diff --git a/README.md b/README.md
index dbb88ac..4f59339 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
 
 ERPNext is built on the [Frappe](https://github.com/frappe/frappe) Framework, a full-stack web app framework in Python & JavaScript.
 
-- [User Guide](https://manual.erpnext.com)
+- [User Guide](https://frappe.github.io/erpnext/)
 - [Getting Help](http://erpnext.org/getting-help.html)
 - [Discussion Forum](https://discuss.erpnext.com/)
 
diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index 81e656e..b54ba59 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -2,7 +2,7 @@
 from __future__ import unicode_literals
 import frappe
 
-__version__ = '7.1.0-beta'
+__version__ = '7.1.22'
 
 def get_default_company(user=None):
 	'''Get default company for user'''
diff --git a/erpnext/accounts/doctype/account/account.js b/erpnext/accounts/doctype/account/account.js
index 2450a8a..4c04fc6 100644
--- a/erpnext/accounts/doctype/account/account.js
+++ b/erpnext/accounts/doctype/account/account.js
@@ -51,7 +51,7 @@
 
 	if (doc.is_group == 1) {
 		cur_frm.add_custom_button(__('Group to Non-Group'),
-			function() { cur_frm.cscript.convert_to_ledger(); }, 'icon-retweet', 'btn-default');
+			function() { cur_frm.cscript.convert_to_ledger(); }, 'fa fa-retweet', 'btn-default');
 	} else if (cint(doc.is_group) == 0) {
 		cur_frm.add_custom_button(__('Ledger'), function() {
 			frappe.route_options = {
@@ -64,7 +64,7 @@
 		});
 
 		cur_frm.add_custom_button(__('Non-Group to Group'),
-			function() { cur_frm.cscript.convert_to_group(); }, 'icon-retweet', 'btn-default')
+			function() { cur_frm.cscript.convert_to_group(); }, 'fa fa-retweet', 'btn-default')
 	}
 }
 
diff --git a/erpnext/accounts/doctype/account/account.json b/erpnext/accounts/doctype/account/account.json
index f11a664..1bdf355 100644
--- a/erpnext/accounts/doctype/account/account.json
+++ b/erpnext/accounts/doctype/account/account.json
@@ -9,11 +9,13 @@
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Setup", 
+ "editable_grid": 0, 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "properties", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -21,6 +23,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "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, 
    "fieldname": "column_break0", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -46,12 +51,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, 
@@ -63,6 +70,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "account_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -70,6 +78,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Account Name", 
    "length": 0, 
    "no_copy": 1, 
@@ -79,6 +88,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, 
@@ -89,6 +99,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "0", 
    "fieldname": "is_group", 
    "fieldtype": "Check", 
@@ -97,6 +108,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Is Group", 
    "length": 0, 
    "no_copy": 0, 
@@ -105,6 +117,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,6 +128,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "company", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -122,6 +136,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -132,6 +147,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 1, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -142,6 +158,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "root_type", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -149,6 +166,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Root Type", 
    "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": "report_type", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -174,6 +194,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Report Type", 
    "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, 
    "depends_on": "eval:doc.is_group==0", 
    "fieldname": "account_currency", 
    "fieldtype": "Link", 
@@ -200,6 +223,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Currency", 
    "length": 0, 
    "no_copy": 0, 
@@ -209,6 +233,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, 
@@ -219,6 +244,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break1", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -226,12 +252,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, 
@@ -243,6 +271,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "parent_account", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -250,6 +279,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Parent Account", 
    "length": 0, 
    "no_copy": 0, 
@@ -260,6 +290,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, 
@@ -270,6 +301,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "Setting Account Type helps in selecting this Account in transactions.", 
    "fieldname": "account_type", 
    "fieldtype": "Select", 
@@ -278,6 +310,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Account Type", 
    "length": 0, 
    "no_copy": 0, 
@@ -288,6 +321,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, 
@@ -298,6 +332,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "Rate at which this tax is applied", 
    "fieldname": "tax_rate", 
    "fieldtype": "Float", 
@@ -306,6 +341,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -315,6 +351,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, 
@@ -325,6 +362,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "If the account is frozen, entries are allowed to restricted users.", 
    "fieldname": "freeze_account", 
    "fieldtype": "Select", 
@@ -333,6 +371,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Frozen", 
    "length": 0, 
    "no_copy": 0, 
@@ -343,6 +382,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 +393,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "warehouse", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -360,6 +401,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Warehouse", 
    "length": 0, 
    "no_copy": 0, 
@@ -368,6 +410,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,6 +421,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "balance_must_be", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -385,6 +429,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Balance must be", 
    "length": 0, 
    "no_copy": 0, 
@@ -393,6 +438,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, 
@@ -403,6 +449,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "lft", 
    "fieldtype": "Int", 
    "hidden": 1, 
@@ -410,6 +457,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Lft", 
    "length": 0, 
    "no_copy": 0, 
@@ -417,6 +465,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, 
@@ -427,6 +476,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "rgt", 
    "fieldtype": "Int", 
    "hidden": 1, 
@@ -434,6 +484,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Rgt", 
    "length": 0, 
    "no_copy": 0, 
@@ -441,6 +492,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, 
@@ -451,6 +503,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "old_parent", 
    "fieldtype": "Data", 
    "hidden": 1, 
@@ -458,6 +511,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Old Parent", 
    "length": 0, 
    "no_copy": 0, 
@@ -465,6 +519,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, 
@@ -474,7 +529,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-money", 
+ "icon": "fa fa-money", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
@@ -483,7 +538,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-06-24 13:33:45.504882", 
+ "modified": "2016-11-07 05:46:08.808791", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Account", 
@@ -499,6 +554,7 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 1, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -519,6 +575,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -539,6 +596,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -559,6 +617,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -579,6 +638,7 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 1, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
diff --git a/erpnext/accounts/doctype/account/account.py b/erpnext/accounts/doctype/account/account.py
index ced1e85..cedaf60 100644
--- a/erpnext/accounts/doctype/account/account.py
+++ b/erpnext/accounts/doctype/account/account.py
@@ -171,7 +171,7 @@
 				
 			old_warehouse = cstr(frappe.db.get_value("Account", self.name, "warehouse"))
 			if old_warehouse != cstr(self.warehouse):
-				if old_warehouse:
+				if old_warehouse and frappe.db.exists("Warehouse", old_warehouse):
 					self.validate_warehouse(old_warehouse)
 				if self.warehouse:
 					self.validate_warehouse(self.warehouse)
diff --git a/erpnext/accounts/doctype/account/account_tree.js b/erpnext/accounts/doctype/account/account_tree.js
index db15eef..fc6a1b4 100644
--- a/erpnext/accounts/doctype/account/account_tree.js
+++ b/erpnext/accounts/doctype/account/account_tree.js
@@ -1,3 +1,5 @@
+frappe.provide("frappe.treeview_settings")
+
 frappe.treeview_settings["Account"] = {
 	breadcrumbs: "Accounts",
 	title: __("Chart Of Accounts"),
@@ -25,18 +27,30 @@
 		{fieldtype:'Check', fieldname:'is_group', label:__('Is Group'),
 			description: __('Further accounts can be made under Groups, but entries can be made against non-Groups')},
 		{fieldtype:'Select', fieldname:'root_type', label:__('Root Type'),
-			options: ['Asset', 'Liability', 'Equity', 'Income', 'Expense'].join('\n')},
+			options: ['Asset', 'Liability', 'Equity', 'Income', 'Expense'].join('\n'),
+			depends_on: 'eval:doc.is_group && !doc.parent_account'},
 		{fieldtype:'Select', fieldname:'account_type', label:__('Account Type'),
-			options: ['', 'Bank', 'Cash', 'Stock', 'Tax', 'Chargeable', 'Fixed Asset'].join('\n'),
+			options: ['', 'Accumulated Depreciation', 'Bank', 'Cash', 'Chargeable', 'Cost of Goods Sold', 'Depreciation', 
+				'Equity', 'Expense Account', 'Expenses Included In Valuation', 'Fixed Asset', 'Income Account', 'Payable', 'Receivable', 
+				'Round Off', 'Stock', 'Stock Adjustment', 'Stock Received But Not Billed', 'Tax', 'Temporary'].join('\n'),
 			description: __("Optional. This setting will be used to filter in various transactions.")
 		},
 		{fieldtype:'Float', fieldname:'tax_rate', label:__('Tax Rate'),
 			depends_on: 'eval:doc.is_group==1&&doc.account_type=="Tax"'},
 		{fieldtype:'Link', fieldname:'warehouse', label:__('Warehouse'), options:"Warehouse",
-			depends_on: 'eval:(!doc.is_group&&doc.account_type=="Warehouse")'},
+			depends_on: 'eval:(!doc.is_group&&doc.account_type=="Stock")',
+			get_query: function() {
+				return {
+					filters:{
+						"company": frappe.treeview_settings.filters["company"]
+					}
+				}
+			}
+		},
 		{fieldtype:'Link', fieldname:'account_currency', label:__('Currency'), options:"Currency",
 			description: __("Optional. Sets company's default currency, if not specified.")}
 	],
+	ignore_fields:["parent_account"],
 	onrender: function(node) {
 		var dr_or_cr = node.data.balance < 0 ? "Cr" : "Dr";
 		if (node.data && node.data.balance!==undefined) {
@@ -48,5 +62,24 @@
 				+ " " + dr_or_cr
 				+ '</span>').insertBefore(node.$ul);
 		}
-	}
-}
\ No newline at end of file
+	},
+	toolbar: [
+		{
+			condition: function(node) {
+				return !node.root && frappe.boot.user.can_read.indexOf("GL Entry") !== -1
+			},
+			label: __("View Ledger"),
+			click: function(node, btn) {
+				frappe.route_options = {
+					"account": node.label,
+					"from_date": sys_defaults.year_start_date,
+					"to_date": sys_defaults.year_end_date,
+					"company": frappe.defaults.get_default('company') ? frappe.defaults.get_default('company'): ""
+				};
+				frappe.set_route("query-report", "General Ledger");
+			},
+			btnClass: "hidden-xs"
+		}
+	],
+	extend_toolbar: true
+}
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 5c82142..e26e354 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
@@ -6,9 +6,8 @@
 from frappe.utils import cstr
 from unidecode import unidecode
 
-def create_charts(chart_name, company):
-	chart = get_chart(chart_name)
-	
+def create_charts(company, chart_template=None, existing_company=None):
+	chart = get_chart(chart_template, existing_company)
 	if chart:
 		accounts = []
 
@@ -17,7 +16,7 @@
 				if root_account:
 					root_type = child.get("root_type")
 
-				if account_name not in ["account_type", "root_type", "is_group"]:
+				if account_name not in ["account_type", "root_type", "is_group", "tax_rate"]:
 
 					account_name_in_db = unidecode(account_name.strip().lower())
 					if account_name_in_db in accounts:
@@ -57,16 +56,19 @@
 def identify_is_group(child):
 	if child.get("is_group"):
 		is_group = child.get("is_group")
-	elif len(set(child.keys()) - set(["account_type", "root_type", "is_group"])):
+	elif len(set(child.keys()) - set(["account_type", "root_type", "is_group", "tax_rate"])):
 		is_group = 1
 	else:
 		is_group = 0
 
 	return is_group
 
-def get_chart(chart_name):
+def get_chart(chart_template, existing_company=None):
 	chart = {}
-	if chart_name == "Standard":
+	if existing_company:
+		return get_account_tree_from_existing_company(existing_company)
+	
+	elif chart_template == "Standard":
 		from erpnext.accounts.doctype.account.chart_of_accounts.verified import standard_chart_of_accounts
 		return standard_chart_of_accounts.get()
 	else:
@@ -79,7 +81,7 @@
 				if fname.endswith(".json"):
 					with open(os.path.join(path, fname), "r") as f:
 						chart = f.read()
-						if chart and json.loads(chart).get("name") == chart_name:
+						if chart and json.loads(chart).get("name") == chart_template:
 							return json.loads(chart).get("tree")
 
 @frappe.whitelist()
@@ -111,3 +113,47 @@
 		charts.append("Standard")
 
 	return charts
+
+
+def get_account_tree_from_existing_company(existing_company):
+	all_accounts = frappe.get_all('Account', 
+		filters={'company': existing_company}, 
+		fields = ["name", "account_name", "parent_account", "account_type", 
+			"is_group", "root_type", "tax_rate"], 
+		order_by="lft, rgt")
+	
+	account_tree = {}
+
+	# 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):
+	# find children
+	parent_account = parent.name if parent else None
+	children  = [acc for acc in all_accounts if acc.parent_account == parent_account]
+			
+	# if no children, but a group account
+	if not children and parent.is_group:
+		tree["is_group"] = 1
+
+	# build a subtree for each child
+	for child in children:
+		if child.account_type == "Stock" and not child.is_group:
+			tree["is_group"] = 1
+			continue
+		
+		# start new subtree
+		tree[child.account_name] = {}
+		
+		# assign account_type and root_type
+		if child.account_type:
+			tree[child.account_name]["account_type"] = child.account_type
+		if child.tax_rate:
+			tree[child.account_name]["tax_rate"] = child.tax_rate
+		if not parent:
+			tree[child.account_name]["root_type"] = child.root_type
+			
+		# call recursively to build a subtree for current account
+		build_account_tree(tree[child.account_name], child, all_accounts)
\ No newline at end of file
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 4fa889d..d7f508f 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
@@ -294,7 +294,7 @@
             "Current Liabilities": {
                 "Accounts Payable": {
                     "Payables": {
-                        "Advance Paybale to Suppliers": {
+                        "Advance Payable to Suppliers": {
                             "account_type": "Payable"
                         },
                         "Consigned Payable": {
diff --git a/erpnext/accounts/doctype/accounts_settings/accounts_settings.json b/erpnext/accounts/doctype/accounts_settings/accounts_settings.json
index a02e591..7a4d40d 100644
--- a/erpnext/accounts/doctype/accounts_settings/accounts_settings.json
+++ b/erpnext/accounts/doctype/accounts_settings/accounts_settings.json
@@ -10,11 +10,13 @@
  "doctype": "DocType", 
  "document_type": "Other", 
  "editable_grid": 1, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "1", 
    "description": "If enabled, the system will post accounting entries for inventory automatically.", 
    "fieldname": "auto_accounting_for_stock", 
@@ -41,6 +43,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.", 
    "fieldname": "acc_frozen_upto", 
    "fieldtype": "Date", 
@@ -66,6 +69,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts", 
    "fieldname": "frozen_accounts_modifier", 
    "fieldtype": "Link", 
@@ -92,6 +96,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_4", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -116,6 +121,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "Role that is allowed to submit transactions that exceed credit limits set.", 
    "fieldname": "credit_controller", 
    "fieldtype": "Link", 
@@ -142,6 +148,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "check_supplier_invoice_uniqueness", 
    "fieldtype": "Check", 
    "hidden": 0, 
@@ -162,11 +169,64 @@
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "make_payment_via_journal_entry", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Make Payment via Journal Entry", 
+   "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, 
+   "default": "1", 
+   "fieldname": "unlink_payment_on_cancellation_of_invoice", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Unlink Payment on Cancellation of Invoice", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
   }
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-cog", 
+ "icon": "fa fa-cog", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
@@ -175,7 +235,7 @@
  "issingle": 1, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-07-14 14:32:06.056888", 
+ "modified": "2016-10-20 16:12:38.595075", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Accounts Settings", 
@@ -191,6 +251,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
diff --git a/erpnext/accounts/doctype/asset/asset.js b/erpnext/accounts/doctype/asset/asset.js
index 8ff4b83..664ed4d 100644
--- a/erpnext/accounts/doctype/asset/asset.js
+++ b/erpnext/accounts/doctype/asset/asset.js
@@ -28,6 +28,7 @@
 	refresh: function(frm) {
 		frappe.ui.form.trigger("Asset", "is_existing_asset");
 		frm.toggle_display("next_depreciation_date", frm.doc.docstatus < 1);
+		frm.events.make_schedules_editable(frm);
 				
 		if (frm.doc.docstatus==1) {
 			if (frm.doc.status=='Submitted' && !frm.doc.is_existing_asset && !frm.doc.purchase_invoice) {
@@ -141,6 +142,22 @@
 		frm.toggle_enable("supplier", frm.doc.is_existing_asset);
 		frm.toggle_reqd("next_depreciation_date", !frm.doc.is_existing_asset);
 	},
+	
+	opening_accumulated_depreciation: function(frm) {
+		erpnext.asset.set_accululated_depreciation(frm);
+	},
+	
+	depreciation_method: function(frm) {
+		frm.events.make_schedules_editable(frm);
+	},
+	
+	make_schedules_editable: function(frm) {
+		var is_editable = frm.doc.depreciation_method==="Manual" ? true : false;
+		frm.toggle_enable("schedules", is_editable);
+		frm.fields_dict["schedules"].grid.toggle_enable("schedule_date", is_editable);
+		frm.fields_dict["schedules"].grid.toggle_enable("depreciation_amount", is_editable);
+	}
+	
 });
 
 frappe.ui.form.on('Depreciation Schedule', {
@@ -159,9 +176,25 @@
 				}
 			})
 		}
+	},
+	
+	depreciation_amount: function(frm, cdt, cdn) {
+		erpnext.asset.set_accululated_depreciation(frm);
 	}
+
 })
 
+erpnext.asset.set_accululated_depreciation = function(frm) {
+	if(frm.doc.depreciation_method != "Manual") return;
+	
+	accumulated_depreciation = flt(frm.doc.opening_accumulated_depreciation);
+	$.each(frm.doc.schedules || [], function(i, row) {
+		accumulated_depreciation  += flt(row.depreciation_amount);
+		frappe.model.set_value(row.doctype, row.name, 
+			"accumulated_depreciation_amount", accumulated_depreciation);
+	})
+}
+
 erpnext.asset.make_purchase_invoice = function(frm) {
 	frappe.call({
 		args: {
diff --git a/erpnext/accounts/doctype/asset/asset.json b/erpnext/accounts/doctype/asset/asset.json
index 612574d..d093e69 100644
--- a/erpnext/accounts/doctype/asset/asset.json
+++ b/erpnext/accounts/doctype/asset/asset.json
@@ -9,11 +9,13 @@
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Document", 
+ "editable_grid": 0, 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "asset_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -21,6 +23,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Asset Name", 
    "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,6 +43,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "item_code", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -46,6 +51,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Item Code", 
    "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": 1, 
    "search_index": 0, 
@@ -65,6 +72,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "asset_category", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -72,6 +80,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Asset Category", 
    "length": 0, 
    "no_copy": 0, 
@@ -81,6 +90,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,6 +101,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "Draft", 
    "fieldname": "status", 
    "fieldtype": "Select", 
@@ -99,6 +110,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Status", 
    "length": 0, 
    "no_copy": 1, 
@@ -108,6 +120,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, 
@@ -118,6 +131,7 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "image", 
    "fieldtype": "Attach Image", 
    "hidden": 1, 
@@ -125,6 +139,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Image", 
    "length": 0, 
    "no_copy": 1, 
@@ -133,6 +148,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, 
@@ -143,6 +159,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_3", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -150,6 +167,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -157,6 +175,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,6 +186,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "company", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -174,6 +194,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -183,6 +204,7 @@
    "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, 
@@ -193,6 +215,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "warehouse", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -200,6 +223,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Warehouse", 
    "length": 0, 
    "no_copy": 0, 
@@ -209,6 +233,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, 
@@ -219,6 +244,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "is_existing_asset", 
    "fieldtype": "Check", 
    "hidden": 0, 
@@ -226,6 +252,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Is Existing Asset", 
    "length": 0, 
    "no_copy": 0, 
@@ -234,6 +261,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 +272,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "purchase_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -251,6 +280,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Purchase Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -259,6 +289,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, 
@@ -269,6 +300,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "supplier", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -276,6 +308,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Supplier", 
    "length": 0, 
    "no_copy": 0, 
@@ -285,6 +318,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 +329,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "purchase_invoice", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -302,6 +337,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Purchase Invoice", 
    "length": 0, 
    "no_copy": 1, 
@@ -311,6 +347,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, 
@@ -321,6 +358,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "disposal_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -328,6 +366,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Disposal Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -336,6 +375,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, 
@@ -346,6 +386,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "journal_entry_for_scrap", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -353,6 +394,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Journal Entry for Scrap", 
    "length": 0, 
    "no_copy": 1, 
@@ -362,6 +404,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, 
@@ -372,6 +415,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_5", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -379,6 +423,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -386,6 +431,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, 
@@ -396,6 +442,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "gross_purchase_amount", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -403,6 +450,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Gross Purchase Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -412,6 +460,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, 
@@ -422,6 +471,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "", 
    "fieldname": "expected_value_after_useful_life", 
    "fieldtype": "Currency", 
@@ -430,6 +480,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Expected Value After Useful Life", 
    "length": 0, 
    "no_copy": 0, 
@@ -439,6 +490,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, 
@@ -449,6 +501,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "is_existing_asset", 
    "fieldname": "opening_accumulated_depreciation", 
    "fieldtype": "Currency", 
@@ -457,6 +510,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Opening Accumulated Depreciation", 
    "length": 0, 
    "no_copy": 1, 
@@ -466,6 +520,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 +531,15 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "value_after_depreciation", 
    "fieldtype": "Currency", 
-   "hidden": 0, 
+   "hidden": 1, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Value After Depreciation", 
    "length": 0, 
    "no_copy": 0, 
@@ -492,6 +549,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, 
@@ -502,6 +560,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_11", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -509,6 +568,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -516,6 +576,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, 
@@ -526,6 +587,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "", 
    "depends_on": "", 
    "fieldname": "depreciation_method", 
@@ -535,15 +597,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Depreciation Method", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "\nStraight Line\nDouble Declining Balance", 
+   "options": "\nStraight Line\nDouble Declining Balance\nManual", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -554,6 +618,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "total_number_of_depreciations", 
    "fieldtype": "Int", 
    "hidden": 0, 
@@ -561,6 +626,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Number of Depreciations", 
    "length": 0, 
    "no_copy": 0, 
@@ -569,6 +635,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, 
@@ -579,6 +646,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:(doc.is_existing_asset && doc.opening_accumulated_depreciation)", 
    "fieldname": "number_of_depreciations_booked", 
    "fieldtype": "Int", 
@@ -587,6 +655,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Number of Depreciations Booked", 
    "length": 0, 
    "no_copy": 1, 
@@ -595,6 +664,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, 
@@ -605,6 +675,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "frequency_of_depreciation", 
    "fieldtype": "Int", 
    "hidden": 0, 
@@ -612,6 +683,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Frequency of Depreciation (Months)", 
    "length": 0, 
    "no_copy": 0, 
@@ -620,6 +692,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, 
@@ -630,6 +703,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "", 
    "fieldname": "next_depreciation_date", 
    "fieldtype": "Date", 
@@ -638,6 +712,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Next Depreciation Date", 
    "length": 0, 
    "no_copy": 1, 
@@ -646,6 +721,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, 
@@ -656,6 +732,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_14", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -663,6 +740,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Depreciation Schedule", 
    "length": 0, 
    "no_copy": 0, 
@@ -671,6 +749,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, 
@@ -681,6 +760,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "schedules", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -688,6 +768,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Depreciation Schedules", 
    "length": 0, 
    "no_copy": 1, 
@@ -696,7 +777,8 @@
    "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, 
    "search_index": 0, 
@@ -707,6 +789,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "amended_from", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -714,6 +797,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amended From", 
    "length": 0, 
    "no_copy": 1, 
@@ -722,6 +806,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, 
@@ -740,7 +825,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-07-05 12:54:38.585259", 
+ "modified": "2016-11-18 15:59:19.774500", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Asset", 
@@ -757,6 +842,7 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 1, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
diff --git a/erpnext/accounts/doctype/asset/asset.py b/erpnext/accounts/doctype/asset/asset.py
index b28aaa9..9caac07 100644
--- a/erpnext/accounts/doctype/asset/asset.py
+++ b/erpnext/accounts/doctype/asset/asset.py
@@ -18,6 +18,7 @@
 		self.set_missing_values()
 		self.validate_asset_values()
 		self.make_depreciation_schedule()
+		self.set_accumulated_depreciation()
 		self.validate_expected_value_after_useful_life()
 		# Validate depreciation related accounts
 		get_depreciation_accounts(self)
@@ -48,7 +49,7 @@
 			for field, value in item_details.items():
 				if not self.get(field):
 					self.set(field, value)
-					
+
 		self.value_after_depreciation = (flt(self.gross_purchase_amount) - 
 			flt(self.opening_accumulated_depreciation))
 
@@ -80,16 +81,17 @@
 				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.throw(_("Next Depreciation Date must be on or after today"))
+			frappe.msgprint(_("Next Depreciation Date is entered as past 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):
-		self.schedules = []
+		if self.depreciation_method != 'Manual':
+			self.schedules = []
+			
 		if not self.get("schedules") and self.next_depreciation_date:
-			accumulated_depreciation = flt(self.opening_accumulated_depreciation)
 			value_after_depreciation = flt(self.value_after_depreciation)
 			
 			number_of_pending_depreciations = cint(self.total_number_of_depreciations) - \
@@ -100,18 +102,21 @@
 						n * cint(self.frequency_of_depreciation))
 
 					depreciation_amount = self.get_depreciation_amount(value_after_depreciation)
-				
-					accumulated_depreciation += flt(depreciation_amount)
 					value_after_depreciation -= flt(depreciation_amount)
 
 					self.append("schedules", {
 						"schedule_date": schedule_date,
-						"depreciation_amount": depreciation_amount,
-						"accumulated_depreciation_amount": accumulated_depreciation
+						"depreciation_amount": depreciation_amount
 					})
+					
+	def set_accumulated_depreciation(self):
+		accumulated_depreciation = flt(self.opening_accumulated_depreciation)
+		for d in self.get("schedules"):
+			accumulated_depreciation  += flt(d.depreciation_amount)
+			d.accumulated_depreciation_amount = accumulated_depreciation
 
 	def get_depreciation_amount(self, depreciable_value):
-		if self.depreciation_method == "Straight Line":
+		if self.depreciation_method in ("Straight Line", "Manual"):
 			depreciation_amount = (flt(self.value_after_depreciation) -
 				flt(self.expected_value_after_useful_life)) / (cint(self.total_number_of_depreciations) - 
 				cint(self.number_of_depreciations_booked))
@@ -126,16 +131,15 @@
 		return depreciation_amount
 		
 	def validate_expected_value_after_useful_life(self):
-		if self.depreciation_method == "Double Declining Balance":
-			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) - 
-				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))
+		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) - 
+			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))
 
 	def validate_cancellation(self):
 		if self.status not in ("Submitted", "Partially Depreciated", "Fully Depreciated"):
diff --git a/erpnext/accounts/doctype/asset/test_asset.py b/erpnext/accounts/doctype/asset/test_asset.py
index b409ec3..51496b9 100644
--- a/erpnext/accounts/doctype/asset/test_asset.py
+++ b/erpnext/accounts/doctype/asset/test_asset.py
@@ -119,6 +119,30 @@
 			for d in asset.get("schedules")]
 
 		self.assertEqual(schedules, expected_schedules)
+		
+	def test_schedule_for_manual_method(self):
+		asset = frappe.get_doc("Asset", "Macbook Pro 1")
+		asset.depreciation_method = "Manual"
+		asset.schedules = []
+		for schedule_date, amount in [["2020-12-31", 40000], ["2021-06-30", 30000], ["2021-10-31", 20000]]:
+			asset.append("schedules", {
+				"schedule_date": schedule_date,
+				"depreciation_amount": amount
+			})
+		asset.save()
+
+		self.assertEqual(asset.status, "Draft")
+
+		expected_schedules = [
+			["2020-12-31", 40000, 40000],
+			["2021-06-30", 30000, 70000],
+			["2021-10-31", 20000, 90000]
+		]
+
+		schedules = [[cstr(d.schedule_date), d.depreciation_amount, d.accumulated_depreciation_amount]
+			for d in asset.get("schedules")]
+
+		self.assertEqual(schedules, expected_schedules)
 
 	def test_depreciation(self):
 		asset = frappe.get_doc("Asset", "Macbook Pro 1")
diff --git a/erpnext/accounts/doctype/asset_category/asset_category.json b/erpnext/accounts/doctype/asset_category/asset_category.json
index 20dd247..0ffdefc 100644
--- a/erpnext/accounts/doctype/asset_category/asset_category.json
+++ b/erpnext/accounts/doctype/asset_category/asset_category.json
@@ -3,16 +3,20 @@
  "allow_import": 1, 
  "allow_rename": 1, 
  "autoname": "field:asset_category_name", 
+ "beta": 0, 
  "creation": "2016-03-01 17:41:39.778765", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Document", 
+ "editable_grid": 0, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "asset_category_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -20,6 +24,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Asset Category Name", 
    "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": 1, 
    "search_index": 0, 
@@ -38,6 +44,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "Straight Line", 
    "fieldname": "depreciation_method", 
    "fieldtype": "Select", 
@@ -46,6 +53,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Depreciation Method", 
    "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": 1, 
    "search_index": 0, 
@@ -65,6 +74,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_3", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -72,6 +82,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -79,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, 
@@ -89,6 +101,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "total_number_of_depreciations", 
    "fieldtype": "Int", 
    "hidden": 0, 
@@ -96,6 +109,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Number of Depreciations", 
    "length": 0, 
    "no_copy": 0, 
@@ -104,6 +118,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, 
@@ -114,6 +129,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "frequency_of_depreciation", 
    "fieldtype": "Int", 
    "hidden": 0, 
@@ -121,6 +137,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Frequency of Depreciation (Months)", 
    "length": 0, 
    "no_copy": 0, 
@@ -129,6 +146,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, 
@@ -139,6 +157,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_2", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -146,6 +165,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Accounts", 
    "length": 0, 
    "no_copy": 0, 
@@ -154,6 +174,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 +185,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "accounts", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -171,6 +193,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Accounts", 
    "length": 0, 
    "no_copy": 0, 
@@ -180,6 +203,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, 
@@ -190,13 +214,14 @@
  "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": "2016-04-20 13:23:09.890324", 
+ "modified": "2016-11-07 05:49:42.600981", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Asset Category", 
@@ -213,6 +238,7 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 1, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -233,6 +259,7 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 1, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
diff --git a/erpnext/accounts/doctype/asset_category_account/asset_category_account.json b/erpnext/accounts/doctype/asset_category_account/asset_category_account.json
index 32a60e5..2393327 100644
--- a/erpnext/accounts/doctype/asset_category_account/asset_category_account.json
+++ b/erpnext/accounts/doctype/asset_category_account/asset_category_account.json
@@ -31,6 +31,7 @@
    "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, 
@@ -58,6 +59,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, 
@@ -85,6 +87,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,6 +115,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, 
@@ -129,7 +133,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-08-26 01:46:01.604335", 
+ "modified": "2016-11-03 15:12:55.775239", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Asset Category Account", 
diff --git a/erpnext/accounts/doctype/asset_movement/asset_movement.json b/erpnext/accounts/doctype/asset_movement/asset_movement.json
index 59b8823..710f3b5 100644
--- a/erpnext/accounts/doctype/asset_movement/asset_movement.json
+++ b/erpnext/accounts/doctype/asset_movement/asset_movement.json
@@ -3,16 +3,19 @@
  "allow_import": 1, 
  "allow_rename": 0, 
  "autoname": "AM-.#####", 
+ "beta": 0, 
  "creation": "2016-04-25 18:00:23.559973", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "", 
+ "editable_grid": 0, 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "asset", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -20,6 +23,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Asset", 
    "length": 0, 
    "no_copy": 0, 
@@ -29,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, 
@@ -39,6 +44,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "transaction_date", 
    "fieldtype": "Datetime", 
    "hidden": 0, 
@@ -46,6 +52,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Transaction Date", 
    "length": 0, 
    "no_copy": 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": 1, 
    "search_index": 0, 
@@ -64,6 +72,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "company", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -71,6 +80,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -80,6 +90,7 @@
    "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, 
@@ -90,6 +101,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_4", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -97,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, 
@@ -104,6 +117,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 +128,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "source_warehouse", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -121,6 +136,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Source Warehouse", 
    "length": 0, 
    "no_copy": 0, 
@@ -130,6 +146,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, 
@@ -140,6 +157,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "target_warehouse", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -147,6 +165,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Target Warehouse", 
    "length": 0, 
    "no_copy": 0, 
@@ -156,6 +175,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, 
@@ -166,6 +186,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "amended_from", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -173,6 +194,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amended From", 
    "length": 0, 
    "no_copy": 1, 
@@ -181,6 +203,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, 
@@ -191,13 +214,14 @@
  "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-04-25 19:14:08.853429", 
+ "modified": "2016-11-07 05:49:47.558549", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Asset Movement", 
@@ -214,6 +238,7 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -234,6 +259,7 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -254,6 +280,7 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
diff --git a/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.js b/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.js
index 85d3187..f1ccd9f 100644
--- a/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.js
+++ b/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.js
@@ -46,6 +46,12 @@
 			callback: function(r, rt) {
 				frm.refresh_field("payment_entries");
 				frm.refresh_fields();
+
+				$(frm.fields_dict.payment_entries.wrapper).find("[data-fieldname=amount]").each(function(i,v){
+					if (i !=0){
+						$(v).addClass("text-right")
+					}
+				})
 			}
 		});
 	}
diff --git a/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.json b/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.json
index 1a7b763..b83dc7c 100644
--- a/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.json
+++ b/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.json
@@ -234,7 +234,7 @@
  ], 
  "hide_heading": 1, 
  "hide_toolbar": 1, 
- "icon": "icon-check", 
+ "icon": "fa fa-check", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
diff --git a/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py b/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py
index a56170d..abc6eba 100644
--- a/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py
+++ b/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py
@@ -3,7 +3,7 @@
 
 from __future__ import unicode_literals
 import frappe
-from frappe.utils import flt, getdate, nowdate
+from frappe.utils import flt, getdate, nowdate, fmt_money
 from frappe import msgprint, _
 from frappe.model.document import Document
 
@@ -26,8 +26,8 @@
 			select 
 				"Journal Entry" as payment_document, t1.name as payment_entry, 
 				t1.cheque_no as cheque_number, t1.cheque_date, 
-				abs(t2.debit_in_account_currency - t2.credit_in_account_currency) as amount, 
-				t1.posting_date, t2.against_account, t1.clearance_date
+				t2.debit_in_account_currency as debit, t2.credit_in_account_currency as credit, 
+				t1.posting_date, t2.against_account, t1.clearance_date, t2.account_currency 
 			from
 				`tabJournal Entry` t1, `tabJournal Entry Account` t2
 			where
@@ -36,21 +36,23 @@
 				and ifnull(t1.is_opening, 'No') = 'No' {0}
 			order by t1.posting_date ASC, t1.name DESC
 		""".format(condition), (self.bank_account, self.from_date, self.to_date), as_dict=1)
-				
+
 		payment_entries = frappe.db.sql("""
 			select 
 				"Payment Entry" as payment_document, name as payment_entry, 
 				reference_no as cheque_number, reference_date as cheque_date, 
-				if(paid_from=%s, paid_amount, received_amount) as amount, 
-				posting_date, party as against_account, clearance_date
+				if(paid_from=%(account)s, paid_amount, "") as credit, 
+				if(paid_from=%(account)s, "", received_amount) as debit, 
+				posting_date, ifnull(party,if(paid_from=%(account)s,paid_to,paid_from)) as against_account, clearance_date,
+				if(paid_to=%(account)s, paid_to_account_currency, paid_from_account_currency) as account_currency
 			from `tabPayment Entry`
 			where
-				(paid_from=%s or paid_to=%s) and docstatus=1
-				and posting_date >= %s and posting_date <= %s {0}
+				(paid_from=%(account)s or paid_to=%(account)s) and docstatus=1
+				and posting_date >= %(from)s and posting_date <= %(to)s {0}
 			order by 
 				posting_date ASC, name DESC
 		""".format(condition), 
-		(self.bank_account, self.bank_account, self.bank_account, self.from_date, self.to_date), as_dict=1)
+		        {"account":self.bank_account, "from":self.from_date, "to":self.to_date}, as_dict=1)
 		
 		entries = sorted(list(payment_entries)+list(journal_entries), 
 			key=lambda k: k['posting_date'] or getdate(nowdate()))
@@ -60,6 +62,11 @@
 
 		for d in entries:
 			row = self.append('payment_entries', {})
+
+			d.amount = fmt_money(d.debit if d.debit else d.credit, 2, d.account_currency) + " " + (_("Dr") if d.debit else _("Cr"))
+			d.pop("credit")
+			d.pop("debit")
+			d.pop("account_currency")
 			row.update(d)
 			self.total_amount += flt(d.amount)
 
diff --git a/erpnext/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.json b/erpnext/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.json
index 0f30fee..2e4af26 100644
--- a/erpnext/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.json
+++ b/erpnext/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.json
@@ -40,14 +40,14 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "columns": 0, 
+   "columns": 1, 
    "fieldname": "payment_entry", 
    "fieldtype": "Dynamic Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
-   "in_list_view": 0, 
+   "in_list_view": 1, 
    "label": "Payment Entry", 
    "length": 0, 
    "no_copy": 0, 
@@ -69,7 +69,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "columns": 3, 
+   "columns": 2, 
    "fieldname": "against_account", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -99,7 +99,7 @@
    "collapsible": 0, 
    "columns": 2, 
    "fieldname": "amount", 
-   "fieldtype": "Currency", 
+   "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
@@ -110,7 +110,7 @@
    "no_copy": 0, 
    "oldfieldname": "debit", 
    "oldfieldtype": "Currency", 
-   "options": "account_currency", 
+   "options": "", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
@@ -151,7 +151,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "columns": 0, 
+   "columns": 2, 
    "fieldname": "posting_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -178,7 +178,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "columns": 3, 
+   "columns": 1, 
    "fieldname": "cheque_number", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -267,7 +267,7 @@
  "istable": 1, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-08-26 01:51:36.123941", 
+ "modified": "2016-11-17 11:39:00.308624", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Bank Reconciliation Detail", 
diff --git a/erpnext/accounts/doctype/budget/budget.js b/erpnext/accounts/doctype/budget/budget.js
index f6a2c88..40e929a 100644
--- a/erpnext/accounts/doctype/budget/budget.js
+++ b/erpnext/accounts/doctype/budget/budget.js
@@ -10,6 +10,14 @@
 				}
 			}
 		})
+
+		frm.set_query("project", function() {
+			return {
+				filters: {
+					company: frm.doc.company
+				}
+			}
+		})
 		
 		frm.set_query("account", "accounts", function() {
 			return {
diff --git a/erpnext/accounts/doctype/budget/budget.json b/erpnext/accounts/doctype/budget/budget.json
index d9464a5..d081364 100644
--- a/erpnext/accounts/doctype/budget/budget.json
+++ b/erpnext/accounts/doctype/budget/budget.json
@@ -14,22 +14,26 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "cost_center", 
-   "fieldtype": "Link", 
+   "columns": 0, 
+   "default": "Cost Center", 
+   "fieldname": "budget_against", 
+   "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Cost Center", 
+   "in_standard_filter": 1, 
+   "label": "Budget Against", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "Cost Center", 
+   "options": "\nCost Center\nProject", 
    "permlevel": 0, 
    "precision": "", 
    "print_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,32 +44,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "fiscal_year", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Fiscal Year", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Fiscal Year", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "company", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -73,6 +52,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -82,6 +62,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, 
@@ -92,6 +73,96 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.budget_against == 'Cost Center'", 
+   "fieldname": "cost_center", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 1, 
+   "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": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.budget_against == 'Project'", 
+   "fieldname": "project", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 1, 
+   "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": "fiscal_year", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Fiscal Year", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Fiscal Year", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_3", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -99,6 +170,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -106,6 +178,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 +189,7 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "Stop", 
    "fieldname": "action_if_annual_budget_exceeded", 
    "fieldtype": "Select", 
@@ -124,6 +198,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Action if Annual Budget Exceeded", 
    "length": 0, 
    "no_copy": 0, 
@@ -133,6 +208,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, 
@@ -143,6 +219,7 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "Warn", 
    "description": "", 
    "fieldname": "action_if_accumulated_monthly_budget_exceeded", 
@@ -152,6 +229,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Action if Accumulated Monthly Budget Exceeded", 
    "length": 0, 
    "no_copy": 0, 
@@ -161,6 +239,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, 
@@ -171,6 +250,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:in_list([\"Stop\", \"Warn\"], doc.action_if_accumulated_monthly_budget_exceeded)", 
    "fieldname": "monthly_distribution", 
    "fieldtype": "Link", 
@@ -179,6 +259,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Monthly Distribution", 
    "length": 0, 
    "no_copy": 0, 
@@ -188,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, 
@@ -198,6 +280,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "amended_from", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -205,6 +288,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amended From", 
    "length": 0, 
    "no_copy": 1, 
@@ -213,6 +297,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, 
@@ -223,6 +308,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_6", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -230,6 +316,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -237,6 +324,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, 
@@ -247,6 +335,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "accounts", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -254,6 +343,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Budget Accounts", 
    "length": 0, 
    "no_copy": 0, 
@@ -263,6 +353,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, 
@@ -280,7 +371,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-08-18 14:46:02.653081", 
+ "modified": "2016-11-30 08:51:10.453935", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Budget", 
@@ -297,6 +388,7 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 1, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
diff --git a/erpnext/accounts/doctype/budget/budget.py b/erpnext/accounts/doctype/budget/budget.py
index 529401c..5fc4fbf 100644
--- a/erpnext/accounts/doctype/budget/budget.py
+++ b/erpnext/accounts/doctype/budget/budget.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+ # -*- coding: utf-8 -*-
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
 # For license information, please see license.txt
 
@@ -14,20 +14,25 @@
 
 class Budget(Document):
 	def autoname(self):
-		self.name = make_autoname(self.cost_center + "/" + self.fiscal_year + "/.###")
+		self.name = make_autoname(self.get(frappe.scrub(self.budget_against)) 
+			+ "/" + self.fiscal_year + "/.###")
 
 	def validate(self):
+		if not self.get(frappe.scrub(self.budget_against)):
+			frappe.throw(_("{0} is mandatory").format(self.budget_against))
 		self.validate_duplicate()
 		self.validate_accounts()
 
 	def validate_duplicate(self):
-		existing_budget = frappe.db.get_value("Budget", {"cost_center": self.cost_center,
+		budget_against_field = frappe.scrub(self.budget_against)
+		budget_against = self.get(budget_against_field)
+		existing_budget = frappe.db.get_value("Budget", {budget_against_field: budget_against,
 			"fiscal_year": self.fiscal_year, "company": self.company,
 			"name": ["!=", self.name], "docstatus": ["!=", 2]})
-		if existing_budget:
-			frappe.throw(_("Another Budget record {0} already exists against {1} for fiscal year {2}")
-				.format(existing_budget, self.cost_center, self.fiscal_year), DuplicateBudgetError)
-
+		if existing_budget: 
+			frappe.throw(_("Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3}")
+				.format(existing_budget, self.budget_against, budget_against, self.fiscal_year), DuplicateBudgetError)
+	
 	def validate_accounts(self):
 		account_list = []
 		for d in self.get('accounts'):
@@ -51,53 +56,104 @@
 
 def validate_expense_against_budget(args):
 	args = frappe._dict(args)
-	if frappe.db.get_value("Account", {"name": args.account, "root_type": "Expense"}):
-		cc_lft, cc_rgt = frappe.db.get_value("Cost Center", args.cost_center, ["lft", "rgt"])
+	if not args.cost_center and not args.project:
+		return
+	for budget_against in [args.project, args.cost_center]:
+		if budget_against \
+				and frappe.db.get_value("Account", {"name": args.account, "root_type": "Expense"}):
 
-		budget_records = frappe.db.sql("""
-			select ba.budget_amount, b.monthly_distribution, b.cost_center,
-				b.action_if_annual_budget_exceeded, b.action_if_accumulated_monthly_budget_exceeded
-			from `tabBudget` b, `tabBudget Account` ba
-			where
-				b.name=ba.parent and b.fiscal_year=%s and ba.account=%s and b.docstatus=1
-				and exists(select name from `tabCost Center` where lft<=%s and rgt>=%s and name=b.cost_center)
-		""", (args.fiscal_year, args.account, cc_lft, cc_rgt), as_dict=True)
+			if args.project:
+				condition = "and exists(select name from `tabProject` where name=b.project)"
+				args.budget_against_field = "Project"
+			
+			elif args.cost_center:
+				cc_lft, cc_rgt = frappe.db.get_value("Cost Center", args.cost_center, ["lft", "rgt"])
+				condition = """and exists(select name from `tabCost Center` 
+					where lft<=%s and rgt>=%s and name=b.cost_center)""" % (cc_lft, cc_rgt)
+				args.budget_against_field = "Cost Center"
+			
+			args.budget_against = budget_against
 
-		for budget in budget_records:
-			if budget.budget_amount:
-				yearly_action = budget.action_if_annual_budget_exceeded
-				monthly_action = budget.action_if_accumulated_monthly_budget_exceeded
+			budget_records = frappe.db.sql("""
+				select
+					b.{budget_against_field}, ba.budget_amount, b.monthly_distribution,
+					b.action_if_annual_budget_exceeded, 
+					b.action_if_accumulated_monthly_budget_exceeded
+				from 
+					`tabBudget` b, `tabBudget Account` ba
+				where
+					b.name=ba.parent and b.fiscal_year=%s 
+					and ba.account=%s and b.docstatus=1
+					{condition}
+			""".format(condition=condition, 
+				budget_against_field=frappe.scrub(args.get("budget_against_field"))),
+				(args.fiscal_year, args.account), as_dict=True)
 
-				if monthly_action in ["Stop", "Warn"]:
-					budget_amount = get_accumulated_monthly_budget(budget.monthly_distribution,
-						args.posting_date, args.fiscal_year, budget.budget_amount)
+			validate_budget_records(args, budget_records)
 
-					args["month_end_date"] = get_last_day(args.posting_date)
-						
-					compare_expense_with_budget(args, budget.cost_center,
-						budget_amount, _("Accumulated Monthly"), monthly_action)
+def validate_budget_records(args, budget_records):
+	for budget in budget_records:
+		if budget.budget_amount:
+			yearly_action = budget.action_if_annual_budget_exceeded
+			monthly_action = budget.action_if_accumulated_monthly_budget_exceeded
 
-				if yearly_action in ("Stop", "Warn") and monthly_action != "Stop" \
-					and yearly_action != monthly_action:
-						compare_expense_with_budget(args, budget.cost_center,
-							flt(budget.budget_amount), _("Annual"), yearly_action)
+			if monthly_action in ["Stop", "Warn"]:
+				budget_amount = get_accumulated_monthly_budget(budget.monthly_distribution,
+					args.posting_date, args.fiscal_year, budget.budget_amount)
+				args["month_end_date"] = get_last_day(args.posting_date)
 
-def compare_expense_with_budget(args, cost_center, budget_amount, action_for, action):
-	actual_expense = get_actual_expense(args, cost_center)
+				compare_expense_with_budget(args, budget_amount, 
+					_("Accumulated Monthly"), monthly_action)
+
+			if yearly_action in ("Stop", "Warn") and monthly_action != "Stop" \
+				and yearly_action != monthly_action:
+				compare_expense_with_budget(args, flt(budget.budget_amount), 
+						_("Annual"), yearly_action)
+
+
+def compare_expense_with_budget(args, budget_amount, action_for, action):
+	actual_expense = get_actual_expense(args)
 	if actual_expense > budget_amount:
 		diff = actual_expense - budget_amount
-		currency = frappe.db.get_value('Company', frappe.db.get_value('Cost Center',
-			cost_center, 'company'), 'default_currency')
+		currency = frappe.db.get_value('Company', args.company, 'default_currency')
 
-		msg = _("{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4}").format(_(action_for),
-			frappe.bold(args.account), frappe.bold(cost_center),
-			frappe.bold(fmt_money(budget_amount, currency=currency)), frappe.bold(fmt_money(diff, currency=currency)))
+		msg = _("{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5}").format(
+				_(action_for), frappe.bold(args.account), args.budget_against_field, 
+				frappe.bold(args.budget_against), 
+				frappe.bold(fmt_money(budget_amount, currency=currency)), 
+				frappe.bold(fmt_money(diff, currency=currency)))
 
 		if action=="Stop":
 			frappe.throw(msg, BudgetError)
 		else:
 			frappe.msgprint(msg, indicator='orange')
 
+
+def get_actual_expense(args):
+	condition1 = " and gle.posting_date <= %(month_end_date)s" \
+		if args.get("month_end_date") else ""
+	if args.budget_against_field == "Cost Center":
+		lft_rgt = frappe.db.get_value(args.budget_against_field, 
+			args.budget_against, ["lft", "rgt"], as_dict=1)
+		args.update(lft_rgt)
+		condition2 = """and exists(select name from `tabCost Center` 
+			where lft>=%(lft)s and rgt<=%(rgt)s and name=gle.cost_center)"""
+	
+	elif args.budget_against_field == "Project":
+		condition2 = "and exists(select name from `tabProject` where name=gle.project)"
+
+	return flt(frappe.db.sql("""
+		select sum(gle.debit) - sum(gle.credit)
+		from `tabGL Entry` gle
+		where gle.account=%(account)s
+			{condition1}
+			and gle.fiscal_year=%(fiscal_year)s
+			and gle.company=%(company)s
+			and gle.docstatus=1
+			{condition2}
+	""".format(condition1=condition1, condition2=condition2), (args))[0][0])
+
+
 def get_accumulated_monthly_budget(monthly_distribution, posting_date, fiscal_year, annual_budget):
 	distribution = {}
 	if monthly_distribution:
@@ -118,21 +174,3 @@
 		dt = add_months(dt, 1)
 
 	return annual_budget * accumulated_percentage / 100
-
-def get_actual_expense(args, cost_center):
-	lft_rgt = frappe.db.get_value("Cost Center", cost_center, ["lft", "rgt"], as_dict=1)
-	args.update(lft_rgt)
-
-	condition = " and gle.posting_date <= %(month_end_date)s" if args.get("month_end_date") else ""
-
-	return flt(frappe.db.sql("""
-		select sum(gle.debit) - sum(gle.credit)
-		from `tabGL Entry` gle
-		where gle.account=%(account)s
-			and exists(select name from `tabCost Center`
-				where lft>=%(lft)s and rgt<=%(rgt)s and name=gle.cost_center)
-			and gle.fiscal_year=%(fiscal_year)s
-			and gle.company=%(company)s
-			and gle.docstatus=1
-			{condition}
-	""".format(condition=condition), (args))[0][0])
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/budget/test_budget.py b/erpnext/accounts/doctype/budget/test_budget.py
index 78f5690..15895dc 100644
--- a/erpnext/accounts/doctype/budget/test_budget.py
+++ b/erpnext/accounts/doctype/budget/test_budget.py
@@ -10,9 +10,9 @@
 
 class TestBudget(unittest.TestCase):		
 	def test_monthly_budget_crossed_ignore(self):
-		set_total_expense_zero("2013-02-28")
+		set_total_expense_zero("2013-02-28", "Cost Center")
 
-		budget = make_budget()
+		budget = make_budget("Cost Center")
 		
 		jv = make_journal_entry("_Test Account Cost for Goods Sold - _TC",
 			"_Test Bank - _TC", 40000, "_Test Cost Center - _TC", submit=True)
@@ -22,10 +22,10 @@
 			
 		budget.cancel()
 
-	def test_monthly_budget_crossed_stop(self):
-		set_total_expense_zero("2013-02-28")
+	def test_monthly_budget_crossed_stop1(self):
+		set_total_expense_zero("2013-02-28", "Cost Center")
 
-		budget = make_budget()
+		budget = make_budget("Cost Center")
 		
 		frappe.db.set_value("Budget", budget.name, "action_if_accumulated_monthly_budget_exceeded", "Stop")
 
@@ -37,10 +37,25 @@
 		budget.load_from_db()
 		budget.cancel()
 
-	def test_yearly_budget_crossed_stop(self):
-		set_total_expense_zero("2013-02-28")
+	def test_monthly_budget_crossed_stop2(self):
+		set_total_expense_zero("2013-02-28", "Project")
 
-		budget = make_budget()
+		budget = make_budget("Project")
+		
+		frappe.db.set_value("Budget", budget.name, "action_if_accumulated_monthly_budget_exceeded", "Stop")
+
+		jv = make_journal_entry("_Test Account Cost for Goods Sold - _TC",
+			"_Test Bank - _TC", 40000, "_Test Cost Center - _TC", project="_Test Project")
+
+		self.assertRaises(BudgetError, jv.submit)
+		
+		budget.load_from_db()
+		budget.cancel()
+
+	def test_yearly_budget_crossed_stop1(self):
+		set_total_expense_zero("2013-02-28", "Cost Center")
+
+		budget = make_budget("Cost Center")
 		
 		jv = make_journal_entry("_Test Account Cost for Goods Sold - _TC",
 			"_Test Bank - _TC", 150000, "_Test Cost Center - _TC")
@@ -49,10 +64,22 @@
 		
 		budget.cancel()
 
-	def test_monthly_budget_on_cancellation(self):
-		set_total_expense_zero("2013-02-28")
+	def test_yearly_budget_crossed_stop2(self):
+		set_total_expense_zero("2013-02-28", "Project")
 
-		budget = make_budget()
+		budget = make_budget("Project")
+		
+		jv = make_journal_entry("_Test Account Cost for Goods Sold - _TC",
+			"_Test Bank - _TC", 150000, "_Test Cost Center - _TC", project="_Test Project")
+
+		self.assertRaises(BudgetError, jv.submit)
+		
+		budget.cancel()
+
+	def test_monthly_budget_on_cancellation1(self):
+		set_total_expense_zero("2013-02-28", "Cost Center")
+
+		budget = make_budget("Cost Center")
 				
 		jv1 = make_journal_entry("_Test Account Cost for Goods Sold - _TC",
 			"_Test Bank - _TC", 20000, "_Test Cost Center - _TC", submit=True)
@@ -72,12 +99,37 @@
 		
 		budget.load_from_db()
 		budget.cancel()
+
+	def test_monthly_budget_on_cancellation2(self):
+		set_total_expense_zero("2013-02-28", "Project")
+
+		budget = make_budget("Project")
+				
+		jv1 = make_journal_entry("_Test Account Cost for Goods Sold - _TC",
+			"_Test Bank - _TC", 20000, "_Test Cost Center - _TC", submit=True, project="_Test Project")
+
+		self.assertTrue(frappe.db.get_value("GL Entry",
+			{"voucher_type": "Journal Entry", "voucher_no": jv1.name}))
+
+		jv2 = make_journal_entry("_Test Account Cost for Goods Sold - _TC",
+			"_Test Bank - _TC", 20000, "_Test Cost Center - _TC", submit=True, project="_Test Project")
+
+		self.assertTrue(frappe.db.get_value("GL Entry",
+			{"voucher_type": "Journal Entry", "voucher_no": jv2.name}))
+
+		frappe.db.set_value("Budget", budget.name, "action_if_accumulated_monthly_budget_exceeded", "Stop")
+		
+		self.assertRaises(BudgetError, jv1.cancel)
+		
+		budget.load_from_db()
+		budget.cancel()
+
 		
 	def test_monthly_budget_against_group_cost_center(self):
-		set_total_expense_zero("2013-02-28")
-		set_total_expense_zero("2013-02-28", "_Test Cost Center 2 - _TC")
+		set_total_expense_zero("2013-02-28", "Cost Center")
+		set_total_expense_zero("2013-02-28", "Cost Center", "_Test Cost Center 2 - _TC")
 		
-		budget = make_budget("_Test Company - _TC")
+		budget = make_budget("Cost Center", "_Test Company - _TC")
 		frappe.db.set_value("Budget", budget.name, "action_if_accumulated_monthly_budget_exceeded", "Stop")
 
 		jv = make_journal_entry("_Test Account Cost for Goods Sold - _TC",
@@ -88,27 +140,52 @@
 		budget.load_from_db()
 		budget.cancel()
 
-def set_total_expense_zero(posting_date, cost_center=None):
-	existing_expense = get_actual_expense({
+def set_total_expense_zero(posting_date, budget_against_field=None, budget_against_CC=None):
+	if budget_against_field == "Project":
+		budget_against = "_Test Project"
+	else:
+		budget_against = budget_against_CC or "_Test Cost Center - _TC"
+	existing_expense = get_actual_expense(frappe._dict({
 		"account": "_Test Account Cost for Goods Sold - _TC",
-		"cost_center": cost_center or "_Test Cost Center - _TC",
+		"cost_center": "_Test Cost Center - _TC",
 		"monthly_end_date": posting_date,
 		"company": "_Test Company",
-		"fiscal_year": "_Test Fiscal Year 2013"
-	}, cost_center or "_Test Cost Center - _TC")
+		"fiscal_year": "_Test Fiscal Year 2013",
+		"budget_against_field": budget_against_field,
+		"budget_against": budget_against
+	}))
 	
-	make_journal_entry("_Test Account Cost for Goods Sold - _TC",
-		"_Test Bank - _TC", -existing_expense, "_Test Cost Center - _TC", submit=True)
+	if existing_expense:
+		if budget_against_field == "Cost Center":
+			make_journal_entry("_Test Account Cost for Goods Sold - _TC",
+			"_Test Bank - _TC", -existing_expense, "_Test Cost Center - _TC", submit=True)
+		elif budget_against_field == "Project":
+			make_journal_entry("_Test Account Cost for Goods Sold - _TC",
+			"_Test Bank - _TC", -existing_expense, "_Test Cost Center - _TC", submit=True, project="_Test Project")
 		
-def make_budget(cost_center=None):
+def make_budget(budget_against=None, cost_center=None):
+	if budget_against == "Project":
+		budget_list = frappe.get_all("Budget", fields=["name"], filters = {"name": ("like", "_Test Project/_Test Fiscal Year 2013%")})
+	else:
+		budget_list = frappe.get_all("Budget", fields=["name"], filters = {"name": ("like", "_Test Cost Center - _TC/_Test Fiscal Year 2013%")})
+	for d in budget_list:
+		frappe.db.sql("delete from `tabBudget` where name = %(name)s", d)
+		frappe.db.sql("delete from `tabBudget Account` where parent = %(name)s", d)
+
 	budget = frappe.new_doc("Budget")
-	budget.cost_center = cost_center or "_Test Cost Center - _TC"
+	
+	if budget_against == "Project":
+		budget.project = "_Test Project"
+	else:
+		budget.cost_center =cost_center or "_Test Cost Center - _TC"
+	
+	
 	budget.fiscal_year = "_Test Fiscal Year 2013"
 	budget.monthly_distribution = "_Test Distribution"
 	budget.company = "_Test Company"
 	budget.action_if_annual_budget_exceeded = "Stop"
 	budget.action_if_accumulated_monthly_budget_exceeded = "Ignore"
-	
+	budget.budget_against = budget_against
 	budget.append("accounts", {
 		"account": "_Test Account Cost for Goods Sold - _TC",
 		"budget_amount": 100000
diff --git a/erpnext/accounts/doctype/c_form/c_form.json b/erpnext/accounts/doctype/c_form/c_form.json
index 93d123c..a59fd18 100644
--- a/erpnext/accounts/doctype/c_form/c_form.json
+++ b/erpnext/accounts/doctype/c_form/c_form.json
@@ -3,15 +3,18 @@
  "allow_import": 1, 
  "allow_rename": 0, 
  "autoname": "naming_series:", 
+ "beta": 0, 
  "creation": "2013-03-07 11:55:06", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "editable_grid": 0, 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break0", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -19,6 +22,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -26,6 +30,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "50%", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -37,6 +42,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "naming_series", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -44,6 +50,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Series", 
    "length": 0, 
    "no_copy": 0, 
@@ -52,6 +59,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, 
@@ -62,6 +70,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "c_form_no", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -69,6 +78,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "C-Form No", 
    "length": 0, 
    "no_copy": 0, 
@@ -76,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, 
@@ -86,6 +97,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "received_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -93,6 +105,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Received Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -100,6 +113,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, 
@@ -110,6 +124,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "customer", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -117,6 +132,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Customer", 
    "length": 0, 
    "no_copy": 0, 
@@ -125,6 +141,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, 
@@ -135,6 +152,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break1", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -142,6 +160,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -149,6 +168,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "50%", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -160,6 +180,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "company", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -167,6 +188,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -175,6 +197,7 @@
    "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, 
@@ -185,6 +208,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "quarter", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -192,6 +216,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Quarter", 
    "length": 0, 
    "no_copy": 0, 
@@ -200,6 +225,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,6 +236,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "total_amount", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -217,6 +244,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -225,6 +253,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, 
@@ -235,6 +264,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "state", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -242,6 +272,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "State", 
    "length": 0, 
    "no_copy": 0, 
@@ -249,6 +280,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, 
@@ -259,6 +291,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break0", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -266,12 +299,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, 
@@ -282,6 +317,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "invoices", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -289,6 +325,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Invoices", 
    "length": 0, 
    "no_copy": 0, 
@@ -297,6 +334,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, 
@@ -307,6 +345,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "total_invoiced_amount", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -314,6 +353,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Invoiced Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -322,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, 
@@ -332,6 +373,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "amended_from", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -339,6 +381,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amended From", 
    "length": 0, 
    "no_copy": 1, 
@@ -347,6 +390,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, 
@@ -356,15 +400,16 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-file-text", 
+ "icon": "fa fa-file-text", 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 3, 
- "modified": "2016-03-03 04:31:05.340444", 
+ "modified": "2016-11-07 05:51:03.273512", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "C-Form", 
@@ -380,6 +425,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -400,6 +446,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -420,6 +467,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 1, 
    "print": 0, 
    "read": 1, 
@@ -431,8 +479,10 @@
    "write": 0
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "sort_order": "DESC", 
- "timeline_field": "customer"
+ "timeline_field": "customer", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/cost_center/cost_center.js b/erpnext/accounts/doctype/cost_center/cost_center.js
index 83ecc9f..5d11005 100644
--- a/erpnext/accounts/doctype/cost_center/cost_center.js
+++ b/erpnext/accounts/doctype/cost_center/cost_center.js
@@ -50,11 +50,11 @@
 cur_frm.cscript.hide_unhide_group_ledger = function(doc) {
 	if (doc.is_group == 1) {
 		cur_frm.add_custom_button(__('Convert to Non-Group'),
-			function() { cur_frm.cscript.convert_to_ledger(); }, "icon-retweet",
+			function() { cur_frm.cscript.convert_to_ledger(); }, "fa fa-retweet",
 				"btn-default")
 	} else if (doc.is_group == 0) {
 		cur_frm.add_custom_button(__('Convert to Group'),
-			function() { cur_frm.cscript.convert_to_group(); }, "icon-retweet",
+			function() { cur_frm.cscript.convert_to_group(); }, "fa fa-retweet",
 				"btn-default")
 	}
 }
diff --git a/erpnext/accounts/doctype/cost_center/cost_center.json b/erpnext/accounts/doctype/cost_center/cost_center.json
index 5f78a5b..f590b5d 100644
--- a/erpnext/accounts/doctype/cost_center/cost_center.json
+++ b/erpnext/accounts/doctype/cost_center/cost_center.json
@@ -10,11 +10,13 @@
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Setup", 
+ "editable_grid": 0, 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "sb0", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -22,6 +24,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "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, 
    "fieldname": "cost_center_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -46,6 +51,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Cost Center Name", 
    "length": 0, 
    "no_copy": 1, 
@@ -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": 1, 
    "search_index": 0, 
@@ -65,6 +72,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "parent_cost_center", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -72,6 +80,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Parent Cost Center", 
    "length": 0, 
    "no_copy": 0, 
@@ -82,6 +91,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, 
@@ -92,6 +102,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "company", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -99,6 +110,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -109,6 +121,7 @@
    "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, 
@@ -119,6 +132,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "cb0", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -126,12 +140,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, 
    "default": "0", 
    "fieldname": "is_group", 
    "fieldtype": "Check", 
@@ -151,6 +168,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Is Group", 
    "length": 0, 
    "no_copy": 0, 
@@ -159,6 +177,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,6 +188,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "lft", 
    "fieldtype": "Int", 
    "hidden": 1, 
@@ -176,6 +196,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "lft", 
    "length": 0, 
    "no_copy": 1, 
@@ -185,6 +206,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, 
@@ -195,6 +217,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "rgt", 
    "fieldtype": "Int", 
    "hidden": 1, 
@@ -202,6 +225,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "rgt", 
    "length": 0, 
    "no_copy": 1, 
@@ -211,6 +235,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, 
@@ -221,6 +246,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "old_parent", 
    "fieldtype": "Link", 
    "hidden": 1, 
@@ -228,6 +254,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "old_parent", 
    "length": 0, 
    "no_copy": 1, 
@@ -238,6 +265,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, 
@@ -247,16 +275,17 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-money", 
+ "icon": "fa fa-money", 
  "idx": 1, 
- "in_create": 0, 
+ "image_view": 0, 
+ "in_create": 1, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-05-16 15:23:14.770933", 
+ "modified": "2016-11-07 05:20:40.282432", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Cost Center", 
@@ -272,6 +301,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -292,6 +322,7 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -312,6 +343,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -332,6 +364,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -352,6 +385,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -368,6 +402,5 @@
  "read_only_onload": 0, 
  "search_fields": "parent_cost_center, is_group", 
  "sort_order": "ASC", 
- "track_seen": 0, 
- "version": 0
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/cost_center/cost_center_tree.js b/erpnext/accounts/doctype/cost_center/cost_center_tree.js
index d8d45c5..6eab34f 100644
--- a/erpnext/accounts/doctype/cost_center/cost_center_tree.js
+++ b/erpnext/accounts/doctype/cost_center/cost_center_tree.js
@@ -22,5 +22,6 @@
 		{fieldtype:'Data', fieldname:'cost_center_name', label:__('New Cost Center Name'), reqd:true},
 		{fieldtype:'Check', fieldname:'is_group', label:__('Is Group'),
 			description:__('Further cost centers can be made under Groups but entries can be made against non-Groups')}
-	]
+	],
+	ignore_fields:["parent_cost_center"]
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/depreciation_schedule/depreciation_schedule.json b/erpnext/accounts/doctype/depreciation_schedule/depreciation_schedule.json
index 57c14b7..1fadf5e 100644
--- a/erpnext/accounts/doctype/depreciation_schedule/depreciation_schedule.json
+++ b/erpnext/accounts/doctype/depreciation_schedule/depreciation_schedule.json
@@ -10,11 +10,13 @@
  "doctype": "DocType", 
  "document_type": "Document", 
  "editable_grid": 1, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "schedule_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -29,7 +31,8 @@
    "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": 1, 
    "search_index": 0, 
@@ -40,6 +43,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "depreciation_amount", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -55,7 +59,8 @@
    "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": 1, 
    "search_index": 0, 
@@ -66,6 +71,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_3", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -80,6 +86,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 +97,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "accumulated_depreciation_amount", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -106,8 +114,9 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
-   "reqd": 1, 
+   "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
@@ -116,6 +125,8 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.docstatus==1", 
    "fieldname": "journal_entry", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -132,6 +143,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, 
@@ -142,7 +154,8 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
-   "depends_on": "eval:(!doc.journal_entry && doc.schedule_date <= get_today())", 
+   "columns": 0, 
+   "depends_on": "eval:(doc.docstatus==1 && !doc.journal_entry && doc.schedule_date <= get_today())", 
    "fieldname": "make_depreciation_entry", 
    "fieldtype": "Button", 
    "hidden": 0, 
@@ -158,6 +171,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,7 +189,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-07-11 03:27:59.603924", 
+ "modified": "2016-11-18 16:42:19.543657", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Depreciation Schedule", 
diff --git a/erpnext/accounts/doctype/fiscal_year/fiscal_year.js b/erpnext/accounts/doctype/fiscal_year/fiscal_year.js
index e7812c3..a516557 100644
--- a/erpnext/accounts/doctype/fiscal_year/fiscal_year.js
+++ b/erpnext/accounts/doctype/fiscal_year/fiscal_year.js
@@ -15,7 +15,7 @@
 
 		if (!doc.__islocal && (doc.name != sys_defaults.fiscal_year)) {
 			this.frm.add_custom_button(__("Default"),
-				this.frm.cscript.set_as_default, "icon-star");
+				this.frm.cscript.set_as_default, "fa fa-star");
 			this.frm.set_intro(__("To set this Fiscal Year as Default, click on 'Set as Default'"));
 		} else {
 			this.frm.set_intro("");
diff --git a/erpnext/accounts/doctype/fiscal_year/fiscal_year.json b/erpnext/accounts/doctype/fiscal_year/fiscal_year.json
index fcbd72c..f8284e6 100644
--- a/erpnext/accounts/doctype/fiscal_year/fiscal_year.json
+++ b/erpnext/accounts/doctype/fiscal_year/fiscal_year.json
@@ -131,7 +131,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-calendar", 
+ "icon": "fa fa-calendar", 
  "idx": 1, 
  "in_create": 0, 
  "in_dialog": 0, 
diff --git a/erpnext/accounts/doctype/gl_entry/gl_entry.json b/erpnext/accounts/doctype/gl_entry/gl_entry.json
index 71008a6..04fd4be 100644
--- a/erpnext/accounts/doctype/gl_entry/gl_entry.json
+++ b/erpnext/accounts/doctype/gl_entry/gl_entry.json
@@ -596,7 +596,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-list", 
+ "icon": "fa fa-list", 
  "idx": 1, 
  "in_create": 1, 
  "in_dialog": 0, 
diff --git a/erpnext/accounts/doctype/gl_entry/gl_entry.py b/erpnext/accounts/doctype/gl_entry/gl_entry.py
index b052e4d..5773813 100644
--- a/erpnext/accounts/doctype/gl_entry/gl_entry.py
+++ b/erpnext/accounts/doctype/gl_entry/gl_entry.py
@@ -46,19 +46,22 @@
 		account_type = frappe.db.get_value("Account", self.account, "account_type")
 		if not (self.party_type and self.party):
 			if account_type == "Receivable":
-				frappe.throw(_("Customer is required against Receivable account {0}").format(self.account))
+				frappe.throw(_("{0} {1}: Customer is required against Receivable account {2}")
+					.format(self.voucher_type, self.voucher_no, self.account))
 			elif account_type == "Payable":
-				frappe.throw(_("Supplier is required against Payable account {0}").format(self.account))
+				frappe.throw(_("{0} {1}: Supplier is required against Payable account {2}")
+					.format(self.voucher_type, self.voucher_no, self.account))
 				
 		# Zero value transaction is not allowed
 		if not (flt(self.debit) or flt(self.credit)):
-			frappe.throw(_("Either debit or credit amount is required for {0}").format(self.account))
+			frappe.throw(_("{0} {1}: Either debit or credit amount is required for {2}")
+				.format(self.voucher_type, self.voucher_no, self.account))
 
 	def pl_must_have_cost_center(self):
 		if frappe.db.get_value("Account", self.account, "report_type") == "Profit and Loss":
 			if not self.cost_center and self.voucher_type != 'Period Closing Voucher':
-				frappe.throw(_("Cost Center is required for 'Profit and Loss' account {0}. Please set up a default Cost Center for the Company.")
-					.format(self.account))
+				frappe.throw(_("{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.")
+					.format(self.voucher_type, self.voucher_no, self.account))
 		else:
 			if self.cost_center:
 				self.cost_center = None
@@ -68,7 +71,8 @@
 	def check_pl_account(self):
 		if self.is_opening=='Yes' and \
 				frappe.db.get_value("Account", self.account, "report_type")=="Profit and Loss":
-			frappe.throw(_("'Profit and Loss' type account {0} not allowed in Opening Entry").format(self.account))
+			frappe.throw(_("{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry")
+				.format(self.voucher_type, self.voucher_no, self.account))
 
 	def validate_account_details(self, adv_adj):
 		"""Account must be ledger, active and not freezed"""
@@ -77,13 +81,16 @@
 			from tabAccount where name=%s""", self.account, as_dict=1)[0]
 
 		if ret.is_group==1:
-			frappe.throw(_("Account {0} cannot be a Group").format(self.account))
+			frappe.throw(_("{0} {1}: Account {2} cannot be a Group")
+				.format(self.voucher_type, self.voucher_no, self.account))
 
 		if ret.docstatus==2:
-			frappe.throw(_("Account {0} is inactive").format(self.account))
+			frappe.throw(_("{0} {1}: Account {2} is inactive")
+				.format(self.voucher_type, self.voucher_no, self.account))
 
 		if ret.company != self.company:
-			frappe.throw(_("Account {0} does not belong to Company {1}").format(self.account, self.company))
+			frappe.throw(_("{0} {1}: Account {2} does not belong to Company {3}")
+				.format(self.voucher_type, self.voucher_no, self.account, self.company))
 
 	def validate_cost_center(self):
 		if not hasattr(self, "cost_center_company"):
@@ -97,7 +104,8 @@
 			return self.cost_center_company[self.cost_center]
 
 		if self.cost_center and _get_cost_center_company() != self.company:
-			frappe.throw(_("Cost Center {0} does not belong to Company {1}").format(self.cost_center, self.company))
+			frappe.throw(_("{0} {1}: Cost Center {2} does not belong to Company {3}")
+				.format(self.voucher_type, self.voucher_no, self.cost_center, self.company))
 
 	def validate_party(self):
 		validate_party_frozen_disabled(self.party_type, self.party)
@@ -110,8 +118,9 @@
 			self.account_currency = company_currency
 
 		if account_currency != self.account_currency:
-			frappe.throw(_("Accounting Entry for {0} can only be made in currency: {1}")
-				.format(self.account, (account_currency or company_currency)), InvalidAccountCurrency)
+			frappe.throw(_("{0} {1}: Accounting Entry for {2} can only be made in currency: {3}")
+				.format(self.voucher_type, self.voucher_no, self.account, 
+				(account_currency or company_currency)), InvalidAccountCurrency)
 
 		if self.party_type and self.party:
 			validate_party_gle_currency(self.party_type, self.party, self.company, self.account_currency)
@@ -186,6 +195,7 @@
 	if against_voucher_type in ["Sales Invoice", "Purchase Invoice"]:
 		ref_doc = frappe.get_doc(against_voucher_type, against_voucher)
 		ref_doc.db_set('outstanding_amount', bal)
+		ref_doc.set_status(update=True)
 
 def validate_frozen_account(account, adv_adj=None):
 	frozen_account = frappe.db.get_value("Account", account, "freeze_account")
diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.js b/erpnext/accounts/doctype/journal_entry/journal_entry.js
index c3a5090..ba650cd 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.js
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.js
@@ -20,7 +20,7 @@
 					group_by_voucher: 0
 				};
 				frappe.set_route("query-report", "General Ledger");
-			}, "icon-table");
+			}, "fa fa-table");
 		}
 
 		if (frm.doc.__islocal) {
diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.json b/erpnext/accounts/doctype/journal_entry/journal_entry.json
index 9d4ad48..112112f 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.json
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.json
@@ -3,16 +3,19 @@
  "allow_import": 1, 
  "allow_rename": 0, 
  "autoname": "naming_series:", 
+ "beta": 0, 
  "creation": "2013-03-25 10:53:52", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Document", 
+ "editable_grid": 0, 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "entry_type_and_date", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -20,14 +23,16 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "icon-flag", 
+   "options": "fa fa-flag", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -38,6 +43,7 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "", 
    "fieldname": "title", 
    "fieldtype": "Data", 
@@ -46,6 +52,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Title", 
    "length": 0, 
    "no_copy": 1, 
@@ -54,6 +61,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, 
@@ -64,6 +72,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "Journal Entry", 
    "fieldname": "voucher_type", 
    "fieldtype": "Select", 
@@ -72,6 +81,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Entry Type", 
    "length": 0, 
    "no_copy": 0, 
@@ -82,6 +92,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, 
@@ -92,6 +103,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "naming_series", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -99,6 +111,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Series", 
    "length": 0, 
    "no_copy": 1, 
@@ -109,6 +122,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, 
@@ -119,6 +133,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break1", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -126,6 +141,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
@@ -133,6 +149,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, 
@@ -144,6 +161,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "posting_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -151,6 +169,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Posting Date", 
    "length": 0, 
    "no_copy": 1, 
@@ -160,6 +179,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, 
@@ -170,6 +190,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "company", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -177,6 +198,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -187,6 +209,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 1, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 1, 
@@ -197,6 +220,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "2_add_edit_gl_entries", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -204,15 +228,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-table", 
+   "options": "fa fa-table", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -223,6 +249,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "accounts", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -230,6 +257,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Accounting Entries", 
    "length": 0, 
    "no_copy": 0, 
@@ -240,6 +268,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, 
@@ -250,6 +279,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break99", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -257,12 +287,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, 
@@ -273,6 +305,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "", 
    "fieldname": "cheque_no", 
    "fieldtype": "Data", 
@@ -281,6 +314,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Reference Number", 
    "length": 0, 
    "no_copy": 1, 
@@ -290,6 +324,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, 
@@ -300,6 +335,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "cheque_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -307,6 +343,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Reference Date", 
    "length": 0, 
    "no_copy": 1, 
@@ -316,6 +353,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, 
@@ -326,6 +364,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "user_remark", 
    "fieldtype": "Small Text", 
    "hidden": 0, 
@@ -333,6 +372,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "User Remark", 
    "length": 0, 
    "no_copy": 1, 
@@ -342,6 +382,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, 
@@ -352,6 +393,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break99", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -359,12 +401,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, 
@@ -375,6 +419,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "total_debit", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -382,6 +427,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Debit", 
    "length": 0, 
    "no_copy": 1, 
@@ -392,6 +438,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, 
@@ -402,6 +449,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "total_credit", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -409,6 +457,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Credit", 
    "length": 0, 
    "no_copy": 1, 
@@ -419,6 +468,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, 
@@ -429,6 +479,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "difference", 
    "fieldname": "difference", 
    "fieldtype": "Currency", 
@@ -437,6 +488,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Difference (Dr - Cr)", 
    "length": 0, 
    "no_copy": 1, 
@@ -447,6 +499,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, 
@@ -457,6 +510,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "difference", 
    "fieldname": "get_balance", 
    "fieldtype": "Button", 
@@ -465,6 +519,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Make Difference Entry", 
    "length": 0, 
    "no_copy": 0, 
@@ -473,6 +528,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, 
@@ -483,6 +539,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "multi_currency", 
    "fieldtype": "Check", 
    "hidden": 0, 
@@ -490,6 +547,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Multi Currency", 
    "length": 0, 
    "no_copy": 0, 
@@ -498,6 +556,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, 
@@ -506,8 +565,38 @@
   }, 
   {
    "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "total_amount_currency", 
+   "fieldtype": "Link", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Total Amount Currency", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 1, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "total_amount", 
    "fieldtype": "Currency", 
    "hidden": 1, 
@@ -515,14 +604,16 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Total Amount", 
    "length": 0, 
    "no_copy": 1, 
-   "options": "Company:company:default_currency", 
+   "options": "total_amount_currency", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 1, 
    "reqd": 0, 
    "search_index": 0, 
@@ -533,6 +624,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "total_amount_in_words", 
    "fieldtype": "Data", 
    "hidden": 1, 
@@ -540,6 +632,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Amount in Words", 
    "length": 0, 
    "no_copy": 1, 
@@ -547,6 +640,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, 
@@ -557,6 +651,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
+   "columns": 0, 
    "fieldname": "reference", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -564,14 +659,16 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Reference", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "icon-pushpin", 
+   "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, 
@@ -582,6 +679,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "clearance_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -589,6 +687,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Clearance Date", 
    "length": 0, 
    "no_copy": 1, 
@@ -598,6 +697,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, 
@@ -608,6 +708,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "", 
    "fieldname": "remark", 
    "fieldtype": "Small Text", 
@@ -616,6 +717,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Remark", 
    "length": 0, 
    "no_copy": 1, 
@@ -625,6 +727,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, 
@@ -635,6 +738,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break98", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -642,12 +746,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, 
@@ -658,6 +764,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "bill_no", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -665,6 +772,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Bill No", 
    "length": 0, 
    "no_copy": 0, 
@@ -674,6 +782,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, 
@@ -684,6 +793,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "bill_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -691,6 +801,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Bill Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -700,6 +811,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, 
@@ -710,6 +822,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "due_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -717,6 +830,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Due Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -726,6 +840,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, 
@@ -736,6 +851,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
+   "columns": 0, 
    "depends_on": "eval:doc.voucher_type == 'Write Off Entry'", 
    "fieldname": "write_off", 
    "fieldtype": "Section Break", 
@@ -744,6 +860,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Write Off", 
    "length": 0, 
    "no_copy": 0, 
@@ -752,6 +869,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, 
@@ -762,6 +880,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "Accounts Receivable", 
    "depends_on": "eval:doc.voucher_type == 'Write Off Entry'", 
    "fieldname": "write_off_based_on", 
@@ -771,6 +890,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Write Off Based On", 
    "length": 0, 
    "no_copy": 0, 
@@ -779,6 +899,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, 
@@ -789,6 +910,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.voucher_type == 'Write Off Entry'", 
    "fieldname": "get_outstanding_invoices", 
    "fieldtype": "Button", 
@@ -797,6 +919,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Get Outstanding Invoices", 
    "length": 0, 
    "no_copy": 0, 
@@ -805,6 +928,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, 
@@ -815,6 +939,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_30", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -822,6 +947,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -829,6 +955,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, 
@@ -839,6 +966,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.voucher_type == 'Write Off Entry'", 
    "fieldname": "write_off_amount", 
    "fieldtype": "Currency", 
@@ -847,6 +975,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Write Off Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -855,6 +984,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, 
@@ -865,6 +995,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
+   "columns": 0, 
    "fieldname": "printing_settings", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -872,6 +1003,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Printing Settings", 
    "length": 0, 
    "no_copy": 0, 
@@ -880,6 +1012,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, 
@@ -887,9 +1020,10 @@
    "unique": 0
   }, 
   {
-   "allow_on_submit": 0, 
+   "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "pay_to_recd_from", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -897,6 +1031,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Pay To / Recd From", 
    "length": 0, 
    "no_copy": 1, 
@@ -904,6 +1039,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 1, 
    "reqd": 0, 
    "search_index": 0, 
@@ -914,6 +1050,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_35", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -921,6 +1058,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -928,6 +1066,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, 
@@ -938,6 +1077,7 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "letter_head", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -945,6 +1085,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Letter Head", 
    "length": 0, 
    "no_copy": 0, 
@@ -953,6 +1094,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, 
@@ -963,6 +1105,7 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "select_print_heading", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -970,6 +1113,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Print Heading", 
    "length": 0, 
    "no_copy": 1, 
@@ -980,6 +1124,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, 
@@ -990,6 +1135,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
+   "columns": 0, 
    "fieldname": "addtional_info", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -997,15 +1143,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "More Information", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-file-text", 
+   "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, 
@@ -1016,6 +1164,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break3", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -1023,6 +1172,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
@@ -1030,6 +1180,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, 
@@ -1041,6 +1192,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "No", 
    "description": "", 
    "fieldname": "is_opening", 
@@ -1050,6 +1202,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Is Opening", 
    "length": 0, 
    "no_copy": 0, 
@@ -1060,6 +1213,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, 
@@ -1070,6 +1224,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:inList([\"Credit Note\", \"Debit Note\"], doc.voucher_type)", 
    "fieldname": "stock_entry", 
    "fieldtype": "Link", 
@@ -1078,6 +1233,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Stock Entry", 
    "length": 0, 
    "no_copy": 0, 
@@ -1087,6 +1243,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, 
@@ -1097,6 +1254,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "amended_from", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -1104,6 +1262,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amended From", 
    "length": 0, 
    "no_copy": 1, 
@@ -1114,6 +1273,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, 
@@ -1123,8 +1283,9 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-file-text", 
+ "icon": "fa fa-file-text", 
  "idx": 176, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 1, 
@@ -1132,7 +1293,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-04-06 05:33:21.851581", 
+ "modified": "2016-11-07 05:53:46.738161", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Journal Entry", 
@@ -1148,6 +1309,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1168,6 +1330,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1188,6 +1351,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1199,6 +1363,7 @@
    "write": 0
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 1, 
  "search_fields": "voucher_type,posting_date, due_date, cheque_no", 
diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py
index 2a6d276..c89e24d 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.py
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py
@@ -37,8 +37,13 @@
 		self.validate_credit_debit_note()
 		self.validate_empty_accounts_table()
 		self.set_account_and_party_balance()
+		self.clear_zero_debit_credit_row()
 		if not self.title:
 			self.title = self.get_title()
+			
+	def clear_zero_debit_credit_row(self):
+		self.accounts = [account for account in self.accounts 
+			if not (account.debit_in_account_currency==0.0 and account.credit_in_account_currency==0.0)]
 
 	def on_submit(self):
 		self.check_credit_limit()
@@ -62,11 +67,22 @@
 
 	def on_cancel(self):
 		from erpnext.accounts.utils import unlink_ref_doc_from_payment_entries
-		unlink_ref_doc_from_payment_entries(self.doctype, self.name)
-
+		from erpnext.hr.doctype.salary_slip.salary_slip import unlink_ref_doc_from_salary_slip
+		unlink_ref_doc_from_payment_entries(self)
+		unlink_ref_doc_from_salary_slip(self.name)
 		self.make_gl_entries(1)
 		self.update_advance_paid()
 		self.update_expense_claim()
+		self.unlink_advance_entry_reference()
+
+	def unlink_advance_entry_reference(self):
+		for d in self.get("accounts"):
+			if d.is_advance and d.reference_type in ("Sales Invoice", "Purchase Invoice"):
+				doc = frappe.get_doc(d.reference_type, d.reference_name)
+				doc.delink_advance_entries(self.name)
+				d.reference_type = ''
+				d.reference_name = ''
+				d.db_update()
 
 	def validate_party(self):
 		for d in self.get("accounts"):
@@ -382,6 +398,7 @@
 
 	def set_total_amount(self, amt, currency):
 		self.total_amount = amt
+		self.total_amount_currency = currency
 		from frappe.utils import money_in_words
 		self.total_amount_in_words = money_in_words(amt, currency)
 
@@ -764,7 +781,8 @@
 	return {
 		"account": account,
 		"balance": account_balance,
-		"party_balance": party_balance
+		"party_balance": party_balance,
+		"account_currency": frappe.db.get_value("Account", account, "account_currency")
 	}
 
 @frappe.whitelist()
diff --git a/erpnext/accounts/doctype/journal_entry/test_journal_entry.py b/erpnext/accounts/doctype/journal_entry/test_journal_entry.py
index 3e609ce..b4bb542 100644
--- a/erpnext/accounts/doctype/journal_entry/test_journal_entry.py
+++ b/erpnext/accounts/doctype/journal_entry/test_journal_entry.py
@@ -171,8 +171,25 @@
 		})
 
 		jv.submit()
+		
+	def test_clear_blank_rows(self):
+		je = make_journal_entry("_Test Bank - _TC", "_Test Account Stock Expenses - _TC", 100, save=False)
+		je.append("accounts", {
+			"account": "_Test Cash - _TC",
+			"debit_in_account_currency": 0,
+			"credit_in_account_currency": 0,
+			"exchange_rate": 1
+		})
+		
+		self.assertEqual(len(je.get("accounts")), 3)
+		je.save()
+		self.assertEqual(len(je.get("accounts")), 2)		
+		
 
-def make_journal_entry(account1, account2, amount, cost_center=None, posting_date=None, exchange_rate=1, save=True, submit=False):
+def make_journal_entry(account1, account2, amount, cost_center=None, posting_date=None, exchange_rate=1, save=True, submit=False, project=None):
+	if not cost_center:
+		cost_center = "_Test Cost Center - _TC"
+
 	jv = frappe.new_doc("Journal Entry")
 	jv.posting_date = posting_date or "2013-02-14"
 	jv.company = "_Test Company"
@@ -182,12 +199,14 @@
 		{
 			"account": account1,
 			"cost_center": cost_center,
+			"project": project,
 			"debit_in_account_currency": amount if amount > 0 else 0,
 			"credit_in_account_currency": abs(amount) if amount < 0 else 0,
 			"exchange_rate": exchange_rate
 		}, {
 			"account": account2,
 			"cost_center": cost_center,
+			"project": project,
 			"credit_in_account_currency": amount if amount > 0 else 0,
 			"debit_in_account_currency": abs(amount) if amount < 0 else 0,
 			"exchange_rate": exchange_rate
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 26519ac..923e87d 100644
--- a/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.json
+++ b/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.json
@@ -3,16 +3,20 @@
  "allow_import": 1, 
  "allow_rename": 1, 
  "autoname": "field:mode_of_payment", 
+ "beta": 0, 
  "creation": "2012-12-04 17:49:20", 
  "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": "mode_of_payment", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -20,6 +24,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Mode of Payment", 
    "length": 0, 
    "no_copy": 0, 
@@ -29,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, 
@@ -39,6 +45,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "type", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -46,6 +53,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Type", 
    "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, 
@@ -65,6 +74,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "accounts", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -72,6 +82,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Accounts", 
    "length": 0, 
    "no_copy": 0, 
@@ -81,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,15 +102,16 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-credit-card", 
+ "icon": "fa fa-credit-card", 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-04-26 11:48:17.411796", 
+ "modified": "2016-11-07 05:54:39.560399", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Mode of Payment", 
@@ -114,6 +127,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -134,6 +148,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
diff --git a/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.json b/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.json
index 377a95c..2340340 100644
--- a/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.json
+++ b/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.json
@@ -9,11 +9,14 @@
  "description": "**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.", 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "editable_grid": 0, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "Name of the Monthly Distribution", 
    "fieldname": "distribution_id", 
    "fieldtype": "Data", 
@@ -22,6 +25,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Distribution 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, 
@@ -41,6 +46,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "fiscal_year", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -48,6 +54,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Fiscal Year", 
    "length": 0, 
    "no_copy": 0, 
@@ -58,6 +65,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 1, 
@@ -68,6 +76,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "percentages", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -75,6 +84,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Monthly Distribution Percentages", 
    "length": 0, 
    "no_copy": 0, 
@@ -85,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,15 +105,16 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-bar-chart", 
+ "icon": "fa fa-bar-chart", 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-05-16 16:35:20.349194", 
+ "modified": "2016-11-21 14:54:35.998761", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Monthly Distribution", 
@@ -119,6 +131,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -139,6 +152,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 2, 
    "print": 0, 
    "read": 1, 
@@ -150,7 +164,7 @@
    "write": 0
   }
  ], 
- "quick_entry": 1, 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "sort_field": "modified", 
diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.js b/erpnext/accounts/doctype/payment_entry/payment_entry.js
index ae956c6..f59d3e7 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.js
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.js
@@ -120,50 +120,21 @@
 	set_dynamic_labels: function(frm) {
 		var company_currency = frappe.get_doc(":Company", frm.doc.company).default_currency;
 
-		var field_label_map = {};
-		var grid_field_label_map = {};
-
-		var setup_field_label_map = function(fields_list, currency, parentfield) {
-			var doctype = parentfield ? frm.fields_dict[parentfield].grid.doctype : frm.doc.doctype;
-			$.each(fields_list, function(i, fname) {
-				var docfield = frappe.meta.docfield_map[doctype][fname];
-				if(docfield) {
-					var label = __(docfield.label || "").replace(/\([^\)]*\)/g, "");
-					if(parentfield) {
-						grid_field_label_map[doctype + "-" + fname] =
-							label.trim() + " (" + __(currency) + ")";
-					} else {
-						field_label_map[fname] = label.trim() + " (" + currency + ")";
-					}
-				}
-			});
-		}
-
-		setup_field_label_map(["base_paid_amount", "base_received_amount", "base_total_allocated_amount",
+		frm.set_currency_labels(["base_paid_amount", "base_received_amount", "base_total_allocated_amount",
 			"difference_amount"], company_currency);
 
-		setup_field_label_map(["paid_amount"], frm.doc.paid_from_account_currency);
-		setup_field_label_map(["received_amount"], frm.doc.paid_to_account_currency);
+		frm.set_currency_labels(["paid_amount"], frm.doc.paid_from_account_currency);
+		frm.set_currency_labels(["received_amount"], frm.doc.paid_to_account_currency);
 
 		var party_account_currency = frm.doc.payment_type=="Receive" ?
 			frm.doc.paid_from_account_currency : frm.doc.paid_to_account_currency;
 
-		setup_field_label_map(["total_allocated_amount", "unallocated_amount"], party_account_currency);
+		frm.set_currency_labels(["total_allocated_amount", "unallocated_amount"], party_account_currency);
 
-		$.each(field_label_map, function(fname, label) {
-			me.frm.fields_dict[fname].set_label(label);
-		});
-
-		setup_field_label_map(["total_amount", "outstanding_amount", "allocated_amount"],
+		frm.set_currency_labels(["total_amount", "outstanding_amount", "allocated_amount"],
 			party_account_currency, "references");
 
-		setup_field_label_map(["amount"], company_currency, "deductions");
-
-		$.each(grid_field_label_map, function(fname, label) {
-			fname = fname.split("-");
-			var df = frappe.meta.get_docfield(fname[0], fname[1], me.frm.doc.name);
-			if(df) df.label = label;
-		});
+		frm.set_currency_labels(["amount"], company_currency, "deductions");
 
 		cur_frm.set_df_property("source_exchange_rate", "description",
 			("1 " + frm.doc.paid_from_account_currency + " = [?] " + company_currency));
@@ -185,7 +156,7 @@
 					group_by_voucher: 0
 				};
 				frappe.set_route("query-report", "General Ledger");
-			}, "icon-table");
+			}, "fa fa-table");
 		}
 	},
 
@@ -407,7 +378,10 @@
 
 		if(!frm.doc.paid_amount && frm.doc.paid_from_account_currency == frm.doc.paid_to_account_currency) {
 			frm.set_value("paid_amount", frm.doc.received_amount);
-			frm.set_value("source_exchange_rate", frm.doc.target_exchange_rate);
+
+			if(frm.doc.target_exchange_rate) {
+				frm.set_value("source_exchange_rate", frm.doc.target_exchange_rate);
+			}
 			frm.set_value("base_paid_amount", frm.doc.base_received_amount);
 		}
 
@@ -427,7 +401,10 @@
 				(frm.doc.paid_from_account_currency == frm.doc.paid_to_account_currency)) {
 			
 			frm.set_value("received_amount", frm.doc.paid_amount);
-			frm.set_value("target_exchange_rate", frm.doc.source_exchange_rate);
+
+			if(frm.doc.source_exchange_rate) {
+				frm.set_value("target_exchange_rate", frm.doc.source_exchange_rate);
+			}
 			frm.set_value("base_received_amount", frm.doc.base_paid_amount);
 		}
 		
@@ -506,6 +483,18 @@
 		});
 	},
 
+	allocate_payment_amount: function(frm) {
+		if(frm.doc.payment_type == 'Internal Transfer'){
+			return
+		}
+
+		if(frm.doc.references.length == 0){
+			frm.events.get_outstanding_documents(frm);
+		}
+
+		frm.events.allocate_party_amount_against_ref_docs(frm, frm.doc.received_amount);
+	},
+
 	allocate_party_amount_against_ref_docs: function(frm, paid_amount) {
 		var total_positive_outstanding_including_order = 0;
 		var total_negative_outstanding = 0;
@@ -547,22 +536,24 @@
 		}
 
 		$.each(frm.doc.references || [], function(i, row) {
-			row.allocated_amount = 0
+			row.allocated_amount = 0 //If allocate payment amount checkbox is unchecked, set zero to allocate amount
+			if(frm.doc.allocate_payment_amount){
+				if(row.outstanding_amount > 0 && allocated_positive_outstanding > 0) {
+					if(row.outstanding_amount >= allocated_positive_outstanding)
+							row.allocated_amount = allocated_positive_outstanding;
+					else row.allocated_amount = row.outstanding_amount;
 
-			if(row.outstanding_amount > 0 && allocated_positive_outstanding > 0) {
-				if(row.outstanding_amount >= allocated_positive_outstanding)
-						row.allocated_amount = allocated_positive_outstanding;
-				else row.allocated_amount = row.outstanding_amount;
+					allocated_positive_outstanding -= flt(row.allocated_amount);
+				} else if (row.outstanding_amount < 0 && allocated_negative_outstanding) {
+					if(Math.abs(row.outstanding_amount) >= allocated_negative_outstanding)
+						row.allocated_amount = -1*allocated_negative_outstanding;
+					else row.allocated_amount = row.outstanding_amount;
 
-				allocated_positive_outstanding -= flt(row.allocated_amount);
-			} else if (row.outstanding_amount < 0 && allocated_negative_outstanding) {
-				if(Math.abs(row.outstanding_amount) >= allocated_negative_outstanding)
-					row.allocated_amount = -1*allocated_negative_outstanding;
-				else row.allocated_amount = row.outstanding_amount;
-
-				allocated_negative_outstanding -= Math.abs(flt(row.allocated_amount));
+					allocated_negative_outstanding -= Math.abs(flt(row.allocated_amount));
+				}
 			}
 		})
+
 		frm.refresh_fields()
 		frm.events.set_total_allocated_amount(frm);
 	},
diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.json b/erpnext/accounts/doctype/payment_entry/payment_entry.json
index 2057d07..c56a83d 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.json
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.json
@@ -23,6 +23,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Type of Payment", 
    "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": 0, 
+   "in_standard_filter": 0, 
    "label": "Series", 
    "length": 0, 
    "no_copy": 0, 
@@ -58,6 +61,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, 
@@ -76,6 +80,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Payment Type", 
    "length": 0, 
    "no_copy": 0, 
@@ -85,6 +90,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, 
@@ -104,6 +110,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Party Type", 
    "length": 0, 
    "no_copy": 0, 
@@ -113,6 +120,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, 
@@ -132,6 +140,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Party", 
    "length": 0, 
    "no_copy": 0, 
@@ -141,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,17 +158,19 @@
    "unique": 0
   }, 
   {
-   "allow_on_submit": 0, 
+   "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "description": "", 
    "fieldname": "party_name", 
    "fieldtype": "Data", 
-   "hidden": 1, 
+   "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, 
@@ -166,7 +178,8 @@
    "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, 
    "search_index": 0, 
@@ -185,6 +198,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -192,6 +206,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,6 +226,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Posting Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -219,6 +235,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, 
@@ -237,6 +254,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -246,6 +264,7 @@
    "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, 
@@ -264,6 +283,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Mode of Payment", 
    "length": 0, 
    "no_copy": 0, 
@@ -273,6 +293,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, 
@@ -291,6 +312,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Accounts", 
    "length": 0, 
    "no_copy": 0, 
@@ -299,6 +321,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,6 +341,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Party Balance", 
    "length": 0, 
    "no_copy": 0, 
@@ -326,6 +350,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, 
@@ -345,6 +370,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Account Paid From", 
    "length": 0, 
    "no_copy": 0, 
@@ -354,6 +380,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, 
@@ -373,6 +400,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Account Currency", 
    "length": 0, 
    "no_copy": 0, 
@@ -382,6 +410,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, 
@@ -401,6 +430,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Account Balance", 
    "length": 0, 
    "no_copy": 0, 
@@ -410,6 +440,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, 
@@ -428,6 +459,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -435,6 +467,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, 
@@ -454,6 +487,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Account Paid To", 
    "length": 0, 
    "no_copy": 0, 
@@ -463,6 +497,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, 
@@ -482,6 +517,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Account Currency", 
    "length": 0, 
    "no_copy": 0, 
@@ -491,6 +527,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, 
@@ -510,6 +547,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Account Balance", 
    "length": 0, 
    "no_copy": 0, 
@@ -519,6 +557,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, 
@@ -539,6 +578,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -547,6 +587,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, 
@@ -566,6 +607,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Paid Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -575,6 +617,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, 
@@ -594,6 +637,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Exchange Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -602,6 +646,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, 
@@ -621,6 +666,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Paid Amount (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -630,6 +676,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, 
@@ -648,6 +695,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -655,6 +703,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, 
@@ -674,6 +723,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Received Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -683,6 +733,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, 
@@ -702,6 +753,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Exchange Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -710,6 +762,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, 
@@ -729,6 +782,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Received Amount (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -738,6 +792,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, 
@@ -758,6 +813,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Reference", 
    "length": 0, 
    "no_copy": 0, 
@@ -766,6 +822,37 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "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", 
+   "depends_on": "eval:in_list(['Pay', 'Receive'], doc.payment_type)", 
+   "fieldname": "allocate_payment_amount", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Allocate Payment Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -785,6 +872,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Payment References", 
    "length": 0, 
    "no_copy": 0, 
@@ -794,6 +882,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, 
@@ -813,6 +902,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Writeoff", 
    "length": 0, 
    "no_copy": 0, 
@@ -821,6 +911,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, 
@@ -840,6 +931,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Allocated Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -848,6 +940,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, 
@@ -867,6 +960,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Allocated Amount (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -876,6 +970,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, 
@@ -894,6 +989,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Set Exchange Gain / Loss", 
    "length": 0, 
    "no_copy": 0, 
@@ -902,6 +998,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, 
@@ -920,6 +1017,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -927,6 +1025,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, 
@@ -946,6 +1045,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Unallocated Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -954,6 +1054,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, 
@@ -973,6 +1074,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Difference Amount (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -982,6 +1084,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, 
@@ -1001,6 +1104,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Write Off Difference Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -1009,6 +1113,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, 
@@ -1029,6 +1134,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Deductions or Loss", 
    "length": 0, 
    "no_copy": 0, 
@@ -1037,6 +1143,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, 
@@ -1055,6 +1162,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Payment Deductions or Loss", 
    "length": 0, 
    "no_copy": 0, 
@@ -1064,6 +1172,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, 
@@ -1082,6 +1191,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Transaction ID", 
    "length": 0, 
    "no_copy": 0, 
@@ -1090,6 +1200,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, 
@@ -1109,6 +1220,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Cheque/Reference No", 
    "length": 0, 
    "no_copy": 0, 
@@ -1117,6 +1229,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, 
@@ -1135,6 +1248,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -1142,6 +1256,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, 
@@ -1161,6 +1276,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Cheque/Reference Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -1169,6 +1285,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, 
@@ -1188,6 +1305,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Clearance Date", 
    "length": 0, 
    "no_copy": 1, 
@@ -1196,6 +1314,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, 
@@ -1216,6 +1335,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "More Information", 
    "length": 0, 
    "no_copy": 0, 
@@ -1224,6 +1344,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, 
@@ -1243,6 +1364,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Project", 
    "length": 0, 
    "no_copy": 0, 
@@ -1252,6 +1374,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, 
@@ -1270,6 +1393,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Remarks", 
    "length": 0, 
    "no_copy": 0, 
@@ -1278,6 +1402,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, 
@@ -1296,6 +1421,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -1303,6 +1429,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, 
@@ -1321,6 +1448,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Letter Head", 
    "length": 0, 
    "no_copy": 0, 
@@ -1330,6 +1458,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, 
@@ -1348,6 +1477,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Print Heading", 
    "length": 0, 
    "no_copy": 0, 
@@ -1357,6 +1487,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, 
@@ -1375,6 +1506,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amended From", 
    "length": 0, 
    "no_copy": 1, 
@@ -1383,6 +1515,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, 
@@ -1401,6 +1534,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Title", 
    "length": 0, 
    "no_copy": 0, 
@@ -1409,6 +1543,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, 
@@ -1426,7 +1561,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-09-05 11:06:18.183458", 
+ "modified": "2016-11-07 05:33:40.371480", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Payment Entry", 
@@ -1443,6 +1578,7 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 1, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1463,6 +1599,7 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 1, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.py b/erpnext/accounts/doctype/payment_entry/payment_entry.py
index 314e814..ef6eec9 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.py
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.py
@@ -60,7 +60,14 @@
 		self.setup_party_account_field()
 		self.make_gl_entries(cancel=1)
 		self.update_advance_paid()
-							
+		self.delink_advance_entry_references()
+	
+	def delink_advance_entry_references(self):
+		for reference in self.references:
+			if reference.reference_doctype in ("Sales Invoice", "Purchase Invoice"):
+				doc = frappe.get_doc(reference.reference_doctype, reference.reference_name)
+				doc.delink_advance_entries(self.name)
+
 	def set_missing_values(self):
 		if self.payment_type == "Internal Transfer":
 			for field in ("party", "party_balance", "total_allocated_amount", 
@@ -672,6 +679,7 @@
 	pe.paid_to_account_currency = party_account_currency if payment_type=="Pay" else bank.account_currency
 	pe.paid_amount = paid_amount
 	pe.received_amount = received_amount
+	pe.allocate_payment_amount = 1
 	
 	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 968ce29..437d695 100644
--- a/erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json
+++ b/erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json
@@ -31,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, 
@@ -58,6 +59,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, 
@@ -84,6 +86,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, 
@@ -109,6 +112,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, 
@@ -119,7 +123,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "columns": 0, 
+   "columns": 2, 
    "fieldname": "total_amount", 
    "fieldtype": "Float", 
    "hidden": 0, 
@@ -135,6 +139,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, 
@@ -145,7 +150,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "columns": 3, 
+   "columns": 2, 
    "fieldname": "outstanding_amount", 
    "fieldtype": "Float", 
    "hidden": 0, 
@@ -161,6 +166,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, 
@@ -171,7 +177,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "columns": 3, 
+   "columns": 2, 
    "fieldname": "allocated_amount", 
    "fieldtype": "Float", 
    "hidden": 0, 
@@ -187,6 +193,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,6 +220,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, 
@@ -230,7 +238,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-08-26 01:59:04.697274", 
+ "modified": "2016-11-14 12:28:51.822341", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Payment Entry Reference", 
diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
index ef617b0..fc4edae 100644
--- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
+++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
@@ -388,7 +388,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 1, 
- "icon": "icon-resize-horizontal", 
+ "icon": "fa fa-resize-horizontal", 
  "idx": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
diff --git a/erpnext/accounts/doctype/payment_request/payment_request.json b/erpnext/accounts/doctype/payment_request/payment_request.json
index 50946c3..b4c3349 100644
--- a/erpnext/accounts/doctype/payment_request/payment_request.json
+++ b/erpnext/accounts/doctype/payment_request/payment_request.json
@@ -10,6 +10,7 @@
  "doctype": "DocType", 
  "document_type": "", 
  "editable_grid": 0, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -23,6 +24,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Series", 
    "length": 0, 
    "no_copy": 1, 
@@ -32,6 +34,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, 
@@ -50,6 +53,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Recipient Message And Payment Details", 
    "length": 0, 
    "no_copy": 0, 
@@ -58,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,6 +82,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Print Format", 
    "length": 0, 
    "no_copy": 0, 
@@ -86,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, 
@@ -104,6 +111,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "To", 
    "length": 0, 
    "no_copy": 0, 
@@ -112,6 +120,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,6 +139,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Subject", 
    "length": 0, 
    "no_copy": 0, 
@@ -138,6 +148,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,6 +167,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -163,6 +175,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,6 +194,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Payment Gateway Account", 
    "length": 0, 
    "no_copy": 0, 
@@ -190,6 +204,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, 
@@ -208,6 +223,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Transaction Currency", 
    "length": 0, 
    "no_copy": 0, 
@@ -217,6 +233,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, 
@@ -236,6 +253,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -245,6 +263,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, 
@@ -264,6 +283,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Status", 
    "length": 0, 
    "no_copy": 0, 
@@ -273,6 +293,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, 
@@ -292,6 +313,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Make Sales Invoice", 
    "length": 0, 
    "no_copy": 0, 
@@ -300,6 +322,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, 
@@ -318,6 +341,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -325,6 +349,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,6 +368,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Message", 
    "length": 0, 
    "no_copy": 0, 
@@ -351,6 +377,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,6 +396,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Message Examples", 
    "length": 0, 
    "no_copy": 0, 
@@ -378,6 +406,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, 
@@ -396,6 +425,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Mute Email", 
    "length": 0, 
    "no_copy": 1, 
@@ -404,6 +434,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, 
@@ -422,6 +453,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "payment_url", 
    "length": 0, 
    "no_copy": 0, 
@@ -430,6 +462,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, 
@@ -449,6 +482,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Payment Gateway Details", 
    "length": 0, 
    "no_copy": 0, 
@@ -457,6 +491,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, 
@@ -475,6 +510,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Payment Gateway", 
    "length": 0, 
    "no_copy": 0, 
@@ -484,6 +520,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, 
@@ -502,6 +539,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Payment Account", 
    "length": 0, 
    "no_copy": 0, 
@@ -511,6 +549,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, 
@@ -529,6 +568,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Reference Details", 
    "length": 0, 
    "no_copy": 0, 
@@ -537,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, 
@@ -555,6 +596,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Reference Doctype", 
    "length": 0, 
    "no_copy": 1, 
@@ -564,6 +606,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, 
@@ -582,6 +625,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Reference Name", 
    "length": 0, 
    "no_copy": 1, 
@@ -591,6 +635,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, 
@@ -609,6 +654,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amended From", 
    "length": 0, 
    "no_copy": 1, 
@@ -617,6 +663,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, 
@@ -634,7 +681,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-09-02 04:07:15.279949", 
+ "modified": "2016-11-07 05:55:42.339193", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Payment Request", 
@@ -651,6 +698,7 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -671,6 +719,7 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
diff --git a/erpnext/accounts/doctype/payment_request/payment_request.py b/erpnext/accounts/doctype/payment_request/payment_request.py
index 84a8e82..26663fd 100644
--- a/erpnext/accounts/doctype/payment_request/payment_request.py
+++ b/erpnext/accounts/doctype/payment_request/payment_request.py
@@ -65,7 +65,7 @@
 		data = frappe.db.get_value(self.reference_doctype, self.reference_name,
 			["company", "customer_name"], as_dict=1)
 		
-		controller = get_integration_controller(self.payment_gateway, setup=False)
+		controller = get_integration_controller(self.payment_gateway)
 		controller.validate_transaction_currency(self.currency)
 		
 		return controller.get_payment_url(**{
diff --git a/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.js b/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.js
index a092e56..c5ded6d 100644
--- a/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.js
+++ b/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.js
@@ -30,7 +30,7 @@
 					group_by_voucher: 0
 				};
 				frappe.set_route("query-report", "General Ledger");
-			}, "icon-table");
+			}, "fa fa-table");
 		}
 	}
 	
diff --git a/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.json b/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.json
index ceb0faa..fb4ca2f 100644
--- a/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.json
+++ b/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.json
@@ -3,27 +3,35 @@
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "PCE/.###", 
+ "beta": 0, 
  "creation": "2013-01-10 16:34:07", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "editable_grid": 0, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "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, 
    "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, 
@@ -35,12 +43,15 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "transaction_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": "Transaction Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -48,7 +59,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": 0, 
    "search_index": 0, 
@@ -59,12 +72,15 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "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": "Posting Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -72,7 +88,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, 
@@ -83,12 +101,15 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "fiscal_year", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Closing Fiscal Year", 
    "length": 0, 
    "no_copy": 0, 
@@ -97,7 +118,9 @@
    "options": "Fiscal Year", 
    "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 +131,15 @@
    "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_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amended From", 
    "length": 0, 
    "no_copy": 1, 
@@ -122,7 +148,9 @@
    "options": "Period Closing Voucher", 
    "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, 
@@ -133,12 +161,15 @@
    "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, 
@@ -147,7 +178,9 @@
    "options": "Company", 
    "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, 
@@ -158,18 +191,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_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, 
@@ -180,13 +218,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "The account head under Liability or Equity, in which Profit/Loss will be booked", 
    "fieldname": "closing_account_head", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Closing Account Head", 
    "length": 0, 
    "no_copy": 0, 
@@ -195,7 +236,9 @@
    "options": "Account", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -206,12 +249,15 @@
    "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_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Remarks", 
    "length": 0, 
    "no_copy": 0, 
@@ -219,7 +265,9 @@
    "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": 1, 
    "search_index": 0, 
@@ -229,15 +277,16 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-file-text", 
+ "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": "2015-11-16 06:29:51.671436", 
+ "modified": "2016-11-07 05:32:15.691681", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Period Closing Voucher", 
@@ -253,6 +302,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -273,6 +323,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -284,10 +335,12 @@
    "write": 1
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "posting_date, fiscal_year", 
  "sort_field": "modified", 
  "sort_order": "DESC", 
- "title_field": "closing_account_head"
+ "title_field": "closing_account_head", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/schools/doctype/scheduling_tool/__init__.py b/erpnext/accounts/doctype/pos_customer_group/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/scheduling_tool/__init__.py
copy to erpnext/accounts/doctype/pos_customer_group/__init__.py
diff --git a/erpnext/accounts/doctype/pos_customer_group/pos_customer_group.json b/erpnext/accounts/doctype/pos_customer_group/pos_customer_group.json
new file mode 100644
index 0000000..4f6a675
--- /dev/null
+++ b/erpnext/accounts/doctype/pos_customer_group/pos_customer_group.json
@@ -0,0 +1,66 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2016-11-16 15:27:16.413449", 
+ "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": "customer_group", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Customer Group", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Customer 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
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2016-11-16 15:27:25.730507", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "POS Customer Group", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/pos_customer_group/pos_customer_group.py b/erpnext/accounts/doctype/pos_customer_group/pos_customer_group.py
new file mode 100644
index 0000000..85c1c9f
--- /dev/null
+++ b/erpnext/accounts/doctype/pos_customer_group/pos_customer_group.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class POSCustomerGroup(Document):
+	pass
diff --git a/erpnext/schools/doctype/scheduling_tool/__init__.py b/erpnext/accounts/doctype/pos_item_group/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/scheduling_tool/__init__.py
copy to erpnext/accounts/doctype/pos_item_group/__init__.py
diff --git a/erpnext/accounts/doctype/pos_item_group/pos_item_group.json b/erpnext/accounts/doctype/pos_item_group/pos_item_group.json
new file mode 100644
index 0000000..b278765
--- /dev/null
+++ b/erpnext/accounts/doctype/pos_item_group/pos_item_group.json
@@ -0,0 +1,66 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2016-11-16 15:26:47.706713", 
+ "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": "item_group", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Item Group", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Item 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
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2016-11-16 15:27:32.263630", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "POS Item Group", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/pos_item_group/pos_item_group.py b/erpnext/accounts/doctype/pos_item_group/pos_item_group.py
new file mode 100644
index 0000000..ceaa57b
--- /dev/null
+++ b/erpnext/accounts/doctype/pos_item_group/pos_item_group.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class POSItemGroup(Document):
+	pass
diff --git a/erpnext/accounts/doctype/pos_profile/pos_profile.js b/erpnext/accounts/doctype/pos_profile/pos_profile.js
index c1aa0c3..bbbab73 100755
--- a/erpnext/accounts/doctype/pos_profile/pos_profile.js
+++ b/erpnext/accounts/doctype/pos_profile/pos_profile.js
@@ -26,6 +26,30 @@
 	});
 });
 
+frappe.ui.form.on("POS Profile", {
+	setup: function(frm) {
+		frm.trigger("get_query_for_groups")
+	},
+
+	get_query_for_groups: function(frm) {
+		frm.fields_dict['item_groups'].grid.get_field('item_group').get_query = function(frm, cdt, cdn) {
+			return{
+				filters: {
+					'is_group': 0
+				}
+			}
+		}
+
+		frm.fields_dict['customer_groups'].grid.get_field('customer_group').get_query = function(frm, cdt, cdn) {
+			return{
+				filters: {
+					'is_group': 0
+				}
+			}
+		}
+	}
+})
+
 // Income Account
 // --------------------------------
 cur_frm.fields_dict['income_account'].get_query = function(doc,cdt,cdn) {
diff --git a/erpnext/accounts/doctype/pos_profile/pos_profile.json b/erpnext/accounts/doctype/pos_profile/pos_profile.json
index 01a87c4..b8404f0 100644
--- a/erpnext/accounts/doctype/pos_profile/pos_profile.json
+++ b/erpnext/accounts/doctype/pos_profile/pos_profile.json
@@ -14,6 +14,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "user", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -21,6 +22,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Applicable for User", 
    "length": 0, 
    "no_copy": 0, 
@@ -31,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, 
@@ -41,6 +44,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "naming_series", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -48,6 +52,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Series", 
    "length": 0, 
    "no_copy": 1, 
@@ -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": 1, 
    "search_index": 0, 
@@ -68,6 +74,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "1", 
    "description": "", 
    "fieldname": "update_stock", 
@@ -77,6 +84,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Update Stock", 
    "length": 0, 
    "no_copy": 0, 
@@ -84,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, 
@@ -94,6 +103,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "update_stock", 
    "fieldname": "warehouse", 
    "fieldtype": "Link", 
@@ -102,6 +112,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Warehouse", 
    "length": 0, 
    "no_copy": 0, 
@@ -112,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, 
@@ -122,6 +134,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "campaign", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -129,6 +142,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Campaign", 
    "length": 0, 
    "no_copy": 0, 
@@ -138,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, 
@@ -148,6 +163,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "ignore_pricing_rule", 
    "fieldtype": "Check", 
    "hidden": 0, 
@@ -155,6 +171,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Ignore Pricing Rule", 
    "length": 0, 
    "no_copy": 0, 
@@ -163,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, 
@@ -173,6 +191,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_4", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -180,6 +199,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -187,6 +207,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, 
@@ -197,6 +218,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "customer", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -204,6 +226,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer", 
    "length": 0, 
    "no_copy": 0, 
@@ -214,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, 
@@ -224,6 +248,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "company", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -231,6 +256,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -241,6 +267,7 @@
    "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, 
@@ -251,6 +278,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "currency", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -258,6 +286,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Currency", 
    "length": 0, 
    "no_copy": 0, 
@@ -268,6 +297,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, 
@@ -278,6 +308,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "allow_partial_payment", 
    "fieldtype": "Check", 
    "hidden": 0, 
@@ -285,6 +316,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Allow Partial Payment", 
    "length": 0, 
    "no_copy": 0, 
@@ -293,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, 
@@ -303,6 +336,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_11", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -310,6 +344,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -317,6 +352,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, 
@@ -327,6 +363,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "payments", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -334,6 +371,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Sales Invoice Payment", 
    "length": 0, 
    "no_copy": 0, 
@@ -343,6 +381,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,7 +392,8 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "section_break_16", 
+   "columns": 0, 
+   "fieldname": "section_break_14", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
@@ -367,6 +407,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, 
@@ -377,6 +418,116 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "item_groups", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Item Groups", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "POS Item 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": "column_break_16", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "customer_groups", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Customer Groups", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "POS Customer 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": "section_break_16", 
+   "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, 
    "default": "Point of Sale", 
    "fieldname": "print_format", 
    "fieldtype": "Link", 
@@ -385,6 +536,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Print Format", 
    "length": 0, 
    "no_copy": 0, 
@@ -394,6 +546,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, 
@@ -404,6 +557,7 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "letter_head", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -411,6 +565,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Letter Head", 
    "length": 0, 
    "no_copy": 0, 
@@ -421,6 +576,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, 
@@ -431,6 +587,7 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "select_print_heading", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -438,6 +595,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Print Heading", 
    "length": 0, 
    "no_copy": 0, 
@@ -448,6 +606,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 +617,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "tc_name", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -465,6 +625,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Terms and Conditions", 
    "length": 0, 
    "no_copy": 0, 
@@ -475,6 +636,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, 
@@ -485,6 +647,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break0", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -492,6 +655,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
@@ -499,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, 
@@ -509,32 +674,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "customer_group", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Customer Group", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Customer Group", 
-   "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, 
    "description": "", 
    "fieldname": "territory", 
    "fieldtype": "Link", 
@@ -543,6 +683,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Territory", 
    "length": 0, 
    "no_copy": 0, 
@@ -553,6 +694,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, 
@@ -563,6 +705,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "selling_price_list", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -570,6 +713,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Price List", 
    "length": 0, 
    "no_copy": 0, 
@@ -580,6 +724,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, 
@@ -590,6 +735,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "apply_discount", 
    "fieldtype": "Check", 
    "hidden": 0, 
@@ -597,6 +743,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Apply Discount", 
    "length": 0, 
    "no_copy": 0, 
@@ -605,6 +752,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, 
@@ -615,6 +763,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "Grand Total", 
    "depends_on": "apply_discount", 
    "fieldname": "apply_discount_on", 
@@ -624,6 +773,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Apply Discount On", 
    "length": 0, 
    "no_copy": 0, 
@@ -633,6 +783,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, 
@@ -643,6 +794,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_19", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -650,6 +802,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -657,6 +810,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, 
@@ -667,6 +821,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "", 
    "fieldname": "write_off_account", 
    "fieldtype": "Link", 
@@ -675,6 +830,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Write Off Account", 
    "length": 0, 
    "no_copy": 0, 
@@ -684,6 +840,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, 
@@ -694,6 +851,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "write_off_cost_center", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -701,6 +859,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Write Off Cost Center", 
    "length": 0, 
    "no_copy": 0, 
@@ -710,6 +869,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, 
@@ -720,6 +880,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "account_for_change_amount", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -727,6 +888,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Account for Change Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -736,6 +898,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, 
@@ -746,6 +909,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "taxes_and_charges", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -753,6 +917,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Taxes and Charges", 
    "length": 0, 
    "no_copy": 0, 
@@ -763,6 +928,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, 
@@ -773,6 +939,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_23", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -780,6 +947,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -787,6 +955,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, 
@@ -797,6 +966,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "income_account", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -804,6 +974,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Income Account", 
    "length": 0, 
    "no_copy": 0, 
@@ -814,6 +985,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, 
@@ -824,6 +996,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:cint(sys_defaults.auto_accounting_for_stock)", 
    "fieldname": "expense_account", 
    "fieldtype": "Link", 
@@ -832,6 +1005,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Expense Account", 
    "length": 0, 
    "no_copy": 0, 
@@ -840,6 +1014,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, 
@@ -850,6 +1025,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "cost_center", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -857,6 +1033,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Cost Center", 
    "length": 0, 
    "no_copy": 0, 
@@ -867,6 +1044,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, 
@@ -876,7 +1054,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-cog", 
+ "icon": "fa fa-cog", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
@@ -885,7 +1063,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-08-17 15:12:56.713748", 
+ "modified": "2016-11-17 05:19:52.335433", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "POS Profile", 
@@ -901,6 +1079,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -921,6 +1100,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
diff --git a/erpnext/accounts/doctype/pos_profile/pos_profile.py b/erpnext/accounts/doctype/pos_profile/pos_profile.py
index 5f4d5bc..ef497bf 100644
--- a/erpnext/accounts/doctype/pos_profile/pos_profile.py
+++ b/erpnext/accounts/doctype/pos_profile/pos_profile.py
@@ -13,6 +13,7 @@
 	def validate(self):
 		self.check_for_duplicate()
 		self.validate_all_link_fields()
+		self.validate_duplicate_groups()
 
 	def check_for_duplicate(self):
 		res = frappe.db.sql("""select name, user from `tabPOS Profile`
@@ -37,6 +38,16 @@
 						"company": self.company, "name": link_dn}):
 					frappe.throw(_("{0} does not belong to Company {1}").format(link_dn, self.company))
 
+	def validate_duplicate_groups(self):
+		item_groups = [d.item_group for d in self.item_groups]
+		customer_groups = [d.customer_group for d in self.customer_groups]
+
+		if len(item_groups) != len(set(item_groups)):
+			frappe.throw(_("Duplicate item group found in the item group table"), title = "Duplicate Item Group")
+
+		if len(customer_groups) != len(set(customer_groups)):
+			frappe.throw(_("Duplicate customer group found in the cutomer group table"), title = "Duplicate Customer Group")
+
 	def before_save(self):
 		set_account_for_mode_of_payment(self)
 
diff --git a/erpnext/accounts/doctype/pos_profile/test_pos_profile.py b/erpnext/accounts/doctype/pos_profile/test_pos_profile.py
index 62274a3..9c6a114 100644
--- a/erpnext/accounts/doctype/pos_profile/test_pos_profile.py
+++ b/erpnext/accounts/doctype/pos_profile/test_pos_profile.py
@@ -5,8 +5,47 @@
 
 import frappe
 import unittest
-
-# test_records = frappe.get_test_records('POS Profile')
+from erpnext.stock.get_item_details import get_pos_profile
+from erpnext.accounts.doctype.sales_invoice.pos import get_items_list, get_customers_list
 
 class TestPOSProfile(unittest.TestCase):
-	pass
+	def test_pos_profile(self):
+		make_pos_profile()
+
+		pos_profile = get_pos_profile("_Test Company") or {}
+		if pos_profile:
+			doc = frappe.get_doc("POS Profile", pos_profile.get("name"))
+			doc.append('item_groups', {'item_group': '_Test Item Group'})
+			doc.append('customer_groups', {'customer_group': '_Test Customer Group'})
+			doc.save()
+
+			items = get_items_list(doc)
+			customers = get_customers_list(doc)
+
+			products_count = frappe.db.sql(""" select count(name) from tabItem where item_group = '_Test Item Group'""", as_list=1)
+			customers_count = frappe.db.sql(""" select count(name) from tabCustomer where customer_group = '_Test Customer Group'""")
+
+			self.assertEquals(len(items), products_count[0][0])
+			self.assertEquals(len(customers), customers_count[0][0])
+
+		frappe.db.sql("delete from `tabPOS Profile`")
+
+def make_pos_profile():
+	pos_profile = frappe.get_doc({
+		"company": "_Test Company",
+		"cost_center": "_Test Cost Center - _TC",
+		"currency": "INR",
+		"doctype": "POS Profile",
+		"expense_account": "_Test Account Cost for Goods Sold - _TC",
+		"income_account": "Sales - _TC",
+		"name": "_Test POS Profile",
+		"naming_series": "_T-POS Profile-",
+		"selling_price_list": "_Test Price List",
+		"territory": "_Test Territory",
+		"warehouse": "_Test Warehouse - _TC",
+		"write_off_account": "_Test Write Off - _TC",
+		"write_off_cost_center": "_Test Write Off Cost Center - _TC"
+	})
+
+	if not frappe.db.exists("POS Profile", "_Test POS Profile"):
+		pos_profile.insert()
\ 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 4c22b0d..5a3e651 100644
--- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.js
+++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.js
@@ -4,7 +4,7 @@
 frappe.ui.form.on("Pricing Rule", "refresh", function(frm) {
 	var help_content = ['<table class="table table-bordered" style="background-color: #f9f9f9;">',
 		'<tr><td>',
-			'<h4><i class="icon-hand-right"></i> ',
+			'<h4><i class="fa fa-hand-right"></i> ',
 				__('Notes'),
 			':</h4>',
 			'<ul>',
@@ -23,7 +23,7 @@
 			'</ul>',
 		'</td></tr>',
 		'<tr><td>',
-			'<h4><i class="icon-question-sign"></i> ',
+			'<h4><i class="fa fa-question-sign"></i> ',
 				__('How Pricing Rule is applied?'),
 			'</h4>',
 			'<ol>',
diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.json b/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
index 23fc76d..fdf3db9 100644
--- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
+++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
@@ -3,16 +3,19 @@
  "allow_import": 1, 
  "allow_rename": 1, 
  "autoname": "field:title", 
+ "beta": 0, 
  "creation": "2014-02-21 15:02:51", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "", 
+ "editable_grid": 0, 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "applicability_section", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -20,6 +23,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
@@ -27,6 +31,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, 
@@ -37,6 +42,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "title", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -44,6 +50,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Title", 
    "length": 0, 
    "no_copy": 1, 
@@ -52,6 +59,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, 
@@ -62,6 +70,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "Item Code", 
    "fieldname": "apply_on", 
    "fieldtype": "Select", 
@@ -70,6 +79,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Apply On", 
    "length": 0, 
    "no_copy": 0, 
@@ -78,6 +88,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, 
@@ -88,6 +99,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.apply_on==\"Item Code\"", 
    "fieldname": "item_code", 
    "fieldtype": "Link", 
@@ -96,6 +108,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Item Code", 
    "length": 0, 
    "no_copy": 0, 
@@ -104,6 +117,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 +128,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.apply_on==\"Brand\"", 
    "fieldname": "brand", 
    "fieldtype": "Link", 
@@ -122,6 +137,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Brand", 
    "length": 0, 
    "no_copy": 0, 
@@ -130,6 +146,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -140,6 +157,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.apply_on==\"Item Group\"", 
    "fieldname": "item_group", 
    "fieldtype": "Link", 
@@ -148,6 +166,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Item Group", 
    "length": 0, 
    "no_copy": 0, 
@@ -156,6 +175,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -166,6 +186,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_7", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -173,6 +194,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -180,6 +202,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, 
@@ -190,6 +213,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "Higher the number, higher the priority", 
    "fieldname": "priority", 
    "fieldtype": "Select", 
@@ -198,6 +222,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Priority", 
    "length": 0, 
    "no_copy": 0, 
@@ -206,6 +231,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -216,6 +242,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "disable", 
    "fieldtype": "Check", 
    "hidden": 0, 
@@ -223,6 +250,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Disable", 
    "length": 0, 
    "no_copy": 0, 
@@ -230,6 +258,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, 
@@ -240,6 +269,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_7", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -247,6 +277,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -254,6 +285,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 +296,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "selling", 
    "fieldtype": "Check", 
    "hidden": 0, 
@@ -271,6 +304,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Selling", 
    "length": 0, 
    "no_copy": 0, 
@@ -278,6 +312,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 +323,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "buying", 
    "fieldtype": "Check", 
    "hidden": 0, 
@@ -295,6 +331,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Buying", 
    "length": 0, 
    "no_copy": 0, 
@@ -302,6 +339,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 +350,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_11", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -319,6 +358,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -326,6 +366,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, 
@@ -336,6 +377,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval: doc.buying || doc.selling", 
    "fieldname": "applicable_for", 
    "fieldtype": "Select", 
@@ -344,6 +386,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Applicable For", 
    "length": 0, 
    "no_copy": 0, 
@@ -352,6 +395,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 +406,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.applicable_for==\"Customer\"", 
    "fieldname": "customer", 
    "fieldtype": "Link", 
@@ -370,6 +415,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer", 
    "length": 0, 
    "no_copy": 0, 
@@ -378,6 +424,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, 
@@ -388,6 +435,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.applicable_for==\"Customer Group\"", 
    "fieldname": "customer_group", 
    "fieldtype": "Link", 
@@ -396,6 +444,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer Group", 
    "length": 0, 
    "no_copy": 0, 
@@ -404,6 +453,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, 
@@ -414,6 +464,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.applicable_for==\"Territory\"", 
    "fieldname": "territory", 
    "fieldtype": "Link", 
@@ -422,6 +473,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Territory", 
    "length": 0, 
    "no_copy": 0, 
@@ -430,6 +482,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,6 +493,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.applicable_for==\"Sales Partner\"", 
    "fieldname": "sales_partner", 
    "fieldtype": "Link", 
@@ -448,6 +502,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Sales Partner", 
    "length": 0, 
    "no_copy": 0, 
@@ -456,6 +511,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, 
@@ -466,6 +522,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.applicable_for==\"Campaign\"", 
    "fieldname": "campaign", 
    "fieldtype": "Link", 
@@ -474,6 +531,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Campaign", 
    "length": 0, 
    "no_copy": 0, 
@@ -482,6 +540,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, 
@@ -492,6 +551,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.applicable_for==\"Supplier\"", 
    "fieldname": "supplier", 
    "fieldtype": "Link", 
@@ -500,6 +560,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Supplier", 
    "length": 0, 
    "no_copy": 0, 
@@ -508,6 +569,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, 
@@ -518,6 +580,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.applicable_for==\"Supplier Type\"", 
    "fieldname": "supplier_type", 
    "fieldtype": "Link", 
@@ -526,6 +589,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Supplier Type", 
    "length": 0, 
    "no_copy": 0, 
@@ -534,6 +598,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, 
@@ -544,6 +609,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_19", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -551,6 +617,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -558,6 +625,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, 
@@ -568,6 +636,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "min_qty", 
    "fieldtype": "Float", 
    "hidden": 0, 
@@ -575,6 +644,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Min Qty", 
    "length": 0, 
    "no_copy": 0, 
@@ -582,6 +652,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, 
@@ -592,6 +663,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_21", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -599,6 +671,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -606,6 +679,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, 
@@ -616,6 +690,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "max_qty", 
    "fieldtype": "Float", 
    "hidden": 0, 
@@ -623,6 +698,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Max Qty", 
    "length": 0, 
    "no_copy": 0, 
@@ -630,6 +706,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, 
@@ -640,6 +717,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_23", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -647,6 +725,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -654,6 +733,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, 
@@ -664,6 +744,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "Today", 
    "fieldname": "valid_from", 
    "fieldtype": "Date", 
@@ -672,6 +753,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Valid From", 
    "length": 0, 
    "no_copy": 0, 
@@ -679,6 +761,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, 
@@ -689,6 +772,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "valid_upto", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -696,6 +780,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Valid Upto", 
    "length": 0, 
    "no_copy": 0, 
@@ -703,6 +788,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,6 +799,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "col_break1", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -720,12 +807,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, 
@@ -736,6 +825,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "company", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -743,6 +833,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -751,6 +842,7 @@
    "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, 
@@ -761,6 +853,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval: doc.selling == 1", 
    "fieldname": "margin", 
    "fieldtype": "Section Break", 
@@ -769,6 +862,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Margin", 
    "length": 0, 
    "no_copy": 0, 
@@ -777,6 +871,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, 
@@ -787,6 +882,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "Percentage", 
    "fieldname": "margin_type", 
    "fieldtype": "Select", 
@@ -795,6 +891,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Margin Type", 
    "length": 0, 
    "no_copy": 0, 
@@ -804,6 +901,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, 
@@ -814,6 +912,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_33", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -821,6 +920,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -828,6 +928,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, 
@@ -838,6 +939,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "0", 
    "depends_on": "eval:doc.margin_type", 
    "fieldname": "margin_rate_or_amount", 
@@ -847,6 +949,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Margin Rate or Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -855,6 +958,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, 
@@ -865,6 +969,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "price_discount_section", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -872,6 +977,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
@@ -879,6 +985,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, 
@@ -889,6 +996,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "Discount Percentage", 
    "fieldname": "price_or_discount", 
    "fieldtype": "Select", 
@@ -897,6 +1005,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Price or Discount", 
    "length": 0, 
    "no_copy": 0, 
@@ -905,6 +1014,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, 
@@ -915,6 +1025,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "col_break2", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -922,12 +1033,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, 
@@ -938,6 +1051,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.price_or_discount==\"Price\"", 
    "fieldname": "price", 
    "fieldtype": "Float", 
@@ -946,6 +1060,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Price", 
    "length": 0, 
    "no_copy": 0, 
@@ -953,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, 
@@ -963,6 +1079,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.price_or_discount==\"Discount Percentage\"", 
    "fieldname": "discount_percentage", 
    "fieldtype": "Float", 
@@ -971,6 +1088,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Discount on Price List Rate (%)", 
    "length": 0, 
    "no_copy": 0, 
@@ -978,6 +1096,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, 
@@ -988,6 +1107,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.price_or_discount==\"Discount Percentage\"", 
    "fieldname": "for_price_list", 
    "fieldtype": "Link", 
@@ -996,6 +1116,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "For Price List", 
    "length": 0, 
    "no_copy": 0, 
@@ -1004,6 +1125,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, 
@@ -1014,6 +1136,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "help_section", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -1021,6 +1144,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
@@ -1029,6 +1153,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, 
@@ -1039,6 +1164,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "pricing_rule_help", 
    "fieldtype": "HTML", 
    "hidden": 0, 
@@ -1046,6 +1172,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Pricing Rule Help", 
    "length": 0, 
    "no_copy": 0, 
@@ -1053,6 +1180,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, 
@@ -1062,15 +1190,16 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-gift", 
+ "icon": "fa fa-gift", 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-03-16 17:35:25.935271", 
+ "modified": "2016-11-07 05:19:31.478456", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Pricing Rule", 
@@ -1086,6 +1215,7 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 1, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -1106,6 +1236,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -1126,6 +1257,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -1146,6 +1278,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -1166,6 +1299,7 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 1, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -1177,9 +1311,11 @@
    "write": 1
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
- "title_field": ""
+ "title_field": "", 
+ "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 b4fe148..3476ddd 100644
--- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
+++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
@@ -11,6 +11,7 @@
 from frappe.utils import flt, cint
 from frappe.model.document import Document
 
+
 class MultiplePricingRuleConflict(frappe.ValidationError): pass
 
 class PricingRule(Document):
@@ -113,8 +114,19 @@
 		args_copy = copy.deepcopy(args)
 		args_copy.update(item)
 		out.append(get_pricing_rule_for_item(args_copy))
-
+		out.append(get_serial_no_for_item(args_copy))
 	return out
+	
+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"):
+		item_details.serial_no = get_serial_no(args)
+	return item_details
 
 def get_pricing_rule_for_item(args):
 	if args.get("parenttype") == "Material Request": return {}
@@ -165,6 +177,13 @@
 			})
 		else:
 			item_details.discount_percentage = pricing_rule.discount_percentage
+	elif args.get('pricing_rule'):
+		if frappe.db.get_value('Pricing Rule', args.get('pricing_rule'), 'price_or_discount') == 'Discount Percentage':
+			item_details.discount_percentage = 0.0
+
+		item_details.margin_rate_or_amount = 0.0
+		item_details.margin_type = None
+
 	return item_details
 
 def get_pricing_rules(args):
@@ -270,7 +289,7 @@
 			pricing_rules = filter(lambda x: x.for_price_list==args.price_list, pricing_rules) \
 				or pricing_rules
 
-	if len(pricing_rules) > 1:
+	if len(pricing_rules) > 1 and not args.for_shopping_cart:
 		frappe.throw(_("Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}")
 			.format("\n".join([d.name for d in pricing_rules])), MultiplePricingRuleConflict)
 	elif pricing_rules:
@@ -304,4 +323,4 @@
 	elif args.customer:
 		args.transaction_type = "selling"
 	else:
-		args.transaction_type = "buying"
+		args.transaction_type = "buying"
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
index ccdd87f..b6378f1 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
@@ -8,7 +8,7 @@
 erpnext.accounts.PurchaseInvoice = erpnext.buying.BuyingController.extend({
 	onload: function() {
 		this._super();
-
+		
 		if(!this.frm.doc.__islocal) {
 			// show credit_to in print format
 			if(!this.frm.doc.supplier && this.frm.doc.credit_to) {
@@ -32,7 +32,7 @@
 		if(doc.update_stock==1 && doc.docstatus==1) {
 			this.show_stock_ledger();
 		}
-
+		
 		if(!doc.is_return && doc.docstatus==1) {
 			if(doc.outstanding_amount != 0) {
 				this.frm.add_custom_button(__('Payment'), this.make_payment_entry, __("Make"));
@@ -198,7 +198,7 @@
 	item_fields_stock = ['warehouse_section', 'received_qty', 'rejected_qty'];
 
 	cur_frm.fields_dict['items'].grid.set_column_disp(item_fields_stock,
-		(cint(doc.update_stock)==1 ? true : false));
+		(cint(doc.update_stock)==1 || cint(doc.is_return)==1 ? true : false));
 
 	cur_frm.refresh_fields();
 }
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
index 836a2e0..2791d6f 100755
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
@@ -15,6 +15,7 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "{supplier_name}", 
    "fieldname": "title", 
    "fieldtype": "Data", 
@@ -23,6 +24,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Title", 
    "length": 0, 
    "no_copy": 1, 
@@ -31,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, 
@@ -41,6 +44,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "naming_series", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -48,6 +52,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Series", 
    "length": 0, 
    "no_copy": 1, 
@@ -58,6 +63,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, 
@@ -68,6 +74,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "supplier", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -75,6 +82,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Supplier", 
    "length": 0, 
    "no_copy": 0, 
@@ -85,6 +93,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, 
@@ -95,6 +104,7 @@
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "supplier", 
    "fieldname": "supplier_name", 
    "fieldtype": "Data", 
@@ -103,6 +113,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Supplier Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -112,6 +123,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, 
@@ -122,6 +134,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "", 
    "fieldname": "bill_no", 
    "fieldtype": "Data", 
@@ -130,6 +143,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Supplier Invoice No", 
    "length": 0, 
    "no_copy": 0, 
@@ -139,6 +153,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, 
@@ -149,6 +164,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "is_paid", 
    "fieldtype": "Check", 
    "hidden": 0, 
@@ -156,6 +172,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Is Paid", 
    "length": 0, 
    "no_copy": 0, 
@@ -164,6 +181,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, 
@@ -174,6 +192,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "0", 
    "fieldname": "is_return", 
    "fieldtype": "Check", 
@@ -182,14 +201,16 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Is Return", 
    "length": 0, 
-   "no_copy": 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, 
@@ -200,6 +221,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break1", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -207,6 +229,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
@@ -214,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, 
@@ -225,6 +249,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "Today", 
    "fieldname": "posting_date", 
    "fieldtype": "Date", 
@@ -233,6 +258,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -242,6 +268,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, 
@@ -252,6 +279,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "due_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -259,6 +287,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Due Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -268,6 +297,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, 
@@ -278,6 +308,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "bill_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -285,6 +316,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Supplier Invoice Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -294,6 +326,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, 
@@ -304,6 +337,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "amended_from", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -311,6 +345,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amended From", 
    "length": 0, 
    "no_copy": 1, 
@@ -321,6 +356,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, 
@@ -331,6 +367,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "company", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -338,6 +375,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -346,6 +384,7 @@
    "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, 
@@ -356,6 +395,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "is_return", 
    "fieldname": "return_against", 
    "fieldtype": "Link", 
@@ -364,15 +404,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Return Against Purchase Invoice", 
    "length": 0, 
-   "no_copy": 0, 
+   "no_copy": 1, 
    "options": "Purchase Invoice", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -383,6 +425,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
+   "columns": 0, 
    "fieldname": "section_addresses", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -390,6 +433,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Address and Contact", 
    "length": 0, 
    "no_copy": 0, 
@@ -398,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, 
@@ -408,6 +453,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "supplier_address", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -415,6 +461,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Select Supplier Address", 
    "length": 0, 
    "no_copy": 0, 
@@ -423,6 +470,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, 
@@ -433,6 +481,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "contact_person", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -440,6 +489,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Contact Person", 
    "length": 0, 
    "no_copy": 0, 
@@ -448,6 +498,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, 
@@ -458,6 +509,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "", 
    "fieldname": "address_display", 
    "fieldtype": "Small Text", 
@@ -466,6 +518,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Address", 
    "length": 0, 
    "no_copy": 0, 
@@ -473,6 +526,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, 
@@ -483,6 +537,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "contact_display", 
    "fieldtype": "Small Text", 
    "hidden": 0, 
@@ -490,6 +545,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Contact", 
    "length": 0, 
    "no_copy": 0, 
@@ -497,6 +553,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, 
@@ -507,6 +564,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "contact_mobile", 
    "fieldtype": "Small Text", 
    "hidden": 0, 
@@ -514,6 +572,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Mobile No", 
    "length": 0, 
    "no_copy": 0, 
@@ -521,6 +580,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, 
@@ -531,6 +591,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "contact_email", 
    "fieldtype": "Small Text", 
    "hidden": 0, 
@@ -538,6 +599,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Contact Email", 
    "length": 0, 
    "no_copy": 0, 
@@ -545,6 +607,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, 
@@ -555,6 +618,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "col_break_address", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -562,6 +626,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -569,6 +634,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, 
@@ -579,6 +645,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "", 
    "fieldname": "shipping_address", 
    "fieldtype": "Link", 
@@ -587,6 +654,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Select Shipping Address", 
    "length": 0, 
    "no_copy": 0, 
@@ -596,6 +664,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, 
@@ -606,6 +675,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "shipping_address_display", 
    "fieldtype": "Small Text", 
    "hidden": 0, 
@@ -613,6 +683,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Shipping Address", 
    "length": 0, 
    "no_copy": 0, 
@@ -621,6 +692,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, 
@@ -631,6 +703,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
+   "columns": 0, 
    "fieldname": "currency_and_price_list", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -638,14 +711,16 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Currency and Price List", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "icon-tag", 
+   "options": "fa fa-tag", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -656,6 +731,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "currency", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -663,6 +739,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Currency", 
    "length": 0, 
    "no_copy": 0, 
@@ -673,6 +750,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, 
@@ -683,6 +761,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "", 
    "fieldname": "conversion_rate", 
    "fieldtype": "Float", 
@@ -691,6 +770,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Exchange Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -701,6 +781,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, 
@@ -711,6 +792,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break2", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -718,12 +800,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, 
@@ -734,6 +818,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "buying_price_list", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -741,6 +826,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Price List", 
    "length": 0, 
    "no_copy": 0, 
@@ -749,6 +835,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, 
@@ -759,6 +846,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "price_list_currency", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -766,6 +854,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Price List Currency", 
    "length": 0, 
    "no_copy": 0, 
@@ -774,6 +863,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, 
@@ -784,6 +874,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "plc_conversion_rate", 
    "fieldtype": "Float", 
    "hidden": 0, 
@@ -791,6 +882,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Price List Exchange Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -799,6 +891,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, 
@@ -809,6 +902,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "ignore_pricing_rule", 
    "fieldtype": "Check", 
    "hidden": 0, 
@@ -816,6 +910,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Ignore Pricing Rule", 
    "length": 0, 
    "no_copy": 1, 
@@ -823,6 +918,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, 
@@ -833,6 +929,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "items_section", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -840,15 +937,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-shopping-cart", 
+   "options": "fa fa-shopping-cart", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -859,6 +958,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "0", 
    "fieldname": "update_stock", 
    "fieldtype": "Check", 
@@ -867,6 +967,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Update Stock", 
    "length": 0, 
    "no_copy": 0, 
@@ -875,6 +976,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, 
@@ -885,6 +987,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "items", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -892,6 +995,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Items", 
    "length": 0, 
    "no_copy": 0, 
@@ -902,6 +1006,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, 
@@ -912,6 +1017,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_26", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -919,12 +1025,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, 
@@ -935,6 +1043,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "base_total", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -942,6 +1051,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -951,6 +1061,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, 
@@ -961,6 +1072,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "", 
    "fieldname": "base_net_total", 
    "fieldtype": "Currency", 
@@ -969,6 +1081,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Net Total (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -979,6 +1092,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, 
@@ -989,6 +1103,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_28", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -996,12 +1111,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, 
@@ -1012,6 +1129,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "total", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -1019,6 +1137,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total", 
    "length": 0, 
    "no_copy": 0, 
@@ -1028,6 +1147,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, 
@@ -1038,6 +1158,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "net_total", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -1045,6 +1166,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Net Total", 
    "length": 0, 
    "no_copy": 0, 
@@ -1055,6 +1177,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, 
@@ -1065,6 +1188,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "taxes_section", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -1072,15 +1196,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-money", 
+   "options": "fa fa-money", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1091,6 +1217,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "taxes_and_charges", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -1098,6 +1225,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Taxes and Charges", 
    "length": 0, 
    "no_copy": 0, 
@@ -1108,6 +1236,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, 
@@ -1118,6 +1247,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "taxes", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -1125,6 +1255,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Purchase Taxes and Charges", 
    "length": 0, 
    "no_copy": 0, 
@@ -1135,6 +1266,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, 
@@ -1145,6 +1277,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "other_charges_calculation", 
    "fieldtype": "HTML", 
    "hidden": 0, 
@@ -1152,6 +1285,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Taxes and Charges Calculation", 
    "length": 0, 
    "no_copy": 0, 
@@ -1160,6 +1294,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, 
@@ -1170,6 +1305,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "totals", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -1177,15 +1313,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-money", 
+   "options": "fa fa-money", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1196,6 +1334,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "base_taxes_and_charges_added", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -1203,6 +1342,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Taxes and Charges Added (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -1213,6 +1353,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, 
@@ -1223,6 +1364,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "base_taxes_and_charges_deducted", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -1230,6 +1372,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Taxes and Charges Deducted (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -1240,6 +1383,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, 
@@ -1250,6 +1394,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "base_total_taxes_and_charges", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -1257,6 +1402,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Taxes and Charges (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -1267,6 +1413,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, 
@@ -1277,6 +1424,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_40", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -1284,6 +1432,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -1291,6 +1440,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, 
@@ -1301,6 +1451,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "taxes_and_charges_added", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -1308,6 +1459,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Taxes and Charges Added", 
    "length": 0, 
    "no_copy": 0, 
@@ -1318,6 +1470,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, 
@@ -1328,6 +1481,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "taxes_and_charges_deducted", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -1335,6 +1489,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Taxes and Charges Deducted", 
    "length": 0, 
    "no_copy": 0, 
@@ -1345,6 +1500,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, 
@@ -1355,6 +1511,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "total_taxes_and_charges", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -1362,6 +1519,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Taxes and Charges", 
    "length": 0, 
    "no_copy": 0, 
@@ -1371,6 +1529,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, 
@@ -1382,6 +1541,7 @@
    "bold": 0, 
    "collapsible": 1, 
    "collapsible_depends_on": "discount_amount", 
+   "columns": 0, 
    "fieldname": "section_break_44", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -1389,6 +1549,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Additional Discount", 
    "length": 0, 
    "no_copy": 0, 
@@ -1397,6 +1558,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, 
@@ -1407,6 +1569,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "Grand Total", 
    "fieldname": "apply_discount_on", 
    "fieldtype": "Select", 
@@ -1415,6 +1578,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Apply Additional Discount On", 
    "length": 0, 
    "no_copy": 0, 
@@ -1424,6 +1588,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, 
@@ -1434,6 +1599,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "base_discount_amount", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -1441,6 +1607,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Additional Discount Amount (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -1450,6 +1617,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, 
@@ -1460,6 +1628,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_46", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -1467,6 +1636,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -1474,6 +1644,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, 
@@ -1484,6 +1655,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "additional_discount_percentage", 
    "fieldtype": "Float", 
    "hidden": 0, 
@@ -1491,6 +1663,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Additional Discount Percentage", 
    "length": 0, 
    "no_copy": 0, 
@@ -1499,6 +1672,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, 
@@ -1509,6 +1683,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "discount_amount", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -1516,6 +1691,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Additional Discount Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -1525,6 +1701,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, 
@@ -1535,6 +1712,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_49", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -1542,6 +1720,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -1549,6 +1728,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, 
@@ -1559,6 +1739,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "base_grand_total", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -1566,6 +1747,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Grand Total (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -1576,6 +1758,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, 
@@ -1586,6 +1769,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "", 
    "fieldname": "base_in_words", 
    "fieldtype": "Data", 
@@ -1594,6 +1778,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "In Words (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -1603,6 +1788,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, 
@@ -1613,6 +1799,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break8", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -1620,6 +1807,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
@@ -1627,6 +1815,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, 
@@ -1638,6 +1827,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "grand_total", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -1645,6 +1835,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Grand Total", 
    "length": 0, 
    "no_copy": 0, 
@@ -1655,6 +1846,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, 
@@ -1665,6 +1857,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "in_words", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -1672,6 +1865,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "In Words", 
    "length": 0, 
    "no_copy": 0, 
@@ -1681,6 +1875,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, 
@@ -1691,6 +1886,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "total_advance", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -1698,6 +1894,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Advance", 
    "length": 0, 
    "no_copy": 1, 
@@ -1708,6 +1905,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, 
@@ -1718,6 +1916,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "outstanding_amount", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -1725,6 +1924,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Outstanding Amount", 
    "length": 0, 
    "no_copy": 1, 
@@ -1735,6 +1935,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, 
@@ -1746,6 +1947,7 @@
    "bold": 0, 
    "collapsible": 1, 
    "collapsible_depends_on": "paid_amount", 
+   "columns": 0, 
    "depends_on": "eval:doc.is_paid===1||(doc.advances && doc.advances.length>0)", 
    "fieldname": "payments_section", 
    "fieldtype": "Section Break", 
@@ -1754,6 +1956,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Payments", 
    "length": 0, 
    "no_copy": 0, 
@@ -1762,6 +1965,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, 
@@ -1772,6 +1976,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "mode_of_payment", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -1779,6 +1984,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Mode of Payment", 
    "length": 0, 
    "no_copy": 0, 
@@ -1788,6 +1994,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, 
@@ -1798,6 +2005,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "cash_bank_account", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -1805,6 +2013,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Cash/Bank Account", 
    "length": 0, 
    "no_copy": 0, 
@@ -1814,6 +2023,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, 
@@ -1824,6 +2034,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "col_br_payments", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -1831,6 +2042,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -1838,6 +2050,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, 
@@ -1848,6 +2061,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "is_paid", 
    "fieldname": "paid_amount", 
    "fieldtype": "Currency", 
@@ -1856,6 +2070,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Paid Amount", 
    "length": 0, 
    "no_copy": 1, 
@@ -1865,6 +2080,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, 
@@ -1875,6 +2091,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "base_paid_amount", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -1882,6 +2099,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Paid Amount (Company Currency)", 
    "length": 0, 
    "no_copy": 1, 
@@ -1891,6 +2109,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, 
@@ -1902,6 +2121,7 @@
    "bold": 0, 
    "collapsible": 1, 
    "collapsible_depends_on": "write_off_amount", 
+   "columns": 0, 
    "depends_on": "grand_total", 
    "fieldname": "write_off", 
    "fieldtype": "Section Break", 
@@ -1910,6 +2130,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Write Off", 
    "length": 0, 
    "no_copy": 0, 
@@ -1918,6 +2139,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, 
@@ -1928,6 +2150,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "write_off_amount", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -1935,6 +2158,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Write Off Amount", 
    "length": 0, 
    "no_copy": 1, 
@@ -1943,6 +2167,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, 
@@ -1953,6 +2178,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "base_write_off_amount", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -1960,6 +2186,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Write Off Amount (Company Currency)", 
    "length": 0, 
    "no_copy": 1, 
@@ -1969,6 +2196,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, 
@@ -1979,6 +2207,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_61", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -1986,6 +2215,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -1993,6 +2223,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, 
@@ -2003,6 +2234,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:flt(doc.write_off_amount)!=0", 
    "fieldname": "write_off_account", 
    "fieldtype": "Link", 
@@ -2011,6 +2243,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Write Off Account", 
    "length": 0, 
    "no_copy": 0, 
@@ -2019,6 +2252,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, 
@@ -2029,6 +2263,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:flt(doc.write_off_amount)!=0", 
    "fieldname": "write_off_cost_center", 
    "fieldtype": "Link", 
@@ -2037,6 +2272,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Write Off Cost Center", 
    "length": 0, 
    "no_copy": 0, 
@@ -2045,6 +2281,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, 
@@ -2056,6 +2293,7 @@
    "bold": 0, 
    "collapsible": 1, 
    "collapsible_depends_on": "advances", 
+   "columns": 0, 
    "fieldname": "advances_section", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -2063,15 +2301,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Advance Payments", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-money", 
+   "options": "fa fa-money", 
    "permlevel": 0, 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -2082,6 +2322,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "get_advances", 
    "fieldtype": "Button", 
    "hidden": 0, 
@@ -2089,6 +2330,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Get Advances Paid", 
    "length": 0, 
    "no_copy": 0, 
@@ -2098,6 +2340,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, 
@@ -2108,6 +2351,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "advances", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -2115,6 +2359,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Advances", 
    "length": 0, 
    "no_copy": 1, 
@@ -2125,6 +2370,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, 
@@ -2136,6 +2382,7 @@
    "bold": 0, 
    "collapsible": 1, 
    "collapsible_depends_on": "terms", 
+   "columns": 0, 
    "fieldname": "terms_section_break", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -2143,14 +2390,16 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Terms and Conditions", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "icon-legal", 
+   "options": "fa fa-legal", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -2161,6 +2410,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "tc_name", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -2168,6 +2418,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Terms", 
    "length": 0, 
    "no_copy": 0, 
@@ -2176,6 +2427,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, 
@@ -2186,6 +2438,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "terms", 
    "fieldtype": "Text Editor", 
    "hidden": 0, 
@@ -2193,6 +2446,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Terms and Conditions1", 
    "length": 0, 
    "no_copy": 0, 
@@ -2200,6 +2454,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, 
@@ -2210,6 +2465,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "raw_materials_supplied", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -2217,6 +2473,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Raw Materials Supplied", 
    "length": 0, 
    "no_copy": 0, 
@@ -2225,6 +2482,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, 
@@ -2235,6 +2493,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "No", 
    "fieldname": "is_subcontracted", 
    "fieldtype": "Select", 
@@ -2243,6 +2502,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Raw Materials Supplied", 
    "length": 0, 
    "no_copy": 0, 
@@ -2252,6 +2512,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, 
@@ -2262,6 +2523,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "supplier_warehouse", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -2269,6 +2531,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Supplier Warehouse", 
    "length": 0, 
    "no_copy": 1, 
@@ -2279,6 +2542,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "50px", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -2290,6 +2554,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "supplied_items", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -2297,6 +2562,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Supplied Items", 
    "length": 0, 
    "no_copy": 0, 
@@ -2306,6 +2572,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, 
@@ -2316,6 +2583,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
+   "columns": 0, 
    "fieldname": "printing_settings", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -2323,6 +2591,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Printing Settings", 
    "length": 0, 
    "no_copy": 0, 
@@ -2331,6 +2600,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, 
@@ -2341,6 +2611,7 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "letter_head", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -2348,6 +2619,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Letter Head", 
    "length": 0, 
    "no_copy": 0, 
@@ -2357,6 +2629,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, 
@@ -2367,6 +2640,7 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "select_print_heading", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -2374,6 +2648,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Print Heading", 
    "length": 0, 
    "no_copy": 1, 
@@ -2384,6 +2659,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, 
@@ -2394,6 +2670,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "language", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -2401,6 +2678,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Print Language", 
    "length": 0, 
    "no_copy": 0, 
@@ -2409,6 +2687,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, 
@@ -2419,6 +2698,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
+   "columns": 0, 
    "fieldname": "more_info", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -2426,15 +2706,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "More Information", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-file-text", 
+   "options": "fa fa-file-text", 
    "permlevel": 0, 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -2445,6 +2727,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "", 
    "fieldname": "credit_to", 
    "fieldtype": "Link", 
@@ -2453,6 +2736,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Credit To", 
    "length": 0, 
    "no_copy": 0, 
@@ -2463,6 +2747,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, 
@@ -2473,6 +2758,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "party_account_currency", 
    "fieldtype": "Link", 
    "hidden": 1, 
@@ -2480,6 +2766,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Party Account Currency", 
    "length": 0, 
    "no_copy": 1, 
@@ -2489,6 +2776,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, 
@@ -2499,6 +2787,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "No", 
    "description": "", 
    "fieldname": "is_opening", 
@@ -2508,6 +2797,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Is Opening", 
    "length": 0, 
    "no_copy": 0, 
@@ -2518,6 +2808,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, 
@@ -2528,6 +2819,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "against_expense_account", 
    "fieldtype": "Small Text", 
    "hidden": 1, 
@@ -2535,6 +2827,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Against Expense Account", 
    "length": 0, 
    "no_copy": 1, 
@@ -2544,6 +2837,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, 
@@ -2554,6 +2848,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_63", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -2561,12 +2856,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, 
@@ -2577,6 +2874,36 @@
    "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_list_view": 0, 
+   "label": "Status", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nDraft\nReturn\nDebit Note Issued\nSubmitted\nPaid\nUnpaid\nOverdue\nCancelled", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "posting_time", 
    "fieldtype": "Time", 
    "hidden": 0, 
@@ -2584,6 +2911,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Posting Time", 
    "length": 0, 
    "no_copy": 1, 
@@ -2593,6 +2921,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, 
@@ -2604,6 +2933,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "remarks", 
    "fieldtype": "Small Text", 
    "hidden": 0, 
@@ -2611,6 +2941,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Remarks", 
    "length": 0, 
    "no_copy": 1, 
@@ -2620,6 +2951,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, 
@@ -2630,6 +2962,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "Warehouse where you are maintaining stock of rejected items", 
    "fieldname": "rejected_warehouse", 
    "fieldtype": "Link", 
@@ -2638,6 +2971,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Rejected Warehouse", 
    "length": 0, 
    "no_copy": 1, 
@@ -2647,6 +2981,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, 
@@ -2658,6 +2993,7 @@
    "bold": 0, 
    "collapsible": 1, 
    "collapsible_depends_on": "is_recurring", 
+   "columns": 0, 
    "depends_on": "eval:doc.docstatus<2", 
    "fieldname": "recurring_invoice", 
    "fieldtype": "Section Break", 
@@ -2666,14 +3002,16 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Recurring Invoice", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "icon-time", 
+   "options": "fa fa-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, 
@@ -2684,6 +3022,7 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.docstatus<2", 
    "description": "", 
    "fieldname": "is_recurring", 
@@ -2693,6 +3032,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Is Recurring", 
    "length": 0, 
    "no_copy": 1, 
@@ -2700,6 +3040,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, 
@@ -2710,6 +3051,7 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.is_recurring==1", 
    "description": "Select the period when the invoice will be generated automatically", 
    "fieldname": "recurring_type", 
@@ -2719,6 +3061,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Recurring Type", 
    "length": 0, 
    "no_copy": 1, 
@@ -2727,6 +3070,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, 
@@ -2737,6 +3081,7 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.is_recurring==1", 
    "description": "Start date of current invoice's period", 
    "fieldname": "from_date", 
@@ -2746,6 +3091,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "From Date", 
    "length": 0, 
    "no_copy": 1, 
@@ -2753,6 +3099,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, 
@@ -2763,6 +3110,7 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.is_recurring==1", 
    "description": "End date of current invoice's period", 
    "fieldname": "to_date", 
@@ -2772,6 +3120,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "To Date", 
    "length": 0, 
    "no_copy": 1, 
@@ -2779,6 +3128,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, 
@@ -2789,6 +3139,7 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.is_recurring && doc.recurring_id === doc.name", 
    "fieldname": "submit_on_creation", 
    "fieldtype": "Check", 
@@ -2797,6 +3148,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Submit on creation", 
    "length": 0, 
    "no_copy": 0, 
@@ -2805,6 +3157,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, 
@@ -2815,6 +3168,7 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.is_recurring && doc.recurring_id === doc.name", 
    "description": "", 
    "fieldname": "notify_by_email", 
@@ -2824,6 +3178,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Notify by email", 
    "length": 0, 
    "no_copy": 1, 
@@ -2832,6 +3187,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, 
@@ -2842,6 +3198,7 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.is_recurring==1", 
    "description": "The day of the month on which auto invoice will be generated e.g. 05, 28 etc", 
    "fieldname": "repeat_on_day_of_month", 
@@ -2851,6 +3208,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Repeat on Day of Month", 
    "length": 0, 
    "no_copy": 1, 
@@ -2858,6 +3216,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, 
@@ -2868,6 +3227,7 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.is_recurring==1", 
    "description": "The date on which recurring invoice will be stop", 
    "fieldname": "end_date", 
@@ -2877,6 +3237,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "End Date", 
    "length": 0, 
    "no_copy": 1, 
@@ -2884,6 +3245,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, 
@@ -2894,6 +3256,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_82", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -2901,12 +3264,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": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -2918,6 +3283,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.is_recurring==1", 
    "description": "The date on which next invoice will be generated. It is generated on submit.", 
    "fieldname": "next_date", 
@@ -2927,6 +3293,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Next Date", 
    "length": 0, 
    "no_copy": 1, 
@@ -2934,6 +3301,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, 
@@ -2944,6 +3312,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.is_recurring==1", 
    "description": "The unique id for tracking all recurring invoices. It is generated on submit.", 
    "fieldname": "recurring_id", 
@@ -2953,6 +3322,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Recurring Id", 
    "length": 0, 
    "no_copy": 1, 
@@ -2960,6 +3330,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, 
@@ -2970,6 +3341,7 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "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", 
    "fieldname": "notification_email_address", 
@@ -2979,6 +3351,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Notification Email Address", 
    "length": 0, 
    "no_copy": 1, 
@@ -2986,6 +3359,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, 
@@ -2996,6 +3370,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.is_recurring==1", 
    "fieldname": "recurring_print_format", 
    "fieldtype": "Link", 
@@ -3004,6 +3379,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Recurring Print Format", 
    "length": 0, 
    "no_copy": 0, 
@@ -3013,6 +3389,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, 
@@ -3022,7 +3399,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-file-text", 
+ "icon": "fa fa-file-text", 
  "idx": 204, 
  "image_view": 0, 
  "in_create": 0, 
@@ -3032,7 +3409,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-08-24 12:50:15.777689", 
+ "modified": "2016-11-09 14:18:47.094777", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Purchase Invoice", 
@@ -3048,6 +3425,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -3068,6 +3446,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -3088,6 +3467,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -3108,6 +3488,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -3128,6 +3509,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 1, 
    "print": 0, 
    "read": 1, 
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
index adc30e2..14459fa 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
@@ -58,20 +58,21 @@
 		self.check_for_closed_status()
 		self.validate_with_previous_doc()
 		self.validate_uom_is_integer("uom", "qty")
-		self.set_expense_account()
+		self.set_expense_account(for_validate=True)
 		self.set_against_expense_account()
 		self.validate_write_off_account()
 		self.validate_multiple_billing("Purchase Receipt", "pr_detail", "amount", "items")
 		self.validate_fixed_asset()
 		self.validate_fixed_asset_account()
 		self.create_remarks()
+		self.set_status()
 
 	def validate_cash(self):
 		if not self.cash_bank_account and flt(self.paid_amount):
 			frappe.throw(_("Cash or Bank Account is mandatory for making payment entry"))
 
 		if flt(self.paid_amount) + flt(self.write_off_amount) \
-				- flt(self.base_grand_total) > 1/(10**(self.precision("base_grand_total") + 1)):
+				- flt(self.grand_total) > 1/(10**(self.precision("base_grand_total") + 1)):
 			frappe.throw(_("""Paid amount + Write Off Amount can not be greater than Grand Total"""))
 
 	def create_remarks(self):
@@ -155,7 +156,7 @@
 
 		super(PurchaseInvoice, self).validate_warehouse()
 
-	def set_expense_account(self):
+	def set_expense_account(self, for_validate=False):
 		auto_accounting_for_stock = cint(frappe.defaults.get_global_default("auto_accounting_for_stock"))
 
 		if auto_accounting_for_stock:
@@ -181,7 +182,7 @@
 				else:
 					item.expense_account = stock_not_billed_account
 
-			elif not item.expense_account:
+			elif not item.expense_account and for_validate:
 				throw(_("Expense account is mandatory for item {0}").format(item.item_code or item.item_name))
 
 	def set_against_expense_account(self):
@@ -305,25 +306,8 @@
 		if not self.grand_total:
 			return
 		
-		self.auto_accounting_for_stock = \
-			cint(frappe.defaults.get_global_default("auto_accounting_for_stock"))
-
-		self.stock_received_but_not_billed = self.get_company_default("stock_received_but_not_billed")
-		self.expenses_included_in_valuation = self.get_company_default("expenses_included_in_valuation")
-		self.negative_expense_to_be_booked = 0.0
-		gl_entries = []
-
-
-		self.make_supplier_gl_entry(gl_entries)
-		self.make_item_gl_entries(gl_entries)
-		self.make_tax_gl_entries(gl_entries)
-
-		gl_entries = merge_similar_entries(gl_entries)
-
-		self.make_payment_gl_entries(gl_entries)
-
-		self.make_write_off_gl_entry(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"
 
@@ -342,6 +326,26 @@
 		elif self.docstatus == 2 and cint(self.update_stock) and self.auto_accounting_for_stock:
 			delete_gl_entries(voucher_type=self.doctype, voucher_no=self.name)
 
+	def get_gl_entries(self, warehouse_account=None):
+		self.auto_accounting_for_stock = \
+			cint(frappe.defaults.get_global_default("auto_accounting_for_stock"))
+
+		self.stock_received_but_not_billed = self.get_company_default("stock_received_but_not_billed")
+		self.expenses_included_in_valuation = self.get_company_default("expenses_included_in_valuation")
+		self.negative_expense_to_be_booked = 0.0
+		gl_entries = []
+
+
+		self.make_supplier_gl_entry(gl_entries)
+		self.make_item_gl_entries(gl_entries)
+		self.make_tax_gl_entries(gl_entries)
+
+		gl_entries = merge_similar_entries(gl_entries)
+
+		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):
 		if self.grand_total:
@@ -372,7 +376,7 @@
 			if flt(item.base_net_amount):
 				account_currency = get_account_currency(item.expense_account)
 
-				if self.update_stock and self.auto_accounting_for_stock:
+				if self.update_stock and self.auto_accounting_for_stock and item.item_code in stock_items:
 					val_rate_db_precision = 6 if cint(item.precision("valuation_rate")) <= 6 else 9
 
 					# warehouse account
@@ -578,7 +582,8 @@
 
 		if not self.is_return:
 			from erpnext.accounts.utils import unlink_ref_doc_from_payment_entries
-			unlink_ref_doc_from_payment_entries(self.doctype, self.name)
+			if frappe.db.get_single_value('Accounts Settings', 'unlink_payment_on_cancellation_of_invoice'):
+				unlink_ref_doc_from_payment_entries(self)
 
 			self.update_prevdoc_status()
 			self.update_billing_status_for_zero_amount_refdoc("Purchase Order")
@@ -592,6 +597,7 @@
 		self.make_gl_entries_on_cancel()
 		self.update_project()
 		self.update_fixed_asset()
+		frappe.db.set(self, 'status', 'Cancelled')
 
 	def update_project(self):
 		project_list = []
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py
index 9b950db..6141db5 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py
@@ -1,31 +1,31 @@
 from frappe import _
 
-data = {
-	'fieldname': 'purchase_invoice',
-	'non_standard_fieldnames': {
-		'Delivery Note': 'against_sales_invoice',
-		'Journal Entry': 'reference_name',
-		'Payment Entry': 'reference_name',
-		'Payment Request': 'reference_name',
-		'Landed Cost Voucher': 'receipt_document',
-		'Purchase Invoice': 'return_against'
-	},
-	'internal_links': {
-		'Purchase Order': ['items', 'sales_order'],
-		'Purchase Receipt': ['items', 'delivery_note'],
-	},
-	'transactions': [
-		{
-			'label': _('Payment'),
-			'items': ['Payment Entry', 'Payment Request', 'Journal Entry']
+def get_data():
+	return {
+		'fieldname': 'purchase_invoice',
+		'non_standard_fieldnames': {
+			'Journal Entry': 'reference_name',
+			'Payment Entry': 'reference_name',
+			'Payment Request': 'reference_name',
+			'Landed Cost Voucher': 'receipt_document',
+			'Purchase Invoice': 'return_against'
 		},
-		{
-			'label': _('Reference'),
-			'items': ['Purchase Order', 'Purchase Receipt', 'Asset', 'Landed Cost Voucher']
+		'internal_links': {
+			'Purchase Order': ['items', 'purchase_order'],
+			'Purchase Receipt': ['items', 'purchase_receipt'],
 		},
-		{
-			'label': _('Returns'),
-			'items': ['Purchase Invoice']
-		},
-	]
-}
\ No newline at end of file
+		'transactions': [
+			{
+				'label': _('Payment'),
+				'items': ['Payment Entry', 'Payment Request', 'Journal Entry']
+			},
+			{
+				'label': _('Reference'),
+				'items': ['Purchase Order', 'Purchase Receipt', 'Asset', 'Landed Cost Voucher']
+			},
+			{
+				'label': _('Returns'),
+				'items': ['Purchase Invoice']
+			},
+		]
+	}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js
index afcd61f..8283acc 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js
@@ -14,7 +14,9 @@
 			} else {
 				return [__("Unpaid"), "orange", "outstanding_amount,>,0|due,>=,Today"];
 			}
-		} else if(flt(doc.outstanding_amount)==0 && doc.docstatus==1) {
+		} else if(flt(doc.outstanding_amount) < 0 && doc.docstatus == 1) {
+			return [__("Debit Note Issued"), "darkgrey", "outstanding_amount,<,0"]
+		}else if(flt(doc.outstanding_amount)==0 && doc.docstatus==1) {
 			return [__("Paid"), "green", "outstanding_amount,=,0"];
 		}
 	}
diff --git a/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
index 4ea18ac..d8c9b04 100644
--- a/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
+++ b/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
@@ -6,7 +6,7 @@
 import unittest
 import frappe
 import frappe.model
-from frappe.utils import cint, flt, today
+from frappe.utils import cint, flt, today, nowdate
 import frappe.defaults
 from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import set_perpetual_inventory, \
 	test_records as pr_test_records
@@ -17,6 +17,12 @@
 test_ignore = ["Serial No"]
 
 class TestPurchaseInvoice(unittest.TestCase):
+	def setUp(self):
+		unlink_payment_on_cancel_of_invoice()
+
+	def tearDown(self):
+		unlink_payment_on_cancel_of_invoice(0)
+
 	def test_gl_entries_without_auto_accounting_for_stock(self):
 		set_perpetual_inventory(0)
 		self.assertTrue(not cint(frappe.defaults.get_global_default("auto_accounting_for_stock")))
@@ -55,6 +61,27 @@
 
 		set_perpetual_inventory(0)
 
+	def test_payment_entry_unlink_against_purchase_invoice(self):
+		from erpnext.accounts.doctype.payment_entry.test_payment_entry import get_payment_entry
+		unlink_payment_on_cancel_of_invoice(0)
+
+		pi_doc = make_purchase_invoice()
+
+		pe = get_payment_entry("Purchase Invoice", pi_doc.name, bank_account="_Test Bank - _TC")
+		pe.reference_no = "1"
+		pe.reference_date = nowdate()
+		pe.paid_from_account_currency = pi_doc.currency
+		pe.paid_to_account_currency = pi_doc.currency
+		pe.source_exchange_rate = 1
+		pe.target_exchange_rate = 1
+		pe.paid_amount = pi_doc.grand_total
+		pe.save(ignore_permissions=True)
+		pe.submit()
+
+		pi_doc = frappe.get_doc('Purchase Invoice', pi_doc.name)
+
+		self.assertRaises(frappe.LinkExistsError, pi_doc.cancel)
+
 	def test_gl_entries_with_auto_accounting_for_stock_against_pr(self):
 		set_perpetual_inventory(1)
 		self.assertEqual(cint(frappe.defaults.get_global_default("auto_accounting_for_stock")), 1)
@@ -410,6 +437,90 @@
 
 		self.assertEquals(frappe.db.get_value("Serial No", pi.get("items")[0].rejected_serial_no,
 			"warehouse"), pi.get("items")[0].rejected_warehouse)
+	
+	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
+
+		jv = frappe.copy_doc(jv_test_records[1])
+		jv.insert()
+		jv.submit()
+
+		pi = frappe.copy_doc(test_records[0])
+		pi.append("advances", {
+			"reference_type": "Journal Entry",
+			"reference_name": jv.name,
+			"reference_row": jv.get("accounts")[0].name,
+			"advance_amount": 400,
+			"allocated_amount": 300,
+			"remarks": jv.remark
+		})
+		pi.insert()
+		pi.submit()
+		pi.load_from_db()
+		
+		#check outstanding after advance allocation
+		self.assertEqual(flt(pi.outstanding_amount), flt(pi.grand_total - pi.total_advance))
+		
+		#added to avoid Document has been modified exception
+		jv = frappe.get_doc("Journal Entry", jv.name)
+		jv.cancel()
+		
+		pi.load_from_db()
+		#check outstanding after advance cancellation
+		self.assertEqual(flt(pi.outstanding_amount), flt(pi.grand_total + pi.total_advance))
+
+	def test_outstanding_amount_after_advance_payment_entry_cancelation(self):
+		pe = frappe.get_doc({
+			"doctype": "Payment Entry",
+			"payment_type": "Pay",
+			"party_type": "Supplier",
+			"party": "_Test Supplier",
+			"company": "_Test Company",
+			"paid_from_account_currency": "INR",
+			"paid_to_account_currency": "INR",
+			"source_exchange_rate": 1,
+			"target_exchange_rate": 1,
+			"reference_no": "1",
+			"reference_date": nowdate(),
+			"received_amount": 300,
+			"paid_amount": 300,
+			"paid_from": "_Test Cash - _TC",
+			"paid_to": "_Test Payable - _TC"
+		})
+		pe.insert()
+		pe.submit()
+		
+		pi = frappe.copy_doc(test_records[0])
+		pi.is_pos = 0
+		pi.append("advances", {
+			"doctype": "Purchase Invoice Advance",
+			"reference_type": "Payment Entry",
+			"reference_name": pe.name,
+			"advance_amount": 300,
+			"allocated_amount": 300,
+			"remarks": pe.remarks
+		})
+		pi.insert()
+		pi.submit()
+		
+		pi.load_from_db()
+
+		#check outstanding after advance allocation
+		self.assertEqual(flt(pi.outstanding_amount), flt(pi.grand_total - pi.total_advance))
+		
+		#added to avoid Document has been modified exception
+		pe = frappe.get_doc("Payment Entry", pe.name)
+		pe.cancel()
+		
+		pi.load_from_db()
+		#check outstanding after advance cancellation
+		self.assertEqual(flt(pi.outstanding_amount), flt(pi.grand_total + pi.total_advance))
+
+def unlink_payment_on_cancel_of_invoice(enable=1):
+	accounts_settings = frappe.get_doc("Accounts Settings")
+	accounts_settings.unlink_payment_on_cancellation_of_invoice = enable
+	accounts_settings.save()
 
 def make_purchase_invoice(**args):
 	pi = frappe.new_doc("Purchase Invoice")
@@ -455,4 +566,4 @@
 			pi.submit()
 	return pi
 
-test_records = frappe.get_test_records('Purchase Invoice')
+test_records = frappe.get_test_records('Purchase Invoice')
\ No newline at end of file
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 d4e20f9..6f8e219 100755
--- a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
+++ b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
@@ -23,6 +23,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Item", 
    "length": 0, 
    "no_copy": 0, 
@@ -33,6 +34,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, 
@@ -51,12 +53,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, 
@@ -75,6 +79,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Item Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -84,6 +89,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, 
@@ -102,6 +108,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Description", 
    "length": 0, 
    "no_copy": 0, 
@@ -110,6 +117,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,6 +136,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Description", 
    "length": 0, 
    "no_copy": 0, 
@@ -138,6 +147,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, 
@@ -157,6 +167,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Image", 
    "length": 0, 
    "no_copy": 0, 
@@ -165,6 +176,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, 
@@ -183,6 +195,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Image View", 
    "length": 0, 
    "no_copy": 0, 
@@ -192,6 +205,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, 
@@ -210,6 +224,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Quantity and Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -217,6 +232,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, 
@@ -235,6 +251,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Received Qty", 
    "length": 0, 
    "no_copy": 0, 
@@ -243,6 +260,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, 
@@ -261,6 +279,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Qty", 
    "length": 0, 
    "no_copy": 0, 
@@ -270,6 +289,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, 
@@ -288,6 +308,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Rejected Qty", 
    "length": 0, 
    "no_copy": 0, 
@@ -296,6 +317,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -314,12 +336,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, 
@@ -338,6 +362,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "UOM", 
    "length": 0, 
    "no_copy": 0, 
@@ -346,6 +371,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, 
@@ -364,6 +390,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Conversion Factor", 
    "length": 0, 
    "no_copy": 0, 
@@ -371,6 +398,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, 
@@ -389,12 +417,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, 
@@ -413,6 +443,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Price List Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -421,6 +452,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, 
@@ -440,6 +472,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Discount on Price List Rate (%)", 
    "length": 0, 
    "no_copy": 0, 
@@ -447,6 +480,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, 
@@ -465,12 +499,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, 
@@ -489,6 +525,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Price List Rate (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -497,6 +534,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, 
@@ -515,12 +553,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, 
@@ -539,6 +579,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Rate ", 
    "length": 0, 
    "no_copy": 0, 
@@ -549,6 +590,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, 
@@ -567,6 +609,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -577,6 +620,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, 
@@ -595,12 +639,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, 
@@ -619,6 +665,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Rate (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -629,6 +676,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, 
@@ -647,6 +695,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amount (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -657,6 +706,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, 
@@ -675,6 +725,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Pricing Rule", 
    "length": 0, 
    "no_copy": 0, 
@@ -683,6 +734,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, 
@@ -701,6 +753,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -708,6 +761,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, 
@@ -726,6 +780,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Net Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -735,6 +790,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, 
@@ -753,6 +809,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Net Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -762,6 +819,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, 
@@ -780,6 +838,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -787,6 +846,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, 
@@ -805,6 +865,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Net Rate (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -814,6 +875,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, 
@@ -832,6 +894,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Net Amount (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -841,6 +904,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, 
@@ -859,6 +923,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Warehouse", 
    "length": 0, 
    "no_copy": 0, 
@@ -867,6 +932,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, 
@@ -886,6 +952,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Accepted Warehouse", 
    "length": 0, 
    "no_copy": 0, 
@@ -895,6 +962,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, 
@@ -913,6 +981,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Rejected Warehouse", 
    "length": 0, 
    "no_copy": 0, 
@@ -922,6 +991,37 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "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.__islocal", 
+   "fieldname": "quality_inspection", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Quality Inspection", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Quality Inspection", 
+   "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, 
@@ -940,6 +1040,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Batch No", 
    "length": 0, 
    "no_copy": 0, 
@@ -949,6 +1050,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, 
@@ -967,6 +1069,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
@@ -975,6 +1078,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, 
@@ -993,6 +1097,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Serial No", 
    "length": 0, 
    "no_copy": 0, 
@@ -1001,6 +1106,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, 
@@ -1019,6 +1125,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Rejected Serial No", 
    "length": 0, 
    "no_copy": 1, 
@@ -1027,6 +1134,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, 
@@ -1045,6 +1153,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Accounting", 
    "length": 0, 
    "no_copy": 0, 
@@ -1052,6 +1161,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, 
@@ -1070,6 +1180,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Expense Head", 
    "length": 0, 
    "no_copy": 0, 
@@ -1081,6 +1192,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "120px", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1100,12 +1212,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, 
@@ -1124,6 +1238,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Project", 
    "length": 0, 
    "no_copy": 0, 
@@ -1132,6 +1247,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, 
@@ -1152,6 +1268,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Cost Center", 
    "length": 0, 
    "no_copy": 0, 
@@ -1163,6 +1280,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "120px", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1182,6 +1300,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Reference", 
    "length": 0, 
    "no_copy": 0, 
@@ -1189,6 +1308,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, 
@@ -1207,6 +1327,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Brand", 
    "length": 0, 
    "no_copy": 0, 
@@ -1216,6 +1337,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, 
@@ -1235,6 +1357,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Item Group", 
    "length": 0, 
    "no_copy": 0, 
@@ -1245,6 +1368,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, 
@@ -1264,6 +1388,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Item Tax Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -1273,6 +1398,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, 
@@ -1291,6 +1417,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Item Tax Amount", 
    "length": 0, 
    "no_copy": 1, 
@@ -1300,6 +1427,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, 
@@ -1319,6 +1447,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Purchase Order", 
    "length": 0, 
    "no_copy": 1, 
@@ -1329,6 +1458,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, 
@@ -1347,6 +1477,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "BOM", 
    "length": 0, 
    "no_copy": 0, 
@@ -1356,6 +1487,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, 
@@ -1374,12 +1506,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, 
@@ -1398,6 +1532,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Is Fixed Asset", 
    "length": 0, 
    "no_copy": 1, 
@@ -1406,6 +1541,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, 
@@ -1425,6 +1561,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Asset", 
    "length": 0, 
    "no_copy": 1, 
@@ -1434,6 +1571,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, 
@@ -1452,6 +1590,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Purchase Order Item", 
    "length": 0, 
    "no_copy": 1, 
@@ -1461,6 +1600,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, 
@@ -1479,6 +1619,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Purchase Receipt", 
    "length": 0, 
    "no_copy": 1, 
@@ -1489,6 +1630,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, 
@@ -1507,6 +1649,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Page Break", 
    "length": 0, 
    "no_copy": 1, 
@@ -1514,6 +1657,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, 
@@ -1532,6 +1676,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "PR Detail", 
    "length": 0, 
    "no_copy": 1, 
@@ -1541,6 +1686,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, 
@@ -1559,6 +1705,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Valuation Rate", 
    "length": 0, 
    "no_copy": 1, 
@@ -1567,6 +1714,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, 
@@ -1585,6 +1733,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Raw Materials Supplied Cost", 
    "length": 0, 
    "no_copy": 1, 
@@ -1593,6 +1742,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, 
@@ -1611,6 +1761,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Landed Cost Voucher Amount", 
    "length": 0, 
    "no_copy": 1, 
@@ -1619,6 +1770,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, 
@@ -1636,7 +1788,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-08-26 04:37:23.737537", 
+ "modified": "2016-11-16 16:04:52.465169", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Purchase Invoice Item", 
diff --git a/erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.json b/erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.json
index 84e903c..50426df 100644
--- a/erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.json
+++ b/erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.json
@@ -3,23 +3,28 @@
  "allow_import": 1, 
  "allow_rename": 1, 
  "autoname": "field:title", 
+ "beta": 0, 
  "creation": "2013-01-10 16:34:08", 
  "custom": 0, 
  "description": "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.\n\n#### Note\n\nThe 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.\n\n#### Description of Columns\n\n1. Calculation Type: \n    - This can be on **Net Total** (that is the sum of basic amount).\n    - **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.\n    - **Actual** (as mentioned).\n2. Account Head: The Account ledger under which this tax will be booked\n3. Cost Center: If the tax / charge is an income (like shipping) or expense it needs to be booked against a Cost Center.\n4. Description: Description of the tax (that will be printed in invoices / quotes).\n5. Rate: Tax rate.\n6. Amount: Tax amount.\n7. Total: Cumulative total to this point.\n8. 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).\n9. 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.\n10. Add or Deduct: Whether you want to add or deduct the tax.", 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Setup", 
+ "editable_grid": 0, 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "title", 
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Title", 
    "length": 0, 
    "no_copy": 1, 
@@ -27,7 +32,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, 
@@ -38,18 +45,23 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "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": "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, 
@@ -60,19 +72,24 @@
    "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_list_view": 1, 
+   "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, 
@@ -83,19 +100,24 @@
    "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_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, 
@@ -106,19 +128,24 @@
    "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": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "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, 
@@ -129,19 +156,24 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break6", 
    "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, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -152,12 +184,15 @@
    "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_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Purchase Taxes and Charges", 
    "length": 0, 
    "no_copy": 0, 
@@ -166,7 +201,9 @@
    "options": "Purchase Taxes and Charges", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -176,15 +213,16 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-money", 
+ "icon": "fa fa-money", 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:54.729312", 
+ "modified": "2016-11-07 05:18:44.095798", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Purchase Taxes and Charges Template", 
@@ -200,6 +238,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -220,6 +259,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -240,6 +280,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -251,6 +292,9 @@
    "write": 0
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "sort_order": "DESC", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/salary_component_account/salary_component_account.json b/erpnext/accounts/doctype/salary_component_account/salary_component_account.json
index 6bbde22..6ba820e 100644
--- a/erpnext/accounts/doctype/salary_component_account/salary_component_account.json
+++ b/erpnext/accounts/doctype/salary_component_account/salary_component_account.json
@@ -14,6 +14,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "company", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -40,7 +41,8 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "description": "Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.", 
+   "columns": 0, 
+   "description": "Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.", 
    "fieldname": "default_account", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -74,7 +76,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-07-27 17:24:24.956896", 
+ "modified": "2016-09-02 07:49:06.567389", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Salary Component Account", 
diff --git a/erpnext/accounts/doctype/sales_invoice/pos.py b/erpnext/accounts/doctype/sales_invoice/pos.py
index f0db4ea..eeb5560 100644
--- a/erpnext/accounts/doctype/sales_invoice/pos.py
+++ b/erpnext/accounts/doctype/sales_invoice/pos.py
@@ -15,6 +15,7 @@
 	doc = frappe.new_doc('Sales Invoice')
 	doc.is_pos = 1;
 	pos_profile = get_pos_profile(doc.company) or {}
+	if not doc.company: doc.company = pos_profile.get('company')
 	doc.update_stock = pos_profile.get('update_stock')
 
 	if pos_profile.get('name'):
@@ -29,10 +30,16 @@
 	return {
 		'doc': doc,
 		'default_customer': pos_profile.get('customer'),
-		'items': get_items(doc, pos_profile),
-		'customers': get_customers(pos_profile, doc, company_data.default_currency),
-		'pricing_rules': get_pricing_rules(doc),
+		'items': get_items_list(pos_profile),
+		'customers': get_customers_list(pos_profile),
+		'serial_no_data': get_serial_no_data(pos_profile, doc.company),
+		'batch_no_data': get_batch_no_data(),
+		'tax_data': get_item_tax_data(),
+		'price_list_data': get_price_list_data(doc.selling_price_list),
+		'bin_data': get_bin_data(pos_profile),
+		'pricing_rules': get_pricing_rule_data(doc),
 		'print_template': print_template,
+		'pos_profile': pos_profile,
 		'meta': {
 			'invoice': frappe.get_meta('Sales Invoice'),
 			'items': frappe.get_meta('Sales Invoice Item'),
@@ -63,7 +70,7 @@
 	doc.naming_series = pos_profile.get('naming_series') or 'SINV-'
 	doc.letter_head = pos_profile.get('letter_head') or company_data.default_letter_head
 	doc.ignore_pricing_rule = pos_profile.get('ignore_pricing_rule') or 0
-	doc.apply_discount_on = pos_profile.get('apply_discount_on') or ''
+	doc.apply_discount_on = pos_profile.get('apply_discount_on') if pos_profile.get('apply_discount') else ''
 	doc.customer_group = pos_profile.get('customer_group') or get_root('Customer Group')
 	doc.territory = pos_profile.get('territory') or get_root('Territory')
 
@@ -103,63 +110,117 @@
 	for tax in taxes:
 		doc.append('taxes', tax)
 
-def get_items(doc, pos_profile):
-	item_list = []
-	for item in frappe.get_all("Item", fields=["*"], filters={'disabled': 0, 'has_variants': 0, 'is_sales_item': 1}):
-		item_doc = frappe.get_doc('Item', item.name)
-		if item_doc.taxes:
-			item.taxes = json.dumps(dict(([d.tax_type, d.tax_rate] for d in
-						item_doc.get("taxes"))))
+def get_items_list(pos_profile):
+	cond = "1=1"
+	item_groups = []
+	if pos_profile.get('item_groups'):
+		# Get items based on the item groups defined in the POS profile
 
-		item.price_list_rate = frappe.db.get_value('Item Price', {'item_code': item.name,
-									'price_list': doc.selling_price_list}, 'price_list_rate') or 0
-		item.default_warehouse = pos_profile.get('warehouse') or \
-			get_item_warehouse_for_company(doc.company, item.default_warehouse) or None
-		item.expense_account = pos_profile.get('expense_account') or item.expense_account
-		item.income_account = pos_profile.get('income_account') or item_doc.income_account
-		item.cost_center = pos_profile.get('cost_center') or item_doc.selling_cost_center
-		item.actual_qty = frappe.db.get_value('Bin', {'item_code': item.name,
-								'warehouse': item.default_warehouse}, 'actual_qty') or 0
-		item.serial_nos = get_serial_nos(item, pos_profile, doc.company)
-		item.batch_nos = frappe.db.sql_list("""select name from `tabBatch` where ifnull(expiry_date, '4000-10-10') > curdate()
-			and item = %(item_code)s""", {'item_code': item.item_code})
+		cond = "item_group in (%s)"%(', '.join(['%s']*len(pos_profile.get('item_groups'))))
+		item_groups = [d.item_group for d in pos_profile.get('item_groups')]
 
-		item_list.append(item)
+	return frappe.db.sql(""" 
+		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
+		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)
 
-	return item_list
+def get_customers_list(pos_profile):
+	cond = "1=1"
+	customer_groups = []
+	if pos_profile.get('customer_groups'):
+		# Get customers based on the customer groups defined in the POS profile
 
-def get_item_warehouse_for_company(company, warehouse):
-	if frappe.db.get_value('Warehouse', warehouse, 'company') != company:
-		warehouse = None
-	return warehouse
+		cond = "customer_group in (%s)"%(', '.join(['%s']*len(pos_profile.get('customer_groups'))))
+		customer_groups = [d.customer_group for d in pos_profile.get('customer_groups')]
 
-def get_serial_nos(item, pos_profile, company):
+	return frappe.db.sql(""" select name, customer_name, customer_group,
+		territory from tabCustomer where disabled = 0
+		and {cond}""".format(cond=cond), tuple(customer_groups), as_dict=1) or {}
+
+def get_serial_no_data(pos_profile, company):
+	# get itemwise serial no data
+	# example {'Nokia Lumia 1020': {'SN0001': 'Pune'}}
+	# where Nokia Lumia 1020 is item code, SN0001 is serial no and Pune is warehouse
+
 	cond = "1=1"
 	if pos_profile.get('update_stock') and pos_profile.get('warehouse'):
 		cond = "warehouse = '{0}'".format(pos_profile.get('warehouse'))
 
-	serial_nos = frappe.db.sql("""select name, warehouse from `tabSerial No` where {0}
-				and item_code = %(item_code)s and company = %(company)s
-				""".format(cond), {'item_code': item.item_code, 'company': company}, as_dict=1)
+	serial_nos = frappe.db.sql("""select name, warehouse, item_code from `tabSerial No` where {0}
+				and company = %(company)s """.format(cond), {'company': company}, as_dict=1)
 
-	serial_no_list = {}
-	for serial_no in serial_nos:
-		serial_no_list[serial_no.name] = serial_no.warehouse
+	itemwise_serial_no = {}
+	for sn in serial_nos:
+		if sn.item_code not in itemwise_serial_no:
+			itemwise_serial_no.setdefault(sn.item_code, {})
+		itemwise_serial_no[sn.item_code][sn.name] = sn.warehouse
 
-	return serial_no_list
+	return itemwise_serial_no
 
-def get_customers(pos_profile, doc, company_currency):
-	filters = {'disabled': 0}
-	customer_list = []
-	customers = frappe.get_all("Customer", fields=["*"], filters = filters)
+def get_batch_no_data():
+	# get itemwise batch no data
+	# exmaple: {'LED-GRE': [Batch001, Batch002]}
+	# where LED-GRE is item code, SN0001 is serial no and Pune is warehouse
 
-	for customer in customers:
-		customer_currency = get_party_account_currency('Customer', customer.name, doc.company) or doc.currency
-		if customer_currency == doc.currency or customer_currency == company_currency:
-			customer_list.append(customer)
-	return customer_list
+	itemwise_batch = {}
+	batches = frappe.db.sql("""select name, item from `tabBatch`
+		where ifnull(expiry_date, '4000-10-10') >= curdate()""", as_dict=1)
 
-def get_pricing_rules(doc):
+	for batch in batches:
+		if batch.item not in itemwise_batch:
+			itemwise_batch.setdefault(batch.item, [])
+		itemwise_batch[batch.item].append(batch.name)
+
+	return itemwise_batch
+
+def get_item_tax_data():
+	# get default tax of an item
+	# example: {'Consulting Services': {'Excise 12 - TS': '12.000'}}
+
+	itemwise_tax = {}
+	taxes = frappe.db.sql(""" select parent, tax_type, tax_rate from `tabItem Tax`""", as_dict=1)
+
+	for tax in taxes:
+		if tax.parent not in itemwise_tax:
+			itemwise_tax.setdefault(tax.parent, {})
+		itemwise_tax[tax.parent][tax.tax_type] = tax.tax_rate
+
+	return itemwise_tax
+
+def get_price_list_data(selling_price_list):
+	itemwise_price_list = {}
+	price_lists = frappe.db.sql("""Select ifnull(price_list_rate, 0) as price_list_rate,
+		item_code from `tabItem Price` ip where price_list = %(price_list)s""",
+		{'price_list': selling_price_list}, as_dict=1)
+
+	for item in price_lists:
+		itemwise_price_list[item.item_code] = item.price_list_rate
+
+	return itemwise_price_list
+
+def get_bin_data(pos_profile):
+	itemwise_bin_data = {}
+	cond = "1=1"
+	if pos_profile.get('warehouse'):
+		cond = "warehouse = '{0}'".format(pos_profile.get('warehouse'))
+
+	bin_data = frappe.db.sql(""" select item_code, warehouse, actual_qty from `tabBin`
+		where actual_qty > 0 and {cond}""".format(cond=cond), as_dict=1)
+
+	for bins in bin_data:
+		if bins.item_code not in itemwise_bin_data:
+			itemwise_bin_data.setdefault(bins.item_code, {})
+		itemwise_bin_data[bins.item_code][bins.warehouse] = bins.actual_qty
+
+	return itemwise_bin_data
+
+def get_pricing_rule_data(doc):
 	pricing_rules = ""
 	if doc.ignore_pricing_rule == 0:
 		pricing_rules = frappe.db.sql(""" Select * from `tabPricing Rule` where docstatus < 2
@@ -235,10 +296,3 @@
 		si_doc.docstatus = 0
 		si_doc.flags.ignore_mandatory = True
 		si_doc.insert()
-		make_scheduler_log(e, si_doc.name)
-
-def make_scheduler_log(e, sales_invoice):
-	scheduler_log = frappe.new_doc('Scheduler Log')
-	scheduler_log.error = e
-	scheduler_log.sales_invoice = sales_invoice
-	scheduler_log.save(ignore_permissions=True)
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
index 47f1a5c..57e0faa 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
@@ -20,6 +20,13 @@
 		erpnext.queries.setup_queries(this.frm, "Warehouse", function() {
 			return erpnext.queries.warehouse(me.frm.doc);
 		});
+
+		if(this.frm.doc.__islocal && this.frm.doc.is_pos) {
+			//Load pos profile data on the invoice if the default value of Is POS is 1
+
+			me.frm.script_manager.trigger("is_pos");
+			me.frm.refresh_fields();
+		}
 	},
 
 	refresh: function(doc, dt, dn) {
@@ -300,7 +307,7 @@
 
 	item_fields_stock = ['serial_no', 'batch_no', 'actual_qty', 'expense_account', 'warehouse', 'expense_account', 'warehouse']
 	cur_frm.fields_dict['items'].grid.set_column_disp(item_fields_stock,
-		(cint(doc.update_stock)==1 ? true : false));
+		(cint(doc.update_stock)==1 || cint(doc.is_return)==1 ? true : false));
 
 	// India related fields
 	if (frappe.boot.sysdefaults.country == 'India') unhide_field(['c_form_applicable', 'c_form_no']);
@@ -483,20 +490,36 @@
 frappe.ui.form.on('Sales Invoice Timesheet', {
 	time_sheet: function(frm, cdt, cdn){
 		var d = locals[cdt][cdn];
-		frappe.call({
-			method: "erpnext.projects.doctype.timesheet.timesheet.get_timesheet_data",
-			args: {
-				'name': d.time_sheet,
-				'project': frm.doc.project || null
-			},
-			callback: function(r, rt) {
-				if(r.message){
-					data = r.message;
-					frappe.model.set_value(cdt, cdn, "billing_hours", data.billing_hours);
-					frappe.model.set_value(cdt, cdn, "billing_amount", data.billing_amount);
-					frappe.model.set_value(cdt, cdn, "timesheet_detail", data.timesheet_detail);
+		if(d.time_sheet) {
+			frappe.call({
+				method: "erpnext.projects.doctype.timesheet.timesheet.get_timesheet_data",
+				args: {
+					'name': d.time_sheet,
+					'project': frm.doc.project || null
+				},
+				callback: function(r, rt) {
+					if(r.message){
+						data = r.message;
+						frappe.model.set_value(cdt, cdn, "billing_hours", data.billing_hours);
+						frappe.model.set_value(cdt, cdn, "billing_amount", data.billing_amount);
+						frappe.model.set_value(cdt, cdn, "timesheet_detail", data.timesheet_detail);
+						calculate_total_billing_amount(frm)
+					}
 				}
-			}
-		})
+			})
+		}
 	}
 })
+
+var calculate_total_billing_amount =  function(frm) {
+	var doc = frm.doc;
+
+	doc.total_billing_amount = 0.0
+	if(doc.timesheets) {
+		$.each(doc.timesheets, function(index, data){
+			doc.total_billing_amount += data.billing_amount
+		})
+	}
+
+	refresh_field('total_billing_amount')
+}
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
index 8e65061..2a07389 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@@ -24,14 +24,16 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "icon-user", 
+   "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, 
@@ -51,6 +53,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Title", 
    "length": 0, 
    "no_copy": 1, 
@@ -59,6 +62,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,6 +81,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Series", 
    "length": 0, 
    "no_copy": 1, 
@@ -87,6 +92,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, 
@@ -105,6 +111,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Customer", 
    "length": 0, 
    "no_copy": 0, 
@@ -115,6 +122,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, 
@@ -134,6 +142,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -143,6 +152,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, 
@@ -161,6 +171,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Is POS", 
    "length": 0, 
    "no_copy": 0, 
@@ -170,6 +181,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, 
@@ -189,14 +201,16 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Is Return", 
    "length": 0, 
-   "no_copy": 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, 
@@ -215,6 +229,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Offline POS Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -223,6 +238,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, 
@@ -241,6 +257,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
@@ -248,6 +265,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, 
@@ -267,6 +285,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Date", 
    "length": 0, 
    "no_copy": 1, 
@@ -276,6 +295,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, 
@@ -294,6 +314,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Payment Due Date", 
    "length": 0, 
    "no_copy": 1, 
@@ -303,6 +324,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, 
@@ -321,6 +343,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -331,6 +354,7 @@
    "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, 
@@ -342,6 +366,36 @@
    "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, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "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, 
@@ -349,6 +403,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amended From", 
    "length": 0, 
    "no_copy": 1, 
@@ -359,6 +414,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, 
@@ -378,15 +434,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Return Against Sales Invoice", 
    "length": 0, 
-   "no_copy": 0, 
+   "no_copy": 1, 
    "options": "Sales Invoice", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -406,6 +464,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Address and Contact", 
    "length": 0, 
    "no_copy": 0, 
@@ -414,6 +473,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, 
@@ -432,6 +492,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer Address", 
    "length": 0, 
    "no_copy": 0, 
@@ -440,6 +501,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, 
@@ -458,6 +520,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Address", 
    "length": 0, 
    "no_copy": 0, 
@@ -465,6 +528,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, 
@@ -483,6 +547,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Contact Person", 
    "length": 0, 
    "no_copy": 0, 
@@ -491,6 +556,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, 
@@ -509,6 +575,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Contact", 
    "length": 0, 
    "no_copy": 0, 
@@ -516,6 +583,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, 
@@ -534,6 +602,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Mobile No", 
    "length": 0, 
    "no_copy": 0, 
@@ -541,6 +610,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, 
@@ -559,6 +629,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Contact Email", 
    "length": 0, 
    "no_copy": 0, 
@@ -567,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, 
@@ -585,6 +657,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -592,6 +665,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, 
@@ -610,6 +684,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Shipping Address Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -619,6 +694,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, 
@@ -637,6 +713,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Shipping Address", 
    "length": 0, 
    "no_copy": 0, 
@@ -645,6 +722,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, 
@@ -664,6 +742,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer Group", 
    "length": 0, 
    "no_copy": 0, 
@@ -672,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, 
@@ -690,6 +770,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Territory", 
    "length": 0, 
    "no_copy": 0, 
@@ -699,6 +780,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, 
@@ -718,6 +800,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Currency and Price List", 
    "length": 0, 
    "no_copy": 0, 
@@ -726,6 +809,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, 
@@ -744,6 +828,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Currency", 
    "length": 0, 
    "no_copy": 0, 
@@ -754,6 +839,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, 
@@ -773,6 +859,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Exchange Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -783,6 +870,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, 
@@ -801,12 +889,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, 
@@ -826,6 +916,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Price List", 
    "length": 0, 
    "no_copy": 0, 
@@ -836,6 +927,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, 
@@ -854,6 +946,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Price List Currency", 
    "length": 0, 
    "no_copy": 0, 
@@ -862,6 +955,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, 
@@ -881,6 +975,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Price List Exchange Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -889,6 +984,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, 
@@ -907,6 +1003,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Ignore Pricing Rule", 
    "length": 0, 
    "no_copy": 1, 
@@ -914,6 +1011,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, 
@@ -932,15 +1030,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-shopping-cart", 
+   "options": "fa fa-shopping-cart", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -959,6 +1059,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Update Stock", 
    "length": 0, 
    "no_copy": 0, 
@@ -968,6 +1069,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, 
@@ -986,6 +1088,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Items", 
    "length": 0, 
    "no_copy": 0, 
@@ -996,6 +1099,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, 
@@ -1014,14 +1118,16 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Packing List", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "icon-suitcase", 
+   "options": "fa fa-suitcase", 
    "permlevel": 0, 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1040,6 +1146,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Packed Items", 
    "length": 0, 
    "no_copy": 0, 
@@ -1048,6 +1155,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, 
@@ -1066,6 +1174,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Product Bundle Help", 
    "length": 0, 
    "no_copy": 0, 
@@ -1073,6 +1182,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, 
@@ -1093,6 +1203,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Time Sheet List", 
    "length": 0, 
    "no_copy": 0, 
@@ -1101,6 +1212,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, 
@@ -1119,6 +1231,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Time Sheets", 
    "length": 0, 
    "no_copy": 0, 
@@ -1128,6 +1241,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, 
@@ -1147,6 +1261,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Billing Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -1155,6 +1270,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, 
@@ -1173,12 +1289,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, 
@@ -1197,6 +1315,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -1206,6 +1325,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, 
@@ -1224,6 +1344,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Net Total (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -1234,6 +1355,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, 
@@ -1252,12 +1374,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, 
@@ -1276,6 +1400,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Net Total", 
    "length": 0, 
    "no_copy": 0, 
@@ -1284,6 +1409,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, 
@@ -1302,6 +1428,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total", 
    "length": 0, 
    "no_copy": 0, 
@@ -1311,6 +1438,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, 
@@ -1329,15 +1457,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-money", 
+   "options": "fa fa-money", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1356,6 +1486,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Taxes and Charges", 
    "length": 0, 
    "no_copy": 0, 
@@ -1366,6 +1497,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, 
@@ -1384,12 +1516,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, 
@@ -1408,6 +1542,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Shipping Rule", 
    "length": 0, 
    "no_copy": 0, 
@@ -1417,6 +1552,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, 
@@ -1435,12 +1571,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, 
@@ -1459,6 +1597,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Sales Taxes and Charges", 
    "length": 0, 
    "no_copy": 0, 
@@ -1469,6 +1608,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, 
@@ -1487,6 +1627,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Taxes and Charges Calculation", 
    "length": 0, 
    "no_copy": 0, 
@@ -1495,6 +1636,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, 
@@ -1513,12 +1655,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, 
@@ -1537,6 +1681,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Taxes and Charges (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -1547,6 +1692,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, 
@@ -1565,6 +1711,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -1572,6 +1719,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, 
@@ -1590,6 +1738,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Taxes and Charges", 
    "length": 0, 
    "no_copy": 0, 
@@ -1598,6 +1747,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, 
@@ -1617,6 +1767,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Additional Discount", 
    "length": 0, 
    "no_copy": 0, 
@@ -1625,6 +1776,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, 
@@ -1644,6 +1796,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Apply Additional Discount On", 
    "length": 0, 
    "no_copy": 0, 
@@ -1653,6 +1806,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, 
@@ -1671,6 +1825,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Additional Discount Amount (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -1680,6 +1835,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, 
@@ -1698,12 +1854,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, 
@@ -1722,6 +1880,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Additional Discount Percentage", 
    "length": 0, 
    "no_copy": 0, 
@@ -1730,6 +1889,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, 
@@ -1748,6 +1908,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Additional Discount Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -1756,6 +1917,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, 
@@ -1774,15 +1936,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-money", 
+   "options": "fa fa-money", 
    "permlevel": 0, 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1801,6 +1965,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Grand Total (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -1811,6 +1976,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, 
@@ -1829,6 +1995,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Rounded Total (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -1839,6 +2006,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, 
@@ -1858,6 +2026,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "In Words (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -1867,6 +2036,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, 
@@ -1885,6 +2055,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
@@ -1892,6 +2063,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, 
@@ -1911,6 +2083,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Grand Total", 
    "length": 0, 
    "no_copy": 0, 
@@ -1921,6 +2094,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, 
@@ -1939,6 +2113,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Rounded Total", 
    "length": 0, 
    "no_copy": 0, 
@@ -1949,6 +2124,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, 
@@ -1967,6 +2143,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "In Words", 
    "length": 0, 
    "no_copy": 0, 
@@ -1976,6 +2153,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, 
@@ -1994,6 +2172,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Advance", 
    "length": 0, 
    "no_copy": 0, 
@@ -2004,6 +2183,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, 
@@ -2022,6 +2202,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Outstanding Amount", 
    "length": 0, 
    "no_copy": 1, 
@@ -2032,6 +2213,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, 
@@ -2051,15 +2233,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Advance Payments", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-money", 
+   "options": "fa fa-money", 
    "permlevel": 0, 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -2078,6 +2262,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Get Advances Received", 
    "length": 0, 
    "no_copy": 0, 
@@ -2087,6 +2272,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, 
@@ -2105,6 +2291,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Advances", 
    "length": 0, 
    "no_copy": 0, 
@@ -2115,6 +2302,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, 
@@ -2135,14 +2323,16 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Payments", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "icon-money", 
+   "options": "fa fa-money", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -2162,6 +2352,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Cash/Bank Account", 
    "length": 0, 
    "no_copy": 0, 
@@ -2172,6 +2363,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, 
@@ -2190,6 +2382,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Sales Invoice Payment", 
    "length": 0, 
    "no_copy": 0, 
@@ -2199,6 +2392,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, 
@@ -2217,6 +2411,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -2224,6 +2419,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, 
@@ -2242,6 +2438,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Paid Amount (Company Currency)", 
    "length": 0, 
    "no_copy": 1, 
@@ -2251,6 +2448,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, 
@@ -2269,6 +2467,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -2276,6 +2475,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, 
@@ -2295,6 +2495,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Paid Amount", 
    "length": 0, 
    "no_copy": 1, 
@@ -2305,6 +2506,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, 
@@ -2323,6 +2525,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -2330,6 +2533,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, 
@@ -2348,6 +2552,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Base Change Amount (Company Currency)", 
    "length": 0, 
    "no_copy": 1, 
@@ -2357,6 +2562,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, 
@@ -2375,6 +2581,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -2382,6 +2589,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, 
@@ -2400,6 +2608,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Change Amount", 
    "length": 0, 
    "no_copy": 1, 
@@ -2409,6 +2618,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, 
@@ -2427,6 +2637,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Account for Change Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -2436,6 +2647,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, 
@@ -2456,6 +2668,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Write Off", 
    "length": 0, 
    "no_copy": 0, 
@@ -2463,6 +2676,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, 
@@ -2483,6 +2697,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Write Off Amount", 
    "length": 0, 
    "no_copy": 1, 
@@ -2491,6 +2706,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, 
@@ -2509,6 +2725,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Write Off Amount (Company Currency)", 
    "length": 0, 
    "no_copy": 1, 
@@ -2518,6 +2735,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, 
@@ -2537,6 +2755,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Write Off Outstanding Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -2544,6 +2763,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, 
@@ -2563,6 +2783,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -2570,6 +2791,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, 
@@ -2589,6 +2811,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Write Off Account", 
    "length": 0, 
    "no_copy": 0, 
@@ -2597,6 +2820,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, 
@@ -2616,6 +2840,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Write Off Cost Center", 
    "length": 0, 
    "no_copy": 0, 
@@ -2624,6 +2849,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, 
@@ -2643,6 +2869,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Terms", 
    "length": 0, 
    "no_copy": 0, 
@@ -2652,6 +2879,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, 
@@ -2670,6 +2898,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Terms", 
    "length": 0, 
    "no_copy": 0, 
@@ -2680,6 +2909,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, 
@@ -2698,6 +2928,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Terms and Conditions Details", 
    "length": 0, 
    "no_copy": 0, 
@@ -2707,6 +2938,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, 
@@ -2725,6 +2957,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Printing Settings", 
    "length": 0, 
    "no_copy": 0, 
@@ -2733,6 +2966,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, 
@@ -2751,6 +2985,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Letter Head", 
    "length": 0, 
    "no_copy": 0, 
@@ -2761,6 +2996,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, 
@@ -2779,6 +3015,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Print Language", 
    "length": 0, 
    "no_copy": 0, 
@@ -2787,6 +3024,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, 
@@ -2805,6 +3043,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -2812,6 +3051,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, 
@@ -2830,6 +3070,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Print Heading", 
    "length": 0, 
    "no_copy": 1, 
@@ -2840,6 +3081,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, 
@@ -2859,6 +3101,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "More Information", 
    "length": 0, 
    "no_copy": 0, 
@@ -2867,6 +3110,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, 
@@ -2878,23 +3122,26 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "project", 
+   "depends_on": "", 
+   "fieldname": "campaign", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Project", 
+   "in_standard_filter": 0, 
+   "label": "Campaign", 
    "length": 0, 
    "no_copy": 0, 
-   "oldfieldname": "project_name", 
+   "oldfieldname": "campaign", 
    "oldfieldtype": "Link", 
-   "options": "Project", 
+   "options": "Campaign", 
    "permlevel": 0, 
-   "print_hide": 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, 
@@ -2913,12 +3160,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, 
@@ -2931,24 +3180,24 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "depends_on": "", 
-   "fieldname": "campaign", 
-   "fieldtype": "Link", 
+   "default": "Draft", 
+   "fieldname": "status", 
+   "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 0, 
+   "in_filter": 1, 
    "in_list_view": 0, 
-   "label": "Campaign", 
+   "label": "Status", 
    "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "campaign", 
-   "oldfieldtype": "Link", 
-   "options": "Campaign", 
+   "no_copy": 1, 
+   "options": "\nDraft\nReturn\nCredit Note Issued\nSubmitted\nPaid\nUnpaid\nOverdue\nCancelled", 
    "permlevel": 0, 
+   "precision": "", 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
-   "read_only": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -2967,6 +3216,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Source", 
    "length": 0, 
    "no_copy": 0, 
@@ -2977,6 +3227,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, 
@@ -2995,15 +3246,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Accounting Details", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-file-text", 
+   "options": "fa fa-file-text", 
    "permlevel": 0, 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -3023,6 +3276,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Debit To", 
    "length": 0, 
    "no_copy": 0, 
@@ -3033,6 +3287,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, 
@@ -3051,6 +3306,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Party Account Currency", 
    "length": 0, 
    "no_copy": 1, 
@@ -3060,6 +3316,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, 
@@ -3080,6 +3337,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Is Opening Entry", 
    "length": 0, 
    "no_copy": 0, 
@@ -3090,6 +3348,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, 
@@ -3108,6 +3367,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "C-Form Applicable", 
    "length": 0, 
    "no_copy": 1, 
@@ -3116,6 +3376,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, 
@@ -3134,6 +3395,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "C-Form No", 
    "length": 0, 
    "no_copy": 1, 
@@ -3142,6 +3404,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, 
@@ -3160,6 +3423,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
@@ -3167,6 +3431,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, 
@@ -3185,6 +3450,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Posting Time", 
    "length": 0, 
    "no_copy": 1, 
@@ -3194,6 +3460,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, 
@@ -3212,6 +3479,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Remarks", 
    "length": 0, 
    "no_copy": 1, 
@@ -3221,6 +3489,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, 
@@ -3240,15 +3509,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Commission", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-group", 
+   "options": "fa fa-group", 
    "permlevel": 0, 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -3267,6 +3538,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Sales Partner", 
    "length": 0, 
    "no_copy": 0, 
@@ -3277,6 +3549,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, 
@@ -3295,6 +3568,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
@@ -3302,6 +3576,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, 
@@ -3321,6 +3596,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Commission Rate (%)", 
    "length": 0, 
    "no_copy": 0, 
@@ -3330,6 +3606,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, 
@@ -3348,6 +3625,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Commission", 
    "length": 0, 
    "no_copy": 0, 
@@ -3358,6 +3636,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, 
@@ -3377,6 +3656,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Sales Team", 
    "length": 0, 
    "no_copy": 0, 
@@ -3384,6 +3664,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, 
@@ -3402,6 +3683,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Sales Team1", 
    "length": 0, 
    "no_copy": 0, 
@@ -3412,6 +3694,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, 
@@ -3432,14 +3715,16 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Recurring", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "icon-time", 
+   "options": "fa fa-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, 
@@ -3458,6 +3743,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Settings", 
    "length": 0, 
    "no_copy": 0, 
@@ -3465,6 +3751,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, 
@@ -3486,6 +3773,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Is Recurring", 
    "length": 0, 
    "no_copy": 1, 
@@ -3493,6 +3781,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, 
@@ -3513,6 +3802,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Reference Document", 
    "length": 0, 
    "no_copy": 1, 
@@ -3521,6 +3811,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, 
@@ -3541,6 +3832,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Frequency", 
    "length": 0, 
    "no_copy": 1, 
@@ -3549,6 +3841,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, 
@@ -3569,6 +3862,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Repeat on Day of Month", 
    "length": 0, 
    "no_copy": 1, 
@@ -3576,6 +3870,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, 
@@ -3596,6 +3891,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "End Date", 
    "length": 0, 
    "no_copy": 1, 
@@ -3603,6 +3899,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, 
@@ -3622,6 +3919,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Submit on creation", 
    "length": 0, 
    "no_copy": 0, 
@@ -3630,6 +3928,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, 
@@ -3650,6 +3949,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Notify by email", 
    "length": 0, 
    "no_copy": 1, 
@@ -3658,6 +3958,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, 
@@ -3678,6 +3979,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Notification Email Address", 
    "length": 0, 
    "no_copy": 1, 
@@ -3686,6 +3988,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, 
@@ -3705,6 +4008,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Recurring Print Format", 
    "length": 0, 
    "no_copy": 0, 
@@ -3714,6 +4018,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, 
@@ -3732,6 +4037,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "This Document", 
    "length": 0, 
    "no_copy": 0, 
@@ -3739,6 +4045,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, 
@@ -3760,6 +4067,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "From Date", 
    "length": 0, 
    "no_copy": 1, 
@@ -3767,6 +4075,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, 
@@ -3787,6 +4096,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "To Date", 
    "length": 0, 
    "no_copy": 1, 
@@ -3794,6 +4104,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, 
@@ -3814,6 +4125,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Next Date", 
    "length": 0, 
    "no_copy": 1, 
@@ -3821,6 +4133,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, 
@@ -3839,6 +4152,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Against Income Account", 
    "length": 0, 
    "no_copy": 1, 
@@ -3848,6 +4162,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, 
@@ -3857,7 +4172,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-file-text", 
+ "icon": "fa fa-file-text", 
  "idx": 181, 
  "image_view": 0, 
  "in_create": 0, 
@@ -3867,7 +4182,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-09-16 06:09:01.246951", 
+ "modified": "2016-11-09 14:18:24.760263", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Sales Invoice", 
@@ -3883,6 +4198,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -3903,6 +4219,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -3923,6 +4240,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 1, 
    "print": 0, 
    "read": 1, 
@@ -3943,6 +4261,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 1, 
    "print": 0, 
    "read": 1, 
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
index 2a0077a..5dce71f 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
@@ -86,6 +86,7 @@
 		self.update_packing_list()
 		self.set_billing_hours_and_amount()
 		self.update_timesheet_billing_for_project()
+		self.set_status()
 
 	def before_save(self):
 		set_account_for_mode_of_payment(self)
@@ -136,7 +137,8 @@
 		self.check_close_sales_order("sales_order")
 
 		from erpnext.accounts.utils import unlink_ref_doc_from_payment_entries
-		unlink_ref_doc_from_payment_entries(self.doctype, self.name)
+		if frappe.db.get_single_value('Accounts Settings', 'unlink_payment_on_cancellation_of_invoice'):
+			unlink_ref_doc_from_payment_entries(self)
 
 		if self.is_return:
 			# NOTE status updating bypassed for is_return
@@ -157,6 +159,7 @@
 			self.update_stock_ledger()
 
 		self.make_gl_entries_on_cancel()
+		frappe.db.set(self, 'status', 'Cancelled')
 
 	def update_status_updater_args(self):
 		if cint(self.update_stock):
@@ -401,7 +404,7 @@
 		super(SalesInvoice, self).validate_warehouse()
 
 		for d in self.get('items'):
-			if not d.warehouse:
+			if not d.warehouse and frappe.db.get_value("Item", d.item_code, "is_stock_item"):
 				frappe.throw(_("Warehouse required at Row No {0}").format(d.idx))
 
 	def validate_delivery_note(self):
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice_dashboard.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice_dashboard.py
index f494303..20d4613 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice_dashboard.py
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice_dashboard.py
@@ -1,30 +1,31 @@
 from frappe import _
 
-data = {
-	'fieldname': 'sales_invoice',
-	'non_standard_fieldnames': {
-		'Delivery Note': 'against_sales_invoice',
-		'Journal Entry': 'reference_name',
-		'Payment Entry': 'reference_name',
-		'Payment Request': 'reference_name',
-		'Sales Invoice': 'return_against'
-	},
-	'internal_links': {
-		'Sales Order': ['items', 'sales_order'],
-		'Delivery Note': ['items', 'delivery_note'],
-	},
-	'transactions': [
-		{
-			'label': _('Payment'),
-			'items': ['Payment Entry', 'Payment Request', 'Journal Entry']
+def get_data():
+	return {
+		'fieldname': 'sales_invoice',
+		'non_standard_fieldnames': {
+			'Delivery Note': 'against_sales_invoice',
+			'Journal Entry': 'reference_name',
+			'Payment Entry': 'reference_name',
+			'Payment Request': 'reference_name',
+			'Sales Invoice': 'return_against'
 		},
-		{
-			'label': _('Reference'),
-			'items': ['Timesheet', 'Delivery Note', 'Sales Order']
+		'internal_links': {
+			'Sales Order': ['items', 'sales_order'],
+			'Delivery Note': ['items', 'delivery_note'],
 		},
-		{
-			'label': _('Returns'),
-			'items': ['Sales Invoice']
-		},
-	]
-}
\ No newline at end of file
+		'transactions': [
+			{
+				'label': _('Payment'),
+				'items': ['Payment Entry', 'Payment Request', 'Journal Entry']
+			},
+			{
+				'label': _('Reference'),
+				'items': ['Timesheet', 'Delivery Note', 'Sales Order']
+			},
+			{
+				'label': _('Returns'),
+				'items': ['Sales Invoice']
+			},
+		]
+	}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js
index 55e8b21..3c9c4b4 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js
@@ -10,9 +10,11 @@
 			return [__("Return"), "darkgrey", "is_return,=,Yes"];
 		} else if(flt(doc.outstanding_amount)==0) {
 			return [__("Paid"), "green", "outstanding_amount,=,0"]
-		} else if (flt(doc.outstanding_amount) > 0 && doc.due_date > frappe.datetime.get_today()) {
+		} else if(flt(doc.outstanding_amount) < 0) {
+			return [__("Credit Note Issued"), "darkgrey", "outstanding_amount,<,0"]
+		}else if (flt(doc.outstanding_amount) > 0 && doc.due_date >= frappe.datetime.get_today()) {
 			return [__("Unpaid"), "orange", "outstanding_amount,>,0|due_date,>,Today"]
-		} else if (flt(doc.outstanding_amount) > 0 && doc.due_date <= frappe.datetime.get_today()) {
+		} else if (flt(doc.outstanding_amount) > 0 && doc.due_date < frappe.datetime.get_today()) {
 			return [__("Overdue"), "red", "outstanding_amount,>,0|due_date,<=,Today"]
 		}
 	},
diff --git a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
index 1bb7b1c..c4f275a 100644
--- a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
@@ -4,8 +4,10 @@
 
 import frappe
 import unittest, copy
-from frappe.utils import nowdate, add_days, flt
+from frappe.utils import nowdate, add_days, flt, nowdate
 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
 from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import set_perpetual_inventory
 from erpnext.exceptions import InvalidAccountCurrency, InvalidCurrency
 from erpnext.stock.doctype.serial_no.serial_no import SerialNoWarehouseError
@@ -19,6 +21,12 @@
 		w.submit()
 		return w
 
+	def setUp(self):
+		unlink_payment_on_cancel_of_invoice()
+
+	def tearDown(self):
+		unlink_payment_on_cancel_of_invoice(0)
+
 	def test_timestamp_change(self):
 		w = frappe.copy_doc(test_records[0])
 		w.docstatus = 0
@@ -78,6 +86,28 @@
 		self.assertEquals(si.base_grand_total, 1627.05)
 		self.assertEquals(si.grand_total, 1627.05)
 
+	def test_payment_entry_unlink_against_invoice(self):
+		from erpnext.accounts.doctype.payment_entry.test_payment_entry import get_payment_entry
+		si = frappe.copy_doc(test_records[0])
+		si.is_pos = 0
+		si.insert()
+		si.submit()
+
+		pe = get_payment_entry("Sales Invoice", si.name, bank_account="_Test Bank - _TC")
+		pe.reference_no = "1"
+		pe.reference_date = nowdate()
+		pe.paid_from_account_currency = si.currency
+		pe.paid_to_account_currency = si.currency
+		pe.source_exchange_rate = 1
+		pe.target_exchange_rate = 1
+		pe.paid_amount = si.grand_total
+		pe.insert()
+		pe.submit()
+
+		unlink_payment_on_cancel_of_invoice(0)
+		si = frappe.get_doc('Sales Invoice', si.name)
+		self.assertRaises(frappe.LinkExistsError, si.cancel)
+
 	def test_sales_invoice_calculation_export_currency(self):
 		si = frappe.copy_doc(test_records[2])
 		si.currency = "USD"
@@ -438,7 +468,7 @@
 
 	def test_pos_gl_entry_with_perpetual_inventory(self):
 		set_perpetual_inventory()
-		self.make_pos_profile()
+		make_pos_profile()
 
 		self._insert_purchase_receipt()
 		pos = copy.deepcopy(test_records[1])
@@ -457,7 +487,7 @@
 
 	def test_pos_change_amount(self):
 		set_perpetual_inventory()
-		self.make_pos_profile()
+		make_pos_profile()
 
 		self._insert_purchase_receipt()
 		pos = copy.deepcopy(test_records[1])
@@ -479,7 +509,7 @@
 
 		set_perpetual_inventory()
 
-		self.make_pos_profile()
+		make_pos_profile()
 		self._insert_purchase_receipt()
 
 		pos = copy.deepcopy(test_records[1])
@@ -543,80 +573,6 @@
 
 		frappe.db.sql("delete from `tabPOS Profile`")
 
-	def make_pos_profile(self):
-		pos_profile = frappe.get_doc({
-			"company": "_Test Company",
-			"cost_center": "_Test Cost Center - _TC",
-			"currency": "INR",
-			"doctype": "POS Profile",
-			"expense_account": "_Test Account Cost for Goods Sold - _TC",
-			"income_account": "Sales - _TC",
-			"name": "_Test POS Profile",
-			"naming_series": "_T-POS Profile-",
-			"selling_price_list": "_Test Price List",
-			"territory": "_Test Territory",
-			"warehouse": "_Test Warehouse - _TC",
-			"write_off_account": "_Test Write Off - _TC",
-			"write_off_cost_center": "_Test Write Off Cost Center - _TC"
-		})
-
-		if not frappe.db.exists("POS Profile", "_Test POS Profile"):
-			pos_profile.insert()
-
-	def test_si_gl_entry_with_perpetual_inventory_and_update_stock_with_warehouse_but_no_account(self):
-		set_perpetual_inventory()
-		frappe.delete_doc("Account", "_Test Warehouse No Account - _TC")
-
-		# insert purchase receipt
-		from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import test_records \
-			as pr_test_records
-		pr = frappe.copy_doc(pr_test_records[0])
-		pr.naming_series = "_T-Purchase Receipt-"
-		pr.get("items")[0].warehouse = "_Test Warehouse No Account - _TC"
-		pr.insert()
-		pr.submit()
-
-		si_doc = copy.deepcopy(test_records[1])
-		si_doc["update_stock"] = 1
-		# si_doc["posting_time"] = "12:05"
-		si_doc.get("items")[0]["warehouse"] = "_Test Warehouse No Account - _TC"
-
-		si = frappe.copy_doc(si_doc)
-		si.insert()
-		si.submit()
-
-		# check stock ledger entries
-		sle = frappe.db.sql("""select * from `tabStock Ledger Entry`
-			where voucher_type = 'Sales Invoice' and voucher_no = %s""",
-			si.name, as_dict=1)[0]
-		self.assertTrue(sle)
-		self.assertEquals([sle.item_code, sle.warehouse, sle.actual_qty],
-			["_Test Item", "_Test Warehouse No Account - _TC", -1.0])
-
-		# check gl entries
-		gl_entries = frappe.db.sql("""select account, debit, credit
-			from `tabGL Entry` where voucher_type='Sales Invoice' and voucher_no=%s
-			order by account asc, debit asc""", si.name, as_dict=1)
-		self.assertTrue(gl_entries)
-
-		expected_gl_entries = dict((d[0], d) for d in [
-			[si.debit_to, 630.0, 0.0],
-			[si_doc.get("items")[0]["income_account"], 0.0, 500.0],
-			[si_doc.get("taxes")[0]["account_head"], 0.0, 80.0],
-			[si_doc.get("taxes")[1]["account_head"], 0.0, 50.0],
-		])
-		for i, gle in enumerate(gl_entries):
-			self.assertEquals(expected_gl_entries[gle.account][0], gle.account)
-			self.assertEquals(expected_gl_entries[gle.account][1], gle.debit)
-			self.assertEquals(expected_gl_entries[gle.account][2], gle.credit)
-
-		si.cancel()
-		gle = frappe.db.sql("""select * from `tabGL Entry`
-			where voucher_type='Sales Invoice' and voucher_no=%s""", si.name)
-
-		self.assertFalse(gle)
-		set_perpetual_inventory(0)
-
 	def test_sales_invoice_gl_entry_with_perpetual_inventory_no_item_code(self):
 		set_perpetual_inventory()
 
@@ -1005,6 +961,86 @@
 		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
+
+		jv = frappe.copy_doc(jv_test_records[0])
+		jv.insert()
+		jv.submit()
+
+		si = frappe.copy_doc(test_records[0])
+		si.append("advances", {
+			"doctype": "Sales Invoice Advance",
+			"reference_type": "Journal Entry",
+			"reference_name": jv.name,
+			"reference_row": jv.get("accounts")[0].name,
+			"advance_amount": 400,
+			"allocated_amount": 300,
+			"remarks": jv.remark
+		})
+		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
+		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",
+			"payment_type": "Receive",
+			"party_type": "Customer",
+			"party": "_Test Customer",
+			"company": "_Test Company",
+			"paid_from_account_currency": "INR",
+			"paid_to_account_currency": "INR",
+			"source_exchange_rate": 1,
+			"target_exchange_rate": 1,
+			"reference_no": "1",
+			"reference_date": nowdate(),
+			"received_amount": 300,
+			"paid_amount": 300,
+			"paid_from": "_Test Receivable - _TC",
+			"paid_to": "_Test Cash - _TC"
+		})
+		pe.insert()
+		pe.submit()
+		
+		si = frappe.copy_doc(test_records[0])
+		si.is_pos = 0
+		si.append("advances", {
+			"doctype": "Sales Invoice Advance",
+			"reference_type": "Payment Entry",
+			"reference_name": pe.name,
+			"advance_amount": 300,
+			"allocated_amount": 300,
+			"remarks": pe.remarks
+		})
+		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")))
 
 def create_sales_invoice(**args):
 	si = frappe.new_doc("Sales Invoice")
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 dd46e76..944230b 100644
--- a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
+++ b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
@@ -23,6 +23,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Barcode", 
    "length": 0, 
    "no_copy": 0, 
@@ -30,6 +31,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, 
@@ -48,6 +50,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Item", 
    "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": 1, 
@@ -76,12 +80,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, 
@@ -100,6 +106,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Item Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -109,6 +116,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, 
@@ -127,6 +135,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer's Item Code", 
    "length": 0, 
    "no_copy": 0, 
@@ -134,6 +143,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, 
@@ -152,6 +162,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Edit Description", 
    "length": 0, 
    "no_copy": 0, 
@@ -160,6 +171,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, 
@@ -178,6 +190,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Description", 
    "length": 0, 
    "no_copy": 0, 
@@ -188,6 +201,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "200px", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -207,6 +221,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -214,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, 
@@ -232,6 +248,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Image View", 
    "length": 0, 
    "no_copy": 0, 
@@ -241,6 +258,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, 
@@ -259,6 +277,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Image", 
    "length": 0, 
    "no_copy": 0, 
@@ -267,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, 
@@ -285,6 +305,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
@@ -292,6 +313,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, 
@@ -310,6 +332,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Quantity", 
    "length": 0, 
    "no_copy": 0, 
@@ -319,6 +342,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, 
@@ -337,6 +361,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Price List Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -347,6 +372,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, 
@@ -365,12 +391,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, 
@@ -389,6 +417,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "UOM", 
    "length": 0, 
    "no_copy": 0, 
@@ -397,6 +426,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, 
@@ -415,6 +445,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Price List Rate (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -425,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, 
@@ -443,6 +475,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Discount and Margin", 
    "length": 0, 
    "no_copy": 0, 
@@ -451,6 +484,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, 
@@ -470,6 +504,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Discount on Price List Rate (%)", 
    "length": 0, 
    "no_copy": 0, 
@@ -479,6 +514,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, 
@@ -497,6 +533,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -504,6 +541,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, 
@@ -523,6 +561,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Margin Type", 
    "length": 0, 
    "no_copy": 0, 
@@ -532,6 +571,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, 
@@ -551,6 +591,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Margin Rate or Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -559,6 +600,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, 
@@ -572,12 +614,13 @@
    "columns": 0, 
    "depends_on": "eval:doc.margin_type && doc.price_list_rate", 
    "fieldname": "total_margin", 
-   "fieldtype": "Float", 
+   "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 Margin", 
    "length": 0, 
    "no_copy": 0, 
@@ -586,6 +629,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, 
@@ -604,12 +648,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, 
@@ -628,6 +674,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -638,6 +685,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, 
@@ -656,6 +704,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -666,6 +715,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, 
@@ -684,12 +734,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, 
@@ -708,6 +760,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Rate (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -718,6 +771,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, 
@@ -736,6 +790,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amount (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -746,6 +801,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, 
@@ -764,6 +820,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Pricing Rule", 
    "length": 0, 
    "no_copy": 0, 
@@ -772,6 +829,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,6 +848,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -797,6 +856,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,6 +875,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Net Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -824,6 +885,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,6 +904,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Net Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -851,6 +914,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,6 +933,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -876,6 +941,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,6 +960,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Net Rate (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -903,6 +970,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,6 +989,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Net Amount (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -930,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, 
@@ -949,6 +1019,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Drop Ship", 
    "length": 0, 
    "no_copy": 0, 
@@ -957,6 +1028,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, 
@@ -975,6 +1047,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Delivered By Supplier", 
    "length": 0, 
    "no_copy": 0, 
@@ -983,6 +1056,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, 
@@ -1001,6 +1075,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Accounting Details", 
    "length": 0, 
    "no_copy": 0, 
@@ -1008,6 +1083,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, 
@@ -1026,6 +1102,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Income Account", 
    "length": 0, 
    "no_copy": 0, 
@@ -1037,6 +1114,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "120px", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -1056,6 +1134,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Expense Account", 
    "length": 0, 
    "no_copy": 0, 
@@ -1064,6 +1143,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, 
@@ -1083,12 +1163,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, 
@@ -1108,6 +1190,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Cost Center", 
    "length": 0, 
    "no_copy": 0, 
@@ -1119,6 +1202,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "120px", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -1139,6 +1223,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Stock Details", 
    "length": 0, 
    "no_copy": 0, 
@@ -1146,6 +1231,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, 
@@ -1164,6 +1250,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Warehouse", 
    "length": 0, 
    "no_copy": 0, 
@@ -1174,6 +1261,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, 
@@ -1192,6 +1280,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer Warehouse (Optional)", 
    "length": 0, 
    "no_copy": 1, 
@@ -1201,6 +1290,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, 
@@ -1212,22 +1302,25 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "serial_no", 
-   "fieldtype": "Small Text", 
+   "depends_on": "eval:!doc.__islocal", 
+   "fieldname": "quality_inspection", 
+   "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
-   "in_list_view": 1, 
-   "label": "Serial No", 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Quality Inspection", 
    "length": 0, 
    "no_copy": 0, 
-   "oldfieldname": "serial_no", 
-   "oldfieldtype": "Small Text", 
+   "options": "Quality Inspection", 
    "permlevel": 0, 
+   "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1246,6 +1339,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Batch No", 
    "length": 0, 
    "no_copy": 0, 
@@ -1254,6 +1348,62 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "col_break5", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_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": "serial_no", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Serial No", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "serial_no", 
+   "oldfieldtype": "Small Text", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1273,6 +1423,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Item Group", 
    "length": 0, 
    "no_copy": 0, 
@@ -1283,6 +1434,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, 
@@ -1301,6 +1453,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Brand Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -1310,6 +1463,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, 
@@ -1328,6 +1482,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Item Tax Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -1337,30 +1492,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "col_break5", 
-   "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, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1379,6 +1511,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Available Batch Qty at Warehouse", 
    "length": 0, 
    "no_copy": 1, 
@@ -1388,6 +1521,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, 
@@ -1407,6 +1541,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Available Qty at Warehouse", 
    "length": 0, 
    "no_copy": 0, 
@@ -1416,6 +1551,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, 
@@ -1434,6 +1570,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "References", 
    "length": 0, 
    "no_copy": 0, 
@@ -1442,6 +1579,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, 
@@ -1460,6 +1598,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Sales Order", 
    "length": 0, 
    "no_copy": 1, 
@@ -1470,6 +1609,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, 
@@ -1488,6 +1628,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Sales Order Item", 
    "length": 0, 
    "no_copy": 1, 
@@ -1497,6 +1638,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, 
@@ -1515,6 +1657,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -1522,6 +1665,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, 
@@ -1540,6 +1684,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Delivery Note", 
    "length": 0, 
    "no_copy": 1, 
@@ -1550,6 +1695,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, 
@@ -1568,6 +1714,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Delivery Note Item", 
    "length": 0, 
    "no_copy": 1, 
@@ -1577,6 +1724,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, 
@@ -1595,6 +1743,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Delivered Qty", 
    "length": 0, 
    "no_copy": 0, 
@@ -1604,6 +1753,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, 
@@ -1622,6 +1772,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Is Fixed Asset", 
    "length": 0, 
    "no_copy": 1, 
@@ -1630,6 +1781,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, 
@@ -1648,6 +1800,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Asset", 
    "length": 0, 
    "no_copy": 1, 
@@ -1657,6 +1810,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, 
@@ -1675,6 +1829,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -1682,6 +1837,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, 
@@ -1700,6 +1856,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Page Break", 
    "length": 0, 
    "no_copy": 1, 
@@ -1707,6 +1864,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, 
@@ -1724,7 +1882,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-08-26 04:48:29.142409", 
+ "modified": "2016-11-16 16:04:02.438952", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Sales Invoice Item", 
diff --git a/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.json b/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.json
index 04cc330..894d5ab 100644
--- a/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.json
+++ b/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.json
@@ -3,23 +3,28 @@
  "allow_import": 1, 
  "allow_rename": 1, 
  "autoname": "field:title", 
+ "beta": 0, 
  "creation": "2013-01-10 16:34:09", 
  "custom": 0, 
  "description": "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.\n\n#### Note\n\nThe 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.\n\n#### Description of Columns\n\n1. Calculation Type: \n    - This can be on **Net Total** (that is the sum of basic amount).\n    - **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.\n    - **Actual** (as mentioned).\n2. Account Head: The Account ledger under which this tax will be booked\n3. Cost Center: If the tax / charge is an income (like shipping) or expense it needs to be booked against a Cost Center.\n4. Description: Description of the tax (that will be printed in invoices / quotes).\n5. Rate: Tax rate.\n6. Amount: Tax amount.\n7. Total: Cumulative total to this point.\n8. 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).\n9. 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.", 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Setup", 
+ "editable_grid": 0, 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "title", 
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Title", 
    "length": 0, 
    "no_copy": 1, 
@@ -27,7 +32,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, 
@@ -38,18 +45,23 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "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": "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, 
@@ -60,19 +72,24 @@
    "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_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, 
@@ -83,17 +100,22 @@
    "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, 
+   "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, 
@@ -104,12 +126,15 @@
    "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": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -118,7 +143,9 @@
    "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, 
@@ -129,17 +156,22 @@
    "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_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -150,13 +182,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "* Will be calculated in the transaction.", 
    "fieldname": "taxes", 
    "fieldtype": "Table", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Sales Taxes and Charges", 
    "length": 0, 
    "no_copy": 0, 
@@ -165,7 +200,9 @@
    "options": "Sales Taxes and Charges", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -175,15 +212,16 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-money", 
+ "icon": "fa fa-money", 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:57.346680", 
+ "modified": "2016-11-07 05:18:41.743257", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Sales Taxes and Charges Template", 
@@ -199,6 +237,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -219,6 +258,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -239,6 +279,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -250,6 +291,9 @@
    "write": 1
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "sort_order": "ASC", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py b/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py
index 28964bb..3947450 100644
--- a/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py
+++ b/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py
@@ -4,12 +4,18 @@
 from __future__ import unicode_literals
 import frappe
 from frappe import _
+from frappe.utils import flt
 from frappe.model.document import Document
 from erpnext.controllers.accounts_controller import validate_taxes_and_charges, validate_inclusive_tax
 
 class SalesTaxesandChargesTemplate(Document):
 	def validate(self):
 		valdiate_taxes_and_charges_template(self)
+		
+	def set_missing_values(self):
+		for data in self.taxes:
+			if data.charge_type == 'On Net Total' and flt(data.rate) == 0.0:
+				data.rate = frappe.db.get_value('Account', data.account_head, 'tax_rate')
 
 def valdiate_taxes_and_charges_template(doc):
 	# default should not be disabled
diff --git a/erpnext/accounts/doctype/shipping_rule/shipping_rule.json b/erpnext/accounts/doctype/shipping_rule/shipping_rule.json
index 7816dd5..a8788a1 100644
--- a/erpnext/accounts/doctype/shipping_rule/shipping_rule.json
+++ b/erpnext/accounts/doctype/shipping_rule/shipping_rule.json
@@ -3,29 +3,36 @@
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "field:label", 
+ "beta": 0, 
  "creation": "2013-06-25 11:48:03", 
  "custom": 0, 
  "description": "Specify conditions to calculate shipping amount", 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "editable_grid": 0, 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "example: Next Day Shipping", 
    "fieldname": "label", 
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Shipping Rule 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": 1, 
    "search_index": 0, 
@@ -36,19 +43,24 @@
    "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_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, 
@@ -59,20 +71,25 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "Net Total", 
    "fieldname": "calculate_based_on", 
    "fieldtype": "Select", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Calculate Based On", 
    "length": 0, 
    "no_copy": 0, 
    "options": "Net Total\nNet Weight", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -83,19 +100,24 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:!doc.disabled", 
    "fieldname": "rule_conditions_section", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Shipping Rule Conditions", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -106,19 +128,24 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "conditions", 
    "fieldtype": "Table", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Shipping Rule Conditions", 
    "length": 0, 
    "no_copy": 0, 
    "options": "Shipping Rule Condition", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -129,19 +156,24 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:!doc.disabled", 
    "fieldname": "section_break_6", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Valid for Countries", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -152,19 +184,24 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "worldwide_shipping", 
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Worldwide Shipping", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_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,13 +212,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:!doc.worldwide_shipping", 
    "fieldname": "countries", 
    "fieldtype": "Table", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Valid for Countries", 
    "length": 0, 
    "no_copy": 0, 
@@ -189,7 +229,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, 
@@ -200,18 +242,23 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:!doc.disabled", 
    "fieldname": "section_break_10", 
    "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, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -222,19 +269,24 @@
    "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, 
@@ -245,17 +297,22 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_12", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_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, 
@@ -266,19 +323,24 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "account", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Shipping Account", 
    "length": 0, 
    "no_copy": 0, 
    "options": "Account", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -289,19 +351,24 @@
    "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_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Cost Center", 
    "length": 0, 
    "no_copy": 0, 
    "options": "Cost Center", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -311,15 +378,16 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-truck", 
+ "icon": "fa fa-truck", 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:57.633071", 
+ "modified": "2016-11-07 05:18:06.472734", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Shipping Rule", 
@@ -335,6 +403,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -355,6 +424,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -375,6 +445,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -395,6 +466,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -406,6 +478,9 @@
    "write": 1
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "sort_order": "ASC", 
+ "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 26e379b..04125c2 100644
--- a/erpnext/accounts/doctype/tax_rule/tax_rule.json
+++ b/erpnext/accounts/doctype/tax_rule/tax_rule.json
@@ -9,11 +9,13 @@
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Setup", 
+ "editable_grid": 0, 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "Sales", 
    "fieldname": "tax_type", 
    "fieldtype": "Select", 
@@ -22,6 +24,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Tax 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": 0, 
    "search_index": 0, 
@@ -41,6 +45,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "use_for_shopping_cart", 
    "fieldtype": "Check", 
    "hidden": 0, 
@@ -48,6 +53,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Use for Shopping Cart", 
    "length": 0, 
    "no_copy": 0, 
@@ -56,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, 
@@ -66,6 +73,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_1", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -73,6 +81,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 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, 
    "depends_on": "eval:doc.tax_type==\"Sales\"", 
    "fieldname": "sales_tax_template", 
    "fieldtype": "Link", 
@@ -98,6 +109,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Sales Tax Template", 
    "length": 0, 
    "no_copy": 0, 
@@ -107,6 +119,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,6 +130,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.tax_type==\"Purchase\"", 
    "fieldname": "purchase_tax_template", 
    "fieldtype": "Link", 
@@ -125,6 +139,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Purchase Tax Template", 
    "length": 0, 
    "no_copy": 0, 
@@ -134,6 +149,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, 
@@ -144,6 +160,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "filters", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -151,6 +168,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Filters", 
    "length": 0, 
    "no_copy": 0, 
@@ -159,6 +177,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,6 +188,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.tax_type==\"Sales\"", 
    "fieldname": "customer", 
    "fieldtype": "Link", 
@@ -177,6 +197,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer", 
    "length": 0, 
    "no_copy": 0, 
@@ -186,6 +207,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,6 +218,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.tax_type==\"Purchase\"", 
    "fieldname": "supplier", 
    "fieldtype": "Link", 
@@ -204,6 +227,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Supplier", 
    "length": 0, 
    "no_copy": 0, 
@@ -213,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, 
@@ -223,6 +248,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "billing_city", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -230,6 +256,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Billing City", 
    "length": 0, 
    "no_copy": 0, 
@@ -238,6 +265,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, 
@@ -248,6 +276,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "billing_county", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -255,6 +284,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Billing County", 
    "length": 0, 
    "no_copy": 0, 
@@ -263,6 +293,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,6 +304,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "billing_state", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -280,6 +312,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Billing State", 
    "length": 0, 
    "no_copy": 0, 
@@ -288,6 +321,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, 
@@ -298,6 +332,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "billing_country", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -305,6 +340,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Billing Country", 
    "length": 0, 
    "no_copy": 0, 
@@ -314,6 +350,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 +361,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_2", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -331,6 +369,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -338,6 +377,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 +388,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.tax_type==\"Sales\"", 
    "fieldname": "customer_group", 
    "fieldtype": "Link", 
@@ -356,6 +397,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer Group", 
    "length": 0, 
    "no_copy": 0, 
@@ -365,6 +407,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, 
@@ -375,6 +418,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.tax_type==\"Purchase\"", 
    "fieldname": "supplier_type", 
    "fieldtype": "Link", 
@@ -383,6 +427,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Supplier Type", 
    "length": 0, 
    "no_copy": 0, 
@@ -392,6 +437,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, 
@@ -402,6 +448,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "shipping_city", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -409,6 +456,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Shipping City", 
    "length": 0, 
    "no_copy": 0, 
@@ -417,6 +465,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, 
@@ -427,6 +476,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "shipping_county", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -434,6 +484,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Shipping County", 
    "length": 0, 
    "no_copy": 0, 
@@ -442,6 +493,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, 
@@ -452,6 +504,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "shipping_state", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -459,6 +512,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Shipping State", 
    "length": 0, 
    "no_copy": 0, 
@@ -467,6 +521,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, 
@@ -477,6 +532,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "shipping_country", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -484,6 +540,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Shipping Country", 
    "length": 0, 
    "no_copy": 0, 
@@ -493,6 +550,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, 
@@ -503,6 +561,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_4", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -510,6 +569,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Validity", 
    "length": 0, 
    "no_copy": 0, 
@@ -518,6 +578,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, 
@@ -528,6 +589,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "from_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -535,6 +597,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "From Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -543,6 +606,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, 
@@ -553,6 +617,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_7", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -560,6 +625,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -567,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, 
@@ -577,6 +644,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "to_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -584,6 +652,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "To Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -592,6 +661,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, 
@@ -602,6 +672,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_6", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -609,6 +680,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -616,6 +688,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, 
@@ -626,6 +699,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "1", 
    "fieldname": "priority", 
    "fieldtype": "Int", 
@@ -634,6 +708,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Priority", 
    "length": 0, 
    "no_copy": 0, 
@@ -642,6 +717,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, 
@@ -652,6 +728,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_20", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -659,6 +736,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -666,6 +744,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, 
@@ -676,6 +755,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "company", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -683,6 +763,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -692,6 +773,7 @@
    "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, 
@@ -702,13 +784,14 @@
  "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": "2016-05-30 15:53:16.630072", 
+ "modified": "2016-11-07 05:17:58.691011", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Tax Rule", 
@@ -725,6 +808,7 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
diff --git a/erpnext/accounts/general_ledger.py b/erpnext/accounts/general_ledger.py
index 4af197e..392902c 100644
--- a/erpnext/accounts/general_ledger.py
+++ b/erpnext/accounts/general_ledger.py
@@ -168,8 +168,8 @@
 
 	if not gl_entries:
 		gl_entries = frappe.db.sql("""
-			select account, posting_date, party_type, party, cost_center, fiscal_year,
-			voucher_type, voucher_no, against_voucher_type, against_voucher, cost_center
+			select account, posting_date, party_type, party, cost_center, fiscal_year,voucher_type,
+			voucher_no, against_voucher_type, against_voucher, cost_center, company
 			from `tabGL Entry`
 			where voucher_type=%s and voucher_no=%s""", (voucher_type, voucher_no), as_dict=True)
 
diff --git a/erpnext/accounts/page/pos/pos.js b/erpnext/accounts/page/pos/pos.js
index 07e55d9..70db094 100644
--- a/erpnext/accounts/page/pos/pos.js
+++ b/erpnext/accounts/page/pos/pos.js
@@ -15,33 +15,19 @@
 	window.onbeforeunload = function () {
 		return wrapper.pos.beforeunload()
 	}
-	wrapper.pos.on_refresh_page()
 }
 
 
 erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({
 	init: function(wrapper){
-		this.load = true;
 		this.page = wrapper.page;
 		this.wrapper = $(wrapper).find('.page-content');
 		this.set_indicator();
 		this.onload();
 		this.make_menu_list();
-		this.set_interval_for_si_sync();
 		this.si_docs = this.get_doc_from_localstorage();
 	},
 
-	on_refresh_page: function() {
-		var me = this;
-		if(this.load){
-			this.load = false;
-		}else if(this.connection_status){
-			this.onload();
-		}else{
-			this.create_new();
-		}
-	},
-
 	beforeunload: function(e){
 		if(this.connection_status == false && frappe.get_route()[0] == "pos"){
 			e = e || window.event;
@@ -86,8 +72,6 @@
 		this.get_data_from_server(function(){
 			me.create_new();
 		});
-
-		this.check_internet_connection();
 	},
 
 	make_menu_list: function(){
@@ -111,6 +95,10 @@
 			})
 		});
 
+		this.page.add_menu_item(__("Sync Offline Invoices"), function(){
+			me.sync_sales_invoice()
+		});
+
 		this.page.add_menu_item(__("POS Profile"), function() {
 			frappe.set_route('List', 'POS Profile');
 		});
@@ -213,13 +201,10 @@
 			freeze: true,
 			freeze_message: __("Master data syncing, it might take some time"),
 			callback: function(r){
-				window.items = r.message.items;
-				window.customers = r.message.customers;
-				window.pricing_rules = r.message.pricing_rules;
-				window.meta = r.message.meta;
-				window.print_template = r.message.print_template;
-				me.default_customer = r.message.default_customer || null;
+				me.init_master_data(r)
 				localStorage.setItem('doc', JSON.stringify(r.message.doc));
+				me.set_interval_for_si_sync();
+				me.check_internet_connection();
 				if(callback){
 					callback();
 				}
@@ -227,6 +212,22 @@
 		})
 	},
 
+	init_master_data: function(r){
+		var me = this;
+		this.meta = r.message.meta;
+		this.item_data = r.message.items;
+		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.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;
+	},
+
 	save_previous_entry : function(){
 		if(this.frm.doc.items.length > 0){
 			this.create_invoice()
@@ -242,20 +243,22 @@
 	},
 
 	load_data: function(load_doc){
-		this.items = window.items;
-		this.customers = window.customers;
-		this.pricing_rules = window.pricing_rules;
+		var me = this;
+
+		this.items = this.item_data;
+		this.actual_qty_dict = {};
 
 		if(load_doc) {
 			this.frm.doc =  JSON.parse(localStorage.getItem('doc'));
 		}
 
-		$.each(window.meta, function(i, data){
+		$.each(this.meta, function(i, data){
 			frappe.meta.sync(data)
 		})
 
 		this.print_template = frappe.render_template("print_template",
-			{content: window.print_template, title:"POS"})
+			{content: this.print_template, title:"POS",
+			base_url: frappe.urllib.get_base_url(), print_css: frappe.boot.print_css})
 	},
 
 	setup: function(){
@@ -366,11 +369,14 @@
 	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(data.name.toLowerCase().match(key)
-					|| data.customer_name.toLowerCase().match(key)
-					|| (data.customer_group && data.customer_group.toLowerCase().match(key))){
+				if(reg.test(data.name.toLowerCase())
+					|| reg.test(data.customer_name.toLowerCase())
+					|| (data.customer_group && reg.test(data.customer_group.toLowerCase()))){
 					return data
 				}
 			})
@@ -392,12 +398,12 @@
 		var $wrap = me.wrapper.find(".item-list");
 		me.wrapper.find(".item-list").empty();
 
-		if (this.items) {
+		if (this.items.length > 0) {
 			$.each(this.items, function(index, obj) {
-				if(index < 16){
+				if(index < 30){
 					$(frappe.render_template("pos_item", {
 						item_code: obj.name,
-						item_price: format_currency(obj.price_list_rate, obj.currency),
+						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,
 						color: frappe.get_palette(obj.item_name),
@@ -405,6 +411,8 @@
 					})).tooltip().appendTo($wrap);
 				}
 			});
+		} else {
+			$("<h4>Searching record not found.</h4>").appendTo($wrap)
 		}
 
 		if(this.items.length == 1
@@ -431,37 +439,40 @@
 		this.item_batch_no = {};
 
 		if(item_code){
-			return $.grep(window.items, function(item){
+			return $.grep(this.item_data, function(item){
 				if(item.item_code == item_code ){
 					return true
 				}
 			})
 		}
 
-		key = this.search.$input.val().toLowerCase();
+		key =  this.search.$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(window.items, function(item){
+			return $.grep(this.item_data, function(item){
 				if(search_status){
-					if(in_list(item.batch_nos, me.search.$input.val())){
+					if(in_list(me.batch_no_data[item.item_code], me.search.$input.val())){
 						search_status = false;
 						return me.item_batch_no[item.item_code] = me.search.$input.val()
-					} else if(in_list(Object.keys(item.serial_nos), 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())) {
 						search_status = false;
-						me.item_serial_no[item.item_code] = [me.search.$input.val(), item.serial_nos[me.search.$input.val()]]
+						me.item_serial_no[item.item_code] = [me.search.$input.val(), me.serial_no_data[item.item_code][me.search.$input.val()]]
 						return true
 					} else if(item.barcode == me.search.$input.val()) {
 						search_status = false;
 						return item.barcode == me.search.$input.val();
-					} else if((item.item_code.toLowerCase().match(key)) ||
-						(item.item_name.toLowerCase().match(key)) || (item.item_group.toLowerCase().match(key))) {
+					} 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 window.items;
+			return this.item_data;
 		}
 	},
 
@@ -614,18 +625,18 @@
 		this.child.description = this.items[0].description;
 		this.child.qty = 1;
 		this.child.item_group = this.items[0].item_group;
-		this.child.cost_center = this.items[0].cost_center;
-		this.child.income_account = this.items[0].income_account;
+		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.items[0].default_warehouse);
-		this.child.price_list_rate = flt(this.items[0].price_list_rate, 9) / flt(this.frm.doc.conversion_rate, 9);
-		this.child.rate = flt(this.items[0].price_list_rate, 9) / flt(this.frm.doc.conversion_rate, 9);
-		this.child.actual_qty = this.items[0].actual_qty;
+			? 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]);
 		this.child.amount = flt(this.child.qty) * flt(this.child.rate);
 		this.child.batch_no = this.item_batch_no[this.child.item_code];
 		this.child.serial_no = (this.item_serial_no[this.child.item_code]
 			? this.item_serial_no[this.child.item_code][0] : '');
-		this.child.item_tax_rate = this.items[0].taxes;
+		this.child.item_tax_rate = JSON.stringify(this.tax_data[this.child.item_code]);
 	},
 
 	update_paid_amount_status: function(update_paid_amount){
@@ -666,13 +677,12 @@
 	show_items_in_item_cart: function() {
 		var me = this;
 		var $items = this.wrapper.find(".items").empty();
-		me.frm.doc.net_total = 0.0
 		$.each(this.frm.doc.items|| [], function(i, d) {
 			$(frappe.render_template("pos_bill_item", {
 				item_code: d.item_code,
 				item_name: (d.item_name===d.item_code || !d.item_name) ? "" : ("<br>" + d.item_name),
 				qty: d.qty,
-				actual_qty: d.actual_qty,
+				actual_qty: me.actual_qty_dict[d.item_code] || 0,
 				projected_qty: d.projected_qty,
 				rate: format_number(d.rate, me.frm.doc.currency),
 				amount: format_currency(d.amount, me.frm.doc.currency)
@@ -723,7 +733,7 @@
 				me.update_paid_amount_status(true);
 				me.create_invoice();
 				me.make_payment();
-			}, "octicon octicon-credit-card");
+			}, "octicon octfa fa-credit-card");
 		}else if(this.frm.doc.docstatus == 1) {
 			this.page.set_primary_action(__("Print"), function() {
 				html = frappe.render(me.print_template, me.frm.doc)
@@ -736,7 +746,7 @@
 		this.page.set_secondary_action(__("New"), function() {
 			me.save_previous_entry();
 			me.create_new();
-		}, "octicon octicon-plus").addClass("btn-primary");
+		}, "octicon octfa fa-plus").addClass("btn-primary");
 	},
 
 	print_dialog: function(){
@@ -992,6 +1002,10 @@
 				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) {
+				item.margin_rate_or_amount = 0.0;
+				item.discount_percentage = 0.0;
+				me.apply_pricing_rule_on_item(item)
 			}
 		})
 	},
@@ -1064,8 +1078,20 @@
 	},
 
 	validate_warehouse: function(){
-		if(!this.items[0].default_warehouse){
-			frappe.throw(__("Deafault warehouse is required for selected item"))
+		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) {
+		this.actual_qty = 0.0;
+
+		var warehouse = this.pos_profile_data['warehouse'] || item.default_warehouse;
+		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
 	}
 })
\ No newline at end of file
diff --git a/erpnext/accounts/page/pos/pos.json b/erpnext/accounts/page/pos/pos.json
index 31c043c..abd918a 100644
--- a/erpnext/accounts/page/pos/pos.json
+++ b/erpnext/accounts/page/pos/pos.json
@@ -3,7 +3,7 @@
  "creation": "2014-08-08 02:45:55.931022", 
  "docstatus": 0, 
  "doctype": "Page", 
- "icon": "icon-th", 
+ "icon": "fa fa-th", 
  "modified": "2014-08-08 05:59:33.045012", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
diff --git a/erpnext/accounts/party_status.py b/erpnext/accounts/party_status.py
index 68b4818..6d9efb1 100644
--- a/erpnext/accounts/party_status.py
+++ b/erpnext/accounts/party_status.py
@@ -55,7 +55,6 @@
 		if party.status == 'Open':
 			# may be open elsewhere, check
 			# default status
-			party.status = status
 			update_status(party)
 
 	party.update_modified()
diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.html b/erpnext/accounts/report/accounts_receivable/accounts_receivable.html
index 75c3e8c..f463c07 100644
--- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.html
+++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.html
@@ -4,7 +4,7 @@
 <h2 class="text-center">{%= __(report.report_name) %}</h2>
 <h4 class="text-center">{%= filters.customer || filters.supplier %} </h4>
 <h5 class="text-center">
-	{%= filters.ageing_based_on %}
+	{%= __(filters.ageing_based_on) %}
 	{%= __("Until") %}
 	{%= dateutil.str_to_user(filters.report_date) %}
 </h5>
@@ -12,7 +12,7 @@
 <table class="table table-bordered">
 	<thead>
 		<tr>
-			{% if(__(report.report_name) == "Accounts Receivable" || __(report.report_name) == "Accounts Payable") { %}
+			{% if(report.report_name === "Accounts Receivable" || report.report_name === "Accounts Payable") { %}
 				<th style="width: 15%">{%= __("Date") %}</th>
 				<th style="width: 15%">{%= __("Ref") %}</th>
 				<th style="width: 40%">{%= __("Party") %}</th>
@@ -30,7 +30,7 @@
 	<tbody>
 		{% for(var i=0, l=data.length; i<l; i++) { %}
 			<tr>
-			{% if(__(report.report_name) == "Accounts Receivable" || __(report.report_name) == "Accounts Payable") { %}
+			{% if(report.report_name === "Accounts Receivable" || report.report_name === "Accounts Payable") { %}
 				{% if(data[i][__("Customer")] || data[i][__("Supplier")]) { %}
 					<td>{%= dateutil.str_to_user(data[i][__("Posting Date")]) %}</td>
 					<td>{%= data[i][__("Voucher Type")] %}
@@ -38,21 +38,21 @@
 					<td>{%= data[i][__("Customer Name")] || data[i][__("Customer")] || data[i][__("Supplier Name")] || data[i][__("Supplier")] %}
 						<br>{%= __("Remarks") %}: {%= data[i][__("Remarks")] %}</td>
 					<td style="text-align: right">
-						{%= format_currency(data[i][__("Invoiced Amount")], data[i]["currency"]) %}</td>
+						{%= format_currency(data[i]["Invoiced Amount"], data[i]["currency"]) %}</td>
 					<td style="text-align: right">
-						{%= format_currency(data[i][__("Paid Amount")], data[i]["currency"]) %}</td>
+						{%= format_currency(data[i]["Paid Amount"], data[i]["currency"]) %}</td>
 					<td style="text-align: right">
-						{%= format_currency(data[i][__("Outstanding Amount")], data[i]["currency"]) %}</td>
+						{%= format_currency(data[i]["Outstanding Amount"], data[i]["currency"]) %}</td>
 				{% } else { %}
 					<td></td>
 					<td></td>
 					<td><b>{%= __("Total") %}</b></td>
 					<td style="text-align: right">
-						{%= format_currency(data[i][__("Invoiced Amount")]) %}</td>
+						{%= format_currency(data[i]["Invoiced Amount"]) %}</td>
 					<td style="text-align: right">
-						{%= format_currency(data[i][__("Paid Amount")]) %}</td>
+						{%= format_currency(data[i]["Paid Amount"]) %}</td>
 					<td style="text-align: right">
-						{%= format_currency(data[i][__("Outstanding Amount")]) %}</td>
+						{%= format_currency(data[i]["Outstanding Amount"]) %}</td>
 				{% } %}
 			{% } else { %}
 				{% if(data[i][__("Customer")] || data[i][__("Supplier")]|| "&nbsp;") { %}
@@ -71,4 +71,4 @@
 		{% } %}
 	</tbody>
 </table>
-<p class="text-right text-muted">Printed On {%= dateutil.str_to_user(dateutil.get_datetime_as_string()) %}</p>
\ No newline at end of file
+<p class="text-right text-muted">{{ __("Printed On") }}{%= dateutil.str_to_user(dateutil.get_datetime_as_string()) %}</p>
\ No newline at end of file
diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
index e1f4f80..6d1e168 100644
--- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
+++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
@@ -88,14 +88,18 @@
 
 		future_vouchers = self.get_entries_after(self.filters.report_date, args.get("party_type"))
 
+		if not self.filters.get("company"):
+			self.filters["company"] = frappe.db.get_single_value('Global Defaults', 'default_company')
+
 		company_currency = frappe.db.get_value("Company", self.filters.get("company"), "default_currency")
 
 		data = []
 		for gle in self.get_entries_till(self.filters.report_date, args.get("party_type")):
 			if self.is_receivable_or_payable(gle, dr_or_cr, future_vouchers):
-				outstanding_amount = self.get_outstanding_amount(gle, self.filters.report_date, dr_or_cr)
+				outstanding_amount = flt(self.get_outstanding_amount(gle, 
+					self.filters.report_date, dr_or_cr), currency_precision)
+					
 				if abs(outstanding_amount) > 0.1/10**currency_precision:
-
 					row = [gle.posting_date, gle.party]
 
 					# customer / supplier name
@@ -124,6 +128,10 @@
 					row += get_ageing_data(cint(self.filters.range1), cint(self.filters.range2),
 						cint(self.filters.range3), self.age_as_on, entry_date, outstanding_amount)
 
+					# issue 6371-Ageing buckets should not have amounts if due date is not reached
+					if self.filters.ageing_based_on == "Due Date" and getdate(due_date) > getdate(self.filters.report_date):
+						row[-1]=row[-2]=row[-3]=row[-4]=0
+
 					if self.filters.get(scrub(args.get("party_type"))):
 						row.append(gle.account_currency)
 					else:
@@ -214,14 +222,16 @@
 			conditions, values = self.prepare_conditions(party_type)
 
 			if self.filters.get(scrub(party_type)):
-				select_fields = "debit_in_account_currency as debit, credit_in_account_currency as credit"
+				select_fields = "sum(debit_in_account_currency) as debit, sum(credit_in_account_currency) as credit"
 			else:
-				select_fields = "debit, credit"
+				select_fields = "sum(debit) as debit, sum(credit) as credit"
 
-			self.gl_entries = frappe.db.sql("""select name, posting_date, account, party_type, party,
-				voucher_type, voucher_no, against_voucher_type, against_voucher, account_currency, remarks, {0}
+			self.gl_entries = frappe.db.sql("""select name, posting_date, account, party_type, party, 
+				voucher_type, voucher_no, against_voucher_type, against_voucher, 
+				account_currency, remarks, {0}
 				from `tabGL Entry`
 				where docstatus < 2 and party_type=%s and (party is not null and party != '') {1}
+				group by voucher_type, voucher_no, against_voucher_type, against_voucher, party
 				order by posting_date, party"""
 				.format(select_fields, conditions), values, as_dict=True)
 
diff --git a/erpnext/accounts/report/balance_sheet/balance_sheet.py b/erpnext/accounts/report/balance_sheet/balance_sheet.py
index d2626cd..5ff8e3e 100644
--- a/erpnext/accounts/report/balance_sheet/balance_sheet.py
+++ b/erpnext/accounts/report/balance_sheet/balance_sheet.py
@@ -4,7 +4,7 @@
 from __future__ import unicode_literals
 import frappe
 from frappe import _
-from frappe.utils import flt
+from frappe.utils import flt, cint
 from erpnext.accounts.report.financial_statements import (get_period_list, get_columns, get_data)
 
 def execute(filters=None):
@@ -14,17 +14,34 @@
 	liability = get_data(filters.company, "Liability", "Credit", period_list, only_current_fiscal_year=False)
 	equity = get_data(filters.company, "Equity", "Credit", period_list, only_current_fiscal_year=False)
 
-	provisional_profit_loss = get_provisional_profit_loss(asset, liability, equity,
+	provisional_profit_loss, total_credit = get_provisional_profit_loss(asset, liability, equity,
 		period_list, filters.company)
 
-	message = check_opening_balance(asset, liability, equity)
+	message, opening_balance = check_opening_balance(asset, liability, equity)
 
 	data = []
 	data.extend(asset or [])
 	data.extend(liability or [])
 	data.extend(equity or [])
+	if opening_balance and round(opening_balance,2) !=0:
+		unclosed ={
+			"account_name": "'" + _("Unclosed Fiscal Years Profit / Loss (Credit)") + "'",
+			"account": None,
+			"warn_if_negative": True,
+			"currency": frappe.db.get_value("Company", filters.company, "default_currency")
+		}
+		for period in period_list:
+			unclosed[period.key] = opening_balance
+			if provisional_profit_loss:
+				provisional_profit_loss[period.key] = provisional_profit_loss[period.key] - opening_balance
+				
+		unclosed["total"]=opening_balance
+		data.append(unclosed)
+		
 	if provisional_profit_loss:
 		data.append(provisional_profit_loss)
+	if total_credit:
+		data.append(total_credit)		
 
 	columns = get_columns(filters.periodicity, period_list, company=filters.company)
 	
@@ -33,15 +50,17 @@
 	return columns, data, message, chart
 
 def get_provisional_profit_loss(asset, liability, equity, period_list, company):
+	provisional_profit_loss = {}
+	total_row = {}
 	if asset and (liability or equity):
-		total=0
-		provisional_profit_loss = {
-			"account_name": "'" + _("Provisional Profit / Loss (Credit)") + "'",
+		total = total_row_total=0
+		currency = frappe.db.get_value("Company", company, "default_currency")
+		total_row = {
+			"account_name": "'" + _("Total (Credit)") + "'",
 			"account": None,
 			"warn_if_negative": True,
-			"currency": frappe.db.get_value("Company", company, "default_currency")
+			"currency": currency
 		}
-
 		has_value = False
 
 		for period in period_list:
@@ -52,28 +71,41 @@
 				effective_liability += flt(equity[-2].get(period.key))
 
 			provisional_profit_loss[period.key] = flt(asset[-2].get(period.key)) - effective_liability
+			total_row[period.key] = effective_liability + provisional_profit_loss[period.key]
 
 			if provisional_profit_loss[period.key]:
 				has_value = True
 
 			total += flt(provisional_profit_loss[period.key])
 			provisional_profit_loss["total"] = total
+			
+			total_row_total += flt(total_row[period.key])
+			total_row["total"] = total_row_total
 
 		if has_value:
-			return provisional_profit_loss
+			provisional_profit_loss.update({
+				"account_name": "'" + _("Provisional Profit / Loss (Credit)") + "'",
+				"account": None,
+				"warn_if_negative": True,
+				"currency": currency
+			})
+			
+	return provisional_profit_loss, total_row
 
 def check_opening_balance(asset, liability, equity):
 	# Check if previous year balance sheet closed
 	opening_balance = 0
+	float_precision = cint(frappe.db.get_default("float_precision")) or 2
 	if asset:
-		opening_balance = flt(asset[0].get("opening_balance", 0))
+		opening_balance = flt(asset[0].get("opening_balance", 0), float_precision)
 	if liability:
-		opening_balance -= flt(liability[0].get("opening_balance", 0))
+		opening_balance -= flt(liability[0].get("opening_balance", 0), float_precision)
 	if equity:
-		opening_balance -= flt(equity[0].get("opening_balance", 0))
+		opening_balance -= flt(equity[0].get("opening_balance", 0), float_precision)
 
 	if opening_balance:
-		return _("Previous Financial Year is not closed")
+		return _("Previous Financial Year is not closed"),opening_balance
+	return None,None
 		
 def get_chart_data(columns, asset, liability, equity):
 	x_intervals = ['x'] + [d.get("label") for d in columns[2:]]
diff --git a/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py b/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py
index d9bac3c..1ec0abc 100644
--- a/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py
+++ b/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py
@@ -16,7 +16,7 @@
 
 def get_columns():
 	return [
-		_("Payment Document") + ":Link/DocType:130",
+		_("Payment Document") + "::130",
 		_("Payment Entry") + ":Dynamic Link/"+_("Payment Document")+":110",
 		_("Posting Date") + ":Date:100",
 		_("Cheque/Reference No") + "::120",
diff --git a/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html b/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html
index dd1609a..23d2a31 100644
--- a/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html
+++ b/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html
@@ -8,7 +8,7 @@
 	<thead>
 		<tr>
 			<th style="width: 15%">{%= __("Posting Date") %}</th>
-			<th style="width: 15%">{%= __("Journal Entry") %}</th>
+			<th style="width: 15%">{%= __("Payment Entry") %}</th>
 			<th style="width: 40%">{%= __("Reference") %}</th>
 			<th style="width: 15%; text-align: right;">{%= __("Debit") %}</th>
 			<th style="width: 15%; text-align: right;">{%= __("Credit") %}</th>
@@ -19,10 +19,10 @@
 			{% if (data[i]["posting_date"]) { %}
 			<tr>
 				<td>{%= dateutil.str_to_user(data[i]["posting_date"]) %}</td>
-				<td>{%= data[i]["journal_entry"] %}</td>
+				<td>{%= data[i]["payment_entry"] %}</td>
 				<td>{%= __("Against") %}: {%= data[i]["against_account"] %}
-					{% if (data[i]["reference"]) { %}
-						<br>{%= __("Reference") %}: {%= data[i]["reference"] %}
+					{% if (data[i]["reference_no"]) { %}
+						<br>{%= __("Reference") %}: {%= data[i]["reference_no"] %}
 						{% if (data[i]["ref_date"]) { %}
 							<br>{%= __("Reference Date") %}: {%= dateutil.str_to_user(data[i]["ref_date"]) %}
 						{% } %}
@@ -38,7 +38,7 @@
 			<tr>
 				<td></td>
 				<td></td>
-				<td>{%= data[i]["journal_entry"] %}</td>
+				<td>{%= data[i]["payment_entry"] %}</td>
 				<td style="text-align: right">{%= format_currency(data[i]["debit"]) %}</td>
 				<td style="text-align: right">{%= format_currency(data[i]["credit"]) %}</td>
 			</tr>
diff --git a/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py b/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py
index 8ed338e..95b7ff7 100644
--- a/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py
+++ b/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py
@@ -129,7 +129,7 @@
 			reference_no, reference_date as ref_date, 
 			if(paid_to=%(account)s, received_amount, 0) as debit, 
 			if(paid_from=%(account)s, paid_amount, 0) as credit, 
-			posting_date, party as against_account, clearance_date,
+			posting_date, ifnull(party,if(paid_from=%(account)s,paid_to,paid_from)) as against_account, clearance_date,
 			if(paid_to=%(account)s, paid_to_account_currency, paid_from_account_currency) as account_currency
 		from `tabPayment Entry`
 		where
diff --git a/erpnext/accounts/report/budget_variance_report/budget_variance_report.py b/erpnext/accounts/report/budget_variance_report/budget_variance_report.py
index b67e2b6..0be0b3d 100644
--- a/erpnext/accounts/report/budget_variance_report/budget_variance_report.py
+++ b/erpnext/accounts/report/budget_variance_report/budget_variance_report.py
@@ -64,7 +64,7 @@
 	return frappe.db.sql("""
 			select b.cost_center, b.monthly_distribution, ba.account, ba.budget_amount
 			from `tabBudget` b, `tabBudget Account` ba
-			where b.name=ba.parent and b.fiscal_year=%s and b.company=%s
+			where b.name=ba.parent and b.docstatus = 1 and b.fiscal_year=%s and b.company=%s 
 		""", (filters.fiscal_year, filters.company), as_dict=True)
 
 #Get target distribution details of accounts of cost center
@@ -84,8 +84,9 @@
 	ac_details = frappe.db.sql("""select gl.account, gl.debit, gl.credit,
 		MONTHNAME(gl.posting_date) as month_name, b.cost_center
 		from `tabGL Entry` gl, `tabBudget Account` ba, `tabBudget` b
-		where 
+		where
 			b.name = ba.parent
+			and b.docstatus = 1
 			and ba.account=gl.account 
 			and gl.fiscal_year=%s 
 			and b.cost_center=%s
diff --git a/erpnext/accounts/report/cash_flow/cash_flow.html b/erpnext/accounts/report/cash_flow/cash_flow.html
new file mode 100644
index 0000000..40ba20c
--- /dev/null
+++ b/erpnext/accounts/report/cash_flow/cash_flow.html
@@ -0,0 +1 @@
+{% include "accounts/report/financial_statements.html" %}
\ 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 24c5cd2..182878a 100644
--- a/erpnext/accounts/report/cash_flow/cash_flow.py
+++ b/erpnext/accounts/report/cash_flow/cash_flow.py
@@ -60,7 +60,6 @@
 	company_currency = frappe.db.get_value("Company", filters.company, "default_currency")
 	
 	for cash_flow_account in cash_flow_accounts:
-
 		section_data = []
 		data.append({
 			"account_name": cash_flow_account['section_header'], 
@@ -83,7 +82,8 @@
 			account_data = get_account_type_based_data(filters.company, 
 				account['account_type'], period_list, filters.accumulated_values)
 			account_data.update({
-				"account_name": account['label'], 
+				"account_name": account['label'],
+				"account": account['label'], 
 				"indent": 1,
 				"parent_account": cash_flow_account['section_header'],
 				"currency": company_currency
@@ -136,7 +136,7 @@
 def add_total_row_account(out, data, label, period_list, currency):
 	total_row = {
 		"account_name": "'" + _("{0}").format(label) + "'",
-		"account": None,
+		"account": "'" + _("{0}").format(label) + "'",
 		"currency": currency
 	}
 	for row in data:
diff --git a/erpnext/accounts/report/financial_statements.py b/erpnext/accounts/report/financial_statements.py
index 97d2cdb..e66d20e 100644
--- a/erpnext/accounts/report/financial_statements.py
+++ b/erpnext/accounts/report/financial_statements.py
@@ -324,12 +324,17 @@
 		additional_conditions.append("posting_date >= %(from_date)s")
 
 	if filters:
-		for key in ['cost_center', 'project']:
-			if filters.get(key):
-				additional_conditions.append("%s = '%s'"%(key, filters.get(key)))
+		if filters.get("project"):
+			additional_conditions.append("project = '%s'"%(frappe.db.escape(filters.get("project"))))
+		if filters.get("cost_center"):
+			additional_conditions.append(get_cost_center_cond(filters.get("cost_center")))
 
 	return " and {}".format(" and ".join(additional_conditions)) if additional_conditions else ""
 
+def get_cost_center_cond(cost_center):
+	lft, rgt = frappe.db.get_value("Cost Center", cost_center, ["lft", "rgt"])
+	return (""" cost_center in (select name from `tabCost Center` where lft >=%s and rgt <=%s)"""%(lft, rgt))
+
 def get_columns(periodicity, period_list, accumulated_values=1, company=None):
 	columns = [{
 		"fieldname": "account",
diff --git a/erpnext/accounts/report/general_ledger/general_ledger.py b/erpnext/accounts/report/general_ledger/general_ledger.py
index 15fd299..00c17e8 100644
--- a/erpnext/accounts/report/general_ledger/general_ledger.py
+++ b/erpnext/accounts/report/general_ledger/general_ledger.py
@@ -91,6 +91,7 @@
 		_("Voucher Type") + "::120", _("Voucher No") + ":Dynamic Link/"+_("Voucher Type")+":160",
 		_("Against Account") + "::120", _("Party Type") + "::80", _("Party") + "::150",
 		_("Project") + ":Link/Project:100", _("Cost Center") + ":Link/Cost Center:100",
+		_("Against Voucher Type") + "::120", _("Against Voucher") + ":Dynamic Link/"+_("Against Voucher Type")+":160",
 		_("Remarks") + "::400"
 	]
 
@@ -118,6 +119,7 @@
 			posting_date, account, party_type, party,
 			sum(debit) as debit, sum(credit) as credit,
 			voucher_type, voucher_no, cost_center, project,
+			against_voucher_type, against_voucher,
 			remarks, against, is_opening {select_fields}
 		from `tabGL Entry`
 		where company=%(company)s {conditions}
@@ -290,7 +292,7 @@
 			row += [d.get("debit_in_account_currency"), d.get("credit_in_account_currency")]
 
 		row += [d.get("voucher_type"), d.get("voucher_no"), d.get("against"),
-			d.get("party_type"), d.get("party"), d.get("project"), d.get("cost_center"), d.get("remarks")
+			d.get("party_type"), d.get("party"), d.get("project"), d.get("cost_center"), d.get("against_voucher_type"), d.get("against_voucher"), d.get("remarks")
 		]
 
 		result.append(row)
diff --git a/erpnext/accounts/report/gross_profit/gross_profit.py b/erpnext/accounts/report/gross_profit/gross_profit.py
index a052821..3451238 100644
--- a/erpnext/accounts/report/gross_profit/gross_profit.py
+++ b/erpnext/accounts/report/gross_profit/gross_profit.py
@@ -17,7 +17,7 @@
 	source = gross_profit_data.grouped_data if filters.get("group_by") != "Invoice" else gross_profit_data.data
 
 	group_wise_columns = frappe._dict({
-		"invoice": ["parent", "customer", "posting_date","item_code", "item_name","item_group", "brand", "description", \
+		"invoice": ["parent", "customer", "customer_group", "posting_date","item_code", "item_name","item_group", "brand", "description", \
 			"warehouse", "qty", "base_rate", "buying_rate", "base_amount",
 			"buying_amount", "gross_profit", "gross_profit_percent", "project"],
 		"item_code": ["item_code", "item_name", "brand", "description", "qty", "base_rate",
diff --git a/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py b/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
index d6bbee5..1d417da 100644
--- a/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
+++ b/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
@@ -31,7 +31,7 @@
 			purchase_receipt = d.purchase_receipt
 		elif d.po_detail:
 			purchase_receipt = ", ".join(frappe.db.sql_list("""select distinct parent
-			from `tabPurchase Receipt Item` where docstatus=1 and prevdoc_detail_docname=%s""", d.po_detail))
+			from `tabPurchase Receipt Item` where docstatus=1 and purchase_order_item=%s""", d.po_detail))
 
 		expense_account = d.expense_account or aii_account_map.get(d.company)
 		row = [d.item_code, d.item_name, d.item_group, d.parent, d.posting_date, d.supplier,
diff --git a/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py b/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
index 39e38d7..1322649 100644
--- a/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
+++ b/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
@@ -5,6 +5,7 @@
 import frappe
 from frappe import _
 from frappe.utils import flt
+from erpnext.accounts.report.sales_register.sales_register import get_mode_of_payments
 
 def execute(filters=None):
 	if not filters: filters = {}
@@ -21,6 +22,7 @@
 		"width": 80
 	})
 	company_currency = frappe.db.get_value("Company", filters.company, "default_currency")
+	mode_of_payments = get_mode_of_payments(set([d.parent for d in item_list]))
 
 	data = []
 	for d in item_list:
@@ -34,7 +36,8 @@
 			delivery_note = d.parent
 
 		row = [d.item_code, d.item_name, d.item_group, d.parent, d.posting_date, d.customer, d.customer_name,
-			d.customer_group, d.debit_to, d.mode_of_payment, d.territory, d.project, d.company, d.sales_order,
+			d.customer_group, d.debit_to, ", ".join(mode_of_payments.get(d.parent, [])), 
+			d.territory, d.project, d.company, d.sales_order,
 			delivery_note, d.income_account, d.cost_center, d.qty, d.base_net_rate, d.base_net_amount]
 
 		for tax in tax_accounts:
@@ -54,7 +57,7 @@
 		_("Posting Date") + ":Date:80", _("Customer") + ":Link/Customer:120",
 		_("Customer Name") + "::120", _("Customer Group") + ":Link/Customer Group:120",
 		_("Receivable Account") + ":Link/Account:120",
-		_("Mode of Payment") + ":Link/Mode of Payment:80", _("Territory") + ":Link/Territory:80",
+		_("Mode of Payment") + "::120", _("Territory") + ":Link/Territory:80",
 		_("Project") + ":Link/Project:80", _("Company") + ":Link/Company:100",
 		_("Sales Order") + ":Link/Sales Order:100", _("Delivery Note") + ":Link/Delivery Note:100",
 		_("Income Account") + ":Link/Account:140", _("Cost Center") + ":Link/Cost Center:140",
@@ -70,10 +73,14 @@
 		("customer", " and si.customer = %(customer)s"),
 		("item_code", " and si_item.item_code = %(item_code)s"),
 		("from_date", " and si.posting_date>=%(from_date)s"),
-		("to_date", " and si.posting_date<=%(to_date)s"),
-		("mode_of_payment", " and ifnull(mode_of_payment, '') = %(mode_of_payment)s")):
+		("to_date", " and si.posting_date<=%(to_date)s")):
 			if filters.get(opts[0]):
 				conditions += opts[1]
+				
+	if filters.get("mode_of_payment"):
+		conditions += """ and exists(select name from `tabSales Invoice Payment`
+			 where parent=si.name 
+			 	and ifnull(`tabSales Invoice Payment`.mode_of_payment, '') = %(mode_of_payment)s)"""
 
 	return conditions
 
@@ -86,7 +93,7 @@
 			si_item.item_code, si_item.item_name, si_item.item_group, si_item.sales_order,
 			si_item.delivery_note, si_item.income_account, si_item.cost_center, si_item.qty,
 			si_item.base_net_rate, si_item.base_net_amount, si.customer_name,
-			si.customer_group, si_item.so_detail, si.update_stock, si.mode_of_payment
+			si.customer_group, si_item.so_detail, si.update_stock
 		from `tabSales Invoice` si, `tabSales Invoice Item` si_item
 		where si.name = si_item.parent and si.docstatus = 1 %s
 		order by si.posting_date desc, si_item.item_code desc""" % conditions, filters, as_dict=1)
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 6b7f490..747eb43 100644
--- a/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py
+++ b/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py
@@ -34,7 +34,7 @@
 		total = 0
 		net_profit_loss = {
 			"account_name": "'" + _("Net Profit / Loss") + "'",
-			"account": None,
+			"account": "'" + _("Net Profit / Loss") + "'",
 			"warn_if_negative": True,
 			"currency": frappe.db.get_value("Company", company, "default_currency")
 		}
diff --git a/erpnext/accounts/report/profitability_analysis/profitability_analysis.html b/erpnext/accounts/report/profitability_analysis/profitability_analysis.html
new file mode 100644
index 0000000..40ba20c
--- /dev/null
+++ b/erpnext/accounts/report/profitability_analysis/profitability_analysis.html
@@ -0,0 +1 @@
+{% include "accounts/report/financial_statements.html" %}
\ No newline at end of file
diff --git a/erpnext/accounts/report/profitability_analysis/profitability_analysis.js b/erpnext/accounts/report/profitability_analysis/profitability_analysis.js
index 4b9a1af..a25fa56 100644
--- a/erpnext/accounts/report/profitability_analysis/profitability_analysis.js
+++ b/erpnext/accounts/report/profitability_analysis/profitability_analysis.js
@@ -14,7 +14,7 @@
 			},
 			{
 				"fieldname": "based_on",
-				"label": __("Baed On"),
+				"label": __("Based On"),
 				"fieldtype": "Select",
 				"options": "Cost Center\nProject",
 				"default": "Cost Center",
diff --git a/erpnext/accounts/report/sales_register/sales_register.py b/erpnext/accounts/report/sales_register/sales_register.py
index 663c5c9..4dc8f8c 100644
--- a/erpnext/accounts/report/sales_register/sales_register.py
+++ b/erpnext/accounts/report/sales_register/sales_register.py
@@ -21,8 +21,9 @@
 		invoice_income_map, income_accounts)
 
 	invoice_so_dn_map = get_invoice_so_dn_map(invoice_list)
-	customer_map = get_customer_deatils(invoice_list)
+	customer_map = get_customer_details(invoice_list)
 	company_currency = frappe.db.get_value("Company", filters.company, "default_currency")
+	mode_of_payments = get_mode_of_payments([inv.name for inv in invoice_list])
 
 	data = []
 	for inv in invoice_list:
@@ -33,7 +34,7 @@
 		row = [inv.name, inv.posting_date, inv.customer, inv.customer_name,
 		customer_map.get(inv.customer, {}).get("customer_group"), 
 		customer_map.get(inv.customer, {}).get("territory"),
-		inv.debit_to, inv.mode_of_payment, inv.project, inv.remarks, 
+		inv.debit_to, ", ".join(mode_of_payments.get(inv.name, [])), inv.project, inv.remarks, 
 		", ".join(sales_order), ", ".join(delivery_note), company_currency]
 
 		# map income values
@@ -68,7 +69,7 @@
 		_("Invoice") + ":Link/Sales Invoice:120", _("Posting Date") + ":Date:80", 
 		_("Customer Id") + "::120", _("Customer Name") + "::120", 
 		_("Customer Group") + ":Link/Customer Group:120", _("Territory") + ":Link/Territory:80", 
-		_("Receivable Account") + ":Link/Account:120", _("Mode of Payment") + ":Link/Mode of Payment:80", 
+		_("Receivable Account") + ":Link/Account:120", _("Mode of Payment") + "::120", 
 		_("Project") +":Link/Project:80", _("Remarks") + "::150", 
 		_("Sales Order") + ":Link/Sales Order:100", _("Delivery Note") + ":Link/Delivery Note:100",
 		{
@@ -113,14 +114,17 @@
 	if filters.get("from_date"): conditions += " and posting_date >= %(from_date)s"
 	if filters.get("to_date"): conditions += " and posting_date <= %(to_date)s"
 	
-	if filters.get("mode_of_payment"): conditions += " and ifnull(mode_of_payment, '') = %(mode_of_payment)s"
-
+	if filters.get("mode_of_payment"):
+		conditions += """ and exists(select name from `tabSales Invoice Payment`
+			 where parent=`tabSales Invoice`.name 
+			 	and ifnull(`tabSales Invoice Payment`.mode_of_payment, '') = %(mode_of_payment)s)"""
+				
 	return conditions
 
 def get_invoices(filters):
 	conditions = get_conditions(filters)
 	return frappe.db.sql("""select name, posting_date, debit_to, project, customer, customer_name, remarks, 
-		base_net_total, base_grand_total, base_rounded_total, outstanding_amount, mode_of_payment
+		base_net_total, base_grand_total, base_rounded_total, outstanding_amount
 		from `tabSales Invoice`
 		where docstatus = 1 %s order by posting_date desc, name desc""" %
 		conditions, filters, as_dict=1)
@@ -180,7 +184,7 @@
 
 	return invoice_so_dn_map
 
-def get_customer_deatils(invoice_list):
+def get_customer_details(invoice_list):
 	customer_map = {}
 	customers = list(set([inv.customer for inv in invoice_list]))
 	for cust in frappe.db.sql("""select name, territory, customer_group from `tabCustomer`
@@ -188,3 +192,16 @@
 			customer_map.setdefault(cust.name, cust)
 
 	return customer_map
+
+
+def get_mode_of_payments(invoice_list):
+	mode_of_payments = {}
+	if invoice_list:
+		inv_mop = frappe.db.sql("""select parent, mode_of_payment
+			from `tabSales Invoice Payment` where parent in (%s) group by parent, mode_of_payment""" %
+			', '.join(['%s']*len(invoice_list)), tuple(invoice_list), as_dict=1)
+
+		for d in inv_mop:
+			mode_of_payments.setdefault(d.parent, []).append(d.mode_of_payment)
+
+	return mode_of_payments
diff --git a/erpnext/accounts/report/trial_balance/trial_balance.js b/erpnext/accounts/report/trial_balance/trial_balance.js
index 9943e5d..ff198e9 100644
--- a/erpnext/accounts/report/trial_balance/trial_balance.js
+++ b/erpnext/accounts/report/trial_balance/trial_balance.js
@@ -55,6 +55,11 @@
 				"label": __("Show zero values"),
 				"fieldtype": "Check"
 			},
+			{
+				"fieldname": "show_unclosed_fy_pl_balances",
+				"label": __("Show unclosed fiscal year's P&L balances"),
+				"fieldtype": "Check"
+			}
 		],
 		"formatter": erpnext.financial_statements.formatter,
 		"tree": true,
diff --git a/erpnext/accounts/report/trial_balance/trial_balance.py b/erpnext/accounts/report/trial_balance/trial_balance.py
index 5401902..7609d1d 100644
--- a/erpnext/accounts/report/trial_balance/trial_balance.py
+++ b/erpnext/accounts/report/trial_balance/trial_balance.py
@@ -87,8 +87,10 @@
 
 
 def get_rootwise_opening_balances(filters, report_type):
-	additional_conditions = " and posting_date >= %(year_start_date)s" \
-		if report_type == "Profit and Loss" else ""
+	additional_conditions = ""
+	if not filters.show_unclosed_fy_pl_balances:
+		additional_conditions = " and posting_date >= %(year_start_date)s" \
+			if report_type == "Profit and Loss" else ""
 
 	if not flt(filters.with_period_closing_entry):
 		additional_conditions += " and ifnull(voucher_type, '')!='Period Closing Voucher'"
diff --git a/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js b/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js
index 4d2efad..7ccec30 100644
--- a/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js
+++ b/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js
@@ -51,6 +51,19 @@
 			"default": "Customer"
 		},
 		{
+			"fieldname":"party",
+			"label": __("Party"),
+			"fieldtype": "Dynamic Link",
+			"get_options": function() {
+				var party_type = frappe.query_report_filters_by_name.party_type.get_value();
+				var party = frappe.query_report_filters_by_name.party.get_value();
+				if(party && !party_type) {
+					frappe.throw(__("Please select Party Type first"));
+				}
+				return party_type;
+			}
+		},
+		{
 			"fieldname": "show_zero_values",
 			"label": __("Show zero values"),
 			"fieldtype": "Check"
diff --git a/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py b/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py
index 58222ac..6480623 100644
--- a/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py
+++ b/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py
@@ -20,13 +20,23 @@
 	
 def get_data(filters, show_party_name):
 	party_name_field = "customer_name" if filters.get("party_type")=="Customer" else "supplier_name"
-	parties = frappe.get_all(filters.get("party_type"), fields = ["name", party_name_field], order_by="name")
+	party_filters = {"name": filters.get("party")} if filters.get("party") else {}
+	parties = frappe.get_all(filters.get("party_type"), fields = ["name", party_name_field], 
+		filters = party_filters, order_by="name")
 	company_currency = frappe.db.get_value("Company", filters.company, "default_currency")
 	opening_balances = get_opening_balances(filters)
 	balances_within_period = get_balances_within_period(filters)
 	
 	data = []
-	total_debit, total_credit = 0, 0
+	# total_debit, total_credit = 0, 0
+	total_row = frappe._dict({
+		"opening_debit": 0,
+		"opening_credit": 0,
+		"debit": 0,
+		"credit": 0,
+		"closing_debit": 0,
+		"closing_credit": 0
+	})
 	for party in parties:
 		row = { "party": party.name }
 		if show_party_name:
@@ -45,11 +55,7 @@
 			"debit": debit,
 			"credit": credit
 		})
-		
-		# totals
-		total_debit += debit
-		total_credit += credit
-		
+				
 		# closing
 		closing_debit, closing_credit = toggle_debit_credit(opening_debit + debit, opening_credit + credit)
 		row.update({
@@ -57,6 +63,10 @@
 			"closing_credit": closing_credit
 		})
 		
+		# totals
+		for col in total_row:
+			total_row[col] += row.get(col)
+		
 		row.update({
 			"currency": company_currency
 		})
@@ -69,13 +79,12 @@
 			data.append(row)
 		
 	# Add total row
-	if total_debit or total_credit:
-		data.append({
-			"party": "'" + _("Totals") + "'",
-			"debit": total_debit,
-			"credit": total_credit,
-			"currency": company_currency
-		})
+	
+	total_row.update({
+		"party": "'" + _("Totals") + "'",
+		"currency": company_currency
+	})
+	data.append(total_row)
 	
 	return data
 	
diff --git a/erpnext/accounts/utils.py b/erpnext/accounts/utils.py
index 9b28cbd..cec01a0 100644
--- a/erpnext/accounts/utils.py
+++ b/erpnext/accounts/utils.py
@@ -127,6 +127,83 @@
 		# if bal is None, return 0
 		return flt(bal)
 
+def get_count_on(account, fieldname, date):
+
+	cond = []
+	if date:
+		cond.append("posting_date <= '%s'" % frappe.db.escape(cstr(date)))
+	else:
+		# get balance of all entries that exist
+		date = nowdate()
+
+	try:
+		year_start_date = get_fiscal_year(date, verbose=0)[1]
+	except FiscalYearError:
+		if getdate(date) > getdate(nowdate()):
+			# if fiscal year not found and the date is greater than today
+			# get fiscal year for today's date and its corresponding year start date
+			year_start_date = get_fiscal_year(nowdate(), verbose=1)[1]
+		else:
+			# this indicates that it is a date older than any existing fiscal year.
+			# hence, assuming balance as 0.0
+			return 0.0
+
+	if account:
+		acc = frappe.get_doc("Account", account)
+
+		if not frappe.flags.ignore_account_permission:
+			acc.check_permission("read")
+
+		# for pl accounts, get balance within a fiscal year
+		if acc.report_type == 'Profit and Loss':
+			cond.append("posting_date >= '%s' and voucher_type != 'Period Closing Voucher'" \
+				% year_start_date)
+
+		# different filter for group and ledger - improved performance
+		if acc.is_group:
+			cond.append("""exists (
+				select name from `tabAccount` ac where ac.name = gle.account
+				and ac.lft >= %s and ac.rgt <= %s
+			)""" % (acc.lft, acc.rgt))
+
+			# If group and currency same as company,
+			# always return balance based on debit and credit in company currency
+			if acc.account_currency == frappe.db.get_value("Company", acc.company, "default_currency"):
+				in_account_currency = False
+		else:
+			cond.append("""gle.account = "%s" """ % (frappe.db.escape(account, percent=False), ))
+
+		entries = frappe.db.sql("""
+			SELECT name, posting_date, account, party_type, party,debit,credit,
+				voucher_type, voucher_no, against_voucher_type, against_voucher
+			FROM `tabGL Entry` gle
+			WHERE {0}""".format(" and ".join(cond)), as_dict=True)
+		
+		count = 0
+		for gle in entries:
+			if fieldname not in ('invoiced_amount','payables'):
+				count += 1
+			else:
+				dr_or_cr = "debit" if fieldname == "invoiced_amount" else "credit"
+				cr_or_dr = "credit" if fieldname == "invoiced_amount" else "debit"
+				select_fields = "ifnull(sum(credit-debit),0)" if fieldname == "invoiced_amount" else "ifnull(sum(debit-credit),0)"
+
+				if ((not gle.against_voucher) or (gle.against_voucher_type in ["Sales Order", "Purchase Order"]) or
+				(gle.against_voucher==gle.voucher_no and gle.get(dr_or_cr) > 0)):
+					payment_amount = frappe.db.sql("""
+						SELECT {0}
+						FROM `tabGL Entry` gle
+						WHERE docstatus < 2 and posting_date <= %(date)s and against_voucher = %(voucher_no)s
+						and party = %(party)s and name != %(name)s""".format(select_fields),
+						{"date": date, "voucher_no": gle.voucher_no, "party": gle.party, "name": gle.name})[0][0]
+					
+					outstanding_amount = flt(gle.get(dr_or_cr)) - flt(gle.get(cr_or_dr)) - payment_amount
+					currency_precision = get_currency_precision() or 2
+					if abs(flt(outstanding_amount)) > 0.1/10**currency_precision:
+						count += 1
+					
+		return count
+
 @frappe.whitelist()
 def add_ac(args=None):
 	if not args:
@@ -324,16 +401,22 @@
 	payment_entry.set_amounts()
 	payment_entry.save(ignore_permissions=True)
 	
-def unlink_ref_doc_from_payment_entries(ref_type, ref_no):
-	remove_ref_doc_link_from_jv(ref_type, ref_no)
-	remove_ref_doc_link_from_pe(ref_type, ref_no)
+def unlink_ref_doc_from_payment_entries(ref_doc):
+	remove_ref_doc_link_from_jv(ref_doc.doctype, ref_doc.name)
+	remove_ref_doc_link_from_pe(ref_doc.doctype, ref_doc.name)
 	
 	frappe.db.sql("""update `tabGL Entry`
 		set against_voucher_type=null, against_voucher=null,
 		modified=%s, modified_by=%s
 		where against_voucher_type=%s and against_voucher=%s
 		and voucher_no != ifnull(against_voucher, '')""",
-		(now(), frappe.session.user, ref_type, ref_no))
+		(now(), frappe.session.user, ref_doc.doctype, ref_doc.name))
+	
+	if ref_doc.doctype in ("Sales Invoice", "Purchase Invoice"):
+		ref_doc.set("advances", [])
+	
+		frappe.db.sql("""delete from `tab{0} Advance` where parent = %s"""
+			.format(ref_doc.doctype), ref_doc.name)
 
 def remove_ref_doc_link_from_jv(ref_type, ref_no):
 	linked_jv = frappe.db.sql_list("""select parent from `tabJournal Entry Account`
@@ -624,4 +707,4 @@
 
 	except frappe.DuplicateEntryError:
 		# already exists, due to a reinstall?
-		pass
+		pass
\ No newline at end of file
diff --git a/erpnext/buying/doctype/buying_settings/buying_settings.json b/erpnext/buying/doctype/buying_settings/buying_settings.json
index 306799d..ac97255 100644
--- a/erpnext/buying/doctype/buying_settings/buying_settings.json
+++ b/erpnext/buying/doctype/buying_settings/buying_settings.json
@@ -186,7 +186,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-cog", 
+ "icon": "fa fa-cog", 
  "idx": 1, 
  "in_create": 0, 
  "in_dialog": 0, 
diff --git a/erpnext/buying/doctype/purchase_common/purchase_common.js b/erpnext/buying/doctype/purchase_common/purchase_common.js
index 3083acb..5d74760 100644
--- a/erpnext/buying/doctype/purchase_common/purchase_common.js
+++ b/erpnext/buying/doctype/purchase_common/purchase_common.js
@@ -183,7 +183,7 @@
 		var item = frappe.get_doc(cdt, cdn);
 		if(item.item_code && item.warehouse) {
 			return this.frm.call({
-				method: "erpnext.stock.get_item_details.get_projected_qty",
+				method: "erpnext.stock.get_item_details.get_bin_details",
 				child: item,
 				args: {
 					item_code: item.item_code,
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json
index 923a3ed..c092695 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.json
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.json
@@ -9,11 +9,13 @@
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Document", 
+ "editable_grid": 0, 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "supplier_section", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -21,14 +23,16 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "icon-user", 
+   "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, 
@@ -39,6 +43,7 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "{supplier_name}", 
    "fieldname": "title", 
    "fieldtype": "Data", 
@@ -47,6 +52,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Title", 
    "length": 0, 
    "no_copy": 1, 
@@ -55,6 +61,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, 
@@ -65,6 +72,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "naming_series", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -72,6 +80,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Series", 
    "length": 0, 
    "no_copy": 1, 
@@ -82,6 +91,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, 
@@ -92,6 +102,7 @@
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "", 
    "fieldname": "supplier", 
    "fieldtype": "Link", 
@@ -100,6 +111,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Supplier", 
    "length": 0, 
    "no_copy": 0, 
@@ -110,6 +122,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, 
@@ -120,6 +133,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.supplier && doc.docstatus===0 && (!(doc.items && doc.items.length) || (doc.items.length==1 && !doc.items[0].item_code))", 
    "fieldname": "get_items_from_open_material_requests", 
    "fieldtype": "Button", 
@@ -128,6 +142,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Get Items from Open Material Requests", 
    "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, 
@@ -146,6 +162,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "No", 
    "fieldname": "is_subcontracted", 
    "fieldtype": "Select", 
@@ -154,6 +171,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Supply Raw Materials", 
    "length": 0, 
    "no_copy": 0, 
@@ -162,6 +180,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, 
@@ -172,6 +191,7 @@
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "supplier_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -179,6 +199,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Supplier Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -186,6 +207,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, 
@@ -196,6 +218,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break1", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -203,6 +226,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
@@ -211,6 +235,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "50%", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -222,6 +247,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "Today", 
    "fieldname": "transaction_date", 
    "fieldtype": "Date", 
@@ -230,6 +256,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -239,6 +266,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, 
@@ -249,6 +277,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "amended_from", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -256,6 +285,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amended From", 
    "length": 0, 
    "no_copy": 1, 
@@ -266,6 +296,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, 
@@ -276,6 +307,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "", 
    "fieldname": "company", 
    "fieldtype": "Link", 
@@ -284,6 +316,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -294,6 +327,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 1, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 1, 
@@ -305,6 +339,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "collapsible_depends_on": "", 
+   "columns": 0, 
    "fieldname": "drop_ship", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -312,6 +347,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Drop Ship", 
    "length": 0, 
    "no_copy": 0, 
@@ -320,6 +356,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, 
@@ -330,6 +367,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "", 
    "fieldname": "customer", 
    "fieldtype": "Link", 
@@ -338,6 +376,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer", 
    "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, 
@@ -357,6 +397,7 @@
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "", 
    "fieldname": "customer_name", 
    "fieldtype": "Data", 
@@ -365,6 +406,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -373,6 +415,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, 
@@ -383,6 +426,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_19", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -390,6 +434,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -397,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, 
@@ -407,6 +453,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "", 
    "fieldname": "customer_contact_person", 
    "fieldtype": "Link", 
@@ -415,6 +462,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer Contact", 
    "length": 0, 
    "no_copy": 0, 
@@ -424,6 +472,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 +483,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "customer_contact_display", 
    "fieldtype": "Small Text", 
    "hidden": 1, 
@@ -441,6 +491,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer Contact", 
    "length": 0, 
    "no_copy": 0, 
@@ -449,6 +500,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, 
@@ -459,6 +511,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "customer_contact_mobile", 
    "fieldtype": "Small Text", 
    "hidden": 1, 
@@ -466,6 +519,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer Mobile No", 
    "length": 0, 
    "no_copy": 0, 
@@ -474,6 +528,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, 
@@ -484,6 +539,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "customer_contact_email", 
    "fieldtype": "Code", 
    "hidden": 1, 
@@ -491,6 +547,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer Contact Email", 
    "length": 0, 
    "no_copy": 0, 
@@ -500,6 +557,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, 
@@ -510,6 +568,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
+   "columns": 0, 
    "fieldname": "section_addresses", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -517,6 +576,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Address and Contact", 
    "length": 0, 
    "no_copy": 0, 
@@ -525,6 +585,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, 
@@ -535,6 +596,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "supplier_address", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -542,6 +604,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Select Supplier Address", 
    "length": 0, 
    "no_copy": 0, 
@@ -550,6 +613,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, 
@@ -560,6 +624,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "contact_person", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -567,6 +632,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Contact Person", 
    "length": 0, 
    "no_copy": 0, 
@@ -575,6 +641,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, 
@@ -585,6 +652,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "", 
    "fieldname": "address_display", 
    "fieldtype": "Small Text", 
@@ -593,6 +661,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Address", 
    "length": 0, 
    "no_copy": 0, 
@@ -600,6 +669,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, 
@@ -610,6 +680,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "contact_display", 
    "fieldtype": "Small Text", 
    "hidden": 0, 
@@ -617,6 +688,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Contact", 
    "length": 0, 
    "no_copy": 0, 
@@ -624,6 +696,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, 
@@ -634,6 +707,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "contact_mobile", 
    "fieldtype": "Small Text", 
    "hidden": 0, 
@@ -641,6 +715,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Mobile No", 
    "length": 0, 
    "no_copy": 0, 
@@ -648,6 +723,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, 
@@ -658,6 +734,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "contact_email", 
    "fieldtype": "Small Text", 
    "hidden": 0, 
@@ -665,6 +742,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Contact Email", 
    "length": 0, 
    "no_copy": 0, 
@@ -672,6 +750,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, 
@@ -682,6 +761,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "col_break_address", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -689,6 +769,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -696,6 +777,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, 
@@ -706,6 +788,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "", 
    "fieldname": "shipping_address", 
    "fieldtype": "Link", 
@@ -714,6 +797,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Select Shipping Address", 
    "length": 0, 
    "no_copy": 0, 
@@ -723,6 +807,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, 
@@ -733,6 +818,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "shipping_address_display", 
    "fieldtype": "Small Text", 
    "hidden": 0, 
@@ -740,6 +826,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Shipping Address", 
    "length": 0, 
    "no_copy": 0, 
@@ -748,6 +835,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, 
@@ -758,6 +846,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
+   "columns": 0, 
    "fieldname": "currency_and_price_list", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -765,14 +854,16 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Currency and Price List", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "icon-tag", 
+   "options": "fa fa-tag", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -783,6 +874,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "currency", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -790,6 +882,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Currency", 
    "length": 0, 
    "no_copy": 0, 
@@ -800,6 +893,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, 
@@ -810,6 +904,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "", 
    "fieldname": "conversion_rate", 
    "fieldtype": "Float", 
@@ -818,6 +913,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Exchange Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -828,6 +924,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, 
@@ -838,6 +935,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "cb_price_list", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -845,12 +943,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, 
@@ -861,6 +961,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "buying_price_list", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -868,6 +969,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Price List", 
    "length": 0, 
    "no_copy": 0, 
@@ -876,6 +978,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, 
@@ -886,6 +989,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "price_list_currency", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -893,6 +997,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Price List Currency", 
    "length": 0, 
    "no_copy": 0, 
@@ -901,6 +1006,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, 
@@ -911,6 +1017,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "plc_conversion_rate", 
    "fieldtype": "Float", 
    "hidden": 0, 
@@ -918,6 +1025,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Price List Exchange Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -926,6 +1034,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, 
@@ -936,6 +1045,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "ignore_pricing_rule", 
    "fieldtype": "Check", 
    "hidden": 0, 
@@ -943,6 +1053,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Ignore Pricing Rule", 
    "length": 0, 
    "no_copy": 1, 
@@ -950,6 +1061,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, 
@@ -960,6 +1072,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "items_section", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -967,15 +1080,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-shopping-cart", 
+   "options": "fa fa-shopping-cart", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -986,6 +1101,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "items", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -993,6 +1109,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Items", 
    "length": 0, 
    "no_copy": 0, 
@@ -1003,6 +1120,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, 
@@ -1013,6 +1131,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.docstatus===0 && (doc.items && doc.items.length)", 
    "fieldname": "get_last_purchase_rate", 
    "fieldtype": "Button", 
@@ -1021,6 +1140,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Get last purchase rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -1029,6 +1149,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, 
@@ -1039,6 +1160,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "sb_last_purchase", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -1046,12 +1168,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, 
@@ -1062,6 +1186,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "base_total", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -1069,6 +1194,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -1078,6 +1204,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, 
@@ -1088,6 +1215,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "base_net_total", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -1095,6 +1223,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Net Total (Company Currency)", 
    "length": 0, 
    "no_copy": 1, 
@@ -1105,6 +1234,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, 
@@ -1115,6 +1245,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_26", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -1122,12 +1253,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, 
@@ -1138,6 +1271,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "total", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -1145,6 +1279,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total", 
    "length": 0, 
    "no_copy": 0, 
@@ -1154,6 +1289,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, 
@@ -1164,6 +1300,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "net_total", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -1171,6 +1308,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Net Total", 
    "length": 0, 
    "no_copy": 0, 
@@ -1181,6 +1319,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, 
@@ -1191,6 +1330,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "taxes_section", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -1198,15 +1338,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-money", 
+   "options": "fa fa-money", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1217,6 +1359,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "", 
    "fieldname": "taxes_and_charges", 
    "fieldtype": "Link", 
@@ -1225,6 +1368,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Taxes and Charges", 
    "length": 0, 
    "no_copy": 0, 
@@ -1235,6 +1379,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, 
@@ -1245,6 +1390,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "taxes", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -1252,6 +1398,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Purchase Taxes and Charges", 
    "length": 0, 
    "no_copy": 0, 
@@ -1262,6 +1409,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, 
@@ -1272,6 +1420,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "other_charges_calculation", 
    "fieldtype": "HTML", 
    "hidden": 0, 
@@ -1279,6 +1428,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Taxes and Charges Calculation", 
    "length": 0, 
    "no_copy": 1, 
@@ -1287,6 +1437,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, 
@@ -1297,6 +1448,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "totals", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -1304,15 +1456,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-money", 
+   "options": "fa fa-money", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1323,6 +1477,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "base_taxes_and_charges_added", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -1330,6 +1485,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Taxes and Charges Added (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -1340,6 +1496,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, 
@@ -1350,6 +1507,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "base_taxes_and_charges_deducted", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -1357,6 +1515,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Taxes and Charges Deducted (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -1367,6 +1526,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, 
@@ -1377,6 +1537,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "base_total_taxes_and_charges", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -1384,6 +1545,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Taxes and Charges (Company Currency)", 
    "length": 0, 
    "no_copy": 1, 
@@ -1394,6 +1556,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, 
@@ -1404,6 +1567,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_39", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -1411,6 +1575,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -1418,6 +1583,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, 
@@ -1428,6 +1594,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "taxes_and_charges_added", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -1435,6 +1602,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Taxes and Charges Added", 
    "length": 0, 
    "no_copy": 0, 
@@ -1445,6 +1613,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, 
@@ -1455,6 +1624,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "taxes_and_charges_deducted", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -1462,6 +1632,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Taxes and Charges Deducted", 
    "length": 0, 
    "no_copy": 0, 
@@ -1472,6 +1643,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, 
@@ -1482,6 +1654,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "total_taxes_and_charges", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -1489,6 +1662,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Taxes and Charges", 
    "length": 0, 
    "no_copy": 0, 
@@ -1498,6 +1672,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, 
@@ -1509,6 +1684,7 @@
    "bold": 0, 
    "collapsible": 1, 
    "collapsible_depends_on": "discount_amount", 
+   "columns": 0, 
    "fieldname": "discount_section", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -1516,6 +1692,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Additional Discount", 
    "length": 0, 
    "no_copy": 0, 
@@ -1524,6 +1701,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, 
@@ -1534,6 +1712,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "Grand Total", 
    "fieldname": "apply_discount_on", 
    "fieldtype": "Select", 
@@ -1542,6 +1721,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Apply Additional Discount On", 
    "length": 0, 
    "no_copy": 0, 
@@ -1551,6 +1731,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, 
@@ -1561,6 +1742,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "base_discount_amount", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -1568,6 +1750,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Additional Discount Amount (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -1577,6 +1760,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, 
@@ -1587,6 +1771,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_45", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -1594,6 +1779,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -1601,6 +1787,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, 
@@ -1611,6 +1798,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "additional_discount_percentage", 
    "fieldtype": "Float", 
    "hidden": 0, 
@@ -1618,6 +1806,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Additional Discount Percentage", 
    "length": 0, 
    "no_copy": 0, 
@@ -1626,6 +1815,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, 
@@ -1636,6 +1826,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "discount_amount", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -1643,6 +1834,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Additional Discount Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -1652,6 +1844,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, 
@@ -1662,6 +1855,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "totals_section", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -1669,6 +1863,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -1676,6 +1871,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, 
@@ -1686,6 +1882,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "base_grand_total", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -1693,6 +1890,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Grand Total (Company Currency)", 
    "length": 0, 
    "no_copy": 1, 
@@ -1703,6 +1901,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, 
@@ -1713,6 +1912,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "In Words will be visible once you save the Purchase Order.", 
    "fieldname": "base_in_words", 
    "fieldtype": "Data", 
@@ -1721,6 +1921,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "In Words (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -1730,6 +1931,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, 
@@ -1740,6 +1942,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "base_rounded_total", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -1747,6 +1950,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Rounded Total (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -1757,6 +1961,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, 
@@ -1767,6 +1972,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break4", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -1774,6 +1980,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
@@ -1781,6 +1988,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, 
@@ -1791,6 +1999,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "grand_total", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -1798,6 +2007,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Grand Total", 
    "length": 0, 
    "no_copy": 0, 
@@ -1808,6 +2018,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, 
@@ -1818,6 +2029,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "in_words", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -1825,6 +2037,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "In Words", 
    "length": 0, 
    "no_copy": 0, 
@@ -1834,6 +2047,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, 
@@ -1844,6 +2058,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "advance_paid", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -1851,6 +2066,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Advance Paid", 
    "length": 0, 
    "no_copy": 1, 
@@ -1859,6 +2075,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, 
@@ -1870,6 +2087,7 @@
    "bold": 0, 
    "collapsible": 1, 
    "collapsible_depends_on": "terms", 
+   "columns": 0, 
    "fieldname": "terms_section_break", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -1877,15 +2095,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Terms and Conditions", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-legal", 
+   "options": "fa fa-legal", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1896,6 +2116,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "tc_name", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -1903,6 +2124,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Terms", 
    "length": 0, 
    "no_copy": 0, 
@@ -1913,6 +2135,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, 
@@ -1923,6 +2146,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "terms", 
    "fieldtype": "Text Editor", 
    "hidden": 0, 
@@ -1930,6 +2154,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Terms and Conditions", 
    "length": 0, 
    "no_copy": 0, 
@@ -1939,6 +2164,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, 
@@ -1949,6 +2175,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
+   "columns": 0, 
    "fieldname": "more_info", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -1956,6 +2183,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "More Information", 
    "length": 0, 
    "no_copy": 0, 
@@ -1964,6 +2192,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, 
@@ -1974,6 +2203,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "Draft", 
    "fieldname": "status", 
    "fieldtype": "Select", 
@@ -1982,6 +2212,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Status", 
    "length": 0, 
    "no_copy": 1, 
@@ -1992,6 +2223,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": 1, 
@@ -2002,6 +2234,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "ref_sq", 
    "fieldtype": "Data", 
    "hidden": 1, 
@@ -2009,6 +2242,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Ref SQ", 
    "length": 0, 
    "no_copy": 1, 
@@ -2018,6 +2252,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, 
@@ -2028,6 +2263,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "party_account_currency", 
    "fieldtype": "Link", 
    "hidden": 1, 
@@ -2035,6 +2271,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Party Account Currency", 
    "length": 0, 
    "no_copy": 1, 
@@ -2044,6 +2281,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, 
@@ -2054,6 +2292,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_74", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -2061,6 +2300,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -2068,6 +2308,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, 
@@ -2078,6 +2319,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:!doc.__islocal", 
    "description": "", 
    "fieldname": "per_received", 
@@ -2087,6 +2329,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "% Received", 
    "length": 0, 
    "no_copy": 1, 
@@ -2096,6 +2339,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, 
@@ -2106,6 +2350,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:!doc.__islocal", 
    "description": "", 
    "fieldname": "per_billed", 
@@ -2115,6 +2360,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "% Billed", 
    "length": 0, 
    "no_copy": 1, 
@@ -2124,6 +2370,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, 
@@ -2134,6 +2381,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
+   "columns": 0, 
    "fieldname": "column_break5", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -2141,6 +2389,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Printing Settings", 
    "length": 0, 
    "no_copy": 0, 
@@ -2150,6 +2399,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "50%", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -2161,6 +2411,7 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "letter_head", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -2168,6 +2419,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Letter Head", 
    "length": 0, 
    "no_copy": 0, 
@@ -2178,6 +2430,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, 
@@ -2188,6 +2441,7 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "select_print_heading", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -2195,6 +2449,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Print Heading", 
    "length": 0, 
    "no_copy": 1, 
@@ -2205,6 +2460,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, 
@@ -2215,6 +2471,63 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_86", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_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": "group_same_items", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Group same items", 
+   "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": "", 
    "fieldname": "language", 
    "fieldtype": "Data", 
@@ -2223,6 +2536,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Print Language", 
    "length": 0, 
    "no_copy": 0, 
@@ -2232,6 +2546,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, 
@@ -2243,6 +2558,7 @@
    "bold": 0, 
    "collapsible": 1, 
    "collapsible_depends_on": "supplied_items", 
+   "columns": 0, 
    "description": "", 
    "fieldname": "raw_material_details", 
    "fieldtype": "Section Break", 
@@ -2251,15 +2567,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Raw Materials Supplied", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-truck", 
+   "options": "fa fa-truck", 
    "permlevel": 0, 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -2270,6 +2588,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "supplied_items", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -2277,6 +2596,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Supplied Items", 
    "length": 0, 
    "no_copy": 0, 
@@ -2287,6 +2607,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, 
@@ -2298,6 +2619,7 @@
    "bold": 0, 
    "collapsible": 1, 
    "collapsible_depends_on": "is_recurring", 
+   "columns": 0, 
    "fieldname": "recurring_order", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -2305,14 +2627,16 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Recurring", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "icon-time", 
+   "options": "fa fa-time", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -2323,6 +2647,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -2330,6 +2655,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Settings", 
    "length": 0, 
    "no_copy": 0, 
@@ -2337,6 +2663,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, 
@@ -2347,6 +2674,7 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.docstatus<2", 
    "description": "", 
    "fieldname": "is_recurring", 
@@ -2356,6 +2684,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Is Recurring", 
    "length": 0, 
    "no_copy": 1, 
@@ -2363,6 +2692,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, 
@@ -2373,6 +2703,7 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "is_recurring", 
    "description": "", 
    "fieldname": "recurring_id", 
@@ -2382,6 +2713,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Reference Document", 
    "length": 0, 
    "no_copy": 1, 
@@ -2390,6 +2722,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, 
@@ -2400,6 +2733,7 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.is_recurring && doc.recurring_id === doc.name", 
    "description": "", 
    "fieldname": "recurring_type", 
@@ -2409,6 +2743,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Frequency", 
    "length": 0, 
    "no_copy": 1, 
@@ -2417,6 +2752,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, 
@@ -2427,6 +2763,7 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.is_recurring && doc.recurring_id === doc.name", 
    "description": "", 
    "fieldname": "repeat_on_day_of_month", 
@@ -2436,6 +2773,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Repeat on Day of Month", 
    "length": 0, 
    "no_copy": 1, 
@@ -2443,6 +2781,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, 
@@ -2453,6 +2792,7 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.is_recurring && doc.recurring_id === doc.name", 
    "description": "", 
    "fieldname": "end_date", 
@@ -2462,6 +2802,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "End Date", 
    "length": 0, 
    "no_copy": 1, 
@@ -2469,6 +2810,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, 
@@ -2479,6 +2821,7 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.is_recurring && doc.recurring_id === doc.name", 
    "fieldname": "submit_on_creation", 
    "fieldtype": "Check", 
@@ -2487,6 +2830,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Submit on creation", 
    "length": 0, 
    "no_copy": 0, 
@@ -2495,6 +2839,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, 
@@ -2505,6 +2850,7 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.is_recurring && doc.recurring_id === doc.name", 
    "description": "", 
    "fieldname": "notify_by_email", 
@@ -2514,6 +2860,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Notify by email", 
    "length": 0, 
    "no_copy": 1, 
@@ -2522,6 +2869,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, 
@@ -2532,6 +2880,7 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.is_recurring && doc.notify_by_email && doc.recurring_id === doc.name", 
    "description": "", 
    "fieldname": "notification_email_address", 
@@ -2541,6 +2890,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Notification Email Address", 
    "length": 0, 
    "no_copy": 1, 
@@ -2549,6 +2899,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, 
@@ -2559,6 +2910,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.is_recurring && doc.notify_by_email && doc.recurring_id === doc.name", 
    "fieldname": "recurring_print_format", 
    "fieldtype": "Link", 
@@ -2567,6 +2919,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Recurring Print Format", 
    "length": 0, 
    "no_copy": 0, 
@@ -2576,6 +2929,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, 
@@ -2586,6 +2940,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break83", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -2593,6 +2948,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "This Document", 
    "length": 0, 
    "no_copy": 0, 
@@ -2600,6 +2956,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, 
@@ -2610,6 +2967,7 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "is_recurring", 
    "description": "", 
    "fieldname": "from_date", 
@@ -2619,6 +2977,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "From Date", 
    "length": 0, 
    "no_copy": 1, 
@@ -2626,6 +2985,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, 
@@ -2636,6 +2996,7 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "is_recurring", 
    "description": "", 
    "fieldname": "to_date", 
@@ -2645,6 +3006,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "To Date", 
    "length": 0, 
    "no_copy": 1, 
@@ -2652,6 +3014,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, 
@@ -2662,6 +3025,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "is_recurring", 
    "description": "", 
    "fieldname": "next_date", 
@@ -2671,6 +3035,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Next Date", 
    "length": 0, 
    "no_copy": 1, 
@@ -2678,6 +3043,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, 
@@ -2687,7 +3053,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-file-text", 
+ "icon": "fa fa-file-text", 
  "idx": 105, 
  "image_view": 0, 
  "in_create": 0, 
@@ -2696,7 +3062,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-07-07 11:32:05.248626", 
+ "modified": "2016-11-07 06:01:00.233621", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Purchase Order", 
@@ -2712,6 +3078,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -2732,6 +3099,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -2752,6 +3120,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -2772,6 +3141,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 1, 
    "print": 0, 
    "read": 1, 
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.py b/erpnext/buying/doctype/purchase_order/purchase_order.py
index 79b22ae..796e0f2 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.py
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.py
@@ -155,7 +155,7 @@
 		if date_diff and date_diff[0][0]:
 			msgprint(_("{0} {1} has been modified. Please refresh.").format(self.doctype, self.name),
 				raise_exception=True)
-
+				
 	def update_status(self, status):
 		self.check_modified_date()
 		self.set_status(update=True, status=status)
@@ -207,6 +207,7 @@
 			"target_parent_dt": "Sales Order",
 			"target_dt": "Sales Order Item",
 			'target_field': 'ordered_qty',
+			"join_field": "sales_order_item",
 			"target_parent_field": ''
 		})
 
@@ -302,6 +303,11 @@
 		target.amount = flt(obj.amount) - flt(obj.billed_amt)
 		target.base_amount = target.amount * flt(source_parent.conversion_rate)
 		target.qty = target.amount / flt(obj.rate) if (flt(obj.rate) and flt(obj.billed_amt)) else flt(obj.qty)
+		
+		item = frappe.db.get_value("Item", target.item_code, ["item_group", "buying_cost_center"], as_dict=1)
+		target.cost_center = frappe.db.get_value("Project", obj.project, "cost_center") \
+			or item.buying_cost_center \
+			or frappe.db.get_value("Item Group", item.item_group, "default_cost_center")
 
 	doc = get_mapped_doc("Purchase Order", source_name,	{
 		"Purchase Order": {
@@ -350,4 +356,3 @@
 	po = frappe.get_doc("Purchase Order", name)
 	po.update_status(status)
 	po.update_delivered_qty_in_sales_order()
-
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py b/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py
index 61a9700..5e460df 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py
+++ b/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py
@@ -1,24 +1,25 @@
 from frappe import _
 
-data = {
-	'fieldname': 'purchase_order',
-	'internal_links': {
-		'Material Request': ['items', 'material_request'],
-		'Supplier Quotation': ['items', 'supplier_quotation'],
-		'Project': ['project'],
-	},
-	'transactions': [
-		{
-			'label': _('Related'),
-			'items': ['Purchase Receipt', 'Purchase Invoice']
+def get_data():
+	return {
+		'fieldname': 'purchase_order',
+		'internal_links': {
+			'Material Request': ['items', 'material_request'],
+			'Supplier Quotation': ['items', 'supplier_quotation'],
+			'Project': ['project'],
 		},
-		{
-			'label': _('Reference'),
-			'items': ['Material Request', 'Supplier Quotation', 'Project']
-		},
-		{
-			'label': _('Sub-contracting'),
-			'items': ['Stock Entry']
-		},
-	]
-}
\ No newline at end of file
+		'transactions': [
+			{
+				'label': _('Related'),
+				'items': ['Purchase Receipt', 'Purchase Invoice']
+			},
+			{
+				'label': _('Reference'),
+				'items': ['Material Request', 'Supplier Quotation', 'Project']
+			},
+			{
+				'label': _('Sub-contracting'),
+				'items': ['Stock Entry']
+			},
+		]
+	}
\ 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 c24bcdc..d4a0d07 100644
--- a/erpnext/buying/doctype/purchase_order/test_purchase_order.py
+++ b/erpnext/buying/doctype/purchase_order/test_purchase_order.py
@@ -110,6 +110,37 @@
 		po.update_status("Closed")
 
 		self.assertEquals(get_ordered_qty(item_code="_Test Item", warehouse="_Test Warehouse - _TC"), existing_ordered_qty)
+		
+	def test_group_same_items(self):
+		frappe.get_doc({
+			"doctype": "Purchase Order",
+			"company": "_Test Company",
+			"supplier" : "_Test Supplier",
+			"is_subcontracted" : "No",
+			"currency" : frappe.db.get_value("Company", "_Test Company", "default_currency"),
+			"conversion_factor" : 1,
+			"items" : get_same_items(),
+			"group_same_items": 1
+		}).insert()
+
+		
+def get_same_items():	
+	return [
+				{
+					"item_code": "_Test FG Item",
+					"warehouse": "_Test Warehouse - _TC",
+					"qty": 1,
+					"rate": 500,
+					"schedule_date": add_days(nowdate(), 1)
+				},
+				{
+					"item_code": "_Test FG Item",
+					"warehouse": "_Test Warehouse - _TC",
+					"qty": 4,
+					"rate": 500,
+					"schedule_date": add_days(nowdate(), 1)
+				}
+			]		
 
 def create_purchase_order(**args):
 	po = frappe.new_doc("Purchase Order")
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 de76c82..6fb6af7 100755
--- a/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
+++ b/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
@@ -118,7 +118,7 @@
    "unique": 0
   }, 
   {
-   "allow_on_submit": 0, 
+   "allow_on_submit": 1, 
    "bold": 1, 
    "collapsible": 0, 
    "columns": 0, 
@@ -145,6 +145,32 @@
    "unique": 0
   }, 
   {
+   "allow_on_submit": 1, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "expected_delivery_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Expected Delivery Date", 
+   "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": 1, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -605,7 +631,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
-   "label": "Rate ", 
+   "label": "Rate", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "import_rate", 
@@ -1465,7 +1491,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-08-26 04:41:17.371535", 
+ "modified": "2016-10-26 16:07:40.592325", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Purchase Order Item", 
@@ -1477,4 +1503,4 @@
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "track_seen": 0
-}
\ No newline at end of file
+}
diff --git a/erpnext/buying/doctype/quality_inspection/quality_inspection.js b/erpnext/buying/doctype/quality_inspection/quality_inspection.js
deleted file mode 100644
index 628337b..0000000
--- a/erpnext/buying/doctype/quality_inspection/quality_inspection.js
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-// License: GNU General Public License v3. See license.txt
-
-cur_frm.cscript.inspection_type = function(doc, cdt, cdn) {
-	if(doc.inspection_type == 'Incoming'){
-		doc.delivery_note_no = '';
-		hide_field('delivery_note_no');
-		unhide_field('purchase_receipt_no');
-	}
-	else if(doc.inspection_type == 'Outgoing'){
-		doc.purchase_receipt_no = '';
-		unhide_field('delivery_note_no');
-		hide_field('purchase_receipt_no');
-
-	}
-	else {
-		doc.purchase_receipt_no = '';
-		doc.delivery_note_no = '';
-		hide_field('purchase_receipt_no');
-		hide_field('delivery_note_no');
-	}
-}
-
-cur_frm.cscript.refresh = cur_frm.cscript.inspection_type;
-
-// item code based on GRN/DN
-cur_frm.fields_dict['item_code'].get_query = function(doc, cdt, cdn) {
-	if (doc.purchase_receipt_no) {
-		return {
-			query: "erpnext.buying.doctype.quality_inspection.quality_inspection.item_query",
-			filters: {
-				"from": "Purchase Receipt Item",
-				"parent": doc.purchase_receipt_no
-			}
-		}
-	} else if (doc.delivery_note_no) {
-		return {
-			query: "erpnext.buying.doctype.quality_inspection.quality_inspection.item_query",
-			filters: {
-				"from": "Delivery Note Item",
-				"parent": doc.delivery_note_no
-			}
-		}
-	}
-}
-
-// Serial No based on item_code
-cur_frm.fields_dict['item_serial_no'].get_query = function(doc, cdt, cdn) {
-	var filters = {};
-	if (doc.item_code) {
-		filters = {
-			'item_code': doc.item_code
-		}
-	}
-	return { filters: filters }
-}
-
-cur_frm.set_query("batch_no", function(doc) {
-	return {
-		filters: {
-			"item": doc.item_code
-		}
-	}
-})
-
-cur_frm.add_fetch('item_code', 'item_name', 'item_name');
-cur_frm.add_fetch('item_code', 'description', 'description');
-
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 e48e1dc..fbdb0e4 100644
--- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
+++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
@@ -15,6 +15,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "naming_series", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -22,6 +23,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Series", 
    "length": 0, 
    "no_copy": 1, 
@@ -33,6 +35,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, 
@@ -43,6 +46,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "", 
    "fieldname": "company", 
    "fieldtype": "Link", 
@@ -51,6 +55,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -62,6 +67,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 1, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 1, 
@@ -72,6 +78,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "For individual supplier", 
    "fieldname": "vendor", 
    "fieldtype": "Link", 
@@ -80,6 +87,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Supplier", 
    "length": 0, 
    "no_copy": 1, 
@@ -89,6 +97,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, 
@@ -99,6 +108,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break1", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -106,6 +116,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
@@ -115,6 +126,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "50%", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -126,6 +138,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "transaction_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -133,6 +146,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -143,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": 1, 
@@ -153,6 +168,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "suppliers_section", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -160,6 +176,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
@@ -168,6 +185,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, 
@@ -178,6 +196,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "suppliers", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -185,6 +204,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Supplier Detail", 
    "length": 0, 
    "no_copy": 0, 
@@ -194,6 +214,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, 
@@ -204,6 +225,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "items_section", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -211,16 +233,18 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-shopping-cart", 
+   "options": "fa fa-shopping-cart", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -231,6 +255,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "items", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -238,6 +263,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Items", 
    "length": 0, 
    "no_copy": 0, 
@@ -249,6 +275,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, 
@@ -259,6 +286,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "supplier_response_section", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -266,6 +294,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
@@ -274,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, 
@@ -284,6 +314,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "standard_reply", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -291,6 +322,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Standard Reply", 
    "length": 0, 
    "no_copy": 0, 
@@ -300,6 +332,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, 
@@ -310,6 +343,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "message_for_supplier", 
    "fieldtype": "Text Editor", 
    "hidden": 0, 
@@ -317,6 +351,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Message for Supplier", 
    "length": 0, 
    "no_copy": 0, 
@@ -325,6 +360,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, 
@@ -336,6 +372,7 @@
    "bold": 0, 
    "collapsible": 1, 
    "collapsible_depends_on": "terms", 
+   "columns": 0, 
    "fieldname": "terms_section_break", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -343,16 +380,18 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Terms and Conditions", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-legal", 
+   "options": "fa fa-legal", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -363,6 +402,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "tc_name", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -370,6 +410,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Terms", 
    "length": 0, 
    "no_copy": 0, 
@@ -381,6 +422,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, 
@@ -391,6 +433,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "terms", 
    "fieldtype": "Text Editor", 
    "hidden": 0, 
@@ -398,6 +441,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Terms and Conditions", 
    "length": 0, 
    "no_copy": 0, 
@@ -408,6 +452,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, 
@@ -418,6 +463,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
+   "columns": 0, 
    "fieldname": "printing_settings", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -425,6 +471,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Printing Settings", 
    "length": 0, 
    "no_copy": 0, 
@@ -433,6 +480,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, 
@@ -443,6 +491,7 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "select_print_heading", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -450,6 +499,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Print Heading", 
    "length": 0, 
    "no_copy": 1, 
@@ -461,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, 
@@ -471,6 +522,7 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "letter_head", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -478,6 +530,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Letter Head", 
    "length": 0, 
    "no_copy": 0, 
@@ -489,6 +542,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, 
@@ -499,6 +553,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
+   "columns": 0, 
    "fieldname": "more_info", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -506,16 +561,18 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "More Information", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-file-text", 
+   "options": "fa fa-file-text", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -526,6 +583,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "status", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -533,6 +591,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Status", 
    "length": 0, 
    "no_copy": 1, 
@@ -544,6 +603,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": 1, 
@@ -554,6 +614,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "fiscal_year", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -561,6 +622,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Fiscal Year", 
    "length": 0, 
    "no_copy": 0, 
@@ -572,6 +634,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, 
@@ -582,6 +645,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break3", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -589,6 +653,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -596,6 +661,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, 
@@ -606,6 +672,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "amended_from", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -613,6 +680,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amended From", 
    "length": 0, 
    "no_copy": 1, 
@@ -621,6 +689,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, 
@@ -630,7 +699,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-shopping-cart", 
+ "icon": "fa fa-shopping-cart", 
  "idx": 0, 
  "image_view": 0, 
  "in_create": 0, 
@@ -639,7 +708,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-08-01 08:45:39.777405", 
+ "modified": "2016-11-07 05:34:08.567257", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Request for Quotation", 
@@ -656,6 +725,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -676,6 +746,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -696,6 +767,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -716,6 +788,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -736,6 +809,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -756,6 +830,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 1, 
    "print": 0, 
    "read": 1, 
@@ -776,6 +851,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 1, 
    "print": 0, 
    "read": 1, 
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 b01d3e8..802888d 100644
--- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py
+++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py
@@ -131,7 +131,8 @@
 
 	def send_email(self, data, sender, subject, message, attachments):
 		make(subject = subject, content=message,recipients=data.email_id, 
-			sender=sender,attachments = attachments, send_email=True)["name"]
+			sender=sender,attachments = attachments, send_email=True,
+		     	doctype=self.doctype, name=self.name)["name"]
 
 		frappe.msgprint(_("Email sent to supplier {0}").format(data.supplier))
 
@@ -192,8 +193,6 @@
 	if isinstance(doc, basestring):
 		doc = json.loads(doc)
 
-	validate_duplicate_supplier_quotation(doc)
-
 	try:
 		sq_doc = frappe.get_doc({
 			"doctype": "Supplier Quotation",
@@ -210,7 +209,7 @@
 		frappe.msgprint(_("Supplier Quotation {0} created").format(sq_doc.name))
 		return sq_doc.name
 	except Exception:
-		return
+		return None
 
 def add_items(sq_doc, supplier, items):
 	for data in items:
@@ -245,13 +244,3 @@
 		args = doc.get('suppliers')[cint(supplier_idx) - 1]
 		doc.update_supplier_part_no(args)
 		return doc
-
-@frappe.whitelist()
-def validate_duplicate_supplier_quotation(args):
-	data = frappe.db.sql("""select sq.name as name from `tabSupplier Quotation` sq, 
-		`tabSupplier Quotation Item` sqi where sqi.parent = sq.name and sq.supplier = %(supplier)s 
-		and sqi.request_for_quotation = %(rfq)s and sq.docstatus < 2""",
-		{'supplier': args.get('supplier'), 'rfq': args.get('name')}, as_dict=True)
-
-	if data and data[0] and data[0].name:
-		frappe.throw(_("Already supplier quotation has created"))
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 4bb4d76..ba09d3f 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
@@ -1,12 +1,13 @@
 from frappe import _
 
-data = {
-	'docstatus': 1,
-	'fieldname': 'request_for_quotation',
-	'transactions': [
-		{
-			'label': _('Related'),
-			'items': ['Supplier Quotation']
-		},
-	]
-}
\ No newline at end of file
+def get_data():
+	return {
+		'docstatus': 1,
+		'fieldname': 'request_for_quotation',
+		'transactions': [
+			{
+				'label': _('Related'),
+				'items': ['Supplier Quotation']
+			},
+		]
+	}
\ No newline at end of file
diff --git a/erpnext/buying/doctype/supplier/supplier.js b/erpnext/buying/doctype/supplier/supplier.js
index cd13a72..b176e00 100644
--- a/erpnext/buying/doctype/supplier/supplier.js
+++ b/erpnext/buying/doctype/supplier/supplier.js
@@ -2,6 +2,19 @@
 // License: GNU General Public License v3. See license.txt
 
 frappe.ui.form.on("Supplier", {
+	setup: function(frm) {
+		frm.set_query('default_price_list', { 'buying': 1});
+		frm.set_query('account', 'accounts', function(doc, cdt, cdn) {
+			var d  = locals[cdt][cdn];
+			return {
+				filters: {
+					'account_type': 'Payable',
+					'company': d.company,
+					"is_group": 0
+				}
+			}
+		});
+	},
 	refresh: function(frm) {
 		if(frappe.defaults.get_default("supp_master_name")!="Naming Series") {
 			frm.toggle_display("naming_series", false);
@@ -16,23 +29,18 @@
 		else {
 		  	unhide_field(['address_html','contact_html']);
 			erpnext.utils.render_address_and_contact(frm);
+
+			// custom buttons
+			frm.add_custom_button(__('Accounting Ledger'), function() {
+				frappe.set_route('query-report', 'General Ledger',
+					{party_type:'Supplier', party:frm.doc.name});
+			});
+			frm.add_custom_button(__('Accounts Payable'), function() {
+				frappe.set_route('query-report', 'Accounts Payable', {supplier:frm.doc.name});
+			});
+
+			// indicators
+			erpnext.utils.set_party_dashboard_indicators(frm);
 		}
 	},
 });
-
-cur_frm.fields_dict['default_price_list'].get_query = function(doc, cdt, cdn) {
-	return{
-		filters:{'buying': 1}
-	}
-}
-
-cur_frm.fields_dict['accounts'].grid.get_field('account').get_query = function(doc, cdt, cdn) {
-	var d  = locals[cdt][cdn];
-	return {
-		filters: {
-			'account_type': 'Payable',
-			'company': d.company,
-			"is_group": 0
-		}
-	}
-}
diff --git a/erpnext/buying/doctype/supplier/supplier.json b/erpnext/buying/doctype/supplier/supplier.json
index a9c8f1a..4b8f8c5 100644
--- a/erpnext/buying/doctype/supplier/supplier.json
+++ b/erpnext/buying/doctype/supplier/supplier.json
@@ -11,11 +11,13 @@
  "doctype": "DocType", 
  "document_type": "Setup", 
  "editable_grid": 0, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "basic_info", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -23,15 +25,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Name and Type", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-user", 
+   "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, 
@@ -42,6 +46,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "naming_series", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -49,6 +54,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Series", 
    "length": 0, 
    "no_copy": 1, 
@@ -59,6 +65,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -69,6 +76,7 @@
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "supplier_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -76,6 +84,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Supplier Name", 
    "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": 1, 
    "search_index": 0, 
@@ -95,6 +105,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "country", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -102,6 +113,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Country", 
    "length": 0, 
    "no_copy": 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, 
@@ -121,6 +134,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "image", 
    "fieldtype": "Attach Image", 
    "hidden": 1, 
@@ -128,14 +142,16 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Image", 
    "length": 0, 
-   "no_copy": 0, 
+   "no_copy": 1, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -146,6 +162,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "status", 
    "fieldtype": "Select", 
    "hidden": 1, 
@@ -153,6 +170,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Status", 
    "length": 0, 
    "no_copy": 0, 
@@ -162,6 +180,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, 
@@ -172,6 +191,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break0", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -179,12 +199,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, 
@@ -196,6 +218,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "supplier_type", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -203,6 +226,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Supplier Type", 
    "length": 0, 
    "no_copy": 0, 
@@ -213,6 +237,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, 
@@ -223,6 +248,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "language", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -230,6 +256,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Print Language", 
    "length": 0, 
    "no_copy": 0, 
@@ -239,6 +266,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, 
@@ -249,6 +277,7 @@
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "0", 
    "fieldname": "disabled", 
    "fieldtype": "Check", 
@@ -257,6 +286,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Disabled", 
    "length": 0, 
    "no_copy": 0, 
@@ -265,6 +295,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, 
@@ -275,6 +306,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
+   "columns": 0, 
    "fieldname": "section_break_7", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -282,6 +314,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Currency and Price List", 
    "length": 0, 
    "no_copy": 0, 
@@ -290,6 +323,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, 
@@ -300,6 +334,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "default_currency", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -307,6 +342,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Billing Currency", 
    "length": 0, 
    "no_copy": 1, 
@@ -315,6 +351,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, 
@@ -325,6 +362,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_10", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -332,6 +370,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -339,6 +378,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, 
@@ -349,6 +389,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "default_price_list", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -356,6 +397,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Price List", 
    "length": 0, 
    "no_copy": 0, 
@@ -364,6 +406,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,6 +417,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
+   "columns": 0, 
    "fieldname": "section_credit_limit", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -381,6 +425,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Credit Limit", 
    "length": 0, 
    "no_copy": 0, 
@@ -389,6 +434,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, 
@@ -399,6 +445,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "credit_days_based_on", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -406,6 +453,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Credit Days Based On", 
    "length": 0, 
    "no_copy": 0, 
@@ -415,6 +463,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, 
@@ -425,6 +474,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", 
@@ -433,6 +483,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Credit Days", 
    "length": 0, 
    "no_copy": 0, 
@@ -440,6 +491,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, 
@@ -450,6 +502,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:!doc.__islocal", 
    "fieldname": "address_contacts", 
    "fieldtype": "Section Break", 
@@ -458,15 +511,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Address and Contacts", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
-   "options": "icon-map-marker", 
+   "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, 
@@ -477,6 +532,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "address_html", 
    "fieldtype": "HTML", 
    "hidden": 0, 
@@ -484,6 +540,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Address HTML", 
    "length": 0, 
    "no_copy": 0, 
@@ -491,6 +548,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, 
@@ -501,6 +559,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break1", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -508,12 +567,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, 
@@ -525,6 +586,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "contact_html", 
    "fieldtype": "HTML", 
    "hidden": 0, 
@@ -532,6 +594,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Contact HTML", 
    "length": 0, 
    "no_copy": 0, 
@@ -539,6 +602,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, 
@@ -550,6 +614,7 @@
    "bold": 0, 
    "collapsible": 1, 
    "collapsible_depends_on": "accounts", 
+   "columns": 0, 
    "fieldname": "default_payable_accounts", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -557,6 +622,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Default Payable Accounts", 
    "length": 0, 
    "no_copy": 0, 
@@ -564,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, 
@@ -574,6 +641,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "", 
    "description": "Mention if non-standard receivable account", 
    "fieldname": "accounts", 
@@ -583,6 +651,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Accounts", 
    "length": 0, 
    "no_copy": 0, 
@@ -591,6 +660,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, 
@@ -602,6 +672,7 @@
    "bold": 0, 
    "collapsible": 1, 
    "collapsible_depends_on": "supplier_details", 
+   "columns": 0, 
    "fieldname": "column_break2", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -609,6 +680,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "More Information", 
    "length": 0, 
    "no_copy": 0, 
@@ -616,6 +688,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, 
@@ -627,6 +700,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "website", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -634,6 +708,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Website", 
    "length": 0, 
    "no_copy": 0, 
@@ -643,6 +718,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, 
@@ -653,6 +729,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "Statutory info and other general information about your Supplier", 
    "fieldname": "supplier_details", 
    "fieldtype": "Text", 
@@ -661,6 +738,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Supplier Details", 
    "length": 0, 
    "no_copy": 0, 
@@ -670,6 +748,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, 
@@ -680,6 +759,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "is_frozen", 
    "fieldtype": "Check", 
    "hidden": 0, 
@@ -687,6 +767,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Is Frozen", 
    "length": 0, 
    "no_copy": 0, 
@@ -695,6 +776,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, 
@@ -704,7 +786,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-user", 
+ "icon": "fa fa-user", 
  "idx": 370, 
  "image_field": "image", 
  "image_view": 0, 
@@ -714,7 +796,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-08-23 05:43:20.950021", 
+ "modified": "2016-11-07 05:24:30.465053", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Supplier", 
@@ -731,6 +813,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -751,6 +834,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -771,6 +855,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -791,6 +876,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -811,6 +897,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -831,6 +918,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -851,6 +939,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
diff --git a/erpnext/buying/doctype/supplier/supplier.py b/erpnext/buying/doctype/supplier/supplier.py
index a4ee326..3677ee2 100644
--- a/erpnext/buying/doctype/supplier/supplier.py
+++ b/erpnext/buying/doctype/supplier/supplier.py
@@ -18,6 +18,26 @@
 	def onload(self):
 		"""Load address and contacts in `__onload`"""
 		load_address_and_contact(self, "supplier")
+		self.load_dashboard_info()
+
+	def load_dashboard_info(self):
+		billing_this_year = frappe.db.sql("""
+			select sum(credit_in_account_currency) - sum(debit_in_account_currency)
+			from `tabGL Entry`
+			where voucher_type='Purchase Invoice' and party_type = 'Supplier'
+				and party=%s and fiscal_year = %s""",
+			(self.name, frappe.db.get_default("fiscal_year")))
+
+		total_unpaid = frappe.db.sql("""select sum(outstanding_amount)
+			from `tabPurchase Invoice`
+			where supplier=%s and docstatus = 1""", self.name)
+
+
+		info = {}
+		info["billing_this_year"] = billing_this_year[0][0] if billing_this_year else 0
+		info["total_unpaid"] = total_unpaid[0][0] if total_unpaid else 0
+
+		self.set_onload('dashboard_info', info)
 
 	def autoname(self):
 		supp_master_name = frappe.defaults.get_global_default('supp_master_name')
diff --git a/erpnext/buying/doctype/supplier/supplier_dashboard.py b/erpnext/buying/doctype/supplier/supplier_dashboard.py
index ab123e2..4f01f58 100644
--- a/erpnext/buying/doctype/supplier/supplier_dashboard.py
+++ b/erpnext/buying/doctype/supplier/supplier_dashboard.py
@@ -1,17 +1,18 @@
 from frappe import _
 
-data = {
-	'heatmap': True,
-	'heatmap_message': _('This is based on transactions against this Supplier. See timeline below for details'),
-	'fieldname': 'supplier',
-	'transactions': [
-		{
-			'label': _('Procurement'),
-			'items': ['Request for Quotation', 'Supplier Quotation']
-		},
-		{
-			'label': _('Orders'),
-			'items': ['Purchase Order', 'Purchase Receipt', 'Purchase Invoice']
-		}
-	]
-}
\ No newline at end of file
+def get_data():
+	return {
+		'heatmap': True,
+		'heatmap_message': _('This is based on transactions against this Supplier. See timeline below for details'),
+		'fieldname': 'supplier',
+		'transactions': [
+			{
+				'label': _('Procurement'),
+				'items': ['Request for Quotation', 'Supplier Quotation']
+			},
+			{
+				'label': _('Orders'),
+				'items': ['Purchase Order', 'Purchase Receipt', 'Purchase Invoice']
+			}
+		]
+	}
\ No newline at end of file
diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
index 4184d79..519c37e 100644
--- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
+++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
@@ -23,14 +23,16 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "icon-user", 
+   "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, 
@@ -50,6 +52,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Title", 
    "length": 0, 
    "no_copy": 1, 
@@ -58,6 +61,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, 
@@ -76,6 +80,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Series", 
    "length": 0, 
    "no_copy": 1, 
@@ -86,6 +91,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, 
@@ -105,6 +111,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Supplier", 
    "length": 0, 
    "no_copy": 0, 
@@ -115,6 +122,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, 
@@ -133,6 +141,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -140,6 +149,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, 
@@ -158,6 +168,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
@@ -166,6 +177,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "50%", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -186,6 +198,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -195,6 +208,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, 
@@ -213,6 +227,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amended From", 
    "length": 0, 
    "no_copy": 1, 
@@ -223,6 +238,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,6 +258,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -252,6 +269,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 1, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 1, 
@@ -270,6 +288,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Address and Contact", 
    "length": 0, 
    "no_copy": 0, 
@@ -278,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, 
@@ -296,6 +316,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Supplier Address", 
    "length": 0, 
    "no_copy": 0, 
@@ -304,6 +325,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, 
@@ -322,6 +344,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Contact Person", 
    "length": 0, 
    "no_copy": 0, 
@@ -330,6 +353,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, 
@@ -348,6 +372,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Address", 
    "length": 0, 
    "no_copy": 0, 
@@ -355,6 +380,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, 
@@ -373,6 +399,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Contact", 
    "length": 0, 
    "no_copy": 0, 
@@ -380,6 +407,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, 
@@ -398,6 +426,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Mobile No", 
    "length": 0, 
    "no_copy": 0, 
@@ -405,6 +434,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, 
@@ -423,6 +453,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Contact Email", 
    "length": 0, 
    "no_copy": 0, 
@@ -431,6 +462,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, 
@@ -449,14 +481,16 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Currency and Price List", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "icon-tag", 
+   "options": "fa fa-tag", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -475,6 +509,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Currency", 
    "length": 0, 
    "no_copy": 0, 
@@ -485,6 +520,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, 
@@ -504,6 +540,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Exchange Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -514,6 +551,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, 
@@ -532,6 +570,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -539,6 +578,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "50%", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -558,6 +598,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Price List", 
    "length": 0, 
    "no_copy": 0, 
@@ -566,6 +607,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, 
@@ -585,6 +627,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Price List Currency", 
    "length": 0, 
    "no_copy": 0, 
@@ -593,6 +636,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, 
@@ -612,6 +656,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Price List Exchange Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -620,6 +665,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, 
@@ -638,6 +684,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Ignore Pricing Rule", 
    "length": 0, 
    "no_copy": 1, 
@@ -645,6 +692,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, 
@@ -663,15 +711,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-shopping-cart", 
+   "options": "fa fa-shopping-cart", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -690,6 +740,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Items", 
    "length": 0, 
    "no_copy": 0, 
@@ -700,6 +751,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, 
@@ -718,12 +770,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, 
@@ -742,6 +796,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -751,6 +806,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, 
@@ -769,6 +825,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Net Total (Company Currency)", 
    "length": 0, 
    "no_copy": 1, 
@@ -779,6 +836,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, 
@@ -797,12 +855,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, 
@@ -821,6 +881,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total", 
    "length": 0, 
    "no_copy": 0, 
@@ -830,6 +891,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, 
@@ -848,6 +910,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Net Total", 
    "length": 0, 
    "no_copy": 0, 
@@ -858,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, 
@@ -876,15 +940,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Taxes and Charges", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-money", 
+   "options": "fa fa-money", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -904,6 +970,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Taxes and Charges", 
    "length": 0, 
    "no_copy": 1, 
@@ -914,6 +981,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, 
@@ -932,6 +1000,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Purchase Taxes and Charges", 
    "length": 0, 
    "no_copy": 0, 
@@ -942,6 +1011,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, 
@@ -960,6 +1030,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Taxes and Charges Calculation", 
    "length": 0, 
    "no_copy": 1, 
@@ -968,6 +1039,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, 
@@ -986,15 +1058,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-money", 
+   "options": "fa fa-money", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1013,6 +1087,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Taxes and Charges Added (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -1023,6 +1098,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, 
@@ -1041,6 +1117,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Taxes and Charges Deducted (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -1051,6 +1128,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, 
@@ -1069,6 +1147,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Taxes and Charges (Company Currency)", 
    "length": 0, 
    "no_copy": 1, 
@@ -1079,6 +1158,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, 
@@ -1097,6 +1177,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -1104,6 +1185,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, 
@@ -1122,6 +1204,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Taxes and Charges Added", 
    "length": 0, 
    "no_copy": 0, 
@@ -1132,6 +1215,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, 
@@ -1150,6 +1234,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Taxes and Charges Deducted", 
    "length": 0, 
    "no_copy": 0, 
@@ -1160,6 +1245,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, 
@@ -1178,6 +1264,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Taxes and Charges", 
    "length": 0, 
    "no_copy": 0, 
@@ -1187,6 +1274,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, 
@@ -1206,6 +1294,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Additional Discount", 
    "length": 0, 
    "no_copy": 0, 
@@ -1214,6 +1303,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, 
@@ -1233,6 +1323,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Apply Additional Discount On", 
    "length": 0, 
    "no_copy": 0, 
@@ -1242,6 +1333,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, 
@@ -1260,6 +1352,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Additional Discount Amount (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -1269,6 +1362,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, 
@@ -1287,6 +1381,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -1294,6 +1389,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, 
@@ -1312,6 +1408,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Additional Discount Percentage", 
    "length": 0, 
    "no_copy": 0, 
@@ -1320,6 +1417,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, 
@@ -1338,6 +1436,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Additional Discount Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -1347,6 +1446,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, 
@@ -1365,6 +1465,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -1372,6 +1473,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, 
@@ -1390,6 +1492,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Grand Total (Company Currency)", 
    "length": 0, 
    "no_copy": 1, 
@@ -1400,6 +1503,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, 
@@ -1419,6 +1523,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "In Words (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -1428,6 +1533,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, 
@@ -1446,6 +1552,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Rounded Total (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -1456,6 +1563,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, 
@@ -1474,6 +1582,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
@@ -1481,6 +1590,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, 
@@ -1499,6 +1609,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Grand Total", 
    "length": 0, 
    "no_copy": 0, 
@@ -1509,6 +1620,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, 
@@ -1527,6 +1639,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "In Words", 
    "length": 0, 
    "no_copy": 0, 
@@ -1536,6 +1649,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, 
@@ -1555,15 +1669,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Terms and Conditions", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-legal", 
+   "options": "fa fa-legal", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1582,6 +1698,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Terms", 
    "length": 0, 
    "no_copy": 0, 
@@ -1592,6 +1709,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, 
@@ -1610,6 +1728,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Terms and Conditions", 
    "length": 0, 
    "no_copy": 0, 
@@ -1619,6 +1738,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, 
@@ -1637,6 +1757,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Printing Settings", 
    "length": 0, 
    "no_copy": 0, 
@@ -1645,6 +1766,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, 
@@ -1663,6 +1785,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Print Heading", 
    "length": 0, 
    "no_copy": 1, 
@@ -1673,6 +1796,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, 
@@ -1691,6 +1815,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Letter Head", 
    "length": 0, 
    "no_copy": 0, 
@@ -1701,6 +1826,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, 
@@ -1719,6 +1845,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Print Language", 
    "length": 0, 
    "no_copy": 0, 
@@ -1727,6 +1854,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, 
@@ -1745,15 +1873,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "More Information", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-file-text", 
+   "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, 
@@ -1772,6 +1902,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Status", 
    "length": 0, 
    "no_copy": 1, 
@@ -1782,6 +1913,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": 1, 
@@ -1800,12 +1932,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, 
@@ -1825,6 +1959,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Is Subcontracted", 
    "length": 0, 
    "no_copy": 0, 
@@ -1833,6 +1968,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, 
@@ -1851,6 +1987,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Reference", 
    "length": 0, 
    "no_copy": 0, 
@@ -1859,6 +1996,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, 
@@ -1877,6 +2015,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Opportunity", 
    "length": 0, 
    "no_copy": 1, 
@@ -1886,6 +2025,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, 
@@ -1895,7 +2035,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-shopping-cart", 
+ "icon": "fa fa-shopping-cart", 
  "idx": 29, 
  "image_view": 0, 
  "in_create": 0, 
@@ -1905,7 +2045,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-09-14 05:48:17.443848", 
+ "modified": "2016-11-07 05:59:51.237877", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Supplier Quotation", 
@@ -1921,6 +2061,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1941,6 +2082,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1961,6 +2103,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1981,6 +2124,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -2001,6 +2145,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 1, 
    "print": 0, 
    "read": 1, 
diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py
index 206dfa3..144e982 100644
--- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py
+++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py
@@ -3,6 +3,7 @@
 
 from __future__ import unicode_literals
 import frappe
+from frappe import _
 from frappe.utils import flt
 from frappe.model.mapper import get_mapped_doc
 
@@ -54,6 +55,18 @@
 		pc = frappe.get_doc('Purchase Common')
 		pc.validate_for_items(self)
 
+def get_list_context(context=None):
+	from erpnext.controllers.website_list_for_contact import get_list_context
+	list_context = get_list_context(context)
+	list_context.update({
+		'show_sidebar': True,
+		'show_search': True,
+		'no_breadcrumbs': True,
+		'title': _('Supplier Quotation'),
+	})
+
+	return list_context
+
 @frappe.whitelist()
 def make_purchase_order(source_name, target_doc=None):
 	def set_missing_values(source, target):
diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation_dashboard.py b/erpnext/buying/doctype/supplier_quotation/supplier_quotation_dashboard.py
index 6c8ae7c..80f946e 100644
--- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation_dashboard.py
+++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation_dashboard.py
@@ -1,20 +1,21 @@
 from frappe import _
 
-data = {
-	'fieldname': 'supplier_quotation',
-	'internal_links': {
-		'Material Request': ['items', 'material_request'],
-		'Request for Quotation': ['items', 'request_for_quotation'],
-		'Project': ['items', 'project'],
-	},
-	'transactions': [
-		{
-			'label': _('Related'),
-			'items': ['Purchase Order']
+def get_data():
+	return {
+		'fieldname': 'supplier_quotation',
+		'internal_links': {
+			'Material Request': ['items', 'material_request'],
+			'Request for Quotation': ['items', 'request_for_quotation'],
+			'Project': ['items', 'project'],
 		},
-		{
-			'label': _('Reference'),
-			'items': ['Material Request', 'Request for Quotation', 'Project']
-		},
-	]
-}
+		'transactions': [
+			{
+				'label': _('Related'),
+				'items': ['Purchase Order']
+			},
+			{
+				'label': _('Reference'),
+				'items': ['Material Request', 'Request for Quotation', 'Project']
+			},
+		]
+	}
diff --git a/erpnext/buying/page/purchase_analytics/purchase_analytics.json b/erpnext/buying/page/purchase_analytics/purchase_analytics.json
index 407d888..ad13c7d 100644
--- a/erpnext/buying/page/purchase_analytics/purchase_analytics.json
+++ b/erpnext/buying/page/purchase_analytics/purchase_analytics.json
@@ -2,7 +2,7 @@
  "creation": "2012-09-21 20:15:16.000000", 
  "docstatus": 0, 
  "doctype": "Page", 
- "icon": "icon-bar-chart", 
+ "icon": "fa fa-bar-chart", 
  "idx": 1, 
  "modified": "2013-07-11 14:43:52.000000", 
  "modified_by": "Administrator", 
diff --git a/erpnext/change_log/v7/v7_1_0.md b/erpnext/change_log/v7/v7_1_0.md
new file mode 100644
index 0000000..c294970
--- /dev/null
+++ b/erpnext/change_log/v7/v7_1_0.md
@@ -0,0 +1,45 @@
+#### Payroll
+- Salary Structure based on formula
+- Single Salary Structure record for multiple employees
+- Make payment entry directly from Salary Slip / Process Payroll form
+
+#### Scrap Management in Manufacturing
+- Define scrap items in BOM
+- Inward entry for scrap items along with finished goods
+
+#### Reports
+- Multi-year Financial Statements
+- Profit and Loss Statement based on Cost Center and Project
+- New report `Profitability Analysis` based on Cost Center and Project
+- Unclosed previous fiscal year's account balances in Balance Sheet and Trial Balance report
+
+#### Default Tax Template based on Country
+- On new installation, added predefined tax templates based on country
+
+#### Schools Updates
+- Renamed Examination doctype to Assessment
+- New Doctype
+	- Assessment Group
+	- Student Category
+	- Student Batch
+	- Guardian
+	- Student Admission
+	- Student Log
+	
+- Application portal for students
+
+#### Other Fixes
+- Show total amount in Stock Entry only for Material Issue / Receipt / Transfer purpose
+- Optional settings to unlink the payment entries on cancellation of the invoice
+- Validate selling price against purchase price
+- Combine duplicate items while printing Purchase Order
+- Project completion based on weighted average of tasks
+- Show already submitted Supplier Quotations on Supplier portal
+- Total and difference added for amount and qty in Stock Reconciliation
+- Option to make Supplier Quotation from Opportunity
+- Billing and outstanding information on Customer / Supplier dashboard
+- Web Form for Job Application
+- Option to make payment via Journal Entry
+- Wildcard search option in POS for Customer and Item
+- Optional setting for automatic allocation of payment amount against outstanding invoices in Payment Entry
+- Purchase Return for rejected items
\ No newline at end of file
diff --git a/erpnext/config/accounts.py b/erpnext/config/accounts.py
index 419d83f..d9faf6d 100644
--- a/erpnext/config/accounts.py
+++ b/erpnext/config/accounts.py
@@ -63,7 +63,7 @@
 				{
 					"type": "doctype",
 					"name": "Account",
-					"icon": "icon-sitemap",
+					"icon": "fa fa-sitemap",
 					"label": _("Chart of Accounts"),
 					"route": "Tree/Account",
 					"description": _("Tree of financial accounts."),
@@ -199,7 +199,7 @@
 				{
 					"type": "doctype",
 					"name": "Cost Center",
-					"icon": "icon-sitemap",
+					"icon": "fa fa-sitemap",
 					"label": _("Chart of Cost Centers"),
 					"route": "Tree/Cost Center",
 					"description": _("Tree of financial Cost Centers."),
@@ -244,7 +244,7 @@
 		},
 		{
 			"label": _("Setup"),
-			"icon": "icon-cog",
+			"icon": "fa fa-cog",
 			"items": [
 				{
 					"type": "doctype",
@@ -351,7 +351,7 @@
 		},
 		{
 			"label": _("Other Reports"),
-			"icon": "icon-table",
+			"icon": "fa fa-table",
 			"items": [
 				{
 					"type": "report",
@@ -373,6 +373,12 @@
 				},
 				{
 					"type": "report",
+					"name": "Profitability Analysis",
+					"doctype": "GL Entry",
+					"is_query_report": True,
+				},
+				{
+					"type": "report",
 					"name": "Payment Period Based On Invoice Date",
 					"is_query_report": True,
 					"doctype": "Journal Entry"
@@ -417,7 +423,7 @@
 		},
 		{
 			"label": _("Help"),
-			"icon": "icon-facetime-video",
+			"icon": "fa fa-facetime-video",
 			"items": [
 				{
 					"type": "help",
diff --git a/erpnext/config/buying.py b/erpnext/config/buying.py
index 3c947cb..e246266 100644
--- a/erpnext/config/buying.py
+++ b/erpnext/config/buying.py
@@ -5,7 +5,7 @@
 	return [
 		{
 			"label": _("Purchasing"),
-			"icon": "icon-star",
+			"icon": "fa fa-star",
 			"items": [
 				{
 					"type": "doctype",
@@ -57,7 +57,7 @@
 		},
 		{
 			"label": _("Setup"),
-			"icon": "icon-cog",
+			"icon": "fa fa-cog",
 			"items": [
 				{
 					"type": "doctype",
@@ -98,7 +98,7 @@
 				{
 					"type": "doctype",
 					"name": "Item Group",
-					"icon": "icon-sitemap",
+					"icon": "fa fa-sitemap",
 					"label": _("Item Group"),
 					"link": "Tree/Item Group",
 					"description": _("Tree of Item Groups."),
@@ -119,13 +119,13 @@
 		},
 		{
 			"label": _("Analytics"),
-			"icon": "icon-table",
+			"icon": "fa fa-table",
 			"items": [
 				{
 					"type": "page",
 					"name": "purchase-analytics",
 					"label": _("Purchase Analytics"),
-					"icon": "icon-bar-chart",
+					"icon": "fa fa-bar-chart",
 				},
 				{
 					"type": "report",
@@ -143,7 +143,7 @@
 		},
 		{
 			"label": _("Other Reports"),
-			"icon": "icon-list",
+			"icon": "fa fa-list",
 			"items": [
 				{
 					"type": "report",
diff --git a/erpnext/config/crm.py b/erpnext/config/crm.py
index e25493c..9935aef 100644
--- a/erpnext/config/crm.py
+++ b/erpnext/config/crm.py
@@ -4,7 +4,7 @@
 	return [
 		{
 			"label": _("Sales Pipeline"),
-			"icon": "icon-star",
+			"icon": "fa fa-star",
 			"items": [
 				{
 					"type": "doctype",
@@ -30,13 +30,13 @@
 		},
 		{
 			"label": _("Reports"),
-			"icon": "icon-list",
+			"icon": "fa fa-list",
 			"items": [
 				{
 					"type": "page",
 					"name": "sales-funnel",
 					"label": _("Sales Funnel"),
-					"icon": "icon-bar-chart",
+					"icon": "fa fa-bar-chart",
 				},
 				{
 					"type": "report",
@@ -53,7 +53,7 @@
 				{
 					"type": "report",
 					"is_query_report": True,
-					"name": "Customer Addresses and Contacts",
+					"name": "Customer Addresses And Contacts",
 					"doctype": "Contact"
 				},
 				{
@@ -66,7 +66,7 @@
 		},
 		{
 			"label": _("Communication"),
-			"icon": "icon-star",
+			"icon": "fa fa-star",
 			"items": [
 				{
 					"type": "doctype",
@@ -77,7 +77,7 @@
 		},
 		{
 			"label": _("Setup"),
-			"icon": "icon-cog",
+			"icon": "fa fa-cog",
 			"items": [
 				{
 					"type": "doctype",
@@ -88,7 +88,7 @@
 					"type": "doctype",
 					"label": _("Customer Group"),
 					"name": "Customer Group",
-					"icon": "icon-sitemap",
+					"icon": "fa fa-sitemap",
 					"link": "Tree/Customer Group",
 					"description": _("Manage Customer Group Tree."),
 				},
@@ -96,7 +96,7 @@
 					"type": "doctype",
 					"label": _("Territory"),
 					"name": "Territory",
-					"icon": "icon-sitemap",
+					"icon": "fa fa-sitemap",
 					"link": "Tree/Territory",
 					"description": _("Manage Territory Tree."),
 				},
@@ -104,7 +104,7 @@
 					"type": "doctype",
 					"label": _("Sales Person"),
 					"name": "Sales Person",
-					"icon": "icon-sitemap",
+					"icon": "fa fa-sitemap",
 					"link": "Tree/Sales Person",
 					"description": _("Manage Sales Person Tree."),
 				},
@@ -112,7 +112,7 @@
 		},
 		{
 			"label": _("SMS"),
-			"icon": "icon-wrench",
+			"icon": "fa fa-wrench",
 			"items": [
 				{
 					"type": "doctype",
diff --git a/erpnext/config/desktop.py b/erpnext/config/desktop.py
index c5a1320..9397ffc 100644
--- a/erpnext/config/desktop.py
+++ b/erpnext/config/desktop.py
@@ -79,7 +79,7 @@
 		{
 			"module_name": "Stock",
 			"color": "#f39c12",
-			"icon": "icon-truck",
+			"icon": "fa fa-truck",
 			"icon": "octicon octicon-package",
 			"type": "module",
 			"hidden": 1
@@ -94,7 +94,7 @@
 		{
 			"module_name": "Selling",
 			"color": "#1abc9c",
-			"icon": "icon-tag",
+			"icon": "fa fa-tag",
 			"icon": "octicon octicon-tag",
 			"type": "module",
 			"hidden": 1
@@ -102,7 +102,7 @@
 		{
 			"module_name": "Buying",
 			"color": "#c0392b",
-			"icon": "icon-shopping-cart",
+			"icon": "fa fa-shopping-cart",
 			"icon": "octicon octicon-briefcase",
 			"type": "module",
 			"hidden": 1
@@ -110,7 +110,7 @@
 		{
 			"module_name": "HR",
 			"color": "#2ecc71",
-			"icon": "icon-group",
+			"icon": "fa fa-group",
 			"icon": "octicon octicon-organization",
 			"label": _("Human Resources"),
 			"type": "module",
@@ -119,7 +119,7 @@
 		{
 			"module_name": "Manufacturing",
 			"color": "#7f8c8d",
-			"icon": "icon-cogs",
+			"icon": "fa fa-cogs",
 			"icon": "octicon octicon-tools",
 			"type": "module",
 			"hidden": 1
@@ -127,7 +127,7 @@
 		{
 			"module_name": "POS",
 			"color": "#589494",
-			"icon": "icon-th",
+			"icon": "fa fa-th",
 			"icon": "octicon octicon-credit-card",
 			"type": "page",
 			"link": "pos",
@@ -136,7 +136,7 @@
 		{
 			"module_name": "Projects",
 			"color": "#8e44ad",
-			"icon": "icon-puzzle-piece",
+			"icon": "fa fa-puzzle-piece",
 			"icon": "octicon octicon-rocket",
 			"type": "module",
 			"hidden": 1
@@ -144,7 +144,7 @@
 		{
 			"module_name": "Support",
 			"color": "#2c3e50",
-			"icon": "icon-phone",
+			"icon": "fa fa-phone",
 			"icon": "octicon octicon-issue-opened",
 			"type": "module",
 			"hidden": 1
@@ -231,7 +231,7 @@
 		{
 			"module_name": "Assessment",
 			"color": "#8a70be",
-			"icon": "icon-file-text-alt",
+			"icon": "fa fa-file-text-alt",
 			"label": _("Assessment"),
 			"link": "List/Assessment",
 			"_doctype": "Assessment",
@@ -240,7 +240,7 @@
 		{
 			"module_name": "Fees",
 			"color": "#83C21E",
-			"icon": "icon-money",
+			"icon": "fa fa-money",
 			"label": _("Fees"),
 			"link": "List/Fees",
 			"_doctype": "Fees",
@@ -258,7 +258,7 @@
 		{
 			"module_name": "Room",
 			"color": "#f22683",
-			"icon": "icon-map-marker",
+			"icon": "fa fa-map-marker",
 			"label": _("Room"),
 			"link": "List/Room",
 			"_doctype": "Room",
diff --git a/erpnext/config/docs.py b/erpnext/config/docs.py
index d1a54e8..7b6915a 100644
--- a/erpnext/config/docs.py
+++ b/erpnext/config/docs.py
@@ -15,14 +15,16 @@
 listed as one of the Best Open Source Softwares in the world by many online
 blogs."""
 
-docs_version = "6.x.x"
+docs_version = "7.x.x"
 splash_light_background = True
 
 def get_context(context):
-	context.brand_html = "ERPNext"
+	context.brand_html = ('<img class="brand-logo" src="'+context.docs_base_url
+		+'/assets/img/erpnext-docs.png"> ERPNext</img>')
 	context.app.splash_light_background = True
 	context.top_bar_items = [
 		{"label": "User Manual", "url": context.docs_base_url + "/user/manual", "right": 1},
 		{"label": "Videos", "url": context.docs_base_url + "/user/videos", "right": 1},
-		{"label": "API Documentation", "url": context.docs_base_url + "/current", "right": 1}
+		{"label": "API", "url": context.docs_base_url + "/current", "right": 1},
+		{"label": "Forum", "url": 'https://discuss.erpnext.com', "right": 1}
 	]
diff --git a/erpnext/config/hr.py b/erpnext/config/hr.py
index 51c258b..0b21fec 100644
--- a/erpnext/config/hr.py
+++ b/erpnext/config/hr.py
@@ -151,14 +151,14 @@
 
 		{
 			"label": _("Tools"),
-			"icon": "icon-wrench",
+			"icon": "fa fa-wrench",
 			"items": [
 
 			]
 		},
 		{
 			"label": _("Setup"),
-			"icon": "icon-cog",
+			"icon": "fa fa-cog",
 			"items": [
 				{
 					"type": "doctype",
@@ -185,11 +185,15 @@
 					"name": "Designation",
 					"description": _("Employee designation (e.g. CEO, Director etc.).")
 				},
+				{
+					"type": "doctype",
+					"name": "Daily Work Summary Settings"
+				},
 			]
 		},
 		{
 			"label": _("Reports"),
-			"icon": "icon-list",
+			"icon": "fa fa-list",
 			"items": [
 				{
 					"type": "report",
@@ -231,7 +235,7 @@
 		},
 		{
 			"label": _("Help"),
-			"icon": "icon-facetime-video",
+			"icon": "fa fa-facetime-video",
 			"items": [
 				{
 					"type": "help",
diff --git a/erpnext/config/maintenance.py b/erpnext/config/maintenance.py
index aa2f87c..7a44f55 100644
--- a/erpnext/config/maintenance.py
+++ b/erpnext/config/maintenance.py
@@ -4,7 +4,7 @@
 	return [
 		{
 			"label": _("Maintenance"),
-			"icon": "icon-star",
+			"icon": "fa fa-star",
 			"items": [
 				{
 					"type": "doctype",
diff --git a/erpnext/config/manufacturing.py b/erpnext/config/manufacturing.py
index d2432b6..0f76952 100644
--- a/erpnext/config/manufacturing.py
+++ b/erpnext/config/manufacturing.py
@@ -5,7 +5,7 @@
 	return [
 		{
 			"label": _("Production"),
-			"icon": "icon-star",
+			"icon": "fa fa-star",
 			"items": [
 				{
 					"type": "doctype",
@@ -41,7 +41,7 @@
 				{
 					"type": "doctype",
 					"name": "BOM",
-					"icon": "icon-sitemap",
+					"icon": "fa fa-sitemap",
 					"label": _("BOM Browser"),
 					"description": _("Tree of Bill of Materials"),
 					"link": "Tree/BOM",
@@ -66,7 +66,7 @@
 		},
 		{
 			"label": _("Tools"),
-			"icon": "icon-wrench",
+			"icon": "fa fa-wrench",
 			"items": [
 				{
 					"type": "doctype",
@@ -87,7 +87,7 @@
 		},
 		{
 			"label": _("Reports"),
-			"icon": "icon-list",
+			"icon": "fa fa-list",
 			"items": [
 				{
 					"type": "report",
@@ -123,7 +123,7 @@
 		},
 		{
 			"label": _("Help"),
-			"icon": "icon-facetime-video",
+			"icon": "fa fa-facetime-video",
 			"items": [
 				{
 					"type": "help",
diff --git a/erpnext/config/projects.py b/erpnext/config/projects.py
index e6c9578..1a70aee 100644
--- a/erpnext/config/projects.py
+++ b/erpnext/config/projects.py
@@ -5,7 +5,7 @@
 	return [
 		{
 			"label": _("Projects"),
-			"icon": "icon-star",
+			"icon": "fa fa-star",
 			"items": [
 				{
 					"type": "doctype",
@@ -19,7 +19,7 @@
 				},
 				{
 					"type": "report",
-					"route": "Gantt/Task",
+					"route": "List/Task/Gantt",
 					"doctype": "Task",
 					"name": "Gantt Chart",
 					"description": _("Gantt chart of all tasks.")
@@ -48,7 +48,7 @@
 		},
 		{
 			"label": _("Reports"),
-			"icon": "icon-list",
+			"icon": "fa fa-list",
 			"items": [
 				{
 					"type": "report",
@@ -66,7 +66,7 @@
 		},
 		{
 			"label": _("Help"),
-			"icon": "icon-facetime-video",
+			"icon": "fa fa-facetime-video",
 			"items": [
 				{
 					"type": "help",
diff --git a/erpnext/config/schools.py b/erpnext/config/schools.py
index 6acf081..f9696d0 100644
--- a/erpnext/config/schools.py
+++ b/erpnext/config/schools.py
@@ -48,6 +48,45 @@
 				{
 					"type": "doctype",
 					"name": "Program Enrollment Tool"
+				},
+				{
+					"type": "doctype",
+					"name": "Student Batch Creation Tool"
+				}
+			]
+		},
+		{
+			"label": _("Attendance"),
+			"items": [
+				{
+					"type": "doctype",
+					"name": "Student Attendance"
+				},
+				{
+					"type": "doctype",
+					"name": "Student Leave Application"
+				},
+				{
+					"type": "doctype",
+					"name": "Student Batch Attendance Tool"
+				},
+				{
+					"type": "report",
+					"is_query_report": True,
+					"name": "Absent Student Report",
+					"doctype": "Student Attendance"
+				},
+				{
+					"type": "report",
+					"is_query_report": True,
+					"name": "Student Batch-Wise Attendance",
+					"doctype": "Student Attendance"
+				},
+				{
+					"type": "report",
+					"is_query_report": True,
+					"name": "Student Monthly Attendance Sheet",
+					"doctype": "Student Attendance"
 				}
 			]
 		},
@@ -61,8 +100,13 @@
 				},
 				{
 					"type": "doctype",
-					"name": "Student Attendance"
-				},
+					"name": "Course Scheduling Tool"
+				}
+			]
+		},
+		{
+			"label": _("Assessment"),
+			"items": [
 				{
 					"type": "doctype",
 					"name": "Assessment"
@@ -73,7 +117,7 @@
 				},
 				{
 					"type": "doctype",
-					"name": "Scheduling Tool"
+					"name": "Grading Structure"
 				}
 			]
 		},
@@ -130,14 +174,6 @@
 				},
 				{
 					"type": "doctype",
-					"name": "Student Category"
-				},
-				{
-					"type": "doctype",
-					"name": "Grading Structure"
-				},
-				{
-					"type": "doctype",
 					"name": "Instructor"
 				},
 				{
@@ -146,6 +182,14 @@
 				},
 				{
 					"type": "doctype",
+					"name": "Student Category"
+				},
+				{
+					"type": "doctype",
+					"name": "Student Batch Name"
+				},
+				{
+					"type": "doctype",
 					"name": "Academic Term"
 				},
 				{
diff --git a/erpnext/config/selling.py b/erpnext/config/selling.py
index 45ec1f7..c406d09 100644
--- a/erpnext/config/selling.py
+++ b/erpnext/config/selling.py
@@ -5,7 +5,7 @@
 	return [
 		{
 			"label": _("Sales"),
-			"icon": "icon-star",
+			"icon": "fa fa-star",
 			"items": [
 				{
 					"type": "doctype",
@@ -31,7 +31,7 @@
 					"type": "doctype",
 					"label": _("Customer Group"),
 					"name": "Customer Group",
-					"icon": "icon-sitemap",
+					"icon": "fa fa-sitemap",
 					"link": "Tree/Customer Group",
 					"description": _("Manage Customer Group Tree."),
 				},
@@ -69,7 +69,7 @@
 				{
 					"type": "doctype",
 					"name": "Item Group",
-					"icon": "icon-sitemap",
+					"icon": "fa fa-sitemap",
 					"label": _("Item Group"),
 					"link": "Tree/Item Group",
 					"description": _("Tree of Item Groups."),
@@ -100,7 +100,7 @@
 					"type": "doctype",
 					"label": _("Territory"),
 					"name": "Territory",
-					"icon": "icon-sitemap",
+					"icon": "fa fa-sitemap",
 					"link": "Tree/Territory",
 					"description": _("Manage Territory Tree."),
 				},
@@ -113,7 +113,7 @@
 					"type": "doctype",
 					"label": _("Sales Person"),
 					"name": "Sales Person",
-					"icon": "icon-sitemap",
+					"icon": "fa fa-sitemap",
 					"link": "Tree/Sales Person",
 					"description": _("Manage Sales Person Tree."),
 				},
@@ -135,7 +135,7 @@
 		},
 		{
 			"label": _("Setup"),
-			"icon": "icon-cog",
+			"icon": "fa fa-cog",
 			"items": [
 				{
 					"type": "doctype",
@@ -167,26 +167,26 @@
 		},
 		{
 			"label": _("Analytics"),
-			"icon": "icon-table",
+			"icon": "fa fa-table",
 			"items": [
 				{
 					"type": "page",
 					"name": "sales-analytics",
 					"label": _("Sales Analytics"),
-					"icon": "icon-bar-chart",
+					"icon": "fa fa-bar-chart",
 				},
 				{
 					"type": "page",
 					"name": "sales-funnel",
 					"label": _("Sales Funnel"),
-					"icon": "icon-bar-chart",
+					"icon": "fa fa-bar-chart",
 				},
 				{
 					"type": "report",
 					"is_query_report": True,
 					"name": "Customer Acquisition and Loyalty",
 					"doctype": "Customer",
-					"icon": "icon-bar-chart",
+					"icon": "fa fa-bar-chart",
 				},
 				{
 					"type": "report",
@@ -204,7 +204,7 @@
 		},
 		{
 			"label": _("Other Reports"),
-			"icon": "icon-list",
+			"icon": "fa fa-list",
 			"items": [
 				{
 					"type": "report",
@@ -270,7 +270,7 @@
 		},
 		{
 			"label": _("SMS"),
-			"icon": "icon-wrench",
+			"icon": "fa fa-wrench",
 			"items": [
 				{
 					"type": "doctype",
diff --git a/erpnext/config/setup.py b/erpnext/config/setup.py
index 5ad6403..9c9bae2 100644
--- a/erpnext/config/setup.py
+++ b/erpnext/config/setup.py
@@ -6,7 +6,7 @@
 	data = [
 		{
 			"label": _("Settings"),
-			"icon": "icon-wrench",
+			"icon": "fa fa-wrench",
 			"items": [
 				{
 					"type": "doctype",
@@ -19,7 +19,7 @@
 		},
 		{
 			"label": _("Printing"),
-			"icon": "icon-print",
+			"icon": "fa fa-print",
 			"items": [
 				{
 					"type": "doctype",
@@ -75,7 +75,7 @@
 		},
 		{
 			"label": _("Customize"),
-			"icon": "icon-glass",
+			"icon": "fa fa-glass",
 			"items": [
 				{
 					"type": "doctype",
@@ -92,7 +92,7 @@
 		},
 		{
 			"label": _("Email"),
-			"icon": "icon-envelope",
+			"icon": "fa fa-envelope",
 			"items": [
 				{
 					"type": "doctype",
@@ -109,12 +109,12 @@
 	]
 
 	for module, label, icon in (
-		("accounts", _("Accounts"), "icon-money"),
-		("stock", _("Stock"), "icon-truck"),
-		("selling", _("Selling"), "icon-tag"),
-		("buying", _("Buying"), "icon-shopping-cart"),
-		("hr", _("Human Resources"), "icon-group"),
-		("support", _("Support"), "icon-phone")):
+		("accounts", _("Accounts"), "fa fa-money"),
+		("stock", _("Stock"), "fa fa-truck"),
+		("selling", _("Selling"), "fa fa-tag"),
+		("buying", _("Buying"), "fa fa-shopping-cart"),
+		("hr", _("Human Resources"), "fa fa-group"),
+		("support", _("Support"), "fa fa-phone")):
 
 		add_setup_section(data, "erpnext", module, label, icon)
 
diff --git a/erpnext/config/stock.py b/erpnext/config/stock.py
index 5b78ca3..3ca424d 100644
--- a/erpnext/config/stock.py
+++ b/erpnext/config/stock.py
@@ -79,7 +79,7 @@
 				{
 					"type": "doctype",
 					"name": "Item Group",
-					"icon": "icon-sitemap",
+					"icon": "fa fa-sitemap",
 					"label": _("Item Group"),
 					"link": "Tree/Item Group",
 					"description": _("Tree of Item Groups."),
@@ -140,7 +140,7 @@
 		},
 		{
 			"label": _("Tools"),
-			"icon": "icon-wrench",
+			"icon": "fa fa-wrench",
 			"items": [
 				{
 					"type": "doctype",
@@ -166,7 +166,7 @@
 		},
 		{
 			"label": _("Setup"),
-			"icon": "icon-cog",
+			"icon": "fa fa-cog",
 			"items": [
 				{
 					"type": "doctype",
@@ -198,7 +198,7 @@
 		},
 		{
 			"label": _("Analytics"),
-			"icon": "icon-table",
+			"icon": "fa fa-table",
 			"items": [
 				{
 					"type": "report",
@@ -210,7 +210,7 @@
 					"type": "page",
 					"name": "stock-analytics",
 					"label": _("Stock Analytics"),
-					"icon": "icon-bar-chart"
+					"icon": "fa fa-bar-chart"
 				},
 				{
 					"type": "report",
@@ -229,7 +229,7 @@
 		},
 		{
 			"label": _("Reports"),
-			"icon": "icon-list",
+			"icon": "fa fa-list",
 			"items": [
 				{
 					"type": "report",
@@ -277,7 +277,7 @@
 		},
 		{
 			"label": _("Help"),
-			"icon": "icon-facetime-video",
+			"icon": "fa fa-facetime-video",
 			"items": [
 				{
 					"type": "help",
diff --git a/erpnext/config/support.py b/erpnext/config/support.py
index a4a4c22..c1f56f0 100644
--- a/erpnext/config/support.py
+++ b/erpnext/config/support.py
@@ -35,13 +35,13 @@
 		},
 		{
 			"label": _("Reports"),
-			"icon": "icon-list",
+			"icon": "fa fa-list",
 			"items": [
 				{
 					"type": "page",
 					"name": "support-analytics",
 					"label": _("Support Analytics"),
-					"icon": "icon-bar-chart"
+					"icon": "fa fa-bar-chart"
 				},
 				{
 					"type": "report",
diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py
index 02e5411..f726db8 100644
--- a/erpnext/controllers/accounts_controller.py
+++ b/erpnext/controllers/accounts_controller.py
@@ -16,557 +16,596 @@
 force_item_fields = ("item_group", "barcode", "brand", "stock_uom")
 
 class AccountsController(TransactionBase):
-    def __init__(self, arg1, arg2=None):
-        super(AccountsController, self).__init__(arg1, arg2)
+	def __init__(self, arg1, arg2=None):
+		super(AccountsController, self).__init__(arg1, arg2)
 
-    @property
-    def company_currency(self):
-        if not hasattr(self, "__company_currency"):
-            self.__company_currency = get_company_currency(self.company)
+	@property
+	def company_currency(self):
+		if not hasattr(self, "__company_currency"):
+			self.__company_currency = get_company_currency(self.company)
 
-        return self.__company_currency
+		return self.__company_currency
 
-    def validate(self):
-        if self.get("_action") and self._action != "update_after_submit":
-            self.set_missing_values(for_validate=True)
-        self.validate_date_with_fiscal_year()
+	def onload(self):
+		self.get("__onload").make_payment_via_journal_entry = frappe.db.get_single_value('Accounts Settings', 'make_payment_via_journal_entry')
 
-        if self.meta.get_field("currency"):
-            self.calculate_taxes_and_totals()
+	def validate(self):
+		if self.get("_action") and self._action != "update_after_submit":
+			self.set_missing_values(for_validate=True)
+		self.validate_date_with_fiscal_year()
 
-            if not self.meta.get_field("is_return") or not self.is_return:
-                self.validate_value("base_grand_total", ">=", 0)
+		if self.meta.get_field("currency"):
+			self.calculate_taxes_and_totals()
 
-            validate_return(self)
-            self.set_total_in_words()
+			if not self.meta.get_field("is_return") or not self.is_return:
+				self.validate_value("base_grand_total", ">=", 0)
 
-        if self.doctype in ("Sales Invoice", "Purchase Invoice") and not self.is_return:
-            self.validate_due_date()
-            self.validate_advance_entries()
+			validate_return(self)
+			self.set_total_in_words()
 
-        if self.meta.get_field("taxes_and_charges"):
-            self.validate_enabled_taxes_and_charges()
+		if self.doctype in ("Sales Invoice", "Purchase Invoice") and not self.is_return:
+			self.validate_due_date()
+			self.validate_advance_entries()
 
-        self.validate_party()
-        self.validate_currency()
+		if self.meta.get_field("taxes_and_charges"):
+			self.validate_enabled_taxes_and_charges()
 
-        if self.meta.get_field("is_recurring"):
-            if self.amended_from and self.recurring_id:
-                self.recurring_id = None
-            if not self.get("__islocal"):
-                validate_recurring_document(self)
-                convert_to_recurring(self, self.get("posting_date") or self.get("transaction_date"))
+		self.validate_party()
+		self.validate_currency()
 
-        if self.doctype == 'Purchase Invoice':
-            self.validate_paid_amount()
+		if self.meta.get_field("is_recurring"):
+			if self.amended_from and self.recurring_id:
+				self.recurring_id = None
+			if not self.get("__islocal"):
+				validate_recurring_document(self)
+				convert_to_recurring(self, self.get("posting_date") or self.get("transaction_date"))
 
-    def validate_paid_amount(self):
-        if hasattr(self, "is_pos") or hasattr(self, "is_paid"):
-            is_paid = self.get("is_pos") or self.get("is_paid")
-            if cint(is_paid) == 1:
-                if flt(self.paid_amount) == 0 and flt(self.outstanding_amount) > 0:
-                    if self.cash_bank_account:
-                        self.paid_amount = flt(flt(self.grand_total) - flt(self.write_off_amount),
-                            self.precision("paid_amount"))
-                        self.base_paid_amount = flt(self.paid_amount * self.conversion_rate, self.precision("base_paid_amount"))
-                    else:
-                        # show message that the amount is not paid
-                        self.paid_amount = 0
-                        frappe.throw(_("Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified"))
-            else:
-                frappe.db.set(self,'paid_amount',0)
+		if self.doctype == 'Purchase Invoice':
+			self.validate_paid_amount()
 
-    def on_update_after_submit(self):
-        if self.meta.get_field("is_recurring"):
-            validate_recurring_document(self)
-            convert_to_recurring(self, self.get("posting_date") or self.get("transaction_date"))
+	def before_print(self):
+		if self.doctype in ['Purchase Order', 'Sales Order']:
+			if self.get("group_same_items"):
+				self.group_similar_items()
 
-    def set_missing_values(self, for_validate=False):
-        if frappe.flags.in_test:
-            for fieldname in ["posting_date","transaction_date"]:
-                if self.meta.get_field(fieldname) and not self.get(fieldname):
-                    self.set(fieldname, today())
-                    break
+	def validate_paid_amount(self):
+		if hasattr(self, "is_pos") or hasattr(self, "is_paid"):
+			is_paid = self.get("is_pos") or self.get("is_paid")
+			if cint(is_paid) == 1:
+				if flt(self.paid_amount) == 0 and flt(self.outstanding_amount) > 0:
+					if self.cash_bank_account:
+						self.paid_amount = flt(flt(self.grand_total) - flt(self.write_off_amount),
+							self.precision("paid_amount"))
+						self.base_paid_amount = flt(self.paid_amount * self.conversion_rate, self.precision("base_paid_amount"))
+					else:
+						# show message that the amount is not paid
+						self.paid_amount = 0
+						frappe.throw(_("Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified"))
+			else:
+				frappe.db.set(self,'paid_amount',0)
 
-    def calculate_taxes_and_totals(self):
-        from erpnext.controllers.taxes_and_totals import calculate_taxes_and_totals
-        calculate_taxes_and_totals(self)
+	def on_update_after_submit(self):
+		if self.meta.get_field("is_recurring"):
+			validate_recurring_document(self)
+			convert_to_recurring(self, self.get("posting_date") or self.get("transaction_date"))
 
-        if self.doctype in ["Quotation", "Sales Order", "Delivery Note", "Sales Invoice"]:
-            self.calculate_commission()
-            self.calculate_contribution()
+	def set_missing_values(self, for_validate=False):
+		if frappe.flags.in_test:
+			for fieldname in ["posting_date","transaction_date"]:
+				if self.meta.get_field(fieldname) and not self.get(fieldname):
+					self.set(fieldname, today())
+					break
 
-    def validate_date_with_fiscal_year(self):
-        if self.meta.get_field("fiscal_year") :
-            date_field = ""
-            if self.meta.get_field("posting_date"):
-                date_field = "posting_date"
-            elif self.meta.get_field("transaction_date"):
-                date_field = "transaction_date"
+	def calculate_taxes_and_totals(self):
+		from erpnext.controllers.taxes_and_totals import calculate_taxes_and_totals
+		calculate_taxes_and_totals(self)
 
-            if date_field and self.get(date_field):
-                validate_fiscal_year(self.get(date_field), self.fiscal_year,
-                    self.meta.get_label(date_field), self)
+		if self.doctype in ["Quotation", "Sales Order", "Delivery Note", "Sales Invoice"]:
+			self.calculate_commission()
+			self.calculate_contribution()
 
-    def validate_due_date(self):
-        from erpnext.accounts.party import validate_due_date
-        if self.doctype == "Sales Invoice":
-            if not self.due_date:
-                frappe.throw(_("Due Date is mandatory"))
+	def validate_date_with_fiscal_year(self):
+		if self.meta.get_field("fiscal_year") :
+			date_field = ""
+			if self.meta.get_field("posting_date"):
+				date_field = "posting_date"
+			elif self.meta.get_field("transaction_date"):
+				date_field = "transaction_date"
 
-            validate_due_date(self.posting_date, self.due_date, "Customer", self.customer, self.company)
-        elif self.doctype == "Purchase Invoice":
-            validate_due_date(self.posting_date, self.due_date, "Supplier", self.supplier, self.company)
+			if date_field and self.get(date_field):
+				validate_fiscal_year(self.get(date_field), self.fiscal_year,
+					self.meta.get_label(date_field), self)
 
-    def set_price_list_currency(self, buying_or_selling):
-        # manqala 19/09/2016: for PO and SO the translation date for exchange rate conversions is transaction_date. For everything else it is posting_date
-        if self.meta.get_field("posting_date"):
-            translation_date = self.posting_date
-        else:
-            translation_date = self.transaction_date
-        # end manqala
-            
-        if self.meta.get_field("currency"):
-            # price list part
-            fieldname = "selling_price_list" if buying_or_selling.lower() == "selling" \
-                else "buying_price_list"
-            if self.meta.get_field(fieldname) and self.get(fieldname):
-                self.price_list_currency = frappe.db.get_value("Price List",
-                    self.get(fieldname), "currency")
+	def validate_due_date(self):
+		from erpnext.accounts.party import validate_due_date
+		if self.doctype == "Sales Invoice":
+			if not self.due_date:
+				frappe.throw(_("Due Date is mandatory"))
 
-                if self.price_list_currency == self.company_currency:
-                    self.plc_conversion_rate = 1.0
+			validate_due_date(self.posting_date, self.due_date, "Customer", self.customer, self.company)
+		elif self.doctype == "Purchase Invoice":
+			validate_due_date(self.posting_date, self.due_date, "Supplier", self.supplier, self.company)
 
-                elif not self.plc_conversion_rate:
-                    # manqala 19/09/16: using the transaction date on the PO or SO as the basis for getting the exchange rate
-                    self.plc_conversion_rate = get_exchange_rate(
-                        translation_date, self.price_list_currency, self.company_currency)
+	def set_price_list_currency(self, buying_or_selling):
+		if self.meta.get_field("posting_date"):
+			translation_date = self.posting_date
+		else:
+			translation_date = self.transaction_date
+		 
+		if self.meta.get_field("currency"):
+			# price list part
+			fieldname = "selling_price_list" if buying_or_selling.lower() == "selling" \
+				else "buying_price_list"
+			if self.meta.get_field(fieldname) and self.get(fieldname):
+				self.price_list_currency = frappe.db.get_value("Price List",
+					self.get(fieldname), "currency")
 
-            # currency
-            if not self.currency:
-                self.currency = self.price_list_currency
-                self.conversion_rate = self.plc_conversion_rate
-            elif self.currency == self.company_currency:
-                self.conversion_rate = 1.0
-            elif not self.conversion_rate:
-                # manqala 19/09/2016: added transaction date to arguments for get_exchange_rate
-                self.conversion_rate = get_exchange_rate(translation_date, self.currency,
-                    self.company_currency)
-                # end manqala
+				if self.price_list_currency == self.company_currency:
+					self.plc_conversion_rate = 1.0
 
-    def set_missing_item_details(self):
-        """set missing item values"""
-        from erpnext.stock.get_item_details import get_item_details
+				elif not self.plc_conversion_rate:
+					self.plc_conversion_rate = get_exchange_rate(translation_date, 
+						self.price_list_currency, self.company_currency)
 
-        if hasattr(self, "items"):
-            parent_dict = {}
-            for fieldname in self.meta.get_valid_columns():
-                parent_dict[fieldname] = self.get(fieldname)
+			# currency
+			if not self.currency:
+				self.currency = self.price_list_currency
+				self.conversion_rate = self.plc_conversion_rate
+			elif self.currency == self.company_currency:
+				self.conversion_rate = 1.0
+			elif not self.conversion_rate:
+				self.conversion_rate = get_exchange_rate(translation_date, self.currency,
+					self.company_currency)
 
-            if self.doctype in ["Quotation", "Sales Order", "Delivery Note", "Sales Invoice"]:
-                document_type = "{} Item".format(self.doctype)
-                parent_dict.update({"document_type": document_type})
+	def set_missing_item_details(self, for_validate=False):
+		"""set missing item values"""
+		from erpnext.stock.get_item_details import get_item_details
 
-            for item in self.get("items"):
-                if item.get("item_code"):
-                    args = parent_dict.copy()
-                    args.update(item.as_dict())
+		if hasattr(self, "items"):
+			parent_dict = {}
+			for fieldname in self.meta.get_valid_columns():
+				parent_dict[fieldname] = self.get(fieldname)
 
-                    args["doctype"] = self.doctype
-                    args["name"] = self.name
+			if self.doctype in ["Quotation", "Sales Order", "Delivery Note", "Sales Invoice"]:
+				document_type = "{} Item".format(self.doctype)
+				parent_dict.update({"document_type": document_type})
 
-                    if not args.get("transaction_date"):
-                        args["transaction_date"] = args.get("posting_date")
+			for item in self.get("items"):
+				if item.get("item_code"):
+					args = parent_dict.copy()
+					args.update(item.as_dict())
 
-                    if self.get("is_subcontracted"):
-                        args["is_subcontracted"] = self.is_subcontracted
+					args["doctype"] = self.doctype
+					args["name"] = self.name
 
-                    ret = get_item_details(args)
+					if not args.get("transaction_date"):
+						args["transaction_date"] = args.get("posting_date")
 
+					if self.get("is_subcontracted"):
+						args["is_subcontracted"] = self.is_subcontracted
 
-                    for fieldname, value in ret.items():
-                        if item.meta.get_field(fieldname) and value is not None:
-                            if (item.get(fieldname) is None or fieldname in force_item_fields):
-                                item.set(fieldname, value)
+					ret = get_item_details(args)
 
-                            elif fieldname == "cost_center" and not item.get("cost_center"):
-                                item.set(fieldname, value)
 
-                            elif fieldname == "conversion_factor" and not item.get("conversion_factor"):
-                                item.set(fieldname, value)
+					for fieldname, value in ret.items():
+						if item.meta.get_field(fieldname) and value is not None:
+							if (item.get(fieldname) is None or fieldname in force_item_fields):
+								item.set(fieldname, value)
 
-                    if ret.get("pricing_rule"):
-                        # if user changed the discount percentage then set user's discount percentage ?
-                        item.set("discount_percentage", ret.get("discount_percentage"))
-                        if ret.get("pricing_rule_for") == "Price":
-                            item.set("pricing_list_rate", ret.get("pricing_list_rate"))
+							elif fieldname == "cost_center" and not item.get("cost_center"):
+								item.set(fieldname, value)
 
-                        if item.price_list_rate:
-                            item.rate = flt(item.price_list_rate *
-                                (1.0 - (flt(item.discount_percentage) / 100.0)), item.precision("rate"))
+							elif fieldname == "conversion_factor" and not item.get("conversion_factor"):
+								item.set(fieldname, value)
 
-            if self.doctype == "Purchase Invoice":
-                self.set_expense_account()
+					if ret.get("pricing_rule"):
+						# if user changed the discount percentage then set user's discount percentage ?
+						item.set("discount_percentage", ret.get("discount_percentage"))
+						if ret.get("pricing_rule_for") == "Price":
+							item.set("pricing_list_rate", ret.get("pricing_list_rate"))
 
-    def set_taxes(self):
-        if not self.meta.get_field("taxes"):
-            return
+						if item.price_list_rate:
+							item.rate = flt(item.price_list_rate *
+								(1.0 - (flt(item.discount_percentage) / 100.0)), item.precision("rate"))
 
-        tax_master_doctype = self.meta.get_field("taxes_and_charges").options
+			if self.doctype == "Purchase Invoice":
+				self.set_expense_account(for_validate)
 
-        if not self.get("taxes"):
-            if not self.get("taxes_and_charges"):
-                # get the default tax master
-                self.set("taxes_and_charges", frappe.db.get_value(tax_master_doctype, {"is_default": 1}))
+	def set_taxes(self):
+		if not self.meta.get_field("taxes"):
+			return
 
-            self.append_taxes_from_master(tax_master_doctype)
+		tax_master_doctype = self.meta.get_field("taxes_and_charges").options
 
-    def append_taxes_from_master(self, tax_master_doctype=None):
-        if self.get("taxes_and_charges"):
-            if not tax_master_doctype:
-                tax_master_doctype = self.meta.get_field("taxes_and_charges").options
+		if not self.get("taxes"):
+			if not self.get("taxes_and_charges"):
+				# get the default tax master
+				self.set("taxes_and_charges", frappe.db.get_value(tax_master_doctype, {"is_default": 1}))
 
-            self.extend("taxes", get_taxes_and_charges(tax_master_doctype, self.get("taxes_and_charges")))
+			self.append_taxes_from_master(tax_master_doctype)
 
-    def set_other_charges(self):
-        self.set("taxes", [])
-        self.set_taxes()
+	def append_taxes_from_master(self, tax_master_doctype=None):
+		if self.get("taxes_and_charges"):
+			if not tax_master_doctype:
+				tax_master_doctype = self.meta.get_field("taxes_and_charges").options
 
-    def validate_enabled_taxes_and_charges(self):
-        taxes_and_charges_doctype = self.meta.get_options("taxes_and_charges")
-        if frappe.db.get_value(taxes_and_charges_doctype, self.taxes_and_charges, "disabled"):
-            frappe.throw(_("{0} '{1}' is disabled").format(taxes_and_charges_doctype, self.taxes_and_charges))
+			self.extend("taxes", get_taxes_and_charges(tax_master_doctype, self.get("taxes_and_charges")))
 
-    def get_gl_dict(self, args, account_currency=None):
-        """this method populates the common properties of a gl entry record"""
+	def set_other_charges(self):
+		self.set("taxes", [])
+		self.set_taxes()
 
-        fiscal_years = get_fiscal_years(self.posting_date, company=self.company)
-        if len(fiscal_years) > 1:
-            frappe.throw(_("Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year").format(formatdate(self.posting_date)))
-        else:
-            fiscal_year = fiscal_years[0][0]
+	def validate_enabled_taxes_and_charges(self):
+		taxes_and_charges_doctype = self.meta.get_options("taxes_and_charges")
+		if frappe.db.get_value(taxes_and_charges_doctype, self.taxes_and_charges, "disabled"):
+			frappe.throw(_("{0} '{1}' is disabled").format(taxes_and_charges_doctype, self.taxes_and_charges))
 
-        gl_dict = frappe._dict({
-            'company': self.company,
-            'posting_date': self.posting_date,
-            'fiscal_year': fiscal_year,
-            'voucher_type': self.doctype,
-            'voucher_no': self.name,
-            'remarks': self.get("remarks"),
-            'debit': 0,
-            'credit': 0,
-            'debit_in_account_currency': 0,
-            'credit_in_account_currency': 0,
-            'is_opening': self.get("is_opening") or "No",
-            'party_type': None,
-            'party': None,
-            'project': self.get("project")
-        })
-        gl_dict.update(args)
+	def get_gl_dict(self, args, account_currency=None):
+		"""this method populates the common properties of a gl entry record"""
 
-        if not account_currency:
-            account_currency = get_account_currency(gl_dict.account)
+		fiscal_years = get_fiscal_years(self.posting_date, company=self.company)
+		if len(fiscal_years) > 1:
+			frappe.throw(_("Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year").format(formatdate(self.posting_date)))
+		else:
+			fiscal_year = fiscal_years[0][0]
 
-        if self.doctype not in ["Journal Entry", "Period Closing Voucher", "Payment Entry"]:
-            self.validate_account_currency(gl_dict.account, account_currency)
-            set_balance_in_account_currency(gl_dict, account_currency, self.get("conversion_rate"), self.company_currency)
+		gl_dict = frappe._dict({
+			'company': self.company,
+			'posting_date': self.posting_date,
+			'fiscal_year': fiscal_year,
+			'voucher_type': self.doctype,
+			'voucher_no': self.name,
+			'remarks': self.get("remarks"),
+			'debit': 0,
+			'credit': 0,
+			'debit_in_account_currency': 0,
+			'credit_in_account_currency': 0,
+			'is_opening': self.get("is_opening") or "No",
+			'party_type': None,
+			'party': None,
+			'project': self.get("project")
+		})
+		gl_dict.update(args)
 
-        return gl_dict
+		if not account_currency:
+			account_currency = get_account_currency(gl_dict.account)
 
-    def validate_account_currency(self, account, account_currency=None):
-        valid_currency = [self.company_currency]
-        if self.get("currency") and self.currency != self.company_currency:
-            valid_currency.append(self.currency)
+		if self.doctype not in ["Journal Entry", "Period Closing Voucher", "Payment Entry"]:
+			self.validate_account_currency(gl_dict.account, account_currency)
+			set_balance_in_account_currency(gl_dict, account_currency, self.get("conversion_rate"), self.company_currency)
 
-        if account_currency not in valid_currency:
-            frappe.throw(_("Account {0} is invalid. Account Currency must be {1}")
-                .format(account, _(" or ").join(valid_currency)))
+		return gl_dict
+
+	def validate_account_currency(self, account, account_currency=None):
+		valid_currency = [self.company_currency]
+		if self.get("currency") and self.currency != self.company_currency:
+			valid_currency.append(self.currency)
+
+		if account_currency not in valid_currency:
+			frappe.throw(_("Account {0} is invalid. Account Currency must be {1}")
+				.format(account, _(" or ").join(valid_currency)))
+
+	def clear_unallocated_advances(self, childtype, parentfield):
+		self.set(parentfield, self.get(parentfield, {"allocated_amount": ["not in", [0, None, ""]]}))
+
+		frappe.db.sql("""delete from `tab%s` where parentfield=%s and parent = %s
+			and allocated_amount = 0""" % (childtype, '%s', '%s'), (parentfield, self.name))
+
+	def set_advances(self):
+		"""Returns list of advances against Account, Party, Reference"""
+
+		res = self.get_advance_entries()
+
+		self.set("advances", [])
+		for d in res:
+			self.append("advances", {
+				"doctype": self.doctype + " Advance",
+				"reference_type": d.reference_type,
+				"reference_name": d.reference_name,
+				"reference_row": d.reference_row,
+				"remarks": d.remarks,
+				"advance_amount": flt(d.amount),
+				"allocated_amount": flt(d.amount) if d.against_order else 0
+			})
+
+	def get_advance_entries(self, include_unallocated=True):
+		if self.doctype == "Sales Invoice":
+			party_account = self.debit_to
+			party_type = "Customer"
+			party = self.customer
+			amount_field = "credit_in_account_currency"
+			order_field = "sales_order"
+			order_doctype = "Sales Order"
+		else:
+			party_account = self.credit_to
+			party_type = "Supplier"
+			party = self.supplier
+			amount_field = "debit_in_account_currency"
+			order_field = "purchase_order"
+			order_doctype = "Purchase Order"
+
+		order_list = list(set([d.get(order_field)
+			for d in self.get("items") if d.get(order_field)]))
 
-    def clear_unallocated_advances(self, childtype, parentfield):
-        self.set(parentfield, self.get(parentfield, {"allocated_amount": ["not in", [0, None, ""]]}))
+		journal_entries = get_advance_journal_entries(party_type, party, party_account,
+			amount_field, order_doctype, order_list, include_unallocated)
 
-        frappe.db.sql("""delete from `tab%s` where parentfield=%s and parent = %s
-            and allocated_amount = 0""" % (childtype, '%s', '%s'), (parentfield, self.name))
+		payment_entries = get_advance_payment_entries(party_type, party, party_account,
+			order_doctype, order_list, include_unallocated)
 
-    def set_advances(self):
-        """Returns list of advances against Account, Party, Reference"""
+		res = journal_entries + payment_entries
 
-        res = self.get_advance_entries()
+		return res
 
-        self.set("advances", [])
-        for d in res:
-            self.append("advances", {
-                "doctype": self.doctype + " Advance",
-                "reference_type": d.reference_type,
-                "reference_name": d.reference_name,
-                "reference_row": d.reference_row,
-                "remarks": d.remarks,
-                "advance_amount": flt(d.amount),
-                "allocated_amount": flt(d.amount) if d.against_order else 0
-            })
+	def validate_advance_entries(self):
+		order_field = "sales_order" if self.doctype == "Sales Invoice" else "purchase_order"
+		order_list = list(set([d.get(order_field)
+			for d in self.get("items") if d.get(order_field)]))
 
-    def get_advance_entries(self, include_unallocated=True):
-        if self.doctype == "Sales Invoice":
-            party_account = self.debit_to
-            party_type = "Customer"
-            party = self.customer
-            amount_field = "credit_in_account_currency"
-            order_field = "sales_order"
-            order_doctype = "Sales Order"
-        else:
-            party_account = self.credit_to
-            party_type = "Supplier"
-            party = self.supplier
-            amount_field = "debit_in_account_currency"
-            order_field = "purchase_order"
-            order_doctype = "Purchase Order"
+		if not order_list: return
 
-        order_list = list(set([d.get(order_field)
-            for d in self.get("items") if d.get(order_field)]))
+		advance_entries = self.get_advance_entries(include_unallocated=False)
 
-        journal_entries = get_advance_journal_entries(party_type, party, party_account,
-            amount_field, order_doctype, order_list, include_unallocated)
+		if advance_entries:
+			advance_entries_against_si = [d.reference_name for d in self.get("advances")]
+			for d in advance_entries:
+				if not advance_entries_against_si or d.reference_name not in advance_entries_against_si:
+					frappe.msgprint(_("Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.")
+						.format(d.reference_name, d.against_order))
 
-        payment_entries = get_advance_payment_entries(party_type, party, party_account,
-            order_doctype, order_list, include_unallocated)
+	def update_against_document_in_jv(self):
+		"""
+			Links invoice and advance voucher:
+				1. cancel advance voucher
+				2. split into multiple rows if partially adjusted, assign against voucher
+				3. submit advance voucher
+		"""
 
-        res = journal_entries + payment_entries
+		if self.doctype == "Sales Invoice":
+			party_type = "Customer"
+			party = self.customer
+			party_account = self.debit_to
+			dr_or_cr = "credit_in_account_currency"
+		else:
+			party_type = "Supplier"
+			party = self.supplier
+			party_account = self.credit_to
+			dr_or_cr = "debit_in_account_currency"
 
-        return res
+		lst = []
+		for d in self.get('advances'):
+			if flt(d.allocated_amount) > 0:
+				args = frappe._dict({
+					'voucher_type': d.reference_type,
+					'voucher_no' : d.reference_name,
+					'voucher_detail_no' : d.reference_row,
+					'against_voucher_type' : self.doctype,
+					'against_voucher'  : self.name,
+					'account' : party_account,
+					'party_type': party_type,
+					'party': party,
+					'is_advance' : 'Yes',
+					'dr_or_cr' : dr_or_cr,
+					'unadjusted_amount' : flt(d.advance_amount),
+					'allocated_amount' : flt(d.allocated_amount),
+					'exchange_rate': (self.conversion_rate
+						if self.party_account_currency != self.company_currency else 1),
+					'grand_total': (self.base_grand_total
+						if self.party_account_currency==self.company_currency else self.grand_total),
+					'outstanding_amount': self.outstanding_amount
+				})
+				lst.append(args)
 
-    def validate_advance_entries(self):
-        order_field = "sales_order" if self.doctype == "Sales Invoice" else "purchase_order"
-        order_list = list(set([d.get(order_field)
-            for d in self.get("items") if d.get(order_field)]))
+		if lst:
+			from erpnext.accounts.utils import reconcile_against_document
+			reconcile_against_document(lst)
 
-        if not order_list: return
+	def validate_multiple_billing(self, ref_dt, item_ref_dn, based_on, parentfield):
+		from erpnext.controllers.status_updater import get_tolerance_for
+		item_tolerance = {}
+		global_tolerance = None
 
-        advance_entries = self.get_advance_entries(include_unallocated=False)
+		for item in self.get("items"):
+			if item.get(item_ref_dn):
+				ref_amt = flt(frappe.db.get_value(ref_dt + " Item",
+					item.get(item_ref_dn), based_on), self.precision(based_on, item))
+				if not ref_amt:
+					frappe.msgprint(_("Warning: System will not check overbilling since amount for Item {0} in {1} is zero").format(item.item_code, ref_dt))
+				else:
+					already_billed = frappe.db.sql("""select sum(%s) from `tab%s`
+						where %s=%s and docstatus=1 and parent != %s""" %
+						(based_on, self.doctype + " Item", item_ref_dn, '%s', '%s'),
+						(item.get(item_ref_dn), self.name))[0][0]
 
-        if advance_entries:
-            advance_entries_against_si = [d.reference_name for d in self.get("advances")]
-            for d in advance_entries:
-                if not advance_entries_against_si or d.reference_name not in advance_entries_against_si:
-                    frappe.msgprint(_("Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.")
-                        .format(d.reference_name, d.against_order))
+					total_billed_amt = flt(flt(already_billed) + flt(item.get(based_on)),
+						self.precision(based_on, item))
 
-    def update_against_document_in_jv(self):
-        """
-            Links invoice and advance voucher:
-                1. cancel advance voucher
-                2. split into multiple rows if partially adjusted, assign against voucher
-                3. submit advance voucher
-        """
+					tolerance, item_tolerance, global_tolerance = get_tolerance_for(item.item_code,
+						item_tolerance, global_tolerance)
 
-        if self.doctype == "Sales Invoice":
-            party_type = "Customer"
-            party = self.customer
-            party_account = self.debit_to
-            dr_or_cr = "credit_in_account_currency"
-        else:
-            party_type = "Supplier"
-            party = self.supplier
-            party_account = self.credit_to
-            dr_or_cr = "debit_in_account_currency"
+					max_allowed_amt = flt(ref_amt * (100 + tolerance) / 100)
 
-        lst = []
-        for d in self.get('advances'):
-            if flt(d.allocated_amount) > 0:
-                args = frappe._dict({
-                    'voucher_type': d.reference_type,
-                    'voucher_no' : d.reference_name,
-                    'voucher_detail_no' : d.reference_row,
-                    'against_voucher_type' : self.doctype,
-                    'against_voucher'  : self.name,
-                    'account' : party_account,
-                    'party_type': party_type,
-                    'party': party,
-                    'is_advance' : 'Yes',
-                    'dr_or_cr' : dr_or_cr,
-                    'unadjusted_amount' : flt(d.advance_amount),
-                    'allocated_amount' : flt(d.allocated_amount),
-                    'exchange_rate': (self.conversion_rate
-                        if self.party_account_currency != self.company_currency else 1),
-                    'grand_total': (self.base_grand_total
-                        if self.party_account_currency==self.company_currency else self.grand_total),
-                    'outstanding_amount': self.outstanding_amount
-                })
-                lst.append(args)
+					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))
 
-        if lst:
-            from erpnext.accounts.utils import reconcile_against_document
-            reconcile_against_document(lst)
+	def get_company_default(self, fieldname):
+		from erpnext.accounts.utils import get_company_default
+		return get_company_default(self.company, fieldname)
 
-    def validate_multiple_billing(self, ref_dt, item_ref_dn, based_on, parentfield):
-        from erpnext.controllers.status_updater import get_tolerance_for
-        item_tolerance = {}
-        global_tolerance = None
+	def get_stock_items(self):
+		stock_items = []
+		item_codes = list(set(item.item_code for item in self.get("items")))
+		if item_codes:
+			stock_items = [r[0] for r in frappe.db.sql("""select name
+				from `tabItem` where name in (%s) and is_stock_item=1""" % \
+				(", ".join((["%s"]*len(item_codes))),), item_codes)]
 
-        for item in self.get("items"):
-            if item.get(item_ref_dn):
-                ref_amt = flt(frappe.db.get_value(ref_dt + " Item",
-                    item.get(item_ref_dn), based_on), self.precision(based_on, item))
-                if not ref_amt:
-                    frappe.msgprint(_("Warning: System will not check overbilling since amount for Item {0} in {1} is zero").format(item.item_code, ref_dt))
-                else:
-                    already_billed = frappe.db.sql("""select sum(%s) from `tab%s`
-                        where %s=%s and docstatus=1 and parent != %s""" %
-                        (based_on, self.doctype + " Item", item_ref_dn, '%s', '%s'),
-                        (item.get(item_ref_dn), self.name))[0][0]
+		return stock_items
 
-                    total_billed_amt = flt(flt(already_billed) + flt(item.get(based_on)),
-                        self.precision(based_on, item))
+	def set_total_advance_paid(self):
+		if self.doctype == "Sales Order":
+			dr_or_cr = "credit_in_account_currency"
+			party = self.customer
+		else:
+			dr_or_cr = "debit_in_account_currency"
+			party = self.supplier
 
-                    tolerance, item_tolerance, global_tolerance = get_tolerance_for(item.item_code,
-                        item_tolerance, global_tolerance)
+		advance = frappe.db.sql("""
+			select
+				account_currency, sum({dr_or_cr}) as amount
+			from
+				`tabGL Entry`
+			where
+				against_voucher_type = %s and against_voucher = %s and party=%s
+				and docstatus = 1
+		""".format(dr_or_cr=dr_or_cr), (self.doctype, self.name, party), as_dict=1)
 
-                    max_allowed_amt = flt(ref_amt * (100 + tolerance) / 100)
+		if advance:
+			advance = advance[0]
+			advance_paid = flt(advance.amount, self.precision("advance_paid"))
+			formatted_advance_paid = fmt_money(advance_paid, precision=self.precision("advance_paid"),
+				currency=advance.account_currency)
 
-                    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.db.set_value(self.doctype, self.name, "party_account_currency",
+				advance.account_currency)
 
-    def get_company_default(self, fieldname):
-        from erpnext.accounts.utils import get_company_default
-        return get_company_default(self.company, fieldname)
+			if advance.account_currency == self.currency:
+				order_total = self.grand_total
+				formatted_order_total = fmt_money(order_total, precision=self.precision("grand_total"),
+					currency=advance.account_currency)
+			else:
+				order_total = self.base_grand_total
+				formatted_order_total = fmt_money(order_total, precision=self.precision("base_grand_total"),
+					currency=advance.account_currency)
 
-    def get_stock_items(self):
-        stock_items = []
-        item_codes = list(set(item.item_code for item in self.get("items")))
-        if item_codes:
-            stock_items = [r[0] for r in frappe.db.sql("""select name
-                from `tabItem` where name in (%s) and is_stock_item=1""" % \
-                (", ".join((["%s"]*len(item_codes))),), item_codes)]
+			if self.currency == self.company_currency and advance_paid > order_total:
+				frappe.throw(_("Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2})")
+					.format(formatted_advance_paid, self.name, formatted_order_total))
 
-        return stock_items
+			frappe.db.set_value(self.doctype, self.name, "advance_paid", advance_paid)
 
-    def set_total_advance_paid(self):
-        if self.doctype == "Sales Order":
-            dr_or_cr = "credit_in_account_currency"
-            party = self.customer
-        else:
-            dr_or_cr = "debit_in_account_currency"
-            party = self.supplier
+	@property
+	def company_abbr(self):
+		if not hasattr(self, "_abbr"):
+			self._abbr = frappe.db.get_value("Company", self.company, "abbr")
 
-        advance = frappe.db.sql("""
-            select
-                account_currency, sum({dr_or_cr}) as amount
-            from
-                `tabGL Entry`
-            where
-                against_voucher_type = %s and against_voucher = %s and party=%s
-                and docstatus = 1
-        """.format(dr_or_cr=dr_or_cr), (self.doctype, self.name, party), as_dict=1)
+		return self._abbr
 
-        if advance:
-            advance = advance[0]
-            advance_paid = flt(advance.amount, self.precision("advance_paid"))
-            formatted_advance_paid = fmt_money(advance_paid, precision=self.precision("advance_paid"),
-                currency=advance.account_currency)
+	def validate_party(self):
+		party_type, party = self.get_party()
+		validate_party_frozen_disabled(party_type, party)
 
-            frappe.db.set_value(self.doctype, self.name, "party_account_currency",
-                advance.account_currency)
+	def get_party(self):
+		party_type = None
+		if self.doctype in ("Opportunity", "Quotation", "Sales Order", "Delivery Note", "Sales Invoice"):
+			party_type = 'Customer'
 
-            if advance.account_currency == self.currency:
-                order_total = self.grand_total
-                formatted_order_total = fmt_money(order_total, precision=self.precision("grand_total"),
-                    currency=advance.account_currency)
-            else:
-                order_total = self.base_grand_total
-                formatted_order_total = fmt_money(order_total, precision=self.precision("base_grand_total"),
-                    currency=advance.account_currency)
+		elif self.doctype in ("Supplier Quotation", "Purchase Order", "Purchase Receipt", "Purchase Invoice"):
+			party_type = 'Supplier'
 
-            if self.currency == self.company_currency and advance_paid > order_total:
-                frappe.throw(_("Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2})")
-                    .format(formatted_advance_paid, self.name, formatted_order_total))
+		elif self.meta.get_field("customer"):
+			party_type = "Customer"
 
-            frappe.db.set_value(self.doctype, self.name, "advance_paid", advance_paid)
+		elif self.meta.get_field("supplier"):
+			party_type = "Supplier"
 
-    @property
-    def company_abbr(self):
-        if not hasattr(self, "_abbr"):
-            self._abbr = frappe.db.get_value("Company", self.company, "abbr")
+		party = self.get(party_type.lower()) if party_type else None
 
-        return self._abbr
+		return party_type, party
 
-    def validate_party(self):
-        party_type, party = self.get_party()
-        validate_party_frozen_disabled(party_type, party)
+	def validate_currency(self):
+		if self.get("currency"):
+			party_type, party = self.get_party()
+			if party_type and party:
+				party_account_currency = get_party_account_currency(party_type, party, self.company)
 
-    def get_party(self):
-        party_type = None
-        if self.doctype in ("Opportunity", "Quotation", "Sales Order", "Delivery Note", "Sales Invoice"):
-            party_type = 'Customer'
+				if (party_account_currency
+					and party_account_currency != self.company_currency
+					and self.currency != party_account_currency):
 
-        elif self.doctype in ("Supplier Quotation", "Purchase Order", "Purchase Receipt", "Purchase Invoice"):
-            party_type = 'Supplier'
+					frappe.throw(_("Accounting Entry for {0}: {1} can only be made in currency: {2}")
+						.format(party_type, party, party_account_currency), InvalidCurrency)
 
-        elif self.meta.get_field("customer"):
-            party_type = "Customer"
+				# Note: not validating with gle account because we don't have the account
+				# at quotation / sales order level and we shouldn't stop someone
+				# from creating a sales invoice if sales order is already created
 
-        elif self.meta.get_field("supplier"):
-            party_type = "Supplier"
+	def validate_fixed_asset(self):
+		for d in self.get("items"):
+			if d.is_fixed_asset:
+				if d.qty > 1:
+					frappe.throw(_("Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.").format(d.idx))
 
-        party = self.get(party_type.lower()) if party_type else None
+				if d.meta.get_field("asset"):
+					if not d.asset:
+						frappe.throw(_("Row #{0}: Asset is mandatory for fixed asset purchase/sale")
+							.format(d.idx))
+					else:
+						asset = frappe.get_doc("Asset", d.asset)
 
-        return party_type, party
+						if asset.company != self.company:
+							frappe.throw(_("Row #{0}: Asset {1} does not belong to company {2}")
+								.format(d.idx, d.asset, self.company))
 
-    def validate_currency(self):
-        if self.get("currency"):
-            party_type, party = self.get_party()
-            if party_type and party:
-                party_account_currency = get_party_account_currency(party_type, party, self.company)
+						elif asset.item_code != d.item_code:
+							frappe.throw(_("Row #{0}: Asset {1} does not linked to Item {2}")
+								.format(d.idx, d.asset, d.item_code))
 
-                if (party_account_currency
-                    and party_account_currency != self.company_currency
-                    and self.currency != party_account_currency):
+						elif asset.docstatus != 1:
+							frappe.throw(_("Row #{0}: Asset {1} must be submitted").format(d.idx, d.asset))
 
-                    frappe.throw(_("Accounting Entry for {0}: {1} can only be made in currency: {2}")
-                        .format(party_type, party, party_account_currency), InvalidCurrency)
+						elif self.doctype == "Purchase Invoice":
+							if asset.status != "Submitted":
+								frappe.throw(_("Row #{0}: Asset {1} is already {2}")
+									.format(d.idx, d.asset, asset.status))
+							elif getdate(asset.purchase_date) != getdate(self.posting_date):
+								frappe.throw(_("Row #{0}: Posting Date must be same as purchase date {1} of asset {2}").format(d.idx, asset.purchase_date, d.asset))
+							elif asset.is_existing_asset:
+								frappe.throw(_("Row #{0}: Purchase Invoice cannot be made against an existing asset {1}").format(d.idx, d.asset))
 
-                # Note: not validating with gle account because we don't have the account
-                # at quotation / sales order level and we shouldn't stop someone
-                # from creating a sales invoice if sales order is already created
+						elif self.docstatus=="Sales Invoice" and self.docstatus == 1:
+							if self.update_stock:
+								frappe.throw(_("'Update Stock' cannot be checked for fixed asset sale"))
 
-    def validate_fixed_asset(self):
-        for d in self.get("items"):
-            if d.is_fixed_asset:
-                if d.qty > 1:
-                    frappe.throw(_("Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.").format(d.idx))
+							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:
+			consider_for_total_advance = True
+			if adv.reference_name == linked_doc_name:
+				frappe.db.sql("""delete from `tab{0} Advance`
+					where name = %s""".format(self.doctype), adv.name)
+				consider_for_total_advance = False
 
-                if d.meta.get_field("asset"):
-                    if not d.asset:
-                        frappe.throw(_("Row #{0}: Asset is mandatory for fixed asset purchase/sale")
-                            .format(d.idx))
-                    else:
-                        asset = frappe.get_doc("Asset", d.asset)
+			if consider_for_total_advance:
+				total_allocated_amount += flt(adv.allocated_amount, adv.precision("allocated_amount"))
 
-                        if asset.company != self.company:
-                            frappe.throw(_("Row #{0}: Asset {1} does not belong to company {2}")
-                                .format(d.idx, d.asset, self.company))
+		frappe.db.set_value(self.doctype, self.name, "total_advance", 
+			total_allocated_amount, update_modified=False)
 
-                        elif asset.item_code != d.item_code:
-                            frappe.throw(_("Row #{0}: Asset {1} does not linked to Item {2}")
-                                .format(d.idx, d.asset, d.item_code))
+	def group_similar_items(self):
+		group_item_qty = {}
+		group_item_amount = {}
 
-                        elif asset.docstatus != 1:
-                            frappe.throw(_("Row #{0}: Asset {1} must be submitted").format(d.idx, d.asset))
+		for item in self.items:
+			group_item_qty[item.item_code] = group_item_qty.get(item.item_code, 0) + item.qty
+			group_item_amount[item.item_code] = group_item_amount.get(item.item_code, 0) + item.amount
 
-                        elif self.doctype == "Purchase Invoice":
-                            if asset.status != "Submitted":
-                                frappe.throw(_("Row #{0}: Asset {1} is already {2}")
-                                    .format(d.idx, d.asset, asset.status))
-                            elif getdate(asset.purchase_date) != getdate(self.posting_date):
-                                frappe.throw(_("Row #{0}: Posting Date must be same as purchase date {1} of asset {2}").format(d.idx, asset.purchase_date, d.asset))
-                            elif asset.is_existing_asset:
-                                frappe.throw(_("Row #{0}: Purchase Invoice cannot be made against an existing asset {1}").format(d.idx, d.asset))
+		duplicate_list = []
 
-                        elif self.docstatus=="Sales Invoice" and self.docstatus == 1:
-                            if self.update_stock:
-                                frappe.throw(_("'Update Stock' cannot be checked for fixed asset sale"))
+		for item in self.items:
+			if item.item_code in group_item_qty:
+				item.qty = group_item_qty[item.item_code]
+				item.amount = group_item_amount[item.item_code]
+				del group_item_qty[item.item_code]
+			else:
+				duplicate_list.append(item)
 
-                            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))
+		for item in duplicate_list:
+			self.remove(item)
 
 @frappe.whitelist()
 def get_tax_rate(account_head):
@@ -691,40 +730,49 @@
     return list(journal_entries)
 
 def get_advance_payment_entries(party_type, party, party_account,
-        order_doctype, order_list=None, include_unallocated=True, against_all_orders=False):
-    party_account_field = "paid_from" if party_type == "Customer" else "paid_to"
-    payment_type = "Receive" if party_type == "Customer" else "Pay"
-    payment_entries_against_order, unallocated_payment_entries = [], []
+		order_doctype, order_list=None, include_unallocated=True, against_all_orders=False):
+	party_account_field = "paid_from" if party_type == "Customer" else "paid_to"
+	payment_type = "Receive" if party_type == "Customer" else "Pay"
+	payment_entries_against_order, unallocated_payment_entries = [], []
 
-    if order_list or against_all_orders:
-        if order_list:
-            reference_condition = " and t2.reference_name in ({0})"\
-                .format(', '.join(['%s'] * len(order_list)))
-        else:
-            reference_condition = ""
-            order_list = []
+	if order_list or against_all_orders:
+		if order_list:
+			reference_condition = " and t2.reference_name in ({0})"\
+				.format(', '.join(['%s'] * len(order_list)))
+		else:
+			reference_condition = ""
+			order_list = []
 
-        payment_entries_against_order = frappe.db.sql("""
-            select
-                "Payment Entry" as reference_type, t1.name as reference_name,
-                t1.remarks, t2.allocated_amount as amount, t2.name as reference_row,
-                t2.reference_name as against_order, t1.posting_date
-            from `tabPayment Entry` t1, `tabPayment Entry Reference` t2
-            where
-                t1.name = t2.parent and t1.{0} = %s and t1.payment_type = %s
-                and t1.party_type = %s and t1.party = %s and t1.docstatus = 1
-                and t2.reference_doctype = %s {1}
-        """.format(party_account_field, reference_condition),
-        [party_account, payment_type, party_type, party, order_doctype] + order_list, as_dict=1)
+		payment_entries_against_order = frappe.db.sql("""
+			select
+				"Payment Entry" as reference_type, t1.name as reference_name,
+				t1.remarks, t2.allocated_amount as amount, t2.name as reference_row,
+				t2.reference_name as against_order, t1.posting_date
+			from `tabPayment Entry` t1, `tabPayment Entry Reference` t2
+			where
+				t1.name = t2.parent and t1.{0} = %s and t1.payment_type = %s
+				and t1.party_type = %s and t1.party = %s and t1.docstatus = 1
+				and t2.reference_doctype = %s {1}
+		""".format(party_account_field, reference_condition),
+		[party_account, payment_type, party_type, party, order_doctype] + order_list, as_dict=1)
 
-    if include_unallocated:
-        unallocated_payment_entries = frappe.db.sql("""
-                select "Payment Entry" as reference_type, name as reference_name,
-                remarks, unallocated_amount as amount
-                from `tabPayment Entry`
-                where
-                    {0} = %s and party_type = %s and party = %s and payment_type = %s
-                    and docstatus = 1 and unallocated_amount > 0
-            """.format(party_account_field), (party_account, party_type, party, payment_type), as_dict=1)
+	if include_unallocated:
+		unallocated_payment_entries = frappe.db.sql("""
+				select "Payment Entry" as reference_type, name as reference_name,
+				remarks, unallocated_amount as amount
+				from `tabPayment Entry`
+				where
+					{0} = %s and party_type = %s and party = %s and payment_type = %s
+					and docstatus = 1 and unallocated_amount > 0
+			""".format(party_account_field), (party_account, party_type, party, payment_type), as_dict=1)
 
-    return list(payment_entries_against_order) + list(unallocated_payment_entries)
\ No newline at end of file
+	return list(payment_entries_against_order) + list(unallocated_payment_entries)
+
+def update_invoice_status():
+	# Daily update the status of the invoices
+
+	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' 
+		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 f7181d7..865514b 100644
--- a/erpnext/controllers/buying_controller.py
+++ b/erpnext/controllers/buying_controller.py
@@ -62,7 +62,7 @@
 		if getattr(self, "supplier", None):
 			self.update_if_missing(get_party_details(self.supplier, party_type="Supplier", ignore_permissions=self.flags.ignore_permissions))
 
-		self.set_missing_item_details()
+		self.set_missing_item_details(for_validate)
 
 	def set_supplier_from_item_default(self):
 		if self.meta.get_field("supplier") and not self.supplier:
diff --git a/erpnext/controllers/queries.py b/erpnext/controllers/queries.py
index 6da496b..98390ff 100644
--- a/erpnext/controllers/queries.py
+++ b/erpnext/controllers/queries.py
@@ -32,12 +32,13 @@
 
  # searches for active employees
 def employee_query(doctype, txt, searchfield, start, page_len, filters):
+	conditions = []
 	return frappe.db.sql("""select name, employee_name from `tabEmployee`
 		where status = 'Active'
 			and docstatus < 2
 			and ({key} like %(txt)s
 				or employee_name like %(txt)s)
-			{mcond}
+			{fcond} {mcond}
 		order by
 			if(locate(%(_txt)s, name), locate(%(_txt)s, name), 99999),
 			if(locate(%(_txt)s, employee_name), locate(%(_txt)s, employee_name), 99999),
@@ -45,6 +46,7 @@
 			name, employee_name
 		limit %(start)s, %(page_len)s""".format(**{
 			'key': searchfield,
+			'fcond': get_filters_cond(doctype, filters, conditions),
 			'mcond': get_match_cond(doctype)
 		}), {
 			'txt': "%%%s%%" % txt,
diff --git a/erpnext/controllers/sales_and_purchase_return.py b/erpnext/controllers/sales_and_purchase_return.py
index ae03a35..3e22681 100644
--- a/erpnext/controllers/sales_and_purchase_return.py
+++ b/erpnext/controllers/sales_and_purchase_return.py
@@ -207,6 +207,7 @@
 			target_doc.rejected_qty = -1* source_doc.rejected_qty
 			target_doc.qty = -1* source_doc.qty
 			target_doc.purchase_order = source_doc.purchase_order
+			target_doc.purchase_order_item = source_doc.purchase_order_item
 			target_doc.rejected_warehouse = source_doc.rejected_warehouse
 		elif doctype == "Purchase Invoice":
 			target_doc.received_qty = -1* source_doc.received_qty
diff --git a/erpnext/controllers/selling_controller.py b/erpnext/controllers/selling_controller.py
index b9b94f5..60cd68c 100644
--- a/erpnext/controllers/selling_controller.py
+++ b/erpnext/controllers/selling_controller.py
@@ -8,6 +8,7 @@
 from frappe import _, throw
 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.controllers.stock_controller import StockController
 
@@ -23,6 +24,7 @@
 			self.grand_total)
 
 	def onload(self):
+		super(SellingController, self).onload()
 		if self.doctype in ("Sales Order", "Delivery Note", "Sales Invoice"):
 			for item in self.get("items"):
 				item.update(get_bin_details(item.item_code,
@@ -31,6 +33,7 @@
 	def validate(self):
 		super(SellingController, self).validate()
 		self.validate_max_discount()
+		self.validate_selling_price()
 		check_active_sales_items(self)
 
 	def set_missing_values(self, for_validate=False):
@@ -160,6 +163,30 @@
 			if discount and flt(d.discount_percentage) > discount:
 				frappe.throw(_("Maxiumm discount for Item {0} is {1}%").format(d.item_code, discount))
 
+	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}""")
+				.format(item_name, ref_rate_field, rate))
+
+		if not frappe.db.get_single_value("Selling Settings", "validate_selling_price"):
+			return
+
+		for it in self.get("items"):
+			last_purchase_rate, is_stock_item = frappe.db.get_value("Item", it.item_code, ["last_purchase_rate", "is_stock_item"])
+
+			if flt(it.base_rate) < flt(last_purchase_rate):
+				throw_message(it.item_name, last_purchase_rate, "last purchase rate")
+
+			last_valuation_rate = frappe.db.sql("""
+				SELECT valuation_rate FROM `tabStock Ledger Entry` WHERE item_code = %s
+				AND warehouse = %s AND valuation_rate > 0
+				ORDER BY posting_date DESC, posting_time DESC, name DESC LIMIT 1
+				""", (it.item_code, it.warehouse))
+
+			if is_stock_item and flt(it.base_rate) < flt(last_valuation_rate):
+				throw_message(it.name, last_valuation_rate, "valuation rate")
+
+
 	def get_item_list(self):
 		il = []
 		for d in self.get("items"):
@@ -229,7 +256,7 @@
 				status = frappe.db.get_value("Sales Order", d.get(ref_fieldname), "status")
 				if status == "Closed":
 					frappe.throw(_("Sales Order {0} is {1}").format(d.get(ref_fieldname), status))
-					
+
 	def update_reserved_qty(self):
 		so_map = {}
 		for d in self.get("items"):
@@ -309,7 +336,7 @@
 			item = frappe.db.sql("""select docstatus,
 				income_account from tabItem where name = %s""",
 				d.item_code, as_dict=True)[0]
-                
+
 			if getattr(d, "income_account", None) and not item.income_account:
 				frappe.db.set_value("Item", d.item_code, "income_account",
 					d.income_account)
diff --git a/erpnext/controllers/status_updater.py b/erpnext/controllers/status_updater.py
index 7be6acd..da09e26 100644
--- a/erpnext/controllers/status_updater.py
+++ b/erpnext/controllers/status_updater.py
@@ -3,7 +3,7 @@
 
 from __future__ import unicode_literals
 import frappe
-from frappe.utils import flt, comma_or
+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
@@ -41,6 +41,26 @@
 		["Cancelled", "eval:self.docstatus==2"],
 		["Closed", "eval:self.status=='Closed'"],
 	],
+	"Sales Invoice": [
+		["Draft", None],
+		["Submitted", "eval:self.docstatus==1"],
+		["Return", "eval:self.is_return==1 and self.docstatus==1"],
+		["Credit Note Issued", "eval:self.outstanding_amount < 0 and self.docstatus==1"],
+		["Paid", "eval:self.outstanding_amount==0 and self.docstatus==1 and self.is_return==0"],
+		["Unpaid", "eval:self.outstanding_amount > 0 and getdate(self.due_date) >= getdate(nowdate()) and self.docstatus==1"],
+		["Overdue", "eval:self.outstanding_amount > 0 and getdate(self.due_date) < getdate(nowdate()) and self.docstatus==1"],
+		["Cancelled", "eval:self.docstatus==2"],
+	],
+	"Purchase Invoice": [
+		["Draft", None],
+		["Submitted", "eval:self.docstatus==1"],
+		["Return", "eval:self.is_return==1 and self.docstatus==1"],
+		["Debit Note Issued", "eval:self.outstanding_amount < 0 and self.docstatus==1"],
+		["Paid", "eval:self.outstanding_amount==0 and self.docstatus==1 and self.is_return==0"],
+		["Unpaid", "eval:self.outstanding_amount > 0 and getdate(self.due_date) >= getdate(nowdate()) and self.docstatus==1"],
+		["Overdue", "eval:self.outstanding_amount > 0 and getdate(self.due_date) < getdate(nowdate()) and self.docstatus==1"],
+		["Cancelled", "eval:self.docstatus==2"],
+	],
 	"Purchase Order": [
 		["Draft", None],
 		["To Receive and Bill", "eval:self.per_received < 100 and self.per_billed < 100 and self.docstatus == 1"],
@@ -251,19 +271,19 @@
 					%(update_modified)s
 				where name='%(name)s'""" % args)
 
-		# update field
-		if args.get('status_field'):
-			frappe.db.sql("""update `tab%(target_parent_dt)s`
-				set %(status_field)s = if(%(target_parent_field)s<0.001,
-					'Not %(keyword)s', if(%(target_parent_field)s>=99.99,
-					'Fully %(keyword)s', 'Partly %(keyword)s'))
-				where name='%(name)s'""" % args)
+			# update field
+			if args.get('status_field'):
+				frappe.db.sql("""update `tab%(target_parent_dt)s`
+					set %(status_field)s = if(%(target_parent_field)s<0.001,
+						'Not %(keyword)s', if(%(target_parent_field)s>=99.99,
+						'Fully %(keyword)s', 'Partly %(keyword)s'))
+					where name='%(name)s'""" % args)
 
-		if update_modified:
-			target = frappe.get_doc(args["target_parent_dt"], args["name"])
-			target.set_status(update=True)
-			target.notify_update()
-			notify_status(target)
+			if update_modified:
+				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'] = ''
@@ -301,12 +321,7 @@
 			ref_doc = frappe.get_doc(ref_dt, ref_dn)
 
 			ref_doc.db_set("per_billed", per_billed)
-
-			if frappe.get_meta(ref_dt).get_field("billing_status"):
-				if per_billed < 0.001: billing_status = "Not Billed"
-				elif per_billed >= 99.99: billing_status = "Fully Billed"
-				else: billing_status = "Partly Billed"
-				ref_doc.db_set('billing_status', billing_status)
+			ref_doc.set_status(update=True)
 
 def get_tolerance_for(item_code, item_tolerance={}, global_tolerance=None):
 	"""
diff --git a/erpnext/controllers/stock_controller.py b/erpnext/controllers/stock_controller.py
index 3f25e02..0c85aa1 100644
--- a/erpnext/controllers/stock_controller.py
+++ b/erpnext/controllers/stock_controller.py
@@ -11,6 +11,10 @@
 from erpnext.controllers.accounts_controller import AccountsController
 
 class StockController(AccountsController):
+	def validate(self):
+		super(StockController, self).validate()
+		self.validate_inspection()
+	
 	def make_gl_entries(self, repost_future_gle=True):
 		if self.docstatus == 2:
 			delete_gl_entries(voucher_type=self.doctype, voucher_no=self.name)
@@ -69,6 +73,10 @@
 						warehouse_with_no_account.append(sle.warehouse)
 
 		if warehouse_with_no_account:
+			for wh in warehouse_with_no_account:
+				if frappe.db.get_value("Warehouse", wh, "company"):
+					frappe.throw(_("Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.").format(wh))
+					
 			msgprint(_("No accounting entries for the following warehouses") + ": \n" +
 				"\n".join(warehouse_with_no_account))
 
@@ -250,6 +258,28 @@
 			"name": self.name,
 		}, update_modified)
 
+	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) 
+				and not d.quality_inspection):
+				
+				frappe.msgprint(_("Quality Inspection required for Item {0}").format(d.item_code))
+				if self.docstatus==1:
+					raise frappe.ValidationError
+
 def update_gl_entries_after(posting_date, posting_time, for_warehouses=None, for_items=None,
 		warehouse_account=None):
 	def _delete_gl_entries(voucher_type, voucher_no):
@@ -276,12 +306,18 @@
 def compare_existing_and_expected_gle(existing_gle, expected_gle):
 	matched = True
 	for entry in expected_gle:
+		account_existed = False
 		for e in existing_gle:
-			if entry.account==e.account and entry.against_account==e.against_account \
-				and (not entry.cost_center or not e.cost_center or entry.cost_center==e.cost_center) \
-				and (entry.debit != e.debit or entry.credit != e.credit):
-					matched = False
-					break
+			if entry.account == e.account:
+				account_existed = True
+			if entry.account == e.account and entry.against_account == e.against_account \
+					and (not entry.cost_center or not e.cost_center or entry.cost_center == e.cost_center) \
+					and (entry.debit != e.debit or entry.credit != e.credit):
+				matched = False
+				break
+		if not account_existed:
+			matched = False
+			break
 	return matched
 
 def get_future_stock_vouchers(posting_date, posting_time, for_warehouses=None, for_items=None):
diff --git a/erpnext/controllers/taxes_and_totals.py b/erpnext/controllers/taxes_and_totals.py
index d8b5e2e..2369143 100644
--- a/erpnext/controllers/taxes_and_totals.py
+++ b/erpnext/controllers/taxes_and_totals.py
@@ -338,7 +338,7 @@
 			tax.item_wise_tax_detail = json.dumps(tax.item_wise_tax_detail, separators=(',', ':'))
 
 	def set_discount_amount(self):
-		if not self.doc.discount_amount and self.doc.additional_discount_percentage:
+		if self.doc.additional_discount_percentage:
 			self.doc.discount_amount = flt(flt(self.doc.get(scrub(self.doc.apply_discount_on)))
 				* self.doc.additional_discount_percentage / 100, self.doc.precision("discount_amount"))
 
diff --git a/erpnext/controllers/trends.py b/erpnext/controllers/trends.py
index 080d749..d991c15 100644
--- a/erpnext/controllers/trends.py
+++ b/erpnext/controllers/trends.py
@@ -49,10 +49,10 @@
 		posting_date = 't1.posting_date'
 
 	if conditions["based_on_select"] in ["t1.project,", "t2.project,"]:
-		cond = 'and '+ conditions["based_on_select"][:-1] +' IS Not NULL'
+		cond = ' and '+ conditions["based_on_select"][:-1] +' IS Not NULL'
 	
 	if conditions.get('trans') in ['Sales Order', 'Purchase Order']:
-		cond += "and t1.status != 'Closed'"
+		cond += " and t1.status != 'Closed'"
 
 	year_start_date, year_end_date = frappe.db.get_value("Fiscal Year",
 		filters.get('fiscal_year'), ["year_start_date", "year_end_date"])
diff --git a/erpnext/controllers/website_list_for_contact.py b/erpnext/controllers/website_list_for_contact.py
index 75c6e08..1abb7e7 100644
--- a/erpnext/controllers/website_list_for_contact.py
+++ b/erpnext/controllers/website_list_for_contact.py
@@ -25,7 +25,10 @@
 
 	if not filters: filters = []
 
-	filters.append((doctype, "docstatus", "=", 1))
+	if doctype == 'Supplier Quotation':
+		filters.append((doctype, "docstatus", "<", 2))
+	else:
+		filters.append((doctype, "docstatus", "=", 1))
 
 	if user != "Guest" and is_website_user():
 		parties_doctype = 'Request for Quotation Supplier' if doctype == 'Request for Quotation' else doctype
@@ -112,7 +115,8 @@
 		return frappe.get_all(doctype, filters=[(doctype, "customer", "in", customers),
 			(doctype, "name", "=", doc.name)]) and True or False
 	elif suppliers:
-		return frappe.get_all(doctype, filters=[(doctype, "suppliers", "in", suppliers),
+		fieldname = 'suppliers' if doctype == 'Request for Quotation' else 'supplier'
+		return frappe.get_all(doctype, filters=[(doctype, fieldname, "in", suppliers),
 			(doctype, "name", "=", doc.name)]) and True or False
 	else:
 		return False
diff --git a/erpnext/crm/doctype/lead/lead.json b/erpnext/crm/doctype/lead/lead.json
index 214379a..d4a02e6 100644
--- a/erpnext/crm/doctype/lead/lead.json
+++ b/erpnext/crm/doctype/lead/lead.json
@@ -23,14 +23,16 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "icon-user", 
+   "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, 
@@ -49,6 +51,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Series", 
    "length": 0, 
    "no_copy": 1, 
@@ -59,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,6 +81,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Person Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -86,6 +91,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, 
@@ -104,6 +110,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Organization Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -113,6 +120,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, 
@@ -131,6 +139,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Email Id", 
    "length": 0, 
    "no_copy": 0, 
@@ -141,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": 1, 
@@ -159,12 +169,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, 
@@ -185,6 +197,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Status", 
    "length": 0, 
    "no_copy": 1, 
@@ -195,6 +208,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, 
@@ -213,6 +227,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Source", 
    "length": 0, 
    "no_copy": 0, 
@@ -223,6 +238,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,6 +258,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "From Customer", 
    "length": 0, 
    "no_copy": 1, 
@@ -252,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, 
@@ -272,6 +290,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Campaign Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -282,6 +301,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, 
@@ -300,6 +320,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Image", 
    "length": 0, 
    "no_copy": 0, 
@@ -308,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, 
@@ -326,6 +348,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -333,6 +356,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, 
@@ -352,6 +376,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Lead Owner", 
    "length": 0, 
    "no_copy": 0, 
@@ -362,6 +387,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, 
@@ -380,6 +406,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -387,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, 
@@ -405,6 +433,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Next Contact By", 
    "length": 0, 
    "no_copy": 0, 
@@ -415,6 +444,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, 
@@ -435,6 +465,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Next Contact Date", 
    "length": 0, 
    "no_copy": 1, 
@@ -444,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, 
@@ -463,15 +495,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Address & Contact", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
-   "options": "icon-map-marker", 
+   "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, 
@@ -491,6 +525,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Address Desc", 
    "length": 0, 
    "no_copy": 0, 
@@ -498,6 +533,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, 
@@ -516,6 +552,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Address HTML", 
    "length": 0, 
    "no_copy": 0, 
@@ -523,6 +560,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, 
@@ -541,12 +579,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, 
@@ -565,6 +605,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Phone", 
    "length": 0, 
    "no_copy": 0, 
@@ -574,6 +615,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, 
@@ -592,6 +634,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Mobile No.", 
    "length": 0, 
    "no_copy": 0, 
@@ -601,6 +644,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, 
@@ -619,6 +663,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Fax", 
    "length": 0, 
    "no_copy": 0, 
@@ -628,6 +673,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, 
@@ -646,6 +692,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Website", 
    "length": 0, 
    "no_copy": 0, 
@@ -655,6 +702,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, 
@@ -674,6 +722,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Territory", 
    "length": 0, 
    "no_copy": 0, 
@@ -684,6 +733,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, 
@@ -702,15 +752,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "More Information", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-file-text", 
+   "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, 
@@ -729,6 +781,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Lead Type", 
    "length": 0, 
    "no_copy": 0, 
@@ -739,6 +792,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, 
@@ -757,6 +811,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Market Segment", 
    "length": 0, 
    "no_copy": 0, 
@@ -767,6 +822,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, 
@@ -785,6 +841,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Industry", 
    "length": 0, 
    "no_copy": 0, 
@@ -795,6 +852,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, 
@@ -813,6 +871,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Request Type", 
    "length": 0, 
    "no_copy": 0, 
@@ -823,6 +882,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, 
@@ -841,6 +901,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
@@ -848,6 +909,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, 
@@ -867,6 +929,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -877,6 +940,7 @@
    "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, 
@@ -895,6 +959,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Unsubscribed", 
    "length": 0, 
    "no_copy": 0, 
@@ -902,6 +967,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, 
@@ -920,6 +986,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Blog Subscriber", 
    "length": 0, 
    "no_copy": 0, 
@@ -927,6 +994,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, 
@@ -936,7 +1004,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-user", 
+ "icon": "fa fa-user", 
  "idx": 5, 
  "image_field": "image", 
  "image_view": 0, 
@@ -946,7 +1014,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-09-16 06:17:22.790727", 
+ "modified": "2016-11-07 05:16:25.037080", 
  "modified_by": "Administrator", 
  "module": "CRM", 
  "name": "Lead", 
@@ -962,6 +1030,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 1, 
    "print": 0, 
    "read": 1, 
@@ -982,6 +1051,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1002,6 +1072,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1022,6 +1093,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1042,6 +1114,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 1, 
    "print": 0, 
    "read": 1, 
@@ -1062,6 +1135,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 1, 
    "print": 0, 
    "read": 1, 
diff --git a/erpnext/crm/doctype/lead/lead.py b/erpnext/crm/doctype/lead/lead.py
index 605b9e9..18c0db4 100644
--- a/erpnext/crm/doctype/lead/lead.py
+++ b/erpnext/crm/doctype/lead/lead.py
@@ -4,7 +4,7 @@
 from __future__ import unicode_literals
 import frappe
 from frappe import _
-from frappe.utils import cstr, validate_email_add, cint, comma_and, has_gravatar
+from frappe.utils import cstr, validate_email_add, cint, comma_and, has_gravatar, nowdate
 from frappe.model.mapper import get_mapped_doc
 
 from erpnext.controllers.selling_controller import SellingController
@@ -38,11 +38,16 @@
 				validate_email_add(self.email_id, True)
 
 			if self.email_id == self.lead_owner:
-				# Lead Owner cannot be same as the Lead
-				self.lead_owner = None
+				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"))
 
 			self.image = has_gravatar(self.email_id)
 
+		if self.contact_date and self.contact_date < nowdate():
+			frappe.throw(_("Next Contact Date cannot be in the past"))
+
 	def on_update(self):
 		self.add_calendar_event()
 
diff --git a/erpnext/crm/doctype/opportunity/opportunity.js b/erpnext/crm/doctype/opportunity/opportunity.js
index 2f1169d..21fba7b 100644
--- a/erpnext/crm/doctype/opportunity/opportunity.js
+++ b/erpnext/crm/doctype/opportunity/opportunity.js
@@ -23,20 +23,19 @@
 	refresh: function(frm) {
 		var doc = frm.doc;
 		frm.events.enquiry_from(frm);
-
 		if(doc.status!=="Lost") {
 			if(doc.with_items){
 				frm.add_custom_button(__('Supplier Quotation'),
 					function() {
 						frm.trigger("make_supplier_quotation")
 					}, __("Make"));
-
-				frm.add_custom_button(__('Quotation'),
-					cur_frm.cscript.create_quotation, __("Make"));
-
-				frm.page.set_inner_btn_group_as_primary(__("Make"));
 			}
 
+			frm.add_custom_button(__('Quotation'),
+				cur_frm.cscript.create_quotation, __("Make"));
+
+			frm.page.set_inner_btn_group_as_primary(__("Make"));
+		
 			if(doc.status!=="Quotation") {
 				frm.add_custom_button(__('Lost'),
 					cur_frm.cscript['Declare Opportunity Lost']);
@@ -61,9 +60,10 @@
 			this.frm.doc.enquiry_from = "Lead";
 
 		if(!this.frm.doc.status)
-			set_multiple(cdt, cdn, { status:'Draft' });
+			set_multiple(this.frm.doc.doctype, this.frm.doc.name, { status:'Open' });
 		if(!this.frm.doc.company && frappe.defaults.get_user_default("Company"))
-			set_multiple(cdt, cdn, { company:frappe.defaults.get_user_default("Company") });
+			set_multiple(this.frm.doc.doctype, this.frm.doc.name, 
+				{ company:frappe.defaults.get_user_default("Company") });
 
 		this.setup_queries();
 	},
diff --git a/erpnext/crm/doctype/opportunity/opportunity.json b/erpnext/crm/doctype/opportunity/opportunity.json
index 84c3567..fa0ec81 100644
--- a/erpnext/crm/doctype/opportunity/opportunity.json
+++ b/erpnext/crm/doctype/opportunity/opportunity.json
@@ -24,14 +24,16 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "icon-user", 
+   "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, 
@@ -50,6 +52,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Series", 
    "length": 0, 
    "no_copy": 1, 
@@ -60,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, 
@@ -78,6 +82,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Opportunity From", 
    "length": 0, 
    "no_copy": 0, 
@@ -88,6 +93,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, 
@@ -107,6 +113,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Customer", 
    "length": 0, 
    "no_copy": 0, 
@@ -117,6 +124,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, 
@@ -136,6 +144,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Lead", 
    "length": 0, 
    "no_copy": 0, 
@@ -146,6 +155,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, 
@@ -165,6 +175,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer / Lead Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -172,6 +183,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, 
@@ -190,6 +202,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
@@ -197,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, 
@@ -216,6 +230,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Title", 
    "length": 0, 
    "no_copy": 1, 
@@ -224,6 +239,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, 
@@ -243,6 +259,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Opportunity Type", 
    "length": 0, 
    "no_copy": 0, 
@@ -253,6 +270,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, 
@@ -272,6 +290,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Status", 
    "length": 0, 
    "no_copy": 1, 
@@ -282,6 +301,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, 
@@ -301,6 +321,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Lost Reason", 
    "length": 0, 
    "no_copy": 1, 
@@ -308,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, 
@@ -326,6 +348,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Mins to first response", 
    "length": 0, 
    "no_copy": 0, 
@@ -334,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, 
@@ -352,6 +376,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "With Items", 
    "length": 0, 
    "no_copy": 0, 
@@ -360,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, 
@@ -379,15 +405,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-shopping-cart", 
+   "options": "fa fa-shopping-cart", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -407,6 +435,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Items", 
    "length": 0, 
    "no_copy": 0, 
@@ -417,6 +446,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, 
@@ -437,14 +467,16 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Contact Info", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "icon-bullhorn", 
+   "options": "fa fa-bullhorn", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -464,6 +496,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer / Lead Address", 
    "length": 0, 
    "no_copy": 0, 
@@ -472,6 +505,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, 
@@ -490,6 +524,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Address", 
    "length": 0, 
    "no_copy": 0, 
@@ -499,6 +534,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -519,6 +555,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Territory", 
    "length": 0, 
    "no_copy": 0, 
@@ -527,6 +564,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, 
@@ -547,6 +585,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer Group", 
    "length": 0, 
    "no_copy": 0, 
@@ -557,6 +596,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 1, 
@@ -575,12 +615,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, 
@@ -600,6 +642,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Contact Person", 
    "length": 0, 
    "no_copy": 0, 
@@ -608,6 +651,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, 
@@ -627,6 +671,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Contact", 
    "length": 0, 
    "no_copy": 0, 
@@ -634,6 +679,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, 
@@ -653,6 +699,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Contact Email", 
    "length": 0, 
    "no_copy": 0, 
@@ -660,6 +707,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, 
@@ -679,6 +727,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Contact Mobile No", 
    "length": 0, 
    "no_copy": 0, 
@@ -686,6 +735,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, 
@@ -705,15 +755,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Source", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-file-text", 
+   "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, 
@@ -732,6 +784,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Source", 
    "length": 0, 
    "no_copy": 0, 
@@ -742,6 +795,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, 
@@ -761,6 +815,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Campaign", 
    "length": 0, 
    "no_copy": 0, 
@@ -771,6 +826,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, 
@@ -789,6 +845,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
@@ -796,6 +853,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,6 +873,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -825,6 +884,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 1, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 1, 
@@ -844,6 +904,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Opportunity Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -853,6 +914,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, 
@@ -873,6 +935,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Next Contact", 
    "length": 0, 
    "no_copy": 0, 
@@ -881,6 +944,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, 
@@ -900,6 +964,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Next Contact By", 
    "length": 0, 
    "no_copy": 0, 
@@ -910,6 +975,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, 
@@ -930,6 +996,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Next Contact Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -939,6 +1006,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, 
@@ -957,6 +1025,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
@@ -964,6 +1033,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, 
@@ -983,6 +1053,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "To Discuss", 
    "length": 0, 
    "no_copy": 1, 
@@ -992,6 +1063,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, 
@@ -1010,6 +1082,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amended From", 
    "length": 0, 
    "no_copy": 1, 
@@ -1020,6 +1093,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, 
@@ -1030,7 +1104,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-info-sign", 
+ "icon": "fa fa-info-sign", 
  "idx": 195, 
  "image_view": 0, 
  "in_create": 0, 
@@ -1039,7 +1113,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-09-16 01:52:06.229882", 
+ "modified": "2016-11-07 05:55:17.785342", 
  "modified_by": "Administrator", 
  "module": "CRM", 
  "name": "Opportunity", 
@@ -1055,6 +1129,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1075,6 +1150,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
diff --git a/erpnext/crm/doctype/opportunity/opportunity.py b/erpnext/crm/doctype/opportunity/opportunity.py
index fafc44b..38164cc 100644
--- a/erpnext/crm/doctype/opportunity/opportunity.py
+++ b/erpnext/crm/doctype/opportunity/opportunity.py
@@ -39,6 +39,9 @@
 
 		if not self.title:
 			self.title = self.customer_name
+			
+		if not self.with_items:
+			self.items = []
 
 
 	def make_new_lead_if_required(self):
diff --git a/erpnext/crm/doctype/opportunity/opportunity_dashboard.py b/erpnext/crm/doctype/opportunity/opportunity_dashboard.py
index 08d5657..40ff6d0 100644
--- a/erpnext/crm/doctype/opportunity/opportunity_dashboard.py
+++ b/erpnext/crm/doctype/opportunity/opportunity_dashboard.py
@@ -1,11 +1,15 @@
 from frappe import _
 
-data = {
-	'fieldname': 'prevdoc_docname',
-	'transactions': [
-		{
-			'label': _('Related'),
-			'items': ['Quotation']
+def get_data():
+	return {
+		'fieldname': 'prevdoc_docname',
+		'non_standard_fieldnames': {
+			'Supplier Quotation': 'opportunity',
 		},
-	]
-}
\ No newline at end of file
+		'transactions': [
+			{
+				'label': _('Related'),
+				'items': ['Quotation', 'Supplier Quotation']
+			},
+		]
+	}
\ No newline at end of file
diff --git a/erpnext/demo/setup/manufacture.py b/erpnext/demo/setup/manufacture.py
index 8ac2039..24ffd92 100644
--- a/erpnext/demo/setup/manufacture.py
+++ b/erpnext/demo/setup/manufacture.py
@@ -63,7 +63,10 @@
 	for i in items:
 		item = frappe.new_doc('Item')
 		item.update(i)
-		item.default_warehouse = frappe.get_all('Warehouse', filters={'warehouse_name': item.default_warehouse}, limit=1)[0].name
+		if item.default_warehouse:
+			warehouse = frappe.get_all('Warehouse', filters={'warehouse_name': item.default_warehouse}, limit=1)
+			if warehouse:
+				item.default_warehouse = warehouse[0].name
 		item.insert()
 
 def setup_product_bundle():
diff --git a/erpnext/demo/setup/setup_data.py b/erpnext/demo/setup/setup_data.py
index d279a64..278c398 100644
--- a/erpnext/demo/setup/setup_data.py
+++ b/erpnext/demo/setup/setup_data.py
@@ -41,9 +41,9 @@
 		setup_complete({
 			"first_name": "Test",
 			"last_name": "User",
-			"email": "test_demo@erpnext.com",
+			"email": "demo@erpnext.com",
 			"company_tagline": 'Awesome Products and Services',
-			"password": "test",
+			"password": "demo",
 			"fy_start_date": "2015-01-01",
 			"fy_end_date": "2015-12-31",
 			"bank_account": "National Bank",
@@ -130,7 +130,7 @@
 		ss.from_date = e.date_of_joining if (e.date_of_joining
 			and e.date_of_joining > f.year_start_date) else f.year_start_date
 		ss.to_date = f.year_end_date
-
+		ss.payment_account = frappe.get_value('Account', {'account_type': 'Cash', 'company': erpnext.get_default_company(),'is_group':0}, "name")
 	ss.append('earnings', {
 		'salary_component': 'Basic',
 		"abbr":'B',
diff --git a/erpnext/demo/user/hr.py b/erpnext/demo/user/hr.py
index 2b80afb..2686987 100644
--- a/erpnext/demo/user/hr.py
+++ b/erpnext/demo/user/hr.py
@@ -1,5 +1,5 @@
 from __future__ import unicode_literals
-import frappe
+import frappe, erpnext
 import random
 from frappe.utils import random_string, add_days, cint
 from erpnext.projects.doctype.timesheet.test_timesheet import make_timesheet
@@ -24,18 +24,14 @@
 		process_payroll.company = frappe.flags.company
 		process_payroll.month = prev_month
 		process_payroll.fiscal_year = year
-		process_payroll.create_sal_slip()
+		process_payroll.from_date = frappe.flags.current_date
+		process_payroll.to_date = add_days(frappe.flags.current_date, random.randint(0, 30))
+		process_payroll.reference_number = "DemoRef23"
+		process_payroll.reference_date = frappe.flags.current_date
+		process_payroll.payment_account = frappe.get_value('Account', {'account_type': 'Cash', 'company': erpnext.get_default_company(),'is_group':0}, "name")
 		process_payroll.submit_salary_slip()
-		r = process_payroll.make_journal_entry(frappe.get_value('Account',
-			{'account_name': 'Salary'}))
-
-		journal_entry = frappe.get_doc(r)
-		journal_entry.cheque_no = random_string(10)
-		journal_entry.cheque_date = frappe.flags.current_date
-		journal_entry.posting_date = frappe.flags.current_date
-		journal_entry.insert()
-		journal_entry.submit()
-	
+		process_payroll.make_journal_entry()
+		
 	if frappe.db.get_global('demo_hr_user'):
 		make_timesheet_records()
 	
diff --git a/erpnext/demo/user/stock.py b/erpnext/demo/user/stock.py
index ac380f2..ea23853 100644
--- a/erpnext/demo/user/stock.py
+++ b/erpnext/demo/user/stock.py
@@ -85,9 +85,10 @@
 
 def submit_draft_stock_entries():
 	from erpnext.stock.doctype.stock_entry.stock_entry import IncorrectValuationRateError, \
-		DuplicateEntryForProductionOrderError, OperationsNotCompleteError
+		DuplicateEntryForProductionOrderError, OperationsNotCompleteError	
 
 	# try posting older drafts (if exists)
+	frappe.db.commit()
 	for st in frappe.db.get_values("Stock Entry", {"docstatus":0}, "name"):
 		try:
 			ste = frappe.get_doc("Stock Entry", st[0])
diff --git a/erpnext/docs/assets/img/accounts/Screen Shot 2016-10-28 at 5.36.15 PM.png b/erpnext/docs/assets/img/accounts/Screen Shot 2016-10-28 at 5.36.15 PM.png
new file mode 100644
index 0000000..cdc4e1a
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/Screen Shot 2016-10-28 at 5.36.15 PM.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/account-settings.png b/erpnext/docs/assets/img/accounts/account-settings.png
index 943aa3d..dfe2abe 100644
--- a/erpnext/docs/assets/img/accounts/account-settings.png
+++ b/erpnext/docs/assets/img/accounts/account-settings.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/balance_sheet_report.png b/erpnext/docs/assets/img/accounts/balance_sheet_report.png
new file mode 100644
index 0000000..4d6ffdc
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/balance_sheet_report.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/cash_flow_report.png b/erpnext/docs/assets/img/accounts/cash_flow_report.png
new file mode 100644
index 0000000..33079da
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/cash_flow_report.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/change-amount.png b/erpnext/docs/assets/img/accounts/change-amount.png
new file mode 100644
index 0000000..33f9c88
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/change-amount.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/fiscal-year.png b/erpnext/docs/assets/img/accounts/fiscal-year.png
index 2dbf0a2..c320a5c 100644
--- a/erpnext/docs/assets/img/accounts/fiscal-year.png
+++ b/erpnext/docs/assets/img/accounts/fiscal-year.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/journal-entry.png b/erpnext/docs/assets/img/accounts/journal-entry.png
index d4a4e21..c6a2a64 100644
--- a/erpnext/docs/assets/img/accounts/journal-entry.png
+++ b/erpnext/docs/assets/img/accounts/journal-entry.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/offline-records.png b/erpnext/docs/assets/img/accounts/offline-records.png
new file mode 100644
index 0000000..78bb730
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/offline-records.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 fb6c1f8..321e8dc 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/accounts/pos-payment.png b/erpnext/docs/assets/img/accounts/pos-payment.png
index 0a0d37f..187e82c 100644
--- a/erpnext/docs/assets/img/accounts/pos-payment.png
+++ b/erpnext/docs/assets/img/accounts/pos-payment.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/pos-sales-invoice.png b/erpnext/docs/assets/img/accounts/pos-sales-invoice.png
new file mode 100644
index 0000000..3a115ed
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/pos-sales-invoice.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/profit_n_loss_report.png b/erpnext/docs/assets/img/accounts/profit_n_loss_report.png
new file mode 100644
index 0000000..de2a75f
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/profit_n_loss_report.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/write-off.png b/erpnext/docs/assets/img/accounts/write-off.png
new file mode 100644
index 0000000..c6896ea
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/write-off.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Selection_021.png b/erpnext/docs/assets/img/articles/Selection_021.png
index f4a61cf..48e8c3e 100644
--- a/erpnext/docs/assets/img/articles/Selection_021.png
+++ b/erpnext/docs/assets/img/articles/Selection_021.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/barcode-feature-setup.png b/erpnext/docs/assets/img/articles/barcode-feature-setup.png
deleted file mode 100644
index 0a097ef..0000000
--- a/erpnext/docs/assets/img/articles/barcode-feature-setup.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/item-show-on-website-checkbox-checked.png b/erpnext/docs/assets/img/articles/item-show-on-website-checkbox-checked.png
new file mode 100644
index 0000000..ae0878a
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/item-show-on-website-checkbox-checked.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/item-show-on-website-checkbox.png b/erpnext/docs/assets/img/articles/item-show-on-website-checkbox.png
new file mode 100644
index 0000000..d1baa0c
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/item-show-on-website-checkbox.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/new-item-for-website-01.png b/erpnext/docs/assets/img/articles/new-item-for-website-01.png
new file mode 100644
index 0000000..826d31a
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/new-item-for-website-01.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/new-item-for-website-02.png b/erpnext/docs/assets/img/articles/new-item-for-website-02.png
new file mode 100644
index 0000000..d838429
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/new-item-for-website-02.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/new-item-for-website-03.png b/erpnext/docs/assets/img/articles/new-item-for-website-03.png
new file mode 100644
index 0000000..e182cbd
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/new-item-for-website-03.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/new-item-for-website-04.png b/erpnext/docs/assets/img/articles/new-item-for-website-04.png
new file mode 100644
index 0000000..8e5ef38
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/new-item-for-website-04.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/new-item-for-website-05.png b/erpnext/docs/assets/img/articles/new-item-for-website-05.png
new file mode 100644
index 0000000..2822807
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/new-item-for-website-05.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/new-item-for-website-06.png b/erpnext/docs/assets/img/articles/new-item-for-website-06.png
new file mode 100644
index 0000000..fea2892
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/new-item-for-website-06.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/new-item-for-website-07.png b/erpnext/docs/assets/img/articles/new-item-for-website-07.png
new file mode 100644
index 0000000..4d410b3
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/new-item-for-website-07.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/new-item-for-website-08.png b/erpnext/docs/assets/img/articles/new-item-for-website-08.png
new file mode 100644
index 0000000..440bef1
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/new-item-for-website-08.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/price-list.png b/erpnext/docs/assets/img/articles/price-list.png
new file mode 100644
index 0000000..a6982f9
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/price-list.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/pricing-rule-invoice.png b/erpnext/docs/assets/img/articles/pricing-rule-invoice.png
new file mode 100644
index 0000000..79d7fa7
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/pricing-rule-invoice.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/pricing-rule-margin.png b/erpnext/docs/assets/img/articles/pricing-rule-margin.png
new file mode 100644
index 0000000..66f6050
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/pricing-rule-margin.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/sales-person-transaction-4.png b/erpnext/docs/assets/img/articles/sales-person-transaction-4.png
deleted file mode 100644
index 5883c76..0000000
--- a/erpnext/docs/assets/img/articles/sales-person-transaction-4.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/withhold-1.png b/erpnext/docs/assets/img/articles/withhold-1.png
new file mode 100644
index 0000000..89b63a0
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/withhold-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/withhold-2.gif b/erpnext/docs/assets/img/articles/withhold-2.gif
new file mode 100644
index 0000000..87a92c1
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/withhold-2.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/buying/add_taxes_to_doc.png b/erpnext/docs/assets/img/buying/add_taxes_to_doc.png
new file mode 100644
index 0000000..3e1480d
--- /dev/null
+++ b/erpnext/docs/assets/img/buying/add_taxes_to_doc.png
Binary files differ
diff --git a/erpnext/docs/assets/img/buying/buying_flow.png b/erpnext/docs/assets/img/buying/buying_flow.png
new file mode 100644
index 0000000..7b3f256
--- /dev/null
+++ b/erpnext/docs/assets/img/buying/buying_flow.png
Binary files differ
diff --git a/erpnext/docs/assets/img/buying/material-request-flowchart.png b/erpnext/docs/assets/img/buying/material-request-flowchart.png
new file mode 100644
index 0000000..8ed0e39
--- /dev/null
+++ b/erpnext/docs/assets/img/buying/material-request-flowchart.png
Binary files differ
diff --git a/erpnext/docs/assets/img/buying/material-request.png b/erpnext/docs/assets/img/buying/material-request.png
index 34005b2..2bb4c88 100644
--- a/erpnext/docs/assets/img/buying/material-request.png
+++ b/erpnext/docs/assets/img/buying/material-request.png
Binary files differ
diff --git a/erpnext/docs/assets/img/buying/show_tax_breakup.png b/erpnext/docs/assets/img/buying/show_tax_breakup.png
new file mode 100644
index 0000000..7348d51
--- /dev/null
+++ b/erpnext/docs/assets/img/buying/show_tax_breakup.png
Binary files differ
diff --git a/erpnext/docs/assets/img/crm/create-customer.gif b/erpnext/docs/assets/img/crm/create-customer.gif
new file mode 100644
index 0000000..a615f2a
--- /dev/null
+++ b/erpnext/docs/assets/img/crm/create-customer.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/crm/customer-to selling-flowchart.jpeg b/erpnext/docs/assets/img/crm/customer-to selling-flowchart.jpeg
new file mode 100644
index 0000000..70e536e
--- /dev/null
+++ b/erpnext/docs/assets/img/crm/customer-to selling-flowchart.jpeg
Binary files differ
diff --git a/erpnext/docs/assets/img/crm/make-sq-from-opportunity.png b/erpnext/docs/assets/img/crm/make-sq-from-opportunity.png
new file mode 100644
index 0000000..9d41027
--- /dev/null
+++ b/erpnext/docs/assets/img/crm/make-sq-from-opportunity.png
Binary files differ
diff --git a/erpnext/docs/assets/img/crm/requirement-gathering.png b/erpnext/docs/assets/img/crm/requirement-gathering.png
new file mode 100644
index 0000000..cd631d6
--- /dev/null
+++ b/erpnext/docs/assets/img/crm/requirement-gathering.png
Binary files differ
diff --git a/erpnext/docs/assets/img/customize/feature-setup.png b/erpnext/docs/assets/img/customize/feature-setup.png
deleted file mode 100644
index 200d138..0000000
--- a/erpnext/docs/assets/img/customize/feature-setup.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/erpnext-docs.png b/erpnext/docs/assets/img/erpnext-docs.png
new file mode 100644
index 0000000..a814703
--- /dev/null
+++ b/erpnext/docs/assets/img/erpnext-docs.png
Binary files differ
diff --git a/erpnext/schools/doctype/scheduling_tool/__init__.py b/erpnext/docs/assets/img/fleet-management/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/scheduling_tool/__init__.py
copy to erpnext/docs/assets/img/fleet-management/__init__.py
diff --git a/erpnext/docs/assets/img/fleet-management/expense-claim-3.1.png b/erpnext/docs/assets/img/fleet-management/expense-claim-3.1.png
new file mode 100644
index 0000000..6aa4d69
--- /dev/null
+++ b/erpnext/docs/assets/img/fleet-management/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/fleet-management/expense-claim-3.2.png
new file mode 100644
index 0000000..9376988
--- /dev/null
+++ b/erpnext/docs/assets/img/fleet-management/expense-claim-3.2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/fleet-management/vehicle-1.1.png b/erpnext/docs/assets/img/fleet-management/vehicle-1.1.png
new file mode 100644
index 0000000..b40912d
--- /dev/null
+++ b/erpnext/docs/assets/img/fleet-management/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/fleet-management/vehicle-1.2.png
new file mode 100644
index 0000000..8a8695e
--- /dev/null
+++ b/erpnext/docs/assets/img/fleet-management/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/fleet-management/vehicle-1.3.png
new file mode 100644
index 0000000..8110454
--- /dev/null
+++ b/erpnext/docs/assets/img/fleet-management/vehicle-1.3.png
Binary files differ
diff --git a/erpnext/docs/assets/img/fleet-management/vehicle-expenses.png b/erpnext/docs/assets/img/fleet-management/vehicle-expenses.png
new file mode 100644
index 0000000..166717c
--- /dev/null
+++ b/erpnext/docs/assets/img/fleet-management/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/fleet-management/vehicle-log-2.1.png
new file mode 100644
index 0000000..f859b42
--- /dev/null
+++ b/erpnext/docs/assets/img/fleet-management/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/fleet-management/vehicle-log-2.2.png
new file mode 100644
index 0000000..12d3187
--- /dev/null
+++ b/erpnext/docs/assets/img/fleet-management/vehicle-log-2.2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/human-resources/bank-entry.png b/erpnext/docs/assets/img/human-resources/bank-entry.png
new file mode 100644
index 0000000..b870bc5
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/bank-entry.png
Binary files differ
diff --git a/erpnext/docs/assets/img/human-resources/daily-work-summary-settings.png b/erpnext/docs/assets/img/human-resources/daily-work-summary-settings.png
new file mode 100644
index 0000000..c4801c2
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/daily-work-summary-settings.png
Binary files differ
diff --git a/erpnext/docs/assets/img/human-resources/payroll-frequency.png b/erpnext/docs/assets/img/human-resources/payroll-frequency.png
new file mode 100644
index 0000000..e639903
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/payroll-frequency.png
Binary files differ
diff --git a/erpnext/docs/assets/img/human-resources/process-payroll.png b/erpnext/docs/assets/img/human-resources/process-payroll.png
index ebbd9ae..0901cbe 100644
--- a/erpnext/docs/assets/img/human-resources/process-payroll.png
+++ b/erpnext/docs/assets/img/human-resources/process-payroll.png
Binary files differ
diff --git a/erpnext/docs/assets/img/human-resources/salary-structure-account.png b/erpnext/docs/assets/img/human-resources/salary-structure-account.png
new file mode 100644
index 0000000..bd37ee0
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/salary-structure-account.png
Binary files differ
diff --git a/erpnext/docs/assets/img/human-resources/salary-structure.png b/erpnext/docs/assets/img/human-resources/salary-structure.png
index a135092..83e4820 100644
--- a/erpnext/docs/assets/img/human-resources/salary-structure.png
+++ b/erpnext/docs/assets/img/human-resources/salary-structure.png
Binary files differ
diff --git a/erpnext/docs/assets/img/manufacturing/PO-FG-update.png b/erpnext/docs/assets/img/manufacturing/PO-FG-update.png
index b07a7cf..97ce265 100644
--- a/erpnext/docs/assets/img/manufacturing/PO-FG-update.png
+++ b/erpnext/docs/assets/img/manufacturing/PO-FG-update.png
Binary files differ
diff --git a/erpnext/docs/assets/img/manufacturing/PO-material-transfer-qty.png b/erpnext/docs/assets/img/manufacturing/PO-material-transfer-qty.png
index e8dea02..6191e13 100644
--- a/erpnext/docs/assets/img/manufacturing/PO-material-transfer-qty.png
+++ b/erpnext/docs/assets/img/manufacturing/PO-material-transfer-qty.png
Binary files differ
diff --git a/erpnext/docs/assets/img/manufacturing/PO-material-transfer-updated.png b/erpnext/docs/assets/img/manufacturing/PO-material-transfer-updated.png
index 5c20ff8..0cd0bd1 100644
--- a/erpnext/docs/assets/img/manufacturing/PO-material-transfer-updated.png
+++ b/erpnext/docs/assets/img/manufacturing/PO-material-transfer-updated.png
Binary files differ
diff --git a/erpnext/docs/assets/img/manufacturing/PO-material-transfer.png b/erpnext/docs/assets/img/manufacturing/PO-material-transfer.png
index dbdc303..c323628 100644
--- a/erpnext/docs/assets/img/manufacturing/PO-material-transfer.png
+++ b/erpnext/docs/assets/img/manufacturing/PO-material-transfer.png
Binary files differ
diff --git a/erpnext/docs/assets/img/manufacturing/PO-operations-make-ts.png b/erpnext/docs/assets/img/manufacturing/PO-operations-make-ts.png
new file mode 100644
index 0000000..07b5170
--- /dev/null
+++ b/erpnext/docs/assets/img/manufacturing/PO-operations-make-ts.png
Binary files differ
diff --git a/erpnext/docs/assets/img/manufacturing/PO-operations.png b/erpnext/docs/assets/img/manufacturing/PO-operations.png
index 6916891..4b091ce 100644
--- a/erpnext/docs/assets/img/manufacturing/PO-operations.png
+++ b/erpnext/docs/assets/img/manufacturing/PO-operations.png
Binary files differ
diff --git a/erpnext/docs/assets/img/manufacturing/PO-stop.png b/erpnext/docs/assets/img/manufacturing/PO-stop.png
index c486a68..0c82573 100644
--- a/erpnext/docs/assets/img/manufacturing/PO-stop.png
+++ b/erpnext/docs/assets/img/manufacturing/PO-stop.png
Binary files differ
diff --git a/erpnext/docs/assets/img/manufacturing/manufacturing-flow.png b/erpnext/docs/assets/img/manufacturing/manufacturing-flow.png
new file mode 100644
index 0000000..4701ad0
--- /dev/null
+++ b/erpnext/docs/assets/img/manufacturing/manufacturing-flow.png
Binary files differ
diff --git a/erpnext/docs/assets/img/manufacturing/price-list-based-currency-bom.png b/erpnext/docs/assets/img/manufacturing/price-list-based-currency-bom.png
new file mode 100644
index 0000000..c8eca6a
--- /dev/null
+++ b/erpnext/docs/assets/img/manufacturing/price-list-based-currency-bom.png
Binary files differ
diff --git a/erpnext/docs/assets/img/manufacturing/production-order.png b/erpnext/docs/assets/img/manufacturing/production-order.png
index d1e7966..fb552f3 100644
--- a/erpnext/docs/assets/img/manufacturing/production-order.png
+++ b/erpnext/docs/assets/img/manufacturing/production-order.png
Binary files differ
diff --git a/erpnext/docs/assets/img/project/percent-complete-calc.png b/erpnext/docs/assets/img/project/percent-complete-calc.png
new file mode 100644
index 0000000..25e170d
--- /dev/null
+++ b/erpnext/docs/assets/img/project/percent-complete-calc.png
Binary files differ
diff --git a/erpnext/docs/assets/img/project/percent-complete-formula.png b/erpnext/docs/assets/img/project/percent-complete-formula.png
new file mode 100644
index 0000000..42ff53a
--- /dev/null
+++ b/erpnext/docs/assets/img/project/percent-complete-formula.png
Binary files differ
diff --git a/erpnext/docs/assets/img/project/project-percent-complete.png b/erpnext/docs/assets/img/project/project-percent-complete.png
new file mode 100644
index 0000000..cebfde3
--- /dev/null
+++ b/erpnext/docs/assets/img/project/project-percent-complete.png
Binary files differ
diff --git a/erpnext/docs/assets/img/project/task-weights.png b/erpnext/docs/assets/img/project/task-weights.png
new file mode 100644
index 0000000..c3cb256
--- /dev/null
+++ b/erpnext/docs/assets/img/project/task-weights.png
Binary files differ
diff --git a/erpnext/docs/assets/img/project/tasks.png b/erpnext/docs/assets/img/project/tasks.png
new file mode 100644
index 0000000..7ee008b
--- /dev/null
+++ b/erpnext/docs/assets/img/project/tasks.png
Binary files differ
diff --git a/erpnext/docs/assets/img/selling/selling-flow.png b/erpnext/docs/assets/img/selling/selling-flow.png
new file mode 100644
index 0000000..7f35f80
--- /dev/null
+++ b/erpnext/docs/assets/img/selling/selling-flow.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/data-import/data-import-tool-template.gif b/erpnext/docs/assets/img/setup/data-import/data-import-tool-template.gif
new file mode 100644
index 0000000..c4d28f4
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/data-import/data-import-tool-template.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/data-import/import-csv.png b/erpnext/docs/assets/img/setup/data-import/import-csv.png
new file mode 100644
index 0000000..3b9bc9f
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/data-import/import-csv.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/data-import/import-file.png b/erpnext/docs/assets/img/setup/data-import/import-file.png
new file mode 100644
index 0000000..c99e015
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/data-import/import-file.png
Binary files differ
diff --git a/erpnext/schools/doctype/scheduling_tool/__init__.py b/erpnext/docs/assets/img/setup/integration-service/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/scheduling_tool/__init__.py
copy to erpnext/docs/assets/img/setup/integration-service/__init__.py
diff --git a/erpnext/docs/assets/img/setup/integration-service/api-step-1.png b/erpnext/docs/assets/img/setup/integration-service/api-step-1.png
new file mode 100644
index 0000000..d51434d
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/integration-service/api-step-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/integration-service/api-step-2.png b/erpnext/docs/assets/img/setup/integration-service/api-step-2.png
new file mode 100644
index 0000000..f4dfa43
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/integration-service/api-step-2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/integration-service/api-step-3.png b/erpnext/docs/assets/img/setup/integration-service/api-step-3.png
new file mode 100644
index 0000000..070fded
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/integration-service/api-step-3.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/integration-service/create_dropbox_service.png b/erpnext/docs/assets/img/setup/integration-service/create_dropbox_service.png
new file mode 100644
index 0000000..daa792c
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/integration-service/create_dropbox_service.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/dropbox-2.png b/erpnext/docs/assets/img/setup/integration-service/dropbox-2.png
similarity index 100%
rename from erpnext/docs/assets/img/setup/dropbox-2.png
rename to erpnext/docs/assets/img/setup/integration-service/dropbox-2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/dropbox-3.png b/erpnext/docs/assets/img/setup/integration-service/dropbox-3.png
similarity index 100%
rename from erpnext/docs/assets/img/setup/dropbox-3.png
rename to erpnext/docs/assets/img/setup/integration-service/dropbox-3.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/dropbox-open-1.png b/erpnext/docs/assets/img/setup/integration-service/dropbox-open-1.png
similarity index 100%
rename from erpnext/docs/assets/img/setup/dropbox-open-1.png
rename to erpnext/docs/assets/img/setup/integration-service/dropbox-open-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/dropbox-open-2.png b/erpnext/docs/assets/img/setup/integration-service/dropbox-open-2.png
similarity index 100%
rename from erpnext/docs/assets/img/setup/dropbox-open-2.png
rename to erpnext/docs/assets/img/setup/integration-service/dropbox-open-2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/dropbox-open-3.png b/erpnext/docs/assets/img/setup/integration-service/dropbox-open-3.png
similarity index 100%
rename from erpnext/docs/assets/img/setup/dropbox-open-3.png
rename to erpnext/docs/assets/img/setup/integration-service/dropbox-open-3.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/integration-service/ldap_settings.png b/erpnext/docs/assets/img/setup/integration-service/ldap_settings.png
new file mode 100644
index 0000000..c0ecbc7
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/integration-service/ldap_settings.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/integration-service/login_via_ldap.png b/erpnext/docs/assets/img/setup/integration-service/login_via_ldap.png
new file mode 100644
index 0000000..15fd387
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/integration-service/login_via_ldap.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/integration-service/payment_gateway_account_paypal.png b/erpnext/docs/assets/img/setup/integration-service/payment_gateway_account_paypal.png
new file mode 100644
index 0000000..e6f1665
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/integration-service/payment_gateway_account_paypal.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/integration-service/payment_gateway_account_razorpay.png b/erpnext/docs/assets/img/setup/integration-service/payment_gateway_account_razorpay.png
new file mode 100644
index 0000000..e09e797
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/integration-service/payment_gateway_account_razorpay.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/integration-service/paypal_coa.png b/erpnext/docs/assets/img/setup/integration-service/paypal_coa.png
new file mode 100644
index 0000000..bf0ed19
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/integration-service/paypal_coa.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/integration-service/paypal_settings.png b/erpnext/docs/assets/img/setup/integration-service/paypal_settings.png
new file mode 100644
index 0000000..f5f5e54
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/integration-service/paypal_settings.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/integration-service/razorpay_coa.png b/erpnext/docs/assets/img/setup/integration-service/razorpay_coa.png
new file mode 100644
index 0000000..68cad28
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/integration-service/razorpay_coa.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/integration-service/razorpay_settings.png b/erpnext/docs/assets/img/setup/integration-service/razorpay_settings.png
new file mode 100644
index 0000000..042b422
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/integration-service/razorpay_settings.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/integration-service/sanbox-credentials.png b/erpnext/docs/assets/img/setup/integration-service/sanbox-credentials.png
new file mode 100644
index 0000000..21e8460
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/integration-service/sanbox-credentials.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/integration-service/setup-backup-frequency.png b/erpnext/docs/assets/img/setup/integration-service/setup-backup-frequency.png
new file mode 100644
index 0000000..916679e
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/integration-service/setup-backup-frequency.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/integration-service/setup-sanbox-1.png b/erpnext/docs/assets/img/setup/integration-service/setup-sanbox-1.png
new file mode 100644
index 0000000..932a62a
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/integration-service/setup-sanbox-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/stock/projected_quantity.png b/erpnext/docs/assets/img/stock/projected_quantity.png
new file mode 100644
index 0000000..d9879b2
--- /dev/null
+++ b/erpnext/docs/assets/img/stock/projected_quantity.png
Binary files differ
diff --git a/erpnext/docs/assets/img/stock/warehouse.png b/erpnext/docs/assets/img/stock/warehouse.png
index 6b968d3..748cee8 100644
--- a/erpnext/docs/assets/img/stock/warehouse.png
+++ b/erpnext/docs/assets/img/stock/warehouse.png
Binary files differ
diff --git a/erpnext/docs/assets/img/taxes-and-charges.gif b/erpnext/docs/assets/img/taxes-and-charges.gif
new file mode 100644
index 0000000..8d0a2bc
--- /dev/null
+++ b/erpnext/docs/assets/img/taxes-and-charges.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/website/checkout.png b/erpnext/docs/assets/img/website/checkout.png
new file mode 100644
index 0000000..0aa7b98
--- /dev/null
+++ b/erpnext/docs/assets/img/website/checkout.png
Binary files differ
diff --git a/erpnext/docs/assets/img/website/item-in-webiste.png b/erpnext/docs/assets/img/website/item-in-webiste.png
new file mode 100644
index 0000000..8a6203e
--- /dev/null
+++ b/erpnext/docs/assets/img/website/item-in-webiste.png
Binary files differ
diff --git a/erpnext/docs/assets/img/website/item-website-specs.png b/erpnext/docs/assets/img/website/item-website-specs.png
new file mode 100644
index 0000000..700b1b0
--- /dev/null
+++ b/erpnext/docs/assets/img/website/item-website-specs.png
Binary files differ
diff --git a/erpnext/docs/assets/img/website/item-website-view.png b/erpnext/docs/assets/img/website/item-website-view.png
new file mode 100644
index 0000000..34d708b
--- /dev/null
+++ b/erpnext/docs/assets/img/website/item-website-view.png
Binary files differ
diff --git a/erpnext/docs/assets/img/website/place-order.png b/erpnext/docs/assets/img/website/place-order.png
new file mode 100644
index 0000000..ced7612
--- /dev/null
+++ b/erpnext/docs/assets/img/website/place-order.png
Binary files differ
diff --git a/erpnext/docs/assets/img/website/shopping-cart-settings.png b/erpnext/docs/assets/img/website/shopping-cart-settings.png
new file mode 100644
index 0000000..7828cff
--- /dev/null
+++ b/erpnext/docs/assets/img/website/shopping-cart-settings.png
Binary files differ
diff --git a/erpnext/docs/assets/img/website/website-login.png b/erpnext/docs/assets/img/website/website-login.png
new file mode 100644
index 0000000..6943098
--- /dev/null
+++ b/erpnext/docs/assets/img/website/website-login.png
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/import-3.png b/erpnext/docs/assets/old_images/erpnext/import-3.png
deleted file mode 100644
index 9387dd5..0000000
--- a/erpnext/docs/assets/old_images/erpnext/import-3.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/import-4.png b/erpnext/docs/assets/old_images/erpnext/import-4.png
deleted file mode 100644
index fce1f51..0000000
--- a/erpnext/docs/assets/old_images/erpnext/import-4.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/item-webimage-1.png b/erpnext/docs/assets/old_images/erpnext/item-webimage-1.png
deleted file mode 100644
index a2dfe7f..0000000
--- a/erpnext/docs/assets/old_images/erpnext/item-webimage-1.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/item-webimage-2.png b/erpnext/docs/assets/old_images/erpnext/item-webimage-2.png
deleted file mode 100644
index 473a3ff..0000000
--- a/erpnext/docs/assets/old_images/erpnext/item-webimage-2.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/item-webimage.png b/erpnext/docs/assets/old_images/erpnext/item-webimage.png
deleted file mode 100644
index af46e3c..0000000
--- a/erpnext/docs/assets/old_images/erpnext/item-webimage.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/itemgroup-webimage-bags.png b/erpnext/docs/assets/old_images/erpnext/itemgroup-webimage-bags.png
deleted file mode 100644
index 9c3a400..0000000
--- a/erpnext/docs/assets/old_images/erpnext/itemgroup-webimage-bags.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/itemgroup-websettings.png b/erpnext/docs/assets/old_images/erpnext/itemgroup-websettings.png
deleted file mode 100644
index dcb8641..0000000
--- a/erpnext/docs/assets/old_images/erpnext/itemgroup-websettings.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/itemgroup-website-settings.png b/erpnext/docs/assets/old_images/erpnext/itemgroup-website-settings.png
deleted file mode 100644
index 1b4039c..0000000
--- a/erpnext/docs/assets/old_images/erpnext/itemgroup-website-settings.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/webpage-itemgroup-display.png b/erpnext/docs/assets/old_images/erpnext/webpage-itemgroup-display.png
deleted file mode 100644
index 7981e4f..0000000
--- a/erpnext/docs/assets/old_images/erpnext/webpage-itemgroup-display.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/webpage-labels.png b/erpnext/docs/assets/old_images/erpnext/webpage-labels.png
deleted file mode 100644
index 3182ab7..0000000
--- a/erpnext/docs/assets/old_images/erpnext/webpage-labels.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/contents.py b/erpnext/docs/contents.py
index 131d410..c23737a 100644
--- a/erpnext/docs/contents.py
+++ b/erpnext/docs/contents.py
@@ -6,4 +6,4 @@
 from frappe.website.utils import get_full_index
 
 def get_context(context):
-	context.full_index = get_full_index(extn = True)
+	context.full_index = get_full_index()
diff --git a/erpnext/docs/current/models/stock/material_request_item.html b/erpnext/docs/current/models/stock/material_request_item.html
deleted file mode 100644
index 2d1e2a0..0000000
--- a/erpnext/docs/current/models/stock/material_request_item.html
+++ /dev/null
@@ -1,414 +0,0 @@
-<!-- title: Material Request Item -->
-
-
-
-
-
-<div class="dev-header">
-
-<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
-	Version 6.x.x</a>
-
-
-	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/stock/doctype/material_request_item"
-		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
-
-</div>
-
-
-<span class="label label-info">Child Table</span>
-
-
-    <p><b>Table Name:</b> <code>tabMaterial Request Item</code></p>
-
-
-
-
-<h3>Fields</h3>
-
-<table class="table table-bordered">
-    <thead>
-        <tr>
-            <th style="width: 5%">Sr</th>
-            <th style="width: 25%">Fieldname</th>
-            <th style="width: 20%">Type</th>
-            <th style="width: 25%">Label</th>
-            <th style="width: 25%">Options</th>
-        </tr>
-    </thead>
-    <tbody>
-        
-        <tr >
-            <td>1</td>
-            <td class="danger" title="Mandatory"><code>item_code</code></td>
-            <td >
-                Link</td>
-            <td >
-                Item Code
-                
-            </td>
-            <td>
-                
-                
-
-
-<a href="https://frappe.github.io/erpnext/current/models/stock/item">Item</a>
-
-
-                
-            </td>
-        </tr>
-        
-        <tr >
-            <td>2</td>
-            <td ><code>col_break1</code></td>
-            <td class="info">
-                Column Break</td>
-            <td >
-                
-                
-            </td>
-            <td></td>
-        </tr>
-        
-        <tr >
-            <td>3</td>
-            <td ><code>item_name</code></td>
-            <td >
-                Data</td>
-            <td >
-                Item Name
-                
-            </td>
-            <td></td>
-        </tr>
-        
-        <tr class="info">
-            <td>4</td>
-            <td ><code>section_break_4</code></td>
-            <td >
-                Section Break</td>
-            <td >
-                Description
-                
-            </td>
-            <td></td>
-        </tr>
-        
-        <tr >
-            <td>5</td>
-            <td class="danger" title="Mandatory"><code>description</code></td>
-            <td >
-                Text Editor</td>
-            <td >
-                Description
-                
-            </td>
-            <td></td>
-        </tr>
-        
-        <tr >
-            <td>6</td>
-            <td ><code>column_break_6</code></td>
-            <td class="info">
-                Column Break</td>
-            <td >
-                
-                
-            </td>
-            <td></td>
-        </tr>
-        
-        <tr >
-            <td>7</td>
-            <td ><code>image</code></td>
-            <td >
-                Attach Image</td>
-            <td >
-                Image
-                
-            </td>
-            <td></td>
-        </tr>
-        
-        <tr class="info">
-            <td>8</td>
-            <td ><code>quantity_and_warehouse</code></td>
-            <td >
-                Section Break</td>
-            <td >
-                Quantity and Warehouse
-                
-            </td>
-            <td></td>
-        </tr>
-        
-        <tr >
-            <td>9</td>
-            <td class="danger" title="Mandatory"><code>qty</code></td>
-            <td >
-                Float</td>
-            <td >
-                Quantity
-                
-            </td>
-            <td></td>
-        </tr>
-        
-        <tr >
-            <td>10</td>
-            <td class="danger" title="Mandatory"><code>uom</code></td>
-            <td >
-                Link</td>
-            <td >
-                Stock UOM
-                
-            </td>
-            <td>
-                
-                
-
-
-<a href="https://frappe.github.io/erpnext/current/models/setup/uom">UOM</a>
-
-
-                
-            </td>
-        </tr>
-        
-        <tr >
-            <td>11</td>
-            <td ><code>warehouse</code></td>
-            <td >
-                Link</td>
-            <td >
-                For Warehouse
-                
-            </td>
-            <td>
-                
-                
-
-
-<a href="https://frappe.github.io/erpnext/current/models/stock/warehouse">Warehouse</a>
-
-
-                
-            </td>
-        </tr>
-        
-        <tr >
-            <td>12</td>
-            <td ><code>col_break2</code></td>
-            <td class="info">
-                Column Break</td>
-            <td >
-                
-                
-            </td>
-            <td></td>
-        </tr>
-        
-        <tr >
-            <td>13</td>
-            <td class="danger" title="Mandatory"><code>schedule_date</code></td>
-            <td >
-                Date</td>
-            <td >
-                Required Date
-                
-            </td>
-            <td></td>
-        </tr>
-        
-        <tr class="info">
-            <td>14</td>
-            <td ><code>more_info</code></td>
-            <td >
-                Section Break</td>
-            <td >
-                More Information
-                
-            </td>
-            <td></td>
-        </tr>
-        
-        <tr >
-            <td>15</td>
-            <td ><code>item_group</code></td>
-            <td >
-                Link</td>
-            <td >
-                Item Group
-                
-            </td>
-            <td>
-                
-                
-
-
-<a href="https://frappe.github.io/erpnext/current/models/setup/item_group">Item Group</a>
-
-
-                
-            </td>
-        </tr>
-        
-        <tr >
-            <td>16</td>
-            <td ><code>brand</code></td>
-            <td >
-                Link</td>
-            <td >
-                Brand
-                
-            </td>
-            <td>
-                
-                
-
-
-<a href="https://frappe.github.io/erpnext/current/models/setup/brand">Brand</a>
-
-
-                
-            </td>
-        </tr>
-        
-        <tr >
-            <td>17</td>
-            <td ><code>lead_time_date</code></td>
-            <td >
-                Date</td>
-            <td >
-                Lead Time Date
-                
-            </td>
-            <td></td>
-        </tr>
-        
-        <tr >
-            <td>18</td>
-            <td ><code>sales_order</code></td>
-            <td >
-                Link</td>
-            <td >
-                Sales Order
-                
-            </td>
-            <td>
-                
-                
-
-
-<a href="https://frappe.github.io/erpnext/current/models/selling/sales_order">Sales Order</a>
-
-
-                
-            </td>
-        </tr>
-        
-        <tr >
-            <td>19</td>
-            <td ><code>project</code></td>
-            <td >
-                Link</td>
-            <td >
-                Project
-                
-            </td>
-            <td>
-                
-                
-
-
-<a href="https://frappe.github.io/erpnext/current/models/projects/project">Project</a>
-
-
-                
-            </td>
-        </tr>
-        
-        <tr >
-            <td>20</td>
-            <td ><code>col_break3</code></td>
-            <td class="info">
-                Column Break</td>
-            <td >
-                
-                
-            </td>
-            <td></td>
-        </tr>
-        
-        <tr >
-            <td>21</td>
-            <td ><code>min_order_qty</code></td>
-            <td >
-                Float</td>
-            <td >
-                Min Order Qty
-                
-            </td>
-            <td></td>
-        </tr>
-        
-        <tr >
-            <td>22</td>
-            <td ><code>projected_qty</code></td>
-            <td >
-                Float</td>
-            <td >
-                Projected Qty
-                
-            </td>
-            <td></td>
-        </tr>
-        
-        <tr >
-            <td>23</td>
-            <td ><code>ordered_qty</code></td>
-            <td >
-                Float</td>
-            <td >
-                Completed Qty
-                
-            </td>
-            <td></td>
-        </tr>
-        
-        <tr >
-            <td>24</td>
-            <td ><code>page_break</code></td>
-            <td >
-                Check</td>
-            <td >
-                Page Break
-                
-            </td>
-            <td></td>
-        </tr>
-        
-    </tbody>
-</table>
-
-
-    
-    
-    <h4>Child Table Of</h4>
-    <ul>
-    
-        <li>
-
-
-<a href="https://frappe.github.io/erpnext/current/models/stock/material_request">Material Request</a>
-
-</li>
-    
-    </ul>
-    
-
-
-<!-- autodoc -->
-<!-- jinja -->
-<!-- static -->
\ No newline at end of file
diff --git a/erpnext/docs/license.html b/erpnext/docs/license.html
index 6aa4e64..43d90cf 100644
--- a/erpnext/docs/license.html
+++ b/erpnext/docs/license.html
@@ -2,183 +2,689 @@
 
 <h1>GNU General Public License (v3)</h1>
 
-<h2>ERPNext License Info</h2>
-
-<p>(c) 2013 Frappe Technologies Pvt Ltd. Mumbai
-ERPNext is a trademark of Frappe Technologies</p>
-
-<p>The ERPNext code is licensed under the GNU General Public License (v3) as mentioned below and the Documentation is licensed under Creative Commons (CC-BY-SA-3.0)</p>
-
-<h2>GNU GENERAL PUBLIC LICENSE</h2>
+<h3>GNU GENERAL PUBLIC LICENSE</h3>
 
 <p>Version 3, 29 June 2007</p>
 
-<p><a href="http://www.gnu.org/copyleft/gpl.html" rel="nofollow">http://www.gnu.org/copyleft/gpl.html</a></p>
+<p>Copyright (C) 2007 Free Software Foundation, Inc.
+<a href="http://fsf.org/" rel="nofollow">http://fsf.org/</a></p>
 
-<p>TERMS AND CONDITIONS
-0. Definitions.</p>
+<p>Everyone is permitted to copy and distribute verbatim copies of this
+license document, but changing it is not allowed.</p>
 
-<p>“This License” refers to version 3 of the GNU General Public License.</p>
+<h3>Preamble</h3>
 
-<p>“Copyright” also means copyright-like laws that apply to other kinds of works, such as semiconductor masks.</p>
+<p>The GNU General Public License is a free, copyleft license for
+software and other kinds of works.</p>
 
-<p>“The Program” refers to any copyrightable work licensed under this License. Each licensee is addressed as “you”. “Licensees” and “recipients” may be individuals or organizations.</p>
+<p>The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom
+to share and change all versions of a program--to make sure it remains
+free software for all its users. We, the Free Software Foundation, use
+the GNU General Public License for most of our software; it applies
+also to any other work released this way by its authors. You can apply
+it to your programs, too.</p>
 
-<p>To “modify” a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a “modified version” of the earlier work or a work “based on” the earlier work.</p>
+<p>When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.</p>
 
-<p>A “covered work” means either the unmodified Program or a work based on the Program.</p>
+<p>To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you
+have certain responsibilities if you distribute copies of the
+software, or if you modify it: responsibilities to respect the freedom
+of others.</p>
 
-<p>To “propagate” a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well.</p>
+<p>For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.</p>
 
-<p>To “convey” a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying.</p>
+<p>Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.</p>
 
-<p>An interactive user interface displays “Appropriate Legal Notices” to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion.
-1. Source Code.</p>
+<p>For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.</p>
 
-<p>The “source code” for a work means the preferred form of the work for making modifications to it. “Object code” means any non-source form of a work.</p>
+<p>Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the
+manufacturer can do so. This is fundamentally incompatible with the
+aim of protecting users' freedom to change the software. The
+systematic pattern of such abuse occurs in the area of products for
+individuals to use, which is precisely where it is most unacceptable.
+Therefore, we have designed this version of the GPL to prohibit the
+practice for those products. If such problems arise substantially in
+other domains, we stand ready to extend this provision to those
+domains in future versions of the GPL, as needed to protect the
+freedom of users.</p>
 
-<p>A “Standard Interface” means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language.</p>
+<p>Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish
+to avoid the special danger that patents applied to a free program
+could make it effectively proprietary. To prevent this, the GPL
+assures that patents cannot be used to render the program non-free.</p>
 
-<p>The “System Libraries” of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A “Major Component”, in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it.</p>
+<p>The precise terms and conditions for copying, distribution and
+modification follow.</p>
 
-<p>The “Corresponding Source” for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work.</p>
+<h3>TERMS AND CONDITIONS</h3>
 
-<p>The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source.</p>
+<h4>0. Definitions.</h4>
 
-<p>The Corresponding Source for a work in source code form is that same work.
-2. Basic Permissions.</p>
+<p>"This License" refers to version 3 of the GNU General Public License.</p>
 
-<p>All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law.</p>
+<p>"Copyright" also means copyright-like laws that apply to other kinds
+of works, such as semiconductor masks.</p>
 
-<p>You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you.</p>
+<p>"The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.</p>
 
-<p>Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary.
-3. Protecting Users' Legal Rights From Anti-Circumvention Law.</p>
+<p>To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of
+an exact copy. The resulting work is called a "modified version" of
+the earlier work or a work "based on" the earlier work.</p>
 
-<p>No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures.</p>
+<p>A "covered work" means either the unmodified Program or a work based
+on the Program.</p>
 
-<p>When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures.
-4. Conveying Verbatim Copies.</p>
+<p>To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.</p>
+
+<p>To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user
+through a computer network, with no transfer of a copy, is not
+conveying.</p>
+
+<p>An interactive user interface displays "Appropriate Legal Notices" to
+the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.</p>
+
+<h4>1. Source Code.</h4>
+
+<p>The "source code" for a work means the preferred form of the work for
+making modifications to it. "Object code" means any non-source form of
+a work.</p>
+
+<p>A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.</p>
+
+<p>The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.</p>
+
+<p>The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.</p>
+
+<p>The Corresponding Source need not include anything that users can
+regenerate automatically from other parts of the Corresponding Source.</p>
+
+<p>The Corresponding Source for a work in source code form is that same
+work.</p>
+
+<h4>2. Basic Permissions.</h4>
+
+<p>All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.</p>
+
+<p>You may make, run and propagate covered works that you do not convey,
+without conditions so long as your license otherwise remains in force.
+You may convey covered works to others for the sole purpose of having
+them make modifications exclusively for you, or provide you with
+facilities for running those works, provided that you comply with the
+terms of this License in conveying all material for which you do not
+control copyright. Those thus making or running the covered works for
+you must do so exclusively on your behalf, under your direction and
+control, on terms that prohibit them from making any copies of your
+copyrighted material outside their relationship with you.</p>
+
+<p>Conveying under any other circumstances is permitted solely under the
+conditions stated below. Sublicensing is not allowed; section 10 makes
+it unnecessary.</p>
+
+<h4>3. Protecting Users' Legal Rights From Anti-Circumvention Law.</h4>
+
+<p>No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.</p>
+
+<p>When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such
+circumvention is effected by exercising rights under this License with
+respect to the covered work, and you disclaim any intention to limit
+operation or modification of the work as a means of enforcing, against
+the work's users, your or third parties' legal rights to forbid
+circumvention of technological measures.</p>
+
+<h4>4. Conveying Verbatim Copies.</h4>
+
+<p>You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.</p>
+
+<p>You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.</p>
+
+<h4>5. Conveying Modified Source Versions.</h4>
+
+<p>You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these
+conditions:</p>
+
+<ul>
+<li>a) The work must carry prominent notices stating that you modified
+it, and giving a relevant date.</li>
+<li>b) The work must carry prominent notices stating that it is
+released under this License and any conditions added under
+section 7. This requirement modifies the requirement in section 4
+to "keep intact all notices".</li>
+<li>c) You must license the entire work, as a whole, under this
+License to anyone who comes into possession of a copy. This
+License will therefore apply, along with any applicable section 7
+additional terms, to the whole of the work, and all its parts,
+regardless of how they are packaged. This License gives no
+permission to license the work in any other way, but it does not
+invalidate such permission if you have separately received it.</li>
+<li>d) If the work has interactive user interfaces, each must display
+Appropriate Legal Notices; however, if the Program has interactive
+interfaces that do not display Appropriate Legal Notices, your
+work need not make them do so.</li>
+</ul>
+
+<p>A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.</p>
+
+<h4>6. Conveying Non-Source Forms.</h4>
+
+<p>You may convey a covered work in object code form under the terms of
+sections 4 and 5, provided that you also convey the machine-readable
+Corresponding Source under the terms of this License, in one of these
+ways:</p>
+
+<ul>
+<li>a) Convey the object code in, or embodied in, a physical product
+(including a physical distribution medium), accompanied by the
+Corresponding Source fixed on a durable physical medium
+customarily used for software interchange.</li>
+<li>b) Convey the object code in, or embodied in, a physical product
+(including a physical distribution medium), accompanied by a
+written offer, valid for at least three years and valid for as
+long as you offer spare parts or customer support for that product
+model, to give anyone who possesses the object code either (1) a
+copy of the Corresponding Source for all the software in the
+product that is covered by this License, on a durable physical
+medium customarily used for software interchange, for a price no
+more than your reasonable cost of physically performing this
+conveying of source, or (2) access to copy the Corresponding
+Source from a network server at no charge.</li>
+<li>c) Convey individual copies of the object code with a copy of the
+written offer to provide the Corresponding Source. This
+alternative is allowed only occasionally and noncommercially, and
+only if you received the object code with such an offer, in accord
+with subsection 6b.</li>
+<li>d) Convey the object code by offering access from a designated
+place (gratis or for a charge), and offer equivalent access to the
+Corresponding Source in the same way through the same place at no
+further charge. You need not require recipients to copy the
+Corresponding Source along with the object code. If the place to
+copy the object code is a network server, the Corresponding Source
+may be on a different server (operated by you or a third party)
+that supports equivalent copying facilities, provided you maintain
+clear directions next to the object code saying where to find the
+Corresponding Source. Regardless of what server hosts the
+Corresponding Source, you remain obligated to ensure that it is
+available for as long as needed to satisfy these requirements.</li>
+<li>e) Convey the object code using peer-to-peer transmission,
+provided you inform other peers where the object code and
+Corresponding Source of the work are being offered to the general
+public at no charge under subsection 6d.</li>
+</ul>
+
+<p>A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.</p>
+
+<p>A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal,
+family, or household purposes, or (2) anything designed or sold for
+incorporation into a dwelling. In determining whether a product is a
+consumer product, doubtful cases shall be resolved in favor of
+coverage. For a particular product received by a particular user,
+"normally used" refers to a typical or common use of that class of
+product, regardless of the status of the particular user or of the way
+in which the particular user actually uses, or expects or is expected
+to use, the product. A product is a consumer product regardless of
+whether the product has substantial commercial, industrial or
+non-consumer uses, unless such uses represent the only significant
+mode of use of the product.</p>
+
+<p>"Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to
+install and execute modified versions of a covered work in that User
+Product from a modified version of its Corresponding Source. The
+information must suffice to ensure that the continued functioning of
+the modified object code is in no case prevented or interfered with
+solely because modification has been made.</p>
+
+<p>If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).</p>
 
-<p>You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program.</p>
+<p>The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or
+updates for a work that has been modified or installed by the
+recipient, or for the User Product in which it has been modified or
+installed. Access to a network may be denied when the modification
+itself materially and adversely affects the operation of the network
+or violates the rules and protocols for communication across the
+network.</p>
 
-<p>You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee.
-5. Conveying Modified Source Versions.</p>
+<p>Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.</p>
 
-<p>You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions:</p>
+<h4>7. Additional Terms.</h4>
 
-<pre><code>a) The work must carry prominent notices stating that you modified it, and giving a relevant date.
-b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to “keep intact all notices”.
-c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it.
-d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so.
-</code></pre>
+<p>"Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.</p>
 
-<p>A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an “aggregate” if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate.
-6. Conveying Non-Source Forms.</p>
+<p>When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.</p>
 
-<p>You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways:</p>
+<p>Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders
+of that material) supplement the terms of this License with terms:</p>
 
-<pre><code>a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange.
-b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge.
-c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b.
-d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements.
-e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d.
-</code></pre>
+<ul>
+<li>a) Disclaiming warranty or limiting liability differently from the
+terms of sections 15 and 16 of this License; or</li>
+<li>b) Requiring preservation of specified reasonable legal notices or
+author attributions in that material or in the Appropriate Legal
+Notices displayed by works containing it; or</li>
+<li>c) Prohibiting misrepresentation of the origin of that material,
+or requiring that modified versions of such material be marked in
+reasonable ways as different from the original version; or</li>
+<li>d) Limiting the use for publicity purposes of names of licensors
+or authors of the material; or</li>
+<li>e) Declining to grant rights under trademark law for use of some
+trade names, trademarks, or service marks; or</li>
+<li>f) Requiring indemnification of licensors and authors of that
+material by anyone who conveys the material (or modified versions
+of it) with contractual assumptions of liability to the recipient,
+for any liability that these contractual assumptions directly
+impose on those licensors and authors.</li>
+</ul>
 
-<p>A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work.</p>
+<p>All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.</p>
 
-<p>A “User Product” is either (1) a “consumer product”, which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, “normally used” refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product.</p>
+<p>If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.</p>
 
-<p>“Installation Information” for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made.</p>
+<p>Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions; the
+above requirements apply either way.</p>
 
-<p>If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM).</p>
+<h4>8. Termination.</h4>
 
-<p>The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network.</p>
+<p>You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).</p>
 
-<p>Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying.
-7. Additional Terms.</p>
+<p>However, if you cease all violation of this License, then your license
+from a particular copyright holder is reinstated (a) provisionally,
+unless and until the copyright holder explicitly and finally
+terminates your license, and (b) permanently, if the copyright holder
+fails to notify you of the violation by some reasonable means prior to
+60 days after the cessation.</p>
 
-<p>“Additional permissions” are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions.</p>
+<p>Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.</p>
 
-<p>When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission.</p>
+<p>Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.</p>
 
-<p>Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms:</p>
+<h4>9. Acceptance Not Required for Having Copies.</h4>
 
-<pre><code>a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or
-b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or
-c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or
-d) Limiting the use for publicity purposes of names of licensors or authors of the material; or
-e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or
-f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors.
-</code></pre>
+<p>You are not required to accept this License in order to receive or run
+a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.</p>
 
-<p>All other non-permissive additional terms are considered “further restrictions” within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying.</p>
+<h4>10. Automatic Licensing of Downstream Recipients.</h4>
 
-<p>If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms.</p>
+<p>Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.</p>
 
-<p>Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way.
-8. Termination.</p>
+<p>An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.</p>
 
-<p>You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11).</p>
+<p>You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.</p>
 
-<p>However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation.</p>
+<h4>11. Patents.</h4>
 
-<p>Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice.</p>
+<p>A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".</p>
 
-<p>Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10.
-9. Acceptance Not Required for Having Copies.</p>
+<p>A contributor's "essential patent claims" are all patent claims owned
+or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.</p>
 
-<p>You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so.
-10. Automatic Licensing of Downstream Recipients.</p>
+<p>Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.</p>
 
-<p>Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License.</p>
+<p>In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.</p>
 
-<p>An “entity transaction” is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts.</p>
+<p>If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.</p>
 
-<p>You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it.
-11. Patents.</p>
+<p>If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.</p>
 
-<p>A “contributor” is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's “contributor version”.</p>
+<p>A patent license is "discriminatory" if it does not include within the
+scope of its coverage, prohibits the exercise of, or is conditioned on
+the non-exercise of one or more of the rights that are specifically
+granted under this License. You may not convey a covered work if you
+are a party to an arrangement with a third party that is in the
+business of distributing software, under which you make payment to the
+third party based on the extent of your activity of conveying the
+work, and under which the third party grants, to any of the parties
+who would receive the covered work from you, a discriminatory patent
+license (a) in connection with copies of the covered work conveyed by
+you (or copies made from those copies), or (b) primarily for and in
+connection with specific products or compilations that contain the
+covered work, unless you entered into that arrangement, or that patent
+license was granted, prior to 28 March 2007.</p>
 
-<p>A contributor's “essential patent claims” are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, “control” includes the right to grant patent sublicenses in a manner consistent with the requirements of this License.</p>
+<p>Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.</p>
 
-<p>Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version.</p>
+<h4>12. No Surrender of Others' Freedom.</h4>
 
-<p>In the following three paragraphs, a “patent license” is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To “grant” such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party.</p>
+<p>If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under
+this License and any other pertinent obligations, then as a
+consequence you may not convey it at all. For example, if you agree to
+terms that obligate you to collect a royalty for further conveying
+from those to whom you convey the Program, the only way you could
+satisfy both those terms and this License would be to refrain entirely
+from conveying the Program.</p>
 
-<p>If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. “Knowingly relying” means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid.</p>
+<h4>13. Use with the GNU Affero General Public License.</h4>
 
-<p>If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it.</p>
+<p>Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.</p>
 
-<p>A patent license is “discriminatory” if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007.</p>
+<h4>14. Revised Versions of this License.</h4>
 
-<p>Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law.
-12. No Surrender of Others' Freedom.</p>
+<p>The Free Software Foundation may publish revised and/or new versions
+of the GNU General Public License from time to time. Such new versions
+will be similar in spirit to the present version, but may differ in
+detail to address new problems or concerns.</p>
 
-<p>If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program.
-13. Use with the GNU Affero General Public License.</p>
+<p>Each version is given a distinguishing version number. If the Program
+specifies that a certain numbered version of the GNU General Public
+License "or any later version" applies to it, you have the option of
+following the terms and conditions either of that numbered version or
+of any later version published by the Free Software Foundation. If the
+Program does not specify a version number of the GNU General Public
+License, you may choose any version ever published by the Free
+Software Foundation.</p>
 
-<p>Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such.
-14. Revised Versions of this License.</p>
+<p>If the Program specifies that a proxy can decide which future versions
+of the GNU General Public License can be used, that proxy's public
+statement of acceptance of a version permanently authorizes you to
+choose that version for the Program.</p>
 
-<p>The Free Software Foundation may publish revised and/or new versions of the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.</p>
+<p>Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.</p>
 
-<p>Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU General Public License “or any later version” applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation.</p>
+<h4>15. Disclaimer of Warranty.</h4>
 
-<p>If the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program.</p>
+<p>THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT
+WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND
+PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE
+DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR
+CORRECTION.</p>
 
-<p>Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version.
-15. Disclaimer of Warranty.</p>
+<h4>16. Limitation of Liability.</h4>
 
-<p>THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-16. Limitation of Liability.</p>
+<p>IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR
+CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT
+NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR
+LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM
+TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER
+PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
 
-<p>IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-17. Interpretation of Sections 15 and 16.</p>
+<h4>17. Interpretation of Sections 15 and 16.</h4>
 
-<p>If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee.</p>
+<p>If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.</p>
 
 <p>END OF TERMS AND CONDITIONS</p>
 
+<h3>How to Apply These Terms to Your New Programs</h3>
+
+<p>If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these
+terms.</p>
+
+<p>To do so, attach the following notices to the program. It is safest to
+attach them to the start of each source file to most effectively state
+the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.</p>
+
+<pre><code>    &lt;one line="" to="" give="" the="" program's="" name="" and="" a="" brief="" idea="" of="" what="" it="" does.=""&gt;
+    Copyright (C) &lt;year&gt;  &lt;name of="" author=""&gt;
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    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;.
+</code></pre>
+
+<p>Also add information on how to contact you by electronic and paper
+mail.</p>
+
+<p>If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:</p>
+
+<pre><code>    &lt;program&gt;  Copyright (C) &lt;year&gt;  &lt;name of author&gt;
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+</code></pre>
+
+<p>The hypothetical commands `show w' and `show c' should show the
+appropriate parts of the General Public License. Of course, your
+program's commands might be different; for a GUI interface, you would
+use an "about box".</p>
+
+<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>
+
+<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>
+
 
 <!-- autodoc -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/de/CRM/customer.md b/erpnext/docs/user/manual/de/CRM/customer.md
index 3ec4281..c730c68 100644
--- a/erpnext/docs/user/manual/de/CRM/customer.md
+++ b/erpnext/docs/user/manual/de/CRM/customer.md
@@ -7,9 +7,9 @@
 
 > CRM > Dokumente > Kunde > Neu
 
-oder einen Upload über ein Datenimportwerkzeug durchführen.
+<img class="screenshot" alt="Kunde" src="{{docs_base_url}}/assets/img/crm/create-customer.gif">
 
-<img class="screenshot" alt="Kunde" src="{{docs_base_url}}/assets/img/crm/customer.png">
+oder einen Upload über ein Datenimportwerkzeug durchführen.
 
 > Anmerkung: Kunden werden von Kontakten und Adressen getrennt verwaltet. Ein Kunde kann mehrere verschiedene Kontakte und Adressen haben.
 
diff --git a/erpnext/docs/user/manual/de/customize-erpnext/custom-field.md b/erpnext/docs/user/manual/de/customize-erpnext/custom-field.md
index c3bec3f..25c40e1 100644
--- a/erpnext/docs/user/manual/de/customize-erpnext/custom-field.md
+++ b/erpnext/docs/user/manual/de/customize-erpnext/custom-field.md
@@ -12,7 +12,7 @@
 
 > Einstellungen > Anpassen > Benutzerdefiniertes Feld > Neu
 
-Sie können ein neues benutzerdefiniertes Feld auch über das [Werkzeug zum Anpassen von Feldern](https://erpnext.com/customize-erpnext/customize-form) einfügen.
+Sie können ein neues benutzerdefiniertes Feld auch über das [Werkzeug zum Anpassen von Feldern]({{docs_base_url}}/user/manual/de/customize-erpnext/customize-form) einfügen.
 
 In einem benutzerdefinierten Formular finden Sie für jedes Feld die Plus(+)-Option. Wenn Sie auf dieses Symbol klicken, wird eine neue Zeile oberhalb dieses Feldes eingefügt. Sie können die Einstellungen für Ihr Feld in der neu eingefügten leeren Zeile eingeben.
 
@@ -50,7 +50,7 @@
 
 ### Optionen einstellen
 
-Wenn Sie ein Verknüpfungsfeld erstellen,dann wird der Name des DocType, mit dem dieses Feld verknüpft werden soll, in das Feld "Optionen" eingefügt. Klicken Sie [hier](https://erpnext.com/kb/customize/creating-custom-link-field) um weitere Informationen darüber zu erhalten, wie man benutzerdefinierte Verknüpfungsfelder erstellt.
+Wenn Sie ein Verknüpfungsfeld erstellen,dann wird der Name des DocType, mit dem dieses Feld verknüpft werden soll, in das Feld "Optionen" eingefügt. Klicken Sie [hier]({{docs_base_url}}/user/manual/en/customize-erpnext/articles/creating-custom-link-field) um weitere Informationen darüber zu erhalten, wie man benutzerdefinierte Verknüpfungsfelder erstellt.
 
 ![Verknüpfung mit einem benutzerdefinierten Feld]({{docs_base_url}}/assets/old_images/erpnext/custom-field-link.png)
 
diff --git a/erpnext/docs/user/manual/de/customize-erpnext/customize-form.md b/erpnext/docs/user/manual/de/customize-erpnext/customize-form.md
index cd83533..dbb9bc5 100644
--- a/erpnext/docs/user/manual/de/customize-erpnext/customize-form.md
+++ b/erpnext/docs/user/manual/de/customize-erpnext/customize-form.md
@@ -71,7 +71,7 @@
     </tr>
     <tr>
       <td>Feldtyp</td>
-      <td>Klicken Sie <a href="https://erpnext.com/kb/customize/field-types">hier</a> um mehr über Feldtypen zu erfahren.</td>
+      <td>Klicken Sie <a href="{{docs_base_url}}/user/manual/en/customize-erpnext/articles/field-types">hier</a> um mehr über Feldtypen zu erfahren.</td>
     </tr>
     <tr>
       <td>Optionen</td>
diff --git a/erpnext/docs/user/manual/en/CRM/customer.md b/erpnext/docs/user/manual/en/CRM/customer.md
index 88f9e66..55755e6 100644
--- a/erpnext/docs/user/manual/en/CRM/customer.md
+++ b/erpnext/docs/user/manual/en/CRM/customer.md
@@ -9,9 +9,13 @@
 
 > Selling > Customer
 
+<img class="screenshot" alt="Create Customer" src="{{docs_base_url}}/assets/img/crm/create-customer.gif">
+
 or upload it via the Data Import Tool.
 
-<img class="screenshot" alt="Customer" src="{{docs_base_url}}/assets/img/crm/customer.png">
+A Customer can avail the features (operations) in the selling process. The general flow can be summarazed as:
+
+<img class="screenshot" alt="Customer" src="{{docs_base_url}}/assets/img/crm/customer-to selling-flowchart.jpeg">
 
 > Note: Customers are separate from Contacts and Addresses. A Customer can
 have multiple Contacts and Addresses.
@@ -53,7 +57,7 @@
 master. Classifying Customers
 
 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/CRM/setup/territory.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
 help you set sales targets for the respective territories.
diff --git a/erpnext/docs/user/manual/en/CRM/opportunity.md b/erpnext/docs/user/manual/en/CRM/opportunity.md
index 9f44fdf..9248fb2 100644
--- a/erpnext/docs/user/manual/en/CRM/opportunity.md
+++ b/erpnext/docs/user/manual/en/CRM/opportunity.md
@@ -1,5 +1,5 @@
 When you know a Lead is looking for some products or services to buy, you can
-track that as an Opportunity.
+track that as an Opportunity. Also opportunity document helps user to collect the requirement of a customer/lead.
 
 You can create an Opportunity from:
 
@@ -17,11 +17,21 @@
 
 <img class="screenshot" alt="Opportunity" src="{{docs_base_url}}/assets/img/crm/lead-to-opportunity.png">
 
+#### Figure 3: Create Opportunity for Customer to Collect their Requirement
+
+<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.
+
+<img class="screenshot" alt="Opportunity" src="{{docs_base_url}}/assets/img/crm/make-sq-from-opportunity.png">
+
 > Best Practice: Leads and Opportunities are often referred as your “Sales
 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
diff --git a/erpnext/docs/user/manual/en/CRM/setup/sales-person.md b/erpnext/docs/user/manual/en/CRM/setup/sales-person.md
index 114003b..ce5ed93 100644
--- a/erpnext/docs/user/manual/en/CRM/setup/sales-person.md
+++ b/erpnext/docs/user/manual/en/CRM/setup/sales-person.md
@@ -8,7 +8,7 @@
 ####Sales Person in Transactions
 
 You can use this Sales Person in Customer and sales transactions like Sales Order, Delivery Note and Sales Invoice.
-Click [here](https://erpnext.com/kb/selling/managing-sales-persons-in-sales-transactions) to learn more 
+Click [here]({{docs_base_url}}/user/manual/en/selling/articles/sales-persons-in-the-sales-transactions) to learn more 
 about how Sales Persons are used in the transactions of Sales Cycle.
 
-{next}
\ No newline at end of file
+{next}
diff --git a/erpnext/docs/user/manual/en/accounts/articles/adjust-withhold-amount-payment-entry.md b/erpnext/docs/user/manual/en/accounts/articles/adjust-withhold-amount-payment-entry.md
new file mode 100644
index 0000000..d469b28
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/adjust-withhold-amount-payment-entry.md
@@ -0,0 +1,37 @@
+#Adjust Withhold Amount in the Payment Entry
+
+###Question
+
+Let's assume that outstanding against a Sales Invoice is 20,000. When client makes payment, they will only pay 19,600. Rest 400 will be booked under Withhold account. How to manage this scenario in the Payment Entry.
+
+###Answer
+
+In the Payment Entry, you can mention Withhold Account in the Deductions or Loss table. Detailed steps below.
+
+####Step 1: Setup Withhold Account
+
+Create a Withhold Account in your Chart of Accounts master.
+
+`Accounts > Chart of Accounts'
+
+####Step 2: Payment Entry
+
+To create Payment Entry, go to unpaid Sales Invoice and create click on Make Payment button.
+
+#####Step 2.1: Enter Payment Amount
+
+Enter Payment Amount as 19,600.
+
+<img alt="Sales Invoice Payment Amount" class="screenshot" src="{{docs_base_url}}/assets/img/articles/withhold-1.png">
+
+#####Step 2.2: Allocate Against Sales Invoice
+
+Against Sales Invoice, allocate 20,000 (explained in GIF below).
+
+#####Step 2.3: Add Deduction/Loss Account
+
+You can notice that there is a difference of 400 in the Payment Amount and the Amount Allocated against Sales Invoice. You can book this difference account under Withhold Account.
+
+<img alt="Deduction/Loss Account" class="screenshot" src="{{docs_base_url}}/assets/img/articles/withhold-2.gif">
+
+ Following same steps, you can also manage difference availed due to Currency Exchange Gain/Loss.
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/index.txt b/erpnext/docs/user/manual/en/accounts/articles/index.txt
index c2fbf70..77474bd 100644
--- a/erpnext/docs/user/manual/en/accounts/articles/index.txt
+++ b/erpnext/docs/user/manual/en/accounts/articles/index.txt
@@ -11,4 +11,5 @@
 update-stock-option-in-sales-invoice
 what-is-the-differences-of-total-and-valuation-in-tax-and-charges
 withdrawing-salary-from-owners-equity-account
+adjust-withhold-amount-payment-entry
 c-form
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/chart-of-accounts.md b/erpnext/docs/user/manual/en/accounts/chart-of-accounts.md
index 99760e7..ae6847e 100644
--- a/erpnext/docs/user/manual/en/accounts/chart-of-accounts.md
+++ b/erpnext/docs/user/manual/en/accounts/chart-of-accounts.md
@@ -19,10 +19,19 @@
 be worth the effort. You can also take the help of your accountant to setup
 your Chart of Accounts.
 
-Financial statement of your company is easily viewable in ERPNext. An Example
-of a financial statement is given below:
+Financial statements for your company are easily viewable in ERPNext. You can view financial statements
+such as  Balance Sheet, Profit and Loss statement and Cash flow statement.
 
-<img class="screenshot" alt="Financial Analytics Balance Sheet" src="{{docs_base_url}}/assets/img/accounts/financial-analytics-bl.png">
+An Example of various financial statement are given below:
+
+#### Cash Flow Report
+<img class="screenshot" alt="Cash Flow Report" src="{{docs_base_url}}/assets/img/accounts/cash_flow_report.png">
+
+#### Profit and Loss Report
+<img class="screenshot" alt="Profit and Loss Report" src="{{docs_base_url}}/assets/img/accounts/profit_n_loss_report.png">
+
+#### Balance Sheet Report
+<img class="screenshot" alt="Balance Sheet Report" src="{{docs_base_url}}/assets/img/accounts/balance_sheet_report.png">
 
 To edit your Chart of Accounts in ERPNext go to:
 
diff --git a/erpnext/docs/user/manual/en/accounts/index.txt b/erpnext/docs/user/manual/en/accounts/index.txt
index d7c405a..6ba9337 100644
--- a/erpnext/docs/user/manual/en/accounts/index.txt
+++ b/erpnext/docs/user/manual/en/accounts/index.txt
@@ -3,6 +3,7 @@
 sales-invoice
 point-of-sale-pos-invoice
 purchase-invoice
+payments
 journal-entry
 payment-entry
 multi-currency-accounting
diff --git a/erpnext/docs/user/manual/en/accounts/journal-entry.md b/erpnext/docs/user/manual/en/accounts/journal-entry.md
index 68ba22a..061bd62 100644
--- a/erpnext/docs/user/manual/en/accounts/journal-entry.md
+++ b/erpnext/docs/user/manual/en/accounts/journal-entry.md
@@ -68,4 +68,44 @@
 > Note: There may be regulations in your country that define by how much
 amount you can depreciate a class of Assets.
 
+#### Credit Note
+
+"Credit Note" is made for a Customer against a Sales Invoice when the 
+company needs to adjust a payment for returned goods. When a Credit Note
+is made, the seller can either make a payment to the customer or adjust 
+the amount in another invoice.
+
+  * Debit: Sales Return Account
+  * Credit: Customer Account
+  
+#### Debit Note
+
+"Debit Note" is made for a Supplier against a Purchase Invoice or accepted 
+as a credit note from supplier when a company returns goods. When a Debit
+Note is made, the company can either receive a payment from the supplier or 
+adjust the amount in another invoice.
+
+  * Debit: Supplier Account
+  * Credit: Purchase Return Account 
+
+#### Excise Entry
+
+When a Company buys good from a Supplier, company pays excise duty
+on these goods to Supplier. And when a company sells these goods to Customers, 
+it receives excise duty. Company will deduct payable excise duty and deposit balance 
+in Govt. account.
+
+  * When a Company buys goods with Excise duty: 
+    * Debit: Purchase Account
+    * Debit: Excise Duty Account
+	* Credit: Supplier Account
+	
+  * When a Company sells goods with Excise duty: 
+    * Debit: Customer Account
+    * Credit: Sales Account
+	* Credit: Excise Duty Account
+
+> Note: Applicable in India, might not be applicable for your Country. 
+Please check your country regulations.
+
 {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 f8dbe1d..8eefe7f 100644
--- a/erpnext/docs/user/manual/en/accounts/managing-fixed-assets.md
+++ b/erpnext/docs/user/manual/en/accounts/managing-fixed-assets.md
@@ -62,7 +62,7 @@
 On submission of the invoice, the "Fixed Asset Account" will be debited and payable account will be credited. It also updates purchase date, supplier and Purchase Invoice no. in the Asset master.
 
 
-## Sale an Asset
+## Sell an Asset
 
 To sale an asset, open the asset record and create a Sales Invoice by clicking on "Sale Asset". On submission of the Sales Invoice, following entries will take place:
 
diff --git a/erpnext/docs/user/manual/en/accounts/payments.md b/erpnext/docs/user/manual/en/accounts/payments.md
new file mode 100644
index 0000000..881d366
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/payments.md
@@ -0,0 +1,48 @@
+Payment can be made against following transactions.
+
+  1. Sales Invoice.
+  2. Purchase Invoice.
+  3. Sales Order (Advance Payment)
+  4. Purchase Order (Advance Payment)
+  
+In ERPNext, there is two options through which user can capture the payment
+
+  1. Payment Entry(Default).
+  2. Journal Entry.
+  
+## Payment Entry
+
+####Step 1: Make Payment
+
+On submitting a document against which Payment Entry can be made, you will find Make Payment button.
+
+<img class="screenshot" alt="Making Payment" src="{{docs_base_url}}/assets/img/accounts/payment-entry-1.png">
+
+####Step 2: Payment Entry
+
+<img class="screenshot" alt="Making Payment" src="{{docs_base_url}}/assets/img/accounts/payment-entry-9.png">
+
+For more details about payment entry [check here.]({{docs_base_url}}/user/manual/en/accounts/payment-entry)
+
+## Journal Entry
+
+To make paymant using journal entry, check below steps
+
+####Step 1: Activate Payment via Journal Entry
+
+Goto Accounts Settings > checked Make Payment via Journal Entry
+
+<img class="screenshot" alt="Making Payment" src="{{docs_base_url}}/assets/img/accounts/account-settings.png">
+
+####Step 2: Make Payment
+
+On submitting a document against which Journal Entry can be made, you will find Make Payment button.
+
+<img class="screenshot" alt="Making Payment" src="{{docs_base_url}}/assets/img/accounts/payment-entry-1.png">
+
+####Step 3: Journal Entry
+
+Save and submit the journal entry to record the payament against the invoice
+<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)
diff --git a/erpnext/docs/user/manual/en/accounts/point-of-sale-pos-invoice.md b/erpnext/docs/user/manual/en/accounts/point-of-sale-pos-invoice.md
index 6a697b1..64fa22c 100644
--- a/erpnext/docs/user/manual/en/accounts/point-of-sale-pos-invoice.md
+++ b/erpnext/docs/user/manual/en/accounts/point-of-sale-pos-invoice.md
@@ -69,6 +69,25 @@
 Submit the document to finalise the record. After the document is submitted,
 you can either print or email it directly to the customer.
 
+### Write off Amount
+
+Outstanding amount can be write off from the POS, user has to enter the amount under write off field on the payment screen.
+
+<img class="screenshot" alt="POS Payment" src="{{docs_base_url}}/assets/img/accounts/write-off.png">
+
+System books the write off amount into the ledger which has selected on the POS Profile.
+
+### Change Amount
+
+POS calculate the extra amount paid by the customer, which user can return from the cash account. User has to set the account for the change amount on the POS profile.
+
+<img class="screenshot" alt="POS Payment" src="{{docs_base_url}}/assets/img/accounts/change-amount.png">
+
+### Offline Records
+All the records from the POS stores into the browser's local storegae and sync submitted records after every minute of the interval if system is connected to internet. User can view the offline records by clicking on Menu > View Offline Records
+
+<img class="screenshot" alt="POS Payment" src="{{docs_base_url}}/assets/img/accounts/offline-records.png">
+
 #### Accounting entries (GL Entry) for a Point of Sale:
 
 Debits:
@@ -82,6 +101,7 @@
   * Taxes (liabilities to be paid to the government)
   * Customer (payment)
   * Write Off (optional)
+  * Account for Change Amount (optional)
 
 To see entries after “Submit”, click on “View Ledger”.
 
diff --git a/erpnext/docs/user/manual/en/accounts/pricing-rule.md b/erpnext/docs/user/manual/en/accounts/pricing-rule.md
index 7afcbea..bd3c51a 100644
--- a/erpnext/docs/user/manual/en/accounts/pricing-rule.md
+++ b/erpnext/docs/user/manual/en/accounts/pricing-rule.md
@@ -79,4 +79,31 @@
 
 <img alt="Disable" class="screenshot" src="{{docs_base_url}}/assets/img/articles/pricing-rule-disable.png">
 
+### Add Margin
+
+Using pricing rule user can add margin on the sales transactions
+
+For example :  User want to add 10% margin on the supplier price list at the time of sales
+
+####1. Make Price List
+
+Create price list for supllier and create item price against the price list.
+
+<img alt="Disable" class="screenshot" src="{{docs_base_url}}/assets/img/articles/price-list.png">
+
+
+####2. Make Pricing Rule 
+
+Create pricing rule for the item against which supplier rate has created
+
+<img alt="Disable" class="screenshot" src="{{docs_base_url}}/assets/img/articles/pricing-rule-margin.png">
+
+####2. Make Invoice
+
+System apply the margin rate on the item price on selection of an item.
+
+<img alt="Disable" class="screenshot" src="{{docs_base_url}}/assets/img/articles/pricing-rule-invoice.png">
+
+For more details about pricing rule [Click Here]({{docs_base_url}}/user/manual/en/selling/articles/adding-margin.html)
+
 <!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/sales-invoice.md b/erpnext/docs/user/manual/en/accounts/sales-invoice.md
index f9a453e..e68d2c7 100644
--- a/erpnext/docs/user/manual/en/accounts/sales-invoice.md
+++ b/erpnext/docs/user/manual/en/accounts/sales-invoice.md
@@ -2,9 +2,9 @@
 
 You can create a Sales Invoice directly from
 
-> Accounting > Documents > Sales Invoice > New Sales Invoice
+> Accounts > Billing > Sales Invoice > New Sales Invoice
 
-or Click on Make Invoice at the right hand corner of the Delivery Note.
+or you can Make a new Sales Invoice after you submit the Delivery Note.
 
 <img class="screenshot" alt="Sales Invoice" src="{{docs_base_url}}/assets/img/accounts/sales-invoice.png">
 
@@ -54,6 +54,25 @@
 ERPNext will automatically create new Invoices and mail it to the email ids
 you set.
 
+#### POS Invoices
+
+Consider a scenario where retail transaction is carried out. For e.g: A retail shop.
+If you check the **Is POS** checkbox, then all your **POS Profile** data is fetched
+into the Sales Invoice and you can easily make payments.
+Also, if you check the **Update Stock** the stock will also update automatically,
+without the need of a Delivery Note.
+
+<img class="screenshot" alt="POS Invoice" src="{{docs_base_url}}/assets/img/accounts/pos-sales-invoice.png">
+
+#### Billing Timesheet with Project
+
+If you want to bill employees working on Projects on hourly basis (contract based),
+they can fill out Timesheets which consists their billing rate. When you make a new
+Sales Invoice, select the Project for which the billing is to be made, and the
+corresponding Timesheet entries for that Project will be fetched.
+
+<img class="screenshot" alt="POS Invoice" src="{{docs_base_url}}/assets/img/accounts/billing-timesheet-sales-invoice.png">
+
 * * *
 
 #### "Pro Forma" Invoice
@@ -70,5 +89,4 @@
 ERPNext) titled as “Pro Forma Invoice”. This way everyone is happy.
 
 This is a fairly common practice. We follow this at Frappe too.
-
 {next}
diff --git a/erpnext/docs/user/manual/en/accounts/setup/accounts-settings.md b/erpnext/docs/user/manual/en/accounts/setup/accounts-settings.md
index 5242b39..e920b65 100644
--- a/erpnext/docs/user/manual/en/accounts/setup/accounts-settings.md
+++ b/erpnext/docs/user/manual/en/accounts/setup/accounts-settings.md
@@ -7,4 +7,8 @@
 
 * Credit Controller: Role that is allowed to submit transactions that exceed credit limits set.
 
+* Make Payment via Journal Entry: If checked, on invoice if uer has clicked on payment system open the journal entry else payment entry
+
+* Unlink Payment on Cancellation of Invoice: If checked system inlink the payment against the invoice else shows the link error.
+
 {next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/setup/fiscal-year.md b/erpnext/docs/user/manual/en/accounts/setup/fiscal-year.md
index 618d20b..4a1195a 100644
--- a/erpnext/docs/user/manual/en/accounts/setup/fiscal-year.md
+++ b/erpnext/docs/user/manual/en/accounts/setup/fiscal-year.md
@@ -18,6 +18,11 @@
 income will be for that year, and can adjust their expenses to maintain their
 desired profit margins.
 
+To set the Fiscal Year as default, click on the 'Default' button.
+
+In case you have multiple companies sharing the same Fiscal Year, you can add
+it into the grid as shown below.
+
 <img class="screenshot" alt="Fiscal Year" src="{{docs_base_url}}/assets/img/accounts/fiscal-year.png">
 
 {next}
diff --git a/erpnext/docs/user/manual/en/buying/purchase-order.md b/erpnext/docs/user/manual/en/buying/purchase-order.md
index e7f2429..89bb6d9 100644
--- a/erpnext/docs/user/manual/en/buying/purchase-order.md
+++ b/erpnext/docs/user/manual/en/buying/purchase-order.md
@@ -7,7 +7,7 @@
 
 #### Purchase Order Flow Chart
 
-![Purchase Order]({{docs_base_url}}/assets/old_images/erpnext/purchase-order-f.jpg)
+![Purchase Order]({{docs_base_url}}/assets/img/buying/buying_flow.png)
 
 In ERPNext, you can also make a Purchase Order directly by going to:
 
@@ -39,6 +39,12 @@
 government is only the difference between what you collect from your Customer
 and what you pay to your Supplier. This is called Value Added Tax (VAT).
 
+#### Add Taxes in Purchase Order
+<img class="screenshot" alt="Purchase Order" src="{{docs_base_url}}/assets/img/buying/add_taxes_to_doc.png">
+
+#### Show Tax break-up
+<img class="screenshot" alt="Purchase Order" src="{{docs_base_url}}/assets/img/buying/show_tax_breakup.png">
+
 For example you buy Items worth X and sell them for 1.3X. So your Customer
 pays 1.3 times the tax you pay your Supplier. Since you have already paid tax
 to your Supplier for X, what you owe your government is only the tax on 0.3X.
@@ -49,7 +55,7 @@
 effect. Please contact your accountant if you need more help or post a query
 on our forums!
 
-  
+
 
 #### Purchase UOM and Stock UOM Conversion
 
@@ -82,5 +88,5 @@
 
 __Step 6:__ Save and Submit the Form.
 
-  
+
 {next}
diff --git a/erpnext/docs/user/manual/en/buying/supplier-quotation.md b/erpnext/docs/user/manual/en/buying/supplier-quotation.md
index 0f1d51a..868a297 100644
--- a/erpnext/docs/user/manual/en/buying/supplier-quotation.md
+++ b/erpnext/docs/user/manual/en/buying/supplier-quotation.md
@@ -8,7 +8,7 @@
 
 #### Supplier Quotation Flow-Chart
 
-![Supplier Quotation]({{docs_base_url}}/assets/old_images/erpnext/supplier-quotation-f.jpg)
+![Supplier Quotation]({{docs_base_url}}/assets/img/buying/buying_flow.png)
 
 You can also make a Supplier Quotation directly from:
 
@@ -23,11 +23,22 @@
 many cases, especially if you have centralized buying, you may want to record
 all the quotes so that
 
-  * You can easily compare prices in the future 
+  * You can easily compare prices in the future
   * Audit whether all Suppliers were given the opportunity to quote.
 
 Supplier Quotations are not necessary for most small businesses. Always
 evaluate the cost of collecting information to the value it really provides!
 You could only do this for high value items.
 
+#### Taxes
+If your Supplier is going to charge you additional taxes or charge like a shipping or insurance charge, you can add it here. It will help you to accurately track your costs. Also, if some of these charges add to the value of the product you will have to mention them in the Taxes table. You can also use templates for your taxes. For more information on setting up your taxes see the Purchase Taxes and Charges Template.
+
+You can select relevant tax by going to "Taxes and Charges" section and adding an entry to the table as shown below,
+
+<img class="screenshot" alt="Supplier Quotation" src="{{docs_base_url}}/assets/img/buying/add_taxes_to_doc.png">
+
+Besides, in case of multiple items you can keep track of taxes on each by clicking "Show tax break-up"
+
+<img class="screenshot" alt="Supplier Quotation" src="{{docs_base_url}}/assets/img/buying/show_tax_breakup.png">
+
 {next}
diff --git a/erpnext/docs/user/manual/en/buying/supplier.md b/erpnext/docs/user/manual/en/buying/supplier.md
index 45ec6b1..89107db 100644
--- a/erpnext/docs/user/manual/en/buying/supplier.md
+++ b/erpnext/docs/user/manual/en/buying/supplier.md
@@ -2,7 +2,7 @@
 
 You can create a new Supplier from:
 
-`Buying > Documents > Supplier > New Supplier`
+`Explore > Supplier > New Supplier`
 
 <img class="screenshot" alt="Supplier Master" src="{{docs_base_url}}/assets/img/buying/supplier-master.png">
 
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/custom-field.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-field.md
index 6410c77..92c5224 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/custom-field.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-field.md
@@ -44,7 +44,9 @@
 
 <img alt="Select Document Type" class="screenshot" src="{{docs_base_url}}/assets/img/customize/custom-field-5.png">
 
-For other field types like Data, Date, Currency, Option field will be left blank.
+For Data field, Option can be set to "Email" or "Phone" and the field will be validated accordingly.
+
+For other field types like Date, Currency, Option field will be left blank.
 
 ####Set More Properties
 
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/hiding-modules-and-features.md b/erpnext/docs/user/manual/en/customize-erpnext/hiding-modules-and-features.md
index 85123f9..ce8a1c3 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/hiding-modules-and-features.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/hiding-modules-and-features.md
@@ -1,15 +1,4 @@
-As you have seen from this manual that ERPNext contains tons of features which you may not use. We have observed that most users start with using 20% of the features, though a different 20%. To hide fields belonging to features you
-dont require, go to:
-
-`Setup > Customize > Features Setup`
-
-<img alt="Hide Features" class="screenshot" src="{{docs_base_url}}/assets/img/customize/feature-setup.png">
-
-Check the features you want to use. The features which are not checked, relevant fields will get hidden from the forms.
-
-* * *
-
-### Hiding Module Icons
+# Hiding Module Icons
 
 To hide modules (icons) from the home page, go to:
 
diff --git a/erpnext/schools/doctype/scheduling_tool/__init__.py b/erpnext/docs/user/manual/en/fleet_management/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/scheduling_tool/__init__.py
copy to erpnext/docs/user/manual/en/fleet_management/__init__.py
diff --git a/erpnext/docs/user/manual/en/fleet_management/index.md b/erpnext/docs/user/manual/en/fleet_management/index.md
new file mode 100644
index 0000000..8ae3b7c
--- /dev/null
+++ b/erpnext/docs/user/manual/en/fleet_management/index.md
@@ -0,0 +1,64 @@
+Fleet Management module 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:
+
+ERPNext > 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/fleet-management/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/fleet-management/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/fleet-management/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:
+
+ERPNext > 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/fleet-management/vehicle-log-2.1.png">
+
+* Enter Refuelling details,Service details if applicable.
+
+	<img class="screenshot" alt="Vehicle Log" src="{{docs_base_url}}/assets/img/fleet-management/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/fleet-management/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/fleet-management/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/fleet-management/vehicle-expenses.png">
diff --git a/erpnext/docs/user/manual/en/fleet_management/index.txt b/erpnext/docs/user/manual/en/fleet_management/index.txt
new file mode 100644
index 0000000..2da8e7b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/fleet_management/index.txt
@@ -0,0 +1,3 @@
+Vehicle
+Vehicle Log
+Vehicle Expenses
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/articles/employees-loan-management.md b/erpnext/docs/user/manual/en/human-resources/articles/employees-loan-management.md
index fddab31..d5c4d00 100644
--- a/erpnext/docs/user/manual/en/human-resources/articles/employees-loan-management.md
+++ b/erpnext/docs/user/manual/en/human-resources/articles/employees-loan-management.md
@@ -10,7 +10,7 @@
       
 #### 1.1  Employee Loan Account
 
-Create Group as 'Employees Loans' under Current Assets and create employee loan A/C (Ledger) under it. [Check this link for new account creation](https://erpnext.com/kb/setup/managing-tree-structure-masters)
+Create Group as 'Employees Loans' under Current Assets and create employee loan A/C (Ledger) under it. [Check this link for new account creation]({{docs_base_url}}/user/manual/en/setting-up/articles/managing-tree-structure-masters)
 
 ![CoA]({{docs_base_url}}/assets/img/articles/Selection_433.png)
 
@@ -52,4 +52,4 @@
 
 ![Loan Reco]({{docs_base_url}}/assets/img/articles/Selection_439.png)
 
-<!-- markdown -->
\ No newline at end of file
+<!-- markdown -->
diff --git a/erpnext/docs/user/manual/en/human-resources/daily-work-summary.md b/erpnext/docs/user/manual/en/human-resources/daily-work-summary.md
new file mode 100644
index 0000000..d3ba22a
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/daily-work-summary.md
@@ -0,0 +1,15 @@
+# Daily Work Summary
+
+Daily Work Summary is way to get a automated way to get a summary of work done by all employees in a company. Once you set it up, each active Employee of the Company gets an email asking them what did they work on during the day.
+
+Replies of all employees who choose to respond is collected and sent as a summary at midnight. Emails are only sent based on the Holiday List setup in the Company or Employee master.
+
+*Note:* You must have one active incoming email account setup for this to work.
+
+### How to Use
+
+Go to "Daily Work Summary Settings" via HR module or search bar and set the company for which you want to activate this feature.
+
+You can also choose to Customize the Message you send to your employees:
+
+<img class="screenshot" alt="Department" src="{{docs_base_url}}/assets/img/human-resources/department.png">
diff --git a/erpnext/docs/user/manual/en/human-resources/index.txt b/erpnext/docs/user/manual/en/human-resources/index.txt
index 33ee4bb..2543b4b 100644
--- a/erpnext/docs/user/manual/en/human-resources/index.txt
+++ b/erpnext/docs/user/manual/en/human-resources/index.txt
@@ -12,4 +12,5 @@
 setup
 holiday-list
 human-resource-setup
+daily-work-summary
 articles
diff --git a/erpnext/docs/user/manual/en/human-resources/salary-and-payroll.md b/erpnext/docs/user/manual/en/human-resources/salary-and-payroll.md
index 62933df..48ff96b 100644
--- a/erpnext/docs/user/manual/en/human-resources/salary-and-payroll.md
+++ b/erpnext/docs/user/manual/en/human-resources/salary-and-payroll.md
@@ -16,9 +16,9 @@
 Salary structures are used to help organizations:
   1. Maintain pay levels that are competitive with the external labor market,
   2. Maintain internal pay relationships among jobs,
-  3. Recognize and reward differences in level of responsibility, skill, and performance, and manage pay expenditures.
+  3. Recognize and reward differences in the level of responsibility, skill, and performance, and manage pay expenditures.
 
-The usual components of the salary structure (in india) include:
+The usual components of the salary structure (in India) include:
 
 __Basic Salary:__ It is the taxable base income and generally not more than 40% of CTC.
 
@@ -32,7 +32,7 @@
 
 __PF:__ Fund collected during emergency or old age. 12% of the basic salary is automatically deducted and goes to the employee provident fund.
 
-__Medical Allowance:__ The employer pays the employee for the medical expenditures incurred. It is tax free up to Rs.15,000.
+__Medical Allowance:__ The employer pays the employee for the medical expenditures incurred. It is tax-free up to Rs.15,000.
 
 __Bonus:__ Taxable part of the CTC, usually a once a year lump sum amount, given to the employee based on the individual’s as well as the organizational performance for the year.
 
@@ -81,6 +81,12 @@
   * Only Formula  
   * Only Amount
   
+#### Figure 1.5:Account Details
+
+<img class="screenshot" alt="Salary Structure" src="{{docs_base_url}}/assets/img/human-resources/salary-structure-account.png">  
+
+  * Select Mode of Payment and Payment Account for the Salary Slips which will be generated using this Salary Structure
+  
 Save the Salary Structure.
 
 In conditions and formulas, 
@@ -128,8 +134,10 @@
 In Process Payroll,
 
   1. Select the Company for which you want to create the Salary Slips.
-  2. Select the Month and the Year for which you want to create the Salary Slips.
-  3. Click on “Create Salary Slips”. This will create Salary Slip records for each active Employee for the month selected. If the Salary Slips are created, the system will not create any more Salary Slips. All updates will be shown in the “Activity Log” section.
+  2. Check "Salary Slip based on Timesheet" if you want to process timesheet based Salary Slips.
+  3. Select the From Date and To Date or Fiscal year and month for which you want to create the Salary Slips.
+  3. Select the Payment Account.
+  3. Click on “Create Salary Slips”. This will create Salary Slip records for each active Employee for the time period selected. If the Salary Slips are created, the system will not create any more Salary Slips. All updates will be shown in the “Activity Log” section.
   4. Once all Salary Slips are created, you can check if they are created correctly or edit it if you want to deduct Leave Without Pay (LWP).
   5. After checking, you can “Submit” them all together by clicking on “Submit Salary Slips”. 1. If you want them to be automatically emailed to the Employee, make sure to check the “Send Email” box.
 
@@ -144,12 +152,19 @@
 with access to the company’s accounts will not have access to the individual
 salaries.
 
-The salary payment entry is a Journal Entry entry that debits the total
-salary of all Employees to the Salary Account and credits the company’s bank
-Account.
+The salary payment entry is a Journal Entry that debits the total of the
+earning type salary component and credits the total of deduction type salary 
+component of all Employees to the default account set at Salary Component level 
+for each component.
 
 To generate your salary payment voucher from Process Payroll, click on
-“Make Bank Voucher” and a new Journal Entry with the total salaries will be
+“Make Bank Entry”. It will ask to enter the Bank Transaction Reference Number and date.
+Click on "Make" and a new Journal Entry with the total salary components will be
 created.
 
+#### Figure 3.1: Make Bank Entry
+
+<img class="screenshot" alt="Process Payroll" src="{{docs_base_url}}/assets/img/human-resources/bank-entry.png">
+
+
 {next}
diff --git a/erpnext/docs/user/manual/en/introduction/getting-started-with-erpnext.md b/erpnext/docs/user/manual/en/introduction/getting-started-with-erpnext.md
index 677d65e..7e783f6 100644
--- a/erpnext/docs/user/manual/en/introduction/getting-started-with-erpnext.md
+++ b/erpnext/docs/user/manual/en/introduction/getting-started-with-erpnext.md
@@ -30,6 +30,6 @@
 
 ### 4\. Install ERPNext on your Unix/Linux/Mac machine
 
-If you are familiar to installing applications on *nix platforms, read the instructions on how to install using [Frappe Bench](https://github.com/frappe/bench).
+If you are familiar with installing applications on *nix platforms, read the instructions on how to install using [Frappe Bench](https://github.com/frappe/bench).
 
 {next}
diff --git a/erpnext/docs/user/manual/en/manufacturing/bill-of-materials.md b/erpnext/docs/user/manual/en/manufacturing/bill-of-materials.md
index 34d8530..91bf7ed 100644
--- a/erpnext/docs/user/manual/en/manufacturing/bill-of-materials.md
+++ b/erpnext/docs/user/manual/en/manufacturing/bill-of-materials.md
@@ -31,6 +31,11 @@
 
 <img class="screenshot" alt="Update Cost" src="{{docs_base_url}}/assets/img/manufacturing/bom-update-cost.png">
 
+* User can select the currency in the BOM 
+* System calculates the costing based on the price list currency
+
+<img class="screenshot" alt="Update Cost" src="{{docs_base_url}}/assets/img/manufacturing/price-list-based-currency-bom.png">
+
 ### Materials Required(exploded) 
 
 This table lists down all the Material required for the Item to be Manufactured.
diff --git a/erpnext/docs/user/manual/en/manufacturing/production-order.md b/erpnext/docs/user/manual/en/manufacturing/production-order.md
index 1720db9..2f0fef3 100644
--- a/erpnext/docs/user/manual/en/manufacturing/production-order.md
+++ b/erpnext/docs/user/manual/en/manufacturing/production-order.md
@@ -1,3 +1,4 @@
+<img class="screenshot" alt="Production Order" src="{{docs_base_url}}/assets/img/manufacturing/manufacturing-flow.png">
 Production Order (also called as Work Order) is a document that is given to
 the manufacturing shop floor by the Production Planner as a signal to produce
 a certain quantity of a certain Item. Production Order also helps to generate
@@ -45,7 +46,7 @@
 * Once you have submitted your Production Order, you need to Transfer the Raw Materials to initiate the Manufacturing Process.
 * This will create a Stock Entry with all the Items required to complete this Production Order to be added to the WIP Warehouse. (this will add sub-Items with BOM as one Item or explode their children based on your setting above).
 
-* Click on 'Transfer Materials for Manufacturing'.
+* Click on 'Start'.
 
 <img class="screenshot" alt="Transfer Materials" src="{{docs_base_url}}/assets/img/manufacturing/PO-material-transfer.png">
 
@@ -63,18 +64,18 @@
 
 ### Making Time Logs
 
-* Progress in the Production Order can be tracked using [Time Log]({{docs_base_url}}/user/manual/en/projects/time-log.html)
-* Time Logs are created against Production Order Operations.
-* Drafts of Time Logs are also created based on the scheduled operations when an Production Order is Submitted.
-* To create more Time Logs against an operation select 'Make TIme Log' in the respective operation.
+* Progress in the Production Order can be tracked using [Timesheet]({{docs_base_url}}/user/manual/en/projects/timesheet/timesheet-against-production-order.html)
+* Timesheet's time slots are created against Production Order Operations.
+* Drafts of Timesheet is created based on the scheduled operations when an Production Order is Submitted.
+* To create more Timesheet against an operation click 'Make Timesheet' button.
 
-<img class="screenshot" alt="Make TL against PO" src="{{docs_base_url}}/assets/img/manufacturing/PO-operations-make-tl.png">
+<img class="screenshot" alt="Make timesheet against PO" src="{{docs_base_url}}/assets/img/manufacturing/PO-operations-make-ts.png">
 
 ###Updating Finished Goods
 
 * Once you are done with the Production Order you need to update the Finished Goods.
 * This will create a Stock Entry that will deduct all the sub-Items from the WIP Warehouse and add them to the Finished Goods Warehouse.
-* Click on 'Update Finished Goods'.
+* Click on 'Finish'.
 
 <img class="screenshot" alt="Update Finished Goods" src="{{docs_base_url}}/assets/img/manufacturing/PO-FG-update.png">
 
diff --git a/erpnext/docs/user/manual/en/projects/project.md b/erpnext/docs/user/manual/en/projects/project.md
index e8a0e0e..7522396 100644
--- a/erpnext/docs/user/manual/en/projects/project.md
+++ b/erpnext/docs/user/manual/en/projects/project.md
@@ -2,6 +2,20 @@
 
 <img class="screenshot" alt="Project" src="{{docs_base_url}}/assets/img/project/project.png">
 
+You can also track % Completion of a Project using different methods.
+
+  1. Task Completion
+  2. Task Progress
+  3. Task Weight
+
+<img class="screenshot" alt="Project" src="{{docs_base_url}}/assets/img/project/project-percent-complete.png">
+
+Some examples of how the % Completion is calculated based on Tasks.
+
+<img class="screenshot" alt="Project" src="{{docs_base_url}}/assets/img/project/percent-complete-calc.png">
+
+<img class="screenshot" alt="Project" src="{{docs_base_url}}/assets/img/project/percent-complete-formula.png">
+
 ### Managing tasks
 Project can be divided into multiple Tasks.
 Task can be created via Project document itself or can be created via  [Task]({{docs_base_url}}/user/manual/en/projects/tasks.html)
@@ -18,6 +32,12 @@
 
 <img class="screenshot" alt="Project - Task Grid" src="{{docs_base_url}}/assets/img/project/project_task_grid.png">
 
+* To add Weights to Tasks you can follow the below steps
+
+<img class="screenshot" alt="Project - Task Grid" src="{{docs_base_url}}/assets/img/project/tasks.png">
+<img class="screenshot" alt="Project - Task Grid" src="{{docs_base_url}}/assets/img/project/task-weights.png">
+
+
 ### Managing time
 
 ERPNext uses [Time Log]({{docs_base_url}}/user/manual/en/projects/time-log.html) to track the progress of a Project.
diff --git a/erpnext/docs/user/manual/en/selling/articles/adding-margin.md b/erpnext/docs/user/manual/en/selling/articles/adding-margin.md
index 2a9ddfa..2b2fb09 100644
--- a/erpnext/docs/user/manual/en/selling/articles/adding-margin.md
+++ b/erpnext/docs/user/manual/en/selling/articles/adding-margin.md
@@ -9,7 +9,7 @@
 
 ####Adding Margin in Pricing Rule
 
-<img alt="Adding Margin in Pricing Rule" class="screenshot"  src="{{docs_base_url}}/assets/img/articles/margin-pricing-rule.png">
+<img alt="Adding Margin in Pricing Rule" class="screenshot"  src="{{docs_base_url}}/assets/img/selling/margin-pricing-rule.png">
 
 Total Margin is calculated as follows:
 `Rate = Price List Rate + Margin Rate`
@@ -22,7 +22,7 @@
 
 ####Adding Item Price
 
-<img alt="Adding Margin in Pricing Rule" class="screenshot"  src="{{docs_base_url}}/assets/img/articles/margin-item-price-list.png">
+<img alt="Adding Margin in Pricing Rule" class="screenshot"  src="{{docs_base_url}}/assets/img/selling/margin-item-price-list.png">
 
 2) Apply margin direct on Item: If user wants to apply the margin without pricing rule, they can use this option. In Quotation Item and Sales Order Item, user can select the margin type and rate or amount. The system will calculate the margin and apply it on price list rate to calculate the rate of the product.
 
@@ -34,4 +34,4 @@
 
 ####Adding Margin in Quotation
 
-<img alt="Adding Margin in Quotation" class="screenshot"  src="{{docs_base_url}}/assets/img/articles/margin-quotation-item.png">
+<img alt="Adding Margin in Quotation" class="screenshot"  src="{{docs_base_url}}/assets/img/selling/margin-quotation-item.png">
diff --git a/erpnext/docs/user/manual/en/selling/articles/sales-persons-in-the-sales-transactions.md b/erpnext/docs/user/manual/en/selling/articles/sales-persons-in-the-sales-transactions.md
index c270e13..781d2ce 100644
--- a/erpnext/docs/user/manual/en/selling/articles/sales-persons-in-the-sales-transactions.md
+++ b/erpnext/docs/user/manual/en/selling/articles/sales-persons-in-the-sales-transactions.md
@@ -32,14 +32,4 @@
 
 `Accounts > Standard Reports > Sales Partners Commission`
 
-####Disable Sales Person Feature
-
-If you don't track Sales Person wise performance, and doesn't wish to use this feature, you can disable it from:
-
-`Setup > Customize > Features Setup`
-
-<img class="screenshot" alt="Disable Sales Person" src="{{docs_base_url}}/assets/img/articles/sales-person-transaction-4.png">
-
-On disabling this feature, fields and tables related to Sales Person will become hidden from masters and transcations.
-
 <!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/selling/quotation.md b/erpnext/docs/user/manual/en/selling/quotation.md
index 6f5cc5e..1f7b06c 100644
--- a/erpnext/docs/user/manual/en/selling/quotation.md
+++ b/erpnext/docs/user/manual/en/selling/quotation.md
@@ -1,9 +1,13 @@
 During a sale, the customer may request for a written note about the products
 or services you are planning to offer, along with the prices and other terms
 of engagement. This is called a “Proposal” or an “Estimate” or a “Pro Forma
-Invoice”or a Quotation.
+Invoice”or a **Quotation**.
 
-To create a new Quotation go to:
+A typical Selling flow looks like:
+
+<img class="screenshot" alt="Make Quotation from Opportunity" src="{{docs_base_url}}/assets/img/selling/selling-flow.png">
+
+To create a new Quotation navigate to:
 
 > Selling > Quotation > New Quotation
 
@@ -13,23 +17,18 @@
 
 <img class="screenshot" alt="Make Quotation from Opportunity" src="{{docs_base_url}}/assets/img/selling/make-quote-from-opp.png">
 
-Or You can create a new Quotation and pull details from an Opportunity.
-
-<img class="screenshot" alt="Make Quotation from Opportunity" src="{{docs_base_url}}/assets/img/selling/make-quotation.gif">
-
 A Quotation contains details about:
 
   * The recipient of the Quotation
   * The Items and quantities you are offering.
-  * The rates at which they are offered. For details refer 
+  * The rates at which they are offered.
   * The taxes applicable.
   * Other charges (like shipping, insurance) if applicable.
   * The validity of contract.
   * The time of delivery.
   * Other conditions.
 
-> Tip: Images look great on Quotations. To add images to your Quotations,
-attach the corresponding image in the Item master.
+> Tip: Images look great on Quotations. Make sure your items have an image attached.
 
 ### Rates
 
@@ -41,11 +40,13 @@
 
 ### Taxes
 
-To add taxes to your Quotation, you can either select a tax template, Sales
-Taxes and Charges Template or add the taxes on your own. To understand taxes in
-detail visit [Taxes]({{docs_base_url}}/user/manual/en/setting-up/setting-up-taxes.html)
+To add taxes to your Quotation, you can select a **Sales Taxes and Charges Template** or add the taxes on your own.
 
-You can add taxes in the same manner as the Sales Taxes and Charges Template.
+For e.g
+
+<img class="screenshot" alt="Taxes and Charges" src="{{docs_base_url}}/assets/img/selling/taxes-and-charges.gif">
+
+To understand taxes in detail visit [Taxes]({{docs_base_url}}/user/manual/en/setting-up/setting-up-taxes.html).
 
 ### Terms and Conditions
 
@@ -71,19 +72,17 @@
 
 Quotation is a “Submittable” transaction. Since you send this Quotation to
 your Customer or Lead, you must freeze it so that changes are not made after
-you send the Quotation. See Document Stages.
+you send the Quotation.
 
 > Tip: Quotations can also be titled as “Proforma Invoice” or “Proposal”.
-Select the right heading in the “Print Heading” field in the “More Info”
-section. To create new Print Headings go to Setup > Branding and Printing >
-Print Headings.
+You can do this by selecting a **Print Heading** in the **Print Settings**
+section. To create new Print Headings go to Setup > Printing >
+Print Heading.
 
 ### Discount
 
 While making your sales transactions like a Quotation (or Sales Order) you
-would already have noticed that there is a “Discount” column. On the left is
-the “Price List Rate” on the right is the “Basic Rate”. You can add a
-“Discount” value to update the basic rate. To understand more about discount
-read [Discount.](http://erpnext.org/discount)
+can also give discounts to your customers. In the Discount section, add
+the discount in percentage or fixed amount. Read [Discount](https://frappe.github.io/erpnext/user/manual/en/selling/articles/applying-discount) for more explanation.
 
 {next}
diff --git a/erpnext/docs/user/manual/en/selling/sales-order.md b/erpnext/docs/user/manual/en/selling/sales-order.md
index 269473a..32e58a5 100644
--- a/erpnext/docs/user/manual/en/selling/sales-order.md
+++ b/erpnext/docs/user/manual/en/selling/sales-order.md
@@ -50,6 +50,16 @@
 This “reserved” quantity will help you project what is the quantity you need
 to purchase based on all your commitments.
 
+### Taxes
+
+To add taxes to your Quotation, you can select a **Sales Taxes and Charges Template** or add the taxes on your own.
+
+For e.g
+
+<img class="screenshot" alt="Taxes and Charges" src="{{docs_base_url}}/assets/img/selling/taxes-and-charges.gif">
+
+To understand taxes in detail visit [Taxes]({{docs_base_url}}/user/manual/en/setting-up/setting-up-taxes.html).
+
 ### Sales Team
 
 **Sales Partner:** If this Sale was booked via a Sales Partner, you can update the Sales Partner’s details with commission and other info that you can aggregate.
diff --git a/erpnext/docs/user/manual/en/selling/setup/product-bundle.md b/erpnext/docs/user/manual/en/selling/setup/product-bundle.md
index fa7f948..123eeaf 100644
--- a/erpnext/docs/user/manual/en/selling/setup/product-bundle.md
+++ b/erpnext/docs/user/manual/en/selling/setup/product-bundle.md
@@ -1,9 +1,7 @@
 #Product Bundle
 
-Product Bundle stands for Sales Bill-of-Material. It's a master where you can list item which are bundled together and 
-sold as one item. For instance, when laptop is delivered, you need to ensure that charger, mouse and laptop bag are 
-delivered and stock level of these items gets affected. To address this scenario, you can set create Product Bundle for 
-the main item, i.e. laptop, and list deliverable items i.e. laptop + charger + other accessories as child items.
+Product Bundle can be seen as something like a "Bill-of-Material" on the Sales side. It's a master where you can list existing items which are bundled together and sold as a set (or bundle). For instance, when you sell a laptop, you need to ensure that charger, mouse and laptop bag are delivered with it and stock levels of these items get affected. 
+To address this scenario, you can set create a Product Bundle for the main item, i.e. laptop, and list deliverable items i.e. laptop + charger + mouse + laptop bag as so-called "Child Items".
   
 Following are the steps on how to setup Product Bundle master, and how is it used in the sales transactions.
 
@@ -17,25 +15,27 @@
 
 ###Select Parent Item
 
-In Product Bundle master, there are two sections. Product Bundle Item and Package Item.
+In Product Bundle master, there are two sections. The "Parent Item" and a List of items to be shipped (Child Items).
 
-In Product Bundle item, you will select a Parent Item. The parent item must be a <b>non-stock item</b>. 
-This is non-stock item because there is no stock maintained for it but only the Package Items. 
+The "Parent Item" must be a so called <b>non-stock item</b>. The "Parent Item" is to be seen more like a vessel or virtual item and not a physical product.
+To create a <b>non-stock item</b> you have to unmark "Maintain Stock" in the Item Form.
+This is non-stock item because there is no stock maintained for it but only for the "Child Items". 
 If you want to maintain stock for the Parent Item, then you must create a regular Bill of Material (BOM) 
 and package them using a Stock Entry Transactions.
 
 ###Select Child Items
 
 In Package Item section, you will list all the child items for which we maintain stock and is delivered to customer.
+Remember: The "Parent Item" is just virtual, so your main product (a laptop in our example here) also has to be listed on the List of Child (or Package) Items
 
 ###Product Bundle in the Sales Transactions
 
-When making Sales transactions like Sales Invoice, Sales Order and Delivery Note, 
-Parent Item will be selected in the main item table.
+When making Sales transactions (Sales Invoice, Sales Order, Delivery Note) 
+the Parent Item will be selected in the main item table.
 
 <img class="screenshot" alt="Product Bundle" src="{{docs_base_url}}/assets/img/selling/product-bundle.gif">
 
-On selection on Parent Item in the main item table, its child items will be fetched in Packing List 
+On selection of a Parent Item in the main item table, its child items will be fetched in Packing List 
 table of the transaction. If child item is the serialized item, you will be able to specify its Serial Mo. 
 in packing List table itself. On submission of transaction, system will reduce the stock level of child items from 
 warehouse specified in Packing List table.
diff --git a/erpnext/docs/user/manual/en/selling/setup/sales-person-target-allocation.md b/erpnext/docs/user/manual/en/selling/setup/sales-person-target-allocation.md
index e32c97d..75b7561 100644
--- a/erpnext/docs/user/manual/en/selling/setup/sales-person-target-allocation.md
+++ b/erpnext/docs/user/manual/en/selling/setup/sales-person-target-allocation.md
@@ -80,7 +80,7 @@
 
 ###See Also
 
-1. [Managing Sales Person](https://erpnext.com/selling/selling-setup/sales-person)
-2. [Using Sales Person in transactions](https://erpnext.com/kb/selling/managing-sales-persons-in-sales-transactions)
+1. [Sales Person Target Allocation]({{docs_base_url}}/user/manual/en/selling/setup/sales-person-target-allocation)
+2. [Using Sales Person in transactions]({{docs_base_url}}/user/manual/en/selling/articles/sales-persons-in-the-sales-transactions)
 
 {next}
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/index.txt b/erpnext/docs/user/manual/en/setting-up/articles/index.txt
index 6f99f89..e6a3b85 100644
--- a/erpnext/docs/user/manual/en/setting-up/articles/index.txt
+++ b/erpnext/docs/user/manual/en/setting-up/articles/index.txt
@@ -9,5 +9,4 @@
 naming-series-current-value
 overwriting-data-from-data-import-tool
 rename-user
-setting-up-dropbox-backups
 using-custom-domain-on-erpnext
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/setting-up-dropbox-backups.md b/erpnext/docs/user/manual/en/setting-up/articles/setting-up-dropbox-backups.md
deleted file mode 100644
index 68e4031..0000000
--- a/erpnext/docs/user/manual/en/setting-up/articles/setting-up-dropbox-backups.md
+++ /dev/null
@@ -1,74 +0,0 @@
-#Setting Up Dropbox Backups
-
-We always recommend customers to maintain backup of their data in ERPNext. he database backup is downloaded in the form of an SQL file. If needed, this SQL file of backup can be restored in the another ERPNext account as well.
-
-You can automate database backup download of your ERPNext account into your Dropbox account.
-
-####Step 1: Go to Setup
-
-`Explore > Setup > Integrations > Dropbox Backup`
-
-####Step 2: Activate
-
-In the Dropbox Backup, check "Send Backups to Dropbox" to active this feature. On checking this field, you will find field to set Frequency and notification Email.
-
-####Step 3: Set Frequency
-
-Set Frequency to download backup in your Dropbox account.
-
-<img class="screenshot" alt="set frequency" src="{{docs_base_url}}/assets/img/setup/dropbox-1.png">
-
-####Step 4: Allow Dropbox Access
-
-After setting frequency and updating notification email, click on `Allow Dropbox access`. On clicking this button, the Dropbox login page will open in the new tab. This might require you to allow pop-up for your ERPNext account.
-
-####Step 5: Login to Dropbox
-
-Login to your Dropbox account by entering login credentials.
-
-<img class="screenshot" alt="Login" src="{{docs_base_url}}/assets/img/setup/dropbox-2.png">
-
-####Step 6: Allow
-
-On successfull login, you will find a confirmation message as following. Click on "Allow" to let your ERPNext account have access to your Dropbox account.
-
-<img class="screenshot" alt="Allow" src="{{docs_base_url}}/assets/img/setup/dropbox-3.png">
-
-With this, a folder called "ERPNext" will be created in your Dropbox account, and database backup will start to auto-download in it.
-
-##Open Source Users
-
-####Step 1: Go to
-
-<a href="https://www.dropbox.com/developers/apps" target="_blank" style="line-height: 1.42857143;">https://www.dropbox.com/developers/apps</a>
-
-####Step 2:Create a new app
-
-<img class="screenshot" alt="Create new" src="{{docs_base_url}}/assets/img/setup/dropbox-open-3.png">
-
-####Step 3: Fill in details for the app
-
-<img class="screenshot" alt="Create new" src="{{docs_base_url}}/assets/img/setup/dropbox-open-1.png">
-
--
-<img class="screenshot" alt="Create new" src="{{docs_base_url}}/assets/img/setup/dropbox-open-2.png">
-
-####Step 4: Settings in Site Config
-
-After the app is created, note the app key and app secret and enter in `sites/{sitename}/site_config.json` as follows,
-
-<div>
-	<pre>
-		<code>{ 
- "db_name": "demo", 
- "db_password": "DZ1Idd55xJ9qvkHvUH", 
- "dropbox_access_key": "ACCESSKEY", 
- "dropbox_secret_key": "SECRECTKEY" 
-} 		
-		</code>
-	</pre>
-</div>
-
-####Step 5: Complete Backup
-
-Setup dropbox backups from the backup manager as shown in previous section.
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/data/data-import-tool.md b/erpnext/docs/user/manual/en/setting-up/data/data-import-tool.md
index e59ed21..563568a 100644
--- a/erpnext/docs/user/manual/en/setting-up/data/data-import-tool.md
+++ b/erpnext/docs/user/manual/en/setting-up/data/data-import-tool.md
@@ -1,8 +1,6 @@
-The Data Import Tool is a great way to upload (or edit) bulk data, specially
-master data, into the system.
+The Data Import Tool is a great way to upload (or edit) bulk data, specially master data, into the system.
 
-To Open the data import tool, you either go to Setup or go to the Transaction
-you want to Import. If Data Import is allowed, you will see an Import Button:
+To Open the data import tool, you either go to Setup or go to the Transaction you want to Import. If Data Import is allowed, you will see an Import Button:
 
 <img alt="Start Import" class="screenshot" src="{{docs_base_url}}/assets/img/setup/data-import/data-import-1.png">
 
@@ -20,22 +18,24 @@
 implemented where there are multiple values for any property. For example an
 Item can have multiple prices, An Invoice has multiple Items and so on.
 
-<img alt="Download Template" class="screenshot" src="{{docs_base_url}}/assets/img/setup/data-import/data-import-2.png">
-
-  * Click on the table you want to download or "All Tables"
-  * For bulk editing, you can click on "Download With Data"
+  * Select Doctype for which template should be downloaded.
+  * Check fields to be included in the template.
+  * Click on "Download Blank Template".
+  * For bulk editing, you can click on "Download With Data".
+  
+<img alt="Download Template" class="screenshot" src="{{docs_base_url}}/assets/img/setup/data-import/data-import-tool-template.gif">
 
 ### 2\. Fill in the Template
 
 After downloading the template, open it in a spreadsheet application and fill
 in the data below the column headings.
 
-![Spreadsheet]({{docs_base_url}}/assets/old_images/erpnext/import-3.png)
+<img alt="Download Template" class="screenshot" src="{{docs_base_url}}/assets/img/setup/data-import/import-file.png">
 
 Then export your template or save it as a **Comma Separated Values** (CSV)
 file.
 
-![Spreadsheet]({{docs_base_url}}/assets/old_images/erpnext/import-4.png)
+<img alt="Download Template" class="screenshot" src="{{docs_base_url}}/assets/img/setup/data-import/import-csv.png">
 
 ### 3\. Upload the .csv File
 
@@ -49,7 +49,7 @@
 1. Make sure that if your application allows, use encoding as UTF-8.
 1. Keep the ID column blank for new records.
 
-### 4\. Uploading All Tables (Main + Child)
+### 4. Uploading All Tables (Main + Child)
 
 If you select all tables, you will get columns belonging to all the tables in
 one row separated by `~` columns.
@@ -67,7 +67,7 @@
 > To see how its done, enter a few records manually using forms and export
 "All Tables" with "Download with Data"
 
-### 5\. Overwriting
+### 5. Overwriting
 
 ERPNext also allows you to overwrite all / certain columns. If you want to
 update certain columns, you can download the template with data. Remember to
@@ -76,7 +76,7 @@
 > Note: For child records, if you select Overwrite, it will delete all the
 child records of that parent.
 
-### 6\. Upload Limitations
+### 6. Upload Limitations
 
 ERPNext restricts the amount of data you can upload in one file. Though the
 number may vary based on the type of data. It is usually safe to upload around
@@ -107,4 +107,10 @@
 clear way of saving as UTF-8. So save your file as a CSV, then open it in
 Notepad, and save as “UTF-8”. (Sorry blame Microsoft for this!)
 
+####Help Video on Importing Data in ERPNext from Spreadsheet file
+
+
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/Ta2Xx3QoK3E" frameborder="0" allowfullscreen></iframe>
+
 {next}
diff --git a/erpnext/schools/doctype/scheduling_tool/__init__.py b/erpnext/docs/user/manual/en/setting-up/integration-services/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/scheduling_tool/__init__.py
copy to erpnext/docs/user/manual/en/setting-up/integration-services/__init__.py
diff --git a/erpnext/docs/user/manual/en/setting-up/integration-services/dropbox-backup.md b/erpnext/docs/user/manual/en/setting-up/integration-services/dropbox-backup.md
new file mode 100644
index 0000000..7fc283b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/integration-services/dropbox-backup.md
@@ -0,0 +1,81 @@
+#Setting Up Dropbox Backups
+
+We always recommend customers to maintain backup of their data in ERPNext. he database backup is downloaded in the form of an SQL file. If needed, this SQL file of backup can be restored in the another ERPNext account as well.
+
+You can automate database backup download of your ERPNext account into your Dropbox account.
+
+####Step 1: Create Dropbox service
+
+`Explore > Setup > Integration Service`
+
+Make a new Integration Service and select `Dropbox` as a service from dropdown then save the document.
+
+####Step 2: Activate
+
+After saving a document, click on `Dropbox Settings` button, to setup service.
+
+<img class="screenshot" alt="create dropbox service" src="{{docs_base_url}}/assets/img/setup/integration-service/create_service.png">
+
+####Step 3: Set Frequency
+
+Set Frequency to download backup in your Dropbox account.
+
+<img class="screenshot" alt="set frequency" src="{{docs_base_url}}/assets/img/setup/integration-service/setup-backup-frequency.png">
+
+####Step 4: Allow Dropbox Access
+
+After setting frequency and updating other details, click on `Allow Dropbox access`. On clicking this button, the Dropbox login page will open in the new tab. This might require you to allow pop-up for your ERPNext account.
+
+####Step 5: Login to Dropbox
+
+Login to your Dropbox account by entering login credentials.
+
+<img class="screenshot" alt="Login" src="{{docs_base_url}}/assets/img/setup/integration-service/dropbox-2.png">
+
+####Step 6: Allow
+
+On successfull login, you will find a confirmation message as following. Click on "Allow" to let your ERPNext account have access to your Dropbox account.
+
+<img class="screenshot" alt="Allow" src="{{docs_base_url}}/assets/img/setup/integration-service/dropbox-3.png">
+
+####Step 7: Enable Service
+After generating access token, go back to Dropbox Integration Service record and check `enable`. This will enable backup auto-download.
+
+With this, a folder called "ERPNext" will be created in your Dropbox account, and database backup will start to auto-download in it.
+
+##Open Source Users
+
+####Step 1: Go to
+
+<a href="https://www.dropbox.com/developers/apps" target="_blank" style="line-height: 1.42857143;">https://www.dropbox.com/developers/apps</a>
+
+####Step 2:Create a new app
+
+<img class="screenshot" alt="Create new" src="{{docs_base_url}}/assets/img/setup/integration-service/dropbox-open-3.png">
+
+####Step 3: Fill in details for the app
+
+<img class="screenshot" alt="Create new" src="{{docs_base_url}}/assets/img/setup/integration-service/dropbox-open-1.png">
+
+-
+<img class="screenshot" alt="Create new" src="{{docs_base_url}}/assets/img/setup/integration-service/dropbox-open-2.png">
+
+####Step 4: Settings in Site Config
+
+After the app is created, note the app key and app secret on Dropbox Settings page or enter in `sites/{sitename}/site_config.json` as follows,
+
+<div>
+	<pre>
+		<code>{ 
+ "db_name": "demo", 
+ "db_password": "DZ1Idd55xJ9qvkHvUH", 
+ "dropbox_access_key": "ACCESSKEY", 
+ "dropbox_secret_key": "SECRECTKEY" 
+} 		
+		</code>
+	</pre>
+</div>
+
+####Step 5: Complete Backup
+
+Setup dropbox backups from the backup manager as shown in previous section.
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/integration-services/index.md b/erpnext/docs/user/manual/en/setting-up/integration-services/index.md
new file mode 100644
index 0000000..e7b5a61
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/integration-services/index.md
@@ -0,0 +1,5 @@
+
+Integration Services is platform to configure 3rd Party Services.
+
+###Services
+{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/integration-services/index.txt b/erpnext/docs/user/manual/en/setting-up/integration-services/index.txt
new file mode 100644
index 0000000..fc5e8a4
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/integration-services/index.txt
@@ -0,0 +1,4 @@
+dropbox-backup
+paypal-integration
+razorpay-integration
+ldap-integration
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/integration-services/ldap-integration.md b/erpnext/docs/user/manual/en/setting-up/integration-services/ldap-integration.md
new file mode 100644
index 0000000..34678a9
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/integration-services/ldap-integration.md
@@ -0,0 +1,24 @@
+#Setting up LDAP
+
+Lightweight Directory Access Protocol is a centralised access controll system used by many small medium scale organisations.
+
+By settings up LDAP service, you able to login to ERPNext account by using LDAP credentials.
+
+####Step 1: Create Razorpay service
+
+`Explore > Setup > Integration Service`
+
+Make a new Integration Service and select `LDAP` as a service from dropdown then save the document.
+After saving a document, click on `LDAP Settings` button, to setup service.
+
+####Step 2: Setup  ldap service
+
+To enable ldap service, you need to configure parameters like LDAP Server Url, Organizational Unit, Base Distinguished Name (DN) and Password for Base DN
+
+<img class="screenshot" alt="LDAP Settings" src="{{docs_base_url}}/assets/img/setup/integration-service/ldap_settings.png">
+
+####Step 3: Enable Service
+After setting up credentials on LDAP Settings, go back to LDAP Service record and enable it.
+While enabling, it will validate LDAP details and on successful validation, it will enables LDAP login option.
+
+<img class="screenshot" alt="LOGIN via LDAP" src="{{docs_base_url}}/assets/img/setup/integration-service/login_via_ldap.png">
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/integration-services/paypal-integration.md b/erpnext/docs/user/manual/en/setting-up/integration-services/paypal-integration.md
new file mode 100644
index 0000000..d1054ba
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/integration-services/paypal-integration.md
@@ -0,0 +1,58 @@
+#Setting up PayPal
+
+A payment gateway is an e-commerce application service provider service that authorizes credit card payments for e-businesses, online retailers, bricks and clicks, or traditional brick and mortar.
+
+A payment gateway facilitates the transfer of information between a payment portal (such as a website, mobile phone or interactive voice response service) and the Front End Processor or acquiring bank.
+
+####Step 1: Create PayPal service
+
+`Explore > Setup > Integration Service`
+
+Make a new Integration Service and select `PayPal` as a service from dropdown then save the document.
+After saving a document, click on `PayPal Settings` button, to setup service.
+
+####Step 2: Setup  payment service
+
+To enable PayPal payment service, you need to configure parameters like API Username, API Password and Signature.
+
+<img class="screenshot" alt="PayPal Settings" src="{{docs_base_url}}/assets/img/setup/integration-service/paypal_settings.png">
+
+You also can set test payment environment, by settings `Use Sandbox`
+
+####Step 3: Enable Service
+After setting up credentials on PayPal Settings, go back to PayPal Service record and enable it.
+On enabling service, the system will create Payment Gateway record and Account head in chart of account with account type as Bank.
+
+<img class="screenshot" alt="PayPal COA" src="{{docs_base_url}}/assets/img/setup/integration-service/paypal_coa.png">
+
+Also it will create Payment Gateway Account entry. Payment Gateway Account is configuration hub from this you can set account head from existing COA, default Payment Request email body template.
+
+<img class="screenshot" alt="Payment Gateway Account" src="{{docs_base_url}}/assets/img/setup/integration-service/payment_gateway_account_paypal.png">
+
+After enabling service and configuring Payment Gateway Account your system is able to accept online payments.
+
+####Supporting transaction currencies
+AUD, BRL, CAD, CZK, DKK, EUR, HKD, HUF, ILS, JPY, MYR, MXN, TWD, NZD, NOK, PHP, PLN, GBP, RUB, SGD, SEK, CHF, THB, TRY, USD
+
+##Get PayPal credentials
+
+#### Paypal Sanbox API Signature
+ - Login to paypal developer account, <a href="https://developer.paypal.com/">PayPal Developer Account</a>
+ - From **Accounts** tab. create a new business account.
+<img class="screenshot" alt="Payment Request" src="{{ docs_base_url }}/assets/img/setup/integration-service/setup-sanbox-1.png">
+ 
+ - From this account profile you will get your sandbox api credentials
+<img class="screenshot" alt="Payment Request" src="{{ docs_base_url }}/assets/img/setup/integration-service/sanbox-credentials.png">
+
+
+---
+
+#### PayPal Account API Signature
+ - Login to PayPal Account and go to profile
+<img class="screenshot" alt="Payment Request" src="{{ docs_base_url }}/assets/img/setup/integration-service/api-step-1.png">
+
+ - From **My Selling Tools** go to **api Access**
+<img class="screenshot" alt="Payment Request" src="{{ docs_base_url }}/assets/img/setup/integration-service/api-step-2.png">
+
+ - On API Access Page, choose option 2 to generate API credentials
+<img class="screenshot" alt="Payment Request" src="{{ docs_base_url }}/assets/img/setup/integration-service/api-step-3.png">
diff --git a/erpnext/docs/user/manual/en/setting-up/integration-services/razorpay-integration.md b/erpnext/docs/user/manual/en/setting-up/integration-services/razorpay-integration.md
new file mode 100644
index 0000000..ad43f63
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/integration-services/razorpay-integration.md
@@ -0,0 +1,33 @@
+#Setting up Razorpay
+
+A payment gateway is an e-commerce application service provider service that authorizes credit card payments for e-businesses, online retailers, bricks and clicks, or traditional brick and mortar.
+
+A payment gateway facilitates the transfer of information between a payment portal (such as a website, mobile phone or interactive voice response service) and the Front End Processor or acquiring bank.
+
+####Step 1: Create Razorpay service
+
+`Explore > Setup > Integration Service`
+
+Make a new Integration Service and select `Razorpay` as a service from dropdown then save the document.
+After saving a document, click on `Razorpay Settings` button, to setup service.
+
+####Step 2: Setup  payment service
+
+To enable Razorpay payment service, you need to configure parameters like API Username, API Password and Signature.
+
+<img class="screenshot" alt="Razorpay Settings" src="{{docs_base_url}}/assets/img/setup/integration-service/razorpay_settings.png">
+
+####Step 3: Enable Service
+After setting up credentials on Razorpay Settings, go back to Razorpay Service record and enable it.
+On enabling service, the system will create Payment Gateway record and Account head in chart of account with account type as Bank.
+
+<img class="screenshot" alt="Razorpay COA" src="{{docs_base_url}}/assets/img/setup/integration-service/razorpay_coa.png">
+
+Also it will create Payment Gateway Account entry. Payment Gateway Account is configuration hub from this you can set account head from existing COA, default Payment Request email body template.
+
+<img class="screenshot" alt="Payment Gateway Account" src="{{docs_base_url}}/assets/img/setup/integration-service/payment_gateway_account_razorpay.png">
+
+After enabling service and configuring Payment Gateway Account your system is able to accept online payments.
+
+####Supporting transaction currencies
+INR
diff --git a/erpnext/docs/user/manual/en/setting-up/print/multi-lingual-print-format.md b/erpnext/docs/user/manual/en/setting-up/print/custom-translations.md
similarity index 98%
rename from erpnext/docs/user/manual/en/setting-up/print/multi-lingual-print-format.md
rename to erpnext/docs/user/manual/en/setting-up/print/custom-translations.md
index a15834c..1dab1c1 100644
--- a/erpnext/docs/user/manual/en/setting-up/print/multi-lingual-print-format.md
+++ b/erpnext/docs/user/manual/en/setting-up/print/custom-translations.md
@@ -1,4 +1,4 @@
-#Multi-lngual Print Formats
+#Custom Translations
 
 User can print the customer's and supplier's document in their local language. For an example if I have customers from germany, france who want quotation in german, french language will be possible with these feature.
 
diff --git a/erpnext/docs/user/manual/en/setting-up/print/index.txt b/erpnext/docs/user/manual/en/setting-up/print/index.txt
index 80b5946..fa23652 100644
--- a/erpnext/docs/user/manual/en/setting-up/print/index.txt
+++ b/erpnext/docs/user/manual/en/setting-up/print/index.txt
@@ -5,4 +5,4 @@
 address-template
 terms-and-conditions
 cheque-print-template
-multi-lingual-print-format
\ No newline at end of file
+custom-translations
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/settings/naming-series.md b/erpnext/docs/user/manual/en/setting-up/settings/naming-series.md
index df7de6d..086a272 100644
--- a/erpnext/docs/user/manual/en/setting-up/settings/naming-series.md
+++ b/erpnext/docs/user/manual/en/setting-up/settings/naming-series.md
@@ -46,3 +46,12 @@
 
 {next}
 
+### 4. Custom Field in Naming Series
+ Some companies prefers to make use of "short-codes" for suppliers, i.e. WN for company "Web Notes" that later can be used in naming series for quick identification.
+ 
+#### Example:
+
+    A custom field "Vendor ID" is created under Document: Supplier.
+    Then under Naming Series, we should allow something like
+        PO-.YY.MM.-.vendor_id.-.#####
+        Resulting in "PO-1503-WN-00001"
diff --git a/erpnext/docs/user/manual/en/stock/articles/track-items-using-barcode.md b/erpnext/docs/user/manual/en/stock/articles/track-items-using-barcode.md
index c880dfb..6d8fcb6 100644
--- a/erpnext/docs/user/manual/en/stock/articles/track-items-using-barcode.md
+++ b/erpnext/docs/user/manual/en/stock/articles/track-items-using-barcode.md
@@ -2,15 +2,9 @@
 
 A barcode is a value decoded into vertical spaced lines. Barcode scanners are the input medium, like Keyboard. When it scans a barcode, the data appears in the computer screens at the point of a cursor.
 
-To enable barcode feature in ERPNext go to:
+### Item Master
 
-`Setup > Customize > Features Setup`
-
-Check "Item Barcode".
-
-<img alt="Material Transfer" class="screenshot" src="{{docs_base_url}}/assets/img/articles/barcode-feature-setup.png">
-
-Now a new field "Barcode" will be appear in Item master. Enter barcode while creating a new item.
+To set the barcode of a particular item, you will have to open the Item record. You can also enter barcode while creating a new item.
 
 <img alt="Material Transfer" class="screenshot" src="{{docs_base_url}}/assets/img/articles/barcode-item-master.png">
 
diff --git a/erpnext/docs/user/manual/en/stock/item/index.md b/erpnext/docs/user/manual/en/stock/item/index.md
index 7ca9d4e..ad44866 100644
--- a/erpnext/docs/user/manual/en/stock/item/index.md
+++ b/erpnext/docs/user/manual/en/stock/item/index.md
@@ -10,7 +10,7 @@
   * **Default Unit of Measure:** This is the default measuring unit that you will use for your product. It could be in nos, kgs, meters, etc. You can store all the UOM’s that your product will require under Set Up> Master Data > UOM. These can be preselected while filling New Item by using % sign to get a pop up of the UOM list.
   * **Brand:** If you have more than one brand save them under Set Up> Master Data> Brand and pre-select them while filling a New Item.
   * **Variant:** A Item Variant is a different version of a Item.To learn more about managing varaints see [Item Variants]({{docs_base_url}}/user/manual/en/stock/item/item-variants.html)
-  
+
 ### Upload an Image
 
 To upload an image for your icon that will appear in all transactions, save
@@ -24,8 +24,8 @@
 Asset Item, Stock Item or even Manufacturing Item.
 
   * **Stock Item:** If you are maintaining stock of this Item in your Inventory, ERPNext will make a stock ledger entry for each transaction of this item.
-  * **Default Warehouse:** This is the Warehouse that is automatically selected in your transactions. 
-  * **Allowance Percentage:** This is the percent by which you will be allowed to over-bill or over-deliver this Item. If not set, it will select from the Global Defaults. 
+  * **Default Warehouse:** This is the Warehouse that is automatically selected in your transactions.
+  * **Allowance Percentage:** This is the percent by which you will be allowed to over-bill or over-deliver this Item. If not set, it will select from the Global Defaults.
   * **Valuation Method:** There are two options to maintain valuation of stock. FIFO (first in - first out) and Moving Average. To understand this topic in detail please visit “ Item Valuation, FIFO and Moving Average”.
 
 ### Serialized and Batched Inventory
@@ -34,11 +34,11 @@
 
 > Important: Once you mark an item as serialized or batched or neither, you cannot change it after you have made any stock entry.
 
-  * [Discussion on Serialized Inventory]({{docs_base_url}}/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item.html)  
+  * [Discussion on Serialized Inventory]({{docs_base_url}}/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item.html)
 
 ### Re Ordering
 
-  * **Re-order level** suggests the amount of stock balance in the Warehouse. 
+  * **Re-order level** suggests the amount of stock balance in the Warehouse.
   * **Re-order Qty** suggests the amount of stock to be ordered to maintain minimum stock levels.
   * **Minimum Order Qty** is the minimum quantity for which a Material Request / Purchase Order must be made.
 
@@ -86,7 +86,7 @@
 
 ![Manufacturing]({{docs_base_url}}/assets/old_images/erpnext/item-manufacturing-website.png)
 
-Visit [Manufacturing]({{docs_base_url}}/user/manual/en/manufacturing.html) and [Website ]({{docs_base_url}}/user/manual/en/website.html)to understand these topics in detail.
+Visit [Manufacturing]({{docs_base_url}}/user/manual/en/manufacturing) and [Website ]({{docs_base_url}}/user/manual/en/website)to understand these topics in detail.
 
 ### Learn more about Item
 
diff --git a/erpnext/docs/user/manual/en/stock/material-request.md b/erpnext/docs/user/manual/en/stock/material-request.md
index 8afda60..d707dd7 100644
--- a/erpnext/docs/user/manual/en/stock/material-request.md
+++ b/erpnext/docs/user/manual/en/stock/material-request.md
@@ -1,7 +1,7 @@
 A Material Request is a simple document identifying a requirement of a set of
 Items (products or services) for a particular reason.
 
-![Workflow]({{docs_base_url}}/assets/old_images/erpnext/material-request-workflow.jpg)
+![Workflow]({{docs_base_url}}/assets/img/buying/material-request-flowchart.png)
 
 To generate a Material Request manually go to:
 
@@ -25,6 +25,8 @@
 * Material Issue - If the requested material is to be Issued.
 * Manufacture - If the requested material is to be Produced.
 
+The User can also raise a [Request For Quotation]({{docs_base_url}}/user/manual/en/buying/request-for-quotation.html) against a Material Request. To create a Request For Quotation the user can click on 'Make'.
+
 > Info: Material Request is not mandatory. It is ideal if you have centralized
 buying so that you can collect this information from various departments.
 
diff --git a/erpnext/docs/user/manual/en/stock/projected-quantity.md b/erpnext/docs/user/manual/en/stock/projected-quantity.md
index 9251a1b..d38bfc9 100644
--- a/erpnext/docs/user/manual/en/stock/projected-quantity.md
+++ b/erpnext/docs/user/manual/en/stock/projected-quantity.md
@@ -11,7 +11,7 @@
 Having a tight control of the projected inventory is crucial to determine
 shortages and to calculate the right order quantity.
 
-![Projected Quantity Stock Report]({{docs_base_url}}/assets/old_images/erpnext/projected-quantity-stock-report.png)
+![Projected Quantity Stock Report]({{docs_base_url}}/assets/img/stock/projected_quantity.png)
 
 
 > Projected Qty = Actual Qty + Planned Qty + Requested Qty + Ordered Qty -
diff --git a/erpnext/docs/user/manual/en/stock/stock-entry.md b/erpnext/docs/user/manual/en/stock/stock-entry.md
index b7e0860..a47d863 100644
--- a/erpnext/docs/user/manual/en/stock/stock-entry.md
+++ b/erpnext/docs/user/manual/en/stock/stock-entry.md
@@ -38,6 +38,6 @@
 <img class="screenshot" alt="Additional Costs General Ledger" src="{{docs_base_url}}/assets/img/stock/additional-costs-general-ledger.png">
 
 
-> **Note:** To update Stock from a spreadsheet, see Stock Reconciliation.
+> **Note:** To update Stock from a spreadsheet, see [Stock Reconciliation]({{doc_base_url}}/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item.html).
 
 {next}
diff --git a/erpnext/docs/user/manual/en/stock/warehouse.md b/erpnext/docs/user/manual/en/stock/warehouse.md
index d86f401..172e469 100644
--- a/erpnext/docs/user/manual/en/stock/warehouse.md
+++ b/erpnext/docs/user/manual/en/stock/warehouse.md
@@ -4,10 +4,8 @@
 cities, towns, and villages. They mostly have loading docks to load and unload
 goods from trucks.
 
-To go to Warehouse, click on Stock and go to Warehouse under Masters.  You
-could also go to the Setup module and click on Warehouse under Master Data.
-
-> Stock > Warehouse > New Warehouse
+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">
 
@@ -20,17 +18,6 @@
 wish a particular user to operate on a particular Warehouse, you can refrain
 the user from accessing that Warehouse.
 
-### Merge Warehouse
-
-In day to day transactions, duplicate entries are done by mistake, resulting
-in duplicate Warehouses. Duplicate records can be merged into a single
-Warehouse. From the top bar of the system select the File menu. Select Rename
-and Enter the correct Warehouse and check the Merge button. The system will
-replace all the links of wrong Warehouse with the correct Warehouse, in all
-transactions. Also, the available quantity (actual qty, reserved qty, ordered
-qty etc) of all items in the duplicate warehouse will be transferred to the
-correct warehouse. Once merging is done, delete the duplicate Warehouse.
-
 > Note: ERPNext system maintains stock balance for every distinct combination
 of Item and Warehouse. Thus you can get stock balance for any specific Item in
 a particular Warehouse on any particular date.
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/merging-documents.md b/erpnext/docs/user/manual/en/using-erpnext/articles/merging-documents.md
index 15dd117..f03bbd8 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/articles/merging-documents.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/merging-documents.md
@@ -1,6 +1,6 @@
 #Merging Documents
 
-For a document, of you have two records which are identical, and meant for common purpose, you can merge them into one record.
+For a document, if you have two records which are identical, and meant for common purpose, you can merge them into one record.
 
 Following are step to merge documents. Let's assume we are merging two Accounts.
 
@@ -10,7 +10,7 @@
 
 #### Step 2: Go to Account 
 
-For an Account to be merge, click on "Rename" option.
+For an Account to be merged, click on the "Rename" option.
 
 <img alt="Sales Order File Attachment" class="screenshot" src="{{docs_base_url}}/assets/img/articles/merge-docs-1.png">
 
@@ -18,7 +18,7 @@
 
 In the New Name field, enter another account name with which this account will be merged. Check "Merge with existing" option. Then press 'Rename' button to merge.
 
-Following is how merged account will appear in the Chart of Account master.
+Following is how the merged account will appear in the Chart of Accounts master.
 
 <img alt="Sales Order File Attachment" class="screenshot" src="{{docs_base_url}}/assets/img/articles/merge-docs-2.gif">
 
@@ -28,4 +28,4 @@
 
 <div class="well"> Note: Group Account cannot be merged into Child Account and vice versa.</div>
 
-<!-- markdown -->
\ No newline at end of file
+<!-- markdown -->
diff --git a/erpnext/docs/user/manual/en/website/add-products-to-website.md b/erpnext/docs/user/manual/en/website/add-products-to-website.md
index 3bad0df..d8ddcf0 100644
--- a/erpnext/docs/user/manual/en/website/add-products-to-website.md
+++ b/erpnext/docs/user/manual/en/website/add-products-to-website.md
@@ -1,69 +1,63 @@
 ### Add Products to the Website
 
-To list your Item on the Website, fill the Item details and save the file.
-Once the file is saved, a plus (+) button will appear next to the Image icon.
-Click on the plus button and add your Item image. The html code will be
+ERPNext will populate your website with products out of your Item Master. The html code will be
 generated automatically.
 
-##### Step 1: Save Image
+#### Step 1: Edit Item
 
-![Webimage]({{docs_base_url}}/assets/old_images/erpnext/item-webimage.png)
+For this example we will add a rocking chair to our catalog to sell on our website.
 
-  
+To edit a catalog item go to: `Stock > Items and Pricing > Item`.  From there select an item to add to website or create a new item by clicking the **New** button in the upper right.
 
-##### Step 2: Check the 'Show in Website' box.
+For this example, click on the **New** button to create a new item.  Fill in the form and then click **Save**.
 
-Under the Website section, please check the box that says 'show in Website'.
-Once the box is checked, the page will display other fields for entering
-information.
+![New Website Item 01]({{docs_base_url}}/assets/img/articles/new-item-for-website-01.png)
 
-![Webimage]({{docs_base_url}}/assets/old_images/erpnext/item-webimage-1.png)
+#### Step 2: Save Image
 
-  
+1. Click the new item from the list to edit it.
+1. In the upper left, click the image block to give the product a picture. Be sure to uncheck the **Private** box so the image will be publicly viewable.
 
-##### Step 3: Enter Website Details
+![New Website Item 02]({{docs_base_url}}/assets/img/articles/new-item-for-website-02.png)  
 
-![Webimage]({{docs_base_url}}/assets/old_images/erpnext/item-webimage-2.png)
+#### Step 3: Check the 'Show in Website' box
 
-The page name will be generated automatically. Mention the Item-Group under
-which the Item will be displayed.
+Under the Website section near the bottom of the form, check the box that says **Show in Website**. Once the box is checked, the page will display other fields for entering information.
 
-#### Item Groups
+* Give the page a route on the website.
 
-Mention the Item Group under this column. If you wish to list your Item under
-the broad category products, name your Item Group as Products. In case you
-have various varieties of Item and want to classify them under different
-names, make Item Groups with those names and check the box that says 'show in
-Website'. For Example, if you wish to create a category called 'Bags', create
-a Item Group named Bags.
+![New Website Item 03]({{docs_base_url}}/assets/img/articles/new-item-for-website-03.png)    
 
-![Item Group]({{docs_base_url}}/assets/old_images/erpnext/itemgroup-webimage-bags.png)
+#### Step 4: Enter Website Details
 
-Once the Item Group is created go to the Website Settings page under Website.
-Enter the Label, Url, and Parent Label.
+Once the `Show in Website` checkbox is checked, a new section called **Website Specifications** appears. Expand this section to add more details about the rocking chair to the website.
 
-![Item Group]({{docs_base_url}}/assets/old_images/erpnext/itemgroup-website-settings.png)
+![New Website Item 04]({{docs_base_url}}/assets/img/articles/new-item-for-website-04.png)
 
-  
+Click **Save** in the upper right and then click `See on Website` on the left under the product image to see the item on your website.
 
-#### Webpage labels
+![New Website Item 05]({{docs_base_url}}/assets/img/articles/new-item-for-website-05.png)
 
-![Webpage]({{docs_base_url}}/assets/old_images/erpnext/webpage-labels.png)
+### Item Groups
 
-Add more Items under a particular Item Group.
+Items can be grouped together in items groups.  To see a listing of the existing item groups to go: `Stock > Items and Pricing > Item Group`. Out of the box, ERPNext comes with a collection of item groups that you can use. Click `Products` to select it and then click `Edit` to open it up.
 
-To add more Items under a certain Label, mention the Item Group on the Item
-Page. The Items will be added automatically on the Webpage, under the Item
-Group Label. For Example, To add Item-Kiddies Bag and Butterfly Print Bag,
-check the 'Show in Website'box. The Items will be placed under the Label Bags
-on the Webpage.
+* Click the **Show in Website** check box.
+* Change the route to `products`.
+* Fill in a description for your products page.
+* Click **Save**.
 
-![Item Group]({{docs_base_url}}/assets/old_images/erpnext/itemgroup-websettings.png)
+![New Website Item 06]({{docs_base_url}}/assets/img/articles/new-item-for-website-06.png)
 
-  
+* Go back to the rocking chair item, expand the **website** section.
+* Click **Add new row** button under the `Item Group` table.
+* Select `Products` from the list.
+* Click **Save**. 
 
-Item Group Display
+![New Website Item 07]({{docs_base_url}}/assets/img/articles/new-item-for-website-07.png)
 
-![Item Group Display]({{docs_base_url}}/assets/old_images/erpnext/webpage-itemgroup-display.png)
+To see on the website, go back to the `Item Group` and then click **See on website**.
+
+![New Website Item 08]({{docs_base_url}}/assets/img/articles/new-item-for-website-08.png)
 
 {next}
diff --git a/erpnext/docs/user/manual/en/website/articles/index.txt b/erpnext/docs/user/manual/en/website/articles/index.txt
index a89040a..97c24d5 100644
--- a/erpnext/docs/user/manual/en/website/articles/index.txt
+++ b/erpnext/docs/user/manual/en/website/articles/index.txt
@@ -1,3 +1,3 @@
 managing-user-sign-up-via-website
 website-security
-wesite-home-page
\ No newline at end of file
+website-home-page
diff --git a/erpnext/docs/user/manual/en/website/articles/managing-user-sign-up-via-website.md b/erpnext/docs/user/manual/en/website/articles/managing-user-sign-up-via-website.md
index 92be7f7..c4f0b77 100644
--- a/erpnext/docs/user/manual/en/website/articles/managing-user-sign-up-via-website.md
+++ b/erpnext/docs/user/manual/en/website/articles/managing-user-sign-up-via-website.md
@@ -2,7 +2,7 @@
 
 Users can sign up for ERPNext account via the ERPNext Website.
 
-<img src="{{docs_base_path}}/assets/img/articles/Screen Shot 2014-12-10 at 4.45.27 pm.jpg">
+<img src="{{docs_base_url}}/assets/img/website/website-login.png">
 
 As seen above the login / sign-up button appears on the homepage of the website generated using ERPNext.
 
@@ -16,7 +16,7 @@
 
 3. Check the disable SignUp check-box and save the doc.
 
-Now only the login button shall appear and there shall be no option to sign-up via the website. You can always revert back by following the same steps.
+Now only the login button will appear and there shall be no option to sign-up via the website. You can always revert back by following the same steps.
 
 
 <!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/website/articles/website-home-page.md b/erpnext/docs/user/manual/en/website/articles/website-home-page.md
new file mode 100644
index 0000000..d44a31a
--- /dev/null
+++ b/erpnext/docs/user/manual/en/website/articles/website-home-page.md
@@ -0,0 +1,25 @@
+# Wesite Home Page
+
+It is very much possible in ERPNext to setup certain standard page as default website Home Page. Following are steps to setup default website home page.
+
+#### **Step 1: Create a Web Page**
+To create a web page go to: `Website > Web Site > Web Page` and then click on the `New` button in the upper right.
+
+* Fill in the page title
+* Give the page a route (keep it lower case)
+* Add content to the `Main Content` section. If you want, you can use markdown to create a more complex page.
+* Tick (Check) the `Published` check box
+* Click the `Save` button.
+
+#### **Step 2: Open Website Settings Page**
+To Open website settings page go to: `Website > Setup > Website Settings`
+
+#### **Step 3: Set Home page**
+
+Enter the same value you entered for the `route` field in the previous section to the `Home Page` field. ERPNext will set this route to be the same as /index for your page.      
+
+![Website Setting Home]({{docs_base_url}}/assets/img/articles/Selection_021.png)
+
+#### **Step 4: Save Website Settings Form.**
+
+After setting up Home Page Press `Save` button from website settings page and refresh the system from Help menu. Like this you can set any standard page as your default website home page. When some one visited to your website, he/she will see home page as default landing page on your website.
diff --git a/erpnext/docs/user/manual/en/website/articles/website-security.md b/erpnext/docs/user/manual/en/website/articles/website-security.md
index 2a5ac0a..ef7986a 100644
--- a/erpnext/docs/user/manual/en/website/articles/website-security.md
+++ b/erpnext/docs/user/manual/en/website/articles/website-security.md
@@ -1,9 +1,11 @@
 #Website Security
 
-One can easily generate a website using erpnext. We can list out Products on the website and also create blogs. Products are directly fetched from the Item Master records of your erpnext account. some people would like to limit the access of the website generated by ERPNext to certain people. This is because some of the items may not be available to public.
+One can easily generate a website using ERPNext. We can list our Products on the website and also create blogs. Products are directly fetched from the Item Master records of your ERPNext account. Some people would like to limit the access of the website generated by ERPNext to certain people. This is because some of the items may not be available to the public.
 
-Well at the moment this feature is not available. You cannot limit the access of the website generated by ERPNext to certain people. If you publish the website it will be publicly visible. However while you cannot control who can view the website, you can always choose which items to display on the website. To show or not show an Item on your website go to 'Item Master' and in the Item form check the 'show in website' checkbox. 
+Well at the moment this feature is not available. You cannot limit the access of the website generated by ERPNext to certain people. If you publish the website it will be publicly visible. However while you cannot control who can view the website, you can always choose which items to display on the website. To show or not show an Item on your website go to `Selling > Items and Pricing > Item` and in the Item form check the `show in website` checkbox. 
 
-<img src="{{docs_base_path}}/assets/img/articles/Screen Shot 2014-11-26 at 10.43.51 am.png"> 
+<img src="{{docs_base_url}}/assets/img/articles/item-show-on-website-checkbox.png"> 
 
-You can also fill in the details of the product as to be shown on the website here.
\ No newline at end of file
+Once the check box has been checked, then more details will appear that you can fill in for the details of the product as to be shown on the website.
+
+<img src="{{docs_base_url}}/assets/img/articles/item-show-on-website-checkbox-checked.png"> 
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/website/articles/wesite-home-page.md b/erpnext/docs/user/manual/en/website/articles/wesite-home-page.md
deleted file mode 100644
index 0cf5fdc..0000000
--- a/erpnext/docs/user/manual/en/website/articles/wesite-home-page.md
+++ /dev/null
@@ -1,23 +0,0 @@
-<h1>Wesite Home Page</h1>
-
-It is very much possible in ERPNext to setup certain standard page as default website Home Page. Following are steps to setup default website home page.
-
-#### **Step 1: Open Website Settings Page.**
-To Open website settings page go to:
-
-`Website > Setup > Website Settings`
-
-
-#### **Step 2: Set Home page.**
-
-Enter standard page like, index, login, products, blog, about, contact etc. as Home Page in Landing Page section of Website Settings page. For e.g consider you want login page as your default website home page.      
-
-![Website Setting Home]({{docs_base_url}}/assets/img/articles/Selection_021.png)
-
-#### **Step 3: Save Website Settings Form.**
-
-After setting up Home Page Press 'Save' button from website settings page and refresh the system from Help menu. Like this you can set any standard page as your default website home page. When some one visited to your website, he/she will see home page as default landing page on your website.
-
-![Website Home Page]({{docs_base_url}}/assets/img/articles/Selection_022.png)    
-
-<!-- markdown -->
diff --git a/erpnext/docs/user/manual/en/website/shopping-cart.md b/erpnext/docs/user/manual/en/website/shopping-cart.md
index 1682084..7b10037 100644
--- a/erpnext/docs/user/manual/en/website/shopping-cart.md
+++ b/erpnext/docs/user/manual/en/website/shopping-cart.md
@@ -6,30 +6,49 @@
 This software displays the price of the product . It also displays shipping
 and handling charges, along with taxes, if applicable.
 
-To set up a shopping cart, go to the selling module.
+### Shopping Cart Setup
 
-> Selling > Shopping Cart Settings
+To set up a shopping cart, go to the website module.
 
-#### Step 1: Enter Company Details and Default Territory.
+> Website > Shopping Cart Settings
 
-![Shopping Cart]({{docs_base_url}}/assets/old_images/erpnext/shopping-cart-1.png)
+#### Enter Company Details and Checkout Details.
 
-#### Step 2: Enter Price List, Tax Master and Shipping Rule.
+<img class="screenshot" alt="Shopping Cart Settings" src="{{docs_base_url}}/assets/img/website/item-website-specs.png">
 
-![Shopping Cart]({{docs_base_url}}/assets/old_images/erpnext/shopping-cart-2.png)
+To make item available on website go to Item master.
 
-#### Shopping Cart Display
+> Stock > Item
 
-On the Website, the shopping cart image will be seen below the Item price.
-Customers can click on the cart and enter the amount of quantity they wish to
-buy. The Item number will be stored on the right hand corner of the page, next
-to the flower sign.
+#### Enable Item for website.
 
-![Shopping Cart]({{docs_base_url}}/assets/old_images/erpnext/shopping-cart-display-1.png)
+<img class="screenshot" alt="Item" src="{{docs_base_url}}/assets/img/website/item-in-webiste.png">
 
-Click on the flower sign on the right hand side to see the cart details. Click
-on the cart to get the final amount details.
+#### Enter Website Specifications for Item.
 
-![Shopping Cart]({{docs_base_url}}/assets/old_images/erpnext/shopping-cart-display-amount.png)
+<img class="screenshot" alt="Website Specifications" src="{{docs_base_url}}/assets/img/website/item-website-specs.png">
+
+
+### Shop using Shopping Cart
+
+#### Add item to shopping cart
+
+Click on "Add to Cart" to add item to shopping cart.
+
+<img class="screenshot" alt="Website Specifications" src="{{docs_base_url}}/assets/img/website/item-website-view.png">
+
+#### Goto Checkout
+
+Click on "Goto Cart" to checkout or on "Cart" which is on upper right side
+of the screen.
+
+<img class="screenshot" alt="Website Specifications" src="{{docs_base_url}}/assets/img/website/checkout.png">
+
+#### Checkout
+
+Change quantity, select Shipping and Billing Address and click
+on "Place Order" to place the order.
+
+<img class="screenshot" alt="Website Specifications" src="{{docs_base_url}}/assets/img/website/place-order.png">
 
 {next}
diff --git a/erpnext/docs/user/videos/index.md b/erpnext/docs/user/videos/index.md
index 071dedb..9a82db5 100644
--- a/erpnext/docs/user/videos/index.md
+++ b/erpnext/docs/user/videos/index.md
@@ -18,7 +18,7 @@
 ---
 
 <h3>
-	<a class="no-decoration" href="https://conf.erpnext.com/2014/videos">Conference Vidoes</a>
+	<a class="no-decoration" href="https://conf.erpnext.com/2014/videos">Conference Videos</a>
 </h3>
 
 <div class="row">
diff --git a/erpnext/docs/user/videos/learn/data-import-tool.md b/erpnext/docs/user/videos/learn/data-import-tool.md
index 10cd00f..a3272e9 100644
--- a/erpnext/docs/user/videos/learn/data-import-tool.md
+++ b/erpnext/docs/user/videos/learn/data-import-tool.md
@@ -1,8 +1,7 @@
 # Data Import Tool
 
-<iframe width="660" height="371" src="https://www.youtube.com/embed/6wiriRKPhmg" frameborder="0" allowfullscreen></iframe>
+<iframe width="660" height="371" src="https://www.youtube.com/embed/Ta2Xx3QoK3E" frameborder="0" allowfullscreen></iframe>
 
-**Duration: 3:24**
+**Duration: 6:32**
 
-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.
+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/schools/doctype/scheduling_tool/__init__.py b/erpnext/fleet_management/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/scheduling_tool/__init__.py
copy to erpnext/fleet_management/__init__.py
diff --git a/erpnext/schools/doctype/scheduling_tool/__init__.py b/erpnext/fleet_management/doctype/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/scheduling_tool/__init__.py
copy to erpnext/fleet_management/doctype/__init__.py
diff --git a/erpnext/schools/doctype/scheduling_tool/__init__.py b/erpnext/fleet_management/doctype/vehicle/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/scheduling_tool/__init__.py
copy to erpnext/fleet_management/doctype/vehicle/__init__.py
diff --git a/erpnext/fleet_management/doctype/vehicle/test_vehicle.py b/erpnext/fleet_management/doctype/vehicle/test_vehicle.py
new file mode 100644
index 0000000..6431977
--- /dev/null
+++ b/erpnext/fleet_management/doctype/vehicle/test_vehicle.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+from frappe.utils import nowdate,flt, cstr,random_string
+# test_records = frappe.get_test_records('Vehicle')
+
+class TestVehicle(unittest.TestCase):
+	def test_make_vehicle(self):
+		vehicle = frappe.get_doc({
+			"doctype": "Vehicle",
+			"license_plate": random_string(10).upper(),
+			"make": "Maruti",
+			"model": "PCM",
+			"last_odometer":5000,
+			"acquisition_date":frappe.utils.nowdate(),
+			"location": "Mumbai",
+			"chassis_no": "1234ABCD",
+			"vehicle_value":frappe.utils.flt(500000)
+		})
+		vehicle.insert()
diff --git a/erpnext/fleet_management/doctype/vehicle/vehicle.js b/erpnext/fleet_management/doctype/vehicle/vehicle.js
new file mode 100644
index 0000000..f12c434
--- /dev/null
+++ b/erpnext/fleet_management/doctype/vehicle/vehicle.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Vehicle', {
+	refresh: function(frm) {
+
+	}
+});
diff --git a/erpnext/fleet_management/doctype/vehicle/vehicle.json b/erpnext/fleet_management/doctype/vehicle/vehicle.json
new file mode 100644
index 0000000..edad8a2
--- /dev/null
+++ b/erpnext/fleet_management/doctype/vehicle/vehicle.json
@@ -0,0 +1,819 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "field:license_plate", 
+ "beta": 0, 
+ "creation": "2016-09-03 03:33:27.680331", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Document", 
+ "editable_grid": 1, 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "license_plate", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "License Plate", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 1
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "make", 
+   "fieldtype": "Data", 
+   "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": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "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": "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", 
+   "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_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Odometer Value (Last)", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "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", 
+   "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_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Insurance 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": "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", 
+   "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", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Petrol\nDiesel\nNatural Gas\nElectric", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "Litre", 
+   "fieldname": "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": "Fuel 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": "carbon_check_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": "Last Carbon Check", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "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_21", 
+   "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": "color", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Color", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "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": "wheels", 
+   "fieldtype": "Int", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Wheels", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "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": "doors", 
+   "fieldtype": "Int", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Doors", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "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_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Amended From", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Vehicle", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2016-11-07 06:00:22.056662", 
+ "modified_by": "Administrator", 
+ "module": "Fleet Management", 
+ "name": "Vehicle", 
+ "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": "Fleet Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "search_fields": "license_plate,location,model", 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "title_field": "", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/fleet_management/doctype/vehicle/vehicle.py b/erpnext/fleet_management/doctype/vehicle/vehicle.py
new file mode 100644
index 0000000..ef5bfe5
--- /dev/null
+++ b/erpnext/fleet_management/doctype/vehicle/vehicle.py
@@ -0,0 +1,14 @@
+# -*- 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 getdate
+from frappe.model.document import Document
+
+class Vehicle(Document):
+	def validate(self):
+		if getdate(self.start_date) > getdate(self.end_date):
+			frappe.throw(_("Insurance Start date should be less than Insurance End date"))
\ No newline at end of file
diff --git a/erpnext/fleet_management/doctype/vehicle/vehicle_dashboard.py b/erpnext/fleet_management/doctype/vehicle/vehicle_dashboard.py
new file mode 100644
index 0000000..2c1c4c3
--- /dev/null
+++ b/erpnext/fleet_management/doctype/vehicle/vehicle_dashboard.py
@@ -0,0 +1,13 @@
+from frappe import _
+
+data = {
+	'heatmap': True,
+	'heatmap_message': _('This is based on logs against this Vehicle. See timeline below for details'),
+	'fieldname': 'license_plate',
+	'transactions': [
+		{
+			'label': _('Logs'),
+			'items': ['Vehicle Log']
+		}
+	]
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/scheduling_tool/__init__.py b/erpnext/fleet_management/doctype/vehicle_log/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/scheduling_tool/__init__.py
copy to erpnext/fleet_management/doctype/vehicle_log/__init__.py
diff --git a/erpnext/fleet_management/doctype/vehicle_log/test_vehicle_log.py b/erpnext/fleet_management/doctype/vehicle_log/test_vehicle_log.py
new file mode 100644
index 0000000..71c1d91
--- /dev/null
+++ b/erpnext/fleet_management/doctype/vehicle_log/test_vehicle_log.py
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+from frappe.utils import nowdate,flt, cstr,random_string
+# test_records = frappe.get_test_records('Vehicle Log')
+class TestVehicleLog(unittest.TestCase):
+	def test_make_vehicle_log(self):
+		license_plate=random_string(10).upper()
+		employee_id=frappe.db.sql("""select name from `tabEmployee` order by modified desc limit 1""")[0][0]
+		vehicle = frappe.get_doc({
+			"doctype": "Vehicle",
+			"license_plate": cstr(license_plate),
+			"make": "Maruti",
+			"model": "PCM",
+			"last_odometer":5000,
+			"acquisition_date":frappe.utils.nowdate(),
+			"location": "Mumbai",
+			"chassis_no": "1234ABCD",
+			"vehicle_value":frappe.utils.flt(500000)
+		})
+		try:
+			vehicle.insert()
+		except frappe.DuplicateEntryError:
+			pass
+		vehicle_log = frappe.get_doc({
+			"doctype": "Vehicle Log",
+			"license_plate": cstr(license_plate),
+			"employee":employee_id,
+			"date":frappe.utils.nowdate(),
+			"odometer":5010,
+			"fuel_qty":frappe.utils.flt(50),
+			"price": frappe.utils.flt(500)
+		})
+		vehicle_log.insert()
+		vehicle_log.submit()
\ No newline at end of file
diff --git a/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.js b/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.js
new file mode 100644
index 0000000..1ccf347
--- /dev/null
+++ b/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.js
@@ -0,0 +1,33 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on("Vehicle Log", {
+	refresh: function(frm,cdt,cdn) {
+		vehicle_log=frappe.model.get_doc(cdt,cdn);
+		if (vehicle_log.license_plate) {
+			frappe.call({
+				method: "erpnext.fleet_management.doctype.vehicle_log.vehicle_log.get_make_model",
+				args: {
+					license_plate: vehicle_log.license_plate
+				},
+				callback: function(r) {
+					frappe.model.set_value(cdt, cdn, ("model"), r.message[0]);
+					frappe.model.set_value(cdt, cdn, ("make"), r.message[1]);
+				}
+			})
+		}
+	},
+	expense_claim: function(frm){
+			frappe.call({
+				method: "erpnext.fleet_management.doctype.vehicle_log.vehicle_log.make_expense_claim",
+				args:{
+					docname: frm.doc.name
+				},
+				callback: function(r){
+					var doc = frappe.model.sync(r.message);
+					frappe.set_route('Form', 'Expense Claim', r.message.name);
+					}
+			})
+	}
+});
+
diff --git a/erpnext/buying/doctype/quality_inspection/quality_inspection.json b/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.json
similarity index 70%
copy from erpnext/buying/doctype/quality_inspection/quality_inspection.json
copy to erpnext/fleet_management/doctype/vehicle_log/vehicle_log.json
index 06246cc..26a4a01 100644
--- a/erpnext/buying/doctype/quality_inspection/quality_inspection.json
+++ b/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.json
@@ -4,16 +4,46 @@
  "allow_rename": 0, 
  "autoname": "naming_series:", 
  "beta": 0, 
- "creation": "2013-04-30 13:13:03", 
+ "creation": "2016-09-03 14:14:51.788550", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "document_type": "Document", 
  "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "vehicle_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, 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "fa fa-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": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "naming_series", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -21,14 +51,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Series", 
    "length": 0, 
    "no_copy": 1, 
-   "options": "QI-", 
+   "options": "VLOG.", 
    "permlevel": 0, 
-   "print_hide": 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, 
@@ -39,26 +72,28 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "default": "Today", 
-   "fieldname": "report_date", 
-   "fieldtype": "Date", 
+   "columns": 0, 
+   "fieldname": "license_plate", 
+   "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
-   "label": "Report Date", 
+   "in_standard_filter": 0, 
+   "label": "License Plate", 
    "length": 0, 
    "no_copy": 0, 
-   "oldfieldname": "report_date", 
-   "oldfieldtype": "Date", 
+   "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": 1, 
+   "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
   }, 
@@ -66,6 +101,36 @@
    "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, 
+   "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": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_4", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -73,6 +138,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -80,6 +146,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,25 +157,25 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "inspection_type", 
-   "fieldtype": "Select", 
+   "columns": 0, 
+   "fieldname": "column_break_7", 
+   "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
-   "in_list_view": 1, 
-   "label": "Inspection Type", 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
-   "oldfieldname": "inspection_type", 
-   "oldfieldtype": "Select", 
-   "options": "\nIncoming\nOutgoing\nIn Process", 
    "permlevel": 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
@@ -117,26 +184,27 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "purchase_receipt_no", 
-   "fieldtype": "Link", 
+   "columns": 0, 
+   "fieldname": "model", 
+   "fieldtype": "Read Only", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Purchase Receipt No", 
+   "in_standard_filter": 0, 
+   "label": "Model", 
    "length": 0, 
    "no_copy": 0, 
-   "oldfieldname": "purchase_receipt_no", 
-   "oldfieldtype": "Link", 
-   "options": "Purchase Receipt", 
    "permlevel": 0, 
+   "precision": "", 
    "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
   }, 
@@ -144,26 +212,27 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "delivery_note_no", 
-   "fieldtype": "Link", 
+   "columns": 0, 
+   "fieldname": "make", 
+   "fieldtype": "Read Only", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Delivery Note No", 
+   "in_standard_filter": 0, 
+   "label": "Make", 
    "length": 0, 
    "no_copy": 0, 
-   "oldfieldname": "delivery_note_no", 
-   "oldfieldtype": "Link", 
-   "options": "Delivery Note", 
    "permlevel": 0, 
+   "precision": "", 
    "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
   }, 
@@ -171,13 +240,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "section_break_7", 
+   "columns": 0, 
+   "fieldname": "odometer_reading", 
    "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": "Odometer Reading", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -185,6 +257,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -195,26 +268,27 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "item_code", 
-   "fieldtype": "Link", 
+   "columns": 0, 
+   "fieldname": "date", 
+   "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
-   "in_list_view": 1, 
-   "label": "Item Code", 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Date", 
    "length": 0, 
    "no_copy": 0, 
-   "oldfieldname": "item_code", 
-   "oldfieldtype": "Link", 
-   "options": "Item", 
    "permlevel": 0, 
+   "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
-   "search_index": 1, 
+   "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
   }, 
@@ -222,23 +296,52 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "item_serial_no", 
-   "fieldtype": "Link", 
+   "columns": 0, 
+   "fieldname": "odometer", 
+   "fieldtype": "Int", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Item Serial No", 
+   "in_standard_filter": 0, 
+   "label": "Odometer", 
    "length": 0, 
    "no_copy": 0, 
-   "oldfieldname": "item_serial_no", 
-   "oldfieldtype": "Link", 
-   "options": "Serial No", 
    "permlevel": 0, 
+   "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 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, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -249,51 +352,26 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "batch_no", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Batch No", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "batch_no", 
-   "oldfieldtype": "Link", 
-   "options": "Batch", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "sample_size", 
+   "columns": 0, 
+   "fieldname": "fuel_qty", 
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Sample Size", 
+   "in_standard_filter": 0, 
+   "label": "Fuel Qty", 
    "length": 0, 
    "no_copy": 0, 
-   "oldfieldname": "sample_size", 
-   "oldfieldtype": "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, 
+   "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
@@ -302,46 +380,51 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "column_break1", 
+   "columns": 0, 
+   "fieldname": "price", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Fuel Price", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "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, 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldtype": "Column Break", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
-   "width": "50%"
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "item_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Item Name", 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "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, 
    "search_index": 0, 
@@ -352,101 +435,25 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "description", 
-   "fieldtype": "Small Text", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "label": "Description", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "description", 
-   "oldfieldtype": "Small Text", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
-   "width": "300px"
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "section_break_14", 
-   "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, 
-   "default": "user", 
-   "fieldname": "inspected_by", 
+   "columns": 0, 
+   "fieldname": "supplier", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Inspected By", 
+   "in_standard_filter": 0, 
+   "label": "Supplier", 
    "length": 0, 
    "no_copy": 0, 
-   "oldfieldname": "inspected_by", 
-   "oldfieldtype": "Data", 
-   "options": "User", 
+   "options": "Supplier", 
    "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": "verified_by", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Verified By", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "verified_by", 
-   "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, 
@@ -457,13 +464,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "column_break_17", 
-   "fieldtype": "Column Break", 
+   "columns": 0, 
+   "fieldname": "invoice", 
+   "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Invoice Ref", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -471,6 +481,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, 
@@ -480,76 +491,25 @@
   {
    "allow_on_submit": 0, 
    "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "remarks", 
-   "fieldtype": "Text", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Remarks", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "remarks", 
-   "oldfieldtype": "Text", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "amended_from", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 1, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Amended From", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "amended_from", 
-   "oldfieldtype": "Data", 
-   "options": "Quality Inspection", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "specification_details", 
+   "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, 
-   "label": "", 
+   "in_standard_filter": 0, 
+   "label": "Service_Details", 
    "length": 0, 
    "no_copy": 0, 
-   "oldfieldtype": "Section Break", 
-   "options": "Simple", 
    "permlevel": 0, 
+   "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -560,48 +520,109 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "get_specification_details", 
-   "fieldtype": "Button", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Get Specification Details", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "get_item_specification_details", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "readings", 
+   "columns": 0, 
+   "fieldname": "service_detail", 
    "fieldtype": "Table", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Readings", 
+   "in_standard_filter": 0, 
+   "label": "Service Detail", 
    "length": 0, 
    "no_copy": 0, 
-   "oldfieldname": "qa_specification_details", 
-   "oldfieldtype": "Table", 
-   "options": "Quality Inspection Reading", 
+   "options": "Vehicle Service", 
    "permlevel": 0, 
+   "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "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, 
+   "remember_last_selected_value": 0, 
+   "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_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Amended From", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Vehicle Log", 
+   "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, 
@@ -611,8 +632,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-search", 
- "idx": 1, 
+ "idx": 0, 
  "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
@@ -620,37 +640,40 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-07-31 11:42:40.498926", 
+ "modified": "2016-11-07 05:24:55.310831", 
  "modified_by": "Administrator", 
- "module": "Buying", 
- "name": "Quality Inspection", 
+ "module": "Fleet Management", 
+ "name": "Vehicle Log", 
+ "name_case": "", 
  "owner": "Administrator", 
  "permissions": [
   {
-   "amend": 1, 
+   "amend": 0, 
    "apply_user_permissions": 0, 
    "cancel": 1, 
    "create": 1, 
    "delete": 1, 
    "email": 1, 
-   "export": 0, 
+   "export": 1, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
    "report": 1, 
-   "role": "Quality Manager", 
+   "role": "Fleet Manager", 
    "set_user_permissions": 0, 
    "share": 1, 
    "submit": 1, 
    "write": 1
   }
  ], 
- "quick_entry": 0, 
+ "quick_entry": 1, 
  "read_only": 0, 
  "read_only_onload": 0, 
- "search_fields": "item_code, report_date, purchase_receipt_no, delivery_note_no", 
- "sort_order": "ASC", 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "title_field": "", 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py b/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py
new file mode 100644
index 0000000..ceea493
--- /dev/null
+++ b/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py
@@ -0,0 +1,57 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+from frappe.utils import flt, cstr
+from frappe.model.mapper import get_mapped_doc
+from frappe.model.document import Document
+
+class VehicleLog(Document):
+	def validate(self):
+		last_odometer=frappe.db.get_value("Vehicle", self.license_plate, "last_odometer")
+		if flt(self.odometer) < flt(last_odometer):
+			frappe.throw(_("Current Odometer reading entered should be greater than initial Vehicle Odometer {0}").format(last_odometer))
+		for service_detail in self.service_detail:
+			if (service_detail.service_item or service_detail.type or service_detail.frequency or service_detail.expense_amount):
+					if not (service_detail.service_item and service_detail.type and service_detail.frequency and service_detail.expense_amount):
+							frappe.throw(_("Service Item,Type,frequency and expense amount are required"))
+							
+	def on_submit(self):
+		frappe.db.sql("update `tabVehicle` set last_odometer=%s where license_plate=%s",
+			(self.odometer, self.license_plate))
+	
+@frappe.whitelist()
+def get_make_model(license_plate):
+	vehicle=frappe.get_doc("Vehicle",license_plate)
+	return (vehicle.make,vehicle.model)
+
+@frappe.whitelist()
+def make_expense_claim(docname):
+	def check_exp_claim_exists():
+		exp_claim = frappe.db.sql("""select name from `tabExpense Claim` where vehicle_log=%s""",vehicle_log.name)
+		return exp_claim[0][0] if exp_claim else ""
+	def calc_service_exp():
+		total_exp_amt=0
+		exp_claim = check_exp_claim_exists()
+		if exp_claim:
+			frappe.throw(_("Expense Claim {0} already exists for the Vehicle Log").format(exp_claim))
+		for serdetail in vehicle_log.service_detail:
+			total_exp_amt = total_exp_amt + serdetail.expense_amount
+		return total_exp_amt
+		
+	vehicle_log = frappe.get_doc("Vehicle Log", docname)
+	exp_claim = frappe.new_doc("Expense Claim")
+	exp_claim.employee=vehicle_log.employee
+	exp_claim.vehicle_log=vehicle_log.name
+	exp_claim.remark=_("Expense Claim for Vehicle Log {0}").format(vehicle_log.name)
+	fuel_price=vehicle_log.price
+	total_claim_amt=calc_service_exp() + fuel_price
+	exp_claim.append("expenses",{
+		"expense_date":vehicle_log.date,
+		"description":_("Vehicle Expenses"),
+		"claim_amount":total_claim_amt
+	})
+	return exp_claim.as_dict()
diff --git a/erpnext/schools/doctype/scheduling_tool/__init__.py b/erpnext/fleet_management/doctype/vehicle_service/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/scheduling_tool/__init__.py
copy to erpnext/fleet_management/doctype/vehicle_service/__init__.py
diff --git a/erpnext/fleet_management/doctype/vehicle_service/vehicle_service.json b/erpnext/fleet_management/doctype/vehicle_service/vehicle_service.json
new file mode 100644
index 0000000..6b80efc
--- /dev/null
+++ b/erpnext/fleet_management/doctype/vehicle_service/vehicle_service.json
@@ -0,0 +1,144 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2016-09-03 19:20:14.561962", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Document", 
+ "editable_grid": 1, 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "service_item", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Service Item", 
+   "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, 
+   "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": "type", 
+   "fieldtype": "Select", 
+   "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", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2016-09-20 07:29:50.852748", 
+ "modified_by": "Administrator", 
+ "module": "Fleet Management", 
+ "name": "Vehicle Service", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/fleet_management/doctype/vehicle_service/vehicle_service.py b/erpnext/fleet_management/doctype/vehicle_service/vehicle_service.py
new file mode 100644
index 0000000..18ed782
--- /dev/null
+++ b/erpnext/fleet_management/doctype/vehicle_service/vehicle_service.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class VehicleService(Document):
+	pass
diff --git a/erpnext/schools/doctype/scheduling_tool/__init__.py b/erpnext/fleet_management/report/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/scheduling_tool/__init__.py
copy to erpnext/fleet_management/report/__init__.py
diff --git a/erpnext/schools/doctype/scheduling_tool/__init__.py b/erpnext/fleet_management/report/vehicle_expenses/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/scheduling_tool/__init__.py
copy to erpnext/fleet_management/report/vehicle_expenses/__init__.py
diff --git a/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.js b/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.js
new file mode 100644
index 0000000..8a05c81
--- /dev/null
+++ b/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.js
@@ -0,0 +1,41 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+frappe.require("assets/erpnext/js/financial_statements.js", function() {
+	frappe.query_reports["Vehicle Expenses"] = {
+		"filters": [
+			{
+				"fieldname": "fiscal_year",
+				"label": __("Fiscal Year"),
+				"fieldtype": "Link",
+				"options": "Fiscal Year",
+				"default": frappe.defaults.get_user_default("fiscal_year"),
+				"reqd": 1,
+				"on_change": function(query_report) {
+					var fiscal_year = query_report.get_values().fiscal_year;
+					if (!fiscal_year) {
+						return;
+					}
+					frappe.model.with_doc("Fiscal Year", fiscal_year, function(r) {
+						var fy = frappe.model.get_doc("Fiscal Year", fiscal_year);
+						frappe.query_report_filters_by_name.from_date.set_input(fy.year_start_date);
+						frappe.query_report_filters_by_name.to_date.set_input(fy.year_end_date);
+						query_report.trigger_refresh();
+					});
+				}
+			},
+			{
+				"fieldname": "from_date",
+				"label": __("From Date"),
+				"fieldtype": "Date",
+				"default": frappe.defaults.get_user_default("year_start_date"),
+			},
+			{
+				"fieldname": "to_date",
+				"label": __("To Date"),
+				"fieldtype": "Date",
+				"default": frappe.defaults.get_user_default("year_end_date"),
+			}
+		]
+	}
+});
+
diff --git a/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.json b/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.json
new file mode 100644
index 0000000..380c873
--- /dev/null
+++ b/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.json
@@ -0,0 +1,18 @@
+{
+ "add_total_row": 0, 
+ "apply_user_permissions": 1, 
+ "creation": "2016-09-09 03:33:40.605734", 
+ "disabled": 0, 
+ "docstatus": 0, 
+ "doctype": "Report", 
+ "idx": 0, 
+ "is_standard": "Yes", 
+ "modified": "2016-09-18 08:54:12.080753", 
+ "modified_by": "Administrator", 
+ "module": "Fleet Management", 
+ "name": "Vehicle Expenses", 
+ "owner": "Administrator", 
+ "ref_doctype": "Vehicle", 
+ "report_name": "Vehicle Expenses", 
+ "report_type": "Script Report"
+}
\ No newline at end of file
diff --git a/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py b/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py
new file mode 100644
index 0000000..717a94f
--- /dev/null
+++ b/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py
@@ -0,0 +1,81 @@
+# 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,cstr
+from erpnext.accounts.report.financial_statements import get_period_list
+
+def execute(filters=None):
+	period_list = get_period_list(2016, 2016,"Monthly")
+	for period in period_list:
+		pass
+	columns, data = [], []
+	columns=get_columns()
+	data=get_log_data(filters)
+	chart=get_chart_data(data,period_list)
+	return columns,data,None,chart
+	
+def get_columns():
+	columns = [_("License") + ":Link/Vehicle:100", _("Make") + ":data:50",
+				_("Model") + ":data:50", _("Location") + ":data:100",
+				_("Log") + ":Link/Vehicle Log:100", _("Odometer") + ":Int:80",
+				_("Date") + ":Date:100", _("Fuel Qty") + ":Float:80",
+				_("Fuel Price") + ":Float:100",_("Service Expense") + ":Float:100"
+	]
+	return columns
+
+def get_log_data(filters):
+	conditions=""
+	if filters.from_date:
+		conditions += " and date >= %(from_date)s"
+	if filters.to_date:
+		conditions += " and date <= %(to_date)s"
+	data = frappe.db.sql("""select vhcl.license_plate as "License",vhcl.make as "Make",vhcl.model as "Model",
+							vhcl.location as "Location",log.name as "Log",log.odometer as "Odometer",log.date as "Date",
+							log.fuel_qty as "Fuel Qty",log.price as "Fuel Price"
+							from `tabVehicle` vhcl,`tabVehicle Log` log
+							where vhcl.license_plate = log.license_plate and log.docstatus = 1 %s
+							order by date""" % (conditions,),filters, as_dict=1)
+	dl=list(data)
+	for row in dl:
+		row["Service Expense"]= get_service_expense(row["Log"])
+	return dl
+	
+def get_service_expense(logname):
+	expense_amount = frappe.db.sql("""select sum(expense_amount) 
+										from `tabVehicle Log` log,`tabVehicle Service` ser 
+										where ser.parent=log.name and log.name=%s""",logname)
+	return flt(expense_amount[0][0]) if expense_amount else 0
+	
+def get_chart_data(data,period_list):
+	fuel_exp_data,service_exp_data,fueldata,servicedata = [],[],[],[]
+	service_exp_data = []
+	fueldata = []
+	for period in period_list:
+		total_fuel_exp=0
+		total_ser_exp=0
+		for row in data:
+			if row["Date"] <= period.to_date and row["Date"] >= period.from_date:
+				total_fuel_exp+=flt(row["Fuel Price"])
+				total_ser_exp+=flt(row["Service Expense"])
+		fueldata.append([period.key,total_fuel_exp])
+		servicedata.append([period.key,total_ser_exp])
+
+	x_intervals = ['x'] + [period.key for period in period_list]
+	fuel_exp_data= [row[1] for row in fueldata]
+	service_exp_data= [row[1] for row in servicedata]
+	columns = [x_intervals]
+	if fuel_exp_data:
+		columns.append(["Fuel Expenses"]+ fuel_exp_data)
+	if service_exp_data:
+		columns.append(["Service Expenses"]+ service_exp_data)
+	chart = {
+		"data": {
+			'x': 'x',
+			'columns': columns
+		}
+	}
+	chart["chart_type"] = "line"
+	return chart
\ No newline at end of file
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index 19e915e..95f6c0b 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -6,7 +6,7 @@
 app_title = "ERPNext"
 app_publisher = "Frappe Technologies Pvt. Ltd."
 app_description = """ERP made simple"""
-app_icon = "icon-th"
+app_icon = "fa fa-th"
 app_color = "#e74c3c"
 app_email = "info@erpnext.com"
 app_license = "GNU General Public License (v3)"
@@ -32,7 +32,6 @@
 on_session_creation = "erpnext.shopping_cart.utils.set_cart_count"
 on_logout = "erpnext.shopping_cart.utils.clear_cart_count"
 
-remember_selected = ['Company', 'Cost Center', 'Project']
 treeviews = ['Account', 'Cost Center', 'Warehouse', 'Item Group', 'Customer Group', 'Sales Person', 'Territory', "BOM"]
 
 # website
@@ -67,6 +66,13 @@
 			"parents": [{"title": _("Invoices"), "name": "invoices"}]
 		}
 	},
+	{"from_route": "/quotations", "to_route": "Supplier Quotation"},
+	{"from_route": "/quotations/<path:name>", "to_route": "order",
+		"defaults": {
+			"doctype": "Supplier Quotation",
+			"parents": [{"title": _("Supplier Quotation"), "name": "quotations"}]
+		}
+	},
 	{"from_route": "/shipments", "to_route": "Delivery Note"},
 	{"from_route": "/shipments/<path:name>", "to_route": "order",
 		"defaults": {
@@ -94,21 +100,31 @@
 
 portal_menu_items = [
 	{"title": _("Projects"), "route": "/project", "reference_doctype": "Project"},
-	{"title": _("Request for Quotations"), "route": "/rfq", "reference_doctype": "Request for Quotation"},
-	{"title": _("Orders"), "route": "/orders", "reference_doctype": "Sales Order"},
-	{"title": _("Invoices"), "route": "/invoices", "reference_doctype": "Sales Invoice"},
-	{"title": _("Shipments"), "route": "/shipments", "reference_doctype": "Delivery Note"},
-	{"title": _("Issues"), "route": "/issues", "reference_doctype": "Issue", "show_always": True},
+	{"title": _("Request for Quotations"), "route": "/rfq", "reference_doctype": "Request for Quotation", "role": "Supplier"},
+	{"title": _("Supplier Quotation"), "route": "/quotations", "reference_doctype": "Supplier Quotation", "role": "Supplier"},
+	{"title": _("Orders"), "route": "/orders", "reference_doctype": "Sales Order", "role":"Customer"},
+	{"title": _("Invoices"), "route": "/invoices", "reference_doctype": "Sales Invoice", "role":"Customer"},
+	{"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"},
-	{"title": _("Assessment Schedule"), "route": "/assessment", "reference_doctype": "Assessment"},
-	{"title": _("Fees"), "route": "/fees", "reference_doctype": "Fees"}
+	{"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': 'Student', 'doctype':'Student', 'email_field': 'student_email_id'}
 ]
 
 has_website_permission = {
 	"Sales Order": "erpnext.controllers.website_list_for_contact.has_website_permission",
 	"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",
@@ -167,16 +183,19 @@
 
 scheduler_events = {
 	"hourly": [
-		"erpnext.controllers.recurring_document.create_recurring_documents"
+		"erpnext.controllers.recurring_document.create_recurring_documents",
+		'erpnext.hr.doctype.daily_work_summary_settings.daily_work_summary_settings.trigger_emails'
 	],
 	"daily": [
 		"erpnext.stock.reorder_item.reorder_item",
 		"erpnext.setup.doctype.email_digest.email_digest.send",
 		"erpnext.support.doctype.issue.issue.auto_close_tickets",
+		"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",
 		"erpnext.projects.doctype.task.task.set_tasks_as_overdue",
-		"erpnext.accounts.doctype.asset.depreciation.post_depreciation_entries"
+		"erpnext.accounts.doctype.asset.depreciation.post_depreciation_entries",
+		'erpnext.hr.doctype.daily_work_summary_settings.daily_work_summary_settings.send_summary'
 	]
 }
 
@@ -195,3 +214,5 @@
 ]
 
 get_site_info = 'erpnext.utilities.get_site_info'
+
+payment_gateway_enabled = "erpnext.accounts.utils.create_payment_gateway_and_account"
diff --git a/erpnext/hr/doctype/appraisal/appraisal.json b/erpnext/hr/doctype/appraisal/appraisal.json
index 1d9a64f..0906557 100644
--- a/erpnext/hr/doctype/appraisal/appraisal.json
+++ b/erpnext/hr/doctype/appraisal/appraisal.json
@@ -23,6 +23,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "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": 0, 
+   "in_standard_filter": 0, 
    "label": "Series", 
    "length": 0, 
    "no_copy": 1, 
@@ -58,6 +61,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, 
@@ -77,6 +81,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Appraisal Template", 
    "length": 0, 
    "no_copy": 0, 
@@ -87,6 +92,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, 
@@ -107,6 +113,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "For Employee", 
    "length": 0, 
    "no_copy": 0, 
@@ -117,6 +124,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, 
@@ -136,6 +144,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "For Employee Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -145,6 +154,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, 
@@ -164,6 +174,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
@@ -171,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, 
@@ -192,6 +204,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Status", 
    "length": 0, 
    "no_copy": 1, 
@@ -202,6 +215,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": 1, 
@@ -221,6 +235,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Start Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -230,6 +245,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, 
@@ -249,6 +265,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "End Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -258,6 +275,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, 
@@ -277,6 +295,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Goals", 
    "length": 0, 
    "no_copy": 0, 
@@ -286,6 +305,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,6 +324,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Goals", 
    "length": 0, 
    "no_copy": 0, 
@@ -314,6 +335,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, 
@@ -332,6 +354,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Calculate Total Score", 
    "length": 0, 
    "no_copy": 0, 
@@ -341,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, 
@@ -359,6 +383,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Total Score (Out of 5)", 
    "length": 0, 
    "no_copy": 1, 
@@ -368,6 +393,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, 
@@ -387,12 +413,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, 
@@ -412,6 +440,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Remarks", 
    "length": 0, 
    "no_copy": 0, 
@@ -419,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, 
@@ -438,6 +468,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
@@ -445,6 +476,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, 
@@ -463,6 +495,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -473,6 +506,7 @@
    "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, 
@@ -491,6 +525,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -498,6 +533,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, 
@@ -516,6 +552,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amended From", 
    "length": 0, 
    "no_copy": 1, 
@@ -526,6 +563,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, 
@@ -536,7 +574,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-thumbs-up", 
+ "icon": "fa fa-thumbs-up", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
@@ -545,7 +583,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-09-02 03:07:02.731236", 
+ "modified": "2016-11-07 05:47:32.082712", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Appraisal", 
@@ -561,6 +599,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -581,6 +620,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -601,6 +641,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
diff --git a/erpnext/hr/doctype/appraisal_template/appraisal_template.json b/erpnext/hr/doctype/appraisal_template/appraisal_template.json
index 4ecd838..22ee3dd 100644
--- a/erpnext/hr/doctype/appraisal_template/appraisal_template.json
+++ b/erpnext/hr/doctype/appraisal_template/appraisal_template.json
@@ -93,7 +93,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-file-text", 
+ "icon": "fa fa-file-text", 
  "idx": 1, 
  "in_create": 0, 
  "in_dialog": 0, 
diff --git a/erpnext/hr/doctype/attendance/attendance.json b/erpnext/hr/doctype/attendance/attendance.json
index ffeb023..9a1b66e 100644
--- a/erpnext/hr/doctype/attendance/attendance.json
+++ b/erpnext/hr/doctype/attendance/attendance.json
@@ -3,16 +3,19 @@
  "allow_import": 1, 
  "allow_rename": 0, 
  "autoname": "naming_series:", 
+ "beta": 0, 
  "creation": "2013-01-10 16:34:13", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Setup", 
+ "editable_grid": 0, 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "attendance_details", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -20,6 +23,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
@@ -29,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, 
@@ -39,6 +44,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "naming_series", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -46,6 +52,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Series", 
    "length": 0, 
    "no_copy": 1, 
@@ -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": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "employee", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -73,6 +82,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Employee", 
    "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": 1, 
    "search_index": 1, 
@@ -93,6 +104,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "employee_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -100,6 +112,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Employee Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -109,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, 
@@ -119,6 +133,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "Present", 
    "fieldname": "status", 
    "fieldtype": "Select", 
@@ -127,6 +142,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Status", 
    "length": 0, 
    "no_copy": 1, 
@@ -137,6 +153,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, 
@@ -147,6 +164,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "leave_type", 
    "fieldtype": "Link", 
    "hidden": 1, 
@@ -154,6 +172,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Leave Type", 
    "length": 0, 
    "no_copy": 0, 
@@ -164,6 +183,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, 
@@ -174,6 +194,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break0", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -181,6 +202,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
@@ -188,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, 
@@ -199,6 +222,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "att_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -206,6 +230,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Attendance Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -215,6 +240,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, 
@@ -225,6 +251,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "company", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -232,6 +259,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -242,6 +270,7 @@
    "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, 
@@ -252,6 +281,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "amended_from", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -259,6 +289,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amended From", 
    "length": 0, 
    "no_copy": 1, 
@@ -267,6 +298,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, 
@@ -276,15 +308,16 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-ok", 
+ "icon": "fa fa-ok", 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-03-04 01:18:30.089630", 
+ "modified": "2016-11-07 05:50:01.058617", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Attendance", 
@@ -300,6 +333,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -320,6 +354,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -340,6 +375,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -351,10 +387,12 @@
    "write": 1
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "employee, employee_name, att_date, status", 
  "sort_field": "modified", 
  "sort_order": "DESC", 
- "title_field": "employee_name"
+ "title_field": "employee_name", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/branch/branch.json b/erpnext/hr/doctype/branch/branch.json
index 1b8f2fd..609456c 100644
--- a/erpnext/hr/doctype/branch/branch.json
+++ b/erpnext/hr/doctype/branch/branch.json
@@ -40,7 +40,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-code-fork", 
+ "icon": "fa fa-code-fork", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
diff --git a/erpnext/schools/doctype/scheduling_tool/__init__.py b/erpnext/hr/doctype/daily_work_summary/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/scheduling_tool/__init__.py
copy to erpnext/hr/doctype/daily_work_summary/__init__.py
diff --git a/erpnext/hr/doctype/daily_work_summary/daily_work_summary.js b/erpnext/hr/doctype/daily_work_summary/daily_work_summary.js
new file mode 100644
index 0000000..1ac173a
--- /dev/null
+++ b/erpnext/hr/doctype/daily_work_summary/daily_work_summary.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Daily Work Summary', {
+	refresh: function(frm) {
+
+	}
+});
diff --git a/erpnext/hr/doctype/daily_work_summary/daily_work_summary.json b/erpnext/hr/doctype/daily_work_summary/daily_work_summary.json
new file mode 100644
index 0000000..b457cf2
--- /dev/null
+++ b/erpnext/hr/doctype/daily_work_summary/daily_work_summary.json
@@ -0,0 +1,168 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2016-11-08 04:58:20.001780", 
+ "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": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 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": "Open", 
+   "fieldname": "status", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Status", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Open\nSent", 
+   "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": "email_sent_to", 
+   "fieldtype": "Code", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Email Sent To", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 1, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2016-11-21 01:05:55.258867", 
+ "modified_by": "Administrator", 
+ "module": "HR", 
+ "name": "Daily Work Summary", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 0, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "is_custom": 0, 
+   "permlevel": 0, 
+   "print": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Employee", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
+   "write": 0
+  }, 
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "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, 
+   "write": 0
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 1, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py b/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py
new file mode 100644
index 0000000..7fff5f5
--- /dev/null
+++ b/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py
@@ -0,0 +1,101 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+from frappe import _
+from email_reply_parser import EmailReplyParser
+from erpnext.hr.doctype.employee.employee import is_holiday
+from frappe.utils import formatdate
+from markdown2 import markdown
+
+class DailyWorkSummary(Document):
+	def send_mails(self, settings, emails):
+		'''Send emails to get daily work summary to all employees'''
+		incoming_email_account = frappe.db.get_value('Email Account',
+			dict(enable_incoming=1, default_incoming=1), 'email_id')
+
+		self.db_set('email_sent_to', '\n'.join(emails))
+		frappe.sendmail(recipients = emails, message = settings.message,
+			subject = settings.subject, reference_doctype=self.doctype,
+			reference_name=self.name, reply_to = incoming_email_account)
+
+	def send_summary(self):
+		'''Send summary of all replies. Called at midnight'''
+		message = self.get_summary_message()
+
+		frappe.sendmail(recipients = get_employee_emails(self.company, False),
+			message = message,
+			subject = _('Daily Work Summary for {0}').format(self.company),
+			reference_doctype=self.doctype, reference_name=self.name)
+
+		self.db_set('status', 'Sent')
+
+	def get_summary_message(self):
+		'''Return summary of replies as HTML'''
+		settings = frappe.get_doc('Daily Work Summary Settings')
+
+		replies = frappe.get_all('Communication', fields=['content', 'text_content', 'sender'],
+			filters=dict(reference_doctype=self.doctype, reference_name=self.name,
+				communication_type='Communication', sent_or_received='Received'),
+				order_by='creation asc')
+
+		did_not_reply = self.email_sent_to.split()
+
+		for d in replies:
+			d.sender_name = frappe.db.get_value("Employee", {"user_id": d.sender},
+				"employee_name") or d.sender
+			if d.sender in did_not_reply:
+				did_not_reply.remove(d.sender)
+			if d.text_content:
+				d.content = markdown(EmailReplyParser.parse_reply(d.text_content))
+
+
+		did_not_reply = [(frappe.db.get_value("Employee", {"user_id": email}, "employee_name") or email)
+			for email in did_not_reply]
+
+		return frappe.render_template(self.get_summary_template(),
+			dict(replies=replies,
+				original_message=settings.message,
+				title=_('Daily Work Summary for {0}'.format(formatdate(self.creation))),
+				did_not_reply= ', '.join(did_not_reply) or '',
+				did_not_reply_title = _('No replies from')))
+
+	def get_summary_template(self):
+		return '''
+<h3>{{ title }}</h3>
+
+{% for reply in replies %}
+<h4>{{ reply.sender_name }}</h4>
+<p style="padding-bottom: 20px">
+	{{ reply.content }}
+</p>
+<hr>
+{% endfor %}
+
+{% if did_not_reply %}
+<p>{{ did_not_reply_title }}: {{ did_not_reply }}</p>
+{% endif %}
+
+'''
+
+def get_employee_emails(company, only_working=True):
+	'''Returns list of Employee user ids for the given company who are working today
+
+	:param company: Company `name`'''
+	employee_list = frappe.get_all('Employee', fields=['name', 'user_id'],
+		filters={'status': 'Active', 'company': company})
+
+	out = []
+	for e in employee_list:
+		if e.user_id:
+			if only_working and is_holiday(e.name):
+				# don't add if holiday
+				continue
+			out.append(e.user_id)
+
+	return out
+
+
diff --git a/erpnext/hr/doctype/daily_work_summary/test_daily_work_summary.py b/erpnext/hr/doctype/daily_work_summary/test_daily_work_summary.py
new file mode 100644
index 0000000..b8e70e2
--- /dev/null
+++ b/erpnext/hr/doctype/daily_work_summary/test_daily_work_summary.py
@@ -0,0 +1,80 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import os
+import frappe
+import unittest
+import frappe.utils
+
+# test_records = frappe.get_test_records('Daily Work Summary')
+
+class TestDailyWorkSummary(unittest.TestCase):
+	def test_email_trigger(self):
+		settings, employees, emails = self.setup_and_prepare_test()
+
+		for d in employees:
+			# check that email is sent to this employee
+			self.assertTrue(d.user_id in [d.recipient for d in emails
+				if settings.subject in d.message])
+
+	def test_email_trigger_failed(self):
+		hour = '00'
+		if frappe.utils.nowtime().split(':')[0]=='00':
+			hour = '01'
+
+		settings, employees, emails = self.setup_and_prepare_test(hour)
+
+		for d in employees:
+			# check that email is sent to this employee
+			self.assertFalse(d.user_id in [d.recipient for d in emails
+				if settings.subject in d.message])
+
+	def test_incoming(self):
+		settings, employees, emails = self.setup_and_prepare_test()
+
+		# get test mail with message-id as in-reply-to
+		with open(os.path.join(os.path.dirname(__file__), "test_data", "test-reply.raw"), "r") as f:
+			test_mails = [f.read().replace('{{ sender }}', employees[-1].user_id)\
+				.replace('{{ message_id }}', emails[-1].message_id)]
+
+		# pull the mail
+		email_account = frappe.get_doc("Email Account", "_Test Email Account 1")
+		email_account.db_set('enable_incoming', 1)
+		email_account.receive(test_mails=test_mails)
+
+		daily_work_summary = frappe.get_doc('Daily Work Summary',
+			frappe.get_all('Daily Work Summary')[0].name)
+
+		summary = daily_work_summary.get_summary_message()
+
+		self.assertTrue('I built Daily Work Summary!' in summary)
+
+	def setup_and_prepare_test(self, hour=None):
+		if not hour:
+			hour = frappe.utils.nowtime().split(':')[0]
+		frappe.db.sql('delete from `tabDaily Work Summary`')
+		frappe.db.sql('delete from `tabEmail Queue`')
+		frappe.db.sql('delete from `tabCommunication`')
+
+		# setup email to trigger at this our
+		settings = frappe.get_doc('Daily Work Summary Settings')
+		settings.companies = []
+
+		settings.append('companies', dict(company='_Test Company',
+			send_emails_at=hour + ':00'))
+		settings.test_subject = 'this is a subject for testing summary emails'
+		settings.save()
+
+		from erpnext.hr.doctype.daily_work_summary_settings.daily_work_summary_settings \
+			import trigger_emails
+		trigger_emails()
+
+		# check if emails are created
+		employees = frappe.get_all('Employee', fields = ['user_id'],
+			filters=dict(company='_Test Company', status='Active'))
+
+		emails = frappe.get_all('Email Queue', fields=['recipient', 'message', 'message_id'])
+
+		return settings, employees, emails
\ No newline at end of file
diff --git a/erpnext/hr/doctype/daily_work_summary/test_data/test-reply.raw b/erpnext/hr/doctype/daily_work_summary/test_data/test-reply.raw
new file mode 100644
index 0000000..ba01bc2
--- /dev/null
+++ b/erpnext/hr/doctype/daily_work_summary/test_data/test-reply.raw
@@ -0,0 +1,75 @@
+From: {{ sender }}
+Content-Type: multipart/alternative;
+	boundary="Apple-Mail=_29597CF7-20DD-4184-B3FA-85582C5C4361"
+Message-Id: <07D687F6-10AA-4B9F-82DE-27753096164E@gmail.com>
+Mime-Version: 1.0 (Mac OS X Mail 9.3 \(3124\))
+X-Smtp-Server: 73CC8281-7E8F-4B47-8324-D5DA86EEDD4F
+Subject: Re: What did you work on today?
+Date: Thu, 10 Nov 2016 16:04:43 +0530
+X-Universally-Unique-Identifier: A4D9669F-179C-42D8-A3D3-AA6A8C49A6F2
+References: <{{ message_id }}>
+To: test_in@iwebnotes.com
+In-Reply-To: <{{ message_id }}>
+
+
+--Apple-Mail=_29597CF7-20DD-4184-B3FA-85582C5C4361
+Content-Transfer-Encoding: quoted-printable
+Content-Type: text/plain;
+	charset=us-ascii
+
+I built Daily Work Summary!
+
+> On 10-Nov-2016, at 3:20 PM, Frappe <test@erpnext.com> wrote:
+>=20
+> Please share what did you do today. If you reply by midnight, your =
+response will be recorded!
+>=20
+> This email was sent to rmehta@gmail.com
+> Unsubscribe from this list =
+<http://demo-test.erpnext.com.dev/api/method/frappe.email.queue.unsubscrib=
+e?email=3Drmehta%40gmail.com&name=3D26cc3e5a5d&doctype=3DDaily+Work+Summar=
+y&_signature=3D2c7ab37e6d775e5a481e9b4376154a41>
+> Sent via ERPNext <https://erpnext.com/?source=3Dvia_email_footer>
+
+
+--Apple-Mail=_29597CF7-20DD-4184-B3FA-85582C5C4361
+Content-Transfer-Encoding: 7bit
+Content-Type: text/html;
+	charset=us-ascii
+
+<html><head><meta http-equiv="Content-Type" content="text/html charset=us-ascii"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class="">I built Daily Work Summary!<div class=""><br class=""><div><blockquote type="cite" class=""><div class="">On 10-Nov-2016, at 3:20 PM, Frappe &lt;<a href="mailto:test@erpnext.com" class="">test@erpnext.com</a>&gt; wrote:</div><br class="Apple-interchange-newline"><div class="">
+
+
+<meta name="viewport" content="width=device-width" class="">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" class="">
+<title class="">What did you work on today?</title>
+
+<div style="line-height: 1.5; color: #36414C;" class="">
+<!-- body -->
+<div style="font-family: -apple-system, BlinkMacSystemFont,
+	    " segoe="" ui",="" "roboto",="" "oxygen",="" "ubuntu",="" "cantarell",="" "fira="" sans",="" "droid="" "helvetica="" neue",="" sans-serif;="" font-size:="" 14px;="" padding:="" 10px;"="" class=""><p class="">Please share what did you do today. If you reply by midnight, your response will be recorded!</p>
+
+</div>
+
+<!-- footer -->
+<div style="margin-top: 30px; font-family: Helvetica, Arial, sans-serif; font-size: 11px;
+    margin-bottom: 15px; border-top: 1px solid #d1d8dd;" data-email-footer="true" class="">
+	<div style="margin: 15px auto; padding: 0px 7px; text-align: center; color: #8d99a6;" class="">
+			This email was sent to <a href="mailto:rmehta@gmail.com" class="">rmehta@gmail.com</a>
+			<p style="margin: 15px auto;" class="">
+				<a href="http://demo-test.erpnext.com.dev/api/method/frappe.email.queue.unsubscribe?email=rmehta%40gmail.com&amp;name=26cc3e5a5d&amp;doctype=Daily+Work+Summary&amp;_signature=2c7ab37e6d775e5a481e9b4376154a41" style="color: #8d99a6; text-decoration: underline;
+					target=" _blank"="" class="">Unsubscribe from this list
+				</a>
+			</p>
+		</div><div style="margin: 15px auto;" class=""><div style="text-align: center;" class="">
+	<a href="https://erpnext.com/?source=via_email_footer" target="_blank" style="color: #8d99a6;" class="">
+		Sent via ERPNext
+	</a>
+</div></div>
+</div>
+<!-- /footer -->
+
+<div class="print-html"></div>
+</div>
+</div></blockquote></div><br class=""></div></body></html>
+--Apple-Mail=_29597CF7-20DD-4184-B3FA-85582C5C4361--
diff --git a/erpnext/schools/doctype/scheduling_tool/__init__.py b/erpnext/hr/doctype/daily_work_summary_settings/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/scheduling_tool/__init__.py
copy to erpnext/hr/doctype/daily_work_summary_settings/__init__.py
diff --git a/erpnext/hr/doctype/daily_work_summary_settings/daily_work_summary_settings.js b/erpnext/hr/doctype/daily_work_summary_settings/daily_work_summary_settings.js
new file mode 100644
index 0000000..f5c0a5c
--- /dev/null
+++ b/erpnext/hr/doctype/daily_work_summary_settings/daily_work_summary_settings.js
@@ -0,0 +1,10 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Daily Work Summary Settings', {
+	refresh: function(frm) {
+		frm.add_custom_button(__('Daily Work Summary'), function() {
+			frappe.set_route('List', 'Daily Work Summary');
+		});
+	}
+});
diff --git a/erpnext/hr/doctype/daily_work_summary_settings/daily_work_summary_settings.json b/erpnext/hr/doctype/daily_work_summary_settings/daily_work_summary_settings.json
new file mode 100644
index 0000000..f52af39
--- /dev/null
+++ b/erpnext/hr/doctype/daily_work_summary_settings/daily_work_summary_settings.json
@@ -0,0 +1,204 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2016-11-08 04:55:08.231715", 
+ "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, 
+   "description": "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.", 
+   "fieldname": "select_companies", 
+   "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": "Select Companies", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "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": "companies", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Companies", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Daily Work Summary Settings Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "message_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": "Message", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "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": "What did you work on today?", 
+   "fieldname": "subject", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Subject", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "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": "<p>Please share what did you do today. If you reply by midnight, your response will be recorded!</p>", 
+   "fieldname": "message", 
+   "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": "Message", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_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": 1, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2016-11-21 00:55:20.726328", 
+ "modified_by": "Administrator", 
+ "module": "HR", 
+ "name": "Daily Work Summary Settings", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "is_custom": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 0, 
+   "role": "HR Manager", 
+   "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_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/daily_work_summary_settings/daily_work_summary_settings.py b/erpnext/hr/doctype/daily_work_summary_settings/daily_work_summary_settings.py
new file mode 100644
index 0000000..aea4c35
--- /dev/null
+++ b/erpnext/hr/doctype/daily_work_summary_settings/daily_work_summary_settings.py
@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+import frappe.utils
+from frappe import _
+from erpnext.hr.doctype.daily_work_summary.daily_work_summary import get_employee_emails
+
+class DailyWorkSummarySettings(Document):
+	def validate(self):
+		if self.companies:
+			if not frappe.flags.in_test and not frappe.db.get_value('Email Account', dict(enable_incoming=1,
+				default_incoming=1)):
+				frappe.throw(_('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.'))
+
+def trigger_emails():
+	'''Send emails to Employees of the enabled companies at the give hour asking
+	them what did they work on today'''
+	settings = frappe.get_doc('Daily Work Summary Settings')
+	for d in settings.companies:
+		# if current hour
+		if frappe.utils.nowtime().split(':')[0] == d.send_emails_at.split(':')[0]:
+			emails = get_employee_emails(d.company)
+			# find emails relating to a company
+			if emails:
+				daily_work_summary = frappe.get_doc(dict(doctype='Daily Work Summary',
+					company=d.company)).insert()
+				daily_work_summary.send_mails(settings, emails)
+
+def send_summary():
+	'''Send summary to everyone'''
+	for d in frappe.get_all('Daily Work Summary', dict(status='Open')):
+		daily_work_summary = frappe.get_doc('Daily Work Summary', d.name)
+		daily_work_summary.send_summary()
\ No newline at end of file
diff --git a/erpnext/schools/doctype/scheduling_tool/__init__.py b/erpnext/hr/doctype/daily_work_summary_settings_company/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/scheduling_tool/__init__.py
copy to erpnext/hr/doctype/daily_work_summary_settings_company/__init__.py
diff --git a/erpnext/hr/doctype/daily_work_summary_settings_company/daily_work_summary_settings_company.json b/erpnext/hr/doctype/daily_work_summary_settings_company/daily_work_summary_settings_company.json
new file mode 100644
index 0000000..be27fa3
--- /dev/null
+++ b/erpnext/hr/doctype/daily_work_summary_settings_company/daily_work_summary_settings_company.json
@@ -0,0 +1,97 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2016-11-08 05:44:02.502527", 
+ "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": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "17:00", 
+   "fieldname": "send_emails_at", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Send Emails At", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "00:00\n01:00\n02:00\n03:00\n04:00\n05:00\n06:00\n07:00\n08:00\n09:00\n10:00\n11:00\n12:00\n13:00\n14:00\n15:00\n16:00\n17:00\n18:00\n19:00\n20:00\n21:00\n22:00\n23:00", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_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": 1, 
+ "max_attachments": 0, 
+ "modified": "2016-11-08 05:46:09.198788", 
+ "modified_by": "Administrator", 
+ "module": "HR", 
+ "name": "Daily Work Summary Settings Company", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/daily_work_summary_settings_company/daily_work_summary_settings_company.py b/erpnext/hr/doctype/daily_work_summary_settings_company/daily_work_summary_settings_company.py
new file mode 100644
index 0000000..cd051b4
--- /dev/null
+++ b/erpnext/hr/doctype/daily_work_summary_settings_company/daily_work_summary_settings_company.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class DailyWorkSummarySettingsCompany(Document):
+	pass
diff --git a/erpnext/hr/doctype/department/department.json b/erpnext/hr/doctype/department/department.json
index cd65d17..e19f175 100644
--- a/erpnext/hr/doctype/department/department.json
+++ b/erpnext/hr/doctype/department/department.json
@@ -66,7 +66,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-sitemap", 
+ "icon": "fa fa-sitemap", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
diff --git a/erpnext/hr/doctype/designation/designation.json b/erpnext/hr/doctype/designation/designation.json
index 73f4446..1e70196 100644
--- a/erpnext/hr/doctype/designation/designation.json
+++ b/erpnext/hr/doctype/designation/designation.json
@@ -64,7 +64,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-bookmark", 
+ "icon": "fa fa-bookmark", 
  "idx": 1, 
  "in_create": 0, 
  "in_dialog": 0, 
diff --git a/erpnext/hr/doctype/employee/employee.js b/erpnext/hr/doctype/employee/employee.js
index f69f4e5..98f9f6e 100755
--- a/erpnext/hr/doctype/employee/employee.js
+++ b/erpnext/hr/doctype/employee/employee.js
@@ -40,6 +40,24 @@
 				"Ms": "Female"
 			}[this.frm.doc.salutation]);
 		}
+	},
+	
+});
+frappe.ui.form.on('Employee',{
+	prefered_contact_email:function(frm){
+		frm.events.update_contact(frm)
+	},
+	personal_email:function(frm){
+		frm.events.update_contact(frm)
+	},
+	company_email:function(frm){
+		frm.events.update_contact(frm)
+	},
+	user_id:function(frm){
+		frm.events.update_contact(frm)
+	},
+	update_contact:function(frm){
+		frm.set_value("prefered_email",frm.fields_dict[frappe.model.scrub(frm.doc.prefered_contact_email)].value)
 	}
 });
 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 2677ac0..5ded5a0 100644
--- a/erpnext/hr/doctype/employee/employee.json
+++ b/erpnext/hr/doctype/employee/employee.json
@@ -3,16 +3,19 @@
  "allow_import": 1, 
  "allow_rename": 1, 
  "autoname": "naming_series:", 
+ "beta": 0, 
  "creation": "2013-03-07 09:04:18", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Setup", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "basic_information", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -20,6 +23,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "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,6 +43,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "employee", 
    "fieldtype": "Data", 
    "hidden": 1, 
@@ -45,6 +51,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Employee", 
    "length": 0, 
    "no_copy": 1, 
@@ -52,6 +59,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, 
@@ -62,6 +70,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "naming_series", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -69,6 +78,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Series", 
    "length": 0, 
    "no_copy": 1, 
@@ -79,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, 
@@ -89,6 +100,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "salutation", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -96,6 +108,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Salutation", 
    "length": 0, 
    "no_copy": 0, 
@@ -106,6 +119,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 +130,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "employee_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -123,6 +138,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Full Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -132,6 +148,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, 
@@ -142,6 +159,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "company", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -149,6 +167,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -157,6 +176,7 @@
    "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, 
@@ -167,6 +187,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "System User (login) ID. If set, it will become default for all HR forms.", 
    "fieldname": "user_id", 
    "fieldtype": "Link", 
@@ -175,6 +196,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "User ID", 
    "length": 0, 
    "no_copy": 0, 
@@ -183,6 +205,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,6 +216,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "image", 
    "fieldtype": "Attach Image", 
    "hidden": 1, 
@@ -200,14 +224,16 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Image", 
    "length": 0, 
-   "no_copy": 0, 
+   "no_copy": 1, 
    "options": "", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -218,6 +244,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break1", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -225,12 +252,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, 
@@ -242,6 +271,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "employee_number", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -249,6 +279,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Employee Number", 
    "length": 0, 
    "no_copy": 0, 
@@ -258,6 +289,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,6 +300,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "date_of_joining", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -275,6 +308,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Date of Joining", 
    "length": 0, 
    "no_copy": 0, 
@@ -284,6 +318,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, 
@@ -294,6 +329,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "You can enter any date manually", 
    "fieldname": "date_of_birth", 
    "fieldtype": "Date", 
@@ -302,6 +338,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Date of Birth", 
    "length": 0, 
    "no_copy": 0, 
@@ -311,6 +348,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, 
@@ -321,6 +359,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "gender", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -328,6 +367,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Gender", 
    "length": 0, 
    "no_copy": 0, 
@@ -338,6 +378,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, 
@@ -348,6 +389,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "employment_details", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -355,6 +397,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Employment Details", 
    "length": 0, 
    "no_copy": 0, 
@@ -362,6 +405,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, 
@@ -372,6 +416,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "Active", 
    "fieldname": "status", 
    "fieldtype": "Select", 
@@ -380,6 +425,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Status", 
    "length": 0, 
    "no_copy": 0, 
@@ -390,6 +436,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, 
@@ -400,6 +447,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "employment_type", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -407,6 +455,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Employment Type", 
    "length": 0, 
    "no_copy": 0, 
@@ -417,6 +466,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, 
@@ -427,6 +477,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "Applicable Holiday List", 
    "fieldname": "holiday_list", 
    "fieldtype": "Link", 
@@ -435,6 +486,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Holiday List", 
    "length": 0, 
    "no_copy": 0, 
@@ -445,6 +497,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, 
@@ -455,6 +508,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "col_break_22", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -462,12 +516,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, 
@@ -478,6 +534,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "scheduled_confirmation_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -485,6 +542,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Offer Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -494,6 +552,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, 
@@ -504,6 +563,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "final_confirmation_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -511,6 +571,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Confirmation Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -520,6 +581,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, 
@@ -530,6 +592,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "contract_end_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -537,6 +600,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Contract End Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -546,6 +610,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,6 +621,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "date_of_retirement", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -563,6 +629,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Date Of Retirement", 
    "length": 0, 
    "no_copy": 0, 
@@ -572,6 +639,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, 
@@ -582,6 +650,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "job_profile", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -589,6 +658,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Job Profile", 
    "length": 0, 
    "no_copy": 0, 
@@ -596,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, 
@@ -606,6 +677,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "branch", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -613,6 +685,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Branch", 
    "length": 0, 
    "no_copy": 0, 
@@ -623,6 +696,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, 
@@ -633,6 +707,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "department", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -640,6 +715,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Department", 
    "length": 0, 
    "no_copy": 0, 
@@ -650,6 +726,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, 
@@ -660,6 +737,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "designation", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -667,6 +745,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Designation", 
    "length": 0, 
    "no_copy": 0, 
@@ -677,6 +756,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, 
@@ -687,6 +767,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "Provide email id registered in company", 
    "fieldname": "company_email", 
    "fieldtype": "Data", 
@@ -695,6 +776,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Company Email", 
    "length": 0, 
    "no_copy": 0, 
@@ -705,6 +787,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, 
@@ -715,6 +798,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "notice_number_of_days", 
    "fieldtype": "Int", 
    "hidden": 0, 
@@ -722,6 +806,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Notice (days)", 
    "length": 0, 
    "no_copy": 0, 
@@ -731,6 +816,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, 
@@ -741,6 +827,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "salary_information", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -748,6 +835,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Salary Information", 
    "length": 0, 
    "no_copy": 0, 
@@ -756,6 +844,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, 
@@ -767,6 +856,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "salary_mode", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -774,6 +864,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Salary Mode", 
    "length": 0, 
    "no_copy": 0, 
@@ -784,6 +875,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, 
@@ -794,6 +886,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.salary_mode == 'Bank'", 
    "fieldname": "bank_name", 
    "fieldtype": "Data", 
@@ -802,6 +895,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Bank Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -811,6 +905,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, 
@@ -821,6 +916,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.salary_mode == 'Bank'", 
    "fieldname": "bank_ac_no", 
    "fieldtype": "Data", 
@@ -829,6 +925,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Bank A/C No.", 
    "length": 0, 
    "no_copy": 0, 
@@ -838,6 +935,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, 
@@ -848,6 +946,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "organization_profile", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -855,6 +954,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Organization Profile", 
    "length": 0, 
    "no_copy": 0, 
@@ -862,6 +962,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, 
@@ -872,6 +973,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "reports_to", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -879,6 +981,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Reports to", 
    "length": 0, 
    "no_copy": 0, 
@@ -889,6 +992,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, 
@@ -899,6 +1003,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "The first Leave Approver in the list will be set as the default Leave Approver", 
    "fieldname": "leave_approvers", 
    "fieldtype": "Table", 
@@ -907,6 +1012,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Leave Approvers", 
    "length": 0, 
    "no_copy": 0, 
@@ -915,6 +1021,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, 
@@ -925,6 +1032,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "contact_details", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -932,6 +1040,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Contact Details", 
    "length": 0, 
    "no_copy": 0, 
@@ -939,6 +1048,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, 
@@ -949,6 +1059,66 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
+   "default": "", 
+   "fieldname": "prefered_contact_email", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Prefered Contact Email", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nCompany Email\nPersonal Email\nUser ID", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "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": "prefered_email", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Prefered Email", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Email", 
+   "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": "cell_number", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -956,6 +1126,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Cell Number", 
    "length": 0, 
    "no_copy": 0, 
@@ -963,6 +1134,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, 
@@ -973,6 +1145,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "personal_email", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -980,6 +1153,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Personal Email", 
    "length": 0, 
    "no_copy": 0, 
@@ -988,6 +1162,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, 
@@ -998,6 +1173,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "unsubscribed", 
    "fieldtype": "Check", 
    "hidden": 0, 
@@ -1005,6 +1181,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Unsubscribed", 
    "length": 0, 
    "no_copy": 0, 
@@ -1012,6 +1189,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, 
@@ -1022,6 +1200,7 @@
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "person_to_be_contacted", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -1029,6 +1208,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Emergency Contact", 
    "length": 0, 
    "no_copy": 0, 
@@ -1036,6 +1216,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, 
@@ -1046,6 +1227,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "relation", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -1053,6 +1235,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Relation", 
    "length": 0, 
    "no_copy": 0, 
@@ -1060,6 +1243,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, 
@@ -1070,6 +1254,7 @@
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "emergency_phone_number", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -1077,6 +1262,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Emergency Phone", 
    "length": 0, 
    "no_copy": 0, 
@@ -1084,6 +1270,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, 
@@ -1094,6 +1281,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break4", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -1101,12 +1289,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, 
@@ -1118,6 +1308,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "permanent_accommodation_type", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -1125,6 +1316,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Permanent Address Is", 
    "length": 0, 
    "no_copy": 0, 
@@ -1133,6 +1325,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, 
@@ -1143,6 +1336,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "permanent_address", 
    "fieldtype": "Small Text", 
    "hidden": 0, 
@@ -1150,6 +1344,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Permanent Address", 
    "length": 0, 
    "no_copy": 0, 
@@ -1157,6 +1352,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, 
@@ -1167,6 +1363,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "current_accommodation_type", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -1174,6 +1371,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Current Address Is", 
    "length": 0, 
    "no_copy": 0, 
@@ -1182,6 +1380,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, 
@@ -1192,6 +1391,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "current_address", 
    "fieldtype": "Small Text", 
    "hidden": 0, 
@@ -1199,6 +1399,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Current Address", 
    "length": 0, 
    "no_copy": 0, 
@@ -1206,6 +1407,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, 
@@ -1216,6 +1418,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "sb53", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -1223,6 +1426,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
@@ -1230,6 +1434,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, 
@@ -1240,6 +1445,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "Short biography for website and other publications.", 
    "fieldname": "bio", 
    "fieldtype": "Text Editor", 
@@ -1248,6 +1454,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Bio", 
    "length": 0, 
    "no_copy": 0, 
@@ -1255,6 +1462,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, 
@@ -1265,6 +1473,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "personal_details", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -1272,6 +1481,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Personal Details", 
    "length": 0, 
    "no_copy": 0, 
@@ -1279,6 +1489,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, 
@@ -1289,6 +1500,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "passport_number", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -1296,6 +1508,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Passport Number", 
    "length": 0, 
    "no_copy": 0, 
@@ -1303,6 +1516,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, 
@@ -1313,6 +1527,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "date_of_issue", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -1320,6 +1535,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Date of Issue", 
    "length": 0, 
    "no_copy": 0, 
@@ -1327,6 +1543,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, 
@@ -1337,6 +1554,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "valid_upto", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -1344,6 +1562,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Valid Upto", 
    "length": 0, 
    "no_copy": 0, 
@@ -1351,6 +1570,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, 
@@ -1361,6 +1581,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "place_of_issue", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -1368,6 +1589,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Place of Issue", 
    "length": 0, 
    "no_copy": 0, 
@@ -1375,6 +1597,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, 
@@ -1385,6 +1608,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break6", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -1392,12 +1616,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, 
@@ -1409,6 +1635,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "marital_status", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -1416,6 +1643,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Marital Status", 
    "length": 0, 
    "no_copy": 0, 
@@ -1424,6 +1652,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, 
@@ -1434,6 +1663,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "blood_group", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -1441,6 +1671,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Blood Group", 
    "length": 0, 
    "no_copy": 0, 
@@ -1449,6 +1680,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, 
@@ -1459,6 +1691,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "Here you can maintain family details like name and occupation of parent, spouse and children", 
    "fieldname": "family_background", 
    "fieldtype": "Small Text", 
@@ -1467,6 +1700,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Family Background", 
    "length": 0, 
    "no_copy": 0, 
@@ -1474,6 +1708,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, 
@@ -1484,6 +1719,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "Here you can maintain height, weight, allergies, medical concerns etc", 
    "fieldname": "health_details", 
    "fieldtype": "Small Text", 
@@ -1492,6 +1728,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Health Details", 
    "length": 0, 
    "no_copy": 0, 
@@ -1499,6 +1736,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, 
@@ -1509,6 +1747,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "educational_qualification", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -1516,6 +1755,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Educational Qualification", 
    "length": 0, 
    "no_copy": 0, 
@@ -1523,6 +1763,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, 
@@ -1533,6 +1774,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "education", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -1540,6 +1782,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Education", 
    "length": 0, 
    "no_copy": 0, 
@@ -1548,6 +1791,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, 
@@ -1558,6 +1802,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "previous_work_experience", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -1565,6 +1810,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Previous Work Experience", 
    "length": 0, 
    "no_copy": 0, 
@@ -1573,6 +1819,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, 
@@ -1583,6 +1830,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "external_work_history", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -1590,6 +1838,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "External Work History", 
    "length": 0, 
    "no_copy": 0, 
@@ -1598,6 +1847,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, 
@@ -1608,6 +1858,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "history_in_company", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -1615,6 +1866,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "History In Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -1623,6 +1875,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, 
@@ -1633,6 +1886,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "internal_work_history", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -1640,6 +1894,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Internal Work History", 
    "length": 0, 
    "no_copy": 0, 
@@ -1648,6 +1903,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, 
@@ -1658,6 +1914,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "exit", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -1665,6 +1922,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Exit", 
    "length": 0, 
    "no_copy": 0, 
@@ -1673,6 +1931,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, 
@@ -1683,6 +1942,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "resignation_letter_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -1690,6 +1950,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Resignation Letter Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -1699,6 +1960,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, 
@@ -1709,6 +1971,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "relieving_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -1716,6 +1979,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Relieving Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -1725,6 +1989,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, 
@@ -1735,6 +2000,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "reason_for_leaving", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -1742,6 +2008,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Reason for Leaving", 
    "length": 0, 
    "no_copy": 0, 
@@ -1751,6 +2018,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, 
@@ -1761,6 +2029,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "leave_encashed", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -1768,6 +2037,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Leave Encashed?", 
    "length": 0, 
    "no_copy": 0, 
@@ -1778,6 +2048,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, 
@@ -1788,6 +2059,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "encashment_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -1795,6 +2067,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Encashment Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -1804,6 +2077,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, 
@@ -1814,6 +2088,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "exit_interview_details", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -1821,6 +2096,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Exit Interview Details", 
    "length": 0, 
    "no_copy": 0, 
@@ -1830,6 +2106,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, 
@@ -1841,6 +2118,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "held_on", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -1848,6 +2126,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Held On", 
    "length": 0, 
    "no_copy": 0, 
@@ -1857,6 +2136,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, 
@@ -1867,6 +2147,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "reason_for_resignation", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -1874,6 +2155,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Reason for Resignation", 
    "length": 0, 
    "no_copy": 0, 
@@ -1884,6 +2166,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, 
@@ -1894,6 +2177,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "new_workplace", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -1901,6 +2185,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "New Workplace", 
    "length": 0, 
    "no_copy": 0, 
@@ -1910,6 +2195,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, 
@@ -1920,6 +2206,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "feedback", 
    "fieldtype": "Small Text", 
    "hidden": 0, 
@@ -1927,6 +2214,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Feedback", 
    "length": 0, 
    "no_copy": 0, 
@@ -1936,6 +2224,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, 
@@ -1945,16 +2234,17 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-user", 
+ "icon": "fa fa-user", 
  "idx": 24, 
  "image_field": "image", 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-04-04 06:44:59.778649", 
+ "modified": "2016-11-07 05:15:16.925799", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Employee", 
@@ -1970,6 +2260,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1990,6 +2281,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -2011,6 +2303,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -2022,6 +2315,7 @@
    "write": 1
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "employee_name", 
diff --git a/erpnext/hr/doctype/employee/employee.py b/erpnext/hr/doctype/employee/employee.py
index 2e5fb26..e2e541b 100755
--- a/erpnext/hr/doctype/employee/employee.py
+++ b/erpnext/hr/doctype/employee/employee.py
@@ -9,7 +9,6 @@
 from frappe import throw, _
 import frappe.permissions
 from frappe.model.document import Document
-from frappe.model.mapper import get_mapped_doc
 from erpnext.utilities.transaction_base import delete_events
 
 
@@ -164,7 +163,6 @@
 
 @frappe.whitelist()
 def get_retirement_date(date_of_birth=None):
-	import datetime
 	ret = {}
 	if date_of_birth:
 		try:
@@ -233,3 +231,16 @@
 
 	return holiday_list
 
+def is_holiday(employee, date=None):
+	'''Returns True if given Employee has an holiday on the given date
+
+	:param employee: Employee `name`
+	:param date: Date to check. Will check for today if None'''
+
+	holiday_list = get_holiday_list_for_employee(employee)
+	if not date:
+		date = today()
+
+	if holiday_list:
+		return frappe.get_all('Holiday List', dict(name=holiday_list, holiday_date=date)) and True or False
+
diff --git a/erpnext/hr/doctype/employee/employee_dashboard.py b/erpnext/hr/doctype/employee/employee_dashboard.py
index 420c1df..7de305d 100644
--- a/erpnext/hr/doctype/employee/employee_dashboard.py
+++ b/erpnext/hr/doctype/employee/employee_dashboard.py
@@ -1,25 +1,26 @@
 from frappe import _
 
-data = {
-	'heatmap': True,
-	'heatmap_message': _('This is based on the attendance of this Employee'),
-	'fieldname': 'employee',
-	'transactions': [
-		{
-			'label': _('Leave and Attendance'),
-			'items': ['Attendance', 'Leave Application', 'Leave Allocation']
-		},
-		{
-			'label': _('Payroll'),
-			'items': ['Salary Structure', 'Salary Slip', 'Timesheet']
-		},
-		{
-			'label': _('Expense'),
-			'items': ['Expense Claim']
-		},
-		{
-			'label': _('Evaluation'),
-			'items': ['Appraisal']
-		}
-	]
-}
\ No newline at end of file
+def get_data():
+	return {
+		'heatmap': True,
+		'heatmap_message': _('This is based on the attendance of this Employee'),
+		'fieldname': 'employee',
+		'transactions': [
+			{
+				'label': _('Leave and Attendance'),
+				'items': ['Attendance', 'Leave Application', 'Leave Allocation']
+			},
+			{
+				'label': _('Payroll'),
+				'items': ['Salary Structure', 'Salary Slip', 'Timesheet']
+			},
+			{
+				'label': _('Expense'),
+				'items': ['Expense Claim']
+			},
+			{
+				'label': _('Evaluation'),
+				'items': ['Appraisal']
+			}
+		]
+	}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js b/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js
index 3493719..de8e17c 100644
--- a/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js
+++ b/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js
@@ -80,14 +80,14 @@
 
 		var row;
 		$.each(employee, function(i, m) {
-			var attendance_icon = "icon-check";
+			var attendance_icon = "fa fa-check";
 			var color_class = "";
 			if(m.status == "Absent") {
-				attendance_icon = "icon-check-empty"
+				attendance_icon = "fa fa-check-empty"
 				color_class = "text-muted";
 			}
 			else if(m.status == "Half Day") {
-				attendance_icon = "icon-check-minus"
+				attendance_icon = "fa fa-check-minus"
 			}
 
 			if (i===0 || i % 4===0) {
diff --git a/erpnext/hr/doctype/employment_type/employment_type.json b/erpnext/hr/doctype/employment_type/employment_type.json
index 3b9604d..6963be2 100644
--- a/erpnext/hr/doctype/employment_type/employment_type.json
+++ b/erpnext/hr/doctype/employment_type/employment_type.json
@@ -40,7 +40,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-flag", 
+ "icon": "fa fa-flag", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
diff --git a/erpnext/hr/doctype/expense_claim/expense_claim.js b/erpnext/hr/doctype/expense_claim/expense_claim.js
index bcd8bc0..8b3c451 100644
--- a/erpnext/hr/doctype/expense_claim/expense_claim.js
+++ b/erpnext/hr/doctype/expense_claim/expense_claim.js
@@ -129,9 +129,6 @@
 	doc.total_sanctioned_amount = 0;
 	$.each((doc.expenses || []), function(i, d) {
 		doc.total_claimed_amount += d.claim_amount;
-		if(d.sanctioned_amount==null) {
-			d.sanctioned_amount = d.claim_amount;
-		}
 		doc.total_sanctioned_amount += d.sanctioned_amount;
 	});
 
@@ -144,17 +141,6 @@
 	cur_frm.cscript.calculate_total(doc,cdt,cdn);
 }
 
-cur_frm.cscript.claim_amount = function(doc,cdt,cdn){
-	cur_frm.cscript.calculate_total(doc,cdt,cdn);
-
-	var child = locals[cdt][cdn];
-	refresh_field("sanctioned_amount", child.name, child.parentfield);
-}
-
-cur_frm.cscript.sanctioned_amount = function(doc,cdt,cdn){
-	cur_frm.cscript.calculate_total(doc,cdt,cdn);
-}
-
 cur_frm.cscript.on_submit = function(doc, cdt, cdn) {
 	if(cint(frappe.boot.notification_settings && frappe.boot.notification_settings.expense_claim)) {
 		cur_frm.email_doc(frappe.boot.notification_settings.expense_claim_message);
@@ -172,6 +158,25 @@
 	}
 }
 
+frappe.ui.form.on("Expense Claim Detail", {
+	claim_amount: function(frm, cdt, cdn) {
+		var child = locals[cdt][cdn];
+		var doc = frm.doc;
+
+		if(!child.sanctioned_amount){
+			frappe.model.set_value(cdt, cdn, 'sanctioned_amount', child.claim_amount)
+		}
+
+		cur_frm.cscript.calculate_total(doc,cdt,cdn);
+	},
+
+	sanctioned_amount: function(frm, cdt, cdn) {
+		var doc = frm.doc;
+		cur_frm.cscript.calculate_total(doc,cdt,cdn);
+	}
+})
+
+
 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 035f7de..99b20fe 100644
--- a/erpnext/hr/doctype/expense_claim/expense_claim.json
+++ b/erpnext/hr/doctype/expense_claim/expense_claim.json
@@ -3,16 +3,19 @@
  "allow_import": 1, 
  "allow_rename": 0, 
  "autoname": "naming_series:", 
+ "beta": 0, 
  "creation": "2013-01-10 16:34:14", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Setup", 
+ "editable_grid": 0, 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "EXP", 
    "fieldname": "naming_series", 
    "fieldtype": "Select", 
@@ -21,6 +24,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Series", 
    "length": 0, 
    "no_copy": 1, 
@@ -30,6 +34,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, 
@@ -40,6 +45,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "Draft", 
    "depends_on": "eval:!doc.__islocal", 
    "fieldname": "approval_status", 
@@ -49,6 +55,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Approval Status", 
    "length": 0, 
    "no_copy": 1, 
@@ -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": 1, 
@@ -69,6 +77,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "A user with \"Expense Approver\" role", 
    "fieldname": "exp_approver", 
    "fieldtype": "Link", 
@@ -77,6 +86,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Approver", 
    "length": 0, 
    "no_copy": 0, 
@@ -87,6 +97,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -98,6 +109,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break0", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -105,6 +117,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
@@ -112,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": 0, 
@@ -123,6 +137,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "total_claimed_amount", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -130,6 +145,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Total Claimed Amount", 
    "length": 0, 
    "no_copy": 1, 
@@ -140,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, 
@@ -151,6 +168,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "total_sanctioned_amount", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -158,6 +176,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Sanctioned Amount", 
    "length": 0, 
    "no_copy": 1, 
@@ -168,6 +187,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,6 +199,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "expense_details", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -186,6 +207,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
@@ -194,6 +216,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, 
@@ -204,6 +227,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "expenses", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -211,6 +235,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Expenses", 
    "length": 0, 
    "no_copy": 0, 
@@ -221,6 +246,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, 
@@ -231,6 +257,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "sb1", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -238,6 +265,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "options": "Simple", 
@@ -245,6 +273,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,6 +284,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "Today", 
    "fieldname": "posting_date", 
    "fieldtype": "Date", 
@@ -263,6 +293,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Posting Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -272,6 +303,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, 
@@ -282,6 +314,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "employee", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -289,6 +322,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "From Employee", 
    "length": 0, 
    "no_copy": 0, 
@@ -299,6 +333,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, 
@@ -309,6 +344,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "employee_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -316,6 +352,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Employee Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -325,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, 
@@ -336,6 +374,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "company", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -343,6 +382,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -353,6 +393,7 @@
    "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, 
@@ -363,19 +404,25 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "cb1", 
-   "fieldtype": "Column Break", 
+   "columns": 0, 
+   "fieldname": "vehicle_log", 
+   "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Vehicle Log", 
    "length": 0, 
    "no_copy": 0, 
+   "options": "Vehicle Log", 
    "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, 
@@ -386,6 +433,33 @@
    "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_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, 
@@ -393,6 +467,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Amount Reimbursed", 
    "length": 0, 
    "no_copy": 1, 
@@ -402,6 +477,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, 
@@ -412,6 +488,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "remark", 
    "fieldtype": "Small Text", 
    "hidden": 0, 
@@ -419,6 +496,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Remark", 
    "length": 0, 
    "no_copy": 1, 
@@ -428,6 +506,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, 
@@ -438,6 +517,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "project", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -445,6 +525,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Project", 
    "length": 0, 
    "no_copy": 0, 
@@ -454,6 +535,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, 
@@ -464,6 +546,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "task", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -471,6 +554,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Task", 
    "length": 0, 
    "no_copy": 0, 
@@ -480,6 +564,7 @@
    "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, 
@@ -490,6 +575,7 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "{employee_name}", 
    "fieldname": "title", 
    "fieldtype": "Data", 
@@ -498,6 +584,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Title", 
    "length": 0, 
    "no_copy": 1, 
@@ -506,6 +593,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, 
@@ -516,6 +604,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "email_id", 
    "fieldtype": "Data", 
    "hidden": 1, 
@@ -523,6 +612,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Employees Email Id", 
    "length": 0, 
    "no_copy": 0, 
@@ -532,6 +622,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, 
@@ -542,6 +633,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "amended_from", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -549,6 +641,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amended From", 
    "length": 0, 
    "no_copy": 1, 
@@ -559,6 +652,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, 
@@ -569,8 +663,9 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-money", 
+ "icon": "fa fa-money", 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 1, 
@@ -578,7 +673,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-03-03 04:00:28.190351", 
+ "modified": "2016-11-07 05:52:48.548201", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Expense Claim", 
@@ -594,6 +689,7 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -614,6 +710,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -635,6 +732,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -656,6 +754,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -668,11 +767,13 @@
    "write": 1
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "approval_status,employee,employee_name", 
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "timeline_field": "employee", 
- "title_field": "title"
+ "title_field": "title", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/expense_claim_type/expense_claim_type.json b/erpnext/hr/doctype/expense_claim_type/expense_claim_type.json
index 3d2b251..f59111a 100644
--- a/erpnext/hr/doctype/expense_claim_type/expense_claim_type.json
+++ b/erpnext/hr/doctype/expense_claim_type/expense_claim_type.json
@@ -1,7 +1,7 @@
 {
  "allow_copy": 0, 
  "allow_import": 1, 
- "allow_rename": 0, 
+ "allow_rename": 1, 
  "autoname": "field:expense_type", 
  "beta": 0, 
  "creation": "2012-03-27 14:35:55", 
@@ -10,11 +10,13 @@
  "doctype": "DocType", 
  "document_type": "Setup", 
  "editable_grid": 0, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "expense_type", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -41,6 +43,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "description", 
    "fieldtype": "Small Text", 
    "hidden": 0, 
@@ -68,6 +71,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "accounts", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -93,7 +97,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-flag", 
+ "icon": "fa fa-flag", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
@@ -102,7 +106,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-07-18 12:36:10.096252", 
+ "modified": "2016-11-07 11:54:10.936716", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Expense Claim Type", 
@@ -118,6 +122,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -138,6 +143,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
diff --git a/erpnext/hr/doctype/holiday_list/holiday_list.json b/erpnext/hr/doctype/holiday_list/holiday_list.json
index ea41654..6b71ffc 100644
--- a/erpnext/hr/doctype/holiday_list/holiday_list.json
+++ b/erpnext/hr/doctype/holiday_list/holiday_list.json
@@ -3,16 +3,20 @@
  "allow_import": 1, 
  "allow_rename": 1, 
  "autoname": "field:holiday_list_name", 
+ "beta": 0, 
  "creation": "2013-01-10 16:34:14", 
  "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": "holiday_list_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -20,6 +24,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Holiday List Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -29,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, 
@@ -39,6 +45,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "from_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -46,6 +53,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "From Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -54,6 +62,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,6 +73,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "to_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -71,6 +81,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "To Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -79,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, 
@@ -89,6 +101,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "weekly_off", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -96,6 +109,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Weekly Off", 
    "length": 0, 
    "no_copy": 1, 
@@ -104,6 +118,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, 
@@ -114,6 +129,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "get_weekly_off_dates", 
    "fieldtype": "Button", 
    "hidden": 0, 
@@ -121,6 +137,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Get Weekly Off Dates", 
    "length": 0, 
    "no_copy": 0, 
@@ -129,6 +146,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, 
@@ -139,6 +157,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "holidays", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -146,6 +165,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Holidays", 
    "length": 0, 
    "no_copy": 0, 
@@ -156,6 +176,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -166,6 +187,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "clear_table", 
    "fieldtype": "Button", 
    "hidden": 0, 
@@ -173,6 +195,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Clear Table", 
    "length": 0, 
    "no_copy": 0, 
@@ -181,6 +204,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, 
@@ -190,15 +214,16 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-calendar", 
+ "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": "2016-03-11 05:26:24.819829", 
+ "modified": "2016-11-07 05:31:24.729126", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Holiday List", 
@@ -214,6 +239,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -225,8 +251,10 @@
    "write": 1
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "sort_field": "modified", 
- "sort_order": "DESC"
+ "sort_order": "DESC", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/holiday_list/holiday_list_calendar.js b/erpnext/hr/doctype/holiday_list/holiday_list_calendar.js
index 3cc8dd5..507d070 100644
--- a/erpnext/hr/doctype/holiday_list/holiday_list_calendar.js
+++ b/erpnext/hr/doctype/holiday_list/holiday_list_calendar.js
@@ -3,8 +3,8 @@
 
 frappe.views.calendar["Holiday List"] = {
 	field_map: {
-		"start": "holiday_date",
-		"end": "holiday_date",
+		"start": "from_date",
+		"end": "to_date",
 		"id": "name",
 		"title": "description",
 		"allDay": "allDay"
diff --git a/erpnext/hr/doctype/hr_settings/hr_settings.json b/erpnext/hr/doctype/hr_settings/hr_settings.json
index d7892c7..74c4273 100644
--- a/erpnext/hr/doctype/hr_settings/hr_settings.json
+++ b/erpnext/hr/doctype/hr_settings/hr_settings.json
@@ -167,7 +167,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "default": "1", 
-   "description": "", 
+   "description": "Emails salary slip to employee based on preferred email selected in Employee", 
    "fieldname": "email_salary_slip_to_employee", 
    "fieldtype": "Check", 
    "hidden": 0, 
@@ -217,7 +217,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-cog", 
+ "icon": "fa fa-cog", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
@@ -226,7 +226,7 @@
  "issingle": 1, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-08-10 12:32:39.780599", 
+ "modified": "2016-09-21 11:28:50.687129", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "HR Settings", 
diff --git a/erpnext/hr/doctype/job_applicant/job_applicant.json b/erpnext/hr/doctype/job_applicant/job_applicant.json
index 4af03b6..05e3c46 100644
--- a/erpnext/hr/doctype/job_applicant/job_applicant.json
+++ b/erpnext/hr/doctype/job_applicant/job_applicant.json
@@ -11,11 +11,13 @@
  "doctype": "DocType", 
  "document_type": "Document", 
  "editable_grid": 0, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "applicant_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -23,6 +25,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Applicant 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": 0, 
    "search_index": 0, 
@@ -40,6 +44,7 @@
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "email_id", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -47,6 +52,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Email Id", 
    "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": "status", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -72,6 +80,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Status", 
    "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": 1, 
    "search_index": 0, 
@@ -90,6 +100,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_3", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -97,12 +108,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, 
@@ -114,6 +127,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "job_title", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -121,6 +135,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Job Opening", 
    "length": 0, 
    "no_copy": 0, 
@@ -129,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, 
@@ -139,6 +155,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_6", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -146,6 +163,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -153,6 +171,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, 
@@ -163,6 +182,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "cover_letter", 
    "fieldtype": "Text", 
    "hidden": 0, 
@@ -170,6 +190,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Cover Letter", 
    "length": 0, 
    "no_copy": 0, 
@@ -178,6 +199,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, 
@@ -188,6 +210,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "resume_attachment", 
    "fieldtype": "Attach", 
    "hidden": 0, 
@@ -195,6 +218,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Resume Attachment", 
    "length": 0, 
    "no_copy": 0, 
@@ -203,6 +227,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, 
@@ -212,7 +237,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-user", 
+ "icon": "fa fa-user", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
@@ -221,7 +246,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-07-15 07:10:58.195489", 
+ "modified": "2016-11-07 05:29:24.405606", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Job Applicant", 
@@ -237,6 +262,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
diff --git a/erpnext/hr/doctype/job_opening/job_opening.json b/erpnext/hr/doctype/job_opening/job_opening.json
index 4556ed3..7e28eef 100644
--- a/erpnext/hr/doctype/job_opening/job_opening.json
+++ b/erpnext/hr/doctype/job_opening/job_opening.json
@@ -10,11 +10,14 @@
  "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, 
@@ -22,6 +25,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Job Title", 
    "length": 0, 
    "no_copy": 0, 
@@ -29,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, 
@@ -39,6 +44,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "publish", 
    "fieldtype": "Check", 
    "hidden": 0, 
@@ -46,6 +52,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Publish on website", 
    "length": 0, 
    "no_copy": 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,6 +72,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "publish", 
    "fieldname": "route", 
    "fieldtype": "Data", 
@@ -72,6 +81,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Route", 
    "length": 0, 
    "no_copy": 0, 
@@ -80,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, 
@@ -90,6 +101,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "status", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -97,6 +109,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Status", 
    "length": 0, 
    "no_copy": 0, 
@@ -105,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, 
@@ -115,6 +129,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "Job profile, qualifications required etc.", 
    "fieldname": "description", 
    "fieldtype": "Text Editor", 
@@ -123,6 +138,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Description", 
    "length": 0, 
    "no_copy": 0, 
@@ -130,6 +146,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, 
@@ -139,7 +156,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-bookmark", 
+ "icon": "fa fa-bookmark", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
@@ -148,7 +165,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-06-23 14:45:46.102129", 
+ "modified": "2016-11-07 05:29:33.272398", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Job Opening", 
@@ -164,6 +181,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
diff --git a/erpnext/hr/doctype/leave_allocation/leave_allocation.js b/erpnext/hr/doctype/leave_allocation/leave_allocation.js
index d01f1ba..b7e1f45 100755
--- a/erpnext/hr/doctype/leave_allocation/leave_allocation.js
+++ b/erpnext/hr/doctype/leave_allocation/leave_allocation.js
@@ -11,6 +11,13 @@
 			return {
 				query: "erpnext.controllers.queries.employee_query"
 			}
+		});
+		frm.set_query("leave_type", function() {
+			return {
+				filters: {
+					is_lwp: 0
+				}
+			}
 		})
 	},
 
diff --git a/erpnext/hr/doctype/leave_allocation/leave_allocation.json b/erpnext/hr/doctype/leave_allocation/leave_allocation.json
index 4e768c1..e984bfc 100644
--- a/erpnext/hr/doctype/leave_allocation/leave_allocation.json
+++ b/erpnext/hr/doctype/leave_allocation/leave_allocation.json
@@ -10,6 +10,7 @@
  "doctype": "DocType", 
  "document_type": "Setup", 
  "editable_grid": 0, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -23,12 +24,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, 
@@ -48,6 +51,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Series", 
    "length": 0, 
    "no_copy": 1, 
@@ -57,6 +61,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, 
@@ -75,6 +80,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Employee", 
    "length": 0, 
    "no_copy": 0, 
@@ -85,6 +91,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, 
@@ -103,6 +110,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Employee Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -110,6 +118,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, 
@@ -128,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, 
@@ -153,6 +164,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Description", 
    "length": 0, 
    "no_copy": 0, 
@@ -162,6 +174,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,6 +194,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -188,6 +202,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,6 +221,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Leave Type", 
    "length": 0, 
    "no_copy": 0, 
@@ -216,6 +232,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, 
@@ -234,6 +251,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "From Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -242,6 +260,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, 
@@ -260,6 +279,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "To Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -268,6 +288,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, 
@@ -286,6 +307,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -293,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, 
@@ -311,6 +334,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "New Leaves Allocated", 
    "length": 0, 
    "no_copy": 0, 
@@ -318,6 +342,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, 
@@ -337,6 +362,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Add unused leaves from previous allocations", 
    "length": 0, 
    "no_copy": 0, 
@@ -344,6 +370,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, 
@@ -363,6 +390,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Unused leaves", 
    "length": 0, 
    "no_copy": 0, 
@@ -370,6 +398,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, 
@@ -388,6 +417,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Leaves Allocated", 
    "length": 0, 
    "no_copy": 0, 
@@ -395,6 +425,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, 
@@ -413,6 +444,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amended From", 
    "length": 0, 
    "no_copy": 1, 
@@ -423,6 +455,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, 
@@ -432,7 +465,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-ok", 
+ "icon": "fa fa-ok", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
@@ -441,7 +474,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-09-01 15:09:42.311292", 
+ "modified": "2016-11-07 05:26:00.812083", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Leave Allocation", 
@@ -457,6 +490,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -477,6 +511,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
diff --git a/erpnext/hr/doctype/leave_allocation/leave_allocation.py b/erpnext/hr/doctype/leave_allocation/leave_allocation.py
index 331a82b..3473fd8 100755
--- a/erpnext/hr/doctype/leave_allocation/leave_allocation.py
+++ b/erpnext/hr/doctype/leave_allocation/leave_allocation.py
@@ -23,6 +23,7 @@
 		self.validate_back_dated_allocation()
 		self.set_total_leaves_allocated()
 		self.validate_total_leaves_allocated()
+		self.validate_lwp()
 		set_employee_name(self)
 
 	def on_update_after_submit(self):
@@ -37,6 +38,10 @@
 	def validate_period(self):
 		if date_diff(self.to_date, self.from_date) <= 0:
 			frappe.throw(_("To date cannot be before from date"))
+			
+	def validate_lwp(self):
+		if frappe.db.get_value("Leave Type", self.leave_type, "is_lwp"):
+			frappe.throw(_("Leave Type {0} cannot be allocated since it is leave without pay").format(self.leave_type))
 
 	def validate_new_leaves_allocated_value(self):
 		"""validate that leave allocation is in multiples of 0.5"""
@@ -87,7 +92,10 @@
 			self.from_date, self.to_date)
 		
 		if flt(leaves_taken) > flt(self.total_leaves_allocated):
-			frappe.throw(_("Total allocated leaves {0} cannot be less than already approved leaves {1} for the period").format(self.total_leaves_allocated, leaves_taken), LessAllocationError)
+			if frappe.db.get_value("Leave Type", self.leave_type, "allow_negative"):
+				frappe.msgprint(_("Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period").format(self.total_leaves_allocated, leaves_taken), LessAllocationError)
+			else:
+				frappe.throw(_("Total allocated leaves {0} cannot be less than already approved leaves {1} for the period").format(self.total_leaves_allocated, leaves_taken), LessAllocationError)
 
 @frappe.whitelist()
 def get_carry_forwarded_leaves(employee, leave_type, date, carry_forward=None):
@@ -113,4 +121,4 @@
 def validate_carry_forward(leave_type):
 	if not frappe.db.get_value("Leave Type", leave_type, "is_carry_forward"):
 		frappe.throw(_("Leave Type {0} cannot be carry-forwarded").format(leave_type))
-	
\ No newline at end of file
+	
diff --git a/erpnext/hr/doctype/leave_application/leave_application.json b/erpnext/hr/doctype/leave_application/leave_application.json
index 14e1b67..0238923 100644
--- a/erpnext/hr/doctype/leave_application/leave_application.json
+++ b/erpnext/hr/doctype/leave_application/leave_application.json
@@ -24,6 +24,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Series", 
    "length": 0, 
    "no_copy": 1, 
@@ -33,6 +34,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, 
@@ -52,6 +54,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Status", 
    "length": 0, 
    "no_copy": 1, 
@@ -60,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, 
@@ -78,6 +82,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 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": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Leave Type", 
    "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": 1, 
    "search_index": 1, 
@@ -129,6 +137,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Leave Balance Before Application", 
    "length": 0, 
    "no_copy": 1, 
@@ -136,6 +145,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, 
@@ -154,6 +164,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -161,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, 
@@ -179,6 +191,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "From Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -186,6 +199,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, 
@@ -204,6 +218,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "To Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -211,6 +226,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, 
@@ -229,6 +245,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Half Day", 
    "length": 0, 
    "no_copy": 0, 
@@ -236,6 +253,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, 
@@ -254,6 +272,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Total Leave Days", 
    "length": 0, 
    "no_copy": 1, 
@@ -261,6 +280,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, 
@@ -279,6 +299,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -286,6 +307,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "50%", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -305,6 +327,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Reason", 
    "length": 0, 
    "no_copy": 0, 
@@ -312,6 +335,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, 
@@ -330,6 +354,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -337,6 +362,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, 
@@ -355,6 +381,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Employee", 
    "length": 0, 
    "no_copy": 0, 
@@ -363,6 +390,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, 
@@ -381,6 +409,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Employee Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -388,6 +417,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, 
@@ -406,6 +436,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -413,6 +444,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, 
@@ -432,6 +464,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Leave Approver", 
    "length": 0, 
    "no_copy": 0, 
@@ -440,6 +473,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 +492,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Leave Approver Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -466,6 +501,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, 
@@ -484,6 +520,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
@@ -491,6 +528,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, 
@@ -510,6 +548,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Posting Date", 
    "length": 0, 
    "no_copy": 1, 
@@ -517,6 +556,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, 
@@ -536,6 +576,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Follow via Email", 
    "length": 0, 
    "no_copy": 0, 
@@ -543,6 +584,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, 
@@ -561,12 +603,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, 
@@ -585,6 +629,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -593,6 +638,7 @@
    "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, 
@@ -611,6 +657,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Letter Head", 
    "length": 0, 
    "no_copy": 0, 
@@ -619,6 +666,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, 
@@ -637,6 +685,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amended From", 
    "length": 0, 
    "no_copy": 1, 
@@ -645,6 +694,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, 
@@ -654,7 +704,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-calendar", 
+ "icon": "fa fa-calendar", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
@@ -663,7 +713,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 3, 
- "modified": "2016-09-02 03:49:26.139593", 
+ "modified": "2016-11-07 05:53:59.896341", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Leave Application", 
@@ -679,6 +729,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -700,6 +751,7 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -720,6 +772,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 1, 
    "print": 0, 
    "read": 1, 
@@ -740,6 +793,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -761,6 +815,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -782,6 +837,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 1, 
    "print": 0, 
    "read": 1, 
@@ -802,6 +858,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 1, 
    "print": 0, 
    "read": 1, 
diff --git a/erpnext/hr/doctype/leave_application/leave_application.py b/erpnext/hr/doctype/leave_application/leave_application.py
index 0aabd27..4cc2e10 100755
--- a/erpnext/hr/doctype/leave_application/leave_application.py
+++ b/erpnext/hr/doctype/leave_application/leave_application.py
@@ -38,6 +38,7 @@
 		self.validate_block_days()
 		self.validate_salary_processed_days()
 		self.validate_leave_approver()
+		self.validate_attendance()
 
 	def on_update(self):
 		if (not self.previous_doc and self.leave_approver) or (self.previous_doc and \
@@ -97,12 +98,19 @@
 				.format(formatdate(future_allocation[0].from_date), future_allocation[0].name))
 
 	def validate_salary_processed_days(self):
-		last_processed_pay_slip = frappe.db.sql("""select start_date, end_date from `tabSalary Slip`
-						where docstatus != 2 and employee = %s and ((%s between start_date and end_date) or (%s between start_date and end_date)) order by modified desc limit 1""",(self.employee, self.to_date, self.from_date))
+		if not frappe.db.get_value("Leave Type", self.leave_type, "is_lwp"):
+			return
+			
+		last_processed_pay_slip = frappe.db.sql("""
+			select start_date, end_date from `tabSalary Slip`
+			where docstatus = 1 and employee = %s
+			and ((%s between start_date and end_date) or (%s between start_date and end_date)) 
+			order by modified desc limit 1
+		""",(self.employee, self.to_date, self.from_date))
 
 		if last_processed_pay_slip:
-			frappe.throw(_("Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.").
-					format(formatdate(last_processed_pay_slip[0][0]), formatdate(last_processed_pay_slip[0][1])))
+			frappe.throw(_("Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.").format(formatdate(last_processed_pay_slip[0][0]), 
+				formatdate(last_processed_pay_slip[0][1])))
 
 
 	def show_block_day_warning(self):
@@ -186,7 +194,7 @@
 
 	def validate_max_days(self):
 		max_days = frappe.db.get_value("Leave Type", self.leave_type, "max_days_allowed")
-		if max_days and self.total_leave_days > max_days:
+		if max_days and self.total_leave_days > cint(max_days):
 			frappe.throw(_("Leave of type {0} cannot be longer than {1}").format(self.leave_type, max_days))
 
 	def validate_leave_approver(self):
@@ -205,6 +213,13 @@
 		elif self.docstatus==1 and len(leave_approvers) and self.leave_approver != frappe.session.user:
 			frappe.throw(_("Only the selected Leave Approver can submit this Leave Application"),
 				LeaveApproverIdentityError)
+	
+	def validate_attendance(self):
+		attendance = frappe.db.sql("""select name from `tabAttendance` where employee = %s and (att_date between %s and %s)
+					and docstatus = 1""",
+			(self.employee, self.from_date, self.to_date))
+		if attendance:
+			frappe.throw(_("Attendance for employee {0} is already marked for this day").format(self.employee))		
 
 	def notify_employee(self, status):
 		employee = frappe.get_doc("Employee", self.employee)
@@ -272,7 +287,7 @@
 
 @frappe.whitelist()
 def get_number_of_leave_days(employee, leave_type, from_date, to_date, half_day=None):
-	if half_day:
+	if half_day==1:
 		return 0.5
 	number_of_days = date_diff(to_date, from_date) + 1
 	if not frappe.db.get_value("Leave Type", leave_type, "include_holiday"):
@@ -401,13 +416,13 @@
 	query = """select name, from_date, to_date, employee_name, half_day,
 		status, employee, docstatus
 		from `tabLeave Application` where
-		(from_date between %s and %s or to_date between %s and %s)
+		from_date <= %(end)s and to_date >= %(start)s <= to_date
 		and docstatus < 2
 		and status!="Rejected" """
 	if match_conditions:
 		query += " and " + match_conditions
 
-	for d in frappe.db.sql(query, (start, end, start, end), as_dict=True):
+	for d in frappe.db.sql(query, {"start":start, "end": end}, as_dict=True):
 		e = {
 			"name": d.name,
 			"doctype": "Leave Application",
diff --git a/erpnext/hr/doctype/leave_application/leave_application_list.js b/erpnext/hr/doctype/leave_application/leave_application_list.js
index f82dfb2..966d1aa 100644
--- a/erpnext/hr/doctype/leave_application/leave_application_list.js
+++ b/erpnext/hr/doctype/leave_application/leave_application_list.js
@@ -1,5 +1,5 @@
 frappe.listview_settings['Leave Application'] = {
-	add_fields: ["status", "leave_type", "employee", "employee_name", "total_leave_days", "from_date"],
+	add_fields: ["status", "leave_type", "employee", "employee_name", "total_leave_days", "from_date", "to_date"],
 	filters:[["status","!=", "Rejected"]],
 	get_indicator: function(doc) {
 		return [__(doc.status), frappe.utils.guess_colour(doc.status),
diff --git a/erpnext/hr/doctype/leave_block_list/leave_block_list.js b/erpnext/hr/doctype/leave_block_list/leave_block_list.js
new file mode 100644
index 0000000..7ccf59d
--- /dev/null
+++ b/erpnext/hr/doctype/leave_block_list/leave_block_list.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Leave Block List', {
+	refresh: function(frm) {
+
+	}
+});
diff --git a/erpnext/hr/doctype/leave_block_list/leave_block_list.json b/erpnext/hr/doctype/leave_block_list/leave_block_list.json
index c1328fb..16dbda8 100644
--- a/erpnext/hr/doctype/leave_block_list/leave_block_list.json
+++ b/erpnext/hr/doctype/leave_block_list/leave_block_list.json
@@ -3,17 +3,20 @@
  "allow_import": 1, 
  "allow_rename": 0, 
  "autoname": "field:leave_block_list_name", 
+ "beta": 0, 
  "creation": "2013-02-18 17:43:12", 
  "custom": 0, 
  "description": "Block Holidays on important days.", 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Setup", 
+ "editable_grid": 0, 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "leave_block_list_name", 
    "fieldtype": "Data", 
    "hidden": 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": "company", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -53,6 +58,7 @@
    "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, 
@@ -63,6 +69,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "If not checked, the list will have to be added to each Department where it has to be applied.", 
    "fieldname": "applies_to_all_departments", 
    "fieldtype": "Check", 
@@ -78,6 +85,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, 
@@ -88,6 +96,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "Stop users from making Leave Applications on following days.", 
    "fieldname": "block_days", 
    "fieldtype": "Section Break", 
@@ -103,6 +112,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, 
@@ -113,6 +123,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "leave_block_list_dates", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -128,6 +139,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, 
@@ -138,6 +150,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "Allow the following users to approve Leave Applications for block days.", 
    "fieldname": "allow_list", 
    "fieldtype": "Section Break", 
@@ -153,6 +166,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, 
@@ -163,6 +177,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "leave_block_list_allowed", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -178,6 +193,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,15 +203,16 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-calendar", 
+ "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": "2016-03-07 00:48:25.784577", 
+ "modified": "2016-11-03 16:01:42.171113", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Leave Block List", 
@@ -211,6 +228,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -222,7 +240,9 @@
    "write": 1
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
- "sort_order": "ASC"
+ "sort_order": "ASC", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/leave_control_panel/leave_control_panel.json b/erpnext/hr/doctype/leave_control_panel/leave_control_panel.json
index 17e667e..6e02ff5 100644
--- a/erpnext/hr/doctype/leave_control_panel/leave_control_panel.json
+++ b/erpnext/hr/doctype/leave_control_panel/leave_control_panel.json
@@ -311,7 +311,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 1, 
- "icon": "icon-cog", 
+ "icon": "fa fa-cog", 
  "idx": 1, 
  "in_create": 0, 
  "in_dialog": 0, 
diff --git a/erpnext/hr/doctype/leave_type/leave_type.json b/erpnext/hr/doctype/leave_type/leave_type.json
index e218ecd..9153bbf 100644
--- a/erpnext/hr/doctype/leave_type/leave_type.json
+++ b/erpnext/hr/doctype/leave_type/leave_type.json
@@ -174,7 +174,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-flag", 
+ "icon": "fa fa-flag", 
  "idx": 1, 
  "in_create": 0, 
  "in_dialog": 0, 
diff --git a/erpnext/hr/doctype/offer_letter/offer_letter.json b/erpnext/hr/doctype/offer_letter/offer_letter.json
index 182ba5d..b0a95c3 100644
--- a/erpnext/hr/doctype/offer_letter/offer_letter.json
+++ b/erpnext/hr/doctype/offer_letter/offer_letter.json
@@ -3,23 +3,28 @@
  "allow_import": 1, 
  "allow_rename": 0, 
  "autoname": "Offer-.#####", 
+ "beta": 0, 
  "creation": "2015-03-04 14:20:17.662207", 
  "custom": 0, 
  "default_print_format": "Offer Letter", 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Document", 
+ "editable_grid": 0, 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "job_applicant", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Job Applicant", 
    "length": 0, 
    "no_copy": 0, 
@@ -29,6 +34,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, 
@@ -39,12 +45,15 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "applicant_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Applicant Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -54,6 +63,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, 
@@ -64,12 +74,15 @@
    "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, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 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": 0, 
    "search_index": 0, 
@@ -87,12 +101,15 @@
    "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_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Status", 
    "length": 0, 
    "no_copy": 1, 
@@ -102,6 +119,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, 
@@ -112,13 +130,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "", 
    "fieldname": "offer_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": "Offer Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -127,6 +148,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, 
@@ -137,12 +159,15 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "designation", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Designation", 
    "length": 0, 
    "no_copy": 0, 
@@ -152,6 +177,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, 
@@ -162,12 +188,15 @@
    "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, 
@@ -177,6 +206,7 @@
    "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, 
@@ -187,12 +217,15 @@
    "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_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -200,6 +233,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,12 +244,15 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "offer_terms", 
    "fieldtype": "Table", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Offer Letter Terms", 
    "length": 0, 
    "no_copy": 0, 
@@ -225,6 +262,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, 
@@ -235,12 +273,15 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_14", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -248,6 +289,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, 
@@ -258,12 +300,15 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "select_terms", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Select Terms and Conditions", 
    "length": 0, 
    "no_copy": 0, 
@@ -273,6 +318,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, 
@@ -283,12 +329,15 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "terms", 
    "fieldtype": "Text Editor", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Terms and Conditions", 
    "length": 0, 
    "no_copy": 0, 
@@ -298,6 +347,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,12 +358,15 @@
    "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_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amended From", 
    "length": 0, 
    "no_copy": 1, 
@@ -322,6 +375,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, 
@@ -332,13 +386,14 @@
  "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-02-12 00:33:04.068380", 
+ "modified": "2016-11-07 05:55:03.924272", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Offer Letter", 
@@ -355,6 +410,7 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 1, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -366,9 +422,11 @@
    "write": 1
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
- "title_field": "applicant_name"
+ "title_field": "applicant_name", 
+ "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 1c60a5f..3265f88 100644
--- a/erpnext/hr/doctype/process_payroll/process_payroll.js
+++ b/erpnext/hr/doctype/process_payroll/process_payroll.js
@@ -1,6 +1,61 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
+frappe.ui.form.on("Process Payroll", {
+	onload: function(frm) {
+		frm.doc.posting_date = frm.doc.start_date = frm.doc.end_date = frappe.datetime.nowdate()
+	},
+
+	refresh: function(frm) {
+		frm.disable_save();
+	},
+	
+	payroll_frequency: function(frm) {
+		frm.trigger("set_start_end_dates");
+	},
+	
+	start_date: function(frm) {
+		frm.trigger("set_start_end_dates");
+	},
+	
+	end_date: function(frm) {
+		frm.trigger("set_start_end_dates");
+	},
+
+	payment_account: function(frm) {
+		frm.toggle_display(['make_bank_entry'], (frm.doc.payment_account!="" && frm.doc.payment_account!="undefined"));
+	},
+	
+	set_start_end_dates: function(frm) {
+		if (!frm.doc.salary_slip_based_on_timesheet){
+			frappe.call({
+				method:'erpnext.hr.doctype.process_payroll.process_payroll.get_start_end_dates',
+				args:{
+					payroll_frequency: frm.doc.payroll_frequency,
+					start_date: frm.doc.start_date,
+					end_date: frm.doc.end_date
+				},
+				callback: function(r){
+					if (r.message){
+						frm.set_value('start_date', r.message.start_date);
+						frm.set_value('end_date', r.message.end_date);			
+					}
+				}
+			})
+		}
+	},
+	account: function(frm) {
+		var account_types = ["Bank", "Cash"];
+		return {
+			filters: {
+				"account_type": ["in", account_types],
+				"is_group": 0,
+				"company": frm.doc.company
+			}
+		}
+	}
+})
+
 cur_frm.cscript.display_activity_log = function(msg) {
 	if(!cur_frm.ss_html)
 		cur_frm.ss_html = $a(cur_frm.fields_dict['activity_log'].wrapper,'div');
@@ -26,7 +81,7 @@
 cur_frm.cscript.submit_salary_slip = function(doc, cdt, cdn) {
 	cur_frm.cscript.display_activity_log("");
 
-	frappe.confirm(__("Do you really want to Submit all Salary Slip for month {0} and year {1}", [doc.month, doc.fiscal_year]), function() {
+	frappe.confirm(__("Do you really want to Submit all Salary Slip from {0} to {1}", [doc.start_date, doc.end_date]), function() {
 		// clear all in locals
 		if(locals["Salary Slip"]) {
 			$.each(locals["Salary Slip"], function(name, d) {
@@ -44,22 +99,45 @@
 }
 
 cur_frm.cscript.make_bank_entry = function(doc,cdt,cdn){
-    if(doc.company && doc.month && doc.fiscal_year){
-    	cur_frm.cscript.make_jv(doc, cdt, cdn);
+    if(doc.company && doc.start_date && doc.end_date){
+		return cur_frm.cscript.reference_entry(doc,cdt,cdn);
     } else {
-  	  msgprint(__("Company, Month and Fiscal Year is mandatory"));
+  	  msgprint(__("Company, From Date and To Date is mandatory"));
     }
 }
 
-cur_frm.cscript.make_jv = function(doc, dt, dn) {
-	return $c_obj(doc, 'make_journal_entry', '', function(r) {
-		var doc = frappe.model.sync(r.message)[0];
-		frappe.set_route("Form", doc.doctype, doc.name);
+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()
+			}
+		]
 	});
-}
-
-frappe.ui.form.on("Process Payroll", {
-	refresh: function(frm) {
-		frm.disable_save();
-	}
-})
+	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 7285765..8e0d395 100644
--- a/erpnext/hr/doctype/process_payroll/process_payroll.json
+++ b/erpnext/hr/doctype/process_payroll/process_payroll.json
@@ -8,11 +8,13 @@
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Other", 
+ "editable_grid": 0, 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break0", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -20,6 +22,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Select Employees", 
    "length": 0, 
    "no_copy": 0, 
@@ -27,6 +30,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, 
@@ -37,6 +41,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break0", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -44,12 +49,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, 
@@ -61,6 +68,8 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
+   "default": "", 
    "fieldname": "company", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -68,6 +77,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -76,6 +86,7 @@
    "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, 
@@ -86,6 +97,94 @@
    "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_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Posting Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "Monthly", 
+   "depends_on": "eval:doc.salary_slip_based_on_timesheet == 0", 
+   "fieldname": "payroll_frequency", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Payroll Frequency", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nMonthly\nFortnightly\nBimonthly\nWeekly\nDaily", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break1", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
+   "width": "50%"
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "branch", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -93,6 +192,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Branch", 
    "length": 0, 
    "no_copy": 0, 
@@ -101,6 +201,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,30 +212,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "column_break1", 
-   "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, 
-   "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, 
-   "width": "50%"
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "department", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -142,6 +220,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Department", 
    "length": 0, 
    "no_copy": 0, 
@@ -150,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, 
@@ -160,6 +240,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "designation", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -167,6 +248,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Designation", 
    "length": 0, 
    "no_copy": 0, 
@@ -175,6 +257,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -185,6 +268,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_8", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -192,6 +276,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -199,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, 
@@ -209,13 +295,15 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "salary_slip_based_on_timesheet", 
    "fieldtype": "Check", 
-   "hidden": 1, 
+   "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", 
    "length": 0, 
    "no_copy": 0, 
@@ -224,6 +312,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, 
@@ -234,14 +323,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "select_payroll_year_and_month", 
+   "columns": 0, 
+   "fieldname": "select_payroll_period", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Select Payroll Year and Month", 
+   "in_standard_filter": 0, 
+   "label": "Select Payroll Period", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -249,6 +340,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,23 +351,27 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "fiscal_year", 
-   "fieldtype": "Link", 
+   "columns": 0, 
+   "default": "Today", 
+   "fieldname": "start_date", 
+   "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Fiscal Year", 
+   "in_standard_filter": 0, 
+   "label": "Start Date", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "Fiscal Year", 
    "permlevel": 0, 
+   "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
-   "reqd": 1, 
+   "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
@@ -284,6 +380,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_11", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -291,6 +388,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -298,6 +396,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,23 +407,27 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "month", 
-   "fieldtype": "Select", 
+   "columns": 0, 
+   "default": "Today", 
+   "fieldname": "end_date", 
+   "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Month", 
+   "in_standard_filter": 0, 
+   "label": "End Date", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "\n01\n02\n03\n04\n05\n06\n07\n08\n09\n10\n11\n12", 
    "permlevel": 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
@@ -333,6 +436,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "process_payroll", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -340,6 +444,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Process Payroll", 
    "length": 0, 
    "no_copy": 0, 
@@ -348,6 +453,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, 
@@ -358,6 +464,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break2", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -365,12 +472,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, 
@@ -382,6 +491,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "Creates salary slip for above mentioned criteria.", 
    "fieldname": "create_salary_slip", 
    "fieldtype": "Button", 
@@ -390,6 +500,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Create Salary Slip", 
    "length": 0, 
    "no_copy": 0, 
@@ -397,6 +508,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, 
@@ -407,6 +519,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break3", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -414,12 +527,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, 
@@ -431,6 +546,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "Submit all salary slips for the above selected criteria", 
    "fieldname": "submit_salary_slip", 
    "fieldtype": "Button", 
@@ -439,6 +555,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Submit Salary Slip", 
    "length": 0, 
    "no_copy": 0, 
@@ -446,6 +563,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, 
@@ -456,38 +574,75 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "column_break4", 
-   "fieldtype": "Column Break", 
+   "columns": 0, 
+   "fieldname": "account", 
+   "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": "Account", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
+   "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "unique": 0, 
-   "width": "25%"
+   "unique": 0
   }, 
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "description": "Create Bank Entry for the total salary paid for the above selected criteria", 
-   "fieldname": "make_bank_entry", 
-   "fieldtype": "Button", 
+   "columns": 0, 
+   "description": "Select Payment Account to make Bank Entry", 
+   "fieldname": "payment_account", 
+   "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Payment Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "", 
+   "description": "Create Bank Entry for the total salary paid for the above selected criteria", 
+   "fieldname": "make_bank_entry", 
+   "fieldtype": "Button", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Make Bank Entry", 
    "length": 0, 
    "no_copy": 0, 
@@ -495,6 +650,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, 
@@ -505,6 +661,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break2", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -512,12 +669,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, 
@@ -528,6 +687,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "activity_log", 
    "fieldtype": "HTML", 
    "hidden": 0, 
@@ -535,6 +695,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Activity Log", 
    "length": 0, 
    "no_copy": 0, 
@@ -542,6 +703,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 +713,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 1, 
- "icon": "icon-cog", 
+ "icon": "fa fa-cog", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
@@ -560,7 +722,7 @@
  "issingle": 1, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-06-22 18:14:02.418857", 
+ "modified": "2016-11-26 01:14:51.691057", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Process Payroll", 
@@ -576,6 +738,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
diff --git a/erpnext/hr/doctype/process_payroll/process_payroll.py b/erpnext/hr/doctype/process_payroll/process_payroll.py
index d17ab4e..97e3876 100644
--- a/erpnext/hr/doctype/process_payroll/process_payroll.py
+++ b/erpnext/hr/doctype/process_payroll/process_payroll.py
@@ -3,14 +3,17 @@
 
 from __future__ import unicode_literals
 import frappe
-from frappe.utils import cint, flt, nowdate
+from frappe.utils import cint, flt, nowdate, add_days, getdate
 from frappe import _
+import collections
+from collections import defaultdict
+from calendar import monthrange
+from erpnext.accounts.utils import get_fiscal_year
 
 from frappe.model.document import Document
 
 class ProcessPayroll(Document):
 
-
 	def get_emp_list(self):
 		"""
 			Returns list of active employees based on selected criteria
@@ -18,22 +21,26 @@
 		"""
 		cond = self.get_filter_condition()
 		cond += self.get_joining_releiving_condition()
-
+		
+		
+		struct_cond = ''
+		if self.payroll_frequency:
+			struct_cond = """and payroll_frequency = '%(payroll_frequency)s'""" % {"payroll_frequency": self.payroll_frequency}	
+			
 		sal_struct = frappe.db.sql("""
 				select name from `tabSalary Structure`
-				where docstatus != 2 and
-				ifnull(salary_slip_based_on_timesheet,0) = 0""")
-
+				where docstatus != 2 and is_active = 'Yes' and company = %(company)s and
+				ifnull(salary_slip_based_on_timesheet,0) = %(salary_slip_based_on_timesheet)s""",
+				{"company": self.company, "salary_slip_based_on_timesheet":self.salary_slip_based_on_timesheet})
+		
 		if sal_struct:
 			cond += "and t2.parent IN %(sal_struct)s "
-
-		emp_list = frappe.db.sql("""
-			select t1.name
-			from `tabEmployee` t1, `tabSalary Structure Employee` t2
-			where t1.docstatus!=2 and t1.name = t2.employee
-		%s """% cond, {"sal_struct": sal_struct})
-
-		return emp_list
+			emp_list = frappe.db.sql("""
+				select t1.name
+				from `tabEmployee` t1, `tabSalary Structure Employee` t2
+				where t1.docstatus!=2 and t1.name = t2.employee
+			%s """% cond, {"sal_struct": sal_struct})
+			return emp_list
 
 
 	def get_filter_condition(self):
@@ -48,43 +55,55 @@
 
 
 	def get_joining_releiving_condition(self):
-		m = get_month_details(self.fiscal_year, self.month)
 		cond = """
-			and ifnull(t1.date_of_joining, '0000-00-00') <= '%(month_end_date)s'
-			and ifnull(t1.relieving_date, '2199-12-31') >= '%(month_start_date)s'
-		""" % m
+			and ifnull(t1.date_of_joining, '0000-00-00') <= '%(end_date)s'
+			and ifnull(t1.relieving_date, '2199-12-31') >= '%(start_date)s'
+		""" % {"start_date": self.start_date, "end_date": self.end_date}
 		return cond
 
 
 	def check_mandatory(self):
-		for f in ['company', 'month', 'fiscal_year']:
-			if not self.get(f):
-				frappe.throw(_("Please set {0}").format(f))
+		for fieldname in ['company', 'payroll_frequency', 'start_date', 'end_date']:
+			if not self.get(fieldname):
+				frappe.throw(_("Please set {0}").format(self.meta.get_label(fieldname)))
 
 	def create_sal_slip(self):
 		"""
 			Creates salary slip for selected employees if already not created
 		"""
-
 		self.check_permission('write')
 
 		emp_list = self.get_emp_list()
 		ss_list = []
-		for emp in emp_list:
-			if not frappe.db.sql("""select name from `tabSalary Slip`
-					where docstatus!= 2 and employee = %s and month = %s and fiscal_year = %s and company = %s
-					""", (emp[0], self.month, self.fiscal_year, self.company)):
-				ss = frappe.get_doc({
-					"doctype": "Salary Slip",
-					"salary_slip_based_on_timesheet": 0,
-					"fiscal_year": self.fiscal_year,
-					"employee": emp[0],
-					"month": self.month,
-					"company": self.company,
-				})
-				ss.insert()
-				ss_list.append(ss.name)
-
+		if emp_list:
+			for emp in emp_list:
+				if not frappe.db.sql("""select name from `tabSalary Slip`
+						where docstatus!= 2 and employee = %s and start_date >= %s and end_date <= %s and company = %s
+						""", (emp[0], self.start_date, self.end_date, self.company)):
+					if self.payroll_frequency == "Monthly" or self.payroll_frequency == '':
+						ss = frappe.get_doc({
+							"doctype": "Salary Slip",
+							"salary_slip_based_on_timesheet": self.salary_slip_based_on_timesheet,
+							"employee": emp[0],
+							"employee_name": frappe.get_value("Employee", {"name":emp[0]}, "employee_name"),
+							"company": self.company,
+							"posting_date": self.posting_date,
+							"payroll_frequency": self.payroll_frequency
+						})
+					else:
+						ss = frappe.get_doc({
+							"doctype": "Salary Slip",
+							"salary_slip_based_on_timesheet": self.salary_slip_based_on_timesheet,
+							"start_date": self.start_date,
+							"end_date": self.end_date,
+							"employee": emp[0],
+							"employee_name": frappe.get_value("Employee", {"name":emp[0]}, "employee_name"),
+							"company": self.company,
+							"posting_date": self.posting_date,
+							"payroll_frequency": self.payroll_frequency
+						})	
+					ss.insert()
+					ss_list.append(ss.name)
 		return self.create_log(ss_list)
 
 
@@ -96,16 +115,17 @@
 		return log
 
 
-	def get_sal_slip_list(self):
+	def get_sal_slip_list(self, ss_status, as_dict=False):
 		"""
 			Returns list of salary slips based on selected criteria
-			which are not submitted
 		"""
 		cond = self.get_filter_condition()
+			
 		ss_list = frappe.db.sql("""
-			select t1.name from `tabSalary Slip` t1
-			where t1.docstatus = 0 and month = %s and fiscal_year = %s %s
-		""" % ('%s', '%s', cond), (self.month, self.fiscal_year))
+			select t1.name, t1.salary_structure from `tabSalary Slip` t1
+			where t1.docstatus = %s and t1.start_date >= %s and t1.end_date <= %s 
+			and (t1.journal_entry is null or t1.journal_entry = "") and ifnull(salary_slip_based_on_timesheet,0) = %s %s
+		""" % ('%s', '%s', '%s','%s', cond), (ss_status, self.start_date, self.end_date, self.salary_slip_based_on_timesheet), as_dict=as_dict)
 		return ss_list
 
 
@@ -115,16 +135,17 @@
 		"""
 		self.check_permission('write')
 
-		ss_list = self.get_sal_slip_list()
+		ss_list = self.get_sal_slip_list(ss_status=0)
 		not_submitted_ss = []
 		for ss in ss_list:
 			ss_obj = frappe.get_doc("Salary Slip",ss[0])
-			try:
-				ss_obj.submit()
-			except Exception,e:
+			if ss_obj.net_pay<0:
 				not_submitted_ss.append(ss[0])
-				frappe.msgprint(e)
-				continue
+			else:
+				try:
+					ss_obj.submit()
+				except Exception,e:
+					not_submitted_ss.append(ss[0])
 
 		return self.create_submit_log(ss_list, not_submitted_ss)
 
@@ -147,6 +168,7 @@
 				<b>Not Submitted Salary Slips: </b>\
 				<br><br> %s <br><br> \
 				Reason: <br>\
+				May be net pay is less than 0 <br>
 				May be company email id specified in employee master is not valid. <br> \
 				Please mention correct email id in employee master or if you don't want to \
 				send mail, uncheck 'Send Email' checkbox. <br>\
@@ -165,38 +187,106 @@
 		cond = self.get_filter_condition()
 		tot = frappe.db.sql("""
 			select sum(rounded_total) from `tabSalary Slip` t1
-			where t1.docstatus = 1 and month = %s and fiscal_year = %s %s
-		""" % ('%s', '%s', cond), (self.month, self.fiscal_year))
+			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])
-
-
-	def make_journal_entry(self, salary_account = None):
+		
+	def get_salary_component_account(self, salary_component):
+		account = frappe.db.get_value("Salary Component Account",
+			{"parent": salary_component, "company": self.company}, "default_account")
+	
+		if not account:
+			frappe.throw(_("Please set default account in Salary Component {0}")
+				.format(salary_component))
+	
+		return account	
+		
+	def get_salary_components(self, component_type):
+		salary_slips = self.get_sal_slip_list(ss_status = 1, as_dict = True)
+		if salary_slips:
+			salary_components = frappe.db.sql("""select salary_component, amount, parentfield
+				from `tabSalary Detail` where parentfield = '%s' and parent in (%s)""" %
+				(component_type, ', '.join(['%s']*len(salary_slips))), tuple([d.name for d in salary_slips]), as_dict=True)				
+			return salary_components
+		
+	def get_salary_component_total(self, component_type = None):
+		salary_components = self.get_salary_components(component_type)
+		if salary_components:
+			component_dict = {}
+			for item in salary_components:			
+				component_dict[item['salary_component']] = component_dict.get(item['salary_component'], 0) + item['amount']
+			account_details = self.get_account(component_dict = component_dict)
+			return account_details
+			
+	def get_account(self, component_dict = None):
+		account_dict = {}
+		for s, a in component_dict.items():
+			account = self.get_salary_component_account(s)
+			account_dict[account] = account_dict.get(account, 0) + a		
+		return account_dict
+		
+	
+	def make_journal_entry(self, reference_number = None, reference_date = None):
 		self.check_permission('write')
+		earnings = self.get_salary_component_total(component_type = "earnings") or {}
+		deductions = self.get_salary_component_total(component_type = "deductions") or {}
+		jv_name = ""
 
-		amount = self.get_total_salary()
-		default_bank_account = frappe.db.get_value("Company", self.company,
-			"default_bank_account")
+		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,
+				self.end_date)
+			journal_entry.company = self.company
+			journal_entry.posting_date = nowdate()
+		
+			account_amt_list = []
+			adjustment_amt = 0
+			for acc, amt in earnings.items():
+				adjustment_amt = adjustment_amt+amt
+				account_amt_list.append({
+						"account": acc,
+						"debit_in_account_currency": amt
+					})
+			for acc, amt in deductions.items():
+				adjustment_amt = adjustment_amt-amt
+				account_amt_list.append({
+						"account": acc,
+						"credit_in_account_currency": amt
+					})
+			account_amt_list.append({
+					"account": self.payment_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()
+				jv_name = journal_entry.name
+				self.update_salary_slip_status(jv_name = jv_name)
+			except Exception, e:
+				frappe.msgprint(e)
+		return self.create_jv_log(jv_name)
+	
 
-		journal_entry = frappe.new_doc('Journal Entry')
-		journal_entry.voucher_type = 'Bank Entry'
-		journal_entry.user_remark = _('Payment of salary for the month {0} and year {1}').format(self.month,
-			self.fiscal_year)
-		journal_entry.fiscal_year = self.fiscal_year
-		journal_entry.company = self.company
-		journal_entry.posting_date = nowdate()
-		journal_entry.set("accounts", [
-			{
-				"account": salary_account,
-				"debit_in_account_currency": amount
-			},
-			{
-				"account": default_bank_account,
-				"credit_in_account_currency": amount
-			},
-		])
+	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	
+	
+	def update_salary_slip_status(self, jv_name = None):
+		ss_list = self.get_sal_slip_list(ss_status=1)
+		for ss in ss_list:
+			ss_obj = frappe.get_doc("Salary Slip",ss[0])
+			frappe.db.set_value("Salary Slip", ss_obj.name, "status", "Paid")
+			frappe.db.set_value("Salary Slip", ss_obj.name, "journal_entry", jv_name)		
 
-		return journal_entry.as_dict()
 
 @frappe.whitelist()
 def get_month_details(year, month):
@@ -209,12 +299,45 @@
 			diff_mnt = 12-int(ysd.month)+cint(month)
 		msd = ysd + relativedelta(months=diff_mnt) # month start date
 		month_days = cint(calendar.monthrange(cint(msd.year) ,cint(month))[1]) # days in month
+		mid_start = datetime.date(msd.year, cint(month), 16) # month mid start date
+		mid_end = datetime.date(msd.year, cint(month), 15) # month mid end date
 		med = datetime.date(msd.year, cint(month), month_days) # month end date
 		return frappe._dict({
 			'year': msd.year,
 			'month_start_date': msd,
 			'month_end_date': med,
+			'month_mid_start_date': mid_start,
+			'month_mid_end_date': mid_end,
 			'month_days': month_days
 		})
 	else:
-		frappe.throw(_("Fiscal Year {0} not found").format(year))
\ No newline at end of file
+		frappe.throw(_("Fiscal Year {0} not found").format(year))
+
+@frappe.whitelist()
+def get_start_end_dates(payroll_frequency, start_date, end_date):
+	if payroll_frequency == "Monthly" or payroll_frequency == "Bimonthly":
+		fiscal_year = get_fiscal_year(start_date)[0] or get_fiscal_year(end_date)[0]
+		month = "%02d" % getdate(start_date).month or "%02d" % getdate(end_date).month
+		m = get_month_details(fiscal_year, month)
+		if payroll_frequency == "Bimonthly":
+			if getdate(start_date).day <= 15:
+				start_date = m['month_start_date']
+				end_date = m['month_mid_end_date']
+			else:
+				start_date = m['month_mid_start_date']
+				end_date = m['month_end_date']
+		else:
+			start_date = m['month_start_date']
+			end_date = m['month_end_date']
+		
+	if payroll_frequency == "Weekly":
+		end_date = add_days(start_date, 6)
+			
+	if payroll_frequency == "Fortnightly":
+		end_date = add_days(start_date, 13)
+		
+	if payroll_frequency == "Daily":
+		end_date = start_date
+	return frappe._dict({
+		'start_date': start_date, 'end_date': end_date
+	})
\ No newline at end of file
diff --git a/erpnext/hr/doctype/process_payroll/test_process_payroll.py b/erpnext/hr/doctype/process_payroll/test_process_payroll.py
new file mode 100644
index 0000000..5167365
--- /dev/null
+++ b/erpnext/hr/doctype/process_payroll/test_process_payroll.py
@@ -0,0 +1,51 @@
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
+
+import unittest
+import frappe
+import erpnext
+from frappe.utils import flt, add_months, cint, nowdate, getdate, add_days, random_string
+from frappe.utils.make_random import get_random
+
+class TestProcessPayroll(unittest.TestCase):
+	def test_process_payroll(self):
+		month = "11"
+		fiscal_year = "_Test Fiscal Year 2016"
+
+		for data in frappe.get_all('Salary Component', fields = ["name"]):
+			if not frappe.db.get_value('Salary Component Account', {'parent': data.name, 'company': erpnext.get_default_company()}, 'name'):
+				get_salary_component_account(data.name)
+				
+		payment_account = frappe.get_value('Account', {'account_type': 'Cash', 'company': erpnext.get_default_company(),'is_group':0}, "name")
+		if not frappe.db.get_value("Salary Slip", {"start_date": "2016-11-01", "end_date": "2016-11-30"}):
+			process_payroll = frappe.get_doc("Process Payroll", "Process Payroll")
+			process_payroll.company = erpnext.get_default_company()
+			process_payroll.start_date = "2016-11-01"
+			process_payroll.end_date = "2016-11-30"
+			process_payroll.payment_account = payment_account
+			process_payroll.posting_date = nowdate()
+			process_payroll.payroll_frequency = "Monthly"
+			process_payroll.create_sal_slip()
+			process_payroll.submit_salary_slip()
+			if process_payroll.get_sal_slip_list(ss_status = 1):
+				r = process_payroll.make_journal_entry(reference_number=random_string(10),reference_date=nowdate())
+	
+
+def get_salary_component_account(sal_comp):
+	company = erpnext.get_default_company()
+	sal_comp = frappe.get_doc("Salary Component", sal_comp)
+	sc = sal_comp.append("accounts")
+	sc.company = company
+	sc.default_account = create_account(company)
+	
+def create_account(company):
+	salary_account = frappe.db.get_value("Account", "Salary - " + frappe.db.get_value('Company', company, 'abbr'))
+	if not salary_account:
+		frappe.get_doc({
+		"doctype": "Account",
+		"account_name": "Salary",
+		"parent_account": "Indirect Expenses - " + frappe.db.get_value('Company', company, 'abbr'),
+		"company": company
+		}).insert()
+	return salary_account
\ No newline at end of file
diff --git a/erpnext/hr/doctype/salary_component/salary_component.json b/erpnext/hr/doctype/salary_component/salary_component.json
index ca7378b..29d6015 100644
--- a/erpnext/hr/doctype/salary_component/salary_component.json
+++ b/erpnext/hr/doctype/salary_component/salary_component.json
@@ -23,6 +23,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Name", 
    "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": 1, 
    "search_index": 0, 
@@ -49,6 +51,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Abbr", 
    "length": 0, 
    "no_copy": 0, 
@@ -58,8 +61,9 @@
    "print_hide_if_no_value": 0, 
    "print_width": "120px", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
-   "reqd": 0, 
+   "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0, 
@@ -70,6 +74,35 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "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": "Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Earning\nDeduction", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "description", 
    "fieldtype": "Small Text", 
    "hidden": 0, 
@@ -77,6 +110,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Description", 
    "length": 0, 
    "no_copy": 0, 
@@ -85,6 +119,34 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "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_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_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 +165,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Accounts", 
    "length": 0, 
    "no_copy": 0, 
@@ -112,43 +175,17 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "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": "type", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Type", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Earning\nDeduction", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
   }
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-flag", 
+ "icon": "fa fa-flag", 
  "idx": 0, 
  "image_view": 0, 
  "in_create": 0, 
@@ -157,7 +194,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-08-29 05:33:22.495594", 
+ "modified": "2016-11-16 12:44:37.733773", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Salary Component", 
@@ -174,6 +211,7 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
diff --git a/erpnext/hr/doctype/salary_component/salary_component.py b/erpnext/hr/doctype/salary_component/salary_component.py
index ca69568..8af7311 100644
--- a/erpnext/hr/doctype/salary_component/salary_component.py
+++ b/erpnext/hr/doctype/salary_component/salary_component.py
@@ -10,7 +10,6 @@
 class SalaryComponent(Document):
 	def validate(self):
 		self.validate_abbr()
-		
 
 	def validate_abbr(self):
 		if not self.salary_component_abbr:
@@ -21,8 +20,5 @@
 		if self.get('__islocal') and len(self.salary_component_abbr) > 5:
 			frappe.throw(_("Abbreviation cannot have more than 5 characters"))
 
-		if not self.salary_component_abbr.strip():
-			frappe.throw(_("Abbreviation is mandatory"))
-
 		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
diff --git a/erpnext/hr/doctype/salary_detail/salary_detail.json b/erpnext/hr/doctype/salary_detail/salary_detail.json
index 3bb621b..99c705a 100644
--- a/erpnext/hr/doctype/salary_detail/salary_detail.json
+++ b/erpnext/hr/doctype/salary_detail/salary_detail.json
@@ -300,7 +300,7 @@
    "label": "Condition and Formula Help", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "<h3>Condition and Formula Help</h3>\n\n<p>Notes:</p>\n\n<ol>\n<li>Use field <code>base</code> for using base salary of the Employee</li>\n<li>Use Salary Component abbreviations in conditions and formulas. <code>BS = Basic Salary</code></li>\n<li>Use field name for employee details in conditions and formulas. <code>Employment Type = employment_type</code><code>Branch = branch</code></li>\n<li>Direct Amount can also be entered based on Condtion. See example 3</li></ol>\n\n<h4>Examples</h4>\n<ol>\n<li>Calculating Basic Salary based on <code>base</code>\n<pre><code>Condition: base &lt; 10000</code></pre>\n<pre><code>Formula: base * .2</code></pre></li>\n<li>Calculating HRA based on Basic Salary<code>BS</code> \n<pre><code>Condition: BS &gt; 2000</code></pre>\n<pre><code>Formula: BS * .1</code></pre></li>\n<li>Calculating TDS based on Employment Type<code>employment_type</code> \n<pre><code>Condition: employment_type==\"Intern\"</code></pre>\n<pre><code>Amount: 1000</code></pre></li>\n</ol>", 
+   "options": "<h3>Condition and Formula Help</h3>\n\n<p>Notes:</p>\n\n<ol>\n<li>Use field <code>base</code> for using base salary of the Employee</li>\n<li>Use Salary Component abbreviations in conditions and formulas. <code>BS = Basic Salary</code></li>\n<li>Use field name for employee details in conditions and formulas. <code>Employment Type = employment_type</code><code>Branch = branch</code></li>\n<li>Use field name from Salary Slip in conditions and formulas. <code>Payment Days = payment_days</code><code>Leave without pay = leave_without_pay</code></li>\n<li>Direct Amount can also be entered based on Condtion. See example 3</li></ol>\n\n<h4>Examples</h4>\n<ol>\n<li>Calculating Basic Salary based on <code>base</code>\n<pre><code>Condition: base &lt; 10000</code></pre>\n<pre><code>Formula: base * .2</code></pre></li>\n<li>Calculating HRA based on Basic Salary<code>BS</code> \n<pre><code>Condition: BS &gt; 2000</code></pre>\n<pre><code>Formula: BS * .1</code></pre></li>\n<li>Calculating TDS based on Employment Type<code>employment_type</code> \n<pre><code>Condition: employment_type==\"Intern\"</code></pre>\n<pre><code>Amount: 1000</code></pre></li>\n</ol>", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -323,7 +323,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-08-23 15:26:07.754570", 
+ "modified": "2016-09-20 05:29:26.373992", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Salary Detail", 
diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.js b/erpnext/hr/doctype/salary_slip/salary_slip.js
index 4c60fba..8b0dd16 100644
--- a/erpnext/hr/doctype/salary_slip/salary_slip.js
+++ b/erpnext/hr/doctype/salary_slip/salary_slip.js
@@ -13,6 +13,20 @@
 				}
 			}
 		}
+		frm.set_query("salary_component", "earnings", function() {
+			return {
+				filters: {
+					type: "earning"
+				}
+			}
+		})
+		frm.set_query("salary_component", "deductions", function() {
+			return {
+				filters: {
+					type: "deduction"
+				}
+			}
+		})
 	},
 
 	company: function(frm) {
@@ -32,59 +46,44 @@
 	salary_slip_based_on_timesheet: function(frm) {
 		frm.trigger("toggle_fields")
 	},
+	
+	payroll_frequency: function(frm) {
+		frm.trigger("toggle_fields")
+	},
 
 	toggle_fields: function(frm) {
-		frm.toggle_display(['start_date', 'end_date', 'hourly_wages', 'timesheets'],
+		frm.toggle_display(['hourly_wages', 'timesheets'],
 			cint(frm.doc.salary_slip_based_on_timesheet)==1);
-		frm.toggle_display(['fiscal_year', 'month', 'total_days_in_month', 'leave_without_pay', 'payment_days'],
-			cint(frm.doc.salary_slip_based_on_timesheet)==0);
+
+		frm.toggle_display(['payment_days', 'total_working_days', 'leave_without_pay'],
+			frm.doc.payroll_frequency!="");
 	}
 })
 
 
-frappe.ui.form.on("Salary Slip Timesheet", {
-	time_sheet: function(frm, cdt, cdn) {
-		doc = frm.doc;
-		cur_frm.cscript.fiscal_year(doc, cdt, cdn)
-	}
-})
-
-
-// On load
-// -------------------------------------------------------------------
-cur_frm.cscript.onload = function(doc,dt,dn){
-	if((cint(doc.__islocal) == 1) && !doc.amended_from){
-		if(!doc.month) {
-			var today=new Date();
-			month = (today.getMonth()+01).toString();
-			if(month.length>1) doc.month = month;
-			else doc.month = '0'+month;
-		}
-		if(!doc.fiscal_year) doc.fiscal_year = sys_defaults['fiscal_year'];
-		refresh_many(['month', 'fiscal_year']);
-	}
-}
-
 // Get leave details
 //---------------------------------------------------------------------
-cur_frm.cscript.fiscal_year = function(doc,dt,dn){
-		return $c_obj(doc, 'get_emp_and_leave_details','',function(r, rt) {
-			var doc = locals[dt][dn];
+cur_frm.cscript.start_date = function(doc, dt, dn){
+	return frappe.call({
+		method: 'get_emp_and_leave_details',
+		doc: locals[dt][dn],
+		callback: function(r, rt) {
 			cur_frm.refresh();
 			calculate_all(doc, dt, dn);
-		});
+		}
+	});
 }
 
-cur_frm.cscript.month = cur_frm.cscript.salary_slip_based_on_timesheet = cur_frm.cscript.fiscal_year;
-cur_frm.cscript.start_date = cur_frm.cscript.end_date = cur_frm.cscript.fiscal_year;
+cur_frm.cscript.payroll_frequency = cur_frm.cscript.salary_slip_based_on_timesheet = cur_frm.cscript.start_date;
+cur_frm.cscript.end_date = cur_frm.cscript.start_date;
 
 cur_frm.cscript.employee = function(doc,dt,dn){
 	doc.salary_structure = ''
-	cur_frm.cscript.fiscal_year(doc, dt, dn)
+	cur_frm.cscript.start_date(doc, dt, dn)
 }
 
 cur_frm.cscript.leave_without_pay = function(doc,dt,dn){
-	if (doc.employee && doc.fiscal_year && doc.month) {
+	if (doc.employee && doc.start_date && doc.end_date) {
 		return $c_obj(doc, 'get_leave_details', {"lwp": doc.leave_without_pay}, function(r, rt) {
 			var doc = locals[dt][dn];
 			cur_frm.refresh();
@@ -100,22 +99,15 @@
 }
 
 cur_frm.cscript.amount = function(doc,dt,dn){
-	calculate_earning_total(doc, dt, dn);
-	calculate_net_pay(doc, dt, dn);
+	var child = locals[dt][dn];
+	if(!doc.salary_structure){
+		frappe.model.set_value(dt,dn, "default_amount", child.amount)
+	}
+	calculate_all(doc, dt, dn);
 }
 
 cur_frm.cscript.depends_on_lwp = function(doc,dt,dn){
 	calculate_earning_total(doc, dt, dn, true);
-	calculate_net_pay(doc, dt, dn);
-}
-// Trigger on earning modified amount and depends on lwp
-// ------------------------------------------------------------------------
-cur_frm.cscript.amount = function(doc,dt,dn){
-	calculate_ded_total(doc, dt, dn);
-	calculate_net_pay(doc, dt, dn);
-}
-
-cur_frm.cscript.depends_on_lwp = function(doc, dt, dn) {
 	calculate_ded_total(doc, dt, dn, true);
 	calculate_net_pay(doc, dt, dn);
 };
@@ -128,7 +120,7 @@
 	for(var i = 0; i < tbl.length; i++){
 		if(cint(tbl[i].depends_on_lwp) == 1) {
 			tbl[i].amount =  Math.round(tbl[i].default_amount)*(flt(doc.payment_days) /
-				cint(doc.total_days_in_month)*100)/100;
+				cint(doc.total_working_days)*100)/100;
 			refresh_field('amount', tbl[i].name, 'earnings');
 		} else if(reset_amount) {
 			tbl[i].amount = tbl[i].default_amount;
@@ -148,7 +140,7 @@
 	var total_ded = 0;
 	for(var i = 0; i < tbl.length; i++){
 		if(cint(tbl[i].depends_on_lwp) == 1) {
-			tbl[i].amount = Math.round(tbl[i].default_amount)*(flt(doc.payment_days)/cint(doc.total_days_in_month)*100)/100;
+			tbl[i].amount = Math.round(tbl[i].default_amount)*(flt(doc.payment_days)/cint(doc.total_working_days)*100)/100;
 			refresh_field('amount', tbl[i].name, 'deductions');
 		} else if(reset_amount) {
 			tbl[i].amount = tbl[i].default_amount;
diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.json b/erpnext/hr/doctype/salary_slip/salary_slip.json
index a6f5266..062f41f 100644
--- a/erpnext/hr/doctype/salary_slip/salary_slip.json
+++ b/erpnext/hr/doctype/salary_slip/salary_slip.json
@@ -15,6 +15,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break0", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -22,6 +23,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
@@ -29,6 +31,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,6 +43,35 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
+   "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": "Posting Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "employee", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -47,6 +79,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Employee", 
    "length": 0, 
    "no_copy": 0, 
@@ -57,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": 1, 
@@ -67,6 +101,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "employee_name", 
    "fieldtype": "Read Only", 
    "hidden": 0, 
@@ -74,6 +109,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Employee Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -84,6 +120,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,23 +131,26 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "department", 
-   "fieldtype": "Link", 
+   "fieldtype": "Read Only", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Department", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "department", 
    "oldfieldtype": "Link", 
-   "options": "Department", 
+   "options": "employee.department", 
    "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, 
@@ -121,23 +161,27 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.designation", 
    "fieldname": "designation", 
-   "fieldtype": "Link", 
+   "fieldtype": "Read Only", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Designation", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "designation", 
    "oldfieldtype": "Link", 
-   "options": "Designation", 
+   "options": "employee.designation", 
    "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, 
@@ -148,23 +192,26 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "branch", 
-   "fieldtype": "Link", 
+   "fieldtype": "Read Only", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Branch", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "branch", 
    "oldfieldtype": "Link", 
-   "options": "Branch", 
+   "options": "employee.branch", 
    "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, 
@@ -175,6 +222,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break1", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -182,6 +230,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
@@ -189,6 +238,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, 
@@ -200,6 +250,64 @@
    "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": 0, 
+   "in_standard_filter": 0, 
+   "label": "Status", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Draft\nSubmitted\nPaid\nCancelled", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "journal_entry", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Journal Entry", 
+   "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": "company", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -207,6 +315,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -215,6 +324,7 @@
    "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, 
@@ -225,6 +335,7 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "letter_head", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -232,6 +343,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Letter Head", 
    "length": 0, 
    "no_copy": 0, 
@@ -240,6 +352,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, 
@@ -250,6 +363,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_10", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -257,6 +371,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -264,6 +379,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, 
@@ -274,6 +390,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "", 
    "fieldname": "salary_slip_based_on_timesheet", 
    "fieldtype": "Check", 
@@ -282,6 +399,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Salary Slip Based on Timesheet", 
    "length": 0, 
    "no_copy": 0, 
@@ -291,6 +409,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, 
@@ -301,63 +420,8 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "depends_on": "", 
-   "fieldname": "fiscal_year", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 1, 
-   "in_list_view": 1, 
-   "label": "Fiscal Year", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "fiscal_year", 
-   "oldfieldtype": "Data", 
-   "options": "Fiscal Year", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "", 
-   "fieldname": "month", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 1, 
-   "in_list_view": 1, 
-   "label": "Month", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "month", 
-   "oldfieldtype": "Select", 
-   "options": "\n01\n02\n03\n04\n05\n06\n07\n08\n09\n10\n11\n12", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 1, 
-   "set_only_once": 0, 
-   "unique": 0, 
-   "width": "37%"
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
+   "columns": 0, 
+   "default": "Today", 
    "fieldname": "start_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -365,6 +429,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Start Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -373,6 +438,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, 
@@ -383,6 +449,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "Today", 
    "depends_on": "", 
    "fieldname": "end_date", 
@@ -392,6 +459,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "End Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -400,6 +468,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 +479,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_15", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -417,6 +487,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -424,6 +495,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 +506,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "", 
    "fieldname": "salary_structure", 
    "fieldtype": "Link", 
@@ -442,6 +515,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Salary Structure", 
    "length": 0, 
    "no_copy": 0, 
@@ -451,6 +525,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, 
@@ -461,14 +536,47 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
+   "default": "", 
+   "depends_on": "eval:(!doc.salary_slip_based_on_timesheet)", 
+   "fieldname": "payroll_frequency", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Payroll Frequency", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nMonthly\nFortnightly\nBimonthly\nWeekly\nDaily", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "", 
-   "fieldname": "total_days_in_month", 
+   "fieldname": "total_working_days", 
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Working Days", 
    "length": 0, 
    "no_copy": 0, 
@@ -478,6 +586,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, 
@@ -488,6 +597,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "", 
    "fieldname": "leave_without_pay", 
    "fieldtype": "Float", 
@@ -496,6 +606,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Leave Without Pay", 
    "length": 0, 
    "no_copy": 0, 
@@ -505,6 +616,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, 
@@ -515,6 +627,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "", 
    "fieldname": "payment_days", 
    "fieldtype": "Float", 
@@ -523,6 +636,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Payment Days", 
    "length": 0, 
    "no_copy": 0, 
@@ -532,6 +646,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, 
@@ -542,6 +657,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "", 
    "fieldname": "hourly_wages", 
    "fieldtype": "Section Break", 
@@ -550,6 +666,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
@@ -558,6 +675,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, 
@@ -568,6 +686,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "", 
    "fieldname": "timesheets", 
    "fieldtype": "Table", 
@@ -576,6 +695,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Salary Slip Timesheet", 
    "length": 0, 
    "no_copy": 0, 
@@ -585,6 +705,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, 
@@ -595,6 +716,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_20", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -602,6 +724,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -609,6 +732,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, 
@@ -619,6 +743,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "total_working_hours", 
    "fieldtype": "Float", 
    "hidden": 0, 
@@ -626,6 +751,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Working Hours", 
    "length": 0, 
    "no_copy": 0, 
@@ -634,6 +760,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, 
@@ -644,6 +771,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "hour_rate", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -651,6 +779,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Hour Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -659,6 +788,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, 
@@ -669,6 +799,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "", 
    "fieldname": "section_break_26", 
    "fieldtype": "Section Break", 
@@ -677,6 +808,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
@@ -685,6 +817,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, 
@@ -695,6 +828,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "bank_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -702,6 +836,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Bank Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -711,6 +846,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, 
@@ -721,6 +857,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "bank_account_no", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -728,6 +865,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Bank Account No.", 
    "length": 0, 
    "no_copy": 0, 
@@ -737,6 +875,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, 
@@ -747,6 +886,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_01", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -754,6 +894,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -761,6 +902,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, 
@@ -771,6 +913,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "amended_from", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -778,6 +921,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amended From", 
    "length": 0, 
    "no_copy": 1, 
@@ -788,6 +932,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, 
@@ -798,6 +943,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "earning_deduction", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -805,6 +951,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Earning & Deduction", 
    "length": 0, 
    "no_copy": 0, 
@@ -813,6 +960,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, 
@@ -823,6 +971,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "earning", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -830,6 +979,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Earning", 
    "length": 0, 
    "no_copy": 0, 
@@ -838,6 +988,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, 
@@ -849,6 +1000,8 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "", 
    "fieldname": "earnings", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -856,6 +1009,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Earnings", 
    "length": 0, 
    "no_copy": 0, 
@@ -866,6 +1020,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, 
@@ -876,6 +1031,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "deduction", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -883,6 +1039,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Deduction", 
    "length": 0, 
    "no_copy": 0, 
@@ -891,6 +1048,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, 
@@ -902,6 +1060,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "deductions", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -909,6 +1068,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Deductions", 
    "length": 0, 
    "no_copy": 0, 
@@ -919,6 +1079,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, 
@@ -929,6 +1090,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "totals", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -936,6 +1098,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
@@ -944,6 +1107,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, 
@@ -954,6 +1118,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "arrear_amount", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -961,6 +1126,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Arrear Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -971,6 +1137,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, 
@@ -981,6 +1148,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "leave_encashment_amount", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -988,6 +1156,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Leave Encashment Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -998,6 +1167,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, 
@@ -1008,6 +1178,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "gross_pay", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -1015,6 +1186,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Gross Pay", 
    "length": 0, 
    "no_copy": 0, 
@@ -1025,6 +1197,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, 
@@ -1035,6 +1208,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_25", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -1042,12 +1216,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, 
@@ -1058,6 +1234,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "total_deduction", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -1065,6 +1242,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Deduction", 
    "length": 0, 
    "no_copy": 0, 
@@ -1075,6 +1253,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, 
@@ -1085,6 +1264,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "Gross Pay + Arrear Amount +Encashment Amount - Total Deduction", 
    "fieldname": "net_pay", 
    "fieldtype": "Currency", 
@@ -1093,6 +1273,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Net Pay", 
    "length": 0, 
    "no_copy": 0, 
@@ -1103,6 +1284,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, 
@@ -1113,6 +1295,7 @@
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "rounded_total", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -1120,6 +1303,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Rounded Total", 
    "length": 0, 
    "no_copy": 0, 
@@ -1128,6 +1312,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, 
@@ -1138,6 +1323,7 @@
    "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", 
@@ -1146,6 +1332,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total in words", 
    "length": 0, 
    "no_copy": 0, 
@@ -1155,6 +1342,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, 
@@ -1164,7 +1352,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-file-text", 
+ "icon": "fa fa-file-text", 
  "idx": 9, 
  "image_view": 0, 
  "in_create": 0, 
@@ -1173,7 +1361,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-08-10 15:57:59.944600", 
+ "modified": "2016-12-08 12:03:31.602913", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Salary Slip", 
@@ -1189,6 +1377,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1210,6 +1399,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1230,6 +1420,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.py b/erpnext/hr/doctype/salary_slip/salary_slip.py
index 1918f92..f0733b7 100644
--- a/erpnext/hr/doctype/salary_slip/salary_slip.py
+++ b/erpnext/hr/doctype/salary_slip/salary_slip.py
@@ -10,20 +10,21 @@
 from frappe import msgprint, _
 from erpnext.accounts.utils import get_fiscal_year
 from erpnext.setup.utils import get_company_currency
-from erpnext.hr.utils import set_employee_name
-from erpnext.hr.doctype.process_payroll.process_payroll import get_month_details
+from erpnext.hr.doctype.process_payroll.process_payroll import get_month_details, get_start_end_dates
 from erpnext.hr.doctype.employee.employee import get_holiday_list_for_employee
 from erpnext.utilities.transaction_base import TransactionBase
 
+from datetime import timedelta
+
 class SalarySlip(TransactionBase):
 	def autoname(self):
 		self.name = make_autoname('Sal Slip/' +self.employee + '/.#####')
 
 	def validate(self):
+		self.status = self.get_status()
 		self.validate_dates()
 		self.check_existing()
-		self.set_month_dates()
-		
+		self.get_date_details()
 		if not (len(self.get("earnings")) or len(self.get("deductions"))):
 			# get details from salary structure
 			self.get_emp_and_leave_details()
@@ -31,7 +32,7 @@
 			self.get_leave_details(lwp = self.leave_without_pay)
 
 		# if self.salary_slip_based_on_timesheet or not self.net_pay:
-		# 	self.calculate_net_pay()
+		self.calculate_net_pay()
 
 		company_currency = get_company_currency(self.company)
 		self.total_in_words = money_in_words(self.rounded_total, company_currency)
@@ -52,29 +53,41 @@
 
 		data = self.get_data_for_eval()
 		for key in ('earnings', 'deductions'):
-			for d in self._salary_structure_doc.get(key):
-				amount = self.eval_condition_and_formula(d, data)				
+			for struct_row in self._salary_structure_doc.get(key):
+				amount = self.eval_condition_and_formula(struct_row, data)	
 				if amount:
-					self.append(key, {
-						'amount': amount,
-						'default_amount': amount,
-						'depends_on_lwp' : d.depends_on_lwp,
-						'salary_component' : d.salary_component
-					})
+					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):
+			if d.salary_component == struct_row.salary_component:
+				component_row = d
+		
+		if not component_row:
+			self.append(key, {
+				'amount': amount,
+				'default_amount': amount,
+				'depends_on_lwp' : struct_row.depends_on_lwp,
+				'salary_component' : struct_row.salary_component
+			})
+		else:
+			component_row.amount = amount
 	
 	def eval_condition_and_formula(self, d, data):
 		try:
 			if d.condition:
 				if not eval(d.condition, None, data):
-					return None
-	
+					return None	
 			amount = d.amount
 			if d.amount_based_on_formula:
 				if d.formula:
 					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:
@@ -92,6 +105,7 @@
 				data.base, data.variable = d.base, d.variable
 	
 		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"])
@@ -107,7 +121,7 @@
 			self.set("earnings", [])
 			self.set("deductions", [])
 
-			self.set_month_dates()
+			self.get_date_details()
 			self.validate_dates()
 			joining_date, relieving_date = frappe.db.get_value("Employee", self.employee,
 				["date_of_joining", "relieving_date"])
@@ -133,32 +147,33 @@
 					'working_hours': data.total_hours
 				})
 
-	def set_month_dates(self):
-		if self.month and not self.salary_slip_based_on_timesheet:
-			m = get_month_details(self.fiscal_year, self.month)
-			self.start_date = m['month_start_date']
-			self.end_date = m['month_end_date']
+	def get_date_details(self):
+		date_details = get_start_end_dates(self.payroll_frequency, self.start_date, self.end_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 = ''
+		if self.payroll_frequency:
+			cond = """and payroll_frequency = '%(payroll_frequency)s'""" % {"payroll_frequency": self.payroll_frequency}
+			
 		st_name = frappe.db.sql("""select parent from `tabSalary Structure Employee`
-			where employee=%s order by modified desc limit 1""",self.employee)
+			where employee=%s
+			and parent in (select name from `tabSalary Structure`
+				where is_active = 'Yes'
+				and (from_date <= %s or from_date <= %s)
+				and (to_date is null or to_date >= %s or to_date >= %s) %s)
+			"""% ('%s', '%s', '%s','%s','%s', cond),(self.employee, self.start_date, joining_date, self.end_date, relieving_date))
 			
 		if st_name:
-			struct = frappe.db.sql("""select name from `tabSalary Structure`
-				where name=%s and is_active = 'Yes'
-				and (from_date <= %s or from_date <= %s)
-				and (to_date is null or to_date >= %s or to_date >= %s) order by from_date desc limit 1""",
-				(st_name, self.start_date, joining_date, self.end_date, relieving_date))
-
-			if not struct:
-				self.salary_structure = None
-				frappe.throw(_("No active or default Salary Structure found for employee {0} for the given dates")
-					.format(self.employee), title=_('Salary Structure Missing'))
-
-			return struct and struct[0][0] or ''
+			if len(st_name) > 1:
+				frappe.msgprint(_("Multiple active Salary Structures found for employee {0} for the given dates")
+					.format(self.employee), title=_('Warning'))
+			return st_name and st_name[0][0] or ''
 		else:
 			self.salary_structure = None
-			frappe.throw(_("No active or default Salary Structure found for employee {0} for the given dates")
+			frappe.msgprint(_("No active or default Salary Structure found for employee {0} for the given dates")
 				.format(self.employee), title=_('Salary Structure Missing'))	
 
 	def pull_sal_struct(self):
@@ -175,9 +190,11 @@
 			
 	def process_salary_structure(self):
 		'''Calculate salary after salary structure details have been updated'''
+		self.get_date_details()
 		self.pull_emp_details()
 		self.get_leave_details()
 		self.calculate_net_pay()
+		
 
 	def add_earning_for_hourly_wages(self, salary_component):
 		default_type = False
@@ -200,14 +217,6 @@
 
 
 	def get_leave_details(self, joining_date=None, relieving_date=None, lwp=None):
-		if not self.fiscal_year:
-			# if default fiscal year is not set, get from nowdate
-			self.fiscal_year = get_fiscal_year(nowdate())[0]
-
-		if not self.month:
-			self.month = "%02d" % getdate(nowdate()).month
-			self.set_month_dates()
-
 		if not joining_date:
 			joining_date, relieving_date = frappe.db.get_value("Employee", self.employee,
 				["date_of_joining", "relieving_date"])
@@ -220,10 +229,15 @@
 			if working_days < 0:
 				frappe.throw(_("There are more holidays than working days this month."))
 
+		actual_lwp = self.calculate_lwp(holidays, working_days)
 		if not lwp:
-			lwp = self.calculate_lwp(holidays, working_days)
-		self.total_days_in_month = working_days
+			lwp = actual_lwp
+		elif lwp != actual_lwp:
+			frappe.msgprint(_("Leave Without Pay does not match with approved Leave Application records"))
+			
+		self.total_working_days = working_days
 		self.leave_without_pay = lwp
+		
 		payment_days = flt(self.get_payment_days(joining_date, relieving_date)) - flt(lwp)
 		self.payment_days = payment_days > 0 and payment_days or 0
 
@@ -267,31 +281,33 @@
 		holidays = [cstr(i) for i in holidays]
 
 		return holidays
-
+	
 	def calculate_lwp(self, holidays, working_days):
 		lwp = 0
+		holidays = "','".join(holidays)
 		for d in range(working_days):
 			dt = add_days(cstr(getdate(self.start_date)), d)
-			if dt not in holidays:
-				leave = frappe.db.sql("""
-					select t1.name, t1.half_day
-					from `tabLeave Application` t1, `tabLeave Type` t2
-					where t2.name = t1.leave_type
-					and t2.is_lwp = 1
-					and t1.docstatus = 1
-					and t1.employee = %s
-					and %s between from_date and to_date
-				""", (self.employee, dt))
-				if leave:
-					lwp = cint(leave[0][1]) and (lwp + 0.5) or (lwp + 1)
-		return lwp
+			leave = frappe.db.sql("""
+				select t1.name, t1.half_day
+				from `tabLeave Application` t1, `tabLeave Type` t2
+				where t2.name = t1.leave_type
+				and t2.is_lwp = 1
+				and t1.docstatus = 1
+				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
+				END
+				""".format(holidays), {"employee": self.employee, "dt": dt})
+			if leave:
+				lwp = cint(leave[0][1]) and (lwp + 0.5) or (lwp + 1)
+		return lwp	
 
 	def check_existing(self):
 		if not self.salary_slip_based_on_timesheet:
 			ret_exist = frappe.db.sql("""select name from `tabSalary Slip`
-						where month = %s and fiscal_year = %s and docstatus != 2
+						where start_date = %s and end_date = %s and docstatus != 2
 						and employee = %s and name != %s""",
-						(self.month, self.fiscal_year, self.employee, self.name))
+						(self.start_date, self.end_date, self.employee, self.name))
 			if ret_exist:
 				self.employee = ''
 				frappe.throw(_("Salary Slip of employee {0} already created for this period").format(self.employee))
@@ -303,8 +319,8 @@
 	def sum_components(self, component_type, total_field):
 		for d in self.get(component_type):
 			if cint(d.depends_on_lwp) == 1 and not self.salary_slip_based_on_timesheet:
-				d.amount = rounded((flt(d.amount) * flt(self.payment_days)
-					/ cint(self.total_days_in_month)), self.precision("amount", component_type))
+				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:
 				d.amount = 0
 			elif not d.amount:
@@ -312,7 +328,8 @@
 			self.set(total_field, self.get(total_field) + flt(d.amount))
 
 	def calculate_net_pay(self):
-		self.calculate_component_amounts()
+		if self.salary_structure:
+			self.calculate_component_amounts()
 
 		disable_rounded_total = cint(frappe.db.get_value("Global Defaults", None, "disable_rounded_total"))
 
@@ -327,18 +344,23 @@
 			self.precision("net_pay") if disable_rounded_total else 0)
 
 	def on_submit(self):
-		self.update_status(self.name)
-		if(frappe.db.get_single_value("HR Settings", "email_salary_slip_to_employee")):
-			self.email_salary_slip()
+		if self.net_pay < 0:
+			frappe.throw(_("Net Pay cannot be less than 0"))
+		else:
+			self.set_status()
+			self.update_status(self.name)
+			if(frappe.db.get_single_value("HR Settings", "email_salary_slip_to_employee")):
+				self.email_salary_slip()
 
 	def on_cancel(self):
+		self.set_status()
 		self.update_status()
 
 	def email_salary_slip(self):
-		receiver = frappe.db.get_value("Employee", self.employee, "company_email") or \
-			frappe.db.get_value("Employee", self.employee, "personal_email")
+		receiver = frappe.db.get_value("Employee", self.employee, "prefered_email")
+
 		if receiver:
-			subj = 'Salary Slip - from {0} to {1}, fiscal year {2}'.format(self.start_date, self.end_date, self.fiscal_year)
+			subj = 'Salary Slip - from {0} to {1}'.format(self.start_date, self.end_date)
 			frappe.sendmail([receiver], subject=subj, message = _("Please see attachment"),
 				attachments=[frappe.attach_print(self.doctype, self.name, file_name=self.name)], reference_doctype= self.doctype, reference_name= self.name)
 		else:
@@ -351,4 +373,30 @@
 				timesheet.salary_slip = salary_slip
 				timesheet.flags.ignore_validate_update_after_submit = True
 				timesheet.set_status()
-				timesheet.save()
\ No newline at end of file
+				timesheet.save()
+				
+	def set_status(self, status=None):
+		'''Get and update status'''
+		if not status:
+			status = self.get_status()
+		self.db_set("status", status)
+
+	def get_status(self):
+		if self.docstatus == 0:
+			status = "Draft"
+		elif self.docstatus == 1:
+			status = "Submitted"
+			if self.journal_entry:
+				status = "Paid"
+		elif self.docstatus == 2:
+			status = "Cancelled"
+		return status	
+
+def unlink_ref_doc_from_salary_slip(ref_no):
+	linked_ss = frappe.db.sql_list("""select name from `tabSalary Slip`
+	where journal_entry=%s and docstatus < 2""", (ref_no))
+	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_records.json b/erpnext/hr/doctype/salary_slip/test_records.json
index ba59dd1..da6365f 100644
--- a/erpnext/hr/doctype/salary_slip/test_records.json
+++ b/erpnext/hr/doctype/salary_slip/test_records.json
@@ -36,9 +36,10 @@
   ], 
   "employee": "_T-Employee-0001", 
   "employee_name": "_Test Employee", 
+  "posting_date": "2013-02-01",
   "fiscal_year": "_Test Fiscal Year 2013", 
   "month": "01", 
   "payment_days": 31, 
-  "total_days_in_month": 31
+  "total_working_days": 31
  }
 ]
\ No newline at end of file
diff --git a/erpnext/hr/doctype/salary_slip/test_salary_slip.py b/erpnext/hr/doctype/salary_slip/test_salary_slip.py
index 503996d..89dced4 100644
--- a/erpnext/hr/doctype/salary_slip/test_salary_slip.py
+++ b/erpnext/hr/doctype/salary_slip/test_salary_slip.py
@@ -5,20 +5,23 @@
 import unittest
 import frappe
 import erpnext
-from frappe.utils import today, now_datetime, getdate, cstr, add_years, nowdate
+from frappe.utils.make_random import get_random
+from erpnext.accounts.utils import get_fiscal_year
+from frappe.utils import today, now_datetime, getdate, cstr, add_years, nowdate, add_days
 from erpnext.hr.doctype.salary_structure.salary_structure import make_salary_slip
-from erpnext.hr.doctype.leave_application.test_leave_application import make_allocation_record
+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):
-		self.make_salary_component(["Basic Salary", "Allowance", "HRA", "Professional Tax", "TDS"])
+		make_earning_salary_component(["Basic Salary", "Allowance", "HRA"])
+		make_deduction_salary_component(["Professional Tax", "TDS"])
 		
 		for dt in ["Leave Application", "Leave Allocation", "Salary Slip"]:
 			frappe.db.sql("delete from `tab%s`" % dt)
 
-		make_allocation_record(leave_type="_Test Leave Type LWP")
-		
 		self.make_holiday_list()
+
 		frappe.db.set_value("Company", erpnext.get_default_company(), "default_holiday_list", "Salary Slip Test Holiday List")
 
 		from erpnext.hr.doctype.leave_application.test_leave_application import _test_records as leave_applications
@@ -37,16 +40,16 @@
 		frappe.db.set_value("Employee", frappe.get_value("Employee", {"employee_name":"test_employee@salary.com"}, "name"), "relieving_date", None)
 		frappe.db.set_value("Employee", frappe.get_value("Employee", {"employee_name":"test_employee@salary.com"}, "name"), "status", "Active")
 		ss = frappe.get_doc("Salary Slip",
-			self.make_employee_salary_slip("test_employee@salary.com"))
+			self.make_employee_salary_slip("test_employee@salary.com", "Monthly"))
 
-		self.assertEquals(ss.total_days_in_month, 31)
+		self.assertEquals(ss.total_working_days, 31)
 		self.assertEquals(ss.payment_days, 31)
-		self.assertEquals(ss.earnings[0].amount, 0)
-		self.assertEquals(ss.earnings[1].amount, 0)
-		self.assertEquals(ss.deductions[0].amount, 0)
-		self.assertEquals(ss.deductions[1].amount, 0)
-		self.assertEquals(ss.gross_pay, 0)
-		self.assertEquals(ss.net_pay, 0)
+		self.assertEquals(ss.earnings[0].amount, 5000)
+		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)
 
 	def test_salary_slip_with_holidays_excluded(self):
 		frappe.db.set_value("HR Settings", None, "include_holidays_in_total_working_days", 0)
@@ -54,17 +57,17 @@
 		frappe.db.set_value("Employee", frappe.get_value("Employee", {"employee_name":"test_employee@salary.com"}, "name"), "relieving_date", None)
 		frappe.db.set_value("Employee", frappe.get_value("Employee", {"employee_name":"test_employee@salary.com"}, "name"), "status", "Active")
 		ss = frappe.get_doc("Salary Slip",
-			self.make_employee_salary_slip("test_employee@salary.com"))
+			self.make_employee_salary_slip("test_employee@salary.com", "Monthly"))
 
-		self.assertEquals(ss.total_days_in_month, 27)
-		self.assertEquals(ss.payment_days, 27)
-		self.assertEquals(ss.earnings[0].amount, 0)
+		self.assertEquals(ss.total_working_days, 28)
+		self.assertEquals(ss.payment_days, 28)
+		self.assertEquals(ss.earnings[0].amount, 5000)
 		self.assertEquals(ss.earnings[0].default_amount, 5000)
-		self.assertEquals(ss.earnings[1].amount, 0)
-		self.assertEquals(ss.deductions[0].amount, 0)
-		self.assertEquals(ss.deductions[1].amount, 0)
-		self.assertEquals(ss.gross_pay, 0)
-		self.assertEquals(ss.net_pay, 0)
+		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)
 		
 	def test_payment_days(self):
 		# Holidays not included in working days
@@ -75,25 +78,25 @@
 		frappe.db.set_value("Employee", frappe.get_value("Employee", {"employee_name":"test_employee@salary.com"}, "name"), "date_of_joining", "2013-01-11")
 		
 		ss = frappe.get_doc("Salary Slip",
-			self.make_employee_salary_slip("test_employee@salary.com"))
+			self.make_employee_salary_slip("test_employee@salary.com", "Monthly"))
 
-		self.assertEquals(ss.total_days_in_month, 27)
-		self.assertEquals(ss.payment_days, 27)
+		self.assertEquals(ss.total_working_days, 28)
+		self.assertEquals(ss.payment_days, 28)
 
 		# set relieving date in the same month
 		frappe.db.set_value("Employee", frappe.get_value("Employee", {"employee_name":"test_employee@salary.com"}, "name"), "relieving_date", "12-12-2016")
 		frappe.db.set_value("Employee", frappe.get_value("Employee", {"employee_name":"test_employee@salary.com"}, "name"), "status", "Left")
 		
-		self.assertEquals(ss.total_days_in_month, 27)
-		self.assertEquals(ss.payment_days, 27)
+		self.assertEquals(ss.total_working_days, 28)
+		self.assertEquals(ss.payment_days, 28)
 		ss.save()
 		
 		frappe.db.set_value("Employee", frappe.get_value("Employee", {"employee_name":"test_employee@salary.com"}, "name"), "relieving_date", None)
 		frappe.db.set_value("Employee", frappe.get_value("Employee", {"employee_name":"test_employee@salary.com"}, "name"), "status", "Active")
 		# Holidays included in working days
 		frappe.db.set_value("HR Settings", None, "include_holidays_in_total_working_days", 1)	
-		self.assertEquals(ss.total_days_in_month, 27)
-		self.assertEquals(ss.payment_days, 27)
+		self.assertEquals(ss.total_working_days, 28)
+		self.assertEquals(ss.payment_days, 28)
 		ss.save()
 				#
 		# frappe.db.set_value("Employee", frappe.get_value("Employee", {"employee_name":"test_employee@salary.com"}, "name"), "date_of_joining", "2001-01-11")
@@ -103,7 +106,7 @@
 		self.make_employee("test_employee@salary.com")
 
 		salary_slip_test_employee = frappe.get_doc("Salary Slip",
-			self.make_employee_salary_slip("test_employee@salary.com"))
+			self.make_employee_salary_slip("test_employee@salary.com", "Monthly"))
 		frappe.set_user("test_employee@salary.com")
 		self.assertTrue(salary_slip_test_employee.has_permission("read"))
 
@@ -116,11 +119,33 @@
 
 		self.make_employee("test_employee@salary.com")
 		ss = frappe.get_doc("Salary Slip",
-			self.make_employee_salary_slip("test_employee@salary.com"))
+			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_payroll_frequency(self):
+		fiscal_year = get_fiscal_year(nowdate())[0]
+		month = "%02d" % getdate(nowdate()).month or "%02d" % getdate(nowdate()).month
+		m = get_month_details(fiscal_year, month)
+
+		for payroll_frequncy in ["Monthly", "Bimonthly", "Fortnightly", "Weekly", "Daily"]:
+			self.make_employee(payroll_frequncy + "_test_employee@salary.com")
+			ss = frappe.get_doc("Salary Slip",
+				self.make_employee_salary_slip(payroll_frequncy + "_test_employee@salary.com", payroll_frequncy))
+			if payroll_frequncy == "Monthly":
+				self.assertEqual(ss.end_date, m['month_end_date'])
+			elif payroll_frequncy == "Bimonthly":
+				if getdate(ss.start_date).day <= 15:
+					self.assertEqual(ss.end_date, m['month_mid_end_date'])
+				else:
+					self.assertEqual(ss.end_date, m['month_end_date'])
+			elif payroll_frequncy == "Fortnightly":
+				self.assertEqual(ss.end_date, getdate(add_days(nowdate(),13)))
+			elif payroll_frequncy == "Weekly":
+				self.assertEqual(ss.end_date, getdate(add_days(nowdate(),6)))
+			elif payroll_frequncy == "Daily":
+				self.assertEqual(ss.end_date, getdate(nowdate()))
 
 	def make_employee(self, user):
 		if not frappe.db.get_value("User", user):
@@ -144,10 +169,12 @@
 				"department": frappe.get_all("Department", fields="name")[0].name,
 				"gender": "Female",
 				"company_email": user,
+				"prefered_contact_email": "Company Email",
+				"prefered_email": user,
 				"status": "Active",
 				"employment_type": "Intern"
 			}).insert()
-			
+
 	def make_holiday_list(self):
 		if not frappe.db.get_value("Holiday List", "Salary Slip Test Holiday List"):
 			holiday_list = frappe.get_doc({
@@ -159,26 +186,18 @@
 			}).insert()	
 			holiday_list.get_weekly_off_dates()
 			holiday_list.save()
-			
-	def make_salary_component(self, salary_components):
-		for salary_component in salary_components:
-			if not frappe.db.exists('Salary Component', salary_component):
-				sal_comp = frappe.get_doc({
-					"doctype": "Salary Component",
-					"salary_component": salary_component
-				})
-				sal_comp.insert()		
-		
-	def make_employee_salary_slip(self, user):
+
+	def make_employee_salary_slip(self, user, payroll_frequency):
 		employee = frappe.db.get_value("Employee", {"user_id": user})
-		salary_structure = make_salary_structure("Salary Structure Test for Salary Slip")
+		salary_structure = make_salary_structure(payroll_frequency + " Salary Structure Test for Salary Slip", payroll_frequency, employee)
 		salary_slip = frappe.db.get_value("Salary Slip", {"employee": frappe.db.get_value("Employee", {"user_id": user})})
 		
 		if not salary_slip:
 			salary_slip = make_salary_slip(salary_structure, employee = employee)
 			salary_slip.employee_name = frappe.get_value("Employee", {"name":frappe.db.get_value("Employee", {"user_id": user})}, "employee_name")
-			salary_slip.month = "12"
-			salary_slip.fiscal_year = "_Test Fiscal Year 2016"
+			salary_slip.payroll_frequency = payroll_frequency
+			salary_slip.start_date = nowdate()
+			salary_slip.posting_date = nowdate()
 			salary_slip.insert()
 			# salary_slip.submit()
 			salary_slip = salary_slip.name
@@ -192,28 +211,60 @@
 		activity_type.wage_rate = 25
 		activity_type.save()
 
+def make_earning_salary_component(salary_components):
+	for salary_component 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"
+			})
+			sal_comp.insert()
+		get_salary_component_account(salary_component)
 
-def make_salary_structure(sal_struct):
+def make_deduction_salary_component(salary_components):
+	for salary_component 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": "Deduction"
+			})
+			sal_comp.insert()
+		get_salary_component_account(salary_component)
+
+def make_salary_structure(sal_struct, payroll_frequency, employee):
 	if not frappe.db.exists('Salary Structure', sal_struct):
 		frappe.get_doc({
 			"doctype": "Salary Structure",
 			"name": sal_struct,
 			"company": erpnext.get_default_company(),
 			"from_date": nowdate(),
-			"employees": get_employee_details(),
+			"employees": get_employee_details(employee),
 			"earnings": get_earnings_component(),
-			"deductions": get_deductions_component()			
+			"deductions": get_deductions_component(),
+			"payroll_frequency": payroll_frequency,
+			"payment_account": frappe.get_value('Account', {'account_type': 'Cash', 'company': erpnext.get_default_company(),'is_group':0}, "name")
 		}).insert()
+
+	elif not frappe.db.get_value("Salary Structure Employee",{'parent':sal_struct, 'employee':employee},'name'):
+		sal_struct = frappe.get_doc("Salary Structure", sal_struct)
+		sal_struct.append("employees", {"employee": employee,
+			"employee_name": employee,
+			"base": 32000,
+			"variable": 3200
+			})
+		sal_struct.save()
+		sal_struct = sal_struct.name
 	return sal_struct
-			
-			
-def get_employee_details():
-	return [{"employee": frappe.get_value("Employee", {"employee_name":"test_employee@salary.com"}, "name"),
+
+def get_employee_details(employee):
+	return [{"employee": employee,
 			"base": 25000,
 			"variable": 5000
 			}
 		]
-			
+
 def get_earnings_component():	
 	return [
 				{
diff --git a/erpnext/hr/doctype/salary_structure/salary_structure.js b/erpnext/hr/doctype/salary_structure/salary_structure.js
index 0dce0a4..0bc67a7 100755
--- a/erpnext/hr/doctype/salary_structure/salary_structure.js
+++ b/erpnext/hr/doctype/salary_structure/salary_structure.js
@@ -1,5 +1,6 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
+{% include "erpnext/public/js/controllers/accounts.js" %}
 
 cur_frm.add_fetch('employee', 'company', 'company');
 cur_frm.add_fetch('company', 'default_letter_head', 'letter_head');
@@ -14,31 +15,95 @@
 
 frappe.ui.form.on('Salary Structure', {
 	onload: function(frm) {
+		frm.toggle_reqd(['payroll_frequency'], !frm.doc.salary_slip_based_on_timesheet),
+		
 		frm.set_query("salary_component", "earnings", function() {
 			return {
 				filters: {
 					type: "earning"
 				}
 			}
-		})
+		});
 		frm.set_query("salary_component", "deductions", function() {
 			return {
 				filters: {
 					type: "deduction"
 				}
 			}
-		})
+		});
+		frm.set_query("employee", "employees", function(doc) {
+			return {
+				query: "erpnext.controllers.queries.employee_query",
+				filters: {
+					company: doc.company
+				}
+			}
+		});
 	},
 	
 	refresh: function(frm) {
-		frm.trigger("toggle_fields")
+		frm.trigger("toggle_fields");
 		frm.fields_dict['earnings'].grid.set_column_disp("default_amount", false);
 		frm.fields_dict['deductions'].grid.set_column_disp("default_amount", false);
 		
 		frm.add_custom_button(__("Preview Salary Slip"),
-			function() { frm.trigger('preview_salary_slip'); }, "icon-sitemap", "btn-default");
+			function() { frm.trigger('preview_salary_slip'); }, "fa fa-sitemap", "btn-default");
+
+		frm.add_custom_button(__("Add Employees"),function () {
+			frm.trigger('add_employees')
+		})
 		
-	},	
+	},
+
+	add_employees:function (frm) {
+		frm.$emp_dialog = new frappe.ui.Dialog({
+			title: __("Add Employees"),
+			fields: [
+				{fieldname:'company', fieldtype:'Link', options: 'Company', label: __('Company')},
+				{fieldname:'branch', fieldtype:'Link', options: 'Branch', label: __('Branch')},
+				{fieldname:'department', fieldtype:'Link', options: 'Department', label: __('Department')},
+				{fieldname:'designation', fieldtype:'Link', options: 'Designation', label: __('Designation')},
+				{fieldname:'base_variable', fieldtype:'Section Break'},
+				{fieldname:'base', fieldtype:'Currency', label: __('Base')},
+				{fieldname:'base_col_br', fieldtype:'Column Break'},
+				{fieldname:'variable', fieldtype:'Currency', label: __('Variable')}
+			]
+		});
+		frm.$emp_dialog.set_primary_action(__("Add"), function() {
+			frm.trigger('get_employees');
+		});
+		frm.$emp_dialog.show();
+	},
+
+	get_employees:function (frm) {
+		var filters = frm.$emp_dialog.get_values();
+		if ('variable' in filters) {
+			delete filters.variable
+		}
+		if ('base' in filters) {
+			delete filters.base
+		}
+		frappe.call({
+			method:'erpnext.hr.doctype.salary_structure.salary_structure.get_employees',
+			args:{
+				filters: filters
+			},
+			callback:function (r) {
+				var employees = $.map(frm.doc.employees, function(d) { return d.employee });
+				for (var i=0; i< r.message.length; i++) {
+					if (employees.indexOf(r.message[i].name) === -1) {
+						var row = frappe.model.add_child(frm.doc, frm.fields_dict.employees.df.options, frm.fields_dict.employees.df.fieldname);
+						row.employee = r.message[i].name;
+						row.employee_name = r.message[i].employee_name;
+						row.base = frm.$emp_dialog.get_value('base');
+						row.variable = frm.$emp_dialog.get_value('variable');
+					}
+				}
+				frm.refresh_field('employees');
+				frm.$emp_dialog.hide()
+			}
+		})
+	},
 
 	salary_slip_based_on_timesheet: function(frm) {
 		frm.trigger("toggle_fields")
@@ -79,13 +144,14 @@
 	toggle_fields: function(frm) {
 		frm.toggle_display(['salary_component', 'hour_rate'], frm.doc.salary_slip_based_on_timesheet);
 		frm.toggle_reqd(['salary_component', 'hour_rate'], frm.doc.salary_slip_based_on_timesheet);
+		frm.toggle_reqd(['payroll_frequency'], !frm.doc.salary_slip_based_on_timesheet);
 	}
-})
+});
 
 
 cur_frm.cscript.amount = function(doc, cdt, cdn){
 	calculate_totals(doc, cdt, cdn);
-}
+};
 
 var calculate_totals = function(doc) {
 	var tbl1 = doc.earnings || [];
@@ -127,11 +193,3 @@
 		calculate_totals(frm.doc);
 	}
 })
-
-frappe.ui.form.on('Salary Structure Employee', {
-	onload: function(frm) {
-		frm.set_query("employee","employees", function(doc,cdt,cdn) {
-			return{ query: "erpnext.controllers.queries.employee_query" }
-		})
-	}
-});
diff --git a/erpnext/hr/doctype/salary_structure/salary_structure.json b/erpnext/hr/doctype/salary_structure/salary_structure.json
index 5abebef..5c0a635 100644
--- a/erpnext/hr/doctype/salary_structure/salary_structure.json
+++ b/erpnext/hr/doctype/salary_structure/salary_structure.json
@@ -23,12 +23,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, 
@@ -48,6 +50,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -56,6 +59,7 @@
    "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, 
@@ -74,6 +78,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Letter Head", 
    "length": 0, 
    "no_copy": 0, 
@@ -83,6 +88,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": "", 
+   "depends_on": "eval:(!doc.salary_slip_based_on_timesheet)", 
+   "fieldname": "payroll_frequency", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Payroll Frequency", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nMonthly\nFortnightly\nBimonthly\nWeekly\nDaily", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -101,12 +138,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, 
@@ -127,6 +166,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Is Active", 
    "length": 0, 
    "no_copy": 0, 
@@ -137,6 +177,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, 
@@ -156,6 +197,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Is Default", 
    "length": 0, 
    "no_copy": 1, 
@@ -165,6 +207,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, 
@@ -183,6 +226,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "From Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -192,6 +236,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, 
@@ -210,6 +255,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "To Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -219,6 +265,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,6 +284,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -244,6 +292,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, 
@@ -263,6 +312,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Employees", 
    "length": 0, 
    "no_copy": 0, 
@@ -272,6 +322,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, 
@@ -290,6 +341,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
@@ -298,6 +350,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, 
@@ -317,6 +370,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Salary Slip Based on Timesheet", 
    "length": 0, 
    "no_copy": 0, 
@@ -325,6 +379,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,6 +398,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -350,6 +406,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, 
@@ -370,6 +427,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Salary Component", 
    "length": 0, 
    "no_copy": 0, 
@@ -379,6 +437,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, 
@@ -398,6 +457,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Hour Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -406,6 +466,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, 
@@ -426,6 +487,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
@@ -436,6 +498,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, 
@@ -454,6 +517,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Earning", 
    "length": 0, 
    "no_copy": 0, 
@@ -463,6 +527,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, 
@@ -483,6 +548,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Earnings", 
    "length": 0, 
    "no_copy": 0, 
@@ -493,6 +559,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, 
@@ -511,6 +578,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Deduction", 
    "length": 0, 
    "no_copy": 0, 
@@ -520,6 +588,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, 
@@ -539,6 +608,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Deductions", 
    "length": 0, 
    "no_copy": 0, 
@@ -549,6 +619,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, 
@@ -568,6 +639,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "options": "Simple", 
@@ -575,6 +647,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, 
@@ -593,12 +666,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, 
@@ -618,6 +693,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Earning", 
    "length": 0, 
    "no_copy": 0, 
@@ -628,6 +704,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, 
@@ -646,6 +723,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Deduction", 
    "length": 0, 
    "no_copy": 0, 
@@ -656,6 +734,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, 
@@ -674,6 +753,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Net Pay", 
    "length": 0, 
    "no_copy": 0, 
@@ -682,16 +762,130 @@
    "print_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": "account", 
+   "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": "Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "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": "mode_of_payment", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 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_28", 
+   "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": "payment_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Payment Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
   }
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-file-text", 
+ "icon": "fa fa-file-text", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
@@ -700,7 +894,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-08-23 12:49:41.258649", 
+ "modified": "2016-12-07 14:57:22.083825", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Salary Structure", 
@@ -716,6 +910,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -736,6 +931,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
diff --git a/erpnext/hr/doctype/salary_structure/salary_structure.py b/erpnext/hr/doctype/salary_structure/salary_structure.py
index d4bc6e3..13622c3 100644
--- a/erpnext/hr/doctype/salary_structure/salary_structure.py
+++ b/erpnext/hr/doctype/salary_structure/salary_structure.py
@@ -58,4 +58,9 @@
 		doc.name = 'Preview for {0}'.format(employee)
 		return frappe.get_print(doc.doctype, doc.name, doc = doc, print_format = print_format)
 	else:
-		return doc
\ No newline at end of file
+		return doc
+
+
+@frappe.whitelist()
+def get_employees(**args):
+	return frappe.get_list('Employee',filters=args['filters'], fields=['name', 'employee_name'])
diff --git a/erpnext/hr/doctype/salary_structure/test_salary_structure.py b/erpnext/hr/doctype/salary_structure/test_salary_structure.py
index ef9231a..83ea12e 100644
--- a/erpnext/hr/doctype/salary_structure/test_salary_structure.py
+++ b/erpnext/hr/doctype/salary_structure/test_salary_structure.py
@@ -5,8 +5,10 @@
 import frappe
 import unittest
 import erpnext
+from frappe.utils.make_random import get_random
 from frappe.utils import nowdate, add_days, add_years
 from erpnext.hr.doctype.salary_structure.salary_structure import make_salary_slip
+from erpnext.hr.doctype.salary_slip.test_salary_slip import make_earning_salary_component, make_deduction_salary_component
 # test_records = frappe.get_test_records('Salary Structure')
 
 class TestSalaryStructure(unittest.TestCase):
@@ -22,7 +24,8 @@
 			
 		self.make_holiday_list()
 		frappe.db.set_value("Company", erpnext.get_default_company(), "default_holiday_list", "Salary Structure Test Holiday List")
-		self.make_salary_component(["Basic Salary", "Allowance", "HRA", "Professional Tax", "TDS"])
+		make_earning_salary_component(["Basic Salary", "Allowance", "HRA"])
+		make_deduction_salary_component(["Professional Tax", "TDS"])
 		employee1 = self.make_employee("test_employee@salary.com")
 		employee2 = self.make_employee("test_employee_2@salary.com")
 		
@@ -68,28 +71,17 @@
 			return emp.name
 		else:
 			return frappe.get_value("Employee", {"employee_name":user}, "name")
-	
-	def make_salary_component(self, salary_components):
-		for salary_component in salary_components:
-			if not frappe.db.exists('Salary Component', salary_component):
-				sal_comp = frappe.get_doc({
-					"doctype": "Salary Component",
-					"salary_component": salary_component
-				})
-				sal_comp.insert()
-				
-
 		
 	def test_amount_totals(self):
 		sal_slip = frappe.get_value("Salary Slip", {"employee_name":"test_employee@salary.com"})
 		if not sal_slip:
 			sal_slip = make_salary_slip_from_salary_structure(employee=frappe.get_value("Employee", {"employee_name":"test_employee@salary.com"}))
 			self.assertEquals(sal_slip.get("salary_structure"), 'Salary Structure Sample')
-			self.assertEquals(sal_slip.get("earnings")[0].amount, 0)
-			self.assertEquals(sal_slip.get("deductions")[0].amount, 0)
-			self.assertEquals(sal_slip.get("deductions")[1].amount, 0)
-			self.assertEquals(sal_slip.get("total_deduction"), 0)
-			self.assertEquals(sal_slip.get("net_pay"), 0)
+			self.assertEquals(sal_slip.get("earnings")[0].amount, 5000)
+			self.assertEquals(sal_slip.get("deductions")[0].amount, 5000)
+			self.assertEquals(sal_slip.get("deductions")[1].amount, 2500)
+			self.assertEquals(sal_slip.get("total_deduction"), 7500)
+			self.assertEquals(sal_slip.get("net_pay"), 7500)
 			
 		
 def make_salary_slip_from_salary_structure(employee):
@@ -98,6 +90,8 @@
 	sal_slip.employee_name = frappe.get_value("Employee", {"name":employee}, "employee_name")
 	sal_slip.month = "11"
 	sal_slip.fiscal_year = "_Test Fiscal Year 2016"
+	sal_slip.posting_date = nowdate()
+	sal_slip.payroll_frequency =  "Monthly"
 	sal_slip.insert()
 	sal_slip.submit()
 	return sal_slip	
@@ -111,7 +105,9 @@
 			"from_date": nowdate(),
 			"employees": get_employee_details(),
 			"earnings": get_earnings_component(),
-			"deductions": get_deductions_component()			
+			"deductions": get_deductions_component(),
+			"payroll_frequency": "Monthly",
+			"payment_account": frappe.get_value('Account', {'account_type': 'Cash', 'company': erpnext.get_default_company(),'is_group':0}, "name")
 		}).insert()
 	return sal_struct
 			
@@ -123,7 +119,7 @@
 			"idx": 1
 			},
 			{"employee": frappe.get_value("Employee", {"employee_name":"test_employee_2@salary.com"}, "name"),
-			 "base": 2100,
+			 "base": 15000,
 			 "variable": 100,
 			 "idx": 2
 			}
@@ -148,7 +144,7 @@
 				{
 					"salary_component": 'HRA',
 					"abbr":'H',
-					"amount": 3000,
+					"amount": 10000,
 					"idx": 3
 				},
 				{
@@ -172,6 +168,7 @@
 				{
 					"salary_component": 'TDS',
 					"abbr":'T',
+					"condition": 'employment_type!="Intern"',
 					"formula": 'base*.5',
 					"idx": 2
 				},
diff --git a/erpnext/hr/doctype/upload_attendance/upload_attendance.json b/erpnext/hr/doctype/upload_attendance/upload_attendance.json
index 4d7ef8e..5a3f72a 100644
--- a/erpnext/hr/doctype/upload_attendance/upload_attendance.json
+++ b/erpnext/hr/doctype/upload_attendance/upload_attendance.json
@@ -161,7 +161,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 1, 
- "icon": "icon-upload-alt", 
+ "icon": "fa fa-upload-alt", 
  "idx": 1, 
  "in_create": 0, 
  "in_dialog": 0, 
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 1789c75..0c38d45 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_days_in_month\"}, {\"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\": \"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\"}]", 
  "idx": 0, 
  "modified": "2016-08-22 00:21:42.600548", 
  "modified_by": "Administrator", 
diff --git a/erpnext/hr/report/employee_information/employee_information.json b/erpnext/hr/report/employee_information/employee_information.json
index 93b8cd2..51963d4 100644
--- a/erpnext/hr/report/employee_information/employee_information.json
+++ b/erpnext/hr/report/employee_information/employee_information.json
@@ -1,12 +1,14 @@
 {
+ "add_total_row": 0, 
  "apply_user_permissions": 1, 
  "creation": "2013-05-06 18:43:53", 
+ "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
  "idx": 1, 
  "is_standard": "Yes", 
- "json": "{\"filters\":[],\"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\"]],\"sort_by\":\"Employee.bank_ac_no\",\"sort_order\":\"desc\",\"sort_by_next\":\"\",\"sort_order_next\":\"desc\"}", 
- "modified": "2015-03-02 07:42:02.352823", 
+ "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_by": "Administrator", 
  "module": "HR", 
  "name": "Employee Information", 
diff --git a/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.js b/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.js
index 4feb417..b1678db 100644
--- a/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.js
+++ b/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.js
@@ -34,11 +34,11 @@
 		}
 	],
 
-	"onload": function(me) {
+	"onload": function() {
 		return  frappe.call({
 			method: "erpnext.hr.report.monthly_attendance_sheet.monthly_attendance_sheet.get_attendance_years",
 			callback: function(r) {
-				var year_filter = me.filters_by_name.year;
+				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();
diff --git a/erpnext/hr/report/monthly_salary_register/monthly_salary_register.html b/erpnext/hr/report/monthly_salary_register/monthly_salary_register.html
new file mode 100644
index 0000000..c77e4e5
--- /dev/null
+++ b/erpnext/hr/report/monthly_salary_register/monthly_salary_register.html
@@ -0,0 +1,39 @@
+<div style="margin-bottom: 7px;" class="text-center">
+	{%= 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">Fiscal Year: {%= filters.fiscal_year %}</h5>
+<h5 class="text-center">Month: {%= filters.month %}</h5>
+<hr>
+<table class="table table-bordered">
+	<thead>
+		<tr>
+			{% for(var i=1, l=report.columns.length; i<l; i++) { %}
+				<th class="text-right">{%= report.columns[i].label %}</th>
+			{% } %}
+		</tr>
+	</thead>
+    <tbody>
+		{% for(var j=0, k=data.length; j<k; j++) { %}
+            {%
+				var row = data[j];
+			%}
+			<tr>
+				{% for(var i=1, l=report.columns.length; i<l; i++) { %}
+					<td class="text-right">
+						{% var fieldname = report.columns[i].field; %}
+                        {% if (i > 10) { %}
+                            {%= format_currency(row[fieldname]) %}
+                        {% } else { %}
+						    {% if (!is_null(row[fieldname])) { %}
+							    {%= row[fieldname] %}
+                            {% } %}
+						{% } %}
+					</td>
+				{% } %}
+			</tr>
+		{% } %}
+	</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/monthly_salary_register/monthly_salary_register.py b/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py
index f384917..1e9d03e 100644
--- a/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py
+++ b/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py
@@ -8,100 +8,100 @@
 
 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)
 	ss_ded_map = get_ss_ded_map(salary_slips)
-	
-	
+
+
 	data = []
 	for ss in salary_slips:
-		row = [ss.employee, ss.employee_name, ss.branch, ss.department, ss.designation, 
+		row = [ss.name, ss.employee, ss.employee_name, ss.branch, ss.department, ss.designation,
 			ss.company, ss.month, ss.leave_withut_pay, ss.payment_days]
-			
+
 		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]
-		
+
 		for d in ded_types:
 			row.append(ss_ded_map.get(ss.name, {}).get(d))
-		
+
 		row += [ss.total_deduction, ss.net_pay]
-		
+
 		data.append(row)
-	
+
 	return columns, data
-	
+
 def get_columns(salary_slips):
 	columns = [
-		_("Employee") + ":Link/Employee:120", _("Employee Name") + "::140", _("Branch") + ":Link/Branch:120", 
+		_("Salary Slip ID") + ":Link/Salary Slip:150",_("Employee") + ":Link/Employee:120", _("Employee Name") + "::140", _("Branch") + ":Link/Branch:120",
 		_("Department") + ":Link/Department:120", _("Designation") + ":Link/Designation:120",
-		 _("Company") + ":Link/Company:120", _("Month") + "::80", _("Leave Without Pay") + ":Float:130", 
+		_("Company") + ":Link/Company:120", _("Month") + "::80", _("Leave Without Pay") + ":Float:130",
 		_("Payment Days") + ":Float:120"
 	]
-	
-	earning_types = frappe.db.sql_list("""select distinct salary_component from `tabSalary Detail`
-		where amount != 0 and parent in (%s)""" % 
-		(', '.join(['%s']*len(salary_slips))), tuple([d.name for d in salary_slips]))
-		
-	ded_types = frappe.db.sql_list("""select distinct salary_component from `tabSalary Detail`
-		where amount != 0 and parent in (%s)""" % 
-		(', '.join(['%s']*len(salary_slips))), tuple([d.name for d in salary_slips]))
-		
-	columns = columns + [(e + ":Currency:120") for e in earning_types] + \
-		["Arrear Amount:Currency:120", "Leave Encashment Amount:Currency:150", 
-		"Gross Pay:Currency:120"] + [(d + ":Currency:120") for d in ded_types] + \
-		["Total Deduction:Currency:120", "Net Pay:Currency:120"]
 
-	return columns, earning_types, ded_types
-	
+	salary_components = {_("Earning"): [], _("Deduction"): []}
+
+	for component in frappe.db.sql("""select distinct sd.salary_component, sc.type
+		from `tabSalary Detail` sd, `tabSalary Component` sc
+		where sc.name=sd.salary_component and sd.amount != 0 and sd.parent in (%s)""" %
+		(', '.join(['%s']*len(salary_slips))), tuple([d.name for d in salary_slips]), as_dict=1):
+		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")]] + \
+		[_("Total Deduction") + ":Currency:120", _("Net Pay") + ":Currency:120"]
+
+	return columns, salary_components[_("Earning")], salary_components[_("Deduction")]
+
 def get_salary_slips(filters):
 	conditions, filters = get_conditions(filters)
 	salary_slips = frappe.db.sql("""select * from `tabSalary Slip` where docstatus = 1 %s
 		order by employee, month""" % conditions, filters, as_dict=1)
-	
+
 	if not salary_slips:
-		msgprint(_("No salary slip found for month: ") + cstr(filters.get("month")) + 
-			_(" and year: ") + cstr(filters.get("fiscal_year")), raise_exception=1)
-	
+		frappe.throw(_("No salary slip found for month {0} and year {1}").format(
+			filters.get("month"), filters.get("fiscal_year")))
+
 	return salary_slips
-	
+
 def get_conditions(filters):
 	conditions = ""
 	if filters.get("month"):
-		month = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", 
+		month = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov",
 			"Dec"].index(filters["month"]) + 1
 		filters["month"] = month
 		conditions += " and month = %(month)s"
-	
+
 	if filters.get("fiscal_year"): conditions += " and fiscal_year = %(fiscal_year)s"
 	if filters.get("company"): conditions += " and company = %(company)s"
 	if filters.get("employee"): conditions += " and employee = %(employee)s"
-	
+
 	return conditions, filters
-	
+
 def get_ss_earning_map(salary_slips):
-	ss_earnings = frappe.db.sql("""select parent, salary_component, amount 
+	ss_earnings = frappe.db.sql("""select parent, salary_component, amount
 		from `tabSalary Detail` where parent in (%s)""" %
 		(', '.join(['%s']*len(salary_slips))), tuple([d.name for d in salary_slips]), as_dict=1)
-	
+
 	ss_earning_map = {}
 	for d in ss_earnings:
 		ss_earning_map.setdefault(d.parent, frappe._dict()).setdefault(d.salary_component, [])
 		ss_earning_map[d.parent][d.salary_component] = flt(d.amount)
-	
+
 	return ss_earning_map
 
 def get_ss_ded_map(salary_slips):
-	ss_deductions = frappe.db.sql("""select parent, salary_component, amount 
+	ss_deductions = frappe.db.sql("""select parent, salary_component, amount
 		from `tabSalary Detail` where parent in (%s)""" %
 		(', '.join(['%s']*len(salary_slips))), tuple([d.name for d in salary_slips]), as_dict=1)
-	
+
 	ss_ded_map = {}
 	for d in ss_deductions:
 		ss_ded_map.setdefault(d.parent, frappe._dict()).setdefault(d.salary_component, [])
 		ss_ded_map[d.parent][d.salary_component] = flt(d.amount)
-	
+
 	return ss_ded_map
\ No newline at end of file
diff --git a/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.json b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.json
index e44213b..60ddf63 100644
--- a/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.json
+++ b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.json
@@ -23,15 +23,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-user", 
+   "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, 
@@ -50,6 +52,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Series", 
    "length": 0, 
    "no_copy": 1, 
@@ -59,6 +62,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, 
@@ -77,6 +81,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Customer", 
    "length": 0, 
    "no_copy": 0, 
@@ -87,6 +92,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, 
@@ -105,6 +111,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
@@ -112,6 +119,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, 
@@ -131,6 +139,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Status", 
    "length": 0, 
    "no_copy": 1, 
@@ -141,6 +150,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, 
@@ -159,6 +169,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Transaction Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -168,6 +179,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, 
@@ -186,15 +198,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-shopping-cart", 
+   "options": "fa fa-shopping-cart", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -213,6 +227,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Items", 
    "length": 0, 
    "no_copy": 0, 
@@ -223,6 +238,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, 
@@ -241,15 +257,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Schedule", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-time", 
+   "options": "fa fa-time", 
    "permlevel": 0, 
    "print_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,6 +286,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Generate Schedule", 
    "length": 0, 
    "no_copy": 0, 
@@ -276,6 +295,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, 
@@ -294,6 +314,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Schedules", 
    "length": 0, 
    "no_copy": 0, 
@@ -304,6 +325,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, 
@@ -322,6 +344,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Contact Info", 
    "length": 0, 
    "no_copy": 0, 
@@ -329,6 +352,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 +372,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Customer Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -357,6 +382,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,6 +402,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Contact Person", 
    "length": 0, 
    "no_copy": 0, 
@@ -384,6 +411,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, 
@@ -403,6 +431,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Mobile No", 
    "length": 0, 
    "no_copy": 0, 
@@ -410,6 +439,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, 
@@ -429,6 +459,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Contact Email", 
    "length": 0, 
    "no_copy": 0, 
@@ -436,6 +467,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, 
@@ -454,6 +486,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Contact", 
    "length": 0, 
    "no_copy": 0, 
@@ -461,6 +494,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, 
@@ -479,12 +513,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, 
@@ -504,6 +540,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer Address", 
    "length": 0, 
    "no_copy": 0, 
@@ -512,6 +549,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, 
@@ -530,6 +568,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Address", 
    "length": 0, 
    "no_copy": 0, 
@@ -537,6 +576,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, 
@@ -557,6 +597,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Territory", 
    "length": 0, 
    "no_copy": 0, 
@@ -567,6 +608,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, 
@@ -587,6 +629,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer Group", 
    "length": 0, 
    "no_copy": 0, 
@@ -595,6 +638,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, 
@@ -613,6 +657,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -623,6 +668,7 @@
    "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, 
@@ -641,6 +687,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amended From", 
    "length": 0, 
    "no_copy": 1, 
@@ -649,6 +696,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, 
@@ -658,7 +706,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-calendar", 
+ "icon": "fa fa-calendar", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
@@ -667,7 +715,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-09-02 04:05:12.265769", 
+ "modified": "2016-11-07 05:54:23.335854", 
  "modified_by": "Administrator", 
  "module": "Maintenance", 
  "name": "Maintenance Schedule", 
@@ -683,6 +731,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
diff --git a/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.json b/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.json
index 8636858..6efd6fd 100644
--- a/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.json
+++ b/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.json
@@ -23,15 +23,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-user", 
+   "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, 
@@ -50,6 +52,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
@@ -57,6 +60,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,6 +79,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Series", 
    "length": 0, 
    "no_copy": 1, 
@@ -84,6 +89,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, 
@@ -102,6 +108,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer", 
    "length": 0, 
    "no_copy": 0, 
@@ -112,6 +119,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, 
@@ -130,6 +138,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -137,6 +146,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, 
@@ -155,6 +165,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Address", 
    "length": 0, 
    "no_copy": 0, 
@@ -162,6 +173,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, 
@@ -180,6 +192,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Contact", 
    "length": 0, 
    "no_copy": 0, 
@@ -187,6 +200,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, 
@@ -205,6 +219,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Mobile No", 
    "length": 0, 
    "no_copy": 0, 
@@ -212,6 +227,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, 
@@ -230,6 +246,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Contact Email", 
    "length": 0, 
    "no_copy": 0, 
@@ -237,6 +254,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, 
@@ -255,6 +273,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
@@ -262,6 +281,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 +302,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Maintenance Date", 
    "length": 0, 
    "no_copy": 1, 
@@ -291,6 +312,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, 
@@ -309,6 +331,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Maintenance Time", 
    "length": 0, 
    "no_copy": 1, 
@@ -318,6 +341,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, 
@@ -336,15 +360,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-wrench", 
+   "options": "fa fa-wrench", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -363,6 +389,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Completion Status", 
    "length": 0, 
    "no_copy": 0, 
@@ -373,6 +400,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, 
@@ -391,12 +419,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, 
@@ -416,6 +446,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Maintenance Type", 
    "length": 0, 
    "no_copy": 0, 
@@ -426,6 +457,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, 
@@ -444,14 +476,16 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-wrench", 
+   "options": "fa fa-wrench", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -470,6 +504,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Purposes", 
    "length": 0, 
    "no_copy": 0, 
@@ -480,6 +515,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, 
@@ -498,15 +534,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "More Information", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-file-text", 
+   "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, 
@@ -525,6 +563,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer Feedback", 
    "length": 0, 
    "no_copy": 0, 
@@ -534,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, 
@@ -552,12 +592,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, 
@@ -577,6 +619,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Status", 
    "length": 0, 
    "no_copy": 1, 
@@ -587,6 +630,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, 
@@ -605,6 +649,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amended From", 
    "length": 0, 
    "no_copy": 1, 
@@ -615,6 +660,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, 
@@ -634,6 +680,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -644,6 +691,7 @@
    "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, 
@@ -663,14 +711,16 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Contact Info", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "icon-bullhorn", 
+   "options": "fa fa-bullhorn", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -689,6 +739,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer Address", 
    "length": 0, 
    "no_copy": 0, 
@@ -697,6 +748,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, 
@@ -715,6 +767,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Contact Person", 
    "length": 0, 
    "no_copy": 0, 
@@ -723,6 +776,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, 
@@ -741,12 +795,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, 
@@ -766,6 +822,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Territory", 
    "length": 0, 
    "no_copy": 0, 
@@ -774,6 +831,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, 
@@ -793,6 +851,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer Group", 
    "length": 0, 
    "no_copy": 0, 
@@ -801,6 +860,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, 
@@ -810,7 +870,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-file-text", 
+ "icon": "fa fa-file-text", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
@@ -819,7 +879,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-09-02 04:04:32.658556", 
+ "modified": "2016-11-07 05:13:23.358364", 
  "modified_by": "Administrator", 
  "module": "Maintenance", 
  "name": "Maintenance Visit", 
@@ -835,6 +895,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
diff --git a/erpnext/manufacturing/doctype/bom/bom.js b/erpnext/manufacturing/doctype/bom/bom.js
index 94f9d38..5181cf4 100644
--- a/erpnext/manufacturing/doctype/bom/bom.js
+++ b/erpnext/manufacturing/doctype/bom/bom.js
@@ -4,9 +4,19 @@
 frappe.provide("erpnext.bom");
 
 frappe.ui.form.on("BOM", {
+	setup: function(frm) {
+		frm.add_fetch('buying_price_list', 'currency', 'currency')
+		frm.fields_dict["items"].grid.get_field("bom_no").get_query = function(doc, cdt, cdn){
+			return {
+				filters: {'currency': frm.doc.currency}
+			}
+		}
+	},
+
 	onload_post_render: function(frm) {
 		frm.get_field("items").grid.set_multiple_add("item_code", "qty");
 	},
+
 	refresh: function(frm) {
 		frm.toggle_enable("item", frm.doc.__islocal);
 		toggle_operations(frm);
@@ -31,6 +41,7 @@
 			});
 		}
 	},
+
 	update_cost: function(frm) {
 		return frappe.call({
 			doc: frm.doc,
@@ -43,6 +54,28 @@
 	}
 });
 
+erpnext.bom.BomController = erpnext.TransactionController.extend({
+	conversion_rate: function(doc, cdt, cdn) {
+		if(this.frm.doc.currency === this.get_company_currency()) {
+			this.frm.set_value("conversion_rate", 1.0);
+		} else {
+			erpnext.bom.update_cost(doc);
+		}
+	},
+	
+	item_code: function(doc, cdt, cdn){
+		var scrap_items = false;
+		child = locals[cdt][cdn];
+		if(child.doctype == 'BOM Scrap Item') {
+			scrap_items = true;
+		}
+
+		get_bom_material_detail(doc, cdt, cdn, scrap_items);
+	},
+})
+
+$.extend(cur_frm.cscript, new erpnext.bom.BomController({frm: cur_frm}));
+
 cur_frm.add_fetch("item", "description", "description");
 cur_frm.add_fetch("item", "image", "image");
 cur_frm.add_fetch("item", "item_name", "item_name");
@@ -56,19 +89,15 @@
 
 cur_frm.cscript.time_in_mins = cur_frm.cscript.hour_rate;
 
-cur_frm.cscript.item_code = function(doc, cdt, cdn) {
-	get_bom_material_detail(doc, cdt, cdn);
-}
-
 cur_frm.cscript.bom_no	= function(doc, cdt, cdn) {
-	get_bom_material_detail(doc, cdt, cdn);
+	get_bom_material_detail(doc, cdt, cdn, false);
 }
 
 cur_frm.cscript.is_default = function(doc) {
 	if (doc.is_default) cur_frm.set_value("is_active", 1);
 }
 
-var get_bom_material_detail= function(doc, cdt, cdn) {
+var get_bom_material_detail= function(doc, cdt, cdn, scrap_items) {
 	var d = locals[cdt][cdn];
 	if (d.item_code) {
 		return frappe.call({
@@ -77,14 +106,17 @@
 			args: {
 				'item_code': d.item_code,
 				'bom_no': d.bom_no != null ? d.bom_no: '',
+				"scrap_items": scrap_items,
 				'qty': d.qty
 			},
 			callback: function(r) {
 				d = locals[cdt][cdn];
 				$.extend(d, r.message);
 				refresh_field("items");
+				refresh_field("scrap_items");
 				doc = locals[doc.doctype][doc.name];
 				erpnext.bom.calculate_rm_cost(doc);
+				erpnext.bom.calculate_scrap_materials_cost(doc);
 				erpnext.bom.calculate_total(doc);
 			},
 			freeze: true
@@ -94,50 +126,99 @@
 
 cur_frm.cscript.qty = function(doc, cdt, cdn) {
 	erpnext.bom.calculate_rm_cost(doc);
+	erpnext.bom.calculate_scrap_materials_cost(doc);
 	erpnext.bom.calculate_total(doc);
 }
 
 cur_frm.cscript.rate = function(doc, cdt, cdn) {
 	var d = locals[cdt][cdn];
+	var scrap_items = false;
+
+	if(child.doctype == 'BOM Scrap Item') {
+		scrap_items = true;
+	}
+
 	if (d.bom_no) {
 		msgprint(__("You can not change rate if BOM mentioned agianst any item"));
-		get_bom_material_detail(doc, cdt, cdn);
+		get_bom_material_detail(doc, cdt, cdn, scrap_items);
 	} else {
 		erpnext.bom.calculate_rm_cost(doc);
+		erpnext.bom.calculate_scrap_materials_cost(doc);
 		erpnext.bom.calculate_total(doc);
 	}
 }
 
+erpnext.bom.update_cost = function(doc) {
+	erpnext.bom.calculate_op_cost(doc);
+	erpnext.bom.calculate_rm_cost(doc);
+	erpnext.bom.calculate_scrap_materials_cost(doc);
+	erpnext.bom.calculate_total(doc);
+}
+
 erpnext.bom.calculate_op_cost = function(doc) {
 	var op = doc.operations || [];
 	doc.operating_cost = 0.0;
+	doc.base_operating_cost = 0.0;
+
 	for(var i=0;i<op.length;i++) {
 		operating_cost = flt(flt(op[i].hour_rate) * flt(op[i].time_in_mins) / 60, 2);
+		base_operating_cost = flt(flt(op[i].base_hour_rate) * flt(op[i].time_in_mins) / 60, 2);
 		frappe.model.set_value('BOM Operation',op[i].name, "operating_cost", operating_cost);
+		frappe.model.set_value('BOM Operation',op[i].name, "base_operating_cost", base_operating_cost);
 
 		doc.operating_cost += operating_cost;
+		doc.base_operating_cost += base_operating_cost;
 	}
-	refresh_field('operating_cost');
+	refresh_field(['operating_cost', 'base_operating_cost']);
 }
 
+// rm : raw material
 erpnext.bom.calculate_rm_cost = function(doc) {
 	var rm = doc.items || [];
 	total_rm_cost = 0;
+	base_total_rm_cost = 0;
 	for(var i=0;i<rm.length;i++) {
-		amt =	flt(rm[i].rate) * flt(rm[i].qty);
-		set_multiple('BOM Item',rm[i].name, {'amount': amt}, 'items');
-		set_multiple('BOM Item',rm[i].name,
-			{'qty_consumed_per_unit': flt(rm[i].qty)/flt(doc.quantity)}, 'items');
-		total_rm_cost += amt;
+		amount = flt(rm[i].rate) * flt(rm[i].qty);
+		base_amount = flt(rm[i].rate) * flt(doc.conversion_rate) * flt(rm[i].qty);
+		frappe.model.set_value('BOM Item', rm[i].name, 'base_rate', flt(rm[i].rate) * flt(doc.conversion_rate))
+		frappe.model.set_value('BOM Item', rm[i].name, 'amount', amount)
+		frappe.model.set_value('BOM Item', rm[i].name, 'qty_consumed_per_unit', flt(rm[i].qty)/flt(doc.quantity))
+		frappe.model.set_value('BOM Item', rm[i].name, 'base_amount', base_amount)
+		total_rm_cost += amount;
+		base_total_rm_cost += base_amount;
 	}
 	cur_frm.set_value("raw_material_cost", total_rm_cost);
+	cur_frm.set_value("base_raw_material_cost", base_total_rm_cost);
 }
 
+//sm : scrap material
+erpnext.bom.calculate_scrap_materials_cost = function(doc) {
+	var sm = doc.scrap_items || [];
+	total_sm_cost = 0;
+	base_total_sm_cost = 0;
+
+	for(var i=0;i<sm.length;i++) {
+		base_rate = flt(sm[i].rate) * flt(doc.conversion_rate);
+		amount =	flt(sm[i].rate) * flt(sm[i].qty);
+		base_amount =	flt(sm[i].rate) * flt(sm[i].qty) * flt(doc.conversion_rate);
+		frappe.model.set_value('BOM Scrap Item',sm[i].name, 'base_rate', base_rate);
+		frappe.model.set_value('BOM Scrap Item',sm[i].name, 'amount', amount);
+		frappe.model.set_value('BOM Scrap Item',sm[i].name, 'base_amount', base_amount);
+		
+		total_sm_cost += amount;
+		base_total_sm_cost += base_amount;
+	}
+	
+	cur_frm.set_value("scrap_material_cost", total_sm_cost);
+	cur_frm.set_value("base_scrap_material_cost", base_total_sm_cost);
+}
 
 // Calculate Total Cost
 erpnext.bom.calculate_total = function(doc) {
-	total_cost = flt(doc.operating_cost) + flt(doc.raw_material_cost);
-	frappe.model.set_value(doc.doctype, doc.name, "total_cost", total_cost);
+	total_cost = flt(doc.operating_cost) + flt(doc.raw_material_cost) - flt(doc.scrap_material_cost);
+	base_total_cost = flt(doc.base_operating_cost) + flt(doc.base_raw_material_cost) - flt(doc.base_scrap_material_cost);
+	cur_frm.set_value("total_cost", total_cost);
+	cur_frm.set_value("base_total_cost", base_total_cost);
 }
 
 
@@ -174,9 +255,7 @@
 }
 
 cur_frm.cscript.validate = function(doc, dt, dn) {
-	erpnext.bom.calculate_op_cost(doc);
-	erpnext.bom.calculate_rm_cost(doc);
-	erpnext.bom.calculate_total(doc);
+	erpnext.bom.update_cost(doc)
 }
 
 frappe.ui.form.on("BOM Operation", "operation", function(frm, cdt, cdn) {
@@ -212,6 +291,7 @@
 		},
 		callback: function (data) {
 			frappe.model.set_value(d.doctype, d.name, "hour_rate", data.message.hour_rate);
+			frappe.model.set_value(d.doctype, d.name, "base_hour_rate", flt(data.message.hour_rate) * flt(frm.doc.conversion_rate));
 			erpnext.bom.calculate_op_cost(frm.doc);
 			erpnext.bom.calculate_total(frm.doc);
 		}
@@ -239,7 +319,6 @@
 	toggle_operations(frm);
 });
 
-
 cur_frm.cscript.image = function() {
 	refresh_field("image_view");
 }
diff --git a/erpnext/manufacturing/doctype/bom/bom.json b/erpnext/manufacturing/doctype/bom/bom.json
index ae23d5e..c2c9b64 100644
--- a/erpnext/manufacturing/doctype/bom/bom.json
+++ b/erpnext/manufacturing/doctype/bom/bom.json
@@ -8,11 +8,13 @@
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Setup", 
+ "editable_grid": 0, 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "Item to be manufactured or repacked", 
    "fieldname": "item", 
    "fieldtype": "Link", 
@@ -21,6 +23,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Item", 
    "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": 1, 
@@ -41,6 +45,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "item_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -48,6 +53,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Item Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -56,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, 
@@ -66,6 +73,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "1", 
    "description": "Quantity of item obtained after manufacturing / repacking from given quantities of raw materials", 
    "fieldname": "quantity", 
@@ -75,6 +83,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Quantity", 
    "length": 0, 
    "no_copy": 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": 1, 
    "search_index": 0, 
@@ -94,6 +104,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "cb0", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -101,12 +112,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, 
@@ -117,6 +130,7 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "1", 
    "fieldname": "is_active", 
    "fieldtype": "Check", 
@@ -125,6 +139,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Is Active", 
    "length": 0, 
    "no_copy": 1, 
@@ -134,6 +149,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, 
@@ -144,6 +160,7 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "1", 
    "fieldname": "is_default", 
    "fieldtype": "Check", 
@@ -152,6 +169,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Is Default", 
    "length": 0, 
    "no_copy": 1, 
@@ -161,6 +179,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 +190,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "Manage cost of operations", 
    "fieldname": "with_operations", 
    "fieldtype": "Check", 
@@ -179,6 +199,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "With Operations", 
    "length": 0, 
    "no_copy": 0, 
@@ -186,6 +207,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,6 +218,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "rm_cost_as_per", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -203,6 +226,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Rate Of Materials Based On", 
    "length": 0, 
    "no_copy": 0, 
@@ -211,6 +235,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,6 +246,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.rm_cost_as_per===\"Price List\"", 
    "fieldname": "buying_price_list", 
    "fieldtype": "Link", 
@@ -229,6 +255,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Price List", 
    "length": 0, 
    "no_copy": 0, 
@@ -237,6 +264,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, 
@@ -247,6 +275,119 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "currency_detail", 
+   "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, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "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_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Currency", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "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_12", 
+   "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": "conversion_rate", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Conversion Rate", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "9", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "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": "Specify the operations, operating cost and give a unique Operation no to your operations.", 
    "fieldname": "operations_section", 
@@ -256,6 +397,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Operations", 
    "length": 0, 
    "no_copy": 0, 
@@ -264,6 +406,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, 
@@ -274,6 +417,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "operations", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -281,6 +425,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Operations", 
    "length": 0, 
    "no_copy": 0, 
@@ -291,6 +436,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, 
@@ -301,6 +447,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "materials_section", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -308,6 +455,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Materials", 
    "length": 0, 
    "no_copy": 0, 
@@ -316,6 +464,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, 
@@ -326,6 +475,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "items", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -333,6 +483,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Items", 
    "length": 0, 
    "no_copy": 0, 
@@ -343,6 +494,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, 
@@ -352,7 +504,65 @@
   {
    "allow_on_submit": 0, 
    "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "scrap_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": "Scrap", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "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": "scrap_items", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Scrap Items", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "BOM Scrap Item", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "costing", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -360,6 +570,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Costing", 
    "length": 0, 
    "no_copy": 0, 
@@ -368,6 +579,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,6 +590,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "operating_cost", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -385,14 +598,16 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Operating Cost", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "Company:company:default_currency", 
+   "options": "currency", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -403,6 +618,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "raw_material_cost", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -410,14 +626,16 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Raw Material Cost", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "Company:company:default_currency", 
+   "options": "currency", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -428,6 +646,36 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "scrap_material_cost", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Scrap Material Cost", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "cb1", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -435,12 +683,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, 
@@ -451,6 +701,121 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "base_operating_cost", 
+   "fieldtype": "Currency", 
+   "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, 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "base_raw_material_cost", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Raw Material Cost(Company Currency)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "base_scrap_material_cost", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Scrap Material Cost(Company Currency)", 
+   "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": "total_cost_of_bom", 
+   "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": "total_cost", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -458,14 +823,16 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Total Cost", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "Company:company:default_currency", 
+   "options": "currency", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -476,6 +843,63 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_26", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "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_total_cost", 
+   "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 Cost(Company Currency)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "more_info_section", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -483,6 +907,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
@@ -490,6 +915,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, 
@@ -500,6 +926,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "project", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -507,6 +934,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Project", 
    "length": 0, 
    "no_copy": 0, 
@@ -517,6 +945,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, 
@@ -527,6 +956,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "company", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -534,6 +964,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -543,6 +974,7 @@
    "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, 
@@ -553,6 +985,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "amended_from", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -560,6 +993,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amended From", 
    "length": 0, 
    "no_copy": 1, 
@@ -568,6 +1002,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, 
@@ -578,6 +1013,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "col_break23", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -585,12 +1021,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, 
@@ -601,6 +1039,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "uom", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -608,6 +1047,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Item UOM", 
    "length": 0, 
    "no_copy": 0, 
@@ -616,6 +1056,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, 
@@ -626,6 +1067,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_25", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -633,6 +1075,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -640,6 +1083,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, 
@@ -650,6 +1094,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "description", 
    "fieldtype": "Small Text", 
    "hidden": 0, 
@@ -657,6 +1102,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Item Description", 
    "length": 0, 
    "no_copy": 0, 
@@ -664,6 +1110,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, 
@@ -674,6 +1121,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_27", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -681,6 +1129,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -688,6 +1137,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, 
@@ -698,6 +1148,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "image", 
    "fieldtype": "Attach", 
    "hidden": 0, 
@@ -705,6 +1156,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Image", 
    "length": 0, 
    "no_copy": 0, 
@@ -713,6 +1165,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, 
@@ -723,6 +1176,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "image_view", 
    "fieldtype": "Image", 
    "hidden": 0, 
@@ -730,6 +1184,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Image View", 
    "length": 0, 
    "no_copy": 0, 
@@ -739,6 +1194,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, 
@@ -749,6 +1205,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:!doc.__islocal", 
    "fieldname": "section_break0", 
    "fieldtype": "Section Break", 
@@ -757,6 +1214,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Materials Required (Exploded)", 
    "length": 0, 
    "no_copy": 0, 
@@ -764,6 +1222,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, 
@@ -774,6 +1233,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "exploded_items", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -781,6 +1241,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Exploded_items", 
    "length": 0, 
    "no_copy": 1, 
@@ -791,6 +1252,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, 
@@ -800,16 +1262,17 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-sitemap", 
+ "icon": "fa fa-sitemap", 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-05-13 18:28:53.557967", 
- "modified_by": "Administrator", 
+ "modified": "2016-11-21 17:06:49.349654", 
+ "modified_by": "rohit@erpnext.com", 
  "module": "Manufacturing", 
  "name": "BOM", 
  "owner": "Administrator", 
@@ -817,6 +1280,27 @@
   {
    "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": "All", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
    "cancel": 1, 
    "create": 1, 
    "delete": 1, 
@@ -824,6 +1308,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -844,6 +1329,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
diff --git a/erpnext/manufacturing/doctype/bom/bom.py b/erpnext/manufacturing/doctype/bom/bom.py
index 580d1ba..2a27922 100644
--- a/erpnext/manufacturing/doctype/bom/bom.py
+++ b/erpnext/manufacturing/doctype/bom/bom.py
@@ -5,6 +5,7 @@
 import frappe
 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 operator import itemgetter
@@ -35,6 +36,8 @@
 	def validate(self):
 		self.clear_operations()
 		self.validate_main_item()
+		self.validate_currency()
+		self.set_conversion_rate()
 
 		from erpnext.utilities.transaction_base import validate_uom_is_integer
 		validate_uom_is_integer(self, "stock_uom", "qty", "BOM Item")
@@ -74,17 +77,18 @@
 		return item
 
 	def validate_rm_item(self, item):
-		if item[0]['name'] == self.item:
+		if (item[0]['name'] in [it.item_code for it in self.items]) and item[0]['name'] == self.item:
 			frappe.throw(_("Raw material cannot be same as main Item"))
 
 	def set_bom_material_details(self):
 		for item in self.get("items"):
 			ret = self.get_bom_material_detail({"item_code": item.item_code, "item_name": item.item_name, "bom_no": item.bom_no,
 				"qty": item.qty})
-
 			for r in ret:
 				if not item.get(r):
 					item.set(r, ret[r])
+					
+			self.validate_bom_currecny(item)
 
 	def get_bom_material_detail(self, args=None):
 		""" Get raw material details like uom, desc and rate"""
@@ -108,14 +112,22 @@
 			 'image'		: item and args['image'] or '',
 			 'stock_uom'	: item and args['stock_uom'] or '',
 			 'bom_no'		: args['bom_no'],
-			 'rate'			: rate
+			 'rate'			: rate,
+			 'base_rate'	: rate if self.company_currency() == self.currency else rate * self.conversion_rate
 		}
 		return ret_item
 
+	def validate_bom_currecny(self, item):
+		if item.get('bom_no') and frappe.db.get_value('BOM', item.get('bom_no'), 'currency') != self.currency:
+			frappe.throw(_("Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2}").format(item.idx, item.bom_no, self.currency))
+
 	def get_rm_rate(self, arg):
 		"""	Get raw material rate as per selected method, if bom exists takes bom cost """
 		rate = 0
-		if arg['bom_no']:
+
+		if arg.get('scrap_items'):
+			rate = self.get_valuation_rate(arg)
+		elif arg['bom_no']:
 			rate = self.get_bom_unitcost(arg['bom_no'])
 		elif arg:
 			if self.rm_cost_as_per == 'Valuation Rate':
@@ -210,6 +222,14 @@
 
 		if not self.quantity:
 			frappe.throw(_("Quantity should be greater than 0"))
+			
+	def validate_currency(self):
+		if self.rm_cost_as_per == 'Price List' and \
+			frappe.db.get_value('Price List', self.buying_price_list, 'currency') != self.currency:
+			frappe.throw(_("Currency of the price list {0} is not similar with the selected currency {1}").format(self.buying_price_list, self.currency))
+
+	def set_conversion_rate(self):
+		self.conversion_rate = get_exchange_rate(self.currency, self.company_currency())
 
 	def validate_materials(self):
 		""" Validate raw material entries """
@@ -271,11 +291,14 @@
 		"""Calculate bom totals"""
 		self.calculate_op_cost()
 		self.calculate_rm_cost()
-		self.total_cost = self.operating_cost + self.raw_material_cost
+		self.calculate_sm_cost()
+		self.total_cost = self.operating_cost + self.raw_material_cost - self.scrap_material_cost
+		self.base_total_cost = self.base_operating_cost + self.base_raw_material_cost - self.base_scrap_material_cost
 
 	def calculate_op_cost(self):
 		"""Update workstation rate and calculates totals"""
 		self.operating_cost = 0
+		self.base_operating_cost = 0
 		for d in self.get('operations'):
 			if d.workstation:
 				if not d.hour_rate:
@@ -283,20 +306,45 @@
 
 			if d.hour_rate and d.time_in_mins:
 				d.operating_cost = flt(d.hour_rate) * flt(d.time_in_mins) / 60.0
+				d.base_hour_rate = flt(d.hour_rate) * flt(self.conversion_rate)
+				d.base_operating_cost = flt(d.base_hour_rate) * flt(d.time_in_mins) / 60.0
 
 			self.operating_cost += flt(d.operating_cost)
+			self.base_operating_cost += flt(d.base_operating_cost)
 
 	def calculate_rm_cost(self):
 		"""Fetch RM rate as per today's valuation rate and calculate totals"""
 		total_rm_cost = 0
+		base_total_rm_cost = 0
+
 		for d in self.get('items'):
 			if d.bom_no:
 				d.rate = self.get_bom_unitcost(d.bom_no)
+				
+			d.base_rate = d.rate * self.conversion_rate
 			d.amount = flt(d.rate, self.precision("rate", d)) * flt(d.qty, self.precision("qty", d))
+			d.base_amount = d.amount * self.conversion_rate
 			d.qty_consumed_per_unit = flt(d.qty, self.precision("qty", d)) / flt(self.quantity, self.precision("quantity"))
 			total_rm_cost += d.amount
+			base_total_rm_cost += d.base_amount
 
 		self.raw_material_cost = total_rm_cost
+		self.base_raw_material_cost = base_total_rm_cost
+
+	def calculate_sm_cost(self):
+		"""Fetch RM rate as per today's valuation rate and calculate totals"""
+		total_sm_cost = 0
+		base_total_sm_cost = 0
+
+		for d in self.get('scrap_items'):
+			d.base_rate = d.rate * self.conversion_rate
+			d.amount = flt(d.rate, self.precision("rate", d)) * flt(d.qty, self.precision("qty", d))
+			d.base_amount = d.amount * self.conversion_rate
+			total_sm_cost += d.amount
+			base_total_sm_cost += d.base_amount
+
+		self.scrap_material_cost = total_sm_cost
+		self.base_scrap_material_cost = base_total_sm_cost
 
 	def update_exploded_items(self):
 		""" Update Flat BOM, following will be correct data"""
@@ -317,8 +365,11 @@
 					'image'			: d.image,
 					'stock_uom'		: d.stock_uom,
 					'qty'			: flt(d.qty),
-					'rate'			: flt(d.rate),
+					'rate'			: d.base_rate,
 				}))
+				
+	def company_currency(self):
+		return frappe.db.get_value('Company', self.company, 'default_currency')
 
 	def add_to_cur_exploded_items(self, args):
 		if self.cur_exploded_items.get(args.item_code):
@@ -377,7 +428,7 @@
 				if not d.description:
 					d.description = frappe.db.get_value('Operation', d.operation, 'description')
 
-def get_bom_items_as_dict(bom, company, qty=1, fetch_exploded=1):
+def get_bom_items_as_dict(bom, company, qty=1, fetch_exploded=1, fetch_scrap_items=0):
 	item_dict = {}
 
 	# Did not use qty_consumed_per_unit in the query, as it leads to rounding loss
@@ -406,11 +457,13 @@
 		query = query.format(table="BOM Explosion Item",
 			conditions="""and item.is_sub_contracted_item = 0""")
 		items = frappe.db.sql(query, { "qty": qty,	"bom": bom }, as_dict=True)
+	elif fetch_scrap_items:
+		query = query.format(table="BOM Scrap Item", conditions="")
+		items = frappe.db.sql(query, { "qty": qty, "bom": bom }, as_dict=True)
 	else:
 		query = query.format(table="BOM Item", conditions="")
 		items = frappe.db.sql(query, { "qty": qty, "bom": bom }, as_dict=True)
 
-	# make unique
 	for item in items:
 		if item_dict.has_key(item.item_code):
 			item_dict[item.item_code]["qty"] += flt(item.qty)
diff --git a/erpnext/manufacturing/doctype/bom/test_records.json b/erpnext/manufacturing/doctype/bom/test_records.json
index 30be2a7..5baa0cb 100644
--- a/erpnext/manufacturing/doctype/bom/test_records.json
+++ b/erpnext/manufacturing/doctype/bom/test_records.json
@@ -22,15 +22,27 @@
   ],
   "docstatus": 1,
   "doctype": "BOM",
+  "currency": "USD",
   "is_active": 1,
   "is_default": 1,
   "item": "_Test Item Home Desktop Manufactured",
   "quantity": 1.0
  },
  {
+  "scrap_items":[
+  {
+   "amount": 2000.0,
+   "doctype": "BOM Item",
+   "item_code": "_Test Item Home Desktop 100",
+   "parentfield": "items",
+   "qty": 1.0,
+   "rate": 2000.0,
+   "stock_uom": "_Test UOM"
+  }
+  ],
   "items": [
    {
-    "amount": 5000.0,
+    "amount": 10000.0,
     "doctype": "BOM Item",
     "item_code": "_Test Item",
     "parentfield": "items",
@@ -52,6 +64,7 @@
   "doctype": "BOM",
   "is_active": 1,
   "is_default": 1,
+  "currency": "USD",
   "item": "_Test FG Item",
   "quantity": 1.0
  },
@@ -81,7 +94,7 @@
     "doctype": "BOM Item",
     "item_code": "_Test Item Home Desktop Manufactured",
     "parentfield": "items",
-    "qty": 2.0,
+    "qty": 3.0,
     "rate": 1000.0,
     "stock_uom": "_Test UOM"
    }
@@ -90,6 +103,7 @@
   "doctype": "BOM",
   "is_active": 1,
   "is_default": 1,
+  "currency": "USD",
   "item": "_Test FG Item 2",
   "quantity": 1.0,
   "with_operations": 1
@@ -119,6 +133,7 @@
   "doctype": "BOM",
   "is_active": 1,
   "is_default": 1,
+  "currency": "USD",
   "item": "_Test Variant Item",
   "quantity": 1.0,
   "with_operations": 1
diff --git a/erpnext/manufacturing/doctype/bom_item/bom_item.json b/erpnext/manufacturing/doctype/bom_item/bom_item.json
index d485abc..bb55c73 100644
--- a/erpnext/manufacturing/doctype/bom_item/bom_item.json
+++ b/erpnext/manufacturing/doctype/bom_item/bom_item.json
@@ -7,6 +7,7 @@
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "document_type": "Setup", 
  "editable_grid": 1, 
  "fields": [
   {
@@ -317,7 +318,7 @@
    "label": "Rate", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "Company:company:default_currency", 
+   "options": "currency", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
@@ -333,6 +334,36 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "amount_as_per_mar", 
+   "oldfieldtype": "Currency", 
+   "options": "currency", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "print_width": "150px", 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
+   "width": "150px"
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "col_break2", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -385,30 +416,79 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "amount", 
+   "fieldname": "base_rate", 
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Amount", 
+   "in_list_view": 0, 
+   "label": "Basic Rate (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
-   "oldfieldname": "amount_as_per_mar", 
-   "oldfieldtype": "Currency", 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
-   "print_hide": 0, 
+   "precision": "", 
+   "print_hide": 1, 
    "print_hide_if_no_value": 0, 
-   "print_width": "150px", 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "unique": 0, 
-   "width": "150px"
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "base_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Amount (Company Currency)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_18", 
+   "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, 
@@ -475,7 +555,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-08-26 02:42:40.468812", 
+ "modified": "2016-10-21 15:57:22.521537", 
  "modified_by": "Administrator", 
  "module": "Manufacturing", 
  "name": "BOM Item", 
diff --git a/erpnext/manufacturing/doctype/bom_operation/bom_operation.json b/erpnext/manufacturing/doctype/bom_operation/bom_operation.json
index 8b6406e..50f1c6c 100644
--- a/erpnext/manufacturing/doctype/bom_operation/bom_operation.json
+++ b/erpnext/manufacturing/doctype/bom_operation/bom_operation.json
@@ -9,11 +9,13 @@
  "doctype": "DocType", 
  "document_type": "Setup", 
  "editable_grid": 1, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "operation", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -41,6 +43,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "workstation", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -68,6 +71,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "description", 
    "fieldtype": "Text Editor", 
    "hidden": 0, 
@@ -94,6 +98,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "col_break1", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -117,8 +122,9 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "hour_rate", 
-   "fieldtype": "Float", 
+   "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
@@ -129,6 +135,7 @@
    "no_copy": 0, 
    "oldfieldname": "hour_rate", 
    "oldfieldtype": "Currency", 
+   "options": "currency", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
@@ -143,6 +150,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "In minutes", 
    "fieldname": "time_in_mins", 
    "fieldtype": "Float", 
@@ -171,6 +179,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "operating_cost", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -183,6 +192,7 @@
    "no_copy": 0, 
    "oldfieldname": "operating_cost", 
    "oldfieldtype": "Currency", 
+   "options": "currency", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
@@ -192,6 +202,61 @@
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "base_hour_rate", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Base Hour Rate(Company Currency)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "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": "5", 
+   "fieldname": "base_operating_cost", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Operating Cost(Company Currency)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
   }
  ], 
  "hide_heading": 0, 
@@ -204,7 +269,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-07-11 03:27:58.625909", 
+ "modified": "2016-10-21 18:38:14.700637", 
  "modified_by": "Administrator", 
  "module": "Manufacturing", 
  "name": "BOM Operation", 
diff --git a/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.json b/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.json
index b7cf4a9..bf7e6fc 100644
--- a/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.json
+++ b/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.json
@@ -80,7 +80,7 @@
  ], 
  "hide_heading": 1, 
  "hide_toolbar": 1, 
- "icon": "icon-magic", 
+ "icon": "fa fa-magic", 
  "idx": 1, 
  "in_create": 1, 
  "in_dialog": 0, 
diff --git a/erpnext/schools/doctype/scheduling_tool/__init__.py b/erpnext/manufacturing/doctype/bom_scrap_item/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/scheduling_tool/__init__.py
copy to erpnext/manufacturing/doctype/bom_scrap_item/__init__.py
diff --git a/erpnext/manufacturing/doctype/bom_scrap_item/bom_scrap_item.json b/erpnext/manufacturing/doctype/bom_scrap_item/bom_scrap_item.json
new file mode 100644
index 0000000..fe81592
--- /dev/null
+++ b/erpnext/manufacturing/doctype/bom_scrap_item/bom_scrap_item.json
@@ -0,0 +1,302 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2016-09-26 02:19:21.642081", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "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_list_view": 1, 
+   "label": "Item Code", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Item", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "item_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Item Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "quantity_and_rate", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Quantity and Rate", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "qty", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Qty", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "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_list_view": 1, 
+   "label": "Rate", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "currency", 
+   "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, 
+   "columns": 0, 
+   "fieldname": "column_break_6", 
+   "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": "stock_uom", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Stock UOM", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "UOM", 
+   "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, 
+   "columns": 0, 
+   "fieldname": "base_rate", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Basic Rate (Company Currency)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "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_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Basic Amount (Company Currency)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "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-10-25 00:27:53.712140", 
+ "modified_by": "Administrator", 
+ "module": "Manufacturing", 
+ "name": "BOM Scrap Item", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/bom_scrap_item/bom_scrap_item.py b/erpnext/manufacturing/doctype/bom_scrap_item/bom_scrap_item.py
new file mode 100644
index 0000000..b6d423f
--- /dev/null
+++ b/erpnext/manufacturing/doctype/bom_scrap_item/bom_scrap_item.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class BOMScrapItem(Document):
+	pass
diff --git a/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json b/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
index 5465705..9f12e45 100644
--- a/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
+++ b/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
@@ -331,7 +331,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-wrench", 
+ "icon": "fa fa-wrench", 
  "idx": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
diff --git a/erpnext/manufacturing/doctype/operation/operation.json b/erpnext/manufacturing/doctype/operation/operation.json
index 2193e95..69eb449 100644
--- a/erpnext/manufacturing/doctype/operation/operation.json
+++ b/erpnext/manufacturing/doctype/operation/operation.json
@@ -10,11 +10,13 @@
  "doctype": "DocType", 
  "document_type": "Setup", 
  "editable_grid": 0, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "workstation", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -22,6 +24,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Default Workstation", 
    "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, 
@@ -41,6 +45,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_4", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -48,6 +53,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 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": "description", 
    "fieldtype": "Text", 
    "hidden": 0, 
@@ -72,6 +80,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Description", 
    "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, 
@@ -89,7 +99,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-wrench", 
+ "icon": "fa fa-wrench", 
  "idx": 0, 
  "image_view": 0, 
  "in_create": 0, 
@@ -98,7 +108,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-07-25 05:24:23.398894", 
+ "modified": "2016-11-07 05:28:27.462413", 
  "modified_by": "Administrator", 
  "module": "Manufacturing", 
  "name": "Operation", 
@@ -115,6 +125,7 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 1, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -135,6 +146,7 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 1, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
diff --git a/erpnext/manufacturing/doctype/production_order/production_order.js b/erpnext/manufacturing/doctype/production_order/production_order.js
index d0e0d86..d8eb25b 100644
--- a/erpnext/manufacturing/doctype/production_order/production_order.js
+++ b/erpnext/manufacturing/doctype/production_order/production_order.js
@@ -225,6 +225,10 @@
 				$.each(["description", "stock_uom", "bom_no"], function(i, field) {
 					cur_frm.set_value(field, r.message[field]);
 				});
+
+				if(r.message["set_scrap_wh_mandatory"]){
+					cur_frm.toggle_reqd("scrap_warehouse", true);
+				}
 			}
 		});
 	},
@@ -260,7 +264,12 @@
 	bom_no: function() {
 		return this.frm.call({
 			doc: this.frm.doc,
-			method: "set_production_order_operations"
+			method: "set_production_order_operations",
+			callback: function(r) {
+				if(r.message["set_scrap_wh_mandatory"]){
+					cur_frm.toggle_reqd("scrap_warehouse", true);
+				}
+			}
 		});
 	},
 
diff --git a/erpnext/manufacturing/doctype/production_order/production_order.json b/erpnext/manufacturing/doctype/production_order/production_order.json
index d1dc0c2..dd8bb5b 100644
--- a/erpnext/manufacturing/doctype/production_order/production_order.json
+++ b/erpnext/manufacturing/doctype/production_order/production_order.json
@@ -15,6 +15,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "item", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -22,14 +23,16 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "icon-gift", 
+   "options": "fa fa-gift", 
    "permlevel": 0, 
    "print_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,6 +43,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "PRO-", 
    "fieldname": "naming_series", 
    "fieldtype": "Select", 
@@ -48,6 +52,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Series", 
    "length": 0, 
    "no_copy": 0, 
@@ -56,6 +61,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, 
@@ -66,6 +72,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "Draft", 
    "depends_on": "eval:!doc.__islocal", 
    "fieldname": "status", 
@@ -75,16 +82,18 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Status", 
    "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "status", 
    "oldfieldtype": "Select", 
-   "options": "\nDraft\nSubmitted\nNot Started\nStopped\nIn Process\nCompleted\nCancelled", 
+   "options": "\nDraft\nSubmitted\nNot Started\nStopped\nUnstopped\nIn Process\nCompleted\nCancelled", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 1, 
@@ -95,6 +104,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "production_item", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -102,6 +112,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Item To Manufacture", 
    "length": 0, 
    "no_copy": 0, 
@@ -112,6 +123,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, 
@@ -122,6 +134,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "", 
    "description": "", 
    "fieldname": "bom_no", 
@@ -131,6 +144,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "BOM No", 
    "length": 0, 
    "no_copy": 0, 
@@ -141,6 +155,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, 
@@ -151,6 +166,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "1", 
    "description": "Plan material for sub-assemblies", 
    "fieldname": "use_multi_level_bom", 
@@ -160,6 +176,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Use Multi-Level BOM", 
    "length": 0, 
    "no_copy": 0, 
@@ -167,6 +184,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, 
@@ -177,6 +195,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break1", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -184,6 +203,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
@@ -191,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, 
@@ -202,6 +223,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "", 
    "fieldname": "sales_order", 
    "fieldtype": "Link", 
@@ -210,6 +232,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Sales Order", 
    "length": 0, 
    "no_copy": 0, 
@@ -218,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, 
@@ -228,6 +252,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "", 
    "fieldname": "qty", 
    "fieldtype": "Float", 
@@ -236,6 +261,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Qty To Manufacture", 
    "length": 0, 
    "no_copy": 0, 
@@ -245,6 +271,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, 
@@ -255,6 +282,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "0", 
    "depends_on": "eval:doc.docstatus==1", 
    "description": "", 
@@ -265,6 +293,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Material Transferred for Manufacturing", 
    "length": 0, 
    "no_copy": 1, 
@@ -273,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, 
@@ -283,6 +313,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "0", 
    "depends_on": "eval:doc.docstatus==1", 
    "description": "", 
@@ -293,6 +324,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Manufactured Qty", 
    "length": 0, 
    "no_copy": 1, 
@@ -302,6 +334,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, 
@@ -312,6 +345,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "warehouses", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -319,14 +353,16 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Warehouses", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "icon-building", 
+   "options": "fa fa-building", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -337,6 +373,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "Warehouse for reserving items", 
    "fieldname": "source_warehouse", 
    "fieldtype": "Link", 
@@ -345,6 +382,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Source Warehouse", 
    "length": 0, 
    "no_copy": 0, 
@@ -354,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, 
@@ -364,6 +403,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "wip_warehouse", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -371,6 +411,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Work-in-Progress Warehouse", 
    "length": 0, 
    "no_copy": 0, 
@@ -379,6 +420,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,6 +431,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_12", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -396,12 +439,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, 
@@ -412,6 +457,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "", 
    "description": "", 
    "fieldname": "fg_warehouse", 
@@ -421,6 +467,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Target Warehouse", 
    "length": 0, 
    "no_copy": 0, 
@@ -429,6 +476,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, 
@@ -439,6 +487,36 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "scrap_warehouse", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Scrap Warehouse", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Warehouse", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "time", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -446,15 +524,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Time", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "icon-time", 
+   "options": "fa fa-time", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -465,6 +545,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "", 
    "fieldname": "expected_delivery_date", 
    "fieldtype": "Date", 
@@ -473,6 +554,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Expected Delivery Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -480,6 +562,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, 
@@ -490,6 +573,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "now", 
    "fieldname": "planned_start_date", 
    "fieldtype": "Datetime", 
@@ -498,6 +582,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Planned Start Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -506,6 +591,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, 
@@ -516,6 +602,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "planned_end_date", 
    "fieldtype": "Datetime", 
    "hidden": 0, 
@@ -523,6 +610,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Planned End Date", 
    "length": 0, 
    "no_copy": 1, 
@@ -531,6 +619,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, 
@@ -541,6 +630,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_13", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -548,6 +638,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -555,6 +646,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, 
@@ -565,6 +657,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "actual_start_date", 
    "fieldtype": "Datetime", 
    "hidden": 0, 
@@ -572,6 +665,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Actual Start Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -580,6 +674,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, 
@@ -590,6 +685,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "actual_end_date", 
    "fieldtype": "Datetime", 
    "hidden": 0, 
@@ -597,6 +693,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Actual End Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -605,6 +702,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, 
@@ -615,6 +713,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "", 
    "fieldname": "operations_section", 
    "fieldtype": "Section Break", 
@@ -623,15 +722,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Operations", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "icon-wrench", 
+   "options": "fa fa-wrench", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -642,6 +743,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "", 
    "fieldname": "operations", 
    "fieldtype": "Table", 
@@ -650,6 +752,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Operations", 
    "length": 0, 
    "no_copy": 0, 
@@ -659,6 +762,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, 
@@ -669,6 +773,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "operations", 
    "fieldname": "section_break_22", 
    "fieldtype": "Section Break", 
@@ -677,6 +782,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Operation Cost", 
    "length": 0, 
    "no_copy": 0, 
@@ -686,6 +792,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, 
@@ -696,6 +803,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "planned_operating_cost", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -703,6 +811,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Planned Operating Cost", 
    "length": 0, 
    "no_copy": 0, 
@@ -712,6 +821,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, 
@@ -722,6 +832,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "actual_operating_cost", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -729,6 +840,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Actual Operating Cost", 
    "length": 0, 
    "no_copy": 1, 
@@ -738,6 +850,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, 
@@ -748,6 +861,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "additional_operating_cost", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -755,6 +869,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Additional Operating Cost", 
    "length": 0, 
    "no_copy": 1, 
@@ -764,6 +879,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, 
@@ -774,6 +890,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_24", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -781,6 +898,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -788,6 +906,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, 
@@ -798,6 +917,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "total_operating_cost", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -805,6 +925,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Operating Cost", 
    "length": 0, 
    "no_copy": 1, 
@@ -814,6 +935,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, 
@@ -824,6 +946,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "more_info", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -831,14 +954,16 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "More Information", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "icon-file-text", 
+   "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, 
@@ -849,6 +974,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "description", 
    "fieldtype": "Small Text", 
    "hidden": 0, 
@@ -856,6 +982,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Item Description", 
    "length": 0, 
    "no_copy": 0, 
@@ -863,6 +990,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, 
@@ -873,6 +1001,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "", 
    "fieldname": "stock_uom", 
    "fieldtype": "Link", 
@@ -881,6 +1010,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Stock UOM", 
    "length": 0, 
    "no_copy": 0, 
@@ -891,6 +1021,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, 
@@ -901,6 +1032,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "company", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -908,6 +1040,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -918,6 +1051,7 @@
    "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, 
@@ -928,6 +1062,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break2", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -935,12 +1070,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, 
@@ -952,6 +1089,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "project", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -959,6 +1097,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Project", 
    "length": 0, 
    "no_copy": 0, 
@@ -969,6 +1108,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, 
@@ -979,6 +1119,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "Manufacture against Material Request", 
    "fieldname": "material_request", 
    "fieldtype": "Link", 
@@ -987,6 +1128,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Material Request", 
    "length": 0, 
    "no_copy": 0, 
@@ -996,6 +1138,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, 
@@ -1006,6 +1149,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "material_request_item", 
    "fieldtype": "Data", 
    "hidden": 1, 
@@ -1013,6 +1157,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Material Request Item", 
    "length": 0, 
    "no_copy": 0, 
@@ -1021,6 +1166,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, 
@@ -1031,6 +1177,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "amended_from", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -1038,6 +1185,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amended From", 
    "length": 0, 
    "no_copy": 1, 
@@ -1048,6 +1196,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, 
@@ -1058,6 +1207,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "required_items", 
    "fieldtype": "Table", 
    "hidden": 1, 
@@ -1065,6 +1215,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Required Items", 
    "length": 0, 
    "no_copy": 0, 
@@ -1074,6 +1225,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, 
@@ -1083,7 +1235,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-cogs", 
+ "icon": "fa fa-cogs", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
@@ -1092,7 +1244,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-07-08 07:09:06.847763", 
+ "modified": "2016-11-07 05:13:02.064821", 
  "modified_by": "Administrator", 
  "module": "Manufacturing", 
  "name": "Production Order", 
@@ -1108,6 +1260,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1128,6 +1281,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
diff --git a/erpnext/manufacturing/doctype/production_order/production_order.py b/erpnext/manufacturing/doctype/production_order/production_order.py
index d598ee2..aa69342 100644
--- a/erpnext/manufacturing/doctype/production_order/production_order.py
+++ b/erpnext/manufacturing/doctype/production_order/production_order.py
@@ -55,9 +55,11 @@
 				if not self.expected_delivery_date:
 					self.expected_delivery_date = so[0].delivery_date
 
-				self.project = so[0].project
+				if so[0].project:
+					self.project = so[0].project
 
-				self.validate_production_order_against_so()
+				if not self.material_request:
+					self.validate_production_order_against_so()
 			else:
 				frappe.throw(_("Sales Order {0} is not valid").format(self.sales_order))
 
@@ -115,7 +117,7 @@
 		'''Update status of production order if unknown'''
 		if not status:
 			status = self.get_status(status)
-			
+
 		if status != self.status:
 			self.db_set("status", status)
 
@@ -215,11 +217,13 @@
 			return
 		self.set('operations', [])
 		operations = frappe.db.sql("""select operation, description, workstation, idx,
-			hour_rate, time_in_mins, "Pending" as status from `tabBOM Operation`
+			base_hour_rate as hour_rate, time_in_mins, "Pending" as status from `tabBOM Operation`
 			where parent = %s order by idx""", self.bom_no, as_dict=1)
 		self.set('operations', operations)
 		self.calculate_time()
 
+		return check_if_scrap_warehouse_mandatory(self.bom_no)
+
 	def calculate_time(self):
 		bom_qty = frappe.db.get_value("BOM", self.bom_no, "quantity")
 
@@ -240,7 +244,7 @@
 			holidays[holiday_list] = holiday_list_days
 
 		return holidays[holiday_list]
-		
+
 	def make_time_logs(self, open_new=False):
 		"""Capacity Planning. Plan time logs based on earliest availablity of workstation after
 			Planned Start Date. Time logs will be created and remain in Draft mode and must be submitted
@@ -261,7 +265,7 @@
 			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))
-				
+
 				args = self.get_operations_data(d)
 				add_timesheet_detail(timesheet, args)
 				original_start_time = d.planned_start_time
@@ -366,7 +370,8 @@
 		if frappe.db.get_value("Item", self.production_item, "has_variants"):
 			frappe.throw(_("Production Order cannot be raised against a Item Template"), ItemHasVariantError)
 
-		validate_end_of_life(self.production_item)
+		if self.production_item:
+			validate_end_of_life(self.production_item)
 
 	def validate_qty(self):
 		if not self.qty > 0:
@@ -454,11 +459,28 @@
 		return {}
 
 	res = res[0]
+
 	res["bom_no"] = frappe.db.get_value("BOM", filters={"item": item, "is_default": 1})
 	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"]:
+		frappe.throw(_("Default BOM for {0} not found").format(item))
+
+	res.update(check_if_scrap_warehouse_mandatory(res["bom_no"]))
+
+	return res
+
+@frappe.whitelist()
+def check_if_scrap_warehouse_mandatory(bom_no):
+	res = {"set_scrap_wh_mandatory": False }
+	bom = frappe.get_doc("BOM", bom_no)
+
+	if len(bom.scrap_items) > 0:
+		res["set_scrap_wh_mandatory"] = True
+
 	return res
 
 @frappe.whitelist()
@@ -504,9 +526,9 @@
 		planned_end_date, status
 		from `tabProduction Order`
 		where ((ifnull(planned_start_date, '0000-00-00')!= '0000-00-00') \
-				and (planned_start_date between %(start)s and %(end)s) \
-			or ((ifnull(planned_start_date, '0000-00-00')!= '0000-00-00') \
-				and planned_end_date between %(start)s and %(end)s)) {conditions}
+				and (planned_start_date <= %(end)s) \
+			and ((ifnull(planned_start_date, '0000-00-00')!= '0000-00-00') \
+				and planned_end_date >= %(start)s)) {conditions}
 		""".format(conditions=conditions), {
 			"start": start,
 			"end": end
@@ -520,7 +542,7 @@
 	timesheet.production_order = production_order
 	return timesheet
 
-@frappe.whitelist()	
+@frappe.whitelist()
 def add_timesheet_detail(timesheet, args):
 	if isinstance(timesheet, unicode):
 		timesheet = frappe.get_doc('Timesheet', timesheet)
diff --git a/erpnext/manufacturing/doctype/production_order/production_order_list.js b/erpnext/manufacturing/doctype/production_order/production_order_list.js
index cce56cf..762beb0 100644
--- a/erpnext/manufacturing/doctype/production_order/production_order_list.js
+++ b/erpnext/manufacturing/doctype/production_order/production_order_list.js
@@ -1,6 +1,6 @@
 frappe.listview_settings['Production Order'] = {
 	add_fields: ["bom_no", "status", "sales_order", "qty",
-		"produced_qty", "expected_delivery_date"],
+		"produced_qty", "expected_delivery_date", "planned_start_date", "planned_end_date"],
 	filters: [["status", "!=", "Stopped"]],
 	get_indicator: function(doc) {
 		if(doc.status==="Submitted") {
diff --git a/erpnext/manufacturing/doctype/production_order/test_production_order.py b/erpnext/manufacturing/doctype/production_order/test_production_order.py
index d29544b..1454c10 100644
--- a/erpnext/manufacturing/doctype/production_order/test_production_order.py
+++ b/erpnext/manufacturing/doctype/production_order/test_production_order.py
@@ -10,7 +10,9 @@
 from erpnext.manufacturing.doctype.production_order.production_order \
 	import make_stock_entry, ItemHasVariantError
 from erpnext.stock.doctype.stock_entry import test_stock_entry
+from erpnext.stock.doctype.item.test_item import get_total_projected_qty
 from erpnext.stock.utils import get_bin
+from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_order
 
 class TestProductionOrder(unittest.TestCase):
 	def setUp(self):
@@ -172,6 +174,28 @@
 		self.assertEqual(self.bin1_at_start.projected_qty,
 			cint(bin1_on_cancel.projected_qty))
 
+	def test_projected_qty_for_production_and_sales_order(self):
+		before_production_order = get_bin(self.item, self.warehouse)
+		before_production_order.update_reserved_qty_for_production()
+
+		self.pro_order = make_prod_order_test_record(item="_Test FG Item", qty=2,
+			source_warehouse=self.warehouse)
+
+		after_production_order = get_bin(self.item, self.warehouse)
+
+		sales_order = make_sales_order(item = self.item, qty = 2)
+		after_sales_order = get_bin(self.item, self.warehouse)
+
+		self.assertEqual(cint(before_production_order.reserved_qty_for_production) + 2,
+			cint(after_sales_order.reserved_qty_for_production))
+		self.assertEqual(cint(before_production_order.projected_qty),
+			cint(after_sales_order.projected_qty) + 2)
+
+		total_projected_qty = get_total_projected_qty(self.item)
+
+		item_doc = frappe.get_doc('Item', self.item)
+		self.assertEqual(total_projected_qty,  item_doc.total_projected_qty)
+
 	def test_reserved_qty_for_production_on_stock_entry(self):
 		test_stock_entry.make_stock_entry(item_code="_Test Item",
 			target= self.warehouse, qty=100, basic_rate=100)
@@ -209,6 +233,45 @@
 		self.pro_order.reload()
 		self.assertEqual(len(self.pro_order.required_items), 0)
 
+	def test_scrap_material_qty(self):
+		prod_order = make_prod_order_test_record(planned_start_date=now(), qty=2)
+
+		# add raw materials to stores
+		test_stock_entry.make_stock_entry(item_code="_Test Item",
+			target="Stores - _TC", qty=10, basic_rate=5000.0)
+		test_stock_entry.make_stock_entry(item_code="_Test Item Home Desktop 100",
+			target="Stores - _TC", qty=10, basic_rate=1000.0)
+
+		s = frappe.get_doc(make_stock_entry(prod_order.name, "Material Transfer for Manufacture", 2))
+		for d in s.get("items"):
+			d.s_warehouse = "Stores - _TC"
+		s.insert()
+		s.submit()
+
+		s = frappe.get_doc(make_stock_entry(prod_order.name, "Manufacture", 2))
+		s.insert()
+		s.submit()
+
+		prod_order_details = frappe.db.get_value("Production Order", prod_order.name,
+			["scrap_warehouse", "qty", "produced_qty", "bom_no"], as_dict=1)
+
+		scrap_item_details = get_scrap_item_details(prod_order_details.bom_no)
+
+		self.assertEqual(prod_order_details.produced_qty, 2)
+
+		for item in s.items:
+			if item.bom_no and item.item_code in scrap_item_details:
+				self.assertEqual(prod_order_details.scrap_warehouse, item.t_warehouse)
+				self.assertEqual(flt(prod_order_details.qty)*flt(scrap_item_details[item.item_code]), item.qty)
+
+def get_scrap_item_details(bom_no):
+	scrap_items = {}
+	for item in frappe.db.sql("""select item_code, qty from `tabBOM Scrap Item`
+		where parent = %s""", bom_no, as_dict=1):
+		scrap_items[item.item_code] = item.qty
+
+	return scrap_items
+
 def make_prod_order_test_record(**args):
 	args = frappe._dict(args)
 
@@ -219,6 +282,7 @@
 	pro_order.qty = args.qty or 10
 	pro_order.wip_warehouse = args.wip_warehouse or "_Test Warehouse - _TC"
 	pro_order.fg_warehouse = args.fg_warehouse or "_Test Warehouse 1 - _TC"
+	pro_order.scrap_warehouse = args.fg_warehouse or "_Test Scrap Warehouse - _TC"
 	pro_order.company = args.company or "_Test Company"
 	pro_order.stock_uom = args.stock_uom or "_Test UOM"
 	pro_order.set_production_order_operations()
diff --git a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.json b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.json
index 8d844cd..ffba219 100644
--- a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.json
+++ b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.json
@@ -807,7 +807,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 1, 
- "icon": "icon-calendar", 
+ "icon": "fa fa-calendar", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 1, 
@@ -816,7 +816,7 @@
  "issingle": 1, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-08-17 05:35:34.331954", 
+ "modified": "2016-11-16 05:35:34.331954", 
  "modified_by": "Administrator", 
  "module": "Manufacturing", 
  "name": "Production Planning Tool", 
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 8521b5e..aaa0e95 100644
--- a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py
+++ b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py
@@ -175,7 +175,7 @@
 				and bom.is_active = 1) %s""" % \
 			(", ".join(["%s"] * len(mr_list)), item_condition), tuple(mr_list), as_dict=1)
 
-		self.add_items(items) 
+		self.add_items(items)
 
 
 	def add_items(self, items):
@@ -314,7 +314,7 @@
 			}
 		"""
 		item_list = []
-		
+
 		for bom, so_wise_qty in bom_dict.items():
 			bom_wise_item_details = {}
 			if self.use_multi_level_bom and self.only_raw_materials and self.include_subcontracted:
@@ -335,19 +335,20 @@
 				# so no childs of SA items
 				bom_wise_item_details = self.get_subitems(bom_wise_item_details, bom,1, \
 					self.use_multi_level_bom,self.only_raw_materials, self.include_subcontracted,non_stock_item)
-				
+
 			for item, item_details in bom_wise_item_details.items():
 				for so_qty in so_wise_qty:
 					item_list.append([item, flt(item_details.qty) * so_qty[1], item_details.description,
 						item_details.stock_uom, item_details.min_order_qty, so_qty[0]])
-						
+
 		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
-			from `tabBOM Item` bom_item, `tabBOM` bom, tabItem item
+		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] + """
@@ -363,7 +364,7 @@
 			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"):
-					child_details = self.get_subitems(bom_wise_item_details,d.default_bom, \
+					self.get_subitems(bom_wise_item_details,d.default_bom, \
 						d.qty, include_sublevel, only_raw, supply_subs)
 		return bom_wise_item_details
 
@@ -408,12 +409,12 @@
 		items_to_be_requested = frappe._dict()
 
 		if not self.create_material_requests_for_all_required_qty:
-			item_projected_qty = self.get_projected_qty()			
+			item_projected_qty = self.get_projected_qty()
 
 		for item, so_item_qty in self.item_dict.items():
 			total_qty = sum([flt(d[0]) for d in so_item_qty])
 			requested_qty = 0
-			
+
 			if self.create_material_requests_for_all_required_qty:
 				requested_qty = total_qty
 			elif total_qty > item_projected_qty.get(item, 0):
@@ -485,7 +486,9 @@
 						"qty": requested_qty,
 						"schedule_date": add_days(nowdate(), cint(item_wrapper.lead_time_days)),
 						"warehouse": self.purchase_request_for_warehouse,
-						"sales_order": sales_order if sales_order!="No Sales Order" else None
+						"sales_order": sales_order if sales_order!="No Sales Order" else None,
+						"project": frappe.db.get_value("Sales Order", sales_order, "project") \
+							if sales_order!="No Sales Order" else None
 					})
 
 				material_request.flags.ignore_permissions = 1
diff --git a/erpnext/manufacturing/doctype/workstation/workstation.js b/erpnext/manufacturing/doctype/workstation/workstation.js
index 153d7e5..ba8e30c 100644
--- a/erpnext/manufacturing/doctype/workstation/workstation.js
+++ b/erpnext/manufacturing/doctype/workstation/workstation.js
@@ -1,17 +1,19 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
-
-
-//--------- ONLOAD -------------
-cur_frm.cscript.onload = function(doc, cdt, cdn) {
-	frappe.call({
-		type:"GET",
-		method:"erpnext.manufacturing.doctype.workstation.workstation.get_default_holiday_list",
-		callback: function(r) {
-			if(!r.exe && r.message){
-				cur_frm.set_value("holiday_list", r.message);
-			}
+frappe.ui.form.on("Workstation", {
+	onload: function(frm) {
+		if(frm.is_new())
+		{
+			frappe.call({
+				type:"GET",
+				method:"erpnext.manufacturing.doctype.workstation.workstation.get_default_holiday_list",
+				callback: function(r) {
+					if(!r.exe && r.message){
+						cur_frm.set_value("holiday_list", r.message);
+					}
+				}
+			})
 		}
-	})
-}
+	}
+})
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/workstation/workstation.json b/erpnext/manufacturing/doctype/workstation/workstation.json
index 93cc992..144635c 100644
--- a/erpnext/manufacturing/doctype/workstation/workstation.json
+++ b/erpnext/manufacturing/doctype/workstation/workstation.json
@@ -348,7 +348,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-wrench", 
+ "icon": "fa fa-wrench", 
  "idx": 1, 
  "in_create": 0, 
  "in_dialog": 0, 
diff --git a/erpnext/manufacturing/doctype/workstation/workstation.py b/erpnext/manufacturing/doctype/workstation/workstation.py
index b939803..5095784 100644
--- a/erpnext/manufacturing/doctype/workstation/workstation.py
+++ b/erpnext/manufacturing/doctype/workstation/workstation.py
@@ -60,9 +60,10 @@
 	workstation = frappe.get_doc("Workstation", workstation)
 
 	for working_hour in workstation.working_hours:
-		slot_length = (to_timedelta(working_hour.end_time or "") - to_timedelta(working_hour.start_time or "")).total_seconds()
-		if slot_length >= operation_length:
-			return
+		if working_hour.start_time and working_hour.end_time:
+			slot_length = (to_timedelta(working_hour.end_time or "") - to_timedelta(working_hour.start_time or "")).total_seconds()
+			if slot_length >= operation_length:
+				return
 
 	frappe.throw(_("Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations").format(operation, workstation.name), NotInWorkingHoursError)
 
diff --git a/erpnext/modules.txt b/erpnext/modules.txt
index 609a3fe..4daf0eb 100644
--- a/erpnext/modules.txt
+++ b/erpnext/modules.txt
@@ -1,6 +1,7 @@
 Accounts
 CRM
 Buying
+Fleet Management
 Projects
 Selling
 Setup
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 40441c8..c4b66e7 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -23,19 +23,15 @@
 execute:frappe.reload_doc('buying', 'doctype', 'supplier') # 2014-01-29
 execute:frappe.reload_doc('accounts', 'doctype', 'asset_category')
 execute:frappe.reload_doc('accounts', 'doctype', 'pricing_rule')
-
-erpnext.patches.v5_2.change_item_selects_to_checks
-execute:frappe.reload_doctype('Item')
-
 erpnext.patches.v4_0.map_charge_to_taxes_and_charges
 execute:frappe.reload_doc('support', 'doctype', 'newsletter') # 2014-01-31
 execute:frappe.reload_doc('hr', 'doctype', 'employee') # 2014-02-03
 execute:frappe.db.sql("update tabPage set module='Core' where name='Setup'")
-
+erpnext.patches.v5_2.change_item_selects_to_checks
+execute:frappe.reload_doctype('Item')
 erpnext.patches.v4_0.fields_to_be_renamed
 erpnext.patches.v4_0.rename_sitemap_to_route
 erpnext.patches.v7_0.re_route #2016-06-27
-
 erpnext.patches.v4_0.fix_contact_address
 erpnext.patches.v4_0.customer_discount_to_pricing_rule
 execute:frappe.db.sql("""delete from `tabWebsite Item Group` where ifnull(item_group, '')=''""")
@@ -175,6 +171,7 @@
 execute:frappe.db.sql_list("delete from `tabDocPerm` where parent='Issue' and modified_by='Administrator' and role='Guest'")
 erpnext.patches.v5_0.update_item_and_description_again
 erpnext.patches.v6_0.multi_currency
+erpnext.patches.v7_0.create_budget_record
 erpnext.patches.v5_0.repost_gle_for_jv_with_multiple_party
 erpnext.patches.v5_0.portal_fixes
 erpnext.patches.v5_0.reset_values_in_tools # 02-05-2016
@@ -237,7 +234,6 @@
 erpnext.patches.v6_4.set_user_in_contact
 erpnext.patches.v6_4.make_image_thumbnail #2015-10-20
 erpnext.patches.v6_5.show_in_website_for_template_item
-erpnext.patches.v7_0.create_budget_record
 erpnext.patches.v6_4.fix_expense_included_in_valuation
 execute:frappe.delete_doc_if_exists("Report", "Item-wise Last Purchase Rate")
 erpnext.patches.v6_6.fix_website_image
@@ -268,7 +264,7 @@
 erpnext.patches.v6_24.map_customer_address_to_shipping_address_on_po
 erpnext.patches.v6_27.fix_recurring_order_status
 erpnext.patches.v6_20x.update_product_bundle_description
-erpnext.patches.v7_0.update_party_status
+erpnext.patches.v7_0.update_party_status #2016-09-22
 erpnext.patches.v7_0.update_item_projected
 erpnext.patches.v7_0.remove_features_setup
 erpnext.patches.v7_0.update_home_page
@@ -286,7 +282,7 @@
 erpnext.patches.v7_0.convert_timelogbatch_to_timesheet
 erpnext.patches.v7_0.convert_timelog_to_timesheet
 erpnext.patches.v7_0.move_timelogbatch_from_salesinvoiceitem_to_salesinvoicetimesheet
-erpnext.patches.v7_0.remove_doctypes_and_reports
+erpnext.patches.v7_0.remove_doctypes_and_reports #2016-10-29
 erpnext.patches.v7_0.update_maintenance_module_in_doctype
 erpnext.patches.v7_0.update_prevdoc_values_for_supplier_quotation_item
 erpnext.patches.v7_0.rename_advance_table_fields
@@ -302,6 +298,7 @@
 execute:frappe.delete_doc_if_exists("DocType", "Payment Tool Detail")
 erpnext.patches.v7_0.setup_account_table_for_expense_claim_type_if_exists
 erpnext.patches.v7_0.migrate_schools_to_erpnext
+erpnext.patches.v7_1.update_lead_source
 erpnext.patches.v6_20x.remove_customer_supplier_roles
 erpnext.patches.v7_0.remove_administrator_role_in_doctypes
 erpnext.patches.v7_0.rename_fee_amount_to_fee_component
@@ -313,6 +310,7 @@
 erpnext.patches.v7_0.set_material_request_type_in_item
 erpnext.patches.v7_0.rename_examination_to_assessment
 erpnext.patches.v7_0.set_portal_settings
+erpnext.patches.v7_0.update_change_amount_account
 erpnext.patches.v7_0.repost_future_gle_for_purchase_invoice
 erpnext.patches.v7_0.fix_duplicate_icons
 erpnext.patches.v7_0.move_employee_parent_to_child_in_salary_structure
@@ -327,4 +325,33 @@
 erpnext.patches.v7_0.update_conversion_factor_in_supplier_quotation_item
 erpnext.patches.v7_1.move_sales_invoice_from_parent_to_child_timesheet
 execute:frappe.db.sql("update `tabTimesheet` ts, `tabEmployee` emp set ts.employee_name = emp.employee_name where emp.name = ts.employee and ts.employee_name is null and ts.employee is not null")
-erpnext.patches.v7_1.update_lead_source
+erpnext.patches.v7_1.fix_link_for_customer_from_lead
+execute:frappe.db.sql("delete from `tabTimesheet Detail` where NOT EXISTS (select name from `tabTimesheet` where name = `tabTimesheet Detail`.parent)")
+erpnext.patches.v7_0.update_mode_of_payment_type
+
+execute:frappe.reload_doctype('Employee') #2016-10-18
+execute:frappe.db.sql("update `tabEmployee` set prefered_contact_email = IFNULL(prefered_contact_email,'') ")
+execute:frappe.reload_doctype("Salary Slip")
+execute:frappe.db.sql("update `tabSalary Slip` set posting_date=creation")
+erpnext.patches.v7_1.update_portal_roles
+erpnext.patches.v7_1.set_total_amount_currency_in_je
+finally:erpnext.patches.v7_0.update_timesheet_communications
+erpnext.patches.v7_0.update_status_of_zero_amount_sales_order
+erpnext.patches.v7_1.add_field_for_task_dependent
+erpnext.patches.v7_0.repost_bin_qty_and_item_projected_qty
+erpnext.patches.v7_1.set_prefered_contact_email
+execute:frappe.reload_doc('accounts', 'doctype', 'accounts_settings')
+execute:frappe.db.set_value("Accounts Settings", "Accounts Settings", "unlink_payment_on_cancellation_of_invoice", 0)
+execute:frappe.db.sql("update `tabStock Entry` set total_amount = null where purpose in('Repack', 'Manufacture')")
+erpnext.patches.v7_1.save_stock_settings
+erpnext.patches.v7_0.repost_gle_for_pi_with_update_stock #2016-11-01
+erpnext.patches.v7_1.add_account_user_role_for_timesheet
+erpnext.patches.v7_0.set_base_amount_in_invoice_payment_table
+erpnext.patches.v7_1.update_invoice_status
+erpnext.patches.v7_0.po_status_issue_for_pr_return
+erpnext.patches.v7_1.update_missing_salary_component_type
+erpnext.patches.v7_1.rename_quality_inspection_field
+erpnext.patches.v7_0.update_autoname_field
+erpnext.patches.v7_1.update_bom_base_currency
+erpnext.patches.v7_0.update_status_of_po_so
+erpnext.patches.v7_1.set_budget_against_as_cost_center
\ No newline at end of file
diff --git a/erpnext/patches/v5_1/rename_roles.py b/erpnext/patches/v5_1/rename_roles.py
index 452c800..26208aa 100644
--- a/erpnext/patches/v5_1/rename_roles.py
+++ b/erpnext/patches/v5_1/rename_roles.py
@@ -5,5 +5,5 @@
 		frappe.rename_doc("Role", "Material User", "Stock User")
 	if not frappe.db.exists("Role", "Stock Manager"):
 		frappe.rename_doc("Role", "Material Manager", "Stock Manager")
-	if not frappe.db.exists("Role", "Stock Manager"):
+	if not frappe.db.exists("Role", "Item Manager"):
 		frappe.rename_doc("Role", "Material Master Manager", "Item Manager")
diff --git a/erpnext/patches/v6_3/convert_applicable_territory.py b/erpnext/patches/v6_3/convert_applicable_territory.py
index 69ec18f..b1793db 100644
--- a/erpnext/patches/v6_3/convert_applicable_territory.py
+++ b/erpnext/patches/v6_3/convert_applicable_territory.py
@@ -5,7 +5,7 @@
 	frappe.reload_doc("accounts", "doctype", "shipping_rule_country")
 	frappe.reload_doctype("Price List")
 	frappe.reload_doctype("Shipping Rule")
-	frappe.reload_doctype("Shopping Cart Settings")
+	frappe.reload_doctype("shopping_cart", "doctype", "shopping_cart_settings")
 
 	# for price list
 	countries = frappe.db.sql_list("select name from tabCountry")
diff --git a/erpnext/patches/v7_0/convert_timelog_to_timesheet.py b/erpnext/patches/v7_0/convert_timelog_to_timesheet.py
index 16b2aec..9894c2a 100644
--- a/erpnext/patches/v7_0/convert_timelog_to_timesheet.py
+++ b/erpnext/patches/v7_0/convert_timelog_to_timesheet.py
@@ -3,11 +3,12 @@
 	import make_timesheet, add_timesheet_detail
 
 def execute():
+	frappe.reload_doc('projects', 'doctype', 'task')
 	frappe.reload_doc('projects', 'doctype', 'timesheet')
 	if not frappe.db.table_exists("Time Log"):
 		return
 
-	for data in frappe.db.sql("select * from `tabTime Log` where docstatus < 2", as_dict=1):
+	for data in frappe.db.sql("select * from `tabTime Log`", as_dict=1):
 		if data.task:
 			company = frappe.db.get_value("Task", data.task, "company")
 		elif data.production_order:
@@ -18,7 +19,10 @@
 		time_sheet = make_timesheet(data.production_order)
 		args = get_timelog_data(data)
 		add_timesheet_detail(time_sheet, args)
-		time_sheet.docstatus = data.docstatus
+		if data.docstatus == 2:
+			time_sheet.docstatus = 0
+		else:
+			time_sheet.docstatus = data.docstatus
 		time_sheet.employee = data.employee
 		time_sheet.note = data.note
 		time_sheet.company = company
@@ -28,6 +32,7 @@
 		time_sheet.update_cost()
 		time_sheet.calculate_total_amounts()
 		time_sheet.flags.ignore_validate = True
+		time_sheet.flags.ignore_links = True
 		time_sheet.save(ignore_permissions=True)
 
 		# To ignore validate_mandatory_fields function
@@ -37,6 +42,10 @@
 				d.db_set("docstatus", 1)
 			time_sheet.update_production_order(time_sheet.name)
 			time_sheet.update_task_and_project()
+		if data.docstatus == 2:
+			time_sheet.db_set("docstatus", 2)
+			for d in time_sheet.get("time_logs"):
+				d.db_set("docstatus", 2)
 
 def get_timelog_data(data):
 	return {
diff --git a/erpnext/patches/v7_0/convert_timelogbatch_to_timesheet.py b/erpnext/patches/v7_0/convert_timelogbatch_to_timesheet.py
index 0eff8d4..a7cb0d7 100644
--- a/erpnext/patches/v7_0/convert_timelogbatch_to_timesheet.py
+++ b/erpnext/patches/v7_0/convert_timelogbatch_to_timesheet.py
@@ -17,10 +17,10 @@
 			add_timesheet_detail(time_sheet, args)
 
 		time_sheet.docstatus = tlb.docstatus
+		time_sheet.flags.ignore_links = True
 		time_sheet.save(ignore_permissions=True)
 
 def get_timesheet_data(data):
-	time_log = frappe.get_all('Time Log', fields=["*"],
-		filters = {'name': data.time_log})[0]
-
-	return get_timelog_data(time_log)
\ No newline at end of file
+	time_log = frappe.get_all('Time Log', fields=["*"], filters = {'name': data.time_log})
+	if time_log:
+		return get_timelog_data(time_log[0])
\ No newline at end of file
diff --git a/erpnext/patches/v7_0/create_warehouse_nestedset.py b/erpnext/patches/v7_0/create_warehouse_nestedset.py
index 8190fd7..8ae86f7 100644
--- a/erpnext/patches/v7_0/create_warehouse_nestedset.py
+++ b/erpnext/patches/v7_0/create_warehouse_nestedset.py
@@ -29,10 +29,11 @@
 			make_warehouse_nestedset(company)
 	else:
 		sle_against_companies = frappe.db.sql_list("""select distinct company from `tabStock Ledger Entry`""")
-		company = frappe.defaults.get_defaults().company
 
 		if len(sle_against_companies) == 1:
-			set_company_to_warehouse(company)
+			company = frappe.db.get_value("Company", sle_against_companies[0], 
+				fieldname=["name", "abbr"], as_dict=1)
+			set_company_to_warehouse(company.name)
 			make_warehouse_nestedset(company)
 
 		elif len(sle_against_companies) > 1:
diff --git a/erpnext/patches/v7_0/fix_duplicate_icons.py b/erpnext/patches/v7_0/fix_duplicate_icons.py
index 3e762f7..f6d227d 100644
--- a/erpnext/patches/v7_0/fix_duplicate_icons.py
+++ b/erpnext/patches/v7_0/fix_duplicate_icons.py
@@ -6,6 +6,8 @@
 
 def execute():
 	'''hide new style icons if old ones are set'''
+	frappe.reload_doc('desk', 'doctype', 'desktop_icon')
+
 	reload_doctypes_for_schools_icons()
 
 	sync_desktop_icons()
diff --git a/erpnext/patches/v7_0/move_employee_parent_to_child_in_salary_structure.py b/erpnext/patches/v7_0/move_employee_parent_to_child_in_salary_structure.py
index f04fa21..4308526 100644
--- a/erpnext/patches/v7_0/move_employee_parent_to_child_in_salary_structure.py
+++ b/erpnext/patches/v7_0/move_employee_parent_to_child_in_salary_structure.py
@@ -11,4 +11,5 @@
 		if not ss_doc.company:
 			ss_doc.company = frappe.db.get_value('Employee', salary_employee.employee, 'company')
 		ss_doc.flags.ignore_validate = True
+		ss_doc.flags.ignore_mandatory = True
 		ss_doc.save()
diff --git a/erpnext/patches/v7_0/move_timelogbatch_from_salesinvoiceitem_to_salesinvoicetimesheet.py b/erpnext/patches/v7_0/move_timelogbatch_from_salesinvoiceitem_to_salesinvoicetimesheet.py
index 0332955..727a44e 100644
--- a/erpnext/patches/v7_0/move_timelogbatch_from_salesinvoiceitem_to_salesinvoicetimesheet.py
+++ b/erpnext/patches/v7_0/move_timelogbatch_from_salesinvoiceitem_to_salesinvoicetimesheet.py
@@ -5,6 +5,8 @@
 	frappe.reload_doc('accounts', 'doctype', 'sales_invoice_payment')
 	for time_sheet in frappe.db.sql(""" select sales_invoice, name, total_billable_amount from `tabTimesheet`
 		where sales_invoice is not null and docstatus < 2""", as_dict=True):
+		if not frappe.db.exists('Sales Invoice', time_sheet.sales_invoice):
+			continue
 		si_doc = frappe.get_doc('Sales Invoice', time_sheet.sales_invoice)
 		ts = si_doc.append('timesheets',{})
 		ts.time_sheet = time_sheet.name
diff --git a/erpnext/patches/v7_0/po_status_issue_for_pr_return.py b/erpnext/patches/v7_0/po_status_issue_for_pr_return.py
new file mode 100644
index 0000000..6e92ffb
--- /dev/null
+++ b/erpnext/patches/v7_0/po_status_issue_for_pr_return.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 execute():
+	parent_list = []
+	count = 0
+	for data in frappe.db.sql(""" 
+		select 
+			`tabPurchase Receipt Item`.purchase_order, `tabPurchase Receipt Item`.name,
+			`tabPurchase Receipt Item`.item_code, `tabPurchase Receipt Item`.idx,
+			`tabPurchase Receipt Item`.parent
+		from 
+			`tabPurchase Receipt Item`, `tabPurchase Receipt`
+		where
+			`tabPurchase Receipt Item`.parent = `tabPurchase Receipt`.name and
+			`tabPurchase Receipt Item`.purchase_order_item is null and
+			`tabPurchase Receipt Item`.purchase_order is not null and
+			`tabPurchase Receipt`.is_return = 1""", as_dict=1):
+			name = frappe.db.get_value('Purchase Order Item', 
+				{'item_code': data.item_code, 'parent': data.purchase_order, 'idx': data.idx}, 'name')
+
+			if name:
+				frappe.db.set_value('Purchase Receipt Item', data.name, 'purchase_order_item', name, update_modified=False)
+				parent_list.append(data.parent)
+
+			count +=1
+			if count % 200 == 0:
+				frappe.db.commit()
+
+	if len(parent_list) > 0:
+		for parent in set(parent_list):
+			doc = frappe.get_doc('Purchase Receipt', parent)
+			doc.update_qty(update_modified=False)
\ No newline at end of file
diff --git a/erpnext/patches/v7_0/remove_doctypes_and_reports.py b/erpnext/patches/v7_0/remove_doctypes_and_reports.py
index 0a302b1..03461de 100644
--- a/erpnext/patches/v7_0/remove_doctypes_and_reports.py
+++ b/erpnext/patches/v7_0/remove_doctypes_and_reports.py
@@ -5,6 +5,22 @@
 		frappe.db.sql("""delete from `tabDocType`
 			where name in('Time Log Batch', 'Time Log Batch Detail', 'Time Log')""")
 
+	frappe.db.sql("""delete from `tabDocField` where parent in ('Time Log', 'Time Log Batch')""")
+	frappe.db.sql("""update `tabCustom Script` set dt = 'Timesheet' where dt = 'Time Log'""")
+
+	for data in frappe.db.sql(""" select label, fieldname from  `tabCustom Field` where dt = 'Time Log'""", as_dict=1):
+		custom_field = frappe.get_doc({
+			'doctype': 'Custom Field',
+			'label': data.label,
+			'dt': 'Timesheet Detail',
+			'fieldname': data.fieldname,
+			'fieldtype': data.fieldtype or "Data"
+		}).insert(ignore_permissions=True)
+
+	frappe.db.sql("""delete from `tabCustom Field` where dt = 'Time Log'""")
+	frappe.reload_doc('projects', 'doctype', 'timesheet')
+	frappe.reload_doc('projects', 'doctype', 'timesheet_detail')
+
 	report = "Daily Time Log Summary"
 	if frappe.db.exists("Report", report):
-		frappe.delete_doc('Report', report)
\ No newline at end of file
+		frappe.delete_doc('Report', report)
diff --git a/erpnext/patches/v7_0/remove_features_setup.py b/erpnext/patches/v7_0/remove_features_setup.py
index 60d1926..596f7a9 100644
--- a/erpnext/patches/v7_0/remove_features_setup.py
+++ b/erpnext/patches/v7_0/remove_features_setup.py
@@ -7,6 +7,8 @@
 	frappe.reload_doctype('Stock Settings')
 	stock_settings = frappe.get_doc('Stock Settings', 'Stock Settings')
 	stock_settings.show_barcode_field = cint(frappe.db.get_value("Features Setup", None, "fs_item_barcode"))
+	if not frappe.db.exists("UOM", stock_settings.stock_uom):
+		stock_settings.stock_uom = None
 	stock_settings.save()
 
 	create_compact_item_print_custom_field()
diff --git a/erpnext/patches/v7_0/rename_salary_components.py b/erpnext/patches/v7_0/rename_salary_components.py
index ecf2faf..4e9ceb2 100644
--- a/erpnext/patches/v7_0/rename_salary_components.py
+++ b/erpnext/patches/v7_0/rename_salary_components.py
@@ -78,9 +78,12 @@
 	
 	for doctype, cols in dt_cols_de.items():		
 		source_cols = "`" + "`, `".join(standard_cols_de + cols) + "`"
-		
-		frappe.db.sql("""INSERT INTO `tabSalary Component` ({0}) SELECT {1} FROM `tab{2}`"""
-			.format(target_cols, source_cols, doctype))
+		try:
+			frappe.db.sql("""INSERT INTO `tabSalary Component` ({0}) SELECT {1} FROM `tab{2}`"""
+				.format(target_cols, source_cols, doctype))
+		except Exception, e:
+			if e.args[0]==1062:
+				pass
 			
 	update_customizations()
 			
diff --git a/erpnext/patches/v7_0/repost_bin_qty_and_item_projected_qty.py b/erpnext/patches/v7_0/repost_bin_qty_and_item_projected_qty.py
new file mode 100644
index 0000000..97af20a
--- /dev/null
+++ b/erpnext/patches/v7_0/repost_bin_qty_and_item_projected_qty.py
@@ -0,0 +1,28 @@
+# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+from erpnext.stock.doctype.bin.bin import update_item_projected_qty
+
+def execute():
+	repost_bin_qty()
+	repost_item_projected_qty()
+
+def repost_bin_qty():
+	for bin in frappe.db.sql(""" select name from `tabBin` 
+		where (actual_qty + ordered_qty + indented_qty + planned_qty- reserved_qty - reserved_qty_for_production) != projected_qty """, as_dict=1):
+		bin_doc = frappe.get_doc('Bin', bin.name)
+		bin_doc.set_projected_qty()
+		bin_doc.db_set("projected_qty", bin_doc.projected_qty, update_modified = False)
+
+def repost_item_projected_qty():
+	for data in frappe.db.sql(""" select 
+			`tabBin`.item_code as item_code,
+			sum(`tabBin`.projected_qty) as projected_qty, 
+			`tabItem`.total_projected_qty as total_projected_qty 
+		from 
+			`tabBin`, `tabItem` 
+		where `tabBin`.item_code = `tabItem`.name 
+		group by `tabBin`.item_code having projected_qty <>  total_projected_qty """, as_dict=1):
+		update_item_projected_qty(data.item_code)
diff --git a/erpnext/patches/v7_0/repost_gle_for_pi_with_update_stock.py b/erpnext/patches/v7_0/repost_gle_for_pi_with_update_stock.py
new file mode 100644
index 0000000..9f159be
--- /dev/null
+++ b/erpnext/patches/v7_0/repost_gle_for_pi_with_update_stock.py
@@ -0,0 +1,22 @@
+# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.utils import cint
+
+def execute():
+	if not cint(frappe.defaults.get_global_default("auto_accounting_for_stock")):
+		return
+
+	frappe.reload_doctype("Purchase Invoice")
+
+	for pi in frappe.db.sql("""select name from `tabPurchase Invoice` 
+		where update_stock=1 and docstatus=1  order by posting_date asc""", as_dict=1):
+		
+			frappe.db.sql("""delete from `tabGL Entry` 
+				where voucher_type = 'Purchase Invoice' and voucher_no = %s""", pi.name)
+				
+			pi_doc = frappe.get_doc("Purchase Invoice", pi.name)
+			pi_doc.make_gl_entries(repost_future_gle=False)
+			frappe.db.commit()
\ No newline at end of file
diff --git a/erpnext/patches/v7_0/repost_gle_for_pos_sales_return.py b/erpnext/patches/v7_0/repost_gle_for_pos_sales_return.py
index d3dd2e9..77ecafd 100644
--- a/erpnext/patches/v7_0/repost_gle_for_pos_sales_return.py
+++ b/erpnext/patches/v7_0/repost_gle_for_pos_sales_return.py
@@ -7,6 +7,7 @@
 
 def execute():
 	frappe.reload_doctype("Sales Invoice")
+	frappe.reload_doctype("Sales Invoice Item")
 	
 	for si in frappe.get_all("Sales Invoice", fields = ["name"], 
 		filters={"docstatus": 1, "is_pos": 1, "is_return": 1}):
diff --git a/erpnext/patches/v7_0/set_base_amount_in_invoice_payment_table.py b/erpnext/patches/v7_0/set_base_amount_in_invoice_payment_table.py
new file mode 100644
index 0000000..5dd61a0
--- /dev/null
+++ b/erpnext/patches/v7_0/set_base_amount_in_invoice_payment_table.py
@@ -0,0 +1,24 @@
+from __future__ import unicode_literals
+import frappe
+from frappe.utils import flt
+
+def execute():
+	si_list = frappe.db.sql("""
+		select distinct parent
+		from `tabSales Invoice Payment`
+		where docstatus!=2 and parenttype = 'Sales Invoice'
+		and amount != 0 and base_amount = 0
+	""")
+
+	count = 0
+	for d in si_list:
+		si = frappe.get_doc("Sales Invoice", d[0])
+		for p in si.get("payments"):
+			if p.amount and not p.base_amount:
+				base_amount = flt(p.amount*si.conversion_rate, si.precision("base_paid_amount"))
+				frappe.db.set_value("Sales Invoice Payment", p.name, "base_amount", base_amount, update_modified=False)
+
+		count +=1
+			
+		if count % 200 == 0:
+			frappe.db.commit()
diff --git a/erpnext/patches/v7_0/set_portal_settings.py b/erpnext/patches/v7_0/set_portal_settings.py
index 3e3b729..d9b6400 100644
--- a/erpnext/patches/v7_0/set_portal_settings.py
+++ b/erpnext/patches/v7_0/set_portal_settings.py
@@ -9,10 +9,12 @@
 def execute():
 	for dt in ("assessment", "announcement", "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:
-		domainify.setup_sidebar_items(domainify.get_domain('Manufacturing'))
\ No newline at end of file
+		domainify.setup_sidebar_items(domainify.get_domain('Manufacturing'))
diff --git a/erpnext/patches/v7_0/setup_account_table_for_expense_claim_type_if_exists.py b/erpnext/patches/v7_0/setup_account_table_for_expense_claim_type_if_exists.py
index 9622490..c565707 100644
--- a/erpnext/patches/v7_0/setup_account_table_for_expense_claim_type_if_exists.py
+++ b/erpnext/patches/v7_0/setup_account_table_for_expense_claim_type_if_exists.py
@@ -16,4 +16,5 @@
 				"company": frappe.db.get_value("Account", expense_claim_type.default_account, "company"),
 				"default_account": expense_claim_type.default_account,
 			})
+			doc.flags.ignore_mandatory = True
 			doc.save(ignore_permissions=True)
\ No newline at end of file
diff --git a/erpnext/patches/v7_0/update_autoname_field.py b/erpnext/patches/v7_0/update_autoname_field.py
new file mode 100644
index 0000000..bfa9b28
--- /dev/null
+++ b/erpnext/patches/v7_0/update_autoname_field.py
@@ -0,0 +1,14 @@
+# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+	doctypes = frappe.db.sql(""" select name, autoname from `tabDocType`
+		where autoname like 'field:%' and allow_rename = 1""", as_dict=1)
+
+	for doctype in doctypes:
+		fieldname = doctype.autoname.split(":")[1]
+		if fieldname:
+			frappe.db.sql(""" update `tab%s` set %s = name """%(doctype.name, fieldname))
\ No newline at end of file
diff --git a/erpnext/patches/v7_0/update_change_amount_account.py b/erpnext/patches/v7_0/update_change_amount_account.py
new file mode 100644
index 0000000..1741095
--- /dev/null
+++ b/erpnext/patches/v7_0/update_change_amount_account.py
@@ -0,0 +1,19 @@
+from __future__ import unicode_literals
+import frappe
+from erpnext.accounts.doctype.journal_entry.journal_entry import get_default_bank_cash_account
+
+def execute():
+	frappe.reload_doc('accounts', 'doctype', 'sales_invoice')
+
+	for company in frappe.db.sql("""select company from `tabSales Invoice` 
+		where change_amount <> 0 and account_for_change_amount is null group by company""", as_list = 1):
+		cash_account = get_default_bank_cash_account(company[0], 'Cash').get('account')
+		if not cash_account:
+			bank_account = get_default_bank_cash_account(company[0], 'Bank').get('account')
+			cash_account = bank_account
+
+		if cash_account:
+			frappe.db.sql("""update `tabSales Invoice` 
+				set account_for_change_amount = %(cash_account)s where change_amount <> 0 
+				and company = %(company)s and account_for_change_amount is null""",
+				{'cash_account': cash_account, 'company': company[0]})
diff --git a/erpnext/patches/v7_0/update_home_page.py b/erpnext/patches/v7_0/update_home_page.py
index 7bc7a2e..ed88e20 100644
--- a/erpnext/patches/v7_0/update_home_page.py
+++ b/erpnext/patches/v7_0/update_home_page.py
@@ -13,7 +13,7 @@
 		header = frappe.db.get_value('Web Page', website_settings.home_page, 'header')
 		if header and header.startswith("<div class='hero text-center'>"):
 			homepage = frappe.get_doc('Homepage', 'Homepage')
-			homepage.company = erpnext.get_default_company()
+			homepage.company = erpnext.get_default_company() or frappe.get_all("Company")[0].name
 			if '<h1>' in header:
 				homepage.tag_line = header.split('<h1>')[1].split('</h1>')[0] or 'Default Website'
 			else:
diff --git a/erpnext/patches/v7_0/update_mode_of_payment_type.py b/erpnext/patches/v7_0/update_mode_of_payment_type.py
new file mode 100644
index 0000000..9292a1b
--- /dev/null
+++ b/erpnext/patches/v7_0/update_mode_of_payment_type.py
@@ -0,0 +1,29 @@
+from __future__ import unicode_literals
+import frappe
+from frappe.utils import flt
+
+def execute():
+	frappe.reload_doc('accounts', 'doctype', 'mode_of_payment')
+
+	frappe.db.sql(""" update `tabMode of Payment` set type = 'Cash' where (type is null or type = '') and name = 'Cash'""")
+
+	for data in frappe.db.sql("""select name from `tabSales Invoice` where is_pos=1 and docstatus<2 and
+		(ifnull(paid_amount, 0) - ifnull(change_amount, 0)) > ifnull(grand_total, 0) and modified > '2016-05-01'""", as_dict=1):
+		if data.name:
+			si_doc = frappe.get_doc("Sales Invoice", data.name)
+			remove_payment = []
+			mode_of_payment = [d.mode_of_payment for d in si_doc.payments if flt(d.amount) > 0]
+			if mode_of_payment != set(mode_of_payment):
+				for payment_data in si_doc.payments:
+					if payment_data.idx != 1 and payment_data.amount == si_doc.grand_total:
+						remove_payment.append(payment_data)
+						frappe.db.sql(""" delete from `tabSales Invoice Payment` 
+							where name = %(name)s""", {'name': payment_data.name})
+
+			if len(remove_payment) > 0:
+				for d in remove_payment:
+					si_doc.remove(d)
+
+				si_doc.set_paid_amount()
+				si_doc.db_set("paid_amount", si_doc.paid_amount, update_modified = False)
+				si_doc.db_set("base_paid_amount", si_doc.base_paid_amount, update_modified = False)
\ No newline at end of file
diff --git a/erpnext/patches/v7_0/update_status_of_po_so.py b/erpnext/patches/v7_0/update_status_of_po_so.py
new file mode 100644
index 0000000..0e2dd74
--- /dev/null
+++ b/erpnext/patches/v7_0/update_status_of_po_so.py
@@ -0,0 +1,62 @@
+# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.utils import cint, flt
+
+def execute():
+	update_po_per_received_per_billed()
+	update_so_per_delivered_per_billed()
+	update_status()
+
+def update_po_per_received_per_billed():
+	frappe.db.sql(""" 
+		update
+			`tabPurchase Order`
+		set
+			`tabPurchase Order`.per_received = round((select sum(if(qty > ifnull(received_qty, 0),
+					ifnull(received_qty, 0), qty)) / sum(qty) *100 from `tabPurchase Order Item`
+					where parent = `tabPurchase Order`.name), 2),
+			`tabPurchase Order`.per_billed = round((select sum( if(amount > ifnull(billed_amt, 0),
+					ifnull(billed_amt, 0), amount)) / sum(amount) *100 from `tabPurchase Order Item`
+					where parent = `tabPurchase Order`.name), 2)""")
+
+def update_so_per_delivered_per_billed():
+	frappe.db.sql(""" 
+		update
+			`tabSales Order`
+		set 
+			`tabSales Order`.per_delivered = round((select sum( if(qty > ifnull(delivered_qty, 0),
+					ifnull(delivered_qty, 0), qty)) / sum(qty) *100 from `tabSales Order Item` 
+					where parent = `tabSales Order`.name), 2), 
+			`tabSales Order`.per_billed = round((select sum( if(amount > ifnull(billed_amt, 0),
+					ifnull(billed_amt, 0), amount)) / sum(amount) *100 from `tabSales Order Item`
+					where parent = `tabSales Order`.name), 2)""")
+
+def update_status():
+	frappe.db.sql("""
+		update
+			`tabSales Order`
+		set status = (Case when status = 'Closed' then 'Closed'
+			When per_delivered < 100 and per_billed < 100 and docstatus = 1 then 'To Deliver and Bill'
+			when per_delivered = 100 and per_billed < 100 and docstatus = 1 then 'To Bill'
+			when per_delivered < 100 and per_billed = 100 and docstatus = 1 then 'To Deliver'
+			when per_delivered = 100 and per_billed = 100 and docstatus = 1 then 'Completed'
+			when order_type = 'Maintenance' and per_billed = 100 and docstatus = 1 then 'Completed'
+			when docstatus = 2 then 'Cancelled'
+			else 'Draft'
+		End)""")
+
+	frappe.db.sql("""
+		update 
+			`tabPurchase Order` 
+		set status = (Case when status = 'Closed' then 'Closed'
+			when status = 'Delivered' then 'Delivered'
+			When per_received < 100 and per_billed < 100 and docstatus = 1 then 'To Receive and Bill'
+			when per_received = 100 and per_billed < 100 and docstatus = 1 then 'To Bill'
+			when per_received < 100 and per_billed = 100 and docstatus = 1 then 'To Receive'
+			when per_received = 100 and per_billed = 100 and docstatus = 1 then 'Completed'
+			when docstatus = 2 then 'Cancelled'
+			else 'Draft'
+		End)""")
\ No newline at end of file
diff --git a/erpnext/patches/v7_0/update_status_of_zero_amount_sales_order.py b/erpnext/patches/v7_0/update_status_of_zero_amount_sales_order.py
new file mode 100644
index 0000000..9b2b247
--- /dev/null
+++ b/erpnext/patches/v7_0/update_status_of_zero_amount_sales_order.py
@@ -0,0 +1,7 @@
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+	for data in frappe.get_all('Sales Order', fields = ["name"], filters = [["docstatus", "=", "1"], ["grand_total", "=", "0"]]):
+		sales_order = frappe.get_doc('Sales Order', data.name)
+		sales_order.set_status(update=True, update_modified = False)
\ No newline at end of file
diff --git a/erpnext/patches/v7_0/update_timesheet_communications.py b/erpnext/patches/v7_0/update_timesheet_communications.py
new file mode 100644
index 0000000..203471e
--- /dev/null
+++ b/erpnext/patches/v7_0/update_timesheet_communications.py
@@ -0,0 +1,27 @@
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+	if frappe.db.table_exists("Time Log"):
+		timesheet = frappe.db.sql("""SELECT ts.name AS name, tl.name AS timelogname,
+				tl.modified AS modified, tl.modified_by AS modified_by, tl.creation AS creation, tl.owner AS owner
+			FROM 
+				`tabTimesheet` ts, `tabTimesheet Detail` tsd, `tabTime Log` tl
+			WHERE 
+				tsd.parent = ts.name AND tl.from_time = tsd.from_time AND tl.to_time = tsd.to_time 
+				AND tl.hours = tsd.hours AND tl.billing_rate = tsd.billing_rate AND tsd.idx=1 
+				AND tl.docstatus < 2""", as_dict=1)
+				
+		for data in timesheet:
+			frappe.db.sql(""" update `tabTimesheet` set creation = %(creation)s,
+				owner = %(owner)s, modified = %(modified)s, modified_by = %(modified_by)s
+				where name = %(name)s""", data)
+								
+			frappe.db.sql("""
+				update 
+					tabCommunication 
+				set 
+					reference_doctype = "Timesheet", reference_name = %(timesheet)s
+				where 
+					reference_doctype = "Time Log" and reference_name = %(timelog)s
+			""", {'timesheet': data.name, 'timelog': data.timelogname}, auto_commit=1)
diff --git a/erpnext/patches/v7_1/add_account_user_role_for_timesheet.py b/erpnext/patches/v7_1/add_account_user_role_for_timesheet.py
new file mode 100644
index 0000000..7372b0c
--- /dev/null
+++ b/erpnext/patches/v7_1/add_account_user_role_for_timesheet.py
@@ -0,0 +1,31 @@
+# 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.get_value('DocPerm', {'parent': 'Timesheet', 'role': 'Accounts User', 'permlevel': 1}):
+		doc = frappe.get_doc('DocType', 'Timesheet')
+		doc.append('permissions', {
+			'role': "Accounts User",
+			'permlevel': 0,
+			'read': 1,
+			'write': 1,
+			'create': 1,
+			'delete': 1,
+			'submit': 1,
+			'cancel': 1,
+			'amend': 1,
+			'report': 1,
+			'email': 1
+		})
+
+		doc.append('permissions', {
+			'role': "Accounts User",
+			'permlevel': 1,
+			'read': 1,
+			'write': 1
+		})
+
+		doc.save(ignore_permissions=True)
\ No newline at end of file
diff --git a/erpnext/patches/v7_1/add_field_for_task_dependent.py b/erpnext/patches/v7_1/add_field_for_task_dependent.py
new file mode 100644
index 0000000..96daa13
--- /dev/null
+++ b/erpnext/patches/v7_1/add_field_for_task_dependent.py
@@ -0,0 +1,9 @@
+import frappe
+
+def execute():
+	frappe.reload_doctype('Task')
+	for t in frappe.get_all('Task', fields=['name']):
+		task = frappe.get_doc('Task', t.name)
+		task.update_depends_on()
+		if task.depends_on_tasks:
+			task.db_set('depends_on_tasks', task.depends_on_tasks, update_modified=False)
diff --git a/erpnext/patches/v7_1/fix_link_for_customer_from_lead.py b/erpnext/patches/v7_1/fix_link_for_customer_from_lead.py
new file mode 100644
index 0000000..cbb3ea4
--- /dev/null
+++ b/erpnext/patches/v7_1/fix_link_for_customer_from_lead.py
@@ -0,0 +1,6 @@
+import frappe
+
+def execute():
+	for c in frappe.db.sql('select name from tabCustomer where ifnull(lead_name,"")!=""'):
+		customer = frappe.get_doc('Customer', c[0])
+		customer.update_lead_status()
\ No newline at end of file
diff --git a/erpnext/patches/v7_1/rename_quality_inspection_field.py b/erpnext/patches/v7_1/rename_quality_inspection_field.py
new file mode 100644
index 0000000..3b5a7d9
--- /dev/null
+++ b/erpnext/patches/v7_1/rename_quality_inspection_field.py
@@ -0,0 +1,38 @@
+from __future__ import unicode_literals
+import frappe
+from frappe.model.utils.rename_field import *
+
+def execute():
+	for doctype in ("Purchase Receipt Item", "Delivery Note Item"):
+		frappe.reload_doctype(doctype)
+
+		table_columns = frappe.db.get_table_columns(doctype)
+		if "qa_no" in table_columns:
+			rename_field(doctype, "qa_no", "quality_inspection")
+
+	frappe.reload_doctype("Item")
+	rename_field("Item", "inspection_required", "inspection_required_before_purchase")
+
+	frappe.reload_doc('stock', 'doctype', 'quality_inspection')
+	frappe.db.sql("""
+		update
+			`tabQuality Inspection`
+		set
+			reference_type = 'Purchase Receipt', reference_name = purchase_receipt_no
+		where
+			ifnull(purchase_receipt_no, '') != '' and inspection_type = 'Incoming'
+	""")
+
+	frappe.db.sql("""
+		update
+			`tabQuality Inspection`
+		set
+			reference_type = 'Delivery Note', reference_name = delivery_note_no
+		where
+			ifnull(delivery_note_no, '') != '' and inspection_type = 'Outgoing'
+	""")
+
+	for old_fieldname in ["purchase_receipt_no", "delivery_note_no"]:
+		update_reports("Quality Inspection", old_fieldname, "reference_name")
+		update_users_report_view_settings("Quality Inspection", old_fieldname, "reference_name")
+		update_property_setters("Quality Inspection", old_fieldname, "reference_name")
diff --git a/erpnext/patches/v7_1/save_stock_settings.py b/erpnext/patches/v7_1/save_stock_settings.py
new file mode 100644
index 0000000..83c27dc
--- /dev/null
+++ b/erpnext/patches/v7_1/save_stock_settings.py
@@ -0,0 +1,7 @@
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+	stock_settings = frappe.get_doc('Stock Settings')
+	stock_settings.flags.ignore_mandatory = True
+	stock_settings.save()
diff --git a/erpnext/patches/v7_1/set_budget_against_as_cost_center.py b/erpnext/patches/v7_1/set_budget_against_as_cost_center.py
new file mode 100644
index 0000000..d077129
--- /dev/null
+++ b/erpnext/patches/v7_1/set_budget_against_as_cost_center.py
@@ -0,0 +1,10 @@
+import frappe
+
+def execute():
+	frappe.reload_doc("account", "doctype", "budget")
+	frappe.db.sql("""
+		update
+			`tabBudget`
+		set
+			budget_against = 'Cost Center'
+		""")
diff --git a/erpnext/patches/v7_1/set_prefered_contact_email.py b/erpnext/patches/v7_1/set_prefered_contact_email.py
new file mode 100644
index 0000000..3b68e22
--- /dev/null
+++ b/erpnext/patches/v7_1/set_prefered_contact_email.py
@@ -0,0 +1,17 @@
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+	frappe.reload_doctype('User')
+	for d in frappe.get_all("Employee"):
+		employee = frappe.get_doc("Employee", d.name)
+		if employee.company_email:
+			employee.prefered_contact_email = "Company Email"
+			employee.prefered_email = employee.company_email
+		elif employee.personal_email:
+			employee.prefered_contact_email = "Personal Email"
+			employee.prefered_email = employee.personal_email
+		elif employee.user_id:
+			employee.prefered_contact_email = "User ID"
+			employee.prefered_email = employee.user_id
+		employee.db_update()
diff --git a/erpnext/patches/v7_1/set_total_amount_currency_in_je.py b/erpnext/patches/v7_1/set_total_amount_currency_in_je.py
new file mode 100644
index 0000000..eb4a347
--- /dev/null
+++ b/erpnext/patches/v7_1/set_total_amount_currency_in_je.py
@@ -0,0 +1,23 @@
+import frappe
+from erpnext import get_default_currency
+
+def execute():
+	frappe.reload_doc("accounts", "doctype", "journal_entry")
+
+	frappe.db.sql(""" update `tabJournal Entry` set total_amount_currency = %s
+		where ifnull(multi_currency, 0) = 0
+		and (pay_to_recd_from is not null or pay_to_recd_from != "") """, get_default_currency())
+
+	for je in frappe.db.sql(""" select name from `tabJournal Entry` where multi_currency = 1
+		and (pay_to_recd_from is not null or pay_to_recd_from != "")""", as_dict=1):
+
+		doc = frappe.get_doc("Journal Entry", je.name)
+		for d in doc.get('accounts'):
+			if d.party_type and d.party:
+				total_amount_currency = d.account_currency
+
+			elif frappe.db.get_value("Account", d.account, "account_type") in ["Bank", "Cash"]:
+				total_amount_currency = d.account_currency
+
+		frappe.db.set_value("Journal Entry", je.name, "total_amount_currency",
+			total_amount_currency, update_modified=False)
diff --git a/erpnext/patches/v7_1/update_bom_base_currency.py b/erpnext/patches/v7_1/update_bom_base_currency.py
new file mode 100644
index 0000000..c8af033
--- /dev/null
+++ b/erpnext/patches/v7_1/update_bom_base_currency.py
@@ -0,0 +1,19 @@
+import frappe
+from erpnext import get_default_currency
+
+def execute():
+	frappe.reload_doc("manufacturing", "doctype", "bom")
+	frappe.reload_doc("manufacturing", "doctype", "bom_item")
+	frappe.reload_doc("manufacturing", "doctype", "bom_explosion_item")
+	frappe.reload_doc("manufacturing", "doctype", "bom_operation")
+	frappe.reload_doc("manufacturing", "doctype", "bom_scrap_item")
+
+	frappe.db.sql(""" update `tabBOM Operation` set base_hour_rate = hour_rate,
+		base_operating_cost = operating_cost """)
+
+	frappe.db.sql(""" update `tabBOM Item` set base_rate = rate, base_amount = amount """)
+	frappe.db.sql(""" update `tabBOM Scrap Item` set base_rate = rate, base_amount = amount """)
+
+	frappe.db.sql(""" update `tabBOM` set `tabBOM`.base_operating_cost = `tabBOM`.operating_cost, 
+		`tabBOM`.base_raw_material_cost = `tabBOM`.raw_material_cost,
+		`tabBOM`.currency = (select default_currency from `tabCompany` where name = `tabBOM`.company)""")
diff --git a/erpnext/patches/v7_1/update_invoice_status.py b/erpnext/patches/v7_1/update_invoice_status.py
new file mode 100644
index 0000000..851af80
--- /dev/null
+++ b/erpnext/patches/v7_1/update_invoice_status.py
@@ -0,0 +1,34 @@
+# 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():
+	frappe.reload_doc('accounts', 'doctype', 'sales_invoice')
+	frappe.reload_doc('accounts', 'doctype', 'purchase_invoice')
+
+	frappe.db.sql(""" 
+		update 
+			`tabPurchase Invoice` 
+		set 
+			status = (Case When outstanding_amount = 0 and docstatus = 1 and is_return = 0 then 'Paid'
+			when due_date < CURDATE() and outstanding_amount > 0 and docstatus =1 then 'Overdue'
+			when due_date >= CURDATE() and outstanding_amount > 0 and docstatus =1 then 'Unpaid'
+			when outstanding_amount < 0 and docstatus =1 then 'Debit Note Issued'
+			when is_return = 1 and docstatus =1 then 'Return'
+			when docstatus = 2 then 'Cancelled'
+			else 'Draft'
+		End)""")
+
+	frappe.db.sql(""" 
+		update 
+			`tabSales Invoice` 
+		set status = (Case When outstanding_amount = 0 and docstatus = 1 and is_return = 0 then 'Paid'
+			when due_date < CURDATE() and outstanding_amount > 0 and docstatus =1 then 'Overdue'
+			when due_date >= CURDATE() and outstanding_amount > 0 and docstatus =1 then 'Unpaid'
+			when outstanding_amount < 0 and docstatus =1 then 'Credit Note Issued'
+			when is_return = 1 and docstatus =1 then 'Return'
+			when docstatus = 2 then 'Cancelled'
+			else 'Draft'
+		End)""")
\ No newline at end of file
diff --git a/erpnext/patches/v7_1/update_lead_source.py b/erpnext/patches/v7_1/update_lead_source.py
index c7815c1..444159d 100644
--- a/erpnext/patches/v7_1/update_lead_source.py
+++ b/erpnext/patches/v7_1/update_lead_source.py
@@ -9,7 +9,7 @@
 	frappe.local.lang = frappe.db.get_default("lang") or 'en'
 
 	for s in default_lead_sources:
-		frappe.get_doc(dict(doctype='Lead Source', source_name=_(s))).insert()
+		insert_lead_source(_(s))
 
 	# get lead sources in existing forms (customized)
 	# and create a document if not created
@@ -17,9 +17,12 @@
 		sources = frappe.db.sql_list('select distinct source from `tab{0}`'.format(d))
 		for s in sources:
 			if s and s not in default_lead_sources:
-				frappe.get_doc(dict(doctype='Lead Source', source_name=s)).insert()
+				insert_lead_source(s)
 
 		# remove customization for source
 		for p in frappe.get_all('Property Setter', {'doc_type':d, 'field_name':'source', 'property':'options'}):
 			frappe.delete_doc('Property Setter', p.name)
 
+def insert_lead_source(s):
+	if not frappe.db.exists('Lead Source', s):
+		frappe.get_doc(dict(doctype='Lead Source', source_name=s)).insert()
diff --git a/erpnext/patches/v7_1/update_missing_salary_component_type.py b/erpnext/patches/v7_1/update_missing_salary_component_type.py
new file mode 100644
index 0000000..25624f5
--- /dev/null
+++ b/erpnext/patches/v7_1/update_missing_salary_component_type.py
@@ -0,0 +1,48 @@
+from __future__ import unicode_literals
+
+import frappe
+from frappe.utils import cstr
+
+'''
+Some components do not have type set, try and guess whether they turn up in
+earnings or deductions in existing salary slips
+'''
+
+def execute():
+	frappe.reload_doc("accounts", "doctype", "salary_component_account")
+	
+	for s in frappe.db.sql('''select name, type, salary_component_abbr from `tabSalary Component` 
+			where ifnull(type, "")="" or ifnull(salary_component_abbr, "") = ""''', as_dict=1):
+			
+		component = frappe.get_doc('Salary Component', s.name)
+
+		# guess
+		if not s.type:
+			guess = frappe.db.sql('''select
+				parentfield from `tabSalary Detail`
+				where salary_component=%s limit 1''', s.name)
+
+			if guess:
+				component.type = 'Earning' if guess[0][0]=='earnings' else 'Deduction'
+
+			else:
+				component.type = 'Deduction'
+				
+		if not s.salary_component_abbr:
+			abbr = ''.join([c[0] for c in component.salary_component.split()]).upper()
+			
+			abbr_count = frappe.db.sql("""
+				select 
+					count(name) 
+				from 
+					`tabSalary Component` 
+				where 
+					salary_component_abbr = %s or salary_component_abbr like %s
+				""", (abbr, abbr + "-%%"))
+				
+			if abbr_count and abbr_count[0][0] > 0:
+				abbr = abbr + "-" + cstr(abbr_count[0][0])
+				
+			component.salary_component_abbr = abbr
+			
+		component.save()
diff --git a/erpnext/patches/v7_1/update_portal_roles.py b/erpnext/patches/v7_1/update_portal_roles.py
new file mode 100644
index 0000000..506adb9
--- /dev/null
+++ b/erpnext/patches/v7_1/update_portal_roles.py
@@ -0,0 +1,21 @@
+import frappe
+
+def execute():
+	frappe.reload_doctype('Role')
+	frappe.reload_doctype('User')
+	for role_name in ('Customer', 'Supplier', 'Student'):
+		if frappe.db.exists('Role', role_name):
+			frappe.db.set_value('Role', role_name, 'desk_access', 0)
+		else:
+			frappe.get_doc(dict(doctype='Role', role_name=role_name, desk_access=0)).insert()
+
+
+	# set customer, supplier roles
+	for c in frappe.get_all('Contact', fields=['user'], filters={'ifnull(user, "")': ('!=', '')}):
+		user = frappe.get_doc('User', c.user)
+		user.set_default_roles()
+		user.flags.ignore_validate = True
+		user.flags.ignore_mandatory = True
+		user.save()
+
+
diff --git a/erpnext/portal/doctype/homepage/homepage.js b/erpnext/portal/doctype/homepage/homepage.js
index 100074f..0b07814 100644
--- a/erpnext/portal/doctype/homepage/homepage.js
+++ b/erpnext/portal/doctype/homepage/homepage.js
@@ -2,6 +2,14 @@
 // For license information, please see license.txt
 
 frappe.ui.form.on('Homepage', {
+	setup: function(frm) {
+		frm.fields_dict["products"].grid.get_field("item_code").get_query = function(){
+			return {
+				filters: {'show_in_website': 1}
+			}
+		}
+	},
+
 	refresh: function(frm) {
 
 	},
@@ -35,5 +43,12 @@
 				}
 			});
 		}
+	},
+
+	view: function(frm, cdt, cdn){
+		var child= locals[cdt][cdn]
+		if(child.item_code && frm.doc.products_url){
+			window.location.href = frm.doc.products_url + '/' + encodeURIComponent(child.item_code);
+		}
 	}
 });
diff --git a/erpnext/projects/doctype/activity_cost/activity_cost.json b/erpnext/projects/doctype/activity_cost/activity_cost.json
index 00ca43f..9d812dd 100644
--- a/erpnext/projects/doctype/activity_cost/activity_cost.json
+++ b/erpnext/projects/doctype/activity_cost/activity_cost.json
@@ -3,22 +3,28 @@
  "allow_import": 1, 
  "allow_rename": 1, 
  "autoname": "AC-.#####", 
+ "beta": 0, 
  "creation": "2015-03-23 02:00:21.861546", 
  "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": "activity_type", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Activity Type", 
    "length": 0, 
    "no_copy": 0, 
@@ -26,7 +32,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": 1, 
    "search_index": 0, 
@@ -37,18 +45,23 @@
    "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, 
@@ -59,12 +72,15 @@
    "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": 0, 
+   "in_standard_filter": 1, 
    "label": "Employee", 
    "length": 0, 
    "no_copy": 0, 
@@ -72,7 +88,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, 
@@ -83,12 +101,15 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "employee_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Employee Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -96,7 +117,9 @@
    "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, 
@@ -107,18 +130,23 @@
    "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_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -129,21 +157,26 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "0", 
    "description": "per hour", 
    "fieldname": "billing_rate", 
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Billing Rate", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -154,18 +187,23 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_6", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -176,21 +214,26 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "0", 
    "description": "per hour", 
    "fieldname": "costing_rate", 
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Costing Rate", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -201,19 +244,24 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "title", 
    "fieldtype": "Data", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "title", 
    "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, 
@@ -223,13 +271,15 @@
  ], 
  "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": "2015-11-16 06:29:41.623039", 
+ "modified": "2016-11-07 05:46:58.605696", 
  "modified_by": "Administrator", 
  "module": "Projects", 
  "name": "Activity Cost", 
@@ -246,6 +296,7 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -257,9 +308,11 @@
    "write": 1
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
- "title_field": "title"
+ "title_field": "title", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/projects/doctype/activity_type/activity_type.json b/erpnext/projects/doctype/activity_type/activity_type.json
index 628f993..fb6d1b2 100644
--- a/erpnext/projects/doctype/activity_type/activity_type.json
+++ b/erpnext/projects/doctype/activity_type/activity_type.json
@@ -112,7 +112,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-flag", 
+ "icon": "fa fa-flag", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
diff --git a/erpnext/projects/doctype/dependent_task/dependent_task.json b/erpnext/projects/doctype/dependent_task/dependent_task.json
index 26179cc..18e6c0d 100644
--- a/erpnext/projects/doctype/dependent_task/dependent_task.json
+++ b/erpnext/projects/doctype/dependent_task/dependent_task.json
@@ -30,6 +30,7 @@
    "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, 
@@ -47,8 +48,8 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-07-11 03:27:59.535486", 
- "modified_by": "Administrator", 
+ "modified": "2016-10-26 17:37:25.638190", 
+ "modified_by": "rohitw1991@gmail.com", 
  "module": "Projects", 
  "name": "Dependent Task", 
  "name_case": "", 
diff --git a/erpnext/projects/doctype/project/project.js b/erpnext/projects/doctype/project/project.js
index ee2db46..5f48a93 100644
--- a/erpnext/projects/doctype/project/project.js
+++ b/erpnext/projects/doctype/project/project.js
@@ -43,9 +43,8 @@
 
 			if(frappe.model.can_read("Task")) {
 				frm.add_custom_button(__("Gantt Chart"), function() {
-					frappe.route_options = {"project": frm.doc.name,
-						"start": frm.doc.expected_start_date, "end": frm.doc.expected_end_date};
-					frappe.set_route("Gantt", "Task");
+					frappe.route_options = {"project": frm.doc.name};
+					frappe.set_route("List", "Task", "Gantt");
 				});
 			}
 
diff --git a/erpnext/projects/doctype/project/project.json b/erpnext/projects/doctype/project/project.json
index f094428..37ca968 100644
--- a/erpnext/projects/doctype/project/project.json
+++ b/erpnext/projects/doctype/project/project.json
@@ -3,16 +3,19 @@
  "allow_import": 1, 
  "allow_rename": 1, 
  "autoname": "field:project_name", 
+ "beta": 0, 
  "creation": "2013-03-07 11:55:07", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Setup", 
+ "editable_grid": 0, 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "", 
    "fieldname": "project_name", 
    "fieldtype": "Data", 
@@ -21,6 +24,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Project Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -29,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, 
@@ -39,6 +44,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "Open", 
    "fieldname": "status", 
    "fieldtype": "Select", 
@@ -47,6 +53,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Status", 
    "length": 0, 
    "no_copy": 1, 
@@ -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": 1, 
    "search_index": 1, 
@@ -67,6 +75,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "project_type", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -74,6 +83,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Project Type", 
    "length": 0, 
    "no_copy": 0, 
@@ -84,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, 
@@ -94,6 +105,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "is_active", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -101,6 +113,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Is Active", 
    "length": 0, 
    "no_copy": 0, 
@@ -111,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, 
@@ -121,6 +135,37 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
+   "default": "Task Completion", 
+   "fieldname": "percent_complete_method", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "% Complete Method", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Task Completion\nTask Progress\nTask Weight", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "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, 
@@ -128,6 +173,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -135,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, 
@@ -145,6 +192,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "priority", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -152,6 +200,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Priority", 
    "length": 0, 
    "no_copy": 0, 
@@ -162,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, 
@@ -172,6 +222,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "expected_start_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -179,6 +230,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Expected Start Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -188,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, 
@@ -198,6 +251,7 @@
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "expected_end_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -205,6 +259,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Expected End Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -214,6 +269,34 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "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": "percent_complete", 
+   "fieldtype": "Percent", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "% Completed", 
+   "length": 0, 
+   "no_copy": 1, 
+   "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, 
@@ -224,6 +307,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
+   "columns": 0, 
    "fieldname": "customer_details", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -231,15 +315,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer Details", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-user", 
+   "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, 
@@ -250,6 +336,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "customer", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -257,6 +344,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer", 
    "length": 0, 
    "no_copy": 0, 
@@ -267,6 +355,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, 
@@ -277,6 +366,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_14", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -284,6 +374,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -291,6 +382,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, 
@@ -301,6 +393,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "sales_order", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -308,6 +401,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Sales Order", 
    "length": 0, 
    "no_copy": 0, 
@@ -317,6 +411,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, 
@@ -327,6 +422,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
+   "columns": 0, 
    "fieldname": "users_section", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -334,6 +430,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Users", 
    "length": 0, 
    "no_copy": 0, 
@@ -342,6 +439,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -352,6 +450,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "Project will be accessible on the website to these users", 
    "fieldname": "users", 
    "fieldtype": "Table", 
@@ -360,6 +459,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Users", 
    "length": 0, 
    "no_copy": 0, 
@@ -369,6 +469,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, 
@@ -379,6 +480,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "sb_milestones", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -386,15 +488,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Tasks", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-flag", 
+   "options": "fa fa-flag", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -405,6 +509,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "tasks", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -412,6 +517,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Tasks", 
    "length": 0, 
    "no_copy": 0, 
@@ -421,30 +527,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": 1, 
-   "collapsible": 0, 
-   "fieldname": "percent_complete", 
-   "fieldtype": "Percent", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "% Tasks Completed", 
-   "length": 0, 
-   "no_copy": 1, 
-   "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, 
@@ -455,6 +538,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
+   "columns": 0, 
    "fieldname": "section_break0", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -462,15 +546,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Notes", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-list", 
+   "options": "fa fa-list", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -481,6 +567,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "notes", 
    "fieldtype": "Text Editor", 
    "hidden": 0, 
@@ -488,6 +575,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Notes", 
    "length": 0, 
    "no_copy": 0, 
@@ -497,6 +585,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, 
@@ -507,6 +596,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
+   "columns": 0, 
    "fieldname": "section_break_18", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -514,6 +604,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Start and End Dates", 
    "length": 0, 
    "no_copy": 0, 
@@ -522,6 +613,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,6 +624,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "actual_start_date", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -539,6 +632,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Actual Start Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -547,6 +641,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, 
@@ -557,6 +652,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "actual_time", 
    "fieldtype": "Float", 
    "hidden": 0, 
@@ -564,6 +660,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Actual Time (in Hours)", 
    "length": 0, 
    "no_copy": 0, 
@@ -572,6 +669,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, 
@@ -582,6 +680,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_20", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -589,6 +688,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -596,6 +696,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, 
@@ -606,6 +707,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "actual_end_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -613,6 +715,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Actual End Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -622,6 +725,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, 
@@ -632,6 +736,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
+   "columns": 0, 
    "fieldname": "project_details", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -639,15 +744,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Costing and Billing", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-money", 
+   "options": "fa fa-money", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -658,6 +765,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "estimated_costing", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -665,6 +773,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Estimated Cost", 
    "length": 0, 
    "no_copy": 0, 
@@ -675,6 +784,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, 
@@ -685,6 +795,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "", 
    "fieldname": "total_costing_amount", 
    "fieldtype": "Currency", 
@@ -693,6 +804,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Costing Amount (via Time Logs)", 
    "length": 0, 
    "no_copy": 0, 
@@ -701,6 +813,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, 
@@ -711,6 +824,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "", 
    "fieldname": "total_expense_claim", 
    "fieldtype": "Currency", 
@@ -719,6 +833,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Expense Claim (via Expense Claims)", 
    "length": 0, 
    "no_copy": 0, 
@@ -727,6 +842,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, 
@@ -737,6 +853,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "company", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -744,6 +861,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -752,6 +870,7 @@
    "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, 
@@ -762,6 +881,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "cost_center", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -769,6 +889,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Default Cost Center", 
    "length": 0, 
    "no_copy": 0, 
@@ -777,6 +898,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, 
@@ -787,6 +909,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_28", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -794,6 +917,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -801,6 +925,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, 
@@ -811,6 +936,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "", 
    "fieldname": "total_billing_amount", 
    "fieldtype": "Currency", 
@@ -819,6 +945,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Billing Amount (via Time Logs)", 
    "length": 0, 
    "no_copy": 0, 
@@ -827,6 +954,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, 
@@ -837,6 +965,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "total_purchase_cost", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -844,6 +973,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Purchase Cost (via Purchase Invoice)", 
    "length": 0, 
    "no_copy": 0, 
@@ -852,6 +982,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, 
@@ -862,6 +993,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
+   "columns": 0, 
    "fieldname": "margin", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -869,6 +1001,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Margin", 
    "length": 0, 
    "no_copy": 0, 
@@ -877,6 +1010,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, 
@@ -888,6 +1022,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "gross_margin", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -895,6 +1030,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Gross Margin", 
    "length": 0, 
    "no_copy": 0, 
@@ -905,6 +1041,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, 
@@ -915,6 +1052,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_37", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -922,6 +1060,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -929,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, 
@@ -939,6 +1079,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "per_gross_margin", 
    "fieldtype": "Percent", 
    "hidden": 0, 
@@ -946,6 +1087,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Gross Margin %", 
    "length": 0, 
    "no_copy": 0, 
@@ -956,6 +1098,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, 
@@ -965,15 +1108,16 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-puzzle-piece", 
+ "icon": "fa fa-puzzle-piece", 
  "idx": 29, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 4, 
- "modified": "2016-04-22 03:15:39.635420", 
+ "modified": "2016-11-07 05:55:56.179455", 
  "modified_by": "Administrator", 
  "module": "Projects", 
  "name": "Project", 
@@ -989,6 +1133,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1009,6 +1154,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 1, 
    "print": 0, 
    "read": 1, 
diff --git a/erpnext/projects/doctype/project/project.py b/erpnext/projects/doctype/project/project.py
index bdf3c3b..388f43e 100644
--- a/erpnext/projects/doctype/project/project.py
+++ b/erpnext/projects/doctype/project/project.py
@@ -36,7 +36,8 @@
 				"start_date": task.exp_start_date,
 				"end_date": task.exp_end_date,
 				"description": task.description,
-				"task_id": task.name
+				"task_id": task.name,
+				"task_weight": task.task_weight
 			})
 
 	def get_tasks(self):
@@ -44,6 +45,7 @@
 
 	def validate(self):
 		self.validate_dates()
+		self.validate_weights()
 		self.sync_tasks()
 		self.tasks = []
 		self.send_welcome_email()
@@ -52,6 +54,14 @@
 		if self.expected_start_date and self.expected_end_date:
 			if getdate(self.expected_end_date) < getdate(self.expected_start_date):
 				frappe.throw(_("Expected End Date can not be less than Expected Start Date"))
+				
+	def validate_weights(self):
+		sum = 0
+		for task in self.tasks:
+			if task.task_weight > 0:
+				sum = sum + task.task_weight
+		if sum > 0 and sum != 1:
+			frappe.throw(_("Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly"))
 
 	def sync_tasks(self):
 		"""sync tasks and remove table"""
@@ -64,13 +74,13 @@
 			else:
 				task = frappe.new_doc("Task")
 				task.project = self.name
-
 			task.update({
 				"subject": t.title,
 				"status": t.status,
 				"exp_start_date": t.start_date,
 				"exp_end_date": t.end_date,
 				"description": t.description,
+				"task_weight": t.task_weight
 			})
 
 			task.flags.ignore_links = True
@@ -93,13 +103,28 @@
 		self.save(ignore_permissions = True)
 
 	def update_percent_complete(self):
-		total = frappe.db.sql("""select count(*) from tabTask where project=%s""", self.name)[0][0]
-		if total:
-			completed = frappe.db.sql("""select count(*) from tabTask where
+		total = frappe.db.sql("""select count(name) from tabTask where project=%s""", self.name)[0][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]
-
 			self.percent_complete = flt(flt(completed) / total * 100, 2)
 
+		if (self.percent_complete_method == "Task Progress" and total > 0):
+			progress = frappe.db.sql("""select sum(progress) from tabTask where
+				project=%s""", self.name)[0][0]
+			self.percent_complete = flt(flt(progress) / total, 2)
+
+		if (self.percent_complete_method == "Task Weight" and total > 0):
+			weight_sum = frappe.db.sql("""select sum(task_weight) from tabTask where
+				project=%s""", self.name)[0][0]
+			if weight_sum == 1:
+				weighted_progress = frappe.db.sql("""select progress,task_weight from tabTask where
+					project=%s""", self.name,as_dict=1)
+				pct_complete=0
+				for row in weighted_progress:
+					pct_complete += row["progress"] * row["task_weight"]
+				self.percent_complete = flt(flt(pct_complete), 2)
+
 	def update_costing(self):
 		from_time_sheet = frappe.db.sql("""select
 			sum(costing_amount) as costing_amount,
diff --git a/erpnext/projects/doctype/project/project_dashboard.py b/erpnext/projects/doctype/project/project_dashboard.py
index b36df88..0ac7d6f 100644
--- a/erpnext/projects/doctype/project/project_dashboard.py
+++ b/erpnext/projects/doctype/project/project_dashboard.py
@@ -1,25 +1,26 @@
 from frappe import _
 
-data = {
-	'heatmap': True,
-	'heatmap_message': _('This is based on the Time Sheets created against this project'),
-	'fieldname': 'project',
-	'transactions': [
-		{
-			'label': _('Project'),
-			'items': ['Task', 'Timesheet', 'Expense Claim', 'Issue']
-		},
-		{
-			'label': _('Material'),
-			'items': ['Material Request', 'BOM', 'Stock Entry']
-		},
-		{
-			'label': _('Sales'),
-			'items': ['Sales Order', 'Delivery Note', 'Sales Invoice']
-		},
-		{
-			'label': _('Purchase'),
-			'items': ['Purchase Order', 'Purchase Receipt', 'Purchase Invoice']
-		},
-	]
-}
+def get_data():
+	return {
+		'heatmap': True,
+		'heatmap_message': _('This is based on the Time Sheets created against this project'),
+		'fieldname': 'project',
+		'transactions': [
+			{
+				'label': _('Project'),
+				'items': ['Task', 'Timesheet', 'Expense Claim', 'Issue']
+			},
+			{
+				'label': _('Material'),
+				'items': ['Material Request', 'BOM', 'Stock Entry']
+			},
+			{
+				'label': _('Sales'),
+				'items': ['Sales Order', 'Delivery Note', 'Sales Invoice']
+			},
+			{
+				'label': _('Purchase'),
+				'items': ['Purchase Order', 'Purchase Receipt', 'Purchase Invoice']
+			},
+		]
+	}
diff --git a/erpnext/projects/doctype/project_task/project_task.json b/erpnext/projects/doctype/project_task/project_task.json
index a0ef69d..85cabf0 100644
--- a/erpnext/projects/doctype/project_task/project_task.json
+++ b/erpnext/projects/doctype/project_task/project_task.json
@@ -9,6 +9,7 @@
  "doctype": "DocType", 
  "document_type": "Other", 
  "editable_grid": 1, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 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, 
@@ -58,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, 
@@ -85,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, 
@@ -110,6 +114,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,6 +141,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, 
@@ -163,6 +169,33 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "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": "task_weight", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Weight", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -188,6 +221,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, 
@@ -214,6 +248,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, 
@@ -241,6 +276,7 @@
    "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, 
@@ -258,8 +294,8 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-08-26 02:44:34.737837", 
- "modified_by": "Administrator", 
+ "modified": "2016-10-26 17:38:23.276609", 
+ "modified_by": "rohitw1991@gmail.com", 
  "module": "Projects", 
  "name": "Project Task", 
  "name_case": "", 
diff --git a/erpnext/projects/doctype/task/task.json b/erpnext/projects/doctype/task/task.json
index 94ec8a1..9cd2aa8 100644
--- a/erpnext/projects/doctype/task/task.json
+++ b/erpnext/projects/doctype/task/task.json
@@ -9,11 +9,13 @@
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Setup", 
+ "editable_grid": 0, 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "subject", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -21,6 +23,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Subject", 
    "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,7 @@
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "project", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -47,6 +52,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Project", 
    "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": 1, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -67,6 +74,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break0", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -74,6 +82,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
@@ -82,6 +91,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "50%", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -93,6 +103,7 @@
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "status", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -100,6 +111,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Status", 
    "length": 0, 
    "no_copy": 1, 
@@ -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, 
@@ -120,6 +133,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "priority", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -127,6 +141,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Priority", 
    "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": 1, 
@@ -147,6 +163,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_10", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -154,6 +171,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -161,6 +179,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 +190,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "exp_start_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -178,6 +198,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Expected Start Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -187,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, 
@@ -197,6 +219,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "0", 
    "description": "", 
    "fieldname": "expected_time", 
@@ -206,6 +229,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Expected Time (in hours)", 
    "length": 0, 
    "no_copy": 0, 
@@ -215,6 +239,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, 
@@ -225,6 +250,35 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "task_weight", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Weight", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_11", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -232,6 +286,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -239,6 +294,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, 
@@ -249,6 +305,7 @@
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "exp_end_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -256,6 +313,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Expected End Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -265,6 +323,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, 
@@ -275,21 +334,24 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "section_break0", 
-   "fieldtype": "Section Break", 
+   "columns": 0, 
+   "fieldname": "progress", 
+   "fieldtype": "Percent", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "% Progress", 
    "length": 0, 
    "no_copy": 0, 
-   "oldfieldtype": "Section Break", 
-   "options": "Simple", 
    "permlevel": 0, 
+   "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -300,6 +362,35 @@
    "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_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldtype": "Section Break", 
+   "options": "Simple", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "description", 
    "fieldtype": "Text Editor", 
    "hidden": 0, 
@@ -307,6 +398,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Details", 
    "length": 0, 
    "no_copy": 0, 
@@ -317,6 +409,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, 
@@ -328,6 +421,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -335,6 +429,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Depends On", 
    "length": 0, 
    "no_copy": 0, 
@@ -343,6 +438,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 +449,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "depends_on", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -360,6 +457,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "depends_on", 
    "length": 0, 
    "no_copy": 0, 
@@ -369,6 +467,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, 
@@ -379,6 +478,35 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "depends_on_tasks", 
+   "fieldtype": "Read Only", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "depends_on_tasks", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "description": "", 
    "fieldname": "actual", 
    "fieldtype": "Section Break", 
@@ -387,6 +515,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
@@ -396,6 +525,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "50%", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -407,6 +537,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "act_start_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -414,6 +545,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Actual Start Date (via Time Sheet)", 
    "length": 0, 
    "no_copy": 0, 
@@ -423,6 +555,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, 
@@ -433,6 +566,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "", 
    "description": "", 
    "fieldname": "actual_time", 
@@ -442,6 +576,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Actual Time (in hours)", 
    "length": 0, 
    "no_copy": 0, 
@@ -451,6 +586,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, 
@@ -461,6 +597,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_15", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -468,6 +605,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -475,6 +613,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, 
@@ -485,6 +624,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "act_end_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -492,6 +632,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Actual End Date (via Time Sheet)", 
    "length": 0, 
    "no_copy": 0, 
@@ -501,6 +642,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, 
@@ -511,6 +653,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_17", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -518,6 +661,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -525,6 +669,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, 
@@ -535,6 +680,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "total_costing_amount", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -542,6 +688,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Costing Amount (via Time Sheet)", 
    "length": 0, 
    "no_copy": 0, 
@@ -552,6 +699,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, 
@@ -562,6 +710,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "total_expense_claim", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -569,6 +718,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Expense Claim (via Expense Claim)", 
    "length": 0, 
    "no_copy": 0, 
@@ -578,6 +728,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, 
@@ -588,6 +739,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_20", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -595,6 +747,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -602,6 +755,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, 
@@ -612,6 +766,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "total_billing_amount", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -619,6 +774,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Billing Amount (via Time Sheet)", 
    "length": 0, 
    "no_copy": 0, 
@@ -627,6 +783,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, 
@@ -637,6 +794,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "more_details", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -644,6 +802,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
@@ -651,6 +810,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, 
@@ -661,6 +821,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.status == \"Closed\" || doc.status == \"Pending Review\"", 
    "fieldname": "review_date", 
    "fieldtype": "Date", 
@@ -669,6 +830,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Review Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -678,6 +840,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, 
@@ -688,6 +851,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.status == \"Closed\"", 
    "fieldname": "closing_date", 
    "fieldtype": "Date", 
@@ -696,6 +860,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Closing Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -705,6 +870,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, 
@@ -715,6 +881,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_22", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -722,12 +889,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, 
@@ -738,6 +907,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "company", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -745,6 +915,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -753,6 +924,7 @@
    "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, 
@@ -762,7 +934,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-check", 
+ "icon": "fa fa-check", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
@@ -772,7 +944,7 @@
  "istable": 0, 
  "max_attachments": 5, 
  "menu_index": 0, 
- "modified": "2016-06-20 17:31:00.798534", 
+ "modified": "2016-11-07 05:12:23.294476", 
  "modified_by": "Administrator", 
  "module": "Projects", 
  "name": "Task", 
@@ -788,6 +960,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
diff --git a/erpnext/projects/doctype/task/task.py b/erpnext/projects/doctype/task/task.py
index b918e3a..0ae2f8b 100644
--- a/erpnext/projects/doctype/task/task.py
+++ b/erpnext/projects/doctype/task/task.py
@@ -28,7 +28,9 @@
 
 	def validate(self):
 		self.validate_dates()
+		self.validate_progress()
 		self.validate_status()
+		self.update_depends_on()
 
 	def validate_dates(self):
 		if self.exp_start_date and self.exp_end_date and getdate(self.exp_start_date) > getdate(self.exp_end_date):
@@ -45,6 +47,16 @@
 
 			from frappe.desk.form.assign_to import clear
 			clear(self.doctype, self.name)
+			
+	def validate_progress(self):
+		if self.progress > 100:
+			frappe.throw(_("Progress % for a task cannot be more than 100."))
+
+	def update_depends_on(self):
+		depends_on_tasks = ""
+		for d in self.depends_on:
+			depends_on_tasks += d.task + ","
+		self.depends_on_tasks = depends_on_tasks
 
 	def on_update(self):
 		self.check_recursion()
@@ -121,9 +133,9 @@
 	data = frappe.db.sql("""select name, exp_start_date, exp_end_date,
 		subject, status, project from `tabTask`
 		where ((ifnull(exp_start_date, '0000-00-00')!= '0000-00-00') \
-				and (exp_start_date between %(start)s and %(end)s) \
-			or ((ifnull(exp_start_date, '0000-00-00')!= '0000-00-00') \
-				and exp_end_date between %(start)s and %(end)s))
+				and (exp_start_date <= %(end)s) \
+			or ((ifnull(exp_end_date, '0000-00-00')!= '0000-00-00') \
+				and exp_end_date >= %(start)s))
 		{conditions}""".format(conditions=conditions), {
 			"start": start,
 			"end": end
@@ -156,5 +168,3 @@
 		and exp_end_date < CURDATE()
 		and `status` not in ('Closed', 'Cancelled')""")
 		
-
-		
diff --git a/erpnext/projects/doctype/task/task_list.js b/erpnext/projects/doctype/task/task_list.js
index d24e1ac..4bfa781 100644
--- a/erpnext/projects/doctype/task/task_list.js
+++ b/erpnext/projects/doctype/task/task_list.js
@@ -1,5 +1,6 @@
 frappe.listview_settings['Task'] = {
-	add_fields: ["project", "status", "priority", "exp_start_date", "exp_end_date", "subject"],
+	add_fields: ["project", "status", "priority", "exp_start_date",
+		"exp_end_date", "subject", "progress", "depends_on_tasks"],
 	filters: [["status", "=", "Open"]],
 	onload: function(listview) {
 		var method = "erpnext.projects.doctype.task.task.set_multiple_status";
diff --git a/erpnext/projects/doctype/timesheet/test_timesheet.py b/erpnext/projects/doctype/timesheet/test_timesheet.py
index 369be6d..11d0b1c 100644
--- a/erpnext/projects/doctype/timesheet/test_timesheet.py
+++ b/erpnext/projects/doctype/timesheet/test_timesheet.py
@@ -6,7 +6,8 @@
 import frappe
 import unittest
 import datetime
-from frappe.utils import now_datetime, nowdate
+from frappe.utils.make_random import get_random
+from frappe.utils import now_datetime, nowdate, add_days
 from erpnext.projects.doctype.timesheet.timesheet import OverlapError
 from erpnext.projects.doctype.timesheet.timesheet import make_salary_slip, make_sales_invoice
 from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
@@ -30,7 +31,7 @@
 
 		self.assertEquals(salary_slip.total_working_hours, 2)
 		self.assertEquals(salary_slip.hour_rate, 50)
-		self.assertEquals(salary_slip.net_pay, 50)
+		self.assertEquals(salary_slip.net_pay, 150)
 		self.assertEquals(salary_slip.timesheets[0].time_sheet, timesheet.name)
 		self.assertEquals(salary_slip.timesheets[0].working_hours, 2)
 		
@@ -75,10 +76,11 @@
 		salary_structure = frappe.new_doc("Salary Structure")
 		salary_structure.name = "Timesheet Salary Structure Test"
 		salary_structure.salary_slip_based_on_timesheet = 1
-		salary_structure.from_date = nowdate()
+		salary_structure.from_date = add_days(nowdate(), -30)
 		salary_structure.salary_component = "Basic"
 		salary_structure.hour_rate = 50.0
-		salary_structure.company= "_Test Company"
+		salary_structure.company = "_Test Company"
+		salary_structure.payment_account = get_random("Account")
 
 		salary_structure.set('employees', [])
 		salary_structure.set('earnings', [])
diff --git a/erpnext/projects/doctype/timesheet/timesheet.js b/erpnext/projects/doctype/timesheet/timesheet.js
index 7d0e71a..93f8b68 100644
--- a/erpnext/projects/doctype/timesheet/timesheet.js
+++ b/erpnext/projects/doctype/timesheet/timesheet.js
@@ -41,12 +41,12 @@
 		if(frm.doc.docstatus==1) {
 			if(frm.doc.per_billed < 100){
 				frm.add_custom_button(__("Make Sales Invoice"), function() { frm.trigger("make_invoice") },
-					"icon-file-alt");
+					"fa fa-file-alt");
 			}
 
 			if(!frm.doc.salary_slip && frm.doc.employee){
 				frm.add_custom_button(__("Make Salary Slip"), function() { frm.trigger("make_salary_slip") },
-					"icon-file-alt");
+					"fa fa-file-alt");
 			}
 		}
 
diff --git a/erpnext/projects/doctype/timesheet/timesheet.json b/erpnext/projects/doctype/timesheet/timesheet.json
index 168bc63..8762a23 100644
--- a/erpnext/projects/doctype/timesheet/timesheet.json
+++ b/erpnext/projects/doctype/timesheet/timesheet.json
@@ -6,7 +6,7 @@
  "beta": 0, 
  "creation": "2013-02-28 17:57:33", 
  "custom": 0, 
- "description": "Batch Time Logs for Billing.", 
+ "description": "", 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Document", 
@@ -24,6 +24,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Series", 
    "length": 0, 
    "no_copy": 0, 
@@ -32,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, 
@@ -50,6 +52,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -59,6 +62,7 @@
    "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, 
@@ -79,6 +83,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Sales Invoice", 
    "length": 0, 
    "no_copy": 1, 
@@ -87,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, 
@@ -105,12 +111,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, 
@@ -130,6 +138,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Salary Slip", 
    "length": 0, 
    "no_copy": 1, 
@@ -139,6 +148,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, 
@@ -158,6 +168,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Status", 
    "length": 0, 
    "no_copy": 1, 
@@ -166,6 +177,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, 
@@ -186,6 +198,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Employee Detail", 
    "length": 0, 
    "no_copy": 0, 
@@ -194,6 +207,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 +220,7 @@
    "collapsible": 0, 
    "columns": 0, 
    "depends_on": "", 
-   "description": "List of employee which has \"Salary Slip Based on Timesheet\" is enabled in salary structure.", 
+   "description": "", 
    "fieldname": "employee", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -214,6 +228,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Employee", 
    "length": 0, 
    "no_copy": 0, 
@@ -223,6 +238,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,6 +258,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Employee Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -251,6 +268,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, 
@@ -269,6 +287,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "User", 
    "length": 0, 
    "no_copy": 0, 
@@ -278,6 +297,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, 
@@ -296,6 +316,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -303,6 +324,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, 
@@ -321,6 +343,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Start Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -329,6 +352,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, 
@@ -347,6 +371,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "End Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -355,6 +380,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, 
@@ -375,6 +401,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Production Detail", 
    "length": 0, 
    "no_copy": 0, 
@@ -383,6 +410,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, 
@@ -401,6 +429,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Production Order", 
    "length": 0, 
    "no_copy": 1, 
@@ -410,6 +439,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, 
@@ -428,12 +458,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, 
@@ -452,6 +484,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Time Sheets", 
    "length": 0, 
    "no_copy": 0, 
@@ -460,6 +493,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, 
@@ -478,6 +512,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -485,6 +520,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, 
@@ -505,6 +541,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Total Working Hours", 
    "length": 0, 
    "no_copy": 0, 
@@ -512,6 +549,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, 
@@ -530,6 +568,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Billing Details", 
    "length": 0, 
    "no_copy": 0, 
@@ -538,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, 
@@ -556,6 +596,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Billable Hours", 
    "length": 0, 
    "no_copy": 0, 
@@ -564,6 +605,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, 
@@ -582,6 +624,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Billed Hours", 
    "length": 0, 
    "no_copy": 0, 
@@ -590,6 +633,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, 
@@ -608,6 +652,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Costing Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -616,6 +661,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, 
@@ -634,6 +680,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -641,6 +688,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, 
@@ -662,6 +710,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Billable Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -670,6 +719,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,6 +738,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Billed Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -696,6 +747,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, 
@@ -714,6 +766,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "% Amount Billed", 
    "length": 0, 
    "no_copy": 1, 
@@ -722,6 +775,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, 
@@ -740,6 +794,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -747,6 +802,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, 
@@ -765,6 +821,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Note", 
    "length": 0, 
    "no_copy": 0, 
@@ -773,6 +830,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,6 +849,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amended From", 
    "length": 0, 
    "no_copy": 1, 
@@ -799,6 +858,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, 
@@ -808,7 +868,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-time", 
+ "icon": "fa fa-time", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
@@ -817,7 +877,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-09-12 13:19:22.298036", 
+ "modified": "2016-11-23 17:35:51.194690", 
  "modified_by": "Administrator", 
  "module": "Projects", 
  "name": "Timesheet", 
@@ -833,6 +893,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -853,6 +914,7 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -873,6 +935,7 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -884,46 +947,6 @@
    "write": 1
   }, 
   {
-   "amend": 1, 
-   "apply_user_permissions": 0, 
-   "cancel": 1, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Accounts User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 1, 
-   "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": "Accounts User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }, 
-  {
    "amend": 0, 
    "apply_user_permissions": 0, 
    "cancel": 0, 
@@ -933,6 +956,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -942,6 +966,48 @@
    "share": 0, 
    "submit": 0, 
    "write": 1
+  }, 
+  {
+   "amend": 1, 
+   "apply_user_permissions": 0, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "is_custom": 0, 
+   "permlevel": 0, 
+   "print": 0, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Accounts User", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 1, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 0, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "is_custom": 0, 
+   "permlevel": 1, 
+   "print": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Accounts User", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
+   "write": 1
   }
  ], 
  "quick_entry": 0, 
diff --git a/erpnext/projects/doctype/timesheet/timesheet.py b/erpnext/projects/doctype/timesheet/timesheet.py
index 3b8f939..48d3e00 100644
--- a/erpnext/projects/doctype/timesheet/timesheet.py
+++ b/erpnext/projects/doctype/timesheet/timesheet.py
@@ -28,6 +28,7 @@
 		self.update_cost()
 		self.calculate_total_amounts()
 		self.calculate_percentage_billed()
+		self.set_dates()
 
 	def set_employee_name(self):
 		if self.employee and not self.employee_name:
@@ -78,17 +79,14 @@
 			self.status = "Completed"
 
 	def set_dates(self):
-		if self.docstatus < 2:
-			start_date = min([d.from_time for d in self.time_logs])
-			end_date = max([d.to_time for d in self.time_logs])
+		if self.docstatus < 2 and self.time_logs:
+			start_date = min([getdate(d.from_time) for d in self.time_logs])
+			end_date = max([getdate(d.to_time) for d in self.time_logs])
 
 			if start_date and end_date:
 				self.start_date = getdate(start_date)
 				self.end_date = getdate(end_date)
 
-	def before_submit(self):
-		self.set_dates()
-
 	def before_cancel(self):
 		self.set_status()
 
@@ -163,7 +161,7 @@
 
 	def validate_dates(self):
 		for data in self.time_logs:
-			if time_diff_in_hours(data.to_time, data.from_time) < 0:
+			if data.from_time and data.to_time and time_diff_in_hours(data.to_time, data.from_time) < 0:
 				frappe.throw(_("To date cannot be before from date"))
 
 	def validate_time_logs(self):
@@ -322,18 +320,7 @@
 @frappe.whitelist()
 def make_salary_slip(source_name, target_doc=None):
 	target = frappe.new_doc("Salary Slip")
-	set_missing_values(source_name, target)
-	
-	target.append("timesheets", get_mapped_doc("Timesheet", source_name, {
-		"Timesheet": {
-			"doctype": "Salary Slip Timesheet",
-			"field_map": {
-				"total_hours": "working_hours",
-				"name": "time_sheet"
-			},
-		}
-	}))
-	
+	set_missing_values(source_name, target)	
 	target.run_method("get_emp_and_leave_details")
 
 	return target
@@ -345,6 +332,7 @@
 	target.salary_slip_based_on_timesheet = 1
 	target.start_date = doc.start_date
 	target.end_date = doc.end_date
+	target.posting_date = doc.modified
 
 @frappe.whitelist()
 def get_activity_cost(employee=None, activity_type=None):
@@ -368,11 +356,11 @@
 	conditions = get_conditions(filters)
 	return frappe.db.sql("""select `tabTimesheet Detail`.name as name, 
 			`tabTimesheet Detail`.docstatus as status, `tabTimesheet Detail`.parent as parent,
-			from_time, hours, activity_type, project, to_time 
+			from_time as start_date, hours, activity_type, project, to_time as end_date
 		from `tabTimesheet Detail`, `tabTimesheet` 
 		where `tabTimesheet Detail`.parent = `tabTimesheet`.name 
 			and `tabTimesheet`.docstatus < 2 
-			and (from_time between %(start)s and %(end)s) {conditions} {match_cond}
+			and (from_time <= %(end)s and to_time >= %(start)s) {conditions} {match_cond}
 		""".format(conditions=conditions, match_cond = get_match_cond('Timesheet')), 
 		{
 			"start": start,
diff --git a/erpnext/projects/doctype/timesheet/timesheet_calendar.js b/erpnext/projects/doctype/timesheet/timesheet_calendar.js
index a41ba38..b22cd09 100644
--- a/erpnext/projects/doctype/timesheet/timesheet_calendar.js
+++ b/erpnext/projects/doctype/timesheet/timesheet_calendar.js
@@ -1,10 +1,10 @@
 frappe.views.calendar["Timesheet"] = {
 	field_map: {
-		"start": "from_time",
-		"end": "to_time",
+		"start": "start_date",
+		"end": "end_date",
 		"name": "parent",
-		"id": "parent",
-		"title": "activity_type",
+		"id": "name",
+		"title": "name",
 		"allDay": "allDay",
 		"child_name": "name"
 	},
@@ -29,4 +29,4 @@
 		}
 	],
 	get_events_method: "erpnext.projects.doctype.timesheet.timesheet.get_events"
-}
\ No newline at end of file
+}
diff --git a/erpnext/projects/doctype/timesheet/timesheet_list.js b/erpnext/projects/doctype/timesheet/timesheet_list.js
index c538fa1..1b200f8 100644
--- a/erpnext/projects/doctype/timesheet/timesheet_list.js
+++ b/erpnext/projects/doctype/timesheet/timesheet_list.js
@@ -1,5 +1,5 @@
 frappe.listview_settings['Timesheet'] = {
-	add_fields: ["status", "total_hours"],
+	add_fields: ["status", "total_hours", "start_date", "end_date"],
 	get_indicator: function(doc) {
 		if (doc.status== "Billed") {
 			return [__("Billed"), "green", "status,=," + "Billed"]
diff --git a/erpnext/projects/doctype/timesheet_detail/timesheet_detail.json b/erpnext/projects/doctype/timesheet_detail/timesheet_detail.json
index b1d3232..fdeb16c 100644
--- a/erpnext/projects/doctype/timesheet_detail/timesheet_detail.json
+++ b/erpnext/projects/doctype/timesheet_detail/timesheet_detail.json
@@ -14,7 +14,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "columns": 2, 
+   "columns": 0, 
    "fieldname": "activity_type", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -30,6 +30,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, 
@@ -56,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, 
@@ -81,6 +83,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, 
@@ -106,6 +109,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, 
@@ -132,6 +136,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,6 +162,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, 
@@ -184,6 +190,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, 
@@ -212,6 +219,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, 
@@ -237,6 +245,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, 
@@ -265,6 +274,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, 
@@ -292,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, 
@@ -317,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, 
@@ -344,6 +356,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,6 +382,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, 
@@ -397,6 +411,7 @@
    "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, 
@@ -422,6 +437,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, 
@@ -449,6 +465,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, 
@@ -474,6 +491,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,6 +519,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, 
@@ -527,6 +546,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, 
@@ -554,6 +574,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, 
@@ -583,6 +604,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, 
@@ -608,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, 
@@ -634,6 +657,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, 
@@ -662,6 +686,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,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, 
@@ -715,6 +741,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,7 +759,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-09-09 13:36:03.057513", 
+ "modified": "2016-11-03 16:01:10.519549", 
  "modified_by": "Administrator", 
  "module": "Projects", 
  "name": "Timesheet Detail", 
diff --git a/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py b/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py
index cc854a4..682fb2e 100644
--- a/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py
+++ b/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py
@@ -4,6 +4,7 @@
 from __future__ import unicode_literals
 import frappe
 from frappe import _
+from frappe.desk.reportview import build_match_conditions
 
 def execute(filters=None):
 	if not filters:
@@ -12,25 +13,36 @@
 		filters["from_time"] = "00:00:00"
 		filters["to_time"] = "24:00:00"
 
-	columns = [_("Timesheet") + ":Link/Timesheet:120", _("Employee") + "::150", _("Employee Name") + "::150", 
-		_("From Datetime") + "::140", _("To Datetime") + "::140", _("Hours") + "::70", 
-		_("Activity Type") + "::120", _("Task") + ":Link/Task:150",
-		_("Project") + ":Link/Project:120", _("Status") + "::70"]
-		
-	conditions = "ts.docstatus = 1"
-	if filters.get("from_date"):
-		conditions += " and tsd.from_time >= timestamp(%(from_date)s, %(from_time)s)"
-	if filters.get("to_date"):
-		conditions += " and tsd.to_time <= timestamp(%(to_date)s, %(to_time)s)"
-	
+	columns = get_column()
+	conditions = get_conditions(filters)
 	data = get_data(conditions, filters)
 
 	return columns, data
 
+def get_column():
+	return [_("Timesheet") + ":Link/Timesheet:120", _("Employee") + "::150", _("Employee Name") + "::150", 
+		_("From Datetime") + "::140", _("To Datetime") + "::140", _("Hours") + "::70", 
+		_("Activity Type") + "::120", _("Task") + ":Link/Task:150",
+		_("Project") + ":Link/Project:120", _("Status") + "::70"]
+
 def get_data(conditions, filters):
-	time_sheet = frappe.db.sql(""" select ts.name, ts.employee, ts.employee_name, 
-		tsd.from_time, tsd.to_time, tsd.hours,
-		tsd.activity_type, tsd.task, tsd.project, ts.status from `tabTimesheet Detail` tsd, 
-		`tabTimesheet` ts where ts.name = tsd.parent and %s order by ts.name"""%(conditions), filters, as_list=1)
+	time_sheet = frappe.db.sql(""" select `tabTimesheet`.name, `tabTimesheet`.employee, `tabTimesheet`.employee_name,
+		`tabTimesheet Detail`.from_time, `tabTimesheet Detail`.to_time, `tabTimesheet Detail`.hours,
+		`tabTimesheet Detail`.activity_type, `tabTimesheet Detail`.task, `tabTimesheet Detail`.project,
+		`tabTimesheet`.status from `tabTimesheet Detail`, `tabTimesheet` where
+		`tabTimesheet Detail`.parent = `tabTimesheet`.name and %s order by `tabTimesheet`.name"""%(conditions), filters, as_list=1)
 
 	return time_sheet
+
+def get_conditions(filters):
+	conditions = "`tabTimesheet`.docstatus = 1"
+	if filters.get("from_date"):
+		conditions += " and `tabTimesheet Detail`.from_time >= timestamp(%(from_date)s, %(from_time)s)"
+	if filters.get("to_date"):
+		conditions += " and `tabTimesheet Detail`.to_time <= timestamp(%(to_date)s, %(to_time)s)"
+
+	match_conditions = build_match_conditions("Timesheet")
+	if match_conditions:
+		conditions += " and %s" % match_conditions
+
+	return conditions
\ No newline at end of file
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 f880508..f6a994d 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
@@ -5,12 +5,12 @@
  "doctype": "Report", 
  "idx": 1, 
  "is_standard": "Yes", 
- "modified": "2014-06-03 07:18:17.229116", 
+ "modified": "2016-12-01 09:18:17.229116", 
  "modified_by": "Administrator", 
  "module": "Projects", 
  "name": "Project wise Stock Tracking", 
  "owner": "Administrator", 
  "ref_doctype": "Project", 
  "report_name": "Project wise Stock Tracking ", 
- "report_type": "Report Builder"
-}
\ No newline at end of file
+ "report_type": "Script Report"
+}
diff --git a/erpnext/public/css/website.css b/erpnext/public/css/website.css
index ab3beb0..6a1d311 100644
--- a/erpnext/public/css/website.css
+++ b/erpnext/public/css/website.css
@@ -2,6 +2,9 @@
   font-size: 18px;
   line-height: 200%;
 }
+.web-page-content {
+  margin-bottom: 30px;
+}
 .item-stock {
   margin-bottom: 10px !important;
 }
@@ -178,7 +181,6 @@
 }
 .cart-dropdown-container .cart-items-dropdown {
   max-height: 350px;
-  overflow: auto;
 }
 .cart-dropdown-container .cart-items-dropdown .cart-dropdown {
   display: block;
diff --git a/erpnext/public/js/conf.js b/erpnext/public/js/conf.js
index 89e5396..d256c08 100644
--- a/erpnext/public/js/conf.js
+++ b/erpnext/public/js/conf.js
@@ -14,7 +14,7 @@
 	$('.navbar-home').html('<img class="erpnext-icon" src="'+
 			frappe.urllib.get_base_url()+'/assets/erpnext/images/erp-icon.svg" />');
 
-	$('[data-link="docs"]').attr("href", "https://manual.erpnext.com")
+	$('[data-link="docs"]').attr("href", "https://frappe.github.io/erpnext/")
 	$('[data-link="issues"]').attr("href", "https://github.com/frappe/erpnext/issues")
 
 
diff --git a/erpnext/public/js/controllers/accounts.js b/erpnext/public/js/controllers/accounts.js
index 37ce5de..c1c3553 100644
--- a/erpnext/public/js/controllers/accounts.js
+++ b/erpnext/public/js/controllers/accounts.js
@@ -81,6 +81,14 @@
 	}
 })
 
+frappe.ui.form.on('Salary Structure', {
+	mode_of_payment: function(frm) {
+		get_payment_mode_account(frm, frm.doc.mode_of_payment, function(account){
+			frm.set_value("payment_account", account);
+		})
+	}
+})
+
 get_payment_mode_account = function(frm, mode_of_payment, callback){
 	return  frappe.call({
 		method: "erpnext.accounts.doctype.sales_invoice.sales_invoice.get_bank_cash_account",
diff --git a/erpnext/public/js/controllers/taxes_and_totals.js b/erpnext/public/js/controllers/taxes_and_totals.js
index 189b56f..4b14d08 100644
--- a/erpnext/public/js/controllers/taxes_and_totals.js
+++ b/erpnext/public/js/controllers/taxes_and_totals.js
@@ -4,21 +4,18 @@
 erpnext.taxes_and_totals = erpnext.payments.extend({
 	setup: function() {},
 	apply_pricing_rule_on_item: function(item){
-		if(!item.margin_type){
-			item.margin_rate_or_amount = 0.0;
-		}
-
 		if(item.margin_type == "Percentage"){
-			item.total_margin = item.price_list_rate + item.price_list_rate * ( item.margin_rate_or_amount / 100);
+			item.total_margin = flt(item.price_list_rate) 
+				+ flt(item.price_list_rate) * ( flt(item.margin_rate_or_amount) / 100);
 		}else{
-			item.total_margin = item.price_list_rate + item.margin_rate_or_amount;
+			item.total_margin = flt(item.price_list_rate) + flt(item.margin_rate_or_amount);
 		}
 
-		item.rate = flt(item.total_margin , 2);
+		item.rate = flt(item.total_margin , precision("rate", item));
 
 		if(item.discount_percentage){
 			discount_value = flt(item.total_margin) * flt(item.discount_percentage) / 100;
-			item.rate = flt((item.total_margin) - (discount_value), precision('rate'));
+			item.rate = flt((item.total_margin) - (discount_value), precision('rate', item));
 		}
 	},
 
diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index 34e0de1..18e16c2 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -79,11 +79,9 @@
 
 			frm.cscript.calculate_taxes_and_totals();
 		});
-
 	},
 	onload: function() {
 		var me = this;
-		//this.frm.show_print_first = true;
 		if(this.frm.doc.__islocal) {
 			var today = get_today(),
 				currency = frappe.defaults.get_user_default("currency");
@@ -136,7 +134,42 @@
 				}
 			});
 		}
+		
+		this.setup_quality_inspection();
+	},
 
+	setup_quality_inspection: function() {
+		if(!in_list(["Delivery Note", "Sales Invoice", "Purchase Receipt", "Purchase Invoice"], this.frm.doc.doctype)) {
+			return;
+		}
+		var me = this;
+		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;
+			return {
+				"inspection_type": inspection_type,
+				"reference_type": me.frm.doc.doctype,
+				"reference_name": me.frm.doc.name,
+				"item_code": row.doc.item_code,
+				"description": row.doc.description,
+				"item_serial_no": row.doc.serial_no ? row.doc.serial_no.split("\n")[0] : null,
+				"batch_no": row.doc.batch_no
+			}
+		}
+		
+		this.frm.set_query("quality_inspection", "items", function(doc, cdt, cdn) {
+			var d = locals[cdt][cdn];
+			return {
+				filters: {
+					docstatus: 1,
+					inspection_type: inspection_type,
+					item_code: d.item_code
+				}
+			}
+		});
 	},
 
 	onload_post_render: function() {
@@ -522,28 +555,20 @@
 
 	change_form_labels: function(company_currency) {
 		var me = this;
-		var field_label_map = {};
 
-		var setup_field_label_map = function(fields_list, currency) {
-			$.each(fields_list, function(i, fname) {
-				var docfield = frappe.meta.docfield_map[me.frm.doc.doctype][fname];
-				if(docfield) {
-					var label = __(docfield.label || "").replace(/\([^\)]*\)/g, "");
-					field_label_map[fname] = label.trim() + " (" + currency + ")";
-				}
-			});
-		};
-		setup_field_label_map(["base_total", "base_net_total", "base_total_taxes_and_charges",
+		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_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);
 
-		setup_field_label_map(["total", "net_total", "total_taxes_and_charges", "discount_amount",
+		this.frm.set_currency_labels(["total", "net_total", "total_taxes_and_charges", "discount_amount",
 			"grand_total", "taxes_and_charges_added", "taxes_and_charges_deducted",
-			"rounded_total", "in_words", "paid_amount", "write_off_amount"], this.frm.doc.currency);
+			"rounded_total", "in_words", "paid_amount", "write_off_amount", "operating_cost", "scrap_material_cost",
+			"raw_material_cost", "total_cost"], this.frm.doc.currency);
 
-		setup_field_label_map(["outstanding_amount", "total_advance"], this.frm.doc.party_account_currency);
+		this.frm.set_currency_labels(["outstanding_amount", "total_advance"], this.frm.doc.party_account_currency);
 
 		cur_frm.set_df_property("conversion_rate", "description", "1 " + this.frm.doc.currency
 			+ " = [?] " + company_currency)
@@ -557,17 +582,13 @@
 		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_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);
 
 		this.frm.toggle_display(["plc_conversion_rate", "price_list_currency"],
 			this.frm.doc.price_list_currency != company_currency);
 
-		// set labels
-		$.each(field_label_map, function(fname, label) {
-			me.frm.fields_dict[fname].set_label(label);
-		});
-
 		var show =cint(cur_frm.doc.discount_amount) ||
 				((cur_frm.doc.taxes || []).filter(function(d) {return d.included_in_print_rate===1}).length);
 
@@ -581,34 +602,43 @@
 
 	change_grid_labels: function(company_currency) {
 		var me = this;
-		var field_label_map = {};
 
-		var setup_field_label_map = function(fields_list, currency, parentfield) {
-			var grid_doctype = me.frm.fields_dict[parentfield].grid.doctype;
-			$.each(fields_list, function(i, fname) {
-				var docfield = frappe.meta.docfield_map[grid_doctype][fname];
-				if(docfield) {
-					var label = __(docfield.label || "").replace(/\([^\)]*\)/g, "");
-					field_label_map[grid_doctype + "-" + fname] =
-						label.trim() + " (" + __(currency) + ")";
-				}
+		this.frm.set_currency_labels(["base_rate", "base_net_rate", "base_price_list_rate", "base_amount", "base_net_amount"],
+			company_currency, "items");
+
+		this.frm.set_currency_labels(["rate", "net_rate", "price_list_rate", "amount", "net_amount"],
+			this.frm.doc.currency, "items");
+
+		if(this.frm.fields_dict["operations"]) {
+			this.frm.set_currency_labels(["operating_cost", "hour_rate"], this.frm.doc.currency, "operations");
+			this.frm.set_currency_labels(["base_operating_cost", "base_hour_rate"], company_currency, "operations");
+
+			var item_grid = this.frm.fields_dict["operations"].grid;
+			$.each(["base_operating_cost", "base_hour_rate"], function(i, fname) {
+				if(frappe.meta.get_docfield(item_grid.doctype, fname))
+					item_grid.set_column_disp(fname, me.frm.doc.currency != company_currency);
 			});
 		}
 
-		setup_field_label_map(["base_rate", "base_net_rate", "base_price_list_rate", "base_amount", "base_net_amount"],
-			company_currency, "items");
+		if(this.frm.fields_dict["scrap_items"]) {
+			this.frm.set_currency_labels(["rate", "amount"], this.frm.doc.currency, "scrap_items");
+			this.frm.set_currency_labels(["base_rate", "base_amount"], company_currency, "scrap_items");
 
-		setup_field_label_map(["rate", "net_rate", "price_list_rate", "amount", "net_amount"],
-			this.frm.doc.currency, "items");
+			var item_grid = this.frm.fields_dict["scrap_items"].grid;
+			$.each(["base_rate", "base_amount"], function(i, fname) {
+				if(frappe.meta.get_docfield(item_grid.doctype, fname))
+					item_grid.set_column_disp(fname, me.frm.doc.currency != company_currency);
+			});
+		}
 
 		if(this.frm.fields_dict["taxes"]) {
-			setup_field_label_map(["tax_amount", "total", "tax_amount_after_discount"], this.frm.doc.currency, "taxes");
+			this.frm.set_currency_labels(["tax_amount", "total", "tax_amount_after_discount"], this.frm.doc.currency, "taxes");
 
-			setup_field_label_map(["base_tax_amount", "base_total", "base_tax_amount_after_discount"], company_currency, "taxes");
+			this.frm.set_currency_labels(["base_tax_amount", "base_total", "base_tax_amount_after_discount"], company_currency, "taxes");
 		}
 
 		if(this.frm.fields_dict["advances"]) {
-			setup_field_label_map(["advance_amount", "allocated_amount"],
+			this.frm.set_currency_labels(["advance_amount", "allocated_amount"],
 				this.frm.doc.party_account_currency, "advances");
 		}
 
@@ -634,11 +664,6 @@
 
 		// set labels
 		var $wrapper = $(this.frm.wrapper);
-		$.each(field_label_map, function(fname, label) {
-			fname = fname.split("-");
-			var df = frappe.meta.get_docfield(fname[0], fname[1], me.frm.doc.name);
-			if(df) df.label = label;
-		});
 	},
 
 	recalculate: function() {
@@ -673,6 +698,7 @@
 					me._set_values_for_item_list(r.message);
 					if(item) me.set_gross_profit(item);
 					if(calculate_taxes_and_totals) me.calculate_taxes_and_totals();
+					if(me.frm.doc.apply_discount_on) me.frm.trigger("apply_discount_on")
 				}
 			}
 		});
@@ -714,7 +740,10 @@
 					"brand": d.brand,
 					"qty": d.qty,
 					"parenttype": d.parenttype,
-					"parent": d.parent
+					"parent": d.parent,
+					"pricing_rule": d.pricing_rule,
+					"warehouse": d.warehouse,
+					"serial_no": d.serial_no
 				});
 
 				// if doctype is Quotation Item / Sales Order Iten then add Margin Type and rate in item_list
@@ -983,7 +1012,7 @@
 
 	make_payment_entry: function() {
 		return frappe.call({
-			method: "erpnext.accounts.doctype.payment_entry.payment_entry.get_payment_entry",
+			method: cur_frm.cscript.get_method_for_payment(),
 			args: {
 				"dt": cur_frm.doc.doctype,
 				"dn": cur_frm.doc.name
@@ -994,5 +1023,19 @@
 				// cur_frm.refresh_fields()
 			}
 		});
-	}
+	},
+
+	get_method_for_payment: function(){
+		method = "erpnext.accounts.doctype.payment_entry.payment_entry.get_payment_entry"
+		if(cur_frm.doc.__onload && cur_frm.doc.__onload.make_payment_via_journal_entry){
+			if(in_list(['Sales Invoice', 'Purchase Invoice'],  cur_frm.doc.doctype)){
+				method = "erpnext.accounts.doctype.journal_entry.journal_entry.get_payment_entry_against_invoice"
+			}else {
+				method= "erpnext.accounts.doctype.journal_entry.journal_entry.get_payment_entry_against_order"
+			}
+		}
+
+		return method
+	},
+	
 });
\ 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 c21e1d5..a6ef2d6 100644
--- a/erpnext/public/js/pos/pos_bill_item.html
+++ b/erpnext/public/js/pos/pos_bill_item.html
@@ -2,18 +2,18 @@
     <div class="col-xs-5"><h6>{%= item_code || "" %}{%= item_name || "" %}</h6></div>
     <div class="col-xs-4">
         <div class="row pos-qty-row">
-            <div class="col-xs-2 text-center pos-qty-btn" data-action="decrease-qty"><i class="icon-minus-sign text-muted"></i></div>
+            <div class="col-xs-2 text-center pos-qty-btn" data-action="decrease-qty"><i class="fa fa-minus-sign text-muted"></i></div>
             <div class="col-xs-8">
 				<div>
                     <input type="text" value="{%= qty %}" class="form-control input-sm 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>                
+                    <span title="{%= __("In Stock") %}">{%= actual_qty || 0 %}<span>
                 </div>
                 {% } %}
             </div>
-            <div class="col-xs-2 text-center pos-qty-btn" data-action="increase-qty"><i class="icon-plus-sign text-muted"></i></div>
+            <div class="col-xs-2 text-center pos-qty-btn" data-action="increase-qty"><i class="fa fa-plus-sign text-muted"></i></div>
         </div>
     </div>
     <div class="col-xs-3 text-right">
diff --git a/erpnext/public/js/pos/pos_item.html b/erpnext/public/js/pos/pos_item.html
index aec36a7..b33076d 100644
--- a/erpnext/public/js/pos/pos_item.html
+++ b/erpnext/public/js/pos/pos_item.html
@@ -6,8 +6,8 @@
 			{% if (!item_image) { %}{{ abbr }}{% } %}
 		</div>
 		<div class="pos-item-text">
-			<h6 class="item-code text-ellipsis">{%= item_name ? (item_name + " (" + item_code + ")") : item_code %}</h6>
-			<div class="small text-ellipsis">{%= item_price %}</div>
+			<h6 class="item-code ellipsis">{%= item_name ? (item_name + " (" + item_code + ")") : item_code %}</h6>
+			<div class="small ellipsis">{%= item_price %}</div>
 		</div>
 	</div>
 </div>
\ No newline at end of file
diff --git a/erpnext/public/js/setup_wizard.js b/erpnext/public/js/setup_wizard.js
index 0013fdb..30323ec 100644
--- a/erpnext/public/js/setup_wizard.js
+++ b/erpnext/public/js/setup_wizard.js
@@ -34,7 +34,7 @@
 		org: {
 			domains: ["all"],
 			title: __("The Organization"),
-			icon: "icon-building",
+			icon: "fa fa-building",
 			fields: [
 				{fieldname:'company_name',
 					label: frappe.wiz.domain==='Education' ?
@@ -158,7 +158,7 @@
 
 		branding: {
 			domains: ["all"],
-			icon: "icon-bookmark",
+			icon: "fa fa-bookmark",
 			title: __("The Brand"),
 			help: __('Upload your letter head and logo. (you can edit them later).'),
 			fields: [
@@ -180,7 +180,7 @@
 
 		users: {
 			domains: ["all"],
-			icon: "icon-money",
+			icon: "fa fa-money",
 			title: __("Add Users"),
 			help: __("Add users to your organization, other than yourself"),
 			fields: [],
@@ -212,7 +212,7 @@
 
 		taxes: {
 			domains: ['manufacturing', 'services', 'retail', 'distribution'],
-			icon: "icon-money",
+			icon: "fa fa-money",
 			title: __("Add Taxes"),
 			help: __("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."),
 			"fields": [],
@@ -233,7 +233,7 @@
 
 		customers: {
 			domains: ['manufacturing', 'services', 'retail', 'distribution'],
-			icon: "icon-group",
+			icon: "fa fa-group",
 			title: __("Your Customers"),
 			help: __("List a few of your customers. They could be organizations or individuals."),
 			fields: [],
@@ -256,7 +256,7 @@
 
 		suppliers: {
 			domains: ['manufacturing', 'services', 'retail', 'distribution'],
-			icon: "icon-group",
+			icon: "fa fa-group",
 			title: __("Your Suppliers"),
 			help: __("List a few of your suppliers. They could be organizations or individuals."),
 			fields: [],
@@ -279,7 +279,7 @@
 
 		items: {
 			domains: ['manufacturing', 'services', 'retail', 'distribution'],
-			icon: "icon-barcode",
+			icon: "fa fa-barcode",
 			title: __("Your Products or Services"),
 			help: __("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."),
 			fields: [],
diff --git a/erpnext/public/js/shopping_cart.js b/erpnext/public/js/shopping_cart.js
index f5819a8..2a69deb 100644
--- a/erpnext/public/js/shopping_cart.js
+++ b/erpnext/public/js/shopping_cart.js
@@ -8,9 +8,9 @@
 	// update user
 	if(full_name) {
 		$('.navbar li[data-label="User"] a')
-			.html('<i class="icon-fixed-width icon-user"></i> ' + full_name);
+			.html('<i class="fa fa-fixed-width fa fa-user"></i> ' + full_name);
 	}
-	
+
 	// update login
 	shopping_cart.show_shoppingcart_dropdown();
 	shopping_cart.set_cart_count();
@@ -32,7 +32,7 @@
 			}
 		});
 	},
-	
+
 	update_cart: function(opts) {
 		if(!full_name || full_name==="Guest") {
 			if(localStorage) {
@@ -50,10 +50,10 @@
 				},
 				btn: opts.btn,
 				callback: function(r) {
-					shopping_cart.set_cart_count();	
+					shopping_cart.set_cart_count();
 					if (r.message.shopping_cart_menu) {
 						$('.shopping-cart-menu').html(r.message.shopping_cart_menu);
-					}					
+					}
 					if(opts.callback)
 						opts.callback(r);
 				}
@@ -63,11 +63,11 @@
 
 	set_cart_count: function() {
 		var cart_count = getCookie("cart_count");
-		
+
 		if(cart_count) {
-			$(".shopping-cart").toggle(true);	
-		}		
-		
+			$(".shopping-cart").toggleClass('hidden', false);
+		}
+
 		var $cart = $('.cart-icon');
 		var $badge = $cart.find("#cart-count");
 
@@ -88,7 +88,7 @@
 			$badge.remove();
 		}
 	},
-	
+
 	shopping_cart_update: function(item_code, newVal, cart_dropdown) {
 		frappe.freeze();
 		shopping_cart.update_cart({
@@ -103,20 +103,20 @@
 					$(".cart-tax-items").html(r.message.taxes);
 					if (cart_dropdown != true) {
 						$(".cart-icon").hide();
-					}					
+					}
 				}
 			},
 		});
 	},
-	
-	
+
+
 	bind_dropdown_cart_buttons: function() {
 		$(".cart-icon").on('click', '.number-spinner button', function () {
 			var btn = $(this),
 				input = btn.closest('.number-spinner').find('input'),
 				oldValue = input.val().trim(),
 				newVal = 0;
-			
+
 				if (btn.attr('data-dir') == 'up') {
 					newVal = parseInt(oldValue) + 1;
 				} else {
@@ -125,11 +125,11 @@
 					}
 			}
 			input.val(newVal);
-			var item_code = input.attr("data-item-code"); 
+			var item_code = input.attr("data-item-code");
 			shopping_cart.shopping_cart_update(item_code, newVal, true);
 			return false;
 		});
-		
+
 	},
-	
+
 });
diff --git a/erpnext/public/js/templates/item_selector.html b/erpnext/public/js/templates/item_selector.html
index 47da67c..89171f8 100644
--- a/erpnext/public/js/templates/item_selector.html
+++ b/erpnext/public/js/templates/item_selector.html
@@ -8,7 +8,7 @@
 			{% if(!item.image) { %}{{ item.abbr }}{% } %}
 		</div>
 		<div class="pos-item-text">
-			<h6 class="item-code text-ellipsis">{{ item.name }}</h6>
+			<h6 class="item-code ellipsis">{{ item.name }}</h6>
 		</div>
 	</div>
 </div>
diff --git a/erpnext/public/js/utils.js b/erpnext/public/js/utils.js
index 7330889..04f5f95 100644
--- a/erpnext/public/js/utils.js
+++ b/erpnext/public/js/utils.js
@@ -108,6 +108,17 @@
 		}
 	},
 
+	set_party_dashboard_indicators: function(frm) {
+		if(frm.doc.__onload && frm.doc.__onload.dashboard_info) {
+			var info = frm.doc.__onload.dashboard_info;
+			frm.dashboard.add_indicator(__('Annual Billing: {0}',
+				[format_currency(info.billing_this_year, info.currency)]), 'blue');
+			frm.dashboard.add_indicator(__('Total Unpaid: {0}',
+				[format_currency(info.total_unpaid, info.currency)]),
+				info.total_unpaid ? 'orange' : 'green');
+		}
+	},
+
 	copy_value_in_all_row: function(doc, dt, dn, table_fieldname, fieldname) {
 		var d = locals[dt][dn];
 		if(d[fieldname]){
@@ -132,8 +143,35 @@
 			if(!cur_frm.doc.items[0].item_code) {
 				cur_frm.doc.items = cur_frm.doc.items.splice(1);
 			}
+
+			// find the doctype of the items table
+			var items_doctype = frappe.meta.get_docfield(cur_frm.doctype, 'items').options;
+			
+			// find the link fieldname from items table for the given
+			// source_doctype
+			var link_fieldname = null;
+			frappe.get_meta(items_doctype).fields.forEach(function(d) { 
+				if(d.options===opts.source_doctype) link_fieldname = d.fieldname; });
+
+			// search in existing items if the source_name is already set
+			var already_set = false;
+
+			$.each(cur_frm.doc.items, function(i, d) {
+				if(d[link_fieldname]==opts.source_name) {
+					already_set = true;
+					return false;
+				}
+			});
+
+			if(already_set) {
+				frappe.msgprint(__("You have already selected items from {0} {1}", 
+					[opts.source_doctype, opts.source_name]));
+				return;
+			}
+
 		}
 
+
 		return frappe.call({
 			// Sometimes we hit the limit for URL length of a GET request
 			// as we send the full target_doc. Hence this is a POST request.
@@ -181,7 +219,7 @@
 
 frappe.form.link_formatters['Item'] = function(value, doc) {
 	if(doc && doc.item_name && doc.item_name !== value) {
-		return value + ': ' + doc.item_name;
+		return value? value + ': ' + doc.item_name: doc.item_name;
 	} else {
 		return value;
 	}
@@ -189,7 +227,7 @@
 
 frappe.form.link_formatters['Employee'] = function(value, doc) {
 	if(doc && doc.employee_name && doc.employee_name !== value) {
-		return value + ': ' + doc.employee_name;
+		return value? value + ': ' + doc.employee_name: doc.employee_name;
 	} else {
 		return value;
 	}
diff --git a/erpnext/public/less/website.less b/erpnext/public/less/website.less
index 37d69e0..b270b8b 100644
--- a/erpnext/public/less/website.less
+++ b/erpnext/public/less/website.less
@@ -8,6 +8,10 @@
 	line-height: 200%;
 }
 
+.web-page-content {
+	margin-bottom: 30px;
+}
+
 .item-stock {
 	margin-bottom: 10px !important;
 }
@@ -229,7 +233,6 @@
 
 	.cart-items-dropdown {
 		max-height: 350px;
-		overflow: auto;
 	}
 
 	.cart-items-dropdown .cart-dropdown {
diff --git a/erpnext/schools/api.py b/erpnext/schools/api.py
index 6011158..7cb02a3 100644
--- a/erpnext/schools/api.py
+++ b/erpnext/schools/api.py
@@ -30,33 +30,40 @@
 	return program_enrollment
 
 @frappe.whitelist()
-def check_attendance_records_exist(course_schedule):
-	"""Check if Attendance Records are made against the specified Course Schedule.
+def check_attendance_records_exist(course_schedule=None, student_batch=None, date=None):
+	"""Check if Attendance Records are made against the specified Course Schedule or Student Batch for given date.
 
 	:param course_schedule: Course Schedule.
+	:param student_batch: Student Batch.
+	:param date: Date.
 	"""
-	return frappe.get_list("Student Attendance", filters={"course_schedule": course_schedule})
+	if course_schedule:
+		return frappe.get_list("Student Attendance", filters={"course_schedule": course_schedule})
+	else:
+		return frappe.get_list("Student Attendance", filters={"student_batch": student_batch, "date": date})
 
 @frappe.whitelist()
-def mark_attendance(students_present, students_absent, course_schedule):
+def mark_attendance(students_present, students_absent, course_schedule=None, student_batch=None, date=None):
 	"""Creates Multiple Attendance Records.
 
 	:param students_present: Students Present JSON.
 	:param students_absent: Students Absent JSON.
 	:param course_schedule: Course Schedule.
+	:param student_batch: Student Batch.
+	:param date: Date.
 	"""
 	present = json.loads(students_present)
 	absent = json.loads(students_absent)
-
 	for d in present:
-		make_attendance_records(d["student"], d["student_name"], course_schedule, "Present")
+		make_attendance_records(d["student"], d["student_name"], "Present", course_schedule, student_batch, date)
 
 	for d in absent:
-		make_attendance_records(d["student"], d["student_name"], course_schedule, "Absent")
+		make_attendance_records(d["student"], d["student_name"], "Absent", course_schedule, student_batch, date)
 
+	frappe.db.commit()
 	frappe.msgprint(_("Attendance has been marked successfully."))
 
-def make_attendance_records(student, student_name, course_schedule, status):
+def make_attendance_records(student, student_name, status, course_schedule=None, student_batch=None, date=None):
 	"""Creates Attendance Record.
 
 	:param student: Student.
@@ -68,9 +75,19 @@
 	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()
-	frappe.db.commit()
+
+@frappe.whitelist()
+def get_student_batch_students(student_batch):
+	"""Returns List of student, student_name 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")
+	return students
 
 @frappe.whitelist()
 def get_student_group_students(student_group):
diff --git a/erpnext/schools/doctype/academic_term/academic_term.json b/erpnext/schools/doctype/academic_term/academic_term.json
index ca10ebf..e15d5d6 100644
--- a/erpnext/schools/doctype/academic_term/academic_term.json
+++ b/erpnext/schools/doctype/academic_term/academic_term.json
@@ -10,11 +10,13 @@
  "doctype": "DocType", 
  "document_type": "Setup", 
  "editable_grid": 0, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "academic_year", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -22,6 +24,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Academic Year", 
    "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, 
    "fieldname": "term_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -48,6 +53,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Term Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -56,6 +62,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 +73,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "term_start_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -73,6 +81,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Term Start Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -81,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": 1, 
@@ -91,6 +101,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "term_end_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -98,6 +109,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Term End Date", 
    "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": 1, 
@@ -116,6 +129,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "title", 
    "fieldtype": "Data", 
    "hidden": 1, 
@@ -123,6 +137,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Title", 
    "length": 0, 
    "no_copy": 0, 
@@ -131,6 +146,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 +164,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-08-27 23:02:03.565866", 
+ "modified": "2016-11-07 05:45:48.577744", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Academic Term", 
@@ -165,6 +181,7 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
diff --git a/erpnext/schools/doctype/academic_term/academic_term.py b/erpnext/schools/doctype/academic_term/academic_term.py
index 891feb8..4a1a941 100644
--- a/erpnext/schools/doctype/academic_term/academic_term.py
+++ b/erpnext/schools/doctype/academic_term/academic_term.py
@@ -4,35 +4,35 @@
 
 from __future__ import unicode_literals
 import frappe
-from frappe import msgprint, _
-from frappe.utils import get_datetime, get_datetime_str
+from frappe import _
+from frappe.utils import get_datetime
 from frappe.model.document import Document
 
 class AcademicTerm(Document):
     def autoname(self):
         self.name = self.academic_year + " ({})".format(self.term_name) if self.term_name else ""
-        
+
     def validate(self):
         #Check if entry with same academic_year and the term_name already exists
         validate_duplication(self)
         self.title = self.academic_year + " ({})".format(self.term_name) if self.term_name else ""
-        
+
         #Check that start of academic year is earlier than end of academic year
         if self.term_start_date and self.term_end_date and self.term_start_date > self.term_end_date:
             frappe.throw(_("The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again."))
-        
-        """Check that the start of the term is not before the start of the academic year and end of term is not after 
+
+        """Check that the start of the term is not before the start of the academic year and end of term is not after
             the end of the academic year"""
         year = frappe.get_doc("Academic Year",self.academic_year)
-        if self.term_start_date and get_datetime_str(year.year_start_date) and (self.term_start_date < get_datetime_str(year.year_start_date)):
+        if self.term_start_date and get_datetime(year.year_start_date) and (self.term_start_date < get_datetime(year.year_start_date)):
             frappe.throw(_("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.").format(self.academic_year))
-        
-        if self.term_end_date and get_datetime_str(year.year_end_date) and (self.term_end_date > get_datetime_str(year.year_end_date)):
+
+        if self.term_end_date and get_datetime(year.year_end_date) and (self.term_end_date > get_datetime(year.year_end_date)):
             frappe.throw(_("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.").format(self.academic_year))
 
 
 def validate_duplication(self):
-    term = frappe.db.sql("""select name from `tabAcademic Term` where academic_year= %s and term_name= %s 
+    term = frappe.db.sql("""select name from `tabAcademic Term` where academic_year= %s and term_name= %s
     and docstatus<2 and name != %s""", (self.academic_year, self.term_name, self.name))
     if term:
         frappe.throw(_("An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.").format(self.academic_year,self.term_name))
diff --git a/erpnext/schools/doctype/assessment/assessment.js b/erpnext/schools/doctype/assessment/assessment.js
index efadbd6..e842f41 100644
--- a/erpnext/schools/doctype/assessment/assessment.js
+++ b/erpnext/schools/doctype/assessment/assessment.js
@@ -6,46 +6,46 @@
 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", {
+    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);
-					}
-				}
-			});
-		}
-	}
+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.json b/erpnext/schools/doctype/assessment/assessment.json
index e978d08..845f2f6 100644
--- a/erpnext/schools/doctype/assessment/assessment.json
+++ b/erpnext/schools/doctype/assessment/assessment.json
@@ -10,11 +10,13 @@
  "doctype": "DocType", 
  "document_type": "Setup", 
  "editable_grid": 0, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "assessment_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -22,6 +24,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Assessment 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,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "assessment_code", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -47,6 +52,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Assessment Code", 
    "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": 1, 
    "search_index": 0, 
@@ -65,6 +72,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "student_group", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -72,6 +80,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Student Group", 
    "length": 0, 
    "no_copy": 0, 
@@ -81,8 +90,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
@@ -91,6 +101,36 @@
    "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, 
@@ -98,6 +138,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Grading Structure", 
    "length": 0, 
    "no_copy": 0, 
@@ -107,6 +148,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,6 +159,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "course", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -124,6 +167,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Course", 
    "length": 0, 
    "no_copy": 0, 
@@ -133,6 +177,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, 
@@ -143,6 +188,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_2", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -150,6 +196,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -157,6 +204,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,6 +215,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "assessment_group", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -174,6 +223,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Assessment Group", 
    "length": 0, 
    "no_copy": 0, 
@@ -183,6 +233,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,6 +244,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "supervisor", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -200,6 +252,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Supervisor", 
    "length": 0, 
    "no_copy": 0, 
@@ -209,6 +262,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, 
@@ -219,6 +273,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "supervisor_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -226,6 +281,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Supervisor Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -234,6 +290,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,6 +301,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "examiner", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -251,6 +309,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Examiner", 
    "length": 0, 
    "no_copy": 0, 
@@ -260,6 +319,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, 
@@ -270,6 +330,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "examiner_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -277,6 +338,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Examiner Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -285,6 +347,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, 
@@ -296,6 +359,7 @@
    "bold": 0, 
    "collapsible": 1, 
    "collapsible_depends_on": "", 
+   "columns": 0, 
    "depends_on": "", 
    "fieldname": "section_break_5", 
    "fieldtype": "Section Break", 
@@ -304,6 +368,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Schedule", 
    "length": 0, 
    "no_copy": 0, 
@@ -312,6 +377,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 +388,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "Today", 
    "fieldname": "schedule_date", 
    "fieldtype": "Date", 
@@ -330,6 +397,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Schedule Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -338,6 +406,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, 
@@ -348,6 +417,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "room", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -355,6 +425,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Room", 
    "length": 0, 
    "no_copy": 0, 
@@ -364,6 +435,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,6 +446,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_4", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -381,6 +454,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -388,6 +462,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, 
@@ -398,6 +473,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "from_time", 
    "fieldtype": "Time", 
    "hidden": 0, 
@@ -405,6 +481,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "From Time", 
    "length": 0, 
    "no_copy": 0, 
@@ -413,6 +490,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, 
@@ -423,6 +501,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "to_time", 
    "fieldtype": "Time", 
    "hidden": 0, 
@@ -430,6 +509,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "To Time", 
    "length": 0, 
    "no_copy": 0, 
@@ -438,6 +518,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, 
@@ -448,6 +529,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
+   "columns": 0, 
    "fieldname": "section_break_11", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -455,6 +537,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Results", 
    "length": 0, 
    "no_copy": 0, 
@@ -463,6 +546,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, 
@@ -473,6 +557,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "results", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -480,6 +565,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "results", 
    "length": 0, 
    "no_copy": 0, 
@@ -489,6 +575,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, 
@@ -499,6 +586,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "amended_from", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -506,6 +594,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amended From", 
    "length": 0, 
    "no_copy": 1, 
@@ -514,6 +603,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, 
@@ -532,7 +622,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-08-27 14:18:51.852078", 
+ "modified": "2016-11-16 13:05:54.953750", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Assessment", 
@@ -549,6 +639,7 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
diff --git a/erpnext/schools/doctype/assessment/assessment.py b/erpnext/schools/doctype/assessment/assessment.py
index de6a653..003b427 100644
--- a/erpnext/schools/doctype/assessment/assessment.py
+++ b/erpnext/schools/doctype/assessment/assessment.py
@@ -8,56 +8,66 @@
 from frappe import _
 
 class Assessment(Document):
-    def validate(self):
-        self.validate_overlap()
-    
-    def validate_overlap(self):
-        """Validates overlap for Student Group, Supervisor, Room"""
+	def validate(self):
+		self.validate_overlap()
 
-        from erpnext.schools.utils import validate_overlap_for
+	def validate_overlap(self):
+		"""Validates overlap for Student Group/Student Batch, Instructor, Room"""
+		
+		from erpnext.schools.utils import validate_overlap_for
 
-        validate_overlap_for(self, "Assessment", "student_group")
-        validate_overlap_for(self, "Course Schedule", "student_group" )
-        
-        if self.room:
-            validate_overlap_for(self, "Assessment", "room")
-            validate_overlap_for(self, "Course Schedule", "room")
+		#Validate overlapping course schedules.
+		if self.student_batch:
+			validate_overlap_for(self, "Course Schedule", "student_batch")
 
-        if self.supervisor:
-            validate_overlap_for(self, "Assessment", "supervisor")
-            validate_overlap_for(self, "Course Schedule", "instructor", self.supervisor)
+		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.instructor)
+
 
 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)
+	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"
-    }
+	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 ""
+	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
+	pass
\ No newline at end of file
diff --git a/erpnext/schools/doctype/course/course.json b/erpnext/schools/doctype/course/course.json
index c03246b..cd8362a 100644
--- a/erpnext/schools/doctype/course/course.json
+++ b/erpnext/schools/doctype/course/course.json
@@ -10,11 +10,13 @@
  "doctype": "DocType", 
  "document_type": "", 
  "editable_grid": 0, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "course_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -22,6 +24,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Course 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,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "course_code", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -47,6 +52,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Course Code", 
    "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": "column_break_3", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -72,6 +80,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -79,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, 
@@ -89,6 +99,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "course_abbreviation", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -96,6 +107,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Course Abbreviation", 
    "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": "department", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -121,6 +135,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Department", 
    "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": 0, 
    "search_index": 0, 
@@ -140,6 +156,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_6", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -147,6 +164,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 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, 
    "fieldname": "course_intro", 
    "fieldtype": "Text Editor", 
    "hidden": 0, 
@@ -171,6 +191,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Course Intro", 
    "length": 0, 
    "no_copy": 0, 
@@ -179,6 +200,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, 
@@ -197,7 +219,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-07-25 01:33:48.647068", 
+ "modified": "2016-11-07 05:28:55.089882", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Course", 
@@ -214,6 +236,7 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
diff --git a/erpnext/schools/doctype/course_schedule/course_schedule.js b/erpnext/schools/doctype/course_schedule/course_schedule.js
index 2defbd5..04a8cde 100644
--- a/erpnext/schools/doctype/course_schedule/course_schedule.js
+++ b/erpnext/schools/doctype/course_schedule/course_schedule.js
@@ -1,137 +1,134 @@
 frappe.provide("schools")
 
-frappe.ui.form.on("Course Schedule" ,{
-	onload: function(frm) {
-		if (frm.doc.from_datetime && frm.doc.to_datetime) {
-			var from_datetime = moment(frm.doc.from_datetime);
-			var to_datetime = moment(frm.doc.to_datetime);
-			frm.doc.schedule_date = from_datetime.format(moment.defaultFormat);
-			frm.doc.from_time = from_datetime.format("HH:mm:ss");
-			frm.doc.to_time = to_datetime.format("HH:mm:ss");
-		}
-	},
-	
-	refresh :function(frm) {
-		if(!frm.doc.__islocal) {
-			frappe.call({
-				method: "erpnext.schools.api.check_attendance_records_exist",
-				args: {
-					"course_schedule": frm.doc.name
-				},
-				callback: function(r) {
-					if(r.message) {
-						hide_field('attendance');
-						frm.events.view_attendance(frm)
-					}
-					else {
-						frappe.call({
-							method: "erpnext.schools.api.get_student_group_students",
-							args: {
-								"student_group": frm.doc.student_group
-							},
-							callback: function(r) {
-								if (r.message) {
-									frm.events.get_students(frm, r.message)
-								}
-							}
-						});
-					}
-				}
-			});
-		}
-		else {
-			hide_field('attendance');
-		}
-	},
-	
-	view_attendance: function(frm) {
-		hide_field('attendance');
-		frm.add_custom_button(__("View attendance"), function() {
-			frappe.route_options = {
-				course_schedule: frm.doc.name
-			}
-			frappe.set_route("List", "Student Attendance");
-		});
-	},
-	
-	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)
-	}
+frappe.ui.form.on("Course Schedule", {
+    onload: function(frm) {
+        if (frm.doc.from_datetime && frm.doc.to_datetime) {
+            var from_datetime = moment(frm.doc.from_datetime);
+            var to_datetime = moment(frm.doc.to_datetime);
+            frm.doc.schedule_date = from_datetime.format(moment.defaultFormat);
+            frm.doc.from_time = from_datetime.format("HH:mm:ss");
+            frm.doc.to_time = to_datetime.format("HH:mm:ss");
+        }
+    },
+
+    refresh: function(frm) {
+        if (!frm.doc.__islocal && frm.doc.student_group) {
+            frappe.call({
+                method: "erpnext.schools.api.check_attendance_records_exist",
+                args: {
+                    "course_schedule": frm.doc.name
+                },
+                callback: function(r) {
+                    if (r.message) {
+                        hide_field('attendance');
+                        frm.events.view_attendance(frm)
+                    } else {
+                        frappe.call({
+                            method: "erpnext.schools.api.get_student_group_students",
+                            args: {
+                                "student_group": frm.doc.student_group
+                            },
+                            callback: function(r) {
+                                if (r.message) {
+                                    frm.events.get_students(frm, r.message)
+                                }
+                            }
+                        });
+                    }
+                }
+            });
+        } else {
+            hide_field('attendance');
+        }
+    },
+
+    view_attendance: function(frm) {
+        hide_field('attendance');
+        frm.add_custom_button(__("View attendance"), function() {
+            frappe.route_options = {
+                course_schedule: frm.doc.name
+            }
+            frappe.set_route("List", "Student Attendance");
+        });
+    },
+
+    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;
-		
-		$(this.wrapper).empty();
-		var student_toolbar = $('<p>\
+    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>\
 			<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).is(":checked")) {
-					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).is(":checked")) {
+                        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).is(":checked")) {
-					check.checked = false;
-				}
-			});
-		});
-		
-		student_toolbar.find(".btn-mark-att")
-			.html(__('Mark Attendence'))
-			.on("click", function() {
-				var students_present = [];
-				var students_absent = [];
-				$(me.wrapper).find('input[type="checkbox"]').each(function(i, check) {
-					if($(check).is(":checked")) {
-						students_present.push(students[i]);
-					}
-					else {
-						students_absent.push(students[i]);
-					}
-				});
-				frappe.call({
-					method: "erpnext.schools.api.mark_attendance",
-					args: {
-						"students_present": students_present,
-						"students_absent": students_absent,
-						"course_schedule": frm.doc.name
-					},
-					callback: function(r) {
-						frm.events.view_attendance(frm)
-					}
-				});
-		});
+        student_toolbar.find(".btn-remove")
+            .html(__('Uncheck all'))
+            .on("click", function() {
+                $(me.wrapper).find('input[type="checkbox"]').each(function(i, check) {
+                    if ($(check).is(":checked")) {
+                        check.checked = false;
+                    }
+                });
+            });
 
-		
-		$.each(students, function(i, m) {
-			$(repl('<div class="col-sm-6">\
+        student_toolbar.find(".btn-mark-att")
+            .html(__('Mark Attendence'))
+            .on("click", function() {
+                var students_present = [];
+                var students_absent = [];
+                $(me.wrapper).find('input[type="checkbox"]').each(function(i, check) {
+                    if ($(check).is(":checked")) {
+                        students_present.push(students[i]);
+                    } else {
+                        students_absent.push(students[i]);
+                    }
+                });
+                frappe.call({
+                    method: "erpnext.schools.api.mark_attendance",
+                    args: {
+                        "students_present": students_present,
+                        "students_absent": students_absent,
+                        "course_schedule": frm.doc.name
+                    },
+                    callback: function(r) {
+                        frm.events.view_attendance(frm)
+                    }
+                });
+            });
+
+
+        $.each(students, function(i, m) {
+            $(repl('<div class="col-sm-6">\
 				<div class="checkbox">\
 				<label><input type="checkbox" class="students-check" student="%(student)s">\
 				%(student)s</label>\
-			</div></div>', {student: m.student_name})).appendTo(me.wrapper);
-		});
-	}
+			</div></div>', { student: m.student_name })).appendTo(me.wrapper);
+        });
+    }
 })
\ No newline at end of file
diff --git a/erpnext/schools/doctype/course_schedule/course_schedule.json b/erpnext/schools/doctype/course_schedule/course_schedule.json
index 308cf68..122285e 100644
--- a/erpnext/schools/doctype/course_schedule/course_schedule.json
+++ b/erpnext/schools/doctype/course_schedule/course_schedule.json
@@ -2,7 +2,7 @@
  "allow_copy": 0, 
  "allow_import": 1, 
  "allow_rename": 0, 
- "autoname": "SH.####", 
+ "autoname": "naming_series:", 
  "beta": 0, 
  "creation": "2015-09-09 16:34:04.960369", 
  "custom": 0, 
@@ -10,11 +10,42 @@
  "doctype": "DocType", 
  "document_type": "Document", 
  "editable_grid": 0, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "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": "student_group", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -22,6 +53,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Student Group", 
    "length": 0, 
    "no_copy": 0, 
@@ -31,8 +63,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,6 +74,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "instructor", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -48,6 +82,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Instructor", 
    "length": 0, 
    "no_copy": 0, 
@@ -57,6 +92,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, 
@@ -67,56 +103,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 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, 
-   "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": "course", 
-   "fieldtype": "Read Only", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Course", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "student_group.course", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 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": "instructor_name", 
    "fieldtype": "Read Only", 
    "hidden": 0, 
@@ -124,6 +111,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Instructor Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -133,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, 
@@ -143,13 +132,15 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "section_break_6", 
-   "fieldtype": "Section Break", 
+   "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, 
@@ -157,6 +148,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,6 +159,93 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
+   "default": "SH", 
+   "fieldname": "naming_series", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Naming Series", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "SH", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 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": 0, 
+   "label": "Course", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Course", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_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_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "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": "schedule_date", 
    "fieldtype": "Date", 
@@ -175,6 +254,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Schedule Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -183,6 +263,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,6 +274,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "room", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -200,6 +282,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Room", 
    "length": 0, 
    "no_copy": 0, 
@@ -209,6 +292,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, 
@@ -219,6 +303,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_9", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -226,6 +311,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -233,6 +319,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, 
@@ -243,6 +330,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "from_time", 
    "fieldtype": "Time", 
    "hidden": 0, 
@@ -250,6 +338,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "From Time", 
    "length": 0, 
    "no_copy": 0, 
@@ -258,6 +347,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, 
@@ -268,6 +358,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "to_time", 
    "fieldtype": "Time", 
    "hidden": 0, 
@@ -275,6 +366,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "To Time", 
    "length": 0, 
    "no_copy": 0, 
@@ -283,6 +375,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, 
@@ -293,6 +386,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
+   "columns": 0, 
    "fieldname": "attendance", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -300,6 +394,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Attendance", 
    "length": 0, 
    "no_copy": 0, 
@@ -308,6 +403,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,6 +414,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "students_html", 
    "fieldtype": "HTML", 
    "hidden": 0, 
@@ -325,6 +422,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Students HTML", 
    "length": 0, 
    "no_copy": 0, 
@@ -333,6 +431,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, 
@@ -343,6 +442,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "title", 
    "fieldtype": "Data", 
    "hidden": 1, 
@@ -350,6 +450,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Title", 
    "length": 0, 
    "no_copy": 0, 
@@ -358,6 +459,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, 
@@ -376,7 +478,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-07-25 01:25:04.593769", 
+ "modified": "2016-12-01 12:59:25.086606", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Course Schedule", 
@@ -388,11 +490,33 @@
    "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, 
diff --git a/erpnext/schools/doctype/course_schedule/course_schedule.py b/erpnext/schools/doctype/course_schedule/course_schedule.py
index 11f3894..ec30c62 100644
--- a/erpnext/schools/doctype/course_schedule/course_schedule.py
+++ b/erpnext/schools/doctype/course_schedule/course_schedule.py
@@ -4,34 +4,62 @@
 
 from __future__ import unicode_literals
 import frappe
+from frappe import _
 from frappe.model.document import Document
 
 class CourseSchedule(Document):
 	def validate(self):
 		self.instructor_name = frappe.db.get_value("Instructor", self.instructor, "instructor_name")
 		self.set_title()
+		self.validate_mandatory()
+		self.validate_course()
+		self.set_student_batch()
 		self.validate_date()
 		self.validate_overlap()
-		
+	
 	def set_title(self):
 		"""Set document Title"""
 		self.title = self.course + " by " + (self.instructor_name if self.instructor_name else self.instructor)
 
+	def validate_mandatory(self):
+		if not (self.student_batch or self.student_group):
+			frappe.throw(_("""Student Batch or Student Group is mandatory"""))
+	
+	def validate_course(self):
+		if self.student_group:
+			self.course= frappe.db.get_value("Student Group", self.student_group, "course")
+	
+	def set_student_batch(self):
+		if self.student_group:
+			self.student_batch = frappe.db.get_value("Student Group", self.student_group, "student_batch")
+	
 	def validate_date(self):
 		"""Validates if from_time is greater than to_time"""
 		if self.from_time > self.to_time:
-			frappe.throw("From Time cannot be greater than To Time.")
+			frappe.throw(_("From Time cannot be greater than To Time."))
 	
 	def validate_overlap(self):
-		"""Validates overlap for Student Group, Instructor, Room"""
+		"""Validates overlap for Student Group/Student Batch, Instructor, Room"""
 		
 		from erpnext.schools.utils import validate_overlap_for
 
-		validate_overlap_for(self, "Course Schedule", "student_group" )
+		#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_overlap_for(self, "Assessment", "student_group")
+		#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.instructor)
 
diff --git a/erpnext/schools/doctype/scheduling_tool/__init__.py b/erpnext/schools/doctype/course_scheduling_tool/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/scheduling_tool/__init__.py
rename to erpnext/schools/doctype/course_scheduling_tool/__init__.py
diff --git a/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js b/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js
new file mode 100644
index 0000000..ea62b8f
--- /dev/null
+++ b/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js
@@ -0,0 +1,21 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+cur_frm.add_fetch("student_group", "program", "program");
+cur_frm.add_fetch("student_group", "student_batch", "student_batch");
+cur_frm.add_fetch("student_group", "course", "course");
+cur_frm.add_fetch("student_group", "academic_year", "academic_year");
+cur_frm.add_fetch("student_group", "academic_term", "academic_term");
+
+frappe.ui.form.on("Course Scheduling Tool", {
+
+    refresh: function(frm) {
+        frm.disable_save();
+        frm.page.set_primary_action(__("Schedule Course"), function() {
+            frappe.call({
+                method: "schedule_course",
+                doc: frm.doc
+            })
+        });
+    }
+});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/scheduling_tool/scheduling_tool.json b/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.json
similarity index 82%
rename from erpnext/schools/doctype/scheduling_tool/scheduling_tool.json
rename to erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.json
index 41a7b94..a66960e 100644
--- a/erpnext/schools/doctype/scheduling_tool/scheduling_tool.json
+++ b/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.json
@@ -9,11 +9,42 @@
  "doctype": "DocType", 
  "document_type": "Setup", 
  "editable_grid": 0, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "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": "student_group", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -21,6 +52,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Student Group", 
    "length": 0, 
    "no_copy": 0, 
@@ -30,6 +62,36 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "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": 0, 
+   "label": "Course", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Course", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -40,6 +102,34 @@
    "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, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "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": "academic_year", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -47,6 +137,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Academic Year", 
    "length": 0, 
    "no_copy": 0, 
@@ -56,6 +147,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, 
@@ -66,6 +158,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "academic_term", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -73,6 +166,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Academic Term", 
    "length": 0, 
    "no_copy": 0, 
@@ -82,6 +176,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, 
@@ -92,30 +187,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": "program", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -123,6 +195,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Program", 
    "length": 0, 
    "no_copy": 0, 
@@ -132,6 +205,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, 
@@ -142,32 +216,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "course", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Course", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Course", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 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": "section_break_6", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -175,6 +224,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -182,6 +232,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -192,56 +243,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "room", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Room", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Room", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "column_break_9", 
-   "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": "instructor", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -249,6 +251,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Instructor", 
    "length": 0, 
    "no_copy": 0, 
@@ -258,6 +261,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, 
@@ -268,6 +272,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "instructor_name", 
    "fieldtype": "Read Only", 
    "hidden": 0, 
@@ -275,6 +280,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Instructor Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -284,6 +290,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, 
@@ -294,13 +301,15 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "section_break_7", 
-   "fieldtype": "Section Break", 
+   "columns": 0, 
+   "fieldname": "column_break_9", 
+   "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, 
@@ -308,6 +317,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -318,22 +328,25 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "default": "", 
-   "fieldname": "from_time", 
-   "fieldtype": "Time", 
+   "columns": 0, 
+   "fieldname": "room", 
+   "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "From Time", 
+   "in_standard_filter": 0, 
+   "label": "Room", 
    "length": 0, 
    "no_copy": 0, 
+   "options": "Room", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -344,6 +357,63 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_7", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "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": "from_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": "From Time", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "default": "", 
    "fieldname": "course_start_date", 
    "fieldtype": "Date", 
@@ -352,6 +422,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Course Start Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -361,6 +432,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, 
@@ -371,6 +443,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "day", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -378,6 +451,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Day", 
    "length": 0, 
    "no_copy": 0, 
@@ -387,6 +461,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, 
@@ -397,6 +472,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "rechedule", 
    "fieldtype": "Check", 
    "hidden": 0, 
@@ -404,6 +480,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Rechedule", 
    "length": 0, 
    "no_copy": 0, 
@@ -412,6 +489,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, 
@@ -422,6 +500,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_15", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -429,6 +508,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -436,6 +516,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, 
@@ -446,6 +527,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "to_time", 
    "fieldtype": "Time", 
    "hidden": 0, 
@@ -453,6 +535,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "To TIme", 
    "length": 0, 
    "no_copy": 0, 
@@ -461,6 +544,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, 
@@ -471,6 +555,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "", 
    "fieldname": "course_end_date", 
    "fieldtype": "Date", 
@@ -479,6 +564,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Course End Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -487,6 +573,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, 
@@ -505,10 +592,10 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-07-25 01:24:48.220756", 
+ "modified": "2016-11-21 16:58:29.295922", 
  "modified_by": "Administrator", 
  "module": "Schools", 
- "name": "Scheduling Tool", 
+ "name": "Course Scheduling Tool", 
  "name_case": "", 
  "owner": "Administrator", 
  "permissions": [
@@ -522,6 +609,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
diff --git a/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py b/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py
similarity index 84%
rename from erpnext/schools/doctype/scheduling_tool/scheduling_tool.py
rename to erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py
index 4a62a74..86fefe2 100644
--- a/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py
+++ b/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (c) 2015, Frappe Technologies and contributors
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
 # For license information, please see license.txt
 
 from __future__ import unicode_literals
@@ -10,7 +10,7 @@
 from frappe.utils import add_days, getdate
 from erpnext.schools.utils import OverlapError
 
-class SchedulingTool(Document):
+class CourseSchedulingTool(Document):
 	def schedule_course(self):
 		"""Creates course schedules as per specified parametes"""
 		
@@ -22,7 +22,9 @@
 		self.validate_mandatory()
 		self.validate_date()
 		self.instructor_name= frappe.db.get_value("Instructor", self.instructor, "instructor_name")
-		self.course= frappe.db.get_value("Student Group", self.student_group, "course")
+		
+		if self.student_group:
+			self.course= frappe.db.get_value("Student Group", self.student_group, "course")
 		
 		if self.rechedule:
 			rescheduled, reschedule_errors = self.delete_course_schedule(rescheduled, reschedule_errors)
@@ -54,7 +56,11 @@
 			
 	def validate_mandatory(self):
 		"""Validates all mandatory fields"""
-		fields = ['student_group', 'room', 'instructor', 'from_time', 'to_time', 'course_start_date', 'course_end_date', 'day']
+		
+		if not (self.student_batch or self.student_group):
+			frappe.throw(_("""Student Batch or Student Group is mandatory"""))
+		
+		fields = ['course', 'room', 'instructor', 'from_time', 'to_time', 'course_start_date', 'course_end_date', 'day']
 		for d in  fields:
 			if not self.get(d):
 				frappe.throw(_("{0} is mandatory").format(self.meta.get_label(d)))	
@@ -68,6 +74,8 @@
 		"""Delete all course schedule within the Date range and specified filters"""
 		schedules = frappe.get_list("Course Schedule", fields=["name", "schedule_date"], filters = 
 			[["student_group", "=", self.student_group],
+			["student_batch", "=", self.student_batch],
+			["course", "=", self.course],
 			["schedule_date", ">=", self.course_start_date], 
 			["schedule_date", "<=", self.course_end_date]])
 		for d in schedules:
@@ -85,6 +93,7 @@
 		
 		course_schedule = frappe.new_doc("Course Schedule")
 		course_schedule.student_group = self.student_group
+		course_schedule.student_batch = self.student_batch
 		course_schedule.course = self.course
 		course_schedule.instructor = self.instructor
 		course_schedule.instructor_name = self.instructor_name
@@ -93,3 +102,4 @@
 		course_schedule.from_time= self.from_time
 		course_schedule.to_time= self.to_time
 		return course_schedule
+	
diff --git a/erpnext/schools/doctype/discussion/discussion.json b/erpnext/schools/doctype/discussion/discussion.json
index 1fea44d..57ebfba 100644
--- a/erpnext/schools/doctype/discussion/discussion.json
+++ b/erpnext/schools/doctype/discussion/discussion.json
@@ -10,11 +10,13 @@
  "doctype": "DocType", 
  "document_type": "Document", 
  "editable_grid": 0, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "subject", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -22,6 +24,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Subject", 
    "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": 1, 
@@ -40,6 +44,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "course", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -47,6 +52,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Course", 
    "length": 0, 
    "no_copy": 0, 
@@ -56,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": 1, 
@@ -66,6 +73,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "description", 
    "fieldtype": "Text", 
    "hidden": 0, 
@@ -73,6 +81,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Description", 
    "length": 0, 
    "no_copy": 0, 
@@ -81,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, 
@@ -91,6 +101,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "amended_from", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -98,6 +109,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amended From", 
    "length": 0, 
    "no_copy": 1, 
@@ -106,6 +118,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, 
@@ -123,7 +136,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-07-25 05:24:23.235387", 
+ "modified": "2016-11-07 05:28:34.032169", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Discussion", 
@@ -140,6 +153,7 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
diff --git a/erpnext/schools/doctype/fee_category/fee_category.json b/erpnext/schools/doctype/fee_category/fee_category.json
index 4314aae..da8f7b1 100644
--- a/erpnext/schools/doctype/fee_category/fee_category.json
+++ b/erpnext/schools/doctype/fee_category/fee_category.json
@@ -69,7 +69,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-flag", 
+ "icon": "fa fa-flag", 
  "idx": 0, 
  "image_view": 0, 
  "in_create": 0, 
diff --git a/erpnext/schools/doctype/fee_component/fee_component.json b/erpnext/schools/doctype/fee_component/fee_component.json
index c0f7bd6..ecf3314 100644
--- a/erpnext/schools/doctype/fee_component/fee_component.json
+++ b/erpnext/schools/doctype/fee_component/fee_component.json
@@ -95,7 +95,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-flag", 
+ "icon": "fa fa-flag", 
  "idx": 0, 
  "image_view": 0, 
  "in_create": 0, 
diff --git a/erpnext/schools/doctype/fee_structure/fee_structure.json b/erpnext/schools/doctype/fee_structure/fee_structure.json
index 95a2f6f..6e99032 100644
--- a/erpnext/schools/doctype/fee_structure/fee_structure.json
+++ b/erpnext/schools/doctype/fee_structure/fee_structure.json
@@ -10,6 +10,7 @@
  "doctype": "DocType", 
  "document_type": "Setup", 
  "editable_grid": 0, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -23,6 +24,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Program", 
    "length": 0, 
    "no_copy": 0, 
@@ -34,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, 
@@ -52,6 +55,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Naming Series", 
    "length": 0, 
    "no_copy": 0, 
@@ -61,6 +65,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -79,6 +84,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -86,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, 
@@ -104,6 +111,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Academic Term", 
    "length": 0, 
    "no_copy": 0, 
@@ -115,6 +123,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, 
@@ -134,6 +143,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Student Category", 
    "length": 0, 
    "no_copy": 0, 
@@ -143,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, 
@@ -161,6 +172,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -168,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, 
@@ -186,6 +199,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Components", 
    "length": 0, 
    "no_copy": 0, 
@@ -195,6 +209,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, 
@@ -213,6 +228,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -220,6 +236,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, 
@@ -238,6 +255,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Total Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -246,6 +264,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, 
@@ -255,7 +274,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-flag", 
+ "icon": "fa fa-flag", 
  "idx": 0, 
  "image_view": 0, 
  "in_create": 0, 
@@ -265,7 +284,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-09-05 06:54:22.360035", 
+ "modified": "2016-11-07 05:25:37.393218", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Fee Structure", 
@@ -282,6 +301,7 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
diff --git a/erpnext/schools/doctype/fees/fees.json b/erpnext/schools/doctype/fees/fees.json
index a3af99b..6309dbd 100644
--- a/erpnext/schools/doctype/fees/fees.json
+++ b/erpnext/schools/doctype/fees/fees.json
@@ -10,6 +10,7 @@
  "doctype": "DocType", 
  "document_type": "Document", 
  "editable_grid": 0, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -23,6 +24,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Student", 
    "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,6 +53,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Academic Year", 
    "length": 0, 
    "no_copy": 0, 
@@ -59,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, 
@@ -77,6 +82,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Academic Term", 
    "length": 0, 
    "no_copy": 0, 
@@ -86,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, 
@@ -104,6 +111,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Fee Structure", 
    "length": 0, 
    "no_copy": 0, 
@@ -113,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, 
@@ -131,6 +140,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Due Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -139,6 +149,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,6 +168,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -164,6 +176,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, 
@@ -182,6 +195,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Student Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -190,6 +204,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, 
@@ -208,6 +223,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Naming Series", 
    "length": 0, 
    "no_copy": 0, 
@@ -217,6 +233,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, 
@@ -235,6 +252,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Program", 
    "length": 0, 
    "no_copy": 0, 
@@ -244,6 +262,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, 
@@ -262,6 +281,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Program Enrollment", 
    "length": 0, 
    "no_copy": 0, 
@@ -271,6 +291,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, 
@@ -289,6 +310,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Student Category", 
    "length": 0, 
    "no_copy": 0, 
@@ -298,6 +320,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, 
@@ -316,6 +339,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -323,6 +347,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, 
@@ -341,6 +366,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Components", 
    "length": 0, 
    "no_copy": 0, 
@@ -350,6 +376,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, 
@@ -368,6 +395,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -375,6 +403,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,6 +422,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amended From", 
    "length": 0, 
    "no_copy": 1, 
@@ -401,6 +431,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, 
@@ -419,6 +450,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -426,6 +458,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, 
@@ -445,6 +478,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -453,6 +487,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, 
@@ -472,6 +507,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Paid Amount", 
    "length": 0, 
    "no_copy": 1, 
@@ -480,6 +516,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, 
@@ -499,6 +536,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Outstanding Amount", 
    "length": 0, 
    "no_copy": 1, 
@@ -507,6 +545,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, 
@@ -525,7 +564,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-09-05 06:56:33.012835", 
+ "modified": "2016-11-07 05:25:29.875222", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Fees", 
@@ -542,6 +581,7 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
diff --git a/erpnext/schools/doctype/instructor/instructor.json b/erpnext/schools/doctype/instructor/instructor.json
index c6029d1..fbb4a0b 100644
--- a/erpnext/schools/doctype/instructor/instructor.json
+++ b/erpnext/schools/doctype/instructor/instructor.json
@@ -1,6 +1,6 @@
 {
  "allow_copy": 0, 
- "allow_import": 0, 
+ "allow_import": 1, 
  "allow_rename": 0, 
  "autoname": "naming_series:", 
  "beta": 0, 
@@ -10,11 +10,13 @@
  "doctype": "DocType", 
  "document_type": "Other", 
  "editable_grid": 0, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "instructor_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -22,6 +24,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Instructor 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,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "employee", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -47,6 +52,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Employee", 
    "length": 0, 
    "no_copy": 0, 
@@ -56,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, 
@@ -66,6 +73,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_5", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -73,6 +81,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 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": "naming_series", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -97,6 +108,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Naming Series", 
    "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": "department", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -123,6 +137,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Department", 
    "length": 0, 
    "no_copy": 0, 
@@ -132,6 +147,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,6 +158,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "image", 
    "fieldtype": "Attach Image", 
    "hidden": 1, 
@@ -149,6 +166,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Image", 
    "length": 0, 
    "no_copy": 0, 
@@ -157,6 +175,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, 
@@ -176,7 +195,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-07-25 01:26:44.111375", 
+ "modified": "2016-11-07 05:24:48.046207", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Instructor", 
@@ -193,6 +212,7 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
diff --git a/erpnext/schools/doctype/program/program.json b/erpnext/schools/doctype/program/program.json
index ca6e1df..95a37f0 100644
--- a/erpnext/schools/doctype/program/program.json
+++ b/erpnext/schools/doctype/program/program.json
@@ -1,7 +1,7 @@
 {
  "allow_copy": 0, 
  "allow_import": 1, 
- "allow_rename": 0, 
+ "allow_rename": 1, 
  "autoname": "field:program_name", 
  "beta": 0, 
  "creation": "2015-09-07 12:54:03.609282", 
@@ -10,11 +10,13 @@
  "doctype": "DocType", 
  "document_type": "", 
  "editable_grid": 0, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "program_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -22,6 +24,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Program 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,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "program_code", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -47,6 +52,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Program Code", 
    "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": "program_abbreviation", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -72,6 +80,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Program Abbreviation", 
    "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": "column_break_3", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -97,6 +108,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 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": "department", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -121,6 +135,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Department", 
    "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": 0, 
    "search_index": 0, 
@@ -140,6 +156,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_5", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -147,6 +164,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Course", 
    "length": 0, 
    "no_copy": 0, 
@@ -155,6 +173,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, 
@@ -165,6 +184,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "courses", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -172,6 +192,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Courses", 
    "length": 0, 
    "no_copy": 0, 
@@ -181,6 +202,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, 
@@ -191,6 +213,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "fee_schedule", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -198,6 +221,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Fee Schedule", 
    "length": 0, 
    "no_copy": 0, 
@@ -206,6 +230,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -216,6 +241,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "fees", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -223,6 +249,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Fees", 
    "length": 0, 
    "no_copy": 0, 
@@ -232,6 +259,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, 
@@ -250,7 +278,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-08-27 03:21:35.806511", 
+ "modified": "2016-11-07 05:23:07.030155", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Program", 
@@ -267,6 +295,7 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
diff --git a/erpnext/schools/doctype/program_enrollment/program_enrollment.json b/erpnext/schools/doctype/program_enrollment/program_enrollment.json
index 199b5e1..e7269f0 100644
--- a/erpnext/schools/doctype/program_enrollment/program_enrollment.json
+++ b/erpnext/schools/doctype/program_enrollment/program_enrollment.json
@@ -10,6 +10,7 @@
  "doctype": "DocType", 
  "document_type": "Document", 
  "editable_grid": 0, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -23,6 +24,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Student", 
    "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,6 +53,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Student Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -59,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, 
@@ -77,6 +82,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Student Category", 
    "length": 0, 
    "no_copy": 0, 
@@ -86,6 +92,36 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "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_name", 
+   "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 Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Student Batch Name", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -104,6 +140,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -111,6 +148,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, 
@@ -129,6 +167,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Program", 
    "length": 0, 
    "no_copy": 0, 
@@ -138,6 +177,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, 
@@ -156,6 +196,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Academic Year", 
    "length": 0, 
    "no_copy": 0, 
@@ -165,6 +206,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, 
@@ -184,6 +226,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Enrollment Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -192,6 +235,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, 
@@ -210,6 +254,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
@@ -218,6 +263,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,6 +282,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Fees", 
    "length": 0, 
    "no_copy": 0, 
@@ -245,6 +292,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 +312,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amended From", 
    "length": 0, 
    "no_copy": 1, 
@@ -272,6 +321,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, 
@@ -290,6 +340,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Image", 
    "length": 0, 
    "no_copy": 0, 
@@ -298,6 +349,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, 
@@ -317,7 +369,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-09-05 06:59:18.620611", 
+ "modified": "2016-11-18 14:20:10.023790", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Program Enrollment", 
@@ -334,6 +386,7 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
diff --git a/erpnext/schools/doctype/program_enrollment/program_enrollment.py b/erpnext/schools/doctype/program_enrollment/program_enrollment.py
index a15a070..02c6fe7 100644
--- a/erpnext/schools/doctype/program_enrollment/program_enrollment.py
+++ b/erpnext/schools/doctype/program_enrollment/program_enrollment.py
@@ -11,6 +11,8 @@
 class ProgramEnrollment(Document):
 	def validate(self):
 		self.validate_duplication()
+		if not self.student_name:
+			self.student_name = frappe.db.get_value("Student", self.student, "title")
 	
 	def on_submit(self):
 		self.update_student_joining_date()
diff --git a/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js b/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js
deleted file mode 100644
index 7109771..0000000
--- a/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js
+++ /dev/null
@@ -1,14 +0,0 @@
-cur_frm.add_fetch("student_group", "program", "program");
-cur_frm.add_fetch("student_group", "course", "course");
-cur_frm.add_fetch("student_group", "academic_year", "academic_year");
-cur_frm.add_fetch("student_group", "academic_term", "academic_term");
-
-frappe.ui.form.on("Scheduling Tool", "refresh", function(frm) {
-	frm.disable_save();
-	frm.page.set_primary_action(__("Schedule Course"), function() {
-		frappe.call({
-			method: "schedule_course",
-			doc:frm.doc
-		})
-	});
-});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/scheduling_tool/test_scheduling_tool.py b/erpnext/schools/doctype/scheduling_tool/test_scheduling_tool.py
deleted file mode 100644
index 4ec3747..0000000
--- a/erpnext/schools/doctype/scheduling_tool/test_scheduling_tool.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('Scheduling Tool')
-
-class TestSchedulingTool(unittest.TestCase):
-	pass
diff --git a/erpnext/schools/doctype/student/student.json b/erpnext/schools/doctype/student/student.json
index 22e229c..6984d38 100644
--- a/erpnext/schools/doctype/student/student.json
+++ b/erpnext/schools/doctype/student/student.json
@@ -1,7 +1,7 @@
 {
  "allow_copy": 0, 
  "allow_import": 1, 
- "allow_rename": 0, 
+ "allow_rename": 1, 
  "autoname": "naming_series:", 
  "beta": 0, 
  "creation": "2015-09-07 13:00:55.938280", 
@@ -10,6 +10,7 @@
  "doctype": "DocType", 
  "document_type": "Document", 
  "editable_grid": 0, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -23,6 +24,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "First Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -31,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,6 +52,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Middle Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -57,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, 
@@ -75,6 +80,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Last Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -83,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, 
@@ -101,6 +108,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -108,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, 
@@ -126,6 +135,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Naming Series", 
    "length": 0, 
    "no_copy": 0, 
@@ -135,6 +145,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,6 +164,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Student Email ID", 
    "length": 0, 
    "no_copy": 0, 
@@ -161,6 +173,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, 
@@ -179,6 +192,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Student Mobile Number", 
    "length": 0, 
    "no_copy": 0, 
@@ -188,6 +202,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,6 +222,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Joining Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -215,6 +231,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,6 +250,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Image", 
    "length": 0, 
    "no_copy": 0, 
@@ -241,6 +259,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, 
@@ -261,6 +280,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Personal Details", 
    "length": 0, 
    "no_copy": 0, 
@@ -269,6 +289,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, 
@@ -287,6 +308,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Date of Birth", 
    "length": 0, 
    "no_copy": 0, 
@@ -295,6 +317,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -313,6 +336,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Blood Group", 
    "length": 0, 
    "no_copy": 0, 
@@ -322,6 +346,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, 
@@ -340,6 +365,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -347,6 +373,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, 
@@ -365,6 +392,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Gender", 
    "length": 0, 
    "no_copy": 0, 
@@ -374,6 +402,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,21 +415,23 @@
    "collapsible": 0, 
    "columns": 0, 
    "fieldname": "nationality", 
-   "fieldtype": "Link", 
+   "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 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, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -419,6 +450,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Student Applicant", 
    "length": 0, 
    "no_copy": 0, 
@@ -428,6 +460,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -446,6 +479,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Home Address", 
    "length": 0, 
    "no_copy": 0, 
@@ -454,6 +488,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, 
@@ -472,6 +507,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Address Line 1", 
    "length": 0, 
    "no_copy": 0, 
@@ -480,6 +516,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, 
@@ -498,6 +535,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Address Line 2", 
    "length": 0, 
    "no_copy": 0, 
@@ -506,6 +544,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, 
@@ -524,6 +563,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Pincode", 
    "length": 0, 
    "no_copy": 0, 
@@ -532,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, 
@@ -550,6 +591,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -557,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, 
@@ -575,6 +618,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "City", 
    "length": 0, 
    "no_copy": 0, 
@@ -583,6 +627,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, 
@@ -601,6 +646,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "State", 
    "length": 0, 
    "no_copy": 0, 
@@ -609,6 +655,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, 
@@ -627,6 +674,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Guardian Details", 
    "length": 0, 
    "no_copy": 0, 
@@ -635,6 +683,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, 
@@ -653,6 +702,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Guardians", 
    "length": 0, 
    "no_copy": 0, 
@@ -662,6 +712,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, 
@@ -680,6 +731,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Sibling Details", 
    "length": 0, 
    "no_copy": 0, 
@@ -689,6 +741,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, 
@@ -707,6 +760,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Siblings", 
    "length": 0, 
    "no_copy": 0, 
@@ -716,6 +770,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, 
@@ -735,6 +790,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Title", 
    "length": 0, 
    "no_copy": 0, 
@@ -743,6 +799,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, 
@@ -762,7 +819,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-09-08 06:29:27.702968", 
+ "modified": "2016-12-01 12:55:32.453131", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Student", 
@@ -773,12 +830,34 @@
    "amend": 0, 
    "apply_user_permissions": 0, 
    "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 0, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "is_custom": 0, 
+   "permlevel": 0, 
+   "print": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Instructor", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
+   "write": 0
+  }, 
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
    "create": 1, 
    "delete": 1, 
    "email": 1, 
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
diff --git a/erpnext/schools/doctype/student/student_dashboard.py b/erpnext/schools/doctype/student/student_dashboard.py
index 9322986..55faffb 100644
--- a/erpnext/schools/doctype/student/student_dashboard.py
+++ b/erpnext/schools/doctype/student/student_dashboard.py
@@ -1,15 +1,16 @@
 from frappe import _
 
-data = {
-	'heatmap': True,
-	'heatmap_message': _('This is based on the attendance of this Student'),
-	'fieldname': 'student',
-	'transactions': [
-		{
-			'items': ['Student Log', 'Student Group', 'Student Attendance']
-		},
-		{
-			'items': ['Program Enrollment', 'Fees', 'Assessment']
-		}
-	]
-}
\ No newline at end of file
+def get_data():
+	return {
+		'heatmap': True,
+		'heatmap_message': _('This is based on the attendance of this Student'),
+		'fieldname': 'student',
+		'transactions': [
+			{
+				'items': ['Student Log', 'Student Group', 'Student Attendance']
+			},
+			{
+				'items': ['Program Enrollment', 'Fees', 'Assessment']
+			}
+		]
+	}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student/student_list.js b/erpnext/schools/doctype/student/student_list.js
new file mode 100644
index 0000000..763f120
--- /dev/null
+++ b/erpnext/schools/doctype/student/student_list.js
@@ -0,0 +1,3 @@
+frappe.listview_settings['Student'] = {
+	add_fields: [ "image"]
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_admission/student_admission.js b/erpnext/schools/doctype/student_admission/student_admission.js
index 48f4c46..d7f7454 100644
--- a/erpnext/schools/doctype/student_admission/student_admission.js
+++ b/erpnext/schools/doctype/student_admission/student_admission.js
@@ -8,7 +8,7 @@
 			frm.refresh_field("route");
 		}
 	},
-	
+
 	academic_year: function(frm) {
 		frm.trigger("program");
 	}
diff --git a/erpnext/schools/doctype/student_admission/student_admission.json b/erpnext/schools/doctype/student_admission/student_admission.json
index e757ae1..22bdb2b 100644
--- a/erpnext/schools/doctype/student_admission/student_admission.json
+++ b/erpnext/schools/doctype/student_admission/student_admission.json
@@ -1,8 +1,8 @@
 {
  "allow_copy": 0, 
  "allow_import": 0, 
- "allow_rename": 0, 
- "autoname": "field:route", 
+ "allow_rename": 1, 
+ "autoname": "", 
  "beta": 0, 
  "creation": "2016-09-13 03:05:27.154713", 
  "custom": 0, 
@@ -23,6 +23,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Academic Year", 
    "length": 0, 
    "no_copy": 0, 
@@ -32,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, 
@@ -50,6 +52,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Admission Start Date", 
    "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": 0, 
+   "in_standard_filter": 0, 
    "label": "Admission End Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -84,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, 
@@ -102,6 +108,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Title", 
    "length": 0, 
    "no_copy": 0, 
@@ -110,6 +117,35 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "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": "naming_series_for_student_applicant", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Naming Series (for Student Applicant)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -128,6 +164,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Publish on website", 
    "length": 0, 
    "no_copy": 0, 
@@ -136,6 +173,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,6 +192,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -161,6 +200,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, 
@@ -179,6 +219,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Program", 
    "length": 0, 
    "no_copy": 0, 
@@ -188,8 +229,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
@@ -206,6 +248,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Application Fee", 
    "length": 0, 
    "no_copy": 0, 
@@ -215,6 +258,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,6 +277,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Currency", 
    "length": 0, 
    "no_copy": 0, 
@@ -242,6 +287,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, 
@@ -261,6 +307,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Route", 
    "length": 0, 
    "no_copy": 0, 
@@ -269,6 +316,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, 
@@ -287,6 +335,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Application Form Route", 
    "length": 0, 
    "no_copy": 0, 
@@ -295,6 +344,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, 
@@ -313,6 +363,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -320,6 +371,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 +390,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Introduction", 
    "length": 0, 
    "no_copy": 0, 
@@ -346,6 +399,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, 
@@ -364,6 +418,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Eligibility", 
    "length": 0, 
    "no_copy": 0, 
@@ -372,6 +427,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 +445,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-09-15 07:03:55.581346", 
+ "modified": "2016-11-07 05:23:58.170546", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Student Admission", 
@@ -406,6 +462,7 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
diff --git a/erpnext/schools/doctype/student_admission/student_admission.py b/erpnext/schools/doctype/student_admission/student_admission.py
index c4384e2..a849d65 100644
--- a/erpnext/schools/doctype/student_admission/student_admission.py
+++ b/erpnext/schools/doctype/student_admission/student_admission.py
@@ -11,15 +11,19 @@
 	website = frappe._dict(
 		template = "templates/generators/student_admission.html",
 		condition_field = "publish",
-		page_title_field = "route"
+		page_title_field = "title"
 	)
 
+	def autoname(self):
+		if not self.title:
+			self.title = self.get_title()
+		self.name = self.title
+
 	def get_context(self, context):
 		context.parents = [{'name': 'admissions', 'title': _('All Student Admissions') }]
-		
-	def validate(self):
-		if not self.title:
-			self.title = self.program + " admissions for " + self.academic_year
+
+	def get_title(self):
+		return _("Admissions for {0}").format(self.academic_year)
 
 def get_list_context(context):
 	context.title = _("Student Admissions")
diff --git a/erpnext/schools/doctype/student_applicant/student_applicant.js b/erpnext/schools/doctype/student_applicant/student_applicant.js
index 6857a66..36baa80 100644
--- a/erpnext/schools/doctype/student_applicant/student_applicant.js
+++ b/erpnext/schools/doctype/student_applicant/student_applicant.js
@@ -4,22 +4,22 @@
 			frm.add_custom_button(__("Approve"), function() {
 				frm.set_value("application_status", "Approved");
 				frm.save_or_update();
-				
-			}).addClass("btn-primary");
-			
+
+			}, 'Actions');
+
 			frm.add_custom_button(__("Reject"), function() {
 				frm.set_value("application_status", "Rejected");
 				frm.save_or_update();
-			}).addClass("btn-danger");
+			}, 'Actions');
 		}
-		
+
 		if(frm.doc.application_status== "Approved" && frm.doc.docstatus== 1 ) {
 			frm.add_custom_button(__("Enroll"), function() {
 				frm.events.enroll(frm)
 			}).addClass("btn-primary");
 		}
 	},
-	
+
 	enroll: function(frm) {
 		frappe.model.open_mapped_doc({
 			method: "erpnext.schools.api.enroll_student",
diff --git a/erpnext/schools/doctype/student_applicant/student_applicant.json b/erpnext/schools/doctype/student_applicant/student_applicant.json
index ae99488..18a490a 100644
--- a/erpnext/schools/doctype/student_applicant/student_applicant.json
+++ b/erpnext/schools/doctype/student_applicant/student_applicant.json
@@ -6,10 +6,12 @@
  "beta": 0, 
  "creation": "2015-09-11 11:50:09.740807", 
  "custom": 0, 
+ "default_print_format": "", 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Document", 
  "editable_grid": 0, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -23,6 +25,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "First 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, 
@@ -49,6 +53,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Middle Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -57,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, 
@@ -75,6 +81,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Last Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -83,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, 
@@ -101,6 +109,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Program", 
    "length": 0, 
    "no_copy": 0, 
@@ -110,6 +119,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, 
@@ -121,6 +131,34 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "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": "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, 
    "fieldname": "column_break_8", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -128,6 +166,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -135,6 +174,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,15 +193,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Naming Series", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "AP.", 
+   "options": "AP", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -181,6 +223,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Application Status", 
    "length": 0, 
    "no_copy": 1, 
@@ -190,6 +233,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, 
@@ -209,6 +253,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Application Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -218,6 +263,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,6 +282,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Academic Year", 
    "length": 0, 
    "no_copy": 0, 
@@ -245,6 +292,36 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "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_admission", 
+   "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 Admission", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Student Admission", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -263,6 +340,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Image", 
    "length": 0, 
    "no_copy": 0, 
@@ -271,6 +349,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,6 +369,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Personal Details", 
    "length": 0, 
    "no_copy": 0, 
@@ -298,6 +378,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, 
@@ -316,6 +397,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Date of Birth", 
    "length": 0, 
    "no_copy": 0, 
@@ -324,6 +406,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, 
@@ -342,6 +425,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Gender", 
    "length": 0, 
    "no_copy": 0, 
@@ -351,6 +435,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,6 +454,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Blood Group", 
    "length": 0, 
    "no_copy": 0, 
@@ -378,6 +464,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, 
@@ -396,6 +483,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -403,6 +491,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, 
@@ -421,6 +510,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Student Email ID", 
    "length": 0, 
    "no_copy": 0, 
@@ -429,6 +519,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, 
@@ -447,6 +538,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Student Mobile Number", 
    "length": 0, 
    "no_copy": 0, 
@@ -455,6 +547,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, 
@@ -473,6 +566,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Nationality", 
    "length": 0, 
    "no_copy": 0, 
@@ -482,6 +576,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, 
@@ -500,6 +595,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Home Address", 
    "length": 0, 
    "no_copy": 0, 
@@ -508,6 +604,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, 
@@ -526,6 +623,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Address Line 1", 
    "length": 0, 
    "no_copy": 0, 
@@ -534,6 +632,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, 
@@ -552,6 +651,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Address Line 2", 
    "length": 0, 
    "no_copy": 0, 
@@ -560,6 +660,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, 
@@ -578,6 +679,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Pincode", 
    "length": 0, 
    "no_copy": 0, 
@@ -586,6 +688,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, 
@@ -604,6 +707,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -611,6 +715,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, 
@@ -629,6 +734,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "City", 
    "length": 0, 
    "no_copy": 0, 
@@ -637,6 +743,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, 
@@ -655,6 +762,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "State", 
    "length": 0, 
    "no_copy": 0, 
@@ -663,6 +771,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, 
@@ -681,6 +790,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Guardian Details", 
    "length": 0, 
    "no_copy": 0, 
@@ -689,6 +799,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, 
@@ -707,6 +818,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Guardians", 
    "length": 0, 
    "no_copy": 0, 
@@ -716,6 +828,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, 
@@ -734,6 +847,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Sibling Details", 
    "length": 0, 
    "no_copy": 0, 
@@ -742,6 +856,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, 
@@ -760,6 +875,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Siblings", 
    "length": 0, 
    "no_copy": 0, 
@@ -769,6 +885,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, 
@@ -787,6 +904,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -794,6 +912,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, 
@@ -812,6 +931,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Title", 
    "length": 0, 
    "no_copy": 0, 
@@ -820,6 +940,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, 
@@ -838,6 +959,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amended From", 
    "length": 0, 
    "no_copy": 1, 
@@ -846,6 +968,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, 
@@ -865,7 +988,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-09-08 06:40:54.242322", 
+ "modified": "2016-11-17 10:26:13.225135", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Student Applicant", 
@@ -882,6 +1005,7 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 1, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
diff --git a/erpnext/schools/doctype/student_applicant/student_applicant.py b/erpnext/schools/doctype/student_applicant/student_applicant.py
index 5ef72cb..047c702 100644
--- a/erpnext/schools/doctype/student_applicant/student_applicant.py
+++ b/erpnext/schools/doctype/student_applicant/student_applicant.py
@@ -8,6 +8,18 @@
 from frappe.model.document import Document
 
 class StudentApplicant(Document):
+	def autoname(self):
+		from frappe.model.naming import set_name_by_naming_series
+		if self.student_admission:
+			naming_series = frappe.db.get_value('Student Admission', self.student_admission,
+				'naming_series_for_student_applicant')
+			print naming_series
+
+			if naming_series:
+				self.naming_series = naming_series
+
+		set_name_by_naming_series(self)
+
 	def validate(self):
 		self.title = " ".join(filter(None, [self.first_name, self.middle_name, self.last_name]))
 
@@ -15,3 +27,6 @@
 		student = frappe.get_list("Student",  filters= {"student_applicant": self.name})
 		if student:
 			frappe.throw(_("Cannot change status as student {0} is linked with student application {1}").format(student[0].name, self.name))
+
+	def on_payment_authorized(self, *args, **kwargs):
+		self.db_set('paid', 1)
diff --git a/erpnext/schools/doctype/student_applicant/student_applicant_list.js b/erpnext/schools/doctype/student_applicant/student_applicant_list.js
index 43402d8..817a728 100644
--- a/erpnext/schools/doctype/student_applicant/student_applicant_list.js
+++ b/erpnext/schools/doctype/student_applicant/student_applicant_list.js
@@ -1,7 +1,11 @@
 frappe.listview_settings['Student Applicant'] = {
-	add_fields: [ "application_status"],
+	add_fields: [ "application_status", 'paid'],
+	has_indicator_for_draft: 1,
 	get_indicator: function(doc) {
-		if (doc.application_status=="Applied") {
+		if (doc.paid) {
+			return [__("Paid"), "green", "paid,=,Yes"];
+		}
+		else if (doc.application_status=="Applied") {
 			return [__("Applied"), "orange", "application_status,=,Applied"];
 		}
 		else if (doc.application_status=="Approved") {
diff --git a/erpnext/schools/doctype/student_attendance/student_attendance.js b/erpnext/schools/doctype/student_attendance/student_attendance.js
index 5068208..ec2a0cb 100644
--- a/erpnext/schools/doctype/student_attendance/student_attendance.js
+++ b/erpnext/schools/doctype/student_attendance/student_attendance.js
@@ -1,8 +1,5 @@
 // Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on('Student Attendance', {
-	refresh: function(frm) {
-
-	}
-});
+cur_frm.add_fetch("course_schedule", "schedule_date", "date");
+cur_frm.add_fetch("course_schedule", "student_batch", "student_batch")
\ 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 64d3994..3ea47f37 100644
--- a/erpnext/schools/doctype/student_attendance/student_attendance.json
+++ b/erpnext/schools/doctype/student_attendance/student_attendance.json
@@ -10,11 +10,13 @@
  "doctype": "DocType", 
  "document_type": "Document", 
  "editable_grid": 0, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "student", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -22,6 +24,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Student", 
    "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,56 +45,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "student_name", 
-   "fieldtype": "Read Only", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Student Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "student.title", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "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, 
+   "columns": 0, 
    "fieldname": "course_schedule", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -98,6 +53,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Course Schedule", 
    "length": 0, 
    "no_copy": 0, 
@@ -107,6 +63,35 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "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", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -117,6 +102,92 @@
    "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, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "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_name", 
+   "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": "Student Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "student.title", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_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, 
    "default": "Present", 
    "fieldname": "status", 
    "fieldtype": "Select", 
@@ -125,6 +196,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Status", 
    "length": 0, 
    "no_copy": 0, 
@@ -134,6 +206,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, 
@@ -144,6 +217,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "amended_from", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -151,6 +225,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amended From", 
    "length": 0, 
    "no_copy": 1, 
@@ -159,6 +234,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, 
@@ -176,7 +252,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-07-25 01:23:49.324922", 
+ "modified": "2016-12-01 12:56:21.537215", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Student Attendance", 
@@ -189,10 +265,32 @@
    "cancel": 1, 
    "create": 1, 
    "delete": 1, 
+   "email": 0, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "is_custom": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Instructor", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 1, 
+   "write": 1
+  }, 
+  {
+   "amend": 1, 
+   "apply_user_permissions": 0, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
    "email": 1, 
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
diff --git a/erpnext/schools/doctype/student_attendance/student_attendance.py b/erpnext/schools/doctype/student_attendance/student_attendance.py
index 65dbd68..45b3014 100644
--- a/erpnext/schools/doctype/student_attendance/student_attendance.py
+++ b/erpnext/schools/doctype/student_attendance/student_attendance.py
@@ -9,13 +9,32 @@
 
 class StudentAttendance(Document):
 	def validate(self):
+		self.validate_date()
+		self.validate_mandatory()
 		self.validate_duplication()
 		
+	def validate_date(self):
+		if self.course_schedule:
+			self.date = frappe.db.get_value("Course Schedule", self.course_schedule, "schedule_date")
+	
+	def validate_mandatory(self):
+		if not (self.student_batch or self.course_schedule):
+			frappe.throw(_("""Student Batch or Course Schedule is mandatory"""))
+	
 	def validate_duplication(self):
 		"""Check if the Attendance Record is Unique"""
-		attendance_records= frappe.db.sql("""select name from `tabStudent Attendance` where \
-			student= %s and course_schedule= %s and name != %s""",
-			(self.student, self.course_schedule, self.name))
+		
+		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))
+		else:
+			attendance_records= frappe.db.sql("""select name from `tabStudent Attendance` where \
+				student= %s and date= %s and name != %s and docstatus=1 and \
+				(course_schedule is Null or course_schedule='')""",
+				(self.student, self.date, self.name))
+			
 		if attendance_records:
-			frappe.throw(_("Attendance Record {0} exists against Student {1} for Course Schedule {2}")
-				.format(attendance_records[0][0], self.student, self.course_schedule))
+			frappe.throw(_("Attendance Record {0} exists against Student {1}")
+				.format(attendance_records[0][0], self.student))
diff --git a/erpnext/schools/doctype/student_batch/student_batch.json b/erpnext/schools/doctype/student_batch/student_batch.json
index fa7e6b5..f571d9d 100644
--- a/erpnext/schools/doctype/student_batch/student_batch.json
+++ b/erpnext/schools/doctype/student_batch/student_batch.json
@@ -10,26 +10,31 @@
  "doctype": "DocType", 
  "document_type": "", 
  "editable_grid": 1, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "student_batch_name", 
-   "fieldtype": "Data", 
+   "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 Name", 
    "length": 0, 
    "no_copy": 0, 
+   "options": "Student Batch Name", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -40,6 +45,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "academic_year", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -47,6 +53,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Academic Year", 
    "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,13 +74,17 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "column_break_2", 
-   "fieldtype": "Column Break", 
+   "columns": 0, 
+   "default": "1", 
+   "fieldname": "enabled", 
+   "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Active", 
    "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,6 +103,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": "program", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -97,6 +138,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Program", 
    "length": 0, 
    "no_copy": 0, 
@@ -106,6 +148,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, 
@@ -116,6 +159,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "academic_term", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -123,6 +167,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Academic Term", 
    "length": 0, 
    "no_copy": 0, 
@@ -132,6 +177,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,13 +188,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "section_break_8", 
+   "columns": 0, 
+   "fieldname": "section_break_6", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Students", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -156,6 +205,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -166,6 +216,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "students", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -173,6 +224,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Students", 
    "length": 0, 
    "no_copy": 0, 
@@ -182,6 +234,64 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "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_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Instructors", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "instructors", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Instructors", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Student Batch 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, 
@@ -199,7 +309,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-08-24 05:32:00.585277", 
+ "modified": "2016-12-01 13:18:12.024001", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Student Batch", 
@@ -216,6 +326,7 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -225,6 +336,27 @@
    "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, 
+   "permlevel": 0, 
+   "print": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Instructor", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
+   "write": 0
   }
  ], 
  "quick_entry": 1, 
diff --git a/erpnext/schools/doctype/student_batch/student_batch.py b/erpnext/schools/doctype/student_batch/student_batch.py
index ec2dc79..1a0d799 100644
--- a/erpnext/schools/doctype/student_batch/student_batch.py
+++ b/erpnext/schools/doctype/student_batch/student_batch.py
@@ -8,12 +8,11 @@
 import frappe
 
 class StudentBatch(Document):
-    def autoname(self):
-        prog_abb = frappe.db.get_value("Program", self.program, "program_abbreviation")
-        if not prog_abb:
-            prog_abb = self.program
-        self.name = prog_abb + "-"+ self.student_batch_name + "-" + self.academic_year
-        
-    def validate(self):
-        validate_duplicate_student(self.students)
-        
\ No newline at end of file
+	def autoname(self):
+		prog_abb = frappe.db.get_value("Program", self.program, "program_abbreviation")
+		if not prog_abb:
+			prog_abb = self.program
+		self.name = prog_abb + "-"+ self.student_batch_name + "-" + self.academic_year
+		
+	def validate(self):
+		validate_duplicate_student(self.students)
diff --git a/erpnext/schools/doctype/scheduling_tool/__init__.py b/erpnext/schools/doctype/student_batch_attendance_tool/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/scheduling_tool/__init__.py
copy to erpnext/schools/doctype/student_batch_attendance_tool/__init__.py
diff --git a/erpnext/schools/doctype/student_batch_attendance_tool/student_batch_attendance_tool.js b/erpnext/schools/doctype/student_batch_attendance_tool/student_batch_attendance_tool.js
new file mode 100644
index 0000000..2dc6a85
--- /dev/null
+++ b/erpnext/schools/doctype/student_batch_attendance_tool/student_batch_attendance_tool.js
@@ -0,0 +1,136 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+frappe.provide("schools")
+
+frappe.ui.form.on('Student Batch Attendance Tool', {
+    refresh: function(frm) {
+        frm.disable_save();
+        hide_field('attendance');
+    },
+
+    student_batch: function(frm) {
+        if (frm.doc.student_batch && frm.doc.date) {
+            frappe.call({
+                method: "erpnext.schools.api.check_attendance_records_exist",
+                args: {
+                    "student_batch": frm.doc.student_batch,
+                    "date": frm.doc.date
+                },
+                callback: function(r) {
+                    if (r.message) {
+                        frappe.msgprint("Attendance already marked.");
+                        hide_field('attendance');
+                    } else {
+                        frappe.call({
+                            method: "erpnext.schools.api.get_student_batch_students",
+                            args: {
+                                "student_batch": frm.doc.student_batch
+                            },
+                            callback: function(r) {
+                                if (r.message) {
+                                    unhide_field('attendance');
+                                    frm.events.get_students(frm, r.message)
+                                }
+                            }
+                        });
+                    }
+                }
+            });
+        }
+    },
+
+    date: 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)
+    }
+});
+
+
+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;
+
+        $(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).is(":checked")) {
+                        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).is(":checked")) {
+                        check.checked = false;
+                    }
+                });
+            });
+
+        var get_student = function(idx) {
+            return students.filter(function(s) {
+                return s.idx === idx;
+            })[0]
+        }
+
+        student_toolbar.find(".btn-mark-att")
+            .html(__('Mark Attendence'))
+            .on("click", function() {
+                var students_present = [];
+                var students_absent = [];
+                $(me.wrapper).find('input[type="checkbox"]').each(function(i, check) {
+                    var idx = $(check).data().idx;
+                    if ($(check).is(":checked")) {
+                        students_present.push(get_student(idx));
+                    } else {
+                        students_absent.push(get_student(idx));
+                    }
+                });
+                frappe.call({
+                    method: "erpnext.schools.api.mark_attendance",
+                    args: {
+                        "students_present": students_present,
+                        "students_absent": students_absent,
+                        "student_batch": frm.doc.student_batch,
+                        "date": frm.doc.date
+                    },
+                    callback: function(r) {
+                        hide_field('attendance');
+                    }
+                });
+            });
+
+
+        $.each(students, function(i, m) {
+            $(repl('<div class="col-sm-6">\
+				<div class="checkbox">\
+				<label><input data-idx="%(idx)s" type="checkbox" class="students-check" data-student="%(name)s">\
+				%(idx)s - %(name)s</label>\
+			</div></div>', {
+                name: m.student_name,
+                idx: m.idx
+            })).appendTo(me.wrapper);
+        });
+    }
+});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_batch_attendance_tool/student_batch_attendance_tool.json b/erpnext/schools/doctype/student_batch_attendance_tool/student_batch_attendance_tool.json
new file mode 100644
index 0000000..defc886
--- /dev/null
+++ b/erpnext/schools/doctype/student_batch_attendance_tool/student_batch_attendance_tool.json
@@ -0,0 +1,222 @@
+{
+ "allow_copy": 1, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2016-11-16 17:12:46.437539", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_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": 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": "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": "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, 
+   "depends_on": "", 
+   "fieldname": "attendance", 
+   "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": "Attendance", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "students_html", 
+   "fieldtype": "HTML", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Students HTML", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "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": "2016-12-01 12:58:31.822014", 
+ "modified_by": "Administrator", 
+ "module": "Schools", 
+ "name": "Student Batch Attendance Tool", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 0, 
+   "email": 0, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "is_custom": 0, 
+   "permlevel": 0, 
+   "print": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Instructor", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 0, 
+   "email": 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": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_batch_attendance_tool/student_batch_attendance_tool.py b/erpnext/schools/doctype/student_batch_attendance_tool/student_batch_attendance_tool.py
new file mode 100644
index 0000000..49a5ae8
--- /dev/null
+++ b/erpnext/schools/doctype/student_batch_attendance_tool/student_batch_attendance_tool.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class StudentBatchAttendanceTool(Document):
+	pass
diff --git a/erpnext/schools/doctype/scheduling_tool/__init__.py b/erpnext/schools/doctype/student_batch_creation_tool/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/scheduling_tool/__init__.py
copy to erpnext/schools/doctype/student_batch_creation_tool/__init__.py
diff --git a/erpnext/schools/doctype/student_batch_creation_tool/student_batch_creation_tool.js b/erpnext/schools/doctype/student_batch_creation_tool/student_batch_creation_tool.js
new file mode 100644
index 0000000..3167174
--- /dev/null
+++ b/erpnext/schools/doctype/student_batch_creation_tool/student_batch_creation_tool.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Student Batch Creation Tool', {
+	refresh: function(frm) {
+		frm.disable_save();
+	}
+});
diff --git a/erpnext/schools/doctype/student_batch_creation_tool/student_batch_creation_tool.json b/erpnext/schools/doctype/student_batch_creation_tool/student_batch_creation_tool.json
new file mode 100644
index 0000000..d94c480
--- /dev/null
+++ b/erpnext/schools/doctype/student_batch_creation_tool/student_batch_creation_tool.json
@@ -0,0 +1,176 @@
+{
+ "allow_copy": 1, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2016-11-14 18:20:12.160405", 
+ "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": "academic_year", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Academic Year", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Academic Year", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "program", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Program", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Program", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "student_batch_name", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Student Batch Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Student Batch Name", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "make_student_batch", 
+   "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 Student Batch", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "make_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
+  }
+ ], 
+ "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": "2016-11-21 16:47:56.823988", 
+ "modified_by": "Administrator", 
+ "module": "Schools", 
+ "name": "Student Batch Creation Tool", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "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": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_batch_creation_tool/student_batch_creation_tool.py b/erpnext/schools/doctype/student_batch_creation_tool/student_batch_creation_tool.py
new file mode 100644
index 0000000..deda137
--- /dev/null
+++ b/erpnext/schools/doctype/student_batch_creation_tool/student_batch_creation_tool.py
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class StudentBatchCreationTool(Document):
+	def make_batch(self):
+		if self.academic_year and self.program and self.student_batch_name:
+			students = frappe.get_list("Program Enrollment", fields=["student", "student_name"],
+				 filters={"academic_year":self.academic_year, "program": self.program, "student_batch_name": self.student_batch_name},
+				 order_by= "student_name")
+			if students:
+				student_batch = frappe.new_doc("Student Batch")
+				student_batch.update({
+					"academic_year": self.academic_year,
+					"program": self.program,
+					"student_batch_name": self.student_batch_name,
+					"students": students
+				})
+				student_batch.save()
+				frappe.msgprint("Student Batch created.")
+			else:
+				frappe.msgprint("No students found.")
+
diff --git a/erpnext/schools/doctype/scheduling_tool/__init__.py b/erpnext/schools/doctype/student_batch_instructor/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/scheduling_tool/__init__.py
copy to erpnext/schools/doctype/student_batch_instructor/__init__.py
diff --git a/erpnext/schools/doctype/student_batch_instructor/student_batch_instructor.json b/erpnext/schools/doctype/student_batch_instructor/student_batch_instructor.json
new file mode 100644
index 0000000..29680fb
--- /dev/null
+++ b/erpnext/schools/doctype/student_batch_instructor/student_batch_instructor.json
@@ -0,0 +1,123 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2016-11-21 19:04:48.211565", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "instructor", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Instructor", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Instructor", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_2", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "instructor_name", 
+   "fieldtype": "Read Only", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Instructor Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "instructor.instructor_name", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2016-11-21 19:08:07.680320", 
+ "modified_by": "Administrator", 
+ "module": "Schools", 
+ "name": "Student Batch Instructor", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_batch_instructor/student_batch_instructor.py b/erpnext/schools/doctype/student_batch_instructor/student_batch_instructor.py
new file mode 100644
index 0000000..19a759d
--- /dev/null
+++ b/erpnext/schools/doctype/student_batch_instructor/student_batch_instructor.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class StudentBatchInstructor(Document):
+	pass
diff --git a/erpnext/schools/doctype/scheduling_tool/__init__.py b/erpnext/schools/doctype/student_batch_name/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/scheduling_tool/__init__.py
copy to erpnext/schools/doctype/student_batch_name/__init__.py
diff --git a/erpnext/schools/doctype/student_batch_name/student_batch_name.js b/erpnext/schools/doctype/student_batch_name/student_batch_name.js
new file mode 100644
index 0000000..7ed3021
--- /dev/null
+++ b/erpnext/schools/doctype/student_batch_name/student_batch_name.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Student Batch Name', {
+	refresh: function(frm) {
+
+	}
+});
diff --git a/erpnext/schools/doctype/student_batch_name/student_batch_name.json b/erpnext/schools/doctype/student_batch_name/student_batch_name.json
new file mode 100644
index 0000000..7f5f16d
--- /dev/null
+++ b/erpnext/schools/doctype/student_batch_name/student_batch_name.json
@@ -0,0 +1,89 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "field:batch_name", 
+ "beta": 0, 
+ "creation": "2016-11-17 18:45:57.965091", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Setup", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "batch_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Batch Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "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": "2016-11-21 16:31:50.775958", 
+ "modified_by": "Administrator", 
+ "module": "Schools", 
+ "name": "Student Batch Name", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "is_custom": 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_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_batch_name/student_batch_name.py b/erpnext/schools/doctype/student_batch_name/student_batch_name.py
new file mode 100644
index 0000000..e6d38ea
--- /dev/null
+++ b/erpnext/schools/doctype/student_batch_name/student_batch_name.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class StudentBatchName(Document):
+	pass
diff --git a/erpnext/schools/doctype/student_batch_name/test_student_batch_name.py b/erpnext/schools/doctype/student_batch_name/test_student_batch_name.py
new file mode 100644
index 0000000..09534f3
--- /dev/null
+++ b/erpnext/schools/doctype/student_batch_name/test_student_batch_name.py
@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+# test_records = frappe.get_test_records('Student Batch Name')
+
+class TestStudentBatchName(unittest.TestCase):
+	pass
diff --git a/erpnext/schools/doctype/student_group/student_group.js b/erpnext/schools/doctype/student_group/student_group.js
index 784f557..6f4084b 100644
--- a/erpnext/schools/doctype/student_group/student_group.js
+++ b/erpnext/schools/doctype/student_group/student_group.js
@@ -1,34 +1,36 @@
 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");
-		});
-		
-		frm.add_custom_button(__("Assessment"), function() {
-			frappe.route_options = {
-				student_group: frm.doc.name
-			}
-			frappe.set_route("List", "Assessment");
-		});
-	}
-});
+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");
+            });
 
-frappe.ui.form.on("Student Group", "onload", function(frm){
-	cur_frm.set_query("academic_term",function(){
-		return{
-			"filters":{
-				"academic_year": (frm.doc.academic_year)
-			}
-		};
-	});
+            frm.add_custom_button(__("Assessment"), function() {
+                frappe.route_options = {
+                    student_group: frm.doc.name
+                }
+                frappe.set_route("List", "Assessment");
+            });
+        }
+    },
+
+    onload: function(frm) {
+        cur_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
 cur_frm.add_fetch("student_batch", "program", "program");
 cur_frm.add_fetch("student_batch", "academic_term", "academic_term");
-cur_frm.add_fetch("student_batch", "academic_year", "academic_year");
+cur_frm.add_fetch("student_batch", "academic_year", "academic_year");
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_group/student_group.json b/erpnext/schools/doctype/student_group/student_group.json
index a0584e3..9e44f51 100644
--- a/erpnext/schools/doctype/student_group/student_group.json
+++ b/erpnext/schools/doctype/student_group/student_group.json
@@ -10,11 +10,13 @@
  "doctype": "DocType", 
  "document_type": "Document", 
  "editable_grid": 0, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "student_batch", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -22,6 +24,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Student Batch", 
    "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, 
@@ -41,6 +45,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "academic_year", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -48,6 +53,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Academic Year", 
    "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": 0, 
    "search_index": 0, 
@@ -67,6 +74,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "academic_term", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -74,6 +82,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Academic Term", 
    "length": 0, 
    "no_copy": 0, 
@@ -83,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, 
@@ -93,6 +103,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_3", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -100,6 +111,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -107,6 +119,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,6 +130,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "program", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -124,6 +138,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Program", 
    "length": 0, 
    "no_copy": 0, 
@@ -133,6 +148,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,6 +159,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "course", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -150,6 +167,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Course", 
    "length": 0, 
    "no_copy": 0, 
@@ -159,6 +177,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, 
@@ -169,6 +188,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "Set 0 for no limit", 
    "fieldname": "max_strength", 
    "fieldtype": "Int", 
@@ -177,6 +197,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Max Strength", 
    "length": 0, 
    "no_copy": 0, 
@@ -185,6 +206,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,6 +218,7 @@
    "bold": 0, 
    "collapsible": 1, 
    "collapsible_depends_on": "", 
+   "columns": 0, 
    "fieldname": "section_break_6", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -203,6 +226,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Students", 
    "length": 0, 
    "no_copy": 0, 
@@ -211,6 +235,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,6 +246,7 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "students", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -228,6 +254,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Students", 
    "length": 0, 
    "no_copy": 0, 
@@ -237,6 +264,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, 
@@ -247,6 +275,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "amended_from", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -254,6 +283,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amended From", 
    "length": 0, 
    "no_copy": 1, 
@@ -262,6 +292,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, 
@@ -280,7 +311,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-08-24 05:21:05.058875", 
+ "modified": "2016-12-01 12:57:17.125085", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Student Group", 
@@ -291,12 +322,34 @@
    "amend": 0, 
    "apply_user_permissions": 0, 
    "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 0, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "is_custom": 0, 
+   "permlevel": 0, 
+   "print": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Instructor", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
+   "write": 0
+  }, 
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
    "create": 1, 
    "delete": 1, 
    "email": 1, 
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
diff --git a/erpnext/schools/doctype/scheduling_tool/__init__.py b/erpnext/schools/doctype/student_leave_application/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/scheduling_tool/__init__.py
copy to erpnext/schools/doctype/student_leave_application/__init__.py
diff --git a/erpnext/schools/doctype/student_leave_application/student_leave_application.js b/erpnext/schools/doctype/student_leave_application/student_leave_application.js
new file mode 100644
index 0000000..4746148
--- /dev/null
+++ b/erpnext/schools/doctype/student_leave_application/student_leave_application.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Student Leave Application', {
+	refresh: function(frm) {
+
+	}
+});
diff --git a/erpnext/schools/doctype/student_leave_application/student_leave_application.json b/erpnext/schools/doctype/student_leave_application/student_leave_application.json
new file mode 100644
index 0000000..238b134
--- /dev/null
+++ b/erpnext/schools/doctype/student_leave_application/student_leave_application.json
@@ -0,0 +1,280 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "SLA.######", 
+ "beta": 0, 
+ "creation": "2016-11-28 15:38:54.793854", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_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": 0, 
+   "in_standard_filter": 0, 
+   "label": "Student", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Student", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "student_name", 
+   "fieldtype": "Read Only", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Student Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "student.title", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_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, 
+   "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": 0, 
+   "fieldname": "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": "Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "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": "reason", 
+   "fieldtype": "Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Reason", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_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_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Amended From", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Student Leave Application", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "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-12-01 12:57:55.914656", 
+ "modified_by": "Administrator", 
+ "module": "Schools", 
+ "name": "Student Leave Application", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 1, 
+   "apply_user_permissions": 0, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "is_custom": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Instructor", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 1, 
+   "write": 1
+  }, 
+  {
+   "amend": 1, 
+   "apply_user_permissions": 0, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "is_custom": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Academics User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "title_field": "student_name", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_leave_application/student_leave_application.py b/erpnext/schools/doctype/student_leave_application/student_leave_application.py
new file mode 100644
index 0000000..4a36590
--- /dev/null
+++ b/erpnext/schools/doctype/student_leave_application/student_leave_application.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class StudentLeaveApplication(Document):
+	pass
diff --git a/erpnext/schools/doctype/student_leave_application/test_student_leave_application.py b/erpnext/schools/doctype/student_leave_application/test_student_leave_application.py
new file mode 100644
index 0000000..ddb30ac
--- /dev/null
+++ b/erpnext/schools/doctype/student_leave_application/test_student_leave_application.py
@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+# test_records = frappe.get_test_records('Student Leave Application')
+
+class TestStudentLeaveApplication(unittest.TestCase):
+	pass
diff --git a/erpnext/schools/doctype/student_log/student_log.json b/erpnext/schools/doctype/student_log/student_log.json
index 4bb5bd6..7809c7e 100644
--- a/erpnext/schools/doctype/student_log/student_log.json
+++ b/erpnext/schools/doctype/student_log/student_log.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": "student", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -22,6 +24,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Student", 
    "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, 
    "fieldname": "type", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -48,6 +53,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Type", 
    "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": 0, 
    "search_index": 0, 
@@ -67,6 +74,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_3", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -74,6 +82,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -81,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, 
@@ -91,6 +101,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "student_name", 
    "fieldtype": "Read Only", 
    "hidden": 0, 
@@ -98,6 +109,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Student Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -107,6 +119,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,6 +130,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -124,6 +138,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -132,6 +147,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,6 +158,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_5", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -149,6 +166,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -156,6 +174,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -166,6 +185,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "log", 
    "fieldtype": "Text Editor", 
    "hidden": 0, 
@@ -173,6 +193,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Log", 
    "length": 0, 
    "no_copy": 0, 
@@ -181,6 +202,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, 
@@ -198,7 +220,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-07-29 07:35:28.623364", 
+ "modified": "2016-11-07 05:59:40.460389", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Student Log", 
@@ -215,6 +237,7 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
diff --git a/erpnext/schools/doctype/topic/topic.json b/erpnext/schools/doctype/topic/topic.json
index 6aedc1e..0a69f88 100644
--- a/erpnext/schools/doctype/topic/topic.json
+++ b/erpnext/schools/doctype/topic/topic.json
@@ -9,11 +9,14 @@
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Document", 
+ "editable_grid": 0, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "course", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -21,6 +24,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "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": 1, 
@@ -40,6 +45,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "topic_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -47,6 +53,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Topic Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -55,6 +62,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, 
@@ -65,6 +73,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "introduction", 
    "fieldtype": "Text", 
    "hidden": 0, 
@@ -72,6 +81,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Introduction", 
    "length": 0, 
    "no_copy": 0, 
@@ -80,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, 
@@ -90,6 +101,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "content", 
    "fieldtype": "Text Editor", 
    "hidden": 0, 
@@ -97,6 +109,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Content", 
    "length": 0, 
    "no_copy": 0, 
@@ -105,6 +118,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, 
@@ -122,7 +136,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-07-18 10:30:50.243271",
+ "modified": "2016-11-07 05:29:20.531725", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Topic", 
@@ -139,6 +153,7 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
diff --git a/erpnext/schools/doctype/scheduling_tool/__init__.py b/erpnext/schools/report/absent_student_report/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/scheduling_tool/__init__.py
copy to erpnext/schools/report/absent_student_report/__init__.py
diff --git a/erpnext/schools/report/absent_student_report/absent_student_report.js b/erpnext/schools/report/absent_student_report/absent_student_report.js
new file mode 100644
index 0000000..7515f22
--- /dev/null
+++ b/erpnext/schools/report/absent_student_report/absent_student_report.js
@@ -0,0 +1,15 @@
+// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+// License: GNU General Public License v3. See license.txt
+
+
+frappe.query_reports["Absent Student Report"] = {
+	"filters": [
+		{
+			"fieldname":"date",
+			"label": __("Date"),
+			"fieldtype": "Date",
+			"default": get_today(),
+			"reqd": 1
+		}
+	]
+}
diff --git a/erpnext/schools/report/absent_student_report/absent_student_report.json b/erpnext/schools/report/absent_student_report/absent_student_report.json
new file mode 100644
index 0000000..5f3ca71
--- /dev/null
+++ b/erpnext/schools/report/absent_student_report/absent_student_report.json
@@ -0,0 +1,18 @@
+{
+ "add_total_row": 0, 
+ "apply_user_permissions": 1, 
+ "creation": "2013-05-13 14:04:03", 
+ "disabled": 0, 
+ "docstatus": 0, 
+ "doctype": "Report", 
+ "idx": 1, 
+ "is_standard": "Yes", 
+ "modified": "2016-12-01 14:28:27.184668", 
+ "modified_by": "Administrator", 
+ "module": "Schools", 
+ "name": "Absent Student Report", 
+ "owner": "Administrator", 
+ "ref_doctype": "Student Attendance", 
+ "report_name": "Absent Student Report", 
+ "report_type": "Script Report"
+}
\ 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
new file mode 100644
index 0000000..82a20aa
--- /dev/null
+++ b/erpnext/schools/report/absent_student_report/absent_student_report.py
@@ -0,0 +1,60 @@
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.utils import cstr, cint, getdate
+from frappe import msgprint, _
+
+def execute(filters=None):
+	if not filters: filters = {}
+
+	if not filters.get("date"):
+		msgprint(_("Please select date"), raise_exception=1)
+	
+	columns = get_columns(filters)
+
+	absent_students = get_absent_students(filters.get("date"))
+	leave_applicants = get_leave_applications(filters.get("date"))
+
+	data = []
+	for student in absent_students:
+		if not student.student in leave_applicants:
+			row = [student.student, student.student_name, student.student_batch]
+			stud_details = frappe.db.get_value("Student", student.student, ['student_email_id', 'student_mobile_number'], as_dict=True)
+			
+			if stud_details.student_email_id:
+				row+=[stud_details.student_email_id]
+			else:
+				row+= [""]
+			
+			if stud_details.student_mobile_number:
+				row+=[stud_details.student_mobile_number]
+			else:
+				row+= [""]
+				
+			data.append(row)
+	
+	return columns, data
+
+def get_columns(filters):
+	columns = [ 
+		_("Student") + ":Link/Student:90", 
+		_("Student Name") + "::150", 
+		_("Student Batch") + "::180",
+		_("Student Email ID") + "::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)
+	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):
+		leave_applicants.append(student[0])
+	return leave_applicants
\ No newline at end of file
diff --git a/erpnext/schools/doctype/scheduling_tool/__init__.py b/erpnext/schools/report/student_batch_wise_attendance/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/scheduling_tool/__init__.py
copy to erpnext/schools/report/student_batch_wise_attendance/__init__.py
diff --git a/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.js b/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.js
new file mode 100644
index 0000000..51f7346
--- /dev/null
+++ b/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.js
@@ -0,0 +1,12 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.query_reports["Student Batch-Wise Attendance"] = {
+    "filters": [{
+        "fieldname": "date",
+        "label": __("Date"),
+        "fieldtype": "Date",
+        "default": get_today(),
+        "reqd": 1
+    }]
+}
\ 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
new file mode 100644
index 0000000..8e5e483
--- /dev/null
+++ b/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.json
@@ -0,0 +1,18 @@
+{
+ "add_total_row": 0, 
+ "apply_user_permissions": 1, 
+ "creation": "2016-11-28 22:07:03.859124", 
+ "disabled": 0, 
+ "docstatus": 0, 
+ "doctype": "Report", 
+ "idx": 0, 
+ "is_standard": "Yes", 
+ "modified": "2016-12-01 15:48:50.120579", 
+ "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"
+}
\ 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
new file mode 100644
index 0000000..c112b59
--- /dev/null
+++ b/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py
@@ -0,0 +1,64 @@
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.utils import cstr, cint, getdate
+from frappe import msgprint, _
+
+def execute(filters=None):
+	if not filters: filters = {}
+
+	if not filters.get("date"):
+		msgprint(_("Please select date"), raise_exception=1)
+	
+	columns = get_columns(filters)
+
+	active_student_batch = get_active_student_batch()
+
+	data = []
+	for student_batch in active_student_batch:
+		row = [student_batch.name]
+		present_students = 0
+		absent_students = 0
+		student_batch_strength = get_student_batch_strength(student_batch.name)
+		student_attendance = get_student_attendance(student_batch.name, filters.get("date"))
+		if student_attendance:
+			for attendance in student_attendance:
+				if attendance.status== "Present":
+					present_students = attendance.count
+				elif attendance.status== "Absent":
+					absent_students = attendance.count
+
+		unmarked_students = student_batch_strength - (present_students + absent_students)
+		row+= [student_batch_strength, present_students, absent_students, unmarked_students]
+		data.append(row)
+
+	return columns, data
+
+def get_columns(filters):
+	columns = [ 
+		_("Student batch") + ":Link/Student Batch:250", 
+		_("Student batch Strength") + "::170", 
+		_("Present") + "::90", 
+		_("Absent") + "::90",
+		_("Not Marked") + "::90"
+	]
+	return columns
+
+def get_active_student_batch():
+	active_student_batch = frappe.db.sql("""select name from `tabStudent Batch` 
+		where enabled = 1 order by name""", as_dict=1)
+	return active_student_batch
+
+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]
+	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\
+				(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/doctype/scheduling_tool/__init__.py b/erpnext/schools/report/student_monthly_attendance_sheet/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/scheduling_tool/__init__.py
copy to erpnext/schools/report/student_monthly_attendance_sheet/__init__.py
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
new file mode 100644
index 0000000..32c0551
--- /dev/null
+++ b/erpnext/schools/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.js
@@ -0,0 +1,42 @@
+// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+// License: GNU General Public License v3. See license.txt
+
+
+frappe.query_reports["Student Monthly Attendance Sheet"] = {
+	"filters": [
+		{
+			"fieldname":"month",
+			"label": __("Month"),
+			"fieldtype": "Select",
+			"options": "Jan\nFeb\nMar\nApr\nMay\nJun\nJul\nAug\nSep\nOct\nNov\nDec",
+			"default": ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov",
+				"Dec"][frappe.datetime.str_to_obj(frappe.datetime.get_today()).getMonth()],
+		},
+		{
+			"fieldname":"year",
+			"label": __("Year"),
+			"fieldtype": "Select",
+			"reqd": 1
+		},
+		{
+			"fieldname":"student_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);
+			}
+		});
+	}
+}
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
new file mode 100644
index 0000000..1d8f4d0
--- /dev/null
+++ b/erpnext/schools/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.json
@@ -0,0 +1,18 @@
+{
+ "add_total_row": 0, 
+ "apply_user_permissions": 1, 
+ "creation": "2013-05-13 14:04:03", 
+ "disabled": 0, 
+ "docstatus": 0, 
+ "doctype": "Report", 
+ "idx": 1, 
+ "is_standard": "Yes", 
+ "modified": "2016-12-01 14:29:53.547378", 
+ "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"
+}
\ 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
new file mode 100644
index 0000000..2f8ba52
--- /dev/null
+++ b/erpnext/schools/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.py
@@ -0,0 +1,82 @@
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.utils import cstr, cint, getdate
+from frappe import msgprint, _
+from calendar import monthrange
+from erpnext.schools.api import get_student_batch_students
+
+def execute(filters=None):
+	if not filters: filters = {}
+
+	conditions, filters = get_conditions(filters)
+	columns = get_columns(filters)
+	att_map = get_attendance_list(conditions, filters)
+	students = get_student_batch_students(filters.get("student_batch"))
+	data = []
+	for stud in students:
+		row = [stud.student, stud.student_name]
+
+		total_p = total_a = 0.0
+		for day in range(filters["total_days_in_month"]):
+			status="None"
+			if att_map.get(stud.student):
+				status = att_map.get(stud.student).get(day + 1, "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
+
+		row += [total_p, total_a]
+		data.append(row)
+
+	return columns, data
+
+def get_columns(filters):
+	columns = [ _("Student") + ":Link/Student:90", _("Student Name") + "::150"]
+
+	for day in range(filters["total_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)
+
+	att_map = {}
+	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
+
+	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)
+
+	filters["month"] = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov",
+		"Dec"].index(filters.month) + 1
+
+	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
+
+@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/selling/doctype/campaign/campaign.js b/erpnext/selling/doctype/campaign/campaign.js
index 31a796f..72a90d0 100644
--- a/erpnext/selling/doctype/campaign/campaign.js
+++ b/erpnext/selling/doctype/campaign/campaign.js
@@ -10,6 +10,6 @@
 		cur_frm.add_custom_button(__("View Leads"), function() {
 			frappe.route_options = {"source": "Campaign","campaign_name": frm.doc.name}
 			frappe.set_route("List", "Lead");
-		}, "icon-list", true);
+		}, "fa fa-list", true);
 	}
 })
diff --git a/erpnext/selling/doctype/campaign/campaign.json b/erpnext/selling/doctype/campaign/campaign.json
index 2c1d2b4..9487540 100644
--- a/erpnext/selling/doctype/campaign/campaign.json
+++ b/erpnext/selling/doctype/campaign/campaign.json
@@ -118,7 +118,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-bullhorn", 
+ "icon": "fa fa-bullhorn", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
diff --git a/erpnext/selling/doctype/customer/customer.js b/erpnext/selling/doctype/customer/customer.js
index 20ecc7b..ea88e8b 100644
--- a/erpnext/selling/doctype/customer/customer.js
+++ b/erpnext/selling/doctype/customer/customer.js
@@ -2,6 +2,29 @@
 // License: GNU General Public License v3. See license.txt
 
 frappe.ui.form.on("Customer", {
+	setup: function(frm) {
+		frm.add_fetch('lead_name', 'company_name', 'customer_name');
+		frm.add_fetch('default_sales_partner','commission_rate','default_commission_rate');
+
+		frm.set_query('customer_group', {'is_group': 0});
+		frm.set_query('default_price_list', { 'selling': 1});
+		frm.set_query('account', 'accounts', function(doc, cdt, cdn) {
+			var d  = locals[cdt][cdn];
+			var filters = {
+				'account_type': 'Receivable',
+				'company': d.company,
+				"is_group": 0
+			};
+
+			if(doc.party_account_currency) {
+				$.extend(filters, {"account_currency": doc.party_account_currency});
+			}
+
+			return {
+				filters: filters
+			}
+		});
+	},
 	refresh: function(frm) {
 		if(frappe.defaults.get_default("cust_master_name")!="Naming Series") {
 			frm.toggle_display("naming_series", false);
@@ -13,6 +36,20 @@
 
 		if(!frm.doc.__islocal) {
 			erpnext.utils.render_address_and_contact(frm);
+
+			// custom buttons
+			frm.add_custom_button(__('Accounting Ledger'), function() {
+				frappe.set_route('query-report', 'General Ledger',
+					{party_type:'Customer', party:frm.doc.name});
+			});
+
+			frm.add_custom_button(__('Accounts Receivable'), function() {
+				frappe.set_route('query-report', 'Accounts Receivable', {customer:frm.doc.name});
+			});
+
+			// indicator
+			erpnext.utils.set_party_dashboard_indicators(frm);
+
 		} else {
 			erpnext.utils.clear_address_and_contact(frm);
 		}
@@ -23,55 +60,5 @@
 	},
 	validate: function(frm) {
 		if(frm.doc.lead_name) frappe.model.clear_doc("Lead", frm.doc.lead_name);
-	}
+	},
 });
-
-cur_frm.cscript.onload = function(doc, dt, dn) {
-	cur_frm.cscript.load_defaults(doc, dt, dn);
-}
-
-cur_frm.cscript.load_defaults = function(doc, dt, dn) {
-	doc = locals[doc.doctype][doc.name];
-	if(!(doc.__islocal && doc.lead_name)) { return; }
-
-	var fields_to_refresh = frappe.model.set_default_values(doc);
-	if(fields_to_refresh) { refresh_many(fields_to_refresh); }
-}
-
-cur_frm.add_fetch('lead_name', 'company_name', 'customer_name');
-cur_frm.add_fetch('default_sales_partner','commission_rate','default_commission_rate');
-
-cur_frm.fields_dict['customer_group'].get_query = function(doc, dt, dn) {
-	return{
-		filters:{'is_group': 0}
-	}
-}
-
-cur_frm.fields_dict.lead_name.get_query = function(doc, cdt, cdn) {
-	return{
-		query: "erpnext.controllers.queries.lead_query"
-	}
-}
-
-cur_frm.fields_dict['default_price_list'].get_query = function(doc, cdt, cdn) {
-	return{
-		filters:{'selling': 1}
-	}
-}
-
-cur_frm.fields_dict['accounts'].grid.get_field('account').get_query = function(doc, cdt, cdn) {
-	var d  = locals[cdt][cdn];
-	var filters = {
-		'account_type': 'Receivable',
-		'company': d.company,
-		"is_group": 0
-	};
-
-	if(doc.party_account_currency) {
-		$.extend(filters, {"account_currency": doc.party_account_currency});
-	}
-
-	return {
-		filters: filters
-	}
-}
diff --git a/erpnext/selling/doctype/customer/customer.json b/erpnext/selling/doctype/customer/customer.json
index bbd23cb..77cc624 100644
--- a/erpnext/selling/doctype/customer/customer.json
+++ b/erpnext/selling/doctype/customer/customer.json
@@ -11,11 +11,13 @@
  "doctype": "DocType", 
  "document_type": "Setup", 
  "editable_grid": 0, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "basic_info", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -23,15 +25,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Name and Type", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-user", 
+   "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, 
@@ -42,6 +46,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "naming_series", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -49,6 +54,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Series", 
    "length": 0, 
    "no_copy": 1, 
@@ -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": 0, 
    "search_index": 0, 
@@ -67,6 +74,7 @@
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "customer_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -74,6 +82,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Full Name", 
    "length": 0, 
    "no_copy": 1, 
@@ -83,6 +92,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, 
@@ -93,6 +103,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "customer_type", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -100,6 +111,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Type", 
    "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, 
@@ -120,6 +133,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "lead_name", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -127,6 +141,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "From Lead", 
    "length": 0, 
    "no_copy": 1, 
@@ -137,6 +152,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, 
@@ -147,6 +163,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "image", 
    "fieldtype": "Attach Image", 
    "hidden": 1, 
@@ -154,6 +171,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Image", 
    "length": 0, 
    "no_copy": 0, 
@@ -162,6 +180,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, 
@@ -172,6 +191,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "Active", 
    "fieldname": "status", 
    "fieldtype": "Select", 
@@ -180,6 +200,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Status", 
    "length": 0, 
    "no_copy": 0, 
@@ -189,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, 
@@ -199,6 +221,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break0", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -206,12 +229,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, 
@@ -223,6 +248,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "", 
    "fieldname": "customer_group", 
    "fieldtype": "Link", 
@@ -231,6 +257,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Customer Group", 
    "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": 1, 
    "search_index": 1, 
@@ -251,6 +279,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "", 
    "fieldname": "territory", 
    "fieldtype": "Link", 
@@ -259,6 +288,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Territory", 
    "length": 0, 
    "no_copy": 0, 
@@ -269,6 +299,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, 
@@ -279,6 +310,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "tax_id", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -286,6 +318,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Tax ID", 
    "length": 0, 
    "no_copy": 0, 
@@ -294,6 +327,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,6 +338,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "0", 
    "fieldname": "disabled", 
    "fieldtype": "Check", 
@@ -312,6 +347,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Disabled", 
    "length": 0, 
    "no_copy": 0, 
@@ -320,6 +356,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, 
@@ -330,6 +367,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
+   "columns": 0, 
    "fieldname": "currency_and_price_list", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -337,6 +375,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Currency and Price List", 
    "length": 0, 
    "no_copy": 0, 
@@ -345,6 +384,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, 
@@ -355,6 +395,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "default_currency", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -362,6 +403,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Billing Currency", 
    "length": 0, 
    "no_copy": 1, 
@@ -370,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, 
@@ -380,6 +423,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "default_price_list", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -387,6 +431,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Default Price List", 
    "length": 0, 
    "no_copy": 0, 
@@ -395,6 +440,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, 
@@ -405,6 +451,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_14", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -412,6 +459,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -419,6 +467,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,6 +478,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "language", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -436,6 +486,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Print Language", 
    "length": 0, 
    "no_copy": 0, 
@@ -445,6 +496,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, 
@@ -455,6 +507,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:!doc.__islocal", 
    "fieldname": "address_contacts", 
    "fieldtype": "Section Break", 
@@ -463,14 +516,16 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Address and Contact", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "icon-map-marker", 
+   "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, 
@@ -481,6 +536,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "address_html", 
    "fieldtype": "HTML", 
    "hidden": 0, 
@@ -488,6 +544,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Address HTML", 
    "length": 0, 
    "no_copy": 0, 
@@ -495,6 +552,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, 
@@ -505,6 +563,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "website", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -512,6 +571,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Website", 
    "length": 0, 
    "no_copy": 0, 
@@ -519,6 +579,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, 
@@ -529,6 +590,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break1", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -536,12 +598,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, 
@@ -553,6 +617,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "contact_html", 
    "fieldtype": "HTML", 
    "hidden": 0, 
@@ -560,6 +625,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Contact HTML", 
    "length": 0, 
    "no_copy": 0, 
@@ -568,6 +634,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,6 +646,7 @@
    "bold": 0, 
    "collapsible": 1, 
    "collapsible_depends_on": "", 
+   "columns": 0, 
    "fieldname": "default_receivable_accounts", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -586,6 +654,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Accounting", 
    "length": 0, 
    "no_copy": 0, 
@@ -593,6 +662,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, 
@@ -603,6 +673,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "", 
    "description": "Mention if non-standard receivable account", 
    "fieldname": "accounts", 
@@ -612,6 +683,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Accounts", 
    "length": 0, 
    "no_copy": 0, 
@@ -620,6 +692,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, 
@@ -631,6 +704,7 @@
    "bold": 0, 
    "collapsible": 1, 
    "collapsible_depends_on": "eval:doc.credit_days || doc.credit_limit", 
+   "columns": 0, 
    "fieldname": "credit_limit_section", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -638,6 +712,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Credit Limit", 
    "length": 0, 
    "no_copy": 0, 
@@ -645,6 +720,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, 
@@ -656,6 +732,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "credit_days_based_on", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -663,6 +740,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Credit Days Based On", 
    "length": 0, 
    "no_copy": 0, 
@@ -672,6 +750,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, 
@@ -682,6 +761,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", 
@@ -690,6 +770,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Credit Days", 
    "length": 0, 
    "no_copy": 0, 
@@ -699,6 +780,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, 
@@ -709,6 +791,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "credit_limit", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -716,6 +799,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Credit Limit", 
    "length": 0, 
    "no_copy": 0, 
@@ -726,6 +810,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, 
@@ -737,6 +822,7 @@
    "bold": 0, 
    "collapsible": 1, 
    "collapsible_depends_on": "customer_details", 
+   "columns": 0, 
    "fieldname": "more_info", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -744,15 +830,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "More Information", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-file-text", 
+   "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, 
@@ -763,6 +851,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "Additional information regarding the customer.", 
    "fieldname": "customer_details", 
    "fieldtype": "Text", 
@@ -771,6 +860,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer Details", 
    "length": 0, 
    "no_copy": 0, 
@@ -780,6 +870,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, 
@@ -790,6 +881,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "is_frozen", 
    "fieldtype": "Check", 
    "hidden": 0, 
@@ -797,6 +889,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Is Frozen", 
    "length": 0, 
    "no_copy": 0, 
@@ -805,6 +898,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, 
@@ -816,6 +910,7 @@
    "bold": 0, 
    "collapsible": 1, 
    "collapsible_depends_on": "default_sales_partner", 
+   "columns": 0, 
    "fieldname": "sales_team_section_break", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -823,15 +918,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Sales Partner and Commission", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-group", 
+   "options": "fa fa-group", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -842,6 +939,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "default_sales_partner", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -849,6 +947,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Sales Partner", 
    "length": 0, 
    "no_copy": 0, 
@@ -859,6 +958,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, 
@@ -869,6 +969,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "default_commission_rate", 
    "fieldtype": "Float", 
    "hidden": 0, 
@@ -876,6 +977,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Commission Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -885,6 +987,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, 
@@ -896,6 +999,7 @@
    "bold": 0, 
    "collapsible": 1, 
    "collapsible_depends_on": "sales_team", 
+   "columns": 0, 
    "fieldname": "sales_team_section", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -903,6 +1007,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Sales Team", 
    "length": 0, 
    "no_copy": 0, 
@@ -911,6 +1016,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, 
@@ -921,6 +1027,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "sales_team", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -928,6 +1035,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Sales Team Details", 
    "length": 0, 
    "no_copy": 0, 
@@ -938,6 +1046,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, 
@@ -947,7 +1056,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-user", 
+ "icon": "fa fa-user", 
  "idx": 363, 
  "image_field": "image", 
  "image_view": 0, 
@@ -957,7 +1066,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-08-23 05:43:04.309480", 
+ "modified": "2016-11-07 05:26:57.948263", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Customer", 
@@ -974,6 +1083,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -994,6 +1104,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 1, 
    "print": 0, 
    "read": 1, 
@@ -1014,6 +1125,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1034,6 +1146,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1054,6 +1167,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 1, 
    "print": 0, 
    "read": 1, 
@@ -1074,6 +1188,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1094,6 +1209,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1114,6 +1230,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1134,6 +1251,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
diff --git a/erpnext/selling/doctype/customer/customer.py b/erpnext/selling/doctype/customer/customer.py
index ee3f6e6..48e2982 100644
--- a/erpnext/selling/doctype/customer/customer.py
+++ b/erpnext/selling/doctype/customer/customer.py
@@ -12,6 +12,7 @@
 from erpnext.utilities.address_and_contact import load_address_and_contact
 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):
 	def get_feed(self):
@@ -20,6 +21,27 @@
 	def onload(self):
 		"""Load address and contacts in `__onload`"""
 		load_address_and_contact(self, "customer")
+		self.load_dashboard_info()
+
+	def load_dashboard_info(self):
+		billing_this_year = frappe.db.sql("""
+			select sum(debit_in_account_currency) - sum(credit_in_account_currency), account_currency
+			from `tabGL Entry`
+			where voucher_type='Sales Invoice' and party_type = 'Customer'
+				and party=%s and fiscal_year = %s""",
+			(self.name, frappe.db.get_default("fiscal_year")))
+
+		total_unpaid = frappe.db.sql("""select sum(outstanding_amount)
+			from `tabSales Invoice`
+			where customer=%s and docstatus = 1""", self.name)
+
+		info = {}
+		info["billing_this_year"] = billing_this_year[0][0] if billing_this_year else 0
+		info["currency"] = billing_this_year[0][1] if billing_this_year else get_default_currency()
+		info["total_unpaid"] = total_unpaid[0][0] if total_unpaid else 0
+
+		self.set_onload('dashboard_info', info)
+
 
 	def autoname(self):
 		cust_master_name = frappe.defaults.get_global_default('cust_master_name')
@@ -33,21 +55,45 @@
 
 	def get_customer_name(self):
 		if frappe.db.get_value("Customer", self.customer_name):
-			count = frappe.db.sql("""select ifnull(max(SUBSTRING_INDEX(name, ' ', -1)), 0) from tabCustomer
+			count = frappe.db.sql("""select ifnull(MAX(CAST(SUBSTRING_INDEX(name, ' ', -1) AS UNSIGNED)), 0) from tabCustomer
 				 where name like %s""", "%{0} - %".format(self.customer_name), as_list=1)[0][0]
 			count = cint(count) + 1
 			return "{0} - {1}".format(self.customer_name, cstr(count))
 
 		return self.customer_name
 
+	def after_insert(self):
+		'''If customer created from Lead, update customer id in quotations, opportunities'''
+		self.update_lead_status()
+
 	def validate(self):
 		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):
+		self.validate_name_with_customer_group()
+
+		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()
 
 	def update_lead_status(self):
+		'''If Customer created from Lead, update lead status to "Converted"
+		update Customer link in Quotation, Opportunity'''
 		if self.lead_name:
-			frappe.db.sql("update `tabLead` set status='Converted' where name = %s", self.lead_name)
+		 	frappe.db.set_value('Lead', self.lead_name, 'status', 'Converted', update_modified=False)
+
+			for doctype in ('Opportunity', 'Quotation'):
+				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()
@@ -78,20 +124,19 @@
 			if not frappe.db.exists("Contact", c.name):
 				c.insert()
 
-	def on_update(self):
-		self.validate_name_with_customer_group()
-
-		self.update_lead_status()
-		self.update_address()
-		self.update_contact()
-
-		if self.flags.is_new_doc:
-			self.create_lead_address_contact()
-
 	def validate_name_with_customer_group(self):
 		if frappe.db.exists("Customer Group", self.name):
 			frappe.throw(_("A Customer Group exists with same name please change the Customer name or rename the Customer Group"), frappe.NameError)
 
+	def validate_credit_limit_on_change(self):
+		if self.get("__islocal") or self.credit_limit == frappe.db.get_value("Customer", self.name, "credit_limit"):
+			return
+
+		for company in frappe.get_all("Company"):
+			outstanding_amt = get_customer_outstanding(self.name, company.name)
+			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,))
diff --git a/erpnext/selling/doctype/customer/customer_dashboard.py b/erpnext/selling/doctype/customer/customer_dashboard.py
index b65c199..681b04a 100644
--- a/erpnext/selling/doctype/customer/customer_dashboard.py
+++ b/erpnext/selling/doctype/customer/customer_dashboard.py
@@ -1,25 +1,26 @@
 from frappe import _
 
-data = {
-	'heatmap': True,
-	'heatmap_message': _('This is based on transactions against this Customer. See timeline below for details'),
-	'fieldname': 'customer',
-	'transactions': [
-		{
-			'label': _('Pre Sales'),
-			'items': ['Opportunity', 'Quotation']
-		},
-		{
-			'label': _('Orders'),
-			'items': ['Sales Order', 'Delivery Note', 'Sales Invoice']
-		},
-		{
-			'label': _('Support'),
-			'items': ['Issue']
-		},
-		{
-			'label': _('Projects'),
-			'items': ['Project']
-		}
-	]
-}
\ No newline at end of file
+def get_data():
+	return {
+		'heatmap': True,
+		'heatmap_message': _('This is based on transactions against this Customer. See timeline below for details'),
+		'fieldname': 'customer',
+		'transactions': [
+			{
+				'label': _('Pre Sales'),
+				'items': ['Opportunity', 'Quotation']
+			},
+			{
+				'label': _('Orders'),
+				'items': ['Sales Order', 'Delivery Note', 'Sales Invoice']
+			},
+			{
+				'label': _('Support'),
+				'items': ['Issue']
+			},
+			{
+				'label': _('Projects'),
+				'items': ['Project']
+			}
+		]
+	}
\ No newline at end of file
diff --git a/erpnext/selling/doctype/customer/test_customer.py b/erpnext/selling/doctype/customer/test_customer.py
index 9e53845..23df503 100644
--- a/erpnext/selling/doctype/customer/test_customer.py
+++ b/erpnext/selling/doctype/customer/test_customer.py
@@ -8,12 +8,17 @@
 
 from frappe.test_runner import make_test_records
 from erpnext.exceptions import PartyFrozen, PartyDisabled
+from frappe.utils import flt
+from erpnext.selling.doctype.customer.customer import get_credit_limit, get_customer_outstanding
 
 test_ignore = ["Price List"]
 
 test_records = frappe.get_test_records('Customer')
 
 class TestCustomer(unittest.TestCase):
+	def tearDown(self):
+		frappe.db.set_value("Customer", '_Test Customer', 'credit_limit', 0.0)
+
 	def test_party_details(self):
 		from erpnext.accounts.party import get_party_details
 
@@ -111,6 +116,64 @@
 		self.assertEquals("_Test Customer 1 - 1", duplicate_customer.name)
 		self.assertEquals(test_customer_1.customer_name, duplicate_customer.customer_name)
 
+	def get_customer_outstanding_amount(self):
+		outstanding_amt = get_customer_outstanding('_Test Customer', '_Test Company')
+
+		# If outstanding is negative make a transaction to get positive outstanding amount
+		if outstanding_amt > 0.0:
+			return outstanding_amt
+
+		item_qty = int((abs(outstanding_amt) + 200)/100)
+		make_sales_order({'qty':item_qty})
+		return get_customer_outstanding('_Test Customer', '_Test Company')
+
+	def test_customer_credit_limit(self):
+		from erpnext.stock.doctype.delivery_note.test_delivery_note import create_delivery_note
+		from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
+		from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_order
+		from erpnext.selling.doctype.sales_order.sales_order import make_sales_invoice
+
+		outstanding_amt = self.get_customer_outstanding_amount()
+		credit_limit = get_credit_limit('_Test Customer', '_Test Company')
+
+		if outstanding_amt <= 0.0:
+			item_qty = int((abs(outstanding_amt) + 200)/100)
+			make_sales_order({'qty':item_qty})
+
+		if credit_limit == 0.0:
+			frappe.db.set_value("Customer", '_Test Customer', 'credit_limit', outstanding_amt - 50.0)
+
+		# Sales Order
+		so = make_sales_order(do_not_submit=True)
+		self.assertRaises(frappe.ValidationError, so.submit)
+
+		# Delivery Note
+		dn = create_delivery_note(do_not_submit=True)
+		self.assertRaises(frappe.ValidationError, dn.submit)
+
+		# Sales Invoice
+		si = create_sales_invoice(do_not_submit=True)
+		self.assertRaises(frappe.ValidationError, si.submit)
+
+		if credit_limit > outstanding_amt:
+			frappe.db.set_value("Customer", '_Test Customer', 'credit_limit', credit_limit)
+
+		# Makes Sales invoice from Sales Order
+		so.save(ignore_permissions=True)
+		si = make_sales_invoice(so.name)
+		si.save(ignore_permissions=True)
+		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)
+
 def get_customer_dict(customer_name):
 	return {
 		 "customer_group": "_Test Customer Group",
@@ -119,4 +182,3 @@
 		 "doctype": "Customer",
 		 "territory": "_Test Territory"
 	}
-
diff --git a/erpnext/selling/doctype/industry_type/industry_type.json b/erpnext/selling/doctype/industry_type/industry_type.json
index 9d23215..027626c 100644
--- a/erpnext/selling/doctype/industry_type/industry_type.json
+++ b/erpnext/selling/doctype/industry_type/industry_type.json
@@ -40,7 +40,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-flag", 
+ "icon": "fa fa-flag", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
diff --git a/erpnext/selling/doctype/installation_note/installation_note.js b/erpnext/selling/doctype/installation_note/installation_note.js
index 5b99691..0334ae7 100644
--- a/erpnext/selling/doctype/installation_note/installation_note.js
+++ b/erpnext/selling/doctype/installation_note/installation_note.js
@@ -60,7 +60,7 @@
 							company: cur_frm.doc.company
 						}
 					})
-				}, "icon-download", "btn-default"
+				}, "fa fa-download", "btn-default"
 			);
 		}
 	},
diff --git a/erpnext/selling/doctype/installation_note/installation_note.json b/erpnext/selling/doctype/installation_note/installation_note.json
index 5719f22..0254ec8 100644
--- a/erpnext/selling/doctype/installation_note/installation_note.json
+++ b/erpnext/selling/doctype/installation_note/installation_note.json
@@ -3,16 +3,19 @@
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "naming_series:", 
+ "beta": 0, 
  "creation": "2013-04-30 13:13:06", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Document", 
+ "editable_grid": 0, 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "installation_note", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -20,6 +23,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Installation Note", 
    "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,6 +43,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break0", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -45,6 +51,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
@@ -52,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, 
@@ -63,6 +71,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "naming_series", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -70,6 +79,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Series", 
    "length": 0, 
    "no_copy": 1, 
@@ -80,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, 
@@ -90,6 +101,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "customer", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -97,6 +109,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Customer", 
    "length": 0, 
    "no_copy": 0, 
@@ -107,6 +120,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, 
@@ -117,6 +131,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "customer", 
    "fieldname": "customer_address", 
    "fieldtype": "Link", 
@@ -125,6 +140,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer Address", 
    "length": 0, 
    "no_copy": 0, 
@@ -133,6 +149,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, 
@@ -143,6 +160,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "customer", 
    "fieldname": "contact_person", 
    "fieldtype": "Link", 
@@ -151,6 +169,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Contact Person", 
    "length": 0, 
    "no_copy": 0, 
@@ -159,6 +178,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, 
@@ -169,6 +189,7 @@
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "customer_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -176,6 +197,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -185,6 +207,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, 
@@ -195,6 +218,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "address_display", 
    "fieldtype": "Small Text", 
    "hidden": 1, 
@@ -202,6 +226,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Address", 
    "length": 0, 
    "no_copy": 0, 
@@ -209,6 +234,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, 
@@ -219,6 +245,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "contact_display", 
    "fieldtype": "Small Text", 
    "hidden": 1, 
@@ -226,6 +253,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Contact", 
    "length": 0, 
    "no_copy": 0, 
@@ -233,6 +261,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, 
@@ -243,6 +272,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "customer", 
    "fieldname": "contact_mobile", 
    "fieldtype": "Small Text", 
@@ -251,6 +281,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Mobile No", 
    "length": 0, 
    "no_copy": 0, 
@@ -258,6 +289,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,6 +300,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "customer", 
    "fieldname": "contact_email", 
    "fieldtype": "Data", 
@@ -276,6 +309,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Contact Email", 
    "length": 0, 
    "no_copy": 0, 
@@ -284,6 +318,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, 
@@ -294,6 +329,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "customer", 
    "description": "", 
    "fieldname": "territory", 
@@ -303,6 +339,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Territory", 
    "length": 0, 
    "no_copy": 0, 
@@ -311,6 +348,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, 
@@ -321,6 +359,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "customer", 
    "description": "", 
    "fieldname": "customer_group", 
@@ -330,6 +369,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer Group", 
    "length": 0, 
    "no_copy": 0, 
@@ -338,6 +378,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, 
@@ -348,6 +389,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break1", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -355,6 +397,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
@@ -362,6 +405,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, 
@@ -373,6 +417,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "inst_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -380,6 +425,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Installation Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -389,6 +435,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, 
@@ -399,6 +446,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "inst_time", 
    "fieldtype": "Time", 
    "hidden": 0, 
@@ -406,6 +454,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Installation Time", 
    "length": 0, 
    "no_copy": 0, 
@@ -415,6 +464,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, 
@@ -425,6 +475,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "Draft", 
    "fieldname": "status", 
    "fieldtype": "Select", 
@@ -433,6 +484,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Status", 
    "length": 0, 
    "no_copy": 1, 
@@ -443,6 +495,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, 
@@ -453,6 +506,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "", 
    "fieldname": "company", 
    "fieldtype": "Link", 
@@ -461,6 +515,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -471,6 +526,7 @@
    "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, 
@@ -481,6 +537,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "amended_from", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -488,6 +545,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amended From", 
    "length": 0, 
    "no_copy": 1, 
@@ -498,6 +556,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, 
@@ -508,6 +567,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "remarks", 
    "fieldtype": "Small Text", 
    "hidden": 0, 
@@ -515,6 +575,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Remarks", 
    "length": 0, 
    "no_copy": 0, 
@@ -524,6 +585,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, 
@@ -534,6 +596,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "item_details", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -541,6 +604,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
@@ -550,6 +614,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, 
@@ -560,6 +625,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "items", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -567,6 +633,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Items", 
    "length": 0, 
    "no_copy": 0, 
@@ -577,6 +644,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, 
@@ -586,15 +654,16 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-wrench", 
+ "icon": "fa fa-wrench", 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-04-06 03:15:14.774949", 
+ "modified": "2016-11-07 05:53:24.141335", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Installation Note", 
@@ -610,6 +679,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -630,6 +700,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 1, 
    "print": 0, 
    "read": 1, 
@@ -641,6 +712,7 @@
    "write": 0
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "sort_field": "modified", 
diff --git a/erpnext/selling/doctype/product_bundle/product_bundle.json b/erpnext/selling/doctype/product_bundle/product_bundle.json
index 7ec3df8..0edb8e6 100644
--- a/erpnext/selling/doctype/product_bundle/product_bundle.json
+++ b/erpnext/selling/doctype/product_bundle/product_bundle.json
@@ -108,7 +108,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-sitemap", 
+ "icon": "fa fa-sitemap", 
  "idx": 1, 
  "in_create": 0, 
  "in_dialog": 0, 
diff --git a/erpnext/selling/doctype/quotation/quotation.json b/erpnext/selling/doctype/quotation/quotation.json
index 4668c3b..4fc536e 100644
--- a/erpnext/selling/doctype/quotation/quotation.json
+++ b/erpnext/selling/doctype/quotation/quotation.json
@@ -23,14 +23,16 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "icon-user", 
+   "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, 
@@ -50,6 +52,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Title", 
    "length": 0, 
    "no_copy": 1, 
@@ -58,6 +61,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, 
@@ -76,6 +80,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Series", 
    "length": 0, 
    "no_copy": 1, 
@@ -86,6 +91,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, 
@@ -105,6 +111,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Quotation To", 
    "length": 0, 
    "no_copy": 0, 
@@ -115,6 +122,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, 
@@ -134,6 +142,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Customer", 
    "length": 0, 
    "no_copy": 0, 
@@ -144,6 +153,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, 
@@ -163,6 +173,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Lead", 
    "length": 0, 
    "no_copy": 0, 
@@ -173,6 +184,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, 
@@ -191,6 +203,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -198,6 +211,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, 
@@ -216,6 +230,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
@@ -223,6 +238,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,6 +258,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amended From", 
    "length": 0, 
    "no_copy": 1, 
@@ -252,6 +269,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, 
@@ -272,6 +290,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -282,6 +301,7 @@
    "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, 
@@ -302,6 +322,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Date", 
    "length": 0, 
    "no_copy": 1, 
@@ -311,6 +332,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, 
@@ -331,6 +353,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Order Type", 
    "length": 0, 
    "no_copy": 0, 
@@ -341,6 +364,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, 
@@ -361,14 +385,16 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Address and Contact", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "icon-bullhorn", 
+   "options": "fa fa-bullhorn", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -387,6 +413,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer Address", 
    "length": 0, 
    "no_copy": 0, 
@@ -395,6 +422,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, 
@@ -413,6 +441,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Address", 
    "length": 0, 
    "no_copy": 0, 
@@ -422,6 +451,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, 
@@ -441,6 +471,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Contact Person", 
    "length": 0, 
    "no_copy": 0, 
@@ -451,6 +482,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, 
@@ -469,6 +501,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Contact", 
    "length": 0, 
    "no_copy": 0, 
@@ -476,6 +509,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, 
@@ -494,6 +528,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Mobile No", 
    "length": 0, 
    "no_copy": 0, 
@@ -501,6 +536,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, 
@@ -519,6 +555,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Contact Email", 
    "length": 0, 
    "no_copy": 0, 
@@ -527,6 +564,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, 
@@ -546,12 +584,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, 
@@ -571,6 +611,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Shipping Address", 
    "length": 0, 
    "no_copy": 0, 
@@ -579,6 +620,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, 
@@ -597,6 +639,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Shipping Address", 
    "length": 0, 
    "no_copy": 0, 
@@ -604,6 +647,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, 
@@ -624,6 +668,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer Group", 
    "length": 0, 
    "no_copy": 0, 
@@ -634,6 +679,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, 
@@ -653,6 +699,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Territory", 
    "length": 0, 
    "no_copy": 0, 
@@ -661,6 +708,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, 
@@ -679,14 +727,16 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Currency and Price List", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "icon-tag", 
+   "options": "fa fa-tag", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -705,6 +755,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Currency", 
    "length": 0, 
    "no_copy": 0, 
@@ -715,6 +766,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, 
@@ -735,6 +787,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Exchange Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -745,6 +798,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, 
@@ -764,12 +818,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, 
@@ -789,6 +845,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Price List", 
    "length": 0, 
    "no_copy": 0, 
@@ -799,6 +856,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, 
@@ -818,6 +876,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Price List Currency", 
    "length": 0, 
    "no_copy": 0, 
@@ -826,6 +885,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, 
@@ -845,6 +905,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Price List Exchange Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -853,6 +914,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, 
@@ -871,6 +933,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Ignore Pricing Rule", 
    "length": 0, 
    "no_copy": 1, 
@@ -878,6 +941,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, 
@@ -896,15 +960,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-shopping-cart", 
+   "options": "fa fa-shopping-cart", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -923,6 +989,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Items", 
    "length": 0, 
    "no_copy": 0, 
@@ -933,6 +1000,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, 
@@ -952,12 +1020,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, 
@@ -976,6 +1046,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -985,6 +1056,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, 
@@ -1003,6 +1075,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Net Total (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -1013,6 +1086,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, 
@@ -1032,12 +1106,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, 
@@ -1056,6 +1132,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total", 
    "length": 0, 
    "no_copy": 0, 
@@ -1065,6 +1142,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, 
@@ -1083,6 +1161,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Net Total", 
    "length": 0, 
    "no_copy": 0, 
@@ -1091,6 +1170,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, 
@@ -1109,15 +1189,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Taxes and Charges", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-money", 
+   "options": "fa fa-money", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1136,6 +1218,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Taxes and Charges", 
    "length": 0, 
    "no_copy": 0, 
@@ -1146,6 +1229,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, 
@@ -1164,12 +1248,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, 
@@ -1188,6 +1274,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Shipping Rule", 
    "length": 0, 
    "no_copy": 0, 
@@ -1197,6 +1284,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, 
@@ -1215,12 +1303,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, 
@@ -1239,6 +1329,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Sales Taxes and Charges", 
    "length": 0, 
    "no_copy": 0, 
@@ -1249,6 +1340,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, 
@@ -1267,6 +1359,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Taxes and Charges Calculation", 
    "length": 0, 
    "no_copy": 0, 
@@ -1275,6 +1368,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, 
@@ -1293,12 +1387,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, 
@@ -1317,6 +1413,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Taxes and Charges (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -1327,6 +1424,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, 
@@ -1345,12 +1443,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, 
@@ -1369,6 +1469,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Taxes and Charges", 
    "length": 0, 
    "no_copy": 0, 
@@ -1377,6 +1478,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, 
@@ -1396,6 +1498,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Additional Discount", 
    "length": 0, 
    "no_copy": 0, 
@@ -1404,6 +1507,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, 
@@ -1423,6 +1527,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Apply Additional Discount On", 
    "length": 0, 
    "no_copy": 0, 
@@ -1432,6 +1537,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, 
@@ -1450,6 +1556,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Additional Discount Amount (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -1459,6 +1566,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, 
@@ -1477,6 +1585,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -1484,6 +1593,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, 
@@ -1502,6 +1612,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Additional Discount Percentage", 
    "length": 0, 
    "no_copy": 0, 
@@ -1510,6 +1621,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, 
@@ -1528,6 +1640,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Additional Discount Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -1536,6 +1649,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, 
@@ -1554,15 +1668,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-money", 
+   "options": "fa fa-money", 
    "permlevel": 0, 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1581,6 +1697,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Grand Total (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -1591,6 +1708,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, 
@@ -1611,6 +1729,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "In Words (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -1620,6 +1739,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, 
@@ -1639,6 +1759,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Rounded Total (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -1649,6 +1770,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, 
@@ -1668,6 +1790,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
@@ -1675,6 +1798,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, 
@@ -1694,6 +1818,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Grand Total", 
    "length": 0, 
    "no_copy": 0, 
@@ -1704,6 +1829,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, 
@@ -1723,6 +1849,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Rounded Total", 
    "length": 0, 
    "no_copy": 0, 
@@ -1733,6 +1860,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, 
@@ -1752,6 +1880,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "In Words", 
    "length": 0, 
    "no_copy": 0, 
@@ -1761,6 +1890,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, 
@@ -1781,15 +1911,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Terms and Conditions", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-legal", 
+   "options": "fa fa-legal", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1808,6 +1940,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Terms", 
    "length": 0, 
    "no_copy": 0, 
@@ -1818,6 +1951,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, 
@@ -1836,6 +1970,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Term Details", 
    "length": 0, 
    "no_copy": 0, 
@@ -1845,6 +1980,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, 
@@ -1863,6 +1999,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Print Settings", 
    "length": 0, 
    "no_copy": 0, 
@@ -1871,6 +2008,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, 
@@ -1889,6 +2027,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Letter Head", 
    "length": 0, 
    "no_copy": 0, 
@@ -1899,6 +2038,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, 
@@ -1917,6 +2057,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Print Heading", 
    "length": 0, 
    "no_copy": 1, 
@@ -1927,6 +2068,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, 
@@ -1945,6 +2087,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -1952,6 +2095,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, 
@@ -1970,6 +2114,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Print Language", 
    "length": 0, 
    "no_copy": 0, 
@@ -1978,6 +2123,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, 
@@ -1996,15 +2142,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "More Information", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-file-text", 
+   "options": "fa fa-file-text", 
    "permlevel": 0, 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -2023,6 +2171,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Campaign", 
    "length": 0, 
    "no_copy": 0, 
@@ -2033,6 +2182,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, 
@@ -2051,6 +2201,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Source", 
    "length": 0, 
    "no_copy": 0, 
@@ -2061,6 +2212,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, 
@@ -2080,6 +2232,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Quotation Lost Reason", 
    "length": 0, 
    "no_copy": 1, 
@@ -2089,6 +2242,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, 
@@ -2107,6 +2261,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
@@ -2114,6 +2269,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, 
@@ -2134,6 +2290,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Status", 
    "length": 0, 
    "no_copy": 1, 
@@ -2144,6 +2301,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, 
@@ -2162,6 +2320,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Opportunity Item", 
    "length": 0, 
    "no_copy": 0, 
@@ -2171,6 +2330,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, 
@@ -2180,7 +2340,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-shopping-cart", 
+ "icon": "fa fa-shopping-cart", 
  "idx": 82, 
  "image_view": 0, 
  "in_create": 0, 
@@ -2190,7 +2350,7 @@
  "istable": 0, 
  "max_attachments": 1, 
  "menu_index": 0, 
- "modified": "2016-09-16 01:53:05.665422", 
+ "modified": "2016-11-07 05:58:07.587479", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Quotation", 
@@ -2206,6 +2366,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -2226,6 +2387,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "match": "", 
    "permlevel": 1, 
    "print": 0, 
@@ -2247,6 +2409,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "match": "", 
    "permlevel": 1, 
    "print": 0, 
@@ -2268,6 +2431,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -2288,6 +2452,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -2308,6 +2473,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "match": "", 
    "permlevel": 1, 
    "print": 0, 
@@ -2329,6 +2495,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -2349,6 +2516,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "match": "", 
    "permlevel": 1, 
    "print": 0, 
diff --git a/erpnext/selling/doctype/quotation/quotation_dashboard.py b/erpnext/selling/doctype/quotation/quotation_dashboard.py
index 80dc6aa..e572a92 100644
--- a/erpnext/selling/doctype/quotation/quotation_dashboard.py
+++ b/erpnext/selling/doctype/quotation/quotation_dashboard.py
@@ -1,11 +1,12 @@
 from frappe import _
 
-data = {
-	'fieldname': 'prevdoc_docname',
-	'transactions': [
-		{
-			'label': _('Related'),
-			'items': ['Sales Order']
-		},
-	]
-}
\ No newline at end of file
+def get_data():
+	return {
+		'fieldname': 'prevdoc_docname',
+		'transactions': [
+			{
+				'label': _('Related'),
+				'items': ['Sales Order']
+			},
+		]
+	}
\ No newline at end of file
diff --git a/erpnext/selling/doctype/quotation_item/quotation_item.json b/erpnext/selling/doctype/quotation_item/quotation_item.json
index 2c73a8e..3a27706 100644
--- a/erpnext/selling/doctype/quotation_item/quotation_item.json
+++ b/erpnext/selling/doctype/quotation_item/quotation_item.json
@@ -563,7 +563,7 @@
    "columns": 0, 
    "depends_on": "eval:doc.margin_type && doc.price_list_rate", 
    "fieldname": "total_margin", 
-   "fieldtype": "Float", 
+   "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
@@ -1276,7 +1276,7 @@
  "istable": 1, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-08-26 04:46:21.936481", 
+ "modified": "2016-11-01 13:02:18.665333", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Quotation Item", 
diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json
index c8158a6..f171007 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.json
+++ b/erpnext/selling/doctype/sales_order/sales_order.json
@@ -10,6 +10,7 @@
  "doctype": "DocType", 
  "document_type": "Document", 
  "editable_grid": 1, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -23,14 +24,16 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "icon-user", 
+   "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, 
@@ -49,6 +52,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
@@ -56,6 +60,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 +81,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Title", 
    "length": 0, 
    "no_copy": 1, 
@@ -84,6 +90,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, 
@@ -102,6 +109,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Series", 
    "length": 0, 
    "no_copy": 1, 
@@ -112,6 +120,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, 
@@ -130,6 +139,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Customer", 
    "length": 0, 
    "no_copy": 0, 
@@ -140,6 +150,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, 
@@ -158,6 +169,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -165,6 +177,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, 
@@ -185,6 +198,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Order Type", 
    "length": 0, 
    "no_copy": 0, 
@@ -195,6 +209,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, 
@@ -213,6 +228,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
@@ -220,6 +236,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 +256,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amended From", 
    "length": 0, 
    "no_copy": 1, 
@@ -249,6 +267,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, 
@@ -269,6 +288,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -279,6 +299,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 1, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 1, 
@@ -299,6 +320,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Date", 
    "length": 0, 
    "no_copy": 1, 
@@ -308,6 +330,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, 
@@ -328,6 +351,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Delivery Date", 
    "length": 0, 
    "no_copy": 1, 
@@ -337,6 +361,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, 
@@ -358,6 +383,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer's Purchase Order", 
    "length": 0, 
    "no_copy": 0, 
@@ -367,6 +393,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, 
@@ -388,6 +415,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer's Purchase Order Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -397,6 +425,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, 
@@ -418,14 +447,16 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Address and Contact", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "icon-bullhorn", 
+   "options": "fa fa-bullhorn", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -444,6 +475,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer Address", 
    "length": 0, 
    "no_copy": 0, 
@@ -452,6 +484,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, 
@@ -470,6 +503,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Address", 
    "length": 0, 
    "no_copy": 0, 
@@ -477,6 +511,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, 
@@ -495,6 +530,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Contact Person", 
    "length": 0, 
    "no_copy": 0, 
@@ -503,6 +539,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, 
@@ -521,6 +558,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Contact", 
    "length": 0, 
    "no_copy": 0, 
@@ -528,6 +566,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, 
@@ -546,6 +585,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Mobile No", 
    "length": 0, 
    "no_copy": 0, 
@@ -553,6 +593,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, 
@@ -571,6 +612,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Contact Email", 
    "length": 0, 
    "no_copy": 0, 
@@ -579,6 +621,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, 
@@ -597,12 +640,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, 
@@ -622,6 +667,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Shipping Address Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -630,6 +676,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, 
@@ -648,6 +695,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Shipping Address", 
    "length": 0, 
    "no_copy": 0, 
@@ -655,6 +703,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, 
@@ -674,6 +723,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer Group", 
    "length": 0, 
    "no_copy": 0, 
@@ -682,6 +732,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, 
@@ -701,6 +752,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Territory", 
    "length": 0, 
    "no_copy": 0, 
@@ -709,6 +761,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, 
@@ -727,14 +780,16 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Currency and Price List", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "icon-tag", 
+   "options": "fa fa-tag", 
    "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, 
@@ -753,6 +808,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Currency", 
    "length": 0, 
    "no_copy": 0, 
@@ -763,6 +819,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, 
@@ -783,6 +840,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Exchange Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -793,6 +851,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, 
@@ -812,12 +871,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, 
@@ -837,6 +898,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Price List", 
    "length": 0, 
    "no_copy": 0, 
@@ -847,6 +909,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, 
@@ -866,6 +929,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Price List Currency", 
    "length": 0, 
    "no_copy": 0, 
@@ -874,6 +938,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, 
@@ -893,6 +958,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Price List Exchange Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -901,6 +967,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, 
@@ -919,6 +986,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Ignore Pricing Rule", 
    "length": 0, 
    "no_copy": 1, 
@@ -926,6 +994,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, 
@@ -944,15 +1013,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-shopping-cart", 
+   "options": "fa fa-shopping-cart", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -971,6 +1042,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Items", 
    "length": 0, 
    "no_copy": 0, 
@@ -981,6 +1053,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, 
@@ -999,12 +1072,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, 
@@ -1023,12 +1098,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, 
@@ -1047,6 +1124,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -1056,6 +1134,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, 
@@ -1074,6 +1153,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Net Total (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -1084,6 +1164,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, 
@@ -1103,12 +1184,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, 
@@ -1127,6 +1210,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total", 
    "length": 0, 
    "no_copy": 0, 
@@ -1136,6 +1220,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, 
@@ -1154,6 +1239,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Net Total", 
    "length": 0, 
    "no_copy": 0, 
@@ -1162,6 +1248,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, 
@@ -1180,15 +1267,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Taxes and Charges", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-money", 
+   "options": "fa fa-money", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1207,6 +1296,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Taxes and Charges", 
    "length": 0, 
    "no_copy": 0, 
@@ -1217,6 +1307,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, 
@@ -1235,12 +1326,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, 
@@ -1259,6 +1352,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Shipping Rule", 
    "length": 0, 
    "no_copy": 0, 
@@ -1268,6 +1362,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, 
@@ -1286,12 +1381,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, 
@@ -1310,6 +1407,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Sales Taxes and Charges", 
    "length": 0, 
    "no_copy": 0, 
@@ -1320,6 +1418,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, 
@@ -1338,6 +1437,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Taxes and Charges Calculation", 
    "length": 0, 
    "no_copy": 0, 
@@ -1346,6 +1446,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, 
@@ -1364,12 +1465,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, 
@@ -1388,6 +1491,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Taxes and Charges (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -1398,6 +1502,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, 
@@ -1417,6 +1522,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -1424,6 +1530,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, 
@@ -1442,6 +1549,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Taxes and Charges", 
    "length": 0, 
    "no_copy": 0, 
@@ -1450,6 +1558,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, 
@@ -1469,6 +1578,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Additional Discount", 
    "length": 0, 
    "no_copy": 0, 
@@ -1477,6 +1587,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, 
@@ -1496,6 +1607,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Apply Additional Discount On", 
    "length": 0, 
    "no_copy": 0, 
@@ -1505,6 +1617,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, 
@@ -1523,6 +1636,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Additional Discount Amount (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -1532,6 +1646,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, 
@@ -1550,12 +1665,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, 
@@ -1575,6 +1692,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Additional Discount Percentage", 
    "length": 0, 
    "no_copy": 0, 
@@ -1583,6 +1701,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, 
@@ -1602,6 +1721,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Additional Discount Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -1610,6 +1730,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, 
@@ -1628,15 +1749,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-money", 
+   "options": "fa fa-money", 
    "permlevel": 0, 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1655,6 +1778,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Grand Total (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -1665,6 +1789,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, 
@@ -1684,6 +1809,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Rounded Total (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -1694,6 +1820,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, 
@@ -1714,6 +1841,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "In Words (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -1723,6 +1851,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, 
@@ -1742,6 +1871,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
@@ -1749,6 +1879,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, 
@@ -1768,6 +1899,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Grand Total", 
    "length": 0, 
    "no_copy": 0, 
@@ -1778,6 +1910,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, 
@@ -1797,6 +1930,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Rounded Total", 
    "length": 0, 
    "no_copy": 0, 
@@ -1807,6 +1941,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, 
@@ -1826,6 +1961,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "In Words", 
    "length": 0, 
    "no_copy": 0, 
@@ -1835,6 +1971,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, 
@@ -1854,6 +1991,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Advance Paid", 
    "length": 0, 
    "no_copy": 1, 
@@ -1862,6 +2000,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, 
@@ -1882,15 +2021,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Packing List", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-suitcase", 
+   "options": "fa fa-suitcase", 
    "permlevel": 0, 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1909,6 +2050,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Packed Items", 
    "length": 0, 
    "no_copy": 0, 
@@ -1919,6 +2061,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, 
@@ -1938,15 +2081,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Terms and Conditions", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-legal", 
+   "options": "fa fa-legal", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1965,6 +2110,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Terms", 
    "length": 0, 
    "no_copy": 0, 
@@ -1975,6 +2121,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, 
@@ -1993,6 +2140,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Terms and Conditions Details", 
    "length": 0, 
    "no_copy": 0, 
@@ -2002,6 +2150,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, 
@@ -2021,15 +2170,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "More Information", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-file-text", 
+   "options": "fa fa-file-text", 
    "permlevel": 0, 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -2049,6 +2200,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Project", 
    "length": 0, 
    "no_copy": 0, 
@@ -2059,6 +2211,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, 
@@ -2077,6 +2230,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Party Account Currency", 
    "length": 0, 
    "no_copy": 1, 
@@ -2086,6 +2240,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, 
@@ -2104,6 +2259,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -2111,6 +2267,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, 
@@ -2129,6 +2286,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Source", 
    "length": 0, 
    "no_copy": 0, 
@@ -2139,6 +2297,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, 
@@ -2158,6 +2317,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Campaign", 
    "length": 0, 
    "no_copy": 0, 
@@ -2168,6 +2328,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, 
@@ -2186,6 +2347,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Printing Details", 
    "length": 0, 
    "no_copy": 0, 
@@ -2194,6 +2356,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, 
@@ -2212,6 +2375,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Print Language", 
    "length": 0, 
    "no_copy": 0, 
@@ -2220,6 +2384,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, 
@@ -2238,6 +2403,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Letter Head", 
    "length": 0, 
    "no_copy": 0, 
@@ -2248,6 +2414,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, 
@@ -2266,6 +2433,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
@@ -2273,6 +2441,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, 
@@ -2292,6 +2461,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Print Heading", 
    "length": 0, 
    "no_copy": 1, 
@@ -2302,6 +2472,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, 
@@ -2309,6 +2480,34 @@
    "unique": 0
   }, 
   {
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "group_same_items", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Group same items", 
+   "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": 1, 
@@ -2320,6 +2519,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Billing and Delivery Status", 
    "length": 0, 
    "no_copy": 0, 
@@ -2328,6 +2528,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, 
@@ -2348,6 +2549,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Status", 
    "length": 0, 
    "no_copy": 1, 
@@ -2358,6 +2560,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": 1, 
@@ -2377,6 +2580,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Delivery Status", 
    "length": 0, 
    "no_copy": 1, 
@@ -2385,6 +2589,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, 
@@ -2405,6 +2610,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "%  Delivered", 
    "length": 0, 
    "no_copy": 1, 
@@ -2414,6 +2620,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, 
@@ -2433,12 +2640,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, 
@@ -2459,6 +2668,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "% Amount Billed", 
    "length": 0, 
    "no_copy": 1, 
@@ -2468,6 +2678,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, 
@@ -2487,6 +2698,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Billing Status", 
    "length": 0, 
    "no_copy": 1, 
@@ -2495,6 +2707,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, 
@@ -2514,15 +2727,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Commission", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-group", 
+   "options": "fa fa-group", 
    "permlevel": 0, 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -2541,6 +2756,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Sales Partner", 
    "length": 0, 
    "no_copy": 0, 
@@ -2551,6 +2767,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, 
@@ -2570,12 +2787,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": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -2595,6 +2814,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Commission Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -2604,6 +2824,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, 
@@ -2623,6 +2844,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Commission", 
    "length": 0, 
    "no_copy": 0, 
@@ -2633,6 +2855,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, 
@@ -2652,6 +2875,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Sales Team", 
    "length": 0, 
    "no_copy": 0, 
@@ -2659,6 +2883,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, 
@@ -2677,6 +2902,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Sales Team1", 
    "length": 0, 
    "no_copy": 0, 
@@ -2687,6 +2913,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, 
@@ -2706,14 +2933,16 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Recurring Order", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "icon-time", 
+   "options": "fa fa-time", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -2732,6 +2961,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Settings", 
    "length": 0, 
    "no_copy": 0, 
@@ -2740,6 +2970,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, 
@@ -2760,6 +2991,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Is Recurring", 
    "length": 0, 
    "no_copy": 1, 
@@ -2767,6 +2999,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, 
@@ -2787,6 +3020,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Reference Document", 
    "length": 0, 
    "no_copy": 1, 
@@ -2795,6 +3029,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, 
@@ -2815,6 +3050,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Frequency", 
    "length": 0, 
    "no_copy": 1, 
@@ -2823,6 +3059,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, 
@@ -2843,6 +3080,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Repeat on Day of Month", 
    "length": 0, 
    "no_copy": 1, 
@@ -2850,6 +3088,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, 
@@ -2870,6 +3109,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Recurring Upto", 
    "length": 0, 
    "no_copy": 1, 
@@ -2877,6 +3117,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, 
@@ -2896,6 +3137,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Submit on creation", 
    "length": 0, 
    "no_copy": 0, 
@@ -2904,6 +3146,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, 
@@ -2924,6 +3167,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Notify by email", 
    "length": 0, 
    "no_copy": 1, 
@@ -2932,6 +3176,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, 
@@ -2952,6 +3197,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Notification Email Address", 
    "length": 0, 
    "no_copy": 1, 
@@ -2960,6 +3206,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, 
@@ -2979,6 +3226,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Recurring Print Format", 
    "length": 0, 
    "no_copy": 0, 
@@ -2988,6 +3236,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, 
@@ -3006,6 +3255,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "This Document", 
    "length": 0, 
    "no_copy": 0, 
@@ -3013,6 +3263,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, 
@@ -3033,6 +3284,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "From Date", 
    "length": 0, 
    "no_copy": 1, 
@@ -3040,6 +3292,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, 
@@ -3060,6 +3313,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "To Date", 
    "length": 0, 
    "no_copy": 1, 
@@ -3067,6 +3321,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, 
@@ -3087,6 +3342,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Next Date", 
    "length": 0, 
    "no_copy": 1, 
@@ -3094,6 +3350,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, 
@@ -3103,7 +3360,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-file-text", 
+ "icon": "fa fa-file-text", 
  "idx": 105, 
  "image_view": 0, 
  "in_create": 0, 
@@ -3112,7 +3369,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-09-16 06:07:17.882648", 
+ "modified": "2016-11-16 04:06:28.675876", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Sales Order", 
@@ -3128,6 +3385,7 @@
    "export": 0, 
    "if_owner": 1, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -3148,6 +3406,7 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 1, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -3168,6 +3427,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -3188,6 +3448,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -3208,6 +3469,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -3228,6 +3490,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 1, 
    "print": 0, 
    "read": 1, 
diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py
index ced3679..acae0e5 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.py
+++ b/erpnext/selling/doctype/sales_order/sales_order.py
@@ -442,6 +442,11 @@
 		target.amount = flt(source.amount) - flt(source.billed_amt)
 		target.base_amount = target.amount * flt(source_parent.conversion_rate)
 		target.qty = target.amount / flt(source.rate) if (source.rate and source.billed_amt) else source.qty
+		
+		item = frappe.db.get_value("Item", target.item_code, ["item_group", "selling_cost_center"], as_dict=1)
+		target.cost_center = frappe.db.get_value("Project", source_parent.project, "cost_center") \
+			or item.selling_cost_center \
+			or frappe.db.get_value("Item Group", item.item_group, "default_cost_center")
 
 	doclist = get_mapped_doc("Sales Order", source_name, {
 		"Sales Order": {
@@ -553,6 +558,9 @@
 def make_purchase_order_for_drop_shipment(source_name, for_supplier, target_doc=None):
 	def set_missing_values(source, target):
 		target.supplier = for_supplier
+		target.apply_discount_on = ""
+		target.additional_discount_percentage = 0.0
+		target.discount_amount = 0.0
 
 		default_price_list = frappe.get_value("Supplier", for_supplier, "default_price_list")
 		if default_price_list:
diff --git a/erpnext/selling/doctype/sales_order/sales_order_dashboard.py b/erpnext/selling/doctype/sales_order/sales_order_dashboard.py
index feda39d..51f81f8 100644
--- a/erpnext/selling/doctype/sales_order/sales_order_dashboard.py
+++ b/erpnext/selling/doctype/sales_order/sales_order_dashboard.py
@@ -1,33 +1,34 @@
 from frappe import _
 
-data = {
-	'fieldname': 'sales_order',
-	'non_standard_fieldnames': {
-		'Delivery Note': 'against_sales_order',
-	},
-	'internal_links': {
-		'Quotation': ['items', 'prevdoc_docname']
-	},
-	'transactions': [
-		{
-			'label': _('Fulfillment'),
-			'items': ['Sales Invoice', 'Delivery Note']
+def get_data():
+	return {
+		'fieldname': 'sales_order',
+		'non_standard_fieldnames': {
+			'Delivery Note': 'against_sales_order',
 		},
-		{
-			'label': _('Purchasing'),
-			'items': ['Material Request', 'Purchase Order']
+		'internal_links': {
+			'Quotation': ['items', 'prevdoc_docname']
 		},
-		{
-			'label': _('Projects'),
-			'items': ['Project']
-		},
-		{
-			'label': _('Manufacturing'),
-			'items': ['Production Order']
-		},
-		{
-			'label': _('Reference'),
-			'items': ['Quotation']
-		},
-	]
-}
\ No newline at end of file
+		'transactions': [
+			{
+				'label': _('Fulfillment'),
+				'items': ['Sales Invoice', 'Delivery Note']
+			},
+			{
+				'label': _('Purchasing'),
+				'items': ['Material Request', 'Purchase Order']
+			},
+			{
+				'label': _('Projects'),
+				'items': ['Project']
+			},
+			{
+				'label': _('Manufacturing'),
+				'items': ['Production Order']
+			},
+			{
+				'label': _('Reference'),
+				'items': ['Quotation']
+			},
+		]
+	}
\ No newline at end of file
diff --git a/erpnext/selling/doctype/sales_order/test_sales_order.py b/erpnext/selling/doctype/sales_order/test_sales_order.py
index f687868..9922a15 100644
--- a/erpnext/selling/doctype/sales_order/test_sales_order.py
+++ b/erpnext/selling/doctype/sales_order/test_sales_order.py
@@ -5,6 +5,7 @@
 from frappe.utils import flt, add_days
 import frappe.permissions
 import unittest
+from erpnext.stock.doctype.item.test_item import get_total_projected_qty
 from erpnext.selling.doctype.sales_order.sales_order \
 	import make_material_request, make_delivery_note, make_sales_invoice, WarehouseRequired
 
@@ -124,8 +125,16 @@
 		dn = create_dn_against_so(so.name, 15)
 		self.assertEqual(get_reserved_qty(), existing_reserved_qty)
 
+		total_projected_qty = get_total_projected_qty('_Test Item')
+		item_doc_before_cancel = frappe.get_doc('Item', '_Test Item')
+		self.assertEqual(total_projected_qty,  item_doc_before_cancel.total_projected_qty)
+
 		dn.cancel()
 		self.assertEqual(get_reserved_qty(), existing_reserved_qty + 10)
+
+		total_projected_qty = get_total_projected_qty('_Test Item')
+		item_doc_after_cancel = frappe.get_doc('Item', '_Test Item')
+		self.assertEqual(total_projected_qty,  item_doc_after_cancel.total_projected_qty)
 		
 	def test_reserved_qty_for_over_delivery_via_sales_invoice(self):
 		# set over-delivery tolerance
@@ -141,6 +150,10 @@
 		si.get("items")[0].qty = 12
 		si.insert()
 		si.submit()
+
+		total_projected_qty = get_total_projected_qty('_Test Item')
+		item_doc = frappe.get_doc('Item', '_Test Item')
+		self.assertEqual(total_projected_qty,  item_doc.total_projected_qty)
 		
 		self.assertEqual(get_reserved_qty(), existing_reserved_qty)
 		
@@ -150,6 +163,9 @@
 
 		si.cancel()
 		self.assertEqual(get_reserved_qty(), existing_reserved_qty + 10)
+		total_projected_qty = get_total_projected_qty('_Test Item')
+		item_doc = frappe.get_doc('Item', '_Test Item')
+		self.assertEqual(total_projected_qty,  item_doc.total_projected_qty)
 		
 		so.load_from_db()
 		self.assertEqual(so.get("items")[0].delivered_qty, 0)
@@ -178,6 +194,10 @@
 		self.assertEqual(get_reserved_qty("_Test Item"), existing_reserved_qty_item1)
 		self.assertEqual(get_reserved_qty("_Test Item Home Desktop 100"), existing_reserved_qty_item2)
 
+		total_projected_qty = get_total_projected_qty('_Test Item')
+		item_doc = frappe.get_doc('Item', '_Test Item')
+		self.assertEqual(total_projected_qty,  item_doc.total_projected_qty)
+
 		# unclose so
 		so.load_from_db()
 		so.update_status('Draft')
@@ -211,6 +231,10 @@
 
 		dn = create_dn_against_so(so.name, 15)
 
+		total_projected_qty = get_total_projected_qty('_Test Item')
+		item_doc = frappe.get_doc('Item', '_Test Item')
+		self.assertEqual(total_projected_qty,  item_doc.total_projected_qty)
+
 		self.assertEqual(get_reserved_qty("_Test Item"), existing_reserved_qty_item1)
 		self.assertEqual(get_reserved_qty("_Test Item Home Desktop 100"),
 			existing_reserved_qty_item2)
@@ -427,6 +451,13 @@
 
 		self.assertEquals(abs(flt(reserved_qty)), existing_reserved_qty_for_dn_item)
 
+	def test_total_projected_qty_against_sales_order(self):
+		so = make_sales_order(item = '_Test Item')
+		total_projected_qty = get_total_projected_qty('_Test Item')
+
+		item_doc = frappe.get_doc('Item', '_Test Item')
+		self.assertEqual(total_projected_qty,  item_doc.total_projected_qty)
+
 	def test_reserved_qty_for_closing_so(self):
 		bin = frappe.get_all("Bin", filters={"item_code": "_Test Item", "warehouse": "_Test Warehouse - _TC"},
 			fields=["reserved_qty"])
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 35d8b0b..a59858a 100644
--- a/erpnext/selling/doctype/sales_order_item/sales_order_item.json
+++ b/erpnext/selling/doctype/sales_order_item/sales_order_item.json
@@ -563,7 +563,7 @@
    "columns": 0, 
    "depends_on": "eval:doc.margin_type && doc.price_list_rate", 
    "fieldname": "total_margin", 
-   "fieldtype": "Float", 
+   "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
@@ -614,7 +614,7 @@
    "columns": 2, 
    "depends_on": "eval: doc.type != \"\"", 
    "fieldname": "rate", 
-   "fieldtype": "Float", 
+   "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
@@ -1582,7 +1582,7 @@
  "istable": 1, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-08-26 04:50:27.723801", 
+ "modified": "2016-11-01 13:01:13.572400", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Sales Order Item", 
diff --git a/erpnext/selling/doctype/selling_settings/selling_settings.js b/erpnext/selling/doctype/selling_settings/selling_settings.js
new file mode 100644
index 0000000..cf6fb28
--- /dev/null
+++ b/erpnext/selling/doctype/selling_settings/selling_settings.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Selling Settings', {
+	refresh: function(frm) {
+
+	}
+});
diff --git a/erpnext/selling/doctype/selling_settings/selling_settings.json b/erpnext/selling/doctype/selling_settings/selling_settings.json
index affa38b..f1bfe95 100644
--- a/erpnext/selling/doctype/selling_settings/selling_settings.json
+++ b/erpnext/selling/doctype/selling_settings/selling_settings.json
@@ -2,29 +2,36 @@
  "allow_copy": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
+ "beta": 0, 
  "creation": "2013-06-25 10:25:16", 
  "custom": 0, 
  "description": "Settings for Selling Module", 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Other", 
+ "editable_grid": 0, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "Customer Name", 
    "fieldname": "cust_master_name", 
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Customer Naming By", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Customer Name\nNaming Series", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -36,17 +43,21 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "campaign_naming_by", 
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Campaign Naming By", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Campaign Name\nNaming Series", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -58,18 +69,22 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "", 
    "fieldname": "customer_group", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Default Customer Group", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Customer Group", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -81,18 +96,22 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "", 
    "fieldname": "territory", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Default Territory", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Territory", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -104,17 +123,21 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "selling_price_list", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Default Price List", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Price List", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -126,15 +149,19 @@
    "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_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -146,17 +173,21 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "so_required", 
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Sales Order Required", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "No\nYes", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -168,17 +199,21 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "dn_required", 
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Delivery Note Required", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "No\nYes", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -190,16 +225,20 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "maintain_same_sales_rate", 
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Maintain Same Rate Throughout Sales Cycle", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -211,16 +250,20 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "editable_price_list_rate", 
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Allow user to edit Price List Rate in transactions", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -232,17 +275,21 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "allow_multiple_items", 
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Allow Item to be added multiple times in a transaction", 
+   "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, 
@@ -254,17 +301,47 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "allow_against_multiple_purchase_orders", 
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Allow multiple Sales Orders against a Customer's Purchase Order", 
+   "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": "validate_selling_price", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Validate Selling Price for Item against Purchase Rate or Valuation Rate", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -275,14 +352,16 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-cog", 
+ "icon": "fa fa-cog", 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 1, 
  "istable": 0, 
- "modified": "2015-08-27 02:42:56.512460", 
+ "max_attachments": 0, 
+ "modified": "2016-10-20 08:17:45.621151", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Selling Settings", 
@@ -298,6 +377,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -309,6 +389,10 @@
    "write": 1
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/selling/doctype/sms_center/sms_center.json b/erpnext/selling/doctype/sms_center/sms_center.json
index 56a3c03..3ea5b14 100644
--- a/erpnext/selling/doctype/sms_center/sms_center.json
+++ b/erpnext/selling/doctype/sms_center/sms_center.json
@@ -319,7 +319,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-mobile-phone", 
+ "icon": "fa fa-mobile-phone", 
  "idx": 1, 
  "in_create": 0, 
  "in_dialog": 0, 
diff --git a/erpnext/selling/page/sales_analytics/sales_analytics.json b/erpnext/selling/page/sales_analytics/sales_analytics.json
index 12bc487..4a7761e 100644
--- a/erpnext/selling/page/sales_analytics/sales_analytics.json
+++ b/erpnext/selling/page/sales_analytics/sales_analytics.json
@@ -2,7 +2,7 @@
  "creation": "2012-09-21 20:15:12.000000", 
  "docstatus": 0, 
  "doctype": "Page", 
- "icon": "icon-bar-chart", 
+ "icon": "fa fa-bar-chart", 
  "idx": 1, 
  "modified": "2013-07-11 14:43:59.000000", 
  "modified_by": "Administrator", 
diff --git a/erpnext/selling/page/sales_funnel/sales_funnel.js b/erpnext/selling/page/sales_funnel/sales_funnel.js
index a516342..67ba1c8 100644
--- a/erpnext/selling/page/sales_funnel/sales_funnel.js
+++ b/erpnext/selling/page/sales_funnel/sales_funnel.js
@@ -31,7 +31,7 @@
 			from_date: wrapper.page.add_date(__("From Date")),
 			to_date: wrapper.page.add_date(__("To Date")),
 			refresh_btn: wrapper.page.set_primary_action(__("Refresh"),
-				function() { me.get_data(); }, "icon-refresh"),
+				function() { me.get_data(); }, "fa fa-refresh"),
 		};
 
 		this.elements.no_data = $('<div class="alert alert-warning">' + __("No Data") + '</div>')
diff --git a/erpnext/selling/page/sales_funnel/sales_funnel.json b/erpnext/selling/page/sales_funnel/sales_funnel.json
index 3a50968..e60b975 100644
--- a/erpnext/selling/page/sales_funnel/sales_funnel.json
+++ b/erpnext/selling/page/sales_funnel/sales_funnel.json
@@ -2,7 +2,7 @@
  "creation": "2013-10-04 13:17:18.000000", 
  "docstatus": 0, 
  "doctype": "Page", 
- "icon": "icon-filter", 
+ "icon": "fa fa-filter", 
  "idx": 1, 
  "modified": "2013-10-04 13:17:18.000000", 
  "modified_by": "Administrator", 
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 0612dc0..af28e20 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
@@ -1,5 +1,5 @@
 {
- "add_total_row": 0, 
+ "add_total_row": 1, 
  "apply_user_permissions": 1, 
  "creation": "2013-05-03 11:31:05", 
  "disabled": 0, 
@@ -7,7 +7,7 @@
  "doctype": "Report", 
  "idx": 1, 
  "is_standard": "Yes", 
- "modified": "2016-01-28 04:22:49.476068", 
+ "modified": "2016-10-05 12:26:15.736596", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Sales Person-wise Transaction Summary", 
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 e9930f3..0c6914d 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
@@ -39,7 +39,7 @@
 		_("Customer") + ":Link/Customer:140", _("Territory") + ":Link/Territory:100", _("Posting Date") + ":Date:100",
 		_("Item Code") + ":Link/Item:120", _("Item Group") + ":Link/Item Group:120",
 		_("Brand") + ":Link/Brand:120", _("Qty") + ":Float:100", _("Amount") + ":Currency:120",
-		_("Sales Person") + ":Link/Sales Person:140", _("Contribution %") + ":Float:110",
+		_("Sales Person") + ":Link/Sales Person:140", _("Contribution %") + "::110",
 		_("Contribution Amount") + ":Currency:140"]
 
 def get_entries(filters):
diff --git a/erpnext/selling/sales_common.js b/erpnext/selling/sales_common.js
index a04c652..fc3cb3d 100644
--- a/erpnext/selling/sales_common.js
+++ b/erpnext/selling/sales_common.js
@@ -66,27 +66,42 @@
 			});
 		}
 
+		if(this.frm.fields_dict["packed_items"] &&
+			this.frm.fields_dict["packed_items"].grid.get_field('batch_no')) {
+			this.frm.set_query("batch_no", "packed_items", function(doc, cdt, cdn) {
+				return me.set_query_for_batch(doc, cdt, cdn)
+			});
+		}
+
 		if(this.frm.fields_dict["items"].grid.get_field('batch_no')) {
 			this.frm.set_query("batch_no", "items", function(doc, cdt, cdn) {
-				var item = frappe.get_doc(cdt, cdn);
-				if(!item.item_code) {
-					frappe.throw(__("Please enter Item Code to get batch no"));
-				} else {
-					filters = {
-						'item_code': item.item_code,
-						'posting_date': me.frm.doc.posting_date || frappe.datetime.nowdate(),
-					}
-					if(item.warehouse) filters["warehouse"] = item.warehouse
-
-					return {
-						query : "erpnext.controllers.queries.get_batch_no",
-						filters: filters
-					}
-				}
+				return me.set_query_for_batch(doc, cdt, cdn)
 			});
 		}
 	},
 
+	set_query_for_batch: function(doc, cdt, cdn) {
+		// Show item's batches in the dropdown of batch no
+
+		var me = this;
+		var item = frappe.get_doc(cdt, cdn);
+
+		if(!item.item_code) {
+			frappe.throw(__("Please enter Item Code to get batch no"));
+		} else {
+			filters = {
+				'item_code': item.item_code,
+				'posting_date': me.frm.doc.posting_date || frappe.datetime.nowdate(),
+			}
+			if(item.warehouse) filters["warehouse"] = item.warehouse
+
+			return {
+				query : "erpnext.controllers.queries.get_batch_no",
+				filters: filters
+			}
+		}
+	},
+
 	refresh: function() {
 		this._super();
 		this.frm.toggle_display("customer_name",
@@ -191,11 +206,13 @@
 
 		if(item.item_code && item.warehouse) {
 			return this.frm.call({
-				method: "erpnext.stock.get_item_details.get_bin_details",
+				method: "erpnext.stock.get_item_details.get_bin_details_and_serial_nos",
 				child: item,
 				args: {
 					item_code: item.item_code,
 					warehouse: item.warehouse,
+					qty: item.qty,
+					serial_no:item.serial_no
 				},
 				callback:function(r){
 					if (inList(['Delivery Note', 'Sales Invoice'], doc.doctype)) {
@@ -360,4 +377,4 @@
 			})
 		}
 	}
-})
+})
\ No newline at end of file
diff --git a/erpnext/setup/doctype/authorization_rule/authorization_rule.json b/erpnext/setup/doctype/authorization_rule/authorization_rule.json
index 9b08398..d696d3b 100644
--- a/erpnext/setup/doctype/authorization_rule/authorization_rule.json
+++ b/erpnext/setup/doctype/authorization_rule/authorization_rule.json
@@ -3,22 +3,27 @@
  "allow_import": 1, 
  "allow_rename": 0, 
  "autoname": "AR.####", 
+ "beta": 0, 
  "creation": "2013-01-10 16:34:22", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Setup", 
+ "editable_grid": 0, 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "transaction", 
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Transaction", 
    "length": 0, 
    "no_copy": 0, 
@@ -27,7 +32,9 @@
    "options": "\nSales Order\nPurchase Order\nQuotation\nDelivery Note\nSales Invoice\nPurchase Invoice\nPurchase Receipt\nAppraisal", 
    "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, 
@@ -38,12 +45,15 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "based_on", 
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Based On", 
    "length": 0, 
    "no_copy": 0, 
@@ -52,7 +62,9 @@
    "options": "\nGrand Total\nAverage Discount\nCustomerwise Discount\nItemwise Discount\nNot Applicable", 
    "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, 
@@ -63,12 +75,15 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "customer_or_item", 
    "fieldtype": "Select", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer or Item", 
    "length": 0, 
    "no_copy": 0, 
@@ -76,7 +91,9 @@
    "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, 
@@ -87,12 +104,15 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "master_name", 
    "fieldtype": "Dynamic Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Customer / Item Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -101,7 +121,9 @@
    "options": "customer_or_item", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -112,18 +134,23 @@
    "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, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_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,12 +161,15 @@
    "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": 1, 
+   "in_standard_filter": 0, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -148,7 +178,9 @@
    "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": 0, 
    "search_index": 0, 
@@ -159,18 +191,23 @@
    "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_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_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,12 +218,15 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "value", 
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Authorized Value", 
    "length": 0, 
    "no_copy": 0, 
@@ -194,7 +234,9 @@
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -205,18 +247,23 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_7", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -227,12 +274,15 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "system_role", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Applicable To (Role)", 
    "length": 0, 
    "no_copy": 0, 
@@ -241,7 +291,9 @@
    "options": "Role", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -252,13 +304,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "", 
    "fieldname": "to_emp", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Applicable To (Employee)", 
    "length": 0, 
    "no_copy": 0, 
@@ -267,7 +322,9 @@
    "options": "Employee", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -278,18 +335,23 @@
    "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_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -300,12 +362,15 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "system_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": "Applicable To (User)", 
    "length": 0, 
    "no_copy": 0, 
@@ -314,7 +379,9 @@
    "options": "User", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -325,13 +392,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "", 
    "fieldname": "to_designation", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Applicable To (Designation)", 
    "length": 0, 
    "no_copy": 0, 
@@ -340,7 +410,9 @@
    "options": "Designation", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -351,18 +423,23 @@
    "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_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -373,12 +450,15 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "approving_role", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Approving Role (above authorized value)", 
    "length": 0, 
    "no_copy": 0, 
@@ -387,7 +467,9 @@
    "options": "Role", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -398,18 +480,23 @@
    "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, 
@@ -420,12 +507,15 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "approving_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": "Approving User  (above authorized value)", 
    "length": 0, 
    "no_copy": 0, 
@@ -434,7 +524,9 @@
    "options": "User", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -444,15 +536,16 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-shield", 
+ "icon": "fa fa-shield", 
  "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:42.164233", 
+ "modified": "2016-11-07 05:10:52.977860", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Authorization Rule", 
@@ -468,6 +561,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -479,7 +573,10 @@
    "write": 1
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
- "search_fields": "transaction,based_on,system_user,system_role,approving_user,approving_role"
+ "search_fields": "transaction,based_on,system_user,system_role,approving_user,approving_role", 
+ "sort_order": "DESC", 
+ "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 8b04358..03433de 100644
--- a/erpnext/setup/doctype/brand/brand.json
+++ b/erpnext/setup/doctype/brand/brand.json
@@ -67,7 +67,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-certificate", 
+ "icon": "fa fa-certificate", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
diff --git a/erpnext/setup/doctype/company/company.json b/erpnext/setup/doctype/company/company.json
index 25e0cfb..fabbd51 100644
--- a/erpnext/setup/doctype/company/company.json
+++ b/erpnext/setup/doctype/company/company.json
@@ -10,11 +10,13 @@
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Setup", 
+ "editable_grid": 0, 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "details", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -22,6 +24,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "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,6 +44,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "company_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -47,6 +52,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -56,6 +62,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 +73,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "", 
    "fieldname": "abbr", 
    "fieldtype": "Data", 
@@ -74,6 +82,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Abbr", 
    "length": 0, 
    "no_copy": 0, 
@@ -83,6 +92,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, 
@@ -93,6 +103,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:!doc.__islocal && in_list(user_roles, \"System Manager\")", 
    "fieldname": "change_abbr", 
    "fieldtype": "Button", 
@@ -101,6 +112,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Change Abbreviation", 
    "length": 0, 
    "no_copy": 0, 
@@ -108,6 +120,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,6 +131,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "cb0", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -125,12 +139,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, 
@@ -141,6 +157,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "domain", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -148,6 +165,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Domain", 
    "length": 0, 
    "no_copy": 0, 
@@ -156,6 +174,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -166,6 +185,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "charts_section", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -173,6 +193,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Default Values", 
    "length": 0, 
    "no_copy": 0, 
@@ -180,6 +201,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, 
@@ -190,6 +212,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "default_letter_head", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -197,6 +220,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Default Letter Head", 
    "length": 0, 
    "no_copy": 0, 
@@ -206,6 +230,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -216,6 +241,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "default_holiday_list", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -223,6 +249,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Default Holiday List", 
    "length": 0, 
    "no_copy": 0, 
@@ -232,6 +259,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,6 +270,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "default_terms", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -249,6 +278,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Default Terms", 
    "length": 0, 
    "no_copy": 0, 
@@ -257,6 +287,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, 
@@ -267,55 +298,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "column_break_10", 
-   "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, 
-   "fieldname": "country", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Country", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Country", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "default_currency", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -323,6 +306,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Default Currency", 
    "length": 0, 
    "no_copy": 0, 
@@ -331,6 +315,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, 
@@ -341,21 +326,23 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "chart_of_accounts", 
-   "fieldtype": "Select", 
+   "columns": 0, 
+   "fieldname": "column_break_10", 
+   "fieldtype": "Column Break", 
    "hidden": 0, 
-   "ignore_user_permissions": 1, 
+   "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Chart of Accounts", 
+   "in_standard_filter": 0, 
    "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, 
@@ -366,6 +353,124 @@
    "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": 0, 
+   "label": "Country", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Country", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "create_chart_of_accounts_based_on", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Create Chart Of Accounts Based On", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Standard Template\nExisting Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.create_chart_of_accounts_based_on===\"Standard Template\"", 
+   "fieldname": "chart_of_accounts", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Chart Of Accounts Template", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.create_chart_of_accounts_based_on===\"Existing Company\"", 
+   "fieldname": "existing_company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Existing Company ", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "default_settings", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -373,6 +478,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Accounts Settings", 
    "length": 0, 
    "no_copy": 0, 
@@ -381,6 +487,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, 
@@ -391,6 +498,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:!doc.__islocal", 
    "fieldname": "default_bank_account", 
    "fieldtype": "Link", 
@@ -399,6 +507,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Default Bank Account", 
    "length": 0, 
    "no_copy": 1, 
@@ -409,6 +518,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, 
@@ -419,6 +529,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:!doc.__islocal", 
    "fieldname": "default_cash_account", 
    "fieldtype": "Link", 
@@ -427,6 +538,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Default Cash Account", 
    "length": 0, 
    "no_copy": 1, 
@@ -435,6 +547,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, 
@@ -445,6 +558,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:!doc.__islocal", 
    "fieldname": "default_receivable_account", 
    "fieldtype": "Link", 
@@ -453,6 +567,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Default Receivable Account", 
    "length": 0, 
    "no_copy": 1, 
@@ -463,6 +578,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, 
@@ -473,6 +589,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "round_off_account", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -480,6 +597,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Round Off Account", 
    "length": 0, 
    "no_copy": 0, 
@@ -489,6 +607,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, 
@@ -499,6 +618,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "write_off_account", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -506,6 +626,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Write Off Account", 
    "length": 0, 
    "no_copy": 0, 
@@ -515,6 +636,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, 
@@ -525,6 +647,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "exchange_gain_loss_account", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -532,6 +655,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Exchange Gain / Loss Account", 
    "length": 0, 
    "no_copy": 0, 
@@ -541,6 +665,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,6 +676,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break0", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -558,6 +684,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
@@ -565,6 +692,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, 
@@ -576,6 +704,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:!doc.__islocal", 
    "fieldname": "default_payable_account", 
    "fieldtype": "Link", 
@@ -584,6 +713,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Default Payable Account", 
    "length": 0, 
    "no_copy": 1, 
@@ -594,6 +724,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, 
@@ -604,6 +735,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:!doc.__islocal", 
    "fieldname": "default_expense_account", 
    "fieldtype": "Link", 
@@ -612,6 +744,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Default Cost of Goods Sold Account", 
    "length": 0, 
    "no_copy": 1, 
@@ -620,6 +753,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, 
@@ -630,6 +764,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:!doc.__islocal", 
    "fieldname": "default_income_account", 
    "fieldtype": "Link", 
@@ -638,6 +773,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Default Income Account", 
    "length": 0, 
    "no_copy": 1, 
@@ -646,6 +782,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, 
@@ -656,6 +793,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "round_off_cost_center", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -663,6 +801,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Round Off Cost Center", 
    "length": 0, 
    "no_copy": 0, 
@@ -672,6 +811,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, 
@@ -682,6 +822,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_22", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -689,6 +830,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -696,6 +838,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, 
@@ -706,6 +849,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:!doc.__islocal", 
    "fieldname": "cost_center", 
    "fieldtype": "Link", 
@@ -714,7 +858,8 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Deafult Cost Center", 
+   "in_standard_filter": 0, 
+   "label": "Default Cost Center", 
    "length": 0, 
    "no_copy": 1, 
    "options": "Cost Center", 
@@ -722,6 +867,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, 
@@ -732,6 +878,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:!doc.__islocal", 
    "fieldname": "credit_limit", 
    "fieldtype": "Currency", 
@@ -740,6 +887,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Credit Limit", 
    "length": 0, 
    "no_copy": 0, 
@@ -750,6 +898,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, 
@@ -760,6 +909,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_26", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -767,6 +917,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -774,6 +925,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, 
@@ -784,6 +936,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "credit_days_based_on", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -791,6 +944,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Credit Days Based On", 
    "length": 0, 
    "no_copy": 0, 
@@ -800,6 +954,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, 
@@ -810,6 +965,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:(!doc.__islocal && doc.credit_days_based_on=='Fixed Days')", 
    "fieldname": "credit_days", 
    "fieldtype": "Int", 
@@ -818,6 +974,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Credit Days", 
    "length": 0, 
    "no_copy": 0, 
@@ -827,6 +984,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, 
@@ -837,6 +995,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:!doc.__islocal", 
    "fieldname": "auto_accounting_for_stock_settings", 
    "fieldtype": "Section Break", 
@@ -845,6 +1004,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Stock Settings", 
    "length": 0, 
    "no_copy": 0, 
@@ -852,6 +1012,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, 
@@ -862,6 +1023,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "stock_received_but_not_billed", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -869,6 +1031,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Stock Received But Not Billed", 
    "length": 0, 
    "no_copy": 1, 
@@ -877,6 +1040,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, 
@@ -887,6 +1051,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "stock_adjustment_account", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -894,6 +1059,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Stock Adjustment Account", 
    "length": 0, 
    "no_copy": 1, 
@@ -902,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, 
@@ -912,6 +1079,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_32", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -919,6 +1087,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -926,6 +1095,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, 
@@ -936,6 +1106,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "expenses_included_in_valuation", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -943,6 +1114,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Expenses Included In Valuation", 
    "length": 0, 
    "no_copy": 1, 
@@ -951,6 +1123,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, 
@@ -961,6 +1134,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "fixed_asset_depreciation_settings", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -968,6 +1142,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Fixed Asset Depreciation Settings", 
    "length": 0, 
    "no_copy": 0, 
@@ -976,6 +1151,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, 
@@ -986,6 +1162,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "accumulated_depreciation_account", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -993,6 +1170,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Accumulated Depreciation Account", 
    "length": 0, 
    "no_copy": 1, 
@@ -1002,6 +1180,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, 
@@ -1012,6 +1191,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "depreciation_expense_account", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -1019,6 +1199,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Depreciation Expense Account", 
    "length": 0, 
    "no_copy": 1, 
@@ -1028,6 +1209,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, 
@@ -1038,6 +1220,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_40", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -1045,6 +1228,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -1052,6 +1236,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, 
@@ -1062,6 +1247,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "disposal_account", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -1069,6 +1255,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Gain/Loss Account on Asset Disposal", 
    "length": 0, 
    "no_copy": 1, 
@@ -1078,6 +1265,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, 
@@ -1088,6 +1276,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "depreciation_cost_center", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -1095,6 +1284,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Asset Depreciation Cost Center", 
    "length": 0, 
    "no_copy": 1, 
@@ -1104,6 +1294,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, 
@@ -1114,6 +1305,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "For reference only.", 
    "fieldname": "company_info", 
    "fieldtype": "Section Break", 
@@ -1122,6 +1314,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Company Info", 
    "length": 0, 
    "no_copy": 0, 
@@ -1129,6 +1322,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, 
@@ -1139,6 +1333,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "address", 
    "fieldtype": "Small Text", 
    "hidden": 0, 
@@ -1146,6 +1341,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Address", 
    "length": 0, 
    "no_copy": 0, 
@@ -1155,6 +1351,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, 
@@ -1165,6 +1362,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break1", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -1172,6 +1370,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
@@ -1179,6 +1378,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, 
@@ -1190,6 +1390,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "phone_no", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -1197,6 +1398,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Phone No", 
    "length": 0, 
    "no_copy": 0, 
@@ -1207,6 +1409,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, 
@@ -1217,6 +1420,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "fax", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -1224,6 +1428,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Fax", 
    "length": 0, 
    "no_copy": 0, 
@@ -1234,6 +1439,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, 
@@ -1244,6 +1450,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "email", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -1251,6 +1458,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Email", 
    "length": 0, 
    "no_copy": 0, 
@@ -1261,6 +1469,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, 
@@ -1271,6 +1480,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "website", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -1278,6 +1488,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Website", 
    "length": 0, 
    "no_copy": 0, 
@@ -1287,6 +1498,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, 
@@ -1297,6 +1509,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "", 
    "fieldname": "registration_info", 
    "fieldtype": "Section Break", 
@@ -1305,6 +1518,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
@@ -1313,6 +1527,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, 
@@ -1324,6 +1539,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "Company registration numbers for your reference. Tax numbers etc.", 
    "fieldname": "registration_details", 
    "fieldtype": "Code", 
@@ -1332,6 +1548,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Registration Details", 
    "length": 0, 
    "no_copy": 0, 
@@ -1341,6 +1558,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, 
@@ -1351,6 +1569,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "delete_company_transactions", 
    "fieldtype": "Button", 
    "hidden": 0, 
@@ -1358,6 +1577,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Delete Company Transactions", 
    "length": 0, 
    "no_copy": 0, 
@@ -1366,6 +1586,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, 
@@ -1375,7 +1596,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-building", 
+ "icon": "fa fa-building", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
@@ -1385,7 +1606,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-06-26 09:08:50.476200", 
+ "modified": "2016-11-23 16:32:04.893315", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Company", 
@@ -1401,6 +1622,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1421,6 +1643,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1441,6 +1664,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -1461,6 +1685,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -1481,6 +1706,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -1501,6 +1727,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -1521,6 +1748,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
diff --git a/erpnext/setup/doctype/company/company.py b/erpnext/setup/doctype/company/company.py
index 00538cd..7f506d5 100644
--- a/erpnext/setup/doctype/company/company.py
+++ b/erpnext/setup/doctype/company/company.py
@@ -30,6 +30,7 @@
 		self.validate_abbr()
 		self.validate_default_accounts()
 		self.validate_currency()
+		self.validate_coa_input()
 
 	def validate_abbr(self):
 		if not self.abbr:
@@ -113,16 +114,25 @@
 					warehouse.insert()
 
 	def create_default_accounts(self):
-		if not self.chart_of_accounts:
-			self.chart_of_accounts = "Standard"
-
 		from erpnext.accounts.doctype.account.chart_of_accounts.chart_of_accounts import create_charts
-		create_charts(self.chart_of_accounts, self.name)
+		create_charts(self.name, self.chart_of_accounts, self.existing_company)
 
 		frappe.db.set(self, "default_receivable_account", frappe.db.get_value("Account",
 			{"company": self.name, "account_type": "Receivable", "is_group": 0}))
 		frappe.db.set(self, "default_payable_account", frappe.db.get_value("Account",
 			{"company": self.name, "account_type": "Payable", "is_group": 0}))
+			
+	def validate_coa_input(self):
+		if self.create_chart_of_accounts_based_on == "Existing Company":
+			self.chart_of_accounts = None
+			if not self.existing_company:
+				frappe.throw(_("Please select Existing Company for creating Chart of Accounts"))
+
+		else:
+			self.existing_company = None
+			self.create_chart_of_accounts_based_on = "Standard Template"
+			if not self.chart_of_accounts:
+				self.chart_of_accounts = "Standard"
 
 	def set_default_accounts(self):
 		self._set_default_account("default_cash_account", "Cash")
diff --git a/erpnext/setup/doctype/company/delete_company_transactions.py b/erpnext/setup/doctype/company/delete_company_transactions.py
index 7e1681c..eb5c043 100644
--- a/erpnext/setup/doctype/company/delete_company_transactions.py
+++ b/erpnext/setup/doctype/company/delete_company_transactions.py
@@ -14,11 +14,10 @@
 	doc = frappe.get_doc("Company", company_name)
 
 	if frappe.session.user != doc.owner:
-		frappe.throw(_("Transactions can only be deleted by the creator of the Company"), 
+		frappe.throw(_("Transactions can only be deleted by the creator of the Company"),
 			frappe.PermissionError)
 
 	delete_bins(company_name)
-	delete_time_sheets(company_name)
 	delete_lead_addresses(company_name)
 
 	for doctype in frappe.db.sql_list("""select parent from
@@ -38,6 +37,9 @@
 
 	if not meta.issingle:
 		if not meta.istable:
+			# delete communication
+			delete_communications(doctype, company_name, company_fieldname)
+
 			# delete children
 			for df in meta.get_table_fields():
 				frappe.db.sql("""delete from `tab{0}` where parent in
@@ -65,19 +67,10 @@
 					frappe.db.sql("""update tabSeries set current = %s
 						where name=%s""", (last, prefix))
 
-
 def delete_bins(company_name):
 	frappe.db.sql("""delete from tabBin where warehouse in
 			(select name from tabWarehouse where company=%s)""", company_name)
 
-def delete_time_sheets(company_name):
-	# Delete Time Logs as it is linked to Production Order / Project / Task, which are linked to company
-	frappe.db.sql("""
-		delete from `tabTimesheet`
-		where
-			company=%(company)s
-	""", {"company": company_name})
-
 def delete_lead_addresses(company_name):
 	"""Delete addresses to which leads are linked"""
 	for lead in frappe.get_all("Lead", filters={"company": company_name}):
@@ -85,3 +78,9 @@
 			where lead=%s and (customer='' or customer is null) and (supplier='' or supplier is null)""", lead.name)
 
 		frappe.db.sql("""update `tabAddress` set lead=null, lead_name=null where lead=%s""", lead.name)
+
+def delete_communications(doctype, company_name, company_fieldname):
+		frappe.db.sql("""
+			DELETE FROM `tabCommunication` WHERE reference_doctype = %s AND
+			EXISTS (SELECT name FROM `tab{0}` WHERE {1} = %s AND `tabCommunication`.reference_name = name)
+			""".format(doctype, company_fieldname), (doctype, company_name))
diff --git a/erpnext/setup/doctype/company/test_company.py b/erpnext/setup/doctype/company/test_company.py
index afcc3b1..52836a6 100644
--- a/erpnext/setup/doctype/company/test_company.py
+++ b/erpnext/setup/doctype/company/test_company.py
@@ -7,8 +7,40 @@
 import frappe
 import unittest
 
-class TestCompany(unittest.TestCase):
-	pass
-
-
 test_records = frappe.get_test_records('Company')
+
+class TestCompany(unittest.TestCase):
+	def test_coa_based_on_existing_company(self):
+		make_company()
+		
+		expected_results = {
+			"Debtors - CFEC": {
+				"account_type": "Receivable",
+				"is_group": 0,
+				"root_type": "Asset",
+				"parent_account": "Accounts Receivable - CFEC",
+			},
+			"_Test Cash - CFEC": {
+				"account_type": "Cash",
+				"is_group": 0,
+				"root_type": "Asset",
+				"parent_account": "Cash In Hand - CFEC"
+			}
+		}
+		
+		for account, acc_property in expected_results.items():
+			acc = frappe.get_doc("Account", account)
+			for prop, val in acc_property.items():
+				self.assertEqual(acc.get(prop), val)
+		
+		
+def make_company():
+	company = frappe.new_doc("Company")
+	company.company_name = "COA from Existing Company"
+	company.abbr = "CFEC"
+	company.default_currency = "INR"
+	company.create_chart_of_accounts_based_on = "Existing Company"
+	company.existing_company = "_Test Company"
+	company.save()
+
+
diff --git a/erpnext/setup/doctype/currency_exchange/currency_exchange.json b/erpnext/setup/doctype/currency_exchange/currency_exchange.json
index 4c62e9b..56e914a 100644
--- a/erpnext/setup/doctype/currency_exchange/currency_exchange.json
+++ b/erpnext/setup/doctype/currency_exchange/currency_exchange.json
@@ -10,6 +10,7 @@
  "doctype": "DocType", 
  "document_type": "Setup", 
  "editable_grid": 0, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -49,7 +50,8 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
-   "in_list_view": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "From Currency", 
    "length": 0, 
    "no_copy": 0, 
@@ -58,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, 
@@ -76,7 +79,12 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+<<<<<<< HEAD
+   "in_list_view": 1, 
+   "in_standard_filter": 1, 
+=======
    "in_list_view": 0, 
+>>>>>>> 4a0c8400762adb857c8e929d3af56ba83d8c3f76
    "label": "To Currency", 
    "length": 0, 
    "no_copy": 0, 
@@ -85,6 +93,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, 
@@ -104,6 +113,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Exchange Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -112,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, 
@@ -122,7 +133,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-exchange", 
+ "icon": "fa fa-exchange", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
@@ -131,7 +142,11 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
+<<<<<<< HEAD
+ "modified": "2016-11-07 05:28:09.772560", 
+=======
  "modified": "2016-09-05 22:47:38.746711", 
+>>>>>>> 4a0c8400762adb857c8e929d3af56ba83d8c3f76
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Currency Exchange", 
@@ -147,6 +162,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -167,6 +183,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -187,6 +204,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -207,6 +225,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
diff --git a/erpnext/setup/doctype/customer_group/customer_group.json b/erpnext/setup/doctype/customer_group/customer_group.json
index a7ebb8a..dc595ac 100644
--- a/erpnext/setup/doctype/customer_group/customer_group.json
+++ b/erpnext/setup/doctype/customer_group/customer_group.json
@@ -350,7 +350,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-sitemap", 
+ "icon": "fa fa-sitemap", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
diff --git a/erpnext/setup/doctype/customer_group/customer_group_tree.js b/erpnext/setup/doctype/customer_group/customer_group_tree.js
new file mode 100644
index 0000000..b52c79c
--- /dev/null
+++ b/erpnext/setup/doctype/customer_group/customer_group_tree.js
@@ -0,0 +1,3 @@
+frappe.treeview_settings["Customer Group"] = {
+	ignore_fields:["parent_customer_group"]
+}
\ No newline at end of file
diff --git a/erpnext/setup/doctype/email_digest/email_digest.js b/erpnext/setup/doctype/email_digest/email_digest.js
index b830d87..d822a75 100644
--- a/erpnext/setup/doctype/email_digest/email_digest.js
+++ b/erpnext/setup/doctype/email_digest/email_digest.js
@@ -21,7 +21,7 @@
 				d.show();
 			}
 		});
-	}, "icon-eye-open", "btn-default");
+	}, "fa fa-eye-open", "btn-default");
 
 	if(user==="Administrator") {
 		cur_frm.add_custom_button(__('Send Now'), function() {
@@ -39,7 +39,7 @@
 			} else {
 				msgprint(save_msg);
 			}
-		}, "icon-envelope", "btn-default");
+		}, "fa fa-envelope", "btn-default");
 	}
 }
 
diff --git a/erpnext/setup/doctype/email_digest/email_digest.json b/erpnext/setup/doctype/email_digest/email_digest.json
index dfc5edb..a75a59a 100644
--- a/erpnext/setup/doctype/email_digest/email_digest.json
+++ b/erpnext/setup/doctype/email_digest/email_digest.json
@@ -3,17 +3,20 @@
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "Prompt", 
+ "beta": 0, 
  "creation": "2013-02-21 14:15:31", 
  "custom": 0, 
  "description": "Send regular summary reports via Email.", 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "System", 
+ "editable_grid": 0, 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "settings", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -21,6 +24,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Email Digest Settings", 
    "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,6 +43,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break0", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -45,12 +51,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, 
@@ -61,6 +69,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "enabled", 
    "fieldtype": "Check", 
    "hidden": 0, 
@@ -68,6 +77,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Enabled", 
    "length": 0, 
    "no_copy": 0, 
@@ -75,6 +85,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, 
@@ -85,6 +96,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "company", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -92,6 +104,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "For Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -100,6 +113,7 @@
    "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, 
@@ -110,6 +124,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "frequency", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -117,6 +132,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "How frequently?", 
    "length": 0, 
    "no_copy": 0, 
@@ -125,6 +141,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, 
@@ -135,6 +152,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.enabled", 
    "fieldname": "next_send", 
    "fieldtype": "Data", 
@@ -143,6 +161,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Next email will be sent on:", 
    "length": 0, 
    "no_copy": 0, 
@@ -150,6 +169,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, 
@@ -160,6 +180,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break1", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -167,12 +188,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, 
@@ -183,6 +206,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "Note: Email will not be sent to disabled users", 
    "fieldname": "recipient_list", 
    "fieldtype": "Code", 
@@ -191,6 +215,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Recipients", 
    "length": 0, 
    "no_copy": 0, 
@@ -199,6 +224,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, 
@@ -209,6 +235,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "addremove_recipients", 
    "fieldtype": "Button", 
    "hidden": 0, 
@@ -216,6 +243,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Add/Remove Recipients", 
    "length": 0, 
    "no_copy": 0, 
@@ -223,6 +251,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,6 +262,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "accounts", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -240,6 +270,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Accounts", 
    "length": 0, 
    "no_copy": 0, 
@@ -247,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, 
@@ -257,6 +289,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "accounts_module", 
    "fieldtype": "Column Break", 
    "hidden": 1, 
@@ -264,13 +297,15 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Income / Expense", 
+   "in_standard_filter": 0, 
+   "label": "Profit & Loss", 
    "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, 
@@ -281,6 +316,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "", 
    "fieldname": "income", 
    "fieldtype": "Check", 
@@ -289,13 +325,15 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Income", 
+   "in_standard_filter": 0, 
+   "label": "New Income", 
    "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, 
@@ -306,6 +344,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "", 
    "fieldname": "expenses_booked", 
    "fieldtype": "Check", 
@@ -314,13 +353,15 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Expense", 
+   "in_standard_filter": 0, 
+   "label": "New Expenses", 
    "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, 
@@ -331,31 +372,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "description": "", 
-   "fieldname": "bank_balance", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Bank Balance", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "income_year_to_date", 
    "fieldtype": "Check", 
    "hidden": 0, 
@@ -363,6 +380,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Annual Income", 
    "length": 0, 
    "no_copy": 0, 
@@ -370,6 +388,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, 
@@ -380,6 +399,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "expense_year_to_date", 
    "fieldtype": "Check", 
    "hidden": 0, 
@@ -387,7 +407,8 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Annual Expense", 
+   "in_standard_filter": 0, 
+   "label": "Annual Expenses", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -395,6 +416,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, 
@@ -405,6 +427,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "", 
    "fieldname": "column_break_16", 
    "fieldtype": "Column Break", 
@@ -413,13 +436,15 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Receivables / Payables", 
+   "in_standard_filter": 0, 
+   "label": "Balance Sheet", 
    "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, 
@@ -430,6 +455,63 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
+   "description": "", 
+   "fieldname": "bank_balance", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Bank Balance", 
+   "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": "credit_balance", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Credit Balance", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "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": "invoiced_amount", 
    "fieldtype": "Check", 
@@ -438,6 +520,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Receivables", 
    "length": 0, 
    "no_copy": 0, 
@@ -445,6 +528,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, 
@@ -455,6 +539,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "", 
    "fieldname": "payables", 
    "fieldtype": "Check", 
@@ -463,6 +548,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Payables", 
    "length": 0, 
    "no_copy": 0, 
@@ -470,6 +556,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, 
@@ -480,6 +567,314 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "operation", 
+   "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": "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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_21", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "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": "sales_order", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "New Sales Orders", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "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": "pending_sales_orders", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Pending Sales Orders", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "purchase_order", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "New Purchase Orders", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "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": "pending_purchase_orders", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Pending Purchase Orders", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "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_operation", 
+   "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": 0, 
+   "fieldname": "new_quotations", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "New Quotations", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "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": "pending_quotations", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Pending Quotations", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "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": "issue", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Open Issues", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "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": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Open Projects", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "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": "other", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -487,6 +882,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Other", 
    "length": 0, 
    "no_copy": 0, 
@@ -495,6 +891,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, 
@@ -505,6 +902,147 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "tools", 
+   "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": "Tools", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "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": "calendar_events", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Upcoming Calendar Events", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "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": "todo_list", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Open To Do", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "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": "notifications", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Open Notifications", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "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_32", 
+   "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": 0, 
    "fieldname": "add_quote", 
    "fieldtype": "Check", 
    "hidden": 0, 
@@ -512,6 +1050,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Add Quote", 
    "length": 0, 
    "no_copy": 0, 
@@ -520,6 +1059,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, 
@@ -529,8 +1069,9 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-envelope", 
+ "icon": "fa fa-envelope", 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
@@ -538,7 +1079,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-02-22 09:22:28.877187", 
+ "modified": "2016-11-07 05:10:32.190134", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Email Digest", 
@@ -554,6 +1095,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -574,6 +1116,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 1, 
    "print": 0, 
    "read": 1, 
@@ -585,8 +1128,10 @@
    "write": 0
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "sort_field": "modified", 
- "sort_order": "DESC"
+ "sort_order": "DESC", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/setup/doctype/email_digest/email_digest.py b/erpnext/setup/doctype/email_digest/email_digest.py
index 4f70cd8..a7dfa7c 100644
--- a/erpnext/setup/doctype/email_digest/email_digest.py
+++ b/erpnext/setup/doctype/email_digest/email_digest.py
@@ -10,7 +10,7 @@
 from dateutil.relativedelta import relativedelta
 from frappe.core.doctype.user.user import STANDARD_USERS
 import frappe.desk.notifications
-from erpnext.accounts.utils import get_balance_on
+from erpnext.accounts.utils import get_balance_on, get_count_on, get_currency_precision
 
 user_specific_content = ["calendar_events", "todo_list"]
 
@@ -77,10 +77,20 @@
 		self.set_title(context)
 		self.set_style(context)
 		self.set_accounting_cards(context)
-
-		context.events = self.get_calendar_events()
-		context.todo_list = self.get_todo_list()
-		context.notifications = self.get_notifications()
+		
+		if self.get("calendar_events"):
+			context.events, context.event_count = self.get_calendar_events()
+		if self.get("todo_list"):
+			context.todo_list = self.get_todo_list()
+			context.todo_count = self.get_todo_count()
+		if self.get("notifications"):
+			context.notifications = self.get_notifications()
+		if self.get("issue"):
+			context.issue_list = self.get_issue_list()
+			context.issue_count = self.get_issue_count()
+		if self.get("project"):
+			context.project_list = self.get_project_list()
+			context.project_count = self.get_project_count()
 
 		quote = get_random_quote()
 		context.quote = {"text": quote[0], "author": quote[1]}
@@ -136,14 +146,16 @@
 		from frappe.desk.doctype.event.event import get_events
 		events = get_events(self.future_from_date.strftime("%Y-%m-%d"),
 			self.future_to_date.strftime("%Y-%m-%d")) or []
-
+		
+		event_count = 0
 		for i, e in enumerate(events):
 			e.starts_on_label = format_time(e.starts_on)
 			e.ends_on_label = format_time(e.ends_on) if e.ends_on else None
 			e.date = formatdate(e.starts)
 			e.link = get_url_to_form("Event", e.name)
+			event_count += 1
 
-		return events
+		return events, event_count
 
 	def get_todo_list(self, user_id=None):
 		"""Get to-do list"""
@@ -159,16 +171,69 @@
 			t.link = get_url_to_form("ToDo", t.name)
 
 		return todo_list
+	
+	def get_todo_count(self, user_id=None):
+		"""Get count of Todo"""
+		if not user_id:
+			user_id = frappe.session.user
+
+		return frappe.db.sql("""select count(*) from `tabToDo` 
+			where status='Open' and (owner=%s or assigned_by=%s)""",
+			(user_id, user_id))[0][0]
+
+	def get_issue_list(self, user_id=None):
+		"""Get issue list"""
+		if not user_id:
+			user_id = frappe.session.user
+		
+		meta = frappe.get_meta("Issue")
+		role_permissions = frappe.permissions.get_role_permissions(meta, user_id)
+		if not role_permissions.get("read"):
+			return None
+
+		issue_list = frappe.db.sql("""select *
+			from `tabIssue` where status in ("Replied","Open")
+			order by modified asc limit 10""", as_dict=True)
+
+		for t in issue_list:
+			t.link = get_url_to_form("Issue", t.name)
+
+		return issue_list
+	
+	def get_issue_count(self):
+		"""Get count of Issue"""
+		return frappe.db.sql("""select count(*) from `tabIssue`
+			where status in ('Open','Replied') """)[0][0]
+
+	def get_project_list(self, user_id=None):
+		"""Get project list"""
+		if not user_id:
+			user_id = frappe.session.user
+
+		project_list = frappe.db.sql("""select *
+			from `tabProject` where status='Open' and project_type='External'
+			order by modified asc limit 10""", as_dict=True)
+
+		for t in project_list:
+			t.link = get_url_to_form("Issue", t.name)
+
+		return project_list
+
+	def get_project_count(self):
+		"""Get count of Project"""
+		return frappe.db.sql("""select count(*) from `tabProject`
+			where status='Open' and project_type='External'""")[0][0]
 
 	def set_accounting_cards(self, context):
 		"""Create accounting cards if checked"""
 
 		cache = frappe.cache()
 		context.cards = []
-		for key in ("income", "expenses_booked", "income_year_to_date", "expense_year_to_date",
-			"invoiced_amount", "payables", "bank_balance"):
+		for key in ("income", "expenses_booked", "income_year_to_date","expense_year_to_date",
+			 "new_quotations","pending_quotations","sales_order","purchase_order","pending_sales_orders","pending_purchase_orders",
+			"invoiced_amount", "payables", "bank_balance", "credit_balance"):
 			if self.get(key):
-				cache_key = "email_digest:card:{0}:{1}".format(self.company, key)
+				cache_key = "email_digest:card:{0}:{1}:{2}".format(self.company, self.frequency, key)
 				card = cache.get(cache_key)
 
 				if card:
@@ -187,9 +252,25 @@
 							card.diff = "+" + str(card.diff)
 							card.gain = True
 
-						card.last_value = self.fmt_money(card.last_value)
+						if key == "credit_balance":
+							card.last_value = card.last_value * -1
+						card.last_value = self.fmt_money(card.last_value,False if key in ("bank_balance", "credit_balance") else True)
 
-					card.value = self.fmt_money(card.value)
+
+					if card.billed_value:
+						card.billed = int(flt(card.billed_value) / card.value * 100)
+						card.billed = "% Billed " + str(card.billed)
+
+					if card.delivered_value:
+						card.delivered = int(flt(card.delivered_value) / card.value * 100)
+						if key == "pending_sales_orders":
+							card.delivered = "% Delivered " + str(card.delivered)
+						else:
+							card.delivered = "% Received " + str(card.delivered)
+						
+					if key =="credit_balance":
+						card.value = card.value *-1
+					card.value = self.fmt_money(card.value,False if key in ("bank_balance", "credit_balance") else True)
 
 					cache.setex(cache_key, card, 24 * 60 * 60)
 
@@ -197,37 +278,45 @@
 
 	def get_income(self):
 		"""Get income for given period"""
-		income, past_income = self.get_period_amounts(self.get_root_type_accounts("income"))
+		income, past_income, count = self.get_period_amounts(self.get_root_type_accounts("income"),'income')
 
 		return {
 			"label": self.meta.get_label("income"),
 			"value": income,
-			"last_value": past_income
+			"last_value": past_income,
+			"count": count
 		}
 
 	def get_income_year_to_date(self):
 		"""Get income to date"""
-		return self.get_year_to_date_balance("income")
+		return self.get_year_to_date_balance("income", "income")
 
 	def get_expense_year_to_date(self):
 		"""Get income to date"""
-		return self.get_year_to_date_balance("expense")
+		return self.get_year_to_date_balance("expense","expenses_booked")
 
-	def get_year_to_date_balance(self, root_type):
+	def get_year_to_date_balance(self, root_type, fieldname):
 		"""Get income to date"""
 		balance = 0.0
+		count = 0
 
 		for account in self.get_root_type_accounts(root_type):
 			balance += get_balance_on(account, date = self.future_to_date)
+			count += get_count_on(account, fieldname, date = self.future_to_date)
 
 		return {
 			"label": self.meta.get_label(root_type + "_year_to_date"),
-			"value": balance
+			"value": balance,
+			"count": count
 		}
 
 	def get_bank_balance(self):
-		# account is of type "Bank" or "Cash"
-		return self.get_type_balance('bank_balance', 'Bank')
+		# account is of type "Bank" and root_type is Asset
+		return self.get_type_balance('bank_balance', 'Bank', root_type='Asset')
+	
+	def get_credit_balance(self):
+		# account is of type "Bank" and root_type is Liability
+		return self.get_type_balance('credit_balance', 'Bank', root_type='Liability')
 
 	def get_payables(self):
 		return self.get_type_balance('payables', 'Payable')
@@ -236,41 +325,62 @@
 		return self.get_type_balance('invoiced_amount', 'Receivable')
 
 	def get_expenses_booked(self):
-		expense, past_expense = self.get_period_amounts(self.get_root_type_accounts("expense"))
+		expense, past_expense, count = self.get_period_amounts(self.get_root_type_accounts("expense"), 'expenses_booked')
 
 		return {
 			"label": self.meta.get_label("expenses_booked"),
 			"value": expense,
-			"last_value": past_expense
+			"last_value": past_expense,
+			"count": count
 		}
 
-	def get_period_amounts(self, accounts):
+	def get_period_amounts(self, accounts, fieldname):
 		"""Get amounts for current and past periods"""
 		balance = past_balance = 0.0
+		count = 0
 		for account in accounts:
 			balance += (get_balance_on(account, date = self.future_to_date)
-				- get_balance_on(account, date = self.future_from_date))
+				- get_balance_on(account, date = self.future_from_date - timedelta(days=1)))
+
+			count += (get_count_on(account,fieldname, date = self.future_to_date )
+				- get_count_on(account,fieldname, date = self.future_from_date - timedelta(days=1)))
 
 			past_balance += (get_balance_on(account, date = self.past_to_date)
-				- get_balance_on(account, date = self.past_from_date))
+				- get_balance_on(account, date = self.past_from_date - timedelta(days=1)))
 
-		return balance, past_balance
+		return balance, past_balance, count
 
-	def get_type_balance(self, fieldname, account_type):
-		accounts = [d.name for d in \
-			frappe.db.get_all("Account", filters={"account_type": account_type,
+	def get_type_balance(self, fieldname, account_type, root_type=None):
+		
+		if root_type:
+			accounts = [d.name for d in \
+				frappe.db.get_all("Account", filters={"account_type": account_type,
+				"company": self.company, "is_group": 0, "root_type": root_type})]
+		else:
+			accounts = [d.name for d in \
+				frappe.db.get_all("Account", filters={"account_type": account_type,
 				"company": self.company, "is_group": 0})]
 
 		balance = prev_balance = 0.0
+		count = 0
 		for account in accounts:
-			balance += get_balance_on(account, date=self.future_from_date)
-			prev_balance += get_balance_on(account, date=self.past_from_date)
-
-		return {
-			'label': self.meta.get_label(fieldname),
-			'value': balance,
-			'last_value': prev_balance
-		}
+			balance += get_balance_on(account, date=self.future_to_date)
+			count += get_count_on(account, fieldname, date=self.future_to_date)
+			prev_balance += get_balance_on(account, date=self.past_to_date)
+		
+		if fieldname in ("bank_balance","credit_balance"):
+			return {
+				'label': self.meta.get_label(fieldname),
+				'value': balance,
+				'last_value': prev_balance			}
+		else:
+			return {
+				'label': self.meta.get_label(fieldname),
+				'value': balance,
+				'last_value': prev_balance,
+				'count': count
+			}
+	
 
 	def get_root_type_accounts(self, root_type):
 		if not root_type in self._accounts:
@@ -279,6 +389,83 @@
 					"company": self.company, "is_group": 0})]
 		return self._accounts[root_type]
 
+	def get_purchase_order(self):
+		
+		return self.get_summary_of_doc("Purchase Order","purchase_order")
+
+	def get_sales_order(self):
+
+		return self.get_summary_of_doc("Sales Order","sales_order")
+    
+	def get_pending_purchase_orders(self):
+
+		return self.get_summary_of_pending("Purchase Order","pending_purchase_orders","per_received")
+
+	def get_pending_sales_orders(self):
+
+		return self.get_summary_of_pending("Sales Order","pending_sales_orders","per_delivered")
+
+	def get_new_quotations(self):
+
+		return self.get_summary_of_doc("Quotation","new_quotations")
+
+	def get_pending_quotations(self):
+
+		return self.get_summary_of_pending_quotations("pending_quotations")
+	
+	def get_summary_of_pending(self, doc_type, fieldname, getfield):
+
+		value, count, billed_value, delivered_value = frappe.db.sql("""select ifnull(sum(grand_total),0), count(*), 
+			ifnull(sum(grand_total*per_billed/100),0), ifnull(sum(grand_total*{0}/100),0)  from `tab{1}`
+			where (transaction_date <= %(to_date)s)
+			and status not in ('Closed','Cancelled', 'Completed') """.format(getfield, doc_type),
+			{"to_date": self.future_to_date})[0]
+		
+		return {
+			"label": self.meta.get_label(fieldname),
+            		"value": value,
+			"billed_value": billed_value,
+			"delivered_value": delivered_value,
+            		"count": count
+		}
+	
+	def get_summary_of_pending_quotations(self, fieldname):
+
+		value, count = frappe.db.sql("""select ifnull(sum(grand_total),0), count(*) from `tabQuotation`
+			where (transaction_date <= %(to_date)s)
+			and status not in ('Ordered','Cancelled', 'Lost') """,{"to_date": self.future_to_date})[0]
+
+		last_value = frappe.db.sql("""select ifnull(sum(grand_total),0) from `tabQuotation`
+			where (transaction_date <= %(to_date)s)
+			and status not in ('Ordered','Cancelled', 'Lost') """,{"to_date": self.past_to_date})[0][0]
+		
+		return {
+			"label": self.meta.get_label(fieldname),
+            		"value": value,
+			"last_value": last_value,
+            		"count": count
+		}
+
+	def get_summary_of_doc(self, doc_type, fieldname):
+		
+		value = self.get_total_on(doc_type, self.future_from_date, self.future_to_date)[0]
+		count = self.get_total_on(doc_type, self.future_from_date, self.future_to_date)[1] 
+
+		last_value =self.get_total_on(doc_type, self.past_from_date, self.past_to_date)[0]
+
+		return {
+			"label": self.meta.get_label(fieldname),
+            		"value": value,
+            		"last_value": last_value,
+			"count": count
+		}
+	
+	def get_total_on(self, doc_type, from_date, to_date):
+		
+		return frappe.db.sql("""select ifnull(sum(grand_total),0), count(*) from `tab{0}`
+			where (transaction_date between %(from_date)s and %(to_date)s) and status not in ('Cancelled')""".format(doc_type),
+			{"from_date": from_date, "to_date": to_date})[0]
+
 	def get_from_to_date(self):
 		today = now_datetime().date()
 
@@ -332,8 +519,11 @@
 	def onload(self):
 		self.get_next_sending()
 
-	def fmt_money(self, value):
-		return fmt_money(abs(value), currency = self.currency)
+	def fmt_money(self, value,absol=True):
+		if absol:
+			return fmt_money(abs(value), currency = self.currency)
+		else:
+			return fmt_money(value, currency=self.currency)
 
 def send():
 	now_date = now_datetime().date()
diff --git a/erpnext/setup/doctype/email_digest/templates/default.html b/erpnext/setup/doctype/email_digest/templates/default.html
index 7ed9d1f..78acbd9 100644
--- a/erpnext/setup/doctype/email_digest/templates/default.html
+++ b/erpnext/setup/doctype/email_digest/templates/default.html
@@ -1,10 +1,20 @@
 {% macro show_card(card) %}
 <div style="width: 50%; float:left; min-height: 80px; padding-top: 20px;">
-    <h6 style="color: {{ text_muted }}; font-size: 12px; margin-bottom: 0px; margin-top: 0px;">{{ card.label }}</h6>
+    <h6 style="color: {{ text_muted }}; font-size: 12px; margin-bottom: 0px; margin-top: 0px;">{{ card.label }}
+    {% if card.count %}
+    <span class="badge">({{ card.count }})</span>
+    {% endif %}</h6>
     <h4 style="margin-top: 7px; font-size: 16px; margin-botom: 5px;">{{ card.value }}</h4>
     {% if card.diff %}
     <p style="color: {{ text_muted }}; font-size: 12px; margin-top: 0px;">{{ card.diff }}%</p>
     {% endif %}
+    {% if card.billed %}
+    <p style="color: {{ text_muted }}; font-size: 12px; margin-top: 0px;">{{ card.billed }}%</p>
+    {% endif %}
+    {% if card.delivered %}
+    <p style="color: {{ text_muted }}; font-size: 12px; margin-top: 0px;">{{ card.delivered }}%</p>
+    {% endif %}
+
 </div>
 {% endmacro %}
 
@@ -31,13 +41,61 @@
 <div style="clear: both"></div>
 {% endif %}
 
+<!-- issue list -->
+{% if issue_list %}
+<h4 style="{{ section_head }}">{{ _("Open Issues ") }}
+	<span class="badge">({{ issue_count }})</span></h4>
+<div>
+{% for t in issue_list %}
+    <div style="{{ line_item }}">
+        <table style="width: 100%;">
+            <tr>
+                <td>
+                    <a style="{{ link_css }}" href="{{ t.link }}">{{ _(t.subject) }}</a>
+                </td>
+                <td style="width: 25%; text-align: right">
+                    <span style="{{ label_css }}">
+                        {{ _(t.status) }}
+                    </span>
+                </td>
+            </tr>
+        </table>
+    </div>
+{% endfor %}
+</div>
+{% endif %}
+
+<!-- project list -->
+{% if project_list %}
+<h4 style="{{ section_head }}">{{ _("Open Projects ") }}
+	<span class="badge">({{ project_count }})</span></h4>
+<div>
+{% for t in project_list %}
+    <div style="{{ line_item }}">
+        <table style="width: 100%;">
+            <tr>
+                <td>
+                    <a style="{{ link_css }}" href="{{ t.link }}">{{ _(t.project_name) }}</a>
+                </td>
+                <td style="width: 25%; text-align: right">
+                    <span style="{{ label_css }}">
+                        {{ _(t.status) }}
+                    </span>
+                </td>
+            </tr>
+        </table>
+    </div>
+{% endfor %}
+</div>
+{% endif %}
 
 {% if events or todo_list or notifications %}
 <h1 style="{{ h1 }}">{{ _("Pending Activities") }}</h1>
 
 <!-- events -->
 {% if events %}
-<h4 style="{{ section_head }}">{{ _("Upcoming Events") }}</h4>
+<h4 style="{{ section_head }}">{{ _("Upcoming Calendar Events ") }}
+	<span class="badge">({{ event_count }})</span></h4>
 <div>
 {% for e in events %}
     {% if loop.index==1 or events[loop.index-1].date != e.date %}
@@ -69,7 +127,8 @@
 
 <!-- todo list -->
 {% if todo_list %}
-<h4 style="{{ section_head }}">{{ _("To Do List") }}</h4>
+<h4 style="{{ section_head }}">{{ _("Open To Do ") }}
+	<span class="badge">({{ todo_count }})</span></h4>
 <div>
 {% for t in todo_list %}
     <div style="{{ line_item }}">
diff --git a/erpnext/setup/doctype/global_defaults/global_defaults.json b/erpnext/setup/doctype/global_defaults/global_defaults.json
index a9397f2..ce3f2cf 100644
--- a/erpnext/setup/doctype/global_defaults/global_defaults.json
+++ b/erpnext/setup/doctype/global_defaults/global_defaults.json
@@ -222,7 +222,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-cog", 
+ "icon": "fa fa-cog", 
  "idx": 1, 
  "in_create": 1, 
  "in_dialog": 0, 
diff --git a/erpnext/setup/doctype/item_group/item_group.json b/erpnext/setup/doctype/item_group/item_group.json
index 02b5268..45740bc 100644
--- a/erpnext/setup/doctype/item_group/item_group.json
+++ b/erpnext/setup/doctype/item_group/item_group.json
@@ -453,7 +453,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-sitemap", 
+ "icon": "fa fa-sitemap", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
diff --git a/erpnext/setup/doctype/item_group/item_group_tree.js b/erpnext/setup/doctype/item_group/item_group_tree.js
new file mode 100644
index 0000000..57afe02
--- /dev/null
+++ b/erpnext/setup/doctype/item_group/item_group_tree.js
@@ -0,0 +1,3 @@
+frappe.treeview_settings["Item Group"] = {
+	ignore_fields:["parent_item_group"]
+}
\ No newline at end of file
diff --git a/erpnext/setup/doctype/naming_series/naming_series.json b/erpnext/setup/doctype/naming_series/naming_series.json
index 545db9d..0daf1a1 100644
--- a/erpnext/setup/doctype/naming_series/naming_series.json
+++ b/erpnext/setup/doctype/naming_series/naming_series.json
@@ -227,7 +227,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 1, 
- "icon": "icon-sort-by-order", 
+ "icon": "fa fa-sort-by-order", 
  "idx": 1, 
  "in_create": 0, 
  "in_dialog": 0, 
diff --git a/erpnext/setup/doctype/naming_series/naming_series.py b/erpnext/setup/doctype/naming_series/naming_series.py
index 33deea4..67646f6 100644
--- a/erpnext/setup/doctype/naming_series/naming_series.py
+++ b/erpnext/setup/doctype/naming_series/naming_series.py
@@ -14,7 +14,8 @@
 class NamingSeries(Document):
 	def get_transactions(self, arg=None):
 		doctypes = list(set(frappe.db.sql_list("""select parent
-				from `tabDocField` where fieldname='naming_series'""")
+				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)""")
 			+ frappe.db.sql_list("""select dt from `tabCustom Field`
 				where fieldname='naming_series'""")))
 
@@ -24,7 +25,8 @@
 			try:
 				options = self.get_options(d)
 			except frappe.DoesNotExistError:
-				frappe.pass_does_not_exist_error()
+				frappe.msgprint('Unable to find DocType {0}'.format(d))
+				#frappe.pass_does_not_exist_error()
 				continue
 
 			if options:
diff --git a/erpnext/setup/doctype/notification_control/notification_control.js b/erpnext/setup/doctype/notification_control/notification_control.js
index c8e199b..7f58ede 100644
--- a/erpnext/setup/doctype/notification_control/notification_control.js
+++ b/erpnext/setup/doctype/notification_control/notification_control.js
@@ -9,7 +9,9 @@
 		frm.set_value("custom_message", frm.doc[frm.events.get_fieldname(frm)]);
 	},
 	set_message: function(frm) {
-		frm.set_value(frm.events.get_fieldname(frm), frm.doc.custom_message);
+		if(frm.doc.select_transaction && frm.doc.select_transaction !== "") {
+			frm.set_value(frm.events.get_fieldname(frm), frm.doc.custom_message);
+		}
 		frm.save();
 	},
 	get_fieldname: function(frm) {
diff --git a/erpnext/setup/doctype/notification_control/notification_control.json b/erpnext/setup/doctype/notification_control/notification_control.json
index 540aa13..fc3316e 100644
--- a/erpnext/setup/doctype/notification_control/notification_control.json
+++ b/erpnext/setup/doctype/notification_control/notification_control.json
@@ -523,7 +523,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-envelope", 
+ "icon": "fa fa-envelope", 
  "idx": 1, 
  "in_create": 0, 
  "in_dialog": 0, 
diff --git a/erpnext/setup/doctype/print_heading/print_heading.json b/erpnext/setup/doctype/print_heading/print_heading.json
index be64db0..d992fcb 100644
--- a/erpnext/setup/doctype/print_heading/print_heading.json
+++ b/erpnext/setup/doctype/print_heading/print_heading.json
@@ -67,7 +67,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-font", 
+ "icon": "fa fa-font", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
diff --git a/erpnext/setup/doctype/quotation_lost_reason/quotation_lost_reason.json b/erpnext/setup/doctype/quotation_lost_reason/quotation_lost_reason.json
index c301698..b95a936 100644
--- a/erpnext/setup/doctype/quotation_lost_reason/quotation_lost_reason.json
+++ b/erpnext/setup/doctype/quotation_lost_reason/quotation_lost_reason.json
@@ -40,7 +40,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-flag", 
+ "icon": "fa fa-flag", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
diff --git a/erpnext/setup/doctype/sales_partner/sales_partner.js b/erpnext/setup/doctype/sales_partner/sales_partner.js
index cb66b7f..143bf44 100644
--- a/erpnext/setup/doctype/sales_partner/sales_partner.js
+++ b/erpnext/setup/doctype/sales_partner/sales_partner.js
@@ -12,9 +12,3 @@
 		erpnext.utils.render_address_and_contact(cur_frm);
 	}
 }
-
-cur_frm.fields_dict['targets'].grid.get_field("item_group").get_query = function(doc, dt, dn) {
-  return{
-  	filters:{ 'is_group': 0 }
-  }
-}
diff --git a/erpnext/setup/doctype/sales_partner/sales_partner.json b/erpnext/setup/doctype/sales_partner/sales_partner.json
index 7cdb30d..760954c 100644
--- a/erpnext/setup/doctype/sales_partner/sales_partner.json
+++ b/erpnext/setup/doctype/sales_partner/sales_partner.json
@@ -10,11 +10,14 @@
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Setup", 
+ "editable_grid": 0, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "partner_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -22,6 +25,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Sales Partner 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, 
@@ -41,6 +46,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "partner_type", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -48,6 +54,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Partner Type", 
    "length": 0, 
    "no_copy": 0, 
@@ -58,6 +65,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -68,6 +76,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "", 
    "fieldname": "territory", 
    "fieldtype": "Link", 
@@ -76,6 +85,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Territory", 
    "length": 0, 
    "no_copy": 0, 
@@ -84,6 +94,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,6 +105,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break0", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -101,6 +113,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
@@ -108,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, 
@@ -119,6 +133,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "commission_rate", 
    "fieldtype": "Float", 
    "hidden": 0, 
@@ -126,6 +141,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Commission Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -135,6 +151,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, 
@@ -145,6 +162,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "address_contacts", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -152,6 +170,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Address & Contacts", 
    "length": 0, 
    "no_copy": 0, 
@@ -159,6 +178,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,6 +189,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.__islocal", 
    "fieldname": "address_desc", 
    "fieldtype": "HTML", 
@@ -177,6 +198,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Address Desc", 
    "length": 0, 
    "no_copy": 0, 
@@ -184,6 +206,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, 
@@ -194,6 +217,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "address_html", 
    "fieldtype": "HTML", 
    "hidden": 0, 
@@ -201,6 +225,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Address HTML", 
    "length": 0, 
    "no_copy": 0, 
@@ -208,6 +233,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, 
@@ -218,6 +244,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break1", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -225,12 +252,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, 
@@ -241,6 +270,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.__islocal", 
    "fieldname": "contact_desc", 
    "fieldtype": "HTML", 
@@ -249,6 +279,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Contact Desc", 
    "length": 0, 
    "no_copy": 0, 
@@ -256,6 +287,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, 
@@ -266,6 +298,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "contact_html", 
    "fieldtype": "HTML", 
    "hidden": 0, 
@@ -273,6 +306,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Contact HTML", 
    "length": 0, 
    "no_copy": 0, 
@@ -280,6 +314,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, 
@@ -290,6 +325,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "partner_target_details_section_break", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -297,6 +333,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Sales Partner Target", 
    "length": 0, 
    "no_copy": 0, 
@@ -305,6 +342,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, 
@@ -315,6 +353,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "targets", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -322,6 +361,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Targets", 
    "length": 0, 
    "no_copy": 0, 
@@ -332,6 +372,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, 
@@ -342,6 +383,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", 
@@ -350,6 +392,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Target Distribution", 
    "length": 0, 
    "no_copy": 0, 
@@ -360,6 +403,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, 
@@ -370,6 +414,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "website", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -377,6 +422,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Website", 
    "length": 0, 
    "no_copy": 0, 
@@ -384,6 +430,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, 
@@ -394,6 +441,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "show_in_website", 
    "fieldtype": "Check", 
    "hidden": 0, 
@@ -401,6 +449,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Show In Website", 
    "length": 0, 
    "no_copy": 0, 
@@ -408,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, 
@@ -418,6 +468,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "show_in_website", 
    "fieldname": "section_break_17", 
    "fieldtype": "Section Break", 
@@ -426,12 +477,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, 
@@ -442,6 +495,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "route", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -449,6 +503,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Route", 
    "length": 0, 
    "no_copy": 0, 
@@ -457,6 +512,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, 
@@ -467,6 +523,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_20", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -474,12 +531,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, 
@@ -490,6 +549,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "logo", 
    "fieldtype": "Attach", 
    "hidden": 0, 
@@ -497,6 +557,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Logo", 
    "length": 0, 
    "no_copy": 0, 
@@ -505,6 +566,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, 
@@ -515,6 +577,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "partner_website", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -522,6 +585,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Partner website", 
    "length": 0, 
    "no_copy": 0, 
@@ -529,6 +593,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, 
@@ -539,6 +604,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "show_in_website", 
    "fieldname": "section_break_22", 
    "fieldtype": "Section Break", 
@@ -547,12 +613,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, 
@@ -563,6 +631,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "introduction", 
    "fieldtype": "Text", 
    "hidden": 0, 
@@ -570,6 +639,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Introduction", 
    "length": 0, 
    "no_copy": 0, 
@@ -577,6 +647,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, 
@@ -587,6 +658,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "description", 
    "fieldtype": "Text Editor", 
    "hidden": 0, 
@@ -594,6 +666,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Description", 
    "length": 0, 
    "no_copy": 0, 
@@ -601,6 +674,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, 
@@ -610,7 +684,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-user", 
+ "icon": "fa fa-user", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
@@ -619,7 +693,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-06-23 14:45:31.978973", 
+ "modified": "2016-11-07 05:29:37.597903", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Sales Partner", 
@@ -635,6 +709,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -655,6 +730,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -675,6 +751,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
diff --git a/erpnext/setup/doctype/sales_person/sales_person.json b/erpnext/setup/doctype/sales_person/sales_person.json
index b42adca..1665ba5 100644
--- a/erpnext/setup/doctype/sales_person/sales_person.json
+++ b/erpnext/setup/doctype/sales_person/sales_person.json
@@ -11,11 +11,13 @@
  "doctype": "DocType", 
  "document_type": "Setup", 
  "editable_grid": 0, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "name_and_employee_id", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -23,14 +25,16 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Name and Employee ID", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "icon-user", 
+   "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, 
@@ -41,6 +45,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "sales_person_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -48,6 +53,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Sales Person Name", 
    "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, 
@@ -67,6 +74,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "Select company name first.", 
    "fieldname": "parent_sales_person", 
    "fieldtype": "Link", 
@@ -75,6 +83,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Parent Sales Person", 
    "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, 
@@ -95,6 +105,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "is_group", 
    "fieldtype": "Check", 
    "hidden": 0, 
@@ -102,6 +113,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Is Group", 
    "length": 0, 
    "no_copy": 0, 
@@ -112,6 +124,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, 
@@ -122,6 +135,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "cb0", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -129,12 +143,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, 
@@ -145,6 +161,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "employee", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -152,6 +169,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Employee", 
    "length": 0, 
    "no_copy": 0, 
@@ -160,6 +178,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, 
@@ -170,6 +189,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "lft", 
    "fieldtype": "Int", 
    "hidden": 1, 
@@ -177,6 +197,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "lft", 
    "length": 0, 
    "no_copy": 1, 
@@ -186,6 +207,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, 
@@ -196,6 +218,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "rgt", 
    "fieldtype": "Int", 
    "hidden": 1, 
@@ -203,6 +226,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "rgt", 
    "length": 0, 
    "no_copy": 1, 
@@ -212,6 +236,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, 
@@ -222,6 +247,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "old_parent", 
    "fieldtype": "Data", 
    "hidden": 1, 
@@ -229,6 +255,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "old_parent", 
    "length": 0, 
    "no_copy": 1, 
@@ -238,6 +265,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, 
@@ -248,6 +276,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "Set targets Item Group-wise for this Sales Person.", 
    "fieldname": "target_details_section_break", 
    "fieldtype": "Section Break", 
@@ -256,15 +285,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Sales Person Targets", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-bullseye", 
+   "options": "fa fa-bullseye", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -275,6 +306,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "targets", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -282,6 +314,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Targets", 
    "length": 0, 
    "no_copy": 0, 
@@ -292,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, 
@@ -302,6 +336,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", 
@@ -310,6 +345,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Target Distribution", 
    "length": 0, 
    "no_copy": 0, 
@@ -320,6 +356,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, 
@@ -329,7 +366,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-user", 
+ "icon": "fa fa-user", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
@@ -338,7 +375,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-07-14 12:44:43.408367", 
+ "modified": "2016-11-07 05:29:29.299529", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Sales Person", 
@@ -354,6 +391,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -374,6 +412,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -394,6 +433,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
diff --git a/erpnext/setup/doctype/sales_person/sales_person_tree.js b/erpnext/setup/doctype/sales_person/sales_person_tree.js
index 077cf3b..bcdfac9 100644
--- a/erpnext/setup/doctype/sales_person/sales_person_tree.js
+++ b/erpnext/setup/doctype/sales_person/sales_person_tree.js
@@ -1,6 +1,7 @@
+
 frappe.treeview_settings["Sales Person"] = {
 	fields: [
-		{fieldtype:'Data', fieldname: 'name_field',
+		{fieldtype:'Data', fieldname: 'sales_person_name',
 			label:__('New Sales Person Name'), reqd:true},
 		{fieldtype:'Link', fieldname:'employee',
 			label:__('Employee'), options:'Employee',
diff --git a/erpnext/setup/doctype/sms_settings/sms_settings.json b/erpnext/setup/doctype/sms_settings/sms_settings.json
index ab2adeb..23d6fa2 100755
--- a/erpnext/setup/doctype/sms_settings/sms_settings.json
+++ b/erpnext/setup/doctype/sms_settings/sms_settings.json
@@ -163,7 +163,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-cog", 
+ "icon": "fa fa-cog", 
  "idx": 1, 
  "in_create": 0, 
  "in_dialog": 0, 
diff --git a/erpnext/setup/doctype/supplier_type/supplier_type.json b/erpnext/setup/doctype/supplier_type/supplier_type.json
index 8d34022..5e62099 100644
--- a/erpnext/setup/doctype/supplier_type/supplier_type.json
+++ b/erpnext/setup/doctype/supplier_type/supplier_type.json
@@ -159,7 +159,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-flag", 
+ "icon": "fa fa-flag", 
  "idx": 1, 
  "in_create": 0, 
  "in_dialog": 0, 
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 8af6321..ce057c2 100644
--- a/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json
+++ b/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json
@@ -92,7 +92,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-legal", 
+ "icon": "fa fa-legal", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
diff --git a/erpnext/setup/doctype/territory/territory.json b/erpnext/setup/doctype/territory/territory.json
index e0f44de..e920c9d 100644
--- a/erpnext/setup/doctype/territory/territory.json
+++ b/erpnext/setup/doctype/territory/territory.json
@@ -309,7 +309,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-map-marker", 
+ "icon": "fa fa-map-marker", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
diff --git a/erpnext/setup/doctype/territory/territory_tree.js b/erpnext/setup/doctype/territory/territory_tree.js
new file mode 100644
index 0000000..edd11df
--- /dev/null
+++ b/erpnext/setup/doctype/territory/territory_tree.js
@@ -0,0 +1,3 @@
+frappe.treeview_settings["Territory"] = {
+	ignore_fields:["parent_territory"]
+}
\ No newline at end of file
diff --git a/erpnext/setup/doctype/uom/uom.json b/erpnext/setup/doctype/uom/uom.json
index 99f97fe..609c6c0 100644
--- a/erpnext/setup/doctype/uom/uom.json
+++ b/erpnext/setup/doctype/uom/uom.json
@@ -1,7 +1,7 @@
 {
  "allow_copy": 0, 
  "allow_import": 1, 
- "allow_rename": 0, 
+ "allow_rename": 1, 
  "autoname": "field:uom_name", 
  "beta": 0, 
  "creation": "2013-01-10 16:34:24", 
@@ -15,6 +15,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "uom_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -41,6 +42,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "Check this to disallow fractions. (for Nos)", 
    "fieldname": "must_be_whole_number", 
    "fieldtype": "Check", 
@@ -65,7 +67,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-compass", 
+ "icon": "fa fa-compass", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
@@ -74,7 +76,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-07-25 05:24:25.434534", 
+ "modified": "2016-09-23 17:58:21.574996", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "UOM", 
@@ -144,5 +146,6 @@
  "quick_entry": 1, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "sort_order": "ASC", 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/setup/install.py b/erpnext/setup/install.py
index 3337b1f..7b71675 100644
--- a/erpnext/setup/install.py
+++ b/erpnext/setup/install.py
@@ -26,7 +26,8 @@
 		return False
 
 def set_single_defaults():
-	for dt in frappe.db.sql_list("""select name from `tabDocType` where issingle=1"""):
+	for dt in ('Accounts Settings', 'Print Settings', 'HR Settings', 'Buying Settings',
+		'Selling Settings', 'Stock Settings', 'Daily Work Summary Settings'):
 		default_values = frappe.db.sql("""select fieldname, `default` from `tabDocField`
 			where parent=%s""", dt)
 		if default_values:
@@ -37,6 +38,8 @@
 				b.save()
 			except frappe.MandatoryError:
 				pass
+			except frappe.ValidationError:
+				pass
 
 	frappe.db.set_default("date_format", "dd-mm-yyyy")
 
diff --git a/erpnext/setup/setup_wizard/data/country_wise_tax.json b/erpnext/setup/setup_wizard/data/country_wise_tax.json
new file mode 100644
index 0000000..780b88f
--- /dev/null
+++ b/erpnext/setup/setup_wizard/data/country_wise_tax.json
@@ -0,0 +1,1380 @@
+{
+	"Albania": {
+		"Albania VAT": {
+			"account_name": "VAT",
+			"tax_rate": 20.00
+		}
+	},
+	"Algeria": {
+		"Algeria VAT 17%": {
+			"account_name": "VAT 17%",
+			"tax_rate": 17.00,
+			"default": 1
+		},
+		"Algeria VAT 7%": {
+			"account_name": "VAT 7%",
+			"tax_rate": 7.00
+		}
+	},
+
+	"Andorra": {
+		"Andorra VAT": {
+			"account_name": "VAT",
+			"tax_rate": 4.50
+		}
+	},
+
+	"Angola": {
+		"Angola VAT": {
+			"account_name": "VAT",
+			"tax_rate": 10.00
+		}
+	},
+
+	"Antigua And Barbuda": {
+		"Antigua & Barbuda Sales Tax": {
+			"account_name": "ABST",
+			"tax_rate": 15.00
+		}
+	},
+
+	"Argentina": {
+		"Argentina Tax": {
+			"account_name": "VAT",
+			"tax_rate": 21.00
+		}
+	},
+
+	"Armenia": {
+		"Armenia Tax": {
+			"account_name": "VAT",
+			"tax_rate": 20.00
+		}
+	},
+
+	"Aruba": {
+		"Aruba Tax": {
+			"account_name": "VAT",
+			"tax_rate": 1.50
+		}
+	},
+
+	"Australia": {
+		"Australia GST1": {
+			"account_name": "GST 10%",
+			"tax_rate": 10.00,
+			"default": 1
+		},
+		"Australia GST 2%": {
+			"account_name": "GST 2%",
+			"tax_rate": 2
+		}
+	},
+
+	"Austria": {
+		"Austria Tax": {
+			"account_name": "VAT",
+			"tax_rate": 20.00
+		}
+	},
+
+	"Azerbaijan": {
+		"Azerbaijan Tax": {
+			"account_name": "GST",
+			"tax_rate": 18.00
+		}
+	},
+
+	"Bahamas": {
+		"Bahamas Tax": {
+			"account_name": "VAT",
+			"tax_rate": 7.50
+		}
+	},
+
+	"Bangladesh": {
+		"Bangladesh Tax": {
+			"account_name": "VAT",
+			"tax_rate": 15.00
+		}
+	},
+
+	"Barbados": {
+		"Barbados Tax": {
+			"account_name": "VAT",
+			"tax_rate": 17.50
+		}
+	},
+
+	"Belarus": {
+		"Belarus Tax": {
+			"account_name": "VAT",
+			"tax_rate": 20.00
+		}
+	},
+
+	"Belgium": {
+		"Belgium VAT 21%": {
+			"account_name": "VAT 21%",
+			"tax_rate": 21.00,
+			"default": 1
+		},
+		"Belgium VAT 12%": {
+			"account_name": "VAT 12%",
+			"tax_rate": 12
+		}
+	},
+
+	"Belize": {
+		"Belize Tax": {
+			"account_name": "GST",
+			"tax_rate": 12.50
+		}
+	},
+
+	"Benin": {
+		"Benin Tax": {
+			"account_name": "VAT",
+			"tax_rate": 18.00
+		}
+	},
+
+	"Bhutan": {
+		"Bhutan Tax": {
+			"account_name": "VAT",
+			"tax_rate": 50.00
+		}
+	},
+
+	"Bolivia": {
+		"Bolivia Tax": {
+			"account_name": "VAT",
+			"tax_rate": 13.00
+		}
+	},
+
+	"Bosnia and Herzegovina": {
+		"Bosnia & Herzegovina Tax": {
+			"account_name": "VAT",
+			"tax_rate": 17.00
+		}
+	},
+
+	"Botswana": {
+		"Botswana Tax": {
+			"account_name": "VAT",
+			"tax_rate": 12.00
+		}
+	},
+
+	"Brazil": {
+		"Brazil ICMS 19%": {
+			"account_name": "ICMS 19%",
+			"tax_rate": 19.00,
+			"default": 1
+		},
+		"Brazil ICMS 17%": {
+			"account_name": "ICMS 17%",
+			"tax_rate": 17.00
+		},
+		"Brazil PIS 1.65%": {
+			"account_name": "PIS 1.65%",
+			"tax_rate": 1.65
+		},
+		"Brazil COFINS 7.6%": {
+			"account_name": "COFINS 7.6%",
+			"tax_rate": 7.6
+		},
+		"Brazil COFINS 5.0%": {
+			"account_name": "ISS 5%",
+			"tax_rate": 5.0
+		}
+	},
+
+	"Bulgaria": {
+		"Bulgaria VAT 20%": {
+			"account_name": "VAT 20%",
+			"tax_rate": 20.00,
+			"default": 1
+		},
+		"Bulgaria VAT 7%": {
+			"account_name": "VAT 7%",
+			"tax_rate": 7.00
+		}
+	},
+
+	"Burkina Faso": {
+		"Burkina Faso Tax": {
+			"account_name": "VAT",
+			"tax_rate": 18.00
+		}
+	},
+
+	"Burundi": {
+		"Burundi Tax": {
+			"account_name": "VAT",
+			"tax_rate": 18.00
+		}
+	},
+
+	"Cambodia": {
+		"Cambodia Tax": {
+			"account_name": "VAT",
+			"tax_rate": 10.00
+		}
+	},
+
+	"Cameroon": {
+		"Cameroon Tax": {
+			"account_name": "VAT",
+			"tax_rate": 19.25
+		}
+	},
+
+	"Canada": {
+		"Canada GST 5%": {
+			"account_name": "GST",
+			"tax_rate": 5.00,
+			"default": 1
+		},
+		"Canada HST 15%": {
+			"account_name": "HST",
+			"tax_rate": 15.00
+		},
+		"Canada PST 8%": {
+			"account_name": "PST 8%",
+			"tax_rate": 8.00
+		},
+		"Canada PST 7%": {
+			"account_name": "PST 7%",
+			"tax_rate": 7.00
+		},
+		"Canada PST 5%": {
+			"account_name": "PST 5%",
+			"tax_rate": 5.00
+		}
+	},
+
+	"Cape Verde": {
+		"Cape Verde Tax": {
+			"account_name": "VAT",
+			"tax_rate": 15.00
+		}
+	},
+
+	"Central African Republic": {
+		"Central African Republic Tax": {
+			"account_name": "VAT",
+			"tax_rate": 19.00
+		}
+	},
+
+	"Chad": {
+		"Chad Tax": {
+			"account_name": "VAT",
+			"tax_rate": 18.00
+		}
+	},
+
+	"Chile": {
+		"Chile Tax": {
+			"account_name": "VAT",
+			"tax_rate": 19.00
+		}
+	},
+
+	"China": {
+		"China Tax": {
+			"account_name": "VAT",
+			"tax_rate": 17.00
+		}
+	},
+
+	"Colombia": {
+		"Colombia Tax": {
+			"account_name": "VAT",
+			"tax_rate": 16.00
+		}
+	},
+
+	"Comoros": {
+		"Comoros Tax": {
+			"account_name": "VAT",
+			"tax_rate": 10.00
+		}
+	},
+
+	"Congo": {
+		"Congo Tax": {
+			"account_name": "VAT",
+			"tax_rate": 16.00
+		}
+	},
+
+	"Costa Rica": {
+		"Costa Rica": {
+			"account_name": "VAT",
+			"tax_rate": 13.00
+		}
+	},
+
+	"Croatia": {
+		"Croatia VAT 25%": {
+			"account_name": "VAT 25%",
+			"tax_rate": 25.00,
+			"default": 1
+		},
+		"Croatia VAT 10%": {
+			"account_name": "VAT 10%",
+			"tax_rate": 10.00
+		}
+	},
+
+	"Cuba": {
+		"Cuba Tax": {
+			"account_name": "VAT",
+			"tax_rate": 20.00
+		}
+	},
+
+	"Cyprus": {
+		"Cyprus Tax": {
+			"account_name": "VAT",
+			"tax_rate": 18.00
+		}
+	},
+
+	"Czech Republic": {
+		"Czech Republic VAT 21%": {
+			"account_name": "VAT 21%",
+			"tax_rate": 21.00,
+			"default": 1
+		},
+		"Czech Republic VAT 15%": {
+			"account_name": "VAT 15%",
+			"tax_rate": 15.00
+		}
+	},
+
+	"Denmark": {
+		"Denmark Tax": {
+			"account_name": "VAT",
+			"tax_rate": 25.00
+		}
+	},
+
+	"Djibouti": {
+		"Dijbouti Tax": {
+			"account_name": "VAT",
+			"tax_rate": 33.00
+		}
+	},
+
+	"Dominica": {
+		"Dominica Tax": {
+			"account_name": "VAT",
+			"tax_rate": 15.00
+		}
+	},
+
+	"Dominican Republic": {
+		"Dominican Republic Tax": {
+			"account_name": "ITBIS",
+			"tax_rate": 16.00
+		}
+	},
+
+	"Ecuador": {
+		"Ecuador Tax": {
+			"account_name": "VAT",
+			"tax_rate": 12.00
+		}
+	},
+
+	"Egypt": {
+		"Egypt Tax": {
+			"account_name": "GST",
+			"tax_rate": 10.00
+		}
+	},
+
+	"El Salvador": {
+		"El Salvador Tax": {
+			"account_name": "VAT",
+			"tax_rate": 13.00
+		}
+	},
+
+	"Equatorial Guinea": {
+		"Equatorial Guinea": {
+			"account_name": "VAT",
+			"tax_rate": 15.00
+		}
+	},
+
+	"Eritrea": {
+		"Eritrea Tax": {
+			"account_name": "VAT",
+			"tax_rate": 4.00
+		}
+	},
+
+	"Estonia": {
+		"Estonia Tax": {
+			"account_name": "VAT",
+			"tax_rate": 20.00
+		}
+	},
+
+	"Ethiopia": {
+		"Ethiopia Tax": {
+			"account_name": "VAT",
+			"tax_rate": 15.00
+		}
+	},
+
+	"Fiji": {
+		"Fiji Tax": {
+			"account_name": "VAT",
+			"tax_rate": 15.00
+		}
+	},
+
+	"Finland": {
+		"Finland Tax": {
+			"account_name": "VAT",
+			"tax_rate": 24.00
+		}
+	},
+
+	"France": {
+		"France VAT 19.6%": {
+			"account_name": "VAT 19.6%",
+			"tax_rate": 19.6,
+			"default": 1
+		},
+		"France VAT 5.5%": {
+			"account_name": "VAT 5.5%",
+			"tax_rate": 5.5
+		}
+	},
+
+	"Gabon": {
+		"Gabon Tax": {
+			"account_name": "VAT",
+			"tax_rate": 18.00
+		}
+	},
+
+	"Gambia": {
+		"Gambia Tax": {
+			"account_name": "VAT",
+			"tax_rate": 15.00
+		}
+	},
+
+	"Georgia": {
+		"Georgia Tax": {
+			"account_name": "VAT",
+			"tax_rate": 18.00
+		}
+	},
+
+	"Germany": {
+		"Germany VAT 19%": {
+			"account_name": "VAT 19%",
+			"tax_rate": 19.00,
+			"default": 1
+		},
+		"Germany VAT 7%": {
+			"account_name": "VAT 7%",
+			"tax_rate": 7.00
+		}
+	},
+
+	"Ghana": {
+		"Ghana Tax": {
+			"account_name": "VAT",
+			"tax_rate": 15.00
+		}
+	},
+
+	"Greece": {
+		"Greece VAT 23%": {
+			"account_name": "VAT 23%",
+			"tax_rate": 23.00,
+			"default": 1
+		},
+		"Greece VAT 9%": {
+			"account_name": "VAT 9%",
+			"tax_rate": 9.00
+		}
+	},
+
+	"Grenada": {
+		"Grenada Tax": {
+			"account_name": "VAT",
+			"tax_rate": 15.00
+		}
+	},
+
+	"Guam": {
+		"Guam Tax": {
+			"account_name": "VAT",
+			"tax_rate": 4.00
+		}
+	},
+
+	"Guatemala": {
+		"Guatemala Tax": {
+			"account_name": "IVA",
+			"tax_rate": 12.00
+		}
+	},
+
+	"Guinea": {
+		"Guinea Tax": {
+			"account_name": "VAT",
+			"tax_rate": 18.00
+		}
+	},
+
+	"Guyana": {
+		"Guyana Tax": {
+			"account_name": "GST",
+			"tax_rate": 16.00
+		}
+	},
+
+	"Haiti": {
+		"Haiti Tax": {
+			"account_name": "VAT",
+			"tax_rate": 10.00
+		}
+	},
+
+	"Honduras": {
+		"Honduras Tax": {
+			"account_name": "VAT",
+			"tax_rate": 15.00
+		}
+	},
+
+	"Hungary": {
+		"Hungary Tax": {
+			"account_name": "VAT",
+			"tax_rate": 27.00
+		}
+	},
+
+	"Iceland": {
+		"Iceland VAT 25.5%": {
+			"account_name": "VAT 25.5%",
+			"tax_rate": 25.5,
+			"default": 1
+		},
+		"Iceland VAT 7.5%": {
+			"account_name": "VAT 7.5%",
+			"tax_rate": 7.5
+		}
+	},
+
+	"India": {
+		"India VAT 5%": {
+			"account_name": "VAT 5%",
+			"tax_rate": 5.00,
+			"default": 1
+		},
+		"India VAT 4%": {
+			"account_name": "VAT 4%",
+			"tax_rate": 4.00
+		},
+		"India VAT 14%": {
+			"account_name": "VAT 14%",
+			"tax_rate": 14.00
+		}
+	},
+
+	"Indonesia": {
+		"Indonesia Tax": {
+			"account_name": "VAT",
+			"tax_rate": 10.00
+		}
+	},
+
+	"Iran": {
+		"Iran Tax": {
+			"account_name": "VAT",
+			"tax_rate": 7.00
+		}
+	},
+
+	"Ireland": {
+		"Ireland Tax": {
+			"account_name": "VAT",
+			"tax_rate": 23.00
+		}
+	},
+
+	"Isle Of Man": {
+		"Isle of Man VAT 20%": {
+			"account_name": "VAT",
+			"tax_rate": 20.00,
+			"default": 1
+		},
+		"Isle of Man VAT 5%": {
+			"account_name": "VAT",
+			"tax_rate": 5.00
+		}
+	},
+
+	"Israel": {
+		"Israel Tax": {
+			"account_name": "VAT",
+			"tax_rate": 18.00
+		}
+	},
+
+	"Italy": {
+		"Italy Tax": {
+			"account_name": "VAT",
+			"tax_rate": 22.00
+		}
+	},
+
+	"Ivory Coast": {
+		"Ivory Coast": {
+			"account_name": "Metric",
+			"tax_rate": 18.00
+		}
+	},
+
+	"Jamaica": {
+		"Jamaica Tax": {
+			"account_name": "GCT",
+			"tax_rate": 16.50
+		}
+	},
+
+	"Japan": {
+		"Japan Tax": {
+			"account_name": "CT",
+			"tax_rate": 5.00
+		}
+	},
+
+	"Jordan": {
+		"Jordan Tax": {
+			"account_name": "VAT",
+			"tax_rate": 16.00
+		}
+	},
+
+	"Kazakhstan": {
+		"Kazakhstan Tax": {
+			"account_name": "VAT",
+			"tax_rate": 12.00
+		}
+	},
+
+	"Kenya": {
+		"Kenya Tax": {
+			"account_name": "VAT",
+			"tax_rate": 16.00
+		}
+	},
+
+	"Kosovo": {
+		"Kosovo Tax": {
+			"account_name": "VAT",
+			"tax_rate": 16.00
+		}
+	},
+
+	"Kyrgyzstan": {
+		"Kyrgyztan Tax": {
+			"account_name": "VAT",
+			"tax_rate": 12.00
+		}
+	},
+
+	"Lao People's Democratic Republic": {
+		"Lao Republic Tax": {
+			"account_name": "VAT",
+			"tax_rate": 10.00
+		}
+	},
+
+	"Latvia": {
+		"Latvia Tax": {
+			"account_name": "VAT",
+			"tax_rate": 20.00
+		}
+	},
+
+	"Lebanon": {
+		"Lebanon Tax": {
+			"account_name": "VAT",
+			"tax_rate": 10.00
+		}
+	},
+
+	"Liechtenstein": {
+		"Liechtenstein Tax": {
+			"account_name": "VAT",
+			"tax_rate": 8.00
+		}
+	},
+
+	"Lithuania": {
+		"Lithunia Tax": {
+			"account_name": "VAT",
+			"tax_rate": 21.00
+		}
+	},
+
+	"Luxembourg": {
+		"Luxembourg VAT 15%": {
+			"account_name": "VAT 15%",
+			"tax_rate": 15.00,
+			"default": 1
+		},
+		"Luxembourg VAT 3%": {
+			"account_name": "VAT 3%",
+			"tax_rate": 3.00
+		}
+	},
+
+	"Macedonia": {
+		"Macedonia VAT 18%": {
+			"account_name": "VAT",
+			"tax_rate": 18.00,
+			"default": 1
+		},
+		"Macedonia VAT 5%": {
+			"account_name": "VAT",
+			"tax_rate": 5.00
+		}
+	},
+
+	"Madagascar": {
+		"Madagascar Tax": {
+			"account_name": "VAT",
+			"tax_rate": 20.00
+		}
+	},
+
+	"Malawi": {
+		"Malawi Tax": {
+			"account_name": "VAT",
+			"tax_rate": 16.50
+		}
+	},
+
+	"Malaysia": {
+		"Malaysia GST 6%": {
+			"account_name": "GST",
+			"tax_rate": 6.00,
+			"default": 1
+		},
+		"Malaysia GST 5%": {
+			"account_name": "GST",
+			"tax_rate": 5.00
+		},
+		"Malaysia GST 10%": {
+			"account_name": "GST",
+			"tax_rate": 10.00
+		}
+	},
+
+	"Mali": {
+		"Mali Tax": {
+			"account_name": "VAT",
+			"tax_rate": 18.00
+		}
+	},
+
+	"Malta": {
+		"Malta Tax": {
+			"account_name": "VAT",
+			"tax_rate": 18.00
+		}
+	},
+
+	"Mauritania": {
+		"Mauritania Tax": {
+			"account_name": "VAT",
+			"tax_rate": 18.00
+		}
+	},
+
+	"Mauritius": {
+		"Mauritius Tax": {
+			"account_name": "VAT",
+			"tax_rate": 15.00
+		}
+	},
+
+	"Mexico": {
+		"Mexico Tax": {
+			"account_name": "IVA",
+			"tax_rate": 16.00
+		}
+	},
+
+	"Micronesia": {
+		"Micronesia Tax": {
+			"account_name": "VAT",
+			"tax_rate": 5.00
+		}
+	},
+
+	"Moldova": {
+		"Moldova VAT 20%": {
+			"account_name": "VAT 20%",
+			"tax_rate": 20.00,
+			"default": 1
+		},
+		"Moldova VAT 8%": {
+			"account_name": "VAT 8%",
+			"tax_rate": 8.00
+		}
+	},
+
+	"Monaco": {
+		"Monaco Tax 19.6%": {
+			"account_name": "VAT 19.6%",
+			"tax_rate": 19.6,
+			"default": 1
+		},
+		"Monaco Tax 5.5%": {
+			"account_name": "VAT 5,5%",
+			"tax_rate": 5.5
+		}
+	},
+
+	"Mongolia": {
+		"Mongolia Tax": {
+			"account_name": "VAT",
+			"tax_rate": 10.00
+		}
+	},
+
+	"Montenegro": {
+		"Montenegro Tax 17%": {
+			"account_name": "VAT 17%",
+			"tax_rate": 17.00,
+			"default": 1
+		},
+		"Montenegro Tax 7%": {
+			"account_name": "VAT 7%",
+			"tax_rate": 7.00
+		}
+	},
+
+	"Morocco": {
+		"Morroco VAT 20%": {
+			"account_name": "VAT 20%",
+			"tax_rate": 20.00,
+			"default": 1
+		},
+		"Morroco VAT 10%": {
+			"account_name": "VAT 10%",
+			"tax_rate": 10.00
+		}
+	},
+
+	"Mozambique": {
+		"Mozambique Tax": {
+			"account_name": "VAT",
+			"tax_rate": 17.00
+		}
+	},
+
+	"Myanmar": {
+		"Myanamar Tax": {
+			"account_name": "VAT",
+			"tax_rate": 30.00
+		}
+	},
+
+	"Namibia": {
+		"Namibia Tax": {
+			"account_name": "VAT",
+			"tax_rate": 15.00
+		}
+	},
+
+	"Nepal": {
+		"Nepal Tax": {
+			"account_name": "VAT",
+			"tax_rate": 13.00
+		}
+	},
+
+	"Netherlands": {
+		"Netherlands VAT 21%": {
+			"account_name": "VAT 21%",
+			"tax_rate": 21.00,
+			"default": 1
+		},
+		"Netherlands VAT 6%": {
+			"account_name": "VAT 6%",
+			"tax_rate": 6.00
+		}
+	},
+
+	"New Zealand": {
+		"New Zealand": {
+			"account_name": "GST",
+			"tax_rate": 15.00
+		}
+	},
+
+	"Nicaragua": {
+		"Nicaragua Tax": {
+			"account_name": "VAT",
+			"tax_rate": 15.00
+		}
+	},
+
+	"Nigeria": {
+		"Nigeria Tax": {
+			"account_name": "VAT",
+			"tax_rate": 5
+		}
+	},
+
+	"North Korea": {
+		"North Korea": {
+			"account_name": "VAT",
+			"tax_rate": 15.00
+		}
+	},
+
+	"Norway": {
+		"Norway VAT 25%": {
+			"account_name": "VAT 25%",
+			"tax_rate": 25.00,
+			"default": 1
+		},
+		"Norway VAT 12%": {
+			"account_name": "VAT 12%",
+			"tax_rate": 12.00
+		}
+	},
+
+	"Pakistan": {
+		"Pakistan Tax": {
+			"account_name": "GST",
+			"tax_rate": 17.00
+		}
+	},
+
+	"Panama": {
+		"Panama Tax": {
+			"account_name": "VAT",
+			"tax_rate": 7.00
+		}
+	},
+
+	"Papua New Guinea": {
+		"Papua New Guinea Tax": {
+			"account_name": "VAT",
+			"tax_rate": 10.00
+		}
+	},
+
+	"Paraguay": {
+		"Paraguay Tax": {
+			"account_name": "VAT",
+			"tax_rate": 10.00
+		}
+	},
+
+	"Peru": {
+		"Peru Tax": {
+			"account_name": "VAT",
+			"tax_rate": 16.00
+		}
+	},
+
+	"Philippines": {
+		"Philippines Tax": {
+			"account_name": "VAT",
+			"tax_rate": 12.00
+		}
+	},
+
+	"Poland": {
+		"Poland VAT 23%": {
+			"account_name": "VAT 23%",
+			"tax_rate": 23.00,
+			"default": 1
+		},
+		"Poland VAT 7%": {
+			"account_name": "VAT 7%",
+			"tax_rate": 7
+		}
+	},
+
+	"Portugal": {
+		"Portugal Tax": {
+			"account_name": "VAT",
+			"tax_rate": 23.00
+		}
+	},
+
+	"Republic Of The Congo": {
+		"Congo Tax": {
+			"account_name": "VAT",
+			"tax_rate": 18.00
+		}
+	},
+
+	"Romania": {
+		"Romania Tax": {
+			"account_name": "VAT",
+			"tax_rate": 24.00
+		}
+	},
+
+	"Russian Federation": {
+		"Russia VAT 18%": {
+			"account_name": "VAT 18%",
+			"tax_rate": 18.00,
+			"default": 1
+		},
+		"Russia VAT 10%": {
+			"account_name": "VAT 10%",
+			"tax_rate": 10.00
+		}
+	},
+
+	"Rwanda": {
+		"Rwanda Tax": {
+			"account_name": "VAT",
+			"tax_rate": 18.00
+		}
+	},
+
+	"Senegal": {
+		"Senegal Tax": {
+			"account_name": "VAT",
+			"tax_rate": 18.00
+		}
+	},
+
+	"Serbia": {
+		"Serbia Tax": {
+			"account_name": "VAT",
+			"tax_rate": 20.00
+		}
+	},
+
+	"Seychelles": {
+		"Seychelles Tax": {
+			"account_name": "VAT",
+			"tax_rate": 15.00
+		}
+	},
+
+	"Sierra Leone": {
+		"Sierra Leone Tax": {
+			"account_name": "VAT",
+			"tax_rate": 15.00
+		}
+	},
+
+	"Singapore": {
+		"Singapore Tax": {
+			"account_name": "GST",
+			"tax_rate": 7.00
+		}
+	},
+
+	"Slovakia": {
+		"Slovakia VAT 20%": {
+			"account_name": "VAT 20%",
+			"tax_rate": 20.00,
+			"default": 1
+		},
+		"Slovakia VAT 10%": {
+			"account_name": "VAT 10%",
+			"tax_rate": 10.00
+		}
+	},
+
+	"Slovenia": {
+		"Slovenia VAT 22%": {
+			"account_name": "VAT 22%",
+			"tax_rate": 22.00,
+			"default": 1
+		},
+		"Slovenia VAT 8.5%": {
+			"account_name": "VAT 8.5%",
+			"tax_rate": 8.50
+		}
+	},
+
+	"Solomon Islands": {
+		"Solomon Islands Tax": {
+			"account_name": "VAT",
+			"tax_rate": 15.00
+		}
+	},
+
+	"Somalia": {
+		"Somalia Tax": {
+			"account_name": "VAT",
+			"tax_rate": 10.00
+		}
+	},
+
+	"South Africa": {
+		"South Africa Tax": {
+			"account_name": "VAT",
+			"tax_rate": 14.00
+		}
+	},
+
+	"South Korea": {
+		"South Korea Tax": {
+			"account_name": "VAT",
+			"tax_rate": 10.00
+		}
+	},
+
+	"Spain": {
+		"Spain Tax": {
+			"account_name": "VAT",
+			"tax_rate": 21.00
+		}
+	},
+
+	"Sri Lanka": {
+		"Sri Lanka Tax": {
+			"account_name": "VAT",
+			"tax_rate": 12.00
+		}
+	},
+
+	"St Lucia": {
+		"St Lucia Tax": {
+			"account_name": "VAT",
+			"tax_rate": 15.00
+		}
+	},
+
+	"Sudan": {
+		"Sudan Tax": {
+			"account_name": "VAT",
+			"tax_rate": 10.00
+		}
+	},
+
+	"Suriname": {
+		"Suriname Tax": {
+			"account_name": "VAT",
+			"tax_rate": 10.00
+		}
+	},
+
+	"Swaziland": {
+		"Swaziland tax": {
+			"account_name": "VAT",
+			"tax_rate": 14.00
+		}
+	},
+
+	"Sweden": {
+		"Sweden Tax": {
+			"account_name": "VAT",
+			"tax_rate": 25.00
+		}
+	},
+
+	"Switzerland": {
+		"Switzerland VAT 8%": {
+			"account_name": "VAT 8%",
+			"tax_rate": 8.00,
+			"default": 1
+		},
+		"Switzerland VAT 2.4%": {
+			"account_name": "VAT 2.4%",
+			"tax_rate": 2.40
+		}
+	},
+
+	"Taiwan": {
+		"Taiwan Tax": {
+			"account_name": "VAT",
+			"tax_rate": 5.00
+		}
+	},
+
+	"Tajikistan": {
+		"Tajikistan Tax": {
+			"account_name": "VAT",
+			"tax_rate": 20
+		}
+	},
+
+	"Tanzania": {
+		"Tanzania Tax": {
+			"account_name": "VAT",
+			"tax_rate": 18.00
+		}
+	},
+
+	"Thailand": {
+		"Thailand Tax": {
+			"account_name": "VAT",
+			"tax_rate": 7.00
+		}
+	},
+
+	"Togo": {
+		"Togo Tax": {
+			"account_name": "VAT",
+			"tax_rate": 18.00
+		}
+	},
+
+	"Tonga": {
+		"Tonga Tax": {
+			"account_name": "VAT",
+			"tax_rate": 15.00
+		}
+	},
+
+	"Trinidad And Tobago": {
+		"Trinidad & Tobago Tax": {
+			"account_name": "VAT",
+			"tax_rate": 15.00
+		}
+	},
+
+	"Tunisia": {
+		"Tunisia VAT 18%": {
+			"account_name": "VAT 18%",
+			"tax_rate": 18.00,
+			"default": 1
+		},
+		"Tunisia VAT 12%": {
+			"account_name": "VAT 12%",
+			"tax_rate": 12.00
+		},
+		"Tunisia VAT 6%": {
+			"account_name": "VAT 6%",
+			"tax_rate": 6.00
+		}
+	},
+
+	"Turkey": {
+		"Turkey Tax": {
+			"account_name": "VAT 18%",
+			"tax_rate": 18.00
+		}
+	},
+
+	"Turkmenistan": {
+		"Turkmenistan Tax": {
+			"account_name": "VAT",
+			"tax_rate": 20.00
+		}
+	},
+
+	"Uganda": {
+		"Uganda Tax": {
+			"account_name": "VAT",
+			"tax_rate": 18.00
+		}
+	},
+
+	"Ukraine": {
+		"Ukraine Tax": {
+			"account_name": "VAT",
+			"tax_rate": 20.00
+		}
+	},
+
+	"United Kingdom": {
+		"United Kingdom Tax": {
+			"account_name": "VAT",
+			"tax_rate": 20.00
+		}
+	},
+
+	"United States": {
+		"US ST 6%": {
+			"account_name": "ST 6%",
+			"tax_rate": 6.00,
+			"default": 1
+		},
+		"US ST 4%": {
+			"account_name": "ST 4%",
+			"tax_rate": 4.00
+		},
+		"US ST 6.25%": {
+			"account_name": "ST 6.25%",
+			"tax_rate": 6.25
+		}
+	},
+
+	"Uruguay": {
+		"Uruguay Tax": {
+			"account_name": "VAT",
+			"tax_rate": 22.00
+		}
+	},
+
+	"Uzbekistan": {
+		"Uzbekistan Tax": {
+			"account_name": "VAT",
+			"tax_rate": 20.00
+		}
+	},
+
+	"Vanuatu": {
+		"Vanuatu Tax": {
+			"account_name": "VAT",
+			"tax_rate": 12.50
+		}
+	},
+
+	"Venezuela": {
+		"Venezuela Tax": {
+			"account_name": "VAT",
+			"tax_rate": 12.00
+		}
+	},
+
+	"Vietnam": {
+		"Vietnam Tax": {
+			"account_name": "VAT",
+			"tax_rate": 10.00
+		}
+	},
+
+	"Yemen": {
+		"Yemen Tax": {
+			"account_name": "VAT",
+			"tax_rate": 5.00
+		}
+	},
+
+	"Zambia": {
+		"Zambia Tax": {
+			"account_name": "VAT",
+			"tax_rate": 16.00
+		}
+	},
+
+	"Zimbabwe": {
+		"Zimbabwe Tax": {
+			"account_name": "VAT",
+			"tax_rate": 15.00
+		}
+	}
+}
\ No newline at end of file
diff --git a/erpnext/setup/setup_wizard/domainify.py b/erpnext/setup/setup_wizard/domainify.py
index 67d77a8..14e2f33 100644
--- a/erpnext/setup/setup_wizard/domainify.py
+++ b/erpnext/setup/setup_wizard/domainify.py
@@ -18,7 +18,7 @@
 			'set_value': [
 				['Stock Settings', None, 'show_barcode_field', 1]
 			],
-			'remove_sidebar_items': ['/announcement', '/course', '/assessment', '/fees']
+			'default_portal_role': 'Customer'
 		},
 
 		'Retail': {
@@ -32,20 +32,17 @@
 			'set_value': [
 				['Stock Settings', None, 'show_barcode_field', 1]
 			],
-			'remove_sidebar_items': ['/announcement', '/course', '/assessment', '/fees']
+			'default_portal_role': 'Customer'
 		},
 
 		'Distribution': {
 			'desktop_icons': ['Item', 'Customer', 'Supplier', 'Lead', 'Sales Order',
 				 'Sales Invoice', 'CRM', 'Selling', 'Buying', 'Stock', 'Accounts', 'HR', 'ToDo'],
 			'remove_roles': ['Manufacturing User', 'Manufacturing Manager', 'Academics User'],
-			'properties': [
-				{'doctype': 'Item', 'fieldname': 'manufacturing', 'property': 'hidden', 'value': 1},
-			],
 			'set_value': [
 				['Stock Settings', None, 'show_barcode_field', 1]
 			],
-			'remove_sidebar_items': ['/announcement', '/course', '/assessment', '/fees']
+			'default_portal_role': 'Customer'
 		},
 
 		'Services': {
@@ -58,13 +55,15 @@
 			'set_value': [
 				['Stock Settings', None, 'show_barcode_field', 0]
 			],
-			'remove_sidebar_items': ['/announcement', '/course', '/assessment', '/fees']
+			'default_portal_role': 'Customer'
 		},
 		'Education': {
 			'desktop_icons': ['Student', 'Program', 'Course', 'Student Group', 'Instructor',
 				'Fees',  'ToDo', 'Schools'],
-			'allow_roles': ['Academics User', 'Accounts User', 'Accounts Manager', 'Website Manager'],
-			'allow_sidebar_items': ['/announcement', '/course', '/assessment', '/fees']
+			'allow_roles': ['Academics User', 'Accounts User', 'Accounts Manager', 'Item Manager',
+				'Website Manager', 'HR User', 'HR Manager', 'Purchase User', 'Purchase Manager',
+				'Student'],
+			'default_portal_role': 'Student'
 		},
 	}
 	if not domain in data:
@@ -79,6 +78,8 @@
 	setup_properties(data)
 	set_values(data)
 	setup_sidebar_items(data)
+	if data.get('default_portal_role'):
+		frappe.db.set_value('Portal Settings', None, 'default_role', data.get('default_portal_role'))
 	frappe.clear_cache()
 
 def setup_desktop_icons(data):
@@ -96,6 +97,7 @@
 	'''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.set_value('Role', role, 'disabled', 1)
 
 	if data.remove_roles:
 		for role in data.remove_roles:
@@ -103,7 +105,7 @@
 
 	if data.allow_roles:
 		# remove all roles other than allowed roles
-		data.allow_roles += ['Administrator', 'Guest', 'System Manager']
+		data.allow_roles += ['Administrator', 'Guest', 'System Manager', 'All']
 		for role in frappe.get_all('Role'):
 			if not (role.name in data.allow_roles):
 				remove_role(role.name)
diff --git a/erpnext/setup/setup_wizard/install_fixtures.py b/erpnext/setup/setup_wizard/install_fixtures.py
index 1f14ddf..a80e6d9 100644
--- a/erpnext/setup/setup_wizard/install_fixtures.py
+++ b/erpnext/setup/setup_wizard/install_fixtures.py
@@ -13,7 +13,6 @@
 
 def install(country=None):
 	records = [
-
 		# address template
 		{'doctype':"Address Template", "country": country},
 
diff --git a/erpnext/setup/setup_wizard/setup_wizard.py b/erpnext/setup/setup_wizard/setup_wizard.py
index 945dfb1..395ea51 100644
--- a/erpnext/setup/setup_wizard/setup_wizard.py
+++ b/erpnext/setup/setup_wizard/setup_wizard.py
@@ -4,6 +4,8 @@
 from __future__ import unicode_literals
 import frappe, copy
 
+import os
+import json
 from frappe.utils import cstr, flt, getdate
 from frappe import _
 from frappe.utils.file_manager import save_file
@@ -15,541 +17,592 @@
 from erpnext.setup.setup_wizard.domainify import setup_domain
 
 def setup_complete(args=None):
-    if frappe.db.sql("select name from tabCompany"):
-        frappe.throw(_("Setup Already Complete!!"))
+	if frappe.db.sql("select name from tabCompany"):
+		frappe.throw(_("Setup Already Complete!!"))
 
-    install_fixtures.install(args.get("country"))
+	install_fixtures.install(args.get("country"))
 
-    create_price_lists(args)
-    create_fiscal_year_and_company(args)
-    create_users(args)
-    set_defaults(args)
-    create_territories()
-    create_feed_and_todo()
-    create_email_digest()
-    create_letter_head(args)
-    create_taxes(args)
-    create_items(args)
-    create_customers(args)
-    create_suppliers(args)
+	create_price_lists(args)
+	create_fiscal_year_and_company(args)
+	create_sales_tax(args)
+	create_users(args)
+	set_defaults(args)
+	create_territories()
+	create_feed_and_todo()
+	create_email_digest()
+	create_letter_head(args)
+	create_taxes(args)
+	create_items(args)
+	create_customers(args)
+	create_suppliers(args)
 
-    if args.domain.lower() == 'education':
-        create_academic_year()
-        create_academic_term()
-        create_program(args)
-        create_course(args)
-        create_instructor(args)
-        create_room(args)
+	if args.domain.lower() == 'education':
+		create_academic_year()
+		create_academic_term()
+		create_program(args)
+		create_course(args)
+		create_instructor(args)
+		create_room(args)
 
-    if args.get('setup_website'):
-        website_maker(args)
+	if args.get('setup_website'):
+		website_maker(args)
 
-    create_logo(args)
+	create_logo(args)
 
-    frappe.local.message_log = []
-    setup_domain(args.get('domain'))
+	frappe.local.message_log = []
+	setup_domain(args.get('domain'))
 
-    frappe.db.commit()
-    login_as_first_user(args)
+	frappe.db.commit()
+	login_as_first_user(args)
 
-    frappe.db.commit()
-    frappe.clear_cache()
+	frappe.db.commit()
+	frappe.clear_cache()
 
-    if args.get("add_sample_data"):
-        try:
-            make_sample_data()
-            frappe.clear_cache()
-        except:
-            # clear message
-            if frappe.message_log:
-                frappe.message_log.pop()
+	if args.get("add_sample_data"):
+		try:
+			make_sample_data()
+			frappe.clear_cache()
+		except:
+			# clear message
+			if frappe.message_log:
+				frappe.message_log.pop()
 
-            pass
+			pass
 
 def create_fiscal_year_and_company(args):
-    if (args.get('fy_start_date')):
-        curr_fiscal_year = get_fy_details(args.get('fy_start_date'), args.get('fy_end_date'))
-        frappe.get_doc({
-        "doctype":"Fiscal Year",
-        'year': curr_fiscal_year,
-        'year_start_date': args.get('fy_start_date'),
-        'year_end_date': args.get('fy_end_date'),
-        }).insert()
-        args["curr_fiscal_year"] = curr_fiscal_year
+	if (args.get('fy_start_date')):
+		curr_fiscal_year = get_fy_details(args.get('fy_start_date'), args.get('fy_end_date'))
+		frappe.get_doc({
+		"doctype":"Fiscal Year",
+		'year': curr_fiscal_year,
+		'year_start_date': args.get('fy_start_date'),
+		'year_end_date': args.get('fy_end_date'),
+		}).insert()
+		args["curr_fiscal_year"] = curr_fiscal_year
 
-    # Company
-    if (args.get('company_name')):
-        frappe.get_doc({
-            "doctype":"Company",
-            'company_name':args.get('company_name').strip(),
-            'abbr':args.get('company_abbr'),
-            'default_currency':args.get('currency'),
-            'country': args.get('country'),
-            'chart_of_accounts': args.get(('chart_of_accounts')),
-            'domain': args.get('domain')
-        }).insert()
+	# Company
+	if (args.get('company_name')):
+		frappe.get_doc({
+			"doctype":"Company",
+			'company_name':args.get('company_name').strip(),
+			'abbr':args.get('company_abbr'),
+			'default_currency':args.get('currency'),
+			'country': args.get('country'),
+			'create_chart_of_accounts_based_on': 'Standard Template',
+			'chart_of_accounts': args.get(('chart_of_accounts')),
+			'domain': args.get('domain')
+		}).insert()
 
-        #Enable shopping cart
-        enable_shopping_cart(args)
+		#Enable shopping cart
+		enable_shopping_cart(args)
 
-        # Bank Account
-        create_bank_account(args)
+		# Bank Account
+		create_bank_account(args)
 
 def enable_shopping_cart(args):
-    frappe.get_doc({
-        "doctype": "Shopping Cart Settings",
-        "enabled": 1,
-        'company': args.get('company_name').strip(),
-        'price_list': frappe.db.get_value("Price List", {"selling": 1}),
-        'default_customer_group': _("Individual"),
-        'quotation_series': "QTN-",
-    }).insert()
+	frappe.get_doc({
+		"doctype": "Shopping Cart Settings",
+		"enabled": 1,
+		'company': args.get('company_name').strip(),
+		'price_list': frappe.db.get_value("Price List", {"selling": 1}),
+		'default_customer_group': _("Individual"),
+		'quotation_series': "QTN-",
+	}).insert()
 
 def create_bank_account(args):
-    if args.get("bank_account"):
-        company_name = args.get('company_name').strip()
-        bank_account_group =  frappe.db.get_value("Account",
-            {"account_type": "Bank", "is_group": 1, "root_type": "Asset",
-                "company": company_name})
-        if bank_account_group:
-            bank_account = frappe.get_doc({
-                "doctype": "Account",
-                'account_name': args.get("bank_account"),
-                'parent_account': bank_account_group,
-                'is_group':0,
-                'company': company_name,
-                "account_type": "Bank",
-            })
-            try:
-                return bank_account.insert()
-            except RootNotEditable:
-                frappe.throw(_("Bank account cannot be named as {0}").format(args.get("bank_account")))
-            except frappe.DuplicateEntryError:
-                # bank account same as a CoA entry
-                pass
+	if args.get("bank_account"):
+		company_name = args.get('company_name').strip()
+		bank_account_group =  frappe.db.get_value("Account",
+			{"account_type": "Bank", "is_group": 1, "root_type": "Asset",
+				"company": company_name})
+		if bank_account_group:
+			bank_account = frappe.get_doc({
+				"doctype": "Account",
+				'account_name': args.get("bank_account"),
+				'parent_account': bank_account_group,
+				'is_group':0,
+				'company': company_name,
+				"account_type": "Bank",
+			})
+			try:
+				return bank_account.insert()
+			except RootNotEditable:
+				frappe.throw(_("Bank account cannot be named as {0}").format(args.get("bank_account")))
+			except frappe.DuplicateEntryError:
+				# bank account same as a CoA entry
+				pass
 
 def create_price_lists(args):
-    for pl_type, pl_name in (("Selling", _("Standard Selling")), ("Buying", _("Standard Buying"))):
-        frappe.get_doc({
-            "doctype": "Price List",
-            "price_list_name": pl_name,
-            "enabled": 1,
-            "buying": 1 if pl_type == "Buying" else 0,
-            "selling": 1 if pl_type == "Selling" else 0,
-            "currency": args["currency"]
-        }).insert()
+	for pl_type, pl_name in (("Selling", _("Standard Selling")), ("Buying", _("Standard Buying"))):
+		frappe.get_doc({
+			"doctype": "Price List",
+			"price_list_name": pl_name,
+			"enabled": 1,
+			"buying": 1 if pl_type == "Buying" else 0,
+			"selling": 1 if pl_type == "Selling" else 0,
+			"currency": args["currency"]
+		}).insert()
 
 def set_defaults(args):
-    # enable default currency
-    frappe.db.set_value("Currency", args.get("currency"), "enabled", 1)
+	# enable default currency
+	frappe.db.set_value("Currency", args.get("currency"), "enabled", 1)
 
-    global_defaults = frappe.get_doc("Global Defaults", "Global Defaults")
-    global_defaults.update({
-        'current_fiscal_year': args.curr_fiscal_year,
-        'default_currency': args.get('currency'),
-        'default_company':args.get('company_name').strip(),
-        "country": args.get("country"),
-    })
+	global_defaults = frappe.get_doc("Global Defaults", "Global Defaults")
+	global_defaults.update({
+		'current_fiscal_year': args.curr_fiscal_year,
+		'default_currency': args.get('currency'),
+		'default_company':args.get('company_name').strip(),
+		"country": args.get("country"),
+	})
 
-    global_defaults.save()
+	global_defaults.save()
 
-    frappe.db.set_value("System Settings", None, "email_footer_address", args.get("company"))
+	frappe.db.set_value("System Settings", None, "email_footer_address", args.get("company"))
 
-    accounts_settings = frappe.get_doc("Accounts Settings")
-    accounts_settings.auto_accounting_for_stock = 1
-    accounts_settings.save()
+	accounts_settings = frappe.get_doc("Accounts Settings")
+	accounts_settings.auto_accounting_for_stock = 1
+	accounts_settings.save()
 
-    stock_settings = frappe.get_doc("Stock Settings")
-    stock_settings.item_naming_by = "Item Code"
-    stock_settings.valuation_method = "FIFO"
-    stock_settings.default_warehouse = frappe.db.get_value('Warehouse', {'warehouse_name': _('Stores')})
-    stock_settings.stock_uom = _("Nos")
-    stock_settings.auto_indent = 1
-    stock_settings.auto_insert_price_list_rate_if_missing = 1
-    stock_settings.automatically_set_serial_nos_based_on_fifo = 1
-    stock_settings.save()
+	stock_settings = frappe.get_doc("Stock Settings")
+	stock_settings.item_naming_by = "Item Code"
+	stock_settings.valuation_method = "FIFO"
+	stock_settings.default_warehouse = frappe.db.get_value('Warehouse', {'warehouse_name': _('Stores')})
+	stock_settings.stock_uom = _("Nos")
+	stock_settings.auto_indent = 1
+	stock_settings.auto_insert_price_list_rate_if_missing = 1
+	stock_settings.automatically_set_serial_nos_based_on_fifo = 1
+	stock_settings.save()
 
-    selling_settings = frappe.get_doc("Selling Settings")
-    selling_settings.cust_master_name = "Customer Name"
-    selling_settings.so_required = "No"
-    selling_settings.dn_required = "No"
-    selling_settings.save()
+	selling_settings = frappe.get_doc("Selling Settings")
+	selling_settings.cust_master_name = "Customer Name"
+	selling_settings.so_required = "No"
+	selling_settings.dn_required = "No"
+	selling_settings.save()
 
-    buying_settings = frappe.get_doc("Buying Settings")
-    buying_settings.supp_master_name = "Supplier Name"
-    buying_settings.po_required = "No"
-    buying_settings.pr_required = "No"
-    buying_settings.maintain_same_rate = 1
-    buying_settings.save()
+	buying_settings = frappe.get_doc("Buying Settings")
+	buying_settings.supp_master_name = "Supplier Name"
+	buying_settings.po_required = "No"
+	buying_settings.pr_required = "No"
+	buying_settings.maintain_same_rate = 1
+	buying_settings.save()
 
-    notification_control = frappe.get_doc("Notification Control")
-    notification_control.quotation = 1
-    notification_control.sales_invoice = 1
-    notification_control.purchase_order = 1
-    notification_control.save()
+	notification_control = frappe.get_doc("Notification Control")
+	notification_control.quotation = 1
+	notification_control.sales_invoice = 1
+	notification_control.purchase_order = 1
+	notification_control.save()
 
-    hr_settings = frappe.get_doc("HR Settings")
-    hr_settings.emp_created_by = "Naming Series"
-    hr_settings.save()
+	hr_settings = frappe.get_doc("HR Settings")
+	hr_settings.emp_created_by = "Naming Series"
+	hr_settings.save()
 
 def create_feed_and_todo():
-    """update Activity feed and create todo for creation of item, customer, vendor"""
-    add_info_comment(**{
-        "subject": _("ERPNext Setup Complete!")
-    })
+	"""update Activity feed and create todo for creation of item, customer, vendor"""
+	add_info_comment(**{
+		"subject": _("ERPNext Setup Complete!")
+	})
 
 def create_email_digest():
-    from frappe.utils.user import get_system_managers
-    system_managers = get_system_managers(only_name=True)
-    if not system_managers:
-        return
+	from frappe.utils.user import get_system_managers
+	system_managers = get_system_managers(only_name=True)
+	if not system_managers:
+		return
 
-    companies = frappe.db.sql_list("select name FROM `tabCompany`")
-    for company in companies:
-        if not frappe.db.exists("Email Digest", "Default Weekly Digest - " + company):
-            edigest = frappe.get_doc({
-                "doctype": "Email Digest",
-                "name": "Default Weekly Digest - " + company,
-                "company": company,
-                "frequency": "Weekly",
-                "recipient_list": "\n".join(system_managers)
-            })
+	companies = frappe.db.sql_list("select name FROM `tabCompany`")
+	for company in companies:
+		if not frappe.db.exists("Email Digest", "Default Weekly Digest - " + company):
+			edigest = frappe.get_doc({
+				"doctype": "Email Digest",
+				"name": "Default Weekly Digest - " + company,
+				"company": company,
+				"frequency": "Weekly",
+				"recipient_list": "\n".join(system_managers)
+			})
 
-            for df in edigest.meta.get("fields", {"fieldtype": "Check"}):
-                if df.fieldname != "scheduler_errors":
-                    edigest.set(df.fieldname, 1)
+			for df in edigest.meta.get("fields", {"fieldtype": "Check"}):
+				if df.fieldname != "scheduler_errors":
+					edigest.set(df.fieldname, 1)
 
-            edigest.insert()
+			edigest.insert()
 
-    # scheduler errors digest
-    if companies:
-        edigest = frappe.new_doc("Email Digest")
-        edigest.update({
-            "name": "Scheduler Errors",
-            "company": companies[0],
-            "frequency": "Daily",
-            "recipient_list": "\n".join(system_managers),
-            "scheduler_errors": 1,
-            "enabled": 1
-        })
-        edigest.insert()
+	# scheduler errors digest
+	if companies:
+		edigest = frappe.new_doc("Email Digest")
+		edigest.update({
+			"name": "Scheduler Errors",
+			"company": companies[0],
+			"frequency": "Daily",
+			"recipient_list": "\n".join(system_managers),
+			"scheduler_errors": 1,
+			"enabled": 1
+		})
+		edigest.insert()
 
 def get_fy_details(fy_start_date, fy_end_date):
-    start_year = getdate(fy_start_date).year
-    if start_year == getdate(fy_end_date).year:
-        fy = cstr(start_year)
-    else:
-        fy = cstr(start_year) + '-' + cstr(start_year + 1)
-    return fy
+	start_year = getdate(fy_start_date).year
+	if start_year == getdate(fy_end_date).year:
+		fy = cstr(start_year)
+	else:
+		fy = cstr(start_year) + '-' + cstr(start_year + 1)
+	return fy
+
+def create_sales_tax(args):
+	country_wise_tax = get_country_wise_tax(args.get("country"))
+	if country_wise_tax and len(country_wise_tax) > 0:
+		for sales_tax, tax_data in country_wise_tax.items():
+			make_tax_account_and_template(args.get("company_name").strip(),
+				tax_data.get('account_name'), tax_data.get('tax_rate'), sales_tax)
+
+def get_country_wise_tax(country):
+	data = {}
+	with open (os.path.join(os.path.dirname(__file__), "data", "country_wise_tax.json")) as countrywise_tax:
+		data = json.load(countrywise_tax).get(country)
+
+	return data
 
 def create_taxes(args):
+	for i in xrange(1,6):
+		if args.get("tax_" + str(i)):
+			# replace % in case someone also enters the % symbol
+			tax_rate = cstr(args.get("tax_rate_" + str(i)) or "").replace("%", "")
+			account_name = args.get("tax_" + str(i))
 
-    for i in xrange(1,6):
-        if args.get("tax_" + str(i)):
-            # replace % in case someone also enters the % symbol
-            tax_rate = cstr(args.get("tax_rate_" + str(i)) or "").replace("%", "")
+			make_tax_account_and_template(args.get("company_name").strip(), account_name, tax_rate)
 
-            try:
-                tax_group = frappe.db.get_value("Account", {"company": args.get("company_name"),
-                    "is_group": 1, "account_type": "Tax", "root_type": "Liability"})
-                if tax_group:
-                    account = make_tax_head(args, i, tax_group, tax_rate)
-                    make_sales_and_purchase_tax_templates(account)
+def make_tax_account_and_template(company, account_name, tax_rate, template_name=None):
+	try:
+		account = make_tax_account(company, account_name, tax_rate)
+		if account:
+			make_sales_and_purchase_tax_templates(account, template_name)
+	except frappe.NameError, e:
+		if e.args[2][0]==1062:
+			pass
+		else:
+			raise
+	except RootNotEditable, e:
+		pass
 
-            except frappe.NameError, e:
-                if e.args[2][0]==1062:
-                    pass
-                else:
-                    raise
-            except RootNotEditable, e:
-                pass
+def get_tax_account_group(company):
+	tax_group = frappe.db.get_value("Account",
+		{"account_name": "Duties and Taxes", "is_group": 1, "company": company})
+	if not tax_group:
+		tax_group = frappe.db.get_value("Account", {"is_group": 1, "root_type": "Liability",
+				"account_type": "Tax", "company": company})
 
-def make_tax_head(args, i, tax_group, tax_rate):
-    return frappe.get_doc({
-        "doctype":"Account",
-        "company": args.get("company_name").strip(),
-        "parent_account": tax_group,
-        "account_name": args.get("tax_" + str(i)),
-        "is_group": 0,
-        "report_type": "Balance Sheet",
-        "account_type": "Tax",
-        "tax_rate": flt(tax_rate) if tax_rate else None
-    }).insert(ignore_permissions=True)
+	return tax_group
 
-def make_sales_and_purchase_tax_templates(account):
-    doc = {
-        "doctype": "Sales Taxes and Charges Template",
-        "title": account.name,
-        "taxes": [{
-            "category": "Valuation and Total",
-            "charge_type": "On Net Total",
-            "account_head": account.name,
-            "description": "{0} @ {1}".format(account.account_name, account.tax_rate),
-            "rate": account.tax_rate
-        }]
-    }
+def make_tax_account(company, account_name, tax_rate):
+	tax_group = get_tax_account_group(company)
+	if tax_group:
+		return frappe.get_doc({
+			"doctype":"Account",
+			"company": company,
+			"parent_account": tax_group,
+			"account_name": account_name,
+			"is_group": 0,
+			"report_type": "Balance Sheet",
+			"root_type": "Liability",
+			"account_type": "Tax",
+			"tax_rate": flt(tax_rate) if tax_rate else None
+		}).insert(ignore_permissions=True)
 
-    # Sales
-    frappe.get_doc(copy.deepcopy(doc)).insert()
+def make_sales_and_purchase_tax_templates(account, template_name=None):
+	if not template_name:
+		template_name = account.name
 
-    # Purchase
-    doc["doctype"] = "Purchase Taxes and Charges Template"
-    frappe.get_doc(copy.deepcopy(doc)).insert()
+	sales_tax_template = {
+		"doctype": "Sales Taxes and Charges Template",
+		"title": template_name,
+		"company": account.company,
+		"taxes": [{
+			"category": "Valuation and Total",
+			"charge_type": "On Net Total",
+			"account_head": account.name,
+			"description": "{0} @ {1}".format(account.account_name, account.tax_rate),
+			"rate": account.tax_rate
+		}]
+	}
+
+	# Sales
+	frappe.get_doc(copy.deepcopy(sales_tax_template)).insert(ignore_permissions=True)
+
+	# Purchase
+	purchase_tax_template = copy.deepcopy(sales_tax_template)
+	purchase_tax_template["doctype"] = "Purchase Taxes and Charges Template"
+	frappe.get_doc(purchase_tax_template).insert(ignore_permissions=True)
 
 def create_items(args):
-    for i in xrange(1,6):
-        item = args.get("item_" + str(i))
-        if item:
-            item_group = args.get("item_group_" + str(i))
-            is_sales_item = args.get("is_sales_item_" + str(i))
-            is_purchase_item = args.get("is_purchase_item_" + str(i))
-            is_stock_item = item_group!=_("Services")
-            default_warehouse = ""
-            if is_stock_item:
-                default_warehouse = frappe.db.get_value("Warehouse", filters={
-                    "warehouse_name": _("Finished Goods") if is_sales_item else _("Stores"),
-                    "company": args.get("company_name").strip()
-                })
+	for i in xrange(1,6):
+		item = args.get("item_" + str(i))
+		if item:
+			item_group = args.get("item_group_" + str(i))
+			is_sales_item = args.get("is_sales_item_" + str(i))
+			is_purchase_item = args.get("is_purchase_item_" + str(i))
+			is_stock_item = item_group!=_("Services")
+			default_warehouse = ""
+			if is_stock_item:
+				default_warehouse = frappe.db.get_value("Warehouse", filters={
+					"warehouse_name": _("Finished Goods") if is_sales_item else _("Stores"),
+					"company": args.get("company_name").strip()
+				})
 
-            try:
-                frappe.get_doc({
-                    "doctype":"Item",
-                    "item_code": item,
-                    "item_name": item,
-                    "description": item,
-                    "show_in_website": 1,
-                    "is_sales_item": is_sales_item,
-                    "is_purchase_item": is_purchase_item,
-                    "is_stock_item": is_stock_item and 1 or 0,
-                    "item_group": item_group,
-                    "stock_uom": args.get("item_uom_" + str(i)),
-                    "default_warehouse": default_warehouse
-                }).insert()
+			try:
+				frappe.get_doc({
+					"doctype":"Item",
+					"item_code": item,
+					"item_name": item,
+					"description": item,
+					"show_in_website": 1,
+					"is_sales_item": is_sales_item,
+					"is_purchase_item": is_purchase_item,
+					"is_stock_item": is_stock_item and 1 or 0,
+					"item_group": item_group,
+					"stock_uom": args.get("item_uom_" + str(i)),
+					"default_warehouse": default_warehouse
+				}).insert()
 
-                if args.get("item_img_" + str(i)):
-                    item_image = args.get("item_img_" + str(i)).split(",")
-                    if len(item_image)==3:
-                        filename, filetype, content = item_image
-                        fileurl = save_file(filename, content, "Item", item, decode=True).file_url
-                        frappe.db.set_value("Item", item, "image", fileurl)
+				if args.get("item_img_" + str(i)):
+					item_image = args.get("item_img_" + str(i)).split(",")
+					if len(item_image)==3:
+						filename, filetype, content = item_image
+						fileurl = save_file(filename, content, "Item", item, decode=True).file_url
+						frappe.db.set_value("Item", item, "image", fileurl)
 
-                if args.get("item_price_" + str(i)):
-                    item_price = flt(args.get("item_price_" + str(i)))
+				if args.get("item_price_" + str(i)):
+					item_price = flt(args.get("item_price_" + str(i)))
 
-                    if is_sales_item:
-                        price_list_name = frappe.db.get_value("Price List", {"selling": 1})
-                        make_item_price(item, price_list_name, item_price)
+					if is_sales_item:
+						price_list_name = frappe.db.get_value("Price List", {"selling": 1})
+						make_item_price(item, price_list_name, item_price)
 
-                    if is_purchase_item:
-                        price_list_name = frappe.db.get_value("Price List", {"buying": 1})
-                        make_item_price(item, price_list_name, item_price)
+					if is_purchase_item:
+						price_list_name = frappe.db.get_value("Price List", {"buying": 1})
+						make_item_price(item, price_list_name, item_price)
 
-            except frappe.NameError:
-                pass
+			except frappe.NameError:
+				pass
 
 def make_item_price(item, price_list_name, item_price):
-    frappe.get_doc({
-        "doctype": "Item Price",
-        "price_list": price_list_name,
-        "item_code": item,
-        "price_list_rate": item_price
-    }).insert()
+	frappe.get_doc({
+		"doctype": "Item Price",
+		"price_list": price_list_name,
+		"item_code": item,
+		"price_list_rate": item_price
+	}).insert()
 
 
 def create_customers(args):
-    for i in xrange(1,6):
-        customer = args.get("customer_" + str(i))
-        if customer:
-            try:
-                doc = frappe.get_doc({
-                    "doctype":"Customer",
-                    "customer_name": customer,
-                    "customer_type": "Company",
-                    "customer_group": _("Commercial"),
-                    "territory": args.get("country"),
-                    "company": args.get("company_name").strip()
-                }).insert()
+	for i in xrange(1,6):
+		customer = args.get("customer_" + str(i))
+		if customer:
+			try:
+				doc = frappe.get_doc({
+					"doctype":"Customer",
+					"customer_name": customer,
+					"customer_type": "Company",
+					"customer_group": _("Commercial"),
+					"territory": args.get("country"),
+					"company": args.get("company_name").strip()
+				}).insert()
 
-                if args.get("customer_contact_" + str(i)):
-                    create_contact(args.get("customer_contact_" + str(i)),
-                        "customer", doc.name)
-            except frappe.NameError:
-                pass
+				if args.get("customer_contact_" + str(i)):
+					create_contact(args.get("customer_contact_" + str(i)),
+						"customer", doc.name)
+			except frappe.NameError:
+				pass
 
 def create_suppliers(args):
-    for i in xrange(1,6):
-        supplier = args.get("supplier_" + str(i))
-        if supplier:
-            try:
-                doc = frappe.get_doc({
-                    "doctype":"Supplier",
-                    "supplier_name": supplier,
-                    "supplier_type": _("Local"),
-                    "company": args.get("company_name").strip()
-                }).insert()
+	for i in xrange(1,6):
+		supplier = args.get("supplier_" + str(i))
+		if supplier:
+			try:
+				doc = frappe.get_doc({
+					"doctype":"Supplier",
+					"supplier_name": supplier,
+					"supplier_type": _("Local"),
+					"company": args.get("company_name").strip()
+				}).insert()
 
-                if args.get("supplier_contact_" + str(i)):
-                    create_contact(args.get("supplier_contact_" + str(i)),
-                        "supplier", doc.name)
-            except frappe.NameError:
-                pass
+				if args.get("supplier_contact_" + str(i)):
+					create_contact(args.get("supplier_contact_" + str(i)),
+						"supplier", doc.name)
+			except frappe.NameError:
+				pass
 
 def create_contact(contact, party_type, party):
-    """Create contact based on given contact name"""
-    contact = contact.strip().split(" ")
+	"""Create contact based on given contact name"""
+	contact = contact.strip().split(" ")
 
-    frappe.get_doc({
-        "doctype":"Contact",
-        party_type: party,
-        "first_name":contact[0],
-        "last_name": len(contact) > 1 and contact[1] or ""
-    }).insert()
+	frappe.get_doc({
+		"doctype":"Contact",
+		party_type: party,
+		"first_name":contact[0],
+		"last_name": len(contact) > 1 and contact[1] or ""
+	}).insert()
 
 def create_letter_head(args):
-    if args.get("attach_letterhead"):
-        frappe.get_doc({
-            "doctype":"Letter Head",
-            "letter_head_name": _("Standard"),
-            "is_default": 1
-        }).insert()
+	if args.get("attach_letterhead"):
+		frappe.get_doc({
+			"doctype":"Letter Head",
+			"letter_head_name": _("Standard"),
+			"is_default": 1
+		}).insert()
 
-        attach_letterhead = args.get("attach_letterhead").split(",")
-        if len(attach_letterhead)==3:
-            filename, filetype, content = attach_letterhead
-            fileurl = save_file(filename, content, "Letter Head", _("Standard"), decode=True).file_url
-            frappe.db.set_value("Letter Head", _("Standard"), "content", "<img src='%s' style='max-width: 100%%;'>" % fileurl)
+		attach_letterhead = args.get("attach_letterhead").split(",")
+		if len(attach_letterhead)==3:
+			filename, filetype, content = attach_letterhead
+			fileurl = save_file(filename, content, "Letter Head", _("Standard"), decode=True).file_url
+			frappe.db.set_value("Letter Head", _("Standard"), "content", "<img src='%s' style='max-width: 100%%;'>" % fileurl)
 
 def create_logo(args):
-    if args.get("attach_logo"):
-        attach_logo = args.get("attach_logo").split(",")
-        if len(attach_logo)==3:
-            filename, filetype, content = attach_logo
-            fileurl = save_file(filename, content, "Website Settings", "Website Settings",
-                decode=True).file_url
-            frappe.db.set_value("Website Settings", "Website Settings", "brand_html",
-                "<img src='{0}' style='max-width: 40px; max-height: 25px;'> {1}".format(fileurl, args.get("company_name").strip()))
+	if args.get("attach_logo"):
+		attach_logo = args.get("attach_logo").split(",")
+		if len(attach_logo)==3:
+			filename, filetype, content = attach_logo
+			fileurl = save_file(filename, content, "Website Settings", "Website Settings",
+				decode=True).file_url
+			frappe.db.set_value("Website Settings", "Website Settings", "brand_html",
+				"<img src='{0}' style='max-width: 40px; max-height: 25px;'> {1}".format(fileurl, args.get("company_name").strip()))
 
 def create_territories():
-    """create two default territories, one for home country and one named Rest of the World"""
-    from frappe.utils.nestedset import get_root_of
-    country = frappe.db.get_default("country")
-    root_territory = get_root_of("Territory")
-    for name in (country, _("Rest Of The World")):
-        if name and not frappe.db.exists("Territory", name):
-            frappe.get_doc({
-                "doctype": "Territory",
-                "territory_name": name.replace("'", ""),
-                "parent_territory": root_territory,
-                "is_group": "No"
-            }).insert()
+	"""create two default territories, one for home country and one named Rest of the World"""
+	from frappe.utils.nestedset import get_root_of
+	country = frappe.db.get_default("country")
+	root_territory = get_root_of("Territory")
+	for name in (country, _("Rest Of The World")):
+		if name and not frappe.db.exists("Territory", name):
+			frappe.get_doc({
+				"doctype": "Territory",
+				"territory_name": name.replace("'", ""),
+				"parent_territory": root_territory,
+				"is_group": "No"
+			}).insert()
 
 def login_as_first_user(args):
-    if args.get("email") and hasattr(frappe.local, "login_manager"):
-        frappe.local.login_manager.login_as(args.get("email"))
+	if args.get("email") and hasattr(frappe.local, "login_manager"):
+		frappe.local.login_manager.login_as(args.get("email"))
 
 def create_users(args):
-    if frappe.session.user == 'Administrator':
-        return
+	if frappe.session.user == 'Administrator':
+		return
 
-    # create employee for self
-    emp = frappe.get_doc({
-        "doctype": "Employee",
-        "employee_name": " ".join(filter(None, [args.get("first_name"), args.get("last_name")])),
-        "user_id": frappe.session.user,
-        "status": "Active",
-        "company": args.get("company_name")
-    })
-    emp.flags.ignore_mandatory = True
-    emp.insert(ignore_permissions = True)
+	# create employee for self
+	emp = frappe.get_doc({
+		"doctype": "Employee",
+		"employee_name": " ".join(filter(None, [args.get("first_name"), args.get("last_name")])),
+		"user_id": frappe.session.user,
+		"status": "Active",
+		"company": args.get("company_name")
+	})
+	emp.flags.ignore_mandatory = True
+	emp.insert(ignore_permissions = True)
 
-    for i in xrange(1,5):
-        email = args.get("user_email_" + str(i))
-        fullname = args.get("user_fullname_" + str(i))
-        if email:
-            if not fullname:
-                fullname = email.split("@")[0]
+	for i in xrange(1,5):
+		email = args.get("user_email_" + str(i))
+		fullname = args.get("user_fullname_" + str(i))
+		if email:
+			if not fullname:
+				fullname = email.split("@")[0]
 
-            parts = fullname.split(" ", 1)
+			parts = fullname.split(" ", 1)
 
-            user = frappe.get_doc({
-                "doctype": "User",
-                "email": email,
-                "first_name": parts[0],
-                "last_name": parts[1] if len(parts) > 1 else "",
-                "enabled": 1,
-                "user_type": "System User"
-            })
+			user = frappe.get_doc({
+				"doctype": "User",
+				"email": email,
+				"first_name": parts[0],
+				"last_name": parts[1] if len(parts) > 1 else "",
+				"enabled": 1,
+				"user_type": "System User"
+			})
 
-            # default roles
-            user.append_roles("Projects User", "Stock User", "Support Team")
+			# default roles
+			user.append_roles("Projects User", "Stock User", "Support Team")
 
-            if args.get("user_sales_" + str(i)):
-                user.append_roles("Sales User", "Sales Manager", "Accounts User")
-            if args.get("user_purchaser_" + str(i)):
-                user.append_roles("Purchase User", "Purchase Manager", "Accounts User")
-            if args.get("user_accountant_" + str(i)):
-                user.append_roles("Accounts Manager", "Accounts User")
+			if args.get("user_sales_" + str(i)):
+				user.append_roles("Sales User", "Sales Manager", "Accounts User")
+			if args.get("user_purchaser_" + str(i)):
+				user.append_roles("Purchase User", "Purchase Manager", "Accounts User")
+			if args.get("user_accountant_" + str(i)):
+				user.append_roles("Accounts Manager", "Accounts User")
 
-            user.flags.delay_emails = True
+			user.flags.delay_emails = True
 
-            if not frappe.db.get_value("User", email):
-                user.insert(ignore_permissions=True)
+			if not frappe.db.get_value("User", email):
+				user.insert(ignore_permissions=True)
 
-                # create employee
-                emp = frappe.get_doc({
-                    "doctype": "Employee",
-                    "employee_name": fullname,
-                    "user_id": email,
-                    "status": "Active",
-                    "company": args.get("company_name")
-                })
-                emp.flags.ignore_mandatory = True
-                emp.insert(ignore_permissions = True)
+				# create employee
+				emp = frappe.get_doc({
+					"doctype": "Employee",
+					"employee_name": fullname,
+					"user_id": email,
+					"status": "Active",
+					"company": args.get("company_name")
+				})
+				emp.flags.ignore_mandatory = True
+				emp.insert(ignore_permissions = True)
 
 def create_academic_term():
-    at = ["Semester 1", "Semester 2", "Semester 3"]
-    ay = ["2013-14", "2014-15", "2015-16", "2016-17", "2017-18"]
-    for y in ay:
-        for t in at:
-            academic_term = frappe.new_doc("Academic Term")
-            academic_term.academic_year = y
-            academic_term.term_name = t
-            academic_term.save()
+	at = ["Semester 1", "Semester 2", "Semester 3"]
+	ay = ["2013-14", "2014-15", "2015-16", "2016-17", "2017-18"]
+	for y in ay:
+		for t in at:
+			academic_term = frappe.new_doc("Academic Term")
+			academic_term.academic_year = y
+			academic_term.term_name = t
+			try:
+				academic_term.save()
+			except frappe.DuplicateEntryError:
+				pass
 
 def create_academic_year():
-    ac = ["2013-14", "2014-15", "2015-16", "2016-17", "2017-18"]
-    for d in ac:
-        academic_year = frappe.new_doc("Academic Year")
-        academic_year.academic_year_name = d
-        academic_year.save()
+	ac = ["2013-14", "2014-15", "2015-16", "2016-17", "2017-18"]
+	for d in ac:
+		academic_year = frappe.new_doc("Academic Year")
+		academic_year.academic_year_name = d
+		try:
+			academic_year.save()
+		except frappe.DuplicateEntryError:
+			pass
 
 def create_program(args):
-    for i in xrange(1,6):
-        if args.get("program_" + str(i)):
-            program = frappe.new_doc("Program")
-            program.program_name = args.get("program_" + str(i))
-            program.save()
+	for i in xrange(1,6):
+		if args.get("program_" + str(i)):
+			program = frappe.new_doc("Program")
+			program.program_name = args.get("program_" + str(i))
+			try:
+				program.save()
+			except frappe.DuplicateEntryError:
+				pass
 
 def create_course(args):
-    for i in xrange(1,6):
-        if args.get("course_" + str(i)):
-            course = frappe.new_doc("Course")
-            course.course_name = args.get("course_" + str(i))
-            course.save()
+	for i in xrange(1,6):
+		if args.get("course_" + str(i)):
+			course = frappe.new_doc("Course")
+			course.course_name = args.get("course_" + str(i))
+			try:
+				course.save()
+			except frappe.DuplicateEntryError:
+				pass
 
 def create_instructor(args):
-    for i in xrange(1,6):
-        if args.get("instructor_" + str(i)):
-            instructor = frappe.new_doc("Instructor")
-            instructor.instructor_name = args.get("instructor_" + str(i))
-            instructor.save()
+	for i in xrange(1,6):
+		if args.get("instructor_" + str(i)):
+			instructor = frappe.new_doc("Instructor")
+			instructor.instructor_name = args.get("instructor_" + str(i))
+			try:
+				instructor.save()
+			except frappe.DuplicateEntryError:
+				pass
 
 def create_room(args):
-    for i in xrange(1,6):
-        if args.get("room_" + str(i)):
-            room = frappe.new_doc("Room")
-            room.room_name = args.get("room_" + str(i))
-            room.seating_capacity = args.get("room_capacity_" + str(i))
-            room.save()
+	for i in xrange(1,6):
+		if args.get("room_" + str(i)):
+			room = frappe.new_doc("Room")
+			room.room_name = args.get("room_" + str(i))
+			room.seating_capacity = args.get("room_capacity_" + str(i))
+			try:
+				room.save()
+			except frappe.DuplicateEntryError:
+				pass
 
 
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 4c462c2..b04b427 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
@@ -2,20 +2,25 @@
  "allow_copy": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
+ "beta": 0, 
  "creation": "2013-06-19 15:57:32", 
  "custom": 0, 
  "description": "Default settings for Shopping Cart", 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "document_type": "System", 
+ "editable_grid": 0, 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "enabled", 
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Enable Shopping Cart", 
@@ -25,6 +30,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -35,10 +41,12 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_2", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -47,6 +55,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, 
@@ -57,10 +66,12 @@
    "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": 1, 
    "label": "Company", 
@@ -71,6 +82,7 @@
    "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, 
@@ -81,10 +93,12 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "price_list", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Price List", 
@@ -96,6 +110,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, 
@@ -106,10 +121,12 @@
    "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_list_view": 0, 
    "length": 0, 
@@ -118,6 +135,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,11 +146,13 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "", 
    "fieldname": "default_customer_group", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Default Customer Group", 
@@ -143,6 +163,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, 
@@ -153,10 +174,12 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "quotation_series", 
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Quotation Series", 
@@ -166,6 +189,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, 
@@ -177,10 +201,12 @@
    "bold": 0, 
    "collapsible": 1, 
    "collapsible_depends_on": "eval:doc.enable_checkout", 
+   "columns": 0, 
    "fieldname": "section_break_8", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Checkout Settings", 
@@ -191,6 +217,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, 
@@ -201,10 +228,12 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "enable_checkout", 
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Enable Checkout", 
@@ -215,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, 
@@ -225,12 +255,14 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "Orders", 
    "description": "After payment completion redirect user to selected page.", 
    "fieldname": "payment_success_url", 
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Payment Success Url", 
@@ -242,6 +274,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, 
@@ -252,10 +285,12 @@
    "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_list_view": 0, 
    "length": 0, 
@@ -265,6 +300,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, 
@@ -275,10 +311,12 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "payment_gateway_account", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Payment Gateway Account", 
@@ -290,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, 
@@ -299,15 +338,16 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-shopping-cart", 
+ "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-02-09 15:45:03.389220", 
+ "modified": "2016-11-03 16:10:33.956822", 
  "modified_by": "Administrator", 
  "module": "Shopping Cart", 
  "name": "Shopping Cart Settings", 
@@ -323,6 +363,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -334,7 +375,9 @@
    "write": 1
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
- "sort_order": "ASC"
+ "sort_order": "ASC", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/shopping_cart/product.py b/erpnext/shopping_cart/product.py
index 6a6cb69..24e4d42 100644
--- a/erpnext/shopping_cart/product.py
+++ b/erpnext/shopping_cart/product.py
@@ -4,9 +4,11 @@
 from __future__ import unicode_literals
 
 import frappe
-from frappe.utils import cint, fmt_money
+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
+from erpnext.shopping_cart.doctype.shopping_cart_settings.shopping_cart_settings \
+	import is_cart_enabled, get_shopping_cart_settings
+from erpnext.accounts.doctype.pricing_rule.pricing_rule import get_pricing_rule_for_item
 
 @frappe.whitelist(allow_guest=True)
 def get_product_info(item_code):
@@ -51,12 +53,14 @@
 			in_stock = in_stock[0][0] > 0 and 1 or 0
 
 	else:
-		in_stock = -1
+		in_stock = 0
 
 	return in_stock
 
-def get_price(item_code, template_item_code, price_list):
+def get_price(item_code, template_item_code, price_list, qty=1):
 	if price_list:
+		cart_settings = get_shopping_cart_settings()
+
 		price = frappe.get_all("Item Price", fields=["price_list_rate", "currency"],
 			filters={"price_list": price_list, "item_code": item_code})
 
@@ -65,4 +69,22 @@
 				filters={"price_list": price_list, "item_code": template_item_code})
 
 		if price:
+			pricing_rule = get_pricing_rule_for_item(frappe._dict({
+				"item_code": item_code,
+				"qty": qty,
+				"transaction_type": "selling",
+				"price_list": price_list,
+				"customer_group": cart_settings.default_customer_group,
+				"company": cart_settings.company,
+				"conversion_rate": 1,
+				"for_shopping_cart": True
+			}))
+
+			if pricing_rule:
+				if pricing_rule.pricing_rule_for == "Discount Percentage":
+					price[0].price_list_rate = flt(price[0].price_list_rate * (1.0 - (pricing_rule.discount_percentage / 100.0)))
+
+				if pricing_rule.pricing_rule_for == "Price":
+					price[0].price_list_rate = pricing_rule.price_list_rate
+
 			return price[0]
diff --git a/erpnext/startup/notifications.py b/erpnext/startup/notifications.py
index 58a2c79..a1b90f9 100644
--- a/erpnext/startup/notifications.py
+++ b/erpnext/startup/notifications.py
@@ -30,6 +30,7 @@
 				"outstanding_amount": (">", 0), 
 				"docstatus": ("<", 2)
 			},
+			"Payment Entry": {"docstatus": 0},
 			"Leave Application": {"status": "Open"},
 			"Expense Claim": {"approval_status": "Draft"},
 			"Job Applicant": {"status": "Open"},
diff --git a/erpnext/stock/dashboard/item_dashboard.js b/erpnext/stock/dashboard/item_dashboard.js
index 33296ee..43bd6d4 100644
--- a/erpnext/stock/dashboard/item_dashboard.js
+++ b/erpnext/stock/dashboard/item_dashboard.js
@@ -46,6 +46,7 @@
 			args: {
 				item_code: this.item_code,
 				warehouse: this.warehouse,
+				item_group: this.item_group,
 				start: this.start,
 				sort_by: this.sort_by,
 				sort_order: this.sort_order,
diff --git a/erpnext/stock/dashboard/item_dashboard.py b/erpnext/stock/dashboard/item_dashboard.py
index 5a00b3d..28ea045 100644
--- a/erpnext/stock/dashboard/item_dashboard.py
+++ b/erpnext/stock/dashboard/item_dashboard.py
@@ -3,12 +3,38 @@
 import frappe
 
 @frappe.whitelist()
-def get_data(item_code=None, warehouse=None, start=0, sort_by='actual_qty', sort_order='desc'):
-	filters = {}
+def get_data(item_code=None, warehouse=None, item_group=None,
+	start=0, sort_by='actual_qty', sort_order='desc'):
+	'''Return data to render the item dashboard'''
+	conditions = []
+	values = []
 	if item_code:
-		filters['item_code'] = item_code
+		conditions.append('b.item_code=%s')
+		values.append(item_code)
 	if warehouse:
-		filters['warehouse'] = warehouse
-	return frappe.get_list("Bin", filters=filters, fields=['item_code', 'warehouse',
-		'projected_qty', 'reserved_qty', 'reserved_qty_for_production', 'actual_qty', 'valuation_rate'],
-		order_by='{0} {1}'.format(sort_by, sort_order), start=start, page_length = 21)
\ No newline at end of file
+		conditions.append('b.warehouse=%s')
+		values.append(warehouse)
+	if item_group:
+		conditions.append('i.item_group=%s')
+		values.append(item_group)
+
+	if conditions:
+		conditions = ' and ' + ' and '.join(conditions)
+	else:
+		conditions = ''
+
+	return frappe.db.sql('''
+	select
+		b.item_code, b.warehouse, b.projected_qty, b.reserved_qty,
+		b.reserved_qty_for_production, b.actual_qty, b.valuation_rate, i.item_name
+	from
+		tabBin b, tabItem i
+	where
+		b.item_code = i.name
+		{conditions}
+	order by
+		{sort_by} {sort_order}
+	limit
+		{start}, 21
+	'''.format(conditions=conditions, sort_by=sort_by, sort_order=sort_order,
+		start=start), values, as_dict=True)
diff --git a/erpnext/stock/dashboard/item_dashboard_list.html b/erpnext/stock/dashboard/item_dashboard_list.html
index f9ffbb3..c1792a9 100644
--- a/erpnext/stock/dashboard/item_dashboard_list.html
+++ b/erpnext/stock/dashboard/item_dashboard_list.html
@@ -7,7 +7,9 @@
 			<div class="col-sm-3 small" style="margin-top: 8px;">
 				{% if show_item %}
 					<a data-type="item"
-						data-name="{{ d.item_code }}">{{ d.item_code }}</a>
+						data-name="{{ d.item_code }}">{{ d.item_code }}
+						{% if d.item_name != d.item_code %}({{ d.item_name }}){% endif %}
+					</a>
 				{% endif %}
 			</div>
 			<div class="col-sm-4 small">
diff --git a/erpnext/stock/doctype/batch/batch.json b/erpnext/stock/doctype/batch/batch.json
index 1abe9b3..ef31cfd 100644
--- a/erpnext/stock/doctype/batch/batch.json
+++ b/erpnext/stock/doctype/batch/batch.json
@@ -3,22 +3,28 @@
  "allow_import": 1, 
  "allow_rename": 0, 
  "autoname": "field:batch_id", 
+ "beta": 0, 
  "creation": "2013-03-05 14:50:38", 
  "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": "batch_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": "Batch ID", 
    "length": 0, 
    "no_copy": 1, 
@@ -26,7 +32,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, 
@@ -37,12 +45,15 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "item", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Item", 
    "length": 0, 
    "no_copy": 0, 
@@ -51,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, 
@@ -62,18 +75,23 @@
    "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, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_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 +102,15 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "expiry_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Expiry Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -97,7 +118,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": 0, 
    "search_index": 0, 
@@ -108,18 +131,23 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_7", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_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,12 +158,15 @@
    "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_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Batch Description", 
    "length": 0, 
    "no_copy": 0, 
@@ -143,7 +174,9 @@
    "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, 
@@ -154,15 +187,16 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-archive", 
+ "icon": "fa fa-archive", 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 5, 
- "modified": "2015-11-16 06:29:42.315839", 
+ "modified": "2016-11-07 05:50:33.973883", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Batch", 
@@ -178,6 +212,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -189,7 +224,9 @@
    "write": 1
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
- "title_field": "item"
+ "title_field": "item", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/bin/bin.json b/erpnext/stock/doctype/bin/bin.json
index bb0de3f..79ad4cd 100644
--- a/erpnext/stock/doctype/bin/bin.json
+++ b/erpnext/stock/doctype/bin/bin.json
@@ -3,15 +3,19 @@
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "BIN/.#######", 
+ "beta": 0, 
  "creation": "2013-01-10 16:34:25", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "editable_grid": 0, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "warehouse", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -19,6 +23,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Warehouse", 
    "length": 0, 
    "no_copy": 0, 
@@ -29,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": 1, 
@@ -39,6 +45,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "item_code", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -46,6 +53,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Item Code", 
    "length": 0, 
    "no_copy": 0, 
@@ -56,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": 1, 
@@ -66,6 +75,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "0.00", 
    "fieldname": "reserved_qty", 
    "fieldtype": "Float", 
@@ -74,6 +84,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Reserved Quantity", 
    "length": 0, 
    "no_copy": 0, 
@@ -83,6 +94,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,6 +105,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "0.00", 
    "fieldname": "actual_qty", 
    "fieldtype": "Float", 
@@ -101,6 +114,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Actual Quantity", 
    "length": 0, 
    "no_copy": 0, 
@@ -110,6 +124,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, 
@@ -120,6 +135,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "0.00", 
    "fieldname": "ordered_qty", 
    "fieldtype": "Float", 
@@ -128,6 +144,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Ordered Quantity", 
    "length": 0, 
    "no_copy": 0, 
@@ -137,6 +154,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, 
@@ -147,6 +165,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "0.00", 
    "fieldname": "indented_qty", 
    "fieldtype": "Float", 
@@ -155,6 +174,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Requested Quantity", 
    "length": 0, 
    "no_copy": 0, 
@@ -164,6 +184,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, 
@@ -174,6 +195,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "planned_qty", 
    "fieldtype": "Float", 
    "hidden": 0, 
@@ -181,6 +203,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Planned Qty", 
    "length": 0, 
    "no_copy": 0, 
@@ -190,6 +213,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, 
@@ -200,6 +224,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "projected_qty", 
    "fieldtype": "Float", 
    "hidden": 0, 
@@ -207,6 +232,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Projected Qty", 
    "length": 0, 
    "no_copy": 0, 
@@ -216,6 +242,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 +253,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "reserved_qty_for_production", 
    "fieldtype": "Float", 
    "hidden": 0, 
@@ -233,6 +261,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Reserved Qty for Production", 
    "length": 0, 
    "no_copy": 0, 
@@ -241,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, 
@@ -251,6 +281,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "ma_rate", 
    "fieldtype": "Float", 
    "hidden": 1, 
@@ -258,6 +289,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Moving Average Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -267,6 +299,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, 
@@ -277,6 +310,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "stock_uom", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -284,6 +318,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "UOM", 
    "length": 0, 
    "no_copy": 0, 
@@ -294,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, 
@@ -304,6 +340,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "fcfs_rate", 
    "fieldtype": "Float", 
    "hidden": 1, 
@@ -311,6 +348,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "FCFS Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -320,6 +358,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, 
@@ -330,6 +369,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "valuation_rate", 
    "fieldtype": "Float", 
    "hidden": 0, 
@@ -337,6 +377,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Valuation Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -346,6 +387,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, 
@@ -356,6 +398,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "stock_value", 
    "fieldtype": "Float", 
    "hidden": 0, 
@@ -363,6 +406,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Stock Value", 
    "length": 0, 
    "no_copy": 0, 
@@ -372,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, 
@@ -382,13 +427,14 @@
  "hide_heading": 0, 
  "hide_toolbar": 1, 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 1, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-04-18 08:12:57.341517", 
+ "modified": "2016-11-27 16:31:55.929378", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Bin", 
@@ -404,6 +450,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -420,10 +467,32 @@
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
+   "email": 0, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "is_custom": 0, 
+   "permlevel": 0, 
+   "print": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Item Manager", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
+   "write": 0
+  }, 
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
    "email": 1, 
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -444,6 +513,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
diff --git a/erpnext/stock/doctype/bin/bin.py b/erpnext/stock/doctype/bin/bin.py
index 2378e3f..ece8220 100644
--- a/erpnext/stock/doctype/bin/bin.py
+++ b/erpnext/stock/doctype/bin/bin.py
@@ -14,18 +14,18 @@
 			self.stock_uom = frappe.db.get_value('Item', self.item_code, 'stock_uom')
 
 		self.validate_mandatory()
-
-		self.projected_qty = flt(self.actual_qty) + flt(self.ordered_qty) + \
-			flt(self.indented_qty) + flt(self.planned_qty) - flt(self.reserved_qty)
-		
+		self.set_projected_qty()
 		self.block_transactions_against_group_warehouse()
 
+	def on_update(self):
+		update_item_projected_qty(self.item_code)
+
 	def validate_mandatory(self):
 		qf = ['actual_qty', 'reserved_qty', 'ordered_qty', 'indented_qty']
 		for f in qf:
 			if (not getattr(self, f, None)) or (not self.get(f)):
 				self.set(f, 0.0)
-	
+
 	def block_transactions_against_group_warehouse(self):
 		from erpnext.stock.utils import is_group_warehouse
 		is_group_warehouse(self.warehouse)
@@ -72,9 +72,7 @@
 		self.indented_qty = flt(self.indented_qty) + flt(args.get("indented_qty"))
 		self.planned_qty = flt(self.planned_qty) + flt(args.get("planned_qty"))
 
-		self.set_projected_qty()
 		self.save()
-		update_item_projected_qty(self.item_code)
 
 	def set_projected_qty(self):
 		self.projected_qty = (flt(self.actual_qty) + flt(self.ordered_qty)
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.js b/erpnext/stock/doctype/delivery_note/delivery_note.js
index ec2da53..204e98a 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.js
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.js
@@ -6,16 +6,24 @@
 frappe.provide("erpnext.stock");
 frappe.provide("erpnext.stock.delivery_note");
 
-frappe.ui.form.on('Delivery Note', 'onload', function(frm) {
-	frm.set_indicator_formatter('item_code',
-		function(doc) {
-			return (doc.docstatus==1 || doc.qty<=doc.actual_qty) ? "green" : "orange"
+frappe.ui.form.on("Delivery Note", {
+	setup: function(frm) {
+		frm.set_indicator_formatter('item_code',
+			function(doc) {
+				return (doc.docstatus==1 || doc.qty<=doc.actual_qty) ? "green" : "orange"
+			})
+
+		frm.set_query("warehouse", "items", function() {
+			return {
+				filters: [
+					["Warehouse", "company", "in", ["", cstr(frm.doc.company)]],
+					["Warehouse", "is_group", "=", 0]
+				]
+			}
 		})
 
-	erpnext.queries.setup_queries(frm, "Warehouse", function() {
-		return erpnext.queries.warehouse(frm.doc);
-	});
-})
+	}
+});
 
 erpnext.stock.DeliveryNoteController = erpnext.selling.SellingController.extend({
 	refresh: function(doc, dt, dn) {
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.json b/erpnext/stock/doctype/delivery_note/delivery_note.json
index 1ab1abe..e1aa16d 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.json
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.json
@@ -23,14 +23,16 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Delivery To", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "icon-user", 
+   "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, 
@@ -49,6 +51,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
@@ -57,6 +60,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "50%", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -77,6 +81,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Title", 
    "length": 0, 
    "no_copy": 1, 
@@ -85,6 +90,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, 
@@ -103,6 +109,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Series", 
    "length": 0, 
    "no_copy": 1, 
@@ -113,6 +120,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, 
@@ -131,6 +139,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Customer", 
    "length": 0, 
    "no_copy": 0, 
@@ -141,6 +150,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, 
@@ -160,6 +170,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -167,6 +178,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, 
@@ -185,6 +197,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
@@ -192,6 +205,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,6 +224,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amended From", 
    "length": 0, 
    "no_copy": 1, 
@@ -221,6 +236,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, 
@@ -241,6 +257,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -252,6 +269,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 0, 
+   "remember_last_selected_value": 1, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 1, 
@@ -272,6 +290,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Date", 
    "length": 0, 
    "no_copy": 1, 
@@ -282,6 +301,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": 1, 
@@ -301,6 +321,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer's Purchase Order No", 
    "length": 0, 
    "no_copy": 0, 
@@ -311,6 +332,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, 
@@ -331,6 +353,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer's Purchase Order Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -341,6 +364,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, 
@@ -360,14 +384,16 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Is Return", 
    "length": 0, 
-   "no_copy": 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, 
@@ -387,15 +413,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Return Against Delivery Note", 
    "length": 0, 
-   "no_copy": 0, 
+   "no_copy": 1, 
    "options": "Delivery Note", 
    "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, 
@@ -415,14 +443,16 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Address and Contact", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "icon-bullhorn", 
+   "options": "fa fa-bullhorn", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -441,6 +471,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Shipping Address", 
    "length": 0, 
    "no_copy": 0, 
@@ -449,6 +480,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, 
@@ -467,6 +499,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Shipping Address", 
    "length": 0, 
    "no_copy": 0, 
@@ -474,6 +507,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, 
@@ -492,6 +526,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Contact Person", 
    "length": 0, 
    "no_copy": 0, 
@@ -500,6 +535,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, 
@@ -518,6 +554,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Contact", 
    "length": 0, 
    "no_copy": 0, 
@@ -525,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, 
@@ -543,6 +581,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Mobile No", 
    "length": 0, 
    "no_copy": 0, 
@@ -550,6 +589,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, 
@@ -568,6 +608,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Contact Email", 
    "length": 0, 
    "no_copy": 0, 
@@ -576,6 +617,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,6 +636,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -601,6 +644,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "50%", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -621,6 +665,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Billing Address Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -629,6 +674,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, 
@@ -647,6 +693,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Billing Address", 
    "length": 0, 
    "no_copy": 0, 
@@ -654,6 +701,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, 
@@ -673,6 +721,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer Group", 
    "length": 0, 
    "no_copy": 0, 
@@ -681,6 +730,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, 
@@ -700,6 +750,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Territory", 
    "length": 0, 
    "no_copy": 0, 
@@ -708,6 +759,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, 
@@ -726,14 +778,16 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Currency and Price List", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "icon-tag", 
+   "options": "fa fa-tag", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -752,6 +806,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Currency", 
    "length": 0, 
    "no_copy": 0, 
@@ -762,6 +817,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, 
@@ -781,6 +837,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Exchange Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -791,6 +848,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, 
@@ -809,12 +867,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, 
@@ -833,6 +893,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Price List", 
    "length": 0, 
    "no_copy": 0, 
@@ -843,6 +904,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, 
@@ -861,6 +923,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Price List Currency", 
    "length": 0, 
    "no_copy": 0, 
@@ -869,6 +932,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, 
@@ -888,6 +952,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Price List Exchange Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -896,6 +961,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, 
@@ -914,6 +980,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Ignore Pricing Rule", 
    "length": 0, 
    "no_copy": 1, 
@@ -921,6 +988,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, 
@@ -939,15 +1007,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-shopping-cart", 
+   "options": "fa fa-shopping-cart", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -966,6 +1036,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Items", 
    "length": 0, 
    "no_copy": 0, 
@@ -976,6 +1047,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, 
@@ -995,15 +1067,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Packing List", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-suitcase", 
+   "options": "fa fa-suitcase", 
    "permlevel": 0, 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1022,6 +1096,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Packed Items", 
    "length": 0, 
    "no_copy": 0, 
@@ -1032,6 +1107,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, 
@@ -1050,6 +1126,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Product Bundle Help", 
    "length": 0, 
    "no_copy": 0, 
@@ -1057,6 +1134,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, 
@@ -1075,12 +1153,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, 
@@ -1099,6 +1179,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -1108,6 +1189,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, 
@@ -1126,6 +1208,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Net Total (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -1137,6 +1220,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, 
@@ -1156,12 +1240,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, 
@@ -1180,6 +1266,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total", 
    "length": 0, 
    "no_copy": 0, 
@@ -1189,6 +1276,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, 
@@ -1207,6 +1295,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Net Total", 
    "length": 0, 
    "no_copy": 0, 
@@ -1215,6 +1304,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, 
@@ -1233,15 +1323,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Taxes and Charges", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-money", 
+   "options": "fa fa-money", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1261,6 +1353,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Taxes and Charges", 
    "length": 0, 
    "no_copy": 0, 
@@ -1271,6 +1364,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, 
@@ -1289,12 +1383,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, 
@@ -1313,6 +1409,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Shipping Rule", 
    "length": 0, 
    "no_copy": 0, 
@@ -1322,6 +1419,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, 
@@ -1340,12 +1438,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, 
@@ -1364,6 +1464,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Sales Taxes and Charges", 
    "length": 0, 
    "no_copy": 0, 
@@ -1374,6 +1475,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, 
@@ -1392,6 +1494,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Taxes and Charges Calculation", 
    "length": 0, 
    "no_copy": 0, 
@@ -1400,6 +1503,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, 
@@ -1418,12 +1522,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, 
@@ -1442,6 +1548,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Taxes and Charges (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -1453,6 +1560,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, 
@@ -1472,6 +1580,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -1479,6 +1588,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, 
@@ -1497,6 +1607,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Taxes and Charges", 
    "length": 0, 
    "no_copy": 0, 
@@ -1505,6 +1616,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, 
@@ -1524,6 +1636,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Additional Discount", 
    "length": 0, 
    "no_copy": 0, 
@@ -1532,6 +1645,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, 
@@ -1551,6 +1665,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Apply Additional Discount On", 
    "length": 0, 
    "no_copy": 0, 
@@ -1560,6 +1675,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, 
@@ -1578,6 +1694,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Additional Discount Amount (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -1587,6 +1704,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, 
@@ -1605,12 +1723,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, 
@@ -1629,6 +1749,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Additional Discount Percentage", 
    "length": 0, 
    "no_copy": 0, 
@@ -1637,6 +1758,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, 
@@ -1655,6 +1777,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Additional Discount Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -1663,6 +1786,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, 
@@ -1681,15 +1805,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-money", 
+   "options": "fa fa-money", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1708,6 +1834,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Grand Total (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -1719,6 +1846,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, 
@@ -1738,6 +1866,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Rounded Total (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -1749,6 +1878,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, 
@@ -1769,6 +1899,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "In Words (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -1779,6 +1910,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, 
@@ -1798,6 +1930,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
@@ -1805,6 +1938,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, 
@@ -1823,6 +1957,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Grand Total", 
    "length": 0, 
    "no_copy": 0, 
@@ -1834,6 +1969,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, 
@@ -1853,6 +1989,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Rounded Total", 
    "length": 0, 
    "no_copy": 0, 
@@ -1864,6 +2001,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, 
@@ -1884,6 +2022,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "In Words", 
    "length": 0, 
    "no_copy": 0, 
@@ -1894,6 +2033,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, 
@@ -1914,15 +2054,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Terms and Conditions", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-legal", 
+   "options": "fa fa-legal", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1941,6 +2083,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Terms", 
    "length": 0, 
    "no_copy": 0, 
@@ -1951,6 +2094,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, 
@@ -1969,6 +2113,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Terms and Conditions Details", 
    "length": 0, 
    "no_copy": 0, 
@@ -1978,6 +2123,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, 
@@ -1997,14 +2143,16 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Transporter Info", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "icon-truck", 
+   "options": "fa fa-truck", 
    "permlevel": 0, 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -2023,6 +2171,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Transporter Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -2033,6 +2182,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, 
@@ -2052,6 +2202,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -2059,6 +2210,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "50%", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -2079,6 +2231,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Vehicle No", 
    "length": 0, 
    "no_copy": 0, 
@@ -2089,6 +2242,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, 
@@ -2110,6 +2264,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Vehicle Dispatch Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -2120,6 +2275,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, 
@@ -2139,15 +2295,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "More Information", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-file-text", 
+   "options": "fa fa-file-text", 
    "permlevel": 0, 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -2167,6 +2325,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Project", 
    "length": 0, 
    "no_copy": 0, 
@@ -2177,6 +2336,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, 
@@ -2196,6 +2356,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Campaign", 
    "length": 0, 
    "no_copy": 0, 
@@ -2206,6 +2367,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, 
@@ -2224,6 +2386,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Source", 
    "length": 0, 
    "no_copy": 0, 
@@ -2234,6 +2397,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, 
@@ -2252,6 +2416,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
@@ -2260,6 +2425,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "50%", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -2280,6 +2446,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Posting Time", 
    "length": 0, 
    "no_copy": 0, 
@@ -2290,6 +2457,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, 
@@ -2309,6 +2477,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "% Amount Billed", 
    "length": 0, 
    "no_copy": 1, 
@@ -2317,6 +2486,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, 
@@ -2335,6 +2505,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Printing Details", 
    "length": 0, 
    "no_copy": 0, 
@@ -2343,6 +2514,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, 
@@ -2361,6 +2533,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Letter Head", 
    "length": 0, 
    "no_copy": 0, 
@@ -2371,6 +2544,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, 
@@ -2389,6 +2563,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Print Heading", 
    "length": 0, 
    "no_copy": 1, 
@@ -2399,6 +2574,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, 
@@ -2417,6 +2593,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Print Language", 
    "length": 0, 
    "no_copy": 0, 
@@ -2425,6 +2602,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, 
@@ -2443,6 +2621,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -2450,6 +2629,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, 
@@ -2468,6 +2648,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Print Without Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -2477,6 +2658,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, 
@@ -2495,6 +2677,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Status", 
    "length": 0, 
    "no_copy": 0, 
@@ -2502,6 +2685,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, 
@@ -2521,6 +2705,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Status", 
    "length": 0, 
    "no_copy": 1, 
@@ -2532,6 +2717,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 1, 
@@ -2553,6 +2739,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "% Installed", 
    "length": 0, 
    "no_copy": 1, 
@@ -2562,6 +2749,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, 
@@ -2580,6 +2768,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Installation Status", 
    "length": 0, 
    "no_copy": 0, 
@@ -2587,6 +2776,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, 
@@ -2605,12 +2795,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, 
@@ -2630,6 +2822,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "To Warehouse", 
    "length": 0, 
    "no_copy": 1, 
@@ -2640,6 +2833,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, 
@@ -2658,6 +2852,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Excise Page Number", 
    "length": 0, 
    "no_copy": 0, 
@@ -2667,6 +2862,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, 
@@ -2685,6 +2881,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Instructions", 
    "length": 0, 
    "no_copy": 0, 
@@ -2694,6 +2891,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, 
@@ -2713,15 +2911,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Commission", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-group", 
+   "options": "fa fa-group", 
    "permlevel": 0, 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -2740,6 +2940,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Sales Partner", 
    "length": 0, 
    "no_copy": 0, 
@@ -2751,6 +2952,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, 
@@ -2770,6 +2972,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -2777,6 +2980,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "50%", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -2796,6 +3000,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Commission Rate (%)", 
    "length": 0, 
    "no_copy": 0, 
@@ -2806,6 +3011,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, 
@@ -2825,6 +3031,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Commission", 
    "length": 0, 
    "no_copy": 0, 
@@ -2835,6 +3042,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, 
@@ -2854,6 +3062,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Sales Team", 
    "length": 0, 
    "no_copy": 0, 
@@ -2861,6 +3070,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, 
@@ -2879,6 +3089,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Sales Team1", 
    "length": 0, 
    "no_copy": 0, 
@@ -2889,6 +3100,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, 
@@ -2898,7 +3110,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-truck", 
+ "icon": "fa fa-truck", 
  "idx": 146, 
  "image_view": 0, 
  "in_create": 0, 
@@ -2908,7 +3120,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-09-16 05:55:36.487662", 
+ "modified": "2016-11-07 05:52:12.783914", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Delivery Note", 
@@ -2924,6 +3136,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -2944,6 +3157,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -2964,6 +3178,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -2984,6 +3199,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -3004,6 +3220,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 1, 
    "print": 0, 
    "read": 1, 
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note_dashboard.py b/erpnext/stock/doctype/delivery_note/delivery_note_dashboard.py
index c2b54f8..c296d8c 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note_dashboard.py
+++ b/erpnext/stock/doctype/delivery_note/delivery_note_dashboard.py
@@ -1,26 +1,27 @@
 from frappe import _
 
-data = {
-	'fieldname': 'delivery_note_no',
-	'non_standard_fieldnames': {
-		'Sales Invoice': 'delivery_note',
-		'Packing Slip': 'delivery_note',
-	},
-	'internal_links': {
-		'Sales Order': ['items', 'against_sales_order'],
-	},
-	'transactions': [
-		{
-			'label': _('Related'),
-			'items': ['Sales Invoice', 'Packing Slip']
+def get_data():
+	return {
+		'fieldname': 'delivery_note',
+		'non_standard_fieldnames': {
+			'Stock Entry': 'delivery_note_no',
+			'Quality Inspection': 'reference_name'
 		},
-		{
-			'label': _('Reference'),
-			'items': ['Sales Order', 'Quality Inspection']
+		'internal_links': {
+			'Sales Order': ['items', 'against_sales_order'],
 		},
-		{
-			'label': _('Returns'),
-			'items': ['Stock Entry']
-		},
-	]
-}
\ No newline at end of file
+		'transactions': [
+			{
+				'label': _('Related'),
+				'items': ['Sales Invoice', 'Packing Slip']
+			},
+			{
+				'label': _('Reference'),
+				'items': ['Sales Order', 'Quality Inspection']
+			},
+			{
+				'label': _('Returns'),
+				'items': ['Stock Entry']
+			},
+		]
+	}
\ No newline at end of file
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 b40be5e..1cb0fcd 100644
--- a/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
+++ b/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
@@ -10,11 +10,13 @@
  "doctype": "DocType", 
  "document_type": "Document", 
  "editable_grid": 1, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "barcode", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -22,6 +24,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Barcode", 
    "length": 0, 
    "no_copy": 0, 
@@ -29,6 +32,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, 
@@ -39,6 +43,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "item_code", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -46,6 +51,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Item Code", 
    "length": 0, 
    "no_copy": 0, 
@@ -57,6 +63,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, 
@@ -68,6 +75,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "item_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -75,6 +83,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Item Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -85,6 +94,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, 
@@ -96,6 +106,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "col_break1", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -103,12 +114,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, 
@@ -119,6 +132,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "customer_item_code", 
    "fieldtype": "Data", 
    "hidden": 1, 
@@ -126,6 +140,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer's Item Code", 
    "length": 0, 
    "no_copy": 0, 
@@ -133,6 +148,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, 
@@ -143,6 +159,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
+   "columns": 0, 
    "fieldname": "section_break_6", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -150,6 +167,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Description", 
    "length": 0, 
    "no_copy": 0, 
@@ -158,6 +176,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,6 +187,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "description", 
    "fieldtype": "Text Editor", 
    "hidden": 0, 
@@ -175,6 +195,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Description", 
    "length": 0, 
    "no_copy": 0, 
@@ -185,6 +206,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, 
@@ -196,6 +218,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_8", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -203,6 +226,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -210,6 +234,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,6 +245,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "image", 
    "fieldtype": "Attach", 
    "hidden": 1, 
@@ -227,6 +253,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Image", 
    "length": 0, 
    "no_copy": 0, 
@@ -235,6 +262,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, 
@@ -245,6 +273,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "image_view", 
    "fieldtype": "Image", 
    "hidden": 0, 
@@ -252,6 +281,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Image View", 
    "length": 0, 
    "no_copy": 0, 
@@ -261,6 +291,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, 
@@ -271,6 +302,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "quantity_and_rate", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -278,6 +310,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Quantity and Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -285,6 +318,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 +329,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "qty", 
    "fieldtype": "Float", 
    "hidden": 0, 
@@ -302,6 +337,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Quantity", 
    "length": 0, 
    "no_copy": 0, 
@@ -312,6 +348,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, 
@@ -323,6 +360,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "price_list_rate", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -330,6 +368,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Price List Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -341,6 +380,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, 
@@ -352,6 +392,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "col_break2", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -359,12 +400,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, 
@@ -375,6 +418,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "stock_uom", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -382,6 +426,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "UOM", 
    "length": 0, 
    "no_copy": 0, 
@@ -393,6 +438,7 @@
    "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, 
@@ -404,6 +450,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "base_price_list_rate", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -411,6 +458,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Price List Rate (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -422,6 +470,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, 
@@ -433,6 +482,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
+   "columns": 0, 
    "fieldname": "discount_and_margin", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -440,6 +490,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Discount and Margin", 
    "length": 0, 
    "no_copy": 0, 
@@ -448,6 +499,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 +510,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "price_list_rate", 
    "fieldname": "discount_percentage", 
    "fieldtype": "Float", 
@@ -466,6 +519,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Discount on Price List Rate (%)", 
    "length": 0, 
    "no_copy": 0, 
@@ -476,6 +530,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,6 +542,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_19", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -494,6 +550,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -501,6 +558,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, 
@@ -511,6 +569,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "price_list_rate", 
    "fieldname": "margin_type", 
    "fieldtype": "Select", 
@@ -519,6 +578,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Margin Type", 
    "length": 0, 
    "no_copy": 0, 
@@ -528,6 +588,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, 
@@ -538,6 +599,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.margin_type && doc.price_list_rate", 
    "fieldname": "margin_rate_or_amount", 
    "fieldtype": "Float", 
@@ -546,6 +608,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Margin Rate or Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -554,6 +617,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, 
@@ -564,14 +628,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.margin_type && doc.price_list_rate", 
    "fieldname": "total_margin", 
-   "fieldtype": "Float", 
+   "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 Margin", 
    "length": 0, 
    "no_copy": 0, 
@@ -580,6 +646,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, 
@@ -590,6 +657,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_1", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -597,12 +665,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, 
@@ -613,6 +683,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "rate", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -620,6 +691,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -631,6 +703,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, 
@@ -642,6 +715,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "amount", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -649,6 +723,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -660,6 +735,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, 
@@ -671,6 +747,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "col_break3", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -678,12 +755,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, 
@@ -694,6 +773,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "base_rate", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -701,6 +781,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Rate (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -712,6 +793,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, 
@@ -723,6 +805,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "base_amount", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -730,6 +813,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amount (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -741,6 +825,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, 
@@ -752,6 +837,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "pricing_rule", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -759,6 +845,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Pricing Rule", 
    "length": 0, 
    "no_copy": 0, 
@@ -767,6 +854,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, 
@@ -777,6 +865,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_25", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -784,6 +873,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -791,6 +881,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, 
@@ -801,6 +892,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "net_rate", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -808,6 +900,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Net Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -817,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, 
@@ -827,6 +921,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "net_amount", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -834,6 +929,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Net Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -843,6 +939,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, 
@@ -853,6 +950,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_28", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -860,6 +958,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -867,6 +966,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, 
@@ -877,6 +977,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "base_net_rate", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -884,6 +985,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Net Rate (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -893,6 +995,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, 
@@ -903,6 +1006,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "base_net_amount", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -910,6 +1014,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Net Amount (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -919,6 +1024,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, 
@@ -929,6 +1035,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "warehouse_and_reference", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -936,6 +1043,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Warehouse and Reference", 
    "length": 0, 
    "no_copy": 0, 
@@ -943,6 +1051,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, 
@@ -953,6 +1062,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "warehouse", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -960,6 +1070,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "From Warehouse", 
    "length": 0, 
    "no_copy": 0, 
@@ -971,6 +1082,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, 
@@ -982,6 +1094,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "", 
    "description": "", 
    "fieldname": "target_warehouse", 
@@ -991,6 +1104,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer Warehouse (Optional)", 
    "length": 0, 
    "no_copy": 1, 
@@ -1000,6 +1114,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, 
@@ -1010,6 +1125,64 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:!doc.__islocal", 
+   "fieldname": "quality_inspection", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Quality Inspection", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Quality Inspection", 
+   "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": "section_break_40", 
+   "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": "serial_no", 
    "fieldtype": "Text", 
    "hidden": 0, 
@@ -1017,6 +1190,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Serial No", 
    "length": 0, 
    "no_copy": 1, 
@@ -1026,6 +1200,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, 
@@ -1036,6 +1211,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "batch_no", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -1043,6 +1219,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Batch No", 
    "length": 0, 
    "no_copy": 0, 
@@ -1053,6 +1230,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, 
@@ -1063,6 +1241,7 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "actual_qty", 
    "fieldtype": "Float", 
    "hidden": 0, 
@@ -1070,6 +1249,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Available Qty at From Warehouse", 
    "length": 0, 
    "no_copy": 1, 
@@ -1080,6 +1260,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, 
@@ -1091,6 +1272,7 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "batch_no", 
    "fieldname": "actual_batch_qty", 
    "fieldtype": "Float", 
@@ -1099,6 +1281,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Available Batch Qty at From Warehouse", 
    "length": 0, 
    "no_copy": 1, 
@@ -1108,6 +1291,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, 
@@ -1119,6 +1303,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "", 
    "fieldname": "item_group", 
    "fieldtype": "Link", 
@@ -1127,6 +1312,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Item Group", 
    "length": 0, 
    "no_copy": 0, 
@@ -1137,6 +1323,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, 
@@ -1147,6 +1334,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "brand", 
    "fieldtype": "Link", 
    "hidden": 1, 
@@ -1154,6 +1342,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Brand Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -1165,6 +1354,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, 
@@ -1176,6 +1366,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "item_tax_rate", 
    "fieldtype": "Small Text", 
    "hidden": 1, 
@@ -1183,6 +1374,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Item Tax Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -1192,6 +1384,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, 
@@ -1202,6 +1395,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "col_break4", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -1209,12 +1403,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, 
@@ -1225,6 +1421,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "expense_account", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -1232,6 +1429,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Expense Account", 
    "length": 0, 
    "no_copy": 1, 
@@ -1240,6 +1438,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, 
@@ -1251,6 +1450,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": ":Company", 
    "fieldname": "cost_center", 
    "fieldtype": "Link", 
@@ -1259,6 +1459,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Cost Center", 
    "length": 0, 
    "no_copy": 1, 
@@ -1267,6 +1468,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, 
@@ -1278,6 +1480,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "against_sales_order", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -1285,14 +1488,16 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Against Sales Order", 
    "length": 0, 
-   "no_copy": 0, 
+   "no_copy": 1, 
    "options": "Sales Order", 
    "permlevel": 0, 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1303,6 +1508,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "against_sales_invoice", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -1310,14 +1516,16 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Against Sales Invoice", 
    "length": 0, 
-   "no_copy": 0, 
+   "no_copy": 1, 
    "options": "Sales Invoice", 
    "permlevel": 0, 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1328,6 +1536,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "so_detail", 
    "fieldtype": "Data", 
    "hidden": 1, 
@@ -1335,6 +1544,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Against Sales Order Item", 
    "length": 0, 
    "no_copy": 1, 
@@ -1345,6 +1555,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, 
@@ -1356,6 +1567,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "si_detail", 
    "fieldtype": "Data", 
    "hidden": 1, 
@@ -1363,6 +1575,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Against Sales Invoice Item", 
    "length": 0, 
    "no_copy": 1, 
@@ -1371,6 +1584,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, 
@@ -1381,6 +1595,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "installed_qty", 
    "fieldtype": "Float", 
    "hidden": 0, 
@@ -1388,6 +1603,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Installed Qty", 
    "length": 0, 
    "no_copy": 1, 
@@ -1398,6 +1614,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, 
@@ -1409,6 +1626,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "billed_amt", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -1416,6 +1634,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Billed Amt", 
    "length": 0, 
    "no_copy": 1, 
@@ -1425,6 +1644,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, 
@@ -1435,6 +1655,7 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "page_break", 
    "fieldtype": "Check", 
    "hidden": 0, 
@@ -1442,6 +1663,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Page Break", 
    "length": 0, 
    "no_copy": 0, 
@@ -1451,6 +1673,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, 
@@ -1468,7 +1691,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-07-11 03:27:59.254550", 
+ "modified": "2016-11-23 12:33:37.728117", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Delivery Note Item", 
diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json
index 18fdad7..bad8416 100644
--- a/erpnext/stock/doctype/item/item.json
+++ b/erpnext/stock/doctype/item/item.json
@@ -1,2565 +1,2869 @@
 {
- "allow_copy": 0, 
- "allow_import": 1, 
- "allow_rename": 1, 
- "autoname": "field:item_code", 
- "beta": 0, 
- "creation": "2013-05-03 10:45:46", 
- "custom": 0, 
- "default_print_format": "Standard", 
- "description": "A Product or a Service that is bought, sold or kept in stock.", 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Setup", 
- "editable_grid": 1, 
+ "allow_copy": 0,
+ "allow_import": 1,
+ "allow_rename": 1,
+ "autoname": "field:item_code",
+ "beta": 0,
+ "creation": "2013-05-03 10:45:46",
+ "custom": 0,
+ "default_print_format": "Standard",
+ "description": "A Product or a Service that is bought, sold or kept in stock.",
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Setup",
+ "editable_grid": 1,
+ "engine": "InnoDB",
  "fields": [
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "name_and_description_section", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldtype": "Section Break", 
-   "options": "icon-flag", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "name_and_description_section",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldtype": "Section Break",
+   "options": "fa fa-flag",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "naming_series", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Series", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "ITEM-", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "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_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Series",
+   "length": 0,
+   "no_copy": 0,
+   "options": "ITEM-",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 1, 
-   "collapsible": 0, 
-   "description": "", 
-   "fieldname": "item_code", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Item Code", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "item_code", 
-   "oldfieldtype": "Data", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 1,
+   "collapsible": 0,
+   "columns": 0,
+   "description": "",
+   "fieldname": "item_code",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Item Code",
+   "length": 0,
+   "no_copy": 1,
+   "oldfieldname": "item_code",
+   "oldfieldtype": "Data",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "variant_of", 
-   "description": "If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified", 
-   "fieldname": "variant_of", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Variant Of", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Item", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "variant_of",
+   "description": "If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified",
+   "fieldname": "variant_of",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 1,
+   "label": "Variant Of",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Item",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "item_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "label": "Item Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "item_name", 
-   "oldfieldtype": "Data", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 1, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "item_name",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 1,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Item Name",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "item_name",
+   "oldfieldtype": "Data",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 1,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "barcode", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Barcode", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "barcode",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Barcode",
+   "length": 0,
+   "no_copy": 1,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "description": "", 
-   "fieldname": "item_group", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 1, 
-   "in_list_view": 1, 
-   "label": "Item Group", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "item_group", 
-   "oldfieldtype": "Link", 
-   "options": "Item Group", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "description": "",
+   "fieldname": "item_group",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 1,
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Item Group",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "item_group",
+   "oldfieldtype": "Link",
+   "options": "Item Group",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "description": "", 
-   "fieldname": "stock_uom", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 1, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Default Unit of Measure", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "stock_uom", 
-   "oldfieldtype": "Link", 
-   "options": "UOM", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "description": "",
+   "fieldname": "stock_uom",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 1,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Default Unit of Measure",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "stock_uom",
+   "oldfieldtype": "Link",
+   "options": "UOM",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "column_break0", 
-   "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, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 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
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "disabled", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Disabled", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "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_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Disabled",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "default": "1", 
-   "description": "", 
-   "fieldname": "is_stock_item", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Maintain Stock", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "is_stock_item", 
-   "oldfieldtype": "Select", 
-   "options": "", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "1",
+   "description": "",
+   "fieldname": "is_stock_item",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Maintain Stock",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "is_stock_item",
+   "oldfieldtype": "Select",
+   "options": "",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 1, 
-   "collapsible": 0, 
-   "depends_on": "eval:(doc.__islocal&&doc.is_stock_item && !doc.has_serial_no && !doc.has_batch_no)", 
-   "fieldname": "opening_stock", 
-   "fieldtype": "Int", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Opening Stock", 
-   "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, 
+   "allow_on_submit": 0,
+   "bold": 1,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "eval:(doc.__islocal&&doc.is_stock_item && !doc.has_serial_no && !doc.has_batch_no)",
+   "fieldname": "opening_stock",
+   "fieldtype": "Int",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Opening Stock",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "eval:(doc.__islocal && doc.is_stock_item && !doc.has_serial_no && !doc.has_batch_no && doc.opening_stock)", 
-   "fieldname": "valuation_rate", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Valuation Rate", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "eval:(doc.__islocal && doc.is_stock_item && !doc.has_serial_no && !doc.has_batch_no && doc.opening_stock)",
+   "fieldname": "valuation_rate",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Valuation Rate",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 1, 
-   "collapsible": 0, 
-   "fieldname": "standard_rate", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Standard Selling Rate", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 1,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "standard_rate",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Standard Selling Rate",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "is_fixed_asset", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Is Fixed Asset", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "is_fixed_asset",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Is Fixed Asset",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "is_fixed_asset", 
-   "fieldname": "asset_category", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Asset Category", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Asset Category", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "is_fixed_asset",
+   "fieldname": "asset_category",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Asset Category",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Asset Category",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 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, 
-   "options": "image", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "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,
+   "options": "image",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "fieldname": "section_break_11", 
-   "fieldtype": "Section Break", 
-   "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": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 1,
+   "columns": 0,
+   "fieldname": "section_break_11",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Description",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "brand", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Brand", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "brand", 
-   "oldfieldtype": "Link", 
-   "options": "Brand", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "brand",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Brand",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "brand",
+   "oldfieldtype": "Link",
+   "options": "Brand",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_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, 
-   "oldfieldname": "description", 
-   "oldfieldtype": "Text", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "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_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Description",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "description",
+   "oldfieldtype": "Text",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "collapsible_depends_on": "is_stock_item", 
-   "depends_on": "is_stock_item", 
-   "fieldname": "inventory", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Inventory", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldtype": "Section Break", 
-   "options": "icon-truck", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 1,
+   "collapsible_depends_on": "is_stock_item",
+   "columns": 0,
+   "depends_on": "is_stock_item",
+   "fieldname": "inventory",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Inventory",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldtype": "Section Break",
+   "options": "fa fa-truck",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "is_stock_item", 
-   "description": "", 
-   "fieldname": "default_warehouse", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 1, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Default Warehouse", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "default_warehouse", 
-   "oldfieldtype": "Link", 
-   "options": "Warehouse", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "is_stock_item",
+   "description": "",
+   "fieldname": "default_warehouse",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 1,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Default Warehouse",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "default_warehouse",
+   "oldfieldtype": "Link",
+   "options": "Warehouse",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "default": "2099-12-31", 
-   "depends_on": "is_stock_item", 
-   "fieldname": "end_of_life", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "End of Life", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "end_of_life", 
-   "oldfieldtype": "Date", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "2099-12-31",
+   "depends_on": "is_stock_item",
+   "fieldname": "end_of_life",
+   "fieldtype": "Date",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "End of Life",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "end_of_life",
+   "oldfieldtype": "Date",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "default": "", 
-   "depends_on": "eval:doc.is_stock_item", 
-   "fieldname": "has_batch_no", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Has Batch No", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "has_batch_no", 
-   "oldfieldtype": "Select", 
-   "options": "", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "",
+   "depends_on": "eval:doc.is_stock_item",
+   "fieldname": "has_batch_no",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Has Batch No",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "has_batch_no",
+   "oldfieldtype": "Select",
+   "options": "",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "default": "", 
-   "depends_on": "eval:doc.is_stock_item", 
-   "description": "Selecting \"Yes\" will give a unique identity to each entity of this item which can be viewed in the Serial No master.", 
-   "fieldname": "has_serial_no", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "label": "Has Serial No", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "has_serial_no", 
-   "oldfieldtype": "Select", 
-   "options": "", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "",
+   "depends_on": "eval:doc.is_stock_item",
+   "description": "Selecting \"Yes\" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",
+   "fieldname": "has_serial_no",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 1,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Has Serial No",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "has_serial_no",
+   "oldfieldtype": "Select",
+   "options": "",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "has_serial_no", 
-   "description": "Example: ABCD.#####\nIf series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.", 
-   "fieldname": "serial_no_series", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Serial Number Series", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "has_serial_no",
+   "description": "Example: ABCD.#####\nIf series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.",
+   "fieldname": "serial_no_series",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Serial Number Series",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "default": "Purchase", 
-   "fieldname": "default_material_request_type", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Default Material Request Type", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Purchase\nMaterial Transfer\nMaterial Issue\nManufacture", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "Purchase",
+   "fieldname": "default_material_request_type",
+   "fieldtype": "Select",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Default Material Request Type",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Purchase\nMaterial Transfer\nMaterial Issue\nManufacture",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "is_stock_item", 
-   "fieldname": "column_break1", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldtype": "Column Break", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "is_stock_item",
+   "fieldname": "column_break1",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_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, 
-   "depends_on": "is_stock_item", 
-   "description": "", 
-   "fieldname": "tolerance", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Allow over delivery or receipt upto this percent", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "tolerance", 
-   "oldfieldtype": "Currency", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "is_stock_item",
+   "description": "",
+   "fieldname": "tolerance",
+   "fieldtype": "Float",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Allow over delivery or receipt upto this percent",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "tolerance",
+   "oldfieldtype": "Currency",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "is_stock_item", 
-   "fieldname": "valuation_method", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Valuation Method", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "\nFIFO\nMoving Average", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "is_stock_item",
+   "fieldname": "valuation_method",
+   "fieldtype": "Select",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Valuation Method",
+   "length": 0,
+   "no_copy": 0,
+   "options": "\nFIFO\nMoving Average",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "eval:doc.is_stock_item", 
-   "fieldname": "warranty_period", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Warranty Period (in days)", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "warranty_period", 
-   "oldfieldtype": "Data", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "eval:doc.is_stock_item",
+   "fieldname": "warranty_period",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Warranty Period (in days)",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "warranty_period",
+   "oldfieldtype": "Data",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "is_stock_item", 
-   "description": "", 
-   "fieldname": "net_weight", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Net Weight", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "is_stock_item",
+   "description": "",
+   "fieldname": "net_weight",
+   "fieldtype": "Float",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Net Weight",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "eval:doc.is_stock_item", 
-   "fieldname": "weight_uom", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 1, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Weight UOM", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "UOM", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "eval:doc.is_stock_item",
+   "fieldname": "weight_uom",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 1,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Weight UOM",
+   "length": 0,
+   "no_copy": 0,
+   "options": "UOM",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "depends_on": "is_stock_item", 
-   "description": "", 
-   "fieldname": "reorder_section", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Auto re-order", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "icon-rss", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 1,
+   "columns": 0,
+   "depends_on": "is_stock_item",
+   "description": "",
+   "fieldname": "reorder_section",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Auto re-order",
+   "length": 0,
+   "no_copy": 0,
+   "options": "fa fa-rss",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "", 
-   "description": "Will also apply for variants unless overrridden", 
-   "fieldname": "reorder_levels", 
-   "fieldtype": "Table", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Reorder level based on Warehouse", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Item Reorder", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "",
+   "description": "Will also apply for variants unless overrridden",
+   "fieldname": "reorder_levels",
+   "fieldtype": "Table",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Reorder level based on Warehouse",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Item Reorder",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "collapsible_depends_on": "attributes", 
-   "depends_on": "", 
-   "fieldname": "variants_section", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Variants", 
-   "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, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 1,
+   "collapsible_depends_on": "attributes",
+   "columns": 0,
+   "depends_on": "",
+   "fieldname": "variants_section",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Variants",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "default": "0", 
-   "depends_on": "eval:!doc.variant_of", 
-   "description": "If this item has variants, then it cannot be selected in sales orders etc.", 
-   "fieldname": "has_variants", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Has Variants", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "0",
+   "depends_on": "eval:!doc.variant_of",
+   "description": "If this item has variants, then it cannot be selected in sales orders etc.",
+   "fieldname": "has_variants",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Has Variants",
+   "length": 0,
+   "no_copy": 1,
+   "options": "",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "", 
-   "fieldname": "attributes", 
-   "fieldtype": "Table", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Attributes", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Item Variant Attribute", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "",
+   "fieldname": "attributes",
+   "fieldtype": "Table",
+   "hidden": 1,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Attributes",
+   "length": 0,
+   "no_copy": 1,
+   "options": "Item Variant Attribute",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "fieldname": "purchase_details", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Purchase Details", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldtype": "Section Break", 
-   "options": "icon-shopping-cart", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 1,
+   "columns": 0,
+   "fieldname": "purchase_details",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Purchase Details",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldtype": "Section Break",
+   "options": "fa fa-shopping-cart",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "default": "1", 
-   "fieldname": "is_purchase_item", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Is Purchase Item", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "1",
+   "fieldname": "is_purchase_item",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Is Purchase Item",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "default": "0.00", 
-   "depends_on": "is_stock_item", 
-   "description": "", 
-   "fieldname": "min_order_qty", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Minimum Order Qty", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "min_order_qty", 
-   "oldfieldtype": "Currency", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "0.00",
+   "depends_on": "is_stock_item",
+   "description": "",
+   "fieldname": "min_order_qty",
+   "fieldtype": "Float",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Minimum Order Qty",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "min_order_qty",
+   "oldfieldtype": "Currency",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "safety_stock", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Safety Stock", 
-   "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, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "safety_stock",
+   "fieldtype": "Float",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Safety Stock",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "", 
-   "description": "Average time taken by the supplier to deliver", 
-   "fieldname": "lead_time_days", 
-   "fieldtype": "Int", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Lead Time in days", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "lead_time_days", 
-   "oldfieldtype": "Int", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "",
+   "description": "Average time taken by the supplier to deliver",
+   "fieldname": "lead_time_days",
+   "fieldtype": "Int",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Lead Time in days",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "lead_time_days",
+   "oldfieldtype": "Int",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "", 
-   "description": "", 
-   "fieldname": "buying_cost_center", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 1, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Default Buying Cost Center", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "cost_center", 
-   "oldfieldtype": "Link", 
-   "options": "Cost Center", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "",
+   "description": "",
+   "fieldname": "buying_cost_center",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 1,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Default Buying Cost Center",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "cost_center",
+   "oldfieldtype": "Link",
+   "options": "Cost Center",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "", 
-   "description": "", 
-   "fieldname": "expense_account", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 1, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Default Expense Account", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "purchase_account", 
-   "oldfieldtype": "Link", 
-   "options": "Account", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "",
+   "description": "",
+   "fieldname": "expense_account",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 1,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Default Expense Account",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "purchase_account",
+   "oldfieldtype": "Link",
+   "options": "Account",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 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, 
-   "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, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "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, 
-   "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, 
-   "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, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 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, 
-   "depends_on": "", 
-   "fieldname": "last_purchase_rate", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Last Purchase Rate", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "last_purchase_rate", 
-   "oldfieldtype": "Currency", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 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_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Last Purchase Rate",
+   "length": 0,
+   "no_copy": 1,
+   "oldfieldname": "last_purchase_rate",
+   "oldfieldtype": "Currency",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "depends_on": "", 
-   "fieldname": "supplier_details", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Supplier Details", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 1,
+   "columns": 0,
+   "depends_on": "",
+   "fieldname": "supplier_details",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Supplier Details",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "", 
-   "fieldname": "default_supplier", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 1, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Default Supplier", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Supplier", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "",
+   "fieldname": "default_supplier",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 1,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Default Supplier",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Supplier",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "delivered_by_supplier", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Delivered by Supplier (Drop Ship)", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "delivered_by_supplier",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Delivered by Supplier (Drop Ship)",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "", 
-   "fieldname": "manufacturer", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Manufacturer", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Manufacturer", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "",
+   "fieldname": "manufacturer",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Manufacturer",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Manufacturer",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "", 
-   "fieldname": "manufacturer_part_no", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Manufacturer Part Number", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "",
+   "fieldname": "manufacturer_part_no",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Manufacturer Part Number",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "", 
-   "fieldname": "column_break2", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Item Code for Suppliers", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldtype": "Column Break", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "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": "column_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,
+   "label": "Item Code for Suppliers",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldtype": "Column Break",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0,
    "width": "50%"
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "", 
-   "fieldname": "supplier_items", 
-   "fieldtype": "Table", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Supplier Items", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Item Supplier", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "",
+   "fieldname": "supplier_items",
+   "fieldtype": "Table",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Supplier Items",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Item Supplier",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "fieldname": "sales_details", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Sales Details", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldtype": "Section Break", 
-   "options": "icon-tag", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 1,
+   "columns": 0,
+   "fieldname": "sales_details",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Sales Details",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldtype": "Section Break",
+   "options": "fa fa-tag",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "default": "1", 
-   "fieldname": "is_sales_item", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Is Sales Item", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "1",
+   "fieldname": "is_sales_item",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Is Sales Item",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "default": "0", 
-   "description": "Publish Item to hub.erpnext.com", 
-   "fieldname": "publish_in_hub", 
-   "fieldtype": "Check", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Publish in Hub", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "0",
+   "description": "Publish Item to hub.erpnext.com",
+   "fieldname": "publish_in_hub",
+   "fieldtype": "Check",
+   "hidden": 1,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Publish in Hub",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "default": "0", 
-   "fieldname": "synced_with_hub", 
-   "fieldtype": "Check", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Synced With Hub", 
-   "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, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "0",
+   "fieldname": "synced_with_hub",
+   "fieldtype": "Check",
+   "hidden": 1,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Synced With Hub",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "", 
-   "fieldname": "income_account", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 1, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Default Income Account", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Account", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "",
+   "fieldname": "income_account",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 1,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Default Income Account",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Account",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "", 
-   "fieldname": "selling_cost_center", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 1, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Default Selling Cost Center", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Cost Center", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "",
+   "fieldname": "selling_cost_center",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 1,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Default Selling Cost Center",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Cost Center",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "", 
-   "fieldname": "column_break3", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Customer Item Codes", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldtype": "Column Break", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "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": "column_break3",
+   "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": "Customer Item Codes",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldtype": "Column Break",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0,
    "width": "50%"
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "", 
-   "description": "", 
-   "fieldname": "customer_items", 
-   "fieldtype": "Table", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Customer Items", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Item Customer Detail", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "",
+   "description": "",
+   "fieldname": "customer_items",
+   "fieldtype": "Table",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Customer Items",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Item Customer Detail",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "", 
-   "fieldname": "max_discount", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Max Discount (%)", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "max_discount", 
-   "oldfieldtype": "Currency", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "",
+   "fieldname": "max_discount",
+   "fieldtype": "Float",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Max Discount (%)",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "max_discount",
+   "oldfieldtype": "Currency",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "fieldname": "item_tax_section_break", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Item Tax", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldtype": "Section Break", 
-   "options": "icon-money", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 1,
+   "columns": 0,
+   "fieldname": "item_tax_section_break",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Item Tax",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldtype": "Section Break",
+   "options": "fa fa-money",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "description": "Will also apply for variants", 
-   "fieldname": "taxes", 
-   "fieldtype": "Table", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Taxes", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "item_tax", 
-   "oldfieldtype": "Table", 
-   "options": "Item Tax", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "description": "Will also apply for variants",
+   "fieldname": "taxes",
+   "fieldtype": "Table",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Taxes",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "item_tax",
+   "oldfieldtype": "Table",
+   "options": "Item Tax",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "fieldname": "inspection_criteria", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Inspection Criteria", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldtype": "Section Break", 
-   "options": "icon-search", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 1,
+   "columns": 0,
+   "fieldname": "inspection_criteria",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Inspection Criteria",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldtype": "Section Break",
+   "options": "fa fa-search",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "default": "", 
-   "fieldname": "inspection_required", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Inspection Required", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "inspection_required", 
-   "oldfieldtype": "Select", 
-   "options": "", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "",
+   "fieldname": "inspection_required_before_purchase",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Inspection Required before Purchase",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "inspection_required",
+   "oldfieldtype": "Select",
+   "options": "",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "inspection_required", 
-   "description": "Will also apply to variants", 
-   "fieldname": "quality_parameters", 
-   "fieldtype": "Table", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Quality Parameters", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "item_specification_details", 
-   "oldfieldtype": "Table", 
-   "options": "Item Quality Inspection Parameter", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "inspection_required_before_delivery",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Inspection Required before Delivery",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "depends_on": "is_stock_item", 
-   "fieldname": "manufacturing", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Manufacturing", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldtype": "Section Break", 
-   "options": "icon-cogs", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "eval:(doc.inspection_required_before_purchase || doc.inspection_required_before_delivery)",
+   "description": "Will also apply to variants",
+   "fieldname": "quality_parameters",
+   "fieldtype": "Table",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Quality Parameters",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "item_specification_details",
+   "oldfieldtype": "Table",
+   "options": "Item Quality Inspection Parameter",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "", 
-   "fieldname": "default_bom", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 1, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Default BOM", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "default_bom", 
-   "oldfieldtype": "Link", 
-   "options": "BOM", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 1,
+   "columns": 0,
+   "depends_on": "is_stock_item",
+   "fieldname": "manufacturing",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Manufacturing",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldtype": "Section Break",
+   "options": "fa fa-cogs",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "default": "", 
-   "description": "If subcontracted to a vendor", 
-   "fieldname": "is_sub_contracted_item", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Supply Raw Materials for Purchase", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "is_sub_contracted_item", 
-   "oldfieldtype": "Select", 
-   "options": "", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "",
+   "fieldname": "default_bom",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 1,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Default BOM",
+   "length": 0,
+   "no_copy": 1,
+   "oldfieldname": "default_bom",
+   "oldfieldtype": "Link",
+   "options": "BOM",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "column_break_74", 
-   "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, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "",
+   "description": "If subcontracted to a vendor",
+   "fieldname": "is_sub_contracted_item",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Supply Raw Materials for Purchase",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "is_sub_contracted_item",
+   "oldfieldtype": "Select",
+   "options": "",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "customer_code", 
-   "fieldtype": "Data", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "label": "Customer Code", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "column_break_74",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_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, 
-   "fieldname": "website_section", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Website", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "icon-globe", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "customer_code",
+   "fieldtype": "Data",
+   "hidden": 1,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 1,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Customer Code",
+   "length": 0,
+   "no_copy": 1,
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "show_in_website", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Show in Website", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "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_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Website",
+   "length": 0,
+   "no_copy": 0,
+   "options": "fa fa-globe",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "show_in_website", 
-   "fieldname": "route", 
-   "fieldtype": "Small Text", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Route", 
-   "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, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "show_in_website",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Show in Website",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "show_in_website", 
-   "description": "Items with higher weightage will be shown higher", 
-   "fieldname": "weightage", 
-   "fieldtype": "Int", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Weightage", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 1, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "show_in_website",
+   "fieldname": "route",
+   "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": "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": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "show_in_website", 
-   "description": "Show a slideshow at the top of the page", 
-   "fieldname": "slideshow", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Slideshow", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Website Slideshow", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "show_in_website",
+   "description": "Items with higher weightage will be shown higher",
+   "fieldname": "weightage",
+   "fieldtype": "Int",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Weightage",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 1,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "show_in_website", 
-   "description": "Item Image (if not slideshow)", 
-   "fieldname": "website_image", 
-   "fieldtype": "Attach", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Image", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "show_in_website",
+   "description": "Show a slideshow at the top of the page",
+   "fieldname": "slideshow",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Slideshow",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Website Slideshow",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "thumbnail", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Thumbnail", 
-   "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, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "show_in_website",
+   "description": "Item Image (if not slideshow)",
+   "fieldname": "website_image",
+   "fieldtype": "Attach",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Image",
+   "length": 0,
+   "no_copy": 0,
+   "options": "",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "cb72", 
-   "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, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 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": 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": 0, 
-   "depends_on": "show_in_website", 
-   "description": "Show \"In Stock\" or \"Not in Stock\" based on stock available in this warehouse.", 
-   "fieldname": "website_warehouse", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 1, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Website Warehouse", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Warehouse", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "cb72",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_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, 
-   "depends_on": "show_in_website", 
-   "description": "List this Item in multiple groups on the website.", 
-   "fieldname": "website_item_groups", 
-   "fieldtype": "Table", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Website Item Groups", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Website Item Group", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "show_in_website",
+   "description": "Show \"In Stock\" or \"Not in Stock\" based on stock available in this warehouse.",
+   "fieldname": "website_warehouse",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 1,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Website Warehouse",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Warehouse",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "collapsible_depends_on": "website_specifications", 
-   "depends_on": "show_in_website", 
-   "fieldname": "sb72", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Website Specifications", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "show_in_website",
+   "description": "List this Item in multiple groups on the website.",
+   "fieldname": "website_item_groups",
+   "fieldtype": "Table",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Website Item Groups",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Website Item Group",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "show_in_website", 
-   "fieldname": "copy_from_item_group", 
-   "fieldtype": "Button", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Copy From Item Group", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 1,
+   "collapsible_depends_on": "website_specifications",
+   "columns": 0,
+   "depends_on": "show_in_website",
+   "fieldname": "sb72",
+   "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": "Website Specifications",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "show_in_website", 
-   "fieldname": "website_specifications", 
-   "fieldtype": "Table", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Website Specifications", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Item Website Specification", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "show_in_website",
+   "fieldname": "copy_from_item_group",
+   "fieldtype": "Button",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Copy From Item Group",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 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_list_view": 0, 
-   "label": "Website Description", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "show_in_website",
+   "fieldname": "website_specifications",
+   "fieldtype": "Table",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Website Specifications",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Item Website Specification",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "total_projected_qty", 
-   "fieldtype": "Float", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Total Projected Qty", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "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_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Website Description",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0
+  },
+  {
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "total_projected_qty",
+   "fieldtype": "Float",
+   "hidden": 1,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Total Projected Qty",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
   }
- ], 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "icon": "icon-tag", 
- "idx": 2, 
- "image_field": "image", 
- "image_view": 0, 
- "in_create": 0, 
- "in_dialog": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 1, 
- "modified": "2016-08-17 17:30:51.323382", 
- "modified_by": "Administrator", 
- "module": "Stock", 
- "name": "Item", 
- "owner": "Administrator", 
+ ],
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "icon": "fa fa-tag",
+ "idx": 2,
+ "image_field": "image",
+ "image_view": 0,
+ "in_create": 0,
+ "in_dialog": 0,
+ "is_submittable": 0,
+ "issingle": 0,
+ "istable": 0,
+ "max_attachments": 1,
+ "modified": "2016-11-18 02:19:54.507883",
+ "modified_by": "Administrator",
+ "module": "Stock",
+ "name": "Item",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 1, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Item Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "amend": 0,
+   "apply_user_permissions": 0,
+   "cancel": 0,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 0,
+   "if_owner": 0,
+   "import": 1,
+   "is_custom": 0,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Item Manager",
+   "set_user_permissions": 0,
+   "share": 1,
+   "submit": 0,
    "write": 1
-  }, 
+  },
   {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Stock Manager", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
+   "amend": 0,
+   "apply_user_permissions": 0,
+   "cancel": 0,
+   "create": 0,
+   "delete": 0,
+   "email": 1,
+   "export": 0,
+   "if_owner": 0,
+   "import": 0,
+   "is_custom": 0,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Stock Manager",
+   "set_user_permissions": 0,
+   "share": 0,
+   "submit": 0,
    "write": 0
-  }, 
+  },
   {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Stock User", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
+   "amend": 0,
+   "apply_user_permissions": 0,
+   "cancel": 0,
+   "create": 0,
+   "delete": 0,
+   "email": 1,
+   "export": 0,
+   "if_owner": 0,
+   "import": 0,
+   "is_custom": 0,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Stock User",
+   "set_user_permissions": 0,
+   "share": 0,
+   "submit": 0,
    "write": 0
-  }, 
+  },
   {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 0, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 0, 
-   "read": 1, 
-   "report": 0, 
-   "role": "Sales User", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
+   "amend": 0,
+   "apply_user_permissions": 0,
+   "cancel": 0,
+   "create": 0,
+   "delete": 0,
+   "email": 0,
+   "export": 0,
+   "if_owner": 0,
+   "import": 0,
+   "is_custom": 0,
+   "permlevel": 0,
+   "print": 0,
+   "read": 1,
+   "report": 0,
+   "role": "Sales User",
+   "set_user_permissions": 0,
+   "share": 0,
+   "submit": 0,
    "write": 0
-  }, 
+  },
   {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 0, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 0, 
-   "read": 1, 
-   "report": 0, 
-   "role": "Purchase User", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
+   "amend": 0,
+   "apply_user_permissions": 0,
+   "cancel": 0,
+   "create": 0,
+   "delete": 0,
+   "email": 0,
+   "export": 0,
+   "if_owner": 0,
+   "import": 0,
+   "is_custom": 0,
+   "permlevel": 0,
+   "print": 0,
+   "read": 1,
+   "report": 0,
+   "role": "Purchase User",
+   "set_user_permissions": 0,
+   "share": 0,
+   "submit": 0,
    "write": 0
-  }, 
+  },
   {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 0, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 0, 
-   "read": 1, 
-   "report": 0, 
-   "role": "Maintenance User", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
+   "amend": 0,
+   "apply_user_permissions": 0,
+   "cancel": 0,
+   "create": 0,
+   "delete": 0,
+   "email": 0,
+   "export": 0,
+   "if_owner": 0,
+   "import": 0,
+   "is_custom": 0,
+   "permlevel": 0,
+   "print": 0,
+   "read": 1,
+   "report": 0,
+   "role": "Maintenance User",
+   "set_user_permissions": 0,
+   "share": 0,
+   "submit": 0,
    "write": 0
-  }, 
+  },
   {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 0, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 0, 
-   "read": 1, 
-   "report": 0, 
-   "role": "Accounts User", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
+   "amend": 0,
+   "apply_user_permissions": 0,
+   "cancel": 0,
+   "create": 0,
+   "delete": 0,
+   "email": 0,
+   "export": 0,
+   "if_owner": 0,
+   "import": 0,
+   "is_custom": 0,
+   "permlevel": 0,
+   "print": 0,
+   "read": 1,
+   "report": 0,
+   "role": "Accounts User",
+   "set_user_permissions": 0,
+   "share": 0,
+   "submit": 0,
    "write": 0
-  }, 
+  },
   {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 0, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 0, 
-   "read": 1, 
-   "report": 0, 
-   "role": "Manufacturing User", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
+   "amend": 0,
+   "apply_user_permissions": 0,
+   "cancel": 0,
+   "create": 0,
+   "delete": 0,
+   "email": 0,
+   "export": 0,
+   "if_owner": 0,
+   "import": 0,
+   "is_custom": 0,
+   "permlevel": 0,
+   "print": 0,
+   "read": 1,
+   "report": 0,
+   "role": "Manufacturing User",
+   "set_user_permissions": 0,
+   "share": 0,
+   "submit": 0,
    "write": 0
   }
- ], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "search_fields": "item_name,description,item_group,customer_code", 
- "sort_field": "idx desc, modified desc", 
- "sort_order": "DESC", 
- "title_field": "item_name", 
+ ],
+ "quick_entry": 1,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "search_fields": "item_name,description,item_group,customer_code",
+ "sort_field": "idx desc, modified desc",
+ "sort_order": "DESC",
+ "title_field": "item_name",
  "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 454fc70..3d248d1 100644
--- a/erpnext/stock/doctype/item/item.py
+++ b/erpnext/stock/doctype/item/item.py
@@ -141,7 +141,7 @@
 
 	def make_route(self):
 		if not self.route:
-			return frappe.db.get_value('Item Group', self.item_group, 'route') + '/' + self.scrub(self.item_name)
+			return cstr(frappe.db.get_value('Item Group', self.item_group, 'route')) + '/' + self.scrub(self.item_name)
 
 	def get_parents(self, context):
 		item_group, route = frappe.db.get_value('Item Group', self.item_group, ['name', 'route'])
@@ -567,7 +567,7 @@
 		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)
 
-		for warehouse in frappe.db.sql("select name from `tabWarehouse`"):
+		for warehouse in frappe.db.sql("select warehouse from `tabBin` where item_code=%s", new_name):
 			repost_stock(new_name, warehouse[0])
 
 		frappe.db.set_value("Stock Settings", None, "allow_negative_stock", existing_allow_negative_stock)
diff --git a/erpnext/stock/doctype/item/item_dashboard.py b/erpnext/stock/doctype/item/item_dashboard.py
index e0f1c21..b40b196 100644
--- a/erpnext/stock/doctype/item/item_dashboard.py
+++ b/erpnext/stock/doctype/item/item_dashboard.py
@@ -1,45 +1,46 @@
 from frappe import _
 
-data = {
-	'heatmap': True,
-	'heatmap_message': _('This is based on stock movement. See {0} for details')\
-		.format('<a href="#query-report/Stock Ledger">' + _('Stock Ledger') + '</a>'),
-	'fieldname': 'item_code',
-	'non_standard_fieldnames': {
-		'Production Order': 'production_item',
-		'Product Bundle': 'new_item_code',
-		'BOM': 'item',
-		'Batch': 'item'
-	},
-	'transactions': [
-		{
-			'label': _('Groups'),
-			'items': ['BOM', 'Product Bundle']
+def get_data():
+	return {
+		'heatmap': True,
+		'heatmap_message': _('This is based on stock movement. See {0} for details')\
+			.format('<a href="#query-report/Stock Ledger">' + _('Stock Ledger') + '</a>'),
+		'fieldname': 'item_code',
+		'non_standard_fieldnames': {
+			'Production Order': 'production_item',
+			'Product Bundle': 'new_item_code',
+			'BOM': 'item',
+			'Batch': 'item'
 		},
-		{
-			'label': _('Pricing'),
-			'items': ['Item Price', 'Pricing Rule']
-		},
-		{
-			'label': _('Sell'),
-			'items': ['Quotation', 'Sales Order', 'Delivery Note', 'Sales Invoice']
-		},
-		{
-			'label': _('Buy'),
-			'items': ['Material Request', 'Supplier Quotation', 'Request for Quotation',
-				'Purchase Order', 'Purchase Invoice']
-		},
-		{
-			'label': _('Traceability'),
-			'items': ['Serial No', 'Batch']
-		},
-		{
-			'label': _('Move'),
-			'items': ['Stock Entry']
-		},
-		{
-			'label': _('Manufacture'),
-			'items': ['Production Order']
-		}
-	]
-}
\ No newline at end of file
+		'transactions': [
+			{
+				'label': _('Groups'),
+				'items': ['BOM', 'Product Bundle']
+			},
+			{
+				'label': _('Pricing'),
+				'items': ['Item Price', 'Pricing Rule']
+			},
+			{
+				'label': _('Sell'),
+				'items': ['Quotation', 'Sales Order', 'Delivery Note', 'Sales Invoice']
+			},
+			{
+				'label': _('Buy'),
+				'items': ['Material Request', 'Supplier Quotation', 'Request for Quotation',
+					'Purchase Order', 'Purchase Invoice']
+			},
+			{
+				'label': _('Traceability'),
+				'items': ['Serial No', 'Batch']
+			},
+			{
+				'label': _('Move'),
+				'items': ['Stock Entry']
+			},
+			{
+				'label': _('Manufacture'),
+				'items': ['Production Order']
+			}
+		]
+	}
\ No newline at end of file
diff --git a/erpnext/stock/doctype/item/test_item.py b/erpnext/stock/doctype/item/test_item.py
index bd617c6..aceefc0 100644
--- a/erpnext/stock/doctype/item/test_item.py
+++ b/erpnext/stock/doctype/item/test_item.py
@@ -177,4 +177,10 @@
 		variant.item_name = "_Test Variant Item-S"
 		variant.save()
 
+def get_total_projected_qty(item):
+	total_qty = frappe.db.sql(""" select sum(projected_qty) as projected_qty from tabBin
+		where item_code = %(item)s""", {'item': item}, as_dict=1)
+
+	return total_qty[0].projected_qty if total_qty else 0.0
+
 test_records = frappe.get_test_records('Item')
diff --git a/erpnext/stock/doctype/item_attribute/item_attribute.json b/erpnext/stock/doctype/item_attribute/item_attribute.json
index 338a0bc..8c02928 100644
--- a/erpnext/stock/doctype/item_attribute/item_attribute.json
+++ b/erpnext/stock/doctype/item_attribute/item_attribute.json
@@ -224,7 +224,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-edit", 
+ "icon": "fa fa-edit", 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
diff --git a/erpnext/stock/doctype/item_attribute_value/item_attribute_value.json b/erpnext/stock/doctype/item_attribute_value/item_attribute_value.json
index aac9c1c..68edfc9 100644
--- a/erpnext/stock/doctype/item_attribute_value/item_attribute_value.json
+++ b/erpnext/stock/doctype/item_attribute_value/item_attribute_value.json
@@ -65,7 +65,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-edit", 
+ "icon": "fa fa-edit", 
  "idx": 0, 
  "image_view": 0, 
  "in_create": 0, 
diff --git a/erpnext/stock/doctype/item_price/item_price.json b/erpnext/stock/doctype/item_price/item_price.json
index 0dcf264..6770c0f 100644
--- a/erpnext/stock/doctype/item_price/item_price.json
+++ b/erpnext/stock/doctype/item_price/item_price.json
@@ -3,30 +3,38 @@
  "allow_import": 1, 
  "allow_rename": 0, 
  "autoname": "ITEM-PRICE-.#####", 
+ "beta": 0, 
  "creation": "2013-05-02 16:29:48", 
  "custom": 0, 
  "description": "Multiple Item prices.", 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Setup", 
+ "editable_grid": 0, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "price_list_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": "Price List", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "icon-tags", 
+   "options": "fa fa-tags", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -37,19 +45,24 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "price_list", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Price List", 
    "length": 0, 
    "no_copy": 0, 
    "options": "Price List", 
    "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, 
@@ -60,18 +73,23 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "buying", 
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Buying", 
    "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, 
@@ -82,18 +100,23 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "selling", 
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Selling", 
    "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, 
@@ -104,19 +127,24 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "item_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": "icon-tag", 
+   "options": "fa fa-tag", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -127,12 +155,15 @@
    "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_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Item Code", 
    "length": 0, 
    "no_copy": 0, 
@@ -141,7 +172,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": 1, 
@@ -152,12 +185,15 @@
    "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": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -166,7 +202,9 @@
    "options": "currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -177,19 +215,24 @@
    "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_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Currency", 
    "length": 0, 
    "no_copy": 0, 
    "options": "Currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -200,17 +243,22 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "col_br_1", 
    "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, 
@@ -221,18 +269,23 @@
    "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_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Item 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, 
@@ -243,18 +296,23 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "item_description", 
    "fieldtype": "Text", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Item Description", 
    "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, 
@@ -265,18 +323,23 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_12", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -287,19 +350,24 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "bulk_import_help", 
    "fieldtype": "HTML", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Bulk Import Help", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -309,15 +377,16 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-flag", 
+ "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": "2015-11-16 06:29:48.400288", 
+ "modified": "2016-11-07 05:32:25.418351", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Item Price", 
@@ -333,6 +402,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -353,6 +423,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -364,7 +435,9 @@
    "write": 1
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
- "title_field": "item_code"
+ "title_field": "item_code", 
+ "track_seen": 0
 }
\ No newline at end of file
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 15a5759..525853b 100644
--- a/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js
+++ b/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js
@@ -37,7 +37,7 @@
 			'<br><br>',
 			'<table class="table table-bordered" style="background-color: #f9f9f9;">',
 				'<tr><td>',
-					'<h4><i class="icon-hand-right"></i> ',
+					'<h4><i class="fa fa-hand-right"></i> ',
 						__('Notes'),
 					':</h4>',
 					'<ul>',
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 63e04ab..227541f 100644
--- a/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
+++ b/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
@@ -23,6 +23,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Series", 
    "length": 0, 
    "no_copy": 1, 
@@ -32,6 +33,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, 
@@ -50,6 +52,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Company", 
    "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": 1, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -76,6 +80,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Purchase Receipts", 
    "length": 0, 
    "no_copy": 0, 
@@ -84,6 +89,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, 
@@ -102,6 +108,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Get Items From Purchase Receipts", 
    "length": 0, 
    "no_copy": 0, 
@@ -109,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, 
@@ -127,6 +135,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Purchase Receipt Items", 
    "length": 0, 
    "no_copy": 1, 
@@ -135,6 +144,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, 
@@ -153,6 +163,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Taxes and Charges", 
    "length": 0, 
    "no_copy": 0, 
@@ -161,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, 
@@ -179,6 +191,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "options": "Simple", 
@@ -187,6 +200,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, 
@@ -205,6 +219,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Taxes and Charges", 
    "length": 0, 
    "no_copy": 0, 
@@ -213,6 +228,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, 
@@ -231,6 +247,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amended From", 
    "length": 0, 
    "no_copy": 1, 
@@ -239,6 +256,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, 
@@ -257,6 +275,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -264,6 +283,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, 
@@ -283,6 +303,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Distribute Charges Based On", 
    "length": 0, 
    "no_copy": 0, 
@@ -292,6 +313,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, 
@@ -310,6 +332,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -317,6 +340,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, 
@@ -335,6 +359,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Landed Cost Help", 
    "length": 0, 
    "no_copy": 0, 
@@ -343,6 +368,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, 
@@ -352,7 +378,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-usd", 
+ "icon": "fa fa-usd", 
  "idx": 0, 
  "image_view": 0, 
  "in_create": 0, 
@@ -361,7 +387,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-09-02 03:31:51.521448", 
+ "modified": "2016-11-07 05:09:46.981120", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Landed Cost Voucher", 
@@ -378,6 +404,7 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
diff --git a/erpnext/stock/doctype/manufacturer/manufacturer.json b/erpnext/stock/doctype/manufacturer/manufacturer.json
index ea69ca0..0840e56 100644
--- a/erpnext/stock/doctype/manufacturer/manufacturer.json
+++ b/erpnext/stock/doctype/manufacturer/manufacturer.json
@@ -159,7 +159,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-certificate", 
+ "icon": "fa fa-certificate", 
  "idx": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
diff --git a/erpnext/stock/doctype/material_request/material_request.js b/erpnext/stock/doctype/material_request/material_request.js
index 78f17d3..2b1fb7f 100644
--- a/erpnext/stock/doctype/material_request/material_request.js
+++ b/erpnext/stock/doctype/material_request/material_request.js
@@ -7,7 +7,13 @@
 	onload: function(frm) {
 		// formatter for material request item
 		frm.set_indicator_formatter('item_code',
-			function(doc) { return (doc.qty<=doc.ordered_qty) ? "green" : "orange" })
+			function(doc) { return (doc.qty<=doc.ordered_qty) ? "green" : "orange" }),
+
+		frm.fields_dict["items"].grid.get_field("warehouse").get_query = function(doc, cdt, cdn){
+			return{
+				filters: {'company': doc.company}
+			}
+		}
 	}
 });
 
@@ -37,7 +43,7 @@
 
 		if(doc.docstatus==0) {
 			cur_frm.add_custom_button(__("Get Items from BOM"),
-				cur_frm.cscript.get_items_from_bom, "icon-sitemap", "btn-default");
+				cur_frm.cscript.get_items_from_bom, "fa fa-sitemap", "btn-default");
 		}
 
 		if(doc.docstatus == 1 && doc.status != 'Stopped') {
diff --git a/erpnext/stock/doctype/material_request/material_request.json b/erpnext/stock/doctype/material_request/material_request.json
index 6e993c2..b5992c2 100644
--- a/erpnext/stock/doctype/material_request/material_request.json
+++ b/erpnext/stock/doctype/material_request/material_request.json
@@ -9,11 +9,13 @@
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Document", 
+ "editable_grid": 0, 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "type_section", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -21,14 +23,16 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "icon-pushpin", 
+   "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, 
@@ -39,6 +43,7 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "{material_request_type}", 
    "fieldname": "title", 
    "fieldtype": "Data", 
@@ -47,6 +52,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Title", 
    "length": 0, 
    "no_copy": 1, 
@@ -55,6 +61,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, 
@@ -65,6 +72,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "material_request_type", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -72,6 +80,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Type", 
    "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": 1, 
    "search_index": 0, 
@@ -90,6 +100,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_2", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -97,12 +108,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, 
@@ -113,6 +126,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "naming_series", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -120,6 +134,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Series", 
    "length": 0, 
    "no_copy": 1, 
@@ -130,6 +145,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, 
@@ -140,6 +156,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "amended_from", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -147,6 +164,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amended From", 
    "length": 0, 
    "no_copy": 1, 
@@ -158,6 +176,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, 
@@ -169,6 +188,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "", 
    "fieldname": "company", 
    "fieldtype": "Link", 
@@ -177,6 +197,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -188,6 +209,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 0, 
+   "remember_last_selected_value": 1, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 1, 
@@ -199,6 +221,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "items_section", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -206,15 +229,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-shopping-cart", 
+   "options": "fa fa-shopping-cart", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -225,6 +250,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "items", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -232,6 +258,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Items", 
    "length": 0, 
    "no_copy": 0, 
@@ -242,6 +269,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 +280,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
+   "columns": 0, 
    "fieldname": "more_info", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -259,15 +288,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "More Information", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-file-text", 
+   "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, 
@@ -278,6 +309,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "requested_by", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -285,6 +317,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Requested For", 
    "length": 0, 
    "no_copy": 0, 
@@ -292,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, 
@@ -302,6 +336,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "Today", 
    "fieldname": "transaction_date", 
    "fieldtype": "Date", 
@@ -310,6 +345,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Transaction Date", 
    "length": 0, 
    "no_copy": 1, 
@@ -320,6 +356,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": 1, 
@@ -331,6 +368,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break2", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -338,6 +376,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
@@ -346,6 +385,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "50%", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -357,6 +397,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "status", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -364,6 +405,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Status", 
    "length": 0, 
    "no_copy": 1, 
@@ -375,6 +417,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": 1, 
@@ -386,6 +429,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "", 
    "fieldname": "per_ordered", 
    "fieldtype": "Percent", 
@@ -394,6 +438,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "% Ordered", 
    "length": 0, 
    "no_copy": 1, 
@@ -403,6 +448,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, 
@@ -413,6 +459,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
+   "columns": 0, 
    "fieldname": "printing_details", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -420,6 +467,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Printing Details", 
    "length": 0, 
    "no_copy": 0, 
@@ -428,6 +476,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, 
@@ -438,6 +487,7 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "letter_head", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -445,6 +495,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Letter Head", 
    "length": 0, 
    "no_copy": 0, 
@@ -455,6 +506,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, 
@@ -465,6 +517,7 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "select_print_heading", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -472,6 +525,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Print Heading", 
    "length": 0, 
    "no_copy": 0, 
@@ -480,6 +534,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, 
@@ -491,6 +546,7 @@
    "bold": 0, 
    "collapsible": 1, 
    "collapsible_depends_on": "terms", 
+   "columns": 0, 
    "fieldname": "terms_section_break", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -498,15 +554,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Terms and Conditions", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-legal", 
+   "options": "fa fa-legal", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -517,6 +575,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "tc_name", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -524,6 +583,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Terms", 
    "length": 0, 
    "no_copy": 0, 
@@ -534,6 +594,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, 
@@ -544,6 +605,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "terms", 
    "fieldtype": "Text Editor", 
    "hidden": 0, 
@@ -551,6 +613,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Terms and Conditions Content", 
    "length": 0, 
    "no_copy": 0, 
@@ -560,6 +623,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, 
@@ -569,7 +633,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-ticket", 
+ "icon": "fa fa-ticket", 
  "idx": 70, 
  "image_view": 0, 
  "in_create": 0, 
@@ -579,7 +643,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-06-08 16:36:41.295001", 
+ "modified": "2016-11-07 05:54:32.987257", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Material Request", 
@@ -595,6 +659,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -615,6 +680,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -635,6 +701,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -655,6 +722,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
diff --git a/erpnext/stock/doctype/material_request/material_request.py b/erpnext/stock/doctype/material_request/material_request.py
index b1f1423..4fb5f5d 100644
--- a/erpnext/stock/doctype/material_request/material_request.py
+++ b/erpnext/stock/doctype/material_request/material_request.py
@@ -15,9 +15,9 @@
 from erpnext.manufacturing.doctype.production_order.production_order import get_item_details
 
 
-# form_grid_templates = {
-# 	"items": "templates/form_grid/material_request_grid.html"
-# }
+form_grid_templates = {
+	"items": "templates/form_grid/material_request_grid.html"
+}
 
 class MaterialRequest(BuyingController):
 	def get_feed(self):
@@ -75,7 +75,7 @@
 		pc_obj = frappe.get_doc('Purchase Common')
 		pc_obj.validate_for_items(self)
 
-		self.set_title()
+		# self.set_title()
 
 
 		# self.validate_qty_against_so()
@@ -372,6 +372,7 @@
 	mr= frappe.get_doc("Material Request", material_request)
 	errors =[]
 	production_orders = []
+	default_wip_warehouse = frappe.db.get_single_value("Manufacturing Settings", "default_wip_warehouse")
 	for d in mr.items:
 		if (d.qty - d.ordered_qty) >0:
 			if frappe.db.get_value("BOM", {"item": d.item_code, "is_default": 1}):
@@ -379,6 +380,7 @@
 				prod_order.production_item = d.item_code
 				prod_order.qty = d.qty - d.ordered_qty
 				prod_order.fg_warehouse = d.warehouse
+				prod_order.wip_warehouse = default_wip_warehouse
 				prod_order.description = d.description
 				prod_order.stock_uom = d.uom
 				prod_order.expected_delivery_date = d.schedule_date
diff --git a/erpnext/stock/doctype/material_request/material_request_dashboard.py b/erpnext/stock/doctype/material_request/material_request_dashboard.py
index 8547df1..751c723 100644
--- a/erpnext/stock/doctype/material_request/material_request_dashboard.py
+++ b/erpnext/stock/doctype/material_request/material_request_dashboard.py
@@ -1,11 +1,17 @@
 from frappe import _
 
-data = {
-	'fieldname': 'material_request',
-	'transactions': [
-		{
-			'label': _('Related'),
-			'items': ['Request for Quotation', 'Supplier Quotation', 'Purchase Order']
-		},
-	]
-}
\ No newline at end of file
+
+def get_data():
+	return {
+		'fieldname': 'material_request',
+		'transactions': [
+			{
+				'label': _('Related'),
+				'items': ['Request for Quotation', 'Supplier Quotation', 'Purchase Order']
+			},
+			{
+				'label': _('Manufacturing'),
+				'items': ['Production Order']
+			}
+		]
+	}
\ No newline at end of file
diff --git a/erpnext/stock/doctype/material_request/test_material_request.py b/erpnext/stock/doctype/material_request/test_material_request.py
index ebdfa5a..8f43acd 100644
--- a/erpnext/stock/doctype/material_request/test_material_request.py
+++ b/erpnext/stock/doctype/material_request/test_material_request.py
@@ -66,7 +66,6 @@
 				"posting_date": "2013-03-01",
 				"posting_time": "00:00:00",
 				"purpose": "Material Receipt",
-				"fiscal_year": "_Test Fiscal Year 2013",
 				"items": [
 					{
 						"conversion_factor": 1.0,
@@ -79,6 +78,7 @@
 						"transfer_qty": qty1,
 						"uom": "_Test UOM 1",
 						"t_warehouse": warehouse or "_Test Warehouse 1 - _TC",
+						"cost_center": "_Test Cost Center - _TC"
 					},
 					{
 						"conversion_factor": 1.0,
@@ -91,6 +91,7 @@
 						"transfer_qty": qty2,
 						"uom": "_Test UOM 1",
 						"t_warehouse": warehouse or "_Test Warehouse 1 - _TC",
+						"cost_center": "_Test Cost Center - _TC"
 					}
 				]
 			})
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 85388a7..f7ca7d9 100644
--- a/erpnext/stock/doctype/material_request_item/material_request_item.json
+++ b/erpnext/stock/doctype/material_request_item/material_request_item.json
@@ -343,7 +343,7 @@
    "bold": 1, 
    "collapsible": 0, 
    "columns": 2, 
-   "default": "Today", 
+   "default": "", 
    "fieldname": "schedule_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -619,6 +619,32 @@
    "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_list_view": 0, 
+   "label": "Actual Qty", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "report_hide": 1, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "ordered_qty", 
    "fieldtype": "Float", 
    "hidden": 0, 
@@ -679,7 +705,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-08-26 02:24:43.340269", 
+ "modified": "2016-10-17 04:58:33.317145", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Material Request Item", 
diff --git a/erpnext/stock/doctype/packed_item/packed_item.py b/erpnext/stock/doctype/packed_item/packed_item.py
index 2078eeb..09affe0 100644
--- a/erpnext/stock/doctype/packed_item/packed_item.py
+++ b/erpnext/stock/doctype/packed_item/packed_item.py
@@ -16,7 +16,7 @@
 def get_product_bundle_items(item_code):
 	return frappe.db.sql("""select t1.item_code, t1.qty, t1.uom, t1.description
 		from `tabProduct Bundle Item` t1, `tabProduct Bundle` t2
-		where t2.new_item_code=%s and t1.parent = t2.name""", item_code, as_dict=1)
+		where t2.new_item_code=%s and t1.parent = t2.name order by t1.idx""", item_code, as_dict=1)
 
 def get_packing_item_details(item):
 	return frappe.db.sql("""select item_name, description, stock_uom from `tabItem`
diff --git a/erpnext/stock/doctype/packing_slip/packing_slip.json b/erpnext/stock/doctype/packing_slip/packing_slip.json
index d8c7952..3359084 100644
--- a/erpnext/stock/doctype/packing_slip/packing_slip.json
+++ b/erpnext/stock/doctype/packing_slip/packing_slip.json
@@ -575,7 +575,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-suitcase", 
+ "icon": "fa fa-suitcase", 
  "idx": 1, 
  "in_create": 0, 
  "in_dialog": 0, 
diff --git a/erpnext/stock/doctype/price_list/price_list.js b/erpnext/stock/doctype/price_list/price_list.js
index f109633..23ac6fd 100644
--- a/erpnext/stock/doctype/price_list/price_list.js
+++ b/erpnext/stock/doctype/price_list/price_list.js
@@ -8,6 +8,6 @@
 				"price_list": cur_frm.doc.name
 			};
 			frappe.set_route("Report", "Item Price");
-		}, "icon-money");
+		}, "fa fa-money");
 	}
 });
diff --git a/erpnext/stock/doctype/price_list/price_list.json b/erpnext/stock/doctype/price_list/price_list.json
index cc323fa..73674ee 100644
--- a/erpnext/stock/doctype/price_list/price_list.json
+++ b/erpnext/stock/doctype/price_list/price_list.json
@@ -3,30 +3,38 @@
  "allow_import": 1, 
  "allow_rename": 1, 
  "autoname": "field:price_list_name", 
+ "beta": 0, 
  "creation": "2013-01-25 11:35:09", 
  "custom": 0, 
  "description": "Price List Master", 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Setup", 
+ "editable_grid": 0, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "1", 
    "fieldname": "enabled", 
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Enabled", 
    "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, 
@@ -37,17 +45,22 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "sb_1", 
    "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, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -58,12 +71,15 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "price_list_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": "Price List Name", 
    "length": 0, 
    "no_copy": 1, 
@@ -71,7 +87,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, 
@@ -82,19 +100,24 @@
    "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_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Currency", 
    "length": 0, 
    "no_copy": 0, 
    "options": "Currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -105,18 +128,23 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "buying", 
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Buying", 
    "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, 
@@ -127,18 +155,23 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "selling", 
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Selling", 
    "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, 
@@ -149,17 +182,22 @@
    "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, 
+   "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, 
@@ -170,12 +208,15 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "countries", 
    "fieldtype": "Table", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Applicable for Countries", 
    "length": 0, 
    "no_copy": 0, 
@@ -183,7 +224,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, 
@@ -193,15 +236,16 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-tags", 
+ "icon": "fa fa-tags", 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 1, 
- "modified": "2015-11-16 06:29:51.852676", 
+ "modified": "2016-11-07 05:32:09.570045", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Price List", 
@@ -217,6 +261,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -237,6 +282,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -257,6 +303,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -277,6 +324,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -297,6 +345,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -308,7 +357,9 @@
    "write": 0
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
- "search_fields": "currency"
+ "search_fields": "currency", 
+ "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 d477189..457a7c2 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
@@ -7,21 +7,6 @@
 
 frappe.ui.form.on("Purchase Receipt", {
 	onload: function(frm) {
-		// default values for quotation no
-		var qa_no = frappe.meta.get_docfield("Purchase Receipt Item", "qa_no");
-		qa_no.get_route_options_for_new_doc = function(field) {
-			if(frm.is_new()) return;
-			var doc = field.doc;
-			return {
-				"inspection_type": "Incoming",
-				"purchase_receipt_no": frm.doc.name,
-				"item_code": doc.item_code,
-				"description": doc.description,
-				"item_serial_no": doc.serial_no ? doc.serial_no.split("\n")[0] : null,
-				"batch_no": doc.batch_no
-			}
-		}
-
 		$.each(["warehouse", "rejected_warehouse"], function(i, field) {
 			frm.set_query(field, "items", function() {
 				return {
@@ -40,7 +25,8 @@
 					["Warehouse", "is_group", "=", 0]
 				]
 			}
-		})
+		});
+		
 	}
 });
 
@@ -190,14 +176,6 @@
 	}
 }
 
-cur_frm.fields_dict.items.grid.get_field("qa_no").get_query = function(doc) {
-	return {
-		filters: {
-			'docstatus': 1
-		}
-	}
-}
-
 cur_frm.fields_dict['items'].grid.get_field('bom').get_query = function(doc, cdt, cdn) {
 	var d = locals[cdt][cdn]
 	return {
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
index f10b634..b4bad54 100755
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
@@ -9,11 +9,13 @@
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Document", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "supplier_section", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -21,14 +23,16 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "icon-user", 
+   "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, 
@@ -39,6 +43,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break0", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -46,6 +51,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
@@ -54,6 +60,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "50%", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -65,6 +72,7 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "{supplier_name}", 
    "fieldname": "title", 
    "fieldtype": "Data", 
@@ -73,6 +81,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Title", 
    "length": 0, 
    "no_copy": 1, 
@@ -81,6 +90,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, 
@@ -91,6 +101,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "", 
    "fieldname": "naming_series", 
    "fieldtype": "Select", 
@@ -99,6 +110,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Series", 
    "length": 0, 
    "no_copy": 1, 
@@ -109,6 +121,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, 
@@ -119,6 +132,7 @@
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "supplier", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -126,6 +140,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Supplier", 
    "length": 0, 
    "no_copy": 0, 
@@ -137,6 +152,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, 
@@ -148,6 +164,7 @@
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "supplier", 
    "fieldname": "supplier_name", 
    "fieldtype": "Data", 
@@ -156,6 +173,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Supplier Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -163,6 +181,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, 
@@ -173,6 +192,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break1", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -180,6 +200,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
@@ -188,6 +209,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "50%", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -199,6 +221,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "Today", 
    "fieldname": "posting_date", 
    "fieldtype": "Date", 
@@ -207,6 +230,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Date", 
    "length": 0, 
    "no_copy": 1, 
@@ -217,6 +241,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": 1, 
@@ -228,6 +253,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "Time at which materials were received", 
    "fieldname": "posting_time", 
    "fieldtype": "Time", 
@@ -236,6 +262,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Posting Time", 
    "length": 0, 
    "no_copy": 1, 
@@ -246,6 +273,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, 
@@ -257,6 +285,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "", 
    "fieldname": "company", 
    "fieldtype": "Link", 
@@ -265,6 +294,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -276,6 +306,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 0, 
+   "remember_last_selected_value": 1, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 1, 
@@ -287,6 +318,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "is_return", 
    "fieldtype": "Check", 
    "hidden": 0, 
@@ -294,14 +326,16 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Is Return", 
    "length": 0, 
-   "no_copy": 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, 
@@ -312,6 +346,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "is_return", 
    "fieldname": "return_against", 
    "fieldtype": "Link", 
@@ -320,15 +355,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Return Against Purchase Receipt", 
    "length": 0, 
-   "no_copy": 0, 
+   "no_copy": 1, 
    "options": "Purchase Receipt", 
    "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, 
@@ -339,6 +376,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
+   "columns": 0, 
    "fieldname": "section_addresses", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -346,6 +384,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Address and Contact", 
    "length": 0, 
    "no_copy": 0, 
@@ -354,6 +393,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, 
@@ -364,6 +404,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "supplier_address", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -371,6 +412,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Select Supplier Address", 
    "length": 0, 
    "no_copy": 0, 
@@ -379,6 +421,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, 
@@ -389,6 +432,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "contact_person", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -396,6 +440,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Contact Person", 
    "length": 0, 
    "no_copy": 0, 
@@ -404,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": 0, 
@@ -414,6 +460,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "", 
    "fieldname": "address_display", 
    "fieldtype": "Small Text", 
@@ -422,6 +469,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Address", 
    "length": 0, 
    "no_copy": 0, 
@@ -429,6 +477,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, 
@@ -439,6 +488,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "contact_display", 
    "fieldtype": "Small Text", 
    "hidden": 0, 
@@ -446,6 +496,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Contact", 
    "length": 0, 
    "no_copy": 0, 
@@ -453,6 +504,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, 
@@ -463,6 +515,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "contact_mobile", 
    "fieldtype": "Small Text", 
    "hidden": 0, 
@@ -470,6 +523,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Mobile No", 
    "length": 0, 
    "no_copy": 0, 
@@ -477,6 +531,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, 
@@ -487,6 +542,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "contact_email", 
    "fieldtype": "Small Text", 
    "hidden": 0, 
@@ -494,6 +550,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Contact Email", 
    "length": 0, 
    "no_copy": 0, 
@@ -501,6 +558,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, 
@@ -511,6 +569,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "col_break_address", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -518,6 +577,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -525,6 +585,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, 
@@ -535,6 +596,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "", 
    "fieldname": "shipping_address", 
    "fieldtype": "Link", 
@@ -543,6 +605,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Select Shipping Address", 
    "length": 0, 
    "no_copy": 0, 
@@ -552,6 +615,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, 
@@ -562,6 +626,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "shipping_address_display", 
    "fieldtype": "Small Text", 
    "hidden": 0, 
@@ -569,6 +634,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Shipping Address", 
    "length": 0, 
    "no_copy": 0, 
@@ -577,6 +643,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, 
@@ -587,6 +654,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
+   "columns": 0, 
    "fieldname": "currency_and_price_list", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -594,14 +662,16 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Currency and Price List", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "icon-tag", 
+   "options": "fa fa-tag", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -612,6 +682,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "currency", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -619,6 +690,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Currency", 
    "length": 0, 
    "no_copy": 0, 
@@ -629,6 +701,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, 
@@ -639,6 +712,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "Rate at which supplier's currency is converted to company's base currency", 
    "fieldname": "conversion_rate", 
    "fieldtype": "Float", 
@@ -647,6 +721,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Exchange Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -657,6 +732,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, 
@@ -667,6 +743,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break2", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -674,6 +751,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
@@ -682,6 +760,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "50%", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -693,6 +772,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "buying_price_list", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -700,6 +780,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Price List", 
    "length": 0, 
    "no_copy": 0, 
@@ -708,6 +789,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, 
@@ -718,6 +800,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "buying_price_list", 
    "fieldname": "price_list_currency", 
    "fieldtype": "Link", 
@@ -726,6 +809,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Price List Currency", 
    "length": 0, 
    "no_copy": 0, 
@@ -734,6 +818,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, 
@@ -744,6 +829,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "buying_price_list", 
    "fieldname": "plc_conversion_rate", 
    "fieldtype": "Float", 
@@ -752,6 +838,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Price List Exchange Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -760,6 +847,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, 
@@ -770,6 +858,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "ignore_pricing_rule", 
    "fieldtype": "Check", 
    "hidden": 0, 
@@ -777,6 +866,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Ignore Pricing Rule", 
    "length": 0, 
    "no_copy": 1, 
@@ -784,6 +874,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, 
@@ -794,6 +885,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "items_section", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -801,15 +893,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-shopping-cart", 
+   "options": "fa fa-shopping-cart", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -820,6 +914,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "items", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -827,6 +922,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Items", 
    "length": 0, 
    "no_copy": 0, 
@@ -837,6 +933,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, 
@@ -847,6 +944,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "get_current_stock", 
    "fieldtype": "Button", 
    "hidden": 0, 
@@ -854,6 +952,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Get current stock", 
    "length": 0, 
    "no_copy": 0, 
@@ -863,6 +962,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, 
@@ -873,6 +973,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break0", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -880,6 +981,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
@@ -887,6 +989,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, 
@@ -897,6 +1000,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "base_total", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -904,6 +1008,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -913,6 +1018,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, 
@@ -923,6 +1029,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "base_net_total", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -930,6 +1037,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Net Total (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -941,6 +1049,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -952,6 +1061,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_27", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -959,12 +1069,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, 
@@ -975,6 +1087,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "total", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -982,6 +1095,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total", 
    "length": 0, 
    "no_copy": 0, 
@@ -991,6 +1105,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, 
@@ -1001,6 +1116,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "net_total", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -1008,6 +1124,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Net Total", 
    "length": 0, 
    "no_copy": 0, 
@@ -1018,6 +1135,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, 
@@ -1028,6 +1146,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "Add / Edit Taxes and Charges", 
    "fieldname": "taxes_section", 
    "fieldtype": "Section Break", 
@@ -1036,15 +1155,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-money", 
+   "options": "fa fa-money", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1055,6 +1176,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "", 
    "fieldname": "taxes_and_charges", 
    "fieldtype": "Link", 
@@ -1063,6 +1185,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Taxes and Charges", 
    "length": 0, 
    "no_copy": 0, 
@@ -1073,6 +1196,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, 
@@ -1083,6 +1207,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "taxes", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -1090,6 +1215,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Purchase Taxes and Charges", 
    "length": 0, 
    "no_copy": 0, 
@@ -1100,6 +1226,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, 
@@ -1110,6 +1237,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "other_charges_calculation", 
    "fieldtype": "HTML", 
    "hidden": 0, 
@@ -1117,6 +1245,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Taxes and Charges Calculation", 
    "length": 0, 
    "no_copy": 0, 
@@ -1125,6 +1254,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, 
@@ -1135,6 +1265,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "", 
    "fieldname": "totals", 
    "fieldtype": "Section Break", 
@@ -1143,15 +1274,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-money", 
+   "options": "fa fa-money", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1162,6 +1295,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "base_taxes_and_charges_added", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -1169,6 +1303,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Taxes and Charges Added (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -1179,6 +1314,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, 
@@ -1189,6 +1325,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "base_taxes_and_charges_deducted", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -1196,6 +1333,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Taxes and Charges Deducted (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -1206,6 +1344,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, 
@@ -1216,6 +1355,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "base_total_taxes_and_charges", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -1223,6 +1363,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Taxes and Charges (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -1233,6 +1374,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, 
@@ -1243,6 +1385,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break3", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -1250,6 +1393,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -1257,6 +1401,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "50%", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1268,6 +1413,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "taxes_and_charges_added", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -1275,6 +1421,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Taxes and Charges Added", 
    "length": 0, 
    "no_copy": 0, 
@@ -1285,6 +1432,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, 
@@ -1295,6 +1443,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "taxes_and_charges_deducted", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -1302,6 +1451,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Taxes and Charges Deducted", 
    "length": 0, 
    "no_copy": 0, 
@@ -1312,6 +1462,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, 
@@ -1322,6 +1473,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "total_taxes_and_charges", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -1329,6 +1481,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Taxes and Charges", 
    "length": 0, 
    "no_copy": 0, 
@@ -1338,6 +1491,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, 
@@ -1349,6 +1503,7 @@
    "bold": 0, 
    "collapsible": 1, 
    "collapsible_depends_on": "discount_amount", 
+   "columns": 0, 
    "fieldname": "section_break_42", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -1356,6 +1511,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Additional Discount", 
    "length": 0, 
    "no_copy": 0, 
@@ -1364,6 +1520,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, 
@@ -1374,6 +1531,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "Grand Total", 
    "fieldname": "apply_discount_on", 
    "fieldtype": "Select", 
@@ -1382,6 +1540,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Apply Additional Discount On", 
    "length": 0, 
    "no_copy": 0, 
@@ -1391,6 +1550,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, 
@@ -1401,6 +1561,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "base_discount_amount", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -1408,6 +1569,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Additional Discount Amount (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -1417,6 +1579,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, 
@@ -1427,6 +1590,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_44", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -1434,6 +1598,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -1441,6 +1606,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, 
@@ -1451,6 +1617,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "additional_discount_percentage", 
    "fieldtype": "Float", 
    "hidden": 0, 
@@ -1458,6 +1625,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Additional Discount Percentage", 
    "length": 0, 
    "no_copy": 0, 
@@ -1466,6 +1634,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, 
@@ -1476,6 +1645,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "discount_amount", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -1483,6 +1653,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Additional Discount Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -1492,6 +1663,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, 
@@ -1502,6 +1674,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_46", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -1509,6 +1682,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -1516,6 +1690,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, 
@@ -1526,6 +1701,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "base_grand_total", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -1533,6 +1709,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Grand Total (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -1543,6 +1720,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, 
@@ -1553,6 +1731,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "", 
    "fieldname": "base_in_words", 
    "fieldtype": "Data", 
@@ -1561,6 +1740,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "In Words (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -1570,6 +1750,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, 
@@ -1580,6 +1761,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "base_rounded_total", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -1587,6 +1769,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Rounded Total (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -1597,6 +1780,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, 
@@ -1607,6 +1791,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_50", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -1614,6 +1799,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -1621,6 +1807,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, 
@@ -1631,6 +1818,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "grand_total", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -1638,6 +1826,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Grand Total", 
    "length": 0, 
    "no_copy": 0, 
@@ -1648,6 +1837,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, 
@@ -1658,6 +1848,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "in_words", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -1665,6 +1856,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "In Words", 
    "length": 0, 
    "no_copy": 0, 
@@ -1674,6 +1866,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, 
@@ -1685,6 +1878,7 @@
    "bold": 0, 
    "collapsible": 1, 
    "collapsible_depends_on": "terms", 
+   "columns": 0, 
    "fieldname": "terms_section_break", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -1692,15 +1886,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Terms and Conditions", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-legal", 
+   "options": "fa fa-legal", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1711,6 +1907,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "tc_name", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -1718,6 +1915,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Terms", 
    "length": 0, 
    "no_copy": 0, 
@@ -1728,6 +1926,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, 
@@ -1738,6 +1937,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "terms", 
    "fieldtype": "Text Editor", 
    "hidden": 0, 
@@ -1745,6 +1945,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Terms and Conditions", 
    "length": 0, 
    "no_copy": 0, 
@@ -1754,6 +1955,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, 
@@ -1765,6 +1967,7 @@
    "bold": 0, 
    "collapsible": 1, 
    "collapsible_depends_on": "supplied_items", 
+   "columns": 0, 
    "description": "", 
    "fieldname": "raw_material_details", 
    "fieldtype": "Section Break", 
@@ -1773,15 +1976,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Raw Materials Supplied", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-table", 
+   "options": "fa fa-table", 
    "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, 
@@ -1792,6 +1997,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "No", 
    "description": "", 
    "fieldname": "is_subcontracted", 
@@ -1801,6 +2007,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Raw Materials Supplied", 
    "length": 0, 
    "no_copy": 0, 
@@ -1811,6 +2018,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, 
@@ -1821,6 +2029,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "", 
    "fieldname": "supplier_warehouse", 
    "fieldtype": "Link", 
@@ -1829,6 +2038,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Supplier Warehouse", 
    "length": 0, 
    "no_copy": 1, 
@@ -1840,6 +2050,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "50px", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1851,6 +2062,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "supplied_items", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -1858,6 +2070,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Supplied Items", 
    "length": 0, 
    "no_copy": 1, 
@@ -1868,6 +2081,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, 
@@ -1878,6 +2092,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "bill_no", 
    "fieldtype": "Data", 
    "hidden": 1, 
@@ -1885,6 +2100,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Bill No", 
    "length": 0, 
    "no_copy": 0, 
@@ -1894,6 +2110,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, 
@@ -1904,6 +2121,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "bill_date", 
    "fieldtype": "Date", 
    "hidden": 1, 
@@ -1911,6 +2129,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Bill Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -1920,6 +2139,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, 
@@ -1930,6 +2150,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
+   "columns": 0, 
    "fieldname": "more_info", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -1937,15 +2158,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "More Information", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-file-text", 
+   "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, 
@@ -1956,6 +2179,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "Draft", 
    "fieldname": "status", 
    "fieldtype": "Select", 
@@ -1964,6 +2188,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Status", 
    "length": 0, 
    "no_copy": 1, 
@@ -1975,6 +2200,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 1, 
@@ -1986,6 +2212,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "Warehouse where you are maintaining stock of rejected items", 
    "fieldname": "rejected_warehouse", 
    "fieldtype": "Link", 
@@ -1994,6 +2221,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Rejected Warehouse", 
    "length": 0, 
    "no_copy": 1, 
@@ -2004,6 +2232,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, 
@@ -2014,6 +2243,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "amended_from", 
    "fieldtype": "Link", 
    "hidden": 1, 
@@ -2021,6 +2251,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amended From", 
    "length": 0, 
    "no_copy": 1, 
@@ -2032,6 +2263,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, 
@@ -2043,6 +2275,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "range", 
    "fieldtype": "Data", 
    "hidden": 1, 
@@ -2050,6 +2283,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Range", 
    "length": 0, 
    "no_copy": 0, 
@@ -2059,6 +2293,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, 
@@ -2069,6 +2304,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break4", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -2076,6 +2312,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
@@ -2084,6 +2321,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "50%", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -2095,6 +2333,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "per_billed", 
    "fieldtype": "Percent", 
    "hidden": 0, 
@@ -2102,6 +2341,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "% Amount Billed", 
    "length": 0, 
    "no_copy": 1, 
@@ -2110,6 +2350,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, 
@@ -2120,6 +2361,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
+   "columns": 0, 
    "fieldname": "printing_settings", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -2127,6 +2369,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Printing Settings", 
    "length": 0, 
    "no_copy": 0, 
@@ -2135,6 +2378,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, 
@@ -2145,6 +2389,7 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "letter_head", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -2152,6 +2397,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Letter Head", 
    "length": 0, 
    "no_copy": 0, 
@@ -2160,6 +2406,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, 
@@ -2170,6 +2417,7 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "select_print_heading", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -2177,6 +2425,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Print Heading", 
    "length": 0, 
    "no_copy": 1, 
@@ -2187,6 +2436,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, 
@@ -2197,6 +2447,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "language", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -2204,6 +2455,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Print Language", 
    "length": 0, 
    "no_copy": 0, 
@@ -2212,6 +2464,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, 
@@ -2222,6 +2475,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "other_details", 
    "fieldtype": "HTML", 
    "hidden": 1, 
@@ -2229,6 +2483,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Other Details", 
    "length": 0, 
    "no_copy": 0, 
@@ -2239,6 +2494,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "30%", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -2250,6 +2506,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "instructions", 
    "fieldtype": "Small Text", 
    "hidden": 0, 
@@ -2257,6 +2514,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Instructions", 
    "length": 0, 
    "no_copy": 0, 
@@ -2266,6 +2524,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, 
@@ -2276,6 +2535,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "remarks", 
    "fieldtype": "Small Text", 
    "hidden": 0, 
@@ -2283,6 +2543,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Remarks", 
    "length": 0, 
    "no_copy": 0, 
@@ -2290,6 +2551,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, 
@@ -2301,6 +2563,7 @@
    "bold": 0, 
    "collapsible": 1, 
    "collapsible_depends_on": "transporter_name", 
+   "columns": 0, 
    "fieldname": "transporter_info", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -2308,14 +2571,16 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Transporter Details", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "icon-truck", 
+   "options": "fa fa-truck", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -2326,6 +2591,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "transporter_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -2333,6 +2599,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Transporter Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -2342,6 +2609,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, 
@@ -2352,6 +2620,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break5", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -2359,6 +2628,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -2366,6 +2636,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "50%", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -2377,6 +2648,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "", 
    "fieldname": "lr_no", 
    "fieldtype": "Data", 
@@ -2385,6 +2657,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Vehicle Number", 
    "length": 0, 
    "no_copy": 1, 
@@ -2395,6 +2668,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, 
@@ -2406,6 +2680,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "", 
    "fieldname": "lr_date", 
    "fieldtype": "Date", 
@@ -2414,6 +2689,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Vehicle Date", 
    "length": 0, 
    "no_copy": 1, 
@@ -2424,6 +2700,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, 
@@ -2434,7 +2711,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-truck", 
+ "icon": "fa fa-truck", 
  "idx": 261, 
  "image_view": 0, 
  "in_create": 0, 
@@ -2444,7 +2721,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-06-30 13:42:23.310309", 
+ "modified": "2016-11-07 05:57:41.746638", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Purchase Receipt", 
@@ -2460,6 +2737,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -2480,6 +2758,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -2500,6 +2779,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -2520,6 +2800,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -2540,6 +2821,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 1, 
    "print": 0, 
    "read": 1, 
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
index 20630b2..4bcde6a 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
@@ -4,11 +4,11 @@
 from __future__ import unicode_literals
 import frappe
 
-from frappe.utils import flt, cint
+from frappe.utils import flt, cint, nowdate
 
-from frappe import _
+from frappe import throw, _
 import frappe.defaults
-
+from frappe.utils import getdate
 from erpnext.controllers.buying_controller import BuyingController
 from erpnext.accounts.utils import get_account_currency
 from frappe.desk.notifications import clear_doctype_notifications
@@ -52,12 +52,15 @@
 			self.set_status()
 		self.po_required()
 		self.validate_with_previous_doc()
-		self.validate_inspection()
 		self.validate_uom_is_integer("uom", ["qty", "received_qty"])
 		self.validate_uom_is_integer("stock_uom", "stock_qty")
 
 		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({
@@ -93,13 +96,6 @@
 			["qty", "warehouse"])
 		return po_qty, po_warehouse
 
-	def validate_inspection(self):
-		for d in self.get('items'):		 #Enter inspection date for all items that require inspection
-			if frappe.db.get_value("Item", d.item_code, "inspection_required") and not d.qa_no:
-				frappe.msgprint(_("Quality Inspection required for Item {0}").format(d.item_code))
-				if self.docstatus==1:
-					raise frappe.ValidationError
-
 	# Check for Closed status
 	def check_for_closed_status(self, pc_obj):
 		check_list =[]
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py b/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py
index 3278032..9722d87 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py
@@ -1,28 +1,29 @@
 from frappe import _
 
-data = {
-	'fieldname': 'purchase_receipt_no',
-	'non_standard_fieldnames': {
-		'Purchase Invoice': 'purchase_receipt',
-		'Landed Cost Voucher': 'receipt_document'
-	},
-	'internal_links': {
-		'Purchase Order': ['items', 'purchase_order'],
-		'Project': ['items', 'project'],
-		'Quality Inspection': ['items', 'qa_no'],
-	},
-	'transactions': [
-		{
-			'label': _('Related'),
-			'items': ['Purchase Invoice', 'Landed Cost Voucher']
+def get_data():
+	return {
+		'fieldname': 'purchase_receipt_no',
+		'non_standard_fieldnames': {
+			'Purchase Invoice': 'purchase_receipt',
+			'Landed Cost Voucher': 'receipt_document'
 		},
-		{
-			'label': _('Reference'),
-			'items': ['Purchase Order', 'Quality Inspection', 'Project']
+		'internal_links': {
+			'Purchase Order': ['items', 'purchase_order'],
+			'Project': ['items', 'project'],
+			'Quality Inspection': ['items', 'quality_inspection'],
 		},
-		{
-			'label': _('Returns'),
-			'items': ['Stock Entry']
-		},
-	]
-}
\ No newline at end of file
+		'transactions': [
+			{
+				'label': _('Related'),
+				'items': ['Purchase Invoice', 'Landed Cost Voucher']
+			},
+			{
+				'label': _('Reference'),
+				'items': ['Purchase Order', 'Quality Inspection', 'Project']
+			},
+			{
+				'label': _('Returns'),
+				'items': ['Stock Entry']
+			},
+		]
+	}
\ 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 f6e1e3f..d8449f1 100755
--- a/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
+++ b/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
@@ -23,6 +23,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Barcode", 
    "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": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -56,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, 
@@ -74,6 +78,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Item Code", 
    "length": 0, 
    "no_copy": 0, 
@@ -85,6 +90,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": 1, 
@@ -104,6 +110,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 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, 
@@ -129,6 +137,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Item Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -138,6 +147,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, 
@@ -156,6 +166,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Description", 
    "length": 0, 
    "no_copy": 0, 
@@ -164,6 +175,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, 
@@ -182,6 +194,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Description", 
    "length": 0, 
    "no_copy": 0, 
@@ -192,6 +205,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, 
@@ -211,12 +225,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, 
@@ -235,6 +251,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Image", 
    "length": 0, 
    "no_copy": 0, 
@@ -243,6 +260,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, 
@@ -261,6 +279,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Image View", 
    "length": 0, 
    "no_copy": 0, 
@@ -270,6 +289,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, 
@@ -288,6 +308,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Received and Accepted", 
    "length": 0, 
    "no_copy": 0, 
@@ -295,6 +316,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, 
@@ -313,6 +335,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Recd Quantity", 
    "length": 0, 
    "no_copy": 0, 
@@ -323,6 +346,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, 
@@ -342,6 +366,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Accepted Quantity", 
    "length": 0, 
    "no_copy": 0, 
@@ -352,6 +377,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, 
@@ -371,6 +397,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Rejected Quantity", 
    "length": 0, 
    "no_copy": 0, 
@@ -381,6 +408,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, 
@@ -400,12 +428,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, 
@@ -424,6 +454,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "UOM", 
    "length": 0, 
    "no_copy": 0, 
@@ -435,6 +466,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, 
@@ -454,6 +486,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Stock UOM", 
    "length": 0, 
    "no_copy": 0, 
@@ -465,6 +498,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, 
@@ -484,6 +518,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Conversion Factor", 
    "length": 0, 
    "no_copy": 0, 
@@ -494,6 +529,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, 
@@ -513,6 +549,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Rate and Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -520,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, 
@@ -538,6 +576,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Price List Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -546,6 +585,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, 
@@ -565,6 +605,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Discount on Price List Rate (%)", 
    "length": 0, 
    "no_copy": 0, 
@@ -572,6 +613,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, 
@@ -590,12 +632,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, 
@@ -614,6 +658,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Price List Rate (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -622,6 +667,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, 
@@ -640,12 +686,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, 
@@ -664,6 +712,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -675,6 +724,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, 
@@ -694,6 +744,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -704,6 +755,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, 
@@ -722,12 +774,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, 
@@ -746,6 +800,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Rate (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -757,6 +812,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, 
@@ -776,6 +832,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amount (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -787,6 +844,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, 
@@ -806,6 +864,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Pricing Rule", 
    "length": 0, 
    "no_copy": 0, 
@@ -814,6 +873,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, 
@@ -832,6 +892,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -839,6 +900,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, 
@@ -857,6 +919,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Net Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -866,6 +929,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, 
@@ -884,6 +948,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Net Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -893,6 +958,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, 
@@ -911,6 +977,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -918,6 +985,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, 
@@ -936,6 +1004,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Net Rate (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -945,6 +1014,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, 
@@ -963,6 +1033,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Net Amount (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -972,6 +1043,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, 
@@ -990,6 +1062,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Warehouse and Reference", 
    "length": 0, 
    "no_copy": 0, 
@@ -997,6 +1070,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, 
@@ -1015,6 +1089,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Accepted Warehouse", 
    "length": 0, 
    "no_copy": 0, 
@@ -1026,6 +1101,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, 
@@ -1045,6 +1121,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Rejected Warehouse", 
    "length": 0, 
    "no_copy": 1, 
@@ -1056,6 +1133,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, 
@@ -1068,13 +1146,15 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "qa_no", 
+   "depends_on": "eval:!doc.__islocal", 
+   "fieldname": "quality_inspection", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Quality Inspection", 
    "length": 0, 
    "no_copy": 1, 
@@ -1085,6 +1165,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, 
@@ -1103,6 +1184,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -1110,6 +1192,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, 
@@ -1128,6 +1211,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Purchase Order", 
    "length": 0, 
    "no_copy": 1, 
@@ -1139,6 +1223,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, 
@@ -1158,6 +1243,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Required By", 
    "length": 0, 
    "no_copy": 0, 
@@ -1167,6 +1253,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, 
@@ -1185,6 +1272,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Qty as per Stock UOM", 
    "length": 0, 
    "no_copy": 0, 
@@ -1195,6 +1283,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, 
@@ -1214,6 +1303,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -1221,6 +1311,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, 
@@ -1239,6 +1330,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Serial No", 
    "length": 0, 
    "no_copy": 1, 
@@ -1248,6 +1340,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, 
@@ -1266,6 +1359,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Batch No", 
    "length": 0, 
    "no_copy": 0, 
@@ -1276,6 +1370,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, 
@@ -1294,6 +1389,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
@@ -1302,6 +1398,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, 
@@ -1320,6 +1417,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Rejected Serial No", 
    "length": 0, 
    "no_copy": 1, 
@@ -1327,6 +1425,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, 
@@ -1345,6 +1444,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -1352,6 +1452,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, 
@@ -1370,6 +1471,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Project", 
    "length": 0, 
    "no_copy": 0, 
@@ -1378,6 +1480,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, 
@@ -1398,6 +1501,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Cost Center", 
    "length": 0, 
    "no_copy": 0, 
@@ -1406,6 +1510,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, 
@@ -1424,6 +1529,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Purchase Order Item", 
    "length": 0, 
    "no_copy": 1, 
@@ -1434,6 +1540,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, 
@@ -1453,12 +1560,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, 
@@ -1477,6 +1586,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "BOM", 
    "length": 0, 
    "no_copy": 1, 
@@ -1486,6 +1596,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, 
@@ -1504,6 +1615,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Billed Amt", 
    "length": 0, 
    "no_copy": 1, 
@@ -1512,6 +1624,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, 
@@ -1530,6 +1643,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Landed Cost Voucher Amount", 
    "length": 0, 
    "no_copy": 1, 
@@ -1537,6 +1651,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, 
@@ -1555,6 +1670,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Brand", 
    "length": 0, 
    "no_copy": 0, 
@@ -1565,6 +1681,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, 
@@ -1584,6 +1701,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Item Group", 
    "length": 0, 
    "no_copy": 0, 
@@ -1594,6 +1712,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, 
@@ -1612,6 +1731,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Raw Materials Supplied Cost", 
    "length": 0, 
    "no_copy": 1, 
@@ -1623,6 +1743,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, 
@@ -1642,6 +1763,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Item Tax Amount", 
    "length": 0, 
    "no_copy": 1, 
@@ -1653,6 +1775,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, 
@@ -1672,6 +1795,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Valuation Rate", 
    "length": 0, 
    "no_copy": 1, 
@@ -1683,6 +1807,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "80px", 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1703,6 +1828,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Item Tax Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -1712,6 +1838,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, 
@@ -1730,6 +1857,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Page Break", 
    "length": 0, 
    "no_copy": 0, 
@@ -1739,6 +1867,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, 
@@ -1756,7 +1885,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-08-26 04:44:03.973239", 
+ "modified": "2016-11-16 16:04:21.778869", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Purchase Receipt Item", 
diff --git a/erpnext/buying/doctype/quality_inspection/README.md b/erpnext/stock/doctype/quality_inspection/README.md
similarity index 100%
rename from erpnext/buying/doctype/quality_inspection/README.md
rename to erpnext/stock/doctype/quality_inspection/README.md
diff --git a/erpnext/buying/doctype/quality_inspection/__init__.py b/erpnext/stock/doctype/quality_inspection/__init__.py
similarity index 100%
rename from erpnext/buying/doctype/quality_inspection/__init__.py
rename to erpnext/stock/doctype/quality_inspection/__init__.py
diff --git a/erpnext/stock/doctype/quality_inspection/quality_inspection.js b/erpnext/stock/doctype/quality_inspection/quality_inspection.js
new file mode 100644
index 0000000..5d7b6b4
--- /dev/null
+++ b/erpnext/stock/doctype/quality_inspection/quality_inspection.js
@@ -0,0 +1,40 @@
+// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+// License: GNU General Public License v3. See license.txt
+
+cur_frm.cscript.refresh = cur_frm.cscript.inspection_type;
+
+// item code based on GRN/DN
+cur_frm.fields_dict['item_code'].get_query = function(doc, cdt, cdn) {
+	if (doc.reference_type && doc.reference_name) {
+		return {
+			query: "erpnext.stock.doctype.quality_inspection.quality_inspection.item_query",
+			filters: {
+				"from": doc.reference_type,
+				"parent": doc.reference_name
+			}
+		}
+	}
+}
+
+// Serial No based on item_code
+cur_frm.fields_dict['item_serial_no'].get_query = function(doc, cdt, cdn) {
+	var filters = {};
+	if (doc.item_code) {
+		filters = {
+			'item_code': doc.item_code
+		}
+	}
+	return { filters: filters }
+}
+
+cur_frm.set_query("batch_no", function(doc) {
+	return {
+		filters: {
+			"item": doc.item_code
+		}
+	}
+})
+
+cur_frm.add_fetch('item_code', 'item_name', 'item_name');
+cur_frm.add_fetch('item_code', 'description', 'description');
+
diff --git a/erpnext/buying/doctype/quality_inspection/quality_inspection.json b/erpnext/stock/doctype/quality_inspection/quality_inspection.json
similarity index 83%
rename from erpnext/buying/doctype/quality_inspection/quality_inspection.json
rename to erpnext/stock/doctype/quality_inspection/quality_inspection.json
index 06246cc..077c12d 100644
--- a/erpnext/buying/doctype/quality_inspection/quality_inspection.json
+++ b/erpnext/stock/doctype/quality_inspection/quality_inspection.json
@@ -9,11 +9,13 @@
  "docstatus": 0, 
  "doctype": "DocType", 
  "editable_grid": 1, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "naming_series", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -21,6 +23,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Series", 
    "length": 0, 
    "no_copy": 1, 
@@ -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,6 +43,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "Today", 
    "fieldname": "report_date", 
    "fieldtype": "Date", 
@@ -47,6 +52,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Report Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -56,6 +62,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, 
@@ -66,6 +73,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_4", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -73,6 +81,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 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": "inspection_type", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -97,6 +108,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Inspection Type", 
    "length": 0, 
    "no_copy": 0, 
@@ -107,6 +119,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, 
@@ -117,74 +130,25 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "purchase_receipt_no", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "label": "Purchase Receipt No", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "purchase_receipt_no", 
-   "oldfieldtype": "Link", 
-   "options": "Purchase Receipt", 
-   "permlevel": 0, 
-   "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": "delivery_note_no", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "label": "Delivery Note No", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "delivery_note_no", 
-   "oldfieldtype": "Link", 
-   "options": "Delivery Note", 
-   "permlevel": 0, 
-   "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": "section_break_7", 
-   "fieldtype": "Section Break", 
+   "columns": 0, 
+   "fieldname": "reference_type", 
+   "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Reference Type", 
    "length": 0, 
    "no_copy": 0, 
+   "options": "\nPurchase Receipt\nPurchase Invoice\nDelivery Note\nSales Invoice", 
    "permlevel": 0, 
    "precision": "", 
    "print_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,6 +159,65 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "", 
+   "fieldname": "reference_name", 
+   "fieldtype": "Dynamic Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Reference Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "purchase_receipt_no", 
+   "oldfieldtype": "Link", 
+   "options": "reference_type", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "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_7", 
+   "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": "item_code", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -202,6 +225,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Item Code", 
    "length": 0, 
    "no_copy": 0, 
@@ -212,6 +236,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, 
@@ -222,6 +247,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "item_serial_no", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -229,6 +255,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Item Serial No", 
    "length": 0, 
    "no_copy": 0, 
@@ -239,6 +266,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, 
@@ -249,6 +277,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "batch_no", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -256,6 +285,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Batch No", 
    "length": 0, 
    "no_copy": 0, 
@@ -266,6 +296,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, 
@@ -276,6 +307,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "sample_size", 
    "fieldtype": "Float", 
    "hidden": 0, 
@@ -283,6 +315,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Sample Size", 
    "length": 0, 
    "no_copy": 0, 
@@ -292,6 +325,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, 
@@ -302,6 +336,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break1", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -309,6 +344,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
@@ -316,6 +352,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, 
@@ -327,6 +364,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "item_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -334,6 +372,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Item Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -342,6 +381,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, 
@@ -352,6 +392,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "description", 
    "fieldtype": "Small Text", 
    "hidden": 0, 
@@ -359,6 +400,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Description", 
    "length": 0, 
    "no_copy": 0, 
@@ -368,6 +410,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, 
@@ -379,6 +422,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_14", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -386,6 +430,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -393,6 +438,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, 
@@ -403,6 +449,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "user", 
    "fieldname": "inspected_by", 
    "fieldtype": "Link", 
@@ -411,6 +458,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Inspected By", 
    "length": 0, 
    "no_copy": 0, 
@@ -421,6 +469,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, 
@@ -431,6 +480,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "verified_by", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -438,6 +488,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Verified By", 
    "length": 0, 
    "no_copy": 0, 
@@ -447,6 +498,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, 
@@ -457,6 +509,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_17", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -464,6 +517,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -471,6 +525,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, 
@@ -481,6 +536,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "remarks", 
    "fieldtype": "Text", 
    "hidden": 0, 
@@ -488,6 +544,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Remarks", 
    "length": 0, 
    "no_copy": 1, 
@@ -497,6 +554,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, 
@@ -507,6 +565,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "amended_from", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -514,6 +573,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amended From", 
    "length": 0, 
    "no_copy": 1, 
@@ -524,6 +584,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, 
@@ -534,6 +595,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "specification_details", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -541,6 +603,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
@@ -550,6 +613,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, 
@@ -560,6 +624,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "get_specification_details", 
    "fieldtype": "Button", 
    "hidden": 0, 
@@ -567,6 +632,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Get Specification Details", 
    "length": 0, 
    "no_copy": 0, 
@@ -575,6 +641,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, 
@@ -585,6 +652,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "readings", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -592,6 +660,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Readings", 
    "length": 0, 
    "no_copy": 0, 
@@ -602,6 +671,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, 
@@ -611,7 +681,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-search", 
+ "icon": "fa fa-search", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
@@ -620,9 +690,9 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-07-31 11:42:40.498926", 
+ "modified": "2016-11-16 04:26:57.853527", 
  "modified_by": "Administrator", 
- "module": "Buying", 
+ "module": "Stock", 
  "name": "Quality Inspection", 
  "owner": "Administrator", 
  "permissions": [
@@ -636,6 +706,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -650,7 +721,7 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
- "search_fields": "item_code, report_date, purchase_receipt_no, delivery_note_no", 
+ "search_fields": "item_code, report_date, reference_name", 
  "sort_order": "ASC", 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/buying/doctype/quality_inspection/quality_inspection.py b/erpnext/stock/doctype/quality_inspection/quality_inspection.py
similarity index 73%
rename from erpnext/buying/doctype/quality_inspection/quality_inspection.py
rename to erpnext/stock/doctype/quality_inspection/quality_inspection.py
index d1d9518..3ba3056 100644
--- a/erpnext/buying/doctype/quality_inspection/quality_inspection.py
+++ b/erpnext/stock/doctype/quality_inspection/quality_inspection.py
@@ -24,19 +24,20 @@
 			child.status = 'Accepted'
 
 	def on_submit(self):
-		if self.purchase_receipt_no:
-			frappe.db.sql("""update `tabPurchase Receipt Item` t1, `tabPurchase Receipt` t2
-				set t1.qa_no = %s, t2.modified = %s
-				where t1.parent = %s and t1.item_code = %s and t1.parent = t2.name""",
-				(self.name, self.modified, self.purchase_receipt_no,
-					self.item_code))
-
+		if self.reference_type and self.reference_name:
+			frappe.db.sql("""update `tab{doctype} Item` t1, `tab{doctype}` t2
+				set t1.quality_inspection = %s, t2.modified = %s
+				where t1.parent = %s and t1.item_code = %s and t1.parent = t2.name"""
+				.format(doctype=self.reference_type),
+				(self.name, self.modified, self.reference_name, self.item_code))
+				
 	def on_cancel(self):
-		if self.purchase_receipt_no:
-			frappe.db.sql("""update `tabPurchase Receipt Item` t1, `tabPurchase Receipt` t2
-				set t1.qa_no = '', t2.modified = %s
-				where t1.parent = %s and t1.item_code = %s and t1.parent = t2.name""",
-				(self.modified, self.purchase_receipt_no, self.item_code))
+		if self.reference_type and self.reference_name:
+			frappe.db.sql("""update `tab{doctype} Item` t1, `tab{doctype}` t2
+				set t1.quality_inspection = null, t2.modified = %s
+				where t1.parent = %s and t1.item_code = %s and t1.parent = t2.name"""
+				.format(doctype=self.reference_type),
+				(self.modified, self.reference_name, self.item_code))
 
 def item_query(doctype, txt, searchfield, start, page_len, filters):
 	if filters.get("from"):
diff --git a/erpnext/buying/doctype/quality_inspection/test_quality_inspection.py b/erpnext/stock/doctype/quality_inspection/test_quality_inspection.py
similarity index 100%
rename from erpnext/buying/doctype/quality_inspection/test_quality_inspection.py
rename to erpnext/stock/doctype/quality_inspection/test_quality_inspection.py
diff --git a/erpnext/buying/doctype/quality_inspection_reading/README.md b/erpnext/stock/doctype/quality_inspection_reading/README.md
similarity index 100%
rename from erpnext/buying/doctype/quality_inspection_reading/README.md
rename to erpnext/stock/doctype/quality_inspection_reading/README.md
diff --git a/erpnext/buying/doctype/quality_inspection_reading/__init__.py b/erpnext/stock/doctype/quality_inspection_reading/__init__.py
similarity index 100%
rename from erpnext/buying/doctype/quality_inspection_reading/__init__.py
rename to erpnext/stock/doctype/quality_inspection_reading/__init__.py
diff --git a/erpnext/buying/doctype/quality_inspection_reading/quality_inspection_reading.json b/erpnext/stock/doctype/quality_inspection_reading/quality_inspection_reading.json
similarity index 87%
rename from erpnext/buying/doctype/quality_inspection_reading/quality_inspection_reading.json
rename to erpnext/stock/doctype/quality_inspection_reading/quality_inspection_reading.json
index 099c768..a3b43e9 100644
--- a/erpnext/buying/doctype/quality_inspection_reading/quality_inspection_reading.json
+++ b/erpnext/stock/doctype/quality_inspection_reading/quality_inspection_reading.json
@@ -14,6 +14,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "specification", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -21,6 +22,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Parameter", 
    "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": "value", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -47,6 +51,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Acceptance Criteria", 
    "length": 0, 
    "no_copy": 0, 
@@ -56,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, 
@@ -66,6 +72,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "reading_1", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -73,6 +80,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Reading 1", 
    "length": 0, 
    "no_copy": 0, 
@@ -82,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, 
@@ -92,6 +101,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "reading_2", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -99,6 +109,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Reading 2", 
    "length": 0, 
    "no_copy": 0, 
@@ -108,6 +119,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,6 +130,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "reading_3", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -125,6 +138,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Reading 3", 
    "length": 0, 
    "no_copy": 0, 
@@ -134,6 +148,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, 
@@ -144,6 +159,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "reading_4", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -151,6 +167,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Reading 4", 
    "length": 0, 
    "no_copy": 0, 
@@ -160,6 +177,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,6 +188,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "reading_5", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -177,6 +196,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Reading 5", 
    "length": 0, 
    "no_copy": 0, 
@@ -186,6 +206,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,6 +217,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "reading_6", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -203,6 +225,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Reading 6", 
    "length": 0, 
    "no_copy": 0, 
@@ -212,6 +235,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, 
@@ -222,6 +246,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "reading_7", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -229,6 +254,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Reading 7", 
    "length": 0, 
    "no_copy": 0, 
@@ -238,6 +264,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, 
@@ -248,6 +275,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "reading_8", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -255,6 +283,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Reading 8", 
    "length": 0, 
    "no_copy": 0, 
@@ -264,6 +293,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, 
@@ -274,6 +304,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "reading_9", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -281,6 +312,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Reading 9", 
    "length": 0, 
    "no_copy": 0, 
@@ -290,6 +322,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, 
@@ -300,6 +333,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "reading_10", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -307,6 +341,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Reading 10", 
    "length": 0, 
    "no_copy": 0, 
@@ -316,6 +351,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, 
@@ -326,6 +362,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "Accepted", 
    "fieldname": "status", 
    "fieldtype": "Select", 
@@ -334,6 +371,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Status", 
    "length": 0, 
    "no_copy": 0, 
@@ -344,6 +382,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,9 +400,9 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-07-11 03:28:06.296900", 
+ "modified": "2016-11-16 03:55:50.046712", 
  "modified_by": "Administrator", 
- "module": "Buying", 
+ "module": "Stock", 
  "name": "Quality Inspection Reading", 
  "owner": "Administrator", 
  "permissions": [], 
diff --git a/erpnext/buying/doctype/quality_inspection_reading/quality_inspection_reading.py b/erpnext/stock/doctype/quality_inspection_reading/quality_inspection_reading.py
similarity index 100%
rename from erpnext/buying/doctype/quality_inspection_reading/quality_inspection_reading.py
rename to erpnext/stock/doctype/quality_inspection_reading/quality_inspection_reading.py
diff --git a/erpnext/stock/doctype/serial_no/serial_no.json b/erpnext/stock/doctype/serial_no/serial_no.json
index d39c6d9..c7ba178 100644
--- a/erpnext/stock/doctype/serial_no/serial_no.json
+++ b/erpnext/stock/doctype/serial_no/serial_no.json
@@ -3,17 +3,20 @@
  "allow_import": 1, 
  "allow_rename": 1, 
  "autoname": "field:serial_no", 
+ "beta": 0, 
  "creation": "2013-05-16 10:59:15", 
  "custom": 0, 
  "description": "Distinct unit of an Item", 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Setup", 
+ "editable_grid": 0, 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "details", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -21,6 +24,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
@@ -29,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, 
@@ -39,6 +44,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break0", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -46,12 +52,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 +70,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "serial_no", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -69,6 +78,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Serial No", 
    "length": 0, 
    "no_copy": 1, 
@@ -78,6 +88,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, 
@@ -88,6 +99,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "item_code", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -95,6 +107,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Item Code", 
    "length": 0, 
    "no_copy": 0, 
@@ -105,6 +118,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, 
@@ -115,6 +129,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt", 
    "fieldname": "warehouse", 
    "fieldtype": "Link", 
@@ -123,6 +138,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Warehouse", 
    "length": 0, 
    "no_copy": 1, 
@@ -133,6 +149,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, 
@@ -143,6 +160,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break1", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -150,12 +168,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, 
@@ -166,6 +186,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "item_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -173,6 +194,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Item Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -180,6 +202,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, 
@@ -190,6 +213,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "description", 
    "fieldtype": "Text", 
    "hidden": 0, 
@@ -197,6 +221,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Description", 
    "length": 0, 
    "no_copy": 0, 
@@ -206,6 +231,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, 
@@ -217,6 +243,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "", 
    "fieldname": "item_group", 
    "fieldtype": "Link", 
@@ -225,6 +252,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Item Group", 
    "length": 0, 
    "no_copy": 0, 
@@ -235,6 +263,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, 
@@ -245,6 +274,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "brand", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -252,6 +282,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Brand", 
    "length": 0, 
    "no_copy": 0, 
@@ -262,6 +293,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,6 +304,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "purchase_details", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -279,6 +312,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Purchase / Manufacture Details", 
    "length": 0, 
    "no_copy": 0, 
@@ -286,6 +320,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,6 +331,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break2", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -303,12 +339,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, 
@@ -320,6 +358,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "purchase_document_type", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -327,6 +366,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Creation Document Type", 
    "length": 0, 
    "no_copy": 1, 
@@ -335,6 +375,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, 
@@ -345,6 +386,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "purchase_document_no", 
    "fieldtype": "Dynamic Link", 
    "hidden": 0, 
@@ -352,6 +394,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Creation Document No", 
    "length": 0, 
    "no_copy": 1, 
@@ -360,6 +403,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,6 +414,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "purchase_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -377,6 +422,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Creation Date", 
    "length": 0, 
    "no_copy": 1, 
@@ -386,6 +432,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, 
@@ -396,6 +443,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "purchase_time", 
    "fieldtype": "Time", 
    "hidden": 0, 
@@ -403,6 +451,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Creation Time", 
    "length": 0, 
    "no_copy": 1, 
@@ -410,6 +459,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, 
@@ -420,6 +470,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "purchase_rate", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -427,6 +478,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Incoming Rate", 
    "length": 0, 
    "no_copy": 1, 
@@ -437,6 +489,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, 
@@ -447,6 +500,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break3", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -454,12 +508,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, 
@@ -471,6 +527,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "supplier", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -478,6 +535,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Supplier", 
    "length": 0, 
    "no_copy": 1, 
@@ -486,6 +544,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, 
@@ -496,6 +555,7 @@
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "supplier_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -503,6 +563,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Supplier Name", 
    "length": 0, 
    "no_copy": 1, 
@@ -510,6 +571,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, 
@@ -520,6 +582,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "delivery_details", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -527,6 +590,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Delivery Details", 
    "length": 0, 
    "no_copy": 0, 
@@ -535,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, 
@@ -545,6 +610,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "delivery_document_type", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -552,6 +618,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Delivery Document Type", 
    "length": 0, 
    "no_copy": 1, 
@@ -560,6 +627,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, 
@@ -570,6 +638,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "delivery_document_no", 
    "fieldtype": "Dynamic Link", 
    "hidden": 0, 
@@ -577,6 +646,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Delivery Document No", 
    "length": 0, 
    "no_copy": 1, 
@@ -585,6 +655,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, 
@@ -595,6 +666,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "delivery_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -602,6 +674,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Delivery Date", 
    "length": 0, 
    "no_copy": 1, 
@@ -611,6 +684,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, 
@@ -621,6 +695,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "delivery_time", 
    "fieldtype": "Time", 
    "hidden": 0, 
@@ -628,6 +703,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Delivery Time", 
    "length": 0, 
    "no_copy": 1, 
@@ -635,6 +711,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, 
@@ -645,6 +722,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "is_cancelled", 
    "fieldtype": "Select", 
    "hidden": 1, 
@@ -652,6 +730,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Is Cancelled", 
    "length": 0, 
    "no_copy": 0, 
@@ -662,6 +741,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 1, 
    "reqd": 0, 
    "search_index": 0, 
@@ -672,6 +752,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break5", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -679,12 +760,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, 
@@ -696,6 +779,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "customer", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -703,6 +787,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer", 
    "length": 0, 
    "no_copy": 1, 
@@ -713,6 +798,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, 
@@ -723,6 +809,7 @@
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "customer_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -730,6 +817,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer Name", 
    "length": 0, 
    "no_copy": 1, 
@@ -739,6 +827,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, 
@@ -749,6 +838,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "warranty_amc_details", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -756,6 +846,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Warranty / AMC Details", 
    "length": 0, 
    "no_copy": 0, 
@@ -763,6 +854,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, 
@@ -773,6 +865,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break6", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -780,12 +873,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, 
@@ -797,6 +892,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "maintenance_status", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -804,6 +900,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Maintenance Status", 
    "length": 0, 
    "no_copy": 0, 
@@ -814,6 +911,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, 
@@ -825,6 +923,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "warranty_period", 
    "fieldtype": "Int", 
    "hidden": 0, 
@@ -832,6 +931,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Warranty Period (Days)", 
    "length": 0, 
    "no_copy": 0, 
@@ -841,6 +941,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, 
@@ -852,6 +953,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break7", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -859,12 +961,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, 
@@ -876,6 +980,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "warranty_expiry_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -883,6 +988,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Warranty Expiry Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -892,6 +998,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, 
@@ -903,6 +1010,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "amc_expiry_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -910,6 +1018,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "AMC Expiry Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -919,6 +1028,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, 
@@ -930,6 +1040,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "more_info", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -937,6 +1048,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "More Information", 
    "length": 0, 
    "no_copy": 0, 
@@ -944,6 +1056,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, 
@@ -954,6 +1067,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "serial_no_details", 
    "fieldtype": "Text Editor", 
    "hidden": 0, 
@@ -961,6 +1075,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Serial No Details", 
    "length": 0, 
    "no_copy": 0, 
@@ -968,6 +1083,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, 
@@ -978,6 +1094,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "company", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -985,6 +1102,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -993,6 +1111,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 1, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 1, 
@@ -1002,15 +1121,16 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-barcode", 
+ "icon": "fa fa-barcode", 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-04-06 05:39:46.427967", 
+ "modified": "2016-11-07 05:08:48.659186", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Serial No", 
@@ -1026,6 +1146,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1046,6 +1167,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1066,6 +1188,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1077,6 +1200,7 @@
    "write": 0
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "item_code", 
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.js b/erpnext/stock/doctype/stock_entry/stock_entry.js
index 7c9e1e6..a5a6ced 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.js
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.js
@@ -348,6 +348,7 @@
 }
 
 cur_frm.cscript.purpose = function(doc, cdt, cdn) {
+	cur_frm.fields_dict.items.grid.refresh();
 	cur_frm.cscript.toggle_related_fields(doc);
 }
 
@@ -378,60 +379,6 @@
 	}
 }
 
-cur_frm.cscript.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
-		};
-		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");
-				}
-			}
-		});
-	}
-}
-
-cur_frm.cscript.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);
-				}
-			}
-		});
-	}
-}
-
-cur_frm.cscript.uom = function(doc, cdt, cdn) {
-	var d = locals[cdt][cdn];
-	if(d.uom && d.item_code){
-		var arg = {'item_code':d.item_code, 'uom':d.uom, 'qty':d.qty}
-		return get_server_fields('get_uom_details', JSON.stringify(arg),
-			'items', doc, cdt, cdn, 1);
-	}
-}
-
 cur_frm.cscript.validate = function(doc, cdt, cdn) {
 	cur_frm.cscript.validate_items(doc);
 }
@@ -452,18 +399,116 @@
 	erpnext.utils.copy_value_in_all_row(doc, cdt, cdn, "items", "cost_center");
 }
 
-cur_frm.cscript.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);
-		}
-	}
-}
-
 
 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);
+					}
+				}
+			});
+		},
+})
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.json b/erpnext/stock/doctype/stock_entry/stock_entry.json
index 0ab80c2..ccf28fd 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.json
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.json
@@ -3,16 +3,20 @@
  "allow_import": 1, 
  "allow_rename": 0, 
  "autoname": "naming_series:", 
+ "beta": 0, 
  "creation": "2013-04-09 11:43:55", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Document", 
+ "editable_grid": 0, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "items_section", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -20,6 +24,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 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,6 +44,7 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "{purpose}", 
    "fieldname": "title", 
    "fieldtype": "Data", 
@@ -46,6 +53,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Title", 
    "length": 0, 
    "no_copy": 1, 
@@ -54,6 +62,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, 
@@ -64,6 +73,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "naming_series", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -71,6 +81,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Series", 
    "length": 0, 
    "no_copy": 1, 
@@ -81,6 +92,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, 
@@ -91,6 +103,7 @@
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "Material Issue", 
    "fieldname": "purpose", 
    "fieldtype": "Select", 
@@ -99,6 +112,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Purpose", 
    "length": 0, 
    "no_copy": 0, 
@@ -109,6 +123,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, 
@@ -119,6 +134,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "company", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -126,6 +142,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -136,6 +153,7 @@
    "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, 
@@ -146,6 +164,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:in_list([\"Material Transfer for Manufacture\", \"Manufacture\"], doc.purpose)", 
    "fieldname": "production_order", 
    "fieldtype": "Link", 
@@ -154,6 +173,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Production Order", 
    "length": 0, 
    "no_copy": 0, 
@@ -164,6 +184,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, 
@@ -174,6 +195,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.purpose==\"Subcontract\"", 
    "fieldname": "purchase_order", 
    "fieldtype": "Link", 
@@ -182,6 +204,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Purchase Order", 
    "length": 0, 
    "no_copy": 0, 
@@ -191,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, 
@@ -201,6 +225,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.purpose==\"Sales Return\"", 
    "fieldname": "delivery_note_no", 
    "fieldtype": "Link", 
@@ -209,6 +234,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Delivery Note No", 
    "length": 0, 
    "no_copy": 1, 
@@ -219,6 +245,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, 
@@ -229,6 +256,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.purpose==\"Sales Return\"", 
    "fieldname": "sales_invoice_no", 
    "fieldtype": "Link", 
@@ -237,6 +265,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Sales Invoice No", 
    "length": 0, 
    "no_copy": 1, 
@@ -245,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, 
@@ -255,6 +285,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.purpose==\"Purchase Return\"", 
    "fieldname": "purchase_receipt_no", 
    "fieldtype": "Link", 
@@ -263,6 +294,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Purchase Receipt No", 
    "length": 0, 
    "no_copy": 1, 
@@ -273,6 +305,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, 
@@ -283,6 +316,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:in_list([\"Material Issue\", \"Material Transfer\", \"Manufacture\", \"Repack\", \t\t\t\t\t\"Subcontract\", \"Material Transfer for Manufacture\"], doc.purpose)", 
    "fieldname": "from_bom", 
    "fieldtype": "Check", 
@@ -291,6 +325,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "From BOM", 
    "length": 0, 
    "no_copy": 0, 
@@ -299,6 +334,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, 
@@ -309,6 +345,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "col2", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -316,6 +353,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
@@ -324,6 +362,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "50%", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -335,6 +374,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "Today", 
    "fieldname": "posting_date", 
    "fieldtype": "Date", 
@@ -343,6 +383,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Posting Date", 
    "length": 0, 
    "no_copy": 1, 
@@ -352,6 +393,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, 
@@ -362,6 +404,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "posting_time", 
    "fieldtype": "Time", 
    "hidden": 0, 
@@ -369,6 +412,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Posting Time", 
    "length": 0, 
    "no_copy": 1, 
@@ -378,6 +422,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, 
@@ -388,6 +433,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval: doc.from_bom && (doc.purpose!==\"Sales Return\" && doc.purpose!==\"Purchase Return\")", 
    "fieldname": "sb1", 
    "fieldtype": "Section Break", 
@@ -396,6 +442,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
@@ -403,6 +450,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, 
@@ -413,6 +461,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "from_bom", 
    "fieldname": "bom_no", 
    "fieldtype": "Link", 
@@ -421,6 +470,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "BOM No", 
    "length": 0, 
    "no_copy": 0, 
@@ -429,6 +479,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, 
@@ -439,6 +490,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "from_bom", 
    "description": "As per Stock UOM", 
    "fieldname": "fg_completed_qty", 
@@ -448,6 +500,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "For Quantity", 
    "length": 0, 
    "no_copy": 0, 
@@ -457,6 +510,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, 
@@ -467,6 +521,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "cb1", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -474,12 +529,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, 
@@ -490,6 +547,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "1", 
    "depends_on": "from_bom", 
    "description": "Including items for sub assemblies", 
@@ -500,6 +558,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Use Multi-Level BOM", 
    "length": 0, 
    "no_copy": 0, 
@@ -507,6 +566,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, 
@@ -517,6 +577,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "from_bom", 
    "fieldname": "get_items", 
    "fieldtype": "Button", 
@@ -525,6 +586,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Get Items", 
    "length": 0, 
    "no_copy": 0, 
@@ -533,6 +595,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, 
@@ -543,6 +606,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_12", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -550,6 +614,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -557,6 +622,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, 
@@ -567,6 +633,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "from_warehouse", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -574,6 +641,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Default Source Warehouse", 
    "length": 0, 
    "no_copy": 1, 
@@ -584,6 +652,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, 
@@ -594,6 +663,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "cb0", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -601,12 +671,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, 
@@ -617,6 +689,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "to_warehouse", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -624,6 +697,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Default Target Warehouse", 
    "length": 0, 
    "no_copy": 1, 
@@ -634,6 +708,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, 
@@ -644,6 +719,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "sb0", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -651,6 +727,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "options": "Simple", 
@@ -658,6 +735,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, 
@@ -668,6 +746,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "items", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -675,6 +754,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Items", 
    "length": 0, 
    "no_copy": 0, 
@@ -685,6 +765,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, 
@@ -695,6 +776,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "", 
    "fieldname": "get_stock_and_rate", 
    "fieldtype": "Button", 
@@ -703,6 +785,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Update Rate and Availability", 
    "length": 0, 
    "no_copy": 0, 
@@ -712,6 +795,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, 
@@ -722,6 +806,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_19", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -729,6 +814,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -736,6 +822,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, 
@@ -746,6 +833,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "total_incoming_value", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -753,6 +841,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Incoming Value", 
    "length": 0, 
    "no_copy": 0, 
@@ -762,6 +851,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, 
@@ -772,6 +862,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_22", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -779,6 +870,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -786,6 +878,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, 
@@ -796,6 +889,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "total_outgoing_value", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -803,6 +897,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Outgoing Value", 
    "length": 0, 
    "no_copy": 0, 
@@ -812,6 +907,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, 
@@ -822,6 +918,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "value_difference", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -829,6 +926,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Value Difference (Out - In)", 
    "length": 0, 
    "no_copy": 0, 
@@ -838,6 +936,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 1, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -849,6 +948,7 @@
    "bold": 0, 
    "collapsible": 1, 
    "collapsible_depends_on": "total_additional_costs", 
+   "columns": 0, 
    "fieldname": "additional_costs_section", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -856,6 +956,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Additional Costs", 
    "length": 0, 
    "no_copy": 0, 
@@ -864,6 +965,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, 
@@ -874,6 +976,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "additional_costs", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -881,6 +984,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Additional Costs", 
    "length": 0, 
    "no_copy": 0, 
@@ -890,6 +994,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, 
@@ -900,6 +1005,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "total_additional_costs", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -907,6 +1013,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Additional Costs", 
    "length": 0, 
    "no_copy": 0, 
@@ -916,6 +1023,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 1, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -926,6 +1034,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
+   "columns": 0, 
    "depends_on": "eval: in_list([\"Sales Return\", \"Purchase Return\", \"Subcontract\"], doc.purpose)", 
    "fieldname": "contact_section", 
    "fieldtype": "Section Break", 
@@ -934,6 +1043,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer or Supplier Details", 
    "length": 0, 
    "no_copy": 0, 
@@ -941,6 +1051,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, 
@@ -951,6 +1062,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.purpose==\"Purchase Return\" || doc.purpose==\"Subcontract\"", 
    "fieldname": "supplier", 
    "fieldtype": "Link", 
@@ -959,6 +1071,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Supplier", 
    "length": 0, 
    "no_copy": 1, 
@@ -969,6 +1082,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, 
@@ -979,6 +1093,7 @@
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.purpose==\"Purchase Return\" || doc.purpose==\"Subcontract\"", 
    "fieldname": "supplier_name", 
    "fieldtype": "Data", 
@@ -987,6 +1102,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Supplier Name", 
    "length": 0, 
    "no_copy": 1, 
@@ -996,6 +1112,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, 
@@ -1006,6 +1123,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.purpose==\"Purchase Return\" || doc.purpose==\"Subcontract\"", 
    "fieldname": "supplier_address", 
    "fieldtype": "Small Text", 
@@ -1014,6 +1132,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Supplier Address", 
    "length": 0, 
    "no_copy": 1, 
@@ -1023,6 +1142,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, 
@@ -1033,6 +1153,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_39", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -1040,6 +1161,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -1047,6 +1169,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, 
@@ -1057,6 +1180,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.purpose==\"Sales Return\"", 
    "fieldname": "customer", 
    "fieldtype": "Link", 
@@ -1065,6 +1189,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer", 
    "length": 0, 
    "no_copy": 1, 
@@ -1075,6 +1200,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, 
@@ -1085,6 +1211,7 @@
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.purpose==\"Sales Return\"", 
    "fieldname": "customer_name", 
    "fieldtype": "Data", 
@@ -1093,6 +1220,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer Name", 
    "length": 0, 
    "no_copy": 1, 
@@ -1102,6 +1230,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, 
@@ -1112,6 +1241,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.purpose==\"Sales Return\"", 
    "fieldname": "customer_address", 
    "fieldtype": "Small Text", 
@@ -1120,6 +1250,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer Address", 
    "length": 0, 
    "no_copy": 1, 
@@ -1129,6 +1260,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, 
@@ -1139,6 +1271,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
+   "columns": 0, 
    "fieldname": "printing_settings", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -1146,6 +1279,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Printing Settings", 
    "length": 0, 
    "no_copy": 0, 
@@ -1154,6 +1288,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, 
@@ -1164,6 +1299,7 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "select_print_heading", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -1171,6 +1307,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Print Heading", 
    "length": 0, 
    "no_copy": 0, 
@@ -1181,6 +1318,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, 
@@ -1191,6 +1329,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "letter_head", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -1198,6 +1337,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Letter Head", 
    "length": 0, 
    "no_copy": 0, 
@@ -1207,6 +1347,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, 
@@ -1217,6 +1358,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
+   "columns": 0, 
    "fieldname": "more_info", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -1224,6 +1366,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "More Information", 
    "length": 0, 
    "no_copy": 0, 
@@ -1232,6 +1375,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, 
@@ -1242,6 +1386,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "project", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -1249,6 +1394,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Project", 
    "length": 0, 
    "no_copy": 0, 
@@ -1258,6 +1404,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, 
@@ -1268,6 +1415,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "remarks", 
    "fieldtype": "Text", 
    "hidden": 0, 
@@ -1275,6 +1423,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Remarks", 
    "length": 0, 
    "no_copy": 1, 
@@ -1284,6 +1433,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, 
@@ -1294,6 +1444,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "col5", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -1301,6 +1452,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -1308,6 +1460,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "50%", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1319,6 +1472,8 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "total_amount", 
    "fieldname": "total_amount", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -1326,14 +1481,16 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Amount", 
    "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
+   "print_hide_if_no_value": 1, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1344,6 +1501,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "amended_from", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -1351,6 +1509,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amended From", 
    "length": 0, 
    "no_copy": 1, 
@@ -1361,6 +1520,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, 
@@ -1371,6 +1531,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "credit_note", 
    "fieldtype": "Link", 
    "hidden": 1, 
@@ -1378,6 +1539,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Credit Note", 
    "length": 0, 
    "no_copy": 0, 
@@ -1387,6 +1549,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, 
@@ -1396,15 +1559,16 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-file-text", 
+ "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-09-08 06:40:03.284036", 
+ "modified": "2016-11-07 05:08:23.746175", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Stock Entry", 
@@ -1420,6 +1584,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1440,6 +1605,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1460,6 +1626,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1480,6 +1647,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1491,6 +1659,7 @@
    "write": 1
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "posting_date, from_warehouse, to_warehouse, purpose, remarks", 
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py
index 44782d5..c5a03e6 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.py
@@ -31,7 +31,7 @@
 			item.update(get_bin_details(item.item_code, item.s_warehouse))
 
 	def validate(self):
-		self.pro_doc = None
+		self.pro_doc = frappe._dict()
 		if self.production_order:
 			self.pro_doc = frappe.get_doc('Production Order', self.production_order)
 
@@ -148,7 +148,7 @@
 						if not d.t_warehouse:
 							frappe.throw(_("Target warehouse is mandatory for row {0}").format(d.idx))
 
-						elif self.pro_doc and cstr(d.t_warehouse) != self.pro_doc.fg_warehouse:
+						elif self.pro_doc and (cstr(d.t_warehouse) != self.pro_doc.fg_warehouse and cstr(d.t_warehouse) != self.pro_doc.scrap_warehouse):
 							frappe.throw(_("Target warehouse in row {0} must be same as Production Order").format(d.idx))
 
 					else:
@@ -238,6 +238,7 @@
 				d.serial_no = transferred_serial_no
 
 	def get_stock_and_rate(self):
+		self.set_production_order_details()
 		self.set_transfer_qty()
 		self.set_actual_qty()
 		self.calculate_rate_and_amount()
@@ -252,6 +253,7 @@
 	def set_basic_rate(self, force=False, update_finished_item_rate=True):
 		"""get stock and incoming rate on posting date"""
 		raw_material_cost = 0.0
+		scrap_material_cost = 0.0
 		fg_basic_rate = 0.0
 
 		for d in self.get('items'):
@@ -276,16 +278,28 @@
 				if not d.t_warehouse:
 					raw_material_cost += flt(d.basic_amount)
 
+			# get scrap items basic rate
+			if d.bom_no:
+				if not flt(d.basic_rate) and getattr(self, "pro_doc", frappe._dict()).scrap_warehouse == d.t_warehouse:
+					basic_rate = flt(get_incoming_rate(args), self.precision("basic_rate", d))
+					if basic_rate > 0:
+						d.basic_rate = basic_rate
+					d.basic_amount = flt(flt(d.transfer_qty) * flt(d.basic_rate), d.precision("basic_amount"))
+
+				if getattr(self, "pro_doc", frappe._dict()).scrap_warehouse == d.t_warehouse:
+
+					scrap_material_cost += flt(d.basic_amount)
+
 		number_of_fg_items = len([t.t_warehouse for t in self.get("items") if t.t_warehouse])
 		if (fg_basic_rate == 0.0 and number_of_fg_items == 1) or update_finished_item_rate:
-			self.set_basic_rate_for_finished_goods(raw_material_cost)
+			self.set_basic_rate_for_finished_goods(raw_material_cost, scrap_material_cost)
 
-	def set_basic_rate_for_finished_goods(self, raw_material_cost):
+	def set_basic_rate_for_finished_goods(self, raw_material_cost, scrap_material_cost):
 		if self.purpose in ["Manufacture", "Repack"]:
 			for d in self.get("items"):
-				if d.bom_no or d.t_warehouse:
-					d.basic_rate = flt(raw_material_cost / flt(d.transfer_qty), d.precision("basic_rate"))
-					d.basic_amount = flt(raw_material_cost, d.precision("basic_amount"))
+				if d.transfer_qty and (d.bom_no or d.t_warehouse) and (getattr(self, "pro_doc", frappe._dict()).scrap_warehouse != d.t_warehouse):
+					d.basic_rate = flt((raw_material_cost - scrap_material_cost) / flt(d.transfer_qty), d.precision("basic_rate"))
+					d.basic_amount = flt((raw_material_cost - scrap_material_cost), d.precision("basic_amount"))
 
 	def distribute_additional_costs(self):
 		if self.purpose == "Material Issue":
@@ -302,11 +316,10 @@
 
 	def update_valuation_rate(self):
 		for d in self.get("items"):
-			d.amount = flt(d.basic_amount + flt(d.additional_cost), d.precision("amount"))
-			d.valuation_rate = flt(
-				flt(d.basic_rate)
-				+ (flt(d.additional_cost) / flt(d.transfer_qty)),
-				d.precision("valuation_rate"))
+			if d.transfer_qty:
+				d.amount = flt(flt(d.basic_amount) + flt(d.additional_cost), d.precision("amount"))
+				d.valuation_rate = flt(flt(d.basic_rate) + (flt(d.additional_cost) / flt(d.transfer_qty)),
+					d.precision("valuation_rate"))
 
 	def set_total_incoming_outgoing_value(self):
 		self.total_incoming_value = self.total_outgoing_value = 0.0
@@ -319,7 +332,9 @@
 		self.value_difference = self.total_incoming_value - self.total_outgoing_value
 
 	def set_total_amount(self):
-		self.total_amount = sum([flt(item.amount) for item in self.get("items")])
+		self.total_amount = None
+		if self.purpose not in ['Manufacture', 'Repack']:
+			self.total_amount = sum([flt(item.amount) for item in self.get("items")])
 
 	def validate_purchase_order(self):
 		"""Throw exception if more raw material is transferred against Purchase Order than in
@@ -346,14 +361,14 @@
 
 	def validate_bom(self):
 		for d in self.get('items'):
-			if d.bom_no:
+			if d.bom_no and (d.t_warehouse != getattr(self, "pro_doc", frappe._dict()).scrap_warehouse):
 				validate_bom_no(d.item_code, d.bom_no)
 
 	def validate_finished_goods(self):
 		"""validation: finished good quantity should be same as manufacturing quantity"""
 		items_with_target_warehouse = []
 		for d in self.get('items'):
-			if d.bom_no and flt(d.transfer_qty) != flt(self.fg_completed_qty):
+			if d.bom_no and flt(d.transfer_qty) != flt(self.fg_completed_qty) and (d.t_warehouse != getattr(self, "pro_doc", frappe._dict()).scrap_warehouse):
 				frappe.throw(_("Quantity in row {0} ({1}) must be same as manufactured quantity {2}"). \
 					format(d.idx, d.transfer_qty, self.fg_completed_qty))
 
@@ -470,7 +485,8 @@
 			'conversion_factor'		: 1,
 			'batch_no'				: '',
 			'actual_qty'			: 0,
-			'basic_rate'			: 0
+			'basic_rate'			: 0,
+			'serial_no'				: ''
 		}
 		for d in [["Account", "expense_account", "default_expense_account"],
 			["Cost Center", "cost_center", "cost_center"]]:
@@ -517,19 +533,7 @@
 		if not self.posting_date or not self.posting_time:
 			frappe.throw(_("Posting date and posting time is mandatory"))
 
-		if not getattr(self, "pro_doc", None):
-			self.pro_doc = None
-
-		if self.production_order:
-			# common validations
-			if not self.pro_doc:
-				self.pro_doc = frappe.get_doc('Production Order', self.production_order)
-
-			if self.pro_doc:
-				self.bom_no = self.pro_doc.bom_no
-			else:
-				# invalid production order
-				self.production_order = None
+		self.set_production_order_details()
 
 		if self.bom_no:
 			if self.purpose in ["Material Issue", "Material Transfer", "Manufacture", "Repack",
@@ -555,7 +559,15 @@
 							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)
+					for item in scrap_item_dict.values():
+						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)
@@ -567,6 +579,21 @@
 		self.set_actual_qty()
 		self.calculate_rate_and_amount()
 
+	def set_production_order_details(self):
+		if not getattr(self, "pro_doc", None):
+			self.pro_doc = frappe._dict()
+
+		if self.production_order:
+			# common validations
+			if not self.pro_doc:
+				self.pro_doc = frappe.get_doc('Production Order', self.production_order)
+
+			if self.pro_doc:
+				self.bom_no = self.pro_doc.bom_no
+			else:
+				# invalid production order
+				self.production_order = None
+
 	def load_items_from_bom(self):
 		if self.production_order:
 			item_code = self.pro_doc.production_item
@@ -605,7 +632,18 @@
 		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)
 
+		for item in item_dict.values():
+			item.from_warehouse = ""
+		return item_dict
+	
 	def get_transfered_raw_materials(self):
 		transferred_materials = frappe.db.sql("""
 			select
@@ -642,7 +680,7 @@
 		for item in transferred_materials:
 			qty= item.qty
 
-			if manufacturing_qty > (produced_qty + flt(self.fg_completed_qty)):
+			if trans_qty and manufacturing_qty > (produced_qty + flt(self.fg_completed_qty)):
 				qty = (qty/trans_qty) * flt(self.fg_completed_qty)
 
 			elif backflushed_materials.get(item.item_code):
@@ -780,7 +818,7 @@
 			"amount": operating_cost_per_unit * flt(fg_qty)
 		})
 
-	if production_order and production_order.additional_operating_cost:
+	if production_order and production_order.additional_operating_cost and production_order.qty:
 		additional_operating_cost_per_unit = \
 			flt(production_order.additional_operating_cost) / flt(production_order.qty)
 
@@ -800,13 +838,14 @@
 		for d in production_order.get("operations"):
 			if flt(d.completed_qty):
 				operating_cost_per_unit += flt(d.actual_operating_cost) / flt(d.completed_qty)
-			else:
+			elif production_order.qty:
 				operating_cost_per_unit += flt(d.planned_operating_cost) / flt(production_order.qty)
 
 	# Get operating cost from BOM if not found in production_order.
 	if not operating_cost_per_unit and bom_no:
 		bom = frappe.db.get_value("BOM", bom_no, ["operating_cost", "quantity"], as_dict=1)
-		operating_cost_per_unit = flt(bom.operating_cost) / flt(bom.quantity)
+		if bom.quantity:
+			operating_cost_per_unit = flt(bom.operating_cost) / flt(bom.quantity)
 
 	return operating_cost_per_unit
 
@@ -828,4 +867,4 @@
 			"basic_rate" : get_incoming_rate(args)
 		}
 
-	return ret
+	return ret
\ No newline at end of file
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry_list.js b/erpnext/stock/doctype/stock_entry/stock_entry_list.js
index 7f1a751..0e5aeb7 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry_list.js
+++ b/erpnext/stock/doctype/stock_entry/stock_entry_list.js
@@ -9,7 +9,7 @@
 					data-filter="from_warehouse,=,'+doc.from_warehouse+'">'+doc.from_warehouse+' </span>';
 			}
 			if(doc.from_warehouse || doc.to_warehouse) {
-				html += '<i class="octicon octicon-arrow-right text-muted"></i> ';
+				html += '<i class="octicon octfa fa-arrow-right text-muted"></i> ';
 			}
 			if(doc.to_warehouse) {
 				html += '<span class="filterable h6"\
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 bcf9962..ed1843e 100644
--- a/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
+++ b/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
@@ -31,6 +31,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, 
@@ -56,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, 
@@ -76,7 +78,7 @@
    "in_list_view": 1, 
    "label": "Source Warehouse", 
    "length": 0, 
-   "no_copy": 1, 
+   "no_copy": 0, 
    "oldfieldname": "s_warehouse", 
    "oldfieldtype": "Link", 
    "options": "Warehouse", 
@@ -84,6 +86,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, 
@@ -108,6 +111,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,7 +132,7 @@
    "in_list_view": 1, 
    "label": "Target Warehouse", 
    "length": 0, 
-   "no_copy": 1, 
+   "no_copy": 0, 
    "oldfieldname": "t_warehouse", 
    "oldfieldtype": "Link", 
    "options": "Warehouse", 
@@ -136,6 +140,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, 
@@ -160,6 +165,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, 
@@ -188,6 +194,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, 
@@ -212,6 +219,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,6 +245,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, 
@@ -263,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, 
@@ -291,6 +301,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, 
@@ -317,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, 
@@ -343,6 +355,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, 
@@ -370,6 +383,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, 
@@ -395,6 +409,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, 
@@ -405,7 +420,7 @@
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
-   "columns": 3, 
+   "columns": 1, 
    "fieldname": "qty", 
    "fieldtype": "Float", 
    "hidden": 0, 
@@ -422,6 +437,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, 
@@ -432,14 +448,14 @@
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
-   "columns": 0, 
+   "columns": 2, 
    "fieldname": "basic_rate", 
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
-   "in_list_view": 0, 
+   "in_list_view": 1, 
    "label": "Basic Rate (as per Stock UOM)", 
    "length": 0, 
    "no_copy": 0, 
@@ -450,6 +466,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, 
@@ -477,6 +494,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, 
@@ -504,6 +522,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, 
@@ -532,6 +551,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, 
@@ -559,6 +579,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, 
@@ -583,6 +604,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, 
@@ -611,6 +633,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, 
@@ -638,6 +661,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, 
@@ -666,6 +690,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, 
@@ -693,6 +718,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, 
@@ -718,6 +744,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, 
@@ -745,6 +772,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, 
@@ -769,6 +797,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, 
@@ -797,6 +826,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, 
@@ -822,6 +852,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, 
@@ -849,6 +880,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, 
@@ -873,6 +905,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, 
@@ -901,6 +934,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, 
@@ -926,6 +960,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, 
@@ -953,6 +988,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, 
@@ -980,6 +1016,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,6 +1041,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, 
@@ -1031,6 +1069,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, 
@@ -1057,6 +1096,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, 
@@ -1074,7 +1114,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-08-26 02:18:23.654050", 
+ "modified": "2016-11-27 15:19:26.597414", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Stock Entry Detail", 
diff --git a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
index 32beb1a..589c286 100644
--- a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
+++ b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
@@ -3,16 +3,20 @@
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "SLE/.########", 
+ "beta": 0, 
  "creation": "2013-01-29 19:25:42", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Other", 
+ "editable_grid": 0, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "item_code", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -31,6 +35,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": 1, 
@@ -42,6 +47,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "serial_no", 
    "fieldtype": "Text", 
    "hidden": 0, 
@@ -57,6 +63,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, 
@@ -68,6 +75,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "batch_no", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -84,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, 
@@ -94,6 +103,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "warehouse", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -112,6 +122,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": 1, 
@@ -123,6 +134,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "posting_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -140,6 +152,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": 1, 
@@ -151,6 +164,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "posting_time", 
    "fieldtype": "Time", 
    "hidden": 0, 
@@ -168,6 +182,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, 
@@ -179,6 +194,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "voucher_type", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -197,6 +213,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, 
@@ -208,6 +225,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "voucher_no", 
    "fieldtype": "Dynamic Link", 
    "hidden": 0, 
@@ -226,6 +244,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, 
@@ -237,6 +256,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "voucher_detail_no", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -254,6 +274,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, 
@@ -265,6 +286,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "actual_qty", 
    "fieldtype": "Float", 
    "hidden": 0, 
@@ -282,6 +304,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, 
@@ -293,6 +316,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "incoming_rate", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -310,6 +334,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, 
@@ -320,6 +345,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "outgoing_rate", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -336,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, 
@@ -346,6 +373,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "stock_uom", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -364,6 +392,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, 
@@ -375,6 +404,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "qty_after_transaction", 
    "fieldtype": "Float", 
    "hidden": 0, 
@@ -392,6 +422,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, 
@@ -403,6 +434,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "valuation_rate", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -421,6 +453,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, 
@@ -432,6 +465,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "stock_value", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -449,6 +483,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, 
@@ -459,6 +494,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "stock_value_difference", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -474,6 +510,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, 
@@ -484,6 +521,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "stock_queue", 
    "fieldtype": "Text", 
    "hidden": 1, 
@@ -500,6 +538,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, 
@@ -510,6 +549,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "project", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -525,6 +565,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, 
@@ -535,6 +576,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "company", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -553,6 +595,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, 
@@ -564,6 +607,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "fiscal_year", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -581,6 +625,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, 
@@ -592,6 +637,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "is_cancelled", 
    "fieldtype": "Select", 
    "hidden": 1, 
@@ -607,6 +653,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 1, 
    "reqd": 0, 
    "search_index": 0, 
@@ -616,15 +663,16 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 1, 
- "icon": "icon-list", 
+ "icon": "fa fa-list", 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 1, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-03-29 13:26:08.241138", 
+ "modified": "2016-11-27 16:31:36.294708", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Stock Ledger Entry", 
@@ -640,6 +688,7 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -657,9 +706,31 @@
    "create": 0, 
    "delete": 0, 
    "email": 0, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "is_custom": 0, 
+   "permlevel": 0, 
+   "print": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Item Manager", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
+   "write": 0
+  }, 
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 0, 
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -671,6 +742,7 @@
    "write": 0
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "sort_field": "modified", 
diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js
index c70613b..2b031d1 100644
--- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js
+++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js
@@ -75,6 +75,9 @@
 					frappe.model.set_value(cdt, cdn, "valuation_rate", r.message.rate);
 					frappe.model.set_value(cdt, cdn, "current_qty", r.message.qty);
 					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);
+					
 				}
 			});
 		}
@@ -92,7 +95,15 @@
 				}
 			});
 		}
-	}	
+	},
+	set_amount_quantity: function(doc, cdt, cdn) {
+		var d = frappe.model.get_doc(cdt, cdn);
+		if (d.qty & d.valuation_rate) {
+			frappe.model.set_value(cdt, cdn, "amount", flt(d.qty) * flt(d.valuation_rate));
+			frappe.model.set_value(cdt, cdn, "quantity_difference", flt(d.qty) - flt(d.current_qty));
+			frappe.model.set_value(cdt, cdn, "amount_difference", flt(d.amount) - flt(d.current_amount));
+		}
+	}
 });
 
 frappe.ui.form.on("Stock Reconciliation Item", {
@@ -104,7 +115,14 @@
 	},
 	item_code: function(frm, cdt, cdn) {
 		frm.events.set_valuation_rate_and_qty(frm, cdt, cdn);
+	},
+	qty: function(frm, cdt, cdn) {
+		frm.events.set_amount_quantity(frm, cdt, cdn);
+	},
+	valuation_rate: function(frm, cdt, cdn) {
+		frm.events.set_amount_quantity(frm, cdt, cdn);
 	}
+	
 });
 
 erpnext.stock.StockReconciliation = erpnext.stock.StockController.extend({
diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json
index 291f14d..9d66d4d 100644
--- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json
+++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json
@@ -23,6 +23,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Series", 
    "length": 0, 
    "no_copy": 1, 
@@ -32,6 +33,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, 
@@ -51,6 +53,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Posting Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -60,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, 
@@ -78,6 +82,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Posting Time", 
    "length": 0, 
    "no_copy": 0, 
@@ -87,6 +92,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, 
@@ -105,12 +111,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, 
@@ -129,6 +137,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amended From", 
    "length": 0, 
    "no_copy": 1, 
@@ -137,6 +146,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, 
@@ -155,6 +165,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -163,6 +174,7 @@
    "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, 
@@ -181,6 +193,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -188,6 +201,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,6 +220,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Items", 
    "length": 0, 
    "no_copy": 0, 
@@ -215,6 +230,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, 
@@ -233,6 +249,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -240,6 +257,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -259,6 +277,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Difference Account", 
    "length": 0, 
    "no_copy": 0, 
@@ -267,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, 
@@ -286,6 +306,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Cost Center", 
    "length": 0, 
    "no_copy": 0, 
@@ -294,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, 
@@ -312,6 +334,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Reconciliation JSON", 
    "length": 0, 
    "no_copy": 1, 
@@ -319,6 +342,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, 
@@ -337,6 +361,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -344,6 +369,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 +388,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Difference Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -370,6 +397,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, 
@@ -379,7 +407,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-upload-alt", 
+ "icon": "fa fa-upload-alt", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
@@ -389,7 +417,7 @@
  "istable": 0, 
  "max_attachments": 1, 
  "menu_index": 0, 
- "modified": "2016-09-02 04:09:18.909485", 
+ "modified": "2016-11-07 05:59:26.309341", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Stock Reconciliation", 
@@ -405,6 +433,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
index 0f5cb96..4ab49e5 100644
--- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
+++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
@@ -27,6 +27,7 @@
 		self.remove_items_with_no_change()
 		self.validate_data()
 		self.validate_expense_account()
+		self.set_total_qty_and_amount()
 
 	def on_submit(self):
 		self.update_stock_ledger()
@@ -236,6 +237,13 @@
 		elif not frappe.db.sql("""select name from `tabStock Ledger Entry` limit 1"""):
 			if frappe.db.get_value("Account", self.expense_account, "report_type") == "Profit and Loss":
 				frappe.throw(_("Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry"), OpeningEntryAccountError)
+				
+	def set_total_qty_and_amount(self):
+		for d in self.get("items"):
+			d.amount = flt(d.qty) * flt(d.valuation_rate)
+			d.current_amount = flt(d.current_qty) * flt(d.current_valuation_rate)
+			d.quantity_difference = flt(d.qty) - flt(d.current_qty)
+			d.amount_difference = flt(d.amount) - flt(d.current_amount)
 
 	def get_items_for(self, warehouse):
 		self.items = []
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 efd0dee..5452aa1 100644
--- a/erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
+++ b/erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
@@ -173,7 +173,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 2, 
-   "description": "Do not include symbols (ex. $)", 
+   "description": "", 
    "fieldname": "valuation_rate", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -200,6 +200,32 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_3", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -207,6 +233,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "label": "Before reconciliation", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -225,7 +252,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "description": "Before reconciliation", 
+   "description": "", 
    "fieldname": "current_qty", 
    "fieldtype": "Float", 
    "hidden": 0, 
@@ -277,9 +304,9 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "description": "Before reconciliation", 
+   "description": "", 
    "fieldname": "current_valuation_rate", 
-   "fieldtype": "Read Only", 
+   "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
@@ -298,6 +325,135 @@
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "", 
+   "fieldname": "current_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Current Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_14", 
+   "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, 
+   "columns": 0, 
+   "fieldname": "quantity_difference", 
+   "fieldtype": "Read Only", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Quantity Difference", 
+   "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": "column_break_16", 
+   "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": "amount_difference", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Amount Difference", 
+   "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
   }
  ], 
  "hide_heading": 0, 
@@ -311,7 +467,7 @@
  "istable": 1, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-09-05 07:10:19.571562", 
+ "modified": "2016-09-28 06:43:53.764287", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Stock Reconciliation Item", 
diff --git a/erpnext/stock/doctype/stock_settings/stock_settings.json b/erpnext/stock/doctype/stock_settings/stock_settings.json
index 4a6e6e9..6501682 100644
--- a/erpnext/stock/doctype/stock_settings/stock_settings.json
+++ b/erpnext/stock/doctype/stock_settings/stock_settings.json
@@ -506,7 +506,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-cog", 
+ "icon": "fa fa-cog", 
  "idx": 1, 
  "in_create": 0, 
  "in_dialog": 0, 
diff --git a/erpnext/stock/doctype/stock_settings/stock_settings.py b/erpnext/stock/doctype/stock_settings/stock_settings.py
index 7c67a65..68d64a2 100644
--- a/erpnext/stock/doctype/stock_settings/stock_settings.py
+++ b/erpnext/stock/doctype/stock_settings/stock_settings.py
@@ -10,7 +10,7 @@
 
 class StockSettings(Document):
 	def validate(self):
-		for key in ["item_naming_by", "item_group", "stock_uom", "allow_negative_stock"]:
+		for key in ["item_naming_by", "item_group", "stock_uom", "allow_negative_stock", "default_warehouse"]:
 			frappe.db.set_default(key, self.get(key, ""))
 
 		from erpnext.setup.doctype.naming_series.naming_series import set_by_naming_series
diff --git a/erpnext/stock/doctype/warehouse/test_records.json b/erpnext/stock/doctype/warehouse/test_records.json
index 4dd9f6b..af3bd23 100644
--- a/erpnext/stock/doctype/warehouse/test_records.json
+++ b/erpnext/stock/doctype/warehouse/test_records.json
@@ -10,6 +10,13 @@
   "company": "_Test Company",
   "create_account_under": "Stock Assets - _TC",
   "doctype": "Warehouse",
+  "warehouse_name": "_Test Scrap Warehouse",
+  "is_group": 0
+ },
+ {
+  "company": "_Test Company",
+  "create_account_under": "Stock Assets - _TC",
+  "doctype": "Warehouse",
   "warehouse_name": "_Test Warehouse",
   "is_group": 0
  },
diff --git a/erpnext/stock/doctype/warehouse/warehouse.js b/erpnext/stock/doctype/warehouse/warehouse.js
index 8b1b679..8a9ecbd 100644
--- a/erpnext/stock/doctype/warehouse/warehouse.js
+++ b/erpnext/stock/doctype/warehouse/warehouse.js
@@ -12,7 +12,7 @@
 
 		if (cint(frm.doc.is_group) == 1) {
 			frm.add_custom_button(__('Group to Non-Group'),
-				function() { convert_to_group_or_ledger(frm); }, 'icon-retweet', 'btn-default')
+				function() { convert_to_group_or_ledger(frm); }, 'fa fa-retweet', 'btn-default')
 		} else if (cint(frm.doc.is_group) == 0) {
 			if(frm.doc.__onload && frm.doc.__onload.account) {
 				frm.add_custom_button(__("General Ledger"), function() {
@@ -25,7 +25,7 @@
 			}
 
 			frm.add_custom_button(__('Non-Group to Group'),
-				function() { convert_to_group_or_ledger(frm); }, 'icon-retweet', 'btn-default')
+				function() { convert_to_group_or_ledger(frm); }, 'fa fa-retweet', 'btn-default')
 		}
 		
 		cur_frm.toggle_enable(['is_group', 'company'], false);
diff --git a/erpnext/stock/doctype/warehouse/warehouse.json b/erpnext/stock/doctype/warehouse/warehouse.json
index ce38056..a7556bd 100644
--- a/erpnext/stock/doctype/warehouse/warehouse.json
+++ b/erpnext/stock/doctype/warehouse/warehouse.json
@@ -15,6 +15,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "warehouse_detail", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -22,6 +23,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Warehouse Detail", 
    "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": 0, 
    "search_index": 0, 
@@ -40,6 +43,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "warehouse_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -47,6 +51,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Warehouse Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -56,6 +61,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 +72,7 @@
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "0", 
    "fieldname": "is_group", 
    "fieldtype": "Check", 
@@ -74,6 +81,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Is Group", 
    "length": 0, 
    "no_copy": 0, 
@@ -83,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, 
@@ -93,6 +102,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "company", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -100,6 +110,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -110,6 +121,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 1, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 1, 
@@ -120,6 +132,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "disabled", 
    "fieldtype": "Check", 
    "hidden": 0, 
@@ -127,6 +140,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Disabled", 
    "length": 0, 
    "no_copy": 0, 
@@ -134,6 +148,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, 
@@ -144,6 +159,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_4", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -151,6 +167,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -158,6 +175,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,6 +186,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:sys_defaults.auto_accounting_for_stock", 
    "description": "Account for the warehouse (Perpetual Inventory) will be created under this Account.", 
    "fieldname": "create_account_under", 
@@ -177,6 +196,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Parent Account", 
    "length": 0, 
    "no_copy": 0, 
@@ -185,6 +205,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,6 +216,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
+   "columns": 0, 
    "description": "", 
    "fieldname": "warehouse_contact_info", 
    "fieldtype": "Section Break", 
@@ -203,6 +225,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Warehouse Contact Info", 
    "length": 0, 
    "no_copy": 0, 
@@ -210,6 +233,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,6 +244,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "email_id", 
    "fieldtype": "Data", 
    "hidden": 1, 
@@ -227,6 +252,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Email Id", 
    "length": 0, 
    "no_copy": 0, 
@@ -236,6 +262,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,6 +273,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "phone_no", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -253,6 +281,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Phone No", 
    "length": 0, 
    "no_copy": 0, 
@@ -263,6 +292,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,6 +303,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "mobile_no", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -280,6 +311,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Mobile No", 
    "length": 0, 
    "no_copy": 0, 
@@ -290,6 +322,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, 
@@ -300,6 +333,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break0", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -307,6 +341,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
@@ -314,6 +349,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 +360,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "address_line_1", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -331,6 +368,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Address Line 1", 
    "length": 0, 
    "no_copy": 0, 
@@ -340,6 +378,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, 
@@ -350,6 +389,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "address_line_2", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -357,6 +397,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Address Line 2", 
    "length": 0, 
    "no_copy": 0, 
@@ -366,6 +407,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, 
@@ -376,6 +418,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "city", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -383,6 +426,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "City", 
    "length": 0, 
    "no_copy": 0, 
@@ -392,6 +436,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, 
@@ -402,6 +447,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "state", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -409,6 +455,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "State", 
    "length": 0, 
    "no_copy": 0, 
@@ -418,6 +465,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, 
@@ -428,6 +476,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "pin", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -435,6 +484,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "PIN", 
    "length": 0, 
    "no_copy": 0, 
@@ -444,6 +494,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, 
@@ -454,6 +505,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
+   "columns": 0, 
    "fieldname": "tree_details", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -461,6 +513,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Tree Details", 
    "length": 0, 
    "no_copy": 0, 
@@ -469,6 +522,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, 
@@ -479,6 +533,7 @@
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "parent_warehouse", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -486,6 +541,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Parent Warehouse", 
    "length": 0, 
    "no_copy": 0, 
@@ -495,6 +551,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, 
@@ -505,6 +562,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "lft", 
    "fieldtype": "Int", 
    "hidden": 1, 
@@ -512,6 +570,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "lft", 
    "length": 0, 
    "no_copy": 0, 
@@ -520,6 +579,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, 
@@ -530,6 +590,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "rgt", 
    "fieldtype": "Int", 
    "hidden": 1, 
@@ -537,6 +598,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "rgt", 
    "length": 0, 
    "no_copy": 0, 
@@ -545,6 +607,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, 
@@ -555,6 +618,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "old_parent", 
    "fieldtype": "Link", 
    "hidden": 1, 
@@ -562,6 +626,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Old Parent", 
    "length": 0, 
    "no_copy": 0, 
@@ -571,6 +636,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, 
@@ -580,7 +646,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-building", 
+ "icon": "fa fa-building", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
@@ -589,7 +655,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-07-25 05:06:44.598548", 
+ "modified": "2016-11-07 05:06:39.128312", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Warehouse", 
@@ -605,6 +671,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -625,6 +692,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -645,6 +713,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -665,6 +734,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -685,6 +755,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -705,6 +776,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
diff --git a/erpnext/stock/doctype/warehouse/warehouse.py b/erpnext/stock/doctype/warehouse/warehouse.py
index 938e73c..5d0951b 100644
--- a/erpnext/stock/doctype/warehouse/warehouse.py
+++ b/erpnext/stock/doctype/warehouse/warehouse.py
@@ -71,7 +71,7 @@
 						"freeze_account": "No"
 					})
 					ac_doc.flags.ignore_permissions = True
-
+					ac_doc.flags.ignore_mandatory = True
 					try:
 						ac_doc.insert()
 						msgprint(_("Account head {0} created").format(ac_doc.name))
@@ -150,7 +150,10 @@
 		return new_warehouse
 
 	def rename_account_for(self, olddn, newdn, merge):
-		old_account = self.get_account(olddn)
+		if self.is_group:
+			old_account = self.get_account()
+		else:
+			old_account = self.get_account(olddn)
 
 		if old_account:
 			new_account = None
@@ -192,11 +195,8 @@
 		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)
 
-		for item in frappe.db.sql("""select distinct item_code from (
-			select name as item_code from `tabItem` where is_stock_item=1
-			union
-			select distinct item_code from tabBin) a"""):
-				repost_stock(item[0], newdn)
+		for item in frappe.db.sql(""" select distinct item_code from tabBin where warehouse = %s""", newdn):
+			repost_stock(item[0], newdn)
 
 		frappe.db.set_value("Stock Settings", None, "allow_negative_stock", existing_allow_negative_stock)
 		frappe.db.auto_commit_on_many_writes = 0
@@ -278,7 +278,7 @@
 		parent = None
 
 	doc.update({
-		name_field: frappe.form_dict['name_field'],
+		name_field: frappe.form_dict['warehouse_name'],
 		parent_field: parent,
 		"is_group": frappe.form_dict['is_group'],
 		"company": company
diff --git a/erpnext/stock/doctype/warehouse/warehouse_tree.js b/erpnext/stock/doctype/warehouse/warehouse_tree.js
index 0baed4d..b0c0cbd 100644
--- a/erpnext/stock/doctype/warehouse/warehouse_tree.js
+++ b/erpnext/stock/doctype/warehouse/warehouse_tree.js
@@ -11,11 +11,12 @@
 		default: frappe.defaults.get_default('company') ? frappe.defaults.get_default('company'): ""
 	}],
 	fields:[
-		{fieldtype:'Data', fieldname: 'name_field',
+		{fieldtype:'Data', fieldname: 'warehouse_name',
 			label:__('New Warehouse Name'), reqd:true},
 		{fieldtype:'Check', fieldname:'is_group', label:__('Is Group'),
 			description: __("Child nodes can be only created under 'Group' type nodes")}
 	],
+	ignore_fields:["parent_warehouse"],
 	onrender: function(node) {
 		if (node.data && node.data.balance!==undefined) {
 			$('<span class="balance-area pull-right text-muted small">'
diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py
index 414b200..c0fe3a6 100644
--- a/erpnext/stock/get_item_details.py
+++ b/erpnext/stock/get_item_details.py
@@ -43,7 +43,7 @@
 	get_party_item_code(args, item_doc, out)
 
 	if out.get("warehouse"):
-		out.update(get_bin_details(args.item_code, out.warehouse))
+		out.update(get_bin_details(args.item_code, out.warehouse))	
 
 	if frappe.db.exists("Product Bundle", args.item_code):
 		valuation_rate = 0.0
@@ -74,8 +74,7 @@
 	out.update(get_pricing_rule_for_item(args))
 
 	if args.get("doctype") in ("Sales Invoice", "Delivery Note"):
-		if item_doc.has_serial_no == 1 and not args.serial_no:
-			out.serial_no = get_serial_nos_by_fifo(args, item_doc)
+		out.serial_no = get_serial_no(out)
 
 	if args.transaction_date and item.lead_time_days:
 		out.schedule_date = out.lead_time_date = add_days(args.transaction_date,
@@ -328,17 +327,18 @@
 
 @frappe.whitelist()
 def get_pos_profile(company):
+	condition = "and company = '%s'"%(company) if company else ''
 	pos_profile = frappe.db.sql("""select * from `tabPOS Profile` where user = %s
-		and company = %s""", (frappe.session['user'], company), as_dict=1)
+		{cond}""".format(cond=condition), (frappe.session['user']), as_dict=1)
 
-	if not pos_profile:
+	if not pos_profile and company:
 		pos_profile = frappe.db.sql("""select * from `tabPOS Profile`
 			where ifnull(user,'') = '' and company = %s""", company, as_dict=1)
 
 	return pos_profile and pos_profile[0] or None
 
 
-def get_serial_nos_by_fifo(args, item_doc):
+def get_serial_nos_by_fifo(args):
 	if frappe.db.get_single_value("Stock Settings", "automatically_set_serial_nos_based_on_fifo"):
 		return "\n".join(frappe.db.sql_list("""select name from `tabSerial No`
 			where item_code=%(item_code)s and warehouse=%(warehouse)s
@@ -374,8 +374,21 @@
 @frappe.whitelist()
 def get_bin_details(item_code, warehouse):
 	return frappe.db.get_value("Bin", {"item_code": item_code, "warehouse": warehouse},
-		["projected_qty", "actual_qty"], as_dict=True) \
-		or {"projected_qty": 0, "actual_qty": 0}
+			["projected_qty", "actual_qty"], as_dict=True) \
+			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})
+	serial_no = get_serial_no(args)
+	return {'serial_no': serial_no}
+	
+@frappe.whitelist()
+def get_bin_details_and_serial_nos(item_code, warehouse, qty, serial_no):
+	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))
+	return bin_details_and_serial_nos
 
 @frappe.whitelist()
 def get_batch_qty(batch_no,warehouse,item_code):
@@ -512,3 +525,16 @@
 
 	return out
 
+@frappe.whitelist()
+def get_serial_no(args):
+	if isinstance(args, basestring):
+		args = json.loads(args)
+		args = frappe._dict(args)
+
+	if args.get('warehouse') and args.get('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 = process_args(args)
+			serial_no = get_serial_nos_by_fifo(args)
+			return serial_no
diff --git a/erpnext/stock/page/stock_analytics/stock_analytics.json b/erpnext/stock/page/stock_analytics/stock_analytics.json
index 3b8380a..90e9f2e 100644
--- a/erpnext/stock/page/stock_analytics/stock_analytics.json
+++ b/erpnext/stock/page/stock_analytics/stock_analytics.json
@@ -2,7 +2,7 @@
  "creation": "2012-09-21 20:15:14.000000", 
  "docstatus": 0, 
  "doctype": "Page", 
- "icon": "icon-bar-chart", 
+ "icon": "fa fa-bar-chart", 
  "idx": 1, 
  "modified": "2013-07-11 14:44:10.000000", 
  "modified_by": "Administrator", 
diff --git a/erpnext/stock/page/stock_balance/stock_balance.js b/erpnext/stock/page/stock_balance/stock_balance.js
index 9494045..3cf93fa 100644
--- a/erpnext/stock/page/stock_balance/stock_balance.js
+++ b/erpnext/stock/page/stock_balance/stock_balance.js
@@ -28,6 +28,17 @@
 		}
 	});
 
+	page.item_group_field = page.add_field({
+		fieldname: 'item_group',
+		label: __('Item Group'),
+		fieldtype:'Link',
+		options:'Item Group',
+		change: function() {
+			page.item_dashboard.start = 0;
+			page.item_dashboard.refresh();
+		}
+	});
+
 	page.sort_selector = new frappe.ui.SortSelector({
 		parent: page.wrapper.find('.page-form'),
 		args: {
@@ -58,6 +69,7 @@
 		page.item_dashboard.before_refresh = function() {
 			this.item_code = page.item_field.get_value();
 			this.warehouse = page.warehouse_field.get_value();
+			this.item_group = page.item_group_field.get_value();
 		}
 
 		page.item_dashboard.refresh();
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 b87a415..3bbc0f6 100644
--- a/erpnext/stock/report/item_shortage_report/item_shortage_report.json
+++ b/erpnext/stock/report/item_shortage_report/item_shortage_report.json
@@ -1,17 +1,20 @@
 {
+ "add_total_row": 0, 
  "apply_user_permissions": 1, 
  "creation": "2013-08-20 13:43:30", 
+ "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
  "idx": 1, 
  "is_standard": "Yes", 
- "json": "{\"filters\":[[\"Bin\",\"projected_qty\",\"<\",\"0\"]],\"columns\":[[\"warehouse\",\"Bin\"],[\"item_code\",\"Bin\"],[\"actual_qty\",\"Bin\"],[\"ordered_qty\",\"Bin\"],[\"planned_qty\",\"Bin\"],[\"reserved_qty\",\"Bin\"],[\"projected_qty\",\"Bin\"]],\"sort_by\":\"Bin.projected_qty\",\"sort_order\":\"asc\",\"sort_by_next\":\"\",\"sort_order_next\":\"desc\"}", 
- "modified": "2014-06-03 07:18:17.092713", 
+ "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_by": "Administrator", 
  "module": "Stock", 
  "name": "Item Shortage Report", 
  "owner": "Administrator", 
+ "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": "Report Builder"
+ "report_type": "Query Report"
 }
\ 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 6a8ddc3..bcca0b4 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
@@ -7,8 +7,8 @@
  "doctype": "Report", 
  "idx": 1, 
  "is_standard": "Yes", 
- "json": "{\"filters\":[],\"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\"]],\"sort_by\":\"Item Price.modified\",\"sort_order\":\"desc\",\"sort_by_next\":null,\"sort_order_next\":\"desc\"}", 
- "modified": "2016-02-01 14:31:04.075909", 
+ "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_by": "Administrator", 
  "module": "Stock", 
  "name": "Item-wise Price List Rate", 
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 5ab5e64..2879d98 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
@@ -7,8 +7,8 @@
  "doctype": "Report", 
  "idx": 1, 
  "is_standard": "Yes", 
- "json": "{\"filters\":[[\"Serial No\",\"delivery_document_type\",\"in\",[\"Delivery Note\",\"Sales Invoice\"]],[\"Serial No\",\"warehouse\",\"=\",\"\"]],\"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\"]],\"sort_by\":\"Serial No.modified\",\"sort_order\":\"desc\",\"sort_by_next\":null,\"sort_order_next\":\"desc\"}", 
- "modified": "2015-10-22 14:53:45.192497", 
+ "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_by": "Administrator", 
  "module": "Stock", 
  "name": "Serial No Service Contract Expiry", 
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 dfc7afc..cb4e70d 100644
--- a/erpnext/stock/report/serial_no_status/serial_no_status.json
+++ b/erpnext/stock/report/serial_no_status/serial_no_status.json
@@ -7,8 +7,8 @@
  "doctype": "Report", 
  "idx": 1, 
  "is_standard": "Yes", 
- "json": "{\"filters\":[],\"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\"]],\"sort_by\":\"Serial No.name\",\"sort_order\":\"desc\",\"sort_by_next\":null,\"sort_order_next\":\"desc\"}", 
- "modified": "2015-10-22 14:49:29.491790", 
+ "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", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Serial No Status", 
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 2a919af..6905671 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
@@ -7,8 +7,8 @@
  "doctype": "Report", 
  "idx": 1, 
  "is_standard": "Yes", 
- "json": "{\"filters\":[[\"Serial No\",\"delivery_document_type\",\"in\",[\"Delivery Note\",\"Sales Invoice\"]],[\"Serial No\",\"warehouse\",\"=\",\"\"]],\"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\"]],\"sort_by\":\"Serial No.modified\",\"sort_order\":\"desc\",\"sort_by_next\":null,\"sort_order_next\":\"desc\"}", 
- "modified": "2015-10-22 14:53:12.575608", 
+ "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_by": "Administrator", 
  "module": "Stock", 
  "name": "Serial No Warranty Expiry", 
diff --git a/erpnext/stock/report/stock_balance/stock_balance.js b/erpnext/stock/report/stock_balance/stock_balance.js
index 43b3657..434c092 100644
--- a/erpnext/stock/report/stock_balance/stock_balance.js
+++ b/erpnext/stock/report/stock_balance/stock_balance.js
@@ -8,6 +8,7 @@
 			"label": __("From Date"),
 			"fieldtype": "Date",
 			"width": "80",
+			"reqd": 1,
 			"default": sys_defaults.year_start_date,
 		},
 		{
@@ -15,6 +16,7 @@
 			"label": __("To Date"),
 			"fieldtype": "Date",
 			"width": "80",
+			"reqd": 1,
 			"default": frappe.datetime.get_today()
 		},
 		{
diff --git a/erpnext/stock/stock_balance.py b/erpnext/stock/stock_balance.py
index 22fa12a..096f6c0 100644
--- a/erpnext/stock/stock_balance.py
+++ b/erpnext/stock/stock_balance.py
@@ -230,7 +230,7 @@
 				pass
 
 def repost_all_stock_vouchers():
-	warehouses_with_account = frappe.db.sql_list("""select master_name from tabAccount
+	warehouses_with_account = frappe.db.sql_list("""select warehouse from tabAccount
 		where ifnull(account_type, '') = 'Stock' and (warehouse is not null and warehouse != '')
 		and is_group=0""")
 
@@ -244,7 +244,7 @@
 	i = 0
 	for voucher_type, voucher_no in vouchers:
 		i+=1
-		print i, "/", len(vouchers)
+		print i, "/", len(vouchers), voucher_type, voucher_no
 		try:
 			for dt in ["Stock Ledger Entry", "GL Entry"]:
 				frappe.db.sql("""delete from `tab%s` where voucher_type=%s and voucher_no=%s"""%
diff --git a/erpnext/support/doctype/issue/issue.js b/erpnext/support/doctype/issue/issue.js
index 21ef5b8..2bee422 100644
--- a/erpnext/support/doctype/issue/issue.js
+++ b/erpnext/support/doctype/issue/issue.js
@@ -15,5 +15,21 @@
 				frm.save();
 			});
 		}
+	},
+
+	timeline_refresh: function(frm) {
+		// create button for "Add to Knowledge Base"
+		if(frappe.model.can_create('Help Article')) {
+			$('<button class="btn btn-xs btn-default btn-add-to-kb pull-right" style="margin-top: -2px">'+
+				__('Add to Knowledge Base') + '</button>')
+				.appendTo(frm.timeline.wrapper.find('.comment-header'))
+				.on('click', function() {
+					var content = $(this).parents('.timeline-item:first').find('.timeline-item-content').html();
+					var doc = frappe.model.get_new_doc('Help Article');
+					doc.title = frm.doc.subject;
+					doc.content = content;
+					frappe.set_route('Form', 'Help Article', doc.name);
+				});
+		}
 	}
 });
diff --git a/erpnext/support/doctype/issue/issue.json b/erpnext/support/doctype/issue/issue.json
index b922dd4..8994ef8 100644
--- a/erpnext/support/doctype/issue/issue.json
+++ b/erpnext/support/doctype/issue/issue.json
@@ -9,11 +9,14 @@
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Setup", 
+ "editable_grid": 0, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "subject_section", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -21,14 +24,16 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Subject", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "icon-flag", 
+   "options": "fa fa-flag", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -39,6 +44,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "naming_series", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -46,6 +52,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Series", 
    "length": 0, 
    "no_copy": 1, 
@@ -54,6 +61,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, 
@@ -64,6 +72,7 @@
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "subject", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -71,6 +80,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Subject", 
    "length": 0, 
    "no_copy": 0, 
@@ -78,6 +88,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, 
@@ -88,6 +99,7 @@
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "mins_to_first_response", 
    "fieldtype": "Float", 
    "hidden": 0, 
@@ -95,6 +107,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Mins to First Response", 
    "length": 0, 
    "no_copy": 0, 
@@ -103,6 +116,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, 
@@ -113,6 +127,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "cb00", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -120,12 +135,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, 
@@ -136,6 +153,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "Open", 
    "fieldname": "status", 
    "fieldtype": "Select", 
@@ -144,6 +162,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Status", 
    "length": 0, 
    "no_copy": 1, 
@@ -154,6 +173,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, 
@@ -164,6 +184,7 @@
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.__islocal", 
    "fieldname": "raised_by", 
    "fieldtype": "Data", 
@@ -172,6 +193,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Raised By (Email)", 
    "length": 0, 
    "no_copy": 0, 
@@ -182,6 +204,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -192,6 +215,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "customer", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -199,6 +223,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer", 
    "length": 0, 
    "no_copy": 0, 
@@ -209,6 +234,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, 
@@ -219,6 +245,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
+   "columns": 0, 
    "fieldname": "section_break_7", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -226,6 +253,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Details", 
    "length": 0, 
    "no_copy": 0, 
@@ -234,6 +262,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 +273,7 @@
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "", 
    "fieldname": "description", 
    "fieldtype": "Text", 
@@ -252,6 +282,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Description", 
    "length": 0, 
    "no_copy": 0, 
@@ -261,6 +292,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, 
@@ -271,6 +303,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_9", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -278,6 +311,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -285,6 +319,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 +330,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:!doc.__islocal", 
    "fieldname": "resolution_date", 
    "fieldtype": "Datetime", 
@@ -303,6 +339,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Resolution Date", 
    "length": 0, 
    "no_copy": 1, 
@@ -312,6 +349,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, 
@@ -322,6 +360,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "first_responded_on", 
    "fieldtype": "Datetime", 
    "hidden": 0, 
@@ -329,6 +368,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "First Responded On", 
    "length": 0, 
    "no_copy": 0, 
@@ -336,6 +376,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,6 +387,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
+   "columns": 0, 
    "fieldname": "additional_info", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -353,14 +395,16 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Contact", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "icon-pushpin", 
+   "options": "fa fa-pushpin", 
    "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, 
@@ -371,6 +415,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "lead", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -378,6 +423,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Lead", 
    "length": 0, 
    "no_copy": 0, 
@@ -386,6 +432,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, 
@@ -396,6 +443,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "contact", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -403,6 +451,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Contact", 
    "length": 0, 
    "no_copy": 0, 
@@ -411,6 +460,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, 
@@ -421,6 +471,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_16", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -428,6 +479,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -435,6 +487,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, 
@@ -445,6 +498,7 @@
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "customer_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -452,6 +506,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -461,6 +516,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, 
@@ -471,6 +527,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "project", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -478,6 +535,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Project", 
    "length": 0, 
    "no_copy": 0, 
@@ -487,6 +545,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, 
@@ -497,6 +556,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
+   "columns": 0, 
    "fieldname": "section_break_19", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -504,6 +564,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Resolution", 
    "length": 0, 
    "no_copy": 0, 
@@ -512,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, 
@@ -522,6 +584,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:!doc.__islocal", 
    "fieldname": "resolution_details", 
    "fieldtype": "Small Text", 
@@ -530,6 +593,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Resolution Details", 
    "length": 0, 
    "no_copy": 1, 
@@ -539,6 +603,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, 
@@ -549,6 +614,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:!doc.__islocal", 
    "fieldname": "column_break1", 
    "fieldtype": "Column Break", 
@@ -557,6 +623,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
@@ -564,6 +631,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, 
@@ -574,6 +642,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "Today", 
    "fieldname": "opening_date", 
    "fieldtype": "Date", 
@@ -582,6 +651,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Opening Date", 
    "length": 0, 
    "no_copy": 1, 
@@ -591,6 +661,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, 
@@ -601,6 +672,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "opening_time", 
    "fieldtype": "Time", 
    "hidden": 0, 
@@ -608,6 +680,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Opening Time", 
    "length": 0, 
    "no_copy": 1, 
@@ -617,6 +690,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, 
@@ -627,6 +701,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "company", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -634,6 +709,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -642,6 +718,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, 
@@ -652,6 +729,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "content_type", 
    "fieldtype": "Data", 
    "hidden": 1, 
@@ -659,6 +737,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Content Type", 
    "length": 0, 
    "no_copy": 0, 
@@ -666,6 +745,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, 
@@ -676,6 +756,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "attachment", 
    "fieldtype": "Attach", 
    "hidden": 1, 
@@ -683,6 +764,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Attachment", 
    "length": 0, 
    "no_copy": 0, 
@@ -691,6 +773,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, 
@@ -700,7 +783,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-ticket", 
+ "icon": "fa fa-ticket", 
  "idx": 7, 
  "image_view": 0, 
  "in_create": 0, 
@@ -709,7 +792,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-06-14 16:29:21.439025", 
+ "modified": "2016-11-07 05:30:07.182340", 
  "modified_by": "Administrator", 
  "module": "Support", 
  "name": "Issue", 
@@ -725,6 +808,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
diff --git a/erpnext/support/doctype/warranty_claim/warranty_claim.js b/erpnext/support/doctype/warranty_claim/warranty_claim.js
index cf9d806..9fed265 100644
--- a/erpnext/support/doctype/warranty_claim/warranty_claim.js
+++ b/erpnext/support/doctype/warranty_claim/warranty_claim.js
@@ -37,7 +37,7 @@
 
 cur_frm.cscript.onload = function(doc,cdt,cdn){
 	if(!doc.status)
-		set_multiple(dt,dn,{status:'Open'});
+		set_multiple(cdt,cdn,{status:'Open'});
 }
 
 cur_frm.fields_dict['customer_address'].get_query = function(doc, cdt, cdn) {
diff --git a/erpnext/support/doctype/warranty_claim/warranty_claim.json b/erpnext/support/doctype/warranty_claim/warranty_claim.json
index f6fcc87..4e63bb6 100644
--- a/erpnext/support/doctype/warranty_claim/warranty_claim.json
+++ b/erpnext/support/doctype/warranty_claim/warranty_claim.json
@@ -3,16 +3,19 @@
  "allow_import": 1, 
  "allow_rename": 0, 
  "autoname": "naming_series:", 
+ "beta": 0, 
  "creation": "2013-01-10 16:34:30", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Setup", 
+ "editable_grid": 0, 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "naming_series", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -20,6 +23,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Series", 
    "length": 0, 
    "no_copy": 1, 
@@ -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,6 +45,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "Open", 
    "fieldname": "status", 
    "fieldtype": "Select", 
@@ -48,6 +54,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Status", 
    "length": 0, 
    "no_copy": 1, 
@@ -58,6 +65,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, 
@@ -68,6 +76,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "Today", 
    "fieldname": "complaint_date", 
    "fieldtype": "Date", 
@@ -76,6 +85,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Issue Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -85,6 +95,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, 
@@ -95,6 +106,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break0", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -102,6 +114,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
@@ -109,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, 
@@ -120,6 +134,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "", 
    "fieldname": "serial_no", 
    "fieldtype": "Link", 
@@ -128,6 +143,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Serial No", 
    "length": 0, 
    "no_copy": 0, 
@@ -136,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, 
@@ -146,6 +163,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "customer", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -153,6 +171,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer", 
    "length": 0, 
    "no_copy": 0, 
@@ -163,6 +182,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, 
@@ -173,6 +193,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_7", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -180,6 +201,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -187,6 +209,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, 
@@ -197,6 +220,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "complaint", 
    "fieldtype": "Text Editor", 
    "hidden": 0, 
@@ -204,6 +228,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Issue", 
    "length": 0, 
    "no_copy": 1, 
@@ -213,6 +238,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, 
@@ -223,6 +249,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "issue_details", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -230,15 +257,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Item and Warranty Details", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-ticket", 
+   "options": "fa fa-ticket", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -249,6 +278,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "item_code", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -256,6 +286,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Item Code", 
    "length": 0, 
    "no_copy": 0, 
@@ -266,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": 1, 
@@ -276,6 +308,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.item_code", 
    "fieldname": "item_name", 
    "fieldtype": "Data", 
@@ -284,6 +317,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Item Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -293,6 +327,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, 
@@ -303,6 +338,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.item_code", 
    "fieldname": "description", 
    "fieldtype": "Small Text", 
@@ -311,6 +347,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Description", 
    "length": 0, 
    "no_copy": 0, 
@@ -320,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, 
@@ -331,6 +369,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break1", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -338,6 +377,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
@@ -345,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, 
@@ -356,6 +397,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "warranty_amc_status", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -363,6 +405,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Warranty / AMC Status", 
    "length": 0, 
    "no_copy": 0, 
@@ -371,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, 
@@ -381,6 +425,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "warranty_expiry_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -388,6 +433,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Warranty Expiry Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -395,6 +441,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, 
@@ -405,6 +452,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "amc_expiry_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -412,6 +460,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "AMC Expiry Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -419,6 +468,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,6 +479,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "", 
    "fieldname": "resolution_section", 
    "fieldtype": "Section Break", 
@@ -437,15 +488,17 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Resolution", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
-   "options": "icon-thumbs-up", 
+   "options": "fa fa-thumbs-up", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -456,6 +509,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "resolution_date", 
    "fieldtype": "Datetime", 
    "hidden": 0, 
@@ -463,6 +517,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Resolution Date", 
    "length": 0, 
    "no_copy": 1, 
@@ -472,6 +527,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, 
@@ -482,6 +538,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "resolved_by", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -489,6 +546,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Resolved By", 
    "length": 0, 
    "no_copy": 1, 
@@ -499,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": 1, 
@@ -509,6 +568,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "resolution_details", 
    "fieldtype": "Text", 
    "hidden": 0, 
@@ -516,6 +576,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Resolution Details", 
    "length": 0, 
    "no_copy": 1, 
@@ -525,6 +586,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, 
@@ -535,6 +597,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
+   "columns": 0, 
    "depends_on": "customer", 
    "fieldname": "contact_info", 
    "fieldtype": "Section Break", 
@@ -543,14 +606,16 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer Details", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "icon-bullhorn", 
+   "options": "fa fa-bullhorn", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -561,6 +626,7 @@
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "customer", 
    "fieldname": "customer_name", 
    "fieldtype": "Data", 
@@ -569,6 +635,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -576,6 +643,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, 
@@ -586,6 +654,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "contact_person", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -593,6 +662,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Contact Person", 
    "length": 0, 
    "no_copy": 0, 
@@ -601,6 +671,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, 
@@ -611,6 +682,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "customer", 
    "fieldname": "contact_display", 
    "fieldtype": "Small Text", 
@@ -619,6 +691,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Contact", 
    "length": 0, 
    "no_copy": 0, 
@@ -626,6 +699,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, 
@@ -636,6 +710,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "customer", 
    "fieldname": "contact_mobile", 
    "fieldtype": "Data", 
@@ -644,6 +719,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Mobile No", 
    "length": 0, 
    "no_copy": 0, 
@@ -651,6 +727,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, 
@@ -661,6 +738,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "customer", 
    "fieldname": "contact_email", 
    "fieldtype": "Data", 
@@ -669,6 +747,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Contact Email", 
    "length": 0, 
    "no_copy": 0, 
@@ -676,6 +755,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,6 +766,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "customer", 
    "description": "", 
    "fieldname": "territory", 
@@ -695,6 +776,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Territory", 
    "length": 0, 
    "no_copy": 0, 
@@ -705,6 +787,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, 
@@ -715,6 +798,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "customer", 
    "description": "", 
    "fieldname": "customer_group", 
@@ -724,6 +808,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer Group", 
    "length": 0, 
    "no_copy": 0, 
@@ -732,6 +817,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, 
@@ -742,6 +828,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "col_break4", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -749,12 +836,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, 
@@ -766,6 +855,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "customer_address", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -773,6 +863,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer Address", 
    "length": 0, 
    "no_copy": 0, 
@@ -781,6 +872,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, 
@@ -791,6 +883,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "customer", 
    "fieldname": "address_display", 
    "fieldtype": "Small Text", 
@@ -799,6 +892,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Address", 
    "length": 0, 
    "no_copy": 0, 
@@ -806,6 +900,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, 
@@ -816,6 +911,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "customer", 
    "description": "If different than customer address", 
    "fieldname": "service_address", 
@@ -825,6 +921,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Service Address", 
    "length": 0, 
    "no_copy": 0, 
@@ -834,6 +931,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, 
@@ -844,6 +942,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
+   "columns": 0, 
    "fieldname": "more_info", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -851,14 +950,16 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "More Information", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "icon-file-text", 
+   "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, 
@@ -869,6 +970,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "company", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -876,6 +978,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -886,6 +989,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 1, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 1, 
@@ -896,6 +1000,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "col_break6", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -903,12 +1008,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, 
@@ -920,6 +1027,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "complaint_raised_by", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -927,6 +1035,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Raised By", 
    "length": 0, 
    "no_copy": 0, 
@@ -936,6 +1045,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, 
@@ -946,6 +1056,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "from_company", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -953,6 +1064,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "From Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -962,6 +1074,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, 
@@ -972,6 +1085,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "amended_from", 
    "fieldtype": "Link", 
    "hidden": 1, 
@@ -979,6 +1093,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amended From", 
    "length": 0, 
    "no_copy": 1, 
@@ -989,6 +1104,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, 
@@ -999,15 +1115,16 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-bug", 
+ "icon": "fa fa-bug", 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-04-06 03:15:18.376985", 
+ "modified": "2016-11-07 05:06:08.638760", 
  "modified_by": "Administrator", 
  "module": "Support", 
  "name": "Warranty Claim", 
@@ -1023,6 +1140,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1034,6 +1152,7 @@
    "write": 1
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "status,customer,customer_name,territory", 
diff --git a/erpnext/support/doctype/warranty_claim/warranty_claim.py b/erpnext/support/doctype/warranty_claim/warranty_claim.py
index b4427be..a3428a2 100644
--- a/erpnext/support/doctype/warranty_claim/warranty_claim.py
+++ b/erpnext/support/doctype/warranty_claim/warranty_claim.py
@@ -19,7 +19,7 @@
 		if session['user'] != 'Guest' and not self.customer:
 			frappe.throw(_("Customer is required"))
 
-		if self.status=="Closed" and \
+		if self.status=="Closed" and not self.resolution_date and \
 			frappe.db.get_value("Warranty Claim", self.name, "status")!="Closed":
 			self.resolution_date = now_datetime()
 
diff --git a/erpnext/support/page/support_analytics/support_analytics.js b/erpnext/support/page/support_analytics/support_analytics.js
index 79a7fd6..01b7b48 100644
--- a/erpnext/support/page/support_analytics/support_analytics.js
+++ b/erpnext/support/page/support_analytics/support_analytics.js
@@ -27,11 +27,11 @@
 	},
 
 	filters: [
-		{fieldtype:"Select", label: __("Fiscal Year"), link:"Fiscal Year",
+		{fieldname: "fiscal_year", fieldtype:"Select", label: __("Fiscal Year"), link:"Fiscal Year",
 			default_value: __("Select Fiscal Year") + "..."},
-		{fieldtype:"Date", label: __("From Date")},
-		{fieldtype:"Date", label: __("To Date")},
-		{fieldtype:"Select", label: __("Range"),
+		{fieldname: "from_date", fieldtype:"Date", label: __("From Date")},
+		{fieldname: "to_date", fieldtype:"Date", label: __("To Date")},
+		{fieldname: "range", fieldtype:"Select", label: __("Range"),
 			options:["Daily", "Weekly", "Monthly", "Quarterly", "Yearly"], default_value: "Monthly"}
 	],
 	
diff --git a/erpnext/support/page/support_analytics/support_analytics.json b/erpnext/support/page/support_analytics/support_analytics.json
index 3d8b486..93eb2d2 100644
--- a/erpnext/support/page/support_analytics/support_analytics.json
+++ b/erpnext/support/page/support_analytics/support_analytics.json
@@ -2,7 +2,7 @@
  "creation": "2013-01-04 15:31:45.000000", 
  "docstatus": 0, 
  "doctype": "Page", 
- "icon": "icon-bar-chart", 
+ "icon": "fa fa-bar-chart", 
  "idx": 1, 
  "modified": "2013-07-11 14:44:24.000000", 
  "modified_by": "Administrator", 
diff --git a/erpnext/templates/emails/request_for_quotation.html b/erpnext/templates/emails/request_for_quotation.html
index aedd8e2..b4dfb88 100644
--- a/erpnext/templates/emails/request_for_quotation.html
+++ b/erpnext/templates/emails/request_for_quotation.html
@@ -4,8 +4,8 @@
 <p>{{_("Please click on the following link to set your new password")}}:</p>
 <p><a href="{{ update_password_link }}">{{ update_password_link }}</a></p>
 {% else %}
-<p>{{_("Request for quotation can be access by clicking following link")}}:</p>
+<p>{{_("The request for quotation can be accessed by clicking on the following link")}}:</p>
 <p><a href="{{ rfq_link }}">Submit your Quotation</a></p>
 {% endif %}
 <p>{{_("Thank you")}},<br>
-{{ user_fullname }}</p>
\ No newline at end of file
+{{ user_fullname }}</p>
diff --git a/erpnext/templates/form_grid/includes/visible_cols.html b/erpnext/templates/form_grid/includes/visible_cols.html
index caa1366..3a0cc8d 100644
--- a/erpnext/templates/form_grid/includes/visible_cols.html
+++ b/erpnext/templates/form_grid/includes/visible_cols.html
@@ -2,7 +2,7 @@
 	{% 	var val = doc.get_formatted(df.fieldname);
 	if((df.fieldname !== "description" && df.fieldname !== "item_name") && val) { %}
 		<div class="row">
-			<div class="col-xs-4 text-ellipsis">
+			<div class="col-xs-4 ellipsis">
 				<strong title="{%= __(df.label) %}">{%= __(df.label) %}:</strong>
 			</div>
 			<div class="col-xs-8">
diff --git a/erpnext/templates/form_grid/material_request_grid.html b/erpnext/templates/form_grid/material_request_grid.html
new file mode 100644
index 0000000..866c06e
--- /dev/null
+++ b/erpnext/templates/form_grid/material_request_grid.html
@@ -0,0 +1,49 @@
+{% var visible_columns = row.get_visible_columns(["item_code", "warehouse",
+	"item_name", "amount", "stock_uom", "uom", "qty", "schedule_date"]); %}
+
+{% if(!doc) { %}
+	<div class="row">
+		<div class="col-sm-4">{%= __("Item") %}</div>
+		<div class="col-sm-3">{%= __("Required On") %}</div>
+		<div class="col-sm-3">{%= __("Warehouse") %}</div>
+		<div class="col-sm-2 text-right">{%= __("Qty") %}</div>
+	</div>
+{% } else { %}
+	<div class="row">
+		<div class="col-sm-4">
+            <span class="indicator {%= (doc.qty<=doc.ordered_qty) ? "green" : "orange" %}">{%= doc.item_code %}</strong>
+			{% if(doc.item_name != doc.item_code) { %}
+				<br>{%= doc.item_name %}{% } %}
+            <!-- {% if(doc.item_name != doc.description) { %}
+                <p>{%= doc.description %}</p>{% } %} -->
+			{% include "templates/form_grid/includes/visible_cols.html" %}
+		</div>
+
+
+		<div class="col-sm-3">
+			{% if(doc.schedule_date) { %}
+                <span title="{%= __("Reqd By Date") %}" class="{%=
+				(frappe.datetime.get_diff(doc.schedule_date, frappe.datetime.get_today()) < 0
+					&& doc.ordered_qty < doc.qty)
+					? "text-danger" : "text-muted" %}">
+					{%= doc.get_formatted("schedule_date") %}</span>
+			{% } %}
+        </div>
+
+        <!-- warehouse -->
+		<div class="col-sm-3">
+			{% if(doc.warehouse) { %}
+				<span class="label label-default" title="{%= __("For Warehouse") %}"
+                    style="margin-right: 10px;">
+					{%= doc.warehouse %}
+				</span>
+			{% } %}
+        </div>
+
+		<!-- qty -->
+		<div class="col-sm-2 text-right">
+			{%= doc.get_formatted("qty") %}
+			<span class="small">{%= doc.uom || doc.stock_uom %}</span>
+		</div>
+	</div>
+{% } %}
diff --git a/erpnext/templates/generators/item.html b/erpnext/templates/generators/item.html
index 5a8116c..c0399a7 100644
--- a/erpnext/templates/generators/item.html
+++ b/erpnext/templates/generators/item.html
@@ -3,7 +3,7 @@
 {% block title %} {{ title }} {% endblock %}
 
 {% block breadcrumbs %}
-    {% include "templates/includes/breadcrumbs.html" %}
+	{% include "templates/includes/breadcrumbs.html" %}
 {% endblock %}
 
 {% block page_content %}
@@ -25,17 +25,17 @@
 					{{ _("Item Code") }}: <span itemprop="productID">{{ variant and variant.name or name }}</span></p>
 				<br>
 				<div class="item-attribute-selectors">
-                    {% if has_variants %}
-                    {% for d in attributes %}
+					{% if has_variants %}
+					{% for d in attributes %}
 					{% if attribute_values[d.attribute] -%}
-                    <div class="item-view-attribute {% if (attribute_values[d.attribute] | len)==1 -%} hidden {%- endif %}"
-                            style="margin-bottom: 10px;">
-                        <h6 class="text-muted">{{ _(d.attribute) }}</h6>
-                        <select class="form-control"
-                            style="max-width: 140px"
-                            data-attribute="{{ d.attribute }}">
+					<div class="item-view-attribute {% if (attribute_values[d.attribute] | len)==1 -%} hidden {%- endif %}"
+							style="margin-bottom: 10px;">
+						<h6 class="text-muted">{{ _(d.attribute) }}</h6>
+						<select class="form-control"
+							style="max-width: 140px"
+							data-attribute="{{ d.attribute }}">
 						{% for value in attribute_values[d.attribute] %}
-                        <option value="{{ value }}"
+						<option value="{{ value }}"
 						{% if selected_attributes and selected_attributes[d.attribute]==value -%}
 							selected
 						{%- elif disabled_attributes and value in disabled_attributes.get(d.attribute, []) -%}
@@ -43,12 +43,12 @@
 						{%- endif %}>
 							{{ _(value) }}
 						</option>
-                        {% endfor %}
-                        </select>
-                    </div>
+						{% endfor %}
+						</select>
+					</div>
 					{%- endif %}
-                    {% endfor %}
-                    {% endif %}
+					{% endfor %}
+					{% endif %}
 				</div>
 				<br>
 				<div style="min-height: 100px; margin: 10px 0;">
@@ -56,18 +56,17 @@
 						<h4 class="item-price" itemprop="price"></h4>
 						<div class="item-stock" itemprop="availability"></div>
 					</div>
-                    <div class="item-cart hide">
-    					<div id="item-add-to-cart">
-    						<button class="btn btn-primary btn-sm">
-    							{{ _("Add to Cart") }}</button>
-    					</div>
-    					<div id="item-update-cart"
-                            style="display: none;
-    						padding-left: 0px; padding-right: 0px;
-                            padding-top: 10px;">
-    						<a href="/cart">{{ _("Goto Cart") }}</a>
-    					</div>
-                    </div>
+					<div class="item-cart hide">
+						<div id="item-add-to-cart">
+							<button class="btn btn-primary btn-sm">
+								{{ _("Add to Cart") }}</button>
+						</div>
+						<div id="item-update-cart" style="display: none;">
+							<a href="/cart" class='btn btn-sm btn-default'>
+								<i class='octicon octicon-check'></i>
+								{{ _("View in Cart") }}</a>
+						</div>
+					</div>
 				</div>
 			</div>
 		</div>
@@ -101,10 +100,10 @@
 <script>
 	{% include "templates/includes/product_page.js" %}
 
-    {% if variant_info %}
-    window.variant_info = {{ variant_info }};
-    {% else %}
-    window.variant_info = null;
-    {% endif %}
+	{% if variant_info %}
+	window.variant_info = {{ variant_info }};
+	{% else %}
+	window.variant_info = null;
+	{% endif %}
 </script>
 {% endblock %}
diff --git a/erpnext/templates/generators/item_group.html b/erpnext/templates/generators/item_group.html
index 674143d..7dac218 100644
--- a/erpnext/templates/generators/item_group.html
+++ b/erpnext/templates/generators/item_group.html
@@ -5,7 +5,7 @@
  <div class="page-breadcrumbs" data-html-block="breadcrumbs">
  	<ul class="breadcrumb">
  		<li>
- 			<span class="icon icon-angle-left"></span>
+ 			<span class="fa fa-angle-left"></span>
  			<a href="/me">My Account</a>
  		</li>
  	</ul>
diff --git a/erpnext/templates/generators/sales_partner.html b/erpnext/templates/generators/sales_partner.html
index 6da6ad0..39138d3 100644
--- a/erpnext/templates/generators/sales_partner.html
+++ b/erpnext/templates/generators/sales_partner.html
@@ -18,7 +18,7 @@
 					target="_blank">{{ partner_website }}</a></p>{%- endif %}
 				{% if partner_address -%}<p itemprop="address">{{ partner_address }}</p>{%- endif %}
 				{% if phone -%}<p itemprop="telephone">{{ phone }}</p>{%- endif %}
-				{% if email -%}<p itemprop="email"><span class="icon-envelope"></span> {{ email }}</p>{%- endif %}
+				{% if email -%}<p itemprop="email"><span class="fa fa-envelope"></span> {{ email }}</p>{%- endif %}
 			</address>
 		</div>
 		<div class="col-md-8">
diff --git a/erpnext/templates/generators/student_admission.html b/erpnext/templates/generators/student_admission.html
index 7eb9226..ae70df8 100644
--- a/erpnext/templates/generators/student_admission.html
+++ b/erpnext/templates/generators/student_admission.html
@@ -16,38 +16,10 @@
 <div>{{ introduction }}</div>
 {% endif %}
 
-{%- if eligibility -%}
-<h3> Eligibility </h3>
-<div>{{ eligibility }}</div>
-{% endif %}
-
-<table class="table table-bordered" style="margin-top: 20px; width: 30%">
-	<tr>
-		<th> Program</th>
-		<td>{{ program }} </td>
-	</tr>
-	<tr>
-		<th> Academic Year</th>
-		<td>{{ academic_year }} </td>
-	</tr>
-	<tr>
-		<th> Admission Start Date</th>
-		<td>{{ frappe.utils.formatdate(admission_start_date) }}</td>
-	</tr>
-	<tr>
-		<th> Admission End Date</th>
-		<td>{{ frappe.utils.formatdate(admission_end_date) }}</td>
-	</tr>
-	<tr>
-		<th> Application Fee</th>
-		<td>{{ frappe.utils.fmt_money(application_fee, 2, currency) }}</td>
-	</tr>
-</table>
-
 {%- if application_form_route -%}
 <p>
 	<a class='btn btn-primary'
-	href='/{{ doc.application_form_route }}?program={{ doc.program }}&academic_year={{ doc.academic_year }}&new=1'>
+	href='/{{ doc.application_form_route }}'>
 	{{ _("Apply Now") }}</a>
 </p>
 {% endif %}
diff --git a/erpnext/templates/includes/cart/cart_dropdown.html b/erpnext/templates/includes/cart/cart_dropdown.html
index 071b281..de29b56 100644
--- a/erpnext/templates/includes/cart/cart_dropdown.html
+++ b/erpnext/templates/includes/cart/cart_dropdown.html
@@ -1,6 +1,6 @@
 <div class="cart-dropdown-container">
 	<div id="cart-error" class="alert alert-danger"
-	style="display: none;"></div>
+		style="display: none;"></div>
 	<div class="row cart-items-dropdown cart-item-header text-muted">
 		<div class="col-sm-6 col-xs-6 h6 text-uppercase">
 		{{ _("Item") }}
@@ -9,13 +9,13 @@
 		{{ _("Price") }}
 		</div>
 	</div>
-	
+
 	{% if doc.items %}
 	<div class="cart-items-dropdown">
 		{% include "templates/includes/cart/cart_items_dropdown.html" %}
 	</div>
 	<div class="checkout-btn">
-	<a href="/cart" class="btn btn-block btn-primary">{{ _("Checkout") }}</a>
+		<a href="/cart" class="btn btn-block btn-primary">{{ _("Checkout") }}</a>
 	</div>
 	{% else %}
 	<p>{{ _("Cart is Empty") }}</p>
diff --git a/erpnext/templates/includes/cart/cart_items_dropdown.html b/erpnext/templates/includes/cart/cart_items_dropdown.html
index 9a3dbf8..b2ba431 100644
--- a/erpnext/templates/includes/cart/cart_items_dropdown.html
+++ b/erpnext/templates/includes/cart/cart_items_dropdown.html
@@ -7,7 +7,6 @@
     </div>
     <div class="col-sm-4 col-xs-4 text-right col-amount">
         {{ d.get_formatted("amount") }}
-
     </div>
 </div>
 {% endfor %}
\ No newline at end of file
diff --git a/erpnext/templates/includes/issue_row.html b/erpnext/templates/includes/issue_row.html
index f19ea85..c0b0d2b 100644
--- a/erpnext/templates/includes/issue_row.html
+++ b/erpnext/templates/includes/issue_row.html
@@ -5,7 +5,7 @@
             <span class="indicator {{ "red" if doc.status=="Open" else "darkgrey"   }}">
                 {{ doc.name }}</span>
 				   </div>
-                <div class="col-xs-6 items-preview text-ellipsis">
+                <div class="col-xs-6 items-preview ellipsis">
                     {{ doc.subject }}</div>
      
         <div class="col-xs-3 text-right small text-muted">
diff --git a/erpnext/templates/includes/macros.html b/erpnext/templates/includes/macros.html
index da21748..a25f313 100644
--- a/erpnext/templates/includes/macros.html
+++ b/erpnext/templates/includes/macros.html
@@ -1,7 +1,12 @@
 {% macro product_image_square(website_image, css_class="") %}
-{% if website_image -%} <meta itemprop="image" content="{{ frappe.utils.quoted(website_image) | abs_url }}"></meta>{%- endif %}
-<div class="product-image product-image-square {% if not website_image -%} missing-image {%- endif %} {{ css_class }}"
-	{% if website_image -%} style="background-image: url('{{ frappe.utils.quoted(website_image) | abs_url }}');" {%- endif %}>
+{% if website_image -%}
+	<meta itemprop="image" content="{{ frappe.utils.quoted(website_image) | abs_url }}"></meta>
+{%- endif %}
+<div class="product-image product-image-square
+	{% if not website_image -%} missing-image {%- endif %} {{ css_class }}"
+	{% if website_image -%}
+	style="background-image: url('{{ frappe.utils.quoted(website_image) | abs_url }}');"
+	{%- endif %}>
 </div>
 {% endmacro %}
 
diff --git a/erpnext/templates/includes/navbar/navbar_items.html b/erpnext/templates/includes/navbar/navbar_items.html
index c7af2fd..87dea8f 100644
--- a/erpnext/templates/includes/navbar/navbar_items.html
+++ b/erpnext/templates/includes/navbar/navbar_items.html
@@ -1,8 +1,8 @@
 {% extends 'frappe/templates/includes/navbar/navbar_items.html' %}
 
 {% block navbar_right_extension %}
-	<li class="shopping-cart">
-		<div class="cart-icon small">
+	<li class="shopping-cart hidden">
+		<div class="cart-icon">
 			<a class="dropdown-toggle" href="#" data-toggle="dropdown" id="navLogin">
 				Cart <span class="badge-wrapper" id="cart-count"></span>
 			</a>
diff --git a/erpnext/templates/includes/order/order_macros.html b/erpnext/templates/includes/order/order_macros.html
index 41be449..e77b8b4 100644
--- a/erpnext/templates/includes/order/order_macros.html
+++ b/erpnext/templates/includes/order/order_macros.html
@@ -4,7 +4,7 @@
     <div class="row item_name_and_description">
         <div class="col-xs-4 col-sm-2 order-image-col">
             <div class="order-image">
-                {{ product_image_square(d.image) }}
+                {{ product_image_square(d.thumbnail or d.image) }}
             </div>
         </div>
         <div class="col-xs-8 col-sm-10">
@@ -13,23 +13,24 @@
         </div>
     </div>
 {% endmacro %}
+
 {% macro item_name_and_description_cart(d) %}
     <div class="row item_name_dropdown">
         <div class="col-xs-4 col-sm-4 order-image-col">
             <div class="order-image">
-             {{ product_image_square(d.image) }}
+             {{ product_image_square(d.thumbnail or d.image) }}
             </div>
         </div>
         <div class="col-xs-8 col-sm-8">
-           {{ d.item_code|truncate(25) }}			
+           {{ d.item_code|truncate(25) }}
 			<div class="input-group number-spinner">
                 <span class="input-group-btn">
                     <button class="btn btn-default cart-btn" data-dir="dwn">
                         –</button>
                 </span>
-            <input class="form-control text-right cart-qty"
-            value = "{{ d.get_formatted('qty') }}"
-            data-item-code="{{ d.item_code }}">
+	            <input class="form-control text-right cart-qty"
+		            value = "{{ d.get_formatted('qty') }}"
+		            data-item-code="{{ d.item_code }}">
                 <span class="input-group-btn">
                     <button class="btn btn-default cart-btn" data-dir="up">
                         +</button>
diff --git a/erpnext/templates/includes/product_page.js b/erpnext/templates/includes/product_page.js
index f4d9027..4b23d5e 100644
--- a/erpnext/templates/includes/product_page.js
+++ b/erpnext/templates/includes/product_page.js
@@ -12,17 +12,17 @@
 			item_code: get_item_code()
 		},
 		callback: function(r) {
-			$(".item-cart").toggleClass("hide", !!!r.message.price);
+			$(".item-cart").toggleClass("hide", (!!!r.message.price || !!!r.message.stock));
 			if(r.message && r.message.price) {
 				$(".item-price")
 					.html(r.message.price.formatted_price + " per " + r.message.uom);
 
 				if(r.message.stock==0) {
-					$(".item-stock").html("<div class='help'>Not in stock</div>");
+					$(".item-stock").html("<div style='color: red'>Not in stock</div>");
 				}
 				else if(r.message.stock==1) {
 					$(".item-stock").html("<div style='color: green'>\
-						<i class='icon-check'></i> Available (in stock)</div>");
+						<i class='fa fa-check'></i> Available (in stock)</div>");
 				}
 
 				if(r.message.qty) {
diff --git a/erpnext/templates/includes/products_as_list.html b/erpnext/templates/includes/products_as_list.html
index b2069e4..20ca59d 100644
--- a/erpnext/templates/includes/products_as_list.html
+++ b/erpnext/templates/includes/products_as_list.html
@@ -6,12 +6,12 @@
 			{{ product_image_square(thumbnail or website_image) }}
 		</div>
 		<div class='col-xs-9 col-sm-10 text-left'>
-			<div class="text-ellipsis product-text strong">{{ item_name }}</div>
+			<div class="ellipsis product-text strong">{{ item_name }}</div>
 			{% set website_description = website_description or description %}
 			{% if website_description != item_name %}
-				<div class="text-ellipsis text-muted">{{ website_description or description }}</div>
+				<div class="ellipsis text-muted">{{ website_description or description }}</div>
 			{% elif item_code != item_name %}
-				<div class="text-ellipsis text-muted">{{ _('Item Code') }}: {{ item_code }}</div>
+				<div class="ellipsis text-muted">{{ _('Item Code') }}: {{ item_code }}</div>
 			{% endif %}
 		</div>
 	</div>
diff --git a/erpnext/templates/includes/rfq.js b/erpnext/templates/includes/rfq.js
index c63226c..46357d4 100644
--- a/erpnext/templates/includes/rfq.js
+++ b/erpnext/templates/includes/rfq.js
@@ -18,6 +18,7 @@
 		this.change_rate();
 		this.terms();
 		this.submit_rfq();
+		this.navigate_quotations();
 	},
 
 	onfocus_select_all: function(){
@@ -81,10 +82,20 @@
 				},
 				btn: this,
 				callback: function(r){
-					$('.btn-sm').hide()
 					frappe.unfreeze();
+					if(r.message){
+						$('.btn-sm').hide()
+						window.location.href = "/quotations/" + encodeURIComponent(r.message);
+					}
 				}
 			})
 		})
+	},
+
+	navigate_quotations: function() {
+		$('.quotations').click(function(){
+			name = $(this).attr('idx')
+			window.location.href = "/quotations/" + encodeURIComponent(name);
+		})
 	}
 })
diff --git a/erpnext/templates/includes/transaction_row.html b/erpnext/templates/includes/transaction_row.html
index f0fee97..10d7605 100644
--- a/erpnext/templates/includes/transaction_row.html
+++ b/erpnext/templates/includes/transaction_row.html
@@ -9,7 +9,7 @@
 					{{ frappe.utils.format_datetime(doc.modified, "medium") }}
 				</div>
 			</div>
-			<div class="col-sm-4 items-preview text-ellipsis small">
+			<div class="col-sm-4 items-preview ellipsis small">
 				{{ doc.items_preview }}
 			</div>
 			<div class="col-sm-3 text-right bold">
diff --git a/erpnext/templates/pages/order.py b/erpnext/templates/pages/order.py
index d390ebf..296b907 100644
--- a/erpnext/templates/pages/order.py
+++ b/erpnext/templates/pages/order.py
@@ -14,10 +14,10 @@
 		context.doc.set_indicator()
 
 	context.parents = frappe.form_dict.parents
-	context.payment_ref = frappe.db.get_value("Payment Request", 
+	context.payment_ref = frappe.db.get_value("Payment Request",
 		{"reference_name": frappe.form_dict.name}, "name")
-	
+
 	context.enabled_checkout = frappe.get_doc("Shopping Cart Settings").enable_checkout
-			
-	if not context.doc.has_website_permission("read"):
+
+	if not frappe.has_website_permission(context.doc):
 		frappe.throw(_("Not Permitted"), frappe.PermissionError)
diff --git a/erpnext/templates/pages/rfq.html b/erpnext/templates/pages/rfq.html
index b151987..591d046 100644
--- a/erpnext/templates/pages/rfq.html
+++ b/erpnext/templates/pages/rfq.html
@@ -34,16 +34,16 @@
 			<div id="rfq-items">
 				<div class="row cart-item-header">
 					<div class="col-sm-5 col-xs-12">
-						Items
+						{{ _("Items") }}
 					</div>
 					<div class="col-sm-2 col-xs-4 text-right">
-						Qty
+						{{ _("Qty") }}
 					</div>
 					<div class="col-sm-2 col-xs-4 text-right">
-						Rate
+						{{ _("Rate") }}
 					</div>
 					<div class="col-sm-3 col-xs-4 text-right">
-						Amount
+						{{ _("Amount") }}
 					</div>
 				</div>
 				<hr>
@@ -68,6 +68,31 @@
 				<textarea class="form-control terms-feedback" style="height: 100px;"></textarea>
 			</div>
 		</div>
+		<hr>
+		<div class="row">
+			<div class="result">
+				<div class="col-xs-12">
+					<p class="text-muted small">{{ _("Quotations: ") }}</p>
+					{% if doc.rfq_links %}
+						{% for d in doc.rfq_links %}
+							<div class="web-list-item transaction-list-item quotations" idx="{{d.name}}">
+								<div class="row">
+									<div class="col-sm-6">
+										<span class="indicator darkgrey"><a href="/quotations/{{d.name}}">{{d.name}}</a></span>
+									</div>
+									<div class="col-sm-3">
+										<span class="small darkgrey">{{d.status}}</span>
+									</div>
+									<div class="col-sm-3">
+										<span class="small darkgrey">{{d.transaction_date}}</span>
+									</div>
+								</div>
+							</div>
+						{% endfor %}
+					{% endif %}
+				</div>
+			</div>
+		</div>
     </div>
 </div>
 
diff --git a/erpnext/templates/pages/rfq.py b/erpnext/templates/pages/rfq.py
index decae41..abc2890 100644
--- a/erpnext/templates/pages/rfq.py
+++ b/erpnext/templates/pages/rfq.py
@@ -4,6 +4,7 @@
 from __future__ import unicode_literals
 import frappe
 from frappe import _
+from frappe.utils import formatdate
 from erpnext.controllers.website_list_for_contact import (get_customers_suppliers,
 					get_party_details)
 
@@ -13,6 +14,7 @@
 	context.doc = frappe.get_doc(frappe.form_dict.doctype, frappe.form_dict.name)
 	context.parents = frappe.form_dict.parents
 	context.doc.supplier = get_supplier()
+	context.doc.rfq_links = get_link_quotation(context.doc.supplier, context.doc.name)
 	unauthorized_user(context.doc.supplier)
 	update_supplier_details(context)
 	context["title"] = frappe.form_dict.name
@@ -41,4 +43,18 @@
 	context.doc.currency = supplier_doc.default_currency or frappe.db.get_value("Company", context.doc.company, "default_currency")
 	context.doc.currency_symbol = frappe.db.get_value("Currency", context.doc.currency, "symbol")
 	context.doc.number_format = frappe.db.get_value("Currency", context.doc.currency, "number_format")
-	context.doc.buying_price_list = supplier_doc.default_price_list or ''
\ No newline at end of file
+	context.doc.buying_price_list = supplier_doc.default_price_list or ''
+
+def get_link_quotation(supplier, rfq):
+	quotation = frappe.db.sql(""" select distinct `tabSupplier Quotation Item`.parent as name,
+		`tabSupplier Quotation`.status, `tabSupplier Quotation`.transaction_date from
+		`tabSupplier Quotation Item`, `tabSupplier Quotation` where `tabSupplier Quotation`.docstatus < 2 and
+		`tabSupplier Quotation Item`.request_for_quotation =%(name)s and
+		`tabSupplier Quotation Item`.parent = `tabSupplier Quotation`.name and
+		`tabSupplier Quotation`.supplier = %(supplier)s order by `tabSupplier Quotation`.creation desc""",
+		{'name': rfq, 'supplier': supplier}, as_dict=1)
+
+	for data in quotation:
+		data.transaction_date = formatdate(data.transaction_date)
+
+	return quotation or None
diff --git a/erpnext/templates/pages/task_info.html b/erpnext/templates/pages/task_info.html
index 1d6574b..7cc5594 100644
--- a/erpnext/templates/pages/task_info.html
+++ b/erpnext/templates/pages/task_info.html
@@ -4,7 +4,7 @@
 <div class="page-breadcrumbs" data-html-block="breadcrumbs">
 	<ul class="breadcrumb">
 		<li>
-			<span class="icon icon-angle-left"></span>
+			<span class="fa fa-angle-left"></span>
 			<a href="/projects?project={{ doc.project }}">{{ doc.project }}</a>
 		</li>
 	</ul>
diff --git a/erpnext/templates/pages/timelog_info.html b/erpnext/templates/pages/timelog_info.html
index 76dbc32..8b2fa6a 100644
--- a/erpnext/templates/pages/timelog_info.html
+++ b/erpnext/templates/pages/timelog_info.html
@@ -1,12 +1,12 @@
 {% extends "templates/web.html" %}
 {% block title %} {{ doc.name }} {% endblock %}
 {% block breadcrumbs %}
-<div class="page-breadcrumbs" data-html-block="breadcrumbs">	                    
+<div class="page-breadcrumbs" data-html-block="breadcrumbs">
 	<ul class="breadcrumb">
 		<li>
-			<span class="icon icon-angle-left"></span>
+			<span class="fa fa-angle-left"></span>
 			<a href="/projects?project={{ doc.project }}">{{ doc.project }}</a>
-		</li>	
+		</li>
 </ul>
 </div>
 {% endblock %}
@@ -18,28 +18,28 @@
 
 	<div class="page-content-block">
 		<div class="row">
-			<div class="col-sm-12" style="max-width: 500px;">							
+			<div class="col-sm-12" style="max-width: 500px;">
 				<label for="project" class="control-label text-muted small">Project</label>
-				<input type="text" class="form-control" name="project" readonly value= "{{ doc.project }}">	
-				
+				<input type="text" class="form-control" name="project" readonly value= "{{ doc.project }}">
+
 				<label for="activity_type" class="control-label text-muted small">Activity Type</label>
-				<input type="text" class="form-control" name="activity_type" readonly value= "{{ doc.activity_type }}">	
+				<input type="text" class="form-control" name="activity_type" readonly value= "{{ doc.activity_type }}">
 
 				<label for="task" class="control-label text-muted small">Task</label>
-				<input type="text" class="form-control" name="task" readonly value= "{{ doc.task }}">	
+				<input type="text" class="form-control" name="task" readonly value= "{{ doc.task }}">
 
 				<label for="from_time" class="control-label text-muted small">From Time</label>
-				<input type="text" class="form-control" name="from_time" readonly value= "{{ doc.from_time }}">	
-				
+				<input type="text" class="form-control" name="from_time" readonly value= "{{ doc.from_time }}">
+
 				<label for="to_time" class="control-label text-muted small">To Time</label>
-				<input type="text" class="form-control" name="to_time" readonly value= "{{ doc.to_time }}">	
-				
+				<input type="text" class="form-control" name="to_time" readonly value= "{{ doc.to_time }}">
+
 				<label for="to_time" class="control-label text-muted small">Hours</label>
 				<input type="text" class="form-control" name="Hours" readonly value= "{{ doc.hours }}">
 
 				<label for="status" class="control-label text-muted small">Status</label>
-				<input type="text" class="form-control" name="status" readonly value= "{{ doc.status }}">	
-				
+				<input type="text" class="form-control" name="status" readonly value= "{{ doc.status }}">
+
 				<label for="Note" class="control-label text-muted small">Note</label>
 				<textarea class="form-control" name="Hours" readonly> {{ doc.note }} </textarea>
 			</div>
diff --git a/erpnext/templates/print_formats/includes/item_table_description.html b/erpnext/templates/print_formats/includes/item_table_description.html
index e8a98f0..e99d712 100644
--- a/erpnext/templates/print_formats/includes/item_table_description.html
+++ b/erpnext/templates/print_formats/includes/item_table_description.html
@@ -2,9 +2,8 @@
 {%- set compact_fields = doc.flags.compact_item_fields -%}
 
 {% if doc.in_format_data("image") and doc.get("image") and not doc.is_print_hide("image")-%}
-<div class="pull-left" style="width: 20%; margin-right: 10px;">
-	<div class="square-image" style="background-image: url('{{ doc.image }}')">
-	</div>
+<div class="pull-left" style="max-width: 40%; margin-right: 10px;">
+	<img class="print-item-image" src="{{ doc.image }}" alt="">
 </div>
 {%- endif %}
 
diff --git a/erpnext/templates/utils.py b/erpnext/templates/utils.py
index f33e647..94f9242 100644
--- a/erpnext/templates/utils.py
+++ b/erpnext/templates/utils.py
@@ -10,15 +10,43 @@
 @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
 
 	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)
+
+	opportunity = frappe.get_doc(dict(
+		doctype='Opportunity',
+		enquiry_from = 'Customer' if customer else 'Lead',
+		status = 'Open',
+		title = subject,
+		to_discuss=message
+	))
+
+	if customer:
+		opportunity.customer = customer
+	else:
+		opportunity.lead = new_lead.name
+
+	opportunity.insert(ignore_permissions=True)
+
 	comm = frappe.get_doc({
 		"doctype":"Communication",
 		"subject": subject,
 		"content": message,
 		"sender": sender,
-		"sent_or_received": "Received"
+		"sent_or_received": "Received",
+		'reference_doctype': 'Opportunity',
+		'reference_name': opportunity.name
 	})
 	comm.insert(ignore_permissions=True)
 
diff --git a/erpnext/translations/am.csv b/erpnext/translations/am.csv
index 84dd78e..2320cc0 100644
--- a/erpnext/translations/am.csv
+++ b/erpnext/translations/am.csv
@@ -18,11 +18,10 @@
 DocType: Sales Partner,Dealer,ሻጭ
 DocType: Employee,Rented,ተከራይቷል
 DocType: Purchase Order,PO-,PO-
-apps/erpnext/erpnext/accounts/report/financial_statements.py +19,Start Year {0} not found.,ዓመት ይጀምሩ {0} አልተገኘም.
 DocType: POS Profile,Applicable for User,ተጠቃሚ ተገቢነት
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +191,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","አቁሟል የምርት ትዕዛዝ ሊሰረዝ አይችልም, ለመሰረዝ መጀመሪያ Unstop"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +197,Do you really want to scrap this asset?,እርግጠኛ ነዎት ይህን ንብረት ቁራጭ ትፈልጋለህ?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +17,Select Default Supplier,ይምረጡ ነባሪ አቅራቢ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +192,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","አቁሟል የምርት ትዕዛዝ ሊሰረዝ አይችልም, ለመሰረዝ መጀመሪያ Unstop"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +198,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 +36,Currency is required for Price List {0},የምንዛሬ ዋጋ ዝርዝር ያስፈልጋል {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* ግብይቱ ላይ ይሰላሉ.
 DocType: Address,County,ካውንቲ
@@ -42,46 +41,45 @@
 DocType: Sales Invoice,Customer Name,የደንበኛ ስም
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +126,Bank account cannot be named as {0},የባንክ ሂሳብ እንደ የሚባል አይችልም {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,ኃላፊዎች (ወይም ቡድኖች) ይህም ላይ አካውንቲንግ ግቤቶችን ናቸው እና ሚዛን ጠብቆ ነው.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +180,Outstanding for {0} cannot be less than zero ({1}),ያልተከፈሉ {0} ሊሆን አይችልም ከ ዜሮ ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,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 +148,Series Updated Successfully,ተከታታይ በተሳካ ሁኔታ ዘምኗል
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +149,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,ሁሉም አቅራቢው ያግኙን
-DocType: Quality Inspection Reading,Parameter,የልኬት
 apps/erpnext/erpnext/projects/doctype/project/project.py +54,Expected End Date can not be less than Expected Start Date,የሚጠበቀው የማብቂያ ቀን የተጠበቀው የመጀመሪያ ቀን ያነሰ መሆን አይችልም
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,የረድፍ # {0}: ተመን ጋር ተመሳሳይ መሆን አለበት {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +239,New Leave Application,አዲስ ፈቃድ ማመልከቻ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,New Leave Application,አዲስ ፈቃድ ማመልከቻ
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +20,Attendance Record {0} exists against Student {1} for Course Schedule {2},በስብሰባው ሪከርድ {0} የትምህርት ፕሮግራም የተማሪ {1} ላይ አለ {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Bank Draft,ባንክ ረቂቅ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,ባንክ ረቂቅ
 DocType: Mode of Payment Account,Mode of Payment Account,የክፍያ መለያ ሁነታ
 apps/erpnext/erpnext/stock/doctype/item/item.js +52,Show Variants,አሳይ አይነቶች
 DocType: Academic Term,Academic Term,ትምህርታዊ የሚቆይበት ጊዜ
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +13,Material,ቁሳዊ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Quantity,ብዛት
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +511,Accounts table cannot be blank.,መለያዎች ሰንጠረዥ ባዶ መሆን አይችልም.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +616,Quantity,ብዛት
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +512,Accounts table cannot be blank.,መለያዎች ሰንጠረዥ ባዶ መሆን አይችልም.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,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/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 +142,User {0} is already assigned to Employee {1},አባል {0} አስቀድሞ ሰራተኛ ተመድቧል {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,የጤና ጥበቃ
-DocType: Purchase Invoice,Monthly,ወርሃዊ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),ክፍያ መዘግየት (ቀኖች)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +771,Invoice,የዋጋ ዝርዝር
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +750,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 +198,Row {0}: {1} {2} does not match with {3},ረድፍ {0}: {1} {2} ጋር አይዛመድም {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,የረድፍ # {0}:
+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 +127,Please select Price List,የዋጋ ዝርዝር እባክዎ ይምረጡ
@@ -112,8 +110,8 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,በዚሁ ኩባንያ ከአንድ ጊዜ በላይ ገባ ነው
 DocType: Employee,Married,ያገባ
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},አይፈቀድም {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +589,Get items from,ከ ንጥሎችን ያግኙ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +382,Stock cannot be updated against Delivery Note {0},የአክሲዮን አሰጣጥ ማስታወሻ ላይ መዘመን አይችልም {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,ከ ንጥሎችን ያግኙ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,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,ግሮሰሪ
@@ -122,7 +120,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 +156,Salary Structure Missing,ደመወዝ መዋቅር ይጎድላል
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Salary Structure Missing,ደመወዝ መዋቅር ይጎድላል
 DocType: Lead,Person Name,ሰው ስም
 DocType: Sales Invoice Item,Sales Invoice Item,የሽያጭ ደረሰኝ ንጥል
 DocType: Account,Credit,የሥዕል
@@ -130,10 +128,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 +156,Credit limit has been crossed for customer {0} {1}/{2},የክሬዲት ገደብ ደንበኛ ተሻገሩ ተደርጓል {0} {1} / {2}
-apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",የንብረት ዘገባ ንጥል ላይ አለ እንደ ካልተደረገበት ሊሆን አይችልም &quot;ቋሚ ንብረት ነው&quot;
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +189,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;
 DocType: Tax Rule,Tax Type,የግብር አይነት
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +144,You are not authorized to add or update entries before {0},ከእናንተ በፊት ግቤቶችን ማከል ወይም ዝማኔ ስልጣን አይደለም {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},ከእናንተ በፊት ግቤቶችን ማከል ወይም ዝማኔ ስልጣን አይደለም {0}
 DocType: Item,Item Image (if not slideshow),ንጥል ምስል (የተንሸራታች አይደለም ከሆነ)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,አንድ የደንበኛ በተመሳሳይ ስም አለ
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(ሰዓት ተመን / 60) * ትክክለኛ ኦፕሬሽን ሰዓት
@@ -143,18 +142,17 @@
 DocType: Student Log,Student Log,የተማሪ ምዝግብ ማስታወሻ
 DocType: Quality Inspection,Get Specification Details,መስፈርቶች ዝርዝሮችን አግኝ
 DocType: Lead,Interested,ለመወዳደር የምትፈልጉ
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +165,Opening,ቀዳዳ
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,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/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,የደንበኛ&gt; የደንበኛ ቡድን&gt; ግዛት
 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.,አሁን ያሉ ግብይት ጋር መለያ ቡድን ሊቀየር አይችልም.
 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,መጀመሪያ ኩባንያ ያስገቡ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Company first,መጀመሪያ ኩባንያ እባክዎ ይምረጡ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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,ጠቅላላ ወጪ
@@ -164,7 +162,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,መለያ መግለጫ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,ፋርማሱቲካልስ
 DocType: Purchase Invoice Item,Is Fixed Asset,ቋሚ ንብረት ነው
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Available qty is {0}, you need {1}",ይገኛል ብዛት {0}: የሚያስፈልግህ ነው {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +225,"Available qty is {0}, you need {1}",ይገኛል ብዛት {0}: የሚያስፈልግህ ነው {1}
 DocType: Expense Claim Detail,Claim Amount,የይገባኛል መጠን
 DocType: Employee,Mr,አቶ
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,አቅራቢው አይነት / አቅራቢዎች
@@ -173,25 +171,26 @@
 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: Assessment Result,Grade,ደረጃ
 DocType: Sales Invoice Item,Delivered By Supplier,አቅራቢ በ ደርሷል
 DocType: SMS Center,All Contact,ሁሉም እውቂያ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Annual Salary,ዓመታዊ ደመወዝ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,የክምችት ወጪ
-apps/erpnext/erpnext/accounts/report/financial_statements.py +22,End Year {0} not found.,የመጨረሻ ዓመት {0} አልተገኘም.
 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}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,አቅርቦት ጥሬ እቃዎች ግዢ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +130,At least one mode of payment is required for POS invoice.,የክፍያ ቢያንስ አንድ ሁነታ POS መጠየቂያ ያስፈልጋል.
 DocType: Products Settings,Show Products as a List,አሳይ ምርቶች አንድ እንደ ዝርዝር
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","ወደ መለጠፊያ አውርድ ተገቢ የውሂብ መሙላት እና የተሻሻለው ፋይል ማያያዝ. በተመረጠው ክፍለ ጊዜ ውስጥ ሁሉም ቀኖች እና ሠራተኛ ጥምረት አሁን ያሉ ክትትል መዛግብት ጋር, በአብነት ውስጥ ይመጣል"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +451,Item {0} is not active or end of life has been reached,{0} ንጥል ንቁ አይደለም ወይም የሕይወት መጨረሻ ደርሷል
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +456,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/controllers/accounts_controller.py +614,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","ንጥል መጠን ረድፍ {0} ውስጥ ግብርን ማካተት, ረድፎች ውስጥ ቀረጥ {1} ደግሞ መካተት አለበት"
+apps/erpnext/erpnext/controllers/accounts_controller.py +617,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","ንጥል መጠን ረድፍ {0} ውስጥ ግብርን ማካተት, ረድፎች ውስጥ ቀረጥ {1} ደግሞ መካተት አለበት"
 apps/erpnext/erpnext/config/hr.py +166,Settings for HR Module,የሰው ሀይል ሞዱል ቅንብሮች
 DocType: SMS Center,SMS Center,ኤስ ኤም ኤስ ማዕከል
 DocType: Sales Invoice,Change Amount,ለውጥ መጠን
@@ -203,13 +202,13 @@
 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 +147,Execution,ማስፈጸም
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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,ንጥሎች እና የዋጋ አሰጣጥ
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},ጠቅላላ ሰዓት: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},ቀን ጀምሮ በ የበጀት ዓመት ውስጥ መሆን አለበት. ቀን ጀምሮ ከወሰድን = {0}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,Cost Center {0} does not belong to Company {1},ማዕከል {0} ኩባንያ የእርሱ ወገን አይደለም ወጪ {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +100,Cost Center {0} does not belong to Company {1},ማዕከል {0} ኩባንያ የእርሱ ወገን አይደለም ወጪ {1}
 DocType: Customer,Individual,የግለሰብ
 DocType: Interest,Academics User,ምሑራንን ተጠቃሚ
 DocType: Cheque Print Template,Amount In Figure,ስእል ውስጥ የገንዘብ መጠን
@@ -225,30 +224,32 @@
 DocType: Production Planning Tool,Sales Orders,የሽያጭ ትዕዛዞች
 DocType: Purchase Taxes and Charges,Valuation,መገመት
 ,Purchase Order Trends,ትዕዛዝ በመታየት ላይ ይግዙ
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,The request for quotation can be accessed by clicking on the following link,ጥቅስ ለማግኘት ጥያቄው በሚከተለው አገናኝ ላይ ጠቅ በማድረግ ሊደረስባቸው ይችላሉ
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,ዓመት ያህል ቅጠል ይመድባሉ.
 DocType: SG Creation Tool Course,SG Creation Tool Course,ሹጋ የፈጠራ መሣሪያ ኮርስ
 DocType: Student Group Creation Tool,Leave blank if you wish to fetch all courses for selected academic term,የመረጡት የትምህርት ቃል ሁሉንም ኮርሶች ማምጣት ከፈለጉ ባዶውን ይተው
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,Insufficient Stock,በቂ ያልሆነ የአክሲዮን
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227,Insufficient Stock,በቂ ያልሆነ የአክሲዮን
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,አሰናክል አቅም የእቅዴ እና ሰዓት መከታተያ
+DocType: Email Digest,New Sales Orders,አዲስ የሽያጭ ትዕዛዞች
 DocType: Bank Reconciliation,Bank Account,የባንክ ሒሳብ
 DocType: Leave Type,Allow Negative Balance,አሉታዊ ቀሪ ፍቀድ
 DocType: Selling Settings,Default Territory,ነባሪ ግዛት
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,ቴሌቪዥን
 DocType: Production Order Operation,Updated via 'Time Log',«ጊዜ Log&quot; በኩል Updated
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} does not belong to Company {1},መለያ {0} ኩባንያ የእርሱ ወገን አይደለም {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +86,Account {0} does not belong to Company {1},መለያ {0} ኩባንያ የእርሱ ወገን አይደለም {1}
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},አስቀድሞ መጠን መብለጥ አይችልም {0} {1}
 DocType: Naming Series,Series List for this Transaction,ለዚህ ግብይት ተከታታይ ዝርዝር
 DocType: Sales Invoice,Is Opening Entry,Entry በመክፈት ላይ ነው
 DocType: Customer Group,Mention if non-standard receivable account applicable,ጥቀስ መደበኛ ያልሆነ እንደተቀበለ መለያ ተገቢነት ካለው
 DocType: Course Schedule,Instructor Name,አስተማሪ ስም
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,For Warehouse is required before Submit,መጋዘን አስገባ በፊት ያስፈልጋል
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,For Warehouse is required before Submit,መጋዘን አስገባ በፊት ያስፈልጋል
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,ላይ ተቀብሏል
 DocType: Sales Partner,Reseller,ሻጭ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,ኩባንያ ያስገቡ
 DocType: Delivery Note Item,Against Sales Invoice Item,የሽያጭ ደረሰኝ ንጥል ላይ
 ,Production Orders in Progress,በሂደት ላይ የምርት ትዕዛዞች
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Cash from Financing,በገንዘብ ከ የተጣራ ገንዘብ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1436,"LocalStorage is full , did not save","የአካባቢ ማከማቻ ሙሉ ነው, ሊያድን አይችልም ነበር"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1460,"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}
@@ -261,18 +262,19 @@
 apps/erpnext/erpnext/templates/generators/item.html +78,No description given,የተሰጠው መግለጫ የለም
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,ግዢ ይጠይቁ.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +5,This is based on the Time Sheets created against this project,ይሄ በዚህ ፕሮጀክት ላይ የተፈጠረውን ጊዜ ሉሆች ላይ የተመሠረተ ነው
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Only the selected Leave Approver can submit this Leave Application,ብቻ የተመረጠው ፈቃድ አጽዳቂ ይህ ፈቃድ ማመልከቻ ማስገባት ይችላሉ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +213,Only the selected Leave Approver can submit this Leave Application,ብቻ የተመረጠው ፈቃድ አጽዳቂ ይህ ፈቃድ ማመልከቻ ማስገባት ይችላሉ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,ቀን የሚያስታግሱ በመቀላቀል ቀን የበለጠ መሆን አለበት
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Leaves per Year,ዓመት በአንድ ማምለኩን
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,ዓመት በአንድ ማምለኩን
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,ረድፍ {0}: ያረጋግጡ መለያ ላይ &#39;Advance ነው&#39; {1} ይህን የቅድሚያ ግቤት ከሆነ.
 apps/erpnext/erpnext/stock/utils.py +188,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
 DocType: Task,Total Costing Amount (via Time Sheet),(ጊዜ ሉህ በኩል) ጠቅላላ ዋጋና መጠን
 DocType: Item Website Specification,Item Website Specification,ንጥል የድር ጣቢያ ዝርዝር
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +435,Leave Blocked,ውጣ የታገዱ
-apps/erpnext/erpnext/stock/doctype/item/item.py +669,Item {0} has reached its end of life on {1},ንጥል {0} ላይ ሕይወት ፍጻሜው ላይ ደርሷል {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +443,Leave Blocked,ውጣ የታገዱ
+apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item {0} has reached its end of life on {1},ንጥል {0} ላይ ሕይወት ፍጻሜው ላይ ደርሷል {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +95,Bank Entries,ባንክ ግቤቶችን
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +83,Annual,ዓመታዊ
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +86,Annual,ዓመታዊ
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,የክምችት ማስታረቅ ንጥል
 DocType: Stock Entry,Sales Invoice No,የሽያጭ ደረሰኝ የለም
 DocType: Material Request Item,Min Order Qty,ዝቅተኛ ትዕዛዝ ብዛት
@@ -280,20 +282,22 @@
 DocType: Lead,Do Not Contact,ያነጋግሩ አትበል
 apps/erpnext/erpnext/public/js/setup_wizard.js +360,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 +91,Software Developer,ሶፍትዌር ገንቢ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,ሶፍትዌር ገንቢ
 DocType: Item,Minimum Order Qty,የስራ ልምድ ትዕዛዝ ብዛት
 DocType: Pricing Rule,Supplier Type,አቅራቢው አይነት
 DocType: Scheduling Tool,Course Start Date,የኮርስ መጀመሪያ ቀን
 DocType: Item,Publish in Hub,ማዕከል ውስጥ አትም
+DocType: Student Admission,Student Admission,የተማሪ ምዝገባ
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is cancelled,{0} ንጥል ተሰርዟል
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Material Request,ቁሳዊ ጥያቄ
+apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} is cancelled,{0} ንጥል ተሰርዟል
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +823,Material Request,ቁሳዊ ጥያቄ
 DocType: Bank Reconciliation,Update Clearance Date,አዘምን መልቀቂያ ቀን
 apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +28,Abbreviation already used for another salary component,በምህፃረ ቃል አስቀድሞ ለሌላ ደመወዝ አካል ጥቅም ላይ
 DocType: Item,Purchase Details,የግዢ ዝርዝሮች
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +328,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},የግዥ ትዕዛዝ ውስጥ &#39;ጥሬ እቃዎች አቅርቦት&#39; ሠንጠረዥ ውስጥ አልተገኘም ንጥል {0} {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +333,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/config/selling.py +18,Confirmed orders from Customers.,ደንበኞች ከ ተረጋግጧል ትዕዛዞች.
 DocType: Purchase Receipt Item,Rejected Quantity,ውድቅ ብዛት
 DocType: SMS Settings,SMS Sender Name,ኤስ ኤም ኤስ የላኪ ስም
@@ -309,20 +313,21 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +130,Please select Charge Type first,በመጀመሪያ የክፍያ አይነት ይምረጡ
 DocType: Student Group Student,Student Group Student,የተማሪ ቡድን ተማሪ
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,የቅርብ ጊዜ
+DocType: Email Digest,New Quotations,አዲስ ጥቅሶች
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,በዝርዝሩ ውስጥ የመጀመሪያው ፈቃድ አጽዳቂ ነባሪ ፈቃድ አጽዳቂ ተዘጋጅቷል ይሆናል
 DocType: Tax Rule,Shipping County,የመርከብ ካውንቲ
 apps/erpnext/erpnext/config/desktop.py +158,Learn,ይወቁ
 DocType: Asset,Next Depreciation Date,ቀጣይ የእርጅና ቀን
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,የተቀጣሪ በአንድ እንቅስቃሴ ወጪ
 DocType: Accounts Settings,Settings for Accounts,መለያዎች ቅንብሮች
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +626,Supplier Invoice No exists in Purchase Invoice {0},አቅራቢው ደረሰኝ ምንም የግዢ ደረሰኝ ውስጥ አለ {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +629,Supplier Invoice No exists in Purchase Invoice {0},አቅራቢው ደረሰኝ ምንም የግዢ ደረሰኝ ውስጥ አለ {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,የሽያጭ ሰው ዛፍ ያቀናብሩ.
 DocType: Job Applicant,Cover Letter,የፊት ገፅ ደብዳቤ
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,ያልተከፈሉ Cheques እና ማጽዳት ተቀማጭ
 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 +348,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 +86,Circular Reference Error,ክብ ማጣቀሻ ስህተት
@@ -334,15 +339,16 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,ራስ-ሰር የቁስ ጥያቄ መፍጠር ላይ በኢሜይል አሳውቅ
 DocType: Journal Entry,Multi Currency,ባለብዙ ምንዛሬ
 DocType: Payment Reconciliation Invoice,Invoice Type,የደረሰኝ አይነት
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +806,Delivery Note,የመላኪያ ማስታወሻ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +800,Delivery Note,የመላኪያ ማስታወሻ
 apps/erpnext/erpnext/config/learn.py +87,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 +233,Payment Entry has been modified after you pulled it. Please pull it again.,አንተም አፈረሰ በኋላ የክፍያ Entry ተቀይሯል. እንደገና ጎትተው እባክህ.
+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/setup/doctype/email_digest/email_digest.py +104,Summary for this week and pending activities,በዚህ ሳምንት እና በመጠባበቅ ላይ ያሉ እንቅስቃሴዎች ማጠቃለያ
+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","በኮማ የተለዩ ያስገቡ የኢሜይል መታወቂያ, መጠየቂያ የተወሰነ ቀን ላይ በራስ-ሰር በፖስታ ቤት ይሆናል"
 DocType: Employee,Company Email,የኩባንያ ኢሜይል
@@ -354,27 +360,28 @@
 apps/erpnext/erpnext/config/hr.py +186,"Employee designation (e.g. CEO, Director etc.).","የተቀጣሪ ስያሜ (ለምሳሌ ሥራ አስፈጻሚ, ዳይሬክተር ወዘተ)."
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,ያስገቡ የመስክ እሴት «ቀን ቀን ወር መካከል ላይ ድገም &#39;እባክህ
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,የደንበኛ ምንዛሬ ደንበኛ መሰረታዊ ምንዛሬ በመለወጥ ነው በ ተመን
-apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},የረድፍ # {0}: የግዢ ደረሰኝ አንድ ነባር ንብረት ላይ ማድረግ አይቻልም {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +554,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},የረድፍ # {0}: የግዢ ደረሰኝ አንድ ነባር ንብረት ላይ ማድረግ አይቻልም {1}
 DocType: Item Tax,Tax Rate,የግብር ተመን
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} አስቀድሞ የሰራተኛ የተመደበው {1} ወደ ጊዜ {2} ለ {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +812,Select Item,ንጥል ምረጥ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +791,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/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,የደረሰኝ {0} አስቀድሞ ገብቷል ነው ይግዙ
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},የረድፍ # {0}: የጅምላ ምንም እንደ አንድ አይነት መሆን አለበት {1} {2}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +143,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.,አንድ ንጥል ባች (ዕጣ).
 DocType: C-Form Invoice Detail,Invoice Date,የደረሰኝ ቀን
 DocType: GL Entry,Debit Amount,ዴት መጠን
 apps/erpnext/erpnext/accounts/party.py +242,There can only be 1 Account per Company in {0} {1},ብቻ በ ኩባንያ በአንድ 1 መለያ ሊኖር ይችላል {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +4,Your email address,የእርስዎ ኢሜይል አድራሻ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +342,Please see attachment,አባሪ ይመልከቱ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,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 +19,Setup Already Complete!!,ማዋቀር አስቀድሞ ሙሉ !!
 ,Finished Goods,ጨርሷል ምርቶች
 DocType: Delivery Note,Instructions,መመሪያዎች
 DocType: Quality Inspection,Inspected By,በ ለመመርመር
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,አቅራቢው&gt; አቅራቢው አይነት
 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,ንጥሎች አክል
@@ -388,29 +395,29 @@
 DocType: Currency Exchange,Currency Exchange,የምንዛሬ Exchange
 DocType: Purchase Invoice Item,Item Name,ንጥል ስም
 DocType: Authorization Rule,Approving User  (above authorized value),(ፍቃድ ዋጋ በላይ) ተጠቃሚ ማጽደቅ
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,የብድር ቀሪ
+DocType: Email Digest,Credit Balance,የብድር ቀሪ
 DocType: Employee,Widowed,የሞተባት
 DocType: Request for Quotation,Request for Quotation,ትዕምርተ ጥያቄ
 DocType: Salary Slip Timesheet,Working Hours,የስራ ሰዓት
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,አንድ ነባር ተከታታይ ጀምሮ / የአሁኑ ቅደም ተከተል ቁጥር ለውጥ.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","በርካታ የዋጋ ደንቦች አይችሉአትም የሚቀጥሉ ከሆነ, ተጠቃሚዎች ግጭት ለመፍታት በእጅ ቅድሚያ ለማዘጋጀት ይጠየቃሉ."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +736,Purchase Return,የግዢ ተመለስ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +715,Purchase Return,የግዢ ተመለስ
 ,Purchase Register,የግዢ ይመዝገቡ
 DocType: 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 +202,{0} ({1}) must have role 'Leave Approver',{0} ({1}) ሚና ሊኖረው ይገባል &#39;አይተውህም አጽዳቂ&#39;
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,{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 +143,Reason for losing,ማጣት ለ ምክንያት
-apps/erpnext/erpnext/accounts/utils.py +239,Allocated amount can not greater than unadjusted amount,የተመደበ መጠን ያልተስተካከለ መጠን አይበልጥም ይችላል
+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,የተመደበ መጠን ያልተስተካከለ መጠን አይበልጥም ይችላል
 DocType: Announcement,Receiver,ተቀባይ
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},ከገቢር በአል ዝርዝር መሰረት በሚከተሉት ቀናት ላይ ዝግ ነው: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,ዕድሎች
 DocType: Employee,Single,ያላገባ
 DocType: Account,Cost of Goods Sold,የዕቃዎችና ወጪ የተሸጡ
 DocType: Purchase Invoice,Yearly,በየአመቱ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +225,Please enter Cost Center,ወጪ ማዕከል ያስገቡ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,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,መርማሪ ስም
@@ -423,26 +430,26 @@
 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,ማጣሪያ አቅራቢው የደረሰኝ ቁጥር ልዩ
 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 +102,Non Profit,ትርፍ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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: Stock Reconciliation Item,Do not include symbols (ex. $),ምልክቶችን ማካተት አትበል (ለምሳሌ. $)
 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 +638,Attribute {0} selected multiple times in Attributes Table,አይነታ {0} አይነታዎች ሠንጠረዥ ውስጥ በርካታ ጊዜ ተመርጠዋል
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,አይነታ {0} አይነታዎች ሠንጠረዥ ውስጥ በርካታ ጊዜ ተመርጠዋል
 DocType: HR Settings,Employee record is created using selected field. ,የተቀጣሪ መዝገብ የተመረጠው መስክ በመጠቀም የተፈጠረ ነው.
 DocType: Sales Order,Not Applicable,ተፈፃሚ የማይሆን
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,የበዓል ጌታ.
 DocType: Request for Quotation Item,Required Date,ተፈላጊ ቀን
 DocType: Delivery Note,Billing Address,የመክፈያ አድራሻ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +862,Please enter Item Code.,ንጥል ኮድ ያስገቡ.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +847,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","ከተመረጠ ቀደም አትም ተመን / አትም መጠን ውስጥ የተካተተ ሆኖ, ቀረጥ መጠን እንመረምራለን"
@@ -456,12 +463,12 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,ዋስትና እና ተቀማጭ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,የተመደበ ጠቅላላ ቅጠሎች የግዴታ ነው
 DocType: Job Opening,Description of a Job Opening,አንድ ኢዮብ በመክፈት መግለጫ
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Pending activities for today,በዛሬው ጊዜ በመጠባበቅ ላይ እንቅስቃሴዎች
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,በዛሬው ጊዜ በመጠባበቅ ላይ እንቅስቃሴዎች
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,የ ተሳትፎ ሬኮርዱ.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,timesheet የተመሠረተ ለደምዎዝ ደመወዝ ክፍለ አካል.
 DocType: Sales Order Item,Used for Production Plan,የምርት ዕቅድ ላይ ውሏል
 DocType: Manufacturing Settings,Time Between Operations (in mins),(ደቂቃዎች ውስጥ) ክወናዎች መካከል ሰዓት
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +92,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},ወጪ ማዕከል ላይ መለያ {1} ለ {0} በጀት {2} ነው {3}. ይህ በ መብለጥ ይሆናል {4}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +95,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},ወጪ ማዕከል ላይ መለያ {1} ለ {0} በጀት {2} ነው {3}. ይህ በ መብለጥ ይሆናል {4}
 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 ተመሳሳይ ንጥል አይደሉም
@@ -469,16 +476,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +238,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 +86,Administrative Officer,አስተዳደር ክፍል ኃላፊ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,አስተዳደር ክፍል ኃላፊ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +23,Acutal Qty {0} / Waiting Qty {1},Acutal ብዛት {0} / መጠበቅ ብዛት {1}
 DocType: Timesheet Detail,Hrs,ሰዓቶች
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +319,Please select Company,ኩባንያ ይምረጡ
-DocType: Stock Entry,Difference Account,ልዩነት መለያ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +309,Please select Company,ኩባንያ ይምረጡ
+DocType: Stock Entry Detail,Difference Account,ልዩነት መለያ
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,በሥሯ ተግባር {0} ዝግ አይደለም የቅርብ ተግባር አይችሉም.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Please enter Warehouse for which Material Request will be raised,የቁስ ጥያቄ ይነሣል ለዚህም መጋዘን ያስገቡ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +399,Please enter Warehouse for which Material Request will be raised,የቁስ ጥያቄ ይነሣል ለዚህም መጋዘን ያስገቡ
 DocType: Production Order,Additional Operating Cost,ተጨማሪ ስርዓተ ወጪ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,መዋቢያዎች
-apps/erpnext/erpnext/stock/doctype/item/item.py +530,"To merge, following properties must be same for both items","ማዋሃድ, የሚከተሉትን ንብረቶች ሁለቱም ንጥሎች ጋር ተመሳሳይ መሆን አለበት"
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,"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 +28,Buy,ግዛ
@@ -486,7 +493,7 @@
 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 +1563,Serial no item cannot be a fraction,ተከታታይ ምንም ንጥል ክፍልፋይ ሊሆን አይችልም
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1587,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
@@ -495,13 +502,14 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Account {0} does not belong to company: {1},{0} መለያ ኩባንያ የእርሱ ወገን አይደለም: {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation already used for another company,በምህፃረ ቃል አስቀድሞ ለሌላ ኩባንያ ጥቅም ላይ
 DocType: Selling Settings,Default Customer Group,ነባሪ የደንበኛ ቡድን
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Supplier is required against Payable account {0},አቅራቢው ተከፋይ ሂሳብ ላይ ያስፈልጋል {0}
 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 መሆን አይችልም
 DocType: Production Planning Tool,Material Requirement,ቁሳዊ ተፈላጊ
 DocType: Company,Delete Company Transactions,ኩባንያ ግብይቶች ሰርዝ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +313,Reference No and Reference Date is mandatory for Bank transaction,ማጣቀሻ የለም እና የማጣቀሻ ቀን ባንክ ግብይት ግዴታ ነው
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +316,Reference No and Reference Date is mandatory for Bank transaction,ማጣቀሻ የለም እና የማጣቀሻ ቀን ባንክ ግብይት ግዴታ ነው
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,/ አርትዕ ግብሮች እና ክፍያዎች ያክሉ
 DocType: Purchase Invoice,Supplier Invoice No,አቅራቢ ደረሰኝ የለም
 DocType: Territory,For reference,ለማጣቀሻ
@@ -512,7 +520,6 @@
 DocType: Installation Note Item,Installation Note Item,የአጫጫን ማስታወሻ ንጥል
 DocType: Production Plan Item,Pending Qty,በመጠባበቅ ላይ ብዛት
 DocType: Budget,Ignore,ችላ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,ንጥል ኮድ&gt; ንጥል ቡድን&gt; የምርት ስም
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,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
@@ -523,11 +530,11 @@
 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/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,በ የደረሰኝ ሠንጠረዥ ውስጥ አልተገኘም ምንም መዝገቦች
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +28,Please select Company and Party Type first,በመጀመሪያ ኩባንያ እና የፓርቲ አይነት ይምረጡ
+apps/erpnext/erpnext/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/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 +707,Make Sales Order,የሽያጭ ትዕዛዝ አድርግ
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +701,Make Sales Order,የሽያጭ ትዕዛዝ አድርግ
 DocType: Project Task,Project Task,ፕሮጀክት ተግባር
 ,Lead Id,ቀዳሚ መታወቂያ
 DocType: C-Form Invoice Detail,Grand Total,አጠቃላይ ድምር
@@ -543,7 +550,8 @@
 DocType: Job Applicant,Resume Attachment,ከቆመበት ቀጥል አባሪ
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,ተደጋጋሚ ደንበኞች
 DocType: Leave Control Panel,Allocate,አካፈለ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +734,Sales Return,የሽያጭ ተመለስ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +728,Sales Return,የሽያጭ ተመለስ
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +91,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,ማስታወሻ: ጠቅላላ የተመደበ ቅጠሎች {0} አስቀድሞ ተቀባይነት ቅጠሎች ያነሰ መሆን የለበትም {1} ወደ ጊዜ
 DocType: Announcement,Posted By,በ ተለጥፏል
 DocType: Item,Delivered by Supplier (Drop Ship),አቅራቢው ደርሷል (ጣል መርከብ)
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,የወደፊት ደንበኞች ውሂብ ጎታ.
@@ -552,14 +560,13 @@
 DocType: Quotation,Quotation To,ወደ ጥቅስ
 DocType: Lead,Middle Income,የመካከለኛ ገቢ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +212,Opening (Cr),በመክፈት ላይ (CR)
-apps/erpnext/erpnext/stock/doctype/item/item.py +795,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,እናንተ አስቀድሞ ከሌላ UOM አንዳንድ ግብይት (ዎች) ምክንያቱም ንጥል ለ ይለኩ ነባሪ ክፍል {0} በቀጥታ ሊቀየር አይችልም. የተለየ ነባሪ UOM ለመጠቀም አዲስ ንጥል መፍጠር አለብዎት.
-apps/erpnext/erpnext/accounts/utils.py +237,Allocated amount can not be negative,የተመደበ መጠን አሉታዊ መሆን አይችልም
+apps/erpnext/erpnext/stock/doctype/item/item.py +797,Default Unit of Measure for Item {0} cannot be changed directly because 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,የተመደበ መጠን አሉታዊ መሆን አይችልም
 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,የሽያጭ ደረሰኝ Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},ማጣቀሻ የለም እና ማጣቀሻ ቀን ያስፈልጋል {0}
-DocType: Sales Invoice,Customer's Vendor,ደንበኛ አቅራቢ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Proposal Writing,ሐሳብ መጻፍ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,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","የቁሳዊ ጥያቄዎች ውስጥ ይካተታል ንዑስ-ኮንትራት የሆኑ እቃዎች, ጥሬ ዕቃዎች ከተመረጠ"
@@ -568,13 +575,14 @@
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,የጊዜ ትራኪንግ
 DocType: Fiscal Year Company,Fiscal Year Company,በጀት ዓመት ኩባንያ
 DocType: Packing Slip Item,DN Detail,DN ዝርዝር
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +257,Already supplier quotation has created,አስቀድሞ አቅራቢ ጥቅስ ፈጥሯል
 DocType: Timesheet,Billed,የሚከፈል
 DocType: Batch,Batch Description,ባች መግለጫ
+apps/erpnext/erpnext/accounts/utils.py +685,"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 +733,View Offline Records,ይመልከቱ ከመስመር መዛግብት
+apps/erpnext/erpnext/accounts/page/pos/pos.js +715,View Offline Records,ይመልከቱ ከመስመር መዛግብት
+DocType: Student,Sibling Details,እህትህ ዝርዝሮች
 DocType: Employee,Reason for Resignation,ሥራ መልቀቅ ለ ምክንያት
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,አፈጻጸም ማስተመኖች አብነት.
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,የክፍያ መጠየቂያ / ጆርናል የሚመዘገብ ዝርዝሮች
@@ -588,7 +596,7 @@
 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,ቆጠራ ውስጥ የተጣራ ለውጥ
 DocType: Employee,Passport Number,የፓስፖርት ቁጥር
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Manager,አስተዳዳሪ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,አስተዳዳሪ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,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;ላይ የተመሠረተ »ጋር ተመሳሳይ መሆን አይችልም
@@ -597,10 +605,11 @@
 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 +299,Timesheet created:,Timesheet ተፈጥሯል:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +715,Please set default Cash or Bank account in Mode of Payment {0},የክፍያ ሁነታ ላይ ነባሪ በጥሬ ገንዘብ ወይም በባንክ መለያ ማዘጋጀት እባክዎ {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +300,Timesheet created:,Timesheet ተፈጥሯል:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +772,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,ይመዝገቡ
 DocType: Selling Settings,Customer Naming By,በ የደንበኛ አሰያየም
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,እባክዎ&gt; የሰው ሃብት ውስጥ HR ቅንብሮች ስርዓት መሰየምን ማዋቀር ሰራተኛ
 DocType: Depreciation Schedule,Depreciation Amount,የእርጅና መጠን
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,ቡድን ወደ ቀይር
 DocType: Activity Cost,Activity Type,የእንቅስቃሴ አይነት
@@ -625,6 +634,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,ጪረሰ
 DocType: Pricing Rule,Sales Manager,የሽያጭ ሃላፊ
 DocType: Salary Structure Employee,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,የንብረት ማስወገድ ላይ ረብ / ማጣት መለያ
@@ -639,11 +649,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +9,Pre Sales,ቅድመ ሽያጭ
 DocType: Purchase Receipt,Other Details,ሌሎች ዝርዝሮች
 DocType: Account,Accounts,መለያዎች
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Marketing,ማርኬቲንግ
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +227,Payment Entry is already created,የክፍያ Entry አስቀድሞ የተፈጠረ ነው
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,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 +538,Row #{0}: Asset {1} does not linked to Item {2},የረድፍ # {0}: {1} የንብረት ንጥል ጋር የተገናኘ አይደለም {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +21,Preview Salary Slip,ቅድመ-የቀጣሪ
+apps/erpnext/erpnext/controllers/accounts_controller.py +541,Row #{0}: Asset {1} does not linked to Item {2},የረድፍ # {0}: {1} የንብረት ንጥል ጋር የተገናኘ አይደለም {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +38,Preview Salary Slip,ቅድመ-የቀጣሪ
 DocType: Company,Deafult Cost Center,Deafult ወጪ ማዕከል
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +48,Account {0} has been entered multiple times,መለያ {0} በርካታ ጊዜ ገብቷል ታይቷል
 DocType: Account,Expenses Included In Valuation,ወጪዎች ግምቱ ውስጥ ተካቷል
@@ -652,7 +662,7 @@
 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 +617,Item has variants.,ንጥል ተለዋጮች አለው.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,ንጥል ተለዋጮች አለው.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,ንጥል {0} አልተገኘም
 DocType: Bin,Stock Value,የክምችት እሴት
 apps/erpnext/erpnext/accounts/doctype/account/account.py +25,Company {0} does not exist,ኩባንያ {0} የለም
@@ -672,7 +682,7 @@
 DocType: Purchase Order,Supply Raw Materials,አቅርቦት ጥሬ እቃዎች
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,ቀጣዩ የክፍያ መጠየቂያ ይፈጠራል ከተደረገባቸው ቀን. ማስገባት ላይ የመነጨ ነው.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,የአሁኑ ንብረቶች
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,{0} is not a stock Item,{0} አንድ የአክሲዮን ንጥል አይደለም
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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 +169,Lead must be set if Opportunity is made from Lead,ዕድል አመራር የተሰራ ከሆነ ግንባር መዘጋጀት አለበት
@@ -739,26 +749,25 @@
 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 +709,No Permission,ምንም ፍቃድ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +710,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}
 apps/erpnext/erpnext/public/js/setup_wizard.js +298,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 +542,Row #{0}: Asset {1} must be submitted,የረድፍ # {0}: የንብረት {1} መቅረብ አለበት
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,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,አንድ አቅራቢው subcontracted ከሆነ
 DocType: SMS Center,All Customer Contact,ሁሉም የደንበኛ ያግኙን
 apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,CSV በኩል የአክሲዮን ቀሪ ይስቀሉ.
 DocType: Warehouse,Tree Details,ዛፍ ዝርዝሮች
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,አሁን ላክ
 ,Support Analytics,የድጋፍ ትንታኔ
 DocType: Item,Website Warehouse,የድር ጣቢያ መጋዘን
 DocType: Payment Reconciliation,Minimum Invoice Amount,ዝቅተኛው የደረሰኝ የገንዘብ መጠን
 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/sales_invoice/sales_invoice.py +227,Timesheet {0} is already completed or cancelled,Timesheet {0} አስቀድሞ የተጠናቀቁ ወይም ተሰርዟል
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +259,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 ያነሰ ወይም እኩል መሆን አለበት
@@ -774,13 +783,13 @@
 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 +229,Target Warehouse,ዒላማ መጋዘን
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +230,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-,STE-
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Sales Order Date,የሚጠበቀው የመላኪያ ቀን የሽያጭ ትዕዛዝ ቀን በፊት ሊሆን አይችልም
 DocType: Upload Attendance,Import Attendance,አስመጣ ክትትል
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,ሁሉም ንጥል ቡድኖች
+apps/erpnext/erpnext/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/config/setup.py +89,Automatically compose message on submission of transactions.,በራስ-ሰር ግብይቶች ማቅረቢያ ላይ መልዕክት ያዘጋጁ.
@@ -792,13 +801,15 @@
 DocType: Sales Invoice,Payment Due Date,ክፍያ መጠናቀቅ ያለበት ቀን
 apps/erpnext/erpnext/stock/doctype/item/item.js +278,Item Variant {0} already exists with same attributes,ንጥል ተለዋጭ {0} ቀድሞውኑ ተመሳሳይ ባሕርያት ጋር አለ
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;በመክፈት ላይ&#39;
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,ማድረግ ወደ ክፈት
 DocType: Notification Control,Delivery Note Message,የመላኪያ ማስታወሻ መልዕክት
 DocType: Expense Claim,Expenses,ወጪ
 DocType: Item Variant Attribute,Item Variant Attribute,ንጥል ተለዋጭ መገለጫ ባህሪ
 ,Purchase Receipt Trends,የግዢ ደረሰኝ በመታየት ላይ ያሉ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Research & Development,የጥናት ምርምር እና ልማት
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,የጥናት ምርምር እና ልማት
 ,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,ዋጋ ወይም ቅናሽ
@@ -807,7 +818,7 @@
 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/controllers/accounts_controller.py +340,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",የክፍያ Entry {0} ትዕዛዝ በዚህ መጠየቂያ ውስጥ አስቀድሞ እንደ አፈረሰ ያለበት ከሆነ {1} ፈትሽ ላይ የተያያዘ ነው.
+apps/erpnext/erpnext/controllers/accounts_controller.py +343,"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,ነጥብ-መካከል-ሽያጭ
@@ -829,12 +840,12 @@
 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 +756,Purchase Receipt,የግዢ ደረሰኝ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +735,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 +167,Reference Doctype must be one of {0},ማጣቀሻ Doctype ውስጥ አንዱ መሆን አለበት {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +282,Unable to find Time Slot in the next {0} days for Operation {1},ድርጊቱ ለ ቀጣዩ {0} ቀናት ውስጥ ጊዜ ማስገቢያ ማግኘት አልተቻለም {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +170,Reference Doctype must be one of {0},ማጣቀሻ Doctype ውስጥ አንዱ መሆን አለበት {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Unable to find Time Slot in the next {0} days for Operation {1},ድርጊቱ ለ ቀጣዩ {0} ቀናት ውስጥ ጊዜ ማስገቢያ ማግኘት አልተቻለም {1}
 DocType: Production Order,Plan material for sub-assemblies,ንዑስ-አብያተ ክርስቲያናት ለ እቅድ ቁሳዊ
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,የሽያጭ አጋሮች እና ግዛት
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be active,BOM {0} ገባሪ መሆን አለበት
@@ -845,7 +856,7 @@
 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 +214,Warehouses with existing transaction can not be converted to ledger.,አሁን ያሉ ግብይት ጋር መጋዘኖችን የመቁጠር ወደ ሊቀየር አይችልም.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +217,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,የምርት ትዕዛዞች
@@ -859,9 +870,9 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,{0} ተቀጣሪ ንቁ አይደለም ወይም የለም
 DocType: Fee Structure,Components,ክፍሎች
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,Please enter Asset Category in Item {0},ንጥል ውስጥ የንብረት ምድብ ያስገቡ {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +612,Item Variants {0} updated,ንጥል አይነቶች {0} ዘምኗል
+apps/erpnext/erpnext/stock/doctype/item/item.py +614,Item Variants {0} updated,ንጥል አይነቶች {0} ዘምኗል
 DocType: Quality Inspection Reading,Reading 6,6 ማንበብ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +843,Cannot {0} {1} {2} without any negative outstanding invoice,አይደለም {0} {1} {2} ያለ ማንኛውም አሉታዊ ግሩም መጠየቂያ ማድረግ ይችላል
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +854,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,አሁን አመሳስል
@@ -876,69 +887,72 @@
 DocType: Item,Is Purchase Item,የግዢ ንጥል ነው
 DocType: Asset,Purchase Invoice,የግዢ ደረሰኝ
 DocType: Stock Ledger Entry,Voucher Detail No,የቫውቸር ዝርዝር የለም
-apps/erpnext/erpnext/accounts/page/pos/pos.js +728,New Sales Invoice,አዲስ የሽያጭ ደረሰኝ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +710,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 +728,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: Cheque Print Template,Has Print Format,አትም ቅርጸት አለው
-apps/erpnext/erpnext/accounts/page/pos/pos.js +86, is mandatory. Maybe Currency Exchange record is not created for ,የግዴታ ነው. ምናልባት የገንዘብ ምንዛሪ መዝገብ አልተፈጠረም ነው
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +109,Row #{0}: Please specify Serial No for Item {1},የረድፍ # {0}: ንጥል ምንም መለያ ይግለጹ {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +619,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","«የምርት ጥቅል &#39;ንጥሎች, መጋዘን, መለያ የለም እና ባች ምንም የ« ማሸጊያ ዝርዝር »ማዕድ ይብራራል. መጋዘን እና የጅምላ የለም ማንኛውም &#39;የምርት ጥቅል&#39; ንጥል ሁሉ ማሸጊያ ንጥሎች ተመሳሳይ ከሆነ, እነዚህ እሴቶች በዋናው ንጥል ሰንጠረዥ ውስጥ ገብቶ ሊሆን ይችላል, እሴቶች ማዕድ &#39;ዝርዝር ማሸግ&#39; ይገለበጣሉ."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +75, 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 +613,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing 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 +606,Supplier Invoice Date cannot be greater than Posting Date,አቅራቢው ደረሰኝ ቀን መለጠፍ ቀን በላይ ሊሆን አይችልም
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +609,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: 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 +810,Select Item for Transfer,ሰደዳ ይምረጡ ንጥል
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +789,Select Item for Transfer,ሰደዳ ይምረጡ ንጥል
 DocType: Purchase Invoice,Additional Discount Percentage,ተጨማሪ የቅናሽ መቶኛ
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,ሁሉም እርዳታ ቪዲዮዎች ዝርዝር ይመልከቱ
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,ቼክ ገቢ የት ባንኩ መለያ ምረጥ ራስ.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,የተጠቃሚ ግብይቶችን የዋጋ ዝርዝር ተመን አርትዕ ለማድረግ ፍቀድ
 DocType: Pricing Rule,Max Qty,ከፍተኛ ብዛት
-DocType: Student Applicant,Father's Name,አባት ስም
 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 +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,ረድፍ {0}: ሽያጮች / የግዥ ትዕዛዝ ላይ ክፍያ ሁልጊዜ አስቀድሞ እንደ ምልክት ሊደረግባቸው ይገባል
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,ኬሚካል
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +686,All items have already been transferred for this Production Order.,ሁሉም ንጥሎች አስቀድሞ በዚህ የምርት ትዕዛዝ ለ ተላልፈዋል.
+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} እና እንደገና ይሞክሩ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +694,All items have already been transferred for this Production Order.,ሁሉም ንጥሎች አስቀድሞ በዚህ የምርት ትዕዛዝ ለ ተላልፈዋል.
 DocType: Process Payroll,Select Payroll Year and Month,የደመወዝ ክፍያ ዓመት እና ወር ይምረጡ
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,Meter,መቁጠሪያ
 DocType: Workstation,Electricity Cost,ኤሌክትሪክ ወጪ
 DocType: HR Settings,Don't send Employee Birthday Reminders,የተቀጣሪ የልደት አስታዋሾች አትላክ
-DocType: Opportunity,Walk In,ውስጥ ይራመዱ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,የክምችት ግቤቶችን
 DocType: Item,Inspection Criteria,የምርመራ መስፈርት
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,ተዘዋውሯል
 apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,የእርስዎን ደብዳቤ ራስ እና አርማ ይስቀሉ. (ቆይተው አርትዕ ማድረግ ይችላሉ).
 DocType: Timesheet Detail,Bill,ቢል
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,White,ነጭ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date is entered as past date,ቀጣይ የእርጅና ቀን ባለፈው ቀን እንደ ገባ ነው
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +167,White,ነጭ
 DocType: SMS Center,All Lead (Open),ሁሉም ቀዳሚ (ክፈት)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +228,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),ረድፍ {0}: ለ ብዛት አይገኝም {4} መጋዘን ውስጥ {1} መግቢያ ጊዜ መለጠፍ (በ {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}),ረድፍ {0}: ለ ብዛት አይገኝም {4} መጋዘን ውስጥ {1} መግቢያ ጊዜ መለጠፍ (በ {2} {3})
 DocType: Purchase Invoice,Get Advances Paid,እድገት የሚከፈልበት ያግኙ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +731,Make ,አድርግ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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 +154,Order Type must be one of {0},ትዕዛዝ አይነት ውስጥ አንዱ መሆን አለበት {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},ትዕዛዝ አይነት ውስጥ አንዱ መሆን አለበት {0}
 DocType: Lead,Next Contact Date,ቀጣይ የእውቂያ ቀን
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,ብዛት በመክፈት ላይ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +393,Please enter Account for Change Amount,ለውጥ መጠን ለ መለያ ያስገቡ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,Please enter Account for Change Amount,ለውጥ መጠን ለ መለያ ያስገቡ
 DocType: Student Batch,Student Batch Name,የተማሪ የቡድን ስም
 DocType: Holiday List,Holiday List Name,የበዓል ዝርዝር ስም
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js +8,Schedule Course,መርሐግብር ኮርስ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Stock Options,የክምችት አማራጮች
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,የክምችት አማራጮች
 DocType: Journal Entry Account,Expense Claim,የወጪ የይገባኛል ጥያቄ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +211,Do you really want to restore this scrapped asset?,በእርግጥ ይህን በመዛጉ ንብረት እነበረበት መመለስ ትፈልጋለህ?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +237,Qty for {0},ለ ብዛት {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +212,Do you really want to restore this scrapped asset?,በእርግጥ ይህን በመዛጉ ንብረት እነበረበት መመለስ ትፈልጋለህ?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,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,አግድ ዝርዝር ቀኖች ውጣ
@@ -947,9 +961,9 @@
 DocType: Company,Default Terms,ነባሪ ውል
 DocType: Packing Slip Item,Packing Slip Item,ማሸጊያ የማያፈስ ንጥል
 DocType: Purchase Invoice,Cash/Bank Account,በጥሬ ገንዘብ / የባንክ መለያ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,ብዛት ወይም ዋጋ ላይ ምንም ለውጥ ጋር የተወገዱ ንጥሎች.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,ብዛት ወይም ዋጋ ላይ ምንም ለውጥ ጋር የተወገዱ ንጥሎች.
 DocType: Delivery Note,Delivery To,ወደ መላኪያ
-apps/erpnext/erpnext/stock/doctype/item/item.py +635,Attribute table is mandatory,አይነታ ሠንጠረዥ የግዴታ ነው
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,አይነታ ሠንጠረዥ የግዴታ ነው
 DocType: Production Planning Tool,Get Sales Orders,የሽያጭ ትዕዛዞች ያግኙ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} አሉታዊ መሆን አይችልም
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,አንድ ተማሪ ይምረጡ
@@ -974,7 +988,7 @@
 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,WIP መጋዘን
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},ተከታታይ አይ {0} እስከሁለት ጥገና ኮንትራት ስር ነው {1}
+apps/erpnext/erpnext/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,የድርጅት ስም
@@ -986,7 +1000,7 @@
 DocType: GL Entry,Against,ላይ
 DocType: Item,Default Selling Cost Center,ነባሪ ሽያጭ ወጪ ማዕከል
 DocType: Sales Partner,Implementation Partner,የትግበራ አጋር
-apps/erpnext/erpnext/controllers/selling_controller.py +231,Sales Order {0} is {1},የሽያጭ ትዕዛዝ {0} ነው {1}
+apps/erpnext/erpnext/controllers/selling_controller.py +232,Sales Order {0} is {1},የሽያጭ ትዕዛዝ {0} ነው {1}
 DocType: Opportunity,Contact Info,የመገኛ አድራሻ
 apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,የክምችት ግቤቶችን ማድረግ
 DocType: Packing Slip,Net Weight UOM,የተጣራ ክብደት UOM
@@ -996,25 +1010,24 @@
 DocType: Holiday List,Get Weekly Off Dates,ሳምንታዊ ጠፍቷል ቀኖች ያግኙ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,የማብቂያ ቀን ከመጀመሪያ ቀን ያነሰ መሆን አይችልም
 DocType: Sales Person,Select company name first.,በመጀመሪያ ይምረጡ የኩባንያ ስም.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Dr,ዶ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Dr,ዶ
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,ጥቅሶች አቅራቢዎች ደርሷል.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},ወደ {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,አማካይ ዕድሜ
 DocType: 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/templates/pages/home.html +32,View All Products,ሁሉም ምርቶች ይመልከቱ
+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 +400,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,ማስጠንቀቂያ: የስርዓት ንጥል ለ መጠን ጀምሮ overbilling ይመልከቱ በ {0} ውስጥ {1} ዜሮ ነው
+apps/erpnext/erpnext/controllers/accounts_controller.py +403,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/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,እና ዓመት:
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +191,{0} {1} must be submitted,{0} {1} መቅረብ አለበት
-DocType: Email Digest,Annual Expense,ዓመታዊ የወጪ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,{0} {1} must be submitted,{0} {1} መቅረብ አለበት
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +145,Quantity must be less than or equal to {0},ብዛት ይልቅ ያነሰ ወይም እኩል መሆን አለበት {0}
 DocType: SMS Center,Total Characters,ጠቅላላ ቁምፊዎች
 apps/erpnext/erpnext/controllers/buying_controller.py +156,Please select BOM in BOM field for Item {0},ንጥል ለ BOM መስክ ውስጥ BOM ይምረጡ {0}
@@ -1025,30 +1038,31 @@
 DocType: Sales Partner,Distributor,አከፋፋይ
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,ወደ ግዢ ሳጥን ጨመር መላኪያ ደንብ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +211,Production Order {0} must be cancelled before cancelling this Sales Order,የምርት ትዕዛዝ {0} ይህን የሽያጭ ትዕዛዝ በመሰረዝ በፊት ተሰርዟል አለበት
-apps/erpnext/erpnext/public/js/controllers/transaction.js +62,Please set 'Apply Additional Discount On',ለማዘጋጀት &#39;ላይ ተጨማሪ ቅናሽ ተግብር&#39; እባክህ
+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,ክልል ያነሰ መሆን አለበት ከ ይልቅ ወደ ክልል
 DocType: Global Defaults,Global Defaults,ዓለም አቀፍ ነባሪዎች
 apps/erpnext/erpnext/projects/doctype/project/project.py +153,Project Collaboration Invitation,ፕሮጀክት ትብብር ማስታወቂያ
 DocType: Salary Slip,Deductions,ቅናሽ
+DocType: Leave Allocation,LAL/,ሱንደር /
 apps/erpnext/erpnext/public/js/financial_statements.js +73,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 +327,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 +362,Finished Item {0} must be entered for Manufacture type entry,ተጠናቅቋል ንጥል {0} ማምረት አይነት መግቢያ መግባት አለበት
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +367,Finished Item {0} must be entered for Manufacture type entry,ተጠናቅቋል ንጥል {0} ማምረት አይነት መግቢያ መግባት አለበት
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,የመክፈቻ ዲግሪ ቀሪ
 DocType: Sales Invoice Advance,Sales Invoice Advance,የሽያጭ ደረሰኝ የቅድሚያ
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +499,Nothing to request,ምንም ነገር መጠየቅ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +500,Nothing to request,ምንም ነገር መጠየቅ
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',&#39;ትክክለኛው የማስጀመሪያ ቀን&#39; &#39;ትክክለኛው መጨረሻ ቀን&#39; በላይ ሊሆን አይችልም
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Management,አስተዳደር
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},ወይ የዴቢት ወይም የክሬዲት መጠን ያስፈልጋል {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,አስተዳደር
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +55,Either debit or credit amount is required for {0},ወይ የዴቢት ወይም የክሬዲት መጠን ያስፈልጋል {0}
 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 +161,Blue,ሰማያዊ
+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,የኢሜይል መታወቂያ ማዘጋጀት እባክዎ
@@ -1058,12 +1072,12 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +23,POS Profile {0} already created for user: {1} and company {2},POS መገለጫ {0} አስቀድሞ ተጠቃሚ ተፈጥሯል: {1} እና ኩባንያ {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM ልወጣ መንስኤ
 DocType: Stock Settings,Default Item Group,ነባሪ ንጥል ቡድን
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1374,Do you really want to submit the invoice?,በእርግጥ ደረሰኝ ማቅረብ ትፈልጋለህ?
+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 +685,Cost Center For Item with Item Code ',&#39;ንጥል ኮድ ጋር ንጥል ለማግኘት ማዕከል ያስከፍላል
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1526,"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 +679,Cost Center For Item with Item Code ',&#39;ንጥል ኮድ ጋር ንጥል ለማግኘት ማዕከል ያስከፍላል
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1550,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","የክፍያ ሁነታ አልተዋቀረም. የመለያ ክፍያዎች ሁነታ ላይ ወይም POS መገለጫ ላይ ተዘጋጅቷል እንደሆነ, ያረጋግጡ."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,የእርስዎ የሽያጭ ሰው የደንበኛ ለማነጋገር በዚህ ቀን ላይ አስታዋሽ ያገኛሉ
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,"Further accounts can be made under Groups, but entries can be made against non-Groups","ተጨማሪ መለያዎች ቡድኖች ስር ሊሆን ይችላል, ነገር ግን ግቤቶች ያልሆኑ ቡድኖች ላይ ሊሆን ይችላል"
 DocType: Lead,Lead,አመራር
@@ -1083,104 +1097,106 @@
 DocType: Payment Reconciliation,Unreconciled Payment Details,Unreconciled የክፍያ ዝርዝሮች
 DocType: Global Defaults,Current Fiscal Year,የአሁኑ በጀት ዓመት
 DocType: Global Defaults,Disable Rounded Total,የተጠጋጋ ጠቅላላ አሰናክል
-DocType: Lead,Call,ጥሪ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +417,'Entries' cannot be empty,&#39;ግቤቶች&#39; ባዶ ሊሆን አይችልም
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +418,'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 +214,Fiscal Year {0} not found,አልተገኘም በጀት ዓመት {0}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +221,Fiscal Year {0} not found,አልተገኘም በጀት ዓመት {0}
 apps/erpnext/erpnext/config/hr.py +238,Setting up Employees,ሰራተኞች በማቀናበር ላይ
 DocType: Sales Order,SO-,ነቅሸ
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,መጀመሪያ ቅድመ ቅጥያ ይምረጡ
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Please select prefix first,መጀመሪያ ቅድመ ቅጥያ ይምረጡ
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Research,ምርምር
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,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 +43,Item {0} must be a non-stock item,{0} ንጥል ያልሆነ-የአክሲዮን ንጥል መሆን አለበት
 DocType: Contact,User ID,የተጠቃሚው መለያ
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +57,View Ledger,ይመልከቱ የሒሳብ መዝገብ
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,የጥንቶቹ
-apps/erpnext/erpnext/stock/doctype/item/item.py +504,"An Item Group exists with same name, please change the item name or rename the item group","አንድ ንጥል ቡድን በተመሳሳይ ስም አለ, ወደ ንጥል ስም መቀየር ወይም ንጥል ቡድን ዳግም መሰየም እባክዎ"
+apps/erpnext/erpnext/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 +437,Rest Of The World,ወደ ተቀረው ዓለም
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,የ ንጥል {0} ባች ሊኖረው አይችልም
 ,Budget Variance Report,በጀት ልዩነት ሪፖርት
 DocType: Salary Slip,Gross Pay,አጠቃላይ ክፍያ
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +90,Row {0}: Activity Type is mandatory.,ረድፍ {0}: የእንቅስቃሴ አይነት የግዴታ ነው.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +114,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/public/js/controllers/stock_controller.js +40,Accounting Ledger,አካውንቲንግ የሒሳብ መዝገብ
+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,የያዛችሁባቸው ተይዞባቸዋል ገቢዎች
 DocType: BOM Item,Item Description,ንጥል መግለጫ
+DocType: Student Sibling,Student Sibling,የተማሪ ወይም እህቴ
 DocType: Purchase Invoice,Is Recurring,ተደጋጋሚ ነው
 DocType: Purchase Invoice,Supplied Items,እጠነቀቅማለሁ ንጥሎች
 DocType: Student,STUD.,ያሸበረቁ.
 DocType: Production Order,Qty To Manufacture,ለማምረት ብዛት
+DocType: Email Digest,New Income,አዲስ ገቢ
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,የግዢ ዑደት ውስጥ ተመሳሳይ መጠን ይኑራችሁ
 DocType: Opportunity Item,Opportunity Item,አጋጣሚ ንጥል
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,ጊዜያዊ በመክፈት ላይ
 ,Employee Leave Balance,የሰራተኛ ፈቃድ ሒሳብ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +131,Balance for Account {0} must always be {1},መለያ ቀሪ {0} ሁልጊዜ መሆን አለበት {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +175,Valuation Rate required for Item in row {0},ረድፍ ውስጥ ንጥል ያስፈልጋል ከግምቱ ተመን {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,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,ምሳሌ: የኮምፒውተር ሳይንስ ሊቃውንት
 DocType: Purchase Invoice,Rejected Warehouse,ውድቅ መጋዘን
 DocType: GL Entry,Against Voucher,ቫውቸር ላይ
 DocType: Item,Default Buying Cost Center,ነባሪ መግዛትና ወጪ ማዕከል
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","ERPNext ውጭ የተሻለ ለማግኘት, እኛ የተወሰነ ጊዜ ሊወስድ እና እነዚህ እርዳታ ቪዲዮዎችን ለመመልከት እንመክራለን."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +87, to ,ወደ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,ወደ
 DocType: Item,Lead Time in days,ቀናት ውስጥ በእርሳስ ሰዓት
 ,Accounts Payable Summary,መለያዎች ተከፋይ ማጠቃለያ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Not authorized to edit frozen Account {0},የታሰረው መለያ አርትዕ ለማድረግ ፈቃድ የለውም {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},የታሰረው መለያ አርትዕ ለማድረግ ፈቃድ የለውም {0}
 DocType: Journal Entry,Get Outstanding Invoices,ያልተከፈሉ ደረሰኞች ያግኙ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +62,Sales Order {0} is not valid,የሽያጭ ትዕዛዝ {0} ልክ ያልሆነ ነው
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,የሽያጭ ትዕዛዝ {0} ልክ ያልሆነ ነው
 apps/erpnext/erpnext/setup/doctype/company/company.py +185,"Sorry, companies cannot be merged","ይቅርታ, ኩባንያዎች ይዋሃዳሉ አይችልም"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +139,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",ሐሳብ ጥያቄ ውስጥ ጠቅላላ እትም / ማስተላለፍ ብዛት {0} {1} \ ንጥል ለ የተጠየቀው ብዛት {2} በላይ ሊሆን አይችልም {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Small,ትንሽ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,Small,ትንሽ
 DocType: Employee,Employee Number,የሰራተኛ ቁጥር
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},የጉዳይ አይ (ዎች) አስቀድሞ ስራ ላይ ነው. መያዣ ማንም ከ ይሞክሩ {0}
 ,Invoiced Amount (Exculsive Tax),በደረሰኝ የተቀመጠው መጠን (Exculsive ታክስ)
-DocType: Student Applicant,Mother's / Guardian 1 Email ID,እናቴ / አሳዳጊ 1 የኢሜይል መታወቂያ
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,ንጥል 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,የመለያ ራስ {0} ተፈጥሯል
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +160,Green,አረንጓዴ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,አረንጓዴ
 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 +57,Contract,ስምምነት
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,ስምምነት
 DocType: Email Digest,Add Quote,Quote አክል
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +498,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 +503,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 +80,Row {0}: Qty is mandatory,ረድፍ {0}: ብዛት የግዴታ ነው
+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 +737,Sync Master Data,አመሳስል መምህር ውሂብ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +719,Sync Master Data,አመሳስል መምህር ውሂብ
 apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,የእርስዎ ምርቶች ወይም አገልግሎቶች
 DocType: Mode of Payment,Mode of Payment,የክፍያ ሁነታ
 apps/erpnext/erpnext/stock/doctype/item/item.py +178,Website Image should be a public file or website URL,የድር ጣቢያ ምስል ይፋዊ ፋይል ወይም ድር ጣቢያ ዩ አር ኤል መሆን አለበት
+DocType: Student Applicant,AP,የ AP
 DocType: Purchase Invoice Item,BOM,BOM
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,ይህ ሥር ንጥል ቡድን ነው እና አርትዕ ሊደረግ አይችልም.
+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 +345,"{0}: Employee email not found, hence email not sent",{0}: የሰራተኛ ኢሜይል አልተገኘም: ከዚህ አልተላከም ኢሜይል
+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,የእርስዎ ኩባንያ አድራሻ ነው
 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 +118,"For {0}, only credit accounts can be linked against another debit entry",{0}: ብቻ የክሬዲት መለያዎች ሌላ ዴቢት ግቤት ላይ የተገናኘ ሊሆን ይችላል
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Delivery Note {0} is not submitted,የመላኪያ ማስታወሻ {0} ማቅረብ አይደለም
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Delivery Note {0} is not submitted,የመላኪያ ማስታወሻ {0} ማቅረብ አይደለም
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Sub-contracted Item,ንጥል {0} አንድ ንዑስ-ኮንትራት ንጥል መሆን አለበት
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,የካፒታል ዕቃዎች
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","የዋጋ ደ መጀመሪያ ላይ በመመስረት ነው ንጥል, ንጥል ቡድን ወይም የምርት ስም ሊሆን ይችላል, ይህም መስክ ላይ ተግብር. &#39;"
 DocType: Hub Settings,Seller Website,ሻጭ ድር ጣቢያ
 DocType: Item,ITEM-,ITEM-
-apps/erpnext/erpnext/controllers/selling_controller.py +147,Total allocated percentage for sales team should be 100,የሽያጭ ቡድን ጠቅላላ የተመደበ መቶኛ 100 መሆን አለበት
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +110,Production Order status is {0},የምርት ትዕዛዝ ሁኔታ ነው {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,የሽያጭ ቡድን ጠቅላላ የተመደበ መቶኛ 100 መሆን አለበት
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},የምርት ትዕዛዝ ሁኔታ ነው {0}
 DocType: Appraisal Goal,Goal,ግብ
 DocType: Sales Invoice Item,Edit Description,አርትዕ መግለጫ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +757,For Supplier,አቅራቢ ለ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +723,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,አትም ቅርጸት ፍጠር
@@ -1196,10 +1212,11 @@
 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,ኛ ክፍል ኮድ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ጥንቅር ኢሜይል:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +445,BOM {0} does not belong to Item {1},BOM {0} ንጥል የእርሱ ወገን አይደለም {1}
 DocType: Sales Partner,Target Distribution,ዒላማ ስርጭት
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1667,Deafault warehouse is required for selected item,Deafault መጋዘን የተመረጠውን ንጥል ያስፈልጋል
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Deafault warehouse is required for selected item,Deafault መጋዘን የተመረጠውን ንጥል ያስፈልጋል
 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 ማንበብ
@@ -1208,23 +1225,23 @@
 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 +110,Hardware,ሃርድዌር
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,ሃርድዌር
 DocType: Sales Order,Recurring Upto,ተደጋጋሚ እስከሁለት
 DocType: Attendance,HR Manager,የሰው ሀይል አስተዳደር
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,አንድ ኩባንያ እባክዎ ይምረጡ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Privilege Leave,መብት ውጣ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,መብት ውጣ
 DocType: Purchase Invoice,Supplier Invoice Date,አቅራቢው ደረሰኝ ቀን
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,አንተ ወደ ግዢ ሳጥን ጨመር ማንቃት አለብዎት
 DocType: Payment Entry,Writeoff,ሰረዘ
 DocType: Appraisal Template Goal,Appraisal Template Goal,ግምገማ አብነት ግብ
-DocType: Salary Slip,Earning,ማግኘት
+DocType: Salary Component,Earning,ማግኘት
 DocType: Purchase Invoice,Party Account Currency,የድግስ መለያ ምንዛሬ
 ,BOM Browser,BOM አሳሽ
 DocType: Purchase Taxes and Charges,Add or Deduct,አክል ወይም ቀነሰ
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,መካከል ተገኝቷል ከተደራቢ ሁኔታ:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +171,Against Journal Entry {0} is already adjusted against some other voucher,ጆርናል ላይ የሚመዘገብ {0} አስቀድሞ አንዳንድ ሌሎች ቫውቸር ላይ ማስተካከያ ነው
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,ጆርናል ላይ የሚመዘገብ {0} አስቀድሞ አንዳንድ ሌሎች ቫውቸር ላይ ማስተካከያ ነው
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,ጠቅላላ ትዕዛዝ እሴት
-apps/erpnext/erpnext/demo/setup_data.py +358,Food,ምግብ
+apps/erpnext/erpnext/demo/setup/setup_data.py +301,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/course_schedule/course_schedule.js +103,Mark Attendence,ማርቆስ Attendence
@@ -1258,12 +1275,12 @@
 DocType: Sales Order Item,Planned Quantity,የታቀደ ብዛት
 DocType: Purchase Invoice Item,Item Tax Amount,ንጥል የግብር መጠን
 DocType: Item,Maintain Stock,የአክሲዮን ይኑራችሁ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +209,Stock Entries already created for Production Order ,ቀደም ሲል የምርት ትዕዛዝ የተፈጠሩ ስቶክ ግቤቶችን
+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,ቋሚ ንብረት ውስጥ የተጣራ ለውጥ
 DocType: Leave Control Panel,Leave blank if considered for all designations,ሁሉንም ስያሜዎች እየታሰቡ ከሆነ ባዶውን ይተው
-apps/erpnext/erpnext/controllers/accounts_controller.py +620,Charge of type 'Actual' in row {0} cannot be included in Item Rate,አይነት &#39;ትክክለኛው&#39; ረድፍ ውስጥ ኃላፊነት {0} ንጥል ተመን ውስጥ ሊካተቱ አይችሉም
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,Max: {0},ከፍተኛ: {0}
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +15,From Datetime,ከ DATETIME
+apps/erpnext/erpnext/controllers/accounts_controller.py +623,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 +239,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 +153,"Request for Quotation is disabled to access from portal, for more check portal settings.","ትዕምርተ ጥያቄ ተጨማሪ ቼክ መተላለፊያውን ቅንብሮች, ፖርታል ከ ለመድረስ ተሰናክሏል."
@@ -1271,8 +1288,8 @@
 DocType: Sales Invoice,Shipping Address Name,የሚላክበት አድራሻ ስም
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,መለያዎች ገበታ
 DocType: Material Request,Terms and Conditions Content,ውል እና ሁኔታዎች ይዘት
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +552,cannot be greater than 100,የበለጠ ከ 100 በላይ ሊሆን አይችልም
-apps/erpnext/erpnext/stock/doctype/item/item.py +680,Item {0} is not a stock Item,{0} ንጥል ከአክሲዮን ንጥል አይደለም
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +546,cannot be greater than 100,የበለጠ ከ 100 በላይ ሊሆን አይችልም
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is not a stock Item,{0} ንጥል ከአክሲዮን ንጥል አይደለም
 DocType: Maintenance Visit,Unscheduled,E ሶችን
 DocType: Employee,Owned,ባለቤትነት የተያዘ
 DocType: Salary Detail,Depends on Leave Without Pay,ይክፈሉ ያለ ፈቃድ ላይ የተመካ ነው
@@ -1286,10 +1303,9 @@
 DocType: GL Entry,GL Entry,GL የሚመዘገብ መረጃ
 DocType: HR Settings,Employee Settings,የሰራተኛ ቅንብሮች
 ,Batch-Wise Balance History,ባች-ጥበበኛ ባላንስ ታሪክ
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,የሚደረጉ ነገሮች ዝርዝር
 apps/erpnext/erpnext/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 +61,Apprentice,ሞያ ተማሪ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +102,Negative Quantity is not allowed,አሉታዊ ብዛት አይፈቀድም
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,ሞያ ተማሪ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +103,Negative Quantity is not allowed,አሉታዊ ብዛት አይፈቀድም
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",እንደ ሕብረቁምፊ ንጥል ከጌታው አልተሰበሰበም እና በዚህ መስክ ውስጥ የተከማቸ ግብር ዝርዝር ሰንጠረዥ. ግብር እና ክፍያዎች ጥቅም ላይ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +152,Employee cannot report to himself.,የተቀጣሪ ራሱን ሪፖርት አይችልም.
@@ -1310,15 +1326,14 @@
 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 +141,Source warehouse is mandatory for row {0},ምንጭ መጋዘን ረድፍ ግዴታ ነው {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +719,Packing Slip,ማሸጊያ የማያፈስ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Source warehouse is mandatory for row {0},ምንጭ መጋዘን ረድፍ ግዴታ ነው {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +713,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/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,ጥቅስ ጥያቄ የሚከተለውን አገናኝ ጠቅ በማድረግ መዳረሻ ሊሆን ይችላል
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,ማስመጣት አልተሳካም!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,ምንም አድራሻ ገና ታክሏል.
 DocType: Workstation Working Hour,Workstation Working Hour,ከገቢር የሥራ ሰዓት
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Analyst,ተንታኝ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,ተንታኝ
 DocType: Item,Inventory,ንብረት ቆጠራ
 DocType: Item,Sales Details,የሽያጭ ዝርዝሮች
 DocType: Quality Inspection,QI-,QI-
@@ -1326,7 +1341,7 @@
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,ብዛት ውስጥ
 DocType: Notification Control,Expense Claim Rejected,የወጪ የይገባኛል ጥያቄ ተቀባይነት አላገኘም
 DocType: Item Attribute,Item Attribute,ንጥል መገለጫ ባህሪ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +103,Government,መንግሥት
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,መንግሥት
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,ተቋም ስም
 apps/erpnext/erpnext/config/stock.py +289,Item Variants,ንጥል አይነቶች
 DocType: Company,Services,አገልግሎቶች
@@ -1342,6 +1357,7 @@
 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/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,ንዋይ ከ የገንዘብ ፍሰት
 DocType: Program Course,Program Course,ፕሮግራም ኮርስ
@@ -1382,12 +1398,12 @@
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,ተቀባይ ዝርዝር ባዶ ነው. ተቀባይ ዝርዝር ይፍጠሩ
 DocType: Production Plan Sales Order,Production Plan Sales Order,የምርት ዕቅድ የሽያጭ ትዕዛዝ
 DocType: Sales Partner,Sales Partner Target,የሽያጭ ባልደረባ ዒላማ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +110,Accounting Entry for {0} can only be made in currency: {1},{0} ለ ዲግሪ Entry ብቻ ምንዛሬ ውስጥ ሊደረጉ ይችላሉ: {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},{0} ለ ዲግሪ Entry ብቻ ምንዛሬ ውስጥ ሊደረጉ ይችላሉ: {1}
 DocType: Pricing Rule,Pricing Rule,የዋጋ አሰጣጥ ደንብ
 DocType: Budget,Action if Annual Budget Exceeded,እርምጃ ዓመታዊ በጀት የታለፈው ከሆነ
 apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,ትዕዛዝ ግዢ ቁሳዊ ጥያቄ
 DocType: Shopping Cart Settings,Payment Success URL,ክፍያ ስኬት ዩ አር ኤል
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +78,Row # {0}: Returned Item {1} does not exists in {2} {3},የረድፍ # {0}: ተመለሱ ንጥል {1} አይደለም ውስጥ አለ ነው {2} {3}
+apps/erpnext/erpnext/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,ባንክ ማስታረቅ መግለጫ
@@ -1396,40 +1412,39 @@
 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/stock/doctype/stock_entry/stock_entry.py +339,Not allowed to tranfer more {0} than {1} against Purchase Order {2},ተጨማሪ ይተላለፍ የማይፈቀድላቸው {0} ከ {1} የግዥ ትዕዛዝ ላይ {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +344,Not allowed to tranfer more {0} than {1} against Purchase Order {2},ተጨማሪ ይተላለፍ የማይፈቀድላቸው {0} ከ {1} የግዥ ትዕዛዝ ላይ {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},ለ በተሳካ ሁኔታ የተመደበ ማምለኩን {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,ምንም ንጥሎች ለመሸከፍ
 DocType: Shipping Rule Condition,From Value,እሴት ከ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +545,Manufacturing Quantity is mandatory,ከማኑፋክቸሪንግ ብዛት የግዴታ ነው
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,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 +71,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 +162,Row {0}: From Time and To Time of {1} is overlapping with {2},ረድፍ {0}: ታይም እና ወደ ጊዜ ጀምሮ {1} ጋር ተደራቢ ነው {2}
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +186,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,የክምችት ተጠያቂነቶች
 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 +130,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 +137,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,ሌሎች ሪፖርቶች
 DocType: Dependent Task,Dependent Task,ጥገኛ ተግባር
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,እባክዎ&gt; የሰው ሃብት ውስጥ HR ቅንብሮች ስርዓት መሰየምን ማዋቀር ሰራተኛ
 apps/erpnext/erpnext/stock/doctype/item/item.py +411,Conversion factor for default Unit of Measure must be 1 in row {0},የመለኪያ ነባሪ ክፍል ለ ልወጣ ምክንያቶች ረድፍ ውስጥ 1 መሆን አለበት {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,Leave of type {0} cannot be longer than {1},አይነት ፈቃድ {0} በላይ ሊሆን አይችልም {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +197,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 +921,Search Item,የፍለጋ ንጥል
+apps/erpnext/erpnext/accounts/page/pos/pos.js +910,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 +546,Already completed,ቀድሞውኑ ተጠናቋል
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +22,Payment Request already exists {0},የክፍያ መጠየቂያ አስቀድሞ አለ {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +550,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 +241,Quantity must not be more than {0},ብዛት የበለጠ መሆን አለበት {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Quantity must not be more than {0},ብዛት የበለጠ መሆን አለበት {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +76,Previous Financial Year is not closed,ቀዳሚ የፋይናንስ ዓመት ዝግ ነው
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +44,Age (Days),የእድሜ (ቀኖች)
 DocType: Quotation Item,Quotation Item,ትዕምርተ ንጥል
@@ -1446,7 +1461,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +221,Purchase Receipt {0} is not submitted,የግዢ ደረሰኝ {0} ማቅረብ አይደለም
 DocType: Company,Default Payable Account,ነባሪ ተከፋይ መለያ
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","እንደ የመላኪያ ደንቦች, የዋጋ ዝርዝር ወዘተ እንደ በመስመር ላይ ግዢ ጋሪ ቅንብሮች"
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +83,{0}% Billed,{0}% የሚከፈል
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}% የሚከፈል
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,የተጠበቁ ናቸው ብዛት
 DocType: Party Account,Party Account,የድግስ መለያ
 apps/erpnext/erpnext/config/setup.py +116,Human Resources,የሰው ሀይል አስተዳደር
@@ -1458,12 +1473,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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 +22,Collect,ይሰብስቡ
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,ይሰብስቡ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,Against Supplier Invoice {0} dated {1},አቅራቢው ላይ የደረሰኝ {0} የተዘጋጀው {1}
 DocType: Customer,Default Price List,ነባሪ ዋጋ ዝርዝር
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +225,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: Payment Reconciliation,Payments,ክፍያዎች
 DocType: Journal Entry,Entry Type,ግቤት አይነት
 ,Customer Credit Balance,የደንበኛ የሥዕል ቀሪ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Payable,ተከፋይ መለያዎች ውስጥ የተጣራ ለውጥ
@@ -1475,7 +1489,7 @@
 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 +9,Procurement,የግዥ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,ንጥሎች መካከል አንዳቸውም መጠን ወይም ዋጋ ላይ ምንም ዓይነት ለውጥ የላቸውም.
+apps/erpnext/erpnext/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,የዋስትና የይገባኛል ጥያቄ
 ,Lead Details,ቀዳሚ ዝርዝሮች
 DocType: Purchase Invoice,End date of current invoice's period,የአሁኑ መጠየቂያ ያለው ክፍለ ጊዜ መጨረሻ ቀን
@@ -1500,7 +1514,7 @@
 DocType: Purchase Invoice,Additional Discount,ተጨማሪ ቅናሽ
 DocType: Selling Settings,Selling Settings,ቅንብሮች መሸጥ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,የመስመር ላይ ጨረታዎች
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +97,Please specify either Quantity or Valuation Rate or both,ብዛት ወይም ዋጋ ትመና Rate ወይም ሁለቱንም ይግለጹ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,ብዛት ወይም ዋጋ ትመና Rate ወይም ሁለቱንም ይግለጹ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +13,Fulfillment,መፈጸም
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","ኩባንያ, ወር እና በጀት ዓመት የግዴታ ነው"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,የገበያ ወጪ
@@ -1521,14 +1535,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,ERPNext ማዋቀር ተጠናቋል!
 DocType: Item,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +93,A Customer Group exists with same name please change the Customer name or rename the Customer Group,አንድ የደንበኛ ቡድን በተመሳሳይ ስም አለ ያለውን የደንበኛ ስም መቀየር ወይም የደንበኛ ቡድን ዳግም መሰየም እባክዎ
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +126,A Customer Group exists with same name please change the Customer name or rename the Customer Group,አንድ የደንበኛ ቡድን በተመሳሳይ ስም አለ ያለውን የደንበኛ ስም መቀየር ወይም የደንበኛ ቡድን ዳግም መሰየም እባክዎ
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,አዲስ እውቂያ
 DocType: Territory,Parent Territory,የወላጅ ግዛት
 DocType: Quality Inspection Reading,Reading 2,2 ማንበብ
 DocType: Stock Entry,Material Receipt,ቁሳዊ ደረሰኝ
 DocType: Homepage,Products,ምርቶች
 DocType: Announcement,Instructor,አሠልታኝ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},የድግስ አይነት እና ወገን የሚሰበሰብ / ሊከፈል መለያ ያስፈልጋል {0}
 DocType: Employee,AB+,ኤቢ +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","ይህ ንጥል ተለዋጮች ያለው ከሆነ, ከዚያም የሽያጭ ትዕዛዞች ወዘተ መመረጥ አይችልም"
 DocType: Lead,Next Contact By,በ ቀጣይ እውቂያ
@@ -1539,7 +1552,7 @@
 ,Item-wise Sales Register,ንጥል-ጥበብ የሽያጭ መመዝገቢያ
 DocType: Asset,Gross Purchase Amount,አጠቃላይ የግዢ መጠን
 DocType: Asset,Depreciation Method,የእርጅና ስልት
-apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Offline,ከመስመር ውጭ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +686,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,የሚያስፈልግ
@@ -1557,25 +1570,27 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +425,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 +858,Make Purchase Order,የግዢ ትዕዛዝ አድርግ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +852,Make Purchase Order,የግዢ ትዕዛዝ አድርግ
 DocType: SMS Center,Send To,ወደ ላክ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,There is not enough leave balance for Leave Type {0},አይተውህም አይነት የሚበቃ ፈቃድ ቀሪ የለም {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,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 +172,Work-in-Progress Warehouse is required before Submit,የስራ-በ-እድገት መጋዘን አስገባ በፊት ያስፈልጋል
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,Work-in-Progress Warehouse is required before Submit,የስራ-በ-እድገት መጋዘን አስገባ በፊት ያስፈልጋል
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,አንድ ኢዮብ ለ አመልካች.
 DocType: Purchase Order Item,Warehouse and Reference,መጋዘን እና ማጣቀሻ
 DocType: Supplier,Statutory info and other general information about your Supplier,የእርስዎ አቅራቢው ስለ ህጋዊ መረጃ እና ሌሎች አጠቃላይ መረጃ
-apps/erpnext/erpnext/hooks.py +88,Addresses,አድራሻዎች
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,አቅራቢው&gt; አቅራቢው አይነት
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +212,Against Journal Entry {0} does not have any unmatched {1} entry,ጆርናል ላይ የሚመዘገብ {0} ማንኛውም ያላገኘውን {1} ግቤት የለውም
+apps/erpnext/erpnext/hooks.py +95,Addresses,አድራሻዎች
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +215,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,ንጥል ወይም መጋዘን ላይ የተመሠረተ ማጣሪያ ማዘጋጀት እባክዎ
 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,አድርስ እና ቢል
@@ -1583,11 +1598,10 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} must be submitted,BOM {0} መቅረብ አለበት
 DocType: Authorization Control,Authorization Control,ፈቀዳ ቁጥጥር
 apps/erpnext/erpnext/controllers/buying_controller.py +300,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},የረድፍ # {0}: መጋዘን አላገኘም ውድቅ ንጥል ላይ ግዴታ ነው {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +731,Payment,ክፍያ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,Payment,ክፍያ
 DocType: Production Order Operation,Actual Time and Cost,ትክክለኛው ጊዜ እና ወጪ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},ከፍተኛው {0} ቁሳዊ ጥያቄ {1} የሽያጭ ትዕዛዝ ላይ ንጥል የተሰራ ሊሆን ይችላል {2}
 DocType: Employee,Salutation,ሰላምታ
-DocType: Pricing Rule,Brand,ምልክት
 DocType: Course,Course Abbreviation,የኮርስ ምህፃረ ቃል
 DocType: Item,Will also apply for variants,በተጨማሪም ተለዋጮች ማመልከት ይሆን
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +142,"Asset cannot be cancelled, as it is already {0}","አስቀድሞ እንደ ንብረት, ሊሰረዝ አይችልም {0}"
@@ -1599,7 +1613,7 @@
 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.","እርስዎ ሊገዛ ወይም ሊሸጥ የእርስዎን ምርቶች ወይም አገልግሎቶች ዘርዝር. ከመጀመርዎ ጊዜ ይለኩ እና ሌሎች ንብረቶች ላይ ንጥል ቡድን, ክፍል ለመመልከት እርግጠኛ ይሁኑ."
 DocType: Hub Settings,Hub Node,ማዕከል መስቀለኛ መንገድ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,አንተ የተባዙ ንጥሎች አስገብተዋል. ለማስተካከል እና እንደገና ይሞክሩ.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Associate,የሥራ ጓደኛ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,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,ተቀባይ ዝርዝር ፍጠር
@@ -1607,7 +1621,7 @@
 DocType: Production Planning Tool,Material Requests,ቁሳዊ ጥያቄዎች
 DocType: Warranty Claim,Issue Date,የተለቀቀበት ቀን
 DocType: Activity Cost,Activity Cost,የእንቅስቃሴ ወጪ
-DocType: Timesheet Detail,Timesheet Detail,Timesheet ዝርዝር
+DocType: Sales Invoice Timesheet,Timesheet Detail,Timesheet ዝርዝር
 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),የጥቅል ይህን የመላኪያ (ብቻ ረቂቅ) አንድ ክፍል እንደሆነ ይጠቁማል
@@ -1630,6 +1644,7 @@
 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,ተለዋጮች አለው
 DocType: Monthly Distribution,Name of the Monthly Distribution,ወደ ወርሃዊ ስርጭት ስም
 DocType: Sales Person,Parent Sales Person,የወላጅ ሽያጭ ሰው
@@ -1642,30 +1657,31 @@
 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 +44,"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/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.,አንተ ወደ የሽያጭ ደረሰኝ ማስቀመጥ አንዴ ቃላት ውስጥ የሚታይ ይሆናል.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +502,Error: {0} &gt; {1},ስህተት: {0}&gt; {1}
 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.,የሚለው ቃል መጀመሪያ ቀን የሚለው ቃል ጋር የተያያዘ ነው ይህም ወደ የትምህርት ዓመት ዓመት የመጀመሪያ ቀን ከ ቀደም ሊሆን አይችልም (የትምህርት ዓመት {}). ቀናት ለማረም እና እንደገና ይሞክሩ.
 DocType: Naming Series,Current Value,የአሁኑ ዋጋ
-apps/erpnext/erpnext/controllers/accounts_controller.py +235,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,በርካታ የበጀት ዓመታት ቀን {0} አገልግሎቶች አሉ. በጀት ዓመት ውስጥ ኩባንያ ማዘጋጀት እባክዎ
+apps/erpnext/erpnext/controllers/accounts_controller.py +238,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 +458,Item table can not be blank,ንጥል ሰንጠረዥ ባዶ መሆን አይችልም
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +443,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 +5,This is based on stock movement. See {0} for details,ይህ የአክሲዮን እንቅስቃሴ ላይ የተመሠረተ ነው. ይመልከቱ {0} ዝርዝር መረጃ ለማግኘት
 DocType: Pricing Rule,Selling,ሽያጭ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +341,Amount {0} {1} deducted against {2},የገንዘብ መጠን {0} {1} ላይ የሚቀነስ {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +344,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,መጠናቀቅ ያለበት ቀን ቀን መለጠፍ በፊት ሊሆን አይችልም
@@ -1680,8 +1696,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +144,Cannot refer row number greater than or equal to current row number for this Charge type,ይህ የክፍያ ዓይነት የአሁኑ ረድፍ ቁጥር ይበልጣል ወይም እኩል ረድፍ ቁጥር ሊያመለክት አይችልም
 DocType: Asset,Sold,የተሸጠ
 ,Item-wise Purchase History,ንጥል-ጥበብ የግዢ ታሪክ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Red,ቀይ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},ተከታታይ ምንም ንጥል ታክሏል ለማምጣት &#39;ፍጠር ፕሮግራም »ላይ ጠቅ ያድርጉ {0}
+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,ክፈት ምርት ትዕዛዞች
 DocType: Sales Invoice Payment,Base Amount (Company Currency),የመሠረት መጠን (የኩባንያ የምንዛሬ)
@@ -1689,7 +1705,7 @@
 DocType: Installation Note,Installation Time,መጫን ሰዓት
 DocType: Sales Invoice,Accounting Details,አካውንቲንግ ዝርዝሮች
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,ይህ ኩባንያ ሁሉም ግብይቶች ሰርዝ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +187,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,የረድፍ # {0}: ክወና {1} በምርት ላይ ሲጨርስ ሸቀጦች {2} ብዛት ይሞላል አይደለም ትዕዛዝ # {3}. ጊዜ ምዝግብ በኩል ክወና ሁኔታ ያዘምኑ
+apps/erpnext/erpnext/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}. ጊዜ ምዝግብ በኩል ክወና ሁኔታ ያዘምኑ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,ኢንቨስትመንት
 DocType: Issue,Resolution Details,ጥራት ዝርዝሮች
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,አመዳደብ
@@ -1725,16 +1741,17 @@
 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}
 DocType: Delivery Note,Excise Page Number,ኤክሳይስ የገጽ ቁጥር
 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}
 ,Maintenance Schedules,ጥገና ፕሮግራም
 DocType: Task,Actual End Date (via Time Sheet),ትክክለኛው መጨረሻ ቀን (ሰዓት ሉህ በኩል)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Amount {0} {1} against {2} {3},የገንዘብ መጠን {0} {1} ላይ {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +339,Amount {0} {1} against {2} {3},የገንዘብ መጠን {0} {1} ላይ {2} {3}
 ,Quotation Trends,በትዕምርተ ጥቅስ አዝማሚያዎች
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},ንጥል ቡድን ንጥል ንጥል ጌታ ውስጥ የተጠቀሰው አይደለም {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +295,Debit To account must be a Receivable account,መለያ ወደ ዴቢት አንድ የሚሰበሰብ መለያ መሆን አለበት
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Receivable account,መለያ ወደ ዴቢት አንድ የሚሰበሰብ መለያ መሆን አለበት
 DocType: Shipping Rule Condition,Shipping Amount,መላኪያ መጠን
 ,Pending Amount,በመጠባበቅ ላይ ያለ መጠን
 DocType: Purchase Invoice Item,Conversion Factor,የልወጣ መንስኤ
@@ -1742,10 +1759,10 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +137,Expected value after useful life must be greater than or equal to {0},ጠቃሚ ሕይወት በኋላ የተጠበቀው ዋጋ ይበልጣል ወይም እኩል መሆን አለበት {0}
 DocType: Purchase Receipt,Vehicle Number,የተሽከርካሪ ቁጥር
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,ተደጋጋሚ መጠየቂያ ማቆም ይሆናል ከተደረገባቸው ቀን
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +90,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,ጠቅላላ የተመደበ ቅጠሎች {0} ያነሰ ሊሆን አይችልም ጊዜ ቀድሞውኑ ጸድቀዋል ቅጠሎች {1} ከ
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +93,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 +22,Enter Paid Amount,የሚከፈልበት መጠን ያስገቡ
+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 ይጠቀሙ
@@ -1755,13 +1772,15 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,Timesheets
 DocType: HR Settings,HR Settings,የሰው ኃይል ቅንብሮች
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Expense Claim is pending approval. Only the Expense Approver can update status.,ወጪ የይገባኛል ጥያቄ ተቀባይነት በመጠባበቅ ላይ ነው. ብቻ ኪሳራውን አጽዳቂ ሁኔታ ማዘመን ይችላሉ.
+DocType: Email Digest,New Expenses,አዲስ ወጪዎች
 DocType: Purchase Invoice,Additional Discount Amount,ተጨማሪ የቅናሽ መጠን
-apps/erpnext/erpnext/controllers/accounts_controller.py +524,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",የረድፍ # {0}: ንጥል ቋሚ ንብረት ነው እንደ ብዛት: 1 መሆን አለበት. በርካታ ብዛት የተለያየ ረድፍ ይጠቀሙ.
+apps/erpnext/erpnext/controllers/accounts_controller.py +527,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",የረድፍ # {0}: ንጥል ቋሚ ንብረት ነው እንደ ብዛት: 1 መሆን አለበት. በርካታ ብዛት የተለያየ ረድፍ ይጠቀሙ.
 DocType: Leave Block List Allow,Leave Block List Allow,አግድ ዝርዝር ፍቀድ ይነሱ
 apps/erpnext/erpnext/setup/doctype/company/company.py +249,Abbr can not be blank or space,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/stock/get_item_details.py +123,Please specify Company,ኩባንያ እባክዎን ይግለጹ
 ,Customer Acquisition and Loyalty,የደንበኛ ማግኛ እና ታማኝነት
@@ -1772,17 +1791,19 @@
 apps/erpnext/erpnext/projects/doctype/task/task.js +26,Expense Claims,የወጪ የይገባኛል ጥያቄዎች
 DocType: Issue,Support,ድጋፍ
 ,BOM Search,BOM ፍለጋ
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Closing (Opening + Totals),የመመዝገቢያ ጊዜ (+ ድምሮች መክፈት)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),የመመዝገቢያ ጊዜ (+ ድምሮች መክፈት)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,ኩባንያ ውስጥ ምንዛሬ ይግለጹ
 DocType: Workstation,Wages per hour,በሰዓት የደመወዝ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +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/controllers/accounts_controller.py +272,Account {0} is invalid. Account Currency must be {1},መለያ {0} ልክ ያልሆነ ነው. መለያ ምንዛሬ መሆን አለበት {1}
+DocType: Email Digest,Pending Sales Orders,የሽያጭ ትዕዛዞች በመጠባበቅ ላይ
+apps/erpnext/erpnext/controllers/accounts_controller.py +275,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 +956,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",የረድፍ # {0}: የማጣቀሻ ሰነድ ዓይነት የሽያጭ ትዕዛዝ አንዱ ሽያጭ ደረሰኝ ወይም ጆርናል የሚመዘገብ መሆን አለበት
-DocType: Salary Slip,Deduction,ቅናሽ
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +87,Row {0}: From Time and To Time is mandatory.,ረድፍ {0}: ሰዓት ጀምሮ እና ሰዓት ወደ የግዴታ ነው.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +969,"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 +111,Row {0}: From Time and To Time is mandatory.,ረድፍ {0}: ሰዓት ጀምሮ እና ሰዓት ወደ የግዴታ ነው.
+DocType: Stock Reconciliation Item,Amount Difference,መጠን ያለው ልዩነት
 apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},ንጥል ዋጋ ለ ታክሏል {0} የዋጋ ዝርዝር ውስጥ {1}
 DocType: Address Template,Address Template,አድራሻ አብነት
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +7,Please enter Employee Id of this sales person,ይህ የሽያጭ ሰው የሰራተኛ መታወቂያ ያስገቡ
@@ -1790,7 +1811,7 @@
 DocType: Project,% Tasks Completed,% ተግባራት የተጠናቀቁ
 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 +194,Please enter Production Item first,በመጀመሪያ የምርት ንጥል ያስገቡ
+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,ተሰናክሏል ተጠቃሚ
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,ጥቅስ
@@ -1799,53 +1820,54 @@
 DocType: Maintenance Visit,Maintenance User,ጥገና ተጠቃሚ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +149,Cost Updated,ወጪ ዘምኗል
 DocType: Employee,Date of Birth,የትውልድ ቀን
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +86,Item {0} has already been returned,ንጥል {0} አስቀድሞ ተመለሱ ተደርጓል
+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: 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 +177,Job Description,ኢዮብ መግለጫ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,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 +126,"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 +127,"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.","የሽያጭ ዘመቻዎች ይከታተሉ. እርሳሶች, ጥቅሶች ተከታተል, የሽያጭ ትዕዛዝ ወዘተ ዘመቻዎች ከ ኢንቨስትመንት ላይ ተመለስ ለመለካት."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +24,Welcome to POS: Create your POS Profile,POS በደህና መጡ: የ POS መገለጫ ፍጠር
 DocType: Expense Claim,Approver,አጽዳቂ
 ,SO Qty,ምት ብዛት
+DocType: Guardian,Work Address,የስራ አድራሻ
 DocType: Appraisal,Calculate Total Score,አጠቃላይ ነጥብ አስላ
 DocType: Request for Quotation,Manufacturing Manager,የማምረቻ አስተዳዳሪ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},ተከታታይ አይ {0} እስከሁለት ዋስትና ስር ነው {1}
+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 +74,Shipments,ማዕድኑን
+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 +153,Row # ,ረድፍ #
+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 +156,Get From,ከ ያግኙ
+apps/erpnext/erpnext/public/js/utils.js +167,Get From,ከ ያግኙ
 DocType: C-Form,Quarter,ሩብ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Miscellaneous Expenses,ልዩ ልዩ ወጪዎች
 DocType: Global Defaults,Default Company,ነባሪ ኩባንያ
 apps/erpnext/erpnext/controllers/stock_controller.py +167,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,ወይም ወጪ ያለው ልዩነት መለያ ንጥል {0} እንደ ተፅዕኖዎች በአጠቃላይ የአክሲዮን ዋጋ ግዴታ ነው
-apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","ረድፍ ውስጥ ንጥል {0} ለማግኘት overbill አይቻልም {1} ይልቅ {2}. overbilling, የክምችት ቅንብሮች ውስጥ ለማዘጋጀት እባክዎ ለመፍቀድ"
+apps/erpnext/erpnext/controllers/accounts_controller.py +419,"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
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} is disabled,አባል {0} ተሰናክሏል
 DocType: Leave Application,Total Leave Days,ጠቅላላ ፈቃድ ቀናት
 DocType: Email Digest,Note: Email will not be sent to disabled users,ማስታወሻ: የኢሜይል ተሰናክሏል ተጠቃሚዎች አይላክም
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,ኩባንያ ይምረጡ ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,ሁሉም ክፍሎች እየታሰቡ ከሆነ ባዶውን ይተው
 apps/erpnext/erpnext/config/hr.py +171,"Types of employment (permanent, contract, intern etc.).","የሥራ ዓይነቶች (ቋሚ, ውል, እሥረኛ ወዘተ)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +346,{0} is mandatory for Item {1},{0} ንጥል ግዴታ ነው {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,{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","ቢያንስ አንድ ረድፍ ውስጥ የተመደበ መጠን, የደረሰኝ አይነት እና የደረሰኝ ቁጥር እባክዎ ይምረጡ"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,አዲስ ግዢ ወጪ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},ንጥል ያስፈልጋል የሽያጭ ትዕዛዝ {0}
 DocType: Purchase Invoice Item,Rate (Company Currency),መጠን (የኩባንያ የምንዛሬ)
-apps/erpnext/erpnext/demo/setup_data.py +360,Others,ሌሎች
+DocType: Student Guardian,Others,ሌሎች
 DocType: Payment Entry,Unallocated Amount,unallocated መጠን
 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,ግብሮች እና ክፍያዎች
@@ -1865,17 +1887,16 @@
 apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,Serialized ቆጠራ
 DocType: Activity Type,Default Billing Rate,ነባሪ አከፋፈል ተመን
 DocType: Sales Invoice,Total Billing Amount,ጠቅላላ የሂሳብ አከፋፈል መጠን
-apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +54,Receivable Account,የሚሰበሰብ መለያ
-apps/erpnext/erpnext/controllers/accounts_controller.py +546,Row #{0}: Asset {1} is already {2},የረድፍ # {0}: የንብረት {1} አስቀድሞ ነው; {2}
+apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,የሚሰበሰብ መለያ
+apps/erpnext/erpnext/controllers/accounts_controller.py +549,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 +79,CEO,ዋና ሥራ አስኪያጅ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,ዋና ሥራ አስኪያጅ
 DocType: Expense Claim Detail,Expense Claim Detail,የወጪ የይገባኛል ጥያቄ ዝርዝር
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +808,Please select correct account,ትክክለኛውን መለያ ይምረጡ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +809,Please select correct account,ትክክለኛውን መለያ ይምረጡ
 DocType: Item,Weight UOM,የክብደት UOM
 DocType: Salary Structure Employee,Salary Structure Employee,ደመወዝ መዋቅር ሰራተኛ
 DocType: Employee,Blood Group,የደም ቡድን
-DocType: Purchase Invoice Item,Page Break,የገጽ መግቻ
 DocType: Production Order Operation,Pending,በመጠባበቅ ላይ
 DocType: Course,Course Name,የኮርሱ ስም
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,በአንድ የተወሰነ ሠራተኛ ፈቃድ መተግበሪያዎች ማጽደቅ የሚችሉ ተጠቃሚዎች
@@ -1884,14 +1905,15 @@
 DocType: Fiscal Year,Companies,ኩባንያዎች
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,ኤሌክትሮኒክስ
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,የአክሲዮን ዳግም-ትዕዛዝ ደረጃ ላይ ሲደርስ የቁሳዊ ጥያቄ ላይ አንሥታችሁ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Full-time,ሙሉ ሰአት
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,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: 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,ጠቅላላ ገቢ ዋጋ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Debit To is required,ዴት ወደ ያስፈልጋል
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +321,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,የጥራት ሥራ አስኪያጅ
@@ -1899,6 +1921,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/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
@@ -1909,18 +1932,17 @@
 DocType: Production Order Operation,Completed Qty,ተጠናቋል ብዛት
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"For {0}, only debit accounts can be linked against another credit entry",{0}: ብቻ ዴቢት መለያዎች ሌላ ክሬዲት ግቤት ላይ የተገናኘ ሊሆን ይችላል
 apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,የዋጋ ዝርዝር {0} ተሰናክሏል
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +99,Row {0}: Completed Qty cannot be more than {1} for operation {2},ረድፍ {0}: ተጠናቋል ብዛት በላይ ሊሆን አይችልም {1} ክወና {2}
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +123,Row {0}: Completed Qty cannot be more than {1} for operation {2},ረድፍ {0}: ተጠናቋል ብዛት በላይ ሊሆን አይችልም {1} ክወና {2}
 DocType: Manufacturing Settings,Allow Overtime,የትርፍ ሰዓት ፍቀድ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} ንጥል ያስፈልጋል መለያ ቁጥር {1}. ያቀረቡት {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,የአሁኑ ግምቱ ተመን
 DocType: Item,Customer Item Codes,የደንበኛ ንጥል ኮዶች
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,የ Exchange ቅሰም / ማጣት
 DocType: Opportunity,Lost Reason,የጠፋ ምክንያት
-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/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/purchase_receipt/purchase_receipt.py +378,All items have already been invoiced,ሁሉም ንጥሎች ቀደም ሲል ደረሰኝ ተደርጓል
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +379,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,ውጫዊ
@@ -1936,18 +1958,19 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,የእርስዎ ደንበኞች
 apps/erpnext/erpnext/projects/doctype/project/project.py +141,You have been invited to collaborate on the project: {0},እርስዎ ፕሮጀክት ላይ ተባበር ተጋብዘዋል: {0}
 DocType: Leave Block List Date,Block Date,አግድ ቀን
-apps/erpnext/erpnext/templates/generators/job_opening.html +19,Apply Now,አሁኑኑ ያመልክቱ
+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.","ይፍጠሩ እና, ዕለታዊ ሳምንታዊ እና ወርሃዊ የኢሜይል ዜናዎች ያስተዳድሩ."
 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,ሕንፃዎች
-apps/erpnext/erpnext/utilities/doctype/address/address.py +164,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,ምንም ነባሪ አድራሻ አብነት አልተገኘም. ማዋቀር&gt; ማተም እና የምርት&gt; አድራሻ መለጠፊያ አንድ አዲስ ፍጠር እባክዎ.
 DocType: Fee Structure,Fee Structure,ክፍያ መዋቅር
 DocType: Timesheet Detail,Costing Amount,ዋጋና የዋጋ መጠን
+DocType: Student Admission,Application Fee,የመተግበሪያ ክፍያ
 DocType: Process Payroll,Submit Salary Slip,የቀጣሪ አስገባ
-apps/erpnext/erpnext/controllers/selling_controller.py +161,Maxiumm discount for Item {0} is {1}%,ንጥል {0} ነው {1}% ለ Maxiumm ቅናሽ
+apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,ንጥል {0} ነው {1}% ለ Maxiumm ቅናሽ
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,የጅምላ ውስጥ አስመጣ
 DocType: Sales Partner,Address & Contacts,አድራሻ እና እውቂያዎች
 DocType: SMS Log,Sender Name,የላኪ ስም
@@ -1972,21 +1995,21 @@
 DocType: Serial No,Delivery Time,የማስረከቢያ ቀን ገደብ
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,ላይ የተመሠረተ ጥበቃና
 DocType: Item,End of Life,የሕይወት መጨረሻ
-apps/erpnext/erpnext/demo/setup_data.py +361,Travel,ጉዞ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +155,No active or default Salary Structure found for employee {0} for the given dates,ለተሰጠው ቀናት ሠራተኛ {0} አልተገኘም ምንም ንቁ ወይም ነባሪ ደመወዝ መዋቅር
+apps/erpnext/erpnext/demo/setup/setup_data.py +304,Travel,ጉዞ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +167,No active or default Salary Structure found for employee {0} for the given dates,ለተሰጠው ቀናት ሠራተኛ {0} አልተገኘም ምንም ንቁ ወይም ነባሪ ደመወዝ መዋቅር
 DocType: Leave Block List,Allow Users,ተጠቃሚዎች ፍቀድ
 DocType: Purchase Order,Customer Mobile No,የደንበኛ ተንቀሳቃሽ ምንም
 DocType: Sales Invoice,Recurring,ተደጋጋሚ
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,የተለየ ገቢ ይከታተሉ እና ምርት ከላይ ወደታች የወረዱ ወይም መከፋፈል ለ የወጪ.
 DocType: Rename Tool,Rename Tool,መሣሪያ ዳግም ሰይም
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +23,Update Cost,አዘምን ወጪ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,አዘምን ወጪ
 DocType: Item Reorder,Item Reorder,ንጥል አስይዝ
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +36,Show Salary Slip,አሳይ የቀጣሪ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +748,Transfer Material,አስተላልፍ ሐሳብ
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +53,Show Salary Slip,አሳይ የቀጣሪ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +166,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 +923,Please set recurring after saving,በማስቀመጥ ላይ በኋላ ተደጋጋሚ ማዘጋጀት እባክዎ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +646,Select change amount account,ይምረጡ ለውጥ መጠን መለያ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +914,Please set recurring after saving,በማስቀመጥ ላይ በኋላ ተደጋጋሚ ማዘጋጀት እባክዎ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +703,Select change amount account,ይምረጡ ለውጥ መጠን መለያ
 DocType: Purchase Invoice,Price List Currency,የዋጋ ዝርዝር ምንዛሬ
 DocType: Naming Series,User must always select,ተጠቃሚው ሁልጊዜ መምረጥ አለብዎ
 DocType: Stock Settings,Allow Negative Stock,አሉታዊ የአክሲዮን ፍቀድ
@@ -1998,31 +2021,32 @@
 DocType: Quality Inspection,Verified By,በ የተረጋገጡ
 DocType: Address,Subsidiary,ተጪማሪ
 apps/erpnext/erpnext/setup/doctype/company/company.py +64,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","ነባር ግብይቶች አሉ ምክንያቱም, ኩባንያ ነባሪ ምንዛሬ መለወጥ አይቻልም. ግብይቶች ነባሪውን ምንዛሬ ለመቀየር ተሰርዟል አለበት."
+DocType: Grade Interval,Grade Description,ኛ መግለጫ
 DocType: Quality Inspection,Purchase Receipt No,የግዢ ደረሰኝ የለም
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,ልባዊ ገንዘብ
 DocType: Process Payroll,Create Salary Slip,የቀጣሪ ፍጠር
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +33,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 +352,Quantity in row {0} ({1}) must be same as manufactured quantity {2},ረድፍ ውስጥ ብዛት {0} ({1}) የሚመረተው ብዛት እንደ አንድ አይነት መሆን አለበት {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Quantity in row {0} ({1}) must be same as manufactured quantity {2},ረድፍ ውስጥ ብዛት {0} ({1}) የሚመረተው ብዛት እንደ አንድ አይነት መሆን አለበት {2}
 DocType: Appraisal,Employee,ተቀጣሪ
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,የተጠቃሚ እንደ ጋብዝ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} ሙሉ በሙሉ እንዲከፍሉ ነው
 DocType: Workstation Working Hour,End Time,መጨረሻ ሰዓት
 DocType: Payment Entry,Payment Deductions or Loss,የክፍያ ተቀናሾች ወይም ማጣት
-apps/erpnext/erpnext/config/schools.py +100,LMS,ኤልኤምኤስ
+apps/erpnext/erpnext/config/schools.py +104,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,የሽያጭ Pipeline
 DocType: Student Batch Student,Student Batch Student,የተማሪ ባች ተማሪ
-DocType: Sales Invoice,Mass Mailing,ጅምላ የመልዕክት
+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 +199,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/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 +297,Salary Slip of employee {0} already created for this period,ሠራተኛ የቀጣሪ {0} አስቀድሞ በዚህ ጊዜ የተፈጠሩ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Pharmaceutical,የህክምና
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +309,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/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,ወደ ክሬዲት
@@ -2037,27 +2061,28 @@
 DocType: Upload Attendance,Attendance To Date,ቀን ወደ በስብሰባው
 DocType: Warranty Claim,Raised By,በ አስነስቷል
 DocType: Payment Gateway Account,Payment Account,የክፍያ መለያ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +814,Please specify Company to proceed,ለመቀጠል ኩባንያ ይግለጹ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +793,Please specify Company to proceed,ለመቀጠል ኩባንያ ይግለጹ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Receivable,መለያዎች የሚሰበሰብ ሂሳብ ውስጥ የተጣራ ለውጥ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Compensatory Off,የማካካሻ አጥፋ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,የማካካሻ አጥፋ
 DocType: Quality Inspection Reading,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.,በእርግጥ ይህ ኩባንያ ሁሉንም ግብይቶችን መሰረዝ ይፈልጋሉ እርግጠኛ ይሁኑ. ነው እንደ ዋና ውሂብ ይቆያል. ይህ እርምጃ ሊቀለበስ አይችልም.
 DocType: Room,Room Number,የክፍል ቁጥር
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},ልክ ያልሆነ ማጣቀሻ {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +161,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ታቅዶ quanitity መብለጥ አይችልም ({2}) በምርት ላይ ትእዛዝ {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +162,{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 +217,Raw Materials cannot be blank.,ጥሬ እቃዎች ባዶ መሆን አይችልም.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,"Could not update stock, invoice contains drop shipping item.","የአክሲዮን ማዘመን አልተቻለም, መጠየቂያ ጠብታ መላኪያ ንጥል ይዟል."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +460,Quick Journal Entry,ፈጣን ጆርናል የሚመዘገብ መረጃ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +111,You can not change rate if BOM mentioned agianst any item,BOM ማንኛውም ንጥል agianst የተጠቀሰው ከሆነ መጠን መቀየር አይችሉም
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +441,"Could not update stock, invoice contains drop shipping item.","የአክሲዮን ማዘመን አልተቻለም, መጠየቂያ ጠብታ መላኪያ ንጥል ይዟል."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Quick Journal Entry,ፈጣን ጆርናል የሚመዘገብ መረጃ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +103,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 +214,{0} {1} is not submitted,{0} {1} ማቅረብ አይደለም
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,ንጥሎች ጥያቄዎች.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,መለየት ምርት ትዕዛዝ እያንዳንዱ በተፈጸመ ጥሩ ንጥል ይፈጠራል.
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +121,{0} must be negative in return document,{0} መመለሻ ሰነድ ላይ አሉታዊ መሆን አለበት
 ,Minutes to First Response for Issues,ጉዳዮች የመጀመርያ ምላሽ ደቂቃ
 DocType: Purchase Invoice,Terms and Conditions1,ውል እና Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,ተቋሙ ስም ስለ እናንተ ይህ ሥርዓት ማዋቀር ነው.
@@ -2066,16 +2091,17 @@
 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 +398,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 +739,Item or Warehouse for row {0} does not match Material Request,ረድፍ {0} አይዛመድም ሐሳብ ጥያቄ ለ ንጥል ወይም መጋዘን
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +747,Item or Warehouse for row {0} does not match Material Request,ረድፍ {0} አይዛመድም ሐሳብ ጥያቄ ለ ንጥል ወይም መጋዘን
 apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,የመለኪያ አሃድ
 DocType: Fiscal Year,Year End Date,ዓመት መጨረሻ ቀን
 DocType: Task Depends On,Task Depends On,ተግባር ላይ ይመረኮዛል
-DocType: Lead,Opportunity,ዕድል
+DocType: Supplier Quotation,Opportunity,ዕድል
 ,Completed Production Orders,ተጠናቋል የምርት ትዕዛዞች
 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,ነባሪ ከገቢር
@@ -2088,7 +2114,7 @@
 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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},ጥገና መጀመሪያ ቀን መለያ አይ ለ የመላኪያ ቀን በፊት ሊሆን አይችልም {0}
+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,ትክክለኛ መጨረሻ ቀን
 DocType: Purchase Invoice,PINV-,PINV-
 DocType: Authorization Rule,Applicable To (Role),የሚመለከታቸው ለማድረግ (ሚና)
@@ -2103,7 +2129,7 @@
 DocType: SMS Log,No of Requested SMS,ተጠይቋል ኤስ የለም
 DocType: Campaign,Campaign-.####,የዘመቻ -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,ቀጣይ እርምጃዎች
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,Please supply the specified items at the best possible rates,ምርጥ በተቻለ ፍጥነት በተጠቀሰው ንጥሎች አቅርብ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +695,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 +117,Contract End Date must be greater than Date of Joining,ውሌ መጨረሻ ቀን በመቀላቀል ቀን የበለጠ መሆን አለበት
 DocType: Delivery Note,DN-,DN-
@@ -2112,7 +2138,7 @@
 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 +14,This is an example website auto-generated from ERPNext,ይህ አንድ ምሳሌ ድር ጣቢያ ERPNext ከ በራስ-የመነጨ ነው
+apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,ይህ አንድ ምሳሌ ድር ጣቢያ ERPNext ከ በራስ-የመነጨ ነው
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,ጥበቃና ክልል 1
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
@@ -2139,13 +2165,14 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd ብዛት
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +54,Fee Records Created - {0},ክፍያ መዛግብት ፈጥሯል - {0}
 DocType: Asset Category Account,Asset Category Account,የንብረት ምድብ መለያ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +103,Cannot produce more Item {0} than Sales Order quantity {1},የሽያጭ ትዕዛዝ ብዛት የበለጠ ንጥል {0} ማፍራት የማይችሉ {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Stock Entry {0} is not submitted,የክምችት Entry {0} ማቅረብ አይደለም
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},የሽያጭ ትዕዛዝ ብዛት የበለጠ ንጥል {0} ማፍራት የማይችሉ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +505,Stock Entry {0} is not submitted,የክምችት Entry {0} ማቅረብ አይደለም
 DocType: Payment Reconciliation,Bank / Cash Account,ባንክ / በጥሬ ገንዘብ መለያ
 DocType: Tax Rule,Billing City,አከፋፈል ከተማ
 DocType: Salary Component Account,Salary Component Account,ደመወዝ አካል መለያ
 DocType: Global Defaults,Hide Currency Symbol,የምንዛሬ ምልክት ደብቅ
 apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card","ለምሳሌ ባንክ, በጥሬ ገንዘብ, ክሬዲት ካርድ"
+DocType: Lead Source,Source Name,ምንጭ ስም
 DocType: Journal Entry,Credit Note,የተሸጠ ዕቃ ሲመለስ የሚሰጥ ወረቀት
 DocType: Warranty Claim,Service Address,የአገልግሎት አድራሻ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furnitures and Fixtures,Furnitures እና አለማድረስ
@@ -2157,6 +2184,7 @@
 DocType: Opportunity,Customer / Lead Name,ደንበኛ / በእርሳስ ስም
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +89,Clearance Date not mentioned,መልቀቂያ ቀን የተጠቀሰው አይደለም
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,ፕሮዳክሽን
+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/controllers/trends.py +19,Total(Qty),ጠቅላላ (ብዛት)
 DocType: Sales Invoice,This Document,ይህ ሰነድ
@@ -2168,15 +2196,15 @@
 DocType: Purchase Receipt,Time at which materials were received,ቁሳቁስ ተሰጥቷቸዋል ነበር ይህም በ ጊዜ
 DocType: Stock Ledger Entry,Outgoing Rate,የወጪ ተመን
 apps/erpnext/erpnext/config/hr.py +176,Organization branch master.,ድርጅት ቅርንጫፍ ጌታቸው.
-apps/erpnext/erpnext/controllers/accounts_controller.py +273, or ,ወይም
+apps/erpnext/erpnext/controllers/accounts_controller.py +276, 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 +203,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,የረድፍ # {0}: ጆርናል የሚመዘገብ {1} መለያ የለውም {2} ወይም አስቀድሞ በሌላ ቫውቸር ጋር ይዛመዳሉ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +206,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 +90,No employee for the above selected criteria OR salary slip already created,ከላይ የተመረጡ መመዘኛዎች ወይም የቀጣሪ ምንም ሠራተኛ አስቀድሞ የተፈጠረ
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +93,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,የክፍያ አይነት
@@ -2204,8 +2232,8 @@
 DocType: Product Bundle,Parent Item,የወላጅ ንጥል
 DocType: Account,Account Type,የመለያ አይነት
 DocType: Delivery Note,DN-RET-,DN-RET-
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +115,Leave Type {0} cannot be carry-forwarded,{0} መሸከም-ማስተላለፍ አይቻልም አይነት ይነሱ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',ጥገና ፕሮግራም ሁሉም ንጥሎች የመነጨ አይደለም. &#39;አመንጭ ፕሮግራም »ላይ ጠቅ ያድርጉ
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +118,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 +163,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","ረድፍ {0} ውስጥ {1}. ንጥል መጠን ውስጥ ከ {2} ማካተት, ረድፎች {3} ደግሞ መካተት አለበት"
@@ -2217,13 +2245,13 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +32,Disabled template must not be default template,የተሰናከለ አብነት ነባሪ አብነት መሆን የለበትም
 DocType: Account,Income Account,የገቢ መለያ
 DocType: Payment Request,Amount in customer's currency,ደንበኛ ምንዛሬ መጠን
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +748,Delivery,ርክክብ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +742,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,ቁልፍ ኃላፊነት አካባቢ
 DocType: Payment Entry,Total Allocated Amount,ጠቅላላ የተመደበ መጠን
 DocType: Item Reorder,Material Request Type,ቁሳዊ ጥያቄ አይነት
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +82,Row {0}: UOM Conversion Factor is mandatory,ረድፍ {0}: UOM የልወጣ ምክንያት የግዴታ ነው
+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,የወጭ ማዕከል
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,የቫውቸር #
@@ -2234,13 +2262,13 @@
 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 +90,Head of Marketing and Sales,ማርኬቲንግ እና ሽያጭ ክፍል ኃላፊ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,የገቢ ግብር
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,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.,የትራክ ኢንዱስትሪ ዓይነት ይመራል.
 DocType: Item Supplier,Item Supplier,ንጥል አቅራቢ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +403,Please enter Item Code to get batch no,ባች ምንም ለማግኘት ንጥል ኮድ ያስገቡ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +770,Please select a value for {0} quotation_to {1},{0} quotation_to እሴት ይምረጡ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +397,Please enter Item Code to get batch no,ባች ምንም ለማግኘት ንጥል ኮድ ያስገቡ
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +764,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","የሚከተሉትን ባሕሪያት በሁለቱም መዝገቦች ላይ ተመሳሳይ ከሆነ ሕዋሶችን ብቻ ነው. ቡድን, ሥር ዓይነት, ኩባንያ ነው?"
@@ -2252,28 +2280,29 @@
 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 +100,Issues,ችግሮች
+apps/erpnext/erpnext/hooks.py +109,Issues,ችግሮች
 apps/erpnext/erpnext/controllers/status_updater.py +13,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,አከፋፈል ምንዛሬ
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Large,በጣም ትልቅ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,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 +507,Warning: Another {0} # {1} exists against stock entry {2},ማስጠንቀቂያ: ሌላው {0} # {1} የአክሲዮን ግቤት ላይ አለ {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Local,አካባቢያዊ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +508,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),ብድር እና እድገት (እሴቶች)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,ተበዳሪዎች
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Large,ትልቅ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,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 +225,Total {0} ({1}),ጠቅላላ {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +224,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,ነባሪ ዋጋ ትመና ዘዴው
@@ -2319,9 +2348,9 @@
 DocType: Attendance,Leave Type,ፈቃድ አይነት
 apps/erpnext/erpnext/controllers/stock_controller.py +173,Expense / Difference account ({0}) must be a 'Profit or Loss' account,ወጪ / መማሩ መለያ ({0}) አንድ &#39;ትርፍ ወይም ኪሳራ&#39; መለያ መሆን አለበት
 DocType: Account,Accounts User,የተጠቃሚ መለያዎች
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Name error: {0},ስም ስህተት: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +90,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 +178,{0} {1} does not associated with {2} {3},{0} {1} ጋር የተያያዘ አይደለም {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +181,{0} {1} does not associated with {2} {3},{0} {1} ጋር የተያያዘ አይደለም {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,ሠራተኛ {0} ክትትልን አስቀድሞ ምልክት ነው
 DocType: Packing Slip,If more than one package of the same type (for print),ከሆነ ተመሳሳይ ዓይነት ከአንድ በላይ ጥቅል (የህትመት ለ)
 DocType: Warehouse,Parent Warehouse,የወላጅ መጋዘን
@@ -2340,7 +2369,7 @@
 DocType: BOM Item,Scrap %,ቁራጭ%
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection","ክፍያዎች ተመጣጣኝ መጠን በእርስዎ ምርጫ መሠረት, ንጥል ብዛት ወይም መጠን ላይ በመመርኮዝ መሰራጨት ይሆናል"
 DocType: Maintenance Visit,Purposes,ዓላማዎች
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,ቢያንስ አንድ ንጥል መመለሻ ሰነድ ላይ አሉታዊ ብዛት ጋር መግባት አለበት
+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 +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","ድርጊቱ {0} ከገቢር ውስጥ ማንኛውም የሚገኙ የሥራ ሰዓት በላይ {1}, በርካታ ስራዎች ወደ ቀዶ አፈርሳለሁ"
 ,Requested,ተጠይቋል
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +83,No Remarks,ምንም መግለጫዎች
@@ -2352,46 +2381,46 @@
 DocType: Item,Total Projected Qty,ጠቅላላ ፕሮጀክት ብዛት
 DocType: Monthly Distribution,Distribution Name,የስርጭት ስም
 DocType: Course,Course Code,የኮርስ ኮድ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Quality Inspection required for Item {0},ንጥል ያስፈልጋል ጥራት ምርመራ {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Quality Inspection required for Item {0},ንጥል ያስፈልጋል ጥራት ምርመራ {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,ይህም ደንበኛ ምንዛሬ ላይ ተመን ኩባንያ መሰረታዊ ምንዛሬ በመለወጥ ላይ ነው
 DocType: Purchase Invoice Item,Net Rate (Company Currency),የተጣራ ተመን (የኩባንያ የምንዛሬ)
 DocType: Salary Detail,Condition and Formula Help,ሁኔታ እና የቀመር እገዛ
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,ግዛት ዛፍ ያቀናብሩ.
 DocType: Journal Entry Account,Sales Invoice,የሽያጭ ደረሰኝ
 DocType: Journal Entry Account,Party Balance,የድግስ ሒሳብ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +475,Please select Apply Discount On,ቅናሽ ላይ ተግብር እባክዎ ይምረጡ
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +92,Salary Slip Created,የቀጣሪ ተፈጥሯል
+apps/erpnext/erpnext/accounts/page/pos/pos.js +464,Please select Apply Discount On,ቅናሽ ላይ ተግብር እባክዎ ይምረጡ
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +95,Salary Slip Created,የቀጣሪ ተፈጥሯል
 DocType: Company,Default Receivable Account,ነባሪ የሚሰበሰብ መለያ
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,ከላይ የተመረጡ መስፈርት የሚከፈለው ጠቅላላ ደመወዝ ስለ ባንክ የሚመዘገብ መረጃ ይፍጠሩ
 DocType: Stock Entry,Material Transfer for Manufacture,ማምረት ቁሳዊ ማስተላለፍ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,የቅናሽ መቶኛ አንድ ዋጋ ዝርዝር ላይ ወይም ሁሉንም የዋጋ ዝርዝር ለማግኘት ወይም ተግባራዊ ሊሆኑ ይችላሉ.
 DocType: Purchase Invoice,Half-yearly,ግማሽ-ዓመታዊ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +384,Accounting Entry for Stock,የአክሲዮን ለ አካውንቲንግ Entry
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +387,Accounting Entry for Stock,የአክሲዮን ለ አካውንቲንግ Entry
 DocType: Sales Invoice,Sales Team1,የሽያጭ Team1
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,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 +96,Row {0}: Completed Qty must be greater than zero.,ረድፍ {0}: ተጠናቋል ብዛት ከዜሮ በላይ መሆን አለበት.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +120,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 +88,Row # {0}: Cannot return more than {1} for Item {2},የረድፍ # {0}: በላይ መመለስ አይቻልም {1} ንጥል ለ {2}
+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,ሴራ
 DocType: Item Group,Show this slideshow at the top of the page,በገጹ ላይኛው ክፍል ላይ ይህን ተንሸራታች ትዕይንት አሳይ
 DocType: BOM,Item UOM,ንጥል UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),የቅናሽ መጠን በኋላ የግብር መጠን (የኩባንያ የምንዛሬ)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +147,Target warehouse is mandatory for row {0},የዒላማ የመጋዘን ረድፍ ግዴታ ነው {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,ይምረጡ አቅራቢው አድራሻ
 DocType: Quality Inspection,Quality Inspection,የጥራት ምርመራ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Extra Small,የበለጠ አነስተኛ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,Warning: Material Requested Qty is less than Minimum Order Qty,ማስጠንቀቂያ: ብዛት ጠይቀዋል ሐሳብ ያለው አነስተኛ ትዕዛዝ ብዛት ያነሰ ነው
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +194,Account {0} is frozen,መለያ {0} የታሰሩ ነው
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,የበለጠ አነስተኛ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +690,Warning: Material Requested Qty is less than Minimum Order Qty,ማስጠንቀቂያ: ብዛት ጠይቀዋል ሐሳብ ያለው አነስተኛ ትዕዛዝ ብዛት ያነሰ ነው
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,መለያ {0} የታሰሩ ነው
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,ወደ ድርጅት ንብረት መለያዎች የተለየ ሰንጠረዥ ጋር ሕጋዊ አካሌ / ንዑስ.
 DocType: Payment Request,Mute Email,ድምጸ-ኢሜይል
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","የምግብ, መጠጥ እና ትንባሆ"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +606,Can only make payment against unbilled {0},ብቻ ላይ ክፍያ ማድረግ ትችላለህ ያለተጠየቀበት {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +126,Commission rate cannot be greater than 100,ኮሚሽን መጠን ከዜሮ በላይ 100 ሊሆን አይችልም
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +609,Can only make payment against unbilled {0},ብቻ ላይ ክፍያ ማድረግ ትችላለህ ያለተጠየቀበት {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,ኮሚሽን መጠን ከዜሮ በላይ 100 ሊሆን አይችልም
 DocType: Stock Entry,Subcontract,በሰብ
 apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,በመጀመሪያ {0} ያስገቡ
 DocType: Production Order Operation,Actual End Time,ትክክለኛው መጨረሻ ሰዓት
@@ -2402,30 +2431,30 @@
 DocType: SMS Log,No of Sent SMS,የተላከ ኤስ የለም
 DocType: Account,Expense Account,የወጪ መለያ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,ሶፍትዌር
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Colour,ቀለም
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,ቀለም
 DocType: Maintenance Visit,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; ነው ንጥል ይምረጡ እና ሌላ የምርት ጥቅል አለ እባክህ
 DocType: Student Log,Academic,የቀለም
-apps/erpnext/erpnext/controllers/accounts_controller.py +469,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),ጠቅላላ የቅድሚያ ({0}) ትዕዛዝ ላይ {1} ግራንድ ጠቅላላ መብለጥ አይችልም ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +472,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),ጠቅላላ የቅድሚያ ({0}) ትዕዛዝ ላይ {1} ግራንድ ጠቅላላ መብለጥ አይችልም ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,ከማያምኑ ወራት በመላ ዒላማ ማሰራጨት ወርሃዊ ስርጭት ይምረጡ.
 DocType: Purchase Invoice Item,Valuation Rate,ግምቱ ተመን
+DocType: Stock Reconciliation,SR/,ድራይቨር /
 apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,የዋጋ ዝርዝር ምንዛሬ አልተመረጠም
 DocType: Assessment,Results,ውጤቶች
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +168,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 +175,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: Student Applicant,Father's/ Guardian 2 Email ID,የአብ / አሳዳጊ 2 የኢሜይል መታወቂያ
 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 +228,Warehouses with existing transaction can not be converted to group.,አሁን ያሉ ግብይት ጋር መጋዘኖችን ቡድን ሊቀየር አይችልም.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +231,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 +93,Researcher,ተመራማሪ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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.,ገቢ ጥራት ፍተሻ.
@@ -2437,25 +2466,25 @@
 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: Sales Invoice,Advertisement,ማስታወቂያ
 DocType: Asset Category Account,Depreciation Expense Account,የእርጅና የወጪ መለያ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Probationary Period,የሙከራ ጊዜ
-apps/erpnext/erpnext/hooks.py +102,Announcements,ማስታወቂያዎችን
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,የሙከራ ጊዜ
+apps/erpnext/erpnext/hooks.py +111,Announcements,ማስታወቂያዎችን
 DocType: Customer Group,Only leaf nodes are allowed in transaction,ብቻ ቅጠል እባጮች ግብይት ውስጥ ይፈቀዳሉ
 DocType: Expense Claim,Expense Approver,የወጪ አጽዳቂ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +109,Row {0}: Advance against Customer must be credit,ረድፍ {0}: የደንበኛ ላይ በቅድሚያ ክሬዲት መሆን አለበት
 apps/erpnext/erpnext/accounts/doctype/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 +16,To Datetime,DATETIME ወደ
+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/scheduling_tool/scheduling_tool.py +51,Course Schedules deleted:,እርግጥ ነው መርሐግብሮች ተሰርዟል:
 apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,ኤስኤምኤስ የመላኪያ ሁኔታ የመጠበቅ ምዝግብ ማስታወሻዎች
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,በመጠባበቅ ላይ እንቅስቃሴዎች
+DocType: Accounts Settings,Make Payment via Journal Entry,ጆርናል Entry በኩል ክፍያ አድርግ
+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 +127,Please enter relieving date.,ቀን ማስታገሻ ያስገቡ.
-apps/erpnext/erpnext/controllers/trends.py +145,Amt,Amt
+apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,Only Leave Applications with status 'Approved' can be submitted,ብቻ ሁኔታ «ጸድቋል» ማስገባት ይችላሉ መተግበሪያዎች ውጣ
 apps/erpnext/erpnext/utilities/doctype/address/address.py +26,Address Title is mandatory.,አድራሻ ርዕስ የግዴታ ነው.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,ጥያቄ ምንጭ ዘመቻ ከሆነ ዘመቻ ስም ያስገቡ
@@ -2473,14 +2502,15 @@
 apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1},{0} ለማግኘት ምንዛሬ ተመን ማግኘት አልተቻለም {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,ማርቆስ ግማሽ ቀን
 DocType: Sales Invoice,Sales Team,የሽያጭ ቡድን
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Duplicate entry,የተባዛ ግቤት
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,የተባዛ ግቤት
 DocType: Program Enrollment Tool,Get Students,ተማሪዎች ያግኙ
 DocType: Serial No,Under Warranty,የዋስትና በታች
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +490,[Error],[ስህተት]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +484,[Error],[ስህተት]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,አንተ ወደ የሽያጭ ትዕዛዝ ለማዳን አንዴ ቃላት ውስጥ የሚታይ ይሆናል.
 ,Employee Birthday,የሰራተኛ የልደት ቀን
 apps/erpnext/erpnext/controllers/status_updater.py +175,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} አስቀድሞ አለ. እነዚህ ግቤቶችን ይቀይሩ እና እንደገና ይሞክሩ.
 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} የለም
@@ -2496,22 +2526,22 @@
 ,Issued Items Against Production Order,የምርት ትዕዛዝ ላይ የተሰጠ ንጥሎች
 DocType: Pricing Rule,Purchase Manager,የግዢ አስተዳዳሪ
 DocType: Target Detail,Target Detail,ዒላማ ዝርዝር
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +25,All Jobs,ሁሉም ስራዎች
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,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,አሁን ያሉ ግብይቶችን ጋር ወጪ ማዕከል ቡድን ሊቀየር አይችልም
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Amount {0} {1} {2} {3},የገንዘብ መጠን {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,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: Supplier,Credit Limit,የብድር ገደብ
 DocType: Production Plan Sales Order,Salse Order Date,Salse ትዕዛዝ ቀን
 DocType: Salary Component,Salary Component,ደመወዝ ክፍለ አካል
-apps/erpnext/erpnext/accounts/utils.py +372,Payment Entries {0} are un-linked,የክፍያ ምዝግቦችን {0}-un ጋር የተገናኘ ነው
+apps/erpnext/erpnext/accounts/utils.py +449,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,የተቀባይ መልዕክት እና የክፍያ ዝርዝሮች
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +497,Material Requests {0} created,የተፈጠረ ቁሳዊ ጥያቄዎች {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +498,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.,ውሎች ወይም ውል አብነት.
 DocType: Purchase Invoice,Address and Contact,አድራሻ እና ዕውቂያ
@@ -2550,7 +2580,7 @@
 DocType: Serial No,Warranty / AMC Details,የዋስትና / AMC ዝርዝሮች
 DocType: Journal Entry,User Remark,የተጠቃሚ አስተያየት
 DocType: Lead,Market Segment,ገበያ ክፍሉ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +848,Paid Amount cannot be greater than total negative outstanding amount {0},የሚከፈልበት መጠን ጠቅላላ አሉታዊ የላቀ መጠን መብለጥ አይችልም {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +859,Paid Amount cannot be greater than total negative outstanding amount {0},የሚከፈልበት መጠን ጠቅላላ አሉታዊ የላቀ መጠን መብለጥ አይችልም {0}
 DocType: Employee Internal Work History,Employee Internal Work History,የተቀጣሪ ውስጣዊ የስራ ታሪክ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +233,Closing (Dr),የመመዝገቢያ ጊዜ (ዶክተር)
 DocType: Cheque Print Template,Cheque Size,ቼክ መጠን
@@ -2571,7 +2601,8 @@
 ,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.
-apps/erpnext/erpnext/controllers/accounts_controller.py +555,'Update Stock' cannot be checked for fixed asset sale,&#39;አዘምን Stock&#39; ቋሚ ንብረት ለሽያጭ ሊረጋገጥ አልቻለም
+DocType: Student Guardian,Father,አባት
+apps/erpnext/erpnext/controllers/accounts_controller.py +558,'Update Stock' cannot be checked for fixed asset sale,&#39;አዘምን Stock&#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} ተሰርዟል ወይም አቁሟል ነው
@@ -2581,15 +2612,15 @@
 DocType: Sales Order,Fully Delivered,ሙሉ በሙሉ ደርሷል
 DocType: Lead,Lower Income,የታችኛው ገቢ
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","ትርፍ / ማጣት ላስያዙበት ይሆናል ውስጥ ተጠያቂነት ስር የሚገኘው ዘገባ ራስ,"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +166,Source and target warehouse cannot be same for row {0},የመነሻ እና የመድረሻ መጋዘን ረድፍ ጋር ተመሳሳይ መሆን አይችልም {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","ይህ የክምችት ማስታረቅ አንድ በመክፈት Entry በመሆኑ ልዩነት መለያ, አንድ ንብረት / የተጠያቂነት ዓይነት መለያ መሆን አለበት"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +81,Purchase Order number required for Item {0},ንጥል ያስፈልጋል ትዕዛዝ ቁጥር ይግዙ {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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/purchase_receipt/purchase_receipt.py +82,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 +17,Cannot change status as student {0} is linked with student application {1},ተማሪ ሁኔታ መለወጥ አይቻልም {0} የተማሪ ማመልከቻ ጋር የተያያዘ ነው {1}
+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: Timesheet,"List of employee which has ""Salary Slip Based on Timesheet"" is enabled in salary structure.",&quot;Timesheet ላይ የተመሠረተ የቀጣሪ&quot; አለው ይህም ሠራተኛ ዝርዝር ደመወዝ መዋቅር ውስጥ ነቅቷል.
 DocType: Asset,Fully Depreciated,ሙሉ በሙሉ የቀነሰበት
 ,Stock Projected Qty,የክምችት ብዛት የታቀደበት
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Customer {0} does not belong to project {1},ይኸው የእርሱ ወገን አይደለም {0} የደንበኛ ፕሮጀክት ወደ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,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,ተከታታይ የለም እና ባች
@@ -2601,7 +2632,7 @@
 DocType: Purchase Invoice,Purchase Taxes and Charges,ግብሮች እና ክፍያዎች ይግዙ
 ,Qty to Receive,ይቀበሉ ዘንድ ብዛት
 DocType: Leave Block List,Leave Block List Allowed,አግድ ዝርዝር ተፈቅዷል ይነሱ
-apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +55,All Warehouses,ሁሉም መጋዘኖችን
+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 +105,Credit To account must be a Balance Sheet account,መለያ ወደ ክሬዲት ሚዛን ሉህ መለያ መሆን አለበት
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,ሁሉም አቅራቢው አይነቶች
@@ -2613,10 +2644,10 @@
 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/manufacturing/doctype/bom/bom.js +26,Browse BOM,አስስ BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,አስስ BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,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 Year,Academic Year,የትምህርት ዘመን
+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,ሲ
 DocType: Appraisal,Appraisal,ግምት
@@ -2624,12 +2655,12 @@
 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 +197,Leave approver must be one of {0},ውስጥ አንዱ መሆን አለበት አጽዳቂ ይነሱ {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,Leave approver must be one of {0},ውስጥ አንዱ መሆን አለበት አጽዳቂ ይነሱ {0}
 DocType: Hub Settings,Seller Email,ሻጭ ኢሜይል
 DocType: Project,Total Purchase Cost (via Purchase Invoice),ጠቅላላ የግዢ ዋጋ (የግዢ ደረሰኝ በኩል)
 DocType: Workstation Working Hour,Start Time,ጀምር ሰዓት
 DocType: Item Price,Bulk Import Help,የጅምላ አስመጣ እገዛ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +256,Select Quantity,ይምረጡ ብዛት
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +257,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,መልዕክት ተልኳል
@@ -2646,6 +2677,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,ወይ ዒላማ ብዛት ወይም የዒላማ መጠን የግዴታ ነው.
 apps/erpnext/erpnext/config/projects.py +45,Cost of various activities,የተለያዩ እንቅስቃሴዎች ወጪ
 apps/erpnext/erpnext/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 +149,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}
 DocType: Item,Inspection Required,የምርመራ ያስፈልጋል
@@ -2665,7 +2697,7 @@
 DocType: Expense Claim,Approval Status,የማጽደቅ ሁኔታ
 DocType: Hub Settings,Publish Items to Hub,ማዕከል ንጥሎች አትም
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},እሴት ረድፍ ውስጥ እሴት ያነሰ መሆን አለበት ከ {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Wire Transfer,የሃዋላ ገንዘብ መላኪያ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,የሃዋላ ገንዘብ መላኪያ
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,ሁሉንም ይመልከቱ
 DocType: Sales Order,Recurring Order,ተደጋጋሚ ትዕዛዝ
 DocType: Company,Default Income Account,ነባሪ ገቢ መለያ
@@ -2677,21 +2709,19 @@
 ,Welcome to ERPNext,ERPNext ወደ እንኳን ደህና መጡ
 apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,ትዕምርተ የሚያደርሱ
 DocType: Lead,From Customer,የደንበኛ ከ
-apps/erpnext/erpnext/demo/setup_data.py +357,Calls,ጊዜ ጥሪዎች
+apps/erpnext/erpnext/demo/setup/setup_data.py +300,Calls,ጊዜ ጥሪዎች
 DocType: Project,Total Costing Amount (via Time Logs),ጠቅላላ የኳንቲቲ መጠን (ጊዜ ምዝግብ ማስታወሻዎች በኩል)
 DocType: Purchase Order Item Supplied,Stock UOM,የክምችት UOM
-apps/erpnext/erpnext/stock/doctype/item/item.py +466,"As there are existing transactions for this item, \
-							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","ነባር ግብይቶች ከእናንተ እሴቶች መቀየር አይችሉም \ ይህ ንጥል: በዚያ እንደ &#39;መለያ ምንም አለው&#39;, &#39;ባች ያለው የለም&#39;, &#39;የአክሲዮን ንጥል ነው&#39; እና &#39;ትመና ዘዴው&#39;"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,Purchase Order {0} is not submitted,ትዕዛዝ {0} አልተካተተም ነው ይግዙ
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,ፕሮጀክት
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},ተከታታይ አይ {0} መጋዘን የእርሱ ወገን አይደለም {1}
 apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,ማስታወሻ: {0} ብዛት ወይም መጠን 0 ነው እንደ የመላኪያ-ደጋግሞ-ማስያዣ ንጥል ለ ስርዓት ይመልከቱ አይደለም
 DocType: Notification Control,Quotation Message,ትዕምርተ መልዕክት
 DocType: Issue,Opening Date,መክፈቻ ቀን
-apps/erpnext/erpnext/schools/api.py +58,Attendance has been marked successfully.,በስብሰባው ላይ በተሳካ ሁኔታ ምልክት ተደርጎበታል.
+apps/erpnext/erpnext/schools/api.py +57,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 +136,Account Type for {0} must be {1},የመለያ አይነት {0} ይህ ሊሆን ግድ ነውና {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +139,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,ሁለቱም መጋዘን ተመሳሳይ ኩባንያ አባል መሆን
@@ -2706,12 +2736,13 @@
 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/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 +20,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 +1190,Please select customer,የደንበኛ ይምረጡ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1193,Please select customer,የደንበኛ ይምረጡ
 DocType: C-Form,I,እኔ
 DocType: Company,Asset Depreciation Cost Center,የንብረት ዋጋ መቀነስ ወጪ ማዕከል
 DocType: Sales Order Item,Sales Order Date,የሽያጭ ትዕዛዝ ቀን
@@ -2721,6 +2752,7 @@
 ,Payment Period Based On Invoice Date,ደረሰኝ ቀን ላይ የተመሠረተ የክፍያ ክፍለ ጊዜ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},ለ የጠፋ የገንዘብ ምንዛሪ ተመኖች {0}
 DocType: Assessment,Examiner,መርማሪ
+DocType: Student,Siblings,እህትማማቾች
 DocType: Journal Entry,Stock Entry,የክምችት የሚመዘገብ መረጃ
 DocType: Payment Entry,Payment References,የክፍያ ማጣቀሻዎች
 DocType: C-Form,C-FORM-,ሲ-የተለጠጡ
@@ -2738,11 +2770,12 @@
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,ርዕስ ስም
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,የ መሸጥ ወይም መግዛትና ውስጥ ቢያንስ አንድ መመረጥ አለበት
+DocType: Grading Structure,Grade Intervals,ኛ ጣልቃ
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,የንግድ ተፈጥሮ ይምረጡ.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,"ባለማምረታቸው, ቀዶ የት ተሸክመው ነው."
 DocType: Asset Movement,Source Warehouse,ምንጭ መጋዘን
 DocType: Installation Note,Installation Date,መጫን ቀን
-apps/erpnext/erpnext/controllers/accounts_controller.py +534,Row #{0}: Asset {1} does not belong to company {2},የረድፍ # {0}: የንብረት {1} ኩባንያ የእርሱ ወገን አይደለም {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +537,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,የሽያጭ ተጠቃሚ
@@ -2756,28 +2789,31 @@
 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 +111,Date Of Retirement must be greater than Date of Joining,ጡረታ መካከል ቀን በመቀላቀል ቀን የበለጠ መሆን አለበት
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +49,There were errors while scheduling course on :,ላይ እርግጥ ነው መርሐግብር ላይ ሳለ ስህተቶች ነበሩ:
 DocType: Sales Invoice,Against Income Account,የገቢ መለያ ላይ
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +87,{0}% Delivered,{0}% ደርሷል
+apps/erpnext/erpnext/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 +379,Please set default {0} in Company {1},ኩባንያ ውስጥ ነባሪ {0} ለማዘጋጀት እባክዎ {1}
+apps/erpnext/erpnext/accounts/utils.py +456,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,አጠቃላይ ትርፍ / ማጣት
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,ትዕዛዝ ንጥል አቅርቦት ይግዙ
 apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,የኩባንያ ስም ኩባንያ ሊሆን አይችልም
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,የህትመት አብነቶች ለ ደብዳቤ ኃላፊዎች.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,የህትመት አብነቶች ለ የማዕረግ Proforma የደረሰኝ ምህበርን.
+DocType: Student Guardian,Student Guardian,የተማሪ አሳዳጊ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +184,Valuation type charges can not marked as Inclusive,ግምቱ አይነት ክፍያዎች ያካተተ ምልክት ተደርጎበታል አይችልም
 DocType: POS Profile,Update Stock,አዘምን Stock
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,ንጥሎች በተለያዩ UOM ትክክል (ጠቅላላ) የተጣራ ክብደት ዋጋ ሊመራ ይችላል. እያንዳንዱ ንጥል የተጣራ ክብደት ተመሳሳይ UOM ውስጥ መሆኑን እርግጠኛ ይሁኑ.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM ተመን
 DocType: Asset,Journal Entry for Scrap,ቁራጭ ለ ጆርናል የሚመዘገብ መረጃ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,የመላኪያ ማስታወሻ የመጡ ንጥሎችን ለመንቀል እባክዎ
-apps/erpnext/erpnext/accounts/utils.py +349,Journal Entries {0} are un-linked,ጆርናል ግቤቶች {0}-un ጋር የተገናኘ ነው
+apps/erpnext/erpnext/accounts/utils.py +426,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,ኩባንያ ውስጥ ዙር ጠፍቷል ወጪ ማዕከል መጥቀስ እባክዎ
@@ -2801,6 +2837,7 @@
 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,የማህበረሰብ መድረክ
+DocType: Homepage,"URL for ""All Products""",&quot;ሁሉም ምርቶች» ለ ዩ አር ኤል
 DocType: Leave Application,Leave Balance Before Application,ማመልከቻ በፊት ሒሳብ ይነሱ
 DocType: SMS Center,Send SMS,ኤስ ኤም ኤስ ላክ
 DocType: Cheque Print Template,Width of amount in word,ቃል ውስጥ መጠን ስፋት
@@ -2809,7 +2846,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 +29,Current Job Openings,የአሁኑ ኢዮብ መከፈት
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,Current Job Openings,የአሁኑ ኢዮብ መከፈት
 DocType: Company,Stock Adjustment Account,የአክሲዮን የማስተካከያ መለያ
 DocType: Journal Entry,Write Off,ሰረዘ
 DocType: Timesheet Detail,Operation ID,ኦፕሬሽን መታወቂያ
@@ -2822,7 +2859,7 @@
 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 +850,Show tax break-up,አሳይ የግብር ከፋይ-ምትኬ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +841,Show tax break-up,አሳይ የግብር ከፋይ-ምትኬ
 apps/erpnext/erpnext/accounts/party.py +308,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} መጋዘን ላይ የለም"
@@ -2832,10 +2869,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 +534,Please select Posting Date before selecting Party,ፓርቲ በመምረጥ በፊት መለጠፍ ቀን ይምረጡ
 DocType: Serial No,Out of AMC,AMC ውጪ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +80,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 +162,Please contact to the user who have Sales Master Manager {0} role,የሽያጭ መምህር አስተዳዳሪ {0} ሚና ያላቸው ተጠቃሚው ወደ ያነጋግሩ
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +195,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 +5,This is based on the attendance of this Student,ይህ የዚህ ተማሪ በስብሰባው ላይ የተመሠረተ ነው
@@ -2844,12 +2882,11 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,የመላኪያ ማስታወሻዎች {0} ይህን የሽያጭ ትዕዛዝ በመሰረዝ በፊት ተሰርዟል አለበት
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +75,Paid amount + Write Off Amount can not be greater than Grand Total,የሚከፈልበት መጠን መጠን ግራንድ ጠቅላላ በላይ ሊሆን አይችልም ጠፍቷል ጻፍ; +
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,{0} is not a valid Batch Number for Item {1},{0} ንጥል ትክክለኛ ባች ቁጥር አይደለም {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +138,Note: There is not enough leave balance for Leave Type {0},ማስታወሻ: አይተውህም ዓይነት በቂ ፈቃድ ቀሪ የለም {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,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,አጋጣሚ አይነት
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,አዲስ ኩባንያ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,Cost Center is required for 'Profit and Loss' account {0},ወጪ ማዕከል &#39;ትርፍ እና ኪሳራ&#39; ያስፈልጋል መለያ {0}
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,ግብይቶች ብቻ ኩባንያ ፈጣሪ ሊሰረዙ ይችላሉ
 apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,አጠቃላይ የሒሳብ መዝገብ ግቤቶች የተሳሳተ ቁጥር አልተገኘም. የ ግብይት የተሳሳተ መለያ የተመረጡ ሊሆን ይችላል.
 DocType: Cheque Print Template,Cheque Width,ቼክ ስፋት
@@ -2858,16 +2895,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,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 +228,{0} '{1}' is disabled,{0} »{1}» ተሰናክሏል
+apps/erpnext/erpnext/controllers/accounts_controller.py +231,{0} '{1}' is disabled,{0} »{1}» ተሰናክሏል
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ክፍት እንደ አዘጋጅ
 DocType: Cheque Print Template,Scanned Cheque,የተቃኘው ቼክ
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,በማስገባት ላይ ግብይቶች ላይ እውቂያዎች ራስ-ሰር ኢሜይሎች ይላኩ.
+DocType: Timesheet,Total Billable Amount,ጠቅላላ የሚከፈልበት መጠን
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,ንጥል 3
 DocType: Purchase Order,Customer Contact Email,የደንበኛ የዕውቂያ ኢሜይል
 DocType: Warranty Claim,Item and Warranty Details,ንጥል እና ዋስትና መረጃ
 DocType: Sales Team,Contribution (%),መዋጮ (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,ማስታወሻ: የክፍያ Entry ጀምሮ አይፈጠርም &#39;በጥሬ ገንዘብ ወይም በባንክ አካውንት&#39; አልተገለጸም
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Responsibilities,ሃላፊነቶች
+apps/erpnext/erpnext/controllers/accounts_controller.py +78,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,ሃላፊነቶች
 DocType: Expense Claim Account,Expense Claim Account,የወጪ የይገባኛል ጥያቄ መለያ
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,አብነት
 DocType: Sales Person,Sales Person Name,የሽያጭ ሰው ስም
@@ -2875,6 +2913,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,ተጠቃሚዎችን ያክሉ
 DocType: Pricing Rule,Item Group,ንጥል ቡድን
 DocType: Item,Safety Stock,የደህንነት Stock
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,ንጥል ኮድ&gt; ንጥል ቡድን&gt; የምርት ስም
 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),ግብሮች እና ክፍያዎች ታክሏል (የኩባንያ የምንዛሬ)
@@ -2884,7 +2923,6 @@
 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: Timesheet,Total Hours,ጠቅላላ ሰዓቶች
 DocType: Journal Entry,Printing Settings,ማተም ቅንብሮች
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Total Debit must be equal to Total Credit. The difference is {0},ጠቅላላ ዴቢት ጠቅላላ ምንጭ ጋር እኩል መሆን አለባቸው. ልዩነቱ ነው {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,አውቶሞቲቭ
@@ -2897,13 +2935,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,የኢንቨስትመንት ባንኪንግ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +71,Cash or Bank Account is mandatory for making payment entry,በጥሬ ገንዘብ ወይም የባንክ ሂሳብ ክፍያ ግቤት ለማድረግ ግዴታ ነው
 DocType: Purchase Invoice,Price List Exchange Rate,የዋጋ ዝርዝር ምንዛሪ ተመን
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,የደንበኛ&gt; የደንበኛ ቡድን&gt; ግዛት
 DocType: Purchase Invoice Item,Rate,ደረጃ ይስጡ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Intern,እሥረኛ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,እሥረኛ
 DocType: Stock Entry,From BOM,BOM ከ
 DocType: Assessment,Assessment Code,ግምገማ ኮድ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +32,Basic,መሠረታዊ
+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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',&#39;አመንጭ ፕሮግራም »ላይ ጠቅ ያድርጉ
+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 +95,Reference No is mandatory if you entered Reference Date,አንተ የማጣቀሻ ቀን ያስገቡት ከሆነ ማጣቀሻ ምንም የግዴታ ነው
@@ -2912,11 +2951,11 @@
 DocType: Salary Slip,Salary Structure,ደመወዝ መዋቅር
 DocType: Account,Bank,ባንክ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,የአየር መንገድ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +752,Issue Material,እትም ይዘት
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +723,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 +683,You are in offline mode. You will not be able to reload until you have network.,ከመስመር ውጪ ሁነታ ላይ ነው ያሉት. እርስዎ መረብ ድረስ ዳግም አይችሉም.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +665,You are in offline mode. You will not be able to reload until you have network.,ከመስመር ውጪ ሁነታ ላይ ነው ያሉት. እርስዎ መረብ ድረስ ዳግም አይችሉም.
 DocType: Hub Settings,Access Token,የመዳረሻ ማስመሰያ
 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,መለያ ቁጥር
@@ -2924,33 +2963,35 @@
 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 +1122,Enter value must be positive,ያስገቡ እሴት አዎንታዊ መሆን አለበት
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,All Territories,ሁሉም ግዛቶች
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1125,Enter value must be positive,ያስገቡ እሴት አዎንታዊ መሆን አለበት
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,ሁሉም ግዛቶች
 DocType: Purchase Invoice,Items,ንጥሎች
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +23,Student is already enrolled.,ተማሪው አስቀድሞ ተመዝግቧል.
 DocType: Fiscal Year,Year Name,ዓመት ስም
 DocType: Process Payroll,Process Payroll,ሂደት የደመወዝ ክፍያ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,ተከታታይ የሥራ ቀናት በላይ በዓላት በዚህ ወር አሉ.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +233,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 +96,Request for Quotations,ጥቅሶች ጠይቅ
+apps/erpnext/erpnext/hooks.py +104,Request for Quotations,ጥቅሶች ጠይቅ
 DocType: Payment Reconciliation,Maximum Invoice Amount,ከፍተኛው የደረሰኝ የገንዘብ መጠን
 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 +628,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',ተለዋጭ ለ ይለኩ ነባሪ ክፍል «{0}» መለጠፊያ ውስጥ እንደ አንድ አይነት መሆን አለበት &#39;{1} »
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',ተለዋጭ ለ ይለኩ ነባሪ ክፍል «{0}» መለጠፊያ ውስጥ እንደ አንድ አይነት መሆን አለበት &#39;{1} »
 DocType: Shipping Rule,Calculate Based On,የተመረኮዘ ላይ ማስላት
 DocType: Delivery Note Item,From Warehouse,መጋዘን ከ
 DocType: Assessment,Supervisor Name,ሱፐርቫይዘር ስም
+DocType: Assessment,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,የግዢ ተጠቃሚ
 DocType: Notification Control,Customize the Notification,የ ማሳወቂያ አብጅ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Cash Flow from Operations,ክወናዎች ከ የገንዘብ ፍሰት
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,ነባሪ አድራሻ መለጠፊያ ሊሰረዝ አይችልም
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,ነባሪ አድራሻ መለጠፊያ ሊሰረዝ አይችልም
 DocType: Sales Invoice,Shipping Rule,መላኪያ ደንብ
 DocType: Manufacturer,Limited to 12 characters,12 ቁምፊዎች የተገደበ
 DocType: Journal Entry,Print Heading,አትም HEADING
@@ -2965,8 +3006,8 @@
 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/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,ወይ የዒላማ ብዛት ወይም የዒላማ መጠን የግዴታ ነው
-apps/erpnext/erpnext/stock/get_item_details.py +485,No default BOM exists for Item {0},ምንም ነባሪ BOM ንጥል የለም {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +336,Please select Posting Date first,በመጀመሪያ መለጠፍ ቀን ይምረጡ
+apps/erpnext/erpnext/stock/get_item_details.py +486,No default BOM exists for Item {0},ምንም ነባሪ BOM ንጥል የለም {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +326,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,አሁን ያሉ ግብይቶችን ጋር ወጪ ማዕከል የሒሳብ መዝገብ ላይ ሊቀየር አይችልም
@@ -2982,6 +3023,7 @@
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,ደረሰኞች ጋር አዛምድ ክፍያዎች
 DocType: Journal Entry,Bank Entry,ባንክ የሚመዘገብ መረጃ
 DocType: Authorization Rule,Applicable To (Designation),የሚመለከታቸው ለማድረግ (ምደባ)
+,Profitability Analysis,ትርፋማ ትንታኔ
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,ወደ ግዢው ቅርጫት ጨምር
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,ቡድን በ
 DocType: Guardian,Interests,ፍላጎቶች
@@ -2994,21 +3036,21 @@
 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 +141,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Serialized ንጥል {0} ከወሰደው ማስታረቅ በመጠቀም \ መዘመን አይችልም
 DocType: Scheduling Tool,Day,ቀን
 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 +122,You are not authorized to approve leaves on Block Dates,አንተ አግድ ቀኖች ላይ ቅጠል ለማፅደቅ ስልጣን አይደለም
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,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: Student Applicant,AP.,የ AP.
 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 +639,Point of Sale,የሽያጭ ነጥብ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +634,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,ግብር
 DocType: Production Planning Tool,Production Planning Tool,የምርት ዕቅድ መሣሪያ
@@ -3017,74 +3059,77 @@
 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 +373,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 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 Profile,Customer Group,የደንበኛ ቡድን
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,Expense account is mandatory for item {0},ወጪ መለያ ንጥል ግዴታ ነው {0}
 DocType: Item,Website Description,የድር ጣቢያ መግለጫ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date must be on or after today,ቀጣይ የእርጅና ቀን ላይ ወይም በዛሬው ጊዜ በኋላ መሆን አለበት
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,ፍትህ ውስጥ የተጣራ ለውጥ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +145,Please cancel Purchase Invoice {0} first,በመጀመሪያ የግዢ ደረሰኝ {0} ይቅር እባክዎ
 DocType: Serial No,AMC Expiry Date,AMC የሚቃጠልበት ቀን
 ,Sales Register,የሽያጭ መመዝገቢያ
 DocType: Quotation,Quotation Lost Reason,ጥቅስ የጠፋ ምክንያት
+apps/erpnext/erpnext/utilities/doctype/address/address.py +164,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,ምንም ነባሪ አድራሻ አብነት አልተገኘም. ማዋቀር&gt; ማተም እና የምርት&gt; አድራሻ መለጠፊያ አንድ አዲስ ፍጠር እባክዎ.
 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 +330,Transaction reference no {0} dated {1},የግብይት ማጣቀሻ ምንም {0} የተዘጋጀው {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Transaction reference no {0} dated {1},የግብይት ማጣቀሻ ምንም {0} የተዘጋጀው {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,አርትዕ ለማድረግ ምንም ነገር የለም.
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,Summary for this month and pending activities,በዚህ ወር እና በመጠባበቅ ላይ ያሉ እንቅስቃሴዎች ማጠቃለያ
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,በዚህ ወር እና በመጠባበቅ ላይ ያሉ እንቅስቃሴዎች ማጠቃለያ
 DocType: Customer Group,Customer Group Name,የደንበኛ የቡድን ስም
 apps/erpnext/erpnext/public/js/financial_statements.js +54,Cash Flow Statement,የገንዘብ ፍሰት መግለጫ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Please remove this Invoice {0} from C-Form {1},ሲ-ቅጽ ይህን የደረሰኝ {0} ያስወግዱ እባክዎ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,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 +644,Get Items,ንጥሎች ያግኙ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +623,Get Items,ንጥሎች ያግኙ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +210,Please enter Write Off Account,መለያ ጠፍቷል ይጻፉ ያስገቡ
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,የመጨረሻ ትዕዛዝ ቀን
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +41,Account {0} does not belongs to company {1},መለያ {0} ነው ኩባንያ ንብረት አይደለም {1}
+DocType: Student,Guardian Details,አሳዳጊ ዝርዝሮች
 DocType: C-Form,C-Form,ሲ-ቅጽ
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,በርካታ ሠራተኞች ምልክት ክትትል
 DocType: Payment Request,Initiated,A ነሳሽነት
 DocType: Production Order,Planned Start Date,የታቀደ መጀመሪያ ቀን
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,Customer is required against Receivable account {0},የደንበኛ የሚሰበሰብ መለያ ላይ ያስፈልጋል {0}
 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 +265,Project-wise data is not available for Quotation,ፕሮጀክት-ጥበብ ውሂብ ትዕምርተ አይገኝም
+apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,ፕሮጀክት-ጥበብ ውሂብ ትዕምርተ አይገኝም
 DocType: Project,Expected End Date,የሚጠበቀው መጨረሻ ቀን
 DocType: Budget Account,Budget Amount,የበጀት መጠን
 DocType: Appraisal Template,Appraisal Template Title,ግምገማ አብነት ርዕስ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,Commercial,ንግድ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,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 +648,Row {0}# Account must be of type 'Fixed Asset',ረድፍ {0} # መለያ አይነት መሆን አለበት &#39;ቋሚ ንብረት&#39;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Row {0}# Account must be of type 'Fixed Asset',ረድፍ {0} # መለያ አይነት መሆን አለበት &#39;ቋሚ ንብረት&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,ብዛት ውጪ
 apps/erpnext/erpnext/config/accounts.py +278,Rules to calculate shipping amount for a sale,ደንቦች አንድ የሚሸጥ የመላኪያ መጠን ለማስላት
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +30,Series is mandatory,ተከታታይ ግዴታ ነው
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +50,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}
 DocType: Leave Allocation,Unused leaves,ያልዋለ ቅጠሎች
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Cr,CR
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Cr,CR
 DocType: Tax Rule,Billing State,አከፋፈል መንግስት
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +250,Transfer,ያስተላልፉ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +187,{0} {1} does not associated with Party Account {2},{0} {1} ፓርቲ መለያዎ ጋር የሚዛመድ አይደለም {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,Fetch exploded BOM (including sub-assemblies),(ንዑስ-አብያተ ክርስቲያናት ጨምሮ) ፈንድቶ BOM ሰብስብ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +254,Transfer,ያስተላልፉ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +190,{0} {1} does not associated with Party Account {2},{0} {1} ፓርቲ መለያዎ ጋር የሚዛመድ አይደለም {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +796,Fetch exploded BOM (including sub-assemblies),(ንዑስ-አብያተ ክርስቲያናት ጨምሮ) ፈንድቶ BOM ሰብስብ
 DocType: Authorization Rule,Applicable To (Employee),የሚመለከታቸው ለማድረግ (ሰራተኛ)
-apps/erpnext/erpnext/controllers/accounts_controller.py +115,Due Date is mandatory,መጠናቀቅ ያለበት ቀን የግዴታ ነው
+apps/erpnext/erpnext/controllers/accounts_controller.py +118,Due Date is mandatory,መጠናቀቅ ያለበት ቀን የግዴታ ነው
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,አይነታ ጭማሬ {0} 0 መሆን አይችልም
 DocType: Journal Entry,Pay To / Recd From,ከ / Recd ወደ ይክፈሉ
 DocType: Naming Series,Setup Series,ማዋቀር ተከታታይ
 DocType: Payment Reconciliation,To Invoice Date,ቀን ደረሰኝ
 DocType: Supplier,Contact HTML,የእውቂያ ኤችቲኤምኤል
 ,Inactive Customers,ያልነቁ ደንበኞች
+DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,የግዢ ደረሰኞች
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,እንዴት የዋጋ ደንብ ተግባራዊ ነው?
 DocType: Quality Inspection,Delivery Note No,የመላኪያ ማስታወሻ የለም
@@ -3093,7 +3138,7 @@
 DocType: Company,Retail,ችርቻሮ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +120,Customer {0} does not exist,የደንበኛ {0} የለም
 DocType: Attendance,Absent,ብርቅ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +587,Product Bundle,የምርት ጥቅል
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Product Bundle,የምርት ጥቅል
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Invalid reference {1},ረድፍ {0}: ልክ ያልሆነ ማጣቀሻ {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,ግብር እና ክፍያዎች አብነት ይግዙ
 DocType: Upload Attendance,Download Template,አውርድ አብነት
@@ -3103,8 +3148,8 @@
 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 +742,Send Supplier Emails,አቅራቢው ኢሜይሎች ላክ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +104,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","ደመወዝ አስቀድሞ {0} እና {1}, ለዚህ የቀን ክልል መካከል ሊሆን አይችልም የማመልከቻ ጊዜ ተወው መካከል ለተወሰነ ጊዜ በሂደት ላይ."
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +708,Send Supplier Emails,አቅራቢው ኢሜይሎች ላክ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,"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,አሳዳጊ የወለድ
 DocType: Timesheet,Employee Detail,የሰራተኛ ዝርዝር
@@ -3115,9 +3160,9 @@
 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/accounts/doctype/gl_entry/gl_entry.py +77,Account {0} cannot be a Group,መለያ {0} አንድ ቡድን ሊሆን አይችልም
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} cannot be a Group,መለያ {0} አንድ ቡድን ሊሆን አይችልም
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +31,Optional. This setting will be used to filter in various transactions.,ከተፈለገ. ይህ ቅንብር በተለያዩ ግብይቶችን ለማጣራት ጥቅም ላይ ይውላል.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +107,Negative Valuation Rate is not allowed,አሉታዊ ግምቱ ተመን አይፈቀድም
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,አሉታዊ ግምቱ ተመን አይፈቀድም
 DocType: Holiday List,Weekly Off,ሳምንታዊ አጥፋ
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","ለምሳሌ በ 2012, 2012-13 ለ"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +39,Provisional Profit / Loss (Credit),ፕሮቪዥናል ትርፍ / ኪሣራ (ምንጭ)
@@ -3131,16 +3176,16 @@
 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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: ወጪ ማዕከል ንጥል ግዴታ ነው; {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +626,Get Items from Product Bundle,የምርት ጥቅል ከ ንጥሎች ያግኙ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +605,Get Items from Product Bundle,የምርት ጥቅል ከ ንጥሎች ያግኙ
 DocType: Asset,Straight Line,ቀጥተኛ መስመር
 DocType: Project User,Project User,የፕሮጀክት ተጠቃሚ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} is inactive,መለያ {0} ንቁ አይደለም
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} is inactive,መለያ {0} ንቁ አይደለም
 DocType: GL Entry,Is Advance,የቅድሚያ ነው
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,ቀን ወደ ቀን እና የትምህርት ክትትል ጀምሮ በስብሰባው የግዴታ ነው
 apps/erpnext/erpnext/controllers/buying_controller.py +148,Please enter 'Is Subcontracted' as Yes or No,አዎ ወይም አይ እንደ &#39;Subcontracted ነው&#39; ያስገቡ
 DocType: Sales Team,Contact No.,የእውቂያ ቁጥር
 DocType: Bank Reconciliation,Payment Entries,የክፍያ ግቤቶች
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,'Profit and Loss' type account {0} not allowed in Opening Entry,Entry በመክፈት ላይ አይፈቀድም &#39;ትርፍ እና ኪሳራ&#39; አይነት መለያ {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +71,'Profit and Loss' type account {0} not allowed in Opening Entry,Entry በመክፈት ላይ አይፈቀድም &#39;ትርፍ እና ኪሳራ&#39; አይነት መለያ {0}
 DocType: Program Enrollment Tool,Get Students From,ከ ተማሪዎች ያግኙ
 DocType: Hub Settings,Seller Country,ሻጭ አገር
 apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,ድህረ ገጽ ላይ ንጥሎች አትም
@@ -3159,7 +3204,7 @@
 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 +558,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","የረድፍ # {0}: የንብረት {1} ማስገባት አይችልም, ቀድሞውንም ነው {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +561,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","የረድፍ # {0}: የንብረት {1} ማስገባት አይችልም, ቀድሞውንም ነው {2}"
 DocType: Tax Rule,Billing Country,አከፋፈል አገር
 DocType: Production Order,Expected Delivery Date,የሚጠበቀው የመላኪያ ቀን
 apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,ዴቢት እና የብድር {0} ለ # እኩል አይደለም {1}. ልዩነት ነው; {2}.
@@ -3172,13 +3217,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +202,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: Sales Order,% Amount Billed,% መጠን የሚከፈል
+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.,ሳያስቀምጡ በፊት ተከታታይ ለመምረጥ ተጠቃሚው ለማስገደድ የሚፈልጉ ከሆነ ይህን ምልክት ያድርጉ. ይህን ለማረጋገጥ ከሆነ ምንም ነባሪ ይሆናል.
 apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},ተከታታይ ምንም ጋር ምንም ንጥል {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,ክፍት ማሳወቂያዎች
+DocType: Email Digest,Open Notifications,ክፍት ማሳወቂያዎች
 DocType: Payment Entry,Difference Amount (Company Currency),ልዩነት መጠን (የኩባንያ የምንዛሬ)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,ቀጥተኛ ወጪዎች
 apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
@@ -3186,7 +3231,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,አዲስ ደንበኛ ገቢ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,የጉዞ ወጪ
 DocType: Maintenance Visit,Breakdown,መሰባበር
-apps/erpnext/erpnext/controllers/accounts_controller.py +634,Account: {0} with currency: {1} can not be selected,መለያ: {0} ምንዛሬ ጋር: {1} መመረጥ አይችልም
+apps/erpnext/erpnext/controllers/accounts_controller.py +637,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}
 DocType: Program Enrollment Tool,Student Applicants,የተማሪ አመልካቾች
@@ -3194,15 +3239,15 @@
 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 +56,Probation,የሥራ ልማድ የሚፈትን ጊዜ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Probation,የሥራ ልማድ የሚፈትን ጊዜ
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,ደመወዝ ክፍሎች
 DocType: Program Enrollment Tool,New Academic Year,አዲስ የትምህርት ዓመት
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Payment of salary for the month {0} and year {1},ወር ደመወዝ ክፍያ {0} እና ዓመት {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Payment of salary for the month {0} and year {1},ወር ደመወዝ ክፍያ {0} እና ዓመት {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,ራስ-ያስገቡ ዋጋ ዝርዝር መጠን ይጎድለዋል ከሆነ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,ጠቅላላ የሚከፈልበት መጠን
 DocType: Production Order Item,Transferred Qty,ተላልፈዋል ብዛት
 apps/erpnext/erpnext/config/learn.py +11,Navigating,በመዳሰስ ላይ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Planning,ማቀድ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,ማቀድ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,የተሰጠበት
 DocType: Project,Total Billing Amount (via Time Logs),ጠቅላላ የሂሳብ አከፋፈል መጠን (ጊዜ ምዝግብ ማስታወሻዎች በኩል)
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,We sell this Item,ይህ ንጥል መሸጥ
@@ -3215,11 +3260,10 @@
 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.,በኢሜይል በኩል መደበኛ የማጠቃለያ ሪፖርቶች ላክ.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Sales invoice submitted sucessfully.,የሽያጭ መጠየቂያ በተሳካ ሁኔታ ገብቷል.
 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}
 DocType: Assessment Result,Student Name,የተማሪ ስም
-apps/erpnext/erpnext/hooks.py +104,Assessment Schedule,ግምገማ ፕሮግራም
+apps/erpnext/erpnext/hooks.py +113,Assessment Schedule,ግምገማ ፕሮግራም
 DocType: Brand,Item Manager,ንጥል አስተዳዳሪ
 DocType: Buying Settings,Default Supplier Type,ነባሪ አቅራቢ አይነት
 DocType: Production Order,Total Operating Cost,ጠቅላላ ማስኬጃ ወጪ
@@ -3229,6 +3273,7 @@
 DocType: GL Entry,Party Type,የድግስ አይነት
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +78,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 አይደለም
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,ደመወዝ አብነት ጌታቸው.
 DocType: Leave Type,Max Days Leave Allowed,ከፍተኛ ቀኖች ፈቃድ ተፈቅዷል
@@ -3240,18 +3285,19 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,የሚመራ ወይም ደንበኞች ወደ በመጥቀስ.
 DocType: Stock Settings,Role Allowed to edit frozen stock,ሚና የታሰረው የአክሲዮን አርትዕ ማድረግ ተፈቅዷል
 ,Territory Target Variance Item Group-Wise,ክልል ዒላማ ልዩነት ንጥል ቡድን ጥበበኛ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Customer Groups,ሁሉም የደንበኛ ቡድኖች
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +78,Accumulated Monthly,ሲጠራቀሙ ወርሃዊ
-apps/erpnext/erpnext/controllers/accounts_controller.py +595,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} የግዴታ ነው. ምናልባት የገንዘብ ምንዛሪ ዘገባ {1} {2} ዘንድ አልተፈጠረም ነው.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,ሁሉም የደንበኛ ቡድኖች
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +81,Accumulated Monthly,ሲጠራቀሙ ወርሃዊ
+apps/erpnext/erpnext/controllers/accounts_controller.py +598,{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} የለም
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),ዋጋ ዝርዝር ተመን (የኩባንያ የምንዛሬ)
 DocType: Products Settings,Products Settings,ምርቶች ቅንብሮች
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +188,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} ውቅረት&gt; በቅንብሮች&gt; መሰየምን ዓምድ ተከታታይ መሰየምን ማዘጋጀት እባክዎ
 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 +84,Secretary,ጸሐፊ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,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,ሊገዙ
@@ -3260,24 +3306,22 @@
 ,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,ግምገማ ስም
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,የረድፍ # {0}: መለያ ምንም ግዴታ ነው
+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 +859,Supplier Quotation,አቅራቢው ትዕምርተ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +838,Supplier Quotation,አቅራቢው ትዕምርተ
 DocType: Quotation,In Words will be visible once you save the Quotation.,የ ትዕምርተ ማስቀመጥ አንዴ ቃላት ውስጥ የሚታይ ይሆናል.
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +7,Collect Fees,ክፍያዎች ሰብስብ
+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}
 DocType: Lead,Add to calendar on this date,በዚህ ቀን ላይ ወደ ቀን መቁጠሪያ አክል
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,የመላኪያ ወጪዎች ለማከል ደንቦች.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,መጪ ክስተቶች
 DocType: Item,Opening Stock,በመክፈት ላይ የአክሲዮን
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,ደንበኛ ያስፈልጋል
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} መመለስ ግዴታ ነው
 DocType: Purchase Order,To Receive,መቀበል
 apps/erpnext/erpnext/public/js/setup_wizard.js +195,user@example.com,user@example.com
-DocType: Email Digest,Income / Expense,ገቢ / የወጪ
 DocType: Employee,Personal Email,የግል ኢሜይል
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,ጠቅላላ ልዩነት
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","የነቃ ከሆነ, ስርዓት በራስ ሰር ክምችት ለ የሂሳብ ግቤቶች መለጠፍ ነው."
@@ -3288,13 +3332,14 @@
 DocType: Customer,From Lead,ሊድ ከ
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,ትዕዛዞች ምርት ከእስር.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,በጀት ዓመት ይምረጡ ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,POS Profile required to make POS Entry,POS መገለጫ POS የሚመዘገብ ለማድረግ ያስፈልጋል
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +509,POS Profile required to make POS Entry,POS መገለጫ POS የሚመዘገብ ለማድረግ ያስፈልጋል
 DocType: Program Enrollment Tool,Enroll Students,ተማሪዎች ይመዝገቡ
 DocType: Hub Settings,Name Token,ስም ማስመሰያ
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,መደበኛ ሽያጭ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Atleast one warehouse is mandatory,ቢያንስ አንድ መጋዘን የግዴታ ነው
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +129,Atleast one warehouse is mandatory,ቢያንስ አንድ መጋዘን የግዴታ ነው
 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 +330,{0} against Sales Invoice {1},{0} የሽያጭ ደረሰኝ ላይ {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,የፕሮጀክት ስም
@@ -3315,10 +3360,11 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,ቅጠሎች 0.5 ላይ ብዜት ውስጥ ይመደባል አለበት
 DocType: Production Order,Operation Cost,ክወና ወጪ
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,አንድ .csv ፋይል መገኘትን ይስቀሉ
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,ያልተከፈሉ Amt
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,አዘጋጅ ግቦች ንጥል ቡድን-ጥበብ ይህን የሽያጭ ሰው ነውና.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],እሰር አክሲዮኖች የቆየ ይልቅ [ቀኖች]
-apps/erpnext/erpnext/controllers/accounts_controller.py +528,Row #{0}: Asset is mandatory for fixed asset purchase/sale,የረድፍ # {0}: ንብረት ቋሚ ንብረት ግዢ / ለሽያጭ ግዴታ ነው
+apps/erpnext/erpnext/controllers/accounts_controller.py +531,Row #{0}: Asset is mandatory for fixed asset purchase/sale,የረድፍ # {0}: ንብረት ቋሚ ንብረት ግዢ / ለሽያጭ ግዴታ ነው
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","ሁለት ወይም ከዚያ በላይ የዋጋ ደንቦች ከላይ ሁኔታዎች ላይ ተመስርቶ አልተገኙም ከሆነ, ቅድሚያ ተፈጻሚ ነው. ነባሪ እሴት ዜሮ (ባዶ) ነው እያለ ቅድሚያ 20 0 መካከል ያለ ቁጥር ነው. ከፍተኛ ቁጥር ተመሳሳይ ሁኔታዎች ጋር በርካታ የዋጋ ደንቦች አሉ ከሆነ የበላይነቱን የሚወስዱ ይሆናል ማለት ነው."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,በጀት ዓመት: {0} ነው አይደለም አለ
 DocType: Currency Exchange,To Currency,ምንዛሬ ወደ
@@ -3335,15 +3381,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,የግል ፍትህ
 DocType: Maintenance Visit,Customer Feedback,የደንበኛ ግብረ መልስ
 DocType: Account,Expense,ወጭ
-DocType: Sales Invoice,Exhibition,ትርኢት
 apps/erpnext/erpnext/utilities/doctype/address/address.py +77,"Company is mandatory, as it is your company address","የእርስዎ ኩባንያ አድራሻ ነው; እንደ ኩባንያ, የግዴታ ነው"
 DocType: Item Attribute,From Range,ክልል ከ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +81,Syntax error in formula or condition: {0},ቀመር ወይም ሁኔታ ውስጥ የአገባብ ስህተት: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +92,Syntax error in formula or condition: {0},ቀመር ወይም ሁኔታ ውስጥ የአገባብ ስህተት: {0}
 apps/erpnext/erpnext/stock/utils.py +99,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 +28,Jobs,ስራዎች
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,ስራዎች
 ,Sales Order Trends,የሽያጭ ትዕዛዝ አዝማሚያዎች
 DocType: Employee,Held On,የተያዙ ላይ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,የምርት ንጥል
@@ -3352,16 +3398,16 @@
 DocType: Stock Entry Detail,Additional Cost,ተጨማሪ ወጪ
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,የፋይናንስ ዓመት መጨረሻ ቀን
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","ቫውቸር ምንም ላይ የተመሠረተ ማጣሪያ አይችሉም, ቫውቸር በ ተመድበው ከሆነ"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +763,Make Supplier Quotation,አቅራቢው ትዕምርተ አድርግ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,Make Supplier Quotation,አቅራቢው ትዕምርተ አድርግ
 DocType: Quality Inspection,Incoming,ገቢ
 DocType: BOM,Materials Required (Exploded),ቁሳቁሶች (የፈነዳ) ያስፈልጋል
 apps/erpnext/erpnext/public/js/setup_wizard.js +185,"Add users to your organization, other than yourself","ራስህን ሌላ, የእርስዎ ድርጅት ተጠቃሚዎችን ያክሉ"
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,Row # {0}: Serial No {1} does not match with {2} {3},የረድፍ # {0}: መለያ አይ {1} ጋር አይዛመድም {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +42,Casual Leave,ተራ ፈቃድ
+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,ተራ ፈቃድ
 DocType: Batch,Batch ID,ባች መታወቂያ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,Note: {0},ማስታወሻ: {0}
 ,Delivery Note Trends,የመላኪያ ማስታወሻ በመታየት ላይ ያሉ
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +103,This Week's Summary,ይህ ሳምንት ማጠቃለያ
+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} ብቻ የአክሲዮን ግብይቶች በኩል መዘመን ይችላሉ
 DocType: Student Group Creation Tool,Get Courses,ኮርሶች ያግኙ
 DocType: GL Entry,Party,ግብዣ
@@ -3371,7 +3417,7 @@
 DocType: Request for Quotation Item,Request for Quotation Item,ትዕምርተ ንጥል ጥያቄ
 DocType: Purchase Order,To Bill,ቢል
 DocType: Material Request,% Ordered,% የዕቃው መረጃ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Piecework,ጭማቂዎች
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Piecework,ጭማቂዎች
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,አማካኝ. ሊገዙ ተመን
 DocType: Task,Actual Time (in Hours),(ሰዓቶች ውስጥ) ትክክለኛ ሰዓት
 DocType: Employee,History In Company,ኩባንያ ውስጥ ታሪክ
@@ -3388,7 +3434,7 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +350,{0} units of {1} needed in {2} to complete this transaction.,{0} ክፍሎች {1} {2} ይህን ግብይት ለማጠናቀቅ ያስፈልጋል.
 DocType: SMS Settings,SMS Settings,ኤስ ኤም ኤስ ቅንብሮች
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Temporary Accounts,ጊዜያዊ መለያዎች
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Black,ጥቁር
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,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} ንጥሎች
@@ -3399,13 +3445,13 @@
 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 +69,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,ማርቆስ የተዉ
 DocType: Journal Entry Account,Exchange Rate,የመለወጫ ተመን
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Sales Order {0} is not submitted,የሽያጭ ትዕዛዝ {0} ማቅረብ አይደለም
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +527,Sales Order {0} is not submitted,የሽያጭ ትዕዛዝ {0} ማቅረብ አይደለም
 DocType: Homepage,Tag Line,መለያ መስመር
 DocType: Fee Component,Fee Component,የክፍያ ክፍለ አካል
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +857,Add items from,ከ ንጥሎችን ያክሉ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +836,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: Cheque Print Template,Regular,መደበኛ
 DocType: BOM,Last Purchase Rate,የመጨረሻው የግዢ ተመን
@@ -3413,6 +3459,7 @@
 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} ጀምሮ ተለዋጮች አለው
 ,Sales Person-wise Transaction Summary,የሽያጭ ሰው-ጥበብ የግብይት ማጠቃለያ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +60,Cost Center is required for 'Profit and Loss' account {0}. Please set up a default Cost Center for the Company.,ወጪ ማዕከል &#39;ትርፍ እና ኪሳራ&#39; መለያ {0} ያስፈልጋል. ካምፓኒው ነባሪ ዋጋ ማዕከል ያዘጋጁ.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,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,ወርሃዊ የስርጭት መቶኛ
@@ -3423,12 +3470,12 @@
 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 +710,Online,የመስመር ላይ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +692,Online,የመስመር ላይ
 ,Available Stock for Packing Items,ማሸግ ንጥሎች አይገኝም የአክሲዮን
 DocType: Item Variant,Item Variant,ንጥል ተለዋጭ
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,ሌላ ምንም ነባሪ የለም እንደ እንደ ነባሪ ይህን አድራሻ አብነት በማዘጋጀት ላይ
+apps/erpnext/erpnext/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'","አስቀድሞ ዴቢት ውስጥ ቀሪ ሒሳብ, አንተ &#39;ምንጭ&#39; እንደ &#39;ሚዛናዊ መሆን አለብህ&#39; እንዲያዘጋጁ ያልተፈቀደላቸው ነው"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Quality Management,የጥራት ሥራ አመራር
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,የጥራት ሥራ አመራር
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,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,የተቀጣሪ ውጫዊ የስራ ታሪክ
@@ -3450,11 +3497,12 @@
 DocType: Student,Student Email ID,የተማሪ የኢሜይል መታወቂያ
 DocType: Employee,Notice (days),ማስታወቂያ (ቀናት)
 DocType: Tax Rule,Sales Tax Template,የሽያጭ ግብር አብነት
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1520,Select items to save the invoice,ወደ መጠየቂያ ለማስቀመጥ ንጥሎችን ምረጥ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1544,Select items to save the invoice,ወደ መጠየቂያ ለማስቀመጥ ንጥሎችን ምረጥ
 DocType: Employee,Encashment Date,Encashment ቀን
 DocType: Account,Stock Adjustment,የአክሲዮን ማስተካከያ
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},ነባሪ እንቅስቃሴ ወጪ የእንቅስቃሴ ዓይነት የለም - {0}
 DocType: Production Order,Planned Operating Cost,የታቀደ ስርዓተ ወጪ
+DocType: Academic Term,Term Start Date,የሚለው ቃል መጀመሪያ ቀን
 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,የአመልካች ስም
@@ -3484,17 +3532,17 @@
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,ወደ መጋዘን (ለተመራ ቆጠራ) መለያ በዚህ መለያ ስር ይፈጠራል.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +119,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,የአክሲዮን የመቁጠር ግቤት ይህን መጋዘን የለም እንደ መጋዘን ሊሰረዝ አይችልም.
 DocType: Company,Distribution,ስርጭት
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +8,Amount Paid,መጠን የሚከፈልበት
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Project Manager,ፕሮጀክት ሥራ አስኪያጅ
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,መጠን የሚከፈልበት
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,ፕሮጀክት ሥራ አስኪያጅ
 ,Quoted Item Comparison,የተጠቀሰ ንጥል ንጽጽር
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Dispatch,የደንበኞች አገልግሎት
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,የደንበኞች አገልግሎት
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,ንጥል የሚፈቀደው ከፍተኛ ቅናሽ: {0} {1}% ነው
 apps/erpnext/erpnext/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.,ካልተዋቀረ የብድር ገደብ መብለጥ መሆኑን ግብይቶችን ማቅረብ አይፈቀድም ነው ሚና.
-DocType: Sales Invoice,Supplier Reference,አቅራቢው ማጣቀሻ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +844,"Master data syncing, it might take some time","መምህር ውሂብ ማመሳሰል, ይህ የተወሰነ ጊዜ ሊወስድ ይችላል"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +832,"Master data syncing, it might take some time","መምህር ውሂብ ማመሳሰል, ይህ የተወሰነ ጊዜ ሊወስድ ይችላል"
 DocType: Item,Material Issue,ቁሳዊ ችግር
 DocType: Hub Settings,Seller Description,ሻጭ መግለጫ
 DocType: Employee Education,Qualification,እዉቀት
@@ -3508,7 +3556,7 @@
 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 +83,Error in formula or condition,ቀመር ወይም ሁኔታ ላይ ስህተት
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,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,ሁሉንም አታመልክት
@@ -3517,7 +3565,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},ቀን ወደ የበጀት ዓመት ውስጥ መሆን አለበት. = ቀን ወደ ከወሰድን {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","እዚህ ወዘተ ቁመት, ክብደት, አለርጂ, የሕክምና ጉዳዮች ጠብቀን መኖር እንችላለን"
 DocType: Leave Block List,Applies to Company,ኩባንያ የሚመለከተው ለ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +197,Cannot cancel because submitted Stock Entry {0} exists,ገብቷል የክምችት Entry {0} መኖሩን ምክንያቱም ማስቀረት አይቻልም
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +198,Cannot cancel because submitted Stock Entry {0} exists,ገብቷል የክምችት Entry {0} መኖሩን ምክንያቱም ማስቀረት አይቻልም
 DocType: Purchase Invoice,In Words,ቃላት ውስጥ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,Today is {0}'s birthday!,ዛሬ {0} »ን የልደት ቀን ነው!
 DocType: Production Planning Tool,Material Request For Warehouse,መጋዘን ያህል ቁሳዊ ጥያቄ
@@ -3527,14 +3575,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,የፋይናንስ ዓመት ላይ ይጀምራል
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,የንብረት Depreciations እና ሚዛን
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +319,Amount {0} {1} transferred from {2} to {3},የገንዘብ መጠን {0} {1} ይተላለፋል {2} ወደ {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +322,Amount {0} {1} transferred from {2} to {3},የገንዘብ መጠን {0} {1} ይተላለፋል {2} ወደ {3}
 DocType: Sales Invoice,Get Advances Received,እድገት ተቀብሏል ያግኙ
 DocType: Email Digest,Add/Remove Recipients,ተቀባዮች አክል / አስወግድ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +432,Transaction not allowed against stopped Production Order {0},ግብይት ቆሟል ምርት ላይ አይፈቀድም ትዕዛዝ {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +437,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 +143,Join,ተቀላቀል
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,እጥረት ብዛት
-apps/erpnext/erpnext/stock/doctype/item/item.py +652,Item variant {0} exists with same attributes,ንጥል ተለዋጭ {0} ተመሳሳይ ባሕርያት ጋር አለ
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,ንጥል ተለዋጭ {0} ተመሳሳይ ባሕርያት ጋር አለ
+DocType: Leave Application,LAP/,ጭን /
 DocType: Salary Slip,Salary Slip,የቀጣሪ
 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;ቀን ወደ »ያስፈልጋል
@@ -3542,12 +3591,12 @@
 DocType: Sales Invoice Item,Sales Order Item,የሽያጭ ትዕዛዝ ንጥል
 DocType: Salary Slip,Payment Days,የክፍያ ቀኖች
 DocType: Customer,Dormant,ዋልጌ
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +212,Warehouses with child nodes cannot be converted to ledger,ልጅ እንደ አንጓዎች ጋር መጋዘኖችን ያሰኘንን ወደ ሊቀየር አይችልም
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +215,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/public/js/controllers/transaction.js +866,It is needed to fetch Item Details.,ይህ የዕቃው መረጃ ማምጣት ያስፈልጋል.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +857,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} አስቀድሞ ደርሷል
@@ -3557,14 +3606,14 @@
 DocType: Expense Claim,Total Claimed Amount,ጠቅላላ የቀረበበት የገንዘብ መጠን
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,መሸጥ የሚሆን እምቅ ዕድል.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,Invalid {0},ልክ ያልሆነ {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Sick Leave,የህመም ጊዜ የስራ ዕረፍት ፍቃድ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,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,መምሪያ መደብሮች
 DocType: Warehouse,PIN,ፒን
 DocType: Sales Invoice,Base Change Amount (Company Currency),የመሠረት ለውጥ መጠን (የኩባንያ የምንዛሬ)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +313,No accounting entries for the following warehouses,የሚከተሉትን መጋዘኖችን ምንም የሂሳብ ግቤቶች
-apps/erpnext/erpnext/projects/doctype/project/project.js +102,Save the document first.,በመጀመሪያ ሰነዱን አስቀምጥ.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +314,No accounting entries for the following warehouses,የሚከተሉትን መጋዘኖችን ምንም የሂሳብ ግቤቶች
+apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,በመጀመሪያ ሰነዱን አስቀምጥ.
 DocType: Account,Chargeable,እንዳንከብድበት
 DocType: Company,Change Abbreviation,ለውጥ ምህፃረ ቃል
 DocType: Expense Claim Detail,Expense Date,የወጪ ቀን
@@ -3577,10 +3626,9 @@
 DocType: Purchase Invoice,Recurring Print Format,ተደጋጋሚ የህትመት ቅርጸት
 DocType: C-Form,Series,ተከታታይ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,Expected Delivery Date cannot be before Purchase Order Date,የሚጠበቀው የመላኪያ ቀን የግዢ ትዕዛዝ ቀን በፊት ሊሆን አይችልም
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} ውቅረት&gt; በቅንብሮች&gt; መሰየምን ዓምድ ተከታታይ መሰየምን ማዘጋጀት እባክዎ
 DocType: Appraisal,Appraisal Template,ግምገማ አብነት
 DocType: Item Group,Item Classification,ንጥል ምደባ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Business Development Manager,የንግድ ልማት ሥራ አስኪያጅ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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,አጠቃላይ የሒሳብ መዝገብ
@@ -3590,8 +3638,8 @@
 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 +940,Please select {0} first,በመጀመሪያ {0} እባክዎ ይምረጡ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +749,Batch {0} of Item {1} has expired.,ንጥል ባች {0} {1} ጊዜው አልፎበታል.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +953,Please select {0} first,በመጀመሪያ {0} እባክዎ ይምረጡ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +757,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,ድምር
@@ -3608,8 +3656,8 @@
 {% 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 +92,Warehouse not found in the system,መጋዘን ሥርዓት ውስጥ አልተገኘም
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +106,This Month's Summary,በዚህ ወር የሰጠው ማጠቃለያ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,መጋዘን ሥርዓት ውስጥ አልተገኘም
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,በዚህ ወር የሰጠው ማጠቃለያ
 DocType: Quality Inspection Reading,Quality Inspection Reading,የጥራት ምርመራ ንባብ
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`እሰር አክሲዮኖች የቆየ Than`% d ቀኖች ያነሰ መሆን ይኖርበታል.
 DocType: Tax Rule,Purchase Tax Template,የግብር አብነት ግዢ
@@ -3619,21 +3667,22 @@
 DocType: Item Customer Detail,Ref Code,ማጣቀሻ ኮድ
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,የሰራተኛ መዝገቦች.
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Please set Next Depreciation Date,ቀጣይ የእርጅና ቀን ማዘጋጀት እባክዎ
-DocType: Payment Gateway,Payment Gateway,የክፍያ ጌትዌይ
 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 +378,Operation Time must be greater than 0 for Operation {0},ኦፕሬሽን ጊዜ ክወና ለ ከ 0 በላይ መሆን አለበት {0}
+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/accounts/doctype/account/account.py +170,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 ያቆዩት (ሸ)
 DocType: Program,Program Abbreviation,ፕሮግራም ምህፃረ ቃል
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,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: Appraisal,Start Date,ቀን ጀምር
@@ -3649,21 +3698,22 @@
 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,ክስ ይህ ንጥል ተገቢነት አይደለም ከሆነ ንጥል አስወግድ
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,ለምሳሌ. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +27,Transaction currency must be same as Payment Gateway currency,የግብይት ምንዛሬ ክፍያ ማስተናገጃ ምንዛሬ ጋር አንድ አይነት መሆን አለበት
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Transaction currency must be same as Payment Gateway currency,የግብይት ምንዛሬ ክፍያ ማስተናገጃ ምንዛሬ ጋር አንድ አይነት መሆን አለበት
 DocType: Payment Entry,Receive,ተቀበል
+apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,ጥቅሶች:
 DocType: Maintenance Visit,Fully Completed,ሙሉ በሙሉ ተጠናቅቋል
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% ተጠናቋል
 DocType: Employee,Educational Qualification,ተፈላጊ የትምህርት ደረጃ
 DocType: Workstation,Operating Costs,ማስኬጃ ወጪዎች
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,እርምጃ ወርኃዊ በጀት የታለፈው ሲጠራቀሙ ከሆነ
 DocType: Purchase Invoice,Submit on creation,ፍጥረት ላይ አስገባ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +432,Currency for {0} must be {1},የመገበያያ ገንዘብ {0} ይህ ሊሆን ግድ ነውና {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +435,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 +493,Row {0}: An Reorder entry already exists for this warehouse {1},ረድፍ {0}: አንድ አስይዝ ግቤት አስቀድመው የዚህ መጋዘን ለ አለ {1}
+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/crm/doctype/opportunity/opportunity.py +79,"Cannot declare as lost, because Quotation has been made.","ትዕምርተ ተደርጓል ምክንያቱም, እንደ የጠፋ ማወጅ አይቻልም."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,የግዢ መምህር አስተዳዳሪ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +429,Production Order {0} must be submitted,ትዕዛዝ {0} መቅረብ አለበት ፕሮዳክሽን
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +434,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,ቀን ወደ ቀን ጀምሮ በፊት መሆን አይችልም
@@ -3673,25 +3723,27 @@
 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 +181,Totals,ድምሮች
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,ድምሮች
 DocType: BOM,Manufacturing,ማኑፋክቸሪንግ
 ,Ordered Items To Be Delivered,የዕቃው ንጥሎች እስኪደርስ ድረስ
 DocType: Account,Income,ገቢ
 DocType: Industry Type,Industry Type,ኢንዱስትሪ አይነት
 apps/erpnext/erpnext/templates/includes/cart.js +141,Something went wrong!,የሆነ ስህተት ተከስቷል!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,Warning: Leave application contains following block dates,ማስጠንቀቂያ: ውጣ መተግበሪያ የሚከተለውን የማገጃ ቀናት ይዟል
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +120,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} ይህን ግብይት ለማጠናቀቅ ለ አሃዶች.
+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 +181,Organization unit (department) master.,የድርጅት ክፍል (ዲፓርትመንት) ጌታው.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,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 +793,All records are synced.,ሁሉም መዛግብት ይመሳሰላሉ.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +781,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,ደህንነቱ ያልተጠበቀ ብድሮች
 DocType: Cost Center,Cost Center Name,ኪሳራ ማዕከል ስም
@@ -3710,21 +3762,20 @@
 DocType: Address,Name of person or organization that this address belongs to.,ይህን አድራሻ ንብረት ሰው ወይም ድርጅት ስም.
 apps/erpnext/erpnext/public/js/setup_wizard.js +260,Your Suppliers,የእርስዎ አቅራቢዎች
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +49,Cannot set as Lost as Sales Order is made.,የሽያጭ ትዕዛዝ ነው እንደ የጠፋ እንደ ማዘጋጀት አልተቻለም.
-DocType: Student Applicant,Mother's Name,እናቴ ስም
 DocType: Request for Quotation Item,Supplier Part No,አቅራቢው ክፍል የለም
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +348,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',በምድብ «ግምቱ &#39;ወይም&#39; Vaulation እና ጠቅላላ &#39;ነው ጊዜ ቀነሰ አይቻልም
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Received From,ከ ተቀብሏል
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Received From,ከ ተቀብሏል
 DocType: Lead,Converted,የተቀየሩ
 DocType: Item,Has Serial No,ተከታታይ ምንም አለው
 DocType: Employee,Date of Issue,የተሰጠበት ቀን
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: ከ {0} ለ {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +153,Row #{0}: Set Supplier for item {1},የረድፍ # {0}: ንጥል አዘጋጅ አቅራቢው {1}
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +93,Row {0}: Hours value must be greater than zero.,ረድፍ {0}: ሰዓቶች ዋጋ ከዜሮ በላይ መሆን አለበት.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +117,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} ሊገኝ አልቻለም
 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 +172,{0} {1} does not exist,{0} {1} የለም
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +175,{0} {1} does not exist,{0} {1} የለም
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,Please check Multi Currency option to allow accounts with other currency,ሌሎች የምንዛሬ ጋር መለያዎች አትፍቀድ ወደ ባለብዙ የምንዛሬ አማራጭ ያረጋግጡ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +72,Item: {0} does not exist in the system,ንጥል: {0} ሥርዓት ውስጥ የለም
 apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,አንተ ቀጥ እሴት ለማዘጋጀት ፍቃድ አይደለም
@@ -3733,13 +3784,14 @@
 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/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,በስብሰባው ወደፊት ቀናት ምልክት ሊሆን አይችልም
 DocType: Pricing Rule,Pricing Rule Help,የዋጋ አሰጣጥ ደንብ እገዛ
 DocType: Purchase Taxes and Charges,Account Head,መለያ ኃላፊ
 apps/erpnext/erpnext/config/stock.py +163,Update additional costs to calculate landed cost of items,ንጥሎች አርፏል ወጪ ማስላት ተጨማሪ ወጪዎች ያዘምኑ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Electrical,ኤሌክትሪክ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Electrical,ኤሌክትሪክ
 DocType: Stock Entry,Total Value Difference (Out - In),ጠቅላላ ዋጋ ያለው ልዩነት (ውጭ - ውስጥ)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,Row {0}: Exchange Rate is mandatory,ረድፍ {0}: ምንዛሪ ተመን የግዴታ ነው
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},የተጠቃሚ መታወቂያ ሰራተኛ ለ ካልተዋቀረ {0}
@@ -3747,7 +3799,7 @@
 DocType: Item,Customer Code,የደንበኛ ኮድ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +210,Birthday Reminder for {0},ለ የልደት አስታዋሽ {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,የመጨረሻ ትዕዛዝ ጀምሮ ቀናት
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +292,Debit To account must be a Balance Sheet account,መለያ ወደ ዴቢት አንድ ሚዛን ሉህ መለያ መሆን አለበት
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To account must be a Balance Sheet account,መለያ ወደ ዴቢት አንድ ሚዛን ሉህ መለያ መሆን አለበት
 DocType: Buying Settings,Naming Series,መሰየምን ተከታታይ
 DocType: Leave Block List,Leave Block List Name,አግድ ዝርዝር ስም ውጣ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,የክምችት ንብረቶች
@@ -3759,11 +3811,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 +301,Salary Slip of employee {0} already created for time sheet {1},ሠራተኛ ደመወዝ ማዘዥ {0} አስቀድሞ ጊዜ ወረቀት የተፈጠሩ {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +313,Salary Slip of employee {0} already created for time sheet {1},ሠራተኛ ደመወዝ ማዘዥ {0} አስቀድሞ ጊዜ ወረቀት የተፈጠሩ {1}
 DocType: Sales Order Item,Ordered Qty,የዕቃው መረጃ ብዛት
-apps/erpnext/erpnext/stock/doctype/item/item.py +673,Item {0} is disabled,ንጥል {0} ተሰናክሏል
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} is disabled,ንጥል {0} ተሰናክሏል
 DocType: Stock Settings,Stock Frozen Upto,የክምችት Frozen እስከሁለት
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +838,BOM does not contain any stock item,BOM ማንኛውም የአክሲዮን ንጥል አልያዘም
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +809,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,ደመወዝ ቡቃያ አመንጭ
@@ -3771,23 +3823,24 @@
 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 +485,Row #{0}: Please set reorder quantity,የረድፍ # {0}: ዳግምስርዓትአስይዝ ብዛት ማዘጋጀት እባክዎ
+DocType: Sales Invoice Timesheet,Billing Hours,አከፋፈል ሰዓቶች
+apps/erpnext/erpnext/stock/doctype/item/item.py +487,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 +62,Please set {0},ማዘጋጀት እባክዎ {0}
 DocType: Purchase Invoice,Repeat on Day of Month,የወር ቀን ላይ ይድገሙ
 DocType: Employee,Health Details,የጤና ዝርዝሮች
 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,ከላይ የተመረጡ መስፈርት ሁሉ የደምወዝ አስገባ
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} ንጥሎች የተመሳሰለ
 DocType: Sales Order,Partly Delivered,በከፊል ደርሷል
-DocType: Sales Invoice,Existing Customer,አሁን ያለው የደንበኛ
 DocType: Email Digest,Receivables,ከማግኘት
+DocType: Lead Source,Lead Source,በእርሳስ ምንጭ
 DocType: Customer,Additional information regarding the customer.,ደንበኛው በተመለከተ ተጨማሪ መረጃ.
 DocType: Quality Inspection Reading,Reading 5,5 ማንበብ
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +38,Campaign Name is required,የዘመቻ ስም ያስፈልጋል
 DocType: Maintenance Visit,Maintenance Date,ጥገና ቀን
 DocType: Purchase Invoice Item,Rejected Serial No,ውድቅ ተከታታይ ምንም
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +80,Year start date or end date is overlapping with {0}. To avoid please set company,ዓመት መጀመሪያ ቀን ወይም የመጨረሻ ቀን {0} ጋር ተደራቢ ነው. ኩባንያ ለማዘጋጀት እባክዎ ለማስቀረት
@@ -3795,10 +3848,9 @@
 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 +129,BOM and Manufacturing Quantity are required,BOM እና ማኑፋክቸሪንግ ብዛት ያስፈልጋሉ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,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,ከፍተኛ ጥንካሬ
-DocType: Bank Reconciliation Detail,Amount,መጠን
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM ተተክቷል
 ,Sales Analytics,የሽያጭ ትንታኔ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +113,Available {0},ይገኛል {0}
@@ -3806,14 +3858,14 @@
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,ኢሜይል በማቀናበር ላይ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +96,Please enter default currency in Company Master,የኩባንያ መምህር ውስጥ ነባሪ ምንዛሬ ያስገቡ
 DocType: Stock Entry Detail,Stock Entry Detail,የክምችት Entry ዝርዝር
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +100,Daily Reminders,ዕለታዊ አስታዋሾች
+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/account/account_tree.js +23,New Account Name,አዲስ መለያ ስም
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,ጥሬ እቃዎች አቅርቦት ወጪ
 DocType: Selling Settings,Settings for Selling Module,ሞዱል መሸጥ ቅንብሮች
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Customer Service,የደንበኞች ግልጋሎት
+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/config/hr.py +50,Offer candidate a Job.,ቅናሽ እጩ አንድ ኢዮብ.
@@ -3822,8 +3874,9 @@
 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} ከአክሲዮን ንጥል መሆን አለበት
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,የሂደት መጋዘን ውስጥ ነባሪ ሥራ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1570,Total nos of serial no is not equal to quantity.,ተከታታይ ምንም አጠቃላይ ቁጥሮች ብዛት ጋር እኩል ነው ማለት አይደለም.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1594,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,አዘምን ተከታታይ ቁጥር
@@ -3831,9 +3884,10 @@
 DocType: Sales Order,Printing Details,ማተሚያ ዝርዝሮች
 DocType: Task,Closing Date,መዝጊያ ቀን
 DocType: Sales Order Item,Produced Quantity,ምርት ብዛት
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Engineer,መሀንዲስ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Engineer,መሀንዲስ
+DocType: Journal Entry,Total Amount Currency,ጠቅላላ መጠን ምንዛሬ
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,የፍለጋ ንዑስ ትላልቅ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Item Code required at Row No {0},ንጥል ኮድ ረድፍ ምንም ያስፈልጋል {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +398,Item Code required at Row No {0},ንጥል ኮድ ረድፍ ምንም ያስፈልጋል {0}
 DocType: Sales Partner,Partner Type,የአጋርነት አይነት
 DocType: Purchase Taxes and Charges,Actual,ትክክለኛ
 DocType: Authorization Rule,Customerwise Discount,Customerwise ቅናሽ
@@ -3849,16 +3903,18 @@
 DocType: BOM,Raw Material Cost,ጥሬ የቁሳዊ ወጪ
 DocType: Item Reorder,Re-Order Level,ዳግም-ትዕዛዝ ደረጃ
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,እርስዎ የምርት ትዕዛዞችን ማሳደግ ወይም ትንተና ጥሬ ዕቃዎች ማውረድ ይፈልጋሉ ለዚህም ንጥሎች እና የታቀዱ ብዛት ያስገቡ.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +55,Part-time,ትርፍ ጊዜ
+apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,Gantt ገበታ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,ትርፍ ጊዜ
 DocType: Employee,Applicable Holiday List,አግባብነት ያለው የበዓል ዝርዝር
 DocType: Employee,Cheque,ቼክ
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,ተከታታይ የዘመነ
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +57,Series Updated,ተከታታይ የዘመነ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,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 +87,Clearance Date updated,መልቀቂያ ቀን ዘምኗል
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,በተሳካ ሁኔታ የታረቀ
@@ -3872,7 +3928,7 @@
 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 +513,Posting date and posting time is mandatory,ቀን በመለጠፍ እና ሰዓት መለጠፍ ግዴታ ነው
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,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.,የ የግዢ ትዕዛዝ ማስቀመጥ አንዴ ቃላት ውስጥ የሚታይ ይሆናል.
@@ -3882,7 +3938,7 @@
 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/stock/doctype/stock_entry/stock_entry.py +158,Target warehouse in row {0} must be same as Production Order,{0} ረድፍ ላይ ዒላማ መጋዘን ምርት ትዕዛዝ አንድ አይነት መሆን አለበት
+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,የመገበያያ ገንዘብ አንዳንድ ሌሎች የምንዛሬ በመጠቀም ግቤቶች በማድረጉ በኋላ ሊቀየር አይችልም
 DocType: Company,Round Off Account,መለያ ጠፍቷል በዙሪያቸው
@@ -3891,23 +3947,22 @@
 DocType: Customer Group,Parent Customer Group,የወላጅ የደንበኞች ቡድን
 DocType: Purchase Invoice,Contact Email,የዕውቂያ ኢሜይል
 DocType: Appraisal Goal,Score Earned,የውጤት የተገኙ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Notice Period,ማስታወቂያ ክፍለ ጊዜ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,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 +4,New Sales Person Name,አዲስ የሽያጭ ሰው ስም
 DocType: Packing Slip,Gross Weight UOM,ጠቅላላ ክብደት UOM
-DocType: Email Digest,Receivables / Payables,ከማግኘት / Payables
 DocType: Delivery Note Item,Against Sales Invoice,የሽያጭ ደረሰኝ ላይ
 DocType: Bin,Reserved Qty for Production,ለምርት ብዛት የተያዘ
 DocType: Asset,Frequency of Depreciation (Months),የእርጅና ድግግሞሽ (ወራት)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +469,Credit Account,የብድር መለያ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Credit Account,የብድር መለያ
 DocType: Landed Cost Item,Landed Cost Item,አረፈ ወጪ ንጥል
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +55,Show zero values,ዜሮ እሴቶች አሳይ
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,ዜሮ እሴቶች አሳይ
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,ንጥል መጠን በጥሬ ዕቃዎች የተሰጠው መጠን ከ እየቀናነሱ / ማኑፋክቸሪንግ በኋላ አገኘሁ
 apps/erpnext/erpnext/public/js/setup_wizard.js +315,Setup a simple website for my organization,ማዋቀር የእኔ ድርጅት ለማግኘት ቀላል ድር ጣቢያ
 DocType: Payment Reconciliation,Receivable / Payable Account,የሚሰበሰብ / ሊከፈል መለያ
 DocType: Delivery Note Item,Against Sales Order Item,የሽያጭ ትዕዛዝ ንጥል ላይ
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Please specify Attribute Value for attribute {0},አይነታ እሴት የአይነት ይግለጹ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},አይነታ እሴት የአይነት ይግለጹ {0}
 DocType: Item,Default Warehouse,ነባሪ መጋዘን
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +39,Budget cannot be assigned against Group Account {0},በጀት ቡድን መለያ ላይ ሊመደብ አይችልም {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,ወላጅ የወጪ ማዕከል ያስገቡ
@@ -3929,19 +3984,22 @@
 DocType: Journal Entry,Total Debit,ጠቅላላ ዴቢት
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,ነባሪ ጨርሷል ዕቃዎች መጋዘን
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,የሽያጭ ሰው
-DocType: Sales Invoice,Cold Calling,ቀዝቃዛ ጥሪ
 DocType: SMS Parameter,SMS Parameter,ኤስ ኤም ኤስ ልኬት
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,በጀት እና ወጪ ማዕከል
 DocType: Maintenance Schedule Item,Half Yearly,ግማሽ ዓመታዊ
 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 +253,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 +141,Set as Lost,የጠፋ እንደ አዘጋጅ
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,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 +5,This is based on transactions against this Customer. See timeline below for details,ይሄ በዚህ የደንበኛ ላይ ግብይቶችን ላይ የተመሠረተ ነው. ዝርዝሮችን ለማግኘት ከታች ያለውን የጊዜ ይመልከቱ
 DocType: Supplier,Credit Days Based On,የብድር ቀኖች ላይ የተመሠረተ
@@ -3953,11 +4011,10 @@
 ,Items To Be Requested,ንጥሎች ተጠይቋል መሆን ወደ
 DocType: Purchase Order,Get Last Purchase Rate,የመጨረሻው ግዢ ተመን ያግኙ
 DocType: Company,Company Info,የኩባንያ መረጃ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +941,Select or add new customer,ይምረጡ ወይም አዲስ ደንበኛ ለማከል
+apps/erpnext/erpnext/accounts/page/pos/pos.js +930,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 +5,This is based on the attendance of this Employee,ይህ የዚህ ሰራተኛ መካከል በስብሰባው ላይ የተመሠረተ ነው
-DocType: Sales Invoice,Frequency,መደጋገም
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +463,Debit Account,ዴት መለያ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Debit Account,ዴት መለያ
 DocType: Fiscal Year,Year Start Date,ዓመት መጀመሪያ ቀን
 DocType: Attendance,Employee Name,የሰራተኛ ስም
 DocType: Sales Invoice,Rounded Total (Company Currency),የከበበ ጠቅላላ (የኩባንያ የምንዛሬ)
@@ -3966,27 +4023,27 @@
 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 +210,Supplier Quotation {0} created,አቅራቢው ትዕምርተ {0} ተፈጥሯል
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +208,Supplier Quotation {0} created,አቅራቢው ትዕምርተ {0} ተፈጥሯል
 apps/erpnext/erpnext/accounts/report/financial_statements.py +90,End Year cannot be before Start Year,የመጨረሻ ዓመት የጀመረበት ዓመት በፊት ሊሆን አይችልም
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Employee Benefits,የሰራተኛ ጥቅማ ጥቅም
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,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 +228,Please set a default Holiday List for Employee {0} or Company {1},የተቀጣሪ ነባሪ በዓል ዝርዝር ለማዘጋጀት እባክዎ {0} ወይም ኩባንያ {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +232,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 +499,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ረድፍ አይ {0}: መጠን የወጪ የይገባኛል ጥያቄ {1} ላይ የገንዘብ መጠን በመጠባበቅ በላይ ሊሆን አይችልም. በመጠባበቅ መጠን ነው {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +500,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ረድፍ አይ {0}: መጠን የወጪ የይገባኛል ጥያቄ {1} ላይ የገንዘብ መጠን በመጠባበቅ በላይ ሊሆን አይችልም. በመጠባበቅ መጠን ነው {2}
 DocType: Maintenance Schedule,Schedule,ፕሮግራም
 DocType: Account,Parent Account,የወላጅ መለያ
 DocType: Quality Inspection Reading,Reading 3,3 ማንበብ
 ,Hub,ማዕከል
 DocType: GL Entry,Voucher Type,የቫውቸር አይነት
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1007,Price List not found or disabled,የዋጋ ዝርዝር አልተገኘም ወይም ተሰናክሏል አይደለም
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1008,Price List not found or disabled,የዋጋ ዝርዝር አልተገኘም ወይም ተሰናክሏል አይደለም
 DocType: Expense Claim,Approved,ጸድቋል
 DocType: Pricing Rule,Price,ዋጋ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +244,Employee relieved on {0} must be set as 'Left',{0} መዘጋጀት አለበት ላይ እፎይታ ሠራተኛ &#39;ግራ&#39; እንደ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +256,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} በተሰጠው ቀን ክልል ውስጥ የሰራተኛ የተፈጠሩ
@@ -3997,12 +4054,12 @@
 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 +259,Please select Employee Record first.,በመጀመሪያ የተቀጣሪ ሪኮርድ ይምረጡ.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +266,Please select Employee Record first.,በመጀመሪያ የተቀጣሪ ሪኮርድ ይምረጡ.
 DocType: POS Profile,Account for Change Amount,ለውጥ መጠን መለያ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +190,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},ረድፍ {0}: ፓርቲ / መለያዎ ጋር አይመሳሰልም {1} / {2} ውስጥ {3} {4}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +235,Please enter Expense Account,የወጪ ሒሳብ ያስገቡ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,Please enter Expense Account,የወጪ ሒሳብ ያስገቡ
 DocType: Account,Stock,አክሲዮን
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,"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 +976,"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,የግዢ / ማምረት ዝርዝሮች
@@ -4017,9 +4074,10 @@
 DocType: Asset Movement,Transaction Date,የግብይት ቀን
 DocType: Production Plan Item,Planned Qty,የታቀደ ብዛት
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,ጠቅላላ ግብር
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,For Quantity (Manufactured Qty) is mandatory,ብዛት ለ (ብዛት የተመረተ) ግዴታ ነው
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,For Quantity (Manufactured Qty) is mandatory,ብዛት ለ (ብዛት የተመረተ) ግዴታ ነው
 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 +78,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,ትክክለኛው የማስጀመሪያ ቀን
@@ -4034,9 +4092,11 @@
 DocType: Warranty Claim,If different than customer address,የደንበኛ አድራሻ የተለየ ከሆነ
 DocType: BOM Operation,BOM Operation,BOM ኦፕሬሽን
 DocType: Purchase Taxes and Charges,On Previous Row Amount,ቀዳሚ ረድፍ መጠን ላይ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +226,Transfer Asset,አስተላልፍ ንብረት
+DocType: Student,Home Address,የቤት አድራሻ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +227,Transfer Asset,አስተላልፍ ንብረት
 DocType: POS Profile,POS Profile,POS መገለጫ
 apps/erpnext/erpnext/config/schools.py +33,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 +129,"Item {0} is a template, please select one of its variants","{0} ንጥል አብነት ነው, በውስጡ ከተለዋጮችዎ አንዱ ይምረጡ"
 DocType: Asset,Asset Category,የንብረት ምድብ
@@ -4046,8 +4106,8 @@
 DocType: Assessment,Room,ክፍል
 DocType: Purchase Order,Advance Paid,የቅድሚያ ክፍያ የሚከፈልበት
 DocType: Item,Item Tax,ንጥል ግብር
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +765,Material to Supplier,አቅራቢው ቁሳዊ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +189,Excise Invoice,ኤክሳይስ ደረሰኝ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,Material to Supplier,አቅራቢው ቁሳዊ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,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,የቅርብ ግዜ አዳ
@@ -4057,7 +4117,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,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 +136,Credit Card,የዱቤ ካርድ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,የዱቤ ካርድ
 DocType: BOM,Item to be manufactured or repacked,ንጥል የሚመረተው ወይም repacked ዘንድ
 apps/erpnext/erpnext/config/stock.py +174,Default settings for stock transactions.,የአክሲዮን ግብይቶች ነባሪ ቅንብሮች.
 DocType: Purchase Invoice,Next Date,ቀጣይ ቀን
@@ -4065,6 +4125,7 @@
 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: Academic Term,Term End Date,የሚለው ቃል መጨረሻ ቀን
 DocType: Hub Settings,Seller Name,የሻጭ ስም
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),ግብሮች እና ክፍያዎች ተቀናሽ (የኩባንያ የምንዛሬ)
 DocType: Item Group,General Settings,ጠቅላላ ቅንብሮች
@@ -4076,7 +4137,7 @@
 DocType: Customer,Commission Rate,ኮሚሽን ተመን
 apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,ተለዋጭ አድርግ
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,መምሪያ አግድ ፈቃድ መተግበሪያዎች.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +115,"Payment Type must be one of Receive, Pay and Internal Transfer","የክፍያ ዓይነት, ተቀበል አንዱ መሆን ይክፈሉ እና የውስጥ ትልልፍ አለበት"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +118,"Payment Type must be one of Receive, Pay and Internal Transfer","የክፍያ ዓይነት, ተቀበል አንዱ መሆን ይክፈሉ እና የውስጥ ትልልፍ አለበት"
 apps/erpnext/erpnext/config/selling.py +169,Analytics,ትንታኔ
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,ጋሪ ባዶ ነው
 DocType: Production Order,Actual Operating Cost,ትክክለኛ ማስኬጃ ወጪ
@@ -4091,10 +4152,10 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,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 +92,Designer,ዕቅድ ሠሪ
+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/accounts/doctype/purchase_invoice/purchase_invoice.py +469,Cost Center is required in row {0} in Taxes table for type {1},አይነት ወጪ ማዕከል ረድፍ ውስጥ ያስፈልጋል {0} ግብሮች ውስጥ ሰንጠረዥ {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +472,Cost Center is required in row {0} in Taxes table for type {1},አይነት ወጪ ማዕከል ረድፍ ውስጥ ያስፈልጋል {0} ግብሮች ውስጥ ሰንጠረዥ {1}
 DocType: Program,Program Code,ፕሮግራም ኮድ
 ,Item-wise Purchase Register,ንጥል-ጥበብ የግዢ ይመዝገቡ
 DocType: Batch,Expiry Date,የአገልግሎት ማብቂያ ጊዜ
@@ -4104,12 +4165,12 @@
 apps/erpnext/erpnext/config/projects.py +13,Project master.,ፕሮጀክት ዋና.
 apps/erpnext/erpnext/controllers/status_updater.py +174,"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 +417, (Half Day),(ግማሽ ቀን)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425, (Half Day),(ግማሽ ቀን)
 DocType: Supplier,Credit Days,የሥዕል ቀኖች
 DocType: Leave Type,Is Carry Forward,አስተላልፍ አኗኗራችሁ ነው
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +740,Get Items from BOM,BOM ከ ንጥሎች ያግኙ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +711,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 +549,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},የረድፍ # {0}: ቀን መለጠፍ የግዢ ቀን ጋር ተመሳሳይ መሆን አለበት {1} ንብረት {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +552,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,እርስ በርሳችሁ መጋዘን አንድ ንብረት ማስተላለፍ
diff --git a/erpnext/translations/ar.csv b/erpnext/translations/ar.csv
index 25eaaf4..b729792 100644
--- a/erpnext/translations/ar.csv
+++ b/erpnext/translations/ar.csv
@@ -18,11 +18,10 @@
 DocType: Sales Partner,Dealer,تاجر
 DocType: Employee,Rented,مؤجر
 DocType: Purchase Order,PO-,PO-
-apps/erpnext/erpnext/accounts/report/financial_statements.py +19,Start Year {0} not found.,بدء السنة {0} غير موجود.
 DocType: POS Profile,Applicable for User,ينطبق على العضو
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +191,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",لا يمكن إلغاء توقفت أمر الإنتاج، نزع السدادة لأول مرة إلغاء
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +197,Do you really want to scrap this asset?,هل تريد حقا أن التخلي عن هذه الأصول؟
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +17,Select Default Supplier,حدد الافتراضي مزود
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +192,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",لا يمكن إلغاء توقفت أمر الإنتاج، نزع السدادة لأول مرة إلغاء
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +198,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 +36,Currency is required for Price List {0},مطلوب العملة لقائمة الأسعار {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* سيتم احتسابه في المعاملة.
 DocType: Address,County,مقاطعة
@@ -42,46 +41,45 @@
 DocType: Sales Invoice,Customer Name,اسم العميل
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +126,Bank account cannot be named as {0},لا يمكن تسمية الحساب مصرفي ب {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,رؤساء (أو مجموعات) التي تتم ضد القيود المحاسبية ويتم الاحتفاظ التوازنات.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +180,Outstanding for {0} cannot be less than zero ({1}),غير المسددة ل {0} لا يمكن أن يكون أقل من الصفر ( {1} )
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,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 +148,Series Updated Successfully,تم تحديث الترقيم المتسلسل بنجاح
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +149,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,بيانات اتصال جميع الموردين
-DocType: Quality Inspection Reading,Parameter,المعلمة
 apps/erpnext/erpnext/projects/doctype/project/project.py +54,Expected End Date can not be less than Expected Start Date,يتوقع نهاية التاريخ لا يمكن أن يكون أقل من تاريخ بدء المتوقعة
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,الصف # {0}: تقييم يجب أن يكون نفس {1} {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +239,New Leave Application,إجازة جديدة التطبيق
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,New Leave Application,إجازة جديدة التطبيق
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +20,Attendance Record {0} exists against Student {1} for Course Schedule {2},سجل الحضور {0} موجود ضد الطلاب {1} لجدول دورة {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Bank Draft,مسودة بنك
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,مسودة بنك
 DocType: Mode of Payment Account,Mode of Payment Account,طريقة حساب الدفع
 apps/erpnext/erpnext/stock/doctype/item/item.js +52,Show Variants,اظهار المتغيرات
 DocType: Academic Term,Academic Term,الفصل الدراسي
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +13,Material,مادة
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Quantity,كمية
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +511,Accounts table cannot be blank.,جدول الحسابات لا يمكن أن يكون فارغا.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +616,Quantity,كمية
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +512,Accounts table cannot be blank.,جدول الحسابات لا يمكن أن يكون فارغا.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,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/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 +142,User {0} is already assigned to Employee {1},المستخدم {0} تم تعيينه بالفعل إلى موظف {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,الرعاية الصحية
-DocType: Purchase Invoice,Monthly,شهريا
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),التأخير في الدفع (أيام)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +771,Invoice,فاتورة
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +750,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 +198,Row {0}: {1} {2} does not match with {3},صف {0} {1} {2} لا يتطابق مع {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,الصف # {0}
+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 +127,Please select Price List,الرجاء اختيار قائمة الأسعار
@@ -112,8 +110,8 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,يتم إدخال نفس الشركة أكثر من مرة
 DocType: Employee,Married,متزوج
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},لا يجوز لل{0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +589,Get items from,الحصول على البنود من
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +382,Stock cannot be updated against Delivery Note {0},لا يمكن تحديث المخزون ضد تسليم مذكرة {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,الحصول على البنود من
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,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,بقالة
@@ -122,7 +120,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 +156,Salary Structure Missing,راتب هيكل المفقودين
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Salary Structure Missing,راتب هيكل المفقودين
 DocType: Lead,Person Name,اسم الشخص
 DocType: Sales Invoice Item,Sales Invoice Item,فاتورة مبيعات السلعة
 DocType: Account,Credit,ائتمان
@@ -130,31 +128,31 @@
 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 +156,Credit limit has been crossed for customer {0} {1}/{2},وقد عبرت الحد الائتماني للعميل {0} {1} / {2}
-apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""هل الأصول ثابتة"" لا يمكن إزالة اختياره, لأن سجل الأصول  موجود ضد هذا البند"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +189,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","""هل الأصول ثابتة"" لا يمكن إزالة اختياره, لأن سجل الأصول  موجود ضد هذا البند"
 DocType: Tax Rule,Tax Type,نوع الضريبة
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +144,You are not authorized to add or update entries before {0},غير مصرح لك لإضافة أو تحديث الإدخالات قبل {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},غير مصرح لك لإضافة أو تحديث الإدخالات قبل {0}
 DocType: Item,Item Image (if not slideshow),صورة البند (إن لم يكن عرض الشرائح)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,موجود على العملاء مع نفس الاسم
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(سعر الساعة / 60) * وقت العمل الفعلي
-DocType: SMS Log,SMS Log,SMS سجل
+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 +165,Opening,افتتاح
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,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/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,العملاء&gt; مجموعة العملاء&gt; الأراضي
 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.,لا يمكن تحويل حساب جرت عليه أي عملية إلى مجموعة.
-DocType: Lead,Product Enquiry,المنتج استفسار
+DocType: Lead,Product Enquiry,الإستفسار عن المنتج
 DocType: Academic Term,Schools,المدارس
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,يرجى إدخال الشركة الأولى
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Company first,يرجى تحديد الشركة أولا
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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,التكلفة الكلية لل
@@ -164,7 +162,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,كشف حساب
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,الصيدلة
 DocType: Purchase Invoice Item,Is Fixed Asset,هو الأصول الثابتة
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Available qty is {0}, you need {1}",الكمية المتوفرة {0}، تحتاج {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +225,"Available qty is {0}, you need {1}",الكمية المتوفرة {0}، تحتاج {1}
 DocType: Expense Claim Detail,Claim Amount,المطالبة المبلغ
 DocType: Employee,Mr,السيد
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,المورد نوع / المورد
@@ -173,49 +171,50 @@
 DocType: Employee,B-,ب-
 DocType: Upload Attendance,Import Log,استيراد دخول
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,سحب المواد طلب من نوع صناعة بناء على المعايير المذكورة أعلاه
+DocType: Assessment Result,Grade,درجة
 DocType: Sales Invoice Item,Delivered By Supplier,سلمت من قبل مزود
 DocType: SMS Center,All Contact,جميع الاتصالات
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Annual Salary,الراتب السنوي
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,مصاريف المخزون
-apps/erpnext/erpnext/accounts/report/financial_statements.py +22,End Year {0} not found.,نهاية السنة {0} غير موجود.
 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}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,توريد مواد خام للشراء
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +130,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 +451,Item {0} is not active or end of life has been reached,البند {0} غير نشط أو تم التوصل إلى نهاية الحياة
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +456,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/controllers/accounts_controller.py +614,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",ل تشمل الضريبة في الصف {0} في معدل الإغلاق ، {1} ويجب أيضا تضمين الضرائب في الصفوف
+apps/erpnext/erpnext/controllers/accounts_controller.py +617,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",ل تشمل الضريبة في الصف {0} في معدل الإغلاق ، {1} ويجب أيضا تضمين الضرائب في الصفوف
 apps/erpnext/erpnext/config/hr.py +166,Settings for HR Module,إعدادات وحدة الموارد البشرية
-DocType: SMS Center,SMS Center,SMS مركز
+DocType: SMS Center,SMS Center,مركز رسائل SMS
 DocType: Sales Invoice,Change Amount,تغيير المبلغ
 DocType: BOM Replace Tool,New BOM,BOM جديدة
 DocType: Timesheet,Batch Time Logs for billing.,دفعة سجلات الوقت لإعداد الفواتير.
 DocType: Depreciation Schedule,Make Depreciation Entry,انشئ مدخل استهلاك
-DocType: Appraisal Template Goal,KRA,كرا
+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 +147,Execution,إعدام
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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,البنود والتسعير
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},مجموع الساعات: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},من التسجيل ينبغي أن يكون ضمن السنة المالية. على افتراض من التسجيل = {0}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,Cost Center {0} does not belong to Company {1},مركز تكلف {0} لا تنتمي إلى شركة {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +100,Cost Center {0} does not belong to Company {1},مركز تكلف {0} لا تنتمي إلى شركة {1}
 DocType: Customer,Individual,فرد
 DocType: Interest,Academics User,المستخدمين الأكادميين
 DocType: Cheque Print Template,Amount In Figure,المبلغ في الشكل
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,خطة للزيارات الصيانة.
-DocType: SMS Settings,Enter url parameter for message,أدخل عنوان URL لمعلمة رسالة
+DocType: SMS Settings,Enter url parameter for message,ادخل معمل العنوان للرسالة
 DocType: Program Enrollment Tool,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,يجب أن تكون قائمة الأسعار المعمول بها لشراء أو بيع
@@ -226,30 +225,32 @@
 DocType: Production Planning Tool,Sales Orders,أوامر البيع
 DocType: Purchase Taxes and Charges,Valuation,تقييم
 ,Purchase Order Trends,شراء اتجاهات ترتيب
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,The request for quotation can be accessed by clicking on the following link,طلب للحصول على الاقتباس يمكن الوصول إليها من خلال النقر على الرابط التالي
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,تخصيص الاجازات لهذا العام.
 DocType: SG Creation Tool Course,SG Creation Tool Course,سان جرمان إنشاء ملعب أداة
 DocType: Student Group Creation Tool,Leave blank if you wish to fetch all courses for selected academic term,ترك فارغا إذا كنت ترغب في جلب جميع دورات لالفصل الدراسي المحدد
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,Insufficient Stock,المالية غير كافية
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227,Insufficient Stock,المالية غير كافية
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,تعطيل تخطيط القدرات وتتبع الوقت
+DocType: Email Digest,New Sales Orders,أوامر المبيعات الجديدة
 DocType: Bank Reconciliation,Bank Account,الحساب المصرفي
 DocType: Leave Type,Allow Negative Balance,السماح بالرصيد السلبي
 DocType: Selling Settings,Default Territory,الإقليم الافتراضي
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,تلفزيون
 DocType: Production Order Operation,Updated via 'Time Log',"تحديث عبر 'وقت دخول """
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} does not belong to Company {1},الحساب {0} لا ينتمي إلى شركة {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +86,Account {0} does not belong to Company {1},الحساب {0} لا ينتمي إلى شركة {1}
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},الدفعة المقدمة لا يمكن أن تكون أكبر من {0} {1}
 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 +174,For Warehouse is required before Submit,ل مطلوب في معرض النماذج ثلاثية قبل إرسال
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,For Warehouse is required before Submit,ل مطلوب في معرض النماذج ثلاثية قبل إرسال
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,تلقى على
 DocType: Sales Partner,Reseller,بائع التجزئة
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,يرجى إدخال الشركة
 DocType: Delivery Note Item,Against Sales Invoice Item,مقابل فاتورة المبيعات
 ,Production Orders in Progress,أوامر الإنتاج في التقدم
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Cash from Financing,صافي النقد من التمويل
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1436,"LocalStorage is full , did not save",التخزين المحلي كامل، لم ينقذ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1460,"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}
@@ -262,18 +263,19 @@
 apps/erpnext/erpnext/templates/generators/item.html +78,No description given,لا يوجد وصف معين
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,طلب للشراء.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +5,This is based on the Time Sheets created against this project,ويستند هذا على جداول زمنية خلق ضد هذا المشروع
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Only the selected Leave Approver can submit this Leave Application,و اترك الموافق المحددة فقط يمكن أن يقدم هذا التطبيق اترك
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +213,Only the selected Leave Approver can submit this Leave Application,و اترك الموافق المحددة فقط يمكن أن يقدم هذا التطبيق اترك
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,تخفيف التسجيل يجب أن يكون أكبر من تاريخ الالتحاق بالعمل
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Leaves per Year,يترك في السنة
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,يترك في السنة
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"صف {0}: يرجى التحقق ""هل المسبق ضد حساب {1} إذا كان هذا هو إدخال مسبق."
 apps/erpnext/erpnext/stock/utils.py +188,Warehouse {0} does not belong to company {1},مستودع {0} لا تنتمي إلى شركة {1}
+DocType: Email Digest,Profit & Loss,خسارة الأرباح
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,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 +435,Leave Blocked,ترك الممنوع
-apps/erpnext/erpnext/stock/doctype/item/item.py +669,Item {0} has reached its end of life on {1},البند {0} قد بلغ نهايته من الحياة على {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +443,Leave Blocked,ترك الممنوع
+apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item {0} has reached its end of life on {1},البند {0} قد بلغ نهايته من الحياة على {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +95,Bank Entries,مدخلات البنك
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +83,Annual,سنوي
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +86,Annual,سنوي
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,جرد عناصر المخزون
 DocType: Stock Entry,Sales Invoice No,فاتورة مبيعات لا
 DocType: Material Request Item,Min Order Qty,الحد الأدنى من ترتيب الكمية
@@ -281,24 +283,26 @@
 DocType: Lead,Do Not Contact,عدم الاتصال
 apps/erpnext/erpnext/public/js/setup_wizard.js +360,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 +91,Software Developer,البرنامج المطور
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,البرنامج المطور
 DocType: Item,Minimum Order Qty,الحد الأدنى لطلب الكمية
 DocType: Pricing Rule,Supplier Type,المورد نوع
 DocType: Scheduling Tool,Course Start Date,بالطبع تاريخ بدء
 DocType: Item,Publish in Hub,نشر في المحور
+DocType: Student Admission,Student Admission,قبول الطلاب
 ,Terretory,إقليم
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is cancelled,البند {0} تم إلغاء
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Material Request,طلب المواد
+apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} is cancelled,البند {0} تم إلغاء
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +823,Material Request,طلب المواد
 DocType: Bank Reconciliation,Update Clearance Date,تحديث تاريخ التخليص
 apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +28,Abbreviation already used for another salary component,اختصار استخدمت بالفعل لمكون راتب آخر
 DocType: Item,Purchase Details,تفاصيل شراء
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +328,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},البند {0} غير موجودة في &quot;المواد الخام الموردة&quot; الجدول في أمر الشراء {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +333,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/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: 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.,تعيين مجموعة من الحكمة الإغلاق الميزانيات على هذا الإقليم. يمكنك أيضا تضمين الموسمية عن طريق تعيين التوزيع.
@@ -310,20 +314,21 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +130,Please select Charge Type first,الرجاء اختيار نوع التهمة الأولى
 DocType: Student Group Student,Student Group Student,مجموعة طالب طالب
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,آخر
+DocType: Email Digest,New Quotations,تسعيرات جديدة
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,سيتم تعيين أول اترك الموافق في القائمة بوصفها الإجازة الموافق الافتراضي
 DocType: Tax Rule,Shipping County,مقاطعة البريدية
 apps/erpnext/erpnext/config/desktop.py +158,Learn,تعلم
 DocType: Asset,Next Depreciation Date,الاستهلاك المقبل التاريخ
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,النشاط التكلفة لكل موظف
 DocType: Accounts Settings,Settings for Accounts,إعدادات الحسابات
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +626,Supplier Invoice No exists in Purchase Invoice {0},المورد فاتورة لا يوجد في شراء الفاتورة {0}
-apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,إدارة المبيعات الشخص شجرة .
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +629,Supplier Invoice No exists in Purchase Invoice {0},المورد فاتورة لا يوجد في شراء الفاتورة {0}
+apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,ادارة شجرة رجل المبيعات
 DocType: Job Applicant,Cover Letter,غطاء الرسالة
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,الشيكات المعلقة والودائع لمسح
 DocType: Item,Synced With Hub,مزامن مع المحور
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,كلمة مرور خاطئة
 DocType: Item,Variant Of,البديل من
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,Completed Qty can not be greater than 'Qty to Manufacture',"الكمية المنتهية لا يمكن أن تكون أكبر من ""كمية لتصنيع"""
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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 +86,Circular Reference Error,خطأ مرجع دائري
@@ -335,15 +340,16 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,إبلاغ عن طريق البريد الإلكتروني على خلق مادة التلقائي طلب
 DocType: Journal Entry,Multi Currency,متعدد العملات
 DocType: Payment Reconciliation Invoice,Invoice Type,نوع الفاتورة
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +806,Delivery Note,ملاحظة التسليم
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +800,Delivery Note,ملاحظة التسليم
 apps/erpnext/erpnext/config/learn.py +87,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 +233,Payment Entry has been modified after you pulled it. Please pull it again.,لقد تم تعديل دفع الدخول بعد سحبها. يرجى تسحبه مرة أخرى.
+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/setup/doctype/email_digest/email_digest.py +104,Summary for this week and pending activities,ملخص لهذا الأسبوع والأنشطة المعلقة
+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",أدخل البريد الإلكتروني معرف مفصولة بفواصل، سوف ترسل الفاتورة تلقائيا على تاريخ معين
 DocType: Employee,Company Email,شركة البريد الإلكتروني
@@ -351,32 +357,33 @@
 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/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,إجمالي الطلب يعتبر
+apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,إجمالي الطلب المعتبر
 apps/erpnext/erpnext/config/hr.py +186,"Employee designation (e.g. CEO, Director etc.).",تعيين موظف (مثل الرئيس التنفيذي ، مدير الخ ) .
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,"الرجاء إدخال ' كرر في يوم من الشهر "" قيمة الحقل"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,المعدل الذي يتم تحويل العملة إلى عملة الأساس العملاء العميل
-apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},الصف # {0}: لا يمكن أن يتم شراء فاتورة مقابل الأصول الموجودة {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +554,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},الصف # {0}: لا يمكن أن يتم شراء فاتورة مقابل الأصول الموجودة {1}
 DocType: Item Tax,Tax Rate,ضريبة
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} مخصصة أصلا للموظف {1} للفترة من {2} إلى {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +812,Select Item,اختر البند
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +791,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/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,شراء الفاتورة {0} يقدم بالفعل
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},الصف # {0}: لا دفعة ويجب أن يكون نفس {1} {2}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +143,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.,رقم المجموعة للصنف
 DocType: C-Form Invoice Detail,Invoice Date,تاريخ الفاتورة
 DocType: GL Entry,Debit Amount,قيمة الخصم
 apps/erpnext/erpnext/accounts/party.py +242,There can only be 1 Account per Company in {0} {1},يمكن أن يكون هناك سوى 1 في حساب الشركة في {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +4,Your email address,عنوان البريد الإلكتروني الخاص بك
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +342,Please see attachment,يرجى الاطلاع على المرفقات
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,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 +19,Setup Already Complete!!,الإعداد الكامل بالفعل !
 ,Finished Goods,السلع تامة الصنع
 DocType: Delivery Note,Instructions,تعليمات
 DocType: Quality Inspection,Inspected By,تفتيش من قبل
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,المورد&gt; نوع المورد
 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,إضافة عناصر
@@ -390,29 +397,29 @@
 DocType: Currency Exchange,Currency Exchange,تحويل العملات
 DocType: Purchase Invoice Item,Item Name,أسم البند
 DocType: Authorization Rule,Approving User  (above authorized value),المستخدم المعتمد (أعلى من القيمة المسموح بها)
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,ميزان الائتمان
+DocType: Email Digest,Credit Balance,الرصيد الدائن
 DocType: Employee,Widowed,ارمل
 DocType: Request for Quotation,Request for Quotation,طلب للحصول على الاقتباس
 DocType: Salary Slip Timesheet,Working Hours,ساعات العمل
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,تغيير رقم تسلسل بدء / الحالي من سلسلة الموجودة.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.",إذا استمرت قواعد التسعير متعددة أن تسود، يطلب من المستخدمين تعيين الأولوية يدويا لحل الصراع.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +736,Purchase Return,شراء العودة
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +715,Purchase Return,شراء العودة
 ,Purchase Register,سجل شراء
 DocType: Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,الرسوم المطبقة
 DocType: Workstation,Consumable Cost,التكلفة الاستهلاكية
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +202,{0} ({1}) must have role 'Leave Approver',{0} ({1})يجب أن يمتلك صلاحية (إعتماد الإجازات)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,{0} ({1}) must have role 'Leave Approver',{0} ({1})يجب أن يمتلك صلاحية (إعتماد الإجازات)
 DocType: Purchase Receipt,Vehicle Date,مركبة التسجيل
 DocType: Student Log,Medical,طبي
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,السبب لفقدان
-apps/erpnext/erpnext/accounts/utils.py +239,Allocated amount can not greater than unadjusted amount,المبلغ المخصص لا يمكن أكبر من القيمة غير المعدلة
+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,المبلغ المخصص لا يمكن أكبر من القيمة غير المعدلة
 DocType: Announcement,Receiver,المتلقي
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},مغلق محطة العمل في التواريخ التالية وفقا لقائمة عطلة: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,الفرص
 DocType: Employee,Single,وحيد
 DocType: Account,Cost of Goods Sold,تكلفة السلع المباعة
 DocType: Purchase Invoice,Yearly,سنويا
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +225,Please enter Cost Center,الرجاء إدخال مركز التكلفة
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,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,اسم الفاحص
@@ -425,26 +432,26 @@
 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,الاختيار فاتورة المورد عدد تفرد
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','الى الحالة  رقم' لا يمكن أن يكون أقل من 'من الحالة رقم'
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,Non Profit,غير ربحي
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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: Stock Reconciliation Item,Do not include symbols (ex. $),لا تتضمن رموزا (على سبيل المثال. $)
 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 +638,Attribute {0} selected multiple times in Attributes Table,السمة {0} اختيار عدة مرات في سمات الجدول
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,السمة {0} اختيار عدة مرات في سمات الجدول
 DocType: HR Settings,Employee record is created using selected field. ,يتم إنشاء سجل الموظف باستخدام الحقل المحدد.
 DocType: Sales Order,Not Applicable,لا ينطبق
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,عطلة الرئيسي.
 DocType: Request for Quotation Item,Required Date,تاريخ المطلوبة
 DocType: Delivery Note,Billing Address,عنوان الفواتير
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +862,Please enter Item Code.,الرجاء إدخال رمز المدينة .
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +847,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",إذا كانت محددة، سيتم النظر في مقدار ضريبة كمدرجة بالفعل في قيم الطباعة / مقدار الطباعة
@@ -458,12 +465,12 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,الأوراق المالية و الودائع
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,مجموع الأوراق المخصصة إلزامية
 DocType: Job Opening,Description of a Job Opening,وصف لافتتاح الوظيفة
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Pending activities for today,الأنشطة في انتظار لهذا اليوم
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,الأنشطة في انتظار لهذا اليوم
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,سجل الحضور.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,مكون الرواتب لكشف المرتبات على أساس الجدول الزمني.
 DocType: Sales Order Item,Used for Production Plan,تستخدم لخطة الإنتاج
 DocType: Manufacturing Settings,Time Between Operations (in mins),الوقت بين العمليات (في دقيقة)
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +92,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} الميزانية لحساب {1} ضد مركز التكلفة {2} غير {3}. وسوف يتجاوز بواسطة {4}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +95,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} الميزانية لحساب {1} ضد مركز التكلفة {2} غير {3}. وسوف يتجاوز بواسطة {4}
 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 المختارة ليست لنفس البند
@@ -471,16 +478,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +238,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 +86,Administrative Officer,موظف إداري
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,موظف إداري
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +23,Acutal Qty {0} / Waiting Qty {1},الكمية الفعلية {0} \ الكمية المنتظرة {1}
 DocType: Timesheet Detail,Hrs,ساعة
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +319,Please select Company,يرجى تحديد الشركة
-DocType: Stock Entry,Difference Account,حساب الفرق
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +309,Please select Company,يرجى تحديد الشركة
+DocType: Stock Entry Detail,Difference Account,حساب الفرق
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,لا يمكن عمل أقرب لم يتم إغلاق المهمة التابعة لها {0}.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Please enter Warehouse for which Material Request will be raised,من فضلك ادخل مستودع لل والتي سيتم رفع طلب المواد
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +399,Please enter Warehouse for which Material Request will be raised,من فضلك ادخل مستودع لل والتي سيتم رفع طلب المواد
 DocType: Production Order,Additional Operating Cost,تكاليف تشغيل  اضافية
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,مستحضرات التجميل
-apps/erpnext/erpnext/stock/doctype/item/item.py +530,"To merge, following properties must be same for both items",لدمج ، يجب أن يكون نفس الخصائص التالية ل كلا البندين
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,"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 +28,Buy,يشترى
@@ -488,7 +495,7 @@
 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 +1563,Serial no item cannot be a fraction,المسلسل أي بند لا يمكن أن يكون جزء
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1587,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,إدارة التعاقد من الباطن
@@ -497,13 +504,14 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Account {0} does not belong to company: {1},الحساب {0} لا ينتمي للشركة: {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation already used for another company,هذا الاختصار تم استخدامه بالفعل لشركة أخرى
 DocType: Selling Settings,Default Customer Group,المجموعة الافتراضية العملاء
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Supplier is required against Payable account {0},مطلوب المورد ضد حسابات المدفوعات {0}
 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
 DocType: Production Planning Tool,Material Requirement,متطلبات المواد
 DocType: Company,Delete Company Transactions,حذف المعاملات الشركة
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +313,Reference No and Reference Date is mandatory for Bank transaction,إشارة لا ومرجعية التسجيل إلزامي لالمعاملات المصرفية
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +316,Reference No and Reference Date is mandatory for Bank transaction,إشارة لا ومرجعية التسجيل إلزامي لالمعاملات المصرفية
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,إضافة / تعديل الضرائب والرسوم
 DocType: Purchase Invoice,Supplier Invoice No,رقم فاتورة المورد
 DocType: Territory,For reference,للرجوع إليها
@@ -512,10 +520,9 @@
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +104,Move Item,نقل العنصر
 DocType: Serial No,Warranty Period (Days),فترة الضمان (أيام)
 DocType: Installation Note Item,Installation Note Item,ملاحظة تثبيت الإغلاق
-DocType: Production Plan Item,Pending Qty,في انتظار الكمية
+DocType: Production Plan Item,Pending Qty,الكمية التي قيد الانتظار
 DocType: Budget,Ignore,تجاهل
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,البند الرمز&gt; البند المجموعة&gt; العلامة التجارية
-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 +86,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,المورد مستودع إلزامية ل إيصال الشراء التعاقد من الباطن
@@ -525,11 +532,11 @@
 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/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,لا توجد في جدول الفاتورة السجلات
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +28,Please select Company and Party Type first,يرجى تحديد الشركة وحزب النوع الأول
+apps/erpnext/erpnext/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/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 +707,Make Sales Order,أنشئ طلب بيع
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +701,Make Sales Order,أنشئ طلب بيع
 DocType: Project Task,Project Task,عمل مشروع
 ,Lead Id,معرف مبادرة البيع
 DocType: C-Form Invoice Detail,Grand Total,المجموع الإجمالي
@@ -545,38 +552,39 @@
 DocType: Job Applicant,Resume Attachment,السيرة الذاتية مرفق
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,العملاء المكررين
 DocType: Leave Control Panel,Allocate,تخصيص
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +734,Sales Return,مبيعات المعاده
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +728,Sales Return,مبيعات المعاده
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +91,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,ملاحظة: مجموع الأوراق المخصصة {0} لا ينبغي أن يكون أقل من الأوراق وافق بالفعل {1} للفترة
 DocType: Announcement,Posted By,منشور من طرف
 DocType: Item,Delivered by Supplier (Drop Ship),سلمت من قبل مزود (هبوط السفينة)
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,قاعدة بيانات من العملاء المحتملين.
 DocType: Authorization Rule,Customer or Item,العملاء أو البند
 apps/erpnext/erpnext/config/selling.py +28,Customer database.,قاعدة البيانات الزبائن
 DocType: Quotation,Quotation To,تسعيرة إلى
-DocType: Lead,Middle Income,المتوسطة الدخل
+DocType: Lead,Middle Income,الدخل المتوسط
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +212,Opening (Cr),افتتاح (الكروم )
-apps/erpnext/erpnext/stock/doctype/item/item.py +795,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,وحدة القياس الافتراضية للالبند {0} لا يمكن تغيير مباشرة لأنك قدمت بالفعل بعض المعاملات (s) مع UOM آخر. سوف تحتاج إلى إنشاء عنصر جديد لاستخدام افتراضي مختلف UOM.
-apps/erpnext/erpnext/accounts/utils.py +237,Allocated amount can not be negative,المبلغ المخصص لا يمكن أن تكون سلبية
+apps/erpnext/erpnext/stock/doctype/item/item.py +797,Default Unit of Measure for Item {0} cannot be changed directly because 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,المبلغ المخصص لا يمكن أن تكون سلبية
 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 +91,Reference No & Reference Date is required for {0},مطلوب المرجعية لا والمراجع التسجيل لل {0}
-DocType: Sales Invoice,Customer's Vendor,بائع العملاء
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Proposal Writing,الكتابة الاقتراح
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,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,البيانات الرئيسية
 apps/erpnext/erpnext/config/accounts.py +140,Update Bank Transaction Dates,تواريخ عملية البنك التحديث
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,تتبع الوقت
 DocType: Fiscal Year Company,Fiscal Year Company,الشركة السنة المالية
 DocType: Packing Slip Item,DN Detail,DN التفاصيل
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +257,Already supplier quotation has created,إذا كنت قد خلقت المورد الاقتباس
 DocType: Timesheet,Billed,توصف
 DocType: Batch,Batch Description,دفعة الوصف
+apps/erpnext/erpnext/accounts/utils.py +685,"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 +733,View Offline Records,مشاهدة غير متصل السجلات
+apps/erpnext/erpnext/accounts/page/pos/pos.js +715,View Offline Records,مشاهدة غير متصل السجلات
+DocType: Student,Sibling Details,تفاصيل الأخوة
 DocType: Employee,Reason for Resignation,سبب الاستقالة
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,قالب لتقييم الأداء.
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,فاتورة / مجلة تفاصيل الدخول
@@ -590,19 +598,20 @@
 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,صافي التغير في المخزون
 DocType: Employee,Passport Number,رقم جواز السفر
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Manager,مدير
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,مدير
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,Same item has been entered multiple times.,تم إدخال البند نفسه عدة مرات.
-DocType: SMS Settings,Receiver Parameter,استقبال معلمة
+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-,في-
 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 +299,Timesheet created:,الجدول الزمني الانشاء:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +715,Please set default Cash or Bank account in Mode of Payment {0},الرجاء تعيين النقدية الافتراضي أو حساب مصرفي في طريقة الدفع {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +300,Timesheet created:,الجدول الزمني الانشاء:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +772,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,تسجل
 DocType: Selling Settings,Customer Naming By,تسمية العملاء بواسطة
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,يرجى إعداد الموظف تسمية النظام في الموارد البشرية&gt; إعدادات الموارد البشرية
 DocType: Depreciation Schedule,Depreciation Amount,انخفاض قيمة المبلغ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,تحويل إلى المجموعة
 DocType: Activity Cost,Activity Type,نوع النشاط
@@ -627,6 +636,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,نهاية
 DocType: Pricing Rule,Sales Manager,مدير المبيعات
 DocType: Salary Structure Employee,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,حساب الربح / الخسارة على التخلص من الأصول
@@ -641,11 +651,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +9,Pre Sales,قبل المبيعات
 DocType: Purchase Receipt,Other Details,تفاصيل أخرى
 DocType: Account,Accounts,حسابات
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Marketing,تسويق
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +227,Payment Entry is already created,يتم إنشاء دفع الاشتراك بالفعل
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,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 +538,Row #{0}: Asset {1} does not linked to Item {2},الصف # {0}: الأصول {1} لا ترتبط البند {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +21,Preview Salary Slip,معاينة زلة الراتب
+apps/erpnext/erpnext/controllers/accounts_controller.py +541,Row #{0}: Asset {1} does not linked to Item {2},الصف # {0}: الأصول {1} لا ترتبط البند {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +38,Preview Salary Slip,معاينة زلة الراتب
 DocType: Company,Deafult Cost Center,مركز التكلفة Deafult
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +48,Account {0} has been entered multiple times,الحساب {0} تم إدخاله عدة مرات
 DocType: Account,Expenses Included In Valuation,النفقات المشملة في التقييم
@@ -654,7 +664,7 @@
 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 +617,Item has variants.,البند لديه المتغيرات.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,البند لديه المتغيرات.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,البند {0} لم يتم العثور على
 DocType: Bin,Stock Value,قيمة المخزون
 apps/erpnext/erpnext/accounts/doctype/account/account.py +25,Company {0} does not exist,لا توجد شركة {0}
@@ -665,7 +675,7 @@
 DocType: Sales Invoice,Commission Rate (%),نسبة العمولة (٪)
 DocType: Project,Estimated Cost,التكلفة التقديرية
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,الفضاء
-DocType: Journal Entry,Credit Card Entry,الدخول بطاقة الائتمان
+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,في القيمة
@@ -674,7 +684,7 @@
 DocType: Purchase Order,Supply Raw Materials,توريد المواد الخام
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,التاريخ الذي سيتم إنشاء الفاتورة القادمة. يتم إنشاؤها على تقديم.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,الموجودات المتداولة
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,{0} is not a stock Item,{0} ليس من نوع المخزون
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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 +169,Lead must be set if Opportunity is made from Lead,يجب تحديد مبادرة البيع اذ كانة فرصة البيع من مبادرة بيع
@@ -760,26 +770,25 @@
 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 +709,No Permission,لا يوجد تصريح
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +710,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}
 apps/erpnext/erpnext/public/js/setup_wizard.js +298,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 +542,Row #{0}: Asset {1} must be submitted,الصف # {0}: الأصول {1} يجب أن تقدم
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,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.
 DocType: Warehouse,Tree Details,تفاصيل شجرة
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,أرسل الآن
 ,Support Analytics,دعم تحليلات
 DocType: Item,Website Warehouse,مستودع الموقع
 DocType: Payment Reconciliation,Minimum Invoice Amount,الحد الأدنى للمبلغ الفاتورة
 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/sales_invoice/sales_invoice.py +227,Timesheet {0} is already completed or cancelled,الجدول الزمني {0} بالفعل منتهي أو ملغى
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +259,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
@@ -795,13 +804,13 @@
 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 +229,Target Warehouse,المستودع المستهدف
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +230,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-,STE-
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Sales Order Date,التاريخ التسليم المتوقع  لا يمكن أن يكون قبل تاريخ طلب شراء المبيعات
 DocType: Upload Attendance,Import Attendance,الحضور الاستيراد
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,جميع مجموعات الصنف
+apps/erpnext/erpnext/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/config/setup.py +89,Automatically compose message on submission of transactions.,شكل رسالة تلقائياً عند تثبيت المعاملة
@@ -809,17 +818,19 @@
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +82,{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/stock/page/stock_balance/stock_balance.js +37,Projected Qty,الكمية المتوقع
+apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +37,Projected Qty,الكمية المتوقعة
 DocType: Sales Invoice,Payment Due Date,تاريخ استحقاق السداد
 apps/erpnext/erpnext/stock/doctype/item/item.js +278,Item Variant {0} already exists with same attributes,البند البديل {0} موجود بالفعل مع نفس الصفات
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;فتح&#39;
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,توسيع المهام
 DocType: Notification Control,Delivery Note Message,ملاحظة تسليم رسالة
 DocType: Expense Claim,Expenses,نفقات
 DocType: Item Variant Attribute,Item Variant Attribute,البند البديل سمة
 ,Purchase Receipt Trends,شراء اتجاهات الإيصال
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Research & Development,البحوث والتنمية
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,البحوث والتنمية
 ,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,السعر أو الخصم
@@ -828,7 +839,7 @@
 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/controllers/accounts_controller.py +340,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",يرتبط دفع الدخول {0} ضد بالدفع {1}، معرفة ما اذا كان ينبغي أن يتم سحبها كما تقدم في هذه الفاتورة.
+apps/erpnext/erpnext/controllers/accounts_controller.py +343,"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,نقطة البيع
@@ -850,12 +861,12 @@
 DocType: Supplier Quotation,Is Subcontracted,وتعاقد من الباطن
 DocType: Item Attribute,Item Attribute Values,قيم سمة العنصر
 DocType: Examination Result,Examination Result,نتيجة الفحص
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +756,Purchase Receipt,ايصال شراء
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +735,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 +167,Reference Doctype must be one of {0},يجب أن يكون إشارة DOCTYPE واحد من {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +282,Unable to find Time Slot in the next {0} days for Operation {1},تعذر العثور على فتحة الزمنية في {0} الأيام القليلة القادمة للعملية {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +170,Reference Doctype must be one of {0},يجب أن يكون إشارة DOCTYPE واحد من {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Unable to find Time Slot in the next {0} days for Operation {1},تعذر العثور على فتحة الزمنية في {0} الأيام القليلة القادمة للعملية {1}
 DocType: Production Order,Plan material for sub-assemblies,المواد خطة للجمعيات الفرعي
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,المناديب و المناطق
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be active,فاتورة الموارد {0} يجب أن تكون نشطة
@@ -866,7 +877,7 @@
 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 +214,Warehouses with existing transaction can not be converted to ledger.,المستودعات مع الصفقة الحالية لا يمكن أن يتم تحويلها إلى دفتر الأستاذ.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +217,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,أوامر الإنتاج
@@ -880,9 +891,9 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,موظف {0} غير نشط أو غير موجود
 DocType: Fee Structure,Components,مكونات
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,Please enter Asset Category in Item {0},الرجاء إدخال الأصول الفئة في البند {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +612,Item Variants {0} updated,البند المتغيرات {0} تحديث
+apps/erpnext/erpnext/stock/doctype/item/item.py +614,Item Variants {0} updated,البند المتغيرات {0} تحديث
 DocType: Quality Inspection Reading,Reading 6,قراءة 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +843,Cannot {0} {1} {2} without any negative outstanding invoice,لا يمكن {0} {1} {2} من دون أي فاتورة المعلقة السلبية
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +854,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,مزامنة الآن
@@ -897,69 +908,72 @@
 DocType: Item,Is Purchase Item,هو شراء مادة
 DocType: Asset,Purchase Invoice,فاتورة شراء
 DocType: Stock Ledger Entry,Voucher Detail No,تفاصيل قسيمة لا
-apps/erpnext/erpnext/accounts/page/pos/pos.js +728,New Sales Invoice,فاتورة مبيعات جديدة
+apps/erpnext/erpnext/accounts/page/pos/pos.js +710,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 +728,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: Cheque Print Template,Has Print Format,لديها تنسيق طباعة
-apps/erpnext/erpnext/accounts/page/pos/pos.js +86, is mandatory. Maybe Currency Exchange record is not created for ,إلزامي. ربما لم يتم انشاء سجل تحويل العملة ل
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +109,Row #{0}: Please specify Serial No for Item {1},الصف # {0}: يرجى تحديد رقم التسلسلي للتاريخ {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +619,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.",وللسلع &quot;حزمة المنتج، مستودع، المسلسل لا دفعة ويتم النظر في أي من الجدول&quot; قائمة التعبئة &quot;. إذا مستودع ودفعة لا هي نفسها لجميع عناصر التعبئة لمادة أي &#39;حزمة المنتج، يمكن إدخال تلك القيم في الجدول الرئيسي عنصر، سيتم نسخ القيم إلى &quot;قائمة التعبئة&quot; الجدول.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +75, 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 +613,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing 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 +606,Supplier Invoice Date cannot be greater than Posting Date,المورد تاريخ الفاتورة لا يمكن أن يكون أكبر من تاريخ النشر
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +609,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: 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 +810,Select Item for Transfer,اختر البند لنقل
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +789,Select Item for Transfer,اختر البند لنقل
 DocType: Purchase Invoice,Additional Discount Percentage,نسبة خصم إضافي
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,عرض قائمة من جميع ملفات الفيديو مساعدة
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,حدد رئيس حساب في البنك حيث أودع الاختيار.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,تسمح للمستخدم لتحرير الأسعار قائمة قيم في المعاملات
 DocType: Pricing Rule,Max Qty,أعلى الكمية
-DocType: Student Applicant,Father's Name,اسم الاب
 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 +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,صف {0}: الدفع مقابل مبيعات / طلب شراء ينبغي دائما أن تكون علامة مسبقا
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,مادة كيميائية
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +686,All items have already been transferred for this Production Order.,كل الأصناف قد تم ترحيلها من قبل لأمر الانتاج هذا.
+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} وحاول مرة أخرى
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +694,All items have already been transferred for this Production Order.,كل الأصناف قد تم ترحيلها من قبل لأمر الانتاج هذا.
 DocType: Process Payroll,Select Payroll Year and Month,حدد الرواتب السنة والشهر
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,Meter,متر
 DocType: Workstation,Electricity Cost,تكلفة الكهرباء
 DocType: HR Settings,Don't send Employee Birthday Reminders,لا ترسل تذكير يوم ميلاد الموظف
-DocType: Opportunity,Walk In,عميل غير مسجل
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,مدخلات المخزون
 DocType: Item,Inspection Criteria,معايير التفتيش
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,نقلها
 apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,تحميل رئيس رسالتكم والشعار. (يمكنك تحريرها لاحقا).
 DocType: Timesheet Detail,Bill,فاتورة حساب
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,White,أبيض
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date is entered as past date,يتم إدخال الاستهلاك المقبل التاريخ كتاريخ الماضي
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +167,White,أبيض
 DocType: SMS Center,All Lead (Open),جميع العملاء المحتملين (فتح)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +228,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),صف {0}: الكمية لا تتوفر لل{4} في مستودع {1} في بالإرسال وقت دخول ({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}),صف {0}: الكمية لا تتوفر لل{4} في مستودع {1} في بالإرسال وقت دخول ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,الحصول على السلف المدفوعة
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +731,Make ,إنشاء
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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 +154,Order Type must be one of {0},يجب أن يكون النظام نوع واحد من {0}
-DocType: Lead,Next Contact Date,تاريخ لاحق اتصل
+apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},يجب أن يكون النظام نوع واحد من {0}
+DocType: Lead,Next Contact Date,تاريخ جهة الاتصال التالية
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,فتح الكمية
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +393,Please enter Account for Change Amount,الرجاء إدخال حساب لتغيير المبلغ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,Please enter Account for Change Amount,الرجاء إدخال حساب لتغيير المبلغ
 DocType: Student Batch,Student Batch Name,طالب اسم دفعة
 DocType: Holiday List,Holiday List Name,عطلة اسم قائمة
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js +8,Schedule Course,دورة الجدول الزمني
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Stock Options,خيارات المخزون
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,خيارات المخزون
 DocType: Journal Entry Account,Expense Claim,حساب المطالبات
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +211,Do you really want to restore this scrapped asset?,هل تريد حقا أن استعادة هذه الأصول ألغت؟
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +237,Qty for {0},الكمية ل{0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +212,Do you really want to restore this scrapped asset?,هل تريد حقا أن استعادة هذه الأصول ألغت؟
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,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,ترك التواريخ قائمة الحظر
@@ -968,9 +982,9 @@
 DocType: Company,Default Terms,الشروط الافتراضية
 DocType: Packing Slip Item,Packing Slip Item,التعبئة الإغلاق زلة
 DocType: Purchase Invoice,Cash/Bank Account,النقد / البنك حساب
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,العناصر إزالتها مع أي تغيير في كمية أو قيمة.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,العناصر إزالتها مع أي تغيير في كمية أو قيمة.
 DocType: Delivery Note,Delivery To,التسليم إلى
-apps/erpnext/erpnext/stock/doctype/item/item.py +635,Attribute table is mandatory,الجدول السمة إلزامي
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,الجدول السمة إلزامي
 DocType: Production Planning Tool,Get Sales Orders,الحصول على أوامر البيع
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} لا يمكن أن تكون سلبية
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,الرجاء اختيار الطلاب
@@ -995,7 +1009,7 @@
 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,مستودع WIP
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},رقم المسلسل {0} هو بموجب عقد صيانة لغاية {1}
+apps/erpnext/erpnext/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,اسم المنظمة
@@ -1007,35 +1021,34 @@
 DocType: GL Entry,Against,ضد
 DocType: Item,Default Selling Cost Center,الافتراضي البيع مركز التكلفة
 DocType: Sales Partner,Implementation Partner,شريك التنفيذ
-apps/erpnext/erpnext/controllers/selling_controller.py +231,Sales Order {0} is {1},اوامر البيع {0} {1}
+apps/erpnext/erpnext/controllers/selling_controller.py +232,Sales Order {0} is {1},اوامر البيع {0} {1}
 DocType: Opportunity,Contact Info,معلومات الاتصال
 apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,جعل الأسهم مقالات
-DocType: Packing Slip,Net Weight UOM,الوزن الصافي UOM
+DocType: Packing Slip,Net Weight UOM,الوزن الصافي لوحدة القياس
 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,تاريخ نهاية لا يمكن أن يكون أقل من تاريخ بدء
 DocType: Sales Person,Select company name first.,حدد اسم الشركة الأول.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Dr,الدكتور
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Dr,الدكتور
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,الاقتباسات الواردة من الموردين.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},إلى {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,متوسط العمر
 DocType: 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/templates/pages/home.html +32,View All Products,عرض جميع المنتجات
+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 +400,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,تحذير : سيقوم النظام لا تحقق بالمغالاة في الفواتير منذ مبلغ القطعة ل {0} في {1} هو صفر
+apps/erpnext/erpnext/controllers/accounts_controller.py +403,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,تحذير : سيقوم النظام لا تحقق بالمغالاة في الفواتير منذ مبلغ القطعة ل {0} في {1} هو صفر
 DocType: Journal Entry,Make Difference Entry,جعل دخول الفرق
 DocType: Upload Attendance,Attendance From Date,الحضور من تاريخ
-DocType: Appraisal Template Goal,Key Performance Area,مفتاح الأداء المنطقة
+DocType: Appraisal Template Goal,Key Performance Area,مفتاح الأداء الرئيسية
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,النقل
 apps/erpnext/erpnext/controllers/item_variant.py +63,Invalid Attribute,سمة غير صالح
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,والسنة:
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +191,{0} {1} must be submitted,{0} {1} يجب أن يؤكّد
-DocType: Email Digest,Annual Expense,المصاريف السنوية
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,{0} {1} must be submitted,{0} {1} يجب أن يؤكّد
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +145,Quantity must be less than or equal to {0},يجب أن تكون الكمية أقل من أو يساوي إلى {0}
 DocType: SMS Center,Total Characters,مجموع أحرف
 apps/erpnext/erpnext/controllers/buying_controller.py +156,Please select BOM in BOM field for Item {0},يرجى تحديد BOM في الحقل BOM القطعة ل{0}
@@ -1046,46 +1059,47 @@
 DocType: Sales Partner,Distributor,موزع
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,التسوق شحن العربة القاعدة
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +211,Production Order {0} must be cancelled before cancelling this Sales Order,إنتاج النظام {0} يجب أن يتم إلغاء هذا الأمر قبل إلغاء المبيعات
-apps/erpnext/erpnext/public/js/controllers/transaction.js +62,Please set 'Apply Additional Discount On',الرجاء تعيين &#39;تطبيق خصم إضافي على&#39;
+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,من المدى يجب أن يكون أقل من أن تتراوح
 DocType: Global Defaults,Global Defaults,افتراضيات العالمية
 apps/erpnext/erpnext/projects/doctype/project/project.py +153,Project Collaboration Invitation,مشروع التعاون دعوة
 DocType: Salary Slip,Deductions,الخصومات
+DocType: Leave Allocation,LAL/,LAL /
 apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,بداية السنة
 DocType: Purchase Invoice,Start date of current invoice's period,تاريخ بدء فترة الفاتورة الحالية
 DocType: Salary Slip,Leave Without Pay,إجازة بدون راتب
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +327,Capacity Planning Error,خطأ القدرة على التخطيط
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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 +362,Finished Item {0} must be entered for Manufacture type entry,البند المنهي {0} يجب إدخاله لادخال نوع صناعة
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +367,Finished Item {0} must be entered for Manufacture type entry,البند المنهي {0} يجب إدخاله لادخال نوع صناعة
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,فتح ميزان المحاسبة
 DocType: Sales Invoice Advance,Sales Invoice Advance,فاتورة مبيعات المقدمة
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +499,Nothing to request,شيء أن تطلب
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +500,Nothing to request,شيء أن تطلب
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',""" تاريخ البدء الفعلي "" لا يمكن أن يكون احدث من "" تاريخ الانتهاء الفعلي """
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Management,إدارة
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},مطلوب إما الخصم أو الائتمان لل مبلغ {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,إدارة
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +55,Either debit or credit amount is required for {0},مطلوب إما الخصم أو الائتمان لل مبلغ {0}
 DocType: Cheque Print Template,Payer Settings,إعدادات دافع
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","سيتم إلحاق هذا إلى بند رمز للمتغير. على سبيل المثال، إذا اختصار الخاص بك هو ""SM""، ورمز البند هو ""T-SHIRT""، رمز العنصر المتغير سيكون ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,سوف تدفع صافي (في كلمة) تكون مرئية بمجرد حفظ زلة الراتب.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,Blue,أزرق
+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
+DocType: Item,UOMs,وحدات القياس
 apps/erpnext/erpnext/stock/utils.py +181,{0} valid serial nos for Item {1},{0} أرقام متسلسلة صالحة للصنف {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,لا يمكن تغيير رمز المدينة لل رقم التسلسلي
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +23,POS Profile {0} already created for user: {1} and company {2},الملف POS {0} خلقت بالفعل للمستخدم: {1} وشركة {2}
-DocType: Purchase Order Item,UOM Conversion Factor,UOM تحويل عامل
+DocType: Purchase Order Item,UOM Conversion Factor,عامل تحويل وحدة القياس
 DocType: Stock Settings,Default Item Group,المجموعة الافتراضية الإغلاق
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1374,Do you really want to submit the invoice?,هل تريد حقا أن تقدم الفاتورة؟
+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 +685,Cost Center For Item with Item Code ',"مركز تكلفة بالنسبة للبند مع رمز المدينة """
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1526,"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 +679,Cost Center For Item with Item Code ',"مركز تكلفة بالنسبة للبند مع رمز المدينة """
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1550,"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 +26,"Further accounts can be made under Groups, but entries can be made against non-Groups",حسابات أخرى يمكن أن يتم ضمن مجموعات، ولكن يمكن أن يتم مقالات ضد المجموعات غير-
 DocType: Lead,Lead,مبادرة بيع
 DocType: Email Digest,Payables,الذمم الدائنة
@@ -1104,104 +1118,106 @@
 DocType: Payment Reconciliation,Unreconciled Payment Details,لم تتم تسويتها تفاصيل الدفع
 DocType: Global Defaults,Current Fiscal Year,السنة المالية الحالية
 DocType: Global Defaults,Disable Rounded Total,تعطيل إجمالي مدور
-DocType: Lead,Call,أتصال
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +417,'Entries' cannot be empty,' المدخلات ' لا يمكن أن تكون فارغة
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +418,'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 +214,Fiscal Year {0} not found,لم يتم العثور  على السنة المالية {0}.
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +221,Fiscal Year {0} not found,لم يتم العثور  على السنة المالية {0}.
 apps/erpnext/erpnext/config/hr.py +238,Setting up Employees,إعداد الموظفين
 DocType: Sales Order,SO-,وبالتالي-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,الرجاء اختيار البادئة الأولى
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Please select prefix first,الرجاء اختيار البادئة الأولى
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Research,بحث
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,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 +43,Item {0} must be a non-stock item,البند {0} يجب أن يكون البند غير الأسهم
 DocType: Contact,User ID,معرف المستخدم
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +57,View Ledger,عرض ليدجر
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,أقرب
-apps/erpnext/erpnext/stock/doctype/item/item.py +504,"An Item Group exists with same name, please change the item name or rename the item group",يوجد اسم مجموعة أصناف بنفس الاسم، الرجاء تغيير اسم الصنف أو إعادة تسمية المجموعة
+apps/erpnext/erpnext/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 +437,Rest Of The World,بقية العالم
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,العنصر {0} لا يمكن أن يكون دفعة
 ,Budget Variance Report,تقرير إنحرافات الموازنة
 DocType: Salary Slip,Gross Pay,إجمالي الأجور
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +90,Row {0}: Activity Type is mandatory.,صف {0}: نوع آخر إلزامي.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +114,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/public/js/controllers/stock_controller.js +40,Accounting Ledger,دفتر الأستاذ العام
+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,الأرباح المحتجزة
 DocType: BOM Item,Item Description,وصف السلعة
+DocType: Student Sibling,Student Sibling,الشقيق طالب
 DocType: Purchase Invoice,Is Recurring,غير متكرر
 DocType: Purchase Invoice,Supplied Items,الأصناف الموردة
 DocType: Student,STUD.,عشيق.
 DocType: Production Order,Qty To Manufacture,الكمية للتصنيع
+DocType: Email Digest,New Income,الدخل الجديد
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,الحفاظ على نفس معدل طوال دورة الشراء
 DocType: Opportunity Item,Opportunity Item,فرصة السلعة
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,افتتاح مؤقت
 ,Employee Leave Balance,رصيد اجازات الموظف
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +131,Balance for Account {0} must always be {1},التوازن ل حساب {0} يجب أن يكون دائما {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +175,Valuation Rate required for Item in row {0},التقييم المعدل المطلوب لعنصر في الصف {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,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,على سبيل المثال: الماجستير في علوم الحاسب الآلي
 DocType: Purchase Invoice,Rejected Warehouse,رفض مستودع
 DocType: GL Entry,Against Voucher,مقابل قسيمة
 DocType: Item,Default Buying Cost Center,مركز التكلفة المشتري الافتراضي
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.",للحصول على أفضل النتائج من ERPNext، ونحن نوصي بأن تأخذ بعض الوقت ومشاهدة أشرطة الفيديو هذه المساعدة.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +87, to ,إلى
+apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,إلى
 DocType: Item,Lead Time in days,المهلة بالايام
 ,Accounts Payable Summary,ملخص الحسابات الدائنة
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Not authorized to edit frozen Account {0},غير مخول لتحرير الحساب المجمد {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},غير مخول لتحرير الحساب المجمد {0}
 DocType: Journal Entry,Get Outstanding Invoices,الحصول على فواتير معلقة
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +62,Sales Order {0} is not valid,اوامر البيع {0} غير صالحه
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,اوامر البيع {0} غير صالحه
 apps/erpnext/erpnext/setup/doctype/company/company.py +185,"Sorry, companies cannot be merged",عذراً، الشركات لا يمكن دمجها
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +139,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",إجمالي كمية العدد / نقل {0} في المواد طلب {1} \ لا يمكن أن يكون أكبر من الكمية المطلوبة {2} لالبند {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Small,صغير
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,Small,صغير
 DocType: Employee,Employee Number,رقم الموظف
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},الحالة رقم ( ق ) قيد الاستخدام بالفعل. محاولة من القضية لا { 0 }
 ,Invoiced Amount (Exculsive Tax),المبلغ فواتير ( Exculsive الضرائب )
-DocType: Student Applicant,Mother's / Guardian 1 Email ID,الأم / الجارديان الرقم 1 البريد الإلكتروني
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,البند 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,الحساب الرئيسى  {0} تم انشأه
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +160,Green,أخضر
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,أخضر
 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 +57,Contract,عقد
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,عقد
 DocType: Email Digest,Add Quote,إضافة اقتباس
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +498,UOM coversion factor required for UOM: {0} in Item: {1},عامل coversion UOM اللازمة لUOM: {0} في المدينة: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +503,UOM coversion factor required for UOM: {0} in Item: {1},معامل التحويل لوحدة القياس مطلوبةل:{0} في البند: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,المصاريف غير المباشرة
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +80,Row {0}: Qty is mandatory,الصف {0}: الكمية إلزامي
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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 +737,Sync Master Data,مزامنة البيانات الرئيسية
+apps/erpnext/erpnext/accounts/page/pos/pos.js +719,Sync Master Data,مزامنة البيانات الرئيسية
 apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,المنتجات أو الخدمات الخاصة بك
 DocType: Mode of Payment,Mode of Payment,طريقة الدفع
 apps/erpnext/erpnext/stock/doctype/item/item.py +178,Website Image should be a public file or website URL,وينبغي أن يكون موقع صورة ملف العامة أو عنوان الموقع
-DocType: Purchase Invoice Item,BOM,BOM
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,هذه هي مجموعة البند الجذرية والتي لا يمكن تحريرها.
+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.,هذه هي مجموعة البند الجذرية والتي لا يمكن تحريرها.
 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 +345,"{0}: Employee email not found, hence email not sent",{0}: البريد الإلكتروني للموظف غير موجود، وبالتالي لم يتم إرسال البريد  الإلكتروني
+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,هل لديك عنوان الشركة
 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 +118,"For {0}, only credit accounts can be linked against another debit entry",ل{0}، فقط حسابات الائتمان يمكن ربط ضد دخول السحب أخرى
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Delivery Note {0} is not submitted,تسليم مذكرة {0} لم تقدم
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Delivery Note {0} is not submitted,تسليم مذكرة {0} لم تقدم
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Sub-contracted Item,البند {0} يجب أن يكون عنصر التعاقد الفرعي
 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,البائع موقع
 DocType: Item,ITEM-,بند-
-apps/erpnext/erpnext/controllers/selling_controller.py +147,Total allocated percentage for sales team should be 100,مجموع النسبة المئوية المخصصة ل فريق المبيعات يجب أن يكون 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +110,Production Order status is {0},مركز الإنتاج للطلب هو {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,مجموع النسبة المئوية المخصصة ل فريق المبيعات يجب أن يكون 100
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},مركز الإنتاج للطلب هو {0}
 DocType: Appraisal Goal,Goal,هدف
 DocType: Sales Invoice Item,Edit Description,تحرير الوصف
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +757,For Supplier,ل مزود
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +723,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,إنشاء تنسيق طباعة
@@ -1217,10 +1233,11 @@
 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,كود الصف
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,أرسل دايجست:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +445,BOM {0} does not belong to Item {1},BOM {0} لا تنتمي إلى الصنف {1}
 DocType: Sales Partner,Target Distribution,هدف التوزيع
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1667,Deafault warehouse is required for selected item,مطلوب مستودع Deafault عن العنصر المحدد
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Deafault warehouse is required for selected item,مطلوب مستودع Deafault عن العنصر المحدد
 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
@@ -1229,23 +1246,23 @@
 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 +110,Hardware,خردوات
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,خردوات
 DocType: Sales Order,Recurring Upto,المتكررة لغاية
 DocType: Attendance,HR Manager,مدير الموارد البشرية
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,الرجاء اختيار الشركة
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Privilege Leave,امتياز الإجازة
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,امتياز الإجازة
 DocType: Purchase Invoice,Supplier Invoice Date,المورد فاتورة التسجيل
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,تحتاج إلى تمكين سلة التسوق
 DocType: Payment Entry,Writeoff,لا تصلح
 DocType: Appraisal Template Goal,Appraisal Template Goal,تقييم قالب الهدف
-DocType: Salary Slip,Earning,كسب
+DocType: Salary Component,Earning,كسب
 DocType: Purchase Invoice,Party Account Currency,حزب حساب العملات
 ,BOM Browser,BOM متصفح
 DocType: Purchase Taxes and Charges,Add or Deduct,إضافة أو خصم
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,الظروف المتداخلة وجدت بين:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +171,Against Journal Entry {0} is already adjusted against some other voucher,مقابل مجلة الدخول {0} تم ضبطه بالفعل ضد بعض قسيمة أخرى
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,مقابل مجلة الدخول {0} تم ضبطه بالفعل ضد بعض قسيمة أخرى
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,مجموع قيمة الطلب
-apps/erpnext/erpnext/demo/setup_data.py +358,Food,غذاء
+apps/erpnext/erpnext/demo/setup/setup_data.py +301,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/course_schedule/course_schedule.js +103,Mark Attendence,علامة إن حضور
@@ -1255,7 +1272,7 @@
 ,Delivered Items To Be Billed,وحدات تسليمها الى أن توصف
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,لا يمكن تغيير الرقم التسلسلي لل مستودع
 DocType: Authorization Rule,Average Discount,متوسط الخصم
-DocType: Purchase Invoice Item,UOM,UOM
+DocType: Purchase Invoice Item,UOM,وحدق القياس
 DocType: Address,Utilities,خدمات
 DocType: Purchase Invoice Item,Accounting,المحاسبة
 DocType: Employee,EMP/,EMP /
@@ -1279,12 +1296,12 @@
 DocType: Sales Order Item,Planned Quantity,المخطط الكمية
 DocType: Purchase Invoice Item,Item Tax Amount,البند ضريبة المبلغ
 DocType: Item,Maintain Stock,منتج يخزن
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +209,Stock Entries already created for Production Order ,مدخلات المخزون التي تم إنشاؤها من قبل لأمر الإنتاج
+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,صافي التغير في الأصول الثابتة
 DocType: Leave Control Panel,Leave blank if considered for all designations,ترك فارغا إذا نظرت لجميع التسميات
-apps/erpnext/erpnext/controllers/accounts_controller.py +620,Charge of type 'Actual' in row {0} cannot be included in Item Rate,لا يمكن تضمين تهمة من نوع ' الفعلي ' في الصف {0} في سعر السلعة
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,Max: {0},الحد الأقصى: {0}
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +15,From Datetime,من التاريخ والوقت
+apps/erpnext/erpnext/controllers/accounts_controller.py +623,Charge of type 'Actual' in row {0} cannot be included in Item Rate,لا يمكن تضمين تهمة من نوع ' الفعلي ' في الصف {0} في سعر السلعة
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +239,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 +153,"Request for Quotation is disabled to access from portal, for more check portal settings.",تم تعطيل طلب تسعيرة للوصول من البوابة، لمزيد من الإعدادات البوابة الاختيار.
@@ -1292,8 +1309,8 @@
 DocType: Sales Invoice,Shipping Address Name,الشحن العنوان الاسم
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,دليل الحسابات
 DocType: Material Request,Terms and Conditions Content,الشروط والأحكام المحتوى
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +552,cannot be greater than 100,لا يمكن أن يكون أكبر من 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +680,Item {0} is not a stock Item,البند {0} ليس الأسهم الإغلاق
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +546,cannot be greater than 100,لا يمكن أن يكون أكبر من 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is not a stock Item,البند {0} ليس الأسهم الإغلاق
 DocType: Maintenance Visit,Unscheduled,غير المجدولة
 DocType: Employee,Owned,تملكها
 DocType: Salary Detail,Depends on Leave Without Pay,يعتمد على إجازة بدون مرتب
@@ -1307,10 +1324,9 @@
 DocType: GL Entry,GL Entry,GL الدخول
 DocType: HR Settings,Employee Settings,إعدادات موظف
 ,Batch-Wise Balance History,دفعة الحكيم التاريخ الرصيد
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,قائمة المهام
 apps/erpnext/erpnext/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 +61,Apprentice,مبتدئ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +102,Negative Quantity is not allowed,لا يسمح بالكميه السالبه
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,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","التفاصيل الضرائب الجدول المنال من سيده البند كسلسلة وتخزينها في هذا المجال.
  المستخدمة للضرائب والرسوم"
@@ -1332,15 +1348,14 @@
 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 +141,Source warehouse is mandatory for row {0},مستودع مصدر إلزامي ل صف {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +719,Packing Slip,زلة التعبئة
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Source warehouse is mandatory for row {0},مستودع مصدر إلزامي ل صف {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +713,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/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,طلب للحصول على الاقتباس يمكن أن يكون الوصول عن طريق النقر الرابط التالي
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,فشل الاستيراد !
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,لا يوجد عنوان مضاف.
 DocType: Workstation Working Hour,Workstation Working Hour,محطة العمل ساعة العمل
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Analyst,محلل
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,محلل
 DocType: Item,Inventory,جرد
 DocType: Item,Sales Details,تفاصيل المبيعات
 DocType: Quality Inspection,QI-,QI-
@@ -1348,7 +1363,7 @@
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,في الكمية
 DocType: Notification Control,Expense Claim Rejected,المطالبة حساب مرفوض
 DocType: Item Attribute,Item Attribute,البند السمة
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +103,Government,حكومة
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,حكومة
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,اسم المعهد
 apps/erpnext/erpnext/config/stock.py +289,Item Variants,المتغيرات البند
 DocType: Company,Services,الخدمات
@@ -1364,6 +1379,7 @@
 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/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,تدفق النقد من الاستثمار
 DocType: Program Course,Program Course,دورة برنامج
@@ -1387,7 +1403,7 @@
 DocType: Leave Block List,Block Holidays on important days.,عطلات كتلة في الأيام الهامة.
 ,Accounts Receivable Summary,حسابات المقبوضات ملخص
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +185,Please set User ID field in an Employee record to set Employee Role,الرجاء تعيين حقل معرف المستخدم في سجل الموظف لتحديد دور موظف
-DocType: UOM,UOM Name,UOM اسم
+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.,تساعدك هذه الأداة لتحديث أو تحديد الكمية وتقييم الأوراق المالية في النظام. وعادة ما يتم استخدامه لمزامنة قيم النظام وما هو موجود فعلا في المستودعات الخاصة بك.
@@ -1404,12 +1420,12 @@
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,قائمة المتلقي هو فارغ. يرجى إنشاء قائمة استقبال
 DocType: Production Plan Sales Order,Production Plan Sales Order,أمر الإنتاج خطة المبيعات
 DocType: Sales Partner,Sales Partner Target,المبلغ المطلوب للمندوب
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +110,Accounting Entry for {0} can only be made in currency: {1},لا يمكن إجراء القيد المحاسبي ل{0} إلا بالعملة: {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},لا يمكن إجراء القيد المحاسبي ل{0} إلا بالعملة: {1}
 DocType: Pricing Rule,Pricing Rule,قاعدة التسعير
 DocType: Budget,Action if Annual Budget Exceeded,العمل إذا تجاوز الميزانية السنوية
 apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,طلب المادي لأمر الشراء
-DocType: Shopping Cart Settings,Payment Success URL,دفع النجاح URL
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +78,Row # {0}: Returned Item {1} does not exists in {2} {3},لا يوجد عاد هذا البند {1} في {2} {3} الصف # {0}
+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,بيان تسوية البنك
@@ -1418,40 +1434,39 @@
 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/stock/doctype/stock_entry/stock_entry.py +339,Not allowed to tranfer more {0} than {1} against Purchase Order {2},لا يسمح للإنتقال أكثر {0} من {1} ضد طلب شراء {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +344,Not allowed to tranfer more {0} than {1} against Purchase Order {2},لا يسمح للإنتقال أكثر {0} من {1} ضد طلب شراء {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},الأوراق المخصصة بنجاح ل {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,لا توجد عناصر لحزمة
 DocType: Shipping Rule Condition,From Value,من القيمة
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +545,Manufacturing Quantity is mandatory,تصنيع الكمية إلزامي
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,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 +71,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 +162,Row {0}: From Time and To Time of {1} is overlapping with {2},صف {0}: من الوقت وإلى وقت {1} ومتداخلة مع {2}
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +186,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,المطلوبات المخزون
 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 +130,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 +137,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,تقارير أخرى
 DocType: Dependent Task,Dependent Task,العمل تعتمد
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,يرجى إعداد الموظف تسمية النظام في الموارد البشرية&gt; إعدادات الموارد البشرية
 apps/erpnext/erpnext/stock/doctype/item/item.py +411,Conversion factor for default Unit of Measure must be 1 in row {0},معامل تحويل وحدة القياس الافتراضية يجب أن تكون 1 في الصف {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,Leave of type {0} cannot be longer than {1},إجازة من نوع {0} لا يمكن أن تكون أطول من {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +197,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 +921,Search Item,بحث البند
+DocType: SMS Center,Receiver List,قائمة المرسل اليهم
+apps/erpnext/erpnext/accounts/page/pos/pos.js +910,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 +546,Already completed,أنجزت بالفعل
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +22,Payment Request already exists {0},دفع طلب بالفعل {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +550,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 +241,Quantity must not be more than {0},لا يجب أن تكون الكمية أكثر من {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Quantity must not be more than {0},لا يجب أن تكون الكمية أكثر من {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +76,Previous Financial Year is not closed,لم يتم إغلاق سابقة المالية السنة
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +44,Age (Days),العمر (أيام)
 DocType: Quotation Item,Quotation Item,عنصر تسعيرة
@@ -1468,11 +1483,11 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +221,Purchase Receipt {0} is not submitted,شراء استلام {0} لم تقدم
 DocType: Company,Default Payable Account,حساب Paybal الافتراضي
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.",إعدادات عربة التسوق مثل قواعد الشحن، وقائمة الأسعار الخ
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +83,{0}% Billed,{0} فوترت٪
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0} فوترت٪
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,الكمية المحجوزة
 DocType: Party Account,Party Account,حساب طرف
 apps/erpnext/erpnext/config/setup.py +116,Human Resources,الموارد البشرية
-DocType: Lead,Upper Income,العلوي الدخل
+DocType: Lead,Upper Income,الدخل الأعلى
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +10,Reject,رفض
 DocType: Journal Entry Account,Debit in Company Currency,الخصم في الشركة العملات
 DocType: BOM Item,BOM Item,BOM صنف
@@ -1480,12 +1495,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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 +22,Collect,جمع
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,جمع
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,Against Supplier Invoice {0} dated {1},مقابل فاتورة المورد {0} بتاريخ {1}
 DocType: Customer,Default Price List,قائمة الأسعار الافتراضي
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +225,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: Payment Reconciliation,Payments,المدفوعات
 DocType: Journal Entry,Entry Type,نوع الدخول
 ,Customer Credit Balance,رصيد الزبون
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Payable,صافي التغير في الحسابات الدائنة
@@ -1497,7 +1511,7 @@
 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 +9,Procurement,المشتريات
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,لا شيء من هذه البنود يكون أي تغيير في كمية أو قيمة.
+apps/erpnext/erpnext/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,مطالبة الضمان
 ,Lead Details,تفاصيل مبادرة بيع
 DocType: Purchase Invoice,End date of current invoice's period,تاريخ نهاية فترة الفاتورة الحالية
@@ -1522,7 +1536,7 @@
 DocType: Purchase Invoice,Additional Discount,خصم إضافي
 DocType: Selling Settings,Selling Settings,إعدادات البيع
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,مزادات على الانترنت
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +97,Please specify either Quantity or Valuation Rate or both,يرجى تحديد الكمية أو التقييم إما قيم أو كليهما
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,يرجى تحديد الكمية أو التقييم إما قيم أو كليهما
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +13,Fulfillment,تحقيق
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory",شركة والشهر و السنة المالية إلزامي
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,مصاريف التسويق
@@ -1543,17 +1557,16 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,إعداد ERPNext كامل!
 DocType: Item,Weightage,الوزن
 DocType: Packing Slip,PS-,ملحوظة:
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +93,A Customer Group exists with same name please change the Customer name or rename the Customer Group,يوجد مجموعة العملاء بنفس الاسم الرجاء تغيير اسم العميل أو إعادة تسمية مجموعة العملاء
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +126,A Customer Group exists with same name please change the Customer name or rename the Customer Group,يوجد مجموعة العملاء بنفس الاسم الرجاء تغيير اسم العميل أو إعادة تسمية مجموعة العملاء
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,اتصال جديد
 DocType: Territory,Parent Territory,الأم الأرض
 DocType: Quality Inspection Reading,Reading 2,القراءة 2
 DocType: Stock Entry,Material Receipt,أستلام مواد
 DocType: Homepage,Products,المنتجات
 DocType: Announcement,Instructor,معلم
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},مطلوب نوع الحزب وحزب المقبوضات / حسابات المدفوعات {0}
 DocType: Employee,AB+,أب+
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.",إذا كان هذا البند لديها بدائل، فإنه لا يمكن اختيارها في أوامر البيع الخ
-DocType: Lead,Next Contact By,لاحق اتصل بواسطة
+DocType: Lead,Next Contact By,جهة الاتصال التالية بواسطة
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +223,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: Quotation,Order Type,نوع الطلب
@@ -1561,7 +1574,7 @@
 ,Item-wise Sales Register,مبيعات البند الحكيم سجل
 DocType: Asset,Gross Purchase Amount,الإجمالي المبلغ شراء
 DocType: Asset,Depreciation Method,طريقة الاستهلاك
-apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Offline,غير متصل
+apps/erpnext/erpnext/accounts/page/pos/pos.js +686,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,مطلوب
@@ -1579,37 +1592,38 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +425,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 +858,Make Purchase Order,انشئ طلب شراء
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +852,Make Purchase Order,انشئ طلب شراء
 DocType: SMS Center,Send To,أرسل إلى
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,There is not enough leave balance for Leave Type {0},ليس هناك ما يكفي من التوازن إجازة ل إجازة نوع {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,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 +172,Work-in-Progress Warehouse is required before Submit,مطلوب العمل في و التقدم في معرض النماذج ثلاثية قبل إرسال
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,Work-in-Progress Warehouse is required before Submit,مطلوب العمل في و التقدم في معرض النماذج ثلاثية قبل إرسال
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,المتقدم للحصول على الوظيفة.
 DocType: Purchase Order Item,Warehouse and Reference,مستودع والمراجع
 DocType: Supplier,Statutory info and other general information about your Supplier,معلومات قانونية ومعلومات عامة أخرى عن بريدا
-apps/erpnext/erpnext/hooks.py +88,Addresses,عناوين
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,المورد&gt; نوع المورد
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +212,Against Journal Entry {0} does not have any unmatched {1} entry,مقابل قيد اليومية {0} ليس لديه أي لا مثيل لها {1} دخول
+apps/erpnext/erpnext/hooks.py +95,Addresses,عناوين
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +215,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,الرجاء تعيين مرشح بناء على البند أو مستودع
 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,مبلغ القرض في حساب العملات
+DocType: GL Entry,Credit Amount in Account Currency,مبلغ الدائن بعملة الحساب
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} must be submitted,BOM {0} يجب أن تعتمد
 DocType: Authorization Control,Authorization Control,إذن التحكم
 apps/erpnext/erpnext/controllers/buying_controller.py +300,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},الصف # {0}: رفض مستودع إلزامي ضد رفض البند {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +731,Payment,دفع
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,Payment,دفع
 DocType: Production Order Operation,Actual Time and Cost,الوقت الفعلي والتكلفة
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},طلب المواد من الحد الأقصى {0} يمكن إجراء القطعة ل {1} ضد ترتيب المبيعات {2}
 DocType: Employee,Salutation,تحية
-DocType: Pricing Rule,Brand,علامة تجارية
 DocType: Course,Course Abbreviation,اختصار بالطبع
 DocType: Item,Will also apply for variants,سوف تطبق أيضا على المتغيرات
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +142,"Asset cannot be cancelled, as it is already {0}",لا يمكن إلغاء الأصول، كما هو بالفعل {0}
@@ -1621,7 +1635,7 @@
 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.",قائمة المنتجات أو الخدمات التي تشتري أو تبيع الخاص بك.
 DocType: Hub Settings,Hub Node,المحور عقدة
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,لقد دخلت عناصر مكررة . يرجى تصحيح و حاول مرة أخرى.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Associate,مساعد
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,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,إنشاء قائمة استقبال
@@ -1629,7 +1643,7 @@
 DocType: Production Planning Tool,Material Requests,الطلبات المادية
 DocType: Warranty Claim,Issue Date,تاريخ القضية
 DocType: Activity Cost,Activity Cost,النشاط التكلفة
-DocType: Timesheet Detail,Timesheet Detail,تفاصيل الجدول الزمني
+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),يشير إلى أن الحزمة هو جزء من هذا التسليم (مشروع فقط)
@@ -1641,7 +1655,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +134,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"يمكن الرجوع صف فقط إذا كان نوع التهمة هي "" في السابق المبلغ صف 'أو' السابق صف إجمالي '"
 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;حساب / الخسارة ربح من التخلص من الأصول&quot; في شركة {0}
@@ -1652,9 +1666,10 @@
 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,يحتوي على متغيرات
 DocType: Monthly Distribution,Name of the Monthly Distribution,اسم التوزيع الشهري
-DocType: Sales Person,Parent Sales Person,الأم المبيعات شخص
+DocType: Sales Person,Parent Sales Person,رجل المبيعات الرئيسي
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,يرجى تحديد العملة الافتراضية في شركة ماستر وافتراضيات العالمية
 DocType: Purchase Invoice,Recurring Invoice,فاتورة المتكررة
 apps/erpnext/erpnext/config/learn.py +268,Managing Projects,إدارة المشاريع
@@ -1664,31 +1679,32 @@
 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 +44,"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/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.,وبعبارة تكون مرئية بمجرد حفظ فاتورة المبيعات.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +502,Error: {0} &gt; {1},الخطأ: {0}&gt; {1}
 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.,تاريخ البدء الأجل لا يمكن أن يكون أقدم من تاريخ بداية السنة للعام الدراسي الذي يرتبط مصطلح (السنة الأكاديمية {}). يرجى تصحيح التواريخ وحاول مرة أخرى.
 DocType: Naming Series,Current Value,القيمة الحالية
-apps/erpnext/erpnext/controllers/accounts_controller.py +235,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,توجد السنوات المالية متعددة للتاريخ {0}. يرجى وضع الشركة في السنة المالية
+apps/erpnext/erpnext/controllers/accounts_controller.py +238,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 +458,Item table can not be blank,الجدول العنصر لا يمكن أن تكون فارغة
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +443,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 +5,This is based on stock movement. See {0} for details,ويستند هذا على حركة المخزون. راجع {0} لمزيد من التفاصيل
 DocType: Pricing Rule,Selling,بيع
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +341,Amount {0} {1} deducted against {2},مبلغ {0} {1} خصم ضد {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +344,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,بسبب التاريخ لا يمكن أن يكون قبل المشاركة في التسجيل
@@ -1703,8 +1719,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +144,Cannot refer row number greater than or equal to current row number for this Charge type,لا يمكن أن يشير رقم الصف أكبر من أو يساوي رقم الصف الحالي لهذا النوع المسؤول
 DocType: Asset,Sold,تم البيع
 ,Item-wise Purchase History,البند الحكيم تاريخ الشراء
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Red,أحمر
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},الرجاء انقر على ' إنشاء الجدول ' لجلب رقم المسلسل أضاف القطعة ل {0}
+apps/erpnext/erpnext/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,أوامر الانتاج المفتوحة
 DocType: Sales Invoice Payment,Base Amount (Company Currency),المبلغ الأساسي (عملة الشركة )
@@ -1712,7 +1728,7 @@
 DocType: Installation Note,Installation Time,تثبيت الزمن
 DocType: Sales Invoice,Accounting Details,تفاصيل المحاسبة
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,حذف جميع المعاملات لهذه الشركة
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +187,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,الصف # {0} عملية {1} لم يكتمل ل{2} الكمية من السلع تامة الصنع في أمر الإنتاج # {3}. يرجى تحديث حالة عملية عن طريق سجلات الوقت
+apps/erpnext/erpnext/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}. يرجى تحديث حالة عملية عن طريق سجلات الوقت
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,الاستثمارات
 DocType: Issue,Resolution Details,قرار تفاصيل
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,المخصصات
@@ -1734,7 +1750,7 @@
 DocType: Room,Room Name,اسم الغرفة
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",ترك لا يمكن تطبيقها / إلغاء قبل {0}، كما كان رصيد الإجازة بالفعل في السجل تخصيص إجازة في المستقبل إعادة توجيهها تحمل {1}
 DocType: Activity Cost,Costing Rate,تكلف سعر
-,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,فيلد إلزامي - السنة الدراسية
@@ -1748,16 +1764,17 @@
 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}
 DocType: Delivery Note,Excise Page Number,المكوس رقم الصفحة
 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),تاريخ الإنتهاء الفعلي (عبر ورقة الوقت)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Amount {0} {1} against {2} {3},مبلغ {0} {1} من {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +339,Amount {0} {1} against {2} {3},مبلغ {0} {1} من {2} {3}
 ,Quotation Trends,مجرى التسعيرات
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},المجموعة البند لم يرد ذكرها في البند الرئيسي لمادة {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +295,Debit To account must be a Receivable account,يجب أن يكون الخصم لحساب حساب المقبوضات
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Receivable account,يجب أن يكون الخصم لحساب حساب المقبوضات
 DocType: Shipping Rule Condition,Shipping Amount,مبلغ الشحن
 ,Pending Amount,في انتظار المبلغ
 DocType: Purchase Invoice Item,Conversion Factor,معامل التحويل
@@ -1765,10 +1782,10 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +137,Expected value after useful life must be greater than or equal to {0},يجب أن تكون القيمة المتوقعة بعد العمر الإنتاجي أكبر من أو يساوي {0}
 DocType: Purchase Receipt,Vehicle Number,عدد المركبات
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,التاريخ الذي سيتم فاتورة المتكررة وقف
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +90,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,مجموع الأوراق المخصصة {0} لا يمكن أن يكون أقل من الأوراق وافق بالفعل {1} للفترة
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +93,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 +22,Enter Paid Amount,أدخل المبلغ المدفوع
+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
@@ -1778,13 +1795,15 @@
 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 +524,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",الصف # {0}: يجب أن يكون العدد 1، والبند هو أصل ثابت. الرجاء استخدام صف منفصل عن الكمية متعددة.
+apps/erpnext/erpnext/controllers/accounts_controller.py +527,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",الصف # {0}: يجب أن يكون العدد 1، والبند هو أصل ثابت. الرجاء استخدام صف منفصل عن الكمية متعددة.
 DocType: Leave Block List Allow,Leave Block List Allow,ترك قائمة الحظر السماح
 apps/erpnext/erpnext/setup/doctype/company/company.py +249,Abbr can not be blank or space,"الاسم المختصر لا يمكن أن يكون فارغاً أو ""مسافة"""
 apps/erpnext/erpnext/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/stock/get_item_details.py +123,Please specify Company,يرجى تحديد شركة
 ,Customer Acquisition and Loyalty,اكتساب العملاء و الولاء
@@ -1795,25 +1814,27 @@
 apps/erpnext/erpnext/projects/doctype/task/task.js +26,Expense Claims,مطالبات حساب
 DocType: Issue,Support,الدعم
 ,BOM Search,BOM البحث
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Closing (Opening + Totals),إغلاق (فتح + المجاميع)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),إغلاق (فتح + المجاميع)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,يرجى تحديد العملة في الشركة
 DocType: Workstation,Wages per hour,الأجور في الساعة
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +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/controllers/accounts_controller.py +272,Account {0} is invalid. Account Currency must be {1},الحساب {0} غير صحيح. يجب أن تكون عملة الحساب {1}
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},مطلوب عامل UOM التحويل في الصف {0}
+DocType: Email Digest,Pending Sales Orders,في انتظار أوامر البيع
+apps/erpnext/erpnext/controllers/accounts_controller.py +275,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 +956,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",الصف # {0}: يجب أن يكون مرجع نوع الوثيقة واحدة من ترتيب المبيعات، مبيعات فاتورة أو إدخال دفتر اليومية
-DocType: Salary Slip,Deduction,اقتطاع
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +87,Row {0}: From Time and To Time is mandatory.,صف {0}: من الوقت وإلى وقت إلزامي.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +969,"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 +111,Row {0}: From Time and To Time is mandatory.,صف {0}: من الوقت وإلى وقت إلزامي.
+DocType: Stock Reconciliation Item,Amount Difference,مقدار الفرق
 apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},وأضاف البند سعر {0} في قائمة الأسعار {1}
 DocType: Address Template,Address Template,قالب عنوان
-apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +7,Please enter Employee Id of this sales person,الرجاء إدخال رقم الموظف من هذا الشخص المبيعات
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +7,Please enter Employee Id of this sales person,الرجاء إدخال رقم الموظف من رجل المبيعات هذا
 DocType: Territory,Classification of Customers by region,تصنيف العملاء حسب المنطقة
 DocType: Project,% Tasks Completed,مهام٪ تم انهاء
 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 +194,Please enter Production Item first,من فضلك ادخل إنتاج السلعة الأولى
+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,المستخدم معطل
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,تسعيرة
@@ -1822,53 +1843,54 @@
 DocType: Maintenance Visit,Maintenance User,عضو الصيانة
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +149,Cost Updated,تكلفة تحديث
 DocType: Employee,Date of Birth,تاريخ الميلاد
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +86,Item {0} has already been returned,البند {0} تم بالفعل عاد
+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: 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 +177,Job Description,المسمى الوظيفي
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,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 +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","أحرف خاصة باستثناء ""-"" "".""، ""#""، و""/"" غير مسموح به في تسمية الترقيم المتسلسل"
+DocType: Purchase Order Item,Qty as per Stock UOM,الكمية حسب السهم لوحدة قياس السهم
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","أحرف خاصة باستثناء ""-"" "".""، ""#""، و""/"" غير مسموح به في تسمية الترقيم المتسلسل"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.",تتبع الحملات المبيعات. تتبع يؤدي، الاقتباسات، ترتيب المبيعات الخ من الحملات لقياس العائد على الاستثمار.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +24,Welcome to POS: Create your POS Profile,مرحبا بكم في نقاط البيع: إنشاء الملف الشخصي نقاط البيع الخاصة بك
 DocType: Expense Claim,Approver,الموافق
-,SO Qty,SO الكمية
+,SO Qty,كمية طلبات الشراء
+DocType: Guardian,Work Address,عنوان العمل
 DocType: Appraisal,Calculate Total Score,حساب النتيجة الإجمالية
 DocType: Request for Quotation,Manufacturing Manager,مدير التصنيع
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},رقم المسلسل {0} هو تحت الضمان لغاية {1}
+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 +74,Shipments,شحنات
+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 +153,Row # ,الصف #
+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 +156,Get From,احصل عليها من
+apps/erpnext/erpnext/public/js/utils.js +167,Get From,احصل عليها من
 DocType: C-Form,Quarter,ربع
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Miscellaneous Expenses,المصروفات المتنوعة
 DocType: Global Defaults,Default Company,افتراضي شركة
 apps/erpnext/erpnext/controllers/stock_controller.py +167,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,حساب أو حساب الفرق إلزامي القطعة ل {0} لأنها آثار قيمة المخزون الإجمالية
-apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings",لا يمكن overbill ل{0} البند في الصف {1} أكثر من {2}. للسماح بالمغالاة في الفواتير، يرجى ضبط إعدادات في الأوراق المالية
+apps/erpnext/erpnext/controllers/accounts_controller.py +419,"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,-أعلى
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} is disabled,المستخدم {0} تم تعطيل
 DocType: Leave Application,Total Leave Days,مجموع أيام الإجازة
 DocType: Email Digest,Note: Email will not be sent to disabled users,ملاحظة: لن يتم إرسالها إلى البريد الإلكتروني للمستخدمين ذوي الاحتياجات الخاصة
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,حدد الشركة ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,اتركه فارغا إذا نظرت لجميع الإدارات
 apps/erpnext/erpnext/config/hr.py +171,"Types of employment (permanent, contract, intern etc.).",أنواع التوظيف (دائمة أو عقد الخ متدربة ) .
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +346,{0} is mandatory for Item {1},{0} إلزامي للصنف {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,{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",يرجى تحديد المبلغ المخصص، نوع الفاتورة ورقم الفاتورة في أتلست صف واحد
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,تكلفة شراء جديد
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},اوامر البيع المطلوبة القطعة ل {0}
 DocType: Purchase Invoice Item,Rate (Company Currency),معدل (عملة الشركة)
-apps/erpnext/erpnext/demo/setup_data.py +360,Others,آخرون
+DocType: Student Guardian,Others,آخرون
 DocType: Payment Entry,Unallocated Amount,المبلغ غير المخصصة
 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,الضرائب والرسوم
@@ -1888,17 +1910,16 @@
 apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,جرد المتسلسلة
 DocType: Activity Type,Default Billing Rate,افتراضي الفواتير أسعار
 DocType: Sales Invoice,Total Billing Amount,المبلغ الكلي الفواتير
-apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +54,Receivable Account,حساب المستحق
-apps/erpnext/erpnext/controllers/accounts_controller.py +546,Row #{0}: Asset {1} is already {2},الصف # {0}: الأصول {1} هو بالفعل {2}
+apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,حساب المستحق
+apps/erpnext/erpnext/controllers/accounts_controller.py +549,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 +79,CEO,المدير التنفيذي
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,المدير التنفيذي
 DocType: Expense Claim Detail,Expense Claim Detail,تفاصيل مصروف المطالبة
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +808,Please select correct account,يرجى تحديد الحساب الصحيح
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +809,Please select correct account,يرجى تحديد الحساب الصحيح
 DocType: Item,Weight UOM,وحدة قياس الوزن
 DocType: Salary Structure Employee,Salary Structure Employee,موظف الراتب هيكل
 DocType: Employee,Blood Group,فصيلة الدم
-DocType: Purchase Invoice Item,Page Break,فاصل الصفحة
 DocType: Production Order Operation,Pending,ريثما
 DocType: Course,Course Name,اسم الدورة التدريبية
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,المستخدمين الذين يمكنهم الموافقة على الطلبات إجازة موظف معين ل
@@ -1907,14 +1928,15 @@
 DocType: Fiscal Year,Companies,الشركات
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,إلكترونيات
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,رفع طلب المواد عند الأسهم تصل إلى مستوى إعادة الطلب
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Full-time,بدوام كامل
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,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: 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,إجمالي القيمة الواردة
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Debit To is required,مطلوب الخصم ل
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +321,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,مدير الجودة
@@ -1922,28 +1944,28 @@
 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/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
 DocType: Timesheet Detail,To Time,إلى وقت
 DocType: Authorization Rule,Approving Role (above authorized value),الموافقة دور (أعلى قيمة أذن)
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Credit To account must be a Payable account,يجب أن يكون الائتمان لحساب حسابات المدفوعات
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Credit To account must be a Payable account,حساب دائن الى يجب أن يكون من حسابات المدفوعات
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +241,BOM recursion: {0} cannot be parent or child of {2},فاتورة الموارد: {0} لا يمكن ان تكون والد او واد من {2}
 DocType: Production Order Operation,Completed Qty,الكمية المنتهية
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"For {0}, only debit accounts can be linked against another credit entry",ل{0}، فقط حسابات الخصم يمكن ربط ضد دخول ائتمان أخرى
 apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,قائمة الأسعار {0} تم تعطيل
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +99,Row {0}: Completed Qty cannot be more than {1} for operation {2},صف {0}: اكتمال الكمية لا يمكن أن يكون أكثر من {1} لتشغيل {2}
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +123,Row {0}: Completed Qty cannot be more than {1} for operation {2},صف {0}: اكتمال الكمية لا يمكن أن يكون أكثر من {1} لتشغيل {2}
 DocType: Manufacturing Settings,Allow Overtime,تسمح العمل الإضافي
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,يلزم {0} أرقاماً تسلسلية للبند {1}. بينما قدمت {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,معدل التقييم الحالي
 DocType: Item,Customer Item Codes,كود صنف العميل
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,صرف أرباح / خسائر
 DocType: Opportunity,Lost Reason,فقد السبب
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,يرجى الإعداد عددهم سلسلة لحضور عبر الإعداد&gt; ترقيم السلسلة
 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/purchase_receipt/purchase_receipt.py +378,All items have already been invoiced,كل الأصناف قد تم فوترتها من قبل
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +379,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,خارجي
@@ -1959,18 +1981,19 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,العملاء
 apps/erpnext/erpnext/projects/doctype/project/project.py +141,You have been invited to collaborate on the project: {0},لقد وجهت الدعوة إلى التعاون في هذا المشروع: {0}
 DocType: Leave Block List Date,Block Date,منع تاريخ
-apps/erpnext/erpnext/templates/generators/job_opening.html +19,Apply Now,قدم الآن
+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.",إنشاء وإدارة البريد الإلكتروني يوميا هضم وأسبوعية وشهرية .
 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,البنايات
-apps/erpnext/erpnext/utilities/doctype/address/address.py +164,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,لم يتم العثور على قالب عنوان افتراضي. يرجى إنشاء واحدة جديدة من الإعداد&gt; الطباعة والعلامات التجارية&gt; قالب العناوين.
 DocType: Fee Structure,Fee Structure,هيكل الرسوم
 DocType: Timesheet Detail,Costing Amount,تكلف مبلغ
+DocType: Student Admission,Application Fee,رسم الإستمارة
 DocType: Process Payroll,Submit Salary Slip,تسجيل ايصال راتب
-apps/erpnext/erpnext/controllers/selling_controller.py +161,Maxiumm discount for Item {0} is {1}%,خصم Maxiumm القطعة ل {0} {1} ٪
+apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,خصم Maxiumm القطعة ل {0} {1} ٪
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,استيراد بكميات كبيرة
 DocType: Sales Partner,Address & Contacts,معلومات الاتصال والعنوان
 DocType: SMS Log,Sender Name,اسم المرسل
@@ -1995,21 +2018,21 @@
 DocType: Serial No,Delivery Time,وقت التسليم
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,العمر بناءا على
 DocType: Item,End of Life,نهاية الحياة
-apps/erpnext/erpnext/demo/setup_data.py +361,Travel,سفر
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +155,No active or default Salary Structure found for employee {0} for the given dates,لا نشط أو الراتب الافتراضي الهيكل تم العثور عليها ل موظف {0} لتواريخ معينة
+apps/erpnext/erpnext/demo/setup/setup_data.py +304,Travel,سفر
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +167,No active or default Salary Structure found for employee {0} for the given dates,لا نشط أو الراتب الافتراضي الهيكل تم العثور عليها ل موظف {0} لتواريخ معينة
 DocType: Leave Block List,Allow Users,السماح للمستخدمين
 DocType: Purchase Order,Customer Mobile No,العميل رقم هاتفك الجوال
 DocType: Sales Invoice,Recurring,تواتري
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,تتبع الدخل والنفقات منفصل عن القطاعات المنتج أو الانقسامات.
 DocType: Rename Tool,Rename Tool,إعادة تسمية أداة
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +23,Update Cost,تحديث التكلفة
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,تحديث التكلفة
 DocType: Item Reorder,Item Reorder,البند إعادة ترتيب
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +36,Show Salary Slip,زلة مشاهدة الراتب
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +748,Transfer Material,نقل المواد
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +53,Show Salary Slip,زلة مشاهدة الراتب
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +166,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 +923,Please set recurring after saving,الرجاء تعيين المتكررة بعد إنقاذ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +646,Select change amount account,حساب كمية حدد التغيير
+apps/erpnext/erpnext/public/js/controllers/transaction.js +914,Please set recurring after saving,الرجاء تعيين المتكررة بعد إنقاذ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +703,Select change amount account,حساب كمية حدد التغيير
 DocType: Purchase Invoice,Price List Currency,قائمة الأسعار العملات
 DocType: Naming Series,User must always select,يجب دائما مستخدم تحديد
 DocType: Stock Settings,Allow Negative Stock,السماح بالقيم السالبة للمخزون
@@ -2021,34 +2044,35 @@
 DocType: Quality Inspection,Verified By,التحقق من
 DocType: Address,Subsidiary,شركة فرعية
 apps/erpnext/erpnext/setup/doctype/company/company.py +64,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.",لا يمكن تغيير العملة الافتراضية الشركة ، وذلك لأن هناك معاملات القائمة. يجب أن يتم إلغاء المعاملات لتغيير العملة الافتراضية.
+DocType: Grade Interval,Grade Description,الصف الوصف
 DocType: Quality Inspection,Purchase Receipt No,لا شراء استلام
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,العربون
 DocType: Process Payroll,Create Salary Slip,إنشاء زلة الراتب
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +33,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 +352,Quantity in row {0} ({1}) must be same as manufactured quantity {2},كمية في الصف {0} ( {1} ) ويجب أن تكون نفس الكمية المصنعة {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Quantity in row {0} ({1}) must be same as manufactured quantity {2},كمية في الصف {0} ( {1} ) ويجب أن تكون نفس الكمية المصنعة {2}
 DocType: Appraisal,Employee,موظف
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,دعوة كمستخدم
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} فوترت بشكل كامل
 DocType: Workstation Working Hour,End Time,نهاية الوقت
 DocType: Payment Entry,Payment Deductions or Loss,الخصومات الدفع أو الخسارة
-apps/erpnext/erpnext/config/schools.py +100,LMS,LMS
+apps/erpnext/erpnext/config/schools.py +104,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,خط أنابيب المبيعات
 DocType: Student Batch Student,Student Batch Student,طالب دفعة طالب
-DocType: Sales Invoice,Mass Mailing,الشامل البريدية
+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 +199,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/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 +297,Salary Slip of employee {0} already created for this period,زلة راتب الموظف {0} تم إنشاؤها مسبقا لهذه الفترة
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Pharmaceutical,الأدوية
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +309,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/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,الائتمان لل
+DocType: Purchase Invoice,Credit To,دائن الى
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +31,Active Leads / Customers,وصلات نشطة / العملاء
 DocType: Employee Education,Post Graduate,دكتوراة
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,صيانة جدول التفاصيل
@@ -2060,27 +2084,28 @@
 DocType: Upload Attendance,Attendance To Date,الحضور إلى تاريخ
 DocType: Warranty Claim,Raised By,التي أثارها
 DocType: Payment Gateway Account,Payment Account,حساب الدفع
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +814,Please specify Company to proceed,يرجى تحديد الشركة للمضي قدما
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +793,Please specify Company to proceed,يرجى تحديد الشركة للمضي قدما
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Receivable,صافي التغير في حسابات المقبوضات
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Compensatory Off,التعويضية
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,التعويضية
 DocType: Quality Inspection Reading,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.,من فضلك تأكد من حقا تريد حذف جميع المعاملات لهذه الشركة. ستبقى البيانات الرئيسية الخاصة بك كما هو. لا يمكن التراجع عن هذا الإجراء.
 DocType: Room,Room Number,رقم الغرفة
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},مرجع غير صالح {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +161,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) لا يمكن أن تتخطي الكمية المخططة {2} في أمر الانتاج {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +162,{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 +217,Raw Materials cannot be blank.,المواد الخام لا يمكن أن يكون فارغا.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,"Could not update stock, invoice contains drop shipping item.",تعذر تحديث المخزون، فاتورة تحتوي انخفاض الشحن البند.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +460,Quick Journal Entry,خيارات مجلة الدخول
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +111,You can not change rate if BOM mentioned agianst any item,لا يمكنك تغيير معدل إذا ذكر BOM agianst أي بند
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +441,"Could not update stock, invoice contains drop shipping item.",تعذر تحديث المخزون، فاتورة تحتوي انخفاض الشحن البند.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Quick Journal Entry,خيارات مجلة الدخول
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +103,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 +214,{0} {1} is not submitted,{0} {1} لم يتم تأكيده
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,طلبات البنود.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,سيتم إنشاء منفصلة أمر الإنتاج لمادة جيدة لكل النهائي.
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +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.,اسم المعهد الذي كنت تقوم بإعداد هذا النظام.
@@ -2089,16 +2114,17 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,حالة المشروع
 DocType: UOM,Check this to disallow fractions. (for Nos),الاختيار هذه لكسور عدم السماح بها. (لNOS)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +398,The following Production Orders were created:,تم إنشاء أوامر الإنتاج التالية:
+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 +739,Item or Warehouse for row {0} does not match Material Request,البند أو مستودع لل صف {0} لا يطابق المواد طلب
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +747,Item or Warehouse for row {0} does not match Material Request,البند أو مستودع لل صف {0} لا يطابق المواد طلب
 apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,وحدة القياس
 DocType: Fiscal Year,Year End Date,تاريخ نهاية العام
 DocType: Task Depends On,Task Depends On,المهمة تعتمد على
-DocType: Lead,Opportunity,فرصة
+DocType: Supplier Quotation,Opportunity,فرصة
 ,Completed Production Orders,أوامر الإنتاج المنتهية
 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,محطة العمل الافتراضية
@@ -2111,7 +2137,7 @@
 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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},صيانة تاريخ بداية لا يمكن أن يكون قبل تاريخ التسليم لل رقم المسلسل {0}
+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,تاريخ الإنتهاء الفعلي
 DocType: Purchase Invoice,PINV-,PINV-
 DocType: Authorization Rule,Applicable To (Role),تنطبق على (الدور)
@@ -2123,10 +2149,10 @@
 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),التسعير الاساسي استنادأ لوحدة القياس
-DocType: SMS Log,No of Requested SMS,لا للSMS مطلوب
+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 +729,Please supply the specified items at the best possible rates,يرجى تزويد البنود المحددة بأفضل الأسعار الممكنة
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +695,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 +117,Contract End Date must be greater than Date of Joining,يجب أن يكون تاريخ انتهاء العقد أكبر من تاريخ الالتحاق بالعمل
 DocType: Delivery Note,DN-,DN-
@@ -2135,7 +2161,7 @@
 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 +14,This is an example website auto-generated from ERPNext,هذا مثال موقع ولدت لصناعة السيارات من ERPNext
+apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,هذا مثال موقع ولدت لصناعة السيارات من ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,العمر مدى 1
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
@@ -2182,13 +2208,14 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd الكمية
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +54,Fee Records Created - {0},السجلات رسوم المنشأة - {0}
 DocType: Asset Category Account,Asset Category Account,حساب الأصول الفئة
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +103,Cannot produce more Item {0} than Sales Order quantity {1},لا يمكن أن تنتج أكثر تفاصيل {0} من المبيعات كمية الطلب {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Stock Entry {0} is not submitted,الحركة المخزنية {0} غير مسجلة
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},لا يمكن أن تنتج أكثر تفاصيل {0} من المبيعات كمية الطلب {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +505,Stock Entry {0} is not submitted,الحركة المخزنية {0} غير مسجلة
 DocType: Payment Reconciliation,Bank / Cash Account,البنك حساب / النقدية
 DocType: Tax Rule,Billing City,مدينة الفوترة
 DocType: Salary Component Account,Salary Component Account,حساب مكون الراتب
 DocType: Global Defaults,Hide Currency Symbol,إخفاء رمز العملة
 apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card",على سبيل المثال البنك، نقدا، بطاقة الائتمان
+DocType: Lead Source,Source Name,اسم المصدر
 DocType: Journal Entry,Credit Note,ملاحظة الائتمان
 DocType: Warranty Claim,Service Address,عنوان الخدمة
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furnitures and Fixtures,أثاث وتركيبات
@@ -2200,6 +2227,7 @@
 DocType: Opportunity,Customer / Lead Name,الزبون/ اسم الدليل
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +89,Clearance Date not mentioned,إزالة التاريخ لم يرد ذكرها
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,الإنتاج
+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/controllers/trends.py +19,Total(Qty),إجمالي (الكمية)
 DocType: Sales Invoice,This Document,هذا المستند
@@ -2211,15 +2239,15 @@
 DocType: Purchase Receipt,Time at which materials were received,الوقت الذي وردت المواد
 DocType: Stock Ledger Entry,Outgoing Rate,أسعار المنتهية ولايته
 apps/erpnext/erpnext/config/hr.py +176,Organization branch master.,فرع المؤسسة الرئيسية .
-apps/erpnext/erpnext/controllers/accounts_controller.py +273, or ,أو
+apps/erpnext/erpnext/controllers/accounts_controller.py +276, 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 +203,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,الصف # {0}: إدخال دفتر اليومية {1} لا يكن لديك حساب {2} أو بالفعل يضاهي ضد قسيمة أخرى
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +206,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 +90,No employee for the above selected criteria OR salary slip already created,أي موظف للمعايير المحدد أعلاه أو قسيمة الراتب تم إنشاؤها مسبقا
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +93,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,الدفع نوع
@@ -2247,8 +2275,8 @@
 DocType: Product Bundle,Parent Item,البند الاصلي
 DocType: Account,Account Type,نوع الحساب
 DocType: Delivery Note,DN-RET-,DN-RET-
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +115,Leave Type {0} cannot be carry-forwarded,ترك نوع {0} لا يمكن إعادة توجيهها ترحيل
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',لم يتم إنشاء الجدول الصيانة ل كافة العناصر. الرجاء انقر على ' إنشاء الجدول '
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +118,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 +163,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",لصف {0} في {1}. لتشمل {2} في سعر البند، {3} يجب أيضا أن يدرج الصفوف
@@ -2260,13 +2288,13 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +32,Disabled template must not be default template,لا يجب أن يكون قالب تعطيل القالب الافتراضي
 DocType: Account,Income Account,دخل الحساب
 DocType: Payment Request,Amount in customer's currency,المبلغ بعملة العميل
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +748,Delivery,تسليم
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +742,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,مفتاح مسؤولية المنطقة
 DocType: Payment Entry,Total Allocated Amount,إجمالي المبلغ المخصص
 DocType: Item Reorder,Material Request Type,طلب نوع المواد
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +82,Row {0}: UOM Conversion Factor is mandatory,الصف {0}: UOM معامل التحويل إلزامي
+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,مركز التكلفة
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,سند #
@@ -2277,13 +2305,13 @@
 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 +90,Head of Marketing and Sales,رئيس التسويق والمبيعات
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,ضريبة الدخل
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,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 +403,Please enter Item Code to get batch no,الرجاء إدخال رمز المدينة للحصول على دفعة لا
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +770,Please select a value for {0} quotation_to {1},يرجى تحديد قيمة ل {0} {1} quotation_to
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +397,Please enter Item Code to get batch no,الرجاء إدخال رمز المدينة للحصول على دفعة لا
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +764,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",دمج غير ممكن إلا إذا الخصائص التالية هي نفسها في كل السجلات. هي المجموعة، نوع الجذر، شركة
@@ -2295,28 +2323,29 @@
 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 +100,Issues,قضايا
+apps/erpnext/erpnext/hooks.py +109,Issues,قضايا
 apps/erpnext/erpnext/controllers/status_updater.py +13,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,الفواتير العملات
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Large,كبير جدا
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,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 +507,Warning: Another {0} # {1} exists against stock entry {2},موجود آخر {0} # {1} ضد حركة مخزنية {2}: تحذير
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Local,محلي
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +508,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),القروض والسلفيات (الأصول )
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,المدينين
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Large,كبير
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,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 +225,Total {0} ({1}),إجمالي {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +224,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,أسلوب التقييم الافتراضي
@@ -2332,7 +2361,7 @@
 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.,جميع معاملات البيع يمكن اختيار ضد عدة ** أشخاص المبيعات ** بحيث يمكنك تعيين ورصد الأهداف.
+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 +150,Please create Customer from Lead {0},يرجى إنشاء العملاء من الرصاص {0}
 DocType: Price List,Applicable for Countries,ينطبق على البلدان
@@ -2374,9 +2403,9 @@
 DocType: Attendance,Leave Type,ترك نوع
 apps/erpnext/erpnext/controllers/stock_controller.py +173,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"حساب / حساب الفرق ({0}) يجب أن يكون الربح أو الخسارة ""حساب"
 DocType: Account,Accounts User,حسابات المستخدمين
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Name error: {0},خطأ اسم: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +90,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 +178,{0} {1} does not associated with {2} {3},{0} {1} غير مترابط مع {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +181,{0} {1} does not associated with {2} {3},{0} {1} غير مترابط مع {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,الحضور للموظف {0} تم وضع علامة بالفعل
 DocType: Packing Slip,If more than one package of the same type (for print),إذا كان أكثر من حزمة واحدة من نفس النوع (للطباعة)
 DocType: Warehouse,Parent Warehouse,مستودع الوالدين
@@ -2388,14 +2417,14 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +38,{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,طلب الكمية
+,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,مناقشات
 DocType: BOM Item,Scrap %,الغاء٪
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection",وسيتم توزيع تستند رسوم متناسب على الكمية البند أو كمية، حسب اختيارك
 DocType: Maintenance Visit,Purposes,أغراض
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,على الأقل يجب إدخال عنصر واحد بقيمة سالبة في الوثيقة العوائد
+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 +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations",عملية {0} أطول من أي ساعات العمل المتاحة في محطة {1}، وتحطيم العملية في عمليات متعددة
 ,Requested,طلب
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +83,No Remarks,لا ملاحظات
@@ -2407,46 +2436,46 @@
 DocType: Item,Total Projected Qty,توقعات مجموع الكمية
 DocType: Monthly Distribution,Distribution Name,توزيع الاسم
 DocType: Course,Course Code,رمز المقرر
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Quality Inspection required for Item {0},التفتيش الجودة المطلوبة القطعة ل {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Quality Inspection required for Item {0},التفتيش الجودة المطلوبة القطعة ل {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,المعدل الذي يتم تحويل العملة إلى عملة العميل قاعدة الشركة
 DocType: Purchase Invoice Item,Net Rate (Company Currency),صافي معدل (شركة العملات)
 DocType: Salary Detail,Condition and Formula Help,حالة والفورمولا مساعدة
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,إدارة شجرة الإقليم.
 DocType: Journal Entry Account,Sales Invoice,فاتورة مبيعات
 DocType: Journal Entry Account,Party Balance,ميزان الحزب
-apps/erpnext/erpnext/accounts/page/pos/pos.js +475,Please select Apply Discount On,الرجاء حدد تطبيق خصم على
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +92,Salary Slip Created,زلة الراتب المنشأة
+apps/erpnext/erpnext/accounts/page/pos/pos.js +464,Please select Apply Discount On,الرجاء حدد تطبيق خصم على
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +95,Salary Slip Created,زلة الراتب المنشأة
 DocType: Company,Default Receivable Account,حساب المقبوضات الافتراضي
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,انشاء دخول بنك الراتب الإجمالي المدفوع للمعايير المحدد أعلاه
 DocType: Stock Entry,Material Transfer for Manufacture,نقل المواد لتصنيع
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,نسبة خصم يمكن تطبيقها إما ضد قائمة الأسعار أو لجميع قائمة الأسعار.
 DocType: Purchase Invoice,Half-yearly,نصف سنوية
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +384,Accounting Entry for Stock,القيود المحاسبية لمخزون
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +387,Accounting Entry for Stock,القيود المحاسبية لمخزون
 DocType: Sales Invoice,Sales Team1,مبيعات Team1
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,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 +96,Row {0}: Completed Qty must be greater than zero.,صف {0}: يجب أن تكتمل الكمية أكبر من الصفر.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +120,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 +88,Row # {0}: Cannot return more than {1} for Item {2},الصف # {0}: لا يمكن إرجاع أكثر من {1} للالبند {2}
+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,مؤامرة
 DocType: Item Group,Show this slideshow at the top of the page,تظهر هذه الشرائح في أعلى الصفحة
-DocType: BOM,Item UOM,البند 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 +147,Target warehouse is mandatory for row {0},المستودع المستهدف إلزامي لصف {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,حدد مزود العناوين
 DocType: Quality Inspection,Quality Inspection,فحص الجودة
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Extra Small,اضافية الصغيرة
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,Warning: Material Requested Qty is less than Minimum Order Qty,تحذير : كمية المواد المطلوبة  هي أقل من الحد الأدنى للطلب الكمية
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +194,Account {0} is frozen,الحساب {0} مجمّد
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,اضافية الصغيرة
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +690,Warning: Material Requested Qty is less than Minimum Order Qty,تحذير : كمية المواد المطلوبة  هي أقل من الحد الأدنى للطلب الكمية
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,الحساب {0} مجمّد
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,كيان قانوني / الفرعية مع مخطط مستقل للحسابات تابعة للمنظمة.
 DocType: Payment Request,Mute Email,كتم البريد الإلكتروني
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco",الغذاء و المشروبات و التبغ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +606,Can only make payment against unbilled {0},ان تجعل دفع فواتير فقط ضد {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +126,Commission rate cannot be greater than 100,معدل العمولة لا يمكن أن يكون أكبر من 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +609,Can only make payment against unbilled {0},ان تجعل دفع فواتير فقط ضد {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,معدل العمولة لا يمكن أن يكون أكبر من 100
 DocType: Stock Entry,Subcontract,قام بمقاولة فرعية
 apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,الرجاء إدخال {0} أولا
 DocType: Production Order Operation,Actual End Time,الفعلي وقت الانتهاء
@@ -2454,33 +2483,33 @@
 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: 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 +158,Colour,اللون
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,اللون
 DocType: Maintenance Visit,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; وليس هناك حزمة المنتجات الأخرى
 DocType: Student Log,Academic,أكاديمي
-apps/erpnext/erpnext/controllers/accounts_controller.py +469,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),مجموع مقدما ({0}) ضد النظام {1} لا يمكن أن يكون أكبر من المجموع الكلي ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +472,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),مجموع مقدما ({0}) ضد النظام {1} لا يمكن أن يكون أكبر من المجموع الكلي ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,اختر التوزيع الشهري لتوزيع غير متساو أهداف على مدى عدة شهور.
 DocType: Purchase Invoice Item,Valuation Rate,تقييم قيم
+DocType: Stock Reconciliation,SR/,ريال سعودى/
 apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,قائمة أسعار العملات غير محددة
 DocType: Assessment,Results,النتائج
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +168,Employee {0} has already applied for {1} between {2} and {3},موظف {0} وقد طبقت بالفعل ل {1} {2} بين و {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +175,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: Student Applicant,Father's/ Guardian 2 Email ID,الأب / الجارديان معرف 2 البريد الإلكتروني
 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 +228,Warehouses with existing transaction can not be converted to group.,المستودعات مع الصفقة الحالية لا يمكن أن يتم تحويلها إلى المجموعة.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +231,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 +93,Researcher,الباحث
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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.,فحص الجودة واردة.
@@ -2492,25 +2521,25 @@
 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: Sales Invoice,Advertisement,إعلان
 DocType: Asset Category Account,Depreciation Expense Account,حساب الاستهلاك النفقات
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Probationary Period,فترة الاختبار
-apps/erpnext/erpnext/hooks.py +102,Announcements,إعلانات
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,فترة الاختبار
+apps/erpnext/erpnext/hooks.py +111,Announcements,إعلانات
 DocType: Customer Group,Only leaf nodes are allowed in transaction,ويسمح العقد ورقة فقط في المعاملة
 DocType: Expense Claim,Expense Approver,حساب الموافق
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +109,Row {0}: Advance against Customer must be credit,الصف {0}: يجب أن يكون مقدما ضد العملاء الائتمان
 apps/erpnext/erpnext/accounts/doctype/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 +16,To Datetime,إلى التاريخ والوقت
+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/scheduling_tool/scheduling_tool.py +51,Course Schedules deleted:,جداول بالطبع حذفها:
 apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,سجلات للحفاظ على حالة تسليم الرسائل القصيرة
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,الأنشطة المعلقة
+DocType: Accounts Settings,Make Payment via Journal Entry,جعل الدفع عن طريق إدخال دفتر اليومية
+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 +127,Please enter relieving date.,من فضلك ادخل تاريخ التخفيف .
-apps/erpnext/erpnext/controllers/trends.py +145,Amt,AMT
+apps/erpnext/erpnext/controllers/trends.py +149,Amt,AMT
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,Only Leave Applications with status 'Approved' can be submitted,اترك فقط مع وضع تطبيقات ' وافق ' يمكن تقديم
 apps/erpnext/erpnext/utilities/doctype/address/address.py +26,Address Title is mandatory.,إسم العنوان إلزامى (لابد من إدخاله)
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,أدخل اسم الحملة إذا كان مصدر من التحقيق هو حملة
@@ -2528,14 +2557,15 @@
 apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1},تعذر العثور على سعر الصرف ل{0} إلى {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,يوم علامة نصف
 DocType: Sales Invoice,Sales Team,فريق المبيعات
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Duplicate entry,تكرار دخول
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,تكرار دخول
 DocType: Program Enrollment Tool,Get Students,الحصول على الطلاب
 DocType: Serial No,Under Warranty,تحت الضمان
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +490,[Error],[خطأ]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +484,[Error],[خطأ]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,وبعبارة تكون مرئية بمجرد حفظ ترتيب المبيعات.
 ,Employee Birthday,عيد ميلاد موظف
 apps/erpnext/erpnext/controllers/status_updater.py +175,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} موجود بالفعل. يرجى تعديل هذه الإدخالات وحاول مرة أخرى.
 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} غير موجود
@@ -2551,29 +2581,29 @@
 ,Issued Items Against Production Order,الأصناف التي صدرت بحق أمر الإنتاج
 DocType: Pricing Rule,Purchase Manager,مدير المشتريات
 DocType: Target Detail,Target Detail,الهدف التفاصيل
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +25,All Jobs,جميع الوظائف
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,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 +323,Amount {0} {1} {2} {3},مبلغ {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,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: Supplier,Credit Limit,الحد الائتماني
 DocType: Production Plan Sales Order,Salse Order Date,Salse ترتيب التاريخ
 DocType: Salary Component,Salary Component,مكون الراتب
-apps/erpnext/erpnext/accounts/utils.py +372,Payment Entries {0} are un-linked,مقالات دفع {0} والامم المتحدة ومرتبطة
+apps/erpnext/erpnext/accounts/utils.py +449,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 +497,Material Requests {0} created,طلبات المواد {0} خلق
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +498,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.,قالب الشروط أو العقد.
 DocType: Purchase Invoice,Address and Contact,العناوين و التواصل
 DocType: Cheque Print Template,Is Account Payable,هو حساب المدفوعات
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +260,Stock cannot be updated against Purchase Receipt {0},لا يمكن تحديث المخزون ضد إيصال الشراء {0}
 DocType: Supplier,Last Day of the Next Month,اليوم الأخير من الشهر المقبل
-DocType: Employee,Feedback,تعليقات
+DocType: Employee,Feedback,ملاحظات
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",إجازة لا يمكن تخصيصها قبل {0}، كما كان رصيد الإجازة بالفعل في السجل تخصيص إجازة في المستقبل إعادة توجيهها تحمل {1}
 apps/erpnext/erpnext/accounts/party.py +305,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),ملاحظة: نظرا / المرجعي تاريخ يتجاوز المسموح أيام الائتمان العملاء التي كتبها {0} يوم (s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +9,Student Applicant,مقدم الطلب طالب
@@ -2605,7 +2635,7 @@
 DocType: Serial No,Warranty / AMC Details,الضمان / AMC تفاصيل
 DocType: Journal Entry,User Remark,ملاحظة المستخدم
 DocType: Lead,Market Segment,سوق القطاع
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +848,Paid Amount cannot be greater than total negative outstanding amount {0},المبلغ المدفوع لا يمكن أن يكون أكبر من إجمالي المبلغ المستحق السلبي {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +859,Paid Amount cannot be greater than total negative outstanding amount {0},المبلغ المدفوع لا يمكن أن يكون أكبر من إجمالي المبلغ المستحق السلبي {0}
 DocType: Employee Internal Work History,Employee Internal Work History,التاريخ الموظف العمل الداخلية
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +233,Closing (Dr),إغلاق (الدكتور)
 DocType: Cheque Print Template,Cheque Size,شيكات الحجم
@@ -2615,7 +2645,7 @@
 apps/erpnext/erpnext/config/selling.py +159,Tax template for selling transactions.,قالب الضريبية لبيع صفقة.
 DocType: Sales Invoice,Write Off Outstanding Amount,شطب المبلغ المستحق
 DocType: Account,Accounts Manager,مدير حسابات
-DocType: Stock Settings,Default Stock UOM,افتراضي ألبوم UOM
+DocType: Stock Settings,Default Stock UOM,افتراضي وحدة قياس السهم
 DocType: Asset,Number of Depreciations Booked,عدد من التلفيات حجزت
 DocType: Landed Cost Item,Receipt Document,وثيقة استلام
 DocType: Production Planning Tool,Create Material Requests,إنشاء طلبات المواد
@@ -2626,7 +2656,8 @@
 ,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 +555,'Update Stock' cannot be checked for fixed asset sale,"تحديث المخزون""  لا يمكن إختياره من مبيعات الأصول الثابته"""
+DocType: Student Guardian,Father,الآب
+apps/erpnext/erpnext/controllers/accounts_controller.py +558,'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/buying/doctype/purchase_order/purchase_order.py +132,Material Request {0} is cancelled or stopped,طلب المواد {0} تم إلغاء أو توقف
@@ -2634,17 +2665,17 @@
 apps/erpnext/erpnext/config/hr.py +243,Leave Management,ترك الإدارة
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,مجموعة بواسطة حساب
 DocType: Sales Order,Fully Delivered,سلمت بالكامل
-DocType: Lead,Lower Income,ذات الدخل المنخفض
+DocType: Lead,Lower Income,دخل أدنى
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked",رئيس الاعتبار في إطار المسؤولية، التي سيتم حجزها الربح / الخسارة
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +166,Source and target warehouse cannot be same for row {0},مصدر و مستودع الهدف لا يمكن أن يكون نفس الصف ل {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",يجب أن يكون حساب الفرق حساب نوع الأصول / الخصوم، لأن هذا المخزون المصالحة هو الدخول افتتاح
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +81,Purchase Order number required for Item {0},عدد طلب شراء مطلوب القطعة ل {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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/purchase_receipt/purchase_receipt.py +82,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 +17,Cannot change status as student {0} is linked with student application {1},لا يمكن تغيير الوضع كما طالب {0} يرتبط مع تطبيق طالب {1}
+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: Timesheet,"List of employee which has ""Salary Slip Based on Timesheet"" is enabled in salary structure.",يتم تمكين قائمة الموظف الذي لديه &quot;زلة الراتب بناء على الجدول الزمني&quot; في هيكل المرتبات.
 DocType: Asset,Fully Depreciated,استهلكت بالكامل
 ,Stock Projected Qty,كمية المخزون المتوقعة
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Customer {0} does not belong to project {1},الزبون {0} لا تنتمي لمشروع {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,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,رقم المسلسل و الدفعة
@@ -2656,9 +2687,9 @@
 DocType: Purchase Invoice,Purchase Taxes and Charges,الضرائب والرسوم الشراء
 ,Qty to Receive,الكمية للاستلام
 DocType: Leave Block List,Leave Block List Allowed,ترك قائمة الحظر مسموح
-apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +55,All Warehouses,جميع المستودعات
+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 +105,Credit To account must be a Balance Sheet account,يجب أن يكون الائتمان لحساب حساب الميزانية العمومية
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Credit To account must be a Balance Sheet account,حساب دائن الى يجب أن يكون من حسابات الميزانية العمومية
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,جميع أنواع  الموردين
 DocType: Global Defaults,Disable In Words,تعطيل في الكلمات
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,Item Code is mandatory because Item is not automatically numbered,كود البند إلزامي لأن السلعة بسهولة و غير مرقمة تلقائيا
@@ -2668,24 +2699,24 @@
 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/manufacturing/doctype/bom/bom.js +26,Browse BOM,تصفح فاتورة الموارد
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,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/asset/depreciation.py +94,Please set Depreciation related Accounts in Asset Category {0} or Company {1},الرجاء ضبط الحسابات المتعلقة الاستهلاك في الفئة الأصول {0} أو شركة {1}
-DocType: Academic Year,Academic Year,السنة الأكاديمية
+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,ادارة العلاقات مع الزبائن
+DocType: Lead,CRM,إدارة علاقات الزبائن
 DocType: Appraisal,Appraisal,تقييم
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +136,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 +197,Leave approver must be one of {0},"الموافق عل الاجازة يجب ان يكون واحد من 
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,Leave approver must be one of {0},"الموافق عل الاجازة يجب ان يكون واحد من 
 {0}"
 DocType: Hub Settings,Seller Email,البريد الإلكتروني للبائع
 DocType: Project,Total Purchase Cost (via Purchase Invoice),مجموع تكلفة الشراء (عن طريق شراء الفاتورة)
 DocType: Workstation Working Hour,Start Time,بداية
 DocType: Item Price,Bulk Import Help,مساعده استيراد بالجمله
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +256,Select Quantity,إختيار الكمية
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +257,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,رسالة المرسلة
@@ -2702,6 +2733,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,إما الكمية المستهدفة أو المبلغ المستهدف إلزامي.
 apps/erpnext/erpnext/config/projects.py +45,Cost of various activities,تكلفة الأنشطة المختلفة
 apps/erpnext/erpnext/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 +149,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}
 DocType: Item,Inspection Required,التفتيش مطلوب
@@ -2721,7 +2753,7 @@
 DocType: Expense Claim,Approval Status,حالة القبول
 DocType: Hub Settings,Publish Items to Hub,نشر عناصر إلى المحور
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},من القيمة يجب أن يكون أقل من القيمة ل في الصف {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Wire Transfer,حوالة مصرفية
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,حوالة مصرفية
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,تحقق من الكل
 DocType: Sales Order,Recurring Order,ترتيب متكرر
 DocType: Company,Default Income Account,حساب الدخل الافتراضي
@@ -2733,21 +2765,19 @@
 ,Welcome to ERPNext,مرحبا بكم في ERPNext
 apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,تؤدي إلى الاقتباس
 DocType: Lead,From Customer,من العملاء
-apps/erpnext/erpnext/demo/setup_data.py +357,Calls,المكالمات
+apps/erpnext/erpnext/demo/setup/setup_data.py +300,Calls,المكالمات
 DocType: Project,Total Costing Amount (via Time Logs),المبلغ الكلي التكاليف (عبر الزمن سجلات)
-DocType: Purchase Order Item Supplied,Stock UOM,الوحدة
-apps/erpnext/erpnext/stock/doctype/item/item.py +466,"As there are existing transactions for this item, \
-							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","كما أن هناك معاملات الموجودة لهذا البند، \ لا يمكنك تغيير قيم ""ليس لديه رقم تسلسلي'،' لديه رقم دفعة '،' هل البند مخزون"" و ""أسلوب التقييم '"
+DocType: Purchase Order Item Supplied,Stock UOM,وحدة قياس السهم
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,Purchase Order {0} is not submitted,طلب شراء {0} لم تقدم
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,المتوقع
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},رقم المسلسل {0} لا ينتمي إلى مستودع {1}
 apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,ملاحظة : سوف النظام لا تحقق الإفراط التسليم و الإفراط في حجز القطعة ل {0} حيث الكمية أو المبلغ 0
 DocType: Notification Control,Quotation Message,رسالة التسعيرة
 DocType: Issue,Opening Date,تاريخ الفتح
-apps/erpnext/erpnext/schools/api.py +58,Attendance has been marked successfully.,تم وضع علامة الحضور بنجاح.
+apps/erpnext/erpnext/schools/api.py +57,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 +136,Account Type for {0} must be {1},نوع الحساب {0} يجب ان يكون {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +139,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,كلا مستودع يجب أن تنتمي إلى نفس الشركة
@@ -2762,12 +2792,13 @@
 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/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 +20,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,اقتباس السلسلة
+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 +1190,Please select customer,الرجاء تحديد العملاء
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1193,Please select customer,الرجاء تحديد العملاء
 DocType: C-Form,I,أنا
 DocType: Company,Asset Depreciation Cost Center,مركز تكلفة إستهلاك الأصول
 DocType: Sales Order Item,Sales Order Date,تاريخ اوامر البيع
@@ -2777,6 +2808,7 @@
 ,Payment Period Based On Invoice Date,طريقة الدفع بناء على تاريخ الفاتورة
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},في عداد المفقودين أسعار صرف العملات ل{0}
 DocType: Assessment,Examiner,محقق
+DocType: Student,Siblings,الأخوة والأخوات
 DocType: Journal Entry,Stock Entry,إدخال مخزون
 DocType: Payment Entry,Payment References,المراجع الدفع
 DocType: C-Form,C-FORM-,C-نموذج-
@@ -2794,11 +2826,12 @@
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,اسم الموضوع
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,يجب اختيار واحدة على الاقل من المبيعات او المشتريات
+DocType: Grading Structure,Grade Intervals,فترات الصف
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,حدد طبيعة عملك.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,حيث تتم عمليات التصنيع.
 DocType: Asset Movement,Source Warehouse,مصدر مستودع
 DocType: Installation Note,Installation Date,تثبيت تاريخ
-apps/erpnext/erpnext/controllers/accounts_controller.py +534,Row #{0}: Asset {1} does not belong to company {2},الصف # {0}: الأصول {1} لا تنتمي إلى شركة {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +537,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,مبيعات العضو
@@ -2806,41 +2839,44 @@
 DocType: Account,Accumulated Depreciation,مجمع الإستهلاك
 DocType: Stock Entry,Customer or Supplier Details,العملاء أو الموردين بيانات
 DocType: Lead,Lead Owner,مسئول مبادرة البيع
-DocType: Bin,Requested Quantity,طلب الكمية
+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-
 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 +111,Date Of Retirement must be greater than Date of Joining,تاريخ التقاعد يجب أن يكون أكبر من تاريخ الالتحاق بالعمل
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +49,There were errors while scheduling course on :,كانت هناك أخطاء أثناء جدولة الدورة على:
 DocType: Sales Invoice,Against Income Account,مقابل حساب الدخل
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +87,{0}% Delivered,{0} سلمت٪
+apps/erpnext/erpnext/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 +379,Please set default {0} in Company {1},الرجاء تعيين الافتراضي {0} في شركة {1}
+apps/erpnext/erpnext/accounts/utils.py +456,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,الربح الإجمالي / الخسارة
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,شراء السلعة ترتيب الموردة
 apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,اسم الشركة لا يمكن أن تكون الشركة
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,رؤساء إلكتروني لقوالب الطباعة.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,عناوين لقوالب الطباعة على سبيل المثال فاتورة أولية.
+DocType: Student Guardian,Student Guardian,الجارديان طالب
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +184,Valuation type charges can not marked as Inclusive,اتهامات نوع التقييم لا يمكن وضع علامة الشاملة
 DocType: POS Profile,Update Stock,تحديث المخزون
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,سوف UOM مختلفة لعناصر تؤدي إلى غير صحيحة ( مجموع ) صافي قيمة الوزن . تأكد من أن الوزن الصافي من كل عنصر في نفس UOM .
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM أسعار
 DocType: Asset,Journal Entry for Scrap,إدخال دفتر اليومية للخردة
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,يرجى سحب العناصر من التسليم ملاحظة
-apps/erpnext/erpnext/accounts/utils.py +349,Journal Entries {0} are un-linked,مجلة مقالات {0} هي الامم المتحدة ومرتبطة
+apps/erpnext/erpnext/accounts/utils.py +426,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,يرجى ذكر جولة معطلة مركز التكلفة في الشركة
 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,تحليلات المشتريات
 DocType: Sales Invoice Item,Delivery Note Item,ملاحظة تسليم السلعة
@@ -2857,15 +2893,16 @@
 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,منتديات
+DocType: Homepage,"URL for ""All Products""",URL ل &quot;جميع المنتجات&quot;
 DocType: Leave Application,Leave Balance Before Application,رصيد الاجازات قلب الطلب
-DocType: SMS Center,Send SMS,SMS إرسال
+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: Account,Rate at which this tax is applied,المعدل الذي يتم تطبيق هذه الضريبة
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,إعادة ترتيب الكميه
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +29,Current Job Openings,فرص العمل الحالية
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,Current Job Openings,فرص العمل الحالية
 DocType: Company,Stock Adjustment Account,حساب تسوية الأوراق المالية
 DocType: Journal Entry,Write Off,لا تصلح
 DocType: Timesheet Detail,Operation ID,عملية ID
@@ -2878,7 +2915,7 @@
 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 +850,Show tax break-up,مشاهدة الضرائب تفكك
+apps/erpnext/erpnext/public/js/controllers/transaction.js +841,Show tax break-up,مشاهدة الضرائب تفكك
 apps/erpnext/erpnext/accounts/party.py +308,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}، وبالتالي لا يمكنك إعادة تعيين أو تعديله
@@ -2888,10 +2925,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 +534,Please select Posting Date before selecting Party,يرجى تحديد تاريخ النشر قبل اختيار الحزب
 DocType: Serial No,Out of AMC,من AMC
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +80,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 +162,Please contact to the user who have Sales Master Manager {0} role,يرجى الاتصال للمستخدم الذين لديهم مدير المبيعات ماستر {0} دور
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +195,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 +5,This is based on the attendance of this Student,ويستند هذا على حضور هذا الطالب
@@ -2900,12 +2938,11 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,تسليم ملاحظات {0} يجب أن يتم إلغاء هذا الأمر قبل إلغاء المبيعات
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +75,Paid amount + Write Off Amount can not be greater than Grand Total,المبلغ المدفوع + شطب المبلغ لا يمكن أن يكون أكبر من المجموع الكلي
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,{0} is not a valid Batch Number for Item {1},{0} ليس رقم الدفعة صالحة للصنف {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +138,Note: There is not enough leave balance for Leave Type {0},ملاحظة : ليس هناك ما يكفي من التوازن إجازة ل إجازة نوع {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,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,الفرصة نوع
+DocType: Opportunity,Opportunity Type,نوع الفرصة
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,شركة جديدة
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,Cost Center is required for 'Profit and Loss' account {0},"مطلوب مركز تكلفة الربح و الخسارة "" حساب {0}"
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,لا يمكن حذف المعاملات من قبل خالق الشركة
 apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,عدد غير صحيح من دفتر الأستاذ العام التسجيلات وجد. كنت قد قمت بتحديد حساب خاطئ في المعاملة.
 DocType: Cheque Print Template,Cheque Width,عرض شيكات
@@ -2914,16 +2951,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,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 +228,{0} '{1}' is disabled,{0} '{1}' معطل
+apps/erpnext/erpnext/controllers/accounts_controller.py +231,{0} '{1}' is disabled,{0} '{1}' معطل
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,على النحو المفتوحة
 DocType: Cheque Print Template,Scanned Cheque,الممسوحة ضوئيا شيك
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,إرسال رسائل البريد الإلكتروني التلقائي لاتصالات على المعاملات تقديم.
+DocType: Timesheet,Total Billable Amount,المبلغ الكلي القابل للمحاسبة
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,البند 3
 DocType: Purchase Order,Customer Contact Email,العملاء الاتصال البريد الإلكتروني
 DocType: Warranty Claim,Item and Warranty Details,البند والضمان تفاصيل
 DocType: Sales Team,Contribution (%),مساهمة (٪)
-apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"ملاحظة : لن يتم إنشاء الدفع منذ دخول ' النقد أو البنك الحساب "" لم يتم تحديد"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Responsibilities,المسؤوليات
+apps/erpnext/erpnext/controllers/accounts_controller.py +78,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,المسؤوليات
 DocType: Expense Claim Account,Expense Claim Account,حساب حساب المطالبة
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,قالب
 DocType: Sales Person,Sales Person Name,اسم رجل المبيعات
@@ -2931,6 +2969,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,إضافة مستخدمين
 DocType: Pricing Rule,Item Group,مجموعة البند
 DocType: Item,Safety Stock,سهم سلامة
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,البند الرمز&gt; البند المجموعة&gt; العلامة التجارية
 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),الضرائب والرسوم المضافة (عملة الشركة)
@@ -2940,7 +2979,6 @@
 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: Timesheet,Total Hours,مجموع ساعات
 DocType: Journal Entry,Printing Settings,إعدادات الطباعة
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Total Debit must be equal to Total Credit. The difference is {0},يجب أن يكون إجمالي الخصم يساوي إجمالي الائتمان .
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,السيارات
@@ -2953,13 +2991,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,الخدمات المصرفية الاستثمارية
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +71,Cash or Bank Account is mandatory for making payment entry,نقدا أو الحساب المصرفي إلزامي لجعل الدخول الدفع
 DocType: Purchase Invoice,Price List Exchange Rate,معدل سعر صرف قائمة
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,العملاء&gt; مجموعة العملاء&gt; الأراضي
 DocType: Purchase Invoice Item,Rate,معدل
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Intern,المتدرب
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,المتدرب
 DocType: Stock Entry,From BOM,من BOM
 DocType: Assessment,Assessment Code,كود التقييم
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +32,Basic,الأساسية
+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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',الرجاء انقر على ' إنشاء الجدول '
+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 +95,Reference No is mandatory if you entered Reference Date,المرجعية لا إلزامي إذا كنت دخلت التاريخ المرجعي
@@ -2968,11 +3007,11 @@
 DocType: Salary Slip,Salary Structure,هيكل المرتبات
 DocType: Account,Bank,مصرف
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,شركة الطيران
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +752,Issue Material,قضية المواد
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +723,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 +683,You are in offline mode. You will not be able to reload until you have network.,كنت في وضع غير متصل بالشبكة. أنت لن تكون قادرة على تحميل حتى يكون لديك شبكة.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +665,You are in offline mode. You will not be able to reload until you have network.,كنت في وضع غير متصل بالشبكة. أنت لن تكون قادرة على تحميل حتى يكون لديك شبكة.
 DocType: Hub Settings,Access Token,رمز وصول
 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,رقم المسلسل
@@ -2980,33 +3019,35 @@
 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 +1122,Enter value must be positive,يجب أن يكون إدخال قيمة ايجابية
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,All Territories,جميع الأقاليم
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1125,Enter value must be positive,يجب أن يكون إدخال قيمة ايجابية
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,جميع الأقاليم
 DocType: Purchase Invoice,Items,البنود
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +23,Student is already enrolled.,والتحق بالفعل طالب.
 DocType: Fiscal Year,Year Name,اسم العام
 DocType: Process Payroll,Process Payroll,عملية كشوف المرتبات
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,هناك أكثر من العطلات أيام عمل من هذا الشهر.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +233,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 +96,Request for Quotations,طلب الاقتباسات
+apps/erpnext/erpnext/hooks.py +104,Request for Quotations,طلب الاقتباسات
 DocType: Payment Reconciliation,Maximum Invoice Amount,الحد الأقصى للمبلغ الفاتورة
 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 +628,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',وحدة القياس الافتراضية للخيار &#39;{0}&#39; يجب أن يكون نفس في قالب &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',وحدة القياس الافتراضية للخيار &#39;{0}&#39; يجب أن يكون نفس في قالب &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,إحسب الربح بناء على
 DocType: Delivery Note Item,From Warehouse,من مستودع
 DocType: Assessment,Supervisor Name,اسم المشرف
+DocType: Assessment,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,عضو الشراء
 DocType: Notification Control,Customize the Notification,تخصيص تنبيهات
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Cash Flow from Operations,التدفق النقدي من العمليات
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,لا يمكن حذف القالب الافتراضي العنوان
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,لا يمكن حذف القالب الافتراضي العنوان
 DocType: Sales Invoice,Shipping Rule,قواعد الشحن
 DocType: Manufacturer,Limited to 12 characters,تقتصر على 12 حرفا
 DocType: Journal Entry,Print Heading,طباعة عنوان
@@ -3021,8 +3062,8 @@
 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/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,إما الكمية المستهدفة أو المبلغ المستهدف إلزامي
-apps/erpnext/erpnext/stock/get_item_details.py +485,No default BOM exists for Item {0},لا توجد BOM الافتراضي القطعة ل {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +336,Please select Posting Date first,يرجى تحديد تاريخ النشر لأول مرة
+apps/erpnext/erpnext/stock/get_item_details.py +486,No default BOM exists for Item {0},لا توجد BOM الافتراضي القطعة ل {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +326,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,مركز التكلفة مع المعاملات القائمة لا يمكن تحويلها إلى دفتر الأستاذ
@@ -3038,6 +3079,7 @@
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,المدفوعات مباراة مع الفواتير
 DocType: Journal Entry,Bank Entry,حركة بنكية
 DocType: Authorization Rule,Applicable To (Designation),تنطبق على (تعيين)
+,Profitability Analysis,تحليل الربحية
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,إضافة إلى العربة
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,المجموعة حسب
 DocType: Guardian,Interests,الإهتمامات
@@ -3049,23 +3091,23 @@
 DocType: Quality Inspection,Item 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 +141,"Serialized Item {0} cannot be updated \
+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 \
 					using Stock Reconciliation","متسلسلة البند {0} لا يمكن تحديث \
  باستخدام الأسهم المصالحة"
 DocType: Scheduling Tool,Day,يوم
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,المسلسل الجديد لا يمكن أن يكون المستودع. يجب تعيين مستودع من قبل دخول الأسهم أو شراء الإيصال
 DocType: Lead,Lead Type,نوع مبادرة البيع
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,You are not authorized to approve leaves on Block Dates,غير مصرح لك الموافقة على أوراق تواريخ بلوك
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,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: Student Applicant,AP.,AP.
 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 +639,Point of Sale,نقطة بيع
+apps/erpnext/erpnext/accounts/page/pos/pos.js +634,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,ضريبة
 DocType: Production Planning Tool,Production Planning Tool,إنتاج أداة تخطيط المنزل
@@ -3073,75 +3115,78 @@
 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 +373,Quantity to Manufacture must be greater than 0.,يجب أن تكون الكمية لصنع أكبر من 0.
+apps/erpnext/erpnext/public/js/setup_wizard.js +299,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 Profile,Customer Group,مجموعة الزبون
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,Expense account is mandatory for item {0},حساب المصاريف إلزامي لمادة {0}
 DocType: Item,Website Description,وصف الموقع
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date must be on or after today,يجب أن يكون استهلاك المقبل التاريخ في أو بعد اليوم
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,صافي التغير في حقوق المساهمين
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +145,Please cancel Purchase Invoice {0} first,يرجى إلغاء شراء الفاتورة {0} لأول مرة
 DocType: Serial No,AMC Expiry Date,AMC تاريخ انتهاء الاشتراك
 ,Sales Register,سجل مبيعات
 DocType: Quotation,Quotation Lost Reason,خسارة التسعيرة بسبب
+apps/erpnext/erpnext/utilities/doctype/address/address.py +164,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,لم يتم العثور على قالب عنوان افتراضي. يرجى إنشاء واحدة جديدة من الإعداد&gt; الطباعة والعلامات التجارية&gt; قالب العناوين.
 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 +330,Transaction reference no {0} dated {1},إشارة عملية لا {0} بتاريخ {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Transaction reference no {0} dated {1},إشارة عملية لا {0} بتاريخ {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,لا يوجد شيء لتحريره
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,Summary for this month and pending activities,ملخص لهذا الشهر والأنشطة المعلقة
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,ملخص لهذا الشهر والأنشطة المعلقة
 DocType: Customer Group,Customer Group Name,أسم مجموعة الزبون
 apps/erpnext/erpnext/public/js/financial_statements.js +54,Cash Flow Statement,بيان التدفقات النقدية
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Please remove this Invoice {0} from C-Form {1},الرجاء إزالة هذا فاتورة {0} من C-نموذج {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Please remove this Invoice {0} from C-Form {1},الرجاء إزالة هذا فاتورة {0} من C-نموذج {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,الرجاء تحديد مضي قدما إذا كنت تريد أيضا لتشمل التوازن العام المالي السابق يترك لهذه السنة المالية
 DocType: GL Entry,Against Voucher Type,مقابل نوع قسيمة
 DocType: Item,Attributes,سمات
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +644,Get Items,الحصول على أصناف
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +623,Get Items,الحصول على أصناف
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +210,Please enter Write Off Account,الرجاء إدخال شطب الحساب
-apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,أمر آخر تاريخ
+apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,تاريخ آخر أمر
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +41,Account {0} does not belongs to company {1},الحساب {0} لا ينتمي إلى الشركة {1}
+DocType: Student,Guardian Details,تفاصيل ولي الأمر
 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,المخطط لها تاريخ بدء
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,Customer is required against Receivable account {0},مطلوب العملاء ضد حساب المقبوضات {0}
 DocType: Serial No,Creation Document Type,نوع الوثيقة إنشاء
 DocType: Leave Type,Is Encash,هو يحققوا ربحا
 DocType: Purchase Invoice,Mobile No,رقم الجوال
 DocType: Leave Allocation,New Leaves Allocated,الجديد يترك المخصصة
-apps/erpnext/erpnext/controllers/trends.py +265,Project-wise data is not available for Quotation,بيانات المشروع من الحكمة ليست متاحة لل اقتباس
+apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,بيانات المشروع من الحكمة ليست متاحة لل اقتباس
 DocType: Project,Expected End Date,تاريخ الإنتهاء المتوقع
 DocType: Budget Account,Budget Amount,مبلغ الميزانية
 DocType: Appraisal Template,Appraisal Template Title,تقييم قالب عنوان
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,Commercial,تجاري
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,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 +648,Row {0}# Account must be of type 'Fixed Asset',صف {0} يجب أن يكون # حساب من نوع &quot;الأصول الثابتة&quot;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,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 +30,Series is mandatory,الترقيم المتسلسل إلزامي
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +50,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}
 DocType: Leave Allocation,Unused leaves,الأوراق غير المستخدمة
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Cr,كر
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Cr,كر
 DocType: Tax Rule,Billing State,الدولة الفواتير
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +250,Transfer,نقل
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +187,{0} {1} does not associated with Party Account {2},{0} {1} لا يرتبط مع حساب الطرف {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,Fetch exploded BOM (including sub-assemblies),جلب BOM انفجرت (بما في ذلك المجالس الفرعية)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +254,Transfer,نقل
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +190,{0} {1} does not associated with Party Account {2},{0} {1} لا يرتبط مع حساب الطرف {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +796,Fetch exploded BOM (including sub-assemblies),جلب BOM انفجرت (بما في ذلك المجالس الفرعية)
 DocType: Authorization Rule,Applicable To (Employee),تنطبق على (موظف)
-apps/erpnext/erpnext/controllers/accounts_controller.py +115,Due Date is mandatory,يرجع تاريخ إلزامي
+apps/erpnext/erpnext/controllers/accounts_controller.py +118,Due Date is mandatory,يرجع تاريخ إلزامي
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,الاضافة للسمة {0} لا يمكن أن يكون 0
 DocType: Journal Entry,Pay To / Recd From,دفع إلى / من Recd
 DocType: Naming Series,Setup Series,إعداد الترقيم المتسلسل
 DocType: Payment Reconciliation,To Invoice Date,إلى تاريخ الفاتورة
 DocType: Supplier,Contact HTML,الاتصال HTML
-,Inactive Customers,العملاء غير نشط
+,Inactive Customers,العملاء الغير النشطين
+DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,إيصالات شراء
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,كيف يتم تطبيق قاعدة التسعير ؟
 DocType: Quality Inspection,Delivery Note No,ملاحظة لا تسليم
@@ -3150,7 +3195,7 @@
 DocType: Company,Retail,بيع بالتجزئة
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +120,Customer {0} does not exist,الزبون {0} غير موجود
 DocType: Attendance,Absent,غائب
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +587,Product Bundle,حزمة المنتج
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Product Bundle,حزمة المنتج
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Invalid reference {1},الصف {0}: إشارة غير صالحة {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,شراء قالب الضرائب والرسوم
 DocType: Upload Attendance,Download Template,تحميل قالب
@@ -3160,8 +3205,8 @@
 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 +742,Send Supplier Emails,إرسال رسائل البريد الإلكتروني مزود
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +104,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",راتب معالجة بالفعل للفترة بين {0} و {1}، ترك فترة التطبيق لا يمكن أن يكون بين هذا النطاق التاريخ.
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +708,Send Supplier Emails,إرسال رسائل البريد الإلكتروني مزود
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,"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,الجارديان الفائدة
 DocType: Timesheet,Employee Detail,التفاصيل موظف
@@ -3172,15 +3217,15 @@
 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/accounts/doctype/gl_entry/gl_entry.py +77,Account {0} cannot be a Group,الحساب {0} لا يمكن أن يكون مجموعة
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} cannot be a Group,الحساب {0} لا يمكن أن يكون مجموعة
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +31,Optional. This setting will be used to filter in various transactions.,اختياري . سيتم استخدام هذا الإعداد لتصفية في المعاملات المختلفة.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +107,Negative Valuation Rate is not allowed,لا يسمح السلبية قيم التقييم
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,لا يسمح السلبية قيم التقييم
 DocType: Holiday List,Weekly Off,العطلة الأسبوعية
 DocType: Fiscal Year,"For e.g. 2012, 2012-13",ل، 2012 على سبيل المثال 2012-13
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +39,Provisional Profit / Loss (Credit),الربح المؤقت / الخسارة (الائتمان)
 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,إنشاء الموضوع
+DocType: Serial No,Creation Time,تاريخ الإنشاء
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,إجمالي الإيرادات
 DocType: Sales Invoice,Product Bundle Help,المنتج حزمة مساعدة
 ,Monthly Attendance Sheet,ورقة الحضور الشهرية
@@ -3188,16 +3233,16 @@
 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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: مركز التكلفة إلزامي  للصنف {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +626,Get Items from Product Bundle,الحصول على أصناف من حزمة المنتج
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +605,Get Items from Product Bundle,الحصول على أصناف من حزمة المنتج
 DocType: Asset,Straight Line,خط مستقيم
 DocType: Project User,Project User,المشروع العضو
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} is inactive,حساب {0} غير نشط
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} is inactive,حساب {0} غير نشط
 DocType: GL Entry,Is Advance,هو المقدم
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,الحضور من التسجيل والحضور إلى تاريخ إلزامي
 apps/erpnext/erpnext/controllers/buying_controller.py +148,Please enter 'Is Subcontracted' as Yes or No,"يرجى إدخال "" التعاقد من الباطن "" كما نعم أو لا"
 DocType: Sales Team,Contact No.,الاتصال رقم
 DocType: Bank Reconciliation,Payment Entries,مقالات الدفع
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,'Profit and Loss' type account {0} not allowed in Opening Entry,نوع حساب الأرباح و الخسائر {0} غير مسموح به في الأرصدة الافتتاحية
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +71,'Profit and Loss' type account {0} not allowed in Opening Entry,نوع حساب الأرباح و الخسائر {0} غير مسموح به في الأرصدة الافتتاحية
 DocType: Program Enrollment Tool,Get Students From,الحصول على الطلاب من
 DocType: Hub Settings,Seller Country,بلد البائع
 apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,نشر عناصر على الموقع
@@ -3206,7 +3251,7 @@
 apps/erpnext/erpnext/templates/generators/item.html +86,Specifications,مواصفات
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,قالب الضرائب على المبيعات والرسوم
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,ملابس واكسسوارات
-apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,عدد بالدفع
+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,دور السماح للتعيين الحسابات المجمدة وتحرير مقالات المجمدة
@@ -3216,7 +3261,7 @@
 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 +558,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",الصف # {0}: الأصول {1} لا يمكن أن تقدم، هو بالفعل {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +561,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",الصف # {0}: الأصول {1} لا يمكن أن تقدم، هو بالفعل {2}
 DocType: Tax Rule,Billing Country,بلد إرسال الفواتير
 DocType: Production Order,Expected Delivery Date,تاريخ التسليم المتوقع
 apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,الخصم والائتمان لا يساوي ل{0} # {1}. الفرق هو {2}.
@@ -3229,13 +3274,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +202,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: Sales Order,% Amount Billed,المبلغ٪ صفت
+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 +117,No Item with Serial No {0},أي عنصر مع المسلسل لا {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,الإخطارات المفتوحة
+DocType: Email Digest,Open Notifications,الإخطارات المفتوحة
 DocType: Payment Entry,Difference Amount (Company Currency),الفرق المبلغ (شركة العملات)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,المصاريف المباشرة
 apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
@@ -3243,7 +3288,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,إيرادات العملاء الجدد
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,مصاريف السفر
 DocType: Maintenance Visit,Breakdown,انهيار
-apps/erpnext/erpnext/controllers/accounts_controller.py +634,Account: {0} with currency: {1} can not be selected,الحساب: {0} مع العملة: {1} لا يمكن اختياره
+apps/erpnext/erpnext/controllers/accounts_controller.py +637,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}
 DocType: Program Enrollment Tool,Student Applicants,المتقدمين طالب
@@ -3251,15 +3296,15 @@
 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 +56,Probation,امتحان
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Probation,امتحان
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,تقسيمات الراتب
 DocType: Program Enrollment Tool,New Academic Year,العام الدراسي الجديد
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Payment of salary for the month {0} and year {1},دفع المرتبات لشهر {0} و السنة {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Payment of salary for the month {0} and year {1},دفع المرتبات لشهر {0} و السنة {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,إدراج تلقائي لقائمة الأسعار إن لم تكن موجودة
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,إجمالي المبلغ المدفوع
 DocType: Production Order Item,Transferred Qty,نقل الكمية
 apps/erpnext/erpnext/config/learn.py +11,Navigating,التنقل
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Planning,تخطيط
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,تخطيط
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,نشر
 DocType: Project,Total Billing Amount (via Time Logs),المبلغ الكلي الفواتير (عبر الزمن سجلات)
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,We sell this Item,نبيع هذه القطعة
@@ -3272,11 +3317,10 @@
 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/accounts/page/pos/pos.js +1376,Sales invoice submitted sucessfully.,فاتورة مبيعات قدمت بنجاح.
 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}
 DocType: Assessment Result,Student Name,أسم الطالب
-apps/erpnext/erpnext/hooks.py +104,Assessment Schedule,جدول التقييم
+apps/erpnext/erpnext/hooks.py +113,Assessment Schedule,جدول التقييم
 DocType: Brand,Item Manager,مدير البند
 DocType: Buying Settings,Default Supplier Type,الافتراضي مزود نوع
 DocType: Production Order,Total Operating Cost,إجمالي تكاليف التشغيل
@@ -3286,6 +3330,7 @@
 DocType: GL Entry,Party Type,نوع الحزب
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +78,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} يتجاوز حدود
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,قالب الراتب الرئيسي.
 DocType: Leave Type,Max Days Leave Allowed,اترك أيام كحد أقصى مسموح
@@ -3297,18 +3342,19 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,اقتباسات لعروض أو العملاء.
 DocType: Stock Settings,Role Allowed to edit frozen stock,دور الأليفة لتحرير الأسهم المجمدة
 ,Territory Target Variance Item Group-Wise,الأراضي المستهدفة الفرق البند المجموعة الحكيم
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Customer Groups,جميع مجموعات العملاء
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +78,Accumulated Monthly,مجمع الشهري
-apps/erpnext/erpnext/controllers/accounts_controller.py +595,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} إلزامي. ربما أنه لم يتم إنشاء سجل سعر صرف العملة ل{1} إلى {2}.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,جميع مجموعات العملاء
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +81,Accumulated Monthly,مجمع الشهري
+apps/erpnext/erpnext/controllers/accounts_controller.py +598,{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} غير موجود
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),قائمة الأسعار معدل (عملة الشركة)
 DocType: Products Settings,Products Settings,إعدادات المنتجات
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +188,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,الرجاء تعيين تسمية سلسلة ل{0} عبر الإعداد&gt; إعدادات&gt; تسمية السلسلة
 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 +84,Secretary,أمين
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,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,شراء
@@ -3317,24 +3363,22 @@
 ,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,اسم تقييم
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,الصف # {0}: لا المسلسل إلزامي
+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 +859,Supplier Quotation,اقتباس المورد
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +838,Supplier Quotation,اقتباس المورد
 DocType: Quotation,In Words will be visible once you save the Quotation.,وبعبارة تكون مرئية بمجرد حفظ اقتباس.
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +7,Collect Fees,جمع الرسوم
+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}
 DocType: Lead,Add to calendar on this date,إضافة إلى التقويم في هذا التاريخ
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,قواعد لإضافة تكاليف الشحن.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,الأحداث القادمة
 DocType: Item,Opening Stock,فتح المخزون
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,الزبون مطلوب
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} إلزامية من أجل العودة
 DocType: Purchase Order,To Receive,تلقي
 apps/erpnext/erpnext/public/js/setup_wizard.js +195,user@example.com,user@example.com
-DocType: Email Digest,Income / Expense,الدخل / المصاريف
 DocType: Employee,Personal Email,البريد الالكتروني الشخصية
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,مجموع الفروق
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.",إذا مكن، سيقوم النظام إضافة القيود المحاسبية للمخزون تلقائيا.
@@ -3346,13 +3390,14 @@
 DocType: Customer,From Lead,من العميل المحتمل
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,أوامر الإفراج عن الإنتاج.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,اختر السنة المالية ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,POS Profile required to make POS Entry,POS الملف المطلوب لجعل الدخول POS
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +509,POS Profile required to make POS Entry,POS الملف المطلوب لجعل الدخول POS
 DocType: Program Enrollment Tool,Enroll Students,تسجيل الطلاب
 DocType: Hub Settings,Name Token,اسم رمز
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,البيع القياسية
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Atleast one warehouse is mandatory,واحدة على الاقل مستودع إلزامي
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +129,Atleast one warehouse is mandatory,واحدة على الاقل مستودع إلزامي
 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 +330,{0} against Sales Invoice {1},{0} مقابل فاتورة المبيعات {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,اسم المشروع
@@ -3363,7 +3408,7 @@
 apps/erpnext/erpnext/config/learn.py +239,Human Resource,الموارد البشرية
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,دفع المصالحة الدفع
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,الأصول الضريبية
-DocType: BOM Item,BOM No,لا BOM
+DocType: BOM Item,BOM No,رقم فاتورة المواد
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +133,Journal Entry {0} does not have account {1} or already matched against other voucher,إدخال دفتر اليومية {0} ليس لديه حساب {1} أو بالفعل يقابل ضد قسيمة أخرى
 DocType: Item,Moving Average,المتوسط المتحرك
@@ -3373,10 +3418,11 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,يجب تخصيص الأوراق في مضاعفات 0.5
 DocType: Production Order,Operation Cost,التكلفة العملية
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,رفع الحضور من ملف CSV.
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,آمت المتميز
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,تحديد أهداف المجموعة السلعة الحكيم لهذا الشخص المبيعات.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],تجميد الأرصدة أقدم من [ أيام]
-apps/erpnext/erpnext/controllers/accounts_controller.py +528,Row #{0}: Asset is mandatory for fixed asset purchase/sale,الصف # {0}: الأصول إلزامي لشراء الأصول الثابتة / بيع
+apps/erpnext/erpnext/controllers/accounts_controller.py +531,Row #{0}: Asset is mandatory for fixed asset purchase/sale,الصف # {0}: الأصول إلزامي لشراء الأصول الثابتة / بيع
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","اذا كانت اثنتان او اكثر من قواعد الاسعار مبنية على الشروط المذكورة فوق, الاولوية تطبق. الاولوية هي رقم بين 0 و 20 والقيمة الافتراضية هي 0. القيمة الاعلى تعني انها ستاخذ الاولوية عندما يكون هناك قواعد أسعار بنفس الشروط."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,السنة المالية: {0} لا موجود
 DocType: Currency Exchange,To Currency,إلى العملات
@@ -3393,15 +3439,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,الأسهم الخاصة
 DocType: Maintenance Visit,Customer Feedback,ملاحظات الزبائن
 DocType: Account,Expense,نفقة
-DocType: Sales Invoice,Exhibition,معرض
 apps/erpnext/erpnext/utilities/doctype/address/address.py +77,"Company is mandatory, as it is your company address",الشركة هي إلزامية، كما هو عنوان لشركتك
 DocType: Item Attribute,From Range,من المدى
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +81,Syntax error in formula or condition: {0},خطأ في الصيغة أو الشرط: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +92,Syntax error in formula or condition: {0},خطأ في الصيغة أو الشرط: {0}
 apps/erpnext/erpnext/stock/utils.py +99,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 +28,Jobs,وظائف
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,وظائف
 ,Sales Order Trends,مجرى طلبات البيع
 DocType: Employee,Held On,عقدت في
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,إنتاج البند
@@ -3410,16 +3456,16 @@
 DocType: Stock Entry Detail,Additional Cost,تكلفة إضافية
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,تاريخ نهاية السنة المالية
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher",لا يمكن تصفية استنادا قسيمة لا، إذا تم تجميعها حسب قسيمة
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +763,Make Supplier Quotation,أنشئ تسعيرة مورد
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,Make Supplier Quotation,أنشئ تسعيرة مورد
 DocType: Quality Inspection,Incoming,الوارد
 DocType: BOM,Materials Required (Exploded),المواد المطلوبة (انفجرت)
 apps/erpnext/erpnext/public/js/setup_wizard.js +185,"Add users to your organization, other than yourself",إضافة مستخدمين إلى مؤسستك، وغيرها من نفسك
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,Row # {0}: Serial No {1} does not match with {2} {3},الصف # {0}: المسلسل لا {1} لا يتطابق مع {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +42,Casual Leave,أجازة عارضة
+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,أجازة عارضة
 DocType: Batch,Batch ID,دفعة ID
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,Note: {0},ملاحظة : {0}
 ,Delivery Note Trends,ملاحظة اتجاهات التسليم
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +103,This Week's Summary,ملخص هذا الأسبوع
+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} لا يمكن إلا أن يتم تحديثه عن طريق المعاملات المالية
 DocType: Student Group Creation Tool,Get Courses,الحصول على دورات
 DocType: GL Entry,Party,الطرف
@@ -3429,7 +3475,7 @@
 DocType: Request for Quotation Item,Request for Quotation Item,طلب تسعيرة البند
 DocType: Purchase Order,To Bill,لبيل
 DocType: Material Request,% Ordered,٪ تم طلبها
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Piecework,العمل مقاولة
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Piecework,العمل مقاولة
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,متوسط. سعر شراء
 DocType: Task,Actual Time (in Hours),الوقت الفعلي (بالساعات)
 DocType: Employee,History In Company,وفي تاريخ الشركة
@@ -3446,7 +3492,7 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +350,{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 +162,Black,أسود
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,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}العناصر المنتجه
@@ -3457,20 +3503,21 @@
 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 +69,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,علامة غائب
 DocType: Journal Entry Account,Exchange Rate,سعر الصرف
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Sales Order {0} is not submitted,اوامر البيع {0} لم ترسل
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +527,Sales Order {0} is not submitted,اوامر البيع {0} لم ترسل
 DocType: Homepage,Tag Line,شعار
 DocType: Fee Component,Fee Component,مكون رسوم
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +857,Add items from,إضافة عناصر من
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +836,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}
 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} منذ ديه المتغيرات
-,Sales Person-wise Transaction Summary,الشخص الحكيم مبيعات ملخص عملية
+,Sales Person-wise Transaction Summary,ملخص المبيعات بناء على رجل المبيعات
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +60,Cost Center is required for 'Profit and Loss' account {0}. Please set up a default Cost Center for the Company.,مطلوب مركز تكلفة &quot;الربح والخسارة&quot; حساب {0}. يرجى انشاء مركز التكلفة الافتراضية للشركة.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,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,النسب المئوية لتوزيع الشهرية
@@ -3478,15 +3525,15 @@
 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 لمعلمة NOS استقبال
+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 +710,Online,على الانترنت
+apps/erpnext/erpnext/accounts/page/pos/pos.js +692,Online,على الانترنت
 ,Available Stock for Packing Items,المخزون المتاج للأصناف المعبأة
 DocType: Item Variant,Item Variant,البديل البند
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,وضع هذا القالب كما العنوان الافتراضي حيث لا يوجد الافتراضية الأخرى
+apps/erpnext/erpnext/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 +74,Quality Management,إدارة الجودة
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,إدارة الجودة
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,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,التاريخ الموظف العمل الخارجي
@@ -3508,11 +3555,12 @@
 DocType: Student,Student Email ID,طالب معرف البريد الإلكتروني
 DocType: Employee,Notice (days),إشعار (أيام )
 DocType: Tax Rule,Sales Tax Template,قالب ضريبة المبيعات
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1520,Select items to save the invoice,تحديد عناصر لحفظ الفاتورة
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1544,Select items to save the invoice,تحديد عناصر لحفظ الفاتورة
 DocType: Employee,Encashment Date,تاريخ التحصيل
 DocType: Account,Stock Adjustment,الأسهم التكيف
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},موجود آخر الافتراضي التكلفة لنوع النشاط - {0}
 DocType: Production Order,Planned Operating Cost,المخطط تكاليف التشغيل
+DocType: Academic Term,Term Start Date,المدى تاريخ بدء
 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,اسم مقدم الطلب
@@ -3530,7 +3578,7 @@
 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.,الإعدادات الافتراضية لبيع صفقة.
-DocType: BOM Replace Tool,Current BOM,BOM الحالي
+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,الضمان
 DocType: Production Order,Warehouses,المستودعات
@@ -3542,17 +3590,17 @@
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,سيتم إنشاء حساب المستودع (الجرد الدائم) تحت هذا الحساب.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +119,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,مستودع لا يمكن حذف كما يوجد مدخل الأسهم دفتر الأستاذ لهذا المستودع.
 DocType: Company,Distribution,التوزيع
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +8,Amount Paid,المبلغ المدفوع
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Project Manager,مدير المشروع
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,المبلغ المدفوع
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,مدير المشروع
 ,Quoted Item Comparison,ونقلت البند مقارنة
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Dispatch,إيفاد
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,إيفاد
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,أعلى خصم مسموح به للمنتج : {0} هو  {1}٪
 apps/erpnext/erpnext/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.,الدور الذي يسمح بتقديم المعاملات التي تتجاوز حدود الائتمان تعيين.
-DocType: Sales Invoice,Supplier Reference,مرجع المورد
-apps/erpnext/erpnext/accounts/page/pos/pos.js +844,"Master data syncing, it might take some time",مزامنة البيانات الرئيسية، قد يستغرق بعض الوقت
+apps/erpnext/erpnext/accounts/page/pos/pos.js +832,"Master data syncing, it might take some time",مزامنة البيانات الرئيسية، قد يستغرق بعض الوقت
 DocType: Item,Material Issue,صرف مواد
 DocType: Hub Settings,Seller Description,وصف البائع
 DocType: Employee Education,Qualification,المؤهل
@@ -3566,7 +3614,7 @@
 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 +83,Error in formula or condition,خطأ في الصيغة أو شرط
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,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,الغاءالكل
@@ -3575,7 +3623,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},إلى التسجيل يجب أن يكون ضمن السنة المالية. على افتراض إلى تاريخ = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc",هنا يمكنك الحفاظ على الطول والوزن، والحساسية، الخ المخاوف الطبية
 DocType: Leave Block List,Applies to Company,ينطبق على شركة
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +197,Cannot cancel because submitted Stock Entry {0} exists,لا يمكن إلغاء الاشتراك بسبب الحركة المخزنية {0} موجود
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +198,Cannot cancel because submitted Stock Entry {0} exists,لا يمكن إلغاء الاشتراك بسبب الحركة المخزنية {0} موجود
 DocType: Purchase Invoice,In Words,في كلمات
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,Today is {0}'s birthday!,اليوم هو {0} 'عيد ميلاد!
 DocType: Production Planning Tool,Material Request For Warehouse,طلب للحصول على المواد مستودع
@@ -3585,14 +3633,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,تبدأ السنة المالية الخاصة بك على
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,إستهلاك الأصول والأرصدة
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +319,Amount {0} {1} transferred from {2} to {3},مبلغ {0} {1} نقلها من {2} إلى {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +322,Amount {0} {1} transferred from {2} to {3},مبلغ {0} {1} نقلها من {2} إلى {3}
 DocType: Sales Invoice,Get Advances Received,الحصول على السلف المتلقاة
 DocType: Email Digest,Add/Remove Recipients,إضافة / إزالة المستلمين
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +432,Transaction not allowed against stopped Production Order {0},الصفقة لا يسمح ضد توقفت أمر الإنتاج {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +437,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 +143,Join,انضم
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,نقص الكمية
-apps/erpnext/erpnext/stock/doctype/item/item.py +652,Item variant {0} exists with same attributes,البديل البند {0} موجود مع نفس الصفات
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,البديل البند {0} موجود مع نفس الصفات
+DocType: Leave Application,LAP/,LAP /
 DocType: Salary Slip,Salary 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,' إلى تاريخ ' مطلوب
@@ -3600,12 +3649,12 @@
 DocType: Sales Invoice Item,Sales Order Item,ترتيب المبيعات الإغلاق
 DocType: Salary Slip,Payment Days,يوم الدفع
 DocType: Customer,Dormant,هاجع
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +212,Warehouses with child nodes cannot be converted to ledger,المستودعات مع العقد التابعة لا يمكن أن يتم تحويلها إلى ليدجر
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +215,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/public/js/controllers/transaction.js +866,It is needed to fetch Item Details.,هناك حاجة لجلب البند التفاصيل.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +857,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} وقد وردت بالفعل
@@ -3615,19 +3664,19 @@
 DocType: Expense Claim,Total Claimed Amount,إجمالي المبلغ المطالب به
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,فرص محتملة للبيع.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,Invalid {0},باطلة {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Sick Leave,الإجازات المرضية
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,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,المتاجر
 DocType: Warehouse,PIN,دبوس
 DocType: Sales Invoice,Base Change Amount (Company Currency),مدى تغيير المبلغ الأساسي (عملة الشركة )
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +313,No accounting entries for the following warehouses,لا القيود المحاسبية للمستودعات التالية
-apps/erpnext/erpnext/projects/doctype/project/project.js +102,Save the document first.,حفظ المستند أولا.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +314,No accounting entries for the following warehouses,لا القيود المحاسبية للمستودعات التالية
+apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,حفظ المستند أولا.
 DocType: Account,Chargeable,تحمل
 DocType: Company,Change Abbreviation,تغيير اختصار
 DocType: Expense Claim Detail,Expense Date,تاريخ المصروف
 DocType: Item,Max Discount (%),أعلى خصم (٪)
-apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,أمر آخر كمية
+apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,كمية آخر طلب
 DocType: Budget,Warn,تحذير
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.",أي ملاحظات أخرى، جهد يذكر أن يجب أن تذهب في السجلات.
 DocType: BOM,Manufacturing User,عضو التصنيع
@@ -3635,10 +3684,9 @@
 DocType: Purchase Invoice,Recurring Print Format,تنسيق طباعة متكرر
 DocType: C-Form,Series,سلسلة ترقيم الوثيقة
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,Expected Delivery Date cannot be before Purchase Order Date,التاريخ التسليم المتوقع  لا يمكن أن يكون قبل تاريخ طلب شراء
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,الرجاء تعيين تسمية سلسلة ل{0} عبر الإعداد&gt; إعدادات&gt; تسمية السلسلة
 DocType: Appraisal,Appraisal Template,تقييم قالب
 DocType: Item Group,Item Classification,تصنيف البند
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Business Development Manager,مدير تطوير الأعمال
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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,دفتر الأستاذ العام
@@ -3648,8 +3696,8 @@
 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 +940,Please select {0} first,الرجاء اختيار {0} الأولى
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +749,Batch {0} of Item {1} has expired.,دفعة {0} من البند {1} قد انتهت صلاحيتها.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +953,Please select {0} first,الرجاء اختيار {0} الأولى
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +757,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,حاصل الجمع
@@ -3677,8 +3725,8 @@
  {٪ إذا٪ email_id} البريد الإلكتروني: {{email_id}} العلامة & lt؛ BR & GT ؛ {٪ ENDIF -٪} 
  </ الرمز> </ PRE>"
 DocType: Salary Detail,Default Amount,المبلغ الافتراضي
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +92,Warehouse not found in the system,لم يتم العثور على المستودع في النظام
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +106,This Month's Summary,ملخص هذا الشهر
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,لم يتم العثور على المستودع في النظام
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,ملخص هذا الشهر
 DocType: Quality Inspection Reading,Quality Inspection Reading,جودة التفتيش القراءة
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,` تجميد المخزون الأقدم من يجب أن يكون أقل من ٪ d يوم ` .
 DocType: Tax Rule,Purchase Tax Template,شراء قالب الضرائب
@@ -3688,21 +3736,22 @@
 DocType: Item Customer Detail,Ref Code,الرمز المرجعي
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,سجلات الموظفين
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Please set Next Depreciation Date,الرجاء ضبط الاستهلاك المقبل التاريخ
-DocType: Payment Gateway,Payment Gateway,بوابة الدفع
 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 +378,Operation Time must be greater than 0 for Operation {0},عملية الوقت يجب أن تكون أكبر من 0 لعملية {0}
+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/accounts/doctype/account/account.py +170,Warehouse is mandatory,المستودع إلزامي
 DocType: Supplier,Address and Contacts,عناوين واتصالات
-DocType: UOM Conversion Detail,UOM Conversion Detail,UOM تحويل التفاصيل
+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 (ح )
 DocType: Program,Program Abbreviation,اختصار برنامج
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,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: Appraisal,Start Date,تاريخ البدء
@@ -3718,21 +3767,22 @@
 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,إزالة البند إذا الرسوم لا تنطبق على هذا البند
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,على سبيل المثال. smsgateway.com / API / send_sms.cgi
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +27,Transaction currency must be same as Payment Gateway currency,يجب أن تكون العملة المعاملة نفس العملة بوابة الدفع
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Transaction currency must be same as Payment Gateway currency,يجب أن تكون العملة المعاملة نفس العملة بوابة الدفع
 DocType: Payment Entry,Receive,تسلم
+apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,الاقتباسات:
 DocType: Maintenance Visit,Fully Completed,يكتمل
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}٪ مكتمل
 DocType: Employee,Educational Qualification,المؤهلات العلمية
 DocType: Workstation,Operating Costs,تكاليف التشغيل
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,العمل إذا مجمع الميزانيه الشهري تجاوز
 DocType: Purchase Invoice,Submit on creation,إرسال على خلق
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +432,Currency for {0} must be {1},العملة ل{0} يجب أن يكون {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +435,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 +493,Row {0}: An Reorder entry already exists for this warehouse {1},صف {0}: إدخال إعادة ترتيب موجود بالفعل لهذا المستودع {1}
+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/crm/doctype/opportunity/opportunity.py +79,"Cannot declare as lost, because Quotation has been made.",لا يمكن ان تعلن بانها فقدت ، لأن أحرز اقتباس .
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,مدير رئيس الشراء
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +429,Production Order {0} must be submitted,إنتاج النظام {0} يجب أن تقدم
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +434,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,حتى الآن لا يمكن أن يكون قبل تاريخ من
@@ -3742,25 +3792,27 @@
 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 +181,Totals,المجاميع
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,المجاميع
 DocType: BOM,Manufacturing,تصنيع
-,Ordered Items To Be Delivered,أمرت عناصر ليتم تسليمها
+,Ordered Items To Be Delivered,البنود المطلبة للتسليم
 DocType: Account,Income,دخل
 DocType: Industry Type,Industry Type,نوع صناعة
 apps/erpnext/erpnext/templates/includes/cart.js +141,Something went wrong!,حدث خطأ!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,Warning: Leave application contains following block dates,يحتوي التطبيق اترك التواريخ الكتلة التالية: تحذير
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +120,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} لإتمام هذه الصفقة.
+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 +181,Organization unit (department) master.,وحدة المؤسسة ( قسم) الرئيسي.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,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 +793,All records are synced.,تمة مزامنة كافة السجلات.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +781,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,اسم مركز تكلفة
@@ -3768,7 +3820,7 @@
 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,مجموع المبالغ المدفوعة AMT
-DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,سيتم انقسم رسالة أكبر من 160 حرف في mesage متعددة
+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,وحدة مقياس التحويل
@@ -3779,21 +3831,20 @@
 DocType: Address,Name of person or organization that this address belongs to.,اسم الشخص أو المنظمة التي ينتمي إلى هذا العنوان.
 apps/erpnext/erpnext/public/js/setup_wizard.js +260,Your Suppliers,الموردون
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +49,Cannot set as Lost as Sales Order is made.,لا يمكن تعيين كما فقدت كما يرصد ترتيب المبيعات .
-DocType: Student Applicant,Mother's Name,اسم الأم
 DocType: Request for Quotation Item,Supplier Part No,رقم قطعة المورد
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +348,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 +326,Received From,مستلم من
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Received From,مستلم من
 DocType: Lead,Converted,تحويل
 DocType: Item,Has Serial No,ورقم المسلسل
 DocType: Employee,Date of Issue,تاريخ الإصدار
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0} من {0} ب {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +153,Row #{0}: Set Supplier for item {1},الصف # {0}: تعيين مورد للالبند {1}
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +93,Row {0}: Hours value must be greater than zero.,صف {0}: يجب أن تكون قيمة ساعات أكبر من الصفر.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +117,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} لا يمكن العثور
 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 +172,{0} {1} does not exist,{0} {1} غير موجود
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +175,{0} {1} does not exist,{0} {1} غير موجود
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,Please check Multi Currency option to allow accounts with other currency,يرجى التحقق من خيار العملات المتعددة للسماح حسابات مع عملة أخرى
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +72,Item: {0} does not exist in the system,البند: {0} غير موجود في النظام
 apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,لا يحق لك تعيين القيمة المجمدة
@@ -3802,21 +3853,22 @@
 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/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,لا يمكن أن ىكون تاريخ الحضور تاريخ مستقبلي
 DocType: Pricing Rule,Pricing Rule Help,تعليمات قاعدة التسعير
 DocType: Purchase Taxes and Charges,Account Head,رئيس حساب
 apps/erpnext/erpnext/config/stock.py +163,Update additional costs to calculate landed cost of items,تحديث تكاليف إضافية لحساب تكلفة هبطت من البنود
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Electrical,كهربائي
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Electrical,كهربائي
 DocType: Stock Entry,Total Value Difference (Out - In),إجمالي قيمة الفرق (خارج - في)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,Row {0}: Exchange Rate is mandatory,الصف {0}: سعر صرف إلزامي
 apps/erpnext/erpnext/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 +210,Birthday Reminder for {0},تذكير عيد ميلاد ل{0}
-apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,منذ أيام طلب آخر
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +292,Debit To account must be a Balance Sheet account,يجب أن يكون الخصم لحساب حساب الميزانية العمومية
+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 +324,Debit To account must be a Balance Sheet account,يجب أن يكون الخصم لحساب حساب الميزانية العمومية
 DocType: Buying Settings,Naming Series,تسمية تسلسلية
 DocType: Leave Block List,Leave Block List Name,ترك اسم كتلة قائمة
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,الموجودات الأسهم
@@ -3828,11 +3880,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 +301,Salary Slip of employee {0} already created for time sheet {1},راتب زلة لموظف {0} خلقت بالفعل ورقة الوقت {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +313,Salary Slip of employee {0} already created for time sheet {1},راتب زلة لموظف {0} خلقت بالفعل ورقة الوقت {1}
 DocType: Sales Order Item,Ordered Qty,أمرت الكمية
-apps/erpnext/erpnext/stock/doctype/item/item.py +673,Item {0} is disabled,البند هو تعطيل {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} is disabled,البند هو تعطيل {0}
 DocType: Stock Settings,Stock Frozen Upto,المخزون المجمدة لغاية
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +838,BOM does not contain any stock item,BOM لا يحتوي على أي بند الأوراق المالية
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +809,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,إنشاء زلات الراتب
@@ -3840,23 +3892,24 @@
 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 +485,Row #{0}: Please set reorder quantity,الصف # {0}: الرجاء تعيين كمية إعادة الطلب
+DocType: Sales Invoice Timesheet,Billing Hours,ساعات الفواتير
+apps/erpnext/erpnext/stock/doctype/item/item.py +487,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 +62,Please set {0},الرجاء تعيين {0}
 DocType: Purchase Invoice,Repeat on Day of Month,تكرار في يوم من شهر
 DocType: Employee,Health Details,الصحة التفاصيل
 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,تقديم جميع قسائم راتب لتحديد المعايير المذكورة أعلاه
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} عناصر مزامن
 DocType: Sales Order,Partly Delivered,هذه جزئيا
-DocType: Sales Invoice,Existing Customer,القائمة العملاء
 DocType: Email Digest,Receivables,المستحقات
+DocType: Lead Source,Lead Source,مصدر مبادرة البيع
 DocType: Customer,Additional information regarding the customer.,معلومات إضافية عن العميل.
 DocType: Quality Inspection Reading,Reading 5,قراءة 5
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +38,Campaign Name is required,مطلوب اسم حملة
 DocType: Maintenance Visit,Maintenance Date,تاريخ الصيانة
 DocType: Purchase Invoice Item,Rejected Serial No,رقم المسلسل رفض
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +80,Year start date or end date is overlapping with {0}. To avoid please set company,عام تاريخ البدء أو تاريخ انتهاء ومتداخلة مع {0}. لتجنب الرجاء تعيين شركة
@@ -3865,10 +3918,9 @@
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","مثال: ABCD ##### 
  إذا تم تعيين سلسلة وليس المذكورة لا المسلسل في المعاملات، سيتم إنشاء الرقم التسلسلي ثم التلقائي على أساس هذه السلسلة. إذا كنت تريد دائما أن يذكر صراحة المسلسل رقم لهذا البند. ترك هذا فارغا."
 DocType: Upload Attendance,Upload Attendance,رفع الحضور
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +129,BOM and Manufacturing Quantity are required,ويلزم BOM والتصنيع الكمية
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,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,أعلى القوة
-DocType: Bank Reconciliation Detail,Amount,كمية
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,استبدال BOM
 ,Sales Analytics,تحليلات المبيعات
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +113,Available {0},متاح {0}
@@ -3876,14 +3928,14 @@
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,إعداد البريد الإلكتروني
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +96,Please enter default currency in Company Master,الرجاء إدخال العملة الافتراضية في شركة ماستر
 DocType: Stock Entry Detail,Stock Entry Detail,تفاصيل ادخال المخزون
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +100,Daily Reminders,تذكير اليومية
+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/account/account_tree.js +23,New Account Name,اسم الحساب الجديد
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,المواد الخام الموردة التكلفة
 DocType: Selling Settings,Settings for Selling Module,إعدادات لبيع وحدة
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Customer Service,خدمة العملاء
+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/config/hr.py +50,Offer candidate a Job.,عرض المرشح على وظيفة.
@@ -3892,8 +3944,9 @@
 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} يجب أن يكون البند الأسهم
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,افتراضي العمل في مستودع التقدم
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1570,Total nos of serial no is not equal to quantity.,مجموع غ من المسلسل لا لا تساوي الكمية.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1594,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,تحديث الرقم المتسلسل
@@ -3901,9 +3954,10 @@
 DocType: Sales Order,Printing Details,تفاصيل الطباعة
 DocType: Task,Closing Date,تاريخ الإنتهاء
 DocType: Sales Order Item,Produced Quantity,أنتجت الكمية
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Engineer,مهندس
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Engineer,مهندس
+DocType: Journal Entry,Total Amount Currency,مجموع المبلغ العملات
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,جمعيات البحث الفرعية
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Item Code required at Row No {0},كود البند المطلوبة في صف لا { 0 }
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +398,Item Code required at Row No {0},كود البند المطلوبة في صف لا { 0 }
 DocType: Sales Partner,Partner Type,نوع الشريك
 DocType: Purchase Taxes and Charges,Actual,فعلي
 DocType: Authorization Rule,Customerwise Discount,Customerwise الخصم
@@ -3911,7 +3965,7 @@
 DocType: Purchase Invoice,Against Expense Account,مقابل حساب المصاريف
 DocType: Production Order,Production Order,الإنتاج ترتيب
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Installation Note {0} has already been submitted,تركيب ملاحظة {0} وقد تم بالفعل قدمت
-DocType: Bank Reconciliation,Get Payment Entries,الحصول على مقالات الدفع
+DocType: Bank Reconciliation,Get Payment Entries,الحصول على مدخلات الدفع
 DocType: Quotation Item,Against Docname,مقابل المستند
 DocType: SMS Center,All Employee (Active),جميع الموظفين (فعالة)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,عرض الآن
@@ -3919,16 +3973,18 @@
 DocType: BOM,Raw Material Cost,تكلفة المواد الخام
 DocType: Item Reorder,Re-Order Level,إعادة ترتيب مستوى
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,إدخال عناصر والكمية المخططة التي تريد رفع أوامر الإنتاج أو تحميل المواد الخام لتحليلها.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +55,Part-time,جزئي
+apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,مخطط جانت
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,جزئي
 DocType: Employee,Applicable Holiday List,ينطبق عطلة قائمة
 DocType: Employee,Cheque,شيك
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,تم تحديث الرقم المتسلسل
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +57,Series Updated,تم تحديث الرقم المتسلسل
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,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 +87,Clearance Date updated,إزالة تاريخ تحديث
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,التوفيق بنجاح
@@ -3942,7 +3998,7 @@
 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 +513,Posting date and posting time is mandatory,تاريخ نشرها ونشر الوقت إلزامي
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,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.,وبعبارة تكون مرئية بمجرد حفظ أمر الشراء.
@@ -3952,7 +4008,7 @@
 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/stock/doctype/stock_entry/stock_entry.py +158,Target warehouse in row {0} must be same as Production Order,المستودع المستهدف في الصف {0} يجب أن يكون نفس ترتيب الإنتاج
+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,لا يمكن تغيير العملة بعد إجراء إدخالات باستخدام بعض العملات الأخرى
 DocType: Company,Round Off Account,جولة قبالة حساب
@@ -3961,23 +4017,22 @@
 DocType: Customer Group,Parent Customer Group,الأم العملاء مجموعة
 DocType: Purchase Invoice,Contact Email,عنوان البريد الإلكتروني
 DocType: Appraisal Goal,Score Earned,نقاط المكتسبة
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Notice Period,فترة إشعار
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,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 +4,New Sales Person Name,اسم جديد شخص المبيعات
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +4,New Sales Person Name,اسم رجل المبيعات الجديد
 DocType: Packing Slip,Gross Weight UOM,الوزن الإجمالي UOM
-DocType: Email Digest,Receivables / Payables,الذمم المدينة / الدائنة
 DocType: Delivery Note Item,Against Sales Invoice,مقابل فاتورة المبيعات
 DocType: Bin,Reserved Qty for Production,محفوظة الكمية للإنتاج
 DocType: Asset,Frequency of Depreciation (Months),تردد من الاستهلاك (أشهر)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +469,Credit Account,حساب الائتمان
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Credit Account,حساب الائتمان
 DocType: Landed Cost Item,Landed Cost Item,هبطت تكلفة السلعة
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +55,Show zero values,إظهار القيم صفر
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,إظهار القيم صفر
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,كمية البند تم الحصول عليها بعد تصنيع / إعادة التعبئة من كميات معينة من المواد الخام
 apps/erpnext/erpnext/public/js/setup_wizard.js +315,Setup a simple website for my organization,إعداد موقع بسيط لمنظمتي
 DocType: Payment Reconciliation,Receivable / Payable Account,القبض / حساب الدائنة
 DocType: Delivery Note Item,Against Sales Order Item,مقابل عنصر أمر المبيعات
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Please specify Attribute Value for attribute {0},يرجى تحديد قيمة السمة للسمة {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},يرجى تحديد قيمة السمة للسمة {0}
 DocType: Item,Default Warehouse,النماذج الافتراضية
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +39,Budget cannot be assigned against Group Account {0},الميزانيه لا يمكن تحديدها مقابل حساب جماعي{0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,الرجاء إدخال مركز تكلفة الأصل
@@ -3999,19 +4054,22 @@
 DocType: Journal Entry,Total Debit,مجموع الخصم
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,مستودع الافتراضي انتهى السلع
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,رجل المبيعات
-DocType: Sales Invoice,Cold Calling,ووصف الباردة
 DocType: SMS Parameter,SMS Parameter,SMS متغيرات
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,الميزانيه و مركز التكلفة
 DocType: Maintenance Schedule Item,Half Yearly,نصف سنوي
 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 +253,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 +141,Set as Lost,على النحو المفقودة
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,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 +5,This is based on transactions against this Customer. See timeline below for details,ويستند هذا على المعاملات ضد هذا العميل. انظر الجدول الزمني أدناه للاطلاع على التفاصيل
 DocType: Supplier,Credit Days Based On,اليوم الإئتماني بناء على
@@ -4023,11 +4081,10 @@
 ,Items To Be Requested,البنود يمكن طلبه
 DocType: Purchase Order,Get Last Purchase Rate,الحصول على آخر تسعيرة شراء
 DocType: Company,Company Info,معلومات عن الشركة
-apps/erpnext/erpnext/accounts/page/pos/pos.js +941,Select or add new customer,تحديد أو إضافة عميل جديد
+apps/erpnext/erpnext/accounts/page/pos/pos.js +930,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 +5,This is based on the attendance of this Employee,ويستند هذا على حضور هذا الموظف
-DocType: Sales Invoice,Frequency,تردد
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +463,Debit Account,حساب الخصم
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Debit Account,حساب الخصم
 DocType: Fiscal Year,Year Start Date,تاريخ بدء العام
 DocType: Attendance,Employee Name,اسم الموظف
 DocType: Sales Invoice,Rounded Total (Company Currency),المشاركات تقريب (العملة الشركة)
@@ -4036,43 +4093,43 @@
 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 +210,Supplier Quotation {0} created,المورد الاقتباس {0} خلق
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +208,Supplier Quotation {0} created,المورد الاقتباس {0} خلق
 apps/erpnext/erpnext/accounts/report/financial_statements.py +90,End Year cannot be before Start Year,نهاية السنة لا يمكن أن يكون قبل بدء السنة
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Employee Benefits,فوائد الموظف
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,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 +228,Please set a default Holiday List for Employee {0} or Company {1},يرجى تحديد قائمة العطل الافتراضية للموظف {0} أو شركة {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +232,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 +499,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},الصف لا {0}: مبلغ لا يمكن أن يكون أكبر من ريثما المبلغ من النفقات المطالبة {1}. في انتظار المبلغ {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +500,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},الصف لا {0}: مبلغ لا يمكن أن يكون أكبر من ريثما المبلغ من النفقات المطالبة {1}. في انتظار المبلغ {2}
 DocType: Maintenance Schedule,Schedule,جدول
 DocType: Account,Parent Account,الأصل حساب
 DocType: Quality Inspection Reading,Reading 3,قراءة 3
 ,Hub,محور
 DocType: GL Entry,Voucher Type,نوع السند
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1007,Price List not found or disabled,قائمة الأسعار لم يتم العثور أو تعطيلها
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1008,Price List not found or disabled,قائمة الأسعار لم يتم العثور أو تعطيلها
 DocType: Expense Claim,Approved,وافق
 DocType: Pricing Rule,Price,السعر
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +244,Employee relieved on {0} must be set as 'Left',يجب أن يتم تعيين الموظف مرتاح على {0} ك ' اليسار '
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +256,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} في نطاق تاريخ معين
 DocType: Employee,Education,تعليم
 DocType: Selling Settings,Campaign Naming By,حملة التسمية بواسطة
 DocType: Employee,Current Address Is,العنوان الحالي هو
-apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,"Optional. Sets company's default currency, if not specified.",اختياري. يحدد العملة الافتراضية الشركة، إذا لم يكن محددا.
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,"Optional. Sets company's default currency, if not specified.",اختياري. ضبط العملة الافتراضية للشركة، إذا لم يكن محددا.
 DocType: Address,Office,مكتب
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,القيود المحاسبية
 DocType: Delivery Note Item,Available Qty at From Warehouse,الكمية المتوفرة في المستودعات من
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +259,Please select Employee Record first.,يرجى تحديد سجل الموظف أولا.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +266,Please select Employee Record first.,يرجى تحديد سجل الموظف أولا.
 DocType: POS Profile,Account for Change Amount,حساب لتغيير المبلغ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +190,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},الصف {0}: حزب / حساب لا يتطابق مع {1} / {2} في {3} {4}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +235,Please enter Expense Account,الرجاء إدخال حساب المصاريف
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,Please enter Expense Account,الرجاء إدخال حساب المصاريف
 DocType: Account,Stock,المخزون
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,"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 +976,"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,تفاصيل شراء / تصنيع
@@ -4087,9 +4144,10 @@
 DocType: Asset Movement,Transaction Date,تاريخ المعاملة
 DocType: Production Plan Item,Planned Qty,المخطط الكمية
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,مجموع الضرائب
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,For Quantity (Manufactured Qty) is mandatory,لالكمية (الكمية المصنعة) إلزامي
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,For Quantity (Manufactured Qty) is mandatory,لالكمية (الكمية المصنعة) إلزامي
 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 +78,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,تاريخ البدء الفعلي
@@ -4104,9 +4162,11 @@
 DocType: Warranty Claim,If different than customer address,إذا كان مختلفا عن عنوان العميل
 DocType: BOM Operation,BOM Operation,BOM عملية
 DocType: Purchase Taxes and Charges,On Previous Row Amount,على المبلغ الصف السابق
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +226,Transfer Asset,نقل الأصول
+DocType: Student,Home Address,عنوان المنزل
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +227,Transfer Asset,نقل الأصول
 DocType: POS Profile,POS Profile,POS الملف الشخصي
 apps/erpnext/erpnext/config/schools.py +33,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 +129,"Item {0} is a template, please select one of its variants",{0} البند هو قالب، يرجى اختيار واحد من مشتقاته
 DocType: Asset,Asset Category,فئة الأصول
@@ -4116,8 +4176,8 @@
 DocType: Assessment,Room,غرفة
 DocType: Purchase Order,Advance Paid,مسبقا المدفوعة
 DocType: Item,Item Tax,البند الضرائب
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +765,Material to Supplier,المواد للمورد ل
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +189,Excise Invoice,المكوس الفاتورة
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,Material to Supplier,المواد للمورد ل
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,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,الخصوم الحالية
@@ -4127,7 +4187,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,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 +136,Credit Card,بطاقة إئتمان
+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.,الإعدادات الافتراضية ل معاملات الأوراق المالية .
 DocType: Purchase Invoice,Next Date,تاريخ القادمة
@@ -4135,6 +4195,7 @@
 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: Academic Term,Term End Date,المدى تاريخ الانتهاء
 DocType: Hub Settings,Seller Name,اسم البائع
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),الضرائب والرسوم مقطوعة (عملة الشركة)
 DocType: Item Group,General Settings,الإعدادات العامة
@@ -4146,7 +4207,7 @@
 DocType: Customer,Commission Rate,نسبة العمولة
 apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,أنشئ متغير
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,منع مغادرة الطلبات المقدمة من الإدارة.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +115,"Payment Type must be one of Receive, Pay and Internal Transfer",يجب أن يكون نوع دفعة واحدة من استلام والدفع ونقل الداخلي
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +118,"Payment Type must be one of Receive, Pay and Internal Transfer",يجب أن يكون نوع دفعة واحدة من استلام والدفع ونقل الداخلي
 apps/erpnext/erpnext/config/selling.py +169,Analytics,التحليلات
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,السلة فارغة
 DocType: Production Order,Actual Operating Cost,الفعلية تكاليف التشغيل
@@ -4156,15 +4217,15 @@
 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: Packing Slip,Package Weight Details,تفاصيل حزمة الوزن
-DocType: Payment Gateway Account,Payment Gateway Account,دفع حساب العبارة
+DocType: Payment Gateway Account,Payment Gateway Account,دفع حساب البوابة
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,اعاده توجيه المستخدم الى الصفحات المحدده بعد اكتمال عمليه الدفع
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,يرجى تحديد ملف CSV
 DocType: 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 +92,Designer,مصمم
+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/accounts/doctype/purchase_invoice/purchase_invoice.py +469,Cost Center is required in row {0} in Taxes table for type {1},مطلوب مركز تكلفة في الصف {0} في جدول الضرائب لنوع {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +472,Cost Center is required in row {0} in Taxes table for type {1},مطلوب مركز تكلفة في الصف {0} في جدول الضرائب لنوع {1}
 DocType: Program,Program Code,رمز البرنامج
 ,Item-wise Purchase Register,البند من الحكمة الشراء تسجيل
 DocType: Batch,Expiry Date,تاريخ انتهاء الصلاحية
@@ -4174,12 +4235,12 @@
 apps/erpnext/erpnext/config/projects.py +13,Project master.,المشروع الرئيسي.
 apps/erpnext/erpnext/controllers/status_updater.py +174,"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 +417, (Half Day),(نصف يوم)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425, (Half Day),(نصف يوم)
 DocType: Supplier,Credit Days,الائتمان أيام
 DocType: Leave Type,Is Carry Forward,والمضي قدما
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +740,Get Items from BOM,BOM الحصول على أصناف من
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +711,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 +549,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},الصف # {0}: تاريخ النشر يجب أن يكون نفس تاريخ الشراء {1} من الأصول {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +552,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,نقل رصيدا من مستودع واحد إلى آخر
diff --git a/erpnext/translations/bg.csv b/erpnext/translations/bg.csv
index 40422a2..188ff1a 100644
--- a/erpnext/translations/bg.csv
+++ b/erpnext/translations/bg.csv
@@ -18,11 +18,10 @@
 DocType: Sales Partner,Dealer,Търговец
 DocType: Employee,Rented,Отдаден
 DocType: Purchase Order,PO-,поли-
-apps/erpnext/erpnext/accounts/report/financial_statements.py +19,Start Year {0} not found.,Започнете Година {0} не е намерен.
 DocType: POS Profile,Applicable for User,Приложимо за User
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +191,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Спряно производство Поръчка не може да бъде отменено, отпуши го първо да отмените"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +197,Do you really want to scrap this asset?,Наистина ли искате да се откаже от този актив?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +17,Select Default Supplier,Избор По подразбиране доставчик
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +192,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Спряно производство Поръчка не може да бъде отменено, отпуши го първо да отмените"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +198,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 +36,Currency is required for Price List {0},Се изисква валута за Ценоразпис {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Ще се изчисли при транзакция.
 DocType: Address,County,окръг
@@ -42,46 +41,45 @@
 DocType: Sales Invoice,Customer Name,Име на клиента
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +126,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 +180,Outstanding for {0} cannot be less than zero ({1}),Изключително за {0} не може да бъде по-малък от нула ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,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 +148,Series Updated Successfully,Series успешно обновени
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +149,Series Updated Successfully,Series успешно обновени
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Checkout
 DocType: Pricing Rule,Apply On,Нанася се върху
 DocType: Item Price,Multiple Item prices.,Множество цени елемент.
 ,Purchase Order Items To Be Received,Покупка Поръчка артикули да бъдат получени
 DocType: SMS Center,All Supplier Contact,All доставчика Свържи се с
-DocType: Quality Inspection Reading,Parameter,Параметър
 apps/erpnext/erpnext/projects/doctype/project/project.py +54,Expected End Date can not be less than Expected Start Date,Очаквано Крайна дата не може да бъде по-малко от очакваното Начална дата
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Курсове трябва да е същото като {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +239,New Leave Application,New Оставете Application
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,New Leave Application,New Оставете Application
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +20,Attendance Record {0} exists against Student {1} for Course Schedule {2},Присъствие Record {0} съществува срещу Student {1} за Course График {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Bank Draft,Bank Проект
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,Bank Проект
 DocType: Mode of Payment Account,Mode of Payment Account,Начин на разплащателна сметка
 apps/erpnext/erpnext/stock/doctype/item/item.js +52,Show Variants,Покажи Варианти
 DocType: Academic Term,Academic Term,Академик Term
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +13,Material,Материал
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Quantity,Количество
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +511,Accounts table cannot be blank.,Сметки маса не може да бъде празно.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +616,Quantity,Количество
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +512,Accounts table cannot be blank.,Сметки маса не може да бъде празно.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,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,Предназначение
 DocType: Production Plan Item,Production Plan Item,Производство Plan Точка
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +142,User {0} is already assigned to Employee {1},Потребителят {0} вече е назначен служител {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Грижа за здравето
-DocType: Purchase Invoice,Monthly,Месечно
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Забавяне на плащане (дни)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +771,Invoice,Фактура
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +750,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 +198,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} не съвпада с {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Row # {0}:
+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 +127,Please select Price List,Моля изберете Ценоразпис
@@ -112,8 +110,8 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Същата фирма се вписват повече от веднъж
 DocType: Employee,Married,Омъжена
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Не се разрешава {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +589,Get items from,Вземете елементи от
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +382,Stock cannot be updated against Delivery Note {0},Фондова не може да бъде актуализиран срещу Бележка за доставка {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Вземете елементи от
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,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,Хранителни стоки
@@ -122,7 +120,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Пенсионни фондове
 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 +156,Salary Structure Missing,Заплата Структура Липсващ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Salary Structure Missing,Заплата Структура Липсващ
 DocType: Lead,Person Name,Лице Име
 DocType: Sales Invoice Item,Sales Invoice Item,Фактурата за продажба Точка
 DocType: Account,Credit,Кредит
@@ -130,10 +128,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,Warehouse Подробности
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,Credit limit has been crossed for customer {0} {1}/{2},Кредитен лимит е била пресечена за клиенти {0} {1} / {2}
-apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Е фиксирана на активи&quot; не може да бъде овладяна, като съществува запис на активи срещу елемента"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +189,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; не може да бъде овладяна, като съществува запис на активи срещу елемента"
 DocType: Tax Rule,Tax Type,Данъчна Type
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +144,You are not authorized to add or update entries before {0},Вие не можете да добавяте или актуализация записи преди {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},Вие не можете да добавяте или актуализация записи преди {0}
 DocType: Item,Item Image (if not slideshow),Точка на снимката (ако не слайдшоу)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Съществува Customer със същото име
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(надница на час / 60) * действително отработено време
@@ -143,18 +142,17 @@
 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 +165,Opening,Отвор
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,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/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Клиент&gt; Customer Група&gt; Територия
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Account плащат само
 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 трансакция не може да бъде превърната в група.
 DocType: Lead,Product Enquiry,Каталог Запитване
 DocType: Academic Term,Schools,училища
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,"Моля, въведете първата компания"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Company first,Моля изберете Company първа
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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,Обща Цена
@@ -164,7 +162,7 @@
 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
 DocType: Purchase Invoice Item,Is Fixed Asset,Има дълготраен актив
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Available qty is {0}, you need {1}","Налични Количество е {0}, трябва {1}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +225,"Available qty is {0}, you need {1}","Налични Количество е {0}, трябва {1}"
 DocType: Expense Claim Detail,Claim Amount,Изискайте Сума
 DocType: Employee,Mr,Господин
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Доставчик Type / Доставчик
@@ -173,25 +171,26 @@
 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: Assessment Result,Grade,клас
 DocType: Sales Invoice Item,Delivered By Supplier,Доставени от доставчик
 DocType: SMS Center,All Contact,Всички контакти
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Annual Salary,Годишна заплата
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Сток Разходи
-apps/erpnext/erpnext/accounts/report/financial_statements.py +22,End Year {0} not found.,Край Година {0} не е намерен.
 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}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Доставка на суровини за пазаруване
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +130,At least one mode of payment is required for POS invoice.,се изисква най-малко един режим на плащане за POS фактура.
 DocType: Products Settings,Show Products as a List,Показване на продукти като Списък
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Изтеглете шаблони, попълнете необходимите данни и се прикрепва на текущото изображение. Всички дати и служител комбинация в избрания период ще дойде в шаблона, със съществуващите записи посещаемост"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +451,Item {0} is not active or end of life has been reached,Точка {0} не е активен или е било постигнато в края на жизнения
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +456,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/controllers/accounts_controller.py +614,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","За да включват курортна такса в ред {0} в скоростта на т, данъци в редове {1} трябва да се включат и"
+apps/erpnext/erpnext/controllers/accounts_controller.py +617,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","За да включват курортна такса в ред {0} в скоростта на т, данъци в редове {1} трябва да се включат и"
 apps/erpnext/erpnext/config/hr.py +166,Settings for HR Module,Настройки за Module HR
 DocType: SMS Center,SMS Center,SMS Center
 DocType: Sales Invoice,Change Amount,Промяна сума
@@ -203,13 +202,13 @@
 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 +147,Execution,Изпълнение
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Execution,Изпълнение
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Подробности за извършените операции.
 DocType: Serial No,Maintenance Status,Поддръжка Status
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Артикули и ценообразуване
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Общо време: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},"От дата трябва да бъде в рамките на фискалната година. Ако приемем, че от датата = {0}"
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,Cost Center {0} does not belong to Company {1},Разходен център {0} не принадлежи към Company {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +100,Cost Center {0} does not belong to Company {1},Разходен център {0} не принадлежи към Company {1}
 DocType: Customer,Individual,Индивидуален
 DocType: Interest,Academics User,Академиците User
 DocType: Cheque Print Template,Amount In Figure,Сума На фигура
@@ -225,30 +224,32 @@
 DocType: Production Planning Tool,Sales Orders,Продажби Поръчки
 DocType: Purchase Taxes and Charges,Valuation,Оценка
 ,Purchase Order Trends,Поръчката Trends
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,The request for quotation can be accessed by clicking on the following link,Искането за котировки могат да бъдат достъпни чрез щракване върху следния линк
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,Разпределяне на листа за годината.
 DocType: SG Creation Tool Course,SG Creation Tool Course,ДВ Създаване Tool Course
 DocType: Student Group Creation Tool,Leave blank if you wish to fetch all courses for selected academic term,"Оставете празно, ако искате да донесе на всички курсове за избран учебен план"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,Insufficient Stock,Недостатъчна наличност
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227,Insufficient Stock,Недостатъчна наличност
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Disable планиране на капацитета и за проследяване на времето
+DocType: Email Digest,New Sales Orders,Продажбите на нови поръчки
 DocType: Bank Reconciliation,Bank Account,Банкова Сметка
 DocType: Leave Type,Allow Negative Balance,Оставя отрицателен баланс
 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/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} does not belong to Company {1},Сметка {0} не принадлежи към Фирма {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +86,Account {0} does not belong to Company {1},Сметка {0} не принадлежи към Фирма {1}
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},Адванс сума не може да бъде по-голяма от {0} {1}
 DocType: Naming Series,Series List for this Transaction,Series Списък за тази транзакция
 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 +174,For Warehouse is required before Submit,За Warehouse се изисква преди Подайте
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,For Warehouse is required before Submit,За Warehouse се изисква преди Подайте
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Получен на
 DocType: Sales Partner,Reseller,Reseller
 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 +1436,"LocalStorage is full , did not save","LocalStorage е пълен, не спаси"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1460,"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}
@@ -261,18 +262,19 @@
 apps/erpnext/erpnext/templates/generators/item.html +78,No description given,Няма описание дадено
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Заявка за покупка.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +5,This is based on the Time Sheets created against this project,Това се основава на графици създадените срещу този проект
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Only the selected Leave Approver can submit this Leave Application,Само избраният Оставете одобряващ да подадете този отпуск Application
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +213,Only the selected Leave Approver can submit this Leave Application,Само избраният Оставете одобряващ да подадете този отпуск Application
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Облекчаване дата трябва да е по-голяма от Дата на Присъединяване
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Leaves per Year,Листата на година
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,Листата на година
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"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}
+DocType: Email Digest,Profit & Loss,Загуба на печалба
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,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 +435,Leave Blocked,Оставете Блокирани
-apps/erpnext/erpnext/stock/doctype/item/item.py +669,Item {0} has reached its end of life on {1},Точка {0} е достигнал края на своя живот на {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +443,Leave Blocked,Оставете Блокирани
+apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item {0} has reached its end of life on {1},Точка {0} е достигнал края на своя живот на {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +95,Bank Entries,Банковите влизания
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +83,Annual,Годишен
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +86,Annual,Годишен
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Склад за помирение Точка
 DocType: Stock Entry,Sales Invoice No,Продажби Фактура Не
 DocType: Material Request Item,Min Order Qty,Min Поръчка Количество
@@ -280,20 +282,22 @@
 DocType: Lead,Do Not Contact,Не допирайте
 apps/erpnext/erpnext/public/js/setup_wizard.js +360,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 +91,Software Developer,Разработчик На Софтуер
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,Разработчик На Софтуер
 DocType: Item,Minimum Order Qty,Минимална поръчка Количество
 DocType: Pricing Rule,Supplier Type,Доставчик Type
 DocType: Scheduling Tool,Course Start Date,Курс Начална дата
 DocType: Item,Publish in Hub,Публикувай в Hub
+DocType: Student Admission,Student Admission,прием на студенти
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is cancelled,Точка {0} е отменен
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Material Request,Материал Искане
+apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} is cancelled,Точка {0} е отменен
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +823,Material Request,Материал Искане
 DocType: Bank Reconciliation,Update Clearance Date,Актуализация Клирънсът Дата
 apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +28,Abbreviation already used for another salary component,Съкращение вече се използва за друг компонент заплата
 DocType: Item,Purchase Details,Изкупните Детайли
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +328,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Точка {0} не е открит в &quot;суровини Доставя&quot; маса в Поръчката {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +333,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/config/selling.py +18,Confirmed orders from Customers.,Потвърдените поръчки от клиенти.
 DocType: Purchase Receipt Item,Rejected Quantity,Отхвърлени Количество
 DocType: SMS Settings,SMS Sender Name,SMS Sender Име
@@ -309,20 +313,21 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +130,Please select Charge Type first,Моля изберете Charge Type първи
 DocType: Student Group Student,Student Group Student,Student Група Student
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Последен
+DocType: Email Digest,New Quotations,Нови Оферти
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Първият Оставете одобряващ в списъка ще бъде избран по подразбиране Оставете одобряващ
 DocType: Tax Rule,Shipping County,County Доставка
 apps/erpnext/erpnext/config/desktop.py +158,Learn,Уча
 DocType: Asset,Next Depreciation Date,Следваща Амортизация Дата
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Разходите за дейността според Служител
 DocType: Accounts Settings,Settings for Accounts,Настройки за сметки
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +626,Supplier Invoice No exists in Purchase Invoice {0},Доставчик на фактура не съществува в фактурата за покупка {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +629,Supplier Invoice No exists in Purchase Invoice {0},Доставчик на фактура не съществува в фактурата за покупка {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Управление на продажбите Person Tree.
 DocType: Job Applicant,Cover Letter,Мотивационно писмо
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Неуредени Чекове Депозити и за да изчистите
 DocType: Item,Synced With Hub,Синхронизирано С 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 +348,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 +86,Circular Reference Error,Circular Референтен Error
@@ -334,15 +339,16 @@
 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 +806,Delivery Note,Фактура
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +800,Delivery Note,Фактура
 apps/erpnext/erpnext/config/learn.py +87,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 +233,Payment Entry has been modified after you pulled it. Please pull it again.,"Заплащане вписване е променен, след като го извади. Моля, изтеглете го отново."
+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/setup/doctype/email_digest/email_digest.py +104,Summary for this week and pending activities,Резюме за тази седмица и предстоящи дейности
+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 разделени със запетаи, фактура ще бъде изпратено автоматично на определена дата"
 DocType: Employee,Company Email,Фирма Email
@@ -354,27 +360,28 @@
 apps/erpnext/erpnext/config/hr.py +186,"Employee designation (e.g. CEO, Director etc.).","Наименование на служителите (например главен изпълнителен директор, директор и т.н.)."
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,"Моля, въведете &quot;Повторение на Ден на месец поле стойност"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Скоростта, с която Customer валути се превръща в основна валута на клиента"
-apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row {0}: Покупка на фактура не може да се направи срещу съществуващ актив {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +554,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 +54,{0} already allocated for Employee {1} for period {2} to {3},"{0} вече разпределена за Employee {1} за период {2} {3}, за да"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +812,Select Item,Изберете Точка
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +791,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/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Фактурата за покупка {0} вече се представя
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch Не трябва да е същото като {1} {2}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +143,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 (много) на дадена позиция.
 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 +342,Please see attachment,"Моля, вижте прикачения файл"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,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 +19,Setup Already Complete!!,Setup Вече Complete !!
 ,Finished Goods,Готова продукция
 DocType: Delivery Note,Instructions,Инструкции
 DocType: Quality Inspection,Inspected By,Инспектирани от
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Доставчик&gt; Доставчик Type
 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,Добавят продукти
@@ -388,29 +395,29 @@
 DocType: Currency Exchange,Currency Exchange,Обмяна На Валута
 DocType: Purchase Invoice Item,Item Name,Име на артикул
 DocType: Authorization Rule,Approving User  (above authorized value),Одобряване на потребителя (над разрешено стойност)
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Credit Balance
+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/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Ако няколко ценови правила продължават да преобладават, потребителите се приканват да се настрои приоритет ръчно да разрешите конфликт."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +736,Purchase Return,Покупка Return
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +715,Purchase Return,Покупка Return
 ,Purchase Register,Покупка Регистрация
 DocType: 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 +202,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) трябва да има роля в ""Одобряващ напускане"""
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) трябва да има роля в ""Одобряващ напускане"""
 DocType: Purchase Receipt,Vehicle Date,Камион Дата
 DocType: Student Log,Medical,Медицински
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Причина за загубата
-apps/erpnext/erpnext/accounts/utils.py +239,Allocated amount can not greater than unadjusted amount,Разпределени сума може да не по-голяма от некоригирана стойност
+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,Разпределени сума може да не по-голяма от некоригирана стойност
 DocType: Announcement,Receiver,приемник
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},"Workstation е затворен на следните дати, както на Holiday Списък: {0}"
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Възможности
 DocType: Employee,Single,Единичен
 DocType: Account,Cost of Goods Sold,Себестойност на продадените стоки
 DocType: Purchase Invoice,Yearly,Годишно
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +225,Please enter Cost Center,"Моля, въведете Cost Center"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,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
@@ -423,26 +430,26 @@
 DocType: Purchase Invoice,Supplier Name,Доставчик Наименование
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Прочетете инструкциите ERPNext
 DocType: Account,Is Group,Is Група
+DocType: Email Digest,Pending Purchase Orders,В очакване на поръчки за покупка
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Автоматично Определете серийни номера на базата на FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Проверете доставчик Invoice Брой Уникалност
 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 +102,Non Profit,Non Profit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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: Stock Reconciliation Item,Do not include symbols (ex. $),Не включват символи (напр. $)
 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 +638,Attribute {0} selected multiple times in Attributes Table,Умение {0} избрани няколко пъти в атрибути на маса
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Умение {0} избрани няколко пъти в атрибути на маса
 DocType: HR Settings,Employee record is created using selected field. ,Запис на служителите е създаден с помощта на избран област.
 DocType: Sales Order,Not Applicable,Не Е Приложимо
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Holiday майстор.
 DocType: Request for Quotation Item,Required Date,Задължително Дата
 DocType: Delivery Note,Billing Address,Адрес На Плащане
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +862,Please enter Item Code.,"Моля, въведете Код."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +847,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 размер"
@@ -456,12 +463,12 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Ценни книжа и депозити
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Общо листа разпределени е задължително
 DocType: Job Opening,Description of a Job Opening,Описание на Откриване на работа
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Pending activities for today,Предстоящите дейности за днес
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Предстоящите дейности за днес
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Присъствие запис.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Заплата Компонент за график базирани работни заплати.
 DocType: Sales Order Item,Used for Production Plan,Използвани за производство на План
 DocType: Manufacturing Settings,Time Between Operations (in mins),Време между операциите (в минути)
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +92,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} Бюджет за профила {1} срещу Cost Center {2} е {3}. Тя ще превишава с {4}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +95,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} Бюджет за профила {1} срещу Cost Center {2} е {3}. Тя ще превишава с {4}
 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,Избраните списъците с материали не са за една и съща позиция
@@ -469,16 +476,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +238,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,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 +86,Administrative Officer,Административният директор
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,Административният директор
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +23,Acutal Qty {0} / Waiting Qty {1},Актуално Количество {0} / Очаквано Количество {1}
 DocType: Timesheet Detail,Hrs,Hrs
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +319,Please select Company,Моля изберете Company
-DocType: Stock Entry,Difference Account,Разлика Акаунт
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +309,Please select Company,Моля изберете Company
+DocType: Stock Entry Detail,Difference Account,Разлика Акаунт
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,"Не може да се близо задача, тъй като си зависим задача {0} не е затворен."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Please enter Warehouse for which Material Request will be raised,"Моля, въведете Warehouse, за които ще бъдат повдигнати Материал Искане"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +399,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 +530,"To merge, following properties must be same for both items","За да се слеят, следните свойства трябва да са едни и същи и за двете позиции"
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,"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 +28,Buy,купувам
@@ -486,7 +493,7 @@
 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 +1563,Serial no item cannot be a fraction,Сериен № точка не може да бъде по-малка
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1587,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,Управление Подизпълнители
@@ -495,13 +502,14 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Account {0} does not belong to company: {1},Сметка {0} не принадлежи на фирма: {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation already used for another company,Съкращение вече се използва за друга компания
 DocType: Selling Settings,Default Customer Group,Default Customer Group
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Supplier is required against Payable account {0},Доставчик се изисква срещу Платими сметка {0}
 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
 DocType: Production Planning Tool,Material Requirement,Материал Изискване
 DocType: Company,Delete Company Transactions,Изтриване на фирма Сделки
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +313,Reference No and Reference Date is mandatory for Bank transaction,Референтен Не и Референтен Дата е задължително за Bank сделка
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +316,Reference No and Reference Date is mandatory for Bank transaction,Референтен Не и Референтен Дата е задължително за Bank сделка
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Добавяне / Редактиране на данъци и такси
 DocType: Purchase Invoice,Supplier Invoice No,Доставчик Invoice Не
 DocType: Territory,For reference,За справка
@@ -512,7 +520,6 @@
 DocType: Installation Note Item,Installation Note Item,Монтаж Забележка Точка
 DocType: Production Plan Item,Pending Qty,Отложена Количество
 DocType: Budget,Ignore,Игнорирам
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Код&gt; Точка Група&gt; Brand
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,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 график
@@ -523,11 +530,11 @@
 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/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 +28,Please select Company and Party Type first,Моля изберете Company и Party Type първи
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +19,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 +707,Make Sales Order,Направи поръчка за продажба
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +701,Make Sales Order,Направи поръчка за продажба
 DocType: Project Task,Project Task,Проект Task
 ,Lead Id,Lead Id
 DocType: C-Form Invoice Detail,Grand Total,Общо
@@ -543,7 +550,8 @@
 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 +734,Sales Return,Продажбите Return
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +728,Sales Return,Продажбите Return
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +91,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)
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,База данни за потенциални клиенти.
@@ -552,14 +560,13 @@
 DocType: Quotation,Quotation To,Офертата до
 DocType: Lead,Middle Income,Среден доход
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +212,Opening (Cr),Откриване (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +795,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Default мерната единица за т {0} не може да се променя директно, защото вече сте направили някаква сделка (и) с друга мерна единица. Вие ще трябва да се създаде нова т да използвате различен Default мерна единица."
-apps/erpnext/erpnext/accounts/utils.py +237,Allocated amount can not be negative,Отпусната сума не може да бъде отрицателна
+apps/erpnext/erpnext/stock/doctype/item/item.py +797,Default Unit of Measure for Item {0} cannot be changed directly because 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,Отпусната сума не може да бъде отрицателна
 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 +91,Reference No & Reference Date is required for {0},Референтен номер по &amp; Референтен Дата се изисква за {0}
-DocType: Sales Invoice,Customer's Vendor,Търговец на клиента
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Proposal Writing,Предложение за писане
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,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","Ако е избрано, суровини за елементи, които са подизпълнители ще бъдат включени в материала Исканията"
@@ -568,13 +575,14 @@
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,проследяване на времето
 DocType: Fiscal Year Company,Fiscal Year Company,Фискална година Company
 DocType: Packing Slip Item,DN Detail,DN Подробности
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +257,Already supplier quotation has created,Вече доставчика котировка е създал
 DocType: Timesheet,Billed,Обявен
 DocType: Batch,Batch Description,Партида Описание
+apps/erpnext/erpnext/accounts/utils.py +685,"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 +733,View Offline Records,Преглед на офлайн Records
+apps/erpnext/erpnext/accounts/page/pos/pos.js +715,View Offline Records,Преглед на офлайн Records
+DocType: Student,Sibling Details,събрат Детайли
 DocType: Employee,Reason for Resignation,Причина за Оставка
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,Шаблон за атестирането.
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,Фактура / вестник влизането информация
@@ -588,7 +596,7 @@
 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,Нетна промяна в Инвентаризация
 DocType: Employee,Passport Number,Номер на паспорт
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Manager,Мениджър
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,Мениджър
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,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,"""Въз основа на"" и ""Групиране По"" не могат да бъдат еднакви"
@@ -597,10 +605,11 @@
 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 +299,Timesheet created:,График създаден:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +715,Please set default Cash or Bank account in Mode of Payment {0},"Моля, задайте по подразбиране брой или банкова сметка в начинът на плащане {0}"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +300,Timesheet created:,График създаден:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +772,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,Записвам се
 DocType: Selling Settings,Customer Naming By,Задаване на име на клиента от
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Моля, настройка на служителите за именуване на системата в Human Resource&gt; Настройки HR"
 DocType: Depreciation Schedule,Depreciation Amount,Амортизацията сума
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,Конвертиране в Група
 DocType: Activity Cost,Activity Type,Вид Дейност
@@ -625,6 +634,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,завършек
 DocType: Pricing Rule,Sales Manager,Мениджър Продажби
 DocType: Salary Structure Employee,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,Печалба / Загуба на профила за изхвърляне на активи
@@ -639,11 +649,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +9,Pre Sales,Предварителни продажби
 DocType: Purchase Receipt,Other Details,Други детайли
 DocType: Account,Accounts,Сметки
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Marketing,Маркетинг
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +227,Payment Entry is already created,Заплащане Влизане вече е създаден
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,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 +538,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 +21,Preview Salary Slip,Преглед Заплата Slip
+apps/erpnext/erpnext/controllers/accounts_controller.py +541,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 +38,Preview Salary Slip,Преглед Заплата Slip
 DocType: Company,Deafult Cost Center,Deafult Center Cost
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +48,Account {0} has been entered multiple times,Сметка {0} е била въведена на няколко пъти
 DocType: Account,Expenses Included In Valuation,"Разходи, включени в остойностяване"
@@ -652,7 +662,7 @@
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,"Моля, изберете Student Group"
 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 +617,Item has variants.,Точка има варианти.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Точка има варианти.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,Точка {0} не е намерен
 DocType: Bin,Stock Value,Стойността на акциите
 apps/erpnext/erpnext/accounts/doctype/account/account.py +25,Company {0} does not exist,Фирма {0} не съществува
@@ -672,7 +682,7 @@
 DocType: Purchase Order,Supply Raw Materials,Доставка суровини
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Датата, на която ще се генерира следващата фактура. Той се генерира на представи."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Текущите активи
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,{0} is not a stock Item,{0} не е в наличност
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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 +169,Lead must be set if Opportunity is made from Lead,"Водещият трябва да се настрои, ако Opportunity е направена от олово"
@@ -739,26 +749,25 @@
 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 +709,No Permission,Няма разрешение
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +710,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}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +298,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 +542,Row #{0}: Asset {1} must be submitted,{0} Row #: Asset трябва да бъде подадено {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset {1} must be submitted,{0} Row #: 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,Всички клиенти Контакти
 apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,Качване на склад баланс чрез CSV.
 DocType: Warehouse,Tree Details,Tree Детайли
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Изпрати сега
 ,Support Analytics,Поддръжка Analytics
 DocType: Item,Website Warehouse,Website Warehouse
 DocType: Payment Reconciliation,Minimum Invoice Amount,Минимална сума на фактурата
 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/sales_invoice/sales_invoice.py +227,Timesheet {0} is already completed or cancelled,График {0} вече е завършено или анулирано
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +259,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
@@ -774,13 +783,13 @@
 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,Въведете пенсионна възраст в години
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +229,Target Warehouse,Target Warehouse
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +230,Target Warehouse,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-,"Stepan,"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Sales Order Date,Очаквана дата на доставка не може да бъде преди Продажби Поръчка Дата
 DocType: Upload Attendance,Import Attendance,Внос Присъствие
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Всички стокови групи
+apps/erpnext/erpnext/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/config/setup.py +89,Automatically compose message on submission of transactions.,Автоматично композира съобщение при представяне на сделките.
@@ -792,13 +801,15 @@
 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/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,Бележка за доставка на ЛС
 DocType: Expense Claim,Expenses,Разходи
 DocType: Item Variant Attribute,Item Variant Attribute,Позиция Variant Умение
 ,Purchase Receipt Trends,Покупка Квитанция Trends
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Research & Development,Research &amp; развитие
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Research &amp; развитие
 ,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
@@ -807,7 +818,7 @@
 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/controllers/accounts_controller.py +340,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Плащането Влизане {0} е свързан срещу Поръчка {1}, проверете дали тя трябва да се извади като предварително в тази фактура."
+apps/erpnext/erpnext/controllers/accounts_controller.py +343,"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,Точка на продажба
@@ -829,12 +840,12 @@
 DocType: Supplier Quotation,Is Subcontracted,Преотстъпват
 DocType: Item Attribute,Item Attribute Values,Точка на стойностите на атрибутите
 DocType: Examination Result,Examination Result,Разглеждане Резултати
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +756,Purchase Receipt,Покупка Разписка
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +735,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 +167,Reference Doctype must be one of {0},Референтен Doctype трябва да бъде един от {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +282,Unable to find Time Slot in the next {0} days for Operation {1},Не може да се намери време слот за следващия {0} ден за операция {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +170,Reference Doctype must be one of {0},Референтен Doctype трябва да бъде един от {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Unable to find Time Slot in the next {0} days for Operation {1},Не може да се намери време слот за следващия {0} ден за операция {1}
 DocType: Production Order,Plan material for sub-assemblies,План материал за частите
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Дистрибутори и територия
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be active,BOM {0} трябва да бъде активен
@@ -845,7 +856,7 @@
 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 +214,Warehouses with existing transaction can not be converted to ledger.,Складове с действащото сделка не може да се превърнат в книга.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +217,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,Производствени поръчки
@@ -859,9 +870,9 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Служител {0} не е активен или не съществува
 DocType: Fee Structure,Components,елементи
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,Please enter Asset Category in Item {0},"Моля, въведете Asset Категория т {0}"
-apps/erpnext/erpnext/stock/doctype/item/item.py +612,Item Variants {0} updated,Позиция Варианти {0} актуализиран
+apps/erpnext/erpnext/stock/doctype/item/item.py +614,Item Variants {0} updated,Позиция Варианти {0} актуализиран
 DocType: Quality Inspection Reading,Reading 6,Четене 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +843,Cannot {0} {1} {2} without any negative outstanding invoice,Не може да {0} {1} {2} без да окаже отрицателно неплатена фактура
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +854,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 сега
@@ -876,69 +887,72 @@
 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 +728,New Sales Invoice,New фактурата за продажба
+apps/erpnext/erpnext/accounts/page/pos/pos.js +710,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 +728,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,Lead Time Дата
 DocType: Guardian,Guardian Name,Наименование Guardian
 DocType: Cheque Print Template,Has Print Format,Има печат Формат
-apps/erpnext/erpnext/accounts/page/pos/pos.js +86, is mandatory. Maybe Currency Exchange record is not created for ,е задължително. Може би не е създаден запис на полето за обмен на валута за
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +109,Row #{0}: Please specify Serial No for Item {1},"Row # {0}: Моля, посочете Пореден № за позиция {1}"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +619,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","За &#39;Продукт Пакетни &quot;, склад, сериен номер и партидният няма да се счита от&quot; Опаковка Списък &quot;масата. Ако Warehouse и партиден № са едни и същи за всички опаковъчни артикули за т всеки &quot;Продукт Bundle&quot;, тези стойности могат да бъдат вписани в основния таблицата позиция, стойностите ще се копират в &quot;Опаковка Списък&quot; маса."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +75, 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 +613,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing 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 +606,Supplier Invoice Date cannot be greater than Posting Date,"Дата Доставчик на фактура не може да бъде по-голяма, отколкото Публикуване Дата"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +609,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: Cheque Print Template,Date Settings,Дата Settings
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Вариране
 ,Company Name,Име На Фирмата
 DocType: SMS Center,Total Message(s),Общо Message (и)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +810,Select Item for Transfer,Изберете точката за прехвърляне
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +789,Select Item for Transfer,Изберете точката за прехвърляне
 DocType: Purchase Invoice,Additional Discount Percentage,Допълнителна отстъпка Процент
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Вижте списък на всички помощни видеоклипове
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Изберете акаунт шеф на банката, в която е депозирана проверка."
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Позволи на потребителя да редактира Ценоразпис Курсове по сделки
 DocType: Pricing Rule,Max Qty,Max Количество
-DocType: Student Applicant,Father's Name,Бащино име
 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 +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,"Row {0}: Плащането срещу Продажби / Поръчката трябва винаги да бъде маркиран, като предварително"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Химически
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +686,All items have already been transferred for this Production Order.,Всички предмети са били прехвърлени вече за тази производствена поръчка.
+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} и опитайте отново
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +694,All items have already been transferred for this Production Order.,Всички предмети са били прехвърлени вече за тази производствена поръчка.
 DocType: Process Payroll,Select Payroll Year and Month,Изберете Payroll година и месец
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,Meter,метър
 DocType: Workstation,Electricity Cost,Ток Cost
 DocType: HR Settings,Don't send Employee Birthday Reminders,Не изпращайте Employee напомняне за рождени дни
-DocType: Opportunity,Walk In,Влизам
 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 +12,Transfered,Прехвърлят
 apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,Качете вашето писмо главата и лого. (Можете да ги редактирате по-късно).
 DocType: Timesheet Detail,Bill,законопроект
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,White,Бял
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date is entered as past date,Следваща Амортизация Дата се вписва като минало дата
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +167,White,Бял
 DocType: SMS Center,All Lead (Open),All Lead (Open)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +228,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Row {0}: Кол не е на разположение за {4} в склад {1} при публикуване време на влизането ({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}),Row {0}: Кол не е на разположение за {4} в склад {1} при публикуване време на влизането ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,Вземи платени аванси
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +731,Make ,Правя
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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 +154,Order Type must be one of {0},Поръчка тип трябва да е един от {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Поръчка тип трябва да е един от {0}
 DocType: Lead,Next Contact Date,Следваща Свържи Дата
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Откриване Количество
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +393,Please enter Account for Change Amount,"Моля, въведете Account за промяна сума"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,Please enter Account for Change Amount,"Моля, въведете Account за промяна сума"
 DocType: Student Batch,Student Batch Name,Student Batch Име
 DocType: Holiday List,Holiday List Name,Holiday Списък име
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js +8,Schedule Course,График на курса
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Stock Options,Сток Options
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Сток Options
 DocType: Journal Entry Account,Expense Claim,Expense претенция
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +211,Do you really want to restore this scrapped asset?,Наистина ли искате да възстановите този бракуван актив?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +237,Qty for {0},Количество за {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +212,Do you really want to restore this scrapped asset?,Наистина ли искате да възстановите този бракуван актив?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,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 Списък Дати
@@ -947,9 +961,9 @@
 DocType: Company,Default Terms,По подразбиране Условия
 DocType: Packing Slip Item,Packing Slip Item,"Приемо-предавателен протокол, т"
 DocType: Purchase Invoice,Cash/Bank Account,Cash / Bank Account
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Премахнати артикули с никаква промяна в количеството или стойността.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Премахнати артикули с никаква промяна в количеството или стойността.
 DocType: Delivery Note,Delivery To,Доставка до
-apps/erpnext/erpnext/stock/doctype/item/item.py +635,Attribute table is mandatory,Умение маса е задължително
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Умение маса е задължително
 DocType: Production Planning Tool,Get Sales Orders,Вземи Продажби Поръчки
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} не може да бъде отрицателна
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,"Моля, изберете Student"
@@ -974,7 +988,7 @@
 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,WIP Warehouse
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Пореден № {0} е по силата на договор за техническо обслужване до запълването {1}
+apps/erpnext/erpnext/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,Наименование на организацията
@@ -986,7 +1000,7 @@
 DocType: GL Entry,Against,Срещу
 DocType: Item,Default Selling Cost Center,Default Selling Cost Center
 DocType: Sales Partner,Implementation Partner,Партньор за изпълнение
-apps/erpnext/erpnext/controllers/selling_controller.py +231,Sales Order {0} is {1},Продажбите Поръчка {0} е {1}
+apps/erpnext/erpnext/controllers/selling_controller.py +232,Sales Order {0} is {1},Продажбите Поръчка {0} е {1}
 DocType: Opportunity,Contact Info,Информация За Контакт
 apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,Осъществяване на склад влизания
 DocType: Packing Slip,Net Weight UOM,Нето тегло мерна единица
@@ -996,25 +1010,24 @@
 DocType: Holiday List,Get Weekly Off Dates,Вземи Седмичен дати
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Крайна дата не може да бъде по-малка от началната дата
 DocType: Sales Person,Select company name first.,Изберете име на компанията на първо място.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,"Цитатите, получени от доставчици."
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},За да {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Средна възраст
 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/templates/pages/home.html +32,View All Products,Преглед на всички продукти
+apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Преглед на всички продукти
 DocType: Company,Default Currency,Default валути
 DocType: Contact,Enter designation of this Contact,Въведете наименование за този контакт
 DocType: Expense Claim,From Employee,От Employee
-apps/erpnext/erpnext/controllers/accounts_controller.py +400,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Внимание: Системата няма да се покажат некоректно, тъй като сума за позиция {0} в {1} е нула"
+apps/erpnext/erpnext/controllers/accounts_controller.py +403,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/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,и година:
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +191,{0} {1} must be submitted,{0} {1} трябва да бъде представено
-DocType: Email Digest,Annual Expense,Годишен Expense
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,{0} {1} must be submitted,{0} {1} трябва да бъде представено
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +145,Quantity must be less than or equal to {0},Количеството трябва да бъде по-малка или равна на {0}
 DocType: SMS Center,Total Characters,Общо Герои
 apps/erpnext/erpnext/controllers/buying_controller.py +156,Please select BOM in BOM field for Item {0},Моля изберете BOM BOM в полето за позиция {0}
@@ -1025,30 +1038,31 @@
 DocType: Sales Partner,Distributor,Разпределител
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Количка Доставка Правило
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +211,Production Order {0} must be cancelled before cancelling this Sales Order,Производство Поръчка {0} трябва да се отмени преди анулира тази поръчка за продажба
-apps/erpnext/erpnext/public/js/controllers/transaction.js +62,Please set 'Apply Additional Discount On',"Моля, задайте &quot;Прилагане Допълнителна отстъпка от &#39;"
+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 трябва да бъде по-малко от гамата
 DocType: Global Defaults,Global Defaults,Глобални Defaults
 apps/erpnext/erpnext/projects/doctype/project/project.py +153,Project Collaboration Invitation,Проект Collaboration Покана
 DocType: Salary Slip,Deductions,Удръжки
+DocType: Leave Allocation,LAL/,LAL /
 apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,Старт Година
 DocType: Purchase Invoice,Start date of current invoice's period,Начална дата на периода на текущата фактура за
 DocType: Salary Slip,Leave Without Pay,Оставете без заплащане
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +327,Capacity Planning Error,Капацитет Error планиране
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,Капацитет Error планиране
 ,Trial Balance for Party,Trial Везни за парти
 DocType: Lead,Consultant,Консултант
 DocType: Salary Slip,Earnings,Печалба
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +362,Finished Item {0} must be entered for Manufacture type entry,Завършил т {0} трябва да бъде въведен за влизане тип Производство
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +367,Finished Item {0} must be entered for Manufacture type entry,Завършил т {0} трябва да бъде въведен за влизане тип Производство
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Откриване Счетоводство Balance
 DocType: Sales Invoice Advance,Sales Invoice Advance,Фактурата за продажба Advance
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +499,Nothing to request,Няма за какво да поиска
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +500,Nothing to request,Няма за какво да поиска
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',"""Актуалната Начална дата"" не може да бъде след  ""Актуалната Крайна дата"""
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Management,Управление
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},Или сума дебитна или кредитна се изисква за {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,Управление
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +55,Either debit or credit amount is required for {0},Или сума дебитна или кредитна се изисква за {0}
 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 +161,Blue,Син
+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"
@@ -1058,12 +1072,12 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +23,POS Profile {0} already created for user: {1} and company {2},POS Профил {0} вече създаден за потребителя: {1} и компания {2}
 DocType: Purchase Order Item,UOM Conversion Factor,Мерна единица реализациите Factor
 DocType: Stock Settings,Default Item Group,По подразбиране Елемент Group
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1374,Do you really want to submit the invoice?,Наистина ли искате да представи фактура?
+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 +685,Cost Center For Item with Item Code ',Разходен център за позиция с Код &quot;
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1526,"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 +679,Cost Center For Item with Item Code ',Разходен център за позиция с Код &quot;
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1550,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Режимът на плащане не е конфигуриран. Моля, проверете, дали сметката е настроен на режим на плащания или на POS профил."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,"Вашият търговец ще получите напомняне на тази дата, за да се свърже с клиента"
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,"Further accounts can be made under Groups, but entries can be made against non-Groups","Допълнителни сметки могат да бъдат направени по групи, но записи могат да бъдат направени по отношение на не-групи"
 DocType: Lead,Lead,Lead
@@ -1083,104 +1097,106 @@
 DocType: Payment Reconciliation,Unreconciled Payment Details,Неизравнени данни за плащане
 DocType: Global Defaults,Current Fiscal Year,Текущата фискална година
 DocType: Global Defaults,Disable Rounded Total,Забранете Rounded Общо
-DocType: Lead,Call,Повикване
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +417,'Entries' cannot be empty,&quot;Записи&quot; не могат да бъдат празни
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +418,'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 +214,Fiscal Year {0} not found,Фискална година {0} не е намерен
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +221,Fiscal Year {0} not found,Фискална година {0} не е намерен
 apps/erpnext/erpnext/config/hr.py +238,Setting up Employees,Създаване Служители
 DocType: Sales Order,SO-,ТАКА-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Моля изберете префикс първа
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Please select prefix first,Моля изберете префикс първа
 DocType: Employee,O-,О-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Research,Проучване
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,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 +43,Item {0} must be a non-stock item,"Точка {0} трябва да е позиция, която не е в наличност"
 DocType: Contact,User ID,User ID
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +57,View Ledger,Виж Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Най-ранната
-apps/erpnext/erpnext/stock/doctype/item/item.py +504,"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 +506,"An Item Group exists with same name, please change the item name or rename the item group","Артикул Group съществува със същото име, моля да промените името на елемент или преименувате група т"
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +437,Rest Of The World,Останалата част от света
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,Продуктът {0} не може да има Batch
 ,Budget Variance Report,Бюджет Вариацията Доклад
 DocType: Salary Slip,Gross Pay,Брутно възнаграждение
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +90,Row {0}: Activity Type is mandatory.,Row {0}: Вид дейност е задължително.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +114,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/public/js/controllers/stock_controller.js +40,Accounting Ledger,Счетоводен Дневник
+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,Неразпределена Печалба
 DocType: BOM Item,Item Description,Елемент Описание
+DocType: Student Sibling,Student Sibling,Student Sibling
 DocType: Purchase Invoice,Is Recurring,Дали повтарящо
 DocType: Purchase Invoice,Supplied Items,Аксесоарита
 DocType: Student,STUD.,Студ.
 DocType: Production Order,Qty To Manufacture,Количество за производство
+DocType: Email Digest,New Income,New доходите
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Поддържане на същия процент в цялата покупка цикъл
 DocType: Opportunity Item,Opportunity Item,Елемент възможност
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,Временно Откриване
 ,Employee Leave Balance,Служител Оставете Balance
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +131,Balance for Account {0} must always be {1},Везни за Account {0} винаги трябва да е {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +175,Valuation Rate required for Item in row {0},"Оценка процент, необходим за позиция в ред {0}"
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,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 по компютърни науки
 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 +87, to ,да се
+apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,да се
 DocType: Item,Lead Time in days,Lead Time в дни
 ,Accounts Payable Summary,Задължения Резюме
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Not authorized to edit frozen Account {0},Не е разрешено да редактирате замразена сметка {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},Не е разрешено да редактирате замразена сметка {0}
 DocType: Journal Entry,Get Outstanding Invoices,Вземи неплатените фактури
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +62,Sales Order {0} is not valid,Продажбите Поръчка {0} не е валидна
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Продажбите Поръчка {0} не е валидна
 apps/erpnext/erpnext/setup/doctype/company/company.py +185,"Sorry, companies cannot be merged","Съжаляваме, компаниите не могат да бъдат слети"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +139,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Общото количество на емисията / Transfer {0} в Подемно-Искане {1} \ не може да бъде по-голяма от поискани количества {2} за т {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Small,Малък
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,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}
 ,Invoiced Amount (Exculsive Tax),Сума по фактура (Изключителен Tax)
-DocType: Student Applicant,Mother's / Guardian 1 Email ID,/ Guardian 1 Email ID на майката
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Позиция 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,Главна Сметка {0} е създадена
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +160,Green,Зелен
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,Зелен
 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 +57,Contract,Договор
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,Договор
 DocType: Email Digest,Add Quote,Добави цитат
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +498,UOM coversion factor required for UOM: {0} in Item: {1},Мерна единица фактор coversion изисква за мерна единица: {0} в продукт: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +503,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 +80,Row {0}: Qty is mandatory,Row {0}: Кол е задължително
+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 +737,Sync Master Data,Sync основни данни
+apps/erpnext/erpnext/accounts/page/pos/pos.js +719,Sync Master Data,Sync основни данни
 apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,Вашите продукти или услуги
 DocType: Mode of Payment,Mode of Payment,Начин на плащане
 apps/erpnext/erpnext/stock/doctype/item/item.py +178,Website Image should be a public file or website URL,Сайт на снимката трябва да бъде държавна файл или уеб сайт URL
+DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Това е главната позиция група и не може да се редактира.
+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,Повтарящо Type
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +345,"{0}: Employee email not found, hence email not sent","{0}: имейл на служителите не е намерен, следователно не имейл, изпратен"
+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,Вашата компания Адрес
 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 +118,"For {0}, only credit accounts can be linked against another debit entry","За {0}, само кредитни сметки могат да бъдат свързани с друг запис дебитна"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Delivery Note {0} is not submitted,Бележка за доставка {0} не е подадена
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Delivery Note {0} is not submitted,Бележка за доставка {0} не е подадена
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Sub-contracted Item,Точка {0} трябва да бъде подизпълнители Точка
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Капиталови УРЕДИ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Ценообразуване правило е първият избран на базата на &quot;Нанесете върху&quot; област, която може да бъде т, т Group или търговска марка."
 DocType: Hub Settings,Seller Website,Продавач Website
 DocType: Item,ITEM-,ВЕЩ-
-apps/erpnext/erpnext/controllers/selling_controller.py +147,Total allocated percentage for sales team should be 100,Общо разпределят процентно за екип по продажбите трябва да бъде 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +110,Production Order status is {0},Състояние на поръчката е {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Общо разпределят процентно за екип по продажбите трябва да бъде 100
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Състояние на поръчката е {0}
 DocType: Appraisal Goal,Goal,Гол
 DocType: Sales Invoice Item,Edit Description,Edit Описание
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +757,For Supplier,За доставчик
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +723,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
@@ -1196,10 +1212,11 @@
 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
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email бюлетин:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +445,BOM {0} does not belong to Item {1},BOM {0} не принадлежи към т {1}
 DocType: Sales Partner,Target Distribution,Target Разпределение
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1667,Deafault warehouse is required for selected item,се изисква Deafault склад за избран продукт
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Deafault warehouse is required for selected item,се изисква Deafault склад за избран продукт
 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
@@ -1208,23 +1225,23 @@
 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 +110,Hardware,Железария
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,Железария
 DocType: Sales Order,Recurring Upto,повтарящо Upto
 DocType: Attendance,HR Manager,HR мениджъра
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Моля изберете Company
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Privilege Leave,Privilege отпуск
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,Privilege отпуск
 DocType: Purchase Invoice,Supplier Invoice Date,Доставчик Дата Invoice
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Трябва да се даде възможност на количката
 DocType: Payment Entry,Writeoff,Отписвам
 DocType: Appraisal Template Goal,Appraisal Template Goal,Оценка Template Goal
-DocType: Salary Slip,Earning,Приходи
+DocType: Salary Component,Earning,Приходи
 DocType: Purchase Invoice,Party Account Currency,Party Account валути
 ,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 +171,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 +174,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_data.py +358,Food,Храна
+apps/erpnext/erpnext/demo/setup/setup_data.py +301,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/course_schedule/course_schedule.js +103,Mark Attendence,Марк Attendence
@@ -1258,12 +1275,12 @@
 DocType: Sales Order Item,Planned Quantity,Планираното количество
 DocType: Purchase Invoice Item,Item Tax Amount,Елемент от данъци
 DocType: Item,Maintain Stock,Поддържайте Фондова
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +209,Stock Entries already created for Production Order ,Вписване в запасите вече създадени за производствена поръчка
+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,Нетна промяна в дълготрайни материални активи
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Оставете празно, ако считат за всички наименования"
-apps/erpnext/erpnext/controllers/accounts_controller.py +620,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge от тип &quot;Край&quot; в ред {0} не могат да бъдат включени в т Курсове
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,Max: {0},Max: {0}
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +15,From Datetime,От за дата
+apps/erpnext/erpnext/controllers/accounts_controller.py +623,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 +239,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 +153,"Request for Quotation is disabled to access from portal, for more check portal settings.","Запитване за оферта е забранено да достъп от портал, за повече настройки за проверка портал."
@@ -1271,8 +1288,8 @@
 DocType: Sales Invoice,Shipping Address Name,Адрес за доставка Име
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,Сметкоплан
 DocType: Material Request,Terms and Conditions Content,Условия Content
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +552,cannot be greater than 100,не може да бъде по-голяма от 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +680,Item {0} is not a stock Item,"Точка {0} не е в наличност, т"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +546,cannot be greater than 100,не може да бъде по-голяма от 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is not a stock Item,"Точка {0} не е в наличност, т"
 DocType: Maintenance Visit,Unscheduled,Нерепаративен
 DocType: Employee,Owned,Собственост
 DocType: Salary Detail,Depends on Leave Without Pay,Зависи от тръгне без Pay
@@ -1286,10 +1303,9 @@
 DocType: GL Entry,GL Entry,GL Влизане
 DocType: HR Settings,Employee Settings,Настройки на наети
 ,Batch-Wise Balance History,Партиди Balance История
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,За да се направи списък
 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 +61,Apprentice,Чирак
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +102,Negative Quantity is not allowed,Отрицателна величина не е позволено
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,Чирак
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +103,Negative Quantity is not allowed,Отрицателна величина не е позволено
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Данъчна подробно маса, извлечен от т майстор като низ и се съхранява в тази област. Използва се за данъци и такси"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +152,Employee cannot report to himself.,Служител не може да докладва пред самия себе си.
@@ -1310,15 +1326,14 @@
 DocType: Asset,Asset Name,Наименование на активи
 DocType: Shipping Rule Condition,To Value,За да Value
 DocType: Asset Movement,Stock Manager,Склад за мениджъра
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +141,Source warehouse is mandatory for row {0},Източник склад е задължително за поредна {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +719,Packing Slip,Приемо-предавателен протокол
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Source warehouse is mandatory for row {0},Източник склад е задължително за поредна {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +713,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/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,"Запитване за оферта може да бъде достъп, като кликнете върху следния линк"
 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 +81,Analyst,Аналитик
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,Аналитик
 DocType: Item,Inventory,Инвентаризация
 DocType: Item,Sales Details,Продажби Детайли
 DocType: Quality Inspection,QI-,QI-
@@ -1326,7 +1341,7 @@
 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 +103,Government,Правителство
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,Правителство
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,Наименование институт
 apps/erpnext/erpnext/config/stock.py +289,Item Variants,Елемент Варианти
 DocType: Company,Services,Услуги
@@ -1342,6 +1357,7 @@
 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,Общо 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,Парични потоци от инвестиционна
 DocType: Program Course,Program Course,програма на курса
@@ -1382,12 +1398,12 @@
 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
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +110,Accounting Entry for {0} can only be made in currency: {1},Счетоводен запис за {0} може да се направи само във валута: {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Счетоводен запис за {0} може да се направи само във валута: {1}
 DocType: Pricing Rule,Pricing Rule,Ценообразуване Правило
 DocType: Budget,Action if Annual Budget Exceeded,"Действие в случай, че,Годишния Бюджет е превишен"
 apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Материал Заявка за пазаруване Поръчка
 DocType: Shopping Cart Settings,Payment Success URL,Заплащане Success URL
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +78,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: Върнати т {1} не съществува в {2} {3}
+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 помирение резюме
@@ -1396,40 +1412,39 @@
 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/stock/doctype/stock_entry/stock_entry.py +339,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Не е позволено да прехвърляйте повече {0} от {1} срещу Поръчката {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +344,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 +545,Manufacturing Quantity is mandatory,Производство Количество е задължително
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,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 +71,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 +162,Row {0}: From Time and To Time of {1} is overlapping with {2},Row {0}: от време и на време на {1} се припокрива с {2}
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +186,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,Сток Задължения
 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 +130,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 +137,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,Други доклади
 DocType: Dependent Task,Dependent Task,Зависим Task
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Моля, настройка на служителите за именуване на системата в Human Resource&gt; Настройки HR"
 apps/erpnext/erpnext/stock/doctype/item/item.py +411,Conversion factor for default Unit of Measure must be 1 in row {0},Коефициент на преобразуване за неизпълнение единица мярка трябва да бъде 1 в ред {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,Leave of type {0} cannot be longer than {1},Разрешение за типа {0} не може да бъде по-дълъг от {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +197,Leave of type {0} cannot be longer than {1},Разрешение за типа {0} не може да бъде по-дълъг от {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Опитайте планира операции за Х дни предварително.
 DocType: HR Settings,Stop Birthday Reminders,Stop напомняне за рождени дни
 DocType: SMS Center,Receiver List,Списък Receiver
-apps/erpnext/erpnext/accounts/page/pos/pos.js +921,Search Item,Търсене точка
+apps/erpnext/erpnext/accounts/page/pos/pos.js +910,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 +546,Already completed,вече приключи
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +22,Payment Request already exists {0},Вече съществува Payment Request {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +550,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 +241,Quantity must not be more than {0},Количество не трябва да бъде повече от {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Quantity must not be more than {0},Количество не трябва да бъде повече от {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +76,Previous Financial Year is not closed,Предходната финансова година не е затворен
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +44,Age (Days),Възраст (дни)
 DocType: Quotation Item,Quotation Item,Цитат Позиция
@@ -1446,7 +1461,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +221,Purchase Receipt {0} is not submitted,Покупка Квитанция {0} не е подадена
 DocType: Company,Default Payable Account,Default Платим Акаунт
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Настройки за онлайн пазарска количка като правилата за корабоплаване, Ценоразпис т.н."
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +83,{0}% Billed,{0}% Начислен
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}% Начислен
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Reserved Количество
 DocType: Party Account,Party Account,Party Акаунт
 apps/erpnext/erpnext/config/setup.py +116,Human Resources,Човешки Ресурси
@@ -1458,12 +1473,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Row {0}: Advance against Supplier must be debit,Row {0}: Advance срещу доставчик трябва да се задължи
 DocType: Company,Default Values,Стойности по подразбиране
 DocType: Expense Claim,Total Amount Reimbursed,Общия размер на възстановените
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +22,Collect,събирам
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,събирам
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,Against Supplier Invoice {0} dated {1},Срещу фактура от доставчик {0} от {1}
 DocType: Customer,Default Price List,Default Ценоразпис
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +225,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
-DocType: Payment Reconciliation,Payments,Плащания
 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,Нетна промяна в Задължения
@@ -1475,7 +1489,7 @@
 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 +9,Procurement,доставяне
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,"Нито един от елементите, има ли промяна в количеството или стойността."
+apps/erpnext/erpnext/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,Гаранционен иск
 ,Lead Details,Олово Детайли
 DocType: Purchase Invoice,End date of current invoice's period,Крайна дата на периода на текущата фактура за
@@ -1500,7 +1514,7 @@
 DocType: Purchase Invoice,Additional Discount,Допълнителна отстъпка
 DocType: Selling Settings,Selling Settings,Продаваме Settings
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Онлайн Търгове
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +97,Please specify either Quantity or Valuation Rate or both,"Моля, посочете или Количество или остойностяване цена, или и двете"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,"Моля, посочете или Количество или остойностяване цена, или и двете"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +13,Fulfillment,изпълняване
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Фирма, Месец и фискална година е задължително"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Разходите за маркетинг
@@ -1521,14 +1535,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,ERPNext Setup Complete!
 DocType: Item,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +93,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Група Клиенти съществува със същото име. Моля, променете името на Клиента или преименувайте Група Клиенти"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +126,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
 DocType: Stock Entry,Material Receipt,Материал Разписка
 DocType: Homepage,Products,Продукти
 DocType: Announcement,Instructor,инструктор
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},Party Тип и страна се изисква за получаване / плащане сметка {0}
 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,Следваща Контакт
@@ -1539,7 +1552,7 @@
 ,Item-wise Sales Register,Точка-мъдър Продажби Регистрация
 DocType: Asset,Gross Purchase Amount,Брутна Сума на покупката
 DocType: Asset,Depreciation Method,Амортизацията Метод
-apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Offline,Извън линия
+apps/erpnext/erpnext/accounts/page/pos/pos.js +686,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,длъжен
@@ -1557,25 +1570,27 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +425,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 +858,Make Purchase Order,Направи поръчка
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +852,Make Purchase Order,Направи поръчка
 DocType: SMS Center,Send To,Изпрати на
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,There is not enough leave balance for Leave Type {0},Няма достатъчно отпуск баланс за отпуск Тип {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,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,Клиента Код
 DocType: Stock Reconciliation,Stock Reconciliation,Склад за помирение
 DocType: Territory,Territory Name,Територия Име
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +172,Work-in-Progress Warehouse is required before Submit,Работа в прогрес Warehouse се изисква преди Подайте
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,Work-in-Progress Warehouse is required before Submit,Работа в прогрес Warehouse се изисква преди Подайте
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Заявител на Йов.
 DocType: Purchase Order Item,Warehouse and Reference,Склад и справочник
 DocType: Supplier,Statutory info and other general information about your Supplier,Законова информация и друга обща информация за вашия доставчик
-apps/erpnext/erpnext/hooks.py +88,Addresses,Адреси
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Доставчик&gt; Доставчик Type
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +212,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/hooks.py +95,Addresses,Адреси
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +215,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"
 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,Да се доставят и Bill
@@ -1583,11 +1598,10 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,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 +731,Payment,Плащане
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,Payment,Плащане
 DocType: Production Order Operation,Actual Time and Cost,Действителното време и разходи
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Материал Искане на максимална {0} може да се направи за позиция {1} срещу Продажби Поръчка {2}
 DocType: Employee,Salutation,Поздрав
-DocType: Pricing Rule,Brand,Марка
 DocType: Course,Course Abbreviation,Съкращение на курса
 DocType: Item,Will also apply for variants,Ще се прилага и за варианти
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +142,"Asset cannot be cancelled, as it is already {0}","Asset не може да бъде отменено, тъй като вече е {0}"
@@ -1599,7 +1613,7 @@
 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.","Списък на вашите продукти или услуги, които купуват или продават. Уверете се, че за да се провери стокова група, мерна единица и други свойства, когато започнете."
 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 +85,Associate,Сътрудник
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,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
@@ -1607,7 +1621,7 @@
 DocType: Production Planning Tool,Material Requests,Материал Заявки
 DocType: Warranty Claim,Issue Date,Дата На Издаване
 DocType: Activity Cost,Activity Cost,Разходи за дейността
-DocType: Timesheet Detail,Timesheet Detail,график Подробности
+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),"Показва, че опаковката е част от тази доставка (Само Проект)"
@@ -1630,6 +1644,7 @@
 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,Student мобилен номер
 DocType: Item,Has Variants,Има варианти
 DocType: Monthly Distribution,Name of the Monthly Distribution,Име на месец Дистрибуцията
 DocType: Sales Person,Parent Sales Person,Родител Продажби Person
@@ -1642,30 +1657,31 @@
 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 +44,"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/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.,По думите ще бъде видим след като спаси фактурата за продажба.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +502,Error: {0} &gt; {1},Грешка: {0}&gt; {1}
 DocType: Item,Is Sales Item,Е-продажба Точка
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Позиция 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.,"Дата на срока Start не може да бъде по-рано от началото на годината Дата на учебната година, към който е свързан терминът (Academic Година {}). Моля, коригирайте датите и опитайте отново."
 DocType: Naming Series,Current Value,Current Value
-apps/erpnext/erpnext/controllers/accounts_controller.py +235,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"Съществуват множество фискални години за датата {0}. Моля, задайте компания в фискална година"
+apps/erpnext/erpnext/controllers/accounts_controller.py +238,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,Пореден № Status
 DocType: Payment Entry Reference,Outstanding,неизплатен
 ,Daily Timesheet Summary,Daily график Резюме
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +458,Item table can not be blank,Точка на маса не може да бъде празно
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +443,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 +5,This is based on stock movement. See {0} for details,Това се основава на склад движение. Вижте {0} за подробности
 DocType: Pricing Rule,Selling,Продажба
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +341,Amount {0} {1} deducted against {2},Сума {0} {1} приспада срещу {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +344,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,"Падежа, не може да бъде, преди да публикувате Дата"
@@ -1680,8 +1696,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +144,Cannot refer row number greater than or equal to current row number for this Charge type,Не може да се отнесе поредни номера по-голям или равен на текущия брой ред за този тип Charge
 DocType: Asset,Sold,продаден
 ,Item-wise Purchase History,Точка-мъдър История на покупките
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Red,Червен
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Моля, кликнете върху &quot;Генериране Schedule&quot;, за да донесе Пореден № добавя за позиция {0}"
+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,Отворените нареждания за производство
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Базовата сума (Company валути)
@@ -1689,7 +1705,7 @@
 DocType: Installation Note,Installation Time,Монтаж на времето
 DocType: Sales Invoice,Accounting Details,Счетоводство Детайли
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,Изтриване на всички сделки за тази фирма
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +187,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Row # {0}: Операция {1} не е завършен за {2} Количество на готовата продукция в производствена поръчка # {3}. Моля Статусът на работа чрез Час Logs
+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,Row # {0}: Операция {1} не е завършен за {2} Количество на готовата продукция в производствена поръчка # {3}. Моля Статусът на работа чрез Час Logs
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,Инвестиции
 DocType: Issue,Resolution Details,Резолюция Детайли
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,Разпределянето
@@ -1725,16 +1741,17 @@
 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}
 DocType: Delivery Note,Excise Page Number,Акцизите Page Number
 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}"
 ,Maintenance Schedules,Графици за поддръжка
 DocType: Task,Actual End Date (via Time Sheet),Действително Крайна дата (чрез Time Sheet)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Amount {0} {1} against {2} {3},Сума {0} {1} срещу {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +339,Amount {0} {1} against {2} {3},Сума {0} {1} срещу {2} {3}
 ,Quotation Trends,Цитати Trends
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},Позиция Group не са посочени в т майстор за т {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +295,Debit To account must be a Receivable account,Дебитиране на сметката трябва да е вземане под внимание
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Receivable account,Дебитиране на сметката трябва да е вземане под внимание
 DocType: Shipping Rule Condition,Shipping Amount,Доставка Сума
 ,Pending Amount,До Сума
 DocType: Purchase Invoice Item,Conversion Factor,Превръщане Factor
@@ -1742,10 +1759,10 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +137,Expected value after useful life must be greater than or equal to {0},Очаквана стойност след полезен живот трябва да бъде по-голяма или равна на {0}
 DocType: Purchase Receipt,Vehicle Number,Номер на возилото
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Датата, на която повтарящите фактура ще се спре"
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +90,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Общо отпуснати листа {0} не могат да бъдат по-малки от вече одобрените листа {1} за периода
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +93,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 +22,Enter Paid Amount,Въведете платената сума
+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
@@ -1755,13 +1772,15 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,очет
 DocType: HR Settings,HR Settings,Настройки на човешките ресурси
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Expense Claim is pending approval. Only the Expense Approver can update status.,Expense претенция изчаква одобрение. Само за сметка одобряващ да актуализирате състоянието.
+DocType: Email Digest,New Expenses,Нови разходи
 DocType: Purchase Invoice,Additional Discount Amount,Допълнителна отстъпка сума
-apps/erpnext/erpnext/controllers/accounts_controller.py +524,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row {0}: Кол трябва да бъде 1, като елемент е дълготраен актив. Моля, използвайте отделен ред за множествена бр."
+apps/erpnext/erpnext/controllers/accounts_controller.py +527,"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 +249,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,Спортен
 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/stock/get_item_details.py +123,Please specify Company,"Моля, посочете Company"
 ,Customer Acquisition and Loyalty,Customer Acquisition и лоялност
@@ -1772,17 +1791,19 @@
 apps/erpnext/erpnext/projects/doctype/task/task.js +26,Expense Claims,Разходните Вземания
 DocType: Issue,Support,Подкрепа
 ,BOM Search,BOM Търсене
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Closing (Opening + Totals),Закриване (откриване + Общо)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),Закриване (откриване + Общо)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,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/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,След Материал Исканията са повдигнати автоматично въз основа на нивото на повторна поръчка Точка на
-apps/erpnext/erpnext/controllers/accounts_controller.py +272,Account {0} is invalid. Account Currency must be {1},Сметка {0} е невалидна. Валутата на сметката трябва да е {1}
+DocType: Email Digest,Pending Sales Orders,До Поръчки за продажби
+apps/erpnext/erpnext/controllers/accounts_controller.py +275,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 +956,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row {0}: Референтен Document Type трябва да бъде един от продажбите Поръчка, продажба на фактура или вестник Влизане"
-DocType: Salary Slip,Deduction,Дедукция
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +87,Row {0}: From Time and To Time is mandatory.,Row {0}: от време и на време е задължително.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +969,"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 +111,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 +262,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 +7,Please enter Employee Id of this sales person,"Моля, въведете Id Служител на този търговец"
@@ -1790,7 +1811,7 @@
 DocType: Project,% Tasks Completed,% Завършени Задачи
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,Разлика сума трябва да бъде нула
 DocType: Project,Gross Margin,Gross Margin
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +194,Please enter Production Item first,"Моля, въведете Производство Точка първа"
+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,ръководство за инвалиди
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Цитат
@@ -1799,53 +1820,54 @@
 DocType: Maintenance Visit,Maintenance User,Поддържане на потребителя
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +149,Cost Updated,Разходите Обновено
 DocType: Employee,Date of Birth,Дата на раждане
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +86,Item {0} has already been returned,Точка {0} вече е върнал
+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}
+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 +177,Job Description,Описание На Работа
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,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 +126,"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 +127,"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, цитати, продажба Поръчка т.н. от кампании, за да се прецени възвръщаемост на инвестициите."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +24,Welcome to POS: Create your POS Profile,Добре дошли в POS: Създаване на POS профил
 DocType: Expense Claim,Approver,Одобряващ
 ,SO Qty,SO Количество
+DocType: Guardian,Work Address,Служебен адрес
 DocType: Appraisal,Calculate Total Score,Изчислете Общ резултат
 DocType: Request for Quotation,Manufacturing Manager,Производство на мениджъра
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Пореден № {0} е в гаранция до запълването {1}
+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 +74,Shipments,Пратки
+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,За да бъде доставен на клиент
 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 +153,Row # ,Row #
+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 +156,Get From,Вземи От
+apps/erpnext/erpnext/public/js/utils.js +167,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 +167,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Expense или Разлика сметка е задължително за т {0}, както цялостната стойност фондова тя влияе"
-apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Не може да се overbill за позиция {0} на ред {1} повече от {2}. За да се даде възможност некоректно, моля, задайте на склад Settings"
+apps/erpnext/erpnext/controllers/accounts_controller.py +419,"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,-По-горе
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} is disabled,Потребителят {0} е деактивиран
 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 ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,"Оставете празно, ако считат за всички ведомства"
 apps/erpnext/erpnext/config/hr.py +171,"Types of employment (permanent, contract, intern etc.).","Видове наемане на работа (постоянни, договорни, стажант и т.н.)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +346,{0} is mandatory for Item {1},{0} е задължително за Артикул {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,{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","Моля изберете отпусната сума, Тип фактура и фактура Номер в поне един ред"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,Разходите за нова покупка
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},Продажбите на поръчката изисква за т {0}
 DocType: Purchase Invoice Item,Rate (Company Currency),Rate (Company валути)
-apps/erpnext/erpnext/demo/setup_data.py +360,Others,Други
+DocType: Student Guardian,Others,Други
 DocType: Payment Entry,Unallocated Amount,Неразпределена сума
 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,Данъци и такси
@@ -1865,17 +1887,16 @@
 apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,Сериализирани Инвентаризация
 DocType: Activity Type,Default Billing Rate,Default Billing Курсове
 DocType: Sales Invoice,Total Billing Amount,Общо Billing Сума
-apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +54,Receivable Account,Вземания Акаунт
-apps/erpnext/erpnext/controllers/accounts_controller.py +546,Row #{0}: Asset {1} is already {2},Row {0}: Asset {1} е вече {2}
+apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,Вземания Акаунт
+apps/erpnext/erpnext/controllers/accounts_controller.py +549,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 +79,CEO,изпълнителен директор
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,изпълнителен директор
 DocType: Expense Claim Detail,Expense Claim Detail,Expense претенция Подробности
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +808,Please select correct account,Моля изберете правилния акаунт
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +809,Please select correct account,Моля изберете правилния акаунт
 DocType: Item,Weight UOM,Тегло мерна единица
 DocType: Salary Structure Employee,Salary Structure Employee,Структура на заплащането на служителите
 DocType: Employee,Blood Group,Blood Group
-DocType: Purchase Invoice Item,Page Break,Page Break
 DocType: Production Order Operation,Pending,В очакване на
 DocType: Course,Course Name,Наименование на учебната дисциплина
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Потребителите, които могат да одобряват заявленията за отпуск специфичен служителя"
@@ -1884,14 +1905,15 @@
 DocType: Fiscal Year,Companies,Фирми
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Електроника
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Повдигнете Материал Заявка когато фондова достигне ниво повторна поръчка
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Full-time,Пълен работен ден
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,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: Student,Guardians,Guardians
 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 +289,Debit To is required,Debit да се изисква
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +321,Debit To is required,Debit да се изисква
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Покупка Ценоразпис
 DocType: Offer Letter Term,Offer Term,Оферта Term
 DocType: Quality Inspection,Quality Manager,Мениджър по качеството
@@ -1899,6 +1921,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/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
@@ -1909,18 +1932,17 @@
 DocType: Production Order Operation,Completed Qty,Завършен Количество
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"For {0}, only debit accounts can be linked against another credit entry","За {0}, само дебитни сметки могат да бъдат свързани с друга кредитна влизане"
 apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,Ценоразпис {0} е деактивиран
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +99,Row {0}: Completed Qty cannot be more than {1} for operation {2},Row {0}: Завършен во не може да бъде повече от {1} за работа {2}
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +123,Row {0}: Completed Qty cannot be more than {1} for operation {2},Row {0}: Завършен во не може да бъде повече от {1} за работа {2}
 DocType: Manufacturing Settings,Allow Overtime,Оставя Извънредният
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,"{0} серийни номера, необходими за т {1}. Вие сте предоставили {2}."
 DocType: Stock Reconciliation Item,Current Valuation Rate,Текущата оценка Курсове
 DocType: Item,Customer Item Codes,Customer Елемент кодове
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,Exchange Печалба / загуба
 DocType: Opportunity,Lost Reason,Загубил Причина
-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/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/purchase_receipt/purchase_receipt.py +378,All items have already been invoiced,Всички елементи вече са фактурирани
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +379,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,Външен
@@ -1936,18 +1958,19 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Вашите клиенти
 apps/erpnext/erpnext/projects/doctype/project/project.py +141,You have been invited to collaborate on the project: {0},Вие сте били поканени да си сътрудничат по проекта: {0}
 DocType: Leave Block List Date,Block Date,Block Дата
-apps/erpnext/erpnext/templates/generators/job_opening.html +19,Apply Now,Запиши се сега
+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.","Създаване и управление на дневни, седмични и месечни имейл Фурнаджиев."
 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,Сгради
-apps/erpnext/erpnext/utilities/doctype/address/address.py +164,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: Fee Structure,Fee Structure,Структура на таксите
 DocType: Timesheet Detail,Costing Amount,Остойностяване Сума
+DocType: Student Admission,Application Fee,Такса за кандидатстване
 DocType: Process Payroll,Submit Salary Slip,Знаете Заплата Slip
-apps/erpnext/erpnext/controllers/selling_controller.py +161,Maxiumm discount for Item {0} is {1}%,Maxiumm отстъпка за т {0} е {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,Maxiumm отстъпка за т {0} е {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Внос в наливно състояние
 DocType: Sales Partner,Address & Contacts,Адрес и контакти
 DocType: SMS Log,Sender Name,Подател Име
@@ -1972,21 +1995,21 @@
 DocType: Serial No,Delivery Time,Време За Доставка
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Застаряването на населението на базата на
 DocType: Item,End of Life,Края на живота
-apps/erpnext/erpnext/demo/setup_data.py +361,Travel,Пътуване
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +155,No active or default Salary Structure found for employee {0} for the given dates,Не активна или по подразбиране Заплата Структура намери за служител {0} за дадените дати
+apps/erpnext/erpnext/demo/setup/setup_data.py +304,Travel,Пътуване
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +167,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 +23,Update Cost,Актуализация Cost
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Актуализация Cost
 DocType: Item Reorder,Item Reorder,Позиция Пренареждане
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +36,Show Salary Slip,Покажи Заплата Slip
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +748,Transfer Material,Transfer Материал
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +53,Show Salary Slip,Покажи Заплата Slip
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +166,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 +923,Please set recurring after saving,"Моля, задайте повтарящи след спасяването"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +646,Select change amount account,количество сметка Select промяна
+apps/erpnext/erpnext/public/js/controllers/transaction.js +914,Please set recurring after saving,"Моля, задайте повтарящи след спасяването"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +703,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 Фондова
@@ -1998,31 +2021,32 @@
 DocType: Quality Inspection,Verified By,Проверени от
 DocType: Address,Subsidiary,Филиал
 apps/erpnext/erpnext/setup/doctype/company/company.py +64,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Не може да се промени валута по подразбиране на фирмата, защото има съществуващи сделки. Сделките трябва да бъдат отменени, за да промените валута по подразбиране."
+DocType: Grade Interval,Grade Description,Категория Описание
 DocType: Quality Inspection,Purchase Receipt No,Покупка Квитанция Не
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Задатък
 DocType: Process Payroll,Create Salary Slip,Създайте Заплата Slip
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +33,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 +352,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Количество в ред {0} ({1}) трябва да е същото като произведено количество {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Количество в ред {0} ({1}) трябва да е същото като произведено количество {2}
 DocType: Appraisal,Employee,Employee
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Покани като Потребител
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} е напълно таксуван
 DocType: Workstation Working Hour,End Time,End Time
 DocType: Payment Entry,Payment Deductions or Loss,Плащане Удръжки или загуба
-apps/erpnext/erpnext/config/schools.py +100,LMS,LMS
+apps/erpnext/erpnext/config/schools.py +104,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,Pipeline Продажби
 DocType: Student Batch Student,Student Batch Student,Student Batch Student
-DocType: Sales Invoice,Mass Mailing,Масовото изпращане
+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 +199,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/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 +297,Salary Slip of employee {0} already created for this period,Заплата поднасяне на служител {0} вече е създаден за този период
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Pharmaceutical,Лекарствена
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +309,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/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,Кредитът за
@@ -2037,27 +2061,28 @@
 DocType: Upload Attendance,Attendance To Date,Присъствие към днешна дата
 DocType: Warranty Claim,Raised By,Повдигнат от
 DocType: Payment Gateway Account,Payment Account,Разплащателна сметка
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +814,Please specify Company to proceed,"Моля, посочете Company, за да продължите"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +793,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 +44,Compensatory Off,Компенсаторни Off
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,Компенсаторни Off
 DocType: Quality Inspection Reading,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.,"Моля, уверете се, че наистина искате да изтриете всички сделки за тази компания. Вашите основни данни ще останат, тъй като е. Това действие не може да бъде отменено."
 DocType: Room,Room Number,Номер на стая
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Невалиден позоваване {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +161,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) не може да бъде по-голямо от планирано количество ({2}) в производствена поръчка {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +162,{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 +217,Raw Materials cannot be blank.,"Суровини, които не могат да бъдат празни."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,"Could not update stock, invoice contains drop shipping item.","Не можа да се актуализира склад, фактура съдържа капка корабоплаването т."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +460,Quick Journal Entry,Quick вестник Влизане
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +111,You can not change rate if BOM mentioned agianst any item,"Вие не можете да променяте скоростта, ако BOM споменато agianst всеки елемент"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +441,"Could not update stock, invoice contains drop shipping item.","Не можа да се актуализира склад, фактура съдържа капка корабоплаването т."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Quick Journal Entry,Quick вестник Влизане
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +103,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 +214,{0} {1} is not submitted,{0} {1} не е подадена
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Искания за предмети.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Отделно производство цел ще бъде създаден за всеки завършен добра позиция.
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +121,{0} must be negative in return document,"{0} трябва да бъде отрицателен, в замяна на документи"
 ,Minutes to First Response for Issues,"Минути, за да First Response за въпроси"
 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.,"Името на института, за който искате да създадете тази система."
@@ -2066,16 +2091,17 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Статус на проекта
 DocType: UOM,Check this to disallow fractions. (for Nos),Вижте това да забраниш фракции. (За NOS)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +398,The following Production Orders were created:,Създадени са следните производствени поръчки:
+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,"Въведете отдела, в който се свържете с нас принадлежи"
 ,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 +739,Item or Warehouse for row {0} does not match Material Request,Точка или склад за ред {0} не съвпада Материал Искане
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +747,Item or Warehouse for row {0} does not match Material Request,Точка или склад за ред {0} не съвпада Материал Искане
 apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,Мерна единица
 DocType: Fiscal Year,Year End Date,Година Крайна дата
 DocType: Task Depends On,Task Depends On,Task зависи от
-DocType: Lead,Opportunity,Opportunity
+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
@@ -2088,7 +2114,7 @@
 DocType: Student,Joining Date,Присъединяването Дата
 ,Employees working on a holiday,"Служителите, които работят на почивка"
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Марк Present
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},Старт поддръжка дата не може да бъде преди датата на доставка в сериен № {0}
+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,Действителна Крайна дата
 DocType: Purchase Invoice,PINV-,PINV-
 DocType: Authorization Rule,Applicable To (Role),Приложими по отношение на (Role)
@@ -2103,7 +2129,7 @@
 DocType: SMS Log,No of Requested SMS,Не на запитаната SMS
 DocType: Campaign,Campaign-.####,Кампания -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Следващи стъпки
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,Please supply the specified items at the best possible rates,"Моля, доставка на определени елементи на възможно най-добрите цени"
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +695,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 +117,Contract End Date must be greater than Date of Joining,Договор Крайна дата трябва да бъде по-голяма от Дата на Присъединяване
 DocType: Delivery Note,DN-,DN-
@@ -2112,7 +2138,7 @@
 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 +14,This is an example website auto-generated from ERPNext,Това е пример за сайт автоматично генерирано от ERPNext
+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
 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.
 
@@ -2139,13 +2165,14 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd Количество
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +54,Fee Records Created - {0},Такса Records Създадена - {0}
 DocType: Asset Category Account,Asset Category Account,Asset Категория профил
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +103,Cannot produce more Item {0} than Sales Order quantity {1},Не може да се произвежда повече Точка {0} от продажби Поръчка количество {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Stock Entry {0} is not submitted,Склад за вписване {0} не е подадена
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Не може да се произвежда повече Точка {0} от продажби Поръчка количество {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +505,Stock Entry {0} is not submitted,Склад за вписване {0} не е подадена
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / Cash Акаунт
 DocType: Tax Rule,Billing City,Billing City
 DocType: Salary Component Account,Salary Component Account,Заплата Компонент профил
 DocType: Global Defaults,Hide Currency Symbol,Скриване на валути Symbol
 apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card","напр Bank, в брой, с кредитна карта"
+DocType: Lead Source,Source Name,Източник Име
 DocType: Journal Entry,Credit Note,Кредитно Известие
 DocType: Warranty Claim,Service Address,Service Адрес
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furnitures and Fixtures,Мебели и тела
@@ -2157,6 +2184,7 @@
 DocType: Opportunity,Customer / Lead Name,Клиент / Lead Име
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +89,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/controllers/trends.py +19,Total(Qty),Общо (Количество)
 DocType: Sales Invoice,This Document,Този документ
@@ -2168,15 +2196,15 @@
 DocType: Purchase Receipt,Time at which materials were received,При която бяха получени материали Time
 DocType: Stock Ledger Entry,Outgoing Rate,Изходящ Курсове
 apps/erpnext/erpnext/config/hr.py +176,Organization branch master.,Браншова организация майстор.
-apps/erpnext/erpnext/controllers/accounts_controller.py +273, or ,или
+apps/erpnext/erpnext/controllers/accounts_controller.py +276, or ,или
 DocType: Sales Order,Billing Status,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 +203,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row {0}: вестник Влизане {1} Няма профил {2} или вече съчетани срещу друг ваучер
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +206,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 +90,No employee for the above selected criteria OR salary slip already created,Вече е създаден Никой служител за над избрани критерии или заплата фиша
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +93,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,Вид на плащане
@@ -2204,8 +2232,8 @@
 DocType: Product Bundle,Parent Item,Родител Точка
 DocType: Account,Account Type,Тип Сметка
 DocType: Delivery Note,DN-RET-,DN-RET-
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +115,Leave Type {0} cannot be carry-forwarded,Оставете Type {0} не може да се извърши-препрати
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"График за поддръжка не се генерира за всички предмети. Моля, кликнете върху &quot;Генериране Schedule&quot;"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +118,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 +163,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","За поредна {0} в {1}. За да {2} включат в курс т, редове {3} трябва да се включат и"
@@ -2217,13 +2245,13 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +32,Disabled template must not be default template,Увреждания шаблон не трябва да е по подразбиране шаблон
 DocType: Account,Income Account,Дохода
 DocType: Payment Request,Amount in customer's currency,Сума във валута на клиента
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +748,Delivery,Доставка
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +742,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
 DocType: Payment Entry,Total Allocated Amount,Общата отпусната сума
 DocType: Item Reorder,Material Request Type,Материал Заявка Type
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +82,Row {0}: UOM Conversion Factor is mandatory,Row {0}: мерна единица реализациите Factor е задължително
+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
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Ваучер #
@@ -2234,13 +2262,13 @@
 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 +90,Head of Marketing and Sales,Ръководител на отдел Маркетинг и Продажби
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Данък общ доход
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,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.
 DocType: Item Supplier,Item Supplier,Позиция доставчик
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +403,Please enter Item Code to get batch no,"Моля, въведете Код, за да получите партиден №"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +770,Please select a value for {0} quotation_to {1},Моля изберете стойност за {0} quotation_to {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +397,Please enter Item Code to get batch no,"Моля, въведете Код, за да получите партиден №"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +764,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"
@@ -2252,28 +2280,29 @@
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,Не е в наличност
 DocType: Appraisal,HR User,HR потребителя
 DocType: Purchase Invoice,Taxes and Charges Deducted,"Данъци и такси, удържани"
-apps/erpnext/erpnext/hooks.py +100,Issues,Въпроси
+apps/erpnext/erpnext/hooks.py +109,Issues,Въпроси
 apps/erpnext/erpnext/controllers/status_updater.py +13,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} е деактивиран
 DocType: Supplier,Billing Currency,Billing валути
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Large,Много Голям
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Extra Large,Много Голям
 ,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 +507,Warning: Another {0} # {1} exists against stock entry {2},Съществува Друг {0} # {1} срещу входната запас {2}: Предупреждение
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Local,Местен
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +508,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Кредитите и авансите (активи)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Длъжници
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Large,Голям
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,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 +225,Total {0} ({1}),Общо {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +224,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
@@ -2319,9 +2348,9 @@
 DocType: Attendance,Leave Type,Оставете Type
 apps/erpnext/erpnext/controllers/stock_controller.py +173,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Expense / Разлика сметка ({0}) трябва да бъде партида на &quot;печалбата или загубата&quot;
 DocType: Account,Accounts User,Роля Потребител на 'Сметки'
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Name error: {0},Наименование грешка: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +90,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 +178,{0} {1} does not associated with {2} {3},{0} {1} не свързан с {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +181,{0} {1} does not associated with {2} {3},{0} {1} не свързан с {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Присъствие на служител {0} вече е маркирана
 DocType: Packing Slip,If more than one package of the same type (for print),Ако повече от един пакет от същия тип (за печат)
 DocType: Warehouse,Parent Warehouse,Родител Warehouse
@@ -2340,7 +2369,7 @@
 DocType: BOM Item,Scrap %,Скрап%
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Таксите ще бъдат разпределени пропорционално на базата на т Количество или количество, според вашия избор"
 DocType: Maintenance Visit,Purposes,Цел
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,Поне един елемент следва да бъде вписано с отрицателна величина в замяна документ
+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 +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Операция {0} по-дълго от всички налични работни часа в работно {1}, съборят операцията в множество операции"
 ,Requested,Заявени
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +83,No Remarks,Без забележки
@@ -2352,46 +2381,46 @@
 DocType: Item,Total Projected Qty,Общото прогнозно Количество
 DocType: Monthly Distribution,Distribution Name,Разпределение Име
 DocType: Course,Course Code,Код на курса
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Quality Inspection required for Item {0},"Инспекция на качеството, необходимо за т {0}"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,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,Състояние и Формула Помощ
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Управление Territory Tree.
 DocType: Journal Entry Account,Sales Invoice,Фактурата за продажба
 DocType: Journal Entry Account,Party Balance,Party Balance
-apps/erpnext/erpnext/accounts/page/pos/pos.js +475,Please select Apply Discount On,Моля изберете Apply отстъпка от
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +92,Salary Slip Created,Заплата Slip Създаден
+apps/erpnext/erpnext/accounts/page/pos/pos.js +464,Please select Apply Discount On,Моля изберете Apply отстъпка от
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +95,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 за Производство
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,Отстъпка Процент може да бъде приложен или срещу ценоразпис или за всички ценовата листа.
 DocType: Purchase Invoice,Half-yearly,Полугодишен
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +384,Accounting Entry for Stock,Счетоводен запис за Складова наличност
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +387,Accounting Entry for Stock,Счетоводен запис за Складова наличност
 DocType: Sales Invoice,Sales Team1,Продажбите Team1
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,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 +96,Row {0}: Completed Qty must be greater than zero.,Row {0}: Завършен во трябва да е по-голяма от нула.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +120,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 +88,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Не може да се върне повече от {1} за позиция {2}
+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,Парцел
 DocType: Item Group,Show this slideshow at the top of the page,Покажете слайдшоу в горната част на страницата
 DocType: BOM,Item UOM,Позиция мерна единица
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Данъчен сума след Сума Discount (Company валути)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +147,Target warehouse is mandatory for row {0},Target склад е задължително за поредна {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +141,Target warehouse is mandatory for row {0},Target склад е задължително за поредна {0}
 DocType: Cheque Print Template,Primary Settings,Основни настройки
 DocType: Purchase Invoice,Select Supplier Address,Изберете доставчик Адрес
 DocType: Quality Inspection,Quality Inspection,Проверка на качеството
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Extra Small,Extra Small
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,Warning: Material Requested Qty is less than Minimum Order Qty,Внимание: Материал Заявени Количество е по-малко от минималното Поръчка Количество
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +194,Account {0} is frozen,Сметка {0} е замразена
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Extra Small
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +690,Warning: Material Requested Qty is less than Minimum Order Qty,Внимание: Материал Заявени Количество е по-малко от минималното Поръчка Количество
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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 +606,Can only make payment against unbilled {0},Мога само да направи плащане срещу нетаксувано {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +126,Commission rate cannot be greater than 100,Ставка на Комисията не може да бъде по-голяма от 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +609,Can only make payment against unbilled {0},Мога само да направи плащане срещу нетаксувано {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,Ставка на Комисията не може да бъде по-голяма от 100
 DocType: Stock Entry,Subcontract,Подизпълнение
 apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,"Моля, въведете {0} първа"
 DocType: Production Order Operation,Actual End Time,Actual End Time
@@ -2402,30 +2431,30 @@
 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 +158,Colour,Цвят
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,Цвят
 DocType: Maintenance Visit,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 продукта"
 DocType: Student Log,Academic,академичен
-apps/erpnext/erpnext/controllers/accounts_controller.py +469,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Общо предварително ({0}) срещу Заповед {1} не може да бъде по-голям от общия сбор ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +472,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Общо предварително ({0}) срещу Заповед {1} не може да бъде по-голям от общия сбор ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Изберете месец Distribution да неравномерно разпределяне цели през месеца.
 DocType: Purchase Invoice Item,Valuation Rate,Оценка Оценка
+DocType: Stock Reconciliation,SR/,SR /
 apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,Ценоразпис на валута не е избрана
 DocType: Assessment,Results,Резултати
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +168,Employee {0} has already applied for {1} between {2} and {3},Служител {0} вече е подал молба за {1} {2} между и {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +175,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: Student Applicant,Father's/ Guardian 2 Email ID,/ Guardian 2 Email ID на бащата
 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 +228,Warehouses with existing transaction can not be converted to group.,Складове с действащото сделка не може да се превърнат в група.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +231,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 +93,Researcher,Изследовател
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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.,Постъпили проверка на качеството.
@@ -2437,25 +2466,25 @@
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","За удобство на клиентите, тези кодове могат да бъдат използвани в печатни формати като фактури и доставка Notes"
 DocType: Sales Invoice,Time Sheet List,Време Списък Sheet
 DocType: Employee,You can enter any date manually,Можете да въведете всяка дата ръчно
-DocType: Sales Invoice,Advertisement,Реклама
 DocType: Asset Category Account,Depreciation Expense Account,Амортизационните разходи на профила
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Probationary Period,Изпитателен Срок
-apps/erpnext/erpnext/hooks.py +102,Announcements,Становища
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Изпитателен Срок
+apps/erpnext/erpnext/hooks.py +111,Announcements,Становища
 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 +109,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 +16,To Datetime,Към за дата
+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/scheduling_tool/scheduling_tool.py +51,Course Schedules deleted:,Списъци на курса заличават:
 apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,Дневници за поддържане състоянието на доставка SMS
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Предстоящите дейности
+DocType: Accounts Settings,Make Payment via Journal Entry,Направи Плащане чрез вестник Влизане
+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 +127,Please enter relieving date.,"Моля, въведете облекчаване дата."
-apps/erpnext/erpnext/controllers/trends.py +145,Amt,Amt
+apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,Only Leave Applications with status 'Approved' can be submitted,"Оставете само заявления, със статут на &quot;Одобрена&quot; може да бъде подадено"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +26,Address Title is mandatory.,Заглавие на Адрес е задължително.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Въведете името на кампанията, ако източник на запитване е кампания"
@@ -2473,14 +2502,15 @@
 apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1},"Не може да се намери на валутния курс за {0} {1}, за да"
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Марк половин ден
 DocType: Sales Invoice,Sales Team,Търговски отдел
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Duplicate entry,Duplicate влизане
+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 +490,[Error],[Грешка]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +484,[Error],[Грешка]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,По думите ще бъде видим след като спаси поръчка за продажба.
 ,Employee Birthday,Служител Birthday
 apps/erpnext/erpnext/controllers/status_updater.py +175,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} вече съществува. Моля, променете тези записи и опитайте отново."
 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} не съществува
@@ -2496,22 +2526,22 @@
 ,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 +25,All Jobs,Всички работни места
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,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 със съществуващите операции не могат да бъдат превърнати в група
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Amount {0} {1} {2} {3},Сума {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Amount {0} {1} {2} {3},Сума {0} {1} {2} {3}
 DocType: Account,Depreciation,Амортизация
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Доставчик (ци)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Служител Присъствие Tool
 DocType: Supplier,Credit Limit,Кредитен лимит
 DocType: Production Plan Sales Order,Salse Order Date,Salse Поръчка Дата
 DocType: Salary Component,Salary Component,Заплата Компонент
-apps/erpnext/erpnext/accounts/utils.py +372,Payment Entries {0} are un-linked,Плащане Entries {0} са не-свързани
+apps/erpnext/erpnext/accounts/utils.py +449,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,Получател на съобщението и данни за плащане
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +497,Material Requests {0} created,"Материал Исканията {0}, създадени"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +498,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 на термини или договор.
 DocType: Purchase Invoice,Address and Contact,Адрес и контакти
@@ -2550,7 +2580,7 @@
 DocType: Serial No,Warranty / AMC Details,Гаранция / AMC Детайли
 DocType: Journal Entry,User Remark,Потребителят Забележка
 DocType: Lead,Market Segment,Пазарен сегмент
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +848,Paid Amount cannot be greater than total negative outstanding amount {0},Платената сума не може да бъде по-голям от общия изключително отрицателна сума {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +859,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 +233,Closing (Dr),Закриване (Dr)
 DocType: Cheque Print Template,Cheque Size,Чек Размер
@@ -2571,7 +2601,8 @@
 ,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 +555,'Update Stock' cannot be checked for fixed asset sale,&quot;Актуализация на склад&quot; не могат да бъдат проверени за фиксиран продажба на активи
+DocType: Student Guardian,Father,баща
+apps/erpnext/erpnext/controllers/accounts_controller.py +558,'Update Stock' cannot be checked for fixed asset sale,&quot;Актуализация на склад&quot; не могат да бъдат проверени за фиксиран продажба на активи
 DocType: Bank Reconciliation,Bank Reconciliation,Bank помирение
 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} е отменен или спрян
@@ -2581,15 +2612,15 @@
 DocType: Sales Order,Fully Delivered,Напълно Доставени
 DocType: Lead,Lower Income,По-ниски доходи
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","Ръководителят сметката по Отговорност, в който печалбата / загубата ще бъде резервирана"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +166,Source and target warehouse cannot be same for row {0},Източник и целева склада не могат да бъдат едни и същи за ред {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Разлика трябва да се вида на актива / Отговорност сметка, тъй като това Фондова Помирението е Откриване Влизане"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +81,Purchase Order number required for Item {0},"Поръчка за покупка брой, необходим за т {0}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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/purchase_receipt/purchase_receipt.py +82,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 +17,Cannot change status as student {0} is linked with student application {1},Не може да се промени статута си на студент {0} е свързан с прилагането студент {1}
+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: Timesheet,"List of employee which has ""Salary Slip Based on Timesheet"" is enabled in salary structure.","Списък на служител, който има &quot;Заплата Slip Въз основа на график&quot; е включен в структурата на заплатите."
 DocType: Asset,Fully Depreciated,напълно амортизирани
 ,Stock Projected Qty,Фондова Прогнозно Количество
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Customer {0} does not belong to project {1},Customer {0} не принадлежи на проекта {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,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,Поръчката на Клиента
 apps/erpnext/erpnext/config/stock.py +107,Serial No and Batch,Пореден № и Batch
@@ -2601,7 +2632,7 @@
 DocType: Purchase Invoice,Purchase Taxes and Charges,Покупка данъци и такси
 ,Qty to Receive,Количество за да получат за
 DocType: Leave Block List,Leave Block List Allowed,Оставете Block List любимци
-apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +55,All Warehouses,Всички Складове
+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 +105,Credit To account must be a Balance Sheet account,Credit За сметка трябва да бъде партида Баланс
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Всички Видове Доставчик
@@ -2613,10 +2644,10 @@
 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/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Направи Заплата Slip
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +26,Browse BOM,Browse BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,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/asset/depreciation.py +94,Please set Depreciation related Accounts in Asset Category {0} or Company {1},"Моля, задайте на амортизация, свързани акаунти в категория активи {0} или Фирма {1}"
-DocType: Academic Year,Academic Year,Академична година
+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
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,Оценка
@@ -2624,12 +2655,12 @@
 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 +197,Leave approver must be one of {0},Оставете одобряващ трябва да бъде един от {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,Leave approver must be one of {0},Оставете одобряващ трябва да бъде един от {0}
 DocType: Hub Settings,Seller Email,Продавач Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Общата покупна цена на придобиване (чрез покупка на фактура)
 DocType: Workstation Working Hour,Start Time,Начален Час
 DocType: Item Price,Bulk Import Help,Bulk Import Помощ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +256,Select Quantity,Изберете Количество
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +257,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,Съобщение изпратено
@@ -2646,6 +2677,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Или целта Количество или целева сума е задължително.
 apps/erpnext/erpnext/config/projects.py +45,Cost of various activities,Разходите за различни дейности
 apps/erpnext/erpnext/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 +149,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}
 DocType: Item,Inspection Required,"Инспекция, изискван"
@@ -2665,7 +2697,7 @@
 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 +138,Wire Transfer,Банков Превод
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,Банков Превод
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Провери всичко
 DocType: Sales Order,Recurring Order,Повтарящо Поръчка
 DocType: Company,Default Income Account,Account Default подоходно
@@ -2677,21 +2709,19 @@
 ,Welcome to ERPNext,Добре дошли в ERPNext
 apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,Доведе до цитата
 DocType: Lead,From Customer,От Customer
-apps/erpnext/erpnext/demo/setup_data.py +357,Calls,Призовава
+apps/erpnext/erpnext/demo/setup/setup_data.py +300,Calls,Призовава
 DocType: Project,Total Costing Amount (via Time Logs),Общо Остойностяване сума (чрез Time Logs)
 DocType: Purchase Order Item Supplied,Stock UOM,Склад за мерна единица
-apps/erpnext/erpnext/stock/doctype/item/item.py +466,"As there are existing transactions for this item, \
-							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Тъй като има съществуващи сделки за тази позиция, \ не можете да промените стойностите на &#39;има сериен номер &quot;,&quot; Има Batch Не &quot;,&quot; Трябва ли фондова т &quot;и&quot; Оценка Метод &quot;"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,Purchase Order {0} is not submitted,Поръчка за покупка {0} не е подадена
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,Проектиран
 apps/erpnext/erpnext/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 +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Забележка: Системата няма да се покажат над-доставка и свръх-резервации за позиция {0} като количество или стойност е 0
 DocType: Notification Control,Quotation Message,Цитат на ЛС
 DocType: Issue,Opening Date,Откриване Дата
-apps/erpnext/erpnext/schools/api.py +58,Attendance has been marked successfully.,Присъствие е маркирано успешно.
+apps/erpnext/erpnext/schools/api.py +57,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 +136,Account Type for {0} must be {1},Тип акаунт за {0} трябва да е {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +139,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 трябва да принадлежи към една и съща фирма
@@ -2706,12 +2736,13 @@
 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/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 +20,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 +1190,Please select customer,Моля изберете клиент
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1193,Please select customer,Моля изберете клиент
 DocType: C-Form,I,аз
 DocType: Company,Asset Depreciation Cost Center,Център за амортизация на разходите Асет
 DocType: Sales Order Item,Sales Order Date,Продажбите Поръчка Дата
@@ -2721,6 +2752,7 @@
 ,Payment Period Based On Invoice Date,Заплащане Период на базата на датата на фактурата
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Липсва обмен на валута цени за {0}
 DocType: Assessment,Examiner,ревизор
+DocType: Student,Siblings,Братя и сестри
 DocType: Journal Entry,Stock Entry,Склад за вписване
 DocType: Payment Entry,Payment References,плащане Референции
 DocType: C-Form,C-FORM-,C-FORM-
@@ -2738,11 +2770,12 @@
 DocType: Journal Entry,JV-,Л ^
 DocType: Topic,Topic Name,тема Наименование
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Поне една от продажба или закупуване трябва да бъдат избрани
+DocType: Grading Structure,Grade Intervals,Интервалите клас
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Изберете естеството на вашия бизнес.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Когато се извършват производствени операции.
 DocType: Asset Movement,Source Warehouse,Източник Warehouse
 DocType: Installation Note,Installation Date,Дата на инсталация
-apps/erpnext/erpnext/controllers/accounts_controller.py +534,Row #{0}: Asset {1} does not belong to company {2},Row {0}: Asset {1} не принадлежи на компания {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +537,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,Продажбите на потребителя
@@ -2756,28 +2789,31 @@
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Свободно Batch Количество в От 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,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 +111,Date Of Retirement must be greater than Date of Joining,Дата на пенсиониране трябва да е по-голяма от Дата на Присъединяване
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +49,There were errors while scheduling course on :,Имаше грешки при насрочване курс по:
 DocType: Sales Invoice,Against Income Account,Срещу Приходна Сметка
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +87,{0}% Delivered,{0}% Доставени
+apps/erpnext/erpnext/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,Transporter Info
-apps/erpnext/erpnext/accounts/utils.py +379,Please set default {0} in Company {1},"Моля, задайте по подразбиране {0} в Company {1}"
+apps/erpnext/erpnext/accounts/utils.py +456,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,Брутна печалба / загуба
 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.,Писмо глави за шаблони за печат.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Заглавия за шаблони за печат, например проформа фактура."
+DocType: Student Guardian,Student Guardian,Student Guardian
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +184,Valuation type charges can not marked as Inclusive,Такси тип оценка не може маркирани като Inclusive
 DocType: POS Profile,Update Stock,Актуализация Фондова
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Different мерна единица за елементи ще доведе до неправилно (Total) Нетна стойност на теглото. Уверете се, че нетното тегло на всеки артикул е в една и съща мерна единица."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Курсове
 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 +349,Journal Entries {0} are un-linked,Холни влизания {0} са не-свързани
+apps/erpnext/erpnext/accounts/utils.py +426,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"
@@ -2801,6 +2837,7 @@
 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
+DocType: Homepage,"URL for ""All Products""",URL за &quot;Всички продукти&quot;
 DocType: Leave Application,Leave Balance Before Application,Оставете Balance Преди Application
 DocType: SMS Center,Send SMS,Изпратете SMS
 DocType: Cheque Print Template,Width of amount in word,Ширина на сума с думи
@@ -2809,7 +2846,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 +29,Current Job Openings,Свободни работни места
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,Current Job Openings,Свободни работни места
 DocType: Company,Stock Adjustment Account,Склад за приспособяване Акаунт
 DocType: Journal Entry,Write Off,Отписвам
 DocType: Timesheet Detail,Operation ID,Операция ID
@@ -2822,7 +2859,7 @@
 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 +850,Show tax break-up,Покажи данък разпадането
+apps/erpnext/erpnext/public/js/controllers/transaction.js +841,Show tax break-up,Покажи данък разпадането
 apps/erpnext/erpnext/accounts/party.py +308,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}, затова не можете да прехвърляте повторно или да го модифицирате"
@@ -2832,10 +2869,11 @@
 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 +534,Please select Posting Date before selecting Party,"Моля, изберете дата на завеждане, преди да изберете страна"
 DocType: Serial No,Out of AMC,Няма AMC
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +80,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 +162,Please contact to the user who have Sales Master Manager {0} role,"Моля, свържете се с потребител, който има {0} роля Продажби Майстор на мениджъра"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +195,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 +5,This is based on the attendance of this Student,Това се основава на присъствието на този Student
@@ -2844,12 +2882,11 @@
 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 +75,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 +138,Note: There is not enough leave balance for Leave Type {0},Забележка: Няма достатъчно отпуск баланс за отпуск Тип {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,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,Opportunity Type
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,New Company
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,Cost Center is required for 'Profit and Loss' account {0},Се изисква Cost Center за &quot;Печалби и загуби&quot; отчита {0}
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Транзакциите могат да бъдат изтрити само от създателя на Дружеството
 apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,Неправилно брой Главна книга намерени записи. Може да сте избрали грешен профил в сделката.
 DocType: Cheque Print Template,Cheque Width,Чек Ширина
@@ -2858,16 +2895,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,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 +228,{0} '{1}' is disabled,{0} &quot;{1}&quot; е деактивирана
+apps/erpnext/erpnext/controllers/accounts_controller.py +231,{0} '{1}' is disabled,{0} &quot;{1}&quot; е деактивирана
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Задай като Open
 DocType: Cheque Print Template,Scanned Cheque,сканираните Чек
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Изпрати автоматични имейли в Контакти при подаването на сделки.
+DocType: Timesheet,Total Billable Amount,Общо фактурирания сума
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Позиция 3
 DocType: Purchase Order,Customer Contact Email,Customer Контакт Email
 DocType: Warranty Claim,Item and Warranty Details,Позиция и подробности за гаранцията
 DocType: Sales Team,Contribution (%),Принос (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Забележка: Плащане Влизане няма да се създали от &quot;пари или с банкова сметка&quot; Не е посочено
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Responsibilities,Отговорности
+apps/erpnext/erpnext/controllers/accounts_controller.py +78,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,Отговорности
 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,Продажби лице Име
@@ -2875,6 +2913,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Добави Потребители
 DocType: Pricing Rule,Item Group,Позиция Group
 DocType: Item,Safety Stock,склад за безопасност
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Код&gt; Точка Група&gt; Brand
 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 валути)
@@ -2884,7 +2923,6 @@
 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: Timesheet,Total Hours,Общо Часа
 DocType: Journal Entry,Printing Settings,Настройки за печат
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Total Debit must be equal to Total Credit. The difference is {0},Общ дебит трябва да бъде равна на Общ кредит. Разликата е {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Автомобилен
@@ -2897,13 +2935,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Инвестиционно банкиране
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +71,Cash or Bank Account is mandatory for making payment entry,Брой или банкова сметка е задължителна за вземане на влизане плащане
 DocType: Purchase Invoice,Price List Exchange Rate,Ценоразпис Валутен курс
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Клиент&gt; Customer Група&gt; Територия
 DocType: Purchase Invoice Item,Rate,Скорост
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Intern,Интерниран
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,Интерниран
 DocType: Stock Entry,From BOM,От BOM
 DocType: Assessment,Assessment Code,Код за оценка
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +32,Basic,Основен
+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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Моля, кликнете върху &quot;Генериране Schedule&quot;"
+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 +95,Reference No is mandatory if you entered Reference Date,"Референтен Не е задължително, ако сте въвели, Референция Дата"
@@ -2912,11 +2951,11 @@
 DocType: Salary Slip,Salary Structure,Структура Заплата
 DocType: Account,Bank,Банка
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Авиолиния
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +752,Issue Material,Материал Issue
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +723,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 +683,You are in offline mode. You will not be able to reload until you have network.,"Вие сте в офлайн режим. Вие няма да бъдете в състояние да се презарежда, докато имате мрежа."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +665,You are in offline mode. You will not be able to reload until you have network.,"Вие сте в офлайн режим. Вие няма да бъдете в състояние да се презарежда, докато имате мрежа."
 DocType: Hub Settings,Access Token,Access Token
 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,Сериен Номер
@@ -2924,33 +2963,35 @@
 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 +1122,Enter value must be positive,Въведете стойност трябва да бъде положителна
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,All Territories,Всички територии
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1125,Enter value must be positive,Въведете стойност трябва да бъде положителна
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,Всички територии
 DocType: Purchase Invoice,Items,Предмети
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +23,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 +221,There are more holidays than working days this month.,Има повече почивки в работни дни този месец.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +233,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 +96,Request for Quotations,Заявка за Цитати
+apps/erpnext/erpnext/hooks.py +104,Request for Quotations,Заявка за Цитати
 DocType: Payment Reconciliation,Maximum Invoice Amount,Максимална сума на фактурата
 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 +628,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Default мерната единица за Variant &#39;{0}&#39; трябва да бъде същото, както в Template &quot;{1}&quot;"
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Default мерната единица за Variant &#39;{0}&#39; трябва да бъде същото, както в Template &quot;{1}&quot;"
 DocType: Shipping Rule,Calculate Based On,Изчислете основава на
 DocType: Delivery Note Item,From Warehouse,От Warehouse
 DocType: Assessment,Supervisor Name,Наименование на надзорник
+DocType: Assessment,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,Покупка на потребителя
 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 +27,Default Address Template cannot be deleted,Default Адрес Template не може да бъде изтрита
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,Default Адрес Template не може да бъде изтрита
 DocType: Sales Invoice,Shipping Rule,Доставка Правило
 DocType: Manufacturer,Limited to 12 characters,Ограничено до 12 символа
 DocType: Journal Entry,Print Heading,Print Heading
@@ -2965,8 +3006,8 @@
 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/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Или целта Количество или целева сума е задължителна
-apps/erpnext/erpnext/stock/get_item_details.py +485,No default BOM exists for Item {0},Не подразбиране BOM съществува за т {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +336,Please select Posting Date first,Моля изберете Публикуване Дата първа
+apps/erpnext/erpnext/stock/get_item_details.py +486,No default BOM exists for Item {0},Не подразбиране BOM съществува за т {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +326,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 със съществуващите операции не могат да бъдат превърнати в Леджър
@@ -2982,6 +3023,7 @@
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Краен Плащания с фактури
 DocType: Journal Entry,Bank Entry,Bank Влизане
 DocType: Authorization Rule,Applicable To (Designation),Приложими по отношение на (наименование)
+,Profitability Analysis,Анализ на рентабилността
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,Добави в кошницата
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Група С
 DocType: Guardian,Interests,Интереси
@@ -2994,21 +3036,21 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,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 +141,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Сериализирани т {0} не може да бъде актуализиран \ използвайки фондова помирение
 DocType: Scheduling Tool,Day,ден
 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 +122,You are not authorized to approve leaves on Block Dates,Вие нямате право да одобри листата на Блок Дати
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,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
-DocType: Student Applicant,AP.,AP.
 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 +639,Point of Sale,Точка на продажба
+apps/erpnext/erpnext/accounts/page/pos/pos.js +634,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,Данък
 DocType: Production Planning Tool,Production Planning Tool,Tool Производствено планиране
@@ -3017,74 +3059,77 @@
 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 +373,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 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 Profile,Customer Group,Customer Group
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,Expense account is mandatory for item {0},Разходна сметка е задължително за покупка {0}
 DocType: Item,Website Description,Website Описание
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date must be on or after today,Следваща Амортизация Датата трябва да е на или след днес
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,Нетна промяна в собствения капитал
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +145,Please cancel Purchase Invoice {0} first,Моля анулира фактурата за покупка {0} първи
 DocType: Serial No,AMC Expiry Date,AMC срок на годност
 ,Sales Register,Продажбите Регистрация
 DocType: Quotation,Quotation Lost Reason,Цитат Загубени Причина
+apps/erpnext/erpnext/utilities/doctype/address/address.py +164,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,"Не подразбиране Адрес Template намерен. Моля, създайте нов от Setup&gt; Печат и Branding&gt; Адрес за шаблони."
 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 +330,Transaction reference no {0} dated {1},Справка за сделката не {0} от {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Transaction reference no {0} dated {1},Справка за сделката не {0} от {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,"Няма нищо, за да редактирате."
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,Summary for this month and pending activities,Резюме за този месец и предстоящи дейности
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Резюме за този месец и предстоящи дейности
 DocType: Customer Group,Customer Group Name,Customer Group Име
 apps/erpnext/erpnext/public/js/financial_statements.js +54,Cash Flow Statement,Отчет за паричните потоци
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Please remove this Invoice {0} from C-Form {1},"Моля, премахнете тази фактура {0} от C-Form {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,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 +644,Get Items,Вземи артикули
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +623,Get Items,Вземи артикули
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +210,Please enter Write Off Account,"Моля, въведете отпишат Акаунт"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Последна Поръчка Дата
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +41,Account {0} does not belongs to company {1},Сметка {0} не принадлежи на фирма {1}
+DocType: Student,Guardian Details,Guardian Детайли
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Марк Присъствие на множество служители
 DocType: Payment Request,Initiated,Образувани
 DocType: Production Order,Planned Start Date,Планирана начална дата
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,Customer is required against Receivable account {0},се изисква от гостите срещу вземания сметка {0}
 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 +265,Project-wise data is not available for Quotation,Project-мъдър данни не е достъпно за оферта
+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 +101,Commercial,Търговски
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,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: Supplier Quotation,Supplier Address,Доставчик Адрес
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +648,Row {0}# Account must be of type 'Fixed Asset',Row {0} # партида трябва да е от тип &quot;дълготраен актив&quot;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,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 +30,Series is mandatory,Series е задължително
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +50,Series is mandatory,Series е задължително
 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,Видове дейности за времето за 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},Warehouse изисква за склад т {0}
 DocType: Leave Allocation,Unused leaves,Неизползваните отпуски
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Cr,Cr
 DocType: Tax Rule,Billing State,Billing членка
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +250,Transfer,Прехвърляне
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +187,{0} {1} does not associated with Party Account {2},{0} {1} не е свързан с профила страна {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,Fetch exploded BOM (including sub-assemblies),Изважда се взриви BOM (включително монтажните възли)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +254,Transfer,Прехвърляне
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +190,{0} {1} does not associated with Party Account {2},{0} {1} не е свързан с профила страна {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +796,Fetch exploded BOM (including sub-assemblies),Изважда се взриви BOM (включително монтажните възли)
 DocType: Authorization Rule,Applicable To (Employee),Приложими по отношение на (Employee)
-apps/erpnext/erpnext/controllers/accounts_controller.py +115,Due Date is mandatory,Поради Дата е задължително
+apps/erpnext/erpnext/controllers/accounts_controller.py +118,Due Date is mandatory,Поради Дата е задължително
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Увеличаване на Умение {0} не може да бъде 0
 DocType: Journal Entry,Pay To / Recd From,Заплати на / Recd От
 DocType: Naming Series,Setup Series,Setup Series
 DocType: Payment Reconciliation,To Invoice Date,Към датата на фактурата
 DocType: Supplier,Contact HTML,Свържи се с HTML
 ,Inactive Customers,Неактивните Клиенти
+DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Изкупните Приходи
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Как ценообразуване правило се прилага?
 DocType: Quality Inspection,Delivery Note No,Бележка за доставка Не
@@ -3093,7 +3138,7 @@
 DocType: Company,Retail,На дребно
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +120,Customer {0} does not exist,Customer {0} не съществува
 DocType: Attendance,Absent,Липсващ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +587,Product Bundle,Каталог Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Product Bundle,Каталог Bundle
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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,Изтеглете шаблони
@@ -3103,8 +3148,8 @@
 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 +742,Send Supplier Emails,Изпрати Доставчик имейли
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +104,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Заплата вече обработени за период между {0} и {1}, Оставете период заявление не може да бъде между този период от време."
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +708,Send Supplier Emails,Изпрати Доставчик имейли
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,"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.
 DocType: Guardian Interest,Guardian Interest,Guardian Интерес
 DocType: Timesheet,Employee Detail,Подробности Employee
@@ -3115,9 +3160,9 @@
 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,Приходи &amp; Приспадане
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +77,Account {0} cannot be a Group,Сметка {0} не може да бъде Група
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} cannot be a Group,Сметка {0} не може да бъде Група
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +31,Optional. This setting will be used to filter in various transactions.,"По избор. Тази настройка ще бъде използван, за да филтрирате по различни сделки."
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +107,Negative Valuation Rate is not allowed,Отрицателна оценка процент не е позволено
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Отрицателна оценка процент не е позволено
 DocType: Holiday List,Weekly Off,Седмичен Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Защото например 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +39,Provisional Profit / Loss (Credit),Временна печалба / загуба (Credit)
@@ -3131,16 +3176,16 @@
 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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Разходен Център е задължително за {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +626,Get Items from Product Bundle,Получават от продукта Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +605,Get Items from Product Bundle,Получават от продукта Bundle
 DocType: Asset,Straight Line,Права
 DocType: Project User,Project User,Потребителят Project
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} is inactive,Сметка {0} е неактивна
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} is inactive,Сметка {0} е неактивна
 DocType: GL Entry,Is Advance,Дали Advance
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Присъствие От Дата и зрители към днешна дата е задължително
 apps/erpnext/erpnext/controllers/buying_controller.py +148,Please enter 'Is Subcontracted' as Yes or No,"Моля, въведете &quot;преотстъпват&quot; като Да или Не"
 DocType: Sales Team,Contact No.,Свържи No.
 DocType: Bank Reconciliation,Payment Entries,Записи на плащане
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,'Profit and Loss' type account {0} not allowed in Opening Entry,"Сметка вид ""Печалби и загуби"" {0} не е позволена при Начален Баланс"
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +71,'Profit and Loss' type account {0} not allowed in Opening Entry,"Сметка вид ""Печалби и загуби"" {0} не е позволена при Начален Баланс"
 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
@@ -3159,7 +3204,7 @@
 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 +558,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row {0}: Asset {1} не може да бъде представен, той вече е {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +561,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row {0}: Asset {1} не може да бъде представен, той вече е {2}"
 DocType: Tax Rule,Billing Country,Billing Country
 DocType: Production Order,Expected Delivery Date,Очаквана дата на доставка
 apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Дебитни и кредитни не е равно на {0} # {1}. Разликата е {2}.
@@ -3172,13 +3217,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +202,Account with existing transaction can not be deleted,Сметка със съществуващa трансакция не може да бъде изтрита
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Legal Expenses,Правни разноски
 DocType: Purchase Invoice,Posting Time,Публикуване на времето
-DocType: Sales Order,% Amount Billed,% Начислената сума
+DocType: Timesheet,% Amount Billed,% Начислената сума
 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.,"Вижте това, ако искате да принуди потребителя да избере серия преди да запазите. Няма да има по подразбиране, ако проверите това."
 apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},Не позиция с Пореден № {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Отворени Известия
+DocType: Email Digest,Open Notifications,Отворени Известия
 DocType: Payment Entry,Difference Amount (Company Currency),Разлика сума (Company валути)
 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 \
@@ -3186,7 +3231,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,New Customer приходите
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,Пътни Разходи
 DocType: Maintenance Visit,Breakdown,Авария
-apps/erpnext/erpnext/controllers/accounts_controller.py +634,Account: {0} with currency: {1} can not be selected,Сметка: {0} с валута: не може да бъде избран {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +637,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}
 DocType: Program Enrollment Tool,Student Applicants,студентските Кандидатите
@@ -3194,15 +3239,15 @@
 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 +56,Probation,Изпитание
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Probation,Изпитание
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Заплата Компоненти
 DocType: Program Enrollment Tool,New Academic Year,Новата учебна година
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Payment of salary for the month {0} and year {1},Изплащането на заплатите за месец {0} и година {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Payment of salary for the month {0} and year {1},Изплащането на заплатите за месец {0} и година {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,"Auto вложка Ценоразпис ставка, ако липсва"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Общо платената сума
 DocType: Production Order Item,Transferred Qty,Прехвърлени Количество
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Навигация
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Planning,Планиране
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,Планиране
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,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,Ние продаваме този артикул
@@ -3215,11 +3260,10 @@
 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/accounts/page/pos/pos.js +1376,Sales invoice submitted sucessfully.,Продажби фактура представен успешно.
 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}"
 DocType: Assessment Result,Student Name,Student Име
-apps/erpnext/erpnext/hooks.py +104,Assessment Schedule,График за оценяване
+apps/erpnext/erpnext/hooks.py +113,Assessment Schedule,График за оценяване
 DocType: Brand,Item Manager,Точка на мениджъра
 DocType: Buying Settings,Default Supplier Type,Default доставчик Type
 DocType: Production Order,Total Operating Cost,Общо оперативни разходи
@@ -3229,6 +3273,7 @@
 DocType: GL Entry,Party Type,Party Type
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +78,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,Max Days Оставете любимци
@@ -3240,18 +3285,19 @@
 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 +99,All Customer Groups,Всички групи клиенти
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +78,Accumulated Monthly,Натрупвано месечно
-apps/erpnext/erpnext/controllers/accounts_controller.py +595,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} е задължително. Може би запис за обменни курсове на валута не е създаден от {1} към {2}.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Всички групи клиенти
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +81,Accumulated Monthly,Натрупвано месечно
+apps/erpnext/erpnext/controllers/accounts_controller.py +598,{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} не съществува
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Ценоразпис Rate (Company валути)
 DocType: Products Settings,Products Settings,Продукти Settings
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +188,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Моля, задайте за именуване Series за {0} чрез Setup&gt; Settings&gt; Наименуване Series"
 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 +84,Secretary,Секретар
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,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,Купуване
@@ -3260,24 +3306,22 @@
 ,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,оценка Име
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,Row # {0}: Пореден № е задължително
+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 +859,Supplier Quotation,Доставчик оферта
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +838,Supplier Quotation,Доставчик оферта
 DocType: Quotation,In Words will be visible once you save the Quotation.,По думите ще бъде видим след като спаси цитата.
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +7,Collect Fees,събира такси
+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}
 DocType: Lead,Add to calendar on this date,Добави в календара на тази дата
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Правила за добавяне на транспортни разходи.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Предстоящи събития
 DocType: Item,Opening Stock,Откриване фондова
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Се изисква 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
-DocType: Email Digest,Income / Expense,Приходи / разходи
 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.","Ако е активирана, системата ще публикуваме счетоводни записвания за инвентара автоматично."
@@ -3288,13 +3332,14 @@
 DocType: Customer,From Lead,От Lead
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Поръчки пуснати за производство.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Изберете фискална година ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,POS Profile required to make POS Entry,POS профил изисква да направи POS Влизане
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +509,POS Profile required to make POS Entry,POS профил изисква да направи POS Влизане
 DocType: Program Enrollment Tool,Enroll Students,приемат студенти
 DocType: Hub Settings,Name Token,Име Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard Selling
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Atleast one warehouse is mandatory,Поне един склад е задължително
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +129,Atleast one warehouse is mandatory,Поне един склад е задължително
 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 +330,{0} against Sales Invoice {1},{0} срещу Фактура за продажба {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Име на проекта
@@ -3315,10 +3360,11 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Листата трябва да бъдат разпределени в кратни на 0,5"
 DocType: Production Order,Operation Cost,Операция Cost
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,Качване на посещаемостта от .csv файл
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Изключително Amt
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Дефинират целите т Group-мъдър за тази Продажби Person.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Freeze Запаси по-стари от [Days]
-apps/erpnext/erpnext/controllers/accounts_controller.py +528,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row {0}: Asset е задължително за дълготраен актив покупка / продажба
+apps/erpnext/erpnext/controllers/accounts_controller.py +531,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row {0}: Asset е задължително за дълготраен актив покупка / продажба
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Ако две или повече ценови правила са открити на базата на горните условия, се прилага приоритет. Приоритет е число между 0 до 20, докато стойността по подразбиране е нула (празно). Висше номер означава, че ще имат предимство, ако има няколко ценови правила с едни и същи условия."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Фискална година: {0} не съществува
 DocType: Currency Exchange,To Currency,За да валути
@@ -3335,15 +3381,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Обратна връзка с клиент
 DocType: Account,Expense,Разход
-DocType: Sales Invoice,Exhibition,Изложба
 apps/erpnext/erpnext/utilities/doctype/address/address.py +77,"Company is mandatory, as it is your company address","Фирмата е задължително, тъй като това е вашата фирма адрес"
 DocType: Item Attribute,From Range,От Range
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +81,Syntax error in formula or condition: {0},Синтактична грешка във формула или състояние: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +92,Syntax error in formula or condition: {0},Синтактична грешка във формула или състояние: {0}
 apps/erpnext/erpnext/stock/utils.py +99,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 +28,Jobs,Работни места
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,Работни места
 ,Sales Order Trends,Поръчка за продажба Trends
 DocType: Employee,Held On,Проведена На
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Производство Точка
@@ -3352,16 +3398,16 @@
 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 +763,Make Supplier Quotation,Направи Доставчик оферта
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,Make Supplier Quotation,Направи Доставчик оферта
 DocType: Quality Inspection,Incoming,Входящ
 DocType: BOM,Materials Required (Exploded),Необходими материали (разглобен)
 apps/erpnext/erpnext/public/js/setup_wizard.js +185,"Add users to your organization, other than yourself","Добавте на потребители към вашата организация, различни от себе си"
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Пореден № {1} не съвпада с {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +42,Casual Leave,Casual отпуск
+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 отпуск
 DocType: Batch,Batch ID,Batch ID
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,Note: {0},Забележка: {0}
 ,Delivery Note Trends,Бележка за доставка Trends
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +103,This Week's Summary,Тази Седмица Резюме
+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} може да се актуализира само чрез Складови трансакции
 DocType: Student Group Creation Tool,Get Courses,Вземете курсове
 DocType: GL Entry,Party,Парти
@@ -3371,7 +3417,7 @@
 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 +59,Piecework,Работа заплащана на парче
+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: Task,Actual Time (in Hours),Действителното време (в часове)
 DocType: Employee,History In Company,История През Company
@@ -3388,7 +3434,7 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +350,{0} units of {1} needed in {2} to complete this transaction.,"{0} единици от {1} необходимо в {2}, за да завършите тази транзакция."
 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 +162,Black,Черен
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,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} произведени артикули
@@ -3399,13 +3445,13 @@
 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 +69,Customer Id,Id Customer
+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 Отсъства
 DocType: Journal Entry Account,Exchange Rate,Обменен курс
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Sales Order {0} is not submitted,Продажбите Поръчка {0} не е подадена
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +527,Sales Order {0} is not submitted,Продажбите Поръчка {0} не е подадена
 DocType: Homepage,Tag Line,Tag Line
 DocType: Fee Component,Fee Component,Такса Компонент
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +857,Add items from,Добавяне на елементи от
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +836,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}
 DocType: Cheque Print Template,Regular,Редовен
 DocType: BOM,Last Purchase Rate,Последна Покупка Курсове
@@ -3413,6 +3459,7 @@
 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}, тъй като има варианти"
 ,Sales Person-wise Transaction Summary,Продажбите Person-мъдър Transaction Резюме
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +60,Cost Center is required for 'Profit and Loss' account {0}. Please set up a default Cost Center for the Company.,"се изисква Cost Center за сметка &quot;Печалби и загуби&quot; {0}. Моля, създаден Център по подразбиране Разходите за дружеството."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,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,Месечни Процентите за дистрибуция
@@ -3423,12 +3470,12 @@
 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 +710,Online,На линия
+apps/erpnext/erpnext/accounts/page/pos/pos.js +692,Online,На линия
 ,Available Stock for Packing Items,"Свободно фондова за артикули, Опаковки"
 DocType: Item Variant,Item Variant,Позиция Variant
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,"Настройването на тази Адрес Шаблон по подразбиране, тъй като няма друг случай на неизпълнение"
+apps/erpnext/erpnext/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'","Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Quality Management,Управление на качеството
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,Управление на качеството
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,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,Служител за външна работа
@@ -3450,11 +3497,12 @@
 DocType: Student,Student Email ID,Student Email ID
 DocType: Employee,Notice (days),Известие (дни)
 DocType: Tax Rule,Sales Tax Template,Данъка върху продажбите Template
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1520,Select items to save the invoice,"Изберете, за да пести фактурата"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1544,Select items to save the invoice,"Изберете, за да пести фактурата"
 DocType: Employee,Encashment Date,Инкасо Дата
 DocType: Account,Stock Adjustment,Склад за приспособяване
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Съществува Cost Default активност за вид дейност - {0}
 DocType: Production Order,Planned Operating Cost,Планиран експлоатационни разходи
+DocType: Academic Term,Term Start Date,Срок Начална дата
 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,"Bank Изявление баланс, както на General Ledger"
 DocType: Job Applicant,Applicant Name,Заявител Име
@@ -3484,17 +3532,17 @@
 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 не може да се заличи, тъй като съществува влизане фондова книга за този склад."
 DocType: Company,Distribution,Разпределение
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +8,Amount Paid,"Сума, платена"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Project Manager,Ръководител На Проект
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,"Сума, платена"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,Ръководител На Проект
 ,Quoted Item Comparison,Цитирано т Сравнение
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Dispatch,Изпращане
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,Изпращане
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,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.,"Роля, която е оставена да се представят сделки, които надвишават кредитни лимити, определени."
-DocType: Sales Invoice,Supplier Reference,Доставчик Референтен
-apps/erpnext/erpnext/accounts/page/pos/pos.js +844,"Master data syncing, it might take some time","Магистър синхронизиране на данни, това може да отнеме известно време,"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +832,"Master data syncing, it might take some time","Магистър синхронизиране на данни, това може да отнеме известно време,"
 DocType: Item,Material Issue,Материал Issue
 DocType: Hub Settings,Seller Description,Продавач Описание
 DocType: Employee Education,Qualification,Квалификация
@@ -3508,7 +3556,7 @@
 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 +83,Error in formula or condition,Грешка във формула или състояние
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,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,Махнете отметката от всичко
@@ -3517,7 +3565,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},"Към днешна дата трябва да бъде в рамките на фискалната година. Ако приемем, че към днешна дата = {0}"
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Тук можете да се поддържа височина, тегло, алергии, медицински опасения и т.н."
 DocType: Leave Block List,Applies to Company,Отнася се за Фирма
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +197,Cannot cancel because submitted Stock Entry {0} exists,"Не може да се затвори, защото {0} съществува внесено фондова Влизане"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +198,Cannot cancel because submitted Stock Entry {0} exists,"Не може да се затвори, защото {0} съществува внесено фондова Влизане"
 DocType: Purchase Invoice,In Words,По думите
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,Today is {0}'s birthday!,Днес е {0} е рожден ден!
 DocType: Production Planning Tool,Material Request For Warehouse,Материал Заявка за складова база
@@ -3527,14 +3575,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,Вашият финансова година започва на
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Активи амортизации и баланси
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +319,Amount {0} {1} transferred from {2} to {3},Сума {0} {1} прехвърля от {2} до {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +322,Amount {0} {1} transferred from {2} to {3},Сума {0} {1} прехвърля от {2} до {3}
 DocType: Sales Invoice,Get Advances Received,Вземи Получени аванси
 DocType: Email Digest,Add/Remove Recipients,Добавяне / Премахване на Получатели
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +432,Transaction not allowed against stopped Production Order {0},Сделката не допуска срещу спря производството Поръчка {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +437,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 +143,Join,Присъедините
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Недостиг Количество
-apps/erpnext/erpnext/stock/doctype/item/item.py +652,Item variant {0} exists with same attributes,Съществува т вариант {0} със същите атрибути
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Съществува т вариант {0} със същите атрибути
+DocType: Leave Application,LAP/,LAP /
 DocType: Salary Slip,Salary Slip,Заплата Slip
 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,"""До дата"" се изисква"
@@ -3542,12 +3591,12 @@
 DocType: Sales Invoice Item,Sales Order Item,Продажбите Поръчка Точка
 DocType: Salary Slip,Payment Days,Плащане Days
 DocType: Customer,Dormant,спящ
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +212,Warehouses with child nodes cannot be converted to ledger,Складове с деца възли не могат да бъдат превърнати в Леджър
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +215,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: Employee Education,Employee Education,Служител Образование
-apps/erpnext/erpnext/public/js/controllers/transaction.js +866,It is needed to fetch Item Details.,"Той е необходим, за да донесе точка Details."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +857,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} вече е получил
@@ -3557,14 +3606,14 @@
 DocType: Expense Claim,Total Claimed Amount,Общо заявените Сума
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Потенциалните възможности за продажби.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,Invalid {0},Невалиден {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Sick Leave,Отпуск По Болест
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,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,Универсални Магазини
 DocType: Warehouse,PIN,PIN
 DocType: Sales Invoice,Base Change Amount (Company Currency),Base Промяна сума (Company валути)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +313,No accounting entries for the following warehouses,Не са счетоводни записвания за следните складове
-apps/erpnext/erpnext/projects/doctype/project/project.js +102,Save the document first.,Записване на документа на първо място.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +314,No accounting entries for the following warehouses,Не са счетоводни записвания за следните складове
+apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Записване на документа на първо място.
 DocType: Account,Chargeable,Платим
 DocType: Company,Change Abbreviation,Промени Съкращение
 DocType: Expense Claim Detail,Expense Date,Expense Дата
@@ -3577,10 +3626,9 @@
 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,Очаквана дата на доставка не може да бъде преди поръчка Дата
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Моля, задайте за именуване Series за {0} чрез Setup&gt; Settings&gt; Наименуване Series"
 DocType: Appraisal,Appraisal Template,Оценка Template
 DocType: Item Group,Item Classification,Позиция Класификация
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Business Development Manager,Мениджър Бизнес развитие
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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,Главна книга
@@ -3590,8 +3638,8 @@
 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 +940,Please select {0} first,Моля изберете {0} първия
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +749,Batch {0} of Item {1} has expired.,Партида {0} на т {1} е изтекъл.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +953,Please select {0} first,Моля изберете {0} първия
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +757,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,Междинна сума
@@ -3608,8 +3656,8 @@
 {% 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 +92,Warehouse not found in the system,Warehouse не е открит в системата
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +106,This Month's Summary,Резюме този месец
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Warehouse не е открит в системата
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Резюме този месец
 DocType: Quality Inspection Reading,Quality Inspection Reading,Проверка на качеството Reading
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Замрази Запаси по-стари от` трябва да бъде по-малък от %d дни.
 DocType: Tax Rule,Purchase Tax Template,Покупка Tax Template
@@ -3619,21 +3667,22 @@
 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 +87,Please set Next Depreciation Date,"Моля, задайте Следваща Амортизация Дата"
-DocType: Payment Gateway,Payment Gateway,Плащане Gateway
 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 +378,Operation Time must be greater than 0 for Operation {0},Операция на времето трябва да е по-голямо от 0 за Operation {0}
+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/accounts/doctype/account/account.py +170,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 (з)
 DocType: Program,Program Abbreviation,програма Съкращение
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,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: Appraisal,Start Date,Начална Дата
@@ -3649,21 +3698,22 @@
 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,"Махни позиция, ако цените не се отнася за тази позиция"
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Напр. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +27,Transaction currency must be same as Payment Gateway currency,Валута на транзакция трябва да бъде същата като Плащане Портал валута
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Transaction currency must be same as Payment Gateway currency,Валута на транзакция трябва да бъде същата като Плащане Портал валута
 DocType: Payment Entry,Receive,Получавам
+apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,цитати:
 DocType: Maintenance Visit,Fully Completed,Завършен до ключ
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Завършен
 DocType: Employee,Educational Qualification,Образователно-квалификационна
 DocType: Workstation,Operating Costs,Оперативни разходи
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,"Действие в случай, че сумарния месечен Бюджет е превишен"
 DocType: Purchase Invoice,Submit on creation,Подаване на създаване
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +432,Currency for {0} must be {1},Валутна за {0} трябва да е {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +435,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 +493,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Един запис Пренареждане вече съществува за този склад {1}
+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/crm/doctype/opportunity/opportunity.py +79,"Cannot declare as lost, because Quotation has been made.","Не може да се декларира като изгубена, защото цитата е направено."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Покупка Майстор на мениджъра
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +429,Production Order {0} must be submitted,Производство Поръчка {0} трябва да бъде представено
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +434,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,Към днешна дата не може да бъде преди от дата
@@ -3673,25 +3723,27 @@
 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 +181,Totals,Общо
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,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 +113,Warning: Leave application contains following block dates,Внимание: Оставете заявка съдържа следните дати блок
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +120,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),Сума (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}, за да завършите тази транзакция."
+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 +181,Organization unit (department) master.,Организация единица (отдел) майстор.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,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 +793,All records are synced.,Всички записи са синхронизирани.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +781,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,Необезпечени кредити
 DocType: Cost Center,Cost Center Name,Стойност Име Center
@@ -3710,21 +3762,20 @@
 DocType: Address,Name of person or organization that this address belongs to.,"Име на лицето или организацията, че този адрес принадлежи."
 apps/erpnext/erpnext/public/js/setup_wizard.js +260,Your Suppliers,Вашите доставчици
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +49,Cannot set as Lost as Sales Order is made.,Не може да се определи като губи като поръчка за продажба е направена.
-DocType: Student Applicant,Mother's Name,Майчино име
 DocType: Request for Quotation Item,Supplier Part No,Доставчик Част Не
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +348,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Не може да се приспадне при категория е за &quot;оценка&quot; или &quot;Vaulation и Total&quot;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Received From,Получени от
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Received From,Получени от
 DocType: Lead,Converted,Покръстен
 DocType: Item,Has Serial No,Има сериен номер
 DocType: Employee,Date of Issue,Дата на издаване
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: От {0} за {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +153,Row #{0}: Set Supplier for item {1},Row # {0}: Определете доставчик за т {1}
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +93,Row {0}: Hours value must be greater than zero.,Row {0}: Часове стойност трябва да е по-голяма от нула.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +117,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} не може да бъде намерена"
 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 +172,{0} {1} does not exist,{0} {1} не съществува
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +175,{0} {1} does not exist,{0} {1} не съществува
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,Please check Multi Currency option to allow accounts with other currency,"Моля, проверете опцията Multi валути да се позволи на сметки в друга валута"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +72,Item: {0} does not exist in the system,Позиция: {0} не съществува в системата
 apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,Вие не можете да настроите Frozen стойност
@@ -3733,13 +3784,14 @@
 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/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,Присъствие не може да бъде маркиран за бъдещи дати
 DocType: Pricing Rule,Pricing Rule Help,Ценообразуване Правило Помощ
 DocType: Purchase Taxes and Charges,Account Head,Главна Сметка
 apps/erpnext/erpnext/config/stock.py +163,Update additional costs to calculate landed cost of items,"Актуализиране на допълнителни разходи, за да се изчисли приземи разходи за предмети"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Electrical,Електрически
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Electrical,Електрически
 DocType: Stock Entry,Total Value Difference (Out - In),Общо Разлика Value (Out - В)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,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}
@@ -3747,7 +3799,7 @@
 DocType: Item,Customer Code,Код Customer
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +210,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 +292,Debit To account must be a Balance Sheet account,Debit За сметка трябва да бъде партида Баланс
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To account must be a Balance Sheet account,Debit За сметка трябва да бъде партида Баланс
 DocType: Buying Settings,Naming Series,Именуване Series
 DocType: Leave Block List,Leave Block List Name,Оставете Block List Име
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Сток Активи
@@ -3759,11 +3811,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} трябва да е от тип Отговорност / Equity
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +301,Salary Slip of employee {0} already created for time sheet {1},Заплата поднасяне на служител {0} вече е създаден за времето лист {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +313,Salary Slip of employee {0} already created for time sheet {1},Заплата поднасяне на служител {0} вече е създаден за времето лист {1}
 DocType: Sales Order Item,Ordered Qty,Поръчано Количество
-apps/erpnext/erpnext/stock/doctype/item/item.py +673,Item {0} is disabled,Точка {0} е деактивиран
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} is disabled,Точка {0} е деактивиран
 DocType: Stock Settings,Stock Frozen Upto,Фондова Frozen Upto
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +838,BOM does not contain any stock item,BOM не съдържа каквито и склад т
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +809,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,Генериране на заплатите фишове
@@ -3771,23 +3823,24 @@
 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 валути)
-apps/erpnext/erpnext/stock/doctype/item/item.py +485,Row #{0}: Please set reorder quantity,"Row # {0}: Моля, задайте повторна поръчка количество"
+DocType: Sales Invoice Timesheet,Billing Hours,Платежни часа
+apps/erpnext/erpnext/stock/doctype/item/item.py +487,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 +62,Please set {0},"Моля, задайте {0}"
 DocType: Purchase Invoice,Repeat on Day of Month,Повторете в Деня на Месец
 DocType: Employee,Health Details,Здраве Детайли
 DocType: Offer Letter,Offer Letter Terms,Оферта Писмо Условия
+DocType: Payment Entry,Allocate Payment Amount,Разпределяне на сумата за плащане
 DocType: Employee External Work History,Salary,Заплата
 DocType: Serial No,Delivery Document Type,Доставка Type Document
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Знаете всички фишове за заплати за над избрани критерии
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} артикули са синхронизирани
 DocType: Sales Order,Partly Delivered,Частично Доставени
-DocType: Sales Invoice,Existing Customer,За съществуващи клиенти
 DocType: Email Digest,Receivables,Вземания
+DocType: Lead Source,Lead Source,Водещ Източник
 DocType: Customer,Additional information regarding the customer.,Допълнителна информация за клиента.
 DocType: Quality Inspection Reading,Reading 5,Четене 5
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +38,Campaign Name is required,Се изисква Име на кампанията
 DocType: Maintenance Visit,Maintenance Date,Поддръжка Дата
 DocType: Purchase Invoice Item,Rejected Serial No,Отхвърлени Пореден №
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +80,Year start date or end date is overlapping with {0}. To avoid please set company,"Година дата начална или крайна дата се припокрива с {0}. За да се избегне моля, задайте компания"
@@ -3795,10 +3848,9 @@
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","Пример:. ABCD ##### Ако серията е настроен и сериен номер не се споменава в сделки, ще бъде създаден след това автоматично пореден номер въз основа на тази серия. Ако искате винаги да споменава изрично серийни номера за тази позиция. оставите полето празно."
 DocType: Upload Attendance,Upload Attendance,Качи Присъствие
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +129,BOM and Manufacturing Quantity are required,BOM и производство Количество са задължителни
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,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
-DocType: Bank Reconciliation Detail,Amount,Размер
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM заменя
 ,Sales Analytics,Продажби Analytics
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +113,Available {0},Налични {0}
@@ -3806,14 +3858,14 @@
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Създаване на Email
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +96,Please enter default currency in Company Master,"Моля, въведете подразбиране валута през Company магистър"
 DocType: Stock Entry Detail,Stock Entry Detail,Склад за вписване Подробности
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +100,Daily Reminders,Дневни Напомняния
+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/account/account_tree.js +23,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 +71,Customer Service,Обслужване На Клиенти
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Customer Service,Обслужване На Клиенти
 DocType: Homepage Featured Product,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,Елемент Подробности Customer
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Оферта кандидат за работа.
@@ -3822,8 +3874,9 @@
 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} трябва да бъде в наличност Позиция
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Default Work В Warehouse Progress
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1570,Total nos of serial no is not equal to quantity.,Общо номера на сериен номер не е равно на количеството.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1594,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,Актуализация Series Number
@@ -3831,9 +3884,10 @@
 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 +82,Engineer,Инженер
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Engineer,Инженер
+DocType: Journal Entry,Total Amount Currency,Обща сума на валута
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Търсене под Изпълнения
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Item Code required at Row No {0},Код изисква най Row Не {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +398,Item Code required at Row No {0},Код изисква най Row Не {0}
 DocType: Sales Partner,Partner Type,Partner Type
 DocType: Purchase Taxes and Charges,Actual,Действителен
 DocType: Authorization Rule,Customerwise Discount,Customerwise Отстъпка
@@ -3849,16 +3903,18 @@
 DocType: BOM,Raw Material Cost,Разходи за суровини
 DocType: Item Reorder,Re-Order Level,Re-Поръчка Level
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Въведете предмети и планирано Количество, за които искате да се повиши производствените поръчки или да изтеглите суровини за анализ."
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +55,Part-time,Непълен работен ден
+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,Непълен работен ден
 DocType: Employee,Applicable Holiday List,Приложимо Holiday Списък
 DocType: Employee,Cheque,Чек
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Series Обновено
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +57,Series Updated,Series Обновено
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,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 +87,Clearance Date updated,Клирънсът Дата на актуализация
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Успешно Съгласувани
@@ -3872,7 +3928,7 @@
 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 +513,Posting date and posting time is mandatory,Публикуване дата и публикуване време е задължително
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,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.,По думите ще бъде видим след като спаси Поръчката.
@@ -3882,7 +3938,7 @@
 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/stock/doctype/stock_entry/stock_entry.py +158,Target warehouse in row {0} must be same as Production Order,Target склад в ред {0} трябва да е същото като производствена поръчка
+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,"Валутна не може да се промени, след като записи с помощта на някои друга валута"
 DocType: Company,Round Off Account,Завършете Акаунт
@@ -3891,23 +3947,22 @@
 DocType: Customer Group,Parent Customer Group,Родител Customer Group
 DocType: Purchase Invoice,Contact Email,Контакт Email
 DocType: Appraisal Goal,Score Earned,Резултат спечелените
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Notice Period,Срок На Предизвестие
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,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 +4,New Sales Person Name,Името на продажбите на нови Лице
 DocType: Packing Slip,Gross Weight UOM,Бруто тегло мерна единица
-DocType: Email Digest,Receivables / Payables,Вземания / Задължения
 DocType: Delivery Note Item,Against Sales Invoice,Срещу фактура за продажба
 DocType: Bin,Reserved Qty for Production,Резервиран Количество за производство
 DocType: Asset,Frequency of Depreciation (Months),Честота на амортизация (месеца)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +469,Credit Account,Кредитна сметка
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Credit Account,Кредитна сметка
 DocType: Landed Cost Item,Landed Cost Item,Поземлен Cost Точка
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +55,Show zero values,Покажи нулеви стойности
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Покажи нулеви стойности
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Брой на т получен след производството / препакетиране от дадени количества суровини
 apps/erpnext/erpnext/public/js/setup_wizard.js +315,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 +647,Please specify Attribute Value for attribute {0},"Моля, посочете Умение Цена атрибут {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},"Моля, посочете Умение Цена атрибут {0}"
 DocType: Item,Default Warehouse,Default Warehouse
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +39,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,"Моля, въведете разходен център майка"
@@ -3929,19 +3984,22 @@
 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
-DocType: Sales Invoice,Cold Calling,Cold Calling
 DocType: SMS Parameter,SMS Parameter,SMS параметър
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,Бюджет и Cost Center
 DocType: Maintenance Schedule Item,Half Yearly,Полугодишна
 DocType: Lead,Blog Subscriber,Блог Subscriber
+DocType: Guardian,Alternate Number,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","Ако е избрано, 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 старт. Моля, коригирайте датите и опитайте отново."
+DocType: Stock Reconciliation Item,Quantity Difference,Количество Разлика
 apps/erpnext/erpnext/config/hr.py +253,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 +141,Set as Lost,Задай като Загубени
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,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 +5,This is based on transactions against this Customer. See timeline below for details,Това се основава на сделки срещу този клиент. Вижте график по-долу за повече подробности
 DocType: Supplier,Credit Days Based On,Кредитните Days въз основа на
@@ -3953,11 +4011,10 @@
 ,Items To Be Requested,Предмети трябва да бъдат поискани
 DocType: Purchase Order,Get Last Purchase Rate,Вземи Last Покупка Курсове
 DocType: Company,Company Info,Информация за фирмата
-apps/erpnext/erpnext/accounts/page/pos/pos.js +941,Select or add new customer,Изберете или да добавите нов клиент
+apps/erpnext/erpnext/accounts/page/pos/pos.js +930,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 +5,This is based on the attendance of this Employee,Това се основава на присъствието на този служител
-DocType: Sales Invoice,Frequency,честота
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +463,Debit Account,Debit Акаунт
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Debit Account,Debit Акаунт
 DocType: Fiscal Year,Year Start Date,Година Начална дата
 DocType: Attendance,Employee Name,Служител Име
 DocType: Sales Invoice,Rounded Total (Company Currency),Rounded Общо (Company валути)
@@ -3966,27 +4023,27 @@
 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 +210,Supplier Quotation {0} created,Доставчик цитата {0} е създаден
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +208,Supplier Quotation {0} created,Доставчик цитата {0} е създаден
 apps/erpnext/erpnext/accounts/report/financial_statements.py +90,End Year cannot be before Start Year,Край година не може да бъде преди Start Година
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Employee Benefits,Доходи на наети лица
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,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 +228,Please set a default Holiday List for Employee {0} or Company {1},"Моля, задайте по подразбиране Holiday Списък на служителите {0} или Фирма {1}"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +232,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 +499,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 +500,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 +1007,Price List not found or disabled,Ценова листа не е намерен или инвалиди
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1008,Price List not found or disabled,Ценова листа не е намерен или инвалиди
 DocType: Expense Claim,Approved,Одобрен
 DocType: Pricing Rule,Price,Цена
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +244,Employee relieved on {0} must be set as 'Left',Служител облекчение на {0} трябва да се зададе като &quot;Ляв&quot;
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +256,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} в даден период от време
@@ -3997,12 +4054,12 @@
 DocType: Address,Office,Офис
 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 +259,Please select Employee Record first.,Моля изберете Record Employee първия.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +266,Please select Employee Record first.,Моля изберете Record Employee първия.
 DocType: POS Profile,Account for Change Amount,Сметка за промяна сума
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +190,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 +235,Please enter Expense Account,"Моля, въведете Expense Account"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,Please enter Expense Account,"Моля, въведете Expense Account"
 DocType: Account,Stock,Наличност
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,"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 +976,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row {0}: Референтен Document Type трябва да бъде един от поръчка за покупка, покупка на фактура или вестник Влизане"
 DocType: Employee,Current Address,Настоящ Адрес
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Ако елемент е вариант на друга позиция след това описание, изображение, ценообразуване, данъци и т.н., ще бъдат определени от шаблона, освен ако изрично е посочено"
 DocType: Serial No,Purchase / Manufacture Details,Покупка / Производство Детайли
@@ -4017,9 +4074,10 @@
 DocType: Asset Movement,Transaction Date,Transaction Дата
 DocType: Production Plan Item,Planned Qty,Планиран Количество
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,Общо Tax
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,For Quantity (Manufactured Qty) is mandatory,За Количество (Произведен Количество) е задължително
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,For Quantity (Manufactured Qty) is mandatory,За Количество (Произведен Количество) е задължително
 DocType: Stock Entry,Default Target Warehouse,Default Target Warehouse
 DocType: Purchase Invoice,Net Total (Company Currency),Net Общо (Company валути)
+apps/erpnext/erpnext/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 +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Party Тип и страна е приложима само срещу получаване / плащане акаунт
 DocType: Notification Control,Purchase Receipt Message,Покупка получено съобщение
 DocType: Production Order,Actual Start Date,Действителна Начална дата
@@ -4034,9 +4092,11 @@
 DocType: Warranty Claim,If different than customer address,Ако е различен от адреса на клиента
 DocType: BOM Operation,BOM Operation,BOM Operation
 DocType: Purchase Taxes and Charges,On Previous Row Amount,На предишния ред Сума
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +226,Transfer Asset,Прехвърляне на активи
+DocType: Student,Home Address,Домашен адрес
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +227,Transfer Asset,Прехвърляне на активи
 DocType: POS Profile,POS Profile,POS профил
 apps/erpnext/erpnext/config/schools.py +33,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 +129,"Item {0} is a template, please select one of its variants","Точка {0} е шаблон, моля изберете една от неговите варианти"
 DocType: Asset,Asset Category,Asset Категория
@@ -4046,8 +4106,8 @@
 DocType: Assessment,Room,Стая
 DocType: Purchase Order,Advance Paid,Авансово изплатени суми
 DocType: Item,Item Tax,Позиция Tax
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +765,Material to Supplier,Материал на доставчик
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +189,Excise Invoice,Акцизите Invoice
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,Material to Supplier,Материал на доставчик
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,Акцизите 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,Текущи задължения
@@ -4057,7 +4117,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,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,Scheduling Tool
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +136,Credit Card,Кредитна Карта
+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.,Настройките по подразбиране за борсови сделки.
 DocType: Purchase Invoice,Next Date,Следващата дата
@@ -4065,6 +4125,7 @@
 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: Academic Term,Term End Date,Срок Крайна дата
 DocType: Hub Settings,Seller Name,Продавач Име
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),"Данъци и такси, удържани (Company валути)"
 DocType: Item Group,General Settings,Основни настройки
@@ -4076,7 +4137,7 @@
 DocType: Customer,Commission Rate,Комисията Курсове
 apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,Направи Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Заявленията за отпуск блок на отдел.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +115,"Payment Type must be one of Receive, Pay and Internal Transfer","Вид на плащане трябва да бъде един от Receive, Pay и вътрешен трансфер"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +118,"Payment Type must be one of Receive, Pay and Internal Transfer","Вид на плащане трябва да бъде един от Receive, Pay и вътрешен трансфер"
 apps/erpnext/erpnext/config/selling.py +169,Analytics,анализ
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Количката е празна
 DocType: Production Order,Actual Operating Cost,Действителни оперативни разходи
@@ -4091,10 +4152,10 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,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 +92,Designer,Дизайнер
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Designer,Дизайнер
 apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,Условия Template
 DocType: Serial No,Delivery Details,Детайли за доставка
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +469,Cost Center is required in row {0} in Taxes table for type {1},Cost Center се изисква в ред {0} в Данъци маса за вид {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +472,Cost Center is required in row {0} in Taxes table for type {1},Cost Center се изисква в ред {0} в Данъци маса за вид {1}
 DocType: Program,Program Code,програмен код
 ,Item-wise Purchase Register,Точка-мъдър Покупка Регистрация
 DocType: Batch,Expiry Date,Срок На Годност
@@ -4104,12 +4165,12 @@
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Майстор Project.
 apps/erpnext/erpnext/controllers/status_updater.py +174,"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 +417, (Half Day),(Половин ден)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425, (Half Day),(Половин ден)
 DocType: Supplier,Credit Days,Кредитните Days
 DocType: Leave Type,Is Carry Forward,Дали Пренасяне
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +740,Get Items from BOM,Получават от BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +711,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 +549,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row {0}: Публикуване Дата трябва да е същото като датата на покупка {1} на актив {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +552,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,"Моля, въведете Поръчки за продажби в таблицата по-горе"
 ,Stock Summary,фондова Резюме
 apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,Трансфер актив от един склад в друг
diff --git a/erpnext/translations/bn.csv b/erpnext/translations/bn.csv
index 8996442..4991f72 100644
--- a/erpnext/translations/bn.csv
+++ b/erpnext/translations/bn.csv
@@ -18,11 +18,10 @@
 DocType: Sales Partner,Dealer,ব্যাপারী
 DocType: Employee,Rented,ভাড়াটে
 DocType: Purchase Order,PO-,PO-
-apps/erpnext/erpnext/accounts/report/financial_statements.py +19,Start Year {0} not found.,শুরু বছর {0} পাওয়া যায়নি.
 DocType: POS Profile,Applicable for User,ব্যবহারকারী জন্য প্রযোজ্য
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +191,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","থামানো উৎপাদন অর্ডার বাতিল করা যাবে না, বাতিল করতে এটি প্রথম দুর"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +197,Do you really want to scrap this asset?,আপনি কি সত্যিই এই সম্পদ স্ক্র্যাপ করতে চান?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +17,Select Default Supplier,নির্বাচন ডিফল্ট সরবরাহকারী
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +192,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","থামানো উৎপাদন অর্ডার বাতিল করা যাবে না, বাতিল করতে এটি প্রথম দুর"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +198,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 +36,Currency is required for Price List {0},মুদ্রাটির মূল্য তালিকা জন্য প্রয়োজন {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* লেনদেনে গণনা করা হবে.
 DocType: Address,County,বিভাগ
@@ -42,46 +41,45 @@
 DocType: Sales Invoice,Customer Name,ক্রেতার নাম
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +126,Bank account cannot be named as {0},ব্যাংক অ্যাকাউন্ট হিসেবে নামকরণ করা যাবে না {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"প্রধান (বা গ্রুপ), যার বিরুদ্ধে হিসাব থেকে তৈরি করা হয় এবং উদ্বৃত্ত বজায় রাখা হয়."
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +180,Outstanding for {0} cannot be less than zero ({1}),বিশিষ্ট {0} হতে পারে না শূন্য কম ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,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 +148,Series Updated Successfully,সিরিজ সফলভাবে আপডেট
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +149,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,সমস্ত সরবরাহকারী যোগাযোগ
-DocType: Quality Inspection Reading,Parameter,স্থিতিমাপ
 apps/erpnext/erpnext/projects/doctype/project/project.py +54,Expected End Date can not be less than Expected Start Date,সমাপ্তি প্রত্যাশিত তারিখ প্রত্যাশিত স্টার্ট জন্ম কম হতে পারে না
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,সারি # {0}: হার হিসাবে একই হতে হবে {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +239,New Leave Application,নিউ ছুটি আবেদন
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,New Leave Application,নিউ ছুটি আবেদন
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +20,Attendance Record {0} exists against Student {1} for Course Schedule {2},এ্যাটেনডেন্স রেকর্ড {0} স্টুডেন্ট {1} বিরুদ্ধে কোর্সের সময়সূচী অস্তিত্বমান {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Bank Draft,ব্যাংক খসড়া
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,ব্যাংক খসড়া
 DocType: Mode of Payment Account,Mode of Payment Account,পেমেন্ট একাউন্ট এর মোড
 apps/erpnext/erpnext/stock/doctype/item/item.js +52,Show Variants,দেখান রুপভেদ
 DocType: Academic Term,Academic Term,একাডেমিক টার্ম
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +13,Material,উপাদান
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Quantity,পরিমাণ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +511,Accounts table cannot be blank.,অ্যাকাউন্ট টেবিল খালি রাখা যাবে না.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +616,Quantity,পরিমাণ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +512,Accounts table cannot be blank.,অ্যাকাউন্ট টেবিল খালি রাখা যাবে না.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,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/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 +142,User {0} is already assigned to Employee {1},ব্যবহারকারী {0} ইতিমধ্যে কর্মচারী নির্ধারিত হয় {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,স্বাস্থ্যের যত্ন
-DocType: Purchase Invoice,Monthly,মাসিক
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),পেমেন্ট মধ্যে বিলম্ব (দিন)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +771,Invoice,চালান
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +750,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 +198,Row {0}: {1} {2} does not match with {3},সারি {0}: {1} {2} সঙ্গে মেলে না {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,সারি # {0}:
+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 +127,Please select Price List,মূল্য তালিকা নির্বাচন করুন
@@ -112,8 +110,8 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,একই কোম্পানীর একবারের বেশি প্রবেশ করানো হয়
 DocType: Employee,Married,বিবাহিত
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},অনুমোদিত নয় {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +589,Get items from,থেকে আইটেম পান
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +382,Stock cannot be updated against Delivery Note {0},শেয়ার হুণ্ডি বিরুদ্ধে আপডেট করা যাবে না {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,থেকে আইটেম পান
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,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,মুদিখানা
@@ -122,7 +120,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 +156,Salary Structure Missing,বেতন কাঠামো অনুপস্থিত
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Salary Structure Missing,বেতন কাঠামো অনুপস্থিত
 DocType: Lead,Person Name,ব্যক্তির নাম
 DocType: Sales Invoice Item,Sales Invoice Item,বিক্রয় চালান আইটেম
 DocType: Account,Credit,জমা
@@ -130,10 +128,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 +156,Credit limit has been crossed for customer {0} {1}/{2},ক্রেডিট সীমা গ্রাহকের জন্য পার হয়েছে {0} {1} / {2}
-apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",", অবারিত হতে পারে না যেমন অ্যাসেট রেকর্ড আইটেমটি বিরুদ্ধে বিদ্যমান &quot;ফিক্সড সম্পদ&quot;"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +189,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;"
 DocType: Tax Rule,Tax Type,ট্যাক্স ধরন
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +144,You are not authorized to add or update entries before {0},আপনি আগে এন্ট্রি যোগ করতে অথবা আপডেট করার জন্য অনুমতিপ্রাপ্ত নন {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},আপনি আগে এন্ট্রি যোগ করতে অথবা আপডেট করার জন্য অনুমতিপ্রাপ্ত নন {0}
 DocType: Item,Item Image (if not slideshow),আইটেম ইমেজ (ছবি না হলে)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,একটি গ্রাহক এই একই নামের
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(ঘন্টা হার / ৬০) * প্রকৃত অপারেশন টাইম
@@ -143,18 +142,17 @@
 DocType: Student Log,Student Log,ছাত্র লগ
 DocType: Quality Inspection,Get Specification Details,স্পেসিফিকেশন বিবরণ পান
 DocType: Lead,Interested,আগ্রহী
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +165,Opening,উদ্বোধন
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,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/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,গ্রাহক&gt; গ্রাহক গ্রুপের&gt; টেরিটরি
 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.,বিদ্যমান লেনদেন সঙ্গে অ্যাকাউন্ট গ্রুপ রূপান্তরিত করা যাবে না.
 DocType: Lead,Product Enquiry,পণ্য অনুসন্ধান
 DocType: Academic Term,Schools,শিক্ষক
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,প্রথম কোম্পানি লিখুন দয়া করে
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Company first,প্রথম কোম্পানি নির্বাচন করুন
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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,মোট খরচ
@@ -164,7 +162,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,অ্যাকাউন্ট বিবৃতি
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,ফার্মাসিউটিক্যালস
 DocType: Purchase Invoice Item,Is Fixed Asset,পরিসম্পদ হয়
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Available qty is {0}, you need {1}","উপলভ্য Qty {0}, আপনি প্রয়োজন হয় {1}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +225,"Available qty is {0}, you need {1}","উপলভ্য Qty {0}, আপনি প্রয়োজন হয় {1}"
 DocType: Expense Claim Detail,Claim Amount,দাবি পরিমাণ
 DocType: Employee,Mr,জনাব
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,সরবরাহকারী ধরন / সরবরাহকারী
@@ -173,25 +171,26 @@
 DocType: Employee,B-,বি-
 DocType: Upload Attendance,Import Log,আমদানি লগ
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,টানুন উপরে মাপকাঠির ভিত্তিতে টাইপ প্রস্তুত উপাদান অনুরোধ
+DocType: Assessment Result,Grade,শ্রেণী
 DocType: Sales Invoice Item,Delivered By Supplier,সরবরাহকারী দ্বারা বিতরণ
 DocType: SMS Center,All Contact,সমস্ত যোগাযোগ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Annual Salary,বার্ষিক বেতন
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,স্টক খরচ
-apps/erpnext/erpnext/accounts/report/financial_statements.py +22,End Year {0} not found.,শেষ বছরের {0} পাওয়া যায়নি.
 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}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,সাপ্লাই কাঁচামালের ক্রয় জন্য
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +130,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 +451,Item {0} is not active or end of life has been reached,{0} আইটেম সক্রিয় নয় বা জীবনের শেষ হয়েছে পৌঁছেছেন
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +456,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/controllers/accounts_controller.py +614,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","আইটেম রেট সারি {0} মধ্যে ট্যাক্স সহ, সারি করের {1} এছাড়াও অন্তর্ভুক্ত করা আবশ্যক"
+apps/erpnext/erpnext/controllers/accounts_controller.py +617,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","আইটেম রেট সারি {0} মধ্যে ট্যাক্স সহ, সারি করের {1} এছাড়াও অন্তর্ভুক্ত করা আবশ্যক"
 apps/erpnext/erpnext/config/hr.py +166,Settings for HR Module,এইচআর মডিউল ব্যবহার সংক্রান্ত সেটিংস Comment
 DocType: SMS Center,SMS Center,এসএমএস কেন্দ্র
 DocType: Sales Invoice,Change Amount,পরিমাণ পরিবর্তন
@@ -203,13 +202,13 @@
 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 +147,Execution,সম্পাদন
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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,চলছে এবং প্রাইসিং
 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}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,Cost Center {0} does not belong to Company {1},কেন্দ্র {0} কোম্পানি অন্তর্গত নয় উড়ানের তালিকাটি {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +100,Cost Center {0} does not belong to Company {1},কেন্দ্র {0} কোম্পানি অন্তর্গত নয় উড়ানের তালিকাটি {1}
 DocType: Customer,Individual,ব্যক্তি
 DocType: Interest,Academics User,শিক্ষাবিদগণ ব্যবহারকারী
 DocType: Cheque Print Template,Amount In Figure,পরিমাণ চিত্র
@@ -225,30 +224,32 @@
 DocType: Production Planning Tool,Sales Orders,বিক্রয় আদেশ
 DocType: Purchase Taxes and Charges,Valuation,মাননির্ণয়
 ,Purchase Order Trends,অর্ডার প্রবণতা ক্রয়
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,The request for quotation can be accessed by clicking on the following link,উদ্ধৃতি জন্য অনুরোধ নিম্নলিখিত লিঙ্কে ক্লিক করে প্রবেশ করা যেতে পারে
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,বছরের জন্য পাতার বরাদ্দ.
 DocType: SG Creation Tool Course,SG Creation Tool Course,এস জি ক্রিয়েশন টুল কোর্স
 DocType: Student Group Creation Tool,Leave blank if you wish to fetch all courses for selected academic term,"ফাঁকা রাখেন, তাহলে আপনি নির্বাচিত একাডেমিক মেয়াদে সকল কোর্সে আনতে চান"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,Insufficient Stock,অপর্যাপ্ত স্টক
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227,Insufficient Stock,অপর্যাপ্ত স্টক
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,অক্ষম ক্ষমতা পরিকল্পনা এবং সময় ট্র্যাকিং
+DocType: Email Digest,New Sales Orders,নতুন বিক্রয় আদেশ
 DocType: Bank Reconciliation,Bank Account,ব্যাংক হিসাব
 DocType: Leave Type,Allow Negative Balance,ঋণাত্মক ব্যালান্স মঞ্জুরি
 DocType: Selling Settings,Default Territory,ডিফল্ট টেরিটরি
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,টিভি
 DocType: Production Order Operation,Updated via 'Time Log',&#39;টাইম ইন&#39; র মাধ্যমে আপডেট
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} does not belong to Company {1},অ্যাকাউন্ট {0} কোম্পানি অন্তর্গত নয় {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +86,Account {0} does not belong to Company {1},অ্যাকাউন্ট {0} কোম্পানি অন্তর্গত নয় {1}
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},অগ্রিম পরিমাণ তার চেয়ে অনেক বেশী হতে পারে না {0} {1}
 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 +174,For Warehouse is required before Submit,গুদাম জন্য জমা করার আগে প্রয়োজন বোধ করা হয়
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,For Warehouse is required before Submit,গুদাম জন্য জমা করার আগে প্রয়োজন বোধ করা হয়
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,পেয়েছি
 DocType: Sales Partner,Reseller,রিসেলার
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,কোম্পানী লিখুন দয়া করে
 DocType: Delivery Note Item,Against Sales Invoice Item,বিক্রয় চালান আইটেমটি বিরুদ্ধে
 ,Production Orders in Progress,প্রগতি উৎপাদন আদেশ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Cash from Financing,অর্থায়ন থেকে নিট ক্যাশ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1436,"LocalStorage is full , did not save","স্থানীয় সঞ্চয়স্থান পূর্ণ, সংরক্ষণ করা হয়নি"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1460,"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}
@@ -261,18 +262,19 @@
 apps/erpnext/erpnext/templates/generators/item.html +78,No description given,দেওয়া কোন বিবরণ
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,কেনার জন্য অনুরোধ জানান.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +5,This is based on the Time Sheets created against this project,এই সময় শীট এই প্রকল্পের বিরুদ্ধে নির্মিত উপর ভিত্তি করে
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Only the selected Leave Approver can submit this Leave Application,শুধু নির্বাচিত ছুটি রাজসাক্ষী এই ছুটি আবেদন জমা দিতে পারেন
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +213,Only the selected Leave Approver can submit this Leave Application,শুধু নির্বাচিত ছুটি রাজসাক্ষী এই ছুটি আবেদন জমা দিতে পারেন
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,তারিখ মুক্তিদান যোগদান তারিখ থেকে বড় হওয়া উচিত
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Leaves per Year,প্রতি বছর পত্রাদি
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,প্রতি বছর পত্রাদি
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,সারি {0}: চেক করুন অ্যাকাউন্টের বিরুদ্ধে &#39;আগাম&#39; {1} এই একটি অগ্রিম এন্ট্রি হয়.
 apps/erpnext/erpnext/stock/utils.py +188,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,লিটার
 DocType: Task,Total Costing Amount (via Time Sheet),মোট খোয়াতে পরিমাণ (টাইম শিট মাধ্যমে)
 DocType: Item Website Specification,Item Website Specification,আইটেম ওয়েবসাইট স্পেসিফিকেশন
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +435,Leave Blocked,ত্যাগ অবরুদ্ধ
-apps/erpnext/erpnext/stock/doctype/item/item.py +669,Item {0} has reached its end of life on {1},আইটেম {0} জীবনের তার শেষ পৌঁছেছে {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +443,Leave Blocked,ত্যাগ অবরুদ্ধ
+apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item {0} has reached its end of life on {1},আইটেম {0} জীবনের তার শেষ পৌঁছেছে {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +95,Bank Entries,ব্যাংক দাখিলা
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +83,Annual,বার্ষিক
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +86,Annual,বার্ষিক
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,শেয়ার রিকনসিলিয়েশন আইটেম
 DocType: Stock Entry,Sales Invoice No,বিক্রয় চালান কোন
 DocType: Material Request Item,Min Order Qty,ন্যূনতম আদেশ Qty
@@ -280,20 +282,22 @@
 DocType: Lead,Do Not Contact,যোগাযোগ না
 apps/erpnext/erpnext/public/js/setup_wizard.js +360,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 +91,Software Developer,সফ্টওয়্যার ডেভেলপার
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,সফ্টওয়্যার ডেভেলপার
 DocType: Item,Minimum Order Qty,নূন্যতম আদেশ Qty
 DocType: Pricing Rule,Supplier Type,সরবরাহকারী ধরন
 DocType: Scheduling Tool,Course Start Date,কোর্স শুরুর তারিখ
 DocType: Item,Publish in Hub,হাব প্রকাশ
+DocType: Student Admission,Student Admission,ছাত্র-ছাত্রী ভর্তি
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is cancelled,{0} আইটেম বাতিল করা হয়
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Material Request,উপাদানের জন্য অনুরোধ
+apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} is cancelled,{0} আইটেম বাতিল করা হয়
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +823,Material Request,উপাদানের জন্য অনুরোধ
 DocType: Bank Reconciliation,Update Clearance Date,আপডেট পরিস্কারের তারিখ
 apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +28,Abbreviation already used for another salary component,সমাহার ইতিমধ্যে আরেকটি বেতন উপাদানের জন্য ব্যবহৃত
 DocType: Item,Purchase Details,ক্রয় বিবরণ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +328,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},ক্রয় করার &#39;কাঁচামাল সরবরাহ করা&#39; টেবিলের মধ্যে পাওয়া আইটেম {0} {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +333,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/config/selling.py +18,Confirmed orders from Customers.,গ্রাহকরা থেকে নিশ্চিত আদেশ.
 DocType: Purchase Receipt Item,Rejected Quantity,প্রত্যাখ্যাত পরিমাণ
 DocType: SMS Settings,SMS Sender Name,এসএমএস প্রেরকের নাম
@@ -309,20 +313,21 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +130,Please select Charge Type first,প্রথম অভিযোগ টাইপ নির্বাচন করুন
 DocType: Student Group Student,Student Group Student,শিক্ষার্থীর গ্রুপ ছাত্র
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,সর্বশেষ
+DocType: Email Digest,New Quotations,নতুন উদ্ধৃতি
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,যদি তালিকার প্রথম ছুটি রাজসাক্ষী ডিফল্ট ছুটি রাজসাক্ষী হিসাবে নির্ধারণ করা হবে
 DocType: Tax Rule,Shipping County,শিপিং কাউন্টি
 apps/erpnext/erpnext/config/desktop.py +158,Learn,শেখা
 DocType: Asset,Next Depreciation Date,পরবর্তী অবচয় তারিখ
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,কর্মচারী প্রতি কার্যকলাপ খরচ
 DocType: Accounts Settings,Settings for Accounts,অ্যাকাউন্ট এর জন্য সেটিং
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +626,Supplier Invoice No exists in Purchase Invoice {0},সরবরাহকারী চালান কোন ক্রয় চালান মধ্যে বিদ্যমান {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +629,Supplier Invoice No exists in Purchase Invoice {0},সরবরাহকারী চালান কোন ক্রয় চালান মধ্যে বিদ্যমান {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,সেলস পারসন গাছ পরিচালনা.
 DocType: Job Applicant,Cover Letter,কাভার লেটার
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,বিশিষ্ট চেক এবং পরিষ্কার আমানত
 DocType: Item,Synced With Hub,হাব সঙ্গে synced
 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 +348,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 +86,Circular Reference Error,সার্কুলার রেফারেন্স ত্রুটি
@@ -334,15 +339,16 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,স্বয়ংক্রিয় উপাদান অনুরোধ নির্মাণের ইমেইল দ্বারা সূচিত
 DocType: Journal Entry,Multi Currency,বিভিন্ন দেশের মুদ্রা
 DocType: Payment Reconciliation Invoice,Invoice Type,চালান প্রকার
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +806,Delivery Note,চালান পত্র
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +800,Delivery Note,চালান পত্র
 apps/erpnext/erpnext/config/learn.py +87,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 +233,Payment Entry has been modified after you pulled it. Please pull it again.,আপনি এটি টানা পরে পেমেন্ট ভুক্তি নথীটি পরিবর্তিত হয়েছে. আবার এটি টান করুন.
+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/setup/doctype/email_digest/email_digest.py +104,Summary for this week and pending activities,এই সপ্তাহে এবং স্থগিত কার্যক্রম জন্য সারসংক্ষেপ
+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","কমা দ্বারা পৃথকীকৃত লিখুন ইমেইল আইডি, চালান নির্দিষ্ট তারিখে স্বয়ংক্রিয়ভাবে পাঠানো হবে"
 DocType: Employee,Company Email,কোম্পানি ইমেইল
@@ -354,27 +360,28 @@
 apps/erpnext/erpnext/config/hr.py +186,"Employee designation (e.g. CEO, Director etc.).","কর্মচারী উপাধি (যেমন সিইও, পরিচালক ইত্যাদি)."
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,প্রবেশ ক্ষেত্রের মান &#39;দিন মাস পুনরাবৃত্তি&#39; দয়া করে
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"গ্রাহক একক গ্রাহকের বেস কারেন্সি রূপান্তরিত হয়, যা এ হার"
-apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},সারি # {0}: ক্রয় চালান একটি বিদ্যমান সম্পদ বিরুদ্ধে করা যাবে না {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +554,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},সারি # {0}: ক্রয় চালান একটি বিদ্যমান সম্পদ বিরুদ্ধে করা যাবে না {1}
 DocType: Item Tax,Tax Rate,করের হার
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} ইতিমধ্যে কর্মচারী জন্য বরাদ্দ {1} সময়ের {2} জন্য {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +812,Select Item,পছন্দ করো
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +791,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/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,চালান {0} ইতিমধ্যেই জমা ক্রয়
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},সারি # {0}: ব্যাচ কোন হিসাবে একই হতে হবে {1} {2}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +143,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.,একটি আইটেম এর ব্যাচ (অনেক).
 DocType: C-Form Invoice Detail,Invoice Date,চালান তারিখ
 DocType: GL Entry,Debit Amount,ডেবিট পরিমাণ
 apps/erpnext/erpnext/accounts/party.py +242,There can only be 1 Account per Company in {0} {1},শুধুমাত্র এ কোম্পানির প্রতি 1 অ্যাকাউন্ট থাকতে পারে {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +4,Your email address,আপনার ইমেইল ঠিকানা
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +342,Please see attachment,অনুগ্রহ পূর্বক সংযুক্তি দেখুন
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,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 +19,Setup Already Complete!!,সেটআপ ইতিমধ্যে সম্পূর্ণ !!
 ,Finished Goods,সমাপ্ত পণ্য
 DocType: Delivery Note,Instructions,নির্দেশনা
 DocType: Quality Inspection,Inspected By,পরিদর্শন
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,সরবরাহকারী&gt; সরবরাহকারী প্রকার
 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,উপকরণ অ্যাড
@@ -388,29 +395,29 @@
 DocType: Currency Exchange,Currency Exchange,টাকা অদলবদল
 DocType: Purchase Invoice Item,Item Name,আইটেম নাম
 DocType: Authorization Rule,Approving User  (above authorized value),(কঠিন মূল্য উপরে) ব্যবহারকারী অনুমোদন
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,ক্রেডিট ব্যালেন্স
+DocType: Email Digest,Credit Balance,ক্রেডিট ব্যালেন্স
 DocType: Employee,Widowed,পতিহীনা
 DocType: Request for Quotation,Request for Quotation,উদ্ধৃতি জন্য অনুরোধ
 DocType: Salary Slip Timesheet,Working Hours,কর্মঘন্টা
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,একটি বিদ্যমান সিরিজের শুরু / বর্তমান ক্রম সংখ্যা পরিবর্তন করুন.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.",একাধিক দামে ব্যাপা চলতে থাকে তবে ব্যবহারকারীরা সংঘাতের সমাধান করতে নিজে অগ্রাধিকার সেট করতে বলা হয়.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +736,Purchase Return,ক্রয় প্রত্যাবর্তন
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +715,Purchase Return,ক্রয় প্রত্যাবর্তন
 ,Purchase Register,ক্রয় নিবন্ধন
 DocType: 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 +202,{0} ({1}) must have role 'Leave Approver',{0} ({1}) ভূমিকা থাকতে হবে &#39;ছুটি রাজসাক্ষী&#39;
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,{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 +143,Reason for losing,হারানোর জন্য কারণ
-apps/erpnext/erpnext/accounts/utils.py +239,Allocated amount can not greater than unadjusted amount,বরাদ্দ পরিমাণ অনিয়ন্ত্রিত পরিমাণ তার চেয়ে অনেক বেশী করতে পারেন না
+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,বরাদ্দ পরিমাণ অনিয়ন্ত্রিত পরিমাণ তার চেয়ে অনেক বেশী করতে পারেন না
 DocType: Announcement,Receiver,গ্রাহক
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},ওয়ার্কস্টেশন ছুটির তালিকা অনুযায়ী নিম্নলিখিত তারিখগুলি উপর বন্ধ করা হয়: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,সুযোগ
 DocType: Employee,Single,একক
 DocType: Account,Cost of Goods Sold,বিক্রি সামগ্রীর খরচ
 DocType: Purchase Invoice,Yearly,বাত্সরিক
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +225,Please enter Cost Center,খরচ কেন্দ্র লিখুন দয়া করে
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,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,পরীক্ষক নাম
@@ -423,26 +430,26 @@
 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,চেক সরবরাহকারী চালান নম্বর স্বতন্ত্রতা
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','কেস নংপর্যন্ত' কখনই 'কেস নং থেকে' এর চেয়ে কম হতে পারে না
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,Non Profit,মুনাফা বিহীন
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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: Stock Reconciliation Item,Do not include symbols (ex. $),চিহ্ন অন্তর্ভুক্ত করবেন না (প্রাক্তন. $)
 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 +638,Attribute {0} selected multiple times in Attributes Table,গুন {0} আরোপ ছক মধ্যে একাধিক বার নির্বাচিত
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,গুন {0} আরোপ ছক মধ্যে একাধিক বার নির্বাচিত
 DocType: HR Settings,Employee record is created using selected field. ,কর্মচারী রেকর্ড নির্বাচিত ক্ষেত্র ব্যবহার করে নির্মিত হয়.
 DocType: Sales Order,Not Applicable,প্রযোজ্য নয়
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,হলিডে মাস্টার.
 DocType: Request for Quotation Item,Required Date,প্রয়োজনীয় তারিখ
 DocType: Delivery Note,Billing Address,বিলিং ঠিকানা
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +862,Please enter Item Code.,আইটেম কোড প্রবেশ করুন.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +847,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","চেক যদি ইতিমধ্যে প্রিন্ট হার / প্রিন্ট পরিমাণ অন্তর্ভুক্ত হিসাবে, ট্যাক্স পরিমাণ বিবেচনা করা হবে"
@@ -456,12 +463,12 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,সিকিউরিটিজ এবং আমানত
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,বরাদ্দ মোট পাতার বাধ্যতামূলক
 DocType: Job Opening,Description of a Job Opening,একটি কাজের খোলার বর্ণনা
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Pending activities for today,আজকের জন্য মুলতুবি কার্যক্রম
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,আজকের জন্য মুলতুবি কার্যক্রম
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,উপস্থিতি দলিল.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,শ্রমিকের খাটুনিঘণ্টা লিপিবদ্ধ কার্ড ভিত্তিক মাইনে জন্য বেতন কম্পোনেন্ট.
 DocType: Sales Order Item,Used for Production Plan,উৎপাদন পরিকল্পনা জন্য ব্যবহৃত
 DocType: Manufacturing Settings,Time Between Operations (in mins),(মিনিট) অপারেশনস মধ্যে সময়
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +92,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} অ্যাকাউন্ট {1} মূল্য কেন্দ্র বিরুদ্ধে বােজট {2} হয় {3}. এটা দ্বারা অতিক্রম করবে {4}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +95,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} অ্যাকাউন্ট {1} মূল্য কেন্দ্র বিরুদ্ধে বােজট {2} হয় {3}. এটা দ্বারা অতিক্রম করবে {4}
 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 একই আইটেমের জন্য নয়
@@ -469,16 +476,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +238,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 +86,Administrative Officer,প্রশাসনিক কর্মকর্তা
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,প্রশাসনিক কর্মকর্তা
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +23,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 +319,Please select Company,কোম্পানি নির্বাচন করুন
-DocType: Stock Entry,Difference Account,পার্থক্য অ্যাকাউন্ট
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +309,Please select Company,কোম্পানি নির্বাচন করুন
+DocType: Stock Entry Detail,Difference Account,পার্থক্য অ্যাকাউন্ট
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,তার নির্ভরশীল টাস্ক {0} বন্ধ না হয় বন্ধ টাস্ক না পারেন.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Please enter Warehouse for which Material Request will be raised,"উপাদান অনুরোধ উত্থাপিত হবে, যার জন্য গুদাম লিখুন দয়া করে"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +399,Please enter Warehouse for which Material Request will be raised,"উপাদান অনুরোধ উত্থাপিত হবে, যার জন্য গুদাম লিখুন দয়া করে"
 DocType: Production Order,Additional Operating Cost,অতিরিক্ত অপারেটিং খরচ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,অঙ্গরাগ
-apps/erpnext/erpnext/stock/doctype/item/item.py +530,"To merge, following properties must be same for both items",মার্জ করার জন্য নিম্নলিখিত বৈশিষ্ট্য উভয় আইটেম জন্য একই হতে হবে
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,"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 +28,Buy,কেনা
@@ -486,7 +493,7 @@
 DocType: Sales Invoice,Offline POS Name,অফলাইন পিওএস নাম
 DocType: Sales Order,To Deliver,প্রদান করা
 DocType: Purchase Invoice Item,Item,আইটেম
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1563,Serial no item cannot be a fraction,সিরিয়াল কোন আইটেমের একটি ভগ্নাংশ হতে পারে না
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1587,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,ম্যানেজিং প্রণীত
@@ -495,13 +502,14 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Account {0} does not belong to company: {1},{0} অ্যাকাউন্ট কোম্পানি অন্তর্গত নয়: {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation already used for another company,সমাহার ইতিমধ্যে অন্য কোম্পানীর জন্য ব্যবহৃত
 DocType: Selling Settings,Default Customer Group,ডিফল্ট গ্রাহক গ্রুপ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Supplier is required against Payable account {0},সরবরাহকারী প্রদেয় অ্যাকাউন্ট বিরুদ্ধে প্রয়োজন বোধ করা হয় {0}
 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 হতে পারবেন না
 DocType: Production Planning Tool,Material Requirement,উপাদান প্রয়োজন
 DocType: Company,Delete Company Transactions,কোম্পানি লেনদেন মুছে
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +313,Reference No and Reference Date is mandatory for Bank transaction,রেফারেন্স কোন ও রেফারেন্স তারিখ ব্যাংক লেনদেনের জন্য বাধ্যতামূলক
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +316,Reference No and Reference Date is mandatory for Bank transaction,রেফারেন্স কোন ও রেফারেন্স তারিখ ব্যাংক লেনদেনের জন্য বাধ্যতামূলক
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,/ সম্পাদনা কর ও চার্জ যোগ
 DocType: Purchase Invoice,Supplier Invoice No,সরবরাহকারী চালান কোন
 DocType: Territory,For reference,অবগতির জন্য
@@ -512,7 +520,6 @@
 DocType: Installation Note Item,Installation Note Item,ইনস্টলেশন নোট আইটেম
 DocType: Production Plan Item,Pending Qty,মুলতুবি Qty
 DocType: Budget,Ignore,উপেক্ষা করা
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,আইটেম কোড&gt; আইটেম গ্রুপ&gt; ব্র্যান্ড
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,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,বেতন স্লিপ শ্রমিকের খাটুনিঘণ্টা লিপিবদ্ধ কার্ড
@@ -523,11 +530,11 @@
 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/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,চালান টেবিল অন্তর্ভুক্ত কোন রেকর্ড
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +28,Please select Company and Party Type first,প্রথম কোম্পানি ও অনুষ্ঠান প্রকার নির্বাচন করুন
+apps/erpnext/erpnext/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/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 +707,Make Sales Order,বিক্রয় আদেশ তৈরি করুন
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +701,Make Sales Order,বিক্রয় আদেশ তৈরি করুন
 DocType: Project Task,Project Task,প্রকল্প টাস্ক
 ,Lead Id,লিড আইডি
 DocType: C-Form Invoice Detail,Grand Total,সর্বমোট
@@ -543,7 +550,8 @@
 DocType: Job Applicant,Resume Attachment,পুনঃসূচনা সংযুক্তি
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,পুনরাবৃত্ত গ্রাহকদের
 DocType: Leave Control Panel,Allocate,বরাদ্দ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +734,Sales Return,সেলস প্রত্যাবর্তন
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +728,Sales Return,সেলস প্রত্যাবর্তন
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +91,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,দ্রষ্টব্য: মোট বরাদ্দ পাতা {0} ইতিমধ্যে অনুমোদন পাতার চেয়ে কম হওয়া উচিত নয় {1} সময়ের জন্য
 DocType: Announcement,Posted By,কারো দ্বারা কোন কিছু ডাকঘরে পাঠানো
 DocType: Item,Delivered by Supplier (Drop Ship),সরবরাহকারীকে বিতরণ (ড্রপ জাহাজ)
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,সম্ভাব্য গ্রাহকদের ডাটাবেস.
@@ -552,14 +560,13 @@
 DocType: Quotation,Quotation To,উদ্ধৃতি
 DocType: Lead,Middle Income,মধ্য আয়
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +212,Opening (Cr),খোলা (যোগাযোগ Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +795,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,আপনি ইতিমধ্যে অন্য UOM সঙ্গে কিছু লেনদেন (গুলি) করেছেন কারণ আইটেম জন্য মেজার ডিফল্ট ইউনিট {0} সরাসরি পরিবর্তন করা যাবে না. আপনি একটি ভিন্ন ডিফল্ট UOM ব্যবহার করার জন্য একটি নতুন আইটেম তৈরি করতে হবে.
-apps/erpnext/erpnext/accounts/utils.py +237,Allocated amount can not be negative,বরাদ্দ পরিমাণ নেতিবাচক হতে পারে না
+apps/erpnext/erpnext/stock/doctype/item/item.py +797,Default Unit of Measure for Item {0} cannot be changed directly because 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,বরাদ্দ পরিমাণ নেতিবাচক হতে পারে না
 DocType: Purchase Order Item,Billed 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 +91,Reference No & Reference Date is required for {0},রেফারেন্স কোন ও রেফারেন্স তারিখ জন্য প্রয়োজন বোধ করা হয় {0}
-DocType: Sales Invoice,Customer's Vendor,গ্রাহকের বিক্রেতার
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Proposal Writing,প্রস্তাবনা লিখন
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,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","তাহলে যে আইটেম উপ-সংকুচিত উপাদান অনুরোধ মধ্যে অন্তর্ভুক্ত করা হবে জন্য চেক, কাঁচামাল"
@@ -568,13 +575,14 @@
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,সময় ট্র্যাকিং
 DocType: Fiscal Year Company,Fiscal Year Company,অর্থবছরের কোম্পানি
 DocType: Packing Slip Item,DN Detail,ডিএন বিস্তারিত
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +257,Already supplier quotation has created,ইতিমধ্যে সরবরাহকারী উদ্ধৃতি সৃষ্টি করেছেন
 DocType: Timesheet,Billed,বিল
 DocType: Batch,Batch Description,ব্যাচ বিবরণ
+apps/erpnext/erpnext/accounts/utils.py +685,"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 +733,View Offline Records,অফলাইন রেকর্ডস
+apps/erpnext/erpnext/accounts/page/pos/pos.js +715,View Offline Records,অফলাইন রেকর্ডস
+DocType: Student,Sibling Details,সহোদর বিস্তারিত
 DocType: Employee,Reason for Resignation,পদত্যাগ করার কারণ
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,কর্মক্ষমতা মূল্যায়ন জন্য টেমপ্লেট.
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,চালান / জার্নাল এন্ট্রি বিস্তারিত
@@ -588,7 +596,7 @@
 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,পরিসংখ্যা মধ্যে নিট পরিবর্তন
 DocType: Employee,Passport Number,পাসপোর্ট নম্বার
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Manager,ম্যানেজার
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,ম্যানেজার
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,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,'গ্রুপ দ্বারা' এবং 'উপর ভিত্তি করে' একই হতে পারে না
@@ -597,10 +605,11 @@
 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 +299,Timesheet created:,শ্রমিকের খাটুনিঘণ্টা লিপিবদ্ধ কার্ড তৈরি করা হয়েছে:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +715,Please set default Cash or Bank account in Mode of Payment {0},পেমেন্ট মোডে ডিফল্ট ক্যাশ বা ব্যাংক একাউন্ট সেট করুন {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +300,Timesheet created:,শ্রমিকের খাটুনিঘণ্টা লিপিবদ্ধ কার্ড তৈরি করা হয়েছে:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +772,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,নথিভুক্ত করা
 DocType: Selling Settings,Customer Naming By,গ্রাহক নেমিং
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,অনুগ্রহ করে সেটআপ কর্মচারী হিউম্যান রিসোর্স মধ্যে নামকরণ সিস্টেম&gt; এইচআর সেটিংস
 DocType: Depreciation Schedule,Depreciation Amount,অবচয় পরিমাণ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,গ্রুপ রূপান্তর
 DocType: Activity Cost,Activity Type,কার্যকলাপ টাইপ
@@ -625,6 +634,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,শেষ
 DocType: Pricing Rule,Sales Manager,বিক্রয় ব্যবস্থাপক
 DocType: Salary Structure Employee,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,অ্যাসেট নিষ্পত্তির লাভ / ক্ষতির হিসাব
@@ -639,11 +649,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +9,Pre Sales,প্রাক সেলস
 DocType: Purchase Receipt,Other Details,অন্যান্য বিস্তারিত
 DocType: Account,Accounts,অ্যাকাউন্ট
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Marketing,মার্কেটিং
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +227,Payment Entry is already created,পেমেন্ট ভুক্তি ইতিমধ্যে তৈরি করা হয়
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,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 +538,Row #{0}: Asset {1} does not linked to Item {2},সারি # {0}: অ্যাসেট {1} আইটেম লিঙ্ক নেই {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +21,Preview Salary Slip,প্রি বেতন স্লিপ
+apps/erpnext/erpnext/controllers/accounts_controller.py +541,Row #{0}: Asset {1} does not linked to Item {2},সারি # {0}: অ্যাসেট {1} আইটেম লিঙ্ক নেই {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +38,Preview Salary Slip,প্রি বেতন স্লিপ
 DocType: Company,Deafult Cost Center,Deafult মূল্য কেন্দ্র
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +48,Account {0} has been entered multiple times,অ্যাকাউন্ট {0} একাধিক বার প্রবেশ করানো হয়েছে
 DocType: Account,Expenses Included In Valuation,খরচ মূল্যনির্ধারণ অন্তর্ভুক্ত
@@ -652,7 +662,7 @@
 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 +617,Item has variants.,আইটেম ভিন্নতা আছে.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,আইটেম ভিন্নতা আছে.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,আইটেম {0} পাওয়া যায়নি
 DocType: Bin,Stock Value,স্টক মূল্য
 apps/erpnext/erpnext/accounts/doctype/account/account.py +25,Company {0} does not exist,কোম্পানির {0} অস্তিত্ব নেই
@@ -672,7 +682,7 @@
 DocType: Purchase Order,Supply Raw Materials,সাপ্লাই কাঁচামালের
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,পরের চালান তৈরি করা হবে কোন তারিখে. এটি জমা দিতে হবে নির্মাণ করা হয়.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,চলতি সম্পদ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,{0} is not a stock Item,{0} একটি স্টক আইটেম নয়
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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 +169,Lead must be set if Opportunity is made from Lead,সুযোগ লিড থেকে তৈরি করা হয় তাহলে লিড নির্ধারণ করা আবশ্যক
@@ -739,26 +749,25 @@
 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 +709,No Permission,অনুমতি নেই
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +710,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}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +298,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 +542,Row #{0}: Asset {1} must be submitted,সারি # {0}: অ্যাসেট {1} দাখিল করতে হবে
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,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 মাধ্যমে স্টক ব্যালেন্স আপলোড করুন.
 DocType: Warehouse,Tree Details,বৃক্ষ বিস্তারিত
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,এখন পাঠান
 ,Support Analytics,সাপোর্ট অ্যানালিটিক্স
 DocType: Item,Website Warehouse,ওয়েবসাইট ওয়্যারহাউস
 DocType: Payment Reconciliation,Minimum Invoice Amount,নূন্যতম চালান পরিমাণ
 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/sales_invoice/sales_invoice.py +227,Timesheet {0} is already completed or cancelled,শ্রমিকের খাটুনিঘণ্টা লিপিবদ্ধ কার্ড {0} ইতিমধ্যে সম্পন্ন বা বাতিল করা হয়েছে
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +259,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 থেকে কম বা সমান হবে
@@ -774,13 +783,13 @@
 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 +229,Target Warehouse,উদ্দিষ্ট ওয়্যারহাউস
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +230,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-,STE-
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Sales Order Date,প্রত্যাশিত প্রসবের তারিখ বিক্রয় আদেশ তারিখের আগে হতে পারে না
 DocType: Upload Attendance,Import Attendance,আমদানি এ্যাটেনডেন্স
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,সকল আইটেম গ্রুপ
+apps/erpnext/erpnext/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/config/setup.py +89,Automatically compose message on submission of transactions.,স্বয়ংক্রিয়ভাবে লেনদেন জমা বার্তা রচনা.
@@ -792,13 +801,15 @@
 DocType: Sales Invoice,Payment Due Date,পরিশোধযোগ্য তারিখ
 apps/erpnext/erpnext/stock/doctype/item/item.js +278,Item Variant {0} already exists with same attributes,আইটেম ভেরিয়েন্ট {0} ইতিমধ্যে একই বৈশিষ্ট্যাবলী সঙ্গে বিদ্যমান
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',' শুরু'
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,কি জন্য উন্মুক্ত
 DocType: Notification Control,Delivery Note Message,হুণ্ডি পাঠান
 DocType: Expense Claim,Expenses,খরচ
 DocType: Item Variant Attribute,Item Variant Attribute,আইটেম ভেরিয়েন্ট গুন
 ,Purchase Receipt Trends,কেনার রসিদ প্রবণতা
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Research & Development,গবেষণা ও উন্নয়ন
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,গবেষণা ও উন্নয়ন
 ,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,দাম বা ডিসকাউন্ট
@@ -807,7 +818,7 @@
 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/controllers/accounts_controller.py +340,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","পেমেন্ট এণ্ট্রি {0} অর্ডার {1}, চেক যদি এটা এই চালান অগ্রিম হিসেবে টানা করা উচিত বিরুদ্ধে সংযুক্ত করা হয়."
+apps/erpnext/erpnext/controllers/accounts_controller.py +343,"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,বিক্রয় বিন্দু
@@ -829,12 +840,12 @@
 DocType: Supplier Quotation,Is Subcontracted,আউটসোর্স হয়
 DocType: Item Attribute,Item Attribute Values,আইটেম বৈশিষ্ট্য মূল্যবোধ
 DocType: Examination Result,Examination Result,পরীক্ষার ফলাফল
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +756,Purchase Receipt,কেনার রশিদ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +735,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 +167,Reference Doctype must be one of {0},রেফারেন্স DOCTYPE এক হতে হবে {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +282,Unable to find Time Slot in the next {0} days for Operation {1},অপারেশন জন্য পরের {0} দিন টাইম স্লটে এটি অক্ষম {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +170,Reference Doctype must be one of {0},রেফারেন্স DOCTYPE এক হতে হবে {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Unable to find Time Slot in the next {0} days for Operation {1},অপারেশন জন্য পরের {0} দিন টাইম স্লটে এটি অক্ষম {1}
 DocType: Production Order,Plan material for sub-assemblies,উপ-সমাহারকে পরিকল্পনা উপাদান
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,সেলস অংশীদার এবং টেরিটরি
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be active,BOM {0} সক্রিয় হতে হবে
@@ -845,7 +856,7 @@
 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 +214,Warehouses with existing transaction can not be converted to ledger.,বিদ্যমান লেনদেনের সঙ্গে গুদাম খাতা থেকে রূপান্তর করা যাবে না.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +217,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,উত্পাদনের আদেশ
@@ -859,9 +870,9 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,{0} কর্মচারী সক্রিয় নয় বা কোন অস্তিত্ব নেই
 DocType: Fee Structure,Components,উপাদান
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,Please enter Asset Category in Item {0},আইটেম মধ্যে লিখুন দয়া করে অ্যাসেট শ্রেণী {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +612,Item Variants {0} updated,আইটেম রুপভেদ {0} আপডেট
+apps/erpnext/erpnext/stock/doctype/item/item.py +614,Item Variants {0} updated,আইটেম রুপভেদ {0} আপডেট
 DocType: Quality Inspection Reading,Reading 6,6 পঠন
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +843,Cannot {0} {1} {2} without any negative outstanding invoice,না {0} {1} {2} ছাড়া কোনো নেতিবাচক অসামান্য চালান Can
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +854,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,সিঙ্ক এখন
@@ -876,69 +887,72 @@
 DocType: Item,Is Purchase Item,ক্রয় আইটেম
 DocType: Asset,Purchase Invoice,ক্রয় চালান
 DocType: Stock Ledger Entry,Voucher Detail No,ভাউচার বিস্তারিত কোন
-apps/erpnext/erpnext/accounts/page/pos/pos.js +728,New Sales Invoice,নতুন সেলস চালান
+apps/erpnext/erpnext/accounts/page/pos/pos.js +710,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 +728,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: Cheque Print Template,Has Print Format,প্রিন্ট ফরম্যাট রয়েছে
-apps/erpnext/erpnext/accounts/page/pos/pos.js +86, is mandatory. Maybe Currency Exchange record is not created for ,আবশ্যক. হয়তো মুদ্রা বিনিময় রেকর্ড এজন্য তৈরি করা হয়নি
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +109,Row #{0}: Please specify Serial No for Item {1},সারি # {0}: আইটেম জন্য কোন সিরিয়াল উল্লেখ করুন {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +619,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","&#39;পণ্য সমষ্টি&#39; আইটেম, গুদাম, সিরিয়াল না এবং ব্যাচ জন্য কোন &#39;প্যাকিং তালিকা টেবিল থেকে বিবেচনা করা হবে. ওয়ারহাউস ও ব্যাচ কোন কোন &#39;পণ্য সমষ্টি&#39; আইটেমের জন্য সব প্যাকিং আইটেম জন্য একই থাকে, যারা মান প্রধান আইটেম টেবিলে সন্নিবেশ করানো যাবে, মান মেজ বোঁচকা তালিকা &#39;থেকে কপি করা হবে."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +75, 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 +613,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing 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 +606,Supplier Invoice Date cannot be greater than Posting Date,সরবরাহকারী চালান তারিখ পোস্টিং তারিখ তার চেয়ে অনেক বেশী হতে পারে না
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +609,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: 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 +810,Select Item for Transfer,স্থানান্তর জন্য নির্বাচন আইটেম
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +789,Select Item for Transfer,স্থানান্তর জন্য নির্বাচন আইটেম
 DocType: Purchase Invoice,Additional Discount Percentage,অতিরিক্ত ছাড় শতাংশ
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,সব সাহায্য ভিডিওর একটি তালিকা দেখুন
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,চেক জমা ছিল ব্যাংকের নির্বাচন অ্যাকাউন্ট মাথা.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,ব্যবহারকারী লেনদেনের মূল্য তালিকা হার সম্পাদন করার অনুমতি প্রদান
 DocType: Pricing Rule,Max Qty,সর্বোচ্চ Qty
-DocType: Student Applicant,Father's Name,বাবার নাম
 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 +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,সারি {0}: সেলস / ক্রয় আদেশের বিরুদ্ধে পেমেন্ট সবসময় অগ্রিম হিসেবে চিহ্নিত করা উচিত
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,রাসায়নিক
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +686,All items have already been transferred for this Production Order.,সকল আইটেম ইতিমধ্যে এই উৎপাদন অর্ডার জন্য স্থানান্তর করা হয়েছে.
+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} এবং আবার চেষ্টা করুন
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +694,All items have already been transferred for this Production Order.,সকল আইটেম ইতিমধ্যে এই উৎপাদন অর্ডার জন্য স্থানান্তর করা হয়েছে.
 DocType: Process Payroll,Select Payroll Year and Month,বেতনের বছর এবং মাস নির্বাচন করুন
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,Meter,মিটার
 DocType: Workstation,Electricity Cost,বিদ্যুৎ খরচ
 DocType: HR Settings,Don't send Employee Birthday Reminders,কর্মচারী জন্মদিনের রিমাইন্ডার পাঠাবেন না
-DocType: Opportunity,Walk In,প্রবেশ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,শেয়ার সাজপোশাকটি
 DocType: Item,Inspection Criteria,ইন্সপেকশন নির্ণায়ক
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,স্থানান্তরিত
 apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,আপনার চিঠি মাথা এবং লোগো আপলোড করুন. (আপনি তাদের পরে সম্পাদনা করতে পারেন).
 DocType: Timesheet Detail,Bill,বিল
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,White,সাদা
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date is entered as past date,পরবর্তী অবচয় তারিখ অতীত তারিখ হিসাবে প্রবেশ করানো হয়
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +167,White,সাদা
 DocType: SMS Center,All Lead (Open),সব নেতৃত্ব (ওপেন)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +228,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),সারি {0}: Qty জন্য পাওয়া যায় না {4} গুদামে {1} এন্ট্রির সময় পোস্টিং এ ({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}),সারি {0}: Qty জন্য পাওয়া যায় না {4} গুদামে {1} এন্ট্রির সময় পোস্টিং এ ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,উন্নতির প্রদত্ত করুন
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +731,Make ,করা
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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 +154,Order Type must be one of {0},যাতে টাইপ এক হতে হবে {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},যাতে টাইপ এক হতে হবে {0}
 DocType: Lead,Next Contact Date,পরের যোগাযোগ তারিখ
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Qty খোলা
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +393,Please enter Account for Change Amount,পরিমাণ পরিবর্তন অ্যাকাউন্ট প্রবেশ করুন
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,Please enter Account for Change Amount,পরিমাণ পরিবর্তন অ্যাকাউন্ট প্রবেশ করুন
 DocType: Student Batch,Student Batch Name,ছাত্র ব্যাচ নাম
 DocType: Holiday List,Holiday List Name,ছুটির তালিকা নাম
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js +8,Schedule Course,সূচি কোর্স
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Stock Options,বিকল্প তহবিল
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,বিকল্প তহবিল
 DocType: Journal Entry Account,Expense Claim,ব্যয় দাবি
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +211,Do you really want to restore this scrapped asset?,আপনি কি সত্যিই এই বাতিল সম্পদ পুনরুদ্ধার করতে চান না?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +237,Qty for {0},জন্য Qty {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +212,Do you really want to restore this scrapped asset?,আপনি কি সত্যিই এই বাতিল সম্পদ পুনরুদ্ধার করতে চান না?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,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,ব্লক তালিকা তারিখগুলি ছেড়ে
@@ -947,9 +961,9 @@
 DocType: Company,Default Terms,ডিফল্ট শর্তাবলী
 DocType: Packing Slip Item,Packing Slip Item,প্যাকিং স্লিপ আইটেম
 DocType: Purchase Invoice,Cash/Bank Account,নগদ / ব্যাংক অ্যাকাউন্ট
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,পরিমাণ বা মান কোন পরিবর্তনের সঙ্গে সরানো আইটেম.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,পরিমাণ বা মান কোন পরিবর্তনের সঙ্গে সরানো আইটেম.
 DocType: Delivery Note,Delivery To,বিতরণ
-apps/erpnext/erpnext/stock/doctype/item/item.py +635,Attribute table is mandatory,গুন টেবিল বাধ্যতামূলক
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,গুন টেবিল বাধ্যতামূলক
 DocType: Production Planning Tool,Get Sales Orders,বিক্রয় আদেশ পান
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} নেতিবাচক হতে পারে না
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,অনুগ্রহ করে একটি ছাত্র নির্বাচন
@@ -974,7 +988,7 @@
 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,WIP ওয়্যারহাউস
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},সিরিয়াল কোন {0} পর্যন্ত রক্ষণাবেক্ষণ চুক্তির অধীন হয় {1}
+apps/erpnext/erpnext/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,প্রতিষ্ঠানের নাম
@@ -986,7 +1000,7 @@
 DocType: GL Entry,Against,বিরুদ্ধে
 DocType: Item,Default Selling Cost Center,ডিফল্ট বিক্রি খরচ কেন্দ্র
 DocType: Sales Partner,Implementation Partner,বাস্তবায়ন অংশীদার
-apps/erpnext/erpnext/controllers/selling_controller.py +231,Sales Order {0} is {1},বিক্রয় আদেশ {0} হল {1}
+apps/erpnext/erpnext/controllers/selling_controller.py +232,Sales Order {0} is {1},বিক্রয় আদেশ {0} হল {1}
 DocType: Opportunity,Contact Info,যোগাযোগের তথ্য
 apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,শেয়ার দাখিলা তৈরীর
 DocType: Packing Slip,Net Weight UOM,নিট ওজন UOM
@@ -996,25 +1010,24 @@
 DocType: Holiday List,Get Weekly Off Dates,সাপ্তাহিক ছুটি তারিখগুলি করুন
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,শেষ তারিখ জন্ম কম হতে পারে না
 DocType: Sales Person,Select company name first.,প্রথমটি বেছে নিন কোম্পানির নাম.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Dr,ডাঃ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Dr,ডাঃ
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,এবার সরবরাহকারী থেকে প্রাপ্ত.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},করুন {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,গড় বয়স
 DocType: 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/templates/pages/home.html +32,View All Products,সকল পণ্য দেখুন
+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 +400,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,সতর্কতা: সিস্টেম আইটেম জন্য পরিমাণ যেহেতু overbilling পরীক্ষা করা হবে না {0} মধ্যে {1} শূন্য
+apps/erpnext/erpnext/controllers/accounts_controller.py +403,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/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,এবং বছর:
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +191,{0} {1} must be submitted,{0} {1} দাখিল করতে হবে
-DocType: Email Digest,Annual Expense,বার্ষিক ব্যয়
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,{0} {1} must be submitted,{0} {1} দাখিল করতে হবে
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +145,Quantity must be less than or equal to {0},পরিমাণ থেকে কম বা সমান হতে হবে {0}
 DocType: SMS Center,Total Characters,মোট অক্ষর
 apps/erpnext/erpnext/controllers/buying_controller.py +156,Please select BOM in BOM field for Item {0},আইটেম জন্য BOM ক্ষেত্রের মধ্যে BOM নির্বাচন করুন {0}
@@ -1025,30 +1038,31 @@
 DocType: Sales Partner,Distributor,পরিবেশক
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,শপিং কার্ট শিপিং রুল
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +211,Production Order {0} must be cancelled before cancelling this Sales Order,উৎপাদন অর্ডার {0} এই সেলস অর্ডার বাতিলের আগে বাতিল করা হবে
-apps/erpnext/erpnext/public/js/controllers/transaction.js +62,Please set 'Apply Additional Discount On',সেট &#39;অতিরিক্ত ডিসকাউন্ট প্রযোজ্য&#39; দয়া করে
+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,বিন্যাস কম হতে হয়েছে থেকে চেয়ে পরিসীমা
 DocType: Global Defaults,Global Defaults,আন্তর্জাতিক ডিফল্ট
 apps/erpnext/erpnext/projects/doctype/project/project.py +153,Project Collaboration Invitation,প্রকল্প সাহায্য আমন্ত্রণ
 DocType: Salary Slip,Deductions,Deductions
+DocType: Leave Allocation,LAL/,LAL /
 apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,শুরুর বছর
 DocType: Purchase Invoice,Start date of current invoice's period,বর্তমান চালান এর সময়সীমার তারিখ শুরু
 DocType: Salary Slip,Leave Without Pay,পারিশ্রমিক বিহীন ছুটি
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +327,Capacity Planning Error,ক্ষমতা পরিকল্পনা ত্রুটি
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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 +362,Finished Item {0} must be entered for Manufacture type entry,সমাপ্ত আইটেম {0} প্রস্তুত টাইপ এন্ট্রির জন্য প্রবেশ করতে হবে
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +367,Finished Item {0} must be entered for Manufacture type entry,সমাপ্ত আইটেম {0} প্রস্তুত টাইপ এন্ট্রির জন্য প্রবেশ করতে হবে
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,খোলা অ্যাকাউন্টিং ব্যালান্স
 DocType: Sales Invoice Advance,Sales Invoice Advance,বিক্রয় চালান অগ্রিম
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +499,Nothing to request,কিছুই অনুরোধ করতে
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +500,Nothing to request,কিছুই অনুরোধ করতে
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','প্রকৃত আরম্ভের তারিখ' কখনই 'প্রকৃত শেষ তারিখ' থেকে বেশি হতে পারে না
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Management,ম্যানেজমেন্ট
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},উভয় ক্ষেত্রেই ডেবিট বা ক্রেডিট পরিমাণ জন্য প্রয়োজন বোধ করা হয় {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,ম্যানেজমেন্ট
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +55,Either debit or credit amount is required for {0},উভয় ক্ষেত্রেই ডেবিট বা ক্রেডিট পরিমাণ জন্য প্রয়োজন বোধ করা হয় {0}
 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 +161,Blue,নীল
+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,ইমেইল আইডি সেট করুন
@@ -1058,12 +1072,12 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +23,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,ডিফল্ট আইটেম গ্রুপ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1374,Do you really want to submit the invoice?,আপনি সত্যিই চালান জমা দিতে চান?
+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 +685,Cost Center For Item with Item Code ',&#39;আইটেম কোড দিয়ে আইটেমের জন্য কেন্দ্র উড়ানের তালিকাটি
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1526,"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 +679,Cost Center For Item with Item Code ',&#39;আইটেম কোড দিয়ে আইটেমের জন্য কেন্দ্র উড়ানের তালিকাটি
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1550,"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 +26,"Further accounts can be made under Groups, but entries can be made against non-Groups","আরও অ্যাকাউন্ট দলের অধীনে করা যেতে পারে, কিন্তু এন্ট্রি অ গ্রুপের বিরুদ্ধে করা যেতে পারে"
 DocType: Lead,Lead,লিড
@@ -1083,104 +1097,106 @@
 DocType: Payment Reconciliation,Unreconciled Payment Details,অসমর্পিত পেমেন্ট বিবরণ
 DocType: Global Defaults,Current Fiscal Year,চলতি অর্থবছরের
 DocType: Global Defaults,Disable Rounded Total,গোলাকৃতি মোট অক্ষম
-DocType: Lead,Call,কল
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +417,'Entries' cannot be empty,&#39;এন্ট্রি&#39; খালি রাখা যাবে না
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +418,'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 +214,Fiscal Year {0} not found,অর্থবছরের {0} পাওয়া যায়নি
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +221,Fiscal Year {0} not found,অর্থবছরের {0} পাওয়া যায়নি
 apps/erpnext/erpnext/config/hr.py +238,Setting up Employees,এমপ্লয়িজ স্থাপনের
 DocType: Sales Order,SO-,SO-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,প্রথম উপসর্গ নির্বাচন করুন
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Please select prefix first,প্রথম উপসর্গ নির্বাচন করুন
 DocType: Employee,O-,o-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Research,গবেষণা
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,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 +43,Item {0} must be a non-stock item,আইটেম {0} একটি অ স্টক আইটেমটি হতে হবে
 DocType: Contact,User ID,ব্যবহারকারী আইডি
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +57,View Ledger,দেখুন লেজার
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,পুরনো
-apps/erpnext/erpnext/stock/doctype/item/item.py +504,"An Item Group exists with same name, please change the item name or rename the item group","একটি আইটেম গ্রুপ একই নামের সঙ্গে বিদ্যমান, আইটেমের নাম পরিবর্তন বা আইটেম গ্রুপ নামান্তর করুন"
+apps/erpnext/erpnext/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 +437,Rest Of The World,বিশ্বের বাকি
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,আইটেম {0} ব্যাচ থাকতে পারে না
 ,Budget Variance Report,বাজেট ভেদাংক প্রতিবেদন
 DocType: Salary Slip,Gross Pay,গ্রস পে
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +90,Row {0}: Activity Type is mandatory.,সারি {0}: কার্যকলাপ প্রকার বাধ্যতামূলক.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +114,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/public/js/controllers/stock_controller.js +40,Accounting Ledger,অ্যাকাউন্টিং লেজার
+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,ধরে রাখা উপার্জন
 DocType: BOM Item,Item Description,পন্নের বর্ণনা
+DocType: Student Sibling,Student Sibling,ছাত্র অমুসলিম
 DocType: Purchase Invoice,Is Recurring,পুনরাবৃত্ত হয়
 DocType: Purchase Invoice,Supplied Items,সরবরাহকৃত চলছে
 DocType: Student,STUD.,প্রজননের জন্য নিযুক্ত.
 DocType: Production Order,Qty To Manufacture,উত্পাদনপ্রণালী Qty
+DocType: Email Digest,New Income,নতুন আয়
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,কেনার চক্র সারা একই হার বজায় রাখা
 DocType: Opportunity Item,Opportunity Item,সুযোগ আইটেম
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,অস্থায়ী খোলা
 ,Employee Leave Balance,কর্মচারী ছুটি ভারসাম্য
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +131,Balance for Account {0} must always be {1},অ্যাকাউন্টের জন্য ব্যালেন্স {0} সবসময় হতে হবে {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +175,Valuation Rate required for Item in row {0},মূল্যনির্ধারণ হার সারিতে আইটেম জন্য প্রয়োজনীয় {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,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,উদাহরণ: কম্পিউটার বিজ্ঞানে মাস্টার্স
 DocType: Purchase Invoice,Rejected Warehouse,পরিত্যক্ত গুদাম
 DocType: GL Entry,Against Voucher,ভাউচার বিরুদ্ধে
 DocType: Item,Default Buying Cost Center,ডিফল্ট রাজধানীতে খরচ কেন্দ্র
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","ERPNext শ্রেষ্ঠ আউট পেতে, আমরা আপনার জন্য কিছু সময় লাগতে এবং এইসব সাহায্যের ভিডিও দেখতে যে সুপারিশ."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +87, to ,থেকে
+apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,থেকে
 DocType: Item,Lead Time in days,দিন সময় লিড
 ,Accounts Payable Summary,অ্যাকাউন্ট প্রদেয় সংক্ষিপ্ত
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Not authorized to edit frozen Account {0},হিমায়িত অ্যাকাউন্ট সম্পাদনা করার জন্য অনুমোদিত নয় {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},হিমায়িত অ্যাকাউন্ট সম্পাদনা করার জন্য অনুমোদিত নয় {0}
 DocType: Journal Entry,Get Outstanding Invoices,অসামান্য চালানে পান
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +62,Sales Order {0} is not valid,বিক্রয় আদেশ {0} বৈধ নয়
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,বিক্রয় আদেশ {0} বৈধ নয়
 apps/erpnext/erpnext/setup/doctype/company/company.py +185,"Sorry, companies cannot be merged","দুঃখিত, কোম্পানি মার্জ করা যাবে না"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +139,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",মোট ইস্যু / স্থানান্তর পরিমাণ {0} উপাদান অনুরোধ মধ্যে {1} \ আইটেম জন্য অনুরোধ পরিমাণ {2} তার চেয়ে অনেক বেশী হতে পারে না {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Small,ছোট
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,Small,ছোট
 DocType: Employee,Employee Number,চাকুরিজীবী সংখ্যা
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},মামলা নং (গুলি) ইতিমধ্যে ব্যবহারে রয়েছে. মামলা নং থেকে কর {0}
 ,Invoiced Amount (Exculsive Tax),Invoiced পরিমাণ (Exculsive ট্যাক্স)
-DocType: Student Applicant,Mother's / Guardian 1 Email ID,মাদার&#39;স / গার্ডিয়ান 1 ইমেল আইডি
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,আইটেম 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,অ্যাকাউন্ট মাথা {0} সৃষ্টি
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +160,Green,সবুজ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,সবুজ
 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 +57,Contract,চুক্তি
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,চুক্তি
 DocType: Email Digest,Add Quote,উক্তি করো
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +498,UOM coversion factor required for UOM: {0} in Item: {1},UOM জন্য প্রয়োজন UOM coversion ফ্যাক্টর: {0} আইটেম: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +503,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 +80,Row {0}: Qty is mandatory,সারি {0}: Qty বাধ্যতামূলক
+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 +737,Sync Master Data,সিঙ্ক মাস্টার ডেটা
+apps/erpnext/erpnext/accounts/page/pos/pos.js +719,Sync Master Data,সিঙ্ক মাস্টার ডেটা
 apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,আপনার পণ্য বা সেবা
 DocType: Mode of Payment,Mode of Payment,পেমেন্ট মোড
 apps/erpnext/erpnext/stock/doctype/item/item.py +178,Website Image should be a public file or website URL,ওয়েবসাইট চিত্র একটি পাবলিক ফাইল বা ওয়েবসাইট URL হওয়া উচিত
+DocType: Student Applicant,AP,পি
 DocType: Purchase Invoice Item,BOM,BOM
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,এটি একটি root আইটেমটি গ্রুপ এবং সম্পাদনা করা যাবে না.
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,এটি একটি root আইটেমটি গ্রুপ এবং সম্পাদনা করা যাবে না.
 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 +345,"{0}: Employee email not found, hence email not sent","{0}: কর্মচারী ইমেল পাওয়া যায়নি, অত: পর না পাঠানো ই-মেইল"
+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,আপনার কোম্পানির ঠিকানা
 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 +118,"For {0}, only credit accounts can be linked against another debit entry","{0}, শুধুমাত্র ক্রেডিট অ্যাকাউন্ট অন্য ডেবিট এন্ট্রি বিরুদ্ধে সংযুক্ত করা যাবে জন্য"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Delivery Note {0} is not submitted,হুণ্ডি {0} দাখিল করা হয় না
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Delivery Note {0} is not submitted,হুণ্ডি {0} দাখিল করা হয় না
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Sub-contracted Item,আইটেম {0} একটি সাব-সংকুচিত আইটেম হতে হবে
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,ক্যাপিটাল উপকরণ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","প্রাইসিং রুল প্রথম উপর ভিত্তি করে নির্বাচন করা হয় আইটেম, আইটেম গ্রুপ বা ব্র্যান্ড হতে পারে, যা ক্ষেত্র &#39;প্রয়োগ&#39;."
 DocType: Hub Settings,Seller Website,বিক্রেতা ওয়েবসাইট
 DocType: Item,ITEM-,ITEM-
-apps/erpnext/erpnext/controllers/selling_controller.py +147,Total allocated percentage for sales team should be 100,সেলস টিম জন্য মোট বরাদ্দ শতাংশ 100 হওয়া উচিত
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +110,Production Order status is {0},উৎপাদন অর্ডার অবস্থা হয় {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,সেলস টিম জন্য মোট বরাদ্দ শতাংশ 100 হওয়া উচিত
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},উৎপাদন অর্ডার অবস্থা হয় {0}
 DocType: Appraisal Goal,Goal,লক্ষ্য
 DocType: Sales Invoice Item,Edit Description,সম্পাদনা বিবরণ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +757,For Supplier,সরবরাহকারী
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +723,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,প্রিন্ট বিন্যাস তৈরি করুন
@@ -1196,10 +1212,11 @@
 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,গ্রেড কোড
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ডাইজেস্ট ইমেল:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +445,BOM {0} does not belong to Item {1},BOM {0} আইটেম অন্তর্গত নয় {1}
 DocType: Sales Partner,Target Distribution,উদ্দিষ্ট ডিস্ট্রিবিউশনের
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1667,Deafault warehouse is required for selected item,Deafault গুদাম নির্বাচিত আইটেমের জন্য প্রয়োজন বোধ করা হয়
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Deafault warehouse is required for selected item,Deafault গুদাম নির্বাচিত আইটেমের জন্য প্রয়োজন বোধ করা হয়
 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 পড়া
@@ -1208,23 +1225,23 @@
 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 +110,Hardware,হার্ডওয়্যারের
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,হার্ডওয়্যারের
 DocType: Sales Order,Recurring Upto,পুনরাবৃত্ত পর্যন্ত
 DocType: Attendance,HR Manager,মানবসম্পদ ব্যবস্থাপক
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,একটি কোম্পানি নির্বাচন করুন
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Privilege Leave,সুবিধা বাতিল ছুটি
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,সুবিধা বাতিল ছুটি
 DocType: Purchase Invoice,Supplier Invoice Date,সরবরাহকারী চালান তারিখ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,আপনি শপিং কার্ট সক্রিয় করতে হবে
 DocType: Payment Entry,Writeoff,Writeoff
 DocType: Appraisal Template Goal,Appraisal Template Goal,মূল্যায়ন টেমপ্লেট গোল
-DocType: Salary Slip,Earning,রোজগার
+DocType: Salary Component,Earning,রোজগার
 DocType: Purchase Invoice,Party Account Currency,পক্ষের অ্যাকাউন্টে একক
 ,BOM Browser,BOM ব্রাউজার
 DocType: Purchase Taxes and Charges,Add or Deduct,করো অথবা বিয়োগ
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,মধ্যে পাওয়া ওভারল্যাপিং শর্ত:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +171,Against Journal Entry {0} is already adjusted against some other voucher,জার্নাল বিরুদ্ধে এণ্ট্রি {0} ইতিমধ্যে অন্য কিছু ভাউচার বিরুদ্ধে স্থায়ী হয়
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,জার্নাল বিরুদ্ধে এণ্ট্রি {0} ইতিমধ্যে অন্য কিছু ভাউচার বিরুদ্ধে স্থায়ী হয়
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,মোট আদেশ মান
-apps/erpnext/erpnext/demo/setup_data.py +358,Food,খাদ্য
+apps/erpnext/erpnext/demo/setup/setup_data.py +301,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/course_schedule/course_schedule.js +103,Mark Attendence,মার্ক উপস্থিতি
@@ -1258,12 +1275,12 @@
 DocType: Sales Order Item,Planned Quantity,পরিকল্পনা পরিমাণ
 DocType: Purchase Invoice Item,Item Tax Amount,আইটেমটি ট্যাক্স পরিমাণ
 DocType: Item,Maintain Stock,শেয়ার বজায়
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +209,Stock Entries already created for Production Order ,ইতিমধ্যে উৎপাদন অর্ডার নির্মিত শেয়ার সাজপোশাকটি
+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,পরিসম্পদ মধ্যে নিট পরিবর্তন
 DocType: Leave Control Panel,Leave blank if considered for all designations,সব প্রশিক্ষণে জন্য বিবেচিত হলে ফাঁকা ছেড়ে দিন
-apps/erpnext/erpnext/controllers/accounts_controller.py +620,Charge of type 'Actual' in row {0} cannot be included in Item Rate,টাইপ &#39;প্রকৃত&#39; সারিতে ভারপ্রাপ্ত {0} আইটেম রেট মধ্যে অন্তর্ভুক্ত করা যাবে না
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,Max: {0},সর্বোচ্চ: {0}
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +15,From Datetime,Datetime থেকে
+apps/erpnext/erpnext/controllers/accounts_controller.py +623,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 +239,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 +153,"Request for Quotation is disabled to access from portal, for more check portal settings.",উদ্ধৃতি জন্য অনুরোধ আরো চেক পোর্টাল সেটিংস জন্য পোর্টাল থেকে অ্যাক্সেস করতে অক্ষম হয়.
@@ -1271,8 +1288,8 @@
 DocType: Sales Invoice,Shipping Address Name,শিপিং ঠিকানা নাম
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,হিসাবরক্ষনের তালিকা
 DocType: Material Request,Terms and Conditions Content,শর্তাবলী কনটেন্ট
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +552,cannot be greater than 100,এর চেয়ে বড় 100 হতে পারে না
-apps/erpnext/erpnext/stock/doctype/item/item.py +680,Item {0} is not a stock Item,{0} আইটেম একটি স্টক আইটেম নয়
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +546,cannot be greater than 100,এর চেয়ে বড় 100 হতে পারে না
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is not a stock Item,{0} আইটেম একটি স্টক আইটেম নয়
 DocType: Maintenance Visit,Unscheduled,অনির্ধারিত
 DocType: Employee,Owned,মালিক
 DocType: Salary Detail,Depends on Leave Without Pay,বিনা বেতনে ছুটি উপর নির্ভর করে
@@ -1286,10 +1303,9 @@
 DocType: GL Entry,GL Entry,জিএল এণ্ট্রি
 DocType: HR Settings,Employee Settings,কর্মচারী সেটিংস
 ,Batch-Wise Balance History,ব্যাচ প্রজ্ঞাময় বাকি ইতিহাস
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,কি কি করতে হবে
 apps/erpnext/erpnext/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 +61,Apprentice,শিক্ষানবিস
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +102,Negative Quantity is not allowed,নেতিবাচক পরিমাণ অনুমোদিত নয়
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,শিক্ষানবিস
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +103,Negative Quantity is not allowed,নেতিবাচক পরিমাণ অনুমোদিত নয়
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",পংক্তিরূপে উল্লিখিত হয় আইটেমটি মাস্টার থেকে সংগৃহীত এবং এই ক্ষেত্রের মধ্যে সংরক্ষিত ট্যাক্স বিস্তারিত টেবিল. কর ও চার্জের জন্য ব্যবহৃত
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +152,Employee cannot report to himself.,কর্মচারী নিজেকে প্রতিবেদন করতে পারবে না.
@@ -1310,15 +1326,14 @@
 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 +141,Source warehouse is mandatory for row {0},উত্স গুদাম সারিতে জন্য বাধ্যতামূলক {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +719,Packing Slip,প্যাকিং স্লিপ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Source warehouse is mandatory for row {0},উত্স গুদাম সারিতে জন্য বাধ্যতামূলক {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +713,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/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,উদ্ধৃতি জন্য অনুরোধ নিম্নলিখিত লিঙ্কে ক্লিক করে এক্সেস হতে পারে
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,আমদানি ব্যর্থ!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,কোনো ঠিকানা এখনো যোগ.
 DocType: Workstation Working Hour,Workstation Working Hour,ওয়ার্কস্টেশন কাজ ঘন্টা
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Analyst,বিশ্লেষক
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,বিশ্লেষক
 DocType: Item,Inventory,জায়
 DocType: Item,Sales Details,বিক্রয় বিবরণ
 DocType: Quality Inspection,QI-,QI-
@@ -1326,7 +1341,7 @@
 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 +103,Government,সরকার
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,সরকার
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,প্রতিষ্ঠানের নাম
 apps/erpnext/erpnext/config/stock.py +289,Item Variants,আইটেম রুপভেদ
 DocType: Company,Services,সেবা
@@ -1342,6 +1357,7 @@
 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/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,বিনিয়োগ থেকে ক্যাশ ফ্লো
 DocType: Program Course,Program Course,প্রোগ্রাম কোর্স
@@ -1382,12 +1398,12 @@
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,রিসিভার তালিকা শূণ্য. রিসিভার তালিকা তৈরি করুন
 DocType: Production Plan Sales Order,Production Plan Sales Order,উৎপাদন পরিকল্পনা বিক্রয় আদেশ
 DocType: Sales Partner,Sales Partner Target,বিক্রয় অংশীদার উদ্দিষ্ট
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +110,Accounting Entry for {0} can only be made in currency: {1},{0} জন্য অ্যাকাউন্টিং কেবল প্রবেশ মুদ্রা তৈরি করা যাবে: {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},{0} জন্য অ্যাকাউন্টিং কেবল প্রবেশ মুদ্রা তৈরি করা যাবে: {1}
 DocType: Pricing Rule,Pricing Rule,প্রাইসিং রুল
 DocType: Budget,Action if Annual Budget Exceeded,যদি বার্ষিক বাজেট অতিক্রম করেছে অ্যাকশন
 apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,আদেশ ক্রয় উপাদানের জন্য অনুরোধ
 DocType: Shopping Cart Settings,Payment Success URL,পেমেন্ট সাফল্য ইউআরএল
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +78,Row # {0}: Returned Item {1} does not exists in {2} {3},সারি # {0}: Returned আইটেম {1} না মধ্যে উপস্থিত থাকে না {2} {3}
+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,ব্যাংক পুনর্মিলন বিবৃতি
@@ -1396,40 +1412,39 @@
 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/stock/doctype/stock_entry/stock_entry.py +339,Not allowed to tranfer more {0} than {1} against Purchase Order {2},আরো tranfer করা অনুমোদিত নয় {0} চেয়ে {1} ক্রয় আদেশের বিরুদ্ধে {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +344,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 +545,Manufacturing Quantity is mandatory,উৎপাদন পরিমাণ বাধ্যতামূলক
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,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 +71,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 +162,Row {0}: From Time and To Time of {1} is overlapping with {2},সারি {0}: থেকে সময় এবং টাইম {1} সঙ্গে ওভারল্যাপিং হয় {2}
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +186,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,শেয়ার দায়
 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 +130,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 +137,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,অন্যান্য রিপোর্ট
 DocType: Dependent Task,Dependent Task,নির্ভরশীল কার্য
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,অনুগ্রহ করে সেটআপ কর্মচারী হিউম্যান রিসোর্স মধ্যে নামকরণ সিস্টেম&gt; এইচআর সেটিংস
 apps/erpnext/erpnext/stock/doctype/item/item.py +411,Conversion factor for default Unit of Measure must be 1 in row {0},মেজার ডিফল্ট ইউনিট জন্য রূপান্তর গুণনীয়ক সারিতে 1 হতে হবে {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,Leave of type {0} cannot be longer than {1},ধরনের ছুটি {0} চেয়ে বেশি হতে পারেনা {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +197,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 +921,Search Item,অনুসন্ধান আইটেম
+apps/erpnext/erpnext/accounts/page/pos/pos.js +910,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 +546,Already completed,ইতিমধ্যে সম্পন্ন
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +22,Payment Request already exists {0},পেমেন্ট অনুরোধ ইতিমধ্যেই বিদ্যমান {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +550,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 +241,Quantity must not be more than {0},পরিমাণ বেশী হবে না {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Quantity must not be more than {0},পরিমাণ বেশী হবে না {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +76,Previous Financial Year is not closed,গত অর্থবছরের বন্ধ হয়নি
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +44,Age (Days),বয়স (দিন)
 DocType: Quotation Item,Quotation Item,উদ্ধৃতি আইটেম
@@ -1446,7 +1461,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +221,Purchase Receipt {0} is not submitted,কেনার রসিদ {0} দাখিল করা হয় না
 DocType: Company,Default Payable Account,ডিফল্ট প্রদেয় অ্যাকাউন্ট
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","যেমন গ্রেপ্তার নিয়ম, মূল্যতালিকা ইত্যাদি হিসাবে অনলাইন শপিং কার্ট এর সেটিংস"
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +83,{0}% Billed,{0}% দেখানো হয়েছিল
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}% দেখানো হয়েছিল
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,সংরক্ষিত Qty
 DocType: Party Account,Party Account,পক্ষের অ্যাকাউন্টে
 apps/erpnext/erpnext/config/setup.py +116,Human Resources,মানব সম্পদ
@@ -1458,12 +1473,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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 +22,Collect,সংগ্রহ করা
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,সংগ্রহ করা
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,Against Supplier Invoice {0} dated {1},সরবরাহকারী বিরুদ্ধে চালান {0} তারিখের {1}
 DocType: Customer,Default Price List,ডিফল্ট মূল্য তালিকা
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +225,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: Payment Reconciliation,Payments,পেমেন্টস্
 DocType: Journal Entry,Entry Type,এন্ট্রি টাইপ
 ,Customer Credit Balance,গ্রাহকের ক্রেডিট ব্যালেন্স
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Payable,হিসাবের পরিশোধযোগ্য অংশ মধ্যে নিট পরিবর্তন
@@ -1475,7 +1489,7 @@
 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 +9,Procurement,আসাদন
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,আইটেম কোনটিই পরিমাণ বা মান কোনো পরিবর্তন আছে.
+apps/erpnext/erpnext/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,পাটা দাবি
 ,Lead Details,সীসা বিবরণ
 DocType: Purchase Invoice,End date of current invoice's period,বর্তমান চালান এর সময়ের শেষ তারিখ
@@ -1500,7 +1514,7 @@
 DocType: Purchase Invoice,Additional Discount,অতিরিক্ত ছাড়
 DocType: Selling Settings,Selling Settings,সেটিংস বিক্রি
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,অনলাইন নিলাম
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +97,Please specify either Quantity or Valuation Rate or both,পরিমাণ বা মূল্যনির্ধারণ হার বা উভয়ই উল্লেখ করুন
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,পরিমাণ বা মূল্যনির্ধারণ হার বা উভয়ই উল্লেখ করুন
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +13,Fulfillment,সিদ্ধি
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","কোম্পানি, মাস এবং ফিস্ক্যাল বছর বাধ্যতামূলক"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,বিপণন খরচ
@@ -1521,14 +1535,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,ERPNext সেটআপ সম্পূর্ণ!
 DocType: Item,Weightage,গুরুত্ব
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +93,A Customer Group exists with same name please change the Customer name or rename the Customer Group,একটি গ্রাহক গ্রুপ একই নামের সঙ্গে বিদ্যমান গ্রাহকের নাম পরিবর্তন বা ক্রেতা গ্রুপ নামান্তর করুন
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +126,A Customer Group exists with same name please change the Customer name or rename the Customer Group,একটি গ্রাহক গ্রুপ একই নামের সঙ্গে বিদ্যমান গ্রাহকের নাম পরিবর্তন বা ক্রেতা গ্রুপ নামান্তর করুন
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,নতুন কন্টাক্ট
 DocType: Territory,Parent Territory,মূল টেরিটরি
 DocType: Quality Inspection Reading,Reading 2,2 পড়া
 DocType: Stock Entry,Material Receipt,উপাদান রশিদ
 DocType: Homepage,Products,পণ্য
 DocType: Announcement,Instructor,উপাধ্যায়
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},পার্টি প্রকার ও অনুষ্ঠান গ্রহনযোগ্য / প্রদেয় অ্যাকাউন্টের জন্য প্রয়োজন বোধ করা হয় {0}
 DocType: Employee,AB+,এবি + +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","এই আইটেমটি ভিন্নতা আছে, তাহলে এটি বিক্রয় আদেশ ইত্যাদি নির্বাচন করা যাবে না"
 DocType: Lead,Next Contact By,পরবর্তী যোগাযোগ
@@ -1539,7 +1552,7 @@
 ,Item-wise Sales Register,আইটেম-জ্ঞানী সেলস নিবন্ধন
 DocType: Asset,Gross Purchase Amount,গ্রস ক্রয়ের পরিমাণ
 DocType: Asset,Depreciation Method,অবচয় পদ্ধতি
-apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Offline,অফলাইন
+apps/erpnext/erpnext/accounts/page/pos/pos.js +686,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,প্রয়োজনীয়
@@ -1557,25 +1570,27 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +425,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 +858,Make Purchase Order,ক্রয় আদেশ করা
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +852,Make Purchase Order,ক্রয় আদেশ করা
 DocType: SMS Center,Send To,পাঠানো
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,There is not enough leave balance for Leave Type {0},ছুটি টাইপ জন্য যথেষ্ট ছুটি ভারসাম্য নেই {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,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 +172,Work-in-Progress Warehouse is required before Submit,কাজ-অগ্রগতি ওয়্যারহাউস জমা করার আগে প্রয়োজন বোধ করা হয়
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,Work-in-Progress Warehouse is required before Submit,কাজ-অগ্রগতি ওয়্যারহাউস জমা করার আগে প্রয়োজন বোধ করা হয়
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,একটি কাজের জন্য আবেদনকারী.
 DocType: Purchase Order Item,Warehouse and Reference,ওয়ারহাউস ও রেফারেন্স
 DocType: Supplier,Statutory info and other general information about your Supplier,আপনার সরবরাহকারীর সম্পর্কে বিধিবদ্ধ তথ্য এবং অন্যান্য সাধারণ তথ্য
-apps/erpnext/erpnext/hooks.py +88,Addresses,ঠিকানা
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,সরবরাহকারী&gt; সরবরাহকারী প্রকার
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +212,Against Journal Entry {0} does not have any unmatched {1} entry,জার্নাল বিরুদ্ধে এণ্ট্রি {0} কোনো অপ্রতিম {1} এন্ট্রি নেই
+apps/erpnext/erpnext/hooks.py +95,Addresses,ঠিকানা
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +215,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,দয়া করে আইটেম বা গুদাম উপর ভিত্তি করে ফিল্টার সেট
 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,রক্ষা কর এবং বিল থেকে
@@ -1583,11 +1598,10 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} must be submitted,BOM {0} দাখিল করতে হবে
 DocType: Authorization Control,Authorization Control,অনুমোদন কন্ট্রোল
 apps/erpnext/erpnext/controllers/buying_controller.py +300,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},সারি # {0}: ওয়্যারহাউস প্রত্যাখ্যাত প্রত্যাখ্যান আইটেম বিরুদ্ধে বাধ্যতামূলক {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +731,Payment,প্রদান
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,Payment,প্রদান
 DocType: Production Order Operation,Actual Time and Cost,প্রকৃত সময় এবং খরচ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},সর্বাধিক {0} এর উপাদানের জন্য অনুরোধ {1} সেলস আদেশের বিরুদ্ধে আইটেম জন্য তৈরি করা যেতে পারে {2}
 DocType: Employee,Salutation,অভিবাদন
-DocType: Pricing Rule,Brand,ব্র্যান্ড
 DocType: Course,Course Abbreviation,কোর্সের সমাহার
 DocType: Item,Will also apply for variants,এছাড়াও ভিন্নতা জন্য আবেদন করতে হবে
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +142,"Asset cannot be cancelled, as it is already {0}","অ্যাসেট, বাতিল করা যাবে না হিসাবে এটি আগে থেকেই {0}"
@@ -1599,7 +1613,7 @@
 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.","আপনি কিনতে বা বিক্রি করে যে আপনার পণ্য বা সেবা তালিকা. যখন আপনি শুরু মেজার এবং অন্যান্য বৈশিষ্ট্য আইটেমটি গ্রুপ, ইউনিট চেক করতে ভুলবেন না."
 DocType: Hub Settings,Hub Node,হাব নোড
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,আপনি ডুপ্লিকেট জিনিস প্রবেশ করে. ত্রুটিমুক্ত এবং আবার চেষ্টা করুন.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Associate,সহযোগী
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,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,রিসিভার তালিকা তৈরি করুন
@@ -1607,7 +1621,7 @@
 DocType: Production Planning Tool,Material Requests,উপাদান অনুরোধ
 DocType: Warranty Claim,Issue Date,প্রদানের তারিখ
 DocType: Activity Cost,Activity Cost,কার্যকলাপ খরচ
-DocType: Timesheet Detail,Timesheet Detail,শ্রমিকের খাটুনিঘণ্টা লিপিবদ্ধ কার্ড বিস্তারিত
+DocType: Sales Invoice Timesheet,Timesheet Detail,শ্রমিকের খাটুনিঘণ্টা লিপিবদ্ধ কার্ড বিস্তারিত
 DocType: Purchase Receipt Item Supplied,Consumed Qty,ক্ষয়প্রাপ্ত Qty
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,টেলিযোগাযোগ
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),বাক্স এই বন্টন (শুধু খসড়া) একটি অংশ কিনা তা চিহ্নিত
@@ -1630,6 +1644,7 @@
 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,ধরন আছে
 DocType: Monthly Distribution,Name of the Monthly Distribution,মাসিক বন্টন নাম
 DocType: Sales Person,Parent Sales Person,মূল সেলস পারসন
@@ -1642,30 +1657,31 @@
 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 +44,"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/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.,আপনি বিক্রয় চালান সংরক্ষণ একবার শব্দ দৃশ্যমান হবে.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +502,Error: {0} &gt; {1},ত্রুটি: {0}&gt; {1}
 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.,টার্ম শুরুর তারিখ চেয়ে একাডেমিক ইয়ার ইয়ার স্টার্ট তারিখ যা শব্দটি সংযুক্ত করা হয় তার আগে না হতে পারে (শিক্ষাবর্ষ {}). তারিখ সংশোধন করে আবার চেষ্টা করুন.
 DocType: Naming Series,Current Value,বর্তমান মূল্য
-apps/erpnext/erpnext/controllers/accounts_controller.py +235,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,একাধিক অর্থ বছরের তারিখ {0} জন্য বিদ্যমান. অর্থবছরে কোম্পানির নির্ধারণ করুন
+apps/erpnext/erpnext/controllers/accounts_controller.py +238,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 +458,Item table can not be blank,আইটেম টেবিল ফাঁকা থাকতে পারে না
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +443,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 +5,This is based on stock movement. See {0} for details,এই স্টক আন্দোলনের উপর ভিত্তি করে তৈরি. দেখুন {0} বিস্তারিত জানতে
 DocType: Pricing Rule,Selling,বিক্রি
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +341,Amount {0} {1} deducted against {2},পরিমাণ {0} {1} বিরুদ্ধে কাটা {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +344,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,দরুন জন্ম তারিখ পোস্ট করার আগে হতে পারে না
@@ -1680,8 +1696,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +144,Cannot refer row number greater than or equal to current row number for this Charge type,এই চার্জ ধরণ জন্য বর্তমান সারির সংখ্যা এর চেয়ে বড় বা সমান সারির সংখ্যা পড়ুন করতে পারবেন না
 DocType: Asset,Sold,বিক্রীত
 ,Item-wise Purchase History,আইটেম-বিজ্ঞ ক্রয় ইতিহাস
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Red,লাল
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},সিরিয়াল কোন আইটেম জন্য যোগ সংগ্রহ করার &#39;নির্মাণ সূচি&#39; তে ক্লিক করুন {0}
+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,ওপেন উত্পাদনের আদেশ
 DocType: Sales Invoice Payment,Base Amount (Company Currency),বেজ পরিমাণ (কোম্পানি মুদ্রা)
@@ -1689,7 +1705,7 @@
 DocType: Installation Note,Installation Time,ইনস্টলেশনের সময়
 DocType: Sales Invoice,Accounting Details,অ্যাকাউন্টিং এর বর্ণনা
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,এই কোম্পানির জন্য সব লেনদেন মুছে
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +187,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,সারি # {0}: অপারেশন {1} উত্পাদনের মধ্যে সমাপ্ত পণ্য {2} Qty জন্য সম্পন্ন করা হয় না আদেশ # {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,সারি # {0}: অপারেশন {1} উত্পাদনের মধ্যে সমাপ্ত পণ্য {2} Qty জন্য সম্পন্ন করা হয় না আদেশ # {3}. সময় লগসমূহ মাধ্যমে অপারেশন অবস্থা আপডেট করুন
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,বিনিয়োগ
 DocType: Issue,Resolution Details,রেজোলিউশনের বিবরণ
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,বরাে
@@ -1725,16 +1741,17 @@
 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}
 DocType: Delivery Note,Excise Page Number,আবগারি পৃষ্ঠা সংখ্যা
 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}
 ,Maintenance Schedules,রক্ষণাবেক্ষণ সময়সূচী
 DocType: Task,Actual End Date (via Time Sheet),প্রকৃত শেষ তারিখ (টাইম শিট মাধ্যমে)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Amount {0} {1} against {2} {3},পরিমাণ {0} {1} বিরুদ্ধে {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +339,Amount {0} {1} against {2} {3},পরিমাণ {0} {1} বিরুদ্ধে {2} {3}
 ,Quotation Trends,উদ্ধৃতি প্রবণতা
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},আইটেমটি গ্রুপ আইটেমের জন্য আইটেম মাস্টার উল্লেখ না {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +295,Debit To account must be a Receivable account,অ্যাকাউন্ট ডেবিট একটি গ্রহনযোগ্য অ্যাকাউন্ট থাকতে হবে
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Receivable account,অ্যাকাউন্ট ডেবিট একটি গ্রহনযোগ্য অ্যাকাউন্ট থাকতে হবে
 DocType: Shipping Rule Condition,Shipping Amount,শিপিং পরিমাণ
 ,Pending Amount,অপেক্ষারত পরিমাণ
 DocType: Purchase Invoice Item,Conversion Factor,রূপান্তর ফ্যাক্টর
@@ -1742,10 +1759,10 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +137,Expected value after useful life must be greater than or equal to {0},দরকারী জীবন পর প্রত্যাশিত মান এর চেয়ে বড় বা সমান হতে হবে {0}
 DocType: Purchase Receipt,Vehicle Number,গাড়ির সংখ্যা
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,আবর্তক চালান বন্ধ করা হবে কোন তারিখে
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +90,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,সর্বমোট পাতার {0} কম হতে পারে না সময়ের জন্য ইতিমধ্যেই অনুমোদন পাতার {1} চেয়ে
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +93,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 +22,Enter Paid Amount,Paid পরিমাণ লিখুন
+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 ব্যবহার
@@ -1755,13 +1772,15 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,Timesheets
 DocType: HR Settings,HR Settings,এইচআর সেটিংস
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Expense Claim is pending approval. Only the Expense Approver can update status.,ব্যয় দাবি অনুমোদনের জন্য স্থগিত করা হয়. শুধু ব্যয় রাজসাক্ষী স্ট্যাটাস আপডেট করতে পারবেন.
+DocType: Email Digest,New Expenses,নিউ খরচ
 DocType: Purchase Invoice,Additional Discount Amount,অতিরিক্ত মূল্য ছাড়ের পরিমাণ
-apps/erpnext/erpnext/controllers/accounts_controller.py +524,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","সারি # {0}: Qty, 1 হবে যেমন আইটেম একটি নির্দিষ্ট সম্পদ. একাধিক Qty এ জন্য পৃথক সারি ব্যবহার করুন."
+apps/erpnext/erpnext/controllers/accounts_controller.py +527,"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 +249,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/stock/get_item_details.py +123,Please specify Company,কোম্পানি উল্লেখ করুন
 ,Customer Acquisition and Loyalty,গ্রাহক অধিগ্রহণ ও বিশ্বস্ততা
@@ -1772,17 +1791,19 @@
 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 +183,Closing (Opening + Totals),বন্ধ (+ + সমগ্র খোলা)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),বন্ধ (+ + সমগ্র খোলা)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,কোম্পানি মুদ্রা উল্লেখ করুন
 DocType: Workstation,Wages per hour,প্রতি ঘন্টায় মজুরী
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +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/controllers/accounts_controller.py +272,Account {0} is invalid. Account Currency must be {1},অ্যাকাউন্ট {0} অবৈধ. অ্যাকাউন্টের মুদ্রা হতে হবে {1}
+DocType: Email Digest,Pending Sales Orders,সেলস অর্ডার অপেক্ষারত
+apps/erpnext/erpnext/controllers/accounts_controller.py +275,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 +956,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","সারি # {0}: রেফারেন্স ডকুমেন্ট প্রকার সেলস অর্ডার এক, সেলস চালান বা জার্নাল এন্ট্রি করতে হবে"
-DocType: Salary Slip,Deduction,সিদ্ধান্তগ্রহণ
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +87,Row {0}: From Time and To Time is mandatory.,সারি {0}: সময় থেকে এবং সময় বাধ্যতামূলক.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +969,"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 +111,Row {0}: From Time and To Time is mandatory.,সারি {0}: সময় থেকে এবং সময় বাধ্যতামূলক.
+DocType: Stock Reconciliation Item,Amount Difference,পরিমাণ পার্থক্য
 apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},আইটেমের মূল্য জন্য যোগ {0} মূল্যতালিকা {1}
 DocType: Address Template,Address Template,ঠিকানা টেমপ্লেট
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +7,Please enter Employee Id of this sales person,এই বিক্রয় ব্যক্তির কর্মী ID লিখুন দয়া করে
@@ -1790,7 +1811,7 @@
 DocType: Project,% Tasks Completed,% কাজগুলো সম্পন্ন  হয়েছে
 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 +194,Please enter Production Item first,প্রথম উত্পাদন আইটেম লিখুন দয়া করে
+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,প্রতিবন্ধী ব্যবহারকারী
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,উদ্ধৃতি
@@ -1799,53 +1820,54 @@
 DocType: Maintenance Visit,Maintenance User,রক্ষণাবেক্ষণ ব্যবহারকারী
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +149,Cost Updated,খরচ আপডেট
 DocType: Employee,Date of Birth,জন্ম তারিখ
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +86,Item {0} has already been returned,আইটেম {0} ইতিমধ্যে ফেরত দেয়া হয়েছে
+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: 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 +177,Job Description,কাজের বর্ণনা
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,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 +126,"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 +127,"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.","সেলস প্রচারাভিযান সম্পর্কে অবগত থাকুন. বাড়ে, উদ্ধৃতি সম্পর্কে অবগত থাকুন, বিক্রয় আদেশ ইত্যাদি প্রচারণা থেকে বিনিয়োগ ফিরে মূল্যাবধারণ করা."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +24,Welcome to POS: Create your POS Profile,পিওএস স্বাগতম: আপনার পিওএস প্রোফাইল তৈরি করুন
 DocType: Expense Claim,Approver,রাজসাক্ষী
 ,SO Qty,তাই Qty
+DocType: Guardian,Work Address,কাজের ঠিকানা
 DocType: Appraisal,Calculate Total Score,মোট স্কোর গণনা করা
 DocType: Request for Quotation,Manufacturing Manager,উৎপাদন ম্যানেজার
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},সিরিয়াল কোন {0} পর্যন্ত ওয়ারেন্টি বা তার কম বয়সী {1}
+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 +74,Shipments,চালানে
+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 +153,Row # ,সারি #
+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 +156,Get From,থেকে পান
+apps/erpnext/erpnext/public/js/utils.js +167,Get From,থেকে পান
 DocType: C-Form,Quarter,সিকি
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Miscellaneous Expenses,বিবিধ খরচ
 DocType: Global Defaults,Default Company,ডিফল্ট কোম্পানি
 apps/erpnext/erpnext/controllers/stock_controller.py +167,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,ব্যয় বা পার্থক্য অ্যাকাউন্ট আইটেম {0} হিসাবে এটি প্রভাব সার্বিক শেয়ার মূল্য জন্য বাধ্যতামূলক
-apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","সারিতে আইটেম {0} জন্য overbill পারবেন না {1} বেশী {2}. Overbilling, স্টক সেটিংস এ সেট করুন অনুমতি করুন"
+apps/erpnext/erpnext/controllers/accounts_controller.py +419,"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,-সর্বোপরি
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} is disabled,ব্যবহারকারী {0} নিষ্ক্রিয় করা হয়
 DocType: Leave Application,Total Leave Days,মোট ছুটি দিন
 DocType: Email Digest,Note: Email will not be sent to disabled users,উল্লেখ্য: এটি ইমেল প্রতিবন্ধী ব্যবহারকারীদের পাঠানো হবে না
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,কোম্পানি নির্বাচন ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,সব বিভাগের জন্য বিবেচিত হলে ফাঁকা ছেড়ে দিন
 apps/erpnext/erpnext/config/hr.py +171,"Types of employment (permanent, contract, intern etc.).","কর্মসংস্থান প্রকারভেদ (স্থায়ী, চুক্তি, অন্তরীণ ইত্যাদি)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +346,{0} is mandatory for Item {1},{0} আইটেমের জন্য বাধ্যতামূলক {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,{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","অন্তত একটি সারিতে বরাদ্দ পরিমাণ, চালান প্রকার এবং চালান নম্বর নির্বাচন করুন"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,নতুন ক্রয়ের খরচ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},আইটেম জন্য প্রয়োজন বিক্রয় আদেশ {0}
 DocType: Purchase Invoice Item,Rate (Company Currency),হার (কোম্পানি একক)
-apps/erpnext/erpnext/demo/setup_data.py +360,Others,অন্যরা
+DocType: Student Guardian,Others,অন্যরা
 DocType: Payment Entry,Unallocated Amount,অব্যবহৃত পরিমাণ
 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,কর ও শুল্ক
@@ -1865,17 +1887,16 @@
 apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,ধারাবাহিকভাবে পরিসংখ্যা
 DocType: Activity Type,Default Billing Rate,ডিফল্ট বিলিং রেট
 DocType: Sales Invoice,Total Billing Amount,মোট বিলিং পরিমাণ
-apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +54,Receivable Account,গ্রহনযোগ্য অ্যাকাউন্ট
-apps/erpnext/erpnext/controllers/accounts_controller.py +546,Row #{0}: Asset {1} is already {2},সারি # {0}: অ্যাসেট {1} ইতিমধ্যে {2}
+apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,গ্রহনযোগ্য অ্যাকাউন্ট
+apps/erpnext/erpnext/controllers/accounts_controller.py +549,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 +79,CEO,সিইও
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,সিইও
 DocType: Expense Claim Detail,Expense Claim Detail,ব্যয় দাবি বিস্তারিত
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +808,Please select correct account,সঠিক অ্যাকাউন্ট নির্বাচন করুন
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +809,Please select correct account,সঠিক অ্যাকাউন্ট নির্বাচন করুন
 DocType: Item,Weight UOM,ওজন UOM
 DocType: Salary Structure Employee,Salary Structure Employee,বেতন কাঠামো কর্মচারী
 DocType: Employee,Blood Group,রক্তের গ্রুপ
-DocType: Purchase Invoice Item,Page Break,পৃষ্ঠা বিরতি
 DocType: Production Order Operation,Pending,বিচারাধীন
 DocType: Course,Course Name,কোর্সের নাম
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,একটি নির্দিষ্ট কর্মচারী হুকুমে অ্যাপ্লিকেশন অনুমোদন করতে পারেন ব্যবহারকারীরা
@@ -1884,14 +1905,15 @@
 DocType: Fiscal Year,Companies,কোম্পানি
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,যন্ত্রপাতির
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,শেয়ার পুনরায় আদেশ পর্যায়ে পৌঁছে যখন উপাদান অনুরোধ বাড়াতে
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Full-time,ফুল টাইম
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,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: 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,মোট ইনকামিং মূল্য
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Debit To is required,ডেবিট প্রয়োজন বোধ করা হয়
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +321,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,গুনগতমান ব্যবস্থাপক
@@ -1899,6 +1921,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/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,মোট চালানে মাসিক
@@ -1909,18 +1932,17 @@
 DocType: Production Order Operation,Completed Qty,সমাপ্ত Qty
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"For {0}, only debit accounts can be linked against another credit entry","{0}, শুধুমাত্র ডেবিট অ্যাকাউন্ট অন্য ক্রেডিট এন্ট্রি বিরুদ্ধে সংযুক্ত করা যাবে জন্য"
 apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,মূল্যতালিকা {0} নিষ্ক্রিয় করা হয়
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +99,Row {0}: Completed Qty cannot be more than {1} for operation {2},সারি {0}: সমাপ্ত Qty চেয়ে বেশি হতে পারে না {1} অপারেশন জন্য {2}
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +123,Row {0}: Completed Qty cannot be more than {1} for operation {2},সারি {0}: সমাপ্ত Qty চেয়ে বেশি হতে পারে না {1} অপারেশন জন্য {2}
 DocType: Manufacturing Settings,Allow Overtime,ওভারটাইম মঞ্জুরি
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} আইটেম জন্য প্রয়োজন সিরিয়াল নাম্বার {1}. আপনার দেওয়া {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,বর্তমান মূল্যনির্ধারণ হার
 DocType: Item,Customer Item Codes,গ্রাহক আইটেম সঙ্কেত
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,এক্সচেঞ্জ লাভ / ক্ষতির
 DocType: Opportunity,Lost Reason,লস্ট কারণ
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,অনুগ্রহ করে সেটআপ সেটআপ মাধ্যমে এ্যাটেনডেন্স সিরিজ সংখ্যায়ন&gt; সংখ্যায়ন সিরিজ
 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/purchase_receipt/purchase_receipt.py +378,All items have already been invoiced,সকল আইটেম ইতিমধ্যে invoiced হয়েছে
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +379,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,বহিরাগত
@@ -1936,18 +1958,19 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,তোমার গ্রাহকরা
 apps/erpnext/erpnext/projects/doctype/project/project.py +141,You have been invited to collaborate on the project: {0},আপনি প্রকল্পের সহযোগীতা করার জন্য আমন্ত্রণ জানানো হয়েছে: {0}
 DocType: Leave Block List Date,Block Date,ব্লক তারিখ
-apps/erpnext/erpnext/templates/generators/job_opening.html +19,Apply Now,এখন আবেদন কর
+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 পরিচালনা."
 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,ভবন
-apps/erpnext/erpnext/utilities/doctype/address/address.py +164,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,ডিফল্ট ঠিকানা টেমপ্লেট পাওয়া. সেটআপ&gt; ছাপানো ও ব্র্যান্ডিং&gt; ঠিকানা টেমপ্লেট থেকে একটি নতুন তৈরি করুন.
 DocType: Fee Structure,Fee Structure,ফি গঠন
 DocType: Timesheet Detail,Costing Amount,খোয়াতে পরিমাণ
+DocType: Student Admission,Application Fee,আবেদন ফী
 DocType: Process Payroll,Submit Salary Slip,বেতন স্লিপ জমা
-apps/erpnext/erpnext/controllers/selling_controller.py +161,Maxiumm discount for Item {0} is {1}%,আইটেম {0} হল {1}% জন্য Maxiumm ছাড়
+apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,আইটেম {0} হল {1}% জন্য Maxiumm ছাড়
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,বাল্ক মধ্যে আমদানি
 DocType: Sales Partner,Address & Contacts,ঠিকানা ও যোগাযোগ
 DocType: SMS Log,Sender Name,প্রেরকের নাম
@@ -1972,21 +1995,21 @@
 DocType: Serial No,Delivery Time,প্রসবের সময়
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,উপর ভিত্তি করে বুড়ো
 DocType: Item,End of Life,জীবনের শেষে
-apps/erpnext/erpnext/demo/setup_data.py +361,Travel,ভ্রমণ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +155,No active or default Salary Structure found for employee {0} for the given dates,প্রদত্ত তারিখ জন্য কর্মচারী {0} জন্য পাওয়া যায়নি সক্রিয় বা ডিফল্ট বেতন কাঠামো
+apps/erpnext/erpnext/demo/setup/setup_data.py +304,Travel,ভ্রমণ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +167,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 +23,Update Cost,আপডেট খরচ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,আপডেট খরচ
 DocType: Item Reorder,Item Reorder,আইটেম অনুসারে পুনঃক্রম করুন
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +36,Show Salary Slip,বেতন দেখান স্লিপ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +748,Transfer Material,ট্রান্সফার উপাদান
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +53,Show Salary Slip,বেতন দেখান স্লিপ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +166,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 +923,Please set recurring after saving,সংরক্ষণ পরে আবর্তক নির্ধারণ করুন
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +646,Select change amount account,নির্বাচন পরিবর্তনের পরিমাণ অ্যাকাউন্ট
+apps/erpnext/erpnext/public/js/controllers/transaction.js +914,Please set recurring after saving,সংরক্ষণ পরে আবর্তক নির্ধারণ করুন
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +703,Select change amount account,নির্বাচন পরিবর্তনের পরিমাণ অ্যাকাউন্ট
 DocType: Purchase Invoice,Price List Currency,মূল্যতালিকা মুদ্রা
 DocType: Naming Series,User must always select,ব্যবহারকারী সবসময় নির্বাচন করতে হবে
 DocType: Stock Settings,Allow Negative Stock,নেতিবাচক শেয়ার মঞ্জুরি
@@ -1998,31 +2021,32 @@
 DocType: Quality Inspection,Verified By,কর্তৃক যাচাইকৃত
 DocType: Address,Subsidiary,সহায়ক
 apps/erpnext/erpnext/setup/doctype/company/company.py +64,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","বিদ্যমান লেনদেন আছে, কারণ, কোম্পানির ডিফল্ট মুদ্রা পরিবর্তন করতে পারবেন. লেনদেন ডিফল্ট মুদ্রা পরিবর্তন বাতিল করতে হবে."
+DocType: Grade Interval,Grade Description,গ্রেড বর্ণনা
 DocType: Quality Inspection,Purchase Receipt No,কেনার রসিদ কোন
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,অগ্রিক
 DocType: Process Payroll,Create Salary Slip,বেতন স্লিপ তৈরি
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +33,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 +352,Quantity in row {0} ({1}) must be same as manufactured quantity {2},সারিতে পরিমাণ {0} ({1}) শিল্পজাত পরিমাণ হিসাবে একই হতে হবে {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Quantity in row {0} ({1}) must be same as manufactured quantity {2},সারিতে পরিমাণ {0} ({1}) শিল্পজাত পরিমাণ হিসাবে একই হতে হবে {2}
 DocType: Appraisal,Employee,কর্মচারী
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,ব্যবহারকারী হিসেবে আমন্ত্রণ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} সম্পূর্ণরূপে বিল হয়
 DocType: Workstation Working Hour,End Time,শেষ সময়
 DocType: Payment Entry,Payment Deductions or Loss,পেমেন্ট Deductions বা হ্রাস
-apps/erpnext/erpnext/config/schools.py +100,LMS,এল.এম.এস
+apps/erpnext/erpnext/config/schools.py +104,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,সেলস পাইপলাইন
 DocType: Student Batch Student,Student Batch Student,ছাত্র ব্যাচের ছাত্র
-DocType: Sales Invoice,Mass Mailing,ভর মেইলিং
+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 +199,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/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 +297,Salary Slip of employee {0} already created for this period,কর্মচারীর বেতন স্লিপ {0} ইতিমধ্যে এই সময়ের জন্য সৃষ্টি
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Pharmaceutical,ফার্মাসিউটিক্যাল
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +309,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/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,ক্রেডিট
@@ -2037,27 +2061,28 @@
 DocType: Upload Attendance,Attendance To Date,তারিখ উপস্থিতি
 DocType: Warranty Claim,Raised By,দ্বারা উত্থাপিত
 DocType: Payment Gateway Account,Payment Account,টাকা পরিষদের অ্যাকাউন্ট
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +814,Please specify Company to proceed,এগিয়ে যেতে কোম্পানি উল্লেখ করুন
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +793,Please specify Company to proceed,এগিয়ে যেতে কোম্পানি উল্লেখ করুন
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Receivable,গ্রহনযোগ্য অ্যাকাউন্ট মধ্যে নিট পরিবর্তন
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Compensatory Off,পূরক অফ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,পূরক অফ
 DocType: Quality Inspection Reading,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.,"আপনি কি সত্যিই এই কোম্পানির জন্য সব লেনদেন মুছে ফেলতে চান, নিশ্চিত করুন. হিসাবে এটা আপনার মাস্টার ডেটা থাকবে. এই ক্রিয়াটি পূর্বাবস্থায় ফেরানো যাবে না."
 DocType: Room,Room Number,রুম নম্বর
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},অবৈধ উল্লেখ {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +161,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) পরিকল্পনা quanitity তার চেয়ে অনেক বেশী হতে পারে না ({2}) উত্পাদন আদেশ {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +162,{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 +217,Raw Materials cannot be blank.,কাঁচামালের ফাঁকা থাকতে পারে না.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,"Could not update stock, invoice contains drop shipping item.","স্টক আপডেট করা যায়নি, চালান ড্রপ শিপিং আইটেমটি রয়েছে."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +460,Quick Journal Entry,দ্রুত জার্নাল এন্ট্রি
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +111,You can not change rate if BOM mentioned agianst any item,BOM কোন আইটেম agianst উল্লেখ তাহলে আপনি হার পরিবর্তন করতে পারবেন না
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +441,"Could not update stock, invoice contains drop shipping item.","স্টক আপডেট করা যায়নি, চালান ড্রপ শিপিং আইটেমটি রয়েছে."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Quick Journal Entry,দ্রুত জার্নাল এন্ট্রি
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +103,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} জন্য পরিকল্পনা Qty লিখুন দয়া করে {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is not submitted,{0} {1} দাখিল করা হয় না
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,আইটেম জন্য অনুরোধ.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,পৃথক উত্পাদন যাতে প্রতিটি সমাপ্ত ভাল আইটেমের জন্য তৈরি করা হবে.
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +121,{0} must be negative in return document,{0} রিটার্ন নথিতে নেতিবাচক হবে
 ,Minutes to First Response for Issues,সমস্যার জন্য প্রথম প্রতিক্রিয়া মিনিট
 DocType: Purchase Invoice,Terms and Conditions1,শর্তাবলী এবং Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,"ইনস্টিটিউটের নাম, যার জন্য আপনি এই সিস্টেম সেট আপ করা হয়."
@@ -2066,16 +2091,17 @@
 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 +398,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 +739,Item or Warehouse for row {0} does not match Material Request,সারি {0} মেলে না উপাদানের জন্য অনুরোধ জন্য আইটেম বা গুদাম
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +747,Item or Warehouse for row {0} does not match Material Request,সারি {0} মেলে না উপাদানের জন্য অনুরোধ জন্য আইটেম বা গুদাম
 apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,পরিমাপের একক
 DocType: Fiscal Year,Year End Date,বছর শেষ তারিখ
 DocType: Task Depends On,Task Depends On,কাজের উপর নির্ভর করে
-DocType: Lead,Opportunity,সুযোগ
+DocType: Supplier Quotation,Opportunity,সুযোগ
 ,Completed Production Orders,সম্পূর্ণ উৎপাদন আদেশ
 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,ডিফল্ট ওয়ার্কস্টেশন
@@ -2088,7 +2114,7 @@
 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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},রক্ষণাবেক্ষণ আরম্ভের তারিখ সিরিয়াল কোন জন্য ডেলিভারি তারিখের আগে হতে পারে না {0}
+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,প্রকৃত শেষ তারিখ
 DocType: Purchase Invoice,PINV-,PINV-
 DocType: Authorization Rule,Applicable To (Role),প্রযোজ্য (ভূমিকা)
@@ -2103,7 +2129,7 @@
 DocType: SMS Log,No of Requested SMS,অনুরোধ করা এসএমএস এর কোন
 DocType: Campaign,Campaign-.####,প্রচারাভিযান -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,পরবর্তী ধাপ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,Please supply the specified items at the best possible rates,সম্ভাব্য সর্বোত্তম হারে নির্দিষ্ট আইটেম সরবরাহ অনুগ্রহ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +695,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 +117,Contract End Date must be greater than Date of Joining,চুক্তি শেষ তারিখ যোগদান তারিখ থেকে বড় হওয়া উচিত
 DocType: Delivery Note,DN-,DN-
@@ -2112,7 +2138,7 @@
 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 +14,This is an example website auto-generated from ERPNext,এই একটি উদাহরণ ওয়েবসাইট ERPNext থেকে স্বয়ংক্রিয় উত্পন্ন হয়
+apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,এই একটি উদাহরণ ওয়েবসাইট ERPNext থেকে স্বয়ংক্রিয় উত্পন্ন হয়
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,বুড়ো বিন্যাস 1
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
@@ -2139,13 +2165,14 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd পরিমাণ
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +54,Fee Records Created - {0},ফি রেকর্ডস নির্মিত - {0}
 DocType: Asset Category Account,Asset Category Account,অ্যাসেট শ্রেণী অ্যাকাউন্ট
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +103,Cannot produce more Item {0} than Sales Order quantity {1},সেলস আদেশ পরিমাণ বেশী আইটেম {0} সৃষ্টি করতে পারে না {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Stock Entry {0} is not submitted,শেয়ার এণ্ট্রি {0} দাখিল করা হয় না
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},সেলস আদেশ পরিমাণ বেশী আইটেম {0} সৃষ্টি করতে পারে না {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +505,Stock Entry {0} is not submitted,শেয়ার এণ্ট্রি {0} দাখিল করা হয় না
 DocType: Payment Reconciliation,Bank / Cash Account,ব্যাংক / নগদ অ্যাকাউন্ট
 DocType: Tax Rule,Billing City,বিলিং সিটি
 DocType: Salary Component Account,Salary Component Account,বেতন কম্পোনেন্ট অ্যাকাউন্ট
 DocType: Global Defaults,Hide Currency Symbol,মুদ্রা প্রতীক লুকান
 apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card","যেমন ব্যাংক, ক্যাশ, ক্রেডিট কার্ড"
+DocType: Lead Source,Source Name,উত্স নাম
 DocType: Journal Entry,Credit Note,ক্রেডিট নোট
 DocType: Warranty Claim,Service Address,সেবা ঠিকানা
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furnitures and Fixtures,আসবাবপত্র এবং রাজধানী
@@ -2157,6 +2184,7 @@
 DocType: Opportunity,Customer / Lead Name,গ্রাহক / লিড নাম
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +89,Clearance Date not mentioned,পরিস্কারের তারিখ উল্লেখ না
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,উত্পাদনের
+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/controllers/trends.py +19,Total(Qty),মোট (Qty)
 DocType: Sales Invoice,This Document,এই নথীটি
@@ -2168,15 +2196,15 @@
 DocType: Purchase Receipt,Time at which materials were received,"উপকরণ গৃহীত হয়েছে, যা এ সময়"
 DocType: Stock Ledger Entry,Outgoing Rate,আউটগোয়িং কলের হার
 apps/erpnext/erpnext/config/hr.py +176,Organization branch master.,সংস্থার শাখা মাস্টার.
-apps/erpnext/erpnext/controllers/accounts_controller.py +273, or ,বা
+apps/erpnext/erpnext/controllers/accounts_controller.py +276, 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 +203,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,সারি # {0}: জার্নাল এন্ট্রি {1} অ্যাকাউন্ট নেই {2} বা ইতিমধ্যেই অন্য ভাউচার বিরুদ্ধে মিলেছে
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +206,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 +90,No employee for the above selected criteria OR salary slip already created,উপরে নির্বাচিত মানদণ্ডের বা বেতন স্লিপ জন্য কোন কর্মচারী ইতিমধ্যে তৈরি
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +93,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,শোধের ধরণ
@@ -2204,8 +2232,8 @@
 DocType: Product Bundle,Parent Item,মূল আইটেমটি
 DocType: Account,Account Type,হিসাবের ধরণ
 DocType: Delivery Note,DN-RET-,ডিএন RET-
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +115,Leave Type {0} cannot be carry-forwarded,{0} বহন-ফরওয়ার্ড করা যাবে না প্রকার ত্যাগ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',রক্ষণাবেক্ষণ সূচি সব আইটেম জন্য উত্পন্ন করা হয় না. &#39;নির্মাণ সূচি&#39; তে ক্লিক করুন
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +118,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 +163,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","সারিতে জন্য {0} মধ্যে {1}. আইটেম হার {2} অন্তর্ভুক্ত করার জন্য, সারি {3} এছাড়াও অন্তর্ভুক্ত করা আবশ্যক"
@@ -2217,13 +2245,13 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +32,Disabled template must not be default template,অক্ষম করা হয়েছে টেমপ্লেট ডিফল্ট টেমপ্লেট হবে না
 DocType: Account,Income Account,আয় অ্যাকাউন্ট
 DocType: Payment Request,Amount in customer's currency,গ্রাহকের মুদ্রার পরিমাণ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +748,Delivery,বিলি
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +742,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,কী দায়িত্ব ফোন
 DocType: Payment Entry,Total Allocated Amount,সর্বমোট পরিমাণ
 DocType: Item Reorder,Material Request Type,উপাদান অনুরোধ টাইপ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +82,Row {0}: UOM Conversion Factor is mandatory,সারি {0}: UOM রূপান্তর ফ্যাক্টর বাধ্যতামূলক
+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,খরচ কেন্দ্র
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,ভাউচার #
@@ -2234,13 +2262,13 @@
 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 +90,Head of Marketing and Sales,মার্কেটিং ও সেলস হেড
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,আয়কর
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,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.,ট্র্যাক শিল্প টাইপ দ্বারা অনুসন্ধান.
 DocType: Item Supplier,Item Supplier,আইটেম সরবরাহকারী
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +403,Please enter Item Code to get batch no,ব্যাচ কোন পেতে আইটেম কোড প্রবেশ করুন
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +770,Please select a value for {0} quotation_to {1},{0} quotation_to জন্য একটি মান নির্বাচন করুন {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +397,Please enter Item Code to get batch no,ব্যাচ কোন পেতে আইটেম কোড প্রবেশ করুন
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +764,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- র ধরন, কোম্পানী"
@@ -2252,28 +2280,29 @@
 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 +100,Issues,সমস্যা
+apps/erpnext/erpnext/hooks.py +109,Issues,সমস্যা
 apps/erpnext/erpnext/controllers/status_updater.py +13,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,ক্রয় অনুরোধ জন্য তাই চলছে অপেক্ষারত
+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,বিলিং মুদ্রা
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Large,অতি বৃহদাকার
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,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 +507,Warning: Another {0} # {1} exists against stock entry {2},সতর্কতা: আরেকটি {0} # {1} শেয়ার এন্ট্রি বিরুদ্ধে বিদ্যমান {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Local,স্থানীয়
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +508,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),ঋণ ও অগ্রিমের (সম্পদ)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,ঋণ গ্রহিতা
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Large,বড়
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,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 +225,Total {0} ({1}),মোট {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +224,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,ডিফল্ট মূল্যনির্ধারণ পদ্ধতি
@@ -2319,9 +2348,9 @@
 DocType: Attendance,Leave Type,ছুটি টাইপ
 apps/erpnext/erpnext/controllers/stock_controller.py +173,Expense / Difference account ({0}) must be a 'Profit or Loss' account,ব্যয় / পার্থক্য অ্যাকাউন্ট ({0}) একটি &#39;লাভ বা ক্ষতি&#39; অ্যাকাউন্ট থাকতে হবে
 DocType: Account,Accounts User,ব্যবহারকারীর অ্যাকাউন্ট
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Name error: {0},নাম ত্রুটি: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +90,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 +178,{0} {1} does not associated with {2} {3},{0} {1} সঙ্গে যুক্ত নেই {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +181,{0} {1} does not associated with {2} {3},{0} {1} সঙ্গে যুক্ত নেই {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,কর্মচারী {0} উপস্থিতির ইতিমধ্যে চিহ্নিত করা হয়
 DocType: Packing Slip,If more than one package of the same type (for print),তাহলে একই ধরনের একাধিক বাক্স (প্রিন্ট জন্য)
 DocType: Warehouse,Parent Warehouse,পেরেন্ট ওয়্যারহাউস
@@ -2340,7 +2369,7 @@
 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,উদ্দেশ্যসমূহ
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,অন্তত একটি আইটেম ফিরে নথিতে নেতিবাচক পরিমাণ সঙ্গে প্রবেশ করা উচিত
+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 +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","অপারেশন {0} ওয়ার্কস্টেশন কোনো উপলব্ধ কাজের সময় চেয়ে দীর্ঘতর {1}, একাধিক অপারেশন মধ্যে অপারেশন ভাঙ্গিয়া"
 ,Requested,অনুরোধ করা
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +83,No Remarks,কোন মন্তব্য
@@ -2352,46 +2381,46 @@
 DocType: Item,Total Projected Qty,মোট অভিক্ষিপ্ত Qty
 DocType: Monthly Distribution,Distribution Name,বন্টন নাম
 DocType: Course,Course Code,কোর্স কোড
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Quality Inspection required for Item {0},আইটেম জন্য প্রয়োজনীয় মান পরিদর্শন {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Quality Inspection required for Item {0},আইটেম জন্য প্রয়োজনীয় মান পরিদর্শন {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,যা গ্রাহকের কারেন্সি হারে কোম্পানির বেস কারেন্সি রূপান্তরিত হয়
 DocType: Purchase Invoice Item,Net Rate (Company Currency),নিট হার (কোম্পানি একক)
 DocType: Salary Detail,Condition and Formula Help,কন্ডিশন ও ফর্মুলা সাহায্য
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,টেরিটরি গাছ পরিচালনা.
 DocType: Journal Entry Account,Sales Invoice,বিক্রয় চালান
 DocType: Journal Entry Account,Party Balance,পার্টি ব্যালেন্স
-apps/erpnext/erpnext/accounts/page/pos/pos.js +475,Please select Apply Discount On,ডিসকাউন্ট উপর প্রয়োগ নির্বাচন করুন
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +92,Salary Slip Created,বেতন স্লিপ তৈরী
+apps/erpnext/erpnext/accounts/page/pos/pos.js +464,Please select Apply Discount On,ডিসকাউন্ট উপর প্রয়োগ নির্বাচন করুন
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +95,Salary Slip Created,বেতন স্লিপ তৈরী
 DocType: Company,Default Receivable Account,ডিফল্ট গ্রহনযোগ্য অ্যাকাউন্ট
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,উপরে নির্বাচিত মানদণ্ডের জন্য প্রদত্ত মোট বেতন জন্য ব্যাংক এনট্রি নির্মাণ
 DocType: Stock Entry,Material Transfer for Manufacture,প্রস্তুত জন্য উপাদান স্থানান্তর
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,ডিসকাউন্ট শতাংশ একটি মূল্য তালিকা বিরুদ্ধে বা সব মূল্য তালিকা জন্য হয় প্রয়োগ করা যেতে পারে.
 DocType: Purchase Invoice,Half-yearly,অর্ধ বার্ষিক
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +384,Accounting Entry for Stock,স্টক জন্য অ্যাকাউন্টিং এণ্ট্রি
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +387,Accounting Entry for Stock,স্টক জন্য অ্যাকাউন্টিং এণ্ট্রি
 DocType: Sales Invoice,Sales Team1,সেলস team1
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,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 +96,Row {0}: Completed Qty must be greater than zero.,সারি {0}: সমাপ্ত Qty শূন্য অনেক বেশী হতে হবে.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +120,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 +88,Row # {0}: Cannot return more than {1} for Item {2},সারি # {0}: বেশী ফিরে যাবে না {1} আইটেম জন্য {2}
+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,চক্রান্ত
 DocType: Item Group,Show this slideshow at the top of the page,পৃষ্ঠার উপরের এই স্লাইডশো প্রদর্শন
 DocType: BOM,Item UOM,আইটেম UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),ছাড়ের পরিমাণ পরে ট্যাক্স পরিমাণ (কোম্পানি একক)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +147,Target warehouse is mandatory for row {0},উদ্দিষ্ট গুদাম সারিতে জন্য বাধ্যতামূলক {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,সরবরাহকারী ঠিকানা নির্বাচন
 DocType: Quality Inspection,Quality Inspection,উচ্চমানের তদন্ত
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Extra Small,অতিরিক্ত ছোট
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,Warning: Material Requested Qty is less than Minimum Order Qty,সতর্কতা: Qty অনুরোধ উপাদান নূন্যতম অর্ডার QTY কম হয়
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +194,Account {0} is frozen,অ্যাকাউন্ট {0} নিথর হয়
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,অতিরিক্ত ছোট
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +690,Warning: Material Requested Qty is less than Minimum Order Qty,সতর্কতা: Qty অনুরোধ উপাদান নূন্যতম অর্ডার QTY কম হয়
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,অ্যাকাউন্ট {0} নিথর হয়
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,সংস্থার একাত্মতার অ্যাকাউন্টের একটি পৃথক চার্ট সঙ্গে আইনি সত্তা / সাবসিডিয়ারি.
 DocType: Payment Request,Mute Email,নিঃশব্দ ইমেইল
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","খাদ্য, পানীয় ও তামাকের"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +606,Can only make payment against unbilled {0},শুধুমাত্র বিরুদ্ধে পেমেন্ট করতে পারবেন যেতে উদ্ভাবনী উপায় {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +126,Commission rate cannot be greater than 100,কমিশন হার তার চেয়ে অনেক বেশী 100 হতে পারে না
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +609,Can only make payment against unbilled {0},শুধুমাত্র বিরুদ্ধে পেমেন্ট করতে পারবেন যেতে উদ্ভাবনী উপায় {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,কমিশন হার তার চেয়ে অনেক বেশী 100 হতে পারে না
 DocType: Stock Entry,Subcontract,ঠিকা
 apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,প্রথম {0} লিখুন দয়া করে
 DocType: Production Order Operation,Actual End Time,প্রকৃত শেষ সময়
@@ -2402,30 +2431,30 @@
 DocType: SMS Log,No of Sent SMS,এসএমএস পাঠানোর কোন
 DocType: Account,Expense Account,দামী হিসাব
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,সফটওয়্যার
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Colour,রঙিন
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,রঙিন
 DocType: Maintenance Visit,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; হয় আইটেম নির্বাচন করুন এবং অন্য কোন পণ্য সমষ্টি নেই, অনুগ্রহ করে"
 DocType: Student Log,Academic,একাডেমিক
-apps/erpnext/erpnext/controllers/accounts_controller.py +469,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),মোট অগ্রিম ({0}) আদেশের বিরুদ্ধে {1} সর্বমোট তার চেয়ে অনেক বেশী হতে পারে না ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +472,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),মোট অগ্রিম ({0}) আদেশের বিরুদ্ধে {1} সর্বমোট তার চেয়ে অনেক বেশী হতে পারে না ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,অসমান মাস জুড়ে লক্ষ্যমাত্রা বিতরণ মাসিক ডিস্ট্রিবিউশন নির্বাচন.
 DocType: Purchase Invoice Item,Valuation Rate,মূল্যনির্ধারণ হার
+DocType: Stock Reconciliation,SR/,এসআর /
 apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,মূল্য তালিকা মুদ্রা একক নির্বাচন করবেন
 DocType: Assessment,Results,ফলাফল
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +168,Employee {0} has already applied for {1} between {2} and {3},কর্মচারী {0} ইতিমধ্যে আবেদন করেছেন {1} মধ্যে {2} এবং {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +175,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: Student Applicant,Father's/ Guardian 2 Email ID,পিতার / গার্ডিয়ান 2 ইমেইল আইডি
 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 +228,Warehouses with existing transaction can not be converted to group.,বিদ্যমান লেনদেনের সঙ্গে গুদাম গ্রুপে রূপান্তর করা যাবে না.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +231,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 +93,Researcher,গবেষক
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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.,ইনকামিং মান পরিদর্শন.
@@ -2437,25 +2466,25 @@
 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: Sales Invoice,Advertisement,বিজ্ঞাপন
 DocType: Asset Category Account,Depreciation Expense Account,অবচয় ব্যায়ের অ্যাকাউন্ট
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Probationary Period,অবেক্ষাধীন সময়ের
-apps/erpnext/erpnext/hooks.py +102,Announcements,ঘোষণা
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,অবেক্ষাধীন সময়ের
+apps/erpnext/erpnext/hooks.py +111,Announcements,ঘোষণা
 DocType: Customer Group,Only leaf nodes are allowed in transaction,শুধু পাতার নোড লেনদেনের অনুমতি দেওয়া হয়
 DocType: Expense Claim,Expense Approver,ব্যয় রাজসাক্ষী
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +109,Row {0}: Advance against Customer must be credit,সারি {0}: গ্রাহক বিরুদ্ধে অগ্রিম ক্রেডিট হতে হবে
 apps/erpnext/erpnext/accounts/doctype/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 +16,To Datetime,Datetime করুন
+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/scheduling_tool/scheduling_tool.py +51,Course Schedules deleted:,কোর্স সূচী মোছা হয়েছে:
 apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,SMS বিতরণ অবস্থা বজায় রাখার জন্য লগ
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,মুলতুবি কার্যক্রম
+DocType: Accounts Settings,Make Payment via Journal Entry,জার্নাল এন্ট্রি মাধ্যমে টাকা প্রাপ্তির
+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 +127,Please enter relieving date.,তারিখ মুক্তিদান লিখুন.
-apps/erpnext/erpnext/controllers/trends.py +145,Amt,AMT
+apps/erpnext/erpnext/controllers/trends.py +149,Amt,AMT
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,Only Leave Applications with status 'Approved' can be submitted,শুধু স্ট্যাটাস &#39;অনুমোদিত&#39; জমা করা যেতে পারে সঙ্গে অ্যাপ্লিকেশন ছেড়ে দিন
 apps/erpnext/erpnext/utilities/doctype/address/address.py +26,Address Title is mandatory.,ঠিকানা শিরোনাম বাধ্যতামূলক.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,তদন্ত উৎস প্রচারণা যদি প্রচারাভিযানের নাম লিখুন
@@ -2473,14 +2502,15 @@
 apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1},{0} করার জন্য বিনিময় হার খুঁজে পেতে অসমর্থ {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,মার্ক অর্ধদিবস
 DocType: Sales Invoice,Sales Team,বিক্রয় দল
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Duplicate entry,ডুপ্লিকেট এন্ট্রি
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,ডুপ্লিকেট এন্ট্রি
 DocType: Program Enrollment Tool,Get Students,শিক্ষার্থীরা পান
 DocType: Serial No,Under Warranty,ওয়ারেন্টিযুক্ত
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +490,[Error],[ত্রুটি]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +484,[Error],[ত্রুটি]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,আপনি বিক্রয় আদেশ সংরক্ষণ একবার শব্দ দৃশ্যমান হবে.
 ,Employee Birthday,কর্মচারী জন্মদিনের
 apps/erpnext/erpnext/controllers/status_updater.py +175,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} আগে থেকেই আছে. এই এন্ট্রি পরিবর্তন করে আবার চেষ্টা করুন.
 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} অস্তিত্ব নেই
@@ -2496,22 +2526,22 @@
 ,Issued Items Against Production Order,উৎপাদন অর্ডার বিরুদ্ধে জারি চলছে
 DocType: Pricing Rule,Purchase Manager,ক্রয় ম্যানেজার
 DocType: Target Detail,Target Detail,উদ্দিষ্ট বিস্তারিত
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +25,All Jobs,সকল চাকরি
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,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 +323,Amount {0} {1} {2} {3},পরিমাণ {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,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: Supplier,Credit Limit,ক্রেডিট সীমা
 DocType: Production Plan Sales Order,Salse Order Date,কর্দমস্রাবক আগ্নেয়গিরি ক্রম তারিখের
 DocType: Salary Component,Salary Component,বেতন কম্পোনেন্ট
-apps/erpnext/erpnext/accounts/utils.py +372,Payment Entries {0} are un-linked,পেমেন্ট দাখিলা {0} উন-লিঙ্ক আছে
+apps/erpnext/erpnext/accounts/utils.py +449,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 +497,Material Requests {0} created,তৈরি উপাদান অনুরোধ {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +498,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.,পদ বা চুক্তি টেমপ্লেট.
 DocType: Purchase Invoice,Address and Contact,ঠিকানা ও যোগাযোগ
@@ -2550,7 +2580,7 @@
 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 +848,Paid Amount cannot be greater than total negative outstanding amount {0},Paid পরিমাণ মোট নেতিবাচক অসামান্য পরিমাণ তার চেয়ে অনেক বেশী হতে পারে না {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +859,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 +233,Closing (Dr),বন্ধ (ড)
 DocType: Cheque Print Template,Cheque Size,চেক সাইজ
@@ -2571,7 +2601,8 @@
 ,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 +555,'Update Stock' cannot be checked for fixed asset sale,&#39;আপডেট শেয়ার&#39; স্থায়ী সম্পদ বিক্রি চেক করা যাবে না
+DocType: Student Guardian,Father,পিতা
+apps/erpnext/erpnext/controllers/accounts_controller.py +558,'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} বাতিল বা বন্ধ করা হয়
@@ -2581,15 +2612,15 @@
 DocType: Sales Order,Fully Delivered,সম্পূর্ণ বিতরণ
 DocType: Lead,Lower Income,নিম্ন আয়
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","লাভ / ক্ষতি হবে বুক দায় অধীনে অ্যাকাউন্ট মাথা,"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +166,Source and target warehouse cannot be same for row {0},সোর্স ও টার্গেট গুদাম সারির এক হতে পারে না {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","এই স্টক রিকনসিলিয়েশন একটি খোলা এণ্ট্রি যেহেতু পার্থক্য অ্যাকাউন্ট, একটি সম্পদ / দায় ধরনের অ্যাকাউন্ট থাকতে হবে"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +81,Purchase Order number required for Item {0},আইটেম জন্য প্রয়োজন ক্রম সংখ্যা ক্রয় {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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/purchase_receipt/purchase_receipt.py +82,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 +17,Cannot change status as student {0} is linked with student application {1},ছাত্র হিসাবে অবস্থা পরিবর্তন করা যাবে না {0} ছাত্র আবেদনপত্রের সাথে সংযুক্ত করা হয় {1}
+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: Timesheet,"List of employee which has ""Salary Slip Based on Timesheet"" is enabled in salary structure.",কর্মচারী তালিকা যা &quot;বেতন স্লিপ শ্রমিকের খাটুনিঘণ্টা লিপিবদ্ধ কার্ড উপর ভিত্তি করে&quot; হয়েছে বেতন কাঠামো সক্রিয় করা হয়.
 DocType: Asset,Fully Depreciated,সম্পূর্ণরূপে মূল্যমান হ্রাস
 ,Stock Projected Qty,স্টক Qty অনুমিত
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Customer {0} does not belong to project {1},অন্তর্গত নয় {0} গ্রাহক প্রকল্পের {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,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,ক্রমিক নং এবং ব্যাচ
@@ -2601,7 +2632,7 @@
 DocType: Purchase Invoice,Purchase Taxes and Charges,কর ও শুল্ক ক্রয়
 ,Qty to Receive,জখন Qty
 DocType: Leave Block List,Leave Block List Allowed,ব্লক তালিকা প্রেজেন্টেশন ত্যাগ
-apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +55,All Warehouses,সকল গুদাম
+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 +105,Credit To account must be a Balance Sheet account,একাউন্টে ক্রেডিট একটি ব্যালান্স শিটের অ্যাকাউন্ট থাকতে হবে
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,সমস্ত সরবরাহকারী প্রকারভেদ
@@ -2613,10 +2644,10 @@
 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/manufacturing/doctype/bom/bom.js +26,Browse BOM,ব্রাউজ BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,ব্রাউজ BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,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 Year,Academic Year,শিক্ষাবর্ষ
+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,সিআরএম
 DocType: Appraisal,Appraisal,গুণগ্রাহিতা
@@ -2624,12 +2655,12 @@
 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 +197,Leave approver must be one of {0},এক হতে হবে রাজসাক্ষী ত্যাগ {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,Leave approver must be one of {0},এক হতে হবে রাজসাক্ষী ত্যাগ {0}
 DocType: Hub Settings,Seller Email,বিক্রেতা ইমেইল
 DocType: Project,Total Purchase Cost (via Purchase Invoice),মোট ক্রয় খরচ (ক্রয় চালান মাধ্যমে)
 DocType: Workstation Working Hour,Start Time,সময় শুরু
 DocType: Item Price,Bulk Import Help,বাল্ক আমদানি সাহায্য
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +256,Select Quantity,পরিমাণ বাছাই কর
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +257,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,বার্তা পাঠানো
@@ -2646,6 +2677,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,উভয় ক্ষেত্রেই লক্ষ্য Qty বা টার্গেট পরিমাণ বাধ্যতামূলক.
 apps/erpnext/erpnext/config/projects.py +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}"
+DocType: Timesheet,Billing Details,পূর্ণ রূপ প্রকাশ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +149,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}
 DocType: Item,Inspection Required,ইন্সপেকশন প্রয়োজনীয়
@@ -2665,7 +2697,7 @@
 DocType: Expense Claim,Approval Status,অনুমোদন অবস্থা
 DocType: Hub Settings,Publish Items to Hub,হাব আইটেম প্রকাশ
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},মূল্য সারিতে মান কম হতে হবে থেকে {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Wire Transfer,ওয়্যার ট্রান্সফার
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,ওয়্যার ট্রান্সফার
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,সবগুলু যাচাই করুন
 DocType: Sales Order,Recurring Order,আবর্তক অর্ডার
 DocType: Company,Default Income Account,ডিফল্ট আয় অ্যাকাউন্ট
@@ -2677,21 +2709,19 @@
 ,Welcome to ERPNext,ERPNext স্বাগতম
 apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,উদ্ধৃতি লিড
 DocType: Lead,From Customer,গ্রাহকের কাছ থেকে
-apps/erpnext/erpnext/demo/setup_data.py +357,Calls,কল
+apps/erpnext/erpnext/demo/setup/setup_data.py +300,Calls,কল
 DocType: Project,Total Costing Amount (via Time Logs),মোট খোয়াতে পরিমাণ (সময় লগসমূহ মাধ্যমে)
 DocType: Purchase Order Item Supplied,Stock UOM,শেয়ার UOM
-apps/erpnext/erpnext/stock/doctype/item/item.py +466,"As there are existing transactions for this item, \
-							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","সেখানে এই আইটেমটি \ আপনি মান পরিবর্তন করতে পারবেন না জন্য বিদ্যমান লেনদেনের হিসাবে &#39;সিরিয়াল কোন আছে&#39;, &#39;ব্যাচ আছে না&#39;, &#39;স্টক আইটেম&#39; এবং &#39;মূল্যনির্ধারণ পদ্ধতি&#39;"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,Purchase Order {0} is not submitted,অর্ডার {0} দাখিল করা হয় না ক্রয়
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,অভিক্ষিপ্ত
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},সিরিয়াল কোন {0} ওয়্যারহাউস অন্তর্গত নয় {1}
 apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,উল্লেখ্য: {0} পরিমাণ বা পরিমাণ 0 হিসাবে বিতরণ-বহুবার-বুকিং আইটেম জন্য সিস্টেম পরীক্ষা করা হবে না
 DocType: Notification Control,Quotation Message,উদ্ধৃতি পাঠান
 DocType: Issue,Opening Date,খোলার তারিখ
-apps/erpnext/erpnext/schools/api.py +58,Attendance has been marked successfully.,এ্যাটেনডেন্স সফলভাবে হিসাবে চিহ্নিত হয়েছে.
+apps/erpnext/erpnext/schools/api.py +57,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 +136,Account Type for {0} must be {1},অ্যাকাউন্ট ধরন {0} হবে জন্য {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +139,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,উভয় ওয়্যারহাউস একই কোম্পানির অন্তর্গত নয়
@@ -2706,12 +2736,13 @@
 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/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 +20,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 +1190,Please select customer,দয়া করে গ্রাহক নির্বাচন
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1193,Please select customer,দয়া করে গ্রাহক নির্বাচন
 DocType: C-Form,I,আমি
 DocType: Company,Asset Depreciation Cost Center,অ্যাসেট অবচয় মূল্য কেন্দ্র
 DocType: Sales Order Item,Sales Order Date,বিক্রয় আদেশ তারিখ
@@ -2721,6 +2752,7 @@
 ,Payment Period Based On Invoice Date,চালান তারিখ উপর ভিত্তি করে পরিশোধ সময়সীমার
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},নিখোঁজ মুদ্রা বিনিময় হার {0}
 DocType: Assessment,Examiner,পরীক্ষক
+DocType: Student,Siblings,সহোদর
 DocType: Journal Entry,Stock Entry,শেয়ার এণ্ট্রি
 DocType: Payment Entry,Payment References,পেমেন্ট তথ্যসূত্র
 DocType: C-Form,C-FORM-,সি-FORM-
@@ -2738,11 +2770,12 @@
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,টপিক নাম
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,বিক্রি বা কেনার অন্তত একটি নির্বাচন করতে হবে
+DocType: Grading Structure,Grade Intervals,গ্রেড অন্তরাল
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,আপনার ব্যবসার প্রকৃতি নির্বাচন করুন.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,উত্পাদন অপারেশন কোথায় সম্পন্ন হয়.
 DocType: Asset Movement,Source Warehouse,উত্স ওয়্যারহাউস
 DocType: Installation Note,Installation Date,ইনস্টলেশনের তারিখ
-apps/erpnext/erpnext/controllers/accounts_controller.py +534,Row #{0}: Asset {1} does not belong to company {2},সারি # {0}: অ্যাসেট {1} কোম্পানির অন্তর্গত নয় {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +537,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,সেলস ব্যবহারকারী
@@ -2756,28 +2789,31 @@
 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,বর্তমান 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 +111,Date Of Retirement must be greater than Date of Joining,অবসর তারিখ যোগদান তারিখ থেকে বড় হওয়া উচিত
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +49,There were errors while scheduling course on :,ত্রুটিযুক্ত অবশ্যই নির্ধারণ করার সময় ছিল:
 DocType: Sales Invoice,Against Income Account,আয় অ্যাকাউন্টের বিরুদ্ধে
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +87,{0}% Delivered,{0}% বিতরণ করা হয়েছে
+apps/erpnext/erpnext/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}: আদেশ Qty {1} সর্বনিম্ন ক্রম Qty {2} (আইটেমটি সংজ্ঞায়িত) কম হতে পারে না.
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,মাসিক বন্টন শতকরা
 DocType: Territory,Territory Targets,টেরিটরি লক্ষ্যমাত্রা
 DocType: Delivery Note,Transporter Info,স্থানান্তরকারী তথ্য
-apps/erpnext/erpnext/accounts/utils.py +379,Please set default {0} in Company {1},ডিফল্ট {0} কোম্পানি নির্ধারণ করুন {1}
+apps/erpnext/erpnext/accounts/utils.py +456,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,গ্রস লাভ / ক্ষতি
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,অর্ডার আইটেমটি সরবরাহ ক্রয়
 apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,কোম্পানির নাম কোম্পানি হতে পারে না
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,মুদ্রণ টেমপ্লেট জন্য পত্র নেতৃবৃন্দ.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,মুদ্রণ টেমপ্লেট শিরোনাম চালানকল্প যেমন.
+DocType: Student Guardian,Student Guardian,ছাত্র গার্ডিয়ান
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +184,Valuation type charges can not marked as Inclusive,মূল্যনির্ধারণ টাইপ চার্জ সমেত হিসাবে চিহ্নিত করতে পারেন না
 DocType: POS Profile,Update Stock,আপডেট শেয়ার
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,আইটেম জন্য বিভিন্ন UOM ভুল (মোট) নিট ওজন মান হতে হবে. প্রতিটি আইটেমের নিট ওজন একই UOM হয় তা নিশ্চিত করুন.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM হার
 DocType: Asset,Journal Entry for Scrap,স্ক্র্যাপ জন্য জার্নাল এন্ট্রি
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,হুণ্ডি থেকে আইটেম টান অনুগ্রহ
-apps/erpnext/erpnext/accounts/utils.py +349,Journal Entries {0} are un-linked,জার্নাল এন্ট্রি {0}-জাতিসংঘের লিঙ্ক আছে
+apps/erpnext/erpnext/accounts/utils.py +426,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,কোম্পানি এ সুসম্পন্ন খরচ কেন্দ্র উল্লেখ করুন
@@ -2801,6 +2837,7 @@
 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,কমিউনিটি ফোরাম
+DocType: Homepage,"URL for ""All Products""",জন্য &quot;সকল পণ্য&quot; URL টি
 DocType: Leave Application,Leave Balance Before Application,আবেদন করার আগে ব্যালান্স ত্যাগ
 DocType: SMS Center,Send SMS,এসএমএস পাঠান
 DocType: Cheque Print Template,Width of amount in word,শব্দ পরিমাণ প্রস্থ
@@ -2809,7 +2846,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 +29,Current Job Openings,বর্তমান জব
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,Current Job Openings,বর্তমান জব
 DocType: Company,Stock Adjustment Account,শেয়ার সামঞ্জস্য অ্যাকাউন্ট
 DocType: Journal Entry,Write Off,খরচ লেখা
 DocType: Timesheet Detail,Operation ID,অপারেশন আইডি
@@ -2822,7 +2859,7 @@
 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 +850,Show tax break-up,দেখান ট্যাক্স ব্রেক আপ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +841,Show tax break-up,দেখান ট্যাক্স ব্রেক আপ
 apps/erpnext/erpnext/accounts/party.py +308,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} ওয়্যারহাউস বিরুদ্ধে অস্তিত্ব অত: পর আপনি পুনরায় দায়িত্ব অর্পণ করা বা এটা পরিবর্তন করতে পারেন"
@@ -2832,10 +2869,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 +534,Please select Posting Date before selecting Party,দয়া করে পার্টির নির্বাচন সামনে পোস্টিং তারিখ নির্বাচন
 DocType: Serial No,Out of AMC,এএমসি আউট
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +80,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 +162,Please contact to the user who have Sales Master Manager {0} role,সেলস মাস্টার ম্যানেজার {0} ভূমিকা আছে যারা ব্যবহারকারীর সাথে যোগাযোগ করুন
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +195,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 +5,This is based on the attendance of this Student,এই শিক্ষার্থী উপস্থিতির উপর ভিত্তি করে
@@ -2844,12 +2882,11 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,প্রসবের নোট {0} এই সেলস অর্ডার বাতিলের আগে বাতিল করা হবে
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +75,Paid amount + Write Off Amount can not be greater than Grand Total,প্রদত্ত পরিমাণ পরিমাণ সর্বমোট তার চেয়ে অনেক বেশী হতে পারে না বন্ধ লিখুন + +
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,{0} is not a valid Batch Number for Item {1},{0} আইটেম জন্য একটি বৈধ ব্যাচ নম্বর নয় {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +138,Note: There is not enough leave balance for Leave Type {0},উল্লেখ্য: ছুটি টাইপ জন্য যথেষ্ট ছুটি ভারসাম্য নেই {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,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,সুযোগ ধরন
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,নতুন কোম্পানি
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,Cost Center is required for 'Profit and Loss' account {0},খরচ কেন্দ্র &#39;লাভ ও ক্ষতি&#39; জন্য প্রয়োজন বোধ করা হয় অ্যাকাউন্ট {0}
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,লেনদেন শুধুমাত্র কোম্পানী স্রষ্টার দ্বারা মুছে ফেলা হতে পারে
 apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,জেনারেল লেজার সাজপোশাকটি ভুল সংখ্যক পাওয়া. আপনি লেনদেনের একটি ভুল অ্যাকাউন্ট নির্বাচিত করেছি.
 DocType: Cheque Print Template,Cheque Width,চেক প্রস্থ
@@ -2858,16 +2895,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,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 +228,{0} '{1}' is disabled,{0} '{1}' নিষ্ক্রিয়
+apps/erpnext/erpnext/controllers/accounts_controller.py +231,{0} '{1}' is disabled,{0} '{1}' নিষ্ক্রিয়
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ওপেন হিসাবে সেট করুন
 DocType: Cheque Print Template,Scanned Cheque,স্ক্যান করা চেক
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,জমা লেনদেনের পরিচিতিতে স্বয়ংক্রিয় ইমেল পাঠান.
+DocType: Timesheet,Total Billable Amount,মোট বিলযোগ্য পরিমাণ
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,আইটেম 3
 DocType: Purchase Order,Customer Contact Email,গ্রাহক যোগাযোগ ইমেইল
 DocType: Warranty Claim,Item and Warranty Details,আইটেম এবং পাটা বিবরণ
 DocType: Sales Team,Contribution (%),অবদান (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,উল্লেখ্য: পেমেন্ট ভুক্তি থেকে তৈরি করা হবে না &#39;ক্যাশ বা ব্যাংক একাউন্ট&#39; উল্লেখ করা হয়নি
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Responsibilities,দায়িত্ব
+apps/erpnext/erpnext/controllers/accounts_controller.py +78,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,দায়িত্ব
 DocType: Expense Claim Account,Expense Claim Account,ব্যয় দাবি অ্যাকাউন্ট
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,টেমপ্লেট
 DocType: Sales Person,Sales Person Name,সেলস পারসন নাম
@@ -2875,6 +2913,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,ব্যবহারকারী যুক্ত করুন
 DocType: Pricing Rule,Item Group,আইটেমটি গ্রুপ
 DocType: Item,Safety Stock,নিরাপত্তা স্টক
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,আইটেম কোড&gt; আইটেম গ্রুপ&gt; ব্র্যান্ড
 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),কর ও চার্জ যোগ (কোম্পানি একক)
@@ -2884,7 +2923,6 @@
 DocType: Item,Default BOM,ডিফল্ট BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Please re-type company name to confirm,পুনরায় টাইপ কোম্পানি নাম নিশ্চিত অনুগ্রহ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +67,Total Outstanding Amt,মোট বিশিষ্ট মাসিক
-DocType: Timesheet,Total Hours,মোট ঘণ্টা
 DocType: Journal Entry,Printing Settings,মুদ্রণ সেটিংস
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Total Debit must be equal to Total Credit. The difference is {0},মোট ডেবিট মোট ক্রেডিট সমান হতে হবে. পার্থক্য হল {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,স্বয়ংচালিত
@@ -2897,13 +2935,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,বিনিয়োগ ব্যাংকিং
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +71,Cash or Bank Account is mandatory for making payment entry,ক্যাশ বা ব্যাংক একাউন্ট পেমেন্ট এন্ট্রি করার জন্য বাধ্যতামূলক
 DocType: Purchase Invoice,Price List Exchange Rate,মূল্য তালিকা বিনিময় হার
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,গ্রাহক&gt; গ্রাহক গ্রুপের&gt; টেরিটরি
 DocType: Purchase Invoice Item,Rate,হার
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Intern,অন্তরীণ করা
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,অন্তরীণ করা
 DocType: Stock Entry,From BOM,BOM থেকে
 DocType: Assessment,Assessment Code,অ্যাসেসমেন্ট কোড
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +32,Basic,মৌলিক
+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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',&#39;নির্মাণ সূচি&#39; তে ক্লিক করুন
+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 +95,Reference No is mandatory if you entered Reference Date,আপনি রেফারেন্স তারিখ প্রবেশ যদি রেফারেন্স কোন বাধ্যতামূলক
@@ -2912,11 +2951,11 @@
 DocType: Salary Slip,Salary Structure,বেতন কাঠামো
 DocType: Account,Bank,ব্যাংক
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,বিমানসংস্থা
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +752,Issue Material,ইস্যু উপাদান
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +723,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 +683,You are in offline mode. You will not be able to reload until you have network.,আপনি অফলাইন মোডে হয়. আপনি যতক্ষণ না আপনি নেটওয়ার্ক আছে রিলোড করতে সক্ষম হবে না.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +665,You are in offline mode. You will not be able to reload until you have network.,আপনি অফলাইন মোডে হয়. আপনি যতক্ষণ না আপনি নেটওয়ার্ক আছে রিলোড করতে সক্ষম হবে না.
 DocType: Hub Settings,Access Token,অ্যাক্সেস টোকেন
 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,ক্রমিক নং
@@ -2924,33 +2963,35 @@
 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 +1122,Enter value must be positive,লিখুন মান ধনাত্মক হবে
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,All Territories,সমস্ত অঞ্চল
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1125,Enter value must be positive,লিখুন মান ধনাত্মক হবে
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,সমস্ত অঞ্চল
 DocType: Purchase Invoice,Items,চলছে
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +23,Student is already enrolled.,ছাত্র ইতিমধ্যে নথিভুক্ত করা হয়.
 DocType: Fiscal Year,Year Name,সাল নাম
 DocType: Process Payroll,Process Payroll,প্রক্রিয়া বেতনের
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,কার্যদিবসের তুলনায় আরো ছুটির এই মাস আছে.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +233,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 +96,Request for Quotations,উদ্ধৃতি জন্য অনুরোধ
+apps/erpnext/erpnext/hooks.py +104,Request for Quotations,উদ্ধৃতি জন্য অনুরোধ
 DocType: Payment Reconciliation,Maximum Invoice Amount,সর্বাধিক চালান পরিমাণ
 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 +628,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',বৈকল্পিক জন্য মেজার ডিফল্ট ইউনিট &#39;{0}&#39; টেমপ্লেট হিসাবে একই হতে হবে &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',বৈকল্পিক জন্য মেজার ডিফল্ট ইউনিট &#39;{0}&#39; টেমপ্লেট হিসাবে একই হতে হবে &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,ভিত্তি করে গণনা
 DocType: Delivery Note Item,From Warehouse,গুদাম থেকে
 DocType: Assessment,Supervisor Name,সুপারভাইজার নাম
+DocType: Assessment,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,ক্রয় ব্যবহারকারী
 DocType: Notification Control,Customize the Notification,বিজ্ঞপ্তি কাস্টমাইজ করুন
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Cash Flow from Operations,অপারেশন থেকে নগদ প্রবাহ
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,ডিফল্ট ঠিকানা টেমপ্লেট মোছা যাবে না
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,ডিফল্ট ঠিকানা টেমপ্লেট মোছা যাবে না
 DocType: Sales Invoice,Shipping Rule,শিপিং রুল
 DocType: Manufacturer,Limited to 12 characters,12 অক্ষরের মধ্যে সীমাবদ্ধ
 DocType: Journal Entry,Print Heading,প্রিন্ট শীর্ষক
@@ -2965,8 +3006,8 @@
 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/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,উভয় ক্ষেত্রেই লক্ষ্য Qty বা টার্গেট পরিমাণ বাধ্যতামূলক
-apps/erpnext/erpnext/stock/get_item_details.py +485,No default BOM exists for Item {0},কোন ডিফল্ট BOM আইটেমটি জন্য বিদ্যমান {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +336,Please select Posting Date first,প্রথম পোস্টিং তারিখ নির্বাচন করুন
+apps/erpnext/erpnext/stock/get_item_details.py +486,No default BOM exists for Item {0},কোন ডিফল্ট BOM আইটেমটি জন্য বিদ্যমান {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +326,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,বিদ্যমান লেনদেন সঙ্গে খরচ কেন্দ্র খতিয়ান রূপান্তরিত করা যাবে না
@@ -2982,6 +3023,7 @@
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,চালানসমূহ সঙ্গে ম্যাচ পেমেন্টস্
 DocType: Journal Entry,Bank Entry,ব্যাংক এণ্ট্রি
 DocType: Authorization Rule,Applicable To (Designation),প্রযোজ্য (পদবী)
+,Profitability Analysis,লাভজনকতা বিশ্লেষণ
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,কার্ট যোগ করুন
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,গ্রুপ দ্বারা
 DocType: Guardian,Interests,রুচি
@@ -2994,21 +3036,21 @@
 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 +141,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",ধারাবাহিকভাবে আইটেম {0} শেয়ার রিকনসিলিয়েশন ব্যবহার \ আপডেট করা যাবে না
 DocType: Scheduling Tool,Day,দিন
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,নতুন সিরিয়াল কোন গুদাম থাকতে পারে না. গুদাম স্টক এন্ট্রি বা কেনার রসিদ দ্বারা নির্ধারণ করা হবে
 DocType: Lead,Lead Type,লিড ধরন
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,You are not authorized to approve leaves on Block Dates,আপনি ব্লক তারিখগুলি উপর পাতার অনুমোদন যথাযথ অনুমতি নেই
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,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,ডিফল্ট উপাদান অনুরোধ প্রকার
-DocType: Student Applicant,AP.,পি.
 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 +639,Point of Sale,বিক্রয় বিন্দু
+apps/erpnext/erpnext/accounts/page/pos/pos.js +634,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,কর
 DocType: Production Planning Tool,Production Planning Tool,উৎপাদন পরিকল্পনা টুল
@@ -3017,74 +3059,77 @@
 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 +373,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 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 Profile,Customer Group,গ্রাহক গ্রুপ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,Expense account is mandatory for item {0},ব্যয় অ্যাকাউন্ট আইটেমের জন্য বাধ্যতামূলক {0}
 DocType: Item,Website Description,ওয়েবসাইট বর্ণনা
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date must be on or after today,পরবর্তী অবচয় তারিখ উপর বা আজ পরে হতে হবে
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,ইক্যুইটি মধ্যে নিট পরিবর্তন
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +145,Please cancel Purchase Invoice {0} first,ক্রয় চালান {0} বাতিল অনুগ্রহ প্রথম
 DocType: Serial No,AMC Expiry Date,এএমসি মেয়াদ শেষ হওয়ার তারিখ
 ,Sales Register,সেলস নিবন্ধন
 DocType: Quotation,Quotation Lost Reason,উদ্ধৃতি লস্ট কারণ
+apps/erpnext/erpnext/utilities/doctype/address/address.py +164,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,ডিফল্ট ঠিকানা টেমপ্লেট পাওয়া. সেটআপ&gt; ছাপানো ও ব্র্যান্ডিং&gt; ঠিকানা টেমপ্লেট থেকে একটি নতুন তৈরি করুন.
 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 +330,Transaction reference no {0} dated {1},লেনদেন রেফারেন্স কোন {0} তারিখের {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Transaction reference no {0} dated {1},লেনদেন রেফারেন্স কোন {0} তারিখের {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,সম্পাদনা করার কিছুই নেই.
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,Summary for this month and pending activities,এই মাস এবং স্থগিত কার্যক্রম জন্য সারসংক্ষেপ
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,এই মাস এবং স্থগিত কার্যক্রম জন্য সারসংক্ষেপ
 DocType: Customer Group,Customer Group Name,গ্রাহক গ্রুপ নাম
 apps/erpnext/erpnext/public/js/financial_statements.js +54,Cash Flow Statement,ক্যাশ ফ্লো বিবৃতি
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Please remove this Invoice {0} from C-Form {1},সি-ফরম থেকে এই চালান {0} মুছে ফেলুন দয়া করে {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,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 +644,Get Items,জানানোর পান
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +623,Get Items,জানানোর পান
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +210,Please enter Write Off Account,"অ্যাকাউন্ট বন্ধ লিখতে লিখতে, অনুগ্রহ করে"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,শেষ আদেশ তারিখ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +41,Account {0} does not belongs to company {1},অ্যাকাউন্ট {0} আছে কোম্পানীর জন্যে না {1}
+DocType: Student,Guardian Details,গার্ডিয়ান বিবরণ
 DocType: C-Form,C-Form,সি-ফরম
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,একাধিক কর্মীদের জন্য মার্ক এ্যাটেনডেন্স
 DocType: Payment Request,Initiated,প্রবর্তিত
 DocType: Production Order,Planned Start Date,পরিকল্পনা শুরুর তারিখ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,Customer is required against Receivable account {0},গ্রাহক হিসাবের প্রাপ্য অ্যাকাউন্ট বিরুদ্ধে প্রয়োজন বোধ করা হয় {0}
 DocType: Serial No,Creation Document Type,ক্রিয়েশন ডকুমেন্ট টাইপ
 DocType: Leave Type,Is Encash,ভাঙ্গান হয়
 DocType: Purchase Invoice,Mobile No,মোবাইল নাম্বার
 DocType: Leave Allocation,New Leaves Allocated,নতুন পাতার বরাদ্দ
-apps/erpnext/erpnext/controllers/trends.py +265,Project-wise data is not available for Quotation,প্রকল্প-ভিত্তিক তথ্য উদ্ধৃতি জন্য উপলব্ধ নয়
+apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,প্রকল্প-ভিত্তিক তথ্য উদ্ধৃতি জন্য উপলব্ধ নয়
 DocType: Project,Expected End Date,সমাপ্তি প্রত্যাশিত তারিখ
 DocType: Budget Account,Budget Amount,বাজেট পরিমাণ
 DocType: Appraisal Template,Appraisal Template Title,মূল্যায়ন টেমপ্লেট শিরোনাম
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,Commercial,ব্যবসায়িক
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,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 +648,Row {0}# Account must be of type 'Fixed Asset',সারি {0} # অ্যাকাউন্ট ধরনের হতে হবে &#39;ফিক্সড অ্যাসেট&#39;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,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 +30,Series is mandatory,সিরিজ বাধ্যতামূলক
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +50,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}
 DocType: Leave Allocation,Unused leaves,অব্যবহৃত পাতার
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Cr,CR
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Cr,CR
 DocType: Tax Rule,Billing State,বিলিং রাজ্য
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +250,Transfer,হস্তান্তর
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +187,{0} {1} does not associated with Party Account {2},{0} {1} পার্টির অ্যাকাউন্টের সাথে যুক্ত না {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,Fetch exploded BOM (including sub-assemblies),(সাব-সমাহারগুলি সহ) অপ্রমাণিত BOM পান
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +254,Transfer,হস্তান্তর
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +190,{0} {1} does not associated with Party Account {2},{0} {1} পার্টির অ্যাকাউন্টের সাথে যুক্ত না {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +796,Fetch exploded BOM (including sub-assemblies),(সাব-সমাহারগুলি সহ) অপ্রমাণিত BOM পান
 DocType: Authorization Rule,Applicable To (Employee),প্রযোজ্য (কর্মচারী)
-apps/erpnext/erpnext/controllers/accounts_controller.py +115,Due Date is mandatory,দরুন জন্ম বাধ্যতামূলক
+apps/erpnext/erpnext/controllers/accounts_controller.py +118,Due Date is mandatory,দরুন জন্ম বাধ্যতামূলক
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,অ্যাট্রিবিউট জন্য বর্ধিত {0} 0 হতে পারবেন না
 DocType: Journal Entry,Pay To / Recd From,থেকে / Recd যেন পে
 DocType: Naming Series,Setup Series,সেটআপ সিরিজ
 DocType: Payment Reconciliation,To Invoice Date,তারিখ চালান
 DocType: Supplier,Contact HTML,যোগাযোগ এইচটিএমএল
 ,Inactive Customers,নিষ্ক্রিয় গ্রাহকরা
+DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,ক্রয় রসিদের
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,কিভাবে প্রাইসিং নিয়ম প্রয়োগ করা হয়?
 DocType: Quality Inspection,Delivery Note No,হুণ্ডি কোন
@@ -3093,7 +3138,7 @@
 DocType: Company,Retail,খুচরা
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +120,Customer {0} does not exist,গ্রাহক {0} অস্তিত্ব নেই
 DocType: Attendance,Absent,অনুপস্থিত
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +587,Product Bundle,পণ্য সমষ্টি
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Product Bundle,পণ্য সমষ্টি
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Invalid reference {1},সারি {0}: অবৈধ উল্লেখ {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,কর ও শুল্ক টেমপ্লেট ক্রয়
 DocType: Upload Attendance,Download Template,ডাউনলোড টেমপ্লেট
@@ -3103,8 +3148,8 @@
 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 +742,Send Supplier Emails,সরবরাহকারী ইমেইল পাঠান
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +104,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","বেতন ইতিমধ্যে মধ্যে {0} এবং {1}, আবেদন সময়ের ত্যাগ এই তারিখ সীমার মধ্যে হতে পারে না সময়ের জন্য প্রক্রিয়া."
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +708,Send Supplier Emails,সরবরাহকারী ইমেইল পাঠান
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,"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,গার্ডিয়ান সুদ
 DocType: Timesheet,Employee Detail,কর্মচারী বিস্তারিত
@@ -3115,9 +3160,9 @@
 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,রোজগার &amp; সিদ্ধান্তগ্রহণ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +77,Account {0} cannot be a Group,অ্যাকাউন্ট {0} একটি গ্রুপ হতে পারে না
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} cannot be a Group,অ্যাকাউন্ট {0} একটি গ্রুপ হতে পারে না
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +31,Optional. This setting will be used to filter in various transactions.,ঐচ্ছিক. এই সেটিং বিভিন্ন লেনদেন ফিল্টার ব্যবহার করা হবে.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +107,Negative Valuation Rate is not allowed,নেতিবাচক মূল্যনির্ধারণ হার অনুমোদিত নয়
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,নেতিবাচক মূল্যনির্ধারণ হার অনুমোদিত নয়
 DocType: Holiday List,Weekly Off,সাপ্তাহিক ছুটি
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","যেমন 2012, 2012-13 জন্য"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +39,Provisional Profit / Loss (Credit),প্রোভিশনাল লাভ / ক্ষতি (ক্রেডিট)
@@ -3131,16 +3176,16 @@
 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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: খরচ কেন্দ্র আইটেম জন্য বাধ্যতামূলক {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +626,Get Items from Product Bundle,পণ্য সমষ্টি থেকে আইটেম পেতে
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +605,Get Items from Product Bundle,পণ্য সমষ্টি থেকে আইটেম পেতে
 DocType: Asset,Straight Line,সোজা লাইন
 DocType: Project User,Project User,প্রকল্প ব্যবহারকারী
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} is inactive,অ্যাকাউন্ট {0} নিষ্ক্রীয়
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} is inactive,অ্যাকাউন্ট {0} নিষ্ক্রীয়
 DocType: GL Entry,Is Advance,অগ্রিম
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,জন্ম তারিখ এবং উপস্থিত এ্যাটেনডেন্স বাধ্যতামূলক
 apps/erpnext/erpnext/controllers/buying_controller.py +148,Please enter 'Is Subcontracted' as Yes or No,হ্যাঁ অথবা না হিসাবে &#39;আউটসোর্স থাকলে&#39; দয়া করে প্রবেশ করুন
 DocType: Sales Team,Contact No.,যোগাযোগের নম্বর.
 DocType: Bank Reconciliation,Payment Entries,পেমেন্ট দাখিলা
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,'Profit and Loss' type account {0} not allowed in Opening Entry,এন্ট্রি খোলা অনুমোদিত নয় &#39;লাভ ও ক্ষতি&#39; টাইপ অ্যাকাউন্ট {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +71,'Profit and Loss' type account {0} not allowed in Opening Entry,এন্ট্রি খোলা অনুমোদিত নয় &#39;লাভ ও ক্ষতি&#39; টাইপ অ্যাকাউন্ট {0}
 DocType: Program Enrollment Tool,Get Students From,থেকে শিক্ষার্থীরা পান
 DocType: Hub Settings,Seller Country,বিক্রেতা দেশ
 apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,ওয়েবসাইটে আইটেম প্রকাশ
@@ -3159,7 +3204,7 @@
 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 +558,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","সারি # {0}: অ্যাসেট {1} জমা দেওয়া যাবে না, এটা আগে থেকেই {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +561,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","সারি # {0}: অ্যাসেট {1} জমা দেওয়া যাবে না, এটা আগে থেকেই {2}"
 DocType: Tax Rule,Billing Country,বিলিং দেশ
 DocType: Production Order,Expected Delivery Date,প্রত্যাশিত প্রসবের তারিখ
 apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,ডেবিট ও ক্রেডিট {0} # জন্য সমান নয় {1}. পার্থক্য হল {2}.
@@ -3172,13 +3217,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +202,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: Sales Order,% Amount Billed,% পরিমাণ দেখানো হয়েছিল
+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 +117,No Item with Serial No {0},সিরিয়াল সঙ্গে কোনো আইটেম {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,খোলা বিজ্ঞপ্তি
+DocType: Email Digest,Open Notifications,খোলা বিজ্ঞপ্তি
 DocType: Payment Entry,Difference Amount (Company Currency),পার্থক্য পরিমাণ (কোম্পানি মুদ্রা)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,সরাসরি খরচ
 apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
@@ -3186,7 +3231,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,নতুন গ্রাহক রাজস্ব
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,ভ্রমণ খরচ
 DocType: Maintenance Visit,Breakdown,ভাঙ্গন
-apps/erpnext/erpnext/controllers/accounts_controller.py +634,Account: {0} with currency: {1} can not be selected,অ্যাকাউন্ট: {0} একক সঙ্গে: {1} নির্বাচন করা যাবে না
+apps/erpnext/erpnext/controllers/accounts_controller.py +637,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}
 DocType: Program Enrollment Tool,Student Applicants,ছাত্র আবেদনকারীদের
@@ -3194,15 +3239,15 @@
 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 +56,Probation,পরীক্ষাকাল
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Probation,পরীক্ষাকাল
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,বেতন উপাদান
 DocType: Program Enrollment Tool,New Academic Year,নতুন শিক্ষাবর্ষ
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Payment of salary for the month {0} and year {1},মাসের জন্য বেতন পরিশোধ {0} এবং বছরের {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Payment of salary for the month {0} and year {1},মাসের জন্য বেতন পরিশোধ {0} এবং বছরের {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,অটো সন্নিবেশ মূল্য তালিকা হার অনুপস্থিত যদি
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,মোট প্রদত্ত পরিমাণ
 DocType: Production Order Item,Transferred Qty,স্থানান্তর করা Qty
 apps/erpnext/erpnext/config/learn.py +11,Navigating,সমুদ্রপথে
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Planning,পরিকল্পনা
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,পরিকল্পনা
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,জারি
 DocType: Project,Total Billing Amount (via Time Logs),মোট বিলিং পরিমাণ (সময় লগসমূহ মাধ্যমে)
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,We sell this Item,আমরা এই আইটেম বিক্রয়
@@ -3215,11 +3260,10 @@
 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/accounts/page/pos/pos.js +1376,Sales invoice submitted sucessfully.,সেলস চালান সফলভাবে জমা দেওয়া হয়েছে.
 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}
 DocType: Assessment Result,Student Name,শিক্ষার্থীর নাম
-apps/erpnext/erpnext/hooks.py +104,Assessment Schedule,অ্যাসেসমেন্ট সূচি
+apps/erpnext/erpnext/hooks.py +113,Assessment Schedule,অ্যাসেসমেন্ট সূচি
 DocType: Brand,Item Manager,আইটেম ম্যানেজার
 DocType: Buying Settings,Default Supplier Type,ডিফল্ট সরবরাহকারী ধরন
 DocType: Production Order,Total Operating Cost,মোট অপারেটিং খরচ
@@ -3229,6 +3273,7 @@
 DocType: GL Entry,Party Type,পার্টি শ্রেণী
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +78,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 না"
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,বেতন টেমপ্লেট মাস্টার.
 DocType: Leave Type,Max Days Leave Allowed,সর্বাধিক দিন ছেড়ে প্রেজেন্টেশন
@@ -3240,18 +3285,19 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,বিশালাকার বা গ্রাহকরা কোট.
 DocType: Stock Settings,Role Allowed to edit frozen stock,ভূমিকা হিমায়িত শেয়ার সম্পাদনা করতে পারবেন
 ,Territory Target Variance Item Group-Wise,টেরিটরি উদ্দিষ্ট ভেদাংক আইটেমটি গ্রুপ-প্রজ্ঞাময়
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Customer Groups,সকল গ্রাহকের গ্রুপ
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +78,Accumulated Monthly,সঞ্চিত মাসিক
-apps/erpnext/erpnext/controllers/accounts_controller.py +595,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} বাধ্যতামূলক. হয়তো মুদ্রা বিনিময় রেকর্ড {1} {2} করার জন্য তৈরি করা হয় না.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,সকল গ্রাহকের গ্রুপ
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +81,Accumulated Monthly,সঞ্চিত মাসিক
+apps/erpnext/erpnext/controllers/accounts_controller.py +598,{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} অস্তিত্ব নেই
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),মূল্যতালিকা হার (কোম্পানি একক)
 DocType: Products Settings,Products Settings,পণ্য সেটিংস
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +188,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} সেটআপ&gt; সেটিংস মাধ্যমে&gt; নেমিং সিরিজ সিরিজ নেমিং নির্ধারণ করুন
 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 +84,Secretary,সম্পাদক
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,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,ক্রয়
@@ -3260,24 +3306,22 @@
 ,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,অ্যাসেসমেন্ট নাম
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,সারি # {0}: সিরিয়াল কোন বাধ্যতামূলক
+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 +859,Supplier Quotation,সরবরাহকারী উদ্ধৃতি
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +838,Supplier Quotation,সরবরাহকারী উদ্ধৃতি
 DocType: Quotation,In Words will be visible once you save the Quotation.,আপনি উধৃতি সংরক্ষণ একবার শব্দ দৃশ্যমান হবে.
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +7,Collect Fees,ফি সংগ্রহ
+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}
 DocType: Lead,Add to calendar on this date,এই তারিখে ক্যালেন্ডারে যোগ
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,শিপিং খরচ যোগ করার জন্য বিধি.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,আসন্ন ঘটনাবলী
 DocType: Item,Opening Stock,খোলা স্টক
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,গ্রাহক প্রয়োজন বোধ করা হয়
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} ফিরার জন্য বাধ্যতামূলক
 DocType: Purchase Order,To Receive,গ্রহণ করতে
 apps/erpnext/erpnext/public/js/setup_wizard.js +195,user@example.com,user@example.com
-DocType: Email Digest,Income / Expense,আয় / ব্যয়
 DocType: Employee,Personal Email,ব্যক্তিগত ইমেইল
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,মোট ভেদাংক
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","সক্রিয় করা হলে, সিস্টেম স্বয়ংক্রিয়ভাবে পরিসংখ্যা জন্য অ্যাকাউন্টিং এন্ট্রি পোস্ট করতে হবে."
@@ -3288,13 +3332,14 @@
 DocType: Customer,From Lead,লিড
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,আদেশ উৎপাদনের জন্য মুক্তি.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,ফিস্ক্যাল বছর নির্বাচন ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,POS Profile required to make POS Entry,পিওএস প্রোফাইল পিওএস এন্ট্রি করতে প্রয়োজন
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +509,POS Profile required to make POS Entry,পিওএস প্রোফাইল পিওএস এন্ট্রি করতে প্রয়োজন
 DocType: Program Enrollment Tool,Enroll Students,শিক্ষার্থীরা তালিকাভুক্ত
 DocType: Hub Settings,Name Token,নাম টোকেন
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,স্ট্যান্ডার্ড বিক্রি
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Atleast one warehouse is mandatory,অন্তত একটি গুদাম বাধ্যতামূলক
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +129,Atleast one warehouse is mandatory,অন্তত একটি গুদাম বাধ্যতামূলক
 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 +330,{0} against Sales Invoice {1},{0} বিক্রয় চালান বিরুদ্ধে {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,প্রকল্পের নাম
@@ -3315,10 +3360,11 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,পাতার 0.5 এর গুণিতক বরাদ্দ করা আবশ্যক
 DocType: Production Order,Operation Cost,অপারেশন খরচ
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,একটি CSV ফাইল থেকে উপস্থিতি আপলোড
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,বিশিষ্ট মাসিক
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,সেট লক্ষ্যমাত্রা আইটেমটি গ্রুপ-ভিত্তিক এই বিক্রয় ব্যক্তি.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],ফ্রিজ স্টক চেয়ে পুরোনো [দিন]
-apps/erpnext/erpnext/controllers/accounts_controller.py +528,Row #{0}: Asset is mandatory for fixed asset purchase/sale,সারি # {0}: অ্যাসেট স্থায়ী সম্পদ ক্রয় / বিক্রয়ের জন্য বাধ্যতামূলক
+apps/erpnext/erpnext/controllers/accounts_controller.py +531,Row #{0}: Asset is mandatory for fixed asset purchase/sale,সারি # {0}: অ্যাসেট স্থায়ী সম্পদ ক্রয় / বিক্রয়ের জন্য বাধ্যতামূলক
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","দুই বা ততোধিক দামে উপরোক্ত অবস্থার উপর ভিত্তি করে পাওয়া যায়, অগ্রাধিকার প্রয়োগ করা হয়. ডিফল্ট মান শূন্য (ফাঁকা) যখন অগ্রাধিকার 0 থেকে 20 এর মধ্যে একটি সংখ্যা হয়. উচ্চতর সংখ্যা একই অবস্থার সঙ্গে একাধিক প্রাইসিং নিয়ম আছে যদি তা প্রাধান্য নিতে হবে."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,অর্থবছরের: {0} না বিদ্যমান
 DocType: Currency Exchange,To Currency,মুদ্রা
@@ -3335,15 +3381,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,ব্যক্তিগত মালিকানা
 DocType: Maintenance Visit,Customer Feedback,গ্রাহকের প্রতিক্রিয়া
 DocType: Account,Expense,ব্যয়
-DocType: Sales Invoice,Exhibition,প্রদর্শনী
 apps/erpnext/erpnext/utilities/doctype/address/address.py +77,"Company is mandatory, as it is your company address","কোম্পানি, বাধ্যতামূলক হিসাবে এটা আপনার কোম্পানীর ঠিকানা"
 DocType: Item Attribute,From Range,পরিসর থেকে
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +81,Syntax error in formula or condition: {0},সূত্র বা অবস্থায় বাক্যগঠন ত্রুটি: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +92,Syntax error in formula or condition: {0},সূত্র বা অবস্থায় বাক্যগঠন ত্রুটি: {0}
 apps/erpnext/erpnext/stock/utils.py +99,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 +28,Jobs,জবস
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,জবস
 ,Sales Order Trends,বিক্রয় আদেশ প্রবণতা
 DocType: Employee,Held On,অনুষ্ঠিত
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,উত্পাদনের আইটেম
@@ -3352,16 +3398,16 @@
 DocType: Stock Entry Detail,Additional Cost,অতিরিক্ত খরচ
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,আর্থিক বছরের শেষ তারিখ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","ভাউচার কোন উপর ভিত্তি করে ফিল্টার করতে পারবে না, ভাউচার দ্বারা গ্রুপকৃত যদি"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +763,Make Supplier Quotation,সরবরাহকারী উদ্ধৃতি করা
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,Make Supplier Quotation,সরবরাহকারী উদ্ধৃতি করা
 DocType: Quality Inspection,Incoming,ইনকামিং
 DocType: BOM,Materials Required (Exploded),উপকরণ (অপ্রমাণিত) প্রয়োজন
 apps/erpnext/erpnext/public/js/setup_wizard.js +185,"Add users to your organization, other than yourself","নিজেকে ছাড়া অন্য, আপনার প্রতিষ্ঠানের ব্যবহারকারীদের যুক্ত করুন"
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,Row # {0}: Serial No {1} does not match with {2} {3},সারি # {0}: সিরিয়াল কোন {1} সঙ্গে মেলে না {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +42,Casual Leave,নৈমিত্তিক ছুটি
+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,নৈমিত্তিক ছুটি
 DocType: Batch,Batch ID,ব্যাচ আইডি
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,Note: {0},উল্লেখ্য: {0}
 ,Delivery Note Trends,হুণ্ডি প্রবণতা
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +103,This Week's Summary,এই সপ্তাহের সংক্ষিপ্ত
+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} শুধুমাত্র স্টক লেনদেনের মাধ্যমে আপডেট করা যাবে
 DocType: Student Group Creation Tool,Get Courses,কোর্স করুন
 DocType: GL Entry,Party,পার্টি
@@ -3371,7 +3417,7 @@
 DocType: Request for Quotation Item,Request for Quotation Item,উদ্ধৃতি আইটেম জন্য অনুরোধ
 DocType: Purchase Order,To Bill,বিল
 DocType: Material Request,% Ordered,% আদেশ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Piecework,ফুরণ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Piecework,ফুরণ
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,গড়. রাজধানীতে হার
 DocType: Task,Actual Time (in Hours),(ঘন্টায়) প্রকৃত সময়
 DocType: Employee,History In Company,কোম্পানি ইন ইতিহাস
@@ -3388,7 +3434,7 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +350,{0} units of {1} needed in {2} to complete this transaction.,{0} একক {1} {2} এই লেনদেন সম্পন্ন করার জন্য প্রয়োজন.
 DocType: SMS Settings,SMS Settings,এসএমএস সেটিংস
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Temporary Accounts,অস্থায়ী অ্যাকাউন্ট
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Black,কালো
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,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} উত্পাদিত আইটেম
@@ -3399,13 +3445,13 @@
 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 +69,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,মার্ক অনুপস্থিত
 DocType: Journal Entry Account,Exchange Rate,বিনিময় হার
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Sales Order {0} is not submitted,বিক্রয় আদেশ {0} দাখিল করা হয় না
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +527,Sales Order {0} is not submitted,বিক্রয় আদেশ {0} দাখিল করা হয় না
 DocType: Homepage,Tag Line,ট্যাগ লাইন
 DocType: Fee Component,Fee Component,ফি কম্পোনেন্ট
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +857,Add items from,থেকে আইটেম যোগ করুন
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +836,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: Cheque Print Template,Regular,নিয়মিত
 DocType: BOM,Last Purchase Rate,শেষ কেনার হার
@@ -3413,6 +3459,7 @@
 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} থেকে ভিন্নতা আছে
 ,Sales Person-wise Transaction Summary,সেলস পারসন অনুসার লেনদেন সংক্ষিপ্ত
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +60,Cost Center is required for 'Profit and Loss' account {0}. Please set up a default Cost Center for the Company.,মূল্য কেন্দ্র &#39;লাভ-ক্ষতির একাউন্ট {0} জন্য প্রয়োজন বোধ করা হয়. অনুগ্রহ করে এখানে ক্লিক করুন জন্য একটি ডিফল্ট মূল্য কেন্দ্র স্থাপন করা.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,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,মাসিক বন্টন শতকরা
@@ -3423,12 +3470,12 @@
 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 +710,Online,অনলাইন
+apps/erpnext/erpnext/accounts/page/pos/pos.js +692,Online,অনলাইন
 ,Available Stock for Packing Items,প্যাকিং আইটেম জন্য উপলব্ধ স্টক
 DocType: Item Variant,Item Variant,আইটেম ভেরিয়েন্ট
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,অন্য কোন ডিফল্ট আছে হিসাবে ডিফল্ট হিসেবে এই ঠিকানায় টেমপ্লেট সেটিং
+apps/erpnext/erpnext/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'","ইতিমধ্যে ডেবিট অ্যাকাউন্ট ব্যালেন্স, আপনি &#39;ক্রেডিট&#39; হিসেবে &#39;ব্যালেন্স করতে হবে&#39; সেট করার অনুমতি দেওয়া হয় না"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Quality Management,গুনমান ব্যবস্থাপনা
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,গুনমান ব্যবস্থাপনা
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,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,কর্মচারী বাহ্যিক কাজের ইতিহাস
@@ -3450,11 +3497,12 @@
 DocType: Student,Student Email ID,স্টুডেন্ট ইমেইল আইডি
 DocType: Employee,Notice (days),নোটিশ (দিন)
 DocType: Tax Rule,Sales Tax Template,সেলস ট্যাক্স টেমপ্লেট
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1520,Select items to save the invoice,চালান সংরক্ষণ আইটেম নির্বাচন করুন
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1544,Select items to save the invoice,চালান সংরক্ষণ আইটেম নির্বাচন করুন
 DocType: Employee,Encashment Date,নগদীকরণ তারিখ
 DocType: Account,Stock Adjustment,শেয়ার সামঞ্জস্য
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},ডিফল্ট কার্যকলাপ খরচ কার্যকলাপ টাইপ জন্য বিদ্যমান - {0}
 DocType: Production Order,Planned Operating Cost,পরিকল্পনা অপারেটিং খরচ
+DocType: Academic Term,Term Start Date,টার্ম শুরুর তারিখ
 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,আবেদনকারীর নাম
@@ -3484,17 +3532,17 @@
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,গুদাম (চিরস্থায়ী পরিসংখ্যা) জন্য অ্যাকাউন্ট এই অ্যাকাউন্টের অধীনে তৈরি করা হবে.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +119,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,শেয়ার খতিয়ান এন্ট্রি এই গুদাম জন্য বিদ্যমান হিসাবে ওয়্যারহাউস মোছা যাবে না.
 DocType: Company,Distribution,বিতরণ
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +8,Amount Paid,পরিমাণ অর্থ প্রদান করা
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Project Manager,প্রকল্প ব্যবস্থাপক
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,পরিমাণ অর্থ প্রদান করা
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,প্রকল্প ব্যবস্থাপক
 ,Quoted Item Comparison,উদ্ধৃত আইটেম তুলনা
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Dispatch,প্রাণবধ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,প্রাণবধ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,আইটেম জন্য অনুমোদিত সর্বোচ্চ ছাড়: {0} {1}% হল
 apps/erpnext/erpnext/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.,সেট ক্রেডিট সীমা অতিক্রম লেনদেন জমা করার অনুমতি দেওয়া হয় যে ভূমিকা.
-DocType: Sales Invoice,Supplier Reference,সরবরাহকারী রেফারেন্স
-apps/erpnext/erpnext/accounts/page/pos/pos.js +844,"Master data syncing, it might take some time","মাস্টার ডেটা সিঙ্ক করা, এটা কিছু সময় নিতে পারে"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +832,"Master data syncing, it might take some time","মাস্টার ডেটা সিঙ্ক করা, এটা কিছু সময় নিতে পারে"
 DocType: Item,Material Issue,উপাদান ইস্যু
 DocType: Hub Settings,Seller Description,বিক্রেতা বিবরণ
 DocType: Employee Education,Qualification,যোগ্যতা
@@ -3508,7 +3556,7 @@
 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 +83,Error in formula or condition,সূত্র বা অবস্থায় ত্রুটি
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,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,সব অচিহ্নিত
@@ -3517,7 +3565,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},তারিখ রাজস্ব বছরের মধ্যে হতে হবে. = জন্ম Assuming {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","এখানে আপনি ইত্যাদি উচ্চতা, ওজন, এলার্জি, ঔষধ উদ্বেগ স্থাপন করতে পারে"
 DocType: Leave Block List,Applies to Company,প্রতিষ্ঠানের ক্ষেত্রে প্রযোজ্য
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +197,Cannot cancel because submitted Stock Entry {0} exists,জমা স্টক এণ্ট্রি {0} থাকার কারণে বাতিল করতে পারেন না
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +198,Cannot cancel because submitted Stock Entry {0} exists,জমা স্টক এণ্ট্রি {0} থাকার কারণে বাতিল করতে পারেন না
 DocType: Purchase Invoice,In Words,শব্দসমূহে
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,Today is {0}'s birthday!,আজ {0} এর জন্মদিন!
 DocType: Production Planning Tool,Material Request For Warehouse,গুদাম জন্য উপাদানের জন্য অনুরোধ
@@ -3527,14 +3575,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,তোমার আর্থিক বছরের শুরু
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,অ্যাসেট Depreciations এবং উদ্বৃত্ত
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +319,Amount {0} {1} transferred from {2} to {3},পরিমাণ {0} {1} থেকে স্থানান্তরিত {2} থেকে {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +322,Amount {0} {1} transferred from {2} to {3},পরিমাণ {0} {1} থেকে স্থানান্তরিত {2} থেকে {3}
 DocType: Sales Invoice,Get Advances Received,উন্নতির গৃহীত করুন
 DocType: Email Digest,Add/Remove Recipients,প্রাপক Add / Remove
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +432,Transaction not allowed against stopped Production Order {0},লেনদেন বন্ধ উত্পাদনের বিরুদ্ধে অনুমতি না করার {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +437,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 +143,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 +652,Item variant {0} exists with same attributes,আইটেম বৈকল্পিক {0} একই বৈশিষ্ট্যাবলী সঙ্গে বিদ্যমান
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,আইটেম বৈকল্পিক {0} একই বৈশিষ্ট্যাবলী সঙ্গে বিদ্যমান
+DocType: Leave Application,LAP/,ভাঁজ/
 DocType: Salary Slip,Salary 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,'তারিখ পর্যন্ত' প্রয়োজন
@@ -3542,12 +3591,12 @@
 DocType: Sales Invoice Item,Sales Order Item,সেলস অর্ডার আইটেমটি
 DocType: Salary Slip,Payment Days,পেমেন্ট দিন
 DocType: Customer,Dormant,সুপ্ত
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +212,Warehouses with child nodes cannot be converted to ledger,সন্তানের নোড সঙ্গে গুদাম খাতা থেকে রূপান্তর করা যাবে না
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +215,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: Employee Education,Employee Education,কর্মচারী শিক্ষা
-apps/erpnext/erpnext/public/js/controllers/transaction.js +866,It is needed to fetch Item Details.,এটি একটি আইটেম বিবরণ পেতে প্রয়োজন হয়.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +857,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} ইতিমধ্যে গৃহীত হয়েছে
@@ -3557,14 +3606,14 @@
 DocType: Expense Claim,Total Claimed Amount,দাবি মোট পরিমাণ
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,বিক্রি জন্য সম্ভাব্য সুযোগ.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,Invalid {0},অকার্যকর {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Sick Leave,অসুস্থতাজনিত ছুটি
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,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,ডিপার্টমেন্ট স্টোর
 DocType: Warehouse,PIN,পিন
 DocType: Sales Invoice,Base Change Amount (Company Currency),বেস পরিবর্তন পরিমাণ (কোম্পানি মুদ্রা)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +313,No accounting entries for the following warehouses,নিম্নলিখিত গুদাম জন্য কোন হিসাব এন্ট্রি
-apps/erpnext/erpnext/projects/doctype/project/project.js +102,Save the document first.,প্রথম নথি সংরক্ষণ করুন.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +314,No accounting entries for the following warehouses,নিম্নলিখিত গুদাম জন্য কোন হিসাব এন্ট্রি
+apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,প্রথম নথি সংরক্ষণ করুন.
 DocType: Account,Chargeable,প্রদেয়
 DocType: Company,Change Abbreviation,পরিবর্তন সমাহার
 DocType: Expense Claim Detail,Expense Date,ব্যয় তারিখ
@@ -3577,10 +3626,9 @@
 DocType: Purchase Invoice,Recurring Print Format,পুনরাবৃত্ত মুদ্রণ বিন্যাস
 DocType: C-Form,Series,সিরিজ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,Expected Delivery Date cannot be before Purchase Order Date,প্রত্যাশিত প্রসবের তারিখ ক্রয় আদেশ তারিখের আগে হতে পারে না
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} সেটআপ&gt; সেটিংস মাধ্যমে&gt; নেমিং সিরিজ সিরিজ নেমিং নির্ধারণ করুন
 DocType: Appraisal,Appraisal Template,মূল্যায়ন টেমপ্লেট
 DocType: Item Group,Item Classification,আইটেম সাইট
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Business Development Manager,ব্যবসা উন্নয়ন ব্যবস্থাপক
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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,জেনারেল লেজার
@@ -3590,8 +3638,8 @@
 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 +940,Please select {0} first,প্রথম {0} দয়া করে নির্বাচন করুন
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +749,Batch {0} of Item {1} has expired.,আইটেম এর ব্যাচ {0} {1} মেয়াদ শেষ হয়ে গেছে.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +953,Please select {0} first,প্রথম {0} দয়া করে নির্বাচন করুন
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +757,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,উপমোট
@@ -3608,8 +3656,8 @@
 {% 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 +92,Warehouse not found in the system,ওয়্যারহাউস সিস্টেম অন্তর্ভুক্ত না
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +106,This Month's Summary,এই মাস এর সংক্ষিপ্ত
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,ওয়্যারহাউস সিস্টেম অন্তর্ভুক্ত না
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,এই মাস এর সংক্ষিপ্ত
 DocType: Quality Inspection Reading,Quality Inspection Reading,গুণ পরিদর্শন ফাইন্যান্স
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`ফ্রিজ স্টক পুরাতন Than`% D দিন চেয়ে কম হওয়া দরকার.
 DocType: Tax Rule,Purchase Tax Template,ট্যাক্স টেমপ্লেট ক্রয়
@@ -3619,21 +3667,22 @@
 DocType: Item Customer Detail,Ref Code,সুত্র কোড
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,কর্মচারী রেকর্ড.
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Please set Next Depreciation Date,নির্ধারণ করুন পরবর্তী অবচয় তারিখ
-DocType: Payment Gateway,Payment Gateway,পেমেন্ট গেটওয়ে
 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 +378,Operation Time must be greater than 0 for Operation {0},অপারেশন টাইম অপারেশন জন্য তার চেয়ে অনেক বেশী 0 হতে হবে {0}
+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/accounts/doctype/account/account.py +170,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)
 DocType: Program,Program Abbreviation,প্রোগ্রাম সমাহার
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,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: Appraisal,Start Date,শুরুর তারিখ
@@ -3649,21 +3698,22 @@
 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,চার্জ যে আইটেমটি জন্য প্রযোজ্য নয় যদি আইটেমটি মুছে ফেলুন
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,যেমন. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +27,Transaction currency must be same as Payment Gateway currency,লেনদেনের কারেন্সি পেমেন্ট গেটওয়ে মুদ্রা একক হিসাবে একই হতে হবে
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Transaction currency must be same as Payment Gateway currency,লেনদেনের কারেন্সি পেমেন্ট গেটওয়ে মুদ্রা একক হিসাবে একই হতে হবে
 DocType: Payment Entry,Receive,গ্রহণ করা
+apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,উদ্ধৃতি:
 DocType: Maintenance Visit,Fully Completed,সম্পূর্ণরূপে সম্পন্ন
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% সমাপ্তি
 DocType: Employee,Educational Qualification,শিক্ষাগত যোগ্যতা
 DocType: Workstation,Operating Costs,অপারেটিং খরচ
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,অ্যাকশন যদি সঞ্চিত মাসিক বাজেট অতিক্রম করেছে
 DocType: Purchase Invoice,Submit on creation,জমা দিন সৃষ্টির উপর
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +432,Currency for {0} must be {1},মুদ্রা {0} হবে জন্য {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +435,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 +493,Row {0}: An Reorder entry already exists for this warehouse {1},সারি {0}: একটি রেকর্ডার এন্ট্রি ইতিমধ্যে এই গুদাম জন্য বিদ্যমান {1}
+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/crm/doctype/opportunity/opportunity.py +79,"Cannot declare as lost, because Quotation has been made.","উদ্ধৃতি দেয়া হয়েছে, কারণ যত হারিয়ে ডিক্লেয়ার করতে পারেন না."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,ক্রয় মাস্টার ম্যানেজার
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +429,Production Order {0} must be submitted,অর্ডার {0} দাখিল করতে হবে উৎপাদন
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +434,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,তারিখ থেকে তারিখের আগে হতে পারে না
@@ -3673,25 +3723,27 @@
 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 +181,Totals,সমগ্র
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,সমগ্র
 DocType: BOM,Manufacturing,উৎপাদন
 ,Ordered Items To Be Delivered,আদেশ আইটেম বিতরণ করা
 DocType: Account,Income,আয়
 DocType: Industry Type,Industry Type,শিল্প শ্রেণী
 apps/erpnext/erpnext/templates/includes/cart.js +141,Something went wrong!,কিছু ভুল হয়েছে!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,Warning: Leave application contains following block dates,সতর্কতা: ছুটি আবেদন নিম্নলিখিত ব্লক তারিখ রয়েছে
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +120,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} এই লেনদেন সম্পন্ন করার জন্য ইউনিট.
+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 +181,Organization unit (department) master.,সংগঠনের ইউনিটের (ডিপার্টমেন্ট) মাস্টার.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,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 +793,All records are synced.,সকল রেকর্ড সিঙ্ক করা হয়.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +781,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,জামানতবিহীন ঋণ
 DocType: Cost Center,Cost Center Name,খরচ কেন্দ্র নাম
@@ -3710,21 +3762,20 @@
 DocType: Address,Name of person or organization that this address belongs to.,এই অঙ্ক জন্যে যে ব্যক্তি বা প্রতিষ্ঠানের নাম.
 apps/erpnext/erpnext/public/js/setup_wizard.js +260,Your Suppliers,আপনার সরবরাহকারীদের
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +49,Cannot set as Lost as Sales Order is made.,বিক্রয় আদেশ তৈরি করা হয় যেমন বিচ্ছিন্ন সেট করা যায় না.
-DocType: Student Applicant,Mother's Name,মায়ের নাম
 DocType: Request for Quotation Item,Supplier Part No,সরবরাহকারী পার্ট কোন
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +348,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',কেটে যাবে না যখন আরো মূল্যনির্ধারণ &#39;বা&#39; Vaulation এবং মোট &#39;জন্য নয়
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Received From,থেকে পেয়েছি
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Received From,থেকে পেয়েছি
 DocType: Lead,Converted,ধর্মান্তরিত
 DocType: Item,Has Serial No,সিরিয়াল কোন আছে
 DocType: Employee,Date of Issue,প্রদান এর তারিখ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: {0} থেকে {1} এর জন্য
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +153,Row #{0}: Set Supplier for item {1},সারি # {0}: আইটেমের জন্য সেট সরবরাহকারী {1}
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +93,Row {0}: Hours value must be greater than zero.,সারি {0}: ঘন্টা মান শূন্য থেকে বড় হওয়া উচিত.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +117,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} পাওয়া যাবে না
 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 +172,{0} {1} does not exist,{0} {1} অস্তিত্ব নেই
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +175,{0} {1} does not exist,{0} {1} অস্তিত্ব নেই
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,Please check Multi Currency option to allow accounts with other currency,অন্যান্য মুদ্রা হিসাব অনুমতি মাল্টি মুদ্রা বিকল্প চেক করুন
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +72,Item: {0} does not exist in the system,আইটেম: {0} সিস্টেমের মধ্যে উপস্থিত না
 apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,আপনি হিমায়িত মূল্য নির্ধারণ করার জন্য অনুমতিপ্রাপ্ত নন
@@ -3733,13 +3784,14 @@
 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/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,এ্যাটেনডেন্স ভবিষ্যতে তারিখগুলি জন্য চিহ্নিত করা যাবে না
 DocType: Pricing Rule,Pricing Rule Help,প্রাইসিং শাসন সাহায্য
 DocType: Purchase Taxes and Charges,Account Head,অ্যাকাউন্ট হেড
 apps/erpnext/erpnext/config/stock.py +163,Update additional costs to calculate landed cost of items,আইটেম অবতরণ খরচ নিরূপণ করার জন্য অতিরিক্ত খরচ আপডেট
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Electrical,বৈদ্যুতিক
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Electrical,বৈদ্যুতিক
 DocType: Stock Entry,Total Value Difference (Out - In),মোট মূল্য পার্থক্য (আউট - ইন)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,Row {0}: Exchange Rate is mandatory,সারি {0}: বিনিময় হার বাধ্যতামূলক
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ইউজার আইডি কর্মচারী জন্য নির্ধারণ করে না {0}
@@ -3747,7 +3799,7 @@
 DocType: Item,Customer Code,গ্রাহক কোড
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +210,Birthday Reminder for {0},জন্য জন্মদিনের স্মারক {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,শেষ আদেশ থেকে দিনের
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +292,Debit To account must be a Balance Sheet account,অ্যাকাউন্ট ডেবিট একটি ব্যালান্স শিটের অ্যাকাউন্ট থাকতে হবে
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To account must be a Balance Sheet account,অ্যাকাউন্ট ডেবিট একটি ব্যালান্স শিটের অ্যাকাউন্ট থাকতে হবে
 DocType: Buying Settings,Naming Series,নামকরণ সিরিজ
 DocType: Leave Block List,Leave Block List Name,ব্লক তালিকা নাম
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,স্টক সম্পদ
@@ -3759,11 +3811,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 +301,Salary Slip of employee {0} already created for time sheet {1},কর্মচারীর বেতন স্লিপ {0} ইতিমধ্যে সময় শীট জন্য নির্মিত {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +313,Salary Slip of employee {0} already created for time sheet {1},কর্মচারীর বেতন স্লিপ {0} ইতিমধ্যে সময় শীট জন্য নির্মিত {1}
 DocType: Sales Order Item,Ordered Qty,আদেশ Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +673,Item {0} is disabled,আইটেম {0} নিষ্ক্রিয় করা হয়
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} is disabled,আইটেম {0} নিষ্ক্রিয় করা হয়
 DocType: Stock Settings,Stock Frozen Upto,শেয়ার হিমায়িত পর্যন্ত
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +838,BOM does not contain any stock item,BOM কোনো স্টক আইটেম নেই
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +809,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,বেতন Slips নির্মাণ
@@ -3771,23 +3823,24 @@
 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 +485,Row #{0}: Please set reorder quantity,সারি # {0}: পুনর্বিন্যাস পরিমাণ সেট করুন
+DocType: Sales Invoice Timesheet,Billing Hours,বিলিং ঘন্টা
+apps/erpnext/erpnext/stock/doctype/item/item.py +487,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 +62,Please set {0},সেট করুন {0}
 DocType: Purchase Invoice,Repeat on Day of Month,মাস দিন পুনরাবৃত্তি
 DocType: Employee,Health Details,স্বাস্থ্য বিবরণ
 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,উপরে নির্বাচিত মানদণ্ডের জন্য সব বেতন স্লিপ জমা
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} জিনিসসমূহ সিঙ্ক করা হয়েছে
 DocType: Sales Order,Partly Delivered,আংশিক বিতরণ
-DocType: Sales Invoice,Existing Customer,অবশিষ্ট ক্রেতা
 DocType: Email Digest,Receivables,সম্ভাব্য
+DocType: Lead Source,Lead Source,সীসা উৎস
 DocType: Customer,Additional information regarding the customer.,গ্রাহক সংক্রান্ত অতিরিক্ত তথ্য.
 DocType: Quality Inspection Reading,Reading 5,5 পঠন
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +38,Campaign Name is required,প্রচারাভিযান নাম প্রয়োজন বোধ করা হয়
 DocType: Maintenance Visit,Maintenance Date,রক্ষণাবেক্ষণ তারিখ
 DocType: Purchase Invoice Item,Rejected Serial No,প্রত্যাখ্যাত সিরিয়াল কোন
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +80,Year start date or end date is overlapping with {0}. To avoid please set company,বছর শুরুর তারিখ বা শেষ তারিখ {0} সঙ্গে ওভারল্যাপিং হয়. এড়ানোর জন্য কোম্পানির সেট দয়া
@@ -3795,10 +3848,9 @@
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","একটা উদাহরণ দেই. সিরিজ সেট করা হয় এবং সিরিয়াল কোন লেনদেন উল্লেখ না করা হয়, তাহলে ABCD #####, তারপর স্বয়ংক্রিয় সিরিয়াল নম্বর এই সিরিজের উপর ভিত্তি করে তৈরি করা হবে. আপনি স্পষ্টভাবে সবসময় এই আইটেমটি জন্য সিরিয়াল আমরা উল্লেখ করতে চান তাহলে. এই মানটি ফাঁকা রাখা হয়."
 DocType: Upload Attendance,Upload Attendance,আপলোড এ্যাটেনডেন্স
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +129,BOM and Manufacturing Quantity are required,BOM ও উৎপাদন পরিমাণ প্রয়োজন হয়
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,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,সর্বোচ্চ শক্তি
-DocType: Bank Reconciliation Detail,Amount,পরিমাণ
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM প্রতিস্থাপিত
 ,Sales Analytics,বিক্রয় বিশ্লেষণ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +113,Available {0},উপলভ্য {0}
@@ -3806,14 +3858,14 @@
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,ইমেইল সেট আপ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +96,Please enter default currency in Company Master,কোম্পানি মাস্টার ডিফল্ট মুদ্রা লিখুন দয়া করে
 DocType: Stock Entry Detail,Stock Entry Detail,শেয়ার এন্ট্রি বিস্তারিত
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +100,Daily Reminders,দৈনিক অনুস্মারক
+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/account/account_tree.js +23,New Account Name,নতুন অ্যাকাউন্ট নাম
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,কাঁচামালের সরবরাহ খরচ
 DocType: Selling Settings,Settings for Selling Module,মডিউল বিক্রী জন্য সেটিংস
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Customer Service,গ্রাহক সেবা
+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/config/hr.py +50,Offer candidate a Job.,অপরাধ প্রার্থী একটি কাজের.
@@ -3822,8 +3874,9 @@
 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} একটি স্টক আইটেম হতে হবে
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,প্রগতি গুদাম ডিফল্ট কাজ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1570,Total nos of serial no is not equal to quantity.,ক্রমিক নং মোট টি পরিমাণ সমান নয়.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1594,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,আপডেট সিরিজ সংখ্যা
@@ -3831,9 +3884,10 @@
 DocType: Sales Order,Printing Details,মুদ্রণ বিস্তারিত
 DocType: Task,Closing Date,বন্ধের তারিখ
 DocType: Sales Order Item,Produced Quantity,উত্পাদিত পরিমাণ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Engineer,ইঞ্জিনিয়ার
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Engineer,ইঞ্জিনিয়ার
+DocType: Journal Entry,Total Amount Currency,মোট পরিমাণ মুদ্রা
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,অনুসন্ধান সাব সমাহারগুলি
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Item Code required at Row No {0},আইটেম কোড সারি কোন সময়ে প্রয়োজনীয় {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +398,Item Code required at Row No {0},আইটেম কোড সারি কোন সময়ে প্রয়োজনীয় {0}
 DocType: Sales Partner,Partner Type,সাথি ধরন
 DocType: Purchase Taxes and Charges,Actual,আসল
 DocType: Authorization Rule,Customerwise Discount,Customerwise ছাড়
@@ -3849,16 +3903,18 @@
 DocType: BOM,Raw Material Cost,কাঁচামাল খরচ
 DocType: Item Reorder,Re-Order Level,পুনর্বিন্যাস স্তর
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"আপনি প্রকাশনা আদেশ বাড়াতে বা বিশ্লেষণের জন্য কাঁচামাল ডাউনলোড করতে চান, যার জন্য জিনিস এবং পরিকল্পনা Qty লিখুন."
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +55,Part-time,খন্ডকালীন
+apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,Gantt চার্ট
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,খন্ডকালীন
 DocType: Employee,Applicable Holiday List,প্রযোজ্য ছুটির তালিকা
 DocType: Employee,Cheque,চেক
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,সিরিজ আপডেট
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +57,Series Updated,সিরিজ আপডেট
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,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 +87,Clearance Date updated,পরিস্কারের তারিখ আপডেট
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,সফলভাবে মীমাংসা
@@ -3872,7 +3928,7 @@
 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 +513,Posting date and posting time is mandatory,তারিখ পোস্টিং এবং সময় পোস্ট বাধ্যতামূলক
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,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.,আপনি ক্রয় আদেশ সংরক্ষণ একবার শব্দ দৃশ্যমান হবে.
@@ -3882,7 +3938,7 @@
 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/stock/doctype/stock_entry/stock_entry.py +158,Target warehouse in row {0} must be same as Production Order,{0} সারিতে উদ্দিষ্ট গুদাম উৎপাদন অর্ডার হিসাবে একই হতে হবে
+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,মুদ্রা একক কিছু অন্যান্য মুদ্রা ব্যবহার এন্ট্রি করার পর পরিবর্তন করা যাবে না
 DocType: Company,Round Off Account,অ্যাকাউন্ট বন্ধ বৃত্তাকার
@@ -3891,23 +3947,22 @@
 DocType: Customer Group,Parent Customer Group,মূল ক্রেতা গ্রুপ
 DocType: Purchase Invoice,Contact Email,যোগাযোগের ই - মেইল
 DocType: Appraisal Goal,Score Earned,স্কোর অর্জিত
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Notice Period,বিজ্ঞপ্তি সময়কাল
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,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 +4,New Sales Person Name,নতুন সেলস পারসন নাম
 DocType: Packing Slip,Gross Weight UOM,গ্রস ওজন UOM
-DocType: Email Digest,Receivables / Payables,সম্ভাব্য / Payables
 DocType: Delivery Note Item,Against Sales Invoice,বিক্রয় চালান বিরুদ্ধে
 DocType: Bin,Reserved Qty for Production,উত্পাদনের জন্য Qty সংরক্ষিত
 DocType: Asset,Frequency of Depreciation (Months),অবচয় এর ফ্রিকোয়েন্সি (মাস)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +469,Credit Account,ক্রেডিট অ্যাকাউন্ট
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Credit Account,ক্রেডিট অ্যাকাউন্ট
 DocType: Landed Cost Item,Landed Cost Item,ল্যান্ড খরচ আইটেমটি
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +55,Show zero values,শূন্য মান দেখাও
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,শূন্য মান দেখাও
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,আইটেমের পরিমাণ কাঁচামাল দেওয়া পরিমাণে থেকে repacking / উত্পাদন পরে প্রাপ্ত
 apps/erpnext/erpnext/public/js/setup_wizard.js +315,Setup a simple website for my organization,সেটআপ আমার প্রতিষ্ঠানের জন্য একটি সহজ ওয়েবসাইট
 DocType: Payment Reconciliation,Receivable / Payable Account,গ্রহনযোগ্য / প্রদেয় অ্যাকাউন্ট
 DocType: Delivery Note Item,Against Sales Order Item,বিক্রয় আদেশ আইটেমটি বিরুদ্ধে
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Please specify Attribute Value for attribute {0},অ্যাট্রিবিউট মূল্য গুন উল্লেখ করুন {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},অ্যাট্রিবিউট মূল্য গুন উল্লেখ করুন {0}
 DocType: Item,Default Warehouse,ডিফল্ট ওয়্যারহাউস
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +39,Budget cannot be assigned against Group Account {0},বাজেট গ্রুপ অ্যাকাউন্ট বিরুদ্ধে নিয়োগ করা যাবে না {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,ঊর্ধ্বতন খরচ কেন্দ্র লিখুন দয়া করে
@@ -3929,19 +3984,22 @@
 DocType: Journal Entry,Total Debit,খরচের অঙ্ক
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,ডিফল্ট তৈরি পণ্য গুদাম
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,সেলস পারসন
-DocType: Sales Invoice,Cold Calling,মৃদু ডাক
 DocType: SMS Parameter,SMS Parameter,এসএমএস পরামিতি
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,বাজেট এবং খরচ কেন্দ্র
 DocType: Maintenance Schedule Item,Half Yearly,অর্ধ বার্ষিক
 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 +253,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 +141,Set as Lost,লস্ট হিসেবে সেট
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,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 +5,This is based on transactions against this Customer. See timeline below for details,এই গ্রাহকের বিরুদ্ধে লেনদেনের উপর ভিত্তি করে তৈরি. বিস্তারিত জানার জন্য নিচের টাইমলাইনে দেখুন
 DocType: Supplier,Credit Days Based On,ক্রেডিট দিনের উপর ভিত্তি করে
@@ -3953,11 +4011,10 @@
 ,Items To Be Requested,চলছে অনুরোধ করা
 DocType: Purchase Order,Get Last Purchase Rate,শেষ কেনার হার পেতে
 DocType: Company,Company Info,প্রতিষ্ঠানের তথ্য
-apps/erpnext/erpnext/accounts/page/pos/pos.js +941,Select or add new customer,নির্বাচন বা নতুন গ্রাহক যোগ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +930,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 +5,This is based on the attendance of this Employee,এই কর্মচারী উপস্থিতি উপর ভিত্তি করে
-DocType: Sales Invoice,Frequency,ফ্রিকোয়েন্সি
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +463,Debit Account,ডেবিট অ্যাকাউন্ট
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Debit Account,ডেবিট অ্যাকাউন্ট
 DocType: Fiscal Year,Year Start Date,বছরের শুরু তারিখ
 DocType: Attendance,Employee Name,কর্মকর্তার নাম
 DocType: Sales Invoice,Rounded Total (Company Currency),গোলাকৃতি মোট (কোম্পানি একক)
@@ -3966,27 +4023,27 @@
 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 +210,Supplier Quotation {0} created,সরবরাহকারী উদ্ধৃতি {0} সৃষ্টি
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +208,Supplier Quotation {0} created,সরবরাহকারী উদ্ধৃতি {0} সৃষ্টি
 apps/erpnext/erpnext/accounts/report/financial_statements.py +90,End Year cannot be before Start Year,শেষ বছরের শুরুর বছর আগে হতে পারবে না
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Employee Benefits,কর্মচারীর সুবিধা
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,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 +228,Please set a default Holiday List for Employee {0} or Company {1},একটি ডিফল্ট কর্মচারী জন্য হলিডে তালিকা নির্ধারণ করুন {0} বা কোম্পানির {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +232,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 +499,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},সারি কোন {0}: পরিমাণ ব্যয় দাবি {1} বিরুদ্ধে পরিমাণ অপেক্ষারত তার চেয়ে অনেক বেশী হতে পারে না. অপেক্ষারত পরিমাণ {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +500,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},সারি কোন {0}: পরিমাণ ব্যয় দাবি {1} বিরুদ্ধে পরিমাণ অপেক্ষারত তার চেয়ে অনেক বেশী হতে পারে না. অপেক্ষারত পরিমাণ {2}
 DocType: Maintenance Schedule,Schedule,সময়সূচি
 DocType: Account,Parent Account,মূল অ্যাকাউন্ট
 DocType: Quality Inspection Reading,Reading 3,3 পড়া
 ,Hub,হাব
 DocType: GL Entry,Voucher Type,ভাউচার ধরন
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1007,Price List not found or disabled,মূল্য তালিকা পাওয়া বা প্রতিবন্ধী না
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1008,Price List not found or disabled,মূল্য তালিকা পাওয়া বা প্রতিবন্ধী না
 DocType: Expense Claim,Approved,অনুমোদিত
 DocType: Pricing Rule,Price,মূল্য
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +244,Employee relieved on {0} must be set as 'Left',{0} নির্ধারণ করা আবশ্যক উপর অব্যাহতিপ্রাপ্ত কর্মচারী &#39;বাম&#39; হিসাবে
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +256,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} প্রদত্ত সময়সীমার মধ্যে কর্মচারী জন্য তৈরি
@@ -3997,12 +4054,12 @@
 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 +259,Please select Employee Record first.,প্রথম কর্মী রেকর্ড নির্বাচন করুন.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +266,Please select Employee Record first.,প্রথম কর্মী রেকর্ড নির্বাচন করুন.
 DocType: POS Profile,Account for Change Amount,পরিমাণ পরিবর্তনের জন্য অ্যাকাউন্ট
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +190,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},সারি {0}: পার্টি / অ্যাকাউন্টের সাথে মেলে না {1} / {2} এ {3} {4}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +235,Please enter Expense Account,ব্যয় অ্যাকাউন্ট লিখুন দয়া করে
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,Please enter Expense Account,ব্যয় অ্যাকাউন্ট লিখুন দয়া করে
 DocType: Account,Stock,স্টক
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,"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 +976,"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,ক্রয় / প্রস্তুত বিস্তারিত
@@ -4017,9 +4074,10 @@
 DocType: Asset Movement,Transaction Date,লেনদেন তারিখ
 DocType: Production Plan Item,Planned Qty,পরিকল্পিত Qty
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,মোট ট্যাক্স
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,For Quantity (Manufactured Qty) is mandatory,পরিমাণ (Qty শিল্পজাত) বাধ্যতামূলক
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,For Quantity (Manufactured Qty) is mandatory,পরিমাণ (Qty শিল্পজাত) বাধ্যতামূলক
 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 +78,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,প্রকৃত আরম্ভের তারিখ
@@ -4034,9 +4092,11 @@
 DocType: Warranty Claim,If different than customer address,গ্রাহক অঙ্ক চেয়ে ভিন্ন যদি
 DocType: BOM Operation,BOM Operation,BOM অপারেশন
 DocType: Purchase Taxes and Charges,On Previous Row Amount,পূর্ববর্তী সারি পরিমাণ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +226,Transfer Asset,ট্রান্সফার অ্যাসেট
+DocType: Student,Home Address,বাসার ঠিকানা
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +227,Transfer Asset,ট্রান্সফার অ্যাসেট
 DocType: POS Profile,POS Profile,পিওএস প্রোফাইল
 apps/erpnext/erpnext/config/schools.py +33,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 +129,"Item {0} is a template, please select one of its variants","{0} আইটেম একটি টেমপ্লেট, তার ভিন্নতা একটি নির্বাচন করুন"
 DocType: Asset,Asset Category,অ্যাসেট শ্রেণী
@@ -4046,8 +4106,8 @@
 DocType: Assessment,Room,কক্ষ
 DocType: Purchase Order,Advance Paid,অগ্রিম প্রদত্ত
 DocType: Item,Item Tax,আইটেমটি ট্যাক্স
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +765,Material to Supplier,সরবরাহকারী উপাদান
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +189,Excise Invoice,আবগারি চালান
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,Material to Supplier,সরবরাহকারী উপাদান
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,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,বর্তমান দায়
@@ -4057,7 +4117,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,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 +136,Credit Card,ক্রেডিট কার্ড
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,ক্রেডিট কার্ড
 DocType: BOM,Item to be manufactured or repacked,আইটেম শিল্পজাত বা repacked করা
 apps/erpnext/erpnext/config/stock.py +174,Default settings for stock transactions.,শেয়ার লেনদেনের জন্য ডিফল্ট সেটিংস.
 DocType: Purchase Invoice,Next Date,পরবর্তী তারিখ
@@ -4065,6 +4125,7 @@
 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: Academic Term,Term End Date,টার্ম শেষ তারিখ
 DocType: Hub Settings,Seller Name,বিক্রেতা নাম
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),কর ও শুল্ক বাদ (কোম্পানি একক)
 DocType: Item Group,General Settings,সাধারণ বিন্যাস
@@ -4076,7 +4137,7 @@
 DocType: Customer,Commission Rate,কমিশন হার
 apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,ভেরিয়েন্ট করুন
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,ডিপার্টমেন্ট দ্বারা ব্লক ছেড়ে অ্যাপ্লিকেশন.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +115,"Payment Type must be one of Receive, Pay and Internal Transfer","পেমেন্ট টাইপ, জখন এক হতে হবে বেতন ও ইন্টারনাল ট্রান্সফার"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +118,"Payment Type must be one of Receive, Pay and Internal Transfer","পেমেন্ট টাইপ, জখন এক হতে হবে বেতন ও ইন্টারনাল ট্রান্সফার"
 apps/erpnext/erpnext/config/selling.py +169,Analytics,বৈশ্লেষিক ন্যায়
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,কার্ট খালি হয়
 DocType: Production Order,Actual Operating Cost,আসল অপারেটিং খরচ
@@ -4091,10 +4152,10 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,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 +92,Designer,ডিজাইনার
+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/accounts/doctype/purchase_invoice/purchase_invoice.py +469,Cost Center is required in row {0} in Taxes table for type {1},ধরণ জন্য খরচ কেন্দ্র সারিতে প্রয়োজন বোধ করা হয় {0} কর টেবিল {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +472,Cost Center is required in row {0} in Taxes table for type {1},ধরণ জন্য খরচ কেন্দ্র সারিতে প্রয়োজন বোধ করা হয় {0} কর টেবিল {1}
 DocType: Program,Program Code,প্রোগ্রাম কোড
 ,Item-wise Purchase Register,আইটেম-বিজ্ঞ ক্রয় নিবন্ধন
 DocType: Batch,Expiry Date,মেয়াদ শেষ হওয়ার তারিখ
@@ -4104,12 +4165,12 @@
 apps/erpnext/erpnext/config/projects.py +13,Project master.,প্রকল্প মাস্টার.
 apps/erpnext/erpnext/controllers/status_updater.py +174,"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 +417, (Half Day),(অর্ধদিবস)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425, (Half Day),(অর্ধদিবস)
 DocType: Supplier,Credit Days,ক্রেডিট দিন
 DocType: Leave Type,Is Carry Forward,এগিয়ে বহন করা হয়
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +740,Get Items from BOM,BOM থেকে জানানোর পান
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +711,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 +549,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},সারি # {0}: পোস্টিং তারিখ ক্রয় তারিখ হিসাবে একই হতে হবে {1} সম্পত্তির {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +552,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,অন্য এক গুদাম থেকে একটি সম্পদ ট্রান্সফার
diff --git a/erpnext/translations/bs.csv b/erpnext/translations/bs.csv
index fe457a3..70ecaac 100644
--- a/erpnext/translations/bs.csv
+++ b/erpnext/translations/bs.csv
@@ -18,11 +18,10 @@
 DocType: Sales Partner,Dealer,Trgovac
 DocType: Employee,Rented,Iznajmljuje
 DocType: Purchase Order,PO-,PO-
-apps/erpnext/erpnext/accounts/report/financial_statements.py +19,Start Year {0} not found.,Početak godine {0} nije pronađen.
 DocType: POS Profile,Applicable for User,Primjenjivo za korisnika
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +191,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Zaustavila proizvodnju Naredba se ne može otkazati, odčepiti to prvi koji će otkazati"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +197,Do you really want to scrap this asset?,Da li zaista želite da ukine ove imovine?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +17,Select Default Supplier,Izaberite snabdjevač
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +192,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Zaustavila proizvodnju Naredba se ne može otkazati, odčepiti to prvi koji će otkazati"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +198,Do you really want to scrap this asset?,Da li zaista želite da ukine ove imovine?
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Izaberite snabdjevač
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Valuta je potreban za Cjenovnik {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Hoće li biti izračunata u transakciji.
 DocType: Address,County,okrug
@@ -42,46 +41,45 @@
 DocType: Sales Invoice,Customer Name,Naziv kupca
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +126,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 +180,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 +183,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 +148,Series Updated Successfully,Serija Updated uspješno
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +149,Series Updated Successfully,Serija Updated uspješno
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Provjeri
 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
-DocType: Quality Inspection Reading,Parameter,Parametar
 apps/erpnext/erpnext/projects/doctype/project/project.py +54,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 +239,New Leave Application,Novi dopust Primjena
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,New Leave Application,Novi dopust Primjena
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +20,Attendance Record {0} exists against Student {1} for Course Schedule {2},Rekord {0} postoji protiv Student {1} za golf Raspored {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Bank Draft,Bank Nacrt
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,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
 DocType: Academic Term,Academic Term,akademski Term
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +13,Material,materijal
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Quantity,Količina
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +511,Accounts table cannot be blank.,Računi stol ne može biti prazan.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +616,Quantity,Količina
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +512,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)
 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/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 +142,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
-DocType: Purchase Invoice,Monthly,Mjesečno
 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/buying/doctype/purchase_order/purchase_order.js +771,Invoice,Faktura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +750,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 +198,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} ne odgovara {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Row # {0}:
+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 +127,Please select Price List,Molimo odaberite Cjenik
@@ -112,8 +110,8 @@
 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 +589,Get items from,Get stavke iz
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +382,Stock cannot be updated against Delivery Note {0},Dionica ne može biti obnovljeno protiv isporuke Napomena {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Get stavke iz
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,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
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Trgovina prehrambenom robom
@@ -122,7 +120,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,mirovinskim fondovima
 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 +156,Salary Structure Missing,Plaća Struktura Missing
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,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
@@ -130,10 +128,11 @@
 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 +156,Credit limit has been crossed for customer {0} {1}/{2},Kreditni limit je prešla za kupca {0} {1} / {2}
-apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;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 +189,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"
 DocType: Tax Rule,Tax Type,Vrste poreza
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +144,You are not authorized to add or update entries before {0},Niste ovlašteni za dodati ili ažurirati unose prije {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,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/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
@@ -143,18 +142,17 @@
 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 +165,Opening,Otvaranje
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,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/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Customer&gt; grupu korisnika&gt; Territory
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Račun plaćaju samo
 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 .
 DocType: Lead,Product Enquiry,Na upit
 DocType: Academic Term,Schools,škole
 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 +335,Please select Company first,Molimo najprije odaberite Company
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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
@@ -164,7 +162,7 @@
 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
 DocType: Purchase Invoice Item,Is Fixed Asset,Fiksni Asset
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Available qty is {0}, you need {1}","Dostupno Količina je {0}, potrebno je {1}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +225,"Available qty is {0}, you need {1}","Dostupno Količina je {0}, potrebno je {1}"
 DocType: Expense Claim Detail,Claim Amount,Iznos štete
 DocType: Employee,Mr,G-din
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Dobavljač Tip / Supplier
@@ -173,26 +171,27 @@
 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: Assessment Result,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 +171,Annual Salary,Godišnja zarada
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Annual Salary,Godišnja zarada
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Stock Troškovi
-apps/erpnext/erpnext/accounts/report/financial_statements.py +22,End Year {0} not found.,Do kraja godine {0} nije pronađen.
 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}
 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 +130,At least one mode of payment is required for POS invoice.,Najmanje jedan način plaćanja je potreban za POS računa.
 DocType: Products Settings,Show Products as a List,Prikaži proizvode kao listu
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Preuzmite Template, popunite odgovarajuće podatke i priložite modifikovani datoteku.
  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 +451,Item {0} is not active or end of life has been reached,Stavka {0} nije aktivan ili kraj života je postignut
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +456,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/controllers/accounts_controller.py +614,"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/controllers/accounts_controller.py +617,"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 +166,Settings for HR Module,Podešavanja modula ljudskih resursa
 DocType: SMS Center,SMS Center,SMS centar
 DocType: Sales Invoice,Change Amount,Promjena Iznos
@@ -204,13 +203,13 @@
 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 +147,Execution,izvršenje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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/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}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,Cost Center {0} does not belong to Company {1},Troška {0} ne pripada Tvrtka {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +100,Cost Center {0} does not belong to Company {1},Troška {0} ne pripada Tvrtka {1}
 DocType: Customer,Individual,Pojedinac
 DocType: Interest,Academics User,akademici korisnika
 DocType: Cheque Print Template,Amount In Figure,Iznos Na slici
@@ -226,30 +225,32 @@
 DocType: Production Planning Tool,Sales Orders,Sales Orders
 DocType: Purchase Taxes and Charges,Valuation,Procjena
 ,Purchase Order Trends,Trendovi narudžbenica kupnje
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,The request for quotation can be accessed by clicking on the following link,Zahtjev za ponudu se može pristupiti klikom na sljedeći link
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,Dodijeli odsustva za godinu.
 DocType: SG Creation Tool Course,SG Creation Tool Course,SG Stvaranje Alat za golf
 DocType: Student Group Creation Tool,Leave blank if you wish to fetch all courses for selected academic term,Ostavite prazno ako želite da donese sve kurseve za odabrane akademsku pojam
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,Insufficient Stock,nedovoljna Stock
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227,Insufficient Stock,nedovoljna Stock
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Onemogućite planiranje kapaciteta i Time Tracking
+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: 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/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} does not belong to Company {1},Konto {0} ne pripada preduzeću {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +86,Account {0} does not belong to Company {1},Konto {0} ne pripada preduzeću {1}
 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}
 DocType: Naming Series,Series List for this Transaction,Serija Popis za ovu transakciju
 DocType: Sales Invoice,Is Opening Entry,Je Otvaranje unos
 DocType: Customer Group,Mention if non-standard receivable account applicable,Spomenite ako nestandardnih potraživanja računa važećim
 DocType: Course Schedule,Instructor Name,instruktor ime
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,For Warehouse is required before Submit,Jer je potrebno Warehouse prije Podnijeti
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,For Warehouse is required before Submit,Jer je potrebno Warehouse prije Podnijeti
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Primljen
 DocType: Sales Partner,Reseller,Prodavač
 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 +1436,"LocalStorage is full , did not save","LocalStorage je puna, nije spasio"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1460,"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}
@@ -262,18 +263,19 @@
 apps/erpnext/erpnext/templates/generators/item.html +78,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 +5,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/leave_application/leave_application.py +206,Only the selected Leave Approver can submit this Leave Application,Samoodabrani Ostavite Odobritelj može podnijeti ovo ostaviti aplikacija
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +213,Only the selected Leave Approver can submit this Leave Application,Samoodabrani Ostavite Odobritelj može podnijeti ovo ostaviti aplikacija
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Olakšavanja Datum mora biti veći od dana ulaska u
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Leaves per Year,Ostavlja per Godina
+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 +103,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}
+DocType: Email Digest,Profit & Loss,Dobiti i gubitka
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,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 +435,Leave Blocked,Ostavite blokirani
-apps/erpnext/erpnext/stock/doctype/item/item.py +669,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 +443,Leave Blocked,Ostavite blokirani
+apps/erpnext/erpnext/stock/doctype/item/item.py +671,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 +83,Annual,godišnji
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +86,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
@@ -281,20 +283,22 @@
 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
 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 +91,Software Developer,Software Developer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Minimalna količina za naručiti
 DocType: Pricing Rule,Supplier Type,Dobavljač Tip
 DocType: Scheduling Tool,Course Start Date,Naravno Ozljede Datum
 DocType: Item,Publish in Hub,Objavite u Hub
+DocType: Student Admission,Student Admission,student Ulaz
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is cancelled,Artikal {0} je otkazan
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Material Request,Materijal zahtjev
+apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} is cancelled,Artikal {0} je otkazan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +823,Material Request,Materijal zahtjev
 DocType: Bank Reconciliation,Update Clearance Date,Ažurirajte provjeri datum
 apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +28,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 +328,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Stavka {0} nije pronađena u &#39;sirovine Isporučuje&#39; sto u narudžbenice {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +333,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/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
@@ -310,20 +314,21 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +130,Please select Charge Type first,Odaberite Naknada za prvi
 DocType: Student Group Student,Student Group Student,Student Group Studentski
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Najnovije
+DocType: Email Digest,New Quotations,Nove ponude
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Prvi dopust Odobritelj na popisu će se postaviti kao zadani Odobritelj dopust
 DocType: Tax Rule,Shipping County,Dostava županije
 apps/erpnext/erpnext/config/desktop.py +158,Learn,Učiti
 DocType: Asset,Next Depreciation Date,Sljedeća Amortizacija Datum
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Aktivnost Trošak po zaposlenom
 DocType: Accounts Settings,Settings for Accounts,Postavke za račune
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +626,Supplier Invoice No exists in Purchase Invoice {0},Dobavljač Račun ne postoji u fakturi {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +629,Supplier Invoice No exists in Purchase Invoice {0},Dobavljač Račun ne postoji u fakturi {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Menadzeri prodaje - Upravljanje.
 DocType: Job Applicant,Cover Letter,Pismo
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Izvanredna Čekovi i depoziti očistiti
 DocType: Item,Synced With Hub,Pohranjen Hub
 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 +348,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 +86,Circular Reference Error,Kružna Reference Error
@@ -335,15 +340,16 @@
 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 +806,Delivery Note,Otpremnica
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +800,Delivery Note,Otpremnica
 apps/erpnext/erpnext/config/learn.py +87,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 +233,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/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/setup/doctype/email_digest/email_digest.py +104,Summary for this week and pending activities,Pregled za ovaj tjedan i aktivnostima na čekanju
+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"
 DocType: Employee,Company Email,Zvanični e-mail
@@ -355,28 +361,29 @@
 apps/erpnext/erpnext/config/hr.py +186,"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
-apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: fakturi ne može se protiv postojeće imovine {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +554,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 +54,{0} already allocated for Employee {1} for period {2} to {3},{0} već izdvojeno za zaposlenog {1} {2} za razdoblje do {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +812,Select Item,Odaberite Item
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +791,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 \
 					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 +142,Purchase Invoice {0} is already submitted,Kupnja Račun {0} već je podnijela
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Row # {0}: serijski br mora biti isti kao {1} {2}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +143,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.
 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 +342,Please see attachment,Pogledajte prilog
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,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 +19,Setup Already Complete!!,Podešavanja je već okončano!!
 ,Finished Goods,gotovih proizvoda
 DocType: Delivery Note,Instructions,Instrukcije
 DocType: Quality Inspection,Inspected By,Provjereno od strane
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Dobavljač&gt; Dobavljač Tip
 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/public/js/utils/item_selector.js +12,Add Items,Dodaj Predmeti
@@ -390,29 +397,29 @@
 DocType: Currency Exchange,Currency Exchange,Mjenjačnica
 DocType: Purchase Invoice Item,Item Name,Naziv artikla
 DocType: Authorization Rule,Approving User  (above authorized value),Odobravanje korisnika (iznad ovlašteni vrijednost)
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Credit Balance
+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/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 +736,Purchase Return,Kupnja Povratak
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +715,Purchase Return,Kupnja Povratak
 ,Purchase Register,Kupnja Registracija
 DocType: 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 +202,{0} ({1}) must have role 'Leave Approver',{0} ({1}) mora imati ulogu 'Leave Approver'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,{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 +143,Reason for losing,Razlog za gubljenje
-apps/erpnext/erpnext/accounts/utils.py +239,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 +163,Reason for losing,Razlog za gubljenje
+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
 DocType: Announcement,Receiver,prijemnik
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation je zatvoren sljedećih datuma po Holiday List: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Prilike
 DocType: Employee,Single,Singl
 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 +225,Please enter Cost Center,Unesite troška
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,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
@@ -425,26 +432,26 @@
 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
 DocType: Account,Is Group,Is Group
+DocType: Email Digest,Pending Purchase Orders,U očekivanju Narudžbenice
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Automatski se postavlja rednim brojevima na osnovu FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Check Dobavljač Faktura Broj Jedinstvenost
 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 +102,Non Profit,Neprofitne
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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: Stock Reconciliation Item,Do not include symbols (ex. $),Ne uključuju simbole (npr. $)
 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 +638,Attribute {0} selected multiple times in Attributes Table,Atribut {0} odabrani više puta u atributi tabeli
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Atribut {0} odabrani više puta u atributi tabeli
 DocType: HR Settings,Employee record is created using selected field. ,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 +862,Please enter Item Code.,Unesite kod artikal .
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +847,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"
@@ -458,12 +465,12 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Vrijednosni papiri i depoziti
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Ukupno lišće dodijeljena je obavezno
 DocType: Job Opening,Description of a Job Opening,Opis posla Otvaranje
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Pending activities for today,Aktivnostima na čekanju za danas
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Aktivnostima na čekanju za danas
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Gledatelja rekord.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Plaća Komponenta za obračun plata na osnovu timesheet.
 DocType: Sales Order Item,Used for Production Plan,Koristi se za plan proizvodnje
 DocType: Manufacturing Settings,Time Between Operations (in mins),Vrijeme između operacije (u min)
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +92,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} budžeta za računa {1} protiv Cost Centar {2} je {3}. To će premašiti po {4}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +95,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} budžeta za računa {1} protiv Cost Centar {2} je {3}. To će premašiti po {4}
 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
@@ -471,16 +478,16 @@
 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/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 +86,Administrative Officer,Administrativni službenik
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,Administrativni službenik
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +23,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 +319,Please select Company,Molimo odaberite Company
-DocType: Stock Entry,Difference Account,Konto razlike
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +309,Please select Company,Molimo odaberite Company
+DocType: Stock Entry Detail,Difference Account,Konto razlike
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,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 +398,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 +399,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 +530,"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 +532,"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 +28,Buy,kupiti
@@ -488,7 +495,7 @@
 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 +1563,Serial no item cannot be a fraction,Serijski br stavka ne može biti frakcija
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1587,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
@@ -497,13 +504,14 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Account {0} does not belong to company: {1},Konto {0} ne pripada preduzeću {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation already used for another company,Skraćenica već koristi za druge kompanije
 DocType: Selling Settings,Default Customer Group,Zadana grupa korisnika
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Supplier is required against Payable account {0},Dobavljač je obavezan protiv plaćaju račun {0}
 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
 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 +313,Reference No and Reference Date is mandatory for Bank transaction,Poziv na broj i referentni datum je obavezan za transakcije banke
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +316,Reference No and Reference Date is mandatory for Bank transaction,Poziv na broj i referentni datum je obavezan za transakcije banke
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Dodaj / uredi poreze i troškove
 DocType: Purchase Invoice,Supplier Invoice No,Dobavljač Račun br
 DocType: Territory,For reference,Za referencu
@@ -514,7 +522,6 @@
 DocType: Installation Note Item,Installation Note Item,Napomena instalacije proizvoda
 DocType: Production Plan Item,Pending Qty,U očekivanju Količina
 DocType: Budget,Ignore,Ignorirati
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Šifra&gt; stavka Group&gt; Brand
 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/config/accounts.py +241,Setup cheque dimensions for printing,dimenzije ček setup za štampanje
 DocType: Salary Slip,Salary Slip Timesheet,Plaća Slip Timesheet
@@ -525,11 +532,11 @@
 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/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 +28,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 +19,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 +707,Make Sales Order,Provjerite prodajnog naloga
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +701,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
@@ -545,7 +552,8 @@
 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 +734,Sales Return,Povrat robe
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +728,Sales Return,Povrat robe
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +91,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)
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Baza potencijalnih kupaca.
@@ -554,14 +562,13 @@
 DocType: Quotation,Quotation To,Ponuda za
 DocType: Lead,Middle Income,Srednji Prihodi
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +212,Opening (Cr),Otvaranje ( Cr )
-apps/erpnext/erpnext/stock/doctype/item/item.py +795,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"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 +237,Allocated amount can not be negative,Dodijeljeni iznos ne može biti negativan
+apps/erpnext/erpnext/stock/doctype/item/item.py +797,Default Unit of Measure for Item {0} cannot be changed directly because 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
 DocType: Purchase Order Item,Billed Amt,Naplaćeni izn
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,A logično Skladište protiv kojih su napravljeni unosa zaliha.
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Prodaja Račun Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},Reference Nema & Reference Datum je potrebno za {0}
-DocType: Sales Invoice,Customer's Vendor,Kupca Prodavatelj
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Proposal Writing,Pisanje prijedlog
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,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"
@@ -570,13 +577,14 @@
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,Time Tracking
 DocType: Fiscal Year Company,Fiscal Year Company,Fiskalna godina Company
 DocType: Packing Slip Item,DN Detail,DN detalj
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +257,Already supplier quotation has created,Već dobavljač citat je stvorio
 DocType: Timesheet,Billed,Naplaćeno
 DocType: Batch,Batch Description,Batch Opis
+apps/erpnext/erpnext/accounts/utils.py +685,"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 +733,View Offline Records,Pogledaj Offline Records
+apps/erpnext/erpnext/accounts/page/pos/pos.js +715,View Offline Records,Pogledaj Offline Records
+DocType: Student,Sibling Details,Polubrat Detalji
 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: Payment Reconciliation,Invoice/Journal Entry Details,Račun / Journal Entry Detalji
@@ -590,7 +598,7 @@
 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
 DocType: Employee,Passport Number,Putovnica Broj
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Manager,menadžer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,menadžer
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,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
@@ -599,10 +607,11 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter email address,Molimo unesite e-mail adresu
 DocType: Production Order Operation,In minutes,U minuta
 DocType: Issue,Resolution Date,Rezolucija Datum
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +299,Timesheet created:,Timesheet created:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +715,Please set default Cash or Bank account in Mode of Payment {0},Molimo postavite zadanu gotovinom ili banka računa u načinu plaćanja {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +300,Timesheet created:,Timesheet created:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +772,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
 DocType: Selling Settings,Customer Naming By,Kupac Imenovanje By
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,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: 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
@@ -627,6 +636,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,završiti
 DocType: Pricing Rule,Sales Manager,Sales Manager
 DocType: Salary Structure Employee,Base,baza
+DocType: Timesheet,Total Billed Hours,Ukupno Fakturisana Hours
 DocType: Journal Entry,Write Off Amount,Napišite paušalni iznos
 DocType: Journal Entry,Bill No,Račun br
 DocType: Company,Gain/Loss Account on Asset Disposal,Dobitak / gubitak računa na Asset Odlaganje
@@ -641,11 +651,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +9,Pre Sales,Pre Sales
 DocType: Purchase Receipt,Other Details,Ostali detalji
 DocType: Account,Accounts,Konta
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Marketing,marketing
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +227,Payment Entry is already created,Plaćanje Ulaz je već stvorena
+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,Plaćanje Ulaz je već stvorena
 DocType: Purchase Receipt Item Supplied,Current Stock,Trenutni Stock
-apps/erpnext/erpnext/controllers/accounts_controller.py +538,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 +21,Preview Salary Slip,Preview Plaća Slip
+apps/erpnext/erpnext/controllers/accounts_controller.py +541,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 +38,Preview Salary Slip,Preview Plaća Slip
 DocType: Company,Deafult Cost Center,Deafult Cost Center
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +48,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
@@ -654,7 +664,7 @@
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,Molimo odaberite Student Group
 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 +617,Item has variants.,Stavka ima varijante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Stavka ima varijante.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,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
@@ -674,7 +684,7 @@
 DocType: Purchase Order,Supply Raw Materials,Supply sirovine
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,Datuma na koji će biti generiran pored fakture. Ona se stvara na dostavi.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Dugotrajna imovina
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,{0} is not a stock Item,{0} ne postoji na zalihama.
+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 +169,Lead must be set if Opportunity is made from Lead,Lead mora biti postavljen ako je prilika iz njega izrađena
@@ -760,26 +770,25 @@
 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 +709,No Permission,Bez dozvole
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +710,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}
 apps/erpnext/erpnext/public/js/setup_wizard.js +298,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 +542,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} moraju biti dostavljeni
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} moraju biti dostavljeni
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Niti jedan zaposlenik pronađena
 DocType: Supplier Quotation,Stopped,Zaustavljen
 DocType: Item,If subcontracted to a vendor,Ako podizvođača na dobavljača
 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.
 DocType: Warehouse,Tree Details,Tree Detalji
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Pošalji odmah
 ,Support Analytics,Podrska za Analitiku
 DocType: Item,Website Warehouse,Web stranica galerije
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimalni iznos fakture
 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/sales_invoice/sales_invoice.py +227,Timesheet {0} is already completed or cancelled,Timesheet {0} je već završen ili otkazan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +259,Timesheet {0} is already completed or cancelled,Timesheet {0} je već završen ili otkazan
 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
@@ -795,13 +804,13 @@
 apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Raspored za golf
 DocType: Maintenance Visit,Completion Status,Završetak Status
 DocType: HR Settings,Enter retirement age in years,Unesite dob za odlazak u penziju u godinama
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +229,Target Warehouse,Ciljana galerija
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +230,Target Warehouse,Ciljana galerija
 DocType: Cheque Print Template,Starting location from left edge,Početna lokacija od lijevog ruba
 DocType: Item,Allow over delivery or receipt upto this percent,Dozvolite preko isporuke ili primitka upto ovu posto
 DocType: Stock Entry,STE-,ste-
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Sales Order Date,Očekuje se dostava Datum ne može biti prije prodajnog naloga Datum
 DocType: Upload Attendance,Import Attendance,Uvoz posjećenost
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Sve grupe artikala
+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/config/setup.py +89,Automatically compose message on submission of transactions.,Automatski nova poruka na podnošenje transakcija .
@@ -813,13 +822,15 @@
 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/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
 DocType: Expense Claim,Expenses,troškovi
 DocType: Item Variant Attribute,Item Variant Attribute,Stavka Variant Atributi
 ,Purchase Receipt Trends,Račun kupnje trendovi
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Research & Development,Istraživanje i razvoj
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Istraživanje i razvoj
 ,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
@@ -828,7 +839,7 @@
 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/controllers/accounts_controller.py +340,"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."
+apps/erpnext/erpnext/controllers/accounts_controller.py +343,"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
@@ -850,12 +861,12 @@
 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 +756,Purchase Receipt,Račun kupnje
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +735,Purchase Receipt,Račun kupnje
 ,Received Items To Be Billed,Primljeni Proizvodi se naplaćuje
 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 +167,Reference Doctype must be one of {0},Referentni Doctype mora biti jedan od {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +282,Unable to find Time Slot in the next {0} days for Operation {1},U nemogućnosti da pronađe termin u narednih {0} dana za operaciju {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +170,Reference Doctype must be one of {0},Referentni Doctype mora biti jedan od {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,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 +439,BOM {0} must be active,BOM {0} mora biti aktivna
@@ -866,7 +877,7 @@
 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 +214,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 +217,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
@@ -880,9 +891,9 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Zaposlenik {0} nije aktivan ili ne postoji
 DocType: Fee Structure,Components,komponente
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,Please enter Asset Category in Item {0},Molimo vas da unesete imovine Kategorija tačke {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +612,Item Variants {0} updated,Stavka Varijante {0} ažurirani
+apps/erpnext/erpnext/stock/doctype/item/item.py +614,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 +843,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 +854,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
@@ -897,69 +908,72 @@
 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 +728,New Sales Invoice,Prodaja novih Račun
+apps/erpnext/erpnext/accounts/page/pos/pos.js +710,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 +728,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
 DocType: Material Request Item,Lead Time Date,Datum i vrijeme Lead-a
 DocType: Guardian,Guardian Name,Guardian ime
 DocType: Cheque Print Template,Has Print Format,Ima Print Format
-apps/erpnext/erpnext/accounts/page/pos/pos.js +86, 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 +109,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 +619,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","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/page/pos/pos.js +75, 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 +613,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing 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 +606,Supplier Invoice Date cannot be greater than Posting Date,Dobavljač Datum računa ne može biti veći od Datum knjiženja
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +609,Supplier Invoice Date cannot be greater than Posting Date,Dobavljač Datum računa ne može biti veći od Datum knjiženja
 DocType: Purchase Invoice Item,Purchase Order Item,Narudžbenica predmet
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +130,Indirect Income,Neizravni dohodak
 DocType: Cheque Print Template,Date Settings,Datum Postavke
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Varijacija
 ,Company Name,Naziv preduzeća
 DocType: SMS Center,Total Message(s),Ukupno poruka ( i)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +810,Select Item for Transfer,Izaberite Stavka za transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +789,Select Item for Transfer,Izaberite Stavka za transfer
 DocType: Purchase Invoice,Additional Discount Percentage,Dodatni popust Procenat
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Pogledaj listu svih snimke Pomoć
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Odaberite račun šefa banke gdje je ček bio pohranjen.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Dopustite korisniku uređivanje cjenika u transakcijama
 DocType: Pricing Rule,Max Qty,Max kol
-DocType: Student Applicant,Father's Name,Očevo ime
 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 +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: Plaćanje protiv Prodaja / narudžbenice treba uvijek biti označeni kao unaprijed
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Hemijski
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +686,All items have already been transferred for this Production Order.,Svi predmeti su već prebačen za ovu proizvodnju Order.
+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
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +694,All items have already been transferred for this Production Order.,Svi predmeti su već prebačen za ovu proizvodnju Order.
 DocType: Process Payroll,Select Payroll Year and Month,Odaberite plata i godina Mjesec
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,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
-DocType: Opportunity,Walk In,Ulaz u
 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 +12,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: Timesheet Detail,Bill,račun
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,White,Bijel
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,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
 DocType: SMS Center,All Lead (Open),Svi potencijalni kupci (aktualni)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +228,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})
+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 +731,Make ,Napraviti
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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 .
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Moja košarica
-apps/erpnext/erpnext/controllers/selling_controller.py +154,Order Type must be one of {0},Tip narudžbe mora biti jedan od {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Tip narudžbe mora biti jedan od {0}
 DocType: Lead,Next Contact Date,Datum sledeceg kontaktiranja
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Otvaranje Kol
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +393,Please enter Account for Change Amount,Unesite račun za promjene Iznos
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,Please enter Account for Change Amount,Unesite račun za promjene Iznos
 DocType: Student Batch,Student Batch Name,Student Batch Ime
 DocType: Holiday List,Holiday List Name,Naziv liste odmora
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js +8,Schedule Course,Raspored predmeta
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Stock Options,Stock Opcije
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Stock Opcije
 DocType: Journal Entry Account,Expense Claim,Rashodi polaganja
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +211,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 +237,Qty for {0},Količina za {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +212,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 +238,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
@@ -968,9 +982,9 @@
 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/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Ukloniti stavke bez promjene u količini ili vrijednosti.
+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 +635,Attribute table is mandatory,Atribut sto je obavezno
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Atribut sto je obavezno
 DocType: Production Planning Tool,Get Sales Orders,Kreiraj narudžbe
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{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
@@ -995,7 +1009,7 @@
 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/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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Serijski Ne {0} je pod ugovorom za održavanje upto {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +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
@@ -1007,7 +1021,7 @@
 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/controllers/selling_controller.py +231,Sales Order {0} is {1},Prodajnog naloga {0} je {1}
+apps/erpnext/erpnext/controllers/selling_controller.py +232,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
 DocType: Packing Slip,Net Weight UOM,Težina mjerna jedinica
@@ -1017,25 +1031,24 @@
 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
 DocType: Sales Person,Select company name first.,Prvo odaberite naziv preduzeća.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Dr,Doktor
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Dr,Doktor
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Ponude dobijene od dobavljača.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},Za {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Prosječna starost
 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/templates/pages/home.html +32,View All Products,Pogledaj sve proizvode
+apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Pogledaj sve proizvode
 DocType: Company,Default Currency,Zadana valuta
 DocType: Contact,Enter designation of this Contact,Upišite oznaku ove Kontakt
 DocType: Expense Claim,From Employee,Od zaposlenika
-apps/erpnext/erpnext/controllers/accounts_controller.py +400,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
+apps/erpnext/erpnext/controllers/accounts_controller.py +403,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/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,i godina:
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +191,{0} {1} must be submitted,{0} {1} mora biti podnesen
-DocType: Email Digest,Annual Expense,Godišnji trošak
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,{0} {1} must be submitted,{0} {1} mora biti podnesen
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +145,Quantity must be less than or equal to {0},Količina mora biti manji ili jednak {0}
 DocType: SMS Center,Total Characters,Ukupno Likovi
 apps/erpnext/erpnext/controllers/buying_controller.py +156,Please select BOM in BOM field for Item {0},Molimo odaberite BOM BOM u polje za Stavka {0}
@@ -1046,30 +1059,31 @@
 DocType: Sales Partner,Distributor,Distributer
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Košarica Shipping pravilo
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +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 +62,Please set 'Apply Additional Discount On',Molimo podesite &#39;primijeniti dodatne popusta na&#39;
+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
 DocType: Global Defaults,Global Defaults,Globalne zadane postavke
 apps/erpnext/erpnext/projects/doctype/project/project.py +153,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
 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 +327,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
 ,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 +362,Finished Item {0} must be entered for Manufacture type entry,Završio Stavka {0} mora biti unesen za tip Proizvodnja unos
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +367,Finished Item {0} must be entered for Manufacture type entry,Završio Stavka {0} mora biti unesen za tip Proizvodnja unos
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Otvaranje Računovodstvo Balance
 DocType: Sales Invoice Advance,Sales Invoice Advance,Predujam prodajnog računa
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +499,Nothing to request,Ništa se zatražiti
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +500,Nothing to request,Ništa se zatražiti
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',"' Stvarni datum početka ' ne može biti veći od stvarnog datuma završetka """
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Management,upravljanje
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},Ili debitna ili kreditna iznos potreban za {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,upravljanje
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +55,Either debit or credit amount is required for {0},Ili debitna ili kreditna iznos potreban za {0}
 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 +161,Blue,Plava boja
+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
@@ -1079,12 +1093,12 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +23,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
 DocType: Stock Settings,Default Item Group,Zadana grupa proizvoda
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1374,Do you really want to submit the invoice?,Da li zaista želite da dostavi fakturu?
+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 +685,Cost Center For Item with Item Code ',Troška Za Stavke sa Šifra '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1526,"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 +679,Cost Center For Item with Item Code ',Troška Za Stavke sa Šifra '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1550,"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/accounts/doctype/account/account_tree.js +26,"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
@@ -1104,104 +1118,106 @@
 DocType: Payment Reconciliation,Unreconciled Payment Details,Nesaglašen Detalji plaćanja
 DocType: Global Defaults,Current Fiscal Year,Tekuće fiskalne godine
 DocType: Global Defaults,Disable Rounded Total,Ugasiti zaokruženi iznos
-DocType: Lead,Call,Poziv
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +417,'Entries' cannot be empty,' Prijave ' ne može biti prazno
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +418,'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 +214,Fiscal Year {0} not found,Fiskalna godina {0} nije pronađen
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +221,Fiscal Year {0} not found,Fiskalna godina {0} nije pronađen
 apps/erpnext/erpnext/config/hr.py +238,Setting up Employees,Postavljanje Zaposlenih
 DocType: Sales Order,SO-,SO-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Odaberite prefiks prvi
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Please select prefix first,Odaberite prefiks prvi
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Research,istraživanje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,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 +43,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 +57,View Ledger,Pogledaj Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Najstarije
-apps/erpnext/erpnext/stock/doctype/item/item.py +504,"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 +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/setup/setup_wizard/setup_wizard.py +437,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
 ,Budget Variance Report,Proračun varijance Prijavi
 DocType: Salary Slip,Gross Pay,Bruto plaća
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +90,Row {0}: Activity Type is mandatory.,Red {0}: Aktivnost Tip je obavezno.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +114,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/public/js/controllers/stock_controller.js +40,Accounting Ledger,Računovodstvo Ledger
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,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
 DocType: BOM Item,Item Description,Opis artikla
+DocType: Student Sibling,Student Sibling,student Polubrat
 DocType: Purchase Invoice,Is Recurring,Je li se ponavlja
 DocType: Purchase Invoice,Supplied Items,Isporučenog pribora
 DocType: Student,STUD.,STUD.
 DocType: Production Order,Qty To Manufacture,Količina za proizvodnju
+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/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 +131,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 +175,Valuation Rate required for Item in row {0},Vrednovanje potrebne za Stavka u nizu objekta {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,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
 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 +87, to ,Za
+apps/erpnext/erpnext/accounts/page/pos/pos.js +76, 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/accounts/doctype/gl_entry/gl_entry.py +196,Not authorized to edit frozen Account {0},Nije ovlašten za uređivanje smrznute račun {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,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 +62,Sales Order {0} is not valid,Prodajnog naloga {0} nije ispravan
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Prodajnog naloga {0} nije ispravan
 apps/erpnext/erpnext/setup/doctype/company/company.py +185,"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 +152,Small,Mali
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,Small,Mali
 DocType: Employee,Employee Number,Zaposlenik Broj
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Slučaj Ne ( i) je već u uporabi . Pokušajte s predmetu broj {0}
 ,Invoiced Amount (Exculsive Tax),Dostavljeni iznos ( Exculsive poreza )
-DocType: Student Applicant,Mother's / Guardian 1 Email ID,Majke / Guardian 1-mail ID
 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 +160,Green,Zelenilo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,Zelenilo
 DocType: Supplier,SUPP-,SUPP-
 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 +57,Contract,ugovor
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,ugovor
 DocType: Email Digest,Add Quote,Dodaj Citat
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +498,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 +503,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 +80,Row {0}: Qty is mandatory,Red {0}: Količina je obvezno
+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 +737,Sync Master Data,Sync Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +719,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/public/js/setup_wizard.js +283,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
+DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,To jekorijen stavka grupa i ne može se mijenjati .
+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 .
 DocType: Journal Entry Account,Purchase Order,Narudžbenica
 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 +345,"{0}: Employee email not found, hence email not sent","{0}: e-mail zaposlenog, stoga-pošte na adresu ne šalje"
+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
 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 +118,"For {0}, only credit accounts can be linked against another debit entry","Za {0}, samo kredit računa može biti povezan protiv drugog ulaska debit"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Delivery Note {0} is not submitted,Otpremnica {0} nije potvrđena
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Delivery Note {0} is not submitted,Otpremnica {0} nije potvrđena
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Sub-contracted Item,Stavka {0} mora bitisklopljen ugovor artikla
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Kapitalni oprema
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Cijene Pravilo prvo se bira na temelju 'Nanesite na' terenu, koji može biti točka, točka Grupa ili Brand."
 DocType: Hub Settings,Seller Website,Prodavač Website
 DocType: Item,ITEM-,Artikl-
-apps/erpnext/erpnext/controllers/selling_controller.py +147,Total allocated percentage for sales team should be 100,Ukupno dodijeljeno postotak za prodajni tim bi trebao biti 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +110,Production Order status is {0},Status radnog naloga je {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Ukupno dodijeljeno postotak za prodajni tim bi trebao biti 100
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Status radnog naloga je {0}
 DocType: Appraisal Goal,Goal,Cilj
 DocType: Sales Invoice Item,Edit Description,Uredi opis
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +757,For Supplier,za Supplier
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +723,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
@@ -1217,10 +1233,11 @@
 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
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +445,BOM {0} does not belong to Item {1},BOM {0} ne pripada Stavka {1}
 DocType: Sales Partner,Target Distribution,Ciljana Distribucija
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1667,Deafault warehouse is required for selected item,Deafault skladište je potreban za izabranu stavku
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Deafault warehouse is required for selected item,Deafault skladište je potreban za izabranu stavku
 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
@@ -1229,23 +1246,23 @@
 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 +110,Hardware,Hardver
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,Hardver
 DocType: Sales Order,Recurring Upto,Ponavljajući Upto
 DocType: Attendance,HR Manager,Šef ljudskih resursa
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Molimo odaberite poduzeća
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Privilege Leave,Privilege dopust
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,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 +79,You need to enable Shopping Cart,Trebate omogućiti Košarica
 DocType: Payment Entry,Writeoff,Otpisati
 DocType: Appraisal Template Goal,Appraisal Template Goal,Procjena Predložak cilja
-DocType: Salary Slip,Earning,Zarada
+DocType: Salary Component,Earning,Zarada
 DocType: Purchase Invoice,Party Account Currency,Party računa valuta
 ,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 +171,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 +174,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_data.py +358,Food,Hrana
+apps/erpnext/erpnext/demo/setup/setup_data.py +301,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/course_schedule/course_schedule.js +103,Mark Attendence,Mark Attendence
@@ -1279,12 +1296,12 @@
 DocType: Sales Order Item,Planned Quantity,Planirana količina
 DocType: Purchase Invoice Item,Item Tax Amount,Iznos poreza artikla
 DocType: Item,Maintain Stock,Održavati Stock
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +209,Stock Entries already created for Production Order ,Stock unosi već stvorene za proizvodnju Order
+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
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,Neto promjena u fiksnoj Asset
 DocType: Leave Control Panel,Leave blank if considered for all designations,Ostavite prazno ako smatra za sve oznake
-apps/erpnext/erpnext/controllers/accounts_controller.py +620,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 +238,Max: {0},Max: {0}
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +15,From Datetime,Od datuma i vremena
+apps/erpnext/erpnext/controllers/accounts_controller.py +623,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 +239,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 +153,"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."
@@ -1292,8 +1309,8 @@
 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 +552,cannot be greater than 100,ne može biti veća od 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +680,Item {0} is not a stock Item,Stavka {0} nijestock Stavka
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +546,cannot be greater than 100,ne može biti veća od 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,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
@@ -1307,10 +1324,9 @@
 DocType: GL Entry,GL Entry,GL ulaz
 DocType: HR Settings,Employee Settings,Postavke zaposlenih
 ,Batch-Wise Balance History,Batch-Wise bilanca Povijest
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,To Do lista
 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 +61,Apprentice,šegrt
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +102,Negative Quantity is not allowed,Negativna količina nije dopuštena
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,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"
@@ -1332,15 +1348,14 @@
 DocType: Asset,Asset Name,Asset ime
 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 +141,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 +719,Packing Slip,Odreskom
+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 +713,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/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,Zahtjev za ponudu može biti pristup klikom sljedeći link
 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 +81,Analyst,analitičar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,analitičar
 DocType: Item,Inventory,Inventar
 DocType: Item,Sales Details,Prodajni detalji
 DocType: Quality Inspection,QI-,QI-
@@ -1348,7 +1363,7 @@
 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 +103,Government,Vlada
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,Vlada
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,Institut ime
 apps/erpnext/erpnext/config/stock.py +289,Item Variants,Stavka Varijante
 DocType: Company,Services,Usluge
@@ -1364,6 +1379,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,Financial Year Start Date,Financijska godina Start Date
 DocType: POS Profile,Apply Discount,Nanesite Popust
 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
 DocType: Program Course,Program Course,program kursa
@@ -1404,12 +1420,12 @@
 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
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +110,Accounting Entry for {0} can only be made in currency: {1},{1}: knjiženju za {0} može se vršiti samo u valuti
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},{1}: knjiženju za {0} može se vršiti samo u valuti
 DocType: Pricing Rule,Pricing Rule,cijene Pravilo
 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
 DocType: Shopping Cart Settings,Payment Success URL,Plaćanje Uspjeh URL
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +78,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: {1} Returned Stavka ne postoji u {2} {3}
+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
@@ -1418,40 +1434,39 @@
 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/stock/doctype/stock_entry/stock_entry.py +339,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Nije dozvoljeno da se više tranfer {0} od {1} protiv narudžbenice {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +344,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 +545,Manufacturing Quantity is mandatory,Proizvodnja Količina je obvezno
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Proizvodnja Količina je obvezno
 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 +71,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 +162,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/projects/doctype/timesheet/timesheet.py +186,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
 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 +130,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 +137,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
 DocType: Dependent Task,Dependent Task,Zavisna Task
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,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/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 +190,Leave of type {0} cannot be longer than {1},Ostavite tipa {0} ne može biti duži od {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +197,Leave of type {0} cannot be longer than {1},Ostavite tipa {0} ne može biti duži od {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Pokušajte planiraju operacije za X dana unaprijed.
 DocType: HR Settings,Stop Birthday Reminders,Zaustavi Rođendan Podsjetnici
 DocType: SMS Center,Receiver List,Lista primalaca
-apps/erpnext/erpnext/accounts/page/pos/pos.js +921,Search Item,Traži Stavka
+apps/erpnext/erpnext/accounts/page/pos/pos.js +910,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 +546,Already completed,već završena
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +22,Payment Request already exists {0},Plaćanje Zahtjev već postoji {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +550,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 +241,Quantity must not be more than {0},Količina ne smije biti više od {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Quantity must not be more than {0},Količina ne smije biti više od {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +76,Previous Financial Year is not closed,Prethodne finansijske godine nije zatvoren
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +44,Age (Days),Starost (dani)
 DocType: Quotation Item,Quotation Item,Artikl iz ponude
@@ -1468,7 +1483,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +221,Purchase Receipt {0} is not submitted,Račun kupnje {0} nije podnesen
 DocType: Company,Default Payable Account,Uobičajeno računa se plaća
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Postavke za online kupovinu košaricu poput shipping pravila, cjenik i sl"
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +83,{0}% Billed,{0}% Fakturisana
+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
@@ -1480,12 +1495,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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/schools/doctype/fees/fees.js +22,Collect,prikupiti
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,prikupiti
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,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 +225,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
-DocType: Payment Reconciliation,Payments,Plaćanja
 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
@@ -1497,7 +1511,7 @@
 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 +9,Procurement,nabavka
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,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/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
 ,Lead Details,Detalji potenciajalnog kupca
 DocType: Purchase Invoice,End date of current invoice's period,Kraj datum tekućeg razdoblja dostavnice
@@ -1522,7 +1536,7 @@
 DocType: Purchase Invoice,Additional Discount,Dodatni popust
 DocType: Selling Settings,Selling Settings,Podešavanja prodaje
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Online aukcije
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +97,Please specify either Quantity or Valuation Rate or both,Navedite ili količini ili vrednovanja Ocijenite ili oboje
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,Navedite ili količini ili vrednovanja Ocijenite ili oboje
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +13,Fulfillment,ispunjenje
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Tvrtka , Mjesec i Fiskalna godina je obvezno"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Troškovi marketinga
@@ -1543,14 +1557,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,ERPNext Setup Complete!
 DocType: Item,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +93,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Grupa kupaca sa istim nazivom već postoji. Promijenite naziv kupca ili promijenite naziv grupe kupaca.
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +126,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
 DocType: Stock Entry,Material Receipt,Materijal Potvrda
 DocType: Homepage,Products,Proizvodi
 DocType: Announcement,Instructor,instruktor
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},Party Tip i stranka je potreban za potraživanja / računa plaćaju {0}
 DocType: 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
@@ -1561,7 +1574,7 @@
 ,Item-wise Sales Register,Stavka-mudri prodaja registar
 DocType: Asset,Gross Purchase Amount,Bruto Kupovina Iznos
 DocType: Asset,Depreciation Method,Način Amortizacija
-apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Offline,Offline
+apps/erpnext/erpnext/accounts/page/pos/pos.js +686,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
@@ -1579,25 +1592,27 @@
 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
 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 +858,Make Purchase Order,Provjerite narudžbenice
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +852,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 +141,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 +148,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
 DocType: Stock Reconciliation,Stock Reconciliation,Kataloški pomirenje
 DocType: Territory,Territory Name,Regija Ime
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +172,Work-in-Progress Warehouse is required before Submit,Rad u tijeku Warehouse je potrebno prije Podnijeti
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,Work-in-Progress Warehouse is required before Submit,Rad u tijeku Warehouse je potrebno prije Podnijeti
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Podnositelj prijave za posao.
 DocType: Purchase Order Item,Warehouse and Reference,Skladište i upute
 DocType: Supplier,Statutory info and other general information about your Supplier,Zakonska info i druge opće informacije o vašem Dobavljaču
-apps/erpnext/erpnext/hooks.py +88,Addresses,Adrese
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Dobavljač&gt; Dobavljač Tip
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +212,Against Journal Entry {0} does not have any unmatched {1} entry,Protiv Journal Entry {0} nema premca {1} unos
+apps/erpnext/erpnext/hooks.py +95,Addresses,Adrese
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +215,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
 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)
 DocType: Sales Order,To Deliver and Bill,Dostaviti i Bill
@@ -1605,11 +1620,10 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,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 +731,Payment,Plaćanje
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,Payment,Plaćanje
 DocType: Production Order Operation,Actual Time and Cost,Stvarno vrijeme i troškovi
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Materijal Zahtjev maksimalno {0} može biti za točku {1} od prodajnog naloga {2}
 DocType: Employee,Salutation,Pozdrav
-DocType: Pricing Rule,Brand,Brend
 DocType: Course,Course Abbreviation,Skraćenica za golf
 DocType: Item,Will also apply for variants,Primjenjivat će se i za varijante
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +142,"Asset cannot be cancelled, as it is already {0}","Imovine ne može biti otkazan, jer je već {0}"
@@ -1621,7 +1635,7 @@
 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 .
 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 +85,Associate,Pomoćnik
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,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
@@ -1629,7 +1643,7 @@
 DocType: Production Planning Tool,Material Requests,materijal Zahtjevi
 DocType: Warranty Claim,Issue Date,Datum izdavanja
 DocType: Activity Cost,Activity Cost,Aktivnost troškova
-DocType: Timesheet Detail,Timesheet Detail,Timesheet Detail
+DocType: Sales Invoice Timesheet,Timesheet Detail,Timesheet Detail
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Potrošeno Kol
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekomunikacije
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Ukazuje da je paket je dio ove isporuke (samo nacrti)
@@ -1652,6 +1666,7 @@
 DocType: Production Plan Material Request,Material Request Date,Materijal Upit Datum
 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
 DocType: Item,Has Variants,Ima Varijante
 DocType: Monthly Distribution,Name of the Monthly Distribution,Naziv Mjesečni distribucije
 DocType: Sales Person,Parent Sales Person,Roditelj Prodaja Osoba
@@ -1664,31 +1679,32 @@
 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 +44,"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/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.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +502,Error: {0} &gt; {1},Greška: {0}&gt; {1}
 DocType: Item,Is Sales Item,Je artikl namijenjen prodaji
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Raspodjela grupe artikala
 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.
 DocType: Naming Series,Current Value,Trenutna vrijednost
-apps/erpnext/erpnext/controllers/accounts_controller.py +235,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/controllers/accounts_controller.py +238,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
 DocType: Delivery Note Item,Against Sales Order,Protiv prodajnog naloga
 ,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 +458,Item table can not be blank,Tablica ne može biti prazna
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +443,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}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +5,This is based on stock movement. See {0} for details,To se temelji na zalihama pokreta. Vidi {0} za detalje
 DocType: Pricing Rule,Selling,Prodaja
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +341,Amount {0} {1} deducted against {2},Broj {0} {1} oduzeti protiv {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +344,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
@@ -1703,8 +1719,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +144,Cannot refer row number greater than or equal to current row number for this Charge type,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 +159,Red,Crven
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Molimo kliknite na ""Generiraj raspored ' dohvatiti Serial No dodao je za točku {0}"
+apps/erpnext/erpnext/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
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Base Iznos (Company Valuta)
@@ -1712,7 +1728,7 @@
 DocType: Installation Note,Installation Time,Vrijeme instalacije
 DocType: Sales Invoice,Accounting Details,Računovodstvo Detalji
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,Izbrisati sve transakcije za ovu kompaniju
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +187,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Row # {0}: {1} Operacija nije završen za {2} Količina gotovih proizvoda u proizvodnji Order # {3}. Molimo vas da ažurirate rad status via Time Dnevnici
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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,Row # {0}: {1} Operacija nije završen za {2} Količina gotovih proizvoda u proizvodnji Order # {3}. Molimo vas da ažurirate rad status via Time Dnevnici
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,Investicije
 DocType: Issue,Resolution Details,Detalji o rjesenju problema
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,izdvajanja
@@ -1748,16 +1764,17 @@
 DocType: Bank Reconciliation Detail,Against Account,Protiv računa
 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}
 DocType: Delivery Note,Excise Page Number,Trošarina Broj stranice
 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}
 ,Maintenance Schedules,Rasporedi održavanja
 DocType: Task,Actual End Date (via Time Sheet),Stvarni Završni datum (preko Time Sheet)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Amount {0} {1} against {2} {3},Broj {0} {1} protiv {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +339,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 +138,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 +295,Debit To account must be a Receivable account,Debit na račun mora biti potraživanja računa
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Receivable account,Debit na račun mora biti potraživanja računa
 DocType: Shipping Rule Condition,Shipping Amount,Iznos transporta
 ,Pending Amount,Iznos na čekanju
 DocType: Purchase Invoice Item,Conversion Factor,Konverzijski faktor
@@ -1765,10 +1782,10 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +137,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
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +90,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Ukupno izdvojene lišće {0} ne može biti manja od već odobrenih lišće {1} za period
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +93,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 +22,Enter Paid Amount,Unesite Plaćen iznos
+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
@@ -1778,13 +1795,15 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,Timesheets
 DocType: HR Settings,HR Settings,Podešavanja ljudskih resursa
 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 +524,"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."
+apps/erpnext/erpnext/controllers/accounts_controller.py +527,"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 +249,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
 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/stock/get_item_details.py +123,Please specify Company,Navedite tvrtke
 ,Customer Acquisition and Loyalty,Stjecanje kupaca i lojalnost
@@ -1795,17 +1814,19 @@
 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 +183,Closing (Opening + Totals),Zatvaranje (Otvaranje + Ukupno)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),Zatvaranje (Otvaranje + Ukupno)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Navedite valuta u Company
 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/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
-apps/erpnext/erpnext/controllers/accounts_controller.py +272,Account {0} is invalid. Account Currency must be {1},Račun {0} je nevažeća. Račun valuta mora biti {1}
+DocType: Email Digest,Pending Sales Orders,U očekivanju Prodajni nalozi
+apps/erpnext/erpnext/controllers/accounts_controller.py +275,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 +956,"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 Slip,Deduction,Odbitak
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +87,Row {0}: From Time and To Time is mandatory.,Red {0}: Od vremena i do vremena je obavezno.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +969,"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 +111,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 +262,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 +7,Please enter Employee Id of this sales person,Unesite zaposlenih Id ove prodaje osoba
@@ -1813,7 +1834,7 @@
 DocType: Project,% Tasks Completed,% Zavrsenih zadataka
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,Razlika iznos mora biti nula
 DocType: Project,Gross Margin,Bruto marža
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +194,Please enter Production Item first,Unesite Proizvodnja predmeta prvi
+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
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Ponude
@@ -1822,53 +1843,54 @@
 DocType: Maintenance Visit,Maintenance User,Održavanje korisnika
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +149,Cost Updated,Troškova Ažurirano
 DocType: Employee,Date of Birth,Datum rođenja
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +86,Item {0} has already been returned,Artikal {0} je već vraćen
+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}
+DocType: Student Admission,Eligibility,kvalifikovanost
 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 +177,Job Description,Opis posla
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,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 +126,"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 +127,"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."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +24,Welcome to POS: Create your POS Profile,Dobrodošli na POS: Kreirajte svoj POS profilu
 DocType: Expense Claim,Approver,Odobritelj
 ,SO Qty,SO Kol
+DocType: Guardian,Work Address,rad Adresa
 DocType: Appraisal,Calculate Total Score,Izračunaj ukupan rezultat
 DocType: Request for Quotation,Manufacturing Manager,Proizvodnja Manager
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serijski Ne {0} je pod jamstvom upto {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +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 +74,Shipments,Pošiljke
+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
 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 +153,Row # ,Row #
+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 +156,Get From,Dobiti od
+apps/erpnext/erpnext/public/js/utils.js +167,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 +167,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 +416,"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"
+apps/erpnext/erpnext/controllers/accounts_controller.py +419,"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
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} is disabled,Korisnik {0} je onemogućen
 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...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Ostavite prazno ako smatra za sve odjele
 apps/erpnext/erpnext/config/hr.py +171,"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 +346,{0} is mandatory for Item {1},{0} je obavezno za tu stavku {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,{0} is mandatory for Item {1},{0} je obavezno za tu stavku {1}
 DocType: Currency Exchange,From Currency,Od novca
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Molimo odaberite Izdvojena količina, vrsta fakture i fakture Broj u atleast jednom redu"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,Troškovi New Kupovina
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},Prodajnog naloga potrebna za točke {0}
 DocType: Purchase Invoice Item,Rate (Company Currency),Ocijeni (Društvo valuta)
-apps/erpnext/erpnext/demo/setup_data.py +360,Others,Drugi
+DocType: Student Guardian,Others,Drugi
 DocType: Payment Entry,Unallocated Amount,neraspoređenih Iznos
 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
@@ -1888,17 +1910,16 @@
 apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,Serijalizovanoj zaliha
 DocType: Activity Type,Default Billing Rate,Uobičajeno Billing Rate
 DocType: Sales Invoice,Total Billing Amount,Ukupan iznos naplate
-apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +54,Receivable Account,Potraživanja račun
-apps/erpnext/erpnext/controllers/accounts_controller.py +546,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} je već {2}
+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 +549,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 +79,CEO,CEO
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,CEO
 DocType: Expense Claim Detail,Expense Claim Detail,Rashodi Zahtjev Detalj
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +808,Please select correct account,Molimo odaberite ispravan račun
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +809,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
-DocType: Purchase Invoice Item,Page Break,Prijelom stranice
 DocType: Production Order Operation,Pending,Čekanje
 DocType: Course,Course Name,Naziv predmeta
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Korisnici koji može odobriti odsustvo aplikacije određenu zaposlenog
@@ -1907,14 +1928,15 @@
 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 +54,Full-time,Puno radno vrijeme
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,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: Student,Guardians,čuvari
 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 +289,Debit To is required,To je potrebno Debit
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +321,Debit To is required,To je potrebno Debit
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Kupoprodajna cijena List
 DocType: Offer Letter Term,Offer Term,Ponuda Term
 DocType: Quality Inspection,Quality Manager,Quality Manager
@@ -1922,6 +1944,7 @@
 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/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
@@ -1932,18 +1955,17 @@
 DocType: Production Order Operation,Completed Qty,Završen Kol
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"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 +273,Price List {0} is disabled,Cjenik {0} je onemogućen
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +99,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/projects/doctype/timesheet/timesheet.py +123,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
 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}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Trenutno Vrednovanje Rate
 DocType: Item,Customer Item Codes,Customer Stavka Codes
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,Exchange dobitak / gubitak
 DocType: Opportunity,Lost Reason,Razlog gubitka
-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/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/purchase_receipt/purchase_receipt.py +378,All items have already been invoiced,Svi artikli su već fakturisani
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +379,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
@@ -1959,18 +1981,19 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Vaši klijenti
 apps/erpnext/erpnext/projects/doctype/project/project.py +141,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/job_opening.html +19,Apply Now,Prijavite se sada
+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 ."
 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
-apps/erpnext/erpnext/utilities/doctype/address/address.py +164,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: Fee Structure,Fee Structure,naknada Struktura
 DocType: Timesheet Detail,Costing Amount,Costing Iznos
+DocType: Student Admission,Application Fee,naknada aplikacija
 DocType: Process Payroll,Submit Salary Slip,Slanje plaće Slip
-apps/erpnext/erpnext/controllers/selling_controller.py +161,Maxiumm discount for Item {0} is {1}%,Maxiumm popusta za točke {0} je {1} %
+apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,Maxiumm popusta za točke {0} je {1} %
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Uvoz u rinfuzi
 DocType: Sales Partner,Address & Contacts,Adresa i kontakti
 DocType: SMS Log,Sender Name,Ime / Naziv pošiljaoca
@@ -1995,21 +2018,21 @@
 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_data.py +361,Travel,putovanje
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +155,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 +304,Travel,putovanje
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +167,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 +23,Update Cost,Update cost
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Update cost
 DocType: Item Reorder,Item Reorder,Ponovna narudžba artikla
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +36,Show Salary Slip,Pokaži Plaća Slip
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +748,Transfer Material,Prijenos materijala
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +53,Show Salary Slip,Pokaži Plaća Slip
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +166,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 +923,Please set recurring after saving,Molimo podesite ponavljaju nakon spremanja
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +646,Select change amount account,Izaberite promjene iznos računa
+apps/erpnext/erpnext/public/js/controllers/transaction.js +914,Please set recurring after saving,Molimo podesite ponavljaju nakon spremanja
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +703,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
@@ -2021,31 +2044,32 @@
 DocType: Quality Inspection,Verified By,Ovjeren od strane
 DocType: Address,Subsidiary,Podružnica
 apps/erpnext/erpnext/setup/doctype/company/company.py +64,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","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: Quality Inspection,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 +33,Traceability,sljedivost
 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 +352,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Količina u redu {0} ( {1} ) mora biti isti kao proizvedena količina {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Količina u redu {0} ( {1} ) mora biti isti kao proizvedena količina {2}
 DocType: Appraisal,Employee,Zaposlenik
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Pozovi kao korisnika
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} je u potpunosti naplaćeno
 DocType: Workstation Working Hour,End Time,End Time
 DocType: Payment Entry,Payment Deductions or Loss,Plaćanje Smanjenja ili gubitak
-apps/erpnext/erpnext/config/schools.py +100,LMS,LMS
+apps/erpnext/erpnext/config/schools.py +104,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/config/crm.py +6,Sales Pipeline,prodaja Pipeline
 DocType: Student Batch Student,Student Batch Student,Student Batch Student
-DocType: Sales Invoice,Mass Mailing,Misa mailing
+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 +199,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/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 +297,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 +111,Pharmaceutical,farmaceutski
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +309,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/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
@@ -2060,27 +2084,28 @@
 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 +814,Please specify Company to proceed,Navedite Tvrtka postupiti
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +793,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 +44,Compensatory Off,kompenzacijski Off
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,kompenzacijski Off
 DocType: Quality Inspection Reading,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.
 DocType: Room,Room Number,Broj sobe
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Invalid referentni {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +161,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ne može biti veći nego što je planirana kolicina ({2}) u proizvodnoj porudzbini {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +162,{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 +217,Raw Materials cannot be blank.,Sirovine ne može biti prazan.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,"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 +460,Quick Journal Entry,Brzi unos u dnevniku
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +111,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/accounts/doctype/sales_invoice/sales_invoice.py +441,"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 +450,Quick Journal Entry,Brzi unos u dnevniku
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +103,You can not change rate if BOM mentioned agianst any item,Ne možete promijeniti brzinu ako BOM spomenuo agianst bilo predmet
 DocType: Employee,Previous Work Experience,Radnog iskustva
 DocType: Stock Entry,For Quantity,Za količina
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +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 +214,{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
 ,Minutes to First Response for Issues,Minuta na prvi odgovor na pitanja
 DocType: Purchase Invoice,Terms and Conditions1,Odredbe i Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,U ime Instituta za koju se postavljanje ovog sistema.
@@ -2089,16 +2114,17 @@
 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 +398,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
 ,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 +739,Item or Warehouse for row {0} does not match Material Request,Artikal ili skladište za redak {0} ne odgovara Zahtjevu za materijalom
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +747,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
 DocType: Fiscal Year,Year End Date,Završni datum godine
 DocType: Task Depends On,Task Depends On,Zadatak ovisi o
-DocType: Lead,Opportunity,Prilika (Opportunity)
+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
@@ -2111,7 +2137,7 @@
 DocType: Student,Joining Date,spajanje Datum
 ,Employees working on a holiday,Radnici koji rade na odmoru
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Mark Present
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},Održavanje datum početka ne može biti prije datuma isporuke za rednim brojem {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},Održavanje datum početka ne može biti prije datuma isporuke za rednim brojem {0}
 DocType: Production Order,Actual End Date,Stvarni datum završetka
 DocType: Purchase Invoice,PINV-,PINV-
 DocType: Authorization Rule,Applicable To (Role),Odnosi se na (uloga)
@@ -2126,7 +2152,7 @@
 DocType: SMS Log,No of Requested SMS,Nema traženih SMS
 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 +729,Please supply the specified items at the best possible rates,Molimo vas da dostavite navedene stavke na najbolji mogući stope
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +695,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 +117,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-
@@ -2135,7 +2161,7 @@
 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 +14,This is an example website auto-generated from ERPNext,Ovo je primjer web stranica automatski generira iz ERPNext
+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
 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.
 
@@ -2182,13 +2208,14 @@
 DocType: Purchase Receipt Item,Recd Quantity,RecD Količina
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +54,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 +103,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 +504,Stock Entry {0} is not submitted,Stock upis {0} nije podnesen
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Ne može proizvesti više predmeta {0} od prodajnog naloga količina {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +505,Stock Entry {0} is not submitted,Stock upis {0} nije podnesen
 DocType: Payment Reconciliation,Bank / Cash Account,Banka / Cash račun
 DocType: Tax Rule,Billing City,Billing Grad
 DocType: Salary Component Account,Salary Component Account,Plaća Komponenta računa
 DocType: Global Defaults,Hide Currency Symbol,Sakrij simbol valute
 apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card","npr. banka, gotovina, kreditne kartice"
+DocType: Lead Source,Source Name,izvor ime
 DocType: Journal Entry,Credit Note,Kreditne Napomena
 DocType: Warranty Claim,Service Address,Usluga Adresa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furnitures and Fixtures,Furnitures i raspored
@@ -2200,6 +2227,7 @@
 DocType: Opportunity,Customer / Lead Name,Kupac / Ime osobe koja je Lead
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +89,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/controllers/trends.py +19,Total(Qty),Ukupno (Qty)
 DocType: Sales Invoice,This Document,ovaj dokument
@@ -2211,15 +2239,15 @@
 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 +176,Organization branch master.,Organizacija grana majstor .
-apps/erpnext/erpnext/controllers/accounts_controller.py +273, or ,ili
+apps/erpnext/erpnext/controllers/accounts_controller.py +276, or ,ili
 DocType: Sales Order,Billing Status,Status naplate
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Prijavi problem
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,komunalna Troškovi
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,Iznad 90
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +203,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: Journal Entry {1} nema nalog {2} ili već usklađeni protiv drugog vaučer
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +206,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 +90,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 +93,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
@@ -2247,8 +2275,8 @@
 DocType: Product Bundle,Parent Item,Roditelj artikla
 DocType: Account,Account Type,Vrsta konta
 DocType: Delivery Note,DN-RET-,DN-RET-
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +115,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 +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Raspored održavanja ne stvara za sve stavke . Molimo kliknite na ""Generiraj raspored '"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +118,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 +163,"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"
@@ -2260,13 +2288,13 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +32,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 +748,Delivery,Isporuka
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +742,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
 DocType: Payment Entry,Total Allocated Amount,Ukupan dodijeljeni iznos
 DocType: Item Reorder,Material Request Type,Materijal Zahtjev Tip
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +82,Row {0}: UOM Conversion Factor is mandatory,Red {0}: UOM Faktor konverzije je obavezno
+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
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,bon #
@@ -2277,13 +2305,13 @@
 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 +90,Head of Marketing and Sales,Voditelj marketinga i prodaje
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Porez na dohodak
+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 +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 .
 DocType: Item Supplier,Item Supplier,Dobavljač artikla
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +403,Please enter Item Code to get batch no,Unesite kod Predmeta da se hrpa nema
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +770,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 +397,Please enter Item Code to get batch no,Unesite kod Predmeta da se hrpa nema
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +764,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"
@@ -2295,28 +2323,29 @@
 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 +100,Issues,Pitanja
+apps/erpnext/erpnext/hooks.py +109,Issues,Pitanja
 apps/erpnext/erpnext/controllers/status_updater.py +13,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
 ,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
 DocType: Supplier,Billing Currency,Valuta plaćanja
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Large,Ekstra veliki
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Extra Large,Ekstra veliki
 ,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 +507,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 +107,Local,Lokalno
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +508,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/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 +154,Large,Veliki
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Large,Veliki
 DocType: Homepage Featured Product,Homepage Featured Product,Homepage Istaknuti proizvoda
 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 +225,Total {0} ({1}),Ukupno {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +224,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
@@ -2374,9 +2403,9 @@
 DocType: Attendance,Leave Type,Ostavite Vid
 apps/erpnext/erpnext/controllers/stock_controller.py +173,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/hr/doctype/salary_slip/salary_slip.py +79,Name error: {0},Ime greška: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +90,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 +178,{0} {1} does not associated with {2} {3},{0} {1} ne u vezi sa {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +181,{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)
 DocType: Warehouse,Parent Warehouse,Parent Skladište
@@ -2395,7 +2424,7 @@
 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
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,Atleast jednu stavku treba upisati s negativnim količine za uzvrat dokumentu
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Atleast one item should be entered with negative quantity in return document,Atleast jednu stavku treba upisati s negativnim količine za uzvrat dokumentu
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operacija {0} više od bilo koje dostupne radnog vremena u radnu stanicu {1}, razbijaju rad u više operacija"
 ,Requested,Tražena
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +83,No Remarks,No Napomene
@@ -2407,46 +2436,46 @@
 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/stock/doctype/purchase_receipt/purchase_receipt.py +98,Quality Inspection required for Item {0},Provera kvaliteta potrebna za točke {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,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ć
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Spisak teritorija - upravljanje.
 DocType: Journal Entry Account,Sales Invoice,Faktura prodaje
 DocType: Journal Entry Account,Party Balance,Party Balance
-apps/erpnext/erpnext/accounts/page/pos/pos.js +475,Please select Apply Discount On,Molimo odaberite Apply popusta na
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +92,Salary Slip Created,Plaća Slip Created
+apps/erpnext/erpnext/accounts/page/pos/pos.js +464,Please select Apply Discount On,Molimo odaberite Apply popusta na
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +95,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
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,Postotak popusta se može neovisno primijeniti prema jednom ili za više cjenika.
 DocType: Purchase Invoice,Half-yearly,Polugodišnje
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +384,Accounting Entry for Stock,Računovodstvo Entry za Stock
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +387,Accounting Entry for Stock,Računovodstvo Entry za Stock
 DocType: Sales Invoice,Sales Team1,Prodaja Team1
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,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 +96,Row {0}: Completed Qty must be greater than zero.,Red {0}: Završena Količina mora biti veća od nule.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +120,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 +88,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/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
 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 +147,Target warehouse is mandatory for row {0},Target skladište je obvezno za redom {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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
 DocType: Quality Inspection,Quality Inspection,Provjera kvalitete
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Extra Small,Extra Small
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +194,Account {0} is frozen,Konto {0} je zamrznut
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Extra Small
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +690,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 +197,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 +606,Can only make payment against unbilled {0},Mogu samo napraviti uplatu protiv nenaplaćenu {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +126,Commission rate cannot be greater than 100,Proviziju ne može biti veća od 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +609,Can only make payment against unbilled {0},Mogu samo napraviti uplatu protiv nenaplaćenu {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,Proviziju ne može biti veća od 100
 DocType: Stock Entry,Subcontract,Podugovor
 apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,Unesite {0} prvi
 DocType: Production Order Operation,Actual End Time,Stvarni End Time
@@ -2457,30 +2486,30 @@
 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 +158,Colour,Boja
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,Boja
 DocType: Maintenance Visit,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"
 DocType: Student Log,Academic,akademski
-apps/erpnext/erpnext/controllers/accounts_controller.py +469,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Ukupno unaprijed ({0}) protiv Order {1} ne može biti veći od Grand Ukupno ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +472,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Ukupno unaprijed ({0}) protiv Order {1} ne može biti veći od Grand Ukupno ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Odaberite Mjesečni Distribucija nejednako distribuirati mete širom mjeseci.
 DocType: Purchase Invoice Item,Valuation Rate,Vrednovanje Stopa
+DocType: Stock Reconciliation,SR/,SR /
 apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,Cjenik valuta ne bira
 DocType: Assessment,Results,Rezultati
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +168,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 +175,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,Preimenovanje Prijavite
-DocType: Student Applicant,Father's/ Guardian 2 Email ID,Oca / Guardian 2-mail ID
 DocType: Maintenance Visit Purpose,Against Document No,Protiv dokumentu nema
 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 +228,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 +231,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/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 +93,Researcher,istraživač
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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.
@@ -2492,25 +2521,25 @@
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Za praktičnost kupaca, te kodovi mogu se koristiti u tiskanim formata kao što su fakture i otpremnice"
 DocType: 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: Sales Invoice,Advertisement,Oglas
 DocType: Asset Category Account,Depreciation Expense Account,Troškovi amortizacije računa
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Probationary Period,Probni rad
-apps/erpnext/erpnext/hooks.py +102,Announcements,obaveštenja
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Probni rad
+apps/erpnext/erpnext/hooks.py +111,Announcements,obaveštenja
 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 +109,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 +16,To Datetime,To datuma i vremena
+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/scheduling_tool/scheduling_tool.py +51,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/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Aktivnosti na čekanju
+DocType: Accounts Settings,Make Payment via Journal Entry,Izvršiti uplatu preko Journal Entry
+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 +127,Please enter relieving date.,Unesite olakšavanja datum .
-apps/erpnext/erpnext/controllers/trends.py +145,Amt,Amt
+apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,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 +26,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"
@@ -2528,14 +2557,15 @@
 apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1},Nije moguće pronaći tečaja HNB {0} do {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Mark Half Day
 DocType: Sales Invoice,Sales Team,Prodajni tim
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Duplicate entry,Dupli unos
+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 +490,[Error],[Greska]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +484,[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
 apps/erpnext/erpnext/controllers/status_updater.py +175,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.
 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
@@ -2551,22 +2581,22 @@
 ,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 +25,All Jobs,Svi poslovi
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,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 +323,Amount {0} {1} {2} {3},Broj {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,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: 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 +372,Payment Entries {0} are un-linked,Plaćanje Unosi {0} su un-povezani
+apps/erpnext/erpnext/accounts/utils.py +449,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
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +497,Material Requests {0} created,Materijalni Zahtjevi {0} stvorio
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +498,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.
 DocType: Purchase Invoice,Address and Contact,Adresa i kontakt
@@ -2605,7 +2635,7 @@
 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 +848,Paid Amount cannot be greater than total negative outstanding amount {0},Uplaćeni iznos ne može biti veći od ukupnog broja negativnih preostali iznos {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +859,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/report/trial_balance/trial_balance.py +233,Closing (Dr),Zatvaranje (Dr)
 DocType: Cheque Print Template,Cheque Size,Ček Veličina
@@ -2626,7 +2656,8 @@
 ,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.
-apps/erpnext/erpnext/controllers/accounts_controller.py +555,'Update Stock' cannot be checked for fixed asset sale,&#39;Update Stock&#39; ne može se provjeriti na prodaju osnovnih sredstava
+DocType: Student Guardian,Father,otac
+apps/erpnext/erpnext/controllers/accounts_controller.py +558,'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
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Get Updates
 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
@@ -2636,15 +2667,15 @@
 DocType: Sales Order,Fully Delivered,Potpuno Isporučeno
 DocType: Lead,Lower Income,Niži Prihodi
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","Glava računa pod odgovornosti , u kojoj dobit / gubitak će biti rezerviran"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +166,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 +238,"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 +81,Purchase Order number required for Item {0},Broj narudžbenice kupnje je potreban za artikal {0}
+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/purchase_receipt/purchase_receipt.py +82,Purchase Order number required for Item {0},Broj narudžbenice kupnje je potreban za artikal {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"' Od datuma ' mora biti poslije ' Do datuma"""
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +17,Cannot change status as student {0} is linked with student application {1},Ne može promijeniti status studenta {0} je povezana s primjenom student {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +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: Timesheet,"List of employee which has ""Salary Slip Based on Timesheet"" is enabled in salary structure.",Popis zaposlenika koji ima &quot;Plaća za klađenje na timesheet osnovu&quot; omogućena u strukturi zarada.
 DocType: Asset,Fully Depreciated,potpuno je oslabio
 ,Stock Projected Qty,Projektovana kolicina na zalihama
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Customer {0} does not belong to project {1},Kupac {0} ne pripada projektu {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,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
 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
@@ -2656,7 +2687,7 @@
 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/patches/v7_0/create_warehouse_nestedset.py +55,All Warehouses,Svi Skladišta
+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 +105,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
@@ -2668,10 +2699,10 @@
 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/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Provjerite plaće slip
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +26,Browse BOM,Browse BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,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/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 Year,Academic Year,akademska godina
+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
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,Procjena
@@ -2679,12 +2710,12 @@
 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 +197,Leave approver must be one of {0},Ostavite odobritelj mora biti jedan od {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,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: Workstation Working Hour,Start Time,Start Time
 DocType: Item Price,Bulk Import Help,Bulk Uvoz Pomoć
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +256,Select Quantity,Odaberite Količina
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +257,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
@@ -2701,6 +2732,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Ili meta Količina ili ciljani iznos je obavezna .
 apps/erpnext/erpnext/config/projects.py +45,Cost of various activities,Troškova različitih aktivnosti
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Postavljanje Događanja u {0}, jer zaposleni u prilogu ispod prodaje osoba nema korisniku ID {1}"
+DocType: Timesheet,Billing Details,Billing Detalji
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +149,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}
 DocType: Item,Inspection Required,Inspekcija Obvezno
@@ -2720,7 +2752,7 @@
 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 +138,Wire Transfer,Wire Transfer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,Wire Transfer
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Provjerite sve
 DocType: Sales Order,Recurring Order,Ponavljajući Order
 DocType: Company,Default Income Account,Zadani račun prihoda
@@ -2732,21 +2764,19 @@
 ,Welcome to ERPNext,Dobrodošli na ERPNext
 apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,Potencijalni kupac do ponude
 DocType: Lead,From Customer,Od kupca
-apps/erpnext/erpnext/demo/setup_data.py +357,Calls,Pozivi
+apps/erpnext/erpnext/demo/setup/setup_data.py +300,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/stock/doctype/item/item.py +466,"As there are existing transactions for this item, \
-							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Kao što je već postoje transakcije za ovu stavku, \ ne možete promijeniti vrijednosti &quot;ima serijski broj &#39;,&#39; Ima serijski br &#39;,&#39; Is Stock Item &#39;i&#39; Vrednovanje Način &#39;"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,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/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 +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Napomena : Sustav neće provjeravati pretjerano isporuke i više - booking za točku {0} kao količinu ili vrijednost je 0
 DocType: Notification Control,Quotation Message,Ponuda - poruka
 DocType: Issue,Opening Date,Otvaranje Datum
-apps/erpnext/erpnext/schools/api.py +58,Attendance has been marked successfully.,Posjećenost je uspješno označen.
+apps/erpnext/erpnext/schools/api.py +57,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 +136,Account Type for {0} must be {1},Tip naloga za {0} mora biti {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +139,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
@@ -2761,12 +2791,13 @@
 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/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 +20,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 +1190,Please select customer,Molimo odaberite kupac
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1193,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
@@ -2776,6 +2807,7 @@
 ,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 +50,Missing Currency Exchange Rates for {0},Nedostaje Valuta Tečaj za {0}
 DocType: Assessment,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
@@ -2793,11 +2825,12 @@
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Topic Name
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Barem jedan od prodajete ili kupujete mora biti odabran
+DocType: Grading Structure,Grade Intervals,Grade Intervali
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Odaberite priroda vašeg poslovanja.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Gdje se obavljaju proizvodne operacije.
 DocType: Asset Movement,Source Warehouse,Izvorno skladište
 DocType: Installation Note,Installation Date,Instalacija Datum
-apps/erpnext/erpnext/controllers/accounts_controller.py +534,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} ne pripada kompaniji {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +537,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
@@ -2811,28 +2844,31 @@
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Dostupno Batch Količina na Od Skladište
 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 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 +111,Date Of Retirement must be greater than Date of Joining,Datum umirovljenja mora biti veći od datuma pristupa
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +49,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 +87,{0}% Delivered,{0}% Isporučeno
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% Isporučeno
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Stavka {0}: {1} Naručena količina ne može biti manji od minimalnog bi Količina {2} (iz točke).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Mjesečni Distribucija Postotak
 DocType: Territory,Territory Targets,Teritorij Mete
 DocType: Delivery Note,Transporter Info,Transporter Info
-apps/erpnext/erpnext/accounts/utils.py +379,Please set default {0} in Company {1},Molimo podesite default {0} u kompaniji {1}
+apps/erpnext/erpnext/accounts/utils.py +456,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
 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.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Naslovi za ispis predložaka pr Predračuna.
+DocType: Student Guardian,Student Guardian,student Guardian
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +184,Valuation type charges can not marked as Inclusive,Prijava tip vrednovanja ne može označiti kao Inclusive
 DocType: POS Profile,Update Stock,Ažurirajte Stock
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Različite mjerne jedinice proizvoda će dovesti do ukupne pogrešne neto težine. Budite sigurni da je neto težina svakog proizvoda u istoj mjernoj jedinici.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
 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 +349,Journal Entries {0} are un-linked,Journal unosi {0} su un-povezani
+apps/erpnext/erpnext/accounts/utils.py +426,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
@@ -2856,6 +2892,7 @@
 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
+DocType: Homepage,"URL for ""All Products""",URL za &quot;Svi proizvodi&quot;
 DocType: Leave Application,Leave Balance Before Application,Ostavite Balance Prije primjene
 DocType: SMS Center,Send SMS,Pošalji SMS
 DocType: Cheque Print Template,Width of amount in word,Širina iznos u riječi
@@ -2864,7 +2901,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 +29,Current Job Openings,Trenutni Otvori Posao
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,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
@@ -2877,7 +2914,7 @@
 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 +850,Show tax break-up,Pokaži porez break-up
+apps/erpnext/erpnext/public/js/controllers/transaction.js +841,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/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"
@@ -2887,10 +2924,11 @@
 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 +534,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 +80,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 +162,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/selling/doctype/customer/customer.py +195,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 +5,This is based on the attendance of this Student,To se temelji na prisustvo ovog Student
@@ -2899,12 +2937,11 @@
 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 +75,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 +138,Note: There is not enough leave balance for Leave Type {0},Napomena : Nema dovoljno ravnotežu dopust za dozvolu tipa {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Note: There is not enough leave balance for Leave Type {0},Napomena : Nema dovoljno ravnotežu dopust za dozvolu tipa {0}
 DocType: Program Enrollment Fee,Program Enrollment Fee,Program Upis Naknada
 DocType: Item,Supplier Items,Dobavljač Predmeti
 DocType: Opportunity,Opportunity Type,Vrsta prilike
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,Nova firma
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,Cost Center is required for 'Profit and Loss' account {0},Troška je potrebno za račun ' dobiti i gubitka ' {0}
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Transakcije mogu se obrisati samo kreator Društva
 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.,Neispravan broj glavnu knjigu unose naći. Možda ste odabrali krivi račun u transakciji.
 DocType: Cheque Print Template,Cheque Width,Ček Širina
@@ -2913,16 +2950,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,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/manufacturing/doctype/production_order/production_order.js +128,Timesheet,kontrolna kartica
-apps/erpnext/erpnext/controllers/accounts_controller.py +228,{0} '{1}' is disabled,{0} '{1}' je onemogućeno
+apps/erpnext/erpnext/controllers/accounts_controller.py +231,{0} '{1}' is disabled,{0} '{1}' je onemogućeno
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Postavi status Otvoreno
 DocType: Cheque Print Template,Scanned Cheque,skeniranim Ček
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Pošaljite e-poštu automatski da Kontakti na podnošenje transakcija.
+DocType: Timesheet,Total Billable Amount,Ukupno naplative iznos
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Stavka 3
 DocType: Purchase Order,Customer Contact Email,Email kontakta kupca
 DocType: Warranty Claim,Item and Warranty Details,Stavka i garancija Detalji
 DocType: Sales Team,Contribution (%),Doprinos (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Napomena : Stupanje Plaćanje neće biti izrađen od ' Gotovina ili bankovni račun ' nije naveden
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Responsibilities,Odgovornosti
+apps/erpnext/erpnext/controllers/accounts_controller.py +78,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
 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
@@ -2930,6 +2968,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Dodaj Korisnici
 DocType: Pricing Rule,Item Group,Grupa artikla
 DocType: Item,Safety Stock,Sigurnost Stock
+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: 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)
@@ -2939,7 +2978,6 @@
 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: Timesheet,Total Hours,Ukupno vrijeme
 DocType: Journal Entry,Printing Settings,Printing Settings
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Total Debit must be equal to Total Credit. The difference is {0},Ukupno zaduženje mora biti jednak ukupnom kreditnom .
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automobilska industrija
@@ -2952,13 +2990,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investicijsko bankarstvo
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +71,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
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Customer&gt; grupu korisnika&gt; Territory
 DocType: Purchase Invoice Item,Rate,VPC
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Intern,stažista
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,stažista
 DocType: Stock Entry,From BOM,Iz BOM
 DocType: Assessment,Assessment Code,procjena Kod
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +32,Basic,Osnovni
+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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Molimo kliknite na ""Generiraj raspored '"
+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 +95,Reference No is mandatory if you entered Reference Date,Reference Ne obvezno ako ušao referentnog datuma
@@ -2967,11 +3006,11 @@
 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 +752,Issue Material,Tiketi - materijal
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +723,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 +683,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 +665,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.
 DocType: Hub Settings,Access Token,Access Token
 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
@@ -2979,33 +3018,35 @@
 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 +1122,Enter value must be positive,Unesite vrijednost mora biti pozitivan
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,All Territories,Sve teritorije
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1125,Enter value must be positive,Unesite vrijednost mora biti pozitivan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,Sve teritorije
 DocType: Purchase Invoice,Items,Artikli
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +23,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 +221,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 +233,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 +96,Request for Quotations,Zahtjev za ponudu
+apps/erpnext/erpnext/hooks.py +104,Request for Quotations,Zahtjev za ponudu
 DocType: Payment Reconciliation,Maximum Invoice Amount,Maksimalni iznos fakture
 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 +628,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Uobičajeno mjerna jedinica za varijantu &#39;{0}&#39; mora biti isti kao u obrascu &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Uobičajeno mjerna jedinica za varijantu &#39;{0}&#39; mora biti isti kao u obrascu &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Izračun zasnovan na
 DocType: Delivery Note Item,From Warehouse,Od Skladište
 DocType: Assessment,Supervisor Name,Supervizor ime
+DocType: Assessment,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
 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 +27,Default Address Template cannot be deleted,Zadani predložak adrese ne može se izbrisati
+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
 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
@@ -3020,8 +3061,8 @@
 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/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 +485,No default BOM exists for Item {0},Ne default BOM postoji točke {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +336,Please select Posting Date first,Molimo najprije odaberite Datum knjiženja
+apps/erpnext/erpnext/stock/get_item_details.py +486,No default BOM exists for Item {0},Ne default BOM postoji točke {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +326,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
@@ -3037,6 +3078,7 @@
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Meč plaćanja fakture
 DocType: Journal Entry,Bank Entry,Bank Entry
 DocType: Authorization Rule,Applicable To (Designation),Odnosi se na (Oznaka)
+,Profitability Analysis,Analiza profitabilnosti
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,Dodaj u košaricu
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Group By
 DocType: Guardian,Interests,Interesi
@@ -3049,22 +3091,22 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,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 +141,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Serijalizovani Stavka {0} ne može se ažurirati \
  koristeći Stock pomirenje"
 DocType: Scheduling Tool,Day,dan
 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 +122,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 +129,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
-DocType: Student Applicant,AP.,AP.
 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 +639,Point of Sale,Point of Sale
+apps/erpnext/erpnext/accounts/page/pos/pos.js +634,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
 DocType: Production Planning Tool,Production Planning Tool,Planiranje proizvodnje alat
@@ -3073,74 +3115,77 @@
 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 +373,Quantity to Manufacture must be greater than 0.,Količina za proizvodnju mora biti veći od 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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 Profile,Customer Group,Vrsta djelatnosti Kupaca
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,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/doctype/asset/asset.py +83,Next Depreciation Date must be on or after today,Sljedeća Amortizacija Datum mora biti na dan ili nakon danas
 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 +145,Please cancel Purchase Invoice {0} first,Molimo vas da otkaže fakturi {0} prvi
 DocType: Serial No,AMC Expiry Date,AMC Datum isteka
 ,Sales Register,Prodaja Registracija
 DocType: Quotation,Quotation Lost Reason,Razlog nerealizirane ponude
+apps/erpnext/erpnext/utilities/doctype/address/address.py +164,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.
 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 +330,Transaction reference no {0} dated {1},Transakcija Ref {0} od {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,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 +107,Summary for this month and pending activities,Sažetak za ovaj mjesec i aktivnostima na čekanju
+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/accounts/doctype/sales_invoice/sales_invoice.py +406,Please remove this Invoice {0} from C-Form {1},Molimo vas da uklonite ovu fakture {0} iz C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,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 +644,Get Items,Kreiraj proizvode
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +623,Get Items,Kreiraj proizvode
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +210,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 +41,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
 DocType: Payment Request,Initiated,Inicirao
 DocType: Production Order,Planned Start Date,Planirani Ozljede Datum
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,Customer is required against Receivable account {0},Ocijenio je potrebna protiv potraživanja računa {0}
 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 +265,Project-wise data is not available for Quotation,Projekat - mudar podaci nisu dostupni za ponudu
+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 +101,Commercial,trgovački
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,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: Supplier Quotation,Supplier Address,Dobavljač Adresa
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +648,Row {0}# Account must be of type 'Fixed Asset',Red {0} # računa mora biti tipa &#39;osnovna sredstva&#39;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,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 +30,Series is mandatory,Serija je obvezno
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +50,Series is mandatory,Serija je obvezno
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,financijske usluge
 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
 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}
 DocType: Leave Allocation,Unused leaves,Neiskorišteni lišće
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Cr,Cr
 DocType: Tax Rule,Billing State,State billing
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +250,Transfer,Prijenos
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +187,{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 +825,Fetch exploded BOM (including sub-assemblies),Fetch eksplodirala BOM (uključujući i podsklopova )
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +254,Transfer,Prijenos
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +190,{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 +796,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 +115,Due Date is mandatory,Due Date je obavezno
+apps/erpnext/erpnext/controllers/accounts_controller.py +118,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
 DocType: Journal Entry,Pay To / Recd From,Platiti Da / RecD Od
 DocType: Naming Series,Setup Series,Postavljanje Serija
 DocType: Payment Reconciliation,To Invoice Date,Da biste Datum računa
 DocType: Supplier,Contact HTML,Kontakt HTML
 ,Inactive Customers,neaktivnih kupaca
+DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Kupovina Primici
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Kako se primjenjuje pravilo cijena?
 DocType: Quality Inspection,Delivery Note No,Otpremnica br
@@ -3149,7 +3194,7 @@
 DocType: Company,Retail,Maloprodaja
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +120,Customer {0} does not exist,Korisnik {0} ne postoji
 DocType: Attendance,Absent,Odsutan
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +587,Product Bundle,Bundle proizvoda
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Product Bundle,Bundle proizvoda
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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
@@ -3159,8 +3204,8 @@
 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 +742,Send Supplier Emails,Pošalji dobavljač Email
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +104,"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/buying/doctype/request_for_quotation/request_for_quotation.js +708,Send Supplier Emails,Pošalji dobavljač Email
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,"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
 DocType: Guardian Interest,Guardian Interest,Guardian interesa
 DocType: Timesheet,Employee Detail,Detalj radnik
@@ -3171,9 +3216,9 @@
 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}
 DocType: Salary Slip,Earning & Deduction,Zarada &amp; Odbitak
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +77,Account {0} cannot be a Group,Konto {0} ne može biti grupa konta
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} cannot be a Group,Konto {0} ne može biti grupa konta
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +31,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 +107,Negative Valuation Rate is not allowed,Negativna stopa vrijednovanja nije dopuštena
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Negativna stopa vrijednovanja nije dopuštena
 DocType: Holiday List,Weekly Off,Tjedni Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Za npr. 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +39,Provisional Profit / Loss (Credit),Privremeni dobit / gubitak (Credit)
@@ -3187,16 +3232,16 @@
 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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: trošak je obvezan za artikal {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +626,Get Items from Product Bundle,Saznajte Predmeti od Bundle proizvoda
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +605,Get Items from Product Bundle,Saznajte Predmeti od Bundle proizvoda
 DocType: Asset,Straight Line,Duž
 DocType: Project User,Project User,Korisnik projekta
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} is inactive,Konto {0} nije aktivan
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} is inactive,Konto {0} nije aktivan
 DocType: GL Entry,Is Advance,Je avans
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Gledatelja Od datuma i posjećenost do sada je obvezno
 apps/erpnext/erpnext/controllers/buying_controller.py +148,Please enter 'Is Subcontracted' as Yes or No,Unesite ' Je podugovoren ' kao da ili ne
 DocType: Sales Team,Contact No.,Kontakt broj
 DocType: Bank Reconciliation,Payment Entries,plaćanje unosi
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,'Profit and Loss' type account {0} not allowed in Opening Entry,' Račun dobiti i gubitka ' vrsta računa {0} nije dopuštena za otvoreni unos
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +71,'Profit and Loss' type account {0} not allowed in Opening Entry,' Račun dobiti i gubitka ' vrsta računa {0} nije dopuštena za otvoreni unos
 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
@@ -3215,7 +3260,7 @@
 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,Komisija za prodaju
 DocType: Offer Letter Term,Value / Description,Vrijednost / Opis
-apps/erpnext/erpnext/controllers/accounts_controller.py +558,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} ne može se podnijeti, to je već {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +561,"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: Production Order,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}.
@@ -3228,13 +3273,13 @@
 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/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Legal Expenses,Pravni troškovi
 DocType: Purchase Invoice,Posting Time,Objavljivanje Vrijeme
-DocType: Sales Order,% Amount Billed,% Naplaćenog iznosa
+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.
 apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},No Stavka s rednim brojem {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Otvorena obavjestenja
+DocType: Email Digest,Open Notifications,Otvorena obavjestenja
 DocType: Payment Entry,Difference Amount (Company Currency),Razlika Iznos (Company Valuta)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,Direktni troškovi
 apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
@@ -3242,7 +3287,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,New Customer prihoda
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,putni troškovi
 DocType: Maintenance Visit,Breakdown,Slom
-apps/erpnext/erpnext/controllers/accounts_controller.py +634,Account: {0} with currency: {1} can not be selected,Račun: {0} s valutnom: {1} se ne mogu odabrati
+apps/erpnext/erpnext/controllers/accounts_controller.py +637,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}
 DocType: Program Enrollment Tool,Student Applicants,student Kandidati
@@ -3250,15 +3295,15 @@
 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 +56,Probation,Probni rad
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Probation,Probni rad
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Plaća Komponente
 DocType: Program Enrollment Tool,New Academic Year,Nova akademska godina
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Payment of salary for the month {0} and year {1},Isplata plaće za mjesec {0} i godina {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Payment of salary for the month {0} and year {1},Isplata plaće za mjesec {0} i godina {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Auto umetak Cjenik stopa ako nedostaje
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Ukupno uplaćeni iznos
 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 +144,Planning,planiranje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,planiranje
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,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
@@ -3271,11 +3316,10 @@
 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.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Sales invoice submitted sucessfully.,Prodaja fakture dostavio uspješno.
 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}
 DocType: Assessment Result,Student Name,ime studenta
-apps/erpnext/erpnext/hooks.py +104,Assessment Schedule,Raspored procjena
+apps/erpnext/erpnext/hooks.py +113,Assessment Schedule,Raspored procjena
 DocType: Brand,Item Manager,Stavka Manager
 DocType: Buying Settings,Default Supplier Type,Zadani tip dobavljača
 DocType: Production Order,Total Operating Cost,Ukupni trošak
@@ -3285,6 +3329,7 @@
 DocType: GL Entry,Party Type,Party Tip
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +78,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
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Plaća predložak majstor .
 DocType: Leave Type,Max Days Leave Allowed,Max Dani Ostavite dopuštenih
@@ -3296,18 +3341,19 @@
 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 +99,All Customer Groups,Sve grupe kupaca
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +78,Accumulated Monthly,akumulirani Mjesečno
-apps/erpnext/erpnext/controllers/accounts_controller.py +595,{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/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Sve grupe kupaca
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +81,Accumulated Monthly,akumulirani Mjesečno
+apps/erpnext/erpnext/controllers/accounts_controller.py +598,{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
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Cjenik stopa (Društvo valuta)
 DocType: Products Settings,Products Settings,Proizvodi Postavke
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +188,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
 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 +84,Secretary,Sekretarica
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,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
@@ -3316,24 +3362,22 @@
 ,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
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,Row # {0}: Serial No je obavezno
+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 +859,Supplier Quotation,Dobavljač Ponuda
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +838,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 +7,Collect Fees,naplatu naknada
+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}
 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 .
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Najave događaja
 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/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
-DocType: Email Digest,Income / Expense,Prihodi / rashodi
 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."
@@ -3345,13 +3389,14 @@
 DocType: Customer,From Lead,Od Lead-a
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Narudžbe objavljen za proizvodnju.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Odaberite fiskalnu godinu ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,POS Profile required to make POS Entry,POS Profil potrebno da bi POS upis
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +509,POS Profile required to make POS Entry,POS Profil potrebno da bi POS upis
 DocType: Program Enrollment Tool,Enroll Students,upisati studenti
 DocType: Hub Settings,Name Token,Ime Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standardna prodaja
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Atleast one warehouse is mandatory,Atleast jednom skladištu je obavezno
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +129,Atleast one warehouse is mandatory,Atleast jednom skladištu je obavezno
 DocType: Serial No,Out of Warranty,Od jamstvo
 DocType: BOM Replace Tool,Replace,Zamijeniti
+DocType: Production Order,Unstopped,Unstopped
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Invoice {1},{0} protiv prodaje fakture {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Naziv projekta
@@ -3372,10 +3417,11 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Listovi moraju biti dodijeljeno u COMBI 0,5"
 DocType: Production Order,Operation Cost,Operacija Cost
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,Prenesi dolazak iz. Csv datoteku
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Izvanredna Amt
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Set cilja predmet Grupa-mudar za ovaj prodavač.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Freeze Dionice stariji od [ dana ]
-apps/erpnext/erpnext/controllers/accounts_controller.py +528,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: Asset je obavezan za osnovno sredstvo kupovinu / prodaju
+apps/erpnext/erpnext/controllers/accounts_controller.py +531,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: Asset je obavezan za osnovno sredstvo kupovinu / prodaju
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Ako su dva ili više Pravila cijene se nalaze na osnovu gore uvjetima, Prioritet se primjenjuje. Prioritet je broj od 0 do 20, a zadana vrijednost je nula (prazno). Veći broj znači da će imati prednost, ako postoji više pravila cijenama s istim uslovima."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Fiskalna godina: {0} ne postoji
 DocType: Currency Exchange,To Currency,Valutno
@@ -3392,15 +3438,15 @@
 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
-DocType: Sales Invoice,Exhibition,Izložba
 apps/erpnext/erpnext/utilities/doctype/address/address.py +77,"Company is mandatory, as it is your company address","Kompanija je obavezno, kao što je vaša kompanija adresa"
 DocType: Item Attribute,From Range,Od Range
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +81,Syntax error in formula or condition: {0},Sintaksa greška u formuli ili stanja: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +92,Syntax error in formula or condition: {0},Sintaksa greška u formuli ili stanja: {0}
 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
+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 +28,Jobs,Posao
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,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
@@ -3409,16 +3455,16 @@
 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 +763,Make Supplier Quotation,Provjerite Supplier kotaciji
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,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/controllers/sales_and_purchase_return.py +100,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 +42,Casual Leave,Casual dopust
+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
 DocType: Batch,Batch ID,ID serije
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,Note: {0},Napomena : {0}
 ,Delivery Note Trends,Trendovi otpremnica
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +103,This Week's Summary,Ovonedeljnom Pregled
+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
 DocType: Student Group Creation Tool,Get Courses,Get kursevi
 DocType: GL Entry,Party,Stranka
@@ -3428,7 +3474,7 @@
 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 +59,Piecework,rad plaćen na akord
+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: Task,Actual Time (in Hours),Stvarno vrijeme (u satima)
 DocType: Employee,History In Company,Povijest tvrtke
@@ -3445,7 +3491,7 @@
 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.
 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 +162,Black,Crn
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,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
@@ -3456,13 +3502,13 @@
 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 +69,Customer Id,Id Kupca
+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
 DocType: Journal Entry Account,Exchange Rate,Tečaj
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Sales Order {0} is not submitted,Prodajnog naloga {0} nije podnesen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +527,Sales Order {0} is not submitted,Prodajnog naloga {0} nije podnesen
 DocType: Homepage,Tag Line,Tag Line
 DocType: Fee Component,Fee Component,naknada Komponenta
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +857,Add items from,Dodaj stavke iz
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +836,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}
 DocType: Cheque Print Template,Regular,redovan
 DocType: BOM,Last Purchase Rate,Zadnja kupovna cijena
@@ -3470,6 +3516,7 @@
 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
 ,Sales Person-wise Transaction Summary,Prodaja Osobne mudar Transakcija Sažetak
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +60,Cost Center is required for 'Profit and Loss' account {0}. Please set up a default Cost Center for the Company.,Troškovi Centar je potreban za &quot;dobiti i gubitka računa {0}. Molimo vas da se uspostavi default troškova Centra za kompanije.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,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
@@ -3480,12 +3527,12 @@
 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 +710,Online,online
+apps/erpnext/erpnext/accounts/page/pos/pos.js +692,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 +16,Setting this Address Template as default as there is no other default,"Postavljanje Ova adresa predloška kao zadano, jer nema drugog zadano"
+apps/erpnext/erpnext/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"
 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 +74,Quality Management,upravljanja kvalitetom
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,upravljanja kvalitetom
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} has been disabled,Stavka {0} je onemogućena
 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
@@ -3507,11 +3554,12 @@
 DocType: Student,Student Email ID,Student-mail ID
 DocType: Employee,Notice (days),Obavijest (dani )
 DocType: Tax Rule,Sales Tax Template,Porez na promet Template
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1520,Select items to save the invoice,Odaberite stavke za spremanje fakture
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1544,Select items to save the invoice,Odaberite stavke za spremanje fakture
 DocType: Employee,Encashment Date,Encashment Datum
 DocType: Account,Stock Adjustment,Stock Podešavanje
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Uobičajeno aktivnosti Troškovi postoji aktivnost Tip - {0}
 DocType: Production Order,Planned Operating Cost,Planirani operativnih troškova
+DocType: Academic Term,Term Start Date,Term Ozljede Datum
 apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},U prilogu {0} {1} #
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Banka bilans po glavnoj knjizi
 DocType: Job Applicant,Applicant Name,Podnositelj zahtjeva Ime
@@ -3541,17 +3589,17 @@
 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 ."
 DocType: Company,Distribution,Distribucija
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +8,Amount Paid,Plaćeni iznos
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Project Manager,Menadzer projekata
+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
 ,Quoted Item Comparison,Citirano Stavka Poređenje
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Dispatch,Otpremanje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,Otpremanje
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Maksimalni popust dopušteno za predmet: {0} je {1}%
 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.
-DocType: Sales Invoice,Supplier Reference,Dobavljač Referenca
-apps/erpnext/erpnext/accounts/page/pos/pos.js +844,"Master data syncing, it might take some time","Master podataka sinhronizaciju, to bi moglo da potraje"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +832,"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
@@ -3565,7 +3613,7 @@
 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 +83,Error in formula or condition,Greška u formuli ili stanju
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,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
@@ -3574,7 +3622,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},Za datum mora biti unutar fiskalne godine. Pod pretpostavkom da bi datum = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Ovdje možete održavati visina, težina, alergije, medicinske brige itd."
 DocType: Leave Block List,Applies to Company,Odnosi se na preduzeće
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +197,Cannot cancel because submitted Stock Entry {0} exists,"Ne mogu otkazati , jer podnijela Stock Stupanje {0} postoji"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +198,Cannot cancel because submitted Stock Entry {0} exists,"Ne mogu otkazati , jer podnijela Stock Stupanje {0} postoji"
 DocType: Purchase Invoice,In Words,Riječima
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,Today is {0}'s birthday!,Danas je {0} 's rođendan!
 DocType: Production Planning Tool,Material Request For Warehouse,Materijal Zahtjev za galeriju
@@ -3584,14 +3632,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,Vaša financijska godina počinje
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Imovine Amortizacija i vage
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +319,Amount {0} {1} transferred from {2} to {3},Broj {0} {1} je prešao iz {2} u {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +322,Amount {0} {1} transferred from {2} to {3},Broj {0} {1} je prešao iz {2} u {3}
 DocType: Sales Invoice,Get Advances Received,Kreiraj avansno primanje
 DocType: Email Digest,Add/Remove Recipients,Dodaj / ukloni primaoce
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +432,Transaction not allowed against stopped Production Order {0},Transakcija nije dopuštena protiv zaustavljena proizvodnja Reda {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +437,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 +143,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 +652,Item variant {0} exists with same attributes,Stavka varijanta {0} postoji sa istim atributima
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Stavka varijanta {0} postoji sa istim atributima
+DocType: Leave Application,LAP/,LAP /
 DocType: Salary Slip,Salary Slip,Plaća proklizavanja
 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
@@ -3599,12 +3648,12 @@
 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 +212,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 +215,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
-apps/erpnext/erpnext/public/js/controllers/transaction.js +866,It is needed to fetch Item Details.,Potrebno je da se donese Stavka Detalji.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +857,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
@@ -3614,14 +3663,14 @@
 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 +178,Invalid {0},Invalid {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Sick Leave,Bolovanje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,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
 DocType: Warehouse,PIN,PIN
 DocType: Sales Invoice,Base Change Amount (Company Currency),Base Promijeni Iznos (Company Valuta)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +313,No accounting entries for the following warehouses,Nema računovodstvene unosi za sljedeće skladišta
-apps/erpnext/erpnext/projects/doctype/project/project.js +102,Save the document first.,Spremite dokument prvi.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +314,No accounting entries for the following warehouses,Nema računovodstvene unosi za sljedeće skladišta
+apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Spremite dokument prvi.
 DocType: Account,Chargeable,Naplativ
 DocType: Company,Change Abbreviation,Promijeni Skraćenica
 DocType: Expense Claim Detail,Expense Date,Rashodi Datum
@@ -3634,10 +3683,9 @@
 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
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,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
 DocType: Appraisal,Appraisal Template,Procjena Predložak
 DocType: Item Group,Item Classification,Stavka Klasifikacija
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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
@@ -3647,8 +3695,8 @@
 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 +940,Please select {0} first,Odaberite {0} Prvi
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +749,Batch {0} of Item {1} has expired.,Batch {0} od {1} Stavka je istekla.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +953,Please select {0} first,Odaberite {0} Prvi
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +757,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
@@ -3676,8 +3724,8 @@
  {% 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 +92,Warehouse not found in the system,Skladište nije pronađeno u sistemu
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +106,This Month's Summary,Ovaj mjesec je sažetak
+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
 DocType: Quality Inspection Reading,Quality Inspection Reading,Kvaliteta Inspekcija čitanje
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`blokiraj zalihe starije od podrazumijevanog manje od % d dana .
 DocType: Tax Rule,Purchase Tax Template,Porez na promet Template
@@ -3687,21 +3735,22 @@
 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 +87,Please set Next Depreciation Date,Molimo podesite Sljedeća Amortizacija Datum
-DocType: Payment Gateway,Payment Gateway,Payment Gateway
 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 +378,Operation Time must be greater than 0 for Operation {0},Vrijeme rada mora biti veći od 0 za rad {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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/accounts/doctype/account/account.py +170,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 )
 DocType: Program,Program Abbreviation,program Skraćenica
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,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: Appraisal,Start Date,Datum početka
@@ -3717,21 +3766,22 @@
 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
 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 +27,Transaction currency must be same as Payment Gateway currency,Transakcija valuta mora biti isti kao i Payment Gateway valutu
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Transaction currency must be same as Payment Gateway currency,Transakcija valuta mora biti isti kao i Payment Gateway valutu
 DocType: Payment Entry,Receive,Primiti
+apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,Citati:
 DocType: Maintenance Visit,Fully Completed,Potpuno Završeni
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Zavrsen
 DocType: Employee,Educational Qualification,Obrazovne kvalifikacije
 DocType: Workstation,Operating Costs,Operativni troškovi
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Akcija ako Akumulirani Mjesečni budžet Exceeded
 DocType: Purchase Invoice,Submit on creation,Dostavi na stvaranju
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +432,Currency for {0} must be {1},Valuta za {0} mora biti {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +435,Currency for {0} must be {1},Valuta za {0} mora biti {1}
 DocType: Asset,Disposal Date,odlaganje Datum
 DocType: Employee Leave Approver,Employee Leave Approver,Zaposlenik dopust Odobritelj
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Unos Ponovno red već postoji za to skladište {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +495,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 +79,"Cannot declare as lost, because Quotation has been made.","Ne može proglasiti izgubili , jer citat je napravio ."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Kupovina Master Manager
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +429,Production Order {0} must be submitted,Proizvodnja Red {0} mora biti podnesen
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +434,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
@@ -3741,25 +3791,27 @@
 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
 DocType: Price List,Price List Name,Cjenik Ime
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +181,Totals,Ukupan rezultat
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,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 +113,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 +120,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
 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.
+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 +181,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/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 +793,All records are synced.,Svi podaci se sinhronizuju.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +781,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
 DocType: Cost Center,Cost Center Name,Troška Name
@@ -3778,21 +3830,20 @@
 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/selling/doctype/quotation/quotation.py +49,Cannot set as Lost as Sales Order is made.,Ne mogu se postaviti kao izgubljen kao prodajnog naloga je napravio .
-DocType: Student Applicant,Mother's Name,Ime majke
 DocType: Request for Quotation Item,Supplier Part No,Dobavljač dio br
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +348,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Ne mogu odbiti kada kategorija je za &#39;Vrednovanje&#39; ili &#39;Vaulation i Total&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Received From,Dobili od
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Received From,Dobili od
 DocType: Lead,Converted,Pretvoreno
 DocType: Item,Has Serial No,Ima serijski br
 DocType: Employee,Date of Issue,Datum izdavanja
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{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 +93,Row {0}: Hours value must be greater than zero.,Red {0}: Radno vrijednost mora biti veća od nule.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +117,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
 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 +172,{0} {1} does not exist,{0} {1} ne postoji
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +175,{0} {1} does not exist,{0} {1} ne postoji
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,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 +72,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
@@ -3801,13 +3852,14 @@
 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/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
 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 +109,Electrical,Električna
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Electrical,Električna
 DocType: Stock Entry,Total Value Difference (Out - In),Ukupna vrijednost Razlika (Out - In)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,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}
@@ -3815,7 +3867,7 @@
 DocType: Item,Customer Code,Kupac Šifra
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +210,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 +292,Debit To account must be a Balance Sheet account,Zaduženja na račun mora biti bilans stanja računa
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To account must be a Balance Sheet account,Zaduženja na račun mora biti bilans stanja računa
 DocType: Buying Settings,Naming Series,Imenovanje serije
 DocType: Leave Block List,Leave Block List Name,Ostavite popis imena Block
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,dionicama u vrijednosti
@@ -3827,11 +3879,11 @@
 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 +301,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 +313,Salary Slip of employee {0} already created for time sheet {1},Plaća listić od zaposlenika {0} već kreirali za vrijeme stanja {1}
 DocType: Sales Order Item,Ordered Qty,Naručena kol
-apps/erpnext/erpnext/stock/doctype/item/item.py +673,Item {0} is disabled,Stavka {0} je onemogućeno
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,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 +838,BOM does not contain any stock item,BOM ne sadrži nikakve zaliha stavka
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +809,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.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generiranje plaće gaćice
@@ -3839,23 +3891,24 @@
 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)
-apps/erpnext/erpnext/stock/doctype/item/item.py +485,Row #{0}: Please set reorder quantity,Row # {0}: Molimo set Ponovno redj količinu
+DocType: Sales Invoice Timesheet,Billing Hours,Billing Hours
+apps/erpnext/erpnext/stock/doctype/item/item.py +487,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 +62,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
+DocType: Payment Entry,Allocate Payment Amount,Izdvojiti plaćanja Iznos
 DocType: Employee External Work History,Salary,Plata
 DocType: Serial No,Delivery Document Type,Dokument isporuke - tip
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Slanje sve plaće gaćice za gore odabranih kriterija
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} Atikli azurirani
 DocType: Sales Order,Partly Delivered,Djelomično Isporučeno
-DocType: Sales Invoice,Existing Customer,Postojeći Kupac
 DocType: Email Digest,Receivables,Potraživanja
+DocType: Lead Source,Lead Source,Izvor potencijalnog kupca
 DocType: Customer,Additional information regarding the customer.,Dodatne informacije o kupcu.
 DocType: Quality Inspection Reading,Reading 5,Čitanje 5
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +38,Campaign Name is required,Potreban je naziv kampanje
 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
@@ -3864,10 +3917,9 @@
 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 +129,BOM and Manufacturing Quantity are required,BOM i proizvodnja Količina su potrebne
+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/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Starenje Range 2
 DocType: SG Creation Tool Course,Max Strength,Max Snaga
-DocType: Bank Reconciliation Detail,Amount,Iznos
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM zamijenjeno
 ,Sales Analytics,Prodajna analitika
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +113,Available {0},Dostupno {0}
@@ -3875,14 +3927,14 @@
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Postavljanje e-pošte
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +96,Please enter default currency in Company Master,Unesite zadanu valutu u tvrtki Master
 DocType: Stock Entry Detail,Stock Entry Detail,Kataloški Stupanje Detalj
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +100,Daily Reminders,Dnevni podsjetnik
+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/account/account_tree.js +23,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 +71,Customer Service,Služba za korisnike
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Customer Service,Služba za korisnike
 DocType: Homepage Featured Product,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.
@@ -3891,8 +3943,9 @@
 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
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Uobičajeno Work in Progress Skladište
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1570,Total nos of serial no is not equal to quantity.,Ukupno nos od rednim nije jednaka količini.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1594,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
 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
@@ -3900,9 +3953,10 @@
 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 +82,Engineer,inženjer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,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 +370,Item Code required at Row No {0},Kod artikla je potreban u redu broj {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +398,Item Code required at Row No {0},Kod artikla je potreban u redu broj {0}
 DocType: Sales Partner,Partner Type,Partner Tip
 DocType: Purchase Taxes and Charges,Actual,Stvaran
 DocType: Authorization Rule,Customerwise Discount,Customerwise Popust
@@ -3918,16 +3972,18 @@
 DocType: BOM,Raw Material Cost,Troškovi sirovina
 DocType: Item Reorder,Re-Order Level,Re-order Level
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Unesite stavke i planirani Količina za koje želite povećati proizvodne naloge ili preuzimanje sirovine za analizu.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +55,Part-time,Part - time
+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
 DocType: Employee,Applicable Holiday List,Primjenjivo odmor Popis
 DocType: Employee,Cheque,Ček
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Serija Updated
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +57,Series Updated,Serija Updated
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Vrsta izvjestaja je obavezna
 DocType: Item,Serial Number Series,Serijski broj serije
 apps/erpnext/erpnext/buying/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 +87,Clearance Date updated,Razmak Datum ažurira
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Uspješno Pomirio
@@ -3941,7 +3997,7 @@
 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 +513,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 +518,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.
@@ -3951,7 +4007,7 @@
 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/stock/doctype/stock_entry/stock_entry.py +158,Target warehouse in row {0} must be same as Production Order,Target skladište u redu {0} mora biti ista kao Production Order
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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
 DocType: Company,Round Off Account,Zaokružiti račun
@@ -3960,23 +4016,22 @@
 DocType: Customer Group,Parent Customer Group,Roditelj Kupac Grupa
 DocType: Purchase Invoice,Contact Email,Kontakt email
 DocType: Appraisal Goal,Score Earned,Ocjena Zarađeni
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Notice Period,Otkazni rok
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,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 +4,New Sales Person Name,Ime prodaja novih lica
 DocType: Packing Slip,Gross Weight UOM,Bruto težina UOM
-DocType: Email Digest,Receivables / Payables,Potraživanja / obveze
 DocType: Delivery Note Item,Against Sales Invoice,Protiv prodaje fakture
 DocType: Bin,Reserved Qty for Production,Rezervirano Količina za proizvodnju
 DocType: Asset,Frequency of Depreciation (Months),Učestalost amortizacije (mjeseci)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +469,Credit Account,Kreditni račun
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Credit Account,Kreditni račun
 DocType: Landed Cost Item,Landed Cost Item,Sletio Troškovi artikla
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +55,Show zero values,Pokazati nulte vrijednosti
+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
 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 +647,Please specify Attribute Value for attribute {0},Molimo navedite vrijednost atributa za atribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Molimo navedite vrijednost atributa za atribut {0}
 DocType: Item,Default Warehouse,Glavno skladište
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +39,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
@@ -3998,19 +4053,22 @@
 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
-DocType: Sales Invoice,Cold Calling,Hladno pozivanje
 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: Maintenance Schedule Item,Half Yearly,Polu godišnji
 DocType: Lead,Blog Subscriber,Blog pretplatnik
+DocType: Guardian,Alternate Number,Alternativna Broj
 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.
+DocType: Stock Reconciliation Item,Quantity Difference,Količina Razlika
 apps/erpnext/erpnext/config/hr.py +253,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 +141,Set as Lost,Postavi kao Lost
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,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 +5,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
 DocType: Supplier,Credit Days Based On,Credit Dani Na osnovu
@@ -4022,11 +4080,10 @@
 ,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 +941,Select or add new customer,Odaberite ili dodati novi kupac
+apps/erpnext/erpnext/accounts/page/pos/pos.js +930,Select or add new customer,Odaberite ili dodati novi kupac
 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 +5,This is based on the attendance of this Employee,To se temelji na prisustvo ovog zaposlenih
-DocType: Sales Invoice,Frequency,frekvencija
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +463,Debit Account,Zaduži račun
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Debit Account,Zaduži račun
 DocType: Fiscal Year,Year Start Date,Početni datum u godini
 DocType: Attendance,Employee Name,Zaposlenik Ime
 DocType: Sales Invoice,Rounded Total (Company Currency),Zaobljeni Ukupno (Društvo valuta)
@@ -4035,27 +4092,27 @@
 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 +210,Supplier Quotation {0} created,Dobavljač Ponuda {0} stvorio
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +208,Supplier Quotation {0} created,Dobavljač Ponuda {0} stvorio
 apps/erpnext/erpnext/accounts/report/financial_statements.py +90,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 +173,Employee Benefits,Primanja zaposlenih
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,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 +228,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 +232,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 +499,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 +500,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 +1007,Price List not found or disabled,Cjenik nije pronađena ili invaliditetom
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1008,Price List not found or disabled,Cjenik nije pronađena ili invaliditetom
 DocType: Expense Claim,Approved,Odobreno
 DocType: Pricing Rule,Price,Cijena
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +244,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 +256,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
@@ -4066,12 +4123,12 @@
 DocType: Address,Office,Ured
 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 +259,Please select Employee Record first.,Molimo odaberite zaposlenih Record prvi.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +266,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 +190,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 +235,Please enter Expense Account,Unesite trošak računa
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,Please enter Expense Account,Unesite trošak računa
 DocType: Account,Stock,Zaliha
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,"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 +976,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Referenca Vrsta dokumenta mora biti jedan od Narudžbenice, fakturi ili Journal Entry"
 DocType: Employee,Current Address,Trenutna adresa
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Ako proizvod varijanta druge stavke onda opis, slike, cijene, poreze itd će biti postavljena iz predloška, osim ako izričito navedeno"
 DocType: Serial No,Purchase / Manufacture Details,Kupnja / Proizvodnja Detalji
@@ -4086,9 +4143,10 @@
 DocType: Asset Movement,Transaction Date,Transakcija Datum
 DocType: Production Plan Item,Planned Qty,Planirani Kol
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,Ukupno porez
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,For Quantity (Manufactured Qty) is mandatory,Za Količina (Proizvedeno Qty) je obavezno
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,For Quantity (Manufactured Qty) is mandatory,Za Količina (Proizvedeno Qty) je obavezno
 DocType: Stock Entry,Default Target Warehouse,Centralno skladište
 DocType: Purchase Invoice,Net Total (Company Currency),Neto Ukupno (Društvo valuta)
+apps/erpnext/erpnext/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 +78,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: Production Order,Actual Start Date,Stvarni datum početka
@@ -4103,9 +4161,11 @@
 DocType: Warranty Claim,If different than customer address,Ako se razlikuje od kupaca adresu
 DocType: BOM Operation,BOM Operation,BOM operacija
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Na prethodnu Row visini
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +226,Transfer Asset,Transfer imovine
+DocType: Student,Home Address,Kućna adresa
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +227,Transfer Asset,Transfer imovine
 DocType: POS Profile,POS Profile,POS profil
 apps/erpnext/erpnext/config/schools.py +33,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 +129,"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
@@ -4115,8 +4175,8 @@
 DocType: Assessment,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 +765,Material to Supplier,Materijal dobavljaču
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +189,Excise Invoice,Akcizama Račun
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,Material to Supplier,Materijal dobavljaču
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,Akcizama Račun
 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
@@ -4126,7 +4186,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,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: Scheduling Tool,Scheduling Tool,zakazivanje alata
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +136,Credit Card,kreditna kartica
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,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.
 DocType: Purchase Invoice,Next Date,Sljedeći datum
@@ -4134,6 +4194,7 @@
 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: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Ovdje možete održavati obiteljske pojedinosti kao što su ime i okupacije roditelja, supružnika i djecu"
+DocType: Academic Term,Term End Date,Term Završni datum
 DocType: Hub Settings,Seller Name,Ime Prodavač
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Porezi i naknade Umanjenja (Društvo valuta)
 DocType: Item Group,General Settings,General Settings
@@ -4145,7 +4206,7 @@
 DocType: Customer,Commission Rate,Komisija Stopa
 apps/erpnext/erpnext/stock/doctype/item/item.js +261,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 +115,"Payment Type must be one of Receive, Pay and Internal Transfer","Plaćanje Tip mora biti jedan od Primi, Pay i unutrašnje Transfer"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +118,"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/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Košarica je prazna
 DocType: Production Order,Actual Operating Cost,Stvarni operativnih troškova
@@ -4160,10 +4221,10 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,Odaberite CSV datoteku
 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 +92,Designer,Imenovatelj
+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
 DocType: Serial No,Delivery Details,Detalji isporuke
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +469,Cost Center is required in row {0} in Taxes table for type {1},Troška potrebno je u redu {0} poreza stolom za vrstu {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +472,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
 ,Item-wise Purchase Register,Stavka-mudar Kupnja Registracija
 DocType: Batch,Expiry Date,Datum isteka
@@ -4173,12 +4234,12 @@
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Direktor Projekata
 apps/erpnext/erpnext/controllers/status_updater.py +174,"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 +417, (Half Day),(Pola dana)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425, (Half Day),(Pola dana)
 DocType: Supplier,Credit Days,Kreditne Dani
 DocType: Leave Type,Is Carry Forward,Je Carry Naprijed
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +740,Get Items from BOM,Kreiraj proizvode od sastavnica (BOM)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +711,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 +549,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/controllers/accounts_controller.py +552,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
 ,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
diff --git a/erpnext/translations/ca.csv b/erpnext/translations/ca.csv
index 9260348..7b272ce 100644
--- a/erpnext/translations/ca.csv
+++ b/erpnext/translations/ca.csv
@@ -18,11 +18,10 @@
 DocType: Sales Partner,Dealer,Comerciant
 DocType: Employee,Rented,Llogat
 DocType: Purchase Order,PO-,PO-
-apps/erpnext/erpnext/accounts/report/financial_statements.py +19,Start Year {0} not found.,Any d&#39;inici {0} no trobat.
 DocType: POS Profile,Applicable for User,Aplicable per a l&#39;usuari
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +191,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Detingut ordre de producció no es pot cancel·lar, unstop primer per cancel·lar"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +197,Do you really want to scrap this asset?,De veres voleu rebutjar aquest actiu?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +17,Select Default Supplier,Tria un proveïdor predeterminat
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +192,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Detingut ordre de producció no es pot cancel·lar, unstop primer per cancel·lar"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +198,Do you really want to scrap this asset?,De veres voleu rebutjar aquest actiu?
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Tria un proveïdor predeterminat
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Informa de la divisa pera la Llista de preus {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Es calcularà en la transacció.
 DocType: Address,County,comtat
@@ -42,46 +41,45 @@
 DocType: Sales Invoice,Customer Name,Nom del client
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +126,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 +180,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 +183,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 +148,Series Updated Successfully,Sèrie actualitzat correctament
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +149,Series Updated Successfully,Sèrie actualitzat correctament
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,caixa
 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
-DocType: Quality Inspection Reading,Parameter,Paràmetre
 apps/erpnext/erpnext/projects/doctype/project/project.py +54,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 +239,New Leave Application,Nova aplicació Deixar
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,New Leave Application,Nova aplicació Deixar
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +20,Attendance Record {0} exists against Student {1} for Course Schedule {2},Registre d&#39;assistència {0} existeix en contra d&#39;estudiants {1} per al Programa del curs {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Bank Draft,Lletra bancària
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,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
 DocType: Academic Term,Academic Term,període acadèmic
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +13,Material,material
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Quantity,Quantitat
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +511,Accounts table cannot be blank.,La taula de comptes no pot estar en blanc.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +616,Quantity,Quantitat
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +512,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)
 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/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 +142,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
-DocType: Purchase Invoice,Monthly,Mensual
 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/buying/doctype/purchase_order/purchase_order.js +771,Invoice,Factura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +750,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 +198,Row {0}: {1} {2} does not match with {3},Fila {0}: {1} {2} no coincideix amb {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Fila # {0}:
+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 +127,Please select Price List,Seleccionla llista de preus
@@ -112,8 +110,8 @@
 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 +589,Get items from,Obtenir articles de
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +382,Stock cannot be updated against Delivery Note {0},L'estoc no es pot actualitzar contra la Nota de Lliurament {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Obtenir articles de
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,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
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Botiga
@@ -122,7 +120,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Fons de Pensions
 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 +156,Salary Structure Missing,Falta Estructura salarial
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,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
@@ -130,10 +128,11 @@
 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 +156,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/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;És l&#39;actiu fix&quot; no pot estar sense marcar, ja que hi ha registre d&#39;actius contra l&#39;element"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +189,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","&quot;És l&#39;actiu fix&quot; no pot estar sense marcar, ja que hi ha registre d&#39;actius contra l&#39;element"
 DocType: Tax Rule,Tax Type,Tipus d&#39;Impostos
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +144,You are not authorized to add or update entries before {0},No té permisos per afegir o actualitzar les entrades abans de {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,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/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ó
@@ -143,18 +142,17 @@
 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 +165,Opening,Obertura
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,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/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Client&gt; Grup de Clients&gt; Territori
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Només compte de pagament
 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.
 DocType: Lead,Product Enquiry,Consulta de producte
 DocType: Academic Term,Schools,escoles
 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 +335,Please select Company first,Si us plau seleccioneu l'empresa primer
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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
@@ -164,7 +162,7 @@
 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
 DocType: Purchase Invoice Item,Is Fixed Asset,És actiu fix
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Available qty is {0}, you need {1}","Quantitats disponibles és {0}, necessita {1}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +225,"Available qty is {0}, you need {1}","Quantitats disponibles és {0}, necessita {1}"
 DocType: Expense Claim Detail,Claim Amount,Reclamació Import
 DocType: Employee,Mr,Sr
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Tipus de Proveïdor / distribuïdor
@@ -173,26 +171,27 @@
 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: Assessment Result,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 +171,Annual Salary,Salari Anual
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Annual Salary,Salari Anual
 DocType: Period Closing Voucher,Closing Fiscal Year,Tancant l'Any Fiscal
 apps/erpnext/erpnext/accounts/party.py +349,{0} {1} is frozen,{0} {1} és congelada
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Despeses d'estoc
-apps/erpnext/erpnext/accounts/report/financial_statements.py +22,End Year {0} not found.,Any de finalització {0} no trobat.
 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}
 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 +130,At least one mode of payment is required for POS invoice.,Es requereix com a mínim una manera de pagament de la factura POS.
 DocType: Products Settings,Show Products as a List,Mostrar els productes en forma de llista
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Descarregueu la plantilla, omplir les dades adequades i adjuntar l'arxiu modificat.
  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 +451,Item {0} is not active or end of life has been reached,L'article {0} no està actiu o ha arribat al final de la seva vida
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +456,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/controllers/accounts_controller.py +614,"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/controllers/accounts_controller.py +617,"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 +166,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
@@ -204,13 +203,13 @@
 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 +147,Execution,Execució
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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/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}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,Cost Center {0} does not belong to Company {1},El Centre de cost {0} no pertany a l'empresa {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +100,Cost Center {0} does not belong to Company {1},El Centre de cost {0} no pertany a l'empresa {1}
 DocType: Customer,Individual,Individual
 DocType: Interest,Academics User,acadèmics usuari
 DocType: Cheque Print Template,Amount In Figure,A la Figura quantitat
@@ -226,30 +225,32 @@
 DocType: Production Planning Tool,Sales Orders,Ordres de venda
 DocType: Purchase Taxes and Charges,Valuation,Valoració
 ,Purchase Order Trends,Compra Tendències Sol·licitar
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,The request for quotation can be accessed by clicking on the following link,La sol·licitud de cotització es pot accedir fent clic al següent enllaç
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,Assignar fulles per a l'any.
 DocType: SG Creation Tool Course,SG Creation Tool Course,SG Curs eina de creació
 DocType: Student Group Creation Tool,Leave blank if you wish to fetch all courses for selected academic term,Deixar en blanc per obtenir tots els cursos del seu terme acadèmic elegit
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,Insufficient Stock,insuficient Stock
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227,Insufficient Stock,insuficient Stock
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Planificació de la capacitat Desactivar i seguiment de temps
+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: 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/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} does not belong to Company {1},El compte {0} no pertany a l'empresa {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +86,Account {0} does not belong to Company {1},El compte {0} no pertany a l'empresa {1}
 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}
 DocType: Naming Series,Series List for this Transaction,Llista de Sèries per a aquesta transacció
 DocType: Sales Invoice,Is Opening Entry,És assentament d'obertura
 DocType: Customer Group,Mention if non-standard receivable account applicable,Esmenteu si compta per cobrar no estàndard aplicable
 DocType: Course Schedule,Instructor Name,nom instructor
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,For Warehouse is required before Submit,Cal informar del magatzem destí abans de presentar
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,For Warehouse is required before Submit,Cal informar del magatzem destí abans de presentar
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Rebuda el
 DocType: Sales Partner,Reseller,Revenedor
 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 +1436,"LocalStorage is full , did not save","LocalStorage està ple, no va salvar"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1460,"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}
@@ -262,18 +263,19 @@
 apps/erpnext/erpnext/templates/generators/item.html +78,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 +5,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/leave_application/leave_application.py +206,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/leave_application/leave_application.py +213,Only the selected Leave Approver can submit this Leave Application,Només l'aprovador d'absències seleccionat pot presentar aquesta sol·licitud
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Alleujar data ha de ser major que la data de Unir
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Leaves per Year,Deixa per any
+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 +103,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}
+DocType: Email Digest,Profit & Loss,D&#39;pèrdues i guanys
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,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 +435,Leave Blocked,Absència bloquejada
-apps/erpnext/erpnext/stock/doctype/item/item.py +669,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 +443,Leave Blocked,Absència bloquejada
+apps/erpnext/erpnext/stock/doctype/item/item.py +671,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 +83,Annual,Anual
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +86,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
@@ -281,20 +283,22 @@
 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ó
 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 +91,Software Developer,Desenvolupador de Programari
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,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: Scheduling Tool,Course Start Date,Curs Data d&#39;Inici
 DocType: Item,Publish in Hub,Publicar en el Hub
+DocType: Student Admission,Student Admission,Admissió d&#39;Estudiants
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is cancelled,L'article {0} està cancel·lat
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Material Request,Sol·licitud de materials
+apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} is cancelled,L'article {0} està cancel·lat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +823,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 +28,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 +328,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Article {0} no es troba en &#39;matèries primeres subministrades&#39; taula en l&#39;Ordre de Compra {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +333,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/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
@@ -310,20 +314,21 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +130,Please select Charge Type first,Seleccioneu Tipus de Càrrec primer
 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: Email Digest,New Quotations,Noves Cites
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,El primer aprovadorde d'absències de la llista s'establirà com a predeterminat
 DocType: Tax Rule,Shipping County,Comtat d&#39;enviament
 apps/erpnext/erpnext/config/desktop.py +158,Learn,Aprendre
 DocType: Asset,Next Depreciation Date,Següent Depreciació Data
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Cost Activitat per Empleat
 DocType: Accounts Settings,Settings for Accounts,Ajustaments de Comptes
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +626,Supplier Invoice No exists in Purchase Invoice {0},Proveïdor de factura no existeix en la factura de la compra {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +629,Supplier Invoice No exists in Purchase Invoice {0},Proveïdor de factura no existeix en la factura de la compra {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Organigrama de vendes
 DocType: Job Applicant,Cover Letter,carta de presentació
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Xecs pendents i Dipòsits per aclarir
 DocType: Item,Synced With Hub,Sincronitzat amb Hub
 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 +348,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 +86,Circular Reference Error,Referència Circular Error
@@ -335,15 +340,16 @@
 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 +806,Delivery Note,Nota de lliurament
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +800,Delivery Note,Nota de lliurament
 apps/erpnext/erpnext/config/learn.py +87,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 +233,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/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/setup/doctype/email_digest/email_digest.py +104,Summary for this week and pending activities,Resum per a aquesta setmana i activitats pendents
+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"
 DocType: Employee,Company Email,Email de l'empresa
@@ -355,28 +361,29 @@
 apps/erpnext/erpnext/config/hr.py +186,"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
-apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Fila # {0}: Factura de compra no es pot fer front a un actiu existent {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +554,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 +54,{0} already allocated for Employee {1} for period {2} to {3},{0} ja assignat per Empleat {1} per al període {2} a {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +812,Select Item,Seleccioneu Producte
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +791,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 \
 					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 +142,Purchase Invoice {0} is already submitted,La Factura de compra {0} ja està Presentada
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Fila # {0}: Lot No ha de ser igual a {1} {2}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +143,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.
 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 +342,Please see attachment,"Si us plau, vegeu el document adjunt"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,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 +19,Setup Already Complete!!,Configuració acabada !!
 ,Finished Goods,Béns Acabats
 DocType: Delivery Note,Instructions,Instruccions
 DocType: Quality Inspection,Inspected By,Inspeccionat per
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Proveïdor&gt; Tipus de proveïdor
 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/public/js/utils/item_selector.js +12,Add Items,Afegir els articles
@@ -390,29 +397,29 @@
 DocType: Currency Exchange,Currency Exchange,Valor de Canvi de divisa
 DocType: Purchase Invoice Item,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)
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Saldo creditor
+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/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 +736,Purchase Return,Devolució de Compra
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +715,Purchase Return,Devolució de Compra
 ,Purchase Register,Compra de Registre
 DocType: 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 +202,{0} ({1}) must have role 'Leave Approver',{0} ({1}) ha de tenir paper 'Deixar aprovador'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,{0} ({1}) must have role 'Leave Approver',{0} ({1}) ha de tenir paper 'Deixar aprovador'
 DocType: Purchase Receipt,Vehicle Date,Data de Vehicles
 DocType: Student Log,Medical,Metge
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Motiu de pèrdua
-apps/erpnext/erpnext/accounts/utils.py +239,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 +163,Reason for losing,Motiu de pèrdua
+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
 DocType: Announcement,Receiver,receptor
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Estació de treball està tancada en les següents dates segons Llista de vacances: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Oportunitats
 DocType: Employee,Single,Solter
 DocType: Account,Cost of Goods Sold,Cost de Vendes
 DocType: Purchase Invoice,Yearly,Anual
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +225,Please enter Cost Center,Si us plau entra el centre de cost
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,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
@@ -425,26 +432,26 @@
 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
 DocType: Account,Is Group,És el Grup
+DocType: Email Digest,Pending Purchase Orders,A l&#39;espera d&#39;ordres de compra
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Ajusta automàticament els números de sèrie basat en FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Comprovar Proveïdor Nombre de factura Singularitat
 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 +102,Non Profit,Sense ànim de lucre
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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: Stock Reconciliation Item,Do not include symbols (ex. $),No incloure símbols (ex. $)
 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 +638,Attribute {0} selected multiple times in Attributes Table,Atribut {0} seleccionat diverses vegades en la taula Atributs
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Atribut {0} seleccionat diverses vegades en la taula Atributs
 DocType: HR Settings,Employee record is created using selected field. ,Es crea el registre d'empleat utilitzant el camp seleccionat.
 DocType: Sales Order,Not Applicable,No Aplicable
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Mestre de vacances.
 DocType: Request for Quotation Item,Required Date,Data Requerit
 DocType: Delivery Note,Billing Address,Direcció De Enviament
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +862,Please enter Item Code.,"Si us plau, introduïu el codi d'article."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +847,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"
@@ -458,12 +465,12 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Valors i Dipòsits
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Fulles totals assignats és obligatori
 DocType: Job Opening,Description of a Job Opening,Descripció d'una oferta de treball
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Pending activities for today,Activitats pendents per avui
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Activitats pendents per avui
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Registre d'assistència.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,El component salarial per a la nòmina de part d&#39;hores basat.
 DocType: Sales Order Item,Used for Production Plan,S'utilitza per al Pla de Producció
 DocType: Manufacturing Settings,Time Between Operations (in mins),Temps entre operacions (en minuts)
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +92,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} Pressupost per al compte {1} contra centres de cost {2} és {3}. Es superarà per {4}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +95,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} Pressupost per al compte {1} contra centres de cost {2} és {3}. Es superarà per {4}
 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
@@ -471,16 +478,16 @@
 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/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 +86,Administrative Officer,Oficial Administratiu
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,Oficial Administratiu
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +23,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 +319,Please select Company,Seleccioneu de l&#39;empresa
-DocType: Stock Entry,Difference Account,Compte de diferències
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +309,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 +44,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 +398,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 +399,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 +530,"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 +532,"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 +28,Buy,comprar
@@ -488,7 +495,7 @@
 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 +1563,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 +1587,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ó
@@ -497,13 +504,14 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Account {0} does not belong to company: {1},Compte {0} no pertany a la companyia: {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation already used for another company,Abreviatura ja utilitzat per una altra empresa
 DocType: Selling Settings,Default Customer Group,Grup predeterminat Client
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Supplier is required against Payable account {0},Es requereix professional contra el compte per pagar {0}
 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
 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 +313,Reference No and Reference Date is mandatory for Bank transaction,No de referència i data de referència és obligatòria per a les transaccions bancàries
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +316,Reference No and Reference Date is mandatory for Bank transaction,No de referència i data de referència és obligatòria per a les transaccions bancàries
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Afegeix / Edita les taxes i càrrecs
 DocType: Purchase Invoice,Supplier Invoice No,Número de Factura de Proveïdor
 DocType: Territory,For reference,Per referència
@@ -514,7 +522,6 @@
 DocType: Installation Note Item,Installation Note Item,Nota d'instal·lació de l'article
 DocType: Production Plan Item,Pending Qty,Pendent Quantitat
 DocType: Budget,Ignore,Ignorar
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Codi de l&#39;article&gt; Grup Element&gt; Marca
 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/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
@@ -525,11 +532,11 @@
 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/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 +28,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 +19,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 +707,Make Sales Order,Fes la teva comanda de vendes
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +701,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
@@ -545,7 +552,8 @@
 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 +734,Sales Return,Devolucions de vendes
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +728,Sales Return,Devolucions de vendes
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +91,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)
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Base de dades de clients potencials.
@@ -554,14 +562,13 @@
 DocType: Quotation,Quotation To,Oferta per
 DocType: Lead,Middle Income,Ingrés Mig
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +212,Opening (Cr),Obertura (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +795,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,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 +237,Allocated amount can not be negative,Suma assignat no pot ser negatiu
+apps/erpnext/erpnext/stock/doctype/item/item.py +797,Default Unit of Measure for Item {0} cannot be changed directly because 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
 DocType: Purchase Order Item,Billed Amt,Quantitat facturada
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Un Magatzem lògic contra el qual es fan les entrades en existències.
 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 +91,Reference No & Reference Date is required for {0},No de referència i obres de consulta Data es requereix per {0}
-DocType: Sales Invoice,Customer's Vendor,Venedor del Client
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Proposal Writing,Redacció de propostes
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,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"
@@ -570,13 +577,14 @@
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,temps de seguiment
 DocType: Fiscal Year Company,Fiscal Year Company,Any fiscal Companyia
 DocType: Packing Slip Item,DN Detail,Detall DN
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +257,Already supplier quotation has created,Ja cotització del proveïdor ha creat
 DocType: Timesheet,Billed,Facturat
 DocType: Batch,Batch Description,Descripció lots
+apps/erpnext/erpnext/accounts/utils.py +685,"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 +733,View Offline Records,Veure Desconnectat Registres
+apps/erpnext/erpnext/accounts/page/pos/pos.js +715,View Offline Records,Veure Desconnectat Registres
+DocType: Student,Sibling Details,Detalls de germans
 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: Payment Reconciliation,Invoice/Journal Entry Details,Factura / Diari Detalls de l'entrada
@@ -590,7 +598,7 @@
 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
 DocType: Employee,Passport Number,Nombre de Passaport
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Manager,Gerent
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,Gerent
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,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
@@ -599,10 +607,11 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter email address,Introduïu l'adreça de correu electrònic
 DocType: Production Order Operation,In minutes,En qüestió de minuts
 DocType: Issue,Resolution Date,Resolució Data
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +299,Timesheet created:,Part d&#39;hores de creació:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +715,Please set default Cash or Bank account in Mode of Payment {0},"Si us plau, estableix pagament en efectiu o Compte bancari predeterminat a la Forma de pagament {0}"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +300,Timesheet created:,Part d&#39;hores de creació:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +772,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
 DocType: Selling Settings,Customer Naming By,Customer Naming By
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,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: 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
@@ -627,6 +636,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,acabat
 DocType: Pricing Rule,Sales Manager,Gerent De Vendes
 DocType: Salary Structure Employee,Base,base
+DocType: Timesheet,Total Billed Hours,Total d&#39;hores facturades
 DocType: Journal Entry,Write Off Amount,Anota la quantitat
 DocType: Journal Entry,Bill No,Factura Número
 DocType: Company,Gain/Loss Account on Asset Disposal,Compte guany / pèrdua en la disposició d&#39;actius
@@ -641,11 +651,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +9,Pre Sales,abans de la compra
 DocType: Purchase Receipt,Other Details,Altres detalls
 DocType: Account,Accounts,Comptes
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Marketing,Màrqueting
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +227,Payment Entry is already created,Ja està creat Entrada Pagament
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,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 +538,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 +21,Preview Salary Slip,Salari vista prèvia de lliscament
+apps/erpnext/erpnext/controllers/accounts_controller.py +541,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 +38,Preview Salary Slip,Salari vista prèvia de lliscament
 DocType: Company,Deafult Cost Center,Centre de cost deafult
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +48,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ó
@@ -654,7 +664,7 @@
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,Seleccioneu un grup d&#39;alumnes
 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 +617,Item has variants.,L&#39;article té variants.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,L&#39;article té variants.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,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
@@ -674,7 +684,7 @@
 DocType: Purchase Order,Supply Raw Materials,Subministrament de Matèries Primeres
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,La data en què es genera la següent factura. Es genera a enviar.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Actiu Corrent
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,{0} is not a stock Item,{0} no és un article d'estoc
+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 +169,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
@@ -760,26 +770,25 @@
 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 +709,No Permission,No permission
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +710,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},&quot;Actualització de la &#39;no es pot comprovar perquè els articles no es lliuren a través de {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +298,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 +542,Row #{0}: Asset {1} must be submitted,Fila # {0}: {1} d&#39;actius ha de ser presentat
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset {1} must be submitted,Fila # {0}: {1} d&#39;actius ha de ser presentat
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,No s'ha trobat cap empeat
 DocType: Supplier Quotation,Stopped,Detingut
 DocType: Item,If subcontracted to a vendor,Si subcontractat a un proveïdor
 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.
 DocType: Warehouse,Tree Details,Detalls de l&#39;arbre
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Enviar ara
 ,Support Analytics,Suport Analytics
 DocType: Item,Website Warehouse,Lloc Web del magatzem
 DocType: Payment Reconciliation,Minimum Invoice Amount,Volum mínim Factura
 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/sales_invoice/sales_invoice.py +227,Timesheet {0} is already completed or cancelled,Part d&#39;hores {0} ja s&#39;hagi completat o cancel·lat
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +259,Timesheet {0} is already completed or cancelled,Part d&#39;hores {0} ja s&#39;hagi completat o cancel·lat
 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
@@ -795,13 +804,13 @@
 apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Horari del curs
 DocType: Maintenance Visit,Completion Status,Estat de finalització
 DocType: HR Settings,Enter retirement age in years,Introdueixi l&#39;edat de jubilació en anys
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +229,Target Warehouse,Magatzem destí
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +230,Target Warehouse,Magatzem destí
 DocType: Cheque Print Template,Starting location from left edge,Posició inicial des la vora esquerra
 DocType: Item,Allow over delivery or receipt upto this percent,Permetre sobre el lliurament o recepció fins aquest percentatge
 DocType: Stock Entry,STE-,Stephen
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Sales Order Date,Data prevista de lliurament no pot ser abans de la data de l'ordres de venda
 DocType: Upload Attendance,Import Attendance,Importa Assistència
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Tots els grups d'articles
+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/config/setup.py +89,Automatically compose message on submission of transactions.,Compondre automàticament el missatge en la presentació de les transaccions.
@@ -813,13 +822,15 @@
 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/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
 DocType: Expense Claim,Expenses,Despeses
 DocType: Item Variant Attribute,Item Variant Attribute,Article Variant Atribut
 ,Purchase Receipt Trends,Purchase Receipt Trends
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Research & Development,Investigació i Desenvolupament
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Investigació i Desenvolupament
 ,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
@@ -828,7 +839,7 @@
 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/controllers/accounts_controller.py +340,"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."
+apps/erpnext/erpnext/controllers/accounts_controller.py +343,"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
@@ -850,12 +861,12 @@
 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 +756,Purchase Receipt,Albarà de compra
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +735,Purchase Receipt,Albarà de compra
 ,Received Items To Be Billed,Articles rebuts per a facturar
 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 +167,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 +282,Unable to find Time Slot in the next {0} days for Operation {1},Incapaç de trobar la ranura de temps en els pròxims {0} dies per a l&#39;operació {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +170,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 +283,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 +439,BOM {0} must be active,BOM {0} ha d'estar activa
@@ -866,7 +877,7 @@
 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 +214,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 +217,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ó
@@ -880,9 +891,9 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,L'Empleat {0} no està actiu o no existeix
 DocType: Fee Structure,Components,components
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,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 +612,Item Variants {0} updated,Article Variants {0} actualitza
+apps/erpnext/erpnext/stock/doctype/item/item.py +614,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 +843,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 +854,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
@@ -897,69 +908,72 @@
 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 +728,New Sales Invoice,Nova factura de venda
+apps/erpnext/erpnext/accounts/page/pos/pos.js +710,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 +728,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
 DocType: Material Request Item,Lead Time Date,Termini d'execució Data
 DocType: Guardian,Guardian Name,nom tutor
 DocType: Cheque Print Template,Has Print Format,Format d&#39;impressió té
-apps/erpnext/erpnext/accounts/page/pos/pos.js +86, 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 +109,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 +619,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","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/page/pos/pos.js +75, 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 +613,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing 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 +606,Supplier Invoice Date cannot be greater than Posting Date,Factura Proveïdor La data no pot ser major que la data de publicació
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +609,Supplier Invoice Date cannot be greater than Posting Date,Factura Proveïdor La data no pot ser major que la data de publicació
 DocType: Purchase Invoice Item,Purchase Order Item,Ordre de compra d'articles
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +130,Indirect Income,Ingressos Indirectes
 DocType: Cheque Print Template,Date Settings,Configuració de la data
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Desacord
 ,Company Name,Nom de l'Empresa
 DocType: SMS Center,Total Message(s),Total Missatge(s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +810,Select Item for Transfer,Seleccionar element de Transferència
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +789,Select Item for Transfer,Seleccionar element de Transferència
 DocType: Purchase Invoice,Additional Discount Percentage,Percentatge de descompte addicional
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Veure una llista de tots els vídeos d&#39;ajuda
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Seleccioneu cap compte del banc on xec va ser dipositat.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Permetre a l'usuari editar la Llista de Preus de Tarifa en transaccions
 DocType: Pricing Rule,Max Qty,Quantitat màxima
-DocType: Student Applicant,Father's Name,Nom del pare
 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 +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Fila {0}: El pagament contra Vendes / Ordre de Compra sempre ha d'estar marcat com a pagamet anticipat (bestreta)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Químic
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +686,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/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
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +694,All items have already been transferred for this Production Order.,Tots els articles ja han estat transferits per aquesta ordre de producció.
 DocType: Process Payroll,Select Payroll Year and Month,Seleccioneu nòmina Any i Mes
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,Meter,Metre
 DocType: Workstation,Electricity Cost,Cost d'electricitat
 DocType: HR Settings,Don't send Employee Birthday Reminders,No envieu Empleat recordatoris d'aniversari
-DocType: Opportunity,Walk In,Walk In
 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 +12,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: Timesheet Detail,Bill,projecte de llei
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,White,Blanc
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,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
 DocType: SMS Center,All Lead (Open),Tots els clients potencials (Obert)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +228,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})
+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 +731,Make ,Fer
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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."
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Carro de la compra
-apps/erpnext/erpnext/controllers/selling_controller.py +154,Order Type must be one of {0},Tipus d'ordre ha de ser un de {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Tipus d'ordre ha de ser un de {0}
 DocType: Lead,Next Contact Date,Data del següent contacte
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Quantitat d'obertura
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +393,Please enter Account for Change Amount,"Si us plau, introdueixi el compte per al Canvi Monto"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,Please enter Account for Change Amount,"Si us plau, introdueixi el compte per al Canvi Monto"
 DocType: Student Batch,Student Batch Name,Lot Nom de l&#39;estudiant
 DocType: Holiday List,Holiday List Name,Nom de la Llista de vacances
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js +8,Schedule Course,Calendari de Cursos
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Stock Options,Opcions sobre accions
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Opcions sobre accions
 DocType: Journal Entry Account,Expense Claim,Compte de despeses
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +211,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 +237,Qty for {0},Quantitat de {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +212,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 +238,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
@@ -968,9 +982,9 @@
 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/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Elements retirats sense canvi en la quantitat o el valor.
+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 +635,Attribute table is mandatory,Taula d&#39;atributs és obligatori
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Taula d&#39;atributs és obligatori
 DocType: Production Planning Tool,Get Sales Orders,Rep ordres de venda
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{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"
@@ -995,7 +1009,7 @@
 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/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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Serial No {0} està sota contracte de manteniment fins {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +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ó
@@ -1007,7 +1021,7 @@
 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/controllers/selling_controller.py +231,Sales Order {0} is {1},Vendes Sol·licitar {0} és {1}
+apps/erpnext/erpnext/controllers/selling_controller.py +232,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
 DocType: Packing Slip,Net Weight UOM,Pes net UOM
@@ -1017,25 +1031,24 @@
 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
 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 +155,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Ofertes rebudes dels proveïdors.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},Per {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Edat mitjana
 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/templates/pages/home.html +32,View All Products,Veure tots els Productes
+apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Veure tots els Productes
 DocType: Company,Default Currency,Moneda per defecte
 DocType: Contact,Enter designation of this Contact,Introduïu designació d'aquest contacte
 DocType: Expense Claim,From Employee,D'Empleat
-apps/erpnext/erpnext/controllers/accounts_controller.py +400,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
+apps/erpnext/erpnext/controllers/accounts_controller.py +403,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/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,i l'any:
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +191,{0} {1} must be submitted,{0} {1} s'ha de Presentar
-DocType: Email Digest,Annual Expense,Despesa anual
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,{0} {1} must be submitted,{0} {1} s'ha de Presentar
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +145,Quantity must be less than or equal to {0},La quantitat ha de ser menor que o igual a {0}
 DocType: SMS Center,Total Characters,Personatges totals
 apps/erpnext/erpnext/controllers/buying_controller.py +156,Please select BOM in BOM field for Item {0},Seleccioneu la llista de materials en el camp de llista de materials per al punt {0}
@@ -1046,30 +1059,31 @@
 DocType: Sales Partner,Distributor,Distribuïdor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Regles d'enviament de la cistella de lacompra
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +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 +62,Please set 'Apply Additional Discount On',"Si us plau, estableix &quot;Aplicar descompte addicional en &#39;"
+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
 DocType: Global Defaults,Global Defaults,Valors per defecte globals
 apps/erpnext/erpnext/projects/doctype/project/project.py +153,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
 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 +327,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
 ,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 +362,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/stock/doctype/stock_entry/stock_entry.py +367,Finished Item {0} must be entered for Manufacture type entry,Article Acabat {0} ha de ser introduït per a l&#39;entrada Tipus de Fabricació
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Obertura de Balanç de Comptabilitat
 DocType: Sales Invoice Advance,Sales Invoice Advance,Factura proforma
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +499,Nothing to request,Res per sol·licitar
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +500,Nothing to request,Res per sol·licitar
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',La 'Data d'Inici Real' no pot ser major que la 'Data de Finalització Real'
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Management,Administració
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},Es requereix ja sigui quantitat de dèbit o crèdit per {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,Administració
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +55,Either debit or credit amount is required for {0},Es requereix ja sigui quantitat de dèbit o crèdit per {0}
 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 +161,Blue,Blau
+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
@@ -1079,12 +1093,12 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +23,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ó
 DocType: Stock Settings,Default Item Group,Grup d'articles predeterminat
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1374,Do you really want to submit the invoice?,Realment voleu enviar la factura?
+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 +685,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 +1526,"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 +679,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 +1550,"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/accounts/doctype/account/account_tree.js +26,"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
@@ -1104,104 +1118,106 @@
 DocType: Payment Reconciliation,Unreconciled Payment Details,Detalls de Pagaments Sense conciliar
 DocType: Global Defaults,Current Fiscal Year,Any fiscal actual
 DocType: Global Defaults,Disable Rounded Total,Desactivar total arrodonit
-DocType: Lead,Call,Truca
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +417,'Entries' cannot be empty,'Entrades' no pot estar buit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +418,'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 +214,Fiscal Year {0} not found,Any fiscal {0} no trobat
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +221,Fiscal Year {0} not found,Any fiscal {0} no trobat
 apps/erpnext/erpnext/config/hr.py +238,Setting up Employees,Configuració d&#39;Empleats
 DocType: Sales Order,SO-,TAN-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Seleccioneu el prefix primer
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Please select prefix first,Seleccioneu el prefix primer
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Research,Recerca
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,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 +43,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 +57,View Ledger,Veure Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Earliest
-apps/erpnext/erpnext/stock/doctype/item/item.py +504,"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 +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/setup/setup_wizard/setup_wizard.py +437,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
 ,Budget Variance Report,Pressupost Variància Reportar
 DocType: Salary Slip,Gross Pay,Sou brut
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +90,Row {0}: Activity Type is mandatory.,Fila {0}: Tipus d&#39;activitat és obligatòria.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +114,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/public/js/controllers/stock_controller.js +40,Accounting Ledger,Comptabilitat principal
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,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
 DocType: BOM Item,Item Description,Descripció de l'Article
+DocType: Student Sibling,Student Sibling,germà de l&#39;estudiant
 DocType: Purchase Invoice,Is Recurring,És recurrent
 DocType: Purchase Invoice,Supplied Items,Articles subministrats
 DocType: Student,STUD.,Stud.
 DocType: Production Order,Qty To Manufacture,Quantitat a fabricar
+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/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 +131,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 +175,Valuation Rate required for Item in row {0},Valoració dels tipus requerits per l&#39;article a la fila {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,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ó
 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 +87, to ,a
+apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,a
 DocType: Item,Lead Time in days,Termini d&#39;execució en dies
 ,Accounts Payable Summary,Comptes per Pagar Resum
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Not authorized to edit frozen Account {0},No autoritzat per editar el compte bloquejat {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,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 +62,Sales Order {0} is not valid,Vendes Sol·licitar {0} no és vàlid
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Vendes Sol·licitar {0} no és vàlid
 apps/erpnext/erpnext/setup/doctype/company/company.py +185,"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 +152,Small,Petit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,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}
 ,Invoiced Amount (Exculsive Tax),Quantitat facturada (Impost exculsive)
-DocType: Student Applicant,Mother's / Guardian 1 Email ID,de la mare / tutor 1 ID de correu electrònic
 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 +160,Green,Verd
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,Verd
 DocType: Supplier,SUPP-,SUPP-
 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 +57,Contract,Contracte
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,Contracte
 DocType: Email Digest,Add Quote,Afegir Cita
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +498,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 +503,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 +80,Row {0}: Qty is mandatory,Fila {0}: Quantitat és obligatori
+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 +737,Sync Master Data,Sincronització de dades mestres
+apps/erpnext/erpnext/accounts/page/pos/pos.js +719,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
 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
+DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,This is a root item group and cannot be edited.
+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.
 DocType: Journal Entry Account,Purchase Order,Ordre De Compra
 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 +345,"{0}: Employee email not found, hence email not sent","{0}: No s&#39;ha trobat el correu electrònic dels empleats, per tant, no correu electrònic enviat"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +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
 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 +118,"For {0}, only credit accounts can be linked against another debit entry","Per {0}, només els comptes de crèdit es poden vincular amb un altre seient de dèbit"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Delivery Note {0} is not submitted,La Nota de lliurament {0} no està presentada
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Delivery Note {0} is not submitted,La Nota de lliurament {0} no està presentada
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Sub-contracted Item,Article {0} ha de ser un subcontractada article
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Capital Equipments
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Regla preus es selecciona per primera basada en 'Aplicar On' camp, que pot ser d'article, grup d'articles o Marca."
 DocType: Hub Settings,Seller Website,Venedor Lloc Web
 DocType: Item,ITEM-,ARTICLE-
-apps/erpnext/erpnext/controllers/selling_controller.py +147,Total allocated percentage for sales team should be 100,El Percentatge del total assignat per a l'equip de vendes ha de ser de 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +110,Production Order status is {0},Estat de l'ordre de producció és {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,El Percentatge del total assignat per a l'equip de vendes ha de ser de 100
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Estat de l'ordre de producció és {0}
 DocType: Appraisal Goal,Goal,Meta
 DocType: Sales Invoice Item,Edit Description,Descripció
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +757,For Supplier,Per Proveïdor
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +723,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ó
@@ -1217,10 +1233,11 @@
 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
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Enviar Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +445,BOM {0} does not belong to Item {1},BOM {0} no pertany a Punt {1}
 DocType: Sales Partner,Target Distribution,Target Distribution
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1667,Deafault warehouse is required for selected item,Es requereix dipòsit de Deafault element seleccionat
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Deafault warehouse is required for selected item,Es requereix dipòsit de Deafault element seleccionat
 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
@@ -1229,23 +1246,23 @@
 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 +110,Hardware,Maquinari
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,Maquinari
 DocType: Sales Order,Recurring Upto,Fins que es repeteix
 DocType: Attendance,HR Manager,Gerent de Recursos Humans
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Seleccioneu una Empresa
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Privilege Leave,Privilege Leave
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,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 +79,You need to enable Shopping Cart,Has d'habilitar el carro de la compra
 DocType: Payment Entry,Writeoff,Demanar-ho per escrit
 DocType: Appraisal Template Goal,Appraisal Template Goal,Meta Plantilla Appraisal
-DocType: Salary Slip,Earning,Guany
+DocType: Salary Component,Earning,Guany
 DocType: Purchase Invoice,Party Account Currency,Compte Partit moneda
 ,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 +171,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 +174,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_data.py +358,Food,Menjar
+apps/erpnext/erpnext/demo/setup/setup_data.py +301,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/course_schedule/course_schedule.js +103,Mark Attendence,Marc Attendence
@@ -1279,12 +1296,12 @@
 DocType: Sales Order Item,Planned Quantity,Quantitat planificada
 DocType: Purchase Invoice Item,Item Tax Amount,Suma d'impostos d'articles
 DocType: Item,Maintain Stock,Mantenir Stock
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +209,Stock Entries already created for Production Order ,Imatges de entrades ja creades per Ordre de Producció
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,Imatges de entrades ja creades per Ordre de Producció
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,Canvi net en actius fixos
 DocType: Leave Control Panel,Leave blank if considered for all designations,Deixar en blanc si es considera per a totes les designacions
-apps/erpnext/erpnext/controllers/accounts_controller.py +620,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 +238,Max: {0},Max: {0}
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +15,From Datetime,A partir de data i hora
+apps/erpnext/erpnext/controllers/accounts_controller.py +623,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 +239,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 +153,"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ó."
@@ -1292,8 +1309,8 @@
 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 +552,cannot be greater than 100,no pot ser major que 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +680,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 +546,cannot be greater than 100,no pot ser major que 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,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
@@ -1307,10 +1324,9 @@
 DocType: GL Entry,GL Entry,Entrada GL
 DocType: HR Settings,Employee Settings,Configuració dels empleats
 ,Batch-Wise Balance History,Batch-Wise Balance History
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Per fer la llista
 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 +61,Apprentice,Aprenent
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +102,Negative Quantity is not allowed,No s'admenten quantitats negatives
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,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"
@@ -1332,15 +1348,14 @@
 DocType: Asset,Asset Name,Nom d&#39;actius
 DocType: Shipping Rule Condition,To Value,Per Valor
 DocType: Asset Movement,Stock Manager,Gerent
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +141,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 +719,Packing Slip,Llista de presència
+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 +713,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/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,Sol·licitud de pressupost es pot accedir fent clic a següent enllaç
 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 +81,Analyst,Analista
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,Analista
 DocType: Item,Inventory,Inventari
 DocType: Item,Sales Details,Detalls de venda
 DocType: Quality Inspection,QI-,qi
@@ -1348,7 +1363,7 @@
 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 +103,Government,Govern
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,Govern
 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
 DocType: Company,Services,Serveis
@@ -1364,6 +1379,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,Financial Year Start Date,Data d'Inici de l'Exercici fiscal
 DocType: POS Profile,Apply Discount,aplicar descompte
 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ó
 DocType: Program Course,Program Course,curs programa
@@ -1404,12 +1420,12 @@
 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
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +110,Accounting Entry for {0} can only be made in currency: {1},Entrada de Comptabilitat per a {0} només es pot fer en moneda: {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Entrada de Comptabilitat per a {0} només es pot fer en moneda: {1}
 DocType: Pricing Rule,Pricing Rule,Regla preus
 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
 DocType: Shopping Cart Settings,Payment Success URL,Pagament URL Èxit
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +78,Row # {0}: Returned Item {1} does not exists in {2} {3},Fila # {0}: L&#39;article tornat {1} no existeix en {2} {3}
+apps/erpnext/erpnext/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
@@ -1418,40 +1434,39 @@
 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/stock/doctype/stock_entry/stock_entry.py +339,Not allowed to tranfer more {0} than {1} against Purchase Order {2},No es permet Tranfer més {0} de {1} contra l&#39;Ordre de Compra {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +344,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 +545,Manufacturing Quantity is mandatory,Quantitat de fabricació és obligatori
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Quantitat de fabricació és obligatori
 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 +71,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 +162,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/projects/doctype/timesheet/timesheet.py +186,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
 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 +130,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 +137,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
 DocType: Dependent Task,Dependent Task,Tasca dependent
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,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/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 +190,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/hr/doctype/leave_application/leave_application.py +197,Leave of type {0} cannot be longer than {1},Una absència del tipus {0} no pot ser de més de {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Intenta operacions per a la planificació de X dies d&#39;antelació.
 DocType: HR Settings,Stop Birthday Reminders,Aturar recordatoris d'aniversari
 DocType: SMS Center,Receiver List,Llista de receptors
-apps/erpnext/erpnext/accounts/page/pos/pos.js +921,Search Item,cerca article
+apps/erpnext/erpnext/accounts/page/pos/pos.js +910,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 +546,Already completed,ja acabat
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +22,Payment Request already exists {0},Sol·licitud de pagament ja existeix {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +550,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 +241,Quantity must not be more than {0},La quantitat no ha de ser més de {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Quantity must not be more than {0},La quantitat no ha de ser més de {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +76,Previous Financial Year is not closed,Exercici anterior no està tancada
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +44,Age (Days),Edat (dies)
 DocType: Quotation Item,Quotation Item,Cita d'article
@@ -1468,7 +1483,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +221,Purchase Receipt {0} is not submitted,El rebut de compra {0} no està presentat
 DocType: Company,Default Payable Account,Compte per Pagar per defecte
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Ajustaments per a la compra en línia, com les normes d'enviament, llista de preus, etc."
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +83,{0}% Billed,{0}% Anunciat
+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
@@ -1480,12 +1495,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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/schools/doctype/fees/fees.js +22,Collect,recollir
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,recollir
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,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 +225,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
-DocType: Payment Reconciliation,Payments,Pagaments
 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
@@ -1497,7 +1511,7 @@
 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 +9,Procurement,obtenció
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,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/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
 ,Lead Details,Detalls del client potencial
 DocType: Purchase Invoice,End date of current invoice's period,Data de finalització del període de facturació actual
@@ -1522,7 +1536,7 @@
 DocType: Purchase Invoice,Additional Discount,Descompte addicional
 DocType: Selling Settings,Selling Settings,La venda d'Ajustaments
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Subhastes en línia
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +97,Please specify either Quantity or Valuation Rate or both,Si us plau especificar Quantitat o valoració de tipus o ambdós
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,Si us plau especificar Quantitat o valoració de tipus o ambdós
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +13,Fulfillment,Realització
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Empresa, mes i de l'any fiscal és obligatòri"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Despeses de Màrqueting
@@ -1543,14 +1557,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,Configuració ERPNext completa!
 DocType: Item,Weightage,Weightage
 DocType: Packing Slip,PS-,PD-
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +93,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"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/selling/doctype/customer/customer.py +126,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
 DocType: Stock Entry,Material Receipt,Recepció de materials
 DocType: Homepage,Products,Productes
 DocType: Announcement,Instructor,instructor
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},Partit Tipus i Partit es requereix per al compte per cobrar / pagar {0}
 DocType: 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
@@ -1561,7 +1574,7 @@
 ,Item-wise Sales Register,Tema-savi Vendes Registre
 DocType: Asset,Gross Purchase Amount,Compra import brut
 DocType: Asset,Depreciation Method,Mètode de depreciació
-apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Offline,desconnectat
+apps/erpnext/erpnext/accounts/page/pos/pos.js +686,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
@@ -1579,25 +1592,27 @@
 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
 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 +858,Make Purchase Order,Feu l'Ordre de Compra
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +852,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 +141,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 +148,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
 DocType: Stock Reconciliation,Stock Reconciliation,Reconciliació d'Estoc
 DocType: Territory,Territory Name,Nom del Territori
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +172,Work-in-Progress Warehouse is required before Submit,Es requereix Magatzem de treballs en procés abans de Presentar
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,Work-in-Progress Warehouse is required before Submit,Es requereix Magatzem de treballs en procés abans de Presentar
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Sol·licitant d'ocupació.
 DocType: Purchase Order Item,Warehouse and Reference,Magatzem i Referència
 DocType: Supplier,Statutory info and other general information about your Supplier,Informació legal i altra informació general sobre el Proveïdor
-apps/erpnext/erpnext/hooks.py +88,Addresses,Direccions
-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/payment_entry/payment_entry.py +212,Against Journal Entry {0} does not have any unmatched {1} entry,Contra Diari entrada {0} no té cap {1} entrada inigualable
+apps/erpnext/erpnext/hooks.py +95,Addresses,Direccions
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +215,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"
 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)
 DocType: Sales Order,To Deliver and Bill,Per Lliurar i Bill
@@ -1605,11 +1620,10 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,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 +731,Payment,Pagament
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,Payment,Pagament
 DocType: Production Order Operation,Actual Time and Cost,Temps real i Cost
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Per l'article {1} es poden fer un màxim de {0} sol·licituds de materials destinats a l'ordre de venda {2}
 DocType: Employee,Salutation,Salutació
-DocType: Pricing Rule,Brand,Marca comercial
 DocType: Course,Course Abbreviation,Abreviatura de golf
 DocType: Item,Will also apply for variants,També s'aplicarà per a les variants
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +142,"Asset cannot be cancelled, as it is already {0}","Actiu no es pot cancel·lar, com ja ho és {0}"
@@ -1621,7 +1635,7 @@
 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"
 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 +85,Associate,Associat
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,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
@@ -1629,7 +1643,7 @@
 DocType: Production Planning Tool,Material Requests,Les sol·licituds de materials
 DocType: Warranty Claim,Issue Date,Data De Assumpte
 DocType: Activity Cost,Activity Cost,Cost Activitat
-DocType: Timesheet Detail,Timesheet Detail,Detall de part d&#39;hores
+DocType: Sales Invoice Timesheet,Timesheet Detail,Detall de part d&#39;hores
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Quantitat utilitzada
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telecomunicacions
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indica que el paquet és una part d'aquest lliurament (Només Projecte)
@@ -1652,6 +1666,7 @@
 DocType: Production Plan Material Request,Material Request Date,Data de sol·licitud de materials
 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
 DocType: Item,Has Variants,Té variants
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nom de la Distribució Mensual
 DocType: Sales Person,Parent Sales Person,Parent Sales Person
@@ -1664,31 +1679,32 @@
 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 +44,"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/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.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +502,Error: {0} &gt; {1},Error: {0}&gt; {1}
 DocType: Item,Is Sales Item,És article de venda
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Arbre de grups d'article
 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."
 DocType: Naming Series,Current Value,Valor actual
-apps/erpnext/erpnext/controllers/accounts_controller.py +235,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/controllers/accounts_controller.py +238,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
 DocType: Delivery Note Item,Against Sales Order,Contra l'Ordre de Venda
 ,Serial No Status,Estat del número de sèrie
 DocType: Payment Entry Reference,Outstanding,Excepcional
 ,Daily Timesheet Summary,Resum diari d&#39;hores
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +458,Item table can not be blank,Taula d'articles no pot estar en blanc
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +443,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}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +5,This is based on stock movement. See {0} for details,Això es basa en el moviment de valors. Veure {0} per a més detalls
 DocType: Pricing Rule,Selling,Vendes
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +341,Amount {0} {1} deducted against {2},Suma {0} {1} presenta disminuint {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +344,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ó
@@ -1703,8 +1719,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +144,Cannot refer row number greater than or equal to current row number for this Charge type,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 +159,Red,Vermell
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Si us plau, feu clic a ""Generar Planificació 'per reservar números de sèrie per l'article {0}"
+apps/erpnext/erpnext/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ó
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Import base (Companyia de divises)
@@ -1712,7 +1728,7 @@
 DocType: Installation Note,Installation Time,Temps d'instal·lació
 DocType: Sales Invoice,Accounting Details,Detalls de Comptabilitat
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,Eliminar totes les transaccions per aquesta empresa
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +187,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,"Fila # {0}: Operació {1} no s'ha completat per {2} Quantitat de productes acabats en ordre de producció # {3}. Si us plau, actualitzi l'estat de funcionament a través dels registres de temps"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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ó {1} no s'ha completat per {2} Quantitat de productes acabats en ordre de producció # {3}. Si us plau, actualitzi l'estat de funcionament a través dels registres de temps"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,Inversions
 DocType: Issue,Resolution Details,Resolució Detalls
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,les assignacions
@@ -1748,16 +1764,17 @@
 DocType: Bank Reconciliation Detail,Against Account,Contra Compte
 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}
 DocType: Delivery Note,Excise Page Number,Excise Page Number
 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}
 ,Maintenance Schedules,Programes de manteniment
 DocType: Task,Actual End Date (via Time Sheet),Data de finalització real (a través de fulla d&#39;hores)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Amount {0} {1} against {2} {3},Suma {0} {1} {2} contra {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +339,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 +138,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 +295,Debit To account must be a Receivable account,Dèbit al compte ha de ser un compte per cobrar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Receivable account,Dèbit al compte ha de ser un compte per cobrar
 DocType: Shipping Rule Condition,Shipping Amount,Total de l'enviament
 ,Pending Amount,A l'espera de l'Import
 DocType: Purchase Invoice Item,Conversion Factor,Factor de conversió
@@ -1765,10 +1782,10 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +137,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
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +90,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Total de fulls assignades {0} no pot ser inferior a les fulles ja aprovats {1} per al període
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +93,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 +22,Enter Paid Amount,Introduïu suma pagat
+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
@@ -1778,13 +1795,15 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,taula de temps
 DocType: HR Settings,HR Settings,Configuració de recursos humans
 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 +524,"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."
+apps/erpnext/erpnext/controllers/accounts_controller.py +527,"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 +249,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
 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/stock/get_item_details.py +123,Please specify Company,"Si us plau, especifiqui l'empresa"
 ,Customer Acquisition and Loyalty,Captació i Fidelització
@@ -1795,17 +1814,19 @@
 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 +183,Closing (Opening + Totals),Tancament (Obertura + totals)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),Tancament (Obertura + totals)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,"Si us plau, especifiqui la moneda a l'empresa"
 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/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
-apps/erpnext/erpnext/controllers/accounts_controller.py +272,Account {0} is invalid. Account Currency must be {1},Compte {0} no és vàlid. Compte moneda ha de ser {1}
+DocType: Email Digest,Pending Sales Orders,A l&#39;espera d&#39;ordres de venda
+apps/erpnext/erpnext/controllers/accounts_controller.py +275,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 +956,"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 Slip,Deduction,Deducció
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +87,Row {0}: From Time and To Time is mandatory.,Fila {0}: Del temps i el temps és obligatori.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +969,"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 +111,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 +262,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 +7,Please enter Employee Id of this sales person,Introdueixi Empleat Id d&#39;aquest venedor
@@ -1813,7 +1834,7 @@
 DocType: Project,% Tasks Completed,% Tasques Completades
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,Diferència La quantitat ha de ser zero
 DocType: Project,Gross Margin,Marge Brut
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +194,Please enter Production Item first,Si us plau indica primer l'Article a Producció
+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
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Oferta
@@ -1822,53 +1843,54 @@
 DocType: Maintenance Visit,Maintenance User,Usuari de Manteniment
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +149,Cost Updated,Cost Actualitzat
 DocType: Employee,Date of Birth,Data de naixement
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +86,Item {0} has already been returned,Article {0} ja s'ha tornat
+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}
+DocType: Student Admission,Eligibility,elegibilitat
 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 +177,Job Description,Descripció del Treball
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,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 +126,"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 +127,"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ó."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +24,Welcome to POS: Create your POS Profile,Benvingut a POS: Crea Perfil POS
 DocType: Expense Claim,Approver,Aprovador
 ,SO Qty,SO Qty
+DocType: Guardian,Work Address,Direcció del treball
 DocType: Appraisal,Calculate Total Score,Calcular Puntuació total
 DocType: Request for Quotation,Manufacturing Manager,Gerent de Fàbrica
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},El número de sèrie {0} està en garantia fins {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +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 +74,Shipments,Els enviaments
+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
 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 +153,Row # ,Fila #
+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 +156,Get From,Obtenir Des
+apps/erpnext/erpnext/public/js/utils.js +167,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 +167,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 +416,"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"
+apps/erpnext/erpnext/controllers/accounts_controller.py +419,"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
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} is disabled,L'usuari {0} està deshabilitat
 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 ...
 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 +171,"Types of employment (permanent, contract, intern etc.).","Tipus d'ocupació (permanent, contractats, intern etc.)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +346,{0} is mandatory for Item {1},{0} és obligatori per l'article {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,{0} is mandatory for Item {1},{0} és obligatori per l'article {1}
 DocType: Currency Exchange,From Currency,De la divisa
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Seleccioneu suma assignat, Tipus factura i número de factura en almenys una fila"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,Cost de Compra de Nova
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},Ordres de venda requerides per l'article {0}
 DocType: Purchase Invoice Item,Rate (Company Currency),Rate (Companyia moneda)
-apps/erpnext/erpnext/demo/setup_data.py +360,Others,Altres
+DocType: Student Guardian,Others,Altres
 DocType: Payment Entry,Unallocated Amount,Suma sense assignar
 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
@@ -1888,17 +1910,16 @@
 apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,Inventari serialitzat
 DocType: Activity Type,Default Billing Rate,Per defecte Facturació Tarifa
 DocType: Sales Invoice,Total Billing Amount,Suma total de facturació
-apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +54,Receivable Account,Compte per Cobrar
-apps/erpnext/erpnext/controllers/accounts_controller.py +546,Row #{0}: Asset {1} is already {2},Fila # {0}: {1} d&#39;actius ja és {2}
+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 +549,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 +79,CEO,CEO
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,CEO
 DocType: Expense Claim Detail,Expense Claim Detail,Reclamació de detall de despesa
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +808,Please select correct account,Seleccioneu el compte correcte
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +809,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
-DocType: Purchase Invoice Item,Page Break,Salt de pàgina
 DocType: Production Order Operation,Pending,Pendent
 DocType: Course,Course Name,Nom del curs
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Els usuaris que poden aprovar les sol·licituds de llicència d'un empleat específic
@@ -1907,14 +1928,15 @@
 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 +54,Full-time,Temps complet
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,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: Student,Guardians,guardians
 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 +289,Debit To is required,Es requereix dèbit per
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +321,Debit To is required,Es requereix dèbit per
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Llista de preus de Compra
 DocType: Offer Letter Term,Offer Term,Oferta Termini
 DocType: Quality Inspection,Quality Manager,Gerent de Qualitat
@@ -1922,6 +1944,7 @@
 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/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
@@ -1932,18 +1955,17 @@
 DocType: Production Order Operation,Completed Qty,Quantitat completada
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"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 +273,Price List {0} is disabled,La llista de preus {0} està deshabilitada
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +99,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/projects/doctype/timesheet/timesheet.py +123,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
 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}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Valoració actual Taxa
 DocType: Item,Customer Item Codes,Codis dels clients
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,Guany en Canvi / Pèrdua
 DocType: Opportunity,Lost Reason,Raó Perdut
-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/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/purchase_receipt/purchase_receipt.py +378,All items have already been invoiced,S'han facturat tots els articles
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +379,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
@@ -1959,18 +1981,19 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Els teus Clients
 apps/erpnext/erpnext/projects/doctype/project/project.py +141,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/job_opening.html +19,Apply Now,Aplicar ara
+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."
 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
-apps/erpnext/erpnext/utilities/doctype/address/address.py +164,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: Fee Structure,Fee Structure,Estructura de tarifes
 DocType: Timesheet Detail,Costing Amount,Pago Monto
+DocType: Student Admission,Application Fee,Taxa de sol·licitud
 DocType: Process Payroll,Submit Salary Slip,Presentar nòmina
-apps/erpnext/erpnext/controllers/selling_controller.py +161,Maxiumm discount for Item {0} is {1}%,Maxim descompte per article {0} és {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,Maxim descompte per article {0} és {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Importació a granel
 DocType: Sales Partner,Address & Contacts,Direcció i contactes
 DocType: SMS Log,Sender Name,Nom del remitent
@@ -1995,21 +2018,21 @@
 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_data.py +361,Travel,Viatges
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +155,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 +304,Travel,Viatges
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +167,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 +23,Update Cost,Actualització de Costos
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Actualització de Costos
 DocType: Item Reorder,Item Reorder,Punt de reorden
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +36,Show Salary Slip,Slip Mostra Salari
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +748,Transfer Material,Transferir material
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +53,Show Salary Slip,Slip Mostra Salari
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +166,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 +923,Please set recurring after saving,Si us plau conjunt recurrent després de guardar
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +646,Select change amount account,Seleccioneu el canvi import del compte
+apps/erpnext/erpnext/public/js/controllers/transaction.js +914,Please set recurring after saving,Si us plau conjunt recurrent després de guardar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +703,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
@@ -2021,31 +2044,32 @@
 DocType: Quality Inspection,Verified By,Verified Per
 DocType: Address,Subsidiary,Filial
 apps/erpnext/erpnext/setup/doctype/company/company.py +64,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","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: Quality Inspection,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 +33,Traceability,traçabilitat
 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 +352,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Quantitat a la fila {0} ({1}) ha de ser igual que la quantitat fabricada {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Quantitat a la fila {0} ({1}) ha de ser igual que la quantitat fabricada {2}
 DocType: Appraisal,Employee,Empleat
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Convida com usuari
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} està totalment facturat
 DocType: Workstation Working Hour,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 +100,LMS,LMS
+apps/erpnext/erpnext/config/schools.py +104,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/config/crm.py +6,Sales Pipeline,pipeline vendes
 DocType: Student Batch Student,Student Batch Student,Estudiant Estudiant lots
-DocType: Sales Invoice,Mass Mailing,Mass Mailing
+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 +199,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/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 +297,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 +111,Pharmaceutical,Farmacèutic
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +309,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/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
@@ -2060,27 +2084,28 @@
 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 +814,Please specify Company to proceed,"Si us plau, especifiqui l'empresa per a procedir"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +793,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 +44,Compensatory Off,Compensatori
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,Compensatori
 DocType: Quality Inspection Reading,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."
 DocType: Room,Room Number,Número d&#39;habitació
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Invàlid referència {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +161,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) no pot ser major que quanitity planejat ({2}) en l'ordre de la producció {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +162,{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 +217,Raw Materials cannot be blank.,Matèries primeres no poden estar en blanc.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,"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 +460,Quick Journal Entry,Seient Ràpida
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +111,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/accounts/doctype/sales_invoice/sales_invoice.py +441,"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 +450,Quick Journal Entry,Seient Ràpida
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +103,You can not change rate if BOM mentioned agianst any item,No es pot canviar la tarifa si el BOM va cap a un article
 DocType: Employee,Previous Work Experience,Experiència laboral anterior
 DocType: Stock Entry,For Quantity,Per Quantitat
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +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 +214,{0} {1} is not submitted,{0} {1} no es presenta
 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ó
 ,Minutes to First Response for Issues,Minuts fins a la primera resposta per Temes
 DocType: Purchase Invoice,Terms and Conditions1,Termes i Condicions 1
 apps/erpnext/erpnext/public/js/setup_wizard.js +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.
@@ -2089,16 +2114,17 @@
 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 +398,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
 ,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 +739,Item or Warehouse for row {0} does not match Material Request,Article o magatzem per a la fila {0} no coincideix Sol·licitud de materials
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +747,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
 DocType: Fiscal Year,Year End Date,Any Data de finalització
 DocType: Task Depends On,Task Depends On,Tasca Depèn de
-DocType: Lead,Opportunity,Oportunitat
+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
@@ -2111,7 +2137,7 @@
 DocType: Student,Joining Date,Data d&#39;incorporació
 ,Employees working on a holiday,Els empleats que treballen en un dia festiu
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Marc Present
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},Data d'inici de manteniment no pot ser abans de la data de lliurament pel número de sèrie {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},Data d'inici de manteniment no pot ser abans de la data de lliurament pel número de sèrie {0}
 DocType: Production Order,Actual End Date,Data de finalització actual
 DocType: Purchase Invoice,PINV-,PINV-
 DocType: Authorization Rule,Applicable To (Role),Aplicable a (Rol)
@@ -2126,7 +2152,7 @@
 DocType: SMS Log,No of Requested SMS,No de SMS sol·licitada
 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 +729,Please supply the specified items at the best possible rates,Si us plau subministrar els elements especificats en les millors taxes possibles
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +695,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 +117,Contract End Date must be greater than Date of Joining,La Data de finalització del contracte ha de ser major que la data d'inici
 DocType: Delivery Note,DN-,DN
@@ -2135,7 +2161,7 @@
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Introduïu els paràmetres d'URL estàtiques aquí (Ex. Remitent = ERPNext, nom d'usuari = ERPNext, password = 1234 etc.)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} no en qualsevol any fiscal activa. Per a més detalls de verificació {2}.
 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 +14,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/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
 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.
 
@@ -2182,13 +2208,14 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd Quantitat
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +54,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 +103,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 +504,Stock Entry {0} is not submitted,Entrada de la {0} no es presenta
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},No es pot produir més Article {0} que en la quantitat de comandes de client {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +505,Stock Entry {0} is not submitted,Entrada de la {0} no es presenta
 DocType: Payment Reconciliation,Bank / Cash Account,Compte Bancari / Efectiu
 DocType: Tax Rule,Billing City,Facturació Ciutat
 DocType: Salary Component Account,Salary Component Account,Compte Nòmina Component
 DocType: Global Defaults,Hide Currency Symbol,Amaga Símbol de moneda
 apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card","per exemple bancària, Efectiu, Targeta de crèdit"
+DocType: Lead Source,Source Name,font Nom
 DocType: Journal Entry,Credit Note,Nota de Crèdit
 DocType: Warranty Claim,Service Address,Adreça de Servei
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furnitures and Fixtures,Mobles i Accessoris
@@ -2200,6 +2227,7 @@
 DocType: Opportunity,Customer / Lead Name,nom del Client/Client Potencial
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +89,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/controllers/trends.py +19,Total(Qty),Total (Quantitat)
 DocType: Sales Invoice,This Document,aquest document
@@ -2211,15 +2239,15 @@
 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 +176,Organization branch master.,Organization branch master.
-apps/erpnext/erpnext/controllers/accounts_controller.py +273, or ,o
+apps/erpnext/erpnext/controllers/accounts_controller.py +276, 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
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,Despeses de serveis públics
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,Per sobre de 90-
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +203,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Fila # {0}: Seient {1} no té en compte {2} o ja compara amb un altre bo
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +206,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 +90,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 +93,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
@@ -2247,8 +2275,8 @@
 DocType: Product Bundle,Parent Item,Article Pare
 DocType: Account,Account Type,Tipus de compte
 DocType: Delivery Note,DN-RET-,DN-RET-
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +115,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 +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"El programa de manteniment no es genera per a tots els articles Si us plau, feu clic a ""Generar Planificació"""
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +118,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 +163,"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"
@@ -2260,13 +2288,13 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +32,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 +748,Delivery,Lliurament
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +742,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
 DocType: Payment Entry,Total Allocated Amount,total assignat
 DocType: Item Reorder,Material Request Type,Material de Sol·licitud Tipus
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +82,Row {0}: UOM Conversion Factor is mandatory,Fila {0}: UOM factor de conversió és obligatori
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Comprovant #
@@ -2277,13 +2305,13 @@
 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 +90,Head of Marketing and Sales,Director de Màrqueting i Vendes
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Impost sobre els guanys
+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 +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.
 DocType: Item Supplier,Item Supplier,Article Proveïdor
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +403,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 +770,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 +397,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 +764,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"
@@ -2295,28 +2323,29 @@
 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 +100,Issues,Qüestions
+apps/erpnext/erpnext/hooks.py +109,Issues,Qüestions
 apps/erpnext/erpnext/controllers/status_updater.py +13,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ó
 ,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
 DocType: Supplier,Billing Currency,Facturació moneda
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Large,Extra gran
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Extra Large,Extra gran
 ,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 +507,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 +107,Local,Local
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +508,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/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 +154,Large,Gran
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Large,Gran
 DocType: Homepage Featured Product,Homepage Featured Product,Pàgina d&#39;inici Producte destacat
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Magatzem nou nom
-apps/erpnext/erpnext/accounts/report/financial_statements.py +225,Total {0} ({1}),Total {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +224,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
@@ -2374,9 +2403,9 @@
 DocType: Attendance,Leave Type,Tipus de llicència
 apps/erpnext/erpnext/controllers/stock_controller.py +173,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/hr/doctype/salary_slip/salary_slip.py +79,Name error: {0},Nom d&#39;error: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +90,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 +178,{0} {1} does not associated with {2} {3},{0} {1} no associada a {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +181,{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ó)
 DocType: Warehouse,Parent Warehouse,Magatzem dels pares
@@ -2395,7 +2424,7 @@
 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
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,Almenys un element ha de introduir-se amb quantitat negativa en el document de devolució
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Atleast one item should be entered with negative quantity in return document,Almenys un element ha de introduir-se amb quantitat negativa en el document de devolució
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operació {0} ja que qualsevol temps de treball disponibles a l&#39;estació de treball {1}, trencar l&#39;operació en múltiples operacions"
 ,Requested,Comanda
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +83,No Remarks,Sense Observacions
@@ -2407,46 +2436,46 @@
 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/stock/doctype/purchase_receipt/purchase_receipt.py +98,Quality Inspection required for Item {0},Inspecció de qualitat requerida per a l'article {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,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
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Administrar Territori arbre.
 DocType: Journal Entry Account,Sales Invoice,Factura de vendes
 DocType: Journal Entry Account,Party Balance,Equilibri Partit
-apps/erpnext/erpnext/accounts/page/pos/pos.js +475,Please select Apply Discount On,Seleccioneu Aplicar descompte en les
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +92,Salary Slip Created,Nòmina de creació
+apps/erpnext/erpnext/accounts/page/pos/pos.js +464,Please select Apply Discount On,Seleccioneu Aplicar descompte en les
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +95,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ó
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,El percentatge de descompte es pot aplicar ja sigui contra una llista de preus o per a tot Llista de Preus.
 DocType: Purchase Invoice,Half-yearly,Semestral
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +384,Accounting Entry for Stock,Entrada Comptabilitat de Stock
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +387,Accounting Entry for Stock,Entrada Comptabilitat de Stock
 DocType: Sales Invoice,Sales Team1,Equip de Vendes 1
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,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 +96,Row {0}: Completed Qty must be greater than zero.,Fila {0}: Complet Quantitat ha de ser més gran que zero.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +120,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 +88,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/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
 DocType: Item Group,Show this slideshow at the top of the page,Mostra aquesta presentació de diapositives a la part superior de la pàgina
 DocType: BOM,Item UOM,Article UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Suma d&#39;impostos Després Quantitat de Descompte (Companyia moneda)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +147,Target warehouse is mandatory for row {0},Magatzem destí obligatori per a la fila {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +141,Target warehouse is mandatory for row {0},Magatzem destí obligatori per a la fila {0}
 DocType: Cheque Print Template,Primary Settings,ajustos primaris
 DocType: Purchase Invoice,Select Supplier Address,Seleccionar adreça del proveïdor
 DocType: Quality Inspection,Quality Inspection,Inspecció de Qualitat
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Extra Small,Extra Petit
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +194,Account {0} is frozen,El compte {0} està bloquejat
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Extra Petit
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +690,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 +197,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 +606,Can only make payment against unbilled {0},Només es pot fer el pagament contra facturats {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +126,Commission rate cannot be greater than 100,La Comissió no pot ser major que 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +609,Can only make payment against unbilled {0},Només es pot fer el pagament contra facturats {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,La Comissió no pot ser major que 100
 DocType: Stock Entry,Subcontract,Subcontracte
 apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,"Si us plau, introdueixi {0} primer"
 DocType: Production Order Operation,Actual End Time,Actual Hora de finalització
@@ -2457,30 +2486,30 @@
 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 +158,Colour,Color
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,Color
 DocType: Maintenance Visit,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"
 DocType: Student Log,Academic,acadèmic
-apps/erpnext/erpnext/controllers/accounts_controller.py +469,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),avanç total ({0}) contra l&#39;Ordre {1} no pot ser major que el total general ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +472,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),avanç total ({0}) contra l&#39;Ordre {1} no pot ser major que el total general ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Seleccioneu Distribució Mensual de distribuir de manera desigual a través d'objectius mesos.
 DocType: Purchase Invoice Item,Valuation Rate,Tarifa de Valoració
+DocType: Stock Reconciliation,SR/,SR /
 apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,No s'ha escollit una divisa per la llista de preus
 DocType: Assessment,Results,Resultats
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +168,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 +175,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: Student Applicant,Father's/ Guardian 2 Email ID,del pare / tutor 2 ID de correu electrònic
 DocType: Maintenance Visit Purpose,Against Document No,Contra el document n
 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 +228,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 +231,Warehouses with existing transaction can not be converted to group.,Complexos de transacció existents no poden ser convertits en grup.
 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 +93,Researcher,Investigador
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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.
@@ -2492,25 +2521,25 @@
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Per comoditat dels clients, aquests codis es poden utilitzar en formats d'impressió, com factures i albarans"
 DocType: Sales Invoice,Time Sheet List,Llista de fulls de temps
 DocType: Employee,You can enter any date manually,Podeu introduir qualsevol data manualment
-DocType: Sales Invoice,Advertisement,Anunci
 DocType: Asset Category Account,Depreciation Expense Account,Compte de despeses de depreciació
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Probationary Period,Període De Prova
-apps/erpnext/erpnext/hooks.py +102,Announcements,anuncis
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Període De Prova
+apps/erpnext/erpnext/hooks.py +111,Announcements,anuncis
 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 +109,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 +16,To Datetime,To Datetime
+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/scheduling_tool/scheduling_tool.py +51,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/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Activitats pendents
+DocType: Accounts Settings,Make Payment via Journal Entry,Fa el pagament via entrada de diari
+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 +127,Please enter relieving date.,Please enter relieving date.
-apps/erpnext/erpnext/controllers/trends.py +145,Amt,Amt
+apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,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 +26,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
@@ -2528,14 +2557,15 @@
 apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1},No es pot trobar el tipus de canvi per a {0} a {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Medi Dia Marcos
 DocType: Sales Invoice,Sales Team,Equip de vendes
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Duplicate entry,Entrada duplicada
+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 +490,[Error],[Error]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +484,[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
 apps/erpnext/erpnext/controllers/status_updater.py +175,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."
 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
@@ -2551,22 +2581,22 @@
 ,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 +25,All Jobs,tots els treballs
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,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
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Amount {0} {1} {2} {3},Suma {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Amount {0} {1} {2} {3},Suma {0} {1} {2} {3}
 DocType: Account,Depreciation,Depreciació
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Proveïdor (s)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Empleat Eina Assistència
 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 +372,Payment Entries {0} are un-linked,Les entrades de pagament {0} són no-relacionat
+apps/erpnext/erpnext/accounts/utils.py +449,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
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +497,Material Requests {0} created,Sol·licituds de material {0} creats
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +498,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.
 DocType: Purchase Invoice,Address and Contact,Direcció i Contacte
@@ -2605,7 +2635,7 @@
 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 +848,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 +859,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 +233,Closing (Dr),Tancament (Dr)
 DocType: Cheque Print Template,Cheque Size,xec Mida
@@ -2626,7 +2656,8 @@
 ,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.
-apps/erpnext/erpnext/controllers/accounts_controller.py +555,'Update Stock' cannot be checked for fixed asset sale,&quot;Actualització de la &#39;no es pot comprovar en venda d&#39;actius fixos
+DocType: Student Guardian,Father,pare
+apps/erpnext/erpnext/controllers/accounts_controller.py +558,'Update Stock' cannot be checked for fixed asset sale,&quot;Actualització de la &#39;no es pot comprovar en venda d&#39;actius fixos
 DocType: Bank Reconciliation,Bank Reconciliation,Conciliació bancària
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Obtenir actualitzacions
 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
@@ -2636,15 +2667,15 @@
 DocType: Sales Order,Fully Delivered,Totalment Lliurat
 DocType: Lead,Lower Income,Lower Income
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","El compte capçalera amb responsabilitat, en el que es farà l'assentament de Guany / Pèrdua"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +166,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 +238,"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 +81,Purchase Order number required for Item {0},Número d'ordre de Compra per {0}
+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/purchase_receipt/purchase_receipt.py +82,Purchase Order number required for Item {0},Número d'ordre de Compra per {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Des de la data' ha de ser després de 'A data'
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +17,Cannot change status as student {0} is linked with student application {1},No es pot canviar l&#39;estat d&#39;estudiant {0} està vinculada amb l&#39;aplicació de l&#39;estudiant {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +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: Timesheet,"List of employee which has ""Salary Slip Based on Timesheet"" is enabled in salary structure.",Llista d&#39;empleats que té &quot;nòmina Basat en part d&#39;hores&quot; hi ha suport per l&#39;estructura salarial.
 DocType: Asset,Fully Depreciated,Estant totalment amortitzats
 ,Stock Projected Qty,Quantitat d'estoc previst
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Customer {0} does not belong to project {1},Client {0} no pertany a projectar {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,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
 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
@@ -2656,7 +2687,7 @@
 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/patches/v7_0/create_warehouse_nestedset.py +55,All Warehouses,tots els cellers
+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 +105,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
@@ -2668,10 +2699,10 @@
 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/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Feu nòmina
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +26,Browse BOM,Navegar per llista de materials
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,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/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 Year,Academic Year,Any escolar
+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
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,Avaluació
@@ -2679,12 +2710,12 @@
 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 +197,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 +204,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: Workstation Working Hour,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 +256,Select Quantity,Seleccioneu Quantitat
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +257,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
@@ -2701,6 +2732,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Tan quantitat destí com Quantitat són obligatoris.
 apps/erpnext/erpnext/config/projects.py +45,Cost of various activities,Cost de diverses activitats
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Configura els esdeveniments a {0}, ja que l&#39;empleat que estigui connectat a la continuació venedors no té un ID d&#39;usuari {1}"
+DocType: Timesheet,Billing Details,Detalls de facturació
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +149,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}
 DocType: Item,Inspection Required,Inspecció requerida
@@ -2720,7 +2752,7 @@
 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 +138,Wire Transfer,Transferència Bancària
+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,Marqueu totes les
 DocType: Sales Order,Recurring Order,Ordre Recurrent
 DocType: Company,Default Income Account,Compte d'Ingressos predeterminat
@@ -2732,21 +2764,19 @@
 ,Welcome to ERPNext,Benvingut a ERPNext
 apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,El plom a la Petició
 DocType: Lead,From Customer,De Client
-apps/erpnext/erpnext/demo/setup_data.py +357,Calls,Trucades
+apps/erpnext/erpnext/demo/setup/setup_data.py +300,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/stock/doctype/item/item.py +466,"As there are existing transactions for this item, \
-							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Com que hi ha transaccions existents per aquest concepte, \ no pot canviar els valors de &#39;no té de sèrie&#39;, &#39;té Nº de lot &quot;,&quot; És de Punt &quot;i&quot; Mètode de valoració&#39;"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,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/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 +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota: El sistema no verificarà el lliurament excessiva i l'excés de reserves per Punt {0} com la quantitat o la quantitat és 0
 DocType: Notification Control,Quotation Message,Cita Missatge
 DocType: Issue,Opening Date,Data d'obertura
-apps/erpnext/erpnext/schools/api.py +58,Attendance has been marked successfully.,L&#39;assistència ha estat marcada amb èxit.
+apps/erpnext/erpnext/schools/api.py +57,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 +136,Account Type for {0} must be {1},Tipus de compte per {0} ha de ser {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +139,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
@@ -2761,12 +2791,13 @@
 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/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 +20,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 +1190,Please select customer,Seleccioneu al client
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1193,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
@@ -2776,6 +2807,7 @@
 ,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 +50,Missing Currency Exchange Rates for {0},Manca de canvi de moneda per {0}
 DocType: Assessment,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
@@ -2793,11 +2825,12 @@
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Nom del tema
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Has de marcar compra o venda
+DocType: Grading Structure,Grade Intervals,intervals de grau
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Seleccioneu la naturalesa del seu negoci.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,On es realitzen les operacions de fabricació.
 DocType: Asset Movement,Source Warehouse,Magatzem d'origen
 DocType: Installation Note,Installation Date,Data d'instal·lació
-apps/erpnext/erpnext/controllers/accounts_controller.py +534,Row #{0}: Asset {1} does not belong to company {2},Fila # {0}: {1} Actius no pertany a l&#39;empresa {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +537,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
@@ -2811,28 +2844,31 @@
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Quantitat de lots disponibles a De Magatzem
 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,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 +111,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/scheduling_tool/scheduling_tool.py +49,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 +87,{0}% Delivered,{0}% Lliurat
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% Lliurat
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Article {0}: Quantitat ordenada {1} no pot ser menor que el qty comanda mínima {2} (definit en l&#39;article).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Mensual Distribució percentual
 DocType: Territory,Territory Targets,Objectius Territori
 DocType: Delivery Note,Transporter Info,Informació del transportista
-apps/erpnext/erpnext/accounts/utils.py +379,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 +456,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
 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ó.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Títols per a plantilles d'impressió, per exemple, factura proforma."
+DocType: Student Guardian,Student Guardian,Guardià de l&#39;estudiant
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +184,Valuation type charges can not marked as Inclusive,Càrrecs de tipus de valoració no poden marcat com Inclòs
 DocType: POS Profile,Update Stock,Actualització de Stock
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UDMs diferents per als articles provocarà pesos nets (Total) erronis. Assegureu-vos que pes net de cada article és de la mateixa UDM.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
 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 +349,Journal Entries {0} are un-linked,Entrades de diari {0} són no enllaçat
+apps/erpnext/erpnext/accounts/utils.py +426,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"
@@ -2856,6 +2892,7 @@
 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
+DocType: Homepage,"URL for ""All Products""",URL de &quot;Tots els productes&quot;
 DocType: Leave Application,Leave Balance Before Application,Leave Balance Before Application
 DocType: SMS Center,Send SMS,Enviar SMS
 DocType: Cheque Print Template,Width of amount in word,Amplada de l&#39;import de paraula
@@ -2864,7 +2901,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 +29,Current Job Openings,Ofertes d&#39;ocupació actuals
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,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
@@ -2877,7 +2914,7 @@
 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}] (# Formulari / article / {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 +850,Show tax break-up,Mostrar impostos ruptura
+apps/erpnext/erpnext/public/js/controllers/transaction.js +841,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/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"
@@ -2887,10 +2924,11 @@
 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 +534,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 +80,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 +162,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/selling/doctype/customer/customer.py +195,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 +5,This is based on the attendance of this Student,Això es basa en la presència d&#39;aquest Estudiant
@@ -2899,12 +2937,11 @@
 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 +75,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 +138,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/hr/doctype/leave_application/leave_application.py +145,Note: There is not enough leave balance for Leave Type {0},Note: There is not enough leave balance for Leave Type {0}
 DocType: Program Enrollment Fee,Program Enrollment Fee,Programa de quota d&#39;inscripció
 DocType: Item,Supplier Items,Articles Proveïdor
 DocType: Opportunity,Opportunity Type,Tipus d'Oportunitats
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,Nova Empresa
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,Cost Center is required for 'Profit and Loss' account {0},"Es requereix de centres de cost per a 'Pèrdues i Guanys ""compta {0}"
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Les transaccions només poden ser esborrats pel creador de la Companyia
 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 incorrecte d'entrades del llibre major. És possible que hi hagi seleccionat un compte erroni en la transacció.
 DocType: Cheque Print Template,Cheque Width,ample Xec
@@ -2913,16 +2950,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,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/manufacturing/doctype/production_order/production_order.js +128,Timesheet,Horari
-apps/erpnext/erpnext/controllers/accounts_controller.py +228,{0} '{1}' is disabled,{0} '{1}' es desactiva
+apps/erpnext/erpnext/controllers/accounts_controller.py +231,{0} '{1}' is disabled,{0} '{1}' es desactiva
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Posar com a obert
 DocType: Cheque Print Template,Scanned Cheque,escanejada Xec
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Enviar correus electrònics automàtics als Contactes al Presentar les transaccions
+DocType: Timesheet,Total Billable Amount,Suma total facturable
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Article 3
 DocType: Purchase Order,Customer Contact Email,Client de correu electrònic de contacte
 DocType: Warranty Claim,Item and Warranty Details,Objecte i de garantia Detalls
 DocType: Sales Team,Contribution (%),Contribució (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Nota: L'entrada de pagament no es crearà perquè no s'ha especificat 'Caixa o compte bancari"""
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Responsibilities,Responsabilitats
+apps/erpnext/erpnext/controllers/accounts_controller.py +78,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
 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
@@ -2930,6 +2968,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Afegir usuaris
 DocType: Pricing Rule,Item Group,Grup d'articles
 DocType: Item,Safety Stock,seguretat de la
+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: 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)
@@ -2939,7 +2978,6 @@
 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: Timesheet,Total Hours,Total d'hores
 DocType: Journal Entry,Printing Settings,Paràmetres d&#39;impressió
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,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
@@ -2952,14 +2990,15 @@
 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 +71,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
+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: Purchase Invoice Item,Rate,Tarifa
 DocType: Purchase Invoice Item,Rate,Tarifa
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Intern,Intern
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,Intern
 DocType: Stock Entry,From BOM,A partir de la llista de materials
 DocType: Assessment,Assessment Code,codi avaluació
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +32,Basic,Bàsic
+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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Si us plau, feu clic a ""Generar Planificació"""
+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 +95,Reference No is mandatory if you entered Reference Date,Reference No és obligatori si introduir Data de Referència
@@ -2968,11 +3007,11 @@
 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 +752,Issue Material,Material Issue
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +723,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 +683,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 +665,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.
 DocType: Hub Settings,Access Token,Token d'accés
 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
@@ -2980,33 +3019,35 @@
 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 +1122,Enter value must be positive,Introduir el valor ha de ser positiu
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,All Territories,Tots els territoris
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1125,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
 DocType: Purchase Invoice,Items,Articles
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +23,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 +221,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 +233,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 +96,Request for Quotations,Sol·licitud de Cites
+apps/erpnext/erpnext/hooks.py +104,Request for Quotations,Sol·licitud de Cites
 DocType: Payment Reconciliation,Maximum Invoice Amount,Import Màxim Factura
 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 +628,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unitat de mesura per defecte per Variant &#39;{0}&#39; ha de ser el mateix que a la plantilla &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unitat de mesura per defecte per Variant &#39;{0}&#39; ha de ser el mateix que a la plantilla &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Calcula a causa del
 DocType: Delivery Note Item,From Warehouse,De Magatzem
 DocType: Assessment,Supervisor Name,Nom del supervisor
+DocType: Assessment,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
 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 +27,Default Address Template cannot be deleted,La Plantilla de la direcció predeterminada no es pot eliminar
+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
 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
@@ -3021,8 +3062,8 @@
 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/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 +485,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 +336,Please select Posting Date first,Seleccioneu Data de comptabilització primer
+apps/erpnext/erpnext/stock/get_item_details.py +486,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 +326,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
@@ -3038,6 +3079,7 @@
 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
 DocType: Authorization Rule,Applicable To (Designation),Aplicable a (Designació)
+,Profitability Analysis,Compte de resultats
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,Afegir a la cistella
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Agrupar per
 DocType: Guardian,Interests,interessos
@@ -3050,22 +3092,22 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,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 +141,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Serialitzat article {0} no es pot actualitzar utilitzant \
  Stock Reconciliació"
 DocType: Scheduling Tool,Day,dia
 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 +122,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 +129,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
-DocType: Student Applicant,AP.,AP.
 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 +639,Point of Sale,Punt de Venda
+apps/erpnext/erpnext/accounts/page/pos/pos.js +634,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
 DocType: Production Planning Tool,Production Planning Tool,Eina de Planificació de la producció
@@ -3074,74 +3116,77 @@
 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 +373,Quantity to Manufacture must be greater than 0.,Quantitat de Fabricació ha de ser major que 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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 Profile,Customer Group,Grup de Clients
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,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/doctype/asset/asset.py +83,Next Depreciation Date must be on or after today,La depreciació propera data ha de ser a partir del dia d&#39;avui
 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 +145,Please cancel Purchase Invoice {0} first,"Si us plau, cancel·lar Factura de Compra {0} primera"
 DocType: Serial No,AMC Expiry Date,AMC Data de caducitat
 ,Sales Register,Registre de vendes
 DocType: Quotation,Quotation Lost Reason,Cita Perduda Raó
+apps/erpnext/erpnext/utilities/doctype/address/address.py +164,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ó."
 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 +330,Transaction reference no {0} dated {1},Referència de la transacció no {0} {1} datat
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,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 +107,Summary for this month and pending activities,Resum per a aquest mes i activitats pendents
+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/accounts/doctype/sales_invoice/sales_invoice.py +406,Please remove this Invoice {0} from C-Form {1},"Si us plau, elimini aquest Factura {0} de C-Form {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,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 +644,Get Items,Obtenir elements
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +623,Get Items,Obtenir elements
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +210,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 +41,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
 DocType: Payment Request,Initiated,Iniciada
 DocType: Production Order,Planned Start Date,Data d'inici prevista
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,Customer is required against Receivable account {0},Es requereix al client contra el compte per cobrar {0}
 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 +265,Project-wise data is not available for Quotation,Dades-Project savi no està disponible per a la cita
+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 +101,Commercial,Comercial
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,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: Supplier Quotation,Supplier Address,Adreça del Proveïdor
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +648,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/accounts/doctype/purchase_invoice/purchase_invoice.py +651,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 +30,Series is mandatory,Sèries és obligatori
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +50,Series is mandatory,Sèries és obligatori
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Serveis Financers
 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
 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}
 DocType: Leave Allocation,Unused leaves,Fulles no utilitzades
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Cr,Cr
 DocType: Tax Rule,Billing State,Estat de facturació
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +250,Transfer,Transferència
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +187,{0} {1} does not associated with Party Account {2},{0} {1} no associada al compte del partit {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,Fetch exploded BOM (including sub-assemblies),Fetch exploded BOM (including sub-assemblies)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +254,Transfer,Transferència
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +190,{0} {1} does not associated with Party Account {2},{0} {1} no associada al compte del partit {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +796,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 +115,Due Date is mandatory,Data de venciment és obligatori
+apps/erpnext/erpnext/controllers/accounts_controller.py +118,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
 DocType: Journal Entry,Pay To / Recd From,Pagar a/Rebut de
 DocType: Naming Series,Setup Series,Sèrie d'instal·lació
 DocType: Payment Reconciliation,To Invoice Date,Per Factura
 DocType: Supplier,Contact HTML,Contacte HTML
 ,Inactive Customers,Els clients inactius
+DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Rebut de compra
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Com s'aplica la regla de preus?
 DocType: Quality Inspection,Delivery Note No,Número d'albarà de lliurament
@@ -3150,7 +3195,7 @@
 DocType: Company,Retail,Venda al detall
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +120,Customer {0} does not exist,El client {0} no existeix
 DocType: Attendance,Absent,Absent
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +587,Product Bundle,Bundle Producte
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Product Bundle,Bundle Producte
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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
@@ -3160,8 +3205,8 @@
 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 +742,Send Supplier Emails,Enviar missatges de correu electrònic del proveïdor
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +104,"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/buying/doctype/request_for_quotation/request_for_quotation.js +708,Send Supplier Emails,Enviar missatges de correu electrònic del proveïdor
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,"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
 DocType: Guardian Interest,Guardian Interest,guardià interès
 DocType: Timesheet,Employee Detail,Detall dels empleats
@@ -3172,9 +3217,9 @@
 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}
 DocType: Salary Slip,Earning & Deduction,Guanyar i Deducció
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +77,Account {0} cannot be a Group,El Compte {0} no pot ser un grup
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} cannot be a Group,El Compte {0} no pot ser un grup
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +31,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 +107,Negative Valuation Rate is not allowed,No es permeten els ràtios de valoració negatius
+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
 DocType: Holiday List,Weekly Off,Setmanal Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Per exemple, 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +39,Provisional Profit / Loss (Credit),Compte de guanys / pèrdues provisional (Crèdit)
@@ -3188,16 +3233,16 @@
 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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Centre de Cost és obligatori per l'article {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +626,Get Items from Product Bundle,Obtenir elements del paquet del producte
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +605,Get Items from Product Bundle,Obtenir elements del paquet del producte
 DocType: Asset,Straight Line,Línia recta
 DocType: Project User,Project User,usuari projecte
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} is inactive,Compte {0} està inactiu
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} is inactive,Compte {0} està inactiu
 DocType: GL Entry,Is Advance,És Avanç
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Assistència Des de la data i Assistència a la data és obligatori
 apps/erpnext/erpnext/controllers/buying_controller.py +148,Please enter 'Is Subcontracted' as Yes or No,"Si us plau, introdueixi 'subcontractació' com Sí o No"
 DocType: Sales Team,Contact No.,Número de Contacte
 DocType: Bank Reconciliation,Payment Entries,Les entrades de pagament
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,'Profit and Loss' type account {0} not allowed in Opening Entry,"""Pèrdues i Guanys"" tipus de compte {0} no es permet l'entrada amb obertura"
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +71,'Profit and Loss' type account {0} not allowed in Opening Entry,"""Pèrdues i Guanys"" tipus de compte {0} no es permet l'entrada amb obertura"
 DocType: 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
@@ -3216,7 +3261,7 @@
 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,Comissió de Vendes
 DocType: Offer Letter Term,Value / Description,Valor / Descripció
-apps/erpnext/erpnext/controllers/accounts_controller.py +558,"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}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +561,"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: Production Order,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}.
@@ -3229,13 +3274,13 @@
 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/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Legal Expenses,Despeses legals
 DocType: Purchase Invoice,Posting Time,Temps d'enviament
-DocType: Sales Order,% Amount Billed,% Import Facturat
+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.
 apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},No Element amb Serial No {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Obrir Notificacions
+DocType: Email Digest,Open Notifications,Obrir Notificacions
 DocType: Payment Entry,Difference Amount (Company Currency),Diferència Suma (Companyia de divises)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,Despeses directes
 apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
@@ -3243,7 +3288,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Nous ingressos al Client
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,Despeses de viatge
 DocType: Maintenance Visit,Breakdown,Breakdown
-apps/erpnext/erpnext/controllers/accounts_controller.py +634,Account: {0} with currency: {1} can not be selected,Compte: {0} amb la divisa: {1} no es pot seleccionar
+apps/erpnext/erpnext/controllers/accounts_controller.py +637,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}
 DocType: Program Enrollment Tool,Student Applicants,Els sol·licitants dels estudiants
@@ -3251,15 +3296,15 @@
 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 +56,Probation,Probation
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Probation,Probation
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,components de sous
 DocType: Program Enrollment Tool,New Academic Year,Nou Any Acadèmic
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Payment of salary for the month {0} and year {1},El pagament del salari corresponent al mes {0} i {1} anys
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Payment of salary for the month {0} and year {1},El pagament del salari corresponent al mes {0} i {1} anys
 DocType: Stock Settings,Auto insert Price List rate if missing,Acte inserit taxa Llista de Preus si falta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Suma total de pagament
 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 +144,Planning,Planificació
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,Planificació
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,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
@@ -3272,11 +3317,10 @@
 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.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Sales invoice submitted sucessfully.,factura de venda presentat amb èxit.
 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}"
 DocType: Assessment Result,Student Name,Nom de l&#39;estudiant
-apps/erpnext/erpnext/hooks.py +104,Assessment Schedule,horari avaluació
+apps/erpnext/erpnext/hooks.py +113,Assessment Schedule,horari avaluació
 DocType: Brand,Item Manager,Administració d&#39;elements
 DocType: Buying Settings,Default Supplier Type,Tipus predeterminat de Proveïdor
 DocType: Production Order,Total Operating Cost,Cost total de funcionament
@@ -3286,6 +3330,7 @@
 DocType: GL Entry,Party Type,Tipus Partit
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +78,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
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Salary template master.
 DocType: Leave Type,Max Days Leave Allowed,Màxim de dies d'absència permesos
@@ -3297,18 +3342,19 @@
 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 +99,All Customer Groups,Tots els Grups de clients
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +78,Accumulated Monthly,acumulat Mensual
-apps/erpnext/erpnext/controllers/accounts_controller.py +595,{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/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Tots els Grups de clients
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +81,Accumulated Monthly,acumulat Mensual
+apps/erpnext/erpnext/controllers/accounts_controller.py +598,{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
 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
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +188,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
 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 +84,Secretary,Secretari
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,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
@@ -3317,24 +3363,22 @@
 ,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ó
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,Fila # {0}: Nombre de sèrie és obligatori
+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 +859,Supplier Quotation,Cita Proveïdor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +838,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 +7,Collect Fees,cobrar tarifes
+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}
 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.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Pròxims esdeveniments
 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/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} és obligatori per a la Tornada
 DocType: Purchase Order,To Receive,Rebre
 apps/erpnext/erpnext/public/js/setup_wizard.js +195,user@example.com,user@example.com
-DocType: Email Digest,Income / Expense,Ingressos / despeses
 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."
@@ -3346,13 +3390,14 @@
 DocType: Customer,From Lead,De client potencial
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Comandes llançades per a la producció.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Seleccioneu l'Any Fiscal ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,POS Profile required to make POS Entry,POS perfil requerit per fer l&#39;entrada POS
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +509,POS Profile required to make POS Entry,POS perfil requerit per fer l&#39;entrada POS
 DocType: Program Enrollment Tool,Enroll Students,inscriure els estudiants
 DocType: Hub Settings,Name Token,Nom Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard Selling
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Atleast one warehouse is mandatory,Almenys un magatzem és obligatori
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +129,Atleast one warehouse is mandatory,Almenys un magatzem és obligatori
 DocType: Serial No,Out of Warranty,Fora de la Garantia
 DocType: BOM Replace Tool,Replace,Reemplaçar
+DocType: Production Order,Unstopped,destapats
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{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
@@ -3373,10 +3418,11 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Les fulles han de ser assignats en múltiples de 0,5"
 DocType: Production Order,Operation Cost,Cost d'operació
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,Puja l'assistència d'un arxiu .csv
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Excel·lent Amt
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Establir Grup d'articles per aquest venedor.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Congela els estocs més vells de [dies]
-apps/erpnext/erpnext/controllers/accounts_controller.py +528,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Fila # {0}: l&#39;element és obligatori per als actius fixos de compra / venda
+apps/erpnext/erpnext/controllers/accounts_controller.py +531,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Fila # {0}: l&#39;element és obligatori per als actius fixos de compra / venda
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Si dos o més regles de preus es troben basats en les condicions anteriors, s'aplica Prioritat. La prioritat és un nombre entre 0 a 20 mentre que el valor per defecte és zero (en blanc). Un nombre més alt significa que va a prevaler si hi ha diverses regles de preus amb mateixes condicions."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Any fiscal: {0} no existeix
 DocType: Currency Exchange,To Currency,Per moneda
@@ -3393,15 +3439,15 @@
 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
-DocType: Sales Invoice,Exhibition,Exposició
 apps/erpnext/erpnext/utilities/doctype/address/address.py +77,"Company is mandatory, as it is your company address","Company és obligatòria, ja que és la direcció de l&#39;empresa"
 DocType: Item Attribute,From Range,De Gamma
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +81,Syntax error in formula or condition: {0},Error de sintaxi en la fórmula o condició: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +92,Syntax error in formula or condition: {0},Error de sintaxi en la fórmula o condició: {0}
 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
+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 +28,Jobs,ocupacions
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,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ó
@@ -3410,16 +3456,16 @@
 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 +763,Make Supplier Quotation,Fer Oferta de Proveïdor
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,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/controllers/sales_and_purchase_return.py +100,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 +42,Casual Leave,Deixar Casual
+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
 DocType: Batch,Batch ID,Identificació de lots
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,Note: {0},Nota: {0}
 ,Delivery Note Trends,Nota de lliurament Trends
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +103,This Week's Summary,Resum de la setmana
+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
 DocType: Student Group Creation Tool,Get Courses,obtenir Cursos
 DocType: GL Entry,Party,Party
@@ -3429,7 +3475,7 @@
 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 +59,Piecework,Treball a preu fet
+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: Task,Actual Time (in Hours),Temps real (en hores)
 DocType: Employee,History In Company,Història a la Companyia
@@ -3446,7 +3492,7 @@
 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ó.
 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 +162,Black,Negre
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,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
@@ -3457,13 +3503,13 @@
 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 +69,Customer Id,ID del client
+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
 DocType: Journal Entry Account,Exchange Rate,Tipus De Canvi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Sales Order {0} is not submitted,Comanda de client {0} no es presenta
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +527,Sales Order {0} is not submitted,Comanda de client {0} no es presenta
 DocType: Homepage,Tag Line,tag Line
 DocType: Fee Component,Fee Component,Quota de components
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +857,Add items from,Afegir elements de
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +836,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}
 DocType: Cheque Print Template,Regular,regular
 DocType: BOM,Last Purchase Rate,Darrera Compra Rate
@@ -3471,6 +3517,7 @@
 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
 ,Sales Person-wise Transaction Summary,Resum de transaccions de vendes Persona-savi
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +60,Cost Center is required for 'Profit and Loss' account {0}. Please set up a default Cost Center for the Company.,"Es requereix un centre de costos per a &#39;de pèrdues i guanys&#39; compte {0}. Si us plau, establir un centre de cost per defecte per a la Companyia."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,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
@@ -3481,12 +3528,12 @@
 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 +710,Online,en línia
+apps/erpnext/erpnext/accounts/page/pos/pos.js +692,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 +16,Setting this Address Template as default as there is no other default,En establir aquesta plantilla de direcció per defecte ja que no hi ha altre defecte
+apps/erpnext/erpnext/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
 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 +74,Quality Management,Gestió de la Qualitat
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,Gestió de la Qualitat
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} has been disabled,Element {0} ha estat desactivat
 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
@@ -3508,11 +3555,12 @@
 DocType: Student,Student Email ID,Estudiant ID de correu electrònic
 DocType: Employee,Notice (days),Avís (dies)
 DocType: Tax Rule,Sales Tax Template,Plantilla d&#39;Impost a les Vendes
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1520,Select items to save the invoice,Seleccioneu articles per estalviar la factura
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1544,Select items to save the invoice,Seleccioneu articles per estalviar la factura
 DocType: Employee,Encashment Date,Data Cobrament
 DocType: Account,Stock Adjustment,Ajust d'estoc
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Hi Cost per defecte per al tipus d&#39;activitat Activitat - {0}
 DocType: Production Order,Planned Operating Cost,Planejat Cost de funcionament
+DocType: Academic Term,Term Start Date,Termini Data d&#39;Inici
 apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},Troba adjunt {0} #{1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Equilibri extracte bancari segons Comptabilitat General
 DocType: Job Applicant,Applicant Name,Nom del sol·licitant
@@ -3542,17 +3590,17 @@
 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.
 DocType: Company,Distribution,Distribució
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +8,Amount Paid,Quantitat pagada
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Project Manager,Gerent De Projecte
+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
 ,Quoted Item Comparison,Citat article Comparació
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Dispatch,Despatx
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,Despatx
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Descompte màxim permès per l'article: {0} és {1}%
 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.
-DocType: Sales Invoice,Supplier Reference,Referència Proveïdor
-apps/erpnext/erpnext/accounts/page/pos/pos.js +844,"Master data syncing, it might take some time","Mestre sincronització de dades, que podria portar el seu temps"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +832,"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ó
@@ -3566,7 +3614,7 @@
 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 +83,Error in formula or condition,Error en la fórmula o condició
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,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
@@ -3575,7 +3623,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},Per a la data ha d'estar dins de l'any fiscal. Suposant Per Data = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Aquí pot actualitzar l'alçada, el pes, al·lèrgies, problemes mèdics, etc."
 DocType: Leave Block List,Applies to Company,S'aplica a l'empresa
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +197,Cannot cancel because submitted Stock Entry {0} exists,No es pot cancel·lar perquè l'entrada d'estoc {0} ja ha estat Presentada
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +198,Cannot cancel because submitted Stock Entry {0} exists,No es pot cancel·lar perquè l'entrada d'estoc {0} ja ha estat Presentada
 DocType: Purchase Invoice,In Words,En Paraules
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,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
@@ -3585,14 +3633,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,El seu exercici comença el
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Les depreciacions d&#39;actius i saldos
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +319,Amount {0} {1} transferred from {2} to {3},Suma {0} {1} transferit des {2} a {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +322,Amount {0} {1} transferred from {2} to {3},Suma {0} {1} transferit des {2} a {3}
 DocType: Sales Invoice,Get Advances Received,Obtenir les bestretes rebudes
 DocType: Email Digest,Add/Remove Recipients,Afegir / Treure Destinataris
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +432,Transaction not allowed against stopped Production Order {0},No es permet la transacció cap a l'ordre de producció aturada {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +437,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 +143,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 +652,Item variant {0} exists with same attributes,Hi ha la variant d&#39;article {0} amb mateixos atributs
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Hi ha la variant d&#39;article {0} amb mateixos atributs
+DocType: Leave Application,LAP/,LAP /
 DocType: Salary Slip,Salary Slip,Slip Salari
 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,'Per Dóna't' es requereix
@@ -3600,12 +3649,12 @@
 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 +212,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 +215,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: Employee Education,Employee Education,Formació Empleat
-apps/erpnext/erpnext/public/js/controllers/transaction.js +866,It is needed to fetch Item Details.,Es necessita a cercar Detalls de l&#39;article.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +857,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
@@ -3615,14 +3664,14 @@
 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 +178,Invalid {0},No vàlida {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Sick Leave,Baixa per malaltia
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,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
 DocType: Warehouse,PIN,PIN
 DocType: Sales Invoice,Base Change Amount (Company Currency),Base quantitat de canvi (moneda de l&#39;empresa)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +313,No accounting entries for the following warehouses,No hi ha assentaments comptables per als següents magatzems
-apps/erpnext/erpnext/projects/doctype/project/project.js +102,Save the document first.,Deseu el document primer.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +314,No accounting entries for the following warehouses,No hi ha assentaments comptables per als següents magatzems
+apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Deseu el document primer.
 DocType: Account,Chargeable,Facturable
 DocType: Company,Change Abbreviation,Canvi Abreviatura
 DocType: Expense Claim Detail,Expense Date,Data de la Despesa
@@ -3635,10 +3684,9 @@
 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
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,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
 DocType: Appraisal,Appraisal Template,Plantilla d'Avaluació
 DocType: Item Group,Item Classification,Classificació d'articles
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Business Development Manager,Gerent de Desenvolupament de Negocis
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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
@@ -3648,8 +3696,8 @@
 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 +940,Please select {0} first,Seleccioneu {0} primer
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +749,Batch {0} of Item {1} has expired.,Lot {0} de {1} article ha expirat.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +953,Please select {0} first,Seleccioneu {0} primer
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +757,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
@@ -3677,8 +3725,8 @@
  {% 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 +92,Warehouse not found in the system,Magatzem no trobat al sistema
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +106,This Month's Summary,Resum d&#39;aquest Mes
+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
 DocType: Quality Inspection Reading,Quality Inspection Reading,Qualitat de Lectura d'Inspecció
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Bloqueja els estocs més antics que' ha de ser menor de %d dies.
 DocType: Tax Rule,Purchase Tax Template,Compra Plantilla Tributària
@@ -3688,21 +3736,22 @@
 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 +87,Please set Next Depreciation Date,"Si us plau, estableix Següent Depreciació Data"
-DocType: Payment Gateway,Payment Gateway,Passarel·la de Pagament
 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 +378,Operation Time must be greater than 0 for Operation {0},Temps de funcionament ha de ser major que 0 per a l&#39;operació {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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/accounts/doctype/account/account.py +170,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)
 DocType: Program,Program Abbreviation,abreviatura programa
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,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: Appraisal,Start Date,Data De Inici
@@ -3718,21 +3767,22 @@
 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
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Ex. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +27,Transaction currency must be same as Payment Gateway currency,Moneda de la transacció ha de ser la mateixa que la moneda de pagament de porta d&#39;enllaç
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Transaction currency must be same as Payment Gateway currency,Moneda de la transacció ha de ser la mateixa que la moneda de pagament de porta d&#39;enllaç
 DocType: Payment Entry,Receive,Rebre
+apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,cites:
 DocType: Maintenance Visit,Fully Completed,Totalment Acabat
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Complet
 DocType: Employee,Educational Qualification,Capacitació per a l'Educació
 DocType: Workstation,Operating Costs,Costos Operatius
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Acció si s&#39;acumula pressupost mensual excedit
 DocType: Purchase Invoice,Submit on creation,Presentar a la creació
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +432,Currency for {0} must be {1},Moneda per {0} ha de ser {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +435,Currency for {0} must be {1},Moneda per {0} ha de ser {1}
 DocType: Asset,Disposal Date,disposició Data
 DocType: Employee Leave Approver,Employee Leave Approver,Empleat Deixar aprovador
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,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 +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/crm/doctype/opportunity/opportunity.py +79,"Cannot declare as lost, because Quotation has been made.","No es pot declarar com perdut, perquè s'han fet ofertes"
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Administraodr principal de compres
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +429,Production Order {0} must be submitted,L'Ordre de Producció {0} ha d'estar Presentada
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +434,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
@@ -3742,25 +3792,27 @@
 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
 DocType: Price List,Price List Name,nom de la llista de preus
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +181,Totals,Totals
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,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 +113,Warning: Leave application contains following block dates,Advertència: Deixa aplicació conté dates bloc
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +120,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
 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ó.
+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 +181,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/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 +793,All records are synced.,Tots els registres es sincronitzen.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +781,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
 DocType: Cost Center,Cost Center Name,Nom del centre de cost
@@ -3779,21 +3831,20 @@
 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/selling/doctype/quotation/quotation.py +49,Cannot set as Lost as Sales Order is made.,No es pot establir tan perdut com està feta d'ordres de venda.
-DocType: Student Applicant,Mother's Name,Nom de la mare
 DocType: Request for Quotation Item,Supplier Part No,Proveïdor de part
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +348,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',No es pot deduir que és la categoria de &#39;de Valoració &quot;o&quot; Vaulation i Total&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Received From,Rebut des
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Received From,Rebut des
 DocType: Lead,Converted,Convertit
 DocType: Item,Has Serial No,No té de sèrie
 DocType: Employee,Date of Issue,Data d'emissió
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{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 +93,Row {0}: Hours value must be greater than zero.,Fila {0}: valor Hores ha de ser més gran que zero.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +117,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
 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 +172,{0} {1} does not exist,{0} {1} no existeix
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +175,{0} {1} does not exist,{0} {1} no existeix
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,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 +72,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
@@ -3802,13 +3853,14 @@
 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/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
 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 +109,Electrical,Elèctric
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Electrical,Elèctric
 DocType: Stock Entry,Total Value Difference (Out - In),Diferència Total Valor (Out - En)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,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}
@@ -3816,7 +3868,7 @@
 DocType: Item,Customer Code,Codi de Client
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +210,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 +292,Debit To account must be a Balance Sheet account,Dèbit al compte ha de ser un compte de Balanç
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To account must be a Balance Sheet account,Dèbit al compte ha de ser un compte de Balanç
 DocType: Buying Settings,Naming Series,Sèrie de nomenclatura
 DocType: Leave Block List,Leave Block List Name,Deixa Nom Llista de bloqueig
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Actius
@@ -3828,11 +3880,11 @@
 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 +301,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 +313,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: Sales Order Item,Ordered Qty,Quantitat demanada
-apps/erpnext/erpnext/stock/doctype/item/item.py +673,Item {0} is disabled,Article {0} està deshabilitat
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,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 +838,BOM does not contain any stock item,BOM no conté cap article comuna
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +809,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.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generar Salari Slips
@@ -3840,23 +3892,24 @@
 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)
-apps/erpnext/erpnext/stock/doctype/item/item.py +485,Row #{0}: Please set reorder quantity,Fila # {0}: Configureu la quantitat de comanda
+DocType: Sales Invoice Timesheet,Billing Hours,Hores de facturació
+apps/erpnext/erpnext/stock/doctype/item/item.py +487,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 +62,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
+DocType: Payment Entry,Allocate Payment Amount,Distribuir l&#39;import de pagament
 DocType: Employee External Work History,Salary,Salari
 DocType: Serial No,Delivery Document Type,Tipus de document de lliurament
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Presenta totes les nòmines amb els criteris anteriorment seleccionats
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} articles sincronitzen
 DocType: Sales Order,Partly Delivered,Parcialment Lliurat
-DocType: Sales Invoice,Existing Customer,Client existent
 DocType: Email Digest,Receivables,Cobrables
+DocType: Lead Source,Lead Source,Origen de clients potencials
 DocType: Customer,Additional information regarding the customer.,Informació addicional respecte al client.
 DocType: Quality Inspection Reading,Reading 5,Lectura 5
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +38,Campaign Name is required,Cal un nom de Campanya
 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 data d&#39;inici o data de finalització es col·loqui per sobre de {0}. Per evitar configuri empresa
@@ -3865,10 +3918,9 @@
 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 +129,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 +113,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
-DocType: Bank Reconciliation Detail,Amount,Quantitat
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM reemplaçat
 ,Sales Analytics,Analytics de venda
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +113,Available {0},Disponible {0}
@@ -3876,14 +3928,14 @@
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Configuració de Correu
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +96,Please enter default currency in Company Master,Si us plau ingressi moneda per defecte en l'empresa Mestre
 DocType: Stock Entry Detail,Stock Entry Detail,Detall de les entrades d'estoc
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +100,Daily Reminders,Recordatoris diaris
+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/account/account_tree.js +23,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 +71,Customer Service,Servei Al Client
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Customer Service,Servei Al Client
 DocType: Homepage Featured Product,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.
@@ -3892,8 +3944,9 @@
 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
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Per defecte Work In Progress Magatzem
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1570,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/accounts/page/pos/pos.js +1594,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
 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
@@ -3901,9 +3954,10 @@
 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 +82,Engineer,Enginyer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,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 +370,Item Code required at Row No {0},Codi de l'article necessari a la fila n {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +398,Item Code required at Row No {0},Codi de l'article necessari a la fila n {0}
 DocType: Sales Partner,Partner Type,Tipus de Partner
 DocType: Purchase Taxes and Charges,Actual,Reial
 DocType: Authorization Rule,Customerwise Discount,Customerwise Descompte
@@ -3919,16 +3973,18 @@
 DocType: BOM,Raw Material Cost,Matèria primera Cost
 DocType: Item Reorder,Re-Order Level,Re-Order Nivell
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Introduïu articles i Quantitat prevista per a les que desitja elevar les ordres de producció o descàrrega de matèries primeres per a la seva anàlisi.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +55,Part-time,Temps parcial
+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
 DocType: Employee,Applicable Holiday List,Llista de vacances aplicable
 DocType: Employee,Cheque,Xec
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Sèries Actualitzat
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +57,Series Updated,Sèries Actualitzat
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Tipus d'informe és obligatori
 DocType: Item,Serial Number Series,Nombre de sèrie de la sèrie
 apps/erpnext/erpnext/buying/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 +87,Clearance Date updated,Liquidació Data s&#39;actualitza
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Reconciliats amb èxit
@@ -3942,7 +3998,7 @@
 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 +513,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 +518,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.
@@ -3952,7 +4008,7 @@
 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/stock/doctype/stock_entry/stock_entry.py +158,Target warehouse in row {0} must be same as Production Order,El magatzem de destinació de la fila {0} ha de ser igual que l'Ordre de Producció
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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
 DocType: Company,Round Off Account,Per arrodonir el compte
@@ -3961,23 +4017,22 @@
 DocType: Customer Group,Parent Customer Group,Pares Grup de Clients
 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 +180,Notice Period,Període de Notificació
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,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 +4,New Sales Person Name,Nom nou encarregat de vendes
 DocType: Packing Slip,Gross Weight UOM,Pes brut UDM
-DocType: Email Digest,Receivables / Payables,Cobrar / pagar
 DocType: Delivery Note Item,Against Sales Invoice,Contra la factura de venda
 DocType: Bin,Reserved Qty for Production,Quantitat reservada per a la Producció
 DocType: Asset,Frequency of Depreciation (Months),Freqüència de Depreciació (Mesos)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +469,Credit Account,Compte de Crèdit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Credit Account,Compte de Crèdit
 DocType: Landed Cost Item,Landed Cost Item,Landed Cost article
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +55,Show zero values,Mostra valors zero
+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ó
 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 +647,Please specify Attribute Value for attribute {0},"Si us plau, especifiqui Atribut Valor de l&#39;atribut {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},"Si us plau, especifiqui Atribut Valor de l&#39;atribut {0}"
 DocType: Item,Default Warehouse,Magatzem predeterminat
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +39,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"
@@ -3999,19 +4054,22 @@
 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
-DocType: Sales Invoice,Cold Calling,Trucades en fred
 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: Maintenance Schedule Item,Half Yearly,Semestrals
 DocType: Lead,Blog Subscriber,Bloc subscriptor
+DocType: Guardian,Alternate Number,nombre alternatiu
 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."
+DocType: Stock Reconciliation Item,Quantity Difference,quantitat Diferència
 apps/erpnext/erpnext/config/hr.py +253,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 +141,Set as Lost,Establir com a Perdut
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,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 +5,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
 DocType: Supplier,Credit Days Based On,Dies crèdit basat en
@@ -4023,11 +4081,10 @@
 ,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 +941,Select or add new customer,Seleccionar o afegir nou client
+apps/erpnext/erpnext/accounts/page/pos/pos.js +930,Select or add new customer,Seleccionar o afegir nou client
 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 +5,This is based on the attendance of this Employee,Això es basa en la presència d&#39;aquest empleat
-DocType: Sales Invoice,Frequency,Freqüència
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +463,Debit Account,Compte Dèbit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,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)
@@ -4036,27 +4093,27 @@
 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 +210,Supplier Quotation {0} created,Cita Proveïdor {0} creat
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +208,Supplier Quotation {0} created,Cita Proveïdor {0} creat
 apps/erpnext/erpnext/accounts/report/financial_statements.py +90,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 +173,Employee Benefits,Beneficis als empleats
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,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 +228,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 +232,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 +499,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 +500,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 +1007,Price List not found or disabled,La llista de preus no existeix o està deshabilitada
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1008,Price List not found or disabled,La llista de preus no existeix o està deshabilitada
 DocType: Expense Claim,Approved,Aprovat
 DocType: Pricing Rule,Price,Preu
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +244,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 +256,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
@@ -4067,12 +4124,12 @@
 DocType: Address,Office,Oficina
 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 +259,Please select Employee Record first.,Seleccioneu Employee Record primer.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +266,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 +190,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 +235,Please enter Expense Account,Si us plau ingressi Compte de Despeses
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,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 +963,"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 +976,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Fila # {0}: Tipus de document de referència ha de ser un l&#39;ordre de compra, factura de compra o d&#39;entrada de diari"
 DocType: Employee,Current Address,Adreça actual
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Si l'article és una variant d'un altre article llavors descripció, imatges, preus, impostos etc s'establirà a partir de la plantilla a menys que s'especifiqui explícitament"
 DocType: Serial No,Purchase / Manufacture Details,Compra / Detalls de Fabricació
@@ -4087,9 +4144,10 @@
 DocType: Asset Movement,Transaction Date,Data de Transacció
 DocType: Production Plan Item,Planned Qty,Planificada Quantitat
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,Impost Total
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,For Quantity (Manufactured Qty) is mandatory,Per Quantitat (Fabricat Quantitat) és obligatori
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,For Quantity (Manufactured Qty) is mandatory,Per Quantitat (Fabricat Quantitat) és obligatori
 DocType: Stock Entry,Default Target Warehouse,Magatzem de destí predeterminat
 DocType: Purchase Invoice,Net Total (Company Currency),Net Total (En la moneda de la Companyia)
+apps/erpnext/erpnext/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 +78,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: Production Order,Actual Start Date,Data d'inici real
@@ -4104,9 +4162,11 @@
 DocType: Warranty Claim,If different than customer address,Si és diferent de la direcció del client
 DocType: BOM Operation,BOM Operation,BOM Operació
 DocType: Purchase Taxes and Charges,On Previous Row Amount,A limport de la fila anterior
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +226,Transfer Asset,actius transferència
+DocType: Student,Home Address,Adreça de casa
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +227,Transfer Asset,actius transferència
 DocType: POS Profile,POS Profile,POS Perfil
 apps/erpnext/erpnext/config/schools.py +33,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 +129,"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
@@ -4116,8 +4176,8 @@
 DocType: Assessment,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 +765,Material to Supplier,Materials de Proveïdor
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +189,Excise Invoice,Impostos Especials Factura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,Material to Supplier,Materials de Proveïdor
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,Impostos Especials Factura
 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
@@ -4127,7 +4187,7 @@
 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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,Grups estudiantils creats.
 DocType: Scheduling Tool,Scheduling Tool,Eina de programació
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +136,Credit Card,Targeta De Crèdit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,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.
 DocType: Purchase Invoice,Next Date,Següent Data
@@ -4135,6 +4195,7 @@
 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: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Aquí pot mantenir els detalls de la família com el nom i ocupació dels pares, cònjuge i fills"
+DocType: Academic Term,Term End Date,Termini Data de finalització
 DocType: Hub Settings,Seller Name,Nom del venedor
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Impostos i despeses deduïdes (Companyia moneda)
 DocType: Item Group,General Settings,Configuració general
@@ -4146,7 +4207,7 @@
 DocType: Customer,Commission Rate,Percentatge de comissió
 apps/erpnext/erpnext/stock/doctype/item/item.js +261,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 +115,"Payment Type must be one of Receive, Pay and Internal Transfer","Tipus de pagament ha de ser un Rebre, Pagar i Transferència interna"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +118,"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/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,El carret està buit
 DocType: Production Order,Actual Operating Cost,Cost de funcionament real
@@ -4161,10 +4222,10 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,Seleccioneu un arxiu csv
 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 +92,Designer,Dissenyador
+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
 DocType: Serial No,Delivery Details,Detalls del lliurament
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +469,Cost Center is required in row {0} in Taxes table for type {1},Es requereix de centres de cost a la fila {0} en Impostos taula per al tipus {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +472,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
 ,Item-wise Purchase Register,Registre de compra d'articles
 DocType: Batch,Expiry Date,Data De Caducitat
@@ -4174,12 +4235,12 @@
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Projecte mestre.
 apps/erpnext/erpnext/controllers/status_updater.py +174,"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 +417, (Half Day),(Mig dia)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425, (Half Day),(Mig dia)
 DocType: Supplier,Credit Days,Dies de Crèdit
 DocType: Leave Type,Is Carry Forward,Is Carry Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +740,Get Items from BOM,Obtenir elements de la llista de materials
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +711,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 +549,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/controllers/accounts_controller.py +552,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"
 ,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
diff --git a/erpnext/translations/cs.csv b/erpnext/translations/cs.csv
index effe5d4..7b6e65c 100644
--- a/erpnext/translations/cs.csv
+++ b/erpnext/translations/cs.csv
@@ -18,11 +18,10 @@
 DocType: Sales Partner,Dealer,Dealer
 DocType: Employee,Rented,Pronajato
 DocType: Purchase Order,PO-,po-
-apps/erpnext/erpnext/accounts/report/financial_statements.py +19,Start Year {0} not found.,Začít rok {0} nebyl nalezen.
 DocType: POS Profile,Applicable for User,Použitelné pro Uživatele
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +191,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Zastavil výrobu Objednat nelze zrušit, uvolnit ho nejprve zrušit"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +197,Do you really want to scrap this asset?,Opravdu chcete zrušit tuto pohledávku?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +17,Select Default Supplier,Vybrat Výchozí Dodavatel
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +192,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Zastavil výrobu Objednat nelze zrušit, uvolnit ho nejprve zrušit"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +198,Do you really want to scrap this asset?,Opravdu chcete zrušit tuto pohledávku?
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Vybrat Výchozí Dodavatel
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Měna je vyžadováno pro Ceníku {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Bude se vypočítá v transakci.
 DocType: Address,County,Hrabství
@@ -42,46 +41,45 @@
 DocType: Sales Invoice,Customer Name,Jméno zákazníka
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +126,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 +180,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 +183,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 +148,Series Updated Successfully,Řada Aktualizováno Úspěšně
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +149,Series Updated Successfully,Řada Aktualizováno Úspěšně
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Odhlásit se
 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
-DocType: Quality Inspection Reading,Parameter,Parametr
 apps/erpnext/erpnext/projects/doctype/project/project.py +54,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 +239,New Leave Application,New Leave Application
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,New Leave Application,New Leave Application
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +20,Attendance Record {0} exists against Student {1} for Course Schedule {2},Účast Record {0} existuje proti Student {1} pro rozvrh {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Bank Draft,Bank Návrh
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,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
 DocType: Academic Term,Academic Term,Akademický Term
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +13,Material,Materiál
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Quantity,Množství
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +511,Accounts table cannot be blank.,Účty tabulka nemůže být prázdné.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +616,Quantity,Množství
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +512,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)
 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/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 +142,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í
-DocType: Purchase Invoice,Monthly,Měsíčně
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Zpoždění s platbou (dny)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +771,Invoice,Faktura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +750,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 +198,Row {0}: {1} {2} does not match with {3},Řádek {0}: {1} {2} se neshoduje s {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Řádek č. {0}:
+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 +127,Please select Price List,"Prosím, vyberte Ceník"
@@ -112,8 +110,8 @@
 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 +589,Get items from,Získat předměty z
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +382,Stock cannot be updated against Delivery Note {0},Sklad nelze aktualizovat na dodací list {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Získat předměty z
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,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
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Potraviny
@@ -122,7 +120,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.,"** 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 +156,Salary Structure Missing,Plat Struktura Chybějící
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,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
@@ -130,10 +128,11 @@
 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 +156,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/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Je Fixed Asset&quot; nemůže být bez povšimnutí, protože existuje Asset záznam proti položce"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +189,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"
 DocType: Tax Rule,Tax Type,Daňové Type
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +144,You are not authorized to add or update entries before {0},Nejste oprávněni přidávat nebo aktualizovat údaje před {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,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/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á doba aktivity
@@ -143,18 +142,17 @@
 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 +165,Opening,Otvor
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,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/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Customer&gt; Customer Group&gt; Území
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Účet Pay Pouze
 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.
 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"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Company first,"Prosím, vyberte první firma"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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
@@ -164,7 +162,7 @@
 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é
 DocType: Purchase Invoice Item,Is Fixed Asset,Je dlouhodobého majetku
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Available qty is {0}, you need {1}","K dispozici je množství {0}, musíte {1}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +225,"Available qty is {0}, you need {1}","K dispozici je množství {0}, musíte {1}"
 DocType: Expense Claim Detail,Claim Amount,Nárok Částka
 DocType: Employee,Mr,Pan
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Dodavatel Typ / dovozce
@@ -173,26 +171,27 @@
 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: Assessment Result,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 +171,Annual Salary,Roční Plat
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Annual Salary,Roční Plat
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Stock Náklady
-apps/erpnext/erpnext/accounts/report/financial_statements.py +22,End Year {0} not found.,Konec roku {0} nebyl nalezen.
 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}
 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 +130,At least one mode of payment is required for POS invoice.,pro POS fakturu je nutná alespoň jeden způsob platby.
 DocType: Products Settings,Show Products as a List,Zobrazit produkty jako seznam
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Stáhněte si šablony, vyplňte potřebné údaje a přiložte upravený soubor.
  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 +451,Item {0} is not active or end of life has been reached,"Bod {0} není aktivní, nebo byl dosažen konec života"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +456,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/controllers/accounts_controller.py +614,"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/controllers/accounts_controller.py +617,"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 +166,Settings for HR Module,Nastavení pro HR modul
 DocType: SMS Center,SMS Center,SMS centrum
 DocType: Sales Invoice,Change Amount,změna Částka
@@ -204,13 +203,13 @@
 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 +147,Execution,Provedení
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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/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}"
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,Cost Center {0} does not belong to Company {1},Náklady Center {0} nepatří do společnosti {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +100,Cost Center {0} does not belong to Company {1},Náklady Center {0} nepatří do společnosti {1}
 DocType: Customer,Individual,Individuální
 DocType: Interest,Academics User,akademici Uživatel
 DocType: Cheque Print Template,Amount In Figure,Na obrázku výše
@@ -226,30 +225,32 @@
 DocType: Production Planning Tool,Sales Orders,Prodejní objednávky
 DocType: Purchase Taxes and Charges,Valuation,Ocenění
 ,Purchase Order Trends,Nákupní objednávka trendy
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,The request for quotation can be accessed by clicking on the following link,Žádost o cenovou nabídku lze přistupovat kliknutím na následující odkaz
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,Přidělit listy za rok.
 DocType: SG Creation Tool Course,SG Creation Tool Course,SG nástroj pro tvorbu hřiště
 DocType: Student Group Creation Tool,Leave blank if you wish to fetch all courses for selected academic term,"Ponechte prázdné, pokud chcete načíst všechny kurzy pro vybrané semestru"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,Insufficient Stock,nedostatečná Sklad
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227,Insufficient Stock,nedostatečná Sklad
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Zakázat Plánování kapacit a Time Tracking
+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: 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/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} does not belong to Company {1},Účet {0} nepatří do společnosti {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +86,Account {0} does not belong to Company {1},Účet {0} nepatří do společnosti {1}
 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}
 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,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 +174,For Warehouse is required before Submit,Pro Sklad je povinné před Odesláním
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,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
 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 +1436,"LocalStorage is full , did not save","Místní úložiště je plná, nezachránil"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1460,"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}
@@ -262,18 +263,19 @@
 apps/erpnext/erpnext/templates/generators/item.html +78,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 +5,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/leave_application/leave_application.py +206,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/leave_application/leave_application.py +213,Only the selected Leave Approver can submit this Leave Application,Pouze vybraný Leave schvalovač může podat této dovolené aplikaci
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Uvolnění Datum musí být větší než Datum spojování
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Leaves per Year,Dovolených za rok
+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 +103,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}
+DocType: Email Digest,Profit & Loss,Ztráta zisku
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,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 +435,Leave Blocked,Absence blokována
-apps/erpnext/erpnext/stock/doctype/item/item.py +669,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 +443,Leave Blocked,Absence blokována
+apps/erpnext/erpnext/stock/doctype/item/item.py +671,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 +83,Annual,Roční
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +86,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í
@@ -281,20 +283,22 @@
 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"
 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 +91,Software Developer,Software Developer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Minimální objednávka Množství
 DocType: Pricing Rule,Supplier Type,Dodavatel Type
 DocType: Scheduling Tool,Course Start Date,Začátek Samozřejmě Datum
 DocType: Item,Publish in Hub,Publikovat v Hub
+DocType: Student Admission,Student Admission,Student Vstupné
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is cancelled,Položka {0} je zrušen
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Material Request,Požadavek na materiál
+apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} is cancelled,Položka {0} je zrušen
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +823,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 +28,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 +328,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Položka {0} nebyl nalezen v &quot;suroviny dodané&quot; tabulky v objednávce {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +333,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/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
@@ -310,20 +314,21 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +130,Please select Charge Type first,"Prosím, vyberte druh tarifu první"
 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: Email Digest,New Quotations,Nové Citace
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,První Leave schvalovač v seznamu bude nastaven jako výchozí Leave schvalujícího
 DocType: Tax Rule,Shipping County,vodní doprava County
 apps/erpnext/erpnext/config/desktop.py +158,Learn,Učit se
 DocType: Asset,Next Depreciation Date,Vedle Odpisy Datum
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Náklady na činnost na jednoho zaměstnance
 DocType: Accounts Settings,Settings for Accounts,Nastavení účtů
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +626,Supplier Invoice No exists in Purchase Invoice {0},Dodavatelské faktury No existuje ve faktuře {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +629,Supplier Invoice No exists in Purchase Invoice {0},Dodavatelské faktury No existuje ve faktuře {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Správa obchodník strom.
 DocType: Job Applicant,Cover Letter,Průvodní dopis
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Vynikající Šeky a vklady s jasnými
 DocType: Item,Synced With Hub,Synchronizovány Hub
 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 +348,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 +86,Circular Reference Error,Kruhové Referenční Chyba
@@ -335,15 +340,16 @@
 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 +806,Delivery Note,Dodací list
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +800,Delivery Note,Dodací list
 apps/erpnext/erpnext/config/learn.py +87,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 +233,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/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/setup/doctype/email_digest/email_digest.py +104,Summary for this week and pending activities,Shrnutí pro tento týden a probíhajícím činnostem
+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"
 DocType: Employee,Company Email,Společnost E-mail
@@ -355,28 +361,29 @@
 apps/erpnext/erpnext/config/hr.py +186,"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"
-apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Řádek # {0}: faktury nelze provést vůči stávajícímu aktivu {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +554,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 +54,{0} already allocated for Employee {1} for period {2} to {3},{0} již přidělené pro zaměstnance {1} na dobu {2} až {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +812,Select Item,Select Položka
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +791,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 \
 					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 +142,Purchase Invoice {0} is already submitted,Přijatá faktura {0} je již odeslána
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},"Row # {0}: Batch No musí být stejné, jako {1} {2}"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +143,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.
 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 +342,Please see attachment,"Prosím, viz příloha"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,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 +19,Setup Already Complete!!,Setup již dokončen !!
 ,Finished Goods,Hotové zboží
 DocType: Delivery Note,Instructions,Instrukce
 DocType: Quality Inspection,Inspected By,Zkontrolován
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Dodavatel&gt; Dodavatel Type
 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/public/js/utils/item_selector.js +12,Add Items,Přidat položky
@@ -390,29 +397,29 @@
 DocType: Currency Exchange,Currency Exchange,Směnárna
 DocType: Purchase Invoice Item,Item Name,Název položky
 DocType: Authorization Rule,Approving User  (above authorized value),Schválení uživatele (nad oprávněné hodnoty)
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Credit Balance
+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/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 +736,Purchase Return,Nákup Return
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +715,Purchase Return,Nákup Return
 ,Purchase Register,Nákup Register
 DocType: 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 +202,{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 +209,{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 +143,Reason for losing,Důvod ztráty
-apps/erpnext/erpnext/accounts/utils.py +239,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 +163,Reason for losing,Důvod ztráty
+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é
 DocType: Announcement,Receiver,Přijímač
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation je uzavřena v následujících dnech podle Prázdninový Seznam: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Příležitosti
 DocType: Employee,Single,Jednolůžkový
 DocType: 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 +225,Please enter Cost Center,"Prosím, zadejte nákladové středisko"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,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
@@ -425,26 +432,26 @@
 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
 DocType: Account,Is Group,Is Group
+DocType: Email Digest,Pending Purchase Orders,Čeká objednávek
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Automaticky nastavit sériových čísel na základě FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,"Zkontrolujte, zda dodavatelské faktury Počet Jedinečnost"
 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 +102,Non Profit,Non Profit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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: Stock Reconciliation Item,Do not include symbols (ex. $),Nezahrnují symboly (např. $)
 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 +638,Attribute {0} selected multiple times in Attributes Table,Atribut {0} vybraný několikrát v atributech tabulce
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Atribut {0} vybraný několikrát v atributech tabulce
 DocType: HR Settings,Employee record is created using selected field. ,Záznam Zaměstnanec je vytvořena pomocí vybrané pole.
 DocType: Sales Order,Not Applicable,Nehodí se
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Holiday master.
 DocType: Request for Quotation Item,Required Date,Požadovaná data
 DocType: Delivery Note,Billing Address,Fakturační adresa
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +862,Please enter Item Code.,"Prosím, zadejte kód položky."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +847,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"
@@ -458,12 +465,12 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Cenné papíry a vklady
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Celkem listy přidělené je povinné
 DocType: Job Opening,Description of a Job Opening,Popis jednoho volných pozic
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Pending activities for today,Nevyřízené aktivity pro dnešek
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Nevyřízené aktivity pro dnešek
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Účast rekord.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Plat komponent pro mzdy časového rozvrhu.
 DocType: Sales Order Item,Used for Production Plan,Používá se pro výrobní plán
 DocType: Manufacturing Settings,Time Between Operations (in mins),Doba mezi operací (v min)
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +92,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} Rozpočet na účet {1} proti nákladového střediska {2} je {3}. To bude přesahovat o {4}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +95,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} Rozpočet na účet {1} proti nákladového střediska {2} je {3}. To bude přesahovat o {4}
 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
@@ -471,16 +478,16 @@
 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/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 +86,Administrative Officer,Správní ředitel
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,Správní ředitel
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +23,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 +319,Please select Company,"Prosím, vyberte Company"
-DocType: Stock Entry,Difference Account,Rozdíl účtu
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +309,Please select Company,"Prosím, vyberte Company"
+DocType: Stock Entry Detail,Difference Account,Rozdíl účtu
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,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 +398,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 +399,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 +530,"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 +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"
 DocType: Shipping Rule,Net Weight,Hmotnost
 DocType: Employee,Emergency Phone,Nouzový telefon
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +28,Buy,Koupit
@@ -488,7 +495,7 @@
 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 +1563,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 +1587,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
@@ -497,13 +504,14 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Account {0} does not belong to company: {1},Účet {0} nepatří k firmě: {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation already used for another company,Zkratka již použit pro jinou společnost
 DocType: Selling Settings,Default Customer Group,Výchozí Customer Group
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Supplier is required against Payable account {0},Dodavatel je nutná proti zaplacení účtu {0}
 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
 DocType: Company,Delete Company Transactions,Smazat transakcí Company
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +313,Reference No and Reference Date is mandatory for Bank transaction,Referenční číslo a referenční datum je povinný pro bankovní transakce
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +316,Reference No and Reference Date is mandatory for Bank transaction,Referenční číslo a referenční datum je povinný pro bankovní transakce
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Přidat / Upravit daní a poplatků
 DocType: Purchase Invoice,Supplier Invoice No,Dodavatelské faktury č
 DocType: Territory,For reference,Pro srovnání
@@ -514,7 +522,6 @@
 DocType: Installation Note Item,Installation Note Item,Poznámka k instalaci bod
 DocType: Production Plan Item,Pending Qty,Čekající Množství
 DocType: Budget,Ignore,Ignorovat
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Kód položky&gt; položka Group&gt; Brand
 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/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
@@ -525,11 +532,11 @@
 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/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 +28,Please select Company and Party Type first,Vyberte první společnost a Party Typ
+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/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 +707,Make Sales Order,Ujistěte se prodejní objednávky
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +701,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
@@ -545,7 +552,8 @@
 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 +734,Sales Return,Sales Return
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +728,Sales Return,Sales Return
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +91,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)
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Databáze potenciálních zákazníků.
@@ -554,14 +562,13 @@
 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 +212,Opening (Cr),Otvor (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +795,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"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 +237,Allocated amount can not be negative,Přidělená částka nemůže být záporná
+apps/erpnext/erpnext/stock/doctype/item/item.py +797,Default Unit of Measure for Item {0} cannot be changed directly because 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á
 DocType: Purchase Order Item,Billed Amt,Účtovaného Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,"Logická Warehouse na položky, které mohou být vyrobeny."
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Prodejní faktury časový rozvrh
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},Referenční číslo a referenční datum je nutné pro {0}
-DocType: Sales Invoice,Customer's Vendor,Prodejce zákazníka
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Proposal Writing,Návrh Psaní
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,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"
@@ -570,13 +577,14 @@
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,Time Tracking
 DocType: Fiscal Year Company,Fiscal Year Company,Fiskální rok Společnosti
 DocType: Packing Slip Item,DN Detail,DN Detail
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +257,Already supplier quotation has created,Již dodavatel citát vytvořil
 DocType: Timesheet,Billed,Fakturováno
 DocType: Batch,Batch Description,Popis Šarže
+apps/erpnext/erpnext/accounts/utils.py +685,"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 +733,View Offline Records,Zobrazení Offline Records
+apps/erpnext/erpnext/accounts/page/pos/pos.js +715,View Offline Records,Zobrazení Offline Records
+DocType: Student,Sibling Details,sourozenec Podrobnosti
 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: Payment Reconciliation,Invoice/Journal Entry Details,Faktura / Zápis do deníku Podrobnosti
@@ -590,7 +598,7 @@
 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
 DocType: Employee,Passport Number,Číslo pasu
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Manager,Manažer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,Manažer
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,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é"
@@ -599,10 +607,11 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter email address,Zadejte e-mailovou adresu
 DocType: Production Order Operation,In minutes,V minutách
 DocType: Issue,Resolution Date,Rozlišení Datum
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +299,Timesheet created:,Časového rozvrhu vytvoření:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +715,Please set default Cash or Bank account in Mode of Payment {0},Prosím nastavte výchozí v hotovosti nebo bankovním účtu v způsob platby {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +300,Timesheet created:,Časového rozvrhu vytvoření:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +772,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
 DocType: Selling Settings,Customer Naming By,Zákazník Pojmenování By
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,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: 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
@@ -627,6 +636,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,Dokončit
 DocType: Pricing Rule,Sales Manager,Manažer prodeje
 DocType: Salary Structure Employee,Base,Báze
+DocType: Timesheet,Total Billed Hours,Celkem Předepsané Hodiny
 DocType: Journal Entry,Write Off Amount,Odepsat Částka
 DocType: Journal Entry,Bill No,Bill No
 DocType: Company,Gain/Loss Account on Asset Disposal,Zisk / ztráty na majetku likvidaci
@@ -641,11 +651,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +9,Pre Sales,Předprodej
 DocType: Purchase Receipt,Other Details,Další podrobnosti
 DocType: Account,Accounts,Účty
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Marketing,Marketing
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +227,Payment Entry is already created,Vstup Platba je již vytvořili
+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,Vstup Platba je již vytvořili
 DocType: Purchase Receipt Item Supplied,Current Stock,Current skladem
-apps/erpnext/erpnext/controllers/accounts_controller.py +538,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 +21,Preview Salary Slip,Preview výplatní pásce
+apps/erpnext/erpnext/controllers/accounts_controller.py +541,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 +38,Preview Salary Slip,Preview výplatní pásce
 DocType: Company,Deafult Cost Center,Deafult nákladového střediska
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +48,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í
@@ -654,7 +664,7 @@
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,"Prosím, vyberte si studentská skupina"
 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 +617,Item has variants.,Položka má varianty.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Položka má varianty.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,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
@@ -674,7 +684,7 @@
 DocType: Purchase Order,Supply Raw Materials,Dodávek surovin
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Datum, kdy bude vygenerován příští faktury. To je generován na odeslat."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Oběžná aktiva
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,{0} is not a stock Item,{0} není skladová položka
+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 +169,Lead must be set if Opportunity is made from Lead,Lead musí být nastaven pokud je Příležitost vyrobena z leadu
@@ -760,26 +770,25 @@
 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 +709,No Permission,Nemáte oprávnění
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +710,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}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +298,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 +542,Row #{0}: Asset {1} must be submitted,Řádek # {0}: {1} Asset musí být předloženy
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset {1} must be submitted,Řádek # {0}: {1} Asset musí být předloženy
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Žádný zaměstnanec nalezeno
 DocType: Supplier Quotation,Stopped,Zastaveno
 DocType: Item,If subcontracted to a vendor,Pokud se subdodávky na dodavatele
 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.
 DocType: Warehouse,Tree Details,Tree Podrobnosti
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Odeslat nyní
 ,Support Analytics,Podpora Analytics
 DocType: Item,Website Warehouse,Sklad pro web
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimální částka faktury
 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/sales_invoice/sales_invoice.py +227,Timesheet {0} is already completed or cancelled,Časového rozvrhu {0} je již dokončena nebo zrušena
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +259,Timesheet {0} is already completed or cancelled,Časového rozvrhu {0} je již dokončena nebo zrušena
 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
@@ -795,13 +804,13 @@
 apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,rozvrh
 DocType: Maintenance Visit,Completion Status,Dokončení Status
 DocType: HR Settings,Enter retirement age in years,Zadejte věk odchodu do důchodu v letech
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +229,Target Warehouse,Target Warehouse
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +230,Target Warehouse,Target Warehouse
 DocType: Cheque Print Template,Starting location from left edge,Počínaje umístění od levého okraje
 DocType: Item,Allow over delivery or receipt upto this percent,Nechte přes dodávku nebo příjem aľ tohoto procenta
 DocType: Stock Entry,STE-,STE-
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Sales Order Date,"Očekávané datum dodání, nemůže být před Sales pořadí Datum"
 DocType: Upload Attendance,Import Attendance,Importovat Docházku
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Všechny skupiny položek
+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/config/setup.py +89,Automatically compose message on submission of transactions.,Automaticky napsat vzkaz na předkládání transakcí.
@@ -813,13 +822,15 @@
 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/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
 DocType: Expense Claim,Expenses,Výdaje
 DocType: Item Variant Attribute,Item Variant Attribute,Položka Variant Atribut
 ,Purchase Receipt Trends,Doklad o koupi Trendy
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Research & Development,Výzkum a vývoj
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Výzkum a vývoj
 ,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
@@ -828,7 +839,7 @@
 DocType: Production Planning Tool,Only Obtain Raw Materials,Získat pouze 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","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 +340,"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."
+apps/erpnext/erpnext/controllers/accounts_controller.py +343,"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
@@ -850,12 +861,12 @@
 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 +756,Purchase Receipt,Příjemka
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +735,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 +167,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 +282,Unable to find Time Slot in the next {0} days for Operation {1},Nelze najít časový úsek v příštích {0} dní k provozu {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +170,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 +283,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 +439,BOM {0} must be active,BOM {0} musí být aktivní
@@ -866,7 +877,7 @@
 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 +214,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 +217,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
@@ -880,9 +891,9 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Zaměstnanec {0} není aktivní nebo neexistuje
 DocType: Fee Structure,Components,Komponenty
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,Please enter Asset Category in Item {0},"Prosím, zadejte Kategorie majetku v položce {0}"
-apps/erpnext/erpnext/stock/doctype/item/item.py +612,Item Variants {0} updated,Bod Varianty {0} aktualizováno
+apps/erpnext/erpnext/stock/doctype/item/item.py +614,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 +843,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 +854,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ď
@@ -897,69 +908,72 @@
 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 +728,New Sales Invoice,Nová prodejní faktura
+apps/erpnext/erpnext/accounts/page/pos/pos.js +710,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 +728,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
 DocType: Material Request Item,Lead Time Date,Datum a čas Leadu
 DocType: Guardian,Guardian Name,Jméno Guardian
 DocType: Cheque Print Template,Has Print Format,Má formát tisku
-apps/erpnext/erpnext/accounts/page/pos/pos.js +86, 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 +109,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 +619,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","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/page/pos/pos.js +75, 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 +613,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing 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 +606,Supplier Invoice Date cannot be greater than Posting Date,Dodavatel Datum faktury nemůže být větší než Datum zveřejnění
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +609,Supplier Invoice Date cannot be greater than Posting Date,Dodavatel Datum faktury nemůže být větší než Datum zveřejnění
 DocType: Purchase Invoice Item,Purchase Order Item,Položka vydané objednávky
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +130,Indirect Income,Nepřímé příjmy
 DocType: Cheque Print Template,Date Settings,Datum Nastavení
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Odchylka
 ,Company Name,Název společnosti
 DocType: SMS Center,Total Message(s),Celkem zpráv (y)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +810,Select Item for Transfer,Vybrat položku pro převod
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +789,Select Item for Transfer,Vybrat položku pro převod
 DocType: Purchase Invoice,Additional Discount Percentage,Další slevy Procento
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Zobrazit seznam všech nápovědy videí
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Vyberte účet šéf banky, kde byla uložena kontrola."
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Povolit uživateli upravovat Ceník Cena při transakcích
 DocType: Pricing Rule,Max Qty,Max Množství
-DocType: Student Applicant,Father's Name,Otcovo jméno
 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 +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: Platba na prodejní / nákupní objednávce by měly být vždy označeny jako předem
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Chemický
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +686,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/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
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +694,All items have already been transferred for this Production Order.,Všechny položky již byly převedeny na výrobu tohoto řádu.
 DocType: Process Payroll,Select Payroll Year and Month,Vyberte Payroll rok a měsíc
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,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
-DocType: Opportunity,Walk In,Vejít
 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 +12,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: Timesheet Detail,Bill,Účet
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,White,Bílá
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,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á
 DocType: SMS Center,All Lead (Open),Všechny Lead (Otevřeny)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +228,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})
+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 +731,Make ,Dělat
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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á."
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Můj košík
-apps/erpnext/erpnext/controllers/selling_controller.py +154,Order Type must be one of {0},Typ objednávky musí být jedním z {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Typ objednávky musí být jedním z {0}
 DocType: Lead,Next Contact Date,Další Kontakt Datum
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Otevření POČET
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +393,Please enter Account for Change Amount,"Prosím, zadejte účet pro změnu Částka"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,Please enter Account for Change Amount,"Prosím, zadejte účet pro změnu Částka"
 DocType: Student Batch,Student Batch Name,Student Batch Name
 DocType: Holiday List,Holiday List Name,Jméno Holiday Seznam
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js +8,Schedule Course,rozvrh
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Stock Options,Akciové opce
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Akciové opce
 DocType: Journal Entry Account,Expense Claim,Hrazení nákladů
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +211,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 +237,Qty for {0},Množství pro {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +212,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 +238,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
@@ -968,9 +982,9 @@
 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/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Odstraněné položky bez změny množství nebo hodnoty.
+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 +635,Attribute table is mandatory,Atribut tabulka je povinné
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Atribut tabulka je povinné
 DocType: Production Planning Tool,Get Sales Orders,Získat Prodejní objednávky
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{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"
@@ -995,7 +1009,7 @@
 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/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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Pořadové číslo {0} je na základě smlouvy o údržbě aľ {1}
+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
@@ -1007,7 +1021,7 @@
 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/controllers/selling_controller.py +231,Sales Order {0} is {1},Prodejní objednávky {0} {1}
+apps/erpnext/erpnext/controllers/selling_controller.py +232,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
 DocType: Packing Slip,Net Weight UOM,Hmotnost UOM
@@ -1017,25 +1031,24 @@
 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í
 DocType: Sales Person,Select company name first.,Vyberte název společnosti jako první.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Nabídka obdržená od Dodavatelů.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},Chcete-li {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Průměrný věk
 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/templates/pages/home.html +32,View All Products,Zobrazit všechny produkty
+apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Zobrazit všechny produkty
 DocType: Company,Default Currency,Výchozí měna
 DocType: Contact,Enter designation of this Contact,Zadejte označení této Kontakt
 DocType: Expense Claim,From Employee,Od Zaměstnance
-apps/erpnext/erpnext/controllers/accounts_controller.py +400,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}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +403,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/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,a rok:
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +191,{0} {1} must be submitted,{0} {1} musí být odeslaný
-DocType: Email Digest,Annual Expense,Roční Expense
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,{0} {1} must be submitted,{0} {1} musí být odeslaný
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +145,Quantity must be less than or equal to {0},Množství musí být menší než nebo rovno {0}
 DocType: SMS Center,Total Characters,Celkový počet znaků
 apps/erpnext/erpnext/controllers/buying_controller.py +156,Please select BOM in BOM field for Item {0},Vyberte kusovník Bom oblasti k bodu {0}
@@ -1046,30 +1059,31 @@
 DocType: Sales Partner,Distributor,Distributor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Nákupní košík Shipping Rule
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +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 +62,Please set 'Apply Additional Discount On',Prosím nastavte na &quot;Použít dodatečnou slevu On&quot;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +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"
 DocType: Global Defaults,Global Defaults,Globální Výchozí
 apps/erpnext/erpnext/projects/doctype/project/project.py +153,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
 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 +327,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
 ,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 +362,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/stock/doctype/stock_entry/stock_entry.py +367,Finished Item {0} must be entered for Manufacture type entry,Dokončeno Položka {0} musí být zadán pro vstup typu Výroba
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Otevření účetnictví Balance
 DocType: Sales Invoice Advance,Sales Invoice Advance,Prodejní faktury Advance
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +499,Nothing to request,Nic požadovat
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +500,Nothing to request,Nic požadovat
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',"""Skutečné datum zahájení"" nemůže být větší než ""Skutečné datum ukončení"""
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Management,Řízení
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},Buď debetní nebo kreditní částka je vyžadována pro {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,Řízení
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +55,Either debit or credit amount is required for {0},Buď debetní nebo kreditní částka je vyžadována pro {0}
 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 +161,Blue,Modrý
+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
@@ -1079,12 +1093,12 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +23,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
 DocType: Stock Settings,Default Item Group,Výchozí bod Group
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1374,Do you really want to submit the invoice?,Opravdu chcete předložit fakturu?
+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 +685,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 +1526,"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 +679,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 +1550,"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/accounts/doctype/account/account_tree.js +26,"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
@@ -1104,104 +1118,106 @@
 DocType: Payment Reconciliation,Unreconciled Payment Details,Smířit platbě
 DocType: Global Defaults,Current Fiscal Year,Aktuální fiskální rok
 DocType: Global Defaults,Disable Rounded Total,Zakázat Zaoblený Celkem
-DocType: Lead,Call,Volání
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +417,'Entries' cannot be empty,"""Záznamy"" nemohou být prázdné"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +418,'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 +214,Fiscal Year {0} not found,Fiskální rok {0} nebyl nalezen
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +221,Fiscal Year {0} not found,Fiskální rok {0} nebyl nalezen
 apps/erpnext/erpnext/config/hr.py +238,Setting up Employees,Nastavení Zaměstnanci
 DocType: Sales Order,SO-,TAK-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,"Prosím, vyberte první prefix"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Please select prefix first,"Prosím, vyberte první prefix"
 DocType: Employee,O-,Ó-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Research,Výzkum
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,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 +43,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 +57,View Ledger,View Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Nejstarší
-apps/erpnext/erpnext/stock/doctype/item/item.py +504,"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 +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/setup/setup_wizard/setup_wizard.py +437,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
 ,Budget Variance Report,Rozpočet Odchylka Report
 DocType: Salary Slip,Gross Pay,Hrubé mzdy
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +90,Row {0}: Activity Type is mandatory.,Řádek {0}: typ činnosti je povinná.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +114,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/public/js/controllers/stock_controller.js +40,Accounting Ledger,Účetní Ledger
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,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
 DocType: BOM Item,Item Description,Položka Popis
+DocType: Student Sibling,Student Sibling,Student Sourozenec
 DocType: Purchase Invoice,Is Recurring,Je Opakující
 DocType: Purchase Invoice,Supplied Items,Dodávané položky
 DocType: Student,STUD.,STUD.
 DocType: Production Order,Qty To Manufacture,Množství K výrobě
+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/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 +131,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 +175,Valuation Rate required for Item in row {0},Ocenění Míra potřebná pro položku v řádku {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,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
 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 +87, to ,na
+apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,na
 DocType: Item,Lead Time in days,Čas leadu ve dnech
 ,Accounts Payable Summary,Splatné účty Shrnutí
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Not authorized to edit frozen Account {0},Není povoleno upravovat zmrazený účet {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,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 +62,Sales Order {0} is not valid,Prodejní objednávky {0} není platný
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Prodejní objednávky {0} není platný
 apps/erpnext/erpnext/setup/doctype/company/company.py +185,"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 +152,Small,Malý
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,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}
 ,Invoiced Amount (Exculsive Tax),Fakturovaná částka (bez daně)
-DocType: Student Applicant,Mother's / Guardian 1 Email ID,Matek / Guardian 1 ID e-mailu
 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 +160,Green,Zelená
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,Zelená
 DocType: Supplier,SUPP-,SUPP-
 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 +57,Contract,Smlouva
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,Smlouva
 DocType: Email Digest,Add Quote,Přidat nabídku
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +498,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 +503,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 +80,Row {0}: Qty is mandatory,Row {0}: Množství je povinný
+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 +737,Sync Master Data,Sync Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +719,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
 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
+DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Jedná se o skupinu kořen položky a nelze upravovat.
+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.
 DocType: Journal Entry Account,Purchase Order,Vydaná objednávka
 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 +345,"{0}: Employee email not found, hence email not sent","{0}: e-mail zaměstnanec nebyl nalezen, a proto je pošta neposlal"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +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
 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 +118,"For {0}, only credit accounts can be linked against another debit entry","Pro {0}, tak úvěrové účty mohou být propojeny na jinou položku debetní"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Delivery Note {0} is not submitted,Delivery Note {0} není předložena
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Delivery Note {0} is not submitted,Delivery Note {0} není předložena
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Sub-contracted Item,Položka {0} musí být Subdodavatelské Item
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Kapitálové Vybavení
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Ceny Pravidlo je nejprve vybrána na základě ""Použít na"" oblasti, které mohou být položky, položky skupiny nebo značky."
 DocType: Hub Settings,Seller Website,Prodejce Website
 DocType: Item,ITEM-,POLOŽKA-
-apps/erpnext/erpnext/controllers/selling_controller.py +147,Total allocated percentage for sales team should be 100,Celkové přidělené procento prodejní tým by měl být 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +110,Production Order status is {0},Stav výrobní zakázka je {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Celkové přidělené procento prodejní tým by měl být 100
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Stav výrobní zakázka je {0}
 DocType: Appraisal Goal,Goal,Cíl
 DocType: Sales Invoice Item,Edit Description,Upravit popis
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +757,For Supplier,Pro Dodavatele
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +723,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
@@ -1217,10 +1233,11 @@
 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
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-mail Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +445,BOM {0} does not belong to Item {1},BOM {0} nepatří k bodu {1}
 DocType: Sales Partner,Target Distribution,Target Distribution
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1667,Deafault warehouse is required for selected item,Nesplněním sklad je vyžadováno pro vybranou položku
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Deafault warehouse is required for selected item,Nesplněním sklad je vyžadováno pro vybranou položku
 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
@@ -1229,23 +1246,23 @@
 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,Žádost o cenovou nabídku dodavatele
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Hardware,Technické vybavení
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,Technické vybavení
 DocType: Sales Order,Recurring Upto,opakující Až
 DocType: Attendance,HR Manager,HR Manager
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Vyberte společnost
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Privilege Leave,Privilege Leave
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,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 +79,You need to enable Shopping Cart,Musíte povolit Nákupní košík
 DocType: Payment Entry,Writeoff,Odepsat
 DocType: Appraisal Template Goal,Appraisal Template Goal,Posouzení Template Goal
-DocType: Salary Slip,Earning,Získávání
+DocType: Salary Component,Earning,Získávání
 DocType: Purchase Invoice,Party Account Currency,Party Měna účtu
 ,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 +171,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 +174,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_data.py +358,Food,Jídlo
+apps/erpnext/erpnext/demo/setup/setup_data.py +301,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/course_schedule/course_schedule.js +103,Mark Attendence,Mark Attendence
@@ -1279,12 +1296,12 @@
 DocType: Sales Order Item,Planned Quantity,Plánované Množství
 DocType: Purchase Invoice Item,Item Tax Amount,Částka Daně Položky
 DocType: Item,Maintain Stock,Udržovat Stock
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +209,Stock Entries already created for Production Order ,Fotky Položky již vytvořené pro výrobní zakázku
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,Fotky Položky již vytvořené pro výrobní zakázku
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,Čistá změna ve stálých aktiv
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Ponechte prázdné, pokud se to považuje za všechny označení"
-apps/erpnext/erpnext/controllers/accounts_controller.py +620,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 +238,Max: {0},Max: {0}
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +15,From Datetime,Od datetime
+apps/erpnext/erpnext/controllers/accounts_controller.py +623,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 +239,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 +153,"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.
@@ -1292,8 +1309,8 @@
 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 +552,cannot be greater than 100,nemůže být větší než 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +680,Item {0} is not a stock Item,Položka {0} není skladem
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +546,cannot be greater than 100,nemůže být větší než 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,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
@@ -1307,10 +1324,9 @@
 DocType: GL Entry,GL Entry,Vstup GL
 DocType: HR Settings,Employee Settings,Nastavení zaměstnanců
 ,Batch-Wise Balance History,Batch-Wise Balance History
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Do List
 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 +61,Apprentice,Učeň
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +102,Negative Quantity is not allowed,Negativní množství není dovoleno
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,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ů"
@@ -1332,15 +1348,14 @@
 DocType: Asset,Asset Name,Asset Name
 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 +141,Source warehouse is mandatory for row {0},Source sklad je povinná pro řadu {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +719,Packing Slip,Balící list
+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 +713,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/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,Žádost o cenovou nabídku může být přístup kliknutím na následující odkaz
 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 +81,Analyst,Analytik
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,Analytik
 DocType: Item,Inventory,Inventář
 DocType: Item,Sales Details,Prodejní Podrobnosti
 DocType: Quality Inspection,QI-,QI-
@@ -1348,7 +1363,7 @@
 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 +103,Government,Vláda
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,Vláda
 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
 DocType: Company,Services,Služby
@@ -1364,6 +1379,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,Financial Year Start Date,Finanční rok Datum zahájení
 DocType: POS Profile,Apply Discount,Použít slevu
 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
 DocType: Program Course,Program Course,Program kurzu
@@ -1404,12 +1420,12 @@
 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
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +110,Accounting Entry for {0} can only be made in currency: {1},Účetní záznam pro {0} lze provádět pouze v měně: {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Účetní záznam pro {0} lze provádět pouze v měně: {1}
 DocType: Pricing Rule,Pricing Rule,Ceny Pravidlo
 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
 DocType: Shopping Cart Settings,Payment Success URL,Platba Úspěch URL
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +78,Row # {0}: Returned Item {1} does not exists in {2} {3},Řádek # {0}: vrácené položky {1} neexistuje v {2} {3}
+apps/erpnext/erpnext/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í
@@ -1418,40 +1434,39 @@
 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/stock/doctype/stock_entry/stock_entry.py +339,Not allowed to tranfer more {0} than {1} against Purchase Order {2},"Není povoleno, aby transfer více {0} než {1} proti Objednávky {2}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +344,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 +545,Manufacturing Quantity is mandatory,Výrobní množství je povinné
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Výrobní množství je povinné
 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 +71,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 +162,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/projects/doctype/timesheet/timesheet.py +186,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
 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 +130,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 +137,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
 DocType: Dependent Task,Dependent Task,Závislý Task
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,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/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 +190,Leave of type {0} cannot be longer than {1},Absence typu {0} nemůže být delší než {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +197,Leave of type {0} cannot be longer than {1},Absence typu {0} nemůže být delší než {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Zkuste plánování operací pro X dní předem.
 DocType: HR Settings,Stop Birthday Reminders,Zastavit připomenutí narozenin
 DocType: SMS Center,Receiver List,Přijímač Seznam
-apps/erpnext/erpnext/accounts/page/pos/pos.js +921,Search Item,Hledání položky
+apps/erpnext/erpnext/accounts/page/pos/pos.js +910,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 +546,Already completed,již byly dokončeny
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +22,Payment Request already exists {0},Platba Poptávka již existuje {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +550,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 +241,Quantity must not be more than {0},Množství nesmí být větší než {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Quantity must not be more than {0},Množství nesmí být větší než {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +76,Previous Financial Year is not closed,Předchozí finanční rok není uzavřen
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +44,Age (Days),Stáří (dny)
 DocType: Quotation Item,Quotation Item,Položka Nabídky
@@ -1468,7 +1483,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +221,Purchase Receipt {0} is not submitted,Doklad o koupi {0} není předložena
 DocType: Company,Default Payable Account,Výchozí Splatnost účtu
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Nastavení pro on-line nákupního košíku, jako jsou pravidla dopravu, ceník atd"
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +83,{0}% Billed,{0}% účtovano
+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
@@ -1480,12 +1495,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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/schools/doctype/fees/fees.js +22,Collect,Sbírat
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Sbírat
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,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 +225,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í
-DocType: Payment Reconciliation,Payments,Platby
 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ů
@@ -1497,7 +1511,7 @@
 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 +9,Procurement,Procurement
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,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/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
 ,Lead Details,Detaily leadu
 DocType: Purchase Invoice,End date of current invoice's period,Datum ukončení doby aktuální faktury je
@@ -1522,7 +1536,7 @@
 DocType: Purchase Invoice,Additional Discount,Další slevy
 DocType: Selling Settings,Selling Settings,Prodejní Nastavení
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Aukce online
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +97,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žství nebo ocenění Cena, nebo obojí"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +13,Fulfillment,Splnění
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Společnost, měsíc a fiskální rok je povinný"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Marketingové náklady
@@ -1543,14 +1557,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,ERPNext Setup Complete!
 DocType: Item,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +93,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Zákaznická Skupina existuje se stejným názvem, prosím změnit název zákazníka nebo přejmenujte skupinu zákazníků"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +126,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
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},Zadejte Party Party a je nutné pro pohledávky / závazky na účtu {0}
 DocType: 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
@@ -1561,7 +1574,7 @@
 ,Item-wise Sales Register,Item-moudrý Sales Register
 DocType: Asset,Gross Purchase Amount,Gross Částka nákupu
 DocType: Asset,Depreciation Method,odpisy Metoda
-apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Offline,Offline
+apps/erpnext/erpnext/accounts/page/pos/pos.js +686,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ý
@@ -1579,25 +1592,27 @@
 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
 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 +858,Make Purchase Order,Proveďte objednávky
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +852,Make Purchase Order,Proveďte objednávky
 DocType: SMS Center,Send To,Odeslat
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,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 +148,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
 DocType: Stock Reconciliation,Stock Reconciliation,Reklamní Odsouhlasení
 DocType: Territory,Territory Name,Území Name
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +172,Work-in-Progress Warehouse is required before Submit,Work-in-Progress sklad je zapotřebí před Odeslat
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,Work-in-Progress Warehouse is required before Submit,Work-in-Progress sklad je zapotřebí před Odeslat
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Žadatel o zaměstnání.
 DocType: Purchase Order Item,Warehouse and Reference,Sklad a reference
 DocType: Supplier,Statutory info and other general information about your Supplier,Statutární info a další obecné informace o váš dodavatel
-apps/erpnext/erpnext/hooks.py +88,Addresses,Adresy
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Dodavatel&gt; Dodavatel Type
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +212,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/hooks.py +95,Addresses,Adresy
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +215,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
 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,Dodat a Bill
@@ -1605,11 +1620,10 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,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 +731,Payment,Platba
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,Payment,Platba
 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: Pricing Rule,Brand,Značka
 DocType: Course,Course Abbreviation,Zkratka hřiště
 DocType: Item,Will also apply for variants,Bude platit i pro varianty
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +142,"Asset cannot be cancelled, as it is already {0}","Asset nelze zrušit, protože je již {0}"
@@ -1621,7 +1635,7 @@
 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í."
 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 +85,Associate,Spolupracovník
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,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
@@ -1629,7 +1643,7 @@
 DocType: Production Planning Tool,Material Requests,materiál Žádosti
 DocType: Warranty Claim,Issue Date,Datum vydání
 DocType: Activity Cost,Activity Cost,Náklady Aktivita
-DocType: Timesheet Detail,Timesheet Detail,časového rozvrhu Detail
+DocType: Sales Invoice Timesheet,Timesheet Detail,časového rozvrhu Detail
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Spotřeba Množství
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekomunikace
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Označuje, že balíček je součástí této dodávky (Pouze návrhu)"
@@ -1652,6 +1666,7 @@
 DocType: Production Plan Material Request,Material Request Date,Materiál Request Date
 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
 DocType: Item,Has Variants,Má varianty
 DocType: Monthly Distribution,Name of the Monthly Distribution,Název měsíční výplatou
 DocType: Sales Person,Parent Sales Person,Parent obchodník
@@ -1664,31 +1679,32 @@
 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 +44,"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/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."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +502,Error: {0} &gt; {1},Chyba: {0}&gt; {1}
 DocType: Item,Is Sales Item,Je Sales Item
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Položka Group Tree
 apps/erpnext/erpnext/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."
 DocType: Naming Series,Current Value,Current Value
-apps/erpnext/erpnext/controllers/accounts_controller.py +235,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/controllers/accounts_controller.py +238,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
 DocType: Delivery Note Item,Against Sales Order,Proti přijaté objednávce
 ,Serial No Status,Serial No Status
 DocType: Payment Entry Reference,Outstanding,Vynikající
 ,Daily Timesheet Summary,Denní časový rozvrh Souhrn
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +458,Item table can not be blank,Tabulka Položka nemůže být prázdný
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +443,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}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +5,This is based on stock movement. See {0} for details,To je založeno na akciovém pohybu. Viz {0} Podrobnosti
 DocType: Pricing Rule,Selling,Prodejní
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +341,Amount {0} {1} deducted against {2},Množství {0} {1} odečíst proti {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +344,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
@@ -1703,8 +1719,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +144,Cannot refer row number greater than or equal to current row number for this Charge type,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 +159,Red,Červená
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Prosím, klikněte na ""Generovat Schedule"", aby přinesla Pořadové číslo přidán k bodu {0}"
+apps/erpnext/erpnext/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
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Základna Částka (Company měna)
@@ -1712,7 +1728,7 @@
 DocType: Installation Note,Installation Time,Instalace Time
 DocType: Sales Invoice,Accounting Details,Účetní detaily
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,Odstraňte všechny transakce pro tuto společnost
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +187,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Row # {0}: Operation {1} není dokončen {2} Množství hotových výrobků ve výrobním procesu objednávky # {3}. Prosím aktualizujte provozní stav přes čas protokoly
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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,Row # {0}: Operation {1} není dokončen {2} Množství hotových výrobků ve výrobním procesu objednávky # {3}. Prosím aktualizujte provozní stav přes čas protokoly
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,Investice
 DocType: Issue,Resolution Details,Rozlišení Podrobnosti
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,alokace
@@ -1748,16 +1764,17 @@
 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}
 DocType: Delivery Note,Excise Page Number,Spotřební Číslo stránky
 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}
 ,Maintenance Schedules,Plány údržby
 DocType: Task,Actual End Date (via Time Sheet),Skutečné datum ukončení (přes Time Sheet)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Amount {0} {1} against {2} {3},Množství {0} {1} na {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +339,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 +138,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 +295,Debit To account must be a Receivable account,"Debetní Chcete-li v úvahu, musí být pohledávka účet"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Receivable account,"Debetní Chcete-li v úvahu, musí být pohledávka účet"
 DocType: Shipping Rule Condition,Shipping Amount,Částka - doprava
 ,Pending Amount,Čeká Částka
 DocType: Purchase Invoice Item,Conversion Factor,Konverzní faktor
@@ -1765,10 +1782,10 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +137,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í"
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +90,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Celkové přidělené listy {0} nemůže být nižší než již schválených listy {1} pro období
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +93,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 +22,Enter Paid Amount,Vstup do zaplacená částka
+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
@@ -1778,13 +1795,15 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,Timesheets
 DocType: HR Settings,HR Settings,Nastavení HR
 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 +524,"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."
+apps/erpnext/erpnext/controllers/accounts_controller.py +527,"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 +249,Abbr can not be blank or space,Zkrácená nemůže být prázdné nebo prostor
 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,Studentské Sourozenci
 apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,Jednotka
 apps/erpnext/erpnext/stock/get_item_details.py +123,Please specify Company,"Uveďte prosím, firmu"
 ,Customer Acquisition and Loyalty,Zákazník Akvizice a loajality
@@ -1795,17 +1814,19 @@
 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 +183,Closing (Opening + Totals),Uzavření (Otevření + součty)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),Uzavření (Otevření + součty)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,"Uveďte prosím měnu, ve společnosti"
 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/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Následující materiál žádosti byly automaticky zvýšena na základě úrovni re-pořadí položky
-apps/erpnext/erpnext/controllers/accounts_controller.py +272,Account {0} is invalid. Account Currency must be {1},Účet {0} je neplatný. Měna účtu musí být {1}
+DocType: Email Digest,Pending Sales Orders,Čeká Prodejní objednávky
+apps/erpnext/erpnext/controllers/accounts_controller.py +275,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 +956,"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 Slip,Deduction,Dedukce
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +87,Row {0}: From Time and To Time is mandatory.,Řádek {0}: From Time a na čas je povinná.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +969,"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 +111,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 +262,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 +7,Please enter Employee Id of this sales person,"Prosím, zadejte ID zaměstnance z tohoto prodeje osoby"
@@ -1813,7 +1834,7 @@
 DocType: Project,% Tasks Completed,% splněných úkolů
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,Rozdíl Částka musí být nula
 DocType: Project,Gross Margin,Hrubá marže
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +194,Please enter Production Item first,"Prosím, zadejte první výrobní položku"
+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é
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Nabídka
@@ -1822,53 +1843,54 @@
 DocType: Maintenance Visit,Maintenance User,Údržba uživatele
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +149,Cost Updated,Náklady Aktualizováno
 DocType: Employee,Date of Birth,Datum narození
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +86,Item {0} has already been returned,Bod {0} již byla vrácena
+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}
+DocType: Student Admission,Eligibility,Způsobilost
 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 +177,Job Description,Popis Práce
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,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 +126,"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 +127,"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."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +24,Welcome to POS: Create your POS Profile,Vítejte na POS: Vytvořte si svůj profil POS
 DocType: Expense Claim,Approver,Schvalovatel
 ,SO Qty,SO Množství
+DocType: Guardian,Work Address,pracovní adresa
 DocType: Appraisal,Calculate Total Score,Vypočítat Celková skóre
 DocType: Request for Quotation,Manufacturing Manager,Výrobní ředitel
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Pořadové číslo {0} je v záruce aľ {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +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 +74,Shipments,Zásilky
+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
 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 +153,Row # ,Řádek č.
+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 +156,Get From,Získat Z
+apps/erpnext/erpnext/public/js/utils.js +167,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 +167,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 +416,"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í"
+apps/erpnext/erpnext/controllers/accounts_controller.py +419,"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
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} is disabled,Uživatel {0} je zakázána
 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 ...
 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 +171,"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 +346,{0} is mandatory for Item {1},{0} je povinná k položce {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,{0} is mandatory for Item {1},{0} je povinná k položce {1}
 DocType: Currency Exchange,From Currency,Od Měny
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Prosím, vyberte alokovaná částka, typ faktury a číslo faktury v aspoň jedné řadě"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,Náklady na nový nákup
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},Prodejní objednávky potřebný k bodu {0}
 DocType: Purchase Invoice Item,Rate (Company Currency),Cena (Měna Společnosti)
-apps/erpnext/erpnext/demo/setup_data.py +360,Others,Ostatní
+DocType: Student Guardian,Others,Ostatní
 DocType: Payment Entry,Unallocated Amount,nepřidělené Částka
 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
@@ -1888,17 +1910,16 @@
 apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,Serialized Zásoby
 DocType: Activity Type,Default Billing Rate,Výchozí fakturace Rate
 DocType: Sales Invoice,Total Billing Amount,Celková částka fakturace
-apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +54,Receivable Account,Účet pohledávky
-apps/erpnext/erpnext/controllers/accounts_controller.py +546,Row #{0}: Asset {1} is already {2},Řádek # {0}: Asset {1} je již {2}
+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 +549,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 +79,CEO,výkonný ředitel
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,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 +808,Please select correct account,"Prosím, vyberte správný účet"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +809,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
-DocType: Purchase Invoice Item,Page Break,Zalomení stránky
 DocType: Production Order Operation,Pending,Až do
 DocType: Course,Course Name,Název kurzu
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Uživatelé, kteří si vyhoví žádosti konkrétního zaměstnance volno"
@@ -1907,14 +1928,15 @@
 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 +54,Full-time,Na plný úvazek
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,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: Student,Guardians,Guardians
 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 +289,Debit To is required,Debetní K je vyžadováno
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +321,Debit To is required,Debetní K je vyžadováno
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Nákupní Ceník
 DocType: Offer Letter Term,Offer Term,Nabídka Term
 DocType: Quality Inspection,Quality Manager,Manažer kvality
@@ -1922,6 +1944,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é nezaplacené: {0}
 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
@@ -1932,18 +1955,17 @@
 DocType: Production Order Operation,Completed Qty,Dokončené Množství
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"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 +273,Price List {0} is disabled,Ceník {0} je zakázána
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +99,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/projects/doctype/timesheet/timesheet.py +123,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
 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}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Aktuální ocenění Rate
 DocType: Item,Customer Item Codes,Zákazník Položka Kódy
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,Exchange zisk / ztráta
 DocType: Opportunity,Lost Reason,Důvod ztráty
-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/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/purchase_receipt/purchase_receipt.py +378,All items have already been invoiced,Všechny položky již byly fakturovány
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +379,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í
@@ -1959,18 +1981,19 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Vaši Zákazníci
 apps/erpnext/erpnext/projects/doctype/project/project.py +141,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/job_opening.html +19,Apply Now,Použít teď
+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."
 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
-apps/erpnext/erpnext/utilities/doctype/address/address.py +164,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: Fee Structure,Fee Structure,Struktura poplatků
 DocType: Timesheet Detail,Costing Amount,Kalkulace Částka
+DocType: Student Admission,Application Fee,poplatek za podání žádosti
 DocType: Process Payroll,Submit Salary Slip,Odeslat výplatní pásce
-apps/erpnext/erpnext/controllers/selling_controller.py +161,Maxiumm discount for Item {0} is {1}%,Maxiumm sleva na položky {0} {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,Maxiumm sleva na položky {0} {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Dovoz hromadnou
 DocType: Sales Partner,Address & Contacts,Adresa a kontakty
 DocType: SMS Log,Sender Name,Jméno odesílatele
@@ -1995,21 +2018,21 @@
 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_data.py +361,Travel,Cestování
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +155,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 +304,Travel,Cestování
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +167,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 +23,Update Cost,Aktualizace Cost
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Aktualizace Cost
 DocType: Item Reorder,Item Reorder,Položka Reorder
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +36,Show Salary Slip,Show výplatní pásce
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +748,Transfer Material,Přenos materiálu
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +53,Show Salary Slip,Show výplatní pásce
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +166,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 +923,Please set recurring after saving,Prosím nastavte opakující se po uložení
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +646,Select change amount account,Vybrat změna výše účet
+apps/erpnext/erpnext/public/js/controllers/transaction.js +914,Please set recurring after saving,Prosím nastavte opakující se po uložení
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +703,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
@@ -2021,31 +2044,32 @@
 DocType: Quality Inspection,Verified By,Verified By
 DocType: Address,Subsidiary,Dceřiný
 apps/erpnext/erpnext/setup/doctype/company/company.py +64,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","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: Quality Inspection,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 +33,Traceability,sledovatelnost
 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 +352,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Množství v řadě {0} ({1}), musí být stejné jako množství vyrobené {2}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Množství v řadě {0} ({1}), musí být stejné jako množství vyrobené {2}"
 DocType: Appraisal,Employee,Zaměstnanec
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Pozvat jako Uživatel
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} je plně fakturováno
 DocType: Workstation Working Hour,End Time,End Time
 DocType: Payment Entry,Payment Deductions or Loss,Platební srážky nebo ztráta
-apps/erpnext/erpnext/config/schools.py +100,LMS,LMS
+apps/erpnext/erpnext/config/schools.py +104,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/config/crm.py +6,Sales Pipeline,prodejní Pipeline
 DocType: Student Batch Student,Student Batch Student,Student Batch Student
-DocType: Sales Invoice,Mass Mailing,Hromadné emaily
+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 +199,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/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 +297,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 +111,Pharmaceutical,Farmaceutické
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +309,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/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:
@@ -2060,27 +2084,28 @@
 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 +814,Please specify Company to proceed,Uveďte prosím společnost pokračovat
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +793,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 +44,Compensatory Off,Vyrovnávací Off
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,Vyrovnávací Off
 DocType: Quality Inspection Reading,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."
 DocType: Room,Room Number,Číslo pokoje
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Neplatná reference {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +161,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},"{0} ({1}) nemůže být větší, než plánované množství ({2}), ve výrobní objednávce {3}"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +162,{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 +217,Raw Materials cannot be blank.,Suroviny nemůže být prázdný.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,"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 +460,Quick Journal Entry,Rychlý vstup Journal
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +111,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/accounts/doctype/sales_invoice/sales_invoice.py +441,"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 +450,Quick Journal Entry,Rychlý vstup Journal
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +103,You can not change rate if BOM mentioned agianst any item,"Nemůžete změnit sazbu, kdyby BOM zmínil agianst libovolné položky"
 DocType: Employee,Previous Work Experience,Předchozí pracovní zkušenosti
 DocType: Stock Entry,For Quantity,Pro Množství
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +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 +214,{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.
+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.
@@ -2089,16 +2114,17 @@
 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 +398,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ří"
 ,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 +739,Item or Warehouse for row {0} does not match Material Request,Položka nebo Warehouse na řádku {0} neodpovídá Materiál Poptávka
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +747,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
 DocType: Fiscal Year,Year End Date,Datum Konce Roku
 DocType: Task Depends On,Task Depends On,Úkol je závislá na
-DocType: Lead,Opportunity,Příležitost
+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
@@ -2111,7 +2137,7 @@
 DocType: Student,Joining Date,Datum připojení
 ,Employees working on a holiday,Zaměstnanci pracující na dovolenou
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Mark Současnost
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},Datum zahájení údržby nemůže být před datem dodání pro pořadové číslo {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},Datum zahájení údržby nemůže být před datem dodání pro pořadové číslo {0}
 DocType: Production Order,Actual End Date,Skutečné datum ukončení
 DocType: Purchase Invoice,PINV-,PINV-
 DocType: Authorization Rule,Applicable To (Role),Vztahující se na (Role)
@@ -2126,7 +2152,7 @@
 DocType: SMS Log,No of Requested SMS,Počet žádaným SMS
 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 +729,Please supply the specified items at the best possible rates,Prosím dodávat uvedené položky na nejlepší možné ceny
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +695,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 +117,Contract End Date must be greater than Date of Joining,Smlouva Datum ukončení musí být větší než Datum spojování
 DocType: Delivery Note,DN-,DN-
@@ -2135,7 +2161,7 @@
 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 +14,This is an example website auto-generated from ERPNext,To je příklad webové stránky automaticky generované z ERPNext
+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
 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.
 
@@ -2182,13 +2208,14 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd Množství
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +54,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 +103,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 +504,Stock Entry {0} is not submitted,Sklad Entry {0} není předložena
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Nelze produkují více položku {0} než prodejní objednávky množství {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +505,Stock Entry {0} is not submitted,Sklad Entry {0} není předložena
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / Peněžní účet
 DocType: Tax Rule,Billing City,Fakturace City
 DocType: Salary Component Account,Salary Component Account,Účet plat Component
 DocType: Global Defaults,Hide Currency Symbol,Skrýt symbol měny
 apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card","např. banka, hotovost, kreditní karty"
+DocType: Lead Source,Source Name,Název zdroje
 DocType: Journal Entry,Credit Note,Dobropis
 DocType: Warranty Claim,Service Address,Servisní adresy
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furnitures and Fixtures,Nábytek a svítidla
@@ -2200,6 +2227,7 @@
 DocType: Opportunity,Customer / Lead Name,Zákazník / Lead Name
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +89,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/controllers/trends.py +19,Total(Qty),Total (ks)
 DocType: Sales Invoice,This Document,Tento dokument
@@ -2211,15 +2239,15 @@
 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 +176,Organization branch master.,Organizace větev master.
-apps/erpnext/erpnext/controllers/accounts_controller.py +273, or ,nebo
+apps/erpnext/erpnext/controllers/accounts_controller.py +276, or ,nebo
 DocType: Sales Order,Billing Status,Status Fakturace
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Nahlásit problém
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,Utility Náklady
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90 Nad
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +203,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Řádek # {0}: Journal Entry {1} nemá účet {2} nebo již uzavřeno proti jinému poukazu
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +206,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 +90,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 +93,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
@@ -2247,8 +2275,8 @@
 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/hr/doctype/leave_allocation/leave_allocation.py +115,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 +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Plán údržby není generován pro všechny položky. Prosím, klikněte na ""Generovat Schedule"""
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +118,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 +163,"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"
@@ -2260,13 +2288,13 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +32,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 +748,Delivery,Dodávka
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +742,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
 DocType: Payment Entry,Total Allocated Amount,Celková alokovaná částka
 DocType: Item Reorder,Material Request Type,Materiál Typ požadavku
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +82,Row {0}: UOM Conversion Factor is mandatory,Řádek {0}: UOM Konverzní faktor je povinné
+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
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Voucher #
@@ -2277,13 +2305,13 @@
 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 +90,Head of Marketing and Sales,Vedoucí marketingu a prodeje
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Daň z příjmů
+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 +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.
 DocType: Item Supplier,Item Supplier,Položka Dodavatel
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +403,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 +770,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 +397,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 +764,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"
@@ -2295,28 +2323,29 @@
 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 +100,Issues,Problémy
+apps/erpnext/erpnext/hooks.py +109,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}
 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,Student Přijímací
 apps/erpnext/erpnext/accounts/party.py +345,{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 +155,Extra Large,Extra Velké
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Extra Large,Extra Velké
 ,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 +507,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 +107,Local,Místní
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +508,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/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 +154,Large,Velký
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Large,Velký
 DocType: Homepage Featured Product,Homepage Featured Product,Úvodní Doporučené zboží
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Nový sklad Name
-apps/erpnext/erpnext/accounts/report/financial_statements.py +225,Total {0} ({1}),Celkem {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +224,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í
@@ -2374,9 +2403,9 @@
 DocType: Attendance,Leave Type,Typ absence
 apps/erpnext/erpnext/controllers/stock_controller.py +173,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/hr/doctype/salary_slip/salary_slip.py +79,Name error: {0},Název chyba: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +90,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 +178,{0} {1} does not associated with {2} {3},{0} {1} není spojeno s {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +181,{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)
 DocType: Warehouse,Parent Warehouse,Parent Warehouse
@@ -2395,7 +2424,7 @@
 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 +109,Atleast one item should be entered with negative quantity in return document,Aspoň jedna položka by měla být zadána s negativním množství ve vratném dokumentu
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Atleast one item should be entered with negative quantity in return document,Aspoň jedna položka by měla být zadána s negativním množství ve vratném dokumentu
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Provoz {0} déle, než všech dostupných pracovních hodin v pracovní stanici {1}, rozložit provoz do několika operací"
 ,Requested,Požadované
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +83,No Remarks,Žádné poznámky
@@ -2407,46 +2436,46 @@
 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/stock/doctype/purchase_receipt/purchase_receipt.py +98,Quality Inspection required for Item {0},Kontrola kvality potřebný k bodu {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,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
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Správa Territory strom.
 DocType: Journal Entry Account,Sales Invoice,Prodejní faktury
 DocType: Journal Entry Account,Party Balance,Balance Party
-apps/erpnext/erpnext/accounts/page/pos/pos.js +475,Please select Apply Discount On,"Prosím, vyberte Použít Sleva na"
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +92,Salary Slip Created,Plat Slip Vytvořeno
+apps/erpnext/erpnext/accounts/page/pos/pos.js +464,Please select Apply Discount On,"Prosím, vyberte Použít Sleva na"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +95,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
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,Sleva v procentech lze použít buď proti Ceníku nebo pro všechny Ceníku.
 DocType: Purchase Invoice,Half-yearly,Pololetní
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +384,Accounting Entry for Stock,Účetní položka na skladě
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +387,Accounting Entry for Stock,Účetní položka na skladě
 DocType: Sales Invoice,Sales Team1,Sales Team1
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,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 +96,Row {0}: Completed Qty must be greater than zero.,Řádek {0}: Dokončené množství musí být větší než nula.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +120,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 +88,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/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í
 DocType: Item Group,Show this slideshow at the top of the page,Zobrazit tuto prezentaci v horní části stránky
 DocType: BOM,Item UOM,Položka UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Částka daně po slevě Částka (Company měny)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +147,Target warehouse is mandatory for row {0},Target sklad je povinná pro řadu {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +141,Target warehouse is mandatory for row {0},Target sklad je povinná pro řadu {0}
 DocType: Cheque Print Template,Primary Settings,primární Nastavení
 DocType: Purchase Invoice,Select Supplier Address,Vybrat Dodavatel Address
 DocType: Quality Inspection,Quality Inspection,Kontrola kvality
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Extra Small,Extra Malé
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +194,Account {0} is frozen,Účet {0} je zmrazen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Extra Malé
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +690,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 +197,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 +606,Can only make payment against unbilled {0},Lze provést pouze platbu proti nevyfakturované {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +126,Commission rate cannot be greater than 100,Rychlost Komise nemůže být větší než 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +609,Can only make payment against unbilled {0},Lze provést pouze platbu proti nevyfakturované {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,Rychlost Komise nemůže být větší než 100
 DocType: Stock Entry,Subcontract,Subdodávka
 apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,"Prosím, zadejte {0} jako první"
 DocType: Production Order Operation,Actual End Time,Aktuální End Time
@@ -2457,30 +2486,30 @@
 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 +158,Colour,Barevné
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,Barevné
 DocType: Maintenance Visit,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"
 DocType: Student Log,Academic,Akademický
-apps/erpnext/erpnext/controllers/accounts_controller.py +469,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Celková záloha ({0}) na objednávku {1} nemůže být větší než celkový součet ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +472,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Celková záloha ({0}) na objednávku {1} nemůže být větší než celkový součet ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Vyberte měsíční výplatou na nerovnoměrně distribuovat cílů napříč měsíců.
 DocType: Purchase Invoice Item,Valuation Rate,Ocenění Rate
+DocType: Stock Reconciliation,SR/,SR /
 apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,Ceníková Měna není zvolena
 DocType: Assessment,Results,výsledky
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +168,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 +175,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: Student Applicant,Father's/ Guardian 2 Email ID,Otcův / Guardian 2 ID e-mailu
 DocType: Maintenance Visit Purpose,Against Document No,Proti dokumentu č
 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 +228,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 +231,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/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 +93,Researcher,Výzkumník
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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.
@@ -2492,25 +2521,25 @@
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Pro pohodlí zákazníků, tyto kódy mohou být použity v tiskových formátech, jako na fakturách a dodacích listech"
 DocType: Sales Invoice,Time Sheet List,Doba Seznam Sheet
 DocType: Employee,You can enter any date manually,Můžete zadat datum ručně
-DocType: Sales Invoice,Advertisement,Reklama
 DocType: Asset Category Account,Depreciation Expense Account,Odpisy Náklady účtu
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Probationary Period,Zkušební doba
-apps/erpnext/erpnext/hooks.py +102,Announcements,oznámení
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Zkušební doba
+apps/erpnext/erpnext/hooks.py +111,Announcements,oznámení
 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 +109,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 +16,To Datetime,Chcete-li datetime
+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/scheduling_tool/scheduling_tool.py +51,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/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Nevyřízené Aktivity
+DocType: Accounts Settings,Make Payment via Journal Entry,Provést platbu přes Journal Entry
+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 +127,Please enter relieving date.,Zadejte zmírnění datum.
-apps/erpnext/erpnext/controllers/trends.py +145,Amt,Amt
+apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,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 +26,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ň"
@@ -2528,14 +2557,15 @@
 apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1},Nepodařilo se najít kurz pro {0} do {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Mark Půldenní
 DocType: Sales Invoice,Sales Team,Prodejní tým
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Duplicate entry,Duplicitní záznam
+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 +490,[Error],[Chyba]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +484,[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
 apps/erpnext/erpnext/controllers/status_updater.py +175,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.
 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
@@ -2551,22 +2581,22 @@
 ,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 +25,All Jobs,Všechny Jobs
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,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
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Amount {0} {1} {2} {3},Množství {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Amount {0} {1} {2} {3},Množství {0} {1} {2} {3}
 DocType: Account,Depreciation,Znehodnocení
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Dodavatel (é)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Docházky zaměstnanců Tool
 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 +372,Payment Entries {0} are un-linked,Platební Příspěvky {0} jsou un-spojený
+apps/erpnext/erpnext/accounts/utils.py +449,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í
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +497,Material Requests {0} created,Materiál Žádosti {0} vytvořené
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +498,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.
 DocType: Purchase Invoice,Address and Contact,Adresa a Kontakt
@@ -2605,7 +2635,7 @@
 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 +848,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 +859,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 +233,Closing (Dr),Uzavření (Dr)
 DocType: Cheque Print Template,Cheque Size,Šek Velikost
@@ -2626,7 +2656,8 @@
 ,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.
-apps/erpnext/erpnext/controllers/accounts_controller.py +555,'Update Stock' cannot be checked for fixed asset sale,&quot;Aktualizace Sklad&quot; nemohou být kontrolovány na pevnou prodeji majetku
+DocType: Student Guardian,Father,Otec
+apps/erpnext/erpnext/controllers/accounts_controller.py +558,'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í
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Získat aktualizace
 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
@@ -2636,15 +2667,15 @@
 DocType: Sales Order,Fully Delivered,Plně Dodáno
 DocType: Lead,Lower Income,S nižšími příjmy
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","Účet hlavu pod odpovědnosti, ve kterém se bude Zisk / ztráta rezervovali"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +166,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 +238,"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 +81,Purchase Order number required for Item {0},Číslo vydané objednávky je potřebné k položce {0}
+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/purchase_receipt/purchase_receipt.py +82,Purchase Order number required for Item {0},Číslo vydané objednávky je potřebné k položce {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""Datum DO"" musí být po ""Datum OD"""
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +17,Cannot change status as student {0} is linked with student application {1},Nemůže změnit statut studenta {0} je propojen s aplikací studentské {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +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: Timesheet,"List of employee which has ""Salary Slip Based on Timesheet"" is enabled in salary structure.","Seznam zaměstnance, který má &quot;výplatní pásce na časový rozvrh based&quot; je povoleno v platové struktuře."
 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 +356,Customer {0} does not belong to project {1},Zákazník {0} nepatří k projektu {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,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
 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
@@ -2656,7 +2687,7 @@
 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/patches/v7_0/create_warehouse_nestedset.py +55,All Warehouses,Všechny Sklady
+apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,Všechny Sklady
 DocType: Sales Partner,Retailer,Maloobchodník
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,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
@@ -2668,10 +2699,10 @@
 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/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Vytvořit výplatní pásku
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +26,Browse BOM,Procházet kusovník
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,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/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 Year,Academic Year,Akademický rok
+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
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,Ocenění
@@ -2679,12 +2710,12 @@
 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 +197,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 +204,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: Workstation Working Hour,Start Time,Start Time
 DocType: Item Price,Bulk Import Help,Bulk import Help
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +256,Select Quantity,Zvolte množství
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +257,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
@@ -2701,6 +2732,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Buď cílové množství nebo cílová částka je povinná.
 apps/erpnext/erpnext/config/projects.py +45,Cost of various activities,Náklady na různých aktivit
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Nastavení událostí do {0}, protože zaměstnanec připojena k níže prodejcům nemá ID uživatele {1}"
+DocType: Timesheet,Billing Details,fakturační údaje
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +149,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}
 DocType: Item,Inspection Required,Kontrola Povinné
@@ -2720,7 +2752,7 @@
 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 +138,Wire Transfer,Bankovní převod
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,Bankovní převod
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Zkontrolovat vše
 DocType: Sales Order,Recurring Order,Opakující se objednávky
 DocType: Company,Default Income Account,Účet Default příjmů
@@ -2732,21 +2764,19 @@
 ,Welcome to ERPNext,Vítejte na ERPNext
 apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,Lead na nabídku
 DocType: Lead,From Customer,Od Zákazníka
-apps/erpnext/erpnext/demo/setup_data.py +357,Calls,Volá
+apps/erpnext/erpnext/demo/setup/setup_data.py +300,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/stock/doctype/item/item.py +466,"As there are existing transactions for this item, \
-							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Stejně jako existují nějaké transakce pro tuto položku, \ nelze změnit hodnoty &quot;Má pořadové číslo&quot;, &quot;má Batch Ne &#39;,&#39; Je skladem&quot; a &quot;ocenění Method&quot;"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,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/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 +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Poznámka: Systém nebude kontrolovat přes dobírku a over-rezervace pro item {0} jako množství nebo částka je 0
 DocType: Notification Control,Quotation Message,Zpráva Nabídky
 DocType: Issue,Opening Date,Datum otevření
-apps/erpnext/erpnext/schools/api.py +58,Attendance has been marked successfully.,Účast byla úspěšně označena.
+apps/erpnext/erpnext/schools/api.py +57,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 +136,Account Type for {0} must be {1},Typ účtu pro {0} musí být {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +139,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
@@ -2761,12 +2791,13 @@
 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/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 +20,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 +1190,Please select customer,Vyberte zákazníka
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1193,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
@@ -2776,6 +2807,7 @@
 ,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 +50,Missing Currency Exchange Rates for {0},Chybí Směnárna Kurzy pro {0}
 DocType: Assessment,Examiner,Zkoušející
+DocType: Student,Siblings,sourozenci
 DocType: Journal Entry,Stock Entry,Reklamní Entry
 DocType: Payment Entry,Payment References,Platební Reference
 DocType: C-Form,C-FORM-,C-form-
@@ -2793,11 +2825,12 @@
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Název tématu
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Aspoň jeden z prodeje nebo koupě musí být zvolena
+DocType: Grading Structure,Grade Intervals,grade Intervaly
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Vyberte podstatu svého podnikání.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,"Tam, kde jsou výrobní operace prováděny."
 DocType: Asset Movement,Source Warehouse,Zdroj Warehouse
 DocType: Installation Note,Installation Date,Datum instalace
-apps/erpnext/erpnext/controllers/accounts_controller.py +534,Row #{0}: Asset {1} does not belong to company {2},Řádek # {0}: {1} Asset nepatří do společnosti {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +537,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
@@ -2811,28 +2844,31 @@
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,K dispozici šarže Množství 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 +111,Date Of Retirement must be greater than Date of Joining,"Datum odchodu do důchodu, musí být větší než Datum spojování"
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +49,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 +87,{0}% Delivered,{0}% dodáno
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% dodáno
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Položka {0}: Objednané množství {1} nemůže být nižší než minimální Objednané množství {2} (definované v bodu).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Měsíční Distribution Procento
 DocType: Territory,Territory Targets,Území Cíle
 DocType: Delivery Note,Transporter Info,Transporter Info
-apps/erpnext/erpnext/accounts/utils.py +379,Please set default {0} in Company {1},Prosím nastavit výchozí {0} ve firmě {1}
+apps/erpnext/erpnext/accounts/utils.py +456,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
 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.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Tituly na tiskových šablon, např zálohové faktury."
+DocType: Student Guardian,Student Guardian,Student Guardian
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +184,Valuation type charges can not marked as Inclusive,Poplatky typu ocenění může není označen jako Inclusive
 DocType: POS Profile,Update Stock,Aktualizace skladem
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Různé UOM položky povede k nesprávné (celkem) Čistá hmotnost hodnoty. Ujistěte se, že čistá hmotnost každé položky je ve stejném nerozpuštěných."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
 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 +349,Journal Entries {0} are un-linked,Zápisů {0} jsou un-spojený
+apps/erpnext/erpnext/accounts/utils.py +426,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"
@@ -2856,6 +2892,7 @@
 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,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ě
@@ -2864,7 +2901,7 @@
 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 +29,Current Job Openings,Aktuální pracovní příležitosti
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,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
@@ -2877,7 +2914,7 @@
 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 +850,Show tax break-up,Show daň break-up
+apps/erpnext/erpnext/public/js/controllers/transaction.js +841,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/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"
@@ -2887,10 +2924,11 @@
 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 +534,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 +80,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 +162,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/selling/doctype/customer/customer.py +195,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 +5,This is based on the attendance of this Student,To je založeno na účasti tohoto studenta
@@ -2899,12 +2937,11 @@
 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 +75,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 +138,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/hr/doctype/leave_application/leave_application.py +145,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: Program Enrollment Fee,Program Enrollment Fee,Program zápisné
 DocType: Item,Supplier Items,Dodavatele položky
 DocType: Opportunity,Opportunity Type,Typ Příležitosti
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,Nová společnost
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,Cost Center is required for 'Profit and Loss' account {0},"Nákladové středisko je vyžadováno pro účet ""výkaz zisku a ztrát"" {0}"
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Transakce mohou být vymazány pouze tvůrce Společnosti
 apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,Nesprávný počet hlavní knihy záznamů nalezen. Pravděpodobně jste zvolili nesprávný účet v transakci.
 DocType: Cheque Print Template,Cheque Width,Šek Šířka
@@ -2913,16 +2950,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,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/manufacturing/doctype/production_order/production_order.js +128,Timesheet,Rozvrh hodin
-apps/erpnext/erpnext/controllers/accounts_controller.py +228,{0} '{1}' is disabled,{0} '{1}' je vypnuté
+apps/erpnext/erpnext/controllers/accounts_controller.py +231,{0} '{1}' is disabled,{0} '{1}' je vypnuté
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Nastavit jako Otevřít
 DocType: Cheque Print Template,Scanned Cheque,skenovaných Šek
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Posílat automatické e-maily na Kontakty na předložení transakcí.
+DocType: Timesheet,Total Billable Amount,Celková částka Zúčtovatelná
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Položka 3
 DocType: Purchase Order,Customer Contact Email,Zákazník Kontaktní e-mail
 DocType: Warranty Claim,Item and Warranty Details,Položka a Záruka Podrobnosti
 DocType: Sales Team,Contribution (%),Příspěvek (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Poznámka: Položka Platba nebude vytvořili, protože ""v hotovosti nebo bankovním účtu"" nebyl zadán"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Responsibilities,Odpovědnost
+apps/erpnext/erpnext/controllers/accounts_controller.py +78,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
 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
@@ -2930,6 +2968,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Přidat uživatele
 DocType: Pricing Rule,Item Group,Položka Group
 DocType: Item,Safety Stock,bezpečnostní Sklad
+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: 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)
@@ -2939,7 +2978,6 @@
 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: Timesheet,Total Hours,Celkem hodin
 DocType: Journal Entry,Printing Settings,Tisk Nastavení
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,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ý
@@ -2952,13 +2990,14 @@
 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 +71,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
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Customer&gt; Customer Group&gt; Území
 DocType: Purchase Invoice Item,Rate,Cena
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Intern,Internovat
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,Internovat
 DocType: Stock Entry,From BOM,Od BOM
 DocType: Assessment,Assessment Code,Kód Assessment
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +32,Basic,Základní
+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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Prosím, klikněte na ""Generovat Schedule"""
+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 +95,Reference No is mandatory if you entered Reference Date,"Referenční číslo je povinné, pokud jste zadali k rozhodnému dni"
@@ -2967,11 +3006,11 @@
 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 +752,Issue Material,Vydání Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +723,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 +683,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 +665,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íť."
 DocType: Hub Settings,Access Token,Přístupový Token
 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
@@ -2979,33 +3018,35 @@
 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 +1122,Enter value must be positive,Zadejte hodnota musí být kladná
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,All Territories,Všechny území
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1125,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í
 DocType: Purchase Invoice,Items,Položky
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +23,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 +221,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 +233,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 +96,Request for Quotations,Žádost o citátů
+apps/erpnext/erpnext/hooks.py +104,Request for Quotations,Žádost o citátů
 DocType: Payment Reconciliation,Maximum Invoice Amount,Maximální částka faktury
 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 +628,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Výchozí měrná jednotka varianty &#39;{0}&#39; musí být stejný jako v Template &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Výchozí měrná jednotka varianty &#39;{0}&#39; musí být stejný jako v Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Vypočítat založené na
 DocType: Delivery Note Item,From Warehouse,Ze skladu
 DocType: Assessment,Supervisor Name,Jméno Supervisor
+DocType: Assessment,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
 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 +27,Default Address Template cannot be deleted,Výchozí šablony adresy nemůže být smazán
+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
 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í
@@ -3020,8 +3061,8 @@
 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/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 +485,No default BOM exists for Item {0},No default BOM existuje pro bod {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +336,Please select Posting Date first,"Prosím, vyberte nejprve Datum zveřejnění"
+apps/erpnext/erpnext/stock/get_item_details.py +486,No default BOM exists for Item {0},No default BOM existuje pro bod {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +326,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
@@ -3037,6 +3078,7 @@
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Zápas platby fakturami
 DocType: Journal Entry,Bank Entry,Bank Entry
 DocType: Authorization Rule,Applicable To (Designation),Vztahující se na (označení)
+,Profitability Analysis,Analýza ziskovost
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,Přidat do košíku
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Seskupit podle
 DocType: Guardian,Interests,zájmy
@@ -3049,22 +3091,22 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,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 +141,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Serialized Položka {0} nelze aktualizovat \
  pomocí Reklamní Odsouhlasení"
 DocType: Scheduling Tool,Day,Den
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,"New Pořadové číslo nemůže mít Warehouse. Warehouse musí být nastaveny Stock vstupním nebo doklad o koupi,"
 DocType: Lead,Lead Type,Typ leadu
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,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 +129,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
-DocType: Student Applicant,AP.,AP.
 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 výměně
-apps/erpnext/erpnext/accounts/page/pos/pos.js +639,Point of Sale,Místo Prodeje
+apps/erpnext/erpnext/accounts/page/pos/pos.js +634,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: Account,Tax,Daň
 DocType: Production Planning Tool,Production Planning Tool,Plánování výroby Tool
@@ -3073,74 +3115,77 @@
 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 +373,Quantity to Manufacture must be greater than 0.,"Množství, které má výroba musí být větší než 0 ° C."
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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 Profile,Customer Group,Zákazník Group
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,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/doctype/asset/asset.py +83,Next Depreciation Date must be on or after today,Vedle Odpisy Datum musí být na nebo po dnešku
 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 +145,Please cancel Purchase Invoice {0} first,Zrušte faktuře {0} první
 DocType: Serial No,AMC Expiry Date,AMC Datum vypršení platnosti
 ,Sales Register,Sales Register
 DocType: Quotation,Quotation Lost Reason,Důvod ztráty nabídky
+apps/erpnext/erpnext/utilities/doctype/address/address.py +164,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.
 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 +330,Transaction reference no {0} dated {1},Referenční transakce no {0} ze dne {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,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 +107,Summary for this month and pending activities,Shrnutí pro tento měsíc a probíhajícím činnostem
+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/accounts/doctype/sales_invoice/sales_invoice.py +406,Please remove this Invoice {0} from C-Form {1},Odeberte Tato faktura {0} z C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,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 +644,Get Items,Získat položky
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +623,Get Items,Získat položky
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +210,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 +41,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ů
 DocType: Payment Request,Initiated,Zahájil
 DocType: Production Order,Planned Start Date,Plánované datum zahájení
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,Customer is required against Receivable account {0},Zákazník je nutná proti pohledávek účtu {0}
 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 +265,Project-wise data is not available for Quotation,Data dle projektu nejsou k dispozici pro nabídku
+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 +101,Commercial,Obchodní
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,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: Supplier Quotation,Supplier Address,Dodavatel Address
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +648,Row {0}# Account must be of type 'Fixed Asset',Řádek {0} # účet musí být typu &quot;Fixed Asset&quot;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,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 +30,Series is mandatory,Série je povinné
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +50,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í pro Time Záznamy
 DocType: Tax Rule,Sales,Prodej
 DocType: Stock Entry Detail,Basic Amount,Základní částka
 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}
 DocType: Leave Allocation,Unused leaves,Nepoužité listy
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Cr,Cr
 DocType: Tax Rule,Billing State,Fakturace State
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +250,Transfer,Převod
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +187,{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 +825,Fetch exploded BOM (including sub-assemblies),Fetch explodovala kusovníku (včetně montážních podskupin)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +254,Transfer,Převod
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +190,{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 +796,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 +115,Due Date is mandatory,Datum splatnosti je povinné
+apps/erpnext/erpnext/controllers/accounts_controller.py +118,Due Date is mandatory,Datum splatnosti je povinné
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Přírůstek pro atribut {0} nemůže být 0
 DocType: Journal Entry,Pay To / Recd From,Platit K / Recd Z
 DocType: Naming Series,Setup Series,Nastavení číselných řad
 DocType: Payment Reconciliation,To Invoice Date,Chcete-li data vystavení faktury
 DocType: Supplier,Contact HTML,Kontakt HTML
 ,Inactive Customers,neaktivní zákazníci
+DocType: 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í?
 DocType: Quality Inspection,Delivery Note No,Dodacího listu
@@ -3149,7 +3194,7 @@
 DocType: Company,Retail,Maloobchodní
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +120,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 +587,Product Bundle,Bundle Product
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Product Bundle,Bundle Product
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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
@@ -3159,8 +3204,8 @@
 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 +742,Send Supplier Emails,Poslat Dodavatel e-maily
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +104,"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/buying/doctype/request_for_quotation/request_for_quotation.js +708,Send Supplier Emails,Poslat Dodavatel e-maily
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,"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
 DocType: Guardian Interest,Guardian Interest,Guardian Zájem
 DocType: Timesheet,Employee Detail,Detail zaměstnanec
@@ -3171,9 +3216,9 @@
 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}
 DocType: Salary Slip,Earning & Deduction,Výdělek a dedukce
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +77,Account {0} cannot be a Group,Účet {0} nemůže být skupina
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} cannot be a Group,Účet {0} nemůže být skupina
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +31,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 +107,Negative Valuation Rate is not allowed,Negativní ocenění Rate není povoleno
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Negativní ocenění Rate není povoleno
 DocType: Holiday List,Weekly Off,Týdenní Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Pro např 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +39,Provisional Profit / Loss (Credit),Prozatímní Zisk / ztráta (Credit)
@@ -3187,16 +3232,16 @@
 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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Nákladové středisko je povinný údaj pro položku {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +626,Get Items from Product Bundle,Získat předměty z Bundle Product
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +605,Get Items from Product Bundle,Získat předměty z Bundle Product
 DocType: Asset,Straight Line,Přímka
 DocType: Project User,Project User,projekt Uživatel
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} is inactive,Účet {0} je neaktivní
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} is inactive,Účet {0} je neaktivní
 DocType: GL Entry,Is Advance,Je Zálohová
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Účast Datum od a docházky do dnešního dne je povinná
 apps/erpnext/erpnext/controllers/buying_controller.py +148,Please enter 'Is Subcontracted' as Yes or No,"Prosím, zadejte ""subdodavatelům"" jako Ano nebo Ne"
 DocType: Sales Team,Contact No.,Kontakt Číslo
 DocType: Bank Reconciliation,Payment Entries,Platební Příspěvky
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,'Profit and Loss' type account {0} not allowed in Opening Entry,"""Výkaz zisku a ztráty"" typ účtu {0} není povoleno pro Vstupní Údaj"
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +71,'Profit and Loss' type account {0} not allowed in Opening Entry,"""Výkaz zisku a ztráty"" typ účtu {0} není povoleno pro Vstupní Údaj"
 DocType: 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
@@ -3215,7 +3260,7 @@
 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,Provize z prodeje
 DocType: Offer Letter Term,Value / Description,Hodnota / Popis
-apps/erpnext/erpnext/controllers/accounts_controller.py +558,"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}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +561,"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: Production Order,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}.
@@ -3228,13 +3273,13 @@
 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/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: Sales Order,% Amount Billed,% Fakturované částky
+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."
 apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},No Položka s Serial č {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Otevřené Oznámení
+DocType: Email Digest,Open Notifications,Otevřené Oznámení
 DocType: Payment Entry,Difference Amount (Company Currency),Rozdíl Částka (Company měna)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,Přímé náklady
 apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
@@ -3242,7 +3287,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Nový zákazník Příjmy
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,Cestovní výdaje
 DocType: Maintenance Visit,Breakdown,Rozbor
-apps/erpnext/erpnext/controllers/accounts_controller.py +634,Account: {0} with currency: {1} can not be selected,Účet: {0} s měnou: {1} nelze vybrat
+apps/erpnext/erpnext/controllers/accounts_controller.py +637,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}
 DocType: Program Enrollment Tool,Student Applicants,Student Žadatelé
@@ -3250,15 +3295,15 @@
 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 +56,Probation,Zkouška
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Probation,Zkouška
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Mzdové Components
 DocType: Program Enrollment Tool,New Academic Year,Nový akademický rok
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Payment of salary for the month {0} and year {1},Platba platu za měsíc {0} a rok {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Payment of salary for the month {0} and year {1},Platba platu za měsíc {0} a rok {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,"Auto vložka Ceník sazba, pokud chybí"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Celkem uhrazené částky
 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 +144,Planning,Plánování
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,Plánování
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,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
@@ -3271,11 +3316,10 @@
 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.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Sales invoice submitted sucessfully.,Prodejní faktura předložena úspěšně.
 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}
 DocType: Assessment Result,Student Name,Jméno studenta
-apps/erpnext/erpnext/hooks.py +104,Assessment Schedule,Plán Assessment
+apps/erpnext/erpnext/hooks.py +113,Assessment Schedule,Plán Assessment
 DocType: Brand,Item Manager,Manažer Položka
 DocType: Buying Settings,Default Supplier Type,Výchozí typ Dodavatel
 DocType: Production Order,Total Operating Cost,Celkové provozní náklady
@@ -3285,6 +3329,7 @@
 DocType: GL Entry,Party Type,Typ Party
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +78,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
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Plat master šablona.
 DocType: Leave Type,Max Days Leave Allowed,Max Days Leave povolena
@@ -3296,18 +3341,19 @@
 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 +99,All Customer Groups,Všechny skupiny zákazníků
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +78,Accumulated Monthly,nahromaděné za měsíc
-apps/erpnext/erpnext/controllers/accounts_controller.py +595,{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/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Všechny skupiny zákazníků
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +81,Accumulated Monthly,nahromaděné za měsíc
+apps/erpnext/erpnext/controllers/accounts_controller.py +598,{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
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Ceník Rate (Company měny)
 DocType: Products Settings,Products Settings,Nastavení Produkty
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +188,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
 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 +84,Secretary,Sekretářka
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,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
@@ -3316,24 +3362,22 @@
 ,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
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,Řádek # {0}: Výrobní číslo je povinné
+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 +859,Supplier Quotation,Dodavatel Nabídka
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +838,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 +7,Collect Fees,vybírat poplatky
+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}
 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.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Připravované akce
 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/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
-DocType: Email Digest,Income / Expense,Výnosy / náklady
 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."
@@ -3345,13 +3389,14 @@
 DocType: Customer,From Lead,Od Leadu
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Objednávky uvolněna pro výrobu.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Vyberte fiskálního roku ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,POS Profile required to make POS Entry,"POS Profile požadováno, aby POS Vstup"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +509,POS Profile required to make POS Entry,"POS Profile požadováno, aby POS Vstup"
 DocType: Program Enrollment Tool,Enroll Students,zapsat studenti
 DocType: Hub Settings,Name Token,Jméno Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standardní prodejní
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Atleast one warehouse is mandatory,Alespoň jeden sklad je povinný
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +129,Atleast one warehouse is mandatory,Alespoň jeden sklad je povinný
 DocType: Serial No,Out of Warranty,Out of záruky
 DocType: BOM Replace Tool,Replace,Vyměnit
+DocType: Production Order,Unstopped,nezastavěnou
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{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
@@ -3372,10 +3417,11 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Dovolené musí být přiděleny v násobcích 0,5"
 DocType: Production Order,Operation Cost,Provozní náklady
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,Nahrajte účast ze souboru CSV
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Vynikající Amt
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Nastavit cíle Item Group-moudrý pro tento prodeje osobě.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Freeze Zásoby Starší než [dny]
-apps/erpnext/erpnext/controllers/accounts_controller.py +528,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Řádek # {0}: Prostředek je povinné pro dlouhodobého majetku nákupu / prodeji
+apps/erpnext/erpnext/controllers/accounts_controller.py +531,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Řádek # {0}: Prostředek je povinné pro dlouhodobého majetku nákupu / prodeji
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Pokud dva nebo více pravidla pro tvorbu cen se nacházejí na základě výše uvedených podmínek, priorita je aplikována. Priorita je číslo od 0 do 20, zatímco výchozí hodnota je nula (prázdný). Vyšší číslo znamená, že bude mít přednost, pokud existuje více pravidla pro tvorbu cen se za stejných podmínek."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Fiskální rok: {0} neexistuje
 DocType: Currency Exchange,To Currency,Chcete-li měny
@@ -3392,15 +3438,15 @@
 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
-DocType: Sales Invoice,Exhibition,Výstava
 apps/erpnext/erpnext/utilities/doctype/address/address.py +77,"Company is mandatory, as it is your company address","Společnost je povinná, protože to je vaše firma adresa"
 DocType: Item Attribute,From Range,Od Rozsah
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +81,Syntax error in formula or condition: {0},syntaktická chyba ve vzorci nebo stavu: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +92,Syntax error in formula or condition: {0},syntaktická chyba ve vzorci nebo stavu: {0}
 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"
+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 +28,Jobs,Jobs
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,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
@@ -3409,16 +3455,16 @@
 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 +763,Make Supplier Quotation,Vytvořit nabídku dodavatele
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,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/controllers/sales_and_purchase_return.py +100,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 +42,Casual Leave,Casual Leave
+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
 DocType: Batch,Batch ID,Šarže ID
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,Note: {0},Poznámka: {0}
 ,Delivery Note Trends,Dodací list Trendy
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +103,This Week's Summary,Tento týden Shrnutí
+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í
 DocType: Student Group Creation Tool,Get Courses,Získat kurzy
 DocType: GL Entry,Party,Strana
@@ -3428,7 +3474,7 @@
 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 +59,Piecework,Úkolová práce
+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: Task,Actual Time (in Hours),Skutečná doba (v hodinách)
 DocType: Employee,History In Company,Historie ve Společnosti
@@ -3445,7 +3491,7 @@
 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.
 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 +162,Black,Černá
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,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é
@@ -3456,13 +3502,13 @@
 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 +69,Customer Id,Zákazník Id
+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
 DocType: Journal Entry Account,Exchange Rate,Exchange Rate
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Sales Order {0} is not submitted,Prodejní objednávky {0} není předložena
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +527,Sales Order {0} is not submitted,Prodejní objednávky {0} není předložena
 DocType: Homepage,Tag Line,tag linka
 DocType: Fee Component,Fee Component,poplatek Component
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +857,Add items from,Přidat položky z
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +836,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}
 DocType: Cheque Print Template,Regular,Pravidelný
 DocType: BOM,Last Purchase Rate,Poslední nákupní sazba
@@ -3470,6 +3516,7 @@
 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"
 ,Sales Person-wise Transaction Summary,Prodej Person-moudrý Shrnutí transakce
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +60,Cost Center is required for 'Profit and Loss' account {0}. Please set up a default Cost Center for the Company.,na účet zisků a ztrát &quot; &#39;{0} je zapotřebí nákladové středisko. Prosím nastavit výchozí nákladového střediska pro společnost.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,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
@@ -3480,12 +3527,12 @@
 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 +710,Online,Online
+apps/erpnext/erpnext/accounts/page/pos/pos.js +692,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 +16,Setting this Address Template as default as there is no other default,"Nastavení Tato adresa šablonu jako výchozí, protože není jiná výchozí"
+apps/erpnext/erpnext/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í"
 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 +74,Quality Management,Řízení kvality
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,Řízení kvality
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} has been disabled,Item {0} byl zakázán
 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
@@ -3507,11 +3554,12 @@
 DocType: Student,Student Email ID,Student ID e-mailu
 DocType: Employee,Notice (days),Oznámení (dny)
 DocType: Tax Rule,Sales Tax Template,Daň z prodeje Template
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1520,Select items to save the invoice,"Vyberte položky, které chcete uložit fakturu"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1544,Select items to save the invoice,"Vyberte položky, které chcete uložit fakturu"
 DocType: Employee,Encashment Date,Inkaso Datum
 DocType: Account,Stock Adjustment,Reklamní Nastavení
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Existuje Náklady Výchozí aktivity pro Typ aktivity - {0}
 DocType: Production Order,Planned Operating Cost,Plánované provozní náklady
+DocType: Academic Term,Term Start Date,Termín Datum zahájení
 apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},V příloze naleznete {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Výpis z bankovního účtu zůstatek podle hlavní knihy
 DocType: Job Applicant,Applicant Name,Žadatel Název
@@ -3541,17 +3589,17 @@
 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."
 DocType: Company,Distribution,Distribuce
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +8,Amount Paid,Zaplacené částky
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Project Manager,Project Manager
+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
 ,Quoted Item Comparison,Citoval Položka Porovnání
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Dispatch,Odeslání
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,Odeslání
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max sleva povoleno položku: {0} {1}%
 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."
-DocType: Sales Invoice,Supplier Reference,Dodavatel Označení
-apps/erpnext/erpnext/accounts/page/pos/pos.js +844,"Master data syncing, it might take some time","Kmenová data synchronizace, může to trvat nějaký čas"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +832,"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
@@ -3565,7 +3613,7 @@
 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 +83,Error in formula or condition,Chyba ve vzorci nebo stavu
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,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
@@ -3574,7 +3622,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},"Chcete-li data by měla být v rámci fiskálního roku. Za předpokladu, že To Date = {0}"
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Zde si můžete udržet výšku, váhu, alergie, zdravotní problémy atd"
 DocType: Leave Block List,Applies to Company,Platí pro firmy
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +197,Cannot cancel because submitted Stock Entry {0} exists,"Nelze zrušit, protože předložena Reklamní Entry {0} existuje"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +198,Cannot cancel because submitted Stock Entry {0} exists,"Nelze zrušit, protože předložena Reklamní Entry {0} existuje"
 DocType: Purchase Invoice,In Words,Slovy
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,Today is {0}'s birthday!,Dnes je {0} 's narozeniny!
 DocType: Production Planning Tool,Material Request For Warehouse,Materiál Request For Warehouse
@@ -3584,14 +3632,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,Váš finanční rok začíná
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Asset Odpisy a zůstatků
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +319,Amount {0} {1} transferred from {2} to {3},Množství {0} {1} převedena z {2} na {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +322,Amount {0} {1} transferred from {2} to {3},Množství {0} {1} převedena z {2} na {3}
 DocType: Sales Invoice,Get Advances Received,Získat přijaté zálohy
 DocType: Email Digest,Add/Remove Recipients,Přidat / Odebrat příjemce
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +432,Transaction not allowed against stopped Production Order {0},Transakce není povoleno proti zastavila výrobu Objednat {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +437,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 +143,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 +652,Item variant {0} exists with same attributes,Bod varianta {0} existuje s stejné atributy
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Bod varianta {0} existuje s stejné atributy
+DocType: Leave Application,LAP/,KLÍN/
 DocType: Salary Slip,Salary Slip,Výplatní páska
 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é"
@@ -3599,12 +3648,12 @@
 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 +212,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 +215,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: Employee Education,Employee Education,Vzdělávání zaměstnanců
-apps/erpnext/erpnext/public/js/controllers/transaction.js +866,It is needed to fetch Item Details.,"Je třeba, aby přinesla Detaily položky."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +857,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
@@ -3614,14 +3663,14 @@
 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 +178,Invalid {0},Neplatný {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Sick Leave,Zdravotní dovolená
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,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
 DocType: Warehouse,PIN,KOLÍK
 DocType: Sales Invoice,Base Change Amount (Company Currency),Základna Změna Částka (Company měna)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +313,No accounting entries for the following warehouses,Žádné účetní záznamy pro následující sklady
-apps/erpnext/erpnext/projects/doctype/project/project.js +102,Save the document first.,Uložte dokument jako první.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +314,No accounting entries for the following warehouses,Žádné účetní záznamy pro následující sklady
+apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Uložte dokument jako první.
 DocType: Account,Chargeable,Vyměřovací
 DocType: Company,Change Abbreviation,Změna zkratky
 DocType: Expense Claim Detail,Expense Date,Datum výdaje
@@ -3634,10 +3683,9 @@
 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"
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,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
 DocType: Appraisal,Appraisal Template,Posouzení Template
 DocType: Item Group,Item Classification,Položka Klasifikace
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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
@@ -3647,8 +3695,8 @@
 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 +940,Please select {0} first,"Prosím, nejprve vyberte {0}"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +749,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 +953,Please select {0} first,"Prosím, nejprve vyberte {0}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +757,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
@@ -3676,8 +3724,8 @@
  {%, 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 +92,Warehouse not found in the system,Sklad nebyl nalezen v systému
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +106,This Month's Summary,Tento měsíc je shrnutí
+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í
 DocType: Quality Inspection Reading,Quality Inspection Reading,Kvalita Kontrola Reading
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Zmrazit zásoby starší než` by mělo být nižší než %d dnů.
 DocType: Tax Rule,Purchase Tax Template,Spotřební daň šablony
@@ -3687,21 +3735,22 @@
 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 +87,Please set Next Depreciation Date,"Prosím, stojí vedle odpisů Datum"
-DocType: Payment Gateway,Payment Gateway,Platební brána
 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 +378,Operation Time must be greater than 0 for Operation {0},Provozní doba musí být větší než 0 pro provoz {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +380,Operation Time must be greater than 0 for Operation {0},Provozní doba musí být větší než 0 pro provoz {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +170,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)
 DocType: Program,Program Abbreviation,Program Zkratka
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,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: Appraisal,Start Date,Datum zahájení
@@ -3717,21 +3766,22 @@
 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
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Např. smsgateway.com/api/send-sms.cgi
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +27,Transaction currency must be same as Payment Gateway currency,Měna transakce musí být stejná jako platební brána měnu
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Transaction currency must be same as Payment Gateway currency,Měna transakce musí být stejná jako platební brána měnu
 DocType: Payment Entry,Receive,Příjem
+apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,citace:
 DocType: Maintenance Visit,Fully Completed,Plně Dokončeno
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% hotovo
 DocType: Employee,Educational Qualification,Vzdělávací Kvalifikace
 DocType: Workstation,Operating Costs,Provozní náklady
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Akční pokud souhrnné měsíční rozpočet překročen
 DocType: Purchase Invoice,Submit on creation,Předložení návrhu na vytvoření
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +432,Currency for {0} must be {1},Měna pro {0} musí být {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +435,Currency for {0} must be {1},Měna pro {0} musí být {1}
 DocType: Asset,Disposal Date,Likvidace Datum
 DocType: Employee Leave Approver,Employee Leave Approver,Zaměstnanec Leave schvalovač
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,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 +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/crm/doctype/opportunity/opportunity.py +79,"Cannot declare as lost, because Quotation has been made.","Nelze prohlásit za ztracený, protože citace byla provedena."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Nákup Hlavní manažer
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +429,Production Order {0} must be submitted,Výrobní zakázka {0} musí být předloženy
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +434,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
@@ -3741,25 +3791,27 @@
 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,Ceník Jméno
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +181,Totals,Součty
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,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 +113,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 +120,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,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.
+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 +181,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/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 +793,All records are synced.,Všechny záznamy jsou synchronizovány.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +781,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ů
 DocType: Cost Center,Cost Center Name,Jméno nákladového střediska
@@ -3778,21 +3830,20 @@
 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/selling/doctype/quotation/quotation.py +49,Cannot set as Lost as Sales Order is made.,"Nelze nastavit jako Ztraceno, protože je přijata objednávka."
-DocType: Student Applicant,Mother's Name,Matčino jméno
 DocType: Request for Quotation Item,Supplier Part No,Žádný dodavatel Part
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +348,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Nemůže odečíst, pokud kategorie je pro &quot;ocenění&quot; nebo &quot;Vaulation a Total&quot;"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Received From,Přijaté Od
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Received From,Přijaté Od
 DocType: Lead,Converted,Převedené
 DocType: Item,Has Serial No,Má Sériové číslo
 DocType: Employee,Date of Issue,Datum vydání
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{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 +93,Row {0}: Hours value must be greater than zero.,Řádek {0}: doba hodnota musí být větší než nula.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +117,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
 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 +172,{0} {1} does not exist,{0} {1} neexistuje
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +175,{0} {1} does not exist,{0} {1} neexistuje
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,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 +72,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í
@@ -3801,13 +3852,14 @@
 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/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
 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 +109,Electrical,Elektrický
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,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 +318,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}
@@ -3815,7 +3867,7 @@
 DocType: Item,Customer Code,Code zákazníků
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +210,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 +292,Debit To account must be a Balance Sheet account,Debetní Na účet musí být účtu Rozvaha
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To account must be a Balance Sheet account,Debetní Na účet musí být účtu Rozvaha
 DocType: Buying Settings,Naming Series,Číselné řady
 DocType: Leave Block List,Leave Block List Name,Nechte Jméno Block List
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Stock Aktiva
@@ -3827,11 +3879,11 @@
 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 +301,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 +313,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: Sales Order Item,Ordered Qty,Objednáno Množství
-apps/erpnext/erpnext/stock/doctype/item/item.py +673,Item {0} is disabled,Položka {0} je zakázána
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,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 +838,BOM does not contain any stock item,BOM neobsahuje žádnou skladovou položku
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +809,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.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generování výplatních páskách
@@ -3839,23 +3891,24 @@
 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)
-apps/erpnext/erpnext/stock/doctype/item/item.py +485,Row #{0}: Please set reorder quantity,Řádek # {0}: Prosím nastavte množství objednací
+DocType: Sales Invoice Timesheet,Billing Hours,Billing Hodiny
+apps/erpnext/erpnext/stock/doctype/item/item.py +487,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 +62,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
+DocType: Payment Entry,Allocate Payment Amount,Přidělit částku platby
 DocType: Employee External Work History,Salary,Plat
 DocType: Serial No,Delivery Document Type,Dodávka Typ dokumentu
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Odeslat všechny výplatní pásky pro výše zvolených kritérií
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} položky synchronizovány
 DocType: Sales Order,Partly Delivered,Částečně vyhlášeno
-DocType: Sales Invoice,Existing Customer,Stávající zákazník
 DocType: Email Digest,Receivables,Pohledávky
+DocType: Lead Source,Lead Source,Olovo Source
 DocType: Customer,Additional information regarding the customer.,Další informace týkající se zákazníka.
 DocType: Quality Inspection Reading,Reading 5,Čtení 5
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +38,Campaign Name is required,Je zapotřebí název kampaně
 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
@@ -3864,10 +3917,9 @@
 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 +129,BOM and Manufacturing Quantity are required,BOM a výroba množství jsou povinné
+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/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
-DocType: Bank Reconciliation Detail,Amount,Částka
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM nahradil
 ,Sales Analytics,Prodejní Analytics
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +113,Available {0},K dispozici {0}
@@ -3875,14 +3927,14 @@
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Nastavení e-mail
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +96,Please enter default currency in Company Master,Zadejte prosím výchozí měnu v podniku Mistr
 DocType: Stock Entry Detail,Stock Entry Detail,Reklamní Entry Detail
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +100,Daily Reminders,Denní Upomínky
+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/account/account_tree.js +23,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 +71,Customer Service,Služby zákazníkům
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Customer Service,Služby zákazníkům
 DocType: Homepage Featured Product,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.
@@ -3891,8 +3943,9 @@
 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
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Výchozí práci ve skladu Progress
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1570,Total nos of serial no is not equal to quantity.,Celkem nos z sériovým číslem není rovno množství.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1594,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
 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
@@ -3900,9 +3953,10 @@
 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 +82,Engineer,Inženýr
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,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 +370,Item Code required at Row No {0},Kód položky třeba na řádku č {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +398,Item Code required at Row No {0},Kód položky třeba na řádku č {0}
 DocType: Sales Partner,Partner Type,Partner Type
 DocType: Purchase Taxes and Charges,Actual,Aktuální
 DocType: Authorization Rule,Customerwise Discount,Sleva podle zákazníka
@@ -3918,16 +3972,18 @@
 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."
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +55,Part-time,Part-time
+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
 DocType: Employee,Applicable Holiday List,Použitelný Seznam Svátků
 DocType: Employee,Cheque,Šek
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Řada Aktualizováno
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +57,Series Updated,Řada Aktualizováno
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Report Type je povinné
 DocType: Item,Serial Number Series,Sériové číslo Series
 apps/erpnext/erpnext/buying/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 +87,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
@@ -3941,7 +3997,7 @@
 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 +513,Posting date and posting time is mandatory,Datum a čas zadání je povinný
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Datum a čas zadání je povinný
 apps/erpnext/erpnext/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."
@@ -3951,7 +4007,7 @@
 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/stock/doctype/stock_entry/stock_entry.py +158,Target warehouse in row {0} must be same as Production Order,Target sklad v řádku {0} musí být stejná jako výrobní zakázky
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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ě
 DocType: Company,Round Off Account,Zaokrouhlovací účet
@@ -3960,23 +4016,22 @@
 DocType: Customer Group,Parent Customer Group,Parent Customer Group
 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 +180,Notice Period,Výpovědní Lhůta
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,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 +4,New Sales Person Name,Jméno Nová Sales Osoba
 DocType: Packing Slip,Gross Weight UOM,Hrubá Hmotnost UOM
-DocType: Email Digest,Receivables / Payables,Pohledávky / Závazky
 DocType: Delivery Note Item,Against Sales Invoice,Proti prodejní faktuře
 DocType: Bin,Reserved Qty for Production,Vyhrazeno Množství pro výrobu
 DocType: Asset,Frequency of Depreciation (Months),Frekvence odpisy (měsíce)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +469,Credit Account,Úvěrový účet
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Credit Account,Úvěrový účet
 DocType: Landed Cost Item,Landed Cost Item,Přistálo nákladovou položkou
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +55,Show zero values,Ukázat nulové hodnoty
+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
 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 +647,Please specify Attribute Value for attribute {0},Uveďte prosím atributu Hodnota atributu {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Uveďte prosím atributu Hodnota atributu {0}
 DocType: Item,Default Warehouse,Výchozí Warehouse
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +39,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ý"
@@ -3998,19 +4053,22 @@
 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
-DocType: Sales Invoice,Cold Calling,Cold Calling
 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: Maintenance Schedule Item,Half Yearly,Pololetní
 DocType: Lead,Blog Subscriber,Blog Subscriber
+DocType: Guardian,Alternate Number,Alternativní Number
 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.
+DocType: Stock Reconciliation Item,Quantity Difference,množství Rozdíl
 apps/erpnext/erpnext/config/hr.py +253,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 +141,Set as Lost,Nastavit jako Lost
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,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 +5,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
 DocType: Supplier,Credit Days Based On,Úvěrové Dny Based On
@@ -4022,11 +4080,10 @@
 ,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 +941,Select or add new customer,Vyberte nebo přidání nového zákazníka
+apps/erpnext/erpnext/accounts/page/pos/pos.js +930,Select or add new customer,Vyberte nebo přidání 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 +5,This is based on the attendance of this Employee,To je založeno na účasti základu tohoto zaměstnance
-DocType: Sales Invoice,Frequency,Frekvence
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +463,Debit Account,Debetní účet
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,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)
@@ -4035,27 +4092,27 @@
 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 +210,Supplier Quotation {0} created,Dodavatel Cen {0} vytvořil
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +208,Supplier Quotation {0} created,Dodavatel Cen {0} vytvořil
 apps/erpnext/erpnext/accounts/report/financial_statements.py +90,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 +173,Employee Benefits,Zaměstnanecké benefity
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,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 +228,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 +232,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 +499,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 +500,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 +1007,Price List not found or disabled,Ceník nebyl nalezen nebo zakázán
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1008,Price List not found or disabled,Ceník nebyl nalezen nebo zakázán
 DocType: Expense Claim,Approved,Schválený
 DocType: Pricing Rule,Price,Cena
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +244,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 +256,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í
@@ -4066,12 +4123,12 @@
 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 dispozici Množství na Od Warehouse
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +259,Please select Employee Record first.,"Prosím, vyberte zaměstnance záznam první."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +266,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 +190,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 +235,Please enter Expense Account,"Prosím, zadejte výdajového účtu"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,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 +963,"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 +976,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Řádek # {0}: Reference Document Type musí být jedním z objednávky, faktury nebo Journal Entry"
 DocType: Employee,Current Address,Aktuální adresa
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Je-li položka je varianta další položku pak popis, obraz, oceňování, daní atd bude stanoven ze šablony, pokud není výslovně uvedeno"
 DocType: Serial No,Purchase / Manufacture Details,Nákup / Výroba Podrobnosti
@@ -4086,9 +4143,10 @@
 DocType: Asset Movement,Transaction Date,Transakce Datum
 DocType: Production Plan Item,Planned Qty,Plánované Množství
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,Total Tax
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,For Quantity (Manufactured Qty) is mandatory,Pro Množství (Vyrobeno ks) je povinné
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,For Quantity (Manufactured Qty) is mandatory,Pro Množství (Vyrobeno ks) je povinné
 DocType: Stock Entry,Default Target Warehouse,Výchozí Target Warehouse
 DocType: Purchase Invoice,Net Total (Company Currency),Net Total (Company Měna)
+apps/erpnext/erpnext/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 +78,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: Production Order,Actual Start Date,Skutečné datum zahájení
@@ -4103,9 +4161,11 @@
 DocType: Warranty Claim,If different than customer address,Pokud se liší od adresy zákazníka
 DocType: BOM Operation,BOM Operation,BOM Operation
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Na předchozí řady Částka
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +226,Transfer Asset,Převod majetku
+DocType: Student,Home Address,Domácí adresa
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +227,Transfer Asset,Převod majetku
 DocType: POS Profile,POS Profile,POS Profile
 apps/erpnext/erpnext/config/schools.py +33,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 +129,"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
@@ -4115,8 +4175,8 @@
 DocType: Assessment,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 +765,Material to Supplier,Materiál Dodavateli
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +189,Excise Invoice,Spotřební Faktura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,Material to Supplier,Materiál Dodavateli
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,Spotřební Faktura
 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
@@ -4126,7 +4186,7 @@
 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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,Studentské skupiny vytvořen.
 DocType: Scheduling Tool,Scheduling Tool,Plánování Tool
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +136,Credit Card,Kreditní karta
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,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í.
 DocType: Purchase Invoice,Next Date,Další data
@@ -4134,6 +4194,7 @@
 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: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Zde si můžete udržovat rodinné detailů, jako jsou jméno a povolání rodičem, manželem a dětmi"
+DocType: Academic Term,Term End Date,Termín Datum ukončení
 DocType: Hub Settings,Seller Name,Prodejce Name
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Daně a poplatky odečteny (Company měna)
 DocType: Item Group,General Settings,Obecné nastavení
@@ -4145,7 +4206,7 @@
 DocType: Customer,Commission Rate,Výše provize
 apps/erpnext/erpnext/stock/doctype/item/item.js +261,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 +115,"Payment Type must be one of Receive, Pay and Internal Transfer",Typ platby musí být jedním z příjem Pay a interní převod
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +118,"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/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Košík je prázdný
 DocType: Production Order,Actual Operating Cost,Skutečné provozní náklady
@@ -4160,10 +4221,10 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,Vyberte soubor csv
 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 +92,Designer,Návrhář
+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
 DocType: Serial No,Delivery Details,Zasílání
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +469,Cost Center is required in row {0} in Taxes table for type {1},Nákladové středisko je nutné v řadě {0} na daních tabulka typu {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +472,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
 ,Item-wise Purchase Register,Item-wise registr nákupu
 DocType: Batch,Expiry Date,Datum vypršení platnosti
@@ -4173,12 +4234,12 @@
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Master Project.
 apps/erpnext/erpnext/controllers/status_updater.py +174,"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 +417, (Half Day),(půlden)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425, (Half Day),(půlden)
 DocType: Supplier,Credit Days,Úvěrové dny
 DocType: Leave Type,Is Carry Forward,Je převádět
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +740,Get Items from BOM,Získat předměty z BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +711,Get Items from BOM,Získat předměty z BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Dodací lhůta dny
-apps/erpnext/erpnext/controllers/accounts_controller.py +549,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/controllers/accounts_controller.py +552,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"
 ,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
diff --git a/erpnext/translations/da-DK.csv b/erpnext/translations/da-DK.csv
index 0c7adef..f3754a6 100644
--- a/erpnext/translations/da-DK.csv
+++ b/erpnext/translations/da-DK.csv
@@ -1,7 +1,7 @@
 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.
-DocType: Sales Order,% Amount Billed,% Beløb Billed
+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}.
@@ -12,12 +12,12 @@
 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 +87, to ,Ultima Actualización : Fecha inválida
+apps/erpnext/erpnext/accounts/page/pos/pos.js +76, 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 +176,{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/accounts_controller.py +273, or ,o
+apps/erpnext/erpnext/controllers/accounts_controller.py +276, or ,o
 DocType: Sales Order,% of materials billed against this Sales Order,% Af materialer faktureret mod denne Sales Order
 DocType: SMS Center,All Lead (Open),Alle Bly (Open)
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Hent opdateringer
diff --git a/erpnext/translations/da.csv b/erpnext/translations/da.csv
index bdb9e28..cf06d06 100644
--- a/erpnext/translations/da.csv
+++ b/erpnext/translations/da.csv
@@ -18,11 +18,10 @@
 DocType: Sales Partner,Dealer,Forhandler
 DocType: Employee,Rented,Lejet
 DocType: Purchase Order,PO-,PO-
-apps/erpnext/erpnext/accounts/report/financial_statements.py +19,Start Year {0} not found.,Start År {0} blev ikke fundet.
 DocType: POS Profile,Applicable for User,Gældende for Bruger
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +191,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Stoppet produktionsordre kan ikke annulleres, Unstop det første til at annullere"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +197,Do you really want to scrap this asset?,Vil du virkelig ønsker at skrotte dette aktiv?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +17,Select Default Supplier,Vælg Standard Leverandør
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +192,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Stoppet produktionsordre kan ikke annulleres, Unstop det første til at annullere"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +198,Do you really want to scrap this asset?,Vil du virkelig ønsker at skrotte dette aktiv?
+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 +36,Currency is required for Price List {0},Valuta er nødvendig for prisliste {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Vil blive beregnet i transaktionen.
 DocType: Address,County,Region
@@ -42,46 +41,45 @@
 DocType: Sales Invoice,Customer Name,Customer Name
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +126,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 +180,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 +183,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 +148,Series Updated Successfully,Series opdateret
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +149,Series Updated Successfully,Series opdateret
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,bestilling
 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
-DocType: Quality Inspection Reading,Parameter,Parameter
 apps/erpnext/erpnext/projects/doctype/project/project.py +54,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 +239,New Leave Application,Ny Leave Application
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,New Leave Application,Ny Leave Application
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +20,Attendance Record {0} exists against Student {1} for Course Schedule {2},Deltagelse Record {0} eksisterer mod Student {1} for Kursus Schedule {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Bank Draft,Bank Draft
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,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
 DocType: Academic Term,Academic Term,Akademisk Term
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +13,Material,Materiale
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Quantity,Mængde
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +511,Accounts table cannot be blank.,Regnskab tabel kan ikke være tom.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +616,Quantity,Mængde
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +512,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)
 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/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 +142,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
-DocType: Purchase Invoice,Monthly,Månedlig
 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/buying/doctype/purchase_order/purchase_order.js +771,Invoice,Faktura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +750,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 +198,Row {0}: {1} {2} does not match with {3},Række {0}: {1} {2} ikke passer med {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Row # {0}:
+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 +127,Please select Price List,Vælg venligst prislisten
@@ -112,8 +110,8 @@
 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 +589,Get items from,Få elementer fra
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +382,Stock cannot be updated against Delivery Note {0},Stock kan ikke opdateres mod følgeseddel {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Få elementer fra
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,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
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Købmand
@@ -122,7 +120,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Pensionskasserne
 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 +156,Salary Structure Missing,Løn Struktur Missing
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,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
@@ -130,10 +128,11 @@
 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,Warehouse Detail
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,Credit limit has been crossed for customer {0} {1}/{2},Credit grænsen er krydset for kunde {0} {1} / {2}
-apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Er anlægsaktiv&quot; kan ikke være ukontrolleret, som eksisterer Asset rekord mod elementet"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +189,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"
 DocType: Tax Rule,Tax Type,Skat Type
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +144,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}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,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/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
@@ -143,18 +142,17 @@
 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 +165,Opening,Åbning
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,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/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Kunden&gt; Customer Group&gt; Territory
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Konto Pay Kun
 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.
 DocType: Lead,Product Enquiry,Produkt Forespørgsel
 DocType: Academic Term,Schools,Skoler
 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 +335,Please select Company first,Vælg venligst Company først
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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
@@ -164,7 +162,7 @@
 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
 DocType: Purchase Invoice Item,Is Fixed Asset,Er anlægsaktiv
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Available qty is {0}, you need {1}","Tilgængelige qty er {0}, du har brug for {1}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +225,"Available qty is {0}, you need {1}","Tilgængelige qty er {0}, du har brug for {1}"
 DocType: Expense Claim Detail,Claim Amount,Krav Beløb
 DocType: Employee,Mr,Hr
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Leverandør Type / leverandør
@@ -173,25 +171,26 @@
 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: Assessment Result,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 +171,Annual Salary,Årsløn
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Annual Salary,Årsløn
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Stock Udgifter
-apps/erpnext/erpnext/accounts/report/financial_statements.py +22,End Year {0} not found.,End År {0} blev ikke fundet.
 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}
 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 +130,At least one mode of payment is required for POS invoice.,Mindst én form for betaling er nødvendig for POS faktura.
 DocType: Products Settings,Show Products as a List,Vis produkterne på en liste
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Download skabelon, fylde relevante data og vedhæfte den ændrede fil. Alle datoer og medarbejder kombination i den valgte periode vil komme i skabelonen, med eksisterende fremmøde optegnelser"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +451,Item {0} is not active or end of life has been reached,Vare {0} er ikke aktiv eller slutningen af livet er nået
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +456,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/controllers/accounts_controller.py +614,"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/controllers/accounts_controller.py +617,"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 +166,Settings for HR Module,Indstillinger for HR modul
 DocType: SMS Center,SMS Center,SMS-center
 DocType: Sales Invoice,Change Amount,ændring beløb
@@ -203,13 +202,13 @@
 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 +147,Execution,Udførelse
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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/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}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,Cost Center {0} does not belong to Company {1},Omkostningssted {0} ikke tilhører selskabet {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +100,Cost Center {0} does not belong to Company {1},Omkostningssted {0} ikke tilhører selskabet {1}
 DocType: Customer,Individual,Individuel
 DocType: Interest,Academics User,akademikere Bruger
 DocType: Cheque Print Template,Amount In Figure,Beløb I figur
@@ -225,30 +224,32 @@
 DocType: Production Planning Tool,Sales Orders,Salgsordrer
 DocType: Purchase Taxes and Charges,Valuation,Værdiansættelse
 ,Purchase Order Trends,Indkøbsordre Trends
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,The request for quotation can be accessed by clicking on the following link,Anmodningen om citat kan tilgås ved at klikke på følgende link
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,Afsætte blade for året.
 DocType: SG Creation Tool Course,SG Creation Tool Course,SG Creation Tool Course
 DocType: Student Group Creation Tool,Leave blank if you wish to fetch all courses for selected academic term,"Lad stå tomt, hvis du ønsker at hente alle kurser for udvalgte akademisk sigt"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,Insufficient Stock,Utilstrækkelig Stock
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227,Insufficient Stock,Utilstrækkelig Stock
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Deaktiver kapacitetsplanlægning og tidsregistrering
+DocType: Email Digest,New Sales Orders,Nye salgsordrer
 DocType: Bank Reconciliation,Bank Account,Bankkonto
 DocType: Leave Type,Allow Negative Balance,Tillad Negativ Balance
 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/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} does not belong to Company {1},Konto {0} tilhører ikke virksomheden {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +86,Account {0} does not belong to Company {1},Konto {0} tilhører ikke virksomheden {1}
 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}
 DocType: Naming Series,Series List for this Transaction,Serie Liste for denne transaktion
 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
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,For Warehouse is required before Submit,"For Warehouse er nødvendig, før Indsend"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,For Warehouse is required before Submit,"For Warehouse er nødvendig, før Indsend"
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Modtaget On
 DocType: Sales Partner,Reseller,Forhandler
 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 Item
 ,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 +1436,"LocalStorage is full , did not save","LocalStorage er fuld, ikke spare"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1460,"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 Tilbagevendende {0} vil blive oprettet på {1}
@@ -261,18 +262,19 @@
 apps/erpnext/erpnext/templates/generators/item.html +78,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 +5,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/leave_application/leave_application.py +206,Only the selected Leave Approver can submit this Leave Application,Kun den valgte Leave Godkender kan indsende denne Leave Application
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +213,Only the selected Leave Approver can submit this Leave Application,Kun den valgte Leave Godkender kan indsende denne Leave Application
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Lindre Dato skal være større end Dato for Sammenføjning
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Leaves per Year,Blade pr år
+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 +103,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},Warehouse {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
 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 +435,Leave Blocked,Lad Blokeret
-apps/erpnext/erpnext/stock/doctype/item/item.py +669,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 +443,Leave Blocked,Lad Blokeret
+apps/erpnext/erpnext/stock/doctype/item/item.py +671,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 +83,Annual,Årligt
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +86,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
@@ -280,20 +282,22 @@
 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"
 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 +91,Software Developer,Software Developer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Minimum Antal
 DocType: Pricing Rule,Supplier Type,Leverandør Type
 DocType: Scheduling Tool,Course Start Date,Kursusstart
 DocType: Item,Publish in Hub,Offentliggør i Hub
+DocType: Student Admission,Student Admission,Student Optagelse
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is cancelled,Vare {0} er aflyst
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Material Request,Materiale Request
+apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} is cancelled,Vare {0} er aflyst
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +823,Material Request,Materiale Request
 DocType: Bank Reconciliation,Update Clearance Date,Opdatering Clearance Dato
 apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +28,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 +328,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Vare {0} ikke fundet i &quot;Raw Materials Leveres &#39;bord i Indkøbsordre {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +333,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/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
@@ -309,20 +313,21 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +130,Please select Charge Type first,Vælg Charge Type først
 DocType: Student Group Student,Student Group Student,Student Group Student
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Seneste
+DocType: Email Digest,New Quotations,Nye Citater
 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"
 DocType: Tax Rule,Shipping County,Forsendelse County
 apps/erpnext/erpnext/config/desktop.py +158,Learn,Lære
 DocType: Asset,Next Depreciation Date,Næste Afskrivninger Dato
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Aktivitet Omkostninger per Medarbejder
 DocType: Accounts Settings,Settings for Accounts,Indstillinger for konti
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +626,Supplier Invoice No exists in Purchase Invoice {0},Leverandør faktura nr eksisterer i købsfaktura {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +629,Supplier Invoice No exists in Purchase Invoice {0},Leverandør faktura nr eksisterer i købsfaktura {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Administrer Sales Person Tree.
 DocType: Job Applicant,Cover Letter,Cover Letter
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Udestående Checks og Indlån at rydde
 DocType: Item,Synced With Hub,Synkroniseret med Hub
 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 +348,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 +86,Circular Reference Error,Cirkulær reference Fejl
@@ -334,15 +339,16 @@
 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 +806,Delivery Note,Følgeseddel
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +800,Delivery Note,Følgeseddel
 apps/erpnext/erpnext/config/learn.py +87,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 +233,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/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/setup/doctype/email_digest/email_digest.py +104,Summary for this week and pending activities,Resumé for denne uge og verserende aktiviteter
+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"
 DocType: Employee,Company Email,Firma Email
@@ -354,27 +360,28 @@
 apps/erpnext/erpnext/config/hr.py +186,"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"
-apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Køb Faktura kan ikke foretages mod en eksisterende aktiv {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +554,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 +54,{0} already allocated for Employee {1} for period {2} to {3},{0} allerede afsat til Medarbejder {1} for perioden {2} til {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +812,Select Item,Vælg Item
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +791,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 \
 					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 +142,Purchase Invoice {0} is already submitted,Købsfaktura {0} er allerede indsendt
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch nr skal være det samme som {1} {2}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +143,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.
 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 +342,Please see attachment,Se venligst vedhæftede
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,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 +19,Setup Already Complete!!,Opsætning Allerede Complete !!
 ,Finished Goods,Færdigvarer
 DocType: Delivery Note,Instructions,Instruktioner
 DocType: Quality Inspection,Inspected By,Inspiceres af
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Leverandør&gt; Leverandør Type
 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/public/js/utils/item_selector.js +12,Add Items,Læg varer
@@ -388,29 +395,29 @@
 DocType: Currency Exchange,Currency Exchange,Valutaveksling
 DocType: Purchase Invoice Item,Item Name,Item Name
 DocType: Authorization Rule,Approving User  (above authorized value),Godkendelse Bruger (over autoriserede værdi)
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Credit Balance
+DocType: Email Digest,Credit Balance,Credit Balance
 DocType: Employee,Widowed,Enke
-DocType: Request for Quotation,Request for Quotation,Anmodning om Citat
+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/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 +736,Purchase Return,Indkøb Return
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +715,Purchase Return,Indkøb Return
 ,Purchase Register,Indkøb Register
 DocType: 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 +202,{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 +209,{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 +143,Reason for losing,Årsag til at miste
-apps/erpnext/erpnext/accounts/utils.py +239,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 +163,Reason for losing,Årsag til at miste
+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
 DocType: Announcement,Receiver,Modtager
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation er lukket på følgende datoer som pr Holiday List: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Muligheder
 DocType: Employee,Single,Enkeltværelse
 DocType: Account,Cost of Goods Sold,Vareforbrug
 DocType: Purchase Invoice,Yearly,Årlig
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +225,Please enter Cost Center,Indtast Cost center
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,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
@@ -423,26 +430,26 @@
 DocType: Purchase Invoice,Supplier Name,Leverandør Navn
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Læs ERPNext Manual
 DocType: Account,Is Group,Is Group
+DocType: Email Digest,Pending Purchase Orders,Afventer indkøbsordrer
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Automatisk Serial nr baseret på FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Check Leverandør Fakturanummer Entydighed
 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 +102,Non Profit,Non Profit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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.,"Tilpas den indledende tekst, der går som en del af denne e-mail. Hver transaktion har en separat indledende tekst."
-DocType: Stock Reconciliation Item,Do not include symbols (ex. $),Må ikke indeholde symboler (tidl. $)
 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 +638,Attribute {0} selected multiple times in Attributes Table,Attribut {0} valgt flere gange i attributter Tabel
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Attribut {0} valgt flere gange i attributter Tabel
 DocType: HR Settings,Employee record is created using selected field. ,Medarbejder rekord er oprettet ved hjælp valgte felt.
 DocType: Sales Order,Not Applicable,Gælder ikke
 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 +862,Please enter Item Code.,Indtast venligst Item Code.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +847,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"
@@ -456,12 +463,12 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Værdipapirer og Indlån
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Total blade tildelte er obligatorisk
 DocType: Job Opening,Description of a Job Opening,Beskrivelse af et job Åbning
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Pending activities for today,Ventende aktiviteter for dag
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Ventende aktiviteter for dag
 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: Manufacturing Settings,Time Between Operations (in mins),Time Between Operations (i minutter)
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +92,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} budget for konto {1} mod Cost center {2} er {3}. Det vil overstige af {4}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +95,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} budget for konto {1} mod Cost center {2} er {3}. Det vil overstige af {4}
 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
@@ -469,16 +476,16 @@
 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/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 +86,Administrative Officer,Kontorfuldmægtig
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,Kontorfuldmægtig
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +23,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 +319,Please select Company,Vælg Firma
-DocType: Stock Entry,Difference Account,Forskel konto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +309,Please select Company,Vælg Firma
+DocType: Stock Entry Detail,Difference Account,Forskel konto
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Kan ikke lukke opgave som sin afhængige opgave {0} ikke er lukket.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,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 +399,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 +530,"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 +532,"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 +28,Buy,Købe
@@ -486,7 +493,7 @@
 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 +1563,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 +1587,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
@@ -495,13 +502,14 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Account {0} does not belong to company: {1},Konto {0} tilhører ikke virksomheden: {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation already used for another company,Forkortelse allerede brugt til et andet selskab
 DocType: Selling Settings,Default Customer Group,Standard Customer Group
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Supplier is required against Payable account {0},Leverandøren er påkrævet mod Betales konto {0}
 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
 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 +313,Reference No and Reference Date is mandatory for Bank transaction,Referencenummer og reference Dato er obligatorisk for Bank transaktion
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +316,Reference No and Reference Date is mandatory for Bank transaction,Referencenummer og reference Dato er obligatorisk for Bank transaktion
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Tilføj / rediger Skatter og Afgifter
 DocType: Purchase Invoice,Supplier Invoice No,Leverandør faktura nr
 DocType: Territory,For reference,For reference
@@ -512,7 +520,6 @@
 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/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Item Code&gt; Vare Gruppe&gt; Brand
 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/config/accounts.py +241,Setup cheque dimensions for printing,Opsætning kontrol dimensioner til udskrivning
 DocType: Salary Slip,Salary Slip Timesheet,Lønseddel Timeseddel
@@ -523,11 +530,11 @@
 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/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Ingen resultater i Invoice tabellen
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +28,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 +19,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 +707,Make Sales Order,Make kundeordre
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +701,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
@@ -543,23 +550,23 @@
 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 +734,Sales Return,Salg Return
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +728,Sales Return,Salg Return
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +91,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)
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Database over potentielle kunder.
 DocType: Authorization Rule,Customer or Item,Kunden eller emne
 apps/erpnext/erpnext/config/selling.py +28,Customer database.,Kundedatabase.
-DocType: Quotation,Quotation To,Citat Til
+DocType: Quotation,Quotation To,Tilbud til
 DocType: Lead,Middle Income,Midterste indkomst
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +212,Opening (Cr),Åbning (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +795,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"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 +237,Allocated amount can not be negative,Tildelte beløb kan ikke være negativ
+apps/erpnext/erpnext/stock/doctype/item/item.py +797,Default Unit of Measure for Item {0} cannot be changed directly because 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
 DocType: Purchase Order Item,Billed Amt,Billed Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Et logisk varelager hvor lagerændringer foretages.
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Salg Faktura Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},Referencenummer &amp; Reference Dato er nødvendig for {0}
-DocType: Sales Invoice,Customer's Vendor,Kundens Vendor
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Proposal Writing,Forslag Skrivning
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,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"
@@ -568,13 +575,14 @@
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,tidsregistrering
 DocType: Fiscal Year Company,Fiscal Year Company,Fiscal År Company
 DocType: Packing Slip Item,DN Detail,DN Detail
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +257,Already supplier quotation has created,Allerede leverandør citat har skabt
 DocType: Timesheet,Billed,Billed
 DocType: Batch,Batch Description,Batch Beskrivelse
+apps/erpnext/erpnext/accounts/utils.py +685,"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 +733,View Offline Records,Vis Offline Records
+apps/erpnext/erpnext/accounts/page/pos/pos.js +715,View Offline Records,Vis Offline Records
+DocType: Student,Sibling Details,søskende Detaljer
 DocType: Employee,Reason for Resignation,Årsag til Udmeldelse
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,Skabelon til præstationsvurderinger.
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,Faktura / Kassekladde Detaljer
@@ -588,7 +596,7 @@
 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
 DocType: Employee,Passport Number,Passport Number
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Manager,Leder
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,Leder
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,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
@@ -597,10 +605,11 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter email address,Indtast e-mail-adresse
 DocType: Production Order Operation,In minutes,I minutter
 DocType: Issue,Resolution Date,Opløsning Dato
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +299,Timesheet created:,Timeseddel oprettet:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +715,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/manufacturing/doctype/production_order/production_order.py +300,Timesheet created:,Timeseddel oprettet:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +772,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
 DocType: Selling Settings,Customer Naming By,Customer Navngivning Af
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Venligst setup Medarbejder navnesystem i Human Resource&gt; HR Indstillinger
 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
@@ -625,6 +634,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,Slutte
 DocType: Pricing Rule,Sales Manager,Salgschef
 DocType: Salary Structure Employee,Base,Grundlag
+DocType: Timesheet,Total Billed Hours,Total Billed Timer
 DocType: Journal Entry,Write Off Amount,Skriv Off Beløb
 DocType: Journal Entry,Bill No,Bill Ingen
 DocType: Company,Gain/Loss Account on Asset Disposal,Gevinst / Tab konto på Asset Bortskaffelse
@@ -639,11 +649,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +9,Pre Sales,Forud salg
 DocType: Purchase Receipt,Other Details,Andre detaljer
 DocType: Account,Accounts,Konti
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Marketing,Marketing
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +227,Payment Entry is already created,Betaling post er allerede skabt
+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,Betaling post er allerede skabt
 DocType: Purchase Receipt Item Supplied,Current Stock,Aktuel Stock
-apps/erpnext/erpnext/controllers/accounts_controller.py +538,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 +21,Preview Salary Slip,Eksempel lønseddel
+apps/erpnext/erpnext/controllers/accounts_controller.py +541,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 +38,Preview Salary Slip,Eksempel lønseddel
 DocType: Company,Deafult Cost Center,Deafult Cost center
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +48,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
@@ -652,7 +662,7 @@
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,Vælg Student Group
 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 +617,Item has variants.,Element har varianter.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,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
 DocType: Bin,Stock Value,Stock Value
 apps/erpnext/erpnext/accounts/doctype/account/account.py +25,Company {0} does not exist,Company {0} findes ikke
@@ -672,7 +682,7 @@
 DocType: Purchase Order,Supply Raw Materials,Supply råstoffer
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Den dato, hvor næste faktura vil blive genereret. Det genereres på send."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Omsætningsaktiver
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,{0} is not a stock Item,{0} er ikke et lager Vare
+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 +169,Lead must be set if Opportunity is made from Lead,"Emne skal indstilles, hvis mulighed er lavet af emne"
@@ -739,26 +749,25 @@
 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 +709,No Permission,Ingen Tilladelse
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +710,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}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +298,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 +542,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} skal indsendes
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} skal indsendes
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Ingen medarbejder fundet
 DocType: Supplier Quotation,Stopped,Stoppet
 DocType: Item,If subcontracted to a vendor,Hvis underentreprise til en sælger
 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.
 DocType: Warehouse,Tree Details,Tree Detaljer
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Send nu
 ,Support Analytics,Support Analytics
 DocType: Item,Website Warehouse,Website Warehouse
 DocType: Payment Reconciliation,Minimum Invoice Amount,Mindste Faktura Beløb
 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 +227,Timesheet {0} is already completed or cancelled,Timesheet {0} er allerede afsluttet eller annulleret
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +259,Timesheet {0} is already completed or cancelled,Timesheet {0} er allerede afsluttet eller annulleret
 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
@@ -774,13 +783,13 @@
 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
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +229,Target Warehouse,Target Warehouse
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +230,Target Warehouse,Target Warehouse
 DocType: Cheque Print Template,Starting location from left edge,Startende placering fra venstre kant
 DocType: Item,Allow over delivery or receipt upto this percent,Tillad løbet levering eller modtagelse op denne procent
 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,"Forventet leveringsdato kan ikke være, før Sales Order Date"
 DocType: Upload Attendance,Import Attendance,Import Fremmøde
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Alle varegrupper
+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/config/setup.py +89,Automatically compose message on submission of transactions.,Automatisk skrive besked på indsendelse af transaktioner.
@@ -792,13 +801,15 @@
 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/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
 DocType: Expense Claim,Expenses,Udgifter
 DocType: Item Variant Attribute,Item Variant Attribute,Item Variant Attribut
 ,Purchase Receipt Trends,Kvittering Tendenser
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Research & Development,Forskning &amp; Udvikling
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Forskning &amp; Udvikling
 ,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
@@ -807,7 +818,7 @@
 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/controllers/accounts_controller.py +340,"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."
+apps/erpnext/erpnext/controllers/accounts_controller.py +343,"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
@@ -829,12 +840,12 @@
 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 +756,Purchase Receipt,Kvittering
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +735,Purchase Receipt,Kvittering
 ,Received Items To Be Billed,Modtagne varer skal faktureres
 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 +167,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 +282,Unable to find Time Slot in the next {0} days for Operation {1},Kan ikke finde Time Slot i de næste {0} dage til Operation {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +170,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 +283,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 +439,BOM {0} must be active,BOM {0} skal være aktiv
@@ -845,7 +856,7 @@
 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 +214,Warehouses with existing transaction can not be converted to ledger.,Pakhuse med eksisterende transaktion kan ikke konverteres til Finans.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +217,Warehouses with existing transaction can not be converted to ledger.,Pakhuse med eksisterende transaktion 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
@@ -859,9 +870,9 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Medarbejder {0} er ikke aktiv eller findes ikke
 DocType: Fee Structure,Components,komponenter
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,Please enter Asset Category in Item {0},Indtast Asset kategori i Item {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +612,Item Variants {0} updated,Item Varianter {0} opdateret
+apps/erpnext/erpnext/stock/doctype/item/item.py +614,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 +843,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 +854,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
@@ -876,69 +887,72 @@
 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 +728,New Sales Invoice,Nye salgsfaktura
+apps/erpnext/erpnext/accounts/page/pos/pos.js +710,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 +728,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
 DocType: Material Request Item,Lead Time Date,Leveringstid Dato
 DocType: Guardian,Guardian Name,Guardian Navn
 DocType: Cheque Print Template,Has Print Format,Har Print Format
-apps/erpnext/erpnext/accounts/page/pos/pos.js +86, 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 +109,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 +619,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","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/page/pos/pos.js +75, 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 +613,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing 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 +606,Supplier Invoice Date cannot be greater than Posting Date,Leverandør Faktura Dato kan ikke være større end Udstationering Dato
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +609,Supplier Invoice Date cannot be greater than Posting Date,Leverandør Faktura Dato kan ikke være større end Udstationering Dato
 DocType: Purchase Invoice Item,Purchase Order Item,Indkøbsordre Item
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +130,Indirect Income,Indirekte Indkomst
 DocType: Cheque Print Template,Date Settings,datoindstillinger
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Varians
 ,Company Name,Firmaets navn
 DocType: SMS Center,Total Message(s),Total Besked (r)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +810,Select Item for Transfer,Vælg Item for Transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +789,Select Item for Transfer,Vælg Item for Transfer
 DocType: Purchase Invoice,Additional Discount Percentage,Yderligere rabatprocent
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Se en liste over alle de hjælpevideoer
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Vælg højde leder af den bank, hvor checken blev deponeret."
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Tillad brugeren at redigere Prisliste Rate i transaktioner
 DocType: Pricing Rule,Max Qty,Max Antal
-DocType: Student Applicant,Father's Name,Fars navn
 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 +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Række {0}: Betaling mod Salg / Indkøbsordre bør altid blive markeret som forskud
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Kemisk
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +686,All items have already been transferred for this Production Order.,Alle elementer er allerede blevet overført til denne produktionsordre.
+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
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +694,All items have already been transferred for this Production Order.,Alle elementer er allerede blevet overført til denne produktionsordre.
 DocType: Process Payroll,Select Payroll Year and Month,Vælg Payroll År og Måned
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,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
-DocType: Opportunity,Walk In,Walk In
 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 +12,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: Timesheet Detail,Bill,Regning
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,White,Hvid
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,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
 DocType: SMS Center,All Lead (Open),Alle emner (åbne)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +228,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})
+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 +731,Make ,Lave
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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."
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Indkøbskurv
-apps/erpnext/erpnext/controllers/selling_controller.py +154,Order Type must be one of {0},Bestil type skal være en af {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Bestil type skal være en af {0}
 DocType: Lead,Next Contact Date,Næste Kontakt Dato
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Åbning Antal
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +393,Please enter Account for Change Amount,Indtast konto for ændring beløb
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,Please enter Account for Change Amount,Indtast konto for ændring beløb
 DocType: Student Batch,Student Batch Name,Student Kladdenavn
 DocType: Holiday List,Holiday List Name,Holiday listenavn
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js +8,Schedule Course,Skema Kursus
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Stock Options,Aktieoptioner
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Aktieoptioner
 DocType: Journal Entry Account,Expense Claim,Expense krav
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +211,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 +237,Qty for {0},Antal for {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +212,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 +238,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
@@ -947,9 +961,9 @@
 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/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Fjernede elementer uden nogen ændringer i mængde eller værdi.
+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 +635,Attribute table is mandatory,Attributtabellen er obligatorisk
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Attributtabellen er obligatorisk
 DocType: Production Planning Tool,Get Sales Orders,Få salgsordrer
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{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
@@ -974,7 +988,7 @@
 apps/erpnext/erpnext/config/stock.py +190,"Attributes for Item Variants. e.g Size, Color etc.","Attributter for Item 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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Løbenummer {0} er under vedligeholdelse kontrakt op {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +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
@@ -986,7 +1000,7 @@
 DocType: GL Entry,Against,Imod
 DocType: Item,Default Selling Cost Center,Standard salgs kostcenter
 DocType: Sales Partner,Implementation Partner,Implementering Partner
-apps/erpnext/erpnext/controllers/selling_controller.py +231,Sales Order {0} is {1},Sales Order {0} er {1}
+apps/erpnext/erpnext/controllers/selling_controller.py +232,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
 DocType: Packing Slip,Net Weight UOM,Nettovægt UOM
@@ -996,25 +1010,24 @@
 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
 DocType: Sales Person,Select company name first.,Vælg firmanavn først.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Dr,Dr
-apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Citater modtaget fra leverandører.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Dr,Dr
+apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Tilbud modtaget fra leverandører.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},Til {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Gennemsnitlig alder
 DocType: 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/templates/pages/home.html +32,View All Products,Se alle produkter
+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,Indtast udpegelsen af denne Kontakt
 DocType: Expense Claim,From Employee,Fra Medarbejder
-apps/erpnext/erpnext/controllers/accounts_controller.py +400,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Advarsel: Systemet vil ikke tjekke overfakturering, da beløbet til konto {0} i {1} er nul"
+apps/erpnext/erpnext/controllers/accounts_controller.py +403,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/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,og år:
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +191,{0} {1} must be submitted,{0} {1} skal indsendes
-DocType: Email Digest,Annual Expense,Årlig Udgift
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,{0} {1} must be submitted,{0} {1} skal indsendes
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +145,Quantity must be less than or equal to {0},Antal skal være mindre end eller lig med {0}
 DocType: SMS Center,Total Characters,Total tegn
 apps/erpnext/erpnext/controllers/buying_controller.py +156,Please select BOM in BOM field for Item {0},Vælg BOM i BOM vilkår for Item {0}
@@ -1025,30 +1038,31 @@
 DocType: Sales Partner,Distributor,Distributør
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Indkøbskurv Shipping Rule
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +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 +62,Please set 'Apply Additional Discount On',Venligst sæt &#39;Anvend Ekstra Rabat på&#39;
+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
 DocType: Global Defaults,Global Defaults,Globale standarder
 apps/erpnext/erpnext/projects/doctype/project/project.py +153,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
 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 +327,Capacity Planning Error,Capacity Planning Fejl
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,Capacity Planning Fejl
 ,Trial Balance for Party,Trial Balance til Party
 DocType: Lead,Consultant,Konsulent
 DocType: Salary Slip,Earnings,Indtjening
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +362,Finished Item {0} must be entered for Manufacture type entry,Færdig element {0} skal indtastes for Fremstilling typen post
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +367,Finished Item {0} must be entered for Manufacture type entry,Færdig element {0} skal indtastes for Fremstilling typen post
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Åbning Regnskab Balance
 DocType: Sales Invoice Advance,Sales Invoice Advance,Salg Faktura Advance
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +499,Nothing to request,Intet at anmode
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +500,Nothing to request,Intet at anmode
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','Faktisk startdato' kan ikke være større end 'Faktisk slutdato'
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Management,Ledelse
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},Enten kredit- eller beløb er påkrævet for {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,Ledelse
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +55,Either debit or credit amount is required for {0},Enten kredit- eller beløb er påkrævet for {0}
 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 +161,Blue,Blå
+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
@@ -1058,12 +1072,12 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +23,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
 DocType: Stock Settings,Default Item Group,Standard Punkt Group
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1374,Do you really want to submit the invoice?,Vil du virkelig ønsker at indsende fakturaen?
+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 +685,Cost Center For Item with Item Code ',Cost Center For Item med Item Code &#39;
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1526,"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 +679,Cost Center For Item with Item Code ',Cost Center For Item med Item Code &#39;
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1550,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Betaling tilstand er ikke konfigureret. Kontroller, om konto er blevet indstillet på Mode betalinger eller på POS profil."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Dit salg person vil få en påmindelse på denne dato for at kontakte kunden
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,"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
@@ -1083,104 +1097,106 @@
 DocType: Payment Reconciliation,Unreconciled Payment Details,Ikke-afstemte Betalingsoplysninger
 DocType: Global Defaults,Current Fiscal Year,Indeværende finansår
 DocType: Global Defaults,Disable Rounded Total,Deaktiver Afrundet Total
-DocType: Lead,Call,Opkald
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +417,'Entries' cannot be empty,'Indlæg' kan ikke være tomt
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +418,'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 +214,Fiscal Year {0} not found,Regnskabsår {0} blev ikke fundet
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +221,Fiscal Year {0} not found,Regnskabsår {0} blev ikke fundet
 apps/erpnext/erpnext/config/hr.py +238,Setting up Employees,Opsætning af Medarbejdere
 DocType: Sales Order,SO-,SÅ-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Vælg venligst præfiks først
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Please select prefix first,Vælg venligst præfiks først
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Research,Forskning
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,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 +43,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 +57,View Ledger,Vis Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Tidligste
-apps/erpnext/erpnext/stock/doctype/item/item.py +504,"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 +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/setup/setup_wizard/setup_wizard.py +437,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
 ,Budget Variance Report,Budget Variance Report
 DocType: Salary Slip,Gross Pay,Gross Pay
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +90,Row {0}: Activity Type is mandatory.,Række {0}: Aktivitet Typen er obligatorisk.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +114,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/public/js/controllers/stock_controller.js +40,Accounting Ledger,Regnskab Ledger
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,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
 DocType: BOM Item,Item Description,Punkt Beskrivelse
+DocType: Student Sibling,Student Sibling,Student Søskende
 DocType: Purchase Invoice,Is Recurring,Er Tilbagevendende
 DocType: Purchase Invoice,Supplied Items,Medfølgende varer
 DocType: Student,STUD.,STUD.
 DocType: Production Order,Qty To Manufacture,Antal Til Fremstilling
+DocType: 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/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 +131,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 +175,Valuation Rate required for Item in row {0},Værdiansættelse Rate kræves for Item i række {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,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
 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 +87, to ,til
+apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,til
 DocType: Item,Lead Time in days,Lead Time i dage
 ,Accounts Payable Summary,Kreditorer Resumé
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Not authorized to edit frozen Account {0},Ikke autoriseret til at redigere frosne konto {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},Ikke autoriseret til at redigere frosne konto {0}
 DocType: Journal Entry,Get Outstanding Invoices,Få udestående fakturaer
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +62,Sales Order {0} is not valid,Sales Order {0} er ikke gyldig
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Sales Order {0} er ikke gyldig
 apps/erpnext/erpnext/setup/doctype/company/company.py +185,"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 +152,Small,Lille
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,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}"
 ,Invoiced Amount (Exculsive Tax),Faktureret beløb (exculsive Tax)
-DocType: Student Applicant,Mother's / Guardian 1 Email ID,Mors / Guardian en e-mail-id
 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 +160,Green,Grøn
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,Grøn
 DocType: Supplier,SUPP-,SUPP-
 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 +57,Contract,Kontrakt
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,Kontrakt
 DocType: Email Digest,Add Quote,Tilføj Citat
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +498,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 +503,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 +80,Row {0}: Qty is mandatory,Række {0}: Antal er obligatorisk
+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 +737,Sync Master Data,Sync Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +719,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/public/js/setup_wizard.js +283,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
+DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Dette er en rod varegruppe og kan ikke redigeres.
+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.
 DocType: Journal Entry Account,Purchase Order,Indkøbsordre
 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 +345,"{0}: Employee email not found, hence email not sent","{0}: Medarbejder email ikke fundet, derfor Email ikke sendt"
+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
 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 +118,"For {0}, only credit accounts can be linked against another debit entry",For {0} kan kun kredit konti knyttes mod en anden debet post
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Delivery Note {0} is not submitted,Levering Note {0} er ikke indsendt
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Delivery Note {0} is not submitted,Levering Note {0} er ikke indsendt
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Sub-contracted Item,Vare {0} skal være en underentreprise Vare
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Capital Udstyr
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Prisfastsættelse Regel først valgt baseret på &quot;Apply On &#39;felt, som kan være Item, punkt Group eller Brand."
 DocType: Hub Settings,Seller Website,Sælger Website
 DocType: Item,ITEM-,VARE-
-apps/erpnext/erpnext/controllers/selling_controller.py +147,Total allocated percentage for sales team should be 100,Samlede fordelte procentdel for salgsteam bør være 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +110,Production Order status is {0},Produktionsordre status er {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Samlede fordelte procentdel for salgsteam bør være 100
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Produktionsordre status er {0}
 DocType: Appraisal Goal,Goal,Goal
 DocType: Sales Invoice Item,Edit Description,Edit Beskrivelse
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +757,For Supplier,For Leverandøren
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +723,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
@@ -1196,10 +1212,11 @@
 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
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +445,BOM {0} does not belong to Item {1},BOM {0} ikke hører til Vare {1}
 DocType: Sales Partner,Target Distribution,Target Distribution
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1667,Deafault warehouse is required for selected item,Deafault lager er nødvendig for valgte punkt
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Deafault warehouse is required for selected item,Deafault lager er nødvendig for valgte punkt
 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
@@ -1207,24 +1224,24 @@
 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 Citat Leverandør
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Hardware,Hardware
+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
 DocType: Sales Order,Recurring Upto,tilbagevendende Op
 DocType: Attendance,HR Manager,HR Manager
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Vælg Firma
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Privilege Leave,Privilege Forlad
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,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 +79,You need to enable Shopping Cart,Du skal aktivere Indkøbskurv
 DocType: Payment Entry,Writeoff,Skrive af
 DocType: Appraisal Template Goal,Appraisal Template Goal,Vurdering Template Goal
-DocType: Salary Slip,Earning,Optjening
+DocType: Salary Component,Earning,Optjening
 DocType: Purchase Invoice,Party Account Currency,Party Account Valuta
 ,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 +171,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 +174,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_data.py +358,Food,Mad
+apps/erpnext/erpnext/demo/setup/setup_data.py +301,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,Ingen af besøg
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.js +103,Mark Attendence,Mark attendence
@@ -1258,21 +1275,21 @@
 DocType: Sales Order Item,Planned Quantity,Planlagt Mængde
 DocType: Purchase Invoice Item,Item Tax Amount,Item Skat Beløb
 DocType: Item,Maintain Stock,Vedligehold Stock
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +209,Stock Entries already created for Production Order ,Stock Entries allerede skabt til produktionsordre
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,Stock Entries allerede skabt til produktionsordre
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,Nettoændring i anlægsaktiver
 DocType: Leave Control Panel,Leave blank if considered for all designations,Lad stå tomt hvis det anses for alle betegnelser
-apps/erpnext/erpnext/controllers/accounts_controller.py +620,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 +238,Max: {0},Max: {0}
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +15,From Datetime,Fra datotid
+apps/erpnext/erpnext/controllers/accounts_controller.py +623,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 +239,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 +153,"Request for Quotation is disabled to access from portal, for more check portal settings.","Anmodning om Citat er deaktiveret til adgang fra portalen, for flere kontroller portal indstillinger."
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +153,"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
 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 +552,cannot be greater than 100,må ikke være større end 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +680,Item {0} is not a stock Item,Vare {0} er ikke et lager Vare
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +546,cannot be greater than 100,må ikke være større end 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,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
@@ -1286,10 +1303,9 @@
 DocType: GL Entry,GL Entry,GL indtastning
 DocType: HR Settings,Employee Settings,Medarbejder Indstillinger
 ,Batch-Wise Balance History,Batch-Wise Balance History
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,To Do List
 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 +61,Apprentice,Lærling
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +102,Negative Quantity is not allowed,Negative Mængde er ikke tilladt
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,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 +152,Employee cannot report to himself.,Medarbejder kan ikke rapportere til ham selv.
@@ -1310,15 +1326,14 @@
 DocType: Asset,Asset Name,Asset Name
 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 +141,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 +719,Packing Slip,Packing Slip
+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 +713,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/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,Anmodning om tilbud kan være adgang ved at klikke på følgende link
 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 +81,Analyst,Analytiker
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,Analytiker
 DocType: Item,Inventory,Inventory
 DocType: Item,Sales Details,Salg Detaljer
 DocType: Quality Inspection,QI-,QI-
@@ -1326,7 +1341,7 @@
 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 +103,Government,Regeringen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,Regeringen
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,Institut Navn
 apps/erpnext/erpnext/config/stock.py +289,Item Variants,Item Varianter
 DocType: Company,Services,Tjenester
@@ -1342,6 +1357,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,Financial Year Start Date,Regnskabsår Startdato
 DocType: POS Profile,Apply Discount,Anvend rabat
 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
 DocType: Program Course,Program Course,Program Kursus
@@ -1382,12 +1398,12 @@
 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
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +110,Accounting Entry for {0} can only be made in currency: {1},Regnskab Punktet om {0} kan kun foretages i valuta: {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Regnskab Punktet om {0} kan kun foretages i valuta: {1}
 DocType: Pricing Rule,Pricing Rule,Prisfastsættelse Rule
 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
 DocType: Shopping Cart Settings,Payment Success URL,Betaling Succes URL
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +78,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: returnerede vare {1} ikke eksisterer i {2} {3}
+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
@@ -1396,43 +1412,42 @@
 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/stock/doctype/stock_entry/stock_entry.py +339,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Ikke lov til at overdragelsessteder mere {0} end {1} mod indkøbsordre {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +344,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Ikke lov til at overdragelsessteder mere {0} end {1} mod indkøbsordre {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +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 +545,Manufacturing Quantity is mandatory,Produktion Mængde er obligatorisk
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Produktion Mængde er obligatorisk
 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 +71,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 +162,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/projects/doctype/timesheet/timesheet.py +186,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
 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 Anmodning om hvilke Leverandør Citater ikke er skabt
 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 +130,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 +137,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
 DocType: Dependent Task,Dependent Task,Afhængig Opgave
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Venligst setup Medarbejder navnesystem i Human Resource&gt; HR Indstillinger
 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 +190,Leave of type {0} cannot be longer than {1},Ferie af typen {0} må ikke være længere end {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +197,Leave of type {0} cannot be longer than {1},Ferie af typen {0} må ikke være længere end {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Prøv at planlægge operationer for X dage i forvejen.
 DocType: HR Settings,Stop Birthday Reminders,Stop Fødselsdag Påmindelser
 DocType: SMS Center,Receiver List,Modtager liste
-apps/erpnext/erpnext/accounts/page/pos/pos.js +921,Search Item,Søg Vare
+apps/erpnext/erpnext/accounts/page/pos/pos.js +910,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 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åleenhed {0} er indtastet mere end én gang i Conversion Factor Table
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +546,Already completed,Allerede afsluttet
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +22,Payment Request already exists {0},Betaling Anmodning findes allerede {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +550,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 +241,Quantity must not be more than {0},Mængde må ikke være mere end {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Quantity must not be more than {0},Mængde må ikke være mere end {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +76,Previous Financial Year is not closed,Foregående regnskabsår er ikke lukket
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +44,Age (Days),Alder (dage)
-DocType: Quotation Item,Quotation Item,Citat Vare
+DocType: Quotation Item,Quotation Item,Tilbudt Varer
 DocType: Account,Account Name,Kontonavn
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,Fra dato ikke kan være større end til dato
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Løbenummer {0} mængde {1} kan ikke være en brøkdel
@@ -1446,7 +1461,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +221,Purchase Receipt {0} is not submitted,Kvittering {0} er ikke indsendt
 DocType: Company,Default Payable Account,Standard Betales konto
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Indstillinger for online indkøbskurv, såsom skibsfart regler, prisliste mv"
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +83,{0}% Billed,{0}% Billed
+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
@@ -1458,12 +1473,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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/schools/doctype/fees/fees.js +22,Collect,Indsamle
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Indsamle
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,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 +225,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
-DocType: Payment Reconciliation,Payments,Betalinger
 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
@@ -1475,7 +1489,7 @@
 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 +9,Procurement,indkøb
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,Ingen af elementerne har nogen ændring i mængde eller værdi.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,Ingen af elementerne har nogen ændring i mængde eller værdi.
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +32,Warranty Claim,Garanti krav
 ,Lead Details,Emne Detaljer
 DocType: Purchase Invoice,End date of current invoice's period,Slutdato for aktuelle faktura menstruation
@@ -1500,7 +1514,7 @@
 DocType: Purchase Invoice,Additional Discount,Ekstra Rabat
 DocType: Selling Settings,Selling Settings,Salgsindstillinger
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Online Auktioner
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +97,Please specify either Quantity or Valuation Rate or both,Angiv venligst enten mængde eller Værdiansættelse Rate eller begge
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,Angiv venligst enten mængde eller Værdiansættelse Rate eller begge
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +13,Fulfillment,Opfyldelse
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Company, Måned og regnskabsår er obligatorisk"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Markedsføringsomkostninger
@@ -1521,14 +1535,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,ERPNext Setup Complete!
 DocType: Item,Weightage,Weightage
 DocType: Packing Slip,PS-,PS
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +93,A Customer Group exists with same name please change the Customer name or rename the Customer Group,En kundegruppe med samme navn findes. Ret Kundens navn eller omdøb kundegruppen
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +126,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
 DocType: Stock Entry,Material Receipt,Materiale Kvittering
 DocType: Homepage,Products,Produkter
 DocType: Announcement,Instructor,Instruktør
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},Party Type og parti er nødvendig for Tilgodehavende / Betales konto {0}
 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 By
@@ -1539,7 +1552,7 @@
 ,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 +704,Offline,Offline
+apps/erpnext/erpnext/accounts/page/pos/pos.js +686,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
@@ -1557,25 +1570,27 @@
 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
 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 +858,Make Purchase Order,Make indkøbsordre
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +852,Make Purchase Order,Make indkøbsordre
 DocType: SMS Center,Send To,Send til
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,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 +148,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
 DocType: Stock Reconciliation,Stock Reconciliation,Stock Afstemning
 DocType: Territory,Territory Name,Territory Navn
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +172,Work-in-Progress Warehouse is required before Submit,"Work-in-Progress Warehouse er nødvendig, før Indsend"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,Work-in-Progress Warehouse is required before Submit,"Work-in-Progress Warehouse er nødvendig, før Indsend"
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Ansøger om et job.
 DocType: Purchase Order Item,Warehouse and Reference,Warehouse og reference
 DocType: Supplier,Statutory info and other general information about your Supplier,Lovpligtig info og andre generelle oplysninger om din leverandør
-apps/erpnext/erpnext/hooks.py +88,Addresses,Adresser
-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/payment_entry/payment_entry.py +212,Against Journal Entry {0} does not have any unmatched {1} entry,Mod Kassekladde {0} har ikke nogen uovertruffen {1} indgang
+apps/erpnext/erpnext/hooks.py +95,Addresses,Adresser
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +215,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
 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)
 DocType: Sales Order,To Deliver and Bill,At levere og Bill
@@ -1583,11 +1598,10 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,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 +731,Payment,Betaling
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,Payment,Betaling
 DocType: Production Order Operation,Actual Time and Cost,Aktuel leveringstid og omkostninger
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Materiale Request af maksimum {0} kan gøres for Item {1} mod Sales Order {2}
 DocType: Employee,Salutation,Salutation
-DocType: Pricing Rule,Brand,Brand
 DocType: Course,Course Abbreviation,Kursus Forkortelse
 DocType: Item,Will also apply for variants,Vil også gælde for varianter
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +142,"Asset cannot be cancelled, as it is already {0}","Asset kan ikke annulleres, da det allerede er {0}"
@@ -1599,7 +1613,7 @@
 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."
 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 +85,Associate,Associate
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,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
@@ -1607,7 +1621,7 @@
 DocType: Production Planning Tool,Material Requests,Materiale Anmodning
 DocType: Warranty Claim,Issue Date,Udstedelsesdagen
 DocType: Activity Cost,Activity Cost,Aktivitet Omkostninger
-DocType: Timesheet Detail,Timesheet Detail,timeseddel Detail
+DocType: Sales Invoice Timesheet,Timesheet Detail,timeseddel Detail
 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)"
@@ -1628,8 +1642,9 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},Vare {0} forekommer flere gange i prisliste {1}
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Selling skal kontrolleres, om nødvendigt er valgt som {0}"
 DocType: Production Plan Material Request,Material Request Date,Materiale Request Dato
-DocType: Purchase Order Item,Supplier Quotation Item,Leverandør Citat Vare
+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
 DocType: Item,Has Variants,Har Varianter
 DocType: Monthly Distribution,Name of the Monthly Distribution,Navnet på den månedlige Distribution
 DocType: Sales Person,Parent Sales Person,Parent Sales Person
@@ -1642,30 +1657,31 @@
 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 +44,"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/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."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +502,Error: {0} &gt; {1},Fejl: {0}&gt; {1}
 DocType: Item,Is Sales Item,Er Sales Item
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Item Group Tree
 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."
 DocType: Naming Series,Current Value,Aktuel værdi
-apps/erpnext/erpnext/controllers/accounts_controller.py +235,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/controllers/accounts_controller.py +238,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Flere regnskabsår findes for den dato {0}. Indstil selskab i regnskabsåret
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} oprettet
 DocType: Delivery Note Item,Against Sales Order,Mod kundeordre
 ,Serial No Status,Løbenummer status
 DocType: Payment Entry Reference,Outstanding,Udestående
 ,Daily Timesheet Summary,Daglig Timesheet Summary
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +458,Item table can not be blank,Item tabel kan ikke være tom
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +443,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 +5,This is based on stock movement. See {0} for details,Dette er baseret på lager bevægelse. Se {0} for detaljer
 DocType: Pricing Rule,Selling,Salg
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +341,Amount {0} {1} deducted against {2},Mængden {0} {1} trækkes mod {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +344,Amount {0} {1} deducted against {2},Mængden {0} {1} trækkes mod {2}
 DocType: Employee,Salary Information,Løn Information
 DocType: Sales Person,Name and Employee ID,Navn og 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"
@@ -1680,8 +1696,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +144,Cannot refer row number greater than or equal to current row number for this Charge type,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 +159,Red,Rød
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Klik på &quot;Generer Schedule &#39;at hente Løbenummer tilføjet for Item {0}
+apps/erpnext/erpnext/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
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Base Beløb (Company Currency)
@@ -1689,7 +1705,7 @@
 DocType: Installation Note,Installation Time,Installation Time
 DocType: Sales Invoice,Accounting Details,Regnskab Detaljer
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,Slette alle transaktioner for denne Company
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +187,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Row # {0}: Operation {1} er ikke afsluttet for {2} qty af færdigvarer i produktionsordre # {3}. Du opdatere driftsstatus via Time Logs
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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,Row # {0}: Operation {1} er ikke afsluttet for {2} qty af færdigvarer i produktionsordre # {3}. Du opdatere driftsstatus via Time Logs
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,Investeringer
 DocType: Issue,Resolution Details,Opløsning Detaljer
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,tildelinger
@@ -1725,16 +1741,17 @@
 DocType: Bank Reconciliation Detail,Against Account,Mod konto
 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}
 DocType: Delivery Note,Excise Page Number,Excise Sidetal
 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}
 ,Maintenance Schedules,Vedligeholdelsesplaner
 DocType: Task,Actual End Date (via Time Sheet),Faktisk Slutdato (via Time Sheet)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Amount {0} {1} against {2} {3},Mængden {0} {1} mod {2} {3}
-,Quotation Trends,Citat Trends
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +339,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 +138,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 +295,Debit To account must be a Receivable account,Betalingskort Til konto skal være et tilgodehavende konto
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Receivable account,Betalingskort Til konto skal være et tilgodehavende konto
 DocType: Shipping Rule Condition,Shipping Amount,Forsendelse Mængde
 ,Pending Amount,Afventer Beløb
 DocType: Purchase Invoice Item,Conversion Factor,Konvertering Factor
@@ -1742,10 +1759,10 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +137,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"
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +90,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Samlede fordelte blade {0} kan ikke være mindre end allerede godkendte blade {1} for perioden
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +93,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 +22,Enter Paid Amount,Indtast Betalt beløb
+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
@@ -1755,13 +1772,15 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,timesedler
 DocType: HR Settings,HR Settings,HR-indstillinger
 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 +524,"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."
+apps/erpnext/erpnext/controllers/accounts_controller.py +527,"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 +249,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
 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/stock/get_item_details.py +123,Please specify Company,Angiv venligst Company
 ,Customer Acquisition and Loyalty,Customer Acquisition og Loyalitet
@@ -1772,17 +1791,19 @@
 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 +183,Closing (Opening + Totals),Lukning (Åbning + Totals)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),Lukning (Åbning + Totals)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Angiv venligst valuta i selskabet
 DocType: Workstation,Wages per hour,Lønningerne i timen
 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/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
-apps/erpnext/erpnext/controllers/accounts_controller.py +272,Account {0} is invalid. Account Currency must be {1},Konto {0} er ugyldig. Konto Valuta skal være {1}
+DocType: Email Digest,Pending Sales Orders,Afventer salgsordrer
+apps/erpnext/erpnext/controllers/accounts_controller.py +275,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 +956,"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 Slip,Deduction,Fradrag
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +87,Row {0}: From Time and To Time is mandatory.,Række {0}: Fra tid og til tid er obligatorisk.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +969,"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 +111,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 +262,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 +7,Please enter Employee Id of this sales person,Indtast venligst Medarbejder Id dette salg person
@@ -1790,62 +1811,63 @@
 DocType: Project,% Tasks Completed,% Opgaver Afsluttet
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,Forskel Beløb skal være nul
 DocType: Project,Gross Margin,Gross Margin
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +194,Please enter Production Item first,Indtast venligst Produktion Vare først
+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,handicappet bruger
-apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Citat
+apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,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 +149,Cost Updated,Omkostninger Opdateret
 DocType: Employee,Date of Birth,Fødselsdato
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +86,Item {0} has already been returned,Element {0} er allerede blevet returneret
+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}
+DocType: Student Admission,Eligibility,Berettigelse
 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 +177,Job Description,Jobbeskrivelse
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,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 +126,"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 +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Specialtegn undtagen &quot;-&quot; &quot;.&quot;, &quot;#&quot;, og &quot;/&quot; ikke tilladt i navngivning serie"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Hold styr på salgskampagner. Hold styr på Leads, Citater, Sales Order osv fra kampagner til at måle Return on Investment."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +24,Welcome to POS: Create your POS Profile,Velkommen til POS: Opret din POS profil
 DocType: Expense Claim,Approver,Godkender
 ,SO Qty,SO Antal
+DocType: Guardian,Work Address,Arbejde Adresse
 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 +191,Serial No {0} is under warranty upto {1},Løbenummer {0} er under garanti op {1}
+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 +74,Shipments,Forsendelser
+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
 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 +153,Row # ,Row #
+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 +156,Get From,Få Fra
+apps/erpnext/erpnext/public/js/utils.js +167,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 +167,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 +416,"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"
+apps/erpnext/erpnext/controllers/accounts_controller.py +419,"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
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} is disabled,Bruger {0} er deaktiveret
 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 handicappede brugere
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +98,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 +171,"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 +346,{0} is mandatory for Item {1},{0} er obligatorisk for Item {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,{0} is mandatory for Item {1},{0} er obligatorisk for Item {1}
 DocType: Currency Exchange,From Currency,Fra Valuta
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Vælg tildelte beløb, Faktura Type og Fakturanummer i mindst én række"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,Udgifter til nye køb
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},Sales Order kræves for Item {0}
 DocType: Purchase Invoice Item,Rate (Company Currency),Rate (Company Valuta)
-apps/erpnext/erpnext/demo/setup_data.py +360,Others,Andre
+DocType: Student Guardian,Others,Andre
 DocType: Payment Entry,Unallocated Amount,Ufordelt Beløb
 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
@@ -1865,17 +1887,16 @@
 apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,Føljeton Inventory
 DocType: Activity Type,Default Billing Rate,Standard Billing Rate
 DocType: Sales Invoice,Total Billing Amount,Samlet Billing Beløb
-apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +54,Receivable Account,Tilgodehavende konto
-apps/erpnext/erpnext/controllers/accounts_controller.py +546,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} er allerede {2}
+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 +549,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 +79,CEO,Direktør
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,Direktør
 DocType: Expense Claim Detail,Expense Claim Detail,Expense krav Detail
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +808,Please select correct account,Vælg korrekt konto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +809,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
-DocType: Purchase Invoice Item,Page Break,Side Break
 DocType: Production Order Operation,Pending,Afventer
 DocType: Course,Course Name,Kursus navn
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Brugere, der kan godkende en bestemt medarbejders orlov applikationer"
@@ -1884,14 +1905,15 @@
 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 +54,Full-time,Fuld tid
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,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: Student,Guardians,Guardians
 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 +289,Debit To is required,Debit Til kræves
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +321,Debit To is required,Debit Til kræves
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Indkøb prisliste
 DocType: Offer Letter Term,Offer Term,Offer Term
 DocType: Quality Inspection,Quality Manager,Kvalitetschef
@@ -1899,6 +1921,7 @@
 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/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
@@ -1909,18 +1932,17 @@
 DocType: Production Order Operation,Completed Qty,Afsluttet Antal
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"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 +273,Price List {0} is disabled,Prisliste {0} er deaktiveret
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +99,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/projects/doctype/timesheet/timesheet.py +123,Row {0}: Completed Qty cannot be more than {1} for operation {2},Række {0}: Afsluttet Antal kan ikke være mere end {1} til drift {2}
 DocType: Manufacturing Settings,Allow Overtime,Tillad Overarbejde
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,"{0} serienumre, der kræves for Item {1}. Du har givet {2}."
 DocType: Stock Reconciliation Item,Current Valuation Rate,Aktuel Værdiansættelse Rate
 DocType: Item,Customer Item Codes,Kunde Item Koder
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,Exchange Gevinst / Tab
 DocType: Opportunity,Lost Reason,Tabt Årsag
-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/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/purchase_receipt/purchase_receipt.py +378,All items have already been invoiced,Alle elementer er allerede blevet faktureret
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +379,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
@@ -1936,18 +1958,19 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Dine kunder
 apps/erpnext/erpnext/projects/doctype/project/project.py +141,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/job_opening.html +19,Apply Now,Ansøg nu
+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."
 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
-apps/erpnext/erpnext/utilities/doctype/address/address.py +164,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: Fee Structure,Fee Structure,Gebyr struktur
 DocType: Timesheet Detail,Costing Amount,Koster Beløb
+DocType: Student Admission,Application Fee,Tilmeldingsgebyr
 DocType: Process Payroll,Submit Salary Slip,Indsend lønseddel
-apps/erpnext/erpnext/controllers/selling_controller.py +161,Maxiumm discount for Item {0} is {1}%,Maxiumm rabat for Item {0} er {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,Maxiumm rabat for Item {0} er {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Import i bulk
 DocType: Sales Partner,Address & Contacts,Adresse &amp; Contacts
 DocType: SMS Log,Sender Name,Sender Name
@@ -1972,21 +1995,21 @@
 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_data.py +361,Travel,Rejser
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +155,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 +304,Travel,Rejser
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +167,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 +23,Update Cost,Opdatering Omkostninger
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Opdatering Omkostninger
 DocType: Item Reorder,Item Reorder,Item Genbestil
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +36,Show Salary Slip,Vis lønseddel
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +748,Transfer Material,Transfer Materiale
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +53,Show Salary Slip,Vis lønseddel
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +166,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 +923,Please set recurring after saving,Venligst sæt tilbagevendende efter besparelse
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +646,Select change amount account,Vælg ændringsstørrelse konto
+apps/erpnext/erpnext/public/js/controllers/transaction.js +914,Please set recurring after saving,Venligst sæt tilbagevendende efter besparelse
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +703,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
@@ -1998,31 +2021,32 @@
 DocType: Quality Inspection,Verified By,Verified by
 DocType: Address,Subsidiary,Datterselskab
 apps/erpnext/erpnext/setup/doctype/company/company.py +64,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Kan ikke ændre virksomhedens standard valuta, fordi der er eksisterende transaktioner. Transaktioner skal annulleres for at ændre standard valuta."
+DocType: Grade Interval,Grade Description,Grade Beskrivelse
 DocType: Quality Inspection,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 +33,Traceability,Sporbarhed
 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 +352,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Mængde i række {0} ({1}), skal være det samme som fremstillede mængde {2}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Mængde i række {0} ({1}), skal være det samme som fremstillede mængde {2}"
 DocType: Appraisal,Employee,Medarbejder
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Inviter som Bruger
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} er fuldt faktureret
 DocType: Workstation Working Hour,End Time,End Time
 DocType: Payment Entry,Payment Deductions or Loss,Betalings Fradrag eller Tab
-apps/erpnext/erpnext/config/schools.py +100,LMS,LMS
+apps/erpnext/erpnext/config/schools.py +104,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/config/crm.py +6,Sales Pipeline,salgspipeline
 DocType: Student Batch Student,Student Batch Student,Student Batch Studerende
-DocType: Sales Invoice,Mass Mailing,Mass Mailing
+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 +199,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/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 +297,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 +111,Pharmaceutical,Farmaceutiske
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +309,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/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
@@ -2037,27 +2061,28 @@
 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 +814,Please specify Company to proceed,Angiv venligst Company for at fortsætte
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +793,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 +44,Compensatory Off,Kompenserende Off
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,Kompenserende Off
 DocType: Quality Inspection Reading,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."
 DocType: Room,Room Number,Værelsesnummer
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Ugyldig henvisning {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +161,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) kan ikke være større end planlagt antal ({2}) på produktionsordre {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +162,{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 +217,Raw Materials cannot be blank.,Raw Materials kan ikke være tom.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,"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 +460,Quick Journal Entry,Hurtig Kassekladde
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +111,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/accounts/doctype/sales_invoice/sales_invoice.py +441,"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 +450,Quick Journal Entry,Hurtig Kassekladde
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +103,You can not change rate if BOM mentioned agianst any item,"Du kan ikke ændre kurs, hvis BOM nævnt agianst ethvert element"
 DocType: Employee,Previous Work Experience,Tidligere erhvervserfaring
 DocType: Stock Entry,For Quantity,For Mængde
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Indtast venligst Planned Antal for Item {0} på rækken {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{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
 ,Minutes to First Response for Issues,Minutter til First Response for Issues
 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."
@@ -2066,16 +2091,17 @@
 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 +398,The following Production Orders were created:,Følgende produktionsordrer blev skabt:
+DocType: Student Admission,Naming Series (for Student Applicant),Navngivning Series (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"
 ,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 +739,Item or Warehouse for row {0} does not match Material Request,Element eller Warehouse for række {0} matcher ikke Materiale Request
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +747,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
 DocType: Fiscal Year,Year End Date,År Slutdato
 DocType: Task Depends On,Task Depends On,Task Afhænger On
-DocType: Lead,Opportunity,Mulighed
+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
@@ -2088,7 +2114,7 @@
 DocType: Student,Joining Date,Vær med Dato
 ,Employees working on a holiday,"Medarbejdere, der arbejder på en ferie"
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Mark Present
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},Vedligeholdelse startdato kan ikke være før leveringsdato for Serial Nej {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},Vedligeholdelse startdato kan ikke være før leveringsdato for Serial Nej {0}
 DocType: Production Order,Actual End Date,Faktiske Slutdato
 DocType: Purchase Invoice,PINV-,PINV-
 DocType: Authorization Rule,Applicable To (Role),Gælder for (Rolle)
@@ -2103,7 +2129,7 @@
 DocType: SMS Log,No of Requested SMS,Ingen af Anmodet SMS
 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 +729,Please supply the specified items at the best possible rates,Angiv venligst de angivne poster på de bedste mulige priser
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +695,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 +117,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-
@@ -2112,7 +2138,7 @@
 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 +14,This is an example website auto-generated from ERPNext,Dette er et eksempel website auto-genereret fra ERPNext
+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
 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.
 
@@ -2139,13 +2165,14 @@
 DocType: Purchase Receipt Item,Recd Quantity,RECD Mængde
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +54,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 +103,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 +504,Stock Entry {0} is not submitted,Stock indtastning {0} er ikke indsendt
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Kan ikke producere mere Item {0} end Sales Order mængde {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +505,Stock Entry {0} is not submitted,Stock indtastning {0} er ikke indsendt
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / kontantautomat konto
 DocType: Tax Rule,Billing City,Fakturering By
 DocType: Salary Component Account,Salary Component Account,Løn Component konto
 DocType: Global Defaults,Hide Currency Symbol,Skjul Valuta Symbol
 apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card","fx Bank, Kontant, Kreditkort"
+DocType: Lead Source,Source Name,Kilde Navn
 DocType: Journal Entry,Credit Note,Kreditnota
 DocType: Warranty Claim,Service Address,Tjeneste Adresse
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furnitures and Fixtures,Havemøbler og Kampprogram
@@ -2157,6 +2184,7 @@
 DocType: Opportunity,Customer / Lead Name,Kunde / Lead navn
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +89,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/controllers/trends.py +19,Total(Qty),I alt (Antal)
 DocType: Sales Invoice,This Document,dette dokument
@@ -2168,15 +2196,15 @@
 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 +176,Organization branch master.,Organisation gren mester.
-apps/erpnext/erpnext/controllers/accounts_controller.py +273, or ,eller
+apps/erpnext/erpnext/controllers/accounts_controller.py +276, or ,eller
 DocType: Sales Order,Billing Status,Fakturering status
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Rapporter et problem
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,Utility Udgifter
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-over
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +203,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: Kassekladde {1} har ikke konto {2} eller allerede matchet mod en anden kupon
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +206,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 +90,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 +93,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
@@ -2204,8 +2232,8 @@
 DocType: Product Bundle,Parent Item,Parent Item
 DocType: Account,Account Type,Kontotype
 DocType: Delivery Note,DN-RET-,DN-Retsinformation
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +115,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 +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Vedligeholdelsesplan ikke genereret for alle poster. Klik på &quot;Generer Schedule &#39;
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +118,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 +163,"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"
@@ -2217,13 +2245,13 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +32,Disabled template must not be default template,Handicappede 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 +748,Delivery,Levering
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +742,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
 DocType: Payment Entry,Total Allocated Amount,Samlet bevilgede beløb
 DocType: Item Reorder,Material Request Type,Materiale Request Type
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +82,Row {0}: UOM Conversion Factor is mandatory,Række {0}: UOM Konvertering Factor er obligatorisk
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Voucher #
@@ -2234,13 +2262,13 @@
 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,Warehouse kan kun ændres via Stock indtastning / følgeseddel / kvittering
 DocType: Employee Education,Class / Percentage,Klasse / Procent
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Head of Marketing and Sales,Chef for Marketing og Salg
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Indkomstskat
+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 +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.
 DocType: Item Supplier,Item Supplier,Vare Leverandør
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +403,Please enter Item Code to get batch no,Indtast venligst Item Code for at få batchnr
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +770,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 +397,Please enter Item Code to get batch no,Indtast venligst Item Code for at få batchnr
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +764,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"
@@ -2252,28 +2280,29 @@
 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 +100,Issues,Spørgsmål
+apps/erpnext/erpnext/hooks.py +109,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}
 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
 ,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
 DocType: Supplier,Billing Currency,Fakturering Valuta
 DocType: Sales Invoice,SINV-RET-,SINV-Retsinformation
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Large,Extra Large
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Extra Large,Extra Large
 ,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 +507,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 +107,Local,Lokal
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +508,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/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 +154,Large,Large
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Large,Large
 DocType: Homepage Featured Product,Homepage Featured Product,Hjemmeside Featured Product
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Ny Warehouse Navn
-apps/erpnext/erpnext/accounts/report/financial_statements.py +225,Total {0} ({1}),I alt {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +224,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
@@ -2284,7 +2313,7 @@
 DocType: Student Applicant,Application Status,Ansøgning status
 DocType: Fees,Fees,Gebyrer
 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,Citat {0} er aflyst
+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
@@ -2319,9 +2348,9 @@
 DocType: Attendance,Leave Type,Forlad Type
 apps/erpnext/erpnext/controllers/stock_controller.py +173,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/hr/doctype/salary_slip/salary_slip.py +79,Name error: {0},Navn fejl: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +90,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 +178,{0} {1} does not associated with {2} {3},{0} {1} ikke tilknyttet {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +181,{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)
 DocType: Warehouse,Parent Warehouse,Forældre Warehouse
@@ -2340,7 +2369,7 @@
 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
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,Mindst ét element skal indtastes med negativt mængde gengæld dokument
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Atleast one item should be entered with negative quantity in return document,Mindst ét element skal indtastes med negativt mængde gengæld dokument
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Betjening {0} længere end alle tilgængelige arbejdstimer i arbejdsstation {1}, nedbryde driften i flere operationer"
 ,Requested,Anmodet
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +83,No Remarks,Ingen Bemærkninger
@@ -2352,46 +2381,46 @@
 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/stock/doctype/purchase_receipt/purchase_receipt.py +98,Quality Inspection required for Item {0},Inspektion kvalitet kræves for Item {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,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
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Administrer Territory Tree.
 DocType: Journal Entry Account,Sales Invoice,Salg Faktura
 DocType: Journal Entry Account,Party Balance,Party Balance
-apps/erpnext/erpnext/accounts/page/pos/pos.js +475,Please select Apply Discount On,Vælg Anvend Rabat på
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +92,Salary Slip Created,Lønseddel Oprettet
+apps/erpnext/erpnext/accounts/page/pos/pos.js +464,Please select Apply Discount On,Vælg Anvend Rabat på
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +95,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
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,Rabat Procent kan anvendes enten mod en prisliste eller for alle prisliste.
 DocType: Purchase Invoice,Half-yearly,Halvårligt
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +384,Accounting Entry for Stock,Regnskab Punktet om Stock
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +387,Accounting Entry for Stock,Regnskab Punktet om Stock
 DocType: Sales Invoice,Sales Team1,Salg TEAM1
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,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 +96,Row {0}: Completed Qty must be greater than zero.,Række {0}: suppleret Antal skal være større end nul.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +120,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 +88,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Kan ikke returnere mere end {1} for Item {2}
+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
 DocType: Item Group,Show this slideshow at the top of the page,Vis denne slideshow øverst på siden
 DocType: BOM,Item UOM,Item UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Skat Beløb Efter Discount Beløb (Company Valuta)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +147,Target warehouse is mandatory for row {0},Target lageret er obligatorisk for rækken {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +141,Target warehouse is mandatory for row {0},Target lageret er obligatorisk for rækken {0}
 DocType: Cheque Print Template,Primary Settings,Primære indstillinger
 DocType: Purchase Invoice,Select Supplier Address,Vælg leverandør Adresse
 DocType: Quality Inspection,Quality Inspection,Quality Inspection
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Extra Small,Extra Small
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +194,Account {0} is frozen,Konto {0} er spærret
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Extra Small
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +690,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 +197,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 +606,Can only make payment against unbilled {0},Kan kun gøre betaling mod faktureret {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +126,Commission rate cannot be greater than 100,Provisionssats kan ikke være større end 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +609,Can only make payment against unbilled {0},Kan kun gøre betaling mod faktureret {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,Provisionssats kan ikke være større end 100
 DocType: Stock Entry,Subcontract,Underleverance
 apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,Indtast venligst {0} først
 DocType: Production Order Operation,Actual End Time,Faktiske Sluttid
@@ -2402,30 +2431,30 @@
 DocType: SMS Log,No of Sent SMS,Ingen af Sent SMS
 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 +158,Colour,Farve
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,Farve
 DocType: Maintenance Visit,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"
 DocType: Student Log,Academic,Akademisk
-apps/erpnext/erpnext/controllers/accounts_controller.py +469,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Samlet forhånd ({0}) mod Order {1} kan ikke være større end Grand alt ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +472,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Samlet forhånd ({0}) mod Order {1} kan ikke være større end Grand alt ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Vælg Månedlig Distribution til ujævnt distribuere mål på tværs måneder.
 DocType: Purchase Invoice Item,Valuation Rate,Værdiansættelse Rate
+DocType: Stock Reconciliation,SR/,SR /
 apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,Pris List Valuta ikke valgt
 DocType: Assessment,Results,Resultater
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +168,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 +175,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: Student Applicant,Father's/ Guardian 2 Email ID,Fars / Guardian 2 E-mail-id
 DocType: Maintenance Visit Purpose,Against Document No,Mod dokument nr
 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 +228,Warehouses with existing transaction can not be converted to group.,Pakhuse med eksisterende transaktion kan ikke konverteres til gruppen.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +231,Warehouses with existing transaction can not be converted to group.,Pakhuse med eksisterende transaktion kan ikke konverteres til gruppen.
 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 +93,Researcher,Forsker
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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.
@@ -2437,25 +2466,25 @@
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","For nemheds af kunder, kan disse koder bruges i trykte formater som fakturaer og følgesedler"
 DocType: 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: Sales Invoice,Advertisement,Annonce
 DocType: Asset Category Account,Depreciation Expense Account,Afskrivninger udgiftskonto
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Probationary Period,Prøvetid
-apps/erpnext/erpnext/hooks.py +102,Announcements,Meddelelser
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Prøvetid
+apps/erpnext/erpnext/hooks.py +111,Announcements,Meddelelser
 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 +109,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 +16,To Datetime,Til datotid
+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/scheduling_tool/scheduling_tool.py +51,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/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Ventende Aktiviteter
+DocType: Accounts Settings,Make Payment via Journal Entry,Foretag Betaling via Kassekladde
+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 +127,Please enter relieving date.,Indtast lindre dato.
-apps/erpnext/erpnext/controllers/trends.py +145,Amt,Amt
+apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,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 +26,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"
@@ -2473,14 +2502,15 @@
 apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1},Kan ikke finde valutakurs for {0} til {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Mark Halvdags
 DocType: Sales Invoice,Sales Team,Salgsteam
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Duplicate entry,Duplicate entry
+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 +490,[Error],[Fejl]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +484,[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
 apps/erpnext/erpnext/controllers/status_updater.py +175,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."
 DocType: UOM,Must be Whole Number,Skal være hele tal
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Nye blade Tildelte (i dage)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Løbenummer {0} eksisterer ikke
@@ -2496,22 +2526,22 @@
 ,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 +25,All Jobs,Alle Jobs
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,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
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Amount {0} {1} {2} {3},Mængden {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Amount {0} {1} {2} {3},Mængden {0} {1} {2} {3}
 DocType: Account,Depreciation,Afskrivninger
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Leverandør (er)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Medarbejder Deltagerliste Værktøj
 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 +372,Payment Entries {0} are un-linked,Betalings Entries {0} er un-linked
+apps/erpnext/erpnext/accounts/utils.py +449,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
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +497,Material Requests {0} created,Materiale Anmodning {0} skabt
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +498,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.
 DocType: Purchase Invoice,Address and Contact,Adresse og kontakt
@@ -2550,7 +2580,7 @@
 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 +848,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 +859,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 +233,Closing (Dr),Lukning (dr)
 DocType: Cheque Print Template,Cheque Size,Check Størrelse
@@ -2571,7 +2601,8 @@
 ,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.
-apps/erpnext/erpnext/controllers/accounts_controller.py +555,'Update Stock' cannot be checked for fixed asset sale,&#39;Opdater Stock&#39; kan ikke kontrolleres for fast salg af aktiver
+DocType: Student Guardian,Father,Far
+apps/erpnext/erpnext/controllers/accounts_controller.py +558,'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
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Send nyhedsbrev
 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
@@ -2581,15 +2612,15 @@
 DocType: Sales Order,Fully Delivered,Fuldt Leveres
 DocType: Lead,Lower Income,Lavere indkomst
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","Kontoen hoved under ansvar, hvor gevinst / tab vil være reserveret"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +166,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 +238,"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 +81,Purchase Order number required for Item {0},Indkøbsordre nummer kræves for Item {0}
+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/purchase_receipt/purchase_receipt.py +82,Purchase Order number required for Item {0},Indkøbsordre nummer kræves for Item {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Fra dato' skal være efter 'Til dato'
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +17,Cannot change status as student {0} is linked with student application {1},Kan ikke ændre status som studerende {0} er forbundet med student ansøgning {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +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: Timesheet,"List of employee which has ""Salary Slip Based on Timesheet"" is enabled in salary structure.","Liste over medarbejder, der har &quot;lønseddel Baseret på Timesheet&quot; er aktiveret i lønstruktur."
 DocType: Asset,Fully Depreciated,fuldt afskrevet
 ,Stock Projected Qty,Stock Forventet Antal
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Customer {0} does not belong to project {1},Kunden {0} ikke hører til projekt {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,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
 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
@@ -2601,22 +2632,22 @@
 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/patches/v7_0/create_warehouse_nestedset.py +55,All Warehouses,Alle Pakhuse
+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 +105,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/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Notering {0} ikke af typen {1}
+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/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Foretag lønseddel
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +26,Browse BOM,Gennemse BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,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/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 Year,Academic Year,Akademi år
+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
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,Vurdering
@@ -2624,12 +2655,12 @@
 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 +197,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 +204,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: Workstation Working Hour,Start Time,Start Time
 DocType: Item Price,Bulk Import Help,Bulk Import Hjælp
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +256,Select Quantity,Vælg antal
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +257,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
@@ -2646,6 +2677,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Enten target qty eller målbeløbet er obligatorisk.
 apps/erpnext/erpnext/config/projects.py +45,Cost of various activities,Omkostninger ved forskellige aktiviteter
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Indstilling Begivenheder til {0}, da Medarbejderen er knyttet til nedenstående sælgere ikke har et bruger-id {1}"
+DocType: Timesheet,Billing Details,faktureringsoplysninger
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +149,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 lov til at opdatere lagertransaktioner ældre end {0}
 DocType: Item,Inspection Required,Inspection Nødvendig
@@ -2665,7 +2697,7 @@
 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 +138,Wire Transfer,Bankoverførsel
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,Bankoverførsel
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Kontroller alt
 DocType: Sales Order,Recurring Order,Tilbagevendende Order
 DocType: Company,Default Income Account,Standard Indkomst konto
@@ -2677,21 +2709,19 @@
 ,Welcome to ERPNext,Velkommen til ERPNext
 apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,Føre til Citat
 DocType: Lead,From Customer,Fra kunde
-apps/erpnext/erpnext/demo/setup_data.py +357,Calls,Opkald
+apps/erpnext/erpnext/demo/setup/setup_data.py +300,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/stock/doctype/item/item.py +466,"As there are existing transactions for this item, \
-							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Da der er eksisterende transaktioner for denne post, \ du ikke kan ændre værdierne af &quot;Har Serial Nej &#39;,&#39; Har Batch Nej &#39;,&#39; Er Stock Vare&quot; og &quot;værdiansættelsesmetode &#39;"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,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/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 +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Bemærk: Systemet vil ikke kontrollere over-levering og over-booking for Item {0} som mængde eller beløb er 0
-DocType: Notification Control,Quotation Message,Citat Message
+DocType: Notification Control,Quotation Message,Tilbuds besked
 DocType: Issue,Opening Date,Åbning Dato
-apps/erpnext/erpnext/schools/api.py +58,Attendance has been marked successfully.,Deltagelse er mærket korrekt.
+apps/erpnext/erpnext/schools/api.py +57,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 +136,Account Type for {0} must be {1},Kontotype for {0} skal være {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +139,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
@@ -2706,12 +2736,13 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Net Cash from Operations,Netto kontant fra Operations
 apps/erpnext/erpnext/public/js/setup_wizard.js +225,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 +20,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,Citat Series
+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 +1190,Please select customer,Vælg venligst kunde
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1193,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
@@ -2721,6 +2752,7 @@
 ,Payment Period Based On Invoice Date,Betaling Periode Baseret på Fakturadato
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Manglende Valutakurser for {0}
 DocType: Assessment,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-
@@ -2738,11 +2770,12 @@
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Emne Navn
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Mindst en af salg eller køb skal vælges
+DocType: Grading Structure,Grade Intervals,Grade Intervaller
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Vælg arten af din virksomhed.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Hvor fremstillingsprocesser gennemføres.
 DocType: Asset Movement,Source Warehouse,Kilde Warehouse
 DocType: Installation Note,Installation Date,Installation Dato
-apps/erpnext/erpnext/controllers/accounts_controller.py +534,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} hører ikke til selskab {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +537,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
@@ -2756,28 +2789,31 @@
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Tilgængelig Batch Antal ved fra vores varelager
 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,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 +111,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/scheduling_tool/scheduling_tool.py +49,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 +87,{0}% Delivered,{0}% Delivered
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% Delivered
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Vare {0}: Bestilte qty {1} kan ikke være mindre end minimum ordreantal {2} (defineret i punkt).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Månedlig Distribution Procent
 DocType: Territory,Territory Targets,Territory Mål
 DocType: Delivery Note,Transporter Info,Transporter Info
-apps/erpnext/erpnext/accounts/utils.py +379,Please set default {0} in Company {1},Indstil standard {0} i Company {1}
+apps/erpnext/erpnext/accounts/utils.py +456,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
 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.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Titler til print skabeloner f.eks Proforma Invoice.
+DocType: Student Guardian,Student Guardian,Student Guardian
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +184,Valuation type charges can not marked as Inclusive,Værdiansættelse typen omkostninger ikke er markeret som Inclusive
 DocType: POS Profile,Update Stock,Opdatering Stock
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Forskellige UOM for elementer vil føre til forkert (Total) Vægt værdi. Sørg for, at Nettovægt for hvert punkt er i den samme UOM."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
 DocType: Asset,Journal Entry for Scrap,Kassekladde til skrot
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Venligst trække elementer fra følgeseddel
-apps/erpnext/erpnext/accounts/utils.py +349,Journal Entries {0} are un-linked,Journaloptegnelser {0} er un-forbundet
+apps/erpnext/erpnext/accounts/utils.py +426,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
@@ -2801,6 +2837,7 @@
 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
+DocType: Homepage,"URL for ""All Products""",URL til &quot;Alle produkter&quot;
 DocType: Leave Application,Leave Balance Before Application,Lad Balance Før Application
 DocType: SMS Center,Send SMS,Send SMS
 DocType: Cheque Print Template,Width of amount in word,Bredde af beløb i ord
@@ -2809,7 +2846,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 +29,Current Job Openings,Aktuelle Ledige stillinger
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,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
@@ -2822,7 +2859,7 @@
 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 / Item / {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 +850,Show tax break-up,Vis skat break-up
+apps/erpnext/erpnext/public/js/controllers/transaction.js +841,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/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"
@@ -2832,10 +2869,11 @@
 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 +534,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 +80,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 +162,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/selling/doctype/customer/customer.py +195,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 +5,This is based on the attendance of this Student,Dette er baseret på deltagelse af denne Student
@@ -2844,12 +2882,11 @@
 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 +75,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 +138,Note: There is not enough leave balance for Leave Type {0},Bemærk: Der er ikke nok orlov balance for Leave Type {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Note: There is not enough leave balance for Leave Type {0},Bemærk: Der er ikke nok orlov balance for Leave Type {0}
 DocType: Program Enrollment Fee,Program Enrollment Fee,Program Tilmelding Fee
 DocType: Item,Supplier Items,Leverandør Varer
 DocType: Opportunity,Opportunity Type,Opportunity Type
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,Ny Company
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,Cost Center is required for 'Profit and Loss' account {0},Cost center er nødvendig for &quot;Resultatopgørelsen&quot; konto {0}
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Transaktioner kan kun slettes af skaberen af selskabet
 apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,Forkert antal finansposter fundet. Du har muligvis valgt et forkert konto i transaktionen.
 DocType: Cheque Print Template,Cheque Width,Check Bredde
@@ -2858,16 +2895,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,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/controllers/accounts_controller.py +228,{0} '{1}' is disabled,{0} &#39;{1}&#39; er deaktiveret
+apps/erpnext/erpnext/controllers/accounts_controller.py +231,{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
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Sende automatiske e-mails til Kontakter på Indsendelse transaktioner.
+DocType: Timesheet,Total Billable Amount,Samlet faktureres Beløb
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Punkt 3
 DocType: Purchase Order,Customer Contact Email,Kundeservice Kontakt E-mail
 DocType: Warranty Claim,Item and Warranty Details,Item og garanti Detaljer
 DocType: Sales Team,Contribution (%),Bidrag (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Bemærk: Betaling indtastning vil ikke blive oprettet siden &#39;Kontant eller bank konto&#39; er ikke angivet
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Responsibilities,Ansvar
+apps/erpnext/erpnext/controllers/accounts_controller.py +78,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
 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
@@ -2875,6 +2913,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Tilføj Brugere
 DocType: Pricing Rule,Item Group,Item Group
 DocType: Item,Safety Stock,Sikkerhed Stock
+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: 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)
@@ -2884,7 +2923,6 @@
 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: Timesheet,Total Hours,Total Hours
 DocType: Journal Entry,Printing Settings,Udskrivning Indstillinger
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,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
@@ -2897,13 +2935,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investment Banking
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +71,Cash or Bank Account is mandatory for making payment entry,Kontant eller bankkonto er obligatorisk for betalingen post
 DocType: Purchase Invoice,Price List Exchange Rate,Prisliste Exchange Rate
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Kunden&gt; Customer Group&gt; Territory
 DocType: Purchase Invoice Item,Rate,Rate
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Intern,Intern
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,Intern
 DocType: Stock Entry,From BOM,Fra BOM
 DocType: Assessment,Assessment Code,Assessment Code
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +32,Basic,Grundlæggende
+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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',Klik på &quot;Generer Schedule &#39;
+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 +95,Reference No is mandatory if you entered Reference Date,"Referencenummer er obligatorisk, hvis du har indtastet reference Dato"
@@ -2912,11 +2951,11 @@
 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 +752,Issue Material,Issue Materiale
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +723,Issue Material,Issue Materiale
 DocType: Material Request Item,For Warehouse,For Warehouse
 DocType: Employee,Offer Date,Offer Dato
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Citater
-apps/erpnext/erpnext/accounts/page/pos/pos.js +683,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/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Tilbud
+apps/erpnext/erpnext/accounts/page/pos/pos.js +665,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."
 DocType: Hub Settings,Access Token,Access Token
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +31,No Student Groups created.,Ingen grupper af studerende oprettet.
 DocType: Purchase Invoice Item,Serial No,Løbenummer
@@ -2924,33 +2963,35 @@
 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 +1122,Enter value must be positive,Indtast værdien skal være positiv
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,All Territories,Alle områder
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1125,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
 DocType: Purchase Invoice,Items,Varer
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +23,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 +221,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 +233,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 +96,Request for Quotations,Anmodning om Citater
+apps/erpnext/erpnext/hooks.py +104,Request for Quotations,Anmodning om tilbud
 DocType: Payment Reconciliation,Maximum Invoice Amount,Maksimal Faktura Beløb
 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 +628,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standard måleenhed for Variant &#39;{0}&#39; skal være samme som i skabelon &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standard måleenhed for Variant &#39;{0}&#39; skal være samme som i skabelon &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Beregn baseret på
 DocType: Delivery Note Item,From Warehouse,Fra Warehouse
 DocType: Assessment,Supervisor Name,supervisor Navn
+DocType: Assessment,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
 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 +27,Default Address Template cannot be deleted,Standard Adresse Skabelon kan ikke slettes
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,Standard Adresse Skabelon kan ikke slettes
 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
@@ -2965,8 +3006,8 @@
 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/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 +485,No default BOM exists for Item {0},Ingen standard BOM eksisterer for Item {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +336,Please select Posting Date first,Vælg Bogføringsdato først
+apps/erpnext/erpnext/stock/get_item_details.py +486,No default BOM exists for Item {0},Ingen standard BOM eksisterer for Item {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +326,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
@@ -2982,6 +3023,7 @@
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Match Betalinger med fakturaer
 DocType: Journal Entry,Bank Entry,Bank indtastning
 DocType: Authorization Rule,Applicable To (Designation),Gælder for (Betegnelse)
+,Profitability Analysis,lønsomhedsanalyse
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,Tilføj til indkøbsvogn
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Gruppér efter
 DocType: Guardian,Interests,Interesser
@@ -2994,21 +3036,21 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,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 +141,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Føljeton Item {0} kan ikke opdateres \ hjælp Stock Afstemning
 DocType: Scheduling Tool,Day,Dag
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Ny Løbenummer kan ikke have Warehouse. Warehouse skal indstilles af Stock indtastning eller kvittering
 DocType: Lead,Lead Type,Lead Type
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,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 +129,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
-DocType: Student Applicant,AP.,AP.
 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 +639,Point of Sale,Point of Sale
+apps/erpnext/erpnext/accounts/page/pos/pos.js +634,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
 DocType: Production Planning Tool,Production Planning Tool,Produktionsplanlægning Tool
@@ -3017,74 +3059,77 @@
 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 +373,Quantity to Manufacture must be greater than 0.,Mængde til Fremstilling skal være større end 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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 Profile,Customer Group,Customer Group
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,Expense account is mandatory for item {0},Udgiftskonto er obligatorisk for element {0}
 DocType: Item,Website Description,Website Beskrivelse
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date must be on or after today,Næste Afskrivninger Dato skal være på eller efter dag
 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 +145,Please cancel Purchase Invoice {0} first,Venligst annullere købsfaktura {0} først
 DocType: Serial No,AMC Expiry Date,AMC Udløbsdato
 ,Sales Register,Salg Register
-DocType: Quotation,Quotation Lost Reason,Citat Lost Årsag
+DocType: Quotation,Quotation Lost Reason,Tilbud afvist - Årsag
+apps/erpnext/erpnext/utilities/doctype/address/address.py +164,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.
 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 +330,Transaction reference no {0} dated {1},Transaktion henvisning ingen {0} dateret {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,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 +107,Summary for this month and pending activities,Resumé for denne måned og verserende aktiviteter
+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/accounts/doctype/sales_invoice/sales_invoice.py +406,Please remove this Invoice {0} from C-Form {1},Fjern denne faktura {0} fra C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,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 +644,Get Items,Få Varer
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +623,Get Items,Få Varer
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +210,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 +41,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
 DocType: Payment Request,Initiated,Indledt
 DocType: Production Order,Planned Start Date,Planlagt startdato
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,Customer is required against Receivable account {0},Kunden er påkrævet mod Tilgodehavende konto {0}
 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 Blade Allokeret
-apps/erpnext/erpnext/controllers/trends.py +265,Project-wise data is not available for Quotation,Projekt-wise data er ikke tilgængelig for Citat
+apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,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 +101,Commercial,Kommerciel
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,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: Supplier Quotation,Supplier Address,Leverandør Adresse
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +648,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/accounts/doctype/purchase_invoice/purchase_invoice.py +651,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 +30,Series is mandatory,Serien er obligatorisk
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +50,Series is mandatory,Serien er obligatorisk
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Financial Services
 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
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +165,Warehouse required for stock Item {0},Warehouse kræves for lager Vare {0}
 DocType: Leave Allocation,Unused leaves,Ubrugte blade
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Cr,Cr
 DocType: Tax Rule,Billing State,Fakturering stat
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +250,Transfer,Transfer
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +187,{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 +825,Fetch exploded BOM (including sub-assemblies),Hent eksploderede BOM (herunder underenheder)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +254,Transfer,Transfer
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +190,{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 +796,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 +115,Due Date is mandatory,Forfaldsdato er obligatorisk
+apps/erpnext/erpnext/controllers/accounts_controller.py +118,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
 DocType: Journal Entry,Pay To / Recd From,Betal Til / RECD Fra
 DocType: Naming Series,Setup Series,Opsætning Series
 DocType: Payment Reconciliation,To Invoice Date,Til faktura dato
 DocType: Supplier,Contact HTML,Kontakt HTML
 ,Inactive Customers,inaktive Kunder
+DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Køb Kvitteringer
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Hvordan Prisfastsættelse Regel anvendes?
 DocType: Quality Inspection,Delivery Note No,Levering Note Nej
@@ -3093,7 +3138,7 @@
 DocType: Company,Retail,Retail
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +120,Customer {0} does not exist,Kunde {0} eksisterer ikke
 DocType: Attendance,Absent,Fraværende
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +587,Product Bundle,Produkt Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Product Bundle,Produkt Bundle
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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
@@ -3103,8 +3148,8 @@
 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 +742,Send Supplier Emails,Send Leverandør Emails
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +104,"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/buying/doctype/request_for_quotation/request_for_quotation.js +708,Send Supplier Emails,Send Leverandør Emails
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,"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.
 DocType: Guardian Interest,Guardian Interest,Guardian Renter
 DocType: Timesheet,Employee Detail,Medarbejder Detail
@@ -3115,9 +3160,9 @@
 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}
 DocType: Salary Slip,Earning & Deduction,Earning &amp; Fradrag
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +77,Account {0} cannot be a Group,Konto {0} kan ikke være en gruppe
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} cannot be a Group,Konto {0} kan ikke være en gruppe
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +31,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 +107,Negative Valuation Rate is not allowed,Negative Værdiansættelse Rate er ikke tilladt
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Negative Værdiansættelse Rate er ikke tilladt
 DocType: Holiday List,Weekly Off,Ugentlig Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Til fx 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +39,Provisional Profit / Loss (Credit),Foreløbig Profit / Loss (Credit)
@@ -3131,16 +3176,16 @@
 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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Omkostningsområde er obligatorisk for varen {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +626,Get Items from Product Bundle,Få elementer fra Product Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +605,Get Items from Product Bundle,Få elementer fra Product Bundle
 DocType: Asset,Straight Line,Lige linje
 DocType: Project User,Project User,Projekt Bruger
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} is inactive,Konto {0} er inaktiv
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} is inactive,Konto {0} er inaktiv
 DocType: GL Entry,Is Advance,Er Advance
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Fremmøde Fra Dato og fremmøde til dato er obligatorisk
 apps/erpnext/erpnext/controllers/buying_controller.py +148,Please enter 'Is Subcontracted' as Yes or No,Indtast &quot;underentreprise&quot; som Ja eller Nej
 DocType: Sales Team,Contact No.,Kontakt No.
 DocType: Bank Reconciliation,Payment Entries,Betalings Entries
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,'Profit and Loss' type account {0} not allowed in Opening Entry,'Resultatopgørelsen' konto {0} ikke tilladt i 'Åbning balance'
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +71,'Profit and Loss' type account {0} not allowed in Opening Entry,'Resultatopgørelsen' konto {0} ikke tilladt i 'Åbning balance'
 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
@@ -3159,7 +3204,7 @@
 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,Provision på salg
 DocType: Offer Letter Term,Value / Description,/ Beskrivelse
-apps/erpnext/erpnext/controllers/accounts_controller.py +558,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} kan ikke indsendes, er det allerede {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +561,"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: Production Order,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}.
@@ -3172,13 +3217,13 @@
 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/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Legal Expenses,Juridiske Udgifter
 DocType: Purchase Invoice,Posting Time,Udstationering Time
-DocType: Sales Order,% Amount Billed,% Beløb Faktureret
+DocType: Timesheet,% Amount Billed,% Beløb Faktureret
 DocType: Production Order,Warehouse for reserving items,Warehouse for at reservere emner
 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."
 apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},Ingen Vare med Serial Nej {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Åbne Meddelelser
+DocType: Email Digest,Open Notifications,Åbne Meddelelser
 DocType: Payment Entry,Difference Amount (Company Currency),Forskel Beløb (Company Currency)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,Direkte udgifter
 apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
@@ -3186,7 +3231,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Ny kunde Omsætning
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,Rejser Udgifter
 DocType: Maintenance Visit,Breakdown,Sammenbrud
-apps/erpnext/erpnext/controllers/accounts_controller.py +634,Account: {0} with currency: {1} can not be selected,Konto: {0} med valuta: kan ikke vælges {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +637,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}
 DocType: Program Enrollment Tool,Student Applicants,Student Ansøgere
@@ -3194,15 +3239,15 @@
 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 +56,Probation,Kriminalforsorgen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Probation,Kriminalforsorgen
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,løn komponenter
 DocType: Program Enrollment Tool,New Academic Year,Nye akademiske år
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Payment of salary for the month {0} and year {1},Udbetaling af løn for måneden {0} og år {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Payment of salary for the month {0} and year {1},Udbetaling af løn for måneden {0} og år {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,"Auto insert Prisliste sats, hvis der mangler"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Samlet indbetalte beløb
 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 +144,Planning,Planlægning
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,Planlægning
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,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
@@ -3215,11 +3260,10 @@
 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.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Sales invoice submitted sucessfully.,Salg faktura indsendt held.
 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}
 DocType: Assessment Result,Student Name,Elevnavn
-apps/erpnext/erpnext/hooks.py +104,Assessment Schedule,Vurdering Schedule
+apps/erpnext/erpnext/hooks.py +113,Assessment Schedule,Vurdering Schedule
 DocType: Brand,Item Manager,Item manager
 DocType: Buying Settings,Default Supplier Type,Standard Leverandør Type
 DocType: Production Order,Total Operating Cost,Samlede driftsomkostninger
@@ -3229,6 +3273,7 @@
 DocType: GL Entry,Party Type,Party Type
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +78,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
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Løn skabelon mester.
 DocType: Leave Type,Max Days Leave Allowed,Max Dage Leave tilladt
@@ -3240,18 +3285,19 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Citater til Leads 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 +99,All Customer Groups,Alle kundegrupper
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +78,Accumulated Monthly,Akkumuleret Månedlig
-apps/erpnext/erpnext/controllers/accounts_controller.py +595,{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/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Alle kundegrupper
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +81,Accumulated Monthly,Akkumuleret Månedlig
+apps/erpnext/erpnext/controllers/accounts_controller.py +598,{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
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Prisliste Rate (Company Valuta)
 DocType: Products Settings,Products Settings,Produkter Indstillinger
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +188,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
 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 +84,Secretary,Sekretær
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,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
@@ -3260,24 +3306,22 @@
 ,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
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,Række # {0}: Løbenummer er obligatorisk
+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 +859,Supplier Quotation,Leverandør Citat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +838,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 +7,Collect Fees,Saml Gebyrer
+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 Item {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.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Kommende begivenheder
 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/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
-DocType: Email Digest,Income / Expense,Indtægter / Expense
 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."
@@ -3288,13 +3332,14 @@
 DocType: Customer,From Lead,Fra Lead
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Ordrer frigives til produktion.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Vælg regnskabsår ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,POS Profile required to make POS Entry,POS profil kræves for at gøre POS indtastning
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +509,POS Profile required to make POS Entry,POS profil kræves for at gøre POS indtastning
 DocType: Program Enrollment Tool,Enroll Students,Tilmeld Studerende
 DocType: Hub Settings,Name Token,Navn Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard salg
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Atleast one warehouse is mandatory,Mindst én lageret er obligatorisk
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +129,Atleast one warehouse is mandatory,Mindst én lageret er obligatorisk
 DocType: Serial No,Out of Warranty,Ud af garanti
 DocType: BOM Replace Tool,Replace,Udskifte
+DocType: Production Order,Unstopped,oplades
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Invoice {1},{0} mod salgsfaktura {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Projektnavn
@@ -3315,10 +3360,11 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Blade skal afsættes i multipla af 0,5"
 DocType: Production Order,Operation Cost,Operation Cost
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,Upload fremmøde fra en .csv-fil
+apps/erpnext/erpnext/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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Enestående Amt
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Fastsatte mål Item Group-wise for denne Sales Person.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Frys Stocks Ældre end [dage]
-apps/erpnext/erpnext/controllers/accounts_controller.py +528,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: Aktiv er obligatorisk for anlægsaktiv køb / salg
+apps/erpnext/erpnext/controllers/accounts_controller.py +531,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: Aktiv er obligatorisk for anlægsaktiv køb / salg
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Hvis to eller flere Priser Regler er fundet på grundlag af de ovennævnte betingelser, er Priority anvendt. Prioritet er et tal mellem 0 og 20, mens Standardværdien er nul (blank). Højere antal betyder, at det vil have forrang, hvis der er flere Priser Regler med samme betingelser."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Fiscal År: {0} ikke eksisterer
 DocType: Currency Exchange,To Currency,Til Valuta
@@ -3335,15 +3381,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Kundefeedback
 DocType: Account,Expense,Expense
-DocType: Sales Invoice,Exhibition,Udstilling
 apps/erpnext/erpnext/utilities/doctype/address/address.py +77,"Company is mandatory, as it is your company address","Selskabet er obligatorisk, da det er din firmaadresse"
 DocType: Item Attribute,From Range,Fra Range
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +81,Syntax error in formula or condition: {0},Syntaks fejl i formel eller tilstand: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +92,Syntax error in formula or condition: {0},Syntaks fejl i formel eller tilstand: {0}
 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
+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 +28,Jobs,Jobs
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,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
@@ -3352,26 +3398,26 @@
 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 +763,Make Supplier Quotation,Foretag Leverandør Citat
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,Make Supplier Quotation,Foretag Leverandør Citat
 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/controllers/sales_and_purchase_return.py +100,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 +42,Casual Leave,Casual Leave
+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
 DocType: Batch,Batch ID,Batch-id
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,Note: {0},Bemærk: {0}
 ,Delivery Note Trends,Følgeseddel Tendenser
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +103,This Week's Summary,Denne uges Summary
+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
 DocType: Student Group Creation Tool,Get Courses,Få Kurser
 DocType: GL Entry,Party,Selskab
 DocType: Sales Order,Delivery Date,Leveringsdato
 DocType: Opportunity,Opportunity Date,Opportunity Dato
 DocType: Purchase Receipt,Return Against Purchase Receipt,Retur Against kvittering
-DocType: Request for Quotation Item,Request for Quotation Item,Anmodning om Citat Vare
+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 +59,Piecework,Akkordarbejde
+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: Task,Actual Time (in Hours),Faktiske tid (i timer)
 DocType: Employee,History In Company,Historie I Company
@@ -3388,7 +3434,7 @@
 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.
 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 +162,Black,Sort
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,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
@@ -3399,13 +3445,13 @@
 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 +69,Customer Id,Kunde-id
+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
 DocType: Journal Entry Account,Exchange Rate,Exchange Rate
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Sales Order {0} is not submitted,Sales Order {0} er ikke indsendt
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +527,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
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +857,Add items from,Tilføj elementer fra
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +836,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}
 DocType: Cheque Print Template,Regular,Fast
 DocType: BOM,Last Purchase Rate,Sidste Purchase Rate
@@ -3413,6 +3459,7 @@
 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
 ,Sales Person-wise Transaction Summary,Salg Person-wise Transaktion Summary
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +60,Cost Center is required for 'Profit and Loss' account {0}. Please set up a default Cost Center for the Company.,Cost center er nødvendig for &quot;Resultatopgørelse&quot; konto {0}. Venligst oprette en standard Cost Center for selskabet.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,Warehouse {0} does not exist,Oplag {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
@@ -3423,12 +3470,12 @@
 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 +710,Online,Online
+apps/erpnext/erpnext/accounts/page/pos/pos.js +692,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 +16,Setting this Address Template as default as there is no other default,"Angivelse af denne adresse skabelon som standard, da der ikke er nogen anden standard"
+apps/erpnext/erpnext/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"
 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 +74,Quality Management,Quality Management
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,Quality Management
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} has been disabled,Vare {0} er blevet deaktiveret
 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
@@ -3450,11 +3497,12 @@
 DocType: Student,Student Email ID,Student Email ID
 DocType: Employee,Notice (days),Varsel (dage)
 DocType: Tax Rule,Sales Tax Template,Sales Tax Skabelon
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1520,Select items to save the invoice,Vælg elementer for at gemme fakturaen
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1544,Select items to save the invoice,Vælg elementer for at gemme fakturaen
 DocType: Employee,Encashment Date,Indløsning Dato
 DocType: Account,Stock Adjustment,Stock Justering
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Standard Activity Omkostninger findes for Activity Type - {0}
 DocType: Production Order,Planned Operating Cost,Planlagt driftsomkostninger
+DocType: Academic Term,Term Start Date,Term startdato
 apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},Vedlagt {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Kontoudskrift balance pr Finans
 DocType: Job Applicant,Applicant Name,Ansøger Navn
@@ -3484,17 +3532,17 @@
 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.,"Warehouse kan ikke slettes, da der eksisterer lager hovedbog post for dette lager."
 DocType: Company,Distribution,Distribution
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +8,Amount Paid,Beløb betalt
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Project Manager,Projektleder
+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
 ,Quoted Item Comparison,Sammenligning Citeret Vare
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Dispatch,Dispatch
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,Dispatch
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max rabat tilladt for vare: {0} er {1}%
 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."
-DocType: Sales Invoice,Supplier Reference,Leverandør reference
-apps/erpnext/erpnext/accounts/page/pos/pos.js +844,"Master data syncing, it might take some time","Master data synkronisering, kan det tage nogen tid"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +832,"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
@@ -3508,7 +3556,7 @@
 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 +83,Error in formula or condition,Fejl i formel eller tilstand
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,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
@@ -3517,7 +3565,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},Til 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 +197,Cannot cancel because submitted Stock Entry {0} exists,Kan ikke annullere fordi indsendt Stock indtastning {0} eksisterer
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +198,Cannot cancel because submitted Stock Entry {0} exists,Kan ikke annullere fordi indsendt Stock indtastning {0} eksisterer
 DocType: Purchase Invoice,In Words,I Words
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,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
@@ -3527,14 +3575,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,Din regnskabsår begynder på
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Asset Afskrivninger og Vægte
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +319,Amount {0} {1} transferred from {2} to {3},Mængden {0} {1} overført fra {2} til {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +322,Amount {0} {1} transferred from {2} to {3},Mængden {0} {1} overført fra {2} til {3}
 DocType: Sales Invoice,Get Advances Received,Få forskud
 DocType: Email Digest,Add/Remove Recipients,Tilføj / fjern modtagere
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +432,Transaction not allowed against stopped Production Order {0},Transaktion ikke tilladt mod stoppet produktionsordre {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +437,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 +143,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 +652,Item variant {0} exists with same attributes,Vare variant {0} eksisterer med samme attributter
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Vare variant {0} eksisterer med samme attributter
+DocType: Leave Application,LAP/,SKØD/
 DocType: Salary Slip,Salary Slip,Lønseddel
 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
@@ -3542,12 +3591,12 @@
 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 +212,Warehouses with child nodes cannot be converted to ledger,Pakhuse med barn noder kan ikke konverteres til finans
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +215,Warehouses with child nodes cannot be converted to ledger,Pakhuse med barn noder 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: Employee Education,Employee Education,Medarbejder Uddannelse
-apps/erpnext/erpnext/public/js/controllers/transaction.js +866,It is needed to fetch Item Details.,Det er nødvendigt at hente Elementdetaljer.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +857,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
@@ -3557,14 +3606,14 @@
 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 +178,Invalid {0},Ugyldig {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Sick Leave,Sygefravær
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,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
 DocType: Warehouse,PIN,PIN
 DocType: Sales Invoice,Base Change Amount (Company Currency),Base ændring beløb (Company Currency)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +313,No accounting entries for the following warehouses,Ingen bogføring for følgende lagre
-apps/erpnext/erpnext/projects/doctype/project/project.js +102,Save the document first.,Gem dokumentet først.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +314,No accounting entries for the following warehouses,Ingen bogføring for følgende lagre
+apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Gem dokumentet først.
 DocType: Account,Chargeable,Gebyr
 DocType: Company,Change Abbreviation,Skift Forkortelse
 DocType: Expense Claim Detail,Expense Date,Expense Dato
@@ -3577,10 +3626,9 @@
 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"
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,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
 DocType: Appraisal,Appraisal Template,Vurdering skabelon
 DocType: Item Group,Item Classification,Item Klassifikation
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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
@@ -3590,8 +3638,8 @@
 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 +940,Please select {0} first,Vælg {0} først
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +749,Batch {0} of Item {1} has expired.,Batch {0} af Item {1} er udløbet.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +953,Please select {0} first,Vælg {0} først
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +757,Batch {0} of Item {1} has expired.,Batch {0} af Item {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
@@ -3608,8 +3656,8 @@
 {% 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 +92,Warehouse not found in the system,Warehouse ikke fundet i systemet
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +106,This Month's Summary,Denne måneds Summary
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Warehouse ikke fundet i systemet
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Denne måneds Summary
 DocType: Quality Inspection Reading,Quality Inspection Reading,Quality Inspection Reading
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Frys lager ældre end` skal være mindre end %d dage.
 DocType: Tax Rule,Purchase Tax Template,Køb Skat Skabelon
@@ -3619,21 +3667,22 @@
 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 +87,Please set Next Depreciation Date,Venligst sæt Næste Afskrivninger Dato
-DocType: Payment Gateway,Payment Gateway,Betaling Gateway
 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 +378,Operation Time must be greater than 0 for Operation {0},Driftstid skal være større end 0 til drift {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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/accounts/doctype/account/account.py +170,Warehouse is mandatory,Warehouse 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)
 DocType: Program,Program Abbreviation,Program Forkortelse
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,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: Appraisal,Start Date,Startdato
@@ -3649,21 +3698,22 @@
 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"
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,F.eks. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +27,Transaction currency must be same as Payment Gateway currency,Transaktion valuta skal være samme som Payment Gateway valuta
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Transaction currency must be same as Payment Gateway currency,Transaktion valuta skal være samme som Payment Gateway valuta
 DocType: Payment Entry,Receive,Modtag
+apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,citater:
 DocType: Maintenance Visit,Fully Completed,Fuldt Afsluttet
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Complete
 DocType: Employee,Educational Qualification,Pædagogisk Kvalifikation
 DocType: Workstation,Operating Costs,Drifts- omkostninger
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Action hvis Akkumulerede Månedligt budget overskredet
 DocType: Purchase Invoice,Submit on creation,Indsend om skabelse
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +432,Currency for {0} must be {1},Valuta for {0} skal være {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +435,Currency for {0} must be {1},Valuta for {0} skal være {1}
 DocType: Asset,Disposal Date,Bortskaffelse Dato
 DocType: Employee Leave Approver,Employee Leave Approver,Medarbejder Leave Godkender
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,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 +79,"Cannot declare as lost, because Quotation has been made.","Kan ikke erklære så tabt, fordi Citat er blevet gjort."
+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/crm/doctype/opportunity/opportunity.py +79,"Cannot declare as lost, because Quotation has been made.","Kan ikke erklæres tabt, fordi tilbud er afgivet."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Indkøb Master manager
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +429,Production Order {0} must be submitted,Produktionsordre {0} skal indsendes
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +434,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
@@ -3673,25 +3723,27 @@
 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
 DocType: Price List,Price List Name,Pris List Name
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +181,Totals,Totaler
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,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 +113,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 +120,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
 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.
+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 +181,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/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 +793,All records are synced.,Alle poster er synkroniseret.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +781,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
 DocType: Cost Center,Cost Center Name,Cost center Navn
@@ -3710,21 +3762,20 @@
 DocType: Address,Name of person or organization that this address belongs to.,"Navn på den person eller organisation, der denne adresse tilhører."
 apps/erpnext/erpnext/public/js/setup_wizard.js +260,Your Suppliers,Dine Leverandører
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +49,Cannot set as Lost as Sales Order is made.,Kan ikke indstilles som Lost som Sales Order er foretaget.
-DocType: Student Applicant,Mother's Name,Mors navn
 DocType: Request for Quotation Item,Supplier Part No,Leverandør varenummer
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +348,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Kan ikke fratrække når kategori er for &quot;Værdiansættelse&quot; eller &quot;Vaulation og Total &#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Received From,Modtaget fra
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Received From,Modtaget fra
 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/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 +93,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/projects/doctype/timesheet/timesheet.py +117,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
 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 +172,{0} {1} does not exist,{0} {1} findes ikke
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +175,{0} {1} does not exist,{0} {1} findes ikke
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,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 +72,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
@@ -3733,13 +3784,14 @@
 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/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-lagervare
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Fremmøde kan ikke markeres for fremtidige datoer
 DocType: Pricing Rule,Pricing Rule Help,Prisfastsættelse Rule Hjælp
 DocType: Purchase Taxes and Charges,Account Head,Konto hoved
 apps/erpnext/erpnext/config/stock.py +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 +109,Electrical,Elektrisk
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Electrical,Elektrisk
 DocType: Stock Entry,Total Value Difference (Out - In),Samlet værdi Difference (Out - In)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,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}
@@ -3747,7 +3799,7 @@
 DocType: Item,Customer Code,Customer Kode
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +210,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 +292,Debit To account must be a Balance Sheet account,Betalingskort Til konto skal være en balance konto
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To account must be a Balance Sheet account,Betalingskort Til konto skal være en balance konto
 DocType: Buying Settings,Naming Series,Navngivning Series
 DocType: Leave Block List,Leave Block List Name,Lad Block List Name
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Stock Assets
@@ -3759,11 +3811,11 @@
 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 +301,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 +313,Salary Slip of employee {0} already created for time sheet {1},Lønseddel af medarbejder {0} allerede skabt til timeopgørelse {1}
 DocType: Sales Order Item,Ordered Qty,Bestilt Antal
-apps/erpnext/erpnext/stock/doctype/item/item.py +673,Item {0} is disabled,Konto {0} er deaktiveret
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,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 +838,BOM does not contain any stock item,BOM indeholder ikke nogen lagervare
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +809,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.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generer lønsedler
@@ -3771,23 +3823,24 @@
 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)
-apps/erpnext/erpnext/stock/doctype/item/item.py +485,Row #{0}: Please set reorder quantity,Række # {0}: Venligst sæt genbestille mængde
+DocType: Sales Invoice Timesheet,Billing Hours,Fakturering Timer
+apps/erpnext/erpnext/stock/doctype/item/item.py +487,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 +62,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
+DocType: Payment Entry,Allocate Payment Amount,Tildel Betaling Beløb
 DocType: Employee External Work History,Salary,Løn
 DocType: Serial No,Delivery Document Type,Levering Dokumenttype
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Indsend alle lønsedler for de ovenfor valgte kriterier
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,synkroniseret {0} Varer
 DocType: Sales Order,Partly Delivered,Delvist Delivered
-DocType: Sales Invoice,Existing Customer,Eksisterende kunde
 DocType: Email Digest,Receivables,Tilgodehavender
+DocType: Lead Source,Lead Source,Lead Source
 DocType: Customer,Additional information regarding the customer.,Yderligere oplysninger om kunden.
 DocType: Quality Inspection Reading,Reading 5,Reading 5
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +38,Campaign Name is required,Kampagne navn er påkrævet
 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
@@ -3795,10 +3848,9 @@
 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 +129,BOM and Manufacturing Quantity are required,BOM and Manufacturing Mængde kræves
+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/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Ageing Range 2
 DocType: SG Creation Tool Course,Max Strength,Max Strength
-DocType: Bank Reconciliation Detail,Amount,Beløb
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM erstattet
 ,Sales Analytics,Salg Analytics
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +113,Available {0},Tilgængelige {0}
@@ -3806,14 +3858,14 @@
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Opsætning af E-mail
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +96,Please enter default currency in Company Master,Indtast standard valuta i Company Master
 DocType: Stock Entry Detail,Stock Entry Detail,Stock indtastning Detail
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +100,Daily Reminders,Daglige Påmindelser
+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/account/account_tree.js +23,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 +71,Customer Service,Kundeservice
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Customer Service,Kundeservice
 DocType: Homepage Featured Product,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.
@@ -3822,8 +3874,9 @@
 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
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Standard Work In Progress Warehouse
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1570,Total nos of serial no is not equal to quantity.,Total nos af serienr er ikke lig med kvantitet.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1594,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
 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
@@ -3831,9 +3884,10 @@
 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 +82,Engineer,Ingeniør
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,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 +370,Item Code required at Row No {0},Item Code kræves på Row Nej {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +398,Item Code required at Row No {0},Item Code kræves på Row Nej {0}
 DocType: Sales Partner,Partner Type,Partner Type
 DocType: Purchase Taxes and Charges,Actual,Faktiske
 DocType: Authorization Rule,Customerwise Discount,Customerwise Discount
@@ -3849,16 +3903,18 @@
 DocType: BOM,Raw Material Cost,Raw Material Omkostninger
 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/setup/setup_wizard/install_fixtures.py +55,Part-time,Deltid
+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
 DocType: Employee,Applicable Holiday List,Gældende Holiday List
 DocType: Employee,Cheque,Cheque
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Series Opdateret
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +57,Series Updated,Series Opdateret
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Rapporttype er obligatorisk
 DocType: Item,Serial Number Series,Serial Number Series
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Warehouse er obligatorisk for lager Vare {0} i række {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Detail &amp; Wholesale
 DocType: Issue,First Responded On,Først svarede den
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross Notering af Item i flere grupper
+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 +87,Clearance Date updated,Clearance Dato opdateret
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Succesfuld Afstemt
@@ -3872,7 +3928,7 @@
 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 +513,Posting date and posting time is mandatory,Udstationering dato og udstationering tid er obligatorisk
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Udstationering dato og udstationering tid er obligatorisk
 apps/erpnext/erpnext/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."
@@ -3882,7 +3938,7 @@
 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/stock/doctype/stock_entry/stock_entry.py +158,Target warehouse in row {0} must be same as Production Order,Target lager i rækken {0} skal være samme som produktionsordre
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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
 DocType: Company,Round Off Account,Afrunde konto
@@ -3891,23 +3947,22 @@
 DocType: Customer Group,Parent Customer Group,Overordnet kunde Group
 DocType: Purchase Invoice,Contact Email,Kontakt E-mail
 DocType: Appraisal Goal,Score Earned,Score tjent
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Notice Period,Opsigelsesperiode
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,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 +4,New Sales Person Name,New Sales Person Name
 DocType: Packing Slip,Gross Weight UOM,Gross Weight UOM
-DocType: Email Digest,Receivables / Payables,Tilgodehavender / Gæld
 DocType: Delivery Note Item,Against Sales Invoice,Mod Salg Faktura
 DocType: Bin,Reserved Qty for Production,Reserveret Antal for Produktion
 DocType: Asset,Frequency of Depreciation (Months),Hyppigheden af afskrivninger (måneder)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +469,Credit Account,Credit konto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Credit Account,Credit konto
 DocType: Landed Cost Item,Landed Cost Item,Landed Cost Vare
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +55,Show zero values,Vis nul værdier
+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
 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 +647,Please specify Attribute Value for attribute {0},Angiv Attribut Værdi for attribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Angiv Attribut Værdi for attribut {0}
 DocType: Item,Default Warehouse,Standard Warehouse
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +39,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
@@ -3929,19 +3984,22 @@
 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
-DocType: Sales Invoice,Cold Calling,Telefonsalg
 DocType: SMS Parameter,SMS Parameter,SMS Parameter
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,Budget og Cost center
 DocType: Maintenance Schedule Item,Half Yearly,HalvÅrlig
 DocType: Lead,Blog Subscriber,Blog Subscriber
+DocType: Guardian,Alternate Number,Alternativ Number
 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.
+DocType: Stock Reconciliation Item,Quantity Difference,Mængde Forskel
 apps/erpnext/erpnext/config/hr.py +253,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 +141,Set as Lost,Sæt som Lost
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,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 +5,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
 DocType: Supplier,Credit Days Based On,Credit Dage Baseret på
@@ -3953,11 +4011,10 @@
 ,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 +941,Select or add new customer,Vælg eller tilføje ny kunde
+apps/erpnext/erpnext/accounts/page/pos/pos.js +930,Select or add new customer,Vælg eller tilføje ny kunde
 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 +5,This is based on the attendance of this Employee,Dette er baseret på deltagelse af denne Medarbejder
-DocType: Sales Invoice,Frequency,Frekvens
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +463,Debit Account,Debet konto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,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)
@@ -3966,27 +4023,27 @@
 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 +210,Supplier Quotation {0} created,Leverandør Citat {0} skabt
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +208,Supplier Quotation {0} created,Leverandør tilbud {0} oprettet
 apps/erpnext/erpnext/accounts/report/financial_statements.py +90,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 +173,Employee Benefits,Personaleydelser
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,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 +228,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 +232,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 +499,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 +500,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 +1007,Price List not found or disabled,Prisliste ikke fundet eller handicappede
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1008,Price List not found or disabled,Prisliste ikke fundet eller handicappede
 DocType: Expense Claim,Approved,Godkendt
 DocType: Pricing Rule,Price,Pris
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +244,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 +256,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
@@ -3997,12 +4054,12 @@
 DocType: Address,Office,Kontor
 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 +259,Please select Employee Record first.,Vælg Medarbejder Record først.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +266,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 +190,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 +235,Please enter Expense Account,Indtast venligst udgiftskonto
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,Please enter Expense Account,Indtast venligst udgiftskonto
 DocType: Account,Stock,Lager
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,"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 +976,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: referencedokument Type skal være en af indkøbsordre, købsfaktura eller Kassekladde"
 DocType: Employee,Current Address,Nuværende adresse
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Hvis varen er en variant af et andet element derefter beskrivelse, billede, prissætning, skatter mv vil blive fastsat fra skabelonen medmindre det udtrykkeligt er angivet"
 DocType: Serial No,Purchase / Manufacture Details,Køb / Fremstilling Detaljer
@@ -4017,9 +4074,10 @@
 DocType: Asset Movement,Transaction Date,Transaktion Dato
 DocType: Production Plan Item,Planned Qty,Planned Antal
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,I alt Skat
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,For Quantity (Manufactured Qty) is mandatory,For Mængde (Fremstillet Antal) er obligatorisk
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,For Quantity (Manufactured Qty) is mandatory,For Mængde (Fremstillet Antal) er obligatorisk
 DocType: Stock Entry,Default Target Warehouse,Standard Target Warehouse
 DocType: Purchase Invoice,Net Total (Company Currency),Net alt (Company Valuta)
+apps/erpnext/erpnext/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 +78,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: Production Order,Actual Start Date,Faktiske startdato
@@ -4034,9 +4092,11 @@
 DocType: Warranty Claim,If different than customer address,Hvis anderledes end kunde adresse
 DocType: BOM Operation,BOM Operation,BOM Operation
 DocType: Purchase Taxes and Charges,On Previous Row Amount,På Forrige Row Beløb
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +226,Transfer Asset,Transfer Asset
+DocType: Student,Home Address,Hjemme adresse
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +227,Transfer Asset,Transfer Asset
 DocType: POS Profile,POS Profile,POS profil
 apps/erpnext/erpnext/config/schools.py +33,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 +129,"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
@@ -4046,8 +4106,8 @@
 DocType: Assessment,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 +765,Material to Supplier,Materiale til leverandøren
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +189,Excise Invoice,Skattestyrelsen Faktura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,Material to Supplier,Materiale til leverandøren
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,Skattestyrelsen Faktura
 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
@@ -4057,7 +4117,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,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: Scheduling Tool,Scheduling Tool,Planlægning Tool
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +136,Credit Card,Credit Card
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,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.
 DocType: Purchase Invoice,Next Date,Næste dato
@@ -4065,6 +4125,7 @@
 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: 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"
+DocType: Academic Term,Term End Date,Term Slutdato
 DocType: Hub Settings,Seller Name,Sælger Navn
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Skatter og Afgifter Fratrukket (Company Valuta)
 DocType: Item Group,General Settings,Generelle indstillinger
@@ -4076,7 +4137,7 @@
 DocType: Customer,Commission Rate,Kommissionens Rate
 apps/erpnext/erpnext/stock/doctype/item/item.js +261,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 +115,"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/accounts/doctype/payment_entry/payment_entry.py +118,"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/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Er tom Indkøbskurv
 DocType: Production Order,Actual Operating Cost,Faktiske driftsomkostninger
@@ -4091,10 +4152,10 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,Vælg en CSV-fil
 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 +92,Designer,Designer
+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
 DocType: Serial No,Delivery Details,Levering Detaljer
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +469,Cost Center is required in row {0} in Taxes table for type {1},Cost Center kræves i række {0} i Skatter tabellen for type {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +472,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
 ,Item-wise Purchase Register,Vare-wise Purchase Tilmeld
 DocType: Batch,Expiry Date,Udløbsdato
@@ -4104,12 +4165,12 @@
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Projekt mester.
 apps/erpnext/erpnext/controllers/status_updater.py +174,"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 +417, (Half Day),(Halv dag)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425, (Half Day),(Halv dag)
 DocType: Supplier,Credit Days,Credit Dage
 DocType: Leave Type,Is Carry Forward,Er Carry Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +740,Get Items from BOM,Få elementer fra BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +711,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 +549,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/controllers/accounts_controller.py +552,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
 ,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
diff --git a/erpnext/translations/de.csv b/erpnext/translations/de.csv
index a144086..ad9db71 100644
--- a/erpnext/translations/de.csv
+++ b/erpnext/translations/de.csv
@@ -11,18 +11,17 @@
 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
 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 +21,Evaluation,Auswertung
+apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +21,Evaluation,Beurteilung
 DocType: Item,Default Unit of Measure,Standardmaßeinheit
 DocType: SMS Center,All Sales Partner Contact,Alle Vertriebspartnerkontakte
 DocType: Employee,Leave Approvers,Urlaubsgenehmiger
 DocType: Sales Partner,Dealer,Händler
 DocType: Employee,Rented,Gemietet
 DocType: Purchase Order,PO-,PO-
-apps/erpnext/erpnext/accounts/report/financial_statements.py +19,Start Year {0} not found.,Beginn Jahr {0} nicht gefunden.
 DocType: POS Profile,Applicable for User,Anwenden für Benutzer
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +191,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",Angehaltener Fertigungsauftrag kann nicht storniert werden. Bitte zuerst den Fertigungsauftrag fortsetzen um ihn dann zu stornieren
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +197,Do you really want to scrap this asset?,Wollen Sie wirklich diese Anlageklasse zu Schrott?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +17,Select Default Supplier,Wählen Sie Standard Lieferant
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +192,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",Angehaltener Fertigungsauftrag kann nicht storniert werden. Bitte zuerst den Fertigungsauftrag fortsetzen um ihn dann zu stornieren
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +198,Do you really want to scrap this asset?,Wollen Sie wirklich diese Anlageklasse zu Schrott?
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Standard -Lieferant auswählen
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Währung für Preisliste {0} erforderlich
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Wird in der Transaktion berechnet.
 DocType: Address,County,Landesbezirk/Gemeinde/Kreis
@@ -42,46 +41,45 @@
 DocType: Sales Invoice,Customer Name,Kundenname
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +126,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 +180,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 +183,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 +148,Series Updated Successfully,Nummernkreise erfolgreich geändert
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +149,Series Updated Successfully,Nummernkreise erfolgreich geändert
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Auschecken
 DocType: Pricing Rule,Apply On,Anwenden auf
 DocType: Item Price,Multiple Item prices.,Mehrere verschiedene Artikelpreise
 ,Purchase Order Items To Be Received,Eingehende Lieferantenauftrags-Artikel
 DocType: SMS Center,All Supplier Contact,Alle Lieferantenkontakte
-DocType: Quality Inspection Reading,Parameter,Parameter
 apps/erpnext/erpnext/projects/doctype/project/project.py +54,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 +239,New Leave Application,Neuer Urlaubsantrag
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,New Leave Application,Neuer Urlaubsantrag
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +20,Attendance Record {0} exists against Student {1} for Course Schedule {2},Besucherrekord {0} existiert gegen Studenten {1} für Kursplan {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Bank Draft,Bankwechsel
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,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
 DocType: Academic Term,Academic Term,Semester
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +13,Material,Stoff
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Quantity,Menge
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +511,Accounts table cannot be blank.,Kontenliste darf nicht leer sein.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +616,Quantity,Menge
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +512,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)
 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/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 +142,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
-DocType: Purchase Invoice,Monthly,Monatlich
 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/buying/doctype/purchase_order/purchase_order.js +771,Invoice,Rechnung
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +750,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 +198,Row {0}: {1} {2} does not match with {3},Zeile {0}: {1} {2} stimmt nicht mit {3} überein
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Zeile # {0}:
+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 +127,Please select Price List,Bitte eine Preisliste auswählen
@@ -112,8 +110,8 @@
 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 +589,Get items from,Holen Sie Elemente aus
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +382,Stock cannot be updated against Delivery Note {0},Lager kann nicht mit Lieferschein {0} aktualisiert werden
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Holen Sie Elemente aus
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,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
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Lebensmittelgeschäft
@@ -122,7 +120,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Pensionsfonds
 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 +156,Salary Structure Missing,Gehaltsstruktur Fehlende
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,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
@@ -130,10 +128,11 @@
 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/config/stock.py +32,Stock Reports,Auf Berichte
 DocType: Warehouse,Warehouse Detail,Lagerdetail
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,Credit limit has been crossed for customer {0} {1}/{2},Kreditlimit für Kunde {0} {1}/{2} wurde überschritten
-apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Ist Anlagevermögen"" kann nicht deaktiviert werden, da Anlagebuchung gegen den Artikel vorhanden"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +189,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"
 DocType: Tax Rule,Tax Type,Steuerart
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +144,You are not authorized to add or update entries before {0},Sie haben keine Berechtigung Buchungen vor {0} hinzuzufügen oder zu aktualisieren
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,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/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
@@ -143,18 +142,17 @@
 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 +165,Opening,Eröffnung
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,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/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Kunden&gt; Kundengruppe&gt; Territorium
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Konto Pay Nur
 DocType: Stock Entry,Additional Costs,Zusätzliche Kosten
 apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Account with existing transaction can not be converted to group.,Ein Konto mit bestehenden Transaktionen kann nicht in eine Gruppe umgewandelt werden
 DocType: Lead,Product Enquiry,Produktanfrage
 DocType: Academic Term,Schools,Schulen
 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 +335,Please select Company first,Bitte zuerst Firma auswählen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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
@@ -164,7 +162,7 @@
 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
 DocType: Purchase Invoice Item,Is Fixed Asset,Ist Anlagevermögen
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Available qty is {0}, you need {1}","Verfügbare Menge ist {0}, müssen Sie {1}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +225,"Available qty is {0}, you need {1}","Verfügbare Menge ist {0}, müssen Sie {1}"
 DocType: Expense Claim Detail,Claim Amount,Betrag einfordern
 DocType: Employee,Mr,Hr.
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Lieferantentyp / Lieferant
@@ -173,25 +171,26 @@
 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: Assessment Result,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 +171,Annual Salary,Jahresgehalt
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Annual Salary,Jahresgehalt
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Lagerkosten
-apps/erpnext/erpnext/accounts/report/financial_statements.py +22,End Year {0} not found.,Ende Jahr {0} nicht gefunden.
 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
 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 +130,At least one mode of payment is required for POS invoice.,Mindestens eine Art der Bezahlung ist für POS-Rechnung erforderlich.
 DocType: Products Settings,Show Products as a List,Produkte anzeigen als Liste
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Vorlage herunterladen, passende Daten eintragen und geänderte Datei anfügen. Alle Termine und Mitarbeiter-Kombinationen im gewählten Zeitraum werden in die Vorlage übernommen, inklusive der bestehenden Anwesenheitslisten"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +451,Item {0} is not active or end of life has been reached,Artikel {0} ist nicht aktiv oder hat das Ende der Lebensdauer erreicht
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +456,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/controllers/accounts_controller.py +614,"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/controllers/accounts_controller.py +617,"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 +166,Settings for HR Module,Einstellungen für das Personal-Modul
 DocType: SMS Center,SMS Center,SMS-Center
 DocType: Sales Invoice,Change Amount,Anzahl ändern
@@ -203,13 +202,13 @@
 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 +147,Execution,Ausführung
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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/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}"
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,Cost Center {0} does not belong to Company {1},Kostenstelle {0} gehört nicht zu Firma {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +100,Cost Center {0} does not belong to Company {1},Kostenstelle {0} gehört nicht zu Firma {1}
 DocType: Customer,Individual,Einzelperson
 DocType: Interest,Academics User,Lehre Benutzer
 DocType: Cheque Print Template,Amount In Figure,Betrag In Abbildung
@@ -225,30 +224,32 @@
 DocType: Production Planning Tool,Sales Orders,Kundenaufträge
 DocType: Purchase Taxes and Charges,Valuation,Bewertung
 ,Purchase Order Trends,Entwicklung Lieferantenaufträge
+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"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,Insufficient Stock,Unzureichende Auf
+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: 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/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} does not belong to Company {1},Konto {0} gehört nicht zu Firma {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +86,Account {0} does not belong to Company {1},Konto {0} gehört nicht zu Firma {1}
 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}
 DocType: Naming Series,Series List for this Transaction,Nummernkreise zu diesem Vorgang
 DocType: Sales Invoice,Is Opening Entry,Ist Eröffnungsbuchung
 DocType: Customer Group,Mention if non-standard receivable account applicable,"Vermerken, wenn kein Standard-Forderungskonto verwendbar ist"
 DocType: Course Schedule,Instructor Name,Ausbilder-Name
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,For Warehouse is required before Submit,"""Für Lager"" wird vor dem Übertragen benötigt"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,For Warehouse is required before Submit,"""Für Lager"" wird vor dem Übertragen benötigt"
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Eingegangen am
 DocType: Sales Partner,Reseller,Wiederverkäufer
 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 +1436,"LocalStorage is full , did not save","Localstorage voll ist, nicht speichern"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1460,"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}
@@ -261,18 +262,19 @@
 apps/erpnext/erpnext/templates/generators/item.html +78,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 +5,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/leave_application/leave_application.py +206,Only the selected Leave Approver can submit this Leave Application,Nur der ausgewählte Urlaubsgenehmiger kann Urlaubsgenehmigungen übertragen
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +213,Only the selected Leave Approver can submit this Leave Application,Nur der ausgewählte Urlaubsgenehmiger kann Urlaubsgenehmigungen übertragen
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Freitstellungsdatum muss nach dem Eintrittsdatum liegen
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Leaves per Year,Abwesenheiten pro Jahr
+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 +103,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}
+DocType: Email Digest,Profit & Loss,Profiteinbuße
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,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 +435,Leave Blocked,Urlaub gesperrt
-apps/erpnext/erpnext/stock/doctype/item/item.py +669,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 +443,Leave Blocked,Urlaub gesperrt
+apps/erpnext/erpnext/stock/doctype/item/item.py +671,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 +83,Annual,Jährlich
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +86,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
@@ -280,20 +282,22 @@
 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"
 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 +91,Software Developer,Software-Entwickler
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,Software-Entwickler
 DocType: Item,Minimum Order Qty,Mindestbestellmenge
 DocType: Pricing Rule,Supplier Type,Lieferantentyp
 DocType: Scheduling Tool,Course Start Date,Kursbeginn
 DocType: Item,Publish in Hub,Im Hub veröffentlichen
+DocType: Student Admission,Student Admission,Studenten Eintritt
 ,Terretory,Region
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is cancelled,Artikel {0} wird storniert
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Material Request,Materialanfrage
+apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} is cancelled,Artikel {0} wird storniert
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +823,Material Request,Materialanfrage
 DocType: Bank Reconciliation,Update Clearance Date,Abwicklungsdatum aktualisieren
 apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +28,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 +328,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},"Artikel {0} in Tabelle ""Rohmaterialien geliefert"" des Lieferantenauftrags {1} nicht gefunden"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +333,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/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
@@ -309,20 +313,21 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +130,Please select Charge Type first,Bitte zuerst Chargentyp auswählen
 DocType: Student Group Student,Student Group Student,Student Group Student
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Neueste(r/s)
+DocType: Email Digest,New Quotations,Neue Angebote
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Der erste Urlaubsgenehmiger auf der Liste wird als standardmäßiger Urlaubsgenehmiger festgesetzt
 DocType: Tax Rule,Shipping County,Versand-Landesbezirk/-Gemeinde/-Kreis
 apps/erpnext/erpnext/config/desktop.py +158,Learn,Lernen
 DocType: Asset,Next Depreciation Date,Nächstes Abschreibungsdatum
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Aktivitätskosten je Mitarbeiter
 DocType: Accounts Settings,Settings for Accounts,Konteneinstellungen
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +626,Supplier Invoice No exists in Purchase Invoice {0},Lieferantenrechnung existiert in Kauf Rechnung {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +629,Supplier Invoice No exists in Purchase Invoice {0},Lieferantenrechnung existiert in Kauf Rechnung {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Baumstruktur der Vertriebsmitarbeiter verwalten
 DocType: Job Applicant,Cover Letter,Motivationsschreiben
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Ausstehende Schecks und Anzahlungen zum verbuchen
 DocType: Item,Synced With Hub,Synchronisiert mit Hub
 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 +348,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 +86,Circular Reference Error,Zirkelschluss-Fehler
@@ -334,15 +339,16 @@
 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 +806,Delivery Note,Lieferschein
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +800,Delivery Note,Lieferschein
 apps/erpnext/erpnext/config/learn.py +87,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 +233,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/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/setup/doctype/email_digest/email_digest.py +104,Summary for this week and pending activities,Zusammenfassung für diese Woche und anstehende Aktivitäten
+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
 DocType: Employee,Company Email,Email-Adresse der Firma
@@ -354,27 +360,28 @@
 apps/erpnext/erpnext/config/hr.py +186,"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"
-apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Kauf Rechnung kann nicht gegen einen bereits bestehenden Asset vorgenommen werden {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +554,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 +54,{0} already allocated for Employee {1} for period {2} to {3},{0} bereits an Mitarbeiter {1} zugeteilt für den Zeitraum {2} bis {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +812,Select Item,Artikel auswählen
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +791,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 \
 					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 +142,Purchase Invoice {0} is already submitted,Eingangsrechnung {0} wurde bereits übertragen
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Zeile # {0}: Chargennummer muss dieselbe sein wie {1} {2}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +143,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
 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 +342,Please see attachment,Bitte Anhang beachten
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,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 +19,Setup Already Complete!!,Einrichtungsvorgang bereits abgeschlossen!!
 ,Finished Goods,Fertigerzeugnisse
 DocType: Delivery Note,Instructions,Anweisungen
 DocType: Quality Inspection,Inspected By,Geprüft von
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Lieferant&gt; Lieferant Typ
 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/public/js/utils/item_selector.js +12,Add Items,Mehrere Artikel hinzufügen
@@ -388,29 +395,29 @@
 DocType: Currency Exchange,Currency Exchange,Währungs-Umrechnung
 DocType: Purchase Invoice Item,Item Name,Artikelname
 DocType: Authorization Rule,Approving User  (above authorized value),Genehmigender Benutzer (über dem autorisierten Wert)
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Verfügbarer Kredit
+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/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 +736,Purchase Return,Warenrücksendung
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +715,Purchase Return,Warenrücksendung
 ,Purchase Register,Übersicht über Einkäufe
 DocType: 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 +202,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) muss die Rolle ""Urlaubsgenehmiger"" haben"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,{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 +143,Reason for losing,Grund für das Verlieren
-apps/erpnext/erpnext/accounts/utils.py +239,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 +163,Reason for losing,Grund für das Verlieren
+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
 DocType: Announcement,Receiver,Empfänger
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Arbeitsplatz ist an folgenden Tagen gemäß der Urlaubsliste geschlossen: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Chancen
 DocType: Employee,Single,Ledig
 DocType: Account,Cost of Goods Sold,Selbstkosten
 DocType: Purchase Invoice,Yearly,Jährlich
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +225,Please enter Cost Center,Bitte die Kostenstelle eingeben
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,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
@@ -423,26 +430,26 @@
 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
 DocType: Account,Is Group,Ist Gruppe
+DocType: Email Digest,Pending Purchase Orders,Bis Bestellungen
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Automatisch Seriennummern auf Basis FIFO einstellen
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,"Aktivieren, damit dieselbe Lieferantenrechnungsnummer nur einmal vorkommen kann"
 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 +102,Non Profit,Gemeinnützig
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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: Stock Reconciliation Item,Do not include symbols (ex. $),Fügen Sie keine Symbole (ex. $)
 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 +638,Attribute {0} selected multiple times in Attributes Table,Attribut {0} mehrfach in Attributetabelle ausgewäht
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Attribut {0} mehrfach in Attributetabelle ausgewäht
 DocType: HR Settings,Employee record is created using selected field. ,Mitarbeiter-Datensatz wird erstellt anhand des ausgewählten Feldes.
 DocType: Sales Order,Not Applicable,Nicht anwenden
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Stammdaten zum Urlaub
 DocType: Request for Quotation Item,Required Date,Angefragtes Datum
 DocType: Delivery Note,Billing Address,Rechnungsadresse
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +862,Please enter Item Code.,Bitte die Artikelnummer eingeben
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +847,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."
@@ -456,12 +463,12 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Wertpapiere und Einlagen
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Die Gesamtmenge des zugeteilten Urlaubs ist zwingend erforderlich
 DocType: Job Opening,Description of a Job Opening,Stellenbeschreibung
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Pending activities for today,Ausstehende Aktivitäten für heute
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Ausstehende Aktivitäten für heute
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Anwesenheitsnachweis
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Gehaltskomponente für Zeiterfassung basierte Abrechnung.
 DocType: Sales Order Item,Used for Production Plan,Wird für den Produktionsplan verwendet
 DocType: Manufacturing Settings,Time Between Operations (in mins),Zeit zwischen den Arbeitsgängen (in Minuten)
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +92,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} Budget für Konto {1} gegen Kostenstelle {2} ist {3}. Es wird um {4} überschritten
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +95,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} Budget für Konto {1} gegen Kostenstelle {2} ist {3}. Es wird um {4} überschritten
 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
@@ -469,16 +476,16 @@
 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/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 +86,Administrative Officer,Administrativer Benutzer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,Administrativer Benutzer
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +23,Acutal Qty {0} / Waiting Qty {1},Tatsächliche Menge {0} / Wartende Menge {1}
 DocType: Timesheet Detail,Hrs,Stunden
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +319,Please select Company,Bitte Firma auswählen
-DocType: Stock Entry,Difference Account,Differenzkonto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +309,Please select Company,Bitte Firma auswählen
+DocType: Stock Entry Detail,Difference Account,Differenzkonto
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,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 +398,Please enter Warehouse for which Material Request will be raised,"Bitte das Lager eingeben, für das eine Materialanfrage erhoben wird"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +399,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 +530,"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 +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"
 DocType: Shipping Rule,Net Weight,Nettogewicht
 DocType: Employee,Emergency Phone,Notruf
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +28,Buy,Kaufen
@@ -486,7 +493,7 @@
 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 +1563,Serial no item cannot be a fraction,Serien-Nr Element kann nicht ein Bruchteil sein
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1587,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
@@ -495,13 +502,14 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Account {0} does not belong to company: {1},Konto {0} gehört nicht zu Firma: {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation already used for another company,Abkürzung bereits für ein anderes Unternehmen verwendet
 DocType: Selling Settings,Default Customer Group,Standardkundengruppe
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Supplier is required against Payable account {0},"Lieferant ist verpflichtet, gegen Kreditorenkonto {0}"
 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
 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 +313,Reference No and Reference Date is mandatory for Bank transaction,Referenznummer und Referenzdatum ist obligatorisch für Bankengeschäft
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +316,Reference No and Reference Date is mandatory for Bank transaction,Referenznummer und Referenzdatum ist obligatorisch für Bankengeschäft
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Hinzufügen/Bearbeiten von Steuern und Abgaben
 DocType: Purchase Invoice,Supplier Invoice No,Lieferantenrechnungsnr.
 DocType: Territory,For reference,Zu Referenzzwecken
@@ -512,7 +520,6 @@
 DocType: Installation Note Item,Installation Note Item,Bestandteil des Installationshinweises
 DocType: Production Plan Item,Pending Qty,Ausstehende Menge
 DocType: Budget,Ignore,Ignorieren
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Item Code&gt; Artikelgruppe&gt; Brand
 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/config/accounts.py +241,Setup cheque dimensions for printing,Setup-Kontrollmaße für den Druck
 DocType: Salary Slip,Salary Slip Timesheet,Gehaltszettel Timesheet
@@ -523,11 +530,11 @@
 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/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 +28,Please select Company and Party Type first,Bitte zuerst Firma und Gruppentyp auswählen
+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/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 +707,Make Sales Order,Kundenauftrag erstellen
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +701,Make Sales Order,Kundenauftrag erstellen
 DocType: Project Task,Project Task,Projekt-Teilaufgabe
 ,Lead Id,Lead-ID
 DocType: C-Form Invoice Detail,Grand Total,Gesamtbetrag
@@ -543,7 +550,8 @@
 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 +734,Sales Return,Rücklieferung
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +728,Sales Return,Rücklieferung
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +91,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)
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Datenbank potentieller Kunden.
@@ -552,14 +560,13 @@
 DocType: Quotation,Quotation To,Angebot für
 DocType: Lead,Middle Income,Mittleres Einkommen
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +212,Opening (Cr),Anfangssstand (Haben)
-apps/erpnext/erpnext/stock/doctype/item/item.py +795,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"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 +237,Allocated amount can not be negative,Zugewiesene Menge kann nicht negativ sein
+apps/erpnext/erpnext/stock/doctype/item/item.py +797,Default Unit of Measure for Item {0} cannot be changed directly because 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
 DocType: Purchase Order Item,Billed Amt,Rechnungsbetrag
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Ein logisches Lager zu dem Lagerbuchungen gemacht werden.
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Ausgangsrechnung-Zeiterfassung
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},Referenznr. & Referenz-Tag sind erforderlich für {0}
-DocType: Sales Invoice,Customer's Vendor,Kundenlieferant
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Proposal Writing,Verfassen von Angeboten
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,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"
@@ -568,13 +575,14 @@
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,Zeiterfassung
 DocType: Fiscal Year Company,Fiscal Year Company,Geschäftsjahr Firma
 DocType: Packing Slip Item,DN Detail,DN-Detail
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +257,Already supplier quotation has created,Bereits Anbieter Zitat erstellt
 DocType: Timesheet,Billed,Abgerechnet
 DocType: Batch,Batch Description,Chargenbeschreibung
+apps/erpnext/erpnext/accounts/utils.py +685,"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 +733,View Offline Records,Offline-Anzeige Datensätze
+apps/erpnext/erpnext/accounts/page/pos/pos.js +715,View Offline Records,Offline-Anzeige Datensätze
+DocType: Student,Sibling Details,Geschwister-Details
 DocType: Employee,Reason for Resignation,Kündigungsgrund
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,Vorlage für Mitarbeiterbeurteilungen
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,Einzelheiten zu Rechnungs-/Journalbuchungen
@@ -588,7 +596,7 @@
 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
 DocType: Employee,Passport Number,Passnummer
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Manager,Leiter
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,Leiter
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,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"
@@ -597,10 +605,11 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter email address,Bitte eine E-Mail-Adresse angeben
 DocType: Production Order Operation,In minutes,In Minuten
 DocType: Issue,Resolution Date,Datum der Entscheidung
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +299,Timesheet created:,Timesheet erstellt:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +715,Please set default Cash or Bank account in Mode of Payment {0},"Bitte Standardeinstellungen für Kassen- oder Bankkonto in ""Zahlungsart"" {0} setzen"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +300,Timesheet created:,Timesheet erstellt:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +772,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
 DocType: Selling Settings,Customer Naming By,Benennung der Kunden nach
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Bitte Setup Mitarbeiter Naming System in Human Resource&gt; HR-Einstellungen
 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
@@ -625,6 +634,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,Fertig
 DocType: Pricing Rule,Sales Manager,Vertriebsleiter
 DocType: Salary Structure Employee,Base,Base
+DocType: Timesheet,Total Billed Hours,Insgesamt Angekündigt Stunden
 DocType: Journal Entry,Write Off Amount,Abschreibungs-Betrag
 DocType: Journal Entry,Bill No,Rechnungsnr.
 DocType: Company,Gain/Loss Account on Asset Disposal,Gewinn / Verlustrechnung auf die Veräußerung von Vermögenswerten
@@ -639,11 +649,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +9,Pre Sales,Vorverkauf
 DocType: Purchase Receipt,Other Details,Sonstige Einzelheiten
 DocType: Account,Accounts,Rechnungswesen
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Marketing,Marketing
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +227,Payment Entry is already created,Payment Eintrag bereits erstellt
+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,Payment Eintrag bereits erstellt
 DocType: Purchase Receipt Item Supplied,Current Stock,Aktueller Lagerbestand
-apps/erpnext/erpnext/controllers/accounts_controller.py +538,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 +21,Preview Salary Slip,Vorschau Gehaltsabrechnung
+apps/erpnext/erpnext/controllers/accounts_controller.py +541,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 +38,Preview Salary Slip,Vorschau Gehaltsabrechnung
 DocType: Company,Deafult Cost Center,Deafult Kostenstellen
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +48,Account {0} has been entered multiple times,Konto {0} wurde mehrmals eingegeben
 DocType: Account,Expenses Included In Valuation,In der Bewertung enthaltene Aufwendungen
@@ -652,7 +662,7 @@
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,Bitte wählen Sie ein Student Group
 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 +617,Item has variants.,Artikel hat Varianten.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Artikel hat Varianten.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,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
@@ -672,7 +682,7 @@
 DocType: Purchase Order,Supply Raw Materials,Rohmaterial bereitstellen
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Das Datum, an dem die nächste Rechnung erstellt wird. Erstellung erfolgt beim Übertragen."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Umlaufvermögen
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,{0} is not a stock Item,{0} ist kein Lagerartikel
+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 +169,Lead must be set if Opportunity is made from Lead,"Lead muss eingestellt werden, wenn eine Opportunity aus dem Lead entsteht"
@@ -758,26 +768,25 @@
 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 +709,No Permission,Keine Berechtigung
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +710,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"
 apps/erpnext/erpnext/public/js/setup_wizard.js +298,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 +542,Row #{0}: Asset {1} must be submitted,Row # {0}: Vermögens {1} muss eingereicht werden
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset {1} must be submitted,Row # {0}: Vermögens {1} muss eingereicht werden
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Kein Mitarbeiter gefunden
 DocType: Supplier Quotation,Stopped,Angehalten
 DocType: Item,If subcontracted to a vendor,Wenn an einen Zulieferer untervergeben
 DocType: SMS Center,All Customer Contact,Alle Kundenkontakte
 apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,Lagerbestand über CSV hochladen
 DocType: Warehouse,Tree Details,Baum-Details
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Jetzt senden
 ,Support Analytics,Support-Analyse
 DocType: Item,Website Warehouse,Webseiten-Lager
 DocType: Payment Reconciliation,Minimum Invoice Amount,Mindestabrechnung
 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/sales_invoice/sales_invoice.py +227,Timesheet {0} is already completed or cancelled,Timesheet {0} ist bereits abgeschlossen oder abgebrochen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +259,Timesheet {0} is already completed or cancelled,Timesheet {0} ist bereits abgeschlossen oder abgebrochen
 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
@@ -793,13 +802,13 @@
 apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Kurstermine
 DocType: Maintenance Visit,Completion Status,Fertigstellungsstatus
 DocType: HR Settings,Enter retirement age in years,Geben Sie das Rentenalter in Jahren
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +229,Target Warehouse,Eingangslager
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +230,Target Warehouse,Eingangslager
 DocType: Cheque Print Template,Starting location from left edge,Startposition vom linken Rand
 DocType: Item,Allow over delivery or receipt upto this percent,Überlieferung bis zu diesem Prozentsatz zulassen
 DocType: Stock Entry,STE-,STE-
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Sales Order Date,Voraussichtlicher Liefertermin kann nicht vor dem Datum des Kundenauftrags liegen
 DocType: Upload Attendance,Import Attendance,Import von Anwesenheiten
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Alle Artikelgruppen
+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/config/setup.py +89,Automatically compose message on submission of transactions.,Automatisch beim Übertragen von Transaktionen Mitteilungen verfassen
@@ -811,13 +820,15 @@
 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/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
 DocType: Expense Claim,Expenses,Ausgaben
 DocType: Item Variant Attribute,Item Variant Attribute,Artikelvariantenattribut
 ,Purchase Receipt Trends,Trandanalyse Kaufbelege
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Research & Development,Forschung & Entwicklung
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Forschung & Entwicklung
 ,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
@@ -826,7 +837,7 @@
 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/controllers/accounts_controller.py +340,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Zahlung Eintrag {0} ist gegen die Ordnung verknüpft {1}, überprüfen, ob es als Fortschritt in dieser Rechnung gezogen werden sollte."
+apps/erpnext/erpnext/controllers/accounts_controller.py +343,"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
@@ -848,12 +859,12 @@
 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 +756,Purchase Receipt,Kaufbeleg
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +735,Purchase Receipt,Kaufbeleg
 ,Received Items To Be Billed,"Von Lieferanten gelieferte Artikel, die noch abgerechnet werden müssen"
 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 +167,Reference Doctype must be one of {0},Referenz Doctype muss man von {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +282,Unable to find Time Slot in the next {0} days for Operation {1},In den nächsten {0} Tagen kann für den Arbeitsgang {1} kein Zeitfenster gefunden werden
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +170,Reference Doctype must be one of {0},Referenz Doctype muss man von {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,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 +439,BOM {0} must be active,Stückliste {0} muss aktiv sein
@@ -864,7 +875,7 @@
 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 +214,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 +217,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
@@ -878,9 +889,9 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Mitarbeiter {0} ist nicht aktiv oder existiert nicht
 DocType: Fee Structure,Components,Komponenten
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,Please enter Asset Category in Item {0},Bitte geben Sie Anlagekategorie in Artikel {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +612,Item Variants {0} updated,Artikelvarianten {0} aktualisiert
+apps/erpnext/erpnext/stock/doctype/item/item.py +614,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 +843,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 +854,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
@@ -895,69 +906,72 @@
 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 +728,New Sales Invoice,Neue Ausgangsrechnung
+apps/erpnext/erpnext/accounts/page/pos/pos.js +710,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 +728,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
 DocType: Material Request Item,Lead Time Date,Lieferzeit und -datum
 DocType: Guardian,Guardian Name,Wächter-Name
 DocType: Cheque Print Template,Has Print Format,Hat das Druckformat
-apps/erpnext/erpnext/accounts/page/pos/pos.js +86, 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 +109,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 +619,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","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/page/pos/pos.js +75, 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 +613,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing 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 +606,Supplier Invoice Date cannot be greater than Posting Date,Lieferant Rechnungsdatum kann nicht größer sein als Datum der Veröffentlichung
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +609,Supplier Invoice Date cannot be greater than Posting Date,Lieferant Rechnungsdatum kann nicht größer sein als Datum der Veröffentlichung
 DocType: Purchase Invoice Item,Purchase Order Item,Lieferantenauftrags-Artikel
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +130,Indirect Income,Indirekte Erträge
 DocType: Cheque Print Template,Date Settings,Datums-Einstellungen
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Abweichung
 ,Company Name,Firmenname
 DocType: SMS Center,Total Message(s),Summe Nachricht(en)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +810,Select Item for Transfer,Artikel für Übertrag auswählen
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +789,Select Item for Transfer,Artikel für Übertrag auswählen
 DocType: Purchase Invoice,Additional Discount Percentage,Zusätzlicher prozentualer Rabatt
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Sehen Sie eine Liste aller Hilfe-Videos
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Bezeichnung des Kontos bei der Bank, bei der der Scheck eingereicht wurde, auswählen."
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,"Benutzer erlauben, die Preisliste in Transaktionen zu bearbeiten"
 DocType: Pricing Rule,Max Qty,Maximalmenge
-DocType: Student Applicant,Father's Name,Name des Vaters
 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 +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,"Zeile {0}: ""Zahlung zu Kunden-/Lieferantenauftrag"" sollte immer als ""Vorkasse"" eingestellt werden"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Chemische Industrie
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +686,All items have already been transferred for this Production Order.,Alle Artikel wurden schon für diesen Fertigungsauftrag übernommen.
+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
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +694,All items have already been transferred for this Production Order.,Alle Artikel wurden schon für diesen Fertigungsauftrag übernommen.
 DocType: Process Payroll,Select Payroll Year and Month,Jahr und Monat der Gehaltsabrechnung auswählen
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,Meter,Meter
 DocType: Workstation,Electricity Cost,Stromkosten
 DocType: HR Settings,Don't send Employee Birthday Reminders,Keine Mitarbeitergeburtstagserinnerungen senden
-DocType: Opportunity,Walk In,Laufkundschaft
 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 +12,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: Timesheet Detail,Bill,Rechnung
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,White,Weiß
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,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ß
 DocType: SMS Center,All Lead (Open),Alle Leads (offen)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +228,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})
+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 +731,Make ,Erstellen
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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."
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Mein Warenkorb
-apps/erpnext/erpnext/controllers/selling_controller.py +154,Order Type must be one of {0},Bestelltyp muss aus {0} sein
+apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Bestelltyp muss aus {0} sein
 DocType: Lead,Next Contact Date,Nächstes Kontaktdatum
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Anfangsmenge
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +393,Please enter Account for Change Amount,Bitte geben Sie Konto für Änderungsbetrag
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,Please enter Account for Change Amount,Bitte geben Sie Konto für Änderungsbetrag
 DocType: Student Batch,Student Batch Name,Studentenstapelname
 DocType: Holiday List,Holiday List Name,Urlaubslistenname
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js +8,Schedule Course,Unterrichtszeiten
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Stock Options,Lager-Optionen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Lager-Optionen
 DocType: Journal Entry Account,Expense Claim,Aufwandsabrechnung
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +211,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 +237,Qty for {0},Menge für {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +212,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 +238,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
@@ -966,9 +980,9 @@
 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/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Artikel wurden ohne Veränderung der Menge oder des Wertes entfernt.
+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 +635,Attribute table is mandatory,Attributtabelle ist zwingend erforderlich
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Attributtabelle ist zwingend erforderlich
 DocType: Production Planning Tool,Get Sales Orders,Kundenaufträge aufrufen
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{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
@@ -993,7 +1007,7 @@
 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/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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Seriennummer {0} ist mit Wartungsvertrag versehen bis {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +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
@@ -1005,7 +1019,7 @@
 DocType: GL Entry,Against,Zu
 DocType: Item,Default Selling Cost Center,Standard-Vertriebskostenstelle
 DocType: Sales Partner,Implementation Partner,Umsetzungspartner
-apps/erpnext/erpnext/controllers/selling_controller.py +231,Sales Order {0} is {1},Kundenauftrag {0} ist {1}
+apps/erpnext/erpnext/controllers/selling_controller.py +232,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
 DocType: Packing Slip,Net Weight UOM,Nettogewichtmaßeinheit
@@ -1015,25 +1029,24 @@
 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
 DocType: Sales Person,Select company name first.,Zuerst den Firmennamen auswählen.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Dr,Soll
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Dr,Soll
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Angebote von Lieferanten
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},An {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Durchschnittsalter
 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/templates/pages/home.html +32,View All Products,Alle Produkte
+apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Alle Produkte
 DocType: Company,Default Currency,Standardwährung
 DocType: Contact,Enter designation of this Contact,Bezeichnung dieses Kontakts eingeben
 DocType: Expense Claim,From Employee,Von Mitarbeiter
-apps/erpnext/erpnext/controllers/accounts_controller.py +400,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"
+apps/erpnext/erpnext/controllers/accounts_controller.py +403,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/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,und Jahr:
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +191,{0} {1} must be submitted,{0} {1} muss vorgelegt werden
-DocType: Email Digest,Annual Expense,Jährliche Kosten
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,{0} {1} must be submitted,{0} {1} muss vorgelegt werden
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +145,Quantity must be less than or equal to {0},Menge muss kleiner als oder gleich {0}
 DocType: SMS Center,Total Characters,Gesamtanzahl Zeichen
 apps/erpnext/erpnext/controllers/buying_controller.py +156,Please select BOM in BOM field for Item {0},Bitte aus dem Stücklistenfeld eine Stückliste für Artikel {0} auswählen
@@ -1044,30 +1057,31 @@
 DocType: Sales Partner,Distributor,Lieferant
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Warenkorb-Versandregel
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +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 +62,Please set 'Apply Additional Discount On',"Bitte ""Zusätzlichen Rabatt anwenden auf"" aktivieren"
+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
 DocType: Global Defaults,Global Defaults,Allgemeine Voreinstellungen
 apps/erpnext/erpnext/projects/doctype/project/project.py +153,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
 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 +327,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
 ,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 +362,Finished Item {0} must be entered for Manufacture type entry,Fertiger Artikel {0} muss für eine Fertigungsbuchung eingegeben werden
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +367,Finished Item {0} must be entered for Manufacture type entry,Fertiger Artikel {0} muss für eine Fertigungsbuchung eingegeben werden
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Eröffnungsbilanz
 DocType: Sales Invoice Advance,Sales Invoice Advance,Anzahlung auf Ausgangsrechnung
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +499,Nothing to request,Nichts anzufragen
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +500,Nothing to request,Nichts anzufragen
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',"Das ""Tatsächliche Startdatum"" kann nicht nach dem  ""Tatsächlichen Enddatum"" liegen"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Management,Verwaltung
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},Für {0} ist entweder ein Haben- oder Sollbetrag erforderlich
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,Verwaltung
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +55,Either debit or credit amount is required for {0},Für {0} ist entweder ein Haben- oder Sollbetrag erforderlich
 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 +161,Blue,Blau
+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
@@ -1077,12 +1091,12 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +23,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
 DocType: Stock Settings,Default Item Group,Standard-Artikelgruppe
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1374,Do you really want to submit the invoice?,Wollen Sie wirklich die Rechnung einreichen?
+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 +685,Cost Center For Item with Item Code ',Kostenstelle für den Artikel mit der Artikel-Nr.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1526,"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 +679,Cost Center For Item with Item Code ',Kostenstelle für den Artikel mit der Artikel-Nr.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1550,"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/accounts/doctype/account/account_tree.js +26,"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
@@ -1102,104 +1116,106 @@
 DocType: Payment Reconciliation,Unreconciled Payment Details,Nicht abgeglichene Zahlungen
 DocType: Global Defaults,Current Fiscal Year,Laufendes Geschäftsjahr
 DocType: Global Defaults,Disable Rounded Total,"""Gesamtsumme runden"" abschalten"
-DocType: Lead,Call,Anruf
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +417,'Entries' cannot be empty,"""Buchungen"" kann nicht leer sein"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +418,'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 +214,Fiscal Year {0} not found,Das Geschäftsjahr {0} nicht gefunden
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +221,Fiscal Year {0} not found,Das Geschäftsjahr {0} nicht gefunden
 apps/erpnext/erpnext/config/hr.py +238,Setting up Employees,Mitarbeiter anlegen
 DocType: Sales Order,SO-,DAMIT-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Bitte zuerst Präfix auswählen
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Please select prefix first,Bitte zuerst Präfix auswählen
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Research,Forschung
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,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 +43,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 +57,View Ledger,Hauptbuch anzeigen
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Frühestens
-apps/erpnext/erpnext/stock/doctype/item/item.py +504,"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 +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/setup/setup_wizard/setup_wizard.py +437,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
 ,Budget Variance Report,Budget-Abweichungsbericht
 DocType: Salary Slip,Gross Pay,Bruttolohn
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +90,Row {0}: Activity Type is mandatory.,Row {0}: Leistungsart ist obligatorisch.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +114,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/public/js/controllers/stock_controller.js +40,Accounting Ledger,Hauptbuch
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,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
 DocType: BOM Item,Item Description,Artikelbeschreibung
+DocType: Student Sibling,Student Sibling,Studenten Geschwister
 DocType: Purchase Invoice,Is Recurring,ist wiederkehrend
 DocType: Purchase Invoice,Supplied Items,Gelieferte Artikel
 DocType: Student,STUD.,ZUCHT.
 DocType: Production Order,Qty To Manufacture,Herzustellende Menge
+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/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 +131,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 +175,Valuation Rate required for Item in row {0},Bewertungsrate erforderlich für den Posten in der Zeile {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,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
 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 +87, to ,nach
+apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,nach
 DocType: Item,Lead Time in days,Lieferzeit in Tagen
 ,Accounts Payable Summary,Übersicht der Verbindlichkeiten
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Not authorized to edit frozen Account {0},Keine Berechtigung gesperrtes Konto {0} zu bearbeiten
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,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 +62,Sales Order {0} is not valid,Kundenauftrag {0} ist nicht gültig
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Kundenauftrag {0} ist nicht gültig
 apps/erpnext/erpnext/setup/doctype/company/company.py +185,"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 +152,Small,Klein
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,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}
 ,Invoiced Amount (Exculsive Tax),Rechnungsbetrag (ohne MwSt.)
-DocType: Student Applicant,Mother's / Guardian 1 Email ID,Mutter / Wächter 1 E-Mail-ID
 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 +160,Green,Grün
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,Grün
 DocType: Supplier,SUPP-,des Liefe-
 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 +57,Contract,Vertrag
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,Vertrag
 DocType: Email Digest,Add Quote,Angebot hinzufügen
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +498,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 +503,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 +80,Row {0}: Qty is mandatory,Zeile {0}: Menge ist zwingend erforderlich
+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 +737,Sync Master Data,Sync Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +719,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/public/js/setup_wizard.js +283,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
+DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,Stückliste
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Dies ist eine Root-Artikelgruppe und kann nicht bearbeitet werden.
+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.
 DocType: Journal Entry Account,Purchase Order,Lieferantenauftrag
 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 +345,"{0}: Employee email not found, hence email not sent","{0}: Mitarbeiter E-Mail nicht gefunden, E-Mail daher nicht gesendet"
+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
 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 +118,"For {0}, only credit accounts can be linked against another debit entry",Für {0} können nur Habenkonten mit einer weiteren Sollbuchung verknüpft werden
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Delivery Note {0} is not submitted,Lieferschein {0} ist nicht gebucht
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Delivery Note {0} is not submitted,Lieferschein {0} ist nicht gebucht
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Sub-contracted Item,Artikel {0} muss ein unterbeauftragter Artikel sein
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Betriebsvermögen
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Die Preisregel wird zunächst basierend auf dem Feld ""Anwenden auf"" ausgewählt. Dieses kann ein Artikel, eine Artikelgruppe oder eine Marke sein."
 DocType: Hub Settings,Seller Website,Webseite des Verkäufers
 DocType: Item,ITEM-,ARTIKEL-
-apps/erpnext/erpnext/controllers/selling_controller.py +147,Total allocated percentage for sales team should be 100,Insgesamt verteilte Prozentmenge für Vertriebsteam sollte 100 sein
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +110,Production Order status is {0},Status des Fertigungsauftrags lautet {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Insgesamt verteilte Prozentmenge für Vertriebsteam sollte 100 sein
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Status des Fertigungsauftrags lautet {0}
 DocType: Appraisal Goal,Goal,Ziel
 DocType: Sales Invoice Item,Edit Description,Beschreibung bearbeiten
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +757,For Supplier,Für Lieferant
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +723,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
@@ -1213,12 +1229,13 @@
 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
 DocType: Depreciation Schedule,Journal Entry,Buchungssatz
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,{0} items in progress,{0} Elemente im Gange
+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
 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 +445,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
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1667,Deafault warehouse is required for selected item,Deafault Lager wird für das ausgewählte Element erforderlich
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Deafault warehouse is required for selected item,Deafault Lager wird für das ausgewählte Element erforderlich
 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
@@ -1227,23 +1244,23 @@
 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 +110,Hardware,Hardware
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,Hardware
 DocType: Sales Order,Recurring Upto,Wiederholt sich bis
 DocType: Attendance,HR Manager,Leiter der Personalabteilung
 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 +48,Privilege Leave,Bevorzugter Urlaub
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,Bevorzugter Urlaub
 DocType: Purchase Invoice,Supplier Invoice Date,Lieferantenrechnungsdatum
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Sie müssen Ihren Einkaufswagen aktivieren.
 DocType: Payment Entry,Writeoff,Abschreiben
 DocType: Appraisal Template Goal,Appraisal Template Goal,Bewertungsvorlage zur Zielorientierung
-DocType: Salary Slip,Earning,Einkommen
+DocType: Salary Component,Earning,Einkommen
 DocType: Purchase Invoice,Party Account Currency,Gruppenkonten-Währung
 ,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 +171,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 +174,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_data.py +358,Food,Lebensmittel
+apps/erpnext/erpnext/demo/setup/setup_data.py +301,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/course_schedule/course_schedule.js +103,Mark Attendence,Mark attendence
@@ -1277,12 +1294,12 @@
 DocType: Sales Order Item,Planned Quantity,Geplante Menge
 DocType: Purchase Invoice Item,Item Tax Amount,Artikelsteuerbetrag
 DocType: Item,Maintain Stock,Lager verwalten
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +209,Stock Entries already created for Production Order ,Es wurden bereits Lagerbuchungen zum Fertigungsauftrag erstellt
+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
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,Nettoveränderung des Anlagevermögens
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Freilassen, wenn für alle Einstufungen gültig"
-apps/erpnext/erpnext/controllers/accounts_controller.py +620,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 +238,Max: {0},Max: {0}
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +15,From Datetime,Von Datum und Uhrzeit
+apps/erpnext/erpnext/controllers/accounts_controller.py +623,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 +239,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 +153,"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."
@@ -1290,8 +1307,8 @@
 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 +552,cannot be greater than 100,Kann nicht größer als 100 sein
-apps/erpnext/erpnext/stock/doctype/item/item.py +680,Item {0} is not a stock Item,Artikel {0} ist kein Lagerartikel
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +546,cannot be greater than 100,Kann nicht größer als 100 sein
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,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
@@ -1305,10 +1322,9 @@
 DocType: GL Entry,GL Entry,Buchung zum Hauptbuch
 DocType: HR Settings,Employee Settings,Mitarbeitereinstellungen
 ,Batch-Wise Balance History,Chargenbezogener Bestandsverlauf
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Aufgabenliste
 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 +61,Apprentice,Auszubildende(r)
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +102,Negative Quantity is not allowed,Negative Menge ist nicht erlaubt
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,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 +152,Employee cannot report to himself.,Mitarbeiter können nicht an sich selbst Bericht erstatten
@@ -1329,15 +1345,14 @@
 DocType: Asset,Asset Name,Asset-Name
 DocType: Shipping Rule Condition,To Value,Bis-Wert
 DocType: Asset Movement,Stock Manager,Lagerleiter
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +141,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 +719,Packing Slip,Packzettel
+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 +713,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/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,Angebotsanfrage kann der Zugriff sein durch folgenden Link klicken
 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 +81,Analyst,Analytiker
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,Analytiker
 DocType: Item,Inventory,Lagerbestand
 DocType: Item,Sales Details,Verkaufsdetails
 DocType: Quality Inspection,QI-,QI-
@@ -1345,7 +1360,7 @@
 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 +103,Government,Regierung
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,Regierung
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,Institut Namens
 apps/erpnext/erpnext/config/stock.py +289,Item Variants,Artikelvarianten
 DocType: Company,Services,Dienstleistungen
@@ -1361,6 +1376,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,Financial Year Start Date,Startdatum des Geschäftsjahres
 DocType: POS Profile,Apply Discount,bewerben Rabatt
 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
 DocType: Program Course,Program Course,Programm Kurs
@@ -1401,12 +1417,12 @@
 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
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +110,Accounting Entry for {0} can only be made in currency: {1},Eine Buchung für {0} kann nur in der Währung: {1} vorgenommen werden
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Eine Buchung für {0} kann nur in der Währung: {1} vorgenommen werden
 DocType: Pricing Rule,Pricing Rule,Preisregel
 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
 DocType: Shopping Cart Settings,Payment Success URL,Payment Success URL
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +78,Row # {0}: Returned Item {1} does not exists in {2} {3},Zeile # {0}: Zurückgegebener Artikel {1} existiert nicht in {2} {3}
+apps/erpnext/erpnext/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
@@ -1415,40 +1431,39 @@
 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/stock/doctype/stock_entry/stock_entry.py +339,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Übertragung von mehr {0} als {1} mit Lieferantenauftrag {2} nicht erlaubt
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +344,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 +545,Manufacturing Quantity is mandatory,Eingabe einer Fertigungsmenge ist erforderlich
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Eingabe einer Fertigungsmenge ist erforderlich
 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 +71,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 +162,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/projects/doctype/timesheet/timesheet.py +186,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
 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 +130,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 +137,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
 DocType: Dependent Task,Dependent Task,Abhängige Aufgabe
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,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/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 +190,Leave of type {0} cannot be longer than {1},Abwesenheit vom Typ {0} kann nicht länger sein als {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +197,Leave of type {0} cannot be longer than {1},Abwesenheit vom Typ {0} kann nicht länger sein als {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Arbeitsgänge für X Tage im Voraus planen.
 DocType: HR Settings,Stop Birthday Reminders,Geburtstagserinnerungen ausschalten
 DocType: SMS Center,Receiver List,Empfängerliste
-apps/erpnext/erpnext/accounts/page/pos/pos.js +921,Search Item,Suche Artikel
+apps/erpnext/erpnext/accounts/page/pos/pos.js +910,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 +546,Already completed,Schon erledigt
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +22,Payment Request already exists {0},Zahlungsanordnung bereits vorhanden ist {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +550,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 +241,Quantity must not be more than {0},Menge darf nicht mehr als {0} sein
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Quantity must not be more than {0},Menge darf nicht mehr als {0} sein
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +76,Previous Financial Year is not closed,Zurück Geschäftsjahr nicht geschlossen
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +44,Age (Days),Alter (Tage)
 DocType: Quotation Item,Quotation Item,Angebotsposition
@@ -1465,7 +1480,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +221,Purchase Receipt {0} is not submitted,Kaufbeleg {0} wurde nicht übertragen
 DocType: Company,Default Payable Account,Standard-Verbindlichkeitenkonto
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Einstellungen zum Warenkorb, z.B. Versandregeln, Preislisten usw."
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +83,{0}% Billed,{0}% berechnet
+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
@@ -1477,12 +1492,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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/schools/doctype/fees/fees.js +22,Collect,Sammeln
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Sammeln
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,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 +225,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
-DocType: Payment Reconciliation,Payments,Zahlungen
 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
@@ -1494,14 +1508,14 @@
 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 +9,Procurement,Beschaffung
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,Keiner der Artikel hat irgendeine Änderung bei Mengen oder Kosten.
+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
 ,Lead Details,Einzelheiten zum Lead
 DocType: Purchase Invoice,End date of current invoice's period,Schlußdatum der laufenden Eingangsrechnungsperiode
 DocType: Pricing Rule,Applicable For,Anwenden für
 DocType: Bank Reconciliation,From Date,Von-Datum
 DocType: Shipping Rule Country,Shipping Rule Country,Versandregel für Land
-apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +9,Leave and Attendance,Lassen Erfassung
+apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +9,Leave and Attendance,Urlaub und Anwesenheit
 DocType: Maintenance Visit,Partially Completed,Teilweise abgeschlossen
 DocType: Leave Type,Include holidays within leaves as leaves,Urlaube innerhalb von Abwesenheiten als Abwesenheiten mit einbeziehen
 DocType: Sales Invoice,Packed Items,Verpackte Artikel
@@ -1519,7 +1533,7 @@
 DocType: Purchase Invoice,Additional Discount,Zusätzlicher Rabatt
 DocType: Selling Settings,Selling Settings,Vertriebseinstellungen
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Online-Auktionen
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +97,Please specify either Quantity or Valuation Rate or both,Bitte entweder die Menge oder den Wertansatz oder beides eingeben
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,Bitte entweder die Menge oder den Wertansatz oder beides eingeben
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +13,Fulfillment,Erfüllung
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Firma, Monat und Geschäftsjahr sind zwingend erforderlich"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Marketingkosten
@@ -1540,14 +1554,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,ERPNext Setup abgeschlossen!
 DocType: Item,Weightage,Gewichtung
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +93,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Eine Kundengruppe mit dem gleichen Namen existiert bereits. Bitte den Kundennamen ändern oder die Kundengruppe umbenennen
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +126,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
 DocType: Stock Entry,Material Receipt,Materialannahme
 DocType: Homepage,Products,Produkte
 DocType: Announcement,Instructor,Lehrer
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},"""Gruppen-Typ"" und die ""Gruppe"" werden für das Konto ""Forderungen / Verbindlichkeiten"" {0} gebraucht"
 DocType: 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
@@ -1558,7 +1571,7 @@
 ,Item-wise Sales Register,Artikelbezogene Übersicht der Verkäufe
 DocType: Asset,Gross Purchase Amount,Bruttokaufbetrag
 DocType: Asset,Depreciation Method,Abschreibungsmethode
-apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Offline,Offline
+apps/erpnext/erpnext/accounts/page/pos/pos.js +686,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
@@ -1576,25 +1589,27 @@
 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
 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 +858,Make Purchase Order,Lieferantenauftrag erstellen
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +852,Make Purchase Order,Lieferantenauftrag erstellen
 DocType: SMS Center,Send To,Senden an
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,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 +148,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.
 DocType: Stock Reconciliation,Stock Reconciliation,Bestandsabgleich
 DocType: Territory,Territory Name,Name der Region
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +172,Work-in-Progress Warehouse is required before Submit,Fertigungslager wird vor dem Übertragen benötigt
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,Work-in-Progress Warehouse is required before Submit,Fertigungslager wird vor dem Übertragen benötigt
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Bewerber für einen Job
 DocType: Purchase Order Item,Warehouse and Reference,Lager und Referenz
 DocType: Supplier,Statutory info and other general information about your Supplier,Rechtlich notwendige und andere allgemeine Informationen über Ihren Lieferanten
-apps/erpnext/erpnext/hooks.py +88,Addresses,Adressen
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Lieferant&gt; Lieferant Typ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +212,Against Journal Entry {0} does not have any unmatched {1} entry,"""Zu Buchungssatz"" {0} hat nur abgeglichene {1} Buchungen"
+apps/erpnext/erpnext/hooks.py +95,Addresses,Adressen
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +215,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
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Das Nettogewicht dieses Pakets. (Automatisch als Summe der einzelnen Nettogewichte berechnet)
 DocType: Sales Order,To Deliver and Bill,Auszuliefern und Abzurechnen
@@ -1602,11 +1617,10 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,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 +731,Payment,Bezahlung
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,Payment,Bezahlung
 DocType: Production Order Operation,Actual Time and Cost,Tatsächliche Laufzeit und Kosten
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Materialanfrage von maximal {0} kann für Artikel {1} zum Kundenauftrag {2} gemacht werden
 DocType: Employee,Salutation,Anrede
-DocType: Pricing Rule,Brand,Marke
 DocType: Course,Course Abbreviation,Kurs Abkürzung
 DocType: Item,Will also apply for variants,Gilt auch für Varianten
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +142,"Asset cannot be cancelled, as it is already {0}","Vermögens kann nicht rückgängig gemacht werden, da es ohnehin schon ist {0}"
@@ -1618,7 +1632,7 @@
 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."
 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 +85,Associate,Mitarbeiter/-in
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,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
@@ -1626,7 +1640,7 @@
 DocType: Production Planning Tool,Material Requests,Materialwünsche
 DocType: Warranty Claim,Issue Date,Ausstellungsdatum
 DocType: Activity Cost,Activity Cost,Aktivitätskosten
-DocType: Timesheet Detail,Timesheet Detail,Timesheet-Detail
+DocType: Sales Invoice Timesheet,Timesheet Detail,Timesheet-Detail
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Verbrauchte Anzahl
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekommunikation
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Zeigt an, dass das Paket ein Teil dieser Lieferung ist (nur Entwurf)"
@@ -1649,6 +1663,7 @@
 DocType: Production Plan Material Request,Material Request Date,Material Auftragsdatum
 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
 DocType: Item,Has Variants,Hat Varianten
 DocType: Monthly Distribution,Name of the Monthly Distribution,Bezeichnung der monatsweisen Verteilung
 DocType: Sales Person,Parent Sales Person,Übergeordneter Vertriebsmitarbeiter
@@ -1661,30 +1676,31 @@
 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 +44,"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/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."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +502,Error: {0} &gt; {1},Fehler: {0}&gt; {1}
 DocType: Item,Is Sales Item,Ist Verkaufsartikel
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Artikelgruppenstruktur
 apps/erpnext/erpnext/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.
 DocType: Naming Series,Current Value,Aktueller Wert
-apps/erpnext/erpnext/controllers/accounts_controller.py +235,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/controllers/accounts_controller.py +238,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 +458,Item table can not be blank,Artikel-Tabelle kann nicht leer sein
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +443,Item table can not be blank,Artikel-Tabelle kann nicht leer sein
 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 +5,This is based on stock movement. See {0} for details,Dies ist auf Lager Bewegung basiert. Siehe {0} für Details
 DocType: Pricing Rule,Selling,Vertrieb
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +341,Amount {0} {1} deducted against {2},Menge {0} {1} abgezogen gegen {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +344,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
@@ -1699,8 +1715,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +144,Cannot refer row number greater than or equal to current row number for this Charge type,"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 +159,Red,Rot
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Bitte auf ""Zeitplan generieren"" klicken, um die Seriennummer für Artikel {0} abzurufen"
+apps/erpnext/erpnext/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
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Basisbetrag (Gesellschaft Währung)
@@ -1708,7 +1724,7 @@
 DocType: Installation Note,Installation Time,Installationszeit
 DocType: Sales Invoice,Accounting Details,Buchhaltungs-Details
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,Löschen aller Transaktionen dieser Firma
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +187,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Zeile #{0}: Arbeitsgang {1} ist für {2} die Menge an Fertigerzeugnissen im Produktionsauftrag # {3} abgeschlossen. Bitte den Status des Arbeitsgangs über die Zeitprotokolle aktualisieren
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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,Zeile #{0}: Arbeitsgang {1} ist für {2} die Menge an Fertigerzeugnissen im Produktionsauftrag # {3} abgeschlossen. Bitte den Status des Arbeitsgangs über die Zeitprotokolle aktualisieren
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,Investitionen
 DocType: Issue,Resolution Details,Details zur Entscheidung
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,Zuteilungen
@@ -1744,16 +1760,17 @@
 DocType: Bank Reconciliation Detail,Against Account,Gegenkonto
 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}
 DocType: Delivery Note,Excise Page Number,Seitenzahl entfernen
 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}
 ,Maintenance Schedules,Wartungspläne
 DocType: Task,Actual End Date (via Time Sheet),Das tatsächliche Enddatum (durch Zeiterfassung)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Amount {0} {1} against {2} {3},Menge {0} {1} gegen {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +339,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 +138,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 +295,Debit To account must be a Receivable account,Sollkonto muss ein Forderungskonto sein
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Receivable account,Sollkonto muss ein Forderungskonto sein
 DocType: Shipping Rule Condition,Shipping Amount,Versandbetrag
 ,Pending Amount,Ausstehender Betrag
 DocType: Purchase Invoice Item,Conversion Factor,Umrechnungsfaktor
@@ -1761,10 +1778,10 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +137,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"
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +90,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Die Gesamtmenge des beantragten Urlaubs {0} kann nicht kleiner sein als die bereits genehmigten Urlaube {1} für den Zeitraum
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +93,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 +22,Enter Paid Amount,Geben Sie gezahlten Betrag
+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
@@ -1774,13 +1791,15 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,Zeiterfassungen
 DocType: HR Settings,HR Settings,Einstellungen zum Modul Personalwesen
 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 +524,"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."
+apps/erpnext/erpnext/controllers/accounts_controller.py +527,"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 +249,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
 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/stock/get_item_details.py +123,Please specify Company,Bitte Firma angeben
 ,Customer Acquisition and Loyalty,Kundengewinnung und -bindung
@@ -1791,17 +1810,19 @@
 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 +183,Closing (Opening + Totals),Schlußstand (Anfangsstand + Summen)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),Schlußstand (Anfangsstand + Summen)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Bitte die Firmenwährung angeben
 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/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
-apps/erpnext/erpnext/controllers/accounts_controller.py +272,Account {0} is invalid. Account Currency must be {1},Konto {0} ist ungültig. Kontenwährung muss {1} sein
+DocType: Email Digest,Pending Sales Orders,Bis Kundenaufträge
+apps/erpnext/erpnext/controllers/accounts_controller.py +275,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 +956,"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 Slip,Deduction,Abzug
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +87,Row {0}: From Time and To Time is mandatory.,Row {0}: Von Zeit und zu Zeit ist obligatorisch.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +969,"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 +111,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 +262,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 +7,Please enter Employee Id of this sales person,Bitte die Mitarbeiter-ID dieses Vertriebsmitarbeiters angeben
@@ -1809,7 +1830,7 @@
 DocType: Project,% Tasks Completed,% der Aufgaben fertiggestellt
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,Differenzbetrag muss Null sein
 DocType: Project,Gross Margin,Handelsspanne
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +194,Please enter Production Item first,Bitte zuerst Herstellungsartikel eingeben
+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
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Angebot
@@ -1818,59 +1839,60 @@
 DocType: Maintenance Visit,Maintenance User,Nutzer Instandhaltung
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +149,Cost Updated,Kosten aktualisiert
 DocType: Employee,Date of Birth,Geburtsdatum
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +86,Item {0} has already been returned,Artikel {0} wurde bereits zurück gegeben
+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}
+DocType: Student Admission,Eligibility,Wählbarkeit
 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 +177,Job Description,Tätigkeitsbeschreibung
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,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 +126,"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 +127,"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."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +24,Welcome to POS: Create your POS Profile,Willkommen bei Ihrer Verkaufsstelle: Erstellen Sie Ihr Verkaufsstellen-Profil
 DocType: Expense Claim,Approver,Genehmiger
 ,SO Qty,Kd.-Auftr.-Menge
+DocType: Guardian,Work Address,Arbeitsadresse
 DocType: Appraisal,Calculate Total Score,Gesamtwertung berechnen
 DocType: Request for Quotation,Manufacturing Manager,Fertigungsleiter
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Seriennummer {0} ist innerhalb der Garantie bis {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +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 +74,Shipments,Lieferungen
+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
 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 +153,Row # ,Zeile #
+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 +156,Get From,Holen Aus
+apps/erpnext/erpnext/public/js/utils.js +167,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 +167,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 +416,"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"
+apps/erpnext/erpnext/controllers/accounts_controller.py +419,"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
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} is disabled,Benutzer {0} ist deaktiviert
 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...
 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 +171,"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 +346,{0} is mandatory for Item {1},{0} Artikel ist zwingend erfoderlich für {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,{0} is mandatory for Item {1},{0} Artikel ist zwingend erfoderlich für {1}
 DocType: Currency Exchange,From Currency,Von Währung
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Bitte zugewiesenen Betrag, Rechnungsart und Rechnungsnummer in mindestens einer Zeile auswählen"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,Kosten neuer Kauf
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},Kundenauftrag für den Artikel {0} erforderlich
 DocType: Purchase Invoice Item,Rate (Company Currency),Preis (Firmenwährung)
-apps/erpnext/erpnext/demo/setup_data.py +360,Others,Andere
+DocType: Student Guardian,Others,Andere
 DocType: Payment Entry,Unallocated Amount,Nicht zugewiesene Betrag
 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/accounts/doctype/payment_entry/payment_entry.js +138,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"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 entfernen Sie Punkt `{0}` und sparen
+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
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Bitte auf ""Zeitplan generieren"" klicken, um den Zeitplan zu erhalten"
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +53,There were errors while deleting following schedules:,Es gab Fehler beim folgenden Zeitpläne zu löschen:
@@ -1884,17 +1906,16 @@
 apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,Serialisierter Lagerbestand
 DocType: Activity Type,Default Billing Rate,Standard-Rechnungspreis
 DocType: Sales Invoice,Total Billing Amount,Gesamtrechnungsbetrag
-apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +54,Receivable Account,Forderungskonto
-apps/erpnext/erpnext/controllers/accounts_controller.py +546,Row #{0}: Asset {1} is already {2},Row # {0}: Vermögens {1} ist bereits {2}
+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 +549,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 +79,CEO,CEO
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,CEO
 DocType: Expense Claim Detail,Expense Claim Detail,Aufwandsabrechnungsdetail
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +808,Please select correct account,Bitte richtiges Konto auswählen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +809,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
-DocType: Purchase Invoice Item,Page Break,Seitenumbruch
 DocType: Production Order Operation,Pending,Ausstehend
 DocType: Course,Course Name,Kursname
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Benutzer, die die Urlaubsanträge eines bestimmten Mitarbeiters genehmigen können"
@@ -1903,14 +1924,15 @@
 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 +54,Full-time,Vollzeit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,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: Student,Guardians,Wächter
 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 +289,Debit To is required,Debit Um erforderlich
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +321,Debit To is required,Debit Um erforderlich
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Einkaufspreisliste
 DocType: Offer Letter Term,Offer Term,Angebotsfrist
 DocType: Quality Inspection,Quality Manager,Qualitätsmanager
@@ -1918,6 +1940,7 @@
 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/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
@@ -1928,18 +1951,17 @@
 DocType: Production Order Operation,Completed Qty,Gefertigte Menge
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"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 +273,Price List {0} is disabled,Preisliste {0} ist deaktiviert
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +99,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/projects/doctype/timesheet/timesheet.py +123,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
 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.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Aktueller Wertansatz
 DocType: Item,Customer Item Codes,Kundenartikelnummern
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,Exchange-Gewinn / Verlust
 DocType: Opportunity,Lost Reason,Verlustgrund
-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/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/purchase_receipt/purchase_receipt.py +378,All items have already been invoiced,Alle Artikel sind bereits abgerechnet
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +379,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
@@ -1955,18 +1977,19 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Ihre Kunden
 apps/erpnext/erpnext/projects/doctype/project/project.py +141,You have been invited to collaborate on the project: {0},Sie wurden zur Zusammenarbeit auf dem Projekt {0} eingeladen.
 DocType: Leave Block List Date,Block Date,Datum sperren
-apps/erpnext/erpnext/templates/generators/job_opening.html +19,Apply Now,Jetzt bewerben
+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"
 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
-apps/erpnext/erpnext/utilities/doctype/address/address.py +164,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: Fee Structure,Fee Structure,Gebührenstruktur
 DocType: Timesheet Detail,Costing Amount,Kalkulationsbetrag
+DocType: Student Admission,Application Fee,Anmeldegebühr
 DocType: Process Payroll,Submit Salary Slip,Gehaltsabrechnung übertragen
-apps/erpnext/erpnext/controllers/selling_controller.py +161,Maxiumm discount for Item {0} is {1}%,Maximaler Rabatt für Artikel {0} beträgt {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,Maximaler Rabatt für Artikel {0} beträgt {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Mengenimport
 DocType: Sales Partner,Address & Contacts,Adresse & Kontaktinformationen
 DocType: SMS Log,Sender Name,Absendername
@@ -1991,21 +2014,21 @@
 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_data.py +361,Travel,Reise
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +155,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 +304,Travel,Reise
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +167,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 +23,Update Cost,Kosten aktualisieren
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Kosten aktualisieren
 DocType: Item Reorder,Item Reorder,Artikelnachbestellung
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +36,Show Salary Slip,Anzeigen Gehaltsabrechnung
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +748,Transfer Material,Material übergeben
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +53,Show Salary Slip,Anzeigen Gehaltsabrechnung
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +166,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 +923,Please set recurring after saving,Bitte setzen Sie wiederkehrende nach dem Speichern
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +646,Select change amount account,Wählen Sie Änderungsbetrag Konto
+apps/erpnext/erpnext/public/js/controllers/transaction.js +914,Please set recurring after saving,Bitte setzen Sie wiederkehrende nach dem Speichern
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +703,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
@@ -2017,31 +2040,32 @@
 DocType: Quality Inspection,Verified By,Geprüft durch
 DocType: Address,Subsidiary,Tochtergesellschaft
 apps/erpnext/erpnext/setup/doctype/company/company.py +64,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","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: Quality Inspection,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 +33,Traceability,Rückverfolgbarkeit
 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 +352,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Menge in Zeile {0} ({1}) muss die gleiche sein wie die hergestellte Menge {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Menge in Zeile {0} ({1}) muss die gleiche sein wie die hergestellte Menge {2}
 DocType: Appraisal,Employee,Mitarbeiter
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Als Benutzer einladen
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} wird voll in Rechnung gestellt
 DocType: Workstation Working Hour,End Time,Endzeit
 DocType: Payment Entry,Payment Deductions or Loss,Zahlung Abzüge oder Verlust
-apps/erpnext/erpnext/config/schools.py +100,LMS,LMS
+apps/erpnext/erpnext/config/schools.py +104,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/config/crm.py +6,Sales Pipeline,Vertriebspipeline
 DocType: Student Batch Student,Student Batch Student,Student Batch Studenten
-DocType: Sales Invoice,Mass Mailing,Massen-E-Mail-Versand
+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 +199,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/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 +297,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 +111,Pharmaceutical,Arzneimittel
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +309,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/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
@@ -2056,27 +2080,28 @@
 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 +814,Please specify Company to proceed,Bitte Firma angeben um fortzufahren
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +793,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 +44,Compensatory Off,Ausgleich für
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,Ausgleich für
 DocType: Quality Inspection Reading,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."
 DocType: Room,Room Number,Zimmernummer
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Ungültige Referenz {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +161,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) kann nicht größer sein als die geplante Menge ({2}) im Fertigungsauftrag {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +162,{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 +217,Raw Materials cannot be blank.,Rohmaterial kann nicht leer sein
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,"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 +460,Quick Journal Entry,Schnellbuchung
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +111,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/accounts/doctype/sales_invoice/sales_invoice.py +441,"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 +450,Quick Journal Entry,Schnellbuchung
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +103,You can not change rate if BOM mentioned agianst any item,"Sie können den Preis nicht ändern, wenn eine Stückliste für einen Artikel aufgeführt ist"
 DocType: Employee,Previous Work Experience,Vorherige Berufserfahrung
 DocType: Stock Entry,For Quantity,Für Menge
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +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 +214,{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
 ,Minutes to First Response for Issues,Minutes to First Response für Probleme
 DocType: Purchase Invoice,Terms and Conditions1,Allgemeine Geschäftsbedingungen1
 apps/erpnext/erpnext/public/js/setup_wizard.js +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."
@@ -2085,16 +2110,17 @@
 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 +398,The following Production Orders were created:,Folgende 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"
 ,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 +739,Item or Warehouse for row {0} does not match Material Request,Artikel oder Lager in Zeile {0} stimmen nicht mit Materialanfrage überein
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +747,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
 DocType: Fiscal Year,Year End Date,Enddatum des Geschäftsjahres
 DocType: Task Depends On,Task Depends On,Aufgabe hängt davon ab
-DocType: Lead,Opportunity,Chance
+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
@@ -2107,7 +2133,7 @@
 DocType: Student,Joining Date,Beitrittsdatum
 ,Employees working on a holiday,Die Mitarbeiter an einem Feiertag arbeiten
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Anwesend setzen
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},Startdatum der Wartung kann nicht vor dem Liefertermin für Seriennummer {0} liegen
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},Startdatum der Wartung kann nicht vor dem Liefertermin für Seriennummer {0} liegen
 DocType: Production Order,Actual End Date,Tatsächliches Enddatum
 DocType: Purchase Invoice,PINV-,PINV-
 DocType: Authorization Rule,Applicable To (Role),Anwenden auf (Rolle)
@@ -2122,7 +2148,7 @@
 DocType: SMS Log,No of Requested SMS,Anzahl angeforderter SMS
 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 +729,Please supply the specified items at the best possible rates,Bitte geben Sie die angegebenen Elemente zu den bestmöglichen Preisen
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +695,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 +117,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-
@@ -2131,7 +2157,7 @@
 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 +14,This is an example website auto-generated from ERPNext,"Dies ist eine Beispiel-Webseite, von ERPNext automatisch generiert"
+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
 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.
 
@@ -2178,13 +2204,14 @@
 DocType: Purchase Receipt Item,Recd Quantity,Erhaltene Menge
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +54,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 +103,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 +504,Stock Entry {0} is not submitted,Lagerbuchung {0} wurde nicht übertragen
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},"Es können nicht mehr Artikel {0} produziert werden, als die über Kundenaufträge bestellte Stückzahl {1}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +505,Stock Entry {0} is not submitted,Lagerbuchung {0} wurde nicht übertragen
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / Geldkonto
 DocType: Tax Rule,Billing City,Stadt laut Rechnungsadresse
 DocType: Salary Component Account,Salary Component Account,Gehaltskomponente Account
 DocType: Global Defaults,Hide Currency Symbol,Währungssymbol ausblenden
 apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card","z. B. Bank, Bargeld, Kreditkarte"
+DocType: Lead Source,Source Name,Quellenname
 DocType: Journal Entry,Credit Note,Gutschrift
 DocType: Warranty Claim,Service Address,Serviceadresse
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furnitures and Fixtures,Betriebs- und Geschäftsausstattung
@@ -2196,6 +2223,7 @@
 DocType: Opportunity,Customer / Lead Name,Kunden- / Lead-Name
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +89,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/controllers/trends.py +19,Total(Qty),Summe (Anzahl)
 DocType: Sales Invoice,This Document,Dieses Dokument
@@ -2207,15 +2235,15 @@
 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 +176,Organization branch master.,Stammdaten zu Unternehmensfilialen
-apps/erpnext/erpnext/controllers/accounts_controller.py +273, or ,oder
+apps/erpnext/erpnext/controllers/accounts_controller.py +276, or ,oder
 DocType: Sales Order,Billing Status,Abrechnungsstatus
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Einen Fall melden
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,Versorgungsaufwendungen
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,Über 90
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +203,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: Journal Entry {1} nicht Konto {2} oder bereits abgestimmt gegen einen anderen Gutschein
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +206,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 +90,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 +93,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
@@ -2243,8 +2271,8 @@
 DocType: Product Bundle,Parent Item,Übergeordneter Artikel
 DocType: Account,Account Type,Kontentyp
 DocType: Delivery Note,DN-RET-,DN-Ret
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +115,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 +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Wartungsplan wird nicht für alle Elemente erzeugt. Bitte klicken Sie auf ""Zeitplan generieren"""
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +118,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 +163,"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"
@@ -2256,13 +2284,13 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +32,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 +748,Delivery,Auslieferung
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +742,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
 DocType: Payment Entry,Total Allocated Amount,Insgesamt Geschätzter Betrag
 DocType: Item Reorder,Material Request Type,Materialanfragetyp
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +82,Row {0}: UOM Conversion Factor is mandatory,Zeile {0}: Umrechnungsfaktor für Maßeinheit ist zwingend erforderlich
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Beleg #
@@ -2273,13 +2301,13 @@
 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 +90,Head of Marketing and Sales,Leiter Marketing und Vertrieb
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Einkommensteuer
+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 +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
 DocType: Item Supplier,Item Supplier,Artikellieferant
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +403,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 +770,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 +397,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 +764,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"
@@ -2291,28 +2319,29 @@
 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 +100,Issues,Fälle
+apps/erpnext/erpnext/hooks.py +109,Issues,Fälle
 apps/erpnext/erpnext/controllers/status_updater.py +13,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
 ,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
 DocType: Supplier,Billing Currency,Abrechnungswährung
 DocType: Sales Invoice,SINV-RET-,SINV-Ret
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Large,Besonders groß
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Extra Large,Besonders groß
 ,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 +507,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 +107,Local,Lokal
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +508,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/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 +154,Large,Groß
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Large,Groß
 DocType: Homepage Featured Product,Homepage Featured Product,Homepage Produktvorstellung
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Neuer Lagername
-apps/erpnext/erpnext/accounts/report/financial_statements.py +225,Total {0} ({1}),Insgesamt {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +224,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
@@ -2370,9 +2399,9 @@
 DocType: Attendance,Leave Type,Urlaubstyp
 apps/erpnext/erpnext/controllers/stock_controller.py +173,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/hr/doctype/salary_slip/salary_slip.py +79,Name error: {0},Name Fehler: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +90,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 +178,{0} {1} does not associated with {2} {3},{0} {1} ist nicht im Zusammenhang mit {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +181,{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
 DocType: Warehouse,Parent Warehouse,Eltern Lager
@@ -2391,7 +2420,7 @@
 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
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,Mindestens ein Artikel sollte mit negativer Menge in das Rückgabedokument eingegeben werden
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Atleast one item should be entered with negative quantity in return document,Mindestens ein Artikel sollte mit negativer Menge in das Rückgabedokument eingegeben werden
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations",Arbeitsgang {0} ist länger als alle verfügbaren Arbeitszeiten am Arbeitsplatz {1}. Bitte den Vorgang in mehrere Teilarbeitsgänge aufteilen.
 ,Requested,Angefordert
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +83,No Remarks,Keine Anmerkungen
@@ -2403,46 +2432,46 @@
 DocType: Item,Total Projected Qty,Prognostizierte Gesamtmenge
 DocType: Monthly Distribution,Distribution Name,Bezeichnung der Verteilung
 DocType: Course,Course Code,Kursnummer
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Quality Inspection required for Item {0},Qualitätsprüfung für den Posten erforderlich {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,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
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Baumstruktur der Regionen verwalten
 DocType: Journal Entry Account,Sales Invoice,Ausgangsrechnung
 DocType: Journal Entry Account,Party Balance,Gruppen-Saldo
-apps/erpnext/erpnext/accounts/page/pos/pos.js +475,Please select Apply Discount On,"Bitte ""Rabatt anwenden auf"" auswählen"
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +92,Salary Slip Created,Gehaltsabrechnung Erstellt
+apps/erpnext/erpnext/accounts/page/pos/pos.js +464,Please select Apply Discount On,"Bitte ""Rabatt anwenden auf"" auswählen"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +95,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
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,Der Rabatt-Prozentsatz kann entweder auf eine Preisliste oder auf alle Preislisten angewandt werden.
 DocType: Purchase Invoice,Half-yearly,Halbjährlich
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +384,Accounting Entry for Stock,Lagerbuchung
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +387,Accounting Entry for Stock,Lagerbuchung
 DocType: Sales Invoice,Sales Team1,Verkaufsteam1
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,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 +96,Row {0}: Completed Qty must be greater than zero.,Row {0}: Abgeschlossen Menge muss größer als Null sein.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +120,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 +88,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/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
 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 +147,Target warehouse is mandatory for row {0},Eingangslager ist für Zeile {0} zwingend erforderlich
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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
 DocType: Quality Inspection,Quality Inspection,Qualitätsprüfung
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Extra Small,Besonders klein
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +194,Account {0} is frozen,Konto {0} ist gesperrt
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Besonders klein
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +690,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 +197,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 +606,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 +126,Commission rate cannot be greater than 100,Provisionssatz kann nicht größer als 100 sein
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +609,Can only make payment against unbilled {0},Zahlung kann nur zu einer noch nicht abgerechneten {0} erstellt werden
+apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,Provisionssatz kann nicht größer als 100 sein
 DocType: Stock Entry,Subcontract,Zulieferer
 apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,Bitte geben Sie zuerst {0} ein
 DocType: Production Order Operation,Actual End Time,Tatsächliche Endzeit
@@ -2453,30 +2482,30 @@
 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 +158,Colour,Farbe
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,Farbe
 DocType: Maintenance Visit,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"
 DocType: Student Log,Academic,akademisch
-apps/erpnext/erpnext/controllers/accounts_controller.py +469,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Insgesamt Voraus ({0}) gegen Bestellen {1} kann nicht größer sein als die Gesamtsumme ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +472,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Insgesamt Voraus ({0}) gegen Bestellen {1} kann nicht größer sein als die Gesamtsumme ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,"Bitte ""Monatsweise Verteilung"" wählen, um Ziele ungleichmäßig über Monate zu verteilen."
 DocType: Purchase Invoice Item,Valuation Rate,Wertansatz
+DocType: Stock Reconciliation,SR/,SR /
 apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,Preislistenwährung nicht ausgewählt
 DocType: Assessment,Results,Ergebnisse
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +168,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 +175,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: Student Applicant,Father's/ Guardian 2 Email ID,Vater / Guardian 2 E-Mail-ID
 DocType: Maintenance Visit Purpose,Against Document No,Zu Dokument Nr.
 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 +228,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 +231,Warehouses with existing transaction can not be converted to group.,Lagerhäuser mit bestehenden Transaktion nicht zu einer Gruppe umgewandelt werden.
 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 +93,Researcher,Wissenschaftler
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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
@@ -2488,25 +2517,25 @@
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Zum Vorteil für die Kunden, können diese Kodes in Druckformaten wie Rechnungen und Lieferscheinen verwendet werden"
 DocType: Sales Invoice,Time Sheet List,Zeitblatt Liste
 DocType: Employee,You can enter any date manually,Sie können jedes Datum manuell eingeben
-DocType: Sales Invoice,Advertisement,Werbung
 DocType: Asset Category Account,Depreciation Expense Account,Aufwandskonto Abschreibungen
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Probationary Period,Probezeit
-apps/erpnext/erpnext/hooks.py +102,Announcements,Ankündigungen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Probezeit
+apps/erpnext/erpnext/hooks.py +111,Announcements,Ankündigungen
 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 +109,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 +16,To Datetime,Bis Datum und Uhrzeit
+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/scheduling_tool/scheduling_tool.py +51,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/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Ausstehende Aktivitäten
+DocType: Accounts Settings,Make Payment via Journal Entry,Zahlung über Journaleintrag
+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 +127,Please enter relieving date.,Bitte Freistellungsdatum eingeben.
-apps/erpnext/erpnext/controllers/trends.py +145,Amt,Menge
+apps/erpnext/erpnext/controllers/trends.py +149,Amt,Menge
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,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 +26,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"
@@ -2524,14 +2553,15 @@
 apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1},Wechselkurs für {0} zu {1} kann nicht gefunden werden
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Mark Halbtages
 DocType: Sales Invoice,Sales Team,Verkaufsteam
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Duplicate entry,Doppelter Eintrag/doppelte Buchung
+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 +490,[Error],[Fehler]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +484,[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
 apps/erpnext/erpnext/controllers/status_updater.py +175,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.
 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
@@ -2547,22 +2577,22 @@
 ,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 +25,All Jobs,Alle Jobs
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,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
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Amount {0} {1} {2} {3},Menge {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Amount {0} {1} {2} {3},Menge {0} {1} {2} {3}
 DocType: Account,Depreciation,Abschreibung
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Lieferant(en)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Angestellt-Anwesenheits-Tool
 DocType: 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 +372,Payment Entries {0} are un-linked,Zahlungs Einträge {0} sind un-linked
+apps/erpnext/erpnext/accounts/utils.py +449,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
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +497,Material Requests {0} created,Materialanfrage {0} erstellt
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +498,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
 DocType: Purchase Invoice,Address and Contact,Adresse und Kontakt
@@ -2601,7 +2631,7 @@
 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 +848,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 +859,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 +233,Closing (Dr),Schlußstand (Soll)
 DocType: Cheque Print Template,Cheque Size,Scheck Größe
@@ -2622,7 +2652,8 @@
 ,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/controllers/accounts_controller.py +555,'Update Stock' cannot be checked for fixed asset sale,&#39;Update Auf&#39; kann nicht für die feste Asset-Verkauf überprüft werden
+DocType: Student Guardian,Father,Vater
+apps/erpnext/erpnext/controllers/accounts_controller.py +558,'Update Stock' cannot be checked for fixed asset sale,&#39;Update Auf&#39; kann nicht für die feste Asset-Verkauf überprüft werden
 DocType: Bank Reconciliation,Bank Reconciliation,Kontenabgleich
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Updates abholen
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +132,Material Request {0} is cancelled or stopped,Materialanfrage {0} wird storniert oder gestoppt
@@ -2632,15 +2663,15 @@
 DocType: Sales Order,Fully Delivered,Komplett geliefert
 DocType: Lead,Lower Income,Niedrigeres Einkommen
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","Bezeichnung des Kontos unter Verbindlichkeiten, in das Gewinn/Verlust verbucht werden"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +166,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 +238,"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 +81,Purchase Order number required for Item {0},Lieferantenauftragsnummer ist für den Artikel {0} erforderlich
+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/purchase_receipt/purchase_receipt.py +82,Purchase Order number required for Item {0},Lieferantenauftragsnummer ist für den Artikel {0} erforderlich
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""Von-Datum"" muss nach ""Bis-Datum"" liegen"
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +17,Cannot change status as student {0} is linked with student application {1},Kann nicht den Status als Student ändern {0} ist mit Studenten Anwendung verknüpft {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +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: Timesheet,"List of employee which has ""Salary Slip Based on Timesheet"" is enabled in salary structure.","Liste der Mitarbeiter, die &quot;Gehaltszettel Basierend auf Timesheet&quot; hat sich in Gehaltsstruktur aktiviert."
 DocType: Asset,Fully Depreciated,vollständig abgeschriebene
 ,Stock Projected Qty,Projizierter Lagerbestand
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Customer {0} does not belong to project {1},Customer {0} gehört nicht zum Projekt {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,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
 DocType: Sales Order,Customer's Purchase Order,Kundenauftrag
 apps/erpnext/erpnext/config/stock.py +107,Serial No and Batch,Seriennummer und Chargen
@@ -2652,7 +2683,7 @@
 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/patches/v7_0/create_warehouse_nestedset.py +55,All Warehouses,Alle Lagerhäuser
+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 +105,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
@@ -2664,10 +2695,10 @@
 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/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Gehaltsabrechnung erstellen
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +26,Browse BOM,Stückliste durchsuchen
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,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/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 Year,Academic Year,Schuljahr
+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
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,Bewertung
@@ -2675,12 +2706,12 @@
 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 +197,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 +204,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: Workstation Working Hour,Start Time,Startzeit
 DocType: Item Price,Bulk Import Help,Massen-Import Hilfe
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +256,Select Quantity,Menge wählen
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +257,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
@@ -2697,6 +2728,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Entweder Zielstückzahl oder Zielmenge ist zwingend erforderlich.
 apps/erpnext/erpnext/config/projects.py +45,Cost of various activities,Aufwendungen für verschiedene Tätigkeiten
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Einstellen Events auf {0}, da die Mitarbeiter auf die beigefügten unter Verkaufs Personen keine Benutzer-ID {1}"
+DocType: Timesheet,Billing Details,Rechnungsdetails
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +149,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
 DocType: Item,Inspection Required,Prüfung erforderlich
@@ -2716,7 +2748,7 @@
 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 +138,Wire Transfer,Überweisung
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,Überweisung
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Alle prüfen
 DocType: Sales Order,Recurring Order,Wiederkehrende Bestellung
 DocType: Company,Default Income Account,Standard-Ertragskonto
@@ -2728,21 +2760,19 @@
 ,Welcome to ERPNext,Willkommen bei ERPNext
 apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,Vom Lead zum Angebot
 DocType: Lead,From Customer,Von Kunden
-apps/erpnext/erpnext/demo/setup_data.py +357,Calls,Anrufe
+apps/erpnext/erpnext/demo/setup/setup_data.py +300,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/stock/doctype/item/item.py +466,"As there are existing transactions for this item, \
-							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Da bestehende Transaktionen für diesen Artikel, \ Sie nicht die Werte von &quot;Serial No Hat&quot; ändern können, &quot;Hat Batch Nein &#39;,&#39;, ist Stock Item &#39;und&#39; Bewertungsmethode &#39;"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,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/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 +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Hinweis: Das System überprüft Überlieferungen und Überbuchungen zu Artikel {0} nicht da Stückzahl oder Menge 0 sind
 DocType: Notification Control,Quotation Message,Angebotsmitteilung
 DocType: Issue,Opening Date,Eröffnungsdatum
-apps/erpnext/erpnext/schools/api.py +58,Attendance has been marked successfully.,Die Teilnahme wurde erfolgreich markiert.
+apps/erpnext/erpnext/schools/api.py +57,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 +136,Account Type for {0} must be {1},Account für {0} muss {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +139,Account Type for {0} must be {1},Account für {0} muss {1}
 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
@@ -2757,12 +2787,13 @@
 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/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 +20,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 +1190,Please select customer,Bitte wählen Sie Kunde
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1193,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
@@ -2772,6 +2803,7 @@
 ,Payment Period Based On Invoice Date,Zahlungszeitraum basierend auf Rechnungsdatum
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Fehlende Wechselkurse für {0}
 DocType: Assessment,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-
@@ -2789,11 +2821,12 @@
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Thema Name
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Mindestens ein Eintrag aus Vertrieb oder Einkauf muss ausgewählt werden
+DocType: Grading Structure,Grade Intervals,Grade Intervalle
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Wählen Sie die Art Ihres Unternehmens.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Ort an dem Arbeitsgänge der Fertigung ablaufen
 DocType: Asset Movement,Source Warehouse,Ausgangslager
 DocType: Installation Note,Installation Date,Datum der Installation
-apps/erpnext/erpnext/controllers/accounts_controller.py +534,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Vermögens {1} gehört nicht zur Gesellschaft {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +537,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
@@ -2807,28 +2840,31 @@
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Verfügbare Chargenmenge im Ausgangslager
 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,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 +111,Date Of Retirement must be greater than Date of Joining,Zeitpunkt der Pensionierung muss nach dem Eintrittsdatum liegen
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +49,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 +87,{0}% Delivered,{0}% geliefert
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% geliefert
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Artikel {0}: Bestellmenge {1} kann nicht weniger als Mindestbestellmenge {2} (im Artikel definiert) sein.
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Prozentuale Aufteilung der monatsweisen Verteilung
 DocType: Territory,Territory Targets,Ziele für die Region
 DocType: Delivery Note,Transporter Info,Informationen zum Transportunternehmer
-apps/erpnext/erpnext/accounts/utils.py +379,Please set default {0} in Company {1},Bitte setzen Sie default {0} in Gesellschaft {1}
+apps/erpnext/erpnext/accounts/utils.py +456,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
 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
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Bezeichnungen für Druckvorlagen, z. B. Proforma-Rechnung"
+DocType: Student Guardian,Student Guardian,Studenten Wächter
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +184,Valuation type charges can not marked as Inclusive,"Bewertungsart Gebühren kann nicht als ""inklusive"" markiert werden"
 DocType: POS Profile,Update Stock,Lagerbestand aktualisieren
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Unterschiedliche Maßeinheiten für Artikel führen zu falschen Werten für das (Gesamt-)Nettogewicht. Es muss sicher gestellt sein, dass das Nettogewicht jedes einzelnen Artikels in der gleichen Maßeinheit angegeben ist."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Stückpreis
 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 +349,Journal Entries {0} are un-linked,Buchungssätze {0} sind nicht verknüpft
+apps/erpnext/erpnext/accounts/utils.py +426,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
@@ -2852,6 +2888,7 @@
 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
+DocType: Homepage,"URL for ""All Products""",URL für &quot;Alle Produkte&quot;
 DocType: Leave Application,Leave Balance Before Application,Urlaubstage vor Antrag
 DocType: SMS Center,Send SMS,SMS verschicken
 DocType: Cheque Print Template,Width of amount in word,Breite der Menge in Wort
@@ -2860,7 +2897,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 +29,Current Job Openings,Aktuelle Stellenangebote
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,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
@@ -2873,7 +2910,7 @@
 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 +850,Show tax break-up,Steuerverteilung anzeigen
+apps/erpnext/erpnext/public/js/controllers/transaction.js +841,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/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"
@@ -2883,10 +2920,11 @@
 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 +534,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 +80,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 +162,Please contact to the user who have Sales Master Manager {0} role,"Bitte den Benutzer kontaktieren, der die Vertriebsleiter {0}-Rolle inne hat"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +195,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/config/accounts.py +56,Company (not Customer or Supplier) master.,Unternehmensstammdaten (nicht Kunde oder Lieferant)
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +5,This is based on the attendance of this Student,Dies basiert auf der Anwesenheit dieses Student
@@ -2895,12 +2933,11 @@
 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 +75,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 +138,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/hr/doctype/leave_application/leave_application.py +145,Note: There is not enough leave balance for Leave Type {0},Hinweis: Es gibt nicht genügend Urlaubsguthaben für Abwesenheitstyp {0}
 DocType: Program Enrollment Fee,Program Enrollment Fee,Programm Einschreibegebühr
 DocType: Item,Supplier Items,Lieferantenartikel
 DocType: Opportunity,Opportunity Type,Chance-Typ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,Neue Firma
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,Cost Center is required for 'Profit and Loss' account {0},Kostenstellenangabe zum GuV-Konto {0} zwingend erforderlich
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Transaktionen können nur durch den Ersteller der Firma gelöscht werden
 apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,Falsche Anzahl von Buchungen im Hauptbuch gefunden. Möglicherweise wurde für die Transaktion ein falsches Konto gewählt.
 DocType: Cheque Print Template,Cheque Width,Scheck Breite
@@ -2909,16 +2946,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Geburtsdatum kann nicht später liegen als heute.
 ,Stock Ageing,Lager-Abschreibungen
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,Zeiterfassung
-apps/erpnext/erpnext/controllers/accounts_controller.py +228,{0} '{1}' is disabled,{0} '{1}' ist deaktiviert
+apps/erpnext/erpnext/controllers/accounts_controller.py +231,{0} '{1}' is disabled,{0} '{1}' ist deaktiviert
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,"Als ""geöffnet"" markieren"
 DocType: Cheque Print Template,Scanned Cheque,Gescannte Scheck
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Beim Übertragen von Transaktionen automatisch E-Mails an Kontakte senden.
+DocType: Timesheet,Total Billable Amount,Insgesamt abrechenbare Betrag
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Position 3
 DocType: Purchase Order,Customer Contact Email,Kontakt-E-Mail des Kunden
 DocType: Warranty Claim,Item and Warranty Details,Einzelheiten Artikel und Garantie
 DocType: Sales Team,Contribution (%),Beitrag (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Hinweis: Zahlungsbuchung wird nicht erstellt, da kein ""Kassen- oder Bankkonto"" angegeben wurde"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Responsibilities,Verantwortung
+apps/erpnext/erpnext/controllers/accounts_controller.py +78,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
 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
@@ -2926,6 +2964,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Benutzer hinzufügen
 DocType: Pricing Rule,Item Group,Artikelgruppe
 DocType: Item,Safety Stock,Sicherheitsbestand
+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: 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)
@@ -2935,7 +2974,6 @@
 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: Timesheet,Total Hours,Summe der Stunden
 DocType: Journal Entry,Printing Settings,Druckeinstellungen
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,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
@@ -2948,13 +2986,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investment-Banking
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +71,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
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Kunden&gt; Kundengruppe&gt; Territorium
 DocType: Purchase Invoice Item,Rate,Preis
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Intern,Praktikant
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,Praktikant
 DocType: Stock Entry,From BOM,Von Stückliste
 DocType: Assessment,Assessment Code,Bewertungs-Code
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +32,Basic,Grundeinkommen
+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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Bitte auf ""Zeitplan generieren"" klicken"
+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 +95,Reference No is mandatory if you entered Reference Date,"Referenznr. ist zwingend erforderlich, wenn Referenz-Tag eingegeben wurde"
@@ -2963,11 +3002,11 @@
 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 +752,Issue Material,Material ausgeben
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +723,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 +683,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 +665,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."
 DocType: Hub Settings,Access Token,Zugriffstoken
 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
@@ -2975,33 +3014,35 @@
 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 +1122,Enter value must be positive,Geben Sie Wert muss positiv sein
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,All Territories,Alle Regionen
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1125,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
 DocType: Purchase Invoice,Items,Artikel
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +23,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 +221,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 +233,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 +96,Request for Quotations,Antrag auf Zitate
+apps/erpnext/erpnext/hooks.py +104,Request for Quotations,Antrag auf Zitate
 DocType: Payment Reconciliation,Maximum Invoice Amount,Maximale Rechnungsbetrag
 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 +628,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standard-Maßeinheit für Variante '{0}' muss dieselbe wie in der Vorlage '{1}' sein
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standard-Maßeinheit für Variante '{0}' muss dieselbe wie in der Vorlage '{1}' sein
 DocType: Shipping Rule,Calculate Based On,Berechnen auf Grundlage von
 DocType: Delivery Note Item,From Warehouse,Ab Lager
 DocType: Assessment,Supervisor Name,Name des Vorgesetzten
+DocType: Assessment,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
 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 +27,Default Address Template cannot be deleted,Standard-Adressvorlage kann nicht gelöscht werden
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,Standard-Adressvorlage kann nicht gelöscht werden
 DocType: Sales Invoice,Shipping Rule,Versandregel
 DocType: Manufacturer,Limited to 12 characters,Limitiert auf 12 Zeichen
 DocType: Journal Entry,Print Heading,Druckkopf
@@ -3016,8 +3057,8 @@
 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/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 +485,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 +336,Please select Posting Date first,Bitte zuerst ein Buchungsdatum auswählen
+apps/erpnext/erpnext/stock/get_item_details.py +486,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 +326,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
@@ -3033,6 +3074,7 @@
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Zahlungen und Rechnungen abgleichen
 DocType: Journal Entry,Bank Entry,Bankbuchung
 DocType: Authorization Rule,Applicable To (Designation),Anwenden auf (Bezeichnung)
+,Profitability Analysis,Wirtschaftlichkeitsanalyse
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,In den Warenkorb legen
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Gruppieren nach
 DocType: Guardian,Interests,Interessen
@@ -3045,21 +3087,21 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,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 +141,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Serienartikel {0} kann nicht über einen Lagerabgleich aktualisiert werden
 DocType: Scheduling Tool,Day,Tag
 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 +122,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 +129,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
-DocType: Student Applicant,AP.,AP.
 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 +639,Point of Sale,Verkaufsstelle
+apps/erpnext/erpnext/accounts/page/pos/pos.js +634,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
 DocType: Production Planning Tool,Production Planning Tool,Werkzeug zur Fertigungsplanung
@@ -3068,74 +3110,77 @@
 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 +373,Quantity to Manufacture must be greater than 0.,Menge Herstellung muss größer als 0 sein.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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 Profile,Customer Group,Kundengruppe
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,Expense account is mandatory for item {0},Aufwandskonto ist zwingend für Artikel {0}
 DocType: Item,Website Description,Webseiten-Beschreibung
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date must be on or after today,Weiter Abschreibungen Datum muss eingeschaltet sein oder nach dem heutigen Tag
 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 +145,Please cancel Purchase Invoice {0} first,Bitte stornieren Einkaufsrechnung {0} zuerst
 DocType: Serial No,AMC Expiry Date,Verfalldatum des jährlichen Wartungsvertrags
 ,Sales Register,Übersicht über den Umsatz
 DocType: Quotation,Quotation Lost Reason,Grund des verlorenen Angebotes
+apps/erpnext/erpnext/utilities/doctype/address/address.py +164,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.
 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 +330,Transaction reference no {0} dated {1},Transaktion Referenznummer {0} vom {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,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 +107,Summary for this month and pending activities,Zusammenfassung für diesen Monat und anstehende Aktivitäten
+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/accounts/doctype/sales_invoice/sales_invoice.py +406,Please remove this Invoice {0} from C-Form {1},Bitte diese Rechnung {0} vom Kontaktformular {1} entfernen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,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 +644,Get Items,Artikel aufrufen
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +623,Get Items,Artikel aufrufen
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +210,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 +41,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
 DocType: Payment Request,Initiated,Initiiert
 DocType: Production Order,Planned Start Date,Geplanter Starttermin
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,Customer is required against Receivable account {0},Der Kunde muss gegen Receivable Konto {0}
 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 +265,Project-wise data is not available for Quotation,Projektbezogene Daten sind für das Angebot nicht verfügbar
+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 +101,Commercial,Werbung
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,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: Supplier Quotation,Supplier Address,Lieferantenadresse
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +648,Row {0}# Account must be of type 'Fixed Asset',"Konto in Zeile {0} muss vom Typ ""Anlagevermögen"" sein"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,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 +30,Series is mandatory,Serie ist zwingend erforderlich
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +50,Series is mandatory,Serie ist zwingend erforderlich
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Finanzdienstleistungen
 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
 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
 DocType: Leave Allocation,Unused leaves,Ungenutzter Urlaub
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Cr,Haben
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Cr,Haben
 DocType: Tax Rule,Billing State,Verwaltungsbezirk laut Rechnungsadresse
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +250,Transfer,Übertragung
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +187,{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 +825,Fetch exploded BOM (including sub-assemblies),Abruf der aufgelösten Stückliste (einschließlich der Unterbaugruppen)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +254,Transfer,Übertragung
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +190,{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 +796,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 +115,Due Date is mandatory,Fälligkeitsdatum wird zwingend vorausgesetzt
+apps/erpnext/erpnext/controllers/accounts_controller.py +118,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
 DocType: Journal Entry,Pay To / Recd From,Zahlen an/Erhalten von
 DocType: Naming Series,Setup Series,Serie bearbeiten
 DocType: Payment Reconciliation,To Invoice Date,Um Datum Rechnung
 DocType: Supplier,Contact HTML,Kontakt-HTML
 ,Inactive Customers,Inaktive Kunden
+DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Kaufbelege
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Wie wird die Preisregel angewandt?
 DocType: Quality Inspection,Delivery Note No,Lieferschein-Nummer
@@ -3144,7 +3189,7 @@
 DocType: Company,Retail,Einzelhandel
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +120,Customer {0} does not exist,Kunde {0} existiert nicht
 DocType: Attendance,Absent,Abwesend
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +587,Product Bundle,Produkt-Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Product Bundle,Produkt-Bundle
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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
@@ -3154,8 +3199,8 @@
 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 +742,Send Supplier Emails,Senden Lieferant von E-Mails
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +104,"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/buying/doctype/request_for_quotation/request_for_quotation.js +708,Send Supplier Emails,Senden Lieferant von E-Mails
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,"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
 DocType: Guardian Interest,Guardian Interest,Wächter Interesse
 DocType: Timesheet,Employee Detail,Mitarbeiterdetails
@@ -3166,9 +3211,9 @@
 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}
 DocType: Salary Slip,Earning & Deduction,Einkünfte & Abzüge
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +77,Account {0} cannot be a Group,Konto {0} kann keine Gruppe sein
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} cannot be a Group,Konto {0} kann keine Gruppe sein
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +31,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 +107,Negative Valuation Rate is not allowed,Negative Bewertung ist nicht erlaubt
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Negative Bewertung ist nicht erlaubt
 DocType: Holiday List,Weekly Off,Wöchentlich frei
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Für z. B. 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +39,Provisional Profit / Loss (Credit),Vorläufiger Gewinn / Verlust (Haben)
@@ -3182,16 +3227,16 @@
 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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Kostenstelle ist zwingend erfoderlich für Artikel {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +626,Get Items from Product Bundle,Artikel aus dem Produkt-Bundle übernehmen
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +605,Get Items from Product Bundle,Artikel aus dem Produkt-Bundle übernehmen
 DocType: Asset,Straight Line,Gerade Linie
 DocType: Project User,Project User,Projektarbeit Benutzer
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} is inactive,Konto {0} ist inaktiv
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} is inactive,Konto {0} ist inaktiv
 DocType: GL Entry,Is Advance,Ist Vorkasse
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,"""Anwesenheit ab Datum"" und ""Anwesenheit bis Datum"" sind zwingend"
 apps/erpnext/erpnext/controllers/buying_controller.py +148,Please enter 'Is Subcontracted' as Yes or No,"Bitte bei ""Untervergeben"" JA oder NEIN eingeben"
 DocType: Sales Team,Contact No.,Kontakt-Nr.
 DocType: Bank Reconciliation,Payment Entries,Zahlungs Einträge
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,'Profit and Loss' type account {0} not allowed in Opening Entry,"Konto vom Typ ""Gewinn und Verlust"" {0} ist in einer Eröffnungsbuchung nicht erlaubt"
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +71,'Profit and Loss' type account {0} not allowed in Opening Entry,"Konto vom Typ ""Gewinn und Verlust"" {0} ist in einer Eröffnungsbuchung nicht erlaubt"
 DocType: 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
@@ -3210,7 +3255,7 @@
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serien #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Commission on Sales,Provision auf den Umsatz
 DocType: Offer Letter Term,Value / Description,Wert / Beschreibung
-apps/erpnext/erpnext/controllers/accounts_controller.py +558,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Vermögens {1} kann nicht vorgelegt werden, es ist bereits {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +561,"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: Production Order,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}.
@@ -3223,13 +3268,13 @@
 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/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Legal Expenses,Rechtskosten
 DocType: Purchase Invoice,Posting Time,Buchungszeit
-DocType: Sales Order,% Amount Billed,% des Betrages berechnet
+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."
 apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},Kein Artikel mit Seriennummer {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Offene Benachrichtigungen
+DocType: Email Digest,Open Notifications,Offene Benachrichtigungen
 DocType: Payment Entry,Difference Amount (Company Currency),Differenzbetrag (Gesellschaft Währung)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,Direkte Aufwendungen
 apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
@@ -3237,7 +3282,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Neuer Kundenumsatz
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,Reisekosten
 DocType: Maintenance Visit,Breakdown,Ausfall
-apps/erpnext/erpnext/controllers/accounts_controller.py +634,Account: {0} with currency: {1} can not be selected,Konto: {0} mit Währung: {1} kann nicht ausgewählt werden
+apps/erpnext/erpnext/controllers/accounts_controller.py +637,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}
 DocType: Program Enrollment Tool,Student Applicants,Studienbewerber
@@ -3245,15 +3290,15 @@
 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 +56,Probation,Probezeit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Probation,Probezeit
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Gehaltskomponenten
 DocType: Program Enrollment Tool,New Academic Year,Neues Studienjahr
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Payment of salary for the month {0} and year {1},Zahlung des Gehalts für Monat {0} und Jahr {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Payment of salary for the month {0} and year {1},Zahlung des Gehalts für Monat {0} und Jahr {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,"Preisliste automatisch einfügen, wenn sie fehlt"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Summe gezahlte Beträge
 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 +144,Planning,Planung
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,Planung
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,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
@@ -3266,11 +3311,10 @@
 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.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Sales invoice submitted sucessfully.,Ausgangsrechnung erfolgreich eingereicht.
 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}
 DocType: Assessment Result,Student Name,Name des Studenten
-apps/erpnext/erpnext/hooks.py +104,Assessment Schedule,Bewertungsplan
+apps/erpnext/erpnext/hooks.py +113,Assessment Schedule,Bewertungsplan
 DocType: Brand,Item Manager,Artikel-Manager
 DocType: Buying Settings,Default Supplier Type,Standardlieferantentyp
 DocType: Production Order,Total Operating Cost,Gesamtbetriebskosten
@@ -3280,6 +3324,7 @@
 DocType: GL Entry,Party Type,Gruppen-Typ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +78,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
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Stammdaten zur Gehaltsvorlage
 DocType: Leave Type,Max Days Leave Allowed,Maximal zulässige Urlaubstage
@@ -3291,18 +3336,19 @@
 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 +99,All Customer Groups,Alle Kundengruppen
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +78,Accumulated Monthly,Kumulierte Monats
-apps/erpnext/erpnext/controllers/accounts_controller.py +595,{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/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Alle Kundengruppen
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +81,Accumulated Monthly,Kumulierte Monats
+apps/erpnext/erpnext/controllers/accounts_controller.py +598,{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
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Preisliste (Firmenwährung)
 DocType: Products Settings,Products Settings,Produkte Einstellungen
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +188,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: 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 +84,Secretary,Sekretärin
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,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
@@ -3311,24 +3357,22 @@
 ,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
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,Zeile # {0}: Seriennummer ist zwingend erforderlich
+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 +859,Supplier Quotation,Lieferantenangebot
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +838,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 +7,Collect Fees,Sammeln Gebühren
+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
 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
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Kommende Veranstaltungen
 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/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
-DocType: Email Digest,Income / Expense,Einnahmen/Ausgaben
 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."
@@ -3339,13 +3383,14 @@
 DocType: Customer,From Lead,Von Lead
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Für die Produktion freigegebene Bestellungen
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Geschäftsjahr auswählen ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,POS Profile required to make POS Entry,"Verkaufsstellen-Profil benötigt, um Verkaufsstellen-Buchung zu erstellen"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +509,POS Profile required to make POS Entry,"Verkaufsstellen-Profil benötigt, um Verkaufsstellen-Buchung zu erstellen"
 DocType: Program Enrollment Tool,Enroll Students,einschreiben Studenten
 DocType: Hub Settings,Name Token,Kürzel benennen
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard-Vertrieb
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Atleast one warehouse is mandatory,Mindestens ein Lager ist zwingend erforderlich
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +129,Atleast one warehouse is mandatory,Mindestens ein Lager ist zwingend erforderlich
 DocType: Serial No,Out of Warranty,Außerhalb der Garantie
 DocType: BOM Replace Tool,Replace,Ersetzen
+DocType: Production Order,Unstopped,unstopped
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Invoice {1},{0} zu Verkaufsrechnung {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Projektname
@@ -3366,10 +3411,11 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Abwesenheiten müssen ein Vielfaches von 0,5 sein"
 DocType: Production Order,Operation Cost,Kosten eines Arbeitsgangs
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,Anwesenheiten aus einer CSV-Datei hochladen
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Offener Betrag
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Ziele artikelgruppenbezogen für diesen Vertriebsmitarbeiter festlegen.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Bestände älter als [Tage] sperren
-apps/erpnext/erpnext/controllers/accounts_controller.py +528,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: Vermögens ist obligatorisch für Anlage Kauf / Verkauf
+apps/erpnext/erpnext/controllers/accounts_controller.py +531,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: Vermögens ist obligatorisch für Anlage Kauf / Verkauf
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Wenn zwei oder mehrere Preisregeln basierend auf den oben genannten Bedingungen gefunden werden, wird eine Vorrangregelung angewandt. Priorität ist eine Zahl zwischen 0 und 20, wobei der Standardwert Null (leer) ist. Die höhere Zahl hat  Vorrang, wenn es mehrere Preisregeln zu den gleichen Bedingungen gibt."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Geschäftsjahr: {0} existiert nicht
 DocType: Currency Exchange,To Currency,In Währung
@@ -3386,15 +3432,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Kapitalbeteiligungsgesellschaft
 DocType: Maintenance Visit,Customer Feedback,Kundenrückmeldung
 DocType: Account,Expense,Kosten
-DocType: Sales Invoice,Exhibition,Messe
 apps/erpnext/erpnext/utilities/doctype/address/address.py +77,"Company is mandatory, as it is your company address","Gesellschaft ist zwingend erforderlich, da es Ihre Firmenadresse ist"
 DocType: Item Attribute,From Range,Von-Bereich
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +81,Syntax error in formula or condition: {0},Syntaxfehler in der Formel oder Bedingung: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +92,Syntax error in formula or condition: {0},Syntaxfehler in der Formel oder Bedingung: {0}
 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: 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 +28,Jobs,Arbeitsplätze
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,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
@@ -3403,16 +3449,16 @@
 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 +763,Make Supplier Quotation,Lieferantenangebot erstellen
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,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/controllers/sales_and_purchase_return.py +100,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 +42,Casual Leave,Erholungsurlaub
+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
 DocType: Batch,Batch ID,Chargen-ID
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,Note: {0},Hinweis: {0}
 ,Delivery Note Trends,Entwicklung Lieferscheine
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +103,This Week's Summary,Zusammenfassung dieser Woche
+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
 DocType: Student Group Creation Tool,Get Courses,Erhalten Sie Kurse
 DocType: GL Entry,Party,Gruppe
@@ -3422,7 +3468,7 @@
 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 +59,Piecework,Akkordarbeit
+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: Task,Actual Time (in Hours),Tatsächliche Zeit (in Stunden)
 DocType: Employee,History In Company,Historie im Unternehmen
@@ -3439,10 +3485,10 @@
 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.
 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 +162,Black,Schwarz
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,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 erzeugt
+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/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Zurück
 DocType: Production Order Operation,Production Order Operation,Arbeitsgang im Fertigungsauftrag
@@ -3450,13 +3496,13 @@
 DocType: Project Task,Pending Review,Wartet 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 +69,Customer Id,Kunden-ID
+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
 DocType: Journal Entry Account,Exchange Rate,Wechselkurs
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Sales Order {0} is not submitted,Kundenauftrag {0} wurde nicht übertragen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +527,Sales Order {0} is not submitted,Kundenauftrag {0} wurde nicht übertragen
 DocType: Homepage,Tag Line,Tag-Linie
 DocType: Fee Component,Fee Component,Fee-Komponente
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +857,Add items from,Elemente hinzufügen aus
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +836,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}
 DocType: Cheque Print Template,Regular,Regulär
 DocType: BOM,Last Purchase Rate,Letzter Anschaffungspreis
@@ -3464,6 +3510,7 @@
 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"
 ,Sales Person-wise Transaction Summary,Vertriebsmitarbeiterbezogene Zusammenfassung der Transaktionen
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +60,Cost Center is required for 'Profit and Loss' account {0}. Please set up a default Cost Center for the Company.,Kostenstelle wird für &quot;Gewinn und Verlust&quot; Konto erforderlich {0}. Bitte stellen Sie eine Standard-Kostenstelle für das Unternehmen.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,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
@@ -3474,12 +3521,12 @@
 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 +710,Online,Online
+apps/erpnext/erpnext/accounts/page/pos/pos.js +692,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 +16,Setting this Address Template as default as there is no other default,"Diese Adressvorlage als Standard einstellen, da es keinen anderen Standard gibt"
+apps/erpnext/erpnext/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"
 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 +74,Quality Management,Qualitätsmanagement
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,Qualitätsmanagement
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} has been disabled,Artikel {0} wurde deaktiviert
 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
@@ -3501,11 +3548,12 @@
 DocType: Student,Student Email ID,Studenten E-Mail-ID
 DocType: Employee,Notice (days),Meldung(s)(-Tage)
 DocType: Tax Rule,Sales Tax Template,Umsatzsteuer-Vorlage
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1520,Select items to save the invoice,"Wählen Sie die Elemente, die Rechnung speichern"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1544,Select items to save the invoice,"Wählen Sie Elemente, um die Rechnung zu speichern"
 DocType: Employee,Encashment Date,Inkassodatum
 DocType: Account,Stock Adjustment,Bestandskorrektur
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Es gibt Standard-Aktivitätskosten für Aktivitätsart - {0}
 DocType: Production Order,Planned Operating Cost,Geplante Betriebskosten
+DocType: Academic Term,Term Start Date,Laufzeit Startdatum
 apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},Bitte Anhang beachten {0} #{1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Kontoauszug Bilanz nach Hauptbuch
 DocType: Job Applicant,Applicant Name,Bewerbername
@@ -3535,17 +3583,17 @@
 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."
 DocType: Company,Distribution,Großhandel
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +8,Amount Paid,Zahlbetrag
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Project Manager,Projektleiter
+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
 ,Quoted Item Comparison,Zitiert Artikelvergleich
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Dispatch,Versand
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,Versand
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max erlaubter Rabatt für Artikel: {0} ist {1}%
 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."
-DocType: Sales Invoice,Supplier Reference,Referenznummer des Lieferanten
-apps/erpnext/erpnext/accounts/page/pos/pos.js +844,"Master data syncing, it might take some time","Stammdaten-Synchronisierung, kann es einige Zeit dauern,"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +832,"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
@@ -3559,7 +3607,7 @@
 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 +83,Error in formula or condition,Fehler in der Formel oder Bedingung
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,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
@@ -3568,7 +3616,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},"Bis-Datum sollte im Geschäftsjahr liegen. Unter der Annahme, dass Bis-Datum = {0} ist"
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Hier können Sie Größe, Gewicht, Allergien, medizinische Belange usw. pflegen"
 DocType: Leave Block List,Applies to Company,Gilt für Firma
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +197,Cannot cancel because submitted Stock Entry {0} exists,"Stornierung nicht möglich, weil übertragene Lagerbuchung {0} existiert"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +198,Cannot cancel because submitted Stock Entry {0} exists,"Stornierung nicht möglich, weil übertragene Lagerbuchung {0} existiert"
 DocType: Purchase Invoice,In Words,In Worten
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,Today is {0}'s birthday!,Heute hat {0} Geburtstag!
 DocType: Production Planning Tool,Material Request For Warehouse,Materialanfrage für Lager
@@ -3578,14 +3626,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,Ihr Geschäftsjahr beginnt am
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Asset-Abschreibungen und Balances
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +319,Amount {0} {1} transferred from {2} to {3},Menge {0} {1} übertragen von {2} auf {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +322,Amount {0} {1} transferred from {2} to {3},Menge {0} {1} übertragen von {2} auf {3}
 DocType: Sales Invoice,Get Advances Received,Erhaltene Anzahlungen aufrufen
 DocType: Email Digest,Add/Remove Recipients,Empfänger hinzufügen/entfernen
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +432,Transaction not allowed against stopped Production Order {0},Transaktion für angehaltenen Fertigungsauftrag {0} nicht erlaubt
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +437,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 +143,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 +652,Item variant {0} exists with same attributes,Artikelvariante {0} mit denselben Attributen existiert
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Artikelvariante {0} mit denselben Attributen existiert
+DocType: Leave Application,LAP/,RUNDE/
 DocType: Salary Slip,Salary Slip,Gehaltsabrechnung
 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,"
@@ -3593,12 +3642,12 @@
 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 +212,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 +215,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: Employee Education,Employee Education,Mitarbeiterschulung
-apps/erpnext/erpnext/public/js/controllers/transaction.js +866,It is needed to fetch Item Details.,"Wird gebraucht, um Artikeldetails abzurufen"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +857,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
@@ -3608,14 +3657,14 @@
 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 +178,Invalid {0},Ungültige(r) {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Sick Leave,Krankheitsbedingte Abwesenheit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,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
 DocType: Warehouse,PIN,STIFT
 DocType: Sales Invoice,Base Change Amount (Company Currency),Base-Änderungsbetrag (Gesellschaft Währung)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +313,No accounting entries for the following warehouses,Keine Buchungen für die folgenden Lager
-apps/erpnext/erpnext/projects/doctype/project/project.js +102,Save the document first.,Speichern Sie das Dokument zuerst.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +314,No accounting entries for the following warehouses,Keine Buchungen für die folgenden Lager
+apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Speichern Sie das Dokument zuerst.
 DocType: Account,Chargeable,Gebührenpflichtig
 DocType: Company,Change Abbreviation,Abkürzung ändern
 DocType: Expense Claim Detail,Expense Date,Datum der Aufwendung
@@ -3628,10 +3677,9 @@
 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
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,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: Appraisal,Appraisal Template,Bewertungsvorlage
 DocType: Item Group,Item Classification,Artikeleinteilung
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Business Development Manager,Leiter der kaufmännischen Abteilung
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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
@@ -3641,8 +3689,8 @@
 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 +940,Please select {0} first,Bitte zuerst {0} auswählen
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +749,Batch {0} of Item {1} has expired.,Charge {0} von Artikel {1} ist abgelaufen.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +953,Please select {0} first,Bitte zuerst {0} auswählen
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +757,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
@@ -3670,8 +3718,8 @@
  {% 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 +92,Warehouse not found in the system,Lager im System nicht gefunden
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +106,This Month's Summary,Zusammenfassung dieses Monats
+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
 DocType: Quality Inspection Reading,Quality Inspection Reading,Ablesung zur Qualitätsprüfung
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,"""Lagerbestände sperren, wenn älter als"" sollte kleiner sein als %d Tage."
 DocType: Tax Rule,Purchase Tax Template,Umsatzsteuer-Vorlage
@@ -3681,21 +3729,22 @@
 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 +87,Please set Next Depreciation Date,Bitte setzen Sie Next Abschreibungen Datum
-DocType: Payment Gateway,Payment Gateway,Zahlungs-Gateways
 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 +378,Operation Time must be greater than 0 for Operation {0},Betriebszeit muss für die Operation {0} größer als 0 sein
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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/accounts/doctype/account/account.py +170,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)
 DocType: Program,Program Abbreviation,Programm Abkürzung
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,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: Appraisal,Start Date,Startdatum
@@ -3709,23 +3758,24 @@
 DocType: Assessment Result,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 angerechtet werden können"
+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"
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,z. B. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +27,Transaction currency must be same as Payment Gateway currency,Transaktionswährung muß gleiche wie Payment Gateway Währung
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Transaction currency must be same as Payment Gateway currency,Transaktionswährung muß gleiche wie Payment Gateway Währung
 DocType: Payment Entry,Receive,Empfangen
+apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,Zitate:
 DocType: Maintenance Visit,Fully Completed,Vollständig abgeschlossen
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% abgeschlossen
 DocType: Employee,Educational Qualification,Schulische Qualifikation
 DocType: Workstation,Operating Costs,Betriebskosten
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Erwünschte Aktion bei überschrittenem kumuliertem Monatsbudget
 DocType: Purchase Invoice,Submit on creation,Buchen beim Erstellen
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +432,Currency for {0} must be {1},Währung für {0} muss {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +435,Currency for {0} must be {1},Währung für {0} muss {1}
 DocType: Asset,Disposal Date,Verkauf Datum
 DocType: Employee Leave Approver,Employee Leave Approver,Urlaubsgenehmiger des Mitarbeiters
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,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 +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/crm/doctype/opportunity/opportunity.py +79,"Cannot declare as lost, because Quotation has been made.","Kann nicht als verloren deklariert werden, da bereits ein Angebot erstellt wurde."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Einkaufsstammdaten-Manager
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +429,Production Order {0} must be submitted,Fertigungsauftrag {0} muss übertragen werden
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +434,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
@@ -3735,25 +3785,27 @@
 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"
 DocType: Price List,Price List Name,Preislistenname
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +181,Totals,Summen
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,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 +113,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 +120,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
 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.
+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 +181,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/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 +793,All records are synced.,Alle Datensätze sind synchronisiert.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +781,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
 DocType: Cost Center,Cost Center Name,Kostenstellenbezeichnung
@@ -3772,21 +3824,20 @@
 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/selling/doctype/quotation/quotation.py +49,Cannot set as Lost as Sales Order is made.,"Kann nicht als verloren gekennzeichnet werden, da ein Kundenauftrag dazu existiert."
-DocType: Student Applicant,Mother's Name,Name der Mutter
 DocType: Request for Quotation Item,Supplier Part No,Lieferant Teile-Nr
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +348,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Kann nicht abziehen, wenn der Kategorie für &quot;Bewertung&quot; oder &quot;Vaulation und Total &#39;ist"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Received From,Erhalten von
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Received From,Erhalten von
 DocType: Lead,Converted,umgewandelt
 DocType: Item,Has Serial No,Hat Seriennummer
 DocType: Employee,Date of Issue,Ausstellungsdatum
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{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 +93,Row {0}: Hours value must be greater than zero.,Row {0}: Stunden-Wert muss größer als Null sein.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +117,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"
 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 +172,{0} {1} does not exist,{0} {1} existiert nicht
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +175,{0} {1} does not exist,{0} {1} existiert nicht
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,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 +72,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
@@ -3795,13 +3846,14 @@
 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/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
 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 +109,Electrical,Elektro
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Electrical,Elektro
 DocType: Stock Entry,Total Value Difference (Out - In),Gesamt-Wertdifferenz (Aus - Ein)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,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
@@ -3809,7 +3861,7 @@
 DocType: Item,Customer Code,Kunden-Nr.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +210,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 +292,Debit To account must be a Balance Sheet account,Sollkonto muss ein Bilanzkonto sein
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Wertpapiere
@@ -3821,11 +3873,11 @@
 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 +301,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 +313,Salary Slip of employee {0} already created for time sheet {1},Gehaltsabrechnung der Mitarbeiter {0} bereits für Zeitblatt erstellt {1}
 DocType: Sales Order Item,Ordered Qty,Bestellte Menge
-apps/erpnext/erpnext/stock/doctype/item/item.py +673,Item {0} is disabled,Artikel {0} ist deaktiviert
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,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 +838,BOM does not contain any stock item,Stückliste enthält keine Lagerware
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +809,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
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Gehaltsabrechnungen generieren
@@ -3833,23 +3885,24 @@
 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)
-apps/erpnext/erpnext/stock/doctype/item/item.py +485,Row #{0}: Please set reorder quantity,Zeile #{0}: Bitte Nachbestellmenge angeben
+DocType: Sales Invoice Timesheet,Billing Hours,Billing Stunden
+apps/erpnext/erpnext/stock/doctype/item/item.py +487,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 +62,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
+DocType: Payment Entry,Allocate Payment Amount,Weisen Zahlungsbetrag
 DocType: Employee External Work History,Salary,Gehalt
 DocType: Serial No,Delivery Document Type,Lieferdokumententyp
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Alle Gehaltsabrechnungen für die oben gewählten Kriterien übertragen
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} Artikel synchronisiert
 DocType: Sales Order,Partly Delivered,Teilweise geliefert
-DocType: Sales Invoice,Existing Customer,Bestehender Kunde
 DocType: Email Digest,Receivables,Forderungen
+DocType: Lead Source,Lead Source,Interessent Ursprung
 DocType: Customer,Additional information regarding the customer.,Zusätzliche Informationen bezüglich des Kunden.
 DocType: Quality Inspection Reading,Reading 5,Ablesewert 5
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +38,Campaign Name is required,Kampagnenname ist erforderlich
 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.
@@ -3858,10 +3911,9 @@
 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 +129,BOM and Manufacturing Quantity are required,Stückliste und Fertigungsmenge werden benötigt
+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/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Alter Bereich 2
 DocType: SG Creation Tool Course,Max Strength,Max Kraft
-DocType: Bank Reconciliation Detail,Amount,Betrag
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Stückliste ersetzt
 ,Sales Analytics,Vertriebsanalyse
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +113,Available {0},Verfügbar {0}
@@ -3869,14 +3921,14 @@
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,E-Mail einrichten
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +96,Please enter default currency in Company Master,Bitte die Standardwährung in die Firmenstammdaten eingeben
 DocType: Stock Entry Detail,Stock Entry Detail,Lagerbuchungsdetail
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +100,Daily Reminders,Tägliche Erinnerungen
+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/account/account_tree.js +23,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 +71,Customer Service,Kundenservice
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Customer Service,Kundenservice
 DocType: Homepage Featured Product,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
@@ -3885,8 +3937,9 @@
 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
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Standard-Fertigungslager
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1570,Total nos of serial no is not equal to quantity.,Insgesamt nos der Seriennummer ist auf Quantität nicht gleich.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1594,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
 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
@@ -3894,9 +3947,10 @@
 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 +82,Engineer,Ingenieur
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,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 +370,Item Code required at Row No {0},Artikelnummer wird in Zeile {0} benötigt
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +398,Item Code required at Row No {0},Artikelnummer wird in Zeile {0} benötigt
 DocType: Sales Partner,Partner Type,Partnertyp
 DocType: Purchase Taxes and Charges,Actual,Tatsächlich
 DocType: Authorization Rule,Customerwise Discount,Kundenspezifischer Rabatt
@@ -3912,16 +3966,18 @@
 DocType: BOM,Raw Material Cost,Rohmaterialkosten
 DocType: Item Reorder,Re-Order Level,Meldebestand
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Geben Sie die Posten und die geplante Menge ein, für die Sie Fertigungsaufträge erstellen möchten, oder laden Sie die Rohmaterialien für die Analyse herunter."
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +55,Part-time,Teilzeit
+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
 DocType: Employee,Applicable Holiday List,Geltende Urlaubsliste
 DocType: Employee,Cheque,Scheck
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Serie aktualisiert
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +57,Series Updated,Serie aktualisiert
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Berichtstyp ist zwingend erforderlich
 DocType: Item,Serial Number Series,Serie der Seriennummer
 apps/erpnext/erpnext/buying/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 +87,Clearance Date updated,Räumungs Datum aktualisiert
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Erfolgreich abgestimmt
@@ -3935,7 +3991,7 @@
 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 +513,Posting date and posting time is mandatory,Buchungsdatum und Buchungszeit sind zwingend erfoderlich
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Buchungsdatum und Buchungszeit sind zwingend erfoderlich
 apps/erpnext/erpnext/config/buying.py +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."
@@ -3945,7 +4001,7 @@
 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/stock/doctype/stock_entry/stock_entry.py +158,Target warehouse in row {0} must be same as Production Order,Eingangslager in Zeile {0} muss dem Fertigungsauftrag entsprechen
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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"
 DocType: Company,Round Off Account,Abschlusskonto
@@ -3954,23 +4010,22 @@
 DocType: Customer Group,Parent Customer Group,Übergeordnete Kundengruppe
 DocType: Purchase Invoice,Contact Email,Kontakt-E-Mail
 DocType: Appraisal Goal,Score Earned,Erreichte Punktzahl
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Notice Period,Mitteilungsfrist
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,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 +4,New Sales Person Name,Neuer Verkaufspersonenname
 DocType: Packing Slip,Gross Weight UOM,Bruttogewicht-Maßeinheit
-DocType: Email Digest,Receivables / Payables,Forderungen/Verbindlichkeiten
 DocType: Delivery Note Item,Against Sales Invoice,Zu Ausgangsrechnung
 DocType: Bin,Reserved Qty for Production,Reserviert Menge für Produktion
 DocType: Asset,Frequency of Depreciation (Months),Die Häufigkeit der Abschreibungen (Monate)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +469,Credit Account,Guthabenkonto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Credit Account,Guthabenkonto
 DocType: Landed Cost Item,Landed Cost Item,Einstandspreis-Artikel
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +55,Show zero values,Nullwerte anzeigen
+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
 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 +647,Please specify Attribute Value for attribute {0},Bitte Attributwert für Attribut {0} angeben
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Bitte Attributwert für Attribut {0} angeben
 DocType: Item,Default Warehouse,Standardlager
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +39,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
@@ -3992,19 +4047,22 @@
 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
-DocType: Sales Invoice,Cold Calling,Kaltakquise
 DocType: SMS Parameter,SMS Parameter,SMS-Parameter
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,Budget und Kostenstellen
 DocType: Maintenance Schedule Item,Half Yearly,Halbjährlich
 DocType: Lead,Blog Subscriber,Blog-Abonnent
+DocType: Guardian,Alternate Number,Alternative Nummer
 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.
+DocType: Stock Reconciliation Item,Quantity Difference,Mengendifferenz
 apps/erpnext/erpnext/config/hr.py +253,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 +141,Set as Lost,"Als ""verloren"" markieren"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,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 +5,This is based on transactions against this Customer. See timeline below for details,Dies basiert auf Transaktionen gegen diesen Kunden. Siehe Zeitleiste unten für Details
 DocType: Supplier,Credit Days Based On,Zahlungsziel basierend auf
@@ -4016,11 +4074,10 @@
 ,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 +941,Select or add new customer,Wählen oder neue Kunden hinzufügen
+apps/erpnext/erpnext/accounts/page/pos/pos.js +930,Select or add new customer,Wählen oder neue Kunden hinzufügen
 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 +5,This is based on the attendance of this Employee,Dies basiert auf der Anwesenheit dieser Arbeitnehmer
-DocType: Sales Invoice,Frequency,Frequenz
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +463,Debit Account,Sollkonto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,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)
@@ -4029,27 +4086,27 @@
 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 +210,Supplier Quotation {0} created,Lieferant Quotation {0} erstellt
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +208,Supplier Quotation {0} created,Lieferant Quotation {0} erstellt
 apps/erpnext/erpnext/accounts/report/financial_statements.py +90,End Year cannot be before Start Year,"Ende Jahr sein kann, nicht vor dem Startjahr"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Employee Benefits,Vergünstigungen an Mitarbeiter
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,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 +228,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 +232,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 +499,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 +500,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 +1007,Price List not found or disabled,Preisliste nicht gefunden oder deaktiviert
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1008,Price List not found or disabled,Preisliste nicht gefunden oder deaktiviert
 DocType: Expense Claim,Approved,Genehmigt
 DocType: Pricing Rule,Price,Preis
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +244,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 +256,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
@@ -4060,12 +4117,12 @@
 DocType: Address,Office,Büro
 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 +259,Please select Employee Record first.,Bitte zuerst Mitarbeiterdatensatz auswählen.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +266,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 +190,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 +235,Please enter Expense Account,Bitte das Aufwandskonto angeben
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,Please enter Expense Account,Bitte das Aufwandskonto angeben
 DocType: Account,Stock,Lagerbestand
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,"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 +976,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Referenzdokumenttyp muss eine der Bestellung, Rechnung oder Kaufjournaleintrag sein"
 DocType: Employee,Current Address,Aktuelle Adresse
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Wenn der Artikel eine Variante eines anderen Artikels ist, dann werden Beschreibung, Bild, Preise, Steuern usw. aus der Vorlage übernommen, sofern nicht ausdrücklich etwas angegeben ist."
 DocType: Serial No,Purchase / Manufacture Details,Einzelheiten zu Kauf / Herstellung
@@ -4080,9 +4137,10 @@
 DocType: Asset Movement,Transaction Date,Transaktionsdatum
 DocType: Production Plan Item,Planned Qty,Geplante Menge
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,Summe Steuern
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,For Quantity (Manufactured Qty) is mandatory,Für Menge (hergestellte Menge) ist zwingend erforderlich
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,For Quantity (Manufactured Qty) is mandatory,Für Menge (hergestellte Menge) ist zwingend erforderlich
 DocType: Stock Entry,Default Target Warehouse,Standard-Eingangslager
 DocType: Purchase Invoice,Net Total (Company Currency),Nettosumme (Firmenwährung)
+apps/erpnext/erpnext/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 +78,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: Production Order,Actual Start Date,Tatsächliches Startdatum
@@ -4097,9 +4155,11 @@
 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
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +226,Transfer Asset,Asset übertragen
+DocType: Student,Home Address,Heimatadresse
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +227,Transfer Asset,Asset übertragen
 DocType: POS Profile,POS Profile,Verkaufsstellen-Profil
 apps/erpnext/erpnext/config/schools.py +33,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 +129,"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
@@ -4109,8 +4169,8 @@
 DocType: Assessment,Room,Zimmer
 DocType: Purchase Order,Advance Paid,Angezahlt
 DocType: Item,Item Tax,Artikelsteuer
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +765,Material to Supplier,Material an den Lieferanten
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +189,Excise Invoice,Verbrauch Rechnung
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,Material to Supplier,Material an den Lieferanten
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,Verbrauch Rechnung
 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
@@ -4120,7 +4180,7 @@
 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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,Studentengruppen erstellt.
 DocType: Scheduling Tool,Scheduling Tool,Scheduling-Werkzeug
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +136,Credit Card,Kreditkarte
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,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
 DocType: Purchase Invoice,Next Date,Nächster Termin
@@ -4128,6 +4188,7 @@
 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: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Hier können Sie Familiendetails wie Namen und Beruf der Eltern, Ehepartner und Kinder pflegen"
+DocType: Academic Term,Term End Date,Zeit Enddatum
 DocType: Hub Settings,Seller Name,Name des Verkäufers
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Steuern und Gebühren abgezogen (Firmenwährung)
 DocType: Item Group,General Settings,Grundeinstellungen
@@ -4139,7 +4200,7 @@
 DocType: Customer,Commission Rate,Provisionssatz
 apps/erpnext/erpnext/stock/doctype/item/item.js +261,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 +115,"Payment Type must be one of Receive, Pay and Internal Transfer","Zahlungsart muss eine der Receive sein, Pay und interne Übertragung"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +118,"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/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Der Warenkorb ist leer
 DocType: Production Order,Actual Operating Cost,Tatsächliche Betriebskosten
@@ -4154,10 +4215,10 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,Bitte eine CSV-Datei auswählen.
 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 +92,Designer,Konstrukteur
+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
 DocType: Serial No,Delivery Details,Lieferdetails
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +469,Cost Center is required in row {0} in Taxes table for type {1},Kostenstelle wird in Zeile {0} der Steuertabelle für Typ {1} gebraucht
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +472,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
 ,Item-wise Purchase Register,Artikelbezogene Übersicht der Einkäufe
 DocType: Batch,Expiry Date,Verfallsdatum
@@ -4167,12 +4228,12 @@
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Projekt-Stammdaten
 apps/erpnext/erpnext/controllers/status_updater.py +174,"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 +417, (Half Day),(Halbtags)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425, (Half Day),(Halbtags)
 DocType: Supplier,Credit Days,Zahlungsziel
 DocType: Leave Type,Is Carry Forward,Ist Übertrag
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +740,Get Items from BOM,Artikel aus der Stückliste holen
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +711,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 +549,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/controllers/accounts_controller.py +552,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
 ,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
diff --git a/erpnext/translations/el.csv b/erpnext/translations/el.csv
index 2e19823..1cabedc 100644
--- a/erpnext/translations/el.csv
+++ b/erpnext/translations/el.csv
@@ -18,11 +18,10 @@
 DocType: Sales Partner,Dealer,Έμπορος
 DocType: Employee,Rented,Νοικιασμένο
 DocType: Purchase Order,PO-,ΤΑΧΥΔΡΟΜΕΊΟ-
-apps/erpnext/erpnext/accounts/report/financial_statements.py +19,Start Year {0} not found.,Ξεκινήστε Έτος {0} δεν βρέθηκε.
 DocType: POS Profile,Applicable for User,Ισχύει για χρήστη
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +191,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Σταμάτησε Παραγγελία παραγωγή δεν μπορεί να ακυρωθεί, θα ξεβουλώνω πρώτα να ακυρώσετε"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +197,Do you really want to scrap this asset?,Θέλετε πραγματικά να καταργήσει αυτό το περιουσιακό στοιχείο;
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +17,Select Default Supplier,Επιλέξτε Προεπιλογή Προμηθευτής
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +192,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Σταμάτησε Παραγγελία παραγωγή δεν μπορεί να ακυρωθεί, θα ξεβουλώνω πρώτα να ακυρώσετε"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +198,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 +36,Currency is required for Price List {0},Το νόμισμα είναι απαραίτητο για τον τιμοκατάλογο {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Θα υπολογίζεται στη συναλλαγή.
 DocType: Address,County,Κομητεία
@@ -42,46 +41,45 @@
 DocType: Sales Invoice,Customer Name,Όνομα πελάτη
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +126,Bank account cannot be named as {0},Ο τραπεζικός λογαριασμός δεν μπορεί να ονομαστεί ως {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Κύριες εγγραφές (ή ομάδες) κατά τις οποίες δημιουργούνται λογιστικές εγγραφές διατηρούνται υπόλοιπα.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +180,Outstanding for {0} cannot be less than zero ({1}),Η εκκρεμότητα για {0} δεν μπορεί να είναι μικρότερη από το μηδέν ( {1} )
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,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 +148,Series Updated Successfully,Η σειρά ενημερώθηκε με επιτυχία
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +149,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,Όλες οι επαφές προμηθευτή
-DocType: Quality Inspection Reading,Parameter,Παράμετρος
 apps/erpnext/erpnext/projects/doctype/project/project.py +54,Expected End Date can not be less than Expected Start Date,Αναμενόμενη ημερομηνία λήξης δεν μπορεί να είναι μικρότερη από την αναμενόμενη ημερομηνία έναρξης
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Σειρά # {0}: Βαθμολογία πρέπει να είναι ίδιο με το {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +239,New Leave Application,Νέα αίτηση άδειας
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,New Leave Application,Νέα αίτηση άδειας
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +20,Attendance Record {0} exists against Student {1} for Course Schedule {2},Συμμετοχή Εγγραφή {0} υπάρχει κατά Student {1} για γκολφ Πρόγραμμα {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Bank Draft,Τραπεζική επιταγή
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,Τραπεζική επιταγή
 DocType: Mode of Payment Account,Mode of Payment Account,Λογαριασμός τρόπου πληρωμής
 apps/erpnext/erpnext/stock/doctype/item/item.js +52,Show Variants,Προβολή παραλλαγών
 DocType: Academic Term,Academic Term,ακαδημαϊκό Όρος
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +13,Material,Υλικό
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Quantity,Ποσότητα
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +511,Accounts table cannot be blank.,Λογαριασμοί πίνακας δεν μπορεί να είναι κενό.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +616,Quantity,Ποσότητα
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +512,Accounts table cannot be blank.,Λογαριασμοί πίνακας δεν μπορεί να είναι κενό.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,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/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 +142,User {0} is already assigned to Employee {1},Ο χρήστης {0} έχει ήδη ανατεθεί στον εργαζομένο {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Υγειονομική περίθαλψη
-DocType: Purchase Invoice,Monthly,Μηνιαίος
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Καθυστέρηση στην πληρωμή (Ημέρες)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +771,Invoice,Τιμολόγιο
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +750,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 +198,Row {0}: {1} {2} does not match with {3},Γραμμή {0}: {1} {2} δεν ταιριάζει με το {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Γραμμή # {0}:
+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 +127,Please select Price List,Παρακαλώ επιλέξτε τιμοκατάλογο
@@ -112,8 +110,8 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Ίδια Εταιρεία καταχωρήθηκε περισσότερο από μία φορά
 DocType: Employee,Married,Παντρεμένος
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Δεν επιτρέπεται η {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +589,Get items from,Πάρτε τα στοιχεία από
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +382,Stock cannot be updated against Delivery Note {0},Το απόθεμα δεν μπορεί να ανανεωθεί σύμφωνα με το δελτίο αποστολής {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Πάρτε τα στοιχεία από
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,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,Παντοπωλείο
@@ -122,7 +120,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 +156,Salary Structure Missing,Δομή του μισθού που λείπουν
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Salary Structure Missing,Δομή του μισθού που λείπουν
 DocType: Lead,Person Name,Όνομα Πρόσωπο
 DocType: Sales Invoice Item,Sales Invoice Item,Είδος τιμολογίου πώλησης
 DocType: Account,Credit,Πίστωση
@@ -130,10 +128,11 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",π.χ. «Δημοτικό Σχολείο» ή «Πανεπιστήμιο»
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Αναφορές απόθεμα
 DocType: Warehouse,Warehouse Detail,Λεπτομέρειες αποθήκης
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,Credit limit has been crossed for customer {0} {1}/{2},Το πιστωτικό όριο έχει ξεπεραστεί για τον πελάτη {0} {1} / {2}
-apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Είναι Παγίων&quot; δεν μπορεί να είναι ανεξέλεγκτη, καθώς υπάρχει Asset ρεκόρ έναντι του στοιχείου"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +189,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 ρεκόρ έναντι του στοιχείου"
 DocType: Tax Rule,Tax Type,Φορολογική Τύπος
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +144,You are not authorized to add or update entries before {0},Δεν επιτρέπεται να προσθέσετε ή να ενημερώσετε τις καταχωρήσεις πριν από {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},Δεν επιτρέπεται να προσθέσετε ή να ενημερώσετε τις καταχωρήσεις πριν από {0}
 DocType: Item,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) * Πραγματικός χρόνος λειτουργίας
@@ -143,18 +142,17 @@
 DocType: Student Log,Student Log,φοιτητής Σύνδεση
 DocType: Quality Inspection,Get Specification Details,Βρες λεπτομέρειες προδιαγραφών
 DocType: Lead,Interested,Ενδιαφερόμενος
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +165,Opening,Άνοιγμα
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,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/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Πελάτης&gt; Ομάδα Πελατών&gt; Επικράτεια
 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.,Ο λογαριασμός με υπάρχουσα συναλλαγή δεν μπορεί να μετατραπεί σε ομάδα.
 DocType: Lead,Product Enquiry,Ερώτηση για προϊόν
 DocType: Academic Term,Schools,σχολεία
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Παρακαλώ εισάγετε πρώτα εταιρεία
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Company first,Επιλέξτε την εταιρεία πρώτα
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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,Συνολικό κόστος
@@ -164,7 +162,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Κατάσταση λογαριασμού
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Φαρμακευτική
 DocType: Purchase Invoice Item,Is Fixed Asset,Είναι Παγίων
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Available qty is {0}, you need {1}","Διαθέσιμη ποσότητα είναι {0}, θα πρέπει να έχετε {1}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +225,"Available qty is {0}, you need {1}","Διαθέσιμη ποσότητα είναι {0}, θα πρέπει να έχετε {1}"
 DocType: Expense Claim Detail,Claim Amount,Ποσό απαίτησης
 DocType: Employee,Mr,Κ
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Τύπος προμηθευτή / προμηθευτής
@@ -173,25 +171,26 @@
 DocType: Employee,B-,ΣΙ-
 DocType: Upload Attendance,Import Log,Αρχείο καταγραφής εισαγωγής
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Τραβήξτε Υλικό Αίτηση του τύπου Κατασκευή με βάση τα παραπάνω κριτήρια
+DocType: Assessment Result,Grade,Βαθμός
 DocType: Sales Invoice Item,Delivered By Supplier,Παραδίδονται από τον προμηθευτή
 DocType: SMS Center,All Contact,Όλες οι επαφές
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Annual Salary,Ετήσιος Μισθός
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Έξοδα αποθέματος
-apps/erpnext/erpnext/accounts/report/financial_statements.py +22,End Year {0} not found.,Στο τέλος του έτους {0} δεν βρέθηκε.
 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}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Παροχή Πρώτων Υλών για Αγορά
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +130,At least one mode of payment is required for POS invoice.,Τουλάχιστον ένα τρόπο πληρωμής απαιτείται για POS τιμολόγιο.
 DocType: Products Settings,Show Products as a List,Εμφάνιση προϊόντων ως Λίστα
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Κατεβάστε το πρότυπο, συμπληρώστε τα κατάλληλα δεδομένα και επισυνάψτε το τροποποιημένο αρχείο. Όλες οι ημερομηνίες και ο συνδυασμός των υπαλλήλων στην επιλεγμένη περίοδο θα εμφανιστεί στο πρότυπο, με τους υπάρχοντες καταλόγους παρουσίας"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +451,Item {0} is not active or end of life has been reached,Το είδος {0} δεν είναι ενεργό ή το τέλος της ζωής έχει περάσει
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +456,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/controllers/accounts_controller.py +614,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Για να περιληφθούν οι φόροι στη γραμμή {0} της τιμής είδους, οι φόροι στις γραμμές {1} πρέπει επίσης να συμπεριληφθούν"
+apps/erpnext/erpnext/controllers/accounts_controller.py +617,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Για να περιληφθούν οι φόροι στη γραμμή {0} της τιμής είδους, οι φόροι στις γραμμές {1} πρέπει επίσης να συμπεριληφθούν"
 apps/erpnext/erpnext/config/hr.py +166,Settings for HR Module,Ρυθμίσεις για τη λειτουργική μονάδα HR
 DocType: SMS Center,SMS Center,Κέντρο SMS
 DocType: Sales Invoice,Change Amount,αλλαγή Ποσό
@@ -203,13 +202,13 @@
 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 +147,Execution,Εκτέλεση
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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,Προϊόντα και Τιμολόγηση
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Σύνολο ωρών: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},Το πεδίο από ημερομηνία πρέπει να είναι εντός της χρήσης. Υποθέτοντας από ημερομηνία = {0}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,Cost Center {0} does not belong to Company {1},Το κέντρο κόστους {0} δεν ανήκει στην εταιρεία {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +100,Cost Center {0} does not belong to Company {1},Το κέντρο κόστους {0} δεν ανήκει στην εταιρεία {1}
 DocType: Customer,Individual,Άτομο
 DocType: Interest,Academics User,ακαδημαϊκοί χρήστη
 DocType: Cheque Print Template,Amount In Figure,Ποσό Στο Σχήμα
@@ -225,30 +224,32 @@
 DocType: Production Planning Tool,Sales Orders,Παραγγελίες πωλήσεων
 DocType: Purchase Taxes and Charges,Valuation,Αποτίμηση
 ,Purchase Order Trends,Τάσεις παραγγελίας αγοράς
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,The request for quotation can be accessed by clicking on the following link,Το αίτημα για προσφορά μπορεί να προσπελαστεί κάνοντας κλικ στον παρακάτω σύνδεσμο
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,Κατανομή αδειών για το έτος
 DocType: SG Creation Tool Course,SG Creation Tool Course,ΓΓ Δημιουργία μαθήματος Εργαλείο
 DocType: Student Group Creation Tool,Leave blank if you wish to fetch all courses for selected academic term,Αφήστε κενό αν θέλετε να φέρω όλα τα μαθήματα για επιλεγμένες ακαδημαϊκή περίοδο
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,Insufficient Stock,ανεπαρκής Χρηματιστήριο
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227,Insufficient Stock,ανεπαρκής Χρηματιστήριο
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Απενεργοποίηση προγραμματισμός της χωρητικότητας και την παρακολούθηση του χρόνου
+DocType: Email Digest,New Sales Orders,Νέες παραγγελίες πωλήσεων
 DocType: Bank Reconciliation,Bank Account,Τραπεζικός λογαριασμό
 DocType: Leave Type,Allow Negative Balance,Επίτρεψε αρνητικό ισοζύγιο
 DocType: Selling Settings,Default Territory,Προεπιλεγμένη περιοχή
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Τηλεόραση
 DocType: Production Order Operation,Updated via 'Time Log',Ενημέρωση μέσω 'αρχείου καταγραφής χρονολογίου'
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} does not belong to Company {1},Ο λογαριασμός {0} δεν ανήκει στη εταιρεία {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +86,Account {0} does not belong to Company {1},Ο λογαριασμός {0} δεν ανήκει στη εταιρεία {1}
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},ποσό της προκαταβολής δεν μπορεί να είναι μεγαλύτερη από {0} {1}
 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 +174,For Warehouse is required before Submit,Tο πεδίο για αποθήκη απαιτείται πριν την υποβολή
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,For Warehouse is required before Submit,Tο πεδίο για αποθήκη απαιτείται πριν την υποβολή
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Που ελήφθη στις
 DocType: Sales Partner,Reseller,Μεταπωλητής
 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 +1436,"LocalStorage is full , did not save","LocalStorage είναι πλήρης, δεν έσωσε"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1460,"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}
@@ -261,18 +262,19 @@
 apps/erpnext/erpnext/templates/generators/item.html +78,No description given,Δεν έχει δοθεί περιγραφή
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Αίτηση αγοράς.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +5,This is based on the Time Sheets created against this project,Αυτό βασίζεται στα δελτία χρόνου εργασίας που δημιουργήθηκαν κατά του σχεδίου αυτού
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Only the selected Leave Approver can submit this Leave Application,Μόνο ο επιλεγμένος υπεύθυνος έγκρισης άδειας μπορεί να υποβάλλει αυτήν την αίτηση άδειας
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +213,Only the selected Leave Approver can submit this Leave Application,Μόνο ο επιλεγμένος υπεύθυνος έγκρισης άδειας μπορεί να υποβάλλει αυτήν την αίτηση άδειας
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Η ημερομηνία απαλλαγής πρέπει να είναι μεταγενέστερη από την ημερομηνία ένταξης
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Leaves per Year,Αφήνει ανά έτος
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,Αφήνει ανά έτος
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Γραμμή {0}: παρακαλώ επιλέξτε το «είναι προκαταβολή» έναντι του λογαριασμού {1} αν αυτό είναι μια καταχώρηση προκαταβολής.
 apps/erpnext/erpnext/stock/utils.py +188,Warehouse {0} does not belong to company {1},Η αποθήκη {0} δεν ανήκει στην εταιρεία {1}
+DocType: Email Digest,Profit & Loss,Απώλειες κερδών
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,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 +435,Leave Blocked,Η άδεια εμποδίστηκε
-apps/erpnext/erpnext/stock/doctype/item/item.py +669,Item {0} has reached its end of life on {1},Το είδος {0} έχει φτάσει στο τέλος της διάρκειας ζωής του στο {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +443,Leave Blocked,Η άδεια εμποδίστηκε
+apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item {0} has reached its end of life on {1},Το είδος {0} έχει φτάσει στο τέλος της διάρκειας ζωής του στο {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +95,Bank Entries,Τράπεζα Καταχωρήσεις
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +83,Annual,Ετήσιος
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +86,Annual,Ετήσιος
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Είδος συμφωνίας αποθέματος
 DocType: Stock Entry,Sales Invoice No,Αρ. Τιμολογίου πώλησης
 DocType: Material Request Item,Min Order Qty,Ελάχιστη ποσότητα παραγγελίας
@@ -280,20 +282,22 @@
 DocType: Lead,Do Not Contact,Μην επικοινωνείτε
 apps/erpnext/erpnext/public/js/setup_wizard.js +360,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 +91,Software Developer,Προγραμματιστής
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,Προγραμματιστής
 DocType: Item,Minimum Order Qty,Ελάχιστη ποσότητα παραγγελίας
 DocType: Pricing Rule,Supplier Type,Τύπος προμηθευτή
 DocType: Scheduling Tool,Course Start Date,Φυσικά Ημερομηνία Έναρξης
 DocType: Item,Publish in Hub,Δημοσίευση στο hub
+DocType: Student Admission,Student Admission,Η είσοδος φοιτητής
 ,Terretory,Περιοχή
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is cancelled,Το είδος {0} είναι ακυρωμένο
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Material Request,Αίτηση υλικού
+apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} is cancelled,Το είδος {0} είναι ακυρωμένο
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +823,Material Request,Αίτηση υλικού
 DocType: Bank Reconciliation,Update Clearance Date,Ενημέρωση ημερομηνίας εκκαθάρισης
 apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +28,Abbreviation already used for another salary component,Σύντμηση που χρησιμοποιείται ήδη για μια άλλη συνιστώσα του μισθού
 DocType: Item,Purchase Details,Λεπτομέρειες αγοράς
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +328,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Θέση {0} δεν βρέθηκε στο «πρώτες ύλες που προμηθεύεται« πίνακα Εντολή Αγοράς {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +333,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/config/selling.py +18,Confirmed orders from Customers.,Επιβεβαιωμένες παραγγελίες από πελάτες.
 DocType: Purchase Receipt Item,Rejected Quantity,Ποσότητα που απορρίφθηκε
 DocType: SMS Settings,SMS Sender Name,Αποστολέας SMS
@@ -309,20 +313,21 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +130,Please select Charge Type first,Παρακαλώ επιλέξτε πρώτα τύπο επιβάρυνσης
 DocType: Student Group Student,Student Group Student,Ομάδα Φοιτητών Φοιτητής
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Το πιο πρόσφατο
+DocType: Email Digest,New Quotations,Νέες προσφορές
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Ο πρώτος υπεύθυνος αδειών στον κατάλογο θα οριστεί ως ο προεπιλεγμένος υπεύθυνος αδειών
 DocType: Tax Rule,Shipping County,County ναυτιλία
 apps/erpnext/erpnext/config/desktop.py +158,Learn,Μαθαίνω
 DocType: Asset,Next Depreciation Date,Επόμενο Ημερομηνία Αποσβέσεις
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Δραστηριότητα κόστος ανά εργαζόμενο
 DocType: Accounts Settings,Settings for Accounts,Ρυθμίσεις για τους λογαριασμούς
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +626,Supplier Invoice No exists in Purchase Invoice {0},Προμηθευτής τιμολόγιο αριθ υπάρχει στην Αγορά Τιμολόγιο {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +629,Supplier Invoice No exists in Purchase Invoice {0},Προμηθευτής τιμολόγιο αριθ υπάρχει στην Αγορά Τιμολόγιο {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Διαχειριστείτε το δέντρο πωλητών.
 DocType: Job Applicant,Cover Letter,συνοδευτική επιστολή
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Εξαιρετική επιταγές και καταθέσεις για να καθαρίσετε
 DocType: Item,Synced With Hub,Συγχρονίστηκαν με το 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 +348,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 +86,Circular Reference Error,Κυκλικού λάθους Αναφορά
@@ -334,15 +339,16 @@
 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 +806,Delivery Note,Δελτίο αποστολής
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +800,Delivery Note,Δελτίο αποστολής
 apps/erpnext/erpnext/config/learn.py +87,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 +233,Payment Entry has been modified after you pulled it. Please pull it again.,Η καταχώηρση πληρωμής έχει τροποποιηθεί μετά την λήψη της. Παρακαλώ επαναλάβετε τη λήψη.
+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/setup/doctype/email_digest/email_digest.py +104,Summary for this week and pending activities,Περίληψη για αυτή την εβδομάδα και εν αναμονή δραστηριότητες
+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, διαχωρισμένο με κόμματα, το τιμολόγιο θα αποσταλεί αυτόματα την συγκεκριμένη ημερομηνία"
 DocType: Employee,Company Email,Email εταιρείας
@@ -354,27 +360,28 @@
 apps/erpnext/erpnext/config/hr.py +186,"Employee designation (e.g. CEO, Director etc.).","Τίτλος υπαλλήλου ( π.Χ. Διευθύνων σύμβουλος, διευθυντής κ.λ.π. )."
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,Παρακαλώ εισάγετε τιμή στο πεδίο 'επανάληψη για την ημέρα του μήνα'
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Ισοτιμία με την οποία το νόμισμα του πελάτη μετατρέπεται στο βασικό νόμισμα του πελάτη
-apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Σειρά # {0}: Αγορά Τιμολόγιο δεν μπορεί να γίνει κατά ένα υπάρχον στοιχείο {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +554,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Σειρά # {0}: Αγορά Τιμολόγιο δεν μπορεί να γίνει κατά ένα υπάρχον στοιχείο {1}
 DocType: Item Tax,Tax Rate,Φορολογικός συντελεστής
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} έχει ήδη διατεθεί υπάλληλου {1} για χρονικό διάστημα {2} σε {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +812,Select Item,Επιλέξτε Προϊόν
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +791,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/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Το τιμολογίου αγοράς {0} έχει ήδη υποβληθεί
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Σειρά # {0}: Παρτίδα Δεν πρέπει να είναι ίδιο με το {1} {2}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +143,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) ενός είδους.
 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 +342,Please see attachment,Παρακαλώ δείτε συνημμένο
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,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 +19,Setup Already Complete!!,Η εγκατάσταση έχει ήδη ολοκληρωθεί!
 ,Finished Goods,Έτοιμα προϊόντα
 DocType: Delivery Note,Instructions,Οδηγίες
 DocType: Quality Inspection,Inspected By,Επιθεωρήθηκε από
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Προμηθευτής&gt; Τύπος προμηθευτή
 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,Προσθήκη Ειδών
@@ -388,29 +395,29 @@
 DocType: Currency Exchange,Currency Exchange,Ανταλλαγή συναλλάγματος
 DocType: Purchase Invoice Item,Item Name,Όνομα είδους
 DocType: Authorization Rule,Approving User  (above authorized value),Έγκριση Χρήστη (πάνω από εξουσιοδοτημένο αξία)
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Υπόλοιπο πίστωσης
+DocType: Email Digest,Credit Balance,Υπόλοιπο πίστωσης
 DocType: Employee,Widowed,Χήρος
 DocType: Request for Quotation,Request for Quotation,Αίτηση για προσφορά
 DocType: Salary Slip Timesheet,Working Hours,Ώρες εργασίας
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Αλλάξτε τον αρχικό/τρέχων αύξοντα αριθμός μιας υπάρχουσας σειράς.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Αν υπάρχουν πολλοί κανόνες τιμολόγησης που συνεχίζουν να επικρατούν, οι χρήστες καλούνται να ορίσουν προτεραιότητα χειρονακτικά για την επίλυση των διενέξεων."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +736,Purchase Return,Επιστροφή αγοράς
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +715,Purchase Return,Επιστροφή αγοράς
 ,Purchase Register,Ταμείο αγορών
 DocType: Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Ισχύουσες χρεώσεις
 DocType: Workstation,Consumable Cost,Κόστος αναλώσιμων
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +202,{0} ({1}) must have role 'Leave Approver',{0} ({1}) Πρέπει να έχει ρόλο «υπεύθυνος έγκρισης αδειών»
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,{0} ({1}) must have role 'Leave Approver',{0} ({1}) Πρέπει να έχει ρόλο «υπεύθυνος έγκρισης αδειών»
 DocType: Purchase Receipt,Vehicle Date,Όχημα Ημερομηνία
 DocType: Student Log,Medical,Ιατρικός
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Αιτιολογία απώλειας
-apps/erpnext/erpnext/accounts/utils.py +239,Allocated amount can not greater than unadjusted amount,Χορηγούμενο ποσό δεν μπορεί να είναι μεγαλύτερη από το μη διορθωμένο ποσό
+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,Χορηγούμενο ποσό δεν μπορεί να είναι μεγαλύτερη από το μη διορθωμένο ποσό
 DocType: Announcement,Receiver,Δέκτης
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Ο σταθμός εργασίας είναι κλειστός κατά τις ακόλουθες ημερομηνίες σύμφωνα με τη λίστα αργιών: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Ευκαιρίες
 DocType: Employee,Single,Μονό
 DocType: Account,Cost of Goods Sold,Κόστος πωληθέντων
 DocType: Purchase Invoice,Yearly,Ετήσια
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +225,Please enter Cost Center,Παρακαλώ εισάγετε κέντρο κόστους
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,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,Όνομα εξεταστής
@@ -423,26 +430,26 @@
 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,Ελέγξτε Προμηθευτής Αριθμός Τιμολογίου Μοναδικότητα
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',Το πεδίο έως αριθμό υπόθεσης δεν μπορεί να είναι μικρότερο του πεδίου από αριθμό υπόθεσης
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,Non Profit,Μη κερδοσκοπικός
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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: Stock Reconciliation Item,Do not include symbols (ex. $),Μην περιλαμβάνουν σύμβολα (πρώην. $)
 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 +638,Attribute {0} selected multiple times in Attributes Table,Χαρακτηριστικό {0} πολλές φορές σε πίνακα Χαρακτηριστικά
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Χαρακτηριστικό {0} πολλές φορές σε πίνακα Χαρακτηριστικά
 DocType: HR Settings,Employee record is created using selected field. ,Η Εγγραφή υπαλλήλου δημιουργείται χρησιμοποιώντας το επιλεγμένο πεδίο.
 DocType: Sales Order,Not Applicable,Μη εφαρμόσιμο
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Κύρια εγγραφή αργιών.
 DocType: Request for Quotation Item,Required Date,Απαιτούμενη ημερομηνία
 DocType: Delivery Note,Billing Address,Διεύθυνση χρέωσης
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +862,Please enter Item Code.,Παρακαλώ εισάγετε κωδικό είδους.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +847,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","Εάν είναι επιλεγμένο, το ποσό του φόρου θα πρέπει να θεωρείται ότι έχει ήδη συμπεριληφθεί στην τιμή / ποσό εκτύπωσης"
@@ -456,12 +463,12 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Κινητές αξίες και καταθέσεις
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Σύνολο φύλλα που διατίθενται είναι υποχρεωτική
 DocType: Job Opening,Description of a Job Opening,Περιγραφή μιας ανοιχτής θέσης εργασίας
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Pending activities for today,Εν αναμονή δραστηριότητες για σήμερα
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Εν αναμονή δραστηριότητες για σήμερα
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Καταχωρήσεις προσέλευσης.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Συστατικό μισθός για το φύλλο κατανομής χρόνου με βάση μισθοδοσίας.
 DocType: Sales Order Item,Used for Production Plan,Χρησιμοποιείται για το σχέδιο παραγωγής
 DocType: Manufacturing Settings,Time Between Operations (in mins),Χρόνου μεταξύ των λειτουργιών (σε λεπτά)
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +92,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} προϋπολογισμού για το λογαριασμό {1} κατά Κέντρο Κόστους {2} είναι {3}. Θα υπερβαίνει κατά {4}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +95,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} προϋπολογισμού για το λογαριασμό {1} κατά Κέντρο Κόστους {2} είναι {3}. Θα υπερβαίνει κατά {4}
 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 δεν είναι για το ίδιο στοιχείο
@@ -469,16 +476,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +238,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 +86,Administrative Officer,Διοικητικός λειτουργός
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,Διοικητικός λειτουργός
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +23,Acutal Qty {0} / Waiting Qty {1},Acutal Ποσότητα {0} / Αναμονή Ποσότητα {1}
 DocType: Timesheet Detail,Hrs,ώρες
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +319,Please select Company,Επιλέξτε Εταιρεία
-DocType: Stock Entry,Difference Account,Λογαριασμός διαφορών
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +309,Please select Company,Επιλέξτε Εταιρεία
+DocType: Stock Entry Detail,Difference Account,Λογαριασμός διαφορών
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Δεν μπορεί να κλείσει το έργο ως εξαρτώμενη εργασία του {0} δεν έχει κλείσει.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Please enter Warehouse for which Material Request will be raised,Παρακαλώ εισάγετε αποθήκη για την οποία θα δημιουργηθεί η αίτηση υλικού
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +399,Please enter Warehouse for which Material Request will be raised,Παρακαλώ εισάγετε αποθήκη για την οποία θα δημιουργηθεί η αίτηση υλικού
 DocType: Production Order,Additional Operating Cost,Πρόσθετο λειτουργικό κόστος
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Καλλυντικά
-apps/erpnext/erpnext/stock/doctype/item/item.py +530,"To merge, following properties must be same for both items","Για τη συγχώνευση, οι ακόλουθες ιδιότητες πρέπει να είναι ίδιες για τα δύο είδη"
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,"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 +28,Buy,Αγορά
@@ -486,7 +493,7 @@
 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 +1563,Serial no item cannot be a fraction,Serial κανένα στοιχείο δεν μπορεί να είναι ένα κλάσμα
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1587,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,Διαχείριση της υπεργολαβίας
@@ -495,13 +502,14 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Account {0} does not belong to company: {1},Ο λογαριασμός {0} δεν ανήκει στην εταιρεία: {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation already used for another company,Σύντμηση που χρησιμοποιείται ήδη για μια άλλη εταιρεία
 DocType: Selling Settings,Default Customer Group,Προεπιλεγμένη ομάδα πελατών
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Supplier is required against Payable account {0},Προμηθευτής είναι υποχρεωμένος κατά Πληρωτέο λογαριασμό {0}
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Αν είναι απενεργοποιημένο, το πεδίο στρογγυλοποιημένο σύνολο δεν θα είναι ορατό σε καμμία συναλλαγή"
 DocType: BOM,Operating Cost,Λειτουργικό κόστος
 DocType: Sales Order Item,Gross Profit,Μικτό κέρδος
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +42,Increment cannot be 0,Προσαύξηση δεν μπορεί να είναι 0
 DocType: Production Planning Tool,Material Requirement,Απαίτηση υλικού
 DocType: Company,Delete Company Transactions,Διαγραφή Συναλλαγές Εταιρείας
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +313,Reference No and Reference Date is mandatory for Bank transaction,Αριθμός αναφοράς και ημερομηνία αναφοράς είναι υποχρεωτική για την Τράπεζα συναλλαγών
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +316,Reference No and Reference Date is mandatory for Bank transaction,Αριθμός αναφοράς και ημερομηνία αναφοράς είναι υποχρεωτική για την Τράπεζα συναλλαγών
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Προσθήκη / επεξεργασία φόρων και επιβαρύνσεων
 DocType: Purchase Invoice,Supplier Invoice No,Αρ. τιμολογίου του προμηθευτή
 DocType: Territory,For reference,Για αναφορά
@@ -512,7 +520,6 @@
 DocType: Installation Note Item,Installation Note Item,Είδος σημείωσης εγκατάστασης
 DocType: Production Plan Item,Pending Qty,Εν αναμονή Ποσότητα
 DocType: Budget,Ignore,Αγνοήστε
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Κωδικός item&gt; Στοιχείο Ομάδα&gt; Μάρκα
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,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
@@ -523,11 +530,11 @@
 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/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Δεν βρέθηκαν εγγραφές στον πίνακα τιμολογίων
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +28,Please select Company and Party Type first,Παρακαλώ επιλέξτε πρώτα εταιρεία και τύπο συμβαλλόμενου
+apps/erpnext/erpnext/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/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 +707,Make Sales Order,Δημιούργησε παραγγελία πώλησης
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +701,Make Sales Order,Δημιούργησε παραγγελία πώλησης
 DocType: Project Task,Project Task,Πρόγραμμα εργασιών
 ,Lead Id,ID επαφής
 DocType: C-Form Invoice Detail,Grand Total,Γενικό σύνολο
@@ -543,7 +550,8 @@
 DocType: Job Applicant,Resume Attachment,Συνέχιση Συνημμένο
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Επαναλαμβανόμενοι πελάτες
 DocType: Leave Control Panel,Allocate,Κατανομή
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +734,Sales Return,Επιστροφή πωλήσεων
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +728,Sales Return,Επιστροφή πωλήσεων
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +91,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)
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Βάση δεδομένων των δυνητικών πελατών.
@@ -552,14 +560,13 @@
 DocType: Quotation,Quotation To,Προσφορά προς
 DocType: Lead,Middle Income,Μέσα έσοδα
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +212,Opening (Cr),Άνοιγμα ( cr )
-apps/erpnext/erpnext/stock/doctype/item/item.py +795,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Προεπιλεγμένη μονάδα μέτρησης για τη θέση {0} δεν μπορεί να αλλάξει άμεσα, επειδή έχετε ήδη κάνει κάποια συναλλαγή (ες) με μια άλλη UOM. Θα χρειαστεί να δημιουργήσετε ένα νέο σημείο για να χρησιμοποιήσετε ένα διαφορετικό Προεπιλογή UOM."
-apps/erpnext/erpnext/accounts/utils.py +237,Allocated amount can not be negative,Το χορηγούμενο ποσό δεν μπορεί να είναι αρνητικό
+apps/erpnext/erpnext/stock/doctype/item/item.py +797,Default Unit of Measure for Item {0} cannot be changed directly because 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,Το χορηγούμενο ποσό δεν μπορεί να είναι αρνητικό
 DocType: Purchase Order Item,Billed Amt,Χρεωμένο ποσό
 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 +91,Reference No & Reference Date is required for {0},Ο αρ. αναφοράς & η ημερομηνία αναφοράς για {0} είναι απαραίτητες.
-DocType: Sales Invoice,Customer's Vendor,Πωλητής πελάτη
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Proposal Writing,Συγγραφή πρότασης
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,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","Αν επιλεγεί, οι πρώτες ύλες για τα είδη που είναι σε υπεργολάβο θα συμπεριληφθούν στο υλικό Αιτήσεις"
@@ -568,13 +575,14 @@
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,Παρακολούθηση του χρόνου
 DocType: Fiscal Year Company,Fiscal Year Company,Εταιρεία χρήσης
 DocType: Packing Slip Item,DN Detail,Λεπτομέρεια dn
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +257,Already supplier quotation has created,Ήδη προμηθευτή εισαγωγικά έχει δημιουργήσει
 DocType: Timesheet,Billed,Χρεώνεται
 DocType: Batch,Batch Description,Περιγραφή παρτίδας
+apps/erpnext/erpnext/accounts/utils.py +685,"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 +733,View Offline Records,Προβολή Αποσυνδεδεμένος Εγγραφές
+apps/erpnext/erpnext/accounts/page/pos/pos.js +715,View Offline Records,Προβολή Αποσυνδεδεμένος Εγγραφές
+DocType: Student,Sibling Details,Αδέλφια Λεπτομέρειες
 DocType: Employee,Reason for Resignation,Αιτία παραίτησης
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,Πρότυπο για την αξιολόγηση της απόδοσης.
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,Λεπτομέρειες καταχώρησης τιμολογίου / λογιστικού βιβλίου
@@ -588,7 +596,7 @@
 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,Καθαρή Αλλαγή στο Απογραφή
 DocType: Employee,Passport Number,Αριθμός διαβατηρίου
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Manager,Προϊστάμενος
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,Προϊστάμενος
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,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,Τα πεδία με βάση και ομαδοποίηση κατά δεν μπορεί να είναι ίδια
@@ -597,10 +605,11 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter email address,Παρακαλώ εισάγετε τη διεύθυνση email
 DocType: Production Order Operation,In minutes,Σε λεπτά
 DocType: Issue,Resolution Date,Ημερομηνία επίλυσης
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +299,Timesheet created:,Φύλλο κατανομής χρόνου δημιουργήθηκε:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +715,Please set default Cash or Bank account in Mode of Payment {0},Παρακαλώ ορίστε τον προεπιλεγμένο λογιαριασμό μετρητών ή τραπέζης στον τρόπο πληρωμής {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +300,Timesheet created:,Φύλλο κατανομής χρόνου δημιουργήθηκε:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +772,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,Εγγράφω
 DocType: Selling Settings,Customer Naming By,Ονομασία πελάτη από
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Παρακαλούμε Υπάλληλος setup Ονοματοδοσία Σύστημα Ανθρώπινου Δυναμικού&gt; Ρυθμίσεις HR
 DocType: Depreciation Schedule,Depreciation Amount,αποσβέσεις Ποσό
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,Μετατροπή σε ομάδα
 DocType: Activity Cost,Activity Type,Τύπος δραστηριότητας
@@ -625,6 +634,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,Φινίρισμα
 DocType: Pricing Rule,Sales Manager,Διευθυντής πωλήσεων
 DocType: Salary Structure Employee,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,Ο λογαριασμός Κέρδος / Ζημιά από διάθεση περιουσιακών στοιχείων
@@ -639,11 +649,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +9,Pre Sales,Προπωλήσεις
 DocType: Purchase Receipt,Other Details,Άλλες λεπτομέρειες
 DocType: Account,Accounts,Λογαριασμοί
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Marketing,Marketing
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +227,Payment Entry is already created,Έναρξη Πληρωμής έχει ήδη δημιουργηθεί
+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,Έναρξη Πληρωμής έχει ήδη δημιουργηθεί
 DocType: Purchase Receipt Item Supplied,Current Stock,Τρέχον απόθεμα
-apps/erpnext/erpnext/controllers/accounts_controller.py +538,Row #{0}: Asset {1} does not linked to Item {2},Σειρά # {0}: Asset {1} δεν συνδέεται στη θέση {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +21,Preview Salary Slip,Preview Μισθός Slip
+apps/erpnext/erpnext/controllers/accounts_controller.py +541,Row #{0}: Asset {1} does not linked to Item {2},Σειρά # {0}: Asset {1} δεν συνδέεται στη θέση {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +38,Preview Salary Slip,Preview Μισθός Slip
 DocType: Company,Deafult Cost Center,Deafult Κέντρο Κόστους
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +48,Account {0} has been entered multiple times,Ο λογαριασμός {0} έχει τεθεί πολλές φορές
 DocType: Account,Expenses Included In Valuation,Δαπάνες που περιλαμβάνονται στην αποτίμηση
@@ -652,7 +662,7 @@
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,Επιλέξτε μια Ομάδα Φοιτητών
 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 +617,Item has variants.,Στοιχείο έχει παραλλαγές.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Στοιχείο έχει παραλλαγές.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,Το είδος {0} δεν βρέθηκε
 DocType: Bin,Stock Value,Αξία των αποθεμάτων
 apps/erpnext/erpnext/accounts/doctype/account/account.py +25,Company {0} does not exist,Η εταιρεία {0} δεν υπάρχει
@@ -672,7 +682,7 @@
 DocType: Purchase Order,Supply Raw Materials,Παροχή Πρώτων Υλών
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,Η ημερομηνία κατά την οποία θα δημιουργηθεί το επόμενο τιμολόγιο. Δημιουργείται με την υποβολή.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Τρέχον ενεργητικό
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,{0} is not a stock Item,Το {0} δεν είναι ένα αποθηκεύσιμο είδος
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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 +169,Lead must be set if Opportunity is made from Lead,Η επαφή πρέπει να οριστεί αν η ευκαιρία προέρχεται από επαφή
@@ -758,26 +768,25 @@
 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 +709,No Permission,Δεν έχετε άδεια
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +710,No Permission,Δεν έχετε άδεια
 DocType: Company,Default Bank Account,Προεπιλεγμένος τραπεζικός λογαριασμός
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Για να φιλτράρετε με βάση Κόμμα, επιλέξτε Τύπος Πάρτυ πρώτα"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"«Ενημέρωση Χρηματιστήριο» δεν μπορεί να ελεγχθεί, διότι τα στοιχεία δεν παραδίδονται μέσω {0}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,Αριθμοί
 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 +542,Row #{0}: Asset {1} must be submitted,Σειρά # {0}: Asset {1} πρέπει να υποβληθούν
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,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,Όλες οι επαφές πελάτη
 apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,Ανεβάστε υπόλοιπο αποθεμάτων μέσω csv.
 DocType: Warehouse,Tree Details,δέντρο Λεπτομέρειες
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Αποστολή τώρα
 ,Support Analytics,Στατιστικά στοιχεία υποστήριξης
 DocType: Item,Website Warehouse,Αποθήκη δικτυακού τόπου
 DocType: Payment Reconciliation,Minimum Invoice Amount,Ελάχιστο ποσό του τιμολογίου
 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/sales_invoice/sales_invoice.py +227,Timesheet {0} is already completed or cancelled,Φύλλο κατανομής χρόνου {0} έχει ήδη ολοκληρωθεί ή ακυρωθεί
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +259,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
@@ -793,13 +802,13 @@
 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 +229,Target Warehouse,Αποθήκη προορισμού
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +230,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-,STE-
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Sales Order Date,Η αναμενόμενη ημερομηνία παράδοσης δεν μπορεί να είναι προγενέστερη της ημερομηνίας παραγγελίας πωλήσεων
 DocType: Upload Attendance,Import Attendance,Εισαγωγή συμμετοχών
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Όλες οι ομάδες ειδών
+apps/erpnext/erpnext/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/config/setup.py +89,Automatically compose message on submission of transactions.,Αυτόματη σύνθεση μηνύματος για την υποβολή συναλλαγών .
@@ -811,13 +820,15 @@
 DocType: Sales Invoice,Payment Due Date,Ημερομηνία λήξης προθεσμίας πληρωμής
 apps/erpnext/erpnext/stock/doctype/item/item.js +278,Item Variant {0} already exists with same attributes,Θέση Παραλλαγή {0} υπάρχει ήδη με ίδια χαρακτηριστικά
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',«Άνοιγμα»
+apps/erpnext/erpnext/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,Τάσεις αποδεικτικού παραλαβής αγοράς
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Research & Development,Έρευνα & ανάπτυξη
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Έρευνα & ανάπτυξη
 ,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,Τιμή ή έκπτωση
@@ -826,7 +837,7 @@
 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/controllers/accounts_controller.py +340,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Έναρξη πληρωμής {0} συνδέεται κατά Παραγγελία {1}, ελέγξτε αν θα πρέπει να τραβηχτεί, όπως εκ των προτέρων σε αυτό το τιμολόγιο."
+apps/erpnext/erpnext/controllers/accounts_controller.py +343,"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
@@ -848,12 +859,12 @@
 DocType: Supplier Quotation,Is Subcontracted,Έχει ανατεθεί ως υπεργολαβία
 DocType: Item Attribute,Item Attribute Values,Τιμές χαρακτηριστικού είδους
 DocType: Examination Result,Examination Result,Αποτέλεσμα εξέτασης
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +756,Purchase Receipt,Αποδεικτικό παραλαβής αγοράς
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +735,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 +167,Reference Doctype must be one of {0},DocType αναφοράς πρέπει να είναι ένα από {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +282,Unable to find Time Slot in the next {0} days for Operation {1},Ανίκανος να βρει χρονοθυρίδα στα επόμενα {0} ημέρες για τη λειτουργία {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +170,Reference Doctype must be one of {0},DocType αναφοράς πρέπει να είναι ένα από {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Unable to find Time Slot in the next {0} days for Operation {1},Ανίκανος να βρει χρονοθυρίδα στα επόμενα {0} ημέρες για τη λειτουργία {1}
 DocType: Production Order,Plan material for sub-assemblies,Υλικό σχεδίου για τα υποσυστήματα
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Συνεργάτες πωλήσεων και Επικράτεια
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be active,Η Λ.Υ. {0} πρέπει να είναι ενεργή
@@ -864,7 +875,7 @@
 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 +214,Warehouses with existing transaction can not be converted to ledger.,Αποθήκες με τα υπάρχοντα συναλλαγής δεν μπορεί να μετατραπεί σε καθολικό.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +217,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,Εντολές παραγωγής
@@ -878,9 +889,9 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Ο υπάλληλος {0} δεν είναι ενεργός ή δεν υπάρχει
 DocType: Fee Structure,Components,εξαρτήματα
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,Please enter Asset Category in Item {0},"Παρακαλούμε, εισάγετε Asset Κατηγορία στη θέση {0}"
-apps/erpnext/erpnext/stock/doctype/item/item.py +612,Item Variants {0} updated,Οι παραλλαγές είδους {0} ενημερώθηκαν
+apps/erpnext/erpnext/stock/doctype/item/item.py +614,Item Variants {0} updated,Οι παραλλαγές είδους {0} ενημερώθηκαν
 DocType: Quality Inspection Reading,Reading 6,Μέτρηση 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +843,Cannot {0} {1} {2} without any negative outstanding invoice,"Δεν είναι δυνατή η {0} {1} {2}, χωρίς οποιαδήποτε αρνητική εκκρεμών τιμολογίων"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +854,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,Συγχρονισμός τώρα
@@ -895,69 +906,72 @@
 DocType: Item,Is Purchase Item,Είναι είδος αγοράς
 DocType: Asset,Purchase Invoice,Τιμολόγιο αγοράς
 DocType: Stock Ledger Entry,Voucher Detail No,Αρ. λεπτομερειών αποδεικτικού
-apps/erpnext/erpnext/accounts/page/pos/pos.js +728,New Sales Invoice,Νέο Τιμολόγιο πωλήσεων
+apps/erpnext/erpnext/accounts/page/pos/pos.js +710,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 +728,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,Όνομα Guardian
 DocType: Cheque Print Template,Has Print Format,Έχει Εκτύπωση Format
-apps/erpnext/erpnext/accounts/page/pos/pos.js +86, is mandatory. Maybe Currency Exchange record is not created for ,είναι υποχρεωτική. Ίσως συναλλάγματος αρχείο δεν έχει δημιουργηθεί για
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +109,Row #{0}: Please specify Serial No for Item {1},Γραμμή # {0}: παρακαλώ ορίστε σειριακό αριθμό για το είδος {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +619,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Για τα στοιχεία «Προϊόν Bundle», Αποθήκη, Αύξων αριθμός παρτίδας και Δεν θα θεωρηθεί από την «Packing List» πίνακα. Αν Αποθήκης και Μαζική Δεν είναι ίδιες για όλα τα είδη συσκευασίας για τη θέση του κάθε «Πακέτο Προϊόντων», οι αξίες αυτές μπορούν να εγγραφούν στον κύριο πίνακα Στοιχείο, οι τιμές θα αντιγραφούν στο «Packing List» πίνακα."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +75, 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 +613,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing 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 +606,Supplier Invoice Date cannot be greater than Posting Date,Τιμολόγιο προμηθευτή ημερομηνία αυτή δεν μπορεί να είναι μεγαλύτερη από την απόσπαση Ημερομηνία
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +609,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: 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 +810,Select Item for Transfer,Επιλογή στοιχείου για μεταφορά
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +789,Select Item for Transfer,Επιλογή στοιχείου για μεταφορά
 DocType: Purchase Invoice,Additional Discount Percentage,Πρόσθετες ποσοστό έκπτωσης
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Δείτε μια λίστα με όλα τα βίντεο βοήθειας
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Επιλέξτε την κύρια εγγραφή λογαριασμού της τράπεζας όπου κατατέθηκε η επιταγή.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Επίτρεψε στο χρήστη να επεξεργάζεται τιμές τιμοκατάλογου στις συναλλαγές
 DocType: Pricing Rule,Max Qty,Μέγιστη ποσότητα
-DocType: Student Applicant,Father's Name,Το όνομα του πατέρα
 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 +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Γραμμή {0}:η πληρωμή έναντι πωλήσεων / παραγγελιών αγοράς θα πρέπει πάντα να επισημαίνεται ως προκαταβολή
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Χημικό
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +686,All items have already been transferred for this Production Order.,Όλα τα είδη έχουν ήδη μεταφερθεί για αυτήν την εντολή παραγωγής.
+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} και προσπαθήστε ξανά
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +694,All items have already been transferred for this Production Order.,Όλα τα είδη έχουν ήδη μεταφερθεί για αυτήν την εντολή παραγωγής.
 DocType: Process Payroll,Select Payroll Year and Month,Επιλέξτε Μισθοδοσίας Έτος και Μήνας
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,Meter,Μέτρο
 DocType: Workstation,Electricity Cost,Κόστος ηλεκτρικής ενέργειας
 DocType: HR Settings,Don't send Employee Birthday Reminders,Μην στέλνετε υπενθυμίσεις γενεθλίων υπαλλήλου
-DocType: Opportunity,Walk In,Προχωρήστε
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,Χρηματιστήριο Καταχωρήσεις
 DocType: Item,Inspection Criteria,Κριτήρια ελέγχου
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Μεταφέρονται
 apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,Ανεβάστε την κεφαλίδα επιστολόχαρτου και το λογότυπό σας. (Μπορείτε να τα επεξεργαστείτε αργότερα).
 DocType: Timesheet Detail,Bill,Νομοσχέδιο
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,White,Λευκό
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date is entered as past date,Επόμενο αποσβέσεις Ημερομηνία εισάγεται ως τελευταία ημερομηνία
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +167,White,Λευκό
 DocType: SMS Center,All Lead (Open),Όλες οι επαφές (ανοιχτές)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +228,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Σειρά {0}: Ποσότητα δεν είναι διαθέσιμη για {4} στην αποθήκη {1} στην απόσπαση χρόνο έναρξης ({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}),Σειρά {0}: Ποσότητα δεν είναι διαθέσιμη για {4} στην αποθήκη {1} στην απόσπαση χρόνο έναρξης ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,Βρες προκαταβολές που καταβλήθηκαν
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +731,Make ,Δημιούργησε
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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 +154,Order Type must be one of {0},Ο τύπος παραγγελίας πρέπει να είναι ένα από τα {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Ο τύπος παραγγελίας πρέπει να είναι ένα από τα {0}
 DocType: Lead,Next Contact Date,Ημερομηνία επόμενης επικοινωνίας
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Αρχική ποσότητα
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +393,Please enter Account for Change Amount,"Παρακαλούμε, εισάγετε Λογαριασμού για την Αλλαγή Ποσό"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,Please enter Account for Change Amount,"Παρακαλούμε, εισάγετε Λογαριασμού για την Αλλαγή Ποσό"
 DocType: Student Batch,Student Batch Name,Φοιτητής παρτίδας Όνομα
 DocType: Holiday List,Holiday List Name,Όνομα λίστας αργιών
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js +8,Schedule Course,Μάθημα πρόγραμμα
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Stock Options,Δικαιώματα Προαίρεσης
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Δικαιώματα Προαίρεσης
 DocType: Journal Entry Account,Expense Claim,Αξίωση δαπανών
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +211,Do you really want to restore this scrapped asset?,Θέλετε πραγματικά να επαναφέρετε αυτή τη διάλυση των περιουσιακών στοιχείων;
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +237,Qty for {0},Ποσότητα για {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +212,Do you really want to restore this scrapped asset?,Θέλετε πραγματικά να επαναφέρετε αυτή τη διάλυση των περιουσιακών στοιχείων;
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,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,Ημερομηνίες λίστας αποκλεισμού ημερών άδειας
@@ -966,9 +980,9 @@
 DocType: Company,Default Terms,Προεπιλογή Όροι
 DocType: Packing Slip Item,Packing Slip Item,Είδος δελτίου συσκευασίας
 DocType: Purchase Invoice,Cash/Bank Account,Λογαριασμός μετρητών/τραπέζης
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Που αφαιρούνται χωρίς καμία αλλαγή στην ποσότητα ή την αξία.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Που αφαιρούνται χωρίς καμία αλλαγή στην ποσότητα ή την αξία.
 DocType: Delivery Note,Delivery To,Παράδοση προς
-apps/erpnext/erpnext/stock/doctype/item/item.py +635,Attribute table is mandatory,Τραπέζι χαρακτηριστικό γνώρισμα είναι υποχρεωτικό
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Τραπέζι χαρακτηριστικό γνώρισμα είναι υποχρεωτικό
 DocType: Production Planning Tool,Get Sales Orders,Βρες παραγγελίες πώλησης
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,Η {0} δεν μπορεί να είναι αρνητική
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,Επιλέξτε ένα φοιτητή
@@ -993,7 +1007,7 @@
 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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Ο σειριακός αριθμός {0} έχει σύμβαση συντήρησης σε ισχύ μέχρι {1}
+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,Όνομα οργανισμού
@@ -1005,7 +1019,7 @@
 DocType: GL Entry,Against,Κατά
 DocType: Item,Default Selling Cost Center,Προεπιλεγμένο κέντρο κόστους πωλήσεων
 DocType: Sales Partner,Implementation Partner,Συνεργάτης υλοποίησης
-apps/erpnext/erpnext/controllers/selling_controller.py +231,Sales Order {0} is {1},Πωλήσεις Τάξης {0} είναι {1}
+apps/erpnext/erpnext/controllers/selling_controller.py +232,Sales Order {0} is {1},Πωλήσεις Τάξης {0} είναι {1}
 DocType: Opportunity,Contact Info,Πληροφορίες επαφής
 apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,Κάνοντας Χρηματιστήριο Καταχωρήσεις
 DocType: Packing Slip,Net Weight UOM,Μ.Μ. Καθαρού βάρους
@@ -1015,25 +1029,24 @@
 DocType: Holiday List,Get Weekly Off Dates,Βρες ημερομηνίες εβδομαδιαίων αργιών
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Η ημερομηνία λήξης δεν μπορεί να είναι προγενέστερη της ημερομηνίας έναρξης
 DocType: Sales Person,Select company name first.,Επιλέξτε το όνομα της εταιρείας πρώτα.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Προσφορές που λήφθηκαν από προμηθευτές.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},Έως {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Μέσος όρος ηλικίας
 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/templates/pages/home.html +32,View All Products,Δείτε όλα τα προϊόντα
+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 +400,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Προσοχή : το σύστημα δεν θα ελέγξει για υπερτιμολογήσεις εφόσον το ποσό για το είδος {0} {1} είναι μηδέν
+apps/erpnext/erpnext/controllers/accounts_controller.py +403,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/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,και το έτος:
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +191,{0} {1} must be submitted,{0} {1} Πρέπει να υποβληθεί
-DocType: Email Digest,Annual Expense,Ετήσια Δαπάνη
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,{0} {1} must be submitted,{0} {1} Πρέπει να υποβληθεί
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +145,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}
@@ -1044,30 +1057,31 @@
 DocType: Sales Partner,Distributor,Διανομέας
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Κανόνες αποστολής καλαθιού αγορών
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +211,Production Order {0} must be cancelled before cancelling this Sales Order,Η εντολή παραγωγής {0} πρέπει να ακυρωθεί πριν από την ακύρωση αυτής της παραγγελίας πώλησης
-apps/erpnext/erpnext/public/js/controllers/transaction.js +62,Please set 'Apply Additional Discount On',Παρακαλούμε να ορίσετε «Εφαρμόστε επιπλέον έκπτωση On»
+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,"Από το φάσμα πρέπει να είναι μικρότερη από ό, τι στην γκάμα"
 DocType: Global Defaults,Global Defaults,Καθολικές προεπιλογές
 apps/erpnext/erpnext/projects/doctype/project/project.py +153,Project Collaboration Invitation,Συνεργασία Πρόσκληση έργου
 DocType: Salary Slip,Deductions,Κρατήσεις
+DocType: Leave Allocation,LAL/,LAL /
 apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,Έτος έναρξης
 DocType: Purchase Invoice,Start date of current invoice's period,Ημερομηνία έναρξης της περιόδου του τρέχοντος τιμολογίου
 DocType: Salary Slip,Leave Without Pay,Άδεια άνευ αποδοχών
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +327,Capacity Planning Error,Χωρητικότητα Σφάλμα Προγραμματισμού
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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 +362,Finished Item {0} must be entered for Manufacture type entry,Ολοκληρώθηκε Θέση {0} πρέπει να εισαχθούν για την είσοδο τύπου Κατασκευή
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +367,Finished Item {0} must be entered for Manufacture type entry,Ολοκληρώθηκε Θέση {0} πρέπει να εισαχθούν για την είσοδο τύπου Κατασκευή
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Άνοιγμα λογιστικό υπόλοιπο
 DocType: Sales Invoice Advance,Sales Invoice Advance,Προκαταβολή τιμολογίου πώλησης
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +499,Nothing to request,Τίποτα να ζητηθεί
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +500,Nothing to request,Τίποτα να ζητηθεί
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',Η πραγματική ημερομηνία έναρξης δεν μπορεί να είναι μεταγενέστερη της πραγματικής ημερομηνίας λήξης
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Management,Διαχείριση
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},Το ποσό χρέωσης ή πίστωσης είναι απαραίτητο για {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,Διαχείριση
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +55,Either debit or credit amount is required for {0},Το ποσό χρέωσης ή πίστωσης είναι απαραίτητο για {0}
 DocType: Cheque Print Template,Payer Settings,Ρυθμίσεις πληρωτή
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Αυτό θα πρέπει να επισυνάπτεται στο κφδικό είδους της παραλλαγής. Για παράδειγμα, εάν η συντομογραφία σας είναι «sm» και ο κωδικός του είδους είναι ""t-shirt"", ο κωδικός του της παραλλαγής του είδους θα είναι ""t-shirt-sm"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Οι καθαρές αποδοχές (ολογράφως) θα είναι ορατές τη στιγμή που θα αποθηκεύσετε τη βεβαίωση αποδοχών
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,Blue,Μπλε
+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
@@ -1077,12 +1091,12 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +23,POS Profile {0} already created for user: {1} and company {2},POS Προφίλ {0} έχει ήδη δημιουργηθεί για το χρήστη: {1} και την παρέα {2}
 DocType: Purchase Order Item,UOM Conversion Factor,Συντελεστής μετατροπής Μ.Μ.
 DocType: Stock Settings,Default Item Group,Προεπιλεγμένη ομάδα ειδών
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1374,Do you really want to submit the invoice?,Θέλετε πραγματικά να υποβάλει το τιμολόγιο;
+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 +685,Cost Center For Item with Item Code ',Κέντρο κόστους για το είδος με το κωδικό είδους '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1526,"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 +679,Cost Center For Item with Item Code ',Κέντρο κόστους για το είδος με το κωδικό είδους '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1550,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Τρόπος πληρωμής δεν έχει ρυθμιστεί. Παρακαλώ ελέγξτε, εάν ο λογαριασμός έχει τεθεί σε λειτουργία πληρωμών ή σε POS προφίλ."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Ο πωλητής σας θα λάβει μια υπενθύμιση την ημερομηνία αυτή για να επικοινωνήσει με τον πελάτη
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,"Further accounts can be made under Groups, but entries can be made against non-Groups","Περαιτέρω λογαριασμών μπορούν να γίνουν στις ομάδες, αλλά εγγραφές μπορούν να γίνουν με την μη Ομάδες"
 DocType: Lead,Lead,Επαφή
@@ -1102,104 +1116,106 @@
 DocType: Payment Reconciliation,Unreconciled Payment Details,Μη συμφωνημένες λεπτομέρειες πληρωμής
 DocType: Global Defaults,Current Fiscal Year,Τρέχουσα χρήση
 DocType: Global Defaults,Disable Rounded Total,Απενεργοποίηση στρογγυλοποίησης συνόλου
-DocType: Lead,Call,Κλήση
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +417,'Entries' cannot be empty,Οι καταχωρήσεις δεν μπορεί να είναι κενές
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +418,'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 +214,Fiscal Year {0} not found,Φορολογικό Έτος {0} δεν βρέθηκε
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +221,Fiscal Year {0} not found,Φορολογικό Έτος {0} δεν βρέθηκε
 apps/erpnext/erpnext/config/hr.py +238,Setting up Employees,Ρύθμιση εργαζόμενοι
 DocType: Sales Order,SO-,ΈΤΣΙ-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Παρακαλώ επιλέξτε πρόθεμα πρώτα
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Please select prefix first,Παρακαλώ επιλέξτε πρόθεμα πρώτα
 DocType: Employee,O-,Ο-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Research,Έρευνα
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,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 +43,Item {0} must be a non-stock item,Στοιχείο {0} πρέπει να είναι ένα στοιχείο που δεν απόθεμα
 DocType: Contact,User ID,ID χρήστη
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +57,View Ledger,Προβολή καθολικού
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Η πιο παλιά
-apps/erpnext/erpnext/stock/doctype/item/item.py +504,"An Item Group exists with same name, please change the item name or rename the item group","Μια ομάδα ειδών υπάρχει με το ίδιο όνομα, μπορείτε να αλλάξετε το όνομα του είδους ή να μετονομάσετε την ομάδα ειδών"
+apps/erpnext/erpnext/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 +437,Rest Of The World,Τρίτες χώρες
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,Το είδος {0} δεν μπορεί να έχει παρτίδα
 ,Budget Variance Report,Έκθεση διακύμανσης του προϋπολογισμού
 DocType: Salary Slip,Gross Pay,Ακαθάριστες αποδοχές
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +90,Row {0}: Activity Type is mandatory.,Σειρά {0}: Τύπος δραστηριότητας είναι υποχρεωτική.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +114,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/public/js/controllers/stock_controller.js +40,Accounting Ledger,Λογιστική Λογιστική
+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,Αδιανέμητα Κέρδη
 DocType: BOM Item,Item Description,Περιγραφή είδους
+DocType: Student Sibling,Student Sibling,φοιτητής Αδέλφια
 DocType: Purchase Invoice,Is Recurring,Είναι επαναλαμβανόμενo
 DocType: Purchase Invoice,Supplied Items,Προμηθευόμενα είδη
 DocType: Student,STUD.,ΚΟΥΜΠΊ ΚΟΛΆΡΟΥ.
 DocType: Production Order,Qty To Manufacture,Ποσότητα για κατασκευή
+DocType: Email Digest,New Income,νέα εισοδήματος
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Διατηρήστε ίδια τιμολόγηση καθ'όλο τον κύκλο αγορών
 DocType: Opportunity Item,Opportunity Item,Είδος ευκαιρίας
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,Προσωρινό άνοιγμα
 ,Employee Leave Balance,Υπόλοιπο αδείας υπαλλήλου
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +131,Balance for Account {0} must always be {1},Το υπόλοιπο λογαριασμού {0} πρέπει να είναι πάντα {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +175,Valuation Rate required for Item in row {0},Αποτίμηση Βαθμολογήστε που απαιτούνται για τη θέση στη γραμμή {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,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,Παράδειγμα: Μάστερ στην Επιστήμη των Υπολογιστών
 DocType: Purchase Invoice,Rejected Warehouse,Αποθήκη απορριφθέντων
 DocType: GL Entry,Against Voucher,Κατά το αποδεικτικό
 DocType: Item,Default Buying Cost Center,Προεπιλεγμένο κέντρο κόστους αγορών
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","Για να πάρετε το καλύτερο από ERPNext, σας συνιστούμε να πάρει κάποιο χρόνο και να παρακολουθήσουν αυτά τα βίντεο βοήθεια."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +87, to ,να
+apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,να
 DocType: Item,Lead Time in days,Χρόνος των ημερών
 ,Accounts Payable Summary,Σύνοψη πληρωτέων λογαριασμών
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Not authorized to edit frozen Account {0},Δεν επιτρέπεται να επεξεργαστείτε τον παγωμένο λογαριασμό {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},Δεν επιτρέπεται να επεξεργαστείτε τον παγωμένο λογαριασμό {0}
 DocType: Journal Entry,Get Outstanding Invoices,Βρες εκκρεμή τιμολόγια
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +62,Sales Order {0} is not valid,Η παραγγελία πώλησης {0} δεν είναι έγκυρη
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Η παραγγελία πώλησης {0} δεν είναι έγκυρη
 apps/erpnext/erpnext/setup/doctype/company/company.py +185,"Sorry, companies cannot be merged","Δυστυχώς, οι εταιρείες δεν μπορούν να συγχωνευθούν"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +139,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}","Η συνολική ποσότητα Issue / Μεταφορά {0} στο Αίτημα Υλικό {1} \ δεν μπορεί να είναι μεγαλύτερη από ό, τι ζητήσατε ποσότητα {2} για τη θέση {3}"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Small,Μικρό
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,Small,Μικρό
 DocType: Employee,Employee Number,Αριθμός υπαλλήλων
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Ο αρ. υπόθεσης χρησιμοποιείται ήδη. Δοκιμάστε από τον αρ. υπόθεσης {0}
 ,Invoiced Amount (Exculsive Tax),Ποσό τιμολόγησης (χωρίς φπα)
-DocType: Student Applicant,Mother's / Guardian 1 Email ID,/ Guardian ID 1 Email Μητέρας
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Στοιχείο 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,Η κύρια εγγραφή λογαριασμού {0} δημιουργήθηκε
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +160,Green,Πράσινος
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,Πράσινος
 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 +57,Contract,Συμβόλαιο
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,Συμβόλαιο
 DocType: Email Digest,Add Quote,Προσθήκη Παράθεση
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +498,UOM coversion factor required for UOM: {0} in Item: {1},Ο παράγοντας μετατροπής Μ.Μ. απαιτείται για τη Μ.Μ.: {0} στο είδος: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +503,UOM coversion factor required for UOM: {0} in Item: {1},Ο παράγοντας μετατροπής Μ.Μ. απαιτείται για τη Μ.Μ.: {0} στο είδος: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,Έμμεσες δαπάνες
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +80,Row {0}: Qty is mandatory,Γραμμή {0}: η ποσότητα είναι απαραίτητη
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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 +737,Sync Master Data,Συγχρονισμός Δεδομένα Βασικού Αρχείου
+apps/erpnext/erpnext/accounts/page/pos/pos.js +719,Sync Master Data,Συγχρονισμός Δεδομένα Βασικού Αρχείου
 apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,Τα προϊόντα ή οι υπηρεσίες σας
 DocType: Mode of Payment,Mode of Payment,Τρόπος πληρωμής
 apps/erpnext/erpnext/stock/doctype/item/item.py +178,Website Image should be a public file or website URL,Ιστοσελίδα εικόνας θα πρέπει να είναι ένα δημόσιο αρχείο ή URL της ιστοσελίδας
+DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Αυτή είναι μια κύρια ομάδα ειδών και δεν μπορεί να επεξεργαστεί.
+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,Γράψτε Off Διαφορά Ποσό
 DocType: Purchase Invoice,Recurring Type,Τύπος επαναλαμβανόμενου
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +345,"{0}: Employee email not found, hence email not sent","{0}: email Υπάλληλος δεν βρέθηκε, ως εκ τούτου, δεν ηλεκτρονικού ταχυδρομείου αποστέλλονται"
+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,Η εταιρεία σας Διεύθυνση
 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 +118,"For {0}, only credit accounts can be linked against another debit entry","Για {0}, μόνο πιστωτικοί λογαριασμοί μπορούν να συνδέονται με άλλες καταχωρήσεις χρέωσης"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Delivery Note {0} is not submitted,Το δελτίο αποστολής {0} δεν έχει υποβληθεί
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Delivery Note {0} is not submitted,Το δελτίο αποστολής {0} δεν έχει υποβληθεί
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Sub-contracted Item,Το είδος {0} πρέπει να είναι είδος υπεργολαβίας
 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,Ιστοσελίδα πωλητή
 DocType: Item,ITEM-,ΕΊΔΟΣ-
-apps/erpnext/erpnext/controllers/selling_controller.py +147,Total allocated percentage for sales team should be 100,Το σύνολο των κατανεμημέωνων ποσοστών για την ομάδα πωλήσεων πρέπει να είναι 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +110,Production Order status is {0},Η κατάσταση της εντολής παραγωγής είναι {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Το σύνολο των κατανεμημέωνων ποσοστών για την ομάδα πωλήσεων πρέπει να είναι 100
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Η κατάσταση της εντολής παραγωγής είναι {0}
 DocType: Appraisal Goal,Goal,Στόχος
 DocType: Sales Invoice Item,Edit Description,Επεξεργασία Περιγραφή
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +757,For Supplier,Για προμηθευτή
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +723,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
@@ -1215,10 +1231,11 @@
 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,Βαθμολογία Κωδικός
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Στείλτε ενημερωτικό άρθρο email:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +445,BOM {0} does not belong to Item {1},Η Λ.Υ. {0} δεν ανήκει στο είδος {1}
 DocType: Sales Partner,Target Distribution,Στόχος διανομής
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1667,Deafault warehouse is required for selected item,Deafault αποθήκη απαιτείται για επιλεγμένο στοιχείο
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Deafault warehouse is required for selected item,Deafault αποθήκη απαιτείται για επιλεγμένο στοιχείο
 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
@@ -1227,23 +1244,23 @@
 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 +110,Hardware,Hardware
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,Hardware
 DocType: Sales Order,Recurring Upto,επαναλαμβανόμενες Μέχρι
 DocType: Attendance,HR Manager,Υπεύθυνος ανθρωπίνου δυναμικού
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Παρακαλώ επιλέξτε ένα Εταιρείας
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Privilege Leave,Άδεια μετ' αποδοχών
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,Άδεια μετ' αποδοχών
 DocType: Purchase Invoice,Supplier Invoice Date,Ημερομηνία τιμολογίου του προμηθευτή
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Χρειάζεται να ενεργοποιήσετε το καλάθι αγορών
 DocType: Payment Entry,Writeoff,Διαγράφω
 DocType: Appraisal Template Goal,Appraisal Template Goal,Στόχος προτύπου αξιολόγησης
-DocType: Salary Slip,Earning,Κέρδος
+DocType: Salary Component,Earning,Κέρδος
 DocType: Purchase Invoice,Party Account Currency,Κόμμα Λογαριασμού Νόμισμα
 ,BOM Browser,BOM 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 +171,Against Journal Entry {0} is already adjusted against some other voucher,Κατά την ημερολογιακή εγγραφή {0} έχει ήδη ρυθμιστεί από κάποιο άλλο αποδεικτικό
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,Κατά την ημερολογιακή εγγραφή {0} έχει ήδη ρυθμιστεί από κάποιο άλλο αποδεικτικό
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Συνολική αξία της παραγγελίας
-apps/erpnext/erpnext/demo/setup_data.py +358,Food,Τροφή
+apps/erpnext/erpnext/demo/setup/setup_data.py +301,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/course_schedule/course_schedule.js +103,Mark Attendence,Mark attendence
@@ -1277,12 +1294,12 @@
 DocType: Sales Order Item,Planned Quantity,Προγραμματισμένη ποσότητα
 DocType: Purchase Invoice Item,Item Tax Amount,Ποσό φόρου είδους
 DocType: Item,Maintain Stock,Διατηρήστε Χρηματιστήριο
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +209,Stock Entries already created for Production Order ,Έχουν ήδη δημιουργηθεί καταχωρήσεις αποθέματος για την εντολή παραγωγής
+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,Καθαρή Αλλαγή στο Παγίων
 DocType: Leave Control Panel,Leave blank if considered for all designations,Άφησε το κενό αν ισχύει για όλες τις ονομασίες
-apps/erpnext/erpnext/controllers/accounts_controller.py +620,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Η επιβάρυνση του τύπου 'πραγματική' στη γραμμή {0} δεν μπορεί να συμπεριληφθεί στην τιμή είδους
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,Max: {0},Μέγιστο: {0}
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +15,From Datetime,Από ημερομηνία και ώρα
+apps/erpnext/erpnext/controllers/accounts_controller.py +623,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Η επιβάρυνση του τύπου 'πραγματική' στη γραμμή {0} δεν μπορεί να συμπεριληφθεί στην τιμή είδους
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +239,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 +153,"Request for Quotation is disabled to access from portal, for more check portal settings.","Αίτηση Προσφοράς είναι απενεργοποιημένη η πρόσβαση από την πύλη, για περισσότερες ρυθμίσεις πύλης ελέγχου."
@@ -1290,8 +1307,8 @@
 DocType: Sales Invoice,Shipping Address Name,Όνομα διεύθυνσης αποστολής
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,Λογιστικό σχέδιο
 DocType: Material Request,Terms and Conditions Content,Περιεχόμενο όρων και προϋποθέσεων
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +552,cannot be greater than 100,Δεν μπορεί να είναι μεγαλύτερη από 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +680,Item {0} is not a stock Item,Το είδος {0} δεν είναι ένα αποθηκεύσιμο είδος
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +546,cannot be greater than 100,Δεν μπορεί να είναι μεγαλύτερη από 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is not a stock Item,Το είδος {0} δεν είναι ένα αποθηκεύσιμο είδος
 DocType: Maintenance Visit,Unscheduled,Έκτακτες
 DocType: Employee,Owned,Ανήκουν
 DocType: Salary Detail,Depends on Leave Without Pay,Εξαρτάται από άδειας άνευ αποδοχών
@@ -1305,10 +1322,9 @@
 DocType: GL Entry,GL Entry,Καταχώρηση gl
 DocType: HR Settings,Employee Settings,Ρυθμίσεις των υπαλλήλων
 ,Batch-Wise Balance History,Ιστορικό υπολοίπων παρτίδας
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Λίστα εκκρεμών εργασιών
 apps/erpnext/erpnext/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 +61,Apprentice,Μαθητευόμενος
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +102,Negative Quantity is not allowed,Δεν επιτρέπεται αρνητική ποσότητα
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,Μαθητευόμενος
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +103,Negative Quantity is not allowed,Δεν επιτρέπεται αρνητική ποσότητα
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",Ο πίνακας λεπτομερειών φόρου υπολογίζεται από την κύρια εγγραφή του είδους σαν αλφαριθμητικό και αποθηκεύεται σε αυτό το πεδίο. Χρησιμοποιείται για φόρους και τέλη
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +152,Employee cannot report to himself.,Ο υπάλληλος δεν μπορεί να αναφέρει στον ευατό του.
@@ -1329,15 +1345,14 @@
 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 +141,Source warehouse is mandatory for row {0},Η αποθήκη προέλευσης είναι απαραίτητη για τη σειρά {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +719,Packing Slip,Δελτίο συσκευασίας
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Source warehouse is mandatory for row {0},Η αποθήκη προέλευσης είναι απαραίτητη για τη σειρά {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +713,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/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,Αίτηση για προσφορά μπορεί να είναι η πρόσβαση κάνοντας κλικ παρακάτω σύνδεσμο
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Η εισαγωγή απέτυχε!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Δεν δημιουργήθηκαν διευθύνσεις
 DocType: Workstation Working Hour,Workstation Working Hour,Ώρες εργαασίας σταθμού εργασίας
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Analyst,Αναλυτής
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,Αναλυτής
 DocType: Item,Inventory,Απογραφή
 DocType: Item,Sales Details,Λεπτομέρειες πωλήσεων
 DocType: Quality Inspection,QI-,QI-
@@ -1345,7 +1360,7 @@
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,Στην ποσότητα
 DocType: Notification Control,Expense Claim Rejected,Η αξίωσης δαπανών απορρίφθηκε
 DocType: Item Attribute,Item Attribute,Χαρακτηριστικό είδους
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +103,Government,Κυβέρνηση
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,Κυβέρνηση
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,όνομα Ινστιτούτου
 apps/erpnext/erpnext/config/stock.py +289,Item Variants,Παραλλαγές του Είδους
 DocType: Company,Services,Υπηρεσίες
@@ -1361,6 +1376,7 @@
 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/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,Ταμειακές ροές από επενδυτικές
 DocType: Program Course,Program Course,Πορεία του προγράμματος
@@ -1401,12 +1417,12 @@
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Η λίστα παραλήπτη είναι άδεια. Παρακαλώ δημιουργήστε λίστα παραλήπτη
 DocType: Production Plan Sales Order,Production Plan Sales Order,Παραγγελία πώλησης σχεδίου παραγωγής
 DocType: Sales Partner,Sales Partner Target,Στόχος συνεργάτη πωλήσεων
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +110,Accounting Entry for {0} can only be made in currency: {1},Λογιστική καταχώριση για {0} μπορεί να γίνει μόνο στο νόμισμα: {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Λογιστική καταχώριση για {0} μπορεί να γίνει μόνο στο νόμισμα: {1}
 DocType: Pricing Rule,Pricing Rule,Κανόνας τιμολόγησης
 DocType: Budget,Action if Annual Budget Exceeded,Δράση αν ετήσιος προϋπολογισμός του ξεπερνούσε
 apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Υλικό αίτηση για αγορά Παραγγελία
 DocType: Shopping Cart Settings,Payment Success URL,Πληρωμή επιτυχία URL
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +78,Row # {0}: Returned Item {1} does not exists in {2} {3},Σειρά # {0}: επιστρεφόμενο στοιχείο {1} δεν υπάρχει σε {2} {3}
+apps/erpnext/erpnext/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,Δήλωση συμφωνίας τραπεζικού λογαριασμού
@@ -1415,40 +1431,39 @@
 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/stock/doctype/stock_entry/stock_entry.py +339,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Δεν επιτρέπεται να μεταφέρουμε περισσότερο {0} από {1} εναντίον παραγγελίας {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +344,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Δεν επιτρέπεται να μεταφέρουμε περισσότερο {0} από {1} εναντίον παραγγελίας {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Οι άδειες κατανεμήθηκαν επιτυχώς για {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Δεν βρέθηκαν είδη για συσκευασία
 DocType: Shipping Rule Condition,From Value,Από τιμή
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +545,Manufacturing Quantity is mandatory,Η παραγόμενη ποσότητα είναι απαραίτητη
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,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 +71,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 +162,Row {0}: From Time and To Time of {1} is overlapping with {2},Σειρά {0}: από το χρόνο και την ώρα της {1} είναι η επικάλυψη με {2}
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +186,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,Υποχρεώσεις αποθέματος
 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 +130,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 +137,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,άλλες εκθέσεις
 DocType: Dependent Task,Dependent Task,Εξαρτημένη Εργασία
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Παρακαλούμε Υπάλληλος setup Ονοματοδοσία Σύστημα Ανθρώπινου Δυναμικού&gt; Ρυθμίσεις HR
 apps/erpnext/erpnext/stock/doctype/item/item.py +411,Conversion factor for default Unit of Measure must be 1 in row {0},Ο συντελεστής μετατροπής για την προεπιλεγμένη μονάδα μέτρησης πρέπει να είναι 1 στη γραμμή {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,Leave of type {0} cannot be longer than {1},Η άδεια του τύπου {0} δεν μπορεί να είναι μεγαλύτερη από {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +197,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 +921,Search Item,Αναζήτηση Είδους
+apps/erpnext/erpnext/accounts/page/pos/pos.js +910,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 +546,Already completed,έχουν ήδη ολοκληρωθεί
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +22,Payment Request already exists {0},Αίτηση Πληρωμής υπάρχει ήδη {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +550,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 +241,Quantity must not be more than {0},Η ποσότητα δεν πρέπει να είναι μεγαλύτερη από {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Quantity must not be more than {0},Η ποσότητα δεν πρέπει να είναι μεγαλύτερη από {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +76,Previous Financial Year is not closed,Προηγούμενο οικονομικό έτος δεν έχει κλείσει
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +44,Age (Days),Ηλικία (ημέρες)
 DocType: Quotation Item,Quotation Item,Είδος προσφοράς
@@ -1465,7 +1480,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +221,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.","Ρυθμίσεις για το online καλάθι αγορών, όπως οι κανόνες αποστολής, ο τιμοκατάλογος κλπ"
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +83,{0}% Billed,{0}% Χρεώθηκαν
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}% Χρεώθηκαν
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Δεσμευμένη ποσότητα
 DocType: Party Account,Party Account,Λογαριασμός συμβαλλόμενου
 apps/erpnext/erpnext/config/setup.py +116,Human Resources,Ανθρώπινοι πόροι
@@ -1477,12 +1492,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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 +22,Collect,Συλλέγω
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Συλλέγω
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,Against Supplier Invoice {0} dated {1},Κατά το τιμολόγιο προμηθευτή {0} της {1}
 DocType: Customer,Default Price List,Προεπιλεγμένος τιμοκατάλογος
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +225,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: Payment Reconciliation,Payments,Πληρωμές
 DocType: Journal Entry,Entry Type,Τύπος εισόδου
 ,Customer Credit Balance,Υπόλοιπο πίστωσης πελάτη
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Payable,Καθαρή Αλλαγή πληρωτέων λογαριασμών
@@ -1494,7 +1508,7 @@
 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 +9,Procurement,Προμήθεια
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,Κανένα από τα στοιχεία που έχουν οποιαδήποτε μεταβολή στην ποσότητα ή την αξία.
+apps/erpnext/erpnext/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,Αξίωση εγγύησης
 ,Lead Details,Λεπτομέρειες επαφής
 DocType: Purchase Invoice,End date of current invoice's period,Ημερομηνία λήξης της περιόδου του τρέχοντος τιμολογίου
@@ -1519,7 +1533,7 @@
 DocType: Purchase Invoice,Additional Discount,Επιπλέον έκπτωση
 DocType: Selling Settings,Selling Settings,Ρυθμίσεις πώλησης
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Online δημοπρασίες
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +97,Please specify either Quantity or Valuation Rate or both,Παρακαλώ ορίστε είτε ποσότητα ή τιμή αποτίμησης ή και τα δύο
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,Παρακαλώ ορίστε είτε ποσότητα ή τιμή αποτίμησης ή και τα δύο
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +13,Fulfillment,Εκπλήρωση
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Η εταιρεία, ο μήνας και η χρήση είναι απαραίτητα"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Δαπάνες marketing
@@ -1540,14 +1554,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,Ρύθμιση ERPNext Πλήρης!
 DocType: Item,Weightage,Ζύγισμα
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +93,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Μια ομάδα πελατών υπάρχει με το ίδιο όνομα παρακαλώ να αλλάξετε το όνομα του πελάτη ή να μετονομάσετε την ομάδα πελατών
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +126,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Μια ομάδα πελατών υπάρχει με το ίδιο όνομα παρακαλώ να αλλάξετε το όνομα του πελάτη ή να μετονομάσετε την ομάδα πελατών
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Νέα Επικοινωνία
 DocType: Territory,Parent Territory,Έδαφος μητρική
 DocType: Quality Inspection Reading,Reading 2,Μέτρηση 2
 DocType: Stock Entry,Material Receipt,Παραλαβή υλικού
 DocType: Homepage,Products,Προϊόντα
 DocType: Announcement,Instructor,Εκπαιδευτής
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},Ο τύπος συμβαλλομένου και ο συμβαλλόμενος είναι απαραίτητα για τον λογαριασμό εισπρακτέων / πληρωτέων {0}
 DocType: Employee,AB+,ΑΒ +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Εάν αυτό το στοιχείο έχει παραλλαγές, τότε δεν μπορεί να επιλεγεί σε εντολές πώλησης κ.λπ."
 DocType: Lead,Next Contact By,Επόμενη επικοινωνία από
@@ -1558,7 +1571,7 @@
 ,Item-wise Sales Register,Ταμείο πωλήσεων ανά είδος
 DocType: Asset,Gross Purchase Amount,Ακαθάριστο Ποσό Αγορά
 DocType: Asset,Depreciation Method,Μέθοδος απόσβεσης
-apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Offline,offline
+apps/erpnext/erpnext/accounts/page/pos/pos.js +686,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,Απαιτείται
@@ -1576,25 +1589,27 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +425,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 +858,Make Purchase Order,Δημιούργησε παραγγελία αγοράς
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +852,Make Purchase Order,Δημιούργησε παραγγελία αγοράς
 DocType: SMS Center,Send To,Αποστολή προς
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,There is not enough leave balance for Leave Type {0},Δεν υπάρχει αρκετό υπόλοιπο άδειας για άδειες τύπου {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,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 +172,Work-in-Progress Warehouse is required before Submit,Η αποθήκη εργασιών σε εξέλιξηαπαιτείται πριν την υποβολή
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,Work-in-Progress Warehouse is required before Submit,Η αποθήκη εργασιών σε εξέλιξηαπαιτείται πριν την υποβολή
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Αιτών εργασία
 DocType: Purchase Order Item,Warehouse and Reference,Αποθήκη και αναφορά
 DocType: Supplier,Statutory info and other general information about your Supplier,Πληροφορίες καταστατικού και άλλες γενικές πληροφορίες σχετικά με τον προμηθευτή σας
-apps/erpnext/erpnext/hooks.py +88,Addresses,Διευθύνσεις
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Προμηθευτής&gt; Τύπος προμηθευτή
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +212,Against Journal Entry {0} does not have any unmatched {1} entry,Κατά την ημερολογιακή εγγραφή {0} δεν έχει καμία αταίριαστη {1} καταχώρηση
+apps/erpnext/erpnext/hooks.py +95,Addresses,Διευθύνσεις
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +215,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,Παρακαλούμε να ορίσετε το φίλτρο σύμφωνα με το σημείο ή την αποθήκη
 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,Για να παρέχουν και να τιμολογούν
@@ -1602,11 +1617,10 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,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 +731,Payment,Πληρωμή
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,Payment,Πληρωμή
 DocType: Production Order Operation,Actual Time and Cost,Πραγματικός χρόνος και κόστος
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Αίτηση υλικού με μέγιστο {0} μπορεί να γίνει για το είδος {1} κατά την παραγγελία πώλησης {2}
 DocType: Employee,Salutation,Χαιρετισμός
-DocType: Pricing Rule,Brand,Εμπορικό σήμα
 DocType: Course,Course Abbreviation,Σύντμηση γκολφ
 DocType: Item,Will also apply for variants,Θα ισχύουν επίσης για τις παραλλαγές
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +142,"Asset cannot be cancelled, as it is already {0}","Περιουσιακό στοιχείο δεν μπορεί να ακυρωθεί, δεδομένου ότι είναι ήδη {0}"
@@ -1618,7 +1632,7 @@
 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.","Απαριθμήστε προϊόντα ή υπηρεσίες που αγοράζετε ή πουλάτε. Σιγουρέψτε πως έχει επιλεγεί η ομάδα εϊδους, η μονάδα μέτρησης και οι άλλες ιδιότητες όταν ξεκινάτε."
 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 +85,Associate,Συνεργάτης
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,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,Δημιουργία λίστας παραλήπτη
@@ -1626,7 +1640,7 @@
 DocType: Production Planning Tool,Material Requests,υλικό αιτήσεις
 DocType: Warranty Claim,Issue Date,Ημερομηνία έκδοσης
 DocType: Activity Cost,Activity Cost,Δραστηριότητα Κόστους
-DocType: Timesheet Detail,Timesheet Detail,φύλλο κατανομής χρόνου Λεπτομέρεια
+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),Δηλώνει ότι το συσκευασία είναι ένα μέρος αυτής της παράδοσης (μόνο πρόχειρο)
@@ -1649,6 +1663,7 @@
 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,Έχει παραλλαγές
 DocType: Monthly Distribution,Name of the Monthly Distribution,Όνομα της μηνιαίας διανομής
 DocType: Sales Person,Parent Sales Person,Γονικός πωλητής
@@ -1661,30 +1676,31 @@
 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 +44,"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/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.,Με λόγια θα είναι ορατά αφού αποθηκεύσετε το τιμολόγιο πώλησης.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +502,Error: {0} &gt; {1},Σφάλμα: {0}&gt; {1}
 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.,Η Ημερομηνία Τίτλος έναρξης δεν μπορεί να είναι νωρίτερα από το έτος έναρξης Ημερομηνία του Ακαδημαϊκού Έτους στην οποία ο όρος συνδέεται (Ακαδημαϊκό Έτος {}). Διορθώστε τις ημερομηνίες και προσπαθήστε ξανά.
 DocType: Naming Series,Current Value,Τρέχουσα αξία
-apps/erpnext/erpnext/controllers/accounts_controller.py +235,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Υπάρχουν πολλαπλές χρήσεις για την ημερομηνία {0}. Παρακαλούμε να ορίσετε την εταιρεία κατά το οικονομικό έτος
+apps/erpnext/erpnext/controllers/accounts_controller.py +238,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 +458,Item table can not be blank,"Ο πίνακας ειδών, δεν μπορεί να είναι κενός"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +443,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 +5,This is based on stock movement. See {0} for details,Αυτό βασίζεται στην κίνηση των αποθεμάτων. Δείτε {0} για λεπτομέρειες
 DocType: Pricing Rule,Selling,Πώληση
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +341,Amount {0} {1} deducted against {2},Ποσό {0} {1} αφαιρούνται από {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +344,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,Η ημερομηνία λήξης προθεσμίας δεν μπορεί να είναι πριν από την ημερομηνία αποστολής
@@ -1699,8 +1715,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +144,Cannot refer row number greater than or equal to current row number for this Charge type,Δεν μπορεί να παραπέμψει τον αριθμό σειράς μεγαλύτερο ή ίσο με τον τρέχοντα αριθμό γραμμής για αυτόν τον τύπο επιβάρυνσης
 DocType: Asset,Sold,Πωληθεί
 ,Item-wise Purchase History,Ιστορικό αγορών ανά είδος
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Red,Κόκκινος
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Παρακαλώ κάντε κλικ στο 'δημιουργία χρονοδιαγράμματος' για να δείτε τον σειριακό αριθμό που προστέθηκε για το είδος {0}
+apps/erpnext/erpnext/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,Ανοιχτές εντολές παραγωγής
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Βάση Ποσό (Εταιρεία νομίσματος)
@@ -1708,7 +1724,7 @@
 DocType: Installation Note,Installation Time,Ώρα εγκατάστασης
 DocType: Sales Invoice,Accounting Details,Λογιστική Λεπτομέρειες
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,Διαγράψτε όλες τις συναλλαγές για αυτή την Εταιρεία
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +187,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Γραμμή #{0}:Η λειτουργία {1} δεν έχει ολοκληρωθεί για τη {2} ποσότητα των τελικών προϊόντων στην εντολή παραγωγής # {3}. Σας Παρακαλώ να ενημερώσετε την κατάσταση λειτουργίας μέσω των χρονικών αρχείων καταγραφής
+apps/erpnext/erpnext/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}. Σας Παρακαλώ να ενημερώσετε την κατάσταση λειτουργίας μέσω των χρονικών αρχείων καταγραφής
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,Επενδύσεις
 DocType: Issue,Resolution Details,Λεπτομέρειες επίλυσης
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,χορηγήσεις
@@ -1744,16 +1760,17 @@
 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}
 DocType: Delivery Note,Excise Page Number,Αριθμός σελίδας έμμεσης εσωτερικής φορολογίας
 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}
 ,Maintenance Schedules,Χρονοδιαγράμματα συντήρησης
 DocType: Task,Actual End Date (via Time Sheet),Πραγματική Ημερομηνία λήξης (μέσω Ώρα Φύλλο)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Amount {0} {1} against {2} {3},Ποσό {0} {1} από {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +339,Amount {0} {1} against {2} {3},Ποσό {0} {1} από {2} {3}
 ,Quotation Trends,Τάσεις προσφορών
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},Η ομάδα είδους δεν αναφέρεται στην κύρια εγγραφή είδους για το είδος {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +295,Debit To account must be a Receivable account,Ο 'λογαριασμός χρέωσης προς' Χρέωση του λογαριασμού πρέπει να είναι λογαριασμός απαιτήσεων
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Receivable account,Ο 'λογαριασμός χρέωσης προς' Χρέωση του λογαριασμού πρέπει να είναι λογαριασμός απαιτήσεων
 DocType: Shipping Rule Condition,Shipping Amount,Κόστος αποστολής
 ,Pending Amount,Ποσό που εκκρεμεί
 DocType: Purchase Invoice Item,Conversion Factor,Συντελεστής μετατροπής
@@ -1761,10 +1778,10 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +137,Expected value after useful life must be greater than or equal to {0},Αναμενόμενη τιμή μετά την ωφέλιμη ζωή πρέπει να είναι μεγαλύτερη ή ίση με {0}
 DocType: Purchase Receipt,Vehicle Number,Αριθμός Οχημάτων
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Η ημερομηνία κατά την οποία το επαναλαμβανόμενο τιμολόγιο θα σταματήσει
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +90,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,"Σύνολο των κατανεμημένων φύλλα {0} δεν μπορεί να είναι μικρότερη από ό, τι έχει ήδη εγκριθεί φύλλα {1} για την περίοδο"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +93,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 +22,Enter Paid Amount,Πληκτρολογήστε το καταβληθέν ποσό
+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,Χρησιμοποιήστε Λ.Υ. πολλαπλών επιπέδων.
@@ -1774,13 +1791,15 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,φύλλων
 DocType: HR Settings,HR Settings,Ρυθμίσεις ανθρωπίνου δυναμικού
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Expense Claim is pending approval. Only the Expense Approver can update status.,Η αξίωση δαπανών είναι εν αναμονή έγκρισης. Μόνο ο υπεύθυνος έγκρισης δαπανών να ενημερώσει την κατάστασή της.
+DocType: Email Digest,New Expenses,νέα Έξοδα
 DocType: Purchase Invoice,Additional Discount Amount,Πρόσθετες ποσό έκπτωσης
-apps/erpnext/erpnext/controllers/accounts_controller.py +524,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Σειρά # {0}: Ποσότητα πρέπει να είναι 1, ως στοιχείο αποτελεί πάγιο περιουσιακό στοιχείο. Παρακαλούμε χρησιμοποιήστε ξεχωριστή σειρά για πολλαπλές ποσότητα."
+apps/erpnext/erpnext/controllers/accounts_controller.py +527,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Σειρά # {0}: Ποσότητα πρέπει να είναι 1, ως στοιχείο αποτελεί πάγιο περιουσιακό στοιχείο. Παρακαλούμε χρησιμοποιήστε ξεχωριστή σειρά για πολλαπλές ποσότητα."
 DocType: Leave Block List Allow,Leave Block List Allow,Επίτρεψε λίστα αποκλεισμού ημερών άδειας
 apps/erpnext/erpnext/setup/doctype/company/company.py +249,Abbr can not be blank or space,Συντ δεν μπορεί να είναι κενό ή χώρος
 apps/erpnext/erpnext/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/stock/get_item_details.py +123,Please specify Company,Παρακαλώ ορίστε εταιρεία
 ,Customer Acquisition and Loyalty,Απόκτηση πελατών και πίστη
@@ -1791,17 +1810,19 @@
 apps/erpnext/erpnext/projects/doctype/task/task.js +26,Expense Claims,Απαιτήσεις Εξόδων
 DocType: Issue,Support,Υποστήριξη
 ,BOM Search,BOM Αναζήτηση
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Closing (Opening + Totals),Κλείσιμο (Άνοιγμα + Σύνολα)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),Κλείσιμο (Άνοιγμα + Σύνολα)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Παρακαλώ ορίστε το νόμισμα στην εταιρεία
 DocType: Workstation,Wages per hour,Μισθοί ανά ώρα
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +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/controllers/accounts_controller.py +272,Account {0} is invalid. Account Currency must be {1},Ο Λογαριασμός {0} δεν είναι έγκυρη. Ο Λογαριασμός νομίσματος πρέπει να είναι {1}
+DocType: Email Digest,Pending Sales Orders,Εν αναμονή Παραγγελίες
+apps/erpnext/erpnext/controllers/accounts_controller.py +275,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 +956,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Σειρά # {0}: Έγγραφο Αναφοράς Τύπος πρέπει να είναι ένα από τα Πωλήσεις Τάξης, Τιμολόγιο Πωλήσεων ή Εφημερίδα Έναρξη"
-DocType: Salary Slip,Deduction,Κρατήση
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +87,Row {0}: From Time and To Time is mandatory.,Σειρά {0}: από το χρόνο και τον χρόνο είναι υποχρεωτική.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +969,"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 +111,Row {0}: From Time and To Time is mandatory.,Σειρά {0}: από το χρόνο και τον χρόνο είναι υποχρεωτική.
+DocType: Stock Reconciliation Item,Amount Difference,ποσό Διαφορά
 apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},Είδους Τιμή προστεθεί {0} στην Τιμοκατάλογος {1}
 DocType: Address Template,Address Template,Πρότυπο διεύθυνσης
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +7,Please enter Employee Id of this sales person,Παρακαλώ εισάγετε το αναγνωριστικό Υπάλληλος αυτό το άτομο πωλήσεων
@@ -1809,7 +1830,7 @@
 DocType: Project,% Tasks Completed,% Εργασίες ολοκληρώθηκαν
 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 +194,Please enter Production Item first,Παρακαλώ εισάγετε πρώτα το είδος παραγωγής
+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,Απενεργοποιημένος χρήστης
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Προσφορά
@@ -1818,53 +1839,54 @@
 DocType: Maintenance Visit,Maintenance User,Χρήστης συντήρησης
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +149,Cost Updated,Κόστος Ενημερώθηκε
 DocType: Employee,Date of Birth,Ημερομηνία γέννησης
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +86,Item {0} has already been returned,Το είδος {0} έχει ήδη επιστραφεί
+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: 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 +177,Job Description,Περιγραφή Δουλειάς
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,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 +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Ειδικοί χαρακτήρες εκτός από ""-"", ""#"", ""."" and ""/"" δεν επιτρέπονται στην σειρά ονομασίας"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"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.","Παρακολουθήστε εκστρατείες προώθησης των πωλήσεων. Παρακολουθήστε επαφές, προσφορές, παραγγελίες πωλήσεων κλπ από τις εκστρατείες στις οποίες πρέπει να γίνει μέτρηση της απόδοσης των επενδύσεων."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +24,Welcome to POS: Create your POS Profile,Καλώς ήρθατε στο POS: Δημιουργία POS σας Προφίλ
 DocType: Expense Claim,Approver,Ο εγκρίνων
 ,SO Qty,Ποσότητα παρ. πώλησης
+DocType: Guardian,Work Address,Διεύθυνση εργασίας
 DocType: Appraisal,Calculate Total Score,Υπολογισμός συνολικής βαθμολογίας
 DocType: Request for Quotation,Manufacturing Manager,Υπεύθυνος παραγωγής
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Ο σειριακός αριθμός {0} έχει εγγύηση μέχρι {1}
+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 +74,Shipments,Αποστολές
+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 +153,Row # ,Γραμμή #
+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 +156,Get From,Πάρτε Από
+apps/erpnext/erpnext/public/js/utils.js +167,Get From,Πάρτε Από
 DocType: C-Form,Quarter,Τρίμηνο
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Miscellaneous Expenses,Διάφορες δαπάνες
 DocType: Global Defaults,Default Company,Προεπιλεγμένη εταιρεία
 apps/erpnext/erpnext/controllers/stock_controller.py +167,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Ο λογαριασμός δαπάνης ή ποσό διαφοράς είναι απαραίτητος για το είδος {0}, καθώς επηρεάζουν τη συνολική αξία των αποθεμάτων"
-apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Δεν είναι δυνατή η υπερτιμολόγηση για το είδος {0} στη γραμμή {0} περισσότερο από {1}. Για να καταστεί δυνατή υπερτιμολογήσεων, ορίστε το στις ρυθμίσεις αποθέματος"
+apps/erpnext/erpnext/controllers/accounts_controller.py +419,"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,-Παραπάνω
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} is disabled,Ο χρήστης {0} είναι απενεργοποιημένος
 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...,Επιλέξτε εταιρία...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Άφησε το κενό αν ισχύει για όλα τα τμήματα
 apps/erpnext/erpnext/config/hr.py +171,"Types of employment (permanent, contract, intern etc.).","Μορφές απασχόλησης ( μόνιμη, σύμβαση, πρακτική άσκηση κ.λ.π. )."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +346,{0} is mandatory for Item {1},Η {0} είναι απαραίτητη για το είδος {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,{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","Παρακαλώ επιλέξτε χορηγούμενο ποσό, τύπο τιμολογίου και αριθμό τιμολογίου σε τουλάχιστον μία σειρά"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,Το κόστος της Νέας Αγοράς
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},Η παραγγελία πώλησης για το είδος {0} είναι απαραίτητη
 DocType: Purchase Invoice Item,Rate (Company Currency),Τιμή (νόμισμα της εταιρείας)
-apps/erpnext/erpnext/demo/setup_data.py +360,Others,Άλλα
+DocType: Student Guardian,Others,Άλλα
 DocType: Payment Entry,Unallocated Amount,μη διατεθέντων Ποσό
 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,Φόροι και επιβαρύνσεις
@@ -1884,17 +1906,16 @@
 apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,Απογραφή συνέχειες
 DocType: Activity Type,Default Billing Rate,Επιτόκιο Υπερημερίας Τιμολόγησης
 DocType: Sales Invoice,Total Billing Amount,Συνολικό Ποσό Χρέωσης
-apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +54,Receivable Account,Εισπρακτέα λογαριασμού
-apps/erpnext/erpnext/controllers/accounts_controller.py +546,Row #{0}: Asset {1} is already {2},Σειρά # {0}: Asset {1} είναι ήδη {2}
+apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,Εισπρακτέα λογαριασμού
+apps/erpnext/erpnext/controllers/accounts_controller.py +549,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 +79,CEO,CEO
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,CEO
 DocType: Expense Claim Detail,Expense Claim Detail,Λεπτομέρειες αξίωσης δαπανών
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +808,Please select correct account,Παρακαλώ επιλέξτε σωστό λογαριασμό
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +809,Please select correct account,Παρακαλώ επιλέξτε σωστό λογαριασμό
 DocType: Item,Weight UOM,Μονάδα μέτρησης βάρους
 DocType: Salary Structure Employee,Salary Structure Employee,Δομή μισθό του υπαλλήλου
 DocType: Employee,Blood Group,Ομάδα αίματος
-DocType: Purchase Invoice Item,Page Break,Αλλαγή σελίδας
 DocType: Production Order Operation,Pending,Εκκρεμής
 DocType: Course,Course Name,Όνομα Μαθήματος
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Χρήστες που μπορούν να εγκρίνουν αιτήσεις για έναν συγκεκριμένο εργαζόμενο
@@ -1903,14 +1924,15 @@
 DocType: Fiscal Year,Companies,Εταιρείες
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Ηλεκτρονικά
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Δημιουργία αιτήματος υλικού όταν το απόθεμα φτάνει το επίπεδο για επαναπαραγγελία
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Full-time,Πλήρης απασχόληση
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,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: 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,Συνολική εισερχόμενη αξία
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Debit To is required,Χρεωστικό να απαιτείται
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +321,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,Υπεύθυνος διασφάλισης ποιότητας
@@ -1918,6 +1940,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/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,Συνολικό ποσό που τιμολογήθηκε
@@ -1928,18 +1951,17 @@
 DocType: Production Order Operation,Completed Qty,Ολοκληρωμένη ποσότητα
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"For {0}, only debit accounts can be linked against another credit entry","Για {0}, μόνο χρεωστικοί λογαριασμοί μπορούν να συνδέονται με άλλες καταχωρήσεις πίστωσης"
 apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,Ο τιμοκατάλογος {0} είναι απενεργοποιημένος
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +99,Row {0}: Completed Qty cannot be more than {1} for operation {2},Σειρά {0}: Ολοκληρώθηκε Ποσότητα δεν μπορεί να είναι πάνω από {1} για τη λειτουργία {2}
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +123,Row {0}: Completed Qty cannot be more than {1} for operation {2},Σειρά {0}: Ολοκληρώθηκε Ποσότητα δεν μπορεί να είναι πάνω από {1} για τη λειτουργία {2}
 DocType: Manufacturing Settings,Allow Overtime,Επιτρέψτε Υπερωρίες
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} αύξοντες αριθμούς που απαιτούνται για τη θέση {1}. Έχετε προβλέπεται {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Τρέχουσα Αποτίμηση Τιμή
 DocType: Item,Customer Item Codes,Θέση Πελάτη Κώδικες
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,Ανταλλαγή Κέρδος / Ζημιά
 DocType: Opportunity,Lost Reason,Αιτιολογία απώλειας
-apps/erpnext/erpnext/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/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/purchase_receipt/purchase_receipt.py +378,All items have already been invoiced,Όλα τα είδη έχουν ήδη τιμολογηθεί
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +379,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,Εξωτερικός
@@ -1955,18 +1977,19 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Οι πελάτες σας
 apps/erpnext/erpnext/projects/doctype/project/project.py +141,You have been invited to collaborate on the project: {0},Έχετε προσκληθεί να συνεργαστούν για το έργο: {0}
 DocType: Leave Block List Date,Block Date,Αποκλεισμός ημερομηνίας
-apps/erpnext/erpnext/templates/generators/job_opening.html +19,Apply Now,Κάνε αίτηση τώρα
+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."
 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,κτίρια
-apps/erpnext/erpnext/utilities/doctype/address/address.py +164,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Δεν Πρότυπο προεπιλεγμένη διεύθυνση βρέθηκε. Παρακαλούμε να δημιουργήσετε ένα νέο από τις Ρυθμίσεις&gt; Εκτύπωση και Branding&gt; Πρότυπο Διεύθυνση.
 DocType: Fee Structure,Fee Structure,Δομή χρέωση
 DocType: Timesheet Detail,Costing Amount,Κοστολόγηση Ποσό
+DocType: Student Admission,Application Fee,Τέλη της αίτησης
 DocType: Process Payroll,Submit Salary Slip,Υποβολή βεβαίωσης αποδοχών
-apps/erpnext/erpnext/controllers/selling_controller.py +161,Maxiumm discount for Item {0} is {1}%,Η μέγιστη έκπτωση για το είδος {0} είναι {1} %
+apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,Η μέγιστη έκπτωση για το είδος {0} είναι {1} %
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Εισαγωγή χύδην
 DocType: Sales Partner,Address & Contacts,Διεύθυνση & Επαφές
 DocType: SMS Log,Sender Name,Όνομα αποστολέα
@@ -1991,21 +2014,21 @@
 DocType: Serial No,Delivery Time,Χρόνος παράδοσης
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Γήρανση με βάση την
 DocType: Item,End of Life,Τέλος της ζωής
-apps/erpnext/erpnext/demo/setup_data.py +361,Travel,Ταξίδι
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +155,No active or default Salary Structure found for employee {0} for the given dates,Δεν ενεργή ή προεπιλογή Μισθός Δομή βρέθηκαν για εργαζόμενο {0} για τις δεδομένες ημερομηνίες
+apps/erpnext/erpnext/demo/setup/setup_data.py +304,Travel,Ταξίδι
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +167,No active or default Salary Structure found for employee {0} for the given dates,Δεν ενεργή ή προεπιλογή Μισθός Δομή βρέθηκαν για εργαζόμενο {0} για τις δεδομένες ημερομηνίες
 DocType: Leave Block List,Allow Users,Επίστρεψε χρήστες
 DocType: Purchase Order,Customer Mobile No,Κινητό αριθ Πελατών
 DocType: Sales Invoice,Recurring,Επαναλαμβανόμενες
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Παρακολουθήστε ξεωριστά έσοδα και έξοδα για τις κάθετες / διαιρέσεις προϊόντος
 DocType: Rename Tool,Rename Tool,Εργαλείο μετονομασίας
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +23,Update Cost,Ενημέρωση κόστους
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Ενημέρωση κόστους
 DocType: Item Reorder,Item Reorder,Αναδιάταξη είδους
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +36,Show Salary Slip,Εμφάνιση Μισθός Slip
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +748,Transfer Material,Μεταφορά υλικού
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +53,Show Salary Slip,Εμφάνιση Μισθός Slip
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +166,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 +923,Please set recurring after saving,Παρακαλούμε να ορίσετε επαναλαμβανόμενες μετά την αποθήκευση
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +646,Select change amount account,υπόψη το ποσό Επιλέξτε αλλαγή
+apps/erpnext/erpnext/public/js/controllers/transaction.js +914,Please set recurring after saving,Παρακαλούμε να ορίσετε επαναλαμβανόμενες μετά την αποθήκευση
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +703,Select change amount account,υπόψη το ποσό Επιλέξτε αλλαγή
 DocType: Purchase Invoice,Price List Currency,Νόμισμα τιμοκαταλόγου
 DocType: Naming Series,User must always select,Ο χρήστης πρέπει πάντα να επιλέγει
 DocType: Stock Settings,Allow Negative Stock,Επίτρεψε αρνητικό απόθεμα
@@ -2017,31 +2040,32 @@
 DocType: Quality Inspection,Verified By,Πιστοποιημένο από
 DocType: Address,Subsidiary,Θυγατρική
 apps/erpnext/erpnext/setup/doctype/company/company.py +64,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Δεν μπορεί να αλλάξει προεπιλεγμένο νόμισμα της εταιρείας, επειδή υπάρχουν υφιστάμενες συναλλαγές. Οι συναλλαγές πρέπει να ακυρωθούν για να αλλάξετε το εξ 'ορισμού νόμισμα."
+DocType: Grade Interval,Grade Description,βαθμός Περιγραφή
 DocType: Quality Inspection,Purchase Receipt No,Αρ. αποδεικτικού παραλαβής αγοράς
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Κερδιζμένα χρήματα
 DocType: Process Payroll,Create Salary Slip,Δημιουργία βεβαίωσης αποδοχών
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +33,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 +352,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Η ποσότητα στη γραμμή {0} ( {1} ) πρέπει να είναι ίδια με την παραγόμενη ποσότητα {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Η ποσότητα στη γραμμή {0} ( {1} ) πρέπει να είναι ίδια με την παραγόμενη ποσότητα {2}
 DocType: Appraisal,Employee,Υπάλληλος
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Πρόσκληση ως χρήστη
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} είναι πλήρως τιμολογημένο
 DocType: Workstation Working Hour,End Time,Ώρα λήξης
 DocType: Payment Entry,Payment Deductions or Loss,Μειώσεις πληρωμής ή απώλειας
-apps/erpnext/erpnext/config/schools.py +100,LMS,LMS
+apps/erpnext/erpnext/config/schools.py +104,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,Pipeline πωλήσεις
 DocType: Student Batch Student,Student Batch Student,Φοιτητής παρτίδας Φοιτητής
-DocType: Sales Invoice,Mass Mailing,Μαζική αλληλογραφία
+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 +199,Purchse Order number required for Item {0},Ο αριθμός παραγγελίας αγοράς για το είδος {0} είναι απαραίτητος
 apps/erpnext/erpnext/controllers/buying_controller.py +262,Specified BOM {0} does not exist for Item {1},Η συγκεκριμμένη Λ.Υ. {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 +297,Salary Slip of employee {0} already created for this period,Μισθός Slip των εργαζομένων {0} έχει ήδη δημιουργηθεί για την περίοδο αυτή
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Pharmaceutical,Φαρμακευτικός
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +309,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/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,Πίστωση προς
@@ -2056,27 +2080,28 @@
 DocType: Upload Attendance,Attendance To Date,Προσέλευση μέχρι ημερομηνία
 DocType: Warranty Claim,Raised By,Δημιουργήθηκε από
 DocType: Payment Gateway Account,Payment Account,Λογαριασμός πληρωμών
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +814,Please specify Company to proceed,Παρακαλώ ορίστε εταιρεία για να προχωρήσετε
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +793,Please specify Company to proceed,Παρακαλώ ορίστε εταιρεία για να προχωρήσετε
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Receivable,Καθαρή Αλλαγή σε εισπρακτέους λογαριασμούς
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Compensatory Off,Αντισταθμιστικά απενεργοποιημένα
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,Αντισταθμιστικά απενεργοποιημένα
 DocType: Quality Inspection Reading,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.,Παρακαλώ βεβαιωθείτε ότι έχετε πραγματικά θέλετε να διαγράψετε όλες τις συναλλαγές για την εν λόγω εταιρεία. Τα δεδομένα της κύριας σας θα παραμείνει ως έχει. Αυτή η ενέργεια δεν μπορεί να αναιρεθεί.
 DocType: Room,Room Number,Αριθμός δωματίου
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Άκυρη αναφορά {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +161,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) Δεν μπορεί να είναι μεγαλύτερο από το προβλεπόμενο ποσότητα ({2}) στην εντολή παραγωγή  {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +162,{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 +217,Raw Materials cannot be blank.,Το πεδίο πρώτων ύλών δεν μπορεί να είναι κενό.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,"Could not update stock, invoice contains drop shipping item.","Δεν ήταν δυνατή η ενημέρωση των αποθεμάτων, τιμολόγιο περιέχει πτώση στέλνοντας στοιχείο."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +460,Quick Journal Entry,Γρήγορη Εφημερίδα Είσοδος
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +111,You can not change rate if BOM mentioned agianst any item,"Δεν μπορείτε να αλλάξετε τιμοκατάλογο, αν η λίστα υλικών αναφέρεται σε οποιουδήποτε είδος"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +441,"Could not update stock, invoice contains drop shipping item.","Δεν ήταν δυνατή η ενημέρωση των αποθεμάτων, τιμολόγιο περιέχει πτώση στέλνοντας στοιχείο."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Quick Journal Entry,Γρήγορη Εφημερίδα Είσοδος
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +103,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 +214,{0} {1} is not submitted,{0} {1} Δεν έχει υποβληθεί
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Αιτήσεις για είδη
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Μια ξεχωριστή εντολή παραγωγής θα δημιουργηθεί για κάθε τελικό καλό είδος.
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +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.,Το όνομα του ιδρύματος για το οποίο είστε δημιουργία αυτού του συστήματος.
@@ -2085,16 +2110,17 @@
 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 +398,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,Εισάγετε το τμήμαστο οποίο ανήκει αυτή η επαφή
 ,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 +739,Item or Warehouse for row {0} does not match Material Request,Το είδος ή η αποθήκη για την γραμμή {0} δεν ταιριάζει στην αίτηση υλικού
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +747,Item or Warehouse for row {0} does not match Material Request,Το είδος ή η αποθήκη για την γραμμή {0} δεν ταιριάζει στην αίτηση υλικού
 apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,Μονάδα μέτρησης
 DocType: Fiscal Year,Year End Date,Ημερομηνία λήξης έτους
 DocType: Task Depends On,Task Depends On,Εργασία Εξαρτάται από
-DocType: Lead,Opportunity,Ευκαιρία
+DocType: Supplier Quotation,Opportunity,Ευκαιρία
 ,Completed Production Orders,Ολοκλήρωση εντολών παραγωγής
 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,Προεπιλογμένος σταθμός εργασίας
@@ -2107,7 +2133,7 @@
 DocType: Student,Joining Date,Ημερομηνία ένταξης
 ,Employees working on a holiday,Οι εργαζόμενοι που εργάζονται σε διακοπές
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Mark Παρόν
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},Η ημερομηνία έναρξης συντήρησης δεν μπορεί να είναι πριν από την ημερομηνία παράδοσης για τον σειριακό αριθμό {0}
+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,Πραγματική ημερομηνία λήξης
 DocType: Purchase Invoice,PINV-,PINV-
 DocType: Authorization Rule,Applicable To (Role),Εφαρμοστέα σε (ρόλος)
@@ -2122,7 +2148,7 @@
 DocType: SMS Log,No of Requested SMS,Αρ. SMS που ζητήθηκαν
 DocType: Campaign,Campaign-.####,Εκστρατεία-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Επόμενα βήματα
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,Please supply the specified items at the best possible rates,Παρακαλείστε να παρέχουν τις συγκεκριμένες θέσεις στις καλύτερες δυνατές τιμές
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +695,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 +117,Contract End Date must be greater than Date of Joining,"Η ημερομηνία λήξης της σύμβασης πρέπει να είναι μεγαλύτερη από ό, τι ημερομηνία ενώνουμε"
 DocType: Delivery Note,DN-,DN-
@@ -2131,7 +2157,7 @@
 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 +14,This is an example website auto-generated from ERPNext,Αυτό είναι ένα παράδειγμα ιστοσελίδας που δημιουργείται αυτόματα από το erpnext
+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
 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.
 
@@ -2178,13 +2204,14 @@
 DocType: Purchase Receipt Item,Recd Quantity,Ποσότητα που παραλήφθηκε
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +54,Fee Records Created - {0},Εγγραφές τέλους Δημιουργήθηκε - {0}
 DocType: Asset Category Account,Asset Category Account,Asset Κατηγορία Λογαριασμού
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +103,Cannot produce more Item {0} than Sales Order quantity {1},Δεν γίνεται να παραχθούν είδη {0} περισσότερα από την ποσότητα παραγγελίας πώλησης {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Stock Entry {0} is not submitted,Χρηματιστήριο Έναρξη {0} δεν έχει υποβληθεί
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Δεν γίνεται να παραχθούν είδη {0} περισσότερα από την ποσότητα παραγγελίας πώλησης {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +505,Stock Entry {0} is not submitted,Χρηματιστήριο Έναρξη {0} δεν έχει υποβληθεί
 DocType: Payment Reconciliation,Bank / Cash Account,Λογαριασμός καταθέσεων σε τράπεζα / μετρητών
 DocType: Tax Rule,Billing City,Πόλη Τιμολόγησης
 DocType: Salary Component Account,Salary Component Account,Ο λογαριασμός μισθός Component
 DocType: Global Defaults,Hide Currency Symbol,Απόκρυψη συμβόλου νομίσματος
 apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card","Π.Χ. Τράπεζα, μετρητά, πιστωτική κάρτα"
+DocType: Lead Source,Source Name,Όνομα πηγή
 DocType: Journal Entry,Credit Note,Πιστωτικό σημείωμα
 DocType: Warranty Claim,Service Address,Διεύθυνση υπηρεσίας
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furnitures and Fixtures,Έπιπλα και φωτιστικών
@@ -2196,6 +2223,7 @@
 DocType: Opportunity,Customer / Lead Name,Πελάτης / όνομα επαφής
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +89,Clearance Date not mentioned,Δεν αναφέρεται ημερομηνία εκκαθάρισης
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Παραγωγή
+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/controllers/trends.py +19,Total(Qty),Σύνολο (ποσότητα)
 DocType: Sales Invoice,This Document,Αυτό το έγγραφο
@@ -2207,15 +2235,15 @@
 DocType: Purchase Receipt,Time at which materials were received,Η χρονική στιγμή κατά την οποία παρελήφθησαν τα υλικά
 DocType: Stock Ledger Entry,Outgoing Rate,Ο απερχόμενος Τιμή
 apps/erpnext/erpnext/config/hr.py +176,Organization branch master.,Κύρια εγγραφή κλάδου οργανισμού.
-apps/erpnext/erpnext/controllers/accounts_controller.py +273, or ,ή
+apps/erpnext/erpnext/controllers/accounts_controller.py +276, 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 +203,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Σειρά # {0}: Εφημερίδα Έναρξη {1} δεν έχει λογαριασμό {2} ή ήδη συγκρίνεται με ένα άλλο κουπόνι
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +206,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 +90,No employee for the above selected criteria OR salary slip already created,Κανένας εργαζόμενος για τις παραπάνω επιλεγμένα κριτήρια ή εκκαθαριστικό μισθοδοσίας που έχουν ήδη δημιουργηθεί
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +93,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,Τύπος πληρωμής
@@ -2243,8 +2271,8 @@
 DocType: Product Bundle,Parent Item,Γονικό είδος
 DocType: Account,Account Type,Τύπος λογαριασμού
 DocType: Delivery Note,DN-RET-,DN-αναδρομική έναρξη
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +115,Leave Type {0} cannot be carry-forwarded,"Αφήστε Τύπος {0} δεν μπορεί να μεταφέρει, διαβιβάζεται"
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Το χρονοδιάγραμμα συντήρησης δεν έχει δημιουργηθεί για όλα τα είδη. Παρακαλώ κάντε κλικ στο δημιουργία χρονοδιαγράμματος
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +118,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 +163,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Για γραμμή {0} {1}. Για να συμπεριλάβετε {2} στην τιμή Θέση, σειρές {3} πρέπει επίσης να συμπεριληφθούν"
@@ -2256,13 +2284,13 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +32,Disabled template must not be default template,Άτομα με ειδικές ανάγκες προτύπου δεν πρέπει να είναι προεπιλεγμένο πρότυπο
 DocType: Account,Income Account,Λογαριασμός εσόδων
 DocType: Payment Request,Amount in customer's currency,Ποσό σε νόμισμα του πελάτη
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +748,Delivery,Παράδοση
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +742,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,Βασικός τομέας ευθύνης
 DocType: Payment Entry,Total Allocated Amount,Συνολικό ποσό που χορηγήθηκε
 DocType: Item Reorder,Material Request Type,Τύπος αίτησης υλικού
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +82,Row {0}: UOM Conversion Factor is mandatory,Σειρά {0}: UOM Συντελεστής μετατροπής είναι υποχρεωτική
+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,Κέντρο κόστους
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Αποδεικτικό #
@@ -2273,13 +2301,13 @@
 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 +90,Head of Marketing and Sales,Κύρια εγγραφή του marketing και των πωλήσεων
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Φόρος εισοδήματος
+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 +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 +403,Please enter Item Code to get batch no,Παρακαλώ εισάγετε κωδικό είδους για να δείτε τον αρ. παρτίδας
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +770,Please select a value for {0} quotation_to {1},Παρακαλώ επιλέξτε μια τιμή για {0} προσφορά προς {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +397,Please enter Item Code to get batch no,Παρακαλώ εισάγετε κωδικό είδους για να δείτε τον αρ. παρτίδας
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +764,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"
@@ -2291,28 +2319,29 @@
 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 +100,Issues,Θέματα
+apps/erpnext/erpnext/hooks.py +109,Issues,Θέματα
 apps/erpnext/erpnext/controllers/status_updater.py +13,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,Νόμισμα Τιμολόγησης
 DocType: Sales Invoice,SINV-RET-,SINV-αναδρομική έναρξη
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Large,Πολύ Μεγάλο
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,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 +507,Warning: Another {0} # {1} exists against stock entry {2},Προειδοποίηση: Ένας άλλος {0} # {1} υπάρχει κατά την έναρξη αποθέματος {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Local,Τοπικός
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +508,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Δάνεια και προκαταβολές ( ενεργητικό )
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Χρεώστες
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Large,Μεγάλο
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,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 +225,Total {0} ({1}),Σύνολο {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +224,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,Προεπιλεγμένη μέθοδος αποτίμησης
@@ -2370,9 +2399,9 @@
 DocType: Attendance,Leave Type,Τύπος άδειας
 apps/erpnext/erpnext/controllers/stock_controller.py +173,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Η δαπάνη / διαφορά λογαριασμού ({0}) πρέπει να είναι λογαριασμός τύπου 'κέρδη ή ζημίες'
 DocType: Account,Accounts User,Χρήστης λογαριασμών
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Name error: {0},error Όνομα: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +90,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 +178,{0} {1} does not associated with {2} {3},{0} {1} δεν σχετίζεται με {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +181,{0} {1} does not associated with {2} {3},{0} {1} δεν σχετίζεται με {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Η συμμετοχή για εργαζομένο {0} έχει ήδη σημειώθει
 DocType: Packing Slip,If more than one package of the same type (for print),Εάν περισσότερες από μία συσκευασίες του ίδιου τύπου (για εκτύπωση)
 DocType: Warehouse,Parent Warehouse,μητρική Αποθήκη
@@ -2391,7 +2420,7 @@
 DocType: BOM Item,Scrap %,Υπολλείματα %
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Οι επιβαρύνσεις θα κατανεμηθούν αναλογικά, σύμφωνα με την ποσότητα ή το ποσό του είδους, σύμφωνα με την επιλογή σας"
 DocType: Maintenance Visit,Purposes,Σκοποί
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,Atleast ένα στοιχείο πρέπει να αναγράφεται με αρνητική ποσότητα στο έγγραφο επιστροφής
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Atleast one item should be entered with negative quantity in return document,Atleast ένα στοιχείο πρέπει να αναγράφεται με αρνητική ποσότητα στο έγγραφο επιστροφής
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Λειτουργία {0} περισσότερο από οποιαδήποτε διαθέσιμη ώρα εργασίας σε θέση εργασίας {1}, αναλύονται η λειτουργία σε πολλαπλές λειτουργίες"
 ,Requested,Ζητήθηκαν
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +83,No Remarks,Δεν βρέθηκαν παρατηρήσεις
@@ -2403,46 +2432,46 @@
 DocType: Item,Total Projected Qty,Συνολικές προβλεπόμενες Ποσότητα
 DocType: Monthly Distribution,Distribution Name,Όνομα διανομής
 DocType: Course,Course Code,Κωδικός Μαθήματος
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Quality Inspection required for Item {0},Ο έλεγχος ποιότητας για το είδος {0} είναι απαραίτητος
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,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 Βοήθεια
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Διαχειριστείτε το δέντρο περιοχών.
 DocType: Journal Entry Account,Sales Invoice,Τιμολόγιο πώλησης
 DocType: Journal Entry Account,Party Balance,Υπόλοιπο συμβαλλόμενου
-apps/erpnext/erpnext/accounts/page/pos/pos.js +475,Please select Apply Discount On,Παρακαλώ επιλέξτε Εφαρμογή έκπτωση σε
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +92,Salary Slip Created,Εκκαθαριστικό μισθοδοσίας Δημιουργήθηκε
+apps/erpnext/erpnext/accounts/page/pos/pos.js +464,Please select Apply Discount On,Παρακαλώ επιλέξτε Εφαρμογή έκπτωση σε
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +95,Salary Slip Created,Εκκαθαριστικό μισθοδοσίας Δημιουργήθηκε
 DocType: Company,Default Receivable Account,Προεπιλεγμένος λογαριασμός εισπρακτέων
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Δημιουργία τραπεζικής καταχώηρσης για το σύνολο του μισθού που καταβάλλεται για τα παραπάνω επιλεγμένα κριτήρια
 DocType: Stock Entry,Material Transfer for Manufacture,Μεταφορά υλικού για την κατασκευή
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,Το ποσοστό έκπτωσης μπορεί να εφαρμοστεί είτε ανά τιμοκατάλογο ή για όλους τους τιμοκαταλόγους
 DocType: Purchase Invoice,Half-yearly,Εξαμηνιαία
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +384,Accounting Entry for Stock,Λογιστική εγγραφή για απόθεμα
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +387,Accounting Entry for Stock,Λογιστική εγγραφή για απόθεμα
 DocType: Sales Invoice,Sales Team1,Ομάδα πωλήσεων 1
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,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 +96,Row {0}: Completed Qty must be greater than zero.,Σειρά {0}: Ολοκληρώθηκε Ποσότητα πρέπει να είναι μεγαλύτερη από το μηδέν.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +120,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 +88,Row # {0}: Cannot return more than {1} for Item {2},Σειρά # {0}: Δεν μπορεί να επιστρέψει πάνω από {1} για τη θέση {2}
+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,Γραφική παράσταση
 DocType: Item Group,Show this slideshow at the top of the page,Εμφάνιση αυτής της παρουσίασης στην κορυφή της σελίδας
 DocType: BOM,Item UOM,Μ.Μ. Είδους
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Ποσό Φόρου Μετά Ποσό έκπτωσης (Εταιρεία νομίσματος)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +147,Target warehouse is mandatory for row {0},Η αποθήκη προορισμού είναι απαραίτητη για τη γραμμή {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +141,Target warehouse is mandatory for row {0},Η αποθήκη προορισμού είναι απαραίτητη για τη γραμμή {0}
 DocType: Cheque Print Template,Primary Settings,πρωτοβάθμια Ρυθμίσεις
 DocType: Purchase Invoice,Select Supplier Address,Επιλέξτε Διεύθυνση Προμηθευτή
 DocType: Quality Inspection,Quality Inspection,Επιθεώρηση ποιότητας
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Extra Small,Extra Small
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,Warning: Material Requested Qty is less than Minimum Order Qty,Προειδοποίηση : ζητήθηκε ποσότητα υλικού που είναι μικρότερη από την ελάχιστη ποσότητα παραγγελίας
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +194,Account {0} is frozen,Ο λογαριασμός {0} έχει παγώσει
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Extra Small
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +690,Warning: Material Requested Qty is less than Minimum Order Qty,Προειδοποίηση : ζητήθηκε ποσότητα υλικού που είναι μικρότερη από την ελάχιστη ποσότητα παραγγελίας
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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 +606,Can only make payment against unbilled {0},Μπορούν να πληρώνουν κατά unbilled {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +126,Commission rate cannot be greater than 100,Το ποσοστό προμήθειας δεν μπορεί να υπερβαίνει το 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +609,Can only make payment against unbilled {0},Μπορούν να πληρώνουν κατά unbilled {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,Το ποσοστό προμήθειας δεν μπορεί να υπερβαίνει το 100
 DocType: Stock Entry,Subcontract,Υπεργολαβία
 apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,"Παρακαλούμε, εισάγετε {0} πρώτη"
 DocType: Production Order Operation,Actual End Time,Πραγματική ώρα λήξης
@@ -2453,30 +2482,30 @@
 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 +158,Colour,Χρώμα
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,Χρώμα
 DocType: Maintenance Visit,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 Προϊόν
 DocType: Student Log,Academic,Ακαδημαϊκός
-apps/erpnext/erpnext/controllers/accounts_controller.py +469,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Σύνολο εκ των προτέρων ({0}) κατά Παραγγελία {1} δεν μπορεί να είναι μεγαλύτερη από το Γενικό σύνολο ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +472,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Σύνολο εκ των προτέρων ({0}) κατά Παραγγελία {1} δεν μπορεί να είναι μεγαλύτερη από το Γενικό σύνολο ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Επιλέξτε μηνιαία κατανομή για την άνιση κατανομή στόχων στους μήνες.
 DocType: Purchase Invoice Item,Valuation Rate,Ποσοστό αποτίμησης
+DocType: Stock Reconciliation,SR/,SR /
 apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,Το νόμισμα του τιμοκαταλόγου δεν έχει επιλεγεί
 DocType: Assessment,Results,αποτελέσματα
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +168,Employee {0} has already applied for {1} between {2} and {3},Ο υπάλληλος {0} έχει ήδη υποβάλει αίτηση για {1} μεταξύ {2} και {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +175,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: Student Applicant,Father's/ Guardian 2 Email ID,/ Guardian ID 2 Email Πατέρα
 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 +228,Warehouses with existing transaction can not be converted to group.,Αποθήκες με τα υπάρχοντα συναλλαγή δεν μπορεί να μετατραπεί σε ομάδα.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +231,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,Είδη αναλυτικά
 DocType: Employee Attendance Tool,Unmarked Attendance,Χωρίς διακριτικά Συμμετοχή
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Researcher,Ερευνητής
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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.,Έλεγχος ποιότητας εισερχομένων
@@ -2488,25 +2517,25 @@
 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: Sales Invoice,Advertisement,Διαφήμιση
 DocType: Asset Category Account,Depreciation Expense Account,Ο λογαριασμός Αποσβέσεις
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Probationary Period,Δοκιμαστική περίοδος
-apps/erpnext/erpnext/hooks.py +102,Announcements,Ανακοινώσεις
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Δοκιμαστική περίοδος
+apps/erpnext/erpnext/hooks.py +111,Announcements,Ανακοινώσεις
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Μόνο οι κόμβοι-φύλλα επιτρέπονται σε μία συναλλαγή
 DocType: Expense Claim,Expense Approver,Υπεύθυνος έγκρισης δαπανών
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +109,Row {0}: Advance against Customer must be credit,Σειρά {0}: Προκαταβολή έναντι των πελατών πρέπει να είναι πιστωτικά
 apps/erpnext/erpnext/accounts/doctype/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 +16,To Datetime,Έως ημερομηνία και ώρα
+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/scheduling_tool/scheduling_tool.py +51,Course Schedules deleted:,διαγράφεται Δρομολόγια μαθήματος:
 apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,Logs για τη διατήρηση της κατάστασης παράδοσης sms
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Εν αναμονή Δραστηριότητες
+DocType: Accounts Settings,Make Payment via Journal Entry,Κάντε Πληρωμή μέσω Εφημερίδα Έναρξη
+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 +127,Please enter relieving date.,Παρακαλώ εισάγετε την ημερομηνία απαλλαγής
-apps/erpnext/erpnext/controllers/trends.py +145,Amt,Ποσό
+apps/erpnext/erpnext/controllers/trends.py +149,Amt,Ποσό
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,Only Leave Applications with status 'Approved' can be submitted,Μόνο αιτήσεις άδειας με κατάσταση 'εγκρίθηκε' μπορούν να υποβληθούν
 apps/erpnext/erpnext/utilities/doctype/address/address.py +26,Address Title is mandatory.,Ο τίτλος της διεύθυνσης είναι υποχρεωτικός.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Πληκτρολογήστε το όνομα της εκστρατείας εάν η πηγή της έρευνας είναι εκστρατεία
@@ -2524,14 +2553,15 @@
 apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1},Ανίκανος να βρει συναλλαγματική ισοτιμία για {0} έως {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Mark Μισή Μέρα
 DocType: Sales Invoice,Sales Team,Ομάδα πωλήσεων
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Duplicate entry,Διπλότυπη καταχώρηση.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,Διπλότυπη καταχώρηση.
 DocType: Program Enrollment Tool,Get Students,Πάρτε Φοιτητές
 DocType: Serial No,Under Warranty,Στα πλαίσια της εγγύησης
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +490,[Error],[Σφάλμα]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +484,[Error],[Σφάλμα]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,Με λόγια θα είναι ορατά αφού αποθηκεύσετε την παραγγελία πώλησης.
 ,Employee Birthday,Γενέθλια υπαλλήλων
 apps/erpnext/erpnext/controllers/status_updater.py +175,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} υπάρχει ήδη. Παρακαλείστε να τροποποιήσετε αυτές τις καταχωρήσεις και δοκιμάστε ξανά.
 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} δεν υπάρχει
@@ -2547,22 +2577,22 @@
 ,Issued Items Against Production Order,Είδη που εκδόθηκαν κατά την εντολή παραγωγής
 DocType: Pricing Rule,Purchase Manager,¥πεύθυνος αγορών
 DocType: Target Detail,Target Detail,Λεπτομέρειες στόχου
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +25,All Jobs,Όλες οι θέσεις εργασίας
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,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 +323,Amount {0} {1} {2} {3},Ποσό {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,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: Supplier,Credit Limit,Πιστωτικό όριο
 DocType: Production Plan Sales Order,Salse Order Date,Salse Παραγγελία Ημερομηνία
 DocType: Salary Component,Salary Component,μισθός Component
-apps/erpnext/erpnext/accounts/utils.py +372,Payment Entries {0} are un-linked,Ενδείξεις πληρωμής {0} είναι μη-συνδεδεμένα
+apps/erpnext/erpnext/accounts/utils.py +449,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 +497,Material Requests {0} created,Οι αίτησης υλικού {0} δημιουργήθηκαν
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +498,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.,Πρότυπο των όρων ή της σύμβασης.
 DocType: Purchase Invoice,Address and Contact,Διεύθυνση και Επικοινωνία
@@ -2601,7 +2631,7 @@
 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 +848,Paid Amount cannot be greater than total negative outstanding amount {0},Καταβληθέν ποσό δεν μπορεί να είναι μεγαλύτερη από το συνολικό αρνητικό οφειλόμενο ποσό {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +859,Paid Amount cannot be greater than total negative outstanding amount {0},Καταβληθέν ποσό δεν μπορεί να είναι μεγαλύτερη από το συνολικό αρνητικό οφειλόμενο ποσό {0}
 DocType: Employee Internal Work History,Employee Internal Work History,Ιστορικό εσωτερικών εργασιών υπαλλήλου
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +233,Closing (Dr),Κλείσιμο (dr)
 DocType: Cheque Print Template,Cheque Size,Επιταγή Μέγεθος
@@ -2622,7 +2652,8 @@
 ,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 +555,'Update Stock' cannot be checked for fixed asset sale,«Ενημέρωση Χρηματιστήριο» δεν μπορεί να ελεγχθεί για σταθερή την πώληση περιουσιακών στοιχείων
+DocType: Student Guardian,Father,Πατέρας
+apps/erpnext/erpnext/controllers/accounts_controller.py +558,'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/buying/doctype/purchase_order/purchase_order.py +132,Material Request {0} is cancelled or stopped,H αίτηση υλικού {0} έχει ακυρωθεί ή διακοπεί
@@ -2632,15 +2663,15 @@
 DocType: Sales Order,Fully Delivered,Έχει παραδοθεί πλήρως
 DocType: Lead,Lower Income,Χαμηλότερο εισόδημα
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","Η κύρια εγγραφή λογαριασμού υποχρεώσεων, στην οποία θα καταγραφούν τα κέρδη / ζημίες"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +166,Source and target warehouse cannot be same for row {0},Η αποθήκη προέλευση και αποθήκη προορισμός δεν μπορεί να είναι η ίδια για τη σειρά {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Ο λογαριασμός διαφορά πρέπει να είναι λογαριασμός τύπου Περιουσιακών Στοιχείων / Υποχρεώσεων, δεδομένου ότι το εν λόγω απόθεμα συμφιλίωση είναι μια Έναρξη Έναρξη"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +81,Purchase Order number required for Item {0},Ο αριθμός παραγγελίας για το είδος {0} είναι απαραίτητος
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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/purchase_receipt/purchase_receipt.py +82,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 +17,Cannot change status as student {0} is linked with student application {1},δεν μπορεί να αλλάξει την κατάσταση ως φοιτητής {0} συνδέεται με την εφαρμογή των φοιτητών {1}
+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: Timesheet,"List of employee which has ""Salary Slip Based on Timesheet"" is enabled in salary structure.",Λίστα των εργαζομένων που έχει &quot;Slip Μισθός Βασισμένο σε Timesheet&quot; είναι ενεργοποιημένη στη δομή των μισθών.
 DocType: Asset,Fully Depreciated,αποσβεσθεί πλήρως
 ,Stock Projected Qty,Προβλεπόμενη ποσότητα αποθέματος
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Customer {0} does not belong to project {1},Ο πελάτης {0} δεν ανήκει στο έργο {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,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,Αύξων αριθμός παρτίδας και
@@ -2652,7 +2683,7 @@
 DocType: Purchase Invoice,Purchase Taxes and Charges,Φόροι και επιβαρύνσεις αγοράς
 ,Qty to Receive,Ποσότητα για παραλαβή
 DocType: Leave Block List,Leave Block List Allowed,Η λίστα αποκλεισμού ημερών άδειας επετράπη
-apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +55,All Warehouses,Όλες οι Αποθήκες
+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 +105,Credit To account must be a Balance Sheet account,Πίστωση του λογαριασμού πρέπει να είναι ένα κονδύλι του Ισολογισμού
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Όλοι οι τύποι προμηθευτή
@@ -2664,10 +2695,10 @@
 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/manufacturing/doctype/bom/bom.js +26,Browse BOM,Αναζήτηση BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Αναζήτηση BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,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 Year,Academic Year,Ακαδημαϊκό έτος
+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
 DocType: Appraisal,Appraisal,Εκτίμηση
@@ -2675,12 +2706,12 @@
 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 +197,Leave approver must be one of {0},Ο υπεύθυνος έγκρισης άδειας πρέπει να είναι ένας από {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,Leave approver must be one of {0},Ο υπεύθυνος έγκρισης άδειας πρέπει να είναι ένας από {0}
 DocType: Hub Settings,Seller Email,Email πωλητή
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Συνολικό Κόστος Αγοράς (μέσω του τιμολογίου αγοράς)
 DocType: Workstation Working Hour,Start Time,Ώρα έναρξης
 DocType: Item Price,Bulk Import Help,Μαζική Βοήθεια Εισαγωγή
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +256,Select Quantity,Επιλέξτε ποσότητα
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +257,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,Το μήνυμα εστάλη
@@ -2697,6 +2728,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Είτε ποσότητα-στόχος ή ποσό-στόχος είναι απαραίτητα.
 apps/erpnext/erpnext/config/projects.py +45,Cost of various activities,Το κόστος των διαφόρων δραστηριοτήτων
 apps/erpnext/erpnext/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 +149,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}
 DocType: Item,Inspection Required,Απαιτείται έλεγχος
@@ -2716,7 +2748,7 @@
 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 +138,Wire Transfer,Τραπεζικό έμβασμα
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,Τραπεζικό έμβασμα
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Ελεγξε τα ολα
 DocType: Sales Order,Recurring Order,Επαναλαμβανόμενη παραγγελία
 DocType: Company,Default Income Account,Προεπιλεγμένος λογαριασμός εσόδων
@@ -2728,21 +2760,19 @@
 ,Welcome to ERPNext,Καλώς ήλθατε στο erpnext
 apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,Να οδηγήσει σε εισαγωγικά
 DocType: Lead,From Customer,Από πελάτη
-apps/erpnext/erpnext/demo/setup_data.py +357,Calls,Κλήσεις
+apps/erpnext/erpnext/demo/setup/setup_data.py +300,Calls,Κλήσεις
 DocType: Project,Total Costing Amount (via Time Logs),Σύνολο Κοστολόγηση Ποσό (μέσω χρόνος Καταγράφει)
 DocType: Purchase Order Item Supplied,Stock UOM,Μ.Μ. Αποθέματος
-apps/erpnext/erpnext/stock/doctype/item/item.py +466,"As there are existing transactions for this item, \
-							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Δεδομένου ότι υπάρχουν συναλλαγές για αυτό το στοιχείο, \ δεν μπορείτε να αλλάξετε τις τιμές των «Έχει Αύξων αριθμός», «Έχει παρτίδας Όχι», «Είναι αναντικατάστατο» και «Μέθοδος Αποτίμησης»"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,Purchase Order {0} is not submitted,Η παραγγελία αγοράς {0} δεν έχει υποβληθεί
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,Προβλεπόμενη
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Ο σειριακός αριθμός {0} δεν ανήκει στην αποθήκη {1}
 apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Σημείωση : το σύστημα δεν θα ελέγχει για υπέρβαση ορίων παράδοσης και κράτησης για το είδος {0} καθώς η ποσότητα ή το ποσό είναι 0
 DocType: Notification Control,Quotation Message,Μήνυμα προσφοράς
 DocType: Issue,Opening Date,Ημερομηνία έναρξης
-apps/erpnext/erpnext/schools/api.py +58,Attendance has been marked successfully.,Η φοίτηση έχει επισημανθεί με επιτυχία.
+apps/erpnext/erpnext/schools/api.py +57,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 +136,Account Type for {0} must be {1},Τύπος λογαριασμού για {0} πρέπει να είναι {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +139,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,Και οι δύο αποθήκες πρέπει να ανήκουν στην ίδια εταιρεία
@@ -2757,12 +2787,13 @@
 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/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 +20,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 +1190,Please select customer,Επιλέξτε πελατών
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1193,Please select customer,Επιλέξτε πελατών
 DocType: C-Form,I,εγώ
 DocType: Company,Asset Depreciation Cost Center,Asset Κέντρο Αποσβέσεις Κόστους
 DocType: Sales Order Item,Sales Order Date,Ημερομηνία παραγγελίας πώλησης
@@ -2772,6 +2803,7 @@
 ,Payment Period Based On Invoice Date,Περίοδος πληρωμής με βάση την ημερομηνία τιμολογίου
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Λείπει η ισοτιμία συναλλάγματος για {0}
 DocType: Assessment,Examiner,Εξεταστής
+DocType: Student,Siblings,Τα αδέλφια
 DocType: Journal Entry,Stock Entry,Καταχώρηση αποθέματος
 DocType: Payment Entry,Payment References,Αναφορές πληρωμής
 DocType: C-Form,C-FORM-,C-διατυ-
@@ -2789,11 +2821,12 @@
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,θέμα Όνομα
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Πρέπει να επιλεγεί τουλάχιστον μία από τις επιλογές πωλήση - αγορά
+DocType: Grading Structure,Grade Intervals,διαστήματα βαθμός
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Επιλέξτε τη φύση της επιχείρησής σας.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Που γίνονται οι μεταποιητικές εργασίες
 DocType: Asset Movement,Source Warehouse,Αποθήκη προέλευσης
 DocType: Installation Note,Installation Date,Ημερομηνία εγκατάστασης
-apps/erpnext/erpnext/controllers/accounts_controller.py +534,Row #{0}: Asset {1} does not belong to company {2},Σειρά # {0}: Asset {1} δεν ανήκει στην εταιρεία {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +537,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,Χρήστης πωλήσεων
@@ -2807,28 +2840,31 @@
 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 Slip
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Η ημερομηνία συνταξιοδότησης πρέπει να είναι μεταγενέστερη από την ημερομηνία πρόσληψης
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +49,There were errors while scheduling course on :,Υπήρξαν σφάλματα κατά τον προγραμματισμό μάθημα για:
 DocType: Sales Invoice,Against Income Account,Κατά τον λογαριασμό εσόδων
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +87,{0}% Delivered,{0}% Παραδόθηκαν
+apps/erpnext/erpnext/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 +379,Please set default {0} in Company {1},Παρακαλούμε να ορίσετε προεπιλεγμένες {0} στην εταιρεία {1}
+apps/erpnext/erpnext/accounts/utils.py +456,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,Μικτά Κέρδη / Ζημίες
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Προμηθεύτηκε είδος παραγγελίας αγοράς
 apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,Όνομα Εταιρίας δεν μπορεί να είναι Εταιρεία
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Επικεφαλίδες επιστολόχαρτου για πρότυπα εκτύπωσης.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Τίτλοι για πρότυπα εκτύπωσης, π.Χ. Προτιμολόγιο."
+DocType: Student Guardian,Student Guardian,Guardian φοιτητής
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +184,Valuation type charges can not marked as Inclusive,Χρεώσεις τύπου αποτίμηση δεν μπορεί να χαρακτηρίζεται ως Inclusive
 DocType: POS Profile,Update Stock,Ενημέρωση αποθέματος
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Διαφορετικές Μ.Μ.για τα είδη θα οδηγήσουν σε λανθασμένη τιμή ( σύνολο ) καθαρού βάρους. Βεβαιωθείτε ότι το καθαρό βάρος κάθε είδοςυ είναι στην ίδια Μ.Μ.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Τιμή Λ.Υ.
 DocType: Asset,Journal Entry for Scrap,Εφημερίδα Έναρξη για παλιοσίδερα
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Παρακαλώ κάντε λήψη ειδών από το δελτίο αποστολής
-apps/erpnext/erpnext/accounts/utils.py +349,Journal Entries {0} are un-linked,Οι λογιστικές εγγραφές {0} είναι μη συνδεδεμένες
+apps/erpnext/erpnext/accounts/utils.py +426,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,Παρακαλείστε να αναφέρετε στρογγυλεύουν Κέντρο Κόστους στην Εταιρεία
@@ -2852,6 +2888,7 @@
 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,Κοινότητα Φόρουμ
+DocType: Homepage,"URL for ""All Products""",URL για &quot;Όλα τα προϊόντα»
 DocType: Leave Application,Leave Balance Before Application,Υπόλοιπο άδειας πριν από την εφαρμογή
 DocType: SMS Center,Send SMS,Αποστολή SMS
 DocType: Cheque Print Template,Width of amount in word,Πλάτος του ποσού στη λέξη
@@ -2860,7 +2897,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 +29,Current Job Openings,Θέσεις Εργασίας
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,Current Job Openings,Θέσεις Εργασίας
 DocType: Company,Stock Adjustment Account,Λογαριασμός διευθέτησης αποθέματος
 DocType: Journal Entry,Write Off,Διαγράφω
 DocType: Timesheet Detail,Operation ID,Λειτουργία ID
@@ -2873,7 +2910,7 @@
 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 +850,Show tax break-up,Εμφάνιση φόρου διάλυση
+apps/erpnext/erpnext/public/js/controllers/transaction.js +841,Show tax break-up,Εμφάνιση φόρου διάλυση
 apps/erpnext/erpnext/accounts/party.py +308,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}, ως εκ τούτου, δεν μπορείτε να εκχωρήσετε ξανά ή να το τροποποιήσει"
@@ -2883,10 +2920,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 +534,Please select Posting Date before selecting Party,Επιλέξτε Απόσπαση Ημερομηνία πριν από την επιλογή Κόμματος
 DocType: Serial No,Out of AMC,Εκτός Ε.Σ.Υ.
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +80,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 +162,Please contact to the user who have Sales Master Manager {0} role,Παρακαλώ επικοινωνήστε με τον χρήστη που έχει ρόλο διαχειριστής κύριων εγγραφών πωλήσεων {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +195,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 +5,This is based on the attendance of this Student,Αυτό βασίζεται στην συμμετοχή του φοιτητή
@@ -2895,12 +2933,11 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Τα δελτία παράδοσης {0} πρέπει να ακυρώνονται πριν από την ακύρωση της παραγγελίας πώλησης
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +75,Paid amount + Write Off Amount can not be greater than Grand Total,Το άθροισμα από το καταβληθέν ποσό και το ποσό που διαγράφηκε δεν μπορεί να είναι μεγαλύτερο από το γενικό σύνολο
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,{0} is not a valid Batch Number for Item {1},Ο {0} δεν είναι έγκυρος αριθμός παρτίδας για το είδος {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +138,Note: There is not enough leave balance for Leave Type {0},Σημείωση : δεν υπάρχει αρκετό υπόλοιπο άδειας για τον τύπο άδειας {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,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,Τύπος ευκαιρίας
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,Νέα εταιρεία
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,Cost Center is required for 'Profit and Loss' account {0},Το κέντρο κόστους απαιτείται για το λογαριασμό 'αποτελέσματα χρήσεως' {0}
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Οι συναλλαγές μπορούν να διαγραφούν μόνο από το δημιουργό της Εταιρείας
 apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,Λάθος αριθμός των εγγραφών γενικής λογιστικής βρέθηκε. Μπορεί να έχετε επιλέξει λάθος λογαριασμό στη συναλλαγή.
 DocType: Cheque Print Template,Cheque Width,Επιταγή Πλάτος
@@ -2909,16 +2946,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,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 +228,{0} '{1}' is disabled,{0} '{1}' Είναι απενεργοποιημένος
+apps/erpnext/erpnext/controllers/accounts_controller.py +231,{0} '{1}' is disabled,{0} '{1}' Είναι απενεργοποιημένος
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Ορισμός ως Ανοικτό
 DocType: Cheque Print Template,Scanned Cheque,σαρωμένα Επιταγή
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Αυτόματη αποστολή email στις επαφές για την υποβολή των συναλλαγών.
+DocType: Timesheet,Total Billable Amount,Σύνολο Χρεώσιμη Ποσό
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Στοιχείο 3
 DocType: Purchase Order,Customer Contact Email,Πελατών Επικοινωνία Email
 DocType: Warranty Claim,Item and Warranty Details,Στοιχείο και εγγύηση Λεπτομέρειες
 DocType: Sales Team,Contribution (%),Συμβολή (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Σημείωση : η καταχώρηση πληρωμής δεν θα δημιουργηθεί γιατί δεν ορίστηκε λογαριασμός μετρητών ή τραπέζης
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Responsibilities,Αρμοδιότητες
+apps/erpnext/erpnext/controllers/accounts_controller.py +78,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,Αρμοδιότητες
 DocType: Expense Claim Account,Expense Claim Account,Λογαριασμός Εξόδων αξίωσης
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,Πρότυπο
 DocType: Sales Person,Sales Person Name,Όνομα πωλητή
@@ -2926,6 +2964,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Προσθήκη χρηστών
 DocType: Pricing Rule,Item Group,Ομάδα ειδών
 DocType: Item,Safety Stock,Απόθεμα ασφαλείας
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Κωδικός item&gt; Στοιχείο Ομάδα&gt; Μάρκα
 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),Φόροι και επιβαρύνσεις που προστέθηκαν (νόμισμα της εταιρείας)
@@ -2935,7 +2974,6 @@
 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: Timesheet,Total Hours,Σύνολο ωρών
 DocType: Journal Entry,Printing Settings,Ρυθμίσεις εκτύπωσης
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Total Debit must be equal to Total Credit. The difference is {0},Η συνολική χρέωση πρέπει να είναι ίση με τη συνολική πίστωση. Η διαφορά είναι {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Αυτοκίνητο
@@ -2948,13 +2986,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Επενδυτική τραπεζική
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +71,Cash or Bank Account is mandatory for making payment entry,Ο λογαριασμός μετρητών/τραπέζης είναι απαραίτητος για την κατασκευή καταχωρήσεων πληρωμής
 DocType: Purchase Invoice,Price List Exchange Rate,Ισοτιμία τιμοκαταλόγου
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Πελάτης&gt; Ομάδα Πελατών&gt; Επικράτεια
 DocType: Purchase Invoice Item,Rate,Τιμή
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Intern,Εκπαιδευόμενος
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,Εκπαιδευόμενος
 DocType: Stock Entry,From BOM,Από BOM
 DocType: Assessment,Assessment Code,Κωδικός αξιολόγηση
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +32,Basic,Βασικός
+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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',Παρακαλώ κάντε κλικ στο 'δημιουργία χρονοδιαγράμματος'
+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 +95,Reference No is mandatory if you entered Reference Date,Ο αρ. αναφοράς είναι απαραίτητος εάν έχετε εισάγει ημερομηνία αναφοράς
@@ -2963,11 +3002,11 @@
 DocType: Salary Slip,Salary Structure,Μισθολόγιο
 DocType: Account,Bank,Τράπεζα
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Αερογραμμή
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +752,Issue Material,Υλικό έκδοσης
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +723,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 +683,You are in offline mode. You will not be able to reload until you have network.,Βρίσκεστε σε λειτουργία χωρίς σύνδεση. Δεν θα είστε σε θέση να φορτώσετε εκ νέου έως ότου έχετε δίκτυο.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +665,You are in offline mode. You will not be able to reload until you have network.,Βρίσκεστε σε λειτουργία χωρίς σύνδεση. Δεν θα είστε σε θέση να φορτώσετε εκ νέου έως ότου έχετε δίκτυο.
 DocType: Hub Settings,Access Token,Η πρόσβαση παραχωρήθηκε
 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,Σειριακός αριθμός
@@ -2975,33 +3014,35 @@
 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 +1122,Enter value must be positive,Εισάγετε τιμή πρέπει να είναι θετικός
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,All Territories,Όλα τα εδάφη
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1125,Enter value must be positive,Εισάγετε τιμή πρέπει να είναι θετικός
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,Όλα τα εδάφη
 DocType: Purchase Invoice,Items,Είδη
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +23,Student is already enrolled.,Φοιτητής ήδη εγγραφεί.
 DocType: Fiscal Year,Year Name,Όνομα έτους
 DocType: Process Payroll,Process Payroll,Επεξεργασία μισθοδοσίας
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,Υπάρχουν περισσότερες ημέρες αργιών από ότι εργάσιμες ημέρες αυτό το μήνα.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +233,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 +96,Request for Quotations,Αίτηση για προσφορά
+apps/erpnext/erpnext/hooks.py +104,Request for Quotations,Αίτηση για προσφορά
 DocType: Payment Reconciliation,Maximum Invoice Amount,Μέγιστο ποσό του τιμολογίου
 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 +628,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Προεπιλεγμένη μονάδα μέτρησης για την παραλλαγή &#39;{0}&#39; πρέπει να είναι ίδιο με το πρότυπο &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Προεπιλεγμένη μονάδα μέτρησης για την παραλλαγή &#39;{0}&#39; πρέπει να είναι ίδιο με το πρότυπο &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Υπολογισμός με βάση:
 DocType: Delivery Note Item,From Warehouse,Από Αποθήκης
 DocType: Assessment,Supervisor Name,Όνομα Επόπτη
+DocType: Assessment,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,Χρήστης αγορών
 DocType: Notification Control,Customize the Notification,Προσαρμόστε την ενημέρωση
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Cash Flow from Operations,Ταμειακές ροές από εργασίες
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,Το προεπιλεγμένο πρότυπο διεύθυνσης δεν μπορεί να διαγραφεί
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,Το προεπιλεγμένο πρότυπο διεύθυνσης δεν μπορεί να διαγραφεί
 DocType: Sales Invoice,Shipping Rule,Κανόνας αποστολής
 DocType: Manufacturer,Limited to 12 characters,Περιορίζεται σε 12 χαρακτήρες
 DocType: Journal Entry,Print Heading,Εκτύπωση κεφαλίδας
@@ -3016,8 +3057,8 @@
 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/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Είτε ποσότητα-στόχος ή ποσό-στόχος είναι απαραίτητα.
-apps/erpnext/erpnext/stock/get_item_details.py +485,No default BOM exists for Item {0},Δεν υπάρχει προεπιλεγμένη Λ.Υ. Για το είδος {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +336,Please select Posting Date first,Παρακαλώ επιλέξτε Ημερομηνία Δημοσίευσης πρώτη
+apps/erpnext/erpnext/stock/get_item_details.py +486,No default BOM exists for Item {0},Δεν υπάρχει προεπιλεγμένη Λ.Υ. Για το είδος {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +326,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,Ένα κέντρο κόστους με υπάρχουσες συναλλαγές δεν μπορεί να μετατραπεί σε καθολικό
@@ -3033,6 +3074,7 @@
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Πληρωμές αγώνα με τιμολόγια
 DocType: Journal Entry,Bank Entry,Καταχώρηση τράπεζας
 DocType: Authorization Rule,Applicable To (Designation),Εφαρμοστέα σε (ονομασία)
+,Profitability Analysis,Ανάλυση κερδοφορίας
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,Προσθήκη στο καλάθι
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Ομαδοποίηση κατά
 DocType: Guardian,Interests,Ενδιαφέροντα
@@ -3045,21 +3087,21 @@
 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 +141,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Το είδος σειράς {0} δεν μπορεί να ενημερωθεί \ χρησιμοποιώντας συμφωνία αποθέματος"""
 DocType: Scheduling Tool,Day,Ημέρα
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Ένας νέος σειριακός αριθμός δεν μπορεί να έχει αποθήκη. Η αποθήκη πρέπει να ορίζεται από καταχωρήσεις αποθέματος ή από παραλαβές αγορών
 DocType: Lead,Lead Type,Τύπος επαφής
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,You are not authorized to approve leaves on Block Dates,Δεν επιτρέπεται να εγκρίνει φύλλα στο Block Ημερομηνίες
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,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,Προεπιλογή Τύπος Υλικού Αίτηση
-DocType: Student Applicant,AP.,ΑΡ.
 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 +639,Point of Sale,Point of sale
+apps/erpnext/erpnext/accounts/page/pos/pos.js +634,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,Φόρος
 DocType: Production Planning Tool,Production Planning Tool,Εργαλείο σχεδιασμού παραγωγής
@@ -3068,74 +3110,77 @@
 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 +373,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 Entry,Update Rate and Availability,Ενημέρωση τιμή και τη διαθεσιμότητα
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Ποσοστό που επιτρέπεται να παραληφθεί ή να παραδοθεί περισσότερο από την ποσότητα παραγγελίας. Για παράδειγμα: εάν έχετε παραγγείλει 100 μονάδες. Και το επίδομα σας είναι 10%, τότε θα μπορούν να παραληφθούν 110 μονάδες."
 DocType: POS Profile,Customer Group,Ομάδα πελατών
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,Expense account is mandatory for item {0},Ο λογαριασμός δαπανών είναι υποχρεωτικός για το είδος {0}
 DocType: Item,Website Description,Περιγραφή δικτυακού τόπου
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date must be on or after today,Επόμενο Αποσβέσεις Ημερομηνία πρέπει να είναι την ή μετά την σημερινή
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,Καθαρή Μεταβολή Ιδίων Κεφαλαίων
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +145,Please cancel Purchase Invoice {0} first,Παρακαλείστε να ακυρώσετε την αγορά Τιμολόγιο {0} πρώτο
 DocType: Serial No,AMC Expiry Date,Ε.Σ.Υ. Ημερομηνία λήξης
 ,Sales Register,Ταμείο πωλήσεων
 DocType: Quotation,Quotation Lost Reason,Λόγος απώλειας προσφοράς
+apps/erpnext/erpnext/utilities/doctype/address/address.py +164,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Δεν Πρότυπο προεπιλεγμένη διεύθυνση βρέθηκε. Παρακαλούμε να δημιουργήσετε ένα νέο από τις Ρυθμίσεις&gt; Εκτύπωση και Branding&gt; Πρότυπο Διεύθυνση.
 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 +330,Transaction reference no {0} dated {1},αναφοράς συναλλαγής δεν {0} με ημερομηνία {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Transaction reference no {0} dated {1},αναφοράς συναλλαγής δεν {0} με ημερομηνία {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Δεν υπάρχει τίποτα να επεξεργαστείτε.
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,Summary for this month and pending activities,Περίληψη για το μήνα αυτό και εν αναμονή δραστηριότητες
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Περίληψη για το μήνα αυτό και εν αναμονή δραστηριότητες
 DocType: Customer Group,Customer Group Name,Όνομα ομάδας πελατών
 apps/erpnext/erpnext/public/js/financial_statements.js +54,Cash Flow Statement,Κατάσταση ταμειακών ροών
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Please remove this Invoice {0} from C-Form {1},Παρακαλώ αφαιρέστε αυτό το τιμολόγιο {0} από τη c-form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,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 +644,Get Items,Βρες είδη
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +623,Get Items,Βρες είδη
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +210,Please enter Write Off Account,Παρακαλώ εισάγετε λογαριασμό διαγραφών
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Τελευταία ημερομηνία παραγγελίας
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +41,Account {0} does not belongs to company {1},Ο Λογαριασμός {0} δεν ανήκει στην εταιρεία {1}
+DocType: Student,Guardian Details,Guardian Λεπτομέρειες
 DocType: C-Form,C-Form,C-form
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark φοίτηση για πολλούς εργαζόμενους
 DocType: Payment Request,Initiated,Ξεκίνησε
 DocType: Production Order,Planned Start Date,Προγραμματισμένη ημερομηνία έναρξης
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,Customer is required against Receivable account {0},Πελάτης υποχρεούται έναντι εισπρακτέων λογαριασμό {0}
 DocType: Serial No,Creation Document Type,Τύπος εγγράφου δημιουργίας
 DocType: Leave Type,Is Encash,Είναι είσπραξη
 DocType: Purchase Invoice,Mobile No,Αρ. Κινητού
 DocType: Leave Allocation,New Leaves Allocated,Νέες άδειες που κατανεμήθηκαν
-apps/erpnext/erpnext/controllers/trends.py +265,Project-wise data is not available for Quotation,Τα στοιχεία με βάση το έργο δεν είναι διαθέσιμα στοιχεία για προσφορά
+apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Τα στοιχεία με βάση το έργο δεν είναι διαθέσιμα στοιχεία για προσφορά
 DocType: Project,Expected End Date,Αναμενόμενη ημερομηνία λήξης
 DocType: Budget Account,Budget Amount,προϋπολογισμός Ποσό
 DocType: Appraisal Template,Appraisal Template Title,Τίτλος προτύπου αξιολόγησης
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,Commercial,Εμπορικός
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,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 +648,Row {0}# Account must be of type 'Fixed Asset',Σειρά {0} # Ο λογαριασμός πρέπει να είναι τύπου «Παγίων»
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,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 +30,Series is mandatory,Η σειρά είναι απαραίτητη
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +50,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}
 DocType: Leave Allocation,Unused leaves,Αχρησιμοποίητα φύλλα
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Cr,Cr
 DocType: Tax Rule,Billing State,Μέλος χρέωσης
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +250,Transfer,Μεταφορά
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +187,{0} {1} does not associated with Party Account {2},{0} {1} δεν σχετίζεται με το Λογαριασμό Κόμμα {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,Fetch exploded BOM (including sub-assemblies),Φέρε αναλυτική Λ.Υ. ( Συμπεριλαμβανομένων των υποσυνόλων )
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +254,Transfer,Μεταφορά
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +190,{0} {1} does not associated with Party Account {2},{0} {1} δεν σχετίζεται με το Λογαριασμό Κόμμα {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +796,Fetch exploded BOM (including sub-assemblies),Φέρε αναλυτική Λ.Υ. ( Συμπεριλαμβανομένων των υποσυνόλων )
 DocType: Authorization Rule,Applicable To (Employee),Εφαρμοστέα σε (υπάλληλος)
-apps/erpnext/erpnext/controllers/accounts_controller.py +115,Due Date is mandatory,Due Date είναι υποχρεωτική
+apps/erpnext/erpnext/controllers/accounts_controller.py +118,Due Date is mandatory,Due Date είναι υποχρεωτική
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Προσαύξηση για Χαρακτηριστικό {0} δεν μπορεί να είναι 0
 DocType: Journal Entry,Pay To / Recd From,Πληρωτέο προς / λήψη από
 DocType: Naming Series,Setup Series,Εγκατάσταση σειρών
 DocType: Payment Reconciliation,To Invoice Date,Για την ημερομηνία του τιμολογίου
 DocType: Supplier,Contact HTML,Επαφή ΗΤΜΛ
 ,Inactive Customers,ανενεργοί Πελάτες
+DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Αποδεικτικά παραλαβής αγορών
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Πώς εφαρμόζεται ο κανόνας τιμολόγησης;
 DocType: Quality Inspection,Delivery Note No,Αρ. δελτίου αποστολής
@@ -3144,7 +3189,7 @@
 DocType: Company,Retail,Λιανική πώληση
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +120,Customer {0} does not exist,O πελάτης {0} δεν υπάρχει
 DocType: Attendance,Absent,Απών
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +587,Product Bundle,Πακέτο προϊόντων
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Product Bundle,Πακέτο προϊόντων
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Invalid reference {1},Σειρά {0}: Άκυρη αναφορά {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Αγοράστε φόροι και επιβαρύνσεις Πρότυπο
 DocType: Upload Attendance,Download Template,Κατεβάστε πρότυπο
@@ -3154,8 +3199,8 @@
 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 +742,Send Supplier Emails,Αποστολή Emails Προμηθευτής
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +104,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Μισθός ήδη υποβάλλονται σε επεξεργασία για χρονικό διάστημα από {0} και {1}, Αφήστε περίοδος εφαρμογής δεν μπορεί να είναι μεταξύ αυτού του εύρους ημερομηνιών."
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +708,Send Supplier Emails,Αποστολή Emails Προμηθευτής
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,"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,Guardian Ενδιαφέροντος
 DocType: Timesheet,Employee Detail,Λεπτομέρεια των εργαζομένων
@@ -3166,9 +3211,9 @@
 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/accounts/doctype/gl_entry/gl_entry.py +77,Account {0} cannot be a Group,Ο λογαριασμός {0} δεν μπορεί να είναι ομάδα
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} cannot be a Group,Ο λογαριασμός {0} δεν μπορεί να είναι ομάδα
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +31,Optional. This setting will be used to filter in various transactions.,Προαιρετικό. Αυτή η ρύθμιση θα χρησιμοποιηθεί για το φιλτράρισμα σε διάφορες συναλλαγές.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +107,Negative Valuation Rate is not allowed,Δεν επιτρέπεται αρνητική τιμή αποτίμησης
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Δεν επιτρέπεται αρνητική τιμή αποτίμησης
 DocType: Holiday List,Weekly Off,Εβδομαδιαίες αργίες
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Για παράδειγμα το 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +39,Provisional Profit / Loss (Credit),Προσωρινά κέρδη / ζημιές (πίστωση)
@@ -3182,16 +3227,16 @@
 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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Tο κέντρο κόστους είναι υποχρεωτικό για το είδος {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +626,Get Items from Product Bundle,Πάρετε τα στοιχεία από Bundle Προϊόν
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +605,Get Items from Product Bundle,Πάρετε τα στοιχεία από Bundle Προϊόν
 DocType: Asset,Straight Line,Ευθεία
 DocType: Project User,Project User,Ο χρήστης του έργου
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} is inactive,Ο λογαριασμός {0} είναι ανενεργός
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} is inactive,Ο λογαριασμός {0} είναι ανενεργός
 DocType: GL Entry,Is Advance,Είναι προκαταβολή
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Η συμμετοχή από και μέχρι είναι απαραίτητη
 apps/erpnext/erpnext/controllers/buying_controller.py +148,Please enter 'Is Subcontracted' as Yes or No,Παρακαλώ εισάγετε τιμή στο πεδίο 'υπεργολαβία' ναι ή όχι
 DocType: Sales Team,Contact No.,Αριθμός επαφής
 DocType: Bank Reconciliation,Payment Entries,Ενδείξεις πληρωμής
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,'Profit and Loss' type account {0} not allowed in Opening Entry,"Ο τύπος λογαριασμού ""Κέρδη και Ζημίες"" {0} δεν επιτρέπεται στην αρχική καταχώρηση λογαριασμών"
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +71,'Profit and Loss' type account {0} not allowed in Opening Entry,"Ο τύπος λογαριασμού ""Κέρδη και Ζημίες"" {0} δεν επιτρέπεται στην αρχική καταχώρηση λογαριασμών"
 DocType: Program Enrollment Tool,Get Students From,Πάρτε φοιτητές από
 DocType: Hub Settings,Seller Country,Χώρα πωλητή
 apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,Δημοσιεύστε Αντικείμενα στην ιστοσελίδα
@@ -3210,7 +3255,7 @@
 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 +558,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Σειρά # {0}: Asset {1} δεν μπορεί να υποβληθεί, είναι ήδη {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +561,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Σειρά # {0}: Asset {1} δεν μπορεί να υποβληθεί, είναι ήδη {2}"
 DocType: Tax Rule,Billing Country,Χρέωση Χώρα
 DocType: Production Order,Expected Delivery Date,Αναμενόμενη ημερομηνία παράδοσης
 apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Χρεωστικών και Πιστωτικών δεν είναι ίση για {0} # {1}. Η διαφορά είναι {2}.
@@ -3223,13 +3268,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +202,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: Sales Order,% Amount Billed,Ποσό που χρεώνεται%
+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 +117,No Item with Serial No {0},Δεν βρέθηκε είδος με σειριακός αριθμός {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Ανοίξτε Ειδοποιήσεις
+DocType: Email Digest,Open Notifications,Ανοίξτε Ειδοποιήσεις
 DocType: Payment Entry,Difference Amount (Company Currency),Διαφορά Ποσό (Εταιρεία νομίσματος)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,Άμεσες δαπάνες
 apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
@@ -3237,7 +3282,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Νέα έσοδα πελατών
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,Έξοδα μετακίνησης
 DocType: Maintenance Visit,Breakdown,Ανάλυση
-apps/erpnext/erpnext/controllers/accounts_controller.py +634,Account: {0} with currency: {1} can not be selected,Ο λογαριασμός: {0} με το νόμισμα: {1} δεν μπορεί να επιλεγεί
+apps/erpnext/erpnext/controllers/accounts_controller.py +637,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}
 DocType: Program Enrollment Tool,Student Applicants,Οι υποψήφιοι φοιτητής
@@ -3245,15 +3290,15 @@
 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 +56,Probation,Επιτήρηση
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Probation,Επιτήρηση
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Εξαρτήματα μισθό
 DocType: Program Enrollment Tool,New Academic Year,Νέο Ακαδημαϊκό Έτος
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Payment of salary for the month {0} and year {1},Πληρωμή του μισθού για τον μήνα {0} και έτος {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Payment of salary for the month {0} and year {1},Πληρωμή του μισθού για τον μήνα {0} και έτος {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Αυτόματη ένθετο ποσοστό Τιμοκατάλογος αν λείπει
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Συνολικό καταβεβλημένο ποσό
 DocType: Production Order Item,Transferred Qty,Μεταφερόμενη ποσότητα
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Πλοήγηση
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Planning,Προγραμματισμός
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,Προγραμματισμός
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Εκδόθηκε
 DocType: Project,Total Billing Amount (via Time Logs),Συνολικό Ποσό Χρέωσης (μέσω χρόνος Καταγράφει)
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,We sell this Item,Πουλάμε αυτό το είδος
@@ -3266,11 +3311,10 @@
 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."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Sales invoice submitted sucessfully.,τιμολόγιο πώλησης που υποβλήθηκε με επιτυχία.
 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}
 DocType: Assessment Result,Student Name,ΟΝΟΜΑ ΜΑΘΗΤΗ
-apps/erpnext/erpnext/hooks.py +104,Assessment Schedule,Πρόγραμμα αξιολόγησης
+apps/erpnext/erpnext/hooks.py +113,Assessment Schedule,Πρόγραμμα αξιολόγησης
 DocType: Brand,Item Manager,Θέση Διευθυντή
 DocType: Buying Settings,Default Supplier Type,Προεπιλεγμένος τύπος προμηθευτής
 DocType: Production Order,Total Operating Cost,Συνολικό κόστος λειτουργίας
@@ -3280,6 +3324,7 @@
 DocType: GL Entry,Party Type,Τύπος συμβαλλόμενου
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +78,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} υπερβαίνει τα όρια
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Κύρια εγγραφή προτύπου μισθολογίου.
 DocType: Leave Type,Max Days Leave Allowed,Μέγιστο πλήθος ημερών άδειας που επιτρέπεται
@@ -3291,18 +3336,19 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Προσφορές σε επαφές ή πελάτες.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Ο ρόλος έχει τη δυνατότητα επεξεργασίας παγωμένου απόθεματος
 ,Territory Target Variance Item Group-Wise,Εύρος στόχων περιοχής ανά ομάδα ειδών
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Customer Groups,Όλες οι ομάδες πελατών
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +78,Accumulated Monthly,συσσωρευμένες Μηνιαία
-apps/erpnext/erpnext/controllers/accounts_controller.py +595,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,Η {0} είναι απαραίτητη. Ίσως δεν έχει δημιουργηθεί εγγραφή ισοτιμίας συναλλάγματος από {1} έως {2}.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Όλες οι ομάδες πελατών
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +81,Accumulated Monthly,συσσωρευμένες Μηνιαία
+apps/erpnext/erpnext/controllers/accounts_controller.py +598,{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} δεν υπάρχει
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Τιμή τιμοκαταλόγου (νόμισμα της εταιρείας)
 DocType: Products Settings,Products Settings,Ρυθμίσεις προϊόντα
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +188,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Παρακαλούμε να ορίσετε Ονομασία σειράς για {0} μέσω Ρύθμιση&gt; Ρυθμίσεις&gt; Ονοματοδοσία Σειρά
 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 +84,Secretary,Γραμματέας
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,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,Αγορά
@@ -3311,24 +3357,22 @@
 ,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,Όνομα αξιολόγηση
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,Σειρά # {0}: Αύξων αριθμός είναι υποχρεωτική
+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 +859,Supplier Quotation,Προσφορά προμηθευτή
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +838,Supplier Quotation,Προσφορά προμηθευτή
 DocType: Quotation,In Words will be visible once you save the Quotation.,Με λόγια θα είναι ορατά αφού αποθηκεύσετε το πρόσημο.
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +7,Collect Fees,εισπράττει τέλη
+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}
 DocType: Lead,Add to calendar on this date,Προσθήκη στο ημερολόγιο την ημερομηνία αυτή
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Κανόνες για την προσθήκη εξόδων αποστολής.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Ανερχόμενες εκδηλώσεις
 DocType: Item,Opening Stock,άνοιγμα Χρηματιστήριο
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Ο πελάτης είναι απαραίτητος
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} είναι υποχρεωτική για την Επιστροφή
 DocType: Purchase Order,To Receive,Να Λάβω
 apps/erpnext/erpnext/public/js/setup_wizard.js +195,user@example.com,user@example.com
-DocType: Email Digest,Income / Expense,Έσοδα / δαπάνες
 DocType: Employee,Personal Email,Προσωπικό 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.","Εάν είναι ενεργοποιημένο, το σύστημα θα καταχωρεί λογιστικές εγγραφές για την απογραφή αυτόματα."
@@ -3340,13 +3384,14 @@
 DocType: Customer,From Lead,Από επαφή
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Παραγγελίες ανοιχτές για παραγωγή.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Επιλέξτε οικονομικό έτος...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,POS Profile required to make POS Entry,POS Προφίλ απαιτούνται για να κάνουν POS Έναρξη
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +509,POS Profile required to make POS Entry,POS Προφίλ απαιτούνται για να κάνουν POS Έναρξη
 DocType: Program Enrollment Tool,Enroll Students,εγγραφούν μαθητές
 DocType: Hub Settings,Name Token,Name Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Πρότυπες πωλήσεις
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Atleast one warehouse is mandatory,Τουλάχιστον μια αποθήκη είναι απαραίτητη
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +129,Atleast one warehouse is mandatory,Τουλάχιστον μια αποθήκη είναι απαραίτητη
 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 +330,{0} against Sales Invoice {1},{0} κατά το τιμολόγιο πώλησης {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Όνομα έργου
@@ -3367,10 +3412,11 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Οι άδειες πρέπει να κατανέμονται σαν πολλαπλάσια του 0, 5"
 DocType: Production Order,Operation Cost,Κόστος λειτουργίας
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,Ανεβάστε παρουσίες από ένα αρχείο .csv
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Οφειλόμενο ποσό
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Ορίστε στόχους ανά ομάδα είδους για αυτόν τον πωλητή
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Πάγωμα αποθεμάτων παλαιότερα από [ημέρες]
-apps/erpnext/erpnext/controllers/accounts_controller.py +528,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Σειρά # {0}: Asset είναι υποχρεωτική για πάγιο περιουσιακό αγορά / πώληση
+apps/erpnext/erpnext/controllers/accounts_controller.py +531,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Σειρά # {0}: Asset είναι υποχρεωτική για πάγιο περιουσιακό αγορά / πώληση
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Αν δύο ή περισσότεροι κανόνες τιμολόγησης που βρέθηκαν με βάση τις παραπάνω προϋποθέσεις, εφαρμόζεται σειρά προτεραιότητας. Η προτεραιότητα είναι ένας αριθμός μεταξύ 0 και 20, ενώ η προεπιλεγμένη τιμή είναι μηδέν (κενό). Μεγαλύτερος αριθμός σημαίνει ότι θα υπερισχύσει εάν υπάρχουν πολλαπλοί κανόνες τιμολόγησης με τους ίδιους όρους."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Φορολογικό Έτος: {0} δεν υπάρχει
 DocType: Currency Exchange,To Currency,Σε νόμισμα
@@ -3387,15 +3433,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Ιδιωτικά κεφάλαια
 DocType: Maintenance Visit,Customer Feedback,Σχόλια πελατών
 DocType: Account,Expense,Δαπάνη
-DocType: Sales Invoice,Exhibition,Έκθεση
 apps/erpnext/erpnext/utilities/doctype/address/address.py +77,"Company is mandatory, as it is your company address","Η εταιρεία είναι υποχρεωτική, όπως είναι η διεύθυνση της εταιρείας σας"
 DocType: Item Attribute,From Range,Από τη σειρά
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +81,Syntax error in formula or condition: {0},συντακτικό λάθος στον τύπο ή την κατάσταση: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +92,Syntax error in formula or condition: {0},συντακτικό λάθος στον τύπο ή την κατάσταση: {0}
 apps/erpnext/erpnext/stock/utils.py +99,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 +28,Jobs,Θέσεις εργασίας
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,Θέσεις εργασίας
 ,Sales Order Trends,Τάσεις παραγγελίας πώλησης
 DocType: Employee,Held On,Πραγματοποιήθηκε την
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Είδος παραγωγής
@@ -3404,16 +3450,16 @@
 DocType: Stock Entry Detail,Additional Cost,Πρόσθετο κόστος
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,Ημερομηνία λήξης για η χρήση
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","Δεν μπορείτε να φιλτράρετε με βάση αρ. αποδεικτικού, αν είναι ομαδοποιημένες ανά αποδεικτικό"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +763,Make Supplier Quotation,Δημιούργησε προσφορά προμηθευτή
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,Make Supplier Quotation,Δημιούργησε προσφορά προμηθευτή
 DocType: Quality Inspection,Incoming,Εισερχόμενος
 DocType: BOM,Materials Required (Exploded),Υλικά που απαιτούνται (αναλυτικά)
 apps/erpnext/erpnext/public/js/setup_wizard.js +185,"Add users to your organization, other than yourself","Προσθέστε χρήστες για τον οργανισμό σας, εκτός από τον εαυτό σας"
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,Row # {0}: Serial No {1} does not match with {2} {3},Σειρά # {0}: Αύξων αριθμός {1} δεν ταιριάζει με το {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +42,Casual Leave,Περιστασιακή άδεια
+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,Περιστασιακή άδεια
 DocType: Batch,Batch ID,ID παρτίδας
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,Note: {0},Σημείωση : {0}
 ,Delivery Note Trends,Τάσεις δελτίου αποστολής
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +103,This Week's Summary,Περίληψη της Εβδομάδας
+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} μπορεί να ενημερώνεται μόνο μέσω συναλλαγών αποθέματος
 DocType: Student Group Creation Tool,Get Courses,Πάρτε μαθήματα
 DocType: GL Entry,Party,Συμβαλλόμενος
@@ -3423,7 +3469,7 @@
 DocType: Request for Quotation Item,Request for Quotation Item,Αίτηση Προσφοράς Είδους
 DocType: Purchase Order,To Bill,Για τιμολόγηση
 DocType: Material Request,% Ordered,Διέταξε%
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Piecework,Εργασία με το κομμάτι
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Piecework,Εργασία με το κομμάτι
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,Μέση τιμή αγοράς
 DocType: Task,Actual Time (in Hours),Πραγματικός χρόνος (σε ώρες)
 DocType: Employee,History In Company,Ιστορικό στην εταιρεία
@@ -3440,7 +3486,7 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +350,{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 +162,Black,Μαύρος
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,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} αντικείμενα που παράγονται
@@ -3451,13 +3497,13 @@
 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 +69,Customer Id,ID πελάτη
+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 Απών
 DocType: Journal Entry Account,Exchange Rate,Ισοτιμία
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Sales Order {0} is not submitted,Η παραγγελία πώλησης {0} δεν έχει υποβληθεί
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +527,Sales Order {0} is not submitted,Η παραγγελία πώλησης {0} δεν έχει υποβληθεί
 DocType: Homepage,Tag Line,Γραμμή ετικέτας
 DocType: Fee Component,Fee Component,χρέωση Component
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +857,Add items from,Προσθήκη στοιχείων από
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +836,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}
 DocType: Cheque Print Template,Regular,Τακτικός
 DocType: BOM,Last Purchase Rate,Τελευταία τιμή αγοράς
@@ -3465,6 +3511,7 @@
 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} γιατί έχει παραλλαγές
 ,Sales Person-wise Transaction Summary,Περίληψη συναλλαγών ανά πωλητή
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +60,Cost Center is required for 'Profit and Loss' account {0}. Please set up a default Cost Center for the Company.,Κέντρο Κόστους απαιτείται για το λογαριασμό «Αποτελέσματα Χρήσεως» {0}. Παρακαλείστε να δημιουργήσει ένα προεπιλεγμένο Κέντρο Κόστους για την Εταιρεία.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,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,Ποσοστά μηνιαίας διανομής
@@ -3475,12 +3522,12 @@
 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 +710,Online,σε απευθείας σύνδεση
+apps/erpnext/erpnext/accounts/page/pos/pos.js +692,Online,σε απευθείας σύνδεση
 ,Available Stock for Packing Items,Διαθέσιμο απόθεμα για είδη συσκευασίας
 DocType: Item Variant,Item Variant,Παραλλαγή είδους
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,"Αυτό το πρότυπο διεύθυνσης ορίστηκε ως προεπιλογή, καθώς δεν υπάρχει άλλη προεπιλογή."
+apps/erpnext/erpnext/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 +74,Quality Management,Διαχείριση ποιότητας
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,Διαχείριση ποιότητας
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,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,Ιστορικό εξωτερικών εργασιών υπαλλήλου
@@ -3502,11 +3549,12 @@
 DocType: Student,Student Email ID,Φοιτητής Email ID
 DocType: Employee,Notice (days),Ειδοποίηση (ημέρες)
 DocType: Tax Rule,Sales Tax Template,Φόρος επί των πωλήσεων Πρότυπο
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1520,Select items to save the invoice,Επιλέξτε αντικείμενα για να σώσει το τιμολόγιο
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1544,Select items to save the invoice,Επιλέξτε αντικείμενα για να σώσει το τιμολόγιο
 DocType: Employee,Encashment Date,Ημερομηνία εξαργύρωσης
 DocType: Account,Stock Adjustment,Διευθέτηση αποθέματος
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Υπάρχει Προεπιλογή Δραστηριότητα κόστος για Τύπος Δραστηριότητα - {0}
 DocType: Production Order,Planned Operating Cost,Προγραμματισμένο λειτουργικό κόστος
+DocType: Academic Term,Term Start Date,Term Ημερομηνία Έναρξης
 apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},Επισυνάπτεται #{0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Δήλωση ισορροπία τραπεζών σύμφωνα με τη Γενική Λογιστική
 DocType: Job Applicant,Applicant Name,Όνομα αιτούντος
@@ -3536,17 +3584,17 @@
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Ο λογαριασμός για την αποθήκη (διαρκής απογραφή) θα δημιουργηθεί στο πλαίσιο του παρόντος λογαριασμού.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +119,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Η αποθήκη δεν μπορεί να διαγραφεί, γιατί υφίσταται καταχώρηση στα καθολικά αποθέματα για την αποθήκη αυτή."
 DocType: Company,Distribution,Διανομή
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +8,Amount Paid,Πληρωμένο Ποσό
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Project Manager,Υπεύθυνος έργου
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,Πληρωμένο Ποσό
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,Υπεύθυνος έργου
 ,Quoted Item Comparison,Εισηγμένες Στοιχείο Σύγκριση
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Dispatch,Αποστολή
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,Αποστολή
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Η μέγιστη έκπτωση που επιτρέπεται για το είδος: {0} είναι {1}%
 apps/erpnext/erpnext/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.,Ρόλος που έχει τη δυνατότητα να υποβάλει τις συναλλαγές που υπερβαίνουν τα όρια πίστωσης.
-DocType: Sales Invoice,Supplier Reference,Σύσταση προμηθευτή
-apps/erpnext/erpnext/accounts/page/pos/pos.js +844,"Master data syncing, it might take some time","Δάσκαλος συγχρονισμό δεδομένων, μπορεί να πάρει κάποιο χρόνο"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +832,"Master data syncing, it might take some time","Δάσκαλος συγχρονισμό δεδομένων, μπορεί να πάρει κάποιο χρόνο"
 DocType: Item,Material Issue,Έκδοση υλικού
 DocType: Hub Settings,Seller Description,Περιγραφή πωλητή
 DocType: Employee Education,Qualification,Προσόν
@@ -3560,7 +3608,7 @@
 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 +83,Error in formula or condition,Σφάλμα στον τύπο ή την κατάσταση
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,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,Καταργήστε την επιλογή όλων
@@ -3569,7 +3617,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},Η 'εώς ημερομηνία' πρέπει να είναι εντός της χρήσης. Υποθέτοντας 'έως ημερομηνία' = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Εδώ μπορείτε να διατηρήσετε το ύψος, το βάρος, τις αλλεργίες, ιατροφαρμακευτική περίθαλψη, κλπ. Ανησυχίες"
 DocType: Leave Block List,Applies to Company,Ισχύει για την εταιρεία
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +197,Cannot cancel because submitted Stock Entry {0} exists,"Δεν μπορεί να γίνει ακύρωση, διότι υπάρχει καταχώρηση αποθέματος {0}"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +198,Cannot cancel because submitted Stock Entry {0} exists,"Δεν μπορεί να γίνει ακύρωση, διότι υπάρχει καταχώρηση αποθέματος {0}"
 DocType: Purchase Invoice,In Words,Με λόγια
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,Today is {0}'s birthday!,Σήμερα είναι τα γενέθλια του {0}
 DocType: Production Planning Tool,Material Request For Warehouse,Αίτηση υλικού για αποθήκη
@@ -3579,14 +3627,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,Το οικονομικό έτος σας αρχίζει
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Ενεργητικού Αποσβέσεις και Υπόλοιπα
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +319,Amount {0} {1} transferred from {2} to {3},Ποσό {0} {1} μεταφέρεται από {2} σε {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +322,Amount {0} {1} transferred from {2} to {3},Ποσό {0} {1} μεταφέρεται από {2} σε {3}
 DocType: Sales Invoice,Get Advances Received,Βρες προκαταβολές που εισπράχθηκαν
 DocType: Email Digest,Add/Remove Recipients,Προσθήκη / αφαίρεση παραληπτών
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +432,Transaction not allowed against stopped Production Order {0},Η συναλλαγή δεν επιτρέπεται σε σταματημένες εντολές παραγωγής {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +437,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 +143,Join,Συμμετοχή
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Έλλειψη ποσότητας
-apps/erpnext/erpnext/stock/doctype/item/item.py +652,Item variant {0} exists with same attributes,Παραλλαγή Θέση {0} υπάρχει με ίδια χαρακτηριστικά
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Παραλλαγή Θέση {0} υπάρχει με ίδια χαρακτηριστικά
+DocType: Leave Application,LAP/,ΑΓΚΑΛΙΆ/
 DocType: Salary Slip,Salary 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,Το πεδίο 'έως ημερομηνία' είναι απαραίτητο.
@@ -3594,12 +3643,12 @@
 DocType: Sales Invoice Item,Sales Order Item,Είδος παραγγελίας πώλησης
 DocType: Salary Slip,Payment Days,Ημέρες πληρωμής
 DocType: Customer,Dormant,Αδρανές
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +212,Warehouses with child nodes cannot be converted to ledger,Αποθήκες με κόμβους παιδί δεν μπορεί να μετατραπεί σε γενικό καθολικό
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +215,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: Employee Education,Employee Education,Εκπαίδευση των υπαλλήλων
-apps/erpnext/erpnext/public/js/controllers/transaction.js +866,It is needed to fetch Item Details.,Είναι απαραίτητη για να φέρω Λεπτομέρειες αντικειμένου.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +857,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} έχει ήδη ληφθεί
@@ -3609,14 +3658,14 @@
 DocType: Expense Claim,Total Claimed Amount,Συνολικό αιτούμενο ποσό αποζημίωσης
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Πιθανές ευκαιρίες για πώληση.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,Invalid {0},Άκυρη {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Sick Leave,Αναρρωτική άδεια
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,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,Πολυκαταστήματα
 DocType: Warehouse,PIN,ΚΑΡΦΊΤΣΑ
 DocType: Sales Invoice,Base Change Amount (Company Currency),Βάση Αλλαγή Ποσό (Εταιρεία νομίσματος)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +313,No accounting entries for the following warehouses,Δεν βρέθηκαν λογιστικές καταχωρήσεις για τις ακόλουθες αποθήκες
-apps/erpnext/erpnext/projects/doctype/project/project.js +102,Save the document first.,Αποθηκεύστε πρώτα το έγγραφο.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +314,No accounting entries for the following warehouses,Δεν βρέθηκαν λογιστικές καταχωρήσεις για τις ακόλουθες αποθήκες
+apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Αποθηκεύστε πρώτα το έγγραφο.
 DocType: Account,Chargeable,Χρεώσιμο
 DocType: Company,Change Abbreviation,Αλλαγή συντομογραφίας
 DocType: Expense Claim Detail,Expense Date,Ημερομηνία δαπάνης
@@ -3629,10 +3678,9 @@
 DocType: Purchase Invoice,Recurring Print Format,Επαναλαμβανόμενες έντυπη μορφή
 DocType: C-Form,Series,Σειρά
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,Expected Delivery Date cannot be before Purchase Order Date,Η αναμενόμενη ημερομηνία παράδοσης δεν μπορεί να είναι προγενέστερη της ημερομηνίας παραγγελίας αγοράς
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Παρακαλούμε να ορίσετε Ονομασία σειράς για {0} μέσω Ρύθμιση&gt; Ρυθμίσεις&gt; Ονοματοδοσία Σειρά
 DocType: Appraisal,Appraisal Template,Πρότυπο αξιολόγησης
 DocType: Item Group,Item Classification,Ταξινόμηση είδους
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Business Development Manager,Διαχειριστής ανάπτυξης επιχείρησης
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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,Γενικό καθολικό
@@ -3642,8 +3690,8 @@
 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 +940,Please select {0} first,Παρακαλώ επιλέξτε {0} πρώτα
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +749,Batch {0} of Item {1} has expired.,Παρτίδα {0} του σημείου {1} έχει λήξει.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +953,Please select {0} first,Παρακαλώ επιλέξτε {0} πρώτα
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +757,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,Μερικό σύνολο
@@ -3671,8 +3719,8 @@
  {% αν 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 +92,Warehouse not found in the system,Δεν βρέθηκε η αποθήκη στο σύστημα
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +106,This Month's Summary,Περίληψη Αυτό το Μήνα
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Δεν βρέθηκε η αποθήκη στο σύστημα
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Περίληψη Αυτό το Μήνα
 DocType: Quality Inspection Reading,Quality Inspection Reading,Μέτρηση επιθεώρησης ποιότητας
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,Το `πάγωμα αποθεμάτων παλαιότερα από ` θα πρέπει να είναι μικρότερο από % d ημέρες.
 DocType: Tax Rule,Purchase Tax Template,Αγοράστε Φορολογικά Πρότυπο
@@ -3682,21 +3730,22 @@
 DocType: Item Customer Detail,Ref Code,Κωδ. Αναφοράς
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Εγγραφές υπαλλήλων
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Please set Next Depreciation Date,Παρακαλούμε να ορίσετε Επόμενο Αποσβέσεις Ημερομηνία
-DocType: Payment Gateway,Payment Gateway,Πύλη Πληρωμών
 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 +378,Operation Time must be greater than 0 for Operation {0},Χρόνος λειτουργίας πρέπει να είναι μεγαλύτερη από 0 για τη λειτουργία {0}
+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/accounts/doctype/account/account.py +170,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 )
 DocType: Program,Program Abbreviation,Σύντμηση πρόγραμμα
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,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: Appraisal,Start Date,Ημερομηνία έναρξης
@@ -3712,21 +3761,22 @@
 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,Αφαιρέστε το είδος εάν οι επιβαρύνσεις δεν ισχύουν για αυτό το είδος
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Π.Χ. SMSgateway.Com / api / send_SMS.Cgi
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +27,Transaction currency must be same as Payment Gateway currency,Νόμισμα συναλλαγής πρέπει να είναι ίδια με πύλη πληρωμής νόμισμα
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Transaction currency must be same as Payment Gateway currency,Νόμισμα συναλλαγής πρέπει να είναι ίδια με πύλη πληρωμής νόμισμα
 DocType: Payment Entry,Receive,Λήψη
+apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,Παραθέσεις:
 DocType: Maintenance Visit,Fully Completed,Πλήρως ολοκληρωμένο
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% ολοκληρωμένο
 DocType: Employee,Educational Qualification,Εκπαιδευτικά προσόντα
 DocType: Workstation,Operating Costs,Λειτουργικά έξοδα
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Δράση αν συσσωρευμένη μηνιαία Προϋπολογισμός Υπέρβαση
 DocType: Purchase Invoice,Submit on creation,Υποβολή στη δημιουργία
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +432,Currency for {0} must be {1},Νόμισμα για {0} πρέπει να είναι {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +435,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 +493,Row {0}: An Reorder entry already exists for this warehouse {1},Γραμμή {0}: μια καταχώρηση αναδιάταξης υπάρχει ήδη για αυτή την αποθήκη {1}
+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/crm/doctype/opportunity/opportunity.py +79,"Cannot declare as lost, because Quotation has been made.","Δεν μπορεί να δηλώθει ως απολεσθέν, επειδή έχει γίνει προσφορά."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Κύρια εγγραφή υπευθύνου αγορών
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +429,Production Order {0} must be submitted,Η εντολή παραγωγής {0} πρέπει να υποβληθεί
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +434,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,Το πεδίο έως ημερομηνία δεν μπορεί να είναι προγενέστερο από το πεδίο από ημερομηνία
@@ -3736,25 +3786,27 @@
 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 +181,Totals,Σύνολα
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,Σύνολα
 DocType: BOM,Manufacturing,Παραγωγή
 ,Ordered Items To Be Delivered,Παραγγελθέντα είδη για παράδοση
 DocType: Account,Income,Έσοδα
 DocType: Industry Type,Industry Type,Τύπος βιομηχανίας
 apps/erpnext/erpnext/templates/includes/cart.js +141,Something went wrong!,Κάτι πήγε στραβά!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,Warning: Leave application contains following block dates,Προσοχή: η αίτηση αδείας περιλαμβάνει τις εξής μπλοκαρισμένες ημερομηνίες
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +120,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} για να ολοκληρώσετε τη συναλλαγή αυτή.
+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 +181,Organization unit (department) master.,Κύρια εγγραφή μονάδας (τμήματος) οργάνωσης.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,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 +793,All records are synced.,Όλα τα αρχεία συγχρονίζονται.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +781,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,Όνομα κέντρου κόστους
@@ -3773,21 +3825,20 @@
 DocType: Address,Name of person or organization that this address belongs to.,Όνομα προσώπου ή οργανισμού που ανήκει αυτή η διεύθυνση.
 apps/erpnext/erpnext/public/js/setup_wizard.js +260,Your Suppliers,Οι προμηθευτές σας
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +49,Cannot set as Lost as Sales Order is made.,"Δεν μπορεί να οριστεί ως απολεσθέν, καθώς έχει γίνει παραγγελία πώλησης."
-DocType: Student Applicant,Mother's Name,Όνομα μητρός
 DocType: Request for Quotation Item,Supplier Part No,Προμηθευτής Μέρος Όχι
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +348,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',δεν μπορεί να εκπέσει όταν η κατηγορία είναι για την «Αποτίμηση» ή «Vaulation και Total»
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Received From,Ελήφθη Από
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Received From,Ελήφθη Από
 DocType: Lead,Converted,Έχει μετατραπεί
 DocType: Item,Has Serial No,Έχει σειριακό αριθμό
 DocType: Employee,Date of Issue,Ημερομηνία έκδοσης
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: Από {0} για {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +153,Row #{0}: Set Supplier for item {1},Σειρά # {0}: Ορισμός Προμηθευτή για το στοιχείο {1}
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +93,Row {0}: Hours value must be greater than zero.,Σειρά {0}: Ώρες τιμή πρέπει να είναι μεγαλύτερη από το μηδέν.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +117,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} δεν μπορεί να βρεθεί
 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 +172,{0} {1} does not exist,{0} {1} δεν υπάρχει
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +175,{0} {1} does not exist,{0} {1} δεν υπάρχει
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,Please check Multi Currency option to allow accounts with other currency,Παρακαλώ ελέγξτε Πολλαπλών επιλογή νομίσματος για να επιτρέψει τους λογαριασμούς με άλλο νόμισμα
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +72,Item: {0} does not exist in the system,Το είδος: {0} δεν υπάρχει στο σύστημα
 apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,Δεν επιτρέπεται να ορίσετε παγωμένη αξία
@@ -3796,13 +3847,14 @@
 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/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,Η συμμετοχή δεν μπορεί να σημειωθεί για μελλοντικές ημερομηνίες
 DocType: Pricing Rule,Pricing Rule Help,Βοήθεια για τον κανόνα τιμολόγησης
 DocType: Purchase Taxes and Charges,Account Head,Κύρια εγγραφή λογαριασμού
 apps/erpnext/erpnext/config/stock.py +163,Update additional costs to calculate landed cost of items,Ενημέρωση πρόσθετων δαπανών για τον υπολογισμό του κόστος μεταφοράς των ειδών
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Electrical,Ηλεκτρικός
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Electrical,Ηλεκτρικός
 DocType: Stock Entry,Total Value Difference (Out - In),Συνολική διαφορά αξίας (εξερχόμενη - εισερχόμενη)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,Row {0}: Exchange Rate is mandatory,Σειρά {0}: συναλλαγματικής ισοτιμίας είναι υποχρεωτική
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Το ID χρήστη δεν έχει οριστεί για τον υπάλληλο {0}
@@ -3810,7 +3862,7 @@
 DocType: Item,Customer Code,Κωδικός πελάτη
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +210,Birthday Reminder for {0},Υπενθύμιση γενεθλίων για {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Ημέρες από την τελευταία παραγγελία
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +292,Debit To account must be a Balance Sheet account,Χρέωση του λογαριασμού πρέπει να είναι ένα κονδύλι του Ισολογισμού
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To account must be a Balance Sheet account,Χρέωση του λογαριασμού πρέπει να είναι ένα κονδύλι του Ισολογισμού
 DocType: Buying Settings,Naming Series,Σειρά ονομασίας
 DocType: Leave Block List,Leave Block List Name,Όνομα λίστας αποκλεισμού ημερών άδειας
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Ενεργητικό αποθέματος
@@ -3822,11 +3874,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 +301,Salary Slip of employee {0} already created for time sheet {1},Μισθός Slip των εργαζομένων {0} ήδη δημιουργήσει για φύλλο χρόνο {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +313,Salary Slip of employee {0} already created for time sheet {1},Μισθός Slip των εργαζομένων {0} ήδη δημιουργήσει για φύλλο χρόνο {1}
 DocType: Sales Order Item,Ordered Qty,Παραγγελθείσα ποσότητα
-apps/erpnext/erpnext/stock/doctype/item/item.py +673,Item {0} is disabled,Θέση {0} είναι απενεργοποιημένη
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} is disabled,Θέση {0} είναι απενεργοποιημένη
 DocType: Stock Settings,Stock Frozen Upto,Παγωμένο απόθεμα μέχρι
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +838,BOM does not contain any stock item,BOM δεν περιέχει κανένα στοιχείο απόθεμα
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +809,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,Δημιουργία βεβαιώσεων αποδοχών
@@ -3834,23 +3886,24 @@
 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 +485,Row #{0}: Please set reorder quantity,Σειρά # {0}: Παρακαλούμε ρυθμίστε την ποσότητα αναπαραγγελίας
+DocType: Sales Invoice Timesheet,Billing Hours,Ώρες χρέωσης
+apps/erpnext/erpnext/stock/doctype/item/item.py +487,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 +62,Please set {0},Παρακαλώ να ορίσετε {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Επανάληψη την ημέρα του μήνα
 DocType: Employee,Health Details,Λεπτομέρειες υγείας
 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,Υποβολή όλων των βεβαιώσεων αποδοχών για τα παραπάνω επιλεγμένα κριτήρια
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} είδη συγχρονίστηκαν
 DocType: Sales Order,Partly Delivered,Έχει παραδοθεί μερικώς
-DocType: Sales Invoice,Existing Customer,Υφιστάμενος πελάτης
 DocType: Email Digest,Receivables,Απαιτήσεις
+DocType: Lead Source,Lead Source,Από που προήρθε η επαφή
 DocType: Customer,Additional information regarding the customer.,Πρόσθετες πληροφορίες σχετικά με τον πελάτη.
 DocType: Quality Inspection Reading,Reading 5,Μέτρηση 5
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +38,Campaign Name is required,Το όνομα εκστρατείας είναι απαραίτητο
 DocType: Maintenance Visit,Maintenance Date,Ημερομηνία συντήρησης
 DocType: Purchase Invoice Item,Rejected Serial No,Σειριακός αριθμός που απορρίφθηκε
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +80,Year start date or end date is overlapping with {0}. To avoid please set company,Έτος ημερομηνία έναρξης ή την ημερομηνία λήξης είναι η επικάλυψη με {0}. Για την αποφυγή ορίστε εταιρείας
@@ -3858,10 +3911,9 @@
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.",". Παράδειγμα: abcd # # # # # αν έχει οριστεί σειρά και ο σειριακός αριθμός δεν αναφέρεται στις συναλλαγές, τότε θα δημιουργηθεί σειριακός αριθμός αυτόματα με βάση αυτή τη σειρά. Αν θέλετε πάντα να αναφέρεται ρητά ο σειριακός αριθμός για αυτό το προϊόν, αφήστε κενό αυτό το πεδίο"
 DocType: Upload Attendance,Upload Attendance,Ανεβάστε παρουσίες
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +129,BOM and Manufacturing Quantity are required,BOM και Βιομηχανία Ποσότητα απαιτούνται
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,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,Μέγιστη Αντοχή
-DocType: Bank Reconciliation Detail,Amount,Ποσό
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Η Λ.Υ. αντικαταστάθηκε
 ,Sales Analytics,Ανάλυση πωλήσεων
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +113,Available {0},Διαθέσιμο {0}
@@ -3869,14 +3921,14 @@
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Ρύθμιση ηλεκτρονικού ταχυδρομείου
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +96,Please enter default currency in Company Master,Παρακαλώ εισάγετε προεπιλεγμένο νόμισμα στην κύρια εγγραφή της εταιρείας
 DocType: Stock Entry Detail,Stock Entry Detail,Λεπτομέρειες καταχώρησης αποθέματος
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +100,Daily Reminders,Καθημερινές υπενθυμίσεις
+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/account/account_tree.js +23,New Account Name,Νέο όνομα λογαριασμού
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Κόστος πρώτων υλών που προμηθεύτηκαν
 DocType: Selling Settings,Settings for Selling Module,Ρυθμίσεις για τη λειτουργική μονάδα πωλήσεων
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Customer Service,Εξυπηρέτηση πελατών
+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/config/hr.py +50,Offer candidate a Job.,Προσφορά υποψήφιος δουλειά.
@@ -3885,8 +3937,9 @@
 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} πρέπει να είναι ένα αποθηκεύσιμο είδος
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Προεπιλογή Work In Progress Αποθήκη
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1570,Total nos of serial no is not equal to quantity.,Σύνολο νος της αύξων αριθμός δεν είναι ίση με την ποσότητα.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1594,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,Ενημέρωση αριθμού σειράς
@@ -3894,9 +3947,10 @@
 DocType: Sales Order,Printing Details,Λεπτομέρειες εκτύπωσης
 DocType: Task,Closing Date,Καταληκτική ημερομηνία
 DocType: Sales Order Item,Produced Quantity,Παραγόμενη ποσότητα
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Engineer,Μηχανικός
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,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 +370,Item Code required at Row No {0},Ο κωδικός είδους απαιτείται στην γραμμή νο. {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +398,Item Code required at Row No {0},Ο κωδικός είδους απαιτείται στην γραμμή νο. {0}
 DocType: Sales Partner,Partner Type,Τύπος συνεργάτη
 DocType: Purchase Taxes and Charges,Actual,Πραγματικός
 DocType: Authorization Rule,Customerwise Discount,Έκπτωση με βάση πελάτη
@@ -3912,16 +3966,18 @@
 DocType: BOM,Raw Material Cost,Κόστος πρώτων υλών
 DocType: Item Reorder,Re-Order Level,Επίπεδο επαναπαραγγελίας
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Εισάγετε τα είδη και την προγραμματισμένη ποσότητα για την οποία θέλετε να δημιουργηθούν οι εντολές παραγωγής ή να κατεβάσετε τις πρώτες ύλες για την ανάλυση.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +55,Part-time,Μερικής απασχόλησης
+apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,Διάγραμμα gantt
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,Μερικής απασχόλησης
 DocType: Employee,Applicable Holiday List,Εφαρμοστέος κατάλογος διακοπών
 DocType: Employee,Cheque,Επιταγή
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Η σειρά ενημερώθηκε
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +57,Series Updated,Η σειρά ενημερώθηκε
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,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 +87,Clearance Date updated,Εκκαθάριση Ημερομηνία ενημερώθηκε
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Επιτυχής συμφωνία
@@ -3935,7 +3991,7 @@
 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 +513,Posting date and posting time is mandatory,Η ημερομηνία αποστολής και ώρα αποστολής είναι απαραίτητες
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,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.,Με λόγια θα είναι ορατά αφού αποθηκεύσετε την παραγγελία αγοράς.
@@ -3945,7 +4001,7 @@
 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/stock/doctype/stock_entry/stock_entry.py +158,Target warehouse in row {0} must be same as Production Order,Η αποθήκη προορισμού στη γραμμή {0} πρέπει να είναι η ίδια όπως στη εντολή παραγωγής
+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,Νόμισμα δεν μπορεί να αλλάξει μετά την πραγματοποίηση εγγραφών χρησιμοποιώντας κάποιο άλλο νόμισμα
 DocType: Company,Round Off Account,Στρογγυλεύουν Λογαριασμού
@@ -3954,23 +4010,22 @@
 DocType: Customer Group,Parent Customer Group,Γονική ομάδα πελατών
 DocType: Purchase Invoice,Contact Email,Email επαφής
 DocType: Appraisal Goal,Score Earned,Αποτέλεσμα
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Notice Period,Ανακοίνωση Περίοδος
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,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 +4,New Sales Person Name,Όνομα νέο πρόσωπο πωλήσεων
 DocType: Packing Slip,Gross Weight UOM,Μ.Μ. Μικτού βάρους
-DocType: Email Digest,Receivables / Payables,Απαιτήσεις / υποχρεώσεις
 DocType: Delivery Note Item,Against Sales Invoice,Κατά το τιμολόγιο πώλησης
 DocType: Bin,Reserved Qty for Production,Διατηρούνται Ποσότητα Παραγωγής
 DocType: Asset,Frequency of Depreciation (Months),Συχνότητα αποσβέσεων (μήνες)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +469,Credit Account,Λογαριασμός Πίστωσης
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Credit Account,Λογαριασμός Πίστωσης
 DocType: Landed Cost Item,Landed Cost Item,Είδος κόστους αποστολής εμπορευμάτων
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +55,Show zero values,Προβολή μηδενικών τιμών
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Προβολή μηδενικών τιμών
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Ποσότητα του είδους που αποκτήθηκε μετά την παραγωγή / ανασυσκευασία από συγκεκριμένες ποσότητες πρώτων υλών
 apps/erpnext/erpnext/public/js/setup_wizard.js +315,Setup a simple website for my organization,Ρύθμιση μια απλή ιστοσελίδα για τον οργανισμό μου
 DocType: Payment Reconciliation,Receivable / Payable Account,Εισπρακτέοι / πληρωτέοι λογαριασμού
 DocType: Delivery Note Item,Against Sales Order Item,Κατά το είδος στην παραγγελία πώλησης
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Please specify Attribute Value for attribute {0},Παρακαλείστε να αναφέρετε Χαρακτηριστικό γνώρισμα Σχέση {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Παρακαλείστε να αναφέρετε Χαρακτηριστικό γνώρισμα Σχέση {0}
 DocType: Item,Default Warehouse,Προεπιλεγμένη αποθήκη
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +39,Budget cannot be assigned against Group Account {0},Ο προϋπολογισμός δεν μπορεί να αποδοθεί κατά του λογαριασμού του Ομίλου {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,Παρακαλώ εισάγετε γονικό κέντρο κόστους
@@ -3992,19 +4047,22 @@
 DocType: Journal Entry,Total Debit,Συνολική χρέωση
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Προεπιλογή Έτοιμα προϊόντα Αποθήκη
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,Πωλητής
-DocType: Sales Invoice,Cold Calling,Cold calling
 DocType: SMS Parameter,SMS Parameter,Παράμετροι SMS
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,Προϋπολογισμός και Κέντρο Κόστους
 DocType: Maintenance Schedule Item,Half Yearly,Εξαμηνιαία
 DocType: Lead,Blog Subscriber,Συνδρομητής blog
+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 +253,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 +141,Set as Lost,Ορισμός ως απολεσθέν
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,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 +5,This is based on transactions against this Customer. See timeline below for details,Αυτό βασίζεται σε συναλλαγές κατά αυτόν τον πελάτη. Δείτε χρονοδιάγραμμα παρακάτω για λεπτομέρειες
 DocType: Supplier,Credit Days Based On,Πιστωτικές ημερών βάσει της
@@ -4016,11 +4074,10 @@
 ,Items To Be Requested,Είδη που θα ζητηθούν
 DocType: Purchase Order,Get Last Purchase Rate,Βρες τελευταία τιμή αγοράς
 DocType: Company,Company Info,Πληροφορίες εταιρείας
-apps/erpnext/erpnext/accounts/page/pos/pos.js +941,Select or add new customer,Επιλέξτε ή προσθέστε νέο πελάτη
+apps/erpnext/erpnext/accounts/page/pos/pos.js +930,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 +5,This is based on the attendance of this Employee,Αυτό βασίζεται στην προσέλευση του υπαλλήλου αυτού
-DocType: Sales Invoice,Frequency,Συχνότητα
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +463,Debit Account,Ο λογαριασμός Χρεωστικές
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Debit Account,Ο λογαριασμός Χρεωστικές
 DocType: Fiscal Year,Year Start Date,Ημερομηνία έναρξης έτους
 DocType: Attendance,Employee Name,Όνομα υπαλλήλου
 DocType: Sales Invoice,Rounded Total (Company Currency),Στρογγυλοποιημένο σύνολο (νόμισμα της εταιρείας)
@@ -4029,27 +4086,27 @@
 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 +210,Supplier Quotation {0} created,Προσφορά Προμηθευτής {0} δημιουργήθηκε
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +208,Supplier Quotation {0} created,Προσφορά Προμηθευτής {0} δημιουργήθηκε
 apps/erpnext/erpnext/accounts/report/financial_statements.py +90,End Year cannot be before Start Year,Στο τέλος του έτους δεν μπορεί να είναι πριν από την έναρξη Έτος
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Employee Benefits,Παροχές σε εργαζομένους
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,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 +228,Please set a default Holiday List for Employee {0} or Company {1},Παρακαλούμε να ορίσετε μια προεπιλεγμένη διακοπές Λίστα υπάλληλου {0} ή της Εταιρείας {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +232,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 +499,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Σειρά Όχι {0}: Ποσό δεν μπορεί να είναι μεγαλύτερη από ό, τι εκκρεμές ποσό έναντι αιτημάτων εξόδων {1}. Εν αναμονή ποσό {2}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +500,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 +1007,Price List not found or disabled,Τιμοκατάλογος δεν βρέθηκε ή άτομα με ειδικές ανάγκες
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1008,Price List not found or disabled,Τιμοκατάλογος δεν βρέθηκε ή άτομα με ειδικές ανάγκες
 DocType: Expense Claim,Approved,Εγκρίθηκε
 DocType: Pricing Rule,Price,Τιμή
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +244,Employee relieved on {0} must be set as 'Left',Υπάλληλος ελεύθερος για {0} πρέπει να οριστεί ως έχει φύγει
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +256,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} στο συγκεκριμένο εύρος ημερομηνιών
@@ -4060,12 +4117,12 @@
 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 +259,Please select Employee Record first.,Παρακαλώ επιλέξτε πρώτα Εγγραφή Εργαζομένων.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +266,Please select Employee Record first.,Παρακαλώ επιλέξτε πρώτα Εγγραφή Εργαζομένων.
 DocType: POS Profile,Account for Change Amount,Ο λογαριασμός για την Αλλαγή Ποσό
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +190,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Σειρά {0}: Πάρτι / λογαριασμός δεν ταιριάζει με {1} / {2} στο {3} {4}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +235,Please enter Expense Account,Παρακαλώ εισάγετε λογαριασμό δαπανών
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,Please enter Expense Account,Παρακαλώ εισάγετε λογαριασμό δαπανών
 DocType: Account,Stock,Απόθεμα
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,"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 +976,"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,Αγορά / λεπτομέρειες παραγωγής
@@ -4080,9 +4137,10 @@
 DocType: Asset Movement,Transaction Date,Ημερομηνία συναλλαγής
 DocType: Production Plan Item,Planned Qty,Προγραμματισμένη ποσότητα
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,Σύνολο φόρου
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,For Quantity (Manufactured Qty) is mandatory,Για Ποσότητα (Τεμ Κατασκευάζεται) είναι υποχρεωτικά
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,For Quantity (Manufactured Qty) is mandatory,Για Ποσότητα (Τεμ Κατασκευάζεται) είναι υποχρεωτικά
 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 +78,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,Πραγματική ημερομηνία έναρξης
@@ -4097,9 +4155,11 @@
 DocType: Warranty Claim,If different than customer address,Αν είναι διαφορετική από τη διεύθυνση του πελάτη
 DocType: BOM Operation,BOM Operation,Λειτουργία Λ.Υ.
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Στο ποσό της προηγούμενης γραμμής
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +226,Transfer Asset,μεταβίβαση περιουσιακών στοιχείων
+DocType: Student,Home Address,Διεύθυνση σπιτιού
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +227,Transfer Asset,μεταβίβαση περιουσιακών στοιχείων
 DocType: POS Profile,POS Profile,POS Προφίλ
 apps/erpnext/erpnext/config/schools.py +33,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 +129,"Item {0} is a template, please select one of its variants","Θέση {0} είναι ένα πρότυπο, επιλέξτε μία από τις παραλλαγές του"
 DocType: Asset,Asset Category,Κατηγορία Παγίου
@@ -4109,8 +4169,8 @@
 DocType: Assessment,Room,Δωμάτιο
 DocType: Purchase Order,Advance Paid,Προκαταβολή που καταβλήθηκε
 DocType: Item,Item Tax,Φόρος είδους
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +765,Material to Supplier,Υλικό Προμηθευτή
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +189,Excise Invoice,Των ειδικών φόρων κατανάλωσης Τιμολόγιο
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,Material to Supplier,Υλικό Προμηθευτή
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,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,Βραχυπρόθεσμες υποχρεώσεις
@@ -4120,7 +4180,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,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 +136,Credit Card,Πιστωτική κάρτα
+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.,Προεπιλεγμένες ρυθμίσεις για συναλλαγές αποθέματος.
 DocType: Purchase Invoice,Next Date,Επόμενη ημερομηνία
@@ -4128,6 +4188,7 @@
 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: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Εδώ μπορείτε να διατηρήσετε τα στοιχεία της οικογένειας όπως το όνομα και η ιδιότητα του γονέα, σύζυγος και παιδιά"
+DocType: Academic Term,Term End Date,Term Ημερομηνία Λήξης
 DocType: Hub Settings,Seller Name,Ονομα πωλητή
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Φόροι και επιβαρύνσεις που παρακρατήθηκαν (νόμισμα της εταιρείας)
 DocType: Item Group,General Settings,Γενικές ρυθμίσεις
@@ -4139,7 +4200,7 @@
 DocType: Customer,Commission Rate,Ποσό προμήθειας
 apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,Κάντε Παραλλαγή
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Αποκλεισμός αιτήσεων άδειας από το τμήμα
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +115,"Payment Type must be one of Receive, Pay and Internal Transfer","Τύπος πληρωμής πρέπει να είναι ένα από Λάβετε, Pay και εσωτερική μεταφορά"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +118,"Payment Type must be one of Receive, Pay and Internal Transfer","Τύπος πληρωμής πρέπει να είναι ένα από Λάβετε, Pay και εσωτερική μεταφορά"
 apps/erpnext/erpnext/config/selling.py +169,Analytics,Analytics
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Το καλάθι είναι άδειο
 DocType: Production Order,Actual Operating Cost,Πραγματικό κόστος λειτουργίας
@@ -4154,10 +4215,10 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,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 +92,Designer,Σχεδιαστής
+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/accounts/doctype/purchase_invoice/purchase_invoice.py +469,Cost Center is required in row {0} in Taxes table for type {1},Το κέντρο κόστους απαιτείται στη γραμμή {0} στον πίνακα πίνακα φόρων για τον τύπο {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +472,Cost Center is required in row {0} in Taxes table for type {1},Το κέντρο κόστους απαιτείται στη γραμμή {0} στον πίνακα πίνακα φόρων για τον τύπο {1}
 DocType: Program,Program Code,Κωδικός προγράμματος
 ,Item-wise Purchase Register,Ταμείο αγορών ανά είδος
 DocType: Batch,Expiry Date,Ημερομηνία λήξης
@@ -4167,12 +4228,12 @@
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Κύρια εγγραφή έργου.
 apps/erpnext/erpnext/controllers/status_updater.py +174,"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 +417, (Half Day),(Μισή ημέρα)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425, (Half Day),(Μισή ημέρα)
 DocType: Supplier,Credit Days,Ημέρες πίστωσης
 DocType: Leave Type,Is Carry Forward,Είναι μεταφορά σε άλλη χρήση
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +740,Get Items from BOM,Λήψη ειδών από Λ.Υ.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +711,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 +549,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Σειρά # {0}: Απόσπαση Ημερομηνία πρέπει να είναι ίδια με την ημερομηνία αγοράς {1} του περιουσιακού στοιχείου {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +552,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,Μεταφορά ενός στοιχείου από μια αποθήκη σε άλλη
diff --git a/erpnext/translations/es-AR.csv b/erpnext/translations/es-AR.csv
index e69de29..7290c6c 100644
--- a/erpnext/translations/es-AR.csv
+++ b/erpnext/translations/es-AR.csv
@@ -0,0 +1,5 @@
+DocType: Fee Structure,Components,Componentes
+DocType: Purchase Invoice Item,Item,Producto
+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
diff --git a/erpnext/translations/es-NI.csv b/erpnext/translations/es-NI.csv
index e69de29..3880aaa 100644
--- a/erpnext/translations/es-NI.csv
+++ b/erpnext/translations/es-NI.csv
@@ -0,0 +1,6 @@
+DocType: Tax Rule,Tax Rule,Regla Fiscal
+DocType: POS Profile,Account for Change Amount,Cuenta para el Cambio de Monto
+apps/erpnext/erpnext/controllers/accounts_controller.py +558,'Update Stock' cannot be checked for fixed asset sale,"""Actualización de Existencia' no se puede ser escogida para venta de activo fijo"
+DocType: Customer,Tax ID,RUC
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85,Tax Rule Conflicts with {0},Regla Fiscal en conflicto con {0}
+DocType: Item Tax,Tax Rate,Tasa de Impuesto
diff --git a/erpnext/translations/es-PE.csv b/erpnext/translations/es-PE.csv
index 7be8b24..9f52df3 100644
--- a/erpnext/translations/es-PE.csv
+++ b/erpnext/translations/es-PE.csv
@@ -9,21 +9,21 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +158,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 +180,Outstanding for {0} cannot be less than zero ({1}),Sobresaliente para {0} no puede ser menor que cero ({1} )
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,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 +148,Series Updated Successfully,Serie actualizado correctamente
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +149,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 +54,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 +239,New Leave Application,Nueva Aplicación de Permiso
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,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 +142,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 +198,Row {0}: {1} {2} does not match with {3},Fila {0}: {1} {2} no coincide con {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Fila # {0}:
+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
@@ -34,7 +34,7 @@
 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 +382,Stock cannot be updated against Delivery Note {0},Inventario no puede actualizarse contra Nota de Envio {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,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
@@ -43,7 +43,7 @@
 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 +156,Credit limit has been crossed for customer {0} {1}/{2},Límite de crédito se ha cruzado para el cliente {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +189,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
@@ -57,30 +57,31 @@
 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 +614,"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/controllers/accounts_controller.py +617,"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 +166,Settings for HR Module,Ajustes para el Módulo de Recursos Humanos
 DocType: Timesheet,Batch Time Logs for billing.,Bitácora de Lotes para  facturación.
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Los detalles de las operaciones realizadas.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,Cost Center {0} does not belong to Company {1},Centro de Costos {0} no pertenece a la empresa {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +100,Cost Center {0} does not belong to Company {1},Centro de Costos {0} no pertenece a la empresa {1}
 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 +206,Only the selected Leave Approver can submit this Leave Application,Sólo el Supervisor de Vacaciones seleccionado puede presentar esta solicitud de permiso
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +213,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 +103,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 +91,Software Developer,Desarrollador de Software
+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
@@ -91,11 +92,11 @@
 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 +348,Completed Qty can not be greater than 'Qty to Manufacture',La cantidad completada no puede ser mayor que la cantidad a producir
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +349,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 +806,Delivery Note,Notas de Entrega
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +800,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"
@@ -105,7 +106,7 @@
 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 +142,Purchase Invoice {0} is already submitted,Factura de Compra {0} ya existe
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +143,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 +19,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}
@@ -118,7 +119,7 @@
 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: BOM,Item Desription,Descripción del Artículo
+DocType: BOM,Item Description,Descripción del Artículo
 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
@@ -134,8 +135,8 @@
 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 +86,Administrative Officer,Oficial Administrativo
-apps/erpnext/erpnext/stock/doctype/item/item.py +530,"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/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 +47,Abbreviation already used for another company,La Abreviación ya está siendo utilizada para otra compañía
@@ -147,15 +148,14 @@
 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 +707,Make Sales Order,Hacer Orden de Venta
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +701,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 +734,Sales Return,Volver Ventas
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +728,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 +91,Reference No & Reference Date is required for {0},Se requiere de No de Referencia y Fecha de Referencia para {0}
-DocType: Sales Invoice,Customer's Vendor,Vendedor del Cliente
 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 .
@@ -187,7 +187,7 @@
 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 +90,{0} is not a stock Item,{0} no es un producto de stock
+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 +169,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
@@ -214,7 +214,7 @@
 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 +342,{0} against Bill {1} dated {2},{0} contra Factura {1} de fecha {2}
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +229,Target Warehouse,Inventario Objetivo
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +230,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 +37,Projected Qty,Cant. Proyectada
@@ -225,7 +225,7 @@
 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 +756,Purchase Receipt,Recibos de Compra
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +735,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
@@ -240,20 +240,20 @@
 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 +86, 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 +109,Row #{0}: Please specify Serial No for Item {1},"Fila # {0}: Por favor, especifique No de Serie de artículos {1}"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +75, 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 +810,Select Item for Transfer,Seleccionar elemento de Transferencia
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +789,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 +105,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: Process Payroll,Select Payroll Year and Month,Seleccione nómina Año y Mes
 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 +731,Make ,Hacer
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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 +175,Stock Options,Opciones sobre Acciones
+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
@@ -262,7 +262,7 @@
 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 +194,Serial No {0} is under maintenance contract upto {1},Número de orden {0} tiene un contrato de mantenimiento hasta {1}
+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
@@ -273,7 +273,7 @@
 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 +400,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/controllers/accounts_controller.py +403,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}"
@@ -281,14 +281,14 @@
 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 +362,Finished Item {0} must be entered for Manufacture type entry,El producto terminado {0} debe ser introducido para la fabricación
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +367,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
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},Se requiere débito o crédito para la cantidad {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +55,Either debit or credit amount is required for {0},Se requiere débito o crédito para la cantidad {0}
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","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 +685,Cost Center For Item with Item Code ',Centro de Costos para artículo con Código del artículo '
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +679,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
@@ -297,17 +297,17 @@
 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 +417,'Entries' cannot be empty,'Entradas' no puede estar vacío
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +418,'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/public/js/controllers/stock_controller.js +40,Accounting Ledger,Libro Mayor Contable
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,Accounting Ledger,Libro Mayor Contable
 DocType: BOM Item,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 +131,Balance for Account {0} must always be {1},Balance de cuenta {0} debe ser siempre {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,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 +87, to ,para
+apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,para
 DocType: Journal Entry,Get Outstanding Invoices,Verifique Facturas Pendientes
 apps/erpnext/erpnext/setup/doctype/company/company.py +185,"Sorry, companies cannot be merged","Lo sentimos , las empresas no se pueden combinar"
 DocType: Employee,Employee Number,Número del Empleado
@@ -315,18 +315,18 @@
 ,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 +80,Row {0}: Qty is mandatory,Fila {0}: Cantidad es obligatorio
+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 +31,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/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 +474,Delivery Note {0} is not submitted,Nota de Entrega {0} no está presentada
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Delivery Note {0} is not submitted,Nota de Entrega {0} no está presentada
 apps/erpnext/erpnext/stock/get_item_details.py +133,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 +757,For Supplier,Por proveedor
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +723,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"""
@@ -339,25 +339,25 @@
 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 +48,Privilege Leave,Permiso con Privilegio
+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 +79,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 Slip,Earning,Ganancia
+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 +171,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
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,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 +35,'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 +209,Stock Entries already created for Production Order ,Imagenes de entradas ya creadas por Orden de Producción
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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 +238,Max: {0},Max: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +239,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 +552,cannot be greater than 100,No puede ser mayor que 100
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +546,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"
@@ -373,11 +373,11 @@
 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 +141,Source warehouse is mandatory for row {0},Almacén de origen es obligatoria para la fila {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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 +103,Government,Gobierno
+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
@@ -392,19 +392,19 @@
 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
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +110,Accounting Entry for {0} can only be made in currency: {1},La Partida Contable para {0} puede hacerse en la siguiente moneda: {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},La Partida Contable para {0} puede hacerse en la siguiente moneda: {1}
 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 +78,Row # {0}: Returned Item {1} does not exists in {2} {3},Fila # {0}: El artículo vuelto {1} no existe en {2} {3}
+apps/erpnext/erpnext/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 +545,Manufacturing Quantity is mandatory,Cantidad de Fabricación es obligatoria
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,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 +190,Leave of type {0} cannot be longer than {1},Permiso de tipo {0} no puede tener más de {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +197,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
@@ -433,8 +433,7 @@
 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 +93,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/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},El tipo de entidad es requerida para las cuentas de Cobrar/Pagar {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +126,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}
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Totales del Objetivo
@@ -443,12 +442,12 @@
 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 +141,There is not enough leave balance for Leave Type {0},No hay suficiente saldo para Tipo de Vacaciones {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,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 +172,Work-in-Progress Warehouse is required before Submit,Se requiere un Almacen de Trabajo en Proceso antes de Enviar
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,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 +212,Against Journal Entry {0} does not have any unmatched {1} entry,Contra la Entrada de Diario {0} no tiene ninguna {1} entrada que vincular
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +215,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)
 DocType: Sales Order,To Deliver and Bill,Para Entregar y Bill
@@ -473,7 +472,7 @@
 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 +458,Item table can not be blank,Tabla de artículos no puede estar en blanco
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +443,Item table can not be blank,Tabla de artículos 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 {1} periodicidad, diferencia entre desde y hasta la fecha \
  debe ser mayor que o igual a {2}"
@@ -488,7 +487,7 @@
 ,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 +187,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,"Fila # {0}: Operación {1} no se ha completado para {2} cantidad de productos terminados en orden de producción # {3}. Por favor, actualice el estado de funcionamiento a través de los registros de tiempo"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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
@@ -496,7 +495,7 @@
 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 +295,Debit To account must be a Receivable account,La cuenta para Débito debe ser una cuenta por cobrar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,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
@@ -507,7 +506,7 @@
 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 +26,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 +272,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/controllers/accounts_controller.py +275,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
@@ -515,20 +514,20 @@
 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 +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Caracteres especiales excepto ""-"" ""."", ""#"", y ""/"" no permitido en el nombramiento de serie"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Caracteres especiales excepto ""-"" ""."", ""#"", y ""/"" no permitido en 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 +191,Serial No {0} is under warranty upto {1},Número de orden {0} está en garantía hasta {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +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 +74,Shipments,Los envíos
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,Row # ,Fila #
+apps/erpnext/erpnext/hooks.py +81,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 +167,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 +346,{0} is mandatory for Item {1},{0} es obligatorio para el producto {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,{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
@@ -561,14 +560,14 @@
 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 +161,Maxiumm discount for Item {0} is {1}%,Descuento máximo para el elemento {0} es {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +162,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 +23,Update Cost,Actualización de Costos
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,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
@@ -579,6 +578,7 @@
 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 +199,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
@@ -589,32 +589,32 @@
 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 +161,{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/manufacturing/doctype/production_order/production_order.py +162,{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 +217,Raw Materials cannot be blank.,Materias primas no pueden estar en blanco.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +111,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/manufacturing/doctype/bom/bom.js +103,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 +214,{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 +739,Item or Warehouse for row {0} does not match Material Request,Artículo o Bodega para la fila {0} no coincide Solicitud de material
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +747,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: Lead,Opportunity,Oportunidades
+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 +198,Maintenance start date can not be before delivery date for Serial No {0},Mantenimiento fecha de inicio no puede ser antes de la fecha de entrega para la Serie No {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +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 +117,Contract End Date must be greater than Date of Joining,La Fecha de Finalización de Contrato debe ser mayor que la Fecha de la Firma
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Terceros / proveedor / comisionista / afiliado / distribuidor que vende productos de empresas a cambio de una comisión.
 DocType: 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 +14,This is an example website auto-generated from ERPNext,Este es un sitio web ejemplo generado por automáticamente por ERPNext
+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 +504,Stock Entry {0} is not submitted,Entrada de la {0} no se presenta
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +505,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
@@ -634,7 +634,7 @@
 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 +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Programa de mantenimiento no se genera para todos los artículos. Por favor, haga clic en ¨ Generar Programación¨"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +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 +163,"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"
@@ -642,20 +642,20 @@
 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 +403,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/accounts/doctype/sales_invoice/sales_invoice.js +397,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 +100,Issues,Problemas
+apps/erpnext/erpnext/hooks.py +109,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 +507,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/journal_entry/journal_entry.py +508,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
@@ -673,22 +673,22 @@
 ,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/stock/doctype/purchase_receipt/purchase_receipt.py +98,Quality Inspection required for Item {0},Inspección de la calidad requerida para el articulo {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,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 +384,Accounting Entry for Stock,Asiento contable de inventario
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +387,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 +88,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}
+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 +147,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 +719,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 +194,Account {0} is frozen,Cuenta {0} está congelada
+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 +690,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 +197,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
@@ -697,7 +697,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Software
 DocType: Maintenance Visit,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 +168,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/hr/doctype/leave_application/leave_application.py +175,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
@@ -721,7 +721,7 @@
 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 +497,Material Requests {0} created,Solicitud de Material {0} creada
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +498,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
@@ -740,11 +740,11 @@
 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
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","El cuenta de Patrimonio , en el que será calculada la  Ganancia / Pérdida"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +166,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 +81,Purchase Order number required for Item {0},Número de la Orden de Compra se requiere para el elemento {0}
+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 +82,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 +356,Customer {0} does not belong to project {1},Cliente {0} no pertenece a proyectar {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,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
@@ -754,7 +754,7 @@
 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 +197,Leave approver must be one of {0},Supervisor de Vacaciones debe ser uno de {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,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
@@ -804,13 +804,12 @@
 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 +162,Please contact to the user who have Sales Master Manager {0} role,"Por favor, póngase en contacto con el usuario con función de Gerente de Ventas {0}"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +195,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/accounts/doctype/gl_entry/gl_entry.py +57,Cost Center is required for 'Profit and Loss' account {0},"Se requiere de Centros de Costos para la cuenta "" Pérdidas y Ganancias "" {0}"
 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 +105,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
@@ -833,19 +832,19 @@
 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 +221,There are more holidays than working days this month.,Hay más vacaciones que días de trabajo este mes.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +233,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 +27,Default Address Template cannot be deleted,Plantilla de la Direcciones Predeterminadas no puede eliminarse
+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 +485,No default BOM exists for Item {0},No existe una Solicitud de Materiales por defecto para el elemento {0}
+apps/erpnext/erpnext/stock/get_item_details.py +486,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 .
@@ -854,7 +853,7 @@
 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 +141,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"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
@@ -869,22 +868,22 @@
 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 +265,Project-wise data is not available for Quotation,El seguimiento preciso del proyecto no está disponible para la cotización--
+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 +30,Series is mandatory,Serie es obligatorio
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +50,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 +825,Fetch exploded BOM (including sub-assemblies),Mezclar Solicitud de Materiales (incluyendo subconjuntos )
-apps/erpnext/erpnext/controllers/accounts_controller.py +115,Due Date is mandatory,La fecha de vencimiento es obligatorio
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +796,Fetch exploded BOM (including sub-assemblies),Mezclar Solicitud de Materiales (incluyendo subconjuntos )
+apps/erpnext/erpnext/controllers/accounts_controller.py +118,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: Quality Inspection,Delivery Note No,No. de Nota de Entrega
 DocType: Company,Retail,venta al por menor
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +120,Customer {0} does not exist,{0} no existe Cliente
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +587,Product Bundle,Conjunto/Paquete de productos
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,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"
@@ -906,13 +905,13 @@
 DocType: Production Order,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: Sales Order,% Amount Billed,% Monto Facturado
+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 +634,Account: {0} with currency: {1} can not be selected,Cuenta: {0} con moneda: {1} no puede ser seleccionada
+apps/erpnext/erpnext/controllers/accounts_controller.py +637,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!
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Payment of salary for the month {0} and year {1},Pago del salario correspondiente al mes {0} y {1} años
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Payment of salary for the month {0} and year {1},Pago del salario correspondiente al mes {0} y {1} años
 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
@@ -925,14 +924,14 @@
 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 +595,{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/controllers/accounts_controller.py +598,{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 +84,Secretary,Secretario
+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 +859,Supplier Quotation,Cotizaciónes a Proveedores
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +838,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 .
@@ -943,7 +942,7 @@
 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 +453,POS Profile required to make POS Entry,Se requiere un perfil POS para crear entradas en el Punto-de-Venta
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +509,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 +330,{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
@@ -964,7 +963,7 @@
 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 +763,Make Supplier Quotation,Crear cotización de proveedor
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,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
@@ -972,14 +971,14 @@
 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 +59,Piecework,Pieza de trabajo
+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
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Retorno
 DocType: Pricing Rule,Disable,Inhabilitar
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Sales Order {0} is not submitted,Órden de Venta {0} no esta presentada
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +527,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
@@ -990,8 +989,8 @@
 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 +16,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 +74,Quality Management,Gestión de la Calidad
+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
@@ -1009,7 +1008,6 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Descuento máximo permitido para cada elemento: {0} es {1}%
 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: Sales Invoice,Supplier Reference,Referencia del Proveedor
 DocType: Item,Material Issue,Incidencia de Material
 DocType: Hub Settings,Seller Description,Descripción del Vendedor
 DocType: Item Price,Item Price,Precios de Productos
@@ -1038,7 +1036,7 @@
 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 +92,Warehouse not found in the system,Almacén no se encuentra en el sistema
+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}
@@ -1055,14 +1053,14 @@
 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 +493,Row {0}: An Reorder entry already exists for this warehouse {1},Fila {0}: Una entrada para reordenar ya existe para este almacén {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +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 +79,"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 +429,Production Order {0} must be submitted,La orden de producción {0} debe ser enviada
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +434,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 +113,Warning: Leave application contains following block dates,Advertencia: Solicitud de Renuncia contiene las siguientes fechas bloquedas
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +120,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 +181,Organization unit (department) master.,Unidad de Organización ( departamento) maestro.
@@ -1101,7 +1099,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.","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 +129,BOM and Manufacturing Quantity are required,Se requiere la lista de materiales (LdM) y cantidad a fabricar.
+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 +96,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
@@ -1111,14 +1109,15 @@
 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 +370,Item Code required at Row No {0},Código del producto requerido en la fila No. {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +398,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 +56,Series Updated,Series Actualizado
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +57,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
@@ -1131,14 +1130,13 @@
 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: Email Digest,Receivables / Payables,Cobrables/ Pagables
 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 +141,Set as Lost,Establecer como Perdidos
+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
@@ -1149,7 +1147,7 @@
 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 +499,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},linea No. {0}: El importe no puede ser mayor que el reembolso pendiente {1}. El importe pendiente es {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +500,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."
@@ -1161,7 +1159,7 @@
 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 +174,For Quantity (Manufactured Qty) is mandatory,Por Cantidad (Cantidad fabricada) es obligatorio
+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 +78,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
@@ -1175,7 +1173,7 @@
 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 +136,Credit Card,Tarjeta de Crédito
+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
@@ -1191,7 +1189,7 @@
 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 +740,Get Items from BOM,Obtener elementos de la Solicitud de Materiales
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +711,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 +76,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}
diff --git a/erpnext/translations/es.csv b/erpnext/translations/es.csv
index 0d18483..402c8df 100644
--- a/erpnext/translations/es.csv
+++ b/erpnext/translations/es.csv
@@ -18,11 +18,10 @@
 DocType: Sales Partner,Dealer,Distribuidor
 DocType: Employee,Rented,Arrendado
 DocType: Purchase Order,PO-,CORREOS-
-apps/erpnext/erpnext/accounts/report/financial_statements.py +19,Start Year {0} not found.,Año de inicio {0} no encontrado.
 DocType: POS Profile,Applicable for User,Aplicable para el usuario
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +191,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","La orden de producción detenida no puede ser cancelada, inicie de nuevo para cancelarla"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +197,Do you really want to scrap this asset?,¿Realmente desea desechar este activo?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +17,Select Default Supplier,Elija un proveedor predeterminado
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +192,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","La orden de producción detenida no puede ser cancelada, inicie de nuevo para cancelarla"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +198,Do you really want to scrap this asset?,¿Realmente desea desechar este activo?
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Elija un proveedor predeterminado
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},La divisa/moneda es requerida para lista de precios {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Será calculado en la transacción.
 DocType: Address,County,Condado
@@ -42,46 +41,45 @@
 DocType: Sales Invoice,Customer Name,Nombre del cliente
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +126,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 +180,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 +183,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 +148,Series Updated Successfully,Secuencia actualizada correctamente
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +149,Series Updated Successfully,Secuencia actualizada correctamente
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Revisa
 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
-DocType: Quality Inspection Reading,Parameter,Parámetro
 apps/erpnext/erpnext/projects/doctype/project/project.py +54,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 +239,New Leave Application,Nueva solicitud de ausencia
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,New Leave Application,Nueva solicitud de ausencia
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +20,Attendance Record {0} exists against Student {1} for Course Schedule {2},Registro de asistencia {0} existe en contra de estudiantes {1} para el Programa del curso {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Bank Draft,Giro bancario
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,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
 DocType: Academic Term,Academic Term,Término académico
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +13,Material,Material
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Quantity,Cantidad
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +511,Accounts table cannot be blank.,La tabla de cuentas no puede estar en blanco
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +616,Quantity,Cantidad
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +512,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)
 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/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 +142,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
-DocType: Purchase Invoice,Monthly,Mensual
 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/buying/doctype/purchase_order/purchase_order.js +771,Invoice,Factura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +750,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 +198,Row {0}: {1} {2} does not match with {3},Línea {0}: {1} {2} no coincide con {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Línea # {0}:
+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 +127,Please select Price List,"Por favor, seleccione la lista de precios"
@@ -112,8 +110,8 @@
 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 +589,Get items from,Obtener artículos de
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +382,Stock cannot be updated against Delivery Note {0},Inventario no puede actualizarse contra la nota de envío {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Obtener artículos de
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,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
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Abarrotes
@@ -122,7 +120,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Fondo de pensiones
 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 +156,Salary Structure Missing,Falta Estructura salarial
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,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
@@ -130,10 +128,11 @@
 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 +156,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/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Es el activo fijo&quot; no puede estar sin marcar, ya que existe registro de activos contra el elemento"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +189,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"
 DocType: Tax Rule,Tax Type,Tipo de impuestos
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +144,You are not authorized to add or update entries before {0},No tiene permisos para agregar o actualizar las entradas antes de {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,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/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
@@ -143,18 +142,17 @@
 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 +165,Opening,Apertura
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,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/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Grupo de Clientes&gt; Territorio
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Sólo cuenta de pago
 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.
 DocType: Lead,Product Enquiry,Petición de producto
 DocType: Academic Term,Schools,Escuelas
 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 +335,Please select Company first,"Por favor, seleccione primero la compañía"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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
@@ -164,35 +162,36 @@
 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
 DocType: Purchase Invoice Item,Is Fixed Asset,Es activo fijo
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Available qty is {0}, you need {1}","Cantidades disponibles es {0}, necesita {1}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +225,"Available qty is {0}, you need {1}","Cantidades disponibles es {0}, necesita {1}"
 DocType: Expense Claim Detail,Claim Amount,Importe del reembolso
 DocType: Employee,Mr,Sr.
 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
-DocType: Employee,B-,SEGUNDO-
+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: Assessment Result,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 +171,Annual Salary,Salario Anual
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Annual Salary,Salario Anual
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Gastos sobre existencias
-apps/erpnext/erpnext/accounts/report/financial_statements.py +22,End Year {0} not found.,Año de finalización {0} no encontrado.
 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}
 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 +130,At least one mode of payment is required for POS invoice.,Se requiere al menos un modo de pago de la factura POS.
 DocType: Products Settings,Show Products as a List,Mostrar los productos en forma de lista
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Descargue la plantilla, para rellenar los datos apropiados y adjuntar el archivo modificado.
  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 +451,Item {0} is not active or end of life has been reached,El producto {0} no está activo o ha llegado al final de la vida útil
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +456,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/controllers/accounts_controller.py +614,"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/controllers/accounts_controller.py +617,"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 +166,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
@@ -204,13 +203,13 @@
 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 +147,Execution,Ejecución
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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/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}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,Cost Center {0} does not belong to Company {1},El centro de Costos {0} no pertenece a la compañía {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +100,Cost Center {0} does not belong to Company {1},El centro de Costos {0} no pertenece a la compañía {1}
 DocType: Customer,Individual,Individual
 DocType: Interest,Academics User,académicos usuario
 DocType: Cheque Print Template,Amount In Figure,En la Figura cantidad
@@ -226,30 +225,32 @@
 DocType: Production Planning Tool,Sales Orders,Ordenes de venta
 DocType: Purchase Taxes and Charges,Valuation,Valuación
 ,Purchase Order Trends,Tendencias de ordenes 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,La solicitud de cotización se puede acceder haciendo clic en el siguiente enlace
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,Asignar las ausencias para el año.
 DocType: SG Creation Tool Course,SG Creation Tool Course,SG Curso herramienta de creación
 DocType: Student Group Creation Tool,Leave blank if you wish to fetch all courses for selected academic term,Dejar en blanco si desea obtener todos los cursos de su término académico elegido
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,Insufficient Stock,insuficiente Stock
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227,Insufficient Stock,insuficiente Stock
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Desactivar planificación de capacidad y seguimiento de tiempo
+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: 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/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} does not belong to Company {1},Cuenta {0} no pertenece a la Compañía {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +86,Account {0} does not belong to Company {1},Cuenta {0} no pertenece a la Compañía {1}
 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}
 DocType: Naming Series,Series List for this Transaction,Lista de secuencias para esta transacción
 DocType: Sales Invoice,Is Opening Entry,Es una entrada de apertura
 DocType: Customer Group,Mention if non-standard receivable account applicable,Indique si una cuenta por cobrar no estándar es  aplicable
 DocType: Course Schedule,Instructor Name,Nombre instructor
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,For Warehouse is required before Submit,Para el almacén es requerido antes de enviar
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,For Warehouse is required before Submit,Para el almacén es requerido antes de enviar
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Recibida el
 DocType: Sales Partner,Reseller,Re-vendedor
 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 +1436,"LocalStorage is full , did not save","LocalStorage está lleno, no salvó"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1460,"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}
@@ -262,18 +263,19 @@
 apps/erpnext/erpnext/templates/generators/item.html +78,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 +5,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/leave_application/leave_application.py +206,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/leave_application/leave_application.py +213,Only the selected Leave Approver can submit this Leave Application,Sólo el supervisor de ausencias responsable puede validar esta solicitud de permiso
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,La fecha de relevo debe ser mayor que la fecha de inicio
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Leaves per Year,Ausencias por año
+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 +103,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}
+DocType: Email Digest,Profit & Loss,Pérdida de beneficios
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,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 +435,Leave Blocked,Vacaciones Bloqueadas
-apps/erpnext/erpnext/stock/doctype/item/item.py +669,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 +83,Annual,Anual
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +443,Leave Blocked,Vacaciones Bloqueadas
+apps/erpnext/erpnext/stock/doctype/item/item.py +671,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 +86,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
@@ -281,20 +283,22 @@
 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
 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 +91,Software Developer,Desarrollador de Software.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,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: Scheduling Tool,Course Start Date,Curso Fecha de Inicio
 DocType: Item,Publish in Hub,Publicar en el Hub
+DocType: Student Admission,Student Admission,Admisión de Estudiantes
 ,Terretory,Territorio
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is cancelled,El producto {0} esta cancelado
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Material Request,Solicitud de materiales
+apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} is cancelled,El producto {0} esta cancelado
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +823,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 +28,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 +328,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},El elemento {0} no se encuentra en 'Materias Primas Suministradas' en la tabla de la órden de compra {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +333,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/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
@@ -310,20 +314,21 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +130,Please select Charge Type first,"Por favor, seleccione primero el tipo de cargo"
 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: Email Digest,New Quotations,Nuevas Citas
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,El primer supervisor de ausencias en la lista sera definido como el administrador de ausencias/vacaciones predeterminado.
 DocType: Tax Rule,Shipping County,Condado de envío
 apps/erpnext/erpnext/config/desktop.py +158,Learn,Aprender
 DocType: Asset,Next Depreciation Date,Siguiente Depreciación Fecha
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Coste de actividad por empleado
 DocType: Accounts Settings,Settings for Accounts,Ajustes de contabilidad
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +626,Supplier Invoice No exists in Purchase Invoice {0},Proveedor de factura no existe en la factura de la compra {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +629,Supplier Invoice No exists in Purchase Invoice {0},Proveedor de factura no existe en la factura de la compra {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Administrar las categoría de los socios de ventas
 DocType: Job Applicant,Cover Letter,Carta de presentación
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Cheques pendientes y Depósitos para despejar
 DocType: Item,Synced With Hub,Sincronizado con Hub.
 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 +348,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 +86,Circular Reference Error,Error de referencia circular
@@ -335,47 +340,49 @@
 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 +806,Delivery Note,Nota de entrega
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +800,Delivery Note,Nota de entrega
 apps/erpnext/erpnext/config/learn.py +87,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 +233,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/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/setup/doctype/email_digest/email_digest.py +104,Summary for this week and pending activities,Resumen para esta semana y actividades pendientes
+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"
 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,Operaciones bancarias / efectivo contra la parte o al traslado
+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/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Total del Pedido Considerado
 apps/erpnext/erpnext/config/hr.py +186,"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
-apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Fila # {0}: Factura de compra no se puede hacer frente a un activo existente {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +554,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 +54,{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 +812,Select Item,Seleccione producto
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +791,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 \
 					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 +142,Purchase Invoice {0} is already submitted,La factura de compra {0} ya existe o se encuentra validada
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Línea # {0}: El lote no puede ser igual a {1} {2}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +143,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
 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 +342,Please see attachment,"Por favor, revise el documento adjunto"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,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 +19,Setup Already Complete!!,La configuración ya se ha completado!
 ,Finished Goods,Productos terminados
 DocType: Delivery Note,Instructions,Instrucciones
 DocType: Quality Inspection,Inspected By,Inspección realizada por
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Proveedor&gt; Tipo de proveedor
 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/public/js/utils/item_selector.js +12,Add Items,Añadir los artículos
@@ -389,29 +396,29 @@
 DocType: Currency Exchange,Currency Exchange,Cambio de divisas
 DocType: Purchase Invoice Item,Item Name,Nombre del producto
 DocType: Authorization Rule,Approving User  (above authorized value),La aprobación del usuario (por encima del valor autorizado)
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Saldo Acreedor
+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/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 +736,Purchase Return,Devolucion de Compra
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +715,Purchase Return,Devolucion de Compra
 ,Purchase Register,Registro de compras
 DocType: 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 +202,{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 +209,{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 +143,Reason for losing,Razón de pérdida
-apps/erpnext/erpnext/accounts/utils.py +239,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 +163,Reason for losing,Razón de pérdida
+apps/erpnext/erpnext/accounts/utils.py +316,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 +79,Workstation is closed on the following dates as per Holiday List: {0},La estación de trabajo estará cerrada en las siguientes fechas según la lista de festividades: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Oportunidades
 DocType: Employee,Single,Soltero
 DocType: Account,Cost of Goods Sold,Costo sobre ventas
 DocType: Purchase Invoice,Yearly,Anual
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +225,Please enter Cost Center,"Por favor, introduzca el centro de costos"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,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
@@ -424,26 +431,26 @@
 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
 DocType: Account,Is Group,Es un grupo
+DocType: Email Digest,Pending Purchase Orders,A la espera de órdenes de compra
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Ajusta automáticamente los números de serie basado en FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Comprobar número de factura único por proveedor
 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 +102,Non Profit,Sin fines de lucro
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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: Stock Reconciliation Item,Do not include symbols (ex. $),No incluya símbolos (ej. $)
 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 +638,Attribute {0} selected multiple times in Attributes Table,Atributo {0} seleccionado varias veces en la tabla Atributos
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Atributo {0} seleccionado varias veces en la tabla Atributos
 DocType: HR Settings,Employee record is created using selected field. ,El registro del empleado se crea utilizando el campo seleccionado.
 DocType: Sales Order,Not Applicable,No aplicable
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Master de vacaciones .
 DocType: Request for Quotation Item,Required Date,Fecha de solicitud
 DocType: Delivery Note,Billing Address,Dirección de facturación
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +862,Please enter Item Code.,"Por favor, introduzca el código del producto."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +847,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"
@@ -457,12 +464,12 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Valores y depósitos
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Hojas totales asignados es obligatorio
 DocType: Job Opening,Description of a Job Opening,Descripción de la oferta de trabajo
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Pending activities for today,Actividades pendientes para hoy
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Actividades pendientes para hoy
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Registros de asistencias.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,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: Manufacturing Settings,Time Between Operations (in mins),Tiempo entre operaciones (en minutos)
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +92,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} Presupuesto para la cuenta {1} contra centros de coste {2} es {3}. Se superará por {4}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +95,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} Presupuesto para la cuenta {1} contra centros de coste {2} es {3}. Se superará por {4}
 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
@@ -470,16 +477,16 @@
 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/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 +86,Administrative Officer,Funcionario administrativo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,Funcionario administrativo
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +23,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 +319,Please select Company,"Por favor, seleccione la empresa"
-DocType: Stock Entry,Difference Account,Cuenta para la Diferencia
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +309,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 +44,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 +398,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 +399,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 +530,"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 +532,"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 +28,Buy,Comprar
@@ -487,7 +494,7 @@
 DocType: Sales Invoice,Offline POS Name,Desconectado Nombre POS
 DocType: Sales Order,To Deliver,Para entregar
 DocType: Purchase Invoice Item,Item,Productos
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1563,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 +1587,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
@@ -496,13 +503,14 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Account {0} does not belong to company: {1},Cuenta {0} no pertenece a la compañía: {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation already used for another company,Abreviatura ya utilizada para otra empresa
 DocType: Selling Settings,Default Customer Group,Categoría de cliente predeterminada
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Supplier is required against Payable account {0},Se requiere profesional contra la cuenta por pagar {0}
 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
 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 +313,Reference No and Reference Date is mandatory for Bank transaction,No de referencia y fecha de referencia es obligatoria para las transacciones bancarias
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +316,Reference No and Reference Date is mandatory for Bank transaction,No de referencia y fecha de referencia es obligatoria para las transacciones bancarias
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Añadir / Editar Impuestos y Cargos
 DocType: Purchase Invoice,Supplier Invoice No,Factura de proveedor No.
 DocType: Territory,For reference,Para referencia
@@ -513,7 +521,6 @@
 DocType: Installation Note Item,Installation Note Item,Nota de instalación de elementos
 DocType: Production Plan Item,Pending Qty,Cantidad pendiente
 DocType: Budget,Ignore,Pasar por alto
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Código del artículo&gt; Grupo Elemento&gt; Marca
 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/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
@@ -524,11 +531,11 @@
 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/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 +28,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 +19,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 +707,Make Sales Order,Crear orden de venta
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +701,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
@@ -544,7 +551,8 @@
 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 +734,Sales Return,Devoluciones de ventas
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +728,Sales Return,Devoluciones de ventas
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +91,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.
@@ -553,14 +561,13 @@
 DocType: Quotation,Quotation To,Oferta de venta para
 DocType: Lead,Middle Income,Ingreso medio
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +212,Opening (Cr),Apertura (Cred)
-apps/erpnext/erpnext/stock/doctype/item/item.py +795,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,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 +237,Allocated amount can not be negative,Monto asignado no puede ser negativo
+apps/erpnext/erpnext/stock/doctype/item/item.py +797,Default Unit of Measure for Item {0} cannot be changed directly because 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
 DocType: Purchase Order Item,Billed Amt,Monto facturado
 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: Sales Invoice Timesheet,Sales Invoice Timesheet,Factura de venta de partes de horas
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},Se requiere de No. de referencia y fecha para {0}
-DocType: Sales Invoice,Customer's Vendor,Agente de ventas
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Proposal Writing,Redacción de propuestas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,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"
@@ -569,13 +576,14 @@
 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
 DocType: Packing Slip Item,DN Detail,Detalle DN
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +257,Already supplier quotation has created,Ya cotización del proveedor ha creado
 DocType: Timesheet,Billed,Facturado
 DocType: Batch,Batch Description,Descripción de lotes
+apps/erpnext/erpnext/accounts/utils.py +685,"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 +733,View Offline Records,Ver Desconectado Registros
+apps/erpnext/erpnext/accounts/page/pos/pos.js +715,View Offline Records,Ver Desconectado Registros
+DocType: Student,Sibling Details,Detalles de hermanos
 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: Payment Reconciliation,Invoice/Journal Entry Details,Factura / Detalles de diarios
@@ -589,7 +597,7 @@
 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
 DocType: Employee,Passport Number,Número de pasaporte
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Manager,Gerente
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,Gerente
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,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
@@ -598,10 +606,11 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter email address,"Por favor, introduzca la dirección de correo electrónico (Email)"
 DocType: Production Order Operation,In minutes,En minutos
 DocType: Issue,Resolution Date,Fecha de resolución
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +299,Timesheet created:,Parte de horas de creación:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +715,Please set default Cash or Bank account in Mode of Payment {0},"Por favor, defina la cuenta de bancos o caja predeterminados en el método de pago {0}"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +300,Timesheet created:,Parte de horas de creación:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +772,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
 DocType: Selling Settings,Customer Naming By,Ordenar cliente por
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,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: 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
@@ -626,6 +635,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,Terminar
 DocType: Pricing Rule,Sales Manager,Gerente de ventas
 DocType: Salary Structure Employee,Base,Base
+DocType: Timesheet,Total Billed Hours,Total de horas facturadas
 DocType: Journal Entry,Write Off Amount,Importe de desajuste
 DocType: Journal Entry,Bill No,Factura No.
 DocType: Company,Gain/Loss Account on Asset Disposal,Cuenta ganancia / pérdida en la disposición de activos
@@ -640,11 +650,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +9,Pre Sales,Pre ventas
 DocType: Purchase Receipt,Other Details,Otros detalles
 DocType: Account,Accounts,Cuentas
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Marketing,Marketing
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +227,Payment Entry is already created,Ya está creado Entrada Pago
+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,Ya está creado Entrada Pago
 DocType: Purchase Receipt Item Supplied,Current Stock,Inventario actual
-apps/erpnext/erpnext/controllers/accounts_controller.py +538,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 +21,Preview Salary Slip,Salario previsualización de deslizamiento
+apps/erpnext/erpnext/controllers/accounts_controller.py +541,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 +38,Preview Salary Slip,Salario previsualización de deslizamiento
 DocType: Company,Deafult Cost Center,Centro de coste deafult
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +48,Account {0} has been entered multiple times,Cuenta {0} se ha introducido varias veces
 DocType: Account,Expenses Included In Valuation,GASTOS DE VALORACIÓN
@@ -653,7 +663,7 @@
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,"Por favor, seleccione un grupo de alumnos"
 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 +617,Item has variants.,El producto tiene variantes.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,El producto tiene variantes.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,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
@@ -673,7 +683,7 @@
 DocType: Purchase Order,Supply Raw Materials,Suministro de materia prima
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,La fecha en que la próxima factura será generada. Es generada al validar.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Activo circulante
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,{0} is not a stock Item,{0} no es un artículo en existencia
+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 +169,Lead must be set if Opportunity is made from Lead,La Iniciativa se debe establecer si la oportunidad está hecha desde las Iniciativas
@@ -759,26 +769,25 @@
 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 +709,No Permission,Sin permiso
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +710,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}
 apps/erpnext/erpnext/public/js/setup_wizard.js +298,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 +542,Row #{0}: Asset {1} must be submitted,Fila # {0}: {1} de activos debe ser presentado
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset {1} must be submitted,Fila # {0}: {1} de activos debe ser presentado
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Empleado no encontrado
 DocType: Supplier Quotation,Stopped,Detenido.
 DocType: Item,If subcontracted to a vendor,Si es sub-contratado a un proveedor
 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
 DocType: Warehouse,Tree Details,Detalles del árbol
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Enviar ahora
 ,Support Analytics,Soporte analítico
 DocType: Item,Website Warehouse,Almacén para el sitio web
 DocType: Payment Reconciliation,Minimum Invoice Amount,Volumen mínimo Factura
 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/sales_invoice/sales_invoice.py +227,Timesheet {0} is already completed or cancelled,Parte de horas {0} ya se haya completado o cancelado
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +259,Timesheet {0} is already completed or cancelled,Parte de horas {0} ya se haya completado o cancelado
 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
@@ -794,13 +803,13 @@
 apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Calendario de cursos
 DocType: Maintenance Visit,Completion Status,Estado de finalización
 DocType: HR Settings,Enter retirement age in years,Introduzca la edad de jubilación en años
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +229,Target Warehouse,Inventario estimado
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +230,Target Warehouse,Inventario estimado
 DocType: Cheque Print Template,Starting location from left edge,Posición inicial desde el borde izquierdo
 DocType: Item,Allow over delivery or receipt upto this percent,Permitir hasta este porcentaje en la entrega y/o recepción
 DocType: Stock Entry,STE-,STE-
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Sales Order Date,La fecha prevista de entrega no puede ser anterior a la fecha de la órden de venta
 DocType: Upload Attendance,Import Attendance,Asistente de importación
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Todos los Grupos de Artículos
+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/config/setup.py +89,Automatically compose message on submission of transactions.,Componer automáticamente el mensaje en la presentación de las transacciones.
@@ -812,13 +821,15 @@
 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/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
 DocType: Expense Claim,Expenses,Gastos
 DocType: Item Variant Attribute,Item Variant Attribute,Artículo Variant Atributo
 ,Purchase Receipt Trends,Tendencias de recibos de compra
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Research & Development,Investigación y desarrollo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Investigación y desarrollo
 ,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
@@ -827,7 +838,7 @@
 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/controllers/accounts_controller.py +340,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Entrada de pago {0} está enlazado con la Orden {1}, comprobar si se debe tirar como avance en esta factura."
+apps/erpnext/erpnext/controllers/accounts_controller.py +343,"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)
@@ -849,12 +860,12 @@
 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 +756,Purchase Receipt,Recibo de compra
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +735,Purchase Receipt,Recibo de compra
 ,Received Items To Be Billed,Recepciones por facturar
 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 +167,Reference Doctype must be one of {0},Referencia Doctype debe ser uno de {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +282,Unable to find Time Slot in the next {0} days for Operation {1},Incapaz de encontrar la ranura de tiempo en los próximos {0} días para la operación {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +170,Reference Doctype must be one of {0},Referencia Doctype debe ser uno de {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,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 +439,BOM {0} must be active,La lista de materiales (LdM) {0} debe estar activa
@@ -865,7 +876,7 @@
 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 +214,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 +217,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
@@ -879,16 +890,16 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,El empleado {0} no está activo o no existe
 DocType: Fee Structure,Components,componentes
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,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 +612,Item Variants {0} updated,{0} variantes actualizadas del producto
+apps/erpnext/erpnext/stock/doctype/item/item.py +614,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 +843,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 +854,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 +172,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-,DIRIGIR-
+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
@@ -896,69 +907,72 @@
 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 +728,New Sales Invoice,Nueva factura de venta
+apps/erpnext/erpnext/accounts/page/pos/pos.js +710,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 +728,Sync Offline Invoices,Las facturas sincronización sin conexión
 DocType: Payment Request,Paid,Pagado
 DocType: Program Fee,Program Fee,tarifa del programa
 DocType: Salary Slip,Total in words,Total en palabras
 DocType: Material Request Item,Lead Time Date,Hora de la Iniciativa
 DocType: Guardian,Guardian Name,Nombre tutor
 DocType: Cheque Print Template,Has Print Format,Formato de impresión tiene
-apps/erpnext/erpnext/accounts/page/pos/pos.js +86, 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 +109,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 +619,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","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/page/pos/pos.js +75, 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 +613,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing 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 +606,Supplier Invoice Date cannot be greater than Posting Date,Factura Proveedor La fecha no puede ser mayor que la fecha de publicación
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +609,Supplier Invoice Date cannot be greater than Posting Date,Factura Proveedor La fecha no puede ser mayor que la fecha de publicación
 DocType: Purchase Invoice Item,Purchase Order Item,Producto de la orden de compra
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +130,Indirect Income,Ingresos indirectos
 DocType: Cheque Print Template,Date Settings,Ajustes de fecha
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Variación
 ,Company Name,Nombre de compañía
 DocType: SMS Center,Total Message(s),Total Mensage(s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +810,Select Item for Transfer,Seleccione el producto a transferir
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +789,Select Item for Transfer,Seleccione el producto a transferir
 DocType: Purchase Invoice,Additional Discount Percentage,Porcentaje de descuento adicional
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Ver una lista de todos los vídeos de ayuda
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Seleccione la cuenta principal de banco donde los cheques fueron depositados.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Permitir al usuario editar la lista de precios en las transacciones
 DocType: Pricing Rule,Max Qty,Cantidad máxima
-DocType: Student Applicant,Father's Name,Nombre del Padre
 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 +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Línea {0}: El pago para la compra/venta siempre debe estar marcado como anticipo
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Químico
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +686,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/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
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +694,All items have already been transferred for this Production Order.,Todos los artículos ya han sido transferidos para esta Orden de Producción.
 DocType: Process Payroll,Select Payroll Year and Month,"Seleccione la nómina, año y mes"
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,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
-DocType: Opportunity,Walk In,Entrar
 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 +12,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: Timesheet Detail,Bill,Cuenta
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,White,Blanco
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,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
 DocType: SMS Center,All Lead (Open),Todas las Oportunidades (Abiertas)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +228,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Fila {0}: Cantidad no está disponible para {4} en el almacén {1} a publicar momento de la entrada ({2} {3})
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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 +731,Make ,Crear
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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."
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Mi carrito
-apps/erpnext/erpnext/controllers/selling_controller.py +154,Order Type must be one of {0},Tipo de orden debe ser uno de {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Tipo de orden debe ser uno de {0}
 DocType: Lead,Next Contact Date,Siguiente fecha de contacto
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Cant. de apertura
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +393,Please enter Account for Change Amount,"Por favor, introduzca la cuenta para el Cambio Monto"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,Please enter Account for Change Amount,"Por favor, introduzca la cuenta para el Cambio Monto"
 DocType: Student Batch,Student Batch Name,Lote Nombre del estudiante
 DocType: Holiday List,Holiday List Name,Nombre de festividad
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js +8,Schedule Course,Calendario de Cursos
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Stock Options,Opciones de stock
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Opciones de stock
 DocType: Journal Entry Account,Expense Claim,Reembolso de gastos
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +211,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 +237,Qty for {0},Cantidad de {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +212,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 +238,Qty for {0},Cantidad de {0}
 DocType: Leave Application,Leave Application,Solicitud de ausencia
 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
@@ -967,9 +981,9 @@
 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/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Elementos eliminados que no han sido afectados en cantidad y valor
+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 +635,Attribute table is mandatory,Tabla de atributos es obligatorio
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Tabla de atributos es obligatorio
 DocType: Production Planning Tool,Get Sales Orders,Obtener ordenes de venta
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} no puede ser negativo
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,"Por favor, seleccione un Estudiante"
@@ -994,7 +1008,7 @@
 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/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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Número de serie {0} tiene un contrato de mantenimiento hasta {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +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
@@ -1006,7 +1020,7 @@
 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/controllers/selling_controller.py +231,Sales Order {0} is {1},Ventas Solicitar {0} es {1}
+apps/erpnext/erpnext/controllers/selling_controller.py +232,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
 DocType: Packing Slip,Net Weight UOM,Unidad de medida para el peso neto
@@ -1016,25 +1030,24 @@
 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
 DocType: Sales Person,Select company name first.,Seleccione primero el nombre de la empresa.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Dr,Deb
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Dr,Deb
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Ofertas de venta recibidas de los proveedores.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},Para {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Edad Promedio
 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/templates/pages/home.html +32,View All Products,Ver todos los Productos
+apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Ver todos los Productos
 DocType: Company,Default Currency,Divisa / modena predeterminada
 DocType: Contact,Enter designation of this Contact,Introduzca el puesto de este contacto
 DocType: Expense Claim,From Employee,Desde Empleado
-apps/erpnext/erpnext/controllers/accounts_controller.py +400,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
+apps/erpnext/erpnext/controllers/accounts_controller.py +403,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/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,y año:
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +191,{0} {1} must be submitted,{0} {1} debe ser presentado
-DocType: Email Digest,Annual Expense,Gasto anual
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,{0} {1} must be submitted,{0} {1} debe ser presentado
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +145,Quantity must be less than or equal to {0},La cantidad debe ser menor que o igual a {0}
 DocType: SMS Center,Total Characters,Total Caracteres
 apps/erpnext/erpnext/controllers/buying_controller.py +156,Please select BOM in BOM field for Item {0},"Por favor, seleccione la lista de materiales (LdM) para el producto {0}"
@@ -1045,30 +1058,31 @@
 DocType: Sales Partner,Distributor,Distribuidor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Reglas de envio para el carrito de compras
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +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 +62,Please set 'Apply Additional Discount On',"Por favor, establece &quot;Aplicar descuento adicional en &#39;"
+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
 DocType: Global Defaults,Global Defaults,Predeterminados globales
 apps/erpnext/erpnext/projects/doctype/project/project.py +153,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
 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 +327,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
 ,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 +362,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/stock/doctype/stock_entry/stock_entry.py +367,Finished Item {0} must be entered for Manufacture type entry,El producto terminado {0} debe ser introducido para el tipo de producción
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Apertura de saldos contables
 DocType: Sales Invoice Advance,Sales Invoice Advance,Factura de ventas anticipada
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +499,Nothing to request,Nada que solicitar
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +500,Nothing to request,Nada que solicitar
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','Fecha de Inicio' no puede ser mayor que 'Fecha Final'
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Management,Gerencia
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},Se requiere cuenta de débito o crédito para {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,Gerencia
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +55,Either debit or credit amount is required for {0},Se requiere cuenta de débito o crédito para {0}
 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 +161,Blue,Azul
+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
@@ -1078,12 +1092,12 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +23,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
 DocType: Stock Settings,Default Item Group,Grupo de artículos predeterminado
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1374,Do you really want to submit the invoice?,¿Realmente desea enviar la factura?
+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 +685,Cost Center For Item with Item Code ',Centro de costos para el producto con código '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1526,"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 +679,Cost Center For Item with Item Code ',Centro de costos para el producto con código '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1550,"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/accounts/doctype/account/account_tree.js +26,"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
@@ -1103,104 +1117,106 @@
 DocType: Payment Reconciliation,Unreconciled Payment Details,Detalles de pagos no conciliados
 DocType: Global Defaults,Current Fiscal Year,Año fiscal actual
 DocType: Global Defaults,Disable Rounded Total,Desactivar redondeo
-DocType: Lead,Call,Llamada
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +417,'Entries' cannot be empty,'Entradas' no pueden estar vacías
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +418,'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 +214,Fiscal Year {0} not found,Año fiscal {0} no encontrado
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +221,Fiscal Year {0} not found,Año fiscal {0} no encontrado
 apps/erpnext/erpnext/config/hr.py +238,Setting up Employees,Configuración de empleados
 DocType: Sales Order,SO-,ASI QUE-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,"Por favor, seleccione primero el prefijo"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Please select prefix first,"Por favor, seleccione primero el prefijo"
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Research,Investigación
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,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 +43,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 +57,View Ledger,Mostrar libro mayor
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Primeras
-apps/erpnext/erpnext/stock/doctype/item/item.py +504,"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 +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/setup/setup_wizard/setup_wizard.py +437,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
 ,Budget Variance Report,Variación de Presupuesto
 DocType: Salary Slip,Gross Pay,Pago bruto
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +90,Row {0}: Activity Type is mandatory.,Fila {0}: Tipo de actividad es obligatoria.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +114,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/public/js/controllers/stock_controller.js +40,Accounting Ledger,Libro de contabilidad
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,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
 DocType: BOM Item,Item Description,Descripción del producto
+DocType: Student Sibling,Student Sibling,hermano del estudiante
 DocType: Purchase Invoice,Is Recurring,Es recurrente
 DocType: Purchase Invoice,Supplied Items,Productos suministrados
 DocType: Student,STUD.,SEMENTAL.
 DocType: Production Order,Qty To Manufacture,Cantidad para producción
+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/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 +131,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 +175,Valuation Rate required for Item in row {0},Rango de Valoración requeridos para el Item en la fila {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,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
 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 +87, to ,a
+apps/erpnext/erpnext/accounts/page/pos/pos.js +76, 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/accounts/doctype/gl_entry/gl_entry.py +196,Not authorized to edit frozen Account {0},No autorizado para editar la cuenta congelada {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,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 +62,Sales Order {0} is not valid,Orden de venta {0} no es válida
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Orden de venta {0} no es válida
 apps/erpnext/erpnext/setup/doctype/company/company.py +185,"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 +152,Small,Pequeño
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,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}
 ,Invoiced Amount (Exculsive Tax),Cantidad facturada (Impuesto excluido)
-DocType: Student Applicant,Mother's / Guardian 1 Email ID,de la madre / tutor 1 ID de correo electrónico
 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 +160,Green,Verde
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,Verde
 DocType: Supplier,SUPP-,SUPP-
 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 +57,Contract,Contrato
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,Contrato
 DocType: Email Digest,Add Quote,Añadir Cita
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +498,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 +503,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 +80,Row {0}: Qty is mandatory,Línea {0}: La cantidad es obligatoria
+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 +737,Sync Master Data,Sincronización de datos maestros
-apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,Los productos o servicios
+apps/erpnext/erpnext/accounts/page/pos/pos.js +719,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
 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
+DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Este es un grupo principal y no se puede editar.
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Este es un grupo principal y no se puede editar.
 DocType: Journal Entry Account,Purchase Order,Orden de compra (OC)
 DocType: 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 +345,"{0}: Employee email not found, hence email not sent","{0}: No se encontró el correo electrónico de los empleados, por lo tanto, no correo electrónico enviado"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +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
 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 +118,"For {0}, only credit accounts can be linked against another debit entry","Para {0}, sólo las cuentas de crédito se pueden vincular con un asiento de débito"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Delivery Note {0} is not submitted,La nota de entrega {0} no está validada
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Delivery Note {0} is not submitted,La nota de entrega {0} no está validada
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Sub-contracted Item,El elemento: {0} debe ser un producto sub-contratado
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,BIENES DE CAPITAL
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","La 'regla precios' es seleccionada primero basada en el campo 'Aplicar En' que puede ser un artículo, grupo de artículos o marca."
 DocType: Hub Settings,Seller Website,Sitio web del vendedor
 DocType: Item,ITEM-,ÍT-
-apps/erpnext/erpnext/controllers/selling_controller.py +147,Total allocated percentage for sales team should be 100,Porcentaje del total asignado para el equipo de ventas debe ser de 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +110,Production Order status is {0},El estado de la orden de producción es {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Porcentaje del total asignado para el equipo de ventas debe ser de 100
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},El estado de la orden de producción es {0}
 DocType: Appraisal Goal,Goal,Meta/Objetivo
 DocType: Sales Invoice Item,Edit Description,Editar descripción
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +757,For Supplier,De proveedor
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +723,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
@@ -1216,10 +1232,11 @@
 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
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Enviar boletín:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +445,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
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1667,Deafault warehouse is required for selected item,Se requiere depósito de Deafault elemento seleccionado
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Deafault warehouse is required for selected item,Se requiere depósito de Deafault elemento seleccionado
 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
@@ -1228,23 +1245,23 @@
 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 +110,Hardware,Hardware
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,Hardware
 DocType: Sales Order,Recurring Upto,Hasta que se repite
 DocType: Attendance,HR Manager,Gerente de recursos humanos (RRHH)
 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 +48,Privilege Leave,Vacaciones
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,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 +79,You need to enable Shopping Cart,Necesita habilitar el carito de compras
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Necesita habilitar el carrito de compras
 DocType: Payment Entry,Writeoff,Pedir por escrito
 DocType: Appraisal Template Goal,Appraisal Template Goal,Objetivo de la plantilla de evaluación
-DocType: Salary Slip,Earning,Ingresos
+DocType: Salary Component,Earning,Ingresos
 DocType: Purchase Invoice,Party Account Currency,Divisa de la cuenta de tercero/s
 ,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 +171,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 +174,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_data.py +358,Food,Comida
+apps/erpnext/erpnext/demo/setup/setup_data.py +301,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/course_schedule/course_schedule.js +103,Mark Attendence,Marcos Attendence
@@ -1278,12 +1295,12 @@
 DocType: Sales Order Item,Planned Quantity,Cantidad planificada
 DocType: Purchase Invoice Item,Item Tax Amount,Total impuestos de producto
 DocType: Item,Maintain Stock,Mantener stock
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +209,Stock Entries already created for Production Order ,Las entradas de stock ya fueron creadas para el numero de producción
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,Las entradas de stock ya fueron creadas para el numero de producción
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,Cambio neto en activos fijos
 DocType: Leave Control Panel,Leave blank if considered for all designations,Dejar en blanco si es considerado para todos los puestos
-apps/erpnext/erpnext/controllers/accounts_controller.py +620,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 +238,Max: {0},Máximo: {0}
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +15,From Datetime,A partir de fecha y hora
+apps/erpnext/erpnext/controllers/accounts_controller.py +623,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 +239,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 +153,"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."
@@ -1291,8 +1308,8 @@
 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 +552,cannot be greater than 100,No puede ser mayor de 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +680,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 +546,cannot be greater than 100,No puede ser mayor de 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,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
@@ -1306,10 +1323,9 @@
 DocType: GL Entry,GL Entry,Entrada GL
 DocType: HR Settings,Employee Settings,Configuración de empleado
 ,Batch-Wise Balance History,Historial de saldo por lotes
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Tareas por hacer
 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 +61,Apprentice,Aprendiz
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +102,Negative Quantity is not allowed,No se permiten cantidades negativas
+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,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 +152,Employee cannot report to himself.,El empleado no puede informar a sí mismo.
@@ -1330,15 +1346,14 @@
 DocType: Asset,Asset Name,Nombre de activos
 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 +141,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 +719,Packing Slip,Lista de embalaje
+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 +713,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/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,Se puede acceder a la solicitud de presupuesto haciendo clic en siguiente enlace
 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 +81,Analyst,Analista
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,Analista
 DocType: Item,Inventory,inventario
 DocType: Item,Sales Details,Detalles de ventas
 DocType: Quality Inspection,QI-,qi
@@ -1346,7 +1361,7 @@
 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 +103,Government,Gubernamental
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,Gubernamental
 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
 DocType: Company,Services,Servicios
@@ -1362,6 +1377,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,Financial Year Start Date,Inicio del ejercicio contable
 DocType: POS Profile,Apply Discount,aplicar descuento
 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
 DocType: Program Course,Program Course,Curso programa
@@ -1402,12 +1418,12 @@
 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
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +110,Accounting Entry for {0} can only be made in currency: {1},El asiento contable para {0} sólo puede hacerse con la divisa: {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},El asiento contable para {0} sólo puede hacerse con la divisa: {1}
 DocType: Pricing Rule,Pricing Rule,Regla de precios
 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
 DocType: Shopping Cart Settings,Payment Success URL,Pago URL Éxito
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +78,Row # {0}: Returned Item {1} does not exists in {2} {3},Línea # {0}: El artículo devuelto {1} no existe en {2} {3}
+apps/erpnext/erpnext/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
@@ -1416,40 +1432,39 @@
 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/stock/doctype/stock_entry/stock_entry.py +339,Not allowed to tranfer more {0} than {1} against Purchase Order {2},No se permite transferir más {0} de {1} para la órden de compra {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +344,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 +545,Manufacturing Quantity is mandatory,La cantidad a producir es obligatoria
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,La cantidad a producir es obligatoria
 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 +71,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 +162,Row {0}: From Time and To Time of {1} is overlapping with {2},Fila {0}: Del tiempo y Tiempo de {1} se solapan con {2}
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +186,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
 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
 DocType: Student Group,Set 0 for no limit,Ajuste 0 indica sin límite
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,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 +137,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 informes
+apps/erpnext/erpnext/config/selling.py +206,Other Reports,Otros Reportes
 DocType: Dependent Task,Dependent Task,Tarea dependiente
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,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/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 +190,Leave of type {0} cannot be longer than {1},Ausencia del tipo {0} no puede tener más de {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +197,Leave of type {0} cannot be longer than {1},Ausencia del tipo {0} no puede tener más de {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Procure planear las operaciones con XX días de antelación.
 DocType: HR Settings,Stop Birthday Reminders,Detener recordatorios de cumpleaños.
 DocType: SMS Center,Receiver List,Lista de receptores
-apps/erpnext/erpnext/accounts/page/pos/pos.js +921,Search Item,Busca artículo
+apps/erpnext/erpnext/accounts/page/pos/pos.js +910,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 +546,Already completed,Ya completado
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +22,Payment Request already exists {0},Solicitud de pago ya existe {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +550,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 +241,Quantity must not be more than {0},La cantidad no debe ser más de {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,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 +76,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
@@ -1466,7 +1481,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +221,Purchase Receipt {0} is not submitted,El recibo de compra {0} no esta validado
 DocType: Company,Default Payable Account,Cuenta por pagar por defecto
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Ajustes para las compras online, normas de envío, lista de precios, etc."
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +83,{0}% Billed,{0}% Facturado
+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
@@ -1478,12 +1493,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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/schools/doctype/fees/fees.js +22,Collect,Recoger
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Recoger
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,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 +225,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
-DocType: Payment Reconciliation,Payments,Pagos.
 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
@@ -1495,7 +1509,7 @@
 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 +9,Procurement,Obtención
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,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/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
 ,Lead Details,Detalle de Iniciativas
 DocType: Purchase Invoice,End date of current invoice's period,Fecha final del periodo de facturación actual
@@ -1520,7 +1534,7 @@
 DocType: Purchase Invoice,Additional Discount,Descuento adicional
 DocType: Selling Settings,Selling Settings,Configuración de ventas
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Subastas en línea
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +97,Please specify either Quantity or Valuation Rate or both,"Por favor indique la Cantidad o el Tipo de Valoración, o ambos"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,"Por favor indique la Cantidad o el Tipo de Valoración, o ambos"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +13,Fulfillment,Cumplimiento
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Compañía, mes y año fiscal son obligatorios"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,GASTOS DE PUBLICIDAD
@@ -1529,7 +1543,7 @@
 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 +66,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,Fee Categoría
+DocType: Fee Category,Fee Category,Categoría de Precio
 ,Student Fee Collection,Cobro del Estudiante
 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
@@ -1541,14 +1555,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,Configuración ERPNext completa!
 DocType: Item,Weightage,Asignación
 DocType: Packing Slip,PS-,PD-
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +93,A Customer Group exists with same name please change the Customer name or rename the Customer Group,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/selling/doctype/customer/customer.py +126,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
 DocType: Stock Entry,Material Receipt,Recepción de materiales
 DocType: Homepage,Products,Productos
 DocType: Announcement,Instructor,Instructor
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},El tipo de entidad y tercero/s son requeridos para las cuentas de cobrar/pagar {0}
 DocType: 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
@@ -1559,7 +1572,7 @@
 ,Item-wise Sales Register,Detalle de ventas
 DocType: Asset,Gross Purchase Amount,Compra importe bruto
 DocType: Asset,Depreciation Method,Método de depreciación
-apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Offline,Desconectado
+apps/erpnext/erpnext/accounts/page/pos/pos.js +686,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
@@ -1577,25 +1590,27 @@
 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
 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 +858,Make Purchase Order,Crear orden de compra
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +852,Make Purchase Order,Crear orden de compra
 DocType: SMS Center,Send To,Enviar a
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,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 +148,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
 DocType: Stock Reconciliation,Stock Reconciliation,Reconciliación de inventarios
 DocType: Territory,Territory Name,Nombre Territorio
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +172,Work-in-Progress Warehouse is required before Submit,Se requiere un almacén de trabajos en proceso antes de validar
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,Work-in-Progress Warehouse is required before Submit,Se requiere un almacén de trabajos en proceso antes de validar
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Solicitante de empleo .
 DocType: Purchase Order Item,Warehouse and Reference,Almacén y Referencia
 DocType: Supplier,Statutory info and other general information about your Supplier,Información legal u otra información general acerca de su proveedor
-apps/erpnext/erpnext/hooks.py +88,Addresses,Direcciones
-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/payment_entry/payment_entry.py +212,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/hooks.py +95,Addresses,Direcciones
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +215,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"
 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)
 DocType: Sales Order,To Deliver and Bill,Para entregar y facturar
@@ -1603,11 +1618,10 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,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 +731,Payment,Pago
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,Payment,Pago
 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: Pricing Rule,Brand,Marca
 DocType: Course,Course Abbreviation,Abreviatura de golf
 DocType: Item,Will also apply for variants,También se aplicará para las variantes
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +142,"Asset cannot be cancelled, as it is already {0}","Activo no se puede cancelar, como ya lo es {0}"
@@ -1619,7 +1633,7 @@
 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."
 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 +85,Associate,Asociado
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,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
@@ -1627,7 +1641,7 @@
 DocType: Production Planning Tool,Material Requests,Las solicitudes de materiales
 DocType: Warranty Claim,Issue Date,Fecha de emisión
 DocType: Activity Cost,Activity Cost,Costo de Actividad
-DocType: Timesheet Detail,Timesheet Detail,Detalle de parte de horas
+DocType: Sales Invoice Timesheet,Timesheet Detail,Detalle de parte de horas
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Cantidad consumida
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telecomunicaciones
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indica que el paquete es una parte de esta entrega (Sólo borradores)
@@ -1650,6 +1664,7 @@
 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: 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
 DocType: Item,Has Variants,Posee variantes
 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
@@ -1662,30 +1677,31 @@
 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 +44,"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/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.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +502,Error: {0} &gt; {1},Error: {0}&gt; {1}
 DocType: Item,Is Sales Item,Es un producto para venta
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Árbol de productos
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,"El producto {0} no está configurado para utilizar Números de Serie, por favor revise el artículo maestro"
 DocType: Maintenance Visit,Maintenance Time,Tiempo del mantenimiento
 ,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."
 DocType: Naming Series,Current Value,Valor actual
-apps/erpnext/erpnext/controllers/accounts_controller.py +235,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/controllers/accounts_controller.py +238,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
 DocType: Delivery Note Item,Against Sales Order,Contra la orden de venta
 ,Serial No Status,Estado del número serie
 DocType: Payment Entry Reference,Outstanding,Excepcional
 ,Daily Timesheet Summary,Resumen diario de horas
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +458,Item table can not be blank,La tabla de productos no puede estar en blanco
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +443,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 +5,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
 DocType: Pricing Rule,Selling,Ventas
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +341,Amount {0} {1} deducted against {2},Monto {0} {1} presenta disminuyendo {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +344,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
@@ -1700,16 +1716,16 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +144,Cannot refer row number greater than or equal to current row number for this Charge type,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 +159,Red,Rojo
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Por favor, haga clic en 'Generar planificación' para obtener el no. de serie del producto {0}"
+apps/erpnext/erpnext/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
-DocType: Sales Invoice Payment,Base Amount (Company Currency),Importe base (Compañía de divisas)
+DocType: Sales Invoice Payment,Base Amount (Company Currency),Importe Base (Divisa de la Empresa)
 DocType: Payment Reconciliation Payment,Reference Row,referencia Fila
 DocType: Installation Note,Installation Time,Tiempo de instalación
 DocType: Sales Invoice,Accounting Details,Detalles de contabilidad
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,Eliminar todas las transacciones para esta compañía
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +187,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,"Línea # {0}: La operación {1} no se ha completado para la cantidad: {2} de productos terminados en orden de producción # {3}. Por favor, actualice el estado de la operación a través de la gestión de tiempos"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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,"Línea # {0}: La operación {1} no se ha completado para la cantidad: {2} de productos terminados en orden de producción # {3}. Por favor, actualice el estado de la operación a través de la gestión de tiempos"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,INVERSIONES
 DocType: Issue,Resolution Details,Detalles de la resolución
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,Las asignaciones
@@ -1745,16 +1761,17 @@
 DocType: Bank Reconciliation Detail,Against Account,Contra la cuenta
 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}
 DocType: Delivery Note,Excise Page Number,Número Impuestos Especiales Página
 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 +336,Amount {0} {1} against {2} {3},Monto {0} {1} {2} contra {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +339,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 +138,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 +295,Debit To account must be a Receivable account,La cuenta 'Debitar a' debe ser una cuenta por cobrar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Receivable account,La cuenta 'Debitar a' debe ser una cuenta por cobrar
 DocType: Shipping Rule Condition,Shipping Amount,Monto de envío
 ,Pending Amount,Monto pendiente
 DocType: Purchase Invoice Item,Conversion Factor,Factor de conversión
@@ -1762,10 +1779,10 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +137,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
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +90,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Total de hojas asignadas {0} no puede ser inferior a las hojas ya aprobados {1} para el período
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +93,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 +22,Enter Paid Amount,Ingrese monto pagado
+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
@@ -1775,13 +1792,15 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,tabla de tiempos
 DocType: HR Settings,HR Settings,Configuración de recursos humanos (RRHH)
 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 +524,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Fila # {0}: Cantidad debe ser 1, como elemento es un activo fijo. Por favor, use fila separada para el qty múltiple."
+apps/erpnext/erpnext/controllers/accounts_controller.py +527,"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 +249,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
 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/stock/get_item_details.py +123,Please specify Company,"Por favor, especifique la compañía"
 ,Customer Acquisition and Loyalty,Compras y Lealtad de Clientes
@@ -1792,17 +1811,19 @@
 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 +183,Closing (Opening + Totals),Cierre (Apertura + Totales)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),Cierre (Apertura + Totales)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,"Por favor, especifique la divisa en la compañía"
 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/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
-apps/erpnext/erpnext/controllers/accounts_controller.py +272,Account {0} is invalid. Account Currency must be {1},La cuenta {0} no es válida. La divisa de la cuenta debe ser {1}
+DocType: Email Digest,Pending Sales Orders,A la espera de órdenes de venta
+apps/erpnext/erpnext/controllers/accounts_controller.py +275,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 +956,"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 Slip,Deduction,Deducción
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +87,Row {0}: From Time and To Time is mandatory.,Fila {0}: Del tiempo y el tiempo es obligatorio.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +969,"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 +111,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 +262,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 +7,Please enter Employee Id of this sales person,"Por favor, Introduzca ID de empleado para este vendedor"
@@ -1810,7 +1831,7 @@
 DocType: Project,% Tasks Completed,% Tareas completadas
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,Diferencia La cantidad debe ser cero
 DocType: Project,Gross Margin,Margen bruto
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +194,Please enter Production Item first,"Por favor, ingrese primero el producto a fabricar"
+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
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Cotización
@@ -1819,53 +1840,54 @@
 DocType: Maintenance Visit,Maintenance User,Mantenimiento por usuario
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +149,Cost Updated,Costo actualizado
 DocType: Employee,Date of Birth,Fecha de nacimiento
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +86,Item {0} has already been returned,El producto {0} ya ha sido devuelto
+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}
+DocType: Student Admission,Eligibility,Elegibilidad
 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 +177,Job Description,Descripción del trabajo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,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 +126,"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 +127,"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."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +24,Welcome to POS: Create your POS Profile,Bienvenido a POS: Crea tu Perfil POS
 DocType: Expense Claim,Approver,Supervisor
 ,SO Qty,Cant. OV
+DocType: Guardian,Work Address,Dirección del trabajo
 DocType: Appraisal,Calculate Total Score,Calcular puntaje total
 DocType: Request for Quotation,Manufacturing Manager,Gerente de producción
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Número de serie {0} está en garantía hasta {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +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 +74,Shipments,Envíos
+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
 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 +153,Row # ,Línea #
+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 +156,Get From,Obtener desde
+apps/erpnext/erpnext/public/js/utils.js +167,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 +167,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 +416,"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"
+apps/erpnext/erpnext/controllers/accounts_controller.py +419,"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
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} is disabled,El usuario {0} está deshabilitado
 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...
 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 +171,"Types of employment (permanent, contract, intern etc.).","Tipos de empleo (permanente , contratos, pasante,  etc) ."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +346,{0} is mandatory for Item {1},{0} es obligatorio para el artículo {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,{0} is mandatory for Item {1},{0} es obligatorio para el artículo {1}
 DocType: Currency Exchange,From Currency,Desde moneda
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Por favor seleccione el monto asignado, tipo de factura y número en una fila"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,Costo de Compra de Nueva
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},Orden de venta requerida para el producto {0}
 DocType: Purchase Invoice Item,Rate (Company Currency),Precio (Divisa por defecto)
-apps/erpnext/erpnext/demo/setup_data.py +360,Others,Otros
+DocType: Student Guardian,Others,Otros
 DocType: Payment Entry,Unallocated Amount,Monto sin asignar
 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
@@ -1885,17 +1907,16 @@
 apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,Inventario Serializado
 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/accounts/report/item_wise_sales_register/item_wise_sales_register.py +54,Receivable Account,Cuenta por cobrar
-apps/erpnext/erpnext/controllers/accounts_controller.py +546,Row #{0}: Asset {1} is already {2},Fila # {0}: {1} de activos ya es {2}
+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 +549,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 +79,CEO,CEO
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,CEO
 DocType: Expense Claim Detail,Expense Claim Detail,Detalle de reembolso de gastos
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +808,Please select correct account,"Por favor, seleccione la cuenta correcta"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +809,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
-DocType: Purchase Invoice Item,Page Break,Salto de página
 DocType: Production Order Operation,Pending,Pendiente
 DocType: Course,Course Name,Nombre del curso
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Usuarios que pueden aprobar las solicitudes de ausencia
@@ -1904,14 +1925,15 @@
 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 +54,Full-time,Jornada completa
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,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: Student,Guardians,guardianes
 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 +289,Debit To is required,Se requiere débito para
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +321,Debit To is required,Se requiere débito para
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Lista de precios para las compras
 DocType: Offer Letter Term,Offer Term,Términos de la oferta
 DocType: Quality Inspection,Quality Manager,Gerente de calidad
@@ -1919,6 +1941,7 @@
 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/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
@@ -1929,18 +1952,17 @@
 DocType: Production Order Operation,Completed Qty,Cantidad completada
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"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 +273,Price List {0} is disabled,La lista de precios {0} está deshabilitada
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +99,Row {0}: Completed Qty cannot be more than {1} for operation {2},Fila {0}: Completo Cantidad no puede contener más de {1} para la operación {2}
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +123,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
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} números de serie son requeridos para el artículo {1}. Usted ha proporcionado {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Tasa de valoración actual
 DocType: Item,Customer Item Codes,Código del producto asignado por el cliente
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,Ganancia en Cambio / Pérdida
 DocType: Opportunity,Lost Reason,Razón de la pérdida
-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/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/purchase_receipt/purchase_receipt.py +378,All items have already been invoiced,Todos los artículos que ya se han facturado
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +379,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
@@ -1956,18 +1978,19 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Sus clientes
 apps/erpnext/erpnext/projects/doctype/project/project.py +141,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/job_opening.html +19,Apply Now,Aplica ya
+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,Liquidez bancaria
+,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."
 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
-apps/erpnext/erpnext/utilities/doctype/address/address.py +164,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: Fee Structure,Fee Structure,Estructura de tarifas
 DocType: Timesheet Detail,Costing Amount,Costo acumulado
+DocType: Student Admission,Application Fee,Tasa de solicitud
 DocType: Process Payroll,Submit Salary Slip,Validar nómina salarial
-apps/erpnext/erpnext/controllers/selling_controller.py +161,Maxiumm discount for Item {0} is {1}%,Descuento máximo para el producto {0} es {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,Descuento máximo para el producto {0} es {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Importación en masa
 DocType: Sales Partner,Address & Contacts,Dirección y Contactos
 DocType: SMS Log,Sender Name,Nombre del remitente
@@ -1992,21 +2015,21 @@
 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_data.py +361,Travel,Viajes
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +155,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 +304,Travel,Viajes
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +167,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 +23,Update Cost,Actualizar costos
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Actualizar costos
 DocType: Item Reorder,Item Reorder,Reabastecer producto
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +36,Show Salary Slip,Slip Mostrar Salario
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +748,Transfer Material,Transferencia de Material
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +53,Show Salary Slip,Slip Mostrar Salario
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +166,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 +923,Please set recurring after saving,Por favor conjunto recurrente después de guardar
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +646,Select change amount account,Seleccione el cambio importe de la cuenta
+apps/erpnext/erpnext/public/js/controllers/transaction.js +914,Please set recurring after saving,Por favor conjunto recurrente después de guardar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +703,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
@@ -2018,31 +2041,32 @@
 DocType: Quality Inspection,Verified By,Verificado por
 DocType: Address,Subsidiary,Subsidiaria
 apps/erpnext/erpnext/setup/doctype/company/company.py +64,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","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: Quality Inspection,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 +33,Traceability,trazabilidad
 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 +352,Quantity in row {0} ({1}) must be same as manufactured quantity {2},La cantidad en la línea {0} ({1}) debe ser la misma que la cantidad producida {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Quantity in row {0} ({1}) must be same as manufactured quantity {2},La cantidad en la línea {0} ({1}) debe ser la misma que la cantidad producida {2}
 DocType: Appraisal,Employee,Empleado
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Invitar como usuario
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} está totalmente facturado
 DocType: Workstation Working Hour,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 +100,LMS,LMS
+apps/erpnext/erpnext/config/schools.py +104,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/config/crm.py +6,Sales Pipeline,Flujo de ventas
 DocType: Student Batch Student,Student Batch Student,Estudiante Estudiante lotes
-DocType: Sales Invoice,Mass Mailing,Correo masivo
+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 +199,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/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 +297,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 +111,Pharmaceutical,Farmacéutico
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +309,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/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
@@ -2057,27 +2081,28 @@
 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 +814,Please specify Company to proceed,"Por favor, especifique la compañía para continuar"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +793,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 +44,Compensatory Off,Compensatorio
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,Compensatorio
 DocType: Quality Inspection Reading,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."
 DocType: Room,Room Number,Número de habitación
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Inválido referencia {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +161,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) no puede ser mayor que la cantidad planificada ({2}) en la orden de producción {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +162,{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 +217,Raw Materials cannot be blank.,'Materias primas' no puede estar en blanco.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,"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 +460,Quick Journal Entry,Asiento Rápida
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +111,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/accounts/doctype/sales_invoice/sales_invoice.py +441,"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 +450,Quick Journal Entry,Asiento Rápida
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +103,You can not change rate if BOM mentioned agianst any item,No se puede cambiar el precio si existe una Lista de materiales (LdM) en el producto
 DocType: Employee,Previous Work Experience,Experiencia laboral previa
 DocType: Stock Entry,For Quantity,Por cantidad
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +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 +214,{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
 ,Minutes to First Response for Issues,Minutos hasta la primera respuesta para Temas
 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.
@@ -2086,16 +2111,17 @@
 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 +398,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
 ,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 +739,Item or Warehouse for row {0} does not match Material Request,Artículo o almacén para la línea {0} no coincide con la requisición de materiales
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +747,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)
 DocType: Fiscal Year,Year End Date,Fecha de Finalización de Año
 DocType: Task Depends On,Task Depends On,Tarea depende de
-DocType: Lead,Opportunity,Oportunidad
+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
@@ -2108,7 +2134,7 @@
 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
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},La fecha de inicio del mantenimiento no puede ser anterior de la fecha de entrega para {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +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: Purchase Invoice,PINV-,PINV-
 DocType: Authorization Rule,Applicable To (Role),Aplicable a (Rol)
@@ -2123,7 +2149,7 @@
 DocType: SMS Log,No of Requested SMS,Número de SMS solicitados
 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 +729,Please supply the specified items at the best possible rates,Por favor suministrar los elementos especificados en las mejores tasas posibles
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +695,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 +117,Contract End Date must be greater than Date of Joining,La fecha de finalización de contrato debe ser mayor que la fecha de ingreso
 DocType: Delivery Note,DN-,DN-
@@ -2132,7 +2158,7 @@
 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 +14,This is an example website auto-generated from ERPNext,Este es un sitio web ejemplo generado automáticamente por ERPNext
+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
 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.
 
@@ -2179,13 +2205,14 @@
 DocType: Purchase Receipt Item,Recd Quantity,Cantidad recibida
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +54,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 +103,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 +504,Stock Entry {0} is not submitted,La entrada de stock {0} no esta validada
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},No se puede producir una cantidad mayor del producto {0} que lo requerido en el pedido de venta {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +505,Stock Entry {0} is not submitted,La entrada de stock {0} no esta validada
 DocType: Payment Reconciliation,Bank / Cash Account,Cuenta de banco / efectivo
 DocType: Tax Rule,Billing City,Ciudad de facturación
 DocType: Salary Component Account,Salary Component Account,Cuenta Nómina Componente
 DocType: Global Defaults,Hide Currency Symbol,Ocultar el símbolo de moneda
 apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card","Los métodos de pago normalmente utilizados por ejemplo: banco, efectivo, tarjeta de crédito, etc."
+DocType: Lead Source,Source Name,Nombre de la fuente
 DocType: Journal Entry,Credit Note,Nota de crédito
 DocType: Warranty Claim,Service Address,Dirección de servicio
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furnitures and Fixtures,Muebles y Accesorios
@@ -2197,6 +2224,7 @@
 DocType: Opportunity,Customer / Lead Name,Cliente / Oportunidad
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +89,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/controllers/trends.py +19,Total(Qty),Total (Cantidad)
 DocType: Sales Invoice,This Document,Este documento
@@ -2208,15 +2236,15 @@
 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 +176,Organization branch master.,Sucursal principal de la organización.
-apps/erpnext/erpnext/controllers/accounts_controller.py +273, or ,ó
+apps/erpnext/erpnext/controllers/accounts_controller.py +276, or ,ó
 DocType: Sales Order,Billing Status,Estado de facturación
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Informar un problema
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,Servicios públicos
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90 o más
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +203,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Fila # {0}: Asiento {1} no tiene en cuenta {2} o ya compara con otro bono
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +206,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 +90,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 +93,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
@@ -2244,8 +2272,8 @@
 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/hr/doctype/leave_allocation/leave_allocation.py +115,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 +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"El programa de mantenimiento no se genera para todos los productos. Por favor, haga clic en 'Generar programación'"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +118,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 +163,"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"
@@ -2257,13 +2285,13 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +32,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 +748,Delivery,Entregar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +742,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
 DocType: Payment Entry,Total Allocated Amount,Total asignado
 DocType: Item Reorder,Material Request Type,Tipo de requisición
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +82,Row {0}: UOM Conversion Factor is mandatory,Línea {0}: El factor de conversión de (UdM) es obligatorio
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Comprobante #
@@ -2274,13 +2302,13 @@
 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 +90,Head of Marketing and Sales,Director de marketing y ventas
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Impuesto sobre la renta
+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 +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
 DocType: Item Supplier,Item Supplier,Proveedor del producto
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +403,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 +770,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 +397,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 +764,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"
@@ -2292,28 +2320,29 @@
 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 +100,Issues,Incidencias
+apps/erpnext/erpnext/hooks.py +109,Issues,Incidencias
 apps/erpnext/erpnext/controllers/status_updater.py +13,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
 ,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
 DocType: Supplier,Billing Currency,Moneda de facturación
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Large,Extra grande
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Extra Large,Extra grande
 ,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 +507,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 +107,Local,Local
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +508,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/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 +154,Large,Grande
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Large,Grande
 DocType: Homepage Featured Product,Homepage Featured Product,Página de inicio Producto destacado
 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 +225,Total {0} ({1}),Total {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +224,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
@@ -2371,9 +2400,9 @@
 DocType: Attendance,Leave Type,Tipo de ausencia
 apps/erpnext/erpnext/controllers/stock_controller.py +173,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
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Name error: {0},Nombre de error: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +90,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 +178,{0} {1} does not associated with {2} {3},{0} {1} no asociada a {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +181,{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)
 DocType: Warehouse,Parent Warehouse,Almacén de los padres
@@ -2392,7 +2421,7 @@
 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
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,Al menos un elemento debe introducirse con cantidad negativa en el documento de devolución
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Atleast one item should be entered with negative quantity in return document,Al menos un elemento debe introducirse con cantidad negativa en el documento de devolución
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","La operación {0} tomará mas tiempo que la capacidad de producción de la estación {1}, por favor divida la tarea en varias operaciones"
 ,Requested,Solicitado
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +83,No Remarks,No hay observaciones
@@ -2400,50 +2429,50 @@
 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
 DocType: Fees,FEE.,CUOTA.
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Pago bruto + Montos atrazados + Vacaciones - Total deducciones
+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/stock/doctype/purchase_receipt/purchase_receipt.py +98,Quality Inspection required for Item {0},Inspección de la calidad requerida para el producto {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,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
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Administración de territorios
 DocType: Journal Entry Account,Sales Invoice,Factura de venta
 DocType: Journal Entry Account,Party Balance,Saldo de tercero/s
-apps/erpnext/erpnext/accounts/page/pos/pos.js +475,Please select Apply Discount On,Por favor seleccione 'Aplicar descuento en'
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +92,Salary Slip Created,Nómina de creación
+apps/erpnext/erpnext/accounts/page/pos/pos.js +464,Please select Apply Discount On,Por favor seleccione 'Aplicar descuento en'
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +95,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
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,El porcentaje de descuento puede ser aplicado ya sea en una lista de precios o para todas las listas de precios.
 DocType: Purchase Invoice,Half-yearly,Semestral
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +384,Accounting Entry for Stock,Asiento contable para inventario
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +387,Accounting Entry for Stock,Asiento contable para inventario
 DocType: Sales Invoice,Sales Team1,Equipo de ventas 1
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,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 +96,Row {0}: Completed Qty must be greater than zero.,Fila {0}: Completo Cantidad debe ser mayor que cero.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +120,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 +88,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/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
 DocType: Item Group,Show this slideshow at the top of the page,Mostrar esta presentación de diapositivas en la parte superior de la página
 DocType: BOM,Item UOM,Unidad de medida (UdM) del producto
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Monto de impuestos después del descuento (Divisa por defecto)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +147,Target warehouse is mandatory for row {0},El almacén de destino es obligatorio para la línea {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +141,Target warehouse is mandatory for row {0},El almacén de destino es obligatorio para la línea {0}
 DocType: Cheque Print Template,Primary Settings,Ajustes primarios
 DocType: Purchase Invoice,Select Supplier Address,Seleccionar dirección del proveedor
 DocType: Quality Inspection,Quality Inspection,Inspección de calidad
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Extra Small,Extra Pequeño
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +194,Account {0} is frozen,La cuenta {0} está congelada
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Extra Pequeño
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +690,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 +197,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 +606,Can only make payment against unbilled {0},Sólo se puede crear el pago contra {0} impagado
-apps/erpnext/erpnext/controllers/selling_controller.py +126,Commission rate cannot be greater than 100,El porcentaje de comisión no puede ser superior a 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +609,Can only make payment against unbilled {0},Sólo se puede crear el pago contra {0} impagado
+apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,El porcentaje de comisión no puede ser superior a 100
 DocType: Stock Entry,Subcontract,Sub-contrato
 apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,"Por favor, introduzca {0} primero"
 DocType: Production Order Operation,Actual End Time,Hora final real
@@ -2454,30 +2483,30 @@
 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 +158,Colour,Color
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,Color
 DocType: Maintenance Visit,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"
 DocType: Student Log,Academic,Académico
-apps/erpnext/erpnext/controllers/accounts_controller.py +469,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Avance total ({0}) contra la Orden {1} no puede ser mayor que el Gran Total ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +472,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Avance total ({0}) contra la Orden {1} no puede ser mayor que el Gran Total ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,"Seleccione la distribución mensual, para asignarla desigualmente en varios meses"
 DocType: Purchase Invoice Item,Valuation Rate,Tasa de Valoración
+DocType: Stock Reconciliation,SR/,SR /
 apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,El tipo de divisa para la lista de precios no ha sido seleccionado
 DocType: Assessment,Results,resultados
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +168,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 +175,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: Student Applicant,Father's/ Guardian 2 Email ID,del padre / tutor 2 ID de correo electrónico
 DocType: Maintenance Visit Purpose,Against Document No,Contra el Documento No
 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 +228,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 +231,Warehouses with existing transaction can not be converted to group.,Complejos de transacción existentes no pueden ser convertidos en grupo.
 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 +93,Researcher,Investigador
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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
@@ -2489,25 +2518,25 @@
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Para la comodidad de los clientes , estos códigos se pueden utilizar en formatos impresos como facturas y notas de entrega"
 DocType: Sales Invoice,Time Sheet List,Lista de hojas de tiempo
 DocType: Employee,You can enter any date manually,Puede introducir cualquier fecha manualmente
-DocType: Sales Invoice,Advertisement,Anuncio
 DocType: Asset Category Account,Depreciation Expense Account,Cuenta de gastos de depreciación
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Probationary Period,Período de prueba
-apps/erpnext/erpnext/hooks.py +102,Announcements,anuncios
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Período de prueba
+apps/erpnext/erpnext/hooks.py +111,Announcements,anuncios
 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 +109,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 +16,To Datetime,Para fecha y hora
+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/scheduling_tool/scheduling_tool.py +51,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/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Actividades pendientes
+DocType: Accounts Settings,Make Payment via Journal Entry,Hace el pago vía entrada de diario
+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 +127,Please enter relieving date.,"Por favor, introduzca la fecha de relevo"
-apps/erpnext/erpnext/controllers/trends.py +145,Amt,Monto
+apps/erpnext/erpnext/controllers/trends.py +149,Amt,Monto
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,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 +26,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."
@@ -2525,14 +2554,15 @@
 apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1},No se puede encontrar el tipo de cambio para {0} a {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Medio Día Marcos
 DocType: Sales Invoice,Sales Team,Equipo de ventas
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Duplicate entry,Entrada duplicada
+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 +490,[Error],[Error]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +484,[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
 apps/erpnext/erpnext/controllers/status_updater.py +175,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."
 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
@@ -2548,22 +2578,22 @@
 ,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 +25,All Jobs,Todos los trabajos
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,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'
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Amount {0} {1} {2} {3},Monto {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Amount {0} {1} {2} {3},Monto {0} {1} {2} {3}
 DocType: Account,Depreciation,DEPRECIACIONES
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Proveedor(es)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Herramienta de asistencia de los empleados
 DocType: 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 +372,Payment Entries {0} are un-linked,Las entradas de pago {0} son no-relacionado
+apps/erpnext/erpnext/accounts/utils.py +449,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
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +497,Material Requests {0} created,Requisición de materiales {0} creada
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +498,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.
 DocType: Purchase Invoice,Address and Contact,Dirección y contacto
@@ -2602,7 +2632,7 @@
 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 +848,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 +859,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 +233,Closing (Dr),Cierre (Deb)
 DocType: Cheque Print Template,Cheque Size,Cheque Tamaño
@@ -2623,7 +2653,8 @@
 ,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.
-apps/erpnext/erpnext/controllers/accounts_controller.py +555,'Update Stock' cannot be checked for fixed asset sale,&quot;Actualización de la &#39;no se puede comprobar en venta de activos fijos
+DocType: Student Guardian,Father,Padre
+apps/erpnext/erpnext/controllers/accounts_controller.py +558,'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
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Obtener actualizaciones
 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
@@ -2633,15 +2664,15 @@
 DocType: Sales Order,Fully Delivered,Entregado completamente
 DocType: Lead,Lower Income,Ingreso menor
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","La cuenta de patrimonio, en la cual serán registradas las perdidas y/o ganancias"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +166,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 +238,"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 +81,Purchase Order number required for Item {0},Se requiere el numero de orden de compra para el producto {0}
+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/purchase_receipt/purchase_receipt.py +82,Purchase Order number required for Item {0},Se requiere el numero de orden de compra para el producto {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Desde la fecha' debe ser después de 'Hasta Fecha'
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +17,Cannot change status as student {0} is linked with student application {1},No se puede cambiar el estado de estudiante {0} está vinculada con la aplicación del estudiante {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +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: Timesheet,"List of employee which has ""Salary Slip Based on Timesheet"" is enabled in salary structure.",Lista de empleados que tiene &quot;nómina Basado en parte de horas&quot; está habilitada en la estructura salarial.
 DocType: Asset,Fully Depreciated,Estando totalmente amortizados
 ,Stock Projected Qty,Cantidad de inventario proyectado
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Customer {0} does not belong to project {1},Cliente {0} no pertenece al proyecto {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,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
 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
@@ -2653,7 +2684,7 @@
 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/patches/v7_0/create_warehouse_nestedset.py +55,All Warehouses,todas las bodegas
+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 +105,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
@@ -2663,12 +2694,12 @@
 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 +154,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 +26,Browse BOM,Explorar la lista de materiales
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,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/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 Year,Academic Year,Año académico
+DocType: Academic Term,Academic Year,Año académico
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Opening Balance Equity,APERTURA DE CAPITAL
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,Evaluación
@@ -2676,12 +2707,12 @@
 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 +197,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 +204,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: Workstation Working Hour,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 +256,Select Quantity,Seleccione cantidad
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +257,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
@@ -2698,6 +2729,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Es obligatoria la meta fe facturación.
 apps/erpnext/erpnext/config/projects.py +45,Cost of various activities,Costo de diversas actividades
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Configurar los eventos a {0}, ya que el empleado que esté conectado a la continuación vendedores no tiene un ID de usuario {1}"
+DocType: Timesheet,Billing Details,Detalles de facturación
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +149,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}
 DocType: Item,Inspection Required,Inspección requerida
@@ -2717,7 +2749,7 @@
 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 +138,Wire Transfer,Transferencia bancaria
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,Transferencia bancaria
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Marque todas las
 DocType: Sales Order,Recurring Order,Orden recurrente
 DocType: Company,Default Income Account,Cuenta de ingresos por defecto
@@ -2725,25 +2757,23 @@
 DocType: Sales Invoice,Time Sheets,Las hojas de asistencia
 DocType: Payment Gateway Account,Default Payment Request Message,Defecto de solicitud de pago del mensaje
 DocType: 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,De bancos y pagos
+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
 DocType: Lead,From Customer,Desde cliente
-apps/erpnext/erpnext/demo/setup_data.py +357,Calls,Llamadas
+apps/erpnext/erpnext/demo/setup/setup_data.py +300,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/stock/doctype/item/item.py +466,"As there are existing transactions for this item, \
-							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Como hay transacciones existentes por este concepto, \ no puede cambiar los valores de &#39;no tiene de serie&#39;, &#39;tiene Nº de lote &quot;,&quot; ¿Es de Punto &quot;y&quot; Método de valoración&#39;"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,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/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 +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota : El sistema no verificará sobre-entregas y exceso de almacenamiento para el producto {0} ya que la cantidad es 0
 DocType: Notification Control,Quotation Message,Mensaje de oferta de venta
 DocType: Issue,Opening Date,Fecha de apertura
-apps/erpnext/erpnext/schools/api.py +58,Attendance has been marked successfully.,La asistencia ha sido marcada con éxito.
+apps/erpnext/erpnext/schools/api.py +57,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 +136,Account Type for {0} must be {1},Tipo de cuenta para {0} debe ser {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +139,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
@@ -2758,12 +2788,13 @@
 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/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 +20,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 +1190,Please select customer,"Por favor, seleccione al cliente"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1193,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
@@ -2773,6 +2804,7 @@
 ,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 +50,Missing Currency Exchange Rates for {0},Se requiere la tasa de cambio para {0}
 DocType: Assessment,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
@@ -2790,11 +2822,12 @@
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Nombre del tema
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Al menos uno de la venta o compra debe seleccionar
+DocType: Grading Structure,Grade Intervals,intervalos de grado
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Seleccione la naturaleza de su negocio.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Dónde se realizan las operaciones de producción
 DocType: Asset Movement,Source Warehouse,Almacén de origen
 DocType: Installation Note,Installation Date,Fecha de instalación
-apps/erpnext/erpnext/controllers/accounts_controller.py +534,Row #{0}: Asset {1} does not belong to company {2},Fila # {0}: {1} Activos no pertenece a la empresa {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +537,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
@@ -2808,28 +2841,31 @@
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Cantidad de lotes disponibles en De Almacén
 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,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 +111,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/scheduling_tool/scheduling_tool.py +49,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 +87,{0}% Delivered,{0}% Entregado
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% Entregado
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,El producto {0}: Con la cantidad ordenada {1} no puede ser menor que el pedido mínimo {2} (definido en el producto).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Distribución mensual porcentual
 DocType: Territory,Territory Targets,Metas de territorios
 DocType: Delivery Note,Transporter Info,Información de Transportista
-apps/erpnext/erpnext/accounts/utils.py +379,Please set default {0} in Company {1},Por favor ajuste por defecto {0} en la empresa {1}
+apps/erpnext/erpnext/accounts/utils.py +456,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
 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.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Títulos para las plantillas de impresión, por ejemplo, Factura proforma."
+DocType: Student Guardian,Student Guardian,Guardián del estudiante
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +184,Valuation type charges can not marked as Inclusive,Cargos de tipo de valoración no pueden marcado como Incluido
 DocType: POS Profile,Update Stock,Actualizar el Inventario
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Unidad de Medida diferente para elementos dará lugar a Peso Neto (Total) incorrecto. Asegúrese de que el peso neto de cada artículo esté en la misma Unidad de Medida.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Coeficiente de la lista de materiales (LdM)
 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 +349,Journal Entries {0} are un-linked,Los asientos contables {0} no están enlazados
+apps/erpnext/erpnext/accounts/utils.py +426,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"
@@ -2853,6 +2889,7 @@
 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
+DocType: Homepage,"URL for ""All Products""",URL de &quot;Todos los productos&quot;
 DocType: Leave Application,Leave Balance Before Application,Ausencias disponibles antes de la solicitud
 DocType: SMS Center,Send SMS,Enviar mensaje SMS
 DocType: Cheque Print Template,Width of amount in word,Anchura del importe de palabra
@@ -2861,7 +2898,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 +29,Current Job Openings,Ofertas de empleo actuales
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,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
@@ -2874,7 +2911,7 @@
 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 +850,Show tax break-up,Mostrar impuesto fragmentado
+apps/erpnext/erpnext/public/js/controllers/transaction.js +841,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/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"
@@ -2884,10 +2921,11 @@
 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 +534,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 +80,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 +162,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/selling/doctype/customer/customer.py +195,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 +5,This is based on the attendance of this Student,Esto se basa en la presencia de este Estudiante
@@ -2896,12 +2934,11 @@
 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 +75,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 +138,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/hr/doctype/leave_application/leave_application.py +145,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: Program Enrollment Fee,Program Enrollment Fee,Programa de cuota de inscripción
 DocType: Item,Supplier Items,Artículos de proveedor
 DocType: Opportunity,Opportunity Type,Tipo de oportunidad
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,Nueva compañía
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,Cost Center is required for 'Profit and Loss' account {0},El centro de costos es requerido para la cuenta de 'perdidas y ganancias' {0}
 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 borradas por el creador de la compañía
 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.,Se encontró un número incorrecto de entradas del libro mayor. Es posible que haya seleccionado una cuenta equivocada en la transacción.
 DocType: Cheque Print Template,Cheque Width,Ancho Cheque
@@ -2909,17 +2946,18 @@
 DocType: Hub Settings,Publish Availability,Publicar disponibilidad
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,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/manufacturing/doctype/production_order/production_order.js +128,Timesheet,parte de horas
-apps/erpnext/erpnext/controllers/accounts_controller.py +228,{0} '{1}' is disabled,{0} '{1}' está deshabilitado
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,Registro de Horas
+apps/erpnext/erpnext/controllers/accounts_controller.py +231,{0} '{1}' is disabled,{0} '{1}' está deshabilitado
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Establecer como abierto/a
 DocType: Cheque Print Template,Scanned Cheque,escaneada Cheque
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Enviar correos electrónicos automáticos a contactos al momento de registrase una transacción
+DocType: Timesheet,Total Billable Amount,Monto total facturable
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Elemento 3
 DocType: Purchase Order,Customer Contact Email,Correo electrónico de contacto de cliente
 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 +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Nota : El registro del pago no se creará hasta que la cuenta del tipo 'Banco o Cajas' sea definida
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Responsibilities,Responsabilidades
+apps/erpnext/erpnext/controllers/accounts_controller.py +78,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
 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
@@ -2927,6 +2965,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Agregar usuarios
 DocType: Pricing Rule,Item Group,Grupo de productos
 DocType: Item,Safety Stock,Stock de seguridad
+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: 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)
@@ -2936,7 +2975,6 @@
 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: Timesheet,Total Hours,Total de Horas
 DocType: Journal Entry,Printing Settings,Ajustes de impresión
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,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
@@ -2949,13 +2987,14 @@
 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 +71,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
+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: Purchase Invoice Item,Rate,Precio
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Intern,Interno
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,Interno
 DocType: Stock Entry,From BOM,Desde lista de materiales (LdM)
 DocType: Assessment,Assessment Code,Código evaluación
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +32,Basic,Base
+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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Por favor, haga clic en 'Generar planificación'"
+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 +95,Reference No is mandatory if you entered Reference Date,El No. de referencia es obligatoria si usted introdujo la fecha
@@ -2964,45 +3003,47 @@
 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 +752,Issue Material,Distribuir materiales
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +723,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 +683,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/accounts/page/pos/pos.js +665,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.
 DocType: Hub Settings,Access Token,Token de acceso
 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/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,Tiempo de trabajo total
+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 +1122,Enter value must be positive,Introducir el valor debe ser positivo
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,All Territories,Todos los Territorios
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1125,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
 DocType: Purchase Invoice,Items,Productos
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +23,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 +221,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 +233,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 +96,Request for Quotations,Solicitud de ofertas de venta
+apps/erpnext/erpnext/hooks.py +104,Request for Quotations,Solicitud de ofertas de venta
 DocType: Payment Reconciliation,Maximum Invoice Amount,Importe Máximo Factura
 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 +628,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unidad de medida predeterminada para Variant &#39;{0}&#39; debe ser el mismo que en la plantilla &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unidad de medida predeterminada para 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
 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
 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 +27,Default Address Template cannot be deleted,La plantilla de direcciones por defecto no puede ser eliminada
+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
 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
@@ -3017,8 +3058,8 @@
 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/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 +485,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 +336,Please select Posting Date first,"Por favor, seleccione Fecha de contabilización primero"
+apps/erpnext/erpnext/stock/get_item_details.py +486,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 +326,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
@@ -3032,8 +3073,9 @@
 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/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
+DocType: Journal Entry,Bank Entry,Registro de Banco
 DocType: Authorization Rule,Applicable To (Designation),Aplicables a (Puesto)
+,Profitability Analysis,Cuenta de resultados
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,Añadir a la Cesta
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Agrupar por
 DocType: Guardian,Interests,Intereses
@@ -3046,21 +3088,21 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,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 +141,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",El producto serializado {0} no se puede actualizar / reconciliar stock
 DocType: Scheduling Tool,Day,Día
 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 +122,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 +129,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
-DocType: Student Applicant,AP.,AP.
 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 +639,Point of Sale,Punto de Venta
+apps/erpnext/erpnext/accounts/page/pos/pos.js +634,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
 DocType: Production Planning Tool,Production Planning Tool,Planificar producción
@@ -3069,74 +3111,77 @@
 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 +373,Quantity to Manufacture must be greater than 0.,La cantidad a producir debe ser mayor que 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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 Profile,Customer Group,Categoría de cliente
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,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/doctype/asset/asset.py +83,Next Depreciation Date must be on or after today,La depreciación próxima fecha debe ser a partir del día de hoy
 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 +145,Please cancel Purchase Invoice {0} first,"Por favor, cancelar Factura de Compra {0} primera"
 DocType: Serial No,AMC Expiry Date,Fecha de caducidad de CMA (Contrato de Mantenimiento Anual)
 ,Sales Register,Registro de ventas
 DocType: Quotation,Quotation Lost Reason,Razón de la pérdida
+apps/erpnext/erpnext/utilities/doctype/address/address.py +164,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."
 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 +330,Transaction reference no {0} dated {1},Referencia de la transacción no {0} {1} fechado
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,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 +107,Summary for this month and pending activities,Resumen para este mes y actividades pendientes
+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/accounts/doctype/sales_invoice/sales_invoice.py +406,Please remove this Invoice {0} from C-Form {1},"Por favor, elimine esta factura {0} de C-Form {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,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 +644,Get Items,Obtener artículos
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +623,Get Items,Obtener artículos
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +210,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 +41,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
 DocType: Payment Request,Initiated,Iniciado
 DocType: Production Order,Planned Start Date,Fecha prevista de inicio
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,Customer is required against Receivable account {0},Se requiere al cliente contra la cuenta por cobrar {0}
 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 +265,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 la oferta de venta
 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 +101,Commercial,Comercial
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,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: Supplier Quotation,Supplier Address,Dirección de proveedor
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +648,Row {0}# Account must be of type 'Fixed Asset',Fila {0} # La cuenta debe ser de tipo &quot;Activo Fijo&quot;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,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 +30,Series is mandatory,La secuencia es obligatoria
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +50,Series is mandatory,La secuencia es obligatoria
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Servicios financieros
 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
 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}
 DocType: Leave Allocation,Unused leaves,Ausencias no utilizadas
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Cr,Cred
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Cr,Cred
 DocType: Tax Rule,Billing State,Región de facturación
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +250,Transfer,Transferencia
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +187,{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 +825,Fetch exploded BOM (including sub-assemblies),Buscar lista de materiales (LdM) incluyendo subconjuntos
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +254,Transfer,Transferencia
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +190,{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 +796,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 +115,Due Date is mandatory,La fecha de vencimiento es obligatoria
+apps/erpnext/erpnext/controllers/accounts_controller.py +118,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
 DocType: Journal Entry,Pay To / Recd From,Pagar a / Recibido de
 DocType: Naming Series,Setup Series,Configurar secuencias
 DocType: Payment Reconciliation,To Invoice Date,Para Factura Fecha
 DocType: Supplier,Contact HTML,HTML de Contacto
 ,Inactive Customers,Los clientes inactivos
+DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Recibos de compra
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,¿Cómo se aplica la regla precios?
 DocType: Quality Inspection,Delivery Note No,Nota de entrega No.
@@ -3145,7 +3190,7 @@
 DocType: Company,Retail,Ventas al por menor
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +120,Customer {0} does not exist,El cliente {0} no existe
 DocType: Attendance,Absent,Ausente
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +587,Product Bundle,Conjunto / paquete de productos
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Product Bundle,Conjunto / paquete de productos
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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
@@ -3155,8 +3200,8 @@
 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 +742,Send Supplier Emails,Enviar mensajes de correo electrónico del proveedor
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +104,"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/buying/doctype/request_for_quotation/request_for_quotation.js +708,Send Supplier Emails,Enviar mensajes de correo electrónico del proveedor
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,"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
 DocType: Guardian Interest,Guardian Interest,guardián interés
 DocType: Timesheet,Employee Detail,Detalle de los empleados
@@ -3167,9 +3212,9 @@
 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}
 DocType: Salary Slip,Earning & Deduction,Ingresos y Deducciones
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +77,Account {0} cannot be a Group,Cuenta {0} no puede ser un Grupo
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} cannot be a Group,Cuenta {0} no puede ser un Grupo
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +31,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 +107,Negative Valuation Rate is not allowed,La valoración negativa no está permitida
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,La valoración negativa no está permitida
 DocType: Holiday List,Weekly Off,Semanal Desactivado
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Por ejemplo, 2012 , 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +39,Provisional Profit / Loss (Credit),Beneficio provisional / pérdida (Crédito)
@@ -3183,16 +3228,16 @@
 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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Centro de Costes es obligatorio para el artículo {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +626,Get Items from Product Bundle,Obtener elementos del paquete del producto
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +605,Get Items from Product Bundle,Obtener elementos del paquete del producto
 DocType: Asset,Straight Line,Línea recta
 DocType: Project User,Project User,usuario proyecto
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} is inactive,Cuenta {0} está inactiva
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} is inactive,Cuenta {0} está inactiva
 DocType: GL Entry,Is Advance,Es un anticipo
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Asistencia 'Desde fecha' y 'Hasta fecha' son obligatorias
 apps/erpnext/erpnext/controllers/buying_controller.py +148,Please enter 'Is Subcontracted' as Yes or No,"Por favor, introduzca si 'Es sub-contratado' o no"
 DocType: Sales Team,Contact No.,Contacto No.
 DocType: Bank Reconciliation,Payment Entries,Las entradas de pago
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,'Profit and Loss' type account {0} not allowed in Opening Entry,El tipo de cuenta 'Pérdidas y ganancias' {0} no esta permitida para el asiento de apertura
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +71,'Profit and Loss' type account {0} not allowed in Opening Entry,El tipo de cuenta 'Pérdidas y ganancias' {0} no esta permitida para el asiento de apertura
 DocType: 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
@@ -3211,7 +3256,7 @@
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial #.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Commission on Sales,Comisiones sobre ventas
 DocType: Offer Letter Term,Value / Description,Valor / Descripción
-apps/erpnext/erpnext/controllers/accounts_controller.py +558,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Fila # {0}: el elemento {1} no puede ser presentado, lo que ya es {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +561,"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: Production Order,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}.
@@ -3224,13 +3269,13 @@
 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/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Legal Expenses,GASTOS LEGALES
 DocType: Purchase Invoice,Posting Time,Hora de contabilización
-DocType: Sales Order,% Amount Billed,% importe facturado
+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.
 apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},Ningún producto con numero de serie {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Abrir notificaciones
+DocType: Email Digest,Open Notifications,Abrir notificaciones
 DocType: Payment Entry,Difference Amount (Company Currency),Diferencia Monto (Compañía de divisas)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,Gastos directos
 apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
@@ -3238,7 +3283,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Ingresos del nuevo cliente
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,Gastos de viaje
 DocType: Maintenance Visit,Breakdown,Desglose
-apps/erpnext/erpnext/controllers/accounts_controller.py +634,Account: {0} with currency: {1} can not be selected,Cuenta: {0} con divisa: {1} no puede ser seleccionada
+apps/erpnext/erpnext/controllers/accounts_controller.py +637,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}
 DocType: Program Enrollment Tool,Student Applicants,Los solicitantes de los estudiantes
@@ -3246,15 +3291,15 @@
 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 +56,Probation,Período de prueba
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Probation,Período de prueba
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,componentes de sueldos
 DocType: Program Enrollment Tool,New Academic Year,Nuevo Año Académico
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Payment of salary for the month {0} and year {1},Pago del salario correspondiente al mes {0} del año {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Payment of salary for the month {0} and year {1},Pago del salario correspondiente al mes {0} del año {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Auto inserto tasa Lista de Precios si falta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Importe total pagado
 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 +144,Planning,Planificación
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,Planificación
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,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
@@ -3267,11 +3312,10 @@
 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.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Sales invoice submitted sucessfully.,factura de venta presentado con éxito.
 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}"
 DocType: Assessment Result,Student Name,Nombre del estudiante
-apps/erpnext/erpnext/hooks.py +104,Assessment Schedule,Horario evaluación
+apps/erpnext/erpnext/hooks.py +113,Assessment Schedule,Horario evaluación
 DocType: Brand,Item Manager,Administración de elementos
 DocType: Buying Settings,Default Supplier Type,Tipos de Proveedores
 DocType: Production Order,Total Operating Cost,Costo Total de Funcionamiento
@@ -3281,6 +3325,7 @@
 DocType: GL Entry,Party Type,Tipo de entidad
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +78,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
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Plantilla maestra de nómina salarial
 DocType: Leave Type,Max Days Leave Allowed,Máximo de días de ausencia permitidos
@@ -3292,18 +3337,19 @@
 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 +99,All Customer Groups,Todas las categorías de clientes
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +78,Accumulated Monthly,acumulado Mensual
-apps/erpnext/erpnext/controllers/accounts_controller.py +595,{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/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Todas las categorías de clientes
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +81,Accumulated Monthly,acumulado Mensual
+apps/erpnext/erpnext/controllers/accounts_controller.py +598,{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
 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
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +188,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
 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 +84,Secretary,Secretaria
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,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
@@ -3312,24 +3358,22 @@
 ,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
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,Línea # {0}: El número de serie es obligatorio
+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 +859,Supplier Quotation,Oferta de venta de proveedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +838,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/schools/doctype/fees/fees.js +7,Collect Fees,cobrar tarifas
+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}
 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.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Próximos eventos
 DocType: Item,Opening Stock,Stock de apertura
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Se requiere cliente
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} es obligatorio para la devolución
 DocType: Purchase Order,To Receive,Recibir
 apps/erpnext/erpnext/public/js/setup_wizard.js +195,user@example.com,usuario@ejemplo.com
-DocType: Email Digest,Income / Expense,Ingresos / gastos
 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."
@@ -3340,13 +3384,14 @@
 DocType: Customer,From Lead,Desde iniciativa
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Las órdenes publicadas para la producción.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Seleccione el año fiscal...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,POS Profile required to make POS Entry,Se requiere un perfil de TPV para crear entradas en el punto de venta
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +509,POS Profile required to make POS Entry,Se requiere un perfil de TPV para crear entradas en el punto de venta
 DocType: Program Enrollment Tool,Enroll Students,inscribir a los estudiantes
 DocType: Hub Settings,Name Token,Nombre de Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Venta estándar
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Atleast one warehouse is mandatory,Al menos un almacén es obligatorio
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +129,Atleast one warehouse is mandatory,Al menos un almacén es obligatorio
 DocType: Serial No,Out of Warranty,Fuera de garantía
 DocType: BOM Replace Tool,Replace,Reemplazar
+DocType: Production Order,Unstopped,destapados
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{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
@@ -3367,10 +3412,11 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,Vacaciones deben distribuirse en múltiplos de 0.5
 DocType: Production Order,Operation Cost,Costo de operación
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,Subir la asistencia desde un archivo .csv
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Saldo pendiente
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Establecer objetivos en los grupos de productos para este vendedor
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Congelar stock mayores a [Days]
-apps/erpnext/erpnext/controllers/accounts_controller.py +528,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Fila # {0}: el elemento es obligatorio para los activos fijos de compra / venta
+apps/erpnext/erpnext/controllers/accounts_controller.py +531,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Fila # {0}: el elemento es obligatorio para los activos fijos de compra / venta
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Si dos o más reglas de precios se encuentran basados en las condiciones anteriores, se aplicará prioridad. La prioridad es un número entre 0 a 20 mientras que el valor por defecto es cero (en blanco). Un número más alto significa que va a prevalecer si hay varias reglas de precios con mismas condiciones."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,El año fiscal: {0} no existe
 DocType: Currency Exchange,To Currency,A moneda
@@ -3387,15 +3433,15 @@
 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
-DocType: Sales Invoice,Exhibition,Exposición
 apps/erpnext/erpnext/utilities/doctype/address/address.py +77,"Company is mandatory, as it is your company address","Company es obligatoria, ya que es la dirección de la empresa"
 DocType: Item Attribute,From Range,De Gama
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +81,Syntax error in formula or condition: {0},Error de sintaxis en la fórmula o condición: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +92,Syntax error in formula or condition: {0},Error de sintaxis en la fórmula o condición: {0}
 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
+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 +28,Jobs,Trabajos
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,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
@@ -3404,16 +3450,16 @@
 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 +763,Make Supplier Quotation,Crear oferta de venta de un proveedor
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,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/controllers/sales_and_purchase_return.py +100,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 +42,Casual Leave,Permiso ocacional
+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
 DocType: Batch,Batch ID,ID de lote
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,Note: {0},Nota: {0}
 ,Delivery Note Trends,Evolución de las notas de entrega
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +103,This Week's Summary,Resumen de la semana.
+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
 DocType: Student Group Creation Tool,Get Courses,Obtener Cursos
 DocType: GL Entry,Party,Tercero
@@ -3423,14 +3469,14 @@
 DocType: Request for Quotation Item,Request for Quotation Item,Solicitud de oferta de venta de artículos
 DocType: Purchase Order,To Bill,Por facturar
 DocType: Material Request,% Ordered,% Ordenado
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Piecework,Trabajo por obra
+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: 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.
 DocType: Stock Ledger Entry,Stock Ledger Entry,Entradas en el mayor de inventarios
-DocType: Department,Leave Block List,Lista de días bloqueados
+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
@@ -3440,7 +3486,7 @@
 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.
 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 +162,Black,Negro
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,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
@@ -3451,13 +3497,13 @@
 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 +69,Customer Id,ID del cliente
+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
 DocType: Journal Entry Account,Exchange Rate,Tipo de cambio
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Sales Order {0} is not submitted,La órden de venta {0} no esta validada
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +527,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,Cuota de componentes
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +857,Add items from,Agregar elementos de
+DocType: Fee Component,Fee Component,Componente de Precio
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +836,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}
 DocType: Cheque Print Template,Regular,Regular
 DocType: BOM,Last Purchase Rate,Tasa de cambio de última compra
@@ -3465,6 +3511,7 @@
 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
 ,Sales Person-wise Transaction Summary,Resumen de transacciones por vendedor
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +60,Cost Center is required for 'Profit and Loss' account {0}. Please set up a default Cost Center for the Company.,"Se requiere un centro de costos para &#39;de pérdidas y ganancias&#39; cuenta {0}. Por favor, establecer un centro de coste por defecto para la Compañía."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,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
@@ -3475,12 +3522,12 @@
 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 +710,Online,En línea
+apps/erpnext/erpnext/accounts/page/pos/pos.js +692,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 +16,Setting this Address Template as default as there is no other default,Establecer esta plantilla de dirección por defecto ya que no existe una predeterminada
+apps/erpnext/erpnext/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
 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 +74,Quality Management,Gestión de calidad
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,Gestión de calidad
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} has been disabled,Elemento {0} ha sido desactivado
 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
@@ -3502,11 +3549,12 @@
 DocType: Student,Student Email ID,Estudiante ID de correo electrónico
 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 +1520,Select items to save the invoice,Seleccione artículos para ahorrar la factura
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1544,Select items to save the invoice,Seleccione artículos para ahorrar la factura
 DocType: Employee,Encashment Date,Fecha de cobro
 DocType: Account,Stock Adjustment,Ajuste de existencias
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Existe una actividad de costo por defecto para la actividad del tipo - {0}
 DocType: Production Order,Planned Operating Cost,Costos operativos planeados
+DocType: Academic Term,Term Start Date,Plazo Fecha de Inicio
 apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},"Por favor, buscar el adjunto {0} #{1}"
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Equilibrio extracto bancario según Contabilidad General
 DocType: Job Applicant,Applicant Name,Nombre del Solicitante
@@ -3536,17 +3584,17 @@
 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."
 DocType: Company,Distribution,Distribución
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +8,Amount Paid,Total Pagado
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Project Manager,Gerente de proyectos
+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
 ,Quoted Item Comparison,Citado artículo Comparación
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Dispatch,Despacho
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,Despacho
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Descuento máximo permitido para el producto: {0} es {1}%
 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.
-DocType: Sales Invoice,Supplier Reference,Referencia de proveedor
-apps/erpnext/erpnext/accounts/page/pos/pos.js +844,"Master data syncing, it might take some time","Maestro sincronización de datos, que podría tomar algún tiempo"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +832,"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
@@ -3560,7 +3608,7 @@
 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 +83,Error in formula or condition,Error en la fórmula o condición
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,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
@@ -3569,7 +3617,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},La fecha debe estar dentro del año fiscal. Asumiendo a la fecha = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Aquí usted puede ingresar la altura, el peso, alergias, problemas médicos, etc."
 DocType: Leave Block List,Applies to Company,Se aplica a la empresa
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +197,Cannot cancel because submitted Stock Entry {0} exists,No se puede cancelar debido a que existe una entrada en el almacén {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +198,Cannot cancel because submitted Stock Entry {0} exists,No se puede cancelar debido a que existe una entrada en el almacén {0}
 DocType: Purchase Invoice,In Words,En palabras
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,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
@@ -3579,14 +3627,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,El año financiero inicia el
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Las depreciaciones de activos y saldos
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +319,Amount {0} {1} transferred from {2} to {3},Monto {0} {1} transferido desde {2} a {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +322,Amount {0} {1} transferred from {2} to {3},Monto {0} {1} transferido desde {2} a {3}
 DocType: Sales Invoice,Get Advances Received,Obtener anticipos recibidos
 DocType: Email Digest,Add/Remove Recipients,Agregar / Eliminar destinatarios
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +432,Transaction not allowed against stopped Production Order {0},Transacción no permitida contra Orden Producción Detenida {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +437,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 +143,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 +652,Item variant {0} exists with same attributes,Existe la variante de artículo {0} con mismos atributos
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Existe la variante de artículo {0} con mismos atributos
+DocType: Leave Application,LAP/,REGAZO/
 DocType: Salary Slip,Salary Slip,Nómina salarial
 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
@@ -3594,12 +3643,12 @@
 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 +212,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 +215,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: Employee Education,Employee Education,Educación del empleado
-apps/erpnext/erpnext/public/js/controllers/transaction.js +866,It is needed to fetch Item Details.,Se necesita a buscar Detalles del artículo.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +857,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
@@ -3609,14 +3658,14 @@
 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 +178,Invalid {0},No válida {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Sick Leave,Permiso por enfermedad
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,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
 DocType: Warehouse,PIN,ALFILER
-DocType: Sales Invoice,Base Change Amount (Company Currency),Base cantidad de cambio (moneda de la empresa)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +313,No accounting entries for the following warehouses,No hay asientos contables para los siguientes almacenes
-apps/erpnext/erpnext/projects/doctype/project/project.js +102,Save the document first.,Guarde el documento primero.
+DocType: Sales Invoice,Base Change Amount (Company Currency),Importe de Cambio Base (Divisa de la Empresa)
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +314,No accounting entries for the following warehouses,No hay asientos contables para los siguientes almacenes
+apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Guarde el documento primero.
 DocType: Account,Chargeable,Devengable
 DocType: Company,Change Abbreviation,Cambiar abreviación
 DocType: Expense Claim Detail,Expense Date,Fecha de gasto
@@ -3629,10 +3678,9 @@
 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
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,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
 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 +87,Business Development Manager,Gerente de desarrollo de negocios
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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
@@ -3642,8 +3690,8 @@
 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 +940,Please select {0} first,"Por favor, seleccione primero {0}"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +749,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 +953,Please select {0} first,"Por favor, seleccione primero {0}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +757,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
@@ -3671,8 +3719,8 @@
  {% 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 +92,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 +106,This Month's Summary,Resumen de este mes
+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
 DocType: Quality Inspection Reading,Quality Inspection Reading,Lecturas de inspección de calidad
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,'Congelar stock mayor a' debe ser menor a %d días.
 DocType: Tax Rule,Purchase Tax Template,Plantilla de Impuestos sobre compras
@@ -3682,21 +3730,22 @@
 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 +87,Please set Next Depreciation Date,"Por favor, establece Siguiente Depreciación Fecha"
-DocType: Payment Gateway,Payment Gateway,Pasarela de Pago
 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 +378,Operation Time must be greater than 0 for Operation {0},El tiempo de operación debe ser mayor que 0 para {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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/accounts/doctype/account/account.py +170,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)
 DocType: Program,Program Abbreviation,Abreviatura programa
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,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: Appraisal,Start Date,Fecha de inicio
@@ -3712,21 +3761,22 @@
 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 +27,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
+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:
 DocType: Maintenance Visit,Fully Completed,Terminado completamente
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% completado
 DocType: Employee,Educational Qualification,Formación académica
 DocType: Workstation,Operating Costs,Costos operativos
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Acción si se acumula presupuesto mensual excedido
 DocType: Purchase Invoice,Submit on creation,Validar al Crear
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +432,Currency for {0} must be {1},Moneda para {0} debe ser {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +435,Currency for {0} must be {1},Moneda para {0} debe ser {1}
 DocType: Asset,Disposal Date,disposición Fecha
 DocType: Employee Leave Approver,Employee Leave Approver,Supervisor de ausencias de empleados
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row {0}: An Reorder entry already exists for this warehouse {1},Línea {0}: Una entrada de abastecimiento ya existe para el almacén {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +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 +79,"Cannot declare as lost, because Quotation has been made.","No se puede declarar como perdida, porque la oferta de venta ha sido hecha."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Director de compras
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +429,Production Order {0} must be submitted,La orden de producción {0} debe ser validada
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +434,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
@@ -3736,25 +3786,27 @@
 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
 DocType: Price List,Price List Name,Nombre de la lista de precios
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +181,Totals,Totales
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,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 +113,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 +120,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
 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.
+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 +181,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/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
 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 +793,All records are synced.,Todos los registros se sincronizan.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +781,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
 DocType: Cost Center,Cost Center Name,Nombre del centro de costos
@@ -3773,21 +3825,20 @@
 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/selling/doctype/quotation/quotation.py +49,Cannot set as Lost as Sales Order is made.,"No se puede definir como pérdida, cuando la orden de venta esta hecha."
-DocType: Student Applicant,Mother's Name,Nombre de la madre
 DocType: Request for Quotation Item,Supplier Part No,Proveedor de parte
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +348,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;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Received From,Recibido de
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Received From,Recibido de
 DocType: Lead,Converted,Convertido
 DocType: Item,Has Serial No,Posee numero de serie
 DocType: Employee,Date of Issue,Fecha de emisión.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{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 +93,Row {0}: Hours value must be greater than zero.,Fila {0}: valor Horas debe ser mayor que cero.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +117,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
 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 +172,{0} {1} does not exist,{0} {1} no existe
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +175,{0} {1} does not exist,{0} {1} no existe
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,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 +72,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'
@@ -3796,13 +3847,14 @@
 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/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
 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 +109,Electrical,Eléctrico
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Electrical,Eléctrico
 DocType: Stock Entry,Total Value Difference (Out - In),Total diferencia  (Salidas - Entradas)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,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}
@@ -3810,7 +3862,7 @@
 DocType: Item,Customer Code,Código de cliente
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +210,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 +292,Debit To account must be a Balance Sheet account,La cuenta de débito debe pertenecer a las cuentas de balance
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To account must be a Balance Sheet account,La cuenta de débito debe pertenecer a las cuentas de balance
 DocType: Buying Settings,Naming Series,Secuencias e identificadores
 DocType: Leave Block List,Leave Block List Name,Nombre de la Lista de Bloqueo de Vacaciones
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Inventarios
@@ -3822,11 +3874,11 @@
 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 +301,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 +313,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: Sales Order Item,Ordered Qty,Cantidad ordenada
-apps/erpnext/erpnext/stock/doctype/item/item.py +673,Item {0} is disabled,Artículo {0} está deshabilitado
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,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 +838,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 +809,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.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generar nóminas salariales
@@ -3834,23 +3886,24 @@
 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)
-apps/erpnext/erpnext/stock/doctype/item/item.py +485,Row #{0}: Please set reorder quantity,Fila # {0}: Configure la cantidad de pedido
+DocType: Sales Invoice Timesheet,Billing Hours,Horas de facturación
+apps/erpnext/erpnext/stock/doctype/item/item.py +487,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 +62,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
+DocType: Payment Entry,Allocate Payment Amount,Distribuir el importe de pago
 DocType: Employee External Work History,Salary,Salario.
 DocType: Serial No,Delivery Document Type,Tipo de documento de entrega
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Presentar todas las nóminas salariales según los criterios seleccionados anteriormente
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} artículos sincronizados
 DocType: Sales Order,Partly Delivered,Parcialmente entregado
-DocType: Sales Invoice,Existing Customer,Cliente existente
 DocType: Email Digest,Receivables,Cuentas por cobrar
+DocType: Lead Source,Lead Source,Fuente de de la Iniciativa
 DocType: Customer,Additional information regarding the customer.,Información adicional referente al cliente.
 DocType: Quality Inspection Reading,Reading 5,Lectura 5
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +38,Campaign Name is required,Es necesario ingresar el nombre  de la campaña
 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
@@ -3859,10 +3912,9 @@
 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 +129,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 +113,BOM and Manufacturing Quantity are required,Se requiere la lista de materiales (LdM) y cantidad a manufacturar.
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Rango de antigüedad 2
 DocType: SG Creation Tool Course,Max Strength,Fuerza máx
-DocType: Bank Reconciliation Detail,Amount,Importe
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Lista de materiales (LdM) reemplazada
 ,Sales Analytics,Análisis de ventas
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +113,Available {0},Disponible {0}
@@ -3870,14 +3922,14 @@
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Configuración de correo
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +96,Please enter default currency in Company Master,"Por favor, ingrese la divisa por defecto en la compañía principal"
 DocType: Stock Entry Detail,Stock Entry Detail,Detalles de entrada de inventario
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +100,Daily Reminders,Recordatorios diarios
+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}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +23,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 +71,Customer Service,Servicio al cliente
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Customer Service,Servicio al cliente
 DocType: Homepage Featured Product,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.
@@ -3886,8 +3938,9 @@
 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
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Almacén predeterminado de trabajos en proceso
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1570,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/accounts/page/pos/pos.js +1594,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
 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
@@ -3895,9 +3948,10 @@
 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 +82,Engineer,Ingeniero
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,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 +370,Item Code required at Row No {0},Código del producto requerido en la línea: {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +398,Item Code required at Row No {0},Código del producto requerido en la línea: {0}
 DocType: Sales Partner,Partner Type,Tipo de socio
 DocType: Purchase Taxes and Charges,Actual,Actual
 DocType: Authorization Rule,Customerwise Discount,Descuento de cliente
@@ -3913,16 +3967,18 @@
 DocType: BOM,Raw Material Cost,Costo de materia prima
 DocType: Item Reorder,Re-Order Level,Nivel mínimo de stock.
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Escriba artículos y Cantidad planificada para los que desea elevar las órdenes de producción o descargar la materia prima para su análisis.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +55,Part-time,Tiempo parcial
+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
 DocType: Employee,Applicable Holiday List,Lista de días festivos
 DocType: Employee,Cheque,Cheque
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Secuencia actualizada
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +57,Series Updated,Secuencia actualizada
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,El tipo de reporte es obligatorio
 DocType: Item,Serial Number Series,Secuencia del número de serie
 apps/erpnext/erpnext/buying/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 +87,Clearance Date updated,Liquidación Fecha actualiza
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Reconciliado exitosamente
@@ -3936,7 +3992,7 @@
 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 +513,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 +518,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.
@@ -3946,7 +4002,7 @@
 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/stock/doctype/stock_entry/stock_entry.py +158,Target warehouse in row {0} must be same as Production Order,Almacenes de destino de la línea {0} deben ser los mismos para la orden de producción
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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
 DocType: Company,Round Off Account,Cuenta de redondeo por defecto
@@ -3955,23 +4011,22 @@
 DocType: Customer Group,Parent Customer Group,Categoría principal de cliente
 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 +180,Notice Period,Período de notificación
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,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 +4,New Sales Person Name,Nombre nuevo encargado de ventas
 DocType: Packing Slip,Gross Weight UOM,Peso bruto de la unidad de medida (UdM)
-DocType: Email Digest,Receivables / Payables,Por cobrar / Por pagar
 DocType: Delivery Note Item,Against Sales Invoice,Contra la factura de venta
 DocType: Bin,Reserved Qty for Production,Cantidad reservada para la Producción
 DocType: Asset,Frequency of Depreciation (Months),Frecuencia de Depreciación (Meses)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +469,Credit Account,Cuenta de crédito
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Credit Account,Cuenta de crédito
 DocType: Landed Cost Item,Landed Cost Item,Costos de destino estimados
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +55,Show zero values,Mostrar valores en cero
+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
 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 +647,Please specify Attribute Value for attribute {0},"Por favor, especifique el valor del atributo {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},"Por favor, especifique el valor del atributo {0}"
 DocType: Item,Default Warehouse,Almacén por defecto
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +39,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"
@@ -3993,21 +4048,24 @@
 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
-DocType: Sales Invoice,Cold Calling,Llamadas en frío
 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: Maintenance Schedule Item,Half Yearly,Semestral
 DocType: Lead,Blog Subscriber,Suscriptor del Blog
+DocType: Guardian,Alternate Number,Número Alternativo
 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."
+DocType: Stock Reconciliation Item,Quantity Difference,Cantidad Diferencia
 apps/erpnext/erpnext/config/hr.py +253,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 +141,Set as Lost,Establecer como perdido
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,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 +5,This is based on transactions against this Customer. See timeline below for details,Esto se basa en transacciones en contra de este cliente. Ver cronología abajo para más detalles
+apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +5,This is based on transactions against this Customer. See timeline below for details,Esto se basa en transacciones con este cliente. Ver cronología más abajo para los detalles
 DocType: Supplier,Credit Days Based On,Días de crédito basados en
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +161,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},Fila {0}: cantidad asignada {1} debe ser menor o igual a la cantidad de entrada de pago {2}
 DocType: Tax Rule,Tax Rule,Regla fiscal
@@ -4017,11 +4075,10 @@
 ,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 +941,Select or add new customer,Seleccionar o añadir nuevo cliente
+apps/erpnext/erpnext/accounts/page/pos/pos.js +930,Select or add new customer,Seleccionar o añadir nuevo cliente
 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 +5,This is based on the attendance of this Employee,Esto se basa en la presencia de este empleado
-DocType: Sales Invoice,Frequency,Frecuencia
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +463,Debit Account,Cuenta de debito
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,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)
@@ -4030,27 +4087,27 @@
 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 +210,Supplier Quotation {0} created,Oferta de venta de proveedor {0} creado
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +208,Supplier Quotation {0} created,Oferta de venta de proveedor {0} creado
 apps/erpnext/erpnext/accounts/report/financial_statements.py +90,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 +173,Employee Benefits,Beneficios de empleados
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,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 +228,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 +232,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 +499,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 +500,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 +1007,Price List not found or disabled,La lista de precios no existe o está deshabilitada.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1008,Price List not found or disabled,La lista de precios no existe o está deshabilitada.
 DocType: Expense Claim,Approved,Aprobado
 DocType: Pricing Rule,Price,Precio
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +244,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 +256,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
@@ -4061,12 +4118,12 @@
 DocType: Address,Office,Oficina
 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 +259,Please select Employee Record first.,"Por favor, primero seleccione el registro del empleado."
-DocType: POS Profile,Account for Change Amount,Cuenta para el Cambio Monto
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +266,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 +190,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 +235,Please enter Expense Account,"Por favor, ingrese la Cuenta de Gastos"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,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 +963,"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 +976,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Fila # {0}: Tipo de documento de referencia debe ser uno de la orden de compra, factura de compra o de entrada de diario"
 DocType: Employee,Current Address,Dirección actual
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Si el artículo es una variante de otro artículo entonces la descripción, imágenes, precios, impuestos, etc. se establecerán a partir de la plantilla a menos que se especifique explícitamente"
 DocType: Serial No,Purchase / Manufacture Details,Detalles de compra / producción
@@ -4081,9 +4138,10 @@
 DocType: Asset Movement,Transaction Date,Fecha de transacción
 DocType: Production Plan Item,Planned Qty,Cantidad planificada
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,Impuesto Total
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,For Quantity (Manufactured Qty) is mandatory,Por cantidad (cantidad fabricada) es obligatoria
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,For Quantity (Manufactured Qty) is mandatory,Por cantidad (cantidad fabricada) es obligatoria
 DocType: Stock Entry,Default Target Warehouse,Almacen de destino predeterminado
 DocType: Purchase Invoice,Net Total (Company Currency),Total neto (Divisa por defecto)
+apps/erpnext/erpnext/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 +78,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: Production Order,Actual Start Date,Fecha de inicio real
@@ -4098,9 +4156,11 @@
 DocType: Warranty Claim,If different than customer address,Si es diferente a la dirección del cliente
 DocType: BOM Operation,BOM Operation,Operación de la lista de materiales (LdM)
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Sobre la línea anterior
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +226,Transfer Asset,Activos transferencia
+DocType: Student,Home Address,Direccion de casa
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +227,Transfer Asset,Activos transferencia
 DocType: POS Profile,POS Profile,Perfil de POS
 apps/erpnext/erpnext/config/schools.py +33,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 +129,"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
@@ -4110,8 +4170,8 @@
 DocType: Assessment,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 +765,Material to Supplier,Materiales de Proveedor
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +189,Excise Invoice,Impuestos Especiales Factura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,Material to Supplier,Materiales de Proveedor
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,Impuestos Especiales Factura
 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
@@ -4121,7 +4181,7 @@
 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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,Grupos estudiantiles creados.
 DocType: Scheduling Tool,Scheduling Tool,Herramienta de programación
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +136,Credit Card,Tarjetas de credito
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,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.
 DocType: Purchase Invoice,Next Date,Siguiente fecha
@@ -4129,6 +4189,7 @@
 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: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Aquí usted puede ingresar los detalles de la familia como el nombre y ocupación de los padres, cónyuge e hijos"
+DocType: Academic Term,Term End Date,Plazo Fecha de finalización
 DocType: Hub Settings,Seller Name,Nombre de vendedor
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Impuestos y gastos deducibles (Divisa por defecto)
 DocType: Item Group,General Settings,Configuración general
@@ -4140,7 +4201,7 @@
 DocType: Customer,Commission Rate,Comisión de ventas
 apps/erpnext/erpnext/stock/doctype/item/item.js +261,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 +115,"Payment Type must be one of Receive, Pay and Internal Transfer","Tipo de pago debe ser uno de Recibir, Pagar y Transferencia interna"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +118,"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/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,El carrito esta vacío.
 DocType: Production Order,Actual Operating Cost,Costo de operación real
@@ -4155,10 +4216,10 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,"Por favor, seleccione un archivo csv"
 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 +92,Designer,Diseñador
+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
 DocType: Serial No,Delivery Details,Detalles de la entrega
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +469,Cost Center is required in row {0} in Taxes table for type {1},Centro de costos requerido para la línea {0} en la tabla Impuestos para el tipo {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +472,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
 ,Item-wise Purchase Register,Detalle de compras
 DocType: Batch,Expiry Date,Fecha de caducidad
@@ -4168,12 +4229,12 @@
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Listado de todos los proyectos.
 apps/erpnext/erpnext/controllers/status_updater.py +174,"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 +417, (Half Day),(Medio día)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425, (Half Day),(Medio día)
 DocType: Supplier,Credit Days,Días de crédito
 DocType: Leave Type,Is Carry Forward,Es un traslado
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +740,Get Items from BOM,Obtener productos desde lista de materiales (LdM)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +711,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 +549,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/controllers/accounts_controller.py +552,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"
 ,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
diff --git a/erpnext/translations/et.csv b/erpnext/translations/et.csv
index 9659208..7c7a45e 100644
--- a/erpnext/translations/et.csv
+++ b/erpnext/translations/et.csv
@@ -18,11 +18,10 @@
 DocType: Sales Partner,Dealer,Dealer
 DocType: Employee,Rented,Üürikorter
 DocType: Purchase Order,PO-,po-
-apps/erpnext/erpnext/accounts/report/financial_statements.py +19,Start Year {0} not found.,Alusta Aasta {0} ei leitud.
 DocType: POS Profile,Applicable for User,Rakendatav Kasutaja
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +191,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Tootmise lõpetanud tellimust ei ole võimalik tühistada, ummistust kõigepealt tühistama"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +197,Do you really want to scrap this asset?,Kas tõesti jäägid see vara?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +17,Select Default Supplier,Vali Vaikimisi Tarnija
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +192,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Tootmise lõpetanud tellimust ei ole võimalik tühistada, ummistust kõigepealt tühistama"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +198,Do you really want to scrap this asset?,Kas tõesti jäägid see vara?
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Vali Vaikimisi Tarnija
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,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
@@ -42,46 +41,45 @@
 DocType: Sales Invoice,Customer Name,Kliendi nimi
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +126,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 +180,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 +183,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 +148,Series Updated Successfully,Seeria edukalt uuendatud
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +149,Series Updated Successfully,Seeria edukalt uuendatud
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Minu tellimused
 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
-DocType: Quality Inspection Reading,Parameter,Parameeter
 apps/erpnext/erpnext/projects/doctype/project/project.py +54,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 +239,New Leave Application,New Jäta ostusoov
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,New Leave Application,New Jäta ostusoov
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +20,Attendance Record {0} exists against Student {1} for Course Schedule {2},Publikurekordiks {0} on olemas vastu Student {1} kursuse ajakava {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Bank Draft,Pangaveksel
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,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
 DocType: Academic Term,Academic Term,Academic Term
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +13,Material,materjal
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Quantity,Kvantiteet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +511,Accounts table cannot be blank.,Kontode tabeli saa olla tühi.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +616,Quantity,Kvantiteet
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +512,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)
 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/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 +142,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
-DocType: Purchase Invoice,Monthly,Kuu
 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/buying/doctype/purchase_order/purchase_order.js +771,Invoice,Arve
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +750,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 +198,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 +74,Row # {0}:,Row # {0}:
+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 +127,Please select Price List,Palun valige hinnakiri
@@ -112,8 +110,8 @@
 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 +589,Get items from,Võta esemed
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +382,Stock cannot be updated against Delivery Note {0},Stock ei saa uuendada vastu saateleht {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Võta esemed
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,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
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Toiduained
@@ -122,7 +120,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Pensionifondid
 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 +156,Salary Structure Missing,Palgastruktuur Kadunud
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,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
@@ -130,10 +128,11 @@
 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 +156,Credit limit has been crossed for customer {0} {1}/{2},Krediidilimiit on ületanud kliendi {0} {1} / {2}
-apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Kas Põhivarade&quot; ei saa märkimata, kui Asset Olemas vastu kirje"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +189,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"
 DocType: Tax Rule,Tax Type,Maksu- Type
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +144,You are not authorized to add or update entries before {0},Sa ei ole volitatud lisada või uuendada oma andmeid enne {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,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/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
@@ -143,18 +142,17 @@
 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 +165,Opening,Avaus
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,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/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Klient&gt; Klient Group&gt; Territory
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Konto maksta ainult
 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.
 DocType: Lead,Product Enquiry,Toode Luure
 DocType: Academic Term,Schools,Koolid
 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 +335,Please select Company first,Palun valige Company esimene
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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
@@ -164,7 +162,7 @@
 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
 DocType: Purchase Invoice Item,Is Fixed Asset,Kas Põhivarade
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Available qty is {0}, you need {1}","Saadaval Kogus on {0}, peate {1}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +225,"Available qty is {0}, you need {1}","Saadaval Kogus on {0}, peate {1}"
 DocType: Expense Claim Detail,Claim Amount,Nõude suurus
 DocType: Employee,Mr,härra
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Tarnija tüüp / tarnija
@@ -173,25 +171,26 @@
 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: Assessment Result,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 +171,Annual Salary,Aastapalka
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Annual Salary,Aastapalka
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Stock kulud
-apps/erpnext/erpnext/accounts/report/financial_statements.py +22,End Year {0} not found.,End Aasta {0} ei leitud.
 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}
 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 +130,At least one mode of payment is required for POS invoice.,Vähemalt üks makseviis on vajalik POS arve.
 DocType: Products Settings,Show Products as a List,Näita tooteid listana
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Lae mall, täitke asjakohaste andmete ja kinnitage muudetud faili. Kõik kuupäevad ning töötaja kombinatsioon valitud perioodil tulevad malli, olemasolevate töölkäimise"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +451,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/stock/doctype/stock_entry/stock_entry.py +456,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/controllers/accounts_controller.py +614,"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/controllers/accounts_controller.py +617,"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 +166,Settings for HR Module,Seaded HR Module
 DocType: SMS Center,SMS Center,SMS Center
 DocType: Sales Invoice,Change Amount,Muuda summa
@@ -203,13 +202,13 @@
 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 +147,Execution,Hukkamine
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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/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}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,Cost Center {0} does not belong to Company {1},Kuluüksus {0} ei kuulu Company {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +100,Cost Center {0} does not belong to Company {1},Kuluüksus {0} ei kuulu Company {1}
 DocType: Customer,Individual,Individuaalne
 DocType: Interest,Academics User,akadeemikud Kasutaja
 DocType: Cheque Print Template,Amount In Figure,Summa joonis
@@ -225,30 +224,32 @@
 DocType: Production Planning Tool,Sales Orders,Müügitellimuste
 DocType: Purchase Taxes and Charges,Valuation,Väärtustamine
 ,Purchase Order Trends,Ostutellimuse Trends
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,The request for quotation can be accessed by clicking on the following link,Taotluse tsitaat pääseb klõpsates järgmist linki
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,Eraldada lehed aastal.
 DocType: SG Creation Tool Course,SG Creation Tool Course,SG Loomistööriist kursus
 DocType: Student Group Creation Tool,Leave blank if you wish to fetch all courses for selected academic term,"Jäta tühjaks, kui soovid tõmmata kõik kursused valitud akadeemilise perspektiivis"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,Insufficient Stock,Ebapiisav Stock
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227,Insufficient Stock,Ebapiisav Stock
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Keela Capacity Planning and Time Tracking
+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: 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/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} does not belong to Company {1},Konto {0} ei kuulu Company {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +86,Account {0} does not belong to Company {1},Konto {0} ei kuulu Company {1}
 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}
 DocType: Naming Series,Series List for this Transaction,Seeria nimekiri selle Tehing
 DocType: Sales Invoice,Is Opening Entry,Avab Entry
 DocType: Customer Group,Mention if non-standard receivable account applicable,Nimetatakse mittestandardsete saadaoleva arvesse kohaldatavat
 DocType: Course Schedule,Instructor Name,Juhendaja nimi
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,For Warehouse is required before Submit,Sest Warehouse on vaja enne Esita
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,For Warehouse is required before Submit,Sest Warehouse on vaja enne Esita
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Saadud
 DocType: Sales Partner,Reseller,Reseller
 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 +1436,"LocalStorage is full , did not save","LocalStorage on täis, ei päästa"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1460,"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}
@@ -261,18 +262,19 @@
 apps/erpnext/erpnext/templates/generators/item.html +78,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 +5,This is based on the Time Sheets created against this project,See põhineb Ajatabelid loodud vastu selle projekti
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,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/leave_application/leave_application.py +213,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 +114,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 +179,Leaves per Year,Lehed aastas
+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 +103,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}
+DocType: Email Digest,Profit & Loss,Kasumiaruanne
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,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 +435,Leave Blocked,Jäta blokeeritud
-apps/erpnext/erpnext/stock/doctype/item/item.py +669,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 +443,Leave Blocked,Jäta blokeeritud
+apps/erpnext/erpnext/stock/doctype/item/item.py +671,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 +83,Annual,Aastane
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +86,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
@@ -280,20 +282,22 @@
 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"
 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 +91,Software Developer,Tarkvara arendaja
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,Tarkvara arendaja
 DocType: Item,Minimum Order Qty,Tellimuse Miinimum Kogus
 DocType: Pricing Rule,Supplier Type,Tarnija Type
 DocType: Scheduling Tool,Course Start Date,Kursuse alguskuupäev
 DocType: Item,Publish in Hub,Avaldab Hub
+DocType: Student Admission,Student Admission,üliõpilane
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is cancelled,Punkt {0} on tühistatud
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Material Request,Materjal taotlus
+apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} is cancelled,Punkt {0} on tühistatud
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +823,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 +28,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 +328,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Punkt {0} ei leitud &quot;tarnitud tooraine&quot; tabelis Ostutellimuse {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +333,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/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
@@ -309,20 +313,21 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +130,Please select Charge Type first,Palun valige Charge Type esimene
 DocType: Student Group Student,Student Group Student,Student Group Student
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Viimased
+DocType: Email Digest,New Quotations,uus tsitaadid
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Esimene Jäta Approver nimekirjas on vaikimisi Jäta Approver
 DocType: Tax Rule,Shipping County,kohaletoimetamine County
 apps/erpnext/erpnext/config/desktop.py +158,Learn,Õpi
 DocType: Asset,Next Depreciation Date,Järgmine kulum kuupäev
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Aktiivsus töötaja kohta
 DocType: Accounts Settings,Settings for Accounts,Seaded konto
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +626,Supplier Invoice No exists in Purchase Invoice {0},Tarnija Arve nr olemas ostuarve {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +629,Supplier Invoice No exists in Purchase Invoice {0},Tarnija Arve nr olemas ostuarve {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Manage Sales Person Tree.
 DocType: Job Applicant,Cover Letter,kaaskiri
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Tasumata tšekke ja hoiused selge
 DocType: Item,Synced With Hub,Sünkroniseerida Hub
 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 +348,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 +86,Circular Reference Error,Ringviide viga
@@ -334,15 +339,16 @@
 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 +806,Delivery Note,Toimetaja märkus
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +800,Delivery Note,Toimetaja märkus
 apps/erpnext/erpnext/config/learn.py +87,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 +233,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/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/setup/doctype/email_digest/email_digest.py +104,Summary for this week and pending activities,Kokkuvõte sel nädalal ja kuni tegevusi
+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"
 DocType: Employee,Company Email,Ettevõte Email
@@ -354,27 +360,28 @@
 apps/erpnext/erpnext/config/hr.py +186,"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
-apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Rida # {0}: ostuarve ei saa vastu olemasoleva vara {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +554,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 +54,{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 +812,Select Item,Vali toode
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +791,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 \
 					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 +142,Purchase Invoice {0} is already submitted,Ostuarve {0} on juba esitatud
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Partii nr peaks olema sama mis {1} {2}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +143,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.
 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 +342,Please see attachment,Palun vt lisa
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,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 +19,Setup Already Complete!!,Setup juba valmis !!
 ,Finished Goods,Valmistoodang
 DocType: Delivery Note,Instructions,Juhised
 DocType: Quality Inspection,Inspected By,Kontrollima
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Tarnija&gt; Tarnija Type
 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/public/js/utils/item_selector.js +12,Add Items,Lisa tooteid
@@ -388,29 +395,29 @@
 DocType: Currency Exchange,Currency Exchange,Valuutavahetus
 DocType: Purchase Invoice Item,Item Name,Asja nimi
 DocType: Authorization Rule,Approving User  (above authorized value),Kinnitamine Kasutaja (üle lubatud väärtuse)
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Kreeditsaldo
+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/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 +736,Purchase Return,Ostutagastus
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +715,Purchase Return,Ostutagastus
 ,Purchase Register,Ostu Registreeri
 DocType: 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 +202,{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 +209,{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 +143,Reason for losing,Põhjus kaotada
-apps/erpnext/erpnext/accounts/utils.py +239,Allocated amount can not greater than unadjusted amount,Eraldatud summa ei ole suurem kui korrigeerimata summa
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +163,Reason for losing,Põhjus kaotada
+apps/erpnext/erpnext/accounts/utils.py +316,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 +79,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: 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 +225,Please enter Cost Center,Palun sisestage Cost Center
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,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
@@ -423,26 +430,26 @@
 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
 DocType: Account,Is Group,On Group
+DocType: Email Digest,Pending Purchase Orders,Kuni Ostutellimuste
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Seatakse automaatselt Serial nr põhineb FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Vaata Tarnija Arve number Uniqueness
 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 +102,Non Profit,Non Profit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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: Stock Reconciliation Item,Do not include symbols (ex. $),Ära sümboleid (nt. $)
 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 +638,Attribute {0} selected multiple times in Attributes Table,Oskus {0} valitakse mitu korda atribuudid Table
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Oskus {0} valitakse mitu korda atribuudid Table
 DocType: HR Settings,Employee record is created using selected field. ,"Töötaja rekord on loodud, kasutades valitud valdkonnas."
 DocType: Sales Order,Not Applicable,Ei kasuta
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Holiday kapten.
 DocType: Request for Quotation Item,Required Date,Vajalik kuupäev
 DocType: Delivery Note,Billing Address,Arve Aadress
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +862,Please enter Item Code.,Palun sisestage Kood.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +847,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
@@ -456,12 +463,12 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Väärtpaberitesse ja hoiustesse
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Kokku lehed eraldatud on kohustuslik
 DocType: Job Opening,Description of a Job Opening,Kirjeldus töökoht
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Pending activities for today,Kuni tegevusi täna
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Kuni tegevusi täna
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Osavõtjate rekord.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Palk Component töögraafik põhineb palgal.
 DocType: Sales Order Item,Used for Production Plan,Kasutatakse tootmise kava
 DocType: Manufacturing Settings,Time Between Operations (in mins),Aeg toimingute vahel (in minutit)
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +92,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} eelarve konto {1} vastu Kulukeskus {2} on {3}. See ületa {4}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +95,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} eelarve konto {1} vastu Kulukeskus {2} on {3}. See ületa {4}
 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
@@ -469,16 +476,16 @@
 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/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 +86,Administrative Officer,Haldusspetsialist
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,Haldusspetsialist
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +23,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 +319,Please select Company,Palun valige Company
-DocType: Stock Entry,Difference Account,Erinevus konto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +309,Please select Company,Palun valige Company
+DocType: Stock Entry Detail,Difference Account,Erinevus konto
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,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 +398,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 +399,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 +530,"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 +532,"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 +28,Buy,ostma
@@ -486,7 +493,7 @@
 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 +1563,Serial no item cannot be a fraction,Seerianumber objekt ei saa olla osa
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1587,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
@@ -495,13 +502,14 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Account {0} does not belong to company: {1},Konto {0} ei kuulu firma: {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation already used for another company,Lühend kasutatakse juba teise firma
 DocType: Selling Settings,Default Customer Group,Vaikimisi Kliendi Group
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Supplier is required against Payable account {0},Tarnija on kohustatud vastu tasulised konto {0}
 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
 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 +313,Reference No and Reference Date is mandatory for Bank transaction,Viitenumber ja viited kuupäev on kohustuslik Bank tehingu
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +316,Reference No and Reference Date is mandatory for Bank transaction,Viitenumber ja viited kuupäev on kohustuslik Bank tehingu
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Klienditeenindus Lisa / uuenda maksud ja tasud
 DocType: Purchase Invoice,Supplier Invoice No,Tarnija Arve nr
 DocType: Territory,For reference,Sest viide
@@ -512,7 +520,6 @@
 DocType: Installation Note Item,Installation Note Item,Paigaldamine Märkus Punkt
 DocType: Production Plan Item,Pending Qty,Kuni Kogus
 DocType: Budget,Ignore,Ignoreerima
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Kood&gt; Punkt Group&gt; Brand
 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/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
@@ -523,11 +530,11 @@
 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/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 +28,Please select Company and Party Type first,Palun valige Company Pidu ja Type esimene
+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/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 +707,Make Sales Order,Tee Sales Order
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +701,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
@@ -543,7 +550,8 @@
 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 +734,Sales Return,Müügitulu
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +728,Sales Return,Müügitulu
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +91,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)
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Andmebaas potentsiaalseid kliente.
@@ -552,14 +560,13 @@
 DocType: Quotation,Quotation To,Tsitaat
 DocType: Lead,Middle Income,Keskmise sissetulekuga
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +212,Opening (Cr),Avamine (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +795,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"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 +237,Allocated amount can not be negative,Eraldatud summa ei saa olla negatiivne
+apps/erpnext/erpnext/stock/doctype/item/item.py +797,Default Unit of Measure for Item {0} cannot be changed directly because 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
 DocType: Purchase Order Item,Billed Amt,Arve Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Loogiline Warehouse mille vastu laos tehakse kandeid.
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Müügiarve Töögraafik
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},Viitenumber &amp; Reference kuupäev on vajalik {0}
-DocType: Sales Invoice,Customer's Vendor,Kliendi Vendor
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Proposal Writing,Ettepanek kirjutamine
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,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"
@@ -568,13 +575,14 @@
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,Time Tracking
 DocType: Fiscal Year Company,Fiscal Year Company,Fiscal Year Company
 DocType: Packing Slip Item,DN Detail,DN Detail
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +257,Already supplier quotation has created,Juba tarnija tsitaat on loonud
 DocType: Timesheet,Billed,Maksustatakse
 DocType: Batch,Batch Description,Partii kirjeldus
+apps/erpnext/erpnext/accounts/utils.py +685,"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 +733,View Offline Records,Vaata eemal Records
+apps/erpnext/erpnext/accounts/page/pos/pos.js +715,View Offline Records,Vaata eemal Records
+DocType: Student,Sibling Details,Kaas detailid
 DocType: Employee,Reason for Resignation,Lahkumise põhjuseks
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,Mall tulemuste hindamisel.
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,Arve / päevikusissekanne Üksikasjad
@@ -588,19 +596,20 @@
 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
 DocType: Employee,Passport Number,Passi number
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Manager,Juhataja
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,Juhataja
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,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,&quot;Tuleneb&quot; ja &quot;Group By&quot; ei saa olla sama
+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
 DocType: Installation Note,IN-,VÕISTLUSTE
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter email address,Palun sisesta e-posti aadress
 DocType: Production Order Operation,In minutes,Minutiga
 DocType: Issue,Resolution Date,Resolutsioon kuupäev
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +299,Timesheet created:,Töögraafik on loodud:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +715,Please set default Cash or Bank account in Mode of Payment {0},Palun määra vaikimisi Raha või pangakonto makseviis {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +300,Timesheet created:,Töögraafik on loodud:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +772,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
 DocType: Selling Settings,Customer Naming By,Kliendi nimetamine By
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Palun setup Töötaja nimesüsteemile Human Resource&gt; HR seaded
 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
@@ -625,6 +634,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,lõpp
 DocType: Pricing Rule,Sales Manager,Müügijuht
 DocType: Salary Structure Employee,Base,alus
+DocType: Timesheet,Total Billed Hours,Kokku Maksustatakse Tundi
 DocType: Journal Entry,Write Off Amount,Kirjutage Off summa
 DocType: Journal Entry,Bill No,Bill pole
 DocType: Company,Gain/Loss Account on Asset Disposal,Gain / kulude aruandes varade realiseerimine
@@ -639,11 +649,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +9,Pre Sales,Müügieelne
 DocType: Purchase Receipt,Other Details,Muud andmed
 DocType: Account,Accounts,Kontod
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Marketing,Marketing
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +227,Payment Entry is already created,Makse Entry juba loodud
+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,Makse Entry juba loodud
 DocType: Purchase Receipt Item Supplied,Current Stock,Laoseis
-apps/erpnext/erpnext/controllers/accounts_controller.py +538,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 +21,Preview Salary Slip,Eelvaade palgatõend
+apps/erpnext/erpnext/controllers/accounts_controller.py +541,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 +38,Preview Salary Slip,Eelvaade palgatõend
 DocType: Company,Deafult Cost Center,Deafult Kulukeskus
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +48,Account {0} has been entered multiple times,Konto {0} on sisestatud mitu korda
 DocType: Account,Expenses Included In Valuation,Kulud sisalduvad Hindamine
@@ -652,7 +662,7 @@
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,Palun valige Student Group
 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 +617,Item has variants.,Punkt on variante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Punkt on variante.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,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
@@ -672,7 +682,7 @@
 DocType: Purchase Order,Supply Raw Materials,Supply tooraine
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Kuupäev, mil järgmise arve genereeritakse. See on genereeritud esitada."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Käibevara
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,{0} is not a stock Item,{0} ei ole laos toode
+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 +169,Lead must be set if Opportunity is made from Lead,"Plii tuleb määrata, kui võimalus on valmistatud Lead"
@@ -739,26 +749,25 @@
 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 +709,No Permission,Ei Luba
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +710,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}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +298,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 +542,Row #{0}: Asset {1} must be submitted,Rida # {0}: Asset {1} tuleb esitada
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset {1} must be submitted,Rida # {0}: Asset {1} tuleb esitada
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Ükski töötaja leitud
 DocType: Supplier Quotation,Stopped,Peatatud
 DocType: Item,If subcontracted to a vendor,Kui alltöövõtjaks müüja
 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.
 DocType: Warehouse,Tree Details,Tree detailid
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Saada nüüd
 ,Support Analytics,Toetus Analytics
 DocType: Item,Website Warehouse,Koduleht Warehouse
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimaalne Arve summa
 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/sales_invoice/sales_invoice.py +227,Timesheet {0} is already completed or cancelled,Töögraafik {0} on juba lõpetatud või tühistatud
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +259,Timesheet {0} is already completed or cancelled,Töögraafik {0} on juba lõpetatud või tühistatud
 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
@@ -774,13 +783,13 @@
 apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Kursuse ajakava
 DocType: Maintenance Visit,Completion Status,Lõpetamine staatus
 DocType: HR Settings,Enter retirement age in years,Sisesta pensioniiga aastat
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +229,Target Warehouse,Target Warehouse
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +230,Target Warehouse,Target Warehouse
 DocType: Cheque Print Template,Starting location from left edge,Alustades asukoha vasakust servast
 DocType: Item,Allow over delivery or receipt upto this percent,Laske üle väljasaatmisel või vastuvõtmisel upto see protsenti
 DocType: Stock Entry,STE-,STE
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Sales Order Date,Oodatud Toimetaja kuupäev ei saa olla enne Sales Order Date
 DocType: Upload Attendance,Import Attendance,Import Osavõtt
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Kõik Punkt Groups
+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/config/setup.py +89,Automatically compose message on submission of transactions.,Automaatselt kirjutada sõnumi esitamise tehingud.
@@ -792,13 +801,15 @@
 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/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
 DocType: Expense Claim,Expenses,Kulud
 DocType: Item Variant Attribute,Item Variant Attribute,Punkt Variant Oskus
 ,Purchase Receipt Trends,Ostutšekk Trends
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Research & Development,Teadus- ja arendustegevus
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Teadus- ja arendustegevus
 ,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
@@ -807,7 +818,7 @@
 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/controllers/accounts_controller.py +340,"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."
+apps/erpnext/erpnext/controllers/accounts_controller.py +343,"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
@@ -829,12 +840,12 @@
 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 +756,Purchase Receipt,Ostutšekk
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +735,Purchase Receipt,Ostutšekk
 ,Received Items To Be Billed,Saadud objekte arve
 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 +167,Reference Doctype must be one of {0},Viide DOCTYPE peab olema üks {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +282,Unable to find Time Slot in the next {0} days for Operation {1},Ei leia Time Slot järgmisel {0} päeva Operation {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +170,Reference Doctype must be one of {0},Viide DOCTYPE peab olema üks {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,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 +439,BOM {0} must be active,Bom {0} peab olema aktiivne
@@ -845,7 +856,7 @@
 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 +214,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 +217,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
@@ -859,9 +870,9 @@
 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
 DocType: Fee Structure,Components,komponendid
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,Please enter Asset Category in Item {0},Palun sisesta Põhivarakategoori punktis {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +612,Item Variants {0} updated,Punkt variandid {0} uuendatud
+apps/erpnext/erpnext/stock/doctype/item/item.py +614,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 +843,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 +854,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
@@ -876,69 +887,72 @@
 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 +728,New Sales Invoice,Uus müügiarve
+apps/erpnext/erpnext/accounts/page/pos/pos.js +710,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 +728,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
 DocType: Material Request Item,Lead Time Date,Ooteaeg kuupäev
 DocType: Guardian,Guardian Name,Guardian Nimi
 DocType: Cheque Print Template,Has Print Format,Kas Print Format
-apps/erpnext/erpnext/accounts/page/pos/pos.js +86, 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 +109,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 +619,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","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/page/pos/pos.js +75, 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 +613,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing 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 +606,Supplier Invoice Date cannot be greater than Posting Date,Tarnija Arve kuupäev ei saa olla suurem kui Postitamise kuupäev
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +609,Supplier Invoice Date cannot be greater than Posting Date,Tarnija Arve kuupäev ei saa olla suurem kui Postitamise kuupäev
 DocType: Purchase Invoice Item,Purchase Order Item,Ostu Telli toode
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +130,Indirect Income,Kaudne tulu
 DocType: Cheque Print Template,Date Settings,kuupäeva seaded
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Dispersioon
 ,Company Name,firma nimi
 DocType: SMS Center,Total Message(s),Kokku Sõnum (s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +810,Select Item for Transfer,Vali toode for Transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +789,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."
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Luba kasutajal muuta hinnakirja hind tehingutes
 DocType: Pricing Rule,Max Qty,Max Kogus
-DocType: Student Applicant,Father's Name,Isa nimi
 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 +105,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
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +686,All items have already been transferred for this Production Order.,Kõik esemed on juba üle selle tootmine Order.
+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
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +694,All items have already been transferred for this Production Order.,Kõik esemed on juba üle selle tootmine Order.
 DocType: Process Payroll,Select Payroll Year and Month,Vali Palga aasta ja kuu
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,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
-DocType: Opportunity,Walk In,Sisse astuma
 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 +12,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: Timesheet Detail,Bill,arve
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,White,Valge
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,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
 DocType: SMS Center,All Lead (Open),Kõik Plii (Open)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +228,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})
+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 +731,Make ,Tee
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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."
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Minu ostukorv
-apps/erpnext/erpnext/controllers/selling_controller.py +154,Order Type must be one of {0},Tellimus tüüp peab olema üks {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Tellimus tüüp peab olema üks {0}
 DocType: Lead,Next Contact Date,Järgmine Kontakt kuupäev
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Avamine Kogus
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +393,Please enter Account for Change Amount,Palun sisesta konto muutuste summa
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,Please enter Account for Change Amount,Palun sisesta konto muutuste summa
 DocType: Student Batch,Student Batch Name,Student Partii Nimi
 DocType: Holiday List,Holiday List Name,Holiday nimekiri nimi
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js +8,Schedule Course,Ajakava kursus
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Stock Options,Stock Options
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Stock Options
 DocType: Journal Entry Account,Expense Claim,Kuluhüvitussüsteeme
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +211,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 +237,Qty for {0},Kogus eest {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +212,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 +238,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
@@ -947,9 +961,9 @@
 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/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Eemaldatud esemed ei muutu kogus või väärtus.
+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 +635,Attribute table is mandatory,Oskus tabelis on kohustuslik
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Oskus tabelis on kohustuslik
 DocType: Production Planning Tool,Get Sales Orders,Võta müügitellimuste
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{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
@@ -974,7 +988,7 @@
 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/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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Serial No {0} on alla hooldusleping upto {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +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
@@ -986,7 +1000,7 @@
 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/controllers/selling_controller.py +231,Sales Order {0} is {1},Sales Order {0} on {1}
+apps/erpnext/erpnext/controllers/selling_controller.py +232,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
 DocType: Packing Slip,Net Weight UOM,Net Weight UOM
@@ -996,25 +1010,24 @@
 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
 DocType: Sales Person,Select company name first.,Vali firma nimi esimesena.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Tsitaadid Hankijatelt.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},{0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Keskmine vanus
 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/templates/pages/home.html +32,View All Products,Kuva kõik tooted
+apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Kuva kõik tooted
 DocType: Company,Default Currency,Vaikimisi Valuuta
 DocType: Contact,Enter designation of this Contact,Sisesta määramise see Kontakt
 DocType: Expense Claim,From Employee,Tööalasest
-apps/erpnext/erpnext/controllers/accounts_controller.py +400,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"
+apps/erpnext/erpnext/controllers/accounts_controller.py +403,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/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,ja aasta:
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +191,{0} {1} must be submitted,{0} {1} tuleb esitada
-DocType: Email Digest,Annual Expense,Aastane Expense
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,{0} {1} must be submitted,{0} {1} tuleb esitada
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +145,Quantity must be less than or equal to {0},Kogus peab olema väiksem või võrdne {0}
 DocType: SMS Center,Total Characters,Kokku Lõbu
 apps/erpnext/erpnext/controllers/buying_controller.py +156,Please select BOM in BOM field for Item {0},Palun valige Bom Bom valdkonnas Punkt {0}
@@ -1025,30 +1038,31 @@
 DocType: Sales Partner,Distributor,Edasimüüja
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Ostukorv kohaletoimetamine reegel
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +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 +62,Please set 'Apply Additional Discount On',Palun määra &quot;Rakenda Täiendav soodustust&quot;
+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
 DocType: Global Defaults,Global Defaults,Global Vaikeväärtused
 apps/erpnext/erpnext/projects/doctype/project/project.py +153,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
-DocType: Purchase Invoice,Start date of current invoice's period,Alguskuupäev jooksva arve on periood
+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 +327,Capacity Planning Error,Capacity Planning viga
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,Capacity Planning viga
 ,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 +362,Finished Item {0} must be entered for Manufacture type entry,Lõppenud Punkt {0} tuleb sisestada Tootmine tüübist kirje
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +367,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
 DocType: Sales Invoice Advance,Sales Invoice Advance,Müügiarve Advance
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +499,Nothing to request,Midagi nõuda
-apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',&quot;Tegelik Start Date&quot; ei saa olla suurem kui &quot;Tegelik End Date&quot;
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Management,Juhtimine
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},Kas deebet- või krediitkaardi summa on vajalik {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +500,Nothing to request,Midagi nõuda
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'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/accounts/doctype/gl_entry/gl_entry.py +55,Either debit or credit amount is required for {0},Kas deebet- või krediitkaardi summa on vajalik {0}
 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 +161,Blue,Blue
+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
@@ -1058,12 +1072,12 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +23,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
 DocType: Stock Settings,Default Item Group,Vaikimisi Punkt Group
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1374,Do you really want to submit the invoice?,Kas te tõesti soovite esitada arve?
+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 +685,Cost Center For Item with Item Code ',Kulude Keskus eseme Kood &quot;
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1526,"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 +679,Cost Center For Item with Item Code ',Kulude Keskus eseme Kood &quot;
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1550,"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/accounts/doctype/account/account_tree.js +26,"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
@@ -1083,104 +1097,106 @@
 DocType: Payment Reconciliation,Unreconciled Payment Details,Unreconciled Makse andmed
 DocType: Global Defaults,Current Fiscal Year,Jooksva eelarveaasta
 DocType: Global Defaults,Disable Rounded Total,Keela Ümardatud kokku
-DocType: Lead,Call,Üleskutse
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +417,'Entries' cannot be empty,&quot;Kanded&quot; ei saa olla tühi
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +418,'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 +214,Fiscal Year {0} not found,Eelarveaastal {0} ei leitud
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +221,Fiscal Year {0} not found,Eelarveaastal {0} ei leitud
 apps/erpnext/erpnext/config/hr.py +238,Setting up Employees,Seadistamine Töötajad
 DocType: Sales Order,SO-,SO-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Palun valige eesliide esimene
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Please select prefix first,Palun valige eesliide esimene
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Research,Teadustöö
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,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 +43,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 +57,View Ledger,Vaata Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Esimesed
-apps/erpnext/erpnext/stock/doctype/item/item.py +504,"An Item Group exists with same name, please change the item name or rename the item group","Elemendi Group olemas sama nimega, siis muuda objekti nimi või ümber nimetada elemendi grupp"
+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/setup/setup_wizard/setup_wizard.py +437,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
 ,Budget Variance Report,Eelarve Dispersioon aruanne
 DocType: Salary Slip,Gross Pay,Gross Pay
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +90,Row {0}: Activity Type is mandatory.,Rida {0}: Activity Type on kohustuslik.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +114,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/public/js/controllers/stock_controller.js +40,Accounting Ledger,Raamatupidamine Ledger
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,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
 DocType: BOM Item,Item Description,Toote kirjeldus
+DocType: Student Sibling,Student Sibling,Student Kaas
 DocType: Purchase Invoice,Is Recurring,Kas Korduvad
 DocType: Purchase Invoice,Supplied Items,Komplektis Esemed
 DocType: Student,STUD.,Stud.
 DocType: Production Order,Qty To Manufacture,Kogus toota
+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/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 +131,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 +175,Valuation Rate required for Item in row {0},Hindamine Rate vajalik toode järjest {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,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
 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 +87, to ,kuni
+apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,kuni
 DocType: Item,Lead Time in days,Ooteaeg päevades
 ,Accounts Payable Summary,Tasumata arved kokkuvõte
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Not authorized to edit frozen Account {0},Ei ole lubatud muuta külmutatud Konto {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,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 +62,Sales Order {0} is not valid,Sales Order {0} ei ole kehtiv
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Sales Order {0} ei ole kehtiv
 apps/erpnext/erpnext/setup/doctype/company/company.py +185,"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 +152,Small,Väike
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,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}
 ,Invoiced Amount (Exculsive Tax),Arve kogusumma (Exculsive Maksu-)
-DocType: Student Applicant,Mother's / Guardian 1 Email ID,Ema / hooldaja 1 Post ID
 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 +160,Green,Green
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,Green
 DocType: Supplier,SUPP-,lisatoite
 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 +57,Contract,Leping
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,Leping
 DocType: Email Digest,Add Quote,Lisa Quote
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +498,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 +503,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 +80,Row {0}: Qty is mandatory,Row {0}: Kogus on kohustuslikuks
+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 +737,Sync Master Data,Sync Master andmed
+apps/erpnext/erpnext/accounts/page/pos/pos.js +719,Sync Master Data,Sync Master andmed
 apps/erpnext/erpnext/public/js/setup_wizard.js +283,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
+DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,Bom
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,See on ülemelemendile rühma ja seda ei saa muuta.
+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.
 DocType: Journal Entry Account,Purchase Order,Ostutellimuse
 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 +345,"{0}: Employee email not found, hence email not sent","{0}: Töötaja e-posti ei leitud, seega e-posti ei saadeta"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +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
 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 +118,"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/accounts/doctype/sales_invoice/sales_invoice.py +474,Delivery Note {0} is not submitted,Toimetaja märkus {0} ei ole esitatud
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Delivery Note {0} is not submitted,Toimetaja märkus {0} ei ole esitatud
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Sub-contracted Item,Punkt {0} peab olema allhanked toode
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Capital seadmed
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Hinnakujundus Reegel on esimene valitud põhineb &quot;Rakenda On väljale, mis võib olla Punkt punkt Group või kaubamärgile."
 DocType: Hub Settings,Seller Website,Müüja Koduleht
 DocType: Item,ITEM-,ITEM-
-apps/erpnext/erpnext/controllers/selling_controller.py +147,Total allocated percentage for sales team should be 100,Kokku eraldatakse protsent müügimeeskond peaks olema 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +110,Production Order status is {0},Tootmine Tellimuse staatus on {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Kokku eraldatakse protsent müügimeeskond peaks olema 100
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Tootmine Tellimuse staatus on {0}
 DocType: Appraisal Goal,Goal,Eesmärk
 DocType: Sales Invoice Item,Edit Description,Edit kirjeldus
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +757,For Supplier,Tarnija
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +723,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
@@ -1196,10 +1212,11 @@
 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
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Saatke Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +445,BOM {0} does not belong to Item {1},Bom {0} ei kuulu Punkt {1}
 DocType: Sales Partner,Target Distribution,Target Distribution
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1667,Deafault warehouse is required for selected item,Deafault lattu on vajalik valitud kirje
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Deafault warehouse is required for selected item,Deafault lattu on vajalik valitud kirje
 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
@@ -1208,23 +1225,23 @@
 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 +110,Hardware,Riistvara
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,Riistvara
 DocType: Sales Order,Recurring Upto,korduvad Upto
 DocType: Attendance,HR Manager,personalijuht
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Palun valige Company
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Privilege Leave,Privilege Leave
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,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 +79,You need to enable Shopping Cart,Sa pead lubama Ostukorv
 DocType: Payment Entry,Writeoff,Maha kirjutama
 DocType: Appraisal Template Goal,Appraisal Template Goal,Hinnang Mall Goal
-DocType: Salary Slip,Earning,Tulu
+DocType: Salary Component,Earning,Tulu
 DocType: Purchase Invoice,Party Account Currency,Partei konto Valuuta
 ,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 +171,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 +174,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_data.py +358,Food,Toit
+apps/erpnext/erpnext/demo/setup/setup_data.py +301,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/course_schedule/course_schedule.js +103,Mark Attendence,Mark kohalolijate
@@ -1258,12 +1275,12 @@
 DocType: Sales Order Item,Planned Quantity,Planeeritud Kogus
 DocType: Purchase Invoice Item,Item Tax Amount,Punkt maksusumma
 DocType: Item,Maintain Stock,Säilitada Stock
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +209,Stock Entries already created for Production Order ,Stock kanded juba loodud Production Telli
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,Stock kanded juba loodud Production Telli
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,Net Change põhivarade
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Jäta tühjaks, kui arvestada kõiki nimetusi"
-apps/erpnext/erpnext/controllers/accounts_controller.py +620,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 +238,Max: {0},Max: {0}
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +15,From Datetime,Siit Date
+apps/erpnext/erpnext/controllers/accounts_controller.py +623,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 +239,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 +153,"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."
@@ -1271,8 +1288,8 @@
 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 +552,cannot be greater than 100,ei saa olla üle 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +680,Item {0} is not a stock Item,Punkt {0} ei ole laos toode
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +546,cannot be greater than 100,ei saa olla üle 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,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
@@ -1286,10 +1303,9 @@
 DocType: GL Entry,GL Entry,GL Entry
 DocType: HR Settings,Employee Settings,Töötaja Seaded
 ,Batch-Wise Balance History,Osakaupa Balance ajalugu
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Nimekiri
 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 +61,Apprentice,Praktikant
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +102,Negative Quantity is not allowed,Negatiivne Kogus ei ole lubatud
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,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 +152,Employee cannot report to himself.,Töötaja ei saa aru ise.
@@ -1310,15 +1326,14 @@
 DocType: Asset,Asset Name,Asset Nimi
 DocType: Shipping Rule Condition,To Value,Hindama
 DocType: Asset Movement,Stock Manager,Stock Manager
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +141,Source warehouse is mandatory for row {0},Allikas lattu on kohustuslik rida {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +719,Packing Slip,Pakkesedel
+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 +713,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/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,Hinnapäring võib olla juurdepääs klõpsates järgmist linki
 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 +81,Analyst,Analüütik
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,Analüütik
 DocType: Item,Inventory,Inventory
 DocType: Item,Sales Details,Müük Üksikasjad
 DocType: Quality Inspection,QI-,QI-
@@ -1326,7 +1341,7 @@
 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 +103,Government,Valitsus
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,Valitsus
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,Instituudi Nimi
 apps/erpnext/erpnext/config/stock.py +289,Item Variants,Punkt variandid
 DocType: Company,Services,Teenused
@@ -1342,6 +1357,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,Financial Year Start Date,Financial alguskuupäev
 DocType: POS Profile,Apply Discount,Kanna Soodus
 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
 DocType: Program Course,Program Course,programmi käigus
@@ -1382,12 +1398,12 @@
 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
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +110,Accounting Entry for {0} can only be made in currency: {1},Raamatupidamine kirjet {0} saab teha ainult valuuta: {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Raamatupidamine kirjet {0} saab teha ainult valuuta: {1}
 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
 DocType: Shopping Cart Settings,Payment Success URL,Makse Edu URL
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +78,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: Tagastatud toode {1} ei eksisteeri {2} {3}
+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
@@ -1396,40 +1412,39 @@
 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/stock/doctype/stock_entry/stock_entry.py +339,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/stock/doctype/stock_entry/stock_entry.py +344,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 +545,Manufacturing Quantity is mandatory,Tootmine Kogus on kohustuslikuks
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Tootmine Kogus on kohustuslikuks
 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 +71,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 +162,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/projects/doctype/timesheet/timesheet.py +186,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
 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 +130,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 +137,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
 DocType: Dependent Task,Dependent Task,Sõltub Task
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,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/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 +190,Leave of type {0} cannot be longer than {1},Jäta tüüpi {0} ei saa olla pikem kui {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +197,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
 DocType: SMS Center,Receiver List,Vastuvõtja loetelu
-apps/erpnext/erpnext/accounts/page/pos/pos.js +921,Search Item,Otsi toode
+apps/erpnext/erpnext/accounts/page/pos/pos.js +910,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 +546,Already completed,juba lõpetatud
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +22,Payment Request already exists {0},Maksenõudekäsule juba olemas {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +550,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 +241,Quantity must not be more than {0},Kogus ei tohi olla rohkem kui {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Quantity must not be more than {0},Kogus ei tohi olla rohkem kui {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +76,Previous Financial Year is not closed,Eelmisel majandusaastal ei ole suletud
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +44,Age (Days),Vanus (päevad)
 DocType: Quotation Item,Quotation Item,Tsitaat toode
@@ -1446,7 +1461,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +221,Purchase Receipt {0} is not submitted,Ostutšekk {0} ei ole esitatud
 DocType: Company,Default Payable Account,Vaikimisi on tasulised konto
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Seaded online ostukorv nagu laevandus reeglid, hinnakirja jm"
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +83,{0}% Billed,{0}% Maksustatakse
+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
@@ -1458,12 +1473,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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/schools/doctype/fees/fees.js +22,Collect,Koguma
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Koguma
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,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 +225,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
-DocType: Payment Reconciliation,Payments,Maksed
 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
@@ -1475,7 +1489,7 @@
 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 +9,Procurement,hankimine
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,Ükski esemed on mingeid muutusi kogus või väärtus.
+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
 ,Lead Details,Plii Üksikasjad
 DocType: Purchase Invoice,End date of current invoice's period,Lõppkuupäev jooksva arve on periood
@@ -1500,7 +1514,7 @@
 DocType: Purchase Invoice,Additional Discount,Täiendav Soodus
 DocType: Selling Settings,Selling Settings,Müük Seaded
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Online Oksjonid
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +97,Please specify either Quantity or Valuation Rate or both,Palun täpsustage kas Kogus või Hindamine Rate või nii
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,Palun täpsustage kas Kogus või Hindamine Rate või nii
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +13,Fulfillment,täitmine
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Ettevõte, Kuu ja majandusaasta on kohustuslik"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Turundus kulud
@@ -1521,14 +1535,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,ERPNext Setup Complete!
 DocType: Item,Weightage,Weightage
 DocType: Packing Slip,PS-,PS
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +93,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Kliendi Group olemas sama nimega siis muuta kliendi nimi või ümber Kliendi Group
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +126,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
 DocType: Stock Entry,Material Receipt,Materjal laekumine
 DocType: Homepage,Products,Tooted
 DocType: Announcement,Instructor,juhendaja
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},Partei tüüp ja partei on vajalik laekumata / maksmata konto {0}
 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
@@ -1539,7 +1552,7 @@
 ,Item-wise Sales Register,Punkt tark Sales Registreeri
 DocType: Asset,Gross Purchase Amount,Gross ostusumma
 DocType: Asset,Depreciation Method,Amortisatsioonimeetod
-apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Offline,offline
+apps/erpnext/erpnext/accounts/page/pos/pos.js +686,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
@@ -1557,25 +1570,27 @@
 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
 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 +858,Make Purchase Order,Tee Ostutellimuse
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +852,Make Purchase Order,Tee Ostutellimuse
 DocType: SMS Center,Send To,Saada
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,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 +148,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
 DocType: Stock Reconciliation,Stock Reconciliation,Stock leppimise
 DocType: Territory,Territory Name,Territoorium nimi
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +172,Work-in-Progress Warehouse is required before Submit,Lõpetamata Progress Warehouse on vaja enne Esita
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,Work-in-Progress Warehouse is required before Submit,Lõpetamata Progress Warehouse on vaja enne Esita
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Taotleja tööd.
 DocType: Purchase Order Item,Warehouse and Reference,Lao- ja seletused
 DocType: Supplier,Statutory info and other general information about your Supplier,Kohustuslik info ja muud üldist infot oma Tarnija
-apps/erpnext/erpnext/hooks.py +88,Addresses,Aadressid
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Tarnija&gt; Tarnija Type
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +212,Against Journal Entry {0} does not have any unmatched {1} entry,Vastu päevikusissekanne {0} ei ole mingit tasakaalustamata {1} kirje
+apps/erpnext/erpnext/hooks.py +95,Addresses,Aadressid
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +215,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
 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)
 DocType: Sales Order,To Deliver and Bill,Pakkuda ja Bill
@@ -1583,11 +1598,10 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,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 +731,Payment,Makse
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,Payment,Makse
 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: Pricing Rule,Brand,Põletusmärk
 DocType: Course,Course Abbreviation,muidugi lühend
 DocType: Item,Will also apply for variants,Kehtib ka variandid
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +142,"Asset cannot be cancelled, as it is already {0}","Vara ei saa tühistada, sest see on juba {0}"
@@ -1599,7 +1613,7 @@
 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."
 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 +85,Associate,Associate
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,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
@@ -1607,7 +1621,7 @@
 DocType: Production Planning Tool,Material Requests,Materjal taotlused
 DocType: Warranty Claim,Issue Date,Väljaandmise kuupäev
 DocType: Activity Cost,Activity Cost,Aktiivsus Cost
-DocType: Timesheet Detail,Timesheet Detail,Töögraafik Detail
+DocType: Sales Invoice Timesheet,Timesheet Detail,Töögraafik Detail
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Tarbitud Kogus
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekommunikatsiooni
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Näitab, et pakend on osa sellest sünnitust (Ainult eelnõu)"
@@ -1630,6 +1644,7 @@
 DocType: Production Plan Material Request,Material Request Date,Materjal taotlus kuupäev
 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
 DocType: Item,Has Variants,Omab variandid
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nimi Kuu Distribution
 DocType: Sales Person,Parent Sales Person,Parent Sales Person
@@ -1642,30 +1657,31 @@
 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 +44,"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/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."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +502,Error: {0} &gt; {1},Viga: {0}&gt; {1}
 DocType: Item,Is Sales Item,Kas Sales toode
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Punkt Group Tree
 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."
 DocType: Naming Series,Current Value,Praegune väärtus
-apps/erpnext/erpnext/controllers/accounts_controller.py +235,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/controllers/accounts_controller.py +238,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
 DocType: Delivery Note Item,Against Sales Order,Vastu Sales Order
 ,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 +458,Item table can not be blank,Punkt tabelis ei tohi olla tühi
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +443,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 +5,This is based on stock movement. See {0} for details,See põhineb varude liikumist. Vaata {0} üksikasjad
 DocType: Pricing Rule,Selling,Müük
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +341,Amount {0} {1} deducted against {2},Summa {0} {1} maha vastu {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +344,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
@@ -1680,8 +1696,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +144,Cannot refer row number greater than or equal to current row number for this Charge type,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 +159,Red,Red
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Palun kliki &quot;Loo Ajakava&quot; tõmmata Serial No lisatud Punkt {0}
+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
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Baasosa (firma Valuuta)
@@ -1689,7 +1705,7 @@
 DocType: Installation Note,Installation Time,Paigaldamine aeg
 DocType: Sales Invoice,Accounting Details,Raamatupidamine Üksikasjad
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,Kustuta kõik tehingud selle firma
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +187,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Row # {0}: Operation {1} ei ole lõpule {2} tk valmistoodangu tootmine Tellimus {3}. Palun uuendage töö staatusest kaudu Time Palgid
+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,Row # {0}: Operation {1} ei ole lõpule {2} tk valmistoodangu tootmine Tellimus {3}. Palun uuendage töö staatusest kaudu Time Palgid
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,Investeeringud
 DocType: Issue,Resolution Details,Resolutsioon Üksikasjad
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,eraldised
@@ -1725,16 +1741,17 @@
 DocType: Bank Reconciliation Detail,Against Account,Vastu konto
 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}
 DocType: Delivery Note,Excise Page Number,Aktsiisi Page Number
 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}
 ,Maintenance Schedules,Hooldusgraafikud
 DocType: Task,Actual End Date (via Time Sheet),Tegelik End Date (via Time Sheet)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Amount {0} {1} against {2} {3},Summa {0} {1} vastu {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +339,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 +138,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 +295,Debit To account must be a Receivable account,Kanne konto peab olema võlgnevus konto
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,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
 DocType: Purchase Invoice Item,Conversion Factor,Tulemus Factor
@@ -1742,10 +1759,10 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +137,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"
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +90,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Kokku eraldatakse lehed {0} ei saa olla väiksem kui juba heaks lehed {1} perioodiks
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +93,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 +22,Enter Paid Amount,Sisesta Paide summa
+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
@@ -1755,13 +1772,15 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,timesheets
 DocType: HR Settings,HR Settings,HR Seaded
 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 +524,"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."
+apps/erpnext/erpnext/controllers/accounts_controller.py +527,"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 +249,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-
 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/stock/get_item_details.py +123,Please specify Company,Palun täpsustage Company
 ,Customer Acquisition and Loyalty,Klientide võitmiseks ja lojaalsus
@@ -1772,17 +1791,19 @@
 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 +183,Closing (Opening + Totals),Sulgemine (Opening + Summad)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),Sulgemine (Opening + Summad)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,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/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
-apps/erpnext/erpnext/controllers/accounts_controller.py +272,Account {0} is invalid. Account Currency must be {1},Konto {0} on kehtetu. Konto Valuuta peab olema {1}
+DocType: Email Digest,Pending Sales Orders,Kuni müügitellimuste
+apps/erpnext/erpnext/controllers/accounts_controller.py +275,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 +956,"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 Slip,Deduction,Kinnipeetav
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +87,Row {0}: From Time and To Time is mandatory.,Rida {0}: From ajal ja aeg on kohustuslik.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +969,"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 +111,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 +262,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 +7,Please enter Employee Id of this sales person,Palun sisestage Töötaja Id selle müügi isik
@@ -1790,7 +1811,7 @@
 DocType: Project,% Tasks Completed,% Ülesanded Valminud
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,Erinevus summa peab olema null
 DocType: Project,Gross Margin,Gross Margin
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +194,Please enter Production Item first,Palun sisestage Production Punkt esimene
+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
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Tsitaat
@@ -1799,53 +1820,54 @@
 DocType: Maintenance Visit,Maintenance User,Hooldus Kasutaja
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +149,Cost Updated,Kulude Uuendatud
 DocType: Employee,Date of Birth,Sünniaeg
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +86,Item {0} has already been returned,Punkt {0} on juba tagasi
+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}
+DocType: Student Admission,Eligibility,kõlblikkus
 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 +177,Job Description,Töö kirjeldus
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,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 +126,"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 +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Erimärkide välja &quot;-&quot;, &quot;#&quot;, &quot;.&quot; ja &quot;/&quot; ei tohi nimetades seeria"
 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."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +24,Welcome to POS: Create your POS Profile,Tere tulemast POS: Loo POS profiil
 DocType: Expense Claim,Approver,Heakskiitja
 ,SO Qty,SO Kogus
+DocType: Guardian,Work Address,tööaadress
 DocType: Appraisal,Calculate Total Score,Arvuta üldskoor
 DocType: Request for Quotation,Manufacturing Manager,Tootmine Manager
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serial No {0} on garantii upto {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +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 +74,Shipments,Saadetised
+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
 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 +153,Row # ,Row #
+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 +156,Get From,Saada
+apps/erpnext/erpnext/public/js/utils.js +167,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 +167,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 +416,"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"
+apps/erpnext/erpnext/controllers/accounts_controller.py +419,"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
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} is disabled,Kasutaja {0} on keelatud
 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 ...
 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 +171,"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 +346,{0} is mandatory for Item {1},{0} on kohustuslik Punkt {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,{0} is mandatory for Item {1},{0} on kohustuslik Punkt {1}
 DocType: Currency Exchange,From Currency,Siit Valuuta
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Palun valige eraldatud summa, arve liik ja arve number atleast üks rida"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,Kulud New Ost
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},Sales Order vaja Punkt {0}
 DocType: Purchase Invoice Item,Rate (Company Currency),Hinda (firma Valuuta)
-apps/erpnext/erpnext/demo/setup_data.py +360,Others,Teised
+DocType: Student Guardian,Others,Teised
 DocType: Payment Entry,Unallocated Amount,Jaotamata summa
 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
@@ -1865,17 +1887,16 @@
 apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,SERIALIZED Inventory
 DocType: Activity Type,Default Billing Rate,Vaikimisi Arved Rate
 DocType: Sales Invoice,Total Billing Amount,Arve summa
-apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +54,Receivable Account,Nõue konto
-apps/erpnext/erpnext/controllers/accounts_controller.py +546,Row #{0}: Asset {1} is already {2},Rida # {0}: Asset {1} on juba {2}
+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 +549,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 +79,CEO,tegevdirektor
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,tegevdirektor
 DocType: Expense Claim Detail,Expense Claim Detail,Kuluhüvitussüsteeme Detail
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +808,Please select correct account,Palun valige õige konto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +809,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
-DocType: Purchase Invoice Item,Page Break,Page Break
 DocType: Production Order Operation,Pending,Pooleliolev
 DocType: Course,Course Name,Kursuse nimi
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Kasutajad, kes saab kinnitada konkreetse töötaja puhkuse rakendused"
@@ -1884,14 +1905,15 @@
 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 +54,Full-time,Täiskohaga
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,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: Student,Guardians,Kaitsjad
 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 +289,Debit To is required,Kanne on vajalik
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +321,Debit To is required,Kanne on vajalik
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Ostu hinnakiri
 DocType: Offer Letter Term,Offer Term,Tähtajaline
 DocType: Quality Inspection,Quality Manager,Kvaliteedi juht
@@ -1899,6 +1921,7 @@
 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/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
@@ -1909,18 +1932,17 @@
 DocType: Production Order Operation,Completed Qty,Valminud Kogus
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"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 +273,Price List {0} is disabled,Hinnakiri {0} on keelatud
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +99,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/projects/doctype/timesheet/timesheet.py +123,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öö
 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}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Praegune Hindamine Rate
 DocType: Item,Customer Item Codes,Kliendi Punkt Koodid
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,Exchange kasum / kahjum
 DocType: Opportunity,Lost Reason,Kaotatud Reason
-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/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/purchase_receipt/purchase_receipt.py +378,All items have already been invoiced,Kõik esemed on juba arve
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +379,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
@@ -1936,18 +1958,19 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Sinu kliendid
 apps/erpnext/erpnext/projects/doctype/project/project.py +141,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/job_opening.html +19,Apply Now,Rakendatakse kohe
+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."
 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
-apps/erpnext/erpnext/utilities/doctype/address/address.py +164,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: Fee Structure,Fee Structure,Fee struktuur
 DocType: Timesheet Detail,Costing Amount,Mis maksavad summa
+DocType: Student Admission,Application Fee,Application Fee
 DocType: Process Payroll,Submit Salary Slip,Esita palgatõend
-apps/erpnext/erpnext/controllers/selling_controller.py +161,Maxiumm discount for Item {0} is {1}%,Maxiumm allahindlust Punkt {0} on {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,Maxiumm allahindlust Punkt {0} on {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Import in Bulk
 DocType: Sales Partner,Address & Contacts,Aadress ja Kontakt
 DocType: SMS Log,Sender Name,Saatja nimi
@@ -1972,21 +1995,21 @@
 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_data.py +361,Travel,Reisimine
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +155,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 +304,Travel,Reisimine
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +167,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 +23,Update Cost,Värskenda Cost
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Värskenda Cost
 DocType: Item Reorder,Item Reorder,Punkt Reorder
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +36,Show Salary Slip,Näita palgatõend
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +748,Transfer Material,Transfer Materjal
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +53,Show Salary Slip,Näita palgatõend
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +166,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 +923,Please set recurring after saving,Palun määra korduvate pärast salvestamist
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +646,Select change amount account,Vali muutus summa kontole
+apps/erpnext/erpnext/public/js/controllers/transaction.js +914,Please set recurring after saving,Palun määra korduvate pärast salvestamist
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +703,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
@@ -1998,31 +2021,32 @@
 DocType: Quality Inspection,Verified By,Kontrollitud
 DocType: Address,Subsidiary,Tütarettevõte
 apps/erpnext/erpnext/setup/doctype/company/company.py +64,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","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: Quality Inspection,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 +33,Traceability,Jälgitavus
 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 +352,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Kogus järjest {0} ({1}) peab olema sama, mida toodetakse kogus {2}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,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: Appraisal,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 +217,{0} {1} is fully billed,{0} {1} on täielikult arve
 DocType: Workstation Working Hour,End Time,End Time
 DocType: Payment Entry,Payment Deductions or Loss,Tasu vähendamisega või kaotus
-apps/erpnext/erpnext/config/schools.py +100,LMS,LMS
+apps/erpnext/erpnext/config/schools.py +104,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/config/crm.py +6,Sales Pipeline,müügivõimaluste
 DocType: Student Batch Student,Student Batch Student,Student Partii Student
-DocType: Sales Invoice,Mass Mailing,Masspostitust
+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 +199,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/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 +297,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 +111,Pharmaceutical,Pharmaceutical
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +309,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/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
@@ -2037,27 +2061,28 @@
 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 +814,Please specify Company to proceed,Palun täpsustage Company edasi
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +793,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 +44,Compensatory Off,Tasandusintress Off
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,Tasandusintress Off
 DocType: Quality Inspection Reading,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."
 DocType: Room,Room Number,Toa number
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Vale viite {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +161,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ei saa olla suurem kui planeeritud quanitity ({2}) in Production Tellimus {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +162,{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 +217,Raw Materials cannot be blank.,Tooraine ei saa olla tühi.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,"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 +460,Quick Journal Entry,Quick päevikusissekanne
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +111,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/accounts/doctype/sales_invoice/sales_invoice.py +441,"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 +450,Quick Journal Entry,Quick päevikusissekanne
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +103,You can not change rate if BOM mentioned agianst any item,Sa ei saa muuta kiirust kui Bom mainitud agianst tahes kirje
 DocType: Employee,Previous Work Experience,Eelnev töökogemus
 DocType: Stock Entry,For Quantity,Sest Kogus
 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 +214,{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
 ,Minutes to First Response for Issues,Protokoll First Response küsimustes
 DocType: Purchase Invoice,Terms and Conditions1,Tingimused ja tingimuste kohta1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,"Nimi instituut, mida te Selle süsteemi rajamisel."
@@ -2066,16 +2091,17 @@
 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 +398,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"
 ,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 +739,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/stock/doctype/stock_entry/stock_entry.py +747,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
 DocType: Fiscal Year,Year End Date,Aasta lõpp kuupäev
 DocType: Task Depends On,Task Depends On,Task sõltub
-DocType: Lead,Opportunity,Võimalus
+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
@@ -2088,7 +2114,7 @@
 DocType: Student,Joining Date,Liitumine kuupäev
 ,Employees working on a holiday,Töötajat puhkusele
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Mark olevik
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},Hooldus alguskuupäev ei saa olla enne tarnekuupäev Serial No {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},Hooldus alguskuupäev ei saa olla enne tarnekuupäev Serial No {0}
 DocType: Production Order,Actual End Date,Tegelik End Date
 DocType: Purchase Invoice,PINV-,PINV-
 DocType: Authorization Rule,Applicable To (Role),Suhtes kohaldatava (Role)
@@ -2103,7 +2129,7 @@
 DocType: SMS Log,No of Requested SMS,Ei taotletud SMS
 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 +729,Please supply the specified items at the best possible rates,Esitada määratud objekte parima võimaliku määr
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +695,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 +117,Contract End Date must be greater than Date of Joining,Leping End Date peab olema suurem kui Liitumis
 DocType: Delivery Note,DN-,DN-
@@ -2112,7 +2138,7 @@
 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 +14,This is an example website auto-generated from ERPNext,See on näide veebisaidi automaatselt genereeritud alates ERPNext
+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
 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.
 
@@ -2139,13 +2165,14 @@
 DocType: Purchase Receipt Item,Recd Quantity,KONTOLE Kogus
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +54,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 +103,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 +504,Stock Entry {0} is not submitted,Stock Entry {0} ei ole esitatud
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,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 +505,Stock Entry {0} is not submitted,Stock Entry {0} ei ole esitatud
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / Cash konto
 DocType: Tax Rule,Billing City,Arved City
 DocType: Salary Component Account,Salary Component Account,Palk Component konto
 DocType: Global Defaults,Hide Currency Symbol,Peida Valuuta Sümbol
 apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card","nt Bank, Raha, Krediitkaart"
+DocType: Lead Source,Source Name,Allikas Nimi
 DocType: Journal Entry,Credit Note,Kreeditaviis
 DocType: Warranty Claim,Service Address,Teenindus Aadress
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furnitures and Fixtures,Mööbel ja lambid
@@ -2157,6 +2184,7 @@
 DocType: Opportunity,Customer / Lead Name,Klienditeenindus / Plii nimi
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +89,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/controllers/trends.py +19,Total(Qty),Kokku (tk)
 DocType: Sales Invoice,This Document,See dokument
@@ -2168,15 +2196,15 @@
 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 +176,Organization branch master.,Organisatsiooni haru meister.
-apps/erpnext/erpnext/controllers/accounts_controller.py +273, or ,või
+apps/erpnext/erpnext/controllers/accounts_controller.py +276, or ,või
 DocType: Sales Order,Billing Status,Arved staatus
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Teata probleemist
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,Utility kulud
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-Above
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +203,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Rida # {0}: päevikusissekanne {1} ei ole arvesse {2} või juba võrreldakse teise kviitungi
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +206,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 +90,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 +93,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
@@ -2204,8 +2232,8 @@
 DocType: Product Bundle,Parent Item,Eellaselement
 DocType: Account,Account Type,Konto tüüp
 DocType: Delivery Note,DN-RET-,DN-RET-
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +115,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 +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Hoolduskava ei loodud kõik esemed. Palun kliki &quot;Loo Ajakava&quot;
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +118,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 +163,"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"
@@ -2217,13 +2245,13 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +32,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 +748,Delivery,Tarne
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +742,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
 DocType: Payment Entry,Total Allocated Amount,Eraldati kokku
 DocType: Item Reorder,Material Request Type,Materjal Hankelepingu liik
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +82,Row {0}: UOM Conversion Factor is mandatory,Row {0}: UOM Conversion Factor on kohustuslik
+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
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Voucher #
@@ -2234,13 +2262,13 @@
 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 +90,Head of Marketing and Sales,Head of Marketing ja müük
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Tulumaksuseaduse
+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 +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.
 DocType: Item Supplier,Item Supplier,Punkt Tarnija
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +403,Please enter Item Code to get batch no,Palun sisestage Kood saada partii ei
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +770,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 +397,Please enter Item Code to get batch no,Palun sisestage Kood saada partii ei
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +764,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"
@@ -2252,28 +2280,29 @@
 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 +100,Issues,Issues
+apps/erpnext/erpnext/hooks.py +109,Issues,Issues
 apps/erpnext/erpnext/controllers/status_updater.py +13,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
 ,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
 DocType: Supplier,Billing Currency,Arved Valuuta
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Large,Väga suur
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Extra Large,Väga suur
 ,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 +507,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 +107,Local,Kohalik
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +508,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/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 +154,Large,Suur
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Large,Suur
 DocType: Homepage Featured Product,Homepage Featured Product,Kodulehekülg Valitud toode
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Uus Warehouse Nimi
-apps/erpnext/erpnext/accounts/report/financial_statements.py +225,Total {0} ({1}),Kokku {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +224,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
@@ -2319,9 +2348,9 @@
 DocType: Attendance,Leave Type,Jäta Type
 apps/erpnext/erpnext/controllers/stock_controller.py +173,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/hr/doctype/salary_slip/salary_slip.py +79,Name error: {0},Nimi viga: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +90,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 +178,{0} {1} does not associated with {2} {3},{0} {1} ei seostatud {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +181,{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)
 DocType: Warehouse,Parent Warehouse,Parent Warehouse
@@ -2340,7 +2369,7 @@
 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
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,Atleast üks element peab olema kantud negatiivse koguse vastutasuks dokument
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Atleast one item should be entered with negative quantity in return document,Atleast üks element peab olema kantud negatiivse koguse vastutasuks dokument
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operation {0} kauem kui ükski saadaval töötundide tööjaama {1}, murda operatsiooni mitmeks toimingud"
 ,Requested,Taotletud
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +83,No Remarks,No Märkused
@@ -2352,46 +2381,46 @@
 DocType: Item,Total Projected Qty,Kokku prognoositakse Kogus
 DocType: Monthly Distribution,Distribution Name,Distribution nimi
 DocType: Course,Course Code,Kursuse kood
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Quality Inspection required for Item {0},Kvaliteedi kontroll on vajalikud Punkt {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,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
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Manage Territory Tree.
 DocType: Journal Entry Account,Sales Invoice,Müügiarve
 DocType: Journal Entry Account,Party Balance,Partei Balance
-apps/erpnext/erpnext/accounts/page/pos/pos.js +475,Please select Apply Discount On,Palun valige Rakenda soodustust
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +92,Salary Slip Created,Palgatõend Loodud
+apps/erpnext/erpnext/accounts/page/pos/pos.js +464,Please select Apply Discount On,Palun valige Rakenda soodustust
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +95,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
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,Soodus protsent võib rakendada kas vastu Hinnakiri või kõigi hinnakiri.
 DocType: Purchase Invoice,Half-yearly,Poolaasta-
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +384,Accounting Entry for Stock,Raamatupidamine kirjet Stock
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +387,Accounting Entry for Stock,Raamatupidamine kirjet Stock
 DocType: Sales Invoice,Sales Team1,Müük Team1
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,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 +96,Row {0}: Completed Qty must be greater than zero.,Rida {0}: Teostatud Kogus peab olema suurem kui null.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +120,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 +88,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Ei saa tagastada rohkem kui {1} jaoks Punkt {2}
+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
 DocType: Item Group,Show this slideshow at the top of the page,Näita seda slideshow ülaosas lehele
 DocType: BOM,Item UOM,Punkt UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Maksusumma Pärast Allahindluse summa (firma Valuuta)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +147,Target warehouse is mandatory for row {0},Target lattu on kohustuslik rida {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +141,Target warehouse is mandatory for row {0},Target lattu on kohustuslik rida {0}
 DocType: Cheque Print Template,Primary Settings,esmane seaded
 DocType: Purchase Invoice,Select Supplier Address,Vali Tarnija Aadress
 DocType: Quality Inspection,Quality Inspection,Kvaliteedi kontroll
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Extra Small,Mikroskoopilises
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +194,Account {0} is frozen,Konto {0} on külmutatud
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Mikroskoopilises
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +690,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 +197,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 +606,Can only make payment against unbilled {0},Kas ainult tasuda vastu unbilled {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +126,Commission rate cannot be greater than 100,Komisjoni määr ei või olla suurem kui 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +609,Can only make payment against unbilled {0},Kas ainult tasuda vastu unbilled {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,Komisjoni määr ei või olla suurem kui 100
 DocType: Stock Entry,Subcontract,Alltöövõtuleping
 apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,Palun sisestage {0} Esimene
 DocType: Production Order Operation,Actual End Time,Tegelik End Time
@@ -2402,30 +2431,30 @@
 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 +158,Colour,Värv
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,Värv
 DocType: Maintenance Visit,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"
 DocType: Student Log,Academic,Akadeemiline
-apps/erpnext/erpnext/controllers/accounts_controller.py +469,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Kokku eelnevalt ({0}) vastu Order {1} ei saa olla suurem kui Grand Kokku ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +472,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Kokku eelnevalt ({0}) vastu Order {1} ei saa olla suurem kui Grand Kokku ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Vali Kuu jaotamine ebaühtlaselt jaotada eesmärkide üle kuu.
 DocType: Purchase Invoice Item,Valuation Rate,Hindamine Rate
+DocType: Stock Reconciliation,SR/,SR /
 apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,Hinnakiri Valuuta ole valitud
 DocType: Assessment,Results,tulemused
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +168,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 +175,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: Student Applicant,Father's/ Guardian 2 Email ID,Isa / Guardian 2 E-ID
 DocType: Maintenance Visit Purpose,Against Document No,Dokumentide vastu pole
 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 +228,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 +231,Warehouses with existing transaction can not be converted to group.,Laod olemasolevate tehing ei ole ümber rühmitada.
 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 +93,Researcher,Teadur
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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.
@@ -2437,25 +2466,25 @@
 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"
 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: Sales Invoice,Advertisement,Kuulutus
 DocType: Asset Category Account,Depreciation Expense Account,Amortisatsioonikulu konto
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Probationary Period,Katseaeg
-apps/erpnext/erpnext/hooks.py +102,Announcements,Teated
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Katseaeg
+apps/erpnext/erpnext/hooks.py +111,Announcements,Teated
 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 +109,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 +16,To Datetime,Et Date
+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/scheduling_tool/scheduling_tool.py +51,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/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Kuni Tegevused
+DocType: Accounts Settings,Make Payment via Journal Entry,Tee makse kaudu päevikusissekanne
+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 +127,Please enter relieving date.,Palun sisestage leevendab kuupäeva.
-apps/erpnext/erpnext/controllers/trends.py +145,Amt,Amt
+apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,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 +26,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
@@ -2473,14 +2502,15 @@
 apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1},Ei leia vahetuskursi {0} kuni {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Mark Pool päeva
 DocType: Sales Invoice,Sales Team,Sales Team
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Duplicate entry,Duplicate kirje
+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 +490,[Error],[Error]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +484,[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
 apps/erpnext/erpnext/controllers/status_updater.py +175,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.
 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
@@ -2496,22 +2526,22 @@
 ,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 +25,All Jobs,Kõik Jobs
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,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
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Amount {0} {1} {2} {3},Summa {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Amount {0} {1} {2} {3},Summa {0} {1} {2} {3}
 DocType: Account,Depreciation,Amortisatsioon
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Pakkuja (s)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Töötaja osalemise Tool
 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 +372,Payment Entries {0} are un-linked,Makse Sissekanded {0} on un-seotud
+apps/erpnext/erpnext/accounts/utils.py +449,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
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +497,Material Requests {0} created,Materjal Taotlused {0} loodud
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +498,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.
 DocType: Purchase Invoice,Address and Contact,Aadress ja Kontakt
@@ -2550,7 +2580,7 @@
 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 +848,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 +859,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 +233,Closing (Dr),Sulgemine (Dr)
 DocType: Cheque Print Template,Cheque Size,Tšekk Suurus
@@ -2571,7 +2601,8 @@
 ,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.
-apps/erpnext/erpnext/controllers/accounts_controller.py +555,'Update Stock' cannot be checked for fixed asset sale,&quot;Uuenda Stock&quot; ei saa kontrollida põhivara müügist
+DocType: Student Guardian,Father,isa
+apps/erpnext/erpnext/controllers/accounts_controller.py +558,'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
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Saada värskendusi
 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
@@ -2581,15 +2612,15 @@
 DocType: Sales Order,Fully Delivered,Täielikult Tarnitakse
 DocType: Lead,Lower Income,Madalama sissetulekuga
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","Konto pea all Vastutus, kus kasum / kahjum on broneeritud"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +166,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 +238,"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 +81,Purchase Order number required for Item {0},Ostutellimuse numbri vaja Punkt {0}
+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/purchase_receipt/purchase_receipt.py +82,Purchase Order number required for Item {0},Ostutellimuse numbri vaja 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;From Date&quot; tuleb pärast &quot;To Date&quot;
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +17,Cannot change status as student {0} is linked with student application {1},Selleks ei saa muuta üliõpilaste {0} on seotud õpilase taotluse {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +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: Timesheet,"List of employee which has ""Salary Slip Based on Timesheet"" is enabled in salary structure.","Loetelu töötaja, kes on &quot;palgatõend põhjal Töögraafik&quot; on lubatud palk struktuuri."
 DocType: Asset,Fully Depreciated,täielikult amortiseerunud
 ,Stock Projected Qty,Stock Kavandatav Kogus
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Customer {0} does not belong to project {1},Kliendi {0} ei kuulu projekti {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,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
 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
@@ -2601,7 +2632,7 @@
 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/patches/v7_0/create_warehouse_nestedset.py +55,All Warehouses,Kõik Laod
+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 +105,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
@@ -2613,10 +2644,10 @@
 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/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Tee palgatõend
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +26,Browse BOM,Sirvi Bom
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,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/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 Year,Academic Year,Õppeaasta
+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
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,Hinnang
@@ -2624,12 +2655,12 @@
 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 +197,Leave approver must be one of {0},Jäta heakskiitja peab olema üks {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,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: Workstation Working Hour,Start Time,Algusaeg
 DocType: Item Price,Bulk Import Help,Bulk Import Abi
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +256,Select Quantity,Vali Kogus
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +257,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
@@ -2646,6 +2677,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Kas eesmärk Kogus või Sihtsummaks on kohustuslik.
 apps/erpnext/erpnext/config/projects.py +45,Cost of various activities,Kulude erinevate tegevuste
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Seadistamine Sündmused {0}, kuna töötaja juurde allpool müügiisikuid ei ole Kasutaja ID {1}"
+DocType: Timesheet,Billing Details,Arved detailid
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +149,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}
 DocType: Item,Inspection Required,Ülevaatus Nõutav
@@ -2665,7 +2697,7 @@
 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 +138,Wire Transfer,Raha telegraafiülekanne
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,Raha telegraafiülekanne
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Vaata kõiki
 DocType: Sales Order,Recurring Order,Korduvad Telli
 DocType: Company,Default Income Account,Vaikimisi tulukonto
@@ -2677,21 +2709,19 @@
 ,Welcome to ERPNext,Tere tulemast ERPNext
 apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,Viia Tsitaat
 DocType: Lead,From Customer,Siit Klienditeenindus
-apps/erpnext/erpnext/demo/setup_data.py +357,Calls,Kutsub
+apps/erpnext/erpnext/demo/setup/setup_data.py +300,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/stock/doctype/item/item.py +466,"As there are existing transactions for this item, \
-							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Nagu on olemasolevate tehingute selle objekt, \ sa ei saa muuta väärtused &quot;Kas Serial No&quot;, &quot;Tal on Partii ei&quot;, &quot;Kas laoartikkel&quot; ja &quot;hindamismeetod&quot;"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,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/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 +139,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: Issue,Opening Date,Avamise kuupäev
-apps/erpnext/erpnext/schools/api.py +58,Attendance has been marked successfully.,Osavõtt on märgitud edukalt.
+apps/erpnext/erpnext/schools/api.py +57,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 +136,Account Type for {0} must be {1},Konto tüüp {0} peab olema {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +139,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
@@ -2706,12 +2736,13 @@
 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/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 +20,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 +1190,Please select customer,Palun valige kliendile
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1193,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
@@ -2721,6 +2752,7 @@
 ,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 +50,Missing Currency Exchange Rates for {0},Kadunud Valuutavahetus ALLAHINDLUSED {0}
 DocType: Assessment,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
@@ -2738,11 +2770,12 @@
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Teema nimi
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Atleast üks müümine või ostmine tuleb valida
+DocType: Grading Structure,Grade Intervals,Hinne intervallid
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Vali laadi oma äri.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Kus tootmistegevus viiakse.
 DocType: Asset Movement,Source Warehouse,Allikas Warehouse
 DocType: Installation Note,Installation Date,Paigaldamise kuupäev
-apps/erpnext/erpnext/controllers/accounts_controller.py +534,Row #{0}: Asset {1} does not belong to company {2},Rida # {0}: Asset {1} ei kuulu firma {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +537,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
@@ -2756,28 +2789,31 @@
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Saadaval Partii Kogus kell laost
 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,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 +111,Date Of Retirement must be greater than Date of Joining,Erru minemise peab olema suurem kui Liitumis
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +49,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 +87,{0}% Delivered,{0}% Tarnitakse
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% Tarnitakse
 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).,Punkt {0}: Tellitud tk {1} ei saa olla väiksem kui minimaalne tellimuse tk {2} (vastab punktis).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Kuu Distribution osakaal
 DocType: Territory,Territory Targets,Territoorium Eesmärgid
 DocType: Delivery Note,Transporter Info,Transporter Info
-apps/erpnext/erpnext/accounts/utils.py +379,Please set default {0} in Company {1},Palun määra vaikimisi {0} Company {1}
+apps/erpnext/erpnext/accounts/utils.py +456,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
 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.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Tiitel mallide nt Esialgse arve.
+DocType: Student Guardian,Student Guardian,Student Guardian
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +184,Valuation type charges can not marked as Inclusive,Hindamine tüübist tasu ei märgitud Inclusive
 DocType: POS Profile,Update Stock,Värskenda Stock
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Erinevad UOM objekte viib vale (kokku) Net Weight väärtus. Veenduge, et Net Weight iga objekt on sama UOM."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Bom Rate
 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 +349,Journal Entries {0} are un-linked,Päevikukirjed {0} on un-seotud
+apps/erpnext/erpnext/accounts/utils.py +426,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
@@ -2801,6 +2837,7 @@
 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
+DocType: Homepage,"URL for ""All Products""",URL &quot;Kõik tooted&quot;
 DocType: Leave Application,Leave Balance Before Application,Jäta Balance Enne taotlemine
 DocType: SMS Center,Send SMS,Saada SMS
 DocType: Cheque Print Template,Width of amount in word,Laius summa sõnaga
@@ -2809,7 +2846,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 +29,Current Job Openings,Praegune noorele
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,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
@@ -2822,7 +2859,7 @@
 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 +850,Show tax break-up,Näita maksu break-up
+apps/erpnext/erpnext/public/js/controllers/transaction.js +841,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/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"
@@ -2832,10 +2869,11 @@
 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 +534,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 +80,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 +162,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/selling/doctype/customer/customer.py +195,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 +5,This is based on the attendance of this Student,See põhineb käimist Selle Student
@@ -2844,12 +2882,11 @@
 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 +75,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 +138,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/hr/doctype/leave_application/leave_application.py +145,Note: There is not enough leave balance for Leave Type {0},Märkus: Ei ole piisavalt puhkust tasakaalu Jäta tüüp {0}
 DocType: Program Enrollment Fee,Program Enrollment Fee,Programm osavõtumaks
 DocType: Item,Supplier Items,Tarnija Esemed
 DocType: Opportunity,Opportunity Type,Opportunity Type
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,Uus firma
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,Cost Center is required for 'Profit and Loss' account {0},Cost Center on vajalik kasumi ja kahjumi &quot;kontole {0}
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Tehingud saab kustutada vaid looja Ettevõtte
 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.,Vale number of General Ledger Sissekanded leitud. Te olete valinud vale konto tehinguga.
 DocType: Cheque Print Template,Cheque Width,Tšekk Laius
@@ -2858,16 +2895,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Sünniaeg ei saa olla suurem kui täna.
 ,Stock Ageing,Stock Ageing
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,Töögraafik
-apps/erpnext/erpnext/controllers/accounts_controller.py +228,{0} '{1}' is disabled,{0} &quot;{1}&quot; on keelatud
+apps/erpnext/erpnext/controllers/accounts_controller.py +231,{0} '{1}' is disabled,{0} &quot;{1}&quot; on keelatud
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Määra Open
 DocType: Cheque Print Template,Scanned Cheque,skaneeritud Tšekk
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Saada automaatne kirju Kontaktid esitamine tehinguid.
+DocType: Timesheet,Total Billable Amount,Kokku Arve summa
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Punkt 3
 DocType: Purchase Order,Customer Contact Email,Klienditeenindus Kontakt E-
 DocType: Warranty Claim,Item and Warranty Details,Punkt ja garantii detailid
 DocType: Sales Team,Contribution (%),Panus (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Märkus: Tasumine Entry ei loonud kuna &quot;Raha või pangakonto pole määratud
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Responsibilities,Vastutus
+apps/erpnext/erpnext/controllers/accounts_controller.py +78,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
 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
@@ -2875,6 +2913,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Lisa Kasutajad
 DocType: Pricing Rule,Item Group,Punkt Group
 DocType: Item,Safety Stock,kindlustusvaru
+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: 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)
@@ -2884,7 +2923,6 @@
 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: Timesheet,Total Hours,Tunnid kokku
 DocType: Journal Entry,Printing Settings,Printing Settings
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Total Debit must be equal to Total Credit. The difference is {0},Kokku Deebetkaart peab olema võrdne Kokku Credit. Erinevus on {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Autod
@@ -2897,13 +2935,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investeerimispanganduse
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +71,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
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Klient&gt; Klient Group&gt; Territory
 DocType: Purchase Invoice Item,Rate,Määr
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Intern,Intern
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,Intern
 DocType: Stock Entry,From BOM,Siit Bom
 DocType: Assessment,Assessment Code,Hinnang kood
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +32,Basic,Põhiline
+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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',Palun kliki &quot;Loo Ajakava&quot;
+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 +95,Reference No is mandatory if you entered Reference Date,"Viitenumber on kohustuslik, kui sisestatud Viitekuupäev"
@@ -2912,11 +2951,11 @@
 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 +752,Issue Material,Väljaanne Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +723,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 +683,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 +665,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."
 DocType: Hub Settings,Access Token,Access Token
 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
@@ -2924,39 +2963,41 @@
 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 +1122,Enter value must be positive,Sisesta väärtus peab olema positiivne
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,All Territories,Kõik aladel
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1125,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
 DocType: Purchase Invoice,Items,Esemed
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +23,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 +221,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 +233,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 +96,Request for Quotations,Taotlus tsitaadid
+apps/erpnext/erpnext/hooks.py +104,Request for Quotations,Taotlus tsitaadid
 DocType: Payment Reconciliation,Maximum Invoice Amount,Maksimaalne Arve summa
 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 +628,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Vaikimisi mõõtühik Variant &quot;{0}&quot; peab olema sama, Mall &quot;{1}&quot;"
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Vaikimisi mõõtühik Variant &quot;{0}&quot; peab olema sama, Mall &quot;{1}&quot;"
 DocType: Shipping Rule,Calculate Based On,Arvuta põhineb
 DocType: Delivery Note Item,From Warehouse,Siit Warehouse
 DocType: Assessment,Supervisor Name,Juhendaja nimi
+DocType: Assessment,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
 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 +27,Default Address Template cannot be deleted,Vaikimisi Aadress Mall ei saa kustutada
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,Vaikimisi Aadress Mall ei saa kustutada
 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/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,&quot;Päeva eelmisest Order&quot; peab olema suurem või võrdne nulliga
+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: Asset,Amended From,Muudetud From
 apps/erpnext/erpnext/public/js/setup_wizard.js +295,Raw Material,Toormaterjal
 DocType: Leave Application,Follow via Email,Järgige e-posti teel
@@ -2965,8 +3006,8 @@
 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/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 +485,No default BOM exists for Item {0},No default Bom olemas Punkt {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +336,Please select Posting Date first,Palun valige Postitamise kuupäev esimest
+apps/erpnext/erpnext/stock/get_item_details.py +486,No default BOM exists for Item {0},No default Bom olemas Punkt {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +326,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
@@ -2982,6 +3023,7 @@
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Match Maksed arvetega
 DocType: Journal Entry,Bank Entry,Bank Entry
 DocType: Authorization Rule,Applicable To (Designation),Suhtes kohaldatava (määramine)
+,Profitability Analysis,tasuvuse analüüsi
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,Lisa ostukorvi
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Group By
 DocType: Guardian,Interests,Huvid
@@ -2994,21 +3036,21 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,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 +141,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",SERIALIZED Punkt {0} ei saa uuendada \ kasutades Stock leppimise
 DocType: Scheduling Tool,Day,päev
 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 +122,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 +129,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
-DocType: Student Applicant,AP.,AP.
 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 +639,Point of Sale,Müügikoht
+apps/erpnext/erpnext/accounts/page/pos/pos.js +634,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
 DocType: Production Planning Tool,Production Planning Tool,Tootmise planeerimise tööriist
@@ -3017,74 +3059,77 @@
 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 +373,Quantity to Manufacture must be greater than 0.,Kogus et Tootmine peab olema suurem kui 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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 Profile,Customer Group,Kliendi Group
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,Expense account is mandatory for item {0},Kulu konto on kohustuslik element {0}
 DocType: Item,Website Description,Koduleht kirjeldus
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date must be on or after today,Järgmine kulum kuupäev peab olema või pärast täna
 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 +145,Please cancel Purchase Invoice {0} first,Palun tühistada ostuarve {0} esimene
 DocType: Serial No,AMC Expiry Date,AMC Aegumisaja
 ,Sales Register,Müügiregister
 DocType: Quotation,Quotation Lost Reason,Tsitaat Lost Reason
+apps/erpnext/erpnext/utilities/doctype/address/address.py +164,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.
 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 +330,Transaction reference no {0} dated {1},Tehingu viitenumber {0} kuupäevast {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,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 +107,Summary for this month and pending activities,Kokkuvõte Selle kuu ja kuni tegevusi
+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/accounts/doctype/sales_invoice/sales_invoice.py +406,Please remove this Invoice {0} from C-Form {1},Palun eemalda see Arve {0} on C-vorm {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,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 +644,Get Items,Võta Esemed
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +623,Get Items,Võta Esemed
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +210,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 +41,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
 DocType: Payment Request,Initiated,Algatatud
 DocType: Production Order,Planned Start Date,Kavandatav alguskuupäev
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,Customer is required against Receivable account {0},Klient on kohustatud vastu võlgnevus konto {0}
 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 +265,Project-wise data is not available for Quotation,Projekti tark andmed ei ole kättesaadavad Tsitaat
+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 +101,Commercial,Kaubanduslik
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,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: Supplier Quotation,Supplier Address,Tarnija Aadress
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +648,Row {0}# Account must be of type 'Fixed Asset',Rida {0} # Konto tüüp peab olema &quot;Põhivarade&quot;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,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 +30,Series is mandatory,Seeria on kohustuslik
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +50,Series is mandatory,Seeria on kohustuslik
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Finantsteenused
 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
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +165,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 +155,Cr,Kr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Cr,Kr
 DocType: Tax Rule,Billing State,Arved riik
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +250,Transfer,Transfer
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +187,{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 +825,Fetch exploded BOM (including sub-assemblies),Tõmba plahvatas Bom (sh sõlmed)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +254,Transfer,Transfer
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +190,{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 +796,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 +115,Due Date is mandatory,Tähtaeg on kohustuslik
+apps/erpnext/erpnext/controllers/accounts_controller.py +118,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
 DocType: Journal Entry,Pay To / Recd From,Pay / KONTOLE From
 DocType: Naming Series,Setup Series,Setup Series
 DocType: Payment Reconciliation,To Invoice Date,Et arve kuupäevast
 DocType: Supplier,Contact HTML,Kontakt HTML
 ,Inactive Customers,Passiivne Kliendid
+DocType: Landed Cost Voucher,LCV,VTS
 DocType: Landed Cost Voucher,Purchase Receipts,Ostutšekid
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Kuidas Hinnakujundus kehtib reegel?
 DocType: Quality Inspection,Delivery Note No,Toimetaja märkus pole
@@ -3093,7 +3138,7 @@
 DocType: Company,Retail,Jaekaubandus
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +120,Customer {0} does not exist,Kliendi {0} ei ole olemas
 DocType: Attendance,Absent,Puuduv
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +587,Product Bundle,Toote Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Product Bundle,Toote Bundle
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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
@@ -3103,8 +3148,8 @@
 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 +742,Send Supplier Emails,Saada Tarnija kirjad
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +104,"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/buying/doctype/request_for_quotation/request_for_quotation.js +708,Send Supplier Emails,Saada Tarnija kirjad
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,"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.
 DocType: Guardian Interest,Guardian Interest,Guardian Intress
 DocType: Timesheet,Employee Detail,töötaja Detail
@@ -3115,9 +3160,9 @@
 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}
 DocType: Salary Slip,Earning & Deduction,Teenimine ja mahaarvamine
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +77,Account {0} cannot be a Group,Konto {0} ei saa Group
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} cannot be a Group,Konto {0} ei saa Group
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +31,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 +107,Negative Valuation Rate is not allowed,Negatiivne Hindamine Rate ei ole lubatud
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Negatiivne Hindamine Rate ei ole lubatud
 DocType: Holiday List,Weekly Off,Weekly Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13",Sest näiteks 2012. 2012-13
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +39,Provisional Profit / Loss (Credit),Ajutine kasum / kahjum (Credit)
@@ -3131,16 +3176,16 @@
 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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Cost Center on kohustuslik Punkt {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +626,Get Items from Product Bundle,Võta Kirjed Toote Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +605,Get Items from Product Bundle,Võta Kirjed Toote Bundle
 DocType: Asset,Straight Line,Sirgjoon
 DocType: Project User,Project User,projekti Kasutaja
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} is inactive,Konto {0} ei ole aktiivne
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} is inactive,Konto {0} ei ole aktiivne
 DocType: GL Entry,Is Advance,Kas Advance
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Osavõtt From kuupäev ja kohalolijate kuupäev on kohustuslik
 apps/erpnext/erpnext/controllers/buying_controller.py +148,Please enter 'Is Subcontracted' as Yes or No,Palun sisestage &quot;on sisse ostetud&quot; kui jah või ei
 DocType: Sales Team,Contact No.,Võta No.
 DocType: Bank Reconciliation,Payment Entries,makse Sissekanded
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,'Profit and Loss' type account {0} not allowed in Opening Entry,&quot;Tulude ja kulude tüüpi konto {0} ei tohi avamine Entry
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +71,'Profit and Loss' type account {0} not allowed in Opening Entry,&quot;Tulude ja kulude tüüpi konto {0} ei tohi avamine Entry
 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
@@ -3159,7 +3204,7 @@
 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,Müügiprovisjon
 DocType: Offer Letter Term,Value / Description,Väärtus / Kirjeldus
-apps/erpnext/erpnext/controllers/accounts_controller.py +558,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Rida # {0}: Asset {1} ei saa esitada, siis on juba {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +561,"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: Production Order,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}.
@@ -3172,13 +3217,13 @@
 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/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Legal Expenses,Kohtukulude
 DocType: Purchase Invoice,Posting Time,Foorumi aeg
-DocType: Sales Order,% Amount Billed,% Arve summa
+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."
 apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},No Punkt Serial No {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Avatud teated
+DocType: Email Digest,Open Notifications,Avatud teated
 DocType: Payment Entry,Difference Amount (Company Currency),Erinevus summa (firma Valuuta)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,Otsesed kulud
 apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
@@ -3186,7 +3231,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Uus klient tulud
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,Sõidukulud
 DocType: Maintenance Visit,Breakdown,Lagunema
-apps/erpnext/erpnext/controllers/accounts_controller.py +634,Account: {0} with currency: {1} can not be selected,Konto: {0} valuuta: {1} ei saa valida
+apps/erpnext/erpnext/controllers/accounts_controller.py +637,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}
 DocType: Program Enrollment Tool,Student Applicants,Student Taotlejad
@@ -3194,15 +3239,15 @@
 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 +56,Probation,Karistusest
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Probation,Karistusest
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,palk komponendid
 DocType: Program Enrollment Tool,New Academic Year,Uus õppeaasta
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Payment of salary for the month {0} and year {1},Palga kuu {0} ja aasta {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Payment of salary for the month {0} and year {1},Palga kuu {0} ja aasta {1}
 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 +144,Planning,Planeerimine
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,Planeerimine
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,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
@@ -3215,11 +3260,10 @@
 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.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Sales invoice submitted sucessfully.,Müük esitatud arve edukalt.
 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}
 DocType: Assessment Result,Student Name,Õpilase nimi
-apps/erpnext/erpnext/hooks.py +104,Assessment Schedule,hindamise ajakava
+apps/erpnext/erpnext/hooks.py +113,Assessment Schedule,hindamise ajakava
 DocType: Brand,Item Manager,Punkt Manager
 DocType: Buying Settings,Default Supplier Type,Vaikimisi Tarnija Type
 DocType: Production Order,Total Operating Cost,Tegevuse kogukuludest
@@ -3229,6 +3273,7 @@
 DocType: GL Entry,Party Type,Partei Type
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +78,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
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Palk malli kapten.
 DocType: Leave Type,Max Days Leave Allowed,Max päeval minnakse lubatud
@@ -3240,18 +3285,19 @@
 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 +99,All Customer Groups,Kõik kliendigruppide
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +78,Accumulated Monthly,kogunenud Kuu
-apps/erpnext/erpnext/controllers/accounts_controller.py +595,{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/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Kõik kliendigruppide
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +81,Accumulated Monthly,kogunenud Kuu
+apps/erpnext/erpnext/controllers/accounts_controller.py +598,{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
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Hinnakiri Rate (firma Valuuta)
 DocType: Products Settings,Products Settings,tooted seaded
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +188,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
 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 +84,Secretary,Sekretär
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,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
@@ -3260,24 +3306,22 @@
 ,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
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,Row # {0}: Serial No on kohustuslik
+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 +859,Supplier Quotation,Tarnija Tsitaat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +838,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 +7,Collect Fees,koguda lõive
+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}
 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.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Sündmused
 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/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
-DocType: Email Digest,Income / Expense,Tulu / kulu
 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."
@@ -3288,13 +3332,14 @@
 DocType: Customer,From Lead,Plii
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Tellimused lastud tootmist.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Vali Fiscal Year ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,POS Profile required to make POS Entry,POS Profile vaja teha POS Entry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +509,POS Profile required to make POS Entry,POS Profile vaja teha POS Entry
 DocType: Program Enrollment Tool,Enroll Students,õppima üliõpilasi
 DocType: Hub Settings,Name Token,Nimi Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard Selling
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Atleast one warehouse is mandatory,Atleast üks ladu on kohustuslik
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +129,Atleast one warehouse is mandatory,Atleast üks ladu on kohustuslik
 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 +330,{0} against Sales Invoice {1},{0} vastu müügiarve {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Projekti nimi
@@ -3315,10 +3360,11 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Lehed tuleb eraldada kordselt 0,5"
 DocType: Production Order,Operation Cost,Operation Cost
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,Laadi käimist alates .csv faili
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Tasumata Amt
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Määra eesmärgid Punkt Group tark selle müügi isik.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Freeze Varud vanem kui [Päeva]
-apps/erpnext/erpnext/controllers/accounts_controller.py +528,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Rida # {0}: vara on kohustuslik põhivara ost / müük
+apps/erpnext/erpnext/controllers/accounts_controller.py +531,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Rida # {0}: vara on kohustuslik põhivara ost / müük
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Kui kaks või enam Hinnakujundus reeglid on vastavalt eespool nimetatud tingimustele, Priority rakendatakse. Prioriteet on number vahemikus 0 kuni 20, kui default väärtus on null (tühi). Suurem arv tähendab, et see on ülimuslik kui on mitu Hinnakujundus reeglite samadel tingimustel."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Fiscal Year: {0} ei ole olemas
 DocType: Currency Exchange,To Currency,Et Valuuta
@@ -3335,15 +3381,15 @@
 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
-DocType: Sales Invoice,Exhibition,Näitus
 apps/erpnext/erpnext/utilities/doctype/address/address.py +77,"Company is mandatory, as it is your company address","Firma on kohustuslik, kui see on teie ettevõte aadress"
 DocType: Item Attribute,From Range,Siit Range
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +81,Syntax error in formula or condition: {0},Süntaksi viga valemis või seisund: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +92,Syntax error in formula or condition: {0},Süntaksi viga valemis või seisund: {0}
 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"
+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 +28,Jobs,Tööturg
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,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
@@ -3352,16 +3398,16 @@
 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 +763,Make Supplier Quotation,Tee Tarnija Tsitaat
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,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/controllers/sales_and_purchase_return.py +100,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 +42,Casual Leave,Casual Leave
+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
 DocType: Batch,Batch ID,Partii nr
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,Note: {0},Märkus: {0}
 ,Delivery Note Trends,Toimetaja märkus Trends
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +103,This Week's Summary,Nädala kokkuvõte
+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
 DocType: Student Group Creation Tool,Get Courses,saada Kursused
 DocType: GL Entry,Party,Osapool
@@ -3371,7 +3417,7 @@
 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 +59,Piecework,Tükitöö
+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: Task,Actual Time (in Hours),Tegelik aeg (tundides)
 DocType: Employee,History In Company,Ajalugu Company
@@ -3388,7 +3434,7 @@
 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.
 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 +162,Black,Black
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,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
@@ -3399,13 +3445,13 @@
 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 +69,Customer Id,Kliendi ID
+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
 DocType: Journal Entry Account,Exchange Rate,Vahetuskurss
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Sales Order {0} is not submitted,Sales Order {0} ei ole esitatud
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +527,Sales Order {0} is not submitted,Sales Order {0} ei ole esitatud
 DocType: Homepage,Tag Line,tag Line
 DocType: Fee Component,Fee Component,Fee Component
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +857,Add items from,Lisa esemed
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +836,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}
 DocType: Cheque Print Template,Regular,regulaarne
 DocType: BOM,Last Purchase Rate,Viimati ostmise korral
@@ -3413,6 +3459,7 @@
 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"
 ,Sales Person-wise Transaction Summary,Müük isikuviisilist Tehing kokkuvõte
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +60,Cost Center is required for 'Profit and Loss' account {0}. Please set up a default Cost Center for the Company.,Kulukeskus on vajalik kasumi ja kahjumi &quot;kontole {0}. Palun luua vaikimisi Cost Center for Company.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,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
@@ -3423,12 +3470,12 @@
 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 +710,Online,Hetkel
+apps/erpnext/erpnext/accounts/page/pos/pos.js +692,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 +16,Setting this Address Template as default as there is no other default,Kui määrata Aadress Mall vaikimisi kuna puudub muu default
+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
 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 +74,Quality Management,Kvaliteedijuhtimine
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,Kvaliteedijuhtimine
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} has been disabled,Punkt {0} on keelatud
 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
@@ -3450,11 +3497,12 @@
 DocType: Student,Student Email ID,Student E-ID
 DocType: Employee,Notice (days),Teade (päeva)
 DocType: Tax Rule,Sales Tax Template,Sales Tax Mall
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1520,Select items to save the invoice,"Valige objekt, et salvestada arve"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1544,Select items to save the invoice,"Valige objekt, et salvestada arve"
 DocType: Employee,Encashment Date,Inkassatsioon kuupäev
 DocType: Account,Stock Adjustment,Stock reguleerimine
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Vaikimisi Tegevus Maksumus olemas Tegevuse liik - {0}
 DocType: Production Order,Planned Operating Cost,Planeeritud töökulud
+DocType: Academic Term,Term Start Date,Term Start Date
 apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},Saadame teile {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Bank avaldus tasakaalu kohta pearaamat
 DocType: Job Applicant,Applicant Name,Taotleja nimi
@@ -3484,17 +3532,17 @@
 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."
 DocType: Company,Distribution,Distribution
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +8,Amount Paid,Makstud summa
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Project Manager,Projektijuht
+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
 ,Quoted Item Comparison,Tsiteeritud Punkt võrdlus
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Dispatch,Dispatch
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,Dispatch
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,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."
-DocType: Sales Invoice,Supplier Reference,Tarnija Reference
-apps/erpnext/erpnext/accounts/page/pos/pos.js +844,"Master data syncing, it might take some time","Master andmete sünkroonimine, see võib võtta aega"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +832,"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
@@ -3508,7 +3556,7 @@
 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 +83,Error in formula or condition,Viga valemis või seisundi
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,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
@@ -3517,7 +3565,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},"Kuupäev peaks jääma eelarveaastal. Eeldades, et Date = {0}"
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Siin saate säilitada pikkus, kaal, allergia, meditsiini muresid etc"
 DocType: Leave Block List,Applies to Company,Kehtib Company
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +197,Cannot cancel because submitted Stock Entry {0} exists,"Ei saa tühistada, sest esitatud Stock Entry {0} on olemas"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +198,Cannot cancel because submitted Stock Entry {0} exists,"Ei saa tühistada, sest esitatud Stock Entry {0} on olemas"
 DocType: Purchase Invoice,In Words,Sõnades
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,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
@@ -3527,14 +3575,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,Teie majandusaasta algab
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Asset Amortisatsiooniaruanne ja Kaalud
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +319,Amount {0} {1} transferred from {2} to {3},Summa {0} {1} ülekantud {2} kuni {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +322,Amount {0} {1} transferred from {2} to {3},Summa {0} {1} ülekantud {2} kuni {3}
 DocType: Sales Invoice,Get Advances Received,Saa ettemaksed
 DocType: Email Digest,Add/Remove Recipients,Add / Remove saajad
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +432,Transaction not allowed against stopped Production Order {0},Tehing ei ole lubatud vastu lõpetas tootmise Tellimus {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +437,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 +143,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 +652,Item variant {0} exists with same attributes,Punkt variant {0} on olemas sama atribuute
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Punkt variant {0} on olemas sama atribuute
+DocType: Leave Application,LAP/,LAP /
 DocType: Salary Slip,Salary Slip,Palgatõend
 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"
@@ -3542,12 +3591,12 @@
 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 +212,Warehouses with child nodes cannot be converted to ledger,Ladude tütartippu ei saa ümber arvestusraamatust
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +215,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: Employee Education,Employee Education,Töötajate haridus
-apps/erpnext/erpnext/public/js/controllers/transaction.js +866,It is needed to fetch Item Details.,"See on vajalik, et tõmbad Punkt Details."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +857,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
@@ -3557,14 +3606,14 @@
 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 +178,Invalid {0},Vale {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Sick Leave,Haiguslehel
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,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
 DocType: Warehouse,PIN,PIN
 DocType: Sales Invoice,Base Change Amount (Company Currency),Põhimuutus summa (firma Valuuta)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +313,No accounting entries for the following warehouses,No raamatupidamise kanded järgmiste laod
-apps/erpnext/erpnext/projects/doctype/project/project.js +102,Save the document first.,Säästa dokumendi esimene.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +314,No accounting entries for the following warehouses,No raamatupidamise kanded järgmiste laod
+apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Säästa dokumendi esimene.
 DocType: Account,Chargeable,Maksustatav
 DocType: Company,Change Abbreviation,Muuda lühend
 DocType: Expense Claim Detail,Expense Date,Kulu kuupäev
@@ -3577,10 +3626,9 @@
 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
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,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
 DocType: Appraisal,Appraisal Template,Hinnang Mall
 DocType: Item Group,Item Classification,Punkt klassifitseerimine
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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
@@ -3590,8 +3638,8 @@
 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 +940,Please select {0} first,Palun valige {0} Esimene
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +749,Batch {0} of Item {1} has expired.,Partii {0} Punkt {1} on aegunud.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +953,Please select {0} first,Palun valige {0} Esimene
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +757,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
@@ -3608,8 +3656,8 @@
 {% 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 +92,Warehouse not found in the system,Ladu ei leitud süsteemis
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +106,This Month's Summary,Selle kuu kokkuvõte
+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
 DocType: Quality Inspection Reading,Quality Inspection Reading,Quality Inspection Reading
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Freeze Varud Vanemad Than` peab olema väiksem kui% d päeva.
 DocType: Tax Rule,Purchase Tax Template,Ostumaks Mall
@@ -3619,24 +3667,25 @@
 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 +87,Please set Next Depreciation Date,Palun määra Järgmine kulum kuupäev
-DocType: Payment Gateway,Payment Gateway,Payment Gateway
 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 +378,Operation Time must be greater than 0 for Operation {0},Tööaeg peab olema suurem kui 0 operatsiooni {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +380,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
 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)
 DocType: Program,Program Abbreviation,programm lühend
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,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: Appraisal,Start Date,Algus kuupä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
@@ -3649,21 +3698,22 @@
 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"
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Nt. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +27,Transaction currency must be same as Payment Gateway currency,Tehingu vääring peab olema sama Payment Gateway valuuta
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Transaction currency must be same as Payment Gateway currency,Tehingu vääring peab olema sama Payment Gateway valuuta
 DocType: Payment Entry,Receive,Saama
+apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,Tsitaadid:
 DocType: Maintenance Visit,Fully Completed,Täielikult täidetud
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Complete
 DocType: Employee,Educational Qualification,Haridustsensus
 DocType: Workstation,Operating Costs,Tegevuskulud
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,"Action, kui kogunenud Kuu eelarve ületatud"
 DocType: Purchase Invoice,Submit on creation,Esitada kohta loomine
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +432,Currency for {0} must be {1},Valuuta eest {0} peab olema {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +435,Currency for {0} must be {1},Valuuta eest {0} peab olema {1}
 DocType: Asset,Disposal Date,müügikuupäevaga
 DocType: Employee Leave Approver,Employee Leave Approver,Töötaja Jäta Approver
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,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 +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/crm/doctype/opportunity/opportunity.py +79,"Cannot declare as lost, because Quotation has been made.","Ei saa kuulutada kadunud, sest Tsitaat on tehtud."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Ostu Master Manager
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +429,Production Order {0} must be submitted,Tootmine Tellimus {0} tuleb esitada
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +434,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
@@ -3673,25 +3723,27 @@
 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
 DocType: Price List,Price List Name,Hinnakiri nimi
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +181,Totals,Summad
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,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 +113,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 +120,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
 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.
+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 +181,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/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 +793,All records are synced.,Kõik andmed on sünkroniseerida.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +781,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
 DocType: Cost Center,Cost Center Name,Kuluüksus nimi
@@ -3710,21 +3762,20 @@
 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/selling/doctype/quotation/quotation.py +49,Cannot set as Lost as Sales Order is made.,"Ei saa määrata, kui on kaotatud Sales Order on tehtud."
-DocType: Student Applicant,Mother's Name,Ema nimi
 DocType: Request for Quotation Item,Supplier Part No,Tarnija osa pole
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +348,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Ei saa maha arvata, kui kategooria on &quot;Hindamine&quot; või &quot;Vaulation ja kokku&quot;"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Received From,Saadud
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Received From,Saadud
 DocType: Lead,Converted,Converted
 DocType: Item,Has Serial No,Kas Serial No
 DocType: Employee,Date of Issue,Väljastamise kuupäev
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{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 +93,Row {0}: Hours value must be greater than zero.,Rida {0}: Tundi väärtus peab olema suurem kui null.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +117,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
 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 +172,{0} {1} does not exist,{0} {1} ei eksisteeri
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +175,{0} {1} does not exist,{0} {1} ei eksisteeri
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,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 +72,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
@@ -3733,13 +3784,14 @@
 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/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
 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 +109,Electrical,Elektriline
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Electrical,Elektriline
 DocType: Stock Entry,Total Value Difference (Out - In),Kokku Väärtus Difference (Out - In)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,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}
@@ -3747,7 +3799,7 @@
 DocType: Item,Customer Code,Kliendi kood
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +210,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 +292,Debit To account must be a Balance Sheet account,Kanne konto peab olema bilansis
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Stock Assets
@@ -3759,11 +3811,11 @@
 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 +301,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 +313,Salary Slip of employee {0} already created for time sheet {1},Palgatõend töötaja {0} on juba loodud ajaandmik {1}
 DocType: Sales Order Item,Ordered Qty,Tellitud Kogus
-apps/erpnext/erpnext/stock/doctype/item/item.py +673,Item {0} is disabled,Punkt {0} on keelatud
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,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 +838,BOM does not contain any stock item,Bom ei sisalda laoartikkel
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +809,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.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Loo palgalehed
@@ -3771,34 +3823,34 @@
 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)
-apps/erpnext/erpnext/stock/doctype/item/item.py +485,Row #{0}: Please set reorder quantity,Row # {0}: määrake reorganiseerima kogusest
+DocType: Sales Invoice Timesheet,Billing Hours,Arved Tundi
+apps/erpnext/erpnext/stock/doctype/item/item.py +487,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 +62,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
+DocType: Payment Entry,Allocate Payment Amount,Eraldada Makse summa
 DocType: Employee External Work History,Salary,Palk
 DocType: Serial No,Delivery Document Type,Toimetaja Dokumendi liik
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Esita kõik palgalehed eespool valitud kriteeriumid
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} Kirjed sünkroniseerida
 DocType: Sales Order,Partly Delivered,Osaliselt Tarnitakse
-DocType: Sales Invoice,Existing Customer,Olemasolev klient
 DocType: Email Digest,Receivables,Nõuded
+DocType: Lead Source,Lead Source,plii Allikas
 DocType: Customer,Additional information regarding the customer.,Lisainfot kliendile.
 DocType: Quality Inspection Reading,Reading 5,Lugemine 5
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +38,Campaign Name is required,Kampaania nimi on nõutav
 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 alguses või lõppkuupäev kattub {0}. Et vältida määrake ettevõte
+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/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 +129,BOM and Manufacturing Quantity are required,Bom ja tootmine Kogus on vajalik
+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/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Vananemine Range 2
 DocType: SG Creation Tool Course,Max Strength,max Strength
-DocType: Bank Reconciliation Detail,Amount,Summa
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Bom asendatakse
 ,Sales Analytics,Müük Analytics
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +113,Available {0},Saadaval {0}
@@ -3806,14 +3858,14 @@
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Seadistamine E-
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +96,Please enter default currency in Company Master,Palun sisesta vaikimisi valuuta Company Master
 DocType: Stock Entry Detail,Stock Entry Detail,Stock Entry Detail
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +100,Daily Reminders,Daily meeldetuletused
+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/account/account_tree.js +23,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 +71,Customer Service,Kasutajatugi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Customer Service,Kasutajatugi
 DocType: Homepage Featured Product,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.
@@ -3822,8 +3874,9 @@
 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
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Vaikimisi Work In Progress Warehouse
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1570,Total nos of serial no is not equal to quantity.,Kokku nos serial no ei ole võrdne kogus.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1594,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
 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
@@ -3831,9 +3884,10 @@
 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 +82,Engineer,Insener
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,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 +370,Item Code required at Row No {0},Kood nõutav Row No {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +398,Item Code required at Row No {0},Kood nõutav Row No {0}
 DocType: Sales Partner,Partner Type,Partner Type
 DocType: Purchase Taxes and Charges,Actual,Tegelik
 DocType: Authorization Rule,Customerwise Discount,Customerwise Soodus
@@ -3849,16 +3903,18 @@
 DocType: BOM,Raw Material Cost,Tooraine hind
 DocType: Item Reorder,Re-Order Level,Re-Order Level
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Sisesta esemed ja planeeritud Kogus, mille soovite tõsta tootmise tellimuste või laadida tooraine analüüsi."
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +55,Part-time,Poole kohaga
+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
 DocType: Employee,Applicable Holiday List,Rakendatav Holiday nimekiri
 DocType: Employee,Cheque,Tšekk
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Seeria Uuendatud
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +57,Series Updated,Seeria Uuendatud
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Aruande tüüp on kohustuslik
 DocType: Item,Serial Number Series,Serial Number Series
 apps/erpnext/erpnext/buying/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 +87,Clearance Date updated,Kliirens Date updated
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Edukalt Lepitatud
@@ -3872,7 +3928,7 @@
 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 +513,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 +518,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."
@@ -3882,7 +3938,7 @@
 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/stock/doctype/stock_entry/stock_entry.py +158,Target warehouse in row {0} must be same as Production Order,Target ladu rida {0} peab olema sama Production Telli
+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
 DocType: Company,Round Off Account,Ümardada konto
@@ -3891,23 +3947,22 @@
 DocType: Customer Group,Parent Customer Group,Parent Kliendi Group
 DocType: Purchase Invoice,Contact Email,Kontakt E-
 DocType: Appraisal Goal,Score Earned,Skoor Teenitud
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Notice Period,Etteteatamistähtaeg
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,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 +4,New Sales Person Name,Uus Sales Person Nimi
 DocType: Packing Slip,Gross Weight UOM,Gross Weight UOM
-DocType: Email Digest,Receivables / Payables,Nõuded / kohustused
 DocType: Delivery Note Item,Against Sales Invoice,Vastu müügiarve
 DocType: Bin,Reserved Qty for Production,Reserveeritud Kogus Production
 DocType: Asset,Frequency of Depreciation (Months),Sagedus kulum (kuud)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +469,Credit Account,Konto kreeditsaldoga
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Credit Account,Konto kreeditsaldoga
 DocType: Landed Cost Item,Landed Cost Item,Maandus kuluartikkel
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +55,Show zero values,Näita null väärtused
+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
 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 +647,Please specify Attribute Value for attribute {0},Palun täpsustage omadus Väärtus atribuut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Palun täpsustage omadus Väärtus atribuut {0}
 DocType: Item,Default Warehouse,Vaikimisi Warehouse
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +39,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
@@ -3929,19 +3984,22 @@
 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
-DocType: Sales Invoice,Cold Calling,Cold calling
 DocType: SMS Parameter,SMS Parameter,SMS Parameeter
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,Eelarve ja Kulukeskus
 DocType: Maintenance Schedule Item,Half Yearly,Pooleaastane
 DocType: Lead,Blog Subscriber,Blogi Subscriber
+DocType: Guardian,Alternate Number,Alternate arv
 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.
+DocType: Stock Reconciliation Item,Quantity Difference,Kogus Difference
 apps/erpnext/erpnext/config/hr.py +253,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 +141,Set as Lost,Määra Lost
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,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 +5,This is based on transactions against this Customer. See timeline below for details,See põhineb tehingute vastu Klient. Vaata ajakava allpool lähemalt
 DocType: Supplier,Credit Days Based On,"Krediidi päeva jooksul, olenevalt"
@@ -3953,12 +4011,11 @@
 ,Items To Be Requested,"Esemed, mida tuleb taotleda"
 DocType: Purchase Order,Get Last Purchase Rate,Võta Viimati ostmise korral
 DocType: Company,Company Info,Firma Info
-apps/erpnext/erpnext/accounts/page/pos/pos.js +941,Select or add new customer,Valige või lisage uus klient
+apps/erpnext/erpnext/accounts/page/pos/pos.js +930,Select or add new customer,Valige või lisage uus klient
 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 +5,This is based on the attendance of this Employee,See põhineb käimist selle töötaja
-DocType: Sales Invoice,Frequency,sagedus
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +463,Debit Account,Deebetsaldoga konto
-DocType: Fiscal Year,Year Start Date,Aasta Start Date
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,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."
@@ -3966,27 +4023,27 @@
 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 +210,Supplier Quotation {0} created,Tarnija Tsitaat {0} loodud
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +208,Supplier Quotation {0} created,Tarnija Tsitaat {0} loodud
 apps/erpnext/erpnext/accounts/report/financial_statements.py +90,End Year cannot be before Start Year,End Aasta ei saa enne Start Aasta
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Employee Benefits,Töövõtjate hüvitised
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,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 +228,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 +232,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 +499,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 +500,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 +1007,Price List not found or disabled,Hinnakiri ei leitud või puudega
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1008,Price List not found or disabled,Hinnakiri ei leitud või puudega
 DocType: Expense Claim,Approved,Kinnitatud
 DocType: Pricing Rule,Price,Hind
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +244,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 +256,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
@@ -3997,12 +4054,12 @@
 DocType: Address,Office,Kontor
 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 +259,Please select Employee Record first.,Palun valige Töötaja Record esimene.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +266,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 +190,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 +235,Please enter Expense Account,Palun sisestage ärikohtumisteks
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,Please enter Expense Account,Palun sisestage ärikohtumisteks
 DocType: Account,Stock,Varu
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,"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 +976,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",Rida # {0}: Reference Document Type peab olema üks ostutellimustest ostuarve või päevikusissekanne
 DocType: Employee,Current Address,Praegune aadress
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Kui objekt on variant teise elemendi siis kirjeldus, pilt, hind, maksud jne seatakse malli, kui ei ole märgitud"
 DocType: Serial No,Purchase / Manufacture Details,Ostu / Tootmine Detailid
@@ -4017,9 +4074,10 @@
 DocType: Asset Movement,Transaction Date,Tehingu kuupäev
 DocType: Production Plan Item,Planned Qty,Planeeritud Kogus
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,Kokku maksu-
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,For Quantity (Manufactured Qty) is mandatory,Sest Kogus (Toodetud Kogus) on kohustuslik
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,For Quantity (Manufactured Qty) is mandatory,Sest Kogus (Toodetud Kogus) on kohustuslik
 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 +78,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: Production Order,Actual Start Date,Tegelik Start Date
@@ -4034,9 +4092,11 @@
 DocType: Warranty Claim,If different than customer address,Kui teistsugune kui klient aadress
 DocType: BOM Operation,BOM Operation,Bom operatsiooni
 DocType: Purchase Taxes and Charges,On Previous Row Amount,On eelmise rea summa
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +226,Transfer Asset,Transfer Asset
+DocType: Student,Home Address,Kodu aadress
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +227,Transfer Asset,Transfer Asset
 DocType: POS Profile,POS Profile,POS profiili
 apps/erpnext/erpnext/config/schools.py +33,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 +129,"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
@@ -4046,8 +4106,8 @@
 DocType: Assessment,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 +765,Material to Supplier,Materjal Tarnija
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +189,Excise Invoice,Aktsiisi Arve
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,Material to Supplier,Materjal Tarnija
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,Aktsiisi Arve
 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
@@ -4057,7 +4117,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,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: Scheduling Tool,Scheduling Tool,Ajastus Tool
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +136,Credit Card,Krediitkaart
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,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.
 DocType: Purchase Invoice,Next Date,Järgmine kuupäev
@@ -4065,6 +4125,7 @@
 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: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Siin saate säilitada pere detailid nagu nimi ja amet vanem, abikaasa ja lapsed"
+DocType: Academic Term,Term End Date,Term End Date
 DocType: Hub Settings,Seller Name,Müüja Nimi
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Maksude ja tasude maha (firma Valuuta)
 DocType: Item Group,General Settings,General Settings
@@ -4076,7 +4137,7 @@
 DocType: Customer,Commission Rate,Komisjonitasu määr
 apps/erpnext/erpnext/stock/doctype/item/item.js +261,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 +115,"Payment Type must be one of Receive, Pay and Internal Transfer","Makse tüüp peab olema üks vastuvõtmine, palk ja Internal Transfer"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +118,"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/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Ostukorv on tühi
 DocType: Production Order,Actual Operating Cost,Tegelik töökulud
@@ -4091,10 +4152,10 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,Palun valige csv faili
 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 +92,Designer,Projekteerija
+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
 DocType: Serial No,Delivery Details,Toimetaja detailid
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +469,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}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +472,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
 ,Item-wise Purchase Register,Punkt tark Ostu Registreeri
 DocType: Batch,Expiry Date,Aegumisaja
@@ -4104,12 +4165,12 @@
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Projekti kapten.
 apps/erpnext/erpnext/controllers/status_updater.py +174,"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 +417, (Half Day),(Pool päeva)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425, (Half Day),(Pool päeva)
 DocType: Supplier,Credit Days,Krediidi päeva
 DocType: Leave Type,Is Carry Forward,Kas kanda
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +740,Get Items from BOM,Võta Kirjed Bom
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +711,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 +549,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/controllers/accounts_controller.py +552,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
 ,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
diff --git a/erpnext/translations/fa.csv b/erpnext/translations/fa.csv
index bd0ca17..91cb5ab 100644
--- a/erpnext/translations/fa.csv
+++ b/erpnext/translations/fa.csv
@@ -18,11 +18,10 @@
 DocType: Sales Partner,Dealer,دلال
 DocType: Employee,Rented,اجاره
 DocType: Purchase Order,PO-,PO-
-apps/erpnext/erpnext/accounts/report/financial_statements.py +19,Start Year {0} not found.,شروع سال {0} یافت نشد.
 DocType: POS Profile,Applicable for User,قابل استفاده برای کاربر
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +191,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",متوقف سفارش تولید نمی تواند لغو شود، آن را اولین Unstop برای لغو
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +197,Do you really want to scrap this asset?,آیا شما واقعا می خواهید به قراضه این دارایی؟
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +17,Select Default Supplier,کننده پیش فرض انتخاب کنید
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +192,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",متوقف سفارش تولید نمی تواند لغو شود، آن را اولین Unstop برای لغو
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +198,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 +36,Currency is required for Price List {0},برای اطلاع از قیمت ارز مورد نیاز است {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* * * * آیا می شود در معامله محاسبه می شود.
 DocType: Address,County,شهرستان
@@ -42,46 +41,45 @@
 DocType: Sales Invoice,Customer Name,نام مشتری
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +126,Bank account cannot be named as {0},حساب بانکی می تواند به عنوان نمی شود به نام {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,سر (یا گروه) که در برابر مطالب حسابداری ساخته شده است و توازن حفظ می شوند.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +180,Outstanding for {0} cannot be less than zero ({1}),برجسته برای {0} نمی تواند کمتر از صفر ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,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 +148,Series Updated Successfully,سری به روز رسانی با موفقیت
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +149,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,همه با منبع تماس با
-DocType: Quality Inspection Reading,Parameter,پارامتر
 apps/erpnext/erpnext/projects/doctype/project/project.py +54,Expected End Date can not be less than Expected Start Date,انتظار می رود تاریخ پایان نمی تواند کمتر از حد انتظار تاریخ شروع
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,ردیف # {0}: نرخ باید به همان صورت {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +239,New Leave Application,جدید مرخصی استفاده
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,New Leave Application,جدید مرخصی استفاده
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +20,Attendance Record {0} exists against Student {1} for Course Schedule {2},رکورد حضور {0} در برابر دانشجویی {1} وجود دارد برای برنامه البته {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Bank Draft,حواله بانکی
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,حواله بانکی
 DocType: Mode of Payment Account,Mode of Payment Account,نحوه حساب پرداخت
 apps/erpnext/erpnext/stock/doctype/item/item.js +52,Show Variants,نمایش انواع
 DocType: Academic Term,Academic Term,ترم تحصیلی
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +13,Material,ماده
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Quantity,مقدار
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +511,Accounts table cannot be blank.,جدول حسابها نمی تواند خالی باشد.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +616,Quantity,مقدار
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +512,Accounts table cannot be blank.,جدول حسابها نمی تواند خالی باشد.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,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/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 +142,User {0} is already assigned to Employee {1},کاربر {0} در حال حاضر به کارکنان اختصاص داده {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,بهداشت و درمان
-DocType: Purchase Invoice,Monthly,ماهیانه
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),تاخیر در پرداخت (روز)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +771,Invoice,فاکتور
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +750,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 +198,Row {0}: {1} {2} does not match with {3},ردیف {0}: {1} {2} با مطابقت ندارد {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,ردیف # {0}:
+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 +127,Please select Price List,لطفا لیست قیمت را انتخاب کنید
@@ -112,8 +110,8 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,همان شرکت است وارد بیش از یک بار
 DocType: Employee,Married,متاهل
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},برای مجاز نیست {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +589,Get items from,گرفتن اقلام از
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +382,Stock cannot be updated against Delivery Note {0},سهام می تواند در برابر تحویل توجه نمی شود به روز شده {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,گرفتن اقلام از
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,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,خواربار
@@ -122,7 +120,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 +156,Salary Structure Missing,گمشده ساختار حقوق و دستمزد
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Salary Structure Missing,گمشده ساختار حقوق و دستمزد
 DocType: Lead,Person Name,نام شخص
 DocType: Sales Invoice Item,Sales Invoice Item,مورد فاکتور فروش
 DocType: Account,Credit,اعتبار
@@ -130,10 +128,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 +156,Credit limit has been crossed for customer {0} {1}/{2},حد اعتبار شده است برای مشتری عبور {0} {1} / {2}
-apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",&quot;آیا دارایی ثابت&quot; نمی تواند بدون کنترل، به عنوان رکورد دارایی در برابر مورد موجود است
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +189,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; نمی تواند بدون کنترل، به عنوان رکورد دارایی در برابر مورد موجود است
 DocType: Tax Rule,Tax Type,نوع مالیات
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +144,You are not authorized to add or update entries before {0},شما مجاز به اضافه و یا به روز رسانی مطالب قبل از {0} نیستید
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},شما مجاز به اضافه و یا به روز رسانی مطالب قبل از {0} نیستید
 DocType: Item,Item Image (if not slideshow),مورد تصویر (در صورت اسلاید نمی شود)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,مشتری با همین نام وجود دارد
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(یک ساعت یک نرخ / 60) * * * * واقعی زمان عمل
@@ -143,18 +142,17 @@
 DocType: Student Log,Student Log,ورود دانشجو
 DocType: Quality Inspection,Get Specification Details,دریافت اطلاعات بیشتر مشخصات
 DocType: Lead,Interested,علاقمند
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +165,Opening,افتتاح
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,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/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ضوابط&gt; ضوابط گروه&gt; قلمرو
 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.,حساب با معامله موجود می تواند به گروه تبدیل نمی کند.
 DocType: Lead,Product Enquiry,پرس و جو محصولات
 DocType: Academic Term,Schools,مدارس
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,لطفا ابتدا وارد شرکت
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Company first,لطفا ابتدا شرکت را انتخاب کنید
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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,هزینه کل
@@ -164,7 +162,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,بیانیه ای از حساب
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,داروسازی
 DocType: Purchase Invoice Item,Is Fixed Asset,است دارائی های ثابت
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Available qty is {0}, you need {1}",تعداد موجود است {0}، شما نیاز {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +225,"Available qty is {0}, you need {1}",تعداد موجود است {0}، شما نیاز {1}
 DocType: Expense Claim Detail,Claim Amount,مقدار ادعا
 DocType: Employee,Mr,آقای
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,نوع منبع / تامین کننده
@@ -173,25 +171,26 @@
 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: Assessment Result,Grade,مقطع تحصیلی
 DocType: Sales Invoice Item,Delivered By Supplier,تحویل داده شده توسط کننده
 DocType: SMS Center,All Contact,همه تماس
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Annual Salary,حقوق سالانه
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,هزینه سهام
-apps/erpnext/erpnext/accounts/report/financial_statements.py +22,End Year {0} not found.,پایان سال {0} یافت نشد.
 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}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,عرضه مواد اولیه برای خرید
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +130,At least one mode of payment is required for POS invoice.,باید حداقل یک حالت پرداخت برای فاکتور POS مورد نیاز است.
 DocType: Products Settings,Show Products as a List,نمایش محصولات به عنوان یک فهرست
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records",دانلود الگو، داده مناسب پر کنید و ضمیمه فایل تغییر یافتهاست. همه تاریخ و کارمند ترکیبی در دوره زمانی انتخاب شده در قالب آمده، با سوابق حضور و غیاب موجود
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +451,Item {0} is not active or end of life has been reached,مورد {0} غیر فعال است و یا پایان زندگی رسیده است
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +456,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/controllers/accounts_controller.py +614,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",شامل مالیات در ردیف {0} در مورد نرخ، مالیات در ردیف {1} باید گنجانده شود
+apps/erpnext/erpnext/controllers/accounts_controller.py +617,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",شامل مالیات در ردیف {0} در مورد نرخ، مالیات در ردیف {1} باید گنجانده شود
 apps/erpnext/erpnext/config/hr.py +166,Settings for HR Module,تنظیمات برای ماژول HR
 DocType: SMS Center,SMS Center,مرکز SMS
 DocType: Sales Invoice,Change Amount,تغییر مقدار
@@ -203,13 +202,13 @@
 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 +147,Execution,اعدام
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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,اقلام و قیمت گذاری
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},کل ساعت: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},از تاریخ باید در سال مالی باشد. با فرض از تاریخ = {0}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,Cost Center {0} does not belong to Company {1},هزینه مرکز {0} به شرکت تعلق ندارد {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +100,Cost Center {0} does not belong to Company {1},هزینه مرکز {0} به شرکت تعلق ندارد {1}
 DocType: Customer,Individual,فردی
 DocType: Interest,Academics User,دانشگاهیان کاربر
 DocType: Cheque Print Template,Amount In Figure,مقدار در شکل
@@ -225,30 +224,32 @@
 DocType: Production Planning Tool,Sales Orders,سفارشات فروش
 DocType: Purchase Taxes and Charges,Valuation,ارزیابی
 ,Purchase Order Trends,خرید سفارش روند
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,The request for quotation can be accessed by clicking on the following link,درخواست برای نقل قول می توان با کلیک بر روی لینک زیر قابل دسترسی
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,اختصاص برگ برای سال.
 DocType: SG Creation Tool Course,SG Creation Tool Course,SG ایجاد ابزار دوره
 DocType: Student Group Creation Tool,Leave blank if you wish to fetch all courses for selected academic term,خالی بگذارید اگر شما مایل به واکشی تمام دوره های آموزشی برای ترم تحصیلی انتخاب
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,Insufficient Stock,سهام کافی
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227,Insufficient Stock,سهام کافی
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,برنامه ریزی ظرفیت غیر فعال کردن و ردیابی زمان
+DocType: Email Digest,New Sales Orders,جدید سفارشات فروش
 DocType: Bank Reconciliation,Bank Account,حساب بانکی
 DocType: Leave Type,Allow Negative Balance,اجازه می دهد تراز منفی
 DocType: Selling Settings,Default Territory,منطقه پیش فرض
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,تلویزیون
 DocType: Production Order Operation,Updated via 'Time Log',به روز شده از طریق &#39;زمان ورود &quot;
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} does not belong to Company {1},حساب {0} به شرکت {1} تعلق ندارد
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +86,Account {0} does not belong to Company {1},حساب {0} به شرکت {1} تعلق ندارد
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},مقدار پیش نمی تواند بیشتر از {0} {1}
 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 +174,For Warehouse is required before Submit,ذخیره سازی قبل از ارسال مورد نیاز است
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,For Warehouse is required before Submit,ذخیره سازی قبل از ارسال مورد نیاز است
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,دریافت در
 DocType: Sales Partner,Reseller,نمایندگی فروش
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,لطفا شرکت وارد
 DocType: Delivery Note Item,Against Sales Invoice Item,در برابر آیتم فاکتور فروش
 ,Production Orders in Progress,سفارشات تولید در پیشرفت
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Cash from Financing,نقدی خالص از تامین مالی
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1436,"LocalStorage is full , did not save",LocalStorage را کامل است، نجات نداد
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1460,"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}
@@ -261,18 +262,19 @@
 apps/erpnext/erpnext/templates/generators/item.html +78,No description given,بدون شرح داده می شود
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,درخواست برای خرید.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +5,This is based on the Time Sheets created against this project,این است که در ورق زمان ایجاد در برابر این پروژه بر اساس
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Only the selected Leave Approver can submit this Leave Application,فقط تصویب مرخصی انتخاب می توانید از این مرخصی استفاده کنید
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +213,Only the selected Leave Approver can submit this Leave Application,فقط تصویب مرخصی انتخاب می توانید از این مرخصی استفاده کنید
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,تسکین تاریخ باید بیشتر از تاریخ پیوستن شود
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Leaves per Year,برگ در سال
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,برگ در سال
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,ردیف {0}: لطفا بررسی کنید آیا پیشرفته در برابر حساب {1} در صورتی که این یک ورودی پیش است.
 apps/erpnext/erpnext/stock/utils.py +188,Warehouse {0} does not belong to company {1},انبار {0} به شرکت تعلق ندارد {1}
+DocType: Email Digest,Profit & Loss,سود و زیان
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,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 +435,Leave Blocked,ترک مسدود
-apps/erpnext/erpnext/stock/doctype/item/item.py +669,Item {0} has reached its end of life on {1},مورد {0} به پایان زندگی بر روی رسید {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +443,Leave Blocked,ترک مسدود
+apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item {0} has reached its end of life on {1},مورد {0} به پایان زندگی بر روی رسید {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +95,Bank Entries,مطالب بانک
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +83,Annual,سالیانه
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +86,Annual,سالیانه
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,مورد سهام آشتی
 DocType: Stock Entry,Sales Invoice No,فاکتور فروش بدون
 DocType: Material Request Item,Min Order Qty,حداقل تعداد سفارش
@@ -280,20 +282,22 @@
 DocType: Lead,Do Not Contact,آیا تماس با نه
 apps/erpnext/erpnext/public/js/setup_wizard.js +360,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 +91,Software Developer,نرم افزار توسعه
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,نرم افزار توسعه
 DocType: Item,Minimum Order Qty,حداقل تعداد سفارش تعداد
 DocType: Pricing Rule,Supplier Type,نوع منبع
 DocType: Scheduling Tool,Course Start Date,البته تاریخ شروع
 DocType: Item,Publish in Hub,انتشار در توپی
+DocType: Student Admission,Student Admission,پذیرش دانشجو
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is cancelled,مورد {0} لغو شود
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Material Request,درخواست مواد
+apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} is cancelled,مورد {0} لغو شود
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +823,Material Request,درخواست مواد
 DocType: Bank Reconciliation,Update Clearance Date,به روز رسانی ترخیص کالا از تاریخ
 apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +28,Abbreviation already used for another salary component,مخفف در حال حاضر برای جزء حقوق و دستمزد دیگری استفاده
 DocType: Item,Purchase Details,جزئیات خرید
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +328,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},مورد {0} در &#39;مواد اولیه عرضه شده جدول در سفارش خرید یافت نشد {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +333,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},مورد {0} در &#39;مواد اولیه عرضه شده جدول در سفارش خرید یافت نشد {1}
 DocType: Employee,Relation,ارتباط
 DocType: Shipping Rule,Worldwide Shipping,حمل و نقل در سراسر جهان
+DocType: Student Guardian,Mother,مادر
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,تایید سفارشات از مشتریان.
 DocType: Purchase Receipt Item,Rejected Quantity,تعداد رد
 DocType: SMS Settings,SMS Sender Name,نام فرستنده SMS
@@ -309,20 +313,21 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +130,Please select Charge Type first,لطفا ابتدا شارژ نوع را انتخاب کنید
 DocType: Student Group Student,Student Group Student,دانشجویی گروه دانشجویی
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,آخرین
+DocType: Email Digest,New Quotations,نقل قول جدید
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,اولین تصویب مرخصی در لیست خواهد شد به عنوان پیش فرض مرخصی تصویب مجموعه
 DocType: Tax Rule,Shipping County,حمل و نقل شهرستان
 apps/erpnext/erpnext/config/desktop.py +158,Learn,فرا گرفتن
 DocType: Asset,Next Depreciation Date,بعدی تاریخ استهلاک
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,هزینه فعالیت به ازای هر کارمند
 DocType: Accounts Settings,Settings for Accounts,تنظیمات برای حساب
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +626,Supplier Invoice No exists in Purchase Invoice {0},کننده فاکتور بدون در خرید فاکتور وجود دارد {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +629,Supplier Invoice No exists in Purchase Invoice {0},کننده فاکتور بدون در خرید فاکتور وجود دارد {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,فروش شخص درخت را مدیریت کند.
 DocType: Job Applicant,Cover Letter,جلد نامه
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,چک برجسته و سپرده برای روشن
 DocType: Item,Synced With Hub,همگام سازی شده با توپی
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,رمز اشتباه
 DocType: Item,Variant Of,نوع از
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,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 +86,Circular Reference Error,خطا مرجع مدور
@@ -334,15 +339,16 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,با رایانامه آگاه کن در ایجاد درخواست مواد اتوماتیک
 DocType: Journal Entry,Multi Currency,چند ارز
 DocType: Payment Reconciliation Invoice,Invoice Type,فاکتور نوع
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +806,Delivery Note,رسید
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +800,Delivery Note,رسید
 apps/erpnext/erpnext/config/learn.py +87,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 +233,Payment Entry has been modified after you pulled it. Please pull it again.,ورود پرداخت اصلاح شده است پس از آن کشیده شده است. لطفا آن را دوباره بکشید.
+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/setup/doctype/email_digest/email_digest.py +104,Summary for this week and pending activities,خلاصه برای این هفته و فعالیت های انتظار
+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 با کاما جدا شده، فاکتور به صورت خودکار در تاریخ خاص فرستاده
 DocType: Employee,Company Email,شرکت پست الکترونیک
@@ -354,27 +360,28 @@
 apps/erpnext/erpnext/config/hr.py +186,"Employee designation (e.g. CEO, Director etc.).",طراحی کارمند (به عنوان مثال مدیر عامل و غیره).
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,لطفا وارد کنید &#39;تکرار در روز از ماه مقدار فیلد
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,سرعت که در آن مشتریان ارز به ارز پایه مشتری تبدیل
-apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},ردیف # {0}: خرید فاکتور می تواند در برابر یک دارایی موجود ساخته نمی شود {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +554,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},ردیف # {0}: خرید فاکتور می تواند در برابر یک دارایی موجود ساخته نمی شود {1}
 DocType: Item Tax,Tax Rate,نرخ مالیات
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} در حال حاضر برای کارکنان اختصاص داده {1} برای مدت {2} به {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +812,Select Item,انتخاب مورد
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +791,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/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,فاکتور خرید {0} در حال حاضر ارائه
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},ردیف # {0}: دسته ای بدون باید همان باشد {1} {2}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +143,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.,دسته ای (زیادی) از آیتم استفاده کنید.
 DocType: C-Form Invoice Detail,Invoice Date,تاریخ فاکتور
 DocType: GL Entry,Debit Amount,مقدار بدهی
 apps/erpnext/erpnext/accounts/party.py +242,There can only be 1 Account per Company in {0} {1},فقط می تواند وجود 1 حساب در هر شرکت می شود {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +4,Your email address,آدرس ایمیل شما
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +342,Please see attachment,لطفا پیوست را ببینید
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,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 +19,Setup Already Complete!!,راه اندازی در حال حاضر کامل!
 ,Finished Goods,محصولات تمام شده
 DocType: Delivery Note,Instructions,دستورالعمل
 DocType: Quality Inspection,Inspected By,بازرسی توسط
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,کننده&gt; نوع کننده
 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,اضافه کردن محصولات
@@ -388,29 +395,29 @@
 DocType: Currency Exchange,Currency Exchange,صرافی
 DocType: Purchase Invoice Item,Item Name,نام آیتم
 DocType: Authorization Rule,Approving User  (above authorized value),تصویب کاربر (بالاتر از ارزش مجاز)
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,میزان اعتبار
+DocType: Email Digest,Credit Balance,میزان اعتبار
 DocType: Employee,Widowed,بیوه
 DocType: Request for Quotation,Request for Quotation,درخواست برای نقل قول
 DocType: Salary Slip Timesheet,Working Hours,ساعات کاری
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,تغییر شروع / شماره توالی فعلی از یک سری موجود است.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.",اگر چند در قوانین قیمت گذاری ادامه غالب است، از کاربران خواسته به تنظیم اولویت دستی برای حل و فصل درگیری.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +736,Purchase Return,بازگشت خرید
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +715,Purchase Return,بازگشت خرید
 ,Purchase Register,خرید ثبت نام
 DocType: Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,اتهامات قابل اجرا
 DocType: Workstation,Consumable Cost,هزینه مصرفی
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +202,{0} ({1}) must have role 'Leave Approver',{0} ({1}) باید اجازه 'تایید و امضا مرخصی' را داشته باشید
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,{0} ({1}) must have role 'Leave Approver',{0} ({1}) باید اجازه 'تایید و امضا مرخصی' را داشته باشید
 DocType: Purchase Receipt,Vehicle Date,خودرو تاریخ
 DocType: Student Log,Medical,پزشکی
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,دلیل برای از دست دادن
-apps/erpnext/erpnext/accounts/utils.py +239,Allocated amount can not greater than unadjusted amount,مقدار اختصاص داده شده می توانید بیشتر از مقدار تعدیل نشده
+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,مقدار اختصاص داده شده می توانید بیشتر از مقدار تعدیل نشده
 DocType: Announcement,Receiver,گیرنده
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},ایستگاه های کاری در تاریخ زیر را به عنوان در هر فهرست تعطیلات بسته است: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,فرصت ها
 DocType: Employee,Single,تک
 DocType: Account,Cost of Goods Sold,هزینه کالاهای فروخته شده
 DocType: Purchase Invoice,Yearly,سالیانه
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +225,Please enter Cost Center,لطفا وارد مرکز هزینه
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,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,نام امتحان
@@ -423,26 +430,26 @@
 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,بررسی تولید کننده فاکتور شماره منحصر به فرد
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',مقدار'تا مورد شماره' نمی تواند کمتر از 'ازمورد شماره' باشد
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,Non Profit,غیر انتفاعی
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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: Stock Reconciliation Item,Do not include symbols (ex. $),هنوز علامت را شامل نمی شود (به عنوان مثال $)
 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 +638,Attribute {0} selected multiple times in Attributes Table,ویژگی {0} چند بار در صفات جدول انتخاب
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,ویژگی {0} چند بار در صفات جدول انتخاب
 DocType: HR Settings,Employee record is created using selected field. ,رکورد کارمند با استفاده از درست انتخاب شده ایجاد می شود.
 DocType: Sales Order,Not Applicable,قابل اجرا نیست
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,کارشناسی ارشد تعطیلات.
 DocType: Request for Quotation Item,Required Date,تاریخ مورد نیاز
 DocType: Delivery Note,Billing Address,نشانی صورتحساب
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +862,Please enter Item Code.,لطفا کد مورد را وارد کنید.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +847,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",در صورت انتخاب، میزان مالیات در نظر گرفته خواهد به عنوان در حال حاضر در چاپ نرخ / چاپ مقدار شامل
@@ -456,12 +463,12 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,اوراق بهادار و سپرده ها
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,مجموع برگ اختصاص داده الزامی است
 DocType: Job Opening,Description of a Job Opening,شرح یک شغل
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Pending activities for today,فعالیت های در انتظار برای امروز
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,فعالیت های در انتظار برای امروز
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,ثبت حضور و غیاب.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,کامپوننت حقوق و دستمزد حقوق و دستمزد بر اساس برنامه زمانی برای.
 DocType: Sales Order Item,Used for Production Plan,مورد استفاده برای طرح تولید
 DocType: Manufacturing Settings,Time Between Operations (in mins),زمان بین عملیات (در دقیقه)
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +92,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} بودجه برای حساب {1} در برابر هزینه مرکز {2} است {3}. آن خواهد شد توسط بیش از {4}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +95,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} بودجه برای حساب {1} در برابر هزینه مرکز {2} است {3}. آن خواهد شد توسط بیش از {4}
 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 ها انتخاب شده برای آیتم یکسان نیست
@@ -469,16 +476,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +238,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 +86,Administrative Officer,افسر اداری
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,افسر اداری
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +23,Acutal Qty {0} / Waiting Qty {1},Acutal تعداد {0} / انتظار تعداد {1}
 DocType: Timesheet Detail,Hrs,ساعت
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +319,Please select Company,لطفا انتخاب کنید شرکت
-DocType: Stock Entry,Difference Account,حساب تفاوت
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +309,Please select Company,لطفا انتخاب کنید شرکت
+DocType: Stock Entry Detail,Difference Account,حساب تفاوت
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,می توانید کار نزدیک به عنوان وظیفه وابسته به آن {0} بسته نشده است نیست.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Please enter Warehouse for which Material Request will be raised,لطفا انبار که درخواست مواد مطرح خواهد شد را وارد کنید
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +399,Please enter Warehouse for which Material Request will be raised,لطفا انبار که درخواست مواد مطرح خواهد شد را وارد کنید
 DocType: Production Order,Additional Operating Cost,هزینه های عملیاتی اضافی
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,آرایشی و بهداشتی
-apps/erpnext/erpnext/stock/doctype/item/item.py +530,"To merge, following properties must be same for both items",به ادغام، خواص زیر باید همین کار را برای هر دو مورد می شود
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,"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 +28,Buy,خرید
@@ -486,7 +493,7 @@
 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 +1563,Serial no item cannot be a fraction,سریال هیچ مورد نمی تواند کسری
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1587,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,مدیریت مقاطعه کاری فرعی
@@ -495,13 +502,14 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Account {0} does not belong to company: {1},حساب {0} به شرکت تعلق ندارد: {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation already used for another company,مخفف در حال حاضر برای یک شرکت دیگر مورد استفاده قرار گرفته است
 DocType: Selling Settings,Default Customer Group,گروه مشتری پیش فرض
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Supplier is required against Payable account {0},کننده به حساب پرداختنی مورد نیاز است {0}
 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
 DocType: Production Planning Tool,Material Requirement,مورد نیاز مواد
 DocType: Company,Delete Company Transactions,حذف معاملات شرکت
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +313,Reference No and Reference Date is mandatory for Bank transaction,مرجع و تاریخ در مرجع برای معامله بانک الزامی است
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +316,Reference No and Reference Date is mandatory for Bank transaction,مرجع و تاریخ در مرجع برای معامله بانک الزامی است
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,افزودن / ویرایش مالیات ها و هزینه ها
 DocType: Purchase Invoice,Supplier Invoice No,تامین کننده فاکتور بدون
 DocType: Territory,For reference,برای مرجع
@@ -512,7 +520,6 @@
 DocType: Installation Note Item,Installation Note Item,نصب و راه اندازی توجه داشته باشید مورد
 DocType: Production Plan Item,Pending Qty,انتظار تعداد
 DocType: Budget,Ignore,نادیده گرفتن
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,کد کالا&gt; مورد گروه&gt; نام تجاری
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,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,برنامه زمانی حقوق و دستمزد لغزش
@@ -523,11 +530,11 @@
 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/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,هیچ ثبتی یافت نشد در جدول فاکتور
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +28,Please select Company and Party Type first,لطفا ابتدا شرکت و حزب نوع را انتخاب کنید
+apps/erpnext/erpnext/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/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 +707,Make Sales Order,را سفارش فروش
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +701,Make Sales Order,را سفارش فروش
 DocType: Project Task,Project Task,وظیفه پروژه
 ,Lead Id,کد شناسایی راهبر
 DocType: C-Form Invoice Detail,Grand Total,بزرگ ها
@@ -543,7 +550,8 @@
 DocType: Job Applicant,Resume Attachment,پیوست رزومه
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,مشتریان تکرار
 DocType: Leave Control Panel,Allocate,اختصاص دادن
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +734,Sales Return,برگشت فروش
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +728,Sales Return,برگشت فروش
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +91,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,توجه: مجموع برگ اختصاص داده {0} نباید کمتر از برگ حال حاضر مورد تایید {1} برای دوره
 DocType: Announcement,Posted By,ارسال شده توسط
 DocType: Item,Delivered by Supplier (Drop Ship),تحویل داده شده توسط کننده (قطره کشتی)
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,پایگاه داده از مشتریان بالقوه است.
@@ -552,14 +560,13 @@
 DocType: Quotation,Quotation To,نقل قول برای
 DocType: Lead,Middle Income,با درآمد متوسط
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +212,Opening (Cr),افتتاح (CR)
-apps/erpnext/erpnext/stock/doctype/item/item.py +795,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,واحد اندازه گیری پیش فرض برای مورد {0} می توانید به طور مستقیم نمی توان تغییر چون در حال حاضر ساخته شده برخی از معامله (ها) با UOM است. شما نیاز به ایجاد یک آیتم جدید به استفاده از پیش فرض UOM متفاوت است.
-apps/erpnext/erpnext/accounts/utils.py +237,Allocated amount can not be negative,مقدار اختصاص داده شده نمی تونه منفی
+apps/erpnext/erpnext/stock/doctype/item/item.py +797,Default Unit of Measure for Item {0} cannot be changed directly because 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,مقدار اختصاص داده شده نمی تونه منفی
 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 +91,Reference No & Reference Date is required for {0},مرجع بدون مرجع و تاریخ مورد نیاز است برای {0}
-DocType: Sales Invoice,Customer's Vendor,فروشنده مشتری
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Proposal Writing,نوشتن طرح های پیشنهادی
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,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",اگر برای مواردی که زیر قرارداد خواهد شد در درخواست مواد شامل بررسی، مواد اولیه
@@ -568,13 +575,14 @@
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,پیگیری زمان
 DocType: Fiscal Year Company,Fiscal Year Company,شرکت سال مالی
 DocType: Packing Slip Item,DN Detail,جزئیات DN
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +257,Already supplier quotation has created,در حال حاضر گزینه نقل قول ایجاد کرده است
 DocType: Timesheet,Billed,فاکتور شده
 DocType: Batch,Batch Description,دسته توضیحات
+apps/erpnext/erpnext/accounts/utils.py +685,"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 +733,View Offline Records,نمایش آفلاین سوابق
+apps/erpnext/erpnext/accounts/page/pos/pos.js +715,View Offline Records,نمایش آفلاین سوابق
+DocType: Student,Sibling Details,جزییات خواهر و برادر
 DocType: Employee,Reason for Resignation,دلیل استعفای
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,الگو برای ارزیابی عملکرد.
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,فاکتور / مجله ورود به جزئیات
@@ -588,7 +596,7 @@
 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,تغییر خالص در پرسشنامه
 DocType: Employee,Passport Number,شماره پاسپورت
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Manager,مدیر
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,مدیر
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,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,"""بر اساس"" و ""گروه شده توسط"" نمی توانند همسان باشند"
@@ -597,10 +605,11 @@
 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 +299,Timesheet created:,برنامه زمانی ایجاد شده:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +715,Please set default Cash or Bank account in Mode of Payment {0},لطفا نقدی پیش فرض و یا حساب بانکی در نحوه پرداخت را تعیین {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +300,Timesheet created:,برنامه زمانی ایجاد شده:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +772,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,ثبت نام کردن
 DocType: Selling Settings,Customer Naming By,نامگذاری مشتری توسط
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,لطفا کارمند راه اندازی نامگذاری سیستم در منابع انسانی&gt; تنظیمات HR
 DocType: Depreciation Schedule,Depreciation Amount,مقدار استهلاک
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,تبدیل به گروه
 DocType: Activity Cost,Activity Type,نوع فعالیت
@@ -625,6 +634,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,پایان
 DocType: Pricing Rule,Sales Manager,مدیر فروش
 DocType: Salary Structure Employee,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,حساب کاهش / افزایش در دفع دارایی
@@ -639,11 +649,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +9,Pre Sales,پیش فروش
 DocType: Purchase Receipt,Other Details,سایر مشخصات
 DocType: Account,Accounts,حساب ها
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Marketing,بازار یابی
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +227,Payment Entry is already created,ورود پرداخت در حال حاضر ایجاد
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,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 +538,Row #{0}: Asset {1} does not linked to Item {2},ردیف # {0}: دارایی {1} به مورد در ارتباط نیست {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +21,Preview Salary Slip,پیش نمایش لغزش حقوق
+apps/erpnext/erpnext/controllers/accounts_controller.py +541,Row #{0}: Asset {1} does not linked to Item {2},ردیف # {0}: دارایی {1} به مورد در ارتباط نیست {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +38,Preview Salary Slip,پیش نمایش لغزش حقوق
 DocType: Company,Deafult Cost Center,هزینه مرکز Deafult
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +48,Account {0} has been entered multiple times,حساب {0} وارد شده است چندین بار
 DocType: Account,Expenses Included In Valuation,هزینه های موجود در ارزش گذاری
@@ -652,7 +662,7 @@
 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 +617,Item has variants.,فقره انواع.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,فقره انواع.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,مورد {0} یافت نشد
 DocType: Bin,Stock Value,سهام ارزش
 apps/erpnext/erpnext/accounts/doctype/account/account.py +25,Company {0} does not exist,شرکت {0} وجود ندارد
@@ -672,7 +682,7 @@
 DocType: Purchase Order,Supply Raw Materials,تامین مواد اولیه
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,از تاریخ فاکتور بعدی تولید خواهد شد. این است که در ارائه تولید می شود.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,دارایی های نقد
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,{0} is not a stock Item,{0}  یک آیتم انباری نیست
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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 +169,Lead must be set if Opportunity is made from Lead,سرب باید مجموعه اگر فرصت است از سرب ساخته شده
@@ -739,26 +749,25 @@
 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 +709,No Permission,بدون اجازه
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +710,No Permission,بدون اجازه
 DocType: Company,Default Bank Account,به طور پیش فرض حساب بانکی
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",برای فیلتر کردن بر اساس حزب، حزب انتخاب نوع اول
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},'به روز رسانی موجودی'نمی تواند انتخاب شود ، زیرا موارد از طریق تحویل نمی {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,شماره
 DocType: Item,Items with higher weightage will be shown higher,پاسخ همراه با بین وزنها بالاتر خواهد بود بالاتر نشان داده شده است
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,جزئیات مغایرت گیری بانک
-apps/erpnext/erpnext/controllers/accounts_controller.py +542,Row #{0}: Asset {1} must be submitted,ردیف # {0}: دارایی {1} باید ارائه شود
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,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 را بارگذاری کنید.
 DocType: Warehouse,Tree Details,جزییات درخت
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,در حال حاضر ارسال
 ,Support Analytics,تجزیه و تحلیل ترافیک پشتیبانی
 DocType: Item,Website Warehouse,انبار وب سایت
 DocType: Payment Reconciliation,Minimum Invoice Amount,حداقل مبلغ فاکتور
 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/sales_invoice/sales_invoice.py +227,Timesheet {0} is already completed or cancelled,برنامه زمانی {0} است در حال حاضر تکمیل و یا لغو
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +259,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 است
@@ -774,13 +783,13 @@
 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 +229,Target Warehouse,هدف انبار
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +230,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-,STE-
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Sales Order Date,انتظار می رود تاریخ تحویل نمی تواند قبل از سفارش فروش تاریخ است
 DocType: Upload Attendance,Import Attendance,واردات حضور و غیاب
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,همه گروه مورد
+apps/erpnext/erpnext/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/config/setup.py +89,Automatically compose message on submission of transactions.,به طور خودکار نگارش پیام در ارائه معاملات.
@@ -792,13 +801,15 @@
 DocType: Sales Invoice,Payment Due Date,پرداخت با توجه تاریخ
 apps/erpnext/erpnext/stock/doctype/item/item.js +278,Item Variant {0} already exists with same attributes,مورد متغیر {0} در حال حاضر با ویژگی های همان وجود دارد
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;افتتاح&#39;
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,گسترش برای این کار
 DocType: Notification Control,Delivery Note Message,تحویل توجه داشته باشید پیام
 DocType: Expense Claim,Expenses,مخارج
 DocType: Item Variant Attribute,Item Variant Attribute,مورد متغیر ویژگی
 ,Purchase Receipt Trends,روند رسید خرید
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Research & Development,تحقیق و توسعه
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,تحقیق و توسعه
 ,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,قیمت و یا تخفیف
@@ -807,7 +818,7 @@
 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/controllers/accounts_controller.py +340,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",ورود پرداخت {0} است که در برابر سفارش {1}، بررسی کنید که آن را باید به عنوان پیش در این فاکتور کشیده مرتبط است.
+apps/erpnext/erpnext/controllers/accounts_controller.py +343,"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,نقطه از فروش
@@ -829,12 +840,12 @@
 DocType: Supplier Quotation,Is Subcontracted,آیا واگذار شده
 DocType: Item Attribute,Item Attribute Values,مقادیر ویژگی مورد
 DocType: Examination Result,Examination Result,نتیجه آزمون
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +756,Purchase Receipt,رسید خرید
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +735,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 +167,Reference Doctype must be one of {0},مرجع DOCTYPE باید یکی از شود {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +282,Unable to find Time Slot in the next {0} days for Operation {1},قادر به پیدا کردن شکاف زمان در آینده {0} روز برای عملیات {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +170,Reference Doctype must be one of {0},مرجع DOCTYPE باید یکی از شود {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Unable to find Time Slot in the next {0} days for Operation {1},قادر به پیدا کردن شکاف زمان در آینده {0} روز برای عملیات {1}
 DocType: Production Order,Plan material for sub-assemblies,مواد را برای طرح زیر مجموعه
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,شرکای فروش و منطقه
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be active,BOM {0} باید فعال باشد
@@ -845,7 +856,7 @@
 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 +214,Warehouses with existing transaction can not be converted to ledger.,انبارها با معامله موجود می توانید به دفتر تبدیل نمی کند.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +217,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,سفارشات تولید
@@ -859,9 +870,9 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,کارمند {0} غیر فعال است و یا وجود ندارد
 DocType: Fee Structure,Components,اجزاء
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,Please enter Asset Category in Item {0},لطفا دارایی رده در آیتم را وارد کنید {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +612,Item Variants {0} updated,مورد انواع {0} به روز شده
+apps/erpnext/erpnext/stock/doctype/item/item.py +614,Item Variants {0} updated,مورد انواع {0} به روز شده
 DocType: Quality Inspection Reading,Reading 6,خواندن 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +843,Cannot {0} {1} {2} without any negative outstanding invoice,آیا می توانم {0} {1} {2} بدون هیچ فاکتور برجسته منفی
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +854,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,همگام سازی در حال حاضر
@@ -876,69 +887,72 @@
 DocType: Item,Is Purchase Item,آیا مورد خرید
 DocType: Asset,Purchase Invoice,فاکتورخرید
 DocType: Stock Ledger Entry,Voucher Detail No,جزئیات کوپن بدون
-apps/erpnext/erpnext/accounts/page/pos/pos.js +728,New Sales Invoice,جدید فاکتور فروش
+apps/erpnext/erpnext/accounts/page/pos/pos.js +710,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 +728,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: Cheque Print Template,Has Print Format,است چاپ فرمت
-apps/erpnext/erpnext/accounts/page/pos/pos.js +86, is mandatory. Maybe Currency Exchange record is not created for ,این مورد الزامی است. شاید مقدار تبدیل ارز برایش ایجاد نشده است
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +109,Row #{0}: Please specify Serial No for Item {1},ردیف # {0}: لطفا سریال مشخص نیست برای مورد {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +619,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.",برای آیتم های &#39;محصولات بسته نرم افزاری، انبار، سریال و بدون دسته بدون خواهد شد از&#39; بسته بندی فهرست جدول در نظر گرفته. اگر انبار و دسته ای بدون برای همه آیتم ها بسته بندی مورد هر &#39;محصولات بسته نرم افزاری &quot;هستند، این ارزش ها را می توان در جدول آیتم های اصلی وارد شده، ارزش خواهد شد کپی شده به&#39; بسته بندی فهرست جدول.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +75, 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 +613,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing 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 +606,Supplier Invoice Date cannot be greater than Posting Date,تاریخ عرضه فاکتور نمی تواند بیشتر از ارسال تاریخ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +609,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: 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 +810,Select Item for Transfer,انتخاب مورد انتقال
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +789,Select Item for Transfer,انتخاب مورد انتقال
 DocType: Purchase Invoice,Additional Discount Percentage,تخفیف اضافی درصد
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,نمایش یک لیست از تمام فیلم ها کمک
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,انتخاب سر حساب بانکی است که چک نهشته شده است.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,کاربر مجاز به ویرایش لیست قیمت نرخ در معاملات
 DocType: Pricing Rule,Max Qty,حداکثر تعداد
-DocType: Student Applicant,Father's Name,نام پدر
 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 +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,ردیف {0}: پرداخت در مقابل فروش / سفارش خرید همیشه باید به عنوان پیش مشخص شده باشد
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,شیمیایی
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +686,All items have already been transferred for this Production Order.,همه موارد قبلا برای این سفارش تولید منتقل می شود.
+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} و دوباره سعی کنید
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +694,All items have already been transferred for this Production Order.,همه موارد قبلا برای این سفارش تولید منتقل می شود.
 DocType: Process Payroll,Select Payroll Year and Month,انتخاب سال و ماه حقوق و دستمزد
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,Meter,متر
 DocType: Workstation,Electricity Cost,هزینه برق
 DocType: HR Settings,Don't send Employee Birthday Reminders,آیا کارمند تولد یادآوری ارسال کنید
-DocType: Opportunity,Walk In,راه رفتن در
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,مطالب سهام
 DocType: Item,Inspection Criteria,معیار بازرسی
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,انتقال
 apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,آپلود سر نامه و آرم خود را. (شما می توانید آنها را بعد از ویرایش).
 DocType: Timesheet Detail,Bill,لایحه
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,White,سفید
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date is entered as past date,بعدی تاریخ استهلاک به عنوان تاریخ گذشته وارد
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +167,White,سفید
 DocType: SMS Center,All Lead (Open),همه سرب (باز)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +228,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),ردیف {0}: تعداد برای در دسترس نیست {4} در انبار {1} در زمان ارسال از ورود ({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}),ردیف {0}: تعداد برای در دسترس نیست {4} در انبار {1} در زمان ارسال از ورود ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,دریافت پیشرفت پرداخت
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +731,Make ,ساخت
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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 +154,Order Type must be one of {0},نوع سفارش باید یکی از است {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},نوع سفارش باید یکی از است {0}
 DocType: Lead,Next Contact Date,تماس با آمار بعدی
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,باز کردن تعداد
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +393,Please enter Account for Change Amount,لطفا حساب برای تغییر مقدار را وارد کنید
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,Please enter Account for Change Amount,لطفا حساب برای تغییر مقدار را وارد کنید
 DocType: Student Batch,Student Batch Name,دانشجو نام دسته ای
 DocType: Holiday List,Holiday List Name,نام فهرست تعطیلات
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js +8,Schedule Course,دوره برنامه
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Stock Options,گزینه های سهام
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,گزینه های سهام
 DocType: Journal Entry Account,Expense Claim,ادعای هزینه
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +211,Do you really want to restore this scrapped asset?,آیا شما واقعا می خواهید برای بازگرداندن این دارایی اوراق؟
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +237,Qty for {0},تعداد برای {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +212,Do you really want to restore this scrapped asset?,آیا شما واقعا می خواهید برای بازگرداندن این دارایی اوراق؟
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,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,ترک فهرست بلوک خرما
@@ -947,9 +961,9 @@
 DocType: Company,Default Terms,به طور پیش فرض شرایط
 DocType: Packing Slip Item,Packing Slip Item,بسته بندی مورد لغزش
 DocType: Purchase Invoice,Cash/Bank Account,نقد / حساب بانکی
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,موارد حذف شده بدون تغییر در مقدار یا ارزش.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,موارد حذف شده بدون تغییر در مقدار یا ارزش.
 DocType: Delivery Note,Delivery To,تحویل به
-apps/erpnext/erpnext/stock/doctype/item/item.py +635,Attribute table is mandatory,جدول ویژگی الزامی است
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,جدول ویژگی الزامی است
 DocType: Production Planning Tool,Get Sales Orders,دریافت سفارشات فروش
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} نمی تواند منفی باشد
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,لطفا یک دانشجو را انتخاب کنید
@@ -974,7 +988,7 @@
 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,انبار WIP
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},سریال بدون {0} است تحت قرارداد تعمیر و نگهداری تا {1}
+apps/erpnext/erpnext/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,نام سازمان
@@ -986,7 +1000,7 @@
 DocType: GL Entry,Against,در برابر
 DocType: Item,Default Selling Cost Center,مرکز هزینه پیش فرض فروش
 DocType: Sales Partner,Implementation Partner,شریک اجرای
-apps/erpnext/erpnext/controllers/selling_controller.py +231,Sales Order {0} is {1},سفارش فروش {0} است {1}
+apps/erpnext/erpnext/controllers/selling_controller.py +232,Sales Order {0} is {1},سفارش فروش {0} است {1}
 DocType: Opportunity,Contact Info,اطلاعات تماس
 apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,ساخت نوشته های سهام
 DocType: Packing Slip,Net Weight UOM,وزن خالص UOM
@@ -996,25 +1010,24 @@
 DocType: Holiday List,Get Weekly Off Dates,دریافت هفتگی فعال تاریخ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,تاریخ پایان نمی تواند کمتر از تاریخ شروع
 DocType: Sales Person,Select company name first.,انتخاب نام شرکت برای اولین بار.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Dr,دکتر
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Dr,دکتر
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,نقل قول از تولید کنندگان دریافت کرد.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},به {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,میانگین سن
 DocType: 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/templates/pages/home.html +32,View All Products,همه محصولات
+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 +400,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,هشدار: سیستم خواهد overbilling از مقدار برای مورد بررسی نمی {0} در {1} صفر است
+apps/erpnext/erpnext/controllers/accounts_controller.py +403,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/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,و سال:
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +191,{0} {1} must be submitted,{0} {1} باید قطعی شود
-DocType: Email Digest,Annual Expense,هزینه سالانه
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,{0} {1} must be submitted,{0} {1} باید قطعی شود
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +145,Quantity must be less than or equal to {0},تعداد باید کمتر یا مساوی به {0}
 DocType: SMS Center,Total Characters,مجموع شخصیت
 apps/erpnext/erpnext/controllers/buying_controller.py +156,Please select BOM in BOM field for Item {0},لطفا BOM BOM در زمینه برای مورد را انتخاب کنید {0}
@@ -1025,30 +1038,31 @@
 DocType: Sales Partner,Distributor,توزیع کننده
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,سبد خرید قانون حمل و نقل
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +211,Production Order {0} must be cancelled before cancelling this Sales Order,سفارش تولید {0} باید قبل از لغو این سفارش فروش لغو
-apps/erpnext/erpnext/public/js/controllers/transaction.js +62,Please set 'Apply Additional Discount On',لطفا &#39;درخواست تخفیف اضافی بر روی&#39;
+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,از محدوده است که به کمتر از به محدوده
 DocType: Global Defaults,Global Defaults,به طور پیش فرض جهانی
 apps/erpnext/erpnext/projects/doctype/project/project.py +153,Project Collaboration Invitation,پروژه دعوت همکاری
 DocType: Salary Slip,Deductions,کسر
+DocType: Leave Allocation,LAL/,LAL /
 apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,سال شروع
 DocType: Purchase Invoice,Start date of current invoice's period,تاریخ دوره صورتحساب فعلی شروع
 DocType: Salary Slip,Leave Without Pay,ترک کنی بدون اینکه پرداخت
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +327,Capacity Planning Error,ظرفیت خطا برنامه ریزی
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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 +362,Finished Item {0} must be entered for Manufacture type entry,مورد به پایان رسید {0} باید برای ورود نوع ساخت وارد
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +367,Finished Item {0} must be entered for Manufacture type entry,مورد به پایان رسید {0} باید برای ورود نوع ساخت وارد
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,باز کردن تعادل حسابداری
 DocType: Sales Invoice Advance,Sales Invoice Advance,فاکتور فروش پیشرفته
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +499,Nothing to request,هیچ چیز برای درخواست
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +500,Nothing to request,هیچ چیز برای درخواست
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','تاریخ شروع واقعی' نمی تواند دیرتر از 'تاریخ پایان واقعی' باشد
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Management,اداره
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},در هر دو صورت بانکی و یا اعتباری مقدار مورد نیاز است برای {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,اداره
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +55,Either debit or credit amount is required for {0},در هر دو صورت بانکی و یا اعتباری مقدار مورد نیاز است برای {0}
 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 +161,Blue,ابی
+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 تنظیم
@@ -1058,12 +1072,12 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +23,POS Profile {0} already created for user: {1} and company {2},نمایش POS {0} در حال حاضر برای کاربر ایجاد: {1} و {2} شرکت
 DocType: Purchase Order Item,UOM Conversion Factor,UOM عامل تبدیل
 DocType: Stock Settings,Default Item Group,به طور پیش فرض مورد گروه
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1374,Do you really want to submit the invoice?,آیا شما واقعا می خواهید برای ارسال فاکتور؟
+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 +685,Cost Center For Item with Item Code ',مرکز مورد با کد آیتم های هزینه
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1526,"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 +679,Cost Center For Item with Item Code ',مرکز مورد با کد آیتم های هزینه
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1550,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",حالت پرداخت پیکربندی نشده است. لطفا بررسی کنید، آیا حساب شده است در حالت پرداخت و یا در POS مشخصات تعیین شده است.
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,فروشنده شما در این تاریخ برای تماس با مشتری یاداوری خواهد داشت
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,"Further accounts can be made under Groups, but entries can be made against non-Groups",حساب های بیشتر می تواند در زیر گروه ساخته شده، اما مطالب را می توان در برابر غیر گروه ساخته شده
 DocType: Lead,Lead,راهبر
@@ -1083,104 +1097,106 @@
 DocType: Payment Reconciliation,Unreconciled Payment Details,مشخصات پرداخت Unreconciled
 DocType: Global Defaults,Current Fiscal Year,سال مالی جاری
 DocType: Global Defaults,Disable Rounded Total,غیر فعال کردن گرد مجموع
-DocType: Lead,Call,دعوت
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +417,'Entries' cannot be empty,&#39;مطالب&#39; نمی تواند خالی باشد
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +418,'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 +214,Fiscal Year {0} not found,سال مالی {0} یافت نشد
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +221,Fiscal Year {0} not found,سال مالی {0} یافت نشد
 apps/erpnext/erpnext/config/hr.py +238,Setting up Employees,راه اندازی کارکنان
 DocType: Sales Order,SO-,بنابراین-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,لطفا ابتدا پیشوند انتخاب کنید
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Please select prefix first,لطفا ابتدا پیشوند انتخاب کنید
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Research,پژوهش
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,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 +43,Item {0} must be a non-stock item,مورد {0} باید یک آیتم غیر سهام شود
 DocType: Contact,User ID,ID کاربر
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +57,View Ledger,مشخصات لجر
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,قدیمیترین
-apps/erpnext/erpnext/stock/doctype/item/item.py +504,"An Item Group exists with same name, please change the item name or rename the item group",گروه مورد با همین نام وجود دارد، لطفا نام مورد تغییر یا تغییر نام گروه مورد
+apps/erpnext/erpnext/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 +437,Rest Of The World,بقیه دنیا
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,مورد {0} می تواند دسته ای ندارد
 ,Budget Variance Report,گزارش انحراف از بودجه
 DocType: Salary Slip,Gross Pay,پرداخت ناخالص
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +90,Row {0}: Activity Type is mandatory.,ردیف {0}: نوع فعالیت الزامی است.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +114,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/public/js/controllers/stock_controller.js +40,Accounting Ledger,حسابداری لجر
+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,سود انباشته
 DocType: BOM Item,Item Description,مورد توضیحات
+DocType: Student Sibling,Student Sibling,دانشجو خواهر و برادر
 DocType: Purchase Invoice,Is Recurring,تکرارشونده است
 DocType: Purchase Invoice,Supplied Items,اقلام عرضه
 DocType: Student,STUD.,گل میخ.
 DocType: Production Order,Qty To Manufacture,تعداد برای تولید
+DocType: Email Digest,New Income,درآمد جدید
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,حفظ همان نرخ در سراسر چرخه خرید
 DocType: Opportunity Item,Opportunity Item,مورد فرصت
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,افتتاح موقت
 ,Employee Leave Balance,کارمند مرخصی تعادل
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +131,Balance for Account {0} must always be {1},موجودی برای حساب {0} همیشه باید {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +175,Valuation Rate required for Item in row {0},نرخ ارزش گذاری مورد نیاز برای مورد در ردیف {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,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,به عنوان مثال: کارشناسی ارشد در رشته علوم کامپیوتر
 DocType: Purchase Invoice,Rejected Warehouse,انبار را رد کرد
 DocType: GL Entry,Against Voucher,علیه کوپن
 DocType: Item,Default Buying Cost Center,به طور پیش فرض مرکز هزینه خرید
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.",برای دریافت بهترین نتیجه را از ERPNext، توصیه می کنیم که شما را برخی از زمان و تماشای این فیلم ها به کمک.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +87, to ,به
+apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,به
 DocType: Item,Lead Time in days,سرب زمان در روز
 ,Accounts Payable Summary,خلاصه  حسابهای  پرداختنی
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Not authorized to edit frozen Account {0},مجاز به ویرایش منجمد حساب {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},مجاز به ویرایش منجمد حساب {0}
 DocType: Journal Entry,Get Outstanding Invoices,دریافت فاکتورها برجسته
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +62,Sales Order {0} is not valid,سفارش فروش {0} معتبر نیست
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,سفارش فروش {0} معتبر نیست
 apps/erpnext/erpnext/setup/doctype/company/company.py +185,"Sorry, companies cannot be merged",با عرض پوزش، شرکت ها نمی توانند با هم ادغام شدند
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +139,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",کل مقدار شماره / انتقال {0} در درخواست پاسخ به مواد {1} \ نمی تواند بیشتر از مقدار درخواست {2} برای مورد {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Small,کوچک
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,Small,کوچک
 DocType: Employee,Employee Number,شماره کارمند
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},مورد هیچ (بازدید کنندگان) در حال حاضر در حال استفاده است. سعی کنید از مورد هیچ {0}
 ,Invoiced Amount (Exculsive Tax),مقدار صورتحساب (Exculsive مالیات)
-DocType: Student Applicant,Mother's / Guardian 1 Email ID,/ نگهبان ID 1 ایمیل مادر
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,آیتم 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,سر حساب {0} ایجاد
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +160,Green,سبز
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,سبز
 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 +57,Contract,قرارداد
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,قرارداد
 DocType: Email Digest,Add Quote,افزودن پیشنهاد قیمت
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +498,UOM coversion factor required for UOM: {0} in Item: {1},عامل coversion UOM مورد نیاز برای UOM: {0} در مورد: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +503,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 +80,Row {0}: Qty is mandatory,ردیف {0}: تعداد الزامی است
+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 +737,Sync Master Data,همگام سازی داده های کارشناسی ارشد
+apps/erpnext/erpnext/accounts/page/pos/pos.js +719,Sync Master Data,همگام سازی داده های کارشناسی ارشد
 apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,محصولات  یا خدمات شما
 DocType: Mode of Payment,Mode of Payment,نحوه پرداخت
 apps/erpnext/erpnext/stock/doctype/item/item.py +178,Website Image should be a public file or website URL,وب سایت تصویر باید یک فایل عمومی و یا آدرس وب سایت می باشد
+DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,این یک گروه مورد ریشه است و نمی تواند ویرایش شود.
+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 +345,"{0}: Employee email not found, hence email not sent",{0}: ایمیل کارمند یافت نشد، از این رو ایمیل ارسال نمی
+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,آیا شرکت شما در نشانی
 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 +118,"For {0}, only credit accounts can be linked against another debit entry",برای {0}، تنها حساب های اعتباری می تواند در مقابل ورود بدهی دیگر مرتبط
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Delivery Note {0} is not submitted,تحویل توجه داشته باشید {0} است ارسال نشده
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Delivery Note {0} is not submitted,تحویل توجه داشته باشید {0} است ارسال نشده
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Sub-contracted Item,مورد {0} باید مورد-فرعی قرارداد است
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,تجهیزات سرمایه
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",قانون قیمت گذاری شده است برای اولین بار بر اساس انتخاب &#39;درخواست در&#39; درست است که می تواند مورد، مورد گروه و یا تجاری.
 DocType: Hub Settings,Seller Website,فروشنده وب سایت
 DocType: Item,ITEM-,آیتم
-apps/erpnext/erpnext/controllers/selling_controller.py +147,Total allocated percentage for sales team should be 100,درصد اختصاص داده ها را برای تیم فروش باید 100 باشد
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +110,Production Order status is {0},وضعیت سفارش تولید {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,درصد اختصاص داده ها را برای تیم فروش باید 100 باشد
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},وضعیت سفارش تولید {0}
 DocType: Appraisal Goal,Goal,هدف
 DocType: Sales Invoice Item,Edit Description,ویرایش توضیحات
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +757,For Supplier,منبع
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +723,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,درست چاپ فرمت
@@ -1196,10 +1212,11 @@
 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,کد کلاس
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ایمیل خلاصه:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +445,BOM {0} does not belong to Item {1},BOM {0} به مورد تعلق ندارد {1}
 DocType: Sales Partner,Target Distribution,توزیع هدف
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1667,Deafault warehouse is required for selected item,انبار Deafault برای آیتم انتخاب شده مورد نیاز است
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Deafault warehouse is required for selected item,انبار Deafault برای آیتم انتخاب شده مورد نیاز است
 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
@@ -1208,23 +1225,23 @@
 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 +110,Hardware,سخت افزار
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,سخت افزار
 DocType: Sales Order,Recurring Upto,در محدوده زمانی معین تا حد
 DocType: Attendance,HR Manager,مدیریت منابع انسانی
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,لطفا یک شرکت را انتخاب کنید
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Privilege Leave,امتیاز مرخصی
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,امتیاز مرخصی
 DocType: Purchase Invoice,Supplier Invoice Date,تامین کننده فاکتور عضویت
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,شما نیاز به فعال کردن سبد خرید هستید
 DocType: Payment Entry,Writeoff,تسویه حساب
 DocType: Appraisal Template Goal,Appraisal Template Goal,هدف ارزیابی الگو
-DocType: Salary Slip,Earning,سود
+DocType: Salary Component,Earning,سود
 DocType: Purchase Invoice,Party Account Currency,حزب حساب ارز
 ,BOM Browser,BOM مرورگر
 DocType: Purchase Taxes and Charges,Add or Deduct,اضافه کردن و یا کسر
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,شرایط با هم تداخل دارند بین:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +171,Against Journal Entry {0} is already adjusted against some other voucher,علیه مجله ورودی {0} در حال حاضر در برابر برخی از کوپن های دیگر تنظیم
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,علیه مجله ورودی {0} در حال حاضر در برابر برخی از کوپن های دیگر تنظیم
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,مجموع ارزش ترتیب
-apps/erpnext/erpnext/demo/setup_data.py +358,Food,غذا
+apps/erpnext/erpnext/demo/setup/setup_data.py +301,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/course_schedule/course_schedule.js +103,Mark Attendence,علامت گذاری به عنوان حضور و غیاب
@@ -1258,12 +1275,12 @@
 DocType: Sales Order Item,Planned Quantity,تعداد برنامه ریزی شده
 DocType: Purchase Invoice Item,Item Tax Amount,مبلغ مالیات مورد
 DocType: Item,Maintain Stock,حفظ سهام
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +209,Stock Entries already created for Production Order ,مطالب سهام در حال حاضر برای سفارش تولید ایجاد
+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,تغییر خالص دارائی های ثابت در
 DocType: Leave Control Panel,Leave blank if considered for all designations,خالی بگذارید اگر برای همه در نظر گرفته نامگذاریهای
-apps/erpnext/erpnext/controllers/accounts_controller.py +620,Charge of type 'Actual' in row {0} cannot be included in Item Rate,شارژ از نوع &#39;واقعی&#39; در ردیف {0} نمی تواند در مورد نرخ شامل
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,Max: {0},حداکثر: {0}
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +15,From Datetime,از تاریخ ساعت
+apps/erpnext/erpnext/controllers/accounts_controller.py +623,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 +239,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 +153,"Request for Quotation is disabled to access from portal, for more check portal settings.",درخواست برای نقل قول به دسترسی از پورتال غیر فعال است، برای اطلاعات بیشتر تنظیمات پورتال چک.
@@ -1271,8 +1288,8 @@
 DocType: Sales Invoice,Shipping Address Name,حمل و نقل آدرس
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,ساختار حسابها
 DocType: Material Request,Terms and Conditions Content,شرایط و ضوابط محتوا
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +552,cannot be greater than 100,نمی تواند بیشتر از ۱۰۰ باشد
-apps/erpnext/erpnext/stock/doctype/item/item.py +680,Item {0} is not a stock Item,مورد {0} است مورد سهام نمی
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +546,cannot be greater than 100,نمی تواند بیشتر از ۱۰۰ باشد
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is not a stock Item,مورد {0} است مورد سهام نمی
 DocType: Maintenance Visit,Unscheduled,برنامه ریزی
 DocType: Employee,Owned,متعلق به
 DocType: Salary Detail,Depends on Leave Without Pay,بستگی به مرخصی بدون حقوق
@@ -1286,10 +1303,9 @@
 DocType: GL Entry,GL Entry,GL ورود
 DocType: HR Settings,Employee Settings,تنظیمات کارمند
 ,Batch-Wise Balance History,دسته حکیم تاریخچه تعادل
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,فهرست کارهای
 apps/erpnext/erpnext/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 +61,Apprentice,شاگرد
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +102,Negative Quantity is not allowed,تعداد منفی مجاز نیست
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,شاگرد
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +103,Negative Quantity is not allowed,تعداد منفی مجاز نیست
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",مالیات جدول جزئیات ذهن از آیتم های کارشناسی ارشد به عنوان یک رشته و ذخیره شده در این زمینه. مورد استفاده برای مالیات و هزینه
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +152,Employee cannot report to himself.,کارمند نمی تواند به خود گزارش دهید.
@@ -1310,15 +1326,14 @@
 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 +141,Source warehouse is mandatory for row {0},انبار منبع برای ردیف الزامی است {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +719,Packing Slip,بسته بندی لغزش
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Source warehouse is mandatory for row {0},انبار منبع برای ردیف الزامی است {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +713,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/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,درخواست برای نقل قول می تواند دسترسی با کلیک روی لینک زیر
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,واردات نشد!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,بدون آدرس اضافه نشده است.
 DocType: Workstation Working Hour,Workstation Working Hour,ایستگاه های کاری کار یک ساعت
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Analyst,روانکاو
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,روانکاو
 DocType: Item,Inventory,فهرست
 DocType: Item,Sales Details,جزییات فروش
 DocType: Quality Inspection,QI-,QI-
@@ -1326,7 +1341,7 @@
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,در تعداد
 DocType: Notification Control,Expense Claim Rejected,ادعای هزینه رد
 DocType: Item Attribute,Item Attribute,صفت مورد
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +103,Government,دولت
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,دولت
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,نام موسسه
 apps/erpnext/erpnext/config/stock.py +289,Item Variants,انواع آیتم
 DocType: Company,Services,خدمات
@@ -1342,6 +1357,7 @@
 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/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,جریان وجوه نقد از سرمایه گذاری
 DocType: Program Course,Program Course,دوره برنامه
@@ -1382,12 +1398,12 @@
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,فهرست گیرنده خالی است. لطفا ایجاد فهرست گیرنده
 DocType: Production Plan Sales Order,Production Plan Sales Order,تولید برنامه سفارش فروش
 DocType: Sales Partner,Sales Partner Target,فروش شریک هدف
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +110,Accounting Entry for {0} can only be made in currency: {1},ثبت حسابداری برای {0} تنها می تواند در ارز ساخته شده است: {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},ثبت حسابداری برای {0} تنها می تواند در ارز ساخته شده است: {1}
 DocType: Pricing Rule,Pricing Rule,قانون قیمت گذاری
 DocType: Budget,Action if Annual Budget Exceeded,اکشن اگر بودجه سالانه بیش از حد
 apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,درخواست مواد به خرید سفارش
 DocType: Shopping Cart Settings,Payment Success URL,پرداخت موفقیت URL
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +78,Row # {0}: Returned Item {1} does not exists in {2} {3},ردیف # {0}: برگشتی مورد {1} در وجود دارد نمی {2} {3}
+apps/erpnext/erpnext/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,صورتحساب مغایرت گیری بانک
@@ -1396,40 +1412,39 @@
 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/stock/doctype/stock_entry/stock_entry.py +339,Not allowed to tranfer more {0} than {1} against Purchase Order {2},مجاز به tranfer تر {0} از {1} در برابر سفارش خرید {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +344,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 +545,Manufacturing Quantity is mandatory,ساخت تعداد الزامی است
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,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 +71,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 +162,Row {0}: From Time and To Time of {1} is overlapping with {2},ردیف {0}: از زمان و به زمان از {1} با هم تداخل دارند {2}
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +186,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,بدهی سهام
 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 +130,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 +137,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,سایر گزارش
 DocType: Dependent Task,Dependent Task,وظیفه وابسته
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,لطفا کارمند راه اندازی نامگذاری سیستم در منابع انسانی&gt; تنظیمات HR
 apps/erpnext/erpnext/stock/doctype/item/item.py +411,Conversion factor for default Unit of Measure must be 1 in row {0},عامل تبدیل واحد اندازه گیری پیش فرض از 1 باید در ردیف شود {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,Leave of type {0} cannot be longer than {1},مرخصی از نوع {0} نمی تواند بیش از {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +197,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 +921,Search Item,جستجو مورد
+apps/erpnext/erpnext/accounts/page/pos/pos.js +910,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 +546,Already completed,قبلا کامل شده
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +22,Payment Request already exists {0},درخواست پرداخت از قبل وجود دارد {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +550,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 +241,Quantity must not be more than {0},تعداد نباید بیشتر از {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Quantity must not be more than {0},تعداد نباید بیشتر از {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +76,Previous Financial Year is not closed,قبلی سال مالی بسته نشده است
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +44,Age (Days),سن (روز)
 DocType: Quotation Item,Quotation Item,مورد نقل قول
@@ -1446,7 +1461,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +221,Purchase Receipt {0} is not submitted,رسید خرید {0} است ارسال نشده
 DocType: Company,Default Payable Account,به طور پیش فرض پرداختنی حساب
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.",تنظیمات برای سبد خرید آنلاین مانند قوانین حمل و نقل، لیست قیمت و غیره
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +83,{0}% Billed,{0}٪ صورتحساب شد
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}٪ صورتحساب شد
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,این سایت متعلق به تعداد
 DocType: Party Account,Party Account,حساب حزب
 apps/erpnext/erpnext/config/setup.py +116,Human Resources,منابع انسانی
@@ -1458,12 +1473,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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 +22,Collect,جمع آوری
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,جمع آوری
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,Against Supplier Invoice {0} dated {1},در برابر تامین کننده فاکتور {0} تاریخ {1}
 DocType: Customer,Default Price List,به طور پیش فرض لیست قیمت
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +225,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: Payment Reconciliation,Payments,پرداخت
 DocType: Journal Entry,Entry Type,نوع ورودی
 ,Customer Credit Balance,تعادل اعتباری مشتری
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Payable,تغییر خالص در حساب های پرداختنی
@@ -1475,7 +1489,7 @@
 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 +9,Procurement,تهیه
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,هیچ یک از موارد هر گونه تغییر در مقدار یا ارزش.
+apps/erpnext/erpnext/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,ادعای گارانتی
 ,Lead Details,مشخصات راهبر
 DocType: Purchase Invoice,End date of current invoice's period,تاریخ پایان دوره صورتحساب فعلی
@@ -1500,7 +1514,7 @@
 DocType: Purchase Invoice,Additional Discount,تخفیف اضافی
 DocType: Selling Settings,Selling Settings,فروش تنظیمات
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,مزایده آنلاین
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +97,Please specify either Quantity or Valuation Rate or both,لطفا یا مقدار و یا نرخ گذاری و یا هر دو مشخص
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,لطفا یا مقدار و یا نرخ گذاری و یا هر دو مشخص
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +13,Fulfillment,انجام
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory",شرکت، ماه و سال مالی الزامی است
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,هزینه های بازاریابی
@@ -1521,14 +1535,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,ERPNext راه اندازی کامل!
 DocType: Item,Weightage,بین وزنها
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +93,A Customer Group exists with same name please change the Customer name or rename the Customer Group,یک گروه مشتری با نام مشابهی وجود دارد. لطا نام مشتری را تغییر دهید یا نام گروه مشتری را اصلاح نمایید.
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +126,A Customer Group exists with same name please change the Customer name or rename the Customer Group,یک گروه مشتری با نام مشابهی وجود دارد. لطا نام مشتری را تغییر دهید یا نام گروه مشتری را اصلاح نمایید.
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,تماس جدید
 DocType: Territory,Parent Territory,منطقه مرجع
 DocType: Quality Inspection Reading,Reading 2,خواندن 2
 DocType: Stock Entry,Material Receipt,دریافت مواد
 DocType: Homepage,Products,محصولات
 DocType: Announcement,Instructor,معلم
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},حزب نوع و حزب دریافتنی / حساب پرداختنی مورد نیاز است {0}
 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,بعد تماس با
@@ -1539,7 +1552,7 @@
 ,Item-wise Sales Register,مورد عاقلانه فروش ثبت نام
 DocType: Asset,Gross Purchase Amount,مبلغ خرید خالص
 DocType: Asset,Depreciation Method,روش استهلاک
-apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Offline,آفلاین
+apps/erpnext/erpnext/accounts/page/pos/pos.js +686,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,ضروری
@@ -1557,25 +1570,27 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +425,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 +858,Make Purchase Order,را سفارش خرید
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +852,Make Purchase Order,را سفارش خرید
 DocType: SMS Center,Send To,فرستادن به
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,There is not enough leave balance for Leave Type {0},است تعادل مرخصی به اندازه کافی برای مرخصی نوع وجود ندارد {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,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 +172,Work-in-Progress Warehouse is required before Submit,کار در حال پیشرفت انبار قبل از ارسال مورد نیاز است
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,Work-in-Progress Warehouse is required before Submit,کار در حال پیشرفت انبار قبل از ارسال مورد نیاز است
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,متقاضی برای یک کار.
 DocType: Purchase Order Item,Warehouse and Reference,انبار و مرجع
 DocType: Supplier,Statutory info and other general information about your Supplier,اطلاعات قانونی و دیگر اطلاعات کلی در مورد تامین کننده خود را
-apps/erpnext/erpnext/hooks.py +88,Addresses,نشانی ها
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,کننده&gt; نوع کننده
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +212,Against Journal Entry {0} does not have any unmatched {1} entry,علیه مجله ورودی {0} هیچ بی بدیل {1} ورود ندارد
+apps/erpnext/erpnext/hooks.py +95,Addresses,نشانی ها
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +215,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,لطفا فیلتر بر اساس مورد یا انبار مجموعه
 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,برای ارائه و بیل
@@ -1583,11 +1598,10 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} must be submitted,BOM {0} باید ارائه شود
 DocType: Authorization Control,Authorization Control,کنترل مجوز
 apps/erpnext/erpnext/controllers/buying_controller.py +300,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},ردیف # {0}: رد انبار در برابر رد مورد الزامی است {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +731,Payment,پرداخت
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,Payment,پرداخت
 DocType: Production Order Operation,Actual Time and Cost,زمان و هزینه های واقعی
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},درخواست مواد از حداکثر {0} را می توان برای مورد {1} در برابر سفارش فروش ساخته شده {2}
 DocType: Employee,Salutation,سلام
-DocType: Pricing Rule,Brand,مارک
 DocType: Course,Course Abbreviation,مخفف دوره
 DocType: Item,Will also apply for variants,همچنین برای انواع اعمال می شود
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +142,"Asset cannot be cancelled, as it is already {0}",دارایی نمی تواند لغو شود، آن است که در حال حاضر {0}
@@ -1599,7 +1613,7 @@
 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.",لیست محصولات و یا خدمات خود را که شما خرید و یا فروش. مطمئن شوید برای بررسی گروه مورد، واحد اندازه گیری و خواص دیگر زمانی که شما شروع می شود.
 DocType: Hub Settings,Hub Node,مرکز گره
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,شما وارد آیتم های تکراری شده اید   لطفا تصحیح و دوباره سعی کنید.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Associate,وابسته
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,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,ایجاد فهرست گیرنده
@@ -1607,7 +1621,7 @@
 DocType: Production Planning Tool,Material Requests,درخواست مواد
 DocType: Warranty Claim,Issue Date,تاریخ صدور
 DocType: Activity Cost,Activity Cost,هزینه فعالیت
-DocType: Timesheet Detail,Timesheet Detail,جزئیات برنامه زمانی
+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),نشان می دهد که بسته به بخشی از این تحویل (فقط پیش نویس) است
@@ -1630,6 +1644,7 @@
 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,دارای انواع
 DocType: Monthly Distribution,Name of the Monthly Distribution,نام توزیع ماهانه
 DocType: Sales Person,Parent Sales Person,شخص پدر و مادر فروش
@@ -1642,30 +1657,31 @@
 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 +44,"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/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.,به عبارت قابل مشاهده خواهد بود زمانی که به فاکتور فروش را نجات دهد.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +502,Error: {0} &gt; {1},خطا: {0}&gt; {1}
 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.,تاریخ شروع ترم نمی تواند زودتر از تاریخ سال شروع سال تحصیلی که مدت مرتبط است باشد (سال تحصیلی {}). لطفا تاریخ های صحیح و دوباره امتحان کنید.
 DocType: Naming Series,Current Value,ارزش فعلی
-apps/erpnext/erpnext/controllers/accounts_controller.py +235,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,سال مالی متعدد برای تاریخ {0} وجود داشته باشد. لطفا شرکت راه در سال مالی
+apps/erpnext/erpnext/controllers/accounts_controller.py +238,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 +458,Item table can not be blank,جدول مورد نمیتواند خالی باشد
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +443,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 +5,This is based on stock movement. See {0} for details,این است که در جنبش سهام است. مشاهده {0} برای جزئیات
 DocType: Pricing Rule,Selling,فروش
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +341,Amount {0} {1} deducted against {2},مقدار {0} {1} کسر شود {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +344,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,تاریخ را نمی توان قبل از ارسال تاریخ
@@ -1680,8 +1696,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +144,Cannot refer row number greater than or equal to current row number for this Charge type,می توانید تعداد ردیف بزرگتر یا مساوی به تعداد سطر فعلی برای این نوع شارژ مراجعه نمی
 DocType: Asset,Sold,فروخته شده
 ,Item-wise Purchase History,تاریخچه خرید مورد عاقلانه
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Red,قرمز
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},لطفا بر روی &#39;ایجاد برنامه &quot;کلیک کنید و به واکشی سریال بدون برای مورد اضافه شده است {0}
+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,سفارشات تولید گسترش
 DocType: Sales Invoice Payment,Base Amount (Company Currency),مقدار پایه (شرکت ارز)
@@ -1689,7 +1705,7 @@
 DocType: Installation Note,Installation Time,زمان نصب و راه اندازی
 DocType: Sales Invoice,Accounting Details,جزئیات حسابداری
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,حذف تمام معاملات این شرکت
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +187,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,ردیف # {0}: عملیات {1} برای {2} تعداد کالا به پایان رسید در تولید تکمیل مرتب # {3}. لطفا وضعیت عملیات به روز رسانی از طریق زمان گزارش ها
+apps/erpnext/erpnext/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}. لطفا وضعیت عملیات به روز رسانی از طریق زمان گزارش ها
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,سرمایه گذاری
 DocType: Issue,Resolution Details,جزییات قطعنامه
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,تخصیص
@@ -1725,16 +1741,17 @@
 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}
 DocType: Delivery Note,Excise Page Number,مالیات کالاهای داخلی صفحه شماره
 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),واقعی پایان تاریخ (از طریق زمان ورق)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Amount {0} {1} against {2} {3},مقدار {0} {1} در برابر {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +339,Amount {0} {1} against {2} {3},مقدار {0} {1} در برابر {2} {3}
 ,Quotation Trends,روند نقل قول
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},مورد گروه در مورد استاد برای آیتم ذکر نشده {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +295,Debit To account must be a Receivable account,بدهی به حساب باید یک حساب کاربری دریافتنی است
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Receivable account,بدهی به حساب باید یک حساب کاربری دریافتنی است
 DocType: Shipping Rule Condition,Shipping Amount,مقدار حمل و نقل
 ,Pending Amount,در انتظار مقدار
 DocType: Purchase Invoice Item,Conversion Factor,عامل تبدیل
@@ -1742,10 +1759,10 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +137,Expected value after useful life must be greater than or equal to {0},مقدار مورد انتظار پس از عمر مفید باید بزرگتر یا مساوی به {0}
 DocType: Purchase Receipt,Vehicle Number,تعداد خودرو
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,از تاریخ تکرار می شود فاکتور را متوقف خواهد کرد
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +90,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,مجموع برگ اختصاص داده {0} نمی تواند کمتر از برگ حال حاضر مورد تایید {1} برای دوره
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +93,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 +22,Enter Paid Amount,مبلغ پرداخت را وارد کنید
+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
@@ -1755,13 +1772,15 @@
 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 +524,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",ردیف # {0}: تعداد باید 1 باشد، به عنوان مورد دارایی ثابت است. لطفا ردیف جداگانه برای تعداد متعدد استفاده کنید.
+apps/erpnext/erpnext/controllers/accounts_controller.py +527,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",ردیف # {0}: تعداد باید 1 باشد، به عنوان مورد دارایی ثابت است. لطفا ردیف جداگانه برای تعداد متعدد استفاده کنید.
 DocType: Leave Block List Allow,Leave Block List Allow,ترک فهرست بلوک اجازه
 apps/erpnext/erpnext/setup/doctype/company/company.py +249,Abbr can not be blank or space,مخفف نمیتواند خالی یا 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/stock/get_item_details.py +123,Please specify Company,لطفا شرکت مشخص
 ,Customer Acquisition and Loyalty,مشتری خرید و وفاداری
@@ -1772,17 +1791,19 @@
 apps/erpnext/erpnext/projects/doctype/task/task.js +26,Expense Claims,ادعاهای هزینه
 DocType: Issue,Support,پشتیبانی
 ,BOM Search,BOM جستجو
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Closing (Opening + Totals),بسته شدن (باز مجموع +)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),بسته شدن (باز مجموع +)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,لطفا ارز در شرکت مشخص
 DocType: Workstation,Wages per hour,دستمزد در ساعت
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +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/controllers/accounts_controller.py +272,Account {0} is invalid. Account Currency must be {1},حساب {0} نامعتبر است. حساب ارزی باید {1} باشد
+DocType: Email Digest,Pending Sales Orders,در انتظار سفارشات فروش
+apps/erpnext/erpnext/controllers/accounts_controller.py +275,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 +956,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",ردیف # {0}: مرجع نوع سند باید یکی از سفارش فروش، فاکتور فروش و یا ورود به مجله می شود
-DocType: Salary Slip,Deduction,کسر
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +87,Row {0}: From Time and To Time is mandatory.,ردیف {0}: از زمان و به زمان الزامی است.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +969,"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 +111,Row {0}: From Time and To Time is mandatory.,ردیف {0}: از زمان و به زمان الزامی است.
+DocType: Stock Reconciliation Item,Amount Difference,تفاوت در مقدار
 apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},مورد قیمت های اضافه شده برای {0} در لیست قیمت {1}
 DocType: Address Template,Address Template,آدرس الگو
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +7,Please enter Employee Id of this sales person,لطفا کارمند شناسه را وارد این فرد از فروش
@@ -1790,7 +1811,7 @@
 DocType: Project,% Tasks Completed,٪ کارهای انجام شده
 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 +194,Please enter Production Item first,لطفا ابتدا وارد مورد تولید
+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,کاربر غیر فعال
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,نقل قول
@@ -1799,53 +1820,54 @@
 DocType: Maintenance Visit,Maintenance User,کاربر نگهداری
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +149,Cost Updated,هزینه به روز رسانی
 DocType: Employee,Date of Birth,تاریخ تولد
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +86,Item {0} has already been returned,مورد {0} در حال حاضر بازگشت شده است
+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: 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 +177,Job Description,شرح شغل
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,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 +126,"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 +127,"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.",پیگیری فروش مبارزات نگه دارید. آهنگ از آگهی های نقل قول نگه دارید، سفارش فروش و غیره را از مبارزات برای ارزیابی بازگشت سرمایه گذاری.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +24,Welcome to POS: Create your POS Profile,به POS خوش آمدید: ایجاد پروفایل شما POS
 DocType: Expense Claim,Approver,تصویب
 ,SO Qty,SO تعداد
+DocType: Guardian,Work Address,آدرس محل کار
 DocType: Appraisal,Calculate Total Score,محاسبه مجموع امتیاز
 DocType: Request for Quotation,Manufacturing Manager,ساخت مدیر
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},سریال بدون {0} است تحت گارانتی تا {1}
+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 +74,Shipments,محموله
+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 +153,Row # ,ردیف #
+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 +156,Get From,دریافت از
+apps/erpnext/erpnext/public/js/utils.js +167,Get From,دریافت از
 DocType: C-Form,Quarter,ربع
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Miscellaneous Expenses,هزینه های متفرقه
 DocType: Global Defaults,Default Company,به طور پیش فرض شرکت
 apps/erpnext/erpnext/controllers/stock_controller.py +167,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,هزینه و یا حساب تفاوت برای مورد {0} آن را به عنوان اثرات ارزش کلی سهام الزامی است
-apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings",نمی تواند برای مورد {0} در ردیف overbill {1} بیشتر از {2}. اجازه می دهد تا overbilling، لطفا در تنظیمات سهام
+apps/erpnext/erpnext/controllers/accounts_controller.py +419,"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,-بالا
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} is disabled,کاربر {0} غیر فعال است
 DocType: Leave Application,Total Leave Days,مجموع مرخصی روز
 DocType: Email Digest,Note: Email will not be sent to disabled users,توجه: ایمیل را به کاربران غیر فعال شده ارسال نمی شود
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,انتخاب شرکت ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,خالی بگذارید اگر برای همه گروه ها در نظر گرفته
 apps/erpnext/erpnext/config/hr.py +171,"Types of employment (permanent, contract, intern etc.).",انواع اشتغال (دائمی، قرارداد، و غیره کارآموز).
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +346,{0} is mandatory for Item {1},{0} برای آیتم الزامی است {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,{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",لطفا مقدار اختصاص داده شده، نوع فاکتور و شماره فاکتور در حداقل یک سطر را انتخاب کنید
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,هزینه خرید جدید
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},سفارش فروش مورد نیاز برای مورد {0}
 DocType: Purchase Invoice Item,Rate (Company Currency),نرخ (شرکت ارز)
-apps/erpnext/erpnext/demo/setup_data.py +360,Others,دیگران
+DocType: Student Guardian,Others,دیگران
 DocType: Payment Entry,Unallocated Amount,مقدار تخصیص نیافته
 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,مالیات و هزینه
@@ -1865,17 +1887,16 @@
 apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,پرسشنامه سریال
 DocType: Activity Type,Default Billing Rate,به طور پیش فرض نرخ صدور صورت حساب
 DocType: Sales Invoice,Total Billing Amount,کل مقدار حسابداری
-apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +54,Receivable Account,حساب دریافتنی
-apps/erpnext/erpnext/controllers/accounts_controller.py +546,Row #{0}: Asset {1} is already {2},ردیف # {0}: دارایی {1} در حال حاضر {2}
+apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,حساب دریافتنی
+apps/erpnext/erpnext/controllers/accounts_controller.py +549,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 +79,CEO,مدیر عامل
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,مدیر عامل
 DocType: Expense Claim Detail,Expense Claim Detail,هزینه جزئیات درخواست
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +808,Please select correct account,لطفا به حساب صحیح را انتخاب کنید
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +809,Please select correct account,لطفا به حساب صحیح را انتخاب کنید
 DocType: Item,Weight UOM,وزن UOM
 DocType: Salary Structure Employee,Salary Structure Employee,کارمند ساختار حقوق و دستمزد
 DocType: Employee,Blood Group,گروه خونی
-DocType: Purchase Invoice Item,Page Break,شکست صفحه
 DocType: Production Order Operation,Pending,در انتظار
 DocType: Course,Course Name,نام دوره
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,کاربرانی که می توانند برنامه های مرخصی یک کارمند خاص را تایید
@@ -1884,14 +1905,15 @@
 DocType: Fiscal Year,Companies,شرکت های
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,الکترونیک
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,افزایش درخواست مواد زمانی که سهام سطح دوباره سفارش می رسد
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Full-time,تمام وقت
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,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: 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,مجموع ارزش ورودی
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Debit To is required,بدهکاری به مورد نیاز است
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +321,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,مدیر کیفیت
@@ -1899,6 +1921,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/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
@@ -1909,18 +1932,17 @@
 DocType: Production Order Operation,Completed Qty,تکمیل تعداد
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"For {0}, only debit accounts can be linked against another credit entry",برای {0}، تنها حساب های بانکی را می توان در برابر ورود اعتباری دیگر مرتبط
 apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,لیست قیمت {0} غیر فعال است
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +99,Row {0}: Completed Qty cannot be more than {1} for operation {2},ردیف {0}: پایان تعداد نمی تواند بیش از {1} برای عملیات {2}
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +123,Row {0}: Completed Qty cannot be more than {1} for operation {2},ردیف {0}: پایان تعداد نمی تواند بیش از {1} برای عملیات {2}
 DocType: Manufacturing Settings,Allow Overtime,اجازه اضافه کاری
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} شماره سریال مورد نیاز برای مورد {1}. شما فراهم کرده اید {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,نرخ گذاری کنونی
 DocType: Item,Customer Item Codes,کدهای مورد مشتری
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,تبادل کاهش / افزایش
 DocType: Opportunity,Lost Reason,از دست داده دلیل
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,لطفا راه اندازی شماره سری برای حضور و غیاب از طریق راه اندازی&gt; شماره سری
 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/purchase_receipt/purchase_receipt.py +378,All items have already been invoiced,همه موارد در حال حاضر صورتحساب شده است
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +379,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,خارجی
@@ -1936,18 +1958,19 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,مشتریان شما
 apps/erpnext/erpnext/projects/doctype/project/project.py +141,You have been invited to collaborate on the project: {0},از شما دعوت شده برای همکاری در این پروژه: {0}
 DocType: Leave Block List Date,Block Date,بلوک عضویت
-apps/erpnext/erpnext/templates/generators/job_opening.html +19,Apply Now,درخواست کن
+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.",ایجاد و مدیریت روزانه، هفتگی و ماهانه هضم ایمیل.
 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,ساختمان
-apps/erpnext/erpnext/utilities/doctype/address/address.py +164,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,بدون آدرس پیش فرض الگو پیدا شده است. لطفا یکی از جدید از راه اندازی&gt; چاپ و تبلیغات تجاری&gt; آدرس الگو ایجاد کنید.
 DocType: Fee Structure,Fee Structure,ساختار هزینه
 DocType: Timesheet Detail,Costing Amount,هزینه مبلغ
+DocType: Student Admission,Application Fee,هزینه درخواست
 DocType: Process Payroll,Submit Salary Slip,ثبت کردن لغزش حقوق
-apps/erpnext/erpnext/controllers/selling_controller.py +161,Maxiumm discount for Item {0} is {1}%,تخفیف Maxiumm برای مورد {0} است {1}٪
+apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,تخفیف Maxiumm برای مورد {0} است {1}٪
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,واردات به صورت فله
 DocType: Sales Partner,Address & Contacts,آدرس و اطلاعات تماس
 DocType: SMS Log,Sender Name,نام فرستنده
@@ -1972,21 +1995,21 @@
 DocType: Serial No,Delivery Time,زمان تحویل
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,سالمندی بر اساس
 DocType: Item,End of Life,پایان زندگی
-apps/erpnext/erpnext/demo/setup_data.py +361,Travel,سفر
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +155,No active or default Salary Structure found for employee {0} for the given dates,فعال یا حقوق و دستمزد به طور پیش فرض ساختار پیدا شده برای کارکنان {0} برای تاریخ داده شده
+apps/erpnext/erpnext/demo/setup/setup_data.py +304,Travel,سفر
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +167,No active or default Salary Structure found for employee {0} for the given dates,فعال یا حقوق و دستمزد به طور پیش فرض ساختار پیدا شده برای کارکنان {0} برای تاریخ داده شده
 DocType: Leave Block List,Allow Users,کاربران اجازه می دهد
 DocType: Purchase Order,Customer Mobile No,مشتری تلفن همراه بدون
 DocType: Sales Invoice,Recurring,در محدوده زمانی معین
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,پیگیری درآمد و هزینه جداگانه برای محصول و یا عمودی بخش.
 DocType: Rename Tool,Rename Tool,ابزار تغییر نام
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +23,Update Cost,به روز رسانی هزینه
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,به روز رسانی هزینه
 DocType: Item Reorder,Item Reorder,مورد ترتیب مجدد
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +36,Show Salary Slip,لغزش نمایش حقوق
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +748,Transfer Material,مواد انتقال
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +53,Show Salary Slip,لغزش نمایش حقوق
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +166,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 +923,Please set recurring after saving,لطفا پس از ذخیره در محدوده زمانی معین
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +646,Select change amount account,انتخاب تغییر حساب مقدار
+apps/erpnext/erpnext/public/js/controllers/transaction.js +914,Please set recurring after saving,لطفا پس از ذخیره در محدوده زمانی معین
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +703,Select change amount account,انتخاب تغییر حساب مقدار
 DocType: Purchase Invoice,Price List Currency,لیست قیمت ارز
 DocType: Naming Series,User must always select,کاربر همیشه باید انتخاب کنید
 DocType: Stock Settings,Allow Negative Stock,اجازه می دهد بورس منفی
@@ -1998,31 +2021,32 @@
 DocType: Quality Inspection,Verified By,تایید شده توسط
 DocType: Address,Subsidiary,فرعی
 apps/erpnext/erpnext/setup/doctype/company/company.py +64,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.",می تواند به طور پیش فرض ارز شرکت را تغییر نمی، چرا که معاملات موجود وجود دارد. معاملات باید لغو شود برای تغییر ارز به طور پیش فرض.
+DocType: Grade Interval,Grade Description,درجه باشرکت
 DocType: Quality Inspection,Purchase Receipt No,رسید خرید بدون
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,بیعانه
 DocType: Process Payroll,Create Salary Slip,ایجاد لغزش حقوق
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +33,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 +352,Quantity in row {0} ({1}) must be same as manufactured quantity {2},تعداد در ردیف {0} ({1}) باید همان مقدار تولید شود {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Quantity in row {0} ({1}) must be same as manufactured quantity {2},تعداد در ردیف {0} ({1}) باید همان مقدار تولید شود {2}
 DocType: Appraisal,Employee,کارمند
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,دعوت به عنوان کاربر
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} به طور کامل صورتحساب شده است
 DocType: Workstation Working Hour,End Time,پایان زمان
 DocType: Payment Entry,Payment Deductions or Loss,کسر پرداخت یا از دست دادن
-apps/erpnext/erpnext/config/schools.py +100,LMS,LMS
+apps/erpnext/erpnext/config/schools.py +104,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,خط لوله فروش
 DocType: Student Batch Student,Student Batch Student,دانشجویی دسته ای
-DocType: Sales Invoice,Mass Mailing,پستی دسته جمعی
+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 +199,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/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 +297,Salary Slip of employee {0} already created for this period,لغزش حقوق و دستمزد کارکنان {0} در حال حاضر برای این دوره بوجود
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Pharmaceutical,دارویی
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +309,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/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,اعتبار به
@@ -2037,27 +2061,28 @@
 DocType: Upload Attendance,Attendance To Date,حضور و غیاب به روز
 DocType: Warranty Claim,Raised By,مطرح شده توسط
 DocType: Payment Gateway Account,Payment Account,حساب پرداخت
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +814,Please specify Company to proceed,لطفا شرکت مشخص برای ادامه
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +793,Please specify Company to proceed,لطفا شرکت مشخص برای ادامه
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Receivable,تغییر خالص در حساب های دریافتنی
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Compensatory Off,جبرانی فعال
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,جبرانی فعال
 DocType: Quality Inspection Reading,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.,لطفا مطمئن شوید که شما واقعا می خواهید به حذف تمام معاملات این شرکت. اطلاعات کارشناسی ارشد خود را باقی خواهد ماند آن را به عنوان است. این عمل قابل بازگشت نیست.
 DocType: Room,Room Number,شماره اتاق
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},مرجع نامعتبر {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +161,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) نمی تواند بیشتر از quanitity برنامه ریزی شده ({2}) در سفارش تولید {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +162,{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 +217,Raw Materials cannot be blank.,مواد اولیه نمی تواند خالی باشد.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,"Could not update stock, invoice contains drop shipping item.",می تواند سهام به روز رسانی نیست، فاکتور شامل آیتم افت حمل و نقل.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +460,Quick Journal Entry,سریع دانشگاه علوم پزشکی ورودی
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +111,You can not change rate if BOM mentioned agianst any item,اگر ذکر بی ا م در مقابل هر ایتمی باشد شما نمیتوانید نرخ را تغییر دهید
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +441,"Could not update stock, invoice contains drop shipping item.",می تواند سهام به روز رسانی نیست، فاکتور شامل آیتم افت حمل و نقل.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Quick Journal Entry,سریع دانشگاه علوم پزشکی ورودی
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +103,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 +214,{0} {1} is not submitted,{0} {1} ثبت نشده است
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,درخواست ها برای اقلام است.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,سفارش تولید جداگانه خواهد شد برای هر مورد خوب به پایان رسید ساخته شده است.
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +121,{0} must be negative in return document,{0} باید در سند بازگشت منفی باشد
 ,Minutes to First Response for Issues,دقیقه به اولین پاسخ برای مسائل
 DocType: Purchase Invoice,Terms and Conditions1,شرایط و Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,نام این موسسه که شما در حال راه اندازی این سیستم.
@@ -2066,16 +2091,17 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,وضعیت پروژه
 DocType: UOM,Check this to disallow fractions. (for Nos),بررسی این به ندهید فراکسیون. (برای NOS)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +398,The following Production Orders were created:,سفارشات تولید زیر ایجاد شد:
+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 +739,Item or Warehouse for row {0} does not match Material Request,موردی یا انبار ردیف {0} مطابقت ندارد درخواست مواد
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +747,Item or Warehouse for row {0} does not match Material Request,موردی یا انبار ردیف {0} مطابقت ندارد درخواست مواد
 apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,واحد اندازه گیری
 DocType: Fiscal Year,Year End Date,سال پایان تاریخ
 DocType: Task Depends On,Task Depends On,کار بستگی به
-DocType: Lead,Opportunity,فرصت
+DocType: Supplier Quotation,Opportunity,فرصت
 ,Completed Production Orders,سفارشات تولید تکمیل
 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,به طور پیش فرض ایستگاه کاری
@@ -2088,7 +2114,7 @@
 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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},تاریخ شروع نگهداری نمی تواند قبل از تاریخ تحویل برای سریال بدون شود {0}
+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,تاریخ واقعی پایان
 DocType: Purchase Invoice,PINV-,PINV-
 DocType: Authorization Rule,Applicable To (Role),به قابل اجرا (نقش)
@@ -2103,7 +2129,7 @@
 DocType: SMS Log,No of Requested SMS,تعداد SMS درخواست شده
 DocType: Campaign,Campaign-.####,کمپین - ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,گام های بعدی
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,Please supply the specified items at the best possible rates,لطفا تأمین اقلام مشخص شده در بهترین نرخ ممکن
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +695,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 +117,Contract End Date must be greater than Date of Joining,قرارداد تاریخ پایان باید از تاریخ پیوستن بیشتر
 DocType: Delivery Note,DN-,DN-
@@ -2112,7 +2138,7 @@
 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 +14,This is an example website auto-generated from ERPNext,این یک مثال وب سایت خودکار تولید شده از ERPNext
+apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,این یک مثال وب سایت خودکار تولید شده از ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,محدوده سالمندی 1
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
@@ -2139,13 +2165,14 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd تعداد
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +54,Fee Records Created - {0},سوابق هزینه ایجاد شده - {0}
 DocType: Asset Category Account,Asset Category Account,حساب دارایی رده
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +103,Cannot produce more Item {0} than Sales Order quantity {1},می تواند مورد دیگر {0} از مقدار سفارش فروش تولید نمی {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Stock Entry {0} is not submitted,سهام ورود {0} است ارسال نشده
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},می تواند مورد دیگر {0} از مقدار سفارش فروش تولید نمی {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +505,Stock Entry {0} is not submitted,سهام ورود {0} است ارسال نشده
 DocType: Payment Reconciliation,Bank / Cash Account,حساب بانک / نقدی
 DocType: Tax Rule,Billing City,صدور صورت حساب شهر
 DocType: Salary Component Account,Salary Component Account,حساب حقوق و دستمزد و اجزای
 DocType: Global Defaults,Hide Currency Symbol,مخفی ارز نماد
 apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card",به عنوان مثال بانکی، پول نقد، کارت اعتباری
+DocType: Lead Source,Source Name,نام منبع
 DocType: Journal Entry,Credit Note,اعتبار توجه داشته باشید
 DocType: Warranty Claim,Service Address,خدمات آدرس
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furnitures and Fixtures,مبلمان و لامپ
@@ -2157,6 +2184,7 @@
 DocType: Opportunity,Customer / Lead Name,مشتری / نام سرب
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +89,Clearance Date not mentioned,ترخیص کالا از تاریخ ذکر نشده است
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,تولید
+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/controllers/trends.py +19,Total(Qty),مجموع (تعداد)
 DocType: Sales Invoice,This Document,این سند
@@ -2168,15 +2196,15 @@
 DocType: Purchase Receipt,Time at which materials were received,زمانی که در آن مواد دریافت شده
 DocType: Stock Ledger Entry,Outgoing Rate,نرخ خروجی
 apps/erpnext/erpnext/config/hr.py +176,Organization branch master.,شاخه سازمان کارشناسی ارشد.
-apps/erpnext/erpnext/controllers/accounts_controller.py +273, or ,یا
+apps/erpnext/erpnext/controllers/accounts_controller.py +276, 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 +203,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,ردیف # {0}: مجله ورودی {1} می کند حساب کاربری ندارید {2} یا در حال حاضر همسان در برابر کوپن دیگر
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +206,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 +90,No employee for the above selected criteria OR salary slip already created,هیچ یک از کارکنان برای معیارهای فوق انتخاب شده و یا لغزش حقوق و دستمزد در حال حاضر ایجاد
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +93,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,نوع پرداخت
@@ -2204,8 +2232,8 @@
 DocType: Product Bundle,Parent Item,مورد پدر و مادر
 DocType: Account,Account Type,نوع حساب
 DocType: Delivery Note,DN-RET-,DN-RET-
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +115,Leave Type {0} cannot be carry-forwarded,نوع ترک {0} نمی تواند حمل فرستاده
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',نگهداری و تعمیرات برنامه برای تمام اقلام تولید شده نیست. لطفا بر روی &#39;ایجاد برنامه کلیک کنید
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +118,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 +163,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",برای ردیف {0} در {1}. شامل {2} در مورد نرخ، ردیف {3} نیز باید گنجانده شود
@@ -2217,13 +2245,13 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +32,Disabled template must not be default template,قالب غیر فعال نباید قالب پیش فرض
 DocType: Account,Income Account,حساب درآمد
 DocType: Payment Request,Amount in customer's currency,مبلغ پول مشتری
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +748,Delivery,تحویل
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +742,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,منطقه مسئولیت های کلیدی
 DocType: Payment Entry,Total Allocated Amount,مجموع مقدار اختصاص داده شده
 DocType: Item Reorder,Material Request Type,مواد نوع درخواست
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +82,Row {0}: UOM Conversion Factor is mandatory,ردیف {0}: UOM عامل تبدیل الزامی است
+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,مرکز هزینه زا
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,کوپن #
@@ -2234,13 +2262,13 @@
 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 +90,Head of Marketing and Sales,رئیس بازاریابی و فروش
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,مالیات بر عایدات
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,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.,آهنگ فرصت های نوع صنعت.
 DocType: Item Supplier,Item Supplier,تامین کننده مورد
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +403,Please enter Item Code to get batch no,لطفا کد مورد وارد کنید دسته ای هیچ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +770,Please select a value for {0} quotation_to {1},لطفا یک ارزش برای {0} quotation_to انتخاب کنید {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +397,Please enter Item Code to get batch no,لطفا کد مورد وارد کنید دسته ای هیچ
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +764,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",ادغام زمانی ممکن است که خواص زیر در هر دو پرونده می باشد. آیا گروه، نوع ریشه، شرکت
@@ -2252,28 +2280,29 @@
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,در انبار
 DocType: Appraisal,HR User,HR کاربر
 DocType: Purchase Invoice,Taxes and Charges Deducted,مالیات و هزینه کسر
-apps/erpnext/erpnext/hooks.py +100,Issues,مسائل مربوط به
+apps/erpnext/erpnext/hooks.py +109,Issues,مسائل مربوط به
 apps/erpnext/erpnext/controllers/status_updater.py +13,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} غیر فعال است
 DocType: Supplier,Billing Currency,صدور صورت حساب نرخ ارز
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Large,خیلی بزرگ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,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 +507,Warning: Another {0} # {1} exists against stock entry {2},هشدار: یکی دیگر از {0} # {1} در برابر ورود سهام وجود دارد {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Local,محلی
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +508,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),وام و پیشرفت (دارایی)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,بدهکاران
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Large,بزرگ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,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 +225,Total {0} ({1}),مجموع {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +224,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,روش های ارزش گذاری پیش فرض
@@ -2319,9 +2348,9 @@
 DocType: Attendance,Leave Type,نوع مرخصی
 apps/erpnext/erpnext/controllers/stock_controller.py +173,Expense / Difference account ({0}) must be a 'Profit or Loss' account,حساب هزینه / تفاوت ({0}) باید یک حساب کاربری &#39;، سود و ضرر باشد
 DocType: Account,Accounts User,کاربر حسابها
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Name error: {0},error نام: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +90,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 +178,{0} {1} does not associated with {2} {3},{0} {1} با همراه نیست {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +181,{0} {1} does not associated with {2} {3},{0} {1} با همراه نیست {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,حضور و غیاب کارکنان برای {0} در حال حاضر مشخص شده
 DocType: Packing Slip,If more than one package of the same type (for print),اگر بیش از یک بسته از همان نوع (برای چاپ)
 DocType: Warehouse,Parent Warehouse,انبار پدر و مادر
@@ -2340,7 +2369,7 @@
 DocType: BOM Item,Scrap %,ضایعات٪
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection",اتهامات خواهد شد توزیع متناسب در تعداد آیتم یا مقدار بر اساس، به عنوان در هر انتخاب شما
 DocType: Maintenance Visit,Purposes,اهداف
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,حداقل یک مورد باید با مقدار منفی در سند وارد بازگشت
+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 +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations",عملیات {0} طولانی تر از هر ساعت کار موجود در ایستگاه های کاری {1}، شکستن عملیات به عملیات های متعدد
 ,Requested,خواسته
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +83,No Remarks,بدون شرح
@@ -2352,46 +2381,46 @@
 DocType: Item,Total Projected Qty,کل پیش بینی تعداد
 DocType: Monthly Distribution,Distribution Name,نام توزیع
 DocType: Course,Course Code,کد درس
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Quality Inspection required for Item {0},بازرسی کیفیت مورد نیاز برای مورد {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Quality Inspection required for Item {0},بازرسی کیفیت مورد نیاز برای مورد {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,سرعت که در آن مشتری ارز به ارز پایه شرکت تبدیل
 DocType: Purchase Invoice Item,Net Rate (Company Currency),نرخ خالص (شرکت ارز)
 DocType: Salary Detail,Condition and Formula Help,شرایط و فرمول راهنما
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,مدیریت درختواره منطقه
 DocType: Journal Entry Account,Sales Invoice,فاکتور فروش
 DocType: Journal Entry Account,Party Balance,تعادل حزب
-apps/erpnext/erpnext/accounts/page/pos/pos.js +475,Please select Apply Discount On,لطفا درخواست تخفیف را انتخاب کنید
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +92,Salary Slip Created,لغزش حقوق و دستمزد ایجاد
+apps/erpnext/erpnext/accounts/page/pos/pos.js +464,Please select Apply Discount On,لطفا درخواست تخفیف را انتخاب کنید
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +95,Salary Slip Created,لغزش حقوق و دستمزد ایجاد
 DocType: Company,Default Receivable Account,به طور پیش فرض دریافتنی حساب
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,ایجاد بانک برای ورود به حقوق و دستمزد کل پرداخت شده برای معیارهای فوق انتخاب شده
 DocType: Stock Entry,Material Transfer for Manufacture,انتقال مواد برای تولید
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,درصد تخفیف می تواند یا علیه یک لیست قیمت و یا برای همه لیست قیمت اعمال می شود.
 DocType: Purchase Invoice,Half-yearly,نیمه سال
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +384,Accounting Entry for Stock,ثبت حسابداری برای انبار
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +387,Accounting Entry for Stock,ثبت حسابداری برای انبار
 DocType: Sales Invoice,Sales Team1,Team1 فروش
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,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 +96,Row {0}: Completed Qty must be greater than zero.,ردیف {0}: پایان تعداد باید بزرگتر از صفر باشد.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +120,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 +88,Row # {0}: Cannot return more than {1} for Item {2},ردیف # {0}: نمی تواند بیشتر از بازگشت {1} برای مورد {2}
+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,طرح
 DocType: Item Group,Show this slideshow at the top of the page,نمایش تصاویر به صورت خودکار در این بازگشت به بالای صفحه
 DocType: BOM,Item UOM,مورد UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),مبلغ مالیات پس از تخفیف مقدار (شرکت ارز)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +147,Target warehouse is mandatory for row {0},انبار هدف برای ردیف الزامی است {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,کنید] را انتخاب کنید
 DocType: Quality Inspection,Quality Inspection,بازرسی کیفیت
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Extra Small,بسیار کوچک
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,Warning: Material Requested Qty is less than Minimum Order Qty,هشدار: مواد درخواست شده تعداد کمتر از حداقل تعداد سفارش تعداد است
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +194,Account {0} is frozen,حساب {0} فریز شده است
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,بسیار کوچک
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +690,Warning: Material Requested Qty is less than Minimum Order Qty,هشدار: مواد درخواست شده تعداد کمتر از حداقل تعداد سفارش تعداد است
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,حساب {0} فریز شده است
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,حقوقی نهاد / جانبی با نمودار جداگانه حساب متعلق به سازمان.
 DocType: Payment Request,Mute Email,بیصدا کردن ایمیل
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco",مواد غذایی، آشامیدنی و دخانیات
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +606,Can only make payment against unbilled {0},می توانید تنها پرداخت به را unbilled را {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +126,Commission rate cannot be greater than 100,نرخ کمیسیون نمی تواند بیشتر از 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +609,Can only make payment against unbilled {0},می توانید تنها پرداخت به را unbilled را {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,نرخ کمیسیون نمی تواند بیشتر از 100
 DocType: Stock Entry,Subcontract,مقاطعه کاری فرعی
 apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,لطفا ابتدا وارد {0}
 DocType: Production Order Operation,Actual End Time,پایان زمان واقعی
@@ -2402,30 +2431,30 @@
 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 +158,Colour,رنگ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,رنگ
 DocType: Maintenance Visit,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; است و هیچ بسته نرم افزاری محصولات دیگر وجود دارد
 DocType: Student Log,Academic,علمی
-apps/erpnext/erpnext/controllers/accounts_controller.py +469,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),مجموع پیش ({0}) را در برابر سفارش {1} نمی تواند بیشتر از جمع کل ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +472,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),مجموع پیش ({0}) را در برابر سفارش {1} نمی تواند بیشتر از جمع کل ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,انتخاب توزیع ماهانه به طور یکنواخت توزیع در سراسر اهداف ماه می باشد.
 DocType: Purchase Invoice Item,Valuation Rate,نرخ گذاری
+DocType: Stock Reconciliation,SR/,SR /
 apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,لیست قیمت ارز انتخاب نشده
 DocType: Assessment,Results,نتایج
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +168,Employee {0} has already applied for {1} between {2} and {3},کارمند {0} در حال حاضر برای اعمال {1} {2} بین و {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +175,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: Student Applicant,Father's/ Guardian 2 Email ID,/ نگهبان ID 2 ایمیل پدر
 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 +228,Warehouses with existing transaction can not be converted to group.,انبارها با معامله موجود می توانید به گروه تبدیل نمی کند.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +231,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 +93,Researcher,پژوهشگر
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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.,بازرسی کیفیت ورودی.
@@ -2437,25 +2466,25 @@
 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: Sales Invoice,Advertisement,اعلان
 DocType: Asset Category Account,Depreciation Expense Account,حساب استهلاک هزینه
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Probationary Period,دوره وابسته به التزام
-apps/erpnext/erpnext/hooks.py +102,Announcements,اطلاعیه ها
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,دوره وابسته به التزام
+apps/erpnext/erpnext/hooks.py +111,Announcements,اطلاعیه ها
 DocType: Customer Group,Only leaf nodes are allowed in transaction,تنها برگ در معامله اجازه
 DocType: Expense Claim,Expense Approver,تصویب هزینه
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +109,Row {0}: Advance against Customer must be credit,ردیف {0}: پیشرفت در برابر مشتری باید اعتبار
 apps/erpnext/erpnext/accounts/doctype/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 +16,To Datetime,به تاریخ ساعت
+apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,به تاریخ ساعت
 DocType: SMS Settings,SMS Gateway URL,URL SMS دروازه
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +51,Course Schedules deleted:,برنامه دوره حذف:
 apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,سیاهههای مربوط به حفظ وضعیت تحویل اس ام اس
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,فعالیت در انتظار
+DocType: Accounts Settings,Make Payment via Journal Entry,پرداخت از طریق ورود مجله
+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 +127,Please enter relieving date.,لطفا تاریخ تسکین وارد کنید.
-apps/erpnext/erpnext/controllers/trends.py +145,Amt,AMT
+apps/erpnext/erpnext/controllers/trends.py +149,Amt,AMT
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,Only Leave Applications with status 'Approved' can be submitted,فقط برنامه های کاربردی با وضعیت &quot;تایید&quot; را می توان ارائه بگذارید
 apps/erpnext/erpnext/utilities/doctype/address/address.py +26,Address Title is mandatory.,عنوان نشانی الزامی است.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,نام کمپین را وارد کنید اگر منبع تحقیق مبارزات انتخاباتی است
@@ -2473,14 +2502,15 @@
 apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1},قادر به پیدا کردن نرخ ارز برای {0} به {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,روز علامت نیم
 DocType: Sales Invoice,Sales Team,تیم فروش
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Duplicate entry,ورود تکراری
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,ورود تکراری
 DocType: Program Enrollment Tool,Get Students,دریافت دانش آموزان
 DocType: Serial No,Under Warranty,تحت گارانتی
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +490,[Error],[خطا]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +484,[Error],[خطا]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,به عبارت قابل مشاهده خواهد بود هنگامی که شما سفارش فروش را نجات دهد.
 ,Employee Birthday,کارمند تولد
 apps/erpnext/erpnext/controllers/status_updater.py +175,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} قبل وجود دارد. لطفا این نوشته را تغییر دهید و دوباره امتحان کنید.
 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} وجود ندارد
@@ -2496,22 +2526,22 @@
 ,Issued Items Against Production Order,آیتم صادره علیه سفارش تولید
 DocType: Pricing Rule,Purchase Manager,مدیر خرید
 DocType: Target Detail,Target Detail,جزئیات هدف
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +25,All Jobs,همه مشاغل
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,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 +323,Amount {0} {1} {2} {3},مقدار {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,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: Supplier,Credit Limit,محدودیت اعتبار
 DocType: Production Plan Sales Order,Salse Order Date,Salse تاریخ سفارش
 DocType: Salary Component,Salary Component,حقوق و دستمزد و اجزای
-apps/erpnext/erpnext/accounts/utils.py +372,Payment Entries {0} are un-linked,مطالب پرداخت {0} سازمان ملل متحد در ارتباط هستند
+apps/erpnext/erpnext/accounts/utils.py +449,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 +497,Material Requests {0} created,درخواست مواد {0} ایجاد
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +498,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.,الگو از نظر و یا قرارداد.
 DocType: Purchase Invoice,Address and Contact,آدرس و تماس با
@@ -2550,7 +2580,7 @@
 DocType: Serial No,Warranty / AMC Details,گارانتی / AMC اطلاعات بیشتر
 DocType: Journal Entry,User Remark,نکته کاربری
 DocType: Lead,Market Segment,بخش بازار
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +848,Paid Amount cannot be greater than total negative outstanding amount {0},مبلغ پرداخت نمی تواند بیشتر از کل مقدار برجسته منفی {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +859,Paid Amount cannot be greater than total negative outstanding amount {0},مبلغ پرداخت نمی تواند بیشتر از کل مقدار برجسته منفی {0}
 DocType: Employee Internal Work History,Employee Internal Work History,کارمند داخلی سابقه کار
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +233,Closing (Dr),بسته شدن (دکتر)
 DocType: Cheque Print Template,Cheque Size,حجم چک
@@ -2571,7 +2601,8 @@
 ,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 +555,'Update Stock' cannot be checked for fixed asset sale,&quot;به روز رسانی سهام می تواند برای فروش دارایی ثابت شود چک
+DocType: Student Guardian,Father,پدر
+apps/erpnext/erpnext/controllers/accounts_controller.py +558,'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/buying/doctype/purchase_order/purchase_order.py +132,Material Request {0} is cancelled or stopped,درخواست مواد {0} است لغو و یا متوقف
@@ -2581,15 +2612,15 @@
 DocType: Sales Order,Fully Delivered,به طور کامل تحویل
 DocType: Lead,Lower Income,درآمد پایین
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked",سر حساب تحت مسئولیت، که در آن سود / زیان رزرو خواهد شد
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +166,Source and target warehouse cannot be same for row {0},منبع و انبار هدف نمی تواند همین کار را برای ردیف {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",حساب تفاوت باید یک حساب کاربری نوع دارایی / مسئولیت باشد، زیرا این سهام آشتی ورود افتتاح است
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +81,Purchase Order number required for Item {0},خرید شماره سفارش مورد نیاز برای مورد {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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/purchase_receipt/purchase_receipt.py +82,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 +17,Cannot change status as student {0} is linked with student application {1},می توانید تغییر وضعیت به عنوان دانش آموز نمی {0} است با استفاده از دانش آموزان مرتبط {1}
+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: Timesheet,"List of employee which has ""Salary Slip Based on Timesheet"" is enabled in salary structure.",فهرست کارمند است که &quot;لغزش حقوق بر اساس برنامه زمانی&quot; در ساختار حقوق و دستمزد را فعال کنید.
 DocType: Asset,Fully Depreciated,به طور کامل مستهلک
 ,Stock Projected Qty,سهام بینی تعداد
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Customer {0} does not belong to project {1},مشتری {0} تعلق ندارد به پروژه {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,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,سریال نه و دسته ای
@@ -2601,7 +2632,7 @@
 DocType: Purchase Invoice,Purchase Taxes and Charges,خرید مالیات و هزینه
 ,Qty to Receive,تعداد دریافت
 DocType: Leave Block List,Leave Block List Allowed,ترک فهرست بلوک های مجاز
-apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +55,All Warehouses,همه انبارها
+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 +105,Credit To account must be a Balance Sheet account,اعتباری به حساب باید یک حساب ترازنامه شود
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,انواع تامین کننده
@@ -2613,10 +2644,10 @@
 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/manufacturing/doctype/bom/bom.js +26,Browse BOM,مرور BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,مرور BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,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 Year,Academic Year,سال تحصیلی
+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
 DocType: Appraisal,Appraisal,ارزیابی
@@ -2624,12 +2655,12 @@
 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 +197,Leave approver must be one of {0},ترک تصویب شود باید یکی از {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,Leave approver must be one of {0},ترک تصویب شود باید یکی از {0}
 DocType: Hub Settings,Seller Email,فروشنده ایمیل
 DocType: Project,Total Purchase Cost (via Purchase Invoice),هزینه خرید مجموع (از طریق فاکتورخرید )
 DocType: Workstation Working Hour,Start Time,زمان شروع
 DocType: Item Price,Bulk Import Help,فله واردات راهنما
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +256,Select Quantity,انتخاب تعداد
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +257,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,پیام های ارسال شده
@@ -2646,6 +2677,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,در هر دو صورت تعداد هدف یا هدف مقدار الزامی است.
 apps/erpnext/erpnext/config/projects.py +45,Cost of various activities,هزینه فعالیت های مختلف
 apps/erpnext/erpnext/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 +149,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}
 DocType: Item,Inspection Required,مورد نیاز بازرسی
@@ -2665,7 +2697,7 @@
 DocType: Expense Claim,Approval Status,وضعیت تایید
 DocType: Hub Settings,Publish Items to Hub,انتشار مطلبی برای توپی
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},از مقدار باید کمتر از ارزش در ردیف شود {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Wire Transfer,انتقال سیم
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,انتقال سیم
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,بررسی همه
 DocType: Sales Order,Recurring Order,ترتیب در محدوده زمانی معین
 DocType: Company,Default Income Account,حساب پیش فرض درآمد
@@ -2677,21 +2709,19 @@
 ,Welcome to ERPNext,به ERPNext خوش آمدید
 apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,منجر به عبارت
 DocType: Lead,From Customer,از مشتری
-apps/erpnext/erpnext/demo/setup_data.py +357,Calls,تماس
+apps/erpnext/erpnext/demo/setup/setup_data.py +300,Calls,تماس
 DocType: Project,Total Costing Amount (via Time Logs),کل مقدار هزینه یابی (از طریق زمان سیاههها)
 DocType: Purchase Order Item Supplied,Stock UOM,سهام UOM
-apps/erpnext/erpnext/stock/doctype/item/item.py +466,"As there are existing transactions for this item, \
-							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'",به عنوان تراکنش های موجود برای این آیتم، \ شما می توانید مقادیر را تغییر دهید وجود دارد &#39;هیچ سریال&#39;، &#39;است دسته ای بدون&#39;، &#39;است سهام مورد »و« روش ارزشگذاری:
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,Purchase Order {0} is not submitted,خرید سفارش {0} است ارسال نشده
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,بینی
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},سریال بدون {0} به انبار تعلق ندارد {1}
 apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,توجه: سیستم نمی خواهد بیش از چک زایمان و بیش از رزرو مورد {0} به عنوان مقدار و یا مقدار 0 است
 DocType: Notification Control,Quotation Message,نقل قول پیام
 DocType: Issue,Opening Date,افتتاح عضویت
-apps/erpnext/erpnext/schools/api.py +58,Attendance has been marked successfully.,حضور و غیاب با موفقیت برگزار شده است.
+apps/erpnext/erpnext/schools/api.py +57,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 +136,Account Type for {0} must be {1},نوع کاربری برای {0} باید {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +139,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,هر دو انبار باید به همان شرکت تعلق
@@ -2706,12 +2736,13 @@
 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/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 +20,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 +1190,Please select customer,لطفا به مشتریان را انتخاب کنید
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1193,Please select customer,لطفا به مشتریان را انتخاب کنید
 DocType: C-Form,I,من
 DocType: Company,Asset Depreciation Cost Center,دارایی مرکز استهلاک هزینه
 DocType: Sales Order Item,Sales Order Date,تاریخ سفارش فروش
@@ -2721,6 +2752,7 @@
 ,Payment Period Based On Invoice Date,دوره پرداخت بر اساس فاکتور عضویت
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},از دست رفته ارز نرخ ارز برای {0}
 DocType: Assessment,Examiner,امتحان کننده
+DocType: Student,Siblings,خواهر و برادر
 DocType: Journal Entry,Stock Entry,سهام ورود
 DocType: Payment Entry,Payment References,منابع پرداخت
 DocType: C-Form,C-FORM-,C-FORM-
@@ -2738,11 +2770,12 @@
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,نام موضوع
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,حداقل یکی از خرید و یا فروش باید انتخاب شود
+DocType: Grading Structure,Grade Intervals,بازه درجه
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,ماهیت کسب و کار خود را انتخاب کنید.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,که در آن عملیات ساخت در حال انجام شده است.
 DocType: Asset Movement,Source Warehouse,انبار منبع
 DocType: Installation Note,Installation Date,نصب و راه اندازی تاریخ
-apps/erpnext/erpnext/controllers/accounts_controller.py +534,Row #{0}: Asset {1} does not belong to company {2},ردیف # {0}: دارایی {1} به شرکت تعلق ندارد {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +537,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,فروش کاربر
@@ -2756,28 +2789,31 @@
 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 +111,Date Of Retirement must be greater than Date of Joining,تاریخ بازنشستگی باید از تاریخ پیوستن بیشتر
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +49,There were errors while scheduling course on :,بودند اشتباهات در حالی که برنامه ریزی دوره وجود دارد:
 DocType: Sales Invoice,Against Income Account,به حساب درآمد
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +87,{0}% Delivered,{0}٪ تحویل داده شد
+apps/erpnext/erpnext/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 +379,Please set default {0} in Company {1},لطفا پیش فرض {0} در {1} شرکت
+apps/erpnext/erpnext/accounts/utils.py +456,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,سود ناخالص / از دست دادن
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,خرید سفارش مورد عرضه
 apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,نام شرکت می تواند شرکت نیست
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,سران نامه برای قالب چاپ.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,عناوین برای قالب چاپ به عنوان مثال پروفرم فاکتور.
+DocType: Student Guardian,Student Guardian,دانشجو نگهبان
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +184,Valuation type charges can not marked as Inclusive,نوع گذاری اتهامات نمی تواند به عنوان فراگیر مشخص شده
 DocType: POS Profile,Update Stock,به روز رسانی سهام
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM مختلف برای اقلام خواهد به نادرست (مجموع) خالص ارزش وزن منجر شود. مطمئن شوید که وزن خالص هر یک از آیتم است در UOM همان.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM نرخ
 DocType: Asset,Journal Entry for Scrap,ورودی مجله برای ضایعات
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,لطفا توجه داشته باشید تحویل اقلام از جلو
-apps/erpnext/erpnext/accounts/utils.py +349,Journal Entries {0} are un-linked,ورودی های دفتر {0} مشابه نیستند
+apps/erpnext/erpnext/accounts/utils.py +426,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,لطفا دور کردن مرکز هزینه در شرکت ذکر
@@ -2801,6 +2837,7 @@
 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,انجمن
+DocType: Homepage,"URL for ""All Products""",URL برای &quot;همه محصولات&quot;
 DocType: Leave Application,Leave Balance Before Application,ترک تعادل قبل از اعمال
 DocType: SMS Center,Send SMS,ارسال اس ام اس
 DocType: Cheque Print Template,Width of amount in word,عرض مقدار در کلمه
@@ -2809,7 +2846,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 +29,Current Job Openings,فرصت های شغلی فعلی
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,Current Job Openings,فرصت های شغلی فعلی
 DocType: Company,Stock Adjustment Account,حساب تنظیم سهام
 DocType: Journal Entry,Write Off,کسر کردن
 DocType: Timesheet Detail,Operation ID,عملیات ID
@@ -2822,7 +2859,7 @@
 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 +850,Show tax break-up,نمایش مالیاتی تجزیه
+apps/erpnext/erpnext/public/js/controllers/transaction.js +841,Show tax break-up,نمایش مالیاتی تجزیه
 apps/erpnext/erpnext/accounts/party.py +308,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} وجود داشته باشد، از این رو شما می توانید دوباره اختصاص و یا آن را تغییر دهید
@@ -2832,10 +2869,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 +534,Please select Posting Date before selecting Party,لطفا ارسال تاریخ قبل از انتخاب حزب را انتخاب کنید
 DocType: Serial No,Out of AMC,از AMC
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +80,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 +162,Please contact to the user who have Sales Master Manager {0} role,لطفا برای کاربری که فروش کارشناسی ارشد مدیریت {0} نقش دارند تماس
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +195,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 +5,This is based on the attendance of this Student,این است که در حضور این دانش آموز بر اساس
@@ -2844,12 +2882,11 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,یادداشت تحویل {0} باید قبل از لغو این سفارش فروش لغو
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +75,Paid amount + Write Off Amount can not be greater than Grand Total,مبلغ پرداخت شده + نوشتن کردن مقدار نمی تواند بیشتر از جمع کل
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,{0} is not a valid Batch Number for Item {1},{0} است تعداد دسته معتبر برای مورد نمی {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +138,Note: There is not enough leave balance for Leave Type {0},نکته: تعادل مرخصی به اندازه کافی برای مرخصی نوع وجود ندارد {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,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,نوع فرصت
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,شرکت های جدید
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,Cost Center is required for 'Profit and Loss' account {0},مرکز هزینه برای سود و زیان &#39;مورد نیاز است حساب {0}
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,معاملات تنها می تواند توسط خالق شرکت حذف
 apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,تعداد نادرست عمومی لجر مطالب در بر داشت. شما ممکن است یک حساب اشتباه در معامله انتخاب شده است.
 DocType: Cheque Print Template,Cheque Width,عرض چک
@@ -2858,16 +2895,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,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 +228,{0} '{1}' is disabled,{0} '{1}'  غیر فعال است
+apps/erpnext/erpnext/controllers/accounts_controller.py +231,{0} '{1}' is disabled,{0} '{1}'  غیر فعال است
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,تنظیم به عنوان گسترش
 DocType: Cheque Print Template,Scanned Cheque,اسکن چک
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,ارسال ایمیل خودکار به تماس در معاملات ارائه.
+DocType: Timesheet,Total Billable Amount,مجموع مبلغ قابل پرداخت
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,3 مورد
 DocType: Purchase Order,Customer Contact Email,مشتریان تماس با ایمیل
 DocType: Warranty Claim,Item and Warranty Details,آیتم و گارانتی اطلاعات
 DocType: Sales Team,Contribution (%),سهم (٪)
-apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,توجه: ورودی پرداخت خواهد از ایجاد شوند &quot;نقدی یا حساب بانکی &#39;مشخص نشده بود
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Responsibilities,مسئولیت
+apps/erpnext/erpnext/controllers/accounts_controller.py +78,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,مسئولیت
 DocType: Expense Claim Account,Expense Claim Account,حساب ادعای هزینه
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,قالب
 DocType: Sales Person,Sales Person Name,نام فروشنده
@@ -2875,6 +2913,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,اضافه کردن کاربران
 DocType: Pricing Rule,Item Group,مورد گروه
 DocType: Item,Safety Stock,سهام ایمنی
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,کد کالا&gt; مورد گروه&gt; نام تجاری
 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),مالیات و هزینه اضافه شده (شرکت ارز)
@@ -2884,7 +2923,6 @@
 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: Timesheet,Total Hours,جمع ساعت
 DocType: Journal Entry,Printing Settings,تنظیمات چاپ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Total Debit must be equal to Total Credit. The difference is {0},دبیت مجموع باید به مجموع اعتبار مساوی باشد. تفاوت در این است {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,خودرو
@@ -2897,13 +2935,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,بانکداری سرمایه گذاری
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +71,Cash or Bank Account is mandatory for making payment entry,نقدی یا حساب بانکی برای ساخت پرداخت ورود الزامی است
 DocType: Purchase Invoice,Price List Exchange Rate,لیست قیمت نرخ ارز
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ضوابط&gt; ضوابط گروه&gt; قلمرو
 DocType: Purchase Invoice Item,Rate,نرخ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Intern,انترن
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,انترن
 DocType: Stock Entry,From BOM,از BOM
 DocType: Assessment,Assessment Code,کد ارزیابی
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +32,Basic,پایه
+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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',لطفا بر روی &#39;ایجاد برنامه کلیک کنید
+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 +95,Reference No is mandatory if you entered Reference Date,مرجع بدون اجباری است اگر شما وارد مرجع تاریخ
@@ -2912,11 +2951,11 @@
 DocType: Salary Slip,Salary Structure,ساختار حقوق و دستمزد
 DocType: Account,Bank,بانک
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,شرکت هواپیمایی
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +752,Issue Material,مواد شماره
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +723,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 +683,You are in offline mode. You will not be able to reload until you have network.,شما در حالت آفلاین می باشد. شما نمی قادر خواهد بود به بارگذاری مجدد تا زمانی که شما به شبکه است.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +665,You are in offline mode. You will not be able to reload until you have network.,شما در حالت آفلاین می باشد. شما نمی قادر خواهد بود به بارگذاری مجدد تا زمانی که شما به شبکه وصل شوید.
 DocType: Hub Settings,Access Token,نشانه دسترسی
 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,شماره سریال
@@ -2924,33 +2963,35 @@
 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 +1122,Enter value must be positive,را وارد کنید مقدار باید مثبت باشد
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,All Territories,همه مناطق
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1125,Enter value must be positive,را وارد کنید مقدار باید مثبت باشد
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,همه مناطق
 DocType: Purchase Invoice,Items,اقلام
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +23,Student is already enrolled.,دانشجو در حال حاضر ثبت نام.
 DocType: Fiscal Year,Year Name,نام سال
 DocType: Process Payroll,Process Payroll,حقوق و دستمزد فرآیند
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,می تعطیلات بیشتر از روز کاری در این ماه وجود دارد.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +233,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 +96,Request for Quotations,درخواست نرخ
+apps/erpnext/erpnext/hooks.py +104,Request for Quotations,درخواست نرخ
 DocType: Payment Reconciliation,Maximum Invoice Amount,حداکثر مبلغ فاکتور
 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 +628,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',واحد اندازه گیری پیش فرض برای متغیر &#39;{0}&#39; باید همان است که در الگو: &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',واحد اندازه گیری پیش فرض برای متغیر &#39;{0}&#39; باید همان است که در الگو: &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,محاسبه بر اساس
 DocType: Delivery Note Item,From Warehouse,از انبار
 DocType: Assessment,Supervisor Name,نام استاد راهنما
+DocType: Assessment,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,خرید کاربر
 DocType: Notification Control,Customize the Notification,سفارشی اطلاع رسانی
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Cash Flow from Operations,جریان وجوه نقد از عملیات
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,به طور پیش فرض آدرس الگو نمی تواند حذف شود
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,به طور پیش فرض آدرس الگو نمی تواند حذف شود
 DocType: Sales Invoice,Shipping Rule,قانون حمل و نقل
 DocType: Manufacturer,Limited to 12 characters,محدود به 12 کاراکتر
 DocType: Journal Entry,Print Heading,چاپ سرنویس
@@ -2965,8 +3006,8 @@
 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/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,در هر دو صورت تعداد مورد نظر و یا مقدار هدف الزامی است
-apps/erpnext/erpnext/stock/get_item_details.py +485,No default BOM exists for Item {0},بدون پیش فرض BOM برای مورد وجود دارد {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +336,Please select Posting Date first,لطفا در ارسال تاریخ را انتخاب کنید اول
+apps/erpnext/erpnext/stock/get_item_details.py +486,No default BOM exists for Item {0},بدون پیش فرض BOM برای مورد وجود دارد {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +326,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,مرکز هزینه با معاملات موجود را نمی توان تبدیل به لجر
@@ -2982,6 +3023,7 @@
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,پرداخت بازی با فاکتورها
 DocType: Journal Entry,Bank Entry,بانک ورودی
 DocType: Authorization Rule,Applicable To (Designation),به (برای تعیین)
+,Profitability Analysis,تحلیل سودآوری
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,اضافه کردن به سبد
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,گروه توسط
 DocType: Guardian,Interests,منافع
@@ -2994,21 +3036,21 @@
 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 +141,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",مورد سریال {0} می تواند \ با استفاده از بورس آشتی نمی شود به روز شده
 DocType: Scheduling Tool,Day,روز
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,جدید بدون سریال را می انبار ندارد. انبار باید توسط بورس ورود یا رسید خرید مجموعه
 DocType: Lead,Lead Type,سرب نوع
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,You are not authorized to approve leaves on Block Dates,شما مجاز به تایید برگ در تاریخ های مسدود شده نیستید
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,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: Student Applicant,AP.,AP.
 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 +639,Point of Sale,نقطه ای از فروش
+apps/erpnext/erpnext/accounts/page/pos/pos.js +634,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,مالیات
 DocType: Production Planning Tool,Production Planning Tool,تولید ابزار برنامه ریزی
@@ -3017,74 +3059,77 @@
 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 +373,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 Entry,Update Rate and Availability,نرخ به روز رسانی و در دسترس بودن
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,درصد شما مجاز به دریافت و یا ارائه بیش برابر مقدار سفارش داد. به عنوان مثال: اگر شما 100 واحد دستور داده اند. و کمک هزینه خود را 10٪ و سپس شما مجاز به دریافت 110 واحد است.
 DocType: POS Profile,Customer Group,گروه مشتری
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,Expense account is mandatory for item {0},حساب هزینه برای آیتم الزامی است {0}
 DocType: Item,Website Description,وب سایت توضیحات
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date must be on or after today,بعدی تاریخ استهلاک باید در یا بعد امروز
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,تغییر خالص در حقوق صاحبان سهام
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +145,Please cancel Purchase Invoice {0} first,لطفا لغو خرید فاکتور {0} برای اولین بار
 DocType: Serial No,AMC Expiry Date,AMC تاریخ انقضاء
 ,Sales Register,ثبت فروش
 DocType: Quotation,Quotation Lost Reason,نقل قول را فراموش کرده اید دلیل
+apps/erpnext/erpnext/utilities/doctype/address/address.py +164,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,بدون آدرس پیش فرض الگو پیدا شده است. لطفا یکی از جدید از راه اندازی&gt; چاپ و تبلیغات تجاری&gt; آدرس الگو ایجاد کنید.
 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 +330,Transaction reference no {0} dated {1},معامله مرجع {0} تاریخ {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Transaction reference no {0} dated {1},معامله مرجع {0} تاریخ {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,چیزی برای ویرایش وجود دارد.
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,Summary for this month and pending activities,خلاصه برای این ماه و فعالیت های انتظار
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,خلاصه برای این ماه و فعالیت های انتظار
 DocType: Customer Group,Customer Group Name,نام گروه مشتری
 apps/erpnext/erpnext/public/js/financial_statements.js +54,Cash Flow Statement,صورت جریان وجوه نقد
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Please remove this Invoice {0} from C-Form {1},لطفا این فاکتور {0} از C-فرم حذف {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Please remove this Invoice {0} from C-Form {1},لطفا این فاکتور {0} از C-فرم حذف {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,لطفا انتخاب کنید حمل به جلو اگر شما نیز می خواهید که شامل تعادل سال گذشته مالی برگ به سال مالی جاری
 DocType: GL Entry,Against Voucher Type,در برابر نوع کوپن
 DocType: Item,Attributes,ویژگی های
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +644,Get Items,گرفتن اقلام
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +623,Get Items,گرفتن اقلام
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +210,Please enter Write Off Account,لطفا وارد حساب فعال
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,تاریخ و زمان آخرین چینش تاریخ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +41,Account {0} does not belongs to company {1},حساب {0} به شرکت {1} تعلق ندارد
+DocType: Student,Guardian Details,نگهبان جزییات
 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,برنامه ریزی تاریخ شروع
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,Customer is required against Receivable account {0},ضوابط به حساب دریافتنی مورد نیاز است {0}
 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 +265,Project-wise data is not available for Quotation,اطلاعات پروژه و زرنگ در دسترس برای عین نمی
+apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,اطلاعات پروژه و زرنگ در دسترس برای عین نمی
 DocType: Project,Expected End Date,انتظار می رود تاریخ پایان
 DocType: Budget Account,Budget Amount,بودجه مقدار
 DocType: Appraisal Template,Appraisal Template Title,ارزیابی الگو عنوان
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,Commercial,تجاری
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,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 +648,Row {0}# Account must be of type 'Fixed Asset',ردیف {0} # حساب باید از این نوع باشد، دارایی ثابت &#39;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,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 +30,Series is mandatory,سری الزامی است
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +50,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}
 DocType: Leave Allocation,Unused leaves,برگ استفاده نشده
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Cr,کروم
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Cr,کروم
 DocType: Tax Rule,Billing State,دولت صدور صورت حساب
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +250,Transfer,انتقال
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +187,{0} {1} does not associated with Party Account {2},{0} {1} با حساب حزب همراه نیست {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,Fetch exploded BOM (including sub-assemblies),واکشی BOM منفجر شد (از جمله زیر مجموعه)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +254,Transfer,انتقال
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +190,{0} {1} does not associated with Party Account {2},{0} {1} با حساب حزب همراه نیست {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +796,Fetch exploded BOM (including sub-assemblies),واکشی BOM منفجر شد (از جمله زیر مجموعه)
 DocType: Authorization Rule,Applicable To (Employee),به قابل اجرا (کارمند)
-apps/erpnext/erpnext/controllers/accounts_controller.py +115,Due Date is mandatory,تاریخ الزامی است
+apps/erpnext/erpnext/controllers/accounts_controller.py +118,Due Date is mandatory,تاریخ الزامی است
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,افزایش برای صفت {0} نمی تواند 0
 DocType: Journal Entry,Pay To / Recd From,پرداخت به / از Recd
 DocType: Naming Series,Setup Series,راه اندازی سری
 DocType: Payment Reconciliation,To Invoice Date,به فاکتور تاریخ
 DocType: Supplier,Contact HTML,تماس با HTML
 ,Inactive Customers,مشتریان غیر فعال
+DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,رسید خرید
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,چگونه قیمت گذاری قانون اعمال می شود؟
 DocType: Quality Inspection,Delivery Note No,تحویل توجه داشته باشید هیچ
@@ -3093,7 +3138,7 @@
 DocType: Company,Retail,خرده فروشی
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +120,Customer {0} does not exist,مشتری {0} وجود ندارد
 DocType: Attendance,Absent,غایب
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +587,Product Bundle,بسته نرم افزاری محصولات
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Product Bundle,بسته نرم افزاری محصولات
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Invalid reference {1},ردیف {0}: مرجع نامعتبر {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,خرید مالیات و هزینه الگو
 DocType: Upload Attendance,Download Template,دانلود الگو
@@ -3103,8 +3148,8 @@
 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 +742,Send Supplier Emails,ارسال ایمیل کننده
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +104,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",حقوق و دستمزد در حال حاضر برای دوره بین {0} و {1}، ترک دوره نرم افزار نمی تواند بین این محدوده تاریخ پردازش شده است.
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +708,Send Supplier Emails,ارسال ایمیل کننده
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,"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,نگهبان علاقه
 DocType: Timesheet,Employee Detail,جزئیات کارمند
@@ -3115,9 +3160,9 @@
 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/accounts/doctype/gl_entry/gl_entry.py +77,Account {0} cannot be a Group,حساب {0} نمی تواند یک گروه باشد
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} cannot be a Group,حساب {0} نمی تواند یک گروه باشد
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +31,Optional. This setting will be used to filter in various transactions.,اختیاری است. این تنظیم استفاده می شود برای فیلتر کردن در معاملات مختلف است.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +107,Negative Valuation Rate is not allowed,نرخ گذاری منفی مجاز نیست
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,نرخ گذاری منفی مجاز نیست
 DocType: Holiday List,Weekly Off,فعال هفتگی
 DocType: Fiscal Year,"For e.g. 2012, 2012-13",برای مثال 2012، 2012-13
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +39,Provisional Profit / Loss (Credit),موقت سود / زیان (اعتباری)
@@ -3131,16 +3176,16 @@
 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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: مرکز هزینه برای مورد الزامی است {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +626,Get Items from Product Bundle,گرفتن اقلام از بسته نرم افزاری محصولات
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +605,Get Items from Product Bundle,گرفتن اقلام از بسته نرم افزاری محصولات
 DocType: Asset,Straight Line,خط مستقیم
 DocType: Project User,Project User,پروژه کاربر
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} is inactive,حساب {0} غیر فعال است
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} is inactive,حساب {0} غیر فعال است
 DocType: GL Entry,Is Advance,آیا پیشرفته
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,حضور و غیاب حضور و غیاب از تاریخ و به روز الزامی است
 apps/erpnext/erpnext/controllers/buying_controller.py +148,Please enter 'Is Subcontracted' as Yes or No,لطفا وارد است واگذار شده به عنوان بله یا نه
 DocType: Sales Team,Contact No.,تماس با شماره
 DocType: Bank Reconciliation,Payment Entries,مطالب پرداخت
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,'Profit and Loss' type account {0} not allowed in Opening Entry,'سود و زیان' نوع حساب {0} در افتتاح ورودی مجاز نیست
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +71,'Profit and Loss' type account {0} not allowed in Opening Entry,'سود و زیان' نوع حساب {0} در افتتاح ورودی مجاز نیست
 DocType: Program Enrollment Tool,Get Students From,مطلع دانش آموزان از
 DocType: Hub Settings,Seller Country,فروشنده کشور
 apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,انتشار موارد در وب سایت
@@ -3159,7 +3204,7 @@
 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 +558,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",ردیف # {0}: دارایی {1} نمی تواند ارائه شود، آن است که در حال حاضر {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +561,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",ردیف # {0}: دارایی {1} نمی تواند ارائه شود، آن است که در حال حاضر {2}
 DocType: Tax Rule,Billing Country,کشور صدور صورت حساب
 DocType: Production Order,Expected Delivery Date,انتظار می رود تاریخ تحویل
 apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,بدهی و اعتباری برای {0} # برابر نیست {1}. تفاوت در این است {2}.
@@ -3172,13 +3217,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +202,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: Sales Order,% Amount Billed,٪ مبلغ صورتحساب
+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 +117,No Item with Serial No {0},آیتم با سریال بدون هیچ {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,گسترش اطلاعیه
+DocType: Email Digest,Open Notifications,گسترش اطلاعیه
 DocType: Payment Entry,Difference Amount (Company Currency),تفاوت در مقدار (شرکت ارز)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,هزینه های مستقیم
 apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
@@ -3186,7 +3231,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,جدید درآمد و ضوابط
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,هزینه های سفر
 DocType: Maintenance Visit,Breakdown,تفکیک
-apps/erpnext/erpnext/controllers/accounts_controller.py +634,Account: {0} with currency: {1} can not be selected,حساب: {0} با ارز: {1} نمی تواند انتخاب شود
+apps/erpnext/erpnext/controllers/accounts_controller.py +637,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}
 DocType: Program Enrollment Tool,Student Applicants,متقاضیان دانشجو
@@ -3194,15 +3239,15 @@
 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 +56,Probation,عفو مشروط
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Probation,عفو مشروط
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,قطعات حقوق و دستمزد
 DocType: Program Enrollment Tool,New Academic Year,سال تحصیلی
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Payment of salary for the month {0} and year {1},پرداخت حقوق و دستمزد برای ماه {0} و {1} سال
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Payment of salary for the month {0} and year {1},پرداخت حقوق و دستمزد برای ماه {0} و {1} سال
 DocType: Stock Settings,Auto insert Price List rate if missing,درج خودرو نرخ لیست قیمت اگر از دست رفته
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,کل مقدار پرداخت
 DocType: Production Order Item,Transferred Qty,انتقال تعداد
 apps/erpnext/erpnext/config/learn.py +11,Navigating,ناوبری
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Planning,برنامه ریزی
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,برنامه ریزی
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,صادر
 DocType: Project,Total Billing Amount (via Time Logs),کل مقدار حسابداری (از طریق زمان سیاههها)
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,We sell this Item,ما فروش این مورد
@@ -3215,11 +3260,10 @@
 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/accounts/page/pos/pos.js +1376,Sales invoice submitted sucessfully.,فاکتور فروش با موفقیت ارسال.
 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}
 DocType: Assessment Result,Student Name,نام دانش آموز
-apps/erpnext/erpnext/hooks.py +104,Assessment Schedule,برنامه ارزیابی
+apps/erpnext/erpnext/hooks.py +113,Assessment Schedule,برنامه ارزیابی
 DocType: Brand,Item Manager,مدیریت آیتم ها
 DocType: Buying Settings,Default Supplier Type,به طور پیش فرض نوع تامین کننده
 DocType: Production Order,Total Operating Cost,مجموع هزینه های عملیاتی
@@ -3229,6 +3273,7 @@
 DocType: GL Entry,Party Type,نوع حزب
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +78,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,حداکثر روز مرخصی مجاز
@@ -3240,18 +3285,19 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,پیشنهاد قیمت برای مشتریان یا مشتریان بالقوه
 DocType: Stock Settings,Role Allowed to edit frozen stock,نقش مجاز به ویرایش سهام منجمد
 ,Territory Target Variance Item Group-Wise,منطقه مورد هدف واریانس گروه حکیم
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Customer Groups,همه گروه های مشتری
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +78,Accumulated Monthly,انباشته ماهانه
-apps/erpnext/erpnext/controllers/accounts_controller.py +595,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} الزامی است. شاید رکورد ارز برای {1} به {2} ایجاد نمی شود.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,همه گروه های مشتری
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +81,Accumulated Monthly,انباشته ماهانه
+apps/erpnext/erpnext/controllers/accounts_controller.py +598,{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} وجود ندارد
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),لیست قیمت نرخ (شرکت ارز)
 DocType: Products Settings,Products Settings,محصولات تنظیمات
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +188,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,لطفا نامگذاری سری برای {0} از طریق راه اندازی&gt; تنظیمات&gt; نامگذاری سری
 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 +84,Secretary,دبیر
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,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,خرید
@@ -3260,24 +3306,22 @@
 ,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,نام ارزیابی
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,ردیف # {0}: سریال نه اجباری است
+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 +859,Supplier Quotation,نقل قول تامین کننده
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +838,Supplier Quotation,نقل قول تامین کننده
 DocType: Quotation,In Words will be visible once you save the Quotation.,به عبارت قابل مشاهده خواهد بود هنگامی که شما نقل قول را نجات دهد.
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +7,Collect Fees,جمع آوری هزینه
+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}
 DocType: Lead,Add to calendar on this date,افزودن به تقویم در این تاریخ
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,مشاهده قوانین برای اضافه کردن هزینه های حمل و نقل.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,رویدادهای نزدیک
 DocType: Item,Opening Stock,سهام باز کردن
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,مشتری مورد نیاز است
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} برای بازگشت الزامی است
 DocType: Purchase Order,To Receive,برای دریافت
 apps/erpnext/erpnext/public/js/setup_wizard.js +195,user@example.com,user@example.com
-DocType: Email Digest,Income / Expense,درآمد / هزینه
 DocType: Employee,Personal Email,ایمیل شخصی
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,واریانس ها
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.",اگر فعال باشد، سیستم مطالب حسابداری برای موجودی ارسال به صورت خودکار.
@@ -3288,13 +3332,14 @@
 DocType: Customer,From Lead,از سرب
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,سفارشات برای تولید منتشر شد.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,انتخاب سال مالی ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,POS Profile required to make POS Entry,نمایش POS مورد نیاز برای ایجاد POS ورود
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +509,POS Profile required to make POS Entry,نمایش POS مورد نیاز برای ایجاد POS ورود
 DocType: Program Enrollment Tool,Enroll Students,ثبت نام دانش آموزان
 DocType: Hub Settings,Name Token,نام رمز
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,فروش استاندارد
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Atleast one warehouse is mandatory,حداقل یک انبار الزامی است
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +129,Atleast one warehouse is mandatory,حداقل یک انبار الزامی است
 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 +330,{0} against Sales Invoice {1},{0} در برابر فاکتور فروش {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,نام پروژه
@@ -3315,10 +3360,11 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,برگ باید در تقسیم عددی بر مضرب 0.5 اختصاص داده
 DocType: Production Order,Operation Cost,هزینه عملیات
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,آپلود حضور از یک فایل. CSV
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,برجسته AMT
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,مجموعه اهداف مورد گروه عاقلانه برای این فرد از فروش.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],سهام یخ قدیمی تر از [روز]
-apps/erpnext/erpnext/controllers/accounts_controller.py +528,Row #{0}: Asset is mandatory for fixed asset purchase/sale,ردیف # {0}: دارایی برای دارائی های ثابت خرید / فروش اجباری است
+apps/erpnext/erpnext/controllers/accounts_controller.py +531,Row #{0}: Asset is mandatory for fixed asset purchase/sale,ردیف # {0}: دارایی برای دارائی های ثابت خرید / فروش اجباری است
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.",اگر دو یا چند قوانین قیمت گذاری هستند در بر داشت بر اساس شرایط فوق، اولویت اعمال می شود. اولویت یک عدد بین 0 تا 20 است در حالی که مقدار پیش فرض صفر (خالی) است. تعداد بالاتر به معنی آن خواهد ارجحیت دارد اگر قوانین قیمت گذاری های متعدد را با شرایط مشابه وجود دارد.
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,سال مالی: {0} می کند وجود دارد نمی
 DocType: Currency Exchange,To Currency,به ارز
@@ -3335,15 +3381,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,سهام خصوصی
 DocType: Maintenance Visit,Customer Feedback,نظرسنجی
 DocType: Account,Expense,هزینه
-DocType: Sales Invoice,Exhibition,نمایشگاه
 apps/erpnext/erpnext/utilities/doctype/address/address.py +77,"Company is mandatory, as it is your company address",شرکت اجباری است، آن را به عنوان آدرس شرکت شما است
 DocType: Item Attribute,From Range,از محدوده
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +81,Syntax error in formula or condition: {0},خطای نحوی در فرمول یا شرایط: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +92,Syntax error in formula or condition: {0},خطای نحوی در فرمول یا شرایط: {0}
 apps/erpnext/erpnext/stock/utils.py +99,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 +28,Jobs,شغل ها
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,شغل ها
 ,Sales Order Trends,سفارش فروش روند
 DocType: Employee,Held On,برگزار
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,مورد تولید
@@ -3352,16 +3398,16 @@
 DocType: Stock Entry Detail,Additional Cost,هزینه های اضافی
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,مالی سال پایان تاریخ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher",می توانید بر روی کوپن نه فیلتر بر اساس، در صورتی که توسط کوپن گروه بندی
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +763,Make Supplier Quotation,را عین تامین کننده
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,Make Supplier Quotation,را عین تامین کننده
 DocType: Quality Inspection,Incoming,وارد شونده
 DocType: BOM,Materials Required (Exploded),مواد مورد نیاز (منفجر شد)
 apps/erpnext/erpnext/public/js/setup_wizard.js +185,"Add users to your organization, other than yourself",اضافه کردن کاربران به سازمان شما، به غیر از خودتان
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,Row # {0}: Serial No {1} does not match with {2} {3},ردیف # {0}: سریال نه {1} با مطابقت ندارد {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +42,Casual Leave,مرخصی گاه به گاه
+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,مرخصی گاه به گاه
 DocType: Batch,Batch ID,دسته ID
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,Note: {0},توجه: {0}
 ,Delivery Note Trends,روند تحویل توجه داشته باشید
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +103,This Week's Summary,خلاصه این هفته
+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} تنها می تواند از طریق معاملات سهام به روز شده
 DocType: Student Group Creation Tool,Get Courses,دوره های
 DocType: GL Entry,Party,حزب
@@ -3371,7 +3417,7 @@
 DocType: Request for Quotation Item,Request for Quotation Item,درخواست برای مورد دیگر
 DocType: Purchase Order,To Bill,به بیل
 DocType: Material Request,% Ordered,مرتب٪
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Piecework,کار از روی مقاطعه
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Piecework,کار از روی مقاطعه
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,اوسط نرخ خرید
 DocType: Task,Actual Time (in Hours),زمان واقعی (در ساعت)
 DocType: Employee,History In Company,تاریخچه در شرکت
@@ -3388,7 +3434,7 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +350,{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 +162,Black,سیاه
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,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} کالاهای تولید شده
@@ -3399,13 +3445,13 @@
 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 +69,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,علامت گذاری به عنوان غایب
 DocType: Journal Entry Account,Exchange Rate,مظنهء ارز
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Sales Order {0} is not submitted,سفارش فروش {0} است ارسال نشده
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +527,Sales Order {0} is not submitted,سفارش فروش {0} است ارسال نشده
 DocType: Homepage,Tag Line,نقطه حساس
 DocType: Fee Component,Fee Component,هزینه یدکی
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +857,Add items from,اضافه کردن آیتم از
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +836,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: Cheque Print Template,Regular,منظم
 DocType: BOM,Last Purchase Rate,تاریخ و زمان آخرین نرخ خرید
@@ -3413,6 +3459,7 @@
 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} از انواع است
 ,Sales Person-wise Transaction Summary,فروش شخص عاقل خلاصه معامله
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +60,Cost Center is required for 'Profit and Loss' account {0}. Please set up a default Cost Center for the Company.,مرکز هزینه برای سود و زیان، حساب {0} مورد نیاز است. لطفا راه اندازی یک مرکز هزینه به طور پیش فرض برای شرکت.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,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,درصد ماهانه توزیع
@@ -3423,12 +3470,12 @@
 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 +710,Online,آنلاین
+apps/erpnext/erpnext/accounts/page/pos/pos.js +692,Online,آنلاین
 ,Available Stock for Packing Items,انبار موجود آیتم ها بسته بندی
 DocType: Item Variant,Item Variant,مورد نوع
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,تنظیم این آدرس الگو به عنوان پیش فرض به عنوان پیش فرض هیچ دیگر وجود دارد
+apps/erpnext/erpnext/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'",مانده حساب در حال حاضر در بدهی، شما امکان پذیر نیست را به مجموعه &quot;تعادل باید به عنوان&quot; اعتبار &quot;
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Quality Management,مدیریت کیفیت
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,مدیریت کیفیت
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,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,کارمند خارجی سابقه کار
@@ -3450,11 +3497,12 @@
 DocType: Student,Student Email ID,دانشجو ID ایمیل
 DocType: Employee,Notice (days),مقررات (روز)
 DocType: Tax Rule,Sales Tax Template,قالب مالیات بر فروش
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1520,Select items to save the invoice,انتخاب آیتم ها برای صرفه جویی در فاکتور
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1544,Select items to save the invoice,انتخاب آیتم ها برای صرفه جویی در فاکتور
 DocType: Employee,Encashment Date,Encashment عضویت
 DocType: Account,Stock Adjustment,تنظیم سهام
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},هزینه به طور پیش فرض برای فعالیت نوع فعالیت وجود دارد - {0}
 DocType: Production Order,Planned Operating Cost,هزینه های عملیاتی برنامه ریزی شده
+DocType: Academic Term,Term Start Date,مدت تاریخ شروع
 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,نام متقاضی
@@ -3484,17 +3532,17 @@
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,حساب برای انبار (موجودی ابدی) خواهد شد تحت این حساب ایجاد شده است.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +119,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,انبار نمی تواند حذف شود به عنوان ورودی سهام دفتر برای این انبار وجود دارد.
 DocType: Company,Distribution,توزیع
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +8,Amount Paid,مبلغ پرداخت شده
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Project Manager,مدیر پروژه
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,مبلغ پرداخت شده
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,مدیر پروژه
 ,Quoted Item Comparison,مورد نقل مقایسه
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Dispatch,اعزام
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,اعزام
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,حداکثر تخفیف را برای آیتم: {0} {1}٪ است
 apps/erpnext/erpnext/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.,نقش است که مجاز به ارائه معاملات است که بیش از محدودیت های اعتباری تعیین شده است.
-DocType: Sales Invoice,Supplier Reference,مرجع عرضه کننده کالا
-apps/erpnext/erpnext/accounts/page/pos/pos.js +844,"Master data syncing, it might take some time",استاد همگام سازی داده های، ممکن است برخی از زمان
+apps/erpnext/erpnext/accounts/page/pos/pos.js +832,"Master data syncing, it might take some time",استاد همگام سازی داده های، ممکن است برخی از زمان
 DocType: Item,Material Issue,شماره مواد
 DocType: Hub Settings,Seller Description,فروشنده توضیحات
 DocType: Employee Education,Qualification,صلاحیت
@@ -3508,7 +3556,7 @@
 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 +83,Error in formula or condition,اشکال در فرمول یا شرایط
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,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,همه موارد را از حالت انتخاب خارج کنید
@@ -3517,7 +3565,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},به روز باید در سال مالی باشد. با فرض به روز = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc",در اینجا شما می توانید قد، وزن، آلرژی ها، نگرانی های پزشکی و غیره حفظ
 DocType: Leave Block List,Applies to Company,امر به شرکت
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +197,Cannot cancel because submitted Stock Entry {0} exists,نمی تواند به دلیل لغو ارائه سهام ورود {0} وجود دارد
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +198,Cannot cancel because submitted Stock Entry {0} exists,نمی تواند به دلیل لغو ارائه سهام ورود {0} وجود دارد
 DocType: Purchase Invoice,In Words,به عبارت
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,Today is {0}'s birthday!,امروز {0} تولد است!
 DocType: Production Planning Tool,Material Request For Warehouse,درخواست مواد ذخیره سازی
@@ -3527,14 +3575,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,سال مالی شما آغاز می شود
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Depreciations دارایی و تعادل
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +319,Amount {0} {1} transferred from {2} to {3},مقدار {0} {1} منتقل شده از {2} به {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +322,Amount {0} {1} transferred from {2} to {3},مقدار {0} {1} منتقل شده از {2} به {3}
 DocType: Sales Invoice,Get Advances Received,دریافت پیشرفت های دریافتی
 DocType: Email Digest,Add/Remove Recipients,اضافه کردن / حذف دریافت کنندگان
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +432,Transaction not allowed against stopped Production Order {0},معامله در برابر تولید متوقف مجاز ترتیب {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +437,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 +143,Join,پیوستن
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,کمبود تعداد
-apps/erpnext/erpnext/stock/doctype/item/item.py +652,Item variant {0} exists with same attributes,نوع مورد {0} با ویژگی های مشابه وجود دارد
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,نوع مورد {0} با ویژگی های مشابه وجود دارد
+DocType: Leave Application,LAP/,LAP /
 DocType: Salary Slip,Salary 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,'تا تاریخ' مورد نیاز است
@@ -3542,12 +3591,12 @@
 DocType: Sales Invoice Item,Sales Order Item,مورد سفارش فروش
 DocType: Salary Slip,Payment Days,روز پرداخت
 DocType: Customer,Dormant,خوابیده
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +212,Warehouses with child nodes cannot be converted to ledger,انبارها با گره فرزند را نمی توان تبدیل به لجر
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +215,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/public/js/controllers/transaction.js +866,It is needed to fetch Item Details.,آن را به واکشی اطلاعات مورد نیاز است.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +857,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} در حال حاضر دریافت شده است
@@ -3557,14 +3606,14 @@
 DocType: Expense Claim,Total Claimed Amount,مجموع مقدار ادعا
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,فرصت های بالقوه برای فروش.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,Invalid {0},نامعتبر {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Sick Leave,مرخصی استعلاجی
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,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,فروشگاه های گروه
 DocType: Warehouse,PIN,PIN
 DocType: Sales Invoice,Base Change Amount (Company Currency),پایه تغییر مقدار (شرکت ارز)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +313,No accounting entries for the following warehouses,هیچ نوشته حسابداری برای انبار زیر
-apps/erpnext/erpnext/projects/doctype/project/project.js +102,Save the document first.,ذخیره سند اول است.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +314,No accounting entries for the following warehouses,هیچ نوشته حسابداری برای انبار زیر
+apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,ذخیره سند اول است.
 DocType: Account,Chargeable,پرشدنی
 DocType: Company,Change Abbreviation,تغییر اختصار
 DocType: Expense Claim Detail,Expense Date,هزینه عضویت
@@ -3577,10 +3626,9 @@
 DocType: Purchase Invoice,Recurring Print Format,تکرار چاپ فرمت
 DocType: C-Form,Series,سلسله
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,Expected Delivery Date cannot be before Purchase Order Date,انتظار می رود تاریخ تحویل نمی تواند قبل از سفارش خرید تاریخ
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,لطفا نامگذاری سری برای {0} از طریق راه اندازی&gt; تنظیمات&gt; نامگذاری سری
 DocType: Appraisal,Appraisal Template,ارزیابی الگو
 DocType: Item Group,Item Classification,طبقه بندی مورد
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Business Development Manager,مدیر توسعه تجاری
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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,لجر عمومی
@@ -3590,8 +3638,8 @@
 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 +940,Please select {0} first,لطفا انتخاب کنید {0} برای اولین بار
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +749,Batch {0} of Item {1} has expired.,دسته {0} از {1} مورد تمام شده است.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +953,Please select {0} first,لطفا انتخاب کنید {0} برای اولین بار
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +757,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,جمع جزء
@@ -3608,8 +3656,8 @@
 {% 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 +92,Warehouse not found in the system,انبار در سیستم یافت نشد
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +106,This Month's Summary,خلاصه این ماه
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,انبار در سیستم یافت نشد
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,خلاصه این ماه
 DocType: Quality Inspection Reading,Quality Inspection Reading,خواندن بازرسی کیفیت
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`سهام منجمد قدیمی تر از` باید کوچکتر از %d روز باشد.
 DocType: Tax Rule,Purchase Tax Template,خرید قالب مالیات
@@ -3619,21 +3667,22 @@
 DocType: Item Customer Detail,Ref Code,کد
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,سوابق کارکنان.
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Please set Next Depreciation Date,لطفا بعد تاریخ استهلاک
-DocType: Payment Gateway,Payment Gateway,دروازه پرداخت
 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 +378,Operation Time must be greater than 0 for Operation {0},عملیات زمان باید بیشتر از 0 برای عملیات می شود {0}
+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/accounts/doctype/account/account.py +170,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)
 DocType: Program,Program Abbreviation,مخفف برنامه
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,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: Appraisal,Start Date,تاریخ شروع
@@ -3649,21 +3698,22 @@
 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,حذف آیتم اگر از اتهامات عنوان شده و قابل انطباق با آن قلم نمی
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,به عنوان مثال. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +27,Transaction currency must be same as Payment Gateway currency,ارز معامله باید به عنوان دروازه پرداخت ارز باشد
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Transaction currency must be same as Payment Gateway currency,ارز معامله باید به عنوان دروازه پرداخت ارز باشد
 DocType: Payment Entry,Receive,دريافت كردن
+apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,نقل قول:
 DocType: Maintenance Visit,Fully Completed,طور کامل تکمیل شده
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}٪ کامل شد
 DocType: Employee,Educational Qualification,صلاحیت تحصیلی
 DocType: Workstation,Operating Costs,هزینه های عملیاتی
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,اکشن اگر انباشته بودجه ماهانه بیش از حد
 DocType: Purchase Invoice,Submit on creation,ارسال در ایجاد
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +432,Currency for {0} must be {1},ارز برای {0} باید {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +435,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 +493,Row {0}: An Reorder entry already exists for this warehouse {1},ردیف {0}: ورود ترتیب مجدد در حال حاضر برای این انبار وجود دارد {1}
+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/crm/doctype/opportunity/opportunity.py +79,"Cannot declare as lost, because Quotation has been made.",نمی تواند به عنوان از دست رفته اعلام، به دلیل عبارت ساخته شده است.
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,خرید استاد مدیر
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +429,Production Order {0} must be submitted,سفارش تولید {0} باید ارائه شود
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +434,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,تا به امروز نمی تواند قبل از از تاریخ
@@ -3673,25 +3723,27 @@
 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 +181,Totals,مجموع
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,مجموع
 DocType: BOM,Manufacturing,ساخت
 ,Ordered Items To Be Delivered,آیتم ها دستور داد تا تحویل
 DocType: Account,Income,درامد
 DocType: Industry Type,Industry Type,نوع صنعت
 apps/erpnext/erpnext/templates/includes/cart.js +141,Something went wrong!,مشکلی!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,Warning: Leave application contains following block dates,هشدار: بگذارید برنامه شامل تاریخ های بلوک زیر
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +120,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} برای برای تکمیل این معامله.
+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 +181,Organization unit (department) master.,واحد سازمانی (گروه آموزشی) استاد.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,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 +793,All records are synced.,همه پرونده ها همگام سازی.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +781,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,هزینه نام مرکز
@@ -3710,21 +3762,20 @@
 DocType: Address,Name of person or organization that this address belongs to.,نام و نام خانوادگی شخص و یا سازمانی که این آدرس متعلق به.
 apps/erpnext/erpnext/public/js/setup_wizard.js +260,Your Suppliers,تامین کنندگان شما
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +49,Cannot set as Lost as Sales Order is made.,می توانید مجموعه ای نه به عنوان از دست داده تا سفارش فروش ساخته شده است.
-DocType: Student Applicant,Mother's Name,نام مادر
 DocType: Request for Quotation Item,Supplier Part No,کننده قسمت بدون
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +348,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',نمی توانید کسر وقتی دسته است برای ارزش گذاری &quot;یا&quot; Vaulation و مجموع:
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Received From,دریافت شده از
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Received From,دریافت شده از
 DocType: Lead,Converted,مبدل
 DocType: Item,Has Serial No,دارای سریال بدون
 DocType: Employee,Date of Issue,تاریخ صدور
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: از {0} برای {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +153,Row #{0}: Set Supplier for item {1},ردیف # {0}: تنظیم کننده برای آیتم {1}
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +93,Row {0}: Hours value must be greater than zero.,ردیف {0}: ارزش ساعت باید بزرگتر از صفر باشد.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +117,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} را نمی توان یافت
 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 +172,{0} {1} does not exist,{0} {1} وجود ندارد
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +175,{0} {1} does not exist,{0} {1} وجود ندارد
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,Please check Multi Currency option to allow accounts with other currency,لطفا گزینه ارز چند اجازه می دهد تا حساب با ارز دیگر را بررسی کنید
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +72,Item: {0} does not exist in the system,مورد: {0} در سیستم وجود ندارد
 apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,شما مجاز به تنظیم مقدار ثابت شده نیستید
@@ -3733,13 +3784,14 @@
 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/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,حضور و غیاب می تواند برای تاریخ های آینده باشد مشخص شده
 DocType: Pricing Rule,Pricing Rule Help,قانون قیمت گذاری راهنما
 DocType: Purchase Taxes and Charges,Account Head,سر حساب
 apps/erpnext/erpnext/config/stock.py +163,Update additional costs to calculate landed cost of items,به روز رسانی هزینه های اضافی برای محاسبه هزینه فرود آمد از اقلام
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Electrical,برق
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Electrical,برق
 DocType: Stock Entry,Total Value Difference (Out - In),تفاوت ارزش ها (خارج - در)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,Row {0}: Exchange Rate is mandatory,ردیف {0}: نرخ ارز الزامی است
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID کاربر برای کارمند تنظیم نشده {0}
@@ -3747,7 +3799,7 @@
 DocType: Item,Customer Code,کد مشتری
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +210,Birthday Reminder for {0},یادآوری تاریخ تولد برای {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,روز پس از آخرین سفارش
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +292,Debit To account must be a Balance Sheet account,بدهکاری به حساب کاربری باید یک حساب ترازنامه شود
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To account must be a Balance Sheet account,بدهکاری به حساب کاربری باید یک حساب ترازنامه شود
 DocType: Buying Settings,Naming Series,نامگذاری سری
 DocType: Leave Block List,Leave Block List Name,ترک نام فهرست بلوک
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,دارایی های سهام
@@ -3759,11 +3811,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 +301,Salary Slip of employee {0} already created for time sheet {1},لغزش حقوق و دستمزد کارکنان {0} در حال حاضر برای ورق زمان ایجاد {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +313,Salary Slip of employee {0} already created for time sheet {1},لغزش حقوق و دستمزد کارکنان {0} در حال حاضر برای ورق زمان ایجاد {1}
 DocType: Sales Order Item,Ordered Qty,دستور داد تعداد
-apps/erpnext/erpnext/stock/doctype/item/item.py +673,Item {0} is disabled,مورد {0} غیر فعال است
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} is disabled,مورد {0} غیر فعال است
 DocType: Stock Settings,Stock Frozen Upto,سهام منجمد تا حد
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +838,BOM does not contain any stock item,BOM هیچ گونه سهام مورد را نمی
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +809,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,تولید حقوق و دستمزد ورقه
@@ -3771,23 +3823,24 @@
 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 +485,Row #{0}: Please set reorder quantity,ردیف # {0}: لطفا مقدار سفارش مجدد مجموعه
+DocType: Sales Invoice Timesheet,Billing Hours,ساعت صدور صورت حساب
+apps/erpnext/erpnext/stock/doctype/item/item.py +487,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 +62,Please set {0},لطفا {0}
 DocType: Purchase Invoice,Repeat on Day of Month,تکرار در روز از ماه
 DocType: Employee,Health Details,جزییات بهداشت
 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,ثبت کردن تمام برگه حقوق و دستمزد برای معیارهای فوق انتخاب شده
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} آیتم ها همگام شدند
 DocType: Sales Order,Partly Delivered,تا حدودی تحویل
-DocType: Sales Invoice,Existing Customer,مشتری های موجود
 DocType: Email Digest,Receivables,مطالبات
+DocType: Lead Source,Lead Source,منبع سرب
 DocType: Customer,Additional information regarding the customer.,اطلاعات اضافی در مورد مشتری می باشد.
 DocType: Quality Inspection Reading,Reading 5,خواندن 5
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +38,Campaign Name is required,نام کمپین الزامی است
 DocType: Maintenance Visit,Maintenance Date,تاریخ نگهداری و تعمیرات
 DocType: Purchase Invoice Item,Rejected Serial No,رد سریال
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +80,Year start date or end date is overlapping with {0}. To avoid please set company,تاریخ شروع سال یا تاریخ پایان است با هم تداخل دارند با {0}. برای جلوگیری از به مدیر مجموعه شرکت
@@ -3795,10 +3848,9 @@
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.",مثال: ABCD ##### اگر سری قرار است و سریال بدون در معاملات ذکر نشده است، پس از آن به صورت خودکار شماره سریال بر اساس این مجموعه ایجاد شده است. اگر شما همیشه می خواهید سریال شماره به صراحت ذکر برای این آیتم. این را خالی بگذارید.
 DocType: Upload Attendance,Upload Attendance,بارگذاری حضور و غیاب
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +129,BOM and Manufacturing Quantity are required,BOM و ساخت تعداد مورد نیاز
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,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,حداکثر قدرت
-DocType: Bank Reconciliation Detail,Amount,مقدار
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM جایگزین
 ,Sales Analytics,تجزیه و تحلیل ترافیک فروش
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +113,Available {0},در دسترس {0}
@@ -3806,14 +3858,14 @@
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,راه اندازی ایمیل
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +96,Please enter default currency in Company Master,لطفا ارز به طور پیش فرض در شرکت استاد وارد
 DocType: Stock Entry Detail,Stock Entry Detail,جزئیات سهام ورود
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +100,Daily Reminders,یادآوری روزانه
+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/account/account_tree.js +23,New Account Name,نام حساب
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,هزینه مواد اولیه عرضه شده
 DocType: Selling Settings,Settings for Selling Module,تنظیمات برای فروش ماژول
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Customer Service,خدمات مشتریان
+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/config/hr.py +50,Offer candidate a Job.,پیشنهاد نامزد یک کار.
@@ -3822,8 +3874,9 @@
 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} باید مورد سهام است
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,پیش فرض کار در انبار پیشرفت
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1570,Total nos of serial no is not equal to quantity.,مجموع سنتاز از سریال است به مقدار برابر نیست.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1594,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,به روز رسانی سری شماره
@@ -3831,9 +3884,10 @@
 DocType: Sales Order,Printing Details,اطلاعات چاپ
 DocType: Task,Closing Date,اختتامیه عضویت
 DocType: Sales Order Item,Produced Quantity,مقدار زیاد تولید
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Engineer,مهندس
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Engineer,مهندس
+DocType: Journal Entry,Total Amount Currency,مبلغ کل ارز
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,مجامع جستجو فرعی
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Item Code required at Row No {0},کد مورد نیاز در ردیف بدون {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +398,Item Code required at Row No {0},کد مورد نیاز در ردیف بدون {0}
 DocType: Sales Partner,Partner Type,نوع شریک
 DocType: Purchase Taxes and Charges,Actual,واقعی
 DocType: Authorization Rule,Customerwise Discount,Customerwise تخفیف
@@ -3849,16 +3903,18 @@
 DocType: BOM,Raw Material Cost,هزینه مواد خام
 DocType: Item Reorder,Re-Order Level,ترتیب سطح
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,اقلام و تعداد برنامه ریزی شده که برای آن شما می خواهید به افزایش سفارشات تولید و یا دانلود کنید مواد خام برای تجزیه و تحلیل را وارد کنید.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +55,Part-time,پاره وقت
+apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,نمودار گانت
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,پاره وقت
 DocType: Employee,Applicable Holiday List,فهرست تعطیلات قابل اجرا
 DocType: Employee,Cheque,چک
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,سری به روز رسانی
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +57,Series Updated,سری به روز رسانی
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,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 +87,Clearance Date updated,تاریخ ترخیص کالا از به روز رسانی
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,موفقیت آشتی
@@ -3872,7 +3928,7 @@
 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 +513,Posting date and posting time is mandatory,تاریخ ارسال و زمان ارسال الزامی است
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,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.,به عبارت قابل مشاهده خواهد بود هنگامی که شما سفارش خرید را نجات دهد.
@@ -3882,7 +3938,7 @@
 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/stock/doctype/stock_entry/stock_entry.py +158,Target warehouse in row {0} must be same as Production Order,انبار هدف در ردیف {0} باید به همان ترتیب تولید می شود
+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,نرخ ارز می تواند پس از ساخت ورودی با استفاده از یک ارز دیگر، نمی توان تغییر داد
 DocType: Company,Round Off Account,دور کردن حساب
@@ -3891,23 +3947,22 @@
 DocType: Customer Group,Parent Customer Group,مشتریان پدر و مادر گروه
 DocType: Purchase Invoice,Contact Email,تماس با ایمیل
 DocType: Appraisal Goal,Score Earned,امتیاز کسب
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Notice Period,مقررات دوره
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,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 +4,New Sales Person Name,نام شخص جدید فروش
 DocType: Packing Slip,Gross Weight UOM,وزن UOM
-DocType: Email Digest,Receivables / Payables,مطالبات / بدهی
 DocType: Delivery Note Item,Against Sales Invoice,در برابر فاکتور فروش
 DocType: Bin,Reserved Qty for Production,تعداد مادی و معنوی برای تولید
 DocType: Asset,Frequency of Depreciation (Months),فرکانس استهلاک (ماه)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +469,Credit Account,حساب اعتباری
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Credit Account,حساب اعتباری
 DocType: Landed Cost Item,Landed Cost Item,فرود از اقلام هزینه
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +55,Show zero values,نمایش صفر ارزش
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,نمایش صفر ارزش
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,تعداد آیتم به دست آمده پس از تولید / repacking از مقادیر داده شده از مواد خام
 apps/erpnext/erpnext/public/js/setup_wizard.js +315,Setup a simple website for my organization,راه اندازی یک وب سایت ساده برای سازمان من
 DocType: Payment Reconciliation,Receivable / Payable Account,حساب دریافتنی / پرداختنی
 DocType: Delivery Note Item,Against Sales Order Item,علیه سفارش فروش مورد
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Please specify Attribute Value for attribute {0},لطفا موجودیت مقدار برای صفت مشخص {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},لطفا موجودیت مقدار برای صفت مشخص {0}
 DocType: Item,Default Warehouse,به طور پیش فرض انبار
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +39,Budget cannot be assigned against Group Account {0},بودجه می تواند در برابر حساب گروه اختصاص {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,لطفا پدر و مادر مرکز هزینه وارد
@@ -3929,19 +3984,22 @@
 DocType: Journal Entry,Total Debit,دبیت مجموع
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,به طور پیش فرض به پایان رسید کالا انبار
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,فروشنده
-DocType: Sales Invoice,Cold Calling,تلفن سرد
 DocType: SMS Parameter,SMS Parameter,پارامتر SMS
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,بودجه و هزینه مرکز
 DocType: Maintenance Schedule Item,Half Yearly,نیمی سالانه
 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 +253,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 +141,Set as Lost,تنظیم به عنوان از دست رفته
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,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 +5,This is based on transactions against this Customer. See timeline below for details,این است که در معاملات در برابر این مشتری است. مشاهده جدول زمانی زیر برای جزئیات
 DocType: Supplier,Credit Days Based On,روز اعتباری بر اساس
@@ -3953,11 +4011,10 @@
 ,Items To Be Requested,گزینه هایی که درخواست شده
 DocType: Purchase Order,Get Last Purchase Rate,دریافت آخرین خرید نرخ
 DocType: Company,Company Info,اطلاعات شرکت
-apps/erpnext/erpnext/accounts/page/pos/pos.js +941,Select or add new customer,انتخاب کنید و یا اضافه کردن مشتری جدید
+apps/erpnext/erpnext/accounts/page/pos/pos.js +930,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 +5,This is based on the attendance of this Employee,این است که در حضور این کارمند بر اساس
-DocType: Sales Invoice,Frequency,فرکانس
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +463,Debit Account,حساب بانکی
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Debit Account,حساب بانکی
 DocType: Fiscal Year,Year Start Date,سال تاریخ شروع
 DocType: Attendance,Employee Name,نام کارمند
 DocType: Sales Invoice,Rounded Total (Company Currency),گرد مجموع (شرکت ارز)
@@ -3966,27 +4023,27 @@
 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 +210,Supplier Quotation {0} created,کننده دیگر {0} ایجاد
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +208,Supplier Quotation {0} created,کننده دیگر {0} ایجاد
 apps/erpnext/erpnext/accounts/report/financial_statements.py +90,End Year cannot be before Start Year,پایان سال نمی تواند قبل از شروع سال می شود
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Employee Benefits,مزایای کارکنان
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,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 +228,Please set a default Holiday List for Employee {0} or Company {1},لطفا تنظیم پیش فرض لیست تعطیلات برای کارمند {0} یا شرکت {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +232,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 +499,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ردیف بدون {0}: مبلغ نمی تواند بیشتر از انتظار مقدار برابر هزینه ادعای {1}. در انتظار مقدار است {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +500,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ردیف بدون {0}: مبلغ نمی تواند بیشتر از انتظار مقدار برابر هزینه ادعای {1}. در انتظار مقدار است {2}
 DocType: Maintenance Schedule,Schedule,برنامه
 DocType: Account,Parent Account,پدر و مادر حساب
 DocType: Quality Inspection Reading,Reading 3,خواندن 3
 ,Hub,قطب
 DocType: GL Entry,Voucher Type,کوپن نوع
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1007,Price List not found or disabled,لیست قیمت یافت نشد یا از کار افتاده
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1008,Price List not found or disabled,لیست قیمت یافت نشد یا از کار افتاده
 DocType: Expense Claim,Approved,تایید
 DocType: Pricing Rule,Price,قیمت
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +244,Employee relieved on {0} must be set as 'Left',کارمند رها در {0} باید تنظیم شود به عنوان چپ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +256,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} در محدوده تاریخ ایجاد شود
@@ -3997,12 +4054,12 @@
 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 +259,Please select Employee Record first.,لطفا ابتدا کارمند ضبط را انتخاب کنید.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +266,Please select Employee Record first.,لطفا ابتدا کارمند ضبط را انتخاب کنید.
 DocType: POS Profile,Account for Change Amount,حساب کاربری برای تغییر مقدار
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +190,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},ردیف {0}: حزب / حساب با مطابقت ندارد {1} / {2} در {3} {4}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +235,Please enter Expense Account,لطفا هزینه حساب وارد کنید
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,Please enter Expense Account,لطفا هزینه حساب وارد کنید
 DocType: Account,Stock,موجودی
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,"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 +976,"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,خرید / جزئیات ساخت
@@ -4017,9 +4074,10 @@
 DocType: Asset Movement,Transaction Date,تاریخ تراکنش
 DocType: Production Plan Item,Planned Qty,برنامه ریزی تعداد
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,مالیات ها
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,For Quantity (Manufactured Qty) is mandatory,برای کمیت (تعداد تولیدی) الزامی است
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,For Quantity (Manufactured Qty) is mandatory,برای کمیت (تعداد تولیدی) الزامی است
 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 +78,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,واقعی تاریخ شروع
@@ -4034,9 +4092,11 @@
 DocType: Warranty Claim,If different than customer address,اگر متفاوت از آدرس مشتری
 DocType: BOM Operation,BOM Operation,عملیات BOM
 DocType: Purchase Taxes and Charges,On Previous Row Amount,در قبلی مقدار ردیف
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +226,Transfer Asset,دارایی انتقال
+DocType: Student,Home Address,آدرس خانه
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +227,Transfer Asset,دارایی انتقال
 DocType: POS Profile,POS Profile,نمایش POS
 apps/erpnext/erpnext/config/schools.py +33,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 +129,"Item {0} is a template, please select one of its variants",مورد {0} یک قالب است، لطفا یکی از انواع آن را انتخاب کنید
 DocType: Asset,Asset Category,دارایی رده
@@ -4046,8 +4106,8 @@
 DocType: Assessment,Room,اتاق
 DocType: Purchase Order,Advance Paid,پیش پرداخت
 DocType: Item,Item Tax,مالیات مورد
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +765,Material to Supplier,مواد به کننده
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +189,Excise Invoice,فاکتور مالیات کالاهای داخلی
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,Material to Supplier,مواد به کننده
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,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,بدهی های جاری
@@ -4057,7 +4117,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,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 +136,Credit Card,کارت اعتباری
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,کارت اعتباری
 DocType: BOM,Item to be manufactured or repacked,آیتم به تولید و یا repacked
 apps/erpnext/erpnext/config/stock.py +174,Default settings for stock transactions.,تنظیمات پیش فرض برای انجام معاملات سهام.
 DocType: Purchase Invoice,Next Date,تاریخ بعدی
@@ -4065,6 +4125,7 @@
 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: Academic Term,Term End Date,مدت پایان تاریخ
 DocType: Hub Settings,Seller Name,نام فروشنده
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),مالیات و هزینه کسر (شرکت ارز)
 DocType: Item Group,General Settings,تنظیمات عمومی
@@ -4076,7 +4137,7 @@
 DocType: Customer,Commission Rate,کمیسیون نرخ
 apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,متغیر را
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,برنامه بلوک مرخصی توسط بخش.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +115,"Payment Type must be one of Receive, Pay and Internal Transfer",نوع پرداخت باید یکی از دریافت شود، پرداخت و انتقال داخلی
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +118,"Payment Type must be one of Receive, Pay and Internal Transfer",نوع پرداخت باید یکی از دریافت شود، پرداخت و انتقال داخلی
 apps/erpnext/erpnext/config/selling.py +169,Analytics,تجزیه و تحلیل ترافیک
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,سبد خرید خالی است
 DocType: Production Order,Actual Operating Cost,هزینه های عملیاتی واقعی
@@ -4091,10 +4152,10 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,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 +92,Designer,طراح
+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/accounts/doctype/purchase_invoice/purchase_invoice.py +469,Cost Center is required in row {0} in Taxes table for type {1},مرکز هزینه در ردیف مورد نیاز است {0} در مالیات جدول برای نوع {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +472,Cost Center is required in row {0} in Taxes table for type {1},مرکز هزینه در ردیف مورد نیاز است {0} در مالیات جدول برای نوع {1}
 DocType: Program,Program Code,کد برنامه
 ,Item-wise Purchase Register,مورد عاقلانه ثبت نام خرید
 DocType: Batch,Expiry Date,تاریخ انقضا
@@ -4104,12 +4165,12 @@
 apps/erpnext/erpnext/config/projects.py +13,Project master.,کارشناسی ارشد پروژه.
 apps/erpnext/erpnext/controllers/status_updater.py +174,"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 +417, (Half Day),(نیم روز)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425, (Half Day),(نیم روز)
 DocType: Supplier,Credit Days,روز اعتباری
 DocType: Leave Type,Is Carry Forward,آیا حمل به جلو
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +740,Get Items from BOM,گرفتن اقلام از BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +711,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 +549,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},ردیف # {0}: ارسال تاریخ باید همان تاریخ خرید می باشد {1} دارایی {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +552,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,انتقال یک دارایی از یک انبار به دیگری
diff --git a/erpnext/translations/fi.csv b/erpnext/translations/fi.csv
index 0b40b99..9746112 100644
--- a/erpnext/translations/fi.csv
+++ b/erpnext/translations/fi.csv
@@ -18,11 +18,10 @@
 DocType: Sales Partner,Dealer,jakaja
 DocType: Employee,Rented,Vuokrattu
 DocType: Purchase Order,PO-,PO-
-apps/erpnext/erpnext/accounts/report/financial_statements.py +19,Start Year {0} not found.,Aloita vuosi {0} ei löytynyt.
 DocType: POS Profile,Applicable for User,Sovelletaan Käyttäjä
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +191,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Pysäytetty Tuotantotilaus ei voi peruuttaa, Unstop se ensin peruuttaa"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +197,Do you really want to scrap this asset?,Haluatko todella romuttaa tämän omaisuuden?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +17,Select Default Supplier,Valitse Oletus toimittaja
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +192,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Pysäytetty Tuotantotilaus ei voi peruuttaa, Unstop se ensin peruuttaa"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +198,Do you really want to scrap this asset?,Haluatko todella romuttaa tämän omaisuuden?
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Valitse Oletus toimittaja
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},valuuttahinnasto vaaditaan {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* lasketaan tapahtumassa
 DocType: Address,County,Lääni
@@ -42,46 +41,45 @@
 DocType: Sales Invoice,Customer Name,asiakkaan nimi
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +126,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 +180,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 +183,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,"poistu, tyypin nimi"
 apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,Näytä auki
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,sarja päivitetty onnistuneesti
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +149,Series Updated Successfully,sarja päivitetty onnistuneesti
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Tarkista
 DocType: Pricing Rule,Apply On,käytä
 DocType: Item Price,Multiple Item prices.,Useiden Item hinnat.
 ,Purchase Order Items To Be Received,Ostotilaus eriä olevan vastaanotettu
 DocType: SMS Center,All Supplier Contact,kaikki toimittajan yhteystiedot
-DocType: Quality Inspection Reading,Parameter,parametri
 apps/erpnext/erpnext/projects/doctype/project/project.py +54,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 +239,New Leave Application,uusi poistumissovellus
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,New Leave Application,uusi poistumissovellus
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +20,Attendance Record {0} exists against Student {1} for Course Schedule {2},Läsnäolo Record {0} on olemassa vastaan Opiskelija {1} varten Course aikataulu {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Bank Draft,pankki sekki
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,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
 DocType: Academic Term,Academic Term,Academic Term
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +13,Material,materiaali
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Quantity,Määrä
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +511,Accounts table cannot be blank.,-Taulukon voi olla tyhjä.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +616,Quantity,Määrä
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +512,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)
 DocType: Employee Education,Year of Passing,vuoden syöttö
 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/setup/doctype/email_digest/templates/default.html +46,Open Issues,Avoimet kysymykset
 DocType: Designation,Designation,nimeäminen
 DocType: Production Plan Item,Production Plan Item,Tuotanto Plan Item
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +142,User {0} is already assigned to Employee {1},käyttäjä {0} on jo nimetty työsuhteeseen {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,terveydenhuolto
-DocType: Purchase Invoice,Monthly,Kuukausittain
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Viivästyminen (päivää)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +771,Invoice,lasku
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +750,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 +198,Row {0}: {1} {2} does not match with {3},rivi {0}: {1} {2} ei täsmää {3} kanssa
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Rivi # {0}:
+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 +127,Please select Price List,Ole hyvä ja valitse hinnasto
@@ -112,8 +110,8 @@
 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 +589,Get items from,Saamaan kohteita
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +382,Stock cannot be updated against Delivery Note {0},varastoa ei voi päivittää lähetettä vastaan {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Saamaan kohteita
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,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
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,päivittäistavara
@@ -122,7 +120,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,eläkerahastot
 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.,** Kuukauden Distribution ** auttaa jakamaan budjetti / Target kuukausissa jos olet kausiluonteisuutta oman yrityksen.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +156,Salary Structure Missing,Palkka rakenne Puuttuvat
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Salary Structure Missing,Palkka rakenne Puuttuvat
 DocType: Lead,Person Name,henkilönimi
 DocType: Sales Invoice Item,Sales Invoice Item,"myyntilasku, tuote"
 DocType: Account,Credit,kredit
@@ -130,10 +128,11 @@
 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,Stock Raportit
 DocType: Warehouse,Warehouse Detail,Varaston lisätiedot
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,Credit limit has been crossed for customer {0} {1}/{2},asiakkaan luottoraja on ylitetty {0} {1} / {2}
-apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Is Fixed Asset&quot; ei voi olla valitsematta, koska Asset kirjaa olemassa vasten kohde"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +189,Credit limit has been crossed for customer {0} {1}/{2},asiakkaan luottoraja on ylitetty {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 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"
 DocType: Tax Rule,Tax Type,Tax Tyyppi
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +144,You are not authorized to add or update entries before {0},sinulla ei ole lupaa lisätä tai päivittää kirjauksia ennen {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,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 (ellei diaesitys)
 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,(tuntitaso / 60) * todellinen käytetty aika
@@ -143,18 +142,17 @@
 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 +165,Opening,Aukko
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,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/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Asiakas&gt; Asiakaspalvelu Group&gt; Territory
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Tilin Pay Only
 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
 DocType: Lead,Product Enquiry,tavara kysely
 DocType: Academic Term,Schools,koulut
 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 +335,Please select Company first,Ole hyvä ja valitse Company ensin
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,Please select Company first,Ole hyvä ja valitse Company ensin
 DocType: Employee Education,Under Graduate,valmistumisen alla
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,tavoitteeseen
 DocType: BOM,Total Cost,kokonaiskustannukset
@@ -164,7 +162,7 @@
 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,Pharmaceuticals
 DocType: Purchase Invoice Item,Is Fixed Asset,Onko käyttöomaisuusosakkeet
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Available qty is {0}, you need {1}","Saatavilla Määrä on {0}, sinun {1}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +225,"Available qty is {0}, you need {1}","Saatavilla Määrä on {0}, sinun {1}"
 DocType: Expense Claim Detail,Claim Amount,vaatimuksen arvomäärä
 DocType: Employee,Mr,Mr
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,toimittaja tyyppi / toimittaja
@@ -173,25 +171,26 @@
 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: Assessment Result,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 +171,Annual Salary,vuosipalkka
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Annual Salary,vuosipalkka
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,varaston kulut
-apps/erpnext/erpnext/accounts/report/financial_statements.py +22,End Year {0} not found.,End Year {0} ei löytynyt.
 DocType: Journal Entry,Contra Entry,vastakirjaus
 DocType: Journal Entry Account,Credit in Company Currency,Luotto Yritys Valuutta
 DocType: Delivery Note,Installation Status,asennus 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}
 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 +130,At least one mode of payment is required for POS invoice.,Ainakin yksi maksutavan vaaditaan POS laskun.
 DocType: Products Settings,Show Products as a List,Näytä tuotteet listana
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","lataa mallipohja, täytä tarvittavat tiedot ja liitä muokattu tiedosto, kaikki päivämäärä- ja työntekijäyhdistelmät tulee malliin valitun kauden ja olemassaolevien osallistumistietueiden mukaan"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +451,Item {0} is not active or end of life has been reached,tuote {0} ei ole aktiivinen tai sen elinkaari loppu
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +456,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/controllers/accounts_controller.py +614,"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/controllers/accounts_controller.py +617,"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 +166,Settings for HR Module,henkilöstömoduulin asetukset
 DocType: SMS Center,SMS Center,tekstiviesti keskus
 DocType: Sales Invoice,Change Amount,muutos Määrä
@@ -203,13 +202,13 @@
 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 +147,Execution,suoritus
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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/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}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,Cost Center {0} does not belong to Company {1},kustannuspaikka {0} ei kuulu yritykseen {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +100,Cost Center {0} does not belong to Company {1},kustannuspaikka {0} ei kuulu yritykseen {1}
 DocType: Customer,Individual,yksilöllinen
 DocType: Interest,Academics User,Academics Käyttäjä
 DocType: Cheque Print Template,Amount In Figure,Määrä Kuvassa
@@ -225,30 +224,32 @@
 DocType: Production Planning Tool,Sales Orders,myyntitilaukset
 DocType: Purchase Taxes and Charges,Valuation,arvo
 ,Purchase Order Trends,Ostotilaus Trendit
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,The request for quotation can be accessed by clicking on the following link,Pyyntö lainaus pääsee klikkaamalla seuraavaa linkkiä
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,kohdistaa poistumisen vuodelle
 DocType: SG Creation Tool Course,SG Creation Tool Course,SG Creation Tool Course
 DocType: Student Group Creation Tool,Leave blank if you wish to fetch all courses for selected academic term,"Jätä tyhjäksi, jos haluat hakea kaikki kursseja valitut lukukaudessa"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,Insufficient Stock,riittämätön Stock
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227,Insufficient Stock,riittämätön Stock
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,poista kapasiteettisuunnittelu ja aikaseuranta käytöstä
+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: 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/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} does not belong to Company {1},tili {0} ei kuulu yritykselle {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +86,Account {0} does not belong to Company {1},tili {0} ei kuulu yritykselle {1}
 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}
 DocType: Naming Series,Series List for this Transaction,sarjalistaus tähän tapahtumaan
 DocType: Sales Invoice,Is Opening Entry,on avauskirjaus
 DocType: Customer Group,Mention if non-standard receivable account applicable,maininta ellei sovelletaan saataien perustiliä käytetä
 DocType: Course Schedule,Instructor Name,ohjaaja Name
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,For Warehouse is required before Submit,varastoon vaaditaan ennen lähetystä
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,For Warehouse is required before Submit,varastoon vaaditaan ennen lähetystä
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Saatu
 DocType: Sales Partner,Reseller,Jälleenmyyjä
 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,Nettokassavirta Rahoituksen
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1436,"LocalStorage is full , did not save","LocalStoragen on täynnä, ei tallentanut"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1460,"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
@@ -261,18 +262,19 @@
 apps/erpnext/erpnext/templates/generators/item.html +78,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 +5,This is based on the Time Sheets created against this project,Tämä perustuu Time Sheets loi vastaan tämän hankkeen
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,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/leave_application/leave_application.py +213,Only the selected Leave Approver can submit this Leave Application,vain valtuutettu käyttäjä voi hyväksyä tämän poistumissovelluksen
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Lievittää Date on oltava suurempi kuin päivämäärä Liittymisen
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Leaves per Year,poistumiset vuodessa
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,poistumiset vuodessa
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"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}
+DocType: Email Digest,Profit & Loss,Voitonmenetys
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,Litre,litra
 DocType: Task,Total Costing Amount (via Time Sheet),Yhteensä Costing Määrä (via Time Sheet)
 DocType: Item Website Specification,Item Website Specification,tuote verkkosivujen asetukset
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +435,Leave Blocked,poistuminen estetty
-apps/erpnext/erpnext/stock/doctype/item/item.py +669,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 +443,Leave Blocked,poistuminen estetty
+apps/erpnext/erpnext/stock/doctype/item/item.py +671,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 +83,Annual,Vuotuinen
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +86,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ä
@@ -280,20 +282,22 @@
 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"
 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 +91,Software Developer,ohjelmistokehittäjä
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,ohjelmistokehittäjä
 DocType: Item,Minimum Order Qty,minimi tilaus yksikkömäärä
 DocType: Pricing Rule,Supplier Type,toimittaja tyyppi
 DocType: Scheduling Tool,Course Start Date,Kurssin aloituspäivä
 DocType: Item,Publish in Hub,Julkaista Hub
+DocType: Student Admission,Student Admission,Opiskelijavalinta
 ,Terretory,alue
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is cancelled,tuote {0} on peruutettu
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Material Request,materiaalipyyntö
+apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} is cancelled,tuote {0} on peruutettu
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +823,Material Request,materiaalipyyntö
 DocType: Bank Reconciliation,Update Clearance Date,päivitä tilityspäivä
 apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +28,Abbreviation already used for another salary component,Lyhenne jo toisen palkanosaa
 DocType: Item,Purchase Details,oston lisätiedot
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +328,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},tuotetta {0} ei löydy 'raaka-aineet toimitettu' ostotilaus taulukko {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +333,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/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
@@ -309,20 +313,21 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +130,Please select Charge Type first,valitse ensin veloitus tyyppi
 DocType: Student Group Student,Student Group Student,Student Group Student
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Viimeisin
+DocType: Email Digest,New Quotations,uusi tarjous
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,luettelon ensimmäinen poistumis hyväksyjä on oletushyväksyjä
 DocType: Tax Rule,Shipping County,toimitus County
 apps/erpnext/erpnext/config/desktop.py +158,Learn,Oppia
 DocType: Asset,Next Depreciation Date,Seuraava Poistot Date
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Aktiviteetti kustannukset työntekijää kohti
 DocType: Accounts Settings,Settings for Accounts,tilien asetukset
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +626,Supplier Invoice No exists in Purchase Invoice {0},Toimittaja laskun nro olemassa Ostolasku {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +629,Supplier Invoice No exists in Purchase Invoice {0},Toimittaja laskun nro olemassa Ostolasku {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,hallitse myyjäpuuta
 DocType: Job Applicant,Cover Letter,Saatekirje
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Erinomainen Sekkejä ja Talletukset tyhjentää
 DocType: Item,Synced With Hub,synkronoi Hub:lla
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,väärä salasana
 DocType: Item,Variant Of,mallista
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,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 +86,Circular Reference Error,kiertoviite vihke
@@ -334,15 +339,16 @@
 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 +806,Delivery Note,lähete
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +800,Delivery Note,lähete
 apps/erpnext/erpnext/config/learn.py +87,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 +233,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/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/setup/doctype/email_digest/email_digest.py +104,Summary for this week and pending activities,Yhteenveto tällä viikolla ja keskeneräisten toimien
+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 Tapahtumia
 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öpostitunnus pilkulla erotettuina, lasku lähetetään automaattisesti määritettynä päivänä"
 DocType: Employee,Company Email,yrityksen sähköposti
@@ -354,27 +360,28 @@
 apps/erpnext/erpnext/config/hr.py +186,"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"
-apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Rivi # {0}: Ostolaskujen ei voi tehdä vastaan olemassaolevan hyödykkeen {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +554,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,vero taso
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} on jo myönnetty Työsuhde {1} kauden {2} ja {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +812,Select Item,valitse tuote
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +791,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 \
 					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 +142,Purchase Invoice {0} is already submitted,ostolasku {0} on lähetetty
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Rivi # {0}: Erä on oltava sama kuin {1} {2}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +143,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.,erä (erä-tuote) tuotteesta
 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},Ei voi olla vain 1 tilini kohden Yhtiö {0} {1}
 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 +342,Please see attachment,katso liitetiedosto
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,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 +19,Setup Already Complete!!,määritys on valmis
 ,Finished Goods,valmiit tavarat
 DocType: Delivery Note,Instructions,ohjeet
 DocType: Quality Inspection,Inspected By,tarkastanut
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Toimittaja&gt; Merkki Tyyppi
 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/public/js/utils/item_selector.js +12,Add Items,Lisää tuotteet
@@ -388,29 +395,29 @@
 DocType: Currency Exchange,Currency Exchange,valuutanvaihto
 DocType: Purchase Invoice Item,Item Name,tuotteen nimi
 DocType: Authorization Rule,Approving User  (above authorized value),Hyväksymisestä User (edellä valtuutettu arvo)
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,"kredit, tase"
+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/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 +736,Purchase Return,Osto Return
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +715,Purchase Return,Osto Return
 ,Purchase Register,Osto Rekisteröidy
 DocType: 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 +202,{0} ({1}) must have role 'Leave Approver',{0} ({1}) tulee olla rooli 'poistumisen hyväksyjä'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,{0} ({1}) must have role 'Leave Approver',{0} ({1}) tulee olla rooli 'poistumisen 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 +143,Reason for losing,häviön syy
-apps/erpnext/erpnext/accounts/utils.py +239,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 +163,Reason for losing,häviön syy
+apps/erpnext/erpnext/accounts/utils.py +316,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 +79,Workstation is closed on the following dates as per Holiday List: {0},työasema on suljettu seuraavina päivinä lomapäivien {0} mukaan
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Mahdollisuudet
 DocType: Employee,Single,yksittäinen
 DocType: Account,Cost of Goods Sold,myydyn tavaran kustannuskset
 DocType: Purchase Invoice,Yearly,Vuosittain
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +225,Please enter Cost Center,syötä kustannuspaikka
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,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 myynnin taso
 DocType: Assessment,Examiner Name,Tutkijan Name
@@ -423,26 +430,26 @@
 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
 DocType: Account,Is Group,on ryhmä
+DocType: Email Digest,Pending Purchase Orders,Odottaa Ostotilaukset
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Automaattisesti Serial nro perustuu FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,tarkista toimittajan laskunumeron yksilöllisyys
 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 +102,Non Profit,nettotulos
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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: Stock Reconciliation Item,Do not include symbols (ex. $),Älä lisää symboleja (esim. $)
 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 +638,Attribute {0} selected multiple times in Attributes Table,Taito {0} valittu useita kertoja määritteet taulukossa
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Taito {0} valittu useita kertoja määritteet taulukossa
 DocType: HR Settings,Employee record is created using selected field. ,työntekijä tietue luodaan käyttämällä valittua kenttää
 DocType: Sales Order,Not Applicable,ei sovellettu
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,lomien valvonta
 DocType: Request for Quotation Item,Required Date,pyydetty päivä
 DocType: Delivery Note,Billing Address,laskutusosoite
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +862,Please enter Item Code.,syötä tuotekoodi
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +847,Please enter Item Code.,syötä tuotekoodi
 DocType: BOM,Costing,kustannuslaskenta
 DocType: Tax Rule,Billing County,Laskutus County
 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
@@ -456,12 +463,12 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,arvopaperit ja talletukset
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Yhteensä lehdet jaetaan on pakollinen
 DocType: Job Opening,Description of a Job Opening,avoimen työn kuvaus
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Pending activities for today,Vireillä toimintaa tänään
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Vireillä toimintaa tänään
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,osallistumis tietue
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Palkanosasta tuntilomakkeen perustuu palkkalistoilla.
 DocType: Sales Order Item,Used for Production Plan,käytetään tuotannon suunnitelmassa
 DocType: Manufacturing Settings,Time Between Operations (in mins),toimintojen välinen aika (minuuteissa)
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +92,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} talousarvion tili {1} vastaan Kustannuspaikka {2} on {3}. Se ylittää {4}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +95,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} talousarvion tili {1} vastaan Kustannuspaikka {2} on {3}. Se ylittää {4}
 DocType: Customer,Buyer of Goods and Services.,ostaja tavarat ja palvelut
 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 BOMs eivät ole samaa kohdetta
@@ -469,16 +476,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +238,List a few of your customers. They could be organizations or individuals.,Luetella muutamia asiakkaisiin. Ne voivat olla organisaatioita tai yksilöitä.
 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 +86,Administrative Officer,hallintovirkailija
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,hallintovirkailija
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +23,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 +319,Please select Company,Ole hyvä ja valitse Company
-DocType: Stock Entry,Difference Account,erotili
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +309,Please select Company,Ole hyvä ja valitse Company
+DocType: Stock Entry Detail,Difference Account,erotili
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,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 +398,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 +399,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 +530,"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 +532,"To merge, following properties must be same for both items",seuraavat ominaisuudet tulee olla samat molemmilla tuotteilla jotta ne voi sulauttaa
 DocType: Shipping Rule,Net Weight,Netto
 DocType: Employee,Emergency Phone,hätänumero
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +28,Buy,Ostaa
@@ -486,7 +493,7 @@
 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 +1563,Serial no item cannot be a fraction,Sarjanumero tuote voi olla murto
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1587,Serial no item cannot be a fraction,Sarjanumero tuote voi olla murto
 DocType: Journal Entry,Difference (Dr - Cr),erotus (€ - TV)
 DocType: Account,Profit and Loss,tuloslaskelma
 apps/erpnext/erpnext/config/stock.py +314,Managing Subcontracting,Toimitusjohtaja Alihankinta
@@ -495,13 +502,14 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Account {0} does not belong to company: {1},tili {0} ei kuulu yritykselle: {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation already used for another company,Lyhenne jo toisen yrityksen
 DocType: Selling Settings,Default Customer Group,oletus asiakasryhmä
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Supplier is required against Payable account {0},Toimittaja tarvitaan vastaan maksullisia tili {0}
 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
 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 +313,Reference No and Reference Date is mandatory for Bank transaction,Viitenumero ja viitepäivämäärä on pakollinen Pankin myynnin
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +316,Reference No and Reference Date is mandatory for Bank transaction,Viitenumero ja viitepäivämäärä on pakollinen Pankin myynnin
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Lisää / muokkaa veroja ja maksuja
 DocType: Purchase Invoice,Supplier Invoice No,toimittajan laskun nro
 DocType: Territory,For reference,viitteeseen
@@ -512,7 +520,6 @@
 DocType: Installation Note Item,Installation Note Item,asennus huomautus tuote
 DocType: Production Plan Item,Pending Qty,Odottaa Kpl
 DocType: Budget,Ignore,ohita
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Kohta Koodi&gt; Item Group&gt; Brand
 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/config/accounts.py +241,Setup cheque dimensions for printing,Setup tarkistaa mitat tulostettavaksi
 DocType: Salary Slip,Salary Slip Timesheet,Palkka Slip Tuntilomakkeen
@@ -523,11 +530,11 @@
 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,"Arvostus Hinta on pakollinen, jos avaaminen Stock tuli"
 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 +28,Please select Company and Party Type first,valitse ensin yritys ja osapuoli tyyppi
+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/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 +707,Make Sales Order,tee myyntitilaus
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +701,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
@@ -543,7 +550,8 @@
 DocType: Job Applicant,Resume Attachment,Jatka Attachment
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Toista asiakkaat
 DocType: Leave Control Panel,Allocate,Jakaa
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +734,Sales Return,Myynti Return
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +728,Sales Return,Myynti Return
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +91,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),Toimitetaan Toimittaja (Drop Ship)
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,tietokanta potentiaalisista asiakkaista
@@ -552,14 +560,13 @@
 DocType: Quotation,Quotation To,tarjoukseen
 DocType: Lead,Middle Income,keskitason tulo
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +212,Opening (Cr),Opening (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +795,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"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 +237,Allocated amount can not be negative,kohdennettu arvomäärä ei voi olla negatiivinen
+apps/erpnext/erpnext/stock/doctype/item/item.py +797,Default Unit of Measure for Item {0} cannot be changed directly because 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 arvomäärä ei voi olla negatiivinen
 DocType: Purchase Order Item,Billed Amt,"laskutettu, pankkipääte"
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,"perustettu varasto, minne varastokirjaukset tehdään"
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Myynnin lasku Tuntilomakkeen
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},viitenumero ja viitepäivä vaaditaan{0}
-DocType: Sales Invoice,Customer's Vendor,asiakkaan tosite
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Proposal Writing,Ehdotus Kirjoittaminen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,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"
@@ -568,13 +575,14 @@
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,aika seuranta
 DocType: Fiscal Year Company,Fiscal Year Company,yrityksen tilikausi
 DocType: Packing Slip Item,DN Detail,DN lisätiedot
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +257,Already supplier quotation has created,Jo toimittaja tarjous on luonut
 DocType: Timesheet,Billed,Laskutetaan
 DocType: Batch,Batch Description,erän kuvaus
+apps/erpnext/erpnext/accounts/utils.py +685,"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 +733,View Offline Records,Katso Poissa Records
+apps/erpnext/erpnext/accounts/page/pos/pos.js +715,View Offline Records,Katso Poissa Records
+DocType: Student,Sibling Details,sisarus tiedot
 DocType: Employee,Reason for Resignation,eroamisen syy
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,mallipohja kehityskeskusteluihin
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,"lasku / päiväkirjakirjaus, lisätiedot"
@@ -588,7 +596,7 @@
 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
 DocType: Employee,Passport Number,passin numero
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Manager,hallinta
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,hallinta
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,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
@@ -597,10 +605,11 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter email address,syötä sähköpostiosoite
 DocType: Production Order Operation,In minutes,minuutteina
 DocType: Issue,Resolution Date,johtopäätös päivä
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +299,Timesheet created:,Tuntilomakkeen luotu:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +715,Please set default Cash or Bank account in Mode of Payment {0},valitse oletusmaksutapa kassa- tai pankkitili maksulle {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +300,Timesheet created:,Tuntilomakkeen luotu:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +772,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
 DocType: Selling Settings,Customer Naming By,asiakkaan nimennyt
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,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: 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,aktiviteettimuoto
@@ -625,6 +634,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,Suorittaa loppuun
 DocType: Pricing Rule,Sales Manager,myynninhallinta
 DocType: Salary Structure Employee,Base,pohja
+DocType: Timesheet,Total Billed Hours,Yhteensä laskutusasteesta
 DocType: Journal Entry,Write Off Amount,poiston arvomäärä
 DocType: Journal Entry,Bill No,Bill No
 DocType: Company,Gain/Loss Account on Asset Disposal,Gain / tuloslaskelma Omaisuudenhoitoalan Hävittäminen
@@ -639,11 +649,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +9,Pre Sales,pre Sales
 DocType: Purchase Receipt,Other Details,muut lisätiedot
 DocType: Account,Accounts,tilit
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Marketing,Markkinointi
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +227,Payment Entry is already created,Maksu käyttö on jo luotu
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,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 +538,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 +21,Preview Salary Slip,Preview Palkka Slip
+apps/erpnext/erpnext/controllers/accounts_controller.py +541,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 +38,Preview Salary Slip,Preview Palkka Slip
 DocType: Company,Deafult Cost Center,Oletuskoodi Kustannuspaikka
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +48,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"
@@ -652,7 +662,7 @@
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,Valitse Student Group
 DocType: Email Digest,Next email will be sent on:,Seuraava sähköpostiviesti lähetetään:
 DocType: Offer Letter Term,Offer Letter Term,Tarjoa Kirje Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +617,Item has variants.,tuotteella on useampia malleja
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,tuotteella on useampia malleja
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,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
@@ -672,7 +682,7 @@
 DocType: Purchase Order,Supply Raw Materials,toimita raaka-aineita
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,laskun luontipäivä muodostuu lähettäessä
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,lyhytaikaiset vastaavat
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,{0} is not a stock Item,{0} ei ole varastotuote
+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 +169,Lead must be set if Opportunity is made from Lead,"vihje on annettava, jos tilaisuus on tehty vihjeestä"
@@ -739,26 +749,25 @@
 DocType: Employee,Family Background,taustaperhe
 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 +709,No Permission,Ei oikeuksia
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +710,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ä varastosaldo' ei voida käyttä tuotteille, joita ei ole toimitettu {0} kautta"
 apps/erpnext/erpnext/public/js/setup_wizard.js +298,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 +542,Row #{0}: Asset {1} must be submitted,Rivi # {0}: Asset {1} on esitettävä
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset {1} must be submitted,Rivi # {0}: Asset {1} on esitettävä
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Yhtään työntekijää ei löytynyt
 DocType: Supplier Quotation,Stopped,pysäytetty
 DocType: Item,If subcontracted to a vendor,alihankinta toimittajalle
 DocType: SMS Center,All Customer Contact,kaikki asiakkaan yhteystiedot
 apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,lataa varastotase .csv-tiedoston kautta
 DocType: Warehouse,Tree Details,Tree Tietoja
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,lähetä nyt
 ,Support Analytics,tuki Analytics
 DocType: Item,Website Warehouse,verkkosivujen varasto
 DocType: Payment Reconciliation,Minimum Invoice Amount,Pienin Laskun summa
 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/sales_invoice/sales_invoice.py +227,Timesheet {0} is already completed or cancelled,Tuntilomakkeen {0} on jo suoritettu tai peruutettu
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +259,Timesheet {0} is already completed or cancelled,Tuntilomakkeen {0} on jo suoritettu tai peruutettu
 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
@@ -774,13 +783,13 @@
 apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,kurssin aikataulu
 DocType: Maintenance Visit,Completion Status,katselmus tila
 DocType: HR Settings,Enter retirement age in years,Anna eläkeikä vuosina
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +229,Target Warehouse,tavoite varasto
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +230,Target Warehouse,tavoite varasto
 DocType: Cheque Print Template,Starting location from left edge,Alkaen sijainti vasemmasta reunasta
 DocType: Item,Allow over delivery or receipt upto this percent,Salli yli toimitus- tai kuitti lähetettävään tähän prosenttia
 DocType: Stock Entry,STE-,Stefan
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Sales Order Date,odotettu toimituspäivä ei voi olla ennen myyntitilauksen päivää
 DocType: Upload Attendance,Import Attendance,tuo osallistuminen
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,kaikki tuoteryhmät
+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/config/setup.py +89,Automatically compose message on submission of transactions.,muodosta automaattinen viesti toiminnon lähetyksessä
@@ -792,13 +801,15 @@
 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/report/stock_ledger/stock_ledger.py +95,'Opening','avautuu'
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Open To Do
 DocType: Notification Control,Delivery Note Message,lähetteen vieti
 DocType: Expense Claim,Expenses,kulut
 DocType: Item Variant Attribute,Item Variant Attribute,Tuote Variant Taito
 ,Purchase Receipt Trends,Ostokuitti Trendit
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Research & Development,Tutkimus ja kehitys
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Tutkimus ja kehitys
 ,Amount to Bill,laskutettava arvomäärä
 DocType: Company,Registration Details,rekisteröinnin lisätiedot
+DocType: Timesheet,Total Billed Amount,Yhteensä Laskutetut Määrä
 DocType: Item Reorder,Re-Order Qty,uudelleentilattava yksikkömäärä
 DocType: Leave Block List Date,Leave Block List Date,"poistu estoluettelo, päivä"
 DocType: Pricing Rule,Price or Discount,Hinta tai Alennus
@@ -807,7 +818,7 @@
 DocType: Production Planning Tool,Only Obtain Raw Materials,Vain Hanki 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","Ottaminen &quot;käyttö ostoskorin, kuten Ostoskorissa on käytössä ja siellä pitäisi olla vähintään yksi Tax Rule ostoskoriin"
-apps/erpnext/erpnext/controllers/accounts_controller.py +340,"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."
+apps/erpnext/erpnext/controllers/accounts_controller.py +343,"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
@@ -829,12 +840,12 @@
 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 +756,Purchase Receipt,Ostokuitti
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +735,Purchase Receipt,Ostokuitti
 ,Received Items To Be Billed,Saivat kohteet laskuttamat
 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 +167,Reference Doctype must be one of {0},Viite Doctype on oltava yksi {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +282,Unable to find Time Slot in the next {0} days for Operation {1},aika-aukkoa ei löydy seuraavaan {0} päivän toiminnolle {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +170,Reference Doctype must be one of {0},Viite Doctype on oltava yksi {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,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 +439,BOM {0} must be active,BOM {0} tulee olla aktiivinen
@@ -845,7 +856,7 @@
 DocType: Salary Slip,Leave Encashment Amount,"perintä, arvomää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 +214,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 +217,Warehouses with existing transaction can not be converted to ledger.,Varastoissa nykyisten tapahtumaa ei voida muuntaa kirjanpitoon.
 DocType: Bank Reconciliation,Total Amount,kokonaisarvomäärä
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,internet julkaisu
 DocType: Production Planning Tool,Production Orders,tuotannon tilaukset
@@ -859,9 +870,9 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,työntekijä {0} ei ole aktiivinen tai ei ole olemassa
 DocType: Fee Structure,Components,komponentit
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,Please enter Asset Category in Item {0},Syötä Asset Luokka momentille {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +612,Item Variants {0} updated,tuotemallit {0} päivitetty
+apps/erpnext/erpnext/stock/doctype/item/item.py +614,Item Variants {0} updated,tuotemallit {0} päivitetty
 DocType: Quality Inspection Reading,Reading 6,Lukeminen 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +843,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 +854,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
@@ -876,69 +887,72 @@
 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 +728,New Sales Invoice,New Sales Lasku
+apps/erpnext/erpnext/accounts/page/pos/pos.js +710,New Sales Invoice,New Sales Lasku
 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 +728,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ä
 DocType: Material Request Item,Lead Time Date,"virtausaika, päiväys"
 DocType: Guardian,Guardian Name,Guardian Name
 DocType: Cheque Print Template,Has Print Format,On Print Format
-apps/erpnext/erpnext/accounts/page/pos/pos.js +86, 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 +109,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 +619,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","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/page/pos/pos.js +75, 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 +613,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing 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 +606,Supplier Invoice Date cannot be greater than Posting Date,Toimittaja Laskun päiväys ei voi olla suurempi kuin julkaisupäivämäärä
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +609,Supplier Invoice Date cannot be greater than Posting Date,Toimittaja Laskun päiväys ei voi olla suurempi kuin julkaisupäivämäärä
 DocType: Purchase Invoice Item,Purchase Order Item,Ostotilaus Kohde
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +130,Indirect Income,välilliset tulot
 DocType: Cheque Print Template,Date Settings,date Settings
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,vaihtelu
 ,Company Name,Yrityksen nimi
 DocType: SMS Center,Total Message(s),viestit yhteensä
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +810,Select Item for Transfer,talitse siirrettävä tuote
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +789,Select Item for Transfer,talitse siirrettävä tuote
 DocType: Purchase Invoice,Additional Discount Percentage,Muita alennusprosenttia
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Katso luettelo kaikista ohjevideot
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"valitse pankin tilin otsikko, minne shekki/takaus talletetaan"
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,salli käyttäjän muokata hinnaston tasoa tapahtumissa
 DocType: Pricing Rule,Max Qty,max yksikkömäärä
-DocType: Student Applicant,Father's Name,Isän nimi
 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 +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,rivi {0}: maksu kohdistettuna myynti- / ostotilaukseen tulee aina merkitä ennakkomaksuksi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,kemiallinen
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +686,All items have already been transferred for this Production Order.,kaikki tavarat on jo siirretty tuotantotilaukseen
+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
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +694,All items have already been transferred for this Production Order.,kaikki tavarat on jo siirretty tuotantotilaukseen
 DocType: Process Payroll,Select Payroll Year and Month,valitse palkkaluettelo vuosi ja kuukausi
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,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
-DocType: Opportunity,Walk In,kävele sisään
 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 +12,Transfered,siirretty
 apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,lataa kirjeen ylätunniste ja logo. (voit muokata niitä myöhemmin)
 DocType: Timesheet Detail,Bill,Laskuttaa
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,White,valkoinen
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,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
 DocType: SMS Center,All Lead (Open),kaikki vihjeet (avoimet)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +228,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})
+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 +731,Make ,Tehdä
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,Make ,Tehdä
+DocType: Student Admission,Admission Start Date,Pääsymaksu aloituspäivä
 DocType: Journal Entry,Total Amount in Words,sanat kokonaisarvomäärä
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"tapahui virhe: todennäköinen syy on ettet ole tallentanut lomakketta, mikäli ongelma jatkuu ota yhteyttä sähköpostiin support@erpnext.com"
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Ostoskori
-apps/erpnext/erpnext/controllers/selling_controller.py +154,Order Type must be one of {0},tilaus tyyppi tulee olla {0}:n
+apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},tilaus tyyppi tulee olla {0}:n
 DocType: Lead,Next Contact Date,seuraava yhteydenottopvä
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,avaus yksikkömäärä
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +393,Please enter Account for Change Amount,Anna Account for Change Summa
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,Please enter Account for Change Amount,Anna Account for Change Summa
 DocType: Student Batch,Student Batch Name,Opiskelijan Erä Name
 DocType: Holiday List,Holiday List Name,lomaluettelo nimi
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js +8,Schedule Course,aikataulu Course
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Stock Options,"varasto, vaihtoehdot"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,"varasto, vaihtoehdot"
 DocType: Journal Entry Account,Expense Claim,kuluvaatimus
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +211,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 +237,Qty for {0},yksikkömäärään {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +212,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 +238,Qty for {0},yksikkömäärään {0}
 DocType: Leave Application,Leave Application,poistumissovellus
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,poistumiskohdistus työkalu
 DocType: Leave Block List,Leave Block List Dates,"poistu estoluettelo, päivät"
@@ -947,9 +961,9 @@
 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/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Poistettu kohteita ei muutu määrän tai arvon.
+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 (lle)
-apps/erpnext/erpnext/stock/doctype/item/item.py +635,Attribute table is mandatory,Taito pöytä on pakollinen
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Taito pöytä on pakollinen
 DocType: Production Planning Tool,Get Sales Orders,hae myyntitilaukset
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{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
@@ -974,7 +988,7 @@
 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/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +27,Returns,tuotto
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP varasto
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},sarjanumero {0} on huoltokannassa {1} asti
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +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,Organisaation nimi
@@ -986,7 +1000,7 @@
 DocType: GL Entry,Against,kohdistus
 DocType: Item,Default Selling Cost Center,myyntien oletuskustannuspaikka
 DocType: Sales Partner,Implementation Partner,sovelluskumppani
-apps/erpnext/erpnext/controllers/selling_controller.py +231,Sales Order {0} is {1},Myyntitilaus {0} on {1}
+apps/erpnext/erpnext/controllers/selling_controller.py +232,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,Making Stock Viestit
 DocType: Packing Slip,Net Weight UOM,Nettopaino UOM
@@ -996,25 +1010,24 @@
 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ää
 DocType: Sales Person,Select company name first.,valitse yrityksen nimi ensin.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Dr,€
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Dr,€
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,toimittajan tarjous vastaanotettu
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},(lle) {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 yhteyttä asiakkaaseen tulevaisuudessa"
 apps/erpnext/erpnext/public/js/setup_wizard.js +261,List a few of your suppliers. They could be organizations or individuals.,Luetella muutaman oman toimittajia. Ne voivat olla organisaatioita tai yksilöitä.
-apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,Kaikki tuotteet
+apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Kaikki tuotteet
 DocType: Company,Default Currency,oletusvaluutta
 DocType: Contact,Enter designation of this Contact,syötä yhteystiedon nimike
 DocType: Expense Claim,From Employee,työntekijästä
-apps/erpnext/erpnext/controllers/accounts_controller.py +400,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,varoitus: järjestelmä ei tarkista liikalaskutusta sillä tuotteen arvomäärä {0} on {1} nolla
+apps/erpnext/erpnext/controllers/accounts_controller.py +403,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,varoitus: järjestelmä ei tarkista liikalaskutusta sillä tuotteen arvomäärä {0} on {1} 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/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,ja vuosi:
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +191,{0} {1} must be submitted,{0} {1} on esitettävä
-DocType: Email Digest,Annual Expense,Vuosikuluna
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,{0} {1} must be submitted,{0} {1} on esitettävä
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +145,Quantity must be less than or equal to {0},Määrä on oltava pienempi tai yhtä suuri kuin {0}
 DocType: SMS Center,Total Characters,henkilöt yhteensä
 apps/erpnext/erpnext/controllers/buying_controller.py +156,Please select BOM in BOM field for Item {0},valitse BOM tuotteelle BOM kentästä {0}
@@ -1025,30 +1038,31 @@
 DocType: Sales Partner,Distributor,jakelija
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,ostoskori toimitus sääntö
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +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 +62,Please set 'Apply Additional Discount On',Aseta &#39;Käytä lisäalennusta &quot;
+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
 DocType: Global Defaults,Global Defaults,yleiset oletusasetukset
 apps/erpnext/erpnext/projects/doctype/project/project.py +153,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
 DocType: Purchase Invoice,Start date of current invoice's period,aloituspäivä nykyiselle laskutuskaudelle
 DocType: Salary Slip,Leave Without Pay,"poistu, ilman palkkaa"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +327,Capacity Planning Error,kapasiteetin suunnittelu virhe
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,kapasiteetin suunnittelu virhe
 ,Trial Balance for Party,Koetase Party
 DocType: Lead,Consultant,konsultti
 DocType: Salary Slip,Earnings,ansiot
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +362,Finished Item {0} must be entered for Manufacture type entry,valmiit tuotteet {0} tulee vastaanottaa valmistus tyyppi kirjauksella
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +367,Finished Item {0} must be entered for Manufacture type entry,valmiit tuotteet {0} tulee vastaanottaa valmistus tyyppi kirjauksella
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,avaa kirjanpidon tase
 DocType: Sales Invoice Advance,Sales Invoice Advance,"myyntilasku, ennakko"
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +499,Nothing to request,Mitään pyytää
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +500,Nothing to request,Mitään pyytää
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',Aloituspäivän tarvitsee olla ennen päättymispäivää
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Management,hallinto
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},joko debet- tai kredit arvomäärä vaaditaan {0}:lle
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,hallinto
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +55,Either debit or credit amount is required for {0},joko debet- tai kredit arvomäärä vaaditaan {0}:lle
 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.,"sanat näkyvät, kun tallennat palkkalaskelman, nettomaksu"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,Blue,sininen
+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 Email ID
@@ -1058,12 +1072,12 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +23,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,UOM muuntokerroin
 DocType: Stock Settings,Default Item Group,oletus tuoteryhmä
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1374,Do you really want to submit the invoice?,Haluatko todella lähettää laskun?
+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 +685,Cost Center For Item with Item Code ',tuotteen kustannuspaikka tuotekoodilla
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1526,"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 +679,Cost Center For Item with Item Code ',tuotteen kustannuspaikka tuotekoodilla
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1550,"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,"myyjä, joka saa muistutuksen asiakkaan yhetdenotosta"
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,"Further accounts can be made under Groups, but entries can be made against non-Groups","lisätilejä voidaan tehdä kohdassa ryhmät, mutta kirjaukset toi suoraan tilille"
 DocType: Lead,Lead,vihje
@@ -1083,104 +1097,106 @@
 DocType: Payment Reconciliation,Unreconciled Payment Details,kohdistamattomien maksujen lisätiedot
 DocType: Global Defaults,Current Fiscal Year,nykyinen tilikausi
 DocType: Global Defaults,Disable Rounded Total,poista 'pyöristys yhteensä' käytöstä
-DocType: Lead,Call,pyyntö
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +417,'Entries' cannot be empty,'Kirjaukset' ei voi olla tyhjä
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +418,'Entries' cannot be empty,'Kirjaukset' ei voi olla tyhjä
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},monista rivi {0} sama kuin {1}
 ,Trial Balance,tasekokeilu
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +214,Fiscal Year {0} not found,Verovuoden {0} ei löytynyt
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +221,Fiscal Year {0} not found,Verovuoden {0} ei löytynyt
 apps/erpnext/erpnext/config/hr.py +238,Setting up Employees,työntekijän perusmääritykset
 DocType: Sales Order,SO-,NIIN-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Ole hyvä ja valitse etuliite ensin
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Please select prefix first,Ole hyvä ja valitse etuliite ensin
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Research,Tutkimus
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,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 +43,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 +57,View Ledger,näytä tilikirja
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,aikaisintaan
-apps/erpnext/erpnext/stock/doctype/item/item.py +504,"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 +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/setup/setup_wizard/setup_wizard.py +437,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,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 +90,Row {0}: Activity Type is mandatory.,Rivi {0}: Toimintalaji on pakollista.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +114,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/public/js/controllers/stock_controller.js +40,Accounting Ledger,Kirjanpito Ledger
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,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
 DocType: BOM Item,Item Description,tuotteen kuvaus
+DocType: Student Sibling,Student Sibling,Student Sisarukset
 DocType: Purchase Invoice,Is Recurring,on toistuva
 DocType: Purchase Invoice,Supplied Items,tuotteet toimitettu
 DocType: Student,STUD.,NASTA.
 DocType: Production Order,Qty To Manufacture,valmistettava yksikkömäärä
+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,"tilaisuus, tuote"
 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 poistumistase
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +131,Balance for Account {0} must always be {1},tilin tase {0} on oltava {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +175,Valuation Rate required for Item in row {0},Arvostus Luokitus vaaditaan Tuote rivillä {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,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},Arvostus Luokitus vaaditaan Tuote 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
 DocType: Purchase Invoice,Rejected Warehouse,Hylätty Warehouse
 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.","Jotta saat parhaan pois ERPNext, suosittelemme, että otat aikaa ja katsella näitä apua videoita."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +87, to ,että
+apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,että
 DocType: Item,Lead Time in days,"virtausaika, päivinä"
 ,Accounts Payable Summary,maksettava tilien yhteenveto
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Not authorized to edit frozen Account {0},jäädytettyä tiliä {0} ei voi muokata
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,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 +62,Sales Order {0} is not valid,myyntitilaus {0} ei ole kelvollinen
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,myyntitilaus {0} ei ole kelvollinen
 apps/erpnext/erpnext/setup/doctype/company/company.py +185,"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 +152,Small,pieni
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,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}"
 ,Invoiced Amount (Exculsive Tax),laskutettu arvomäärä (sisältäen verot)
-DocType: Student Applicant,Mother's / Guardian 1 Email ID,Äidin / Guardian 1 -sähköpostitunnus
 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 +160,Green,vihreä
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,vihreä
 DocType: Supplier,SUPP-,toimittaja-
 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 +57,Contract,sopimus
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,sopimus
 DocType: Email Digest,Add Quote,Lisää Lainaus
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +498,UOM coversion factor required for UOM: {0} in Item: {1},UOM muuntokerroin vaaditaan UOM {0}:lle tuotteessa: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +503,UOM coversion factor required for UOM: {0} in Item: {1},UOM muuntokerroin vaaditaan UOM {0}:lle tuotteessa: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,välilliset kulut
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +80,Row {0}: Qty is mandatory,rivi {0}: yksikkömäärä vaaditaan
+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 +737,Sync Master Data,Sync Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +719,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,Omat tavarat 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,Website Kuva pitäisi olla julkinen tiedoston tai verkkosivuston URL-
+DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,tämä on kantatuoteryhmä eikä sitä voi muokata
+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
 DocType: Journal Entry Account,Purchase Order,Ostotilaus
 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 +345,"{0}: Employee email not found, hence email not sent","{0}: Työntekijä sähköposti ei löytynyt, joten sähköpostiosoitteisiin ei lähetetty"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +358,"{0}: Employee email not found, hence email not sent","{0}: Työntekijä sähköposti ei löytynyt, joten sähköpostiosoitteisiin ei lähetetty"
 DocType: Address,City/Town,kaupunki/kunta
 DocType: Address,Is Your Company Address,Is Your Company Osoite
 DocType: Email Digest,Annual Income,Vuositulot
 DocType: Serial No,Serial No Details,sarjanumeron lisätiedot
 DocType: Purchase Invoice Item,Item Tax Rate,tuotteen verotaso
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,"For {0}, only credit accounts can be linked against another debit entry","{0}, vain kredit tili voidaan kohdistaa debet kirjaukseen"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Delivery Note {0} is not submitted,lähetettä {0} ei ole lähetetty
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Delivery Note {0} is not submitted,lähetettä {0} ei ole lähetetty
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Sub-contracted Item,tuote {0} on alihankintatuote
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,käyttöomaisuuspääoma
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","hinnoittelusääntö tulee ensin valita  'käytä tässä' kentästä, joka voi olla tuote, tuoteryhmä tai brändi"
 DocType: Hub Settings,Seller Website,myyjä verkkosivut
 DocType: Item,ITEM-,kuvallisissa osaluetteloissa
-apps/erpnext/erpnext/controllers/selling_controller.py +147,Total allocated percentage for sales team should be 100,myyntitiimin kohdennettu prosenttiosuus tulee olla 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +110,Production Order status is {0},tuotannon tilauksen tila on {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,myyntitiimin kohdennettu prosenttiosuus tulee olla 100
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},tuotannon tilauksen tila on {0}
 DocType: Appraisal Goal,Goal,tavoite
 DocType: Sales Invoice Item,Edit Description,Muokkaa Kuvaus
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +757,For Supplier,toimittajalle
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +723,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
@@ -1196,10 +1212,11 @@
 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
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,tiedote:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +445,BOM {0} does not belong to Item {1},BOM {0} ei kuulu tuotteelle {1}
 DocType: Sales Partner,Target Distribution,"toimitus, tavoitteet"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1667,Deafault warehouse is required for selected item,Deafault varasto tarvitaan valitun kohteen
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Deafault warehouse is required for selected item,Deafault varasto tarvitaan valitun kohteen
 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,Lukeminen 8
@@ -1208,23 +1225,23 @@
 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,Tarjouspyyntö Toimittaja
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Hardware,kova tavara
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,kova tavara
 DocType: Sales Order,Recurring Upto,Toistuvat Jopa
 DocType: Attendance,HR Manager,henkilöstön hallinta
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Valitse Yritys
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Privilege Leave,poistumisoikeus
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,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 +79,You need to enable Shopping Cart,Sinun tulee aktivoida ostoskori
 DocType: Payment Entry,Writeoff,Poistolasku
 DocType: Appraisal Template Goal,Appraisal Template Goal,"arviointi, mallipohja tavoite"
-DocType: Salary Slip,Earning,ansio
+DocType: Salary Component,Earning,ansio
 DocType: Purchase Invoice,Party Account Currency,PartyAccount Valuutta
 ,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 +171,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 +174,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_data.py +358,Food,ruoka
+apps/erpnext/erpnext/demo/setup/setup_data.py +301,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/course_schedule/course_schedule.js +103,Mark Attendence,Mark Tapahtumaan
@@ -1258,12 +1275,12 @@
 DocType: Sales Order Item,Planned Quantity,Suunnitellut Määrä
 DocType: Purchase Invoice Item,Item Tax Amount,tuotteen veroarvomäärä
 DocType: Item,Maintain Stock,huolla varastoa
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +209,Stock Entries already created for Production Order ,varaston kirjaukset on muodostettu tuotannon tilauksesta
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,varaston kirjaukset on muodostettu tuotannon tilauksesta
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,Nettomuutos kiinteä omaisuus
 DocType: Leave Control Panel,Leave blank if considered for all designations,tyhjä mikäli se pidetään vihtoehtona kaikille nimityksille
-apps/erpnext/erpnext/controllers/accounts_controller.py +620,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 +238,Max: {0},Max: {0}
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +15,From Datetime,alkaen aikajana
+apps/erpnext/erpnext/controllers/accounts_controller.py +623,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 +239,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 +153,"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.
@@ -1271,8 +1288,8 @@
 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 +552,cannot be greater than 100,ei voi olla suurempi kuin 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +680,Item {0} is not a stock Item,tuote {0} ei ole varastotuote
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +546,cannot be greater than 100,ei voi olla suurempi kuin 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is not a stock Item,tuote {0} ei ole varastotuote
 DocType: Maintenance Visit,Unscheduled,ei aikataulutettu
 DocType: Employee,Owned,Omistuksessa
 DocType: Salary Detail,Depends on Leave Without Pay,riippuu poistumisesta ilman palkkaa
@@ -1286,10 +1303,9 @@
 DocType: GL Entry,GL Entry,päätilikirjakirjaus
 DocType: HR Settings,Employee Settings,työntekijän asetukset
 ,Batch-Wise Balance History,"erä työkalu, tasehistoria"
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,To Do - tehtävät luettelo
 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 +61,Apprentice,opettelu
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +102,Negative Quantity is not allowed,Negatiivinen Määrä ei ole sallittua
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,opettelu
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +103,Negative Quantity is not allowed,Negatiivinen Määrä ei ole sallittua
 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 +152,Employee cannot report to himself.,työntekijä ei voi raportoida itselleen
@@ -1310,15 +1326,14 @@
 DocType: Asset,Asset Name,Asset Name
 DocType: Shipping Rule Condition,To Value,arvoon
 DocType: Asset Movement,Stock Manager,varastohallinta
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +141,Source warehouse is mandatory for row {0},lähde varasto on pakollinen rivin {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +719,Packing Slip,pakkauslappu
+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 +713,Packing Slip,pakkauslappu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Toimisto Rent
 apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,tekstiviestin reititinmääritykset
-apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,Tarjouspyyntö voi olla pääsy klikkaamalla seuraavaa linkkiä
 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 +81,Analyst,Analyytikko
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,Analyytikko
 DocType: Item,Inventory,inventaario
 DocType: Item,Sales Details,myynnin lisätiedot
 DocType: Quality Inspection,QI-,Qi
@@ -1326,7 +1341,7 @@
 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 +103,Government,hallinto
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,hallinto
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,Institute Name
 apps/erpnext/erpnext/config/stock.py +289,Item Variants,tuotemallit
 DocType: Company,Services,palvelut
@@ -1342,6 +1357,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,Financial Year Start Date,tilikauden aloituspäivä
 DocType: POS Profile,Apply Discount,Käytä alennus
 DocType: Employee External Work History,Total Experience,kustannukset yhteensä
+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,pakkauslaput peruttu
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Cash Flow from Investing,Investointien rahavirta
 DocType: Program Course,Program Course,ohjelma Course
@@ -1382,12 +1398,12 @@
 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
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +110,Accounting Entry for {0} can only be made in currency: {1},Kirjaus {0} voidaan tehdä vain valuutassa: {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Kirjaus {0} voidaan tehdä vain valuutassa: {1}
 DocType: Pricing Rule,Pricing Rule,Hinnoittelu Rule
 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ä
 DocType: Shopping Cart Settings,Payment Success URL,Maksu Menestys URL
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +78,Row # {0}: Returned Item {1} does not exists in {2} {3},rivi # {0}: palautettava tuote {1} ei löydy {2} {3}
+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
@@ -1396,40 +1412,39 @@
 DocType: C-Form,III,III
 apps/erpnext/erpnext/config/stock.py +294,Opening Stock Balance,avaa varastotase
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +51,{0} must appear only once,{0} saa esiintyä vain kerran
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +339,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Ei saa tranfer enemmän {0} kuin {1} vastaan Ostotilaus {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +344,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},poistumiset kohdennettu {0}:n
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,ei pakattavia tuotteita
 DocType: Shipping Rule Condition,From Value,arvosta
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +545,Manufacturing Quantity is mandatory,Valmistus Määrä on pakollista
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Valmistus Määrä on pakollista
 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,Reading 4
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,yrityksen kuluvaatimukset
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +71,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Rivi # {0}: Maavara date {1} ei voi olla ennen Sekki Date {2}
 DocType: Company,Default Holiday List,oletus lomaluettelo
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +162,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/projects/doctype/timesheet/timesheet.py +186,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
 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 joita ei löydy toimittajan tarjouskyselyistä
 DocType: Student Group,Set 0 for no limit,Aseta 0 ei rajaa
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Päivä (t), johon haet lupaa ovat vapaapäiviä. Sinun ei tarvitse hakea lupaa."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +137,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
 DocType: Dependent Task,Dependent Task,riippuvainen tehtävä
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,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/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 +190,Leave of type {0} cannot be longer than {1},poistumis tyyppi {0} ei voi olla pidempi kuin {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +197,Leave of type {0} cannot be longer than {1},poistumis tyyppi {0} ei voi olla pidempi kuin {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,kokeile suunnitella toimia X päivää etukäteen
 DocType: HR Settings,Stop Birthday Reminders,lopeta syntymäpäivämuistutukset
 DocType: SMS Center,Receiver List,Vastaanotin List
-apps/erpnext/erpnext/accounts/page/pos/pos.js +921,Search Item,haku Tuote
+apps/erpnext/erpnext/accounts/page/pos/pos.js +910,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 +546,Already completed,jo valmiiksi
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +22,Payment Request already exists {0},Maksupyyntö on jo olemassa {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +550,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 +241,Quantity must not be more than {0},Määrä saa olla enintään {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Quantity must not be more than {0},Määrä saa olla enintään {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +76,Previous Financial Year is not closed,Edellisen tilikauden ei ole suljettu
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +44,Age (Days),Ikä (päivää)
 DocType: Quotation Item,Quotation Item,tarjous tuote
@@ -1446,7 +1461,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +221,Purchase Receipt {0} is not submitted,ostokuittia {0} ei ole lähetetty
 DocType: Company,Default Payable Account,oletus maksettava tili
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","online-ostoskorin asetukset, kuten toimitustavat, hinnastot jne"
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +83,{0}% Billed,{0}% laskutettu
+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
@@ -1458,12 +1473,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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,hyvityksen kokonaisarvomäärä
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +22,Collect,Kerätä
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Kerätä
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,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 +225,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 Verovuoden {0}. Verovuoden {0} on asetettu oletuksena Global Settings
-DocType: Payment Reconciliation,Payments,maksut
 DocType: Journal Entry,Entry Type,Entry Tyyppi
 ,Customer Credit Balance,asiakas kredit tase
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Payable,Nettomuutos ostovelat
@@ -1475,7 +1489,7 @@
 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 +9,Procurement,hankinta
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,Mikään kohteita ovat muutoksia määrän tai arvon.
+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
 ,Lead Details,"vihje, lisätiedot"
 DocType: Purchase Invoice,End date of current invoice's period,nykyisen laskukauden päättymispäivä
@@ -1500,7 +1514,7 @@
 DocType: Purchase Invoice,Additional Discount,Lisäalennuksen
 DocType: Selling Settings,Selling Settings,myynnin asetukset
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Online Auctions
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +97,Please specify either Quantity or Valuation Rate or both,"määritä määrä, arvotaso tai molemmat"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,"määritä määrä, arvotaso tai molemmat"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +13,Fulfillment,täyttymys
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","yritys, kuukausi ja tilikausi vaaditaan"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,markkinointikulut
@@ -1521,14 +1535,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,ERPNext Asennus valmis!
 DocType: Item,Weightage,painoarvo
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +93,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"saman niminen asiakasryhmä on jo olemassa, vaihda asiakkaan nimi tai nimeä asiakasryhmä uudelleen"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +126,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,Parent Territory
 DocType: Quality Inspection Reading,Reading 2,Reading 2
 DocType: Stock Entry,Material Receipt,materiaali kuitti
 DocType: Homepage,Products,tavarat
 DocType: Announcement,Instructor,Ohjaaja
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},osapuolitili sekä osapuoli vaaditaansaatava / maksettava tilille {0}
 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 myyntitilaukseen yms
 DocType: Lead,Next Contact By,seuraava yhteydenottohlö
@@ -1539,7 +1552,7 @@
 ,Item-wise Sales Register,"tuote työkalu, myyntirekisteri"
 DocType: Asset,Gross Purchase Amount,Gross Osto Määrä
 DocType: Asset,Depreciation Method,Poistot Menetelmä
-apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Offline,Poissa
+apps/erpnext/erpnext/accounts/page/pos/pos.js +686,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
@@ -1557,25 +1570,27 @@
 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
 DocType: Employee,Leave Encashed?,perintä?
 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 +858,Make Purchase Order,Tee Ostotilaus
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +852,Make Purchase Order,Tee Ostotilaus
 DocType: SMS Center,Send To,lähetä kenelle
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,There is not enough leave balance for Leave Type {0},jäännöstyypille {0} ei ole tarpeeksi vapaata jäännöstasetta
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,There is not enough leave balance for Leave Type {0},jäännöstyypille {0} ei ole tarpeeksi vapaata jäännöstasetta
 DocType: Payment Reconciliation Payment,Allocated amount,kohdennettu arvomäärä
 DocType: Sales Team,Contribution to Net Total,"panostus, netto yhteensä"
 DocType: Sales Invoice Item,Customer's Item Code,asiakkaan tuotekoodi
 DocType: Stock Reconciliation,Stock Reconciliation,varaston täsmäytys
 DocType: Territory,Territory Name,alue nimi
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +172,Work-in-Progress Warehouse is required before Submit,"työnallaoleva työ, varasto vaaditaan ennen lähetystä"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,Work-in-Progress Warehouse is required before Submit,"työnallaoleva työ, varasto vaaditaan ennen lähetystä"
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,työn hakija.
 DocType: Purchase Order Item,Warehouse and Reference,Varasto ja viite
 DocType: Supplier,Statutory info and other general information about your Supplier,toimittajan lakisääteiset- ja muut päätiedot
-apps/erpnext/erpnext/hooks.py +88,Addresses,osoitteet
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Toimittaja&gt; Merkki Tyyppi
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +212,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/hooks.py +95,Addresses,osoitteet
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +215,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
 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"
 DocType: Sales Order,To Deliver and Bill,toimitukseen ja laskutukseen
@@ -1583,11 +1598,10 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,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 +731,Payment,Maksu
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,Payment,Maksu
 DocType: Production Order Operation,Actual Time and Cost,todellinen aika ja hinta
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},materiaalipyyntö max {0} voidaan tehdä tuotteelle {1} kohdistettuna myyntitilaukseen {2}
 DocType: Employee,Salutation,titteli/tervehdys
-DocType: Pricing Rule,Brand,brändi
 DocType: Course,Course Abbreviation,Course lyhenne
 DocType: Item,Will also apply for variants,sovelletaan myös muissa malleissa
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +142,"Asset cannot be cancelled, as it is already {0}","Asset ei voi peruuttaa, koska se on jo {0}"
@@ -1599,7 +1613,7 @@
 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"
 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.,Päällekkäisiä tuotteita on syötetty. Korjaa ja yritä uudelleen.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Associate,kolleega
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,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
@@ -1607,7 +1621,7 @@
 DocType: Production Planning Tool,Material Requests,materiaali pyynnöt
 DocType: Warranty Claim,Issue Date,aiheen päivä
 DocType: Activity Cost,Activity Cost,aktiviteettikustannukset
-DocType: Timesheet Detail,Timesheet Detail,tuntilomakkeen Detail
+DocType: Sales Invoice Timesheet,Timesheet Detail,tuntilomakkeen Detail
 DocType: Purchase Receipt Item Supplied,Consumed Qty,käytetty yksikkömäärä
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,tietoliikenne
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"osoittaa, pakkaus on vain osa tätä toimitusta (luonnos)"
@@ -1630,6 +1644,7 @@
 DocType: Production Plan Material Request,Material Request Date,Materiaali Request Date
 DocType: Purchase Order Item,Supplier Quotation Item,"toimittajan tarjouskysely, 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
 DocType: Item,Has Variants,on useita malleja
 DocType: Monthly Distribution,Name of the Monthly Distribution,"toimitus kuukaudessa, nimi"
 DocType: Sales Person,Parent Sales Person,emomyyjä
@@ -1642,30 +1657,31 @@
 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 +44,"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,alueella / asiakas
 apps/erpnext/erpnext/public/js/setup_wizard.js +227,e.g. 5,"esim, 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},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"
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +502,Error: {0} &gt; {1},Virhe: {0}&gt; {1}
 DocType: Item,Is Sales Item,on myyntituote
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,tuoteryhmäpuu
 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.
 DocType: Naming Series,Current Value,nykyinen arvo
-apps/erpnext/erpnext/controllers/accounts_controller.py +235,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/controllers/accounts_controller.py +238,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}
 DocType: Delivery Note Item,Against Sales Order,myyntitilauksen kohdistus
 ,Serial No Status,sarjanumero tila
 DocType: Payment Entry Reference,Outstanding,maksamatta
 ,Daily Timesheet Summary,Päivittäinen Tuntilomakkeen Yhteenveto
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +458,Item table can not be blank,tuote taulukko ei voi olla tyhjä
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +443,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 +5,This is based on stock movement. See {0} for details,Tämä perustuu varastojen kehityksellä. Katso {0} lisätietoja
 DocType: Pricing Rule,Selling,myynti
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +341,Amount {0} {1} deducted against {2},Määrä {0} {1} vähennetään vastaan {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +344,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ää
@@ -1680,8 +1696,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +144,Cannot refer row number greater than or equal to current row number for this Charge type,"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 +159,Red,punainen
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"klikkaa ""muodosta aikataulu"" ja syötä tuotteen sarjanumero {0}"
+apps/erpnext/erpnext/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
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Base Määrä (Company valuutta)
@@ -1689,7 +1705,7 @@
 DocType: Installation Note,Installation Time,asennus aika
 DocType: Sales Invoice,Accounting Details,Kirjanpito Lisätiedot
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,poista kaikki tapahtumat tältä yritykseltä
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +187,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,"rivi # {0}: toiminto {1} ei ole valmis {2} valmiiden tuotteiden yksikkömäärä tuotantotilauksessa # {3}, päivitä toiminnon tila aikalokin kautta"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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,"rivi # {0}: toiminto {1} ei ole valmis {2} valmiiden tuotteiden yksikkömäärä tuotantotilauksessa # {3}, päivitä toiminnon tila aikalokin kautta"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,sijoitukset
 DocType: Issue,Resolution Details,johtopäätös lisätiedot
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,määrärahat
@@ -1725,16 +1741,17 @@
 DocType: Bank Reconciliation Detail,Against Account,tili kohdistus
 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},Varsinainen laskutus: {0}
 DocType: Delivery Note,Excise Page Number,poisto sivunumero
 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},Aseta &quot;Asset Poistot Kustannuspaikka&quot; in Company {0}
 ,Maintenance Schedules,huoltoaikataulut
 DocType: Task,Actual End Date (via Time Sheet),Todellinen Lopetuspäivä (via kellokortti)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Amount {0} {1} against {2} {3},Määrä {0} {1} vastaan {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +339,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 +138,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 +295,Debit To account must be a Receivable account,tilin debet tulee olla saatava tili
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Receivable account,tilin debet tulee olla saatava tili
 DocType: Shipping Rule Condition,Shipping Amount,toimituskustannus arvomäärä
 ,Pending Amount,odottaa arvomäärä
 DocType: Purchase Invoice Item,Conversion Factor,muuntokerroin
@@ -1742,10 +1759,10 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +137,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,Ajoneuvojen lukumäärä
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,päivä jolloin toistuva lasku lakkaa
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +90,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Yhteensä myönnetty lehdet {0} ei voi olla pienempi kuin jo hyväksytty lehdet {1} kaudeksi
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +93,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,"toimittaja työkalu, myyntianalyysi"
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +22,Enter Paid Amount,Anna maksettu summa
+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ä useampi asteista BOM:ia
@@ -1755,13 +1772,15 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,kellokortit
 DocType: HR Settings,HR Settings,henkilöstön asetukset
 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äalennuksen arvomäärä
-apps/erpnext/erpnext/controllers/accounts_controller.py +524,"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."
+apps/erpnext/erpnext/controllers/accounts_controller.py +527,"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,"poistu estoluettelo, salli"
 apps/erpnext/erpnext/setup/doctype/company/company.py +249,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
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,"yhteensä, todellinen"
+DocType: Student Siblings,Student Siblings,Student Sisarukset
 apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,yksikkö
 apps/erpnext/erpnext/stock/get_item_details.py +123,Please specify Company,Ilmoitathan Company
 ,Customer Acquisition and Loyalty,asiakashankinta ja suhteet
@@ -1772,17 +1791,19 @@
 apps/erpnext/erpnext/projects/doctype/task/task.js +26,Expense Claims,kuluvaatimukset
 DocType: Issue,Support,tuki
 ,BOM Search,BOM haku
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Closing (Opening + Totals),sulku (avaus + summat)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),sulku (avaus + summat)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,määritä yrityksen valuutta
 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/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
-apps/erpnext/erpnext/controllers/accounts_controller.py +272,Account {0} is invalid. Account Currency must be {1},Tili {0} ei kelpaa. Tilin valuutan on oltava {1}
+DocType: Email Digest,Pending Sales Orders,Odottaa Myyntitilaukset
+apps/erpnext/erpnext/controllers/accounts_controller.py +275,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},UOM muuntokerroin vaaditaan rivillä {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +956,"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 Slip,Deduction,vähennys
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +87,Row {0}: From Time and To Time is mandatory.,Rivi {0}: From Time ja Kellonaikatilaan on pakollista.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +969,"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 +111,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 +262,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 +7,Please enter Employee Id of this sales person,syötä työntekijätunnu tälle myyjälle
@@ -1790,7 +1811,7 @@
 DocType: Project,% Tasks Completed,% tehtävät valmis
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,Ero määrä on nolla
 DocType: Project,Gross Margin,bruttokate
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +194,Please enter Production Item first,syötä ensin tuotantotuote
+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ä
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,tarjous
@@ -1799,53 +1820,54 @@
 DocType: Maintenance Visit,Maintenance User,"huolto, käyttäjä"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +149,Cost Updated,kustannukset päivitetty
 DocType: Employee,Date of Birth,syntymäpäivä
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +86,Item {0} has already been returned,tuote {0} on palautettu
+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** kaikki tilikauden kirjanpitoon kirjatut tositteet ja päätapahtumat on jäljitetty **tilikausi**
 DocType: Opportunity,Customer / Lead Address,asiakas / vihje osoite
 apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid SSL certificate on attachment {0},Varoitus: Virheellinen SSL-varmenteen kiinnittymiseen {0}
+DocType: Student Admission,Eligibility,kelpoisuus
 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 +177,Job Description,työn kuvaus
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,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 +126,"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 +127,"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"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +24,Welcome to POS: Create your POS Profile,Tervetuloa POS: Luo POS profiili
 DocType: Expense Claim,Approver,hyväksyjä
 ,SO Qty,myyntitilaukset yksikkömäärä
+DocType: Guardian,Work Address,työosoite
 DocType: Appraisal,Calculate Total Score,laske yhteispisteet
 DocType: Request for Quotation,Manufacturing Manager,valmistuksenhallinta
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},sarjanumerolla {0} on takuu {1} asti
+apps/erpnext/erpnext/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 +74,Shipments,toimitukset
+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
 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 +153,Row # ,Rivi #
+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 +156,Get From,"hae, mistä"
+apps/erpnext/erpnext/public/js/utils.js +167,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 +167,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 +416,"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"
+apps/erpnext/erpnext/controllers/accounts_controller.py +419,"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ä
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} is disabled,käyttäjä {0} on poistettu käytöstä
 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...
 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 +171,"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 +346,{0} is mandatory for Item {1},{0} on pakollinen tuotteelle {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,{0} is mandatory for Item {1},{0} on pakollinen tuotteelle {1}
 DocType: Currency Exchange,From Currency,valuutasta
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","valitse kohdennettava arvomäärä, laskun tyyppi ja laskun numero vähintään yhdelle riville"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,Kustannukset New Purchase
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},myyntitilaus vaaditaan tuotteelle {0}
 DocType: Purchase Invoice Item,Rate (Company Currency),taso (yrityksen valuutta)
-apps/erpnext/erpnext/demo/setup_data.py +360,Others,Muut
+DocType: Student Guardian,Others,Muut
 DocType: Payment Entry,Unallocated Amount,Kohdistamattomat Määrä
 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
@@ -1865,17 +1887,16 @@
 apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,Serialized Inventory
 DocType: Activity Type,Default Billing Rate,Oletus laskutustaksa
 DocType: Sales Invoice,Total Billing Amount,laskutuksen kokomaisarvomäärä
-apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +54,Receivable Account,saatava tili
-apps/erpnext/erpnext/controllers/accounts_controller.py +546,Row #{0}: Asset {1} is already {2},Rivi # {0}: Asset {1} on jo {2}
+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 +549,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 +79,CEO,toimitusjohtaja
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,toimitusjohtaja
 DocType: Expense Claim Detail,Expense Claim Detail,kuluvaatimus lisätiedot
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +808,Please select correct account,Valitse oikea tili
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +809,Please select correct account,Valitse oikea tili
 DocType: Item,Weight UOM,paino UOM
 DocType: Salary Structure Employee,Salary Structure Employee,Palkka rakenne Työntekijän
 DocType: Employee,Blood Group,Veriryhmä
-DocType: Purchase Invoice Item,Page Break,Sivunvaihto
 DocType: Production Order Operation,Pending,odottaa
 DocType: Course,Course Name,Kurssin nimi
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,seuraavat käyttäjät voivat hyväksyä määriteltyjen työntekijöiden poistumissovellukset
@@ -1884,14 +1905,15 @@
 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,korota materiaalipyyntö kun varastoarvo saavuttaa uuden ostotilauksen tason
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Full-time,päätoiminen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,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: Student,Guardians,Guardians
 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 +289,Debit To is required,Veloituksen tarvitaan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +321,Debit To is required,Veloituksen tarvitaan
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Ostohinta List
 DocType: Offer Letter Term,Offer Term,Tarjous Term
 DocType: Quality Inspection,Quality Manager,laatuhallinta
@@ -1899,6 +1921,7 @@
 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},Yhteensä Maksamattomat: {0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Tarjoa Kirje
 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"
@@ -1909,18 +1932,17 @@
 DocType: Production Order Operation,Completed Qty,valmiit yksikkömäärä
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"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 +273,Price List {0} is disabled,hinnasto {0} on poistettu käytöstä
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +99,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/projects/doctype/timesheet/timesheet.py +123,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
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} sarjanumerot tarvitaan Tuote {1}. Olet antanut {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,nykyinen arvotaso
 DocType: Item,Customer Item Codes,asiakkaan tuotekoodit
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,Exchange voitto / tappio
 DocType: Opportunity,Lost Reason,hävitty syy
-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/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 Document
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +378,All items have already been invoiced,kaikki tuotteet on jo laskutettu
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +379,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
@@ -1936,18 +1958,19 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Omat asiakkaat
 apps/erpnext/erpnext/projects/doctype/project/project.py +141,You have been invited to collaborate on the project: {0},Sinut on kutsuttu yhteistyötä hankkeen: {0}
 DocType: Leave Block List Date,Block Date,estopäivä
-apps/erpnext/erpnext/templates/generators/job_opening.html +19,Apply Now,Hae nyt
+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"
 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
-apps/erpnext/erpnext/utilities/doctype/address/address.py +164,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: Fee Structure,Fee Structure,Palkkiojärjestelmä
 DocType: Timesheet Detail,Costing Amount,"kustannuslaskenta, arvomäärä"
+DocType: Student Admission,Application Fee,Hakemusmaksu
 DocType: Process Payroll,Submit Salary Slip,lähetä palkkalaskelma
-apps/erpnext/erpnext/controllers/selling_controller.py +161,Maxiumm discount for Item {0} is {1}%,Maxiumm alennus Tuote {0} on {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,Maxiumm alennus Tuote {0} on {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,tuo massana
 DocType: Sales Partner,Address & Contacts,osoitteet ja yhteystiedot
 DocType: SMS Log,Sender Name,lähettäjän nimi
@@ -1972,21 +1995,21 @@
 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_data.py +361,Travel,matka
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +155,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 +304,Travel,matka
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +167,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,Asiakas Mobile Ei
 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ä Tool
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +23,Update Cost,päivitä kustannukset
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,päivitä kustannukset
 DocType: Item Reorder,Item Reorder,tuote tiedostot
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +36,Show Salary Slip,Näytä Palkka Slip
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +748,Transfer Material,materiaalisiirto
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +53,Show Salary Slip,Näytä Palkka Slip
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +166,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 +923,Please set recurring after saving,Määritä toistuva tallentamisen jälkeen
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +646,Select change amount account,Valitse muutoksen suuruuden tili
+apps/erpnext/erpnext/public/js/controllers/transaction.js +914,Please set recurring after saving,Määritä toistuva tallentamisen jälkeen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +703,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
@@ -1998,31 +2021,32 @@
 DocType: Quality Inspection,Verified By,vahvistanut
 DocType: Address,Subsidiary,tytäryhtiö
 apps/erpnext/erpnext/setup/doctype/company/company.py +64,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","yrityksen oletusvaluuttaaei voi muuttaa sillä tapahtumia on olemassa, tapahtumat tulee peruuttaa jotta oletusvaluuttaa voi muuttaa"
+DocType: Grade Interval,Grade Description,Grade Kuvaus
 DocType: Quality Inspection,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 +33,Traceability,jäljitettävyys
 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 +352,Quantity in row {0} ({1}) must be same as manufactured quantity {2},määrä rivillä {0} ({1}) tulee olla sama kuin valmistettu määrä {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Quantity in row {0} ({1}) must be same as manufactured quantity {2},määrä rivillä {0} ({1}) tulee olla sama kuin valmistettu määrä {2}
 DocType: Appraisal,Employee,työntekijä
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Kutsu Käyttäjä
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} on kokonaan laskutettu
 DocType: Workstation Working Hour,End Time,ajan loppu
 DocType: Payment Entry,Payment Deductions or Loss,Maksu vähennykset tai tappio
-apps/erpnext/erpnext/config/schools.py +100,LMS,LMS
+apps/erpnext/erpnext/config/schools.py +104,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/config/crm.py +6,Sales Pipeline,Sales Pipeline
 DocType: Student Batch Student,Student Batch Student,Student Erä Student
-DocType: Sales Invoice,Mass Mailing,Mass Mailing
+apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,pyydetylle
 DocType: Rename Tool,File to Rename,uudelleennimettä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 +199,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/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,kuluvaatimus hyväksytty
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +297,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 +111,Pharmaceutical,Lääkealan
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +309,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/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
@@ -2037,27 +2061,28 @@
 DocType: Upload Attendance,Attendance To Date,osallistuminen päivään
 DocType: Warranty Claim,Raised By,Raised By
 DocType: Payment Gateway Account,Payment Account,maksutili
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +814,Please specify Company to proceed,Ilmoitathan Yritys jatkaa
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +793,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 +44,Compensatory Off,korvaava on pois
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,korvaava on pois
 DocType: Quality Inspection Reading,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"
 DocType: Room,Room Number,Huoneen numero
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Virheellinen viittaus {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +161,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ei voi olla suurempi arvo kuin suunniteltu tuotantomäärä ({2}) tuotannon tilauksessa {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +162,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ei voi olla suurempi arvo kuin suunniteltu tuotantomäärä ({2}) tuotannon tilauksessa {3}
 DocType: Shipping Rule,Shipping Rule Label,toimitus sääntö etiketti
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Käyttäjäfoorumi
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +217,Raw Materials cannot be blank.,raaka-aineet ei voi olla tyhjiä
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,"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 +460,Quick Journal Entry,Nopea Päiväkirjakirjaus
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +111,You can not change rate if BOM mentioned agianst any item,"tasoa ei voi muuttaa, jos BOM liitetty johonkin tuotteeseen"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +441,"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 +450,Quick Journal Entry,Nopea Päiväkirjakirjaus
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +103,You can not change rate if BOM mentioned agianst any item,"tasoa ei voi muuttaa, jos BOM liitetty johonkin tuotteeseen"
 DocType: Employee,Previous Work Experience,Edellinen Työkokemus
 DocType: Stock Entry,For Quantity,yksikkömäärään
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +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 +214,{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
 ,Minutes to First Response for Issues,Minuutin First Response Issues
 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ää.
@@ -2066,16 +2091,17 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Projekti Status
 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 +398,The following Production Orders were created:,Seuraavat Tuotanto Tilaukset 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"
 ,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 +739,Item or Warehouse for row {0} does not match Material Request,tuote tai varastorivi {0} ei täsmää materiaalipyynnön kanssa
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +747,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ö
 DocType: Fiscal Year,Year End Date,Vuoden viimeinen päivä
 DocType: Task Depends On,Task Depends On,tehtävä riippuu
-DocType: Lead,Opportunity,tilaisuus
+DocType: Supplier Quotation,Opportunity,tilaisuus
 ,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}: For toimittaja {0} email id on lähetettävä sähköpostitse
 DocType: Operation,Default Workstation,oletus työpiste
@@ -2088,7 +2114,7 @@
 DocType: Student,Joining Date,liittyminen Date
 ,Employees working on a holiday,Työntekijät työskentelevät lomalla
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Mark Nykyinen
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},huollon aloituspäivä ei voi olla ennen sarjanumeron {0} toimitusaikaa
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},huollon aloituspäivä ei voi olla ennen sarjanumeron {0} toimitusaikaa
 DocType: Production Order,Actual End Date,todellinen päättymispäivä
 DocType: Purchase Invoice,PINV-,PINV-
 DocType: Authorization Rule,Applicable To (Role),sovellettavissa (rooli)
@@ -2103,7 +2129,7 @@
 DocType: SMS Log,No of Requested SMS,Ei annettu Pyydetty SMS
 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 +729,Please supply the specified items at the best possible rates,Ole hyvä ja toimittaa erityisiin kohtiin on paras mahdollinen hinnat
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +695,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 +117,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-
@@ -2112,7 +2138,7 @@
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","syötä staattiset url parametrit tähän (esim, lähettäjä = ERPNext, käyttäjätunnus = ERPNext, salasana = 1234 jne)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,"{0} {1} ei ole millään aktiivisella tilikaudella, täppää {2} saadaksesi lisätietoja"
 DocType: Task,Actual Start Date (via Time Sheet),Todellinen aloituspäivä (via kellokortti)
-apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +14,This is an example website auto-generated from ERPNext,"tämä on demo verkkosivu, joka on muodostettu automaattisesti ERPNext:ssä"
+apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,"tämä on demo verkkosivu, joka on muodostettu automaattisesti ERPNext:ssä"
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,vanhentumisen skaala 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.
 
@@ -2139,13 +2165,14 @@
 DocType: Purchase Receipt Item,Recd Quantity,RECD Määrä
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +54,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 +103,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 +504,Stock Entry {0} is not submitted,varaston kirjaus {0} ei ole lähetetty
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},ei voi valmistaa suurempaa määrää tuotteita {0} kuin myyntitilauksen määrä {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +505,Stock Entry {0} is not submitted,varaston kirjaus {0} ei ole lähetetty
 DocType: Payment Reconciliation,Bank / Cash Account,Pankki-tai Kassatili
 DocType: Tax Rule,Billing City,Laskutus Kaupunki
 DocType: Salary Component Account,Salary Component Account,Palkanosasta Account
 DocType: Global Defaults,Hide Currency Symbol,piilota valuuttasymbooli
 apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card","esim, pankki, kassa, luottokortti"
+DocType: Lead Source,Source Name,Source Name
 DocType: Journal Entry,Credit Note,hyvityslasku
 DocType: Warranty Claim,Service Address,palveluosoite
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furnitures and Fixtures,Huonekaluja ja kalusteet
@@ -2157,6 +2184,7 @@
 DocType: Opportunity,Customer / Lead Name,asiakas / vihje nimi
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +89,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/controllers/trends.py +19,Total(Qty),yhteensä (yksikkömäärä)
 DocType: Sales Invoice,This Document,Tämä asiakirja
@@ -2168,15 +2196,15 @@
 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 +176,Organization branch master.,"organisaatio, toimiala valvonta"
-apps/erpnext/erpnext/controllers/accounts_controller.py +273, or ,tai
+apps/erpnext/erpnext/controllers/accounts_controller.py +276, or ,tai
 DocType: Sales Order,Billing Status,Laskutus tila
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,raportti aihe
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,hyödykekulut
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-yli
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +203,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Rivi # {0}: Päiväkirjakirjaus {1} ei ole huomioon {2} tai jo sovitettu toista voucher
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +206,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 Slip Perustuen Tuntilomakkeen
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +90,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 +93,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
@@ -2204,8 +2232,8 @@
 DocType: Product Bundle,Parent Item,Parent Kohde
 DocType: Account,Account Type,Tilin tyyppi
 DocType: Delivery Note,DN-RET-,DN-jälkikä-
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +115,Leave Type {0} cannot be carry-forwarded,"Jätä Tyyppi {0} ei voida tehdä, toimitetaan"
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"huoltuaikataulua ei ole luotu kaikille tuotteille, klikkaa ""muodosta aikataulu"""
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +118,Leave Type {0} cannot be carry-forwarded,"Jätä Tyyppi {0} ei voida tehdä, toimitetaan"
+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,Payroll
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +163,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","riviin {0}:ssa {1} sisällytä {2} tuotetasolle, rivit {3} tulee myös sisällyttää"
@@ -2217,13 +2245,13 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +32,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 +748,Delivery,Toimitus
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +742,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
 DocType: Payment Entry,Total Allocated Amount,Yhteensä osuutensa
 DocType: Item Reorder,Material Request Type,materiaalipyynnön tyyppi
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +82,Row {0}: UOM Conversion Factor is mandatory,Rivi {0}: UOM Muuntokerroin on pakollinen
+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
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,tosite #
@@ -2234,13 +2262,13 @@
 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 +90,Head of Marketing and Sales,markkinoinnin ja myynnin pää
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,tulovero
+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 +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.,jäljitä vihjeitä toimialan mukaan
 DocType: Item Supplier,Item Supplier,tuote toimittaja
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +403,Please enter Item Code to get batch no,syötä tuotekoodi saadaksesi eränumeron
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +770,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 +397,Please enter Item Code to get batch no,syötä tuotekoodi saadaksesi eränumeron
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +764,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"
@@ -2252,28 +2280,29 @@
 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,verot ja maksut vähennetty
-apps/erpnext/erpnext/hooks.py +100,Issues,aiheet
+apps/erpnext/erpnext/hooks.py +109,Issues,aiheet
 apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},tilan tulee olla yksi {0}:sta
 DocType: Sales Invoice,Debit To,debet (lle)
 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
 ,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ä
 DocType: Supplier,Billing Currency,Laskutus Valuutta
 DocType: Sales Invoice,SINV-RET-,SINV-jälkikä-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Large,erittäin suuri
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Extra Large,erittäin suuri
 ,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 +507,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 +107,Local,Paikallinen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +508,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/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 +154,Large,Suuri
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Large,Suuri
 DocType: Homepage Featured Product,Homepage Featured Product,Kotisivu Erityistuotteet
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Uusi varasto Name
-apps/erpnext/erpnext/accounts/report/financial_statements.py +225,Total {0} ({1}),Yhteensä {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +224,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ä
@@ -2319,9 +2348,9 @@
 DocType: Attendance,Leave Type,"poistu, tyyppi"
 apps/erpnext/erpnext/controllers/stock_controller.py +173,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/hr/doctype/salary_slip/salary_slip.py +79,Name error: {0},Nimi error: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +90,Name error: {0},Nimi error: {0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,Puute
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +178,{0} {1} does not associated with {2} {3},{0} {1} ei liittynyt {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +181,{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)
 DocType: Warehouse,Parent Warehouse,Parent Varasto
@@ -2340,7 +2369,7 @@
 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
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,vähintään yhdellä tuottella tulee olla negatiivinen määrä palautus asiakirjassa
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Atleast one item should be entered with negative quantity in return document,vähintään yhdellä tuottella tulee olla negatiivinen määrä palautus asiakirjassa
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","tuote {0} kauemmin kuin mikään saatavillaoleva työaika työasemalla {1}, hajoavat toiminta useiksi toiminnoiksi"
 ,Requested,Pyydetty
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +83,No Remarks,Ei Huomautuksia
@@ -2352,46 +2381,46 @@
 DocType: Item,Total Projected Qty,Kokonaisprojektiopinnalle Määrä
 DocType: Monthly Distribution,Distribution Name,"toimitus, nimi"
 DocType: Course,Course Code,Course koodi
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Quality Inspection required for Item {0},tuotteelle {0} laatutarkistus
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,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
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,hallitse aluepuuta
 DocType: Journal Entry Account,Sales Invoice,myyntilasku
 DocType: Journal Entry Account,Party Balance,osatase
-apps/erpnext/erpnext/accounts/page/pos/pos.js +475,Please select Apply Discount On,valitse käytä alennusta
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +92,Salary Slip Created,Palkka Slip Luotu
+apps/erpnext/erpnext/accounts/page/pos/pos.js +464,Please select Apply Discount On,valitse käytä alennusta
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +95,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
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,"alennusprosenttia voi soveltaa yhteen, tai useampaan hinnastoon"
 DocType: Purchase Invoice,Half-yearly,puolivuosittain
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +384,Accounting Entry for Stock,kirjanpidon varaston kirjaus
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +387,Accounting Entry for Stock,kirjanpidon varaston kirjaus
 DocType: Sales Invoice,Sales Team1,myyntitiimi 1
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,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 +96,Row {0}: Completed Qty must be greater than zero.,Rivi {0}: Valmis Määrä on oltava suurempi kuin nolla.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +120,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 +88,Row # {0}: Cannot return more than {1} for Item {2},rivi # {0}: ei voi palauttaa enemmän kuin {1} tuotteelle {2}
+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
 DocType: Item Group,Show this slideshow at the top of the page,näytä tämä diaesitys sivun yläreunassa
 DocType: BOM,Item UOM,tuote UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),veron arvomäärä alennusten jälkeen (yrityksen valuutta)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +147,Target warehouse is mandatory for row {0},tavoite varasto on pakollinen rivin {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +141,Target warehouse is mandatory for row {0},tavoite varasto on pakollinen rivin {0}
 DocType: Cheque Print Template,Primary Settings,ensisijainen Asetukset
 DocType: Purchase Invoice,Select Supplier Address,Valitse toimittaja Osoite
 DocType: Quality Inspection,Quality Inspection,laatutarkistus
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Extra Small,erittäin pieni
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,Warning: Material Requested Qty is less than Minimum Order Qty,varoitus: pyydetty materiaali yksikkömäärä on pienempi kuin vähimmäis ostotilausmäärä
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +194,Account {0} is frozen,tili {0} on jäädytetty
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,erittäin pieni
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +690,Warning: Material Requested Qty is less than Minimum Order Qty,varoitus: pyydetty materiaali yksikkömäärä on pienempi kuin vähimmäis ostotilausmäärä
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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 +606,Can only make payment against unbilled {0},Voi vain maksun vastaan laskuttamattomia {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +126,Commission rate cannot be greater than 100,provisio taso ei voi olla suurempi kuin 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +609,Can only make payment against unbilled {0},Voi vain maksun vastaan laskuttamattomia {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,provisio taso ei voi olla suurempi kuin 100
 DocType: Stock Entry,Subcontract,alihankinta
 apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,Kirjoita {0} ensimmäisen
 DocType: Production Order Operation,Actual End Time,todellinen päättymisaika
@@ -2402,30 +2431,30 @@
 DocType: SMS Log,No of Sent SMS,Ei annettu Lähetetyt SMS
 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 +158,Colour,väritä
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,väritä
 DocType: Maintenance Visit,Scheduled,aikataulutettu
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Pyydä tarjous.
 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"
 DocType: Student Log,Academic,akateeminen
-apps/erpnext/erpnext/controllers/accounts_controller.py +469,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Yhteensä etukäteen ({0}) vastaan Order {1} ei voi olla suurempi kuin Grand Total ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +472,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Yhteensä etukäteen ({0}) vastaan Order {1} ei voi olla suurempi kuin Grand Total ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,valitse toimitusten kk jaksotus tehdäksesi kausiluonteiset toimitusttavoitteet
 DocType: Purchase Invoice Item,Valuation Rate,arvotaso
+DocType: Stock Reconciliation,SR/,SR /
 apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,"hinnasto, valuutta ole valittu"
 DocType: Assessment,Results,tulokset
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +168,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 +175,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ä Log
-DocType: Student Applicant,Father's/ Guardian 2 Email ID,Isän / Guardian 2 -sähköpostitunnus
 DocType: Maintenance Visit Purpose,Against Document No,asiakirjan nro kohdistus
 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 +228,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 +231,Warehouses with existing transaction can not be converted to group.,Varastoissa nykyisten tapahtumaa ei voida muuntaa ryhmään.
 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 +93,Researcher,Tutkija
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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"
@@ -2437,25 +2466,25 @@
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",voit tulostaa nämä koodit tulostusmuodoissa asiakirjoihin kuten laskut ja lähetteet asiakkaiden työn helpottamiseksi
 DocType: Sales Invoice,Time Sheet List,Kellokortti List
 DocType: Employee,You can enter any date manually,voit kirjoittaa minkä tahansa päivämäärän manuaalisesti
-DocType: Sales Invoice,Advertisement,mainos
 DocType: Asset Category Account,Depreciation Expense Account,Poistot edustusravintolat
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Probationary Period,Koeaika
-apps/erpnext/erpnext/hooks.py +102,Announcements,Ilmoitukset
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Koeaika
+apps/erpnext/erpnext/hooks.py +111,Announcements,Ilmoitukset
 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 +109,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 +16,To Datetime,aikajana
+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/scheduling_tool/scheduling_tool.py +51,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/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Odottaa Aktiviteetit
+DocType: Accounts Settings,Make Payment via Journal Entry,Tee Maksu Päiväkirjakirjaus
+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 +127,Please enter relieving date.,Syötä lievittää päivämäärä.
-apps/erpnext/erpnext/controllers/trends.py +145,Amt,pankkipääte
+apps/erpnext/erpnext/controllers/trends.py +149,Amt,pankkipääte
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,Only Leave Applications with status 'Approved' can be submitted,vain 'hyväksytty' poistumissovellus voidaan lähettää
 apps/erpnext/erpnext/utilities/doctype/address/address.py +26,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
@@ -2473,14 +2502,15 @@
 apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1},Ei löydy valuuttakurssin {0} on {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Mark Half Day
 DocType: Sales Invoice,Sales Team,myyntitiimi
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Duplicate entry,monista kirjaus
+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,takuun alla
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +490,[Error],[virhe]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +484,[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ä
 apps/erpnext/erpnext/controllers/status_updater.py +175,Limit Crossed,raja Crossed
 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.
 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
@@ -2496,22 +2526,22 @@
 ,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 +25,All Jobs,kaikki työt
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,All Jobs,kaikki työt
 DocType: Sales Order,% of materials billed against this Sales Order,% materiaaleja laskutettu tätä myyntitilausta vastaan
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,kauden sulkukirjaus
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,olemassaolevien tapahtumien kustannuspaikkaa ei voi muuttaa ryhmäksi
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Amount {0} {1} {2} {3},Määrä {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Amount {0} {1} {2} {3},Määrä {0} {1} {2} {3}
 DocType: Account,Depreciation,arvonalennus
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),toimittaja/toimittajat
 DocType: Employee Attendance Tool,Employee Attendance Tool,Työntekijän läsnäolo Tool
 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 +372,Payment Entries {0} are un-linked,Maksu merkinnät {0} ovat un sidottu
+apps/erpnext/erpnext/accounts/utils.py +449,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,poistumiskohdistus
 DocType: Payment Request,Recipient Message And Payment Details,Vastaanottaja Message ja maksutiedot
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +497,Material Requests {0} created,materiaalipyynnön tekijä {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +498,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.,sopimustaehtojen mallipohja
 DocType: Purchase Invoice,Address and Contact,Osoite ja yhteystiedot
@@ -2550,7 +2580,7 @@
 DocType: Serial No,Warranty / AMC Details,takuu / AMC 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 +848,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 +859,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 +233,Closing (Dr),sulku (dr)
 DocType: Cheque Print Template,Cheque Size,Shekki Koko
@@ -2571,7 +2601,8 @@
 ,Billed Amount,laskutettu arvomäärä
 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.
-apps/erpnext/erpnext/controllers/accounts_controller.py +555,'Update Stock' cannot be checked for fixed asset sale,Päivitä Stock &quot;ei voida tarkistaa käyttöomaisuushankintoihin myytävänä
+DocType: Student Guardian,Father,Isä
+apps/erpnext/erpnext/controllers/accounts_controller.py +558,'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
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,hae päivitykset
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +132,Material Request {0} is cancelled or stopped,materiaalipyyntö {0} on peruttu tai keskeytetty
@@ -2581,15 +2612,15 @@
 DocType: Sales Order,Fully Delivered,täysin toimitettu
 DocType: Lead,Lower Income,matala tulo
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","vastattavat päätili, jonne voitto/tappio varataan"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +166,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 +238,"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 +81,Purchase Order number required for Item {0},ostotilauksen numero vaaditaan tuotteelle {0}
+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/purchase_receipt/purchase_receipt.py +82,Purchase Order number required for Item {0},ostotilauksen numero vaaditaan tuotteelle {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',Aloituspäivän tulee olla ennen päättymispäivää
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +17,Cannot change status as student {0} is linked with student application {1},Ei voida muuttaa asemaa opiskelija {0} liittyy opiskelijavalinta {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Ei voida muuttaa asemaa opiskelija {0} liittyy opiskelijavalinta {1}
 DocType: Timesheet,"List of employee which has ""Salary Slip Based on Timesheet"" is enabled in salary structure.","Luettelo työntekijä, joka on &quot;palkkakuitin perusteella Tuntilomakkeen&quot; on käytössä palkkarakenteen."
 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 +356,Customer {0} does not belong to project {1},asiakas {0} ei kuulu projektiin {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,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
 DocType: Sales Order,Customer's Purchase Order,Asiakkaan Ostotilaus
 apps/erpnext/erpnext/config/stock.py +107,Serial No and Batch,Sarjanumero ja Erä
@@ -2601,7 +2632,7 @@
 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,"poistu estoluettelo, sallittu"
-apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +55,All Warehouses,kaikki kaupalliset
+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 +105,Credit To account must be a Balance Sheet account,Kiitos tilin on oltava Tase tili
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,kaikki toimittajatyypit
@@ -2613,10 +2644,10 @@
 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/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,tee palkkalaskelma
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +26,Browse BOM,selaa BOM:a
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,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/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 Year,Academic Year,Lukuvuosi
+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
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,arviointi
@@ -2624,12 +2655,12 @@
 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 +197,Leave approver must be one of {0},poistumis hyväksyjä tulee olla {0}:sta
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,Leave approver must be one of {0},poistumis hyväksyjä tulee olla {0}:sta
 DocType: Hub Settings,Seller Email,myyjä sähköposti
 DocType: Project,Total Purchase Cost (via Purchase Invoice),hankintakustannusten kokonaismäärä (ostolaskuista)
 DocType: Workstation Working Hour,Start Time,aloitusaika
 DocType: Item Price,Bulk Import Help,"massatuonti, ohje"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +256,Select Quantity,valitse yksikkömäärä
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +257,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,Peruuttaa tämän Sähköposti Digest
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Viesti lähetetty
@@ -2646,6 +2677,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,tavoite yksikkömäärä tai tavoite arvomäärä vaaditaan
 apps/erpnext/erpnext/config/projects.py +45,Cost of various activities,vaihtelevien aktiviteettien kustannukset
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Asetus Tapahtumat {0}, koska työntekijä kiinnitetty alla Sales Henkilöt ei ole User ID {1}"
+DocType: Timesheet,Billing Details,laskutustiedot
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +149,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
 DocType: Item,Inspection Required,tarkistus vaaditaan
@@ -2665,7 +2697,7 @@
 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 +138,Wire Transfer,johdotus siirto
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,johdotus siirto
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Tarkista kaikki
 DocType: Sales Order,Recurring Order,Toistuvat Order
 DocType: Company,Default Income Account,oletus tulotili
@@ -2677,21 +2709,19 @@
 ,Welcome to ERPNext,tervetuloa ERPNext
 apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,vihjeestä tarjous
 DocType: Lead,From Customer,asiakkaasta
-apps/erpnext/erpnext/demo/setup_data.py +357,Calls,pyynnöt
+apps/erpnext/erpnext/demo/setup/setup_data.py +300,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/stock/doctype/item/item.py +466,"As there are existing transactions for this item, \
-							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Koska on olemassa nykyisiä tapahtumia tälle tuotteelle, \ et voi muuttaa arvoja &quot;Has Järjestysnumero&quot;, &quot;Has Erä&quot;, &quot;Onko Kanta Tuote&quot; ja &quot;Arvostusmenetelmä&quot;"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,Purchase Order {0} is not submitted,ostotilausta {0} ei ole lähetetty
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,ennustus
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},sarjanumero {0} ei kuulu varastoon {1}
 apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,huom: järjestelmä ei tarkista ylitoimitusta tai tuotteen ylivarausta {0} yksikkömääränä tai arvomäärän ollessa 0
 DocType: Notification Control,Quotation Message,"tarjous, viesti"
 DocType: Issue,Opening Date,Opening Date
-apps/erpnext/erpnext/schools/api.py +58,Attendance has been marked successfully.,Läsnäolo on merkitty onnistuneesti.
+apps/erpnext/erpnext/schools/api.py +57,Attendance has been marked successfully.,Läsnäolo on merkitty onnistuneesti.
 DocType: Journal Entry,Remark,Huomautus
 DocType: Purchase Receipt Item,Rate and Amount,taso ja arvomäärä
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +136,Account Type for {0} must be {1},Tilityyppi on {0} on {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +139,Account Type for {0} must be {1},Tilityyppi on {0} on {1}
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Lehdet ja Holiday
 DocType: Sales Order,Not Billed,Ei laskuteta
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Both Warehouse must belong to same Company,Molemmat Warehouse on kuuluttava samaan Company
@@ -2706,12 +2736,13 @@
 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/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 +20,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 +1190,Please select customer,Valitse asiakas
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1193,Please select customer,Valitse asiakas
 DocType: C-Form,I,minä
 DocType: Company,Asset Depreciation Cost Center,Asset Poistot Kustannuspaikka
 DocType: Sales Order Item,Sales Order Date,"myyntitilaus, päivä"
@@ -2721,6 +2752,7 @@
 ,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 +50,Missing Currency Exchange Rates for {0},valuuttakurssi puuttuu {0}
 DocType: Assessment,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
@@ -2738,11 +2770,12 @@
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Aihe Name
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Ainakin yksi tai myyminen ostaminen on valittava
+DocType: Grading Structure,Grade Intervals,Grade intervallit
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Valitse liiketoiminnan luonteesta.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,missä valmistus tapahtuu
 DocType: Asset Movement,Source Warehouse,lähde varasto
 DocType: Installation Note,Installation Date,asennuspäivä
-apps/erpnext/erpnext/controllers/accounts_controller.py +534,Row #{0}: Asset {1} does not belong to company {2},Rivi # {0}: Asset {1} ei kuulu yhtiön {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +537,Row #{0}: Asset {1} does not belong to company {2},Rivi # {0}: Asset {1} ei kuulu yhtiön {2}
 DocType: Employee,Confirmation Date,vahvistuspäivä
 DocType: C-Form,Total Invoiced Amount,kokonaislaskutus arvomäärä
 DocType: Account,Sales User,myynnin käyttäjä
@@ -2756,28 +2789,31 @@
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Saatavilla Erä Kpl osoitteessa varastosta
 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,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 +111,Date Of Retirement must be greater than Date of Joining,eläkkepäivän on oltava suurempi kuin liittymispäivä
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +49,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 +87,{0}% Delivered,{0}% toimitettu
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% toimitettu
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,tuote {0}: tilattu yksikkömäärä {1} ei voi olla pienempi kuin pienin tilaus yksikkömäärä {2} (määritellylle tuotteelle)
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,"toimitus kuukaudessa, prosenttiosuus"
 DocType: Territory,Territory Targets,aluetavoite
 DocType: Delivery Note,Transporter Info,kuljetuksen info
-apps/erpnext/erpnext/accounts/utils.py +379,Please set default {0} in Company {1},Aseta oletus {0} in Company {1}
+apps/erpnext/erpnext/accounts/utils.py +456,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
 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.,kirjeen ylätunniste mallipohjan tulostukseen
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"tuolostus, mallipohjan otsikot esim, proformalaskuun"
+DocType: Student Guardian,Student Guardian,Student Guardian
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +184,Valuation type charges can not marked as Inclusive,arvotyypin maksuja ei voi sisällyttää
 DocType: POS Profile,Update Stock,päivitä varasto
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"tuotteiden eri UOM johtaa virheellisiin (kokonais) painoarvon, varmista, että tuotteiden nettopainot on samassa UOM:ssa"
 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 +349,Journal Entries {0} are un-linked,päiväkirjakirjauksia {0} ei ole kohdistettu
+apps/erpnext/erpnext/accounts/utils.py +426,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.","Kirjaa kaikista viestinnän tyypin sähköposti, puhelin, chatti, käynti, 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
@@ -2801,6 +2837,7 @@
 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
+DocType: Homepage,"URL for ""All Products""",URL &quot;Kaikki tuotteet&quot;
 DocType: Leave Application,Leave Balance Before Application,poistu taseesta ennen sovellusta
 DocType: SMS Center,Send SMS,lähetä tekstiviesti
 DocType: Cheque Print Template,Width of amount in word,Leveys määrän sanassa
@@ -2809,7 +2846,7 @@
 DocType: Item,Standard Selling Rate,Standard Myynnin Hinta
 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,uudellentilattu yksikkömäärä
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +29,Current Job Openings,Avoimet työpaikat
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,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
@@ -2822,7 +2859,7 @@
 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 +850,Show tax break-up,Näytä vero hajottua
+apps/erpnext/erpnext/public/js/controllers/transaction.js +841,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/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ä"
@@ -2832,10 +2869,11 @@
 DocType: Sales Invoice,Rounded Total,pyöristys yhteensä
 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 +534,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 +80,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 +162,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/selling/doctype/customer/customer.py +195,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 +5,This is based on the attendance of this Student,Tämä perustuu läsnäolo tämän Student
@@ -2844,12 +2882,11 @@
 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 +75,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 +138,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/hr/doctype/leave_application/leave_application.py +145,Note: There is not enough leave balance for Leave Type {0},"huom, jäännöstyypille {0} ei ole tarpeeksi vapaata jäännöstasetta"
 DocType: Program Enrollment Fee,Program Enrollment Fee,Ohjelma Ilmoittautuminen Fee
 DocType: Item,Supplier Items,toimittajan tuotteet
 DocType: Opportunity,Opportunity Type,tilaisuus tyyppi
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,Uusi yritys
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,Cost Center is required for 'Profit and Loss' account {0},"kustannuspaikka tarvitsee ""tuloslaskelma"" tilin {0}"
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,vain järjestelmän perustaja voi poistaa tapahtumia
 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.,"löytyi virheellinen määrä päätilikirjan kirjauksia, olet ehkä valinnut väärän tilin tapahtumaan"
 DocType: Cheque Print Template,Cheque Width,Shekki Leveys
@@ -2858,16 +2895,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,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/manufacturing/doctype/production_order/production_order.js +128,Timesheet,Kellokortti
-apps/erpnext/erpnext/controllers/accounts_controller.py +228,{0} '{1}' is disabled,{0} '{1}' on poistettu käytöstä
+apps/erpnext/erpnext/controllers/accounts_controller.py +231,{0} '{1}' is disabled,{0} '{1}' on poistettu käytöstä
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,aseta avoimeksi
 DocType: Cheque Print Template,Scanned Cheque,skannatut Shekki
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,"lähetä sähköpostia automaattisesti yhteyshenkilöille kun tapahtuman ""lähetys"" tehdään"
+DocType: Timesheet,Total Billable Amount,Yhteensä Billable Määrä
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,tuote 3
 DocType: Purchase Order,Customer Contact Email,Asiakas Sähköpostiosoite
 DocType: Warranty Claim,Item and Warranty Details,Kohta ja takuu Tietoja
 DocType: Sales Team,Contribution (%),panostus (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,huom: maksukirjausta ei synny sillä 'kassa- tai pankkitiliä' ei ole määritetty
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Responsibilities,Vastuut
+apps/erpnext/erpnext/controllers/accounts_controller.py +78,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
 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
@@ -2875,6 +2913,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Lisää käyttäjiä
 DocType: Pricing Rule,Item Group,tuoteryhmä
 DocType: Item,Safety Stock,turvallisuus Stock
+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: Stock Reconciliation Item,Before reconciliation,ennen täsmäytystä
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},(lle) {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),verot ja maksut lisätty (yrityksen valuutta)
@@ -2884,7 +2923,6 @@
 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: Timesheet,Total Hours,tunnit yhteensä
 DocType: Journal Entry,Printing Settings,Asetusten tulostaminen
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,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
@@ -2897,13 +2935,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,sijoitukset pankki
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +71,Cash or Bank Account is mandatory for making payment entry,kassa tai pankkitili vaaditaan maksujen kirjaukseen
 DocType: Purchase Invoice,Price List Exchange Rate,hinnasto vaihtotaso
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Asiakas&gt; Asiakaspalvelu Group&gt; Territory
 DocType: Purchase Invoice Item,Rate,taso
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Intern,harjoitella
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,harjoitella
 DocType: Stock Entry,From BOM,BOM:sta
 DocType: Assessment,Assessment Code,arviointi koodi
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +32,Basic,perustiedot
+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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"klikkaa ""muodosta aikataulu"""
+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 +95,Reference No is mandatory if you entered Reference Date,viitenumero vaaditaan mykäli viitepäivä on annettu
@@ -2912,11 +2951,11 @@
 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 +752,Issue Material,materiaali aihe
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +723,Issue Material,materiaali aihe
 DocType: Material Request Item,For Warehouse,varastoon
 DocType: Employee,Offer Date,Ehdota päivää
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Lainaukset
-apps/erpnext/erpnext/accounts/page/pos/pos.js +683,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 +665,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.
 DocType: Hub Settings,Access Token,Access Token
 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
@@ -2924,33 +2963,35 @@
 DocType: Purchase Invoice,Print Language,Tulosta Kieli
 DocType: Salary Slip,Total Working Hours,Kokonaistyöajasta
 DocType: Stock Entry,Including items for sub assemblies,mukaanlukien alikokoonpanon tuotteet
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1122,Enter value must be positive,Anna-arvon on oltava positiivinen
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,All Territories,Kaikki alueet
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1125,Enter value must be positive,Anna-arvon on oltava positiivinen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,Kaikki alueet
 DocType: Purchase Invoice,Items,tuotteet
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +23,Student is already enrolled.,Opiskelijan on jo ilmoittautunut.
 DocType: Fiscal Year,Year Name,Vuoden nimi
 DocType: Process Payroll,Process Payroll,Process Palkanlaskenta
-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ä
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +233,There are more holidays than working days this month.,tässä kuussa ei ole lomapäiviä työpäivinä
 DocType: Product Bundle Item,Product Bundle Item,tavarakokonaisuus tuote
 DocType: Sales Partner,Sales Partner Name,myyntikumppani nimi
-apps/erpnext/erpnext/hooks.py +96,Request for Quotations,Pyyntö Lainaukset
+apps/erpnext/erpnext/hooks.py +104,Request for Quotations,Pyyntö Lainaukset
 DocType: Payment Reconciliation,Maximum Invoice Amount,Suurin Laskun summa
 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 +628,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Oletus mittayksikkö Variant &quot;{0}&quot; on oltava sama kuin malli &quot;{1}&quot;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Oletus mittayksikkö Variant &quot;{0}&quot; on oltava sama kuin malli &quot;{1}&quot;
 DocType: Shipping Rule,Calculate Based On,"laske, perusteet"
 DocType: Delivery Note Item,From Warehouse,Varastosta
 DocType: Assessment,Supervisor Name,ohjaaja Name
+DocType: Assessment,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ä
 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 +27,Default Address Template cannot be deleted,"oletus osoite, mallipohjaa ei voi poistaa"
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,"oletus osoite, mallipohjaa ei voi poistaa"
 DocType: Sales Invoice,Shipping Rule,toimitus sääntö
 DocType: Manufacturer,Limited to 12 characters,Rajattu 12 merkkiä
 DocType: Journal Entry,Print Heading,Tulosta Otsikko
@@ -2965,8 +3006,8 @@
 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/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 +485,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 +336,Please select Posting Date first,Valitse julkaisupäivä ensimmäinen
+apps/erpnext/erpnext/stock/get_item_details.py +486,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 +326,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
@@ -2982,6 +3023,7 @@
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Match Maksut Laskut
 DocType: Journal Entry,Bank Entry,pankkikirjaus
 DocType: Authorization Rule,Applicable To (Designation),sovellettavissa (nimi)
+,Profitability Analysis,Kannattavuusanalyysi
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,Lisää koriin
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,ryhmän
 DocType: Guardian,Interests,etu
@@ -2994,21 +3036,21 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Present,esillä 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 +141,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",sarjanumerollista tuottetta {0} ei voi päivittää varaston täsmäytyksellä
 DocType: Scheduling Tool,Day,Päivä
 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 +122,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 +129,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
-DocType: Student Applicant,AP.,AP.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,Tuntematon
 DocType: Shipping Rule,Shipping Rule Conditions,toimitus sääntö ehdot
 DocType: BOM Replace Tool,The new BOM after replacement,uusi BOM korvauksen jälkeen
-apps/erpnext/erpnext/accounts/page/pos/pos.js +639,Point of Sale,Point of Sale
+apps/erpnext/erpnext/accounts/page/pos/pos.js +634,Point of Sale,Point of Sale
 DocType: Payment Entry,Received Amount,Vastaanotetut Määrä
+DocType: Payment Entry,Party Name,Party Name
 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
 DocType: Production Planning Tool,Production Planning Tool,Tuotannon suunnittelu Tool
@@ -3017,74 +3059,77 @@
 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 +373,Quantity to Manufacture must be greater than 0.,Määrä Valmistus on oltava suurempi kuin 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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 Profile,Customer Group,asiakasryhmä
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,Expense account is mandatory for item {0},kulutili on vaaditaan tuotteelle {0}
 DocType: Item,Website Description,verkkosivujen kuvaus
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date must be on or after today,Seuraava Poistot Date on oltava tai sen jälkeen tänään
 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 +145,Please cancel Purchase Invoice {0} first,Peruuta Ostolasku {0} ensimmäinen
 DocType: Serial No,AMC Expiry Date,AMC Viimeinen käyttöpäivä
 ,Sales Register,myyntirekisteri
 DocType: Quotation,Quotation Lost Reason,"tarjous hävitty, syy"
+apps/erpnext/erpnext/utilities/doctype/address/address.py +164,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.
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,Valitse Domain
 DocType: Address,Plant,Kasvi
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +330,Transaction reference no {0} dated {1},Transaction viitenumero {0} päivätyn {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,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 +107,Summary for this month and pending activities,Yhteenveto tässä kuussa ja keskeneräisten toimien
+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/accounts/doctype/sales_invoice/sales_invoice.py +406,Please remove this Invoice {0} from C-Form {1},poista lasku {0} C-kaaviosta {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,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 +644,Get Items,hae tuotteet
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +623,Get Items,hae tuotteet
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +210,Please enter Write Off Account,syötä poistotili
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Last Order Päivämäärä
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +41,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ä
 DocType: Payment Request,Initiated,Aloitettu
 DocType: Production Order,Planned Start Date,Suunnitellut aloituspäivä
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,Customer is required against Receivable account {0},Asiakas tarvitaan vastaan Receivable tili {0}
 DocType: Serial No,Creation Document Type,asiakirjantyypin luonti
 DocType: Leave Type,Is Encash,on perintä
 DocType: Purchase Invoice,Mobile No,Mobile No
 DocType: Leave Allocation,New Leaves Allocated,uusi poistumisten kohdennus
-apps/erpnext/erpnext/controllers/trends.py +265,Project-wise data is not available for Quotation,"projekti työkalu, tietoja ei ole saatavilla tarjousvaiheessa"
+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,"arviointi, mallipohja otsikko"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,Commercial,kaupallinen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,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,Parent Kohta {0} ei saa olla Kanta Tuote
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,kaikki tavarat tai palvelut
 DocType: Supplier Quotation,Supplier Address,toimittajan osoite
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +648,Row {0}# Account must be of type 'Fixed Asset',Rivi {0} # Account täytyy olla tyyppiä &quot;Käyttöomaisuuden&quot;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,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 +30,Series is mandatory,sarjat ovat pakollisia
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +50,Series is mandatory,sarjat ovat pakollisia
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,talouspalvelu
 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
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +165,Warehouse required for stock Item {0},varastolta vaaditaan varastotuotteelle {0}
 DocType: Leave Allocation,Unused leaves,Käyttämättömät lehdet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Cr,Cr
 DocType: Tax Rule,Billing State,Laskutus valtion
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +250,Transfer,siirto
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +187,{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 +825,Fetch exploded BOM (including sub-assemblies),nouda BOM räjäytys (mukaan lukien alikokoonpanot)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +254,Transfer,siirto
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +190,{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 +796,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 +115,Due Date is mandatory,eräpäivä vaaditaan
+apps/erpnext/erpnext/controllers/accounts_controller.py +118,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
 DocType: Journal Entry,Pay To / Recd From,Pay To / RECD Mistä
 DocType: Naming Series,Setup Series,sarjojen määritys
 DocType: Payment Reconciliation,To Invoice Date,Laskun päivämäärä
 DocType: Supplier,Contact HTML,"yhteystiedot, HTML"
 ,Inactive Customers,Ei-aktiiviset asiakkaat
+DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Osto Kuitit
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,miten hinnoittelu sääntöä käytetään
 DocType: Quality Inspection,Delivery Note No,lähetteen numero
@@ -3093,7 +3138,7 @@
 DocType: Company,Retail,Vähittäiskauppa
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +120,Customer {0} does not exist,asiakasta {0} ei ole olemassa
 DocType: Attendance,Absent,puuttua
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +587,Product Bundle,tavarakokonaisuus
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Product Bundle,tavarakokonaisuus
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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
@@ -3103,8 +3148,8 @@
 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 +742,Send Supplier Emails,Lähetä toimittaja Sähköpostit
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +104,"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/buying/doctype/request_for_quotation/request_for_quotation.js +708,Send Supplier Emails,Lähetä toimittaja Sähköpostit
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,"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
 DocType: Guardian Interest,Guardian Interest,Guardian Interest
 DocType: Timesheet,Employee Detail,työntekijän Detail
@@ -3115,9 +3160,9 @@
 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}
 DocType: Salary Slip,Earning & Deduction,ansio & vähennys
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +77,Account {0} cannot be a Group,tili {0} ei voi ryhmä
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} cannot be a Group,tili {0} ei voi ryhmä
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +31,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 +107,Negative Valuation Rate is not allowed,negatiivinen arvotaso ei ole sallittu
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,negatiivinen arvotaso ei ole sallittu
 DocType: Holiday List,Weekly Off,viikottain pois
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","esim 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +39,Provisional Profit / Loss (Credit),voitto/tappio ote (kredit)
@@ -3131,16 +3176,16 @@
 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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: kustannuspaikka on pakollinen tuotteelle {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +626,Get Items from Product Bundle,Saamaan kohteita Product Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +605,Get Items from Product Bundle,Saamaan kohteita Product Bundle
 DocType: Asset,Straight Line,Suora viiva
 DocType: Project User,Project User,Project Käyttäjä
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} is inactive,tili {0} ei ole aktiivinen
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} is inactive,tili {0} ei ole aktiivinen
 DocType: GL Entry,Is Advance,on ennakko
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,"osallistuminen päivästä, osallistuminen päivään To vaaditaan"
 apps/erpnext/erpnext/controllers/buying_controller.py +148,Please enter 'Is Subcontracted' as Yes or No,"syötä ""on alihankittu"" (kyllä tai ei)"
 DocType: Sales Team,Contact No.,yhteystiedot nro
 DocType: Bank Reconciliation,Payment Entries,maksu merkinnät
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,'Profit and Loss' type account {0} not allowed in Opening Entry,'Tuloslaskelma' tili {0} ei ole sallittu avauskirjauksessa
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +71,'Profit and Loss' type account {0} not allowed in Opening Entry,'Tuloslaskelma' tili {0} ei ole sallittu avauskirjauksessa
 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
@@ -3159,7 +3204,7 @@
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,sarja #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Commission on Sales,provisio myynti
 DocType: Offer Letter Term,Value / Description,arvo / kuvaus
-apps/erpnext/erpnext/controllers/accounts_controller.py +558,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Rivi # {0}: Asset {1} ei voida antaa, se on jo {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +561,"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: Production Order,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}
@@ -3172,13 +3217,13 @@
 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/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Legal Expenses,juridiset kulut
 DocType: Purchase Invoice,Posting Time,Kirjoittamisen aika
-DocType: Sales Order,% Amount Billed,% laskutettu arvomäärä
+DocType: Timesheet,% Amount Billed,% laskutettu arvomäärä
 DocType: Production Order,Warehouse for reserving items,Varasto varaamiseksi kohdetta
 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"
 apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},Ei Kohta Serial Ei {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Avaa Ilmoitukset
+DocType: Email Digest,Open Notifications,Avaa Ilmoitukset
 DocType: Payment Entry,Difference Amount (Company Currency),Ero Summa (Company valuutta)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,suorat kulut
 apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
@@ -3186,7 +3231,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Uusi asiakas Liikevaihto
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,matkakulut
 DocType: Maintenance Visit,Breakdown,hajoitus
-apps/erpnext/erpnext/controllers/accounts_controller.py +634,Account: {0} with currency: {1} can not be selected,Tili: {0} kanssa valuutta: {1} ei voi valita
+apps/erpnext/erpnext/controllers/accounts_controller.py +637,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}
 DocType: Program Enrollment Tool,Student Applicants,Student Hakijat
@@ -3194,15 +3239,15 @@
 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 +56,Probation,Koeaika
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Probation,Koeaika
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Palkka Components
 DocType: Program Enrollment Tool,New Academic Year,Uusi Lukuvuosi
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Payment of salary for the month {0} and year {1},palkanmaksu kuukausi {0} vuosi {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Payment of salary for the month {0} and year {1},palkanmaksu kuukausi {0} vuosi {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,"Automaattinen käynnistys Hinnasto korolla, jos puuttuu"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,maksettu arvomäärä yhteensä
 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 +144,Planning,Suunnittelu
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,Suunnittelu
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,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
@@ -3215,11 +3260,10 @@
 DocType: Sales Partner,Contact Desc,"yhteystiedot, kuvailu"
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","poistumissyy, kuten vapaa, sairas jne"
 DocType: Email Digest,Send regular summary reports via Email.,lähetä yhteenvetoraportteja säännöllisesti sähköpostitse
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Sales invoice submitted sucessfully.,Myynnin lasku toimitettu onnistuneesti.
 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}
 DocType: Assessment Result,Student Name,Opiskelijan nimi
-apps/erpnext/erpnext/hooks.py +104,Assessment Schedule,arviointi aikataulu
+apps/erpnext/erpnext/hooks.py +113,Assessment Schedule,arviointi aikataulu
 DocType: Brand,Item Manager,tuotehallinta
 DocType: Buying Settings,Default Supplier Type,oletus toimittajatyyppi
 DocType: Production Order,Total Operating Cost,käyttökustannukset yhteensä
@@ -3229,6 +3273,7 @@
 DocType: GL Entry,Party Type,osapuoli tyyppi
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +78,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
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,palkka mallipohja valvonta
 DocType: Leave Type,Max Days Leave Allowed,maksimi poistumispäivät sallittu
@@ -3240,18 +3285,19 @@
 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 +99,All Customer Groups,kaikki asiakasryhmät
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +78,Accumulated Monthly,kertyneet Kuukauden
-apps/erpnext/erpnext/controllers/accounts_controller.py +595,{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/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,kaikki asiakasryhmät
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +81,Accumulated Monthly,kertyneet Kuukauden
+apps/erpnext/erpnext/controllers/accounts_controller.py +598,{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
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),"hinnasto, taso (yrityksen valuutta)"
 DocType: Products Settings,Products Settings,tuotteet Asetukset
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +188,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
 DocType: Account,Temporary,väliaikainen
 DocType: Address,Preferred Billing Address,suositeltu laskutusosoite
 DocType: Program,Courses,Kurssit
 DocType: Monthly Distribution Percentage,Percentage Allocation,Prosentti Allocation
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Secretary,sihteeri
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,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
@@ -3260,24 +3306,22 @@
 ,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
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,Rivi # {0}: Sarjanumero on pakollinen
+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,"tuote työkalu, hinnasto taso"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +859,Supplier Quotation,toimittajan tarjouskysely
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +838,Supplier Quotation,toimittajan tarjouskysely
 DocType: Quotation,In Words will be visible once you save the Quotation.,"sanat näkyvät, kun tallennat tarjouksen"
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +7,Collect Fees,Kerää maksut
+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}
 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
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Tulevat tapahtumat
 DocType: Item,Opening Stock,avaaminen Stock
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,asiakasta velvoitetaan
 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
-DocType: Email Digest,Income / Expense,tuotot / kulut
 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 aktiivinen, järjestelmä lähettää kirjanpidon kirjaukset automaattisesti"
@@ -3288,13 +3332,14 @@
 DocType: Customer,From Lead,vihjeestä
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,tuotantoon luovutetut tilaukset
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,valitse tilikausi ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,POS Profile required to make POS Entry,POS profiili vaatii POS kirjauksen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +509,POS Profile required to make POS Entry,POS profiili vaatii POS kirjauksen
 DocType: Program Enrollment Tool,Enroll Students,Ilmoittaudu Opiskelijat
 DocType: Hub Settings,Name Token,Name Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,perusmyynti
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Atleast one warehouse is mandatory,Ainakin yksi varasto on pakollinen
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +129,Atleast one warehouse is mandatory,Ainakin yksi varasto on pakollinen
 DocType: Serial No,Out of Warranty,Out of Takuu
 DocType: BOM Replace Tool,Replace,Korvata
+DocType: Production Order,Unstopped,aukenevat
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Invoice {1},{0} myyntilaskua vastaan {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Hankkeen nimi
@@ -3315,10 +3360,11 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"poistumiset tulee kohdentaa luvun 0,5 kerrannaisina"
 DocType: Production Order,Operation Cost,toiminnan kustannus
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,lataa osallistumislomake .csv-tiedostoon
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,"odottaa, pankkipääte"
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,"tuoteryhmä työkalu, aseta tavoitteet tälle myyjälle"
 DocType: Stock Settings,Freeze Stocks Older Than [Days],jäädytä yli [päivää] vanhat varastot
-apps/erpnext/erpnext/controllers/accounts_controller.py +528,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Rivi # {0}: Asset on pakollinen käyttöomaisuushankintoihin osto / myynti
+apps/erpnext/erpnext/controllers/accounts_controller.py +531,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Rivi # {0}: Asset on pakollinen käyttöomaisuushankintoihin osto / myynti
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","yllämainituilla ehdoilla löytyy kaksi tai useampia hinnoittelusääntöjä ja prioriteettia tarvitaan, prioriteettinumero luku 0-20:n välillä, oletusarvona se on nolla (tyhjä), mitä korkeampi luku sitä suurempi prioriteetti"
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,tilikautta: {0} ei ole olemassa
 DocType: Currency Exchange,To Currency,valuuttakursseihin
@@ -3335,15 +3381,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,asiakaspalaute
 DocType: Account,Expense,kulu
-DocType: Sales Invoice,Exhibition,näyttely
 apps/erpnext/erpnext/utilities/doctype/address/address.py +77,"Company is mandatory, as it is your company address","Yhtiö on pakollista, koska se on yrityksen osoite"
 DocType: Item Attribute,From Range,Alkaen Range
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +81,Syntax error in formula or condition: {0},Syntaksivirhe kaavassa tai tila: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +92,Syntax error in formula or condition: {0},Syntaksivirhe kaavassa tai tila: {0}
 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
+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,domain
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Jobs,Työpaikat
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,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
@@ -3352,16 +3398,16 @@
 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 +763,Make Supplier Quotation,tee toimittajan tarjouskysely
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,Make Supplier Quotation,tee toimittajan tarjouskysely
 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/controllers/sales_and_purchase_return.py +100,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 +42,Casual Leave,tavallinen poistuminen
+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
 DocType: Batch,Batch ID,erän tunnus
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,Note: {0},Huomautus: {0}
 ,Delivery Note Trends,lähete trendit
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +103,This Week's Summary,Viikon yhteenveto
+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
 DocType: Student Group Creation Tool,Get Courses,Get Kurssit
 DocType: GL Entry,Party,Puolue
@@ -3371,7 +3417,7 @@
 DocType: Request for Quotation Item,Request for Quotation Item,Tarjouspyyntö Tuote
 DocType: Purchase Order,To Bill,laskutukseen
 DocType: Material Request,% Ordered,% Järjestetty
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Piecework,Urakkatyö
+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 ostamisen taso
 DocType: Task,Actual Time (in Hours),todellinen aika (tunneissa)
 DocType: Employee,History In Company,yrityksen historia
@@ -3388,7 +3434,7 @@
 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.
 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 +162,Black,musta
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Black,musta
 DocType: BOM Explosion Item,BOM Explosion Item,BOM tuotteen räjäytys
 DocType: Account,Auditor,Tilintarkastaja
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +56,{0} items produced,{0} kohdetta tuotettu
@@ -3399,13 +3445,13 @@
 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 +69,Customer Id,asiakastunnus
+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
 DocType: Journal Entry Account,Exchange Rate,valuutta taso
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Sales Order {0} is not submitted,myyntitilausta {0} ei ole lähetetty
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +527,Sales Order {0} is not submitted,myyntitilausta {0} ei ole lähetetty
 DocType: Homepage,Tag Line,Tag Line
 DocType: Fee Component,Fee Component,Fee Component
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +857,Add items from,Lisää kohteita
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +836,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}
 DocType: Cheque Print Template,Regular,säännöllinen
 DocType: BOM,Last Purchase Rate,viimeisin ostotaso
@@ -3413,6 +3459,7 @@
 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
 ,Sales Person-wise Transaction Summary,"myyjän työkalu,  tapahtuma yhteenveto"
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +60,Cost Center is required for 'Profit and Loss' account {0}. Please set up a default Cost Center for the Company.,Kustannukset keskus tarvitaan &quot;Tuloslaskelma&quot; tili {0}. Määritä oletuksena kustannukset Center for the Company.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,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"
@@ -3423,12 +3470,12 @@
 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 +710,Online,Online
+apps/erpnext/erpnext/accounts/page/pos/pos.js +692,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 +16,Setting this Address Template as default as there is no other default,"tämä osoite mallipohjaa on asetettu oletukseksi, sillä muuta pohjaa ei ole valittu"
+apps/erpnext/erpnext/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"
 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 +74,Quality Management,määrähallinta
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,määrähallinta
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} has been disabled,Kohta {0} on poistettu käytöstä
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Kirjoita kpl määrä Tuote {0}
 DocType: Employee External Work History,Employee External Work History,työntekijän muu työkokemus
@@ -3450,11 +3497,12 @@
 DocType: Student,Student Email ID,Opiskelijan Sähköposti ID
 DocType: Employee,Notice (days),Ilmoitus (päivää)
 DocType: Tax Rule,Sales Tax Template,Sales Tax Malline
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1520,Select items to save the invoice,Valitse kohteita tallentaa laskun
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1544,Select items to save the invoice,Valitse kohteita tallentaa laskun
 DocType: Employee,Encashment Date,perintä päivä
 DocType: Account,Stock Adjustment,varastonsäätö
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},oletus aktiviteettikustannus aktiviteetin tyypille - {0}
 DocType: Production Order,Planned Operating Cost,suunnitellut käyttökustannukset
+DocType: Academic Term,Term Start Date,Term aloituspäivä
 apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},Ohessa {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Tiliote tasapaino kohti Pääkirja
 DocType: Job Applicant,Applicant Name,hakijan nimi
@@ -3485,17 +3533,17 @@
 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, sillä kohdistettuja varaston tilikirjan kirjauksia on olemassa."
 DocType: Company,Distribution,toimitus
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +8,Amount Paid,maksettu arvomäärä
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Project Manager,projektihallinta
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,maksettu arvomäärä
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,projektihallinta
 ,Quoted Item Comparison,Noteeratut Kohta Vertailu
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Dispatch,lähetys
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,lähetys
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max alennus sallittua item: {0} on {1}%
 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
-DocType: Sales Invoice,Supplier Reference,toimittajan viite
-apps/erpnext/erpnext/accounts/page/pos/pos.js +844,"Master data syncing, it might take some time","Master data synkronointia, se saattaa kestää jonkin aikaa"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +832,"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
@@ -3509,7 +3557,7 @@
 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 +83,Error in formula or condition,Virhe kaava tai kunnossa
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,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
@@ -3518,7 +3566,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},"päivä tulee olla tällä tilikaudella, oletettu lopetuspäivä = {0}"
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","tässä voit ylläpitää terveystietoja, pituus, paino, allergiat, lääkkeet jne"
 DocType: Leave Block List,Applies to Company,koskee yritystä
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +197,Cannot cancel because submitted Stock Entry {0} exists,"ei voi peruuttaa, sillä lähetetty varaston tosite {0} on jo olemassa"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +198,Cannot cancel because submitted Stock Entry {0} exists,"ei voi peruuttaa, sillä lähetetty varaston tosite {0} on jo olemassa"
 DocType: Purchase Invoice,In Words,sanat
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,Today is {0}'s birthday!,tänään on {0}:n syntymäpäivä
 DocType: Production Planning Tool,Material Request For Warehouse,varaston materiaalipyyntö
@@ -3528,14 +3576,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,Tilikautesi alkaa
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Asset Poistot ja saldot
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +319,Amount {0} {1} transferred from {2} to {3},Määrä {0} {1} siirretty {2} ja {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +322,Amount {0} {1} transferred from {2} to {3},Määrä {0} {1} siirretty {2} ja {3}
 DocType: Sales Invoice,Get Advances Received,hae saadut ennakot
 DocType: Email Digest,Add/Remove Recipients,lisää / poista vastaanottajia
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +432,Transaction not allowed against stopped Production Order {0},tapahtumat tuotannon tilaukseen {0} on estetty
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +437,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 +143,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 +652,Item variant {0} exists with same attributes,Tuote variantti {0} ovat olemassa samoja ominaisuuksia
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Tuote variantti {0} ovat olemassa samoja ominaisuuksia
+DocType: Leave Application,LAP/,LAP /
 DocType: Salary Slip,Salary Slip,palkkalaskelma
 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
@@ -3543,12 +3592,12 @@
 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 +212,Warehouses with child nodes cannot be converted to ledger,Varasto lapsen solmuja ei voida muuntaa Ledger
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +215,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.","täpättäessä sähköposti-ikkuna avautuu välittömästi kun tapahtuma ""lähetetty"", oletus vastaanottajana on tapahtuman ""yhteyshenkilö"" ja tapahtuma liitteenä, voit valita lähetätkö tapahtuman sähköpostilla"
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,yleiset asetukset
 DocType: Employee Education,Employee Education,työntekijä koulutus
-apps/erpnext/erpnext/public/js/controllers/transaction.js +866,It is needed to fetch Item Details.,Sitä tarvitaan hakemaan Osa Tiedot.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +857,It is needed to fetch Item Details.,Sitä tarvitaan hakemaan Osa Tiedot.
 DocType: Salary Slip,Net Pay,Net Pay
 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
@@ -3558,14 +3607,14 @@
 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 +178,Invalid {0},Virheellinen {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Sick Leave,sairaspoistuminen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,Sick Leave,sairaspoistuminen
 DocType: Email Digest,Email Digest,sähköpostitiedote
 DocType: Delivery Note,Billing Address Name,laskutusosoite nimi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,osasto kaupat
 DocType: Warehouse,PIN,PIN
 DocType: Sales Invoice,Base Change Amount (Company Currency),Base Muuta Summa (Company valuutta)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +313,No accounting entries for the following warehouses,ei kirjanpidon kirjauksia seuraaviin varastoihin
-apps/erpnext/erpnext/projects/doctype/project/project.js +102,Save the document first.,tallenna ensimmäinen asiakirja
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +314,No accounting entries for the following warehouses,ei kirjanpidon kirjauksia seuraaviin varastoihin
+apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,tallenna ensimmäinen asiakirja
 DocType: Account,Chargeable,veloitettava
 DocType: Company,Change Abbreviation,muutos lyhennys
 DocType: Expense Claim Detail,Expense Date,"kulu, päivä"
@@ -3578,10 +3627,9 @@
 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ää
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,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
 DocType: Appraisal,Appraisal Template,"arviointi, mallipohja"
 DocType: Item Group,Item Classification,tuote luokittelu
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Business Development Manager,myynninkehityshallinta
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Business Development Manager,myynninkehityshallinta
 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
@@ -3591,8 +3639,8 @@
 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,"tuote työkalu, uuden ostotilauksen suositusarvo"
 DocType: Salary Detail,Salary Detail,Palkka Detail
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +940,Please select {0} first,Ole hyvä ja valitse {0} Ensimmäinen
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +749,Batch {0} of Item {1} has expired.,erä {0} tuotteesta {1} on vanhentunut
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +953,Please select {0} first,Ole hyvä ja valitse {0} Ensimmäinen
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +757,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.,Kellokortti valmistukseen.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,Välisumma
@@ -3609,8 +3657,8 @@
 {% 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 +92,Warehouse not found in the system,varastoa ei löydy järjestelmästä
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +106,This Month's Summary,Tämän kuun Yhteenveto
+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
 DocType: Quality Inspection Reading,Quality Inspection Reading,laarutarkistuksen luku
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,Jäädytä varasto joka on vanhempi kuin % päivää
 DocType: Tax Rule,Purchase Tax Template,Myyntiverovelkojen malli
@@ -3620,21 +3668,22 @@
 DocType: Item Customer Detail,Ref Code,Ref Koodi
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,työntekijä tietue
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Please set Next Depreciation Date,Määritä Seuraava Poistot Date
-DocType: Payment Gateway,Payment Gateway,Payment Gateway
 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 +378,Operation Time must be greater than 0 for Operation {0},Toiminta-aika on oltava suurempi kuin 0 Toiminta {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +380,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
 DocType: Supplier,Address and Contacts,Osoite ja yhteystiedot
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM muunto 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)
 DocType: Program,Program Abbreviation,ohjelma lyhenne
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,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: Appraisal,Start Date,aloituspäivä
@@ -3650,21 +3699,22 @@
 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
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,"esim, smsgateway.com/api/send_sms.cgi"
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +27,Transaction currency must be same as Payment Gateway currency,Maksuvälineenä on oltava sama kuin Payment Gateway valuutta
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Transaction currency must be same as Payment Gateway currency,Maksuvälineenä on oltava sama kuin Payment Gateway valuutta
 DocType: Payment Entry,Receive,Vastaanottaa
+apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,lainaukset:
 DocType: Maintenance Visit,Fully Completed,täysin valmis
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% valmis
 DocType: Employee,Educational Qualification,koulutusksen arviointi
 DocType: Workstation,Operating Costs,käyttökustannukset
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Toiminta jos kuukausikulutus budjetti ylitetty
 DocType: Purchase Invoice,Submit on creation,Jättää ehdotus luomiseen
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +432,Currency for {0} must be {1},Valuutta {0} on {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +435,Currency for {0} must be {1},Valuutta {0} on {1}
 DocType: Asset,Disposal Date,hävittäminen Date
 DocType: Employee Leave Approver,Employee Leave Approver,työntekijän poistumis hyväksyjä
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row {0}: An Reorder entry already exists for this warehouse {1},rivi {0}: uusi tilaus on jo kirjattu tähän varastoon {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +495,Row {0}: An Reorder entry already exists for this warehouse {1},rivi {0}: uusi tilaus on jo kirjattu tähän varastoon {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +79,"Cannot declare as lost, because Quotation has been made.","ei voida vahvistaa hävityksi, sillä tarjous on tehty"
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,"ostojenhallinta, valvonta"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +429,Production Order {0} must be submitted,tuotannon tilaus {0} on lähetettävä
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +434,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ää
@@ -3674,25 +3724,27 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,kustannuspaikkakaavio
 ,Requested Items To Be Ordered,tilattavat pyydetyt tuotteet
 DocType: Price List,Price List Name,Hinnasto Name
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +181,Totals,summat
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,summat
 DocType: BOM,Manufacturing,Valmistus
 ,Ordered Items To Be Delivered,toimitettavat tilatut tuotteet
 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 +113,Warning: Leave application contains following block dates,varoitus: poistumissovellus sisältää seuraavat estopäivät
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +120,Warning: Leave application contains following block dates,varoitus: poistumissovellus sisältää seuraavat estopäivät
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Sales Invoice {0} has already been submitted,myyntilasku {0} on lähetetty
 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),arvomäärä (yrityksen valuutta)
 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.
+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 +181,Organization unit (department) master.,"organisaatioyksikkö, osasto valvonta"
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Anna kelvolliset mobiili nos
 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 +793,All records are synced.,Kaikki tiedot synkronoidaan.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +781,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
 DocType: Cost Center,Cost Center Name,kustannuspaikan nimi
@@ -3711,21 +3763,20 @@
 DocType: Address,Name of person or organization that this address belongs to.,henkilön- tai organisaation nimi kenelle tämä osoite kuuluu
 apps/erpnext/erpnext/public/js/setup_wizard.js +260,Your Suppliers,omat toimittajat
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +49,Cannot set as Lost as Sales Order is made.,ei voi asettaa hävityksi sillä myyntitilaus on tehty
-DocType: Student Applicant,Mother's Name,Äidin nimi
 DocType: Request for Quotation Item,Supplier Part No,Toimittaja osanumero
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +348,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Ei voi vähentää, kun kategoria on &quot;arvostus&quot; tai &quot;Vaulation ja Total&quot;"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Received From,Saadut
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Received From,Saadut
 DocType: Lead,Converted,muunnettu
 DocType: Item,Has Serial No,on sarjanumero
 DocType: Employee,Date of Issue,aiheen päivä
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{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 +93,Row {0}: Hours value must be greater than zero.,Rivi {0}: Tuntia arvon on oltava suurempi kuin nolla.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +117,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,Website Kuva {0} kiinnitetty Tuote {1} ei löydy
 DocType: Issue,Content Type,sisällön tyyppi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,tietokone
 DocType: Item,List this Item in multiple groups on the website.,Listaa tästä Kohta useisiin ryhmiin verkkosivuilla.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +172,{0} {1} does not exist,{0} {1} ei ole olemassa
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +175,{0} {1} does not exist,{0} {1} ei ole olemassa
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,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 +72,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
@@ -3734,13 +3785,14 @@
 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/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 taso
 apps/erpnext/erpnext/stock/doctype/item/item.py +415,'Has Serial No' can not be 'Yes' for non-stock item,'Sarjanumero' ei voi olla kyllä ei-varastonimikkeelle
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,osallistumisia ei voi merkitä tuleville päiville
 DocType: Pricing Rule,Pricing Rule Help,"hinnoittelusääntö, ohjeet"
 DocType: Purchase Taxes and Charges,Account Head,tilin otsikko
 apps/erpnext/erpnext/config/stock.py +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 +109,Electrical,sähköinen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Electrical,sähköinen
 DocType: Stock Entry,Total Value Difference (Out - In),arvoero (ulos-sisään) yhteensä
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,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}
@@ -3748,7 +3800,7 @@
 DocType: Item,Customer Code,asiakkaan koodi
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +210,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 +292,Debit To account must be a Balance Sheet account,Pankkikortti tilille on kuitenkin taseen tili
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To account must be a Balance Sheet account,Pankkikortti tilille on kuitenkin taseen tili
 DocType: Buying Settings,Naming Series,Nimeä sarjat
 DocType: Leave Block List,Leave Block List Name,"poistu estoluettelo, nimi"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,"varasto, vastaavat"
@@ -3760,11 +3812,11 @@
 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 +301,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 +313,Salary Slip of employee {0} already created for time sheet {1},Palkka Slip työntekijöiden {0} on jo luotu kellokortti {1}
 DocType: Sales Order Item,Ordered Qty,tilattu yksikkömäärä
-apps/erpnext/erpnext/stock/doctype/item/item.py +673,Item {0} is disabled,Tuote {0} on poistettu käytöstä
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,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 +838,BOM does not contain any stock item,BOM ei sisällä varastotuote
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +809,BOM does not contain any stock item,BOM ei sisällä varastotuote
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Period From and Period To dates mandatory for recurring {0},Ajanjaksona ja AIKA Voit päivämäärät pakollinen toistuvia {0}
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Hanketoimintaa / tehtävä.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,muodosta palkkalaskelmat
@@ -3772,23 +3824,24 @@
 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,Viimeksi ostaa korko ei löytynyt
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Kirjoita Off Määrä (Yrityksen valuutta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +485,Row #{0}: Please set reorder quantity,Rivi # {0}: Aseta tilausrajaa
+DocType: Sales Invoice Timesheet,Billing Hours,Laskutus tuntia
+apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Rivi # {0}: Aseta tilausrajaa
 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 +62,Please set {0},Aseta {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Toista päivä Kuukausi
 DocType: Employee,Health Details,"terveys, lisätiedot"
 DocType: Offer Letter,Offer Letter Terms,Tarjoa Kirje Ehdot
+DocType: Payment Entry,Allocate Payment Amount,Allocate Maksusumma
 DocType: Employee External Work History,Salary,palkka
 DocType: Serial No,Delivery Document Type,toimitusasiakirjan tyyppi
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,lähetä kaikki palkkalaskelmat yllä valituin kriteerein
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} tuotteet on synkronoitu
 DocType: Sales Order,Partly Delivered,osittain toimitettu
-DocType: Sales Invoice,Existing Customer,nykyinen asiakas
 DocType: Email Digest,Receivables,saatavat
+DocType: Lead Source,Lead Source,lyijy Source
 DocType: Customer,Additional information regarding the customer.,Lisätietoja asiakas.
 DocType: Quality Inspection Reading,Reading 5,Lukeminen 5
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +38,Campaign Name is required,kampanjan nimi vaaditaan
 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
@@ -3796,10 +3849,9 @@
 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,lataa osallistuminen
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +129,BOM and Manufacturing Quantity are required,BOM ja valmistusmäärä tarvitaan
+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/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,vanhentumisen skaala 2
 DocType: SG Creation Tool Course,Max Strength,max Strength
-DocType: Bank Reconciliation Detail,Amount,arvomäärä
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM korvattu
 ,Sales Analytics,myyntianalyysi
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +113,Available {0},Käytettävissä {0}
@@ -3807,14 +3859,14 @@
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,sähköpostin perusmääritykset
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +96,Please enter default currency in Company Master,syötä oletusvaluutta yritys valvonnassa
 DocType: Stock Entry Detail,Stock Entry Detail,varaston kirjausen yksityiskohdat
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +100,Daily Reminders,Päivittäinen Muistutukset
+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},Vero sääntö Ristiriidat {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +23,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 +71,Customer Service,asiakaspalvelu
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Customer Service,asiakaspalvelu
 DocType: Homepage Featured Product,Thumbnail,Thumbnail
 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ä
@@ -3823,8 +3875,9 @@
 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
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Oletus Work In Progress Warehouse
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1570,Total nos of serial no is not equal to quantity.,Yhteensä nos sarjanumero ei vastaa määrää.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1594,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ä
 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
@@ -3832,9 +3885,10 @@
 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 +82,Engineer,insinööri
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,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 +370,Item Code required at Row No {0},tuotekoodi vaaditaan riville {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +398,Item Code required at Row No {0},tuotekoodi vaaditaan riville {0}
 DocType: Sales Partner,Partner Type,kumppani tyyppi
 DocType: Purchase Taxes and Charges,Actual,todellinen
 DocType: Authorization Rule,Customerwise Discount,asiakaskohtainen alennus
@@ -3850,16 +3904,18 @@
 DocType: BOM,Raw Material Cost,raaka-ainekustannukset
 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.,"syötä tuotteet ja suunniteltu yksikkömäärä, joille haluat lisätä tuotantotilauksia tai joista haluat ladata raaka-aine analyysin"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +55,Part-time,Osa-aikainen
+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
 DocType: Employee,Applicable Holiday List,sovellettava lomalista
 DocType: Employee,Cheque,takaus/shekki
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,sarja päivitetty
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +57,Series Updated,sarja päivitetty
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,raportin tyyppi vaaditaan
 DocType: Item,Serial Number Series,sarjanumero sarjat
 apps/erpnext/erpnext/buying/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 +87,Clearance Date updated,Maavara Päivitetty
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,onnistuneesti täsmäytetty
@@ -3873,7 +3929,7 @@
 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 +513,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 +518,Posting date and posting time is mandatory,Lähettämistä päivämäärä ja lähettämistä aika on pakollista
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,veromallipohja ostotapahtumiin
 ,Item Prices,tuote hinnat
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,"sanat näkyvät, kun tallennat ostotilauksen"
@@ -3883,7 +3939,7 @@
 DocType: Purchase Invoice,Advance Payments,Ennakkomaksut
 DocType: Purchase Taxes and Charges,On Net Total,netto yhteensä:ssä
 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},Vastinetta Taito {0} on oltava alueella {1} ja {2} ja lisäyksin {3} alamomenttiin {4}
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +158,Target warehouse in row {0} must be same as Production Order,tavoite varasto rivillä {0} on oltava yhtäsuuri kuin tuotannon tilaus
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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,Valuutta ei voi muuttaa tehtyään merkinnät jollakin toisella valuutta
 DocType: Company,Round Off Account,pyöristys tili
@@ -3892,23 +3948,22 @@
 DocType: Customer Group,Parent Customer Group,Parent Asiakasryhmä
 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 +180,Notice Period,Irtisanomisaika
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,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 +4,New Sales Person Name,New Sales Person Name
 DocType: Packing Slip,Gross Weight UOM,bruttopaino UOM
-DocType: Email Digest,Receivables / Payables,saatavat / maksettavat
 DocType: Delivery Note Item,Against Sales Invoice,myyntilaskun kohdistus
 DocType: Bin,Reserved Qty for Production,Varattu Määrä for Production
 DocType: Asset,Frequency of Depreciation (Months),Taajuus Poistot (kuukautta)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +469,Credit Account,Luottotili
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Credit Account,Luottotili
 DocType: Landed Cost Item,Landed Cost Item,"kohdistetut kustannukset, tuote"
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +55,Show zero values,näytä nolla-arvot
+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
 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 +647,Please specify Attribute Value for attribute {0},Ilmoitathan Taito Vastinetta määrite {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Ilmoitathan Taito Vastinetta määrite {0}
 DocType: Item,Default Warehouse,oletus varasto
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +39,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
@@ -3930,19 +3985,22 @@
 DocType: Journal Entry,Total Debit,debet yhteensä
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Oletus Valmiiden Warehouse
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,myyjä
-DocType: Sales Invoice,Cold Calling,kylmä pyyntö
 DocType: SMS Parameter,SMS Parameter,tekstiviesti parametri
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,Talousarvio ja Kustannuspaikka
 DocType: Maintenance Schedule Item,Half Yearly,puolivuosittain
 DocType: Lead,Blog Subscriber,Blogi Subscriber
+DocType: Guardian,Alternate Number,vaihtoehtoinen Number
 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.
+DocType: Stock Reconciliation Item,Quantity Difference,määrä ero
 apps/erpnext/erpnext/config/hr.py +253,Processing Payroll,Käsittely Payroll
 DocType: Opportunity Item,Basic Rate,perustaso
 DocType: GL Entry,Credit Amount,Luoton määrä
 DocType: Cheque Print Template,Signatory Position,allekirjoittaja Position
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,aseta kadonneeksi
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,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 +5,This is based on transactions against this Customer. See timeline below for details,Tämä perustuu liiketoimien vastaan Asiakas. Katso aikajana lisätietoja alla
 DocType: Supplier,Credit Days Based On,"kredit päivää, perustuen"
@@ -3954,11 +4012,10 @@
 ,Items To Be Requested,tuotteet joita on pyydettävä
 DocType: Purchase Order,Get Last Purchase Rate,hae viimeisin ostotaso
 DocType: Company,Company Info,yrityksen tiedot
-apps/erpnext/erpnext/accounts/page/pos/pos.js +941,Select or add new customer,Valitse tai lisätä uuden asiakkaan
+apps/erpnext/erpnext/accounts/page/pos/pos.js +930,Select or add new customer,Valitse tai lisätä uuden asiakkaan
 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 +5,This is based on the attendance of this Employee,Tämä perustuu läsnäolo tämän Työntekijän
-DocType: Sales Invoice,Frequency,Taajuus
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +463,Debit Account,Luottotililtä
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,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)
@@ -3967,27 +4024,27 @@
 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 +210,Supplier Quotation {0} created,Toimittaja noteeraus {0} luotu
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +208,Supplier Quotation {0} created,Toimittaja noteeraus {0} luotu
 apps/erpnext/erpnext/accounts/report/financial_statements.py +90,End Year cannot be before Start Year,Loppu vuosi voi olla ennen Aloitusvuosi
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Employee Benefits,työntekijä etuudet
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,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 +228,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 +232,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 +499,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 +500,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,emotili
 DocType: Quality Inspection Reading,Reading 3,Reading 3
 ,Hub,hubi
 DocType: GL Entry,Voucher Type,tosite tyyppi
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1007,Price List not found or disabled,hinnastoa ei löydy tai se on poistettu käytöstä
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1008,Price List not found or disabled,hinnastoa ei löydy tai se on poistettu käytöstä
 DocType: Expense Claim,Approved,hyväksytty
 DocType: Pricing Rule,Price,Hinta
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +244,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 +256,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ä
@@ -3998,12 +4055,12 @@
 DocType: Address,Office,Toimisto
 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 +259,Please select Employee Record first.,valitse työntekijä tietue ensin
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +266,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 +190,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 +235,Please enter Expense Account,syötä kulutili
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,Please enter Expense Account,syötä kulutili
 DocType: Account,Stock,varasto
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,"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 +976,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Rivi # {0}: Reference Document Type on yksi Ostotilaus, Ostolasku tai Päiväkirjakirjaus"
 DocType: Employee,Current Address,nykyinen osoite
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","mikäli tuote on toisen tuotteen malli tulee tuotteen kuvaus, kuva, hinnoittelu, verot ja muut tiedot oletuksena mallipohjasta ellei oletusta ole erikseen poistettu"
 DocType: Serial No,Purchase / Manufacture Details,oston/valmistuksen lisätiedot
@@ -4018,9 +4075,10 @@
 DocType: Asset Movement,Transaction Date,tapahtuma päivä
 DocType: Production Plan Item,Planned Qty,suunniteltu yksikkömäärä
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,verot yhteensä
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,For Quantity (Manufactured Qty) is mandatory,yksikkömäärään (valmistettu yksikkömäärä) vaaditaan
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,For Quantity (Manufactured Qty) is mandatory,yksikkömäärään (valmistettu yksikkömäärä) vaaditaan
 DocType: Stock Entry,Default Target Warehouse,oletus tavoite varasto
 DocType: Purchase Invoice,Net Total (Company Currency),netto yhteensä (yrityksen valuutta)
+apps/erpnext/erpnext/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 +78,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: Production Order,Actual Start Date,todellinen aloituspäivä
@@ -4035,9 +4093,11 @@
 DocType: Warranty Claim,If different than customer address,mikäli eri kuin asiakkan osoite
 DocType: BOM Operation,BOM Operation,BOM käyttö
 DocType: Purchase Taxes and Charges,On Previous Row Amount,edellisen rivin arvomäärä
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +226,Transfer Asset,siirto Asset
+DocType: Student,Home Address,Kotiosoite
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +227,Transfer Asset,siirto Asset
 DocType: POS Profile,POS Profile,POS Profile
 apps/erpnext/erpnext/config/schools.py +33,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 +129,"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
@@ -4047,8 +4107,8 @@
 DocType: Assessment,Room,Huone
 DocType: Purchase Order,Advance Paid,ennakkoon maksettu
 DocType: Item,Item Tax,tuote vero
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +765,Material to Supplier,Materiaalin Toimittaja
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +189,Excise Invoice,Valmistevero Lasku
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,Material to Supplier,Materiaalin Toimittaja
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,Valmistevero Lasku
 DocType: Expense Claim,Employees Email Id,työntekijän sähköpostitunnus
 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
@@ -4058,7 +4118,7 @@
 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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,Student Groups luotu.
 DocType: Scheduling Tool,Scheduling Tool,ajoitustyökalun
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +136,Credit Card,luottokortti
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,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.,varaston tapahtumien oletusasetukset
 DocType: Purchase Invoice,Next Date,Seuraava päivä
@@ -4066,6 +4126,7 @@
 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,Drop Ship
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","talleta tähän esim. perheen lisätiedot, kuten vanhempien nimi ja ammatti, puoliso ja lapset"
+DocType: Academic Term,Term End Date,Term Päättymispäivä
 DocType: Hub Settings,Seller Name,myyjä nimi
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),verot ja maksut vähennetty (yrityksen valuutta)
 DocType: Item Group,General Settings,pääasetukset
@@ -4077,7 +4138,7 @@
 DocType: Customer,Commission Rate,provisio taso
 apps/erpnext/erpnext/stock/doctype/item/item.js +261,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 +115,"Payment Type must be one of Receive, Pay and Internal Transfer","Maksu tyyppi on yksi vastaanottaminen, Pay ja sisäinen siirto"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +118,"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,Analytics
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Ostoskori on tyhjä
 DocType: Production Order,Actual Operating Cost,todelliset toimintakustannukset
@@ -4092,10 +4153,10 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,Valitse csv tiedosto
 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 +92,Designer,suunnittelija
+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
 DocType: Serial No,Delivery Details,"toimitus, lisätiedot"
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +469,Cost Center is required in row {0} in Taxes table for type {1},kustannuspaikka tarvitsee rivin {0} verokannan {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +472,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
 ,Item-wise Purchase Register,"tuote työkalu, ostorekisteri"
 DocType: Batch,Expiry Date,vanhenemis päivä
@@ -4105,12 +4166,12 @@
 apps/erpnext/erpnext/config/projects.py +13,Project master.,projekti valvonta
 apps/erpnext/erpnext/controllers/status_updater.py +174,"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 +417, (Half Day),(1/2 päivä)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425, (Half Day),(1/2 päivä)
 DocType: Supplier,Credit Days,kredit päivää
 DocType: Leave Type,Is Carry Forward,siirretääkö
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +740,Get Items from BOM,hae tuotteita BOM:sta
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +711,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 +549,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/controllers/accounts_controller.py +552,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
 ,Stock Summary,Stock Yhteenveto
 apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,Luovuttaa omaisuuttaan yhdestä varastosta another
diff --git a/erpnext/translations/fr-CA.csv b/erpnext/translations/fr-CA.csv
index 4253811..30deff3 100644
--- a/erpnext/translations/fr-CA.csv
+++ b/erpnext/translations/fr-CA.csv
@@ -22,3 +22,4 @@
  {% 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>"
+DocType: Journal Entry,Difference (Dr - Cr),Différence (Dt - Ct )
diff --git a/erpnext/translations/fr.csv b/erpnext/translations/fr.csv
index 6292472..bd580f2 100644
--- a/erpnext/translations/fr.csv
+++ b/erpnext/translations/fr.csv
@@ -18,11 +18,10 @@
 DocType: Sales Partner,Dealer,Revendeur
 DocType: Employee,Rented,Loué
 DocType: Purchase Order,PO-,PO-
-apps/erpnext/erpnext/accounts/report/financial_statements.py +19,Start Year {0} not found.,Année de début {0} introuvable.
 DocType: POS Profile,Applicable for User,Applicable pour l&#39;utilisateur
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +191,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Arrêtée ordre de production ne peut pas être annulée, déboucher d&#39;abord annuler"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +197,Do you really want to scrap this asset?,Voulez-vous vraiment supprimer cet actif?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +17,Select Default Supplier,Sélectionnez Par défaut Fournisseur
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +192,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Arrêtée ordre de production ne peut pas être annulée, déboucher d&#39;abord annuler"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +198,Do you really want to scrap this asset?,Voulez-vous vraiment supprimer cet actif?
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Sélectionnez Par défaut Fournisseur
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Devise est nécessaire pour 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
@@ -42,46 +41,45 @@
 DocType: Sales Invoice,Customer Name,Nom du client
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +126,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 +180,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 +183,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 +148,Series Updated Successfully,Mise à jour des séries réussie
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +149,Series Updated Successfully,Mise à jour des séries réussie
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Check-out
 DocType: Pricing Rule,Apply On,Appliquer sur
 DocType: Item Price,Multiple Item prices.,Prix articles multiples.
 ,Purchase Order Items To Be Received,Articles de bons de commande pour être reçu
 DocType: SMS Center,All Supplier Contact,Tous les contacts fournisseur
-DocType: Quality Inspection Reading,Parameter,Paramètre
 apps/erpnext/erpnext/projects/doctype/project/project.py +54,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 +239,New Leave Application,Nouvelle Demande de Congés
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,New Leave Application,Nouvelle Demande de Congés
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +20,Attendance Record {0} exists against Student {1} for Course Schedule {2},Registre des présences {0} existe contre Student {1} pour Schedule Course {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Bank Draft,Projet de la Banque
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,Projet de la Banque
 DocType: Mode of Payment Account,Mode of Payment Account,Mode de compte de paiement
 apps/erpnext/erpnext/stock/doctype/item/item.js +52,Show Variants,Voir les variantes
 DocType: Academic Term,Academic Term,Terme Académique
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +13,Material,Matériel
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Quantity,Quantité
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +511,Accounts table cannot be blank.,Comptes table ne peut pas être vide.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +616,Quantity,Quantité
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +512,Accounts table cannot be blank.,Le tableau 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)
 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/setup/doctype/email_digest/templates/default.html +46,Open Issues,Questions ouvertes
 DocType: Designation,Designation,Désignation
 DocType: Production Plan Item,Production Plan Item,Élément du plan de production
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +142,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é
-DocType: Purchase Invoice,Monthly,Mensuel
 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/buying/doctype/purchase_order/purchase_order.js +771,Invoice,Facture
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +750,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 +198,Row {0}: {1} {2} does not match with {3},Rangée {0}: {1} {2} ne correspond pas à {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Rangée # {0}:
+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 +127,Please select Price List,S&#39;il vous plaît sélectionnez Liste des Prix
@@ -112,8 +110,8 @@
 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 +589,Get items from,Obtenir des éléments de
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +382,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/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Obtenir des éléments de
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,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
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,épicerie
@@ -121,8 +119,8 @@
 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
 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 la saisonnalité dans votre entreprise.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +156,Salary Structure Missing,Structure des salaires manquant
+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 +168,Salary Structure Missing,Structure des salaires manquant
 DocType: Lead,Person Name,Nom de la personne
 DocType: Sales Invoice Item,Sales Invoice Item,Article facture de vente
 DocType: Account,Credit,Crédit
@@ -130,10 +128,11 @@
 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 +156,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/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","«Est Asset fixe&quot; ne peut pas être désactivée, comme dossier actif existe contre l&#39;élément"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +189,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: Tax Rule,Tax Type,Type d&#39;impôt
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +144,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}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,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 Article (si ce n&#39;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
@@ -143,18 +142,17 @@
 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 +165,Opening,Ouverture
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,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/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Client&gt; Groupe Client&gt; Territoire
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Compte Pay Only
 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
 DocType: Lead,Product Enquiry,Demande d&#39;information produit
 DocType: Academic Term,Schools,Écoles
 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 +335,Please select Company first,S'il vous plaît sélectionnez Société premier
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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
@@ -164,7 +162,7 @@
 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
 DocType: Purchase Invoice Item,Is Fixed Asset,Est-Fixed Asset
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Available qty is {0}, you need {1}","Disponible qté est {0}, vous devez {1}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +225,"Available qty is {0}, you need {1}","Disponible qté est {0}, vous devez {1}"
 DocType: Expense Claim Detail,Claim Amount,Montant réclamé
 DocType: Employee,Mr,M.
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Fournisseur Type / Fournisseur
@@ -173,26 +171,27 @@
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,Journal d'importation
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Tirez Matériau Demande de Type Fabrication sur la base des critères ci-dessus
+DocType: Assessment Result,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 +171,Annual Salary,Salaire Annuel
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Annual Salary,Salaire Annuel
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Dépenses stock
-apps/erpnext/erpnext/accounts/report/financial_statements.py +22,End Year {0} not found.,Fin de l&#39;année {0} introuvable.
 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}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Approvisionnement en matières premières pour l&#39;achat
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +130,At least one mode of payment is required for POS invoice.,Au moins un mode de paiement est nécessaire pour POS facture.
 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 +451,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/stock/doctype/stock_entry/stock_entry.py +456,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/controllers/accounts_controller.py +614,"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/controllers/accounts_controller.py +617,"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 +166,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
@@ -204,15 +203,15 @@
 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 +147,Execution,exécution
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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/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}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,Cost Center {0} does not belong to Company {1},Centre de coûts {0} n'appartient pas à la Société {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +100,Cost Center {0} does not belong to Company {1},Centre de coûts {0} n'appartient pas à la Société {1}
 DocType: Customer,Individual,Individuel
-DocType: Interest,Academics User,Universitaires utilisateur
+DocType: Interest,Academics User,Utilisateur académique
 DocType: Cheque Print Template,Amount In Figure,Sur la figure quantité
 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
@@ -226,54 +225,57 @@
 DocType: Production Planning Tool,Sales Orders,Commandes clients
 DocType: Purchase Taxes and Charges,Valuation,Valorisation
 ,Purchase Order Trends,Bon de commande Tendances
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,The request for quotation can be accessed by clicking on the following link,La demande de devis peut être consulté en cliquant sur le lien suivant
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,Allouer des congés pour l'année.
 DocType: SG Creation Tool Course,SG Creation Tool Course,SG Cours outil de création
 DocType: Student Group Creation Tool,Leave blank if you wish to fetch all courses for selected academic term,Laissez vide si vous souhaitez récupérer tous les cours pour semestre universitaire sélectionné
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,Insufficient Stock,Stock insuffisant
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227,Insufficient Stock,Stock insuffisant
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Planification de la capacité Désactiver et Gestion du Temps
+DocType: Email Digest,New Sales Orders,Nouvelles commandes clients
 DocType: Bank Reconciliation,Bank Account,Compte bancaire
 DocType: Leave Type,Allow Negative Balance,Autoriser un solde négatif
 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/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} does not belong to Company {1},Compte {0} n'appartient pas à la société {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +86,Account {0} does not belong to Company {1},Compte {0} n'appartient pas à la société {1}
 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}
 DocType: Naming Series,Series List for this Transaction,Liste des Séries pour cette transaction
 DocType: Sales Invoice,Is Opening Entry,Est l&#39;ouverture d&#39;entrée
 DocType: Customer Group,Mention if non-standard receivable account applicable,Mentionner si créance non standard applicable
 DocType: Course Schedule,Instructor Name,Nom de l&#39;instructeur
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,For Warehouse is required before Submit,Pour l’entrepôt est nécessaire avant Soumettre
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,For Warehouse is required before Submit,Pour l’entrepôt est nécessaire avant Soumettre
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Reçu le
 DocType: Sales Partner,Reseller,Revendeur
 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,Sur l'objet de la facture de vente
+DocType: Delivery Note Item,Against Sales Invoice Item,Dans l'élément 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 +1436,"LocalStorage is full , did not save","LocalStorage est plein, ne pas enregistrer"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1460,"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
 apps/erpnext/erpnext/controllers/recurring_document.py +227,Next Recurring {0} will be created on {1},Suivant récurrent {0} sera créé sur {1}
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +28,Another Budget record {0} already exists against {1} for fiscal year {2},Un autre record du budget {0} existe déjà contre {1} pour l&#39;exercice {2}
 DocType: Sales Partner,Partner website,Site Partenaire
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +104,Add Item,Ajouter un item
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +104,Add Item,Ajouter un article
 ,Contact Name,Contact Nom
 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: Cheque Print Template,Line spacing for amount in words,L&#39;espacement des lignes pour montant en lettres
 apps/erpnext/erpnext/templates/generators/item.html +78,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 +5,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/leave_application/leave_application.py +206,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/leave_application/leave_application.py +213,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 +114,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 +179,Leaves per Year,Congés par Année
+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 +103,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}
+DocType: Email Digest,Profit & Loss,Perte de profit
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,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 Site élément
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +435,Leave Blocked,Laisser verouillé
-apps/erpnext/erpnext/stock/doctype/item/item.py +669,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 +443,Leave Blocked,Laisser verouillé
+apps/erpnext/erpnext/stock/doctype/item/item.py +671,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 +83,Annual,Annuel
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +86,Annual,Annuel
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock réconciliation article
 DocType: Stock Entry,Sales Invoice No,Aucune facture de vente
 DocType: Material Request Item,Min Order Qty,Qté min. de commande
@@ -281,20 +283,22 @@
 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
 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 +91,Software Developer,Developeur logiciel
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,Developeur logiciel
 DocType: Item,Minimum Order Qty,Qté minimum de commande
 DocType: Pricing Rule,Supplier Type,Type de fournisseur
 DocType: Scheduling Tool,Course Start Date,Cours Date de début
 DocType: Item,Publish in Hub,Publier dans Hub
+DocType: Student Admission,Student Admission,Admission des étudiants
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is cancelled,Article {0} est annulé
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Material Request,Demande de matériel
+apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} is cancelled,Article {0} est annulé
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +823,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 +28,Abbreviation already used for another salary component,Abréviation déjà utilisé pour une autre composante de salaire
+apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +28,Abbreviation already used for another salary component,Abréviation déjà utilisée pour une autre composante de salaire
 DocType: Item,Purchase Details,Détails de l'achat
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +328,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Article {0} introuvable dans 'matières premières Fournies' table dans la commande d'achat {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +333,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/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
@@ -310,20 +314,21 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +130,Please select Charge Type first,S'il vous plaît sélectionnez le type de Facturation de la première
 DocType: Student Group Student,Student Group Student,Groupe Étudiant Étudiant
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,dernier
+DocType: Email Digest,New Quotations,Citations de nouvelles
 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
 DocType: Tax Rule,Shipping County,County Expédition
 apps/erpnext/erpnext/config/desktop.py +158,Learn,Apprendre
 DocType: Asset,Next Depreciation Date,Suivant Amortissements date
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Coût de l'activité par employé
 DocType: Accounts Settings,Settings for Accounts,Réglages pour les comptes
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +626,Supplier Invoice No exists in Purchase Invoice {0},Fournisseur facture n ° existe dans la facture d&#39;achat {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +629,Supplier Invoice No exists in Purchase Invoice {0},Fournisseur facture n ° existe dans la facture d&#39;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
 DocType: Item,Synced With Hub,Synchronisé avec Hub
 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 +348,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 +86,Circular Reference Error,Référence circulaire erreur
@@ -335,15 +340,16 @@
 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 +806,Delivery Note,Bon de livraison
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +800,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/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 +233,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/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/setup/doctype/email_digest/email_digest.py +104,Summary for this week and pending activities,Résumé de la semaine et activités en suspens
+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/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"
 DocType: Employee,Company Email,E-mail société
@@ -355,28 +361,29 @@
 apps/erpnext/erpnext/config/hr.py +186,"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
-apps/erpnext/erpnext/controllers/accounts_controller.py +551,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}
+apps/erpnext/erpnext/controllers/accounts_controller.py +554,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 +54,{0} already allocated for Employee {1} for period {2} to {3},{0} déjà alloué pour les employés {1} pour la période {2} pour {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +812,Select Item,Sélectionner un article
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +791,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 \
 					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 +142,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 +91,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/stock/doctype/purchase_receipt/purchase_receipt.py +143,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.
 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 +342,Please see attachment,S'il vous plaît voir la pièce jointe
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,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 +19,Setup Already Complete!!,Configuration déjà terminée !
 ,Finished Goods,Produits finis
 DocType: Delivery Note,Instructions,Instructions
 DocType: Quality Inspection,Inspected By,Inspecté par
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Fournisseur&gt; Type de fournisseur
 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/public/js/utils/item_selector.js +12,Add Items,Ajouter les articles
@@ -386,34 +393,34 @@
 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 couts de personnel existe pour l'employé {0} dans 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 de personnel existent pour l'employé {0} dans 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)
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Solde de crédit
+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/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 +736,Purchase Return,Achat de retour
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +715,Purchase Return,Achat de retour
 ,Purchase Register,Registre des achats
 DocType: Scheduling Tool,Rechedule,Rechedule
 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 +202,{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 +209,{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 +143,Reason for losing,Raison pour perdre
-apps/erpnext/erpnext/accounts/utils.py +239,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 +163,Reason for losing,Raison pour perdre
+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é
 DocType: Announcement,Receiver,Récepteur
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,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: 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 +225,Please enter Cost Center,S'il vous plaît entrer Centre de coûts
-DocType: Journal Entry Account,Sales Order,Bon de commande
+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
+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/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},La quantité ne peut pas être une fraction à la ligne {0}
@@ -425,26 +432,26 @@
 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,Dans l&#39;attente des commandes d&#39;achat
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Réglage automatique de série n ° basé sur FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Vérifiez Fournisseur numéro de facture Unicité
 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 +102,Non Profit,À but non lucratif
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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: Stock Reconciliation Item,Do not include symbols (ex. $),Ne pas inclure des symboles (ex. $)
 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,Sur envoyé
-apps/erpnext/erpnext/stock/doctype/item/item.py +638,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 +640,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 Date
 DocType: Delivery Note,Billing Address,Adresse de facturation
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +862,Please enter Item Code.,S'il vous plaît entrez le code d'article .
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +847,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"
@@ -458,12 +465,12 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Titres et des dépôts
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Nombre de feuilles alloués est obligatoire
 DocType: Job Opening,Description of a Job Opening,Description d'une ouverture d'emploi
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Pending activities for today,Activités en suspens pour aujourd&#39;hui
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Activités en suspens pour aujourd&#39;hui
 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: Manufacturing Settings,Time Between Operations (in mins),Temps entre les opérations (en min)
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +92,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} budget pour compte {1} contre le centre de coûts {2} est {3}. Il dépassera par {4}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +95,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} budget pour compte {1} contre le centre de coûts {2} est {3}. Il dépassera par {4}
 DocType: Customer,Buyer of Goods and Services.,Lors de votre achat des biens et services.
 DocType: Journal Entry,Accounts Payable,Comptes à payer
 apps/erpnext/erpnext/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
@@ -471,16 +478,16 @@
 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/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 +86,Administrative Officer,Agent administratif
-apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +23,Acutal Qty {0} / Waiting Qty {1},Acutal Quantité {0} / Attente Quantité {1}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,Agent administratif
+apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +23,Acutal Qty {0} / Waiting Qty {1},Quantité réelle {0} / Quantité en attente {1}
 DocType: Timesheet Detail,Hrs,hrs
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +319,Please select Company,S&#39;il vous plaît sélectionnez Société
-DocType: Stock Entry,Difference Account,Compte de la différence
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +309,Please select Company,S&#39;il vous plaît sélectionnez Société
+DocType: Stock Entry Detail,Difference Account,Compte de la différence
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,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 +398,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 +399,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 +530,"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 +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"
 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 +28,Buy,Acheter
@@ -488,7 +495,7 @@
 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 +1563,Serial no item cannot be a fraction,Serial aucun élément ne peut pas être une fraction
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1587,Serial no item cannot be a fraction,Serial aucun élément 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
@@ -497,13 +504,14 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Account {0} does not belong to company: {1},Compte {0} n'appartient pas à la société : {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation already used for another company,Abréviation déjà utilisé pour une autre société
 DocType: Selling Settings,Default Customer Group,Groupe de clients par défaut
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Supplier is required against Payable account {0},Fournisseur est nécessaire contre les compte à payer {0}
 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
 DocType: Production Planning Tool,Material Requirement,Exigence Matériel
 DocType: Company,Delete Company Transactions,Supprimer Transactions Société
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +313,Reference No and Reference Date is mandatory for Bank transaction,N ° de référence et de référence Date de transaction est obligatoire pour la Banque
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +316,Reference No and Reference Date is mandatory for Bank transaction,N ° de référence et de référence Date de transaction est obligatoire pour la Banque
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Ajouter / Modifier Taxes et Charges
 DocType: Purchase Invoice,Supplier Invoice No,Fournisseur facture n
 DocType: Territory,For reference,Pour référence
@@ -514,7 +522,6 @@
 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/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
 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
 DocType: Salary Slip,Salary Slip Timesheet,Slip Salaire Timesheet
@@ -525,11 +532,11 @@
 DocType: Buying Settings,Purchase Receipt Required,Réception achat requis
 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/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 +28,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 +19,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é , série n ne peut pas être fusionné"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +707,Make Sales Order,Assurez- Commande
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +701,Make Sales Order,Assurez- Commande
 DocType: Project Task,Project Task,Tâche projet
 ,Lead Id,Id prospect
 DocType: C-Form Invoice Detail,Grand Total,Total Général
@@ -545,7 +552,8 @@
 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 +734,Sales Return,Retour de Ventes
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +728,Sales Return,Retour de Ventes
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +91,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)
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Base de données de clients potentiels.
@@ -554,14 +562,13 @@
 DocType: Quotation,Quotation To,Devis Pour
 DocType: Lead,Middle Income,Revenu intermédiaire
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +212,Opening (Cr),Ouverture ( Cr )
-apps/erpnext/erpnext/stock/doctype/item/item.py +795,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,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 +237,Allocated amount can not be negative,Le montant alloué ne peut être négatif
+apps/erpnext/erpnext/stock/doctype/item/item.py +797,Default Unit of Measure for Item {0} cannot be changed directly because 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
 DocType: Purchase Order Item,Billed Amt,Montant facturé
 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,Facture de vente Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},No et date de référence est nécessaire pour {0}
-DocType: Sales Invoice,Customer's Vendor,Client Fournisseur
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Proposal Writing,Rédaction de propositions
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,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"
@@ -570,13 +577,14 @@
 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
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +257,Already supplier quotation has created,Déjà fournisseur de cotation a créé
 DocType: Timesheet,Billed,Facturé
 DocType: Batch,Batch Description,Description du lot
+apps/erpnext/erpnext/accounts/utils.py +685,"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 de vente et frais
 DocType: Employee,Organization Profile,Profil de l'organisme
-apps/erpnext/erpnext/accounts/page/pos/pos.js +733,View Offline Records,Voir hors ligne Dossiers
+apps/erpnext/erpnext/accounts/page/pos/pos.js +715,View Offline Records,Voir hors ligne Dossiers
+DocType: Student,Sibling Details,Détails Sibling
 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: Payment Reconciliation,Invoice/Journal Entry Details,Facture / Détails pièce comptable
@@ -590,7 +598,7 @@
 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
 DocType: Employee,Passport Number,Numéro de passeport
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Manager,Directeur
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,Directeur
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,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
@@ -599,10 +607,11 @@
 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
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +299,Timesheet created:,Timesheet créé:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +715,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/manufacturing/doctype/production_order/production_order.py +300,Timesheet created:,Timesheet créé:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +772,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
 DocType: Selling Settings,Customer Naming By,Client de nommage par
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,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: Depreciation Schedule,Depreciation Amount,amortissement Montant
 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é
@@ -627,6 +636,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,terminer
 DocType: Pricing Rule,Sales Manager,Responsable Ventes
 DocType: Salary Structure Employee,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
@@ -641,20 +651,20 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +9,Pre Sales,Ventes pré
 DocType: Purchase Receipt,Other Details,Autres détails
 DocType: Account,Accounts,Comptes
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Marketing,Marketing
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +227,Payment Entry is already created,Paiement entrée est déjà créé
+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,Paiement entrée est déjà créé
 DocType: Purchase Receipt Item Supplied,Current Stock,Stock actuel
-apps/erpnext/erpnext/controllers/accounts_controller.py +538,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 +21,Preview Salary Slip,Aperçu Salaire Slip
+apps/erpnext/erpnext/controllers/accounts_controller.py +541,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 +38,Preview Salary Slip,Aperçu Salaire Slip
 DocType: Company,Deafult Cost Center,Centre de coûts deafult
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +48,Account {0} has been entered multiple times,Compte {0} a été saisi plusieurs fois
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +48,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,Vendeur Ville
 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
 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 +617,Item has variants.,L'article a des variantes.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,L'article a des variantes.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,Article {0} introuvable
 DocType: Bin,Stock Value,Valeur de l&#39;action
 apps/erpnext/erpnext/accounts/doctype/account/account.py +25,Company {0} does not exist,n&#39;existe pas Société {0}
@@ -674,7 +684,7 @@
 DocType: Purchase Order,Supply Raw Materials,Raw Materials Supply
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,La date à laquelle prochaine facture sera générée. Il est généré sur soumettre.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Actif à court terme
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,{0} is not a stock Item,{0} n'est pas un article de stock
+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 (Société Monnaie)
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +169,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
@@ -712,7 +722,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).
@@ -723,19 +733,19 @@
 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.","Modèle de la taxe standard qui peut être appliqué à toutes les opérations de vente. Ce modèle peut contenir la liste des chefs d'impôt ainsi que d'autres chefs dépenses / revenus comme le ""port"", ""assurance"", ""Manipulation"", etc. 
+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.","Modèle de la taxe standard qui peut être appliqué à toutes les opérations de vente. Ce modèle peut contenir la liste des chefs d'impôt ainsi que d'autres chefs dépenses / revenus comme le ""port"", ""assurance"", ""Manipulation"", etc.
 
- #### Remarque 
+ #### Remarque
 
  Le taux d'imposition vous définir ici sera le taux d'imposition standard pour tous les articles ** **. Se il ya ** ** Articles qui ont des taux différents, ils doivent être ajoutés dans le ** Impôt de l'article ** ** table dans le Point ** maître.
 
- #### Description des colonnes 
+ #### Description des colonnes
 
- 1. Type de calcul: 
+ 1. Type de calcul:
  - Cela peut être le ** Net Total ** (ce est la somme de montant de base).
  - ** Sur Rang Précédent Total / Montant ** (pour les taxes ou frais cumulatifs). Si vous sélectionnez cette option, la taxe sera appliquée en pourcentage de la rangée précédente (dans la table d'impôt) montant ou totale.
  - ** ** Réelles (comme mentionné).
- 2. Compte chef: Le grand livre de compte en vertu de laquelle cette taxe sera réservé 
+ 2. Compte chef: Le grand livre de compte en vertu de laquelle cette taxe sera réservé
  3. Centre de Coût: Si la taxe / redevance est un revenu (comme le transport) ou dépenses qu'elle doit être réservé contre un centre de coûts.
  4. Description: Description de la taxe (qui sera imprimée sur les factures / guillemets).
  5. Taux: Le taux d'imposition.
@@ -760,26 +770,25 @@
 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 +709,No Permission,Aucune autorisation
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +710,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}
 apps/erpnext/erpnext/public/js/setup_wizard.js +298,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 +542,Row #{0}: Asset {1} must be submitted,Row # {0}: {1} Asset doit être soumise
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset {1} must be submitted,Row # {0}: {1} Asset doit être soumise
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Aucun employé trouvé
 DocType: Supplier Quotation,Stopped,Arrêté
 DocType: Item,If subcontracted to a vendor,Si 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.
 DocType: Warehouse,Tree Details,Arbre Détails
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Envoyer maintenant
 ,Support Analytics,Analyse du support
 DocType: Item,Website Warehouse,Entrepôt site web
 DocType: Payment Reconciliation,Minimum Invoice Amount,Montant minimum de facturation
 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/sales_invoice/sales_invoice.py +227,Timesheet {0} is already completed or cancelled,Timesheet {0} est déjà terminée ou annulée
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +259,Timesheet {0} is already completed or cancelled,Timesheet {0} est déjà terminée ou annulée
 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
@@ -795,13 +804,13 @@
 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&#39;âge de la retraite dans les années
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +229,Target Warehouse,Entrepôt cible
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +230,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: 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 +17,All Item Groups,Tous les groupes d'article
+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/config/setup.py +89,Automatically compose message on submission of transactions.,Composer automatiquement un message sur la soumission de transactions .
@@ -813,13 +822,15 @@
 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,Point Variant {0} existe déjà avec les mêmes caractéristiques
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;Ouverture&#39;
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Ouvrir To Do
 DocType: Notification Control,Delivery Note Message,Message du bon de livraison
 DocType: Expense Claim,Expenses,Dépenses
 DocType: Item Variant Attribute,Item Variant Attribute,Point Variant Attribut
 ,Purchase Receipt Trends,Achat Tendances reçus
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Research & Development,Recherche & Développement
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Recherche & Développement
 ,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,Frais d'administration
@@ -828,7 +839,7 @@
 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/controllers/accounts_controller.py +340,"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."
+apps/erpnext/erpnext/controllers/accounts_controller.py +343,"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,Stock Détails
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Valeur du projet
 apps/erpnext/erpnext/config/selling.py +307,Point-of-Sale,Point-de-vente
@@ -850,12 +861,12 @@
 DocType: Supplier Quotation,Is Subcontracted,Est en sous-traitance
 DocType: Item Attribute,Item Attribute Values,Point valeurs d'attribut
 DocType: Examination Result,Examination Result,Résultat d&#39;examen
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +756,Purchase Receipt,Achat Réception
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +735,Purchase Receipt,Achat Réception
 ,Received Items To Be Billed,Articles reçus à facturer
 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 +167,Reference Doctype must be one of {0},Référence Doctype doit être l&#39;un des {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +282,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/accounts/doctype/payment_entry/payment_entry.py +170,Reference Doctype must be one of {0},Référence Doctype doit être l&#39;un des {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,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 +439,BOM {0} must be active,BOM {0} doit être actif
@@ -866,7 +877,7 @@
 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 +214,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 +217,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
@@ -880,9 +891,9 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,"L'employé {0} n'est pas actif, ou n'existe pas"
 DocType: Fee Structure,Components,Composants
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,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 +612,Item Variants {0} updated,Point variantes {0} mis à jour
+apps/erpnext/erpnext/stock/doctype/item/item.py +614,Item Variants {0} updated,Point variantes {0} mis à jour
 DocType: Quality Inspection Reading,Reading 6,Lecture 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +843,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 +854,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
@@ -897,69 +908,72 @@
 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 +728,New Sales Invoice,Nouvelle facture de vente
+apps/erpnext/erpnext/accounts/page/pos/pos.js +710,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 +728,Sync Offline Invoices,Synchronisation hors connexion Factures
 DocType: Payment Request,Paid,Payé
 DocType: Program Fee,Program Fee,Frais du programme
 DocType: Salary Slip,Total in words,Total En Toutes Lettres
 DocType: Material Request Item,Lead Time Date,Délai Date Heure
 DocType: Guardian,Guardian Name,Nom du gardien
 DocType: Cheque Print Template,Has Print Format,A Format d&#39;impression
-apps/erpnext/erpnext/accounts/page/pos/pos.js +86, 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 +109,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 +619,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","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/page/pos/pos.js +75, 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 +613,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing 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 +606,Supplier Invoice Date cannot be greater than Posting Date,Fournisseur Date de la facture ne peut pas être supérieure à Date de publication
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +609,Supplier Invoice Date cannot be greater than Posting Date,Fournisseur Date de la facture ne peut pas être supérieure à Date de publication
 DocType: Purchase Invoice Item,Purchase Order Item,Achat Passer commande
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +130,Indirect Income,Revenu indirect
 DocType: Cheque Print Template,Date Settings,Paramètres de date
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Variance
 ,Company Name,Nom de l'entreprise
 DocType: SMS Center,Total Message(s),Comptes temporaires ( actif)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +810,Select Item for Transfer,Sélectionner un élément à transferer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +789,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: 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
-DocType: Student Applicant,Father's Name,Nom du père
 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 +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: Paiement contre Ventes / bon de commande doit toujours être marqué comme avance
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,chimique
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +686,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/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
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +694,All items have already been transferred for this Production Order.,Tous les éléments ont déjà été transférés pour cet ordre de production.
 DocType: Process Payroll,Select Payroll Year and Month,Sélectionnez paie Année et mois
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,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
-DocType: Opportunity,Walk In,Walk In
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,Stock entrées
 DocType: Item,Inspection Criteria,Critères d&#39;inspection
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,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: Timesheet Detail,Bill,Facture
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,White,Blanc
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,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
 DocType: SMS Center,All Lead (Open),Toutes les pistes (Ouvertes)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +228,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})
+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 +731,Make ,Faire
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,Make ,Faire
+DocType: Student Admission,Admission Start Date,Admission Date de début
 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 .
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Mon panier
-apps/erpnext/erpnext/controllers/selling_controller.py +154,Order Type must be one of {0},type d'ordre doit être l'un des {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},type d'ordre doit être l'un des {0}
 DocType: Lead,Next Contact Date,Date du prochain contact
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Quantité d'ouverture
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +393,Please enter Account for Change Amount,S&#39;il vous plaît entrez compte pour le changement Montant
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,Please enter Account for Change Amount,S&#39;il vous plaît entrez compte pour le changement Montant
 DocType: Student Batch,Student Batch Name,Student Batch Nom
 DocType: Holiday List,Holiday List Name,Nom de la liste de vacances
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js +8,Schedule Course,Cours Calendrier
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Stock Options,Options sur actions
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Options sur actions
 DocType: Journal Entry Account,Expense Claim,Note de frais
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +211,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 +237,Qty for {0},Qté pour {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +212,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 +238,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;
@@ -968,9 +982,9 @@
 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/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Les articles retirés avec aucun changement dans la quantité ou la valeur.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Les articles retirés avec aucun changement dans la quantité ou la valeur.
 DocType: Delivery Note,Delivery To,Livraison à
-apps/erpnext/erpnext/stock/doctype/item/item.py +635,Attribute table is mandatory,Table attribut est obligatoire
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Table attribut est obligatoire
 DocType: Production Planning Tool,Get Sales Orders,Obtenez des commandes clients
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} ne peut pas être négatif
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,S&#39;il vous plaît sélectionner un étudiant
@@ -995,7 +1009,7 @@
 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/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +27,Returns,résultats
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Entrepôt
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +194,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/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
@@ -1007,7 +1021,7 @@
 DocType: GL Entry,Against,Contre
 DocType: Item,Default Selling Cost Center,Coût des marchandises vendues
 DocType: Sales Partner,Implementation Partner,Partenaire de mise en œuvre
-apps/erpnext/erpnext/controllers/selling_controller.py +231,Sales Order {0} is {1},Bon de commande {0} est {1}
+apps/erpnext/erpnext/controllers/selling_controller.py +232,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
 DocType: Packing Slip,Net Weight UOM,Unité de mesure Poids Net
@@ -1017,25 +1031,24 @@
 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
 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 +155,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Devis reçus des fournisseurs.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},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/templates/pages/home.html +32,View All Products,Voir tous les produits
+apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Voir tous les produits
 DocType: Company,Default Currency,Devise par défaut
 DocType: Contact,Enter designation of this Contact,Entrez la désignation de ce contact
 DocType: Expense Claim,From Employee,De l'employé
-apps/erpnext/erpnext/controllers/accounts_controller.py +400,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
+apps/erpnext/erpnext/controllers/accounts_controller.py +403,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: 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,Invalid Attribute
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,et l&#39;année:
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +191,{0} {1} must be submitted,{0} {1} doit être soumis
-DocType: Email Digest,Annual Expense,Dépense annuelle
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,{0} {1} must be submitted,{0} {1} doit être soumis
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +145,Quantity must be less than or equal to {0},La quantité doit être inférieure ou égale à {0}
 DocType: SMS Center,Total Characters,Nombre de caractères
 apps/erpnext/erpnext/controllers/buying_controller.py +156,Please select BOM in BOM field for Item {0},S'il vous plaît sélectionner dans le champ BOM BOM pour objet {0}
@@ -1046,30 +1059,31 @@
 DocType: Sales Partner,Distributor,Distributeur
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Panier Livraison règle
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +211,Production Order {0} must be cancelled before cancelling this Sales Order,Tous les groupes de clients
-apps/erpnext/erpnext/public/js/controllers/transaction.js +62,Please set 'Apply Additional Discount On',S&#39;il vous plaît mettre «Appliquer réduction supplémentaire sur &#39;
+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
 DocType: Global Defaults,Global Defaults,Valeurs par défaut globales
 apps/erpnext/erpnext/projects/doctype/project/project.py +153,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
 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 +327,Capacity Planning Error,Erreur planification de capacité
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,Erreur planification de capacité
 ,Trial Balance for Party,Balance pour le Parti
 DocType: Lead,Consultant,Consultant
 DocType: Salary Slip,Earnings,Bénéfices
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +362,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/stock/doctype/stock_entry/stock_entry.py +367,Finished Item {0} must be entered for Manufacture type entry,Point Fini {0} doit être saisi pour le type de Fabrication entrée
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Solde d&#39;ouverture de comptabilité
 DocType: Sales Invoice Advance,Sales Invoice Advance,Avance facture de vente
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +499,Nothing to request,Pas de requête à demander
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +500,Nothing to request,Pas de requête à demander
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',« Date de Début réel » ne peut être supérieur à ' Date réelle de fin »
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Management,gestion
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},Soit de débit ou de montant de crédit est nécessaire pour {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,gestion
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +55,Either debit or credit amount is required for {0},Un montant au débit ou au crédit est nécessaire pour {0}
 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 +161,Blue,Bleu
+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,Liste des Prix Pays
 apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,S'il vous plaît définissez ID Email
@@ -1079,12 +1093,12 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +23,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
 DocType: Stock Settings,Default Item Group,Groupe d&#39;éléments par défaut
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1374,Do you really want to submit the invoice?,Voulez-vous vraiment à présenter la facture?
+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 +685,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 +1526,"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 +679,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 +1550,"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/accounts/doctype/account/account_tree.js +26,"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
@@ -1104,104 +1118,106 @@
 DocType: Payment Reconciliation,Unreconciled Payment Details,Détail des paiements non rapprochés
 DocType: Global Defaults,Current Fiscal Year,Exercice en cours
 DocType: Global Defaults,Disable Rounded Total,Désactiver le Total arrondi
-DocType: Lead,Call,Appeler
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +417,'Entries' cannot be empty,'Les entrées' ne peuvent pas être vide
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +418,'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 +214,Fiscal Year {0} not found,Exercice {0} introuvable
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +221,Fiscal Year {0} not found,Exercice {0} introuvable
 apps/erpnext/erpnext/config/hr.py +238,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 +150,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 +151,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 +145,Research,Recherche
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,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 +43,Item {0} must be a non-stock item,Item {0} doit être un élément non disponible
 DocType: Contact,User ID,ID utilisateur
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +57,View Ledger,Voir Grand Livre
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Au plus tôt
-apps/erpnext/erpnext/stock/doctype/item/item.py +504,"An Item Group exists with same name, please change the item name or rename the item group","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 +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/setup/setup_wizard/setup_wizard.py +437,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
 ,Budget Variance Report,Rapport sur les écarts du budget
 DocType: Salary Slip,Gross Pay,Salaire brut
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +90,Row {0}: Activity Type is mandatory.,Row {0}: Type d&#39;activité est obligatoire.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +114,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/public/js/controllers/stock_controller.js +40,Accounting Ledger,Livre des comptes
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,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
 DocType: BOM Item,Item Description,Description de l'article
+DocType: Student Sibling,Student Sibling,Student Sibling
 DocType: Purchase Invoice,Is Recurring,Est récurrent
 DocType: Purchase Invoice,Supplied Items,Articles fournis
 DocType: Student,STUD.,GOUJON.
 DocType: Production Order,Qty To Manufacture,Quantité à fabriquer
+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/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 +131,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 +175,Valuation Rate required for Item in row {0},Évaluation Taux requis pour le point à la ligne {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,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
 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 +87, to ,à
+apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,à
 DocType: Item,Lead Time in days,Délai en jours
 ,Accounts Payable Summary,Le résumé des comptes à payer
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Not authorized to edit frozen Account {0},N'êtes pas autorisé à modifier le compte gelé {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,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 +62,Sales Order {0} is not valid,Bon de commande {0} invalide
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Bon de commande {0} invalide
 apps/erpnext/erpnext/setup/doctype/company/company.py +185,"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 +152,Small,Petit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,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}
 ,Invoiced Amount (Exculsive Tax),Montant facturé ( impôt Exculsive )
-DocType: Student Applicant,Mother's / Guardian 1 Email ID,/ Tuteur 1 Email ID Mère
 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 +160,Green,Vert
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,Vert
 DocType: Supplier,SUPP-,SUPP-
 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 +57,Contract,Contrat
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,Contrat
 DocType: Email Digest,Add Quote,Ajouter Citer
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +498,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 +503,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 +80,Row {0}: Qty is mandatory,Ligne {0}: Qté est obligatoire
+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 +737,Sync Master Data,Sync Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +719,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/public/js/setup_wizard.js +283,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
+DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Ceci est un groupe d'élément racine et ne peut être modifié .
+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é .
 DocType: Journal Entry Account,Purchase Order,Bon de commande
 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 de courant
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +345,"{0}: Employee email not found, hence email not sent","{0}: l'adresse mail de l'employé ne figure pas, par conséquent le courriel n'a pas été envoyé"
+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,Votre entreprise est Adresse
 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 +118,"For {0}, only credit accounts can be linked against another debit entry","Pour {0}, seuls les comptes de crédit peuvent être liés avec une autre entrée de débit"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Delivery Note {0} is not submitted,Bon de livraison {0} n'est pas soumis
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Delivery Note {0} is not submitted,Bon de livraison {0} n'est pas soumis
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Sub-contracted Item,Exercice Date de début
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Capitaux immobilisés
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Prix règle est d'abord sélectionné sur la base de «postuler en« champ, qui peut être l'article, groupe d'articles ou de marque."
 DocType: Hub Settings,Seller Website,Site Vendeur
 DocType: Item,ITEM-,ARTICLE-
-apps/erpnext/erpnext/controllers/selling_controller.py +147,Total allocated percentage for sales team should be 100,Pourcentage total alloué à l'équipe de vente devrait être de 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +110,Production Order status is {0},Feuilles alloué avec succès pour {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Pourcentage total alloué à l'équipe de vente devrait être de 100
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Feuilles alloué avec succès pour {0}
 DocType: Appraisal Goal,Goal,Objectif
 DocType: Sales Invoice Item,Edit Description,Modifier la description
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +757,For Supplier,pour fournisseur
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +723,For Supplier,pour fournisseur
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Type de compte Configuration aide à sélectionner ce compte dans les transactions.
 DocType: Purchase Invoice,Grand Total (Company Currency),Total (Société Monnaie)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Créer Format d&#39;impression
@@ -1217,10 +1233,11 @@
 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
 DocType: Workstation,Workstation Name,Nom de la station de travail
+DocType: Grade Interval,Grade Code,code de grade
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Envoyer Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +445,BOM {0} does not belong to Item {1},BOM {0} ne appartient pas à l'article {1}
 DocType: Sales Partner,Target Distribution,Distribution cible
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1667,Deafault warehouse is required for selected item,entrepôt Deafault est nécessaire pour l&#39;élément sélectionné
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Deafault warehouse is required for selected item,entrepôt Deafault est nécessaire pour l&#39;élément sélectionné
 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
@@ -1229,23 +1246,23 @@
 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,Appel d&#39;offre Fournisseur
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Hardware,Hardware
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,Hardware
 DocType: Sales Order,Recurring Upto,récurrent Upto
 DocType: Attendance,HR Manager,Responsable du RH
 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 +48,Privilege Leave,Congé Privilège
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,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 +79,You need to enable Shopping Cart,Vous devez activer le panier
 DocType: Payment Entry,Writeoff,Écrire
 DocType: Appraisal Template Goal,Appraisal Template Goal,But du modèle d'évaluation
-DocType: Salary Slip,Earning,Revenus
+DocType: Salary Component,Earning,Revenus
 DocType: Purchase Invoice,Party Account Currency,Compte Parti devise
 ,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 +171,Against Journal Entry {0} is already adjusted against some other voucher,Sur le Journal des entrées {0} est déjà ajusté par un autre bon
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,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/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Ordre Valeur totale
-apps/erpnext/erpnext/demo/setup_data.py +358,Food,Repas
+apps/erpnext/erpnext/demo/setup/setup_data.py +301,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/course_schedule/course_schedule.js +103,Mark Attendence,Mark attendence
@@ -1279,12 +1296,12 @@
 DocType: Sales Order Item,Planned Quantity,Quantité planifiée
 DocType: Purchase Invoice Item,Item Tax Amount,Montant de la Taxe sur l'Article
 DocType: Item,Maintain Stock,Maintenir Stock
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +209,Stock Entries already created for Production Order ,Stock entrées déjà créés pour ordre de fabrication
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,Stock entrées déjà créés pour ordre de fabrication
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,Variation nette de l&#39;actif fixe
 DocType: Leave Control Panel,Leave blank if considered for all designations,Laisser vide si cela est jugé pour toutes les désignations
-apps/erpnext/erpnext/controllers/accounts_controller.py +620,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 +238,Max: {0},Max: {0}
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +15,From Datetime,De l'heure de la date
+apps/erpnext/erpnext/controllers/accounts_controller.py +623,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 +239,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 +153,"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."
@@ -1292,8 +1309,8 @@
 DocType: Sales Invoice,Shipping Address Name,Adresse Nom 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 +552,cannot be greater than 100,ne peut pas être supérieure à 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +680,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 +546,cannot be greater than 100,ne peut pas être supérieure à 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,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é
@@ -1307,10 +1324,9 @@
 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
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Liste de tâches à faire
 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 +61,Apprentice,Apprenti
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +102,Negative Quantity is not allowed,Quantité négative n'est pas autorisée
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,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"
@@ -1332,15 +1348,14 @@
 DocType: Asset,Asset Name,Nom de l&#39;actif
 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 +141,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 +719,Packing Slip,Bordereau de livraison
+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 +713,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/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,Demande de devis peut être l&#39;accès en cliquant sur le lien suivant
 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 +81,Analyst,analyste
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,analyste
 DocType: Item,Inventory,Inventaire
 DocType: Item,Sales Details,Détails ventes
 DocType: Quality Inspection,QI-,Qi-
@@ -1348,7 +1363,7 @@
 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 +103,Government,Gouvernement
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,Gouvernement
 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,Des variantes de l&#39;article
 DocType: Company,Services,Services
@@ -1364,6 +1379,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,Financial Year Start Date,Date de Début de l'exercice financier
 DocType: POS Profile,Apply Discount,Appliquer Discount
 DocType: Employee External Work History,Total Experience,Total Experience
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70,Open Projects,Projets Open
 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
 DocType: Program Course,Program Course,Cours du programme
@@ -1404,12 +1420,12 @@
 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,Plan de Production Ventes Ordre
 DocType: Sales Partner,Sales Partner Target,Objectif
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +110,Accounting Entry for {0} can only be made in currency: {1},Entrée de comptabie pour {0} ne peut être effectué qu'en devise: {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Entrée de comptabie pour {0} ne peut être effectué qu'en devise: {1}
 DocType: Pricing Rule,Pricing Rule,Règle de tarification
 DocType: Budget,Action if Annual Budget Exceeded,Action si le budget annuel Dépassé
 apps/erpnext/erpnext/config/learn.py +202,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 +78,Row # {0}: Returned Item {1} does not exists in {2} {3},Ligne # {0}: article retourné {1} ne existe pas dans {2} {3}
+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
@@ -1418,40 +1434,39 @@
 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/stock/doctype/stock_entry/stock_entry.py +339,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/stock/doctype/stock_entry/stock_entry.py +344,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 +545,Manufacturing Quantity is mandatory,Fabrication Quantité est obligatoire
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Fabrication Quantité est obligatoire
 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 +71,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}
 DocType: Company,Default Holiday List,Liste de vacances par défaut
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +162,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/projects/doctype/timesheet/timesheet.py +186,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
 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,Set 0 pour aucune limite
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,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 +137,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
 DocType: Dependent Task,Dependent Task,Tâche dépendante
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,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/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 +190,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/hr/doctype/leave_application/leave_application.py +197,Leave of type {0} cannot be longer than {1},Les entrées en stocks existent contre entrepôt {0} ne peut pas réaffecter ou modifier Maître Nom '
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Essayez opérations de X jours de la planification à l&#39;avance.
 DocType: HR Settings,Stop Birthday Reminders,Arrêter anniversaire rappels
 DocType: SMS Center,Receiver List,Liste des destinataires
-apps/erpnext/erpnext/accounts/page/pos/pos.js +921,Search Item,Recherche article
+apps/erpnext/erpnext/accounts/page/pos/pos.js +910,Search Item,Recherche 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 +546,Already completed,Déjà terminé
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +22,Payment Request already exists {0},Demande de paiement existe déjà {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +550,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 +241,Quantity must not be more than {0},Quantité ne doit pas être plus de {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Quantity must not be more than {0},Quantité ne doit pas être plus de {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +76,Previous Financial Year is not closed,Précédent Année financière est pas fermé
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +44,Age (Days),Âge (jours)
 DocType: Quotation Item,Quotation Item,Article de la soumission
@@ -1468,7 +1483,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +221,Purchase Receipt {0} is not submitted,Reçu d'achat {0} n'est pas soumis
 DocType: Company,Default Payable Account,Compte de créances fournisseur par défaut
 apps/erpnext/erpnext/config/website.py +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 +83,{0}% Billed,{0}% Facturé
+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
@@ -1480,12 +1495,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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/schools/doctype/fees/fees.js +22,Collect,Collecte
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Collecte
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,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 +225,Asset Movement record {0} created,Mouvement de l&#39;actif enregistrement {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
-DocType: Payment Reconciliation,Payments,Paiements
 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
@@ -1497,7 +1511,7 @@
 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 +9,Procurement,Approvisionnement
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,Aucun des éléments ont tout changement dans la quantité ou la valeur.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,Aucun des éléments ont tout changement dans la quantité ou la valeur.
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +32,Warranty Claim,Déclaration de garantie
 ,Lead Details,Détails du prospect
 DocType: Purchase Invoice,End date of current invoice's period,Date de fin de la période de facturation en cours
@@ -1514,7 +1528,7 @@
 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 +233,"Advance paid against {0} {1} cannot be greater \
-						than Grand Total {2}",Avance versée contre {0} {1} ne peut pas être supérieure \ que Total {2}
+						than Grand Total {2}",L'avance versée pour {0} {1} ne peut être supérieure \ au Total {2}
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Etes-vous sûr de vouloir unstop
 DocType: Territory,Territory Manager,Responsable Régional
 DocType: Packed Item,To Warehouse (Optional),A l'entrepôt (Facultatif)
@@ -1522,7 +1536,7 @@
 DocType: Purchase Invoice,Additional Discount,Remise supplémentaires
 DocType: Selling Settings,Selling Settings,Réglages de vente
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Enchères en ligne
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +97,Please specify either Quantity or Valuation Rate or both,S'il vous plaît spécifier Quantité ou l'évaluation des taux ou à la fois
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,S'il vous plaît spécifier Quantité ou l'évaluation des taux ou à la fois
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +13,Fulfillment,Accomplissement
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Société , le mois et l'année fiscale est obligatoire"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Dépenses de marketing
@@ -1543,14 +1557,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,ERPNext Installation terminée!
 DocType: Item,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +93,A Customer Group exists with same name please change the Customer name or rename the Customer Group,BOM récursivité : {0} ne peut pas être le parent ou l'enfant de {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +126,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
 DocType: Stock Entry,Material Receipt,Réception matériel
 DocType: Homepage,Products,Produits
 DocType: Announcement,Instructor,Instructeur
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},Type de Parti et le Parti est nécessaire pour recevoir / payer compte {0}
 DocType: 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
@@ -1561,7 +1574,7 @@
 ,Item-wise Sales Register,Registre des ventes par items
 DocType: Asset,Gross Purchase Amount,Achat Montant brut
 DocType: Asset,Depreciation Method,Méthode d&#39;amortissement
-apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Offline,Hors ligne
+apps/erpnext/erpnext/accounts/page/pos/pos.js +686,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
@@ -1579,25 +1592,27 @@
 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
 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 +858,Make Purchase Order,Faire un bon de commande
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +852,Make Purchase Order,Faire un bon de commande
 DocType: SMS Center,Send To,Envoyer à
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,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 +148,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
 DocType: Stock Reconciliation,Stock Reconciliation,Stock réconciliation
 DocType: Territory,Territory Name,Nom de la région
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +172,Work-in-Progress Warehouse is required before Submit,L'entrepôt des travaux en cours est nécessaire avant de soumettre
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,Work-in-Progress Warehouse is required before Submit,L'entrepôt des travaux en cours est nécessaire avant de soumettre
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Candidat à un emploi.
 DocType: Purchase Order Item,Warehouse and Reference,Entrepôt et Référence
 DocType: Supplier,Statutory info and other general information about your Supplier,Informations légales et autres informations générales au sujet de votre Fournisseur
-apps/erpnext/erpnext/hooks.py +88,Addresses,Adresses
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Fournisseur&gt; Type de fournisseur
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +212,Against Journal Entry {0} does not have any unmatched {1} entry,Sur le Journal des entrées {0} n'a pas d'entrée {1} non associée
+apps/erpnext/erpnext/hooks.py +95,Addresses,Adresses
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +215,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/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
 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)
 DocType: Sales Order,To Deliver and Bill,A livrer et facturer
@@ -1605,11 +1620,10 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,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 +731,Payment,Paiement
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,Payment,Paiement
 DocType: Production Order Operation,Actual Time and Cost,Temps réel et coût
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Demande de Matériel d'un maximum de {0} peut être faite pour l'article {1} par rapport au bon de commande {2}
 DocType: Employee,Salutation,Titre
-DocType: Pricing Rule,Brand,Marque
 DocType: Course,Course Abbreviation,Abréviation de cours
 DocType: Item,Will also apply for variants,Se appliquera également pour les variantes
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +142,"Asset cannot be cancelled, as it is already {0}","Asset ne peut être annulé, car il est déjà {0}"
@@ -1621,7 +1635,7 @@
 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."
 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 +85,Associate,associé
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Associate,associé
 DocType: Asset Movement,Asset Movement,Mouvement Asset
 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
@@ -1629,7 +1643,7 @@
 DocType: Production Planning Tool,Material Requests,Les demandes de matériel
 DocType: Warranty Claim,Issue Date,Date d&#39;émission
 DocType: Activity Cost,Activity Cost,Coût des Activités
-DocType: Timesheet Detail,Timesheet Detail,Détail Timesheet
+DocType: Sales Invoice Timesheet,Timesheet Detail,Détail Timesheet
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Quantité consommée
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,télécommunications
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indique que le package est une partie de cette livraison (Seuls les projets)
@@ -1652,6 +1666,7 @@
 DocType: Production Plan Material Request,Material Request Date,Date de demande de Matériel
 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
 DocType: Item,Has Variants,A Variantes
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nom de la répartition mensuelle
 DocType: Sales Person,Parent Sales Person,Parent Sales Person
@@ -1664,31 +1679,32 @@
 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 +44,"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/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
 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/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.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +502,Error: {0} &gt; {1},Erreur: {0}&gt; {1}
 DocType: Item,Is Sales Item,Est un article à vendre
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Arborescence de groupe d'article
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Point {0} n'est pas configuré pour maître numéros de série Check Point
 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.
 DocType: Naming Series,Current Value,Valeur actuelle
-apps/erpnext/erpnext/controllers/accounts_controller.py +235,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/controllers/accounts_controller.py +238,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éé
 DocType: Delivery Note Item,Against Sales Order,Sur la commande
 ,Serial No Status,Statut du No de série
 DocType: Payment Entry Reference,Outstanding,Exceptionnel
 ,Daily Timesheet Summary,Sommaire quotidien de Timesheet
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +458,Item table can not be blank,La liste des Articles ne peut être vide
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +443,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 +5,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 +341,Amount {0} {1} deducted against {2},Montant {0} {1} déduite {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +344,Amount {0} {1} deducted against {2},Montant {0} {1} déduite {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
@@ -1703,8 +1719,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +144,Cannot refer row number greater than or equal to current row number for this Charge type,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 +159,Red,Rouge
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +228,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/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}"
 DocType: Account,Frozen,Gelé
 ,Open Production Orders,Commandes ouverte de production
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Montant de base (Société Monnaie)
@@ -1712,7 +1728,7 @@
 DocType: Installation Note,Installation Time,Temps d&#39;installation
 DocType: Sales Invoice,Accounting Details,Détails Comptabilité
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,Supprimer toutes les transactions pour cette Société
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +187,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Ligne # {0}: Opération {1} ne est pas terminée pour {2} Quantité de produits finis en ordre de fabrication # {3}. S'il vous plaît mettre à jour l'état de fonctionnement via Time Logs
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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,Ligne # {0}: Opération {1} ne est pas terminée pour {2} Quantité de produits finis en ordre de fabrication # {3}. S'il vous plaît mettre à jour l'état de fonctionnement via Time Logs
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,Investissements
 DocType: Issue,Resolution Details,Détails de la résolution
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,Allocations
@@ -1748,16 +1764,17 @@
 DocType: Bank Reconciliation Detail,Against Account,Sur le compte
 DocType: Maintenance Schedule Detail,Actual Date,Date Réelle
 DocType: Item,Has Batch No,A lot no
+apps/erpnext/erpnext/public/js/utils.js +114,Annual Billing: {0},Facturation annuelle: {0}
 DocType: Delivery Note,Excise Page Number,Numéro de page d&#39;accise
 DocType: Asset,Purchase Date,date d&#39;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}
 ,Maintenance Schedules,Programmes d&#39;entretien
 DocType: Task,Actual End Date (via Time Sheet),Date réelle de fin (via la feuille de temps)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Amount {0} {1} against {2} {3},Montant {0} {1} contre {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +339,Amount {0} {1} against {2} {3},Montant {0} {1} contre {2} {3}
 ,Quotation Trends,Soumission Tendances
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},Le groupe d'articles ne sont pas mentionnés dans le maître de l'article pour l'article {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +295,Debit To account must be a Receivable account,Débit Pour compte doit être un compte à recevoir
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Receivable account,Débit Pour compte doit être un compte à recevoir
 DocType: Shipping Rule Condition,Shipping Amount,Montant de livraison
 ,Pending Amount,Montant en attente
 DocType: Purchase Invoice Item,Conversion Factor,Facteur de conversion
@@ -1765,10 +1782,10 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +137,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 +90,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
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +93,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 +22,Enter Paid Amount,Entrez Montant payé
+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
@@ -1778,13 +1795,15 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,Timesheets
 DocType: HR Settings,HR Settings,Paramètrages RH
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Expense Claim is pending approval. Only the Expense Approver can update status.,La note de frais est en attente d'approbation. Seul l'approbateur des frais peut mettre à jour le statut.
+DocType: Email Digest,New Expenses,Nouvelles dépenses
 DocType: Purchase Invoice,Additional Discount Amount,Montant de réduction supplémentaire
-apps/erpnext/erpnext/controllers/accounts_controller.py +524,"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."
+apps/erpnext/erpnext/controllers/accounts_controller.py +527,"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 +249,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/stock/get_item_details.py +123,Please specify Company,S'il vous plaît préciser la société
 ,Customer Acquisition and Loyalty,Acquisition et fidélisation client
@@ -1795,17 +1814,19 @@
 apps/erpnext/erpnext/projects/doctype/task/task.js +26,Expense Claims,Notes de Frais
 DocType: Issue,Support,Support
 ,BOM Search,BOM Recherche
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Closing (Opening + Totals),Fermeture (ouverture + totaux)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),Fermeture (ouverture + totaux)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,S'il vous plaît spécifier la devise de 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/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Suite à des demandes importantes ont été soulevées automatiquement en fonction du niveau de re-commande de l&#39;article
-apps/erpnext/erpnext/controllers/accounts_controller.py +272,Account {0} is invalid. Account Currency must be {1},Le compte {0} est invalide. La devise du compte doit être {1}
+DocType: Email Digest,Pending Sales Orders,Dans l&#39;attente des commandes clients
+apps/erpnext/erpnext/controllers/accounts_controller.py +275,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 +956,"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"
-DocType: Salary Slip,Deduction,Déduction
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +87,Row {0}: From Time and To Time is mandatory.,Row {0}: From Time To Time et est obligatoire.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +969,"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"
+DocType: Salary Component,Deduction,Déduction
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +111,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/stock/get_item_details.py +262,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 +7,Please enter Employee Id of this sales person,S&#39;il vous plaît entrer Employee ID de cette personne de ventes
@@ -1813,7 +1834,7 @@
 DocType: Project,% Tasks Completed,% des tâches terminées
 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 +194,Please enter Production Item first,S'il vous plaît entrer en production l'article premier
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +195,Please enter Production Item first,S'il vous plaît entrer en production l'article 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é
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Devis
@@ -1822,53 +1843,54 @@
 DocType: Maintenance Visit,Maintenance User,Maintenance utilisateur
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +149,Cost Updated,Mise à jour coût
 DocType: Employee,Date of Birth,Date de naissance
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +86,Item {0} has already been returned,Nouveau Stock UDM doit être différent de stock actuel Emballage
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +123,Item {0} has already been returned,Nouveau Stock UDM doit être différent de stock actuel Emballage
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Exercice ** représente un exercice. Toutes les écritures comptables et autres transactions majeures sont suivis dans ** Exercice **.
 DocType: Opportunity,Customer / Lead Address,Adresse Client / Prospect
 apps/erpnext/erpnext/stock/doctype/item/item.py +208,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 +177,Job Description,Description de l'emplois
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,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 +126,"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 +127,"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."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +24,Welcome to POS: Create your POS Profile,Bienvenue sur POS: Créez votre profil POS
 DocType: Expense Claim,Approver,Approbateur
 ,SO Qty,SO Quantité
+DocType: Guardian,Work Address,Adresse de travail
 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 +191,Serial No {0} is under warranty upto {1},No de Série {0} est sous garantie jusqu'au {1}
+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 +74,Shipments,Livraisons
+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
 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 +153,Row # ,Rangée #
+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 +156,Get From,Obtenez De
+apps/erpnext/erpnext/public/js/utils.js +167,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 +167,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 +416,"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"
+apps/erpnext/erpnext/controllers/accounts_controller.py +419,"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
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} is disabled,Utilisateur {0} est désactivé
 DocType: Leave Application,Total Leave Days,Total des jours de congé
 DocType: Email Digest,Note: Email will not be sent to disabled users,Remarque: 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é ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Laisser vide si cela est jugé pour tous les ministères
 apps/erpnext/erpnext/config/hr.py +171,"Types of employment (permanent, contract, intern etc.).","Types d'emploi ( , contrat permanent, stagiaire , etc. ) ."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +346,{0} is mandatory for Item {1},{0} est obligatoire pour l'objet {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,{0} is mandatory for Item {1},{0} est obligatoire pour l'objet {1}
 DocType: Currency Exchange,From Currency,De la devise
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","S'il vous plaît sélectionnez Montant alloué, type de facture et numéro de facture dans atleast une rangée"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,Coût du Nouvel achat
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},Commande requis pour objet {0}
 DocType: Purchase Invoice Item,Rate (Company Currency),Prix (Monnaie de la société)
-apps/erpnext/erpnext/demo/setup_data.py +360,Others,autres
+DocType: Student Guardian,Others,autres
 DocType: Payment Entry,Unallocated Amount,Montant Unallocated
 apps/erpnext/erpnext/templates/includes/product_page.js +65,Cannot find a matching Item. Please select some other value for {0}.,Impossible de trouver un article similaire. S'il vous plaît sélectionner une autre valeur pour {0}.
 DocType: POS Profile,Taxes and Charges,Impôts et taxes
@@ -1888,17 +1910,16 @@
 apps/erpnext/erpnext/config/stock.py +304,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/accounts/report/item_wise_sales_register/item_wise_sales_register.py +54,Receivable Account,Compte à recevoir
-apps/erpnext/erpnext/controllers/accounts_controller.py +546,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} est déjà {2}
+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 +549,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 +79,CEO,PDG
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,PDG
 DocType: Expense Claim Detail,Expense Claim Detail,Détail Note de Frais
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +808,Please select correct account,S&#39;il vous plaît sélectionnez compte correct
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +809,Please select correct account,S&#39;il vous plaît sélectionnez compte correct
 DocType: Item,Weight UOM,Poids Emballage
 DocType: Salary Structure Employee,Salary Structure Employee,Structure des salaires des employés
 DocType: Employee,Blood Group,Groupe sanguin
-DocType: Purchase Invoice Item,Page Break,Saut de page
 DocType: Production Order Operation,Pending,En attente
 DocType: Course,Course Name,Nom du cours
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Les utilisateurs qui peuvent approuver les demandes de congé d'un employé en particulier
@@ -1907,14 +1928,15 @@
 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 +54,Full-time,À plein temps
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Full-time,À plein temps
 DocType: Salary Structure,Employees,Des 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: 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
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Debit To is required,Débit Pour est nécessaire
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +321,Debit To is required,Débit Pour est nécessaire
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Liste prix d'achat
 DocType: Offer Letter Term,Offer Term,Offre à terme
 DocType: Quality Inspection,Quality Manager,Responsable Qualité
@@ -1922,28 +1944,28 @@
 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/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: Timesheet Detail,To Time,To Time
+DocType: Timesheet Detail,To Time,Horaire de fin
 DocType: Authorization Rule,Approving Role (above authorized value),Approuver Rôle (valeur autorisée ci-dessus)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,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 +241,BOM recursion: {0} cannot be parent or child of {2},S'il vous plaît entrer une adresse valide Id
 DocType: Production Order Operation,Completed Qty,Quantité complétée
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"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 +273,Price List {0} is disabled,Liste des prix  {0} est désactivée
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +99,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/projects/doctype/timesheet/timesheet.py +123,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
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Numéros de Série requis pour objet {1}. Vous avez fourni {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Valorisation Taux actuel
 DocType: Item,Customer Item Codes,Codes article du client
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,Gain de change / Perte
 DocType: Opportunity,Lost Reason,Raison perdu
-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/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/purchase_receipt/purchase_receipt.py +378,All items have already been invoiced,Tous les articles ont déjà été facturés
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +379,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"
 DocType: Project,External,Externe
@@ -1959,18 +1981,19 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Vos clients
 apps/erpnext/erpnext/projects/doctype/project/project.py +141,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/templates/generators/job_opening.html +19,Apply Now,Appliquer maintenant
+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,Évaluation Code de groupe
 ,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 ."
 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
-apps/erpnext/erpnext/utilities/doctype/address/address.py +164,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: Fee Structure,Fee Structure,Structure de frais
 DocType: Timesheet Detail,Costing Amount,Montant des coûts
+DocType: Student Admission,Application Fee,Frais d&#39;inscription
 DocType: Process Payroll,Submit Salary Slip,Envoyer le bulletin de salaire
-apps/erpnext/erpnext/controllers/selling_controller.py +161,Maxiumm discount for Item {0} is {1}%,Remise maximum pour l'article {0} est de {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,Remise maximum pour l'article {0} est de {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Importer en masse
 DocType: Sales Partner,Address & Contacts,Adresse & Coordonnées
 DocType: SMS Log,Sender Name,Nom de l&#39;expéditeur
@@ -1995,21 +2018,21 @@
 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_data.py +361,Travel,Déplacement
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +155,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 +304,Travel,Déplacement
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +167,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 +23,Update Cost,Mettre à jour le coût
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,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 +36,Show Salary Slip,Slip Show Salaire
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +748,Transfer Material,transfert de matériel
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +53,Show Salary Slip,Slip Show Salaire
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +166,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 +923,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 +646,Select change amount account,Sélectionnez compte du changement montant
+apps/erpnext/erpnext/public/js/controllers/transaction.js +914,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 +703,Select change amount account,Sélectionnez compte du changement montant
 DocType: Purchase Invoice,Price List Currency,Devise Prix
 DocType: Naming Series,User must always select,L&#39;utilisateur doit toujours sélectionner
 DocType: Stock Settings,Allow Negative Stock,Autoriser un stock négatif
@@ -2021,31 +2044,32 @@
 DocType: Quality Inspection,Verified By,Vérifié par
 DocType: Address,Subsidiary,Filiale
 apps/erpnext/erpnext/setup/doctype/company/company.py +64,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","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: Quality Inspection,Purchase Receipt No,Quittance d'achat No
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Arrhes
 DocType: Process Payroll,Create Salary Slip,Créer bulletin de salaire
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +33,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 +352,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}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,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: Appraisal,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 +217,{0} {1} is fully billed,{0} {1} est entièrement facturé
 DocType: Workstation Working Hour,End Time,Heure de fin
 DocType: Payment Entry,Payment Deductions or Loss,Déductions de paiement ou perte
-apps/erpnext/erpnext/config/schools.py +100,LMS,LMS
+apps/erpnext/erpnext/config/schools.py +104,LMS,LMS
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Date prévue d'achèvement ne peut pas être inférieure à projet Date de début
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,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
-DocType: Sales Invoice,Mass Mailing,Envoi en masse
+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 +199,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},Divulgué BOM {0} ne existe pas pour objet {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 +297,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 +111,Pharmaceutical,pharmaceutique
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +309,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/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Coût des articles achetés
 DocType: Selling Settings,Sales Order Required,Commande obligatoire
 DocType: Purchase Invoice,Credit To,Crédit Pour
@@ -2060,27 +2084,28 @@
 DocType: Upload Attendance,Attendance To Date,La participation à ce jour
 DocType: Warranty Claim,Raised By,Raised By
 DocType: Payment Gateway Account,Payment Account,Compte de paiement
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +814,Please specify Company to proceed,Veuillez indiquer la société pour continuer
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +793,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 +44,Compensatory Off,Congé compensatoire
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,Congé compensatoire
 DocType: Quality Inspection Reading,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.
 DocType: Room,Room Number,Numéro de la chambre
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Référence non valide {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +161,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ne peut pas être supérieure à quanitity prévu ({2}) dans la commande de fabrication {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +162,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ne peut pas être supérieure à quanitity prévu ({2}) dans la commande de fabrication {3}
 DocType: Shipping Rule,Shipping Rule Label,Livraison règle étiquette
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Forum de l&#39;utilisateur
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +217,Raw Materials cannot be blank.,Matières premières ne peuvent pas être vide.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,"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 +460,Quick Journal Entry,Entrée rapide dans le journal
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +111,You can not change rate if BOM mentioned agianst any item,Vous ne pouvez pas modifier le taux si BOM mentionné agianst un article
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +441,"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 +450,Quick Journal Entry,Entrée rapide dans le journal
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +103,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 +214,{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
 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.
@@ -2089,16 +2114,17 @@
 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 +398,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 +739,Item or Warehouse for row {0} does not match Material Request,Une autre entrée de clôture de la période {0} a été faite après {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +747,Item or Warehouse for row {0} does not match Material Request,Une autre entrée de clôture de la période {0} a été faite après {1}
 apps/erpnext/erpnext/config/stock.py +184,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: Lead,Opportunity,Occasion
+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
@@ -2111,7 +2137,7 @@
 DocType: Student,Joining Date,Date d&#39;inscription
 ,Employees working on a holiday,Les employés qui travaillent un jour férié
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Marquer présent
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},Entretien date de début ne peut pas être avant la date de livraison pour série n ° {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},Entretien date de début ne peut pas être avant la date de livraison pour série n ° {0}
 DocType: Production Order,Actual End Date,Date de fin réelle
 DocType: Purchase Invoice,PINV-,PINV-
 DocType: Authorization Rule,Applicable To (Role),Applicable à (Rôle)
@@ -2126,7 +2152,7 @@
 DocType: SMS Log,No of Requested SMS,Nombre de SMS demandés
 DocType: Campaign,Campaign-.####,Campagne-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Prochaines étapes
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,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/buying/doctype/request_for_quotation/request_for_quotation.js +695,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 +117,Contract End Date must be greater than Date of Joining,La date de fin de contrat doit être supérieure à la date d'embauche
 DocType: Delivery Note,DN-,DN-
@@ -2135,7 +2161,7 @@
 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 +14,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/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
 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.
 
@@ -2145,7 +2171,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).
@@ -2157,19 +2183,19 @@
 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.","Modèle de la taxe standard qui peut être appliqué à toutes les opérations d'achat. Ce modèle peut contenir la liste des chefs d'impôt ainsi que d'autres chefs de dépenses comme ""Expédition"", ""assurance"", ""Manipulation"", etc. 
+10. Add or Deduct: Whether you want to add or deduct the tax.","Modèle de la taxe standard qui peut être appliqué à toutes les opérations d'achat. Ce modèle peut contenir la liste des chefs d'impôt ainsi que d'autres chefs de dépenses comme ""Expédition"", ""assurance"", ""Manipulation"", etc.
 
- #### Remarque 
+ #### Remarque
 
  Le taux d'imposition que vous définissez ici sera le taux d'imposition standard pour tous les articles ** **. Se il ya ** ** Articles qui ont des taux différents, ils doivent être ajoutés dans le ** Impôt de l'article ** ** table dans le Point ** maître.
 
- #### Description des colonnes 
+ #### Description des colonnes
 
- 1. Type de calcul: 
+ 1. Type de calcul:
  - Cela peut être le ** Net Total ** (ce est la somme de montant de base).
  - ** Sur Rang Précédent Total / Montant ** (pour les taxes ou frais cumulatifs). Si vous sélectionnez cette option, la taxe sera appliquée en pourcentage de la rangée précédente (dans la table d'impôt) montant ou totale.
  - ** ** Réelles (comme mentionné).
- 2. Compte chef: Le grand livre de compte en vertu de laquelle cette taxe sera réservé 
+ 2. Compte chef: Le grand livre de compte en vertu de laquelle cette taxe sera réservé
  3. Centre de Coût: Si la taxe / redevance est un revenu (comme le transport) ou dépenses qu'elle doit être réservé contre un centre de coûts.
  4. Description: Description de la taxe (qui sera imprimée sur les factures / guillemets).
  5. Taux: Le taux d'imposition.
@@ -2182,13 +2208,14 @@
 DocType: Purchase Receipt Item,Recd Quantity,Quantité reçue
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +54,Fee Records Created - {0},Records Fee Créé - {0}
 DocType: Asset Category Account,Asset Category Account,Catégorie d&#39;actif compte
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +103,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 +504,Stock Entry {0} is not submitted,Entrée stock {0} est pas soumis
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,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 +505,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: Salary Component Account,Salary Component Account,Compte Composant Salaire
 DocType: Global Defaults,Hide Currency Symbol,Masquer le symbole monétaire
 apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card","Ex. Cash, Banque, Carte de crédit"
+DocType: Lead Source,Source Name,Nom de la source
 DocType: Journal Entry,Credit Note,Note de crédit
 DocType: Warranty Claim,Service Address,Adresse du service
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furnitures and Fixtures,Meubles et Luminaires
@@ -2200,6 +2227,7 @@
 DocType: Opportunity,Customer / Lead Name,Nom du Client / Prospect
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +89,Clearance Date not mentioned,"Désignation des employés (par exemple de chef de la direction , directeur , etc.)"
 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/controllers/trends.py +19,Total(Qty),Total(Qté)
 DocType: Sales Invoice,This Document,Ce document
@@ -2211,15 +2239,15 @@
 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 +176,Organization branch master.,Organisation principale des branches.
-apps/erpnext/erpnext/controllers/accounts_controller.py +273, or ,ou
+apps/erpnext/erpnext/controllers/accounts_controller.py +276, 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
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,Services publics
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-dessus
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +203,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
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +206,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 +90,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 +93,No employee for the above selected criteria OR salary slip already created,Aucun employé pour les critères ci-dessus sélectionnés ou fiche de salaire déjà créé
 DocType: Notification Control,Sales Order Message,Message de commande client
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Valeurs par défaut comme : Societé, Devise, Année financière en cours, etc..."
 DocType: Payment Entry,Payment Type,Type de paiement
@@ -2247,8 +2275,8 @@
 DocType: Product Bundle,Parent Item,Article Parent
 DocType: Account,Account Type,Type de compte
 DocType: Delivery Note,DN-RET-,DN-RET-
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +115,Leave Type {0} cannot be carry-forwarded,Laissez type {0} ne peut pas être transmis carry-
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Programme d'entretien n'est pas créer pour tous les articles. S'il vous plait clickez sur 'Créer un programme'
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +118,Leave Type {0} cannot be carry-forwarded,Laissez type {0} ne peut pas être transmis 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',Programme d'entretien n'est pas créer pour tous les articles. S'il vous plait clickez sur 'Créer un programme'
 ,To Produce,A Produire
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Paie
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +163,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Pour la ligne {0} dans {1}. Pour inclure {2} dans le prix de l&#39;article, les lignes {3} doivent également être inclus"
@@ -2260,13 +2288,13 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +32,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 +748,Delivery,Livraison
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +742,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
 DocType: Payment Entry,Total Allocated Amount,Montant total alloué
 DocType: Item Reorder,Material Request Type,Type de demande de matériel
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +82,Row {0}: UOM Conversion Factor is mandatory,Row {0}: Facteur de conversion UOM est obligatoire
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +79,Row {0}: UOM Conversion Factor is mandatory,Row {0}: Facteur de conversion UOM est obligatoire
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Réf
 DocType: Budget,Cost Center,Centre de coûts
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Bon #
@@ -2277,13 +2305,13 @@
 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 +90,Head of Marketing and Sales,Responsable du marketing et des ventes
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Impôt sur le revenu
+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 +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
 DocType: Item Supplier,Item Supplier,Fournisseur de l'article
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +403,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 +770,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 +397,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 +764,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é"
@@ -2295,28 +2323,29 @@
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,En rupture
 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 +100,Issues,Questions
+apps/erpnext/erpnext/hooks.py +109,Issues,Questions
 apps/erpnext/erpnext/controllers/status_updater.py +13,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é
 DocType: Supplier,Billing Currency,Devise de facturation
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Large,Extra Large
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Extra Large,Extra Large
 ,Profit and Loss Statement,Compte de résultat
 DocType: Bank Reconciliation Detail,Cheque Number,Numéro de chèque
 ,Sales Browser,Exceptionnelle pour {0} ne peut pas être inférieur à zéro ( {1} )
 DocType: Journal Entry,Total Credit,Crédit total
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +507,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 +107,Local,Locale
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +508,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/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 +154,Large,Grand
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Large,Grand
 DocType: Homepage Featured Product,Homepage Featured Product,Page d&#39;accueil Produit vedette
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Nouveau Entrepôt Nom
-apps/erpnext/erpnext/accounts/report/financial_statements.py +225,Total {0} ({1}),Total {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +224,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
@@ -2360,7 +2389,7 @@
 1. Ways of addressing disputes, indemnity, liability, etc.
 1. Address and Contact of your Company.","Conditions d'utilisation standard qui peuvent être ajoutés aux ventes et achats.
 
- Exemples: 
+ Exemples:
 
  1. Validité de l'offre.
  1. Conditions de paiement (à l'avance, à crédit, une partie avance etc).
@@ -2369,14 +2398,14 @@
  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. Façons de différends adressage, indemnisation, la responsabilité, etc.
  1. Adresse et contact de votre société."
 DocType: Attendance,Leave Type,Type de Congé
 apps/erpnext/erpnext/controllers/stock_controller.py +173,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/hr/doctype/salary_slip/salary_slip.py +79,Name error: {0},error Nom: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +90,Name error: {0},error 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 +178,{0} {1} does not associated with {2} {3},{0} {1} n&#39;a pas associée à {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +181,{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é
 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
@@ -2395,7 +2424,7 @@
 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
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,Au moins un article doit être saisi avec quantité négative dans le document de retour
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Atleast one item should be entered with negative quantity in return document,Au moins un article doit être saisi avec quantité négative dans le document de retour
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Opération {0} plus longtemps que les heures de travail disponibles dans poste de travail {1}, briser l&#39;opération en plusieurs opérations"
 ,Requested,demandé
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +83,No Remarks,Pas de remarques
@@ -2407,46 +2436,46 @@
 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/stock/doctype/purchase_receipt/purchase_receipt.py +98,Quality Inspection required for Item {0},Inspection de la qualité requise pour l'article {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,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
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Gérer l’arborescence des régions.
 DocType: Journal Entry Account,Sales Invoice,Facture de vente
 DocType: Journal Entry Account,Party Balance,Solde Parti
-apps/erpnext/erpnext/accounts/page/pos/pos.js +475,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 +92,Salary Slip Created,Bulletin de salaire Créé
+apps/erpnext/erpnext/accounts/page/pos/pos.js +464,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 +95,Salary Slip Created,Bulletin de salaire Créé
 DocType: Company,Default Receivable Account,Compte de créances clients par défaut
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Créer une entrée de la Banque pour le salaire total payé pour les critères ci-dessus sélectionnés
 DocType: Stock Entry,Material Transfer for Manufacture,Transfert de matériel pour Fabrication
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,Pourcentage de réduction peut être appliquée contre une liste de prix ou pour toute liste de prix.
 DocType: Purchase Invoice,Half-yearly,Semestriel
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +384,Accounting Entry for Stock,Entrée comptable pour Stock
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +387,Accounting Entry for Stock,Entrée comptable pour Stock
 DocType: Sales Invoice,Sales Team1,Ventes Equipe1
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,Item {0} does not exist,Article {0} n'existe pas
 DocType: Attendance Tool Student,Attendance Tool Student,Participation à outils des élèves
 DocType: Sales Invoice,Customer Address,Adresse du client
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +96,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 +120,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
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +88,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/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
 DocType: Item Group,Show this slideshow at the top of the page,Voir ce diaporama en haut de la page
 DocType: BOM,Item UOM,Article Emballage
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Montant de la taxe Après Montant de la remise (Société devise)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +147,Target warehouse is mandatory for row {0},Entrepôt cible est obligatoire pour la ligne {0}
+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 Fournisseur Adresse
 DocType: Quality Inspection,Quality Inspection,Inspection de la Qualité
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Extra Small,Très Petit
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +194,Account {0} is frozen,Le compte {0} est gelé
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Très Petit
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +690,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 +197,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 +606,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 +126,Commission rate cannot be greater than 100,Taux de commission ne peut pas être supérieure à 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +609,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 +127,Commission rate cannot be greater than 100,Taux de commission ne peut pas être supérieure à 100
 DocType: Stock Entry,Subcontract,Sous-traiter
 apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,S'il vous plaît entrer {0} en premier
 DocType: Production Order Operation,Actual End Time,Fin du temps réel
@@ -2457,30 +2486,30 @@
 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 +158,Colour,Couleur
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,Couleur
 DocType: Maintenance Visit,Scheduled,Prévu
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Demande de devis.
 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
 DocType: Student Log,Academic,Académique
-apps/erpnext/erpnext/controllers/accounts_controller.py +469,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Avance totale ({0}) contre l&#39;ordonnance {1} ne peut pas être supérieure à la Grand total ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +472,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Avance totale ({0}) contre l&#39;ordonnance {1} ne peut pas être supérieure à la Grand total ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Sélectionnez une répartition mensuelle afin de repartir l'objectif.
 DocType: Purchase Invoice Item,Valuation Rate,Taux de valorisation
+DocType: Stock Reconciliation,SR/,SR /
 apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,Liste des Prix devise sélectionné
 DocType: Assessment,Results,Résultats
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +168,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 +175,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,Renommez identifiez-vous
-DocType: Student Applicant,Father's/ Guardian 2 Email ID,/ Guardian 2 Email ID Père
 DocType: Maintenance Visit Purpose,Against Document No,Sur le document n °
 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 +228,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 +231,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 +93,Researcher,chercheur
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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.
@@ -2492,25 +2521,25 @@
 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: Sales Invoice,Advertisement,Publicité
 DocType: Asset Category Account,Depreciation Expense Account,Compte Amortissement des frais
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Probationary Period,Période De Probation
-apps/erpnext/erpnext/hooks.py +102,Announcements,Annonces
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Période De Probation
+apps/erpnext/erpnext/hooks.py +111,Announcements,Annonces
 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 +109,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,Article reçu d&#39;achat fournis
 DocType: Payment Entry,Pay,Payer
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +16,To Datetime,Pour La date du
+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/scheduling_tool/scheduling_tool.py +51,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/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Activités en attente
+DocType: Accounts Settings,Make Payment via Journal Entry,Effectuer un paiement via Journal Entry
+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 +127,Please enter relieving date.,Type de partie de Parent
-apps/erpnext/erpnext/controllers/trends.py +145,Amt,Amt
+apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,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 +26,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
@@ -2528,14 +2557,15 @@
 apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1},Impossible de trouver le taux de change pour {0} à {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Marquer demi-journée
 DocType: Sales Invoice,Sales Team,Équipe des ventes
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Duplicate entry,dupliquer entrée
+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 +490,[Error],[Erreur]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +484,[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é
 apps/erpnext/erpnext/controllers/status_updater.py +175,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.
 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
@@ -2551,22 +2581,22 @@
 ,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 +25,All Jobs,Tous les emplois
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,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
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Amount {0} {1} {2} {3},Montant {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Amount {0} {1} {2} {3},Montant {0} {1} {2} {3}
 DocType: Account,Depreciation,Actifs d'impôt
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Fournisseur (s)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Outils gestion de présence des employés
 DocType: Supplier,Credit Limit,Limite de crédit
 DocType: Production Plan Sales Order,Salse Order Date,Salse Date de commande
 DocType: Salary Component,Salary Component,Composant Salaire
-apps/erpnext/erpnext/accounts/utils.py +372,Payment Entries {0} are un-linked,Entrées de paiement {0} sont non liés
+apps/erpnext/erpnext/accounts/utils.py +449,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
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +497,Material Requests {0} created,Les demandes matérielles {0} créés
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +498,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.
 DocType: Purchase Invoice,Address and Contact,Adresse et contact
@@ -2577,7 +2607,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","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/schools/doctype/program/program.js +9,Student Applicant,demandeur étudiant
-DocType: Asset Category Account,Accumulated Depreciation Account,Compte Amortissement cumulé
+DocType: Asset Category Account,Accumulated Depreciation Account,Compte d'amortissements cumulé
 DocType: Stock Settings,Freeze Stock Entries,Geler entrées en stocks
 DocType: Asset,Expected Value After Useful Life,Valeur attendue Après la vie utile
 DocType: Item,Reorder level based on Warehouse,Niveau de réapprovisionnement basée sur Entrepôt
@@ -2605,7 +2635,7 @@
 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 +848,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 +859,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 +233,Closing (Dr),Fermeture (Dr)
 DocType: Cheque Print Template,Cheque Size,Chèque Taille
@@ -2626,7 +2656,8 @@
 ,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.
-apps/erpnext/erpnext/controllers/accounts_controller.py +555,'Update Stock' cannot be checked for fixed asset sale,«Mise à jour Stock» ne peut pas être vérifiée à la vente d&#39;immobilisations
+DocType: Student Guardian,Father,Père
+apps/erpnext/erpnext/controllers/accounts_controller.py +558,'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/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é
@@ -2636,15 +2667,15 @@
 DocType: Sales Order,Fully Delivered,Entièrement Livré
 DocType: Lead,Lower Income,Revenu bas
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","Le compte tête sous la responsabilité , dans lequel Bénéfice / perte sera comptabilisée"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +166,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 +238,"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 +81,Purchase Order number required for Item {0},Vous ne pouvez pas reporter {0}
+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/purchase_receipt/purchase_receipt.py +82,Purchase Order number required for Item {0},Vous ne pouvez pas reporter {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','La date due' doit être antérieure à la 'Date'
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +17,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}
+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}
 DocType: Timesheet,"List of employee which has ""Salary Slip Based on Timesheet"" is enabled in salary structure.",Liste des employés qui a &quot;Slip Salaire Basé sur Timesheet&quot; est activé dans la structure salariale.
 DocType: Asset,Fully Depreciated,entièrement dépréciées
 ,Stock Projected Qty,Stock projeté Quantité
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Customer {0} does not belong to project {1},S'il vous plaît définir la valeur par défaut {0} dans Société {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,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
@@ -2656,7 +2687,7 @@
 DocType: Purchase Invoice,Purchase Taxes and Charges,Impôts achat et les frais
 ,Qty to Receive,Quantité à recevoir
 DocType: Leave Block List,Leave Block List Allowed,Laisser Block List admis
-apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +55,All Warehouses,Tous les entrepôts
+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 +105,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
@@ -2668,10 +2699,10 @@
 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/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Faire fiche de salaire
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +26,Browse BOM,Parcourir BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Parcourir BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,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 Year,Academic Year,Année Académique
+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
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,Évaluation
@@ -2679,12 +2710,12 @@
 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 +197,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 +204,Leave approver must be one of {0},Approbateur d'absence doit être un de {0}
 DocType: Hub Settings,Seller Email,Vendeur Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Coût d&#39;achat total (via la facture d&#39;achat)
 DocType: Workstation Working Hour,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 +256,Select Quantity,Choisir Quantité
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +257,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/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é
@@ -2701,6 +2732,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Soit Qté ou le montant cible est obligatoire
 apps/erpnext/erpnext/config/projects.py +45,Cost of various activities,Coût des différents types d'activités.
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","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 +149,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}
 DocType: Item,Inspection Required,Inspection obligatoire
@@ -2720,7 +2752,7 @@
 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 +138,Wire Transfer,Virement
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,Virement
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Cochez tous
 DocType: Sales Order,Recurring Order,Ordre récurrent
 DocType: Company,Default Income Account,Compte d'exploitation
@@ -2732,21 +2764,19 @@
 ,Welcome to ERPNext,Bienvenue à ERPNext
 apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,Délai pour l'offre
 DocType: Lead,From Customer,Du client
-apps/erpnext/erpnext/demo/setup_data.py +357,Calls,appels
+apps/erpnext/erpnext/demo/setup/setup_data.py +300,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/stock/doctype/item/item.py +466,"As there are existing transactions for this item, \
-							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Comme il y a des transactions existantes pour cet article, \ vous ne pouvez pas modifier les valeurs de &#39;A Pas de série »,« A lot No »,« Est-Stock Item »et« Méthode d&#39;évaluation »"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,Purchase Order {0} is not submitted,Bon de commande {0} est pas soumis
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,Projection
 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 +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Remarque : Le système ne vérifie pas sur - livraison et la sur- réservation pour objet {0} que la quantité ou le montant est égal à 0
 DocType: Notification Control,Quotation Message,Message du devis
 DocType: Issue,Opening Date,Date d&#39;ouverture
-apps/erpnext/erpnext/schools/api.py +58,Attendance has been marked successfully.,La fréquentation a été marquée avec succès.
+apps/erpnext/erpnext/schools/api.py +57,Attendance has been marked successfully.,La fréquentation 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 +136,Account Type for {0} must be {1},Type de compte pour {0} doit être {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +139,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
@@ -2757,16 +2787,17 @@
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,S'il vous plaît tirer des articles de livraison Note
 DocType: Purchase Invoice,Return Against Purchase Invoice,Retour contre la facture d&#39;achat
 DocType: Item,Warranty Period (in days),Période de garantie (en jours)
-apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +40,Acutal qty in stock,qté acutal en stock
+apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +40,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/stock/report/bom_search/bom_search.js +26,Item 4,Article 4
+DocType: Student Admission,Admission End Date,Admission Date de fin
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +20,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 +1190,Please select customer,S&#39;il vous plaît sélectionner client
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1193,Please select customer,S&#39;il vous plaît sélectionner client
 DocType: C-Form,I,I
 DocType: Company,Asset Depreciation Cost Center,Asset Centre Amortissements
 DocType: Sales Order Item,Sales Order Date,Date du bon de Commande
@@ -2776,6 +2807,7 @@
 ,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 +50,Missing Currency Exchange Rates for {0},Taux de change Manquant pour {0}
 DocType: Assessment,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-
@@ -2793,11 +2825,12 @@
 DocType: Journal Entry,JV-,JV
 DocType: Topic,Topic Name,Nom de la rubrique
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Au moins une vente ou achat doit être sélectionné
+DocType: Grading Structure,Grade Intervals,intervalles Etat
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Sélectionnez la nature de votre entreprise.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Lorsque les opérations de fabrication sont réalisées.
 DocType: Asset Movement,Source Warehouse,Entrepôt source
 DocType: Installation Note,Installation Date,Date d&#39;installation
-apps/erpnext/erpnext/controllers/accounts_controller.py +534,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} ne fait pas partie à la société {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +537,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
@@ -2811,28 +2844,31 @@
 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 +111,Date Of Retirement must be greater than Date of Joining,La date de départ en retraite doit être supérieure à date d'embauche
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +49,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 +87,{0}% Delivered,{0}% Livré
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% Livré
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Point {0}: Quantité commandée {1} ne peut pas être inférieure à commande minimum qté {2} (défini au point).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,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 +379,Please set default {0} in Company {1},S&#39;il vous plaît définir par défaut {0} dans l&#39;entreprise {1}
+apps/erpnext/erpnext/accounts/utils.py +456,Please set default {0} in Company {1},S&#39;il vous plaît définir par défaut {0} dans l&#39;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,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 brut / perte
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Point de commande 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..
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Titres pour les modèles d'impression par exemple Facture proforma.
+DocType: Student Guardian,Student Guardian,Gardien étudiant
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +184,Valuation type charges can not marked as Inclusive,Frais de type valorisation ne peuvent pas marqué comme inclusive
 DocType: POS Profile,Update Stock,Mettre à jour le Stock
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Différents Emballage des articles mènera à incorrects (Total ) Valeur de poids . Assurez-vous que poids net de chaque article se trouve dans la même unité de mesure .
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Taux BOM
 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 +349,Journal Entries {0} are un-linked,Entrées du journal {0} ne sont pas liées
+apps/erpnext/erpnext/accounts/utils.py +426,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é
@@ -2856,6 +2892,7 @@
 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
+DocType: Homepage,"URL for ""All Products""",URL &quot;Tous les produits&quot;
 DocType: Leave Application,Leave Balance Before Application,Laisser Solde Avant d&#39;application
 DocType: SMS Center,Send SMS,Envoyer un SMS
 DocType: Cheque Print Template,Width of amount in word,Largeur du montant en parole
@@ -2864,7 +2901,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 +29,Current Job Openings,Possibilités d&#39;emploi actuelles
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,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
@@ -2877,7 +2914,7 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Fournisseur fournit 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,Prochaine date doit être supérieure à Date de publication
-apps/erpnext/erpnext/public/js/controllers/transaction.js +850,Show tax break-up,Afficher impôt rupture
+apps/erpnext/erpnext/public/js/controllers/transaction.js +841,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/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"
@@ -2887,10 +2924,11 @@
 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 +534,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 +80,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 +162,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/selling/doctype/customer/customer.py +195,Please contact to the user who have Sales Master Manager {0} role,S'il vous plaît contacter à l'utilisateur qui ont Sales Master Chef {0} rôle
 DocType: Company,Default Cash Account,Compte 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 +5,This is based on the attendance of this Student,Ceci est basé sur la présence de cet étudiant
@@ -2899,12 +2937,11 @@
 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 +75,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 +138,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/hr/doctype/leave_application/leave_application.py +145,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: Program Enrollment Fee,Program Enrollment Fee,Programme Frais d&#39;inscription
 DocType: Item,Supplier Items,Fournisseur Articles
 DocType: Opportunity,Opportunity Type,Type d&#39;opportunité
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,Nouvelle Société
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,Cost Center is required for 'Profit and Loss' account {0},Quantité de minute
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Transactions ne peuvent être supprimés 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: Cheque Print Template,Cheque Width,Largeur Chèque
@@ -2913,16 +2950,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,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 +228,{0} '{1}' is disabled,{0} '{1}' est désactivée
+apps/erpnext/erpnext/controllers/accounts_controller.py +231,{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,Scanned Chèque
 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
 DocType: Purchase Order,Customer Contact Email,Email contact client
 DocType: Warranty Claim,Item and Warranty Details,détails article et garantie
 DocType: Sales Team,Contribution (%),Contribution (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Remarque: 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 +178,Responsibilities,Responsabilités
+apps/erpnext/erpnext/controllers/accounts_controller.py +78,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
 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
@@ -2930,6 +2968,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Ajouter des utilisateurs
 DocType: Pricing Rule,Item Group,Groupe d'article
 DocType: Item,Safety Stock,Stock de Sécurité
+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: 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)
@@ -2939,7 +2978,6 @@
 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: Timesheet,Total Hours,Total des heures
 DocType: Journal Entry,Printing Settings,Réglages d&#39;impression
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,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
@@ -2947,18 +2985,19 @@
 DocType: Salary Structure Employee,Variable,Variable
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,From Delivery Note,Du bon de livraison
 DocType: POS Profile,Allow Partial Payment,Autoriser paiement partiel
-DocType: Timesheet Detail,From Time,From Time
+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 +71,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 Prix de liste
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Client&gt; Groupe Client&gt; Territoire
 DocType: Purchase Invoice Item,Rate,Taux
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Intern,interne
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,interne
 DocType: Stock Entry,From BOM,De BOM
 DocType: Assessment,Assessment Code,code de l&#39;évaluation
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +32,Basic,de base
+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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"S'il vous plaît cliquer sur ""Générer calendrier''"
+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 +95,Reference No is mandatory if you entered Reference Date,No de  référence est obligatoire si vous avez introduit une date
@@ -2967,11 +3006,11 @@
 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 +752,Issue Material,Problème matériel
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +723,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 +683,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 +665,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.
 DocType: Hub Settings,Access Token,Jeton d'accès
 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
@@ -2979,33 +3018,35 @@
 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 +1122,Enter value must be positive,Entrer la valeur doit être positive
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,All Territories,Tous les secteurs
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1125,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
 DocType: Purchase Invoice,Items,Articles
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +23,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 +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.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +233,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,Produit Bundle Point
 DocType: Sales Partner,Sales Partner Name,Nom Sales Partner
-apps/erpnext/erpnext/hooks.py +96,Request for Quotations,Demande de Devis
+apps/erpnext/erpnext/hooks.py +104,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
 DocType: Asset,Partially Depreciated,Partiellement dépréciées
 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 +628,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unité de mesure pour la variante par défaut &#39;{0}&#39; doit être la même que dans le modèle &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unité de mesure pour la variante par défaut &#39;{0}&#39; doit être la même que dans le modèle &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Calculer en fonction 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: 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,Achat utilisateur
 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 +27,Default Address Template cannot be deleted,Adresse modèle par défaut ne peut pas être supprimé
+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é
 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
@@ -3020,8 +3061,8 @@
 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/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 +485,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 +336,Please select Posting Date first,S&#39;il vous plaît sélectionnez Date de publication abord
+apps/erpnext/erpnext/stock/get_item_details.py +486,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 +326,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
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Centre de coûts de transactions existants ne peut pas être converti pour le grand livre
@@ -3037,6 +3078,7 @@
 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)
+,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,Par groupe
 DocType: Guardian,Interests,Intérêts
@@ -3049,22 +3091,22 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,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 +141,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Point sérialisé {0} ne peut pas être mis à jour en utilisant \
  Stock réconciliation"
 DocType: Scheduling Tool,Day,journée
 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 +122,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 +129,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
-DocType: Student Applicant,AP.,AP.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,Inconnu
 DocType: Shipping Rule,Shipping Rule Conditions,Règle expédition Conditions
 DocType: BOM Replace Tool,The new BOM after replacement,La nouvelle nomenclature après le remplacement
-apps/erpnext/erpnext/accounts/page/pos/pos.js +639,Point of Sale,Point de vente
+apps/erpnext/erpnext/accounts/page/pos/pos.js +634,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
 DocType: Production Planning Tool,Production Planning Tool,Outil de planification de la production
@@ -3073,74 +3115,77 @@
 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 +373,Quantity to Manufacture must be greater than 0.,Quantité à fabriquer doit être supérieur à 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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 Profile,Customer Group,Groupe de clients
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,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/doctype/asset/asset.py +83,Next Depreciation Date must be on or after today,Suivant Amortissement La date doit être ou après aujourd&#39;hui
 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 +145,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
 ,Sales Register,Registre des ventes
 DocType: Quotation,Quotation Lost Reason,Soumission perdu la raison
+apps/erpnext/erpnext/utilities/doctype/address/address.py +164,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.
 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 +330,Transaction reference no {0} dated {1},Référence de la transaction ne {0} daté {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,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 +107,Summary for this month and pending activities,Résumé du mois et activités en suspens
+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/accounts/doctype/sales_invoice/sales_invoice.py +406,Please remove this Invoice {0} from C-Form {1},S'il vous plaît retirez cette Facture {0} du C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,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 +644,Get Items,Obtenir les éléments
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +623,Get Items,Obtenir les éléments
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +210,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 +41,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
 DocType: Payment Request,Initiated,Initié
 DocType: Production Order,Planned Start Date,Date de début prévue
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,Customer is required against Receivable account {0},Client est tenu compte à recevoir contre {0}
 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 +265,Project-wise data is not available for Quotation,alloué avec succè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 +101,Commercial,Commercial
-DocType: Payment Entry,Account Paid To,Compte Paid To
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,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: Supplier Quotation,Supplier Address,Adresse du fournisseur
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +648,Row {0}# Account must be of type 'Fixed Asset',Row {0} # Le compte doit être de type &#39;Asset fixe&#39;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,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 +30,Series is mandatory,Série est obligatoire
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +50,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
 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}
 DocType: Leave Allocation,Unused leaves,Congés non utilisés
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Cr,Cr
 DocType: Tax Rule,Billing State,État de facturation
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +250,Transfer,Transférer
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +187,{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 +825,Fetch exploded BOM (including sub-assemblies),Fetch nomenclature éclatée ( y compris les sous -ensembles )
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +254,Transfer,Transférer
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +190,{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 +796,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/controllers/accounts_controller.py +115,Due Date is mandatory,Date d&#39;échéance est obligatoire
+apps/erpnext/erpnext/controllers/accounts_controller.py +118,Due Date is mandatory,Date d&#39;échéance est obligatoire
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Incrément pour attribut {0} ne peut pas être 0
 DocType: Journal Entry,Pay To / Recd From,Pay To / RECD De
 DocType: Naming Series,Setup Series,Configuration des Séries
 DocType: Payment Reconciliation,To Invoice Date,Pour Date de la facture
 DocType: Supplier,Contact HTML,Contact HTML
 ,Inactive Customers,Clients inactifs
+DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Achat reçus
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Comment Prix règle est appliquée?
 DocType: Quality Inspection,Delivery Note No,Bon de livraison No
@@ -3149,18 +3194,18 @@
 DocType: Company,Retail,Vente au détail
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +120,Customer {0} does not exist,Client {0} n'existe pas
 DocType: Attendance,Absent,Absent
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +587,Product Bundle,Produit groupé
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Product Bundle,Produit groupé
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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-
 DocType: GL Entry,Remarks,Remarques
-DocType: Payment Entry,Account Paid From,Compte Payé De
+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 Barcode Champ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +742,Send Supplier Emails,Envoyer Emails Fournisseur
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +104,"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/buying/doctype/request_for_quotation/request_for_quotation.js +708,Send Supplier Emails,Envoyer Emails Fournisseur
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,"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
 DocType: Guardian Interest,Guardian Interest,intérêt Gardien
 DocType: Timesheet,Employee Detail,employé Détail
@@ -3171,9 +3216,9 @@
 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}
 DocType: Salary Slip,Earning & Deduction,Revenus et déduction
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +77,Account {0} cannot be a Group,Compte {0} ne peut pas être un groupe
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} cannot be a Group,Compte {0} ne peut pas être un groupe
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +31,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 +107,Negative Valuation Rate is not allowed,Négatif évaluation Taux n'est pas autorisé
+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 +39,Provisional Profit / Loss (Credit),Résultat provisoire / Perte (crédit)
@@ -3187,16 +3232,16 @@
 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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Centre de coûts est obligatoire pour objet {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +626,Get Items from Product Bundle,Obtenir les articles du produit groupé
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +605,Get Items from Product Bundle,Obtenir les articles du produit groupé
 DocType: Asset,Straight Line,Ligne droite
 DocType: Project User,Project User,projet utilisateur
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} is inactive,Le compte {0} est inactif
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} is inactive,Le compte {0} est inactif
 DocType: GL Entry,Is Advance,Est-Advance
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Participation Date de début et de présence à ce jour est obligatoire
 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
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,'Profit and Loss' type account {0} not allowed in Opening Entry,Le compte {0} de type 'profit et pertes' n'est pas permis dans une ouverture d'entrée.
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +71,'Profit and Loss' type account {0} not allowed in Opening Entry,Le compte {0} de type 'profit et pertes' n'est pas permis dans une ouverture d'entrée.
 DocType: Program Enrollment Tool,Get Students From,Obtenez des étudiants de
 DocType: Hub Settings,Seller Country,Vendeur Pays
 apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,De publier des éléments sur le Site
@@ -3215,7 +3260,7 @@
 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,Commission sur les ventes
 DocType: Offer Letter Term,Value / Description,Valeur / Description
-apps/erpnext/erpnext/controllers/accounts_controller.py +558,"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}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +561,"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: Production Order,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}.
@@ -3228,13 +3273,13 @@
 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/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Legal Expenses,Frais juridiques
 DocType: Purchase Invoice,Posting Time,Affichage Temps
-DocType: Sales Order,% Amount Billed,Montant Facturé en %
+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.
 apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},Aucun Item avec le Numéro de Série {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Notifications ouvertes
+DocType: Email Digest,Open Notifications,Notifications ouvertes
 DocType: Payment Entry,Difference Amount (Company Currency),Différence Montant (Société Monnaie)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,Dépenses directes
 apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
@@ -3242,7 +3287,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,New Revenu clientèle
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,Frais de déplacement
 DocType: Maintenance Visit,Breakdown,Panne
-apps/erpnext/erpnext/controllers/accounts_controller.py +634,Account: {0} with currency: {1} can not be selected,Compte: {0} avec la devise: {1} ne peut pas être sélectionné
+apps/erpnext/erpnext/controllers/accounts_controller.py +637,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: Program Enrollment Tool,Student Applicants,Les demandeurs d&#39;étudiants
@@ -3250,15 +3295,15 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Comme la date
 DocType: Appraisal,HR,HEURE
 DocType: Program Enrollment,Enrollment Date,Date de l&#39;inscription
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Probation,probation
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,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
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Payment of salary for the month {0} and year {1},Paiement salaire pour le mois de {0} et année {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Payment of salary for the month {0} and year {1},Paiement salaire pour le mois de {0} et année {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Insertion automatique de taux de la liste de prix si manquante
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Montant total payé
 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 +144,Planning,Planification
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,Planification
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,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
@@ -3267,15 +3312,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +212,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 Année académique
+DocType: Academic Year,Academic Year Name,Nom de l'année académique
 DocType: Sales Partner,Contact Desc,Contact Desc.
 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.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Sales invoice submitted sucessfully.,Facture de vente soumis avec succès.
 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}
 DocType: Assessment Result,Student Name,Nom d&#39;étudiant
-apps/erpnext/erpnext/hooks.py +104,Assessment Schedule,Calendrier de l&#39;évaluation
+apps/erpnext/erpnext/hooks.py +113,Assessment Schedule,Calendrier de l&#39;évaluation
 DocType: Brand,Item Manager,Item Manager
 DocType: Buying Settings,Default Supplier Type,Fournisseur Type par défaut
 DocType: Production Order,Total Operating Cost,Coût d&#39;exploitation total
@@ -3285,6 +3329,7 @@
 DocType: GL Entry,Party Type,Type de partie
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +78,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
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Maître de modèle de salaires .
 DocType: Leave Type,Max Days Leave Allowed,Jours de congé Max. admis
@@ -3296,18 +3341,19 @@
 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 +99,All Customer Groups,Tous les groupes client
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +78,Accumulated Monthly,Cumul mensuel
-apps/erpnext/erpnext/controllers/accounts_controller.py +595,{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/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Tous les groupes client
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +81,Accumulated Monthly,Cumul mensuel
+apps/erpnext/erpnext/controllers/accounts_controller.py +598,{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
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Tarifs Taux (Société Monnaie)
 DocType: Products Settings,Products Settings,Produits Réglages
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +188,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
 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 +84,Secretary,secrétaire
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,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
@@ -3316,42 +3362,41 @@
 ,Reqd By Date,Reqd 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&#39;évaluation
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,Ligne # {0}: No de série est obligatoire
+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 +859,Supplier Quotation,Estimation Fournisseur
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +838,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 +7,Collect Fees,Collecter les frais
+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}
 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.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Evénements à venir
 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
-DocType: Email Digest,Income / Expense,Produits / charges
 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
 DocType: Address,Postal Code,Code Postal
 DocType: Production Order Operation,"in Minutes
-Updated via 'Time Log'","Mise à jour en quelques minutes 
+Updated via 'Time Log'","Mise à jour en quelques minutes
  via 'Log Time'"
 DocType: Customer,From Lead,Du prospect
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Commandes validé pour la production.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Sélectionnez Exercice ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,POS Profile required to make POS Entry,Profil POS nécessaire pour faire POS Entrée
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +509,POS Profile required to make POS Entry,Profil POS nécessaire pour faire POS Entrée
 DocType: Program Enrollment Tool,Enroll Students,Inscrivez étudiants
 DocType: Hub Settings,Name Token,Nom du jeton
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Vente standard
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Atleast one warehouse is mandatory,Au moins un entrepôt est obligatoire
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +129,Atleast one warehouse is mandatory,Au moins un entrepôt est obligatoire
 DocType: Serial No,Out of Warranty,Hors garantie
 DocType: BOM Replace Tool,Replace,Remplacer
+DocType: Production Order,Unstopped,débouchées
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{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
@@ -3372,10 +3417,11 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Les congés doivent être alloués par multiples de 0,5"
 DocType: Production Order,Operation Cost,Coût de l'opération
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,Télécharger les participations à partir d'un fichier .csv
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Exceptionnelle Amt
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Fixer des objectifs élément de groupe-sage pour cette personne des ventes.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Vous ne pouvez pas entrer bon actuelle dans «Contre Journal Voucher ' colonne
-apps/erpnext/erpnext/controllers/accounts_controller.py +528,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: Asset est obligatoire pour les immobilisations achat / vente
+apps/erpnext/erpnext/controllers/accounts_controller.py +531,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: Asset est obligatoire pour les immobilisations achat / vente
 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
@@ -3388,19 +3434,19 @@
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Transactions du stock
 DocType: Budget,Budget Accounts,Comptes budgétaires
 DocType: Employee,Internal Work History,Historique de travail interne
-DocType: Depreciation Schedule,Accumulated Depreciation Amount,Cumul Montant d&#39;amortissement
+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
-DocType: Sales Invoice,Exhibition,Exposition
 apps/erpnext/erpnext/utilities/doctype/address/address.py +77,"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 +81,Syntax error in formula or condition: {0},Erreur de syntaxe dans la formule ou condition: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +92,Syntax error in formula or condition: {0},Erreur de syntaxe dans la formule ou condition: {0}
 apps/erpnext/erpnext/stock/utils.py +99,Item {0} ignored since it is not a stock item,S'il vous plaît mentionner pas de visites requises
+DocType: Appraisal,APRSL,APRSL
 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 +28,Jobs,Emplois
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,Emplois
 ,Sales Order Trends,Ventes Tendances des commandes
 DocType: Employee,Held On,Tenu le
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Production Item
@@ -3409,16 +3455,16 @@
 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 +763,Make Supplier Quotation,Faire Fournisseur offre
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,Make Supplier Quotation,Faire Fournisseur offre
 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/controllers/sales_and_purchase_return.py +100,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 +42,Casual Leave,Congé occasionnel
+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
 DocType: Batch,Batch ID,ID. du lot
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,Note: {0},Note: {0}
 ,Delivery Note Trends,Bordereau de livraison Tendances
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +103,This Week's Summary,Résumé de la semaine
+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
 DocType: Student Group Creation Tool,Get Courses,Obtenez Cours
 DocType: GL Entry,Party,Intervenants
@@ -3428,7 +3474,7 @@
 DocType: Request for Quotation Item,Request for Quotation Item,Appel d&#39;offre Item
 DocType: Purchase Order,To Bill,A facturer
 DocType: Material Request,% Ordered,% Commandé
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Piecework,Travail à la pièce
+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
 DocType: Task,Actual Time (in Hours),Temps réel (en heures)
 DocType: Employee,History In Company,Ancienneté dans l'entreprise
@@ -3445,7 +3491,7 @@
 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.
 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 +162,Black,Noir
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Black,Noir
 DocType: BOM Explosion Item,BOM Explosion Item,Article éclatement de la nomenclature
 DocType: Account,Auditor,Auditeur
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +56,{0} items produced,{0} articles produits
@@ -3456,13 +3502,13 @@
 DocType: Project Task,Pending Review,Attente d&#39;examen
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +106,"Asset {0} cannot be scrapped, as it is already {1}","Asset {0} ne peut pas être mis au rebut, car il est déjà {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Frais totaux (via Note de Frais)
-apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +69,Customer Id,Client Id
+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
 DocType: Journal Entry Account,Exchange Rate,Taux de change
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Sales Order {0} is not submitted,Bon de commande {0} n'a pas été transmis
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +527,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
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +857,Add items from,Ajouter des articles de
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +836,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: Cheque Print Template,Regular,Ordinaire
 DocType: BOM,Last Purchase Rate,Dernier prix d'achat
@@ -3470,6 +3516,7 @@
 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 objet {0} a depuis variantes
 ,Sales Person-wise Transaction Summary,Sales Person-sage Résumé de la transaction
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +60,Cost Center is required for 'Profit and Loss' account {0}. Please set up a default Cost Center for the Company.,Centre de coûts est nécessaire pour compte »des pertes et profits &#39;{0}. S&#39;il vous plaît mettre en place un centre de coûts par défaut pour la Société.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,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
@@ -3480,12 +3527,12 @@
 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 +710,Online,en ligne
+apps/erpnext/erpnext/accounts/page/pos/pos.js +692,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 +16,Setting this Address Template as default as there is no other default,"La définition de cette adresse modèle par défaut, car il n'ya pas d'autre défaut"
+apps/erpnext/erpnext/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"
 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 +74,Quality Management,Gestion de la qualité
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,Gestion de la qualité
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,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é
@@ -3507,16 +3554,17 @@
 DocType: Student,Student Email ID,Étudiant Email ID
 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 +1520,Select items to save the invoice,Sélectionnez les éléments à sauvegarder la facture
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1544,Select items to save the invoice,Sélectionnez les éléments à sauvegarder la facture
 DocType: Employee,Encashment Date,Date de l&#39;encaissement
 DocType: Account,Stock Adjustment,Stock ajustement
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Existe défaut Activité Coût pour le type d&#39;activité - {0}
 DocType: Production Order,Planned Operating Cost,Coût de fonctionnement prévues
+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
 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**. 
+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"".
 
@@ -3541,17 +3589,17 @@
 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.
 DocType: Company,Distribution,Distribution
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +8,Amount Paid,Le montant payé
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Project Manager,Chef de projet
+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
 ,Quoted Item Comparison,Comparaison Point Cité
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Dispatch,envoi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,envoi
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,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.
-DocType: Sales Invoice,Supplier Reference,Référence fournisseur
-apps/erpnext/erpnext/accounts/page/pos/pos.js +844,"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 +832,"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
@@ -3565,7 +3613,7 @@
 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 +83,Error in formula or condition,Erreur dans la formule ou condition
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,Error in formula or condition,Erreur dans la formule ou condition
 DocType: BOM,Rate Of Materials Based On,Taux de matériaux à base
 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
@@ -3574,7 +3622,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},Pour la date doit être dans l'exercice. En supposant à ce jour = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Ici vous pouvez maintenir la hauteur, le poids, allergies, etc médicaux préoccupations"
 DocType: Leave Block List,Applies to Company,S'applique à la société
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +197,Cannot cancel because submitted Stock Entry {0} exists,Impossible d'annuler car l'entrée du stock soumis {0} existe
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +198,Cannot cancel because submitted Stock Entry {0} exists,Impossible d'annuler car l'entrée du stock soumis {0} existe
 DocType: Purchase Invoice,In Words,En Toutes Lettres
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,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
@@ -3584,14 +3632,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,Date de début de la période comptable
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Asset Amortissements et soldes
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +319,Amount {0} {1} transferred from {2} to {3},Montant {0} {1} transféré de {2} et {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +322,Amount {0} {1} transferred from {2} to {3},Montant {0} {1} transféré de {2} et {3}
 DocType: Sales Invoice,Get Advances Received,Obtenez Avances et acomptes reçus
 DocType: Email Digest,Add/Remove Recipients,Ajouter / supprimer des destinataires
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +432,Transaction not allowed against stopped Production Order {0},Transaction non autorisée contre l'ordre d'arret de production {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +437,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 +143,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 +652,Item variant {0} exists with same attributes,Variante d&#39;objet {0} existe avec les mêmes caractéristiques
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Variante d&#39;objet {0} existe avec les mêmes caractéristiques
+DocType: Leave Application,LAP/,TOUR/
 DocType: Salary Slip,Salary Slip,Fiche de paye
 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
@@ -3599,12 +3648,12 @@
 DocType: Sales Invoice Item,Sales Order Item,Poste de commande client
 DocType: Salary Slip,Payment Days,Jours de paiement
 DocType: Customer,Dormant,Dormant
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +212,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 +215,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/public/js/controllers/transaction.js +866,It is needed to fetch Item Details.,Il est nécessaire d&#39;aller chercher de l&#39;article Détails.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +857,It is needed to fetch Item Details.,Il est nécessaire d&#39;aller chercher de l&#39;article Détails.
 DocType: Salary Slip,Net Pay,Salaire net
 DocType: Account,Account,Compte
 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
@@ -3614,14 +3663,14 @@
 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 +178,Invalid {0},Invalide {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Sick Leave,Congé maladie
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,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
 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),Base de Variation Montant (Société Monnaie)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +313,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 +102,Save the document first.,Enregistrez le document d'abord.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +314,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
 DocType: Company,Change Abbreviation,Changer Abréviation
 DocType: Expense Claim Detail,Expense Date,Date de frais
@@ -3634,10 +3683,9 @@
 DocType: Purchase Invoice,Recurring Print Format,Format d&#39;impression récurrent
 DocType: C-Form,Series,Séries
 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
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,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
 DocType: Appraisal,Appraisal Template,Modèle d&#39;évaluation
 DocType: Item Group,Item Classification,Point Classification
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Business Development Manager,Directeur du développement des affaires
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Business Development Manager,Directeur du développement des affaires
 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
@@ -3647,8 +3695,8 @@
 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 +940,Please select {0} first,S'il vous plaît sélectionnez {0} premier
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +749,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 +953,Please select {0} first,S'il vous plaît sélectionnez {0} premier
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +757,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
@@ -3663,21 +3711,21 @@
 {% 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>","<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 +92,Warehouse not found in the system,Entrepôt pas trouvé dans le système
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +106,This Month's Summary,Résumé de ce mois-ci
+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
 DocType: Quality Inspection Reading,Quality Inspection Reading,Libellé du contrôle de qualité
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Figer les stocks datant de plus` doit être inférieur que %d jours.
 DocType: Tax Rule,Purchase Tax Template,Achetez modèle impôt
@@ -3687,21 +3735,22 @@
 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 +87,Please set Next Depreciation Date,S&#39;il vous plaît définir Next Amortissements date
-DocType: Payment Gateway,Payment Gateway,Passerelle de paiement
 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,De nouvelles commandes
 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
 DocType: Sales Invoice,C-Form Applicable,Formulaire - C applicable
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,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/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/accounts/doctype/account/account.py +170,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"
 DocType: Program,Program Abbreviation,Abréviation du programme
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,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: Appraisal,Start Date,Date de début
@@ -3717,21 +3766,22 @@
 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
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Par exemple. smsgateway.com / api / send_sms.cgi
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +27,Transaction currency must be same as Payment Gateway currency,Devise de la transaction doit être la même que la monnaie paiement passerelle
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Transaction currency must be same as Payment Gateway currency,Devise de la transaction doit être la même que la monnaie paiement passerelle
 DocType: Payment Entry,Receive,Recevoir
+apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,Citations:
 DocType: Maintenance Visit,Fully Completed,Entièrement complété
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% complète
 DocType: Employee,Educational Qualification,Qualification pour l&#39;éducation
 DocType: Workstation,Operating Costs,Coûts d'exploitation
-DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Action si accumulées excédait Budget mensuel
+DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Action si le cumulé excéde le budget mensuel
 DocType: Purchase Invoice,Submit on creation,Soumettre sur la création
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +432,Currency for {0} must be {1},Devise pour {0} doit être {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +435,Currency for {0} must be {1},Devise pour {0} doit être {1}
 DocType: Asset,Disposal Date,élimination date de
 DocType: Employee Leave Approver,Employee Leave Approver,Approbateur des Congés de l'employé
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,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 +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/crm/doctype/opportunity/opportunity.py +79,"Cannot declare as lost, because Quotation has been made.","Vous ne pouvez pas déclarer comme perdu, parce que le devis a été fait."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Directeur des Achats
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +429,Production Order {0} must be submitted,Ordre de fabrication {0} doit être soumis
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +434,Production Order {0} must be submitted,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
@@ -3741,25 +3791,27 @@
 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/accounts/report/general_ledger/general_ledger.py +181,Totals,Totaux
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,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 +113,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 +120,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.
+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 +181,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/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,"Vous ne pouvez pas supprimer Aucune série {0} en stock . Première retirer du stock, puis supprimer ."
+DocType: Email Digest,Pending Quotations,En attendant Citations
 apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,Point-of-Sale profil
-apps/erpnext/erpnext/accounts/page/pos/pos.js +793,All records are synced.,Tous les enregistrements sont synchronisés.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +781,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
 DocType: Cost Center,Cost Center Name,Nom du centre de coûts
@@ -3778,21 +3830,20 @@
 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 +49,Cannot set as Lost as Sales Order is made.,Impossible de définir aussi perdu que les ventes décret.
-DocType: Student Applicant,Mother's Name,Le nom de la mère
 DocType: Request for Quotation Item,Supplier Part No,Fournisseur de pièce
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +348,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 +326,Received From,Reçu de
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,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/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 +93,Row {0}: Hours value must be greater than zero.,Row {0}: valeur des heures doit être supérieure à zéro.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +117,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é
 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 +172,{0} {1} does not exist,{0} {1} n&#39;existe pas
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +175,{0} {1} does not exist,{0} {1} n&#39;existe pas
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,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 +72,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
@@ -3801,13 +3852,14 @@
 apps/erpnext/erpnext/accounts/party.py +257,Billing currency must be equal to either default comapany's currency or party account currency,monnaie de facturation doit être égale à la monnaie ou le compte du parti de la monnaie soit comapany par défaut
 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 d&#39;é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
 DocType: Pricing Rule,Pricing Rule Help,Prix règle Aide
 DocType: Purchase Taxes and Charges,Account Head,Responsable du compte
 apps/erpnext/erpnext/config/stock.py +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 +109,Electrical,Electrique
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,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 +318,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}
@@ -3815,7 +3867,7 @@
 DocType: Item,Customer Code,Code client
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +210,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 +292,Debit To account must be a Balance Sheet account,Débit Pour compte doit être un compte de bilan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To account must be a Balance Sheet account,Débit Pour compte doit être un compte de bilan
 DocType: Buying Settings,Naming Series,Nommer Séries
 DocType: Leave Block List,Leave Block List Name,Laisser Nom de la liste de blocage
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,payable
@@ -3827,11 +3879,11 @@
 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 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 +301,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 +313,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: Sales Order Item,Ordered Qty,Quantité commandée
-apps/erpnext/erpnext/stock/doctype/item/item.py +673,Item {0} is disabled,Article {0} est désactivé
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,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 +838,BOM does not contain any stock item,BOM ne contient aucun article en stock
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +809,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.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Générer les bulletins de salaire
@@ -3839,35 +3891,35 @@
 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,taux d&#39;achat Dernière non trouvée
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Write Off Montant (Société devise)
-apps/erpnext/erpnext/stock/doctype/item/item.py +485,Row #{0}: Please set reorder quantity,Row # {0}: S&#39;il vous plaît définir la quantité de réapprovisionnement
+DocType: Sales Invoice Timesheet,Billing Hours,Heures de facturation
+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
 DocType: Fees,Program Enrollment,Programme d&#39;inscription
 DocType: Landed Cost Voucher,Landed Cost Voucher,Bon d'Landed Cost
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +62,Please set {0},S'il vous plaît mettre {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Répétez le Jour du Mois
 DocType: Employee,Health Details,Détails de santé
 DocType: Offer Letter,Offer Letter Terms,Offrez Conditions Lettre
+DocType: Payment Entry,Allocate Payment Amount,Allouer Montant du paiement
 DocType: Employee External Work History,Salary,Salaire
 DocType: Serial No,Delivery Document Type,Type de document de livraison
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Soumettre tous les bulletins de salaire pour les critères sélectionnés ci-dessus
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} Articles synchronisés
 DocType: Sales Order,Partly Delivered,Livré en partie
-DocType: Sales Invoice,Existing Customer,Client existant
 DocType: Email Digest,Receivables,Créances
+DocType: Lead Source,Lead Source,Source plomb
 DocType: Customer,Additional information regarding the customer.,Informations supplémentaires concernant le client.
 DocType: Quality Inspection Reading,Reading 5,Reading 5
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +38,Campaign Name is required,Le nom de la campagne est requis
 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,Année de début ou de fin 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 ##### 
+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 +129,BOM and Manufacturing Quantity are required,BOM et fabrication Quantité sont nécessaires
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,BOM and Manufacturing Quantity are required,BOM et fabrication Quantité sont nécessaires
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Gamme de vieillissement 2
 DocType: SG Creation Tool Course,Max Strength,Max Force
-DocType: Bank Reconciliation Detail,Amount,Montant
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM remplacé
 ,Sales Analytics,Analytics Sales
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +113,Available {0},Disponible {0}
@@ -3875,14 +3927,14 @@
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Configurer l'Email
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +96,Please enter default currency in Company Master,S'il vous plaît entrer la devise par défaut pour la société principale
 DocType: Stock Entry Detail,Stock Entry Detail,Détail d&#39;entrée Stock
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +100,Daily Reminders,Rappels quotidiens
+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,Dépréciation d&#39;actifs Ledger
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85,Tax Rule Conflicts with {0},Règle fiscale Conflits avec {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +23,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 +71,Customer Service,Service à la clientèle
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Customer Service,Service à la clientèle
 DocType: Homepage Featured Product,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.,Offre candidat un emploi.
@@ -3891,8 +3943,9 @@
 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,Point {0} doit être un stock Article
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Par défaut Work In Progress Entrepôt
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1570,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/accounts/page/pos/pos.js +1594,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
@@ -3900,9 +3953,10 @@
 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 +82,Engineer,ingénieur
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,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,Recherche de sous-ensembles
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Item Code required at Row No {0},Code de l'article est requis à la ligne No {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +398,Item Code required at Row No {0},Code de l'article est requis à la ligne No {0}
 DocType: Sales Partner,Partner Type,Type de partenaire
 DocType: Purchase Taxes and Charges,Actual,Réel
 DocType: Authorization Rule,Customerwise Discount,Remise Customerwise
@@ -3918,16 +3972,18 @@
 DocType: BOM,Raw Material Cost,Coût matières premières
 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/setup/setup_wizard/install_fixtures.py +55,Part-time,À temps partiel
+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
 DocType: Employee,Applicable Holiday List,Liste de vacances applicable
 DocType: Employee,Cheque,Chèque
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Série mise à jour
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +57,Series Updated,Série mise à jour
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Bulletin de salaire de l'employé {0} déjà créé pour ce mois-ci
 DocType: Item,Serial Number Series,Série Série Nombre
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},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,Retail & Wholesale
 DocType: Issue,First Responded On,D&#39;abord répondu le
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Croix Listing des articles dans plusieurs groupes
+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 +87,Clearance Date updated,Dégagement Date de mise à jour
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Réconcilié avec succès
@@ -3941,7 +3997,7 @@
 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 +513,Posting date and posting time is mandatory,Date et heure de publication sont obligatoire
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,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.
@@ -3951,7 +4007,7 @@
 DocType: Purchase Invoice,Advance Payments,Paiements anticipés
 DocType: Purchase Taxes and Charges,On Net Total,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/stock/doctype/stock_entry/stock_entry.py +158,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/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
 DocType: Company,Round Off Account,Arrondir compte
@@ -3960,23 +4016,22 @@
 DocType: Customer Group,Parent Customer Group,Groupe Client parent
 DocType: Purchase Invoice,Contact Email,Contact Email
 DocType: Appraisal Goal,Score Earned,Score gagné
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Notice Period,Période de préavis
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Notice Period,Période de préavis
 DocType: Asset Category,Asset Category Name,Catégorie d&#39;actif Nom
 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 +4,New Sales Person Name,Nom New Sales Person
 DocType: Packing Slip,Gross Weight UOM,Emballage Poids brut
-DocType: Email Digest,Receivables / Payables,Créances / dettes
 DocType: Delivery Note Item,Against Sales Invoice,Sur la facture de vente
 DocType: Bin,Reserved Qty for Production,Réservé Quantité pour la production
 DocType: Asset,Frequency of Depreciation (Months),Fréquence des amortissements (mois)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +469,Credit Account,Compte créditeur
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Credit Account,Compte créditeur
 DocType: Landed Cost Item,Landed Cost Item,Article coût en magasin
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +55,Show zero values,Afficher les valeurs nulles
+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
 DocType: Payment Reconciliation,Receivable / Payable Account,Compte à recevoir / payer
-DocType: Delivery Note Item,Against Sales Order Item,Sur l'objet de la commande
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,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,Dans l'élément de la commande
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,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 +39,Budget cannot be assigned against Group Account {0},Budget ne peut pas être attribué à l&#39;encontre du compte de groupe {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,Le projet de loi n ° {0} déjà réservé dans la facture d'achat {1}
@@ -3994,23 +4049,26 @@
 DocType: Journal Entry,Debit Note,Note de débit
 DocType: Stock Entry,As per Stock UOM,Selon Stock UDM
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Pas expiré
-DocType: Student Log,Achievement,Exploit
+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
-DocType: Sales Invoice,Cold Calling,Cold Calling
 DocType: SMS Parameter,SMS Parameter,Paramètre SMS
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,Budget et Centre de coûts
 DocType: Maintenance Schedule Item,Half Yearly,Semestriel
 DocType: Lead,Blog Subscriber,Abonné Blog
+DocType: Guardian,Alternate Number,Autre numéro
 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.
+DocType: Stock Reconciliation Item,Quantity Difference,Quantité Différence
 apps/erpnext/erpnext/config/hr.py +253,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 +141,Set as Lost,Définir comme perdu
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,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 +5,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
 DocType: Supplier,Credit Days Based On,Jours de crédit basée sur
@@ -4022,40 +4080,39 @@
 ,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 +941,Select or add new customer,Sélectionnez ou ajoutez nouveau client
+apps/erpnext/erpnext/accounts/page/pos/pos.js +930,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 +5,This is based on the attendance of this Employee,Ceci est basé sur la présence de cet employé
-DocType: Sales Invoice,Frequency,Fréquence
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +463,Debit Account,Compte de débit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,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.
 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 actulisez.
+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 des achats
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +210,Supplier Quotation {0} created,Fournisseur offre {0} créé
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +208,Supplier Quotation {0} created,Fournisseur offre {0} créé
 apps/erpnext/erpnext/accounts/report/financial_statements.py +90,End Year cannot be before Start Year,Fin de l&#39;année ne peut pas être avant Année de début
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Employee Benefits,Avantages du personnel
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,Employee Benefits,Avantages du personnel
 DocType: Sales Invoice,Is POS,Est-POS
 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 +228,Please set a default Holiday List for Employee {0} or Company {1},S&#39;il vous plaît définir une valeur par défaut Liste de vacances pour les employés {0} ou Société {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +232,Please set a default Holiday List for Employee {0} or Company {1},S&#39;il vous plaît définir une valeur par défaut Liste de vacances pour les employés {0} ou 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 +499,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 +500,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 +1007,Price List not found or disabled,Liste de prix introuvable ou desactivé
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1008,Price List not found or disabled,Liste de prix introuvable ou desactivé
 DocType: Expense Claim,Approved,Approuvé
 DocType: Pricing Rule,Price,Profil de l'organisation
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +244,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 +256,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 &quot;Oui&quot; donner une identité unique à chaque entité de cet article qui peut être consulté dans le N ° de série maître.
 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
@@ -4066,12 +4123,12 @@
 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 +259,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 Montant
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +266,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 +190,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 +235,Please enter Expense Account,S&#39;il vous plaît entrer Compte de dépenses
+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
 DocType: Account,Stock,Stock
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,"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 +976,"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
@@ -4086,9 +4143,10 @@
 DocType: Asset Movement,Transaction Date,Date de la transaction
 DocType: Production Plan Item,Planned Qty,Qté planifiée
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,Total Tax
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,For Quantity (Manufactured Qty) is mandatory,Pour Quantité (Qté Fabriqué) est obligatoire
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,For Quantity (Manufactured Qty) is mandatory,Pour Quantité (Qté Fabriqué) est obligatoire
 DocType: Stock Entry,Default Target Warehouse,Cible d&#39;entrepôt par défaut
 DocType: Purchase Invoice,Net Total (Company Currency),Total Net (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 +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Type et le Parti est applicable uniquement contre débiteurs / Comptes fournisseurs
 DocType: Notification Control,Purchase Receipt Message,Achat message de réception
 DocType: Production Order,Actual Start Date,Date de début réelle
@@ -4097,15 +4155,17 @@
 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}.,Les écritures comptables ont déjà été réalisés en monnaie {0} pour la société {1}. S&#39;il vous plaît sélectionner un compte à recevoir ou à payer avec de la monnaie {0}.
+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}.
 DocType: Asset,Is Existing Asset,Est Asset existant
 ,Monthly Salary Register,Registre mensuel des salaires
 DocType: Warranty Claim,If different than customer address,Si différente de l'adresse du client
 DocType: BOM Operation,BOM Operation,Opération BOM
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Le montant rangée précédente
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +226,Transfer Asset,Transfert d&#39;actifs
+DocType: Student,Home Address,Adresse du domicile
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +227,Transfer Asset,Transfert d&#39;actifs
 DocType: POS Profile,POS Profile,Profil POS
 apps/erpnext/erpnext/config/schools.py +33,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 +129,"Item {0} is a template, please select one of its variants","Point {0} est un modèle, s&#39;il vous plaît sélectionnez l&#39;une de ses variantes"
 DocType: Asset,Asset Category,Catégorie d&#39;actif
@@ -4115,8 +4175,8 @@
 DocType: Assessment,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 +765,Material to Supplier,Matériel au fournisseur
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +189,Excise Invoice,Accise facture
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,Material to Supplier,Matériel au fournisseur
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,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
@@ -4126,7 +4186,7 @@
 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/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,Scheduling outil
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +136,Credit Card,Carte de crédit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,Carte de crédit
 DocType: BOM,Item to be manufactured or repacked,Ce point doit être manufacturés ou reconditionnés
 apps/erpnext/erpnext/config/stock.py +174,Default settings for stock transactions.,Paramètres par défaut pour les mouvements de stock.
 DocType: Purchase Invoice,Next Date,Date suivante
@@ -4134,6 +4194,7 @@
 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: 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: Hub Settings,Seller Name,Vendeur Nom
 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
@@ -4145,7 +4206,7 @@
 DocType: Customer,Commission Rate,Taux de commission
 apps/erpnext/erpnext/stock/doctype/item/item.js +261,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 +115,"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/accounts/doctype/payment_entry/payment_entry.py +118,"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/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Le panier est vide
 DocType: Production Order,Actual Operating Cost,Coût de fonctionnement réel
@@ -4156,14 +4217,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,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.,Après le paiement terminé rediriger l&#39;utilisateur à la page sélectionnée.
+DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,"Le paiement terminé, rediriger l'utilisateur vers la page sélectionnée."
 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
 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 +92,Designer,Designer
+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
 DocType: Serial No,Delivery Details,Détails de la livraison
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +469,Cost Center is required in row {0} in Taxes table for type {1},Livré de série n ° {0} ne peut pas être supprimé
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +472,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
 ,Item-wise Purchase Register,Registre des achats par items
 DocType: Batch,Expiry Date,Date d&#39;expiration
@@ -4173,12 +4234,12 @@
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Liste de projets.
 apps/erpnext/erpnext/controllers/status_updater.py +174,"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 +417, (Half Day),(Demi-journée)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425, (Half Day),(Demi-journée)
 DocType: Supplier,Credit Days,Jours de crédit
 DocType: Leave Type,Is Carry Forward,Est-Report
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +740,Get Items from BOM,Obtenir des éléments de nomenclature
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +711,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 +549,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/controllers/accounts_controller.py +552,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
diff --git a/erpnext/translations/gu.csv b/erpnext/translations/gu.csv
index f211dd8..fe32770 100644
--- a/erpnext/translations/gu.csv
+++ b/erpnext/translations/gu.csv
@@ -18,11 +18,10 @@
 DocType: Sales Partner,Dealer,વિક્રેતા
 DocType: Employee,Rented,ભાડાનાં
 DocType: Purchase Order,PO-,PO-
-apps/erpnext/erpnext/accounts/report/financial_statements.py +19,Start Year {0} not found.,પ્રારંભ વર્ષ {0} મળી નથી.
 DocType: POS Profile,Applicable for User,વપરાશકર્તા માટે લાગુ પડે છે
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +191,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","અટકાવાયેલ ઉત્પાદન ઓર્ડર રદ કરી શકાતી નથી, રદ કરવા તે પ્રથમ Unstop"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +197,Do you really want to scrap this asset?,શું તમે ખરેખર આ એસેટ સ્ક્રેપ કરવા માંગો છો?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +17,Select Default Supplier,પસંદ કરો મૂળભૂત પુરવઠોકર્તા
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +192,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","અટકાવાયેલ ઉત્પાદન ઓર્ડર રદ કરી શકાતી નથી, રદ કરવા તે પ્રથમ Unstop"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +198,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 +36,Currency is required for Price List {0},કરન્સી ભાવ યાદી માટે જરૂરી છે {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* પરિવહનમાં ગણતરી કરવામાં આવશે.
 DocType: Address,County,કાઉન્ટી
@@ -42,46 +41,45 @@
 DocType: Sales Invoice,Customer Name,ગ્રાહક નું નામ
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +126,Bank account cannot be named as {0},બેન્ક એકાઉન્ટ તરીકે નામ આપવામાં આવ્યું ન કરી શકાય {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,ચેતવણી (અથવા જૂથો) જે સામે હિસાબી પ્રવેશ કરવામાં આવે છે અને બેલેન્સ જાળવવામાં આવે છે.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +180,Outstanding for {0} cannot be less than zero ({1}),ઉત્કૃષ્ટ {0} કરી શકાય નહીં શૂન્ય કરતાં ઓછી ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,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 +148,Series Updated Successfully,સિરીઝ સફળતાપૂર્વક અપડેટ
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +149,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,બધા પુરવઠોકર્તા સંપર્ક
-DocType: Quality Inspection Reading,Parameter,પરિમાણ
 apps/erpnext/erpnext/projects/doctype/project/project.py +54,Expected End Date can not be less than Expected Start Date,અપેક્ષિત ઓવરને તારીખ અપેક્ષિત પ્રારંભ તારીખ કરતાં ઓછા ન હોઈ શકે
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,ROW # {0}: દર જ હોવી જોઈએ {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +239,New Leave Application,ન્યૂ છોડો અરજી
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,New Leave Application,ન્યૂ છોડો અરજી
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +20,Attendance Record {0} exists against Student {1} for Course Schedule {2},હાજરીનો વિક્રમ {0} વિદ્યાર્થી {1} સામે કોર્સ શેડ્યૂલ માટે અસ્તિત્વમાં {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Bank Draft,બેંક ડ્રાફ્ટ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,બેંક ડ્રાફ્ટ
 DocType: Mode of Payment Account,Mode of Payment Account,ચુકવણી એકાઉન્ટ પ્રકાર
 apps/erpnext/erpnext/stock/doctype/item/item.js +52,Show Variants,બતાવો ચલો
 DocType: Academic Term,Academic Term,શૈક્ષણિક ટર્મ
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +13,Material,સામગ્રી
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Quantity,જથ્થો
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +511,Accounts table cannot be blank.,એકાઉન્ટ્સ ટેબલ ખાલી ન હોઈ શકે.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +616,Quantity,જથ્થો
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +512,Accounts table cannot be blank.,એકાઉન્ટ્સ ટેબલ ખાલી ન હોઈ શકે.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,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/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 +142,User {0} is already assigned to Employee {1},વપરાશકર્તા {0} પહેલાથી જ કર્મચારી સોંપેલ છે {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,સ્વાસ્થ્ય કાળજી
-DocType: Purchase Invoice,Monthly,માસિક
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),ચુકવણી વિલંબ (દિવસ)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +771,Invoice,ભરતિયું
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +750,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 +198,Row {0}: {1} {2} does not match with {3},રો {0}: {1} {2} સાથે મેળ ખાતું નથી {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,ROW # {0}:
+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 +127,Please select Price List,ભાવ યાદી પસંદ કરો
@@ -112,8 +110,8 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,સેમ કંપની એક કરતા વધુ વખત દાખલ થયેલ
 DocType: Employee,Married,પરણિત
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},માટે પરવાનગી નથી {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +589,Get items from,વસ્તુઓ મેળવો
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +382,Stock cannot be updated against Delivery Note {0},સ્ટોક બોલ પર કોઈ નોંધ સામે અપડેટ કરી શકાતું નથી {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,વસ્તુઓ મેળવો
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,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,કરિયાણા
@@ -122,7 +120,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 +156,Salary Structure Missing,પગાર માળખું ખૂટે
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Salary Structure Missing,પગાર માળખું ખૂટે
 DocType: Lead,Person Name,વ્યક્તિ નામ
 DocType: Sales Invoice Item,Sales Invoice Item,સેલ્સ ભરતિયું વસ્તુ
 DocType: Account,Credit,ક્રેડિટ
@@ -130,10 +128,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 +156,Credit limit has been crossed for customer {0} {1}/{2},ક્રેડિટ મર્યાદા ગ્રાહક માટે ઓળંગી કરવામાં આવી છે {0} {1} / {2}
-apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",", અનચેક કરી શકાતી નથી કારણ કે એસેટ રેકોર્ડ વસ્તુ સામે અસ્તિત્વમાં &quot;સ્થિર એસેટ છે&quot;"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +189,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;"
 DocType: Tax Rule,Tax Type,ટેક્સ પ્રકાર
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +144,You are not authorized to add or update entries before {0},જો તમે પહેલાં પ્રવેશો ઉમેરવા અથવા અપડેટ કરવા માટે અધિકૃત નથી {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},જો તમે પહેલાં પ્રવેશો ઉમેરવા અથવા અપડેટ કરવા માટે અધિકૃત નથી {0}
 DocType: Item,Item Image (if not slideshow),આઇટમ છબી (જોક્સ ન હોય તો)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,ગ્રાહક જ નામ સાથે હાજર
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(કલાક દર / 60) * વાસ્તવિક કામગીરી સમય
@@ -143,18 +142,17 @@
 DocType: Student Log,Student Log,વિદ્યાર્થી પ્રવેશ
 DocType: Quality Inspection,Get Specification Details,સ્પષ્ટીકરણ વિગતો મેળવવા
 DocType: Lead,Interested,રસ
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +165,Opening,ખુલી
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,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/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ગ્રાહક&gt; ગ્રાહક જૂથ&gt; પ્રદેશ
 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.,હાલની વ્યવહાર સાથે એકાઉન્ટ જૂથ રૂપાંતરિત કરી શકતા નથી.
 DocType: Lead,Product Enquiry,ઉત્પાદન ઇન્કવાયરી
 DocType: Academic Term,Schools,શાળાઓ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,પ્રથમ કંપની દાખલ કરો
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Company first,પ્રથમ કંપની પસંદ કરો
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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,કુલ ખર્ચ
@@ -164,7 +162,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,એકાઉન્ટ સ્ટેટમેન્ટ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,ફાર્માસ્યુટિકલ્સ
 DocType: Purchase Invoice Item,Is Fixed Asset,સ્થિર એસેટ છે
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Available qty is {0}, you need {1}","ઉપલબ્ધ Qty {0}, તમને જરૂર છે {1}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +225,"Available qty is {0}, you need {1}","ઉપલબ્ધ Qty {0}, તમને જરૂર છે {1}"
 DocType: Expense Claim Detail,Claim Amount,દાવો રકમ
 DocType: Employee,Mr,શ્રીમાન
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,પુરવઠોકર્તા પ્રકાર / પુરવઠોકર્તા
@@ -173,25 +171,26 @@
 DocType: Employee,B-,બી
 DocType: Upload Attendance,Import Log,આયાત લોગ
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,પુલ ઉપર માપદંડ પર આધારિત પ્રકાર ઉત્પાદન સામગ્રી વિનંતી
+DocType: Assessment Result,Grade,ગ્રેડ
 DocType: Sales Invoice Item,Delivered By Supplier,સપ્લાયર દ્વારા વિતરિત
 DocType: SMS Center,All Contact,તમામ સંપર્ક
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Annual Salary,વાર્ષિક પગાર
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,સ્ટોક ખર્ચ
-apps/erpnext/erpnext/accounts/report/financial_statements.py +22,End Year {0} not found.,સમાપ્તિ વર્ષ {0} મળી નથી.
 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}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,પુરવઠા કાચો માલ ખરીદી માટે
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +130,At least one mode of payment is required for POS invoice.,ચુકવણી ઓછામાં ઓછો એક મોડ POS ભરતિયું માટે જરૂરી છે.
 DocType: Products Settings,Show Products as a List,શો ઉત્પાદનો યાદી તરીકે
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records",", નમૂનો ડાઉનલોડ યોગ્ય માહિતી ભરો અને ફેરફાર ફાઇલ સાથે જોડે છે. પસંદ કરેલ સમયગાળામાં તમામ તારીખો અને કર્મચારી સંયોજન હાલની એટેન્ડન્સ રેકર્ડઝ સાથે, નમૂનો આવશે"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +451,Item {0} is not active or end of life has been reached,{0} વસ્તુ સક્રિય નથી અથવા જીવનનો અંત સુધી પહોંચી ગઇ હશે
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +456,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/controllers/accounts_controller.py +614,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","આઇટમ રેટ પંક્તિ {0} કર સમાવેશ કરવા માટે, પંક્તિઓ કર {1} પણ સમાવેશ કરવો જ જોઈએ"
+apps/erpnext/erpnext/controllers/accounts_controller.py +617,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","આઇટમ રેટ પંક્તિ {0} કર સમાવેશ કરવા માટે, પંક્તિઓ કર {1} પણ સમાવેશ કરવો જ જોઈએ"
 apps/erpnext/erpnext/config/hr.py +166,Settings for HR Module,એચઆર મોડ્યુલ માટે સેટિંગ્સ
 DocType: SMS Center,SMS Center,એસએમએસ કેન્દ્ર
 DocType: Sales Invoice,Change Amount,જથ્થો બદલી
@@ -203,13 +202,13 @@
 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 +147,Execution,એક્ઝેક્યુશન
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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,વસ્તુઓ અને પ્રાઇસીંગ
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},કુલ સમય: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},તારીખ થી નાણાકીય વર્ષ અંદર પ્રયત્ન કરીશું. તારીખ થી એમ ધારી રહ્યા છીએ = {0}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,Cost Center {0} does not belong to Company {1},કેન્દ્ર {0} કંપની ને અનુલક્ષતું નથી કિંમત {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +100,Cost Center {0} does not belong to Company {1},કેન્દ્ર {0} કંપની ને અનુલક્ષતું નથી કિંમત {1}
 DocType: Customer,Individual,વ્યક્તિગત
 DocType: Interest,Academics User,શિક્ષણવિંદો વપરાશકર્તા
 DocType: Cheque Print Template,Amount In Figure,રકમ આકૃતિ
@@ -225,30 +224,32 @@
 DocType: Production Planning Tool,Sales Orders,વેચાણ ઓર્ડર
 DocType: Purchase Taxes and Charges,Valuation,મૂલ્યાંકન
 ,Purchase Order Trends,ઓર્ડર પ્રવાહો ખરીદી
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,The request for quotation can be accessed by clicking on the following link,અવતરણ માટે વિનંતી નીચેની લિંક પર ક્લિક કરીને વાપરી શકાય છે
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,વર્ષ માટે પાંદડા ફાળવો.
 DocType: SG Creation Tool Course,SG Creation Tool Course,એસજી બનાવટ સાધન કોર્સ
 DocType: Student Group Creation Tool,Leave blank if you wish to fetch all courses for selected academic term,"ખાલી છોડી દો, તો તમે પસંદ શૈક્ષણિક મુદત માટે તમામ કોર્સીસ મેળવે કરવા માંગો છો"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,Insufficient Stock,અપૂરતી સ્ટોક
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227,Insufficient Stock,અપૂરતી સ્ટોક
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,અક્ષમ કરો ક્ષમતા આયોજન અને સમય ટ્રેકિંગ
+DocType: Email Digest,New Sales Orders,નવા વેચાણની ઓર્ડર
 DocType: Bank Reconciliation,Bank Account,બેંક એકાઉન્ટ
 DocType: Leave Type,Allow Negative Balance,નેગેટિવ બેલેન્સ માટે પરવાનગી આપે છે
 DocType: Selling Settings,Default Territory,મૂળભૂત પ્રદેશ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,દૂરદર્શન
 DocType: Production Order Operation,Updated via 'Time Log',&#39;સમય લોગ&#39; મારફતે સુધારાશે
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} does not belong to Company {1},એકાઉન્ટ {0} કંપની ને અનુલક્ષતું નથી {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +86,Account {0} does not belong to Company {1},એકાઉન્ટ {0} કંપની ને અનુલક્ષતું નથી {1}
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},એડવાન્સ રકમ કરતાં વધારે ન હોઈ શકે {0} {1}
 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 +174,For Warehouse is required before Submit,વેરહાઉસ માટે જમા પહેલાં જરૂરી છે
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,For Warehouse is required before Submit,વેરહાઉસ માટે જમા પહેલાં જરૂરી છે
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,પર પ્રાપ્ત
 DocType: Sales Partner,Reseller,પુનર્વિક્રેતા
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,કંપની દાખલ કરો
 DocType: Delivery Note Item,Against Sales Invoice Item,સેલ્સ ભરતિયું વસ્તુ સામે
 ,Production Orders in Progress,પ્રગતિ ઉત્પાદન ઓર્ડર્સ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Cash from Financing,નાણાકીય થી ચોખ્ખી રોકડ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1436,"LocalStorage is full , did not save","LocalStorage સંપૂર્ણ છે, સાચવી ન હતી"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1460,"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}
@@ -261,18 +262,19 @@
 apps/erpnext/erpnext/templates/generators/item.html +78,No description given,આપવામાં કોઈ વર્ણન
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,ખરીદી માટે વિનંતી.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +5,This is based on the Time Sheets created against this project,આ સમય શીટ્સ આ પ્રોજેક્ટ સામે બનાવવામાં પર આધારિત છે
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Only the selected Leave Approver can submit this Leave Application,ફક્ત પસંદ કરેલ છોડો તાજનો આ છોડી અરજી સબમિટ કરી શકો છો
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +213,Only the selected Leave Approver can submit this Leave Application,ફક્ત પસંદ કરેલ છોડો તાજનો આ છોડી અરજી સબમિટ કરી શકો છો
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,તારીખ રાહત જોડાયા તારીખ કરતાં મોટી હોવી જ જોઈએ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Leaves per Year,દર વર્ષે પાંદડાં
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,દર વર્ષે પાંદડાં
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,રો {0}: કૃપા કરીને તપાસો એકાઉન્ટ સામે &#39;અગાઉથી છે&#39; {1} આ એક અગાઉથી પ્રવેશ હોય તો.
 apps/erpnext/erpnext/stock/utils.py +188,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
 DocType: Task,Total Costing Amount (via Time Sheet),કુલ પડતર રકમ (સમયનો શીટ મારફતે)
 DocType: Item Website Specification,Item Website Specification,વસ્તુ વેબસાઇટ સ્પષ્ટીકરણ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +435,Leave Blocked,છોડો અવરોધિત
-apps/erpnext/erpnext/stock/doctype/item/item.py +669,Item {0} has reached its end of life on {1},વસ્તુ {0} પર તેના જીવનના અંતે પહોંચી ગયું છે {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +443,Leave Blocked,છોડો અવરોધિત
+apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item {0} has reached its end of life on {1},વસ્તુ {0} પર તેના જીવનના અંતે પહોંચી ગયું છે {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +95,Bank Entries,બેન્ક પ્રવેશો
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +83,Annual,વાર્ષિક
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +86,Annual,વાર્ષિક
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,સ્ટોક રિકંસીલેશન વસ્તુ
 DocType: Stock Entry,Sales Invoice No,સેલ્સ ભરતિયું કોઈ
 DocType: Material Request Item,Min Order Qty,મીન ઓર્ડર Qty
@@ -280,20 +282,22 @@
 DocType: Lead,Do Not Contact,સંપર્ક કરો
 apps/erpnext/erpnext/public/js/setup_wizard.js +360,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 +91,Software Developer,સોફ્ટવેર ડેવલોપર
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,સોફ્ટવેર ડેવલોપર
 DocType: Item,Minimum Order Qty,ન્યુનત્તમ ઓર્ડર Qty
 DocType: Pricing Rule,Supplier Type,પુરવઠોકર્તા પ્રકાર
 DocType: Scheduling Tool,Course Start Date,કોર્સ શરૂ તારીખ
 DocType: Item,Publish in Hub,હબ પ્રકાશિત
+DocType: Student Admission,Student Admission,વિદ્યાર્થી પ્રવેશ
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is cancelled,{0} વસ્તુ રદ કરવામાં આવે છે
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Material Request,સામગ્રી વિનંતી
+apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} is cancelled,{0} વસ્તુ રદ કરવામાં આવે છે
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +823,Material Request,સામગ્રી વિનંતી
 DocType: Bank Reconciliation,Update Clearance Date,સુધારા ક્લિયરન્સ તારીખ
 apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +28,Abbreviation already used for another salary component,સંક્ષેપનો પહેલાથી જ બીજા પગાર ઘટક માટે વપરાય
 DocType: Item,Purchase Details,ખરીદી વિગતો
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +328,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},ખરીદી માટે &#39;કાચો માલ પાડેલ&#39; ટેબલ મળી નથી વસ્તુ {0} {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +333,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/config/selling.py +18,Confirmed orders from Customers.,ગ્રાહકો પાસેથી પુષ્ટિ ઓર્ડર.
 DocType: Purchase Receipt Item,Rejected Quantity,નકારેલું જથ્થો
 DocType: SMS Settings,SMS Sender Name,એસએમએસ પ્રેષકનું નામ
@@ -309,20 +313,21 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +130,Please select Charge Type first,પ્રથમ ચાર્જ પ્રકાર પસંદ કરો
 DocType: Student Group Student,Student Group Student,વિદ્યાર્થી જૂથ વિદ્યાર્થી
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,તાજેતરના
+DocType: Email Digest,New Quotations,ન્યૂ સુવાકયો
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,યાદીમાં પ્રથમ છોડો તાજનો મૂળભૂત છોડો તાજનો તરીકે સેટ કરવામાં આવશે
 DocType: Tax Rule,Shipping County,શીપીંગ કાઉન્ટી
 apps/erpnext/erpnext/config/desktop.py +158,Learn,જાણો
 DocType: Asset,Next Depreciation Date,આગળ અવમૂલ્યન તારીખ
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,કર્મચારી દીઠ પ્રવૃત્તિ કિંમત
 DocType: Accounts Settings,Settings for Accounts,એકાઉન્ટ્સ માટે સુયોજનો
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +626,Supplier Invoice No exists in Purchase Invoice {0},પુરવઠોકર્તા ભરતિયું બોલ પર કોઈ ખરીદી ભરતિયું અસ્તિત્વમાં {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +629,Supplier Invoice No exists in Purchase Invoice {0},પુરવઠોકર્તા ભરતિયું બોલ પર કોઈ ખરીદી ભરતિયું અસ્તિત્વમાં {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,વેચાણ વ્યક્તિ વૃક્ષ મેનેજ કરો.
 DocType: Job Applicant,Cover Letter,પરબિડીયુ
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,ઉત્કૃષ્ટ Cheques અને સાફ ડિપોઝિટ
 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 +348,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 +86,Circular Reference Error,ગોળ સંદર્ભ ભૂલ
@@ -334,15 +339,16 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,આપોઆપ સામગ્રી વિનંતી બનાવટ પર ઇમેઇલ દ્વારા સૂચિત
 DocType: Journal Entry,Multi Currency,મલ્ટી કરન્સી
 DocType: Payment Reconciliation Invoice,Invoice Type,ભરતિયું પ્રકાર
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +806,Delivery Note,ડિલીવરી નોંધ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +800,Delivery Note,ડિલીવરી નોંધ
 apps/erpnext/erpnext/config/learn.py +87,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 +233,Payment Entry has been modified after you pulled it. Please pull it again.,તમે તેને ખેંચી ચુકવણી પછી એન્ટ્રી સુધારાઈ ગયેલ છે. તેને ફરીથી ખેંચી કરો.
+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/setup/doctype/email_digest/email_digest.py +104,Summary for this week and pending activities,આ અઠવાડિયે અને બાકી પ્રવૃત્તિઓ માટે સારાંશ
+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","અલ્પવિરામ દ્વારા અલગ દાખલ ઇમેઇલ ને, ભરતિયું ચોક્કસ તારીખ પર આપોઆપ મોકલવામાં આવશે"
 DocType: Employee,Company Email,કંપની ઇમેઇલ
@@ -354,27 +360,28 @@
 apps/erpnext/erpnext/config/hr.py +186,"Employee designation (e.g. CEO, Director etc.).",કર્મચારીનું હોદ્દો (દા.ત. સીઇઓ ડિરેક્ટર વગેરે).
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,દાખલ ક્ષેત્ર કિંમત &#39;ડે મહિનો પર પુનરાવર્તન&#39; કરો
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"ગ્રાહક કરન્સી ગ્રાહક આધાર ચલણ ફેરવાય છે, જે અંતે દર"
-apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},રો # {0} ખરીદી ભરતિયું હાલની એસેટ સામે નથી કરી શકાય છે {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +554,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},રો # {0} ખરીદી ભરતિયું હાલની એસેટ સામે નથી કરી શકાય છે {1}
 DocType: Item Tax,Tax Rate,ટેક્સ રેટ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} પહેલાથી જ કર્મચારી માટે ફાળવવામાં {1} માટે સમય {2} માટે {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +812,Select Item,પસંદ કરો વસ્તુ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +791,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/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,ભરતિયું {0} પહેલાથી જ રજૂ કરવામાં આવે છે ખરીદી
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},ROW # {0}: બેચ કોઈ તરીકે જ હોવી જોઈએ {1} {2}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +143,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.,આઇટમ બેચ (ઘણો).
 DocType: C-Form Invoice Detail,Invoice Date,ભરતિયું તારીખ
 DocType: GL Entry,Debit Amount,ડેબિટ રકમ
 apps/erpnext/erpnext/accounts/party.py +242,There can only be 1 Account per Company in {0} {1},માત્ર કંપની દીઠ 1 એકાઉન્ટ હોઈ શકે છે {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +4,Your email address,તમારું ઈ મેઈલ સરનામું
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +342,Please see attachment,જોડાણ જુઓ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,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 +19,Setup Already Complete!!,સેટઅપ પહેલેથી પૂર્ણ !!
 ,Finished Goods,ફિનિશ્ડ ગૂડ્સ
 DocType: Delivery Note,Instructions,સૂચનાઓ
 DocType: Quality Inspection,Inspected By,દ્વારા પરીક્ષણ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,પુરવઠોકર્તા&gt; પુરવઠોકર્તા પ્રકાર
 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,વસ્તુઓ ઉમેરો
@@ -388,29 +395,29 @@
 DocType: Currency Exchange,Currency Exchange,કરન્સી એક્સચેન્જ
 DocType: Purchase Invoice Item,Item Name,વસ્તુ નામ
 DocType: Authorization Rule,Approving User  (above authorized value),(અધિકૃત કિંમત ઉપર) વપરાશકર્તા એપ્રૂવિંગ
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,ક્રેડિટ બેલેન્સ
+DocType: Email Digest,Credit Balance,ક્રેડિટ બેલેન્સ
 DocType: Employee,Widowed,વિધવા
 DocType: Request for Quotation,Request for Quotation,અવતરણ માટે વિનંતી
 DocType: Salary Slip Timesheet,Working Hours,કામ નાં કલાકો
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,હાલની શ્રેણી શરૂ / વર્તમાન ક્રમ નંબર બદલો.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","બહુવિધ કિંમતના નિયમોમાં જીતવું ચાલુ હોય, વપરાશકર્તાઓ તકરાર ઉકેલવા માટે જાતે અગ્રતા સુયોજિત કરવા માટે કહેવામાં આવે છે."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +736,Purchase Return,ખરીદી પરત
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +715,Purchase Return,ખરીદી પરત
 ,Purchase Register,ખરીદી રજીસ્ટર
 DocType: Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,લાગુ ખર્ચ
 DocType: Workstation,Consumable Cost,ઉપભોજ્ય કિંમત
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +202,{0} ({1}) must have role 'Leave Approver',{0} ({1}) ભૂમિકા હોવી જ જોઈએ &#39;છોડી તાજનો&#39;
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,{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 +143,Reason for losing,ગુમાવી માટે કારણ
-apps/erpnext/erpnext/accounts/utils.py +239,Allocated amount can not greater than unadjusted amount,સોંપાયેલ રકમ અસમાયોજિત રકમ કરતાં વધારે ન કરી શકો છો
+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,સોંપાયેલ રકમ અસમાયોજિત રકમ કરતાં વધારે ન કરી શકો છો
 DocType: Announcement,Receiver,રીસીવર
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},વર્કસ્ટેશન રજા યાદી મુજબ નીચેની તારીખો પર બંધ છે: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,તકો
 DocType: Employee,Single,એક
 DocType: Account,Cost of Goods Sold,માલની કિંમત વેચાઈ
 DocType: Purchase Invoice,Yearly,વાર્ષિક
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +225,Please enter Cost Center,ખર્ચ કેન્દ્રને દાખલ કરો
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,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,એક્ઝામિનર નામ
@@ -423,26 +430,26 @@
 DocType: Purchase Invoice,Supplier Name,પુરવઠોકર્તા નામ
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,આ ERPNext માર્ગદર્શિકા વાંચવા
 DocType: Account,Is Group,Is ગ્રુપ
+DocType: Email Digest,Pending Purchase Orders,ખરીદી ઓર્ડર બાકી
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,આપમેળે FIFO પર આધારિત અમે સીરીયલ સેટ
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,ચેક પુરવઠોકર્તા ભરતિયું નંબર વિશિષ્ટતા
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',&#39;કેસ નંબર&#39; &#39;કેસ નંબર પ્રતિ&#39; કરતાં ઓછી ન હોઈ શકે
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,Non Profit,બિન નફો
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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: Stock Reconciliation Item,Do not include symbols (ex. $),પ્રતીકો સમાવશો નહિં (નિર્ગ. $)
 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 +638,Attribute {0} selected multiple times in Attributes Table,એટ્રીબ્યુટ {0} લક્ષણો ટેબલ ઘણી વખત પસંદ
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,એટ્રીબ્યુટ {0} લક્ષણો ટેબલ ઘણી વખત પસંદ
 DocType: HR Settings,Employee record is created using selected field. ,કર્મચારીનું રેકોર્ડ પસંદ ક્ષેત્ર ઉપયોગ કરીને બનાવવામાં આવે છે.
 DocType: Sales Order,Not Applicable,લાગુ નથી
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,હોલિડે માસ્ટર.
 DocType: Request for Quotation Item,Required Date,જરૂરી તારીખ
 DocType: Delivery Note,Billing Address,બિલિંગ સરનામું
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +862,Please enter Item Code.,વસ્તુ કોડ દાખલ કરો.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +847,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","ચકાસાયેલ જો પહેલેથી પ્રિન્ટ દર છાપો / રકમ સમાવેશ થાય છે, કારણ કે કર રકમ ગણવામાં આવશે"
@@ -456,12 +463,12 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,સિક્યોરિટીઝ અને થાપણો
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,ફાળવવામાં કુલ પાંદડા ફરજિયાત છે
 DocType: Job Opening,Description of a Job Opening,એક જોબ ખુલી વર્ણન
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Pending activities for today,આજે બાકી પ્રવૃત્તિઓ
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,આજે બાકી પ્રવૃત્તિઓ
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,હાજરીનો વિક્રમ છે.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Timesheet આધારિત પેરોલ માટે પગાર પુન.
 DocType: Sales Order Item,Used for Production Plan,ઉત્પાદન યોજના માટે વપરાય છે
 DocType: Manufacturing Settings,Time Between Operations (in mins),(મિનિટ) ઓપરેશન્સ વચ્ચે સમય
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +92,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} એકાઉન્ટ {1} કિંમત કેન્દ્ર સામે બજેટમાં {2} છે {3}. તે દ્વારા કરતાં વધી જશે {4}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +95,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} એકાઉન્ટ {1} કિંમત કેન્દ્ર સામે બજેટમાં {2} છે {3}. તે દ્વારા કરતાં વધી જશે {4}
 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 જ વસ્તુ માટે નથી
@@ -469,16 +476,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +238,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 +86,Administrative Officer,વહીવટી અધિકારીશ્રી
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,વહીવટી અધિકારીશ્રી
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +23,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 +319,Please select Company,કંપની પસંદ કરો
-DocType: Stock Entry,Difference Account,તફાવત એકાઉન્ટ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +309,Please select Company,કંપની પસંદ કરો
+DocType: Stock Entry Detail,Difference Account,તફાવત એકાઉન્ટ
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,તેના આશ્રિત કાર્ય {0} બંધ નથી નજીક કાર્ય નથી કરી શકો છો.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Please enter Warehouse for which Material Request will be raised,"સામગ્રી વિનંતી ઊભા કરવામાં આવશે, જેના માટે વેરહાઉસ દાખલ કરો"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +399,Please enter Warehouse for which Material Request will be raised,"સામગ્રી વિનંતી ઊભા કરવામાં આવશે, જેના માટે વેરહાઉસ દાખલ કરો"
 DocType: Production Order,Additional Operating Cost,વધારાની ઓપરેટીંગ ખર્ચ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,કોસ્મેટિક્સ
-apps/erpnext/erpnext/stock/doctype/item/item.py +530,"To merge, following properties must be same for both items","મર્જ, નીચેના ગુણધર્મો બંને આઇટમ્સ માટે જ હોવી જોઈએ"
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,"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 +28,Buy,ખરીદો
@@ -486,7 +493,7 @@
 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 +1563,Serial no item cannot be a fraction,સીરીયલ કોઈ આઇટમ એક અપૂર્ણાંક ન હોઈ શકે
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1587,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
@@ -495,13 +502,14 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Account {0} does not belong to company: {1},{0} એકાઉન્ટ કંપની ને અનુલક્ષતું નથી: {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation already used for another company,સંક્ષેપનો પહેલેથી બીજી કંપની માટે વપરાય
 DocType: Selling Settings,Default Customer Group,મૂળભૂત ગ્રાહક જૂથ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Supplier is required against Payable account {0},પુરવઠોકર્તા ચૂકવવાપાત્ર એકાઉન્ટ સામે જરૂરી છે {0}
 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 ન હોઈ શકે
 DocType: Production Planning Tool,Material Requirement,સામગ્રી જરૂરિયાત
 DocType: Company,Delete Company Transactions,કંપની વ્યવહારો કાઢી નાખો
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +313,Reference No and Reference Date is mandatory for Bank transaction,સંદર્ભ કોઈ અને સંદર્ભ તારીખ બેન્ક ટ્રાન્ઝેક્શન માટે ફરજિયાત છે
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +316,Reference No and Reference Date is mandatory for Bank transaction,સંદર્ભ કોઈ અને સંદર્ભ તારીખ બેન્ક ટ્રાન્ઝેક્શન માટે ફરજિયાત છે
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,/ સંપાદિત કરો કર અને ખર્ચ ઉમેરો
 DocType: Purchase Invoice,Supplier Invoice No,પુરવઠોકર્તા ભરતિયું કોઈ
 DocType: Territory,For reference,સંદર્ભ માટે
@@ -512,7 +520,6 @@
 DocType: Installation Note Item,Installation Note Item,સ્થાપન નોંધ વસ્તુ
 DocType: Production Plan Item,Pending Qty,બાકી Qty
 DocType: Budget,Ignore,અવગણો
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,વસ્તુ code&gt; વસ્તુ ગ્રુપ&gt; બ્રાન્ડ
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,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
@@ -523,11 +530,11 @@
 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/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,ભરતિયું ટેબલ માં શોધી કોઈ રેકોર્ડ
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +28,Please select Company and Party Type first,પ્રથમ કંપની અને પાર્ટી પ્રકાર પસંદ કરો
+apps/erpnext/erpnext/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/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 +707,Make Sales Order,વેચાણ ઓર્ડર બનાવો
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +701,Make Sales Order,વેચાણ ઓર્ડર બનાવો
 DocType: Project Task,Project Task,પ્રોજેક્ટ ટાસ્ક
 ,Lead Id,લીડ આઈડી
 DocType: C-Form Invoice Detail,Grand Total,કુલ સરવાળો
@@ -543,7 +550,8 @@
 DocType: Job Applicant,Resume Attachment,ફરી શરૂ કરો જોડાણ
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,પુનરાવર્તન ગ્રાહકો
 DocType: Leave Control Panel,Allocate,ફાળવો
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +734,Sales Return,વેચાણ પરત
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +728,Sales Return,વેચાણ પરત
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +91,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,નોંધ: કુલ ફાળવેલ પાંદડા {0} પહેલાથી મંજૂર પાંદડા કરતાં ઓછી ન હોવી જોઈએ {1} સમયગાળા માટે
 DocType: Announcement,Posted By,દ્વારા પોસ્ટ કરવામાં આવ્યું
 DocType: Item,Delivered by Supplier (Drop Ship),સપ્લાયર દ્વારા વિતરિત (ડ્રૉપ જહાજ)
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,સંભવિત ગ્રાહકો ડેટાબેઝ.
@@ -552,14 +560,13 @@
 DocType: Quotation,Quotation To,માટે અવતરણ
 DocType: Lead,Middle Income,મધ્યમ આવક
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +212,Opening (Cr),ખુલી (સીઆર)
-apps/erpnext/erpnext/stock/doctype/item/item.py +795,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,જો તમે પહેલાથી જ અન્ય UOM સાથે કેટલાક વ્યવહાર (ઓ) કર્યા છે કારણ કે વસ્તુ માટે માપવા એકમ મૂળભૂત {0} સીધા બદલી શકાતું નથી. તમે વિવિધ મૂળભૂત UOM વાપરવા માટે એક નવી આઇટમ બનાવવા માટે જરૂર પડશે.
-apps/erpnext/erpnext/accounts/utils.py +237,Allocated amount can not be negative,ફાળવેલ રકમ નકારાત્મક ન હોઈ શકે
+apps/erpnext/erpnext/stock/doctype/item/item.py +797,Default Unit of Measure for Item {0} cannot be changed directly because 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,ફાળવેલ રકમ નકારાત્મક ન હોઈ શકે
 DocType: Purchase Order Item,Billed Amt,ચાંચ એએમટી
 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 +91,Reference No & Reference Date is required for {0},સંદર્ભ કોઈ અને સંદર્ભ તારીખ માટે જરૂરી છે {0}
-DocType: Sales Invoice,Customer's Vendor,ગ્રાહક વેન્ડર
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Proposal Writing,દરખાસ્ત લેખન
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,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","જો વસ્તુઓ છે કે જે પેટા કોન્ટ્રાક્ટ સામગ્રી અરજીઓ સમાવવામાં આવશે છે ચકાસાયેલ છે, કાચી સામગ્રી"
@@ -568,13 +575,14 @@
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,સમયનો ટ્રેકિંગ
 DocType: Fiscal Year Company,Fiscal Year Company,ફિસ્કલ યર કંપની
 DocType: Packing Slip Item,DN Detail,DN વિગતવાર
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +257,Already supplier quotation has created,પહેલેથી જ સપ્લાયર અવતરણ બનાવી છે
 DocType: Timesheet,Billed,ગણાવી
 DocType: Batch,Batch Description,બેચ વર્ણન
+apps/erpnext/erpnext/accounts/utils.py +685,"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 +733,View Offline Records,જુઓ ઑફલાઇન રેકોર્ડ્સ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +715,View Offline Records,જુઓ ઑફલાઇન રેકોર્ડ્સ
+DocType: Student,Sibling Details,બહેન વિગતો
 DocType: Employee,Reason for Resignation,રાજીનામાની કારણ
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,કામગીરી appraisals માટે નમૂનો.
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,ભરતિયું / જર્નલ પ્રવેશ વિગતો
@@ -588,7 +596,7 @@
 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,ઇન્વેન્ટરીમાં કુલ ફેરફાર
 DocType: Employee,Passport Number,પાસપોર્ટ નંબર
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Manager,વ્યવસ્થાપક
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,વ્યવસ્થાપક
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,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; જ ન હોઈ શકે
@@ -597,10 +605,11 @@
 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 +299,Timesheet created:,Timesheet બનાવવામાં:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +715,Please set default Cash or Bank account in Mode of Payment {0},ચૂકવણીની પદ્ધતિ મૂળભૂત કેશ અથવા બેન્ક એકાઉન્ટ સેટ કરો {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +300,Timesheet created:,Timesheet બનાવવામાં:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +772,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,નોંધણી
 DocType: Selling Settings,Customer Naming By,કરીને ગ્રાહક નામકરણ
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,કૃપા કરીને સુયોજિત કર્મચારીનું માનવ સંસાધન નામકરણ સિસ્ટમ&gt; એચઆર સેટિંગ્સ
 DocType: Depreciation Schedule,Depreciation Amount,અવમૂલ્યન રકમ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,ગ્રુપ કન્વર્ટ
 DocType: Activity Cost,Activity Type,પ્રવૃત્તિ પ્રકાર
@@ -625,6 +634,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,સમાપ્ત
 DocType: Pricing Rule,Sales Manager,વેચાણ મેનેજર
 DocType: Salary Structure Employee,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,એસેટ નિકાલ પર ગેઇન / નુકશાન એકાઉન્ટ
@@ -639,11 +649,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +9,Pre Sales,પૂર્વ વેચાણ
 DocType: Purchase Receipt,Other Details,અન્ય વિગતો
 DocType: Account,Accounts,એકાઉન્ટ્સ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Marketing,માર્કેટિંગ
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +227,Payment Entry is already created,ચુકવણી એન્ટ્રી પહેલાથી જ બનાવવામાં આવે છે
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,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 +538,Row #{0}: Asset {1} does not linked to Item {2},રો # {0}: એસેટ {1} વસ્તુ કડી નથી {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +21,Preview Salary Slip,પૂર્વદર્શન પગાર કાપલી
+apps/erpnext/erpnext/controllers/accounts_controller.py +541,Row #{0}: Asset {1} does not linked to Item {2},રો # {0}: એસેટ {1} વસ્તુ કડી નથી {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +38,Preview Salary Slip,પૂર્વદર્શન પગાર કાપલી
 DocType: Company,Deafult Cost Center,Deafult કિંમત કેન્દ્ર
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +48,Account {0} has been entered multiple times,એકાઉન્ટ {0} ઘણી વખત દાખલ કરવામાં આવી છે
 DocType: Account,Expenses Included In Valuation,ખર્ચ વેલ્યુએશનમાં સમાવાયેલ
@@ -652,7 +662,7 @@
 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 +617,Item has variants.,વસ્તુ ચલો છે.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,વસ્તુ ચલો છે.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,વસ્તુ {0} મળી નથી
 DocType: Bin,Stock Value,સ્ટોક ભાવ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +25,Company {0} does not exist,કંપની {0} અસ્તિત્વમાં નથી
@@ -672,7 +682,7 @@
 DocType: Purchase Order,Supply Raw Materials,પુરવઠા કાચો માલ
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,આગળ ભરતિયું પેદા થશે કે જેના પર તારીખ. તેને સબમિટ પર પેદા થયેલ છે.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,વર્તમાન અસ્કયામતો
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,{0} is not a stock Item,{0} સ્ટોક વસ્તુ નથી
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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 +169,Lead must be set if Opportunity is made from Lead,"તક લીડ બનાવવામાં આવે છે, તો લીડ સુયોજિત થવુ જ જોઇએ"
@@ -739,26 +749,25 @@
 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 +709,No Permission,પરવાનગી નથી
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +710,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}
 apps/erpnext/erpnext/public/js/setup_wizard.js +298,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 +542,Row #{0}: Asset {1} must be submitted,રો # {0}: એસેટ {1} સબમિટ હોવું જ જોઈએ
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,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,એક વિક્રેતા subcontracted તો
 DocType: SMS Center,All Customer Contact,બધા ગ્રાહક સંપર્ક
 apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,CSV મારફતે સ્ટોક બેલેન્સ અપલોડ કરો.
 DocType: Warehouse,Tree Details,વૃક્ષ વિગતો
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,હવે મોકલો
 ,Support Analytics,આધાર ઍનલિટિક્સ
 DocType: Item,Website Warehouse,વેબસાઇટ વેરહાઉસ
 DocType: Payment Reconciliation,Minimum Invoice Amount,ન્યુનત્તમ ભરતિયું રકમ
 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/sales_invoice/sales_invoice.py +227,Timesheet {0} is already completed or cancelled,Timesheet {0} પહેલેથી જ પૂર્ણ અથવા રદ થયેલ છે
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +259,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 કરતાં ઓછી અથવા સમાન હોવા જ જોઈએ
@@ -774,13 +783,13 @@
 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 +229,Target Warehouse,લક્ષ્યાંક વેરહાઉસ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +230,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-,STE-
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Sales Order Date,અપેક્ષિત બોલ તારીખ સેલ્સ ઓર્ડર તારીખ પહેલાં ન હોઈ શકે
 DocType: Upload Attendance,Import Attendance,આયાત એટેન્ડન્સ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,બધા આઇટમ જૂથો
+apps/erpnext/erpnext/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/config/setup.py +89,Automatically compose message on submission of transactions.,આપમેળે વ્યવહારો સબમિશન પર સંદેશ કંપોઝ.
@@ -792,13 +801,15 @@
 DocType: Sales Invoice,Payment Due Date,ચુકવણી કારણે તારીખ
 apps/erpnext/erpnext/stock/doctype/item/item.js +278,Item Variant {0} already exists with same attributes,વસ્તુ વેરિએન્ટ {0} પહેલાથી જ લક્ષણો સાથે હાજર
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;ખુલી&#39;
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,આવું કરવા માટે ઓપન
 DocType: Notification Control,Delivery Note Message,ડ લવર નોંધ સંદેશ
 DocType: Expense Claim,Expenses,ખર્ચ
 DocType: Item Variant Attribute,Item Variant Attribute,વસ્તુ વેરિએન્ટ એટ્રીબ્યુટ
 ,Purchase Receipt Trends,ખરીદી રસીદ પ્રવાહો
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Research & Development,રિસર્ચ એન્ડ ડેવલપમેન્ટ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,રિસર્ચ એન્ડ ડેવલપમેન્ટ
 ,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,ભાવ અથવા ડિસ્કાઉન્ટ
@@ -807,7 +818,7 @@
 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/controllers/accounts_controller.py +340,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","ચુકવણી એન્ટ્રી {0} ઓર્ડર {1}, ચેક, તો તે આ બિલ અગાઉથી તરીકે ખેંચાય જોઇએ સામે કડી થયેલ છે."
+apps/erpnext/erpnext/controllers/accounts_controller.py +343,"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,પોઇન્ટ ઓફ સેલ
@@ -829,12 +840,12 @@
 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 +756,Purchase Receipt,ખરીદી રસીદ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +735,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 +167,Reference Doctype must be one of {0},સંદર્ભ Doctype એક હોવો જ જોઈએ {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +282,Unable to find Time Slot in the next {0} days for Operation {1},ઓપરેશન માટે આગામી {0} દિવસોમાં સમય સ્લોટ શોધવામાં અસમર્થ {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +170,Reference Doctype must be one of {0},સંદર્ભ Doctype એક હોવો જ જોઈએ {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Unable to find Time Slot in the next {0} days for Operation {1},ઓપરેશન માટે આગામી {0} દિવસોમાં સમય સ્લોટ શોધવામાં અસમર્થ {1}
 DocType: Production Order,Plan material for sub-assemblies,પેટા-સ્થળોના માટે યોજના સામગ્રી
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,સેલ્સ પાર્ટનર્સ અને પ્રદેશ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be active,BOM {0} સક્રિય હોવા જ જોઈએ
@@ -845,7 +856,7 @@
 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 +214,Warehouses with existing transaction can not be converted to ledger.,હાલની વ્યવહાર સાથે વખારો ખાતાવહી રૂપાંતરિત કરી શકાય છે.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +217,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,ઉત્પાદન ઓર્ડર્સ
@@ -859,9 +870,9 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,{0} કર્મચારીનું સક્રિય નથી અથવા અસ્તિત્વમાં નથી
 DocType: Fee Structure,Components,ઘટકો
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,Please enter Asset Category in Item {0},વસ્તુ દાખલ કરો એસેટ વર્ગ {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +612,Item Variants {0} updated,વસ્તુ ચલો {0} સુધારાશે
+apps/erpnext/erpnext/stock/doctype/item/item.py +614,Item Variants {0} updated,વસ્તુ ચલો {0} સુધારાશે
 DocType: Quality Inspection Reading,Reading 6,6 વાંચન
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +843,Cannot {0} {1} {2} without any negative outstanding invoice,નથી {0} {1} {2} વગર કોઈપણ નકારાત્મક બાકી ભરતિયું કરી શકો છો
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +854,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,હવે સમન્વય
@@ -876,69 +887,72 @@
 DocType: Item,Is Purchase Item,ખરીદી વસ્તુ છે
 DocType: Asset,Purchase Invoice,ખરીદી ભરતિયું
 DocType: Stock Ledger Entry,Voucher Detail No,વાઉચર વિગતવાર કોઈ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +728,New Sales Invoice,ન્યૂ વેચાણ ભરતિયું
+apps/erpnext/erpnext/accounts/page/pos/pos.js +710,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 +728,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: Cheque Print Template,Has Print Format,પ્રિન્ટ ફોર્મેટ છે
-apps/erpnext/erpnext/accounts/page/pos/pos.js +86, is mandatory. Maybe Currency Exchange record is not created for ,ફરજિયાત છે. કદાચ ચલણ એક્સચેન્જ રેકોર્ડ માટે બનાવવામાં નથી
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +109,Row #{0}: Please specify Serial No for Item {1},ROW # {0}: વસ્તુ માટે કોઈ સીરીયલ સ્પષ્ટ કરો {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +619,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","&#39;ઉત્પાદન બંડલ&#39; વસ્તુઓ, વેરહાઉસ, સીરીયલ કોઈ અને બેચ માટે કોઈ &#39;પેકિંગ યાદી&#39; ટેબલ પરથી ગણવામાં આવશે. વેરહાઉસ અને બેચ કોઈ કોઈ &#39;ઉત્પાદન બંડલ&#39; આઇટમ માટે બધા પેકિંગ વસ્તુઓ માટે જ છે, તો તે કિંમતો મુખ્ય વસ્તુ ટેબલ દાખલ કરી શકાય, મૂલ્યો મેજની યાદી પેકિંગ &#39;નકલ થશે."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +75, 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 +613,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing 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 +606,Supplier Invoice Date cannot be greater than Posting Date,પુરવઠોકર્તા ભરતિયું તારીખ પોસ્ટ તારીખ કરતાં વધારે ન હોઈ શકે
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +609,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: 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 +810,Select Item for Transfer,ટ્રાન્સફર માટે પસંદ વસ્તુ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +789,Select Item for Transfer,ટ્રાન્સફર માટે પસંદ વસ્તુ
 DocType: Purchase Invoice,Additional Discount Percentage,વધારાના ડિસ્કાઉન્ટ ટકાવારી
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,તમામ મદદ વિડિઓઝ યાદી જુઓ
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,ચેક જમા કરવામાં આવી હતી જ્યાં બેન્ક ઓફ પસંદ એકાઉન્ટ વડા.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,વપરાશકર્તા વ્યવહારો ભાવ યાદી દર ફેરફાર કરવા માટે પરવાનગી આપે છે
 DocType: Pricing Rule,Max Qty,મેક્સ Qty
-DocType: Student Applicant,Father's Name,પિતાનું નામ
 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 +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,રો {0}: / સેલ્સ ખરીદી ઓર્ડર સામે ચુકવણી હંમેશા અગાઉથી તરીકે ચિહ્નિત થયેલ હોવી જોઈએ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,કેમિકલ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +686,All items have already been transferred for this Production Order.,બધી વસ્તુઓ પહેલેથી જ આ ઉત્પાદન ઓર્ડર માટે તબદીલ કરવામાં આવી છે.
+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} અને ફરીથી પ્રયાસ કરો
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +694,All items have already been transferred for this Production Order.,બધી વસ્તુઓ પહેલેથી જ આ ઉત્પાદન ઓર્ડર માટે તબદીલ કરવામાં આવી છે.
 DocType: Process Payroll,Select Payroll Year and Month,પગારપત્રક વર્ષ અને મહિનામાં પસંદ કરો
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,Meter,મીટર
 DocType: Workstation,Electricity Cost,વીજળી ખર્ચ
 DocType: HR Settings,Don't send Employee Birthday Reminders,કર્મચારીનું જન્મદિવસ રિમાઇન્ડર્સ મોકલશો નહીં
-DocType: Opportunity,Walk In,ચાલવા
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,સ્ટોક પ્રવેશો
 DocType: Item,Inspection Criteria,નિરીક્ષણ માપદંડ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,ટ્રાન્સફર
 apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,તમારો પત્ર વડા અને લોગો અપલોડ કરો. (જો તમે પછીથી તેમને ફેરફાર કરી શકો છો).
 DocType: Timesheet Detail,Bill,બિલ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,White,વ્હાઇટ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date is entered as past date,આગળ અવમૂલ્યન તારીખ છેલ્લા તારીખ તરીકે દાખલ થયેલ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +167,White,વ્હાઇટ
 DocType: SMS Center,All Lead (Open),બધા સીસું (ઓપન)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +228,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),રો {0}: Qty માટે ઉપલબ્ધ નથી {4} વેરહાઉસ {1} પ્રવેશ સમયે પોસ્ટ પર ({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}),રો {0}: Qty માટે ઉપલબ્ધ નથી {4} વેરહાઉસ {1} પ્રવેશ સમયે પોસ્ટ પર ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,એડવાન્સિસ ચૂકવેલ મેળવો
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +731,Make ,બનાવો
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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 +154,Order Type must be one of {0},ઓર્ડર પ્રકાર એક હોવા જ જોઈએ {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},ઓર્ડર પ્રકાર એક હોવા જ જોઈએ {0}
 DocType: Lead,Next Contact Date,આગામી સંપર્ક તારીખ
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Qty ખુલવાનો
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +393,Please enter Account for Change Amount,જથ્થો બદલી માટે એકાઉન્ટ દાખલ કરો
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,Please enter Account for Change Amount,જથ્થો બદલી માટે એકાઉન્ટ દાખલ કરો
 DocType: Student Batch,Student Batch Name,વિદ્યાર્થી બેચ નામ
 DocType: Holiday List,Holiday List Name,રજા યાદી નામ
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js +8,Schedule Course,સૂચિ કોર્સ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Stock Options,સ્ટોક ઓપ્શન્સ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,સ્ટોક ઓપ્શન્સ
 DocType: Journal Entry Account,Expense Claim,ખર્ચ દાવો
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +211,Do you really want to restore this scrapped asset?,શું તમે ખરેખર આ પડયો એસેટ પુનઃસ્થાપિત કરવા માંગો છો?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +237,Qty for {0},માટે Qty {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +212,Do you really want to restore this scrapped asset?,શું તમે ખરેખર આ પડયો એસેટ પુનઃસ્થાપિત કરવા માંગો છો?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,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,બ્લોક યાદી તારીખો છોડો
@@ -947,9 +961,9 @@
 DocType: Company,Default Terms,મૂળભૂત શરતો
 DocType: Packing Slip Item,Packing Slip Item,પેકિંગ કાપલી વસ્તુ
 DocType: Purchase Invoice,Cash/Bank Account,કેશ / બેન્ક એકાઉન્ટ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,જથ્થો અથવા કિંમત કોઈ ફેરફાર સાથે દૂર વસ્તુઓ.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,જથ્થો અથવા કિંમત કોઈ ફેરફાર સાથે દૂર વસ્તુઓ.
 DocType: Delivery Note,Delivery To,ડ લવર
-apps/erpnext/erpnext/stock/doctype/item/item.py +635,Attribute table is mandatory,એટ્રીબ્યુટ ટેબલ ફરજિયાત છે
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,એટ્રીબ્યુટ ટેબલ ફરજિયાત છે
 DocType: Production Planning Tool,Get Sales Orders,વેચાણ ઓર્ડર મેળવો
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} નકારાત્મક ન હોઈ શકે
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,કૃપા કરીને એક વિદ્યાર્થી પસંદ
@@ -974,7 +988,7 @@
 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,WIP વેરહાઉસ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},સીરીયલ કોઈ {0} સુધી જાળવણી કરાર હેઠળ છે {1}
+apps/erpnext/erpnext/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,સંસ્થા નામ
@@ -986,7 +1000,7 @@
 DocType: GL Entry,Against,સામે
 DocType: Item,Default Selling Cost Center,મૂળભૂત વેચાણ ખર્ચ કેન્દ્ર
 DocType: Sales Partner,Implementation Partner,અમલીકરણ જીવનસાથી
-apps/erpnext/erpnext/controllers/selling_controller.py +231,Sales Order {0} is {1},વેચાણ ઓર્ડર {0} છે {1}
+apps/erpnext/erpnext/controllers/selling_controller.py +232,Sales Order {0} is {1},વેચાણ ઓર્ડર {0} છે {1}
 DocType: Opportunity,Contact Info,સંપર્ક માહિતી
 apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,સ્ટોક પ્રવેશો બનાવે
 DocType: Packing Slip,Net Weight UOM,નેટ વજન UOM
@@ -996,25 +1010,24 @@
 DocType: Holiday List,Get Weekly Off Dates,અઠવાડિક બંધ તારીખો મેળવો
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,સમાપ્તિ તારીખ પ્રારંભ તારીખ કરતાં ઓછા ન હોઈ શકે
 DocType: Sales Person,Select company name first.,પ્રથમ પસંદ કંપની નામ.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Dr,ડૉ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Dr,ડૉ
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,સુવાકયો સપ્લાયરો પાસેથી પ્રાપ્ત થઈ છે.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},માટે {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,સરેરાશ ઉંમર
 DocType: 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/templates/pages/home.html +32,View All Products,બધા ઉત્પાદનો જોવા
+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 +400,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,ચેતવણી: સિસ્ટમ વસ્તુ માટે રકમ કારણ overbilling તપાસ કરશે નહીં {0} માં {1} શૂન્ય છે
+apps/erpnext/erpnext/controllers/accounts_controller.py +403,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/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,અને વર્ષ:
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +191,{0} {1} must be submitted,{0} {1} સબમિટ હોવું જ જોઈએ
-DocType: Email Digest,Annual Expense,વાિષર્ક ખચર્
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,{0} {1} must be submitted,{0} {1} સબમિટ હોવું જ જોઈએ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +145,Quantity must be less than or equal to {0},જથ્થો કરતાં ઓછી અથવા સમાન હોવા જ જોઈએ {0}
 DocType: SMS Center,Total Characters,કુલ અક્ષરો
 apps/erpnext/erpnext/controllers/buying_controller.py +156,Please select BOM in BOM field for Item {0},વસ્તુ માટે BOM ક્ષેત્રમાં BOM પસંદ કરો {0}
@@ -1025,30 +1038,31 @@
 DocType: Sales Partner,Distributor,ડિસ્ટ્રીબ્યુટર
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,શોપિંગ કાર્ટ શીપીંગ નિયમ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +211,Production Order {0} must be cancelled before cancelling this Sales Order,ઉત્પાદન ઓર્ડર {0} આ વેચાણ ઓર્ડર રદ પહેલાં રદ થયેલ હોવું જ જોઈએ
-apps/erpnext/erpnext/public/js/controllers/transaction.js +62,Please set 'Apply Additional Discount On',સુયોજિત &#39;પર વધારાની ડિસ્કાઉન્ટ લાગુ&#39; કરો
+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,રેન્જ ઓછી હોઈ શકે છે કરતાં શ્રેણી
 DocType: Global Defaults,Global Defaults,વૈશ્વિક ડિફૉલ્ટ્સ
 apps/erpnext/erpnext/projects/doctype/project/project.py +153,Project Collaboration Invitation,પ્રોજેક્ટ સહયોગ આમંત્રણ
 DocType: Salary Slip,Deductions,કપાત
+DocType: Leave Allocation,LAL/,લાલ /
 apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,પ્રારંભ વર્ષ
 DocType: Purchase Invoice,Start date of current invoice's period,વર્તમાન ભરતિયું માતાનો સમયગાળા તારીખ શરૂ
 DocType: Salary Slip,Leave Without Pay,પગાર વિના છોડો
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +327,Capacity Planning Error,ક્ષમતા આયોજન ભૂલ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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 +362,Finished Item {0} must be entered for Manufacture type entry,સમાપ્ત વસ્તુ {0} ઉત્પાદન પ્રકાર પ્રવેશ માટે દાખલ કરવો જ પડશે
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +367,Finished Item {0} must be entered for Manufacture type entry,સમાપ્ત વસ્તુ {0} ઉત્પાદન પ્રકાર પ્રવેશ માટે દાખલ કરવો જ પડશે
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,ખુલવાનો હિસાબી બેલેન્સ
 DocType: Sales Invoice Advance,Sales Invoice Advance,સેલ્સ ભરતિયું એડવાન્સ
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +499,Nothing to request,કંઈ વિનંતી કરવા
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +500,Nothing to request,કંઈ વિનંતી કરવા
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',&#39;વાસ્તવિક પ્રારંભ તારીખ&#39; &#39;વાસ્તવિક ઓવરને તારીખ&#39; કરતાં વધારે ન હોઈ શકે
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Management,મેનેજમેન્ટ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},ક્યાં ડેબિટ અથવા ક્રેડિટ રકમ માટે જરૂરી છે {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,મેનેજમેન્ટ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +55,Either debit or credit amount is required for {0},ક્યાં ડેબિટ અથવા ક્રેડિટ રકમ માટે જરૂરી છે {0}
 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 +161,Blue,બ્લુ
+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,ઇમેઇલ ને સુયોજિત કરો
@@ -1058,12 +1072,12 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +23,POS Profile {0} already created for user: {1} and company {2},POS પ્રોફાઇલ {0} પહેલાથી જ વપરાશકર્તા માટે બનાવેલ: {1} અને કંપની {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM રૂપાંતર ફેક્ટર
 DocType: Stock Settings,Default Item Group,મૂળભૂત વસ્તુ ગ્રુપ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1374,Do you really want to submit the invoice?,તમે ખરેખર ભરતિયું સબમિટ કરવા માંગો છો?
+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 +685,Cost Center For Item with Item Code ',&#39;આઇટમ કોડ સાથે આઇટમ માટે કેન્દ્ર ખર્ચ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1526,"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 +679,Cost Center For Item with Item Code ',&#39;આઇટમ કોડ સાથે આઇટમ માટે કેન્દ્ર ખર્ચ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1550,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","ચુકવણી સ્થિતિ રૂપરેખાંકિત થયેલ નથી. કૃપા કરીને તપાસો, કે શું એકાઉન્ટ ચૂકવણી સ્થિતિ પર અથવા POS પ્રોફાઇલ પર સેટ કરવામાં આવ્યો છે."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,તમારા વેચાણ વ્યક્તિ ગ્રાહક સંપર્ક કરવા માટે આ તારીખ પર એક રીમાઇન્ડર મળશે
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,"Further accounts can be made under Groups, but entries can be made against non-Groups","વધુ એકાઉન્ટ્સ જૂથો હેઠળ કરી શકાય છે, પરંતુ પ્રવેશો બિન-જૂથો સામે કરી શકાય છે"
 DocType: Lead,Lead,લીડ
@@ -1083,104 +1097,106 @@
 DocType: Payment Reconciliation,Unreconciled Payment Details,Unreconciled ચુકવણી વિગતો
 DocType: Global Defaults,Current Fiscal Year,ચાલુ નાણાકીય વર્ષ
 DocType: Global Defaults,Disable Rounded Total,ગોળાકાર કુલ અક્ષમ કરો
-DocType: Lead,Call,કૉલ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +417,'Entries' cannot be empty,&#39;એન્ટ્રીઝ&#39; ખાલી ન હોઈ શકે
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +418,'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 +214,Fiscal Year {0} not found,ફિસ્કલ વર્ષ {0} મળી નથી
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +221,Fiscal Year {0} not found,ફિસ્કલ વર્ષ {0} મળી નથી
 apps/erpnext/erpnext/config/hr.py +238,Setting up Employees,કર્મચારીઓ સુયોજિત કરી રહ્યા છે
 DocType: Sales Order,SO-,SO-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,પ્રથમ ઉપસર્ગ પસંદ કરો
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Please select prefix first,પ્રથમ ઉપસર્ગ પસંદ કરો
 DocType: Employee,O-,ઓ-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Research,સંશોધન
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,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 +43,Item {0} must be a non-stock item,વસ્તુ {0} નોન-સ્ટોક વસ્તુ હોઇ જ જોઈએ
 DocType: Contact,User ID,વપરાશકર્તા ID
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +57,View Ledger,જુઓ ખાતાવહી
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,જુનું
-apps/erpnext/erpnext/stock/doctype/item/item.py +504,"An Item Group exists with same name, please change the item name or rename the item group","એક વસ્તુ ગ્રુપ જ નામ સાથે હાજર, આઇટમ નામ બદલવા અથવા વસ્તુ જૂથ નામ બદલી કૃપા કરીને"
+apps/erpnext/erpnext/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 +437,Rest Of The World,બાકીનું વિશ્વ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,આ આઇટમ {0} બેચ હોઈ શકે નહિં
 ,Budget Variance Report,બજેટ ફેરફાર રિપોર્ટ
 DocType: Salary Slip,Gross Pay,કુલ પે
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +90,Row {0}: Activity Type is mandatory.,રો {0}: પ્રવૃત્તિ પ્રકાર ફરજિયાત છે.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +114,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/public/js/controllers/stock_controller.js +40,Accounting Ledger,હિસાબી ખાતાવહી
+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,રાખેલી કમાણી
 DocType: BOM Item,Item Description,વસ્તુ વર્ણન
+DocType: Student Sibling,Student Sibling,વિદ્યાર્થી બહેન
 DocType: Purchase Invoice,Is Recurring,રીકરીંગ છે
 DocType: Purchase Invoice,Supplied Items,પૂરી પાડવામાં વસ્તુઓ
 DocType: Student,STUD.,સંવર્ધન.
 DocType: Production Order,Qty To Manufacture,ઉત્પાદન Qty
+DocType: Email Digest,New Income,નવી આવક
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,ખરીદી ચક્ર દરમ્યાન જ દર જાળવી
 DocType: Opportunity Item,Opportunity Item,તક વસ્તુ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,કામચલાઉ ખુલી
 ,Employee Leave Balance,કર્મચારી રજા બેલેન્સ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +131,Balance for Account {0} must always be {1},એકાઉન્ટ માટે બેલેન્સ {0} હંમેશા હોવી જ જોઈએ {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +175,Valuation Rate required for Item in row {0},મૂલ્યાંકન દર પંક્તિ માં વસ્તુ માટે જરૂરી {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,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,ઉદાહરણ: કોમ્પ્યુટર સાયન્સમાં માસ્ટર્સ
 DocType: Purchase Invoice,Rejected Warehouse,નકારેલું વેરહાઉસ
 DocType: GL Entry,Against Voucher,વાઉચર સામે
 DocType: Item,Default Buying Cost Center,ડિફૉલ્ટ ખરીદી ખર્ચ કેન્દ્રને
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","ERPNext બહાર શ્રેષ્ઠ વિચાર, અમે તમને થોડો સમય લાગી અને આ સહાય વિડિઓઝ જોઈ ભલામણ કરીએ છીએ."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +87, to ,માટે
+apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,માટે
 DocType: Item,Lead Time in days,દિવસોમાં લીડ સમય
 ,Accounts Payable Summary,એકાઉન્ટ્સ ચૂકવવાપાત્ર સારાંશ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Not authorized to edit frozen Account {0},સ્થિર એકાઉન્ટ સંપાદિત કરો કરવા માટે અધિકૃત ન {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},સ્થિર એકાઉન્ટ સંપાદિત કરો કરવા માટે અધિકૃત ન {0}
 DocType: Journal Entry,Get Outstanding Invoices,બાકી ઇન્વૉઇસેસ મેળવો
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +62,Sales Order {0} is not valid,વેચાણ ઓર્ડર {0} માન્ય નથી
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,વેચાણ ઓર્ડર {0} માન્ય નથી
 apps/erpnext/erpnext/setup/doctype/company/company.py +185,"Sorry, companies cannot be merged","માફ કરશો, કંપનીઓ મર્જ કરી શકાતા નથી"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +139,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",કુલ અંક / ટ્રાન્સફર જથ્થો {0} સામગ્રી વિનંતી {1} \ વસ્તુ માટે વિનંતી જથ્થો {2} કરતાં વધારે ન હોઈ શકે {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Small,નાના
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,Small,નાના
 DocType: Employee,Employee Number,કર્મચારીનું સંખ્યા
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},કેસ ના (ઓ) પહેલેથી જ વપરાશમાં છે. કેસ કોઈ થી પ્રયાસ {0}
 ,Invoiced Amount (Exculsive Tax),ભરતિયું રકમ (Exculsive ટેક્સ)
-DocType: Student Applicant,Mother's / Guardian 1 Email ID,માતાનો / વાલી 1 ઇમેઇલ ને
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,આઇટમ 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,એકાઉન્ટ વડા {0} બનાવવામાં
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +160,Green,ગ્રીન
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,ગ્રીન
 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 +57,Contract,કરાર
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,કરાર
 DocType: Email Digest,Add Quote,ભાવ ઉમેરો
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +498,UOM coversion factor required for UOM: {0} in Item: {1},UOM માટે જરૂરી UOM coversion પરિબળ: {0} વસ્તુ: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +503,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 +80,Row {0}: Qty is mandatory,રો {0}: Qty ફરજિયાત છે
+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 +737,Sync Master Data,સમન્વય માસ્ટર ડેટા
+apps/erpnext/erpnext/accounts/page/pos/pos.js +719,Sync Master Data,સમન્વય માસ્ટર ડેટા
 apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,તમારી ઉત્પાદનો અથવા સેવાઓ
 DocType: Mode of Payment,Mode of Payment,ચૂકવણીની પદ્ધતિ
 apps/erpnext/erpnext/stock/doctype/item/item.py +178,Website Image should be a public file or website URL,વેબસાઇટ છબી જાહેર ફાઈલ અથવા વેબસાઇટ URL હોવો જોઈએ
+DocType: Student Applicant,AP,એપી
 DocType: Purchase Invoice Item,BOM,BOM
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,આ રુટ વસ્તુ જૂથ છે અને સંપાદિત કરી શકાતી નથી.
+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 +345,"{0}: Employee email not found, hence email not sent","{0}: કર્મચારીનું ઇમેઇલ મળી નથી, તેથી નથી મોકલવામાં ઇમેઇલ"
+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,તમારી કંપની સરનામું
 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 +118,"For {0}, only credit accounts can be linked against another debit entry","{0}, માત્ર ક્રેડિટ ખાતાઓ અન્ય ડેબિટ પ્રવેશ સામે લિંક કરી શકો છો"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Delivery Note {0} is not submitted,ડ લવર નોંધ {0} અપર્ણ ન કરાય
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Delivery Note {0} is not submitted,ડ લવર નોંધ {0} અપર્ણ ન કરાય
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Sub-contracted Item,વસ્તુ {0} એ પેટા કોન્ટ્રાક્ટ વસ્તુ જ હોવી જોઈએ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,કેપિટલ સાધનો
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","પ્રાઇસીંગ નિયમ પ્રથમ પર આધારિત પસંદ થયેલ વસ્તુ, આઇટમ ગ્રુપ અથવા બ્રાન્ડ બની શકે છે, જે ક્ષેત્ર &#39;પર લાગુ પડે છે."
 DocType: Hub Settings,Seller Website,વિક્રેતા વેબસાઇટ
 DocType: Item,ITEM-,ITEM-
-apps/erpnext/erpnext/controllers/selling_controller.py +147,Total allocated percentage for sales team should be 100,વેચાણ ટીમ માટે કુલ ફાળવેલ ટકાવારી 100 પ્રયત્ન કરીશું
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +110,Production Order status is {0},ઉત્પાદન ઓર્ડર સ્થિતિ છે {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,વેચાણ ટીમ માટે કુલ ફાળવેલ ટકાવારી 100 પ્રયત્ન કરીશું
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},ઉત્પાદન ઓર્ડર સ્થિતિ છે {0}
 DocType: Appraisal Goal,Goal,ગોલ
 DocType: Sales Invoice Item,Edit Description,સંપાદિત કરો વર્ણન
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +757,For Supplier,સપ્લાયર માટે
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +723,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,પ્રિન્ટ ફોર્મેટ બનાવો
@@ -1196,10 +1212,11 @@
 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,ગ્રેડ કોડ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ડાયજેસ્ટ ઇમેઇલ:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +445,BOM {0} does not belong to Item {1},BOM {0} વસ્તુ ને અનુલક્ષતું નથી {1}
 DocType: Sales Partner,Target Distribution,લક્ષ્ય વિતરણની
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1667,Deafault warehouse is required for selected item,Deafault વેરહાઉસ પસંદ કરેલ વસ્તુ માટે જરૂરી છે
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Deafault warehouse is required for selected item,Deafault વેરહાઉસ પસંદ કરેલ વસ્તુ માટે જરૂરી છે
 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 વાંચન
@@ -1208,23 +1225,23 @@
 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 +110,Hardware,હાર્ડવેર
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,હાર્ડવેર
 DocType: Sales Order,Recurring Upto,રીકરીંગ સુધી
 DocType: Attendance,HR Manager,એચઆર મેનેજર
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,કંપની પસંદ કરો
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Privilege Leave,પ્રિવિલેજ છોડો
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,પ્રિવિલેજ છોડો
 DocType: Purchase Invoice,Supplier Invoice Date,પુરવઠોકર્તા ભરતિયું તારીખ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,તમે શોપિંગ કાર્ટ સક્રિય કરવાની જરૂર છે
 DocType: Payment Entry,Writeoff,Writeoff
 DocType: Appraisal Template Goal,Appraisal Template Goal,મૂલ્યાંકન ઢાંચો ગોલ
-DocType: Salary Slip,Earning,અર્નિંગ
+DocType: Salary Component,Earning,અર્નિંગ
 DocType: Purchase Invoice,Party Account Currency,પક્ષ એકાઉન્ટ કરન્સી
 ,BOM Browser,BOM બ્રાઉઝર
 DocType: Purchase Taxes and Charges,Add or Deduct,ઉમેરો અથવા કપાત
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,વચ્ચે ઑવરલેપ શરતો:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +171,Against Journal Entry {0} is already adjusted against some other voucher,જર્નલ સામે એન્ટ્રી {0} પહેલેથી જ કેટલાક અન્ય વાઉચર સામે ગોઠવ્યો છે
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,જર્નલ સામે એન્ટ્રી {0} પહેલેથી જ કેટલાક અન્ય વાઉચર સામે ગોઠવ્યો છે
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,કુલ ઓર્ડર ભાવ
-apps/erpnext/erpnext/demo/setup_data.py +358,Food,ફૂડ
+apps/erpnext/erpnext/demo/setup/setup_data.py +301,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/course_schedule/course_schedule.js +103,Mark Attendence,માર્ક Attendence
@@ -1258,12 +1275,12 @@
 DocType: Sales Order Item,Planned Quantity,આયોજિત જથ્થો
 DocType: Purchase Invoice Item,Item Tax Amount,વસ્તુ ટેક્સની રકમ
 DocType: Item,Maintain Stock,સ્ટોક જાળવો
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +209,Stock Entries already created for Production Order ,પહેલેથી જ ઉત્પાદન ઓર્ડર માટે બનાવવામાં સ્ટોક પ્રવેશો
+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,સ્થિર એસેટ કુલ ફેરફાર
 DocType: Leave Control Panel,Leave blank if considered for all designations,બધા ડેઝીગ્નેશન્સ માટે વિચારણા તો ખાલી છોડી દો
-apps/erpnext/erpnext/controllers/accounts_controller.py +620,Charge of type 'Actual' in row {0} cannot be included in Item Rate,પ્રકાર &#39;વાસ્તવિક&#39; પંક્તિ માં ચાર્જ {0} આઇટમ રેટ સમાવેશ કરવામાં નથી કરી શકો છો
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,Max: {0},મહત્તમ: {0}
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +15,From Datetime,તારીખ સમય પ્રતિ
+apps/erpnext/erpnext/controllers/accounts_controller.py +623,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 +239,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 +153,"Request for Quotation is disabled to access from portal, for more check portal settings.",અવતરણ માટે વિનંતી વધુ ચેક પોર્ટલ સેટિંગ્સ માટે પોર્ટલ ઍક્સેસ અક્ષમ છે.
@@ -1271,8 +1288,8 @@
 DocType: Sales Invoice,Shipping Address Name,શિપિંગ સરનામું નામ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,એકાઉન્ટ્સ ઓફ ચાર્ટ
 DocType: Material Request,Terms and Conditions Content,નિયમો અને શરતો સામગ્રી
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +552,cannot be greater than 100,100 કરતા વધારે ન હોઈ શકે
-apps/erpnext/erpnext/stock/doctype/item/item.py +680,Item {0} is not a stock Item,{0} વસ્તુ સ્ટોક વસ્તુ નથી
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +546,cannot be greater than 100,100 કરતા વધારે ન હોઈ શકે
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is not a stock Item,{0} વસ્તુ સ્ટોક વસ્તુ નથી
 DocType: Maintenance Visit,Unscheduled,અનિશ્ચિત
 DocType: Employee,Owned,માલિકીની
 DocType: Salary Detail,Depends on Leave Without Pay,પગાર વિના રજા પર આધાર રાખે છે
@@ -1286,10 +1303,9 @@
 DocType: GL Entry,GL Entry,ઓપનજીએલ એન્ટ્રી
 DocType: HR Settings,Employee Settings,કર્મચારીનું સેટિંગ્સ
 ,Batch-Wise Balance History,બેચ વાઈસ બેલેન્સ ઇતિહાસ
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,યાદી કરવા માટે
 apps/erpnext/erpnext/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 +61,Apprentice,એપ્રેન્ટિસ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +102,Negative Quantity is not allowed,નકારાત્મક જથ્થો મંજૂરી નથી
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,એપ્રેન્ટિસ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +103,Negative Quantity is not allowed,નકારાત્મક જથ્થો મંજૂરી નથી
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",સ્ટ્રિંગ તરીકે વસ્તુ માસ્ટર પાસેથી મેળવ્યાં અને આ ક્ષેત્રમાં સંગ્રહિત કર વિગતવાર કોષ્ટક. કર અને ખર્ચ માટે વપરાય છે
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +152,Employee cannot report to himself.,કર્મચારીનું પોતાની જાતને જાણ કરી શકો છો.
@@ -1310,15 +1326,14 @@
 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 +141,Source warehouse is mandatory for row {0},સોર્સ વેરહાઉસ પંક્તિ માટે ફરજિયાત છે {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +719,Packing Slip,પેકિંગ કાપલી
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Source warehouse is mandatory for row {0},સોર્સ વેરહાઉસ પંક્તિ માટે ફરજિયાત છે {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +713,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/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,અવતરણ માટે વિનંતી નીચેની લિંક પર ક્લિક કરીને ઍક્સેસ હોઈ શકે છે
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,આયાત નિષ્ફળ!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,કોઈ સરનામું હજુ સુધી ઉમેર્યું.
 DocType: Workstation Working Hour,Workstation Working Hour,વર્કસ્ટેશન કામ કલાક
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Analyst,એનાલિસ્ટ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,એનાલિસ્ટ
 DocType: Item,Inventory,ઈન્વેન્ટરી
 DocType: Item,Sales Details,સેલ્સ વિગતો
 DocType: Quality Inspection,QI-,QI-
@@ -1326,7 +1341,7 @@
 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 +103,Government,સરકાર
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,સરકાર
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,સંસ્થાનું નામ
 apps/erpnext/erpnext/config/stock.py +289,Item Variants,વસ્તુ ચલો
 DocType: Company,Services,સેવાઓ
@@ -1342,6 +1357,7 @@
 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/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,રોકાણ કેશ ફ્લો
 DocType: Program Course,Program Course,કાર્યક્રમ કોર્સ
@@ -1382,12 +1398,12 @@
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,રીસીવર સૂચિ ખાલી છે. રીસીવર યાદી બનાવવા કરો
 DocType: Production Plan Sales Order,Production Plan Sales Order,ઉત્પાદન યોજના વેચાણ ઓર્ડર
 DocType: Sales Partner,Sales Partner Target,વેચાણ ભાગીદાર લક્ષ્યાંક
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +110,Accounting Entry for {0} can only be made in currency: {1},{0} માટે એકાઉન્ટિંગ એન્ટ્રી માત્ર ચલણ કરી શકાય છે: {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},{0} માટે એકાઉન્ટિંગ એન્ટ્રી માત્ર ચલણ કરી શકાય છે: {1}
 DocType: Pricing Rule,Pricing Rule,પ્રાઇસીંગ નિયમ
 DocType: Budget,Action if Annual Budget Exceeded,જો વાર્ષિક બજેટ વટાવી ક્રિયા
 apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,ઓર્ડર ખરીદી સામગ્રી વિનંતી
 DocType: Shopping Cart Settings,Payment Success URL,ચુકવણી સફળતા URL
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +78,Row # {0}: Returned Item {1} does not exists in {2} {3},ROW # {0}: પરત વસ્તુ {1} નથી અસ્તિત્વમાં નથી {2} {3}
+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,બેન્ક રિકંસીલેશન નિવેદન
@@ -1396,40 +1412,39 @@
 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/stock/doctype/stock_entry/stock_entry.py +339,Not allowed to tranfer more {0} than {1} against Purchase Order {2},વધુ tranfer માટે મંજૂરી નથી {0} કરતાં {1} ખરીદી ઓર્ડર સામે {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +344,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 +545,Manufacturing Quantity is mandatory,ઉત્પાદન જથ્થો ફરજિયાત છે
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,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 +71,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 +162,Row {0}: From Time and To Time of {1} is overlapping with {2},રો {0}: પ્રતિ સમય અને સમય {1} સાથે ઓવરલેપિંગ છે {2}
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +186,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,સ્ટોક જવાબદારીઓ
 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 +130,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 +137,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,અન્ય અહેવાલો
 DocType: Dependent Task,Dependent Task,આશ્રિત ટાસ્ક
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,કૃપા કરીને સુયોજિત કર્મચારીનું માનવ સંસાધન નામકરણ સિસ્ટમ&gt; એચઆર સેટિંગ્સ
 apps/erpnext/erpnext/stock/doctype/item/item.py +411,Conversion factor for default Unit of Measure must be 1 in row {0},માપવા એકમ મૂળભૂત માટે રૂપાંતર પરિબળ પંક્તિ માં 1 હોવા જ જોઈએ {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,Leave of type {0} cannot be longer than {1},પ્રકાર રજા {0} કરતાં લાંબા સમય સુધી ન હોઈ શકે {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +197,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 +921,Search Item,શોધ વસ્તુ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +910,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 +546,Already completed,પહેલેથી જ પૂર્ણ
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +22,Payment Request already exists {0},ચુકવણી વિનંતી પહેલેથી હાજર જ છે {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +550,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 +241,Quantity must not be more than {0},જથ્થો કરતાં વધુ ન હોવું જોઈએ {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Quantity must not be more than {0},જથ્થો કરતાં વધુ ન હોવું જોઈએ {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +76,Previous Financial Year is not closed,અગાઉના નાણાકીય વર્ષમાં બંધ છે
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +44,Age (Days),ઉંમર (દિવસ)
 DocType: Quotation Item,Quotation Item,અવતરણ વસ્તુ
@@ -1446,7 +1461,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +221,Purchase Receipt {0} is not submitted,ખરીદી રસીદ {0} અપર્ણ ન કરાય
 DocType: Company,Default Payable Account,મૂળભૂત ચૂકવવાપાત્ર એકાઉન્ટ
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","આવા શીપીંગ નિયમો, ભાવ યાદી વગેરે શોપિંગ કાર્ટ માટે સુયોજનો"
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +83,{0}% Billed,{0}% ગણાવી
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}% ગણાવી
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,સુરક્ષિત Qty
 DocType: Party Account,Party Account,પક્ષ એકાઉન્ટ
 apps/erpnext/erpnext/config/setup.py +116,Human Resources,માનવ સંસાધન
@@ -1458,12 +1473,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Row {0}: Advance against Supplier must be debit,રો {0}: પુરવઠોકર્તા સામે એડવાન્સ ડેબિટ હોવું જ જોઈએ
 DocType: Company,Default Values,મૂળભૂત મૂલ્યો
 DocType: Expense Claim,Total Amount Reimbursed,કુલ રકમ reimbursed
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +22,Collect,એકત્રિત
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,એકત્રિત
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,Against Supplier Invoice {0} dated {1},પુરવઠોકર્તા સામે ભરતિયું {0} ના રોજ {1}
 DocType: Customer,Default Price List,ડિફૉલ્ટ ભાવ યાદી
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +225,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: Payment Reconciliation,Payments,ચુકવણીઓ
 DocType: Journal Entry,Entry Type,એન્ટ્રી પ્રકાર
 ,Customer Credit Balance,ગ્રાહક ક્રેડિટ બેલેન્સ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Payable,ચૂકવવાપાત્ર હિસાબ નેટ બદલો
@@ -1475,7 +1489,7 @@
 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 +9,Procurement,પ્રાપ્તિ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,વસ્તુઓ કંઈ જથ્થો અથવા કિંમત કોઈ ફેરફાર હોય છે.
+apps/erpnext/erpnext/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,વોરંટી દાવાની
 ,Lead Details,લીડ વિગતો
 DocType: Purchase Invoice,End date of current invoice's period,વર્તમાન ભરતિયું માતાનો સમયગાળા ઓવરને અંતે તારીખ
@@ -1500,7 +1514,7 @@
 DocType: Purchase Invoice,Additional Discount,વધારાના ડિસ્કાઉન્ટ
 DocType: Selling Settings,Selling Settings,સેટિંગ્સ વેચાણ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,ઓનલાઇન હરાજી
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +97,Please specify either Quantity or Valuation Rate or both,થો અથવા મૂલ્યાંકન દર અથવા બંને ક્યાં સ્પષ્ટ કરો
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,થો અથવા મૂલ્યાંકન દર અથવા બંને ક્યાં સ્પષ્ટ કરો
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +13,Fulfillment,પરિપૂર્ણતા
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","કંપની, મહિનો અને ફિસ્કલ વર્ષ ફરજિયાત છે"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,માર્કેટિંગ ખર્ચ
@@ -1521,14 +1535,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,ERPNext સેટઅપ પૂર્ણ કરો!
 DocType: Item,Weightage,ભારાંકન
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +93,A Customer Group exists with same name please change the Customer name or rename the Customer Group,એક ગ્રાહક જૂથ જ નામ સાથે હાજર ગ્રાહક નામ બદલી અથવા ગ્રાહક જૂથ નામ બદલી કૃપા કરીને
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +126,A Customer Group exists with same name please change the Customer name or rename the Customer Group,એક ગ્રાહક જૂથ જ નામ સાથે હાજર ગ્રાહક નામ બદલી અથવા ગ્રાહક જૂથ નામ બદલી કૃપા કરીને
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,ન્યૂ સંપર્ક
 DocType: Territory,Parent Territory,પિતૃ પ્રદેશ
 DocType: Quality Inspection Reading,Reading 2,2 વાંચન
 DocType: Stock Entry,Material Receipt,સામગ્રી રસીદ
 DocType: Homepage,Products,પ્રોડક્ટ્સ
 DocType: Announcement,Instructor,પ્રશિક્ષક
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},પાર્ટી પ્રકાર અને પાર્ટી પ્રાપ્ત / ચૂકવવાપાત્ર એકાઉન્ટ માટે જરૂરી છે {0}
 DocType: Employee,AB+,એબી +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","આ આઇટમ ચલો છે, તો પછી તે વેચાણ ઓર્ડર વગેરે પસંદ કરી શકાતી નથી"
 DocType: Lead,Next Contact By,આગામી સંપર્ક
@@ -1539,7 +1552,7 @@
 ,Item-wise Sales Register,વસ્તુ મુજબના સેલ્સ રજિસ્ટર
 DocType: Asset,Gross Purchase Amount,કુલ ખરીદી જથ્થો
 DocType: Asset,Depreciation Method,અવમૂલ્યન પદ્ધતિ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Offline,ઑફલાઇન
+apps/erpnext/erpnext/accounts/page/pos/pos.js +686,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,જરૂરી
@@ -1557,25 +1570,27 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +425,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 +858,Make Purchase Order,ખરીદી ઓર્ડર બનાવો
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +852,Make Purchase Order,ખરીદી ઓર્ડર બનાવો
 DocType: SMS Center,Send To,ને મોકલવું
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,There is not enough leave balance for Leave Type {0},છોડો પ્રકાર માટે પૂરતી રજા બેલેન્સ નથી {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,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 +172,Work-in-Progress Warehouse is required before Submit,વર્ક ઈન પ્રોગ્રેસ વેરહાઉસ સબમિટ પહેલાં જરૂરી છે
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,Work-in-Progress Warehouse is required before Submit,વર્ક ઈન પ્રોગ્રેસ વેરહાઉસ સબમિટ પહેલાં જરૂરી છે
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,નોકરી માટે અરજી.
 DocType: Purchase Order Item,Warehouse and Reference,વેરહાઉસ અને સંદર્ભ
 DocType: Supplier,Statutory info and other general information about your Supplier,તમારા સપ્લાયર વિશે વૈધાિનક માહિતી અને અન્ય સામાન્ય માહિતી
-apps/erpnext/erpnext/hooks.py +88,Addresses,સરનામાંઓ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,પુરવઠોકર્તા&gt; પુરવઠોકર્તા પ્રકાર
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +212,Against Journal Entry {0} does not have any unmatched {1} entry,જર્નલ સામે એન્ટ્રી {0} કોઈપણ મેળ ન ખાતી {1} પ્રવેશ નથી
+apps/erpnext/erpnext/hooks.py +95,Addresses,સરનામાંઓ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +215,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,આઇટમ અથવા વેરહાઉસ પર આધારિત ફિલ્ટર સેટ
 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,વિતરિત અને બિલ
@@ -1583,11 +1598,10 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,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 +731,Payment,ચુકવણી
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,Payment,ચુકવણી
 DocType: Production Order Operation,Actual Time and Cost,વાસ્તવિક સમય અને ખર્ચ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},મહત્તમ {0} ના સામગ્રી વિનંતી {1} વેચાણ ઓર્ડર સામે વસ્તુ માટે કરી શકાય છે {2}
 DocType: Employee,Salutation,નમસ્કાર
-DocType: Pricing Rule,Brand,બ્રાન્ડ
 DocType: Course,Course Abbreviation,કોર્સ સંક્ષેપનો
 DocType: Item,Will also apply for variants,પણ ચલો માટે લાગુ પડશે
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +142,"Asset cannot be cancelled, as it is already {0}",એસેટ રદ કરી શકાતી નથી કારણ કે તે પહેલેથી જ છે {0}
@@ -1599,7 +1613,7 @@
 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.","તમે ખરીદી અથવા વેચાણ કે તમારા ઉત્પાદનો અથવા સેવાઓ યાદી. તમે શરૂ કરો છો ત્યારે માપ અને અન્ય ગુણધર્મો આઇટમ ગ્રુપ, એકમ ચકાસવા માટે ખાતરી કરો."
 DocType: Hub Settings,Hub Node,હબ નોડ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,તમે નકલી વસ્તુઓ દાખલ કર્યો છે. સુધારવું અને ફરીથી પ્રયાસ કરો.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Associate,એસોસિયેટ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,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,રીસીવર યાદી બનાવો
@@ -1607,7 +1621,7 @@
 DocType: Production Planning Tool,Material Requests,સામગ્રી અરજીઓ
 DocType: Warranty Claim,Issue Date,મુદ્દા તારીખ
 DocType: Activity Cost,Activity Cost,પ્રવૃત્તિ કિંમત
-DocType: Timesheet Detail,Timesheet Detail,Timesheet વિગતવાર
+DocType: Sales Invoice Timesheet,Timesheet Detail,Timesheet વિગતવાર
 DocType: Purchase Receipt Item Supplied,Consumed Qty,કમ્પોનન્ટ Qty
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,દૂરસંચાર
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),પેકેજ આ બોલ (ફક્ત ડ્રાફ્ટ) ના એક ભાગ છે કે જે સૂચવે
@@ -1630,6 +1644,7 @@
 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,ચલો છે
 DocType: Monthly Distribution,Name of the Monthly Distribution,માસિક વિતરણ નામ
 DocType: Sales Person,Parent Sales Person,પિતૃ વેચાણ વ્યક્તિ
@@ -1642,30 +1657,31 @@
 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 +44,"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/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.,તમે વેચાણ ભરતિયું સેવ વાર શબ્દો દૃશ્યમાન થશે.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +502,Error: {0} &gt; {1},ભૂલ: {0}&gt; {1}
 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.,ટર્મ પ્રારંભ તારીખ કરતાં શૈક્ષણિક વર્ષ શરૂ તારીખ શબ્દ સાથે કડી થયેલ છે અગાઉ ન હોઈ શકે (શૈક્ષણિક વર્ષ {}). તારીખો સુધારવા અને ફરીથી પ્રયાસ કરો.
 DocType: Naming Series,Current Value,વર્તમાન કિંમત
-apps/erpnext/erpnext/controllers/accounts_controller.py +235,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,મલ્ટીપલ નાણાકીય વર્ષ તારીખ {0} માટે અસ્તિત્વ ધરાવે છે. નાણાકીય વર્ષ કંપની સુયોજિત કરો
+apps/erpnext/erpnext/controllers/accounts_controller.py +238,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 +458,Item table can not be blank,વસ્તુ ટેબલ ખાલી ન હોઈ શકે
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +443,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 +5,This is based on stock movement. See {0} for details,આ સ્ટોક ચળવળ પર આધારિત છે. જુઓ {0} વિગતો માટે
 DocType: Pricing Rule,Selling,વેચાણ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +341,Amount {0} {1} deducted against {2},રકમ {0} {1} સામે બાદ {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +344,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,કારણે તારીખ તારીખ પોસ્ટ કરતા પહેલા ન હોઈ શકે
@@ -1680,8 +1696,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +144,Cannot refer row number greater than or equal to current row number for this Charge type,આ ચાર્જ પ્રકાર માટે વર્તમાન પંક્તિ નંબર એક કરતાં વધારે અથવા સમાન પંક્તિ નંબર નો સંદર્ભ લો નથી કરી શકો છો
 DocType: Asset,Sold,વેચાઈ
 ,Item-wise Purchase History,વસ્તુ મુજબના ખરીદ ઈતિહાસ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Red,Red
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},સીરીયલ કોઈ વસ્તુ માટે ઉમેરવામાં મેળવે &#39;બનાવો સૂચિ&#39; પર ક્લિક કરો {0}
+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,ઓપન ઉત્પાદન ઓર્ડર્સ
 DocType: Sales Invoice Payment,Base Amount (Company Currency),મૂળ રકમ (કંપની ચલણ)
@@ -1689,7 +1705,7 @@
 DocType: Installation Note,Installation Time,સ્થાપન સમયે
 DocType: Sales Invoice,Accounting Details,હિસાબી વિગતો
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,આ કંપની માટે તમામ વ્યવહારો કાઢી નાખો
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +187,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,ROW # {0}: ઓપરેશન {1} ઉત્પાદન સમાપ્ત માલ {2} Qty માટે પૂર્ણ નથી ઓર્ડર # {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,ROW # {0}: ઓપરેશન {1} ઉત્પાદન સમાપ્ત માલ {2} Qty માટે પૂર્ણ નથી ઓર્ડર # {3}. સમય લોગ મારફતે કામગીરી સ્થિતિ અપડેટ કરો
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,રોકાણો
 DocType: Issue,Resolution Details,ઠરાવ વિગતો
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,ફાળવણી
@@ -1725,16 +1741,17 @@
 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}
 DocType: Delivery Note,Excise Page Number,એક્સાઇઝ પાનાં ક્રમાંક
 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}
 ,Maintenance Schedules,જાળવણી શેડ્યુલ
 DocType: Task,Actual End Date (via Time Sheet),વાસ્તવિક ઓવરને તારીખ (સમયનો શીટ મારફતે)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Amount {0} {1} against {2} {3},રકમ {0} {1} સામે {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +339,Amount {0} {1} against {2} {3},રકમ {0} {1} સામે {2} {3}
 ,Quotation Trends,અવતરણ પ્રવાહો
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},વસ્તુ ગ્રુપ આઇટમ માટે વસ્તુ માસ્ટર ઉલ્લેખ નથી {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +295,Debit To account must be a Receivable account,એકાઉન્ટ ડેબિટ એક પ્રાપ્ત એકાઉન્ટ હોવું જ જોઈએ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Receivable account,એકાઉન્ટ ડેબિટ એક પ્રાપ્ત એકાઉન્ટ હોવું જ જોઈએ
 DocType: Shipping Rule Condition,Shipping Amount,શીપીંગ રકમ
 ,Pending Amount,બાકી રકમ
 DocType: Purchase Invoice Item,Conversion Factor,રૂપાંતર ફેક્ટર
@@ -1742,10 +1759,10 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +137,Expected value after useful life must be greater than or equal to {0},ઉપયોગી જીવન પછી અપેક્ષિત કિંમત કરતાં વધારે અથવા બરાબર હોવું જોઈએ {0}
 DocType: Purchase Receipt,Vehicle Number,વાહન સંખ્યા
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,રિકરિંગ ભરતિયું સ્ટોપ હશે કે જેના પર તારીખ
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +90,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,કુલ ફાળવેલ પાંદડા {0} ઓછી ન હોઈ શકે સમયગાળા માટે પહેલાથી મંજૂર પાંદડા {1} કરતાં
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +93,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 +22,Enter Paid Amount,ચૂકવેલ રકમ દાખલ
+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 વાપરો
@@ -1755,13 +1772,15 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,timesheets
 DocType: HR Settings,HR Settings,એચઆર સેટિંગ્સ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Expense Claim is pending approval. Only the Expense Approver can update status.,ખર્ચ દાવો મંજૂરી બાકી છે. માત્ર ખર્ચ તાજનો સ્થિતિ અપડેટ કરી શકો છો.
+DocType: Email Digest,New Expenses,ન્યૂ ખર્ચ
 DocType: Purchase Invoice,Additional Discount Amount,વધારાના ડિસ્કાઉન્ટ રકમ
-apps/erpnext/erpnext/controllers/accounts_controller.py +524,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","રો # {0}: Qty, 1 હોવું જ જોઈએ, કારણ કે આઇટમ એક સ્થિર એસેટ છે. બહુવિધ Qty માટે અલગ પંક્તિ ઉપયોગ કરો."
+apps/erpnext/erpnext/controllers/accounts_controller.py +527,"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 +249,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/stock/get_item_details.py +123,Please specify Company,કંપની સ્પષ્ટ કરો
 ,Customer Acquisition and Loyalty,ગ્રાહક સંપાદન અને વફાદારી
@@ -1772,17 +1791,19 @@
 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 +183,Closing (Opening + Totals),બંધ (+ કૂલ ઉદઘાટન)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),બંધ (+ કૂલ ઉદઘાટન)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,કંપની ચલણ સ્પષ્ટ કરો
 DocType: Workstation,Wages per hour,કલાક દીઠ વેતન
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +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/controllers/accounts_controller.py +272,Account {0} is invalid. Account Currency must be {1},એકાઉન્ટ {0} અમાન્ય છે. એકાઉન્ટ કરન્સી હોવા જ જોઈએ {1}
+DocType: Email Digest,Pending Sales Orders,વેચાણ ઓર્ડર બાકી
+apps/erpnext/erpnext/controllers/accounts_controller.py +275,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 +956,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","રો # {0}: સંદર્ભ દસ્તાવેજ પ્રકાર વેચાણ ઓર્ડર એક, સેલ્સ ભરતિયું અથવા જર્નલ પ્રવેશ હોવું જ જોઈએ"
-DocType: Salary Slip,Deduction,કપાત
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +87,Row {0}: From Time and To Time is mandatory.,રો {0}: સમય અને સમય ફરજિયાત છે.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +969,"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 +111,Row {0}: From Time and To Time is mandatory.,રો {0}: સમય અને સમય ફરજિયાત છે.
+DocType: Stock Reconciliation Item,Amount Difference,રકમ તફાવત
 apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},વસ્તુ ભાવ માટે ઉમેરવામાં {0} ભાવ યાદીમાં {1}
 DocType: Address Template,Address Template,સરનામું ઢાંચો
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +7,Please enter Employee Id of this sales person,આ વેચાણ વ્યક્તિ કર્મચારી ID દાખલ કરો
@@ -1790,7 +1811,7 @@
 DocType: Project,% Tasks Completed,% કાર્યો પૂર્ણ
 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 +194,Please enter Production Item first,પ્રથમ પ્રોડક્શન વસ્તુ દાખલ કરો
+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,અપંગ વપરાશકર્તા
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,અવતરણ
@@ -1799,53 +1820,54 @@
 DocType: Maintenance Visit,Maintenance User,જાળવણી વપરાશકર્તા
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +149,Cost Updated,કિંમત સુધારાશે
 DocType: Employee,Date of Birth,જ્ન્મતારીખ
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +86,Item {0} has already been returned,વસ્તુ {0} પહેલાથી જ પરત કરવામાં આવી છે
+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: 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 +177,Job Description,જોબ વર્ણન
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,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 +126,"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 +127,"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.","વેચાણ ઝુંબેશ ટ્રેક રાખો. દોરી જાય છે, સુવાકયો ટ્રૅક રાખો, વેચાણ ઓર્ડર વગેરે અભિયાન રોકાણ પર વળતર જાણવા માટે."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +24,Welcome to POS: Create your POS Profile,POS માટે આપનું સ્વાગત છે: તમારા POS પ્રોફાઇલ બનાવો
 DocType: Expense Claim,Approver,તાજનો
 ,SO Qty,તેથી Qty
+DocType: Guardian,Work Address,કાર્યાલયનું સરનામું
 DocType: Appraisal,Calculate Total Score,કુલ સ્કોર ગણતરી
 DocType: Request for Quotation,Manufacturing Manager,ઉત્પાદન વ્યવસ્થાપક
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},સીરીયલ કોઈ {0} સુધી વોરંટી હેઠળ છે {1}
+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 +74,Shipments,આવેલા શિપમેન્ટની
+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 +153,Row # ,ROW #
+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 +156,Get From,પ્રતિ મેળવો
+apps/erpnext/erpnext/public/js/utils.js +167,Get From,પ્રતિ મેળવો
 DocType: C-Form,Quarter,ક્વાર્ટર
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Miscellaneous Expenses,લખેલા ન હોય તેવા ખર્ચ
 DocType: Global Defaults,Default Company,મૂળભૂત કંપની
 apps/erpnext/erpnext/controllers/stock_controller.py +167,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"ખર્ચ કે તફાવત એકાઉન્ટ વસ્તુ {0}, કે અસર સમગ્ર મૂલ્ય માટે ફરજિયાત છે"
-apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","પંક્તિ માં વસ્તુ {0} માટે overbill નથી કરી શકો છો {1} કરતાં વધુ {2}. Overbilling, સ્ટોક સેટિંગ્સ સેટ કરો પરવાનગી આપવા માટે"
+apps/erpnext/erpnext/controllers/accounts_controller.py +419,"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
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} is disabled,વપરાશકર્તા {0} અક્ષમ છે
 DocType: Leave Application,Total Leave Days,કુલ છોડો દિવસો
 DocType: Email Digest,Note: Email will not be sent to disabled users,નોંધ: આ ઇમેઇલ નિષ્ક્રિય વપરાશકર્તાઓ માટે મોકલવામાં આવશે નહીં
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,કંપની પસંદ કરો ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,તમામ વિભાગો માટે ગણવામાં તો ખાલી છોડી દો
 apps/erpnext/erpnext/config/hr.py +171,"Types of employment (permanent, contract, intern etc.).","રોજગાર પ્રકાર (કાયમી, કરાર, ઇન્ટર્ન વગેરે)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +346,{0} is mandatory for Item {1},{0} વસ્તુ માટે ફરજિયાત છે {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,{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","ઓછામાં ઓછા એક પંક્તિ ફાળવવામાં રકમ, ભરતિયું પ્રકાર અને ભરતિયું નંબર પસંદ કરો"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,નવી ખરીદી કિંમત
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},વસ્તુ માટે જરૂરી વેચાણની ઓર્ડર {0}
 DocType: Purchase Invoice Item,Rate (Company Currency),દર (કંપની ચલણ)
-apps/erpnext/erpnext/demo/setup_data.py +360,Others,અન્ય
+DocType: Student Guardian,Others,અન્ય
 DocType: Payment Entry,Unallocated Amount,ફાળવેલ રકમ
 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,કર અને ખર્ચ
@@ -1865,17 +1887,16 @@
 apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,શ્રેણીબદ્ધ ઈન્વેન્ટરી
 DocType: Activity Type,Default Billing Rate,મૂળભૂત બિલિંગ રેટ
 DocType: Sales Invoice,Total Billing Amount,કુલ બિલિંગ રકમ
-apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +54,Receivable Account,પ્રાપ્ત એકાઉન્ટ
-apps/erpnext/erpnext/controllers/accounts_controller.py +546,Row #{0}: Asset {1} is already {2},રો # {0}: એસેટ {1} પહેલેથી જ છે {2}
+apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,પ્રાપ્ત એકાઉન્ટ
+apps/erpnext/erpnext/controllers/accounts_controller.py +549,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 +79,CEO,સીઇઓ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,સીઇઓ
 DocType: Expense Claim Detail,Expense Claim Detail,ખર્ચ દાવાની વિગત
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +808,Please select correct account,યોગ્ય એકાઉન્ટ પસંદ કરો
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +809,Please select correct account,યોગ્ય એકાઉન્ટ પસંદ કરો
 DocType: Item,Weight UOM,વજન UOM
 DocType: Salary Structure Employee,Salary Structure Employee,પગાર માળખું કર્મચારીનું
 DocType: Employee,Blood Group,બ્લડ ગ્રુપ
-DocType: Purchase Invoice Item,Page Break,પૃષ્ઠ વિરામ
 DocType: Production Order Operation,Pending,બાકી
 DocType: Course,Course Name,અભ્યાસક્રમનું નામ
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,ચોક્કસ કર્મચારી રજા કાર્યક્રમો મંજૂર કરી શકો છો વપરાશકર્તાઓ કે જેઓ
@@ -1884,14 +1905,15 @@
 DocType: Fiscal Year,Companies,કંપનીઓ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,ઇલેક્ટ્રોનિક્સ
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,સ્ટોક ફરીથી ક્રમમાં સ્તર સુધી પહોંચે છે ત્યારે સામગ્રી વિનંતી વધારો
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Full-time,આખો સમય
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,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: 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,કુલ ઇનકમિંગ ભાવ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Debit To is required,ડેબિટ કરવા માટે જરૂરી છે
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +321,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,ગુણવત્તા મેનેજર
@@ -1899,6 +1921,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/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,કુલ ભરતિયું એએમટી
@@ -1909,18 +1932,17 @@
 DocType: Production Order Operation,Completed Qty,પૂર્ણ Qty
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"For {0}, only debit accounts can be linked against another credit entry","{0}, માત્ર ડેબિટ એકાઉન્ટ્સ બીજા ક્રેડિટ પ્રવેશ સામે લિંક કરી શકો છો"
 apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,ભાવ યાદી {0} અક્ષમ છે
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +99,Row {0}: Completed Qty cannot be more than {1} for operation {2},રો {0}: પૂર્ણ Qty કરતાં વધુ હોઈ શકે છે {1} કામગીરી માટે {2}
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +123,Row {0}: Completed Qty cannot be more than {1} for operation {2},રો {0}: પૂર્ણ Qty કરતાં વધુ હોઈ શકે છે {1} કામગીરી માટે {2}
 DocType: Manufacturing Settings,Allow Overtime,અતિકાલિક માટે પરવાનગી આપે છે
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} વસ્તુ માટે જરૂરી સીરીયલ નંબર {1}. તમે પ્રદાન કરે છે {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,વર્તમાન મૂલ્યાંકન દર
 DocType: Item,Customer Item Codes,ગ્રાહક વસ્તુ કોડ્સ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,એક્સચેન્જ મેળવી / નુકશાન
 DocType: Opportunity,Lost Reason,લોસ્ટ કારણ
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,કૃપા કરીને સેટઅપ સેટઅપ મારફતે હાજરી માટે શ્રેણી નંબર&gt; ક્રમાંકન સિરીઝ
 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/purchase_receipt/purchase_receipt.py +378,All items have already been invoiced,બધી વસ્તુઓ પહેલેથી જ તેનું ભરતિયું કરાય છે
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +379,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,બાહ્ય
@@ -1936,18 +1958,19 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,તમારા ગ્રાહકો
 apps/erpnext/erpnext/projects/doctype/project/project.py +141,You have been invited to collaborate on the project: {0},તમે આ પ્રોજેક્ટ પર સહયોગ કરવા માટે આમંત્રિત કરવામાં આવ્યા છે: {0}
 DocType: Leave Block List Date,Block Date,બ્લોક તારીખ
-apps/erpnext/erpnext/templates/generators/job_opening.html +19,Apply Now,હવે લાગુ
+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.","બનાવો અને દૈનિક, સાપ્તાહિક અને માસિક ઇમેઇલ પચાવી મેનેજ કરો."
 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,મકાન
-apps/erpnext/erpnext/utilities/doctype/address/address.py +164,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,કોઈ મૂળભૂત સરનામું ઢાંચો જોવા મળે છે. સેટઅપ&gt; પ્રિન્ટર અને બ્રાંડિંગ&gt; સરનામું નમૂનો એક નવું બનાવો.
 DocType: Fee Structure,Fee Structure,ફી માળખું
 DocType: Timesheet Detail,Costing Amount,પડતર રકમ
+DocType: Student Admission,Application Fee,અરજી ફી
 DocType: Process Payroll,Submit Salary Slip,પગાર સ્લિપ રજુ
-apps/erpnext/erpnext/controllers/selling_controller.py +161,Maxiumm discount for Item {0} is {1}%,વસ્તુ {0} છે {1}% માટે Maxiumm ડિસ્કાઉન્ટ
+apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,વસ્તુ {0} છે {1}% માટે Maxiumm ડિસ્કાઉન્ટ
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,બલ્ક આયાત
 DocType: Sales Partner,Address & Contacts,સરના સંપર્કો
 DocType: SMS Log,Sender Name,પ્રેષકનું નામ
@@ -1972,21 +1995,21 @@
 DocType: Serial No,Delivery Time,ડ લવર સમય
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,પર આધારિત એઇજીંગનો
 DocType: Item,End of Life,જીવનનો અંત
-apps/erpnext/erpnext/demo/setup_data.py +361,Travel,યાત્રા
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +155,No active or default Salary Structure found for employee {0} for the given dates,આપવામાં તારીખો માટે કર્મચારી {0} મળી કોઈ સક્રિય અથવા મૂળભૂત પગાર માળખું
+apps/erpnext/erpnext/demo/setup/setup_data.py +304,Travel,યાત્રા
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +167,No active or default Salary Structure found for employee {0} for the given dates,આપવામાં તારીખો માટે કર્મચારી {0} મળી કોઈ સક્રિય અથવા મૂળભૂત પગાર માળખું
 DocType: Leave Block List,Allow Users,વપરાશકર્તાઓ માટે પરવાનગી આપે છે
 DocType: Purchase Order,Customer Mobile No,ગ્રાહક મોબાઇલ કોઈ
 DocType: Sales Invoice,Recurring,રીકરીંગ
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,અલગ ઇન્કમ ટ્રૅક અને ઉત્પાદન ક્ષેત્રોમાં અથવા વિભાગો માટે ખર્ચ.
 DocType: Rename Tool,Rename Tool,સાધન નામ બદલો
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +23,Update Cost,સુધારો કિંમત
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,સુધારો કિંમત
 DocType: Item Reorder,Item Reorder,વસ્તુ પુનઃક્રમાંકિત કરો
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +36,Show Salary Slip,પગાર બતાવો કાપલી
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +748,Transfer Material,ટ્રાન્સફર સામગ્રી
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +53,Show Salary Slip,પગાર બતાવો કાપલી
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +166,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 +923,Please set recurring after saving,બચત પછી રિકરિંગ સુયોજિત કરો
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +646,Select change amount account,પસંદ કરો ફેરફાર રકમ એકાઉન્ટ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +914,Please set recurring after saving,બચત પછી રિકરિંગ સુયોજિત કરો
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +703,Select change amount account,પસંદ કરો ફેરફાર રકમ એકાઉન્ટ
 DocType: Purchase Invoice,Price List Currency,ભાવ યાદી કરન્સી
 DocType: Naming Series,User must always select,વપરાશકર્તા હંમેશા પસંદ કરવી જ પડશે
 DocType: Stock Settings,Allow Negative Stock,નકારાત્મક સ્ટોક પરવાનગી આપે છે
@@ -1998,31 +2021,32 @@
 DocType: Quality Inspection,Verified By,દ્વારા ચકાસવામાં
 DocType: Address,Subsidiary,સબસિડીયરી
 apps/erpnext/erpnext/setup/doctype/company/company.py +64,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","હાલની વ્યવહારો છે, કારણ કે કંપની મૂળભૂત ચલણ બદલી શકાતું નથી. વ્યવહારો મૂળભૂત ચલણ બદલવાની રદ હોવું જ જોઈએ."
+DocType: Grade Interval,Grade Description,ગ્રેડ વર્ણન
 DocType: Quality Inspection,Purchase Receipt No,ખરીદી રસીદ કોઈ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,બાનું
 DocType: Process Payroll,Create Salary Slip,પગાર કાપલી બનાવો
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +33,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 +352,Quantity in row {0} ({1}) must be same as manufactured quantity {2},પંક્તિ માં જથ્થો {0} ({1}) ઉત્પાદન જથ્થો તરીકે જ હોવી જોઈએ {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Quantity in row {0} ({1}) must be same as manufactured quantity {2},પંક્તિ માં જથ્થો {0} ({1}) ઉત્પાદન જથ્થો તરીકે જ હોવી જોઈએ {2}
 DocType: Appraisal,Employee,કર્મચારીનું
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,વપરાશકર્તા તરીકે આમંત્રણ આપો
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} સંપૂર્ણપણે ગણાવી છે
 DocType: Workstation Working Hour,End Time,અંત સમય
 DocType: Payment Entry,Payment Deductions or Loss,ચુકવણી કપાત અથવા નુકસાન
-apps/erpnext/erpnext/config/schools.py +100,LMS,એમઆઇ
+apps/erpnext/erpnext/config/schools.py +104,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,સેલ્સ પાઇપલાઇન
 DocType: Student Batch Student,Student Batch Student,વિદ્યાર્થી બેચ વિદ્યાર્થી
-DocType: Sales Invoice,Mass Mailing,સામૂહિક મેઈલિંગ
+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 +199,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/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 +297,Salary Slip of employee {0} already created for this period,કર્મચારી પગાર કાપલી {0} પહેલાથી જ આ સમયગાળા માટે બનાવવામાં
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Pharmaceutical,ફાર્માસ્યુટિકલ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +309,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/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,માટે ક્રેડિટ
@@ -2037,27 +2061,28 @@
 DocType: Upload Attendance,Attendance To Date,તારીખ હાજરી
 DocType: Warranty Claim,Raised By,દ્વારા ઊભા
 DocType: Payment Gateway Account,Payment Account,ચુકવણી એકાઉન્ટ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +814,Please specify Company to proceed,આગળ વધવા માટે કંપની સ્પષ્ટ કરો
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +793,Please specify Company to proceed,આગળ વધવા માટે કંપની સ્પષ્ટ કરો
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Receivable,એકાઉન્ટ્સ પ્રાપ્ત નેટ બદલો
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Compensatory Off,વળતર બંધ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,વળતર બંધ
 DocType: Quality Inspection Reading,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.,શું તમે ખરેખર આ કંપની માટે તમામ વ્યવહારો કાઢી નાખવા માંગો છો તેની ખાતરી કરો. તે છે તમારા માસ્ટર ડેટા રહેશે. આ ક્રિયા પૂર્વવત્ કરી શકાતી નથી.
 DocType: Room,Room Number,રૂમ સંખ્યા
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},અમાન્ય સંદર્ભ {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +161,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) આયોજિત quanitity કરતાં વધારે ન હોઈ શકે છે ({2}) ઉત્પાદન ઓર્ડર {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +162,{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 +217,Raw Materials cannot be blank.,કાચો માલ ખાલી ન હોઈ શકે.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,"Could not update stock, invoice contains drop shipping item.","સ્ટોક અપડેટ કરી શકાયું નથી, ભરતિયું ડ્રોપ શીપીંગ વસ્તુ છે."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +460,Quick Journal Entry,ઝડપી જર્નલ પ્રવેશ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +111,You can not change rate if BOM mentioned agianst any item,BOM કોઈપણ વસ્તુ agianst ઉલ્લેખ તો તમે દર બદલી શકતા નથી
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +441,"Could not update stock, invoice contains drop shipping item.","સ્ટોક અપડેટ કરી શકાયું નથી, ભરતિયું ડ્રોપ શીપીંગ વસ્તુ છે."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Quick Journal Entry,ઝડપી જર્નલ પ્રવેશ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +103,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} માટે આયોજન Qty દાખલ કરો {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is not submitted,{0} {1} અપર્ણ ન કરાય
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,આઇટમ્સ માટે વિનંતી કરે છે.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,અલગ ઉત્પાદન ક્રમમાં દરેક સમાપ્ત સારી વસ્તુ માટે બનાવવામાં આવશે.
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +121,{0} must be negative in return document,{0} વળતર દસ્તાવેજમાં નકારાત્મક હોવા જ જોઈએ
 ,Minutes to First Response for Issues,મુદ્દાઓ માટે પ્રથમ પ્રતિભાવ મિનિટ
 DocType: Purchase Invoice,Terms and Conditions1,નિયમો અને Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,સંસ્થા નામ કે જેના માટે તમે આ સિસ્ટમ સુયોજિત કરી રહ્યા હોય.
@@ -2066,16 +2091,17 @@
 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 +398,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 +739,Item or Warehouse for row {0} does not match Material Request,પંક્તિ {0} સાથે મેળ ખાતું નથી સામગ્રી વિનંતી વસ્તુ અથવા વેરહાઉસ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +747,Item or Warehouse for row {0} does not match Material Request,પંક્તિ {0} સાથે મેળ ખાતું નથી સામગ્રી વિનંતી વસ્તુ અથવા વેરહાઉસ
 apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,માપવા એકમ
 DocType: Fiscal Year,Year End Date,વર્ષ અંતે તારીખ
 DocType: Task Depends On,Task Depends On,કાર્ય પર આધાર રાખે છે
-DocType: Lead,Opportunity,તક
+DocType: Supplier Quotation,Opportunity,તક
 ,Completed Production Orders,પૂર્ણ ઉત્પાદન ઓર્ડર્સ
 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,મૂળભૂત વર્કસ્ટેશન
@@ -2088,7 +2114,7 @@
 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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},જાળવણી શરૂઆત તારીખ સીરીયલ કોઈ ડ લવર તારીખ પહેલાં ન હોઈ શકે {0}
+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,વાસ્તવિક ઓવરને તારીખ
 DocType: Purchase Invoice,PINV-,PINV-
 DocType: Authorization Rule,Applicable To (Role),લાગુ કરવા માટે (ભૂમિકા)
@@ -2103,7 +2129,7 @@
 DocType: SMS Log,No of Requested SMS,વિનંતી એસએમએસ કોઈ
 DocType: Campaign,Campaign-.####,અભિયાન -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,આગળ કરવાનાં પગલાંઓ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,Please supply the specified items at the best possible rates,શ્રેષ્ઠ શક્ય દરે સ્પષ્ટ વસ્તુઓ સપ્લાય કૃપા કરીને
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +695,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 +117,Contract End Date must be greater than Date of Joining,કરારનો અંત તારીખ જોડાયા તારીખ કરતાં મોટી હોવી જ જોઈએ
 DocType: Delivery Note,DN-,DN-
@@ -2112,7 +2138,7 @@
 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 +14,This is an example website auto-generated from ERPNext,આ એક ઉદાહરણ વેબસાઇટ ERPNext માંથી ઓટો પેદા થાય છે
+apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,આ એક ઉદાહરણ વેબસાઇટ ERPNext માંથી ઓટો પેદા થાય છે
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,એઇજીંગનો રેન્જ 1
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
@@ -2139,13 +2165,14 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd જથ્થો
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +54,Fee Records Created - {0},ફી રેકોર્ડ્સ બનાવનાર - {0}
 DocType: Asset Category Account,Asset Category Account,એસેટ વર્ગ એકાઉન્ટ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +103,Cannot produce more Item {0} than Sales Order quantity {1},સેલ્સ ક્રમ સાથે જથ્થો કરતાં વધુ આઇટમ {0} પેદા કરી શકતા નથી {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Stock Entry {0} is not submitted,સ્ટોક એન્ટ્રી {0} અપર્ણ ન કરાય
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},સેલ્સ ક્રમ સાથે જથ્થો કરતાં વધુ આઇટમ {0} પેદા કરી શકતા નથી {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +505,Stock Entry {0} is not submitted,સ્ટોક એન્ટ્રી {0} અપર્ણ ન કરાય
 DocType: Payment Reconciliation,Bank / Cash Account,બેન્ક / રોકડ એકાઉન્ટ
 DocType: Tax Rule,Billing City,બિલિંગ સિટી
 DocType: Salary Component Account,Salary Component Account,પગાર પુન એકાઉન્ટ
 DocType: Global Defaults,Hide Currency Symbol,કરન્સી નિશાનીનો છુપાવો
 apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card","દા.ત. બેન્ક, રોકડ, ક્રેડિટ કાર્ડ"
+DocType: Lead Source,Source Name,સોર્સ નામ
 DocType: Journal Entry,Credit Note,ઉધાર નોધ
 DocType: Warranty Claim,Service Address,સેવા સરનામું
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furnitures and Fixtures,Furnitures અને ફિક્સર
@@ -2157,6 +2184,7 @@
 DocType: Opportunity,Customer / Lead Name,ગ્રાહક / લીડ નામ
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +89,Clearance Date not mentioned,ક્લિયરન્સ તારીખ ઉલ્લેખ નથી
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,ઉત્પાદન
+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/controllers/trends.py +19,Total(Qty),કુલ (Qty)
 DocType: Sales Invoice,This Document,આ દસ્તાવેજ
@@ -2168,15 +2196,15 @@
 DocType: Purchase Receipt,Time at which materials were received,"સામગ્રી પ્રાપ્ત કરવામાં આવી હતી, જે અંતે સમય"
 DocType: Stock Ledger Entry,Outgoing Rate,આઉટગોઇંગ દર
 apps/erpnext/erpnext/config/hr.py +176,Organization branch master.,સંસ્થા શાખા માસ્ટર.
-apps/erpnext/erpnext/controllers/accounts_controller.py +273, or ,અથવા
+apps/erpnext/erpnext/controllers/accounts_controller.py +276, 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 +203,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,રો # {0}: જર્નલ પ્રવેશ {1} એકાઉન્ટ નથી {2} અથવા પહેલાથી જ બીજા વાઉચર સામે મેળ ખાતી
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +206,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 +90,No employee for the above selected criteria OR salary slip already created,ઉપર પસંદ માપદંડ અથવા પગાર સ્લીપ માટે કોઈ કર્મચારી પહેલેથી જ બનાવનાર
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +93,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,ચુકવણી પ્રકાર
@@ -2204,8 +2232,8 @@
 DocType: Product Bundle,Parent Item,પિતૃ વસ્તુ
 DocType: Account,Account Type,એકાઉન્ટ પ્રકાર
 DocType: Delivery Note,DN-RET-,Dn-RET-
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +115,Leave Type {0} cannot be carry-forwarded,{0} હાથ ધરવા આગળ કરી શકાતી નથી પ્રકાર છોડો
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',જાળવણી સુનિશ્ચિત બધી વસ્તુઓ માટે પેદા નથી. &#39;બનાવો સૂચિ&#39; પર ક્લિક કરો
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +118,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 +163,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","પંક્તિ માટે {0} માં {1}. આઇટમ રેટ માં {2} સમાવેશ કરવા માટે, પંક્તિઓ {3} પણ સમાવેશ કરવો જ જોઈએ"
@@ -2217,13 +2245,13 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +32,Disabled template must not be default template,અપંગ નમૂનો ડિફૉલ્ટ નમૂનો ન હોવું જોઈએ
 DocType: Account,Income Account,આવક એકાઉન્ટ
 DocType: Payment Request,Amount in customer's currency,ગ્રાહકોના ચલણ માં જથ્થો
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +748,Delivery,ડ લવર
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +742,Delivery,ડ લવર
 DocType: Stock Reconciliation Item,Current Qty,વર્તમાન Qty
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",જુઓ પડતર વિભાગ &quot;સામગ્રી પર આધારિત દર&quot;
 DocType: Appraisal Goal,Key Responsibility Area,કી જવાબદારી વિસ્તાર
 DocType: Payment Entry,Total Allocated Amount,કુલ ફાળવેલ રકમ
 DocType: Item Reorder,Material Request Type,સામગ્રી વિનંતી પ્રકાર
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +82,Row {0}: UOM Conversion Factor is mandatory,રો {0}: UOM રૂપાંતર ફેક્ટર ફરજિયાત છે
+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,ખર્ચ કેન્દ્રને
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,વાઉચર #
@@ -2234,13 +2262,13 @@
 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 +90,Head of Marketing and Sales,માર્કેટિંગ અને સેલ્સ હેડ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,આય કર
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,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.,ટ્રેક ઉદ્યોગ પ્રકાર દ્વારા દોરી જાય છે.
 DocType: Item Supplier,Item Supplier,વસ્તુ પુરવઠોકર્તા
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +403,Please enter Item Code to get batch no,બેચ કોઈ વિચાર વસ્તુ કોડ દાખલ કરો
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +770,Please select a value for {0} quotation_to {1},{0} quotation_to માટે નીચેની પસંદ કરો {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +397,Please enter Item Code to get batch no,બેચ કોઈ વિચાર વસ્તુ કોડ દાખલ કરો
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +764,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 લખવું, કંપની છે"
@@ -2252,28 +2280,29 @@
 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 +100,Issues,મુદ્દાઓ
+apps/erpnext/erpnext/hooks.py +109,Issues,મુદ્દાઓ
 apps/erpnext/erpnext/controllers/status_updater.py +13,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,ખરીદી વિનંતી તેથી વસ્તુઓ બાકી
+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,બિલિંગ કરન્સી
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Large,બહુ્ મોટુ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,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 +507,Warning: Another {0} # {1} exists against stock entry {2},ચેતવણી: અન્ય {0} # {1} સ્ટોક પ્રવેશ સામે અસ્તિત્વમાં {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Local,સ્થાનિક
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +508,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),લોન અને એડવાન્સિસ (અસ્ક્યામત)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,ડેટર્સ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Large,મોટા
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,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 +225,Total {0} ({1}),કુલ {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +224,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,મૂળભૂત મૂલ્યાંકન પદ્ધતિ
@@ -2319,9 +2348,9 @@
 DocType: Attendance,Leave Type,રજા પ્રકાર
 apps/erpnext/erpnext/controllers/stock_controller.py +173,Expense / Difference account ({0}) must be a 'Profit or Loss' account,ખર્ચ / તફાવત એકાઉન્ટ ({0}) એક &#39;નફો અથવા નુકસાન ખાતામાં હોવા જ જોઈએ
 DocType: Account,Accounts User,વપરાશકર્તા એકાઉન્ટ્સ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Name error: {0},નામ ભૂલ: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +90,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 +178,{0} {1} does not associated with {2} {3},{0} {1} સાથે સંકળાયેલ નથી {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +181,{0} {1} does not associated with {2} {3},{0} {1} સાથે સંકળાયેલ નથી {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,કર્મચારી {0} માટે હાજરી પહેલેથી ચિહ્નિત થયેલ છે
 DocType: Packing Slip,If more than one package of the same type (for print),જો એક જ પ્રકારના એક કરતાં વધુ પેકેજ (પ્રિન્ટ માટે)
 DocType: Warehouse,Parent Warehouse,પિતૃ વેરહાઉસ
@@ -2340,7 +2369,7 @@
 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,હેતુઓ
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,ઓછામાં ઓછા એક વસ્તુ પાછી દસ્તાવેજ નકારાત્મક જથ્થો દાખલ કરવું જોઈએ
+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 +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","ઓપરેશન {0} વર્કસ્ટેશન કોઇપણ ઉપલ્બધ કામના કલાકો કરતાં લાંબા સમય સુધી {1}, બહુવિધ કામગીરી માં ઓપરેશન તોડી"
 ,Requested,વિનંતી
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +83,No Remarks,કોઈ ટિપ્પણી
@@ -2352,46 +2381,46 @@
 DocType: Item,Total Projected Qty,કુલ અંદાજ Qty
 DocType: Monthly Distribution,Distribution Name,વિતરણ નામ
 DocType: Course,Course Code,કોર્સ કોડ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Quality Inspection required for Item {0},વસ્તુ માટે જરૂરી ગુણવત્તા નિરીક્ષણ {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Quality Inspection required for Item {0},વસ્તુ માટે જરૂરી ગુણવત્તા નિરીક્ષણ {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,જે ગ્રાહક ચલણ પર દર કંપનીના આધાર ચલણ ફેરવાય છે
 DocType: Purchase Invoice Item,Net Rate (Company Currency),નેટ દર (કંપની ચલણ)
 DocType: Salary Detail,Condition and Formula Help,સ્થિતિ અને ફોર્મ્યુલા મદદ
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,પ્રદેશ વૃક્ષ મેનેજ કરો.
 DocType: Journal Entry Account,Sales Invoice,સેલ્સ ભરતિયું
 DocType: Journal Entry Account,Party Balance,પાર્ટી બેલેન્સ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +475,Please select Apply Discount On,ડિસ્કાઉન્ટ પર લાગુ પડે છે પસંદ કરો
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +92,Salary Slip Created,પગાર કાપલી બનાવનાર
+apps/erpnext/erpnext/accounts/page/pos/pos.js +464,Please select Apply Discount On,ડિસ્કાઉન્ટ પર લાગુ પડે છે પસંદ કરો
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +95,Salary Slip Created,પગાર કાપલી બનાવનાર
 DocType: Company,Default Receivable Account,મૂળભૂત પ્રાપ્ત એકાઉન્ટ
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,ઉપર પસંદ માપદંડ માટે ચૂકવણી કુલ પગાર માટે બેન્ક એન્ટ્રી બનાવો
 DocType: Stock Entry,Material Transfer for Manufacture,ઉત્પાદન માટે માલ પરિવહન
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,ડિસ્કાઉન્ટ ટકાવારી ભાવ યાદી સામે અથવા બધું ભાવ યાદી માટે ક્યાં લાગુ પાડી શકાય છે.
 DocType: Purchase Invoice,Half-yearly,અર્ધ-વાર્ષિક
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +384,Accounting Entry for Stock,સ્ટોક માટે એકાઉન્ટિંગ એન્ટ્રી
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +387,Accounting Entry for Stock,સ્ટોક માટે એકાઉન્ટિંગ એન્ટ્રી
 DocType: Sales Invoice,Sales Team1,સેલ્સ team1
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,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 +96,Row {0}: Completed Qty must be greater than zero.,રો {0}: પૂર્ણ Qty શૂન્ય કરતાં મોટી હોવી જ જોઈએ.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +120,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 +88,Row # {0}: Cannot return more than {1} for Item {2},ROW # {0}: કરતાં વધુ પાછા ન કરી શકે {1} વસ્તુ માટે {2}
+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,પ્લોટ
 DocType: Item Group,Show this slideshow at the top of the page,પાનાંની ટોચ પર આ સ્લાઇડશો બતાવો
 DocType: BOM,Item UOM,વસ્તુ UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),ડિસ્કાઉન્ટ રકમ બાદ ટેક્સની રકમ (કંપની ચલણ)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +147,Target warehouse is mandatory for row {0},લક્ષ્યાંક વેરહાઉસ પંક્તિ માટે ફરજિયાત છે {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,પુરવઠોકર્તા સરનામું પસંદ
 DocType: Quality Inspection,Quality Inspection,ગુણવત્તા નિરીક્ષણ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Extra Small,વિશેષ નાના
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,Warning: Material Requested Qty is less than Minimum Order Qty,ચેતવણી: Qty વિનંતી સામગ્રી ન્યુનત્તમ ઓર્ડર Qty કરતાં ઓછી છે
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +194,Account {0} is frozen,એકાઉન્ટ {0} સ્થિર છે
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,વિશેષ નાના
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +690,Warning: Material Requested Qty is less than Minimum Order Qty,ચેતવણી: Qty વિનંતી સામગ્રી ન્યુનત્તમ ઓર્ડર Qty કરતાં ઓછી છે
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,એકાઉન્ટ {0} સ્થિર છે
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,સંસ્થા સાથે જોડાયેલા એકાઉન્ટ્સ એક અલગ ચાર્ટ સાથે કાનૂની એન્ટિટી / સબસિડીયરી.
 DocType: Payment Request,Mute Email,મ્યૂટ કરો ઇમેઇલ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","ફૂડ, પીણું અને તમાકુ"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +606,Can only make payment against unbilled {0},માત્ર સામે ચુકવણી કરી શકો છો unbilled {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +126,Commission rate cannot be greater than 100,કમિશન દર કરતા વધારે 100 ન હોઈ શકે
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +609,Can only make payment against unbilled {0},માત્ર સામે ચુકવણી કરી શકો છો unbilled {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,કમિશન દર કરતા વધારે 100 ન હોઈ શકે
 DocType: Stock Entry,Subcontract,Subcontract
 apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,પ્રથમ {0} દાખલ કરો
 DocType: Production Order Operation,Actual End Time,વાસ્તવિક ઓવરને સમય
@@ -2402,30 +2431,30 @@
 DocType: SMS Log,No of Sent SMS,એસએમએસ કોઈ
 DocType: Account,Expense Account,ખર્ચ એકાઉન્ટ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,સોફ્ટવેર
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Colour,કલર
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,કલર
 DocType: Maintenance Visit,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; છે વસ્તુ પસંદ કરો અને કોઈ અન્ય ઉત્પાદન બંડલ છે, કૃપા કરીને"
 DocType: Student Log,Academic,શૈક્ષણિક
-apps/erpnext/erpnext/controllers/accounts_controller.py +469,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),કુલ એડવાન્સ ({0}) ઓર્ડર સામે {1} ગ્રાન્ડ કુલ કરતાં વધારે ન હોઈ શકે છે ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +472,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),કુલ એડવાન્સ ({0}) ઓર્ડર સામે {1} ગ્રાન્ડ કુલ કરતાં વધારે ન હોઈ શકે છે ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,અસમાન મહિના સમગ્ર લક્ષ્યો વિતરિત કરવા માટે માસિક વિતરણ પસંદ કરો.
 DocType: Purchase Invoice Item,Valuation Rate,મૂલ્યાંકન દર
+DocType: Stock Reconciliation,SR/,SR /
 apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,ભાવ યાદી કરન્સી પસંદ નહી
 DocType: Assessment,Results,પરિણામો
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +168,Employee {0} has already applied for {1} between {2} and {3},કર્મચારીનું {0} પહેલાથી માટે અરજી કરી છે {1} વચ્ચે {2} અને {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +175,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: Student Applicant,Father's/ Guardian 2 Email ID,પિતાનો / ગાર્ડિયન 2 ઇમેઇલ ને
 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 +228,Warehouses with existing transaction can not be converted to group.,હાલની વ્યવહાર સાથે વખારો જૂથ રૂપાંતરિત કરી શકાય છે.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +231,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 +93,Researcher,સંશોધક
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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.,ઇનકમિંગ ગુણવત્તા નિરીક્ષણ.
@@ -2437,25 +2466,25 @@
 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: Sales Invoice,Advertisement,જાહેરખબર
 DocType: Asset Category Account,Depreciation Expense Account,અવમૂલ્યન ખર્ચ એકાઉન્ટ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Probationary Period,અજમાયશી સમય
-apps/erpnext/erpnext/hooks.py +102,Announcements,જાહેરાત
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,અજમાયશી સમય
+apps/erpnext/erpnext/hooks.py +111,Announcements,જાહેરાત
 DocType: Customer Group,Only leaf nodes are allowed in transaction,માત્ર પર્ણ ગાંઠો વ્યવહાર માન્ય છે
 DocType: Expense Claim,Expense Approver,ખર્ચ તાજનો
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +109,Row {0}: Advance against Customer must be credit,રો {0}: ગ્રાહક સામે એડવાન્સ ક્રેડિટ હોવા જ જોઈએ
 apps/erpnext/erpnext/accounts/doctype/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 +16,To Datetime,તારીખ સમય માટે
+apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,તારીખ સમય માટે
 DocType: SMS Settings,SMS Gateway URL,એસએમએસ ગેટવે URL
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +51,Course Schedules deleted:,કોર્સ શેડ્યુલ કાઢી:
 apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,SMS વિતરણ સ્થિતિ જાળવવા માટે લોગ
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,બાકી પ્રવૃત્તિઓ
+DocType: Accounts Settings,Make Payment via Journal Entry,જર્નલ પ્રવેશ મારફતે ચુકવણી બનાવો
+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 +127,Please enter relieving date.,તારીખ રાહત દાખલ કરો.
-apps/erpnext/erpnext/controllers/trends.py +145,Amt,એએમટી
+apps/erpnext/erpnext/controllers/trends.py +149,Amt,એએમટી
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,Only Leave Applications with status 'Approved' can be submitted,માત્ર પરિસ્થિતિ &#39;માન્ય&#39; સબમિટ કરી શકો છો પૂરૂં છોડો
 apps/erpnext/erpnext/utilities/doctype/address/address.py +26,Address Title is mandatory.,સરનામું શીર્ષક ફરજિયાત છે.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"તપાસ સ્ત્રોત અભિયાન છે, તો ઝુંબેશ નામ દાખલ કરો"
@@ -2473,14 +2502,15 @@
 apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1},{0} માટે વિનિમય દર શોધવામાં અસમર્થ {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,માર્ક અડધા દિવસ
 DocType: Sales Invoice,Sales Team,સેલ્સ ટીમ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Duplicate entry,નકલી નોંધણી
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,નકલી નોંધણી
 DocType: Program Enrollment Tool,Get Students,વિદ્યાર્થીઓ મેળવો
 DocType: Serial No,Under Warranty,વોરંટી હેઠળ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +490,[Error],[ભૂલ]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +484,[Error],[ભૂલ]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,તમે વેચાણ ઓર્ડર સેવ વાર શબ્દો દૃશ્યમાન થશે.
 ,Employee Birthday,કર્મચારીનું જન્મદિવસ
 apps/erpnext/erpnext/controllers/status_updater.py +175,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} પહેલેથી હાજર છે. આ પ્રવેશો સુધારવા માટે અને ફરીથી પ્રયાસ કરો.
 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} અસ્તિત્વમાં નથી
@@ -2496,22 +2526,22 @@
 ,Issued Items Against Production Order,ઉત્પાદન ઓર્ડર સામે જારી વસ્તુઓ
 DocType: Pricing Rule,Purchase Manager,ખરીદી વ્યવસ્થાપક
 DocType: Target Detail,Target Detail,લક્ષ્યાંક વિગતવાર
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +25,All Jobs,બધા નોકરીઓ
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,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 +323,Amount {0} {1} {2} {3},રકમ {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,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: Supplier,Credit Limit,ક્રેડિટ મર્યાદા
 DocType: Production Plan Sales Order,Salse Order Date,Salse ઓર્ડર તારીખ
 DocType: Salary Component,Salary Component,પગાર પુન
-apps/erpnext/erpnext/accounts/utils.py +372,Payment Entries {0} are un-linked,ચુકવણી પ્રવેશો {0} યુએન સાથે જોડાયેલી છે
+apps/erpnext/erpnext/accounts/utils.py +449,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 +497,Material Requests {0} created,બનાવવામાં સામગ્રી અરજીઓ {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +498,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.,શરતો અથવા કરારની ઢાંચો.
 DocType: Purchase Invoice,Address and Contact,એડ્રેસ અને સંપર્ક
@@ -2550,7 +2580,7 @@
 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 +848,Paid Amount cannot be greater than total negative outstanding amount {0},ચૂકવેલ રકમ કુલ નકારાત્મક બાકી રકમ કરતાં વધારે ન હોઈ શકે {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +859,Paid Amount cannot be greater than total negative outstanding amount {0},ચૂકવેલ રકમ કુલ નકારાત્મક બાકી રકમ કરતાં વધારે ન હોઈ શકે {0}
 DocType: Employee Internal Work History,Employee Internal Work History,કર્મચારીનું આંતરિક કામ ઇતિહાસ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +233,Closing (Dr),બંધ (DR)
 DocType: Cheque Print Template,Cheque Size,ચેક માપ
@@ -2571,7 +2601,8 @@
 ,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.
-apps/erpnext/erpnext/controllers/accounts_controller.py +555,'Update Stock' cannot be checked for fixed asset sale,&#39;સુધારા સ્ટોક&#39; સ્થિર એસેટ વેચાણ માટે તપાસી શકાતું નથી
+DocType: Student Guardian,Father,પિતા
+apps/erpnext/erpnext/controllers/accounts_controller.py +558,'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} રદ અથવા બંધ છે
@@ -2581,15 +2612,15 @@
 DocType: Sales Order,Fully Delivered,સંપૂર્ણપણે વિતરિત
 DocType: Lead,Lower Income,ઓછી આવક
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","નફો / નુકશાન નક્કી કરવામાં આવશે, જેમાં જવાબદારી હેઠળ એકાઉન્ટ વડા,"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +166,Source and target warehouse cannot be same for row {0},સોર્સ અને ટાર્ગેટ વેરહાઉસ પંક્તિ માટે જ ન હોઈ શકે {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","આ સ્ટોક રિકંસીલેશન એક ખુલી પ્રવેશ છે, કારણ કે તફાવત એકાઉન્ટ, એક એસેટ / જવાબદારી પ્રકાર એકાઉન્ટ હોવું જ જોઈએ"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +81,Purchase Order number required for Item {0},વસ્તુ માટે જરૂરી ઓર્ડર નંબર ખરીદી {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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/purchase_receipt/purchase_receipt.py +82,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 +17,Cannot change status as student {0} is linked with student application {1},વિદ્યાર્થી તરીકે સ્થિતિ બદલી શકાતું નથી {0} વિદ્યાર્થી અરજી સાથે કડી થયેલ છે {1}
+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: Timesheet,"List of employee which has ""Salary Slip Based on Timesheet"" is enabled in salary structure.",કર્મચારી યાદી કે જે &quot;પગાર કાપલી Timesheet પર આધારિત&quot; છે પગાર માળખું સક્રિય કરેલ છે.
 DocType: Asset,Fully Depreciated,સંપૂર્ણપણે અવમૂલ્યન
 ,Stock Projected Qty,સ્ટોક Qty અંદાજિત
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Customer {0} does not belong to project {1},સંબંધ નથી {0} ગ્રાહક પ્રોજેક્ટ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,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,સીરીયલ કોઈ અને બેચ
@@ -2601,7 +2632,7 @@
 DocType: Purchase Invoice,Purchase Taxes and Charges,કર અને ખર્ચ ખરીદી
 ,Qty to Receive,પ્રાપ્ત Qty
 DocType: Leave Block List,Leave Block List Allowed,બ્લોક યાદી મંજૂર છોડો
-apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +55,All Warehouses,બધા વખારો
+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 +105,Credit To account must be a Balance Sheet account,એકાઉન્ટ ક્રેડિટ બેલેન્સ શીટ એકાઉન્ટ હોવું જ જોઈએ
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,બધા પુરવઠોકર્તા પ્રકાર
@@ -2613,10 +2644,10 @@
 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/manufacturing/doctype/bom/bom.js +26,Browse BOM,બ્રાઉઝ BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,બ્રાઉઝ BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,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 Year,Academic Year,શૈક્ષણીક વર્ષ
+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
 DocType: Appraisal,Appraisal,મૂલ્યાંકન
@@ -2624,12 +2655,12 @@
 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 +197,Leave approver must be one of {0},એક હોવો જ જોઈએ સાક્ષી છોડો {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,Leave approver must be one of {0},એક હોવો જ જોઈએ સાક્ષી છોડો {0}
 DocType: Hub Settings,Seller Email,વિક્રેતા ઇમેઇલ
 DocType: Project,Total Purchase Cost (via Purchase Invoice),કુલ ખરીદ કિંમત (ખરીદી ભરતિયું મારફતે)
 DocType: Workstation Working Hour,Start Time,પ્રારંભ સમય
 DocType: Item Price,Bulk Import Help,બલ્ક આયાત કરવામાં મદદ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +256,Select Quantity,પસંદ કરો જથ્થો
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +257,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,સંદેશ મોકલ્યો
@@ -2646,6 +2677,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,ક્યાં લક્ષ્ય Qty અથવા લક્ષ્ય રકમ ફરજિયાત છે.
 apps/erpnext/erpnext/config/projects.py +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}, કારણ કે કર્મચારી વેચાણ વ્યક્તિઓ નીચે જોડાયેલ એક વપરાશકર્તા id નથી {1}"
+DocType: Timesheet,Billing Details,બિલિંગ વિગતો
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +149,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}
 DocType: Item,Inspection Required,નિરીક્ષણ જરૂરી
@@ -2665,7 +2697,7 @@
 DocType: Expense Claim,Approval Status,મંજૂરી સ્થિતિ
 DocType: Hub Settings,Publish Items to Hub,હબ વસ્તુઓ પ્રકાશિત
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},કિંમત પંક્તિ માં કિંમત કરતાં ઓછી હોવી જોઈએ થી {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Wire Transfer,વાયર ટ્રાન્સફર
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,વાયર ટ્રાન્સફર
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,બધા તપાસો
 DocType: Sales Order,Recurring Order,રીકરીંગ ઓર્ડર
 DocType: Company,Default Income Account,ડિફૉલ્ટ આવક એકાઉન્ટ
@@ -2677,21 +2709,19 @@
 ,Welcome to ERPNext,ERPNext માટે આપનું સ્વાગત છે
 apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,અવતરણ માટે લીડ
 DocType: Lead,From Customer,ગ્રાહક પાસેથી
-apps/erpnext/erpnext/demo/setup_data.py +357,Calls,કોલ્સ
+apps/erpnext/erpnext/demo/setup/setup_data.py +300,Calls,કોલ્સ
 DocType: Project,Total Costing Amount (via Time Logs),કુલ પડતર રકમ (સમય લોગ મારફતે)
 DocType: Purchase Order Item Supplied,Stock UOM,સ્ટોક UOM
-apps/erpnext/erpnext/stock/doctype/item/item.py +466,"As there are existing transactions for this item, \
-							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","આ આઇટમ, \ તમે મૂલ્યો બદલી શકતા નથી માટે વર્તમાન વ્યવહારો હોય છે &#39;સીરીયલ કોઈ છે&#39;, &#39;બેચ કોઈ&#39;, &#39;સ્ટોક વસ્તુ છે&#39; અને &#39;મૂલ્યાંકન પદ્ધતિ&#39;"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,Purchase Order {0} is not submitted,ઓર્ડર {0} અપર્ણ ન કરાય ખરીદી
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,અંદાજિત
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},સીરીયલ કોઈ {0} વેરહાઉસ ને અનુલક્ષતું નથી {1}
 apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,"નોંધ: {0} જથ્થો કે રકમ 0 છે, કારણ કે ડિલિવરી ઉપર અને ઉપર બુકિંગ વસ્તુ માટે સિસ્ટમ તપાસ કરશે નહીં"
 DocType: Notification Control,Quotation Message,અવતરણ સંદેશ
 DocType: Issue,Opening Date,શરૂઆતના તારીખ
-apps/erpnext/erpnext/schools/api.py +58,Attendance has been marked successfully.,એટેન્ડન્સ સફળતાપૂર્વક ચિહ્નિત કરવામાં આવી છે.
+apps/erpnext/erpnext/schools/api.py +57,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 +136,Account Type for {0} must be {1},એકાઉન્ટ પ્રકાર {0} હોવા જ જોઈએ {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +139,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,બંને વેરહાઉસ જ કંપની સંબંધ માટે જ જોઈએ
@@ -2706,12 +2736,13 @@
 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/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 +20,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 +1190,Please select customer,કૃપા કરીને ગ્રાહક પસંદ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1193,Please select customer,કૃપા કરીને ગ્રાહક પસંદ
 DocType: C-Form,I,હું
 DocType: Company,Asset Depreciation Cost Center,એસેટ અવમૂલ્યન કિંમત કેન્દ્ર
 DocType: Sales Order Item,Sales Order Date,સેલ્સ ઓર્ડર તારીખ
@@ -2721,6 +2752,7 @@
 ,Payment Period Based On Invoice Date,ભરતિયું તારીખ પર આધારિત ચુકવણી સમય
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},માટે ખૂટે કરન્સી વિનિમય દરો {0}
 DocType: Assessment,Examiner,એક્ઝામિનર
+DocType: Student,Siblings,બહેન
 DocType: Journal Entry,Stock Entry,સ્ટોક એન્ટ્રી
 DocType: Payment Entry,Payment References,ચુકવણી સંદર્ભો
 DocType: C-Form,C-FORM-,સી ફોર્મ-
@@ -2738,11 +2770,12 @@
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,વિષય નામ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,વેચાણ અથવા ખરીદી ઓછામાં ઓછા એક પસંદ કરેલ હોવું જ જોઈએ
+DocType: Grading Structure,Grade Intervals,ગ્રેડ અંતરાલો
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,તમારા વેપાર સ્વભાવ પસંદ કરો.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,ઉત્પાદન કામગીરી જ્યાં ધરવામાં આવે છે.
 DocType: Asset Movement,Source Warehouse,સોર્સ વેરહાઉસ
 DocType: Installation Note,Installation Date,સ્થાપન તારીખ
-apps/erpnext/erpnext/controllers/accounts_controller.py +534,Row #{0}: Asset {1} does not belong to company {2},રો # {0}: એસેટ {1} કંપની ને અનુલક્ષતું નથી {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +537,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,સેલ્સ વપરાશકર્તા
@@ -2756,28 +2789,31 @@
 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,વર્તમાન 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 +111,Date Of Retirement must be greater than Date of Joining,નિવૃત્તિ તારીખ જોડાયા તારીખ કરતાં મોટી હોવી જ જોઈએ
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +49,There were errors while scheduling course on :,ભૂલો પર કોર્સ સુનિશ્ચિત જ્યારે હતા:
 DocType: Sales Invoice,Against Income Account,આવક એકાઉન્ટ સામે
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +87,{0}% Delivered,{0}% વિતરિત
+apps/erpnext/erpnext/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}: આદેશ આપ્યો Qty {1} ન્યૂનતમ ક્રમ Qty {2} (વસ્તુ માં વ્યાખ્યાયિત) કરતા ઓછી ન હોઈ શકે.
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,માસિક વિતરણ ટકાવારી
 DocType: Territory,Territory Targets,પ્રદેશ લક્ષ્યાંક
 DocType: Delivery Note,Transporter Info,ટ્રાન્સપોર્ટર માહિતી
-apps/erpnext/erpnext/accounts/utils.py +379,Please set default {0} in Company {1},મૂળભૂત {0} કંપની સુયોજિત કરો {1}
+apps/erpnext/erpnext/accounts/utils.py +456,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,ગ્રોસ પ્રોફિટ / નુકશાન
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,ઓર્ડર વસ્તુ પાડેલ ખરીદી
 apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,કંપની નામ કંપની ન હોઈ શકે
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,પ્રિન્ટ નમૂનાઓ માટે પત્ર ચેતવણી.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,પ્રિન્ટ ટેમ્પલેટો માટે શિર્ષકો કાચું ભરતિયું દા.ત..
+DocType: Student Guardian,Student Guardian,વિદ્યાર્થી ગાર્ડિયન
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +184,Valuation type charges can not marked as Inclusive,મૂલ્યાંકન પ્રકાર ખર્ચ વ્યાપક તરીકે ચિહ્નિત નથી કરી શકો છો
 DocType: POS Profile,Update Stock,સુધારા સ્ટોક
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,વસ્તુઓ માટે વિવિધ UOM ખોટી (કુલ) નેટ વજન કિંમત તરફ દોરી જશે. દરેક વસ્તુ ચોખ્ખી વજન જ UOM છે કે તેની ખાતરી કરો.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM દર
 DocType: Asset,Journal Entry for Scrap,સ્ક્રેપ માટે જર્નલ પ્રવેશ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,ડ લવર નોંધ વસ્તુઓ ખેંચી કરો
-apps/erpnext/erpnext/accounts/utils.py +349,Journal Entries {0} are un-linked,જર્નલ પ્રવેશો {0}-અન જોડાયેલા છે
+apps/erpnext/erpnext/accounts/utils.py +426,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,કંપની રાઉન્ડ બંધ ખર્ચ કેન્દ્રને ઉલ્લેખ કરો
@@ -2801,6 +2837,7 @@
 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,સમુદાય ફોરમ
+DocType: Homepage,"URL for ""All Products""",માટે &quot;બધા ઉત્પાદનો&quot; URL ને
 DocType: Leave Application,Leave Balance Before Application,એપ્લિકેશન પહેલાં બેલેન્સ છોડો
 DocType: SMS Center,Send SMS,એસએમએસ મોકલો
 DocType: Cheque Print Template,Width of amount in word,શબ્દ રકમ પહોળાઈ
@@ -2809,7 +2846,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 +29,Current Job Openings,વર્તમાન જોબ શરૂઆતનો
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,Current Job Openings,વર્તમાન જોબ શરૂઆતનો
 DocType: Company,Stock Adjustment Account,સ્ટોક એડજસ્ટમેન્ટ એકાઉન્ટ
 DocType: Journal Entry,Write Off,માંડવાળ
 DocType: Timesheet Detail,Operation ID,ઓપરેશન ID ને
@@ -2822,7 +2859,7 @@
 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 +850,Show tax break-up,બતાવો કર બ્રેક અપ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +841,Show tax break-up,બતાવો કર બ્રેક અપ
 apps/erpnext/erpnext/accounts/party.py +308,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} વેરહાઉસ સામે અસ્તિત્વમાં તેથી તમે ફરીથી સોંપવા અથવા સંશોધિત કરી શકો છો"
@@ -2832,10 +2869,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 +534,Please select Posting Date before selecting Party,કૃપા કરીને પાર્ટી પસંદ કર્યા પહેલાં પોસ્ટ તારીખ સિલેક્ટ કરો
 DocType: Serial No,Out of AMC,એએમસીના આઉટ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +80,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 +162,Please contact to the user who have Sales Master Manager {0} role,સેલ્સ માસ્ટર વ્યવસ્થાપક {0} ભૂમિકા છે જે વપરાશકર્તા માટે સંપર્ક કરો
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +195,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 +5,This is based on the attendance of this Student,આ વિદ્યાર્થી હાજરી પર આધારિત છે
@@ -2844,12 +2882,11 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,ડ લવર નોંધો {0} આ વેચાણ ઓર્ડર રદ પહેલાં રદ થયેલ હોવું જ જોઈએ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +75,Paid amount + Write Off Amount can not be greater than Grand Total,ચૂકવેલ રકમ રકમ ગ્રાન્ડ કુલ કરતાં વધારે ન હોઈ શકે માંડવાળ +
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,{0} is not a valid Batch Number for Item {1},{0} વસ્તુ માટે માન્ય બેચ નંબર નથી {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +138,Note: There is not enough leave balance for Leave Type {0},નોંધ: છોડો પ્રકાર માટે પૂરતી રજા બેલેન્સ નથી {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,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,તક પ્રકાર
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,નવી કંપની
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,Cost Center is required for 'Profit and Loss' account {0},ખર્ચ કેન્દ્રને &#39;નફો અને નુકસાનનું&#39; માટે જરૂરી છે એકાઉન્ટ {0}
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,વ્યવહારો માત્ર કંપની સર્જક દ્વારા કાઢી શકાય છે
 apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,સામાન્ય ખાતાવહી પ્રવેશો ખોટો નંબર જોવા મળે છે. તમે વ્યવહાર એક ખોટા એકાઉન્ટમાં પસંદ કરેલ છે શકે છે.
 DocType: Cheque Print Template,Cheque Width,ચેક પહોળાઈ
@@ -2858,16 +2895,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,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 +228,{0} '{1}' is disabled,{0} &#39;{1}&#39; અક્ષમ છે
+apps/erpnext/erpnext/controllers/accounts_controller.py +231,{0} '{1}' is disabled,{0} &#39;{1}&#39; અક્ષમ છે
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ઓપન તરીકે સેટ કરો
 DocType: Cheque Print Template,Scanned Cheque,સ્કેન ચેક
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,સબમિટ વ્યવહારો પર સંપર્કો આપોઆપ ઇમેઇલ્સ મોકલો.
+DocType: Timesheet,Total Billable Amount,કુલ બિલેબલ રકમ
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,આઇટમ 3
 DocType: Purchase Order,Customer Contact Email,ગ્રાહક સંપર્ક ઇમેઇલ
 DocType: Warranty Claim,Item and Warranty Details,વસ્તુ અને વોરંટી વિગતો
 DocType: Sales Team,Contribution (%),યોગદાન (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,નોંધ: ચુકવણી એન્ટ્રી થી બનાવી શકાય નહીં &#39;કેશ અથવા બેન્ક એકાઉન્ટ&#39; સ્પષ્ટ કરેલ ન હતી
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Responsibilities,જવાબદારીઓ
+apps/erpnext/erpnext/controllers/accounts_controller.py +78,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,જવાબદારીઓ
 DocType: Expense Claim Account,Expense Claim Account,ખર્ચ દાવો એકાઉન્ટ
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,ઢાંચો
 DocType: Sales Person,Sales Person Name,વેચાણ વ્યક્તિ નામ
@@ -2875,6 +2913,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,વપરાશકર્તાઓ ઉમેરો
 DocType: Pricing Rule,Item Group,વસ્તુ ગ્રુપ
 DocType: Item,Safety Stock,સુરક્ષા સ્ટોક
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,વસ્તુ code&gt; વસ્તુ ગ્રુપ&gt; બ્રાન્ડ
 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),કર અને ખર્ચ ઉમેરાયેલ (કંપની ચલણ)
@@ -2884,7 +2923,6 @@
 DocType: Item,Default BOM,મૂળભૂત BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Please re-type company name to confirm,ફરીથી લખો કંપની નામ ખાતરી કરવા માટે કરો
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +67,Total Outstanding Amt,કુલ બાકી એએમટી
-DocType: Timesheet,Total Hours,કુલ કલાકો
 DocType: Journal Entry,Printing Settings,પ્રિન્ટિંગ સેટિંગ્સ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Total Debit must be equal to Total Credit. The difference is {0},કુલ ડેબિટ કુલ ક્રેડિટ માટે સમાન હોવો જોઈએ. તફાવત છે {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,ઓટોમોટિવ
@@ -2897,13 +2935,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,ઇન્વેસ્ટમેન્ટ બેન્કિંગ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +71,Cash or Bank Account is mandatory for making payment entry,કેશ અથવા બેન્ક એકાઉન્ટ ચુકવણી પ્રવેશ બનાવવા માટે ફરજિયાત છે
 DocType: Purchase Invoice,Price List Exchange Rate,ભાવ યાદી એક્સચેન્જ રેટ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ગ્રાહક&gt; ગ્રાહક જૂથ&gt; પ્રદેશ
 DocType: Purchase Invoice Item,Rate,દર
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Intern,ઇન્ટર્ન
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,ઇન્ટર્ન
 DocType: Stock Entry,From BOM,BOM થી
 DocType: Assessment,Assessment Code,આકારણી કોડ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +32,Basic,મૂળભૂત
+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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',&#39;બનાવો સૂચિ&#39; પર ક્લિક કરો
+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 +95,Reference No is mandatory if you entered Reference Date,તમે સંદર્ભ તારીખ દાખલ જો સંદર્ભ કોઈ ફરજિયાત છે
@@ -2912,11 +2951,11 @@
 DocType: Salary Slip,Salary Structure,પગાર માળખું
 DocType: Account,Bank,બેન્ક
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,એરલાઇન
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +752,Issue Material,ઇશ્યૂ સામગ્રી
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +723,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 +683,You are in offline mode. You will not be able to reload until you have network.,તમે ઑફલાઇન મોડ છે. તમે જ્યાં સુધી તમે નેટવર્ક ફરીથી લોડ કરવા માટે સમર્થ હશે નહિં.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +665,You are in offline mode. You will not be able to reload until you have network.,તમે ઑફલાઇન મોડ છે. તમે જ્યાં સુધી તમે નેટવર્ક ફરીથી લોડ કરવા માટે સમર્થ હશે નહિં.
 DocType: Hub Settings,Access Token,ઍક્સેસ ટોકન
 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,સીરીયલ કોઈ
@@ -2924,33 +2963,35 @@
 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 +1122,Enter value must be positive,દાખલ કિંમત હકારાત્મક હોવો જ જોઈએ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,All Territories,બધા પ્રદેશો
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1125,Enter value must be positive,દાખલ કિંમત હકારાત્મક હોવો જ જોઈએ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,બધા પ્રદેશો
 DocType: Purchase Invoice,Items,વસ્તુઓ
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +23,Student is already enrolled.,વિદ્યાર્થી પહેલેથી પ્રવેશ છે.
 DocType: Fiscal Year,Year Name,વર્ષ નામ
 DocType: Process Payroll,Process Payroll,પ્રક્રિયા પેરોલ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,કામ દિવસો કરતાં વધુ રજાઓ આ મહિને છે.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +233,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 +96,Request for Quotations,સુવાકયો માટે વિનંતી
+apps/erpnext/erpnext/hooks.py +104,Request for Quotations,સુવાકયો માટે વિનંતી
 DocType: Payment Reconciliation,Maximum Invoice Amount,મહત્તમ ભરતિયું જથ્થા
 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 +628,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',વેરિએન્ટ માટે માપવા એકમ મૂળભૂત &#39;{0}&#39; નમૂનો તરીકે જ હોવી જોઈએ &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',વેરિએન્ટ માટે માપવા એકમ મૂળભૂત &#39;{0}&#39; નમૂનો તરીકે જ હોવી જોઈએ &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,પર આધારિત ગણતરી
 DocType: Delivery Note Item,From Warehouse,વેરહાઉસ માંથી
 DocType: Assessment,Supervisor Name,સુપરવાઇઝર નામ
+DocType: Assessment,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,ખરીદી વપરાશકર્તા
 DocType: Notification Control,Customize the Notification,સૂચન કસ્ટમાઇઝ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Cash Flow from Operations,કામગીરી માંથી રોકડ પ્રવાહ
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,મૂળભૂત સરનામું ઢાંચો કાઢી શકાતી નથી
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,મૂળભૂત સરનામું ઢાંચો કાઢી શકાતી નથી
 DocType: Sales Invoice,Shipping Rule,શીપીંગ નિયમ
 DocType: Manufacturer,Limited to 12 characters,12 અક્ષરો સુધી મર્યાદિત
 DocType: Journal Entry,Print Heading,પ્રિંટ મથાળું
@@ -2965,8 +3006,8 @@
 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/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,ક્યાં લક્ષ્ય Qty અથવા લક્ષ્ય રકમ ફરજિયાત છે
-apps/erpnext/erpnext/stock/get_item_details.py +485,No default BOM exists for Item {0},મૂળભૂત BOM વસ્તુ માટે અસ્તિત્વમાં {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +336,Please select Posting Date first,પ્રથમ પોસ્ટ તારીખ પસંદ કરો
+apps/erpnext/erpnext/stock/get_item_details.py +486,No default BOM exists for Item {0},મૂળભૂત BOM વસ્તુ માટે અસ્તિત્વમાં {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +326,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,હાલની વ્યવહારો સાથે ખર્ચ કેન્દ્રને ખાતાવહી રૂપાંતરિત કરી શકતા નથી
@@ -2982,6 +3023,7 @@
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,ઇન્વૉઇસેસ સાથે મેળ ચુકવણીઓ
 DocType: Journal Entry,Bank Entry,બેન્ક એન્ટ્રી
 DocType: Authorization Rule,Applicable To (Designation),લાગુ કરો (હોદ્દો)
+,Profitability Analysis,નફાકારકતા એનાલિસિસ
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,સૂચી માં સામેલ કરો
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,ગ્રુપ દ્વારા
 DocType: Guardian,Interests,રૂચિ
@@ -2994,21 +3036,21 @@
 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 +141,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",શ્રેણીબદ્ધ વસ્તુ {0} સ્ટોક રિકંસીલેશન ઉપયોગ \ અપડેટ કરી શકાતું નથી
 DocType: Scheduling Tool,Day,દિવસ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,ન્યૂ સીરીયલ કોઈ વેરહાઉસ કરી શકે છે. વેરહાઉસ સ્ટોક એન્ટ્રી અથવા ખરીદી રસીદ દ્વારા સુયોજિત થયેલ હોવું જ જોઈએ
 DocType: Lead,Lead Type,લીડ પ્રકાર
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,You are not authorized to approve leaves on Block Dates,તમે બ્લોક તારીખો પર પાંદડા મંજૂર કરવા માટે અધિકૃત નથી
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,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: Student Applicant,AP.,એપી.
 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 +639,Point of Sale,વેચાણ પોઇન્ટ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +634,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,ટેક્સ
 DocType: Production Planning Tool,Production Planning Tool,ઉત્પાદન આયોજન સાધન
@@ -3017,74 +3059,77 @@
 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 +373,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 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 Profile,Customer Group,ગ્રાહક જૂથ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,Expense account is mandatory for item {0},ખર્ચ હિસાબ આઇટમ માટે ફરજિયાત છે {0}
 DocType: Item,Website Description,વેબસાઇટ વર્ણન
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date must be on or after today,આગળ અવમૂલ્યન તારીખે અથવા આજે પછી જ હોવી જોઈએ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,ઈક્વિટી કુલ ફેરફાર
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +145,Please cancel Purchase Invoice {0} first,ખરીદી ભરતિયું {0} રદ કૃપા કરીને પ્રથમ
 DocType: Serial No,AMC Expiry Date,એએમસી સમાપ્તિ તારીખ
 ,Sales Register,સેલ્સ રજિસ્ટર
 DocType: Quotation,Quotation Lost Reason,અવતરણ લોસ્ટ કારણ
+apps/erpnext/erpnext/utilities/doctype/address/address.py +164,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,કોઈ મૂળભૂત સરનામું ઢાંચો જોવા મળે છે. સેટઅપ&gt; પ્રિન્ટર અને બ્રાંડિંગ&gt; સરનામું નમૂનો એક નવું બનાવો.
 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 +330,Transaction reference no {0} dated {1},ટ્રાન્ઝેક્શન સંદર્ભ કોઈ {0} ના રોજ {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Transaction reference no {0} dated {1},ટ્રાન્ઝેક્શન સંદર્ભ કોઈ {0} ના રોજ {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,ફેરફાર કરવા માટે કંઈ નથી.
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,Summary for this month and pending activities,આ મહિને અને બાકી પ્રવૃત્તિઓ માટે સારાંશ
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,આ મહિને અને બાકી પ્રવૃત્તિઓ માટે સારાંશ
 DocType: Customer Group,Customer Group Name,ગ્રાહક જૂથ નામ
 apps/erpnext/erpnext/public/js/financial_statements.js +54,Cash Flow Statement,કેશ ફ્લો સ્ટેટમેન્ટ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Please remove this Invoice {0} from C-Form {1},સી-ફોર્મ આ બિલ {0} દૂર કરો {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,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 +644,Get Items,વસ્તુઓ વિચાર
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +623,Get Items,વસ્તુઓ વિચાર
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +210,Please enter Write Off Account,એકાઉન્ટ માંડવાળ દાખલ કરો
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,છેલ્લે ઓર્ડર તારીખ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +41,Account {0} does not belongs to company {1},એકાઉન્ટ {0} કરે કંપની માટે અનુસરે છે નથી {1}
+DocType: Student,Guardian Details,ગાર્ડિયન વિગતો
 DocType: C-Form,C-Form,સી-ફોર્મ
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,બહુવિધ કર્મચારીઓ માટે માર્ક એટેન્ડન્સ
 DocType: Payment Request,Initiated,શરૂ
 DocType: Production Order,Planned Start Date,આયોજિત પ્રારંભ તારીખ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,Customer is required against Receivable account {0},ગ્રાહક પ્રાપ્ત એકાઉન્ટ સામે જરૂરી છે {0}
 DocType: Serial No,Creation Document Type,બનાવટ દસ્તાવેજ પ્રકારની
 DocType: Leave Type,Is Encash,વેચીને રોકડાં નાણાં કરવાં છે
 DocType: Purchase Invoice,Mobile No,મોબાઈલ નં
 DocType: Leave Allocation,New Leaves Allocated,નવા પાંદડા સોંપાયેલ
-apps/erpnext/erpnext/controllers/trends.py +265,Project-wise data is not available for Quotation,પ્રોજેક્ટ મુજબના માહિતી અવતરણ માટે ઉપલબ્ધ નથી
+apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,પ્રોજેક્ટ મુજબના માહિતી અવતરણ માટે ઉપલબ્ધ નથી
 DocType: Project,Expected End Date,અપેક્ષિત ઓવરને તારીખ
 DocType: Budget Account,Budget Amount,બજેટ રકમ
 DocType: Appraisal Template,Appraisal Template Title,મૂલ્યાંકન ઢાંચો શીર્ષક
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,Commercial,કોમર્શિયલ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,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 +648,Row {0}# Account must be of type 'Fixed Asset',રો {0} # એકાઉન્ટ પ્રકાર હોવા જ જોઈએ &#39;સ્થિર એસેટ&#39;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,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 +30,Series is mandatory,સિરીઝ ફરજિયાત છે
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +50,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}
 DocType: Leave Allocation,Unused leaves,નહિં વપરાયેલ પાંદડા
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Cr,લાખોમાં
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Cr,લાખોમાં
 DocType: Tax Rule,Billing State,બિલિંગ રાજ્ય
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +250,Transfer,ટ્રાન્સફર
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +187,{0} {1} does not associated with Party Account {2},{0} {1} પક્ષ એકાઉન્ટ સાથે સંકળાયેલ નથી {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,Fetch exploded BOM (including sub-assemblies),(પેટા-સ્થળોના સહિત) ફેલાય છે BOM મેળવો
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +254,Transfer,ટ્રાન્સફર
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +190,{0} {1} does not associated with Party Account {2},{0} {1} પક્ષ એકાઉન્ટ સાથે સંકળાયેલ નથી {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +796,Fetch exploded BOM (including sub-assemblies),(પેટા-સ્થળોના સહિત) ફેલાય છે BOM મેળવો
 DocType: Authorization Rule,Applicable To (Employee),લાગુ કરો (કર્મચારી)
-apps/erpnext/erpnext/controllers/accounts_controller.py +115,Due Date is mandatory,કારણે તારીખ ફરજિયાત છે
+apps/erpnext/erpnext/controllers/accounts_controller.py +118,Due Date is mandatory,કારણે તારીખ ફરજિયાત છે
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,લક્ષણ માટે વૃદ્ધિ {0} 0 ન હોઈ શકે
 DocType: Journal Entry,Pay To / Recd From,ના / Recd પગાર
 DocType: Naming Series,Setup Series,સેટઅપ સિરીઝ
 DocType: Payment Reconciliation,To Invoice Date,તારીખ ભરતિયું
 DocType: Supplier,Contact HTML,સંપર્ક HTML
 ,Inactive Customers,નિષ્ક્રિય ગ્રાહકો
+DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,ખરીદી રસીદો
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,કેવી રીતે પ્રાઇસીંગ નિયમ લાગુ પડે છે?
 DocType: Quality Inspection,Delivery Note No,ડ લવર નોંધ કોઈ
@@ -3093,7 +3138,7 @@
 DocType: Company,Retail,છૂટક
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +120,Customer {0} does not exist,ગ્રાહક {0} અસ્તિત્વમાં નથી
 DocType: Attendance,Absent,ગેરહાજર
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +587,Product Bundle,ઉત્પાદન બંડલ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Product Bundle,ઉત્પાદન બંડલ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Invalid reference {1},રો {0}: અમાન્ય સંદર્ભ {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,કર અને ખર્ચ ઢાંચો ખરીદી
 DocType: Upload Attendance,Download Template,ડાઉનલોડ નમૂનો
@@ -3103,8 +3148,8 @@
 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 +742,Send Supplier Emails,પુરવઠોકર્તા ઇમેઇલ્સ મોકલો
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +104,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","પગાર પહેલેથી જ વચ્ચે {0} અને {1}, એપ્લિકેશન સમયગાળા છોડો આ તારીખ શ્રેણી વચ્ચે ન હોઈ શકે સમયગાળા માટે પ્રક્રિયા."
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +708,Send Supplier Emails,પુરવઠોકર્તા ઇમેઇલ્સ મોકલો
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,"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,ગાર્ડિયન વ્યાજ
 DocType: Timesheet,Employee Detail,કર્મચારીનું વિગતવાર
@@ -3115,9 +3160,9 @@
 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/accounts/doctype/gl_entry/gl_entry.py +77,Account {0} cannot be a Group,એકાઉન્ટ {0} ગ્રુપ ન હોઈ શકે
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} cannot be a Group,એકાઉન્ટ {0} ગ્રુપ ન હોઈ શકે
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +31,Optional. This setting will be used to filter in various transactions.,વૈકલ્પિક. આ ગોઠવણી વિવિધ વ્યવહારો ફિલ્ટર કરવા માટે ઉપયોગ કરવામાં આવશે.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +107,Negative Valuation Rate is not allowed,નકારાત્મક મૂલ્યાંકન દર મંજૂરી નથી
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,નકારાત્મક મૂલ્યાંકન દર મંજૂરી નથી
 DocType: Holiday List,Weekly Off,અઠવાડિક બંધ
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","દા.ત. 2012, 2012-13 માટે"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +39,Provisional Profit / Loss (Credit),કામચલાઉ નફો / નુકશાન (ક્રેડિટ)
@@ -3131,16 +3176,16 @@
 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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: ખર્ચ કેન્દ્રને વસ્તુ માટે ફરજિયાત છે {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +626,Get Items from Product Bundle,ઉત્પાદન બંડલ થી વસ્તુઓ વિચાર
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +605,Get Items from Product Bundle,ઉત્પાદન બંડલ થી વસ્તુઓ વિચાર
 DocType: Asset,Straight Line,સીધી રેખા
 DocType: Project User,Project User,પ્રોજેક્ટ વપરાશકર્તા
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} is inactive,એકાઉન્ટ {0} નિષ્ક્રિય છે
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} is inactive,એકાઉન્ટ {0} નિષ્ક્રિય છે
 DocType: GL Entry,Is Advance,અગાઉથી છે
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,તારીખ તારીખ અને હાજરી થી એટેન્ડન્સ ફરજિયાત છે
 apps/erpnext/erpnext/controllers/buying_controller.py +148,Please enter 'Is Subcontracted' as Yes or No,હા અથવા ના હોય તરીકે &#39;subcontracted છે&#39; દાખલ કરો
 DocType: Sales Team,Contact No.,સંપર્ક નંબર
 DocType: Bank Reconciliation,Payment Entries,ચુકવણી પ્રવેશો
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,'Profit and Loss' type account {0} not allowed in Opening Entry,એન્ટ્રી ખુલવાનો મંજૂરી નથી &#39;નફો અને નુકસાનનું&#39; પ્રકાર એકાઉન્ટ {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +71,'Profit and Loss' type account {0} not allowed in Opening Entry,એન્ટ્રી ખુલવાનો મંજૂરી નથી &#39;નફો અને નુકસાનનું&#39; પ્રકાર એકાઉન્ટ {0}
 DocType: Program Enrollment Tool,Get Students From,વિદ્યાર્થીઓ મેળવો
 DocType: Hub Settings,Seller Country,વિક્રેતા દેશ
 apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,વેબસાઇટ પર આઇટમ્સ પ્રકાશિત
@@ -3159,7 +3204,7 @@
 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 +558,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","રો # {0}: એસેટ {1} સુપ્રત કરી શકાય નહીં, તે પહેલેથી જ છે {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +561,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","રો # {0}: એસેટ {1} સુપ્રત કરી શકાય નહીં, તે પહેલેથી જ છે {2}"
 DocType: Tax Rule,Billing Country,બિલિંગ દેશ
 DocType: Production Order,Expected Delivery Date,અપેક્ષિત બોલ તારીખ
 apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,ડેબિટ અને ક્રેડિટ {0} # માટે સમાન નથી {1}. તફાવત છે {2}.
@@ -3172,13 +3217,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +202,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: Sales Order,% Amount Billed,% રકમ ગણાવી
+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 +117,No Item with Serial No {0},સીરીયલ કોઈ સાથે કોઈ વસ્તુ {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,ઓપન સૂચનાઓ
+DocType: Email Digest,Open Notifications,ઓપન સૂચનાઓ
 DocType: Payment Entry,Difference Amount (Company Currency),તફાવત રકમ (કંપની ચલણ)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,પ્રત્યક્ષ ખર્ચ
 apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
@@ -3186,7 +3231,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,નવા ગ્રાહક આવક
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,પ્રવાસ ખર્ચ
 DocType: Maintenance Visit,Breakdown,વિરામ
-apps/erpnext/erpnext/controllers/accounts_controller.py +634,Account: {0} with currency: {1} can not be selected,ખાતું: {0} ચલણ સાથે: {1} પસંદ કરી શકાતી નથી
+apps/erpnext/erpnext/controllers/accounts_controller.py +637,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}
 DocType: Program Enrollment Tool,Student Applicants,વિદ્યાર્થી અરજદારો
@@ -3194,15 +3239,15 @@
 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 +56,Probation,પ્રોબેશન
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Probation,પ્રોબેશન
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,પગાર ઘટકો
 DocType: Program Enrollment Tool,New Academic Year,નવા શૈક્ષણિક વર્ષ
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Payment of salary for the month {0} and year {1},મહિના માટે પગાર ચુકવણી {0} અને વર્ષ {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Payment of salary for the month {0} and year {1},મહિના માટે પગાર ચુકવણી {0} અને વર્ષ {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,ઓટો સામેલ ભાવ યાદી દર ગુમ તો
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,કુલ ભરપાઈ રકમ
 DocType: Production Order Item,Transferred Qty,પરિવહન Qty
 apps/erpnext/erpnext/config/learn.py +11,Navigating,શોધખોળ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Planning,આયોજન
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,આયોજન
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,જારી
 DocType: Project,Total Billing Amount (via Time Logs),કુલ બિલિંગ રકમ (સમય લોગ મારફતે)
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,We sell this Item,અમે આ આઇટમ વેચાણ
@@ -3215,11 +3260,10 @@
 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.,ઈમેઈલ મારફતે નિયમિત સારાંશ અહેવાલ મોકલો.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Sales invoice submitted sucessfully.,વેચાણ ભરતિયું સફળતાપૂર્વક સબમિટ કરી.
 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}
 DocType: Assessment Result,Student Name,વિદ્યાર્થી નામ
-apps/erpnext/erpnext/hooks.py +104,Assessment Schedule,આકારણી સૂચિ
+apps/erpnext/erpnext/hooks.py +113,Assessment Schedule,આકારણી સૂચિ
 DocType: Brand,Item Manager,વસ્તુ વ્યવસ્થાપક
 DocType: Buying Settings,Default Supplier Type,મૂળભૂત પુરવઠોકર્તા પ્રકાર
 DocType: Production Order,Total Operating Cost,કુલ સંચાલન ખર્ચ
@@ -3229,6 +3273,7 @@
 DocType: GL Entry,Party Type,પાર્ટી પ્રકાર
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +78,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 નથી"
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,પગાર નમૂનો માસ્ટર.
 DocType: Leave Type,Max Days Leave Allowed,મેક્સ દિવસો રજા આપવામાં
@@ -3240,18 +3285,19 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,દોરી જાય છે અથવા ગ્રાહકો માટે ખર્ચ.
 DocType: Stock Settings,Role Allowed to edit frozen stock,ભૂમિકા સ્થિર સ્ટોક ફેરફાર કરવા માટે પરવાનગી
 ,Territory Target Variance Item Group-Wise,પ્રદેશ લક્ષ્યાંક ફેરફાર વસ્તુ ગ્રુપ મુજબની
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Customer Groups,બધા ગ્રાહક જૂથો
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +78,Accumulated Monthly,સંચિત માસિક
-apps/erpnext/erpnext/controllers/accounts_controller.py +595,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} ફરજિયાત છે. કદાચ ચલણ એક્સચેન્જ રેકોર્ડ {1} {2} માટે બનાવેલ નથી.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,બધા ગ્રાહક જૂથો
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +81,Accumulated Monthly,સંચિત માસિક
+apps/erpnext/erpnext/controllers/accounts_controller.py +598,{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} અસ્તિત્વમાં નથી
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),ભાવ યાદી દર (કંપની ચલણ)
 DocType: Products Settings,Products Settings,પ્રોડક્ટ્સ સેટિંગ્સ
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +188,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} સેટઅપ&gt; સેટિંગ્સ મારફતે&gt; નામકરણ સિરીઝ માટે સિરીઝ નામકરણ સુયોજિત કરો
 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 +84,Secretary,સચિવ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,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,ખરીદી
@@ -3260,24 +3306,22 @@
 ,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,આકારણી નામ
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,ROW # {0}: સીરીયલ કોઈ ફરજિયાત છે
+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 +859,Supplier Quotation,પુરવઠોકર્તા અવતરણ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +838,Supplier Quotation,પુરવઠોકર્તા અવતરણ
 DocType: Quotation,In Words will be visible once you save the Quotation.,તમે આ અવતરણ સેવ વાર શબ્દો દૃશ્યમાન થશે.
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +7,Collect Fees,ફી એકઠી
+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}
 DocType: Lead,Add to calendar on this date,આ તારીખ પર કૅલેન્ડર ઉમેરો
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,શિપિંગ ખર્ચ ઉમેરવા માટે નિયમો.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,આવનારી પ્રવૃત્તિઓ
 DocType: Item,Opening Stock,ખુલવાનો સ્ટોક
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,ગ્રાહક જરૂરી છે
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} રીટર્ન ફરજિયાત છે
 DocType: Purchase Order,To Receive,પ્રાપ્ત
 apps/erpnext/erpnext/public/js/setup_wizard.js +195,user@example.com,user@example.com
-DocType: Email Digest,Income / Expense,આવક / ખર્ચ
 DocType: Employee,Personal Email,વ્યક્તિગત ઇમેઇલ
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,કુલ ફેરફાર
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","જો સક્રિય હોય તો, સિસ્ટમ આપોઆપ યાદી માટે એકાઉન્ટિંગ પ્રવેશો પોસ્ટ થશે."
@@ -3288,13 +3332,14 @@
 DocType: Customer,From Lead,લીડ પ્રતિ
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,ઓર્ડર્સ ઉત્પાદન માટે પ્રકાશિત થાય છે.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,ફિસ્કલ વર્ષ પસંદ કરો ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,POS Profile required to make POS Entry,POS પ્રોફાઇલ POS એન્ટ્રી બનાવવા માટે જરૂરી
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +509,POS Profile required to make POS Entry,POS પ્રોફાઇલ POS એન્ટ્રી બનાવવા માટે જરૂરી
 DocType: Program Enrollment Tool,Enroll Students,વિદ્યાર્થી નોંધણી
 DocType: Hub Settings,Name Token,નામ ટોકન
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,ધોરણ વેચાણ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Atleast one warehouse is mandatory,ઓછામાં ઓછા એક વખાર ફરજિયાત છે
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +129,Atleast one warehouse is mandatory,ઓછામાં ઓછા એક વખાર ફરજિયાત છે
 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 +330,{0} against Sales Invoice {1},{0} સેલ્સ ભરતિયું સામે {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,પ્રોજેક્ટ નામ
@@ -3315,10 +3360,11 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,પાંદડા 0.5 ના ગુણાંકમાં ફાળવવામાં હોવું જ જોઈએ
 DocType: Production Order,Operation Cost,ઓપરેશન ખર્ચ
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,એક CSV ફાઈલ માંથી હાજરી અપલોડ કરો
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,ઉત્કૃષ્ટ એએમટી
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,સેટ લક્ષ્યો વસ્તુ ગ્રુપ મુજબની આ વેચાણ વ્યક્તિ માટે.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],ફ્રીઝ સ્ટોક્સ કરતાં જૂની [ટ્રેડીંગ]
-apps/erpnext/erpnext/controllers/accounts_controller.py +528,Row #{0}: Asset is mandatory for fixed asset purchase/sale,રો # {0}: એસેટ સ્થિર એસેટ ખરીદી / વેચાણ માટે ફરજિયાત છે
+apps/erpnext/erpnext/controllers/accounts_controller.py +531,Row #{0}: Asset is mandatory for fixed asset purchase/sale,રો # {0}: એસેટ સ્થિર એસેટ ખરીદી / વેચાણ માટે ફરજિયાત છે
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","બે અથવા વધુ કિંમતના નિયમોમાં ઉપર શરતો પર આધારિત જોવા મળે છે, પ્રાધાન્યતા લાગુ પડે છે. મૂળભૂત કિંમત શૂન્ય (ખાલી) છે, જ્યારે પ્રાધાન્યતા 20 0 વચ્ચે એક નંબર છે. ઉચ્ચ નંબર સમાન શરતો સાથે બહુવિધ પ્રાઇસીંગ નિયમો હોય છે, જો તે અગ્રતા લે છે એનો અર્થ એ થાય."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,ફિસ્કલ વર્ષ: {0} નથી અસ્તિત્વમાં
 DocType: Currency Exchange,To Currency,ચલણ
@@ -3335,15 +3381,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,પ્રાઇવેટ ઇક્વિટી
 DocType: Maintenance Visit,Customer Feedback,ગ્રાહક પ્રતિસાદ
 DocType: Account,Expense,ખર્ચ
-DocType: Sales Invoice,Exhibition,પ્રદર્શન
 apps/erpnext/erpnext/utilities/doctype/address/address.py +77,"Company is mandatory, as it is your company address","કંપની, ફરજિયાત છે કારણ કે તે તમારી કંપની સરનામું"
 DocType: Item Attribute,From Range,શ્રેણી
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +81,Syntax error in formula or condition: {0},સૂત્ર અથવા શરત સિન્ટેક્ષ ભૂલ: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +92,Syntax error in formula or condition: {0},સૂત્ર અથવા શરત સિન્ટેક્ષ ભૂલ: {0}
 apps/erpnext/erpnext/stock/utils.py +99,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 +28,Jobs,નોકરીઓ
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,નોકરીઓ
 ,Sales Order Trends,વેચાણ ઓર્ડર પ્રવાહો
 DocType: Employee,Held On,આયોજન પર
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,ઉત્પાદન વસ્તુ
@@ -3352,16 +3398,16 @@
 DocType: Stock Entry Detail,Additional Cost,વધારાના ખર્ચ
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,નાણાકીય વર્ષ સમાપ્તિ તારીખ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","વાઉચર કોઈ પર આધારિત ફિલ્ટર કરી શકો છો, વાઉચર દ્વારા જૂથ તો"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +763,Make Supplier Quotation,પુરવઠોકર્તા અવતરણ બનાવો
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,Make Supplier Quotation,પુરવઠોકર્તા અવતરણ બનાવો
 DocType: Quality Inspection,Incoming,ઇનકમિંગ
 DocType: BOM,Materials Required (Exploded),મટિરીયલ્સ (વિસ્ફોટ) જરૂરી
 apps/erpnext/erpnext/public/js/setup_wizard.js +185,"Add users to your organization, other than yourself","જાતે કરતાં અન્ય, તમારી સંસ્થા માટે વપરાશકર્તાઓ ઉમેરો"
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,Row # {0}: Serial No {1} does not match with {2} {3},ROW # {0}: સીરીયલ કોઈ {1} સાથે મેળ ખાતું નથી {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +42,Casual Leave,પરચુરણ રજા
+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,પરચુરણ રજા
 DocType: Batch,Batch ID,બેચ ID ને
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,Note: {0},નોંધ: {0}
 ,Delivery Note Trends,ડ લવર નોંધ પ્રવાહો
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +103,This Week's Summary,આ અઠવાડિયાના સારાંશ
+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} માત્ર સ્ટોક વ્યવહારો દ્વારા સુધારી શકાય છે
 DocType: Student Group Creation Tool,Get Courses,અભ્યાસક્રમો મેળવો
 DocType: GL Entry,Party,પાર્ટી
@@ -3371,7 +3417,7 @@
 DocType: Request for Quotation Item,Request for Quotation Item,અવતરણ વસ્તુ માટે વિનંતી
 DocType: Purchase Order,To Bill,બિલ
 DocType: Material Request,% Ordered,% આદેશ આપ્યો
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Piecework,છૂટક કામ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Piecework,છૂટક કામ
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,સરેરાશ. ખરીદી દર
 DocType: Task,Actual Time (in Hours),(કલાકોમાં) વાસ્તવિક સમય
 DocType: Employee,History In Company,કંપની ઇતિહાસ
@@ -3388,7 +3434,7 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +350,{0} units of {1} needed in {2} to complete this transaction.,{0} એકમો {1} {2} આ વ્યવહાર પૂર્ણ કરવા માટે જરૂર છે.
 DocType: SMS Settings,SMS Settings,એસએમએસ સેટિંગ્સ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Temporary Accounts,કામચલાઉ ખાતાઓને
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Black,બ્લેક
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,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} બનતી વસ્તુઓ
@@ -3399,13 +3445,13 @@
 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 +69,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,માર્ક ગેરહાજર
 DocType: Journal Entry Account,Exchange Rate,વિનિમય દર
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Sales Order {0} is not submitted,વેચાણ ઓર્ડર {0} અપર્ણ ન કરાય
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +527,Sales Order {0} is not submitted,વેચાણ ઓર્ડર {0} અપર્ણ ન કરાય
 DocType: Homepage,Tag Line,ટેગ લાઇન
 DocType: Fee Component,Fee Component,ફી પુન
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +857,Add items from,વસ્તુઓ ઉમેરો
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +836,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: Cheque Print Template,Regular,નિયમિત
 DocType: BOM,Last Purchase Rate,છેલ્લા ખરીદી દર
@@ -3413,6 +3459,7 @@
 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} થી ચલો છે
 ,Sales Person-wise Transaction Summary,વેચાણ વ્યક્તિ મુજબના ટ્રાન્ઝેક્શન સારાંશ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +60,Cost Center is required for 'Profit and Loss' account {0}. Please set up a default Cost Center for the Company.,કિંમત કેન્દ્ર &#39;નફો અને નુકસાનનું&#39; એકાઉન્ટ {0} માટે જરૂરી છે. કૃપા કરીને કંપની માટે મૂળભૂત કિંમત કેન્દ્ર સુયોજિત કરો.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,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,માસિક વિતરણ ટકાવારી
@@ -3423,12 +3470,12 @@
 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 +710,Online,ઓનલાઇન
+apps/erpnext/erpnext/accounts/page/pos/pos.js +692,Online,ઓનલાઇન
 ,Available Stock for Packing Items,પેકિંગ આઇટમ્સ માટે ઉપલબ્ધ સ્ટોક
 DocType: Item Variant,Item Variant,વસ્તુ વેરિએન્ટ
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,અન્ય કોઈ મૂળભૂત છે કારણ કે ત્યાં મૂળભૂત તરીકે આ સરનામું ઢાંચો સુયોજિત કરી રહ્યા છે
+apps/erpnext/erpnext/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'","પહેલેથી જ ડેબિટ એકાઉન્ટ બેલેન્સ, તમે ક્રેડિટ &#39;તરીકે&#39; બેલેન્સ હોવું જોઈએ &#39;સુયોજિત કરવા માટે માન્ય નથી"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Quality Management,ક્વોલિટી મેનેજમેન્ટ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,ક્વોલિટી મેનેજમેન્ટ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,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,કર્મચારીનું બાહ્ય કામ ઇતિહાસ
@@ -3450,11 +3497,12 @@
 DocType: Student,Student Email ID,વિદ્યાર્થી ઇમેઇલ ને
 DocType: Employee,Notice (days),સૂચના (દિવસ)
 DocType: Tax Rule,Sales Tax Template,સેલ્સ ટેક્સ ઢાંચો
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1520,Select items to save the invoice,ભરતિયું સેવ આઇટમ્સ પસંદ કરો
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1544,Select items to save the invoice,ભરતિયું સેવ આઇટમ્સ પસંદ કરો
 DocType: Employee,Encashment Date,એન્કેશમેન્ટ તારીખ
 DocType: Account,Stock Adjustment,સ્ટોક એડજસ્ટમેન્ટ
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},મૂળભૂત પ્રવૃત્તિ કિંમત પ્રવૃત્તિ પ્રકાર માટે અસ્તિત્વમાં છે - {0}
 DocType: Production Order,Planned Operating Cost,આયોજિત ઓપરેટિંગ ખર્ચ
+DocType: Academic Term,Term Start Date,ટર્મ પ્રારંભ તારીખ
 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,અરજદારનું નામ
@@ -3484,17 +3532,17 @@
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,વેરહાઉસ (પર્પેચ્યુઅલ ઈન્વેન્ટરી) માટે એકાઉન્ટ આ એકાઉન્ટ હેઠળ બનાવવામાં આવશે.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +119,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,સ્ટોક ખાતાવહી પ્રવેશ આ વેરહાઉસ માટે અસ્તિત્વમાં તરીકે વેરહાઉસ કાઢી શકાતી નથી.
 DocType: Company,Distribution,વિતરણ
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +8,Amount Paid,રકમ ચૂકવવામાં
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Project Manager,પ્રોજેક્ટ મેનેજર
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,રકમ ચૂકવવામાં
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,પ્રોજેક્ટ મેનેજર
 ,Quoted Item Comparison,નોંધાયેલા વસ્તુ સરખામણી
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Dispatch,રવાનગી
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,રવાનગી
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,આઇટમ માટે મંજૂરી મેક્સ ડિસ્કાઉન્ટ: {0} {1}% છે
 apps/erpnext/erpnext/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.,સેટ ક્રેડિટ મર્યાદા કરતાં વધી કે વ્યવહારો સબમિટ કરવા માટે માન્ય છે તે ભૂમિકા.
-DocType: Sales Invoice,Supplier Reference,પુરવઠોકર્તા સંદર્ભ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +844,"Master data syncing, it might take some time","મુખ્ય માહિતી સમન્વય, તે થોડો સમય લાગી શકે છે"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +832,"Master data syncing, it might take some time","મુખ્ય માહિતી સમન્વય, તે થોડો સમય લાગી શકે છે"
 DocType: Item,Material Issue,મહત્વનો મુદ્દો
 DocType: Hub Settings,Seller Description,વિક્રેતા વર્ણન
 DocType: Employee Education,Qualification,લાયકાત
@@ -3508,7 +3556,7 @@
 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 +83,Error in formula or condition,સૂત્ર અથવા શરત ભૂલ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,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,અનચેક બધા
@@ -3517,7 +3565,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},"તારીખ કરવા માટે, નાણાકીય વર્ષ અંદર પ્રયત્ન કરીશું. = તારીખ ધારી રહ્યા છીએ {0}"
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","અહીં તમે વગેરે ઊંચાઇ, વજન, એલર્જી, તબીબી બાબતો જાળવી શકે છે"
 DocType: Leave Block List,Applies to Company,કંપની માટે લાગુ પડે છે
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +197,Cannot cancel because submitted Stock Entry {0} exists,સબમિટ સ્ટોક એન્ટ્રી {0} અસ્તિત્વમાં છે કારણ કે રદ કરી શકાતી નથી
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +198,Cannot cancel because submitted Stock Entry {0} exists,સબમિટ સ્ટોક એન્ટ્રી {0} અસ્તિત્વમાં છે કારણ કે રદ કરી શકાતી નથી
 DocType: Purchase Invoice,In Words,શબ્દો માં
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,Today is {0}'s birthday!,આજે {0} &#39;જન્મદિવસ છે!
 DocType: Production Planning Tool,Material Request For Warehouse,વેરહાઉસ માટે સામગ્રી અરજી
@@ -3527,14 +3575,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,તમારી નાણાકીય વર્ષ શરૂ થાય છે
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,એસેટ Depreciations અને બેલેન્સ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +319,Amount {0} {1} transferred from {2} to {3},રકમ {0} {1} માંથી તબદીલ {2} માટે {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +322,Amount {0} {1} transferred from {2} to {3},રકમ {0} {1} માંથી તબદીલ {2} માટે {3}
 DocType: Sales Invoice,Get Advances Received,એડવાન્સિસ પ્રાપ્ત કરો
 DocType: Email Digest,Add/Remove Recipients,મેળવનારા ઉમેરો / દૂર કરો
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +432,Transaction not allowed against stopped Production Order {0},ટ્રાન્ઝેક્શન બંધ કરી દીધું ઉત્પાદન સામે મંજૂરી નથી ક્રમમાં {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +437,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 +143,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 +652,Item variant {0} exists with same attributes,વસ્તુ ચલ {0} જ લક્ષણો સાથે હાજર
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,વસ્તુ ચલ {0} જ લક્ષણો સાથે હાજર
+DocType: Leave Application,LAP/,LAP /
 DocType: Salary Slip,Salary 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,&#39;તારીખ કરવા માટે&#39; જરૂરી છે
@@ -3542,12 +3591,12 @@
 DocType: Sales Invoice Item,Sales Order Item,વેચાણ ઓર્ડર વસ્તુ
 DocType: Salary Slip,Payment Days,ચુકવણી દિવસ
 DocType: Customer,Dormant,નિષ્ક્રિય
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +212,Warehouses with child nodes cannot be converted to ledger,બાળક ગાંઠો સાથે વખારો ખાતાવહી રૂપાંતરિત કરી શકાય છે
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +215,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/public/js/controllers/transaction.js +866,It is needed to fetch Item Details.,તે વસ્તુ વિગતો મેળવવા માટે જરૂરી છે.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +857,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} પહેલાથી જ પ્રાપ્ત કરવામાં આવ્યો છે
@@ -3557,14 +3606,14 @@
 DocType: Expense Claim,Total Claimed Amount,કુલ દાવો રકમ
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,વેચાણ માટે સંભવિત તકો.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,Invalid {0},અમાન્ય {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Sick Leave,માંદગી રજા
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,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,ડિપાર્ટમેન્ટ સ્ટોર્સ
 DocType: Warehouse,PIN,PIN
 DocType: Sales Invoice,Base Change Amount (Company Currency),આધાર બદલી રકમ (કંપની ચલણ)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +313,No accounting entries for the following warehouses,નીચેના વખારો માટે કોઈ હિસાબ પ્રવેશો
-apps/erpnext/erpnext/projects/doctype/project/project.js +102,Save the document first.,પ્રથમ દસ્તાવેજ સાચવો.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +314,No accounting entries for the following warehouses,નીચેના વખારો માટે કોઈ હિસાબ પ્રવેશો
+apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,પ્રથમ દસ્તાવેજ સાચવો.
 DocType: Account,Chargeable,લેવાપાત્ર
 DocType: Company,Change Abbreviation,બદલો સંક્ષેપનો
 DocType: Expense Claim Detail,Expense Date,ખર્ચ તારીખ
@@ -3577,10 +3626,9 @@
 DocType: Purchase Invoice,Recurring Print Format,રીકરીંગ પ્રિન્ટ ફોર્મેટ
 DocType: C-Form,Series,સિરીઝ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,Expected Delivery Date cannot be before Purchase Order Date,અપેક્ષિત બોલ તારીખ ખરીદી ઓર્ડર તારીખ પહેલાં ન હોઈ શકે
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} સેટઅપ&gt; સેટિંગ્સ મારફતે&gt; નામકરણ સિરીઝ માટે સિરીઝ નામકરણ સુયોજિત કરો
 DocType: Appraisal,Appraisal Template,મૂલ્યાંકન ઢાંચો
 DocType: Item Group,Item Classification,વસ્તુ વર્ગીકરણ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Business Development Manager,બિઝનેસ ડેવલપમેન્ટ મેનેજર
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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,સામાન્ય ખાતાવહી
@@ -3590,8 +3638,8 @@
 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 +940,Please select {0} first,પ્રથમ {0} પસંદ કરો
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +749,Batch {0} of Item {1} has expired.,વસ્તુ બેચ {0} {1} સમયસીમા સમાપ્ત થઈ ગઈ છે.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +953,Please select {0} first,પ્રથમ {0} પસંદ કરો
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +757,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,પેટાસરવાળો
@@ -3608,8 +3656,8 @@
 {% 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 +92,Warehouse not found in the system,વેરહાઉસ સિસ્ટમમાં મળ્યા નથી
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +106,This Month's Summary,આ મહિનો સારાંશ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,વેરહાઉસ સિસ્ટમમાં મળ્યા નથી
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,આ મહિનો સારાંશ
 DocType: Quality Inspection Reading,Quality Inspection Reading,ગુણવત્તા નિરીક્ષણ વાંચન
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`ફ્રીઝ સ્ટોક્સ જૂની Than`% d દિવસ કરતાં ઓછું હોવું જોઈએ.
 DocType: Tax Rule,Purchase Tax Template,ટેક્સ ઢાંચો ખરીદી
@@ -3619,21 +3667,22 @@
 DocType: Item Customer Detail,Ref Code,સંદર્ભ કોડ
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,કર્મચારીનું રેકોર્ડ.
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Please set Next Depreciation Date,સુયોજિત કરો આગળ અવમૂલ્યન તારીખ
-DocType: Payment Gateway,Payment Gateway,પેમેન્ટ ગેટવે
 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 +378,Operation Time must be greater than 0 for Operation {0},ઓપરેશન સમય ઓપરેશન કરતાં વધારે 0 હોવા જ જોઈએ {0}
+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/accounts/doctype/account/account.py +170,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)
 DocType: Program,Program Abbreviation,કાર્યક્રમ સંક્ષેપનો
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,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: Appraisal,Start Date,પ્રારંભ તારીખ
@@ -3649,21 +3698,22 @@
 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,ખર્ચ કે આઇટમ પર લાગુ નથી તો આઇટમ દૂર
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,ઉદા. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +27,Transaction currency must be same as Payment Gateway currency,ટ્રાન્ઝેક્શન ચલણ પેમેન્ટ ગેટવે ચલણ તરીકે જ હોવી જોઈએ
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Transaction currency must be same as Payment Gateway currency,ટ્રાન્ઝેક્શન ચલણ પેમેન્ટ ગેટવે ચલણ તરીકે જ હોવી જોઈએ
 DocType: Payment Entry,Receive,પ્રાપ્ત
+apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,સુવાકયો:
 DocType: Maintenance Visit,Fully Completed,સંપૂર્ણપણે પૂર્ણ
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% પૂર્ણ
 DocType: Employee,Educational Qualification,શૈક્ષણિક લાયકાત
 DocType: Workstation,Operating Costs,ઓપરેટિંગ ખર્ચ
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,ક્રિયા જો સંચિત માસિક બજેટ વટાવી
 DocType: Purchase Invoice,Submit on creation,સબમિટ બનાવટ પર
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +432,Currency for {0} must be {1},કરન્સી {0} હોવા જ જોઈએ {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +435,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 +493,Row {0}: An Reorder entry already exists for this warehouse {1},રો {0}: એક પુનઃક્રમાંકિત કરો પ્રવેશ પહેલેથી જ આ વેરહાઉસ માટે અસ્તિત્વમાં {1}
+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/crm/doctype/opportunity/opportunity.py +79,"Cannot declare as lost, because Quotation has been made.","અવતરણ કરવામાં આવી છે, કારણ કે લોસ્ટ જાહેર કરી શકતા નથી."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,ખરીદી માસ્ટર વ્યવસ્થાપક
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +429,Production Order {0} must be submitted,ઓર્ડર {0} સબમિટ હોવું જ જોઈએ ઉત્પાદન
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +434,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,તારીખ કરવા માટે તારીખથી પહેલાં ન હોઈ શકે
@@ -3673,25 +3723,27 @@
 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 +181,Totals,કૂલ
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,કૂલ
 DocType: BOM,Manufacturing,ઉત્પાદન
 ,Ordered Items To Be Delivered,આદેશ આપ્યો વસ્તુઓ પહોંચાડી શકાય
 DocType: Account,Income,આવક
 DocType: Industry Type,Industry Type,ઉદ્યોગ પ્રકાર
 apps/erpnext/erpnext/templates/includes/cart.js +141,Something went wrong!,કંઈક ખોટું થયું!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,Warning: Leave application contains following block dates,ચેતવણી: છોડો અરજીને પગલે બ્લોક તારીખો સમાવે
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +120,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} આ સોદો પૂર્ણ કરવા માટે એકમો.
+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 +181,Organization unit (department) master.,સંસ્થા યુનિટ (વિભાગ) માસ્ટર.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,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 +793,All records are synced.,બધા રેકોર્ડ સમન્વિત થાય છે.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +781,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,અસુરક્ષીત લોન્સ
 DocType: Cost Center,Cost Center Name,ખર્ચ કેન્દ્રને નામ
@@ -3710,21 +3762,20 @@
 DocType: Address,Name of person or organization that this address belongs to.,આ સરનામા માટે અનુસરે છે કે વ્યક્તિ કે સંસ્થા નામ.
 apps/erpnext/erpnext/public/js/setup_wizard.js +260,Your Suppliers,તમારા સપ્લાયર્સ
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +49,Cannot set as Lost as Sales Order is made.,વેચાણ ઓર્ડર કરવામાં આવે છે ગુમાવી સેટ કરી શકાતો નથી.
-DocType: Student Applicant,Mother's Name,માતાનું નામ
 DocType: Request for Quotation Item,Supplier Part No,પુરવઠોકર્તા ભાગ કોઈ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +348,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 +326,Received From,પ્રતિ પ્રાપ્ત
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Received From,પ્રતિ પ્રાપ્ત
 DocType: Lead,Converted,રૂપાંતરિત
 DocType: Item,Has Serial No,સીરીયલ કોઈ છે
 DocType: Employee,Date of Issue,ઇશ્યૂ તારીખ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: પ્રતિ {0} માટે {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +153,Row #{0}: Set Supplier for item {1},ROW # {0}: આઇટમ માટે સેટ પુરવઠોકર્તા {1}
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +93,Row {0}: Hours value must be greater than zero.,રો {0}: કલાક કિંમત શૂન્ય કરતાં મોટી હોવી જ જોઈએ.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +117,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} શોધી શકાતી નથી
 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 +172,{0} {1} does not exist,{0} {1} અસ્તિત્વમાં નથી
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +175,{0} {1} does not exist,{0} {1} અસ્તિત્વમાં નથી
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,Please check Multi Currency option to allow accounts with other currency,અન્ય ચલણ સાથે એકાઉન્ટ્સ માટે પરવાનગી આપે છે મલ્ટી કરન્સી વિકલ્પ તપાસો
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +72,Item: {0} does not exist in the system,વસ્તુ: {0} સિસ્ટમ અસ્તિત્વમાં નથી
 apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,તમે ફ્રોઝન કિંમત સુયોજિત કરવા માટે અધિકૃત નથી
@@ -3733,13 +3784,14 @@
 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/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/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 +109,Electrical,ઇલેક્ટ્રિકલ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Electrical,ઇલેક્ટ્રિકલ
 DocType: Stock Entry,Total Value Difference (Out - In),કુલ મૂલ્ય તફાવત (બહાર - માં)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,Row {0}: Exchange Rate is mandatory,રો {0}: વિનિમય દર ફરજિયાત છે
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},વપરાશકર્તા ID કર્મચારી માટે સેટ નથી {0}
@@ -3747,7 +3799,7 @@
 DocType: Item,Customer Code,ગ્રાહક કોડ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +210,Birthday Reminder for {0},માટે જન્મદિવસ રીમાઇન્ડર {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,છેલ્લે ઓર્ડર સુધીનાં દિવસો
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +292,Debit To account must be a Balance Sheet account,એકાઉન્ટ ડેબિટ એક બેલેન્સ શીટ એકાઉન્ટ હોવું જ જોઈએ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To account must be a Balance Sheet account,એકાઉન્ટ ડેબિટ એક બેલેન્સ શીટ એકાઉન્ટ હોવું જ જોઈએ
 DocType: Buying Settings,Naming Series,નામકરણ સિરીઝ
 DocType: Leave Block List,Leave Block List Name,બ્લોક યાદી મૂકો નામ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,સ્ટોક અસ્કયામતો
@@ -3759,11 +3811,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 +301,Salary Slip of employee {0} already created for time sheet {1},કર્મચારી પગાર કાપલી {0} પહેલાથી જ સમય શીટ માટે બનાવવામાં {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +313,Salary Slip of employee {0} already created for time sheet {1},કર્મચારી પગાર કાપલી {0} પહેલાથી જ સમય શીટ માટે બનાવવામાં {1}
 DocType: Sales Order Item,Ordered Qty,આદેશ આપ્યો Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +673,Item {0} is disabled,વસ્તુ {0} અક્ષમ છે
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} is disabled,વસ્તુ {0} અક્ષમ છે
 DocType: Stock Settings,Stock Frozen Upto,સ્ટોક ફ્રોઝન સુધી
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +838,BOM does not contain any stock item,BOM કોઈપણ સ્ટોક વસ્તુ સમાવી નથી
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +809,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,પગાર સ્લિપ બનાવો
@@ -3771,23 +3823,24 @@
 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 +485,Row #{0}: Please set reorder quantity,ROW # {0}: પુનઃક્રમાંકિત કરો જથ્થો સુયોજિત કરો
+DocType: Sales Invoice Timesheet,Billing Hours,બિલિંગ કલાક
+apps/erpnext/erpnext/stock/doctype/item/item.py +487,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 +62,Please set {0},સેટ કરો {0}
 DocType: Purchase Invoice,Repeat on Day of Month,મહિનાનો દિવસ પર પુનરાવર્તન
 DocType: Employee,Health Details,આરોગ્ય વિગતો
 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,ઉપર પસંદ માપદંડ માટે બધા પગાર સ્લિપ સબમિટ
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} વસ્તુઓ સમન્વયિત
 DocType: Sales Order,Partly Delivered,આંશિક વિતરિત
-DocType: Sales Invoice,Existing Customer,હાલની ગ્રાહક
 DocType: Email Digest,Receivables,Receivables
+DocType: Lead Source,Lead Source,લીડ સોર્સ
 DocType: Customer,Additional information regarding the customer.,ગ્રાહક સંબંધિત વધારાની માહિતી.
 DocType: Quality Inspection Reading,Reading 5,5 વાંચન
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +38,Campaign Name is required,ઝુંબેશ નામ જરૂરી છે
 DocType: Maintenance Visit,Maintenance Date,જાળવણી તારીખ
 DocType: Purchase Invoice Item,Rejected Serial No,નકારેલું સીરીયલ કોઈ
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +80,Year start date or end date is overlapping with {0}. To avoid please set company,વર્ષ શરૂ તારીખ અથવા અંતિમ તારીખ {0} સાથે ઓવરલેપિંગ છે. ટાળવા માટે કંપની સુયોજિત કરો
@@ -3795,10 +3848,9 @@
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","ઉદાહરણ:. શ્રેણી સુયોજિત છે અને સીરીયલ કોઈ વ્યવહારો માં ઉલ્લેખ નથી તો ABCD #####, તો પછી આપોઆપ સીરીયલ નંબર આ શ્રેણી પર આધારિત બનાવવામાં આવશે. તમે હંમેશા નિશ્ચિતપણે આ આઇટમ માટે સીરીયલ અમે ઉલ્લેખ કરવા માંગો છો. આ ખાલી છોડી દો."
 DocType: Upload Attendance,Upload Attendance,અપલોડ કરો એટેન્ડન્સ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +129,BOM and Manufacturing Quantity are required,BOM અને ઉત્પાદન જથ્થો જરૂરી છે
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,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,મેક્સ શક્તિ
-DocType: Bank Reconciliation Detail,Amount,રકમ
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM બદલાઈ
 ,Sales Analytics,વેચાણ ઍનલિટિક્સ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +113,Available {0},ઉપલબ્ધ {0}
@@ -3806,14 +3858,14 @@
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,ઇમેઇલ સુયોજિત કરી રહ્યા છે
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +96,Please enter default currency in Company Master,કંપની માસ્ટર મૂળભૂત ચલણ દાખલ કરો
 DocType: Stock Entry Detail,Stock Entry Detail,સ્ટોક એન્ટ્રી વિગતવાર
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +100,Daily Reminders,દૈનિક રીમાઇન્ડર્સ
+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/account/account_tree.js +23,New Account Name,નવા એકાઉન્ટ નામ
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,કાચો માલ પાડેલ કિંમત
 DocType: Selling Settings,Settings for Selling Module,મોડ્યુલ વેચાણ માટે સેટિંગ્સ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Customer Service,ગ્રાહક સેવા
+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/config/hr.py +50,Offer candidate a Job.,ઓફર ઉમેદવાર જોબ.
@@ -3822,8 +3874,9 @@
 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} સ્ટોક વસ્તુ જ હોવી જોઈએ
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,પ્રગતિ વેરહાઉસ માં મૂળભૂત કામ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1570,Total nos of serial no is not equal to quantity.,સીરીયલ કોઈ કુલ સંખ્યા જથ્થો બરાબર નથી.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1594,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,સુધારા સિરીઝ સંખ્યા
@@ -3831,9 +3884,10 @@
 DocType: Sales Order,Printing Details,પ્રિન્ટિંગ વિગતો
 DocType: Task,Closing Date,છેલ્લી તારીખ
 DocType: Sales Order Item,Produced Quantity,ઉત્પાદન જથ્થો
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Engineer,ઇજનેર
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Engineer,ઇજનેર
+DocType: Journal Entry,Total Amount Currency,કુલ રકમ કરન્સી
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,શોધ પેટા એસેમ્બલીઝ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Item Code required at Row No {0},વસ્તુ કોડ રો કોઈ જરૂરી {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +398,Item Code required at Row No {0},વસ્તુ કોડ રો કોઈ જરૂરી {0}
 DocType: Sales Partner,Partner Type,જીવનસાથી પ્રકાર
 DocType: Purchase Taxes and Charges,Actual,વાસ્તવિક
 DocType: Authorization Rule,Customerwise Discount,Customerwise ડિસ્કાઉન્ટ
@@ -3849,16 +3903,18 @@
 DocType: BOM,Raw Material Cost,કાચો સામગ્રી ખર્ચ
 DocType: Item Reorder,Re-Order Level,ફરીથી ઓર્ડર સ્તર
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,તમે ઉત્પાદન ઓર્ડર વધારવા અથવા વિશ્લેષણ માટે કાચી સામગ્રી ડાઉનલોડ કરવા માંગો છો કે જેના માટે વસ્તુઓ અને આયોજન Qty દાખલ કરો.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +55,Part-time,ભાગ સમય
+apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,ગેન્ટ ચાર્ટ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,ભાગ સમય
 DocType: Employee,Applicable Holiday List,લાગુ રજા યાદી
 DocType: Employee,Cheque,ચેક
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,સિરીઝ સુધારાશે
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +57,Series Updated,સિરીઝ સુધારાશે
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,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 +87,Clearance Date updated,ક્લિયરન્સ તારીખ સુધારાશે
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,સફળતાપૂર્વક અનુરૂપ
@@ -3872,7 +3928,7 @@
 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 +513,Posting date and posting time is mandatory,તારીખ પોસ્ટ અને સમય પોસ્ટ ફરજિયાત છે
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,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.,તમે ખરીદી માટે સેવ વાર શબ્દો દૃશ્યમાન થશે.
@@ -3882,7 +3938,7 @@
 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/stock/doctype/stock_entry/stock_entry.py +158,Target warehouse in row {0} must be same as Production Order,{0} પંક્તિ માં લક્ષ્યાંક વેરહાઉસ ઉત્પાદન ઓર્ડર તરીકે જ હોવી જોઈએ
+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,કરન્સી કેટલાક અન્ય ચલણ ઉપયોગ પ્રવેશો કર્યા પછી બદલી શકાતું નથી
 DocType: Company,Round Off Account,એકાઉન્ટ બંધ રાઉન્ડ
@@ -3891,23 +3947,22 @@
 DocType: Customer Group,Parent Customer Group,પિતૃ ગ્રાહક જૂથ
 DocType: Purchase Invoice,Contact Email,સંપર્ક ઇમેઇલ
 DocType: Appraisal Goal,Score Earned,કુલ સ્કોર કમાવેલી
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Notice Period,સૂચના સમયગાળા
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,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 +4,New Sales Person Name,ન્યૂ વેચાણ વ્યક્તિ નામ
 DocType: Packing Slip,Gross Weight UOM,એકંદર વજન UOM
-DocType: Email Digest,Receivables / Payables,Receivables / ચૂકવણીના
 DocType: Delivery Note Item,Against Sales Invoice,સેલ્સ ભરતિયું સામે
 DocType: Bin,Reserved Qty for Production,ઉત્પાદન માટે Qty અનામત
 DocType: Asset,Frequency of Depreciation (Months),અવમૂલ્યન આવર્તન (મહિના)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +469,Credit Account,ક્રેડિટ એકાઉન્ટ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Credit Account,ક્રેડિટ એકાઉન્ટ
 DocType: Landed Cost Item,Landed Cost Item,ઉતારેલ માલની કિંમત વસ્તુ
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +55,Show zero values,શૂન્ય કિંમતો બતાવો
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,શૂન્ય કિંમતો બતાવો
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,આઇટમ જથ્થો કાચા માલના આપવામાં જથ્થામાં થી repacking / ઉત્પાદન પછી પ્રાપ્ત
 apps/erpnext/erpnext/public/js/setup_wizard.js +315,Setup a simple website for my organization,સેટઅપ મારા સંસ્થા માટે એક સરળ વેબસાઇટ
 DocType: Payment Reconciliation,Receivable / Payable Account,પ્રાપ્ત / ચૂકવવાપાત્ર એકાઉન્ટ
 DocType: Delivery Note Item,Against Sales Order Item,વેચાણ ઓર્ડર વસ્તુ સામે
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Please specify Attribute Value for attribute {0},લક્ષણ માટે લક્ષણની કિંમત સ્પષ્ટ કરો {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},લક્ષણ માટે લક્ષણની કિંમત સ્પષ્ટ કરો {0}
 DocType: Item,Default Warehouse,મૂળભૂત વેરહાઉસ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +39,Budget cannot be assigned against Group Account {0},બજેટ ગ્રુપ એકાઉન્ટ સામે અસાઇન કરી શકાતી નથી {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,પિતૃ ખર્ચ કેન્દ્રને દાખલ કરો
@@ -3929,19 +3984,22 @@
 DocType: Journal Entry,Total Debit,કુલ ડેબિટ
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,મૂળભૂત ફિનિશ્ડ ગૂડ્સ વેરહાઉસ
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,વેચાણ વ્યક્તિ
-DocType: Sales Invoice,Cold Calling,શીત કોલિંગ
 DocType: SMS Parameter,SMS Parameter,એસએમએસ પરિમાણ
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,બજેટ અને ખર્ચ કેન્દ્ર
 DocType: Maintenance Schedule Item,Half Yearly,અર્ધ વાર્ષિક
 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 +253,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 +141,Set as Lost,લોસ્ટ તરીકે સેટ કરો
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,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 +5,This is based on transactions against this Customer. See timeline below for details,આ ગ્રાહક સામે વ્યવહારો પર આધારિત છે. વિગતો માટે નીચે જુઓ ટાઇમલાઇન
 DocType: Supplier,Credit Days Based On,ક્રેડિટ ટ્રેડીંગ પર આધારિત છે
@@ -3953,11 +4011,10 @@
 ,Items To Be Requested,વસ્તુઓ વિનંતી કરવામાં
 DocType: Purchase Order,Get Last Purchase Rate,છેલ્લા ખરીદી દર વિચાર
 DocType: Company,Company Info,કંપની માહિતી
-apps/erpnext/erpnext/accounts/page/pos/pos.js +941,Select or add new customer,પસંદ કરો અથવા નવા ગ્રાહક ઉમેરો
+apps/erpnext/erpnext/accounts/page/pos/pos.js +930,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 +5,This is based on the attendance of this Employee,આ કર્મચારીનું હાજરી પર આધારિત છે
-DocType: Sales Invoice,Frequency,આવર્તન
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +463,Debit Account,ઉધાર ખાતું
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Debit Account,ઉધાર ખાતું
 DocType: Fiscal Year,Year Start Date,વર્ષે શરૂ તારીખ
 DocType: Attendance,Employee Name,કર્મચારીનું નામ
 DocType: Sales Invoice,Rounded Total (Company Currency),ગોળાકાર કુલ (કંપની ચલણ)
@@ -3966,27 +4023,27 @@
 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 +210,Supplier Quotation {0} created,પુરવઠોકર્તા અવતરણ {0} બનાવવામાં
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +208,Supplier Quotation {0} created,પુરવઠોકર્તા અવતરણ {0} બનાવવામાં
 apps/erpnext/erpnext/accounts/report/financial_statements.py +90,End Year cannot be before Start Year,અંતે વર્ષ શરૂ વર્ષ પહેલાં ન હોઈ શકે
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Employee Benefits,એમ્પ્લોયી બેનિફિટ્સ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,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 +228,Please set a default Holiday List for Employee {0} or Company {1},મૂળભૂત કર્મચારી માટે રજા યાદી સુયોજિત કરો {0} અથવા કંપની {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +232,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 +499,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},રો કોઈ {0}: રકમ ખર્ચ દાવો {1} સામે રકમ બાકી કરતાં વધારે ન હોઈ શકે. બાકી રકમ છે {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +500,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},રો કોઈ {0}: રકમ ખર્ચ દાવો {1} સામે રકમ બાકી કરતાં વધારે ન હોઈ શકે. બાકી રકમ છે {2}
 DocType: Maintenance Schedule,Schedule,સૂચિ
 DocType: Account,Parent Account,પિતૃ એકાઉન્ટ
 DocType: Quality Inspection Reading,Reading 3,3 વાંચન
 ,Hub,હબ
 DocType: GL Entry,Voucher Type,વાઉચર પ્રકાર
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1007,Price List not found or disabled,ભાવ યાદી મળી અથવા અક્ષમ નથી
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1008,Price List not found or disabled,ભાવ યાદી મળી અથવા અક્ષમ નથી
 DocType: Expense Claim,Approved,મંજૂર
 DocType: Pricing Rule,Price,ભાવ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +244,Employee relieved on {0} must be set as 'Left',{0} સુયોજિત થયેલ હોવું જ જોઈએ પર રાહત કર્મચારી &#39;ડાબી&#39; તરીકે
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +256,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} આપેલ તારીખ શ્રેણી માં કર્મચારી માટે બનાવવામાં
@@ -3997,12 +4054,12 @@
 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 +259,Please select Employee Record first.,પ્રથમ કર્મચારી રેકોર્ડ પસંદ કરો.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +266,Please select Employee Record first.,પ્રથમ કર્મચારી રેકોર્ડ પસંદ કરો.
 DocType: POS Profile,Account for Change Amount,જથ્થો બદલી માટે એકાઉન્ટ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +190,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},રો {0}: પાર્ટી / એકાઉન્ટ સાથે મેળ ખાતું નથી {1} / {2} માં {3} {4}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +235,Please enter Expense Account,ખર્ચ એકાઉન્ટ દાખલ કરો
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,Please enter Expense Account,ખર્ચ એકાઉન્ટ દાખલ કરો
 DocType: Account,Stock,સ્ટોક
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,"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 +976,"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,ખરીદી / ઉત્પાદન વિગતો
@@ -4017,9 +4074,10 @@
 DocType: Asset Movement,Transaction Date,ટ્રાન્ઝેક્શન તારીખ
 DocType: Production Plan Item,Planned Qty,આયોજિત Qty
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,કુલ કર
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,For Quantity (Manufactured Qty) is mandatory,જથ્થો માટે (Qty ઉત્પાદિત થતા) ફરજિયાત છે
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,For Quantity (Manufactured Qty) is mandatory,જથ્થો માટે (Qty ઉત્પાદિત થતા) ફરજિયાત છે
 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 +78,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,વાસ્તવિક પ્રારંભ તારીખ
@@ -4034,9 +4092,11 @@
 DocType: Warranty Claim,If different than customer address,ગ્રાહક સરનામું કરતાં અલગ તો
 DocType: BOM Operation,BOM Operation,BOM ઓપરેશન
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Next અગાઉના આગળ રો રકમ પર
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +226,Transfer Asset,ટ્રાન્સફર એસેટ
+DocType: Student,Home Address,ઘરનું સરનામું
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +227,Transfer Asset,ટ્રાન્સફર એસેટ
 DocType: POS Profile,POS Profile,POS પ્રોફાઇલ
 apps/erpnext/erpnext/config/schools.py +33,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 +129,"Item {0} is a template, please select one of its variants","{0} વસ્તુ એક નમૂનો છે, તેના ચલો એક પસંદ કરો"
 DocType: Asset,Asset Category,એસેટ વર્ગ
@@ -4046,8 +4106,8 @@
 DocType: Assessment,Room,રૂમ
 DocType: Purchase Order,Advance Paid,આગોતરી ચુકવણી
 DocType: Item,Item Tax,વસ્તુ ટેક્સ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +765,Material to Supplier,સપ્લાયર સામગ્રી
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +189,Excise Invoice,એક્સાઇઝ ભરતિયું
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,Material to Supplier,સપ્લાયર સામગ્રી
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,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,વર્તમાન જવાબદારીઓ
@@ -4057,7 +4117,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,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 +136,Credit Card,ક્રેડીટ કાર્ડ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,ક્રેડીટ કાર્ડ
 DocType: BOM,Item to be manufactured or repacked,વસ્તુ ઉત્પાદન અથવા repacked શકાય
 apps/erpnext/erpnext/config/stock.py +174,Default settings for stock transactions.,સ્ટોક વ્યવહારો માટે મૂળભૂત સુયોજનો.
 DocType: Purchase Invoice,Next Date,આગામી તારીખ
@@ -4065,6 +4125,7 @@
 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: Academic Term,Term End Date,ટર્મ સમાપ્તિ તારીખ
 DocType: Hub Settings,Seller Name,વિક્રેતા નામ
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),કર અને ખર્ચ બાદ (કંપની ચલણ)
 DocType: Item Group,General Settings,સામાન્ય સુયોજનો
@@ -4076,7 +4137,7 @@
 DocType: Customer,Commission Rate,કમિશન દર
 apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,વેરિએન્ટ બનાવો
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,વિભાગ દ્વારા બ્લોક છોડી કાર્યક્રમો.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +115,"Payment Type must be one of Receive, Pay and Internal Transfer","ચુકવણી પ્રકાર, પ્રાપ્ત એક હોવું જોઈએ પે અને આંતરિક ટ્રાન્સફર"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +118,"Payment Type must be one of Receive, Pay and Internal Transfer","ચુકવણી પ્રકાર, પ્રાપ્ત એક હોવું જોઈએ પે અને આંતરિક ટ્રાન્સફર"
 apps/erpnext/erpnext/config/selling.py +169,Analytics,ઍનલિટિક્સ
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,કાર્ટ ખાલી છે
 DocType: Production Order,Actual Operating Cost,વાસ્તવિક ઓપરેટિંગ ખર્ચ
@@ -4091,10 +4152,10 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,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 +92,Designer,ડીઝાઈનર
+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/accounts/doctype/purchase_invoice/purchase_invoice.py +469,Cost Center is required in row {0} in Taxes table for type {1},પ્રકાર માટે ખર્ચ કેન્દ્રને પંક્તિ જરૂરી છે {0} કર ટેબલ {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +472,Cost Center is required in row {0} in Taxes table for type {1},પ્રકાર માટે ખર્ચ કેન્દ્રને પંક્તિ જરૂરી છે {0} કર ટેબલ {1}
 DocType: Program,Program Code,કાર્યક્રમ કોડ
 ,Item-wise Purchase Register,વસ્તુ મુજબના ખરીદી રજીસ્ટર
 DocType: Batch,Expiry Date,અંતિમ તારીખ
@@ -4104,12 +4165,12 @@
 apps/erpnext/erpnext/config/projects.py +13,Project master.,પ્રોજેક્ટ માસ્ટર.
 apps/erpnext/erpnext/controllers/status_updater.py +174,"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 +417, (Half Day),(અડધા દિવસ)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425, (Half Day),(અડધા દિવસ)
 DocType: Supplier,Credit Days,ક્રેડિટ દિવસો
 DocType: Leave Type,Is Carry Forward,આગળ લઈ છે
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +740,Get Items from BOM,BOM થી વસ્તુઓ વિચાર
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +711,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 +549,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},રો # {0}: પોસ્ટ તારીખ ખરીદી તારીખ તરીકે જ હોવી જોઈએ {1} એસેટ {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +552,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,બીજા એક વખાર માંથી એસેટ ટ્રાન્સફર
diff --git a/erpnext/translations/he.csv b/erpnext/translations/he.csv
index 724de33..15c6fe1 100644
--- a/erpnext/translations/he.csv
+++ b/erpnext/translations/he.csv
@@ -19,8 +19,8 @@
 DocType: Employee,Rented,הושכר
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,ישים עבור משתמש
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +191,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","הזמנת ייצור הפסיק אינה ניתנת לביטול, מגופתו הראשונה לביטול"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +197,Do you really want to scrap this asset?,האם אתה באמת רוצה לבטל הנכס הזה?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +192,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","הזמנת ייצור הפסיק אינה ניתנת לביטול, מגופתו הראשונה לביטול"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +198,Do you really want to scrap this asset?,האם אתה באמת רוצה לבטל הנכס הזה?
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},מטבע נדרש למחיר המחירון {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* יחושב בעסקה.
 DocType: Address,County,מָחוֹז
@@ -40,28 +40,27 @@
 DocType: Sales Invoice,Customer Name,שם לקוח
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +126,Bank account cannot be named as {0},חשבון בנק לא יכול להיות שם בתור {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,ראשים (או קבוצות) נגד שרישומים חשבונאיים נעשים ומתוחזקים יתרות.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +180,Outstanding for {0} cannot be less than zero ({1}),יוצא מן הכלל עבור {0} אינם יכולים להיות פחות מאפס ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,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 +148,Series Updated Successfully,סדרת עדכון בהצלחה
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +149,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,כל לתקשר עם הספק
-DocType: Quality Inspection Reading,Parameter,פרמטר
 apps/erpnext/erpnext/projects/doctype/project/project.py +54,Expected End Date can not be less than Expected Start Date,תאריך הסיום צפוי לא יכול להיות פחות מתאריך ההתחלה צפויה
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,# השורה {0}: שיעור חייב להיות זהה {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +239,New Leave Application,החדש Leave Application
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,New Leave Application,החדש Leave Application
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +20,Attendance Record {0} exists against Student {1} for Course Schedule {2},נוכחות שיא {0} קיים נגד סטודנטים {1} עבור לוח זמנים מסלול {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Bank Draft,המחאה בנקאית
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,המחאה בנקאית
 DocType: Mode of Payment Account,Mode of Payment Account,מצב של חשבון תשלומים
 apps/erpnext/erpnext/stock/doctype/item/item.js +52,Show Variants,גרסאות הצג
 DocType: Academic Term,Academic Term,מונח אקדמי
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +13,Material,חוֹמֶר
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Quantity,כמות
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +511,Accounts table cannot be blank.,טבלת החשבונות לא יכולה להיות ריקה.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +616,Quantity,כמות
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +512,Accounts table cannot be blank.,טבלת החשבונות לא יכולה להיות ריקה.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,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"
@@ -70,16 +69,15 @@
 DocType: Production Plan Item,Production Plan Item,פריט תכנית ייצור
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +142,User {0} is already assigned to Employee {1},משתמש {0} כבר הוקצה לעובדי {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,בריאות
-DocType: Purchase Invoice,Monthly,חודשי
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),עיכוב בתשלום (ימים)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +771,Invoice,חשבונית
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +750,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 +198,Row {0}: {1} {2} does not match with {3},שורת {0}: {1} {2} אינה תואמת עם {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,# השורה {0}:
+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 +127,Please select Price List,אנא בחר מחירון
 DocType: Production Order Operation,Work In Progress,עבודה בתהליך
@@ -108,8 +106,8 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,אותו החברה נכנסה יותר מפעם אחת
 DocType: Employee,Married,נשוי
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},חל איסור על {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +589,Get items from,קבל פריטים מ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +382,Stock cannot be updated against Delivery Note {0},המניה לא ניתן לעדכן נגד תעודת משלוח {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,קבל פריטים מ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Stock cannot be updated against Delivery Note {0},המניה לא ניתן לעדכן נגד תעודת משלוח {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},מוצרים {0}
 DocType: Payment Reconciliation,Reconcile,ליישב
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,מכולת
@@ -118,7 +116,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 +156,Salary Structure Missing,חסר מבנה השכר
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Salary Structure Missing,חסר מבנה השכר
 DocType: Lead,Person Name,שם אדם
 DocType: Sales Invoice Item,Sales Invoice Item,פריט חשבונית מכירות
 DocType: Account,Credit,אשראי
@@ -126,10 +124,10 @@
 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 +156,Credit limit has been crossed for customer {0} {1}/{2},מסגרת אשראי נחצתה ללקוחות {0} {1} / {2}
-apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;האם רכוש קבוע&quot; לא יכול להיות מסומן, כמו שיא נכסים קיים כנגד הפריט"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +189,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; לא יכול להיות מסומן, כמו שיא נכסים קיים כנגד הפריט"
 DocType: Tax Rule,Tax Type,סוג המס
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +144,You are not authorized to add or update entries before {0},אין לך ההרשאה להוסיף או עדכון ערכים לפני {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},אין לך ההרשאה להוסיף או עדכון ערכים לפני {0}
 DocType: Item,Item Image (if not slideshow),תמונת פריט (אם לא מצגת)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,לקוחות קיימים עם אותו שם
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(שעת דרג / 60) * בפועל מבצע זמן
@@ -138,7 +136,7 @@
 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 +165,Opening,פתיחה
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,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,כניסת פתיחה
@@ -148,7 +146,7 @@
 DocType: Lead,Product Enquiry,חקירה מוצר
 DocType: Academic Term,Schools,בתי ספר
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,אנא ראשון להיכנס החברה
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Company first,אנא בחר החברה ראשונה
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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,עלות כוללת
@@ -158,7 +156,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,הצהרה של חשבון
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,תרופות
 DocType: Purchase Invoice Item,Is Fixed Asset,האם קבוע נכסים
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Available qty is {0}, you need {1}","כמות זמינה הוא {0}, אתה צריך {1}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +225,"Available qty is {0}, you need {1}","כמות זמינה הוא {0}, אתה צריך {1}"
 DocType: Expense Claim Detail,Claim Amount,סכום תביעה
 DocType: Employee,Mr,מר
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,סוג ספק / ספק
@@ -169,7 +167,7 @@
 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 +171,Annual Salary,משכורת שנתית
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,הוצאות המניה
@@ -182,9 +180,9 @@
 DocType: Products Settings,Show Products as a List,הצג מוצרים כרשימה
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","הורד את התבנית, למלא נתונים מתאימים ולצרף את הקובץ הנוכחי. כל שילוב התאריכים ועובדים בתקופה שנבחרה יבוא בתבנית, עם רישומי נוכחות קיימים"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +451,Item {0} is not active or end of life has been reached,פריט {0} אינו פעיל או שהגיע הסוף של חיים
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +456,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/controllers/accounts_controller.py +614,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","כדי לכלול מס בשורת {0} בשיעור פריט, מסים בשורות {1} חייבים להיות כלולים גם"
+apps/erpnext/erpnext/controllers/accounts_controller.py +617,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","כדי לכלול מס בשורת {0} בשיעור פריט, מסים בשורות {1} חייבים להיות כלולים גם"
 apps/erpnext/erpnext/config/hr.py +166,Settings for HR Module,הגדרות עבור מודול HR
 DocType: SMS Center,SMS Center,SMS מרכז
 DocType: Sales Invoice,Change Amount,שנת הסכום
@@ -196,13 +194,13 @@
 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 +147,Execution,ביצוע
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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,פריטים ותמחור
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},סה&quot;כ שעות: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},מתאריך צריך להיות בתוך שנת הכספים. בהנחת מתאריך = {0}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,Cost Center {0} does not belong to Company {1},עלות המרכז {0} אינו שייך לחברת {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +100,Cost Center {0} does not belong to Company {1},עלות המרכז {0} אינו שייך לחברת {1}
 DocType: Customer,Individual,פרט
 DocType: Interest,Academics User,משתמש אקדמאים
 DocType: Cheque Print Template,Amount In Figure,הסכום באיור
@@ -221,27 +219,28 @@
 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/stock/doctype/stock_entry/stock_entry.py +233,Insufficient Stock,מאגר מספיק
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227,Insufficient Stock,מאגר מספיק
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,תכנון קיבולת השבת ומעקב זמן
+DocType: Email Digest,New Sales Orders,הזמנות ומכירות חדשות
 DocType: Bank Reconciliation,Bank Account,חשבון בנק
 DocType: Leave Type,Allow Negative Balance,לאפשר מאזן שלילי
 DocType: Selling Settings,Default Territory,טריטורית ברירת מחדל
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,טלוויזיה
 DocType: Production Order Operation,Updated via 'Time Log',"עדכון באמצעות 'יומן זמן """
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} does not belong to Company {1},חשבון {0} אינו שייך לחברת {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +86,Account {0} does not belong to Company {1},חשבון {0} אינו שייך לחברת {1}
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},הסכום מראש לא יכול להיות גדול מ {0} {1}
 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 +174,For Warehouse is required before Submit,למחסן נדרש לפני הגשה
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,For Warehouse is required before Submit,למחסן נדרש לפני הגשה
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,התקבל ב
 DocType: Sales Partner,Reseller,משווק
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,נא להזין חברה
 DocType: Delivery Note Item,Against Sales Invoice Item,נגד פריט מכירות חשבונית
 ,Production Orders in Progress,הזמנות ייצור בהתקדמות
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Cash from Financing,מזומנים נטו ממימון
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1436,"LocalStorage is full , did not save","LocalStorage מלא, לא הציל"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1460,"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}
@@ -254,35 +253,35 @@
 apps/erpnext/erpnext/templates/generators/item.html +78,No description given,אין תיאור נתון
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,בקש לרכישה.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +5,This is based on the Time Sheets created against this project,זה מבוסס על פחי הזמנים נוצרו נגד הפרויקט הזה
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Only the selected Leave Approver can submit this Leave Application,רק המאשר Leave נבחר יכול להגיש בקשה זו החופשה
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +213,Only the selected Leave Approver can submit this Leave Application,רק המאשר Leave נבחר יכול להגיש בקשה זו החופשה
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,להקלה על התאריך חייבת להיות גדולה מ תאריך ההצטרפות
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Leaves per Year,עלים בכל שנה
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,עלים בכל שנה
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,שורת {0}: בדוק את 'האם 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,לִיטר
 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 +435,Leave Blocked,השאר חסימה
-apps/erpnext/erpnext/stock/doctype/item/item.py +669,Item {0} has reached its end of life on {1},פריט {0} הגיע לסיומו של חיים על {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +443,Leave Blocked,השאר חסימה
+apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item {0} has reached its end of life on {1},פריט {0} הגיע לסיומו של חיים על {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +95,Bank Entries,פוסט בנק
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +83,Annual,שנתי
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +86,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,אנשים המלמדים בארגון שלך
 DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Id הייחודי למעקב אחר כל החשבוניות חוזרות. הוא נוצר על שליחה.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Software Developer,מפתח תוכנה
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,מפתח תוכנה
 DocType: Item,Minimum Order Qty,להזמין כמות מינימום
 DocType: Pricing Rule,Supplier Type,סוג ספק
 DocType: Scheduling Tool,Course Start Date,תאריך פתיחת הקורס
 DocType: Item,Publish in Hub,פרסם בHub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is cancelled,פריט {0} יבוטל
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Material Request,בקשת חומר
+apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} is cancelled,פריט {0} יבוטל
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +823,Material Request,בקשת חומר
 DocType: Bank Reconciliation,Update Clearance Date,תאריך שחרור עדכון
 DocType: Item,Purchase Details,פרטי רכישה
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +328,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},פריט {0} לא נמצא בטבלה &quot;חומרי גלם מסופקת &#39;בהזמנת רכש {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +333,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},פריט {0} לא נמצא בטבלה &quot;חומרי גלם מסופקת &#39;בהזמנת רכש {1}
 DocType: Employee,Relation,ביחס
 DocType: Shipping Rule,Worldwide Shipping,משלוח ברחבי העולם
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,הזמנות אישרו מלקוחות.
@@ -300,20 +299,21 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +130,Please select Charge Type first,אנא בחר Charge סוג ראשון
 DocType: Student Group Student,Student Group Student,סטודנט הקבוצה
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,אחרון
+DocType: Email Digest,New Quotations,ציטוטים חדשים
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,המאשר החופשה הראשונה ברשימה תהיה לקבוע כברירת מחדל Leave המאשרת
 DocType: Tax Rule,Shipping County,מחוז משלוח
 apps/erpnext/erpnext/config/desktop.py +158,Learn,לִלמוֹד
 DocType: Asset,Next Depreciation Date,תאריך הפחת הבא
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,עלות פעילות לעובדים
 DocType: Accounts Settings,Settings for Accounts,הגדרות עבור חשבונות
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +626,Supplier Invoice No exists in Purchase Invoice {0},ספק חשבונית לא קיים חשבונית רכישת {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +629,Supplier Invoice No exists in Purchase Invoice {0},ספק חשבונית לא קיים חשבונית רכישת {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,ניהול מכירות אדם עץ.
 DocType: Job Applicant,Cover Letter,מכתב כיסוי
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,המחאות ופיקדונות כדי לנקות מצטיינים
 DocType: Item,Synced With Hub,סונכרן עם רכזת
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,סיסמא שגויה
 DocType: Item,Variant Of,גרסה של
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,Completed Qty can not be greater than 'Qty to Manufacture',"כמות שהושלמה לא יכולה להיות גדולה מ 'כמות לייצור """
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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 +86,Circular Reference Error,שגיאת הפניה מעגלית
@@ -325,12 +325,12 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,להודיע באמצעות דואר אלקטרוני על יצירת בקשת חומר אוטומטית
 DocType: Journal Entry,Multi Currency,מטבע רב
 DocType: Payment Reconciliation Invoice,Invoice Type,סוג חשבונית
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +806,Delivery Note,תעודת משלוח
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +800,Delivery Note,תעודת משלוח
 apps/erpnext/erpnext/config/learn.py +87,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 +233,Payment Entry has been modified after you pulled it. Please pull it again.,כניסת תשלום השתנתה לאחר שמשכת אותו. אנא למשוך אותו שוב.
+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/setup/doctype/email_digest/email_digest.py +104,Summary for this week and pending activities,סיכום השבוע הזה ופעילויות תלויות ועומדות
+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,הסכום לאחר פחת
@@ -345,21 +345,21 @@
 apps/erpnext/erpnext/config/hr.py +186,"Employee designation (e.g. CEO, Director etc.).","ייעוד עובד (למשל מנכ""ל, מנהל וכו ')."
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,נא להזין את 'חזור על פעולה ביום בחודש' ערך שדה
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,קצב שבו מטבע לקוחות מומר למטבע הבסיס של הלקוח
-apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},שורה # {0}: חשבונית הרכש אינו יכול להתבצע נגד נכס קיים {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +554,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},שורה # {0}: חשבונית הרכש אינו יכול להתבצע נגד נכס קיים {1}
 DocType: Item Tax,Tax Rate,שיעור מס
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} כבר הוקצה לעובדי {1} לתקופה {2} {3} ל
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +812,Select Item,פריט בחר
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +791,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/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,לרכוש חשבונית {0} כבר הוגשה
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},# השורה {0}: אצווה לא חייב להיות זהה {1} {2}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +143,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.,אצווה (הרבה) של פריט.
 DocType: C-Form Invoice Detail,Invoice Date,תאריך חשבונית
 DocType: GL Entry,Debit Amount,סכום חיוב
 apps/erpnext/erpnext/accounts/party.py +242,There can only be 1 Account per Company in {0} {1},לא יכול להיות רק 1 חשבון לכל חברת {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +4,Your email address,"כתובת הדוא""ל שלך"
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +342,Please see attachment,אנא ראה קובץ מצורף
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,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 +19,Setup Already Complete!!,התקנה כבר מלא !!
@@ -379,29 +379,29 @@
 DocType: Currency Exchange,Currency Exchange,המרת מטבע
 DocType: Purchase Invoice Item,Item Name,שם פריט
 DocType: Authorization Rule,Approving User  (above authorized value),אישור משתמש (מעל הערך מורשה)
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,יתרת אשראי
+DocType: Email Digest,Credit Balance,יתרת אשראי
 DocType: Employee,Widowed,אלמנה
 DocType: Request for Quotation,Request for Quotation,בקשה לציטוט
 DocType: Salary Slip Timesheet,Working Hours,שעות עבודה
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,לשנות את מתחיל / מספר הרצף הנוכחי של סדרות קיימות.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","אם כללי תמחור מרובים להמשיך לנצח, משתמשים מתבקשים להגדיר עדיפות ידנית לפתור את הסכסוך."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +736,Purchase Return,חזור רכישה
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +715,Purchase Return,חזור רכישה
 ,Purchase Register,רכישת הרשמה
 DocType: Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,חיובים החלים
 DocType: Workstation,Consumable Cost,עלות מתכלה
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +202,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) חייב להיות תפקיד ""Leave מאשר '"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,{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 +143,Reason for losing,סיבה לאיבוד
-apps/erpnext/erpnext/accounts/utils.py +239,Allocated amount can not greater than unadjusted amount,הסכום שהוקצה לא יכול מעל לסכום ללא התאמות
+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,הסכום שהוקצה לא יכול מעל לסכום ללא התאמות
 DocType: Announcement,Receiver,מַקְלֵט
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},תחנת עבודה סגורה בתאריכים הבאים בהתאם לרשימת Holiday: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,הזדמנויות
 DocType: Employee,Single,אחת
 DocType: Account,Cost of Goods Sold,עלות מכר
 DocType: Purchase Invoice,Yearly,שנתי
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +225,Please enter Cost Center,נא להזין מרכז עלות
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,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,שם הבודק
@@ -417,23 +417,22 @@
 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 +102,Non Profit,ללא כוונת רווח
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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: Stock Reconciliation Item,Do not include symbols (ex. $),אינו כולל סמלים (לשעבר. $)
 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 +638,Attribute {0} selected multiple times in Attributes Table,תכונה {0} נבחר מספר פעמים בטבלה תכונות
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,תכונה {0} נבחר מספר פעמים בטבלה תכונות
 DocType: HR Settings,Employee record is created using selected field. ,שיא עובד שנוצר באמצעות שדה שנבחר.
 DocType: Sales Order,Not Applicable,לא ישים
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,אב חג.
 DocType: Request for Quotation Item,Required Date,תאריך הנדרש
 DocType: Delivery Note,Billing Address,כתובת לחיוב
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +862,Please enter Item Code.,נא להזין את קוד פריט.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +847,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","אם מסומן, את סכום המס ייחשב כפי שכבר כלול במחיר ההדפסה / סכום ההדפסה"
@@ -447,12 +446,12 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,ניירות ערך ופיקדונות
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,סה&quot;כ עלים שהוקצו הוא חובה
 DocType: Job Opening,Description of a Job Opening,תיאור של פתיחת איוב
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Pending activities for today,פעילויות ממתינים להיום
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,פעילויות ממתינים להיום
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,נוכחות שיא.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,רכיב שכר שכר מבוסס גיליון.
 DocType: Sales Order Item,Used for Production Plan,המשמש לתכנית ייצור
 DocType: Manufacturing Settings,Time Between Operations (in mins),זמן בין פעולות (בדקות)
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +92,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} תקציב עבור חשבון {1} נגד מרכז עלות {2} הוא {3}. זה יעלה ידי {4}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +95,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} תקציב עבור חשבון {1} נגד מרכז עלות {2} הוא {3}. זה יעלה ידי {4}
 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,בומס שנבחר אינו תמורת אותו הפריט
@@ -460,15 +459,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +238,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 +86,Administrative Officer,קצין מנהלי
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,קצין מנהלי
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +23,Acutal Qty {0} / Waiting Qty {1},Acutal כמות {0} / ממתינים כמות {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +319,Please select Company,אנא בחר חברה
-DocType: Stock Entry,Difference Account,חשבון הבדל
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +309,Please select Company,אנא בחר חברה
+DocType: Stock Entry Detail,Difference Account,חשבון הבדל
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,לא יכולה לסגור משימה כמשימה התלויה {0} אינה סגורה.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Please enter Warehouse for which Material Request will be raised,נא להזין את המחסן שלבקשת חומר יועלה
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +399,Please enter Warehouse for which Material Request will be raised,נא להזין את המחסן שלבקשת חומר יועלה
 DocType: Production Order,Additional Operating Cost,עלות הפעלה נוספות
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,קוסמטיקה
-apps/erpnext/erpnext/stock/doctype/item/item.py +530,"To merge, following properties must be same for both items","למזג, המאפיינים הבאים חייבים להיות זהים בשני הפריטים"
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,"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 +28,Buy,לִקְנוֹת
@@ -476,7 +475,7 @@
 DocType: Sales Invoice,Offline POS Name,שם קופה מנותקת
 DocType: Sales Order,To Deliver,כדי לספק
 DocType: Purchase Invoice Item,Item,פריט
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1563,Serial no item cannot be a fraction,אין פריט סידורי לא יכול להיות חלק
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1587,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,קבלנות משנה ניהול
@@ -491,7 +490,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +42,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 +313,Reference No and Reference Date is mandatory for Bank transaction,אסמכתא ותאריך ההפניה הוא חובה עבור עסקת הבנק
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +316,Reference No and Reference Date is mandatory for Bank transaction,אסמכתא ותאריך ההפניה הוא חובה עבור עסקת הבנק
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,להוסיף מסים / עריכה וחיובים
 DocType: Purchase Invoice,Supplier Invoice No,ספק חשבונית לא
 DocType: Territory,For reference,לעיון
@@ -512,11 +511,11 @@
 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/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,לא נמצא רשומות בטבלת החשבונית
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +28,Please select Company and Party Type first,אנא בחר סוג החברה והמפלגה ראשון
+apps/erpnext/erpnext/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/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 +707,Make Sales Order,הפוך להזמין מכירות
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +701,Make Sales Order,הפוך להזמין מכירות
 DocType: Project Task,Project Task,פרויקט משימה
 ,Lead Id,זיהוי ליד
 DocType: C-Form Invoice Detail,Grand Total,סך כולל
@@ -532,7 +531,7 @@
 DocType: Job Applicant,Resume Attachment,מצורף קורות חיים
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,חזרו על לקוחות
 DocType: Leave Control Panel,Allocate,להקצות
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +734,Sales Return,חזור מכירות
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +728,Sales Return,חזור מכירות
 DocType: Announcement,Posted By,פורסם על ידי
 DocType: Item,Delivered by Supplier (Drop Ship),נמסר על ידי ספק (זרוק משלוח)
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,מסד הנתונים של לקוחות פוטנציאליים.
@@ -541,14 +540,13 @@
 DocType: Quotation,Quotation To,הצעת מחיר ל
 DocType: Lead,Middle Income,הכנסה התיכונה
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +212,Opening (Cr),פתיחה (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +795,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"ברירת מחדל של יחידת מדידה לפריט {0} לא ניתן לשנות באופן ישיר, כי כבר עשו כמה עסקה (ים) עם יחידת מידה אחרת. יהיה עליך ליצור פריט חדש לשימוש יחידת מידת ברירת מחדל שונה."
-apps/erpnext/erpnext/accounts/utils.py +237,Allocated amount can not be negative,סכום שהוקצה אינו יכול להיות שלילי
+apps/erpnext/erpnext/stock/doctype/item/item.py +797,Default Unit of Measure for Item {0} cannot be changed directly because 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,סכום שהוקצה אינו יכול להיות שלילי
 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 +91,Reference No & Reference Date is required for {0},התייחסות לא & תאריך הפניה נדרש עבור {0}
-DocType: Sales Invoice,Customer's Vendor,הספק של הלקוח
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Proposal Writing,כתיבת הצעה
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,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,תואר שני
@@ -556,13 +554,12 @@
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,מעקב זמן
 DocType: Fiscal Year Company,Fiscal Year Company,שנת כספי חברה
 DocType: Packing Slip Item,DN Detail,פרט DN
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +257,Already supplier quotation has created,כבר ציטוט ספק יצר
 DocType: Timesheet,Billed,מחויב
 DocType: Batch,Batch Description,תיאור אצווה
 DocType: Delivery Note,Time at which items were delivered from warehouse,זמן שבו פריטים הועברו ממחסן
 DocType: Sales Invoice,Sales Taxes and Charges,מסים מכירות וחיובים
 DocType: Employee,Organization Profile,ארגון פרופיל
-apps/erpnext/erpnext/accounts/page/pos/pos.js +733,View Offline Records,רשום מנותק צפה
+apps/erpnext/erpnext/accounts/page/pos/pos.js +715,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,חשבונית / יומן פרטים
@@ -576,7 +573,7 @@
 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,שינוי נטו במלאי
 DocType: Employee,Passport Number,דרכון מספר
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Manager,מנהל
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,מנהל
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,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' אינם יכולים להיות זהים.
@@ -585,8 +582,8 @@
 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 +299,Timesheet created:,גיליון נוצר:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +715,Please set default Cash or Bank account in Mode of Payment {0},אנא הגדר מזומנים ברירת מחדל או חשבון בנק במצב של תשלום {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +300,Timesheet created:,גיליון נוצר:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +772,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,לְהִרָשֵׁם
 DocType: Selling Settings,Customer Naming By,Naming הלקוח על ידי
 DocType: Depreciation Schedule,Depreciation Amount,סכום הפחת
@@ -625,10 +622,10 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +9,Pre Sales,קדם מכירות
 DocType: Purchase Receipt,Other Details,פרטים נוספים
 DocType: Account,Accounts,חשבונות
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Marketing,שיווק
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +227,Payment Entry is already created,כניסת תשלום כבר נוצר
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,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 +538,Row #{0}: Asset {1} does not linked to Item {2},# שורה {0}: Asset {1} אינו קשור פריט {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +541,Row #{0}: Asset {1} does not linked to Item {2},# שורה {0}: Asset {1} אינו קשור פריט {2}
 DocType: Company,Deafult Cost Center,מרכז עלות Deafult
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +48,Account {0} has been entered multiple times,חשבון {0} הוזן מספר פעמים
 DocType: Account,Expenses Included In Valuation,הוצאות שנכללו בהערכת שווי
@@ -637,7 +634,7 @@
 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 +617,Item has variants.,יש פריט גרסאות.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,יש פריט גרסאות.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,פריט {0} לא נמצא
 DocType: Bin,Stock Value,מניית ערך
 apps/erpnext/erpnext/accounts/doctype/account/account.py +25,Company {0} does not exist,החברה {0} לא קיים
@@ -657,7 +654,7 @@
 DocType: Purchase Order,Supply Raw Materials,חומרי גלם אספקה
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,התאריך שבו החשבונית הבאה תופק. הוא נוצר על שליחה.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,נכסים שוטפים
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,{0} is not a stock Item,{0} הוא לא פריט מלאי
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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 +169,Lead must be set if Opportunity is made from Lead,עופרת יש להגדיר אם הזדמנות עשויה מעופרת
@@ -724,26 +721,25 @@
 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 +709,No Permission,אין אישור
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +710,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,מס
 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 +542,Row #{0}: Asset {1} must be submitted,# שורה {0}: Asset {1} יש להגיש
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,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,כל קשרי הלקוחות
 apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,העלה איזון המניה באמצעות csv.
 DocType: Warehouse,Tree Details,עץ פרטים
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,שלח עכשיו
 ,Support Analytics,Analytics תמיכה
 DocType: Item,Website Warehouse,מחסן אתר
 DocType: Payment Reconciliation,Minimum Invoice Amount,סכום חשבונית מינימום
 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/sales_invoice/sales_invoice.py +227,Timesheet {0} is already completed or cancelled,גיליון {0} כבר הושלם או בוטל
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +259,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
@@ -759,13 +755,13 @@
 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 +229,Target Warehouse,יעד מחסן
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +230,Target Warehouse,יעד מחסן
 DocType: Cheque Print Template,Starting location from left edge,החל מיקום הקצה שמאלי
 DocType: Item,Allow over delivery or receipt upto this percent,לאפשר על משלוח או קבלת upto אחוזים זה
 DocType: Stock Entry,STE-,STE-
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Sales Order Date,תאריך אספקה צפוי לא יכול להיות לפני תאריך הזמנת המכירות
 DocType: Upload Attendance,Import Attendance,נוכחות יבוא
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,בכל קבוצות הפריט
+apps/erpnext/erpnext/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/config/setup.py +89,Automatically compose message on submission of transactions.,באופן אוטומטי לחבר את ההודעה על הגשת עסקות.
@@ -781,7 +777,7 @@
 DocType: Expense Claim,Expenses,הוצאות
 DocType: Item Variant Attribute,Item Variant Attribute,תכונה Variant פריט
 ,Purchase Receipt Trends,מגמות קבלת רכישה
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Research & Development,מחקר ופיתוח
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,מחקר ופיתוח
 ,Amount to Bill,הסכום להצעת החוק
 DocType: Company,Registration Details,פרטי רישום
 DocType: Item Reorder,Re-Order Qty,Re-להזמין כמות
@@ -791,7 +787,7 @@
 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/controllers/accounts_controller.py +340,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","קליטת הוצאות {0} מקושרת נגד להזמין {1}, לבדוק אם הוא צריך להיות משך כפי מראש בחשבונית זו."
+apps/erpnext/erpnext/controllers/accounts_controller.py +343,"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,נקודת מכירה
@@ -813,12 +809,12 @@
 DocType: Supplier Quotation,Is Subcontracted,האם קבלן
 DocType: Item Attribute,Item Attribute Values,ערכי תכונה פריט
 DocType: Examination Result,Examination Result,תוצאת בחינה
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +756,Purchase Receipt,קבלת רכישה
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +735,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 +167,Reference Doctype must be one of {0},הפניה Doctype חייב להיות אחד {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +282,Unable to find Time Slot in the next {0} days for Operation {1},לא ניתן למצוא משבצת הזמן בעולם הבא {0} ימים למבצע {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +170,Reference Doctype must be one of {0},הפניה Doctype חייב להיות אחד {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Unable to find Time Slot in the next {0} days for Operation {1},לא ניתן למצוא משבצת הזמן בעולם הבא {0} ימים למבצע {1}
 DocType: Production Order,Plan material for sub-assemblies,חומר תכנית לתת מכלולים
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,שותפי מכירות טריטוריה
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be active,BOM {0} חייב להיות פעיל
@@ -829,7 +825,7 @@
 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 +214,Warehouses with existing transaction can not be converted to ledger.,מחסן עם עסקה קיימת לא ניתן להמיר לדג&#39;ר.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +217,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,הזמנות ייצור
@@ -842,9 +838,9 @@
 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 +232,Please enter Asset Category in Item {0},נא להזין קטגורית Asset בסעיף {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +612,Item Variants {0} updated,פריט גרסאות {0} מעודכן
+apps/erpnext/erpnext/stock/doctype/item/item.py +614,Item Variants {0} updated,פריט גרסאות {0} מעודכן
 DocType: Quality Inspection Reading,Reading 6,קריאת 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +843,Cannot {0} {1} {2} without any negative outstanding invoice,אין אפשרות {0} {1} {2} ללא כל חשבונית מצטיינים שלילית
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +854,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 עכשיו
@@ -859,7 +855,7 @@
 DocType: Item,Is Purchase Item,האם פריט הרכישה
 DocType: Asset,Purchase Invoice,רכישת חשבוניות
 DocType: Stock Ledger Entry,Voucher Detail No,פרט שובר לא
-apps/erpnext/erpnext/accounts/page/pos/pos.js +728,New Sales Invoice,חשבונית מכירת בתים חדשה
+apps/erpnext/erpnext/accounts/page/pos/pos.js +710,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,בקשה לקבלת מידע
@@ -868,57 +864,55 @@
 DocType: Salary Slip,Total in words,"סה""כ במילים"
 DocType: Material Request Item,Lead Time Date,תאריך ליד זמן
 DocType: Cheque Print Template,Has Print Format,יש פורמט להדפסה
-apps/erpnext/erpnext/accounts/page/pos/pos.js +86, is mandatory. Maybe Currency Exchange record is not created for ,הוא חובה. אולי שיא המרה לא נוצר ל
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +109,Row #{0}: Please specify Serial No for Item {1},# שורה {0}: נא לציין את מספר סידורי לפריט {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +619,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","לפריטים &#39;מוצרי Bundle&#39;, מחסן, מספר סידורי ויצוו לא ייחשב מהשולחן &quot;רשימת האריזה&quot;. אם מחסן ויצוו אין הם זהים עבור כל פריטי האריזה עבור כל הפריט &quot;מוצרים Bundle &#39;, ניתן להזין ערכים אלה בטבלת הפריט העיקרית, ערכים יועתקו ל&#39;אריזת רשימה&#39; שולחן."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +75, 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 +613,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing 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 +606,Supplier Invoice Date cannot be greater than Posting Date,תאריך חשבונית ספק לא יכול להיות גדול מ תאריך פרסום
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +609,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: 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 +810,Select Item for Transfer,פריט בחר להעברה
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +789,Select Item for Transfer,פריט בחר להעברה
 DocType: Purchase Invoice,Additional Discount Percentage,אחוז הנחה נוסף
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,הצגת רשימה של כל סרטי וידאו העזרה
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,ראש בחר חשבון של הבנק שבו הופקד שיק.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,לאפשר למשתמש לערוך מחירון שיעור בעסקות
 DocType: Pricing Rule,Max Qty,מקס כמות
-DocType: Student Applicant,Father's Name,שמו של האב
 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 +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,שורת {0}: תשלום נגד מכירות / הזמנת רכש תמיד צריך להיות מסומן כמראש
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,כימיה
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +686,All items have already been transferred for this Production Order.,כל הפריטים כבר הועברו להזמנת ייצור זה.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +694,All items have already been transferred for this Production Order.,כל הפריטים כבר הועברו להזמנת ייצור זה.
 DocType: Process Payroll,Select Payroll Year and Month,בחר שכר שנה וחודש
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,Meter,מטר
 DocType: Workstation,Electricity Cost,עלות חשמל
 DocType: HR Settings,Don't send Employee Birthday Reminders,אל תשלחו לעובדי יום הולדת תזכורות
-DocType: Opportunity,Walk In,ללכת ב
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,ערכי מניות
 DocType: Item,Inspection Criteria,קריטריונים לבדיקה
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,הועבר
 apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,העלה ראש המכתב ואת הלוגו שלך. (אתה יכול לערוך אותם מאוחר יותר).
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,White,לבן
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +167,White,לבן
 DocType: SMS Center,All Lead (Open),כל הלידים (פתוח)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +228,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),שורה {0}: כמות אינה זמינה עבור {4} במחסן {1} בכל שעת הפרסום של כניסה ({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}),שורה {0}: כמות אינה זמינה עבור {4} במחסן {1} בכל שעת הפרסום של כניסה ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,קבלו תשלום מקדמות
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +731,Make ,הפוך
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,Make ,הפוך
 DocType: Journal Entry,Total Amount in Words,סכתי-הכל סכום מילים
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,הייתה שגיאה. סיבה סבירה אחת יכולה להיות שלא שמרת את הטופס. אנא צור קשר עם support@erpnext.com אם הבעיה נמשכת.
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,סל הקניות שלי
-apps/erpnext/erpnext/controllers/selling_controller.py +154,Order Type must be one of {0},סוג ההזמנה חייבת להיות אחד {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},סוג ההזמנה חייבת להיות אחד {0}
 DocType: Lead,Next Contact Date,התאריך לתקשר הבא
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,פתיחת כמות
 DocType: Student Batch,Student Batch Name,שם תצווה סטודנטים
 DocType: Holiday List,Holiday List Name,שם רשימת החג
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js +8,Schedule Course,קורס לו&quot;ז
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Stock Options,אופציות
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,אופציות
 DocType: Journal Entry Account,Expense Claim,תביעת הוצאות
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +211,Do you really want to restore this scrapped asset?,האם אתה באמת רוצה לשחזר נכס לגרוטאות זה?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +237,Qty for {0},כמות עבור {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +212,Do you really want to restore this scrapped asset?,האם אתה באמת רוצה לשחזר נכס לגרוטאות זה?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,Qty for {0},כמות עבור {0}
 DocType: Leave Application,Leave Application,החופשה Application
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,השאר הקצאת כלי
 DocType: Leave Block List,Leave Block List Dates,השאר תאריכי בלוק רשימה
@@ -927,9 +921,9 @@
 DocType: Company,Default Terms,תנאי ברירת מחדל
 DocType: Packing Slip Item,Packing Slip Item,פריט Slip אריזה
 DocType: Purchase Invoice,Cash/Bank Account,מזומנים / חשבון בנק
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,פריטים הוסרו ללא שינוי בכמות או ערך.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,פריטים הוסרו ללא שינוי בכמות או ערך.
 DocType: Delivery Note,Delivery To,משלוח ל
-apps/erpnext/erpnext/stock/doctype/item/item.py +635,Attribute table is mandatory,שולחן תכונה הוא חובה
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,שולחן תכונה הוא חובה
 DocType: Production Planning Tool,Get Sales Orders,קבל הזמנות ומכירות
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} אינו יכול להיות שלילי
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,בחר סטודנטים
@@ -954,7 +948,7 @@
 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,מחסן WIP
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},מספר סידורי {0} הוא תחת חוזה תחזוקת upto {1}
+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,שם ארגון
@@ -966,7 +960,7 @@
 DocType: GL Entry,Against,נגד
 DocType: Item,Default Selling Cost Center,מרכז עלות מכירת ברירת מחדל
 DocType: Sales Partner,Implementation Partner,שותף יישום
-apps/erpnext/erpnext/controllers/selling_controller.py +231,Sales Order {0} is {1},להזמין מכירות {0} הוא {1}
+apps/erpnext/erpnext/controllers/selling_controller.py +232,Sales Order {0} is {1},להזמין מכירות {0} הוא {1}
 DocType: Opportunity,Contact Info,יצירת קשר
 apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,מה שהופך את ערכי המלאי
 DocType: Packing Slip,Net Weight UOM,Net משקל של אוני 'מישגן
@@ -976,25 +970,24 @@
 DocType: Holiday List,Get Weekly Off Dates,קבל תאריכי מנוחה שבועיים
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,תאריך סיום לא יכול להיות פחות מתאריך ההתחלה
 DocType: Sales Person,Select company name first.,שם חברה בחר ראשון.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Dr,"ד""ר"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Dr,"ד""ר"
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,ציטוטים המתקבלים מספקים.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},כדי {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,גיל ממוצע
 DocType: 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/templates/pages/home.html +32,View All Products,הצג את כל המוצרים
+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 +400,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,אזהרה: מערכת לא תבדוק overbilling מאז סכום עבור פריט {0} ב {1} הוא אפס
+apps/erpnext/erpnext/controllers/accounts_controller.py +403,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/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,ושנה:
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +191,{0} {1} must be submitted,{0} {1} יש להגיש
-DocType: Email Digest,Annual Expense,הוצאה שנתית
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,{0} {1} must be submitted,{0} {1} יש להגיש
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +145,Quantity must be less than or equal to {0},כמות חייבת להיות קטנה או שווה ל {0}
 DocType: SMS Center,Total Characters,"סה""כ תווים"
 apps/erpnext/erpnext/controllers/buying_controller.py +156,Please select BOM in BOM field for Item {0},אנא בחר BOM בתחום BOM לפריט {0}
@@ -1005,7 +998,7 @@
 DocType: Sales Partner,Distributor,מפיץ
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,כלל משלוח סל קניות
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +211,Production Order {0} must be cancelled before cancelling this Sales Order,ייצור להזמין {0} יש לבטל לפני ביטול הזמנת מכירות זה
-apps/erpnext/erpnext/public/js/controllers/transaction.js +62,Please set 'Apply Additional Discount On',אנא הגדר &#39;החל הנחה נוספות ב&#39;
+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,מהטווח צריך להיות פחות מטווח
 DocType: Global Defaults,Global Defaults,ברירות מחדל גלובליות
@@ -1013,21 +1006,21 @@
 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 +327,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 +362,Finished Item {0} must be entered for Manufacture type entry,פריט סיים {0} יש להזין לכניסת סוג הייצור
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +367,Finished Item {0} must be entered for Manufacture type entry,פריט סיים {0} יש להזין לכניסת סוג הייצור
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,מאזן חשבונאי פתיחה
 DocType: Sales Invoice Advance,Sales Invoice Advance,מכירות חשבונית מראש
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +499,Nothing to request,שום דבר לא לבקש
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +500,Nothing to request,שום דבר לא לבקש
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','תאריך התחלה בפועל' לא יכול להיות גדול מ 'תאריך סיום בפועל'
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Management,ניהול
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},כך או סכום חיוב או זיכוי נדרש עבור {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,ניהול
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +55,Either debit or credit amount is required for {0},כך או סכום חיוב או זיכוי נדרש עבור {0}
 DocType: Cheque Print Template,Payer Settings,גדרות משלמות
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","זה יצורף לקוד הפריט של הגרסה. לדוגמא, אם הקיצור שלך הוא ""SM"", ואת קוד הפריט הוא ""T-shirt"", קוד הפריט של הגרסה יהיה ""T-shirt-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,חבילת נקי (במילים) תהיה גלויה ברגע שאתה לשמור את תלוש המשכורת.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,Blue,כחול
+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;ל
@@ -1037,12 +1030,11 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +23,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/accounts/page/pos/pos.js +1374,Do you really want to submit the invoice?,האם אתה באמת רוצה להגיש חשבונית?
 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 +685,Cost Center For Item with Item Code ',עלות מרכז לפריט עם קוד פריט '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1526,"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 +679,Cost Center For Item with Item Code ',עלות מרכז לפריט עם קוד פריט '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1550,"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 +26,"Further accounts can be made under Groups, but entries can be made against non-Groups","חשבונות נוספים יכולים להתבצע תחת קבוצות, אבל ערכים יכולים להתבצע נגד לא-קבוצות"
 DocType: Lead,Lead,לידים
@@ -1062,30 +1054,30 @@
 DocType: Payment Reconciliation,Unreconciled Payment Details,פרטי תשלום לא מותאמים
 DocType: Global Defaults,Current Fiscal Year,שנת כספים נוכחית
 DocType: Global Defaults,Disable Rounded Total,"להשבית מעוגל סה""כ"
-DocType: Lead,Call,שיחה
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +417,'Entries' cannot be empty,הרשומות' לא יכולות להיות ריקות'
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +418,'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 +214,Fiscal Year {0} not found,שנת כספים {0} לא נמצאה
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +221,Fiscal Year {0} not found,שנת כספים {0} לא נמצאה
 apps/erpnext/erpnext/config/hr.py +238,Setting up Employees,הגדרת עובדים
 DocType: Sales Order,SO-,כך-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,אנא בחר תחילה קידומת
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Please select prefix first,אנא בחר תחילה קידומת
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Research,מחקר
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,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 +43,Item {0} must be a non-stock item,פריט {0} חייב להיות לפריט שאינו מוחזק במלאי
 DocType: Contact,User ID,זיהוי משתמש
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +57,View Ledger,צפה לדג'ר
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,המוקדם
-apps/erpnext/erpnext/stock/doctype/item/item.py +504,"An Item Group exists with same name, please change the item name or rename the item group","קבוצת פריט קיימת עם אותו שם, בבקשה לשנות את שם הפריט או לשנות את שם קבוצת הפריט"
+apps/erpnext/erpnext/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 +437,Rest Of The World,שאר העולם
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,פריט {0} לא יכול להיות אצווה
 ,Budget Variance Report,תקציב שונות דווח
 DocType: Salary Slip,Gross Pay,חבילת גרוס
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +90,Row {0}: Activity Type is mandatory.,שורת {0}: סוג פעילות חובה.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +114,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/public/js/controllers/stock_controller.js +40,Accounting Ledger,החשבונאות לדג&#39;ר
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,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,עודפים
 DocType: BOM Item,Item Description,תיאור פריט
@@ -1097,69 +1089,68 @@
 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 +131,Balance for Account {0} must always be {1},מאזן לחשבון {0} חייב תמיד להיות {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +175,Valuation Rate required for Item in row {0},דרג הערכה הנדרשים פריט בשורת {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,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,דוגמה: שני במדעי המחשב
 DocType: Purchase Invoice,Rejected Warehouse,מחסן שנדחו
 DocType: GL Entry,Against Voucher,נגד שובר
 DocType: Item,Default Buying Cost Center,מרכז עלות רכישת ברירת מחדל
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","כדי לקבל את הטוב ביותר של ERPNext, אנו ממליצים שתיקחו קצת זמן ולצפות בקטעי וידאו עזרה אלה."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +87, to ,ל
+apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,ל
 DocType: Item,Lead Time in days,עופרת זמן בימים
 ,Accounts Payable Summary,חשבונות לתשלום סיכום
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Not authorized to edit frozen Account {0},אינך רשאי לערוך חשבון קפוא {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},אינך רשאי לערוך חשבון קפוא {0}
 DocType: Journal Entry,Get Outstanding Invoices,קבל חשבוניות מצטיינים
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +62,Sales Order {0} is not valid,להזמין מכירות {0} אינו חוקי
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,להזמין מכירות {0} אינו חוקי
 apps/erpnext/erpnext/setup/doctype/company/company.py +185,"Sorry, companies cannot be merged","מצטער, לא ניתן למזג חברות"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +139,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",כמות הנפקה / ההעברה הכולל {0} ב בקשת חומר {1} \ לא יכולה להיות גדולה מ כמות מבוקשת {2} עבור פריט {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Small,קטן
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,Small,קטן
 DocType: Employee,Employee Number,מספר עובדים
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},מקרה לא (ים) כבר בשימוש. נסה מקייס לא {0}
 ,Invoiced Amount (Exculsive Tax),סכום חשבונית (מס Exculsive)
-DocType: Student Applicant,Mother's / Guardian 1 Email ID,האם / אפוטרופוס 1 מזהה אימייל
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,פריט 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,ראש חשבון {0} נוצר
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +160,Green,ירוק
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,ירוק
 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 +57,Contract,חוזה
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,חוזה
 DocType: Email Digest,Add Quote,להוסיף ציטוט
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +498,UOM coversion factor required for UOM: {0} in Item: {1},גורם coversion של אוני 'מישגן נדרש לאונים' מישגן: {0} בפריט: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +503,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 +80,Row {0}: Qty is mandatory,שורת {0}: הכמות היא חובה
+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 +737,Sync Master Data,Sync Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +719,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,המוצרים או השירותים שלך
 DocType: Mode of Payment,Mode of Payment,מצב של תשלום
 apps/erpnext/erpnext/stock/doctype/item/item.py +178,Website Image should be a public file or website URL,תמונה: אתר אינטרנט צריכה להיות קובץ ציבורי או כתובת אתר אינטרנט
 DocType: Purchase Invoice Item,BOM,BOM
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,מדובר בקבוצת פריט שורש ולא ניתן לערוך.
+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 +345,"{0}: Employee email not found, hence email not sent","{0}: דוא&quot;ל שכיר לא נמצא, ומכאן דוא&quot;ל לא נשלח"
+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,האם כתובת החברה שלך
 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 +118,"For {0}, only credit accounts can be linked against another debit entry","עבור {0}, רק חשבונות האשראי יכולים להיות מקושרים נגד כניסת חיוב נוספת"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Delivery Note {0} is not submitted,משלוח הערה {0} לא תוגש
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Delivery Note {0} is not submitted,משלוח הערה {0} לא תוגש
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Sub-contracted Item,פריט {0} חייב להיות פריט-נדבק Sub
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,ציוד הון
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","כלל תמחור נבחר ראשון המבוססת על 'החל ב'שדה, אשר יכול להיות פריט, קבוצת פריט או מותג."
 DocType: Hub Settings,Seller Website,אתר מוכר
 DocType: Item,ITEM-,פריט-
-apps/erpnext/erpnext/controllers/selling_controller.py +147,Total allocated percentage for sales team should be 100,"אחוז הוקצה סה""כ לצוות מכירות צריך להיות 100"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +110,Production Order status is {0},מעמד הזמנת ייצור הוא {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,"אחוז הוקצה סה""כ לצוות מכירות צריך להיות 100"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},מעמד הזמנת ייצור הוא {0}
 DocType: Appraisal Goal,Goal,מטרה
 DocType: Sales Invoice Item,Edit Description,עריכת תיאור
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +757,For Supplier,לספקים
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +723,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,יצירת תבנית הדפסה
@@ -1178,7 +1169,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,"תקציר דוא""ל:"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +445,BOM {0} does not belong to Item {1},BOM {0} אינו שייך לפריט {1}
 DocType: Sales Partner,Target Distribution,הפצת יעד
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1667,Deafault warehouse is required for selected item,מחסן Deafault נדרש עבור פריט נבחר
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Deafault warehouse is required for selected item,מחסן Deafault נדרש עבור פריט נבחר
 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
@@ -1187,23 +1178,23 @@
 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 +110,Hardware,חומרה
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,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 +48,Privilege Leave,זכות Leave
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,זכות Leave
 DocType: Purchase Invoice,Supplier Invoice Date,תאריך חשבונית ספק
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,אתה צריך לאפשר סל קניות
 DocType: Payment Entry,Writeoff,מחיקת חוב
 DocType: Appraisal Template Goal,Appraisal Template Goal,מטרת הערכת תבנית
-DocType: Salary Slip,Earning,להרוויח
+DocType: Salary Component,Earning,להרוויח
 DocType: Purchase Invoice,Party Account Currency,מפלגת חשבון מטבע
 ,BOM Browser,דפדפן BOM
 DocType: Purchase Taxes and Charges,Add or Deduct,להוסיף או לנכות
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,חפיפה בין תנאים מצאו:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +171,Against Journal Entry {0} is already adjusted against some other voucher,נגד תנועת היומן {0} כבר תואם כמה שובר אחר
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,נגד תנועת היומן {0} כבר תואם כמה שובר אחר
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,"ערך להזמין סה""כ"
-apps/erpnext/erpnext/demo/setup_data.py +358,Food,מזון
+apps/erpnext/erpnext/demo/setup/setup_data.py +301,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/course_schedule/course_schedule.js +103,Mark Attendence,מארק Attendence
@@ -1237,12 +1228,12 @@
 DocType: Sales Order Item,Planned Quantity,כמות מתוכננת
 DocType: Purchase Invoice Item,Item Tax Amount,סכום מס פריט
 DocType: Item,Maintain Stock,לשמור על המלאי
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +209,Stock Entries already created for Production Order ,ערכי מניות כבר יצרו להפקה להזמין
+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,שינוי נטו בנכסים קבועים
 DocType: Leave Control Panel,Leave blank if considered for all designations,שאר ריק אם תיחשב לכל הכינויים
-apps/erpnext/erpnext/controllers/accounts_controller.py +620,Charge of type 'Actual' in row {0} cannot be included in Item Rate,תשלום מסוג 'בפועל' בשורת {0} אינו יכול להיות כלולים במחיר הפריט
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,Max: {0},מקס: {0}
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +15,From Datetime,מDatetime
+apps/erpnext/erpnext/controllers/accounts_controller.py +623,Charge of type 'Actual' in row {0} cannot be included in Item Rate,תשלום מסוג 'בפועל' בשורת {0} אינו יכול להיות כלולים במחיר הפריט
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +239,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 +153,"Request for Quotation is disabled to access from portal, for more check portal settings.","בקשה להצעת מחיר מושבת לגשת מתוך הפורטל, עבור הגדרות פורטל הצ&#39;ק יותר."
@@ -1250,8 +1241,8 @@
 DocType: Sales Invoice,Shipping Address Name,שם כתובת למשלוח
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,תרשים של חשבונות
 DocType: Material Request,Terms and Conditions Content,תוכן תנאים והגבלות
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +552,cannot be greater than 100,לא יכול להיות גדול מ 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +680,Item {0} is not a stock Item,פריט {0} הוא לא פריט מניות
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +546,cannot be greater than 100,לא יכול להיות גדול מ 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is not a stock Item,פריט {0} הוא לא פריט מניות
 DocType: Maintenance Visit,Unscheduled,לא מתוכנן
 DocType: Employee,Owned,בבעלות
 DocType: Salary Detail,Depends on Leave Without Pay,תלוי בחופשה ללא תשלום
@@ -1265,10 +1256,9 @@
 DocType: GL Entry,GL Entry,GL כניסה
 DocType: HR Settings,Employee Settings,הגדרות עובד
 ,Batch-Wise Balance History,אצווה-Wise היסטוריה מאזן
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,כדי לעשות את רשימה
 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 +61,Apprentice,Apprentice
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +102,Negative Quantity is not allowed,כמות שלילית אינה מותרת
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,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 +152,Employee cannot report to himself.,עובד לא יכול לדווח לעצמו.
@@ -1289,15 +1279,14 @@
 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 +141,Source warehouse is mandatory for row {0},מחסן המקור הוא חובה עבור שורת {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +719,Packing Slip,Slip אריזה
+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 +713,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/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,בקשה להצעת המחיר יכולה להיות גישה על ידי לחיצה על הקישור הבא
 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 +81,Analyst,אנליסט
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,אנליסט
 DocType: Item,Inventory,מלאי
 DocType: Item,Sales Details,פרטי מכירות
 DocType: Quality Inspection,QI-,QI-
@@ -1305,7 +1294,7 @@
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,בכמות
 DocType: Notification Control,Expense Claim Rejected,תביעה נדחתה חשבון
 DocType: Item Attribute,Item Attribute,תכונה פריט
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +103,Government,ממשלה
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,ממשלה
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,שם המוסד
 apps/erpnext/erpnext/config/stock.py +289,Item Variants,גרסאות פריט
 DocType: Company,Services,שירותים
@@ -1361,12 +1350,12 @@
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,מקלט רשימה ריקה. אנא ליצור מקלט רשימה
 DocType: Production Plan Sales Order,Production Plan Sales Order,הפקת תכנית להזמין מכירות
 DocType: Sales Partner,Sales Partner Target,מכירות פרטנר יעד
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +110,Accounting Entry for {0} can only be made in currency: {1},כניסה לחשבונאות {0} יכולה להתבצע רק במטבע: {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},כניסה לחשבונאות {0} יכולה להתבצע רק במטבע: {1}
 DocType: Pricing Rule,Pricing Rule,כלל תמחור
 DocType: Budget,Action if Annual Budget Exceeded,פעולה אם שנתי תקציב חריג
 apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,בקשת חומר להזמנת רכש
 DocType: Shopping Cart Settings,Payment Success URL,כתובת הצלחה תשלום
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +78,Row # {0}: Returned Item {1} does not exists in {2} {3},שורה # {0}: פריט מוחזר {1} לא קיים {2} {3}
+apps/erpnext/erpnext/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,הצהרת בנק פיוס
@@ -1375,11 +1364,11 @@
 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/stock/doctype/stock_entry/stock_entry.py +339,Not allowed to tranfer more {0} than {1} against Purchase Order {2},אסור לי תשלומי העברה יותר {0} מ {1} נגד הזמנת רכש {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +344,Not allowed to tranfer more {0} than {1} against Purchase Order {2},אסור לי תשלומי העברה יותר {0} מ {1} נגד הזמנת רכש {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},עלים שהוקצו בהצלחה עבור {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,אין פריטים לארוז
 DocType: Shipping Rule Condition,From Value,מערך
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +545,Manufacturing Quantity is mandatory,כמות ייצור היא תנאי הכרחית
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,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.,תביעות לחשבון חברה.
@@ -1390,22 +1379,22 @@
 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 +130,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 +137,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,דוחות נוספים
 DocType: Dependent Task,Dependent Task,משימה תלויה
 apps/erpnext/erpnext/stock/doctype/item/item.py +411,Conversion factor for default Unit of Measure must be 1 in row {0},גורם המרה ליחידת ברירת מחדל של מדד חייב להיות 1 בשורה {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,Leave of type {0} cannot be longer than {1},Leave מסוג {0} אינו יכול להיות ארוך מ- {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +197,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 +546,Already completed,הושלם כבר
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +22,Payment Request already exists {0},בקשת תשלום כבר קיימת {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +550,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 +241,Quantity must not be more than {0},כמות לא חייבת להיות יותר מ {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Quantity must not be more than {0},כמות לא חייבת להיות יותר מ {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +76,Previous Financial Year is not closed,קודם שנת הכספים אינה סגורה
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +44,Age (Days),גיל (ימים)
 DocType: Quotation Item,Quotation Item,פריט ציטוט
@@ -1422,7 +1411,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +221,Purchase Receipt {0} is not submitted,קבלת רכישת {0} לא תוגש
 DocType: Company,Default Payable Account,חשבון זכאים ברירת מחדל
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","הגדרות לעגלת קניות מקוונות כגון כללי משלוח, מחירון וכו '"
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +83,{0}% Billed,{0}% שחויבו
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}% שחויבו
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,שמורות כמות
 DocType: Party Account,Party Account,חשבון המפלגה
 apps/erpnext/erpnext/config/setup.py +116,Human Resources,משאבי אנוש
@@ -1434,12 +1423,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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 +22,Collect,לאסוף
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,לאסוף
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,Against Supplier Invoice {0} dated {1},נגד ספק חשבונית {0} יום {1}
 DocType: Customer,Default Price List,מחיר מחירון ברירת מחדל
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +225,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: Payment Reconciliation,Payments,תשלומים
 DocType: Journal Entry,Entry Type,סוג הכניסה
 ,Customer Credit Balance,יתרת אשראי ללקוחות
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Payable,שינוי נטו בחשבונות זכאים
@@ -1451,7 +1439,7 @@
 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 +9,Procurement,רֶכֶשׁ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,אף אחד מהפריטים יש שינוי בכמות או ערך.
+apps/erpnext/erpnext/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,הפעיל אחריות
 ,Lead Details,פרטי לידים
 DocType: Purchase Invoice,End date of current invoice's period,תאריך סיום של התקופה של החשבונית הנוכחית
@@ -1476,7 +1464,7 @@
 DocType: Purchase Invoice,Additional Discount,הנחה נוסף
 DocType: Selling Settings,Selling Settings,מכירת הגדרות
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,מכירות פומביות באינטרנט
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +97,Please specify either Quantity or Valuation Rate or both,נא לציין גם כמות או דרגו את ההערכה או שניהם
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,נא לציין גם כמות או דרגו את ההערכה או שניהם
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +13,Fulfillment,הַגשָׁמָה
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","חברה, חודש ושנת כספים הוא חובה"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,הוצאות שיווק
@@ -1497,14 +1485,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,ERPNext ההתקנה הושלמה!
 DocType: Item,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +93,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"קבוצת לקוחות קיימת עם אותו שם, בבקשה לשנות את שם הלקוח או לשנות את שם קבוצת הלקוחות"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +126,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"קבוצת לקוחות קיימת עם אותו שם, בבקשה לשנות את שם הלקוח או לשנות את שם קבוצת הלקוחות"
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,איש קשר חדש
 DocType: Territory,Parent Territory,טריטורית הורה
 DocType: Quality Inspection Reading,Reading 2,קריאת 2
 DocType: Stock Entry,Material Receipt,קבלת חומר
 DocType: Homepage,Products,מוצרים
 DocType: Announcement,Instructor,מַדְרִיך
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},מפלגת סוג והמפלגה נדרש לבקל / חשבון זכאים {0}
 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,לתקשר בא על ידי
@@ -1533,20 +1520,20 @@
 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 +858,Make Purchase Order,הפוך הזמנת רכש
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +852,Make Purchase Order,הפוך הזמנת רכש
 DocType: SMS Center,Send To,שלח אל
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,There is not enough leave balance for Leave Type {0},אין איזון חופשה מספיק לחופשת סוג {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,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 +172,Work-in-Progress Warehouse is required before Submit,עבודה ב-התקדמות המחסן נדרש לפני הגשה
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,Work-in-Progress Warehouse is required before Submit,עבודה ב-התקדמות המחסן נדרש לפני הגשה
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,מועמד לעבודה.
 DocType: Purchase Order Item,Warehouse and Reference,מחסן והפניה
 DocType: Supplier,Statutory info and other general information about your Supplier,מידע סטטוטורי ומידע כללי אחר על הספק שלך
-apps/erpnext/erpnext/hooks.py +88,Addresses,כתובות
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +212,Against Journal Entry {0} does not have any unmatched {1} entry,נגד תנועת היומן {0} אין {1} כניסה ללא תחרות
+apps/erpnext/erpnext/hooks.py +95,Addresses,כתובות
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +215,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,תנאי עבור כלל משלוח
@@ -1557,11 +1544,10 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} must be submitted,BOM {0} יש להגיש
 DocType: Authorization Control,Authorization Control,אישור בקרה
 apps/erpnext/erpnext/controllers/buying_controller.py +300,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},# השורה {0}: נדחה מחסן הוא חובה נגד פריט דחה {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +731,Payment,תשלום
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,Payment,תשלום
 DocType: Production Order Operation,Actual Time and Cost,זמן ועלות בפועל
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},בקשת חומר של מקסימום {0} יכולה להתבצע עבור פריט {1} נגד להזמין מכירות {2}
 DocType: Employee,Salutation,שְׁאֵילָה
-DocType: Pricing Rule,Brand,מותג
 DocType: Course,Course Abbreviation,קיצור קורס
 DocType: Item,Will also apply for variants,תחול גם לגרסות
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +142,"Asset cannot be cancelled, as it is already {0}","נכסים לא ניתן לבטל, כפי שהוא כבר {0}"
@@ -1572,7 +1558,7 @@
 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.","רשימת המוצרים שלך או שירותים שאתה לקנות או למכור. הקפד לבדוק את קבוצת הפריט, יחידת המידה ונכסים אחרים בעת ההפעלה."
 DocType: Hub Settings,Hub Node,רכזת צומת
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,אתה נכנס פריטים כפולים. אנא לתקן ונסה שוב.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Associate,חבר
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,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,צור מקלט רשימה
@@ -1580,7 +1566,7 @@
 DocType: Production Planning Tool,Material Requests,בקשות חומר
 DocType: Warranty Claim,Issue Date,תאריך הנפקה
 DocType: Activity Cost,Activity Cost,עלות פעילות
-DocType: Timesheet Detail,Timesheet Detail,פרטי גיליון
+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),מציין כי החבילה היא חלק ממשלוח (רק טיוטה) זה
@@ -1626,18 +1612,18 @@
 ,Amount to Deliver,הסכום לאספקת
 apps/erpnext/erpnext/public/js/setup_wizard.js +292,A Product or Service,מוצר או שירות
 DocType: Naming Series,Current Value,ערך נוכחי
-apps/erpnext/erpnext/controllers/accounts_controller.py +235,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,שנתי כספים מרובות קיימות במועד {0}. אנא להגדיר חברה בשנת הכספים
+apps/erpnext/erpnext/controllers/accounts_controller.py +238,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 +458,Item table can not be blank,שולחן פריט לא יכול להיות ריק
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +443,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 +5,This is based on stock movement. See {0} for details,זה מבוסס על תנועת המניה. ראה {0} לפרטים
 DocType: Pricing Rule,Selling,מכירה
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +341,Amount {0} {1} deducted against {2},סכום {0} {1} לנכות כנגד {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +344,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,תאריך יעד לא יכול להיות לפני פרסום תאריך
@@ -1652,8 +1638,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +144,Cannot refer row number greater than or equal to current row number for this Charge type,לא יכול להתייחס מספר השורה גדול או שווה למספר השורה הנוכחי לסוג השעבוד זה
 DocType: Asset,Sold,נמכר
 ,Item-wise Purchase History,היסטוריה רכישת פריט-חכם
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Red,אדום
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},אנא לחץ על 'צור לוח זמנים' כדי להביא מספר סידורי הוסיפה לפריט {0}
+apps/erpnext/erpnext/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,הזמנות ייצור פתוחות
 DocType: Sales Invoice Payment,Base Amount (Company Currency),הסכום הבסיסי (החברה מטבע)
@@ -1661,7 +1647,7 @@
 DocType: Installation Note,Installation Time,זמן התקנה
 DocType: Sales Invoice,Accounting Details,חשבונאות פרטים
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,מחק את כל העסקאות לחברה זו
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +187,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,# השורה {0}: מבצע {1} לא הושלם עבור {2} כמות של מוצרים מוגמרים הפקה שמספרת {3}. עדכן מצב פעולה באמצעות יומני זמן
+apps/erpnext/erpnext/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}. עדכן מצב פעולה באמצעות יומני זמן
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,השקעות
 DocType: Issue,Resolution Details,רזולוציה פרטים
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,הקצבות
@@ -1703,10 +1689,10 @@
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +182,Please set 'Asset Depreciation Cost Center' in Company {0},אנא הגדר &#39;מרכז עלות נכסי פחת&#39; ב חברת {0}
 ,Maintenance Schedules,לוחות זמנים תחזוקה
 DocType: Task,Actual End Date (via Time Sheet),תאריך סיום בפועל (באמצעות גיליון זמן)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Amount {0} {1} against {2} {3},סכום {0} {1} נגד {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +339,Amount {0} {1} against {2} {3},סכום {0} {1} נגד {2} {3}
 ,Quotation Trends,מגמות ציטוט
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},קבוצת פריט שלא צוינה באב פריט לפריט {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +295,Debit To account must be a Receivable account,חיוב החשבון חייב להיות חשבון חייבים
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Receivable account,חיוב החשבון חייב להיות חשבון חייבים
 DocType: Shipping Rule Condition,Shipping Amount,סכום משלוח
 ,Pending Amount,סכום תלוי ועומד
 DocType: Purchase Invoice Item,Conversion Factor,המרת פקטור
@@ -1714,10 +1700,10 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +137,Expected value after useful life must be greater than or equal to {0},הערך צפוי לאחר חיים שימושיים חייב להיות גדול או שווה ל {0}
 DocType: Purchase Receipt,Vehicle Number,מספר רכב
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,התאריך שבו חשבונית חוזרת תהיה לעצור
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +90,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,עלים כולל שהוקצו {0} לא יכולים להיות פחות מעלים שכבר אושרו {1} לתקופה
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +93,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 +22,Enter Paid Amount,זן הסכום ששולם
+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,כוללים ערכים מפוייס
@@ -1727,7 +1713,7 @@
 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: Purchase Invoice,Additional Discount Amount,סכום הנחה נוסף
-apps/erpnext/erpnext/controllers/accounts_controller.py +524,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","# השורה {0}: כמות חייבת להיות 1, כפריט הוא נכס קבוע. השתמש בשורה נפרדת עבור כמות מרובה."
+apps/erpnext/erpnext/controllers/accounts_controller.py +527,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","# השורה {0}: כמות חייבת להיות 1, כפריט הוא נכס קבוע. השתמש בשורה נפרדת עבור כמות מרובה."
 DocType: Leave Block List Allow,Leave Block List Allow,השאר בלוק רשימה אפשר
 apps/erpnext/erpnext/setup/doctype/company/company.py +249,Abbr can not be blank or space,Abbr לא יכול להיות ריק או חלל
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,קבוצה לקבוצה ללא
@@ -1743,17 +1729,17 @@
 apps/erpnext/erpnext/projects/doctype/task/task.js +26,Expense Claims,תביעות חשבון
 DocType: Issue,Support,תמיכה
 ,BOM Search,חיפוש BOM
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Closing (Opening + Totals),סגירה (פתיחת סיכומים +)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),סגירה (פתיחת סיכומים +)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,נא לציין את מטבע בחברה
 DocType: Workstation,Wages per hour,שכר לשעה
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +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/controllers/accounts_controller.py +272,Account {0} is invalid. Account Currency must be {1},חשבון {0} אינו חוקי. מטבע חשבון חייב להיות {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +275,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 +956,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","# השורה {0}: Reference סוג המסמך חייב להיות אחד להזמין מכירות, חשבוניות מכירות או תנועת יומן"
-DocType: Salary Slip,Deduction,ניכוי
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +87,Row {0}: From Time and To Time is mandatory.,שורת {0}: מעת לעת ו היא חובה.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +969,"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 +111,Row {0}: From Time and To Time is mandatory.,שורת {0}: מעת לעת ו היא חובה.
 apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},מחיר הפריט נוסף עבור {0} ב מחירון {1}
 DocType: Address Template,Address Template,תבנית כתובת
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +7,Please enter Employee Id of this sales person,נא להזין את עובדי זיהוי של איש מכירות זה
@@ -1761,7 +1747,7 @@
 DocType: Project,% Tasks Completed,משימות שהושלמו%
 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 +194,Please enter Production Item first,אנא ראשון להיכנס פריט הפקה
+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,משתמשים נכים
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,הצעת מחיר
@@ -1770,53 +1756,51 @@
 DocType: Maintenance Visit,Maintenance User,משתמש תחזוקה
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +149,Cost Updated,עלות עדכון
 DocType: Employee,Date of Birth,תאריך לידה
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +86,Item {0} has already been returned,פריט {0} הוחזר כבר
+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: Production Order Operation,Actual Operation Time,בפועל מבצע זמן
 DocType: Authorization Rule,Applicable To (User),כדי ישים (משתמש)
 DocType: Purchase Taxes and Charges,Deduct,לנכות
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,Job Description,תיאור התפקיד
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,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 +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","תווים מיוחדים מלבד ""-"" ""."", ""#"", ו"" / ""אסור בשמות סדרה"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","תווים מיוחדים מלבד ""-"" ""."", ""#"", ו"" / ""אסור בשמות סדרה"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","עקוב אחר מסעות פרסום מכירות. עקוב אחר הובלות, הצעות מחיר, להזמין מכירות וכו 'ממסעות הפרסום כדי לאמוד את ההחזר על השקעה."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +24,Welcome to POS: Create your POS Profile,ברוכים הבאים קופה: יצירת פרופיל הקופה שלך
 DocType: Expense Claim,Approver,מאשר
 ,SO Qty,SO כמות
 DocType: Appraisal,Calculate Total Score,חישוב ציון הכולל
 DocType: Request for Quotation,Manufacturing Manager,ייצור מנהל
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},מספר סידורי {0} הוא תחת אחריות upto {1}
+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 +74,Shipments,משלוחים
+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 +153,Row # ,# שורה
+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 +156,Get From,קבל מ
+apps/erpnext/erpnext/public/js/utils.js +167,Get From,קבל מ
 DocType: C-Form,Quarter,רבעון
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Miscellaneous Expenses,הוצאות שונות
 DocType: Global Defaults,Default Company,חברת ברירת מחדל
 apps/erpnext/erpnext/controllers/stock_controller.py +167,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,הוצאה או חשבון הבדל היא חובה עבור פריט {0} כערך המניה בסך הכל זה משפיע
-apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","לא יכול overbill לפריט {0} בשורת {1} יותר מ {2}. כדי לאפשר overbilling, נא לקבוע בהגדרות בורסה"
+apps/erpnext/erpnext/controllers/accounts_controller.py +419,"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,-מעל
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} is disabled,משתמש {0} אינו זמין
 DocType: Leave Application,Total Leave Days,"ימי חופשה סה""כ"
 DocType: Email Digest,Note: Email will not be sent to disabled users,הערה: דואר אלקטרוני לא יישלח למשתמשים בעלי מוגבלויות
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,בחר חברה ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,שאר ריק אם תיחשב לכל המחלקות
 apps/erpnext/erpnext/config/hr.py +171,"Types of employment (permanent, contract, intern etc.).","סוגי התעסוקה (קבוע, חוזה, וכו 'מתמחה)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +346,{0} is mandatory for Item {1},{0} הוא חובה עבור פריט {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,{0} is mandatory for Item {1},{0} הוא חובה עבור פריט {1}
 DocType: Currency Exchange,From Currency,ממטבע
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","אנא בחר סכום שהוקצה, סוג החשבונית וחשבונית מספר בatleast שורה אחת"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,עלות רכישה חדשה
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},להזמין מכירות הנדרשים לפריט {0}
 DocType: Purchase Invoice Item,Rate (Company Currency),שיעור (חברת מטבע)
-apps/erpnext/erpnext/demo/setup_data.py +360,Others,אחרים
+DocType: Student Guardian,Others,אחרים
 DocType: Payment Entry,Unallocated Amount,סכום שלא הוקצה
 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,מסים והיטלים ש
@@ -1836,16 +1820,15 @@
 apps/erpnext/erpnext/config/stock.py +304,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 +54,Receivable Account,חשבון חייבים
-apps/erpnext/erpnext/controllers/accounts_controller.py +546,Row #{0}: Asset {1} is already {2},# שורה {0}: Asset {1} הוא כבר {2}
+apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,חשבון חייבים
+apps/erpnext/erpnext/controllers/accounts_controller.py +549,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 +79,CEO,מנכ&quot;ל
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,מנכ&quot;ל
 DocType: Expense Claim Detail,Expense Claim Detail,פרטי תביעת חשבון
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +808,Please select correct account,אנא בחר חשבון נכון
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +809,Please select correct account,אנא בחר חשבון נכון
 DocType: Item,Weight UOM,המשקל של אוני 'מישגן
 DocType: Employee,Blood Group,קבוצת דם
-DocType: Purchase Invoice Item,Page Break,מעבר עמוד
 DocType: Production Order Operation,Pending,ממתין ל
 DocType: Course,Course Name,שם קורס
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,משתמשים שיכולים לאשר בקשות החופשה של עובד ספציפי
@@ -1854,13 +1837,13 @@
 DocType: Fiscal Year,Companies,חברות
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,אלקטרוניקה
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,להעלות בקשת חומר כאשר המלאי מגיע לרמה מחדש כדי
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Full-time,משרה מלאה
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,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.","אם יצרת תבנית סטנדרטית בתבנית מסים מכירות וחיובים, בחר אחד ולחץ על הכפתור למטה."
 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 +289,Debit To is required,חיוב נדרש
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +321,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,מנהל איכות
@@ -1887,7 +1870,7 @@
 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/purchase_receipt/purchase_receipt.py +378,All items have already been invoiced,כל הפריטים כבר בחשבונית
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +379,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,חיצוני
@@ -1902,7 +1885,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,הלקוחות שלך
 apps/erpnext/erpnext/projects/doctype/project/project.py +141,You have been invited to collaborate on the project: {0},הוזמנת לשתף פעולה על הפרויקט: {0}
 DocType: Leave Block List Date,Block Date,תאריך בלוק
-apps/erpnext/erpnext/templates/generators/job_opening.html +19,Apply Now,החל עכשיו
+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.","יצירה וניהול של מעכל דוא""ל יומי, שבועית וחודשית."
@@ -1911,7 +1894,7 @@
 DocType: Fee Structure,Fee Structure,מבנה עמלות
 DocType: Timesheet Detail,Costing Amount,סכום תמחיר
 DocType: Process Payroll,Submit Salary Slip,שלח שכר Slip
-apps/erpnext/erpnext/controllers/selling_controller.py +161,Maxiumm discount for Item {0} is {1}%,ההנחה Maxiumm לפריט {0} {1}% הוא
+apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,ההנחה Maxiumm לפריט {0} {1}% הוא
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,יבוא בתפזורת
 DocType: Sales Partner,Address & Contacts,כתובת ומגעים
 DocType: SMS Log,Sender Name,שם שולח
@@ -1936,19 +1919,19 @@
 DocType: Serial No,Delivery Time,זמן אספקה
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,הזדקנות המבוסס על
 DocType: Item,End of Life,סוף החיים
-apps/erpnext/erpnext/demo/setup_data.py +361,Travel,נסיעות
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +155,No active or default Salary Structure found for employee {0} for the given dates,אין מבנה פעיל או שכר מחדל נמצא עבור עובד {0} לתאריכים הנתונים
+apps/erpnext/erpnext/demo/setup/setup_data.py +304,Travel,נסיעות
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +167,No active or default Salary Structure found for employee {0} for the given dates,אין מבנה פעיל או שכר מחדל נמצא עבור עובד {0} לתאריכים הנתונים
 DocType: Leave Block List,Allow Users,אפשר למשתמשים
 DocType: Purchase Order,Customer Mobile No,לקוחות ניידים לא
 DocType: Sales Invoice,Recurring,חוזר
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,עקוב אחר הכנסות והוצאות נפרדות לאנכי מוצר או חטיבות.
 DocType: Rename Tool,Rename Tool,שינוי שם כלי
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +23,Update Cost,עלות עדכון
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,עלות עדכון
 DocType: Item Reorder,Item Reorder,פריט סידור מחדש
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +748,Transfer Material,העברת חומר
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +166,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 +923,Please set recurring after saving,אנא קבע חוזר לאחר השמירה
+apps/erpnext/erpnext/public/js/controllers/transaction.js +914,Please set recurring after saving,אנא קבע חוזר לאחר השמירה
 DocType: Purchase Invoice,Price List Currency,מטבע מחירון
 DocType: Naming Series,User must always select,משתמש חייב תמיד לבחור
 DocType: Stock Settings,Allow Negative Stock,אפשר מלאי שלילי
@@ -1965,26 +1948,26 @@
 DocType: Process Payroll,Create Salary Slip,צור שכר Slip
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +33,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 +352,Quantity in row {0} ({1}) must be same as manufactured quantity {2},כמות בשורת {0} ({1}) חייבת להיות זהה לכמות שיוצרה {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Quantity in row {0} ({1}) must be same as manufactured quantity {2},כמות בשורת {0} ({1}) חייבת להיות זהה לכמות שיוצרה {2}
 DocType: Appraisal,Employee,עובד
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,הזמן כמשתמש
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} מחויב באופן מלא
 DocType: Workstation Working Hour,End Time,שעת סיום
 DocType: Payment Entry,Payment Deductions or Loss,ניכויי תשלום או פסד
-apps/erpnext/erpnext/config/schools.py +100,LMS,LMS
+apps/erpnext/erpnext/config/schools.py +104,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,צינור מכירות
 DocType: Student Batch Student,Student Batch Student,סטודנט יצווה
-DocType: Sales Invoice,Mass Mailing,תפוצה המונית
+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 +199,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/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 +297,Salary Slip of employee {0} already created for this period,תלוש משכורת של עובד {0} נוצר כבר בתקופה זו
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Pharmaceutical,תרופות
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +309,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/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,אשראי ל
@@ -1999,20 +1982,20 @@
 DocType: Upload Attendance,Attendance To Date,נוכחות לתאריך
 DocType: Warranty Claim,Raised By,הועלה על ידי
 DocType: Payment Gateway Account,Payment Account,חשבון תשלומים
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +814,Please specify Company to proceed,נא לציין את חברה כדי להמשיך
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +793,Please specify Company to proceed,נא לציין את חברה כדי להמשיך
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Receivable,שינוי נטו בחשבונות חייבים
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Compensatory Off,Off המפצה
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,Off המפצה
 DocType: Quality Inspection Reading,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.,אנא ודא שאתה באמת רוצה למחוק את כל העסקות לחברה זו. נתוני אביך יישארו כפי שהוא. לא ניתן לבטל פעולה זו.
 DocType: Room,Room Number,מספר חדר
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},התייחסות לא חוקית {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +161,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) לא יכול להיות גדול יותר מquanitity המתוכנן ({2}) בהפקה להזמין {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +162,{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 +217,Raw Materials cannot be blank.,חומרי גלם לא יכולים להיות ריקים.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,"Could not update stock, invoice contains drop shipping item.","לא ניתן לעדכן מניות, חשבונית מכילה פריט ירידת משלוח."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +460,Quick Journal Entry,מהיר יומן
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +111,You can not change rate if BOM mentioned agianst any item,אתה לא יכול לשנות את השיעור אם BOM ציינו agianst כל פריט
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +441,"Could not update stock, invoice contains drop shipping item.","לא ניתן לעדכן מניות, חשבונית מכילה פריט ירידת משלוח."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Quick Journal Entry,מהיר יומן
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +103,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}
@@ -2032,11 +2015,11 @@
 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 +739,Item or Warehouse for row {0} does not match Material Request,פריט או מחסן לשורת {0} אינו תואם בקשת חומר
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +747,Item or Warehouse for row {0} does not match Material Request,פריט או מחסן לשורת {0} אינו תואם בקשת חומר
 apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,יְחִידַת מִידָה
 DocType: Fiscal Year,Year End Date,תאריך סיום שנה
 DocType: Task Depends On,Task Depends On,המשימה תלויה ב
-DocType: Lead,Opportunity,הזדמנות
+DocType: Supplier Quotation,Opportunity,הזדמנות
 ,Completed Production Orders,הזמנות ייצור שהושלמו
 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 ברירת המחדל
@@ -2049,7 +2032,7 @@
 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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},תאריך התחלת תחזוקה לא יכול להיות לפני מועד אספקה למספר סידורי {0}
+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,תאריך סיום בפועל
 DocType: Purchase Invoice,PINV-,PINV-
 DocType: Authorization Rule,Applicable To (Role),כדי ישים (תפקיד)
@@ -2064,7 +2047,7 @@
 DocType: SMS Log,No of Requested SMS,לא של SMS המבוקש
 DocType: Campaign,Campaign-.####,קמפיין -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,הצעדים הבאים
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,Please supply the specified items at the best possible rates,נא למלא את הסעיפים המפורטים בשיעורים הטובים ביותר האפשריים
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +695,Please supply the specified items at the best possible rates,נא למלא את הסעיפים המפורטים בשיעורים הטובים ביותר האפשריים
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,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.,/ סוחר / סוכן / שותפים / משווק עמלת מפיץ הצד שלישי שמוכר את המוצרים עבור חברות בועדה.
@@ -2072,7 +2055,7 @@
 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 +14,This is an example website auto-generated from ERPNext,זה אתר דוגמא שנוצר אוטומטית מERPNext
+apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,זה אתר דוגמא שנוצר אוטומטית מERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,טווח הזדקנות 1
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
@@ -2099,8 +2082,8 @@
 DocType: Purchase Receipt Item,Recd Quantity,כמות Recd
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +54,Fee Records Created - {0},רשומות דמי נוצר - {0}
 DocType: Asset Category Account,Asset Category Account,חשבון קטגורית נכסים
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +103,Cannot produce more Item {0} than Sales Order quantity {1},לא יכול לייצר יותר פריט {0} מאשר כמות להזמין מכירות {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Stock Entry {0} is not submitted,מניית כניסת {0} לא הוגשה
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},לא יכול לייצר יותר פריט {0} מאשר כמות להזמין מכירות {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +505,Stock Entry {0} is not submitted,מניית כניסת {0} לא הוגשה
 DocType: Payment Reconciliation,Bank / Cash Account,חשבון בנק / מזומנים
 DocType: Tax Rule,Billing City,עיר חיוב
 DocType: Global Defaults,Hide Currency Symbol,הסתר סמל מטבע
@@ -2126,15 +2109,15 @@
 DocType: Purchase Receipt,Time at which materials were received,זמן שבו חומרים שהתקבלו
 DocType: Stock Ledger Entry,Outgoing Rate,דרג יוצא
 apps/erpnext/erpnext/config/hr.py +176,Organization branch master.,אדון סניף ארגון.
-apps/erpnext/erpnext/controllers/accounts_controller.py +273, or ,או
+apps/erpnext/erpnext/controllers/accounts_controller.py +276, 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 +203,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,# השורה {0}: תנועת היומן {1} אין חשבון {2} או כבר מתאים נגד בשובר אחר
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +206,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 +90,No employee for the above selected criteria OR salary slip already created,אף עובדים לקריטריונים לעיל נבחרים או תלוש משכורת כבר נוצר
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +93,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,8 +2145,8 @@
 DocType: Product Bundle,Parent Item,פריט הורה
 DocType: Account,Account Type,סוג החשבון
 DocType: Delivery Note,DN-RET-,DN-RET-
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +115,Leave Type {0} cannot be carry-forwarded,השאר סוג {0} אינו יכולים להיות מועבר-לבצע
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"תחזוקת לוח זמנים לא נוצרו עבור כל הפריטים. אנא לחץ על 'צור לוח זמנים """
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +118,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 +163,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","לשורה {0} ב {1}. כדי לכלול {2} בשיעור פריט, שורות {3} חייבים להיות כלולות גם"
@@ -2175,13 +2158,13 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +32,Disabled template must not be default template,תבנית לנכים אסור להיות תבנית ברירת המחדל
 DocType: Account,Income Account,חשבון הכנסות
 DocType: Payment Request,Amount in customer's currency,הסכום במטבע של הלקוח
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +748,Delivery,משלוח
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +742,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,פינת אחריות מפתח
 DocType: Payment Entry,Total Allocated Amount,סכום כולל שהוקצה
 DocType: Item Reorder,Material Request Type,סוג בקשת חומר
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +82,Row {0}: UOM Conversion Factor is mandatory,שורת {0}: יחידת מידת המרת פקטור הוא חובה
+apps/erpnext/erpnext/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,מרכז עלות
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,# שובר
@@ -2192,13 +2175,13 @@
 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 +90,Head of Marketing and Sales,ראש אגף השיווק ומכירות
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,מס הכנסה
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,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 +403,Please enter Item Code to get batch no,נא להזין את קוד פריט כדי לקבל אצווה לא
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +770,Please select a value for {0} quotation_to {1},אנא בחר ערך עבור {0} quotation_to {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +397,Please enter Item Code to get batch no,נא להזין את קוד פריט כדי לקבל אצווה לא
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +764,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","המיזוג אפשרי רק אם המאפיינים הבאים הם זהים בשני רשומות. האם קבוצה, סוג רוט, חברה"
@@ -2210,7 +2193,7 @@
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,לא במלאי
 DocType: Appraisal,HR User,משתמש HR
 DocType: Purchase Invoice,Taxes and Charges Deducted,מסים והיטלים שנוכה
-apps/erpnext/erpnext/hooks.py +100,Issues,נושאים
+apps/erpnext/erpnext/hooks.py +109,Issues,נושאים
 apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},מצב חייב להיות אחד {0}
 DocType: Sales Invoice,Debit To,חיוב ל
 DocType: Delivery Note,Required only for sample item.,נדרש רק עבור פריט מדגם.
@@ -2219,19 +2202,19 @@
 apps/erpnext/erpnext/accounts/party.py +345,{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 +155,Extra Large,גדול במיוחד
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,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 +507,Warning: Another {0} # {1} exists against stock entry {2},אזהרה: נוסף {0} # {1} קיימת נגד כניסת מניית {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Local,מקומי
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +508,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),הלוואות ומקדמות (נכסים)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,חייבים
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Large,גדול
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,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 +225,Total {0} ({1}),סה&quot;כ {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +224,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,שיטת הערכת ברירת מחדל
@@ -2277,7 +2260,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +173,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"חשבון הוצאות / הבדל ({0}) חייב להיות חשבון ""רווח והפסד"""
 DocType: Account,Accounts User,חשבונות משתמשים
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,מחסור
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +178,{0} {1} does not associated with {2} {3},{0} {1} אינו קשור {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +181,{0} {1} does not associated with {2} {3},{0} {1} אינו קשור {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,נוכחות לעובדי {0} כבר מסומנת
 DocType: Packing Slip,If more than one package of the same type (for print),אם חבילה אחד או יותר מאותו הסוג (להדפסה)
 DocType: Warehouse,Parent Warehouse,מחסן הורה
@@ -2296,7 +2279,7 @@
 DocType: BOM Item,Scrap %,% גרוטאות
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection","תשלום נוסף שיחולק לפי אופן יחסי על כמות פריט או סכום, בהתאם לבחירתך"
 DocType: Maintenance Visit,Purposes,מטרות
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,פריט אחד atleast יש להזין עם כמות שלילית במסמך התמורה
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Atleast one item should be entered with negative quantity in return document,פריט אחד atleast יש להזין עם כמות שלילית במסמך התמורה
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","מבצע {0} יותר מכל שעות עבודה זמינות בתחנת העבודה {1}, לשבור את הפעולה לפעולות מרובות"
 ,Requested,ביקשתי
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +83,No Remarks,אין הערות
@@ -2308,45 +2291,45 @@
 DocType: Item,Total Projected Qty,כללית המתוכננת כמות
 DocType: Monthly Distribution,Distribution Name,שם הפצה
 DocType: Course,Course Code,קוד קורס
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Quality Inspection required for Item {0},בדיקת איכות הנדרשת לפריט {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,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 +475,Please select Apply Discount On,אנא בחר החל דיסקונט ב
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +92,Salary Slip Created,שכר סליפ נוצר
+apps/erpnext/erpnext/accounts/page/pos/pos.js +464,Please select Apply Discount On,אנא בחר החל דיסקונט ב
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +95,Salary Slip Created,שכר סליפ נוצר
 DocType: Company,Default Receivable Account,חשבון חייבים ברירת מחדל
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,צור בנק כניסה לשכר הכולל ששולם לקריטריונים לעיל נבחרים
 DocType: Stock Entry,Material Transfer for Manufacture,העברת חומר לייצור
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,אחוז הנחה יכול להיות מיושם גם נגד מחיר מחירון או לכל רשימת המחיר.
 DocType: Purchase Invoice,Half-yearly,חצי שנתי
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +384,Accounting Entry for Stock,כניסה לחשבונאות במלאי
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +387,Accounting Entry for Stock,כניסה לחשבונאות במלאי
 DocType: Sales Invoice,Sales Team1,Team1 מכירות
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,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 +96,Row {0}: Completed Qty must be greater than zero.,שורת {0}: הושלמה הכמות חייבת להיות גדולה מאפס.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +120,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 +88,Row # {0}: Cannot return more than {1} for Item {2},# השורה {0}: לא יכול לחזור יותר מ {1} לפריט {2}
+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,עלילה
 DocType: Item Group,Show this slideshow at the top of the page,הצג מצגת זו בחלק העליון של הדף
 DocType: BOM,Item UOM,פריט של אוני 'מישגן
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),סכום מס לאחר סכום דיסקונט (חברת מטבע)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +147,Target warehouse is mandatory for row {0},מחסן היעד הוא חובה עבור שורת {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +141,Target warehouse is mandatory for row {0},מחסן היעד הוא חובה עבור שורת {0}
 DocType: Cheque Print Template,Primary Settings,הגדרות ראשיות
 DocType: Purchase Invoice,Select Supplier Address,כתובת ספק בחר
 DocType: Quality Inspection,Quality Inspection,איכות פיקוח
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Extra Small,קטן במיוחד
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,Warning: Material Requested Qty is less than Minimum Order Qty,אזהרה: חומר המבוקש כמות הוא פחות מלהזמין כמות מינימאלית
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +194,Account {0} is frozen,חשבון {0} הוא קפוא
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,קטן במיוחד
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +690,Warning: Material Requested Qty is less than Minimum Order Qty,אזהרה: חומר המבוקש כמות הוא פחות מלהזמין כמות מינימאלית
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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 +606,Can only make payment against unbilled {0},יכול רק לבצע את התשלום כנגד סרק {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +126,Commission rate cannot be greater than 100,שיעור עמלה לא יכול להיות גדול מ -100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +609,Can only make payment against unbilled {0},יכול רק לבצע את התשלום כנגד סרק {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,שיעור עמלה לא יכול להיות גדול מ -100
 DocType: Stock Entry,Subcontract,בקבלנות משנה
 apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,נא להזין את {0} הראשון
 DocType: Production Order Operation,Actual End Time,בפועל שעת סיום
@@ -2357,29 +2340,28 @@
 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 +158,Colour,צבע
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,צבע
 DocType: Maintenance Visit,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 מוצרים אחר
-apps/erpnext/erpnext/controllers/accounts_controller.py +469,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),מראש סה&quot;כ ({0}) נגד להזמין {1} לא יכול להיות גדול יותר מהסך כולל ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +472,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),מראש סה&quot;כ ({0}) נגד להזמין {1} לא יכול להיות גדול יותר מהסך כולל ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,בחר בחתך חודשי להפיץ בצורה לא אחידה על פני מטרות חודשים.
 DocType: Purchase Invoice Item,Valuation Rate,שערי הערכת שווי
 apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,מטבע מחירון לא נבחר
 DocType: Assessment,Results,תוצאות
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +168,Employee {0} has already applied for {1} between {2} and {3},עובד {0} כבר הגיש בקשה {1} בין {2} ו {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +175,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: Student Applicant,Father's/ Guardian 2 Email ID,אב / אפוטרופוס 2 מזהה אימייל
 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 +228,Warehouses with existing transaction can not be converted to group.,מחסן עם עסקה קיימת לא ניתן להמיר לקבוצה.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +231,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 +93,Researcher,חוקר
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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.,בדיקת איכות נכנסת.
@@ -2391,25 +2373,24 @@
 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: Sales Invoice,Advertisement,פרסומת
 DocType: Asset Category Account,Depreciation Expense Account,חשבון הוצאות פחת
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Probationary Period,תקופת ניסיון
-apps/erpnext/erpnext/hooks.py +102,Announcements,כרזות
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,תקופת ניסיון
+apps/erpnext/erpnext/hooks.py +111,Announcements,כרזות
 DocType: Customer Group,Only leaf nodes are allowed in transaction,רק צמתים עלה מותר בעסקה
 DocType: Expense Claim,Expense Approver,מאשר חשבון
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +109,Row {0}: Advance against Customer must be credit,שורת {0}: מראש נגד הלקוח חייב להיות אשראי
 apps/erpnext/erpnext/accounts/doctype/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 +16,To Datetime,לDatetime
+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/scheduling_tool/scheduling_tool.py +51,Course Schedules deleted:,קורס לוחות זמנים נמחקו:
 apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,יומנים לשמירה על סטטוס משלוח SMS
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,פעילויות ממתינות ל
+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 +127,Please enter relieving date.,נא להזין את הקלת מועד.
-apps/erpnext/erpnext/controllers/trends.py +145,Amt,AMT
+apps/erpnext/erpnext/controllers/trends.py +149,Amt,AMT
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,Only Leave Applications with status 'Approved' can be submitted,השאר רק יישומים עם מעמד 'מאושר' ניתן להגיש
 apps/erpnext/erpnext/utilities/doctype/address/address.py +26,Address Title is mandatory.,כותרת כתובת היא חובה.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"הזן את השם של מסע פרסום, אם המקור של החקירה הוא קמפיין"
@@ -2427,10 +2408,10 @@
 apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1},לא ניתן למצוא שער חליפין עבור {0} {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,יום חצי מארק
 DocType: Sales Invoice,Sales Team,צוות מכירות
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Duplicate entry,כניסה כפולה
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,כניסה כפולה
 DocType: Program Enrollment Tool,Get Students,קבל סטודנטים
 DocType: Serial No,Under Warranty,במסגרת אחריות
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +490,[Error],[שגיאה]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +484,[Error],[שגיאה]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,במילים יהיו גלוי לאחר שתשמרו את הזמנת המכירות.
 ,Employee Birthday,עובד יום הולדת
 apps/erpnext/erpnext/controllers/status_updater.py +175,Limit Crossed,הגבל Crossed
@@ -2449,22 +2430,22 @@
 ,Issued Items Against Production Order,פריטים שהוצאו נגד להזמין הפקה
 DocType: Pricing Rule,Purchase Manager,מנהל רכש
 DocType: Target Detail,Target Detail,פרט היעד
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +25,All Jobs,כל הצעות העבודה
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,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 +323,Amount {0} {1} {2} {3},סכום {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,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: Supplier,Credit Limit,מגבלת אשראי
 DocType: Production Plan Sales Order,Salse Order Date,תאריך להזמין Salse
 DocType: Salary Component,Salary Component,מרכיב השכר
-apps/erpnext/erpnext/accounts/utils.py +372,Payment Entries {0} are un-linked,פוסט תשלומים {0} הם בלתי צמודים
+apps/erpnext/erpnext/accounts/utils.py +449,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 +497,Material Requests {0} created,בקשות חומר {0} נוצרו
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +498,Material Requests {0} created,בקשות חומר {0} נוצרו
 apps/erpnext/erpnext/config/selling.py +154,Template of terms or contract.,תבנית של מונחים או חוזה.
 DocType: Purchase Invoice,Address and Contact,כתובת ולתקשר
 DocType: Cheque Print Template,Is Account Payable,האם חשבון זכאי
@@ -2502,7 +2483,7 @@
 DocType: Serial No,Warranty / AMC Details,אחריות / AMC פרטים
 DocType: Journal Entry,User Remark,הערה משתמש
 DocType: Lead,Market Segment,פלח שוק
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +848,Paid Amount cannot be greater than total negative outstanding amount {0},הסכום ששולם לא יכול להיות גדול מ מלוא יתרת חוב שלילי {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +859,Paid Amount cannot be greater than total negative outstanding amount {0},הסכום ששולם לא יכול להיות גדול מ מלוא יתרת חוב שלילי {0}
 DocType: Employee Internal Work History,Employee Internal Work History,העובד פנימי היסטוריה עבודה
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +233,Closing (Dr),"סגירה (ד""ר)"
 DocType: Cheque Print Template,Cheque Size,גודל מחאה
@@ -2523,7 +2504,7 @@
 ,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 +555,'Update Stock' cannot be checked for fixed asset sale,&#39;עדכון מאגר&#39; לא ניתן לבדוק למכירת נכס קבועה
+apps/erpnext/erpnext/controllers/accounts_controller.py +558,'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} בוטלה או נעצרה
@@ -2533,15 +2514,15 @@
 DocType: Sales Order,Fully Delivered,נמסר באופן מלא
 DocType: Lead,Lower Income,הכנסה נמוכה
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","ראש החשבון תחת אחריות, שבו רווח / הפסד יהיה להזמין"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +166,Source and target warehouse cannot be same for row {0},מקור ומחסן היעד אינו יכולים להיות זהים לשורה {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","חשבון הבדל חייב להיות חשבון סוג הנכס / התחייבות, מאז מניית הפיוס הזה הוא כניסת פתיחה"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +81,Purchase Order number required for Item {0},לרכוש מספר ההזמנה נדרש לפריט {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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/purchase_receipt/purchase_receipt.py +82,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 +17,Cannot change status as student {0} is linked with student application {1},לא ניתן לשנות את מצב כמו סטודנט {0} הוא מקושר עם יישום סטודנט {1}
+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: Timesheet,"List of employee which has ""Salary Slip Based on Timesheet"" is enabled in salary structure.",רשימה של עובד שיש לו &quot;תלוש משכורת בהתבסס על גליון&quot; מופעלת במבנה השכר.
 DocType: Asset,Fully Depreciated,לגמרי מופחת
 ,Stock Projected Qty,המניה צפויה כמות
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Customer {0} does not belong to project {1},לקוח {0} אינו שייכים לפרויקט {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,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,אין ו אצווה סידורי
@@ -2553,7 +2534,7 @@
 DocType: Purchase Invoice,Purchase Taxes and Charges,לרכוש מסים והיטלים
 ,Qty to Receive,כמות לקבלת
 DocType: Leave Block List,Leave Block List Allowed,השאר בלוק רשימת מחמד
-apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +55,All Warehouses,מחסן כל
+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 +105,Credit To account must be a Balance Sheet account,אשראי לחשבון חייב להיות חשבון מאזן
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,כל סוגי הספק
@@ -2565,10 +2546,10 @@
 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,הפוך שכר Slip
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +26,Browse BOM,העיון BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,העיון BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,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 Year,Academic Year,שנה אקדמית
+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
 DocType: Appraisal,Appraisal,הערכה
@@ -2576,12 +2557,12 @@
 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 +197,Leave approver must be one of {0},השאר מאשר חייב להיות האחד {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,Leave approver must be one of {0},השאר מאשר חייב להיות האחד {0}
 DocType: Hub Settings,Seller Email,"דוא""ל מוכר"
 DocType: Project,Total Purchase Cost (via Purchase Invoice),עלות רכישה כוללת (באמצעות רכישת חשבונית)
 DocType: Workstation Working Hour,Start Time,זמן התחלה
 DocType: Item Price,Bulk Import Help,עזרה יבוא גורפת
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +256,Select Quantity,כמות בחר
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +257,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,הודעה נשלחה
@@ -2617,7 +2598,7 @@
 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 +138,Wire Transfer,העברה בנקאית
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,העברה בנקאית
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,סמן הכל
 DocType: Sales Order,Recurring Order,להזמין חוזר
 DocType: Company,Default Income Account,חשבון הכנסות ברירת מחדל
@@ -2629,21 +2610,19 @@
 ,Welcome to ERPNext,ברוכים הבאים לERPNext
 apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,להוביל להצעת המחיר
 DocType: Lead,From Customer,מלקוחות
-apps/erpnext/erpnext/demo/setup_data.py +357,Calls,שיחות
+apps/erpnext/erpnext/demo/setup/setup_data.py +300,Calls,שיחות
 DocType: Project,Total Costing Amount (via Time Logs),הסכום כולל תמחיר (דרך זמן יומנים)
 DocType: Purchase Order Item Supplied,Stock UOM,המניה של אוני 'מישגן
-apps/erpnext/erpnext/stock/doctype/item/item.py +466,"As there are existing transactions for this item, \
-							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","כמו ישנם עסקות קיימות עבור פריט זה, \ אתה לא יכול לשנות את הערכים של &#39;בעל מספר סידורי&#39;, &#39;יש תצווה לא&#39;, &#39;האם פריט במלאי&#39; ו &#39;שיטת הערכה &quot;"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,Purchase Order {0} is not submitted,הזמנת רכש {0} לא תוגש
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,צפוי
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},מספר סידורי {0} אינו שייך למחסן {1}
 apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,הערה: מערכת לא תבדוק על-אספקה ועל-הזמנה לפריט {0} ככמות או כמות היא 0
 DocType: Notification Control,Quotation Message,הודעת ציטוט
 DocType: Issue,Opening Date,תאריך פתיחה
-apps/erpnext/erpnext/schools/api.py +58,Attendance has been marked successfully.,נוכחות סומנה בהצלחה.
+apps/erpnext/erpnext/schools/api.py +57,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 +136,Account Type for {0} must be {1},סוג חשבון עבור {0} חייב להיות {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +139,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,שניהם המחסן חייב להיות שייך לאותה חברה
@@ -2663,7 +2642,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,סטודנט קבוצה
 DocType: Shopping Cart Settings,Quotation Series,סדרת ציטוט
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +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 +1190,Please select customer,אנא בחר לקוח
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1193,Please select customer,אנא בחר לקוח
 DocType: C-Form,I,אני
 DocType: Company,Asset Depreciation Cost Center,מרכז עלות פחת נכסים
 DocType: Sales Order Item,Sales Order Date,תאריך הזמנת מכירות
@@ -2693,7 +2672,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,איפה פעולות ייצור מתבצעות.
 DocType: Asset Movement,Source Warehouse,מחסן מקור
 DocType: Installation Note,Installation Date,התקנת תאריך
-apps/erpnext/erpnext/controllers/accounts_controller.py +534,Row #{0}: Asset {1} does not belong to company {2},# השורה {0}: Asset {1} לא שייך לחברת {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +537,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,משתמש מכירות
@@ -2710,12 +2689,12 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,מועד הפרישה חייב להיות גדול מ תאריך ההצטרפות
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +49,There were errors while scheduling course on :,היו שגיאות בעת תזמון כמובן על:
 DocType: Sales Invoice,Against Income Account,נגד חשבון הכנסות
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +87,{0}% Delivered,{0}% נמסר
+apps/erpnext/erpnext/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,Transporter מידע
-apps/erpnext/erpnext/accounts/utils.py +379,Please set default {0} in Company {1},אנא קבע את ברירת המחדל {0} ב החברה {1}
+apps/erpnext/erpnext/accounts/utils.py +456,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,לרכוש פריט להזמין מסופק
@@ -2728,7 +2707,7 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM שערי
 DocType: Asset,Journal Entry for Scrap,תנועת יומן עבור גרוטאות
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,אנא למשוך פריטים מתעודת המשלוח
-apps/erpnext/erpnext/accounts/utils.py +349,Journal Entries {0} are un-linked,"תנועות היומן {0} הם לא צמוד,"
+apps/erpnext/erpnext/accounts/utils.py +426,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,נא לציין מרכז העלות לעגל בחברה
@@ -2760,7 +2739,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 +29,Current Job Openings,משרות נוכחיות
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,Current Job Openings,משרות נוכחיות
 DocType: Company,Stock Adjustment Account,חשבון התאמת מלאי
 DocType: Journal Entry,Write Off,לכתוב את
 DocType: Timesheet Detail,Operation ID,מבצע זיהוי
@@ -2773,7 +2752,7 @@
 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 +850,Show tax break-up,התפרקות מס הצג
+apps/erpnext/erpnext/public/js/controllers/transaction.js +841,Show tax break-up,התפרקות מס הצג
 apps/erpnext/erpnext/accounts/party.py +308,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}, ולכן אתה לא יכול להקצות מחדש או לשנות אותה"
@@ -2786,7 +2765,7 @@
 DocType: Serial No,Out of AMC,מתוך AMC
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +80,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 +162,Please contact to the user who have Sales Master Manager {0} role,אנא צור קשר עם למשתמש שיש לי מכירות Master מנהל {0} תפקיד
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +195,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 +5,This is based on the attendance of this Student,זה מבוסס על הנוכחות של תלמיד זה
@@ -2795,12 +2774,11 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,תעודות משלוח {0} יש לבטל לפני ביטול הזמנת מכירות זה
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +75,Paid amount + Write Off Amount can not be greater than Grand Total,הסכום ששולם + לכתוב את הסכום לא יכול להיות גדול יותר מסך כולל
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,{0} is not a valid Batch Number for Item {1},{0} הוא לא מספר אצווה תקף לפריט {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +138,Note: There is not enough leave balance for Leave Type {0},הערה: אין איזון חופשה מספיק לחופשת סוג {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,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,סוג ההזדמנות
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,חברה חדשה
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,Cost Center is required for 'Profit and Loss' account {0},חשבון מרכז העלות הנדרש עבור 'רווח והפסד' {0}
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,ניתן למחוק עסקות רק על ידי היוצר של החברה
 apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,מספר שגוי של כלליים לדג'ר ערכים מצא. ייתכן שנבחרת חשבון הלא נכון בעסקה.
 DocType: Cheque Print Template,Cheque Width,רוחב המחאה
@@ -2809,7 +2787,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,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 +228,{0} '{1}' is disabled,{0} '{1}' אינו זמין
+apps/erpnext/erpnext/controllers/accounts_controller.py +231,{0} '{1}' is disabled,{0} '{1}' אינו זמין
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,קבע כלהרחיב
 DocType: Cheque Print Template,Scanned Cheque,המחאה סרוקה
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,"שלח דוא""ל אוטומטית למגעים על עסקות הגשת."
@@ -2817,8 +2795,8 @@
 DocType: Purchase Order,Customer Contact Email,דוא&quot;ל ליצירת קשר של לקוחות
 DocType: Warranty Claim,Item and Warranty Details,פרטי פריט ואחריות
 DocType: Sales Team,Contribution (%),תרומה (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"הערה: כניסת תשלום לא יצרה מאז ""מזומן או חשבון הבנק 'לא צוין"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Responsibilities,אחריות
+apps/erpnext/erpnext/controllers/accounts_controller.py +78,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,אחריות
 DocType: Expense Claim Account,Expense Claim Account,חשבון תביעת הוצאות
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,תבנית
 DocType: Sales Person,Sales Person Name,שם איש מכירות
@@ -2835,7 +2813,6 @@
 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: Timesheet,Total Hours,"סה""כ שעות"
 DocType: Journal Entry,Printing Settings,הגדרות הדפסה
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Total Debit must be equal to Total Credit. The difference is {0},חיוב כולל חייב להיות שווה לסך אשראי. ההבדל הוא {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,רכב
@@ -2848,11 +2825,11 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +71,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 +60,Intern,Intern
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,Intern
 DocType: Stock Entry,From BOM,מBOM
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +32,Basic,בסיסי
+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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"אנא לחץ על 'צור לוח זמנים """
+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 +95,Reference No is mandatory if you entered Reference Date,התייחסות לא חובה אם אתה נכנס תאריך ההפניה
@@ -2861,11 +2838,11 @@
 DocType: Salary Slip,Salary Structure,שכר מבנה
 DocType: Account,Bank,בנק
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,חברת תעופה
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +752,Issue Material,חומר נושא
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +723,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 +683,You are in offline mode. You will not be able to reload until you have network.,אתה נמצא במצב לא מקוון. אתה לא תוכל לטעון עד שיש לך רשת.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +665,You are in offline mode. You will not be able to reload until you have network.,אתה נמצא במצב לא מקוון. אתה לא תוכל לטעון עד שיש לך רשת.
 DocType: Hub Settings,Access Token,גישת אסימון
 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,מספר סידורי
@@ -2873,23 +2850,23 @@
 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 +1122,Enter value must be positive,זן הערך חייב להיות חיובי
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,All Territories,כל השטחים
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1125,Enter value must be positive,זן הערך חייב להיות חיובי
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,כל השטחים
 DocType: Purchase Invoice,Items,פריטים
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +23,Student is already enrolled.,סטודנטים כבר נרשמו.
 DocType: Fiscal Year,Year Name,שם שנה
 DocType: Process Payroll,Process Payroll,שכר תהליך
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,ישנם יותר מ חגי ימי עבודה בחודש זה.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +233,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 +96,Request for Quotations,בקשת ציטטות
+apps/erpnext/erpnext/hooks.py +104,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 +628,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',ברירת מחדל של יחידת מדידה ולריאנט &#39;{0}&#39; חייבת להיות זהה בתבנית &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',ברירת מחדל של יחידת מדידה ולריאנט &#39;{0}&#39; חייבת להיות זהה בתבנית &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,חישוב המבוסס על
 DocType: Delivery Note Item,From Warehouse,ממחסן
 DocType: Assessment,Supervisor Name,המפקח שם
@@ -2899,7 +2876,7 @@
 DocType: Account,Purchase User,משתמש רכישה
 DocType: Notification Control,Customize the Notification,התאמה אישית של ההודעה
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Cash Flow from Operations,תזרים מזומנים מפעילות שוטף
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,תבנית כתובת ברירת מחדל לא ניתן למחוק
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,תבנית כתובת ברירת מחדל לא ניתן למחוק
 DocType: Sales Invoice,Shipping Rule,כלל משלוח
 DocType: Manufacturer,Limited to 12 characters,מוגבל ל -12 תווים
 DocType: Journal Entry,Print Heading,כותרת הדפסה
@@ -2914,8 +2891,8 @@
 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/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,כך או כמות היעד או סכום היעד היא חובה
-apps/erpnext/erpnext/stock/get_item_details.py +485,No default BOM exists for Item {0},אין ברירת מחדל BOM קיימת עבור פריט {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +336,Please select Posting Date first,אנא בחר תחילה תאריך פרסום
+apps/erpnext/erpnext/stock/get_item_details.py +486,No default BOM exists for Item {0},אין ברירת מחדל BOM קיימת עבור פריט {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +326,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,מרכז עלות בעסקות קיימות לא ניתן להמיר לדג'ר
@@ -2942,19 +2919,18 @@
 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 +141,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",פריט בהמשכים {0} לא ניתן לעדכן \ באמצעות בורסת פיוס
 DocType: Scheduling Tool,Day,יְוֹם
 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 +122,You are not authorized to approve leaves on Block Dates,אתה לא מורשה לאשר עלים בתאריכי הבלוק
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,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: Student Applicant,AP.,AP.
 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 +639,Point of Sale,Point of Sale
+apps/erpnext/erpnext/accounts/page/pos/pos.js +634,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,מס
@@ -2964,14 +2940,13 @@
 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 +373,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 Entry,Update Rate and Availability,עדכון תעריף וזמינות
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,אחוז מותר לך לקבל או למסור יותר נגד כל הכמות המוזמנת. לדוגמא: אם יש לך הורה 100 יחידות. והפרשה שלך הוא 10% אז אתה רשאי לקבל 110 יחידות.
 DocType: POS Profile,Customer Group,קבוצת לקוחות
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,Expense account is mandatory for item {0},חשבון הוצאות הוא חובה עבור פריט {0}
 DocType: Item,Website Description,תיאור אתר
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date must be on or after today,תאריך הפחת הבא חייב להיות על או לאחר היום
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,שינוי נטו בהון עצמי
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +145,Please cancel Purchase Invoice {0} first,אנא בטל חשבונית רכישת {0} ראשון
 DocType: Serial No,AMC Expiry Date,תאריך תפוגה AMC
@@ -2979,16 +2954,16 @@
 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 +330,Transaction reference no {0} dated {1},התייחסות עסקה לא {0} מתאריך {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Transaction reference no {0} dated {1},התייחסות עסקה לא {0} מתאריך {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,אין שום דבר כדי לערוך.
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,Summary for this month and pending activities,סיכום לחודש זה ופעילויות תלויות ועומדות
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,סיכום לחודש זה ופעילויות תלויות ועומדות
 DocType: Customer Group,Customer Group Name,שם קבוצת הלקוחות
 apps/erpnext/erpnext/public/js/financial_statements.js +54,Cash Flow Statement,דוח על תזרימי המזומנים
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Please remove this Invoice {0} from C-Form {1},אנא הסר חשבונית זו {0} מC-טופס {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Please remove this Invoice {0} from C-Form {1},אנא הסר חשבונית זו {0} מC-טופס {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,אנא בחר לשאת קדימה אם אתה גם רוצה לכלול האיזון של שנת כספים הקודמת משאיר לשנה הפיסקלית
 DocType: GL Entry,Against Voucher Type,נגד סוג השובר
 DocType: Item,Attributes,תכונות
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +644,Get Items,קבל פריטים
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +623,Get Items,קבל פריטים
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +210,Please enter Write Off Account,נא להזין לכתוב את החשבון
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,התאריך אחרון סדר
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +41,Account {0} does not belongs to company {1},חשבון {0} אינו שייך לחברת {1}
@@ -3000,32 +2975,32 @@
 DocType: Leave Type,Is Encash,האם encash
 DocType: Purchase Invoice,Mobile No,נייד לא
 DocType: Leave Allocation,New Leaves Allocated,עלים חדשים שהוקצו
-apps/erpnext/erpnext/controllers/trends.py +265,Project-wise data is not available for Quotation,נתוני פרויקט-חכם אינם זמינים להצעת מחיר
+apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,נתוני פרויקט-חכם אינם זמינים להצעת מחיר
 DocType: Project,Expected End Date,תאריך סיום צפוי
 DocType: Budget Account,Budget Amount,סכום תקציב
 DocType: Appraisal Template,Appraisal Template Title,הערכת תבנית כותרת
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,Commercial,מסחרי
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,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 +648,Row {0}# Account must be of type 'Fixed Asset',שורה {0} החשבון # צריך להיות מסוג &#39;קבוע נכסים&#39;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Row {0}# Account must be of type 'Fixed Asset',שורה {0} החשבון # צריך להיות מסוג &#39;קבוע נכסים&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,מתוך כמות
 apps/erpnext/erpnext/config/accounts.py +278,Rules to calculate shipping amount for a sale,כללים לחישוב סכום משלוח למכירה
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +30,Series is mandatory,סדרה היא חובה
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +50,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}
 DocType: Leave Allocation,Unused leaves,עלים שאינם בשימוש
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Cr,Cr
 DocType: Tax Rule,Billing State,מדינת חיוב
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +250,Transfer,העברה
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +187,{0} {1} does not associated with Party Account {2},{0} {1} אינו משויך לחשבון המפלגה {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,Fetch exploded BOM (including sub-assemblies),תביא BOM התפוצץ (כולל תת מכלולים)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +254,Transfer,העברה
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +190,{0} {1} does not associated with Party Account {2},{0} {1} אינו משויך לחשבון המפלגה {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +796,Fetch exploded BOM (including sub-assemblies),תביא BOM התפוצץ (כולל תת מכלולים)
 DocType: Authorization Rule,Applicable To (Employee),כדי ישים (עובד)
-apps/erpnext/erpnext/controllers/accounts_controller.py +115,Due Date is mandatory,תאריך היעד הוא חובה
+apps/erpnext/erpnext/controllers/accounts_controller.py +118,Due Date is mandatory,תאריך היעד הוא חובה
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,תוספת לתכונה {0} לא יכולה להיות 0
 DocType: Journal Entry,Pay To / Recd From,לשלם ל/ Recd מ
 DocType: Naming Series,Setup Series,סדרת התקנה
@@ -3039,7 +3014,7 @@
 DocType: Company,Retail,Retail
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +120,Customer {0} does not exist,לקוח {0} אינו קיים
 DocType: Attendance,Absent,נעדר
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +587,Product Bundle,Bundle מוצר
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Product Bundle,Bundle מוצר
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Invalid reference {1},שורת {0}: התייחסות לא חוקית {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,לרכוש תבנית מסים והיטלים
 DocType: Upload Attendance,Download Template,תבנית להורדה
@@ -3049,7 +3024,7 @@
 DocType: Purchase Order Item Supplied,Raw Material Item Code,קוד פריט חומר הגלם
 DocType: Journal Entry,Write Off Based On,לכתוב את מבוסס על
 DocType: Stock Settings,Show Barcode Field,הצג ברקוד שדה
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +742,Send Supplier Emails,שלח הודעות דוא&quot;ל ספק
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +708,Send Supplier Emails,שלח הודעות דוא&quot;ל ספק
 apps/erpnext/erpnext/config/stock.py +122,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,היום של התאריך הבא חזרו על יום בחודש חייב להיות שווה
@@ -3059,9 +3034,9 @@
 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/accounts/doctype/gl_entry/gl_entry.py +77,Account {0} cannot be a Group,חשבון {0} אינו יכול להיות קבוצה
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} cannot be a Group,חשבון {0} אינו יכול להיות קבוצה
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +31,Optional. This setting will be used to filter in various transactions.,אופציונאלי. הגדרה זו תשמש לסינון בעסקות שונות.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +107,Negative Valuation Rate is not allowed,שערי הערכה שליליים אינו מותר
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,שערי הערכה שליליים אינו מותר
 DocType: Holiday List,Weekly Off,Off השבועי
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","לדוגמה: 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +39,Provisional Profit / Loss (Credit),רווח / הפסד זמני (אשראי)
@@ -3075,16 +3050,16 @@
 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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: מרכז העלות הוא חובה עבור פריט {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +626,Get Items from Product Bundle,קבל פריטים מחבילת מוצרים
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +605,Get Items from Product Bundle,קבל פריטים מחבילת מוצרים
 DocType: Asset,Straight Line,קו ישר
 DocType: Project User,Project User,משתמש פרויקט
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} is inactive,חשבון {0} אינו פעיל
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} is inactive,חשבון {0} אינו פעיל
 DocType: GL Entry,Is Advance,האם Advance
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,נוכחות מתאריך והנוכחות עד כה היא חובה
 apps/erpnext/erpnext/controllers/buying_controller.py +148,Please enter 'Is Subcontracted' as Yes or No,"נא להזין את 'האם קבלן ""ככן או לא"
 DocType: Sales Team,Contact No.,מס 'לתקשר
 DocType: Bank Reconciliation,Payment Entries,פוסט תשלום
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,'Profit and Loss' type account {0} not allowed in Opening Entry,"""רווח והפסד"" חשבון סוג {0} אסור בפתיחת כניסה"
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +71,'Profit and Loss' type account {0} not allowed in Opening Entry,"""רווח והפסד"" חשבון סוג {0} אסור בפתיחת כניסה"
 DocType: Program Enrollment Tool,Get Students From,קבל מבית הספר
 DocType: Hub Settings,Seller Country,מדינה המוכרת
 apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,לפרסם פריטים באתר
@@ -3102,7 +3077,7 @@
 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 +558,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","# שורה {0}: Asset {1} לא ניתן להגיש, זה כבר {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +561,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","# שורה {0}: Asset {1} לא ניתן להגיש, זה כבר {2}"
 DocType: Tax Rule,Billing Country,ארץ חיוב
 DocType: Production Order,Expected Delivery Date,תאריך אספקה צפוי
 apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,חיוב אשראי לא שווה {0} # {1}. ההבדל הוא {2}.
@@ -3115,13 +3090,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +202,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: Sales Order,% Amount Billed,% סכום החיוב
+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 +117,No Item with Serial No {0},אין פריט עם מספר סידורי {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,הודעות פתוחות
+DocType: Email Digest,Open Notifications,הודעות פתוחות
 DocType: Payment Entry,Difference Amount (Company Currency),סכום פרש (חברת מטבע)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,הוצאות ישירות
 apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
@@ -3129,7 +3104,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,הכנסות מלקוחות חדשות
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,הוצאות נסיעה
 DocType: Maintenance Visit,Breakdown,התפלגות
-apps/erpnext/erpnext/controllers/accounts_controller.py +634,Account: {0} with currency: {1} can not be selected,חשבון: {0} עם מטבע: {1} לא ניתן לבחור
+apps/erpnext/erpnext/controllers/accounts_controller.py +637,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}
 DocType: Program Enrollment Tool,Student Applicants,מועמדים סטודנטים
@@ -3137,15 +3112,15 @@
 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 +56,Probation,מבחן
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Probation,מבחן
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,מרכיבי שכר
 DocType: Program Enrollment Tool,New Academic Year,חדש שנה אקדמית
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Payment of salary for the month {0} and year {1},תשלום השכר עבור החודש {0} ושנה {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Payment of salary for the month {0} and year {1},תשלום השכר עבור החודש {0} ושנה {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,הכנס אוטומטי שיעור מחירון אם חסר
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,"סכום ששולם סה""כ"
 DocType: Production Order Item,Transferred Qty,כמות שהועברה
 apps/erpnext/erpnext/config/learn.py +11,Navigating,ניווט
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Planning,תכנון
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,תכנון
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,הפיק
 DocType: Project,Total Billing Amount (via Time Logs),סכום חיוב כולל (דרך זמן יומנים)
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,We sell this Item,אנחנו מוכרים פריט זה
@@ -3158,7 +3133,6 @@
 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/accounts/page/pos/pos.js +1376,Sales invoice submitted sucessfully.,חשבונית מכירות הגישה בהצלחה.
 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}
 DocType: Assessment Result,Student Name,שם תלמיד
@@ -3182,9 +3156,9 @@
 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 +99,All Customer Groups,בכל קבוצות הלקוחות
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +78,Accumulated Monthly,מצטבר חודשי
-apps/erpnext/erpnext/controllers/accounts_controller.py +595,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} הוא חובה. אולי שיא המרה לא נוצר עבור {1} ל {2}.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,בכל קבוצות הלקוחות
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +81,Accumulated Monthly,מצטבר חודשי
+apps/erpnext/erpnext/controllers/accounts_controller.py +598,{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} לא קיימת
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),מחיר מחירון שיעור (חברת מטבע)
@@ -3193,7 +3167,7 @@
 DocType: Address,Preferred Billing Address,כתובת חיוב מועדפת
 DocType: Program,Courses,קורסים
 DocType: Monthly Distribution Percentage,Percentage Allocation,אחוז ההקצאה
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Secretary,מזכיר
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,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,קנייה
@@ -3201,24 +3175,22 @@
 DocType: POS Profile,Apply Discount On,החל דיסקונט ב
 ,Reqd By Date,Reqd לפי תאריך
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Creditors,נושים
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,# השורה {0}: מספר סידורי הוא חובה
+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,פריט Detail המס וייז
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,קיצור המכון
 ,Item-wise Price List Rate,שערי רשימת פריט המחיר חכם
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +859,Supplier Quotation,הצעת מחיר של ספק
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +838,Supplier Quotation,הצעת מחיר של ספק
 DocType: Quotation,In Words will be visible once you save the Quotation.,במילים יהיו גלוי לאחר שתשמרו את הצעת המחיר.
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +7,Collect Fees,לגבות דמי
+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}
 DocType: Lead,Add to calendar on this date,הוסף ללוח שנה בתאריך זה
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,כללים להוספת עלויות משלוח.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,אירועים קרובים
 DocType: Item,Opening Stock,מאגר פתיחה
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,הלקוח נדרש
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} הוא חובה עבור שבות
 DocType: Purchase Order,To Receive,לקבל
 apps/erpnext/erpnext/public/js/setup_wizard.js +195,user@example.com,user@example.com
-DocType: Email Digest,Income / Expense,הכנסות / הוצאות
 DocType: Employee,Personal Email,"דוא""ל אישי"
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,סך שונה
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","אם מאופשר, המערכת תפרסם רישומים חשבונאיים עבור המלאי באופן אוטומטי."
@@ -3229,11 +3201,11 @@
 DocType: Customer,From Lead,מליד
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,הזמנות שוחררו לייצור.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,בחר שנת כספים ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,POS Profile required to make POS Entry,פרופיל קופה הנדרש כדי להפוך את קופה הכניסה
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +509,POS Profile required to make POS Entry,פרופיל קופה הנדרש כדי להפוך את קופה הכניסה
 DocType: Program Enrollment Tool,Enroll Students,רשם תלמידים
 DocType: Hub Settings,Name Token,שם אסימון
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,מכירה סטנדרטית
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Atleast one warehouse is mandatory,Atleast מחסן אחד הוא חובה
+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 +330,{0} against Sales Invoice {1},{0} נגד מכירות חשבונית {1}
@@ -3259,7 +3231,7 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Amt מצטיין
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,קבוצה חכמה פריט יעדים שנקבעו לאיש מכירות זה.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],מניות הקפאת Older Than [ימים]
-apps/erpnext/erpnext/controllers/accounts_controller.py +528,Row #{0}: Asset is mandatory for fixed asset purchase/sale,# השורה {0}: לנכסי לקוחות חובה לרכוש נכס קבוע / מכירה
+apps/erpnext/erpnext/controllers/accounts_controller.py +531,Row #{0}: Asset is mandatory for fixed asset purchase/sale,# השורה {0}: לנכסי לקוחות חובה לרכוש נכס קבוע / מכירה
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","אם שניים או יותר כללי תמחור נמצאים בהתבסס על התנאים לעיל, עדיפות מיושם. עדיפות היא מספר בין 0 ל 20, וערך ברירת מחדל הוא אפס (ריק). מספר גבוה יותר פירושו הם הקובעים אם יש כללי תמחור מרובים עם אותם תנאים."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,שנת כספים: {0} אינו קיים
 DocType: Currency Exchange,To Currency,למטבע
@@ -3276,14 +3248,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,הון פרטי
 DocType: Maintenance Visit,Customer Feedback,לקוחות משוב
 DocType: Account,Expense,חשבון
-DocType: Sales Invoice,Exhibition,תערוכה
 apps/erpnext/erpnext/utilities/doctype/address/address.py +77,"Company is mandatory, as it is your company address","החברה היא חובה, כפי שהוא כתובת החברה שלך"
 DocType: Item Attribute,From Range,מטווח
 apps/erpnext/erpnext/stock/utils.py +99,Item {0} ignored since it is not a stock item,פריט {0} התעלם כן הוא לא פריט מניות
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +34,Submit this Production Order for further processing.,שלח הזמנת ייצור זה לעיבוד נוסף.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","שלא להחיל כלל תמחור בעסקה מסוימת, צריכים להיות נכה כל כללי התמחור הישימים."
 DocType: Company,Domain,תחום
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Jobs,מקומות תעסוקה
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,מקומות תעסוקה
 ,Sales Order Trends,מגמות להזמין מכירות
 DocType: Employee,Held On,במוחזק
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,פריט ייצור
@@ -3292,16 +3263,16 @@
 DocType: Stock Entry Detail,Additional Cost,עלות נוספת
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,תאריך הפיננסי סוף השנה
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","לא לסנן מבוססים על השובר לא, אם מקובצים לפי שובר"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +763,Make Supplier Quotation,הפוך הצעת מחיר של ספק
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,Make Supplier Quotation,הפוך הצעת מחיר של ספק
 DocType: Quality Inspection,Incoming,נכנסים
 DocType: BOM,Materials Required (Exploded),חומרים דרושים (התפוצצו)
 apps/erpnext/erpnext/public/js/setup_wizard.js +185,"Add users to your organization, other than yourself","הוסף משתמשים לארגון שלך, מלבד את עצמך"
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,Row # {0}: Serial No {1} does not match with {2} {3},# השורה {0}: סידורי לא {1} אינו תואם עם {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +42,Casual Leave,חופשה מזדמנת
+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,חופשה מזדמנת
 DocType: Batch,Batch ID,זיהוי אצווה
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,Note: {0},הערה: {0}
 ,Delivery Note Trends,מגמות תעודת משלוח
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +103,This Week's Summary,סיכום זה של השבוע
+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} ניתן לעדכן רק דרך עסקות במלאי
 DocType: Student Group Creation Tool,Get Courses,קבל קורסים
 DocType: GL Entry,Party,מפלגה
@@ -3311,7 +3282,7 @@
 DocType: Request for Quotation Item,Request for Quotation Item,בקשה להצעת מחיר הפריט
 DocType: Purchase Order,To Bill,להצעת החוק
 DocType: Material Request,% Ordered,% מסודר
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Piecework,עֲבוֹדָה בְּקַבּלָנוּת
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Piecework,עֲבוֹדָה בְּקַבּלָנוּת
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,ממוצע. שיעור קנייה
 DocType: Task,Actual Time (in Hours),זמן בפועל (בשעות)
 DocType: Employee,History In Company,ההיסטוריה בחברה
@@ -3328,7 +3299,7 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +350,{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 +162,Black,שחור
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,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} פריטים המיוצרים
@@ -3339,12 +3310,12 @@
 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),תביעה סה&quot;כ הוצאות (באמצעות תביעת הוצאות)
-apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +69,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,מארק בהעדר
 DocType: Journal Entry Account,Exchange Rate,שער חליפין
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Sales Order {0} is not submitted,להזמין מכירות {0} לא יוגש
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +527,Sales Order {0} is not submitted,להזמין מכירות {0} לא יוגש
 DocType: Homepage,Tag Line,קו תג
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +857,Add items from,הוספת פריטים מ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +836,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: Cheque Print Template,Regular,רגיל
 DocType: BOM,Last Purchase Rate,שער רכישה אחרונה
@@ -3364,9 +3335,9 @@
 DocType: Assessment,Supervisor,מְפַקֵחַ
 ,Available Stock for Packing Items,מלאי זמין לפריטי אריזה
 DocType: Item Variant,Item Variant,פריט Variant
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,הגדרת תבנית כתובת זו כברירת מחדל כפי שאין ברירת מחדל אחרת
+apps/erpnext/erpnext/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 +74,Quality Management,ניהול איכות
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,ניהול איכות
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,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,העובד חיצוני היסטוריה עבודה
@@ -3388,7 +3359,7 @@
 DocType: Student,Student Email ID,מזהה אימייל סטודנטים
 DocType: Employee,Notice (days),הודעה (ימים)
 DocType: Tax Rule,Sales Tax Template,תבנית מס מכירות
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1520,Select items to save the invoice,בחר פריטים כדי לשמור את החשבונית
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1544,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}
@@ -3422,17 +3393,16 @@
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,חשבון למחסן (מלאי תמידי) ייווצר תחת חשבון זה.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +119,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,מחסן לא ניתן למחוק ככניסת פנקס המניות קיימת למחסן זה.
 DocType: Company,Distribution,הפצה
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +8,Amount Paid,הסכום ששולם
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Project Manager,מנהל פרויקט
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,הסכום ששולם
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,מנהל פרויקט
 ,Quoted Item Comparison,פריט מצוטט השוואה
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Dispatch,שדר
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,שדר
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,הנחה מרבית המוותרת עבור פריט: {0} היא% {1}
 apps/erpnext/erpnext/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.,תפקיד שמותר להגיש עסקות חריגות ממסגרות אשראי שנקבע.
-DocType: Sales Invoice,Supplier Reference,הפניה ספק
-apps/erpnext/erpnext/accounts/page/pos/pos.js +844,"Master data syncing, it might take some time","סינכרון נתוני אב, זה עלול לקחת קצת זמן"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +832,"Master data syncing, it might take some time","סינכרון נתוני אב, זה עלול לקחת קצת זמן"
 DocType: Item,Material Issue,נושא מהותי
 DocType: Hub Settings,Seller Description,תיאור מוכר
 DocType: Employee Education,Qualification,הסמכה
@@ -3453,7 +3423,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},לתאריך צריך להיות בתוך שנת הכספים. בהנחה לתאריך = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","כאן אתה יכול לשמור על גובה, משקל, אלרגיות, בעיות רפואיות וכו '"
 DocType: Leave Block List,Applies to Company,חל על חברה
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +197,Cannot cancel because submitted Stock Entry {0} exists,לא ניתן לבטל עקב נתון מלאי {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +198,Cannot cancel because submitted Stock Entry {0} exists,לא ניתן לבטל עקב נתון מלאי {0}
 DocType: Purchase Invoice,In Words,במילים
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,Today is {0}'s birthday!,היום הוא {0} 's יום הולדת!
 DocType: Production Planning Tool,Material Request For Warehouse,בקשת חומר למחסן
@@ -3463,14 +3433,14 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,השנה שלך הפיננסית מתחילה ב
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,פחת נכסים יתרה
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +319,Amount {0} {1} transferred from {2} to {3},סכום {0} {1} הועברה מבית {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +322,Amount {0} {1} transferred from {2} to {3},סכום {0} {1} הועברה מבית {2} {3}
 DocType: Sales Invoice,Get Advances Received,קבלו התקבלו מקדמות
 DocType: Email Digest,Add/Remove Recipients,הוספה / הסרה של מקבלי
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +432,Transaction not allowed against stopped Production Order {0},עסקה לא אפשרה נגד הפקה הפסיקה להזמין {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +437,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 +143,Join,לְהִצְטַרֵף
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,מחסור כמות
-apps/erpnext/erpnext/stock/doctype/item/item.py +652,Item variant {0} exists with same attributes,גרסת פריט {0} קיימת עימן תכונות
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,גרסת פריט {0} קיימת עימן תכונות
 DocType: 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,'עד תאריך' נדרש
@@ -3478,12 +3448,12 @@
 DocType: Sales Invoice Item,Sales Order Item,פריט להזמין מכירות
 DocType: Salary Slip,Payment Days,ימי תשלום
 DocType: Customer,Dormant,רָדוּם
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +212,Warehouses with child nodes cannot be converted to ledger,מחסן עם בלוטות ילד לא ניתן להמיר לדג&#39;ר
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +215,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 +866,It is needed to fetch Item Details.,הוא צריך את זה כדי להביא פרטי פריט.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +857,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} כבר קיבל
@@ -3493,14 +3463,14 @@
 DocType: Expense Claim,Total Claimed Amount,"סכום הנתבע סה""כ"
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,הזדמנויות פוטנציאליות למכירה.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,Invalid {0},לא חוקי {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Sick Leave,חופשת מחלה
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,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,חנויות כלבו
 DocType: Warehouse,PIN,פִּין
 DocType: Sales Invoice,Base Change Amount (Company Currency),שנת סכום בסיס (מטבע חברה)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +313,No accounting entries for the following warehouses,אין רישומים חשבונאיים למחסנים הבאים
-apps/erpnext/erpnext/projects/doctype/project/project.js +102,Save the document first.,שמור את המסמך ראשון.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +314,No accounting entries for the following warehouses,אין רישומים חשבונאיים למחסנים הבאים
+apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,שמור את המסמך ראשון.
 DocType: Account,Chargeable,נִטעָן
 DocType: Company,Change Abbreviation,קיצור שינוי
 DocType: Expense Claim Detail,Expense Date,תאריך הוצאה
@@ -3515,7 +3485,7 @@
 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 +87,Business Development Manager,מנהל פיתוח עסקי
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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,בכלל לדג'ר
@@ -3525,8 +3495,8 @@
 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 +940,Please select {0} first,אנא בחר {0} ראשון
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +749,Batch {0} of Item {1} has expired.,אצווה {0} של פריט {1} פג.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +953,Please select {0} first,אנא בחר {0} ראשון
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +757,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,סיכום ביניים
@@ -3543,8 +3513,8 @@
 {% 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 +92,Warehouse not found in the system,מחסן לא נמצא במערכת
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +106,This Month's Summary,סיכום של החודש
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,מחסן לא נמצא במערכת
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,סיכום של החודש
 DocType: Quality Inspection Reading,Quality Inspection Reading,איכות פיקוח קריאה
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`מניות הקפאה ישן יותר Than` צריך להיות קטן יותר מאשר% d ימים.
 DocType: Tax Rule,Purchase Tax Template,מס רכישת תבנית
@@ -3554,21 +3524,21 @@
 DocType: Item Customer Detail,Ref Code,"נ""צ קוד"
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,רשומות עובדים.
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Please set Next Depreciation Date,אנא קבע את תאריך פחת הבא
-DocType: Payment Gateway,Payment Gateway,תשלום Gateway
 DocType: HR Settings,Payroll Settings,הגדרות שכר
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,התאם חשבוניות ותשלומים הלא צמוד.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,להזמין מקום
+DocType: Email Digest,New Purchase Orders,הזמנות רכש חדשות
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,שורש לא יכול להיות מרכז עלות הורה
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Brand...,מותג בחר ...
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,פחת שנצבר כמו על
 DocType: Sales Invoice,C-Form Applicable,C-טופס ישים
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,Operation Time must be greater than 0 for Operation {0},מבצע זמן חייב להיות גדול מ 0 למבצע {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +380,Operation Time must be greater than 0 for Operation {0},מבצע זמן חייב להיות גדול מ 0 למבצע {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +170,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 (ח)
 DocType: Program,Program Abbreviation,קיצור התוכנית
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,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: Appraisal,Start Date,תאריך ההתחלה
@@ -3583,7 +3553,7 @@
 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,הסר פריט אם חיובים אינם ישימים לפריט ש
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,לדוגמא. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +27,Transaction currency must be same as Payment Gateway currency,עסקת מטבע חייב להיות זהה לתשלום במטבע Gateway
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Transaction currency must be same as Payment Gateway currency,עסקת מטבע חייב להיות זהה לתשלום במטבע Gateway
 DocType: Payment Entry,Receive,קבל
 DocType: Maintenance Visit,Fully Completed,הושלם במלואו
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% הושלם
@@ -3591,13 +3561,13 @@
 DocType: Workstation,Operating Costs,עלויות תפעול
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,פעולה אם שנצבר חודשי תקציב חריג
 DocType: Purchase Invoice,Submit on creation,שלח על יצירה
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +432,Currency for {0} must be {1},מטבע עבור {0} חייב להיות {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +435,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 +493,Row {0}: An Reorder entry already exists for this warehouse {1},שורת {0}: כניסת סידור מחדש כבר קיימת למחסן זה {1}
+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/crm/doctype/opportunity/opportunity.py +79,"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 +429,Production Order {0} must be submitted,ייצור להזמין {0} יש להגיש
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +434,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,עד כה לא יכול להיות לפני מהמועד
@@ -3607,13 +3577,13 @@
 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 +181,Totals,סיכומים
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,סיכומים
 DocType: BOM,Manufacturing,ייצור
 ,Ordered Items To Be Delivered,פריטים הורה שיימסרו
 DocType: Account,Income,הכנסה
 DocType: Industry Type,Industry Type,סוג התעשייה
 apps/erpnext/erpnext/templates/includes/cart.js +141,Something went wrong!,משהו השתבש!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,Warning: Leave application contains following block dates,אזהרה: יישום השאר מכיל תאריכי הבלוק הבאים
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +120,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,תאריך סיום
@@ -3625,7 +3595,7 @@
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,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 +793,All records are synced.,כל הרשומות מסונכרנות.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +781,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,שם מרכז עלות
@@ -3643,20 +3613,19 @@
 DocType: Address,Name of person or organization that this address belongs to.,שמו של אדם או ארגון שכתובת זו שייכת ל.
 apps/erpnext/erpnext/public/js/setup_wizard.js +260,Your Suppliers,הספקים שלך
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +49,Cannot set as Lost as Sales Order is made.,לא ניתן להגדיר כאבודים כלהזמין מכירות נעשה.
-DocType: Student Applicant,Mother's Name,שם האם
 DocType: Request for Quotation Item,Supplier Part No,אין ספק חלק
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Received From,התקבל מ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Received From,התקבל מ
 DocType: Lead,Converted,המרה
 DocType: Item,Has Serial No,יש מספר סידורי
 DocType: Employee,Date of Issue,מועד ההנפקה
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: החל מ- {0} עבור {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +153,Row #{0}: Set Supplier for item {1},# השורה {0}: ספק הוגדר לפריט {1}
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +93,Row {0}: Hours value must be greater than zero.,שורה {0}: שעות הערך חייב להיות גדול מאפס.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +117,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}
 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 +172,{0} {1} does not exist,{0} {1} לא קיים
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +175,{0} {1} does not exist,{0} {1} לא קיים
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,Please check Multi Currency option to allow accounts with other currency,אנא בדוק את אפשרות מטבע רב כדי לאפשר חשבונות עם מטבע אחר
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +72,Item: {0} does not exist in the system,פריט: {0} אינו קיים במערכת
 apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,אתה לא רשאי לקבוע ערך קפוא
@@ -3671,7 +3640,7 @@
 DocType: Pricing Rule,Pricing Rule Help,עזרה כלל תמחור
 DocType: Purchase Taxes and Charges,Account Head,חשבון ראש
 apps/erpnext/erpnext/config/stock.py +163,Update additional costs to calculate landed cost of items,עדכון עלויות נוספות לחישוב עלות נחתה של פריטים
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Electrical,חשמל
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Electrical,חשמל
 DocType: Stock Entry,Total Value Difference (Out - In),הבדל ערך כולל (Out - ב)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,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}
@@ -3679,7 +3648,7 @@
 DocType: Item,Customer Code,קוד לקוח
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +210,Birthday Reminder for {0},תזכורת יום הולדת עבור {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,ימים מאז הזמנה אחרונה
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +292,Debit To account must be a Balance Sheet account,חיוב החשבון חייב להיות חשבון מאזן
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To account must be a Balance Sheet account,חיוב החשבון חייב להיות חשבון מאזן
 DocType: Buying Settings,Naming Series,סדרת שמות
 DocType: Leave Block List,Leave Block List Name,השאר שם בלוק רשימה
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,נכסים במלאי
@@ -3691,11 +3660,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 +301,Salary Slip of employee {0} already created for time sheet {1},תלוש משכורת של עובד {0} כבר נוצר עבור גיליון זמן {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +313,Salary Slip of employee {0} already created for time sheet {1},תלוש משכורת של עובד {0} כבר נוצר עבור גיליון זמן {1}
 DocType: Sales Order Item,Ordered Qty,כמות הורה
-apps/erpnext/erpnext/stock/doctype/item/item.py +673,Item {0} is disabled,פריט {0} הוא נכים
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} is disabled,פריט {0} הוא נכים
 DocType: Stock Settings,Stock Frozen Upto,המניה קפואה Upto
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +838,BOM does not contain any stock item,BOM אינו מכיל כל פריט במלאי
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +809,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,צור תלושי שכר
@@ -3703,7 +3672,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,דיסקונט חייב להיות פחות מ -100
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Last purchase rate not found,שער הרכישה האחרונה לא נמצא
 DocType: Purchase Invoice,Write Off Amount (Company Currency),לכתוב את הסכום (חברת מטבע)
-apps/erpnext/erpnext/stock/doctype/item/item.py +485,Row #{0}: Please set reorder quantity,# השורה {0}: אנא הגדר כמות הזמנה חוזרת
+apps/erpnext/erpnext/stock/doctype/item/item.py +487,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 +62,Please set {0},אנא הגדר {0}
@@ -3715,11 +3684,10 @@
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,להגיש את כל תלושי השכר לקריטריונים לעיל נבחרים
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} פריטים יסונכרנו
 DocType: Sales Order,Partly Delivered,בחלקו נמסר
-DocType: Sales Invoice,Existing Customer,לקוח קיים
 DocType: Email Digest,Receivables,חייבים
+DocType: Lead Source,Lead Source,מקור עופרת
 DocType: Customer,Additional information regarding the customer.,מידע נוסף לגבי הלקוחות.
 DocType: Quality Inspection Reading,Reading 5,קריאת 5
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +38,Campaign Name is required,שם מסע פרסום נדרש
 DocType: Maintenance Visit,Maintenance Date,תאריך תחזוקה
 DocType: Purchase Invoice Item,Rejected Serial No,מספר סידורי שנדחו
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +80,Year start date or end date is overlapping with {0}. To avoid please set company,תאריך התחלת שנה או תאריך סיום חופף עם {0}. כדי למנוע נא לקבוע חברה
@@ -3727,10 +3695,9 @@
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","לדוגמא:. ABCD ##### אם הסדרה מוגדרת ומספר סידורי אינו מוזכר בעסקות, מספר סידורי ולאחר מכן אוטומטי ייווצר מבוסס על סדרה זו. אם אתה תמיד רוצה להזכיר במפורש מס 'סידורי לפריט זה. להשאיר ריק זה."
 DocType: Upload Attendance,Upload Attendance,נוכחות העלאה
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +129,BOM and Manufacturing Quantity are required,BOM וכמות הייצור נדרשים
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,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,מקס חוזק
-DocType: Bank Reconciliation Detail,Amount,הסכום
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM הוחלף
 ,Sales Analytics,Analytics מכירות
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +113,Available {0},זמין {0}
@@ -3738,14 +3705,14 @@
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,הגדרת דוא&quot;ל
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +96,Please enter default currency in Company Master,נא להזין את ברירת מחדל של המטבע בחברה Master
 DocType: Stock Entry Detail,Stock Entry Detail,פרט מניית הכניסה
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +100,Daily Reminders,תזכורות יומיות
+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/account/account_tree.js +23,New Account Name,שם חשבון חדש
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,עלות חומרי גלם הסופק
 DocType: Selling Settings,Settings for Selling Module,הגדרות עבור מכירת מודול
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Customer Service,שירות לקוחות
+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/config/hr.py +50,Offer candidate a Job.,מועמד הצעת עבודה.
@@ -3762,9 +3729,9 @@
 DocType: Sales Order,Printing Details,הדפסת פרטים
 DocType: Task,Closing Date,תאריך סגירה
 DocType: Sales Order Item,Produced Quantity,כמות מיוצרת
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Engineer,מהנדס
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,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 +370,Item Code required at Row No {0},קוד פריט נדרש בשורה לא {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +398,Item Code required at Row No {0},קוד פריט נדרש בשורה לא {0}
 DocType: Sales Partner,Partner Type,שם שותף
 DocType: Purchase Taxes and Charges,Actual,בפועל
 DocType: Authorization Rule,Customerwise Discount,Customerwise דיסקונט
@@ -3780,10 +3747,11 @@
 DocType: BOM,Raw Material Cost,עלות חומרי גלם
 DocType: Item Reorder,Re-Order Level,סדר מחדש רמה
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,הזן פריטים וכמות מתוכננת עבורו ברצון להעלות הזמנות ייצור או להוריד חומרי גלם לניתוח.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +55,Part-time,במשרה חלקית
+apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,תרשים גנט
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,במשרה חלקית
 DocType: Employee,Applicable Holiday List,רשימת Holiday ישימה
 DocType: Employee,Cheque,המחאה
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,סדרת עדכון
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +57,Series Updated,סדרת עדכון
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,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}
@@ -3803,7 +3771,7 @@
 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 +513,Posting date and posting time is mandatory,תאריך הפרסום ופרסום הזמן הוא חובה
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,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.,במילים יהיו גלוי לאחר שתשמרו את הזמנת הרכש.
@@ -3813,7 +3781,7 @@
 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/stock/doctype/stock_entry/stock_entry.py +158,Target warehouse in row {0} must be same as Production Order,מחסן יעד בשורת {0} חייב להיות זהה להזמנת ייצור
+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,מטבע לא ניתן לשנות לאחר ביצוע ערכים באמצעות כמה מטבע אחר
 DocType: Company,Round Off Account,לעגל את החשבון
@@ -3822,22 +3790,21 @@
 DocType: Customer Group,Parent Customer Group,קבוצת לקוחות הורה
 DocType: Purchase Invoice,Contact Email,"דוא""ל ליצירת קשר"
 DocType: Appraisal Goal,Score Earned,הציון שנצבר
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Notice Period,תקופת הודעה
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,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 +4,New Sales Person Name,ניו איש מכירות שם
 DocType: Packing Slip,Gross Weight UOM,משקלים של אוני 'מישגן
-DocType: Email Digest,Receivables / Payables,חייבים / זכאי
 DocType: Delivery Note Item,Against Sales Invoice,נגד חשבונית מכירות
 DocType: Bin,Reserved Qty for Production,שמורות כמות עבור הפקה
 DocType: Asset,Frequency of Depreciation (Months),תדירות הפחת (חודשים)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +469,Credit Account,חשבון אשראי
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Credit Account,חשבון אשראי
 DocType: Landed Cost Item,Landed Cost Item,פריט עלות נחת
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +55,Show zero values,הצג אפס ערכים
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,הצג אפס ערכים
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,כמות של פריט המתקבלת לאחר ייצור / אריזה מחדש מכמויות מסוימות של חומרי גלם
 DocType: Payment Reconciliation,Receivable / Payable Account,חשבון לקבל / לשלם
 DocType: Delivery Note Item,Against Sales Order Item,נגד פריט להזמין מכירות
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Please specify Attribute Value for attribute {0},ציין מאפיין ערך עבור תכונת {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},ציין מאפיין ערך עבור תכונת {0}
 DocType: Item,Default Warehouse,מחסן ברירת מחדל
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +39,Budget cannot be assigned against Group Account {0},תקציב לא ניתן להקצות נגד קבוצת חשבון {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,נא להזין מרכז עלות הורה
@@ -3858,7 +3825,6 @@
 DocType: Journal Entry,Total Debit,"חיוב סה""כ"
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,מחסן מוצרים מוגמר ברירת מחדל
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,איש מכירות
-DocType: Sales Invoice,Cold Calling,קורא קר
 DocType: SMS Parameter,SMS Parameter,פרמטר SMS
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,תקציב מרכז עלות
 DocType: Maintenance Schedule Item,Half Yearly,חצי שנתי
@@ -3870,7 +3836,7 @@
 DocType: Opportunity Item,Basic Rate,שיעור בסיסי
 DocType: GL Entry,Credit Amount,סכום אשראי
 DocType: Cheque Print Template,Signatory Position,תפקיד החותם
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,קבע כאבוד
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,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 +5,This is based on transactions against this Customer. See timeline below for details,זה מבוסס על עסקאות מול לקוח זה. ראה את ציר הזמן מתחת לפרטים
 DocType: Supplier,Credit Days Based On,ימי אשראי לפי
@@ -3882,11 +3848,10 @@
 ,Items To Be Requested,פריטים להידרש
 DocType: Purchase Order,Get Last Purchase Rate,קבל אחרון תעריף רכישה
 DocType: Company,Company Info,מידע על חברה
-apps/erpnext/erpnext/accounts/page/pos/pos.js +941,Select or add new customer,בחר או הוסף לקוח חדש
+apps/erpnext/erpnext/accounts/page/pos/pos.js +930,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 +5,This is based on the attendance of this Employee,זה מבוסס על הנוכחות של העובד
-DocType: Sales Invoice,Frequency,תֶדֶר
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +463,Debit Account,חשבון חיוב
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Debit Account,חשבון חיוב
 DocType: Fiscal Year,Year Start Date,תאריך התחלת שנה
 DocType: Attendance,Employee Name,שם עובד
 DocType: Sales Invoice,Rounded Total (Company Currency),"סה""כ מעוגל (חברת מטבע)"
@@ -3895,26 +3860,26 @@
 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 +210,Supplier Quotation {0} created,הצעת מחיר הספק {0} נוצר
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Employee Benefits,הטבות לעובדים
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +208,Supplier Quotation {0} created,הצעת מחיר הספק {0} נוצר
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,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 +228,Please set a default Holiday List for Employee {0} or Company {1},אנא להגדיר ברירת מחדל Holiday רשימה עבור שכיר {0} או החברה {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +232,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 +499,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},שורה לא {0}: הסכום אינו יכול להיות גדול מהסכום ממתין נגד תביעת {1} הוצאות. הסכום בהמתנת {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +500,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},שורה לא {0}: הסכום אינו יכול להיות גדול מהסכום ממתין נגד תביעת {1} הוצאות. הסכום בהמתנת {2}
 DocType: Maintenance Schedule,Schedule,לוח זמנים
 DocType: Account,Parent Account,חשבון הורה
 DocType: Quality Inspection Reading,Reading 3,רידינג 3
 ,Hub,רכזת
 DocType: GL Entry,Voucher Type,סוג שובר
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1007,Price List not found or disabled,מחיר המחירון לא נמצא או נכים
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1008,Price List not found or disabled,מחיר המחירון לא נמצא או נכים
 DocType: Expense Claim,Approved,אושר
 DocType: Pricing Rule,Price,מחיר
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +244,Employee relieved on {0} must be set as 'Left',עובד הקלה על {0} חייב להיות מוגדרים כ'שמאל '
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +256,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} בטווח התאריכים נתון
 DocType: Employee,Education,חינוך
@@ -3924,11 +3889,11 @@
 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 +259,Please select Employee Record first.,אנא בחר עובד רשומה ראשון.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +266,Please select Employee Record first.,אנא בחר עובד רשומה ראשון.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +190,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},שורה {0}: מסיבה / חשבון אינו תואם עם {1} / {2} {3} {4}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +235,Please enter Expense Account,נא להזין את חשבון הוצאות
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,Please enter Expense Account,נא להזין את חשבון הוצאות
 DocType: Account,Stock,מלאי
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,"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 +976,"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,רכישה / פרטי ייצור
@@ -3942,7 +3907,7 @@
 DocType: Asset Movement,Transaction Date,תאריך עסקה
 DocType: Production Plan Item,Planned Qty,מתוכננת כמות
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,"מס סה""כ"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,For Quantity (Manufactured Qty) is mandatory,לכמות (מיוצר כמות) הוא חובה
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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 +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,שורת {0}: מפלגת סוג והמפלגה הוא ישים רק נגד חייבים / חשבון לתשלום
@@ -3959,7 +3924,7 @@
 DocType: Warranty Claim,If different than customer address,אם שונה מכתובת הלקוח
 DocType: BOM Operation,BOM Operation,BOM מבצע
 DocType: Purchase Taxes and Charges,On Previous Row Amount,על סכום שורה הקודם
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +226,Transfer Asset,Asset Transfer
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +227,Transfer Asset,Asset Transfer
 DocType: POS Profile,POS Profile,פרופיל קופה
 apps/erpnext/erpnext/config/schools.py +33,Admission,הוֹדָאָה
 apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.","עונתיות להגדרת תקציבים, יעדים וכו '"
@@ -3971,8 +3936,8 @@
 DocType: Assessment,Room,חֶדֶר
 DocType: Purchase Order,Advance Paid,מראש בתשלום
 DocType: Item,Item Tax,מס פריט
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +765,Material to Supplier,חומר לספקים
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +189,Excise Invoice,בלו חשבונית
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,Material to Supplier,חומר לספקים
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,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,התחייבויות שוטפות
@@ -3982,7 +3947,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,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 +136,Credit Card,כרטיס אשראי
+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.,הגדרות ברירת מחדל עבור עסקות מניות.
 DocType: Purchase Invoice,Next Date,התאריך הבא
@@ -4001,7 +3966,7 @@
 DocType: Customer,Commission Rate,הוועדה שערי
 apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,הפוך Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,יישומי חופשת בלוק על ידי מחלקה.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +115,"Payment Type must be one of Receive, Pay and Internal Transfer",סוג התשלום חייב להיות אחד וקבל שכר וטובות העברה פנימית
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +118,"Payment Type must be one of Receive, Pay and Internal Transfer",סוג התשלום חייב להיות אחד וקבל שכר וטובות העברה פנימית
 apps/erpnext/erpnext/config/selling.py +169,Analytics,Analytics
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,עגלה ריקה
 DocType: Production Order,Actual Operating Cost,עלות הפעלה בפועל
@@ -4016,10 +3981,10 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,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 +92,Designer,מעצב
+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/accounts/doctype/purchase_invoice/purchase_invoice.py +469,Cost Center is required in row {0} in Taxes table for type {1},מרכז העלות נדרש בשורת {0} במסי שולחן לסוג {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +472,Cost Center is required in row {0} in Taxes table for type {1},מרכז העלות נדרש בשורת {0} במסי שולחן לסוג {1}
 DocType: Program,Program Code,קוד התוכנית
 ,Item-wise Purchase Register,הרשם רכישת פריט-חכם
 DocType: Batch,Expiry Date,תַאֲרִיך תְפוּגָה
@@ -4029,12 +3994,12 @@
 apps/erpnext/erpnext/config/projects.py +13,Project master.,אדון פרויקט.
 apps/erpnext/erpnext/controllers/status_updater.py +174,"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 +417, (Half Day),(חצי יום)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425, (Half Day),(חצי יום)
 DocType: Supplier,Credit Days,ימי אשראי
 DocType: Leave Type,Is Carry Forward,האם להמשיך קדימה
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +740,Get Items from BOM,קבל פריטים מBOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +711,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 +549,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},# שורה {0}: פרסום תאריך חייב להיות זהה לתאריך הרכישה {1} של נכס {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +552,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,להעביר נכס ממחסן אחד למשנהו
diff --git a/erpnext/translations/hi.csv b/erpnext/translations/hi.csv
index fbcedb2..2d411dd 100644
--- a/erpnext/translations/hi.csv
+++ b/erpnext/translations/hi.csv
@@ -18,11 +18,10 @@
 DocType: Sales Partner,Dealer,व्यापारी
 DocType: Employee,Rented,किराये पर
 DocType: Purchase Order,PO-,पुलिस
-apps/erpnext/erpnext/accounts/report/financial_statements.py +19,Start Year {0} not found.,प्रारंभ वर्ष {0} नहीं मिला।
 DocType: POS Profile,Applicable for User,उपयोगकर्ता के लिए लागू
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +191,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","रूका उत्पादन आदेश रद्द नहीं किया जा सकता, रद्द करने के लिए पहली बार इसे आगे बढ़ाना"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +197,Do you really want to scrap this asset?,आप वास्तव में इस संपत्ति स्क्रैप करना चाहते हैं?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +17,Select Default Supplier,चयन डिफ़ॉल्ट प्रदायक
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +192,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","रूका उत्पादन आदेश रद्द नहीं किया जा सकता, रद्द करने के लिए पहली बार इसे आगे बढ़ाना"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +198,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 +36,Currency is required for Price List {0},मुद्रा मूल्य सूची के लिए आवश्यक है {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* लेनदेन में गणना की जाएगी.
 DocType: Address,County,काउंटी
@@ -42,46 +41,45 @@
 DocType: Sales Invoice,Customer Name,ग्राहक का नाम
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +126,Bank account cannot be named as {0},बैंक खाते के रूप में नामित नहीं किया जा सकता {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,प्रमुखों (या समूह) के खिलाफ जो लेखांकन प्रविष्टियों बना रहे हैं और संतुलन बनाए रखा है।
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +180,Outstanding for {0} cannot be less than zero ({1}),बकाया {0} शून्य से भी कम नहीं किया जा सकता है के लिए ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,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 +148,Series Updated Successfully,सीरीज सफलतापूर्वक अपडेट
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +149,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,सभी आपूर्तिकर्ता संपर्क
-DocType: Quality Inspection Reading,Parameter,प्राचल
 apps/erpnext/erpnext/projects/doctype/project/project.py +54,Expected End Date can not be less than Expected Start Date,उम्मीद अंत तिथि अपेक्षित प्रारंभ तिथि से कम नहीं हो सकता है
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,पंक्ति # {0}: दर के रूप में ही किया जाना चाहिए {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +239,New Leave Application,नई छुट्टी के लिए अर्जी
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,New Leave Application,नई छुट्टी के लिए अर्जी
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +20,Attendance Record {0} exists against Student {1} for Course Schedule {2},उपस्थिति रिकॉर्ड {0} {1} छात्र के खिलाफ पाठ्यक्रम अनुसूची के लिए मौजूद है {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Bank Draft,बैंक ड्राफ्ट
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,बैंक ड्राफ्ट
 DocType: Mode of Payment Account,Mode of Payment Account,भुगतान खाता का तरीका
 apps/erpnext/erpnext/stock/doctype/item/item.js +52,Show Variants,दिखाएँ वेरिएंट
 DocType: Academic Term,Academic Term,शैक्षणिक अवधि
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +13,Material,सामग्री
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Quantity,मात्रा
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +511,Accounts table cannot be blank.,खातों की तालिका खाली नहीं हो सकता।
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +616,Quantity,मात्रा
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +512,Accounts table cannot be blank.,खातों की तालिका खाली नहीं हो सकता।
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,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/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 +142,User {0} is already assigned to Employee {1},प्रयोक्ता {0} पहले से ही कर्मचारी को सौंपा है {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,स्वास्थ्य देखभाल
-DocType: Purchase Invoice,Monthly,मासिक
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),भुगतान में देरी (दिन)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +771,Invoice,बीजक
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +750,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 +198,Row {0}: {1} {2} does not match with {3},पंक्ति {0}: {1} {2} के साथ मेल नहीं खाता {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,पंक्ति # {0}:
+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 +127,Please select Price List,मूल्य सूची का चयन करें
@@ -112,8 +110,8 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,एक ही कंपनी के एक से अधिक बार दर्ज किया जाता है
 DocType: Employee,Married,विवाहित
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},अनुमति नहीं {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +589,Get items from,से आइटम प्राप्त
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +382,Stock cannot be updated against Delivery Note {0},शेयर वितरण नोट के खिलाफ अद्यतन नहीं किया जा सकता {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,से आइटम प्राप्त
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,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,किराना
@@ -122,7 +120,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 +156,Salary Structure Missing,वेतन ढांचे गुम
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Salary Structure Missing,वेतन ढांचे गुम
 DocType: Lead,Person Name,व्यक्ति का नाम
 DocType: Sales Invoice Item,Sales Invoice Item,बिक्री चालान आइटम
 DocType: Account,Credit,श्रेय
@@ -130,10 +128,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 +156,Credit limit has been crossed for customer {0} {1}/{2},क्रेडिट सीमा ग्राहक के लिए पार किया गया है {0} {1} / {2}
-apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",अनियंत्रित नहीं हो सकता है के रूप में एसेट रिकॉर्ड मद के सामने मौजूद है &quot;निश्चित परिसंपत्ति है&quot;
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +189,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;
 DocType: Tax Rule,Tax Type,टैक्स प्रकार
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +144,You are not authorized to add or update entries before {0},इससे पहले कि आप प्रविष्टियों को जोड़ने या अद्यतन करने के लिए अधिकृत नहीं हैं {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},इससे पहले कि आप प्रविष्टियों को जोड़ने या अद्यतन करने के लिए अधिकृत नहीं हैं {0}
 DocType: Item,Item Image (if not slideshow),छवि (यदि नहीं स्लाइड शो)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,एक ग्राहक एक ही नाम के साथ मौजूद है
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(घंटा दर / 60) * वास्तविक ऑपरेशन टाइम
@@ -143,18 +142,17 @@
 DocType: Student Log,Student Log,छात्र लॉग
 DocType: Quality Inspection,Get Specification Details,विशिष्टता विवरण
 DocType: Lead,Interested,इच्छुक
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +165,Opening,प्रारंभिक
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,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/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ग्राहक&gt; ग्राहक समूह&gt; टेरिटरी
 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.,मौजूदा लेन - देन के साथ खाता समूह को नहीं बदला जा सकता .
 DocType: Lead,Product Enquiry,उत्पाद पूछताछ
 DocType: Academic Term,Schools,स्कूलों
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,पहली कंपनी दाखिल करें
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Company first,पहले कंपनी का चयन करें
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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,कुल लागत
@@ -164,7 +162,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,लेखा - विवरण
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,औषधीय
 DocType: Purchase Invoice Item,Is Fixed Asset,निश्चित परिसंपत्ति है
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Available qty is {0}, you need {1}","उपलब्ध मात्रा {0}, आप की जरूरत है {1}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +225,"Available qty is {0}, you need {1}","उपलब्ध मात्रा {0}, आप की जरूरत है {1}"
 DocType: Expense Claim Detail,Claim Amount,दावे की राशि
 DocType: Employee,Mr,श्री
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,प्रदायक प्रकार / प्रदायक
@@ -173,26 +171,27 @@
 DocType: Employee,B-,बी
 DocType: Upload Attendance,Import Log,प्रवेश करें आयात
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,खींचो उपरोक्त मानदंडों के आधार पर प्रकार के निर्माण की सामग्री का अनुरोध
+DocType: Assessment Result,Grade,ग्रेड
 DocType: Sales Invoice Item,Delivered By Supplier,प्रदायक द्वारा वितरित
 DocType: SMS Center,All Contact,सभी संपर्क
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Annual Salary,वार्षिक वेतन
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,शेयर व्यय
-apps/erpnext/erpnext/accounts/report/financial_statements.py +22,End Year {0} not found.,समाप्ति वर्ष {0} नहीं मिला।
 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}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,आपूर्ति कच्चे माल की खरीद के लिए
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +130,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 +451,Item {0} is not active or end of life has been reached,आइटम {0} सक्रिय नहीं है या जीवन के अंत तक पहुँच गया है
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +456,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/controllers/accounts_controller.py +614,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","पंक्ति में कर शामिल करने के लिए {0} आइटम रेट में , पंक्तियों में करों {1} भी शामिल किया जाना चाहिए"
+apps/erpnext/erpnext/controllers/accounts_controller.py +617,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","पंक्ति में कर शामिल करने के लिए {0} आइटम रेट में , पंक्तियों में करों {1} भी शामिल किया जाना चाहिए"
 apps/erpnext/erpnext/config/hr.py +166,Settings for HR Module,मानव संसाधन मॉड्यूल के लिए सेटिंग्स
 DocType: SMS Center,SMS Center,एसएमएस केंद्र
 DocType: Sales Invoice,Change Amount,राशि परिवर्तन
@@ -204,13 +203,13 @@
 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 +147,Execution,निष्पादन
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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,आइटम और मूल्य निर्धारण
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},कुल घंटे: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},दिनांक से वित्तीय वर्ष के भीतर होना चाहिए. दिनांक से मान लिया जाये = {0}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,Cost Center {0} does not belong to Company {1},लागत केंद्र {0} से संबंधित नहीं है कंपनी {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +100,Cost Center {0} does not belong to Company {1},लागत केंद्र {0} से संबंधित नहीं है कंपनी {1}
 DocType: Customer,Individual,व्यक्ति
 DocType: Interest,Academics User,शिक्षाविदों उपयोगकर्ता
 DocType: Cheque Print Template,Amount In Figure,राशि चित्रा में
@@ -226,30 +225,32 @@
 DocType: Production Planning Tool,Sales Orders,बिक्री के आदेश
 DocType: Purchase Taxes and Charges,Valuation,मूल्याकंन
 ,Purchase Order Trends,आदेश रुझान खरीद
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,The request for quotation can be accessed by clicking on the following link,उद्धरण के लिए अनुरोध नीचे दिए गए लिंक पर क्लिक करके पहुँचा जा सकता है
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,वर्ष के लिए पत्तियों आवंटित.
 DocType: SG Creation Tool Course,SG Creation Tool Course,एसजी निर्माण उपकरण कोर्स
 DocType: Student Group Creation Tool,Leave blank if you wish to fetch all courses for selected academic term,खाली छोड़ देते हैं आपके द्वारा चयनित शैक्षणिक अवधि के लिए सभी पाठ्यक्रमों लाने के लिए चाहते हैं
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,Insufficient Stock,अपर्याप्त स्टॉक
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227,Insufficient Stock,अपर्याप्त स्टॉक
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,अक्षम क्षमता योजना और समय ट्रैकिंग
+DocType: Email Digest,New Sales Orders,नई बिक्री आदेश
 DocType: Bank Reconciliation,Bank Account,बैंक खाता
 DocType: Leave Type,Allow Negative Balance,ऋणात्मक शेष की अनुमति दें
 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/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} does not belong to Company {1},खाते {0} कंपनी से संबंधित नहीं है {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +86,Account {0} does not belong to Company {1},खाते {0} कंपनी से संबंधित नहीं है {1}
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},अग्रिम राशि से अधिक नहीं हो सकता है {0} {1}
 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 +174,For Warehouse is required before Submit,गोदाम की आवश्यकता है के लिए पहले जमा करें
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,For Warehouse is required before Submit,गोदाम की आवश्यकता है के लिए पहले जमा करें
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,प्राप्त हुआ
 DocType: Sales Partner,Reseller,पुनर्विक्रेता
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,कंपनी दाखिल करें
 DocType: Delivery Note Item,Against Sales Invoice Item,बिक्री चालान आइटम के खिलाफ
 ,Production Orders in Progress,प्रगति में उत्पादन के आदेश
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Cash from Financing,फाइनेंसिंग से नेट नकद
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1436,"LocalStorage is full , did not save","LocalStorage भरा हुआ है, नहीं सहेज सकते हैं।"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1460,"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}
@@ -262,18 +263,19 @@
 apps/erpnext/erpnext/templates/generators/item.html +78,No description given,दिया का कोई विवरण नहीं
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,खरीद के लिए अनुरोध.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +5,This is based on the Time Sheets created against this project,इस समय पत्रक इस परियोजना के खिलाफ बनाया पर आधारित है
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Only the selected Leave Approver can submit this Leave Application,केवल चयनित लीव अनुमोदक इस छुट्टी के लिए अर्जी प्रस्तुत कर सकते हैं
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +213,Only the selected Leave Approver can submit this Leave Application,केवल चयनित लीव अनुमोदक इस छुट्टी के लिए अर्जी प्रस्तुत कर सकते हैं
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,तिथि राहत शामिल होने की तिथि से अधिक होना चाहिए
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Leaves per Year,प्रति वर्ष पत्तियां
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,प्रति वर्ष पत्तियां
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,पंक्ति {0}: कृपया जाँच खाते के खिलाफ 'अग्रिम है' {1} यह एक अग्रिम प्रविष्टि है।
 apps/erpnext/erpnext/stock/utils.py +188,Warehouse {0} does not belong to company {1},वेयरहाउस {0} से संबंधित नहीं है कंपनी {1}
+DocType: Email Digest,Profit & Loss,लाभ हानि
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,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 +435,Leave Blocked,अवरुद्ध छोड़ दो
-apps/erpnext/erpnext/stock/doctype/item/item.py +669,Item {0} has reached its end of life on {1},आइटम {0} पर जीवन के अपने अंत तक पहुँच गया है {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +443,Leave Blocked,अवरुद्ध छोड़ दो
+apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item {0} has reached its end of life on {1},आइटम {0} पर जीवन के अपने अंत तक पहुँच गया है {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +95,Bank Entries,बैंक प्रविष्टियां
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +83,Annual,वार्षिक
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +86,Annual,वार्षिक
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,शेयर सुलह आइटम
 DocType: Stock Entry,Sales Invoice No,बिक्री चालान नहीं
 DocType: Material Request Item,Min Order Qty,न्यूनतम आदेश मात्रा
@@ -281,20 +283,22 @@
 DocType: Lead,Do Not Contact,संपर्क नहीं है
 apps/erpnext/erpnext/public/js/setup_wizard.js +360,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 +91,Software Developer,सॉफ्टवेयर डेवलपर
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,सॉफ्टवेयर डेवलपर
 DocType: Item,Minimum Order Qty,न्यूनतम आदेश मात्रा
 DocType: Pricing Rule,Supplier Type,प्रदायक प्रकार
 DocType: Scheduling Tool,Course Start Date,कोर्स प्रारंभ तिथि
 DocType: Item,Publish in Hub,हब में प्रकाशित
+DocType: Student Admission,Student Admission,छात्र प्रवेश
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is cancelled,आइटम {0} को रद्द कर दिया गया है
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Material Request,सामग्री अनुरोध
+apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} is cancelled,आइटम {0} को रद्द कर दिया गया है
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +823,Material Request,सामग्री अनुरोध
 DocType: Bank Reconciliation,Update Clearance Date,अद्यतन क्लीयरेंस तिथि
 apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +28,Abbreviation already used for another salary component,संक्षिप्त पहले से ही एक और वेतन घटक के लिए इस्तेमाल किया
 DocType: Item,Purchase Details,खरीद विवरण
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +328,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},खरीद आदेश में &#39;कच्चे माल की आपूर्ति&#39; तालिका में नहीं मिला मद {0} {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +333,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/config/selling.py +18,Confirmed orders from Customers.,ग्राहकों से आदेश की पुष्टि की है.
 DocType: Purchase Receipt Item,Rejected Quantity,अस्वीकृत मात्रा
 DocType: SMS Settings,SMS Sender Name,एसएमएस प्रेषक का नाम
@@ -310,20 +314,21 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +130,Please select Charge Type first,प्रभारी प्रकार पहले का चयन करें
 DocType: Student Group Student,Student Group Student,छात्र समूह छात्र
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,नवीनतम
+DocType: Email Digest,New Quotations,नई कोटेशन
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,सूची में पहले छोड़ अनुमोदक डिफ़ॉल्ट छोड़ दो अनुमोदक के रूप में स्थापित किया जाएगा
 DocType: Tax Rule,Shipping County,शिपिंग काउंटी
 apps/erpnext/erpnext/config/desktop.py +158,Learn,सीखना
 DocType: Asset,Next Depreciation Date,अगली तिथि मूल्यह्रास
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,कर्मचारी प्रति गतिविधि लागत
 DocType: Accounts Settings,Settings for Accounts,खातों के लिए सेटिंग्स
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +626,Supplier Invoice No exists in Purchase Invoice {0},आपूर्तिकर्ता चालान नहीं खरीद चालान में मौजूद है {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +629,Supplier Invoice No exists in Purchase Invoice {0},आपूर्तिकर्ता चालान नहीं खरीद चालान में मौजूद है {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,बिक्री व्यक्ति पेड़ की व्यवस्था करें.
 DocType: Job Applicant,Cover Letter,कवर लेटर
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,बकाया चेक्स और स्पष्ट करने जमाओं
 DocType: Item,Synced With Hub,हब के साथ सिंक किया गया
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,गलत पासवर्ड
 DocType: Item,Variant Of,के variant
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,Completed Qty can not be greater than 'Qty to Manufacture',की तुलना में 'मात्रा निर्माण करने के लिए' पूरी की गई मात्रा अधिक नहीं हो सकता
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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 +86,Circular Reference Error,परिपत्र संदर्भ त्रुटि
@@ -335,15 +340,16 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,स्वचालित सामग्री अनुरोध के निर्माण पर ईमेल द्वारा सूचित करें
 DocType: Journal Entry,Multi Currency,बहु मुद्रा
 DocType: Payment Reconciliation Invoice,Invoice Type,चालान का प्रकार
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +806,Delivery Note,बिलटी
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +800,Delivery Note,बिलटी
 apps/erpnext/erpnext/config/learn.py +87,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 +233,Payment Entry has been modified after you pulled it. Please pull it again.,आप इसे खींचा बाद भुगतान एंट्री संशोधित किया गया है। इसे फिर से खींच कर दीजिये।
+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/setup/doctype/email_digest/email_digest.py +104,Summary for this week and pending activities,इस सप्ताह और लंबित गतिविधियों के लिए सारांश
+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","अल्पविराम के द्वारा अलग ईमेल आईडी दर्ज करें, चालान विशेष तिथि पर स्वचालित रूप से भेज दिया जाएगा"
 DocType: Employee,Company Email,कंपनी ईमेल
@@ -355,28 +361,29 @@
 apps/erpnext/erpnext/config/hr.py +186,"Employee designation (e.g. CEO, Director etc.).","कर्मचारी पदनाम (जैसे सीईओ , निदेशक आदि ) ."
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,क्षेत्र मूल्य 'माह के दिवस पर दोहराएँ ' दर्ज करें
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,जिस पर दर ग्राहक की मुद्रा ग्राहक आधार मुद्रा में परिवर्तित किया जाता है
-apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},पंक्ति # {0}: चालान की खरीद करने के लिए एक मौजूदा परिसंपत्ति के खिलाफ नहीं बनाया जा सकता है {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +554,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},पंक्ति # {0}: चालान की खरीद करने के लिए एक मौजूदा परिसंपत्ति के खिलाफ नहीं बनाया जा सकता है {1}
 DocType: Item Tax,Tax Rate,कर की दर
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} पहले से ही कर्मचारी के लिए आवंटित {1} तक की अवधि के {2} के लिए {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +812,Select Item,वस्तु चुनें
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +791,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/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,खरीद चालान {0} पहले से ही प्रस्तुत किया जाता है
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},पंक्ति # {0}: बैच नहीं के रूप में ही किया जाना चाहिए {1} {2}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +143,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.,एक आइटम के बैच (बहुत).
 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 +342,Please see attachment,लगाव को देखने के लिए धन्यवाद
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,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 +19,Setup Already Complete!!,सेटअप पहले से ही पूरा !
 ,Finished Goods,निर्मित माल
 DocType: Delivery Note,Instructions,निर्देश
 DocType: Quality Inspection,Inspected By,द्वारा निरीक्षण किया
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,प्रदायक&gt; प्रदायक प्रकार
 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,सामगंरियां जोड़ें
@@ -390,29 +397,29 @@
 DocType: Currency Exchange,Currency Exchange,मुद्रा विनिमय
 DocType: Purchase Invoice Item,Item Name,मद का नाम
 DocType: Authorization Rule,Approving User  (above authorized value),(अधिकृत मूल्य से ऊपर) उपयोगकर्ता का अनुमोदन
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,जमा शेष
+DocType: Email Digest,Credit Balance,जमा शेष
 DocType: Employee,Widowed,विधवा
 DocType: Request for Quotation,Request for Quotation,उद्धरण के लिए अनुरोध
 DocType: Salary Slip Timesheet,Working Hours,कार्य के घंटे
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,एक मौजूदा श्रृंखला के शुरू / वर्तमान अनुक्रम संख्या बदलें.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","कई डालती प्रबल करने के लिए जारी रखते हैं, उपयोगकर्ताओं संघर्ष को हल करने के लिए मैन्युअल रूप से प्राथमिकता सेट करने के लिए कहा जाता है."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +736,Purchase Return,क्रय वापसी
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +715,Purchase Return,क्रय वापसी
 ,Purchase Register,इन पंजीकृत खरीद
 DocType: Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,लागू शुल्कों
 DocType: Workstation,Consumable Cost,उपभोज्य लागत
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +202,{0} ({1}) must have role 'Leave Approver',{0} ({1}) भूमिका होनी चाहिए 'लीव अनुमोदनकर्ता'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,{0} ({1}) must have role 'Leave Approver',{0} ({1}) भूमिका होनी चाहिए 'लीव अनुमोदनकर्ता'
 DocType: Purchase Receipt,Vehicle Date,वाहन की तारीख
 DocType: Student Log,Medical,चिकित्सा
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,खोने के लिए कारण
-apps/erpnext/erpnext/accounts/utils.py +239,Allocated amount can not greater than unadjusted amount,आवंटित राशि असमायोजित राशि से अधिक नहीं कर सकते हैं
+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,आवंटित राशि असमायोजित राशि से अधिक नहीं कर सकते हैं
 DocType: Announcement,Receiver,रिसीवर
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},कार्य केंद्र छुट्टी सूची के अनुसार निम्नलिखित तारीखों पर बंद हो गया है: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,सुनहरे अवसर
 DocType: Employee,Single,एक
 DocType: Account,Cost of Goods Sold,बेच माल की लागत
 DocType: Purchase Invoice,Yearly,वार्षिक
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +225,Please enter Cost Center,लागत केंद्र दर्ज करें
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,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,परीक्षक नाम
@@ -425,26 +432,26 @@
 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,स्वचालित रूप से फीफो पर आधारित नग सीरियल सेट
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,चेक आपूर्तिकर्ता चालान संख्या अद्वितीयता
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',&#39;प्रकरण नहीं करने के लिए&#39; &#39;केस नंबर से&#39; से कम नहीं हो सकता
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,Non Profit,गैर लाभ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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: Stock Reconciliation Item,Do not include symbols (ex. $),प्रतीकों शामिल न करें (उदा। $)
 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 +638,Attribute {0} selected multiple times in Attributes Table,गुण {0} गुण तालिका में कई बार चुना
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,गुण {0} गुण तालिका में कई बार चुना
 DocType: HR Settings,Employee record is created using selected field. ,कर्मचारी रिकॉर्ड चयनित क्षेत्र का उपयोग कर बनाया जाता है.
 DocType: Sales Order,Not Applicable,लागू नहीं
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,अवकाश मास्टर .
 DocType: Request for Quotation Item,Required Date,आवश्यक तिथि
 DocType: Delivery Note,Billing Address,बिलिंग पता
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +862,Please enter Item Code.,मद कोड दर्ज करें.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +847,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","अगर जाँच की है, कर की राशि के रूप में पहले से ही प्रिंट दर / प्रिंट राशि में शामिल माना जाएगा"
@@ -458,12 +465,12 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,प्रतिभूति और जमाओं
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,आवंटित कुल पत्तियों अनिवार्य है
 DocType: Job Opening,Description of a Job Opening,एक नौकरी खोलने का विवरण
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Pending activities for today,आज के लिए लंबित गतिविधियों
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,आज के लिए लंबित गतिविधियों
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,उपस्थिति रिकॉर्ड.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,timesheet आधारित पेरोल के लिए वेतन घटक।
 DocType: Sales Order Item,Used for Production Plan,उत्पादन योजना के लिए प्रयुक्त
 DocType: Manufacturing Settings,Time Between Operations (in mins),(मिनट में) संचालन के बीच का समय
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +92,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} खाता {1} लागत केंद्र के खिलाफ के लिए बजट {2} है {3}। यह द्वारा अधिक होगा {4}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +95,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} खाता {1} लागत केंद्र के खिलाफ के लिए बजट {2} है {3}। यह द्वारा अधिक होगा {4}
 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 एक ही मद के लिए नहीं हैं
@@ -471,16 +478,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +238,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 +86,Administrative Officer,प्रशासनिक अधिकारी
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,प्रशासनिक अधिकारी
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +23,Acutal Qty {0} / Waiting Qty {1},Acutal मात्रा {0} / इंतज़ार मात्रा {1}
 DocType: Timesheet Detail,Hrs,बजे
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +319,Please select Company,कंपनी का चयन करें
-DocType: Stock Entry,Difference Account,अंतर खाता
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +309,Please select Company,कंपनी का चयन करें
+DocType: Stock Entry Detail,Difference Account,अंतर खाता
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,उसकी निर्भर कार्य {0} बंद नहीं है के रूप में बंद काम नहीं कर सकते हैं।
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Please enter Warehouse for which Material Request will be raised,"सामग्री अनुरोध उठाया जाएगा , जिसके लिए वेयरहाउस दर्ज करें"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +399,Please enter Warehouse for which Material Request will be raised,"सामग्री अनुरोध उठाया जाएगा , जिसके लिए वेयरहाउस दर्ज करें"
 DocType: Production Order,Additional Operating Cost,अतिरिक्त ऑपरेटिंग कॉस्ट
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,प्रसाधन सामग्री
-apps/erpnext/erpnext/stock/doctype/item/item.py +530,"To merge, following properties must be same for both items","मर्ज करने के लिए , निम्नलिखित गुण दोनों मदों के लिए ही होना चाहिए"
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,"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 +28,Buy,खरीदें
@@ -488,7 +495,7 @@
 DocType: Sales Invoice,Offline POS Name,ऑफलाइन पीओएस नाम
 DocType: Sales Order,To Deliver,पहुँचाना
 DocType: Purchase Invoice Item,Item,मद
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1563,Serial no item cannot be a fraction,सीरियल नहीं आइटम एक अंश नहीं किया जा सकता
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1587,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,प्रबंध उप
@@ -497,13 +504,14 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Account {0} does not belong to company: {1},खाते {0} कंपनी से संबंधित नहीं है: {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation already used for another company,संक्षिप्त पहले से ही एक और कंपनी के लिए इस्तेमाल किया
 DocType: Selling Settings,Default Customer Group,डिफ़ॉल्ट ग्राहक समूह
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Supplier is required against Payable account {0},प्रदायक देय खाते के खिलाफ आवश्यक है {0}
 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 नहीं किया जा सकता
 DocType: Production Planning Tool,Material Requirement,सामग्री की आवश्यकताएँ
 DocType: Company,Delete Company Transactions,कंपनी लेन-देन को हटाएं
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +313,Reference No and Reference Date is mandatory for Bank transaction,संदर्भ कोई और संदर्भ तिथि बैंक लेन-देन के लिए अनिवार्य है
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +316,Reference No and Reference Date is mandatory for Bank transaction,संदर्भ कोई और संदर्भ तिथि बैंक लेन-देन के लिए अनिवार्य है
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,कर और प्रभार जोड़ें / संपादित करें
 DocType: Purchase Invoice,Supplier Invoice No,प्रदायक चालान नहीं
 DocType: Territory,For reference,संदर्भ के लिए
@@ -514,7 +522,6 @@
 DocType: Installation Note Item,Installation Note Item,अधिष्ठापन नोट आइटम
 DocType: Production Plan Item,Pending Qty,विचाराधीन मात्रा
 DocType: Budget,Ignore,उपेक्षा
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,मद कोड&gt; मद समूह&gt; ब्रांड
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,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
@@ -525,11 +532,11 @@
 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/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,चालान तालिका में कोई अभिलेख
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +28,Please select Company and Party Type first,पहले कंपनी और पार्टी के प्रकार का चयन करें
+apps/erpnext/erpnext/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/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 +707,Make Sales Order,बनाओ बिक्री आदेश
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +701,Make Sales Order,बनाओ बिक्री आदेश
 DocType: Project Task,Project Task,परियोजना के कार्य
 ,Lead Id,लीड ईद
 DocType: C-Form Invoice Detail,Grand Total,महायोग
@@ -545,7 +552,8 @@
 DocType: Job Applicant,Resume Attachment,जीवनवृत्त संलग्नक
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,ग्राहकों को दोहराने
 DocType: Leave Control Panel,Allocate,आवंटित
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +734,Sales Return,बिक्री लौटें
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +728,Sales Return,बिक्री लौटें
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +91,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,नोट: कुल आवंटित पत्ते {0} पहले ही मंजूरी दे दी पत्तियों से कम नहीं होना चाहिए {1} अवधि के लिए
 DocType: Announcement,Posted By,द्वारा प्रकाशित किया गया था
 DocType: Item,Delivered by Supplier (Drop Ship),प्रदायक द्वारा वितरित (ड्रॉप जहाज)
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,संभावित ग्राहकों के लिए धन्यवाद.
@@ -554,14 +562,13 @@
 DocType: Quotation,Quotation To,करने के लिए कोटेशन
 DocType: Lead,Middle Income,मध्य आय
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +212,Opening (Cr),उद्घाटन (सीआर )
-apps/erpnext/erpnext/stock/doctype/item/item.py +795,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,आप पहले से ही एक और UoM के साथ कुछ लेन-देन (एस) बना दिया है क्योंकि मद के लिए माप की मूलभूत इकाई {0} सीधे नहीं बदला जा सकता। आप एक अलग डिफ़ॉल्ट UoM का उपयोग करने के लिए एक नया आइटम बनाने की आवश्यकता होगी।
-apps/erpnext/erpnext/accounts/utils.py +237,Allocated amount can not be negative,आवंटित राशि ऋणात्मक नहीं हो सकता
+apps/erpnext/erpnext/stock/doctype/item/item.py +797,Default Unit of Measure for Item {0} cannot be changed directly because 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,आवंटित राशि ऋणात्मक नहीं हो सकता
 DocType: Purchase Order Item,Billed Amt,बिल भेजा राशि
 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 +91,Reference No & Reference Date is required for {0},संदर्भ कोई और संदर्भ तिथि के लिए आवश्यक है {0}
-DocType: Sales Invoice,Customer's Vendor,ग्राहक विक्रेता
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Proposal Writing,प्रस्ताव लेखन
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,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","अगर आइटम है कि उप अनुबंधित सामग्री अनुरोधों में शामिल किया जाएगा रहे हैं के लिए जाँच की, कच्चे माल"
@@ -570,13 +577,14 @@
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,समय ट्रैकिंग
 DocType: Fiscal Year Company,Fiscal Year Company,वित्त वर्ष कंपनी
 DocType: Packing Slip Item,DN Detail,डी.एन. विस्तार
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +257,Already supplier quotation has created,पहले से ही आपूर्तिकर्ता उद्धरण बनाया गया है
 DocType: Timesheet,Billed,का बिल
 DocType: Batch,Batch Description,बैच विवरण
+apps/erpnext/erpnext/accounts/utils.py +685,"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 +733,View Offline Records,देखें ऑफलाइन रिकॉर्ड्स
+apps/erpnext/erpnext/accounts/page/pos/pos.js +715,View Offline Records,देखें ऑफलाइन रिकॉर्ड्स
+DocType: Student,Sibling Details,सहोदर विवरण
 DocType: Employee,Reason for Resignation,इस्तीफे का कारण
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,प्रदर्शन मूल्यांकन के लिए खाका .
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,चालान / पत्रिका प्रवेश विवरण
@@ -590,7 +598,7 @@
 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,सूची में शुद्ध परिवर्तन
 DocType: Employee,Passport Number,पासपोर्ट नंबर
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Manager,मैनेजर
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,मैनेजर
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,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,'पर आधारित ' और ' समूह द्वारा ' ही नहीं किया जा सकता है
@@ -599,10 +607,11 @@
 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 +299,Timesheet created:,Timesheet बनाया:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +715,Please set default Cash or Bank account in Mode of Payment {0},भुगतान की विधि में डिफ़ॉल्ट नकद या बैंक खाता सेट करें {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +300,Timesheet created:,Timesheet बनाया:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +772,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,भर्ती
 DocType: Selling Settings,Customer Naming By,द्वारा नामकरण ग्राहक
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,कृपया सेटअप कर्मचारी मानव संसाधन में नामकरण सिस्टम&gt; मानव संसाधन सेटिंग
 DocType: Depreciation Schedule,Depreciation Amount,मूल्यह्रास राशि
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,समूह के साथ परिवर्तित
 DocType: Activity Cost,Activity Type,गतिविधि प्रकार
@@ -627,6 +636,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,समाप्त
 DocType: Pricing Rule,Sales Manager,बिक्री प्रबंधक
 DocType: Salary Structure Employee,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,एसेट निपटान पर लाभ / हानि खाता
@@ -641,11 +651,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +9,Pre Sales,बेचने से पहले
 DocType: Purchase Receipt,Other Details,अन्य विवरण
 DocType: Account,Accounts,लेखा
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Marketing,विपणन
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +227,Payment Entry is already created,भुगतान प्रवेश पहले से ही बनाई गई है
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,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 +538,Row #{0}: Asset {1} does not linked to Item {2},पंक्ति # {0}: संपत्ति {1} वस्तु {2} से जुड़ा हुआ नहीं है
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +21,Preview Salary Slip,पूर्वावलोकन वेतन पर्ची
+apps/erpnext/erpnext/controllers/accounts_controller.py +541,Row #{0}: Asset {1} does not linked to Item {2},पंक्ति # {0}: संपत्ति {1} वस्तु {2} से जुड़ा हुआ नहीं है
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +38,Preview Salary Slip,पूर्वावलोकन वेतन पर्ची
 DocType: Company,Deafult Cost Center,Deafult लागत केंद्र
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +48,Account {0} has been entered multiple times,खाता {0} कई बार दर्ज किया गया है
 DocType: Account,Expenses Included In Valuation,व्यय मूल्यांकन में शामिल
@@ -654,7 +664,7 @@
 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 +617,Item has variants.,आइटम वेरिएंट है।
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,आइटम वेरिएंट है।
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,आइटम {0} नहीं मिला
 DocType: Bin,Stock Value,शेयर मूल्य
 apps/erpnext/erpnext/accounts/doctype/account/account.py +25,Company {0} does not exist,कंपनी {0} मौजूद नहीं है
@@ -674,7 +684,7 @@
 DocType: Purchase Order,Supply Raw Materials,कच्चे माल की आपूर्ति
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"अगले चालान उत्पन्न हो जाएगा, जिस पर तारीख। इसे प्रस्तुत पर उत्पन्न होता है।"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,वर्तमान संपत्तियाँ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,{0} is not a stock Item,{0} भंडार वस्तु नहीं है
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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 +169,Lead must be set if Opportunity is made from Lead,"अवसर नेतृत्व से किया जाता है , तो लीड सेट किया जाना चाहिए"
@@ -760,26 +770,25 @@
 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 +709,No Permission,अनुमति नहीं है
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +710,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}
 apps/erpnext/erpnext/public/js/setup_wizard.js +298,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 +542,Row #{0}: Asset {1} must be submitted,पंक्ति # {0}: संपत्ति {1} प्रस्तुत किया जाना चाहिए
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,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,एक विक्रेता के लिए subcontracted हैं
 DocType: SMS Center,All Customer Contact,सभी ग्राहक संपर्क
 apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,Csv के माध्यम से शेयर संतुलन अपलोड करें.
 DocType: Warehouse,Tree Details,ट्री विवरण
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,अब भेजें
 ,Support Analytics,समर्थन विश्लेषिकी
 DocType: Item,Website Warehouse,वेबसाइट वेअरहाउस
 DocType: Payment Reconciliation,Minimum Invoice Amount,न्यूनतम चालान राशि
 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/sales_invoice/sales_invoice.py +227,Timesheet {0} is already completed or cancelled,Timesheet {0} पहले ही पूरा या रद्द कर दिया है
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +259,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 के बराबर होना चाहिए
@@ -795,13 +804,13 @@
 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 +229,Target Warehouse,लक्ष्य वेअरहाउस
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +230,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-,STE-
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Sales Order Date,उम्मीद की डिलीवरी की तारीख से पहले बिक्री आदेश तिथि नहीं हो सकता
 DocType: Upload Attendance,Import Attendance,आयात उपस्थिति
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,सभी आइटम समूहों
+apps/erpnext/erpnext/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/config/setup.py +89,Automatically compose message on submission of transactions.,स्वचालित रूप से लेनदेन के प्रस्तुत करने पर संदेश लिखें .
@@ -813,13 +822,15 @@
 DocType: Sales Invoice,Payment Due Date,भुगतान की नियत तिथि
 apps/erpnext/erpnext/stock/doctype/item/item.js +278,Item Variant {0} already exists with same attributes,मद संस्करण {0} पहले से ही एक ही गुण के साथ मौजूद है
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;उद्घाटन&#39;
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,क्या करने के लिए ओपन
 DocType: Notification Control,Delivery Note Message,डिलिवरी नोट संदेश
 DocType: Expense Claim,Expenses,व्यय
 DocType: Item Variant Attribute,Item Variant Attribute,मद संस्करण गुण
 ,Purchase Receipt Trends,खरीद रसीद रुझान
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Research & Development,अनुसंधान एवं विकास
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,अनुसंधान एवं विकास
 ,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,मूल्य या डिस्काउंट
@@ -828,7 +839,7 @@
 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/controllers/accounts_controller.py +340,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","भुगतान एंट्री {0} {1} आदेश, जाँच करता है, तो यह इस चालान में अग्रिम के रूप में निकाला जाना चाहिए खिलाफ जुड़ा हुआ है।"
+apps/erpnext/erpnext/controllers/accounts_controller.py +343,"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,बिक्री केन्द्र
@@ -850,12 +861,12 @@
 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 +756,Purchase Receipt,रसीद खरीद
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +735,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 +167,Reference Doctype must be one of {0},संदर्भ Doctype से एक होना चाहिए {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +282,Unable to find Time Slot in the next {0} days for Operation {1},ऑपरेशन के लिए अगले {0} दिनों में टाइम स्लॉट पाने में असमर्थ {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +170,Reference Doctype must be one of {0},संदर्भ Doctype से एक होना चाहिए {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Unable to find Time Slot in the next {0} days for Operation {1},ऑपरेशन के लिए अगले {0} दिनों में टाइम स्लॉट पाने में असमर्थ {1}
 DocType: Production Order,Plan material for sub-assemblies,उप असेंबलियों के लिए योजना सामग्री
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,बिक्री भागीदारों और टेरिटरी
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be active,बीओएम {0} सक्रिय होना चाहिए
@@ -866,7 +877,7 @@
 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 +214,Warehouses with existing transaction can not be converted to ledger.,मौजूदा लेनदेन के साथ गोदामों खाता बही में परिवर्तित नहीं किया जा सकता है।
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +217,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,उत्पादन के आदेश
@@ -880,9 +891,9 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,कर्मचारी {0} सक्रिय नहीं है या मौजूद नहीं है
 DocType: Fee Structure,Components,अवयव
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,Please enter Asset Category in Item {0},मद में दर्ज करें परिसंपत्ति वर्ग {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +612,Item Variants {0} updated,आइटम वेरिएंट {0} अद्यतन
+apps/erpnext/erpnext/stock/doctype/item/item.py +614,Item Variants {0} updated,आइटम वेरिएंट {0} अद्यतन
 DocType: Quality Inspection Reading,Reading 6,6 पढ़ना
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +843,Cannot {0} {1} {2} without any negative outstanding invoice,नहीं {0} {1} {2} के बिना किसी भी नकारात्मक बकाया चालान कर सकते हैं
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +854,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,अभी सिंक करें
@@ -897,69 +908,72 @@
 DocType: Item,Is Purchase Item,खरीद आइटम है
 DocType: Asset,Purchase Invoice,चालान खरीद
 DocType: Stock Ledger Entry,Voucher Detail No,वाउचर विस्तार नहीं
-apps/erpnext/erpnext/accounts/page/pos/pos.js +728,New Sales Invoice,नई बिक्री चालान
+apps/erpnext/erpnext/accounts/page/pos/pos.js +710,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 +728,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: Cheque Print Template,Has Print Format,प्रिंट स्वरूप है
-apps/erpnext/erpnext/accounts/page/pos/pos.js +86, is mandatory. Maybe Currency Exchange record is not created for ,अनिवार्य है। हो सकता है कि मुद्रा विनिमय रिकार्ड नहीं बनाई गई है
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +109,Row #{0}: Please specify Serial No for Item {1},Row # {0}: आइटम के लिए धारावाहिक नहीं निर्दिष्ट करें {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +619,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","&#39;उत्पाद बंडल&#39; आइटम, गोदाम, सीरियल कोई और बैच के लिए नहीं &#39;पैकिंग सूची&#39; मेज से विचार किया जाएगा। गोदाम और बैच कोई &#39;किसी भी उत्पाद बंडल&#39; आइटम के लिए सभी मदों की पैकिंग के लिए ही कर रहे हैं, तो उन मूल्यों को मुख्य मद तालिका में दर्ज किया जा सकता है, मूल्यों की मेज &#39;पैकिंग सूची&#39; में कॉपी किया जाएगा।"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +75, 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 +613,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing 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 +606,Supplier Invoice Date cannot be greater than Posting Date,आपूर्तिकर्ता चालान दिनांक पोस्ट दिनांक से बड़ा नहीं हो सकता है
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +609,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: 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 +810,Select Item for Transfer,स्थानांतरण के लिए आइटम का चयन करें
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +789,Select Item for Transfer,स्थानांतरण के लिए आइटम का चयन करें
 DocType: Purchase Invoice,Additional Discount Percentage,अतिरिक्त छूट प्रतिशत
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,सभी की मदद वीडियो की एक सूची देखें
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,बैंक के खाते में जहां चेक जमा किया गया था सिर का चयन करें.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,उपयोगकर्ता लेनदेन में मूल्य सूची दर को संपादित करने की अनुमति दें
 DocType: Pricing Rule,Max Qty,अधिकतम मात्रा
-DocType: Student Applicant,Father's Name,पिता का नाम
 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 +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,पंक्ति {0}: बिक्री / खरीद आदेश के खिलाफ भुगतान हमेशा अग्रिम के रूप में चिह्नित किया जाना चाहिए
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,रासायनिक
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +686,All items have already been transferred for this Production Order.,सभी आइटम को पहले से ही इस उत्पादन के आदेश के लिए स्थानांतरित कर दिया गया है।
+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} और फिर कोशिश करें
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +694,All items have already been transferred for this Production Order.,सभी आइटम को पहले से ही इस उत्पादन के आदेश के लिए स्थानांतरित कर दिया गया है।
 DocType: Process Payroll,Select Payroll Year and Month,पेरोल वर्ष और महीने का चयन करें
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,Meter,मीटर
 DocType: Workstation,Electricity Cost,बिजली की लागत
 DocType: HR Settings,Don't send Employee Birthday Reminders,कर्मचारी जन्मदिन अनुस्मारक न भेजें
-DocType: Opportunity,Walk In,में चलो
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,स्टॉक प्रविष्टियां
 DocType: Item,Inspection Criteria,निरीक्षण मानदंड
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,तबादला
 apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,अपने पत्र सिर और लोगो अपलोड करें। (आप उन्हें बाद में संपादित कर सकते हैं)।
 DocType: Timesheet Detail,Bill,बिल
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,White,सफेद
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date is entered as past date,अगली मूल्यह्रास दिनांक अतीत की तारीख के रूप में दर्ज किया जाता है
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +167,White,सफेद
 DocType: SMS Center,All Lead (Open),सभी लीड (ओपन)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +228,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),पंक्ति {0}: मात्रा के लिए उपलब्ध नहीं {4} गोदाम में {1} प्रवेश के समय पोस्टिंग पर ({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}),पंक्ति {0}: मात्रा के लिए उपलब्ध नहीं {4} गोदाम में {1} प्रवेश के समय पोस्टिंग पर ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,भुगतान किए गए अग्रिम जाओ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +731,Make ,मेक
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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 +154,Order Type must be one of {0},आदेश प्रकार का होना चाहिए {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},आदेश प्रकार का होना चाहिए {0}
 DocType: Lead,Next Contact Date,अगले संपर्क तिथि
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,खुलने मात्रा
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +393,Please enter Account for Change Amount,राशि परिवर्तन के लिए खाता दर्ज करें
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,Please enter Account for Change Amount,राशि परिवर्तन के लिए खाता दर्ज करें
 DocType: Student Batch,Student Batch Name,छात्र बैच नाम
 DocType: Holiday List,Holiday List Name,अवकाश सूची नाम
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js +8,Schedule Course,अनुसूची कोर्स
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Stock Options,पूँजी विकल्प
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,पूँजी विकल्प
 DocType: Journal Entry Account,Expense Claim,व्यय दावा
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +211,Do you really want to restore this scrapped asset?,आप वास्तव में इस संपत्ति को खत्म कर दिया बहाल करने के लिए करना चाहते हैं?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +237,Qty for {0},के लिए मात्रा {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +212,Do you really want to restore this scrapped asset?,आप वास्तव में इस संपत्ति को खत्म कर दिया बहाल करने के लिए करना चाहते हैं?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,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,ब्लॉक सूची तिथियां छोड़ो
@@ -968,9 +982,9 @@
 DocType: Company,Default Terms,डिफ़ॉल्ट शर्तें
 DocType: Packing Slip Item,Packing Slip Item,पैकिंग स्लिप आइटम
 DocType: Purchase Invoice,Cash/Bank Account,नकद / बैंक खाता
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,मात्रा या मूल्य में कोई परिवर्तन से हटाया आइटम नहीं है।
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,मात्रा या मूल्य में कोई परिवर्तन से हटाया आइटम नहीं है।
 DocType: Delivery Note,Delivery To,करने के लिए डिलिवरी
-apps/erpnext/erpnext/stock/doctype/item/item.py +635,Attribute table is mandatory,गुण तालिका अनिवार्य है
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,गुण तालिका अनिवार्य है
 DocType: Production Planning Tool,Get Sales Orders,विक्रय आदेश
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} ऋणात्मक नहीं हो सकता
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,कृपया एक छात्र का चयन
@@ -995,7 +1009,7 @@
 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,WIP वेयरहाउस
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},धारावाहिक नहीं {0} तक रखरखाव अनुबंध के तहत है {1}
+apps/erpnext/erpnext/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,संगठन का नाम
@@ -1007,7 +1021,7 @@
 DocType: GL Entry,Against,के खिलाफ
 DocType: Item,Default Selling Cost Center,डिफ़ॉल्ट बिक्री लागत केंद्र
 DocType: Sales Partner,Implementation Partner,कार्यान्वयन साथी
-apps/erpnext/erpnext/controllers/selling_controller.py +231,Sales Order {0} is {1},बिक्री आदेश {0} है {1}
+apps/erpnext/erpnext/controllers/selling_controller.py +232,Sales Order {0} is {1},बिक्री आदेश {0} है {1}
 DocType: Opportunity,Contact Info,संपर्क जानकारी
 apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,स्टॉक प्रविष्टियां बनाना
 DocType: Packing Slip,Net Weight UOM,नेट वजन UOM
@@ -1017,25 +1031,24 @@
 DocType: Holiday List,Get Weekly Off Dates,साप्ताहिक ऑफ तिथियां
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,समाप्ति तिथि आरंभ तिथि से कम नहीं हो सकता
 DocType: Sales Person,Select company name first.,कंपनी 1 नाम का चयन करें.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Dr,डा
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Dr,डा
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,कोटेशन आपूर्तिकर्ता से प्राप्त किया.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},{0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,औसत आयु
 DocType: 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/templates/pages/home.html +32,View All Products,सभी उत्पादों को देखने
+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 +400,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,चेतावनी: सिस्टम {0} {1} शून्य है में आइटम के लिए राशि के बाद से overbilling जांच नहीं करेगा
+apps/erpnext/erpnext/controllers/accounts_controller.py +403,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/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,और वर्ष:
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +191,{0} {1} must be submitted,{0} {1} प्रस्तुत किया जाना चाहिए
-DocType: Email Digest,Annual Expense,वार्षिक खर्च
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,{0} {1} must be submitted,{0} {1} प्रस्तुत किया जाना चाहिए
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +145,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}
@@ -1046,30 +1059,31 @@
 DocType: Sales Partner,Distributor,वितरक
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,शॉपिंग कार्ट नौवहन नियम
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +211,Production Order {0} must be cancelled before cancelling this Sales Order,उत्पादन का आदेश {0} इस बिक्री आदेश रद्द करने से पहले रद्द कर दिया जाना चाहिए
-apps/erpnext/erpnext/public/js/controllers/transaction.js +62,Please set 'Apply Additional Discount On',सेट &#39;पर अतिरिक्त छूट लागू करें&#39; कृपया
+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,सीमा कम हो गया है से की तुलना में श्रृंखला के लिए
 DocType: Global Defaults,Global Defaults,वैश्विक मूलभूत
 apps/erpnext/erpnext/projects/doctype/project/project.py +153,Project Collaboration Invitation,परियोजना सहयोग निमंत्रण
 DocType: Salary Slip,Deductions,कटौती
+DocType: Leave Allocation,LAL/,लाल /
 apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,साल की शुरुआत
 DocType: Purchase Invoice,Start date of current invoice's period,वर्तमान चालान की अवधि के आरंभ तिथि
 DocType: Salary Slip,Leave Without Pay,बिना वेतन छुट्टी
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +327,Capacity Planning Error,क्षमता योजना में त्रुटि
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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 +362,Finished Item {0} must be entered for Manufacture type entry,तैयार आइटम {0} निर्माण प्रकार प्रविष्टि के लिए दर्ज होना चाहिए
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +367,Finished Item {0} must be entered for Manufacture type entry,तैयार आइटम {0} निर्माण प्रकार प्रविष्टि के लिए दर्ज होना चाहिए
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,खुलने का लेखा बैलेंस
 DocType: Sales Invoice Advance,Sales Invoice Advance,बिक्री चालान अग्रिम
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +499,Nothing to request,अनुरोध करने के लिए कुछ भी नहीं
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +500,Nothing to request,अनुरोध करने के लिए कुछ भी नहीं
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',' वास्तविक प्रारंभ दिनांक ' वास्तविक अंत तिथि ' से बड़ा नहीं हो सकता
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Management,प्रबंधन
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},डेबिट या क्रेडिट राशि के लिए या तो आवश्यक है {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,प्रबंधन
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +55,Either debit or credit amount is required for {0},डेबिट या क्रेडिट राशि के लिए या तो आवश्यक है {0}
 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 +161,Blue,नीला
+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,ईमेल आईडी सेट करें
@@ -1079,12 +1093,12 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +23,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,डिफ़ॉल्ट आइटम समूह
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1374,Do you really want to submit the invoice?,क्या तुम सच में चालान प्रस्तुत करने के लिए करना चाहते हैं?
+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 +685,Cost Center For Item with Item Code ','आइटम कोड के साथ आइटम के लिए केंद्र का खर्च
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1526,"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 +679,Cost Center For Item with Item Code ','आइटम कोड के साथ आइटम के लिए केंद्र का खर्च
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1550,"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 +26,"Further accounts can be made under Groups, but entries can be made against non-Groups","इसके अलावा खातों समूह के तहत बनाया जा सकता है, लेकिन प्रविष्टियों गैर समूहों के खिलाफ बनाया जा सकता है"
 DocType: Lead,Lead,नेतृत्व
@@ -1104,104 +1118,106 @@
 DocType: Payment Reconciliation,Unreconciled Payment Details,Unreconciled भुगतान विवरण
 DocType: Global Defaults,Current Fiscal Year,चालू वित्त वर्ष
 DocType: Global Defaults,Disable Rounded Total,गोल कुल अक्षम
-DocType: Lead,Call,कॉल
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +417,'Entries' cannot be empty,' प्रविष्टियां ' खाली नहीं हो सकती
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +418,'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 +214,Fiscal Year {0} not found,वित्त वर्ष {0} नहीं मिला
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +221,Fiscal Year {0} not found,वित्त वर्ष {0} नहीं मिला
 apps/erpnext/erpnext/config/hr.py +238,Setting up Employees,कर्मचारी की स्थापना
 DocType: Sales Order,SO-,इसलिए-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,पहले उपसर्ग का चयन करें
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Please select prefix first,पहले उपसर्ग का चयन करें
 DocType: Employee,O-,हे
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Research,अनुसंधान
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,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 +43,Item {0} must be a non-stock item,मद {0} एक गैर शेयर मद में होना चाहिए
 DocType: Contact,User ID,प्रयोक्ता आईडी
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +57,View Ledger,देखें खाता बही
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,शीघ्रातिशीघ्र
-apps/erpnext/erpnext/stock/doctype/item/item.py +504,"An Item Group exists with same name, please change the item name or rename the item group","एक आइटम समूह में एक ही नाम के साथ मौजूद है , वस्तु का नाम बदलने के लिए या आइटम समूह का नाम बदलने के लिए कृपया"
+apps/erpnext/erpnext/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 +437,Rest Of The World,शेष विश्व
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,आइटम {0} बैच नहीं हो सकता
 ,Budget Variance Report,बजट विचरण रिपोर्ट
 DocType: Salary Slip,Gross Pay,सकल वेतन
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +90,Row {0}: Activity Type is mandatory.,पंक्ति {0}: गतिविधि प्रकार अनिवार्य है।
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +114,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/public/js/controllers/stock_controller.js +40,Accounting Ledger,लेखा बही
+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,प्रतिधारित कमाई
 DocType: BOM Item,Item Description,आइटम विवरण
+DocType: Student Sibling,Student Sibling,छात्र सहोदर
 DocType: Purchase Invoice,Is Recurring,आवर्ती है
 DocType: Purchase Invoice,Supplied Items,आपूर्ति आइटम
 DocType: Student,STUD.,स्टड।
 DocType: Production Order,Qty To Manufacture,विनिर्माण मात्रा
+DocType: Email Digest,New Income,नई आय
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,खरीद चक्र के दौरान एक ही दर बनाए रखें
 DocType: Opportunity Item,Opportunity Item,अवसर आइटम
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,अस्थाई उद्घाटन
 ,Employee Leave Balance,कर्मचारी लीव बैलेंस
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +131,Balance for Account {0} must always be {1},{0} हमेशा होना चाहिए खाता के लिए शेष {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +175,Valuation Rate required for Item in row {0},मूल्यांकन दर पंक्ति में आइटम के लिए आवश्यक {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,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,उदाहरण: कंप्यूटर विज्ञान में परास्नातक
 DocType: Purchase Invoice,Rejected Warehouse,अस्वीकृत वेअरहाउस
 DocType: GL Entry,Against Voucher,वाउचर के खिलाफ
 DocType: Item,Default Buying Cost Center,डिफ़ॉल्ट ख़रीदना लागत केंद्र
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","ERPNext के बाहर का सबसे अच्छा पाने के लिए, हम आपको कुछ समय लगेगा और इन की मदद से वीडियो देखने के लिए सलाह देते हैं।"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +87, to ,को
+apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,को
 DocType: Item,Lead Time in days,दिनों में लीड समय
 ,Accounts Payable Summary,लेखा देय सारांश
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Not authorized to edit frozen Account {0},जमे खाता संपादित करने के लिए अधिकृत नहीं {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},जमे खाता संपादित करने के लिए अधिकृत नहीं {0}
 DocType: Journal Entry,Get Outstanding Invoices,बकाया चालान
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +62,Sales Order {0} is not valid,बिक्री आदेश {0} मान्य नहीं है
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,बिक्री आदेश {0} मान्य नहीं है
 apps/erpnext/erpnext/setup/doctype/company/company.py +185,"Sorry, companies cannot be merged","क्षमा करें, कंपनियों का विलय कर दिया नहीं किया जा सकता"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +139,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",कुल अंक / स्थानांतरण मात्रा {0} सामग्री अनुरोध में {1} \ मद के लिए अनुरोध मात्रा {2} से बड़ा नहीं हो सकता है {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Small,छोटा
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,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}
 ,Invoiced Amount (Exculsive Tax),चालान राशि ( Exculsive टैक्स )
-DocType: Student Applicant,Mother's / Guardian 1 Email ID,मातृ / अभिभावक 1 ईमेल आईडी
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,आइटम 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,लेखाशीर्ष {0} बनाया
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +160,Green,ग्रीन
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,ग्रीन
 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 +57,Contract,अनुबंध
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,अनुबंध
 DocType: Email Digest,Add Quote,उद्धरण जोड़ें
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +498,UOM coversion factor required for UOM: {0} in Item: {1},UOM के लिए आवश्यक UOM coversion पहलू: {0} मद में: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +503,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 +80,Row {0}: Qty is mandatory,पंक्ति {0}: मात्रा अनिवार्य है
+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 +737,Sync Master Data,सिंक मास्टर डाटा
+apps/erpnext/erpnext/accounts/page/pos/pos.js +719,Sync Master Data,सिंक मास्टर डाटा
 apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,अपने उत्पादों या सेवाओं
 DocType: Mode of Payment,Mode of Payment,भुगतान की रीति
 apps/erpnext/erpnext/stock/doctype/item/item.py +178,Website Image should be a public file or website URL,वेबसाइट छवि एक सार्वजनिक फ़ाइल या वेबसाइट URL होना चाहिए
+DocType: Student Applicant,AP,एपी
 DocType: Purchase Invoice Item,BOM,बीओएम
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,यह एक रूट आइटम समूह है और संपादित नहीं किया जा सकता है .
+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 +345,"{0}: Employee email not found, hence email not sent","{0}: कर्मचारी ईमेल नहीं मिला है, इसलिए नहीं भेजा गया ईमेल"
+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,आपकी कंपनी पता है
 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 +118,"For {0}, only credit accounts can be linked against another debit entry","{0}, केवल ऋण खातों अन्य डेबिट प्रविष्टि के खिलाफ जोड़ा जा सकता है के लिए"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Delivery Note {0} is not submitted,डिलिवरी नोट {0} प्रस्तुत नहीं किया गया है
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Delivery Note {0} is not submitted,डिलिवरी नोट {0} प्रस्तुत नहीं किया गया है
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Sub-contracted Item,आइटम {0} एक उप अनुबंधित आइटम होना चाहिए
 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,विक्रेता वेबसाइट
 DocType: Item,ITEM-,"आइटम,"
-apps/erpnext/erpnext/controllers/selling_controller.py +147,Total allocated percentage for sales team should be 100,बिक्री टीम के लिए कुल आवंटित 100 प्रतिशत होना चाहिए
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +110,Production Order status is {0},उत्पादन का आदेश स्थिति है {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,बिक्री टीम के लिए कुल आवंटित 100 प्रतिशत होना चाहिए
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},उत्पादन का आदेश स्थिति है {0}
 DocType: Appraisal Goal,Goal,लक्ष्य
 DocType: Sales Invoice Item,Edit Description,संपादित करें] वर्णन
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +757,For Supplier,सप्लायर के लिए
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +723,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,प्रिंट प्रारूप बनाएं
@@ -1217,10 +1233,11 @@
 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,ग्रेड कोड
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,डाइजेस्ट ईमेल:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +445,BOM {0} does not belong to Item {1},बीओएम {0} मद से संबंधित नहीं है {1}
 DocType: Sales Partner,Target Distribution,लक्ष्य वितरण
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1667,Deafault warehouse is required for selected item,Deafault गोदाम चयनित आइटम के लिए आवश्यक है
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Deafault warehouse is required for selected item,Deafault गोदाम चयनित आइटम के लिए आवश्यक है
 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 पढ़ना
@@ -1229,23 +1246,23 @@
 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 +110,Hardware,हार्डवेयर
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,हार्डवेयर
 DocType: Sales Order,Recurring Upto,आवर्ती तक
 DocType: Attendance,HR Manager,मानव संसाधन प्रबंधक
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,एक कंपनी का चयन करें
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Privilege Leave,विशेषाधिकार छुट्टी
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,विशेषाधिकार छुट्टी
 DocType: Purchase Invoice,Supplier Invoice Date,प्रदायक चालान तिथि
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,आप खरीदारी की टोकरी में सक्रिय करने की जरूरत
 DocType: Payment Entry,Writeoff,बट्टे खाते डालना
 DocType: Appraisal Template Goal,Appraisal Template Goal,मूल्यांकन टेम्पलेट लक्ष्य
-DocType: Salary Slip,Earning,कमाई
+DocType: Salary Component,Earning,कमाई
 DocType: Purchase Invoice,Party Account Currency,पार्टी खाता मुद्रा
 ,BOM Browser,बीओएम ब्राउज़र
 DocType: Purchase Taxes and Charges,Add or Deduct,जोड़ें या घटा
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,बीच पाया ओवरलैपिंग की स्थिति :
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +171,Against Journal Entry {0} is already adjusted against some other voucher,जर्नल के खिलाफ एंट्री {0} पहले से ही कुछ अन्य वाउचर के खिलाफ निकाला जाता है
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,जर्नल के खिलाफ एंट्री {0} पहले से ही कुछ अन्य वाउचर के खिलाफ निकाला जाता है
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,कुल ऑर्डर मूल्य
-apps/erpnext/erpnext/demo/setup_data.py +358,Food,भोजन
+apps/erpnext/erpnext/demo/setup/setup_data.py +301,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/course_schedule/course_schedule.js +103,Mark Attendence,मार्क उपस्थिति
@@ -1279,12 +1296,12 @@
 DocType: Sales Order Item,Planned Quantity,नियोजित मात्रा
 DocType: Purchase Invoice Item,Item Tax Amount,आइटम कर राशि
 DocType: Item,Maintain Stock,स्टॉक बनाए रखें
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +209,Stock Entries already created for Production Order ,पहले से ही उत्पादन आदेश के लिए बनाया स्टॉक प्रविष्टियां
+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,निश्चित परिसंपत्ति में शुद्ध परिवर्तन
 DocType: Leave Control Panel,Leave blank if considered for all designations,रिक्त छोड़ अगर सभी पदनाम के लिए विचार
-apps/erpnext/erpnext/controllers/accounts_controller.py +620,Charge of type 'Actual' in row {0} cannot be included in Item Rate,प्रकार पंक्ति {0} में 'वास्तविक ' का प्रभार आइटम रेट में शामिल नहीं किया जा सकता
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,Max: {0},मैक्स: {0}
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +15,From Datetime,Datetime से
+apps/erpnext/erpnext/controllers/accounts_controller.py +623,Charge of type 'Actual' in row {0} cannot be included in Item Rate,प्रकार पंक्ति {0} में 'वास्तविक ' का प्रभार आइटम रेट में शामिल नहीं किया जा सकता
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +239,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 +153,"Request for Quotation is disabled to access from portal, for more check portal settings.",उद्धरण के लिए अनुरोध अधिक चेक पोर्टल सेटिंग्स के लिए पोर्टल से उपयोग करने में अक्षम है।
@@ -1292,8 +1309,8 @@
 DocType: Sales Invoice,Shipping Address Name,शिपिंग पता नाम
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,खातों का चार्ट
 DocType: Material Request,Terms and Conditions Content,नियम और शर्तें सामग्री
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +552,cannot be greater than 100,100 से अधिक नहीं हो सकता
-apps/erpnext/erpnext/stock/doctype/item/item.py +680,Item {0} is not a stock Item,आइटम {0} भंडार वस्तु नहीं है
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +546,cannot be greater than 100,100 से अधिक नहीं हो सकता
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is not a stock Item,आइटम {0} भंडार वस्तु नहीं है
 DocType: Maintenance Visit,Unscheduled,अनिर्धारित
 DocType: Employee,Owned,स्वामित्व
 DocType: Salary Detail,Depends on Leave Without Pay,बिना वेतन छुट्टी पर निर्भर करता है
@@ -1307,10 +1324,9 @@
 DocType: GL Entry,GL Entry,जीएल एंट्री
 DocType: HR Settings,Employee Settings,कर्मचारी सेटिंग्स
 ,Batch-Wise Balance History,बैच वार बैलेंस इतिहास
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,सूची
 apps/erpnext/erpnext/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 +61,Apprentice,शिक्षु
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +102,Negative Quantity is not allowed,नकारात्मक मात्रा की अनुमति नहीं है
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,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","एक स्ट्रिंग के रूप में आइटम गुरु से दिलवाया है और इस क्षेत्र में संग्रहित कर विस्तार मेज।
  करों और शुल्कों के लिए प्रयुक्त"
@@ -1332,15 +1348,14 @@
 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 +141,Source warehouse is mandatory for row {0},स्रोत गोदाम पंक्ति के लिए अनिवार्य है {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +719,Packing Slip,पर्ची पैकिंग
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Source warehouse is mandatory for row {0},स्रोत गोदाम पंक्ति के लिए अनिवार्य है {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +713,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/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,"उद्धरण के लिए अनुरोध को, नीचे दिये गए लिंक पर क्लिक करके भी पहुंचा जा सकता है"
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,आयात विफल!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,कोई पता अभी तक जोड़ा।
 DocType: Workstation Working Hour,Workstation Working Hour,कार्य केंद्र घंटे काम
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Analyst,विश्लेषक
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,विश्लेषक
 DocType: Item,Inventory,इनवेंटरी
 DocType: Item,Sales Details,बिक्री विवरण
 DocType: Quality Inspection,QI-,QI-
@@ -1348,7 +1363,7 @@
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,मात्रा में
 DocType: Notification Control,Expense Claim Rejected,व्यय दावे का खंडन किया
 DocType: Item Attribute,Item Attribute,आइटम गुण
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +103,Government,सरकार
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,सरकार
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,संस्थान का नाम
 apps/erpnext/erpnext/config/stock.py +289,Item Variants,आइटम वेरिएंट
 DocType: Company,Services,सेवाएं
@@ -1364,6 +1379,7 @@
 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/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,निवेश से कैश फ्लो
 DocType: Program Course,Program Course,कार्यक्रम पाठ्यक्रम
@@ -1404,12 +1420,12 @@
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,पानेवाला सूची खाली है . पानेवाला सूची बनाएं
 DocType: Production Plan Sales Order,Production Plan Sales Order,उत्पादन योजना बिक्री आदेश
 DocType: Sales Partner,Sales Partner Target,बिक्री साथी लक्ष्य
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +110,Accounting Entry for {0} can only be made in currency: {1},{0} के लिए लेखा प्रविष्टि केवल मुद्रा में बनाया जा सकता है: {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},{0} के लिए लेखा प्रविष्टि केवल मुद्रा में बनाया जा सकता है: {1}
 DocType: Pricing Rule,Pricing Rule,मूल्य निर्धारण नियम
 DocType: Budget,Action if Annual Budget Exceeded,यदि वार्षिक बजट से अधिक हो कार्रवाई
 apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,क्रय आदेश के लिए सामग्री का अनुरोध
 DocType: Shopping Cart Settings,Payment Success URL,भुगतान सफलता यूआरएल
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +78,Row # {0}: Returned Item {1} does not exists in {2} {3},पंक्ति # {0}: वापस आ मद {1} नहीं में मौजूद है {2} {3}
+apps/erpnext/erpnext/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,बैंक समाधान विवरण
@@ -1418,40 +1434,39 @@
 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/stock/doctype/stock_entry/stock_entry.py +339,Not allowed to tranfer more {0} than {1} against Purchase Order {2},अधिक tranfer करने के लिए अनुमति नहीं है {0} की तुलना में {1} खरीद आदेश के खिलाफ {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +344,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 +545,Manufacturing Quantity is mandatory,विनिर्माण मात्रा अनिवार्य है
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,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 +71,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 +162,Row {0}: From Time and To Time of {1} is overlapping with {2},पंक्ति {0}: से समय और के समय {1} के साथ अतिव्यापी है {2}
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +186,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,शेयर देयताएं
 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 +130,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 +137,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,अन्य रिपोर्टें
 DocType: Dependent Task,Dependent Task,आश्रित टास्क
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,कृपया सेटअप कर्मचारी मानव संसाधन में नामकरण सिस्टम&gt; मानव संसाधन सेटिंग
 apps/erpnext/erpnext/stock/doctype/item/item.py +411,Conversion factor for default Unit of Measure must be 1 in row {0},उपाय की मूलभूत इकाई के लिए रूपांतरण कारक पंक्ति में 1 होना चाहिए {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,Leave of type {0} cannot be longer than {1},प्रकार की छुट्टी {0} से बड़ा नहीं हो सकता है {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +197,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 +921,Search Item,खोजें मद
+apps/erpnext/erpnext/accounts/page/pos/pos.js +910,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 +546,Already completed,पहले से पूरा है
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +22,Payment Request already exists {0},भुगतान का अनुरोध पहले से मौजूद है {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +550,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 +241,Quantity must not be more than {0},मात्रा से अधिक नहीं होना चाहिए {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Quantity must not be more than {0},मात्रा से अधिक नहीं होना चाहिए {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +76,Previous Financial Year is not closed,पिछले वित्त वर्ष बंद नहीं है
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +44,Age (Days),आयु (दिन)
 DocType: Quotation Item,Quotation Item,कोटेशन आइटम
@@ -1468,7 +1483,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +221,Purchase Receipt {0} is not submitted,खरीद रसीद {0} प्रस्तुत नहीं किया गया है
 DocType: Company,Default Payable Account,डिफ़ॉल्ट देय खाता
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","ऐसे शिपिंग नियम, मूल्य सूची आदि के रूप में ऑनलाइन शॉपिंग कार्ट के लिए सेटिंग"
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +83,{0}% Billed,{0}% बिल
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}% बिल
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,सुरक्षित मात्रा
 DocType: Party Account,Party Account,पार्टी खाता
 apps/erpnext/erpnext/config/setup.py +116,Human Resources,मानवीय संसाधन
@@ -1480,12 +1495,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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 +22,Collect,लीजिए
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,लीजिए
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,Against Supplier Invoice {0} dated {1},प्रदायक के खिलाफ चालान {0} दिनांक {1}
 DocType: Customer,Default Price List,डिफ़ॉल्ट मूल्य सूची
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +225,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: Payment Reconciliation,Payments,भुगतान
 DocType: Journal Entry,Entry Type,प्रविष्टि प्रकार
 ,Customer Credit Balance,ग्राहक क्रेडिट बैलेंस
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Payable,देय खातों में शुद्ध परिवर्तन
@@ -1497,7 +1511,7 @@
 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 +9,Procurement,खरीद
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,आइटम में से कोई भी मात्रा या मूल्य में कोई बदलाव किया है।
+apps/erpnext/erpnext/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,वारंटी का दावा
 ,Lead Details,विवरण लीड
 DocType: Purchase Invoice,End date of current invoice's period,वर्तमान चालान की अवधि की समाप्ति की तारीख
@@ -1522,7 +1536,7 @@
 DocType: Purchase Invoice,Additional Discount,अतिरिक्त छूट
 DocType: Selling Settings,Selling Settings,सेटिंग्स बेचना
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,ऑनलाइन नीलामी
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +97,Please specify either Quantity or Valuation Rate or both,मात्रा या मूल्यांकन दर या दोनों निर्दिष्ट करें
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,मात्रा या मूल्यांकन दर या दोनों निर्दिष्ट करें
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +13,Fulfillment,पूर्ति
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","कंपनी , महीना और वित्तीय वर्ष अनिवार्य है"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,विपणन व्यय
@@ -1543,14 +1557,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,ERPNext सेटअप पूरा हुआ!
 DocType: Item,Weightage,महत्व
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +93,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"ग्राहक समूह समान नाम के साथ पहले से मौजूद है, कृपया ग्राहक का नाम बदले या ग्राहक समूह का नाम बदले"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +126,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"ग्राहक समूह समान नाम के साथ पहले से मौजूद है, कृपया ग्राहक का नाम बदले या ग्राहक समूह का नाम बदले"
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,नया संपर्क
 DocType: Territory,Parent Territory,माता - पिता टेरिटरी
 DocType: Quality Inspection Reading,Reading 2,2 पढ़ना
 DocType: Stock Entry,Material Receipt,सामग्री प्राप्ति
 DocType: Homepage,Products,उत्पाद
 DocType: Announcement,Instructor,प्रशिक्षक
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},पार्टी का प्रकार और पार्टी प्राप्य / देय खाते के लिए आवश्यक है {0}
 DocType: Employee,AB+,एबी +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","इस मद वेरिएंट है, तो यह बिक्री के आदेश आदि में चयन नहीं किया जा सकता है"
 DocType: Lead,Next Contact By,द्वारा अगले संपर्क
@@ -1561,7 +1574,7 @@
 ,Item-wise Sales Register,आइटम के लिहाज से बिक्री रजिस्टर
 DocType: Asset,Gross Purchase Amount,सकल खरीद राशि
 DocType: Asset,Depreciation Method,मूल्यह्रास विधि
-apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Offline,ऑफलाइन
+apps/erpnext/erpnext/accounts/page/pos/pos.js +686,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,अपेक्षित
@@ -1579,25 +1592,27 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +425,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 +858,Make Purchase Order,बनाओ खरीद आदेश
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +852,Make Purchase Order,बनाओ खरीद आदेश
 DocType: SMS Center,Send To,इन्हें भेजें
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,There is not enough leave balance for Leave Type {0},छोड़ दो प्रकार के लिए पर्याप्त छुट्टी संतुलन नहीं है {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,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 +172,Work-in-Progress Warehouse is required before Submit,वर्क प्रगति वेयरहाउस प्रस्तुत करने से पहले आवश्यक है
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,Work-in-Progress Warehouse is required before Submit,वर्क प्रगति वेयरहाउस प्रस्तुत करने से पहले आवश्यक है
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,एक नौकरी के लिए आवेदक.
 DocType: Purchase Order Item,Warehouse and Reference,गोदाम और संदर्भ
 DocType: Supplier,Statutory info and other general information about your Supplier,वैधानिक अपने सप्लायर के बारे में जानकारी और अन्य सामान्य जानकारी
-apps/erpnext/erpnext/hooks.py +88,Addresses,पतों
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,प्रदायक&gt; प्रदायक प्रकार
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +212,Against Journal Entry {0} does not have any unmatched {1} entry,जर्नल के खिलाफ एंट्री {0} किसी भी बेजोड़ {1} प्रविष्टि नहीं है
+apps/erpnext/erpnext/hooks.py +95,Addresses,पतों
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +215,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,कृपया मद या गोदाम के आधार पर फ़िल्टर सेट
 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,उद्धार और बिल के लिए
@@ -1605,11 +1620,10 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,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 +731,Payment,भुगतान
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,Payment,भुगतान
 DocType: Production Order Operation,Actual Time and Cost,वास्तविक समय और लागत
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},अधिकतम की सामग्री अनुरोध {0} मद के लिए {1} के खिलाफ किया जा सकता है बिक्री आदेश {2}
 DocType: Employee,Salutation,अभिवादन
-DocType: Pricing Rule,Brand,ब्रांड
 DocType: Course,Course Abbreviation,कोर्स संक्षिप्त
 DocType: Item,Will also apply for variants,यह भी वेरिएंट के लिए लागू होगी
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +142,"Asset cannot be cancelled, as it is already {0}","एसेट, रद्द नहीं किया जा सकता क्योंकि यह पहले से ही है {0}"
@@ -1621,7 +1635,7 @@
 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.",अपने उत्पादों या आप खरीदने या बेचने सेवाओं है कि सूची .
 DocType: Hub Settings,Hub Node,हब नोड
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,आप डुप्लिकेट आइटम दर्ज किया है . सुधारने और पुन: प्रयास करें .
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Associate,सहयोगी
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,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,रिसीवर सूची बनाएँ
@@ -1629,7 +1643,7 @@
 DocType: Production Planning Tool,Material Requests,सामग्री अनुरोध
 DocType: Warranty Claim,Issue Date,जारी करने की तिथि
 DocType: Activity Cost,Activity Cost,गतिविधि लागत
-DocType: Timesheet Detail,Timesheet Detail,timesheet विस्तार
+DocType: Sales Invoice Timesheet,Timesheet Detail,timesheet विस्तार
 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),पैकेज इस वितरण का एक हिस्सा है कि संकेत करता है (केवल मसौदा)
@@ -1652,6 +1666,7 @@
 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,वेरिएंट है
 DocType: Monthly Distribution,Name of the Monthly Distribution,मासिक वितरण का नाम
 DocType: Sales Person,Parent Sales Person,माता - पिता बिक्री व्यक्ति
@@ -1664,31 +1679,32 @@
 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 +44,"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/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.,एक बार जब आप विक्रय इनवॉइस सहेजें शब्दों में दिखाई जाएगी।
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +502,Error: {0} &gt; {1},त्रुटि: {0}&gt; {1}
 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.,टर्म प्रारंभ तिथि से शैक्षणिक वर्ष की वर्ष प्रारंभ तिथि जो करने के लिए शब्द जुड़ा हुआ है पहले नहीं हो सकता है (शैक्षिक वर्ष {})। तारीखों को ठीक करें और फिर कोशिश करें।
 DocType: Naming Series,Current Value,वर्तमान मान
-apps/erpnext/erpnext/controllers/accounts_controller.py +235,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,एकाधिक वित्तीय वर्ष की तारीख {0} के लिए मौजूद हैं। वित्त वर्ष में कंपनी सेट करें
+apps/erpnext/erpnext/controllers/accounts_controller.py +238,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 +458,Item table can not be blank,आइटम तालिका खाली नहीं हो सकता
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +443,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 +5,This is based on stock movement. See {0} for details,यह शेयर आंदोलन पर आधारित है। देखें {0} जानकारी के लिए
 DocType: Pricing Rule,Selling,विक्रय
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +341,Amount {0} {1} deducted against {2},राशि {0} {1} {2} के खिलाफ की कटौती
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +344,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,नियत तिथि तिथि पोस्टिंग से पहले नहीं किया जा सकता
@@ -1703,8 +1719,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +144,Cannot refer row number greater than or equal to current row number for this Charge type,इस आरोप प्रकार के लिए अधिक से अधिक या वर्तमान पंक्ति संख्या के बराबर पंक्ति संख्या का उल्लेख नहीं कर सकते
 DocType: Asset,Sold,बिक गया
 ,Item-wise Purchase History,आइटम के लिहाज से खरीदारी इतिहास
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Red,लाल
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},सीरियल मद के लिए जोड़ा लाने के लिए 'उत्पन्न अनुसूची' पर क्लिक करें {0}
+apps/erpnext/erpnext/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,ओपन उत्पादन के आदेश
 DocType: Sales Invoice Payment,Base Amount (Company Currency),आधार राशि (कंपनी मुद्रा)
@@ -1712,7 +1728,7 @@
 DocType: Installation Note,Installation Time,अधिष्ठापन काल
 DocType: Sales Invoice,Accounting Details,लेखा विवरण
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,इस कंपनी के लिए सभी लेन-देन को हटाएं
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +187,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,पंक्ति # {0}: ऑपरेशन {1} उत्पादन में तैयार माल की {2} मात्रा के लिए पूरा नहीं है आदेश # {3}। टाइम लॉग्स के माध्यम से आपरेशन स्थिति अपडेट करें
+apps/erpnext/erpnext/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}। टाइम लॉग्स के माध्यम से आपरेशन स्थिति अपडेट करें
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,निवेश
 DocType: Issue,Resolution Details,संकल्प विवरण
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,आवंटन
@@ -1748,16 +1764,17 @@
 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}
 DocType: Delivery Note,Excise Page Number,आबकारी पृष्ठ संख्या
 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}
 ,Maintenance Schedules,रखरखाव अनुसूचियों
 DocType: Task,Actual End Date (via Time Sheet),वास्तविक अंत तिथि (समय पत्रक के माध्यम से)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Amount {0} {1} against {2} {3},राशि {0} {1} के खिलाफ {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +339,Amount {0} {1} against {2} {3},राशि {0} {1} के खिलाफ {2} {3}
 ,Quotation Trends,कोटेशन रुझान
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},आइटम के लिए आइटम मास्टर में उल्लेख नहीं मद समूह {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +295,Debit To account must be a Receivable account,खाते में डेबिट एक प्राप्य खाता होना चाहिए
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Receivable account,खाते में डेबिट एक प्राप्य खाता होना चाहिए
 DocType: Shipping Rule Condition,Shipping Amount,नौवहन राशि
 ,Pending Amount,लंबित राशि
 DocType: Purchase Invoice Item,Conversion Factor,परिवर्तनकारक तत्व
@@ -1765,10 +1782,10 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +137,Expected value after useful life must be greater than or equal to {0},उपयोगी जीवन के बाद उम्मीद मूल्य से अधिक या बराबर होना चाहिए {0}
 DocType: Purchase Receipt,Vehicle Number,वाहन संख्या
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,"तारीख, जिस पर आवर्ती चालान रोकने के लिए किया जाएगा"
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +90,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,कुल आवंटित पत्ते {0} कम नहीं हो सकता अवधि के लिए पहले से ही मंजूरी दे दी पत्ते {1} से
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +93,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 +22,Enter Paid Amount,भुगतान की गई राशि दर्ज
+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,मल्टी लेवल बीओएम का उपयोग करें
@@ -1778,13 +1795,15 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,timesheets
 DocType: HR Settings,HR Settings,मानव संसाधन सेटिंग्स
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Expense Claim is pending approval. Only the Expense Approver can update status.,खर्च का दावा अनुमोदन के लिए लंबित है . केवल खर्च अनुमोदक स्थिति अपडेट कर सकते हैं .
+DocType: Email Digest,New Expenses,नए खर्च
 DocType: Purchase Invoice,Additional Discount Amount,अतिरिक्त छूट राशि
-apps/erpnext/erpnext/controllers/accounts_controller.py +524,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","पंक्ति # {0}: मात्रा, 1 होना चाहिए के रूप में आइटम एक निश्चित परिसंपत्ति है। कई मात्रा के लिए अलग पंक्ति का उपयोग करें।"
+apps/erpnext/erpnext/controllers/accounts_controller.py +527,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","पंक्ति # {0}: मात्रा, 1 होना चाहिए के रूप में आइटम एक निश्चित परिसंपत्ति है। कई मात्रा के लिए अलग पंक्ति का उपयोग करें।"
 DocType: Leave Block List Allow,Leave Block List Allow,छोड़ दो ब्लॉक सूची की अनुमति दें
 apps/erpnext/erpnext/setup/doctype/company/company.py +249,Abbr can not be blank or space,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/stock/get_item_details.py +123,Please specify Company,कंपनी निर्दिष्ट करें
 ,Customer Acquisition and Loyalty,ग्राहक अधिग्रहण और वफादारी
@@ -1795,17 +1814,19 @@
 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 +183,Closing (Opening + Totals),समापन (+ योग खोलने)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),समापन (+ योग खोलने)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,कंपनी में मुद्रा निर्दिष्ट करें
 DocType: Workstation,Wages per hour,प्रति घंटे मजदूरी
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +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/controllers/accounts_controller.py +272,Account {0} is invalid. Account Currency must be {1},खाते {0} अमान्य है। खाता मुद्रा होना चाहिए {1}
+DocType: Email Digest,Pending Sales Orders,विक्रय आदेश लंबित
+apps/erpnext/erpnext/controllers/accounts_controller.py +275,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 +956,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","पंक्ति # {0}: संदर्भ दस्तावेज़ प्रकार बिक्री आदेश में से एक, बिक्री चालान या जर्नल प्रविष्टि होना चाहिए"
-DocType: Salary Slip,Deduction,कटौती
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +87,Row {0}: From Time and To Time is mandatory.,पंक्ति {0}: समय और समय के लिए अनिवार्य है।
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +969,"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 +111,Row {0}: From Time and To Time is mandatory.,पंक्ति {0}: समय और समय के लिए अनिवार्य है।
+DocType: Stock Reconciliation Item,Amount Difference,राशि अंतर
 apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},मद कीमत के लिए जोड़ा {0} मूल्य सूची में {1}
 DocType: Address Template,Address Template,पता खाका
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +7,Please enter Employee Id of this sales person,इस व्यक्ति की बिक्री के कर्मचारी आईडी दर्ज करें
@@ -1813,7 +1834,7 @@
 DocType: Project,% Tasks Completed,% कार्य संपन्न
 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 +194,Please enter Production Item first,पहली उत्पादन मद दर्ज करें
+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,विकलांग उपयोगकर्ता
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,उद्धरण
@@ -1822,53 +1843,54 @@
 DocType: Maintenance Visit,Maintenance User,रखरखाव उपयोगकर्ता
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +149,Cost Updated,मूल्य अपडेट
 DocType: Employee,Date of Birth,जन्म तिथि
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +86,Item {0} has already been returned,आइटम {0} पहले से ही लौटा दिया गया है
+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}
+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 +177,Job Description,नौकरी का विवरण
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,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 +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","सिवाय विशेष अक्षर ""-"" ""।"" ""#"", और ""/"" श्रृंखला के नामकरण में अनुमति नहीं"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","सिवाय विशेष अक्षर ""-"" ""।"" ""#"", और ""/"" श्रृंखला के नामकरण में अनुमति नहीं"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","बिक्री अभियान का ट्रैक रखें। बिक्रीसूत्र, कोटेशन का ट्रैक रखें, बिक्री आदेश आदि अभियानों से निवेश पर लौटें गेज करने के लिए।"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +24,Welcome to POS: Create your POS Profile,स्थिति में आपका स्वागत है: अपने पीओएस प्रोफ़ाइल बनाएँ
 DocType: Expense Claim,Approver,सरकारी गवाह
 ,SO Qty,अतः मात्रा
+DocType: Guardian,Work Address,कार्यालय का पता
 DocType: Appraisal,Calculate Total Score,कुल स्कोर की गणना
 DocType: Request for Quotation,Manufacturing Manager,विनिर्माण प्रबंधक
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},धारावाहिक नहीं {0} तक वारंटी के अंतर्गत है {1}
+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 +74,Shipments,लदान
+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 +153,Row # ,पंक्ति #
+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 +156,Get From,से मिलता है
+apps/erpnext/erpnext/public/js/utils.js +167,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 +167,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,व्यय या अंतर खाता अनिवार्य है मद के लिए {0} यह प्रभावों समग्र शेयर मूल्य के रूप में
-apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","पंक्ति में आइटम {0} के लिए overbill नहीं कर सकते हैं {1} से अधिक {2}। Overbilling, स्टॉक सेटिंग्स में सेट कृपया अनुमति देने के लिए"
+apps/erpnext/erpnext/controllers/accounts_controller.py +419,"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,ऊपर
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} is disabled,प्रयोक्ता {0} अक्षम है
 DocType: Leave Application,Total Leave Days,कुल छोड़ दो दिन
 DocType: Email Digest,Note: Email will not be sent to disabled users,नोट: ईमेल अक्षम उपयोगकर्ताओं के लिए नहीं भेजा जाएगा
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,कंपनी का चयन करें ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,रिक्त छोड़ अगर सभी विभागों के लिए विचार
 apps/erpnext/erpnext/config/hr.py +171,"Types of employment (permanent, contract, intern etc.).","रोजगार ( स्थायी , अनुबंध , प्रशिक्षु आदि ) के प्रकार."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +346,{0} is mandatory for Item {1},{0} मद के लिए अनिवार्य है {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,{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","कम से कम एक पंक्ति में आवंटित राशि, प्रकार का चालान और चालान नंबर का चयन करें"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,नई खरीद की लागत
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},आइटम के लिए आवश्यक बिक्री आदेश {0}
 DocType: Purchase Invoice Item,Rate (Company Currency),दर (कंपनी मुद्रा)
-apps/erpnext/erpnext/demo/setup_data.py +360,Others,दूसरों
+DocType: Student Guardian,Others,दूसरों
 DocType: Payment Entry,Unallocated Amount,unallocated राशि
 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,करों और प्रभार
@@ -1888,17 +1910,16 @@
 apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,श्रृंखलाबद्ध इन्वेंटरी
 DocType: Activity Type,Default Billing Rate,डिफ़ॉल्ट बिलिंग दर
 DocType: Sales Invoice,Total Billing Amount,कुल बिलिंग राशि
-apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +54,Receivable Account,प्राप्य खाता
-apps/erpnext/erpnext/controllers/accounts_controller.py +546,Row #{0}: Asset {1} is already {2},पंक्ति # {0}: संपत्ति {1} पहले से ही है {2}
+apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,प्राप्य खाता
+apps/erpnext/erpnext/controllers/accounts_controller.py +549,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 +79,CEO,सी ई ओ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,सी ई ओ
 DocType: Expense Claim Detail,Expense Claim Detail,व्यय दावा विवरण
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +808,Please select correct account,सही खाते का चयन करें
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +809,Please select correct account,सही खाते का चयन करें
 DocType: Item,Weight UOM,वजन UOM
 DocType: Salary Structure Employee,Salary Structure Employee,वेतन ढांचे कर्मचारी
 DocType: Employee,Blood Group,रक्त वर्ग
-DocType: Purchase Invoice Item,Page Break,पृष्ठातर
 DocType: Production Order Operation,Pending,अपूर्ण
 DocType: Course,Course Name,कोर्स का नाम
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,एक विशिष्ट कर्मचारी की छुट्टी आवेदनों को स्वीकृत कर सकते हैं जो प्रयोक्ता
@@ -1907,14 +1928,15 @@
 DocType: Fiscal Year,Companies,कंपनियां
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,इलेक्ट्रानिक्स
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,सामग्री अनुरोध उठाएँ जब शेयर पुनः आदेश के स्तर तक पहुँच
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Full-time,पूर्णकालिक
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,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: 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,कुल आवक मूल्य
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Debit To is required,डेबिट करने के लिए आवश्यक है
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +321,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,गुणवत्ता प्रबंधक
@@ -1922,6 +1944,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/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,कुल चालान किए गए राशि
@@ -1932,18 +1955,17 @@
 DocType: Production Order Operation,Completed Qty,पूरी की मात्रा
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"For {0}, only debit accounts can be linked against another credit entry","{0}, केवल डेबिट खातों एक और क्रेडिट प्रविष्टि के खिलाफ जोड़ा जा सकता है के लिए"
 apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,मूल्य सूची {0} अक्षम है
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +99,Row {0}: Completed Qty cannot be more than {1} for operation {2},पंक्ति {0}: पूर्ण मात्रा से अधिक नहीं हो सकता है {1} ऑपरेशन के लिए {2}
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +123,Row {0}: Completed Qty cannot be more than {1} for operation {2},पंक्ति {0}: पूर्ण मात्रा से अधिक नहीं हो सकता है {1} ऑपरेशन के लिए {2}
 DocType: Manufacturing Settings,Allow Overtime,ओवरटाइम की अनुमति दें
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} मद के लिए आवश्यक सीरियल नंबर {1}। आपके द्वारा दी गई {2}।
 DocType: Stock Reconciliation Item,Current Valuation Rate,वर्तमान मूल्यांकन दर
 DocType: Item,Customer Item Codes,ग्राहक आइटम संहिताओं
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,मुद्रा लाभ / हानि
 DocType: Opportunity,Lost Reason,खोया कारण
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,कृपया सेटअप सेटअप के माध्यम से उपस्थिति के लिए श्रृंखला नंबर&gt; नंबरिंग सीरीज
 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/purchase_receipt/purchase_receipt.py +378,All items have already been invoiced,सभी आइटम पहले से चालान कर दिया गया है
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +379,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,बाहरी
@@ -1959,18 +1981,19 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,अपने ग्राहकों
 apps/erpnext/erpnext/projects/doctype/project/project.py +141,You have been invited to collaborate on the project: {0},आप इस परियोजना पर सहयोग करने के लिए आमंत्रित किया गया है: {0}
 DocType: Leave Block List Date,Block Date,तिथि ब्लॉक
-apps/erpnext/erpnext/templates/generators/job_opening.html +19,Apply Now,अभी अप्लाई करें
+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.","बनाएँ और दैनिक, साप्ताहिक और मासिक ईमेल हज़म का प्रबंधन ."
 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,बिल्डिंग
-apps/erpnext/erpnext/utilities/doctype/address/address.py +164,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,कोई डिफ़ॉल्ट पता खाका पाया। सेटअप&gt; मुद्रण और ब्रांडिंग&gt; पता खाका से एक नया एक का सृजन करें।
 DocType: Fee Structure,Fee Structure,शुल्क संरचना
 DocType: Timesheet Detail,Costing Amount,लागत राशि
+DocType: Student Admission,Application Fee,आवेदन शुल्क
 DocType: Process Payroll,Submit Salary Slip,वेतनपर्ची सबमिट करें
-apps/erpnext/erpnext/controllers/selling_controller.py +161,Maxiumm discount for Item {0} is {1}%,आइटम के लिए Maxiumm छूट {0} {1} % है
+apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,आइटम के लिए Maxiumm छूट {0} {1} % है
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,थोक में आयात
 DocType: Sales Partner,Address & Contacts,पता और संपर्क
 DocType: SMS Log,Sender Name,प्रेषक का नाम
@@ -1995,21 +2018,21 @@
 DocType: Serial No,Delivery Time,सुपुर्दगी समय
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,के आधार पर बूढ़े
 DocType: Item,End of Life,जीवन का अंत
-apps/erpnext/erpnext/demo/setup_data.py +361,Travel,यात्रा
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +155,No active or default Salary Structure found for employee {0} for the given dates,दी गई तारीखों के लिए कर्मचारी {0} के लिए कोई सक्रिय या डिफ़ॉल्ट वेतन ढांचे
+apps/erpnext/erpnext/demo/setup/setup_data.py +304,Travel,यात्रा
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +167,No active or default Salary Structure found for employee {0} for the given dates,दी गई तारीखों के लिए कर्मचारी {0} के लिए कोई सक्रिय या डिफ़ॉल्ट वेतन ढांचे
 DocType: Leave Block List,Allow Users,उपयोगकर्ताओं को अनुमति दें
 DocType: Purchase Order,Customer Mobile No,ग्राहक मोबाइल नं
 DocType: Sales Invoice,Recurring,आवर्ती
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,अलग आय को ट्रैक और उत्पाद कार्यक्षेत्र या डिवीजनों के लिए खर्च।
 DocType: Rename Tool,Rename Tool,उपकरण का नाम बदलें
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +23,Update Cost,अद्यतन लागत
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,अद्यतन लागत
 DocType: Item Reorder,Item Reorder,आइटम पुनः क्रमित करें
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +36,Show Salary Slip,वेतन पर्ची दिखाएँ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +748,Transfer Material,हस्तांतरण सामग्री
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +53,Show Salary Slip,वेतन पर्ची दिखाएँ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +166,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 +923,Please set recurring after saving,सहेजने के बाद आवर्ती सेट करें
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +646,Select change amount account,बदलें चुनें राशि खाते
+apps/erpnext/erpnext/public/js/controllers/transaction.js +914,Please set recurring after saving,सहेजने के बाद आवर्ती सेट करें
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +703,Select change amount account,बदलें चुनें राशि खाते
 DocType: Purchase Invoice,Price List Currency,मूल्य सूची मुद्रा
 DocType: Naming Series,User must always select,उपयोगकर्ता हमेशा का चयन करना होगा
 DocType: Stock Settings,Allow Negative Stock,नकारात्मक स्टॉक की अनुमति दें
@@ -2021,31 +2044,32 @@
 DocType: Quality Inspection,Verified By,द्वारा सत्यापित
 DocType: Address,Subsidiary,सहायक
 apps/erpnext/erpnext/setup/doctype/company/company.py +64,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","मौजूदा लेनदेन कर रहे हैं , क्योंकि कंपनी के डिफ़ॉल्ट मुद्रा में परिवर्तन नहीं कर सकते हैं . लेनदेन डिफ़ॉल्ट मुद्रा बदलने के लिए रद्द कर दिया जाना चाहिए ."
+DocType: Grade Interval,Grade Description,ग्रेड विवरण
 DocType: Quality Inspection,Purchase Receipt No,रसीद खरीद नहीं
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,बयाना राशि
 DocType: Process Payroll,Create Salary Slip,वेतनपर्ची बनाएँ
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +33,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 +352,Quantity in row {0} ({1}) must be same as manufactured quantity {2},मात्रा पंक्ति में {0} ({1} ) के रूप में ही किया जाना चाहिए निर्मित मात्रा {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Quantity in row {0} ({1}) must be same as manufactured quantity {2},मात्रा पंक्ति में {0} ({1} ) के रूप में ही किया जाना चाहिए निर्मित मात्रा {2}
 DocType: Appraisal,Employee,कर्मचारी
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,उपयोगकर्ता के रूप में आमंत्रित
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} पूरी तरह से बिल भेजा है
 DocType: Workstation Working Hour,End Time,अंतिम समय
 DocType: Payment Entry,Payment Deductions or Loss,भुगतान कटौती या घटाने
-apps/erpnext/erpnext/config/schools.py +100,LMS,एलएमएस
+apps/erpnext/erpnext/config/schools.py +104,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,बिक्री पाइपलाइन
 DocType: Student Batch Student,Student Batch Student,छात्र बैच के छात्र
-DocType: Sales Invoice,Mass Mailing,मास मेलिंग
+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 +199,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/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 +297,Salary Slip of employee {0} already created for this period,कर्मचारी के वेतन पर्ची {0} पहले से ही इस अवधि के लिए बनाए गए
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Pharmaceutical,औषधि
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +309,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/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,करने के लिए क्रेडिट
@@ -2060,27 +2084,28 @@
 DocType: Upload Attendance,Attendance To Date,तिथि उपस्थिति
 DocType: Warranty Claim,Raised By,द्वारा उठाए गए
 DocType: Payment Gateway Account,Payment Account,भुगतान खाता
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +814,Please specify Company to proceed,कंपनी आगे बढ़ने के लिए निर्दिष्ट करें
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +793,Please specify Company to proceed,कंपनी आगे बढ़ने के लिए निर्दिष्ट करें
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Receivable,लेखा प्राप्य में शुद्ध परिवर्तन
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Compensatory Off,प्रतिपूरक बंद
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,प्रतिपूरक बंद
 DocType: Quality Inspection Reading,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.,आप वास्तव में इस कंपनी के लिए सभी लेन-देन को हटाना चाहते हैं सुनिश्चित करें। यह है के रूप में आपका मास्टर डाटा रहेगा। इस क्रिया को पूर्ववत नहीं किया जा सकता।
 DocType: Room,Room Number,कमरा संख्या
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},अमान्य संदर्भ {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +161,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) की योजना बनाई quanitity से अधिक नहीं हो सकता है ({2}) उत्पादन में आदेश {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +162,{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 +217,Raw Materials cannot be blank.,कच्चे माल खाली नहीं किया जा सकता।
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,"Could not update stock, invoice contains drop shipping item.","शेयर अद्यतन नहीं कर सका, चालान ड्रॉप शिपिंग आइटम शामिल हैं।"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +460,Quick Journal Entry,त्वरित जर्नल प्रविष्टि
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +111,You can not change rate if BOM mentioned agianst any item,बीओएम किसी भी आइटम agianst उल्लेख अगर आप दर में परिवर्तन नहीं कर सकते
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +441,"Could not update stock, invoice contains drop shipping item.","शेयर अद्यतन नहीं कर सका, चालान ड्रॉप शिपिंग आइटम शामिल हैं।"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Quick Journal Entry,त्वरित जर्नल प्रविष्टि
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +103,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 +214,{0} {1} is not submitted,{0} {1} प्रस्तुत नहीं किया गया है
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,आइटम के लिए अनुरोध.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,अलग उत्पादन का आदेश प्रत्येक समाप्त अच्छा आइटम के लिए बनाया जाएगा.
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +121,{0} must be negative in return document,{0} वापसी दस्तावेज़ में नकारात्मक होना चाहिए
 ,Minutes to First Response for Issues,मुद्दे के लिए पहली प्रतिक्रिया मिनट
 DocType: Purchase Invoice,Terms and Conditions1,नियम और Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,संस्थान का नाम है जिसके लिए आप इस प्रणाली स्थापित कर रहे हैं।
@@ -2089,16 +2114,17 @@
 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 +398,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 +739,Item or Warehouse for row {0} does not match Material Request,पंक्ति के लिए आइटम या वेयरहाउस {0} सामग्री अनुरोध मेल नहीं खाता
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +747,Item or Warehouse for row {0} does not match Material Request,पंक्ति के लिए आइटम या वेयरहाउस {0} सामग्री अनुरोध मेल नहीं खाता
 apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,माप की इकाई
 DocType: Fiscal Year,Year End Date,वर्षांत तिथि
 DocType: Task Depends On,Task Depends On,काम पर निर्भर करता है
-DocType: Lead,Opportunity,अवसर
+DocType: Supplier Quotation,Opportunity,अवसर
 ,Completed Production Orders,पूरे किए उत्पादन के आदेश
 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,मूलभूत वर्कस्टेशन
@@ -2111,7 +2137,7 @@
 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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},रखरखाव शुरू करने की तारीख धारावाहिक नहीं के लिए डिलीवरी की तारीख से पहले नहीं किया जा सकता {0}
+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,वास्तविक समाप्ति तिथि
 DocType: Purchase Invoice,PINV-,PINV-
 DocType: Authorization Rule,Applicable To (Role),के लिए लागू (रोल)
@@ -2126,7 +2152,7 @@
 DocType: SMS Log,No of Requested SMS,अनुरोधित एसएमएस की संख्या
 DocType: Campaign,Campaign-.####,अभियान . # # # #
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,अगला कदम
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,Please supply the specified items at the best possible rates,सबसे अच्छा संभव दरों पर निर्दिष्ट वस्तुओं की आपूर्ति करें
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +695,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 +117,Contract End Date must be greater than Date of Joining,अनुबंध समाप्ति तिथि शामिल होने की तिथि से अधिक होना चाहिए
 DocType: Delivery Note,DN-,DN-
@@ -2135,7 +2161,7 @@
 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 +14,This is an example website auto-generated from ERPNext,इस ERPNext से ऑटो उत्पन्न एक उदाहरण वेबसाइट है
+apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,इस ERPNext से ऑटो उत्पन्न एक उदाहरण वेबसाइट है
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,बूढ़े सीमा 1
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
@@ -2182,13 +2208,14 @@
 DocType: Purchase Receipt Item,Recd Quantity,रिसी डी मात्रा
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +54,Fee Records Created - {0},शुल्क रिकॉर्ड बनाया - {0}
 DocType: Asset Category Account,Asset Category Account,परिसंपत्ति वर्ग अकाउंट
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +103,Cannot produce more Item {0} than Sales Order quantity {1},अधिक आइटम उत्पादन नहीं कर सकते {0} से बिक्री आदेश मात्रा {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Stock Entry {0} is not submitted,स्टॉक एंट्री {0} प्रस्तुत नहीं किया गया है
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},अधिक आइटम उत्पादन नहीं कर सकते {0} से बिक्री आदेश मात्रा {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +505,Stock Entry {0} is not submitted,स्टॉक एंट्री {0} प्रस्तुत नहीं किया गया है
 DocType: Payment Reconciliation,Bank / Cash Account,बैंक / रोकड़ लेखा
 DocType: Tax Rule,Billing City,बिलिंग शहर
 DocType: Salary Component Account,Salary Component Account,वेतन घटक अकाउंट
 DocType: Global Defaults,Hide Currency Symbol,मुद्रा प्रतीक छुपाएँ
 apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card","जैसे बैंक, नकद, क्रेडिट कार्ड"
+DocType: Lead Source,Source Name,स्रोत का नाम
 DocType: Journal Entry,Credit Note,जमापत्र
 DocType: Warranty Claim,Service Address,सेवा पता
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furnitures and Fixtures,Furnitures और फिक्सर
@@ -2200,6 +2227,7 @@
 DocType: Opportunity,Customer / Lead Name,ग्राहक / लीड नाम
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +89,Clearance Date not mentioned,क्लीयरेंस तिथि का उल्लेख नहीं
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,उत्पादन
+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/controllers/trends.py +19,Total(Qty),कुल मात्रा)
 DocType: Sales Invoice,This Document,इस दस्तावेज़
@@ -2211,15 +2239,15 @@
 DocType: Purchase Receipt,Time at which materials were received,जो समय पर सामग्री प्राप्त हुए थे
 DocType: Stock Ledger Entry,Outgoing Rate,आउटगोइंग दर
 apps/erpnext/erpnext/config/hr.py +176,Organization branch master.,संगठन शाखा मास्टर .
-apps/erpnext/erpnext/controllers/accounts_controller.py +273, or ,या
+apps/erpnext/erpnext/controllers/accounts_controller.py +276, 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 +203,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,पंक्ति # {0}: जर्नल प्रविष्टि {1} खाता नहीं है {2} या पहले से ही एक और वाउचर के खिलाफ मिलान
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +206,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 +90,No employee for the above selected criteria OR salary slip already created,ऊपर चयनित मानदंड या वेतन पर्ची के लिए कोई कर्मचारी पहले से ही बनाया
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +93,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,भुगतान के प्रकार
@@ -2247,8 +2275,8 @@
 DocType: Product Bundle,Parent Item,मूल आइटम
 DocType: Account,Account Type,खाता प्रकार
 DocType: Delivery Note,DN-RET-,डी.एन.-RET-
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +115,Leave Type {0} cannot be carry-forwarded,{0} ले अग्रेषित नहीं किया जा सकता प्रकार छोड़ दो
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',रखरखाव अनुसूची सभी मदों के लिए उत्पन्न नहीं है . 'उत्पन्न अनुसूची' पर क्लिक करें
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +118,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 +163,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","पंक्ति के लिए {0} में {1}। आइटम दर में {2} में शामिल करने के लिए, पंक्तियों {3} भी शामिल किया जाना चाहिए"
@@ -2260,13 +2288,13 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +32,Disabled template must not be default template,विकलांगों के लिए टेम्पलेट डिफ़ॉल्ट टेम्पलेट नहीं होना चाहिए
 DocType: Account,Income Account,आय खाता
 DocType: Payment Request,Amount in customer's currency,ग्राहक की मुद्रा में राशि
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +748,Delivery,वितरण
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +742,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,कुंजी जिम्मेदारी क्षेत्र
 DocType: Payment Entry,Total Allocated Amount,कुल आवंटित राशि
 DocType: Item Reorder,Material Request Type,सामग्री अनुरोध प्रकार
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +82,Row {0}: UOM Conversion Factor is mandatory,पंक्ति {0}: UoM रूपांतरण कारक है अनिवार्य है
+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,लागत केंद्र
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,वाउचर #
@@ -2277,13 +2305,13 @@
 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 +90,Head of Marketing and Sales,मार्केटिंग और सेल्स के प्रमुख
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,आयकर
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,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 +403,Please enter Item Code to get batch no,कोई बैच पाने के मद कोड दर्ज करें
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +770,Please select a value for {0} quotation_to {1},के लिए एक मूल्य का चयन करें {0} quotation_to {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +397,Please enter Item Code to get batch no,कोई बैच पाने के मद कोड दर्ज करें
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +764,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","निम्नलिखित गुण दोनों रिकॉर्ड में वही कर रहे हैं अगर विलय ही संभव है। समूह, रूट प्रकार, कंपनी है"
@@ -2295,28 +2323,29 @@
 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 +100,Issues,मुद्दे
+apps/erpnext/erpnext/hooks.py +109,Issues,मुद्दे
 apps/erpnext/erpnext/controllers/status_updater.py +13,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,बिलिंग मुद्रा
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Large,एक्स्ट्रा लार्ज
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,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 +507,Warning: Another {0} # {1} exists against stock entry {2},चेतावनी: एक और {0} # {1} शेयर प्रविष्टि के खिलाफ मौजूद है {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Local,स्थानीय
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +508,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),ऋण और अग्रिम ( संपत्ति)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,देनदार
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Large,बड़ा
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,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 +225,Total {0} ({1}),कुल {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +224,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,डिफ़ॉल्ट मूल्यन विधि
@@ -2374,9 +2403,9 @@
 DocType: Attendance,Leave Type,प्रकार छोड़ दो
 apps/erpnext/erpnext/controllers/stock_controller.py +173,Expense / Difference account ({0}) must be a 'Profit or Loss' account,व्यय / अंतर खाते ({0}) एक 'लाभ या हानि' खाता होना चाहिए
 DocType: Account,Accounts User,उपयोगकर्ता खातों
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Name error: {0},नाम में त्रुटि: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +90,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 +178,{0} {1} does not associated with {2} {3},{0} {1} के साथ जुड़े नहीं है {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +181,{0} {1} does not associated with {2} {3},{0} {1} के साथ जुड़े नहीं है {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,कर्मचारी के लिए उपस्थिति {0} पहले से ही चिह्नित है
 DocType: Packing Slip,If more than one package of the same type (for print),यदि एक ही प्रकार के एक से अधिक पैकेज (प्रिंट के लिए)
 DocType: Warehouse,Parent Warehouse,जनक गोदाम
@@ -2395,7 +2424,7 @@
 DocType: BOM Item,Scrap %,% स्क्रैप
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection","प्रभार अनुपात में अपने चयन के अनुसार, मद मात्रा या राशि के आधार पर वितरित किया जाएगा"
 DocType: Maintenance Visit,Purposes,उद्देश्यों
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,कम से कम एक आइटम वापसी दस्तावेज़ में नकारात्मक मात्रा के साथ दर्ज किया जाना चाहिए
+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 +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","ऑपरेशन {0} कार्य केंद्र में किसी भी उपलब्ध काम के घंटे से अधिक समय तक {1}, कई आपरेशनों में आपरेशन तोड़ने के नीचे"
 ,Requested,निवेदित
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +83,No Remarks,कोई टिप्पणी
@@ -2407,46 +2436,46 @@
 DocType: Item,Total Projected Qty,कुल अनुमानित मात्रा
 DocType: Monthly Distribution,Distribution Name,वितरण नाम
 DocType: Course,Course Code,पाठ्यक्रम कोड
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Quality Inspection required for Item {0},आइटम के लिए आवश्यक गुणवत्ता निरीक्षण {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Quality Inspection required for Item {0},आइटम के लिए आवश्यक गुणवत्ता निरीक्षण {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,जिस पर दर ग्राहक की मुद्रा कंपनी के बेस मुद्रा में परिवर्तित किया जाता है
 DocType: Purchase Invoice Item,Net Rate (Company Currency),शुद्ध दर (कंपनी मुद्रा)
 DocType: Salary Detail,Condition and Formula Help,स्थिति और फॉर्मूला सहायता
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,टेरिटरी ट्री प्रबंधन .
 DocType: Journal Entry Account,Sales Invoice,बिक्री चालान
 DocType: Journal Entry Account,Party Balance,पार्टी बैलेंस
-apps/erpnext/erpnext/accounts/page/pos/pos.js +475,Please select Apply Discount On,डिस्काउंट पर लागू होते हैं का चयन करें
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +92,Salary Slip Created,वेतन पर्ची बनाया
+apps/erpnext/erpnext/accounts/page/pos/pos.js +464,Please select Apply Discount On,डिस्काउंट पर लागू होते हैं का चयन करें
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +95,Salary Slip Created,वेतन पर्ची बनाया
 DocType: Company,Default Receivable Account,डिफ़ॉल्ट प्राप्य खाता
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,ऊपर चयनित मानदंड के लिए भुगतान की गई कुल वेतन के लिए बैंक प्रविष्टि बनाएँ
 DocType: Stock Entry,Material Transfer for Manufacture,निर्माण के लिए सामग्री हस्तांतरण
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,डिस्काउंट प्रतिशत एक मूल्य सूची के खिलाफ या सभी मूल्य सूची के लिए या तो लागू किया जा सकता है.
 DocType: Purchase Invoice,Half-yearly,आधे साल में एक बार
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +384,Accounting Entry for Stock,शेयर के लिए लेखा प्रविष्टि
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +387,Accounting Entry for Stock,शेयर के लिए लेखा प्रविष्टि
 DocType: Sales Invoice,Sales Team1,Team1 बिक्री
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,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 +96,Row {0}: Completed Qty must be greater than zero.,पंक्ति {0}: पूर्ण मात्रा शून्य से अधिक होना चाहिए।
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +120,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 +88,Row # {0}: Cannot return more than {1} for Item {2},पंक्ति # {0}: अधिक से अधिक नहीं लौट सकते हैं {1} आइटम के लिए {2}
+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,भूखंड
 DocType: Item Group,Show this slideshow at the top of the page,पृष्ठ के शीर्ष पर इस स्लाइड शो दिखाएँ
 DocType: BOM,Item UOM,आइटम UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),सबसे कम राशि के बाद टैक्स राशि (कंपनी मुद्रा)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +147,Target warehouse is mandatory for row {0},लक्ष्य गोदाम पंक्ति के लिए अनिवार्य है {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,प्रदायक पते का चयन
 DocType: Quality Inspection,Quality Inspection,गुणवत्ता निरीक्षण
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Extra Small,अतिरिक्त छोटा
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,Warning: Material Requested Qty is less than Minimum Order Qty,चेतावनी: मात्रा अनुरोध सामग्री न्यूनतम आदेश मात्रा से कम है
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +194,Account {0} is frozen,खाते {0} जमे हुए है
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,अतिरिक्त छोटा
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +690,Warning: Material Requested Qty is less than Minimum Order Qty,चेतावनी: मात्रा अनुरोध सामग्री न्यूनतम आदेश मात्रा से कम है
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,खाते {0} जमे हुए है
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,संगठन से संबंधित खातों की एक अलग चार्ट के साथ कानूनी इकाई / सहायक।
 DocType: Payment Request,Mute Email,म्यूट ईमेल
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","खाद्य , पेय और तंबाकू"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +606,Can only make payment against unbilled {0},केवल विरुद्ध भुगतान कर सकते हैं unbilled {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +126,Commission rate cannot be greater than 100,आयोग दर 100 से अधिक नहीं हो सकता
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +609,Can only make payment against unbilled {0},केवल विरुद्ध भुगतान कर सकते हैं unbilled {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,आयोग दर 100 से अधिक नहीं हो सकता
 DocType: Stock Entry,Subcontract,उपपट्टा
 apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,1 {0} दर्ज करें
 DocType: Production Order Operation,Actual End Time,वास्तविक अंत समय
@@ -2457,30 +2486,30 @@
 DocType: SMS Log,No of Sent SMS,भेजे गए एसएमएस की संख्या
 DocType: Account,Expense Account,व्यय लेखा
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,सॉफ्टवेयर
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Colour,रंगीन
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,रंगीन
 DocType: Maintenance Visit,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; है आइटम का चयन करें और कोई अन्य उत्पाद बंडल नहीं है कृपया
 DocType: Student Log,Academic,एकेडमिक
-apps/erpnext/erpnext/controllers/accounts_controller.py +469,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),कुल अग्रिम ({0}) आदेश के खिलाफ {1} महायोग से बड़ा नहीं हो सकता है ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +472,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),कुल अग्रिम ({0}) आदेश के खिलाफ {1} महायोग से बड़ा नहीं हो सकता है ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,असमान महीने भर में लक्ष्य को वितरित करने के लिए मासिक वितरण चुनें।
 DocType: Purchase Invoice Item,Valuation Rate,मूल्यांकन दर
+DocType: Stock Reconciliation,SR/,एसआर /
 apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,मूल्य सूची मुद्रा का चयन नहीं
 DocType: Assessment,Results,परिणाम
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +168,Employee {0} has already applied for {1} between {2} and {3},कर्मचारी {0} पहले से ही दोनों के बीच {1} के लिए आवेदन किया है {2} और {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +175,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: Student Applicant,Father's/ Guardian 2 Email ID,पिता / 2 गार्जियन ईमेल आईडी
 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 +228,Warehouses with existing transaction can not be converted to group.,मौजूदा लेनदेन के साथ गोदामों समूह में परिवर्तित नहीं किया जा सकता है।
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +231,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 +93,Researcher,अनुसंधानकर्ता
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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.,इनकमिंग गुणवत्ता निरीक्षण.
@@ -2492,25 +2521,25 @@
 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: Sales Invoice,Advertisement,विज्ञापन
 DocType: Asset Category Account,Depreciation Expense Account,मूल्यह्रास व्यय खाते में
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Probationary Period,परिवीक्षाधीन अवधि
-apps/erpnext/erpnext/hooks.py +102,Announcements,घोषणाएँ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,परिवीक्षाधीन अवधि
+apps/erpnext/erpnext/hooks.py +111,Announcements,घोषणाएँ
 DocType: Customer Group,Only leaf nodes are allowed in transaction,केवल पत्ता नोड्स के लेनदेन में की अनुमति दी जाती है
 DocType: Expense Claim,Expense Approver,व्यय अनुमोदनकर्ता
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +109,Row {0}: Advance against Customer must be credit,पंक्ति {0}: ग्राहक के खिलाफ अग्रिम ऋण होना चाहिए
 apps/erpnext/erpnext/accounts/doctype/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 +16,To Datetime,Datetime करने के लिए
+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/scheduling_tool/scheduling_tool.py +51,Course Schedules deleted:,कोर्स अनुसूचियों को हटाया:
 apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,एसएमएस वितरण की स्थिति बनाए रखने के लिए लॉग
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,गतिविधियों में लंबित
+DocType: Accounts Settings,Make Payment via Journal Entry,जर्नल प्रविष्टि के माध्यम से भुगतान करने के
+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 +127,Please enter relieving date.,तारीख से राहत दर्ज करें.
-apps/erpnext/erpnext/controllers/trends.py +145,Amt,राशि
+apps/erpnext/erpnext/controllers/trends.py +149,Amt,राशि
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,Only Leave Applications with status 'Approved' can be submitted,केवल प्रस्तुत किया जा सकता है 'स्वीकृत' स्थिति के साथ आवेदन छोड़ दो
 apps/erpnext/erpnext/utilities/doctype/address/address.py +26,Address Title is mandatory.,पता शीर्षक अनिवार्य है .
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,अभियान का नाम दर्ज़ अगर जांच के स्रोत अभियान
@@ -2528,14 +2557,15 @@
 apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1},{0} के लिए विनिमय दर मिल करने में असमर्थ {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,मार्क आधे दिन
 DocType: Sales Invoice,Sales Team,बिक्री टीम
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Duplicate entry,प्रवेश डुप्लिकेट
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,प्रवेश डुप्लिकेट
 DocType: Program Enrollment Tool,Get Students,छात्रों
 DocType: Serial No,Under Warranty,वारंटी के अंतर्गत
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +490,[Error],[त्रुटि]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +484,[Error],[त्रुटि]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,एक बार जब आप विक्रय क्रम सहेजें शब्दों में दिखाई जाएगी।
 ,Employee Birthday,कर्मचारी जन्मदिन
 apps/erpnext/erpnext/controllers/status_updater.py +175,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} पहले से ही मौजूद है। इन प्रविष्टियों को संशोधित करने और फिर कोशिश करें।
 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} मौजूद नहीं है
@@ -2551,22 +2581,22 @@
 ,Issued Items Against Production Order,उत्पादन के आदेश के खिलाफ जारी किए गए आइटम
 DocType: Pricing Rule,Purchase Manager,खरीद प्रबंधक
 DocType: Target Detail,Target Detail,लक्ष्य विस्तार
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +25,All Jobs,सारी नौकरियां
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,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 +323,Amount {0} {1} {2} {3},राशि {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,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: Supplier,Credit Limit,साख सीमा
 DocType: Production Plan Sales Order,Salse Order Date,Salse आदेश दिनांक
 DocType: Salary Component,Salary Component,वेतन घटक
-apps/erpnext/erpnext/accounts/utils.py +372,Payment Entries {0} are un-linked,भुगतान प्रविष्टियां {0} संयुक्त राष्ट्र से जुड़े हैं
+apps/erpnext/erpnext/accounts/utils.py +449,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 +497,Material Requests {0} created,सामग्री अनुरोध {0} बनाया
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +498,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.,शब्दों या अनुबंध के टेम्पलेट.
 DocType: Purchase Invoice,Address and Contact,पता और संपर्क
@@ -2605,7 +2635,7 @@
 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 +848,Paid Amount cannot be greater than total negative outstanding amount {0},भुगतान की गई राशि कुल नकारात्मक बकाया राशि से अधिक नहीं हो सकता है {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +859,Paid Amount cannot be greater than total negative outstanding amount {0},भुगतान की गई राशि कुल नकारात्मक बकाया राशि से अधिक नहीं हो सकता है {0}
 DocType: Employee Internal Work History,Employee Internal Work History,कर्मचारी आंतरिक कार्य इतिहास
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +233,Closing (Dr),समापन (डॉ.)
 DocType: Cheque Print Template,Cheque Size,चैक आकार
@@ -2626,7 +2656,8 @@
 ,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 +555,'Update Stock' cannot be checked for fixed asset sale,&#39;अपडेट शेयर&#39; निश्चित संपत्ति बिक्री के लिए जाँच नहीं की जा सकती
+DocType: Student Guardian,Father,पिता
+apps/erpnext/erpnext/controllers/accounts_controller.py +558,'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} को रद्द कर दिया है या बंद कर दिया गया है
@@ -2636,15 +2667,15 @@
 DocType: Sales Order,Fully Delivered,पूरी तरह से वितरित
 DocType: Lead,Lower Income,कम आय
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","लाभ / हानि बुक किया जा जाएगा जिसमें दायित्व के तहत खाता सिर ,"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +166,Source and target warehouse cannot be same for row {0},स्रोत और लक्ष्य गोदाम पंक्ति के लिए समान नहीं हो सकता {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","यह स्टॉक सुलह एक खोलने एंट्री के बाद से अंतर खाते, एक एसेट / दायित्व प्रकार खाता होना चाहिए"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +81,Purchase Order number required for Item {0},क्रय आदेश संख्या मद के लिए आवश्यक {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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/purchase_receipt/purchase_receipt.py +82,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 +17,Cannot change status as student {0} is linked with student application {1},छात्र के रूप में स्थिति को बदल नहीं सकते {0} छात्र आवेदन के साथ जुड़ा हुआ है {1}
+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: Timesheet,"List of employee which has ""Salary Slip Based on Timesheet"" is enabled in salary structure.",कर्मचारी की सूची है जो &quot;वेतन पर्ची Timesheet के आधार पर&quot; है वेतन संरचना में सक्षम है।
 DocType: Asset,Fully Depreciated,पूरी तरह से घिस
 ,Stock Projected Qty,शेयर मात्रा अनुमानित
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Customer {0} does not belong to project {1},ग्राहक {0} परियोजना से संबंधित नहीं है {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,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,सीरियल नहीं और बैच
@@ -2656,7 +2687,7 @@
 DocType: Purchase Invoice,Purchase Taxes and Charges,खरीद कर और शुल्क
 ,Qty to Receive,प्राप्त करने के लिए मात्रा
 DocType: Leave Block List,Leave Block List Allowed,छोड़ दो ब्लॉक सूची रख सकते है
-apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +55,All Warehouses,सभी गोदामों
+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 +105,Credit To account must be a Balance Sheet account,खाते में जमा एक बैलेंस शीट खाता होना चाहिए
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,सभी आपूर्तिकर्ता के प्रकार
@@ -2668,10 +2699,10 @@
 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/manufacturing/doctype/bom/bom.js +26,Browse BOM,ब्राउज़ बीओएम
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,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/asset/depreciation.py +94,Please set Depreciation related Accounts in Asset Category {0} or Company {1},में परिसंपत्ति वर्ग {0} या कंपनी मूल्यह्रास संबंधित खाते सेट करें {1}
-DocType: Academic Year,Academic Year,शैक्षणिक वर्ष
+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,सीआरएम
 DocType: Appraisal,Appraisal,मूल्यांकन
@@ -2679,12 +2710,12 @@
 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 +197,Leave approver must be one of {0},छोड़ दो सरकारी गवाह से एक होना चाहिए {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,Leave approver must be one of {0},छोड़ दो सरकारी गवाह से एक होना चाहिए {0}
 DocType: Hub Settings,Seller Email,विक्रेता ईमेल
 DocType: Project,Total Purchase Cost (via Purchase Invoice),कुल खरीद मूल्य (खरीद चालान के माध्यम से)
 DocType: Workstation Working Hour,Start Time,समय शुरू
 DocType: Item Price,Bulk Import Help,थोक आयात सहायता
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +256,Select Quantity,मात्रा चुनें
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +257,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,भेजे गए संदेश
@@ -2701,6 +2732,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,लक्ष्य मात्रा या लक्ष्य राशि या तो अनिवार्य है .
 apps/erpnext/erpnext/config/projects.py +45,Cost of various activities,विभिन्न गतिविधियों की लागत
 apps/erpnext/erpnext/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 +149,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}
 DocType: Item,Inspection Required,आवश्यक निरीक्षण
@@ -2720,7 +2752,7 @@
 DocType: Expense Claim,Approval Status,स्वीकृति स्थिति
 DocType: Hub Settings,Publish Items to Hub,हब के लिए आइटम प्रकाशित करें
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},मूल्य से पंक्ति में मान से कम होना चाहिए {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Wire Transfer,वायर ट्रांसफर
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,वायर ट्रांसफर
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,सभी की जांच करो
 DocType: Sales Order,Recurring Order,आवर्ती आदेश
 DocType: Company,Default Income Account,डिफ़ॉल्ट आय खाता
@@ -2732,21 +2764,19 @@
 ,Welcome to ERPNext,ERPNext में आपका स्वागत है
 apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,कोटेशन के लिए लीड
 DocType: Lead,From Customer,ग्राहक से
-apps/erpnext/erpnext/demo/setup_data.py +357,Calls,कॉल
+apps/erpnext/erpnext/demo/setup/setup_data.py +300,Calls,कॉल
 DocType: Project,Total Costing Amount (via Time Logs),कुल लागत राशि (टाइम लॉग्स के माध्यम से)
 DocType: Purchase Order Item Supplied,Stock UOM,स्टॉक UOM
-apps/erpnext/erpnext/stock/doctype/item/item.py +466,"As there are existing transactions for this item, \
-							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","वहाँ इस मद, \ आप के मूल्यों को बदलने के लिए नहीं कर सकते मौजूदा लेनदेन कर रहे हैं के रूप में &#39;सीरियल नहीं है&#39;, &#39;बैच है नहीं&#39;, &#39;शेयर मद है&#39; और &#39;मूल्यांकन पद्धति&#39;"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,Purchase Order {0} is not submitted,खरीद आदेश {0} प्रस्तुत नहीं किया गया है
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,प्रक्षेपित
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},धारावाहिक नहीं {0} वेयरहाउस से संबंधित नहीं है {1}
 apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,नोट : सिस्टम मद के लिए वितरण और अधिक से अधिक बुकिंग की जांच नहीं करेगा {0} मात्रा या राशि के रूप में 0 है
 DocType: Notification Control,Quotation Message,कोटेशन संदेश
 DocType: Issue,Opening Date,तिथि खुलने की
-apps/erpnext/erpnext/schools/api.py +58,Attendance has been marked successfully.,उपस्थिति सफलतापूर्वक अंकित की गई है।
+apps/erpnext/erpnext/schools/api.py +57,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 +136,Account Type for {0} must be {1},खाते का प्रकार {0} के लिए होना चाहिए {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +139,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,दोनों गोदाम एक ही कंपनी से संबंधित होना चाहिए
@@ -2761,12 +2791,13 @@
 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/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 +20,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 +1190,Please select customer,कृपया ग्राहक का चयन
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1193,Please select customer,कृपया ग्राहक का चयन
 DocType: C-Form,I,मैं
 DocType: Company,Asset Depreciation Cost Center,संपत्ति मूल्यह्रास लागत केंद्र
 DocType: Sales Order Item,Sales Order Date,बिक्री आदेश दिनांक
@@ -2776,6 +2807,7 @@
 ,Payment Period Based On Invoice Date,चालान तिथि के आधार पर भुगतान की अवधि
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},के लिए गुम मुद्रा विनिमय दरों {0}
 DocType: Assessment,Examiner,परीक्षक
+DocType: Student,Siblings,एक माँ की संताने
 DocType: Journal Entry,Stock Entry,स्टॉक एंट्री
 DocType: Payment Entry,Payment References,भुगतान संदर्भ
 DocType: C-Form,C-FORM-,सी-फार्म
@@ -2793,11 +2825,12 @@
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,विषय नाम
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,बेचने या खरीदने का कम से कम एक का चयन किया जाना चाहिए
+DocType: Grading Structure,Grade Intervals,ग्रेड अंतराल
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,आपके व्यवसाय की प्रकृति का चयन करें।
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,निर्माण कार्यों कहां किया जाता है।
 DocType: Asset Movement,Source Warehouse,स्रोत वेअरहाउस
 DocType: Installation Note,Installation Date,स्थापना की तारीख
-apps/erpnext/erpnext/controllers/accounts_controller.py +534,Row #{0}: Asset {1} does not belong to company {2},पंक्ति # {0}: संपत्ति {1} कंपनी का नहीं है {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +537,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,बिक्री प्रयोक्ता
@@ -2811,28 +2844,31 @@
 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 +111,Date Of Retirement must be greater than Date of Joining,सेवानिवृत्ति की तिथि शामिल होने की तिथि से अधिक होना चाहिए
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +49,There were errors while scheduling course on :,"वहाँ त्रुटियों पर पाठ्यक्रम का समय निर्धारण, जबकि थे:"
 DocType: Sales Invoice,Against Income Account,आय खाता के खिलाफ
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +87,{0}% Delivered,{0}% वितरित
+apps/erpnext/erpnext/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 +379,Please set default {0} in Company {1},डिफ़ॉल्ट {0} कंपनी में सेट करें {1}
+apps/erpnext/erpnext/accounts/utils.py +456,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,सकल लाभ / हानि
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,खरीद आदेश आइटम की आपूर्ति
 apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,कंपनी का नाम कंपनी नहीं किया जा सकता
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,प्रिंट टेम्पलेट्स के लिए पत्र सिर .
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,प्रिंट टेम्पलेट्स के लिए खिताब उदा प्रोफार्मा चालान .
+DocType: Student Guardian,Student Guardian,छात्र गार्जियन
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +184,Valuation type charges can not marked as Inclusive,मूल्यांकन प्रकार के आरोप समावेशी के रूप में चिह्नित नहीं कर सकता
 DocType: POS Profile,Update Stock,स्टॉक अद्यतन
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,मदों के लिए अलग UOM गलत ( कुल ) नेट वजन मूल्य को बढ़ावा मिलेगा. प्रत्येक आइटम का शुद्ध वजन ही UOM में है कि सुनिश्चित करें.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,बीओएम दर
 DocType: Asset,Journal Entry for Scrap,स्क्रैप के लिए जर्नल प्रविष्टि
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,डिलिवरी नोट से आइटम खींच कृपया
-apps/erpnext/erpnext/accounts/utils.py +349,Journal Entries {0} are un-linked,जर्नल प्रविष्टियां {0} संयुक्त राष्ट्र से जुड़े हुए हैं
+apps/erpnext/erpnext/accounts/utils.py +426,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,कंपनी में गोल लागत से केंद्र का उल्लेख करें
@@ -2856,6 +2892,7 @@
 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,सामुदायिक फोरम
+DocType: Homepage,"URL for ""All Products""",के लिए &quot;सभी उत्पाद&quot; यूआरएल
 DocType: Leave Application,Leave Balance Before Application,आवेदन से पहले शेष छोड़ो
 DocType: SMS Center,Send SMS,एसएमएस भेजें
 DocType: Cheque Print Template,Width of amount in word,शब्द में राशि की चौड़ाई
@@ -2864,7 +2901,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 +29,Current Job Openings,वर्तमान नौकरी के उद्घाटन
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,Current Job Openings,वर्तमान नौकरी के उद्घाटन
 DocType: Company,Stock Adjustment Account,स्टॉक समायोजन खाता
 DocType: Journal Entry,Write Off,ख़ारिज करना
 DocType: Timesheet Detail,Operation ID,ऑपरेशन आईडी
@@ -2877,7 +2914,7 @@
 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 +850,Show tax break-up,शो कर तोड़-अप
+apps/erpnext/erpnext/public/js/controllers/transaction.js +841,Show tax break-up,शो कर तोड़-अप
 apps/erpnext/erpnext/accounts/party.py +308,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} गोदाम के खिलाफ मौजूद इसलिए आप नहीं फिर से आवंटित या इसे संशोधित कर सकते हैं"
@@ -2887,10 +2924,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 +534,Please select Posting Date before selecting Party,कृपया पार्टी के चयन से पहले पोस्ट दिनांक का चयन
 DocType: Serial No,Out of AMC,एएमसी के बाहर
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +80,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 +162,Please contact to the user who have Sales Master Manager {0} role,बिक्री मास्टर प्रबंधक {0} भूमिका है जो उपयोगकर्ता के लिए संपर्क करें
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +195,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 +5,This is based on the attendance of this Student,यह इस छात्र की उपस्थिति पर आधारित है
@@ -2899,12 +2937,11 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,डिलिवरी नोट्स {0} इस बिक्री आदेश रद्द करने से पहले रद्द कर दिया जाना चाहिए
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +75,Paid amount + Write Off Amount can not be greater than Grand Total,भुगतान की गई राशि + राशि से लिखने के कुल योग से बड़ा नहीं हो सकता
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,{0} is not a valid Batch Number for Item {1},{0} आइटम के लिए एक वैध बैच नंबर नहीं है {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +138,Note: There is not enough leave balance for Leave Type {0},नोट : छोड़ किस्म के लिए पर्याप्त छुट्टी संतुलन नहीं है {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,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,अवसर प्रकार
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,नई कंपनी
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,Cost Center is required for 'Profit and Loss' account {0},लागत केंद्र ' लाभ और हानि के खाते के लिए आवश्यक है {0}
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,लेन-देन ही कंपनी के निर्माता द्वारा नष्ट किया जा सकता
 apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,सामान्य लेज़र प्रविष्टियों का गलत नंबर मिला. आप लेन - देन में एक गलत खाते चयनित हो सकता है.
 DocType: Cheque Print Template,Cheque Width,चैक चौड़ाई
@@ -2913,16 +2950,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,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 +228,{0} '{1}' is disabled,{0} '{1}' अक्षम किया गया है
+apps/erpnext/erpnext/controllers/accounts_controller.py +231,{0} '{1}' is disabled,{0} '{1}' अक्षम किया गया है
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ओपन के रूप में सेट करें
 DocType: Cheque Print Template,Scanned Cheque,स्कैन किए हुए चैक
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,भेजने से लेन-देन पर संपर्क करने के लिए स्वत: ईमेल भेजें।
+DocType: Timesheet,Total Billable Amount,कुल बिल करने योग्य राशि
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,आइटम 3
 DocType: Purchase Order,Customer Contact Email,ग्राहक संपर्क ईमेल
 DocType: Warranty Claim,Item and Warranty Details,मद और वारंटी के विवरण
 DocType: Sales Team,Contribution (%),अंशदान (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,नोट : भुगतान एंट्री ' नकद या बैंक खाता' निर्दिष्ट नहीं किया गया था के बाद से नहीं बनाया जाएगा
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Responsibilities,जिम्मेदारियों
+apps/erpnext/erpnext/controllers/accounts_controller.py +78,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,जिम्मेदारियों
 DocType: Expense Claim Account,Expense Claim Account,व्यय दावा अकाउंट
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,टेम्पलेट
 DocType: Sales Person,Sales Person Name,बिक्री व्यक्ति का नाम
@@ -2930,6 +2968,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,उपयोगकर्ता जोड़ें
 DocType: Pricing Rule,Item Group,आइटम समूह
 DocType: Item,Safety Stock,सुरक्षा भंडार
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,मद कोड&gt; मद समूह&gt; ब्रांड
 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),करों और शुल्कों जोड़ा (कंपनी मुद्रा)
@@ -2939,7 +2978,6 @@
 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: Timesheet,Total Hours,कुल घंटे
 DocType: Journal Entry,Printing Settings,मुद्रण सेटिंग्स
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Total Debit must be equal to Total Credit. The difference is {0},कुल डेबिट कुल क्रेडिट के बराबर होना चाहिए .
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,मोटर वाहन
@@ -2952,13 +2990,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,निवेश बैंकिंग
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +71,Cash or Bank Account is mandatory for making payment entry,नकद या बैंक खाते को भुगतान के प्रवेश करने के लिए अनिवार्य है
 DocType: Purchase Invoice,Price List Exchange Rate,मूल्य सूची विनिमय दर
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ग्राहक&gt; ग्राहक समूह&gt; टेरिटरी
 DocType: Purchase Invoice Item,Rate,दर
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Intern,प्रशिक्षु
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,प्रशिक्षु
 DocType: Stock Entry,From BOM,बीओएम से
 DocType: Assessment,Assessment Code,आकलन संहिता
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +32,Basic,बुनियादी
+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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule','उत्पन्न अनुसूची' पर क्लिक करें
+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 +95,Reference No is mandatory if you entered Reference Date,"आप संदर्भ तिथि में प्रवेश किया , तो संदर्भ कोई अनिवार्य है"
@@ -2967,11 +3006,11 @@
 DocType: Salary Slip,Salary Structure,वेतन संरचना
 DocType: Account,Bank,बैंक
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,एयरलाइन
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +752,Issue Material,मुद्दा सामग्री
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +723,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 +683,You are in offline mode. You will not be able to reload until you have network.,आप ऑफ़लाइन मोड में हैं। आप जब तक आप नेटवर्क है फिर से लोड करने में सक्षम नहीं होगा।
+apps/erpnext/erpnext/accounts/page/pos/pos.js +665,You are in offline mode. You will not be able to reload until you have network.,आप ऑफ़लाइन मोड में हैं। आप जब तक आप नेटवर्क है फिर से लोड करने में सक्षम नहीं होगा।
 DocType: Hub Settings,Access Token,एक्सेस टोकन
 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,नहीं सीरियल
@@ -2979,33 +3018,35 @@
 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 +1122,Enter value must be positive,दर्ज मूल्य सकारात्मक होना चाहिए
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,All Territories,सभी प्रदेशों
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1125,Enter value must be positive,दर्ज मूल्य सकारात्मक होना चाहिए
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,सभी प्रदेशों
 DocType: Purchase Invoice,Items,आइटम
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +23,Student is already enrolled.,छात्र पहले से ही दाखिला लिया है।
 DocType: Fiscal Year,Year Name,वर्ष नाम
 DocType: Process Payroll,Process Payroll,प्रक्रिया पेरोल
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,इस महीने के दिन काम की तुलना में अधिक छुट्टियां कर रहे हैं .
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +233,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 +96,Request for Quotations,कोटेशन के लिए अनुरोध
+apps/erpnext/erpnext/hooks.py +104,Request for Quotations,कोटेशन के लिए अनुरोध
 DocType: Payment Reconciliation,Maximum Invoice Amount,अधिकतम चालान राशि
 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 +628,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',संस्करण के लिए उपाय की मूलभूत इकाई &#39;{0}&#39; खाका के रूप में ही होना चाहिए &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',संस्करण के लिए उपाय की मूलभूत इकाई &#39;{0}&#39; खाका के रूप में ही होना चाहिए &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,के आधार पर गणना करें
 DocType: Delivery Note Item,From Warehouse,गोदाम से
 DocType: Assessment,Supervisor Name,पर्यवेक्षक का नाम
+DocType: Assessment,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,क्रय उपयोगकर्ता
 DocType: Notification Control,Customize the Notification,अधिसूचना को मनपसंद
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Cash Flow from Operations,आपरेशन से नकद प्रवाह
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,डिफ़ॉल्ट पता खाका हटाया नहीं जा सकता
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,डिफ़ॉल्ट पता खाका हटाया नहीं जा सकता
 DocType: Sales Invoice,Shipping Rule,नौवहन नियम
 DocType: Manufacturer,Limited to 12 characters,12 अक्षरों तक सीमित
 DocType: Journal Entry,Print Heading,शीर्षक प्रिंट
@@ -3020,8 +3061,8 @@
 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/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,लक्ष्य मात्रा या लक्ष्य राशि या तो अनिवार्य है
-apps/erpnext/erpnext/stock/get_item_details.py +485,No default BOM exists for Item {0},कोई डिफ़ॉल्ट बीओएम मौजूद मद के लिए {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +336,Please select Posting Date first,पहली पोस्टिंग तिथि का चयन करें
+apps/erpnext/erpnext/stock/get_item_details.py +486,No default BOM exists for Item {0},कोई डिफ़ॉल्ट बीओएम मौजूद मद के लिए {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +326,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,मौजूदा लेनदेन के साथ लागत केंद्र लेज़र परिवर्तित नहीं किया जा सकता है
@@ -3037,6 +3078,7 @@
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,चालान के साथ मैच भुगतान
 DocType: Journal Entry,Bank Entry,बैंक एंट्री
 DocType: Authorization Rule,Applicable To (Designation),के लिए लागू (पद)
+,Profitability Analysis,लाभप्रदता विश्लेषण
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,कार्ट में जोड़ें
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,समूह द्वारा
 DocType: Guardian,Interests,रूचियाँ
@@ -3049,22 +3091,22 @@
 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 +141,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","धारावाहिक मद {0} शेयर सुलह का उपयोग कर \
  अद्यतन नहीं किया जा सकता है"
 DocType: Scheduling Tool,Day,दिन
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,नया धारावाहिक कोई गोदाम नहीं कर सकते हैं . गोदाम स्टॉक एंट्री या खरीद रसीद द्वारा निर्धारित किया जाना चाहिए
 DocType: Lead,Lead Type,प्रकार लीड
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,You are not authorized to approve leaves on Block Dates,आप ब्लॉक तारीखों पर पत्तियों को मंजूरी के लिए अधिकृत नहीं हैं
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,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: Student Applicant,AP.,एपी।
 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 +639,Point of Sale,बिक्री के प्वाइंट
+apps/erpnext/erpnext/accounts/page/pos/pos.js +634,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,कर
 DocType: Production Planning Tool,Production Planning Tool,उत्पादन योजना उपकरण
@@ -3073,74 +3115,77 @@
 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 +373,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 Entry,Update Rate and Availability,अद्यतन दर और उपलब्धता
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,आप मात्रा के खिलाफ और अधिक प्राप्त या वितरित करने के लिए अनुमति दी जाती प्रतिशत का आदेश दिया. उदाहरण के लिए: यदि आप 100 यूनिट का आदेश दिया है. और अपने भत्ता 10% तो आप 110 इकाइयों को प्राप्त करने के लिए अनुमति दी जाती है.
 DocType: POS Profile,Customer Group,ग्राहक समूह
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,Expense account is mandatory for item {0},व्यय खाते आइटम के लिए अनिवार्य है {0}
 DocType: Item,Website Description,वेबसाइट विवरण
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date must be on or after today,अगली मूल्यह्रास तिथि पर या आज के बाद होना चाहिए
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,इक्विटी में शुद्ध परिवर्तन
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +145,Please cancel Purchase Invoice {0} first,चालान की खरीद {0} को रद्द कृपया पहले
 DocType: Serial No,AMC Expiry Date,एएमसी समाप्ति तिथि
 ,Sales Register,बिक्री रजिस्टर
 DocType: Quotation,Quotation Lost Reason,कोटेशन कारण खोया
+apps/erpnext/erpnext/utilities/doctype/address/address.py +164,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,कोई डिफ़ॉल्ट पता खाका पाया। सेटअप&gt; मुद्रण और ब्रांडिंग&gt; पता खाका से एक नया एक का सृजन करें।
 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 +330,Transaction reference no {0} dated {1},लेन-देन संदर्भ कोई {0} दिनांक {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Transaction reference no {0} dated {1},लेन-देन संदर्भ कोई {0} दिनांक {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,संपादित करने के लिए कुछ भी नहीं है .
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,Summary for this month and pending activities,इस महीने और लंबित गतिविधियों के लिए सारांश
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,इस महीने और लंबित गतिविधियों के लिए सारांश
 DocType: Customer Group,Customer Group Name,ग्राहक समूह का नाम
 apps/erpnext/erpnext/public/js/financial_statements.js +54,Cash Flow Statement,नकदी प्रवाह विवरण
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Please remove this Invoice {0} from C-Form {1},सी-फार्म से इस चालान {0} निकाल दें {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,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 +644,Get Items,आइटम पाने के लिए
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +623,Get Items,आइटम पाने के लिए
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +210,Please enter Write Off Account,खाता बंद लिखने दर्ज करें
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,पिछले आदेश की तिथि
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +41,Account {0} does not belongs to company {1},खाता {0} करता है कंपनी के अंतर्गत आता नहीं {1}
+DocType: Student,Guardian Details,गार्जियन विवरण
 DocType: C-Form,C-Form,सी - फार्म
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,कई कर्मचारियों के लिए मार्क उपस्थिति
 DocType: Payment Request,Initiated,शुरू की
 DocType: Production Order,Planned Start Date,नियोजित प्रारंभ दिनांक
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,Customer is required against Receivable account {0},ग्राहक प्राप्य खाते के खिलाफ आवश्यक है {0}
 DocType: Serial No,Creation Document Type,निर्माण दस्तावेज़ प्रकार
 DocType: Leave Type,Is Encash,तुड़ाना है
 DocType: Purchase Invoice,Mobile No,नहीं मोबाइल
 DocType: Leave Allocation,New Leaves Allocated,नई आवंटित पत्तियां
-apps/erpnext/erpnext/controllers/trends.py +265,Project-wise data is not available for Quotation,परियोजना के लिहाज से डेटा उद्धरण के लिए उपलब्ध नहीं है
+apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,परियोजना के लिहाज से डेटा उद्धरण के लिए उपलब्ध नहीं है
 DocType: Project,Expected End Date,उम्मीद समाप्ति तिथि
 DocType: Budget Account,Budget Amount,कुल बज़ट
 DocType: Appraisal Template,Appraisal Template Title,मूल्यांकन टेम्पलेट शीर्षक
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,Commercial,वाणिज्यिक
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,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 +648,Row {0}# Account must be of type 'Fixed Asset',पंक्ति {0} # खाता प्रकार का होना चाहिए &#39;फिक्स्ड एसेट&#39;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Row {0}# Account must be of type 'Fixed Asset',पंक्ति {0} # खाता प्रकार का होना चाहिए &#39;फिक्स्ड एसेट&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,मात्रा बाहर
 apps/erpnext/erpnext/config/accounts.py +278,Rules to calculate shipping amount for a sale,एक बिक्री के लिए शिपिंग राशि की गणना करने के नियम
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +30,Series is mandatory,सीरीज अनिवार्य है
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +50,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}
 DocType: Leave Allocation,Unused leaves,अप्रयुक्त पत्ते
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Cr,सीआर
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Cr,सीआर
 DocType: Tax Rule,Billing State,बिलिंग राज्य
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +250,Transfer,हस्तांतरण
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +187,{0} {1} does not associated with Party Account {2},{0} {1} पार्टी खाते से संबद्ध नहीं है {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,Fetch exploded BOM (including sub-assemblies),( उप असेंबलियों सहित) विस्फोट बीओएम लायें
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +254,Transfer,हस्तांतरण
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +190,{0} {1} does not associated with Party Account {2},{0} {1} पार्टी खाते से संबद्ध नहीं है {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +796,Fetch exploded BOM (including sub-assemblies),( उप असेंबलियों सहित) विस्फोट बीओएम लायें
 DocType: Authorization Rule,Applicable To (Employee),के लिए लागू (कर्मचारी)
-apps/erpnext/erpnext/controllers/accounts_controller.py +115,Due Date is mandatory,नियत तिथि अनिवार्य है
+apps/erpnext/erpnext/controllers/accounts_controller.py +118,Due Date is mandatory,नियत तिथि अनिवार्य है
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,गुण के लिए वेतन वृद्धि {0} 0 नहीं किया जा सकता
 DocType: Journal Entry,Pay To / Recd From,/ रिसी डी से भुगतान
 DocType: Naming Series,Setup Series,सेटअप सीरीज
 DocType: Payment Reconciliation,To Invoice Date,दिनांक चालान करने के लिए
 DocType: Supplier,Contact HTML,संपर्क HTML
 ,Inactive Customers,निष्क्रिय ग्राहकों
+DocType: Landed Cost Voucher,LCV,एलसीवी
 DocType: Landed Cost Voucher,Purchase Receipts,खरीद प्राप्तियां
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,कैसे मूल्य निर्धारण नियम लागू किया जाता है?
 DocType: Quality Inspection,Delivery Note No,डिलिवरी नोट
@@ -3149,7 +3194,7 @@
 DocType: Company,Retail,खुदरा
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +120,Customer {0} does not exist,ग्राहक {0} मौजूद नहीं है
 DocType: Attendance,Absent,अनुपस्थित
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +587,Product Bundle,उत्पाद बंडल
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Product Bundle,उत्पाद बंडल
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Invalid reference {1},पंक्ति {0}: अमान्य संदर्भ {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,करों और शुल्कों टेम्पलेट खरीद
 DocType: Upload Attendance,Download Template,टेम्पलेट डाउनलोड करें
@@ -3159,8 +3204,8 @@
 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 +742,Send Supplier Emails,प्रदायक ईमेल भेजें
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +104,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","वेतन पहले ही बीच {0} और {1}, आवेदन की अवधि छोड़ दो इस तिथि सीमा के बीच नहीं हो सकता है अवधि के लिए कार्रवाई की।"
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +708,Send Supplier Emails,प्रदायक ईमेल भेजें
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,"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,गार्जियन ब्याज
 DocType: Timesheet,Employee Detail,कर्मचारी विस्तार
@@ -3171,9 +3216,9 @@
 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/accounts/doctype/gl_entry/gl_entry.py +77,Account {0} cannot be a Group,खाते {0} एक समूह नहीं हो सकता
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} cannot be a Group,खाते {0} एक समूह नहीं हो सकता
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +31,Optional. This setting will be used to filter in various transactions.,वैकल्पिक . यह सेटिंग विभिन्न लेनदेन में फिल्टर करने के लिए इस्तेमाल किया जाएगा .
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +107,Negative Valuation Rate is not allowed,नकारात्मक मूल्यांकन दर की अनुमति नहीं है
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,नकारात्मक मूल्यांकन दर की अनुमति नहीं है
 DocType: Holiday List,Weekly Off,ऑफ साप्ताहिक
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","जैसे 2012, 2012-13 के लिए"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +39,Provisional Profit / Loss (Credit),अनंतिम लाभ / हानि (क्रेडिट)
@@ -3187,16 +3232,16 @@
 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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: लागत केंद्र मद के लिए अनिवार्य है {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +626,Get Items from Product Bundle,उत्पाद बंडल से आइटम प्राप्त
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +605,Get Items from Product Bundle,उत्पाद बंडल से आइटम प्राप्त
 DocType: Asset,Straight Line,सीधी रेखा
 DocType: Project User,Project User,परियोजना उपयोगकर्ता
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} is inactive,खाते {0} निष्क्रिय है
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} is inactive,खाते {0} निष्क्रिय है
 DocType: GL Entry,Is Advance,अग्रिम है
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,तिथि करने के लिए तिथि और उपस्थिति से उपस्थिति अनिवार्य है
 apps/erpnext/erpnext/controllers/buying_controller.py +148,Please enter 'Is Subcontracted' as Yes or No,डालें हाँ या नहीं के रूप में ' subcontracted है '
 DocType: Sales Team,Contact No.,सं संपर्क
 DocType: Bank Reconciliation,Payment Entries,भुगतान प्रविष्टियां
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,'Profit and Loss' type account {0} not allowed in Opening Entry,' लाभ और हानि ' प्रकार खाते {0} एंट्री खुलने में अनुमति नहीं
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +71,'Profit and Loss' type account {0} not allowed in Opening Entry,' लाभ और हानि ' प्रकार खाते {0} एंट्री खुलने में अनुमति नहीं
 DocType: Program Enrollment Tool,Get Students From,से छात्रों जाओ
 DocType: Hub Settings,Seller Country,विक्रेता देश
 apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,वेबसाइट पर आइटम प्रकाशित करें
@@ -3215,7 +3260,7 @@
 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 +558,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","पंक्ति # {0}: संपत्ति {1} प्रस्तुत नहीं किया जा सकता है, यह पहले से ही है {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +561,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","पंक्ति # {0}: संपत्ति {1} प्रस्तुत नहीं किया जा सकता है, यह पहले से ही है {2}"
 DocType: Tax Rule,Billing Country,बिलिंग देश
 DocType: Production Order,Expected Delivery Date,उम्मीद डिलीवरी की तारीख
 apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,डेबिट और क्रेडिट {0} # के लिए बराबर नहीं {1}। अंतर यह है {2}।
@@ -3228,13 +3273,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +202,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: Sales Order,% Amount Billed,% बिल की राशि
+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 +117,No Item with Serial No {0},धारावाहिक नहीं के साथ कोई आइटम {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,ओपन सूचनाएं
+DocType: Email Digest,Open Notifications,ओपन सूचनाएं
 DocType: Payment Entry,Difference Amount (Company Currency),अंतर राशि (कंपनी मुद्रा)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,प्रत्यक्ष खर्च
 apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
@@ -3242,7 +3287,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,नया ग्राहक राजस्व
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,यात्रा व्यय
 DocType: Maintenance Visit,Breakdown,भंग
-apps/erpnext/erpnext/controllers/accounts_controller.py +634,Account: {0} with currency: {1} can not be selected,खाता: {0} मुद्रा के साथ: {1} चयनित नहीं किया जा सकता
+apps/erpnext/erpnext/controllers/accounts_controller.py +637,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}
 DocType: Program Enrollment Tool,Student Applicants,छात्र आवेदकों
@@ -3250,15 +3295,15 @@
 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 +56,Probation,परिवीक्षा
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Probation,परिवीक्षा
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,वेतन अवयव
 DocType: Program Enrollment Tool,New Academic Year,नए शैक्षणिक वर्ष
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Payment of salary for the month {0} and year {1},महीने के वेतन का भुगतान {0} और वर्ष {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Payment of salary for the month {0} and year {1},महीने के वेतन का भुगतान {0} और वर्ष {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,ऑटो डालने मूल्य सूची दर लापता यदि
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,कुल भुगतान की गई राशि
 DocType: Production Order Item,Transferred Qty,मात्रा तबादला
 apps/erpnext/erpnext/config/learn.py +11,Navigating,नेविगेट
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Planning,आयोजन
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,आयोजन
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,जारी किया गया
 DocType: Project,Total Billing Amount (via Time Logs),कुल बिलिंग राशि (टाइम लॉग्स के माध्यम से)
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,We sell this Item,हम इस आइटम बेचने
@@ -3271,11 +3316,10 @@
 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/accounts/page/pos/pos.js +1376,Sales invoice submitted sucessfully.,बिक्री चालान सफलतापूर्वक प्रस्तुत की।
 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}
 DocType: Assessment Result,Student Name,छात्र का नाम
-apps/erpnext/erpnext/hooks.py +104,Assessment Schedule,आकलन अनुसूची
+apps/erpnext/erpnext/hooks.py +113,Assessment Schedule,आकलन अनुसूची
 DocType: Brand,Item Manager,आइटम प्रबंधक
 DocType: Buying Settings,Default Supplier Type,डिफ़ॉल्ट प्रदायक प्रकार
 DocType: Production Order,Total Operating Cost,कुल परिचालन लागत
@@ -3285,6 +3329,7 @@
 DocType: GL Entry,Party Type,पार्टी के प्रकार
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +78,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 नहीं
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,वेतन टेम्पलेट मास्टर .
 DocType: Leave Type,Max Days Leave Allowed,अधिकतम दिन छोड़ने की अनुमति दी
@@ -3296,18 +3341,19 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,सुराग या ग्राहक के लिए उद्धरण.
 DocType: Stock Settings,Role Allowed to edit frozen stock,जमे हुए शेयर संपादित करने के लिए रख सकते है भूमिका
 ,Territory Target Variance Item Group-Wise,क्षेत्र को लक्षित विचरण मद समूहवार
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Customer Groups,सभी ग्राहक समूहों
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +78,Accumulated Monthly,संचित मासिक
-apps/erpnext/erpnext/controllers/accounts_controller.py +595,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} अनिवार्य है. हो सकता है कि विनिमय दर रिकॉर्ड {2} को {1} के लिए नहीं बनाई गई है.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,सभी ग्राहक समूहों
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +81,Accumulated Monthly,संचित मासिक
+apps/erpnext/erpnext/controllers/accounts_controller.py +598,{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} मौजूद नहीं है
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),मूल्य सूची दर (कंपनी मुद्रा)
 DocType: Products Settings,Products Settings,उत्पाद सेटिंग
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +188,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} सेटअप&gt; सेटिंग के माध्यम से&gt; नामकरण सीरीज के लिए श्रृंखला का नामकरण सेट करें
 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 +84,Secretary,सचिव
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,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,क्रय
@@ -3316,24 +3362,22 @@
 ,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,आकलन नाम
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,पंक्ति # {0}: सीरियल नहीं अनिवार्य है
+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 +859,Supplier Quotation,प्रदायक कोटेशन
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +838,Supplier Quotation,प्रदायक कोटेशन
 DocType: Quotation,In Words will be visible once you save the Quotation.,शब्दों में दिखाई हो सकता है एक बार आप उद्धरण बचाने के लिए होगा.
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +7,Collect Fees,फीस जमा
+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}
 DocType: Lead,Add to calendar on this date,इस तिथि पर कैलेंडर में जोड़ें
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,शिपिंग लागत को जोड़ने के लिए नियम.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,आगामी कार्यक्रम
 DocType: Item,Opening Stock,आरंभिक स्टॉक
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,ग्राहक की आवश्यकता है
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} वापसी के लिए अनिवार्य है
 DocType: Purchase Order,To Receive,प्राप्त करने के लिए
 apps/erpnext/erpnext/public/js/setup_wizard.js +195,user@example.com,user@example.com
-DocType: Email Digest,Income / Expense,आय / व्यय
 DocType: Employee,Personal Email,व्यक्तिगत ईमेल
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,कुल विचरण
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","यदि सक्रिय है, प्रणाली स्वतः सूची के लिए लेखांकन प्रविष्टियों के बाद होगा."
@@ -3345,13 +3389,14 @@
 DocType: Customer,From Lead,लीड से
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,उत्पादन के लिए आदेश जारी किया.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,वित्तीय वर्ष का चयन करें ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,POS Profile required to make POS Entry,पीओएस प्रोफ़ाइल पीओएस एंट्री बनाने के लिए आवश्यक
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +509,POS Profile required to make POS Entry,पीओएस प्रोफ़ाइल पीओएस एंट्री बनाने के लिए आवश्यक
 DocType: Program Enrollment Tool,Enroll Students,छात्रों को भर्ती
 DocType: Hub Settings,Name Token,नाम टोकन
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,मानक बेच
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Atleast one warehouse is mandatory,कम से कम एक गोदाम अनिवार्य है
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +129,Atleast one warehouse is mandatory,कम से कम एक गोदाम अनिवार्य है
 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 +330,{0} against Sales Invoice {1},{0} बिक्री चालान के खिलाफ {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,इस परियोजना का नाम
@@ -3372,10 +3417,11 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,पत्तियां 0.5 के गुणकों में आवंटित किया जाना चाहिए
 DocType: Production Order,Operation Cost,संचालन लागत
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,. Csv फ़ाइल से उपस्थिति अपलोड करें
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,बकाया राशि
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,सेट आइटम इस बिक्री व्यक्ति के लिए समूह - वार लक्ष्य.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],रुक स्टॉक से अधिक उम्र [ दिन]
-apps/erpnext/erpnext/controllers/accounts_controller.py +528,Row #{0}: Asset is mandatory for fixed asset purchase/sale,पंक्ति # {0}: संपत्ति निश्चित संपत्ति खरीद / बिक्री के लिए अनिवार्य है
+apps/erpnext/erpnext/controllers/accounts_controller.py +531,Row #{0}: Asset is mandatory for fixed asset purchase/sale,पंक्ति # {0}: संपत्ति निश्चित संपत्ति खरीद / बिक्री के लिए अनिवार्य है
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","दो या दो से अधिक मूल्य निर्धारण नियमों उपरोक्त शर्तों के आधार पर पाए जाते हैं, प्राथमिकता लागू किया जाता है। डिफ़ॉल्ट मान शून्य (रिक्त) है, जबकि प्राथमिकता 0-20 के बीच एक नंबर है। अधिक संख्या में एक ही शर्तों के साथ एकाधिक मूल्य निर्धारण नियम हैं अगर यह पूर्वता ले जाएगा मतलब है।"
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,वित्तीय वर्ष: {0} करता नहीं मौजूद है
 DocType: Currency Exchange,To Currency,मुद्रा के लिए
@@ -3392,15 +3438,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,निजी इक्विटी
 DocType: Maintenance Visit,Customer Feedback,ग्राहक प्रतिक्रिया
 DocType: Account,Expense,व्यय
-DocType: Sales Invoice,Exhibition,प्रदर्शनी
 apps/erpnext/erpnext/utilities/doctype/address/address.py +77,"Company is mandatory, as it is your company address","कंपनी, अनिवार्य है, क्योंकि यह आपकी कंपनी पता है"
 DocType: Item Attribute,From Range,सीमा से
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +81,Syntax error in formula or condition: {0},सूत्र या हालत में सिंटेक्स त्रुटि: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +92,Syntax error in formula or condition: {0},सूत्र या हालत में सिंटेक्स त्रुटि: {0}
 apps/erpnext/erpnext/stock/utils.py +99,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 +28,Jobs,नौकरियां
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,नौकरियां
 ,Sales Order Trends,बिक्री आदेश रुझान
 DocType: Employee,Held On,पर Held
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,उत्पादन आइटम
@@ -3409,16 +3455,16 @@
 DocType: Stock Entry Detail,Additional Cost,अतिरिक्त लागत
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,वित्तीय वर्ष की समाप्ति तिथि
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","वाउचर के आधार पर फ़िल्टर नहीं कर सकते नहीं, वाउचर के आधार पर समूहीकृत अगर"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +763,Make Supplier Quotation,प्रदायक कोटेशन बनाओ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,Make Supplier Quotation,प्रदायक कोटेशन बनाओ
 DocType: Quality Inspection,Incoming,आवक
 DocType: BOM,Materials Required (Exploded),माल आवश्यक (विस्फोट)
 apps/erpnext/erpnext/public/js/setup_wizard.js +185,"Add users to your organization, other than yourself","खुद के अलावा अन्य, अपने संगठन के लिए उपयोगकर्ताओं को जोड़ें"
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,Row # {0}: Serial No {1} does not match with {2} {3},पंक्ति # {0}: सीरियल नहीं {1} के साथ मेल नहीं खाता {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +42,Casual Leave,आकस्मिक छुट्टी
+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,आकस्मिक छुट्टी
 DocType: Batch,Batch ID,बैच आईडी
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,Note: {0},नोट : {0}
 ,Delivery Note Trends,डिलिवरी नोट रुझान
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +103,This Week's Summary,इस सप्ताह की सारांश
+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} केवल शेयर लेनदेन के माध्यम से अद्यतन किया जा सकता है
 DocType: Student Group Creation Tool,Get Courses,पाठ्यक्रम जाओ
 DocType: GL Entry,Party,पार्टी
@@ -3428,7 +3474,7 @@
 DocType: Request for Quotation Item,Request for Quotation Item,कोटेशन मद के लिए अनुरोध
 DocType: Purchase Order,To Bill,बिल
 DocType: Material Request,% Ordered,% का आदेश दिया
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Piecework,ठेका
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Piecework,ठेका
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,औसत। क्रय दर
 DocType: Task,Actual Time (in Hours),(घंटे में) वास्तविक समय
 DocType: Employee,History In Company,कंपनी में इतिहास
@@ -3445,7 +3491,7 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +350,{0} units of {1} needed in {2} to complete this transaction.,{0} की इकाइयों {1} {2} इस सौदे को पूरा करने के लिए की जरूरत है।
 DocType: SMS Settings,SMS Settings,एसएमएस सेटिंग्स
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Temporary Accounts,अस्थाई लेखा
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Black,काली
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,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} उत्पादित वस्तुओं
@@ -3456,13 +3502,13 @@
 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 +69,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,मार्क अनुपस्थित
 DocType: Journal Entry Account,Exchange Rate,विनिमय दर
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Sales Order {0} is not submitted,बिक्री आदेश {0} प्रस्तुत नहीं किया गया है
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +527,Sales Order {0} is not submitted,बिक्री आदेश {0} प्रस्तुत नहीं किया गया है
 DocType: Homepage,Tag Line,टैग लाइन
 DocType: Fee Component,Fee Component,शुल्क घटक
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +857,Add items from,से आइटम जोड़ें
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +836,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: Cheque Print Template,Regular,नियमित
 DocType: BOM,Last Purchase Rate,पिछले खरीद दर
@@ -3470,6 +3516,7 @@
 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} के बाद से वेरिएंट है
 ,Sales Person-wise Transaction Summary,बिक्री व्यक्ति के लिहाज गतिविधि सारांश
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +60,Cost Center is required for 'Profit and Loss' account {0}. Please set up a default Cost Center for the Company.,लागत केंद्र &#39;लाभ और हानि के खाते {0} के लिए आवश्यक है। कृपया कंपनी के लिए एक डिफ़ॉल्ट लागत केंद्र की स्थापना की।
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,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,मासिक वितरण प्रतिशत
@@ -3480,12 +3527,12 @@
 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 +710,Online,ऑनलाइन
+apps/erpnext/erpnext/accounts/page/pos/pos.js +692,Online,ऑनलाइन
 ,Available Stock for Packing Items,आइटम पैकिंग के लिए उपलब्ध स्टॉक
 DocType: Item Variant,Item Variant,आइटम संस्करण
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,कोई अन्य डिफ़ॉल्ट रूप में वहाँ डिफ़ॉल्ट के रूप में इस का पता खाका स्थापना
+apps/erpnext/erpnext/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 +74,Quality Management,गुणवत्ता प्रबंधन
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,गुणवत्ता प्रबंधन
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,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,कर्मचारी बाहरी काम इतिहास
@@ -3507,11 +3554,12 @@
 DocType: Student,Student Email ID,छात्र ईमेल आईडी
 DocType: Employee,Notice (days),सूचना (दिन)
 DocType: Tax Rule,Sales Tax Template,सेल्स टैक्स खाका
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1520,Select items to save the invoice,चालान बचाने के लिए आइटम का चयन करें
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1544,Select items to save the invoice,चालान बचाने के लिए आइटम का चयन करें
 DocType: Employee,Encashment Date,नकदीकरण तिथि
 DocType: Account,Stock Adjustment,शेयर समायोजन
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},डिफ़ॉल्ट गतिविधि लागत गतिविधि प्रकार के लिए मौजूद है - {0}
 DocType: Production Order,Planned Operating Cost,नियोजित परिचालन लागत
+DocType: Academic Term,Term Start Date,टर्म प्रारंभ तिथि
 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,आवेदक के नाम
@@ -3541,17 +3589,17 @@
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,गोदाम ( सदा सूची ) के लिए खाते में इस खाते के तहत बनाया जाएगा .
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +119,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,शेयर खाता प्रविष्टि इस गोदाम के लिए मौजूद वेयरहाउस हटाया नहीं जा सकता .
 DocType: Company,Distribution,वितरण
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +8,Amount Paid,राशि का भुगतान
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Project Manager,परियोजना प्रबंधक
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,राशि का भुगतान
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,परियोजना प्रबंधक
 ,Quoted Item Comparison,उद्धरित मद तुलना
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Dispatch,प्रेषण
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,प्रेषण
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,अधिकतम छूट मद के लिए अनुमति दी: {0} {1}% है
 apps/erpnext/erpnext/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.,निर्धारित ऋण सीमा से अधिक लेनदेन है कि प्रस्तुत करने की अनुमति दी है कि भूमिका.
-DocType: Sales Invoice,Supplier Reference,प्रदायक संदर्भ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +844,"Master data syncing, it might take some time","मास्टर डेटा सिंक्रनाइज़, यह कुछ समय लग सकता है"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +832,"Master data syncing, it might take some time","मास्टर डेटा सिंक्रनाइज़, यह कुछ समय लग सकता है"
 DocType: Item,Material Issue,महत्त्वपूर्ण विषय
 DocType: Hub Settings,Seller Description,विक्रेता विवरण
 DocType: Employee Education,Qualification,योग्यता
@@ -3565,7 +3613,7 @@
 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 +83,Error in formula or condition,सूत्र या हालत में त्रुटि
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,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,सब को अचयनित करें
@@ -3574,7 +3622,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},तिथि वित्तीय वर्ष के भीतर होना चाहिए. तिथि करने के लिए मान लिया जाये = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","यहाँ आप ऊंचाई, वजन, एलर्जी, चिकित्सा चिंताओं आदि बनाए रख सकते हैं"
 DocType: Leave Block List,Applies to Company,कंपनी के लिए लागू होता है
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +197,Cannot cancel because submitted Stock Entry {0} exists,"प्रस्तुत स्टॉक एंट्री {0} मौजूद है , क्योंकि रद्द नहीं कर सकते"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +198,Cannot cancel because submitted Stock Entry {0} exists,"प्रस्तुत स्टॉक एंट्री {0} मौजूद है , क्योंकि रद्द नहीं कर सकते"
 DocType: Purchase Invoice,In Words,शब्दों में
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,Today is {0}'s birthday!,आज {0} का जन्मदिन है!
 DocType: Production Planning Tool,Material Request For Warehouse,वेयरहाउस के लिए सामग्री का अनुरोध
@@ -3584,14 +3632,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,आपकी वित्तीय वर्ष को शुरू होता है
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,एसेट depreciations और शेष
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +319,Amount {0} {1} transferred from {2} to {3},राशि {0} {1} से स्थानांतरित {2} को {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +322,Amount {0} {1} transferred from {2} to {3},राशि {0} {1} से स्थानांतरित {2} को {3}
 DocType: Sales Invoice,Get Advances Received,अग्रिम प्राप्त
 DocType: Email Digest,Add/Remove Recipients,प्राप्तकर्ता जोड़ें / निकालें
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +432,Transaction not allowed against stopped Production Order {0},लेन - देन बंद कर दिया प्रोडक्शन आदेश के खिलाफ अनुमति नहीं {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +437,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 +143,Join,जुडें
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,कमी मात्रा
-apps/erpnext/erpnext/stock/doctype/item/item.py +652,Item variant {0} exists with same attributes,मद संस्करण {0} एक ही गुण के साथ मौजूद है
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,मद संस्करण {0} एक ही गुण के साथ मौजूद है
+DocType: Leave Application,LAP/,गोद /
 DocType: Salary Slip,Salary 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,तिथि करने के लिए आवश्यक है
@@ -3599,12 +3648,12 @@
 DocType: Sales Invoice Item,Sales Order Item,बिक्री आदेश आइटम
 DocType: Salary Slip,Payment Days,भुगतान दिन
 DocType: Customer,Dormant,निष्क्रिय
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +212,Warehouses with child nodes cannot be converted to ledger,बच्चे नोड्स के साथ गोदामों खाता बही में परिवर्तित नहीं किया जा सकता
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +215,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/public/js/controllers/transaction.js +866,It is needed to fetch Item Details.,यह आइटम विवरण लाने की जरूरत है।
+apps/erpnext/erpnext/public/js/controllers/transaction.js +857,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} पहले से ही प्राप्त हो गया है
@@ -3614,14 +3663,14 @@
 DocType: Expense Claim,Total Claimed Amount,कुल दावा किया राशि
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,बेचने के लिए संभावित अवसरों.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,Invalid {0},अमान्य {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Sick Leave,बीमारी छुट्टी
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,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,विभाग के स्टोर
 DocType: Warehouse,PIN,पिन
 DocType: Sales Invoice,Base Change Amount (Company Currency),बेस परिवर्तन राशि (कंपनी मुद्रा)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +313,No accounting entries for the following warehouses,निम्नलिखित गोदामों के लिए कोई लेखा प्रविष्टियों
-apps/erpnext/erpnext/projects/doctype/project/project.js +102,Save the document first.,पहले दस्तावेज़ को सहेजें।
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +314,No accounting entries for the following warehouses,निम्नलिखित गोदामों के लिए कोई लेखा प्रविष्टियों
+apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,पहले दस्तावेज़ को सहेजें।
 DocType: Account,Chargeable,प्रभार्य
 DocType: Company,Change Abbreviation,बदले संक्षिप्त
 DocType: Expense Claim Detail,Expense Date,व्यय तिथि
@@ -3634,10 +3683,9 @@
 DocType: Purchase Invoice,Recurring Print Format,आवर्ती प्रिंट प्रारूप
 DocType: C-Form,Series,कई
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,Expected Delivery Date cannot be before Purchase Order Date,उम्मीद की डिलीवरी तिथि खरीद आदेश तिथि से पहले नहीं हो सकता
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} सेटअप&gt; सेटिंग के माध्यम से&gt; नामकरण सीरीज के लिए श्रृंखला का नामकरण सेट करें
 DocType: Appraisal,Appraisal Template,मूल्यांकन टेम्पलेट
 DocType: Item Group,Item Classification,आइटम वर्गीकरण
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Business Development Manager,व्यापार विकास प्रबंधक
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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,सामान्य खाता
@@ -3647,8 +3695,8 @@
 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 +940,Please select {0} first,पहला {0} का चयन करें
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +749,Batch {0} of Item {1} has expired.,आइटम के बैच {0} {1} समाप्त हो गया है।
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +953,Please select {0} first,पहला {0} का चयन करें
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +757,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,आधा
@@ -3676,8 +3724,8 @@
  {% अगर email_id%} ईमेल: {{email_id}} & lt; br & जी.टी. ; {% endif -%} 
  </ कोड> </ pre>"
 DocType: Salary Detail,Default Amount,चूक की राशि
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +92,Warehouse not found in the system,सिस्टम में नहीं मिला वेयरहाउस
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +106,This Month's Summary,इस महीने की सारांश
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,सिस्टम में नहीं मिला वेयरहाउस
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,इस महीने की सारांश
 DocType: Quality Inspection Reading,Quality Inspection Reading,गुणवत्ता निरीक्षण पढ़ना
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,` से अधिक उम्र रुक स्टॉक `% d दिनों से कम होना चाहिए .
 DocType: Tax Rule,Purchase Tax Template,टैक्स टेम्पलेट खरीद
@@ -3687,21 +3735,22 @@
 DocType: Item Customer Detail,Ref Code,रेफरी कोड
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,कर्मचारी रिकॉर्ड.
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Please set Next Depreciation Date,सेट कृपया अगले मूल्यह्रास दिनांक
-DocType: Payment Gateway,Payment Gateway,भुगतान के लिए रास्ता
 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 +378,Operation Time must be greater than 0 for Operation {0},आपरेशन के समय ऑपरेशन के लिए 0 से अधिक होना चाहिए {0}
+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/accounts/doctype/account/account.py +170,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 (डब्ल्यू) रखो यह ( ज)
 DocType: Program,Program Abbreviation,कार्यक्रम संक्षिप्त
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,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: Appraisal,Start Date,प्रारंभ दिनांक
@@ -3717,21 +3766,22 @@
 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,आरोप है कि आइटम के लिए लागू नहीं है अगर आइटम निकालें
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,उदा. एपीआई smsgateway.com / / send_sms.cgi
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +27,Transaction currency must be same as Payment Gateway currency,लेन-देन मुद्रा पेमेंट गेटवे मुद्रा के रूप में ही किया जाना चाहिए
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Transaction currency must be same as Payment Gateway currency,लेन-देन मुद्रा पेमेंट गेटवे मुद्रा के रूप में ही किया जाना चाहिए
 DocType: Payment Entry,Receive,प्राप्त
+apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,कोटेशन:
 DocType: Maintenance Visit,Fully Completed,पूरी तरह से पूरा
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% पूर्ण
 DocType: Employee,Educational Qualification,शैक्षिक योग्यता
 DocType: Workstation,Operating Costs,परिचालन लागत
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,"कार्रवाई करता है, तो संचित मासिक बजट पार"
 DocType: Purchase Invoice,Submit on creation,जमा करें निर्माण पर
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +432,Currency for {0} must be {1},मुद्रा {0} के लिए होना चाहिए {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +435,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 +493,Row {0}: An Reorder entry already exists for this warehouse {1},पंक्ति {0}: एक पुनःक्रमित प्रविष्टि पहले से ही इस गोदाम के लिए मौजूद है {1}
+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/crm/doctype/opportunity/opportunity.py +79,"Cannot declare as lost, because Quotation has been made.","खो के रूप में उद्धरण बना दिया गया है , क्योंकि घोषणा नहीं कर सकते हैं ."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,क्रय मास्टर प्रबंधक
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +429,Production Order {0} must be submitted,उत्पादन का आदेश {0} प्रस्तुत किया जाना चाहिए
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +434,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,तिथि करने के लिए तिथि से पहले नहीं हो सकता
@@ -3741,25 +3791,27 @@
 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 +181,Totals,योग
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,योग
 DocType: BOM,Manufacturing,विनिर्माण
 ,Ordered Items To Be Delivered,हिसाब से दिया जा आइटम
 DocType: Account,Income,आय
 DocType: Industry Type,Industry Type,उद्योग के प्रकार
 apps/erpnext/erpnext/templates/includes/cart.js +141,Something went wrong!,कुछ गलत हो गया!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,Warning: Leave application contains following block dates,चेतावनी: अवकाश आवेदन निम्न ब्लॉक दिनांक शामिल
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +120,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} इस सौदे को पूरा करने के लिए की इकाइयों।
+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 +181,Organization unit (department) master.,संगठन इकाई ( विभाग ) मास्टर .
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,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 +793,All records are synced.,सभी रिकॉर्ड सिंक किए गए हैं।
+apps/erpnext/erpnext/accounts/page/pos/pos.js +781,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,असुरक्षित ऋण
 DocType: Cost Center,Cost Center Name,लागत केन्द्र का नाम
@@ -3778,21 +3830,20 @@
 DocType: Address,Name of person or organization that this address belongs to.,कि इस पते पर संबधित व्यक्ति या संगठन का नाम.
 apps/erpnext/erpnext/public/js/setup_wizard.js +260,Your Suppliers,अपने आपूर्तिकर्ताओं
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +49,Cannot set as Lost as Sales Order is made.,बिक्री आदेश किया जाता है के रूप में खो के रूप में सेट नहीं कर सकता .
-DocType: Student Applicant,Mother's Name,मां का नाम
 DocType: Request for Quotation Item,Supplier Part No,प्रदायक भाग नहीं
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +348,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 +326,Received From,से प्राप्त
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Received From,से प्राप्त
 DocType: Lead,Converted,परिवर्तित
 DocType: Item,Has Serial No,नहीं सीरियल गया है
 DocType: Employee,Date of Issue,जारी करने की तारीख
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: {0} के लिए {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +153,Row #{0}: Set Supplier for item {1},पंक्ति # {0}: आइटम के लिए सेट प्रदायक {1}
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +93,Row {0}: Hours value must be greater than zero.,पंक्ति {0}: घंटे मूल्य शून्य से अधिक होना चाहिए।
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +117,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} पाया नहीं जा सकता
 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 +172,{0} {1} does not exist,{0} {1} मौजूद नहीं है
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +175,{0} {1} does not exist,{0} {1} मौजूद नहीं है
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,Please check Multi Currency option to allow accounts with other currency,अन्य मुद्रा के साथ खातों अनुमति देने के लिए बहु मुद्रा विकल्प की जाँच करें
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +72,Item: {0} does not exist in the system,आइटम: {0} सिस्टम में मौजूद नहीं है
 apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,आप स्थिर मूल्य निर्धारित करने के लिए अधिकृत नहीं हैं
@@ -3801,13 +3852,14 @@
 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/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,उपस्थिति भविष्य तारीखों के लिए चिह्नित नहीं किया जा सकता
 DocType: Pricing Rule,Pricing Rule Help,मूल्य निर्धारण नियम मदद
 DocType: Purchase Taxes and Charges,Account Head,लेखाशीर्ष
 apps/erpnext/erpnext/config/stock.py +163,Update additional costs to calculate landed cost of items,मदों की उतरा लागत की गणना करने के लिए अतिरिक्त लागत अद्यतन
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Electrical,विद्युत
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Electrical,विद्युत
 DocType: Stock Entry,Total Value Difference (Out - In),कुल मूल्य का अंतर (आउट - में)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,Row {0}: Exchange Rate is mandatory,पंक्ति {0}: विनिमय दर अनिवार्य है
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},यूजर आईडी कर्मचारी के लिए सेट नहीं {0}
@@ -3815,7 +3867,7 @@
 DocType: Item,Customer Code,ग्राहक कोड
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +210,Birthday Reminder for {0},के लिए जन्मदिन अनुस्मारक {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,दिनों से पिछले आदेश
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +292,Debit To account must be a Balance Sheet account,खाते में डेबिट एक बैलेंस शीट खाता होना चाहिए
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To account must be a Balance Sheet account,खाते में डेबिट एक बैलेंस शीट खाता होना चाहिए
 DocType: Buying Settings,Naming Series,श्रृंखला का नामकरण
 DocType: Leave Block List,Leave Block List Name,ब्लॉक सूची नाम छोड़ दो
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,शेयर एसेट्स
@@ -3827,11 +3879,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 +301,Salary Slip of employee {0} already created for time sheet {1},कर्मचारी के वेतन पर्ची {0} पहले से ही समय पत्रक के लिए बनाई गई {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +313,Salary Slip of employee {0} already created for time sheet {1},कर्मचारी के वेतन पर्ची {0} पहले से ही समय पत्रक के लिए बनाई गई {1}
 DocType: Sales Order Item,Ordered Qty,मात्रा का आदेश दिया
-apps/erpnext/erpnext/stock/doctype/item/item.py +673,Item {0} is disabled,मद {0} अक्षम हो जाता है
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} is disabled,मद {0} अक्षम हो जाता है
 DocType: Stock Settings,Stock Frozen Upto,स्टॉक तक जमे हुए
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +838,BOM does not contain any stock item,बीओएम किसी भी शेयर आइटम शामिल नहीं है
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +809,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.,परियोजना / कार्य कार्य.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,वेतन स्लिप्स उत्पन्न
@@ -3839,23 +3891,24 @@
 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 +485,Row #{0}: Please set reorder quantity,पंक्ति # {0}: पुनःक्रमित मात्रा सेट करें
+DocType: Sales Invoice Timesheet,Billing Hours,बिलिंग घंटे
+apps/erpnext/erpnext/stock/doctype/item/item.py +487,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 +62,Please set {0},सेट करें {0}
 DocType: Purchase Invoice,Repeat on Day of Month,महीने का दिन पर दोहराएँ
 DocType: Employee,Health Details,स्वास्थ्य विवरण
 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,ऊपर चयनित मानदंड के लिए सभी वेतन निकल जाता है भेजें
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} आइटम synced
 DocType: Sales Order,Partly Delivered,आंशिक रूप से वितरित
-DocType: Sales Invoice,Existing Customer,मौजूदा ग्राहक
 DocType: Email Digest,Receivables,प्राप्य
+DocType: Lead Source,Lead Source,स्रोत लीड
 DocType: Customer,Additional information regarding the customer.,ग्राहक के बारे में अतिरिक्त जानकारी।
 DocType: Quality Inspection Reading,Reading 5,5 पढ़ना
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +38,Campaign Name is required,अभियान का नाम आवश्यक है
 DocType: Maintenance Visit,Maintenance Date,रखरखाव तिथि
 DocType: Purchase Invoice Item,Rejected Serial No,अस्वीकृत धारावाहिक नहीं
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +80,Year start date or end date is overlapping with {0}. To avoid please set company,साल शुरू की तारीख या अंत की तारीख {0} के साथ अतिव्यापी है। से बचने के लिए कंपनी सेट करें
@@ -3864,10 +3917,9 @@
 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 +129,BOM and Manufacturing Quantity are required,बीओएम और विनिर्माण मात्रा की आवश्यकता होती है
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,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,मैक्स शक्ति
-DocType: Bank Reconciliation Detail,Amount,राशि
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,बीओएम प्रतिस्थापित
 ,Sales Analytics,बिक्री विश्लेषिकी
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +113,Available {0},उपलब्ध {0}
@@ -3875,14 +3927,14 @@
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,ईमेल स्थापना
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +96,Please enter default currency in Company Master,कंपनी मास्टर में डिफ़ॉल्ट मुद्रा दर्ज करें
 DocType: Stock Entry Detail,Stock Entry Detail,शेयर एंट्री विस्तार
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +100,Daily Reminders,दैनिक अनुस्मारक
+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/account/account_tree.js +23,New Account Name,नया खाता नाम
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,कच्चे माल की लागत की आपूर्ति
 DocType: Selling Settings,Settings for Selling Module,मॉड्यूल बेचना के लिए सेटिंग
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Customer Service,ग्राहक सेवा
+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/config/hr.py +50,Offer candidate a Job.,ऑफर उम्मीदवार एक नौकरी।
@@ -3891,8 +3943,9 @@
 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} भंडार वस्तु होना चाहिए
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,प्रगति गोदाम में डिफ़ॉल्ट वर्क
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1570,Total nos of serial no is not equal to quantity.,सीरियल नहीं की कुल सं मात्रा के बराबर नहीं है।
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1594,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,अद्यतन सीरीज नंबर
@@ -3900,9 +3953,10 @@
 DocType: Sales Order,Printing Details,मुद्रण विवरण
 DocType: Task,Closing Date,तिथि समापन
 DocType: Sales Order Item,Produced Quantity,उत्पादित मात्रा
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Engineer,इंजीनियर
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Engineer,इंजीनियर
+DocType: Journal Entry,Total Amount Currency,कुल राशि मुद्रा
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,खोज उप असेंबलियों
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Item Code required at Row No {0},रो नहीं पर आवश्यक मद कोड {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +398,Item Code required at Row No {0},रो नहीं पर आवश्यक मद कोड {0}
 DocType: Sales Partner,Partner Type,साथी के प्रकार
 DocType: Purchase Taxes and Charges,Actual,वास्तविक
 DocType: Authorization Rule,Customerwise Discount,Customerwise डिस्काउंट
@@ -3918,16 +3972,18 @@
 DocType: BOM,Raw Material Cost,कच्चे माल की लागत
 DocType: Item Reorder,Re-Order Level,स्तर पुनः क्रमित करें
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"वस्तुओं और योजना बनाई मात्रा दर्ज करें, जिसके लिए आप उत्पादन के आदेश को बढ़ाने या विश्लेषण के लिए कच्चे माल के डाउनलोड करना चाहते हैं."
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +55,Part-time,अंशकालिक
+apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,Gantt चार्ट
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,अंशकालिक
 DocType: Employee,Applicable Holiday List,लागू अवकाश सूची
 DocType: Employee,Cheque,चैक
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,सीरीज नवीनीकृत
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +57,Series Updated,सीरीज नवीनीकृत
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,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 +87,Clearance Date updated,क्लीयरेंस दिनांक अद्यतन
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,सफलतापूर्वक राज़ी
@@ -3941,7 +3997,7 @@
 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 +513,Posting date and posting time is mandatory,पोस्ट दिनांक और पोस्टिंग समय अनिवार्य है
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,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.,एक बार जब आप खरीद आदेश सहेजें शब्दों में दिखाई जाएगी।
@@ -3951,7 +4007,7 @@
 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/stock/doctype/stock_entry/stock_entry.py +158,Target warehouse in row {0} must be same as Production Order,पंक्ति में लक्ष्य गोदाम {0} के रूप में ही किया जाना चाहिए उत्पादन का आदेश
+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,मुद्रा कुछ अन्य मुद्रा का उपयोग प्रविष्टियों करने के बाद बदला नहीं जा सकता
 DocType: Company,Round Off Account,खाता बंद दौर
@@ -3960,23 +4016,22 @@
 DocType: Customer Group,Parent Customer Group,माता - पिता ग्राहक समूह
 DocType: Purchase Invoice,Contact Email,संपर्क ईमेल
 DocType: Appraisal Goal,Score Earned,स्कोर अर्जित
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Notice Period,नोटिस की मुद्दत
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,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 +4,New Sales Person Name,नई बिक्री व्यक्ति का नाम
 DocType: Packing Slip,Gross Weight UOM,सकल वजन UOM
-DocType: Email Digest,Receivables / Payables,प्राप्तियों / देय
 DocType: Delivery Note Item,Against Sales Invoice,बिक्री चालान के खिलाफ
 DocType: Bin,Reserved Qty for Production,उत्पादन के लिए मात्रा सुरक्षित
 DocType: Asset,Frequency of Depreciation (Months),मूल्यह्रास की आवृत्ति (माह)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +469,Credit Account,क्रेडिट खाता
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Credit Account,क्रेडिट खाता
 DocType: Landed Cost Item,Landed Cost Item,आयातित माल की लागत मद
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +55,Show zero values,शून्य मूल्यों को दिखाने
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,शून्य मूल्यों को दिखाने
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,वस्तु की मात्रा विनिर्माण / कच्चे माल की दी गई मात्रा से repacking के बाद प्राप्त
 apps/erpnext/erpnext/public/js/setup_wizard.js +315,Setup a simple website for my organization,सेटअप अपने संगठन के लिए एक साधारण वेबसाइट
 DocType: Payment Reconciliation,Receivable / Payable Account,प्राप्य / देय खाता
 DocType: Delivery Note Item,Against Sales Order Item,बिक्री आदेश आइटम के खिलाफ
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Please specify Attribute Value for attribute {0},विशेषता के लिए विशेषता मान निर्दिष्ट करें {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},विशेषता के लिए विशेषता मान निर्दिष्ट करें {0}
 DocType: Item,Default Warehouse,डिफ़ॉल्ट गोदाम
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +39,Budget cannot be assigned against Group Account {0},बजट समूह खाते के खिलाफ नहीं सौंपा जा सकता {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,माता - पिता लागत केंद्र दर्ज करें
@@ -3998,19 +4053,22 @@
 DocType: Journal Entry,Total Debit,कुल डेबिट
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,डिफ़ॉल्ट तैयार माल गोदाम
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,बिक्री व्यक्ति
-DocType: Sales Invoice,Cold Calling,सर्द पहुँच
 DocType: SMS Parameter,SMS Parameter,एसएमएस पैरामीटर
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,बजट और लागत केंद्र
 DocType: Maintenance Schedule Item,Half Yearly,छमाही
 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 +253,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 +141,Set as Lost,खोया के रूप में सेट करें
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,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 +5,This is based on transactions against this Customer. See timeline below for details,यह इस ग्राहक के खिलाफ लेन-देन पर आधारित है। जानकारी के लिए नीचे समय देखें
 DocType: Supplier,Credit Days Based On,क्रेडिट दिनों पर आधारित
@@ -4022,11 +4080,10 @@
 ,Items To Be Requested,अनुरोध किया जा करने के लिए आइटम
 DocType: Purchase Order,Get Last Purchase Rate,पिछले खरीद दर
 DocType: Company,Company Info,कंपनी की जानकारी
-apps/erpnext/erpnext/accounts/page/pos/pos.js +941,Select or add new customer,का चयन करें या नए ग्राहक जोड़ने
+apps/erpnext/erpnext/accounts/page/pos/pos.js +930,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 +5,This is based on the attendance of this Employee,यह इस कर्मचारी की उपस्थिति पर आधारित है
-DocType: Sales Invoice,Frequency,आवृत्ति
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +463,Debit Account,डेबिट अकाउंट
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Debit Account,डेबिट अकाउंट
 DocType: Fiscal Year,Year Start Date,वर्ष प्रारंभ दिनांक
 DocType: Attendance,Employee Name,कर्मचारी का नाम
 DocType: Sales Invoice,Rounded Total (Company Currency),गोल कुल (कंपनी मुद्रा)
@@ -4035,27 +4092,27 @@
 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 +210,Supplier Quotation {0} created,प्रदायक कोटेशन {0} बनाया
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +208,Supplier Quotation {0} created,प्रदायक कोटेशन {0} बनाया
 apps/erpnext/erpnext/accounts/report/financial_statements.py +90,End Year cannot be before Start Year,समाप्ति वर्ष प्रारंभ साल से पहले नहीं हो सकता
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Employee Benefits,कर्मचारी लाभ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,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 +228,Please set a default Holiday List for Employee {0} or Company {1},एक डिफ़ॉल्ट कर्मचारी के लिए छुट्टी सूची सेट करें {0} {1} या कंपनी
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +232,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 +499,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},पंक्ति कोई {0}: राशि व्यय दावा {1} के खिलाफ राशि लंबित से अधिक नहीं हो सकता है। लंबित राशि है {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +500,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},पंक्ति कोई {0}: राशि व्यय दावा {1} के खिलाफ राशि लंबित से अधिक नहीं हो सकता है। लंबित राशि है {2}
 DocType: Maintenance Schedule,Schedule,अनुसूची
 DocType: Account,Parent Account,खाते के जनक
 DocType: Quality Inspection Reading,Reading 3,3 पढ़ना
 ,Hub,हब
 DocType: GL Entry,Voucher Type,वाउचर प्रकार
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1007,Price List not found or disabled,मूल्य सूची पाया या निष्क्रिय नहीं
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1008,Price List not found or disabled,मूल्य सूची पाया या निष्क्रिय नहीं
 DocType: Expense Claim,Approved,अनुमोदित
 DocType: Pricing Rule,Price,कीमत
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +244,Employee relieved on {0} must be set as 'Left',{0} को राहत मिली कर्मचारी 'वाम ' के रूप में स्थापित किया जाना चाहिए
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +256,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} निश्चित तिथि सीमा में कर्मचारी के लिए बनाया
@@ -4066,12 +4123,12 @@
 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 +259,Please select Employee Record first.,पहले कर्मचारी रिकॉर्ड का चयन करें।
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +266,Please select Employee Record first.,पहले कर्मचारी रिकॉर्ड का चयन करें।
 DocType: POS Profile,Account for Change Amount,राशि परिवर्तन के लिए खाता
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +190,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},पंक्ति {0}: पार्टी / खाते के साथ मैच नहीं करता है {1} / {2} में {3} {4}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +235,Please enter Expense Account,व्यय खाते में प्रवेश करें
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,Please enter Expense Account,व्यय खाते में प्रवेश करें
 DocType: Account,Stock,स्टॉक
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,"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 +976,"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,खरीद / निर्माण विवरण
@@ -4086,9 +4143,10 @@
 DocType: Asset Movement,Transaction Date,लेनदेन की तारीख
 DocType: Production Plan Item,Planned Qty,नियोजित मात्रा
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,कुल कर
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,For Quantity (Manufactured Qty) is mandatory,मात्रा के लिए (मात्रा निर्मित) अनिवार्य है
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,For Quantity (Manufactured Qty) is mandatory,मात्रा के लिए (मात्रा निर्मित) अनिवार्य है
 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 +78,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,वास्तविक प्रारंभ दिनांक
@@ -4103,9 +4161,11 @@
 DocType: Warranty Claim,If different than customer address,यदि ग्राहक पते से अलग
 DocType: BOM Operation,BOM Operation,बीओएम ऑपरेशन
 DocType: Purchase Taxes and Charges,On Previous Row Amount,पिछली पंक्ति राशि पर
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +226,Transfer Asset,स्थानांतरण एसेट
+DocType: Student,Home Address,घर का पता
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +227,Transfer Asset,स्थानांतरण एसेट
 DocType: POS Profile,POS Profile,पीओएस प्रोफ़ाइल
 apps/erpnext/erpnext/config/schools.py +33,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 +129,"Item {0} is a template, please select one of its variants","{0} आइटम एक टेम्पलेट है, इसके वेरिएंट में से एक का चयन करें"
 DocType: Asset,Asset Category,परिसंपत्ति वर्ग है
@@ -4115,8 +4175,8 @@
 DocType: Assessment,Room,कक्ष
 DocType: Purchase Order,Advance Paid,अग्रिम भुगतान
 DocType: Item,Item Tax,आइटम टैक्स
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +765,Material to Supplier,प्रदायक के लिए सामग्री
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +189,Excise Invoice,आबकारी चालान
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,Material to Supplier,प्रदायक के लिए सामग्री
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,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,वर्तमान देयताएं
@@ -4126,7 +4186,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,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 +136,Credit Card,क्रेडिट कार्ड
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,क्रेडिट कार्ड
 DocType: BOM,Item to be manufactured or repacked,आइटम निर्मित किया जा या repacked
 apps/erpnext/erpnext/config/stock.py +174,Default settings for stock transactions.,शेयर लेनदेन के लिए डिफ़ॉल्ट सेटिंग्स .
 DocType: Purchase Invoice,Next Date,अगली तारीख
@@ -4134,6 +4194,7 @@
 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: Academic Term,Term End Date,सत्रांत दिनांक
 DocType: Hub Settings,Seller Name,विक्रेता का नाम
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),कर और शुल्क कटौती (कंपनी मुद्रा)
 DocType: Item Group,General Settings,सामान्य सेटिंग्स
@@ -4145,7 +4206,7 @@
 DocType: Customer,Commission Rate,आयोग दर
 apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,संस्करण बनाओ
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,विभाग द्वारा आवेदन छोड़ मै.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +115,"Payment Type must be one of Receive, Pay and Internal Transfer","भुगतान प्रकार, प्राप्त की एक होना चाहिए वेतन और आंतरिक स्थानांतरण"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +118,"Payment Type must be one of Receive, Pay and Internal Transfer","भुगतान प्रकार, प्राप्त की एक होना चाहिए वेतन और आंतरिक स्थानांतरण"
 apps/erpnext/erpnext/config/selling.py +169,Analytics,एनालिटिक्स
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,कार्ट खाली है
 DocType: Production Order,Actual Operating Cost,वास्तविक ऑपरेटिंग कॉस्ट
@@ -4160,10 +4221,10 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,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 +92,Designer,डिज़ाइनर
+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/accounts/doctype/purchase_invoice/purchase_invoice.py +469,Cost Center is required in row {0} in Taxes table for type {1},लागत केंद्र पंक्ति में आवश्यक है {0} कर तालिका में प्रकार के लिए {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +472,Cost Center is required in row {0} in Taxes table for type {1},लागत केंद्र पंक्ति में आवश्यक है {0} कर तालिका में प्रकार के लिए {1}
 DocType: Program,Program Code,प्रोग्राम कोड
 ,Item-wise Purchase Register,आइटम के लिहाज से खरीद पंजीकृत करें
 DocType: Batch,Expiry Date,समाप्ति दिनांक
@@ -4173,12 +4234,12 @@
 apps/erpnext/erpnext/config/projects.py +13,Project master.,मास्टर परियोजना.
 apps/erpnext/erpnext/controllers/status_updater.py +174,"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 +417, (Half Day),(आधा दिन)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425, (Half Day),(आधा दिन)
 DocType: Supplier,Credit Days,क्रेडिट दिन
 DocType: Leave Type,Is Carry Forward,क्या आगे ले जाना
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +740,Get Items from BOM,बीओएम से आइटम प्राप्त
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +711,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 +549,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},पंक्ति # {0}: पोस्ट दिनांक खरीद की तारीख के रूप में ही होना चाहिए {1} संपत्ति का {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +552,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,दूसरे के लिए एक गोदाम से एक संपत्ति स्थानांतरण
diff --git a/erpnext/translations/hr.csv b/erpnext/translations/hr.csv
index b3e548f..84609ee 100644
--- a/erpnext/translations/hr.csv
+++ b/erpnext/translations/hr.csv
@@ -18,11 +18,10 @@
 DocType: Sales Partner,Dealer,Trgovac
 DocType: Employee,Rented,Iznajmljeno
 DocType: Purchase Order,PO-,po-
-apps/erpnext/erpnext/accounts/report/financial_statements.py +19,Start Year {0} not found.,Početak godine {0} nije pronađen.
 DocType: POS Profile,Applicable for User,Primjenjivo za članove
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +191,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Zaustavljen Proizvodnja Red ne može biti otkazana, odčepiti najprije otkazati"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +197,Do you really want to scrap this asset?,Da li zaista želite odbaciti ovu imovinu?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +17,Select Default Supplier,Odabir Primarna Dobavljač
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +192,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Zaustavljen Proizvodnja Red ne može biti otkazana, odčepiti najprije otkazati"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +198,Do you really want to scrap this asset?,Da li zaista želite odbaciti ovu imovinu?
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Odabir Primarna Dobavljač
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,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
@@ -42,46 +41,45 @@
 DocType: Sales Invoice,Customer Name,Naziv klijenta
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +126,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 +180,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 +183,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 +148,Series Updated Successfully,Serija je uspješno ažurirana
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +149,Series Updated Successfully,Serija je uspješno ažurirana
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Provjeri
 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
-DocType: Quality Inspection Reading,Parameter,Parametar
 apps/erpnext/erpnext/projects/doctype/project/project.py +54,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 +239,New Leave Application,Novi dopust Primjena
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,New Leave Application,Novi dopust Primjena
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +20,Attendance Record {0} exists against Student {1} for Course Schedule {2},Gledatelja Zapis {0} ne postoji protiv Student {1} za tečaj Raspored {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Bank Draft,Bank Nacrt
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,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
 DocType: Academic Term,Academic Term,Akademski pojam
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +13,Material,Materijal
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Quantity,Količina
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +511,Accounts table cannot be blank.,Računi stol ne može biti prazno.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +616,Quantity,Količina
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +512,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)
 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/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 +142,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
-DocType: Purchase Invoice,Monthly,Mjesečno
 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/buying/doctype/purchase_order/purchase_order.js +771,Invoice,Faktura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +750,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 +198,Row {0}: {1} {2} does not match with {3},Red {0}: {1} {2} ne odgovara {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Red # {0}:
+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 +127,Please select Price List,Molim odaberite cjenik
@@ -112,8 +110,8 @@
 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 +589,Get items from,Nabavite stavke iz
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +382,Stock cannot be updated against Delivery Note {0},Dionica ne može biti obnovljeno protiv isporuke Napomena {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Nabavite stavke iz
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,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
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Trgovina prehrambenom robom
@@ -122,7 +120,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Mirovinski fondovi
 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 +156,Salary Structure Missing,Struktura plaća Nedostaje
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,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
@@ -130,10 +128,11 @@
 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 +156,Credit limit has been crossed for customer {0} {1}/{2},Kreditni limit je prešao na kupca {0} {1} / {2}
-apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Je nepokretne imovine&quot; ne može biti potvrđen, što postoji imovinom rekord protiv stavku"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +189,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"
 DocType: Tax Rule,Tax Type,Porezna Tip
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +144,You are not authorized to add or update entries before {0},Niste ovlašteni dodavati ili ažurirati unose prije {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,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/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
@@ -143,18 +142,17 @@
 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 +165,Opening,Otvaranje
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,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/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Kupac&gt; Korisnička Group&gt; Regija
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Račun platiti samo
 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.
 DocType: Lead,Product Enquiry,Upit
 DocType: Academic Term,Schools,škole
 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 +335,Please select Company first,Odaberite tvrtka prvi
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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
@@ -164,7 +162,7 @@
 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
 DocType: Purchase Invoice Item,Is Fixed Asset,Je nepokretne imovine
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Available qty is {0}, you need {1}","Dostupno Količina Jedinična je {0}, potrebno je {1}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +225,"Available qty is {0}, you need {1}","Dostupno Količina Jedinična je {0}, potrebno je {1}"
 DocType: Expense Claim Detail,Claim Amount,Iznos štete
 DocType: Employee,Mr,G.
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Dobavljač Tip / Supplier
@@ -173,26 +171,27 @@
 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: Assessment Result,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 +171,Annual Salary,Godišnja plaća
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Annual Salary,Godišnja plaća
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Stock Troškovi
-apps/erpnext/erpnext/accounts/report/financial_statements.py +22,End Year {0} not found.,Godina završetka {0} nije pronađen.
 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}
 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 +130,At least one mode of payment is required for POS invoice.,potreban je najmanje jedan način plaćanja za POS računa.
 DocType: Products Settings,Show Products as a List,Prikaži proizvode kao popis
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Preuzmite predložak, ispunite odgovarajuće podatke i priložiti izmijenjene datoteke.
  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 +451,Item {0} is not active or end of life has been reached,Proizvod {0} nije aktivan ili nije došao do kraja roka valjanosti
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +456,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/controllers/accounts_controller.py +614,"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/controllers/accounts_controller.py +617,"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 +166,Settings for HR Module,Postavke za HR modula
 DocType: SMS Center,SMS Center,SMS centar
 DocType: Sales Invoice,Change Amount,Promjena Iznos
@@ -204,13 +203,13 @@
 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 +147,Execution,izvršenje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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/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}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,Cost Center {0} does not belong to Company {1},Troška {0} ne pripada Tvrtka {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +100,Cost Center {0} does not belong to Company {1},Troška {0} ne pripada Tvrtka {1}
 DocType: Customer,Individual,Pojedinac
 DocType: Interest,Academics User,Akademski korisnik
 DocType: Cheque Print Template,Amount In Figure,Iznos u slici
@@ -226,30 +225,32 @@
 DocType: Production Planning Tool,Sales Orders,Narudžbe kupca
 DocType: Purchase Taxes and Charges,Valuation,Procjena
 ,Purchase Order Trends,Trendovi narudžbenica kupnje
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,The request for quotation can be accessed by clicking on the following link,Zahtjev za ponudu se može pristupiti klikom na sljedeći link
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,Dodjela lišće za godinu dana.
 DocType: SG Creation Tool Course,SG Creation Tool Course,Tečaj SG alat za izradu
 DocType: Student Group Creation Tool,Leave blank if you wish to fetch all courses for selected academic term,Ostavite prazno ako želite dohvatiti sve tečajeve za odabrane akademskog pojam
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,Insufficient Stock,nedovoljna Stock
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227,Insufficient Stock,nedovoljna Stock
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Onemogući planiranje kapaciteta i vremena za praćenje
+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: 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/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} does not belong to Company {1},Račun {0} ne pripada tvrtki {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +86,Account {0} does not belong to Company {1},Račun {0} ne pripada tvrtki {1}
 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}
 DocType: Naming Series,Series List for this Transaction,Serija Popis za ovu transakciju
 DocType: Sales Invoice,Is Opening Entry,Je Otvaranje unos
 DocType: Customer Group,Mention if non-standard receivable account applicable,Spomenuti ako nestandardni potraživanja računa primjenjivo
 DocType: Course Schedule,Instructor Name,Instruktor Ime
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,For Warehouse is required before Submit,Jer je potrebno Warehouse prije Podnijeti
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,For Warehouse is required before Submit,Jer je potrebno Warehouse prije Podnijeti
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Primila je u
 DocType: Sales Partner,Reseller,Prodavač
 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 +1436,"LocalStorage is full , did not save","LocalStorage puna, nije štedjelo"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1460,"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}
@@ -262,18 +263,19 @@
 apps/erpnext/erpnext/templates/generators/item.html +78,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 +5,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/leave_application/leave_application.py +206,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/leave_application/leave_application.py +213,Only the selected Leave Approver can submit this Leave Application,Samo osoba ovlaštena za odobrenje odsustva može potvrditi zahtjev za odsustvom
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Olakšavanja Datum mora biti veći od dana ulaska u
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Leaves per Year,Ostavlja godišnje
+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 +103,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}
+DocType: Email Digest,Profit & Loss,Gubitak profita
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,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 +435,Leave Blocked,Neodobreno odsustvo
-apps/erpnext/erpnext/stock/doctype/item/item.py +669,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 +443,Leave Blocked,Neodobreno odsustvo
+apps/erpnext/erpnext/stock/doctype/item/item.py +671,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 +83,Annual,godišnji
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +86,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
@@ -281,20 +283,22 @@
 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
 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 +91,Software Developer,Software Developer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Minimalna količina narudžbe
 DocType: Pricing Rule,Supplier Type,Dobavljač Tip
 DocType: Scheduling Tool,Course Start Date,Naravno Datum početka
 DocType: Item,Publish in Hub,Objavi na Hub
+DocType: Student Admission,Student Admission,Studentski Ulaz
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is cancelled,Proizvod {0} je otkazan
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Material Request,Zahtjev za robom
+apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} is cancelled,Proizvod {0} je otkazan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +823,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 +28,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 +328,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Stavka {0} nije pronađena u &quot;sirovina nabavlja se &#39;stol narudžbenice {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +333,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/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
@@ -310,20 +314,21 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +130,Please select Charge Type first,Odaberite Naknada za prvi
 DocType: Student Group Student,Student Group Student,Studentski Group Studentski
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Najnovije
+DocType: Email Digest,New Quotations,Nove ponude
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Prvi dopust Odobritelj na popisu će se postaviti kao zadani Odobritelj dopust
 DocType: Tax Rule,Shipping County,dostava županija
 apps/erpnext/erpnext/config/desktop.py +158,Learn,Naučiti
 DocType: Asset,Next Depreciation Date,Sljedeći datum Amortizacija
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Aktivnost Cijena po zaposlenom
 DocType: Accounts Settings,Settings for Accounts,Postavke za račune
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +626,Supplier Invoice No exists in Purchase Invoice {0},Dobavljač Račun br postoji u fakturi {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +629,Supplier Invoice No exists in Purchase Invoice {0},Dobavljač Račun br postoji u fakturi {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Uredi raspodjelu prodavača.
 DocType: Job Applicant,Cover Letter,Pismo
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Izvanredna Čekovi i depoziti za brisanje
 DocType: Item,Synced With Hub,Sinkronizirati s Hub
 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 +348,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 +86,Circular Reference Error,Kružni Referentna Greška
@@ -335,15 +340,16 @@
 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 +806,Delivery Note,Otpremnica
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +800,Delivery Note,Otpremnica
 apps/erpnext/erpnext/config/learn.py +87,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 +233,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/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/setup/doctype/email_digest/email_digest.py +104,Summary for this week and pending activities,Sažetak za ovaj tjedan i tijeku aktivnosti
+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"
 DocType: Employee,Company Email,tvrtka E-mail
@@ -355,28 +361,29 @@
 apps/erpnext/erpnext/config/hr.py +186,"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
-apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},"Red # {0}: Kupnja Račun, ne može se protiv postojećeg sredstva {1}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +554,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 +54,{0} already allocated for Employee {1} for period {2} to {3},{0} već dodijeljeno za zaposlenika {1} za vrijeme {2} {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +812,Select Item,Odaberite stavku
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +791,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 \
 					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 +142,Purchase Invoice {0} is already submitted,Nabavni račun {0} je već podnesen
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Red # {0}: Batch Ne mora biti ista kao {1} {2}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +143,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.
 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 +342,Please see attachment,Pogledajte prilog
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,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 +19,Setup Already Complete!!,Postavke su već kompletne!
 ,Finished Goods,Gotovi proizvodi
 DocType: Delivery Note,Instructions,Instrukcije
 DocType: Quality Inspection,Inspected By,Pregledati
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Dobavljač&gt; Vrsta Dobavljač
 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/public/js/utils/item_selector.js +12,Add Items,Dodaj artikle
@@ -390,29 +397,29 @@
 DocType: Currency Exchange,Currency Exchange,Mjenjačnica
 DocType: Purchase Invoice Item,Item Name,Naziv proizvoda
 DocType: Authorization Rule,Approving User  (above authorized value),Odobravanje korisnik (iznad ovlaštenog vrijednosti)
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Kreditna bilanca
+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/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 +736,Purchase Return,Kupnja Povratak
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +715,Purchase Return,Kupnja Povratak
 ,Purchase Register,Popis nabave
 DocType: 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 +202,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) mora imati ulogu ""Odobritelj odsustva '"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,{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 +143,Reason for losing,Razlog gubitka
-apps/erpnext/erpnext/accounts/utils.py +239,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 +163,Reason for losing,Razlog gubitka
+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
 DocType: Announcement,Receiver,Prijamnik
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Radna stanica je zatvorena na sljedeće datume po Holiday Popis: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Mogućnosti
 DocType: Employee,Single,Singl
 DocType: 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 +225,Please enter Cost Center,Unesite troška
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,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č
@@ -425,26 +432,26 @@
 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
 DocType: Account,Is Group,Je grupe
+DocType: Email Digest,Pending Purchase Orders,U tijeku narudžbenice
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Automatski Postavljanje Serijski broj na temelju FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Provjerite Dobavljač Račun broj Jedinstvenost
 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 +102,Non Profit,Neprofitno
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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: Stock Reconciliation Item,Do not include symbols (ex. $),Ne uključuje simbole (npr. $)
 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 +638,Attribute {0} selected multiple times in Attributes Table,Osobina {0} izabrani više puta u Svojstva tablice
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Osobina {0} izabrani više puta u Svojstva tablice
 DocType: HR Settings,Employee record is created using selected field. ,Zaposlenika rekord je stvorio pomoću odabranog polja.
 DocType: Sales Order,Not Applicable,Nije primjenjivo
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Majstor za odmor .
 DocType: Request for Quotation Item,Required Date,Potrebna Datum
 DocType: Delivery Note,Billing Address,Adresa za naplatu
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +862,Please enter Item Code.,Unesite kod artikal .
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +847,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"
@@ -458,12 +465,12 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Vrijednosni papiri i depoziti
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Ukupno lišće izdvojena obvezna
 DocType: Job Opening,Description of a Job Opening,Opis je otvaranju novih radnih mjesta
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Pending activities for today,Čekanju aktivnosti za danas
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Čekanju aktivnosti za danas
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Rekord gledanosti
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Plaća Komponenta za timesheet temelju plaće.
 DocType: Sales Order Item,Used for Production Plan,Koristi se za plan proizvodnje
 DocType: Manufacturing Settings,Time Between Operations (in mins),Vrijeme između operacije (u minutama)
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +92,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} Proračun za račun {1} protiv Centra troška {2} {3}. To će biti veći od {4}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +95,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} Proračun za račun {1} protiv Centra troška {2} {3}. To će biti veći od {4}
 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
@@ -471,16 +478,16 @@
 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/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 +86,Administrative Officer,Administrativni službenik
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,Administrativni službenik
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +23,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 +319,Please select Company,Odaberite tvrtke
-DocType: Stock Entry,Difference Account,Račun razlike
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +309,Please select Company,Odaberite tvrtke
+DocType: Stock Entry Detail,Difference Account,Račun razlike
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,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 +398,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 +399,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 +530,"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 +532,"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 +28,Buy,Kupiti
@@ -488,7 +495,7 @@
 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 +1563,Serial no item cannot be a fraction,Serijski nema stavke ne može biti dio
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1587,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
@@ -497,13 +504,14 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Account {0} does not belong to company: {1},Račun {0} ne pripada tvrtki: {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation already used for another company,Naziv već koristi druga tvrtka
 DocType: Selling Settings,Default Customer Group,Zadana grupa kupaca
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Supplier is required against Payable account {0},Dobavljač je dužan uz plaća se računa {0}
 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
 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 +313,Reference No and Reference Date is mandatory for Bank transaction,Referentni broj i reference Datum obvezna je za banke transakcije
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +316,Reference No and Reference Date is mandatory for Bank transaction,Referentni broj i reference Datum obvezna je za banke transakcije
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Dodaj / uredi porez i pristojbe
 DocType: Purchase Invoice,Supplier Invoice No,Dobavljač Račun br
 DocType: Territory,For reference,Za referencu
@@ -514,7 +522,6 @@
 DocType: Installation Note Item,Installation Note Item,Napomena instalacije proizvoda
 DocType: Production Plan Item,Pending Qty,U tijeku Kom
 DocType: Budget,Ignore,Ignorirati
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Stavka Šifra&gt; Stavka Group&gt; Brand
 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/config/accounts.py +241,Setup cheque dimensions for printing,Provjera postavljanje dimenzije za ispis
 DocType: Salary Slip,Salary Slip Timesheet,Plaća proklizavanja timesheet
@@ -525,11 +532,11 @@
 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/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 +28,Please select Company and Party Type first,Odaberite Društvo i Zabava Tip prvi
+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/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 +707,Make Sales Order,Napravi prodajnu narudžbu
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +701,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
@@ -545,7 +552,8 @@
 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 +734,Sales Return,Povrat robe
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +728,Sales Return,Povrat robe
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +91,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)
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Baza potencijalnih kupaca.
@@ -554,14 +562,13 @@
 DocType: Quotation,Quotation To,Ponuda za
 DocType: Lead,Middle Income,Srednji Prihodi
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +212,Opening (Cr),Otvaranje ( Cr )
-apps/erpnext/erpnext/stock/doctype/item/item.py +795,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"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 +237,Allocated amount can not be negative,Dodijeljeni iznos ne može biti negativan
+apps/erpnext/erpnext/stock/doctype/item/item.py +797,Default Unit of Measure for Item {0} cannot be changed directly because 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
 DocType: Purchase Order Item,Billed Amt,Naplaćeno Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Kreirano Skladište za ulazne stavke
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Prodaja Račun timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},Reference Nema & Reference Datum je potrebno za {0}
-DocType: Sales Invoice,Customer's Vendor,Kupca Prodavatelj
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Proposal Writing,Pisanje prijedlog
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,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"
@@ -570,13 +577,14 @@
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,praćenje vremena
 DocType: Fiscal Year Company,Fiscal Year Company,Fiskalna godina - tvrtka
 DocType: Packing Slip Item,DN Detail,DN detalj
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +257,Already supplier quotation has created,Već dobavljač citat je stvorio
 DocType: Timesheet,Billed,Naplaćeno
 DocType: Batch,Batch Description,Batch Opis
+apps/erpnext/erpnext/accounts/utils.py +685,"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 +733,View Offline Records,Pogledaj Offline Records
+apps/erpnext/erpnext/accounts/page/pos/pos.js +715,View Offline Records,Pogledaj Offline Records
+DocType: Student,Sibling Details,polubrat Detalji
 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: Payment Reconciliation,Invoice/Journal Entry Details,Račun / Temeljnica Detalji
@@ -590,7 +598,7 @@
 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
 DocType: Employee,Passport Number,Broj putovnice
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Manager,Upravitelj
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,Upravitelj
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,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
@@ -599,10 +607,11 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter email address,Molimo unesite e-mail adresu
 DocType: Production Order Operation,In minutes,U minuta
 DocType: Issue,Resolution Date,Rezolucija Datum
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +299,Timesheet created:,Timesheet stvorio:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +715,Please set default Cash or Bank account in Mode of Payment {0},Molimo postavite zadanu gotovinom ili banka računa u načinu plaćanja {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +300,Timesheet created:,Timesheet stvorio:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +772,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
 DocType: Selling Settings,Customer Naming By,Imenovanje kupca prema
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Molimo postavljanje zaposlenika sustav imenovanja u ljudskim resursima&gt; HR Postavke
 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
@@ -627,6 +636,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,Završi
 DocType: Pricing Rule,Sales Manager,Sales Manager
 DocType: Salary Structure Employee,Base,Baza
+DocType: Timesheet,Total Billed Hours,Ukupno Naplaćene sati
 DocType: Journal Entry,Write Off Amount,Napišite paušalni iznos
 DocType: Journal Entry,Bill No,Bill Ne
 DocType: Company,Gain/Loss Account on Asset Disposal,Dobitak / Gubitak računa na sredstva Odlaganje
@@ -641,11 +651,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +9,Pre Sales,Pretprodaja
 DocType: Purchase Receipt,Other Details,Ostali detalji
 DocType: Account,Accounts,Računi
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Marketing,Marketing
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +227,Payment Entry is already created,Ulazak Plaćanje je već stvorio
+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,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 +538,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 +21,Preview Salary Slip,Pregled Plaća proklizavanja
+apps/erpnext/erpnext/controllers/accounts_controller.py +541,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 +38,Preview Salary Slip,Pregled Plaća proklizavanja
 DocType: Company,Deafult Cost Center,Deafult Centar Cijena
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +48,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
@@ -654,7 +664,7 @@
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,Odaberite grupe studenata
 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 +617,Item has variants.,Stavka ima varijante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Stavka ima varijante.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,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
@@ -674,7 +684,7 @@
 DocType: Purchase Order,Supply Raw Materials,Supply sirovine
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,Datum na koji pored faktura će biti generiran. Ona nastaje na dostavi.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Dugotrajna imovina
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,{0} is not a stock Item,{0} nije skladišni proizvod
+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 +169,Lead must be set if Opportunity is made from Lead,Potencijalni kupac mora biti postavljen ako je prilika iz njega izrađena
@@ -760,26 +770,25 @@
 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 +709,No Permission,Nemate dopuštenje
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +710,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}
 apps/erpnext/erpnext/public/js/setup_wizard.js +298,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 +542,Row #{0}: Asset {1} must be submitted,Red # {0}: Imovina {1} mora biti predana
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset {1} must be submitted,Red # {0}: Imovina {1} mora biti predana
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Nisu pronađeni zaposlenici
 DocType: Supplier Quotation,Stopped,Zaustavljen
 DocType: Item,If subcontracted to a vendor,Ako podugovoren dobavljaču
 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.
 DocType: Warehouse,Tree Details,stablo Detalji
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Pošalji odmah
 ,Support Analytics,Analitike podrške
 DocType: Item,Website Warehouse,Skladište web stranice
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimalni iznos fakture
 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/sales_invoice/sales_invoice.py +227,Timesheet {0} is already completed or cancelled,Timesheet {0} već je završen ili otkazan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +259,Timesheet {0} is already completed or cancelled,Timesheet {0} već je završen ili otkazan
 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
@@ -795,13 +804,13 @@
 apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Raspored predmeta
 DocType: Maintenance Visit,Completion Status,Završetak Status
 DocType: HR Settings,Enter retirement age in years,Unesite dob za umirovljenje u godinama
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +229,Target Warehouse,Ciljana galerija
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +230,Target Warehouse,Ciljana galerija
 DocType: Cheque Print Template,Starting location from left edge,Počevši lokaciju od lijevog ruba
 DocType: Item,Allow over delivery or receipt upto this percent,Dopustite preko isporuka ili primitak upto ovim posto
 DocType: Stock Entry,STE-,STE-
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Sales Order Date,Očekuje se dostava Datum ne može biti prije prodajnog naloga Datum
 DocType: Upload Attendance,Import Attendance,Uvoz posjećenost
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Sve skupine proizvoda
+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/config/setup.py +89,Automatically compose message on submission of transactions.,Automatski napravi poruku pri podnošenju transakcije.
@@ -813,13 +822,15 @@
 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/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
 DocType: Expense Claim,Expenses,troškovi
 DocType: Item Variant Attribute,Item Variant Attribute,Stavka Varijanta Osobina
 ,Purchase Receipt Trends,Trend primki
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Research & Development,Istraživanje i razvoj
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Istraživanje i razvoj
 ,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
@@ -828,7 +839,7 @@
 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/controllers/accounts_controller.py +340,"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."
+apps/erpnext/erpnext/controllers/accounts_controller.py +343,"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
@@ -850,12 +861,12 @@
 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 +756,Purchase Receipt,Primka
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +735,Purchase Receipt,Primka
 ,Received Items To Be Billed,Primljeni Proizvodi se naplaćuje
 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 +167,Reference Doctype must be one of {0},Referentni DOCTYPE mora biti jedan od {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +282,Unable to find Time Slot in the next {0} days for Operation {1},Nije moguće pronaći termin u narednih {0} dana za rad {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +170,Reference Doctype must be one of {0},Referentni DOCTYPE mora biti jedan od {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,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 +439,BOM {0} must be active,BOM {0} mora biti aktivna
@@ -866,7 +877,7 @@
 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 +214,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 +217,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
@@ -880,9 +891,9 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Zaposlenik {0} nije aktivan ili ne postoji
 DocType: Fee Structure,Components,Komponente
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,Please enter Asset Category in Item {0},Unesite imovinom Kategorija tačke {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +612,Item Variants {0} updated,Stavka Varijante {0} ažurirani
+apps/erpnext/erpnext/stock/doctype/item/item.py +614,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 +843,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 +854,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
@@ -897,69 +908,72 @@
 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 +728,New Sales Invoice,Novi prodajni Račun
+apps/erpnext/erpnext/accounts/page/pos/pos.js +710,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 +728,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
 DocType: Material Request Item,Lead Time Date,Potencijalni kupac - datum
 DocType: Guardian,Guardian Name,Naziv Guardian
 DocType: Cheque Print Template,Has Print Format,Ima format ispisa
-apps/erpnext/erpnext/accounts/page/pos/pos.js +86, is mandatory. Maybe Currency Exchange record is not created for ,je obavezno. Možta nije upisan tečaj za
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +109,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 +619,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","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/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,je obavezno. Možta nije upisan tečaj 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 +613,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing 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 +606,Supplier Invoice Date cannot be greater than Posting Date,Datum Dobavljač Račun ne može biti veća od datum knjiženja
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +609,Supplier Invoice Date cannot be greater than Posting Date,Datum Dobavljač Račun ne može biti veća od datum knjiženja
 DocType: Purchase Invoice Item,Purchase Order Item,Stavka narudžbenice
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +130,Indirect Income,Neizravni dohodak
 DocType: Cheque Print Template,Date Settings,Datum Postavke
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Varijacija
 ,Company Name,Ime tvrtke
 DocType: SMS Center,Total Message(s),Ukupno poruka ( i)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +810,Select Item for Transfer,Odaberite stavke za prijenos
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +789,Select Item for Transfer,Odaberite stavke za prijenos
 DocType: Purchase Invoice,Additional Discount Percentage,Dodatni Postotak Popust
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Pregled popisa svih pomoć videa
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Odaberite račun šefa banke gdje je ček bio pohranjen.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Dopusti korisniku uređivanje cjenika u transakcijama
 DocType: Pricing Rule,Max Qty,Maksimalna količina
-DocType: Student Applicant,Father's Name,Očevo ime
 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 +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Red {0}: Plaćanje protiv prodaje / narudžbenice treba uvijek biti označena kao unaprijed
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,kemijski
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +686,All items have already been transferred for this Production Order.,Svi predmeti su već prebačeni za ovu radnog naloga.
+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
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +694,All items have already been transferred for this Production Order.,Svi predmeti su već prebačeni za ovu radnog naloga.
 DocType: Process Payroll,Select Payroll Year and Month,Odaberite Platne godina i mjesec
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,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
-DocType: Opportunity,Walk In,Šetnja u
 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 +12,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: Timesheet Detail,Bill,Račun
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,White,Bijela
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,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
 DocType: SMS Center,All Lead (Open),Svi potencijalni kupci (aktualni)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +228,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})
+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 +731,Make ,Napravi
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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 .
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Moja košarica
-apps/erpnext/erpnext/controllers/selling_controller.py +154,Order Type must be one of {0},Tip narudžbe mora biti jedan od {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Tip narudžbe mora biti jedan od {0}
 DocType: Lead,Next Contact Date,Sljedeći datum kontakta
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Otvaranje Kol
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +393,Please enter Account for Change Amount,Unesite račun za promjene visine
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,Please enter Account for Change Amount,Unesite račun za promjene visine
 DocType: Student Batch,Student Batch Name,Studentski Batch Name
 DocType: Holiday List,Holiday List Name,Turistička Popis Ime
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js +8,Schedule Course,Raspored nastave
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Stock Options,Burzovnih opcija
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Burzovnih opcija
 DocType: Journal Entry Account,Expense Claim,Rashodi polaganja
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +211,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 +237,Qty for {0},Količina za {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +212,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 +238,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
@@ -968,9 +982,9 @@
 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/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Uklonjene stvari bez promjena u količini ili vrijednosti.
+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 +635,Attribute table is mandatory,Osobina stol je obavezno
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Osobina stol je obavezno
 DocType: Production Planning Tool,Get Sales Orders,Kreiraj narudžbe
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{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
@@ -995,7 +1009,7 @@
 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/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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Serijski Ne {0} je pod ugovorom za održavanje upto {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +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
@@ -1007,7 +1021,7 @@
 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/controllers/selling_controller.py +231,Sales Order {0} is {1},Prodaja Naručite {0} {1}
+apps/erpnext/erpnext/controllers/selling_controller.py +232,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
 DocType: Packing Slip,Net Weight UOM,Težina mjerna jedinica
@@ -1017,25 +1031,24 @@
 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
 DocType: Sales Person,Select company name first.,Prvo odaberite naziv tvrtke.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Dr,Doktor
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Dr,Doktor
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Ponude dobivene od dobavljača.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},Za {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Prosječna starost
 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/templates/pages/home.html +32,View All Products,Pogledaj sve proizvode
+apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Pogledaj sve proizvode
 DocType: Company,Default Currency,Zadana valuta
 DocType: Contact,Enter designation of this Contact,Upišite oznaku ove Kontakt
 DocType: Expense Claim,From Employee,Od zaposlenika
-apps/erpnext/erpnext/controllers/accounts_controller.py +400,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
+apps/erpnext/erpnext/controllers/accounts_controller.py +403,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/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,i godina:
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +191,{0} {1} must be submitted,{0} {1} mora biti podnesen
-DocType: Email Digest,Annual Expense,Godišnji rashodi
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,{0} {1} must be submitted,{0} {1} mora biti podnesen
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +145,Quantity must be less than or equal to {0},Količina mora biti manji ili jednak {0}
 DocType: SMS Center,Total Characters,Ukupno Likovi
 apps/erpnext/erpnext/controllers/buying_controller.py +156,Please select BOM in BOM field for Item {0},Odaberite BOM u BOM polje za točku {0}
@@ -1046,30 +1059,31 @@
 DocType: Sales Partner,Distributor,Distributer
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Košarica Dostava Rule
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +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 +62,Please set 'Apply Additional Discount On',Molimo postavite &quot;Primijeni dodatni popust na &#39;
+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
 DocType: Global Defaults,Global Defaults,Globalne zadane postavke
 apps/erpnext/erpnext/projects/doctype/project/project.py +153,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
 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 +327,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
 ,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 +362,Finished Item {0} must be entered for Manufacture type entry,Gotovi Stavka {0} mora biti upisana za tip Proizvodnja upis
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +367,Finished Item {0} must be entered for Manufacture type entry,Gotovi Stavka {0} mora biti upisana za tip Proizvodnja upis
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Otvaranje Računovodstvo Stanje
 DocType: Sales Invoice Advance,Sales Invoice Advance,Predujam prodajnog računa
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +499,Nothing to request,Ništa za zatražiti
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +500,Nothing to request,Ništa za zatražiti
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',Stvarni datum početka ne može biti veći od stvarnog datuma završetka
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Management,Uprava
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},Ili debitna ili kreditna iznos potreban za {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,Uprava
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +55,Either debit or credit amount is required for {0},Ili debitna ili kreditna iznos potreban za {0}
 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 +161,Blue,Plava
+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
@@ -1079,12 +1093,12 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +23,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
 DocType: Stock Settings,Default Item Group,Zadana grupa proizvoda
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1374,Do you really want to submit the invoice?,Da li stvarno želite da pošaljete račun?
+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 +685,Cost Center For Item with Item Code ',Troška za stavku s šifra '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1526,"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 +679,Cost Center For Item with Item Code ',Troška za stavku s šifra '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1550,"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/accounts/doctype/account/account_tree.js +26,"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
@@ -1104,104 +1118,106 @@
 DocType: Payment Reconciliation,Unreconciled Payment Details,Nesaglašen Detalji plaćanja
 DocType: Global Defaults,Current Fiscal Year,Tekuće fiskalne godine
 DocType: Global Defaults,Disable Rounded Total,Ugasiti zaokruženi iznos
-DocType: Lead,Call,Poziv
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +417,'Entries' cannot be empty,'Ulazi' ne može biti prazno
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +418,'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 +214,Fiscal Year {0} not found,Fiskalna godina {0} nije pronađena
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +221,Fiscal Year {0} not found,Fiskalna godina {0} nije pronađena
 apps/erpnext/erpnext/config/hr.py +238,Setting up Employees,Postavljanje zaposlenika
 DocType: Sales Order,SO-,TAKO-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Odaberite prefiks prvi
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Please select prefix first,Odaberite prefiks prvi
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Research,istraživanje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,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 +43,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 +57,View Ledger,Pogledaj Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Najstarije
-apps/erpnext/erpnext/stock/doctype/item/item.py +504,"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 +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/setup/setup_wizard/setup_wizard.py +437,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
 ,Budget Variance Report,Proračun varijance Prijavi
 DocType: Salary Slip,Gross Pay,Bruto plaća
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +90,Row {0}: Activity Type is mandatory.,Red {0}: Tip aktivnost je obavezna.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +114,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/public/js/controllers/stock_controller.js +40,Accounting Ledger,Računovodstvo knjiga
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,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
 DocType: BOM Item,Item Description,Opis proizvoda
+DocType: Student Sibling,Student Sibling,Studentski iste razine
 DocType: Purchase Invoice,Is Recurring,Je Ponavljajući
 DocType: Purchase Invoice,Supplied Items,Isporučeni pribor
 DocType: Student,STUD.,KLINAC.
 DocType: Production Order,Qty To Manufacture,Količina za proizvodnju
+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/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 +131,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 +175,Valuation Rate required for Item in row {0},Procjena stopa potrebna za stavke u retku {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,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
 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 +87, to ,za
+apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,za
 DocType: Item,Lead Time in days,Olovo Vrijeme u danima
 ,Accounts Payable Summary,Obveze Sažetak
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Not authorized to edit frozen Account {0},Niste ovlašteni za uređivanje zamrznutog računa {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,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 +62,Sales Order {0} is not valid,Prodajnog naloga {0} nije ispravan
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Prodajnog naloga {0} nije ispravan
 apps/erpnext/erpnext/setup/doctype/company/company.py +185,"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 +152,Small,Mali
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,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}
 ,Invoiced Amount (Exculsive Tax),Dostavljeni iznos ( Exculsive poreza )
-DocType: Student Applicant,Mother's / Guardian 1 Email ID,/ Staratelja ID 1 e-Majčin
 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 +160,Green,Zelena
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,Zelena
 DocType: Supplier,SUPP-,SUPP-
 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 +57,Contract,ugovor
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,ugovor
 DocType: Email Digest,Add Quote,Dodaj ponudu
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +498,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 +503,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 +80,Row {0}: Qty is mandatory,Red {0}: Količina je obvezno
+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 +737,Sync Master Data,Sync Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +719,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/public/js/setup_wizard.js +283,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
+DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,To jekorijen stavka grupa i ne može se mijenjati .
+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 .
 DocType: Journal Entry Account,Purchase Order,Narudžbenica
 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 +345,"{0}: Employee email not found, hence email not sent","{0}: Radnik email nije pronađen, stoga ne e-mail poslan"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +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
 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 +118,"For {0}, only credit accounts can be linked against another debit entry","Za {0}, samo kreditne računi se mogu povezati protiv drugog ulaska debitnom"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Delivery Note {0} is not submitted,Otpremnica {0} nije potvrđena
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Delivery Note {0} is not submitted,Otpremnica {0} nije potvrđena
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Sub-contracted Item,Stavka {0} mora bitisklopljen ugovor artikla
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Kapitalni oprema
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Cijene Pravilo prvo se bira na temelju 'Nanesite na' terenu, koji može biti točka, točka Grupa ili Brand."
 DocType: Hub Settings,Seller Website,Web Prodavač
 DocType: Item,ITEM-,ARTIKAL-
-apps/erpnext/erpnext/controllers/selling_controller.py +147,Total allocated percentage for sales team should be 100,Ukupno dodijeljeno postotak za prodajni tim bi trebao biti 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +110,Production Order status is {0},Status proizvodnog naloga je {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Ukupno dodijeljeno postotak za prodajni tim bi trebao biti 100
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Status proizvodnog naloga je {0}
 DocType: Appraisal Goal,Goal,Cilj
 DocType: Sales Invoice Item,Edit Description,Uredi Opis
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +757,For Supplier,za Supplier
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +723,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
@@ -1217,10 +1233,11 @@
 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
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-pošta:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +445,BOM {0} does not belong to Item {1},BOM {0} ne pripada Točki {1}
 DocType: Sales Partner,Target Distribution,Ciljana Distribucija
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1667,Deafault warehouse is required for selected item,Deafault skladište je potreban za odabranu stavku
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Deafault warehouse is required for selected item,Deafault skladište je potreban za odabranu stavku
 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
@@ -1229,23 +1246,23 @@
 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 +110,Hardware,Hardver
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,Hardver
 DocType: Sales Order,Recurring Upto,ponavljajući Upto
 DocType: Attendance,HR Manager,HR menadžer
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Odaberite tvrtku
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Privilege Leave,Privilege dopust
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,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 +79,You need to enable Shopping Cart,Morate omogućiti košaricu
 DocType: Payment Entry,Writeoff,Otpisati
 DocType: Appraisal Template Goal,Appraisal Template Goal,Procjena Predložak cilja
-DocType: Salary Slip,Earning,Zarada
+DocType: Salary Component,Earning,Zarada
 DocType: Purchase Invoice,Party Account Currency,Strana valuta računa
 ,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 +171,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 +174,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_data.py +358,Food,hrana
+apps/erpnext/erpnext/demo/setup/setup_data.py +301,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/course_schedule/course_schedule.js +103,Mark Attendence,Mark dolazaka
@@ -1279,12 +1296,12 @@
 DocType: Sales Order Item,Planned Quantity,Planirana količina
 DocType: Purchase Invoice Item,Item Tax Amount,Iznos poreza proizvoda
 DocType: Item,Maintain Stock,Upravljanje zalihama
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +209,Stock Entries already created for Production Order ,Stock Prijave su već stvorene za proizvodnju reda
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,Stock Prijave su već stvorene za proizvodnju reda
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,Neto promjena u dugotrajne imovine
 DocType: Leave Control Panel,Leave blank if considered for all designations,Ostavite prazno ako se odnosi na sve oznake
-apps/erpnext/erpnext/controllers/accounts_controller.py +620,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 +238,Max: {0},Maksimalno: {0}
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +15,From Datetime,Od datetime
+apps/erpnext/erpnext/controllers/accounts_controller.py +623,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 +239,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 +153,"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."
@@ -1292,8 +1309,8 @@
 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 +552,cannot be greater than 100,ne može biti veće od 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +680,Item {0} is not a stock Item,Proizvod {0} nije skladišni proizvod
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +546,cannot be greater than 100,ne može biti veće od 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,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
@@ -1307,10 +1324,9 @@
 DocType: GL Entry,GL Entry,GL ulaz
 DocType: HR Settings,Employee Settings,Postavke zaposlenih
 ,Batch-Wise Balance History,Batch-Wise povijest bilance
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Popis podsjetnika
 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 +61,Apprentice,šegrt
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +102,Negative Quantity is not allowed,Negativna količina nije dopuštena
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,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"
@@ -1332,15 +1348,14 @@
 DocType: Asset,Asset Name,Naziv imovinom
 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 +141,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 +719,Packing Slip,Odreskom
+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 +713,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/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,Zahtjev za ponudu može biti pristup klikom linku
 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 +81,Analyst,analitičar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,analitičar
 DocType: Item,Inventory,Inventar
 DocType: Item,Sales Details,Prodajni detalji
 DocType: Quality Inspection,QI-,QI-
@@ -1348,7 +1363,7 @@
 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 +103,Government,Vlada
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,Vlada
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,Naziv Institut
 apps/erpnext/erpnext/config/stock.py +289,Item Variants,Stavka Varijante
 DocType: Company,Services,Usluge
@@ -1364,6 +1379,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,Financial Year Start Date,Financijska godina - početni datum
 DocType: POS Profile,Apply Discount,Primijeni popust
 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
 DocType: Program Course,Program Course,Program predmeta
@@ -1404,12 +1420,12 @@
 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
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +110,Accounting Entry for {0} can only be made in currency: {1},Računovodstvo Ulaz za {0} može biti samo u valuti: {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Računovodstvo Ulaz za {0} može biti samo u valuti: {1}
 DocType: Pricing Rule,Pricing Rule,Pravila cijena
 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
 DocType: Shopping Cart Settings,Payment Success URL,Plaćanje Uspjeh URL
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +78,Row # {0}: Returned Item {1} does not exists in {2} {3},Red # {0}: Vraćeno Stavka {1} ne postoji u {2} {3}
+apps/erpnext/erpnext/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
@@ -1418,40 +1434,39 @@
 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/stock/doctype/stock_entry/stock_entry.py +339,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Nije dopušteno Prenesite više {0} od {1} protiv narudžbenice {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +344,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 +545,Manufacturing Quantity is mandatory,Proizvedena količina je obvezna
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Proizvedena količina je obvezna
 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 +71,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 +162,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/projects/doctype/timesheet/timesheet.py +186,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
 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 +130,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 +137,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
 DocType: Dependent Task,Dependent Task,Ovisno zadatak
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,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/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 +190,Leave of type {0} cannot be longer than {1},Odsustvo tipa {0} ne može biti duže od {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +197,Leave of type {0} cannot be longer than {1},Odsustvo tipa {0} ne može biti duže od {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Pokušajte planirati poslovanje za X dana unaprijed.
 DocType: HR Settings,Stop Birthday Reminders,Zaustavi Rođendan Podsjetnici
 DocType: SMS Center,Receiver List,Prijemnik Popis
-apps/erpnext/erpnext/accounts/page/pos/pos.js +921,Search Item,Traži Stavka
+apps/erpnext/erpnext/accounts/page/pos/pos.js +910,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 +546,Already completed,već završena
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +22,Payment Request already exists {0},Zahtjev za plaćanje već postoji {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +550,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 +241,Quantity must not be more than {0},Količina ne smije biti veća od {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Quantity must not be more than {0},Količina ne smije biti veća od {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +76,Previous Financial Year is not closed,Prethodne financijske godine nije zatvoren
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +44,Age (Days),Starost (dani)
 DocType: Quotation Item,Quotation Item,Proizvod iz ponude
@@ -1468,7 +1483,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +221,Purchase Receipt {0} is not submitted,Primka {0} nije potvrđena
 DocType: Company,Default Payable Account,Zadana Plaća račun
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Postavke za online košarici, kao što su utovar pravila, cjenika i sl"
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +83,{0}% Billed,{0}% Naplaćeno
+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
@@ -1480,12 +1495,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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/schools/doctype/fees/fees.js +22,Collect,Prikupiti
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Prikupiti
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,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 +225,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
-DocType: Payment Reconciliation,Payments,Plaćanja
 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
@@ -1497,7 +1511,7 @@
 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 +9,Procurement,nabavka
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,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/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
 ,Lead Details,Detalji potenciajalnog kupca
 DocType: Purchase Invoice,End date of current invoice's period,Kraj datum tekućeg razdoblja dostavnice
@@ -1522,7 +1536,7 @@
 DocType: Purchase Invoice,Additional Discount,Dodatni popust
 DocType: Selling Settings,Selling Settings,Postavke prodaje
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Online aukcije
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +97,Please specify either Quantity or Valuation Rate or both,Navedite ili količini ili vrednovanja Ocijenite ili oboje
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,Navedite ili količini ili vrednovanja Ocijenite ili oboje
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +13,Fulfillment,Ispunjenje
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Tvrtka , Mjesec i Fiskalna godina je obvezno"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Troškovi marketinga
@@ -1543,14 +1557,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,ERPNext dovršeno!
 DocType: Item,Weightage,Weightage
 DocType: Packing Slip,PS-,P.S-
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +93,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Postoji grupa kupaca sa istim imenom. Promijenite naziv kupca ili naziv grupe kupaca.
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +126,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
 DocType: Stock Entry,Material Receipt,Potvrda primitka robe
 DocType: Homepage,Products,Proizvodi
 DocType: Announcement,Instructor,Instruktor
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},Party Tip i stranka je potrebna za potraživanja / obveze prema dobavljačima račun {0}
 DocType: 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
@@ -1561,7 +1574,7 @@
 ,Item-wise Sales Register,Stavka-mudri prodaja registar
 DocType: Asset,Gross Purchase Amount,Bruto Iznos narudžbe
 DocType: Asset,Depreciation Method,Metoda amortizacije
-apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Offline,offline
+apps/erpnext/erpnext/accounts/page/pos/pos.js +686,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
@@ -1579,25 +1592,27 @@
 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
 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 +858,Make Purchase Order,Napravi narudžbu kupnje
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +852,Make Purchase Order,Napravi narudžbu kupnje
 DocType: SMS Center,Send To,Pošalji
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,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 +148,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
 DocType: Stock Reconciliation,Stock Reconciliation,Kataloški pomirenje
 DocType: Territory,Territory Name,Naziv teritorija
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +172,Work-in-Progress Warehouse is required before Submit,Rad u tijeku Warehouse je potrebno prije Podnijeti
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,Work-in-Progress Warehouse is required before Submit,Rad u tijeku Warehouse je potrebno prije Podnijeti
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Podnositelj prijave za posao.
 DocType: Purchase Order Item,Warehouse and Reference,Skladište i reference
 DocType: Supplier,Statutory info and other general information about your Supplier,Zakonska info i druge opće informacije o vašem Dobavljaču
-apps/erpnext/erpnext/hooks.py +88,Addresses,Adrese
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Dobavljač&gt; Vrsta Dobavljač
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +212,Against Journal Entry {0} does not have any unmatched {1} entry,Protiv Temeljnica {0} nema premca {1} unos
+apps/erpnext/erpnext/hooks.py +95,Addresses,Adrese
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +215,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
 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)
 DocType: Sales Order,To Deliver and Bill,Za isporuku i Bill
@@ -1605,11 +1620,10 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,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 +731,Payment,Uplata
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,Payment,Uplata
 DocType: Production Order Operation,Actual Time and Cost,Stvarnog vremena i troškova
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Zahtjev za robom od maksimalnih {0} može biti napravljen za proizvod {1} od narudžbe kupca {2}
 DocType: Employee,Salutation,Pozdrav
-DocType: Pricing Rule,Brand,Brend
 DocType: Course,Course Abbreviation,naziv predmeta
 DocType: Item,Will also apply for variants,Također će podnijeti zahtjev za varijante
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +142,"Asset cannot be cancelled, as it is already {0}","Imovina se ne može otkazati, jer je već {0}"
@@ -1621,7 +1635,7 @@
 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."
 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 +85,Associate,pomoćnik
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,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
@@ -1629,7 +1643,7 @@
 DocType: Production Planning Tool,Material Requests,Materijal Zahtjevi
 DocType: Warranty Claim,Issue Date,Datum izdavanja
 DocType: Activity Cost,Activity Cost,Aktivnost troškova
-DocType: Timesheet Detail,Timesheet Detail,timesheet Detalj
+DocType: Sales Invoice Timesheet,Timesheet Detail,timesheet Detalj
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Potrošeno Kol
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekomunikacije
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Ukazuje da je paket je dio ove isporuke (samo nacrti)
@@ -1652,6 +1666,7 @@
 DocType: Production Plan Material Request,Material Request Date,Materijal Zahtjev Datum
 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
 DocType: Item,Has Variants,Je Varijante
 DocType: Monthly Distribution,Name of the Monthly Distribution,Naziv mjesečne distribucije
 DocType: Sales Person,Parent Sales Person,Nadređeni prodavač
@@ -1664,31 +1679,32 @@
 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 +44,"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/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.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +502,Error: {0} &gt; {1},Pogreška: {0}&gt; {1}
 DocType: Item,Is Sales Item,Je proizvod namijenjen prodaji
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Raspodjela grupa proizvoda
 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.
 DocType: Naming Series,Current Value,Trenutna vrijednost
-apps/erpnext/erpnext/controllers/accounts_controller.py +235,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/controllers/accounts_controller.py +238,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
 DocType: Delivery Note Item,Against Sales Order,Protiv prodajnog naloga
 ,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 +458,Item table can not be blank,Tablica ne može biti prazna
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +443,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}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +5,This is based on stock movement. See {0} for details,To se temelji na dionicama kretanja. Vidi {0} za detalje
 DocType: Pricing Rule,Selling,Prodaja
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +341,Amount {0} {1} deducted against {2},Iznos {0} {1} oduzimaju od {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +344,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
@@ -1703,8 +1719,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +144,Cannot refer row number greater than or equal to current row number for this Charge type,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 +159,Red,Crvena
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Molimo kliknite na ""Generiraj raspored ' dohvatiti Serial No dodao je za točku {0}"
+apps/erpnext/erpnext/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
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Baza Iznos (Društvo valuta)
@@ -1712,7 +1728,7 @@
 DocType: Installation Note,Installation Time,Vrijeme instalacije
 DocType: Sales Invoice,Accounting Details,Računovodstvo Detalji
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,Izbrišite sve transakcije za ovu Društvo
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +187,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Red # {0}: {1} Operacija nije završeno za {2} kom gotovih proizvoda u proizvodnji Naručite # {3}. Molimo ažurirati status rada preko Vrijeme Trupci
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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,Red # {0}: {1} Operacija nije završeno za {2} kom gotovih proizvoda u proizvodnji Naručite # {3}. Molimo ažurirati status rada preko Vrijeme Trupci
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,Investicije
 DocType: Issue,Resolution Details,Rezolucija o Brodu
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,izdvajanja
@@ -1748,16 +1764,17 @@
 DocType: Bank Reconciliation Detail,Against Account,Protiv računa
 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}
 DocType: Delivery Note,Excise Page Number,Trošarina Broj stranice
 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}
 ,Maintenance Schedules,Održavanja rasporeda
 DocType: Task,Actual End Date (via Time Sheet),Stvarni Datum završetka (putem vremenska tablica)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Amount {0} {1} against {2} {3},Iznos {0} {1} od {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +339,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 +138,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 +295,Debit To account must be a Receivable account,Zaduženja računa mora biti Potraživanja račun
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Receivable account,Zaduženja računa mora biti Potraživanja račun
 DocType: Shipping Rule Condition,Shipping Amount,Dostava Iznos
 ,Pending Amount,Iznos na čekanju
 DocType: Purchase Invoice Item,Conversion Factor,Konverzijski faktor
@@ -1765,10 +1782,10 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +137,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
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +90,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Ukupno dodijeljeni lišće {0} ne može biti manja od već odobrenih lišća {1} za razdoblje
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +93,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 +22,Enter Paid Amount,Unesite uplaćeni iznos
+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
@@ -1778,13 +1795,15 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,timesheets
 DocType: HR Settings,HR Settings,HR postavke
 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 +524,"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."
+apps/erpnext/erpnext/controllers/accounts_controller.py +527,"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 +249,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
 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/stock/get_item_details.py +123,Please specify Company,Navedite tvrtke
 ,Customer Acquisition and Loyalty,Stjecanje kupaca i lojalnost
@@ -1795,17 +1814,19 @@
 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 +183,Closing (Opening + Totals),Zatvaranje (Otvaranje + iznosi)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),Zatvaranje (Otvaranje + iznosi)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Navedite valutu u Društvu
 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/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
-apps/erpnext/erpnext/controllers/accounts_controller.py +272,Account {0} is invalid. Account Currency must be {1},Račun {0} je nevažeći. Valuta računa mora biti {1}
+DocType: Email Digest,Pending Sales Orders,U tijeku su nalozi za prodaju
+apps/erpnext/erpnext/controllers/accounts_controller.py +275,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 +956,"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 Slip,Deduction,Odbitak
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +87,Row {0}: From Time and To Time is mandatory.,Red {0}: Od vremena i vremena je obavezno.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +969,"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 +111,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 +262,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 +7,Please enter Employee Id of this sales person,Unesite ID zaposlenika ove prodaje osobi
@@ -1813,7 +1834,7 @@
 DocType: Project,% Tasks Completed,% Odrađeni zadaci
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,Razlika Iznos mora biti jednak nuli
 DocType: Project,Gross Margin,Bruto marža
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +194,Please enter Production Item first,Unesite Proizvodnja predmeta prvi
+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
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Ponuda
@@ -1822,53 +1843,54 @@
 DocType: Maintenance Visit,Maintenance User,Korisnik održavanja
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +149,Cost Updated,Trošak Ažurirano
 DocType: Employee,Date of Birth,Datum rođenja
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +86,Item {0} has already been returned,Proizvod {0} je već vraćen
+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}
+DocType: Student Admission,Eligibility,kvalificiranost
 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 +177,Job Description,Opis Posla
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,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 +126,"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 +127,"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."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +24,Welcome to POS: Create your POS Profile,Dobrodošli na POS: Kreirajte svoj POS profil
 DocType: Expense Claim,Approver,Odobritelj
 ,SO Qty,SO Kol
+DocType: Guardian,Work Address,Adresa na poslu
 DocType: Appraisal,Calculate Total Score,Izračunajte ukupni rezultat
 DocType: Request for Quotation,Manufacturing Manager,Upravitelj proizvodnje
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serijski Ne {0} je pod jamstvom upto {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +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 +74,Shipments,Pošiljke
+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
 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 +153,Row # ,Red #
+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 +156,Get From,Dobiti Iz
+apps/erpnext/erpnext/public/js/utils.js +167,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 +167,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 +416,"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"
+apps/erpnext/erpnext/controllers/accounts_controller.py +419,"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
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} is disabled,Korisnik {0} je onemogućen
 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 ...
 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 +171,"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 +346,{0} is mandatory for Item {1},{0} je obavezno za točku {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,{0} is mandatory for Item {1},{0} je obavezno za točku {1}
 DocType: Currency Exchange,From Currency,Od novca
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Odaberite Dodijeljeni iznos, Vrsta računa i broj računa u atleast jednom redu"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,Trošak kupnje novog
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},Prodajnog naloga potrebna za točke {0}
 DocType: Purchase Invoice Item,Rate (Company Currency),Ocijeni (Društvo valuta)
-apps/erpnext/erpnext/demo/setup_data.py +360,Others,Ostali
+DocType: Student Guardian,Others,Ostali
 DocType: Payment Entry,Unallocated Amount,Nealocirano Količina
 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
@@ -1888,17 +1910,16 @@
 apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,Serijaliziranom Inventar
 DocType: Activity Type,Default Billing Rate,Zadana naplate stopa
 DocType: Sales Invoice,Total Billing Amount,Ukupno naplate Iznos
-apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +54,Receivable Account,Potraživanja račun
-apps/erpnext/erpnext/controllers/accounts_controller.py +546,Row #{0}: Asset {1} is already {2},Red # {0}: Imovina {1} Već {2}
+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 +549,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 +79,CEO,CEO
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,CEO
 DocType: Expense Claim Detail,Expense Claim Detail,Rashodi Zahtjev Detalj
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +808,Please select correct account,Molimo odaberite ispravnu račun
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +809,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
-DocType: Purchase Invoice Item,Page Break,Prijelom stranice
 DocType: Production Order Operation,Pending,Na čekanju
 DocType: Course,Course Name,Naziv predmeta
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Korisnici koji može odobriti dopust aplikacije neke specifične zaposlenika
@@ -1907,14 +1928,15 @@
 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 +54,Full-time,Puno radno vrijeme
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,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: Student,Guardians,čuvari
 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 +289,Debit To is required,Zaduženja je potrebno
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +321,Debit To is required,Zaduženja je potrebno
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Kupovni cjenik
 DocType: Offer Letter Term,Offer Term,Ponuda Pojam
 DocType: Quality Inspection,Quality Manager,Upravitelj kvalitete
@@ -1922,6 +1944,7 @@
 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/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
@@ -1932,18 +1955,17 @@
 DocType: Production Order Operation,Completed Qty,Završen Kol
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"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 +273,Price List {0} is disabled,Cjenik {0} je ugašen
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +99,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/projects/doctype/timesheet/timesheet.py +123,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
 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}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Trenutno Vrednovanje Ocijenite
 DocType: Item,Customer Item Codes,Kupac Stavka Kodovi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,Razmjena Dobit / gubitak
 DocType: Opportunity,Lost Reason,Razlog gubitka
-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/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/purchase_receipt/purchase_receipt.py +378,All items have already been invoiced,Svi proizvodi su već fakturirani
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +379,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
@@ -1959,18 +1981,19 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Vaši klijenti
 apps/erpnext/erpnext/projects/doctype/project/project.py +141,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/job_opening.html +19,Apply Now,Primijeni sada
+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."
 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
-apps/erpnext/erpnext/utilities/doctype/address/address.py +164,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: Fee Structure,Fee Structure,Struktura naknade
 DocType: Timesheet Detail,Costing Amount,Obračun troškova Iznos
+DocType: Student Admission,Application Fee,Naknada Primjena
 DocType: Process Payroll,Submit Salary Slip,Slanje plaće Slip
-apps/erpnext/erpnext/controllers/selling_controller.py +161,Maxiumm discount for Item {0} is {1}%,Najveći popust za proizvode {0} je {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,Najveći popust za proizvode {0} je {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Uvoz u rasutom stanju
 DocType: Sales Partner,Address & Contacts,Adresa i kontakti
 DocType: SMS Log,Sender Name,Pošiljatelj Ime
@@ -1995,21 +2018,21 @@
 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_data.py +361,Travel,putovanje
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +155,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 +304,Travel,putovanje
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +167,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 +23,Update Cost,Update cost
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Update cost
 DocType: Item Reorder,Item Reorder,Ponovna narudžba proizvoda
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +36,Show Salary Slip,Prikaži Plaća proklizavanja
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +748,Transfer Material,Prijenos materijala
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +53,Show Salary Slip,Prikaži Plaća proklizavanja
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +166,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 +923,Please set recurring after saving,Molimo postavite ponavljajući nakon spremanja
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +646,Select change amount account,Iznos računa Odaberi promjene
+apps/erpnext/erpnext/public/js/controllers/transaction.js +914,Please set recurring after saving,Molimo postavite ponavljajući nakon spremanja
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +703,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
@@ -2021,31 +2044,32 @@
 DocType: Quality Inspection,Verified By,Ovjeren od strane
 DocType: Address,Subsidiary,Podružnica
 apps/erpnext/erpnext/setup/doctype/company/company.py +64,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","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: Quality Inspection,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 +33,Traceability,Sljedivost
 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 +352,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Količina u redku {0} ({1}) mora biti ista kao proizvedena količina {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Količina u redku {0} ({1}) mora biti ista kao proizvedena količina {2}
 DocType: Appraisal,Employee,Zaposlenik
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Pozovi kao korisnik
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} je naplaćen u cijelosti
 DocType: Workstation Working Hour,End Time,Kraj vremena
 DocType: Payment Entry,Payment Deductions or Loss,Odbici plaćanja ili gubitak
-apps/erpnext/erpnext/config/schools.py +100,LMS,LMS
+apps/erpnext/erpnext/config/schools.py +104,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/config/crm.py +6,Sales Pipeline,Prodaja cjevovoda
 DocType: Student Batch Student,Student Batch Student,Studentski Batch Student
-DocType: Sales Invoice,Mass Mailing,Grupno slanje mailova
+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 +199,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/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 +297,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 +111,Pharmaceutical,Farmaceutski
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +309,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/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
@@ -2060,27 +2084,28 @@
 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 +814,Please specify Company to proceed,Navedite Tvrtka postupiti
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +793,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 +44,Compensatory Off,kompenzacijski Off
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,kompenzacijski Off
 DocType: Quality Inspection Reading,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.
 DocType: Room,Room Number,Broj sobe
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Pogrešna referentni {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +161,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ne može biti veći od planirane količine ({2}) u proizvodnom nalogu {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +162,{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 +217,Raw Materials cannot be blank.,Sirovine ne može biti prazno.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,"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 +460,Quick Journal Entry,Brzo Temeljnica
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +111,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/accounts/doctype/sales_invoice/sales_invoice.py +441,"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 +450,Quick Journal Entry,Brzo Temeljnica
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +103,You can not change rate if BOM mentioned agianst any item,Ne možete promijeniti cijenu ako je sastavnica spomenuta u bilo kojem proizvodu
 DocType: Employee,Previous Work Experience,Radnog iskustva
 DocType: Stock Entry,For Quantity,Za Količina
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +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 +214,{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
 ,Minutes to First Response for Issues,Minuta do prvog odgovora na pitanja
 DocType: Purchase Invoice,Terms and Conditions1,Odredbe i Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,Ime instituta za koju postavljate ovaj sustav.
@@ -2089,16 +2114,17 @@
 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 +398,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
 ,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 +739,Item or Warehouse for row {0} does not match Material Request,Proizvod ili skladište za redak {0} ne odgovara Zahtjevu za materijalom
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +747,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
 DocType: Fiscal Year,Year End Date,Završni datum godine
 DocType: Task Depends On,Task Depends On,Zadatak ovisi o
-DocType: Lead,Opportunity,Prilika
+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
@@ -2111,7 +2137,7 @@
 DocType: Student,Joining Date,Ulazak Datum
 ,Employees working on a holiday,Radnici koji rade na odmor
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Mark Sadašnje
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},Početni datum održavanja ne može biti stariji od datuma isporuke s rednim brojem {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},Početni datum održavanja ne može biti stariji od datuma isporuke s rednim brojem {0}
 DocType: Production Order,Actual End Date,Stvarni datum završetka
 DocType: Purchase Invoice,PINV-,PINV-
 DocType: Authorization Rule,Applicable To (Role),Odnosi se na (uloga)
@@ -2126,7 +2152,7 @@
 DocType: SMS Log,No of Requested SMS,Nema traženih SMS-a
 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 +729,Please supply the specified items at the best possible rates,Molimo dostaviti navedene stavke po najboljim mogućim cijenama
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +695,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 +117,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-
@@ -2135,7 +2161,7 @@
 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 +14,This is an example website auto-generated from ERPNext,Ovo je primjer web stranica automatski generira iz ERPNext
+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
 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.
 
@@ -2182,13 +2208,14 @@
 DocType: Purchase Receipt Item,Recd Quantity,RecD Količina
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +54,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 +103,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 +504,Stock Entry {0} is not submitted,Međuskladišnica {0} nije potvrđena
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Ne može proizvesti više predmeta {0} od prodajnog naloga količina {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +505,Stock Entry {0} is not submitted,Međuskladišnica {0} nije potvrđena
 DocType: Payment Reconciliation,Bank / Cash Account,Banka / Cash račun
 DocType: Tax Rule,Billing City,Naplata Grad
 DocType: Salary Component Account,Salary Component Account,Račun plaća Komponenta
 DocType: Global Defaults,Hide Currency Symbol,Sakrij simbol valute
 apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card","npr. banka, gotovina, kreditne kartice"
+DocType: Lead Source,Source Name,source Name
 DocType: Journal Entry,Credit Note,Kreditne Napomena
 DocType: Warranty Claim,Service Address,Usluga Adresa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furnitures and Fixtures,Namještaja i rasvjete
@@ -2200,6 +2227,7 @@
 DocType: Opportunity,Customer / Lead Name,Kupac / Potencijalni kupac
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +89,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/controllers/trends.py +19,Total(Qty),Ukupno (Kol)
 DocType: Sales Invoice,This Document,Ovaj dokument
@@ -2211,15 +2239,15 @@
 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 +176,Organization branch master.,Organizacija grana majstor .
-apps/erpnext/erpnext/controllers/accounts_controller.py +273, or ,ili
+apps/erpnext/erpnext/controllers/accounts_controller.py +276, or ,ili
 DocType: Sales Order,Billing Status,Status naplate
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Prijavi problem
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,komunalna Troškovi
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-Iznad
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +203,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Red # {0}: časopis za ulazak {1} nema računa {2} ili već usklađeni protiv drugog bona
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +206,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 +90,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 +93,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
@@ -2247,8 +2275,8 @@
 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/hr/doctype/leave_allocation/leave_allocation.py +115,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 +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Raspored održavanja nije generiran za sve proizvode. Molimo kliknite na 'Generiraj raspored'
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +118,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 +163,"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"
@@ -2260,13 +2288,13 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +32,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 +748,Delivery,Isporuka
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +742,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
 DocType: Payment Entry,Total Allocated Amount,Ukupni raspoređeni iznos
 DocType: Item Reorder,Material Request Type,Tip zahtjeva za robom
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +82,Row {0}: UOM Conversion Factor is mandatory,Red {0}: UOM pretvorbe faktor je obavezno
+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
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,bon #
@@ -2277,13 +2305,13 @@
 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 +90,Head of Marketing and Sales,Voditelj marketinga i prodaje
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Porez na dohodak
+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 +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.
 DocType: Item Supplier,Item Supplier,Dobavljač proizvoda
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +403,Please enter Item Code to get batch no,Unesite kod Predmeta da se hrpa nema
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +770,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 +397,Please enter Item Code to get batch no,Unesite kod Predmeta da se hrpa nema
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +764,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"
@@ -2295,28 +2323,29 @@
 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 +100,Issues,Pitanja
+apps/erpnext/erpnext/hooks.py +109,Issues,Pitanja
 apps/erpnext/erpnext/controllers/status_updater.py +13,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
 ,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
 DocType: Supplier,Billing Currency,Naplata valuta
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Large,Extra large
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Extra Large,Extra large
 ,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 +507,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 +107,Local,Lokalno
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +508,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/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 +154,Large,Veliki
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Large,Veliki
 DocType: Homepage Featured Product,Homepage Featured Product,Početna Istaknuti Proizvodi
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Novo ime Skladište
-apps/erpnext/erpnext/accounts/report/financial_statements.py +225,Total {0} ({1}),Ukupno {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +224,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
@@ -2374,9 +2403,9 @@
 DocType: Attendance,Leave Type,Vrsta odsustva
 apps/erpnext/erpnext/controllers/stock_controller.py +173,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/hr/doctype/salary_slip/salary_slip.py +79,Name error: {0},greška Ime: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +90,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 +178,{0} {1} does not associated with {2} {3},{0} {1} ne povezan s {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +181,{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)
 DocType: Warehouse,Parent Warehouse,Roditelj Skladište
@@ -2395,7 +2424,7 @@
 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
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,Atleast jedan predmet treba upisati s negativnim količinama u povratnom dokumentu
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Atleast one item should be entered with negative quantity in return document,Atleast jedan predmet treba upisati s negativnim količinama u povratnom dokumentu
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operacija {0} više nego bilo raspoloživih radnih sati u radnom {1}, razbiti rad u više operacija"
 ,Requested,Tražena
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +83,No Remarks,Nema primjedbi
@@ -2407,46 +2436,46 @@
 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/stock/doctype/purchase_receipt/purchase_receipt.py +98,Quality Inspection required for Item {0},Inspekcija kvalitete potrebna za proizvod {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,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ć
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Uredi teritorijalnu raspodjelu.
 DocType: Journal Entry Account,Sales Invoice,Prodajni račun
 DocType: Journal Entry Account,Party Balance,Bilanca stranke
-apps/erpnext/erpnext/accounts/page/pos/pos.js +475,Please select Apply Discount On,Odaberite Primijeni popusta na
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +92,Salary Slip Created,Plaća proklizavanja Stvoren
+apps/erpnext/erpnext/accounts/page/pos/pos.js +464,Please select Apply Discount On,Odaberite Primijeni popusta na
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +95,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
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,Postotak popusta se može neovisno primijeniti prema jednom ili za više cjenika.
 DocType: Purchase Invoice,Half-yearly,Polugodišnje
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +384,Accounting Entry for Stock,Knjiženje na skladištu
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +387,Accounting Entry for Stock,Knjiženje na skladištu
 DocType: Sales Invoice,Sales Team1,Prodaja Team1
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,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 +96,Row {0}: Completed Qty must be greater than zero.,Red {0}: Završen količina mora biti veća od nule.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +120,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 +88,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/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
 DocType: Item Group,Show this slideshow at the top of the page,Prikaži ovaj slideshow na vrhu stranice
 DocType: BOM,Item UOM,Mjerna jedinica proizvoda
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Porezna Iznos Nakon Popust Iznos (Društvo valuta)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +147,Target warehouse is mandatory for row {0},Target skladište je obvezno za redom {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +141,Target warehouse is mandatory for row {0},Target skladište je obvezno za redom {0}
 DocType: Cheque Print Template,Primary Settings,Primarne postavke
 DocType: Purchase Invoice,Select Supplier Address,Odaberite Dobavljač adresa
 DocType: Quality Inspection,Quality Inspection,Provjera kvalitete
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Extra Small,Dodatni Mali
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +194,Account {0} is frozen,Račun {0} je zamrznut
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Dodatni Mali
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +690,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 +197,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 +606,Can only make payment against unbilled {0},Može napraviti samo plaćanje protiv Nenaplaćena {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +126,Commission rate cannot be greater than 100,Proviziju ne može biti veća od 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +609,Can only make payment against unbilled {0},Može napraviti samo plaćanje protiv Nenaplaćena {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,Proviziju ne može biti veća od 100
 DocType: Stock Entry,Subcontract,Podugovor
 apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,Unesite {0} prvi
 DocType: Production Order Operation,Actual End Time,Stvarni End Time
@@ -2457,30 +2486,30 @@
 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 +158,Colour,Boja
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,Boja
 DocType: Maintenance Visit,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"
 DocType: Student Log,Academic,Akademski
-apps/erpnext/erpnext/controllers/accounts_controller.py +469,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Ukupno unaprijed ({0}) protiv Red {1} ne može biti veći od sveukupnog ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +472,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Ukupno unaprijed ({0}) protiv Red {1} ne može biti veći od sveukupnog ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Odaberite mjesečna distribucija na nejednako distribuirati ciljeve diljem mjeseci.
 DocType: Purchase Invoice Item,Valuation Rate,Stopa vrednovanja
+DocType: Stock Reconciliation,SR/,SR /
 apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,Valuta cjenika nije odabrana
 DocType: Assessment,Results,Rezultati
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +168,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 +175,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: Student Applicant,Father's/ Guardian 2 Email ID,/ Staratelja ID 2 Email očeva
 DocType: Maintenance Visit Purpose,Against Document No,Protiv dokumentu nema
 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 +228,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 +231,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/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 +93,Researcher,istraživač
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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.
@@ -2492,25 +2521,25 @@
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Za praktičnost kupaca, te kodovi mogu se koristiti u tiskanim formata kao što su fakture i otpremnice"
 DocType: 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: Sales Invoice,Advertisement,Oglas
 DocType: Asset Category Account,Depreciation Expense Account,Amortizacija reprezentaciju
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Probationary Period,Probni
-apps/erpnext/erpnext/hooks.py +102,Announcements,najave
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Probni
+apps/erpnext/erpnext/hooks.py +111,Announcements,najave
 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 +109,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 +16,To Datetime,Za datetime
+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/scheduling_tool/scheduling_tool.py +51,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/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Aktivnosti na čekanju
+DocType: Accounts Settings,Make Payment via Journal Entry,Plaćanje putem Temeljnica
+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 +127,Please enter relieving date.,Unesite olakšavanja datum .
-apps/erpnext/erpnext/controllers/trends.py +145,Amt,AMT
+apps/erpnext/erpnext/controllers/trends.py +149,Amt,AMT
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,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 +26,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"
@@ -2528,14 +2557,15 @@
 apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1},Nije moguće pronaći tečaj za {0} do {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Mark Poludnevni
 DocType: Sales Invoice,Sales Team,Prodajni tim
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Duplicate entry,Dupli unos
+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 +490,[Error],[Greška]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +484,[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
 apps/erpnext/erpnext/controllers/status_updater.py +175,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.
 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
@@ -2551,22 +2581,22 @@
 ,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 +25,All Jobs,Svi poslovi
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,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
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Amount {0} {1} {2} {3},Iznos {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Amount {0} {1} {2} {3},Iznos {0} {1} {2} {3}
 DocType: Account,Depreciation,Amortizacija
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Dobavljač (s)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Sudjelovanje zaposlenika alat
 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 +372,Payment Entries {0} are un-linked,Prijave plaćanja {0} su UN-linked
+apps/erpnext/erpnext/accounts/utils.py +449,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
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +497,Material Requests {0} created,Zahtjevi za robom {0} kreirani
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +498,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.
 DocType: Purchase Invoice,Address and Contact,Kontakt
@@ -2605,7 +2635,7 @@
 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 +848,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 +859,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 +233,Closing (Dr),Zatvaranje (DR)
 DocType: Cheque Print Template,Cheque Size,Ček Veličina
@@ -2626,7 +2656,8 @@
 ,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.
-apps/erpnext/erpnext/controllers/accounts_controller.py +555,'Update Stock' cannot be checked for fixed asset sale,&#39;Update Stock&#39; ne može se provjeriti na prodaju osnovnog sredstva
+DocType: Student Guardian,Father,Otac
+apps/erpnext/erpnext/controllers/accounts_controller.py +558,'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
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Nabavite ažuriranja
 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
@@ -2636,15 +2667,15 @@
 DocType: Sales Order,Fully Delivered,Potpuno Isporučeno
 DocType: Lead,Lower Income,Niža primanja
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","Glava računa pod odgovornosti , u kojoj dobit / gubitak će biti rezerviran"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +166,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 +238,"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 +81,Purchase Order number required for Item {0},Broj narudžbenice kupnje je potreban za artikal {0}
+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/purchase_receipt/purchase_receipt.py +82,Purchase Order number required for Item {0},Broj narudžbenice kupnje je potreban za artikal {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Od datuma' mora biti poslije 'Do datuma'
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +17,Cannot change status as student {0} is linked with student application {1},Ne može se promijeniti status studenta {0} je povezan sa studentskom primjene {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +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: Timesheet,"List of employee which has ""Salary Slip Based on Timesheet"" is enabled in salary structure.",Popis zaposlenika koji je &quot;plaće Slip Na temelju timesheet&quot; uključena u strukturi plaća.
 DocType: Asset,Fully Depreciated,potpuno amortizirana
 ,Stock Projected Qty,Stanje skladišta
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Customer {0} does not belong to project {1},Korisnik {0} ne pripada projicirati {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,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
 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
@@ -2656,7 +2687,7 @@
 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/patches/v7_0/create_warehouse_nestedset.py +55,All Warehouses,Svi Skladišta
+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 +105,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
@@ -2668,10 +2699,10 @@
 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/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Provjerite plaće slip
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +26,Browse BOM,Pretraživanje BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,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/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 Year,Academic Year,Akademska godina
+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
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,Procjena
@@ -2679,12 +2710,12 @@
 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 +197,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 +204,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: Workstation Working Hour,Start Time,Vrijeme početka
 DocType: Item Price,Bulk Import Help,Bulk uvoz Pomoć
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +256,Select Quantity,Odaberite Količina
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +257,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
@@ -2701,6 +2732,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Ili meta Količina ili ciljani iznos je obavezna .
 apps/erpnext/erpnext/config/projects.py +45,Cost of various activities,Troškovi raznih aktivnosti
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Postavljanje Događaji na {0}, budući da je zaposlenik u prilogu niže prodaje osoba nema ID korisnika {1}"
+DocType: Timesheet,Billing Details,Detalji o naplati
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +149,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}
 DocType: Item,Inspection Required,Inspekcija Obvezno
@@ -2720,7 +2752,7 @@
 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 +138,Wire Transfer,Wire Transfer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,Wire Transfer
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Provjeri sve
 DocType: Sales Order,Recurring Order,Ponavljajući narudžbe
 DocType: Company,Default Income Account,Zadani račun prihoda
@@ -2732,21 +2764,19 @@
 ,Welcome to ERPNext,Dobrodošli u ERPNext
 apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,Dovesti do kotaciju
 DocType: Lead,From Customer,Od kupca
-apps/erpnext/erpnext/demo/setup_data.py +357,Calls,Pozivi
+apps/erpnext/erpnext/demo/setup/setup_data.py +300,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/stock/doctype/item/item.py +466,"As there are existing transactions for this item, \
-							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Kao što postoje neki poslovi za tu stavku, \ ne možete mijenjati vrijednosti &quot;Je rednim &#39;,&#39; Je Hrpa Ne &#39;,&#39; Je Stock Stavka&quot; i &quot;Postupak vrednovanja &#39;"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,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/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 +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Napomena : Sustav neće provjeravati pretjerano isporuke i više - booking za točku {0} kao količinu ili vrijednost je 0
 DocType: Notification Control,Quotation Message,Ponuda - poruka
 DocType: Issue,Opening Date,Datum otvaranja
-apps/erpnext/erpnext/schools/api.py +58,Attendance has been marked successfully.,Sudjelovanje je uspješno označen.
+apps/erpnext/erpnext/schools/api.py +57,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 +136,Account Type for {0} must be {1},Vrsta računa za {0} mora biti {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +139,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
@@ -2761,12 +2791,13 @@
 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/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 +20,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 +1190,Please select customer,Molimo izaberite kupca
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1193,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)
@@ -2776,6 +2807,7 @@
 ,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 +50,Missing Currency Exchange Rates for {0},Nedostaje Valuta za {0}
 DocType: Assessment,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-
@@ -2793,11 +2825,12 @@
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,tema Naziv
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Barem jedan od prodajete ili kupujete mora biti odabran
+DocType: Grading Structure,Grade Intervals,grade Intervali
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Odaberite prirodu Vašeg poslovanja.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Gdje se odvija proizvodni postupci.
 DocType: Asset Movement,Source Warehouse,Izvor galerija
 DocType: Installation Note,Installation Date,Instalacija Datum
-apps/erpnext/erpnext/controllers/accounts_controller.py +534,Row #{0}: Asset {1} does not belong to company {2},Red # {0}: Imovina {1} ne pripada društvu {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +537,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
@@ -2811,28 +2844,31 @@
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Dostupno Batch Količina u iz skladišta
 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 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 +111,Date Of Retirement must be greater than Date of Joining,Datum umirovljenja mora biti veći od datuma pristupa
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +49,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 +87,{0}% Delivered,{0}% Isporučeno
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% Isporučeno
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Stavka {0}: Ž Količina Jedinična {1} ne može biti manja od minimalne narudžbe kom {2} (definiranom u točki).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Mjesečni postotak distribucije
 DocType: Territory,Territory Targets,Prodajni plan prema teritoriju
 DocType: Delivery Note,Transporter Info,Transporter Info
-apps/erpnext/erpnext/accounts/utils.py +379,Please set default {0} in Company {1},Molimo postavite zadani {0} u Društvu {1}
+apps/erpnext/erpnext/accounts/utils.py +456,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
 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.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Naslovi za ispis predložaka, na primjer predračuna."
+DocType: Student Guardian,Student Guardian,Studentski Guardian
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +184,Valuation type charges can not marked as Inclusive,Troškovi tipa Vrednovanje se ne može označiti kao Inclusive
 DocType: POS Profile,Update Stock,Ažuriraj zalihe
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Različite mjerne jedinice proizvoda će dovesti do ukupne pogrešne neto težine. Budite sigurni da je neto težina svakog proizvoda u istoj mjernoj jedinici.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM stopa
 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 +349,Journal Entries {0} are un-linked,Dnevničkih zapisa {0} su UN-povezani
+apps/erpnext/erpnext/accounts/utils.py +426,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
@@ -2856,6 +2892,7 @@
 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
+DocType: Homepage,"URL for ""All Products""",URL za &quot;sve proizvode&quot;
 DocType: Leave Application,Leave Balance Before Application,Bilanca odsustva prije predaje zahtjeva
 DocType: SMS Center,Send SMS,Pošalji SMS
 DocType: Cheque Print Template,Width of amount in word,Širina iznosa u riječi
@@ -2864,7 +2901,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 +29,Current Job Openings,Trenutni radnih mjesta
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,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
@@ -2877,7 +2914,7 @@
 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 +850,Show tax break-up,Pokaži porez raspada
+apps/erpnext/erpnext/public/js/controllers/transaction.js +841,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/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"
@@ -2887,10 +2924,11 @@
 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 +534,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 +80,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 +162,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/selling/doctype/customer/customer.py +195,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 +5,This is based on the attendance of this Student,To se temelji na prisustvo ovog Student
@@ -2899,12 +2937,11 @@
 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 +75,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 +138,Note: There is not enough leave balance for Leave Type {0},Napomena : Nema dovoljno ravnotežu dopust za dozvolu tipa {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Note: There is not enough leave balance for Leave Type {0},Napomena : Nema dovoljno ravnotežu dopust za dozvolu tipa {0}
 DocType: Program Enrollment Fee,Program Enrollment Fee,Program za upis naknada
 DocType: Item,Supplier Items,Dobavljač Stavke
 DocType: Opportunity,Opportunity Type,Tip prilike
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,Nova tvrtka
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,Cost Center is required for 'Profit and Loss' account {0},Troška je potrebno za račun ' dobiti i gubitka ' {0}
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Transakcije se mogu samo izbrisana od tvorca Društva
 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.,Neispravan broj glavnu knjigu unose naći. Možda ste odabrali krivi račun u transakciji.
 DocType: Cheque Print Template,Cheque Width,Ček Širina
@@ -2913,16 +2950,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,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/manufacturing/doctype/production_order/production_order.js +128,Timesheet,kontrolna kartica
-apps/erpnext/erpnext/controllers/accounts_controller.py +228,{0} '{1}' is disabled,{0} '{1}' je onemogućen
+apps/erpnext/erpnext/controllers/accounts_controller.py +231,{0} '{1}' is disabled,{0} '{1}' je onemogućen
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Postavi kao Opena
 DocType: Cheque Print Template,Scanned Cheque,Scanned Ček
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Pošaljite e-poštu automatski u imenik na podnošenje transakcija.
+DocType: Timesheet,Total Billable Amount,Ukupan iznos za naplatu
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Stavka 3
 DocType: Purchase Order,Customer Contact Email,Kupac Kontakt e
 DocType: Warranty Claim,Item and Warranty Details,Stavka i jamstvo Detalji
 DocType: Sales Team,Contribution (%),Doprinos (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Napomena : Stupanje Plaćanje neće biti izrađen od ' Gotovina ili bankovni račun ' nije naveden
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Responsibilities,Odgovornosti
+apps/erpnext/erpnext/controllers/accounts_controller.py +78,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
 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
@@ -2930,6 +2968,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Dodaj korisnicima
 DocType: Pricing Rule,Item Group,Grupa proizvoda
 DocType: Item,Safety Stock,Sigurnost Stock
+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: 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)
@@ -2939,7 +2978,6 @@
 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: Timesheet,Total Hours,Ukupno vrijeme
 DocType: Journal Entry,Printing Settings,Ispis Postavke
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,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
@@ -2952,13 +2990,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investicijsko bankarstvo
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +71,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
+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: Purchase Invoice Item,Rate,VPC
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Intern,stažista
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,stažista
 DocType: Stock Entry,From BOM,Od sastavnice
 DocType: Assessment,Assessment Code,kod procjena
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +32,Basic,Osnovni
+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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Molimo kliknite na ""Generiraj raspored '"
+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 +95,Reference No is mandatory if you entered Reference Date,Reference Ne obvezno ako ušao referentnog datuma
@@ -2967,11 +3006,11 @@
 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 +752,Issue Material,Izdavanje materijala
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +723,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 +683,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 +665,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.
 DocType: Hub Settings,Access Token,Pristupni token
 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
@@ -2979,33 +3018,35 @@
 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 +1122,Enter value must be positive,Unesite vrijednost moraju biti pozitivne
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,All Territories,Sve teritorije
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1125,Enter value must be positive,Unesite vrijednost moraju biti pozitivne
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,Sve teritorije
 DocType: Purchase Invoice,Items,Proizvodi
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +23,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 +221,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 +233,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 +96,Request for Quotations,Zahtjev za dostavljanje ponuda
+apps/erpnext/erpnext/hooks.py +104,Request for Quotations,Zahtjev za dostavljanje ponuda
 DocType: Payment Reconciliation,Maximum Invoice Amount,Maksimalna Iznos dostavnice
 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 +628,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Zadana mjerna jedinica za Variant &#39;{0}&#39; mora biti isti kao u predložak &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Zadana mjerna jedinica za Variant &#39;{0}&#39; mora biti isti kao u predložak &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Izračun temeljen na
 DocType: Delivery Note Item,From Warehouse,Iz skladišta
 DocType: Assessment,Supervisor Name,Naziv Supervisor
+DocType: Assessment,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
 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 +27,Default Address Template cannot be deleted,Zadani predložak adrese ne može se izbrisati
+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
 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
@@ -3020,8 +3061,8 @@
 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/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 +485,No default BOM exists for Item {0},Zadani BOM ne postoji za proizvod {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +336,Please select Posting Date first,Molimo odaberite datum knjiženja prvo
+apps/erpnext/erpnext/stock/get_item_details.py +486,No default BOM exists for Item {0},Zadani BOM ne postoji za proizvod {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +326,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
@@ -3037,6 +3078,7 @@
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Match Plaćanja s faktura
 DocType: Journal Entry,Bank Entry,Bank Stupanje
 DocType: Authorization Rule,Applicable To (Designation),Odnosi se na (Oznaka)
+,Profitability Analysis,Analiza profitabilnosti
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,Dodaj u košaricu
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Grupa Do
 DocType: Guardian,Interests,interesi
@@ -3049,22 +3091,22 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,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 +141,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Serijaliziranom Stavka {0} nije moguće ažurirati pomoću \
  Stock pomirenja"
 DocType: Scheduling Tool,Day,Dan
 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 +122,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 +129,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
-DocType: Student Applicant,AP.,AP.
 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 +639,Point of Sale,Point of Sale
+apps/erpnext/erpnext/accounts/page/pos/pos.js +634,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
 DocType: Production Planning Tool,Production Planning Tool,Planiranje proizvodnje alat
@@ -3073,74 +3115,77 @@
 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 +373,Quantity to Manufacture must be greater than 0.,Količina za proizvodnju mora biti veći od 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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 Profile,Customer Group,Grupa kupaca
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,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/doctype/asset/asset.py +83,Next Depreciation Date must be on or after today,Sljedeća Amortizacija Datum mora biti na dan ili nakon današnjeg dana
 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 +145,Please cancel Purchase Invoice {0} first,Otkažite fakturi {0} prvi
 DocType: Serial No,AMC Expiry Date,AMC Datum isteka
 ,Sales Register,Prodaja Registracija
 DocType: Quotation,Quotation Lost Reason,Razlog nerealizirane ponude
+apps/erpnext/erpnext/utilities/doctype/address/address.py +164,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.
 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 +330,Transaction reference no {0} dated {1},Transakcija referenca ne {0} datumom {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,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 +107,Summary for this month and pending activities,Sažetak za ovaj mjesec i tijeku aktivnosti
+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/accounts/doctype/sales_invoice/sales_invoice.py +406,Please remove this Invoice {0} from C-Form {1},Molimo uklonite ovu fakturu {0} od C-obrasca {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,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 +644,Get Items,Kreiraj proizvode
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +623,Get Items,Kreiraj proizvode
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +210,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 +41,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
 DocType: Payment Request,Initiated,Pokrenut
 DocType: Production Order,Planned Start Date,Planirani datum početka
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,Customer is required against Receivable account {0},Kupac je dužan protiv Potraživanja računa {0}
 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 +265,Project-wise data is not available for Quotation,Projekt - mudar podaci nisu dostupni za ponudu
+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 +101,Commercial,trgovački
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,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: Supplier Quotation,Supplier Address,Dobavljač Adresa
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +648,Row {0}# Account must be of type 'Fixed Asset',Red {0} # računa mora biti tipa &#39;Dugotrajne imovine&#39;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,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 +30,Series is mandatory,Serija je obvezno
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +50,Series is mandatory,Serija je obvezno
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Financijske usluge
 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
 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}
 DocType: Leave Allocation,Unused leaves,Neiskorišteni lišće
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Cr,Cr
 DocType: Tax Rule,Billing State,Državna naplate
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +250,Transfer,Prijenos
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +187,{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 +825,Fetch exploded BOM (including sub-assemblies),Fetch eksplodirala BOM (uključujući i podsklopova )
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +254,Transfer,Prijenos
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +190,{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 +796,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 +115,Due Date is mandatory,Datum dospijeća je obavezno
+apps/erpnext/erpnext/controllers/accounts_controller.py +118,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
 DocType: Journal Entry,Pay To / Recd From,Platiti do / primiti od
 DocType: Naming Series,Setup Series,Postavljanje Serija
 DocType: Payment Reconciliation,To Invoice Date,Za Račun Datum
 DocType: Supplier,Contact HTML,Kontakt HTML
 ,Inactive Customers,Neaktivni korisnici
+DocType: Landed Cost Voucher,LCV,lakih gospodarskih
 DocType: Landed Cost Voucher,Purchase Receipts,Primke
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Kako se primjenjuje pravilo cijena?
 DocType: Quality Inspection,Delivery Note No,Otpremnica br
@@ -3149,7 +3194,7 @@
 DocType: Company,Retail,Maloprodaja
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +120,Customer {0} does not exist,Korisnik {0} ne postoji
 DocType: Attendance,Absent,Odsutan
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +587,Product Bundle,Snop proizvoda
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Product Bundle,Snop proizvoda
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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
@@ -3159,8 +3204,8 @@
 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 +742,Send Supplier Emails,Pošalji Supplier e-pošte
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +104,"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/buying/doctype/request_for_quotation/request_for_quotation.js +708,Send Supplier Emails,Pošalji Supplier e-pošte
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,"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
 DocType: Guardian Interest,Guardian Interest,Guardian kamata
 DocType: Timesheet,Employee Detail,Detalj zaposlenika
@@ -3171,9 +3216,9 @@
 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}
 DocType: Salary Slip,Earning & Deduction,Zarada &amp; Odbitak
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +77,Account {0} cannot be a Group,Račun {0} ne može biti grupa
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} cannot be a Group,Račun {0} ne može biti grupa
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +31,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 +107,Negative Valuation Rate is not allowed,Negativna stopa vrijednovanja nije dopuštena
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Negativna stopa vrijednovanja nije dopuštena
 DocType: Holiday List,Weekly Off,Tjedni Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Za npr. 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +39,Provisional Profit / Loss (Credit),Privremeni dobit / gubitak (Credit)
@@ -3187,16 +3232,16 @@
 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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Mjesto troška je ovezno za stavku {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +626,Get Items from Product Bundle,Se predmeti s Bundle proizvoda
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +605,Get Items from Product Bundle,Se predmeti s Bundle proizvoda
 DocType: Asset,Straight Line,Ravna crta
 DocType: Project User,Project User,Korisnik projekta
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} is inactive,Račun {0} nije aktivan
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} is inactive,Račun {0} nije aktivan
 DocType: GL Entry,Is Advance,Je Predujam
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Gledanost od datuma do datuma je obvezna
 apps/erpnext/erpnext/controllers/buying_controller.py +148,Please enter 'Is Subcontracted' as Yes or No,Unesite ' Je podugovoren ' kao da ili ne
 DocType: Sales Team,Contact No.,Kontakt broj
 DocType: Bank Reconciliation,Payment Entries,Prijave plaćanja
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,'Profit and Loss' type account {0} not allowed in Opening Entry,'Račun dobiti i gubitka' tip računa {0} nije dopušten u otvorenom ulazu
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +71,'Profit and Loss' type account {0} not allowed in Opening Entry,'Račun dobiti i gubitka' tip računa {0} nije dopušten u otvorenom ulazu
 DocType: 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
@@ -3215,7 +3260,7 @@
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serijski #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Commission on Sales,Komisija za prodaju
 DocType: Offer Letter Term,Value / Description,Vrijednost / Opis
-apps/erpnext/erpnext/controllers/accounts_controller.py +558,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Red # {0}: Imovina {1} ne može se podnijeti, to je već {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +561,"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: Production Order,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}.
@@ -3228,13 +3273,13 @@
 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/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Legal Expenses,Pravni troškovi
 DocType: Purchase Invoice,Posting Time,Objavljivanje Vrijeme
-DocType: Sales Order,% Amount Billed,% Naplaćeni iznos
+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.
 apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},Nema proizvoda sa serijskim brojem {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Otvoreno Obavijesti
+DocType: Email Digest,Open Notifications,Otvoreno Obavijesti
 DocType: Payment Entry,Difference Amount (Company Currency),Razlika Iznos (Društvo valuta)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,Izravni troškovi
 apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
@@ -3242,7 +3287,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Novi prihod kupca
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,putni troškovi
 DocType: Maintenance Visit,Breakdown,Slom
-apps/erpnext/erpnext/controllers/accounts_controller.py +634,Account: {0} with currency: {1} can not be selected,Račun: {0} s valutom: {1} ne može se odabrati
+apps/erpnext/erpnext/controllers/accounts_controller.py +637,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}
 DocType: Program Enrollment Tool,Student Applicants,Studentski Kandidati
@@ -3250,15 +3295,15 @@
 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 +56,Probation,Probni rad
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Probation,Probni rad
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Plaća Komponente
 DocType: Program Enrollment Tool,New Academic Year,Nova akademska godina
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Payment of salary for the month {0} and year {1},Isplata plaće za mjesec {0} i godina {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Payment of salary for the month {0} and year {1},Isplata plaće za mjesec {0} i godina {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,"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 +144,Planning,planiranje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,planiranje
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,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
@@ -3271,11 +3316,10 @@
 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.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Sales invoice submitted sucessfully.,Prodaja fakture podnosi uspješno.
 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}
 DocType: Assessment Result,Student Name,Ime studenta
-apps/erpnext/erpnext/hooks.py +104,Assessment Schedule,Raspored Procjena
+apps/erpnext/erpnext/hooks.py +113,Assessment Schedule,Raspored Procjena
 DocType: Brand,Item Manager,Stavka Manager
 DocType: Buying Settings,Default Supplier Type,Zadani tip dobavljača
 DocType: Production Order,Total Operating Cost,Ukupni trošak
@@ -3285,6 +3329,7 @@
 DocType: GL Entry,Party Type,Tip stranke
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +78,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
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Plaća predložak majstor .
 DocType: Leave Type,Max Days Leave Allowed,Max Dani Ostavite dopuštenih
@@ -3296,18 +3341,19 @@
 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 +99,All Customer Groups,Sve grupe kupaca
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +78,Accumulated Monthly,ukupna mjesečna
-apps/erpnext/erpnext/controllers/accounts_controller.py +595,{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/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Sve grupe kupaca
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +81,Accumulated Monthly,ukupna mjesečna
+apps/erpnext/erpnext/controllers/accounts_controller.py +598,{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
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Stopa cjenika (valuta tvrtke)
 DocType: Products Settings,Products Settings,proizvodi Postavke
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +188,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
 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 +84,Secretary,tajnica
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,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
@@ -3316,24 +3362,22 @@
 ,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
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,Red # {0}: Serijski br obvezno
+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 +859,Supplier Quotation,Dobavljač Ponuda
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +838,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 +7,Collect Fees,prikupiti naknade
+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}
 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.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Nadolazeći događaji
 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/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
-DocType: Email Digest,Income / Expense,Prihodi / rashodi
 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."
@@ -3345,13 +3389,14 @@
 DocType: Customer,From Lead,Od Olovo
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Narudžbe objavljen za proizvodnju.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Odaberite fiskalnu godinu ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,POS Profile required to make POS Entry,POS Profil potrebna da bi POS unos
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +509,POS Profile required to make POS Entry,POS Profil potrebna da bi POS unos
 DocType: Program Enrollment Tool,Enroll Students,upisati studenti
 DocType: Hub Settings,Name Token,Naziv tokena
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standardna prodaja
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Atleast one warehouse is mandatory,Atleast jednom skladištu je obavezno
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +129,Atleast one warehouse is mandatory,Atleast jednom skladištu je obavezno
 DocType: Serial No,Out of Warranty,Od jamstvo
 DocType: BOM Replace Tool,Replace,Zamijeniti
+DocType: Production Order,Unstopped,Unstopped
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{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
@@ -3372,10 +3417,11 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Odsustva moraju biti dodijeljena kao višekratnici od 0,5"
 DocType: Production Order,Operation Cost,Operacija troškova
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,Prenesi dolazak iz. Csv datoteku
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Izvanredna Amt
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Set cilja predmet Grupa-mudar za ovaj prodavač.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Freeze Dionice stariji od [ dana ]
-apps/erpnext/erpnext/controllers/accounts_controller.py +528,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Red # {0}: Imovina je obvezna za nepokretne imovine kupnju / prodaju
+apps/erpnext/erpnext/controllers/accounts_controller.py +531,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Red # {0}: Imovina je obvezna za nepokretne imovine kupnju / prodaju
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Ako dva ili više Cijene Pravila nalaze se na temelju gore navedenih uvjeta, Prioritet se primjenjuje. Prioritet je broj između 0 do 20, a zadana vrijednost je nula (prazno). Veći broj znači da će imati prednost ako ima više Cijene pravila s istim uvjetima."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Fiskalna godina: {0} ne postoji
 DocType: Currency Exchange,To Currency,Valutno
@@ -3392,15 +3438,15 @@
 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
-DocType: Sales Invoice,Exhibition,Izložba
 apps/erpnext/erpnext/utilities/doctype/address/address.py +77,"Company is mandatory, as it is your company address","Društvo je obvezno, kao što je vaša adresa tvrtke"
 DocType: Item Attribute,From Range,Iz raspona
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +81,Syntax error in formula or condition: {0},sintaktička pogreška u formuli ili stanja: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +92,Syntax error in formula or condition: {0},sintaktička pogreška u formuli ili stanja: {0}
 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
+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 +28,Jobs,Posao
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,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
@@ -3409,16 +3455,16 @@
 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 +763,Make Supplier Quotation,Napravi ponudu dobavljaču
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,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/controllers/sales_and_purchase_return.py +100,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 +42,Casual Leave,Casual dopust
+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
 DocType: Batch,Batch ID,ID serije
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,Note: {0},Napomena: {0}
 ,Delivery Note Trends,Trend otpremnica
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +103,This Week's Summary,Ovaj tjedan Sažetak
+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
 DocType: Student Group Creation Tool,Get Courses,dobiti Tečajevi
 DocType: GL Entry,Party,Stranka
@@ -3428,7 +3474,7 @@
 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 +59,Piecework,Rad po komadu
+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: Task,Actual Time (in Hours),Stvarno vrijeme (u satima)
 DocType: Employee,History In Company,Povijest tvrtke
@@ -3445,7 +3491,7 @@
 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.
 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 +162,Black,Crna
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,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
@@ -3456,13 +3502,13 @@
 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 +69,Customer Id,Korisnički ID
+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
 DocType: Journal Entry Account,Exchange Rate,Tečaj
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Sales Order {0} is not submitted,Prodajnog naloga {0} nije podnesen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +527,Sales Order {0} is not submitted,Prodajnog naloga {0} nije podnesen
 DocType: Homepage,Tag Line,Tag linija
 DocType: Fee Component,Fee Component,Naknada Komponenta
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +857,Add items from,Dodavanje stavki iz
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +836,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}
 DocType: Cheque Print Template,Regular,redovan
 DocType: BOM,Last Purchase Rate,Zadnja kupovna cijena
@@ -3470,6 +3516,7 @@
 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
 ,Sales Person-wise Transaction Summary,Pregled prometa po prodavaču
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +60,Cost Center is required for 'Profit and Loss' account {0}. Please set up a default Cost Center for the Company.,Trošak Centar je potreban za &#39;dobiti i gubitka &quot;računu {0}. Molimo postaviti zadani troška Društva.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,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
@@ -3480,12 +3527,12 @@
 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 +710,Online,Na liniji
+apps/erpnext/erpnext/accounts/page/pos/pos.js +692,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 +16,Setting this Address Template as default as there is no other default,"Postavljanje Ova adresa predloška kao zadano, jer nema drugog zadano"
+apps/erpnext/erpnext/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"
 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 +74,Quality Management,Upravljanje kvalitetom
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,Upravljanje kvalitetom
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} has been disabled,Stavka {0} je onemogućen
 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
@@ -3507,11 +3554,12 @@
 DocType: Student,Student Email ID,Student ID e-pošte
 DocType: Employee,Notice (days),Obavijest (dani)
 DocType: Tax Rule,Sales Tax Template,Porez Predložak
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1520,Select items to save the invoice,Odaberite stavke za spremanje račun
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1544,Select items to save the invoice,Odaberite stavke za spremanje račun
 DocType: Employee,Encashment Date,Encashment Datum
 DocType: Account,Stock Adjustment,Stock Podešavanje
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Zadana aktivnost Troškovi postoji Vrsta djelatnosti - {0}
 DocType: Production Order,Planned Operating Cost,Planirani operativni trošak
+DocType: Academic Term,Term Start Date,Pojam Datum početka
 apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},U prilogu {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Banka Izjava stanje po glavnom knjigom
 DocType: Job Applicant,Applicant Name,Podnositelj zahtjeva Ime
@@ -3541,17 +3589,17 @@
 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.
 DocType: Company,Distribution,Distribucija
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +8,Amount Paid,Plaćeni iznos
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Project Manager,Voditelj projekta
+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
 ,Quoted Item Comparison,Citirano predmeta za usporedbu
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Dispatch,Otpremanje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,Otpremanje
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Maksimalni dopušteni popust za proizvod: {0} je {1}%
 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.
-DocType: Sales Invoice,Supplier Reference,Dobavljač Referenca
-apps/erpnext/erpnext/accounts/page/pos/pos.js +844,"Master data syncing, it might take some time","Master Data sinkronizacije, to bi moglo potrajati neko vrijeme"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +832,"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
@@ -3565,7 +3613,7 @@
 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 +83,Error in formula or condition,Greška u formuli ili stanju
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,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
@@ -3574,7 +3622,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},Za datum mora biti unutar fiskalne godine. Pod pretpostavkom da bi datum = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Ovdje možete održavati visina, težina, alergije, medicinske brige itd."
 DocType: Leave Block List,Applies to Company,Odnosi se na Društvo
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +197,Cannot cancel because submitted Stock Entry {0} exists,"Ne može se otkazati, jer skladišni ulaz {0} postoji"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +198,Cannot cancel because submitted Stock Entry {0} exists,"Ne može se otkazati, jer skladišni ulaz {0} postoji"
 DocType: Purchase Invoice,In Words,Riječima
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,Today is {0}'s birthday!,Danas je {0} 'rođendan!
 DocType: Production Planning Tool,Material Request For Warehouse,Zahtjev za robom za skladište
@@ -3584,14 +3632,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,Vaša financijska godina počinje
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Imovine deprecijacije i sredstva
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +319,Amount {0} {1} transferred from {2} to {3},Iznos {0} {1} prenesen iz {2} u {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +322,Amount {0} {1} transferred from {2} to {3},Iznos {0} {1} prenesen iz {2} u {3}
 DocType: Sales Invoice,Get Advances Received,Kreiraj avansno primanje
 DocType: Email Digest,Add/Remove Recipients,Dodaj / ukloni primatelja
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +432,Transaction not allowed against stopped Production Order {0},Transakcija nije dopuštena protiv zaustavljena proizvodnja Reda {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +437,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 +143,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 +652,Item variant {0} exists with same attributes,Inačica Stavka {0} postoji s istim atributima
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Inačica Stavka {0} postoji s istim atributima
+DocType: Leave Application,LAP/,KRUG/
 DocType: Salary Slip,Salary Slip,Plaća proklizavanja
 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
@@ -3599,12 +3648,12 @@
 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 +212,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 +215,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: Employee Education,Employee Education,Obrazovanje zaposlenika
-apps/erpnext/erpnext/public/js/controllers/transaction.js +866,It is needed to fetch Item Details.,To je potrebno kako bi dohvatili Stavka Pojedinosti.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +857,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
@@ -3614,14 +3663,14 @@
 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 +178,Invalid {0},Pogrešna {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Sick Leave,bolovanje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,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
 DocType: Warehouse,PIN,PIN
 DocType: Sales Invoice,Base Change Amount (Company Currency),Baza Promjena Iznos (Društvo valuta)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +313,No accounting entries for the following warehouses,Nema računovodstvenih unosa za ova skladišta
-apps/erpnext/erpnext/projects/doctype/project/project.js +102,Save the document first.,Spremite dokument prvi.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +314,No accounting entries for the following warehouses,Nema računovodstvenih unosa za ova skladišta
+apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Spremite dokument prvi.
 DocType: Account,Chargeable,Naplativ
 DocType: Company,Change Abbreviation,Promijeni naziv
 DocType: Expense Claim Detail,Expense Date,Rashodi Datum
@@ -3634,10 +3683,9 @@
 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
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,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
 DocType: Appraisal,Appraisal Template,Procjena Predložak
 DocType: Item Group,Item Classification,Klasifikacija predmeta
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Business Development Manager,Voditelj razvoja poslovanja
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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
@@ -3647,8 +3695,8 @@
 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 +940,Please select {0} first,Odaberite {0} Prvi
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +749,Batch {0} of Item {1} has expired.,Hrpa {0} od {1} Stavka je istekla.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +953,Please select {0} first,Odaberite {0} Prvi
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +757,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
@@ -3676,8 +3724,8 @@
  {% 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 +92,Warehouse not found in the system,Skladište nije pronađeno u sustavu
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +106,This Month's Summary,Ovomjesečnom Sažetak
+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
 DocType: Quality Inspection Reading,Quality Inspection Reading,Inspekcija kvalitete - čitanje
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,` Freeze Dionice starije od ` bi trebao biti manji od % d dana .
 DocType: Tax Rule,Purchase Tax Template,Predložak poreza pri nabavi
@@ -3687,21 +3735,22 @@
 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 +87,Please set Next Depreciation Date,Molimo postavite Next Amortizacija Date
-DocType: Payment Gateway,Payment Gateway,Payment Gateway
 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 +378,Operation Time must be greater than 0 for Operation {0},Operacija vrijeme mora biti veći od 0 za rad {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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/accounts/doctype/account/account.py +170,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
 DocType: Program,Program Abbreviation,naziv programa
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,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: Appraisal,Start Date,Datum početka
@@ -3717,21 +3766,22 @@
 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
 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 +27,Transaction currency must be same as Payment Gateway currency,Transakcija valute mora biti isti kao i Payment Gateway valute
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Transaction currency must be same as Payment Gateway currency,Transakcija valute mora biti isti kao i Payment Gateway valute
 DocType: Payment Entry,Receive,Primite
+apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,citati:
 DocType: Maintenance Visit,Fully Completed,Potpuno Završeni
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Napravljeno
 DocType: Employee,Educational Qualification,Obrazovne kvalifikacije
 DocType: Workstation,Operating Costs,Operativni troškovi
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,"Akcija, ako ukupna mjesečna Proračun Prebačen"
 DocType: Purchase Invoice,Submit on creation,Pošalji na stvaranje
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +432,Currency for {0} must be {1},Valuta za {0} mora biti {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +435,Currency for {0} must be {1},Valuta za {0} mora biti {1}
 DocType: Asset,Disposal Date,Datum Odlaganje
 DocType: Employee Leave Approver,Employee Leave Approver,Zaposlenik dopust Odobritelj
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,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 +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/crm/doctype/opportunity/opportunity.py +79,"Cannot declare as lost, because Quotation has been made.","Ne može se proglasiti izgubljenim, jer je ponuda napravljena."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Upravitelj predloška nabave
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +429,Production Order {0} must be submitted,Proizvodnja Red {0} mora biti podnesen
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +434,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
@@ -3741,25 +3791,27 @@
 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
 DocType: Price List,Price List Name,Naziv cjenika
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +181,Totals,Ukupan rezultat
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,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 +113,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 +120,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
 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.
+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 +181,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/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 +793,All records are synced.,Svi zapisi se sinkroniziraju.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +781,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
 DocType: Cost Center,Cost Center Name,Troška Name
@@ -3778,21 +3830,20 @@
 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/selling/doctype/quotation/quotation.py +49,Cannot set as Lost as Sales Order is made.,Ne mogu se postaviti kao izgubljen kao prodajnog naloga je napravio .
-DocType: Student Applicant,Mother's Name,Majčino ime
 DocType: Request for Quotation Item,Supplier Part No,Dobavljač Dio Ne
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +348,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Ne mogu odbiti kada je kategorija za &quot;vrednovanje&quot; ili &quot;Vaulation i ukupni &#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Received From,Primljeno od
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Received From,Primljeno od
 DocType: Lead,Converted,Pretvoreno
 DocType: Item,Has Serial No,Ima serijski br
 DocType: Employee,Date of Issue,Datum izdavanja
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{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 +93,Row {0}: Hours value must be greater than zero.,Red {0}: Sati vrijednost mora biti veća od nule.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +117,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
 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 +172,{0} {1} does not exist,{0} {1} ne postoji
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +175,{0} {1} does not exist,{0} {1} ne postoji
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,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 +72,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
@@ -3801,13 +3852,14 @@
 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/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
 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 +109,Electrical,Električna
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Electrical,Električna
 DocType: Stock Entry,Total Value Difference (Out - In),Ukupna vrijednost razlika (Out - In)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,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}
@@ -3815,7 +3867,7 @@
 DocType: Item,Customer Code,Kupac Šifra
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +210,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 +292,Debit To account must be a Balance Sheet account,Zaduženja računa mora biti bilanca račun
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To account must be a Balance Sheet account,Zaduženja računa mora biti bilanca račun
 DocType: Buying Settings,Naming Series,Imenovanje serije
 DocType: Leave Block List,Leave Block List Name,Naziv popisa neodobrenih odsustava
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,dionicama u vrijednosti
@@ -3827,11 +3879,11 @@
 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 +301,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 +313,Salary Slip of employee {0} already created for time sheet {1},Plaća proklizavanja zaposlenika {0} već stvoren za vremensko listu {1}
 DocType: Sales Order Item,Ordered Qty,Naručena kol
-apps/erpnext/erpnext/stock/doctype/item/item.py +673,Item {0} is disabled,Stavka {0} je onemogućen
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,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 +838,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 +809,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.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generiranje plaće gaćice
@@ -3839,23 +3891,24 @@
 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)
-apps/erpnext/erpnext/stock/doctype/item/item.py +485,Row #{0}: Please set reorder quantity,Red # {0}: Molimo postavite naručivanja količinu
+DocType: Sales Invoice Timesheet,Billing Hours,Radno vrijeme naplate
+apps/erpnext/erpnext/stock/doctype/item/item.py +487,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 +62,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
+DocType: Payment Entry,Allocate Payment Amount,Dodjela iznos otplate
 DocType: Employee External Work History,Salary,Plaća
 DocType: Serial No,Delivery Document Type,Dokument isporuke - tip
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Slanje sve plaće gaćice za gore odabranih kriterija
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} Stavke sinkronizirane
 DocType: Sales Order,Partly Delivered,Djelomično isporučeno
-DocType: Sales Invoice,Existing Customer,Postojeći Kupac
 DocType: Email Digest,Receivables,Potraživanja
+DocType: Lead Source,Lead Source,Izvor potencijalnog kupca
 DocType: Customer,Additional information regarding the customer.,Dodatne informacije o kupcu.
 DocType: Quality Inspection Reading,Reading 5,Čitanje 5
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +38,Campaign Name is required,Potreban je naziv kampanje
 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
@@ -3864,10 +3917,9 @@
 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 +129,BOM and Manufacturing Quantity are required,BOM i proizvodnja Količina potrebne su
+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/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Starenje Raspon 2
 DocType: SG Creation Tool Course,Max Strength,Max snaga
-DocType: Bank Reconciliation Detail,Amount,Iznos
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM zamijenjeno
 ,Sales Analytics,Prodajna analitika
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +113,Available {0},Dostupno {0}
@@ -3875,14 +3927,14 @@
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Postavljanje e-poštu
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +96,Please enter default currency in Company Master,Unesite zadanu valutu u tvrtki Master
 DocType: Stock Entry Detail,Stock Entry Detail,Detalji međuskladišnice
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +100,Daily Reminders,Dnevne Podsjetnici
+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/account/account_tree.js +23,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 +71,Customer Service,Služba za korisnike
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Customer Service,Služba za korisnike
 DocType: Homepage Featured Product,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.
@@ -3891,8 +3943,9 @@
 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
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Zadana rad u tijeku Skladište
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1570,Total nos of serial no is not equal to quantity.,Ukupno NOS iz rednim brojem nije jednaka količini.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1594,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
 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
@@ -3900,9 +3953,10 @@
 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 +82,Engineer,inženjer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,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 +370,Item Code required at Row No {0},Kod proizvoda je potreban u redu broj {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +398,Item Code required at Row No {0},Kod proizvoda je potreban u redu broj {0}
 DocType: Sales Partner,Partner Type,Tip partnera
 DocType: Purchase Taxes and Charges,Actual,Stvaran
 DocType: Authorization Rule,Customerwise Discount,Customerwise Popust
@@ -3918,16 +3972,18 @@
 DocType: BOM,Raw Material Cost,Troškova sirovine
 DocType: Item Reorder,Re-Order Level,Ponovno bi razini
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Unesite stavke i planirani Količina za koje želite povećati proizvodne naloge ili preuzimanje sirovine za analizu.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +55,Part-time,Privemeno (nepuno radno vrijeme)
+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)
 DocType: Employee,Applicable Holiday List,Primjenjivo odmor Popis
 DocType: Employee,Cheque,Ček
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Serija ažurirana
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +57,Series Updated,Serija ažurirana
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Vrsta izvješća je obvezno
 DocType: Item,Serial Number Series,Serijski broj serije
 apps/erpnext/erpnext/buying/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 +87,Clearance Date updated,Razmak Datum ažurirana
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Uspješno Pomirio
@@ -3941,7 +3997,7 @@
 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 +513,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 +518,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.
@@ -3951,7 +4007,7 @@
 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/stock/doctype/stock_entry/stock_entry.py +158,Target warehouse in row {0} must be same as Production Order,Target skladište u redu {0} mora biti ista kao Production Order
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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
 DocType: Company,Round Off Account,Zaokružiti račun
@@ -3960,23 +4016,22 @@
 DocType: Customer Group,Parent Customer Group,Nadređena grupa kupaca
 DocType: Purchase Invoice,Contact Email,Kontakt email
 DocType: Appraisal Goal,Score Earned,Ocjena Zarađeni
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Notice Period,Otkaznog roka
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,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 +4,New Sales Person Name,Novo ime prodajnog agenta
 DocType: Packing Slip,Gross Weight UOM,Bruto težina UOM
-DocType: Email Digest,Receivables / Payables,Potraživanja / obveze
 DocType: Delivery Note Item,Against Sales Invoice,Protiv prodaje fakture
 DocType: Bin,Reserved Qty for Production,Rezervirano Kol za proizvodnju
 DocType: Asset,Frequency of Depreciation (Months),Učestalost Amortizacija (mjeseci)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +469,Credit Account,Kreditni račun
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Credit Account,Kreditni račun
 DocType: Landed Cost Item,Landed Cost Item,Stavka zavisnih troškova
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +55,Show zero values,Pokaži nulte vrijednosti
+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
 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 +647,Please specify Attribute Value for attribute {0},Navedite značajke vrijednost za atribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Navedite značajke vrijednost za atribut {0}
 DocType: Item,Default Warehouse,Glavno skladište
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +39,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
@@ -3998,19 +4053,22 @@
 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
-DocType: Sales Invoice,Cold Calling,Hladno pozivanje
 DocType: SMS Parameter,SMS Parameter,SMS parametra
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,Proračun i Centar Cijena
 DocType: Maintenance Schedule Item,Half Yearly,Pola godišnji
 DocType: Lead,Blog Subscriber,Blog pretplatnik
+DocType: Guardian,Alternate Number,Alternativni broj
 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.
+DocType: Stock Reconciliation Item,Quantity Difference,Količina razlika
 apps/erpnext/erpnext/config/hr.py +253,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 +141,Set as Lost,Postavi kao Lost
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,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 +5,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
 DocType: Supplier,Credit Days Based On,Kreditne dana na temelju
@@ -4022,11 +4080,10 @@
 ,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 +941,Select or add new customer,Odaberite ili dodajte novi kupac
+apps/erpnext/erpnext/accounts/page/pos/pos.js +930,Select or add new customer,Odaberite ili dodajte novi kupac
 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 +5,This is based on the attendance of this Employee,To se temelji na prisustvo tog zaposlenog
-DocType: Sales Invoice,Frequency,Frekvencija
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +463,Debit Account,Duguje račun
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,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)
@@ -4035,27 +4092,27 @@
 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 +210,Supplier Quotation {0} created,Dobavljač Navod {0} stvorio
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +208,Supplier Quotation {0} created,Dobavljač Navod {0} stvorio
 apps/erpnext/erpnext/accounts/report/financial_statements.py +90,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 +173,Employee Benefits,Primanja zaposlenih
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,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 +228,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 +232,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 +499,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 +500,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 +1007,Price List not found or disabled,Cjenik nije pronađen
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1008,Price List not found or disabled,Cjenik nije pronađen
 DocType: Expense Claim,Approved,Odobren
 DocType: Pricing Rule,Price,Cijena
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +244,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 +256,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
@@ -4066,12 +4123,12 @@
 DocType: Address,Office,Ured
 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 +259,Please select Employee Record first.,Odaberite zaposlenika rekord prvi.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +266,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 +190,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 +235,Please enter Expense Account,Unesite trošak računa
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,Please enter Expense Account,Unesite trošak računa
 DocType: Account,Stock,Lager
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,"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 +976,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Red # {0}: Referenca Tip dokumenta mora biti jedan od narudžbenice, fakture kupovine ili Journal Entry"
 DocType: Employee,Current Address,Trenutna adresa
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Ako predmet je varijanta drugom stavku zatim opis, slika, cijena, porezi itd će biti postavljena od predloška, osim ako je izričito navedeno"
 DocType: Serial No,Purchase / Manufacture Details,Detalji nabave/proizvodnje
@@ -4086,9 +4143,10 @@
 DocType: Asset Movement,Transaction Date,Transakcija Datum
 DocType: Production Plan Item,Planned Qty,Planirani Kol
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,Ukupno porez
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,For Quantity (Manufactured Qty) is mandatory,Za Količina (Proizvedeno Kol) je obavezno
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,For Quantity (Manufactured Qty) is mandatory,Za Količina (Proizvedeno Kol) je obavezno
 DocType: Stock Entry,Default Target Warehouse,Centralno skladište
 DocType: Purchase Invoice,Net Total (Company Currency),Ukupno neto (valuta tvrtke)
+apps/erpnext/erpnext/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 +78,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: Production Order,Actual Start Date,Stvarni datum početka
@@ -4103,9 +4161,11 @@
 DocType: Warranty Claim,If different than customer address,Ako se razlikuje od kupaca adresu
 DocType: BOM Operation,BOM Operation,BOM operacija
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Na prethodnu Row visini
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +226,Transfer Asset,Prijenos imovine
+DocType: Student,Home Address,Kućna adresa
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +227,Transfer Asset,Prijenos imovine
 DocType: POS Profile,POS Profile,POS profil
 apps/erpnext/erpnext/config/schools.py +33,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 +129,"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
@@ -4115,8 +4175,8 @@
 DocType: Assessment,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 +765,Material to Supplier,Materijal za dobavljača
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +189,Excise Invoice,Trošarine Račun
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,Material to Supplier,Materijal za dobavljača
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,Trošarine Račun
 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
@@ -4126,7 +4186,7 @@
 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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,Studentski Grupe stvorio.
 DocType: Scheduling Tool,Scheduling Tool,alat za raspoređivanje
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +136,Credit Card,kreditna kartica
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,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.
 DocType: Purchase Invoice,Next Date,Sljedeći datum
@@ -4134,6 +4194,7 @@
 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: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Ovdje možete održavati obiteljske pojedinosti kao što su ime i okupacije roditelja, supružnika i djecu"
+DocType: Academic Term,Term End Date,Pojam Datum završetka
 DocType: Hub Settings,Seller Name,Naziv prodavatelja
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Porezi i naknade Umanjenja (Društvo valuta)
 DocType: Item Group,General Settings,Opće postavke
@@ -4145,7 +4206,7 @@
 DocType: Customer,Commission Rate,Komisija Stopa
 apps/erpnext/erpnext/stock/doctype/item/item.js +261,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 +115,"Payment Type must be one of Receive, Pay and Internal Transfer","Vrsta plaćanja mora biti jedan od primati, platiti i unutarnje prijenos"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +118,"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/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Košarica je prazna
 DocType: Production Order,Actual Operating Cost,Stvarni operativni trošak
@@ -4160,10 +4221,10 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,Odaberite CSV datoteku
 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 +92,Designer,Imenovatelj
+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
 DocType: Serial No,Delivery Details,Detalji isporuke
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +469,Cost Center is required in row {0} in Taxes table for type {1},Troška potrebno je u redu {0} poreza stolom za vrstu {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +472,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
 ,Item-wise Purchase Register,Popis nabave po stavkama
 DocType: Batch,Expiry Date,Datum isteka
@@ -4173,12 +4234,12 @@
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Projekt majstor.
 apps/erpnext/erpnext/controllers/status_updater.py +174,"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 +417, (Half Day),(Pola dana)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425, (Half Day),(Pola dana)
 DocType: Supplier,Credit Days,Kreditne Dani
 DocType: Leave Type,Is Carry Forward,Je Carry Naprijed
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +740,Get Items from BOM,Kreiraj proizvode od sastavnica (BOM)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +711,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 +549,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/controllers/accounts_controller.py +552,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
 ,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
diff --git a/erpnext/translations/hu.csv b/erpnext/translations/hu.csv
index e0a9935..27d345b 100644
--- a/erpnext/translations/hu.csv
+++ b/erpnext/translations/hu.csv
@@ -2,27 +2,26 @@
 DocType: Employee,Divorced,Elvált
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +84,Warning: Same item has been entered multiple times.,Figyelmeztetés: ugyanazt a tételt már többször jelenik meg.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Tételek már szinkronizálva
-DocType: Buying Settings,Allow Item to be added multiple times in a transaction,"Hagyjuk pont, hogy ki többször a tranzakció"
+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,Mégsem Material látogatás {0} törlése előtt ezt a garanciális igény
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Consumer Products
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,"Kérjük, válasszon párt Type első"
 DocType: Item,Customer Items,Vásárlói elemek
 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,Account {0}: Parent véve {1} nem lehet a főkönyvi
+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
 DocType: Item,Publish Item to hub.erpnext.com,Közzé tétel 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 +21,Evaluation,Értékelés
 DocType: Item,Default Unit of Measure,Alapértelmezett mértékegység
-DocType: SMS Center,All Sales Partner Contact,Minden értékesítő kapcsolata
+DocType: SMS Center,All Sales Partner Contact,Összes értékesítő partner kapcsolata
 DocType: Employee,Leave Approvers,Hagyja Jóváhagyók
 DocType: Sales Partner,Dealer,Terjesztő
 DocType: Employee,Rented,Bérelt
 DocType: Purchase Order,PO-,hely-
-apps/erpnext/erpnext/accounts/report/financial_statements.py +19,Start Year {0} not found.,Kezdés éve: {0} nem található.
 DocType: POS Profile,Applicable for User,Alkalmazható Felhasználó
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +191,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Leállította a termelést rendelés nem törölhető, kidugaszol először, hogy megszünteti"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +197,Do you really want to scrap this asset?,"Tényleg azt szeretnénk, hogy leépítik ezt az eszközt?"
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +17,Select Default Supplier,Kiválaszt Alapértelmezett Szállító
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +192,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Leállította a termelést rendelés nem törölhető, kidugaszol először, hogy megszünteti"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +198,Do you really want to scrap this asset?,"Tényleg azt szeretnénk, hogy leépítik ezt az eszközt?"
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Kiválaszt Alapértelmezett Szállító
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Árfolyam szükséges árlista {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* A tranzakcióban lesz kiszámolva.
 DocType: Address,County,Megye
@@ -32,7 +31,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +5,This is based on transactions against this Supplier. See timeline below for details,Ennek alapja az ügyletek ellen Szállító. Lásd idővonal alábbiakban részletesen
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Nincs több eredményt.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Jogi
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +158,Actual type tax cannot be included in Item rate in row {0},Tényleges típusú adó nem lehet jogcím tartalmazza ráta sorban {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +158,Actual type tax cannot be included in Item rate in row {0},Tényleges adó típust nem lehet hozzárendelni a Tétel értékébe a {0} sorban
 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
@@ -42,46 +41,45 @@
 DocType: Sales Invoice,Customer Name,Vevő neve
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +126,Bank account cannot be named as {0},A bankszámla nem nevezhetjük {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"Heads (vagy csoport), amely ellen könyvelési tételek készültek és ellensúlyok tartják."
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +180,Outstanding for {0} cannot be less than zero ({1}),"Kiemelkedő {0} nem lehet kevesebb, mint nulla ({1})"
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Outstanding for {0} cannot be less than zero ({1}),"Kiemelkedő {0} nem lehet kevesebb, mint nulla ({1})"
 DocType: Manufacturing Settings,Default 10 mins,Default 10 perc
 DocType: Leave Type,Leave Type Name,Hagyja típus neve
 apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,műsormegnyitó
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Sorozat sikeresen frissítve
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +149,Series Updated Successfully,Sorozat sikeresen frissítve
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,kijelentkezés
 DocType: Pricing Rule,Apply On,Alkalmazza
 DocType: Item Price,Multiple Item prices.,Több tétel árakat.
 ,Purchase Order Items To Be Received,Megrendelés tételek Kapott
-DocType: SMS Center,All Supplier Contact,Minden beszállító Kapcsolat
-DocType: Quality Inspection Reading,Parameter,Paraméter
+DocType: SMS Center,All Supplier Contact,Összes beszállítói Kapcsolat
 apps/erpnext/erpnext/projects/doctype/project/project.py +54,Expected End Date can not be less than Expected Start Date,"Várható befejezés dátuma nem lehet kevesebb, 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}: Ár kell egyeznie {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +239,New Leave Application,Új Leave Application
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,New Leave Application,Új Leave Application
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +20,Attendance Record {0} exists against Student {1} for Course Schedule {2},Részvételi rekord {0} létezik ellen Student {1} a pálya Menetrend {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Bank Draft,Bank Draft
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,Bank Draft
 DocType: Mode of Payment Account,Mode of Payment Account,Mód Fizetési számla
 apps/erpnext/erpnext/stock/doctype/item/item.js +52,Show Variants,Mutasd változatok
-DocType: Academic Term,Academic Term,Hosszútávú
+DocType: Academic Term,Academic Term,Akadémia szemeszter
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +13,Material,Anyag
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Quantity,Mennyiség
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +511,Accounts table cannot be blank.,Fiókok tábla nem lehet üres.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +616,Quantity,Mennyiség
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +512,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)
 DocType: Employee Education,Year of Passing,Év Passing
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s","Hivatkozás:% s, pont kód:% s és az ügyfél:% s"
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Raktáron
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,Nyitott kérdések
 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 +142,User {0} is already assigned to Employee {1},Felhasználó {0} már hozzá van rendelve Employee {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Egészségügyi ellátás
-DocType: Purchase Invoice,Monthly,Havi
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Fizetési késedelem (nap)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +771,Invoice,Számla
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +750,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 +198,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} nem egyezik a {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Row # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Row # {0}:
 DocType: Timesheet,Total Costing Amount,Összesen Költség összege
 DocType: Delivery Note,Vehicle No,Jármű No
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +127,Please select Price List,"Kérjük, válasszon árjegyzéke"
@@ -93,7 +91,7 @@
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +47,Course Schedules created:,Természetesen Menetrendek létre:
 apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},Új {0}: # {1}
 ,Sales Partners Commission,Értékesítő partner jutaléka
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +22,Abbreviation cannot have more than 5 characters,"Rövidítése nem lehet több, mint 5 karakter"
+apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +22,Abbreviation cannot have more than 5 characters,"Rövidítés nem lehet több, mint 5 karakter"
 DocType: Payment Request,Payment Request,Kifizetési kérelem
 DocType: Asset,Value After Depreciation,Eszközök értékcsökkenés utáni
 DocType: Employee,O+,O +
@@ -108,21 +106,21 @@
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Nyitott állások
 DocType: Item Attribute,Increment,Növekmény
 apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,Válassza Warehouse ...
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Hirdetés
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Hírdet
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Ugyanez a vállalat szerepel többször
 DocType: Employee,Married,Házas
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Nem engedélyezett {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +589,Get items from,Hogy elemeket
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +382,Stock cannot be updated against Delivery Note {0},Stock nem lehet frissíteni ellen szállítólevél {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Hogy elemeket
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Stock cannot be updated against Delivery Note {0},Stock nem lehet frissíteni ellen szállítólevél {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Termék {0}
 DocType: Payment Reconciliation,Reconcile,Összeegyeztetni
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Élelmiszerbolt
 DocType: Quality Inspection Reading,Reading 1,Reading 1
 DocType: Process Payroll,Make Bank Entry,Tedd Bank Entry
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Nyugdíjpénztárak
-DocType: SMS Center,All Sales Person,Minden értékesítő
-DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,"** Havi Distribution ** segít terjeszteni a költségvetési / Cél hónapok között, ha a szezonalitás a te dolgod."
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +156,Salary Structure Missing,Bérrendszer Hiányzó
+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 +168,Salary Structure Missing,Bérrendszer Hiányzó
 DocType: Lead,Person Name,Személy Név
 DocType: Sales Invoice Item,Sales Invoice Item,Kimenő számla tételei
 DocType: Account,Credit,Követelés
@@ -130,41 +128,41 @@
 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/config/stock.py +32,Stock Reports,Stock jelentések
 DocType: Warehouse,Warehouse Detail,Raktár részletek
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,Credit limit has been crossed for customer {0} {1}/{2},Hitelkeret már átlépte az ügyfél {0} {1} / {2}
-apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Az állóeszköz&quot; nem lehet bejelölve, mint Asset bejegyzés létezik ellen tétel"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +189,Credit limit has been crossed for customer {0} {1}/{2},Hitelkeret 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 kifejezés végső dátuma nem lehet későbbi, mint az év végi időpontja a tanév, amelyre 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: Tax Rule,Tax Type,Adónem
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +144,You are not authorized to add or update entries before {0},Ön nem jogosult hozzáadására és frissítésére bejegyzés előtt {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},Ön nem jogosult hozzáadására és frissítésére bejegyzés előtt {0}
 DocType: Item,Item Image (if not slideshow),Elem 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,(Órás sebesség / 60) * aktuális üzemidő
+DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Óra sebesség / 60) * aktuális üzemidő
 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ételek
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Az üdülési {0} nem között Dátum és napjainkig
 DocType: Student Log,Student Log,Student Belépés
 DocType: Quality Inspection,Get Specification Details,Get Specification Részletek
 DocType: Lead,Interested,Érdekelt
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +165,Opening,Nyílás
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,Opening,Nyílás
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Re {0} {1}
 DocType: Item,Copy From Item Group,Másolás jogcím-csoport
 DocType: Journal Entry,Opening Entry,Kezdő tétel
-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
-apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Fiók fizessen csak
+apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Számla csak fizetésre
 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.,Véve a meglévő ügylet nem konvertálható csoportot.
+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á.
 DocType: Lead,Product Enquiry,Termék Érdeklődés
 DocType: Academic Term,Schools,iskolák
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,"Kérjük, adja cég első"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Company first,"Kérjük, válasszon Társaság első"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,Please select Company first,"Kérjük, válasszon Társaság első"
 DocType: Employee Education,Under Graduate,Under Graduate
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Cél On
 DocType: BOM,Total Cost,Összköltség
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Tevékenység lista
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Tevékenység napló:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Item {0} does not exist in the system or has expired,"Elem {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,Statement of Account
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Pharmaceuticals
 DocType: Purchase Invoice Item,Is Fixed Asset,Van állóeszköz
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Available qty is {0}, you need {1}","Elérhető mennyiség: {0}, akkor meg kell {1}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +225,"Available qty is {0}, you need {1}","Elérhető mennyiség: {0}, akkor meg kell {1}"
 DocType: Expense Claim Detail,Claim Amount,Követelés összege
 DocType: Employee,Mr,Úr
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Szállító Type / szállító
@@ -173,25 +171,26 @@
 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,Húzza Anyag kérése típusú Előállítás alapján a fenti kritériumoknak
+DocType: Assessment Result,Grade,Fokozat
 DocType: Sales Invoice Item,Delivered By Supplier,Megérkezés a Szállító
-DocType: SMS Center,All Contact,Minden Kapcsolattartó
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Annual Salary,Éves Fizetés
+DocType: SMS Center,All Contact,Összes Kapcsolattartó
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Annual Salary,Éves Fizetés
 DocType: Period Closing Voucher,Closing Fiscal Year,Záró pénzügyi év
 apps/erpnext/erpnext/accounts/party.py +349,{0} {1} is frozen,{0} {1} fagyasztott
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Stock költségek
-apps/erpnext/erpnext/accounts/report/financial_statements.py +22,End Year {0} not found.,Befejező év: {0} nem található.
 DocType: Journal Entry,Contra Entry,Contra Entry
 DocType: Journal Entry Account,Credit in Company Currency,Credit Company Valuta
 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ég meg kell egyeznie a beérkezett mennyiséget tétel {0}
+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
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Supply nyersanyag beszerzése
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +130,At least one mode of payment is required for POS invoice.,Legalább egy fizetési mód szükséges POS számlát.
 DocType: Products Settings,Show Products as a List,Megmutatása termékek 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 munkavállaló 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 +451,Item {0} is not active or end of life has been reached,"Elem {0} nem aktív, vagy az elhasználódott elérte"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +456,Item {0} is not active or end of life has been reached,"Elem {0} nem aktív, vagy az elhasználódott elérte"
 apps/erpnext/erpnext/public/js/setup_wizard.js +341,Example: Basic Mathematics,Példa: Basic Mathematics
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Hogy tartalmazzák az adót a sorban {0} tétel mértéke, az adók sorokban {1} is fel kell venni"
+apps/erpnext/erpnext/controllers/accounts_controller.py +617,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Hogy tartalmazzák az adót a sorban {0} tétel mértéke, az adók sorokban {1} is fel kell venni"
 apps/erpnext/erpnext/config/hr.py +166,Settings for HR Module,Beállításait HR modul
 DocType: SMS Center,SMS Center,SMS Központ
 DocType: Sales Invoice,Change Amount,Változás mértéke
@@ -203,15 +202,15 @@
 DocType: Leave Application,Reason,Ok
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Tedd Alkalmazott
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Broadcasting
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Execution,Végrehajtás
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Execution,Végrehajtás
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Részletek az elvégzett műveleteket.
 DocType: Serial No,Maintenance Status,Karbantartás állapota
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Tételek és árak
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Összesen tartás: {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átum belül kell pénzügyi évben. Feltételezve A Date = {0}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,Cost Center {0} does not belong to Company {1},Költséghely {0} nem tartozik Company {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +100,Cost Center {0} does not belong to Company {1},Költséghely {0} nem tartozik Company {1}
 DocType: Customer,Individual,Magánszemély
-DocType: Interest,Academics User,akadémikusok felhasználó
+DocType: Interest,Academics User,Akadémiai felhasználó
 DocType: Cheque Print Template,Amount In Figure,Összeg ábrán
 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,Adja url paraméter üzenet
@@ -225,54 +224,57 @@
 DocType: Production Planning Tool,Sales Orders,Vevőmegrendelés
 DocType: Purchase Taxes and Charges,Valuation,Értékelés
 ,Purchase Order Trends,Megrendelés Trends
-apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,Osztja levelek évre.
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,The request for quotation can be accessed by clicking on the following link,"Az ajánlatkérés érhető el, kattintson a következő linkre"
+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 Teremtés Szerszám pálya
 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 tanfolyamok kiválasztott tanulmányi idő"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,Insufficient Stock,elégtelen Stock
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227,Insufficient Stock,elégtelen Stock
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Disable kapacitás-tervezés és Time Tracking
+DocType: Email Digest,New Sales Orders,Új értékesítési rendelés
 DocType: Bank Reconciliation,Bank Account,Bankszámla
 DocType: Leave Type,Allow Negative Balance,Negatív egyenleg engedélyezése
 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 keresztül ""Idő Log"""
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} does not belong to Company {1},Account {0} nem tartozik Company {1}
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},"Advance összege nem lehet nagyobb, mint {0} {1}"
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +86,Account {0} does not belong to Company {1},A {0}számlához nem tartozik a {1} Vállalat
+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}"
 DocType: Naming Series,Series List for this Transaction,Sorozat List ehhez a tranzakcióhoz
 DocType: Sales Invoice,Is Opening Entry,Ez nyitó tétel?
 DocType: Customer Group,Mention if non-standard receivable account applicable,"Beszélve, ha nem szabványos követelés véve az alkalmazandó"
 DocType: Course Schedule,Instructor Name,oktató neve
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,For Warehouse is required before Submit,"Raktár van szükség, mielőtt beküldése"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,For Warehouse is required before Submit,"Raktár van szükség, mielőtt beküldése"
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Beérkezett
 DocType: Sales Partner,Reseller,Viszonteladó
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,"Kérjük, adja Társaság"
 DocType: Delivery Note Item,Against Sales Invoice Item,Ellen Értékesítési számlák Elem
 ,Production Orders in Progress,Folyamatban lévő gyártási rendelések
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Cash from Financing,Nettó származó pénzeszközök
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1436,"LocalStorage is full , did not save","LocalStorage tele van, nem mentettem"
-DocType: Lead,Address & Contact,Cím és Kapcsolattartó
-DocType: Leave Allocation,Add unused leaves from previous allocations,Add fel nem használt leveleket a korábbi juttatások
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1460,"LocalStorage is full , did not save","LocalStorage tele van, nem mentettem"
+DocType: Lead,Address & Contact,Cím & Kapcsolattartó
+DocType: Leave Allocation,Add unused leaves from previous allocations,Adja hozzása 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},Next Ismétlődő {0} jön létre {1}
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +28,Another Budget record {0} already exists against {1} for fiscal year {2},Egy másik olcsó rekord {0} már létezik az {1} pénzügyi évben {2}
 DocType: Sales Partner,Partner website,partner weboldal
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +104,Add Item,Elem hozzáadása
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +104,Add Item,Tétel hozzáadása
 ,Contact Name,Kapcsolattartó neve
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Bérlap létrehozása a fenti kritériumok alapján.
 DocType: Cheque Print Template,Line spacing for amount in words,Sorközét összeg kiírva
 apps/erpnext/erpnext/templates/generators/item.html +78,No description given,Nem megadott leírás
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Kérheti a vásárlást.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +5,This is based on the Time Sheets created against this project,Ennek alapja az idő lapok létrehozott ellen a projekt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Only the selected Leave Approver can submit this Leave Application,Csak a kijelölt Leave Jóváhagyó nyújthatják be ez a szabadság Application
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +213,Only the selected Leave Approver can submit this Leave Application,Csak a kijelölt Leave Jóváhagyó nyújthatják be ez a szabadság Application
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,"Tehermentesítő dátuma nagyobbnak kell lennie, mint Csatlakozás dátuma"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Leaves per Year,Levelek évente
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,Levelek évente
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"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 {1} céghez
+DocType: Email Digest,Profit & Loss,Profit veszteség
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,Litre,Liter
 DocType: Task,Total Costing Amount (via Time Sheet),Összesen Costing Összeg (via Idő Sheet)
 DocType: Item Website Specification,Item Website Specification,Az anyag weboldala
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +435,Leave Blocked,Hagyja Blokkolt
-apps/erpnext/erpnext/stock/doctype/item/item.py +669,Item {0} has reached its end of life on {1},Elem {0} elérte az élettartama végét {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +443,Leave Blocked,Hagyja Blokkolt
+apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item {0} has reached its end of life on {1},Elem {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 +83,Annual,Éves
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +86,Annual,Éves
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Megbékélés Elem
 DocType: Stock Entry,Sales Invoice No,Kimenő számla száma
 DocType: Material Request Item,Min Order Qty,Min. rendelési menny.
@@ -280,20 +282,22 @@
 DocType: Lead,Do Not Contact,Ne írj
 apps/erpnext/erpnext/public/js/setup_wizard.js +360,People who teach at your organisation,"Emberek, akik tanítanak a szervezet"
 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. Úgy keletkezett benyújtani.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Software Developer,Software Developer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Minimális rendelési menny
 DocType: Pricing Rule,Supplier Type,Beszállító típusa
 DocType: Scheduling Tool,Course Start Date,Természetesen kezdő dátuma
 DocType: Item,Publish in Hub,Közzéteszi Hub
+DocType: Student Admission,Student Admission,Student Felvételi
 ,Terretory,Terület
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is cancelled,{0} elem törölve
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Material Request,Anyagigénylés
+apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} is cancelled,{0} elem törölve
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +823,Material Request,Anyagigénylés
 DocType: Bank Reconciliation,Update Clearance Date,Frissítés Végső dátum
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +28,Abbreviation already used for another salary component,Rövidítése már használja egy másik fizetési alkatrész
+apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +28,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,Vásárlási adatok
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +328,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Elem {0} nem található &quot;szállított alapanyagok&quot; táblázat Megrendelés {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +333,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Elem {0} nem található &quot;szállított alapanyagok&quot; táblázat Megrendelés {1}
 DocType: Employee,Relation,Kapcsolat
 DocType: Shipping Rule,Worldwide Shipping,Világszerte Szállítási
+DocType: Student Guardian,Mother,Anya
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Visszaigazolt megrendelések ügyfelektől.
 DocType: Purchase Receipt Item,Rejected Quantity,Elutasított mennyiség
 DocType: SMS Settings,SMS Sender Name,SMS küldő neve
@@ -309,40 +313,42 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +130,Please select Charge Type first,"Kérjük, válasszon Charge Type első"
 DocType: Student Group Student,Student Group Student,Student Group Student
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Legutolsó
+DocType: Email Digest,New Quotations,Új árajánlat
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Az első Leave Jóváhagyó a lista lesz-e az alapértelmezett Leave Jóváhagyó
 DocType: Tax Rule,Shipping County,Szállítási megye
 apps/erpnext/erpnext/config/desktop.py +158,Learn,Tanulás
 DocType: Asset,Next Depreciation Date,Következő Értékcsökkenés dátuma
-apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Activity Egy alkalmazottra jutó
+apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Alkalmazottankénti Tevékenység költség
 DocType: Accounts Settings,Settings for Accounts,Fiókok beállítása
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +626,Supplier Invoice No exists in Purchase Invoice {0},Szállító számla nem létezik beszerzési számla {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +629,Supplier Invoice No exists in Purchase Invoice {0},Szállító számla nem létezik beszerzési számla {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Kezelje Sales Person fa.
 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,Kiemelkedő csekkeket és a betétek egyértelmű
 DocType: Item,Synced With Hub,Szinkronizálta Hub
 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 +348,Completed Qty can not be greater than 'Qty to Manufacture',"Befejezett Menny nem lehet nagyobb, mint ""Menny a Manufacture"""
+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 ""Menny a Manufacture"""
 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 +86,Circular Reference Error,Körkörös hivatkozás Error
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,"Szavakban (Export) lesz látható, ha menteni a szállítólevélen."
 DocType: Cheque Print Template,Distance from left edge,Távolság bal szélén
-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 / pont / {1}) 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} egység [{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,Értesítés e-mailben a létrehozása automatikus Material kérése
 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 +806,Delivery Note,Szállítólevél
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +800,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/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Költsége Eladott Asset
-apps/erpnext/erpnext/accounts/utils.py +233,Payment Entry has been modified after you pulled it. Please pull it again.,"Fizetési Entry módosításra került, miután húzta. Kérjük, húzza meg újra."
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,{0} entered twice in Item Tax,{0} belépett kétszer tétel adó
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,Summary for this week and pending activities,Összefoglaló erre a hétre és a folyamatban lévő tevékenységek
-DocType: Student Applicant,Admitted,Felvételt nyer
+apps/erpnext/erpnext/accounts/utils.py +310,Payment Entry has been modified after you pulled it. Please pull it again.,"Fizetési Entry módosításra került, miután húzta. Kérjük, húzza meg újra."
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,{0} entered twice in Item Tax,{0} kétszer bevitt a tétel adójába
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Összefoglaló erre a hétre és a folyamatban lévő tevékenységek
+DocType: Student Applicant,Admitted,Belépést nyer
 DocType: Workstation,Rent Cost,Bérleti díj
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Összeg után értékcsökkenési leírás
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +97,Upcoming Calendar Events,Közelgő naptár
 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,Céges E-mail cím
@@ -354,63 +360,64 @@
 apps/erpnext/erpnext/config/hr.py +186,"Employee designation (e.g. CEO, Director etc.).","Munkavállalói kijelölése (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 ""Repeat a hónap napja"" mező értéke"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Arány, amely Customer Valuta átalakul ügyfél alap deviza"
-apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Sor # {0}: beszerzési számla nem lehet fellépni egy már meglévő eszközt {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +554,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Sor # {0}: beszerzési számla nem lehet fellépni egy már meglévő eszközt {1}
 DocType: Item Tax,Tax Rate,Adókulcs
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} már elkülönített Employee {1} időszakra {2} {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +812,Select Item,Elem kiválasztása
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} már elkülönített a  {1} Munkavállalóhoz a {2} -től {3} -ig időszakra
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +791,Select Item,Elem kiválasztása
+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","Cikk: {0} sikerült szakaszos, nem lehet összeegyeztetni a \ Stock Megbékélés helyett használja Stock Entry"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Vásárlást igazoló számlát {0} már benyújtott
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Sor # {0}: Batch Nem kell egyeznie {1} {2}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +143,Purchase Invoice {0} is already submitted,Vásárlást igazoló számlát {0} már benyújtott
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Sor # {0}: Batch Nem kell egyeznie {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Átalakítás nem Group
 apps/erpnext/erpnext/config/stock.py +117,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,Betéti összeg
 apps/erpnext/erpnext/accounts/party.py +242,There can only be 1 Account per Company in {0} {1},Ott csak 1 fiók per Társaság {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 +342,Please see attachment,"Kérjük, nézze meg a mellékletet"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,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ákcsoportok
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,Beállítás Már Komplett !!
 ,Finished Goods,Készáru
 DocType: Delivery Note,Instructions,Utasítások
 DocType: Quality Inspection,Inspected By,Megvizsgálta
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Szállító&gt; Szállító Type
 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},Serial No {0} nem tartozik szállítólevél {1}
-apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,elemek hozzáadása
+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,Anyag minőségi vizsgálatának részletei
 DocType: Leave Application,Leave Approver Name,Hagyja Jóváhagyó név
 DocType: Depreciation Schedule,Schedule Date,Menetrend dátuma
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components","Jövedelem, levonások vagy más fizetés alkatrészek"
 DocType: Packed Item,Packed Item,Csomagolt Elem
 apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,Alapértelmezett beállítások a vásárlás tranzakciókat.
-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 Employee {0} elleni tevékenység típusa - {1}
+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,Valuta árfolyam
 DocType: Purchase Invoice Item,Item Name,Az elem neve
 DocType: Authorization Rule,Approving User  (above authorized value),Jóváhagyó felhasználó (a fenti engedélyezett érték)
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Credit Balance
+DocType: Email Digest,Credit Balance,Credit Balance
 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ám egy meglévő sorozatban.
 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ályok továbbra is fennállnak, a felhasználók arra kérik, hogy a prioritás beállítása kézzel tudja oldani a konfliktusokat."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +736,Purchase Return,Vásárlási Return
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +715,Purchase Return,Vásárlási Return
 ,Purchase Register,Vásárlási Regisztráció
 DocType: Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Alkalmazandó díjak
 DocType: Workstation,Consumable Cost,Fogyó költség
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +202,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) kell szerepet ""Leave Jóváhagyó"""
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,{0} ({1}) must have role 'Leave Approver',{0} ({1}) 'Eltávozás Jóváhagyó' szereppel kell rendelkeznie
 DocType: Purchase Receipt,Vehicle Date,Jármű dátuma
 DocType: Student Log,Medical,Orvosi
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Veszteség indoka
-apps/erpnext/erpnext/accounts/utils.py +239,Allocated amount can not greater than unadjusted amount,"Elkülönített összeg nem lehet nagyobb, mint kiigazítás nélküli összege"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +163,Reason for losing,Veszteség indoka
+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/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Munkaállomás zárva a következő időpontokban per Nyaralás listája: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Lehetőségek
 DocType: Employee,Single,Egyedülálló
 DocType: Account,Cost of Goods Sold,Az eladott áruk beszerzési
 DocType: Purchase Invoice,Yearly,Évi
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +225,Please enter Cost Center,"Kérjük, adja Cost Center"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,Please enter Cost Center,"Kérjük, adja Cost Center"
 DocType: Journal Entry Account,Sales Order,Értékesítési megrendelés
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,Átlagos eladási ráta
 DocType: Assessment,Examiner Name,vizsgáztató neve
@@ -423,26 +430,26 @@
 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
 DocType: Account,Is Group,Is Csoport
+DocType: Email Digest,Pending Purchase Orders,Függő Megrendelések
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Automatikusan beállítja Soros számú alapuló FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Ellenőrizze Szállító Számla száma Egyediség
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',"""A Case No."" nem lehet kevesebb, mint ""A Case No."""
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,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 +105,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.,"Megszokott a bevezető szöveget, amely megy, mint egy része az e-mail. Minden egyes tranzakció külön bevezető szöveget."
-DocType: Stock Reconciliation Item,Do not include symbols (ex. $),Nem tartalmaznak szimbólumok (pl. $)
 DocType: Sales Taxes and Charges Template,Sales Master Manager,Sales mester menedzser
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Globális beállítások minden egyes gyártási folyamat.
 DocType: Accounts Settings,Accounts Frozen Upto,A számlák be vannak fagyasztva eddig
 DocType: SMS Log,Sent On,Elküldve
-apps/erpnext/erpnext/stock/doctype/item/item.py +638,Attribute {0} selected multiple times in Attributes Table,Képesség {0} kiválasztott többször attribútumok táblázat
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Képesség {0} kiválasztott többször attribútumok táblázat
 DocType: HR Settings,Employee record is created using selected field. ,Munkavállalói rekord jön létre a kiválasztott mező.
 DocType: Sales Order,Not Applicable,Nem értelmezhető
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Nyaralás mester.
 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 +862,Please enter Item Code.,"Kérjük, adja tételkód."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +847,Please enter Item Code.,"Kérjük, adja tételkód."
 DocType: BOM,Costing,Költség
 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 tekinteni, mint amelyek már szerepelnek a Print Ár / Print Összeg"
@@ -456,12 +463,12 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Értékpapírok és betétek
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Összesen levelek kiosztott kötelező
 DocType: Job Opening,Description of a Job Opening,Leírása egy Állásajánlatok
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Pending activities for today,Függő tevékenységek ma
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Függő tevékenységek ma
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Részvételi rekord.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Fizetés Komponens munkaidő alapú bér.
 DocType: Sales Order Item,Used for Production Plan,Használt termelési terv
 DocType: Manufacturing Settings,Time Between Operations (in mins),Time Between Operations (percben)
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +92,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} költségvetés fiók {1} ellen Költségközpont {2} az {3}. Ez meg fogja haladni a {4}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +95,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},"{0} költségvetés a {1} Főkönyvi számlához a {2} Költségközpont jóváírására, ennyi {3}. Ez meg fogja haladni ezt {4}"
 DocType: Customer,Buyer of Goods and Services.,Vevő az áruk és szolgáltatások.
 DocType: Journal Entry,Accounts Payable,Fizethető 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
@@ -469,16 +476,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +238,List a few of your customers. They could be organizations or individuals.,Sorolja pár az ügyfelek. Ők lehetnek szervezetek vagy magánszemélyek.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Direct Income,Közvetlen jövedelemtámogatás
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Nem tudja kiszűrni alapján Account, ha csoportosítva Account"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Administrative Officer,Igazgatási tisztviselő
-apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +23,Acutal Qty {0} / Waiting Qty {1},Juhhús Mennyiség {0} / Waiting db {1}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,Igazgatási tisztviselő
+apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +23,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 +319,Please select Company,"Kérjük, válasszon Társaság"
-DocType: Stock Entry,Difference Account,Különbség Account
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +309,Please select Company,"Kérjük, válasszon Társaság"
+DocType: Stock Entry Detail,Difference Account,Különbség Account
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Nem zárható feladata a függő feladat {0} nincs lezárva.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Please enter Warehouse for which Material Request will be raised,"Kérjük, adja Warehouse, amelyek anyaga kérés jelenik meg"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +399,Please enter Warehouse for which Material Request will be raised,"Kérjük, adja Warehouse, amelyek anyaga kérés jelenik meg"
 DocType: Production Order,Additional Operating Cost,További üzemeltetési költség
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kozmetikum
-apps/erpnext/erpnext/stock/doctype/item/item.py +530,"To merge, following properties must be same for both items","Egyesíteni, a következő tulajdonságokkal kell, hogy egyezzen mindkét tételek"
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,"To merge, following properties must be same for both items","Egyesíteni, a következő tulajdonságokkal kell, hogy egyezzen mindkét tételek"
 DocType: Shipping Rule,Net Weight,Nettó súly
 DocType: Employee,Emergency Phone,Sürgősségi telefon
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +28,Buy,Vásárol
@@ -486,22 +493,23 @@
 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 +1563,Serial no item cannot be a fraction,Sorszám elem nem lehet egy töredéke
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1587,Serial no item cannot be a fraction,Sorszám elem nem lehet egy töredéke
 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,Ügyvezető alvállalkozói munkák
 DocType: Project,Project will be accessible on the website to these users,"Project lesz elérhető a honlapon, hogy ezek a felhasználók"
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,"Arány, amely Árlista valuta konvertálja a vállalkozás székhelyén pénznemben"
-apps/erpnext/erpnext/setup/doctype/company/company.py +56,Account {0} does not belong to company: {1},Account {0} nem tartozik a cég: {1}
-apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation already used for another company,Rövidítése már használja egy másik cég
+apps/erpnext/erpnext/setup/doctype/company/company.py +56,Account {0} does not belong to company: {1},A {0}számlához nem tartozik ez a Vállalat: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation already used for another company,Rövidítést már használja egy másik cég
 DocType: Selling Settings,Default Customer Group,Alapértelmezett Vásárlói csoport
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Supplier is required against Payable account {0},Szállító köteles ellen fizetendő számla {0}
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Ha kikapcsolod, a 'Kerekített összesen' mező nem fog látszódni sehol sem"
 DocType: BOM,Operating Cost,A működési költségek
 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
 DocType: Production Planning Tool,Material Requirement,Anyagszükséglet
 DocType: Company,Delete Company Transactions,Törlés vállalkozásnak adott
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +313,Reference No and Reference Date is mandatory for Bank transaction,Hivatkozási szám és Referencia dátum kötelező Bank tranzakció
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +316,Reference No and Reference Date is mandatory for Bank transaction,Hivatkozási szám és Referencia dátum kötelező Bank tranzakció
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Adók és költségek hozzáadása / szerkesztése
 DocType: Purchase Invoice,Supplier Invoice No,Beszállítói számla száma
 DocType: Territory,For reference,Referenciaként
@@ -512,7 +520,6 @@
 DocType: Installation Note Item,Installation Note Item,Telepítési feljegyzés Elem
 DocType: Production Plan Item,Pending Qty,Folyamatban db
 DocType: Budget,Ignore,Mellőz
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Tételkód&gt; Elem Csoport&gt; Márka
 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/config/accounts.py +241,Setup cheque dimensions for printing,Beállítás csekk méreteit nyomtatás
 DocType: Salary Slip,Salary Slip Timesheet,Fizetés Munkaidő Slip
@@ -523,11 +530,11 @@
 DocType: Buying Settings,Purchase Receipt Required,Vásárlási Kötelező átvételi
 apps/erpnext/erpnext/stock/doctype/item/item.py +128,Valuation Rate is mandatory if Opening Stock entered,"Értékelés Rate kötelező, ha nyitvatartási Stock lépett"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Nincs bejegyzés találat a számlatáblázat
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +28,Please select Company and Party Type first,"Kérjük, válasszon Társaság és a Party Type első"
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +19,Please select Company and Party Type first,"Kérjük, válasszon Társaság és a Party Type első"
 apps/erpnext/erpnext/config/accounts.py +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, Serial Nos nem lehet összevonni,"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +707,Make Sales Order,Értékesítési megrendelés készítése
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +701,Make Sales Order,Értékesítési megrendelés készítése
 DocType: Project Task,Project Task,Projekt feladat
 ,Lead Id,Célpont ID
 DocType: C-Form Invoice Detail,Grand Total,Mindösszesen
@@ -542,8 +549,9 @@
 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óid
-DocType: Leave Control Panel,Allocate,Osztja
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +734,Sales Return,Eladás visszaküldése
+DocType: Leave Control Panel,Allocate,Feloszott
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +728,Sales Return,Eladás visszaküldése
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +91,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,"Megjegyzés: Az összes kijelölt levelek {0} nem lehet kevesebb, mint a már jóváhagyott levelek {1} időszakra"
 DocType: Announcement,Posted By,Általa megosztva
 DocType: Item,Delivered by Supplier (Drop Ship),Megérkezés a Szállító (Drop Ship)
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Adatbázist a potenciális vásárlók.
@@ -552,14 +560,13 @@
 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 +212,Opening (Cr),Opening (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +795,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Alapértelmezett mértékegysége pont {0} nem lehet megváltoztatni közvetlenül, mert már tett néhány tranzakció (k) másik UOM. Szükséged lesz egy új tétel, hogy egy másik Alapértelmezett UOM."
-apps/erpnext/erpnext/accounts/utils.py +237,Allocated amount can not be negative,Elkülönített összeg nem lehet negatív
+apps/erpnext/erpnext/stock/doctype/item/item.py +797,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Alapértelmezett mértékegysége pont {0} nem lehet megváltoztatni közvetlenül, mert már tett néhány tranzakció (k) másik UOM. Szükséged lesz egy új tétel, hogy egy másik Alapértelmezett UOM."
+apps/erpnext/erpnext/accounts/utils.py +314,Allocated amount can not be negative,Elkülönített összeg nem lehet negatív
 DocType: Purchase Order Item,Billed Amt,Számlázott össz.
-DocType: Warehouse,A logical Warehouse against which stock entries are made.,A logikai Warehouse amely ellen állomány bejegyzések történnek.
+DocType: Warehouse,A logical Warehouse against which stock entries are made.,A logikai Készlet amelyhez a készlet állomány bejegyzések történnek.
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Értékesítési számlák Időnyilvántartó
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},Hivatkozási szám és Referencia dátuma szükséges {0}
-DocType: Sales Invoice,Customer's Vendor,A Vevő szállítója
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Proposal Writing,Pályázatírás
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,Proposal Writing,Pályázatírás
 DocType: Payment Entry Deduction,Payment Entry Deduction,Fizetési Entry 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 Sales Person {0} létezik az azonos dolgozói azonosító
 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 Material kérések"
@@ -568,17 +575,18 @@
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,Időkövetés
 DocType: Fiscal Year Company,Fiscal Year Company,Pénzügyi év társaság
 DocType: Packing Slip Item,DN Detail,DN részlete
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +257,Already supplier quotation has created,Már szállító idézet teremtett
 DocType: Timesheet,Billed,Számlázott
 DocType: Batch,Batch Description,Köteg leírás
+apps/erpnext/erpnext/accounts/utils.py +685,"Payment Gateway Account not created, please create one manually.","Payment Gateway 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,Időpontja tételek szállítottak a raktárból
 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 +733,View Offline Records,Részletek Offline Records
+apps/erpnext/erpnext/accounts/page/pos/pos.js +715,View Offline Records,Részletek Offline Records
+DocType: Student,Sibling Details,testvér Részletek
 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és.
 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 pénzügyi évben {2}"
+apps/erpnext/erpnext/accounts/utils.py +53,{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 vásárlás Module
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},Asset {0} nem tartozik a cég {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,"Kérjük, adja vásárlási nyugta első"
@@ -588,19 +596,20 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Aztán árképzési szabályok szűrik ki alapul vevő, Customer Group, Territory, Szállító, Szállító Type, kampány, értékesítési partner stb"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Inventory,Nettó készletváltozás
 DocType: Employee,Passport Number,Útlevél száma
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Manager,Menedzser
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,Menedzser
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,Same item has been entered multiple times.,Ugyanazt a tételt már többször jelenik meg.
 DocType: SMS Settings,Receiver Parameter,Vevő Paraméter
-apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,Az 'alapján' 'és a 'csoport szerint' nem lehet ugyanazon
+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 célok
 DocType: Installation Note,IN-,BAN BEN-
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter email address,Emailcím megadása
 DocType: Production Order Operation,In minutes,Perceken
 DocType: Issue,Resolution Date,Megoldás dátuma
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +299,Timesheet created:,Munkaidő nyilvántartás készítette:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +715,Please set default Cash or Bank account in Mode of Payment {0},Kérjük alapértelmezett Készpénz vagy bankszámlára Fizetési mód {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +300,Timesheet created:,Munkaidő nyilvántartás készítette:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +772,Please set default Cash or Bank account in Mode of Payment {0},Kérjük alapértelmezett Készpénz vagy bankszámlára Fizetési mód {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +17,Enroll,felvesz
 DocType: Selling Settings,Customer Naming By,Vásárlói Elnevezése a
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,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: Depreciation Schedule,Depreciation Amount,értékcsökkenés összege
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,Átalakítás Group
 DocType: Activity Cost,Activity Type,Tevékenység típusa
@@ -625,6 +634,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,Befejez
 DocType: Pricing Rule,Sales Manager,Sales Manager
 DocType: Salary Structure Employee,Base,Bázis
+DocType: Timesheet,Total Billed Hours,Összesen számlázott Óra
 DocType: Journal Entry,Write Off Amount,Leírt összeg
 DocType: Journal Entry,Bill No,Számlaszám
 DocType: Company,Gain/Loss Account on Asset Disposal,Nyereség / veszteség számla on Asset ártalmatlanítása
@@ -638,21 +648,21 @@
 DocType: Interest,Interest,Érdeklődés
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +9,Pre Sales,Előeladás
 DocType: Purchase Receipt,Other Details,Egyéb részletek
-DocType: Account,Accounts,Könyvelés
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Marketing,Marketing
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +227,Payment Entry is already created,Fizetési Nevezési már létrehozott
+DocType: Account,Accounts,Főkönyvi számlák
+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,Fizetési Nevezési már létrehozott
 DocType: Purchase Receipt Item Supplied,Current Stock,Raktárkészlet
-apps/erpnext/erpnext/controllers/accounts_controller.py +538,Row #{0}: Asset {1} does not linked to Item {2},Sor # {0}: {1} Asset nem kapcsolódik pont {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +21,Preview Salary Slip,Preview fizetés Slip
+apps/erpnext/erpnext/controllers/accounts_controller.py +541,Row #{0}: Asset {1} does not linked to Item {2},Sor # {0}: {1} Asset nem kapcsolódik pont {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +38,Preview Salary Slip,Preview fizetés Slip
 DocType: Company,Deafult Cost Center,Alapértelmezett értek Költségközpont
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +48,Account {0} has been entered multiple times,Fiók {0} már többször jelenik meg
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +48,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égekből Értékelési
 DocType: Employee,Provide email id registered in company,Adjon email id bejegyzett cég
 DocType: Hub Settings,Seller City,Eladó város
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,"Kérjük, válasszon ki egy diákcsoport"
 DocType: Email Digest,Next email will be sent on:,A következő emailt küldjük:
-DocType: Offer Letter Term,Offer Letter Term,Ajánlat Letter Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +617,Item has variants.,Tételnek változatok.
+DocType: Offer Letter Term,Offer Letter Term,Ajánlat levél feltétele
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Tételnek változatok.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,Elem {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,Company {0} nem létezik
@@ -672,14 +682,14 @@
 DocType: Purchase Order,Supply Raw Materials,Supply nyersanyagok
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Az időpont, amikor a következő számlán kerül előállításra. Úgy keletkezett benyújtani."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Jelenlegi eszközök
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,{0} is not a stock Item,{0} nem Stock tétel
+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 +169,Lead must be set if Opportunity is made from Lead,"Lead kell állítani, ha Opportunity készült Lead"
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,"Kérjük, válassza ki a heti egyszeri nap"
 DocType: Production Order Operation,Planned End Time,Tervezett End Time
 ,Sales Person Target Variance Item Group-Wise,Értékesítői Cél Variance tétel Group-Wise
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,Account with existing transaction cannot be converted to ledger,Véve a meglévő tranzakciós nem lehet átalakítani főkönyvi
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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á.
 DocType: Delivery Note,Customer's Purchase Order No,A Vevő rendelésének száma
 DocType: Employee,Cell Number,Mobilszám
 apps/erpnext/erpnext/stock/reorder_item.py +177,Auto Material Requests Generated,Auto Anyag kéréseket
@@ -691,7 +701,7 @@
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Havi kimutatást.
 DocType: Item Group,Website Specifications,Honlapok
 apps/erpnext/erpnext/utilities/doctype/address/address.py +104,There is an error in your Address Template {0},Van egy hiba a Címsablon {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{0}: From {0} of type {1},{0}: A {0} típusú {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{0}: From {0} of type {1},{0}: Feladó {0} a {1} típusból
 DocType: Warranty Claim,CI-,Cl-
 apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Row {0}: Conversion Factor kötelező
 DocType: Employee,A+,A +
@@ -739,26 +749,25 @@
 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 +709,No Permission,Nincs jogosultság
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +710,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","Kiszűrni alapuló párt, válasszuk a párt Írja első"
-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; nem lehet ellenőrizni, mert az elemek nem szállítják keresztül {0}"
+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}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Tételek magasabb weightage jelenik meg a magasabb
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bank Megbékélés részlete
-apps/erpnext/erpnext/controllers/accounts_controller.py +542,Row #{0}: Asset {1} must be submitted,Sor # {0}: {1} Asset kell benyújtani
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset {1} must be submitted,Sor # {0}: {1} Asset kell benyújtani
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Egyetlen dolgozó sem találtam
 DocType: Supplier Quotation,Stopped,Megállítva
 DocType: Item,If subcontracted to a vendor,Ha alvállalkozásba eladó
-DocType: SMS Center,All Customer Contact,Minden vevői Kapcsolattartó
+DocType: SMS Center,All Customer Contact,Összes vevői Kapcsolattartó
 apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,Töltsd fel készletének egyenlege keresztül csv.
 DocType: Warehouse,Tree Details,fa Részletek
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Küldés most
 ,Support Analytics,Támogatási analitika
 DocType: Item,Website Warehouse,Weboldal Warehouse
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimális Számla összege
 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,Elem Row {idx} {} {doctype DOCNAME} nem létezik a fent &#39;{doctype} &quot;asztalon
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +227,Timesheet {0} is already completed or cancelled,Timesheet {0} már befejezett vagy visszavont
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +259,Timesheet {0} is already completed or cancelled,Timesheet {0} már befejezett vagy visszavont
 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 auto számla 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 kell lennie, kisebb vagy egyenlő, mint 5"
@@ -770,35 +779,37 @@
 DocType: HR Settings,Retirement Age,Nyugdíjas kor
 DocType: Bin,Moving Average Rate,Mozgóátlag
 DocType: Production Planning Tool,Select Items,Válassza ki az elemeket
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,{0} against Bill {1} dated {2},{0} ellen Bill {1} kelt {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,{0} against Bill {1} dated {2},{0} a  {2} kelt  {1} Számla ellen
 apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,természetesen menetrend
 DocType: Maintenance Visit,Completion Status,Készültségi állapot
-DocType: HR Settings,Enter retirement age in years,Írja nyugdíjkorhatár év
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +229,Target Warehouse,Cél raktár
+DocType: HR Settings,Enter retirement age in years,Adja meg a nyugdíjkorhatárt (év)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +230,Target Warehouse,Cél raktár
 DocType: Cheque Print Template,Starting location from left edge,Kiindulási hely balról él
-DocType: Item,Allow over delivery or receipt upto this percent,Hagyjuk fölött szállítás vagy nyugtát Akár ezt a százalékos
+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: 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 Várható szállítás dátuma nem lehet korábbi mint a rendelés dátuma
 DocType: Upload Attendance,Import Attendance,Import Nézőszám
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Minden tétel Csoportok
-DocType: Process Payroll,Activity Log,Tevékenység
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Összes tétel Csoportok
+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/config/setup.py +89,Automatically compose message on submission of transactions.,Automatikusan üzenet írása benyújtása tranzakciókat.
 DocType: Production Order,Item To Manufacture,Anyag gyártáshoz
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +82,{0} {1} status is {2},{0} {1} állapot {2}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +82,{0} {1} status is {2},{0} {1} állapota {2}
 DocType: Shopping Cart Settings,Enable Checkout,engedélyezze Pénztár
 apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Megrendelést Fizetés
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +37,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,Elem Variant {0} már létezik azonos tulajdonságú
 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 meg
 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,Elem Variant Képesség
 ,Purchase Receipt Trends,Vásárlási nyugta Trends
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Research & Development,Kutatás és fejlesztés
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Kutatás és fejlesztés
 ,Amount to Bill,Összeget számlázni
 DocType: Company,Registration Details,Regisztrációs adatok
+DocType: Timesheet,Total Billed Amount,Teljes kiszámlázott összeg
 DocType: Item Reorder,Re-Order Qty,Re-Order Mennyiség
 DocType: Leave Block List Date,Leave Block List Date,Hagyja Block List dátuma
 DocType: Pricing Rule,Price or Discount,Árazás vagy engedmény
@@ -807,11 +818,11 @@
 DocType: Production Planning Tool,Only Obtain Raw Materials,Csak beszerzése nyersanyagok
 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","Engedélyezése &quot;Használja kosár&quot;, mint kosár van kapcsolva, és ott kell lennie legalább egy adó Szabály Kosár"
-apps/erpnext/erpnext/controllers/accounts_controller.py +340,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Fizetési Entry {0} kapcsolódik ellen rendelés {1}, akkor esetleg meg kell húzni, mint előre ezen a számlán."
+apps/erpnext/erpnext/controllers/accounts_controller.py +343,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Fizetési Entry {0} kapcsolódik ellen rendelés {1}, akkor esetleg meg kell húzni, mint előre ezen a számlán."
 DocType: Sales Invoice Item,Stock Details,Stock Részletek
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Projekt érték
 apps/erpnext/erpnext/config/selling.py +307,Point-of-Sale,Az értékesítés helyén
-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 Credit, akkor nem szabad beállítani ""egyensúlyt kell"", mint ""Tartozik"""
+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"
 DocType: Account,Balance must be,Egyensúlyt kell
 DocType: Hub Settings,Publish Pricing,Közzé Pricing
 DocType: Notification Control,Expense Claim Rejected Message,Elutasított igény indoklása
@@ -829,12 +840,12 @@
 DocType: Supplier Quotation,Is Subcontracted,Alvállalkozó által feldolgozandó?
 DocType: Item Attribute,Item Attribute Values,Elem attribútum-értékekben
 DocType: Examination Result,Examination Result,vizsgálati eredmény
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +756,Purchase Receipt,Vásárlási nyugta
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +735,Purchase Receipt,Vásárlási nyugta
 ,Received Items To Be Billed,Kapott elemek is fizetnie kell
 DocType: Employee,Ms,Hölgy
 apps/erpnext/erpnext/config/accounts.py +267,Currency exchange rate master.,Devizaárfolyam mester.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +167,Reference Doctype must be one of {0},Referencia Doctype közül kell {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +282,Unable to find Time Slot in the next {0} days for Operation {1},Nem található a Time Slot a következő {0} nap Operation {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +170,Reference Doctype must be one of {0},Referencia Doctype közül kell {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Unable to find Time Slot in the next {0} days for Operation {1},Nem található a Time Slot a következő {0} nap Operation {1}
 DocType: Production Order,Plan material for sub-assemblies,Terv anyagot részegységekre
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Értékesítési partnerek és Terület
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be active,BOM {0} aktívnak kell lennie
@@ -845,7 +856,7 @@
 DocType: Salary Slip,Leave Encashment Amount,Hagyja beváltása Összeg
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Serial No {0} nem tartozik Elem {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Kötelező Mennyiség
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +214,Warehouses with existing transaction can not be converted to ledger.,Raktárak meglévő ügylet nem konvertálható főkönyvi.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +217,Warehouses with existing transaction can not be converted to ledger.,Raktárak meglévő ügylet nem konvertálható főkönyvi.
 DocType: Bank Reconciliation,Total Amount,Összesen
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internet Publishing
 DocType: Production Planning Tool,Production Orders,Gyártási rendelések
@@ -859,9 +870,9 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,"Employee {0} nem aktív, vagy nem létezik"
 DocType: Fee Structure,Components,Alkatrészek
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,Please enter Asset Category in Item {0},"Kérjük, adja Asset Kategória Elem {0}"
-apps/erpnext/erpnext/stock/doctype/item/item.py +612,Item Variants {0} updated,Elem változatok {0} frissített
+apps/erpnext/erpnext/stock/doctype/item/item.py +614,Item Variants {0} updated,Elem változatok {0} frissített
 DocType: Quality Inspection Reading,Reading 6,Olvasás 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +843,Cannot {0} {1} {2} without any negative outstanding invoice,Nem lehet a {0} {1} {2} nélkül negatív kiemelkedő számla
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +854,Cannot {0} {1} {2} without any negative outstanding invoice,Nem lehet a {0} {1} {2} nélkül negatív kiemelkedő számla
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Vásárlást igazoló számlát Advance
 DocType: Address,Shop,Bolt
 DocType: Hub Settings,Sync Now,Szinkronizálás most
@@ -876,69 +887,72 @@
 DocType: Item,Is Purchase Item,Beszerzendő tétel?
 DocType: Asset,Purchase Invoice,Bejövő számla
 DocType: Stock Ledger Entry,Voucher Detail No,Utalvány Részlet No
-apps/erpnext/erpnext/accounts/page/pos/pos.js +728,New Sales Invoice,Új kimenő számla
+apps/erpnext/erpnext/accounts/page/pos/pos.js +710,New Sales Invoice,Új kimenő 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,Megnyitása és határidőt kell belül ugyanazon üzleti év
 DocType: Lead,Request for Information,Információkérés
+apps/erpnext/erpnext/accounts/page/pos/pos.js +728,Sync Offline Invoices,Szinkronizálás Offline számlák
 DocType: Payment Request,Paid,Fizetett
 DocType: Program Fee,Program Fee,Program díja
 DocType: Salary Slip,Total in words,Összesen szavakban
 DocType: Material Request Item,Lead Time Date,Átfutási idő dátuma
 DocType: Guardian,Guardian Name,Guardian neve
 DocType: Cheque Print Template,Has Print Format,Rendelkezik nyomtatási formátum
-apps/erpnext/erpnext/accounts/page/pos/pos.js +86, is mandatory. Maybe Currency Exchange record is not created for ,kötelező. Talán Pénzváltó rekord nem teremtett
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +109,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 +619,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Mert &quot;Termék Bundle&quot; tételek, raktár, Serial No és Batch Nem fogják tekinteni a &quot;Csomagolási lista&quot; táblázatban. Ha Warehouse és a Batch Nem vagyunk azonosak az összes csomagoljon bármely &quot;Product Bundle&quot; elemet, ezek az értékek bekerülnek a fő tétel asztal, értékek lesznek másolva &quot;Csomagolási lista&quot; táblázatban."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,kötelező. Talán Pénzváltó rekord nincs létrehozva 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 +613,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Mert &quot;Termék Bundle&quot; tételek, raktár, Serial No és Batch Nem fogják tekinteni a &quot;Csomagolási lista&quot; táblázatban. Ha Warehouse és a Batch Nem vagyunk azonosak az összes csomagoljon bármely &quot;Product Bundle&quot; elemet, ezek az értékek bekerülnek a fő tétel asztal, értékek lesznek másolva &quot;Csomagolási lista&quot; táblázatban."
 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 +606,Supplier Invoice Date cannot be greater than Posting Date,"Szállító Számla dátuma nem lehet nagyobb, mint Beküldés dátuma"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +609,Supplier Invoice Date cannot be greater than Posting Date,"Szállító Számla dátuma nem lehet nagyobb, mint Beküldés dátuma"
 DocType: Purchase Invoice Item,Purchase Order Item,Megrendelés Termék
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +130,Indirect Income,Közvetett jövedelem
 DocType: Cheque Print Template,Date Settings,Dátum beállítása
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Variancia
 ,Company Name,Cég neve
 DocType: SMS Center,Total Message(s),Teljes üzenet (ek)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +810,Select Item for Transfer,Válassza ki a tétel a Transfer
-DocType: Purchase Invoice,Additional Discount Percentage,További kedvezmény százalékos
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +789,Select Item for Transfer,Válassza ki a tétel a Transfer
+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 fiók vezetője a bank, ahol check rakódott le."
-DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Lehetővé teszi a felhasználó szerkesztheti árjegyzéke Rate tranzakciókban
+DocType: Selling Settings,Allow user to edit Price List Rate in transactions,"Lehetővé teszi, hogy a felhasználó szerkeszthesse az árjegyzék adókat a  tranzakciókban"
 DocType: Pricing Rule,Max Qty,Max Mennyiség
-DocType: Student Applicant,Father's Name,Apja neve
 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 +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,"Row {0}: Fizetés ellenében Sales / Megrendelés mindig fel kell tüntetni, előre"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Vegyi
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +686,All items have already been transferred for this Production Order.,"Összes példány már átadott, erre a gyártási utasítás."
+apps/erpnext/erpnext/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 Grade kód: {0} átfedi évfolyam időközönként más évfolyamon. Kérjük, ellenőrizze időközönként {0} és {1}, és próbálja újra"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +694,All items have already been transferred for this Production Order.,"Összes tétel már átadott, erre a gyártási utasítás."
 DocType: Process Payroll,Select Payroll Year and Month,"Válassza bérszámfejtés év, hónap"
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,Meter,Méter
 DocType: Workstation,Electricity Cost,Villamosenergia-költség
 DocType: HR Settings,Don't send Employee Birthday Reminders,Ne küldjön dolgozói születésnapi emlékeztetőt
-DocType: Opportunity,Walk In,Utcáról
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,Stock bejegyzések
 DocType: Item,Inspection Criteria,Vizsgálati szempontok
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,TRANSFERED
-apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,Töltsd fel fejléces és logo. (Ezeket lehet szerkeszteni később).
+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: Timesheet Detail,Bill,Számla
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,White,Fehér
-DocType: SMS Center,All Lead (Open),Minden Lead (Open)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +228,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})
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date is entered as past date,Következő Az értékcsökkenés dátuma tüntették múltbeli dátum
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +167,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 +731,Make ,Csinál
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,Make ,Csinál
+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 formájában. Kérjük, forduljon support@erpnext.com ha a probléma továbbra is fennáll."
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Kosár
-apps/erpnext/erpnext/controllers/selling_controller.py +154,Order Type must be one of {0},Megrendelni típusa közül kell {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Megrendelni típusa közül kell {0}
 DocType: Lead,Next Contact Date,Következő megbeszélés dátuma
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Nyitva Mennyiség
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +393,Please enter Account for Change Amount,"Kérjük, adja Számla Change Összeg"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,Please enter Account for Change Amount,"Kérjük, adja Számla Change Összeg"
 DocType: Student Batch,Student Batch Name,Student kötegnevet
 DocType: Holiday List,Holiday List Name,Szabadnapok listájának neve
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js +8,Schedule Course,Menetrend pálya
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Stock Options,Stock Options
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Stock Options
 DocType: Journal Entry Account,Expense Claim,Béremelési igény
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +211,Do you really want to restore this scrapped asset?,Tényleg azt szeretné visszaállítani ezt a kiselejtezett eszköz?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +237,Qty for {0},Mennyiség: {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +212,Do you really want to restore this scrapped asset?,Tényleg azt szeretné visszaállítani ezt a kiselejtezett eszköz?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,Qty for {0},Mennyiség: {0}
 DocType: Leave Application,Leave Application,Szabadságok
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Szabadság Lefoglaló Eszköz
 DocType: Leave Block List,Leave Block List Dates,Hagyja Block List dátuma
@@ -947,9 +961,9 @@
 DocType: Company,Default Terms,Alapértelmezett feltételek
 DocType: Packing Slip Item,Packing Slip Item,Csomagjegy tétel
 DocType: Purchase Invoice,Cash/Bank Account,Cash / Bank Account
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Az eltávolított elemek változása nélkül mennyiséget vagy értéket.
+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 az
-apps/erpnext/erpnext/stock/doctype/item/item.py +635,Attribute table is mandatory,Attribútum tábla kötelező
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Attribútum tábla kötelező
 DocType: Production Planning Tool,Get Sales Orders,Get Vevőmegrendelés
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} nem lehet negatív
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,"Kérjük, válassza ki a Student"
@@ -970,11 +984,11 @@
 DocType: Serial No,Creation Document No,Creation Document No
 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 Társaság
+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.","Attribútumait tétel változatok. 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 Warehouse
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Serial No {0} jelenleg karbantartás alatt áll szerződésben max {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},Serial No {0} jelenleg karbantartás alatt áll szerződésben max {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,Toborzás
 DocType: BOM Operation,Operation,Működés
 DocType: Lead,Organization Name,Szervezet neve
@@ -986,7 +1000,7 @@
 DocType: GL Entry,Against,Ellen
 DocType: Item,Default Selling Cost Center,Alapértelmezett Selling Cost Center
 DocType: Sales Partner,Implementation Partner,Kivitelező partner
-apps/erpnext/erpnext/controllers/selling_controller.py +231,Sales Order {0} is {1},Vevői {0} {1}
+apps/erpnext/erpnext/controllers/selling_controller.py +232,Sales Order {0} is {1},Vevői {0} {1}
 DocType: Opportunity,Contact Info,Kapcsolattartó infó
 apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,Így Stock bejegyzések
 DocType: Packing Slip,Net Weight UOM,Nettó súly mértékegysége
@@ -996,25 +1010,24 @@
 DocType: Holiday List,Get Weekly Off Dates,Get Off Heti dátuma
 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 a Start Date"
 DocType: Sales Person,Select company name first.,Válassza ki a cég nevét először.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Idézetek a szállítóktól kapott.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},{0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Á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 Önnel a jövőben"
 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 a szállítók. Ők lehetnek szervezetek vagy magánszemélyek.
-apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,Az összes termék megtekintése
+apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Az összes termék megtekintése
 DocType: Company,Default Currency,Alapértelmezett pénznem
 DocType: Contact,Enter designation of this Contact,Adja kijelölése ennek Kapcsolat
 DocType: Expense Claim,From Employee,Dolgozótól
-apps/erpnext/erpnext/controllers/accounts_controller.py +400,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Figyelmeztetés: A rendszer nem ellenőrzi overbilling hiszen összeget tétel {0} {1} nulla
+apps/erpnext/erpnext/controllers/accounts_controller.py +403,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Figyelmeztetés: A rendszer nem ellenőrzi overbilling hiszen összeget tétel {0} {1} nulla
 DocType: Journal Entry,Make Difference Entry,Különbözeti bejegyzés generálása
 DocType: Upload Attendance,Attendance From Date,Jelenléti 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 Képesség
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,év:
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +191,{0} {1} must be submitted,{0} {1} kell benyújtani
-DocType: Email Digest,Annual Expense,Éves költség
+apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,és év:
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,{0} {1} must be submitted,{0} {1} be kell nyújtani
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +145,Quantity must be less than or equal to {0},"Mennyiség kisebbnek kell lennie, vagy egyenlő, mint {0}"
 DocType: SMS Center,Total Characters,Összesen karakterek
 apps/erpnext/erpnext/controllers/buying_controller.py +156,Please select BOM in BOM field for Item {0},"Kérjük, válasszon BOM BOM területen jogcím {0}"
@@ -1025,45 +1038,46 @@
 DocType: Sales Partner,Distributor,Nagykereskedő
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Kosár Szállítási szabály
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +211,Production Order {0} must be cancelled before cancelling this Sales Order,Gyártási rendelés {0} törölni kell lemondása előtt ezt a Vevői rendelés
-apps/erpnext/erpnext/public/js/controllers/transaction.js +62,Please set 'Apply Additional Discount On',"Kérjük, állítsa be az &quot;Apply További kedvezmény&quot;"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',"Kérjük, állítsa be az &quot;Apply További kedvezmény&quot;"
 ,Ordered Items To Be Billed,Rendelt mennyiség számlázásra
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +39,From Range has to be less than To Range,Range kell lennie kisebb hatótávolsággal
 DocType: Global Defaults,Global Defaults,Általános beállítások
 apps/erpnext/erpnext/projects/doctype/project/project.py +153,Project Collaboration Invitation,Project Együttműködés Meghívó
 DocType: Salary Slip,Deductions,Levonások
+DocType: Leave Allocation,LAL/,LAL /
 apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,Kezdő év
 DocType: Purchase Invoice,Start date of current invoice's period,Kezdési időpont az aktuális számla időszaka
 DocType: Salary Slip,Leave Without Pay,Fizetés nélküli szabadságon
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +327,Capacity Planning Error,Kapacitás tervezés Error
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,Kapacitás tervezés Error
 ,Trial Balance for Party,Trial Balance Party
 DocType: Lead,Consultant,Szaktanácsadó
 DocType: Salary Slip,Earnings,Keresetek
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +362,Finished Item {0} must be entered for Manufacture type entry,Kész elem {0} kell beírni gyártása típusú bejegyzést
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +367,Finished Item {0} must be entered for Manufacture type entry,Kész elem {0} kell beírni gyártása típusú bejegyzést
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Nyitva Könyvelési egyenleg
 DocType: Sales Invoice Advance,Sales Invoice Advance,Kimenő számla előleg
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +499,Nothing to request,Nincs kérni
-apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',"""A tényleges kezdési dátum"" nem lehet nagyobb, mint a ""tényleges záró dátum"""
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Management,Vezetés
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},Vagy terhelés és jóváírás összegét szükséges {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +500,Nothing to request,Nincs kérni
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',"""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/accounts/doctype/gl_entry/gl_entry.py +55,Either debit or credit amount is required for {0},Vagy terhelés és jóváírás összegét szükséges {0}
 DocType: Cheque Print Template,Payer Settings,Payer 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 fűzve az Item Code a variáns. Például, ha a rövidítés ""SM"", és az elem kód ""T-shirt"", a cikk-kód a variáns lesz ""feliratú pólót-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Nettó Pay (szavakban) lesz látható, ha menteni a fizetés csúszik."
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,Blue,Kék
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Blue,Kék
 DocType: Purchase Invoice,Is Return,Van Return
 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 E-mail ID"
 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ámot, nos jogcím {1}"
+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/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Tételkód nem lehet megváltoztatni a Serial No.
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +23,POS Profile {0} already created for user: {1} and company {2},POS profil {0} már létrehozott felhasználói: {1} és a társaság {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM konverziós tényező
 DocType: Stock Settings,Default Item Group,Alapértelmezett árucsoport
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1374,Do you really want to submit the invoice?,"Tényleg azt akarjuk, hogy nyújtsa be a számlát?"
+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,Referencia név
 DocType: Account,Balance Sheet,Mérleg
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +685,Cost Center For Item with Item Code ',"Költség Center For elem Elem Code """
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1526,"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ód, vagy POS profil."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +679,Cost Center For Item with Item Code ',"Költség Center For elem Elem Code """
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1550,"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ód, vagy POS profil."
 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ő Ezen a napon a kapcsolatot az ügyféllel,"
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,"Further accounts can be made under Groups, but entries can be made against non-Groups","További számlák tehető alatt csoportjai, de bejegyzéseket lehet tenni ellene nem Csoportok"
 DocType: Lead,Lead,Célpont
@@ -1083,104 +1097,106 @@
 DocType: Payment Reconciliation,Unreconciled Payment Details,Nem egyeztetett fizetési részletek
 DocType: Global Defaults,Current Fiscal Year,Jelenlegi pénzügyi év
 DocType: Global Defaults,Disable Rounded Total,Kerekített összesen elrejtése
-DocType: Lead,Call,Hívás
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +417,'Entries' cannot be empty,"""Bejegyzések"" nem lehet üres"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +418,'Entries' cannot be empty,"""Bejegyzések"" nem lehet üres"
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},A {0} duplikált sor azonos ezzel: {1}
 ,Trial Balance,Trial Balance
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +214,Fiscal Year {0} not found,Pénzügyi év {0} nem található
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +221,Fiscal Year {0} not found,Pénzügyi év {0} nem található
 apps/erpnext/erpnext/config/hr.py +238,Setting up Employees,Alkalmazottak beállítása
 DocType: Sales Order,SO-,ÍGY-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,"Kérjük, válasszon prefix első"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Please select prefix first,"Kérjük, válasszon prefix első"
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Research,Kutatás
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,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 attribútum a tulajdonságok táblázatban
-DocType: Announcement,All Students,minden diák
+DocType: Announcement,All Students,Összes diák
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a non-stock item,"Elem {0} kell lennie, nem Raktárkészleten"
 DocType: Contact,User ID,Felhasználó ID
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +57,View Ledger,Könyvelés megtekintése
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Legkorábbi
-apps/erpnext/erpnext/stock/doctype/item/item.py +504,"An Item Group exists with same name, please change the item name or rename the item group","Egy tétel Group létezik azonos nevű, kérjük, változtassa meg az elem nevét, vagy nevezze át a tétel-csoportban"
+apps/erpnext/erpnext/stock/doctype/item/item.py +506,"An Item Group exists with same name, please change the item name or rename the item group","Egy tétel Group létezik azonos nevű, kérjük, változtassa meg az elem nevét, vagy nevezze át a tétel-csoportban"
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +437,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 Batch
 ,Budget Variance Report,Költségkeret Variance jelentés
 DocType: Salary Slip,Gross Pay,Bruttó fizetés
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +90,Row {0}: Activity Type is mandatory.,Sor {0}: tevékenység típusa kötelező.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +114,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,"Az osztalék,"
-apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Számviteli Ledger
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,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: BOM Item,Item Description,Az anyag leírása
+DocType: Student Sibling,Student Sibling,Student Testvér
 DocType: Purchase Invoice,Is Recurring,Ismétlődő
 DocType: Purchase Invoice,Supplied Items,A mellékelt tartozékok
 DocType: Student,STUD.,Stud.
 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,Fenntartani azonos ütemben egész vásárlási ciklus
 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át
 ,Employee Leave Balance,Munkavállalói Leave Balance
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +131,Balance for Account {0} must always be {1},Mérlegek Account {0} mindig legyen {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +175,Valuation Rate required for Item in row {0},Értékelés Rate szükséges tétel sorában {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,Balance for Account {0} must always be {1},Mérlegek Account {0} mindig legyen {1}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +176,Valuation Rate required for Item in row {0},Értékelés Rate szükséges tétel sorában {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: Masters in Computer Science
 DocType: Purchase Invoice,Rejected Warehouse,Elutasított raktár
-DocType: GL Entry,Against Voucher,Ellen utalvány
+DocType: GL Entry,Against Voucher,Ellen bizonylat
 DocType: Item,Default Buying Cost Center,Alapértelmezett Vásárlási 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.","Ahhoz, hogy a legjobbat hozza ki ERPNext, azt ajánljuk, hogy időbe telik, és nézni ezeket a videókat segítséget."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +87, to ,nak nek
+apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,nak nek
 DocType: Item,Lead Time in days,Átfutási idő nap
-,Accounts Payable Summary,A szállítói kötelezettségek összefoglalása
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Not authorized to edit frozen Account {0},Nem engedélyezett szerkeszteni befagyasztott számlára {0}
+,Accounts Payable Summary,A beszállítók felé kötelezettségeink összefoglalása
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},Nem engedélyezett szerkeszteni befagyasztott számlára {0}
 DocType: Journal Entry,Get Outstanding Invoices,Get kiváló számlák
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +62,Sales Order {0} is not valid,Vevői {0} nem érvényes
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Vevői {0} nem érvényes
 apps/erpnext/erpnext/setup/doctype/company/company.py +185,"Sorry, companies cannot be merged","Sajnáljuk, a vállalatok 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 téma / Transfer mennyiség {0} Anyaga kérése {1} \ nem lehet nagyobb, mint kért mennyiséget {2} jogcím {3}"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Small,Kis
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,Small,Kis
 DocType: Employee,Employee Number,Munkavállalói száma
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Case szám (ok) már használatban van. Próbálja a Case {0}
 ,Invoiced Amount (Exculsive Tax),Számlázott összeg (Exculsive Tax)
-DocType: Student Applicant,Mother's / Guardian 1 Email ID,Anyák / Guardian 1 E-mail azonosító
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,2. pont
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,Account fejét {0} létre
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +160,Green,Zöld
+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
 DocType: Supplier,SUPP-,mellékeltük
 DocType: Item,Auto re-order,Auto újra érdekében
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Összesen Elért
 DocType: Employee,Place of Issue,Probléma helye
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Contract,Szerződés
-DocType: Email Digest,Add Quote,Add Idézet
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +498,UOM coversion factor required for UOM: {0} in Item: {1},UOM coversion tényező szükséges UOM: {0} Cikk: {1}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,Szerződés
+DocType: Email Digest,Add Quote,Idézet hozzáadása
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +503,UOM coversion factor required for UOM: {0} in Item: {1},UOM coversion tényező szükséges UOM: {0} Cikk: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,Közvetett költségek
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +80,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,Row {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 +737,Sync Master Data,Szinkronizálás törzsadatok
+apps/erpnext/erpnext/accounts/page/pos/pos.js +719,Sync Master Data,Szinkronizálás törzsadatok
 apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,A termékek vagy szolgáltatások
 DocType: Mode of Payment,Mode of Payment,Fizetési mód
 apps/erpnext/erpnext/stock/doctype/item/item.py +178,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,BOM
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,"Ez egy gyökér tétel-csoportban, és nem lehet szerkeszteni."
+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-csoportban, és nem lehet szerkeszteni."
 DocType: Journal Entry Account,Purchase Order,Megrendelés
 DocType: Warehouse,Warehouse Contact Info,Raktári kapcsolattartó
 DocType: Payment Entry,Write Off Difference Amount,Írja Off Eltérés összege
 DocType: Purchase Invoice,Recurring Type,Gyakoriság
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +345,"{0}: Employee email not found, hence email not sent","{0}: Alkalmazott email nem található, ezért nem küldte email"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +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
 DocType: Email Digest,Annual Income,Éves jövedelem
 DocType: Serial No,Serial No Details,Sorozatszám adatai
 DocType: Purchase Invoice Item,Item Tax Rate,Az anyag adójának mértéke
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,"For {0}, only credit accounts can be linked against another debit entry","{0}, csak jóváírásokat lehet kapcsolni a másik ellen terheléssel"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Delivery Note {0} is not submitted,Szállítólevélen {0} nem nyújtják be
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Delivery Note {0} is not submitted,Szállítólevélen {0} nem nyújtják be
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Sub-contracted Item,Elem {0} kell egy Alvállalkozásban Elem
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Capital Felszereltség
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Árképzési szabály először alapján kiválasztott ""Apply"" mezőben, ami lehet pont, pont-csoport vagy a márka."
 DocType: Hub Settings,Seller Website,Eladó Website
 DocType: Item,ITEM-,TÉTEL-
-apps/erpnext/erpnext/controllers/selling_controller.py +147,Total allocated percentage for sales team should be 100,A teljes lefoglalt százalékos értékesítési csapatot kell 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +110,Production Order status is {0},Gyártási rendelés állapot {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,A teljes lefoglalt százalékos értékesítési csapatot kell 100
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Gyártási rendelés állapot {0}
 DocType: Appraisal Goal,Goal,Cél
 DocType: Sales Invoice Item,Edit Description,Leírás szerkesztése
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +757,For Supplier,A Szállító
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +723,For Supplier,A Szállító
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Beállítás Account Type segít kiválasztani ezt a számlát a tranzakció.
 DocType: Purchase Invoice,Grand Total (Company Currency),Mindösszesen (Társaság Currency)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Létrehozása nyomtatási formátum
@@ -1194,12 +1210,13 @@
 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,Sorozatszámot {0} belépett többször
 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} folyamatban
+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,Grade Code
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Összefoglaló email:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +445,BOM {0} does not belong to Item {1},BOM {0} nem tartozik Elem {1}
 DocType: Sales Partner,Target Distribution,Cél Distribution
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1667,Deafault warehouse is required for selected item,Deafault raktár van szükség a kiválasztott elem
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Deafault warehouse is required for selected item,Deafault raktár van szükség a kiválasztott elem
 DocType: Salary Slip,Bank Account No.,Bankszámla szám
 DocType: Naming Series,This is the number of the last created transaction with this prefix,"Ez az a szám, az utoljára létrehozott tranzakciós ilyen előtaggal"
 DocType: Quality Inspection Reading,Reading 8,Reading 8
@@ -1208,24 +1225,24 @@
 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,Árajánlatkérés Szállító
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Hardware,Hardver
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,Hardver
 DocType: Sales Order,Recurring Upto,ismétlődő Upto
 DocType: Attendance,HR Manager,HR menedzser
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,"Kérjük, válasszon egy cég"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Privilege Leave,Privilege Leave
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,Privilege Leave
 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 +79,You need to enable Shopping Cart,Akkor engedélyezze a kosárba
 DocType: Payment Entry,Writeoff,Írd le
 DocType: Appraisal Template Goal,Appraisal Template Goal,Teljesítmény értékelő sablon célja
-DocType: Salary Slip,Earning,Kereset
+DocType: Salary Component,Earning,Kereset
 DocType: Purchase Invoice,Party Account Currency,Fél számla pénzneme
 ,BOM Browser,Anyagjegyzék Listázó
-DocType: Purchase Taxes and Charges,Add or Deduct,Add vagy le lehet vonni
+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ételei között található:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +171,Against Journal Entry {0} is already adjusted against some other voucher,Ellen Naplókönyvelés {0} már értékével szemben néhány más voucher
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,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,Teljes megrendelési érték
-apps/erpnext/erpnext/demo/setup_data.py +358,Food,Élelmiszer
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Ageing tartomány 3
+apps/erpnext/erpnext/demo/setup/setup_data.py +301,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,Nem a látogatások
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.js +103,Mark Attendence,Mark Attendence
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Árfolyam a záró figyelembe kell {0}
@@ -1258,12 +1275,12 @@
 DocType: Sales Order Item,Planned Quantity,Tervezett mennyiség
 DocType: Purchase Invoice Item,Item Tax Amount,Az anyag adójának értéke
 DocType: Item,Maintain Stock,Fenntartani Stock
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +209,Stock Entries already created for Production Order ,Stock bejegyzés már létrehozott termelési rendelés
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,Stock bejegyzés már létrehozott termelési rendelés
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,Nettó változás állóeszköz-
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Hagyja üresen, ha figyelembe valamennyi megjelölés"
-apps/erpnext/erpnext/controllers/accounts_controller.py +620,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Charge típusú ""közvetlen"" sorában {0} nem lehet jogcím tartalmazza Rate"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,Max: {0},Max: {0}
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +15,From Datetime,Re Datetime
+apps/erpnext/erpnext/controllers/accounts_controller.py +623,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Charge típusú ""közvetlen"" sorában {0} nem lehet jogcím tartalmazza Rate"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +239,Max: {0},Max: {0}
+apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Re Datetime
 DocType: Email Digest,For Company,A Társaságnak
 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 +153,"Request for Quotation is disabled to access from portal, for more check portal settings.","Ajánlatkérés le van tiltva a hozzáférés portál, több ellenőrzés portál beállításokat."
@@ -1271,8 +1288,8 @@
 DocType: Sales Invoice,Shipping Address Name,Szállítási cím Név
 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 +552,cannot be greater than 100,"nem lehet nagyobb, mint 100"
-apps/erpnext/erpnext/stock/doctype/item/item.py +680,Item {0} is not a stock Item,Elem {0} nem Stock tétel
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +546,cannot be greater than 100,"nem lehet nagyobb, mint 100"
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is not a stock Item,Elem {0} nem Stock tétel
 DocType: Maintenance Visit,Unscheduled,Nem tervezett
 DocType: Employee,Owned,Tulajdon
 DocType: Salary Detail,Depends on Leave Without Pay,"Attól függ, fizetés nélküli szabadságon"
@@ -1281,21 +1298,20 @@
 DocType: Employee,Better Prospects,Jobb kilátásokat
 DocType: Appraisal,Goals,Célok
 DocType: Warranty Claim,Warranty / AMC Status,Garancia és éves karbantartási szerződés állapota
-,Accounts Browser,Számlák Browser
+,Accounts Browser,Számlák böngészője
 DocType: Payment Entry Reference,Payment Entry Reference,Fizetési Entry Referencia
 DocType: GL Entry,GL Entry,GL Entry
 DocType: HR Settings,Employee Settings,Munkavállalói beállítások
 ,Batch-Wise Balance History,Szakaszos Balance History
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Tennivalók listája
 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 +61,Apprentice,Ipari tanuló
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +102,Negative Quantity is not allowed,Negatív mennyiség nem megengedett
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,Ipari tanuló
+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észletesen táblázatban letöltésre a tételt mester, mint egy húr, és tárolja ezen a területen. Használt adók és illetékek"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +152,Employee cannot report to himself.,Munkavállaló 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 szabad korlátozni a felhasználók."
 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},Számviteli könyvelése {0}: {1} csak akkor lehet elvégezni a pénznem: {2}
+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}"
 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 tranzakciók.
@@ -1310,15 +1326,14 @@
 DocType: Asset,Asset Name,Eszköz neve
 DocType: Shipping Rule Condition,To Value,Hogy Érték
 DocType: Asset Movement,Stock Manager,Stock menedzser
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +141,Source warehouse is mandatory for row {0},Forrás raktárban kötelező sorban {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +719,Packing Slip,Csomagjegy
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Source warehouse is mandatory for row {0},Forrás raktárban kötelező sorban {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +713,Packing Slip,Csomagjegy
 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,Beállítás SMS gateway beállítások
-apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,Ajánlatkérés lehet hozzáférést kattintva következő link
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Az importálás nem sikerült!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Nem címre hozzá még.
 DocType: Workstation Working Hour,Workstation Working Hour,Munkaállomás munkaideje
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Analyst,Elemző
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,Elemző
 DocType: Item,Inventory,Leltár
 DocType: Item,Sales Details,Értékesítés részletei
 DocType: Quality Inspection,QI-,Qi
@@ -1326,7 +1341,7 @@
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,A Menny
 DocType: Notification Control,Expense Claim Rejected,Béremelési igény elutasítva
 DocType: Item Attribute,Item Attribute,Elem Attribútum
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +103,Government,Kormány
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,Kormány
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,Intézet neve
 apps/erpnext/erpnext/config/stock.py +289,Item Variants,Elem változatok
 DocType: Company,Services,Szolgáltatások
@@ -1342,6 +1357,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,Financial Year Start Date,Pénzügyi év kezdő dátuma
 DocType: POS Profile,Apply Discount,kedvezmény alkalmazása
 DocType: Employee External Work History,Total Experience,Összesen Experience
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70,Open Projects,Nyílt projektek
 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,Cash Flow Befektetési
 DocType: Program Course,Program Course,Program pálya
@@ -1355,7 +1371,7 @@
 DocType: Maintenance Schedule,Schedules,Menetrendek
 DocType: Purchase Invoice Item,Net Amount,Nettó Összege
 DocType: Purchase Order Item Supplied,BOM Detail No,Anyagjegyzék részlet száma
-DocType: Purchase Invoice,Additional Discount Amount (Company Currency),További kedvezmény összege (Társaság Currency)
+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 fiókot a számlatükör."
 DocType: Maintenance Visit,Maintenance Visit,Karbantartási látogatás
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Elérhető Batch Mennyiség a Warehouse
@@ -1382,12 +1398,12 @@
 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,Gyártási terv Vevői
 DocType: Sales Partner,Sales Partner Target,Értékesítő partner célja
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +110,Accounting Entry for {0} can only be made in currency: {1},Számviteli könyvelése {0} csak akkor lehet elvégezni a pénznem: {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},"Könyvelési tétel ehhez: {0}, csak ebben a pénznem végezhető: {1}"
 DocType: Pricing Rule,Pricing Rule,Árképzési szabály
-DocType: Budget,Action if Annual Budget Exceeded,"Eljárás, ha az éves költségvetési Meghaladta"
+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,Anyag Kérelem Megrendelés
 DocType: Shopping Cart Settings,Payment Success URL,Fizetési siker URL
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +78,Row # {0}: Returned Item {1} does not exists in {2} {3},Sor # {0}: Visszaküldött pont {1} nem létezik {2} {3}
+apps/erpnext/erpnext/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-,PREC-
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bankszámlák
 ,Bank Reconciliation Statement,Bank Megbékélés nyilatkozat
@@ -1395,43 +1411,42 @@
 ,POS,Értékesítési hely (POS)
 DocType: C-Form,III,III
 apps/erpnext/erpnext/config/stock.py +294,Opening Stock Balance,Nyitva Stock Balance
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +51,{0} must appear only once,{0} kell csak egyszer jelenik meg
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +339,Not allowed to tranfer more {0} than {1} against Purchase Order {2},"Nem szabad Tranfer több {0}, mint {1} ellen Megrendelés {2}"
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +51,{0} must appear only once,{0} csak egyszer kell megjelennie
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +344,Not allowed to tranfer more {0} than {1} against Purchase Order {2},"Nem szabad Tranfer több {0}, mint {1} ellen Megrendelés {2}"
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},A levelek foglalás sikeres {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Nincsenek tételek csomag
 DocType: Shipping Rule Condition,From Value,Értéktől
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +545,Manufacturing Quantity is mandatory,Gyártási mennyiség kötelező
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Gyártási mennyiség kötelező
 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 honlapján"
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Követelések cég költségén.
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +71,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},"Sor # {0}: Végső dátum {1} nem lehet, mielőtt Cheque Date {2}"
 DocType: Company,Default Holiday List,Alapértelmezett távolléti lista
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +162,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/projects/doctype/timesheet/timesheet.py +186,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,Stock 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 kérelmek, amelyek esetében Szállító idézetek nem jönnek 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 +130,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"A nap (ok) on, amelyre pályázik a szabadság szabadság. Nem kell alkalmazni a szabadság."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +137,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"A nap (ok) on, amelyre pályázik a szabadság szabadság. Nem kell alkalmazni a szabadság."
 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
 DocType: Dependent Task,Dependent Task,Függő Task
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,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/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 sorban {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,Leave of type {0} cannot be longer than {1},"Szabadság típusú {0} nem lehet hosszabb, mint {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +197,Leave of type {0} cannot be longer than {1},"Szabadság típusú {0} nem lehet hosszabb, mint {1}"
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Próbálja Tervezési tevékenység X nappal előre.
 DocType: HR Settings,Stop Birthday Reminders,Születésnapi emlékeztetők kikapcsolása
 DocType: SMS Center,Receiver List,Vevő lista
-apps/erpnext/erpnext/accounts/page/pos/pos.js +921,Search Item,Keresés Elem
+apps/erpnext/erpnext/accounts/page/pos/pos.js +910,Search Item,Keresés Elem
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Elfogyasztott
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +97,Net Change in Cash,Nettó 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értékegység {0} adta meg többször a konverziós tényező táblázat
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +546,Already completed,már elkészült
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +22,Payment Request already exists {0},Kifizetési kérelmet már létezik: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +550,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érelmet már létezik: {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Költsége Kiadott elemek
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +241,Quantity must not be more than {0},"Mennyiség nem lehet több, mint {0}"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Quantity must not be more than {0},"Mennyiség nem lehet több, mint {0}"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +76,Previous Financial Year is not closed,Előző pénzügyi év nem zárt
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +44,Age (Days),Életkor (nap)
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +44,Age (Days),Életkor (napok)
 DocType: Quotation Item,Quotation Item,Árajánlat tétele
 DocType: Account,Account Name,Számla név
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,"Dátum nem lehet nagyobb, mint dátuma"
@@ -1446,7 +1461,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +221,Purchase Receipt {0} is not submitted,Vásárlási nyugta {0} nem nyújtják be
 DocType: Company,Default Payable Account,Alapértelmezett fizetendő számla
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","A beállítások Online bevásárlókosár mint a hajózás szabályait, árlistát stb"
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +83,{0}% Billed,{0}% számlázott
+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,Párt Account
 apps/erpnext/erpnext/config/setup.py +116,Human Resources,Emberi erőforrások
@@ -1458,12 +1473,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Row {0}: Advance against Supplier must be debit,Sor {0}: Advance ellen Szállító kell megterhelni
 DocType: Company,Default Values,Alapértelmezett értékek
 DocType: Expense Claim,Total Amount Reimbursed,Megtérített teljes összeg
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +22,Collect,Gyűjt
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,Against Supplier Invoice {0} dated {1},Ellen Szállító Számla {0} dátuma {1}
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Gyűjt
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,Against Supplier Invoice {0} dated {1},Szállító Ellenszámla {0} dátuma {1}
 DocType: Customer,Default Price List,Alapértelmezett árjegyzék
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +225,Asset Movement record {0} created,Asset mozgás rekord {0} létrehozott
 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 Pénzügyi év: {0}. Pénzügyi év {0} az alapértelmezett beállítás, a Globális beállítások"
-DocType: Payment Reconciliation,Payments,Kifizetések
 DocType: Journal Entry,Entry Type,Bejegyzés típusa
 ,Customer Credit Balance,Customer Credit Balance
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Payable,Nettó Szállítói kötelezettségek változása
@@ -1475,7 +1489,7 @@
 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 Az (nap)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +9,Procurement,Beszerzés
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,"Egyik példány bármilyen változás mennyisége, illetve értéke."
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,"Egyik példány bármilyen változás mennyisége, illetve értéke."
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +32,Warranty Claim,Jótállási igény
 ,Lead Details,Célpont adatai
 DocType: Purchase Invoice,End date of current invoice's period,A befejezés dátuma az aktuális számla időszaka
@@ -1492,7 +1506,7 @@
 DocType: Shopping Cart Settings,Enable Shopping Cart,Bevásárló kosár engedélyezése
 DocType: Employee,Permanent Address,Állandó lakcím
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,"Advance paid against {0} {1} cannot be greater \
-						than Grand Total {2}","A kifizetett előleg ellen {0} {1} nem lehet nagyobb, \ mint Mindösszesen {2}"
+						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 az elemet kódot"
 DocType: Territory,Territory Manager,Területi igazgató
 DocType: Packed Item,To Warehouse (Optional),A Warehouse (opcionális)
@@ -1500,7 +1514,7 @@
 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 +97,Please specify either Quantity or Valuation Rate or both,"Kérjük, adja meg sem mennyiség vagy Értékelési Rate, vagy mindkettő"
+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 sem mennyiség vagy Értékelési Rate, vagy mindkettő"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +13,Fulfillment,Teljesítés
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Cég, hónap és költségvetési évben kötelező"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Marketing költségek
@@ -1521,14 +1535,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,ERPNext beállítása befejeződött!
 DocType: Item,Weightage,Súlyozás
 DocType: Packing Slip,PS-,PS
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +93,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Az ügyfélszolgálati csoport létezik azonos nevű kérjük, változtassa meg az Ügyfél nevét vagy nevezze át a Vásárlói csoport"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +126,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Egy vásárlói csoport létezik azonos névvel, kérjük változtassa meg a Vásárló nevét vagy nevezze át a Vásárlói csoportot"
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Új Kapcsolat
 DocType: Territory,Parent Territory,Szülő Terület
 DocType: Quality Inspection Reading,Reading 2,Reading 2
 DocType: Stock Entry,Material Receipt,Anyag bevételezése
 DocType: Homepage,Products,Termékek
 DocType: Announcement,Instructor,Oktató
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},Párt típusa és fél köteles a követelések / kötelezettségek figyelembe {0}
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Ha ennek az elemnek a változatokat, akkor nem lehet kiválasztani a vevői rendelések stb"
 DocType: Lead,Next Contact By,Next Kapcsolat
@@ -1539,7 +1552,7 @@
 ,Item-wise Sales Register,Elem-bölcs Sales Regisztráció
 DocType: Asset,Gross Purchase Amount,Bruttó Vásárlás összege
 DocType: Asset,Depreciation Method,Értékcsökkenési módszer
-apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Offline,Offline
+apps/erpnext/erpnext/accounts/page/pos/pos.js +686,Offline,Offline
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Ez adó az árban Basic Rate?
 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
@@ -1549,7 +1562,7 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Megbékélés 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
-DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Hogy több értékesítési megrendelések ellen ügyfél Megrendelés
+DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Többszöri Vásárlói megrendelések engedélyezése egy Beszerzési megrendelés ellen
 apps/erpnext/erpnext/setup/doctype/company/company.py +164,Main,Legfontosabb
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Variant,Variáns
 DocType: Naming Series,Set prefix for numbering series on your transactions,Előtagja a számozás sorozat a tranzakciók
@@ -1557,25 +1570,27 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +425,Default BOM ({0}) must be active for this item or its template,"Alapértelmezett BOM ({0}) aktívnak kell lennie ehhez a termékhez, vagy a sablon"
 DocType: Employee,Leave Encashed?,Hagyja beváltásának módjáról?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Lehetőség A mező kitöltése kötelező
+DocType: Email Digest,Annual Expenses,éves költségek
 DocType: Item,Variants,Változatok
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +858,Make Purchase Order,Beszerzési rendelés készítése
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +852,Make Purchase Order,Beszerzési rendelés készítése
 DocType: SMS Center,Send To,Címzett
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,There is not enough leave balance for Leave Type {0},Nincs elég szabadság mérlege Leave Type {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,There is not enough leave balance for Leave Type {0},Nincs elég szabadság mérlege Leave Type {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Lekötött összeg
 DocType: Sales Team,Contribution to Net Total,Hozzájárulás a Net Total
 DocType: Sales Invoice Item,Customer's Item Code,Vevő cikkszáma
 DocType: Stock Reconciliation,Stock Reconciliation,Készlet egyeztetés
 DocType: Territory,Territory Name,Terület neve
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +172,Work-in-Progress Warehouse is required before Submit,"Work in progress Warehouse van szükség, mielőtt beküldése"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,Work-in-Progress Warehouse is required before Submit,"Work in progress Warehouse van szükség, mielőtt beküldése"
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Kérelmező a munkát.
 DocType: Purchase Order Item,Warehouse and Reference,Raktár és Referencia
 DocType: Supplier,Statutory info and other general information about your Supplier,Törvényes info és más általános információkat közöl Szállító
-apps/erpnext/erpnext/hooks.py +88,Addresses,Címek
-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/payment_entry/payment_entry.py +212,Against Journal Entry {0} does not have any unmatched {1} entry,Ellen Naplókönyvelés {0} nem rendelkezik páratlan {1} bejegyzést
+apps/erpnext/erpnext/hooks.py +95,Addresses,Címek
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +215,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},Duplikált sorozatszám lett beírva ehhez a tételhez: {0}
-DocType: Shipping Rule Condition,A condition for a Shipping Rule,Ennek feltétele a szállítási szabály
+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,gólszerző
 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 alapján pont vagy a Warehouse"
 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 összege nettó tömege tételek)
 DocType: Sales Order,To Deliver and Bill,Szállítani és Bill
@@ -1583,31 +1598,30 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} must be submitted,BOM {0} be kell nyújtani
 DocType: Authorization Control,Authorization Control,Felhatalmazásvezé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 +731,Payment,Fizetés
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,Payment,Fizetés
 DocType: Production Order Operation,Actual Time and Cost,Tényleges idő és költség
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Anyag kérésére legfeljebb {0} tehető jogcím {1} ellen Vevői {2}
 DocType: Employee,Salutation,Megszólítás
-DocType: Pricing Rule,Brand,Márka
 DocType: Course,Course Abbreviation,természetesen rövidítés
 DocType: Item,Will also apply for variants,Kell alkalmazni a változatok
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +142,"Asset cannot be cancelled, as it is already {0}","Eszközt nem lehet törölni, mivel ez már {0}"
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,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.,Bundle tételek idején eladó.
-DocType: Quotation Item,Actual Qty,Aktuális db.
+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 termékeket vagy szolgáltatásokat vásárol vagy eladni. Ügyeljen arra, hogy a tétel Group, mértékegység és egyéb tulajdonságait, amikor elkezdi."
 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.,"Megadta ismétlődő elemek. Kérjük orvosolja, és próbálja újra."
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Associate,Társult
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Associate,Társult
 DocType: Asset Movement,Asset Movement,Eszköz Mozgalom
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Elem {0} nem folytatásos tétel
 DocType: SMS Center,Create Receiver List,Címzettlista létrehozása
 DocType: Packing Slip,To Package No.,A csomag No.
 DocType: Production Planning Tool,Material Requests,Anyaga kérések
 DocType: Warranty Claim,Issue Date,Probléma dátuma
-DocType: Activity Cost,Activity Cost,Activity költség
-DocType: Timesheet Detail,Timesheet Detail,timesheet részlet
+DocType: Activity Cost,Activity Cost,Tevékenység költsége
+DocType: Sales Invoice Timesheet,Timesheet Detail,timesheet részlet
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Fogyasztott Mennyiség
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Távközlési
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Azt jelzi, hogy a csomag egy része ennek a szállítási (Csak tervezet)"
@@ -1630,6 +1644,7 @@
 DocType: Production Plan Material Request,Material Request Date,Anyaga igénylés dátuma
 DocType: Purchase Order Item,Supplier Quotation Item,Beszállítói ajánlat tétel
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Kikapcsolja létrehozása időt naplóid gyártási megrendeléseket. Műveletek nem lehet nyomon követni ellenében rendelés
+DocType: Student,Student Mobile Number,Student mobil szám
 DocType: Item,Has Variants,Van-e változatok
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nevét az havi megoszlása
 DocType: Sales Person,Parent Sales Person,Szülő Értékesítői
@@ -1642,37 +1657,38 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +233,Fixed Asset Item must be a non-stock item.,"Befektetett eszközök tételeire kell lennie, nem készlet elemet."
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +44,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Költségvetést nem lehet rendelni ellen {0}, mivel ez nem egy bevétel vagy ráfordítás figyelembe"
 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,Alkalmazási mód
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Terület / Ügyfél
 apps/erpnext/erpnext/public/js/setup_wizard.js +227,e.g. 5,pl. 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},"Row {0}: elkülönített összege {1} kisebbnek kell lennie, vagy egyenlő számlázni fennálló összeg {2}"
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,A szavak lesz látható mentése után a kereskedelmi számla.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +502,Error: {0} &gt; {1},Hiba: {0}&gt; {1}
 DocType: Item,Is Sales Item,Eladható tétel?
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Tétel csoportfa
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Elem {0} nem beállítás Serial Nos. Ellenőrizze tétel mester
 DocType: Maintenance Visit,Maintenance Time,Karbantartási idő
 ,Amount to Deliver,Összeget Deliver
 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ő dátuma a tanév, amelyre a kifejezés kapcsolódik (Tanév {}). Kérjük javítsa ki a dátumot, és próbálja újra."
 DocType: Naming Series,Current Value,Jelenlegi érték
-apps/erpnext/erpnext/controllers/accounts_controller.py +235,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ég pénzügyi évben"
+apps/erpnext/erpnext/controllers/accounts_controller.py +238,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ég 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
+DocType: Delivery Note Item,Against Sales Order,Ellen Vevői megrendelések
 ,Serial No Status,Sorozatszám állapota
 DocType: Payment Entry Reference,Outstanding,Kiemelkedő
 ,Daily Timesheet Summary,Napi összefoglaló Időnyilvántartó
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +458,Item table can not be blank,Az Anyagok rész nem lehet üres
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +443,Item table can not be blank,Az Anyagok rész 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 +5,This is based on stock movement. See {0} for details,Ennek alapja az állomány mozgását. Lásd {0} részletekért
 DocType: Pricing Rule,Selling,Értékesítés
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +341,Amount {0} {1} deducted against {2},Összeg: {0} {1} levonásra ellen {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +344,Amount {0} {1} deducted against {2},Összeg: {0} {1} levonásra ellen {2}
 DocType: Employee,Salary Information,Bérinformáció
 DocType: Sales Person,Name and Employee ID,Neve és dolgozói azonosító
 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
 DocType: Website Item Group,Website Item Group,Weboldal Termék Csoport
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +147,Duties and Taxes,Vámok és adók
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,Please enter Reference date,"Kérjük, adja Hivatkozási dátum"
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} fizetési bejegyzéseket nem lehet szűrni {1}
+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 a tétel, amely megjelenik a Web Site"
 DocType: Purchase Order Item Supplied,Supplied Qty,Mellékelt Mennyiség
 DocType: Purchase Order Item,Material Request Item,Anyagigénylés tétel
@@ -1680,8 +1696,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +144,Cannot refer row number greater than or equal to current row number for this Charge type,"Nem lehet hivatkozni sor száma nagyobb vagy egyenlő, mint aktuális sor számát erre a Charge típusú"
 DocType: Asset,Sold,Eladott
 ,Item-wise Purchase History,Elem-bölcs Vásárlási előzmények
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Red,Piros
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Kérjük, kattintson a ""Létrehoz Menetrend"", hogy hozza Serial No hozzá jogcím {0}"
+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 ""Létrehoz Menetrend"", hogy hozza Serial No hozzá jogcím {0}"
 DocType: Account,Frozen,Zárolt
 ,Open Production Orders,Nyitott gyártási rendelések
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Base összeg (Company pénzneme)
@@ -1689,11 +1705,11 @@
 DocType: Installation Note,Installation Time,Telepítési idő
 DocType: Sales Invoice,Accounting Details,Számviteli Részletek
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,Törölje az összes tranzakciók erre Társaság
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +187,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,"Row # {0}: Operation {1} nem fejeződik be a {2} Mennyiség késztermékek a gyártási utasítás # {3}. Kérjük, frissítse az operációs státuszt keresztül Time Naplók"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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,"Row # {0}: Operation {1} nem fejeződik be a {2} Mennyiség késztermékek a gyártási utasítás # {3}. Kérjük, frissítse az operációs státuszt keresztül Time Naplók"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,Befektetések
 DocType: Issue,Resolution Details,Megoldás részletei
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,A kiosztandó
-DocType: Quality Inspection Reading,Acceptance Criteria,Elfogadási határ
+DocType: Quality Inspection Reading,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 anyag kérelmeket a fenti táblázatban"
 DocType: Item Attribute,Attribute Name,Jellemző neve
 DocType: Item Group,Show In Website,Weboldalon megjelenjen
@@ -1704,7 +1720,7 @@
 apps/erpnext/erpnext/config/projects.py +25,Gantt chart of all tasks.,Minden feladat egy Gantt diagramon.
 DocType: Opportunity,Mins to First Response,Perc a First Response
 DocType: Pricing Rule,Margin Type,Margó típus
-apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} óra
+apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} óra(k)
 DocType: Appraisal,For Employee Name,Az alkalmazott neve
 DocType: Holiday List,Clear Table,Tábla törlése
 DocType: C-Form Invoice Detail,Invoice No,Számlát nem
@@ -1719,22 +1735,23 @@
 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 leszűrjük alapján mennyiséget.
 DocType: Task,Total Billing Amount (via Time Sheet),Összesen számlázási összeg (via Idő Sheet)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,A törzsvásárlói Revenue
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +50,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) kell szerepet költségére Jóváhagyó """
+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ó' szereppel kell rendelkeznie
 apps/erpnext/erpnext/public/js/setup_wizard.js +298,Pair,Pár
 DocType: Asset,Depreciation Schedule,Az értékcsökkenési leírás ütemezése
 DocType: Bank Reconciliation Detail,Against Account,Ellen számla
-DocType: Maintenance Schedule Detail,Actual Date,Tényleges dátuma
+DocType: Maintenance Schedule Detail,Actual Date,Jelenlegi dátum
 DocType: Item,Has Batch No,Lesz kötegszáma?
+apps/erpnext/erpnext/public/js/utils.js +114,Annual Billing: {0},Éves számlázás: {0}
 DocType: Delivery Note,Excise Page Number,Jövedéki Oldal száma
 DocType: Asset,Purchase Date,Vásárlás időpontja
 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 &quot;értékcsökkenés Költségközpont&quot; a Társaság {0}"
 ,Maintenance Schedules,Karbantartási ütemezések
-DocType: Task,Actual End Date (via Time Sheet),Tényleges befejezés dátuma (via Idő Sheet)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Amount {0} {1} against {2} {3},Összeg: {0} {1} ellen {2} {3}
+DocType: Task,Actual End Date (via Time Sheet),Tényleges befejezés dátuma (Idő űrlap alapján)
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +339,Amount {0} {1} against {2} {3},Összeg: {0} {1} ellen {2} {3}
 ,Quotation Trends,Idézet Trends
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},Elem Csoport nem említett elem mestere jogcím {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +295,Debit To account must be a Receivable account,Megterhelése figyelembe kell venni a követelések között
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Receivable account,Megterhelése figyelembe kell venni a követelések között
 DocType: Shipping Rule Condition,Shipping Amount,Szállítandó mennyiség
 ,Pending Amount,Függőben lévő összeg
 DocType: Purchase Invoice Item,Conversion Factor,Konverziós tényező
@@ -1742,10 +1759,10 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +137,Expected value after useful life must be greater than or equal to {0},"Várható érték után hasznos élettartam 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 fognak megállítani"
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +90,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,"Összes elkülönített levelek {0} nem lehet kevesebb, mint a már jóváhagyott levelek {1} időszakra"
-DocType: Journal Entry,Accounts Receivable,Vevőkövetelések
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +93,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,"Összes elkülönített levelek {0} nem lehet kevesebb, mint a már jóváhagyott levelek {1} időszakra"
+DocType: Journal Entry,Accounts Receivable,Követelés számlák
 ,Supplier-Wise Sales Analytics,Beszállítói Wise Sales Analytics
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +22,Enter Paid Amount,Írja befizetett összeg
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,Írja befizetett összeg
 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,Select alkalmazottak jelenlegi bérrendszer
 DocType: Production Order,Use Multi-Level BOM,Többszíntű anyagjegyzék
@@ -1755,34 +1772,38 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,Munkaidőnyilvántartók
 DocType: HR Settings,HR Settings,Munkaügyi beállítások
 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 +524,"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álja külön sorban több menny."
+apps/erpnext/erpnext/controllers/accounts_controller.py +527,"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álja külön sorban több menny."
 DocType: Leave Block List Allow,Leave Block List Allow,Hagyja Block List engedélyezése
-apps/erpnext/erpnext/setup/doctype/company/company.py +249,Abbr can not be blank or space,Rövidített nem lehet üres vagy hely
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,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üli
 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,Összesen Aktuális
+DocType: Student Siblings,Student Siblings,Student Testvérek
 apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,Egység
 apps/erpnext/erpnext/stock/get_item_details.py +123,Please specify Company,Kérem adja meg a Cég nevét
 ,Customer Acquisition and Loyalty,Ügyfélszerzés és hűség
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,"Raktár, ahol fenntartják állomány visszautasított tételek"
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,A pénzügyi év vége on
 DocType: POS Profile,Price List,Árlista
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} most az alapértelmezett pénzügyi évben. Kérjük, frissítse böngészőjét, hogy a változtatások életbe léptetéséhez."
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} ez most az alapértelmezett Költségvetési Év. Kérjük, frissítse böngészőjét a változtatások életbeléptetéséhez."
 apps/erpnext/erpnext/projects/doctype/task/task.js +26,Expense Claims,Költségtérítési igényeket
 DocType: Issue,Support,Támogatás
 ,BOM Search,Anyagjegyzék Keresés
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Closing (Opening + Totals),Zárás (nyitás + összesítések)
+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/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,"Kérjük, adja valuta Társaság"
 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},"Stock egyensúly Batch {0} negatívvá válik {1} jogcím {2} 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 kérések merültek fel alapján automatikusan Termék újra, hogy szinten"
-apps/erpnext/erpnext/controllers/accounts_controller.py +272,Account {0} is invalid. Account Currency must be {1},Fiók {0} érvénytelen. A fiók pénzneme legyen {1}
+DocType: Email Digest,Pending Sales Orders,Függő Vevői rendelések
+apps/erpnext/erpnext/controllers/accounts_controller.py +275,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},UOM átváltási arányra is szükség sorában {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +956,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Sor # {0}: Reference Document Type közül kell Sales Order, eladást igazoló számla vagy Naplókönyvelés"
-DocType: Salary Slip,Deduction,Levonás
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +87,Row {0}: From Time and To Time is mandatory.,Sor {0}: From Time és időre kötelező.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +969,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Sor # {0}: Reference Document Type közül kell Sales Order, eladást igazoló számla vagy Naplókönyvelés"
+DocType: Salary Component,Deduction,Levonás
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +111,Row {0}: From Time and To Time is mandatory.,Sor {0}: From Time és időre kötelező.
+DocType: Stock Reconciliation Item,Amount Difference,összeg különbség
 apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},Elem Ár hozzáadott {0} árjegyzéke {1}
 DocType: Address Template,Address Template,Címlista sablon
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +7,Please enter Employee Id of this sales person,"Kérjük, adja Alkalmazott Id e üzletkötő"
@@ -1790,7 +1811,7 @@
 DocType: Project,% Tasks Completed,% Feladat Elvégezve
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,Eltérés összege nullának kell lennie
 DocType: Project,Gross Margin,Bruttó árrés
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +194,Please enter Production Item first,"Kérjük, adja Production pont első"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +195,Please enter Production Item first,"Kérjük, adja Production pont első"
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Számított Bankkivonat egyensúly
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,letiltott felhasználó
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Árajánlat
@@ -1799,53 +1820,54 @@
 DocType: Maintenance Visit,Maintenance User,Karbantartás Felhasználó
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +149,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 +86,Item {0} has already been returned,Elem {0} már visszatért
-DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,"** Pénzügyi év ** az adott pénzügyi évben. Minden könyvelési tétel, és más jelentős tranzakciókat nyomon elleni ** pénzügyi év **."
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +123,Item {0} has already been returned,Elem {0} már visszatért
+DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,"** Pénzügyi év ** 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ő / Célpont 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 mellékletet {0}
+DocType: Student Admission,Eligibility,Jogosultság
 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 +177,Job Description,Munkaleírás
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,Job Description,Munkaleírás
 DocType: Student Applicant,Applied,Alkalmazott
 DocType: Purchase Order Item,Qty as per Stock UOM,Mennyiség mint egy Stock UOM
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Speciális karakterek kivételével ""-"", ""#"", ""."" és a ""/"" nem engedélyezett elnevezési sorozat"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Speciális karakterek kivételével ""-"", ""#"", ""."" és a ""/"" nem engedélyezett elnevezési sorozat"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Kövesse nyomon az értékesítési kampányok. Kövesse nyomon az érdeklődők, idézetek, vevői rendelés, stb a kampányok felmérni Return on Investment."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +24,Welcome to POS: Create your POS Profile,Üdvözöljük a POS: Készítse el a POS Profile
 DocType: Expense Claim,Approver,Jóváhagyó
 ,SO Qty,SO Mennyiség
+DocType: Guardian,Work Address,Munkahelyi cím
 DocType: Appraisal,Calculate Total Score,Számolja ki Total Score
 DocType: Request for Quotation,Manufacturing Manager,Gyártási menedzser
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serial No {0} még garanciális max {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},Serial No {0} még garanciális max {1}
 apps/erpnext/erpnext/config/stock.py +153,Split Delivery Note into packages.,Osztott szállítólevél csomagokat.
-apps/erpnext/erpnext/hooks.py +74,Shipments,Szállítások
+apps/erpnext/erpnext/hooks.py +81,Shipments,Szállítások
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Kiutalt teljes összeg (Company pénzneme)
 DocType: Purchase Order Item,To be delivered to customer,Be kell nyújtani az ügyfél
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Soros {0} nem tartozik semmilyen Warehouse
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,Row # ,Sor #
+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 +156,Get From,Kap
+apps/erpnext/erpnext/public/js/utils.js +167,Get From,Kap
 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 +167,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Költség vagy Difference számla kötelező tétel {0} kifejtett hatása miatt teljes állomány értéke
-apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Nem overbill jogcím {0} sorban {1} több mint {2}. Ahhoz, hogy overbilling, kérjük beállított Stock Beállítások"
+apps/erpnext/erpnext/controllers/accounts_controller.py +419,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Nem overbill jogcím {0} sorban {1} több mint {2}. Ahhoz, hogy overbilling, kérjük beállított Stock Beállítások"
+DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,Bank neve
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Felett
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} is disabled,A(z) {0} felhasználó tiltva
 DocType: Leave Application,Total Leave Days,Teljes szabadság napjait
 DocType: Email Digest,Note: Email will not be sent to disabled users,Megjegyzés: E-mail nem lesz elküldve a fogyatékkal élő felhasználók számára
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,Válassza ki Company ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,"Hagyja üresen, ha venni valamennyi szervezeti egység"
 apps/erpnext/erpnext/config/hr.py +171,"Types of employment (permanent, contract, intern etc.).","Típusú foglalkoztatás (munkaidős, szerződéses, gyakornok stb)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +346,{0} is mandatory for Item {1},{0} kötelező tétel {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,{0} is mandatory for Item {1},{0} kötelező a(z) {1} tételnek
 DocType: Currency Exchange,From Currency,Deviza-
 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ípusa és számlaszámra adni legalább egy sorban"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,Költsége új vásárlás
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},Vevői szükséges Elem {0}
 DocType: Purchase Invoice Item,Rate (Company Currency),Érték (a cég pénznemében)
-apps/erpnext/erpnext/demo/setup_data.py +360,Others,Egyéb
+DocType: Student Guardian,Others,Egyéb
 DocType: Payment Entry,Unallocated Amount,A fel nem osztott összeg
 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ék {0}."
 DocType: POS Profile,Taxes and Charges,Adók és költségek
@@ -1860,22 +1882,21 @@
 DocType: Quality Inspection,In Process,In Process
 DocType: Authorization Rule,Itemwise Discount,Itemwise Kedvezmény
 apps/erpnext/erpnext/config/accounts.py +69,Tree of financial accounts.,Fája pénzügyi számlák.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,{0} against Sales Order {1},{0} ellen Vevői {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,{0} against Sales Order {1},{0} a {1} Vevői megrendelés ellen
 DocType: Account,Fixed Asset,Az állóeszköz-
 apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,Serialized Inventory
 DocType: Activity Type,Default Billing Rate,Alapértelmezett díjszabás
 DocType: Sales Invoice,Total Billing Amount,Összesen Számlázási összeg
-apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +54,Receivable Account,Követelések Account
-apps/erpnext/erpnext/controllers/accounts_controller.py +546,Row #{0}: Asset {1} is already {2},Sor # {0}: Asset {1} {2} már
+apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,Követelések Account
+apps/erpnext/erpnext/controllers/accounts_controller.py +549,Row #{0}: Asset {1} is already {2},Sor # {0}: Asset {1} {2} már
 DocType: Quotation Item,Stock Balance,Készlet egyenleg
 apps/erpnext/erpnext/config/selling.py +302,Sales Order to Payment,Vevői rendelés Fizetési
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +79,CEO,vezérigazgató
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,vezérigazgató
 DocType: Expense Claim Detail,Expense Claim Detail,Béremelés részlete
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +808,Please select correct account,"Kérjük, válassza ki a megfelelő fiókot"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +809,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,Bérrendszer Alkalmazott
 DocType: Employee,Blood Group,Vércsoport
-DocType: Purchase Invoice Item,Page Break,Oldaltörés
 DocType: Production Order Operation,Pending,Függő
 DocType: Course,Course Name,A tantárgy neve
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"A felhasználók, akik engedélyt egy bizonyos munkavállalói szabadság alkalmazások"
@@ -1884,14 +1905,15 @@
 DocType: Fiscal Year,Companies,Cégek
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Elektronika
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,"Emelje Material kérése, amikor állomány eléri újra, hogy szinten"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Full-time,Teljes munkaidőben
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Full-time,Teljes munkaidőben
 DocType: Salary Structure,Employees,Az alkalmazottak
 DocType: Employee,Contact Details,Kapcsolattartó részletei
 DocType: C-Form,Received Date,Kapott 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 sablon értékesítéshez kapcsolódó adók és díjak sablon, válasszon egyet és kattintson az alábbi gombra."
+DocType: Student,Guardians,Guardians
 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ály vagy ellenőrizze Világszerte Szállítási
 DocType: Stock Entry,Total Incoming Value,A bejövő Érték
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Debit To is required,Megterhelése szükséges
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +321,Debit To is required,Megterhelése szükséges
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Vételár listája
 DocType: Offer Letter Term,Offer Term,Ajánlat Term
 DocType: Quality Inspection,Quality Manager,Minőségbiztosítási vezető
@@ -1899,7 +1921,8 @@
 DocType: Payment Reconciliation,Payment Reconciliation,Fizetési Megbékélés
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,"Kérjük, válasszon incharge személy nevét"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Technológia
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Ajánlat Letter
+apps/erpnext/erpnext/public/js/utils.js +116,Total Unpaid: {0},Összesen Kifizetetlen: {0}
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Ajánlat levél
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Létrehoz Material kérelmeket (MRP) és a gyártási megrendeléseket.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +65,Total Invoiced Amt,Teljes kiszámlázott Amt
 DocType: Timesheet Detail,To Time,Az Idő
@@ -1909,18 +1932,17 @@
 DocType: Production Order Operation,Completed Qty,Befejezett Mennyiség
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"For {0}, only debit accounts can be linked against another credit entry","{0}, csak betéti számlák köthető másik ellen jóváírás"
 apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,Árlista {0} van tiltva
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +99,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,Hagyjuk Túlóra
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} sorozatszám szükséges jogcím {1}. Megadta {2}.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +123,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
+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és Rate
 DocType: Item,Customer Item Codes,Vásárlói pont 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 Reason
-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/public/js/templates/address_list.html +1,New Address,Új cím
 DocType: Quality Inspection,Sample Size,A minta mérete
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Receipt Document,"Kérjük, adja átvétele dokumentum"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +378,All items have already been invoiced,Összes példány már kiszámlázott
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +379,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 'A 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,További költség központok tehető alatt Csoportok de bejegyzéseket lehet tenni ellene nem Csoportok
 DocType: Project,External,Külső
@@ -1936,18 +1958,19 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Az ügyfelek
 apps/erpnext/erpnext/projects/doctype/project/project.py +141,You have been invited to collaborate on the project: {0},"Ön meghívást kapott, hogy működjenek együtt a projekt: {0}"
 DocType: Leave Block List Date,Block Date,Blokk dátuma
-apps/erpnext/erpnext/templates/generators/job_opening.html +19,Apply Now,Jelentkezz most
+apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Jelentkezz most
 DocType: Sales Order,Not Delivered,Nem szállított
 DocType: Assessment Group,Assessment Group Code,Assessment Group Code
 ,Bank Clearance Summary,Bank Végső összefoglaló
 apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Hozhat létre napi, heti és havi e-mail digest."
 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,épületek
-apps/erpnext/erpnext/utilities/doctype/address/address.py +164,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: Fee Structure,Fee Structure,díjstruktúra
 DocType: Timesheet Detail,Costing Amount,Költségszámítás Összeg
+DocType: Student Admission,Application Fee,Jelentkezési díj
 DocType: Process Payroll,Submit Salary Slip,Bérlap küldés
-apps/erpnext/erpnext/controllers/selling_controller.py +161,Maxiumm discount for Item {0} is {1}%,Maxiumm kedvezmény jogcím {0} {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,Maxiumm kedvezmény jogcím {0} {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Import ömlesztett
 DocType: Sales Partner,Address & Contacts,Címek és Kapcsolattartók
 DocType: SMS Log,Sender Name,Küldő neve
@@ -1970,63 +1993,64 @@
 DocType: Item,Show a slideshow at the top of the page,Mutass egy slideshow a lap tetején
 apps/erpnext/erpnext/stock/doctype/item/item.py +134,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,Ageing alapszik
+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_data.py +361,Travel,Utazási
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +155,No active or default Salary Structure found for employee {0} for the given dates,Nem aktív vagy alapértelmezett bérrendszer talált munkavállaló {0} az adott huszonegy óra
+apps/erpnext/erpnext/demo/setup/setup_data.py +304,Travel,Utazási
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +167,No active or default Salary Structure found for employee {0} for the given dates,Nem aktív vagy alapértelmezett bérrendszer talált munkavállaló {0} az adott huszonegy óra
 DocType: Leave Block List,Allow Users,Felhasználók engedélyezése
 DocType: Purchase Order,Customer Mobile No,Vásárlói Mobile Nem
 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 bevételek és ráfordítások termék függőlegesek vagy körzetekre.
 DocType: Rename Tool,Rename Tool,Átnevezési eszköz
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +23,Update Cost,Költségek újraszámolása
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Költségek újraszámolása
 DocType: Item Reorder,Item Reorder,Anyag újrarendelés
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +36,Show Salary Slip,Mutatása fizetés Slip
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +748,Transfer Material,Transfer anyag
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +53,Show Salary Slip,Mutatása fizetés Slip
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,Transfer Material,Transfer anyag
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Adja meg a működését, a működési költségek, és hogy egy egyedi Operation nem a műveleteket."
 apps/erpnext/erpnext/controllers/status_updater.py +166,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Ez a dokumentum a korlátozás felett {0} {1} jogcím {4}. Te hogy újabb {3} ellen ugyanazon {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +923,Please set recurring after saving,"Kérjük, állítsa be az ismétlődő mentés után"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +646,Select change amount account,Select változás összegét figyelembe
+apps/erpnext/erpnext/public/js/controllers/transaction.js +914,Please set recurring after saving,"Kérjük, állítsa be az ismétlődő mentés után"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +703,Select change amount account,Select változás összegét figyelembe
 DocType: Purchase Invoice,Price List Currency,Árlista pénzneme
 DocType: Naming Series,User must always select,Felhasználó mindig válassza
 DocType: Stock Settings,Allow Negative Stock,Negatív készlet engedélyezése
 DocType: Installation Note,Installation Note,Telepítési feljegyzés
-apps/erpnext/erpnext/public/js/setup_wizard.js +216,Add Taxes,Add adók
+apps/erpnext/erpnext/public/js/setup_wizard.js +216,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,Cash pénzügyi
 DocType: Budget Account,Budget Account,költségvetési elszámolási számlájára
 DocType: Quality Inspection,Verified By,Ellenőrizte
 DocType: Address,Subsidiary,Leányvállalat
 apps/erpnext/erpnext/setup/doctype/company/company.py +64,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Nem lehet megváltoztatni cég alapértelmezett valuta, mert már vannak tranzakciókat. Tranzakciók törölni kell változtatni az alapértelmezett pénznem."
+DocType: Grade Interval,Grade Description,Grade Leírás
 DocType: Quality Inspection,Purchase Receipt No,Vásárlási nyugta nincs
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Keresett pénz
 DocType: Process Payroll,Create Salary Slip,Bérlap létrehozása
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +33,Traceability,A nyomon követhetőség
 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 (Források)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +352,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Mennyiség sorban {0} ({1}) meg kell egyeznie a gyártott mennyiség {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Mennyiség sorban {0} ({1}) meg kell egyeznie a gyártott mennyiség {2}
 DocType: Appraisal,Employee,Munkavállaló
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Meghívás Felhasználó
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} teljesen számlázott
 DocType: Workstation Working Hour,End Time,End Time
 DocType: Payment Entry,Payment Deductions or Loss,Fizetési levonások vagy veszteség
-apps/erpnext/erpnext/config/schools.py +100,LMS,LMS
+apps/erpnext/erpnext/config/schools.py +104,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ési vagy megvásárolható.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Utalvány által csoportosítva
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,értékesítési Pipeline
 DocType: Student Batch Student,Student Batch Student,Student Batch Student
-DocType: Sales Invoice,Mass Mailing,Tömeges email
+apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Szükség
 DocType: Rename Tool,File to Rename,Fájl átnevezése
 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 BOM jogcím sorában {0}"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchse Order number required for Item {0},Purchse Rendelési szám szükséges Elem {0}
 apps/erpnext/erpnext/controllers/buying_controller.py +262,Specified BOM {0} does not exist for Item {1},Meghatározott BOM {0} nem létezik jogcím {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +199,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Karbantartási ütemterv {0} törölni kell lemondása előtt ezt a Vevői rendelés
 DocType: Notification Control,Expense Claim Approved,Béremelési igény jóváhagyva
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +297,Salary Slip of employee {0} already created for this period,Fizetés Slip dolgozói {0} már létezik erre az időszakra
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Pharmaceutical,Gyógyszeripari
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +309,Salary Slip of employee {0} already created for this period,Fizetés Slip dolgozói {0} már létezik erre az időszakra
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Pharmaceutical,Gyógyszeripari
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,A vásárolt tételek
 DocType: Selling Settings,Sales Order Required,Értékesítési sorrendbe
 DocType: Purchase Invoice,Credit To,Hitel
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +31,Active Leads / Customers,Aktív vezet / ügyfelek
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +31,Active Leads / Customers,Aktív Érdeklődések / Vevők
 DocType: Employee Education,Post Graduate,Posztgraduális
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Karbantartási ütemterv részlete
 DocType: Quality Inspection Reading,Reading 9,Olvasás 9
@@ -2037,45 +2061,47 @@
 DocType: Upload Attendance,Attendance To Date,Részvétel a dátum
 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 +814,Please specify Company to proceed,"Kérjük, adja Társaság a folytatáshoz"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +793,Please specify Company to proceed,"Kérjük, adja Társaság a folytatáshoz"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Receivable,Nettó változás Vevők
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Compensatory Off,Kompenzációs Off
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,Kompenzációs Off
 DocType: Quality Inspection Reading,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örzsadatok marad, ahogy van. Ez a művelet nem vonható vissza."
 DocType: Room,Room Number,Szoba szám
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Érvénytelen hivatkozás {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +161,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},"{0} ({1}) nem lehet nagyobb, mint a tervezett quanitity ({2}) a gyártási utasítás {3}"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +162,{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 utasításban"
 DocType: Shipping Rule,Shipping Rule Label,Szállítási lehetőség 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 +217,Raw Materials cannot be blank.,Nyersanyagok nem lehet üres.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,"Could not update stock, invoice contains drop shipping item.","Nem sikerült frissíteni a készletek, számla tartalmaz csepp szállítási elemet."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +460,Quick Journal Entry,Gyors Naplókönyvelés
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +111,You can not change rate if BOM mentioned agianst any item,"Nem tudod megváltoztatni mértéke, ha BOM említett Against olyan tétel"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +441,"Could not update stock, invoice contains drop shipping item.","Nem sikerült frissíteni a készletek, számla tartalmaz csepp szállítási elemet."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Quick Journal Entry,Gyors Naplókönyvelés
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +103,You can not change rate if BOM mentioned agianst any item,"Nem tudod megváltoztatni mértéke, ha BOM említett Against olyan tétel"
 DocType: Employee,Previous Work Experience,Korábbi szakmai tapasztalat
 DocType: Stock Entry,For Quantity,Mert Mennyiség
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},"Kérjük, adja Tervezett Mennyiség jogcím {0} sorban {1}"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{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 termelési érdekében jön létre minden kész a jó elemet.
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +121,{0} must be negative in return document,{0} negatívnak kell lennie cserébe dokumentum
 ,Minutes to First Response for Issues,Perc Első Response kérdések
 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.,A nevét az intézet amelyek akkor állítsa be ezt a rendszert.
-DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Könyvelési tételt befagyva, hogy ez az időpont, senkinek nincs joga / módosítani bejegyzést kivéve szerepet az alábbiak szerint."
+DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Könyvelési tételt befagyasztva eddig a dátumig, senkinek nincs joga végrehajtani / módosítani a bejegyzést kivéve az alább meghatározott szerepkörö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, utána karbantartási ütemterv"
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Projekt állapota
 DocType: UOM,Check this to disallow fractions. (for Nos),"Jelölje be ezt, hogy ne engedélyezze frakciók. (A számok)"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +398,The following Production Orders were created:,A következő gyártási megrendelések jött létre:
+DocType: Student Admission,Naming Series (for Student Applicant),Elnevezési sorozat (Student Kérelmező)
 DocType: Delivery Note,Transporter Name,Fuvarozó neve
 DocType: Authorization Rule,Authorized Value,Megengedett érték
 DocType: Contact,Enter department to which this Contact belongs,"Adja egysége, ahova a kapcsolattartónak tartozik"
 ,Minutes to First Response for Opportunity,Perceket First Response Opportunity
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Absent,Összesen Hiány
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +739,Item or Warehouse for row {0} does not match Material Request,Elem vagy raktár sorban {0} nem egyezik Material kérése
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +747,Item or Warehouse for row {0} does not match Material Request,Elem vagy raktár sorban {0} nem egyezik Material kérése
 apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,Mértékegység
 DocType: Fiscal Year,Year End Date,Év végi dátum
 DocType: Task Depends On,Task Depends On,A feladat tőle függ:
-DocType: Lead,Opportunity,Lehetőség
+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 szállító {0} e-mail id szükséges, hogy küldjön e-mailt"
 DocType: Operation,Default Workstation,Alapértelmezett Workstation
@@ -2088,7 +2114,7 @@
 DocType: Student,Joining Date,Csatlakozási dátum
 ,Employees working on a holiday,Dolgozó nyaralni
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Mark Present
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},Karbantartás kezdési időpontja nem lehet korábbi szállítási határidő a Serial No {0}
+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 szállítási határidő a Serial No {0}
 DocType: Production Order,Actual End Date,Tényleges befejezési dátum
 DocType: Purchase Invoice,PINV-,PINV-
 DocType: Authorization Rule,Applicable To (Role),Alkalmazandó (Role)
@@ -2103,17 +2129,17 @@
 DocType: SMS Log,No of Requested SMS,Nem kért SMS
 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 +729,Please supply the specified items at the best possible rates,Kérjük adja meg a terméket a lehető legjobb áron
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +695,Please supply the specified items at the best possible rates,Kérjük adja meg a terméket a lehető legjobb áron
 apps/erpnext/erpnext/public/js/financial_statements.js +81,End Year,Befejező év
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,"Szerződés befejezés dátuma nem lehet nagyobb, mint Csatlakozás dátuma"
 DocType: 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 harmadik fél forgalmazó / kereskedő / bizományos / társult / viszonteladó, aki eladja a vállalatok termékek a jutalék."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +346,{0} against Purchase Order {1},{0} ellen Megrendelés {1}
+DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"A harmadik fél forgalmazó / kereskedő / bizományos / társult / viszonteladó, aki jutalákárt eladja a vállalatok termékeit."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +346,{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 (via Idő Sheet)
-apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +14,This is an example website auto-generated from ERPNext,Ez egy példa honlapján automatikusan generált a ERPNext
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Ageing tartomány 1
+DocType: Task,Actual Start Date (via Time Sheet),Tényleges kezdési dátum (Idő űrlap szerint)
+apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Ez egy példa honlapján automatikusan generált a ERPNext
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Öregedés tartomány 1
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -2139,13 +2165,14 @@
 DocType: Purchase Receipt Item,Recd Quantity,RecD Mennyiség
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +54,Fee Records Created - {0},Fee létrehozott rekordok - {0}
 DocType: Asset Category Account,Asset Category Account,Eszköz kategória fiók
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +103,Cannot produce more Item {0} than Sales Order quantity {1},"Nem lehet még több tétel {0}, mint Sales Rendelési mennyiség {1}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Stock Entry {0} is not submitted,"Stock Entry {0} nem nyújtják be,"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},"Nem lehet még több tétel {0}, mint Sales Rendelési mennyiség {1}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +505,Stock Entry {0} is not submitted,"Stock Entry {0} nem nyújtják be,"
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / Cash Account
 DocType: Tax Rule,Billing City,Számlázási Város
 DocType: Salary Component Account,Salary Component Account,Fizetés Component fiók
 DocType: Global Defaults,Hide Currency Symbol,Pénznem szimbólumának elrejtése
 apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card","pl. bank, készpénz, hitelkártya"
+DocType: Lead Source,Source Name,Forrás neve
 DocType: Journal Entry,Credit Note,Jóváírási értesítő
 DocType: Warranty Claim,Service Address,Szerviz címe
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furnitures and Fixtures,Bútorok és világítótestek
@@ -2157,6 +2184,7 @@
 DocType: Opportunity,Customer / Lead Name,Vevő / Célpont neve
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +89,Clearance Date not mentioned,Távolság dátuma nem szerepel
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Termelé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/controllers/trends.py +19,Total(Qty),Összesen (db)
 DocType: Sales Invoice,This Document,E dokumentum
@@ -2168,15 +2196,15 @@
 DocType: Purchase Receipt,Time at which materials were received,Időpontja anyagok érkezett
 DocType: Stock Ledger Entry,Outgoing Rate,Kimenő Rate
 apps/erpnext/erpnext/config/hr.py +176,Organization branch master.,Szervezet ága mester.
-apps/erpnext/erpnext/controllers/accounts_controller.py +273, or ,vagy
+apps/erpnext/erpnext/controllers/accounts_controller.py +276, or ,vagy
 DocType: Sales Order,Billing Status,Számlázási állapot
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Hiba 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 +203,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 +206,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
 DocType: Buying Settings,Default Buying Price List,Alapértelmezett Vásárlási árjegyzéke
 DocType: Process Payroll,Salary Slip Based on Timesheet,Fizetés Slip alapján Időnyilvántartó
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +90,No employee for the above selected criteria OR salary slip already created,Nem alkalmazottja a fent kiválasztott kritériumoknak vagy fizetés csúszik már létrehozott
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +93,No employee for the above selected criteria OR salary slip already created,Nem alkalmazottja a fent kiválasztott kritériumoknak vagy fizetés csúszik már létrehozott
 DocType: Notification Control,Sales Order Message,Vevői Message
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Alapértelmezett értékek, mint a társaság, Valuta, folyó pénzügyi évben, stb"
 DocType: Payment Entry,Payment Type,Fizetési mód
@@ -2204,8 +2232,8 @@
 DocType: Product Bundle,Parent Item,Szülőelem
 DocType: Account,Account Type,Számla típus
 DocType: Delivery Note,DN-RET-,DN-RET-
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +115,Leave Type {0} cannot be carry-forwarded,Hagyja típusa {0} nem carry-továbbítani
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Karbantartási ütemterv nem keletkezik az összes elem. Kérjük, kattintson a ""Létrehoz Menetrend"""
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +118,Leave Type {0} cannot be carry-forwarded,Hagyja típusa {0} nem carry-továbbítani
+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 keletkezik az összes elem. Kérjük, kattintson a ""Létrehoz Menetrend"""
 ,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 +163,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","A sorban {0} {1}. Márpedig a {2} jogcímben ráta, sorok {3} is fel kell venni"
@@ -2217,13 +2245,13 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +32,Disabled template must not be default template,Mozgáskorlátozottak 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 valuta
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +748,Delivery,Szállítás
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +742,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
 DocType: Payment Entry,Total Allocated Amount,Kiutalt teljes összeg
 DocType: Item Reorder,Material Request Type,Anyagigénylés típusa
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +82,Row {0}: UOM Conversion Factor is mandatory,Sor {0}: UOM átváltási arányra is kötelező
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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,Ref
 DocType: Budget,Cost Center,Költségközpont
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Utalvány #
@@ -2234,14 +2262,14 @@
 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 készül felülírni árjegyzéke / határozza kedvezmény százalékos, néhány olyan feltétel alapján."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Warehouse csak akkor lehet megváltoztatni keresztül Stock Entry / szállítólevél / vásárlási nyugta
 DocType: Employee Education,Class / Percentage,Osztály / Százalékos
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Head of Marketing and Sales,Marketing és Értékesítés vezetője
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Jövedelemadó
+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 +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 készül az ""Ár"", az felülírja árlista. Árképzési szabály ár a végleges ár, így további kedvezményt kellene alkalmazni. Ezért a tranzakciók, mint a vevői rendelés, megrendelés, stb, akkor kerül letöltésre a ""Rate"" mezőbe, ahelyett, hogy ""árjegyzéke Rate"" mezőben."
 apps/erpnext/erpnext/config/selling.py +164,Track Leads by Industry Type.,A pálya vezet az ipar típusa.
 DocType: Item Supplier,Item Supplier,Anyagbeszállító
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +403,Please enter Item Code to get batch no,"Kérjük, adja tételkód hogy batch nincs"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +770,Please select a value for {0} quotation_to {1},"Kérjük, válasszon értéket {0} quotation_to {1}"
-apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Minden címek.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +397,Please enter Item Code to get batch no,"Kérjük, adja tételkód hogy batch nincs"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +764,Please select a value for {0} quotation_to {1},"Kérjük, válasszon értéket {0} quotation_to {1}"
+apps/erpnext/erpnext/config/selling.py +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/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Gain/Loss on Asset Disposal,Nyereség / veszteség Asset ártalmatlanítása
@@ -2252,28 +2280,29 @@
 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 +100,Issues,Problémák
+apps/erpnext/erpnext/hooks.py +109,Issues,Problémák
 apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},Állapot közül kell {0}
 DocType: Sales Invoice,Debit To,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 Miután a tranzakciós
+DocType: Stock Ledger Entry,Actual Qty After Transaction,Tényleges Mennyiség a tranzakció után
 ,Pending SO Items For Purchase Request,Függőben lévő SO elemek vásárolható kérése
-apps/erpnext/erpnext/accounts/party.py +345,{0} {1} is disabled,{0} {1} van tiltva
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Student Felvételi
+apps/erpnext/erpnext/accounts/party.py +345,{0} {1} is disabled,{0} {1} le van tiltva
 DocType: Supplier,Billing Currency,Számlázási Árfolyam
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Large,Extra Nagy
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Extra Large,Extra Nagy
 ,Profit and Loss Statement,Az eredmény-kimutatás
 DocType: Bank Reconciliation Detail,Cheque Number,Csekk száma
 ,Sales Browser,Értékesítési Browser
 DocType: Journal Entry,Total Credit,Követelés összesen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +507,Warning: Another {0} # {1} exists against stock entry {2},Figyelmeztetés: Egy másik {0} # {1} létezik elleni készletnövekedést {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Local,Helyi
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +508,Warning: Another {0} # {1} exists against stock entry {2},Figyelmeztetés: Egy másik {0} # {1} létezik elleni készletnövekedést {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Local,Helyi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),A hitelek és előlegek (Eszközök)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Adósok
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Large,Nagy
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Large,Nagy
 DocType: Homepage Featured Product,Homepage Featured Product,Honlap Ajánlott termék
 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 +225,Total {0} ({1}),Összesen {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +224,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 beszélve nincs ellenőrzés szükséges
 DocType: Stock Settings,Default Valuation Method,Alapértelmezett készletérték számítási mód
@@ -2289,7 +2318,7 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Employee {0} volt szabadságon lévő {1}. Nem jelölhet részvétel.
 DocType: Sales Partner,Targets,Célok
 DocType: Price List,Price List Master,Árlista mester
-DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Minden értékesítési tranzakciók lehet címkézett ellen több ** értékesítők ** így, és kövesse nyomon célokat."
+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ő ** ellen, így beállíthat és követhet célokat."
 ,S.O. No.,SO No.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +150,Please create Customer from Lead {0},"Kérjük, hozzon létre Ügyfél a Lead {0}"
 DocType: Price List,Applicable for Countries,Alkalmazható Országok
@@ -2318,10 +2347,10 @@
 1. Address and Contact of your Company.","Általános Szerződési Feltételek felvehető értékesítés és a beszerzés. Példák: 1. érvényessége az ajánlatot. 1. Fizetési feltételek (előre hitelre, része előre stb). 1. Mi az extra (vagy az ügyfél által fizetendő). 1. Biztonsági / használati figyelmeztetést. 1. A garanciális ha van ilyen. 1. garancia Policy. 1. szállítási feltételek, ha van ilyen. 1. hogyan lehetne kezelni viták, kártérítési felelősség stb 1. Cím és kapcsolattartási cége."
 DocType: Attendance,Leave Type,Szabadság típusa
 apps/erpnext/erpnext/controllers/stock_controller.py +173,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"Költség / Difference számla ({0}) kell lennie az ""eredmény"" fiók"
-DocType: Account,Accounts User,Fiók-felhasználó
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Name error: {0},Név hiba: {0}
+DocType: Account,Accounts User,Számlák felhasználó
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +90,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 +178,{0} {1} does not associated with {2} {3},{0} {1} nem jár a {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +181,{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} munkavállaló már megjelölt a jelenlétin
 DocType: Packing Slip,If more than one package of the same type (for print),Ha egynél több csomagot azonos típusú (nyomtatási)
 DocType: Warehouse,Parent Warehouse,szülő Warehouse
@@ -2330,7 +2359,7 @@
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Fennálló összeg
 DocType: Project Task,Working,Folyamatban
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Stock Queue (FIFO)
-apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +38,{0} does not belong to Company {1},{0} nem tartozik a társasághoz {1}
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +38,{0} does not belong to Company {1},{0} nem tartozik az  {1} vállalathoz
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,Költség a
 DocType: Account,Round Off,Befejez
 ,Requested Qty,Kért Mennyiség
@@ -2340,7 +2369,7 @@
 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 kerülnek kiosztásra alapján arányosan elem Mennyiség vagy összeget, mint egy a kiválasztás"
 DocType: Maintenance Visit,Purposes,Célok
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,Atleast egy tételt kell beírni a negatív mennyiség cserébe dokumentum
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Atleast one item should be entered with negative quantity in return document,Atleast egy tételt kell beírni a negatív mennyiség cserébe dokumentum
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Működés {0} hosszabb, mint bármely rendelkezésre álló munkaidő munkaállomás {1}, lebontják a művelet a több művelet"
 ,Requested,Kért
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +83,No Remarks,Nincs megjegyzés
@@ -2352,46 +2381,46 @@
 DocType: Item,Total Projected Qty,Teljes kivetített db
 DocType: Monthly Distribution,Distribution Name,Nagykereskedelem neve
 DocType: Course,Course Code,A tantárgy kódja
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Quality Inspection required for Item {0},Minőség-ellenőrzési szükséges Elem {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Quality Inspection required for Item {0},Minőség-ellenőrzési szükséges Elem {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,"Arány, amely ügyfél deviza átalakul cég bázisvalutaként"
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Nettó ár (Társaság Currency)
 DocType: Salary Detail,Condition and Formula Help,Állapot és Formula Súgó
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Kezelése Terület fa.
 DocType: Journal Entry Account,Sales Invoice,Kimenő számla
 DocType: Journal Entry Account,Party Balance,Párt Balance
-apps/erpnext/erpnext/accounts/page/pos/pos.js +475,Please select Apply Discount On,"Kérjük, válassza az Apply kedvezmény"
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +92,Salary Slip Created,Fizetés Slip Létrehozta
+apps/erpnext/erpnext/accounts/page/pos/pos.js +464,Please select Apply Discount On,"Kérjük, válassza az Apply kedvezmény"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +95,Salary Slip Created,Fizetés Slip Létrehozta
 DocType: Company,Default Receivable Account,Alapértelmezett Receivable Account
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Készítse Bank Belépő a teljes bért fizet a fent kiválasztott kritériumoknak
 DocType: Stock Entry,Material Transfer for Manufacture,Anyag átrakása gyártásához
 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ékos lehet alkalmazni vagy ellen árlistában vagy az összes árlistában.
 DocType: Purchase Invoice,Half-yearly,Félévente
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +384,Accounting Entry for Stock,Számviteli könyvelése Stock
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +387,Accounting Entry for Stock,Könyvelési tétel a Készlethez
 DocType: Sales Invoice,Sales Team1,Értékesítő csapat1
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,Item {0} does not exist,Elem {0} nem létezik
 DocType: Attendance Tool Student,Attendance Tool Student,Nézőszám eszköz Student
 DocType: Sales Invoice,Customer Address,Vevő címe
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +96,Row {0}: Completed Qty must be greater than zero.,"Sor {0}: Befejezve Mennyiség nagyobbnak kell lennie, mint nulla."
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +120,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,Alkalmazza További kedvezmény
 DocType: Account,Root Type,Root Type
 DocType: Item,FIFO,FIFO
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +88,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/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,Telek
 DocType: Item Group,Show this slideshow at the top of the page,Mutasd ezt slideshow a lap tetején
 DocType: BOM,Item UOM,Az anyag mennyiségi egysége
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Adó összege után kedvezmény összege (Társaság Currency)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +147,Target warehouse is mandatory for row {0},Cél raktárban kötelező sorban {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +141,Target warehouse is mandatory for row {0},Cél raktárban kötelező sorban {0}
 DocType: Cheque Print Template,Primary Settings,Elsődleges beállítások
 DocType: Purchase Invoice,Select Supplier Address,Select Gyártó címe
 DocType: Quality Inspection,Quality Inspection,Minőségvizsgálat
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Extra Small,Extra Small
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,Warning: Material Requested Qty is less than Minimum Order Qty,"Figyelmeztetés: Anyag kért Mennyiség kevesebb, mint Minimális rendelési menny"
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +194,Account {0} is frozen,Account {0} lefagyott
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Extra Small
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +690,Warning: Material Requested Qty is less than Minimum Order Qty,"Figyelmeztetés: Anyag kért Mennyiség kevesebb, mint Minimális rendelési menny"
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,A {0} számla lefagyott
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Jogi személy / leányvállalat külön számlatükör tartozó Szervezet.
 DocType: Payment Request,Mute Email,Mute-mail
 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 +606,Can only make payment against unbilled {0},Egyszerre csak fizetés ellenében nem számlázott {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +126,Commission rate cannot be greater than 100,"Jutalék mértéke nem lehet nagyobb, mint a 100"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +609,Can only make payment against unbilled {0},Egyszerre csak fizetés ellenében nem számlázott {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,"Jutalék mértéke nem lehet nagyobb, mint a 100"
 DocType: Stock Entry,Subcontract,Alvállalkozói
 apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,"Kérjük, adja {0} első"
 DocType: Production Order Operation,Actual End Time,Tényleges befejezési időpont
@@ -2402,30 +2431,30 @@
 DocType: SMS Log,No of Sent SMS,Nem az elküldött SMS-
 DocType: Account,Expense Account,Áfás számlát
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Szoftver
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Colour,Szín
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,Szín
 DocType: Maintenance Visit,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 pont, ahol &quot;Is Stock tétel&quot; &quot;Nem&quot; és &quot;Van Sales Termék&quot; &quot;Igen&quot;, és nincs más termék Bundle"
 DocType: Student Log,Academic,Akadémiai
-apps/erpnext/erpnext/controllers/accounts_controller.py +469,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),"Összesen előre ({0}) ellen rendelés {1} nem lehet nagyobb, mint a végösszeg ({2})"
+apps/erpnext/erpnext/controllers/accounts_controller.py +472,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),"Összesen előre ({0}) ellen rendelés {1} nem lehet nagyobb, mint a végösszeg ({2})"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Válassza ki havi megoszlása egyenlőtlen osztja célok hónapok között.
 DocType: Purchase Invoice Item,Valuation Rate,Becsült érték
+DocType: Stock Reconciliation,SR/,SR /
 apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,Árlista Ki nem választott
 DocType: Assessment,Results,Eredmények
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +168,Employee {0} has already applied for {1} between {2} and {3},Employee {0} már jelentkezett {1} között {2} és {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +175,Employee {0} has already applied for {1} between {2} and {3},Employee {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 kezdési dátuma
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Míg
 DocType: Rename Tool,Rename Log,Átnevezési napló
-DocType: Student Applicant,Father's/ Guardian 2 Email ID,Apák / Guardian 2-mail azonosítót
-DocType: Maintenance Visit Purpose,Against Document No,Ellen Document No
+DocType: Maintenance Visit Purpose,Against Document No,Ellen Dokument sz.
 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 +228,Warehouses with existing transaction can not be converted to group.,Raktárak meglévő ügylet nem konvertálható csoport.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +231,Warehouses with existing transaction can not be converted to group.,Raktárak meglévő ügylet nem konvertálható csoport.
 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 +93,Researcher,Kutató
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Researcher,Kutató
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Program Beiratkozási eszköz Student
 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.,Bejövő minőségi ellenőrzés.
@@ -2437,27 +2466,27 @@
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","A könnyebb ügyfelek, ezek a kódok használhatók a nyomtatási formátumok, mint számlákon és a szállítóleveleken"
 DocType: Sales Invoice,Time Sheet List,Idő Laplista
 DocType: Employee,You can enter any date manually,Megadhat bármilyen dátum kézi
-DocType: Sales Invoice,Advertisement,Hirdetés
 DocType: Asset Category Account,Depreciation Expense Account,Értékcsökkenési ráfordítás számla
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Probationary Period,Próbaidő
-apps/erpnext/erpnext/hooks.py +102,Announcements,Közlemények
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Próbaidő
+apps/erpnext/erpnext/hooks.py +111,Announcements,Közlemények
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Csak az ágakat engedélyezettek a tranzakciós
 DocType: Expense Claim,Expense Approver,Költségén Jóváhagyó
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +109,Row {0}: Advance against Customer must be credit,Sor {0}: Advance ellen ügyfelet meg kell hitelt
 apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,Nem csoportonként
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Vásárlási nyugta mellékelt tételek
 DocType: Payment Entry,Pay,Fizet
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +16,To Datetime,Hogy Datetime
+apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Hogy Datetime
 DocType: SMS Settings,SMS Gateway URL,SMS átjáró URL-je
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +51,Course Schedules deleted:,Természetesen Menetrendek hagyni:
 apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,Rönk fenntartása sms szállítási állapot
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Függő Tevékenységek
+DocType: Accounts Settings,Make Payment via Journal Entry,Befizetés keresztül Naplókönyvelés
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Függő Tevékenységek
 DocType: Payment Gateway,Gateway,Gateway
 DocType: Fee Component,Fees Category,díjak Kategória
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,"Kérjük, adja enyhíti a dátumot."
-apps/erpnext/erpnext/controllers/trends.py +145,Amt,Amt
+apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,Only Leave Applications with status 'Approved' can be submitted,"Csak Hagyd alkalmazások állapotát ""Elfogadott"" lehet benyújtani"
-apps/erpnext/erpnext/utilities/doctype/address/address.py +26,Address Title is mandatory.,Address Cím kötelező.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +26,Address Title is mandatory.,Cím felirat kötelező.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Adja meg nevét kampányt, ha a forrása a vizsgálódás 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álassza ki Fiscal Year
@@ -2465,7 +2494,7 @@
 DocType: Attendance,Attendance Date,Jelenléti dátuma
 apps/erpnext/erpnext/stock/get_item_details.py +258,Item Price updated for {0} in Price List {1},Termék ára frissítve: {0} Árlista {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Fizetés szakítás alapján a kereseti és levonás.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Számlát a gyermek csomópontok nem lehet átalakítani főkönyvi
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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,Ez legyen a szállítási cím is
 DocType: Purchase Invoice Item,Accepted Warehouse,Elfogadott raktár
 DocType: Bank Reconciliation Detail,Posting Date,Rögzítés dátuma
@@ -2473,14 +2502,15 @@
 apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1},Nem található árfolyam {0} {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Mark Félnapos
 DocType: Sales Invoice,Sales Team,Értékesítő csapat
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Duplicate entry,Ismétlődő bejegyzés
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,Ismétlődő bejegyzés
 DocType: Program Enrollment Tool,Get Students,hogy a diákok
 DocType: Serial No,Under Warranty,Garanciaidőn belül
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +490,[Error],[Hiba]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +484,[Error],[Hiba]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,"A szavak lesz látható, ha menteni a Vevői rendelés."
 ,Employee Birthday,Munkavállaló születésnapja
 apps/erpnext/erpnext/controllers/status_updater.py +175,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 ez a &quot;Tanév &#39;{0} és a&quot; Term neve&#39; {1} már létezik. Kérjük, módosítsa ezeket a bejegyzéseket, és próbálja újra."
 DocType: UOM,Must be Whole Number,Egész számnak kell lennie
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Új szabadság lefoglalása (napokban)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,A {0} sorozatszám nem létezik
@@ -2491,30 +2521,30 @@
 DocType: Employee Leave Approver,Leave Approver,Szabadság jóváhagyó
 DocType: Assessment Group,Assessment Group Name,Értékelési csoport neve
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Anyaga átadott gyártása
-DocType: Expense Claim,"A user with ""Expense Approver"" role","A felhasználó ""Költség Jóváhagyó"" szerepét"
+DocType: Expense Claim,"A user with ""Expense Approver"" role","Egy felhasználó ""Költség Jóváhagyó"" szereppel"
 DocType: Landed Cost Item,Receipt Document Type,Nyugta Document Type
 ,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észlete
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +25,All Jobs,minden munka
-DocType: Sales Order,% of materials billed against this Sales Order,% -a Anyagok számlázott ellen Vevői
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,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,Időszakban a nevezési határidő
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,"Költség Center meglévő tranzakciók nem lehet átalakítani, hogy csoportban"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Amount {0} {1} {2} {3},Összeg: {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Amount {0} {1} {2} {3},Összeg: {0} {1} {2} {3}
 DocType: Account,Depreciation,Értékcsökkenés
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Szállító (k)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Munkavállalói Jelenlét Eszköz
 DocType: Supplier,Credit Limit,Credit Limit
 DocType: Production Plan Sales Order,Salse Order Date,Salse Rendezés Dátum
 DocType: Salary Component,Salary Component,Bér összetevők
-apps/erpnext/erpnext/accounts/utils.py +372,Payment Entries {0} are un-linked,Fizetési bejegyzések {0} vannak un-linked
+apps/erpnext/erpnext/accounts/utils.py +449,Payment Entries {0} are un-linked,Fizetési bejegyzések {0} vannak un-linked
 DocType: GL Entry,Voucher No,Bizonylatszám
 DocType: Leave Allocation,Leave Allocation,Szabadság lefoglalása
 DocType: Payment Request,Recipient Message And Payment Details,A címzett üzenet és fizetési
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +497,Material Requests {0} created,{0} anyagigénylés létrejött
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +498,Material Requests {0} created,{0} anyagigénylés létrejött
 DocType: Production Planning Tool,Include sub-contracted raw materials,Tartalmazza alvállalkozóknak nyersanyagok
 apps/erpnext/erpnext/config/selling.py +154,Template of terms or contract.,Sablon kifejezések vagy szerződés.
-DocType: Purchase Invoice,Address and Contact,Cím és kapcsolattartási
+DocType: Purchase Invoice,Address and Contact,Cím és kapcsolattartó
 DocType: Cheque Print Template,Is Account Payable,Van szállítók
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +260,Stock cannot be updated against Purchase Receipt {0},Stock nem lehet frissíteni ellen vásárlási nyugta {0}
 DocType: Supplier,Last Day of the Next Month,Last Day of a következő hónapban
@@ -2531,7 +2561,7 @@
 DocType: Monthly Distribution Percentage,Month,Hónap
 ,Stock Analytics,Készlet analítika
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +373,Operations cannot be left blank,Műveletek nem maradhat üresen
-DocType: Maintenance Visit Purpose,Against Document Detail No,Ellen Document Részlet No
+DocType: Maintenance Visit Purpose,Against Document Detail No,Ellen Dokument Részlet sz.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +72,Party Type is mandatory,Fél típus kötelező
 DocType: Quality Inspection,Outgoing,Kimenő
 DocType: Material Request,Requested For,Igényelt
@@ -2550,7 +2580,7 @@
 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 +848,Paid Amount cannot be greater than total negative outstanding amount {0},"Befizetett összeg nem lehet nagyobb, mint a teljes negatív fennálló összege {0}"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +859,Paid Amount cannot be greater than total negative outstanding amount {0},"Befizetett összeg nem lehet nagyobb, mint a teljes negatív fennálló összege {0}"
 DocType: Employee Internal Work History,Employee Internal Work History,A munkavállaló cégen belüli mozgása
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +233,Closing (Dr),Zárás (Dr)
 DocType: Cheque Print Template,Cheque Size,Csekk Méret
@@ -2571,25 +2601,26 @@
 ,Billed Amount,Számlázott összeg
 DocType: Asset,Double Declining Balance,Dupla degresszív
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Closed order cannot be cancelled. Unclose to cancel.,"Zárt hogy nem lehet törölni. Felnyit, hogy megszünteti."
-apps/erpnext/erpnext/controllers/accounts_controller.py +555,'Update Stock' cannot be checked for fixed asset sale,&#39;Update Stock&#39; nem lehet ellenőrizni állóeszköz eladó
+DocType: Student Guardian,Father,Apa
+apps/erpnext/erpnext/controllers/accounts_controller.py +558,'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 Megbékélés
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Értesülés változásról
 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 mintát bejegyzések
+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 +243,Leave Management,Hagyja Management
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Számla által csoportosítva
 DocType: Sales Order,Fully Delivered,Teljesen szállítva
 DocType: Lead,Lower Income,Alacsonyabb jövedelmű
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","A számla fej mellett felelősség, amelyben Profit / Loss könyvelik"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +166,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 +238,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Különbség Figyelembe kell lennie Eszköz / Forrás típusú számla, mivel ez a Stock Megbékélés egy Nyitva Entry"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +81,Purchase Order number required for Item {0},Megrendelés számát szükséges Elem {0}
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"a ""Dátumtól"" a ""Dátumig"" után kell állnia"
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +17,Cannot change status as student {0} is linked with student application {1},Állapotát nem lehet megváltoztatni a hallgató {0} kapcsolódik hallgató alkalmazás {1}
+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 Figyelembe kell lennie Eszköz / Forrás típusú számla, mivel ez a Stock Megbékélés egy Nyitva Entry"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +82,Purchase Order number required for Item {0},Megrendelés számát szükséges Elem {0}
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"a ""Dátumtól"" 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},Állapotát nem lehet megváltoztatni a hallgató {0} kapcsolódik hallgató alkalmazás {1}
 DocType: Timesheet,"List of employee which has ""Salary Slip Based on Timesheet"" is enabled in salary structure.","Listája alkalmazottja, amely &quot;fizetés Slip alapján Munkaidő&quot; engedélyezve van a bérrendszer."
 DocType: Asset,Fully Depreciated,teljesen amortizálódott
 ,Stock Projected Qty,Stock kivetített Mennyiség
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Customer {0} does not belong to project {1},Vásárlói {0} nem tartozik a projekt {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,Customer {0} does not belong to project {1},Vásárlói {0} nem tartozik a projekt {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Jelzett Nézőszám HTML
 DocType: Sales Order,Customer's Purchase Order,Ügyfél Megrendelés
 apps/erpnext/erpnext/config/stock.py +107,Serial No and Batch,Sorszám és Batch
@@ -2601,10 +2632,10 @@
 DocType: Purchase Invoice,Purchase Taxes and Charges,Adókat és díjakat
 ,Qty to Receive,Mennyiség fogadáshoz
 DocType: Leave Block List,Leave Block List Allowed,Hagyja Block List hozhatja
-apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +55,All Warehouses,minden Raktárak
+apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,Összes Raktárak
 DocType: Sales Partner,Retailer,Kiskereskedő
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Credit To account must be a Balance Sheet account,Hitel figyelembe kell egy Mérlegszámla
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Minden beszállító típusok
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Összes beszállító típus
 DocType: Global Defaults,Disable In Words,Disable szavakban
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,Item Code is mandatory because Item is not automatically numbered,"Elem kód megadása kötelező, mert pont nincs automatikusan számozott"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Idézet {0} nem type {1}
@@ -2613,10 +2644,10 @@
 DocType: Production Order,PRO-,PRO-
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Bank Overdraft Account,Folyószámlahitel Account
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Bérlap készítése
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +26,Browse BOM,Keressen BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Keressen BOM
 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/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ési kapcsolódó számlák Asset Kategória {0} vagy {1} Társaság"
-DocType: Academic Year,Academic Year,Tanév
+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,Nyitó egyenleg Equity
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,Teljesítmény értékelés
@@ -2624,16 +2655,16 @@
 DocType: Opportunity,OPTY-,OPTY-
 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,Az aláírásra jogosult
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +197,Leave approver must be one of {0},Hagyja jóváhagyóhoz közül kell {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,Leave approver must be one of {0},Hagyja jóváhagyóhoz közül kell {0}
 DocType: Hub Settings,Seller Email,Eladó Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Beszerzés teljes költségének (via vásárlást igazoló számlát)
 DocType: Workstation Working Hour,Start Time,Start Time
 DocType: Item Price,Bulk Import Help,Csoportos Importálás Súgó
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +256,Select Quantity,Select Mennyiség
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +257,Select Quantity,Select Mennyiség
 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ó szerepet nem lehet ugyanaz, mint szerepe a szabály alkalmazandó"
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Iratkozni a e-mail kivonat
 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,Számlát gyermek csomópontok nem lehet beállítani főkönyvi
+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á
 DocType: C-Form,II,II
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,"Arány, amely Árlista pénznemben átalakul ügyfél alap deviza"
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Nettó összeg (Társaság Currency)
@@ -2641,11 +2672,12 @@
 DocType: Stock Settings,Item Naming By,Elem elnevezés típusa
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Egy újabb pont a nevezési határidő {0} azután tette {1}
 DocType: Production Order,Material Transferred for Manufacturing,Anyag átrakva gyártáshoz
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Account {0} nem létezik
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,A {0} számla nem létezik
 DocType: Project,Project Type,Projekt típusa
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Vagy target Menny vagy előirányzott összeg kötelező.
 apps/erpnext/erpnext/config/projects.py +45,Cost of various activities,Költségek különböző tevékenységek
 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 a munkavállaló csatlakozik a lenti értékesítők Nincsenek felhasználói azonosító {1}"
+DocType: Timesheet,Billing Details,Számlázási adatok
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +149,Source and target warehouse must be different,Forrás és cél raktár 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 frissíteni részvény tranzakciók idősebb, mint {0}"
 DocType: Item,Inspection Required,Minőség-ellenőrzés szükséges
@@ -2665,7 +2697,7 @@
 DocType: Expense Claim,Approval Status,Jóváhagyás állapota
 DocType: Hub Settings,Publish Items to Hub,Közzé tételek Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},"Re kisebb legyen, mint az értéket sorban {0}"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Wire Transfer,Banki átutalás
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,Banki átutalás
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Ellenőrizni mind
 DocType: Sales Order,Recurring Order,Ismétlődő rendelés
 DocType: Company,Default Income Account,Alapértelmezett bejövő számla
@@ -2677,21 +2709,19 @@
 ,Welcome to ERPNext,Üdvözöl az ERPNext
 apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,Vezethet Idézet
 DocType: Lead,From Customer,Az Ügyfél
-apps/erpnext/erpnext/demo/setup_data.py +357,Calls,Hívások
+apps/erpnext/erpnext/demo/setup/setup_data.py +300,Calls,Hívások
 DocType: Project,Total Costing Amount (via Time Logs),Összesen Költség Összeg (via Idő Napló)
 DocType: Purchase Order Item Supplied,Stock UOM,Készlet mértékegysége
-apps/erpnext/erpnext/stock/doctype/item/item.py +466,"As there are existing transactions for this item, \
-							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Mivel vannak olyan meglévő ügyletek ezt az elemet, \ nem tudja megváltoztatni az értékeket &quot;Has Tételszám&quot;, &quot;a kötegelt Nem&quot;, &quot;Úgy Stock tétel&quot; és &quot;értékelési módszer&quot;"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,Purchase Order {0} is not submitted,Megrendelés {0} nem nyújtják be
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,Tervezett
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serial No {0} nem tartozik Warehouse {1}
 apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,"Megjegyzés: A rendszer nem ellenőrzi túlteljesítés és over-foglalás jogcím {0}, mint a mennyiség vagy összeg 0"
 DocType: Notification Control,Quotation Message,Idézet Message
 DocType: Issue,Opening Date,Kezdési dátum
-apps/erpnext/erpnext/schools/api.py +58,Attendance has been marked successfully.,Jelenléti van jelölve sikeresen.
+apps/erpnext/erpnext/schools/api.py +57,Attendance has been marked successfully.,Jelenléti van jelölve sikeresen.
 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 +136,Account Type for {0} must be {1},Számla típusa: {0} kell lennie {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +139,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,A levelek és a Holiday
 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
@@ -2702,16 +2732,17 @@
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Kedvezmény összege
 DocType: Purchase Invoice,Return Against Purchase Invoice,Return Against vásárlási számla
 DocType: Item,Warranty Period (in days),Garancia hossza (napokban)
-apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +40,Acutal qty in stock,Juhhús Mennyiség raktáron
+apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +40,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ó cash-műveletek
 apps/erpnext/erpnext/public/js/setup_wizard.js +225,e.g. VAT,pl. ÁFA
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,4. pont
+DocType: Student Admission,Admission End Date,Felvételi Végdátum
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +20,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,Idézet 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","Egy elem létezik azonos nevű ({0}), kérjük, változtassa meg a tételt csoport nevét, vagy nevezze át a tételt"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1190,Please select customer,"Kérjük, válasszon az ügyfél"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1193,Please select customer,"Kérjük, válasszon az ügyfél"
 DocType: C-Form,I,én
 DocType: Company,Asset Depreciation Cost Center,Értékcsökkenés Költségközpont
 DocType: Sales Order Item,Sales Order Date,Vevői rendelés dátuma
@@ -2721,6 +2752,7 @@
 ,Payment Period Based On Invoice Date,Fizetési határidő számla alapján dátuma
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Hiányzó valutaárfolyamok: {0}
 DocType: Assessment,Examiner,Vizsgáztató
+DocType: Student,Siblings,testvérek
 DocType: Journal Entry,Stock Entry,Készlet mozgás
 DocType: Payment Entry,Payment References,fizetési Referenciák
 DocType: C-Form,C-FORM-,C-forma-
@@ -2738,11 +2770,12 @@
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Topic neve
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Atleast egyik elad vagy vesz ki kell választani
+DocType: Grading Structure,Grade Intervals,Grade periódusai
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Válassza ki a vállalkozás természete.
 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 +534,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 +537,Row #{0}: Asset {1} does not belong to company {2},Sor # {0}: {1} Asset nem tartozik a cég {2}
 DocType: Employee,Confirmation Date,Visszaigazolás
 DocType: C-Form,Total Invoiced Amount,Teljes kiszámlázott összeg
 DocType: Account,Sales User,Értékesítési Felhasználó
@@ -2756,28 +2789,31 @@
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Elérhető Batch Mennyiség meg a raktárból
 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,Jelenlegi BOM és a New BOM nem lehet ugyanazon
+apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +39,Salary Slip ID,Fizetés Slip ID
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,"A nyugdíjazás nagyobbnak kell lennie, mint Csatlakozás dátuma"
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +49,There were errors while scheduling course on :,Közben hiba ütemezési természetesen:
 DocType: Sales Invoice,Against Income Account,Elleni jövedelem számla
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +87,{0}% Delivered,{0}% szállítva
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% szállítva
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,"Elem {0}: Rendezett Mennyiség {1} nem lehet kevesebb, mint a minimális rendelési mennyiség {2} (pontban meghatározott)."
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Havi elosztási százalék
 DocType: Territory,Territory Targets,Területi célpontok
 DocType: Delivery Note,Transporter Info,Fuvarozó adatai
-apps/erpnext/erpnext/accounts/utils.py +379,Please set default {0} in Company {1},"Kérjük, állítsa be az alapértelmezett {0} {1} Társaság"
+apps/erpnext/erpnext/accounts/utils.py +456,Please set default {0} in Company {1},"Kérjük, állítsa be az alapértelmezett {0} {1} Társaság"
 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 jelenik meg
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +146,Gross Profit / Loss,Bruttó nyereség / veszteség
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Megrendelés mellékelt tételek
 apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,A cég neve nem lehet Társaság
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Levél fejek a nyomtatási sablonok.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Címeket nyomtatási sablonok pl Pro forma számla.
+DocType: Student Guardian,Student Guardian,Student Guardian
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +184,Valuation type charges can not marked as Inclusive,Értékelés típusú költségeket nem lehet megjelölni Inclusive
 DocType: POS Profile,Update Stock,Készlet frissítése
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Különböző mértékegysége elemek, az helytelen (Total) Nettó súly értéket. Győződjön meg arról, hogy a nettó tömege egyes tételek ugyanabban UOM."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Anyagjegyzék Díjszabás
 DocType: Asset,Journal Entry for Scrap,Naplóbejegyzést Fémhulladék
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,"Kérjük, húzza elemeket szállítólevél"
-apps/erpnext/erpnext/accounts/utils.py +349,Journal Entries {0} are un-linked,A naplóbejegyzések {0} un-linked
+apps/erpnext/erpnext/accounts/utils.py +426,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ók használt elemek
 apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,Kérjük beszélve Round Off Cost Center Company
@@ -2801,6 +2837,7 @@
 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,"Töltse le a jelentést, amely tartalmazza az összes nyersanyagot, a legfrissebb Készlet állapot"
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Közösségi Fórum
+DocType: Homepage,"URL for ""All Products""",URL &quot;Összes termék&quot;
 DocType: Leave Application,Leave Balance Before Application,Hagyja Balance alkalmazása előtt
 DocType: SMS Center,Send SMS,SMS küldése
 DocType: Cheque Print Template,Width of amount in word,Szélessége összeg szó
@@ -2809,20 +2846,20 @@
 DocType: Item,Standard Selling Rate,Normál eladási árfolyam
 DocType: Account,Rate at which this tax is applied,"Arány, amely ezt az adót alkalmaznak"
 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 +29,Current Job Openings,Jelenlegi munkalehetőségek
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,Current Job Openings,Jelenlegi munkalehetőségek
 DocType: Company,Stock Adjustment Account,Stock korrekció számla
 DocType: Journal Entry,Write Off,Leíró
 DocType: Timesheet Detail,Operation ID,Operation ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Rendszer felhasználói (login) ID. Ha be van állítva, ez lesz az alapértelmezés minden HR formák."
-apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: {1}
+apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Feladó {1}
 DocType: Task,depends_on,attól függ
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +24,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,"Nevét az új fiók. Megjegyzés: Kérjük, ne hozzon létre ügyfélszámlák és Szolgáltatók"
 DocType: BOM Replace Tool,BOM Replace Tool,Anyagjegyzék cserélő eszköz
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Országonként eltérő címlista sablonok
 DocType: Sales Order Item,Supplier delivers to Customer,Szállító szállít az Ügyfél
-apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form / pont / {0}) elfogyott
+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átum nagyobbnak kell lennie, mint a Beküldés dátuma"
-apps/erpnext/erpnext/public/js/controllers/transaction.js +850,Show tax break-up,Mutass adókedvezmény-up
+apps/erpnext/erpnext/public/js/controllers/transaction.js +841,Show tax break-up,Mutass adókedvezmény-up
 apps/erpnext/erpnext/accounts/party.py +308,Due / Reference Date cannot be after {0},A határidő / referencia dátum nem lehet {0} utáni
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Az 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","Stock bejegyzés létezik ellen Warehouse {0}, így akkor nem lehet újra rendelhet, illetve módosíthatja azt"
@@ -2832,24 +2869,24 @@
 DocType: Sales Invoice,Rounded Total,Kerekített összeg
 DocType: Product Bundle,List items that form the package.,A lista elemei alkotják a csomagot.
 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%
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +534,Please select Posting Date before selecting Party,"Kérjük, válasszon könyvelési dátum kiválasztása előtt fél"
 DocType: Serial No,Out of AMC,ÉKSz időn túl
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +80,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,"Száma leértékelődések foglalás nem lehet nagyobb, mint a teljes száma amortizáció"
 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 +162,Please contact to the user who have Sales Master Manager {0} role,"Kérjük, lépjen kapcsolatba a felhasználónak, akik Sales mester menedzser {0} szerepe"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +195,Please contact to the user who have Sales Master Manager {0} role,"Kérjük, lépjen kapcsolatba a felhasználónak, akik Sales mester menedzser {0} szerepe"
 DocType: Company,Default Cash Account,Alapértelmezett pénzforgalmi számlát
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Cég (nem ügyfél vagy szállító) mestere.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +5,This is based on the attendance of this Student,Ennek alapja az a jelenléti e Student
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +165,Add more items or open full form,További elemek hozzáadása vagy nyitott teljes formájában
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +165,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 a ""szülés várható időpontja"""
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Szállítólevelek {0} törölni kell lemondása előtt ezt a Vevői rendelés
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +75,Paid amount + Write Off Amount can not be greater than Grand Total,"Befizetett összeg + Írja egyszeri összeg nem lehet nagyobb, mint a Grand Total"
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,{0} is not a valid Batch Number for Item {1},{0} nem érvényes Batch Number jogcím {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +138,Note: There is not enough leave balance for Leave Type {0},Megjegyzés: Nincs elég szabadság mérlege Leave Type {0}
+apps/erpnext/erpnext/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 +145,Note: There is not enough leave balance for Leave Type {0},Megjegyzés: Nincs elég szabadság mérlege Leave Type {0}
 DocType: Program Enrollment Fee,Program Enrollment Fee,Program Beiratkozási díj
 DocType: Item,Supplier Items,Szállító elemek
 DocType: Opportunity,Opportunity Type,Lehetőség Type
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,Új cég
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,Cost Center is required for 'Profit and Loss' account {0},"Költség Center szükséges ""eredménykimutatás"" veszik {0}"
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Tranzakciók csak akkor törli a Teremtő a Társaság
 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 száma főkönyvi bejegyzések találhatók. Lehet, hogy már kiválasztott egy megfelelő fiókba a tranzakciót."
 DocType: Cheque Print Template,Cheque Width,Csekk szélesség
@@ -2858,16 +2895,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,"Születési idő nem lehet nagyobb, mint ma."
 ,Stock Ageing,Készlet öregedés
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,Jelenléti ív
-apps/erpnext/erpnext/controllers/accounts_controller.py +228,{0} '{1}' is disabled,"{0} ""{1}"" le van tiltva"
+apps/erpnext/erpnext/controllers/accounts_controller.py +231,{0} '{1}' is disabled,{0} '{1}' letiltott
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Beállítás Nyílt
 DocType: Cheque Print Template,Scanned Cheque,A beolvasott Csekk
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Küldd automatikus e-maileket Kapcsolatok benyújtásával tranzakciókat.
+DocType: Timesheet,Total Billable Amount,Összesen számlázható összeg
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,3. pont
 DocType: Purchase Order,Customer Contact Email,Vásárlói Email
 DocType: Warranty Claim,Item and Warranty Details,Elem és garancia Részletek
 DocType: Sales Team,Contribution (%),Hozzájárulás (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Megjegyzés: Fizetés bejegyzés nem hozható létre, mert ""Készpénz vagy bankszámláját"" nem volt megadva"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Responsibilities,Felelősségek
+apps/erpnext/erpnext/controllers/accounts_controller.py +78,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Megjegyzés: Fizetés bejegyzés nem hozható létre, mert ""Készpénz vagy bankszámláját"" nem volt megadva"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Responsibilities,Felelősségek
 DocType: Expense Claim Account,Expense Claim Account,Költség követelés számla
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,Sablon
 DocType: Sales Person,Sales Person Name,Értékesítő neve
@@ -2875,6 +2913,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Felhasználók hozzáadása
 DocType: Pricing Rule,Item Group,Anyagcsoport
 DocType: Item,Safety Stock,Biztonsági készlet
+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: Stock Reconciliation Item,Before reconciliation,Mielőtt megbékélés
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},{0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Adók és költségek hozzáadása (a cég pénznemében)
@@ -2884,26 +2923,26 @@
 DocType: Item,Default BOM,Alapértelmezett BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Please re-type company name to confirm,"Kérjük ismíteld cég nevét, hogy erősítse"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +67,Total Outstanding Amt,Teljes fennálló Amt
-DocType: Timesheet,Total Hours,Össz óraszám
 DocType: Journal Entry,Printing Settings,Nyomtatási beállítások
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Total Debit must be equal to Total Credit. The difference is {0},"Összesen Betéti kell egyeznie az összes Credit. A különbség az, {0}"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automotive
 DocType: Asset Category Account,Fixed Asset Account,Állóeszköz-fiók
 DocType: Salary Structure Employee,Variable,Változó
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,From Delivery Note,Áthozás fuvarlevélből
-DocType: POS Profile,Allow Partial Payment,Hagyjuk Részleges fizetés
+DocType: POS Profile,Allow Partial Payment,Részleges fizetés engedélyezése
 DocType: Timesheet Detail,From Time,Időtől
 DocType: Notification Control,Custom Message,Egyedi üzenet
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investment Banking
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +71,Cash or Bank Account is mandatory for making payment entry,Készpénz vagy bankszámlára kötelező a fizetés bejegyzés
 DocType: Purchase Invoice,Price List Exchange Rate,Árlista árfolyam
+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: Purchase Invoice Item,Rate,Arány
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Intern,Intern
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,Intern
 DocType: Stock Entry,From BOM,Anyagjegyzékből
 DocType: Assessment,Assessment Code,Értékelés Code
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +32,Basic,Alapvető
+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,Részvény tranzakciók előtt {0} befagyasztották
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Kérjük, kattintson a ""Létrehoz Menetrend"""
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule',"Kérjük, kattintson a ""Létrehoz Menetrend"""
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,El kellene megegyezik Dátum fél napra szabadságra
 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 +95,Reference No is mandatory if you entered Reference Date,"Hivatkozási szám kötelező, amennyiben megadta Referencia dátum"
@@ -2912,45 +2951,47 @@
 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 +752,Issue Material,Kérdés Anyag
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +723,Issue Material,Kérdés Anyag
 DocType: Material Request Item,For Warehouse,Ebbe a raktárba
 DocType: Employee,Offer Date,Ajánlat dátum
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Idézetek
-apps/erpnext/erpnext/accounts/page/pos/pos.js +683,You are in offline mode. You will not be able to reload until you have network.,"Ön offline módban. Ön nem lesz képes, hogy újra, amíg van hálózaton."
-DocType: Hub Settings,Access Token,Access Token
+apps/erpnext/erpnext/accounts/page/pos/pos.js +665,You are in offline mode. You will not be able to reload until you have network.,"Ön offline módban. Ön nem lesz képes, hogy újra, amíg van hálózaton."
+DocType: Hub Settings,Access Token,Hozzáférési token
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +31,No Student Groups created.,Nem Diákcsoportok létre.
 DocType: Purchase Invoice Item,Serial No,Sorozatszám
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,"Kérjük, adja fenntartás Részletek először"
 DocType: Purchase Invoice,Print Language,Print Language
 DocType: Salary Slip,Total Working Hours,Teljes munkaidő
 DocType: Stock Entry,Including items for sub assemblies,Beleértve elemek részegységek
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1122,Enter value must be positive,Írja pozitív értéket kell megadni
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,All Territories,Minden Területek
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1125,Enter value must be positive,Írja pozitív értéket kell megadni
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,Összes Terület
 DocType: Purchase Invoice,Items,Tételek
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +23,Student is already enrolled.,Student már részt.
 DocType: Fiscal Year,Year Name,Év Név
 DocType: Process Payroll,Process Payroll,Bérszámfejtéséhez
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,"Jelenleg több, mint a szabadság munkanapon ebben a hónapban."
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +233,There are more holidays than working days this month.,"Jelenleg több, mint a szabadság munkanapon ebben a hónapban."
 DocType: Product Bundle Item,Product Bundle Item,Termék Bundle pont
 DocType: Sales Partner,Sales Partner Name,Értékesítő partner neve
-apps/erpnext/erpnext/hooks.py +96,Request for Quotations,Árajánlatkérés
+apps/erpnext/erpnext/hooks.py +104,Request for Quotations,Árajánlatkérés
 DocType: Payment Reconciliation,Maximum Invoice Amount,Maximális Számla összege
 apps/erpnext/erpnext/config/selling.py +23,Customers,Az ügyfelek
+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 időpontok megadása
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Securities & árutőzsdén
-apps/erpnext/erpnext/stock/doctype/item/item.py +628,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Alapértelmezett mértékegysége Variant &#39;{0}&#39; meg kell egyeznie a sablon &quot;{1}&quot;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Alapértelmezett mértékegysége Variant &#39;{0}&#39; meg kell egyeznie a sablon &quot;{1}&quot;
 DocType: Shipping Rule,Calculate Based On,A számítás ezen alapul
 DocType: Delivery Note Item,From Warehouse,Raktárról
 DocType: Assessment,Supervisor Name,Biztos neve
+DocType: Assessment,Grading Structure,besorolási szerkezetet
 DocType: Purchase Taxes and Charges,Valuation and Total,Értékelési és Total
 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 pont egy változata {0} (Template). Attribútumok kerülnek másolásra át a sablont, kivéve, ha ""No Copy"" van beállítva"
 DocType: Account,Purchase User,Vásárlási Felhasználó
 DocType: Notification Control,Customize the Notification,Értesítés testreszabása
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Cash Flow from Operations,A működésből származó pénzáramlás
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,Alapértelmezett Címsablon nem lehet törölni
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,Alapértelmezett Címsablon nem lehet törölni
 DocType: Sales Invoice,Shipping Rule,Szállítási lehetőség
 DocType: Manufacturer,Limited to 12 characters,Legfeljebb 12 karakter
 DocType: Journal Entry,Print Heading,Nyomtatás címsor
@@ -2965,8 +3006,8 @@
 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.,Gyermek fiók létezik erre a számlára. Nem törölheti ezt a fiókot.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Vagy target Menny vagy előirányzott összeg kötelező
-apps/erpnext/erpnext/stock/get_item_details.py +485,No default BOM exists for Item {0},Nincs alapértelmezett BOM létezik tétel {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +336,Please select Posting Date first,"Kérjük, válasszon Könyvelési dátum első"
+apps/erpnext/erpnext/stock/get_item_details.py +486,No default BOM exists for Item {0},Nincs alapértelmezett BOM létezik tétel {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +326,Please select Posting Date first,"Kérjük, válasszon Könyvelési dátum első"
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,"Nyitva Dátum kell, mielőtt zárónapja"
 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ég Center meglévő tranzakciók nem lehet átalakítani főkönyvi
@@ -2982,7 +3023,8 @@
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Match kifizetések a számlák
 DocType: Journal Entry,Bank Entry,Bank Entry
 DocType: Authorization Rule,Applicable To (Designation),Alkalmazandó (elnevezését)
-apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,A kosárban
+,Profitability Analysis,jövedelmezőség elemzése
+apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,Adja a kosárhoz
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Csoportosítva
 DocType: Guardian,Interests,érdekek
 apps/erpnext/erpnext/config/accounts.py +262,Enable / disable currencies.,Engedélyezése / tiltása a pénznemnek
@@ -2992,23 +3034,23 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Szórakozás és szabadidő
 DocType: Quality Inspection,Item Serial No,Anyag-sorozatszám
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Present,Összesen Present
-apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,számviteli kimutatások
+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 +141,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Serialized Elem {0} nem lehet frissíteni \ felhasználásával Stock Megbékélés
 DocType: Scheduling Tool,Day,Nap
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Új Serial No nem lehet Warehouse. Warehouse kell beállítani Stock Entry vagy vásárlási nyugta
 DocType: Lead,Lead Type,Célpont típusa
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,You are not authorized to approve leaves on Block Dates,Ön nem jogosult jóváhagyni levelek blokkolása időpontjai
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,All these items have already been invoiced,Mindezen tételek már kiszámlázott
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,You are not authorized to approve leaves on Block Dates,Ön nem jogosult jóváhagyni levelek blokkolása időpontjai
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +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},Lehet jóvá {0}
 DocType: Item,Default Material Request Type,Default Material Kérelem típusa
-DocType: Student Applicant,AP.,AP.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,Ismeretlen
 DocType: Shipping Rule,Shipping Rule Conditions,Szállítás feltételei
 DocType: BOM Replace Tool,The new BOM after replacement,"Az anyagjegyzék, amire le lesz cserélve mindenhol"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +639,Point of Sale,Értékesítési hely
+apps/erpnext/erpnext/accounts/page/pos/pos.js +634,Point of Sale,Értékesítési hely
 DocType: Payment Entry,Received Amount,kapott összeg
+DocType: Payment Entry,Party Name,fél neve
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Készítsen teljes mennyiség, figyelmen kívül hagyva a mennyiség már megrendelt"
 DocType: Account,Tax,Adó
 DocType: Production Planning Tool,Production Planning Tool,Gyártástervező eszköz
@@ -3017,74 +3059,77 @@
 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 +373,Quantity to Manufacture must be greater than 0.,"Mennyiség hogy Előállítás nagyobbnak kell lennie, mint 0."
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +375,Quantity to Manufacture must be greater than 0.,"Mennyiség hogy Előállítás 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ág és a szabad
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Százalékos Ön lehet kapni, vagy adja tovább ellen a megrendelt mennyiség. Például: Ha Ön által megrendelt 100 egység. és a juttatás 10%, akkor Ön lehet kapni 110 egység."
 DocType: POS Profile,Customer Group,Vevő csoport
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,Expense account is mandatory for item {0},Költség számla kötelező elem {0}
 DocType: Item,Website Description,Weboldal leírása
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date must be on or after today,"Következő Az értékcsökkenés dátuma nem lehet későbbi, a mai nap után"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,Nettó változása Részvény
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +145,Please cancel Purchase Invoice {0} first,"Kérjük, vonja vissza a(z) {0} bejövő számlát először"
 DocType: Serial No,AMC Expiry Date,Éves karbantartási szerződés lejárati dátuma
 ,Sales Register,Értékesítési Regisztráció
 DocType: Quotation,Quotation Lost Reason,Árajánlat elutasításának oka
+apps/erpnext/erpnext/utilities/doctype/address/address.py +164,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."
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,Válassza ki a Domain
 DocType: Address,Plant,Növény
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +330,Transaction reference no {0} dated {1},Tranzakciós hivatkozási szám {0} dátum: {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,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 szerkeszteni.
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,Summary for this month and pending activities,"Összefoglaló ebben a hónapban, és folyamatban lévő tevékenységek"
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,"Összefoglaló ebben a hónapban, és folyamatban lévő tevékenységek"
 DocType: Customer Group,Customer Group Name,Vevő csoport neve
 apps/erpnext/erpnext/public/js/financial_statements.js +54,Cash Flow Statement,Cash Flow kimutatás
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Please remove this Invoice {0} from C-Form {1},Töröld a számla {0} a C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Please remove this Invoice {0} from C-Form {1},Töröld a számla {0} a C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Kérjük, válasszon átviszi, ha Ön is szeretné közé előző pénzügyi év mérlege hagyja a költségvetési évben"
 DocType: GL Entry,Against Voucher Type,Ellen-bizonylat típusa
 DocType: Item,Attributes,Attribútumok
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +644,Get Items,Tételek áthozása
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +623,Get Items,Tételek áthozása
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +210,Please enter Write Off Account,"Kérjük, adja leírni Account"
 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 +41,Account {0} does not belongs to company {1},Account {0} nem tartozik a cég {1}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +41,Account {0} does not belongs to company {1},A {0}számlához nem tartozik a {1} vállalat
+DocType: Student,Guardian Details,Guardian Részletek
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark Jelenléti több alkalmazottal
 DocType: Payment Request,Initiated,Kezdeményezett
 DocType: Production Order,Planned Start Date,Tervezett kezdési dátum
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,Customer is required against Receivable account {0},Ügyfél köteles ellen Receivable véve {0}
 DocType: Serial No,Creation Document Type,Creation Document Type
 DocType: Leave Type,Is Encash,A behajt
 DocType: Purchase Invoice,Mobile No,Mobiltelefon
 DocType: Leave Allocation,New Leaves Allocated,Új szabadság lefoglalás
-apps/erpnext/erpnext/controllers/trends.py +265,Project-wise data is not available for Quotation,Project-bölcs adatok nem állnak rendelkezésre árajánlat
+apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Project-bölcs adatok nem állnak rendelkezésre árajánlat
 DocType: Project,Expected End Date,Várható befejezés dátuma
 DocType: 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 +101,Commercial,Kereskedelmi
-DocType: Payment Entry,Account Paid To,Fiók Paid To
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,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őelem {0} nem lehet Stock pont
-apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Minden termék és szolgáltatás.
+apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Összes termékek vagy szolgáltatások.
 DocType: Supplier Quotation,Supplier Address,Beszállító címe
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +648,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/purchase_invoice/purchase_invoice.py +651,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/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Out Mennyiség
 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 +30,Series is mandatory,Sorozat kötelező
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +50,Series is mandatory,Sorozat kötelező
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Pénzügyi szolgáltatások
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Típusú tevékenységek Time Naplók
 DocType: Tax Rule,Sales,Értékesítés
 DocType: Stock Entry Detail,Basic Amount,Alapösszege
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +165,Warehouse required for stock Item {0},Warehouse szükséges Stock tétel {0}
 DocType: Leave Allocation,Unused leaves,A fel nem használt levelek
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Cr,Kr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Cr,Kr
 DocType: Tax Rule,Billing State,Számlázási Állam
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +250,Transfer,Átutalás
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +187,{0} {1} does not associated with Party Account {2},{0} {1} nem jár a fél fiók {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,Fetch exploded BOM (including sub-assemblies),Hozz robbant BOM (beleértve a részegységeket)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +254,Transfer,Átutalás
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +190,{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 +796,Fetch exploded BOM (including sub-assemblies),Hozz robbant BOM (beleértve a részegységeket)
 DocType: Authorization Rule,Applicable To (Employee),Alkalmazandó (Employee)
-apps/erpnext/erpnext/controllers/accounts_controller.py +115,Due Date is mandatory,Due Date kötelező
+apps/erpnext/erpnext/controllers/accounts_controller.py +118,Due Date is mandatory,Due Date kötelező
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Növekménye Képesség {0} nem lehet 0
 DocType: Journal Entry,Pay To / Recd From,Fizetni / követelni tőle
 DocType: Naming Series,Setup Series,Sorszámozás beállítása
 DocType: Payment Reconciliation,To Invoice Date,A számla keltétől
 DocType: Supplier,Contact HTML,Kapcsolattartó HTML leírása
 ,Inactive Customers,inaktív ügyfelek
+DocType: Landed Cost Voucher,LCV,kishaszonjármű
 DocType: Landed Cost Voucher,Purchase Receipts,Vásárlási bevételek
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Hogyan árképzési szabály alkalmazása során?
 DocType: Quality Inspection,Delivery Note No,Szállítólevél száma
@@ -3092,19 +3137,19 @@
 DocType: Cheque Print Template,Message to show,Üzenet mutatni
 DocType: Company,Retail,Kiskereskedelem
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +120,Customer {0} does not exist,Vásárlói {0} nem létezik
-DocType: Attendance,Absent,Hiányzik
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +587,Product Bundle,Termék Bundle
+DocType: Attendance,Absent,Távollévő
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Product Bundle,Termék Bundle
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Invalid reference {1},Sor {0}: Érvénytelen hivatkozás {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Vásároljon adók és illetékek Template
 DocType: Upload Attendance,Download Template,Sablon letöltése
 DocType: Timesheet,TS-,TS-
 DocType: GL Entry,Remarks,Megjegyzések
-DocType: Payment Entry,Account Paid From,Fiók fizetett
+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,Írja Off alapuló
 DocType: Stock Settings,Show Barcode Field,Mutatása Vonalkód mező
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +742,Send Supplier Emails,Küldj Szállító e-mailek
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +104,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Fizetés már feldolgozott közötti időszakra {0} és {1}, Leave alkalmazási időszak nem lehet között erre az időszakra."
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +708,Send Supplier Emails,Küldj Szállító e-mailek
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Fizetés már feldolgozott közötti időszakra {0} és {1}, Leave alkalmazási időszak nem lehet között erre az időszakra."
 apps/erpnext/erpnext/config/stock.py +122,Installation record for a Serial No.,Telepítés rekordot a Serial No.
 DocType: Guardian Interest,Guardian Interest,Guardian kamat
 DocType: Timesheet,Employee Detail,Alkalmazott részlet
@@ -3115,9 +3160,9 @@
 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 tulajdonság {0} {1}
 DocType: Salary Slip,Earning & Deduction,Kereset és levonás
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +77,Account {0} cannot be a Group,Account {0} nem lehet Group
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} cannot be a Group,A {0} számla nem lehet Csoport
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +31,Optional. This setting will be used to filter in various transactions.,"Opcionális. Ez a beállítás kell használni, a különböző tranzakciókat."
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +107,Negative Valuation Rate is not allowed,Negatív értékelési Rate nem megengedett
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Negatív értékelési Rate nem megengedett
 DocType: Holiday List,Weekly Off,Heti Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Pl 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +39,Provisional Profit / Loss (Credit),Ideiglenes nyereség / veszteség (Credit)
@@ -3130,17 +3175,17 @@
 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,Költsége selejtezve Asset
-apps/erpnext/erpnext/controllers/stock_controller.py +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Cost Center kötelező tétel {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +626,Get Items from Product Bundle,Hogy elemeket Termék Bundle
+apps/erpnext/erpnext/controllers/stock_controller.py +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Költség központ kötelező ehhez a tételhez {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +605,Get Items from Product Bundle,Hogy elemeket Termék Bundle
 DocType: Asset,Straight Line,Egyenes
 DocType: Project User,Project User,projekt felhasználó
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} is inactive,Account {0} inaktív
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} is inactive,A {0} számla inaktív
 DocType: GL Entry,Is Advance,Ez előleg?
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Jelenléti Dátum és jelenlét a mai napig kötelező
 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"", mint Igen vagy Nem"
 DocType: Sales Team,Contact No.,Kapcsolattartó szám
 DocType: Bank Reconciliation,Payment Entries,fizetési bejegyzések
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,'Profit and Loss' type account {0} not allowed in Opening Entry,"""Eredménykimutatás"" típusú számla {0} nem engedélyezett Nyitó Bejegyzés"
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +71,'Profit and Loss' type account {0} not allowed in Opening Entry,"""Eredménykimutatás"" típusú számla {0} nem engedélyezett Nyitó Bejegyzés"
 DocType: Program Enrollment Tool,Get Students From,Get diákok
 DocType: Hub Settings,Seller Country,Eladó Ország
 apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,Adja Napirendi honlap
@@ -3159,7 +3204,7 @@
 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,Eladási jutalékok
 DocType: Offer Letter Term,Value / Description,Érték / Leírás
-apps/erpnext/erpnext/controllers/accounts_controller.py +558,"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 +561,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Sor # {0}: {1} Asset nem lehet benyújtani, ez már {2}"
 DocType: Tax Rule,Billing Country,Számlázási Ország
 DocType: Production Order,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}.,Terhelés és jóváírás nem egyenlő a {0} # {1}. Különbség van {2}.
@@ -3169,40 +3214,40 @@
 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.,A pályázatokat a szabadság.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +202,Account with existing transaction can not be deleted,Véve a meglévő ügylet nem törölhető
+apps/erpnext/erpnext/accounts/doctype/account/account.py +202,Account with existing transaction can not be deleted,Meglévő tranzakcióval rendelkező számla nem törölhető.
 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: Sales Order,% Amount Billed,% mennyiség számlázva
+DocType: Timesheet,% Amount Billed,% mennyiség számlázva
 DocType: Production Order,Warehouse for reserving items,Raktár fenntartásáról tételek
 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,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.,"Jelölje be, ha azt szeretné, hogy a felhasználó kiválaszthatja a sorozatban mentés előtt. Nem lesz alapértelmezett, ha ellenőrizni."
 apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},Egyetlen tétel Serial No {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Nyílt értesítések
+DocType: Email Digest,Open Notifications,Nyílt értesítések
 DocType: Payment Entry,Difference Amount (Company Currency),Eltérés összege (Company pénzneme)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,Közvetlen költségek
 apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
-						Email Address'",{0} érvénytelen e-mail címet a &quot;Bejelentés \ e-mail cím&quot;
+						Email Address'","{0} érvénytelen e-mail cím itt: ""Értesítés \ Email címek"""
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Új Vásárló Revenue
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,Utazási költségek
 DocType: Maintenance Visit,Breakdown,Üzemzavar
-apps/erpnext/erpnext/controllers/accounts_controller.py +634,Account: {0} with currency: {1} can not be selected,Fiók: {0} pénznem: {1} nem választható
+apps/erpnext/erpnext/controllers/accounts_controller.py +637,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},Account {0}: Parent véve {1} nem tartozik a cég: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +54,Account {0}: Parent account {1} does not belong to company: {2},A {0} számla: Szülő számla {1} nem tartozik ehhez a céghez: {2}
 DocType: Program Enrollment Tool,Student Applicants,Student 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 ügylet a vállalattal kapcsolatos!
 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,Regisztráció dátuma
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Probation,Próbaidő
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Probation,Próbaidő
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Bér összetevők
 DocType: Program Enrollment Tool,New Academic Year,Új Tanév
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Payment of salary for the month {0} and year {1},Kifizetését fizetése a hónap {0} és az év {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Payment of salary for the month {0} and year {1},Kifizetését fizetése a hónap {0} és az év {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,"Auto insert árjegyzéke mértéke, ha hiányzik"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Teljes befizetett összeg
 DocType: Production Order Item,Transferred Qty,Át Mennyiség
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigálás
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Planning,Tervezés
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,Tervezés
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Kiadott
 DocType: Project,Total Billing Amount (via Time Logs),Összesen Számlázási összeg (via Idő Napló)
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,We sell this Item,Az általunk forgalmazott ezt a tárgyat
@@ -3215,43 +3260,44 @@
 DocType: Sales Partner,Contact Desc,Kapcsolattartó leírása
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Típusú levelek, mint alkalmi, beteg stb"
 DocType: Email Digest,Send regular summary reports via Email.,Küldd el a rendszeres összefoglaló jelentések e-mailben.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Sales invoice submitted sucessfully.,Kimenő számla sikeresen rögzítve
 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},"Kérjük, állítsa be az alapértelmezett fiókot Költség Követelés típusa: {0}"
 DocType: Assessment Result,Student Name,Tanuló név
-apps/erpnext/erpnext/hooks.py +104,Assessment Schedule,Assessment Schedule
+apps/erpnext/erpnext/hooks.py +113,Assessment Schedule,Assessment Schedule
 DocType: Brand,Item Manager,Elem menedzser
 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: Elem {0} többször jelenik meg
-apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Minden Kapcsolattartó.
+apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Összes Kapcsolattartó.
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Company Abbreviation,Cég rövidítése
 DocType: GL Entry,Party Type,Párt Type
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +78,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ési Entry már létezik
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Nem authroized hiszen {0} meghaladja határértékek
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Fizetés sablon mester.
 DocType: Leave Type,Max Days Leave Allowed,Max nap szabadságra hozhatja
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Állítsa adózási szabály az bevásárlókosár
 DocType: Purchase Invoice,Taxes and Charges Added,Adók és költségek hozzáadása
 ,Sales Funnel,Értékesítési csatorna
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +25,Abbreviation is mandatory,Rövidítése kötelező
+apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +25,Abbreviation is mandatory,Rövidítés kötelező
 ,Qty to Transfer,Mennyiség Transfer
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Idézetek a vezetéket vagy ügyfelek.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Zárolt készlet szerkesztésének engedélyezése ennek a beosztásnak
 ,Territory Target Variance Item Group-Wise,Terület Cél Variance tétel Group-Wise
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Customer Groups,Minden vásárlói csoport
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +78,Accumulated Monthly,Halmozott Havi
-apps/erpnext/erpnext/controllers/accounts_controller.py +595,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} kötelező. Talán Pénzváltó rekord nem teremtett {1} {2}.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Összes vásárlói csoport
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +81,Accumulated Monthly,Halmozott Havi
+apps/erpnext/erpnext/controllers/accounts_controller.py +598,{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,Account {0}: Parent véve {1} nem létezik
+apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,A {0} számla: Szülő számla {1} nem létezik
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Árlista Rate (Társaság Currency)
 DocType: Products Settings,Products Settings,Termék beállítások
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +188,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: Account,Temporary,Ideiglenes
 DocType: Address,Preferred Billing Address,Ez legyen a számlázási cím is
 DocType: Program,Courses,tanfolyamok
 DocType: Monthly Distribution Percentage,Percentage Allocation,Százalékos megoszlás
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Secretary,Titkár
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Secretary,Titkár
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Ha kikapcsolja, az &quot;In szavak&quot; mezőben nem lesz látható bármilyen tranzakció"
 DocType: Serial No,Distinct unit of an Item,Különálló egység Egy tétel
 DocType: Pricing Rule,Buying,Beszerzés
@@ -3260,24 +3306,22 @@
 ,Reqd By Date,Reqd 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
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,Sor # {0}: Sorszám kötelező
+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,Elem Wise Tax részlete
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,Intézet rövidítése
 ,Item-wise Price List Rate,Elem-bölcs árjegyzéke Rate
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +859,Supplier Quotation,Beszállítói ajánlat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +838,Supplier Quotation,Beszállítói ajánlat
 DocType: Quotation,In Words will be visible once you save the Quotation.,"A szavak lesz látható, ha menteni a stringet."
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +7,Collect Fees,Gyűjtsük díjak
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,Gyűjtsük díjak
 DocType: Attendance,ATT-,ATT-
 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
-DocType: Lead,Add to calendar on this date,Hozzáadás a naptárhoz ezen a napon
+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.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Közelgő események
 DocType: Item,Opening Stock,nyitó állomány
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Ügyfél köteles
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} kötelező Return
+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,Kapni
 apps/erpnext/erpnext/public/js/setup_wizard.js +195,user@example.com,user@example.com
-DocType: Email Digest,Income / Expense,Bevételek / ráfordítások
 DocType: Employee,Personal Email,Személyes emailcím
 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.","Ha engedélyezve van, a rendszer küldeni könyvelési tételek a leltár automatikusan."
@@ -3288,14 +3332,15 @@
 DocType: Customer,From Lead,Célponttól
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Megrendelések bocsátott termelés.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Válassza ki Fiscal Year ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,POS Profile required to make POS Entry,POS Profil köteles a POS Entry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +509,POS Profile required to make POS Entry,POS Profil köteles a POS Entry
 DocType: Program Enrollment Tool,Enroll Students,Iratkozz diákok
 DocType: Hub Settings,Name Token,Név Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Normál Ajánló
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Atleast one warehouse is mandatory,Adni legalább egy raktárban kötelező
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +129,Atleast one warehouse is mandatory,Adni legalább egy raktárban kötelező
 DocType: Serial No,Out of Warranty,Garanciaidőn túl
 DocType: BOM Replace Tool,Replace,Csere
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Invoice {1},{0} ellen Értékesítési számlák {1}
+DocType: Production Order,Unstopped,Unstopped
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Invoice {1},{0} a {1} Értékesítési számla ellen
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Projekt neve
 DocType: Supplier,Mention if non-standard receivable account,"Beszélve, ha nem szabványos követelések számla"
@@ -3315,14 +3360,15 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"A levelek kell felosztani többszörösei 0,5"
 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 látogatottsága a CSV-fájl
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Kiemelkedő Amt
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Célok tétel Group-bölcs erre a Sales Person.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],[napoknál] régebbi készlet zárolása
-apps/erpnext/erpnext/controllers/accounts_controller.py +528,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 +531,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/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ályok megtalálhatók alapján a fenti feltételeknek, Priority alkalmazzák. Prioritás közötti szám 0-20, míg alapértelmezett érték nulla (üres). A magasabb szám azt jelenti, hogy elsőbbséget, ha több árképzési szabályok azonos feltételek mellett."
 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,A devizaárfolyam-
-DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,"Hagyja, hogy a következő felhasználók jóváhagyása Leave alkalmazások blokk nap."
+DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Engedélyezze a következő felhasználók Távollét alkalmazás jóváhagyását a blokkolt napokra.
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,Típusú kiadások állítást.
 DocType: Item,Taxes,Adók
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +301,Paid and Not Delivered,Fizetett és nem nyilvánított
@@ -3331,19 +3377,19 @@
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Stock tranzakciók
 DocType: Budget,Budget Accounts,költségvetési számlák
 DocType: Employee,Internal Work History,Belső munka története
-DocType: Depreciation Schedule,Accumulated Depreciation Amount,Halmozott értékcsökkenés
+DocType: Depreciation Schedule,Accumulated Depreciation Amount,Halmozott értékcsökkenés összege
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Vevői visszajelzés
 DocType: Account,Expense,Költség
-DocType: Sales Invoice,Exhibition,Kiállítás
 apps/erpnext/erpnext/utilities/doctype/address/address.py +77,"Company is mandatory, as it is your company address","Company kötelező, hiszen a cég címe"
 DocType: Item Attribute,From Range,Range
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +81,Syntax error in formula or condition: {0},Szintaktikai hiba a képlet vagy állapot: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +92,Syntax error in formula or condition: {0},Szintaktikai hiba a képlet vagy állapot: {0}
 apps/erpnext/erpnext/stock/utils.py +99,Item {0} ignored since it is not a stock item,"Elem {0} figyelmen kívül hagyni, mivel ez nem egy állomány elem"
+DocType: Appraisal,APRSL,APRSL
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +34,Submit this Production Order for further processing.,Benyújtja ezt Production Order 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 vonatkozik árképzési szabály egy adott ügylet minden esetben árképzési szabályokat kell tiltani.
 DocType: Company,Domain,Terület
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Jobs,Állás
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,Állás
 ,Sales Order Trends,Vevői Trends
 DocType: Employee,Held On,Tartott
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Gyártási tétel
@@ -3352,17 +3398,17 @@
 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égén 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 kiszűrni alapján utalvány No, ha csoportosítva utalvány"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +763,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 +729,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","Add felhasználók számára, hogy a szervezet, más mint te"
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,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 +42,Casual Leave,Alkalmi szabadság
+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/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 szabadság
 DocType: Batch,Batch ID,Köteg ID
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,Note: {0},Megjegyzés: {0}
 ,Delivery Note Trends,Szállítólevélen Trends
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +103,This Week's Summary,Ezen a héten összefoglalója
-apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Fiók: {0} csak akkor lehet frissíteni keresztül részvény tranzakciók
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Ezen a héten összefoglalója
+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ő
 DocType: Student Group Creation Tool,Get Courses,Get Tanfolyamok
 DocType: GL Entry,Party,Fél
 DocType: Sales Order,Delivery Date,Szállítási dátum
@@ -3370,8 +3416,8 @@
 DocType: Purchase Receipt,Return Against Purchase Receipt,Return Against vásárlási nyugtát
 DocType: Request for Quotation Item,Request for Quotation Item,Árajánlatkérés pont
 DocType: Purchase Order,To Bill,Bill
-DocType: Material Request,% Ordered,Rendezett%
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Piecework,Darabszámra fizetett munka
+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ási ráta
 DocType: Task,Actual Time (in Hours),Tényleges idő (óra)
 DocType: Employee,History In Company,Előzmények a cégnél
@@ -3385,13 +3431,13 @@
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +4,Approve,Jóváhagy
 DocType: Customer,Sales Partner and Commission,Értékesítési Partner és a Bizottság
 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 {1} szükség {2} befejezni ezt a tranzakciót.
+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.
 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 +162,Black,Fekete
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Black,Fekete
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Robbanás Elem
 DocType: Account,Auditor,Könyvvizsgáló
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +56,{0} items produced,{0} előállított
+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/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Visszatérés
 DocType: Production Order Operation,Production Order Operation,Gyártási rendelés Operation
@@ -3399,13 +3445,13 @@
 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}","Asset {0} nem selejtezték, ahogy ez már {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Teljes Költség Követelés (via költségelszámolás benyújtás)
-apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +69,Customer Id,Az ügyfél Id
+apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +70,Customer Id,Az ügyfél Id
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Mark Hiányzik
 DocType: Journal Entry Account,Exchange Rate,Átváltási arány
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Sales Order {0} is not submitted,Vevői {0} nem nyújtják be
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +527,Sales Order {0} is not submitted,Vevői {0} nem nyújtják be
 DocType: Homepage,Tag Line,tag vonal
 DocType: Fee Component,Fee Component,díj komponens
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +857,Add items from,Add tárgyak
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +836,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
 DocType: Cheque Print Template,Regular,Szabályos
 DocType: BOM,Last Purchase Rate,Utolsó beszerzési ár
@@ -3413,29 +3459,30 @@
 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 tétel {0} óta van változatok
 ,Sales Person-wise Transaction Summary,Sales Person-bölcs Tranzakciós összefoglalása
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +60,Cost Center is required for 'Profit and Loss' account {0}. Please set up a default Cost Center for the Company.,"Költség Center szükséges &quot;Eredménykimutatás&quot; fiók {0}. Kérjük, állítsa be az alapértelmezett Költségközpont a Társaság számára."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,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 Distribution százalékok
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,A kiválasztott elem nem lehet Batch
-DocType: Delivery Note,% of materials delivered against this Delivery Note,% Anyagokat szállított ellen szállítólevél
+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
 DocType: SMS Settings,Enter url parameter for receiver nos,Adja url paraméter vevő nos
 DocType: Payment Entry,Paid Amount,Fizetett összeg
 DocType: Assessment,Supervisor,Felügyelő
-apps/erpnext/erpnext/accounts/page/pos/pos.js +710,Online,Online
+apps/erpnext/erpnext/accounts/page/pos/pos.js +692,Online,Online
 ,Available Stock for Packing Items,Elérhető készlet a csomagoláshoz
 DocType: Item Variant,Item Variant,Elem Variant
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,"Ha ezt Címsablon alapértelmezett, mivel nincs más alapértelmezett"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Számlaegyenleg már terhelés, akkor nem szabad beállítani ""egyensúlyt kell"", mint ""Credit"""
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Quality Management,Quality Management
+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"
+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,Quality Management
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} has been disabled,Elem {0} van tiltva
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},"Kérjük, adjon meg mennyiséget tétel {0}"
 DocType: Employee External Work History,Employee External Work History,A munkavállaló korábbi munkahelyei
 DocType: Tax Rule,Purchase,Vásárlás
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Balance Mennyiség
 DocType: Item Group,Parent Item Group,Szülőelem Group
-apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} {1}
+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ég Centers
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,"Arány, amely szállító valuta konvertálja a vállalkozás székhelyén pénznemben"
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: Timings konfliktusok sora {1}
@@ -3450,11 +3497,12 @@
 DocType: Student,Student Email ID,Student-mail azonosítót
 DocType: Employee,Notice (days),Figyelmeztetés (nap)
 DocType: Tax Rule,Sales Tax Template,Forgalmi adó Template
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1520,Select items to save the invoice,"Válassza ki a tételeket, hogy mentse a számlát"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1544,Select items to save the invoice,"Válassza ki a tételeket, hogy mentse a számlát"
 DocType: Employee,Encashment Date,Beváltás dátuma
 DocType: Account,Stock Adjustment,Stock Adjustment
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Alapértelmezett Tevékenység Költség létezik tevékenység típusa - {0}
 DocType: Production Order,Planned Operating Cost,Tervezett üzemeltetési költség
+DocType: Academic Term,Term Start Date,Term kezdési dátum
 apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},Mellékeljük {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,"Bankkivonat egyensúlyt, mint egy főkönyvi"
 DocType: Job Applicant,Applicant Name,Kérelmező neve
@@ -3465,7 +3513,7 @@
 
 For Example: If you are selling Laptops and Backpacks separately and have a special price if the customer buys both, then the Laptop + Backpack will be a new Product Bundle Item.
 
-Note: BOM = Bill of Materials","Összesített csoport ** ** elemek egy másik ** Elem **. Ez akkor hasznos, ha kötegeljük egy bizonyos ** ** tételek egy csomagban és fenntartani állományát a csomagolt ** ** tételek, és nem az aggregált ** Elem **. A csomag ** ** Elem lesz &quot;Ez Stock cikk&quot; &quot;Nem&quot; és &quot;Van Sales pont&quot;, mint &quot;igen&quot;. Például: Ha Ön értékesítési laptopok és hátizsákok külön-külön és egy speciális árat, ha az ügyfél vásárol két, akkor a Laptop + hátizsák lesz egy új termék Bundle pont. Megjegyzés: BOM = Bill of Materials"
+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észletel 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},Serial No kötelező tétel {0}
 DocType: Item Variant Attribute,Attribute,Tulajdonság
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,Please specify from/to range,Kérem adjon meg / a tartomány
@@ -3473,28 +3521,28 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +54,Item valuation rate is recalculated considering landed cost voucher amount,Elem értékelési kamatlábat újraszámolják tekintve landolt költsége utalvány összegét
 apps/erpnext/erpnext/config/selling.py +143,Default settings for selling transactions.,Alapértelmezett beállítások eladási tranzakciókat.
 DocType: BOM Replace Tool,Current BOM,Aktuális anyagjegyzék (mit)
-apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Add Serial No
+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,szavatosság
 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 álló
-apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} eszköz nem vihető át
+apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} tárgyi eszköz nem vihető át
 DocType: Workstation,per hour,óránként
 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.,Véve a raktárban (Perpetual Inventory) jön létre e számla.
+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ánka 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ár nem lehet törölni a készletek főkönyvi bejegyzés létezik erre a raktárban.
 DocType: Company,Distribution,Nagykereskedelem
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +8,Amount Paid,Kifizetett Összeg
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Project Manager,Projekt menedzser
+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 menedzser
 ,Quoted Item Comparison,Idézett pont Összehasonlítás
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Dispatch,Dispatch
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,Dispatch
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,A(z) {0} tételre max. {1}% engedmény adható
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,Eszközérték a
 DocType: Account,Receivable,Követelés
+DocType: Grade Interval,From Score,tól Score
 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 szállító Megrendelés már létezik
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Szerepet, amely lehetővé tette, hogy nyújtson be tranzakciók, amelyek meghaladják hitel határértékeket."
-DocType: Sales Invoice,Supplier Reference,Beszállító ajánlása
-apps/erpnext/erpnext/accounts/page/pos/pos.js +844,"Master data syncing, it might take some time","A törzsadatok szinkronizálását, ez eltart egy ideig"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +832,"Master data syncing, it might take some time","A törzsadatok szinkronizálását, ez eltart egy ideig"
 DocType: Item,Material Issue,Anyag probléma
 DocType: Hub Settings,Seller Description,Eladó Leírás
 DocType: Employee Education,Qualification,Képesítés
@@ -3508,7 +3556,7 @@
 DocType: Naming Series,Select Transaction,Válassza a Tranzakció
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,"Kérjük, adja jóváhagyása Role vagy jóváhagyása Felhasználó"
 DocType: Journal Entry,Write Off Entry,Írja Off Entry
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +83,Error in formula or condition,Hiba a képlet vagy állapot
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,Error in formula or condition,Hiba a képlet vagy állapot
 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,Törölje az összes
@@ -3517,7 +3565,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},El kellene belüli pénzügyi évben. Feltételezve To Date = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Itt tart fenn magasság, súly, allergia, egészségügyi problémák stb"
 DocType: Leave Block List,Applies to Company,Vonatkozik Társaság
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +197,Cannot cancel because submitted Stock Entry {0} exists,"Nem lehet mondani, mert be Stock Entry {0} létezik"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +198,Cannot cancel because submitted Stock Entry {0} exists,"Nem lehet mondani, mert be Stock Entry {0} létezik"
 DocType: Purchase Invoice,In Words,Szavakkal
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,Today is {0}'s birthday!,Ma van {0} 's születésnapját!
 DocType: Production Planning Tool,Material Request For Warehouse,Anyagigénylés raktárba
@@ -3527,14 +3575,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,A pénzügyi év kezdete
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Eszköz-gyengülés és egyenlegek
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +319,Amount {0} {1} transferred from {2} to {3},Összeg: {0} {1} átment a {2} és {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +322,Amount {0} {1} transferred from {2} to {3},Összeg: {0} {1} átment a {2} és {3}
 DocType: Sales Invoice,Get Advances Received,Befogadott előlegek átmásolása
-DocType: Email Digest,Add/Remove Recipients,Hozzáadása / eltávolítása címzettek
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +432,Transaction not allowed against stopped Production Order {0},A tranzakció nem megengedett ellen leállította a termelést Megrendelni {0}
+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 +437,Transaction not allowed against stopped Production Order {0},A tranzakció nem megengedett ellen leállította a termelést Megrendelni {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Beállítani a költségvetési évben alapértelmezettként, kattintson a ""Beállítás alapértelmezettként"""
 apps/erpnext/erpnext/projects/doctype/project/project.py +143,Join,Csatlakozik
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Hiány Mennyiség
-apps/erpnext/erpnext/stock/doctype/item/item.py +652,Item variant {0} exists with same attributes,Elem változat {0} létezik azonos tulajdonságokkal
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Elem változat {0} létezik azonos tulajdonságokkal
+DocType: Leave Application,LAP/,LAP /
 DocType: Salary Slip,Salary Slip,Bérlap
 DocType: Pricing Rule,Margin Rate or Amount,Margó ütemére vagy mértékére
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,"""Határidô"" szükséges"
@@ -3542,12 +3591,12 @@
 DocType: Sales Invoice Item,Sales Order Item,Vevői Elem
 DocType: Salary Slip,Payment Days,Fizetési Napok
 DocType: Customer,Dormant,Alvó
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +212,Warehouses with child nodes cannot be converted to ledger,Raktárak gyermek csomópontok nem lehet átalakítani főkönyvi
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +215,Warehouses with child nodes cannot be converted to ledger,Raktárak gyermek csomópontok nem lehet átalakítani főkönyvi
 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: Employee Education,Employee Education,Munkavállaló képzése
-apps/erpnext/erpnext/public/js/controllers/transaction.js +866,It is needed to fetch Item Details.,"Erre azért van szükség, hogy hozza Termék részletek."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +857,It is needed to fetch Item Details.,"Erre azért van szükség, hogy hozza Termék részletek."
 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,Serial No {0} már beérkezett
@@ -3557,14 +3606,14 @@
 DocType: Expense Claim,Total Claimed Amount,Összesen követelt összeget
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,A potenciális értékesítési lehetőségeinek.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,Invalid {0},Érvénytelen {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Sick Leave,A betegszabadság
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,Sick Leave,A 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
 DocType: Warehouse,PIN,PIN
 DocType: Sales Invoice,Base Change Amount (Company Currency),Base Change Összeg (Company pénzneme)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +313,No accounting entries for the following warehouses,Nincs számviteli bejegyzést az alábbi raktárak
-apps/erpnext/erpnext/projects/doctype/project/project.js +102,Save the document first.,Mentse el a dokumentumot.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +314,No accounting entries for the following warehouses,Nincs számviteli bejegyzést az alábbi raktárak
+apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Mentse el a dokumentumot.
 DocType: Account,Chargeable,Felszámítható
 DocType: Company,Change Abbreviation,Change rövidítése
 DocType: Expense Claim Detail,Expense Date,Igénylés dátuma
@@ -3577,10 +3626,9 @@
 DocType: Purchase Invoice,Recurring Print Format,Ismétlődő Print Format
 DocType: C-Form,Series,Sorszám
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,Expected Delivery Date cannot be before Purchase Order Date,A Várható szállítás dátuma nem lehet korábbi mint a beszerzési rendelés dátuma
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,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: Appraisal,Appraisal Template,Teljesítmény értékelő sablon
 DocType: Item Group,Item Classification,Elem osztályozás
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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
@@ -3590,8 +3638,8 @@
 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,Itemwise Ajánlott Reorder Level
 DocType: Salary Detail,Salary Detail,fizetés részlet
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +940,Please select {0} first,"Kérjük, válassza ki a {0} első"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +749,Batch {0} of Item {1} has expired.,Batch {0} pont {1} lejárt.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +953,Please select {0} first,"Kérjük, válassza ki a {0} első"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +757,Batch {0} of Item {1} has expired.,Batch {0} pont {1} lejárt.
 DocType: Sales Invoice,Commission,Jutalék
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Idő lap gyártása.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,Részösszeg
@@ -3608,38 +3656,39 @@
 {% 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 +92,Warehouse not found in the system,Raktár nem található a rendszerben
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +106,This Month's Summary,Ebben a hónapban összefoglalója
+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,Ebben a hónapban összefoglalója
 DocType: Quality Inspection Reading,Quality Inspection Reading,Minőség-ellenőrzési Reading
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,"`Zárolja azon készleteket, amelyek régebbiek, mint' kisebbnek kell lennie, mint a nap %-a."
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,"`Zárolja azon készleteket, amelyek régebbiek, mint` kisebbnek kell lennie,  %d napnál."
 DocType: Tax Rule,Purchase Tax Template,Forgalmi adót Template
 ,Project wise Stock Tracking,Projekt raktárkészlet követése
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Karbantartási ütemterv {0} létezik elleni {0}
-DocType: Stock Entry Detail,Actual Qty (at source/target),Tényleges Mennyiség (forrásnál / target)
+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,Ref Code
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Munkavállalók adatait.
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Please set Next Depreciation Date,"Kérjük, állítsa Következő Értékcsökkenés dátuma"
-DocType: Payment Gateway,Payment Gateway,Fizetési Gateway
 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.,Egyezik összeköttetésben nem álló számlákat és a kifizetéseket.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Place Order
+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,Root 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 olyan meglévő ügyletek ezt az elemet, nem tudja megváltoztatni az értékét {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 on
+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 +378,Operation Time must be greater than 0 for Operation {0},"Működési idő nagyobbnak kell lennie, mint 0 Operation {0}"
+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ő nagyobbnak kell lennie, mint 0 Operation {0}"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Warehouse is mandatory,Warehouse 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 web barátságos 900px (w) által 100px (h)
 DocType: Program,Program Abbreviation,Program rövidítése
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Production Order cannot be raised against a Item Template,Termelési hogy nem lehet ellen emelt elemsablont
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Production Order cannot be raised against a Item Template,Termelési hogy nem lehet ellen emelt elemsablont
 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át az olyan áru
 DocType: Warranty Claim,Resolved By,Megoldotta
 DocType: Appraisal,Start Date,Kezdés dátuma
-apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Osztja levelek időszakra.
+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,A csekkeket és betétek helytelenül elszámolt
-apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: You can not assign itself as parent account,Account {0}: Nem rendelhet magának szülői fiók
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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
 DocType: Purchase Invoice Item,Price List Rate,Árlista arány
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Mutasd a ""raktáron"", vagy ""nincs raktáron"" alapján álló állomány ebben a raktárban."
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),Anyagjegyzék (BOM)
@@ -3649,49 +3698,52 @@
 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 +27,Transaction currency must be same as Payment Gateway currency,A művelet pénzneme meg kell egyeznie a Payment Gateway pénznemben
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Transaction currency must be same as Payment Gateway currency,A művelet pénzneme meg kell egyeznie a Payment Gateway pénznemben
 DocType: Payment Entry,Receive,Kaphat
+apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,idézetek:
 DocType: Maintenance Visit,Fully Completed,Teljesen kész
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% kész
 DocType: Employee,Educational Qualification,Iskolai végzettség
 DocType: Workstation,Operating Costs,A működési költségek
-DocType: Budget,Action if Accumulated Monthly Budget Exceeded,"Eljárás, ha a felhalmozott havi költségkeret Meghaladta"
+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és
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +432,Currency for {0} must be {1},Árfolyam {0} kell lennie {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +435,Currency for {0} must be {1},Árfolyam {0} kell lennie {1}
 DocType: Asset,Disposal Date,ártalmatlanítás időpontja
 DocType: Employee Leave Approver,Employee Leave Approver,Munkavállalói Leave Jóváhagyó
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,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 +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/crm/doctype/opportunity/opportunity.py +79,"Cannot declare as lost, because Quotation has been made.","Nem jelenthetjük, mint elveszett, mert Idézet történt."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Vásárlási mester menedzser
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +429,Production Order {0} must be submitted,Gyártási rendelés {0} kell benyújtani
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +434,Production Order {0} must be submitted,Gyártási rendelés {0} 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ének dátumát jogcím {0}"
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +35,Course is mandatory in row {0},Természetesen kötelező sorban {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,"A mai napig nem lehet, mielőtt a dátumot"
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +225,Add / Edit Prices,Add / Edit árak
+apps/erpnext/erpnext/stock/doctype/item/item.js +225,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
 DocType: Price List,Price List Name,Árlista neve
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +181,Totals,Az összesítések
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,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 +113,Warning: Leave application contains following block dates,Figyelmeztetés: Hagyjon kérelem tartalmazza a következő blokk húsz óra
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +120,Warning: Leave application contains following block dates,Figyelmeztetés: Hagyjon kérelem tartalmazza a következő blokk húsz óra
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Sales Invoice {0} has already been submitted,A {0} kimenő számla már elküldve
 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 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} egység {1} szükség {2} a {3} {4} az {5} befejezni ezt a tranzakció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} egység ebből: {1} szükséges ebben: {2}, erre: {3} {4} ehhez: {5} ; a tranzakció befejezéséhez."
+DocType: Fee Structure,Student Category,diák kategória
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,Kötelező feild - Get diákok
 DocType: Announcement,Student,Diák
 apps/erpnext/erpnext/config/hr.py +181,Organization unit (department) master.,Szervezeti egység (osztály) mestere.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Adjon meg egy érvényes mobil nos
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,"Kérjük, adja üzenet elküldése előtt"
+DocType: Email Digest,Pending Quotations,Függő idézetek
 apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,Point-of-Sale Profile
-apps/erpnext/erpnext/accounts/page/pos/pos.js +793,All records are synced.,Minden rekord szinkronizálva.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +781,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 SMS beállítások"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Unsecured Loans,Fedezetlen hitelek
 DocType: Cost Center,Cost Center Name,Költségközpont neve
@@ -3710,21 +3762,20 @@
 DocType: Address,Name of person or organization that this address belongs to.,"Teljes név vagy szervezet, amely ezt a címet tartozik."
 apps/erpnext/erpnext/public/js/setup_wizard.js +260,Your Suppliers,Ön Szállítók
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +49,Cannot set as Lost as Sales Order is made.,Nem lehet beállítani elveszett Sales elrendelése esetén.
-DocType: Student Applicant,Mother's Name,Anyja neve
 DocType: Request for Quotation Item,Supplier Part No,Szállító szám
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +348,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Nem vonhatja le, ha a kategória az &quot;Értékelés&quot; vagy &quot;Vaulation és a Total&quot;"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Received From,Feladó
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Received From,Feladó
 DocType: Lead,Converted,Átalakított
 DocType: Item,Has Serial No,Lesz 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}: A {0} az {1}
+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/selling/doctype/sales_order/sales_order.py +153,Row #{0}: Set Supplier for item {1},Sor # {0}: Állítsa Szállító jogcím {1}
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +93,Row {0}: Hours value must be greater than zero.,"Sor {0}: Óra értéknek nagyobbnak kell lennie, mint nulla."
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +117,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,A weboldal kép {0} ami csatolva lett a tételhez {1} nem található
 DocType: Issue,Content Type,Tartalom típusa
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Számítógép
 DocType: Item,List this Item in multiple groups on the website.,Sorolja ezt a tárgyat több csoportban a honlapon.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +172,{0} {1} does not exist,{0} {1} nem létezik
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +175,{0} {1} does not exist,{0} {1} nem létezik
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,Please check Multi Currency option to allow accounts with other currency,"Kérjük, ellenőrizze Több pénznem opciót, hogy számláikat más pénznemben"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +72,Item: {0} does not exist in the system,Cikk: {0} nem létezik a rendszerben
 apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,Ön nem jogosult a beállított értéket Frozen
@@ -3733,13 +3784,14 @@
 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énznem egyenlőnek kell lennie vagy az alapértelmezett comapany pénznemét vagy fél számla pénznemében
 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,Jelenlétit nem lehet megjelölni a jövőbeli időpontokban
 DocType: Pricing Rule,Pricing Rule Help,Árképzési szabály Súgó
 DocType: Purchase Taxes and Charges,Account Head,Számla fejléc
 apps/erpnext/erpnext/config/stock.py +163,Update additional costs to calculate landed cost of items,Frissítse többletköltségek kiszámítására landolt bekerülési
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Electrical,Elektromos
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Electrical,Elektromos
 DocType: Stock Entry,Total Value Difference (Out - In),Összesen értékkülönbözet (Out - A)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,Row {0}: Exchange Rate is mandatory,Sor {0}: árfolyam kötelező
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Felhasználói azonosító nem állította be az Employee {0}
@@ -3747,7 +3799,7 @@
 DocType: Item,Customer Code,Vevő kódja
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +210,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,Napok óta utolsó rendelés
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +292,Debit To account must be a Balance Sheet account,Megterhelése figyelembe kell egy Mérlegszámla
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To account must be a Balance Sheet account,Megterhelése figyelembe kell egy Mérlegszámla
 DocType: Buying Settings,Naming Series,Sorszámozási csoport
 DocType: Leave Block List,Leave Block List Name,Hagyja Block List név
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Stock Eszközök
@@ -3759,11 +3811,11 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Szállítólevélen {0} nem kell benyújtani
 DocType: Notification Control,Sales Invoice Message,Értékesítési számlák Message
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Záró számla {0} típusú legyen kötelezettség / saját tőke
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +301,Salary Slip of employee {0} already created for time sheet {1},Fizetés Slip dolgozói {0} már létrehozott jelenléti ív {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +313,Salary Slip of employee {0} already created for time sheet {1},Fizetés Slip dolgozói {0} már létrehozott jelenléti ív {1}
 DocType: Sales Order Item,Ordered Qty,Rendelt menny.
-apps/erpnext/erpnext/stock/doctype/item/item.py +673,Item {0} is disabled,Elem {0} van tiltva
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} is disabled,Elem {0} van tiltva
 DocType: Stock Settings,Stock Frozen Upto,Készlet zárolása eddig
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +838,BOM does not contain any stock item,BOM nem tartalmaz semmilyen tételt készlet
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +809,BOM does not contain any stock item,BOM nem tartalmaz semmilyen tételt készlet
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Period From and Period To dates mandatory for recurring {0},"Közötti időszakra, és időszakról kilenc óra kötelező visszatérő {0}"
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Projekt feladatok és tevékenységek.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Bérlap generálása
@@ -3771,23 +3823,24 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,"A kedvezménynek kisebbnek kell lennie, mint 100"
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Last purchase rate not found,Utolsó vételi árfolyamon nem talált
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Írj egy egyszeri összeget (Társaság Currency)
-apps/erpnext/erpnext/stock/doctype/item/item.py +485,Row #{0}: Please set reorder quantity,"Sor # {0}: Kérjük, állítsa újrarendezésből mennyiség"
+DocType: Sales Invoice Timesheet,Billing Hours,számlázási Óra
+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"
 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 +62,Please set {0},"Kérjük, állítsa {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 Letter feltételek
+DocType: Offer Letter,Offer Letter Terms,Ajánlat levél feltételei
+DocType: Payment Entry,Allocate Payment Amount,Osztja fizetés összege
 DocType: Employee External Work History,Salary,Bér
 DocType: Serial No,Delivery Document Type,Szállítási Document Type
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Benyújtja az összes fizetése csúszik a fent kiválasztott kritériumoknak
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} szinkronizálva
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} tétel(ek) szinkronizálva
 DocType: Sales Order,Partly Delivered,Részben szállítva
-DocType: Sales Invoice,Existing Customer,Meglévő ügyfél
 DocType: Email Digest,Receivables,Követelések
-DocType: Customer,Additional information regarding the customer.,További információt az ügyfél.
+DocType: Lead Source,Lead Source,Lead Forrás
+DocType: Customer,Additional information regarding the customer.,További információt az ügyfélről.
 DocType: Quality Inspection Reading,Reading 5,Olvasás 5
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +38,Campaign Name is required,Kampány név szükséges
 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 {0}. Annak elkerülése érdekében, kérjük, állítsa cég"
@@ -3795,10 +3848,9 @@
 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 sorozatban van állítva, és Serial No nem szerepel az ügylet, akkor az automatikus sorozatszáma alapján készíthető ez a sorozat. Ha azt szeretné, hogy kifejezetten említsék Serial Nos ezt az elemet. hagyja üresen."
 DocType: Upload Attendance,Upload Attendance,Feltöltés Nézőszám
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +129,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,Ageing tartomány 2
+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/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Öregedés tartomány 2
 DocType: SG Creation Tool Course,Max Strength,Max Strength
-DocType: Bank Reconciliation Detail,Amount,Összeg
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Anyagjegyzék cserélve
 ,Sales Analytics,Értékesítési analítika
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +113,Available {0},Elérhető {0}
@@ -3806,14 +3858,14 @@
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,E-mail beállítása
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +96,Please enter default currency in Company Master,"Kérjük, adja alapértelmezett pénznem Company mester"
 DocType: Stock Entry Detail,Stock Entry Detail,Készlet mozgás részletei
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +100,Daily Reminders,Napi emlékeztetők
+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 Termékek
 ,Asset Depreciation Ledger,Értékcsökkenés Ledger
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85,Tax Rule Conflicts with {0},Adó szabály ütközik {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +23,New Account Name,New Account Name
 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 Értékesítés modul
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Customer Service,Ügyfélszolgálat
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Customer Service,Ügyfélszolgálat
 DocType: Homepage Featured Product,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,Az elem vevőjének részletei
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Ajánlat jelölt munkát.
@@ -3822,8 +3874,9 @@
 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,Elem {0} kell lennie Stock tétel
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Alapértelmezett a Folyamatban Warehouse
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1570,Total nos of serial no is not equal to quantity.,Összesen nos a sorszám nem egyenlő mennyiségben.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1594,Total nos of serial no is not equal to quantity.,Összesen nos a sorszám nem egyenlő mennyiségben.
 apps/erpnext/erpnext/config/accounts.py +252,Default settings for accounting transactions.,Alapértelmezett beállításokat számviteli tranzakciók.
+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árható időpontja nem lehet korábbi Material igénylés dátuma
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Hiba: Nem érvényes id?
 DocType: Naming Series,Update Series Number,Sorszám frissítése
@@ -3831,34 +3884,37 @@
 DocType: Sales Order,Printing Details,Nyomtatási Részletek
 DocType: Task,Closing Date,Benyújtási határidő
 DocType: Sales Order Item,Produced Quantity,"A termelt mennyiség,"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Engineer,Mérnök
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Engineer,Mérnök
+DocType: Journal Entry,Total Amount Currency,Összesen Összeg Valuta
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Keresés részegységek
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Item Code required at Row No {0},Tételkód szükség Row {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +398,Item Code required at Row No {0},Tételkód szükség Row {0}
 DocType: Sales Partner,Partner Type,Partner típusa
 DocType: Purchase Taxes and Charges,Actual,Tényleges
 DocType: Authorization Rule,Customerwise Discount,Customerwise Kedvezmény
 apps/erpnext/erpnext/config/projects.py +35,Timesheet for tasks.,Timesheet feladatokra.
-DocType: Purchase Invoice,Against Expense Account,Ellen áfás számlát
+DocType: Purchase Invoice,Against Expense Account,Ellen költség számla
 DocType: Production Order,Production Order,Gyártásrendelés
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Installation Note {0} has already been submitted,Telepítési feljegyzés {0} már benyújtott
 DocType: Bank Reconciliation,Get Payment Entries,Get Fizetési bejegyzések
-DocType: Quotation Item,Against Docname,Ellen Docname
-DocType: SMS Center,All Employee (Active),Minden dolgozó (Aktív)
+DocType: Quotation Item,Against Docname,Ellen Doknév
+DocType: SMS Center,All Employee (Active),Összes alkalmazott (Aktív)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Megtekintés most
 DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,"Válassza ki az időszak, amikor a számla automatikusan generálja"
 DocType: BOM,Raw Material Cost,Nyersanyagköltsége
 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.,"Adja tételek és tervezett Mennyiség amelynek meg szeretné emelni a gyártási megrendeléseket, vagy töltse le a nyersanyagok elemzésre."
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +55,Part-time,Részidős
+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
 DocType: Employee,Applicable Holiday List,Alkalmazható Nyaralás listája
 DocType: Employee,Cheque,Csekk
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Sorozat Frissítve
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +57,Series Updated,Sorozat Frissítve
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Report Type kötelező
 DocType: Item,Serial Number Series,Sorozatszám sorozat
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Warehouse kötelező Stock tétel {0} sorban {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Kis- és nagykereskedelem
 DocType: Issue,First Responded On,Első válasz időpontja
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Kereszt felsorolása Elem több csoportban
+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},Pénzügyi év kezdő dátuma és a pénzügyi év vége dátum már meghatározták Fiscal Year {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +87,Clearance Date updated,Végső Dátum frissítve
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Sikeresen Egyeztetett
@@ -3872,18 +3928,18 @@
 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 +513,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 +518,Posting date and posting time is mandatory,Postára adás dátuma és a kiküldetés ideje kötelező
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Adó sablont vásárol tranzakciókat.
 ,Item Prices,Elem árak
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,A szavak lesz látható mentése után a megrendelés.
 DocType: Period Closing Voucher,Period Closing Voucher,Időszak lezárása utalvány
 apps/erpnext/erpnext/config/selling.py +67,Price List master.,Árlista mester.
 DocType: Task,Review Date,Vélemény dátuma
-DocType: Purchase Invoice,Advance Payments,Előzetes kifizetések
+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 Képesség {0} kell tartományon belül a {1} {2} a lépésekben {3} jogcím {4}
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +158,Target warehouse in row {0} must be same as Production Order,Cél raktár sorban {0} meg kell egyeznie a gyártási utasítás
-apps/erpnext/erpnext/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ő% s"
+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 sorban {0} meg kell egyeznie a gyártási utasítás
+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,"Valuta nem lehet változtatni, miután bejegyzések segítségével más pénznemben"
 DocType: Company,Round Off Account,Fejezze ki Account
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +91,Administrative Expenses,Igazgatási költségek
@@ -3891,23 +3947,22 @@
 DocType: Customer Group,Parent Customer Group,Szülő Vásárlói csoport
 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 +180,Notice Period,Felmondási idő
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Notice Period,Felmondási idő
 DocType: Asset Category,Asset Category Name,Eszköz Kategória neve
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,"Ez egy gyökér területén, és nem lehet szerkeszteni."
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +4,New Sales Person Name,Új értékesítési személy neve
 DocType: Packing Slip,Gross Weight UOM,Bruttó tömeg mértékegysége
-DocType: Email Digest,Receivables / Payables,Követelések / Kötelezettségek
-DocType: Delivery Note Item,Against Sales Invoice,Ellen Értékesítési számlák
+DocType: Delivery Note Item,Against Sales Invoice,Értékesítési ellenszámlák
 DocType: Bin,Reserved Qty for Production,Fenntartott db Termelés
 DocType: Asset,Frequency of Depreciation (Months),Az értékcsökkenés elszámolásának gyakorisága (hónapok)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +469,Credit Account,Hitelszámla
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Credit Account,Hitelszámla
 DocType: Landed Cost Item,Landed Cost Item,Beszerzési költség tétel
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +55,Show zero values,Mutasd a nulla értékeket
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Mutasd a nulla értékeket
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,"Mennyiség pont után kapott gyártási / visszacsomagolásánál a megadott alapanyagok mennyiségét,"
 apps/erpnext/erpnext/public/js/setup_wizard.js +315,Setup a simple website for my organization,Beállít egy egyszerű weboldal a szervezetem
 DocType: Payment Reconciliation,Receivable / Payable Account,Követelések / Account
-DocType: Delivery Note Item,Against Sales Order Item,Ellen Vevői Elem
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Please specify Attribute Value for attribute {0},"Kérjük, adja Jellemző értéke az attribútum {0}"
+DocType: Delivery Note Item,Against Sales Order Item,Ellen Vevői rendelési tétel
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},"Kérjük, adja Jellemző értéke az attribútum {0}"
 DocType: Item,Default Warehouse,Alapértelmezett raktár
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +39,Budget cannot be assigned against Group Account {0},Költségvetést nem lehet rendelni ellen Group Account {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,"Kérjük, adja szülő költséghely"
@@ -3925,23 +3980,26 @@
 DocType: Journal Entry,Debit Note,Terhelési értesítő
 DocType: Stock Entry,As per Stock UOM,Mivel a per Stock UOM
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Nem járt le
-DocType: Student Log,Achievement,Teljesítmény
+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árba
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,Értékesítő
-DocType: Sales Invoice,Cold Calling,Hideg hívás (telemarketing)
 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éghatékonyság Center
 DocType: Maintenance Schedule Item,Half Yearly,Félévente
 DocType: Lead,Blog Subscriber,Blog Követôk
+DocType: Guardian,Alternate Number,Alternatív száma
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,Készítse szabályok korlátozzák ügyletek alapján értékek.
 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,Összesen 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.,"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."
+DocType: Stock Reconciliation Item,Quantity Difference,mennyiség különbség
 apps/erpnext/erpnext/config/hr.py +253,Processing Payroll,Feldolgozás bérszámfejtés
 DocType: Opportunity Item,Basic Rate,Alapár
 DocType: GL Entry,Credit Amount,A hitel összege
 DocType: Cheque Print Template,Signatory Position,Az aláíró pozíció
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Beállítás Elveszett
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,Set as Lost,Beállítás Elveszett
+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étele Megjegyzés
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +5,This is based on transactions against this Customer. See timeline below for details,Ennek alapja az ügyletek ellen Ügyfél. Lásd idővonal alábbiakban részletesen
 DocType: Supplier,Credit Days Based On,"Hitel napokon, attól függően"
@@ -3953,11 +4011,10 @@
 ,Items To Be Requested,Tételek kell kérni
 DocType: Purchase Order,Get Last Purchase Rate,Kap Utolsó Purchase Rate
 DocType: Company,Company Info,Cégadatok
-apps/erpnext/erpnext/accounts/page/pos/pos.js +941,Select or add new customer,"Válassza ki, vagy új ügyfél"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +930,Select or add new customer,"Válassza ki, vagy új ügyfél"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),A vagyon (eszközök)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +5,This is based on the attendance of this Employee,Ennek alapja az a jelenléti e Alkalmazott
-DocType: Sales Invoice,Frequency,Frekvencia
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +463,Debit Account,Betéti Számla
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Debit Account,Betéti Számla
 DocType: Fiscal Year,Year Start Date,Év Start Date
 DocType: Attendance,Employee Name,Munkavállalói név
 DocType: Sales Invoice,Rounded Total (Company Currency),Kerekített összeg (a cég pénznemében)
@@ -3966,27 +4023,27 @@
 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,vásárlás összege
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +210,Supplier Quotation {0} created,Szállító Idézet {0} létrehozott
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +208,Supplier Quotation {0} created,Szállító Idézet {0} létrehozott
 apps/erpnext/erpnext/accounts/report/financial_statements.py +90,End Year cannot be before Start Year,Befejező év nem lehet korábbi első éve
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Employee Benefits,Munkavállalói juttatások
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,Employee Benefits,Munkavállalói juttatások
 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},Csomagolt mennyiséget kell egyezniük a mennyiséget tétel {0} sorban {1}
 DocType: Production Order,Manufactured Qty,Gyártott menny.
 DocType: Purchase Receipt Item,Accepted Quantity,Elfogadott mennyiség
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +228,Please set a default Holiday List for Employee {0} or Company {1},"Kérjük, állítsa be az alapértelmezett Nyaralás List Employee {0} vagy {1} Társaság"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +232,Please set a default Holiday List for Employee {0} or Company {1},"Kérjük, állítsa be az alapértelmezett Nyaralás List Employee {0} vagy {1} Társaság"
 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ôszámla
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekt azonosító
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +499,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 +500,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ő Account
 DocType: Quality Inspection Reading,Reading 3,Reading 3
 ,Hub,Kerékagy
 DocType: GL Entry,Voucher Type,Bizonylat típusa
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1007,Price List not found or disabled,"Árlista nem található, vagy a fogyatékkal"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1008,Price List not found or disabled,"Árlista nem található, vagy a fogyatékkal"
 DocType: Expense Claim,Approved,Jóváhagyott
 DocType: Pricing Rule,Price,Árazás
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +244,Employee relieved on {0} must be set as 'Left',Munkavállalói megkönnyebbült {0} kell beállítani -Bal-
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +256,Employee relieved on {0} must be set as 'Left',Munkavállalói megkönnyebbült {0} kell beállítani -Bal-
 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"" ad egy egyedi azonosító, hogy minden entitás ez a tétel, amely megtekinthető a Serial No mester."
 DocType: Guardian,Guardian,Gyám
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Értékelési {0} létre Employee {1} az adott időpontban tartományban
@@ -3995,14 +4052,14 @@
 DocType: Employee,Current Address Is,Jelenlegi cím
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,"Optional. Sets company's default currency, if not specified.","Választható. Megadja cég alapértelmezett pénznem, ha nincs megadva."
 DocType: Address,Office,Iroda
-apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Számviteli naplóbejegyzések.
+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 raktárról
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +259,Please select Employee Record first.,"Kérjük, válassza ki a dolgozó Record első."
-DocType: POS Profile,Account for Change Amount,Számla Change Összeg
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +266,Please select Employee Record first.,"Kérjük, válassza ki a dolgozó Record első."
+DocType: POS Profile,Account for Change Amount,Átváltási összeg számlája
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +190,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Sor {0}: Party / fiók nem egyezik {1} / {2} a {3} {4}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +235,Please enter Expense Account,"Kérjük, adja áfás számlát"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,Please enter Expense Account,"Kérjük, adja áfás számlát"
 DocType: Account,Stock,Készlet
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",Sor # {0}: Reference Document Type közül kell Megrendelés bejövő számla vagy Naplókönyvelés
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +976,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",Sor # {0}: Reference Document Type közül kell Megrendelés bejövő számla vagy Naplókönyvelés
 DocType: Employee,Current Address,Jelenlegi cím
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Ha az elem egy változata egy másik elemet, majd leírás, kép, árképzés, adók stb lesz állítva a sablont Ha kifejezetten nincs"
 DocType: Serial No,Purchase / Manufacture Details,Vásárlás / gyártása Részletek
@@ -4017,26 +4074,29 @@
 DocType: Asset Movement,Transaction Date,Ügylet dátuma
 DocType: Production Plan Item,Planned Qty,Tervezett Mennyiség
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,Összes adó
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,For Quantity (Manufactured Qty) is mandatory,Mert Mennyiség (gyártott db) kötelező
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,For Quantity (Manufactured Qty) is mandatory,Mert Mennyiség (gyártott db) kötelező
 DocType: Stock Entry,Default Target Warehouse,Alapértelmezett cél raktár
 DocType: Purchase Invoice,Net Total (Company Currency),Nettó összesen (a cég pénznemében)
+apps/erpnext/erpnext/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 +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Party típusa és fél csak akkor alkalmazható elleni követelések / fiók
 DocType: Notification Control,Purchase Receipt Message,Vásárlási nyugta Message
 DocType: Production Order,Actual Start Date,Tényleges kezdési dátum
-DocType: Sales Order,% of materials delivered against this Sales Order,% Anyagokat szállított ellen Vevői
+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.
 DocType: Hub Settings,Hub Settings,Hub Beállítások
 DocType: Project,Gross Margin %,A bruttó árrés %
 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 készpénzzel {0} {1} cég. Kérjük, válasszon járó vagy fizetendő számla valuta {0}."
+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 járó vagy fizetendő számlát ebben a pénznemben {0}."
 DocType: Asset,Is Existing Asset,Meglévő Asset
 ,Monthly Salary Register,Havi fizetés Regisztráció
 DocType: Warranty Claim,If different than customer address,"Ha más, mint megrendelő címét"
 DocType: BOM Operation,BOM Operation,BOM Operation
 DocType: Purchase Taxes and Charges,On Previous Row Amount,On előző sor összege
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +226,Transfer Asset,Transfer Asset
+DocType: Student,Home Address,Lakcím
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +227,Transfer Asset,Transfer Asset
 DocType: POS Profile,POS Profile,POS Profile
 apps/erpnext/erpnext/config/schools.py +33,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ésekor, célok stb"
 apps/erpnext/erpnext/stock/get_item_details.py +129,"Item {0} is a template, please select one of its variants","Elem {0} egy olyan sablon, kérjük, válasszon variánsai"
 DocType: Asset,Asset Category,Eszköz kategória
@@ -4046,8 +4106,8 @@
 DocType: Assessment,Room,Szoba
 DocType: Purchase Order,Advance Paid,A kifizetett előleg
 DocType: Item,Item Tax,Az anyag adójának típusa
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +765,Material to Supplier,Anyaga a Szállító
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +189,Excise Invoice,Jövedéki számla
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,Material to Supplier,Anyaga a Szállító
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,Jövedéki számla
 DocType: Expense Claim,Employees Email Id,Dolgozó 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,A rövid lejáratú kötelezettségek
@@ -4057,7 +4117,7 @@
 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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,Diákcsoportok létre.
 DocType: Scheduling Tool,Scheduling Tool,ütemező eszköz
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +136,Credit Card,Hitelkártya
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,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ók.
 DocType: Purchase Invoice,Next Date,Következő dátum
@@ -4065,6 +4125,7 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,"Kérjük, adja adók és illetékek"
 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","Itt tart fenn a családi részleteket, mint a neve és foglalkozása szülő, házastárs és a gyermekek"
+DocType: Academic Term,Term End Date,Term Végdátum
 DocType: Hub Settings,Seller Name,Értékesítő neve
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Levont adók és költségek (a cég pénznemében)
 DocType: Item Group,General Settings,Általános beállítások
@@ -4076,7 +4137,7 @@
 DocType: Customer,Commission Rate,Jutalék mértéke
 apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,Győződjön Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Blokk szabadság alkalmazások osztály.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +115,"Payment Type must be one of Receive, Pay and Internal Transfer","Fizetés típusa közül kell fogadása, fizetős és belső Transfer"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +118,"Payment Type must be one of Receive, Pay and Internal Transfer","Fizetés típusa közül kell fogadása, fizetős és belső Transfer"
 apps/erpnext/erpnext/config/selling.py +169,Analytics,Analitika
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,A kosár üres
 DocType: Production Order,Actual Operating Cost,Tényleges működési költség
@@ -4087,14 +4148,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Capital Stock,Capital Stock
 DocType: Packing Slip,Package Weight Details,Csomag súlyának adatai
 DocType: Payment Gateway Account,Payment Gateway Account,Fizetési Gateway fiók
-DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,A fizetés után befejezése átirányítani a felhasználó a kiválasztott oldalon.
+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.
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,Válasszon egy csv fájlt
 DocType: Purchase Order,To Receive and Bill,Fogadására és Bill
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Kiemelt Termék
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Designer,Tervező
+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
 DocType: Serial No,Delivery Details,Szállítási adatok
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +469,Cost Center is required in row {0} in Taxes table for type {1},Költség Center szükséges sorában {0} adók táblázat típusú {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +472,Cost Center is required in row {0} in Taxes table for type {1},Költség Center szükséges sorában {0} adók táblázat típusú {1}
 DocType: Program,Program Code,programkód
 ,Item-wise Purchase Register,Elem-bölcs vásárlása Regisztráció
 DocType: Batch,Expiry Date,Lejárat dátuma
@@ -4104,12 +4165,12 @@
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Projektek.
 apps/erpnext/erpnext/controllers/status_updater.py +174,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Ahhoz, hogy a túlzott számlázási vagy túlrendelést frissítse &quot;juttatás&quot; a Stock-beállításokat vagy a tétel."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,"Nem mutatnak szimbólum, mint $$ etc mellett valuták."
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +417, (Half Day),(Fél Nap)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425, (Half Day),(Fél Nap)
 DocType: Supplier,Credit Days,Credit Napok
 DocType: Leave Type,Is Carry Forward,Van átviszi
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +740,Get Items from BOM,Elemek áthozása Anyagjegyzékből
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +711,Get Items from BOM,Elemek áthozása Anyagjegyzékből
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Átfutási idő napokban
-apps/erpnext/erpnext/controllers/accounts_controller.py +549,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/controllers/accounts_controller.py +552,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 vevői rendelések, a fenti táblázatban"
 ,Stock Summary,Stock Összefoglaló
 apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,Transzfer egy eszköz az egyik raktárból a másikba
@@ -4120,6 +4181,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Szentesített Összeg
 DocType: GL Entry,Is Opening,Nyit
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +169,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,Account {0} nem létezik
+apps/erpnext/erpnext/accounts/doctype/account/account.py +218,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 honlap és egyéb kiadványok.
diff --git a/erpnext/translations/id.csv b/erpnext/translations/id.csv
index 28eba7b..4fd671c 100644
--- a/erpnext/translations/id.csv
+++ b/erpnext/translations/id.csv
@@ -18,11 +18,10 @@
 DocType: Sales Partner,Dealer,Dealer (Pelaku)
 DocType: Employee,Rented,Sewaan
 DocType: Purchase Order,PO-,po
-apps/erpnext/erpnext/accounts/report/financial_statements.py +19,Start Year {0} not found.,Mulai Tahun {0} tidak ditemukan.
 DocType: POS Profile,Applicable for User,Berlaku untuk Pengguna
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +191,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Berhenti Order Produksi tidak dapat dibatalkan, unstop terlebih dahulu untuk membatalkan"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +197,Do you really want to scrap this asset?,Apakah Anda benar-benar ingin membatalkan aset ini?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +17,Select Default Supplier,Pilih Default Pemasok
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +192,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Berhenti Order Produksi tidak dapat dibatalkan, unstop terlebih dahulu untuk membatalkan"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +198,Do you really want to scrap this asset?,Apakah Anda benar-benar ingin membatalkan aset ini?
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Pilih Default Pemasok
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Mata Uang diperlukan untuk Daftar Harga {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Akan dihitung dalam transaksi.
 DocType: Address,County,daerah
@@ -42,46 +41,45 @@
 DocType: Sales Invoice,Customer Name,Nama Konsumen
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +126,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 +180,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 +183,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 +148,Series Updated Successfully,Series Berhasil Diupdate
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +149,Series Updated Successfully,Series Berhasil Diupdate
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Periksa
 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
-DocType: Quality Inspection Reading,Parameter,{0}Para{/0}{1}me{/1}{0}ter{/0}
 apps/erpnext/erpnext/projects/doctype/project/project.py +54,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 +239,New Leave Application,Aplikasi Cuti Baru
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,New Leave Application,Aplikasi Cuti Baru
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +20,Attendance Record {0} exists against Student {1} for Course Schedule {2},Kehadiran Rekam {0} ada terhadap Mahasiswa {1} untuk Jadwal Kursus {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Bank Draft,Bank Draft
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,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
 DocType: Academic Term,Academic Term,Jangka akademik
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +13,Material,Bahan
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Quantity,Kuantitas
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +511,Accounts table cannot be blank.,Tabel account tidak boleh kosong.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +616,Quantity,Kuantitas
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +512,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)
 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/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 +142,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
-DocType: Purchase Invoice,Monthly,Bulanan
 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/buying/doctype/purchase_order/purchase_order.js +771,Invoice,Faktur
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +750,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 +198,Row {0}: {1} {2} does not match with {3},Baris {0}: {1} {2} tidak cocok dengan {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Row # {0}:
+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 +127,Please select Price List,Silakan pilih Daftar Harga
@@ -112,8 +110,8 @@
 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 +589,Get items from,Mendapatkan Stok Barang-Stok Barang dari
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +382,Stock cannot be updated against Delivery Note {0},Stock tidak dapat diperbarui terhadap Delivery Note {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Mendapatkan Stok Barang-Stok Barang dari
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,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
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Toko Kelontongan
@@ -122,7 +120,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Dana pensiun
 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 +156,Salary Structure Missing,Struktur Gaji Hilang
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,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
@@ -130,10 +128,11 @@
 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 +156,Credit limit has been crossed for customer {0} {1}/{2},Batas kredit telah menyeberang untuk Konsumen {0} {1} / {2}
-apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Apakah Aset Tetap&quot; tidak dicentang, sebagai catatan Asset ada terhadap item"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +189,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"
 DocType: Tax Rule,Tax Type,Jenis pajak
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +144,You are not authorized to add or update entries before {0},Anda tidak diizinkan untuk menambah atau memperbarui entri sebelum {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,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/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
@@ -143,18 +142,17 @@
 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 +165,Opening,Pembukaan
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,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/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Pelanggan&gt; Pelanggan Grup&gt; Wilayah
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Akun Pay Hanya
 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.
 DocType: Lead,Product Enquiry,Produk Enquiry
 DocType: Academic Term,Schools,sekolah
 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 +335,Please select Company first,Silakan pilih Perusahaan terlebih dahulu
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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
@@ -164,7 +162,7 @@
 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
 DocType: Purchase Invoice Item,Is Fixed Asset,Apakah Aset Tetap
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Available qty is {0}, you need {1}","Tersedia qty adalah {0}, Anda perlu {1}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +225,"Available qty is {0}, you need {1}","Tersedia qty adalah {0}, Anda perlu {1}"
 DocType: Expense Claim Detail,Claim Amount,Nilai Klaim
 DocType: Employee,Mr,Mr
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Supplier Type / Supplier
@@ -173,26 +171,27 @@
 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: Assessment Result,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 +171,Annual Salary,Gaji Tahunan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Annual Salary,Gaji Tahunan
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Beban Stok
-apps/erpnext/erpnext/accounts/report/financial_statements.py +22,End Year {0} not found.,Akhir Tahun {0} tidak ditemukan.
 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}
 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 +130,At least one mode of payment is required for POS invoice.,Setidaknya satu cara pembayaran diperlukan untuk POS faktur.
 DocType: Products Settings,Show Products as a List,Tampilkan Produk sebagai sebuah Daftar
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Unduh Template, isi data yang sesuai dan melampirkan gambar yang sudah dimodifikasi.
  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 +451,Item {0} is not active or end of life has been reached,Item {0} tidak aktif atau akhir hidup telah tercapai
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +456,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/controllers/accounts_controller.py +614,"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/controllers/accounts_controller.py +617,"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 +166,Settings for HR Module,Pengaturan untuk modul HR
 DocType: SMS Center,SMS Center,SMS Center
 DocType: Sales Invoice,Change Amount,perubahan Jumlah
@@ -204,13 +203,13 @@
 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 +147,Execution,Eksekusi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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/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}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,Cost Center {0} does not belong to Company {1},Biaya Pusat {0} bukan milik Perusahaan {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +100,Cost Center {0} does not belong to Company {1},Biaya Pusat {0} bukan milik Perusahaan {1}
 DocType: Customer,Individual,Individu
 DocType: Interest,Academics User,akademisi Pengguna
 DocType: Cheque Print Template,Amount In Figure,Jumlah Dalam Gambar
@@ -226,30 +225,32 @@
 DocType: Production Planning Tool,Sales Orders,Order Penjualan
 DocType: Purchase Taxes and Charges,Valuation,Valuation
 ,Purchase Order Trends,Trend Order Pembelian
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,The request for quotation can be accessed by clicking on the following link,Permintaan untuk kutipan dapat diakses dengan mengklik link berikut
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,Alokasi cuti untuk tahun berjalan.
 DocType: SG Creation Tool Course,SG Creation Tool Course,SG Penciptaan Alat Course
 DocType: Student Group Creation Tool,Leave blank if you wish to fetch all courses for selected academic term,Biarkan kosong jika Anda ingin mengambil semua program untuk jangka akademik yang dipilih
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,Insufficient Stock,Stock tidak cukup
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227,Insufficient Stock,Stock tidak cukup
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Nonaktifkan Perencanaan Kapasitas dan Waktu Pelacakan
+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: 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/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} does not belong to Company {1},Akun {0} bukan milik Perusahaan {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +86,Account {0} does not belong to Company {1},Akun {0} bukan milik Perusahaan {1}
 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}
 DocType: Naming Series,Series List for this Transaction,Daftar Series Transaksi ini
 DocType: Sales Invoice,Is Opening Entry,Entri Pembuka?
 DocType: Customer Group,Mention if non-standard receivable account applicable,Sebutkan jika akun non-standar piutang yang berlaku
 DocType: Course Schedule,Instructor Name,instruktur Nama
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,For Warehouse is required before Submit,Untuk Gudang diperlukan sebelum Submit
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,For Warehouse is required before Submit,Untuk Gudang diperlukan sebelum Submit
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Diterima pada
 DocType: Sales Partner,Reseller,Reseller
 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 +1436,"LocalStorage is full , did not save","LocalStorage penuh, tidak menyimpan"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1460,"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}
@@ -262,18 +263,19 @@
 apps/erpnext/erpnext/templates/generators/item.html +78,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 +5,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/leave_application/leave_application.py +206,Only the selected Leave Approver can submit this Leave Application,Hanya dipilih Cuti Approver dapat mengirimkan Aplikasi Cuti ini
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +213,Only the selected Leave Approver can submit this Leave Application,Hanya dipilih Cuti Approver dapat mengirimkan Aplikasi Cuti ini
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Menghilangkan Tanggal harus lebih besar dari Tanggal Bergabung
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Leaves per Year,cuti per Tahun
+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 +103,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}
+DocType: Email Digest,Profit & Loss,Rugi laba
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,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 +435,Leave Blocked,Cuti Diblokir
-apps/erpnext/erpnext/stock/doctype/item/item.py +669,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 +443,Leave Blocked,Cuti Diblokir
+apps/erpnext/erpnext/stock/doctype/item/item.py +671,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 +83,Annual,Tahunan
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +86,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
@@ -281,20 +283,22 @@
 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
 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 +91,Software Developer,Software Developer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Minimum Order Qty
 DocType: Pricing Rule,Supplier Type,Supplier Type
 DocType: Scheduling Tool,Course Start Date,Tentu saja Tanggal Mulai
 DocType: Item,Publish in Hub,Publikasikan di Hub
+DocType: Student Admission,Student Admission,Mahasiswa Pendaftaran
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is cancelled,Item {0} dibatalkan
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Material Request,Permintaan Material
+apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} is cancelled,Item {0} dibatalkan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +823,Material Request,Permintaan Material
 DocType: Bank Reconciliation,Update Clearance Date,Perbarui Izin Tanggal
 apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +28,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 +328,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Item {0} tidak ditemukan dalam &#39;Bahan Baku Disediakan&#39; tabel dalam Purchase Order {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +333,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/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
@@ -310,20 +314,21 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +130,Please select Charge Type first,Silakan pilih Mengisi Tipe terlebih dahulu
 DocType: Student Group Student,Student Group Student,Mahasiswa Grup Pelajar
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Terbaru
+DocType: Email Digest,New Quotations,Kutipan Baru
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,The Approver Cuti terlebih dahulu dalam daftar akan ditetapkan sebagai default Cuti Approver
 DocType: Tax Rule,Shipping County,Pengiriman County
 apps/erpnext/erpnext/config/desktop.py +158,Learn,Belajar
 DocType: Asset,Next Depreciation Date,Berikutnya Penyusutan Tanggal
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Biaya Aktivitas Per Karyawan
 DocType: Accounts Settings,Settings for Accounts,Pengaturan Akun
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +626,Supplier Invoice No exists in Purchase Invoice {0},Pemasok Faktur ada ada di Purchase Invoice {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +629,Supplier Invoice No exists in Purchase Invoice {0},Pemasok Faktur ada ada di Purchase Invoice {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Pengelolaan Tingkat Salesman
 DocType: Job Applicant,Cover Letter,Sampul surat
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Penghapusan Cek dan Deposito yang Jatuh Tempo
 DocType: Item,Synced With Hub,Disinkronkan Dengan Hub
 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 +348,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 +86,Circular Reference Error,Referensi Kesalahan melingkar
@@ -335,15 +340,16 @@
 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 +806,Delivery Note,Nota Pengiriman
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +800,Delivery Note,Nota Pengiriman
 apps/erpnext/erpnext/config/learn.py +87,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 +233,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/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/setup/doctype/email_digest/email_digest.py +104,Summary for this week and pending activities,Ringkasan untuk minggu ini dan kegiatan yang tertunda
+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"
 DocType: Employee,Company Email,Email Perusahaan
@@ -355,28 +361,29 @@
 apps/erpnext/erpnext/config/hr.py +186,"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
-apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Pembelian Faktur tidak dapat dilakukan terhadap aset yang ada {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +554,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 +54,{0} already allocated for Employee {1} for period {2} to {3},{0} sudah dialokasikan untuk Karyawan {1} untuk periode {2} ke {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +812,Select Item,Pilih Stok Barang
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +791,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 \
 					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 +142,Purchase Invoice {0} is already submitted,Faktur Pembelian {0} sudah Terkirim
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch ada harus sama {1} {2}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +143,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.
 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 +342,Please see attachment,Silakan lihat lampiran
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,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 +19,Setup Already Complete!!,Pengaturan Sudah Selesai!!
 ,Finished Goods,Stok Barang Jadi
 DocType: Delivery Note,Instructions,Instruksi
 DocType: Quality Inspection,Inspected By,Diperiksa Oleh
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Pemasok&gt; pemasok Jenis
 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/public/js/utils/item_selector.js +12,Add Items,Tambahkan Item
@@ -390,29 +397,29 @@
 DocType: Currency Exchange,Currency Exchange,Kurs Mata Uang
 DocType: Purchase Invoice Item,Item Name,Nama Item
 DocType: Authorization Rule,Approving User  (above authorized value),Approving User (di atas nilai yang berwenang)
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Saldo kredit
+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/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 +736,Purchase Return,Pembelian Kembali
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +715,Purchase Return,Pembelian Kembali
 ,Purchase Register,Register Pembelian
 DocType: 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 +202,{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 +209,{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 +143,Reason for losing,Alasan Kehilangan
-apps/erpnext/erpnext/accounts/utils.py +239,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 +163,Reason for losing,Alasan Kehilangan
+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
 DocType: Announcement,Receiver,Penerima
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation ditutup pada tanggal berikut sesuai Hari Libur Daftar: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Peluang
 DocType: Employee,Single,Tunggal
 DocType: Account,Cost of Goods Sold,Harga Pokok Penjualan
 DocType: Purchase Invoice,Yearly,Tahunan
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +225,Please enter Cost Center,Harap Masukan Jenis Biaya Pusat
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,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
@@ -425,26 +432,26 @@
 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
 DocType: Account,Is Group,Apakah Group?
+DocType: Email Digest,Pending Purchase Orders,Pending Pembelian Pesanan
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Nomor Serial Otomatis berdasarkan FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Periksa keunikan nomor Faktur Supplier
 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 +102,Non Profit,Non Profit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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: Stock Reconciliation Item,Do not include symbols (ex. $),Tidak termasuk simbol (ex. $)
 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 +638,Attribute {0} selected multiple times in Attributes Table,Atribut {0} karena beberapa kali dalam Atribut Tabel
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Atribut {0} karena beberapa kali dalam Atribut Tabel
 DocType: HR Settings,Employee record is created using selected field. ,
 DocType: Sales Order,Not Applicable,Tidak Berlaku
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Master 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 +862,Please enter Item Code.,Entrikan Item Code.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +847,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"
@@ -458,12 +465,12 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Efek Saham dan Deposit
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Jumlah cuti wajib dialokasikan
 DocType: Job Opening,Description of a Job Opening,Deskripsi dari Lowongan Pekerjaan
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Pending activities for today,Kegiatan tertunda untuk hari ini
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Kegiatan tertunda untuk hari ini
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Laporan Absensi.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Komponen gaji untuk gaji berdasarkan absen.
 DocType: Sales Order Item,Used for Production Plan,Digunakan untuk Rencana Produksi
 DocType: Manufacturing Settings,Time Between Operations (in mins),Waktu diantara Operasi (di menit)
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +92,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} Anggaran untuk Akun {1} terhadap Pusat Biaya {2} adalah {3}. Ini akan melebihi oleh {4}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +95,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} Anggaran untuk Akun {1} terhadap Pusat Biaya {2} adalah {3}. Ini akan melebihi oleh {4}
 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
@@ -471,24 +478,24 @@
 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/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 +86,Administrative Officer,Petugas Administrasi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,Petugas Administrasi
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +23,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 +319,Please select Company,Silakan pilih Perusahaan
-DocType: Stock Entry,Difference Account,Perbedaan Akun
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +309,Please select Company,Silakan pilih Perusahaan
+DocType: Stock Entry Detail,Difference Account,Perbedaan Akun
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,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 +398,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 +399,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 +530,"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 +532,"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 +28,Buy,Membeli
 ,Serial No Warranty Expiry,Nomor Serial Garansi telah kadaluarsa
 DocType: Sales Invoice,Offline POS Name,POS Offline Nama
 DocType: Sales Order,To Deliver,Mengirim
-DocType: Purchase Invoice Item,Item,List Stok Barang
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1563,Serial no item cannot be a fraction,Serial Item tidak dapat pecahan
+DocType: Purchase Invoice Item,Item,Barang
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1587,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
@@ -497,13 +504,14 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Account {0} does not belong to company: {1},Akun {0} bukan milik perusahaan: {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation already used for another company,Singkatan sudah digunakan untuk perusahaan lain
 DocType: Selling Settings,Default Customer Group,Bawaan Konsumen Grup
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Supplier is required against Payable account {0},Pemasok diperlukan terhadap akun Hutang {0}
 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
 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 +313,Reference No and Reference Date is mandatory for Bank transaction,Referensi ada dan Tanggal referensi wajib untuk transaksi Bank
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +316,Reference No and Reference Date is mandatory for Bank transaction,Referensi ada dan Tanggal referensi wajib untuk transaksi Bank
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Tambah / Edit Pajak dan Biaya
 DocType: Purchase Invoice,Supplier Invoice No,Nomor Faktur Supplier
 DocType: Territory,For reference,Untuk referensi
@@ -514,7 +522,6 @@
 DocType: Installation Note Item,Installation Note Item,Laporan Instalasi Stok Barang
 DocType: Production Plan Item,Pending Qty,Qty Tertunda
 DocType: Budget,Ignore,Diabaikan
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Item Code&gt; Item Grup&gt; Merek
 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/config/accounts.py +241,Setup cheque dimensions for printing,dimensi penyiapan cek untuk pencetakan
 DocType: Salary Slip,Salary Slip Timesheet,Slip Gaji Timesheet
@@ -525,11 +532,11 @@
 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/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 +28,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 +19,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 +707,Make Sales Order,Membuat Sales Order
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +701,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
@@ -545,7 +552,8 @@
 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 +734,Sales Return,Retur Penjualan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +728,Sales Return,Retur Penjualan
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +91,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)
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Database Konsumen potensial.
@@ -554,14 +562,13 @@
 DocType: Quotation,Quotation To,Quotation Untuk
 DocType: Lead,Middle Income,Penghasilan Menengah
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +212,Opening (Cr),Pembukaan (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +795,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,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 +237,Allocated amount can not be negative,Jumlah yang dialokasikan tidak dijinkan negatif
+apps/erpnext/erpnext/stock/doctype/item/item.py +797,Default Unit of Measure for Item {0} cannot be changed directly because 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
 DocType: Purchase Order Item,Billed Amt,Nilai Tagihan
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Sebuah Gudang logis terhadap entri stok yang dibuat.
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Penjualan Faktur Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},Referensi ada & Referensi Tanggal diperlukan untuk {0}
-DocType: Sales Invoice,Customer's Vendor,Vendor Konsumen
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Proposal Writing,Penulisan Proposal
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,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"
@@ -570,13 +577,14 @@
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,Pelacakan waktu
 DocType: Fiscal Year Company,Fiscal Year Company,Tahun Fiskal Perusahaan
 DocType: Packing Slip Item,DN Detail,DN Detil
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +257,Already supplier quotation has created,Sudah kutip pemasok telah menciptakan
 DocType: Timesheet,Billed,Ditagih
 DocType: Batch,Batch Description,Keterangan Batch
+apps/erpnext/erpnext/accounts/utils.py +685,"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 +733,View Offline Records,Lihat Offline Rekaman
+apps/erpnext/erpnext/accounts/page/pos/pos.js +715,View Offline Records,Lihat Offline Rekaman
+DocType: Student,Sibling Details,Detail saudara
 DocType: Employee,Reason for Resignation,Alasan pengunduran diri
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,Template untuk penilaian kinerja.
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,Faktur / Jurnal entri Detail
@@ -590,19 +598,20 @@
 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
 DocType: Employee,Passport Number,Nomor Paspor
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Manager,Manajer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,Manajer
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,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
 DocType: Installation Note,IN-,DI-
-apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter email address,Masukkan alamat email
+apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter email address,Silahkan masukkan alamat email
 DocType: Production Order Operation,In minutes,Dalam menit
 DocType: Issue,Resolution Date,Tanggal Resolusi
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +299,Timesheet created:,Absen dibuat:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +715,Please set default Cash or Bank account in Mode of Payment {0},Silakan set Cash standar atau rekening Bank Mode Pembayaran {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +300,Timesheet created:,Absen dibuat:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +772,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
 DocType: Selling Settings,Customer Naming By,Penamaan Konsumen Dengan
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Silakan penyiapan Karyawan Penamaan Sistem di Sumber Daya Manusia&gt; Settings HR
 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
@@ -627,6 +636,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,Selesai
 DocType: Pricing Rule,Sales Manager,Sales Manager
 DocType: Salary Structure Employee,Base,Mendasarkan
+DocType: Timesheet,Total Billed Hours,Total Jam Ditagih
 DocType: Journal Entry,Write Off Amount,Jumlah Nilai Write Off
 DocType: Journal Entry,Bill No,Nomor Tagihan
 DocType: Company,Gain/Loss Account on Asset Disposal,Gain / Loss Account pada Asset Disposal
@@ -641,11 +651,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +9,Pre Sales,Pra penjualan
 DocType: Purchase Receipt,Other Details,Detail lainnya
 DocType: Account,Accounts,Akun / Rekening
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Marketing,Marketing
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +227,Payment Entry is already created,Entri pembayaran sudah dibuat
+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,Entri pembayaran sudah dibuat
 DocType: Purchase Receipt Item Supplied,Current Stock,Stok saat ini
-apps/erpnext/erpnext/controllers/accounts_controller.py +538,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 +21,Preview Salary Slip,Slip Gaji Preview
+apps/erpnext/erpnext/controllers/accounts_controller.py +541,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 +38,Preview Salary Slip,Slip Gaji Preview
 DocType: Company,Deafult Cost Center,Deafult Pusat Biaya
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +48,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
@@ -654,7 +664,7 @@
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,Silakan pilih Grup Pelajar
 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 +617,Item has variants.,Item memiliki varian.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Item memiliki varian.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,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
@@ -674,7 +684,7 @@
 DocType: Purchase Order,Supply Raw Materials,Pasokan Bahan Baku
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,Tanggal dimana faktur berikutnya akan dihasilkan. Hal ini dihasilkan di submit.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Aset Lancar
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,{0} is not a stock Item,{0} bukan merupakan Stok Barang persediaan
+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 +169,Lead must be set if Opportunity is made from Lead,Kesempatan harus diatur apabila Peluang berasal dari Kesempatan
@@ -760,26 +770,25 @@
 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 +709,No Permission,Tidak ada Izin
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +710,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}
 apps/erpnext/erpnext/public/js/setup_wizard.js +298,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 +542,Row #{0}: Asset {1} must be submitted,Row # {0}: Aset {1} harus diserahkan
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset {1} must be submitted,Row # {0}: Aset {1} harus diserahkan
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Tidak ada karyawan yang ditemukan
 DocType: 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.
 DocType: Warehouse,Tree Details,Detail pohon
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Kirim sekarang
 ,Support Analytics,Dukungan Analytics
 DocType: Item,Website Warehouse,Situs Gudang
 DocType: Payment Reconciliation,Minimum Invoice Amount,Nilai Minimum Faktur
 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/sales_invoice/sales_invoice.py +227,Timesheet {0} is already completed or cancelled,Absen {0} sudah selesai atau dibatalkan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +259,Timesheet {0} is already completed or cancelled,Absen {0} sudah selesai atau dibatalkan
 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
@@ -795,13 +804,13 @@
 apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Jadwal Kuliah
 DocType: Maintenance Visit,Completion Status,Status Penyelesaian
 DocType: HR Settings,Enter retirement age in years,Memasuki usia pensiun di tahun
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +229,Target Warehouse,Target Gudang
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +230,Target Warehouse,Target Gudang
 DocType: Cheque Print Template,Starting location from left edge,Mulai lokasi dari tepi kiri
 DocType: Item,Allow over delivery or receipt upto this percent,Biarkan selama pengiriman atau penerimaan upto persen ini
 DocType: Stock Entry,STE-,Ste-
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Sales Order Date,Diharapkan Pengiriman Tanggal tidak bisa sebelum Sales Order Tanggal
 DocType: Upload Attendance,Import Attendance,Impor Absensi
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Semua Grup Stok Barang/Item
+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/config/setup.py +89,Automatically compose message on submission of transactions.,Secara otomatis menulis pesan pada pengajuan transaksi.
@@ -813,13 +822,15 @@
 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/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
 DocType: Expense Claim,Expenses,Biaya / Beban
 DocType: Item Variant Attribute,Item Variant Attribute,Item Varian Atribut
 ,Purchase Receipt Trends,Tren Nota Penerimaan
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Research & Development,Penelitian & Pengembangan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Penelitian & Pengembangan
 ,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
@@ -828,7 +839,7 @@
 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/controllers/accounts_controller.py +340,"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."
+apps/erpnext/erpnext/controllers/accounts_controller.py +343,"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
@@ -850,12 +861,12 @@
 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 +756,Purchase Receipt,Nota Penerimaan
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +735,Purchase Receipt,Nota Penerimaan
 ,Received Items To Be Billed,Produk Diterima Akan Ditagih
 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 +167,Reference Doctype must be one of {0},Referensi DOCTYPE harus menjadi salah satu {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +282,Unable to find Time Slot in the next {0} days for Operation {1},Tidak dapat menemukan waktu Slot di {0} hari berikutnya untuk Operasi {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +170,Reference Doctype must be one of {0},Referensi DOCTYPE harus menjadi salah satu {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,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 +439,BOM {0} must be active,BOM {0} harus aktif
@@ -866,7 +877,7 @@
 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 +214,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 +217,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
@@ -880,9 +891,9 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Karyawan {0} tidak aktif atau tidak ada
 DocType: Fee Structure,Components,komponen
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,Please enter Asset Category in Item {0},Cukup masukkan Aset Kategori dalam angka {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +612,Item Variants {0} updated,Item Varian {0} diperbarui
+apps/erpnext/erpnext/stock/doctype/item/item.py +614,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 +843,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 +854,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
@@ -897,69 +908,72 @@
 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 +728,New Sales Invoice,Baru Faktur Penjualan
+apps/erpnext/erpnext/accounts/page/pos/pos.js +710,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 +728,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
 DocType: Material Request Item,Lead Time Date,Waktu Tenggang Pesanan
 DocType: Guardian,Guardian Name,Nama wali
 DocType: Cheque Print Template,Has Print Format,Memiliki Print Format
-apps/erpnext/erpnext/accounts/page/pos/pos.js +86, 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 +109,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 +619,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","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/page/pos/pos.js +75, 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 +613,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing 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 +606,Supplier Invoice Date cannot be greater than Posting Date,Pemasok Faktur Tanggal tidak dapat lebih besar dari Posting Tanggal
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +609,Supplier Invoice Date cannot be greater than Posting Date,Pemasok Faktur Tanggal tidak dapat lebih besar dari Posting Tanggal
 DocType: Purchase Invoice Item,Purchase Order Item,Stok Barang Order Pembelian
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +130,Indirect Income,Pendapatan Tidak Langsung
 DocType: Cheque Print Template,Date Settings,Pengaturan Tanggal
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Variance
 ,Company Name,Nama Perusahaan
 DocType: SMS Center,Total Message(s),Total Pesan (s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +810,Select Item for Transfer,Pilih item untuk transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +789,Select Item for Transfer,Pilih item untuk transfer
 DocType: Purchase Invoice,Additional Discount Percentage,Persentase Diskon Tambahan
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Lihat daftar semua bantuan video
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Pilih kepala rekening bank mana cek diendapkan.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Izinkan user/pengguna untuk mengubah rate daftar harga di dalam transaksi
 DocType: Pricing Rule,Max Qty,Qty Maksimum
-DocType: Student Applicant,Father's Name,Nama ayah
 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 +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Baris {0}: Pembayaran terhadap Penjualan / Purchase Order harus selalu ditandai sebagai muka
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Kimia
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +686,All items have already been transferred for this Production Order.,Semua item telah dialihkan untuk Order Produksi ini.
+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
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +694,All items have already been transferred for this Production Order.,Semua item telah dialihkan untuk Order Produksi ini.
 DocType: Process Payroll,Select Payroll Year and Month,Pilih Payroll Tahun dan Bulan
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,Meter,Meter
 DocType: Workstation,Electricity Cost,Biaya Listrik
 DocType: HR Settings,Don't send Employee Birthday Reminders,Jangan Kirim Pengingat Ulang Tahun
-DocType: Opportunity,Walk In,Walk In
 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 +12,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: Timesheet Detail,Bill,Tagihan
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,White,Putih
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,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
 DocType: SMS Center,All Lead (Open),Semua Kesempatan (Open)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +228,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})
+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 +731,Make ,Membuat
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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.
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Cart saya
-apps/erpnext/erpnext/controllers/selling_controller.py +154,Order Type must be one of {0},Order Type harus menjadi salah satu {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Order Type harus menjadi salah satu {0}
 DocType: Lead,Next Contact Date,Tanggal Komunikasi Selanjutnya
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Qty Pembukaan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +393,Please enter Account for Change Amount,Silahkan masukkan account untuk Perubahan Jumlah
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,Please enter Account for Change Amount,Silahkan masukkan account untuk Perubahan Jumlah
 DocType: Student Batch,Student Batch Name,Mahasiswa Nama Batch
 DocType: Holiday List,Holiday List Name,List Hari Libur
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js +8,Schedule Course,Jadwal Kursus
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Stock Options,Opsi Persediaan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Opsi Persediaan
 DocType: Journal Entry Account,Expense Claim,Biaya Klaim
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +211,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 +237,Qty for {0},Jumlah untuk {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +212,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 +238,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
@@ -968,9 +982,9 @@
 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/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Item dihapus dengan tidak ada perubahan dalam jumlah atau nilai.
+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 +635,Attribute table is mandatory,Tabel atribut wajib
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Tabel atribut wajib
 DocType: Production Planning Tool,Get Sales Orders,Dapatkan Order Penjualan
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{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
@@ -995,7 +1009,7 @@
 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/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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Serial ada {0} berada di bawah kontrak pemeliharaan upto {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +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
@@ -1007,7 +1021,7 @@
 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/controllers/selling_controller.py +231,Sales Order {0} is {1},Sales Order {0} adalah {1}
+apps/erpnext/erpnext/controllers/selling_controller.py +232,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
 DocType: Packing Slip,Net Weight UOM,Uom Berat Bersih
@@ -1017,25 +1031,24 @@
 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
 DocType: Sales Person,Select company name first.,Pilih nama perusahaan terlebih dahulu.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Penawaran Diterima dari Supplier
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},Untuk {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Rata-rata Usia
 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/templates/pages/home.html +32,View All Products,Lihat Semua Produk
+apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Lihat Semua Produk
 DocType: Company,Default Currency,Standar Mata Uang
 DocType: Contact,Enter designation of this Contact,Entrikan penunjukan Kontak ini
 DocType: Expense Claim,From Employee,Dari Karyawan
-apps/erpnext/erpnext/controllers/accounts_controller.py +400,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
+apps/erpnext/erpnext/controllers/accounts_controller.py +403,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/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,dan tahun:
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +191,{0} {1} must be submitted,{0} {1} harus di-posting
-DocType: Email Digest,Annual Expense,Beban tahunan
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,{0} {1} must be submitted,{0} {1} harus di-posting
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +145,Quantity must be less than or equal to {0},Kuantitas harus kurang dari atau sama dengan {0}
 DocType: SMS Center,Total Characters,Jumlah Karakter
 apps/erpnext/erpnext/controllers/buying_controller.py +156,Please select BOM in BOM field for Item {0},Silakan pilih BOM BOM di lapangan untuk Item {0}
@@ -1046,30 +1059,31 @@
 DocType: Sales Partner,Distributor,Distributor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Aturan Pengiriman Belanja Shoping Cart
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +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 +62,Please set 'Apply Additional Discount On',Silahkan mengatur &#39;Terapkan Diskon tambahan On&#39;
+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
 DocType: Global Defaults,Global Defaults,Standar Global
 apps/erpnext/erpnext/projects/doctype/project/project.py +153,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
 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 +327,Capacity Planning Error,Kesalahan Perencanaan Kapasitas
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,Kesalahan Perencanaan Kapasitas
 ,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 +362,Finished Item {0} must be entered for Manufacture type entry,Selesai Stok Barang {0} harus dimasukkan untuk jenis Produksi entri
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +367,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
 DocType: Sales Invoice Advance,Sales Invoice Advance,Uang Muka Faktur Penjualan
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +499,Nothing to request,Tidak ada Permintaan
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +500,Nothing to request,Tidak ada Permintaan
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','Tanggal Mulai Sebenarnya' tidak dapat lebih besar dari 'Tanggal Selesai Sebenarnya'
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Management,Manajemen
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},Entah debit atau jumlah kredit diperlukan untuk {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,Manajemen
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +55,Either debit or credit amount is required for {0},Entah debit atau jumlah kredit diperlukan untuk {0}
 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 +161,Blue,Biru
+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
@@ -1079,12 +1093,12 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +23,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
 DocType: Stock Settings,Default Item Group,Standar Item Grup
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1374,Do you really want to submit the invoice?,Apakah Anda benar-benar ingin mengirimkan faktur?
+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 +685,Cost Center For Item with Item Code ',Biaya Center For Stok Barang dengan Item Code '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1526,"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 +679,Cost Center For Item with Item Code ',Biaya Center For Stok Barang dengan Item Code '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1550,"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/accounts/doctype/account/account_tree.js +26,"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
@@ -1104,104 +1118,106 @@
 DocType: Payment Reconciliation,Unreconciled Payment Details,Rincian Pembayaran Unreconciled
 DocType: Global Defaults,Current Fiscal Year,Tahun Anggaran saat ini
 DocType: Global Defaults,Disable Rounded Total,Nonaktifkan Pembulatan Jumlah
-DocType: Lead,Call,Panggilan Telpon
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +417,'Entries' cannot be empty,'Entries' tidak boleh kosong
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +418,'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 +214,Fiscal Year {0} not found,Tahun fiskal {0} tidak ditemukan
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +221,Fiscal Year {0} not found,Tahun fiskal {0} tidak ditemukan
 apps/erpnext/erpnext/config/hr.py +238,Setting up Employees,Persiapan Karyawan
 DocType: Sales Order,SO-,BEGITU-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Silakan pilih awalan terlebih dahulu
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Please select prefix first,Silakan pilih awalan terlebih dahulu
 DocType: Employee,O-,HAI-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Research,Penelitian
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,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 +43,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 +57,View Ledger,Lihat Buku Besar
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Paling Awal
-apps/erpnext/erpnext/stock/doctype/item/item.py +504,"An Item Group exists with same name, please change the item name or rename the item group","Item Grup ada dengan nama yang sama, ubah nama item atau mengubah nama kelompok Stok Barang"
+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/setup/setup_wizard/setup_wizard.py +437,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
 ,Budget Variance Report,Laporan Perbedaan Anggaran
 DocType: Salary Slip,Gross Pay,Nilai Gross Bayar
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +90,Row {0}: Activity Type is mandatory.,Row {0}: Jenis Kegiatan adalah wajib.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +114,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/public/js/controllers/stock_controller.js +40,Accounting Ledger,Buku Besar Akuntansi
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,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
 DocType: BOM Item,Item Description,Deskripsi Barang
+DocType: Student Sibling,Student Sibling,Mahasiswa Sibling
 DocType: Purchase Invoice,Is Recurring,Dokumen Berulang/Langganan
 DocType: Purchase Invoice,Supplied Items,Produk Disupply
 DocType: Student,STUD.,STUD.
 DocType: Production Order,Qty To Manufacture,Qty Untuk Produksi
+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/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 +131,Balance for Account {0} must always be {1},Saldo Rekening {0} harus selalu {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +175,Valuation Rate required for Item in row {0},Penilaian Tingkat diperlukan untuk Item berturut-turut {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,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
 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 +87, to ,untuk
+apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,untuk
 DocType: Item,Lead Time in days,Waktu Tenggang Dalam Hari
 ,Accounts Payable Summary,Ringkasan Buku Besar Hutang
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Not authorized to edit frozen Account {0},Tidak berwenang untuk mengedit Akun frozen {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,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 +62,Sales Order {0} is not valid,Order Penjualan {0} tidak valid
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Order Penjualan {0} tidak valid
 apps/erpnext/erpnext/setup/doctype/company/company.py +185,"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 +152,Small,Kecil
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,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}
 ,Invoiced Amount (Exculsive Tax),Faktur Jumlah (Pajak exculsive)
-DocType: Student Applicant,Mother's / Guardian 1 Email ID,Ibu / Wali 1 Email ID
 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 +160,Green,Hijau
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,Hijau
 DocType: Supplier,SUPP-,SUPP-
 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 +57,Contract,Kontrak
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,Kontrak
 DocType: Email Digest,Add Quote,Tambahkan Kutipan
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +498,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 +503,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 +80,Row {0}: Qty is mandatory,Row {0}: Qty adalah wajib
+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 +737,Sync Master Data,Sync Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +719,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/public/js/setup_wizard.js +283,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
+DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Ini adalah kelompok Stok Barang akar dan tidak dapat diedit.
+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.
 DocType: Journal Entry Account,Purchase Order,Purchase Order
 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 +345,"{0}: Employee email not found, hence email not sent","{0}: email Karyawan tidak ditemukan, maka email yang tidak terkirim"
+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
 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 +118,"For {0}, only credit accounts can be linked against another debit entry","Untuk {0}, hanya rekening kredit dapat dihubungkan dengan entri debit lain"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Delivery Note {0} is not submitted,Nota pengiriman {0} tidak Terkirim
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Delivery Note {0} is not submitted,Nota pengiriman {0} tidak Terkirim
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Sub-contracted Item,Item {0} harus Item Sub-kontrak
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Perlengkapan Modal
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Rule harga terlebih dahulu dipilih berdasarkan 'Terapkan On' lapangan, yang dapat Stok Barang, Stok Barang Grup atau Merek."
 DocType: Hub Settings,Seller Website,Situs Penjual
 DocType: Item,ITEM-,BARANG-
-apps/erpnext/erpnext/controllers/selling_controller.py +147,Total allocated percentage for sales team should be 100,Persentase total yang dialokasikan untuk tim penjualan harus 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +110,Production Order status is {0},Status Order produksi adalah {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Persentase total yang dialokasikan untuk tim penjualan harus 100
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Status Order produksi adalah {0}
 DocType: Appraisal Goal,Goal,Sasaran
 DocType: Sales Invoice Item,Edit Description,Edit Keterangan
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +757,For Supplier,Untuk Supplier
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +723,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
@@ -1217,10 +1233,11 @@
 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
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +445,BOM {0} does not belong to Item {1},BOM {0} bukan milik Stok Barang {1}
 DocType: Sales Partner,Target Distribution,Target Distribusi
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1667,Deafault warehouse is required for selected item,gudang Deafault diperlukan untuk item yang dipilih
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Deafault warehouse is required for selected item,gudang Deafault diperlukan untuk item yang dipilih
 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
@@ -1229,23 +1246,23 @@
 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 +110,Hardware,Perangkat keras
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,Perangkat keras
 DocType: Sales Order,Recurring Upto,berulang Upto
 DocType: Attendance,HR Manager,HR Manager
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Silakan pilih sebuah Perusahaan
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Privilege Leave,Privilege Cuti
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,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 +79,You need to enable Shopping Cart,Anda harus mengaktifkan Keranjang Belanja
 DocType: Payment Entry,Writeoff,writeoff
 DocType: Appraisal Template Goal,Appraisal Template Goal,Template Target Penilaian Pencapaian
-DocType: Salary Slip,Earning,Pendapatan
+DocType: Salary Component,Earning,Pendapatan
 DocType: Purchase Invoice,Party Account Currency,Akun Mata Uang per Party
 ,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 +171,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 +174,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_data.py +358,Food,Makanan
+apps/erpnext/erpnext/demo/setup/setup_data.py +301,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/course_schedule/course_schedule.js +103,Mark Attendence,Mark absensi
@@ -1279,12 +1296,12 @@
 DocType: Sales Order Item,Planned Quantity,Direncanakan Kuantitas
 DocType: Purchase Invoice Item,Item Tax Amount,Jumlah Pajak Stok Barang
 DocType: Item,Maintain Stock,Maintain Stock
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +209,Stock Entries already created for Production Order ,Stok Entries sudah dibuat untuk Order Produksi
+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
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,Perubahan bersih dalam Aset Tetap
 DocType: Leave Control Panel,Leave blank if considered for all designations,Biarkan kosong jika dipertimbangkan untuk semua sebutan
-apps/erpnext/erpnext/controllers/accounts_controller.py +620,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 +238,Max: {0},Max: {0}
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +15,From Datetime,Dari Datetime
+apps/erpnext/erpnext/controllers/accounts_controller.py +623,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 +239,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 +153,"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."
@@ -1292,8 +1309,8 @@
 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 +552,cannot be greater than 100,tidak dapat lebih besar dari 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +680,Item {0} is not a stock Item,Item {0} bukan merupakan Stok Stok Barang
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +546,cannot be greater than 100,tidak dapat lebih besar dari 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,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
@@ -1307,10 +1324,9 @@
 DocType: GL Entry,GL Entry,GL Entri
 DocType: HR Settings,Employee Settings,Pengaturan Karyawan
 ,Batch-Wise Balance History,Batch-Wise Balance Sejarah
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,To Do List
 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 +61,Apprentice,Magang
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +102,Negative Quantity is not allowed,Jumlah negatif tidak diperbolehkan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,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"
@@ -1332,15 +1348,14 @@
 DocType: Asset,Asset Name,Aset Nama
 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 +141,Source warehouse is mandatory for row {0},Sumber gudang adalah wajib untuk baris {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +719,Packing Slip,Slip Packing
+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 +713,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/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,Permintaan kutipan dapat diakses dengan mengklik link berikut
 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 +81,Analyst,Analis
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,Analis
 DocType: Item,Inventory,Inventarisasi
 DocType: Item,Sales Details,Detail Penjualan
 DocType: Quality Inspection,QI-,QI-
@@ -1348,10 +1363,10 @@
 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 +103,Government,pemerintahan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,pemerintahan
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,nama institusi
 apps/erpnext/erpnext/config/stock.py +289,Item Variants,Item Varian
-DocType: Company,Services,Layanan
+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
 DocType: Sales Invoice,Source,Sumber
@@ -1364,6 +1379,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,Financial Year Start Date,Tahun Buku Tanggal mulai
 DocType: POS Profile,Apply Discount,Terapkan Diskon
 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
 DocType: Program Course,Program Course,Kursus Program
@@ -1404,12 +1420,12 @@
 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
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +110,Accounting Entry for {0} can only be made in currency: {1},Entri Akunting untuk {0} hanya dapat dilakukan dalam mata uang: {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Entri Akunting untuk {0} hanya dapat dilakukan dalam mata uang: {1}
 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
 DocType: Shopping Cart Settings,Payment Success URL,Pembayaran Sukses URL
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +78,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: Returned Stok Barang {1} tidak ada dalam {2} {3}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +80,Row # {0}: Returned Item {1} does not exists in {2} {3},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
@@ -1418,40 +1434,39 @@
 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/stock/doctype/stock_entry/stock_entry.py +339,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Tidak diizinkan untuk tranfer lebih {0} dari {1} terhadap Purchase Order {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +344,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 +545,Manufacturing Quantity is mandatory,Qty Manufaktur  wajib diisi
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Qty Manufaktur  wajib diisi
 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 +71,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 +162,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/projects/doctype/timesheet/timesheet.py +186,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
 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 +130,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 +137,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
 DocType: Dependent Task,Dependent Task,Tugas Dependent
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,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/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 +190,Leave of type {0} cannot be longer than {1},Cuti jenis {0} tidak boleh lebih dari {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +197,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
 DocType: SMS Center,Receiver List,Daftar Penerima
-apps/erpnext/erpnext/accounts/page/pos/pos.js +921,Search Item,Cari Barang
+apps/erpnext/erpnext/accounts/page/pos/pos.js +910,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 +546,Already completed,Sudah lengkap
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +22,Payment Request already exists {0},Permintaan pembayaran sudah ada {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +550,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 +241,Quantity must not be more than {0},Kuantitas tidak boleh lebih dari {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Quantity must not be more than {0},Kuantitas tidak boleh lebih dari {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +76,Previous Financial Year is not closed,Sebelumnya Keuangan Tahun tidak tertutup
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +44,Age (Days),Umur (Hari)
 DocType: Quotation Item,Quotation Item,Quotation Stok Barang
@@ -1468,7 +1483,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +221,Purchase Receipt {0} is not submitted,Nota Penerimaan {0} tidak Terkirim
 DocType: Company,Default Payable Account,Standar Akun Hutang
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Pengaturan untuk keranjang belanja online seperti aturan pengiriman, daftar harga dll"
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +83,{0}% Billed,{0}% Ditagih
+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
@@ -1480,12 +1495,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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/schools/doctype/fees/fees.js +22,Collect,Mengumpulkan
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Mengumpulkan
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,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 +225,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
-DocType: Payment Reconciliation,Payments,2. Payment (Pembayaran)
 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
@@ -1497,7 +1511,7 @@
 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 +9,Procurement,Pembelian
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,Tak satu pun dari item memiliki perubahan kuantitas atau nilai.
+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
 ,Lead Details,Detail Kesempatan
 DocType: Purchase Invoice,End date of current invoice's period,Tanggal akhir periode faktur saat ini
@@ -1522,7 +1536,7 @@
 DocType: Purchase Invoice,Additional Discount,Diskon Tambahan
 DocType: Selling Settings,Selling Settings,Pengaturan Penjualan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Lelang Online
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +97,Please specify either Quantity or Valuation Rate or both,Silakan tentukan baik Quantity atau Tingkat Penilaian atau keduanya
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,Silakan tentukan baik Quantity atau Tingkat Penilaian atau keduanya
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +13,Fulfillment,Pemenuhan
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Perusahaan, Bulan dan Tahun Anggaran adalah wajib"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Beban Pemasaran
@@ -1543,25 +1557,24 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,ERPNext Pengaturan Selesai!
 DocType: Item,Weightage,Weightage
 DocType: Packing Slip,PS-,PS
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +93,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Kelompok Konsumen sudah ada dengan nama yang sama, silakan mengubah nama Konsumen atau mengubah nama Grup Konsumen"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +126,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
 DocType: Stock Entry,Material Receipt,Nota Penerimaan Barang
 DocType: Homepage,Products,Produk
 DocType: Announcement,Instructor,Pengajar
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},Partai Jenis dan Partai diperlukan untuk Piutang / Hutang akun {0}
 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 Berikutnya Melalui
+DocType: Lead,Next Contact By,Kontak Selanjutnya Oleh
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +223,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}
 DocType: Quotation,Order Type,Tipe Order
-DocType: Purchase Invoice,Notification Email Address,Alamat Email Notifikasi
+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 +704,Offline,Offline
+apps/erpnext/erpnext/accounts/page/pos/pos.js +686,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
@@ -1579,25 +1592,27 @@
 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
 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 +858,Make Purchase Order,Buat Order Pembelian
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +852,Make Purchase Order,Buat Order Pembelian
 DocType: SMS Center,Send To,Kirim Ke
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,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 +148,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
 DocType: Stock Reconciliation,Stock Reconciliation,Rekonsiliasi Stok
 DocType: Territory,Territory Name,Nama Wilayah
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +172,Work-in-Progress Warehouse is required before Submit,Kerja-in-Progress Gudang diperlukan sebelum Submit
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,Work-in-Progress Warehouse is required before Submit,Kerja-in-Progress Gudang diperlukan sebelum Submit
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Pemohon untuk Lowongan Pekerjaan
 DocType: Purchase Order Item,Warehouse and Reference,Gudang dan Referensi
 DocType: Supplier,Statutory info and other general information about your Supplier,Info Statutory dan informasi umum lainnya tentang Supplier Anda
-apps/erpnext/erpnext/hooks.py +88,Addresses,Daftar Alamat
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Pemasok&gt; pemasok Jenis
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +212,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/hooks.py +95,Addresses,Daftar Alamat
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +215,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
 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)
 DocType: Sales Order,To Deliver and Bill,Untuk Dikirim dan Ditagih
@@ -1605,11 +1620,10 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,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 +731,Payment,Pembayaran
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,Payment,Pembayaran
 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: Pricing Rule,Brand,Merek
 DocType: Course,Course Abbreviation,Singkatan saja
 DocType: Item,Will also apply for variants,Juga akan berlaku untuk varian
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +142,"Asset cannot be cancelled, as it is already {0}","Aset tidak dapat dibatalkan, karena sudah {0}"
@@ -1621,7 +1635,7 @@
 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."
 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 +85,Associate,Rekan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,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
@@ -1629,7 +1643,7 @@
 DocType: Production Planning Tool,Material Requests,Permintaan bahan
 DocType: Warranty Claim,Issue Date,Tanggal dibuat
 DocType: Activity Cost,Activity Cost,Biaya Aktivitas
-DocType: Timesheet Detail,Timesheet Detail,Detil absen
+DocType: Sales Invoice Timesheet,Timesheet Detail,Detil absen
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Qty Dikonsumsi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekomunikasi
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Menunjukkan bahwa paket tersebut merupakan bagian dari pengiriman ini (Hanya Draft)
@@ -1652,6 +1666,7 @@
 DocType: Production Plan Material Request,Material Request Date,Bahan Permintaan Tanggal
 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
 DocType: Item,Has Variants,Memiliki Varian
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nama Distribusi Bulanan
 DocType: Sales Person,Parent Sales Person,Induk Sales Person
@@ -1664,31 +1679,32 @@
 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 +44,"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/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.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +502,Error: {0} &gt; {1},Kesalahan: {0}&gt; {1}
 DocType: Item,Is Sales Item,Barang Jualan
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Tree Item Grup
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Stok Barang {0} tidak setup untuk Serial Nos Periksa Stok Barang induk
 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.
 DocType: Naming Series,Current Value,Nilai saat ini
-apps/erpnext/erpnext/controllers/accounts_controller.py +235,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/controllers/accounts_controller.py +238,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
 DocType: Delivery Note Item,Against Sales Order,Berdasarkan Order Penjualan
 ,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 +458,Item table can not be blank,Tabel Stok Barang tidak boleh kosong
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +443,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}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +5,This is based on stock movement. See {0} for details,Hal ini didasarkan pada pergerakan saham. Lihat {0} untuk rincian
 DocType: Pricing Rule,Selling,Penjualan
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +341,Amount {0} {1} deducted against {2},Jumlah {0} {1} dipotong terhadap {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +344,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
@@ -1703,8 +1719,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +144,Cannot refer row number greater than or equal to current row number for this Charge type,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 +159,Red,Merah
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Silahkan klik 'Menghasilkan Jadwal' untuk mengambil Serial yang ditambahkan untuk Item {0}
+apps/erpnext/erpnext/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
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Basis Jumlah (Perusahaan Mata Uang)
@@ -1712,7 +1728,7 @@
 DocType: Installation Note,Installation Time,Waktu Installasi
 DocType: Sales Invoice,Accounting Details,Akunting Detail
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,Hapus semua Transaksi untuk Perusahaan ini
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +187,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Row # {0}: Operasi {1} tidak selesai untuk {2} qty Stok Barang jadi di Produksi Orde # {3}. Silakan update status operasi via Waktu Log
+apps/erpnext/erpnext/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,Row # {0}: Operasi {1} tidak selesai untuk {2} qty Stok Barang jadi di Produksi Orde # {3}. Silakan update status operasi via Waktu Log
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,Investasi
 DocType: Issue,Resolution Details,Detail Resolusi
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,Alokasi
@@ -1748,16 +1764,17 @@
 DocType: Bank Reconciliation Detail,Against Account,Terhadap Akun
 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}
 DocType: Delivery Note,Excise Page Number,Jumlah Halaman Excise
 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}
 ,Maintenance Schedules,Jadwal pemeliharaan
 DocType: Task,Actual End Date (via Time Sheet),Sebenarnya Tanggal Akhir (via Waktu Lembar)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Amount {0} {1} against {2} {3},Jumlah {0} {1} terhadap {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +339,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 +138,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 +295,Debit To account must be a Receivable account,Debit Untuk akun harus rekening Piutang
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,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
 DocType: Purchase Invoice Item,Conversion Factor,Faktor konversi
@@ -1765,10 +1782,10 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +137,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
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +90,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Jumlah cuti dialokasikan {0} tidak bisa kurang dari cuti yang telah disetujui {1} untuk periode
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +93,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 +22,Enter Paid Amount,Masukkan Dibayar Jumlah
+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
@@ -1778,13 +1795,15 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,timesheets
 DocType: HR Settings,HR Settings,Pengaturan Sumber Daya Manusia
 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 +524,"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."
+apps/erpnext/erpnext/controllers/accounts_controller.py +527,"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 +249,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
 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/stock/get_item_details.py +123,Please specify Company,Silakan tentukan Perusahaan
 ,Customer Acquisition and Loyalty,Akuisisi Konsumen dan Loyalitas
@@ -1795,17 +1814,19 @@
 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 +183,Closing (Opening + Totals),Penutupan (Membuka Total +)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),Penutupan (Membuka Total +)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Silakan tentukan mata uang di Perusahaan
 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/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
-apps/erpnext/erpnext/controllers/accounts_controller.py +272,Account {0} is invalid. Account Currency must be {1},Akun {0} tidak valid. Akun Mata Uang harus {1}
+DocType: Email Digest,Pending Sales Orders,Pending Order Penjualan
+apps/erpnext/erpnext/controllers/accounts_controller.py +275,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 +956,"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 Slip,Deduction,Deduksi
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +87,Row {0}: From Time and To Time is mandatory.,Row {0}: Dari Waktu dan To Waktu adalah wajib.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +969,"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 +111,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 +262,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 +7,Please enter Employee Id of this sales person,Cukup masukkan Id Karyawan Sales Person ini
@@ -1813,7 +1834,7 @@
 DocType: Project,% Tasks Completed,% Tugas Selesai
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,Perbedaan Jumlah harus nol
 DocType: Project,Gross Margin,Margin kotor
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +194,Please enter Production Item first,Entrikan Produksi Stok Barang terlebih dahulu
+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
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Quotation
@@ -1822,53 +1843,54 @@
 DocType: Maintenance Visit,Maintenance User,Pengguna Pemeliharaan
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +149,Cost Updated,Perbarui Biaya
 DocType: Employee,Date of Birth,Tanggal Lahir
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +86,Item {0} has already been returned,Item {0} telah dikembalikan
+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}
+DocType: Student Admission,Eligibility,kelayakan
 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 +177,Job Description,Deskripsi Bidang Kerja
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,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 +126,"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 +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Karakter khusus kecuali ""-"" ""."", ""#"", dan ""/"" tidak diperbolehkan dalam penamaan seri"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Pelihara Penjualan Kampanye. Melacak Memimpin, Quotation, Sales Order dll dari Kampanye untuk mengukur Return on Investment."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +24,Welcome to POS: Create your POS Profile,Selamat Datang di POS: Buat Profil POS Anda
 DocType: Expense Claim,Approver,Approver
 ,SO Qty,SO Qty
+DocType: Guardian,Work Address,kerja Alamat
 DocType: Appraisal,Calculate Total Score,Hitung Total Skor
 DocType: Request for Quotation,Manufacturing Manager,Manajer Manufaktur
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serial ada {0} masih dalam garansi upto {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +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 +74,Shipments,Pengiriman
+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
 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 +153,Row # ,Row #
+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 +156,Get From,Dapatkan Dari
+apps/erpnext/erpnext/public/js/utils.js +167,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 +167,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 +416,"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"
+apps/erpnext/erpnext/controllers/accounts_controller.py +419,"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
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} is disabled,Pengguna {0} dinonaktifkan
 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 ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Biarkan kosong jika dianggap untuk semua departemen
 apps/erpnext/erpnext/config/hr.py +171,"Types of employment (permanent, contract, intern etc.).","Jenis pekerjaan (permanen, kontrak, magang dll)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +346,{0} is mandatory for Item {1},{0} adalah wajib untuk Item {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,{0} is mandatory for Item {1},{0} adalah wajib untuk Item {1}
 DocType: Currency Exchange,From Currency,Dari mata uang
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Silakan pilih Jumlah Alokasi, Faktur Jenis dan Faktur Nomor di minimal satu baris"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,Biaya Pembelian New
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},Sales Order yang diperlukan untuk Item {0}
 DocType: Purchase Invoice Item,Rate (Company Currency),Rate (Perusahaan Mata Uang)
-apps/erpnext/erpnext/demo/setup_data.py +360,Others,Lainnya
+DocType: Student Guardian,Others,Lainnya
 DocType: Payment Entry,Unallocated Amount,Jumlah yang tidak terisi
 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
@@ -1888,17 +1910,16 @@
 apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,Persediaan memiliki serial
 DocType: Activity Type,Default Billing Rate,Standar Tingkat Penagihan
 DocType: Sales Invoice,Total Billing Amount,Jumlah Total Tagihan
-apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +54,Receivable Account,Akun Piutang
-apps/erpnext/erpnext/controllers/accounts_controller.py +546,Row #{0}: Asset {1} is already {2},Row # {0}: Aset {1} sudah {2}
+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 +549,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 +79,CEO,CEO
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,CEO
 DocType: Expense Claim Detail,Expense Claim Detail,Detail Klaim Biaya
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +808,Please select correct account,Silakan pilih akun yang benar
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +809,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
-DocType: Purchase Invoice Item,Page Break,Halaman Istirahat
 DocType: Production Order Operation,Pending,Menunggu
 DocType: Course,Course Name,Nama kursus
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Pengguna yang dapat menyetujui aplikasi cuti karyawan tertentu yang
@@ -1907,14 +1928,15 @@
 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 +54,Full-time,Full-time
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,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: Student,Guardians,Penjaga
 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 +289,Debit To is required,Debit Untuk diperlukan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +321,Debit To is required,Debit Untuk diperlukan
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Pembelian Daftar Harga
 DocType: Offer Letter Term,Offer Term,Penawaran Term
 DocType: Quality Inspection,Quality Manager,Manajer Mutu
@@ -1922,6 +1944,7 @@
 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/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
@@ -1932,18 +1955,17 @@
 DocType: Production Order Operation,Completed Qty,Qty Selesai
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"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 +273,Price List {0} is disabled,Daftar Harga {0} dinonaktifkan
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +99,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/projects/doctype/timesheet/timesheet.py +123,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
 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}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Nilai Tingkat Penilaian Saat ini
 DocType: Item,Customer Item Codes,Kode Stok Barang Konsumen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,Efek Gain / Loss
 DocType: Opportunity,Lost Reason,Alasan Kehilangan
-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/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/purchase_receipt/purchase_receipt.py +378,All items have already been invoiced,Semua Stok Barang telah tertagih
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +379,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
@@ -1959,18 +1981,19 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Konsumen Anda
 apps/erpnext/erpnext/projects/doctype/project/project.py +141,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/job_opening.html +19,Apply Now,Terapkan Sekarang
+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."
 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
-apps/erpnext/erpnext/utilities/doctype/address/address.py +164,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: Fee Structure,Fee Structure,Struktur biaya
 DocType: Timesheet Detail,Costing Amount,Nilai Jumlah Biaya
+DocType: Student Admission,Application Fee,Biaya aplikasi
 DocType: Process Payroll,Submit Salary Slip,Kirim Slip Gaji
-apps/erpnext/erpnext/controllers/selling_controller.py +161,Maxiumm discount for Item {0} is {1}%,Diskon Maxiumm untuk Item {0} adalah {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,Diskon Maxiumm untuk Item {0} adalah {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Impor Secara massal
 DocType: Sales Partner,Address & Contacts,Alamat & Kontak
 DocType: SMS Log,Sender Name,Nama Pengirim
@@ -1995,21 +2018,21 @@
 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_data.py +361,Travel,Perjalanan
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +155,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 +304,Travel,Perjalanan
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +167,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 +23,Update Cost,Perbarui Biaya
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Perbarui Biaya
 DocType: Item Reorder,Item Reorder,Item Reorder
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +36,Show Salary Slip,Slip acara Gaji
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +748,Transfer Material,Transfer Material/Stok Barang
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +53,Show Salary Slip,Slip acara Gaji
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +166,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 +923,Please set recurring after saving,Silahkan mengatur berulang setelah menyimpan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +646,Select change amount account,Pilih akun berubah jumlah
+apps/erpnext/erpnext/public/js/controllers/transaction.js +914,Please set recurring after saving,Silahkan mengatur berulang setelah menyimpan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +703,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
@@ -2021,31 +2044,32 @@
 DocType: Quality Inspection,Verified By,Diverifikasi oleh
 DocType: Address,Subsidiary,Anak Perusahaan
 apps/erpnext/erpnext/setup/doctype/company/company.py +64,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","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: Quality Inspection,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 +33,Traceability,Lacak
 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 +352,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Jumlah berturut-turut {0} ({1}) harus sama dengan jumlah yang diproduksi {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Jumlah berturut-turut {0} ({1}) harus sama dengan jumlah yang diproduksi {2}
 DocType: Appraisal,Employee,Karyawan
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Undang sebagai Pengguna
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} telah ditagih sepenuhnya
 DocType: Workstation Working Hour,End Time,Waktu Akhir
 DocType: Payment Entry,Payment Deductions or Loss,Pengurangan pembayaran atau Rugi
-apps/erpnext/erpnext/config/schools.py +100,LMS,LMS
+apps/erpnext/erpnext/config/schools.py +104,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/config/crm.py +6,Sales Pipeline,Pipeline penjualan
 DocType: Student Batch Student,Student Batch Student,Mahasiswa mahasiswa Batch
-DocType: Sales Invoice,Mass Mailing,Pengiriman Email secara Banyak
+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 +199,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/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 +297,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 +111,Pharmaceutical,Farmasi
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +309,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/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
@@ -2060,27 +2084,28 @@
 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 +814,Please specify Company to proceed,Silahkan tentukan Perusahaan untuk melanjutkan
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +793,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 +44,Compensatory Off,Kompensasi Off
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,Kompensasi Off
 DocType: Quality Inspection Reading,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.
 DocType: Room,Room Number,Nomor kamar
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Referensi yang tidak valid {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +161,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) tidak dapat lebih besar dari jumlah yang direncanakan ({2}) di Order Produksi {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +162,{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 +217,Raw Materials cannot be blank.,Bahan baku tidak boleh kosong.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,"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 +460,Quick Journal Entry,Jurnal Entry Cepat
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +111,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/accounts/doctype/sales_invoice/sales_invoice.py +441,"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 +450,Quick Journal Entry,Jurnal Entry Cepat
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +103,You can not change rate if BOM mentioned agianst any item,Anda tidak dapat mengubah kurs jika BOM disebutkan atas tiap Stok Barang
 DocType: Employee,Previous Work Experience,Pengalaman Kerja Sebelumnya
 DocType: Stock Entry,For Quantity,Untuk Kuantitas
 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 +214,{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
 ,Minutes to First Response for Issues,Menit ke Response Pertama untuk Masalah
 DocType: Purchase Invoice,Terms and Conditions1,Syarat dan Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,Nama lembaga yang Anda menyiapkan sistem ini.
@@ -2089,16 +2114,17 @@
 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 +398,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
 ,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 +739,Item or Warehouse for row {0} does not match Material Request,Item atau Gudang untuk baris {0} Material tidak cocok Permintaan
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +747,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
 DocType: Fiscal Year,Year End Date,Tanggal Akhir Tahun
 DocType: Task Depends On,Task Depends On,Tugas Tergantung Pada
-DocType: Lead,Opportunity,Peluang
+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
@@ -2111,7 +2137,7 @@
 DocType: Student,Joining Date,Tanggal Bergabung
 ,Employees working on a holiday,Karyawan yang bekerja pada hari libur
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Mark Hadir
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},Tanggal mulai pemeliharaan tidak bisa sebelum tanggal pengiriman untuk Serial No {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},Tanggal mulai pemeliharaan tidak bisa sebelum tanggal pengiriman untuk Serial No {0}
 DocType: Production Order,Actual End Date,Tanggal Akhir Aktual
 DocType: Purchase Invoice,PINV-,PINV-
 DocType: Authorization Rule,Applicable To (Role),Berlaku Untuk (Peran)
@@ -2126,7 +2152,7 @@
 DocType: SMS Log,No of Requested SMS,Tidak ada dari Diminta SMS
 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 +729,Please supply the specified items at the best possible rates,Silakan memasok barang-barang tertentu dengan tarif terbaik
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +695,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 +117,Contract End Date must be greater than Date of Joining,Kontrak Tanggal Akhir harus lebih besar dari Tanggal Bergabung
 DocType: Delivery Note,DN-,DN-
@@ -2135,7 +2161,7 @@
 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 +14,This is an example website auto-generated from ERPNext,Ini adalah situs contoh auto-dihasilkan dari ERPNext
+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
 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.
 
@@ -2182,15 +2208,16 @@
 DocType: Purchase Receipt Item,Recd Quantity,Qty Diterima
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +54,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 +103,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 +504,Stock Entry {0} is not submitted,Entri Bursa {0} tidak Terkirim
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Tidak dapat menghasilkan lebih Stok Barang {0} daripada kuantitas Sales Order {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +505,Stock Entry {0} is not submitted,Entri Bursa {0} tidak Terkirim
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / Rekening Kas
 DocType: Tax Rule,Billing City,Kota Penagihan
 DocType: Salary Component Account,Salary Component Account,Akun Komponen Gaji
 DocType: Global Defaults,Hide Currency Symbol,Sembunyikan Currency Symbol
 apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card","misalnya Bank, Kas, Kartu Kredit"
+DocType: Lead Source,Source Name,sumber Nama
 DocType: Journal Entry,Credit Note,Nota Kredit
-DocType: Warranty Claim,Service Address,Layanan Alamat
+DocType: Warranty Claim,Service Address,Alamat Layanan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furnitures and Fixtures,Mebel dan perlengkapan
 DocType: Item,Manufacture,Pembuatan
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Silakan Pengiriman Catatan terlebih dahulu
@@ -2200,6 +2227,7 @@
 DocType: Opportunity,Customer / Lead Name,Konsumen / Lead Nama
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +89,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/controllers/trends.py +19,Total(Qty),Total (Qty)
 DocType: Sales Invoice,This Document,Dokumen ini
@@ -2211,15 +2239,15 @@
 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 +176,Organization branch master.,Cabang master organisasi.
-apps/erpnext/erpnext/controllers/accounts_controller.py +273, or ,atau
+apps/erpnext/erpnext/controllers/accounts_controller.py +276, or ,atau
 DocType: Sales Order,Billing Status,Status Penagihan
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Laporkan Masalah
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,Beban utilitas
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-ke atas
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +203,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: Journal Entri {1} tidak memiliki akun {2} atau sudah cocok dengan voucher lain
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +206,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 +90,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 +93,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
@@ -2247,8 +2275,8 @@
 DocType: Product Bundle,Parent Item,Induk Stok Barang
 DocType: Account,Account Type,Jenis Account
 DocType: Delivery Note,DN-RET-,DN-RET-
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +115,Leave Type {0} cannot be carry-forwarded,Cuti Jenis {0} tidak dapat membawa-diteruskan
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Jadwal pemeliharaan tidak dihasilkan untuk semua item. Silahkan klik 'Menghasilkan Jadwal'
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +118,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 +163,"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"
@@ -2260,13 +2288,13 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +32,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 +748,Delivery,Pengiriman
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +742,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
 DocType: Payment Entry,Total Allocated Amount,Jumlah Total Dialokasikan
 DocType: Item Reorder,Material Request Type,Permintaan Jenis Bahan
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +82,Row {0}: UOM Conversion Factor is mandatory,Row {0}: UOM Faktor Konversi adalah wajib
+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
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Voucher #
@@ -2277,13 +2305,13 @@
 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 +90,Head of Marketing and Sales,Kepala Pemasaran dan Penjualan
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Pajak Penghasilan
+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 +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.
 DocType: Item Supplier,Item Supplier,Item Supplier
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +403,Please enter Item Code to get batch no,Entrikan Item Code untuk mendapatkan bets tidak
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +770,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 +397,Please enter Item Code to get batch no,Entrikan Item Code untuk mendapatkan bets tidak
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +764,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"
@@ -2295,28 +2323,29 @@
 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 +100,Issues,Isu
+apps/erpnext/erpnext/hooks.py +109,Issues,Isu
 apps/erpnext/erpnext/controllers/status_updater.py +13,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
 ,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
 DocType: Supplier,Billing Currency,Mata Uang Penagihan
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Large,Ekstra Besar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Extra Large,Ekstra Besar
 ,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 +507,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 +107,Local,[Daerah
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +508,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/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 +154,Large,Besar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Large,Besar
 DocType: Homepage Featured Product,Homepage Featured Product,Homepage Produk Pilihan
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Gudang baru Nama
-apps/erpnext/erpnext/accounts/report/financial_statements.py +225,Total {0} ({1}),Total {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +224,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
@@ -2374,9 +2403,9 @@
 DocType: Attendance,Leave Type,Cuti Type
 apps/erpnext/erpnext/controllers/stock_controller.py +173,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/hr/doctype/salary_slip/salary_slip.py +79,Name error: {0},Nama error: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +90,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 +178,{0} {1} does not associated with {2} {3},{0} {1} tidak terkait dengan {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +181,{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)
 DocType: Warehouse,Parent Warehouse,Gudang tua
@@ -2395,7 +2424,7 @@
 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
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,Atleast satu item harus dimasukkan dengan kuantitas negatif dalam dokumen kembali
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Atleast one item should be entered with negative quantity in return document,Atleast satu item harus dimasukkan dengan kuantitas negatif dalam dokumen kembali
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operasi {0} lebih lama daripada jam kerja yang tersedia di workstation {1}, memecah operasi menjadi beberapa operasi"
 ,Requested,Diminta
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +83,No Remarks,Tidak ada Keterangan
@@ -2407,46 +2436,46 @@
 DocType: Item,Total Projected Qty,Total Proyeksi Jumlah
 DocType: Monthly Distribution,Distribution Name,Nama Distribusi
 DocType: Course,Course Code,Kode Course
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Quality Inspection required for Item {0},Kualitas Inspeksi diperlukan untuk Item {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,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
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Kelola Wilayah Tree.
 DocType: Journal Entry Account,Sales Invoice,Faktur Penjualan
 DocType: Journal Entry Account,Party Balance,Saldo Partai
-apps/erpnext/erpnext/accounts/page/pos/pos.js +475,Please select Apply Discount On,Silakan pilih Terapkan Diskon Pada
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +92,Salary Slip Created,Slip Gaji Dibuat
+apps/erpnext/erpnext/accounts/page/pos/pos.js +464,Please select Apply Discount On,Silakan pilih Terapkan Diskon Pada
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +95,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
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,Persentase Diskon dapat diterapkan baik terhadap Daftar Harga atau untuk semua List Price.
 DocType: Purchase Invoice,Half-yearly,Setengah tahun sekali
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +384,Accounting Entry for Stock,Entri Akunting untuk Stok
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +387,Accounting Entry for Stock,Entri Akunting untuk Stok
 DocType: Sales Invoice,Sales Team1,Penjualan team1
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,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 +96,Row {0}: Completed Qty must be greater than zero.,Row {0}: Selesai Qty harus lebih besar dari nol.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +120,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 +88,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Tidak dapat kembali lebih dari {1} untuk Item {2}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +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
 DocType: Item Group,Show this slideshow at the top of the page,Tampilkan slide ini di bagian atas halaman
 DocType: BOM,Item UOM,Stok Barang UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Jumlah pajak Setelah Diskon Jumlah (Perusahaan Mata Uang)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +147,Target warehouse is mandatory for row {0},Target gudang adalah wajib untuk baris {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +141,Target warehouse is mandatory for row {0},Target gudang adalah wajib untuk baris {0}
 DocType: Cheque Print Template,Primary Settings,Pengaturan utama
 DocType: Purchase Invoice,Select Supplier Address,Pilih Pemasok Alamat
 DocType: Quality Inspection,Quality Inspection,Inspeksi Kualitas
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Extra Small,Ekstra Kecil
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +194,Account {0} is frozen,Akun {0} dibekukan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Ekstra Kecil
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +690,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 +197,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 +606,Can only make payment against unbilled {0},Hanya dapat melakukan pembayaran terhadap yang belum ditagihkan {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +126,Commission rate cannot be greater than 100,Tingkat komisi tidak dapat lebih besar dari 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +609,Can only make payment against unbilled {0},Hanya dapat melakukan pembayaran terhadap yang belum ditagihkan {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,Tingkat komisi tidak dapat lebih besar dari 100
 DocType: Stock Entry,Subcontract,Kontrak tambahan
 apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,Entrikan {0} terlebih dahulu
 DocType: Production Order Operation,Actual End Time,Waktu Akhir Aktual
@@ -2457,30 +2486,30 @@
 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 +158,Colour,Warna
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,Warna
 DocType: Maintenance Visit,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"
 DocType: Student Log,Academic,Akademik
-apps/erpnext/erpnext/controllers/accounts_controller.py +469,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Total muka ({0}) terhadap Orde {1} tidak dapat lebih besar dari Grand Total ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +472,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Total muka ({0}) terhadap Orde {1} tidak dapat lebih besar dari Grand Total ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Pilih Distribusi bulanan untuk merata mendistribusikan target di bulan.
 DocType: Purchase Invoice Item,Valuation Rate,Tingkat Penilaian
+DocType: Stock Reconciliation,SR/,SR /
 apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,Daftar Harga Mata uang tidak dipilih
 DocType: Assessment,Results,hasil
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +168,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 +175,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: Student Applicant,Father's/ Guardian 2 Email ID,Ayah / wali 2 Email ID
 DocType: Maintenance Visit Purpose,Against Document No,Terhadap No. Dokumen
 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 +228,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 +231,Warehouses with existing transaction can not be converted to group.,Gudang dengan transaksi yang ada tidak dapat dikonversi ke grup.
 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 +93,Researcher,Peneliti
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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
@@ -2492,25 +2521,25 @@
 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"
 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: Sales Invoice,Advertisement,iklan
 DocType: Asset Category Account,Depreciation Expense Account,Akun Beban Penyusutan
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Probationary Period,Masa percobaan
-apps/erpnext/erpnext/hooks.py +102,Announcements,Pengumuman
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Masa percobaan
+apps/erpnext/erpnext/hooks.py +111,Announcements,Pengumuman
 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 +109,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 +16,To Datetime,Untuk Datetime
+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/scheduling_tool/scheduling_tool.py +51,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/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Kegiatan Tertunda
+DocType: Accounts Settings,Make Payment via Journal Entry,Lakukan Pembayaran via Journal Entri
+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 +127,Please enter relieving date.,Silahkan masukkan menghilangkan date.
-apps/erpnext/erpnext/controllers/trends.py +145,Amt,Amt
+apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,Only Leave Applications with status 'Approved' can be submitted,Hanya Cuti Aplikasi status 'Disetujui' dapat diajukan
 apps/erpnext/erpnext/utilities/doctype/address/address.py +26,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
@@ -2528,14 +2557,15 @@
 apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1},Tidak dapat menemukan tukar untuk {0} ke {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Mark Half Day
 DocType: Sales Invoice,Sales Team,Tim Penjualan
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Duplicate entry,Entri Ganda/Duplikat
+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 +490,[Error],[Kesalahan]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +484,[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
 apps/erpnext/erpnext/controllers/status_updater.py +175,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.
 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
@@ -2551,22 +2581,22 @@
 ,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 +25,All Jobs,Semua Jobs
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,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
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Amount {0} {1} {2} {3},Jumlah {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Amount {0} {1} {2} {3},Jumlah {0} {1} {2} {3}
 DocType: Account,Depreciation,Penyusutan
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Supplier (s)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Alat Absensi Karyawan
 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 +372,Payment Entries {0} are un-linked,Entries pembayaran {0} adalah un-linked
+apps/erpnext/erpnext/accounts/utils.py +449,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
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +497,Material Requests {0} created,Permintaan Material {0} dibuat
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +498,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.
 DocType: Purchase Invoice,Address and Contact,Alamat dan Kontak
@@ -2605,7 +2635,7 @@
 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 +848,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 +859,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 +233,Closing (Dr),Penutup (Dr)
 DocType: Cheque Print Template,Cheque Size,Cek Ukuran
@@ -2626,7 +2656,8 @@
 ,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.
-apps/erpnext/erpnext/controllers/accounts_controller.py +555,'Update Stock' cannot be checked for fixed asset sale,&#39;Update Stock&#39; tidak dapat diperiksa untuk penjualan aset tetap
+DocType: Student Guardian,Father,Ayah
+apps/erpnext/erpnext/controllers/accounts_controller.py +558,'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
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Dapatkan Update
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +132,Material Request {0} is cancelled or stopped,Permintaan Material {0} dibatalkan atau dihentikan
@@ -2636,15 +2667,15 @@
 DocType: Sales Order,Fully Delivered,Sepenuhnya Terkirim
 DocType: Lead,Lower Income,Penghasilan rendah
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","Account kepala di bawah Kewajiban, di mana Laba / Rugi akan dipesan"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +166,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 +238,"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 +81,Purchase Order number required for Item {0},Nomor Purchase Order yang diperlukan untuk Item {0}
+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/purchase_receipt/purchase_receipt.py +82,Purchase Order number required for Item {0},Nomor Purchase Order yang diperlukan untuk Item {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Tanggal Mulai' harus sebelum 'Tanggal Akhir'
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +17,Cannot change status as student {0} is linked with student application {1},tidak dapat mengubah status sebagai mahasiswa {0} terkait dengan aplikasi mahasiswa {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +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: Timesheet,"List of employee which has ""Salary Slip Based on Timesheet"" is enabled in salary structure.",Daftar karyawan yang memiliki &quot;Slip Gaji Berdasarkan Timesheet&quot; diaktifkan dalam struktur gaji.
 DocType: Asset,Fully Depreciated,sepenuhnya disusutkan
 ,Stock Projected Qty,Stock Proyeksi Jumlah
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Customer {0} does not belong to project {1},Konsumen {0} bukan milik proyek {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,Customer {0} does not belong to project {1},Konsumen {0} bukan milik proyek {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Kehadiran ditandai HTML
 DocType: Sales Order,Customer's Purchase Order,Purchase Order Konsumen
 apps/erpnext/erpnext/config/stock.py +107,Serial No and Batch,Serial dan Batch
@@ -2656,7 +2687,7 @@
 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/patches/v7_0/create_warehouse_nestedset.py +55,All Warehouses,semua Gudang
+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 +105,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
@@ -2668,10 +2699,10 @@
 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/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Membuat Slip Gaji
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +26,Browse BOM,Telusuri BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,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/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 Year,Academic Year,Tahun akademik
+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
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,Penilaian
@@ -2679,12 +2710,12 @@
 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 +197,Leave approver must be one of {0},Cuti approver harus menjadi salah satu {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,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: Workstation Working Hour,Start Time,Waktu Mulai
 DocType: Item Price,Bulk Import Help,Bantuan Impor Masal
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +256,Select Quantity,Pilih Kuantitas
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +257,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
@@ -2701,6 +2732,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Entah Target qty atau jumlah target adalah wajib.
 apps/erpnext/erpnext/config/projects.py +45,Cost of various activities,Biaya berbagai kegiatan
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Mengatur Acara untuk {0}, karena karyawan yang melekat di bawah Penjualan Orang tidak memiliki User ID {1}"
+DocType: Timesheet,Billing Details,Detail penagihan
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +149,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}
 DocType: Item,Inspection Required,Inspeksi Diperlukan
@@ -2720,7 +2752,7 @@
 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 +138,Wire Transfer,Transfer Kliring
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,Transfer Kliring
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Periksa Semua
 DocType: Sales Order,Recurring Order,Order Berulang
 DocType: Company,Default Income Account,Akun Pendapatan standar
@@ -2732,21 +2764,19 @@
 ,Welcome to ERPNext,Selamat Datang di ERPNext
 apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,Kesempatan menjadi Peluang
 DocType: Lead,From Customer,Dari Konsumen
-apps/erpnext/erpnext/demo/setup_data.py +357,Calls,Panggilan
+apps/erpnext/erpnext/demo/setup/setup_data.py +300,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/stock/doctype/item/item.py +466,"As there are existing transactions for this item, \
-							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Karena ada transaksi yang ada untuk item ini, \ Anda tidak dapat mengubah nilai-nilai &#39;Memiliki Serial&#39;, &#39;Apakah Batch No&#39;, &#39;Apakah Stock Item&#39; dan &#39;Metode Penilaian&#39;"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,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/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 +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Catatan: Sistem tidak akan memeriksa over-pengiriman dan over-booking untuk Item {0} kuantitas atau jumlah 0
 DocType: Notification Control,Quotation Message,Quotation Pesan
 DocType: Issue,Opening Date,Tanggal pembukaan
-apps/erpnext/erpnext/schools/api.py +58,Attendance has been marked successfully.,Kehadiran telah ditandai berhasil.
+apps/erpnext/erpnext/schools/api.py +57,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 +136,Account Type for {0} must be {1},Jenis Account untuk {0} harus {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +139,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
@@ -2761,12 +2791,13 @@
 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/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 +20,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 +1190,Please select customer,Silakan pilih pelanggan
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1193,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
@@ -2776,6 +2807,7 @@
 ,Payment Period Based On Invoice Date,Masa Pembayaran Berdasarkan Faktur Tanggal
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Hilang Kurs mata uang Tarif untuk {0}
 DocType: Assessment,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-
@@ -2793,11 +2825,12 @@
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,topik Nama
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,"Setidaknya salah satu, Jual atau Beli harus dipilih"
-apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Pilih sifat bisnis Anda.
+DocType: Grading Structure,Grade Intervals,Interval kelas
+apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Pilih jenis bisnis anda.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Dimana operasi manufaktur dilakukan.
 DocType: Asset Movement,Source Warehouse,Sumber Gudang
 DocType: Installation Note,Installation Date,Instalasi Tanggal
-apps/erpnext/erpnext/controllers/accounts_controller.py +534,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Aset {1} bukan milik perusahaan {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +537,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
@@ -2811,28 +2844,31 @@
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Tersedia Batch Qty di Gudang Dari
 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 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 +111,Date Of Retirement must be greater than Date of Joining,Tanggal Of Pensiun harus lebih besar dari Tanggal Bergabung
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +49,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 +87,{0}% Delivered,{0}% Terkirim
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% Terkirim
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Item {0}: qty Memerintahkan {1} tidak bisa kurang dari qty minimum order {2} (didefinisikan dalam Butir).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Bulanan Persentase Distribusi
 DocType: Territory,Territory Targets,Target Wilayah
 DocType: Delivery Note,Transporter Info,Info Transporter
-apps/erpnext/erpnext/accounts/utils.py +379,Please set default {0} in Company {1},Silahkan mengatur default {0} di Perusahaan {1}
+apps/erpnext/erpnext/accounts/utils.py +456,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
 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.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Judul untuk mencetak template misalnya Proforma Invoice.
+DocType: Student Guardian,Student Guardian,Wali murid
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +184,Valuation type charges can not marked as Inclusive,Jenis penilaian biaya tidak dapat ditandai sebagai Inklusif
 DocType: POS Profile,Update Stock,Perbarui Stock
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM berbeda untuk item akan menyebabkan salah (Total) Nilai Berat Bersih. Pastikan Berat Bersih dari setiap item di UOM sama.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Tingkat
 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 +349,Journal Entries {0} are un-linked,Entri jurnal {0} un-linked
+apps/erpnext/erpnext/accounts/utils.py +426,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
@@ -2856,6 +2892,7 @@
 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
+DocType: Homepage,"URL for ""All Products""",URL untuk &quot;Semua Produk&quot;
 DocType: Leave Application,Leave Balance Before Application,Cuti Saldo Sebelum Aplikasi
 DocType: SMS Center,Send SMS,Kirim SMS
 DocType: Cheque Print Template,Width of amount in word,Lebar jumlah dalam kata
@@ -2864,7 +2901,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 +29,Current Job Openings,Job Openings saat
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,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
@@ -2876,8 +2913,8 @@
 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/controllers/recurring_document.py +174,Next Date must be greater than Posting Date,Tanggal berikutnya harus lebih besar dari Posting Tanggal
-apps/erpnext/erpnext/public/js/controllers/transaction.js +850,Show tax break-up,Tampilkan pajak break-up
+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 +841,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/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"
@@ -2887,10 +2924,11 @@
 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 +534,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 +80,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 +162,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/selling/doctype/customer/customer.py +195,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 +5,This is based on the attendance of this Student,Hal ini didasarkan pada kehadiran mahasiswa ini
@@ -2899,12 +2937,11 @@
 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 +75,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 +138,Note: There is not enough leave balance for Leave Type {0},Catatan: Tidak ada saldo cuti cukup bagi Leave Type {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Note: There is not enough leave balance for Leave Type {0},Catatan: Tidak ada saldo cuti cukup bagi Leave Type {0}
 DocType: Program Enrollment Fee,Program Enrollment Fee,Program Pendaftaran Biaya
 DocType: Item,Supplier Items,Supplier Produk
 DocType: Opportunity,Opportunity Type,Peluang Type
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,Perusahaan Baru
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,Cost Center is required for 'Profit and Loss' account {0},Biaya Pusat diperlukan untuk akun 'Laba Rugi' {0}
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Transaksi hanya dapat dihapus oleh pencipta Perusahaan
 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.,Jumlah yang salah dari General Ledger Entries ditemukan. Anda mungkin telah memilih Account salah dalam transaksi.
 DocType: Cheque Print Template,Cheque Width,Lebar Cek
@@ -2913,16 +2950,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Tanggal Lahir tidak dapat lebih besar dari saat ini.
 ,Stock Ageing,Stock Penuaan
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,Timesheet
-apps/erpnext/erpnext/controllers/accounts_controller.py +228,{0} '{1}' is disabled,{0} '{1}' dinonaktifkan
+apps/erpnext/erpnext/controllers/accounts_controller.py +231,{0} '{1}' is disabled,{0} '{1}' dinonaktifkan
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Ditetapkan sebagai Terbuka
 DocType: Cheque Print Template,Scanned Cheque,scan Cek
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Kirim email otomatis ke Kontak transaksi Mengirimkan.
+DocType: Timesheet,Total Billable Amount,Jumlah Total Ditagih
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Butir 3
 DocType: Purchase Order,Customer Contact Email,Email Kontak Konsumen
 DocType: Warranty Claim,Item and Warranty Details,Item dan Garansi Detail
 DocType: Sales Team,Contribution (%),Kontribusi (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Catatan: Entry Pembayaran tidak akan dibuat karena 'Cash atau Rekening Bank tidak ditentukan
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Responsibilities,Tanggung Jawab
+apps/erpnext/erpnext/controllers/accounts_controller.py +78,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
 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
@@ -2930,6 +2968,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Tambahkan User
 DocType: Pricing Rule,Item Group,Item Grup
 DocType: Item,Safety Stock,Persediaan keselamatan
+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: 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)
@@ -2939,7 +2978,6 @@
 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: Timesheet,Total Hours,Jumlah Jam
 DocType: Journal Entry,Printing Settings,Pengaturan pencetakan
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,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
@@ -2952,13 +2990,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Perbankan Investasi
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +71,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
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Pelanggan&gt; Pelanggan Grup&gt; Wilayah
 DocType: Purchase Invoice Item,Rate,Menilai
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Intern,Menginternir
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,Menginternir
 DocType: Stock Entry,From BOM,Dari BOM
 DocType: Assessment,Assessment Code,Kode penilaian
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +32,Basic,Dasar
+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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',Silahkan klik 'Menghasilkan Jadwal'
+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 +95,Reference No is mandatory if you entered Reference Date,Referensi ada adalah wajib jika Anda memasukkan Referensi Tanggal
@@ -2967,11 +3006,11 @@
 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 +752,Issue Material,Isu Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +723,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 +683,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 +665,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.
 DocType: Hub Settings,Access Token,Akses Token
 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
@@ -2979,33 +3018,35 @@
 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 +1122,Enter value must be positive,Masukkan nilai harus positif
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,All Territories,Semua Wilayah
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1125,Enter value must be positive,Masukkan nilai harus positif
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,Semua Wilayah
 DocType: Purchase Invoice,Items,Items
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +23,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 +221,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 +233,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 +96,Request for Quotations,Permintaan Kutipan
+apps/erpnext/erpnext/hooks.py +104,Request for Quotations,Permintaan Kutipan
 DocType: Payment Reconciliation,Maximum Invoice Amount,Maksimum Faktur Jumlah
 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 +628,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standar Satuan Ukur untuk Variant &#39;{0}&#39; harus sama seperti di Template &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standar Satuan Ukur untuk Variant &#39;{0}&#39; harus sama seperti di Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Hitung Berbasis On
 DocType: Delivery Note Item,From Warehouse,Dari Gudang
 DocType: Assessment,Supervisor Name,Nama pengawas
+DocType: Assessment,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
 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 +27,Default Address Template cannot be deleted,Template Default Address tidak bisa dihapus
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,Template Default Address tidak bisa dihapus
 DocType: Sales Invoice,Shipping Rule,Aturan Pengiriman
 DocType: Manufacturer,Limited to 12 characters,Terbatas untuk 12 karakter
 DocType: Journal Entry,Print Heading,Cetak Pos
@@ -3020,8 +3061,8 @@
 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/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 +485,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 +336,Please select Posting Date first,Silakan pilih Posting Tanggal terlebih dahulu
+apps/erpnext/erpnext/stock/get_item_details.py +486,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 +326,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
@@ -3030,13 +3071,14 @@
 DocType: Item,Item Code for Suppliers,Item Code untuk Supplier
 DocType: Issue,Raised By (Email),Dibesarkan Oleh (Email)
 DocType: Mode of Payment,General,Umum
-apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,Lampirkan Surat
+apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,Lampirkan Kop Surat
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +338,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/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
 DocType: Authorization Rule,Applicable To (Designation),Berlaku Untuk (Penunjukan)
+,Profitability Analysis,Analisis profitabilitas
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,Tambahkan ke Keranjang Belanja
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Kelompok Dengan
 DocType: Guardian,Interests,minat
@@ -3049,22 +3091,22 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,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 +141,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Serial Stok Barang {0} tidak dapat diperbarui \
  menggunakan Stock Rekonsiliasi"
 DocType: Scheduling Tool,Day,Hari
 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 +122,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 +129,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
-DocType: Student Applicant,AP.,AP.
 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 +639,Point of Sale,Point of Sale
+apps/erpnext/erpnext/accounts/page/pos/pos.js +634,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
 DocType: Production Planning Tool,Production Planning Tool,Alat Perencanaan Produksi
@@ -3073,74 +3115,77 @@
 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 +373,Quantity to Manufacture must be greater than 0.,Kuantitas untuk Produksi harus lebih besar dari 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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 Profile,Customer Group,Kelompok Konsumen
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,Expense account is mandatory for item {0},Rekening pengeluaran adalah wajib untuk item {0}
 DocType: Item,Website Description,Website Description
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date must be on or after today,Berikutnya Penyusutan Tanggal harus pada atau setelah hari ini
 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 +145,Please cancel Purchase Invoice {0} first,Batalkan Purchase Invoice {0} pertama
 DocType: Serial No,AMC Expiry Date,Tanggal Kadaluarsa AMC
 ,Sales Register,Daftar Penjualan
 DocType: Quotation,Quotation Lost Reason,Quotation Kehilangan Alasan
+apps/erpnext/erpnext/utilities/doctype/address/address.py +164,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.
 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 +330,Transaction reference no {0} dated {1},referensi transaksi tidak ada {0} tertanggal {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,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 +107,Summary for this month and pending activities,Ringkasan untuk bulan ini dan kegiatan yang tertunda
+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/accounts/doctype/sales_invoice/sales_invoice.py +406,Please remove this Invoice {0} from C-Form {1},Hapus Invoice ini {0} dari C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,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 +644,Get Items,Dapatkan Produk
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +623,Get Items,Dapatkan Produk
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +210,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 +41,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
 DocType: Payment Request,Initiated,Diprakarsai
 DocType: Production Order,Planned Start Date,Direncanakan Tanggal Mulai
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,Customer is required against Receivable account {0},Pelanggan diperlukan terhadap akun piutang {0}
 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 +265,Project-wise data is not available for Quotation,Data proyek-bijaksana tidak tersedia untuk Quotation
+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 +101,Commercial,Komersial
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,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: Supplier Quotation,Supplier Address,Supplier Alamat
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +648,Row {0}# Account must be of type 'Fixed Asset',Row {0} # Akun harus bertipe &#39;Fixed Asset&#39;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,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 +30,Series is mandatory,Series adalah wajib
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +50,Series is mandatory,Series adalah wajib
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Jasa Keuangan
 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
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +165,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 +155,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Cr,Cr
 DocType: Tax Rule,Billing State,Negara penagihan
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +250,Transfer,Transfer
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +187,{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 +825,Fetch exploded BOM (including sub-assemblies),Fetch meledak BOM (termasuk sub-rakitan)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +254,Transfer,Transfer
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +190,{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 +796,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 +115,Due Date is mandatory,Due Date adalah wajib
+apps/erpnext/erpnext/controllers/accounts_controller.py +118,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
 DocType: Journal Entry,Pay To / Recd From,Pay To / RECD Dari
 DocType: Naming Series,Setup Series,Pengaturan Series
 DocType: Payment Reconciliation,To Invoice Date,Untuk Faktur Tanggal
 DocType: Supplier,Contact HTML,Hubungi HTML
 ,Inactive Customers,Pelanggan tidak aktif
+DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Nota Penerimaan
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Bagaimana Rule Harga diterapkan?
 DocType: Quality Inspection,Delivery Note No,Pengiriman Note No
@@ -3149,7 +3194,7 @@
 DocType: Company,Retail,Eceran
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +120,Customer {0} does not exist,Konsumen {0} tidak ada
 DocType: Attendance,Absent,Absen
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +587,Product Bundle,Bundel Produk
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Product Bundle,Bundel Produk
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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
@@ -3159,8 +3204,8 @@
 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 +742,Send Supplier Emails,Kirim Pemasok Email
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +104,"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/buying/doctype/request_for_quotation/request_for_quotation.js +708,Send Supplier Emails,Kirim Pemasok Email
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,"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
 DocType: Guardian Interest,Guardian Interest,wali Tujuan
 DocType: Timesheet,Employee Detail,Detil karyawan
@@ -3171,9 +3216,9 @@
 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}
 DocType: Salary Slip,Earning & Deduction,Earning & Pengurangan
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +77,Account {0} cannot be a Group,Akun {0} tidak dapat menjadi akun Grup
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} cannot be a Group,Akun {0} tidak dapat menjadi akun Grup
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +31,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 +107,Negative Valuation Rate is not allowed,Tingkat Penilaian negatif tidak diperbolehkan
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Tingkat Penilaian negatif tidak diperbolehkan
 DocType: Holiday List,Weekly Off,Weekly Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Untuk misalnya 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +39,Provisional Profit / Loss (Credit),Laba Provisional / Rugi (Kredit)
@@ -3187,16 +3232,16 @@
 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 +176,{0} {1}: Cost Center is mandatory for Item {2},"{0} {1}: ""Cost Center"" adalah wajib untuk Item {2}"
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +626,Get Items from Product Bundle,Dapatkan Barang-barang dari Bundel Produk
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +605,Get Items from Product Bundle,Dapatkan Barang-barang dari Bundel Produk
 DocType: Asset,Straight Line,Garis lurus
 DocType: Project User,Project User,proyek Pengguna
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} is inactive,Akun {0} tidak aktif
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} is inactive,Akun {0} tidak aktif
 DocType: GL Entry,Is Advance,Apakah Muka
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Kehadiran Dari Tanggal dan Kehadiran Sampai Tanggal adalah wajib
 apps/erpnext/erpnext/controllers/buying_controller.py +148,Please enter 'Is Subcontracted' as Yes or No,Entrikan 'Apakah subkontrak' sebagai Ya atau Tidak
 DocType: Sales Team,Contact No.,Hubungi Nomor
 DocType: Bank Reconciliation,Payment Entries,Entries pembayaran
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,'Profit and Loss' type account {0} not allowed in Opening Entry,Tipe akun 'Laba Rugi' {0} tidak diperbolehkan dalam Entri Saldo Awal
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +71,'Profit and Loss' type account {0} not allowed in Opening Entry,Tipe akun 'Laba Rugi' {0} tidak diperbolehkan dalam Entri Saldo Awal
 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
@@ -3215,7 +3260,7 @@
 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,Komisi Penjualan
 DocType: Offer Letter Term,Value / Description,Nilai / Keterangan
-apps/erpnext/erpnext/controllers/accounts_controller.py +558,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Aset {1} tidak dapat disampaikan, itu sudah {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +561,"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: Production Order,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}.
@@ -3228,13 +3273,13 @@
 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/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Legal Expenses,Beban Legal
 DocType: Purchase Invoice,Posting Time,Posting Waktu
-DocType: Sales Order,% Amount Billed,% Jumlah Ditagih
+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.
 apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},Tidak ada Stok Barang dengan Serial No {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Terbuka Pemberitahuan
+DocType: Email Digest,Open Notifications,Terbuka Pemberitahuan
 DocType: Payment Entry,Difference Amount (Company Currency),Perbedaan Jumlah (Perusahaan Mata Uang)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,Beban Langsung
 apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
@@ -3242,7 +3287,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,New Pendapatan Konsumen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,Biaya Perjalanan
 DocType: Maintenance Visit,Breakdown,Rincian
-apps/erpnext/erpnext/controllers/accounts_controller.py +634,Account: {0} with currency: {1} can not be selected,Account: {0} dengan mata uang: {1} tidak dapat dipilih
+apps/erpnext/erpnext/controllers/accounts_controller.py +637,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}
 DocType: Program Enrollment Tool,Student Applicants,Pelamar mahasiswa
@@ -3250,15 +3295,15 @@
 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 +56,Probation,Percobaan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Probation,Percobaan
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Komponen gaji
 DocType: Program Enrollment Tool,New Academic Year,Baru Tahun Akademik
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Payment of salary for the month {0} and year {1},Pembayaran gaji untuk bulan {0} dan tahun {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Payment of salary for the month {0} and year {1},Pembayaran gaji untuk bulan {0} dan tahun {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Insert auto tingkat Daftar Harga jika hilang
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Jumlah Total Dibayar
 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 +144,Planning,Perencanaan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,Perencanaan
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,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
@@ -3271,11 +3316,10 @@
 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.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Sales invoice submitted sucessfully.,Penjualan tagihan yang diajukan berhasil.
 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}
 DocType: Assessment Result,Student Name,Nama siswa
-apps/erpnext/erpnext/hooks.py +104,Assessment Schedule,Jadwal penilaian
+apps/erpnext/erpnext/hooks.py +113,Assessment Schedule,Jadwal penilaian
 DocType: Brand,Item Manager,Item Manajer
 DocType: Buying Settings,Default Supplier Type,Standar Supplier Type
 DocType: Production Order,Total Operating Cost,Total Biaya Operasional
@@ -3285,6 +3329,7 @@
 DocType: GL Entry,Party Type,Type Partai
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +78,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
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Master Gaji Template.
 DocType: Leave Type,Max Days Leave Allowed,Max Hari Cuti Diizinkan
@@ -3296,18 +3341,19 @@
 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 +99,All Customer Groups,Semua Grup Konsumen
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +78,Accumulated Monthly,akumulasi Bulanan
-apps/erpnext/erpnext/controllers/accounts_controller.py +595,{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/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Semua Grup Konsumen
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +81,Accumulated Monthly,akumulasi Bulanan
+apps/erpnext/erpnext/controllers/accounts_controller.py +598,{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
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Daftar Harga Rate (Perusahaan Mata Uang)
 DocType: Products Settings,Products Settings,Pengaturan produk
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +188,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
 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 +84,Secretary,Sekretaris
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,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
@@ -3316,24 +3362,22 @@
 ,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
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,Row # {0}: Serial ada adalah wajib
+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 +859,Supplier Quotation,Supplier Quotation
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +838,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 +7,Collect Fees,kumpulkan Biaya
+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}
 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.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Acara Mendatang
 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/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
-DocType: Email Digest,Income / Expense,Penghasilan / Beban
 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."
@@ -3345,13 +3389,14 @@
 DocType: Customer,From Lead,Dari Timbal
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Order dirilis untuk produksi.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Pilih Tahun Anggaran ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,POS Profile required to make POS Entry,POS Profil diperlukan untuk membuat POS Entri
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +509,POS Profile required to make POS Entry,POS Profil diperlukan untuk membuat POS Entri
 DocType: Program Enrollment Tool,Enroll Students,Daftarkan Siswa
 DocType: Hub Settings,Name Token,Nama Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard Jual
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Atleast one warehouse is mandatory,Setidaknya satu gudang adalah wajib
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +129,Atleast one warehouse is mandatory,Setidaknya satu gudang adalah wajib
 DocType: Serial No,Out of Warranty,Out of Garansi
 DocType: BOM Replace Tool,Replace,Mengganti
+DocType: Production Order,Unstopped,unstopped
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Invoice {1},{0} terhadap Faktur Penjualan {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Nama Proyek
@@ -3372,10 +3417,11 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"cuti harus dialokasikan dalam kelipatan 0,5"
 DocType: Production Order,Operation Cost,Biaya Operasi
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,Upload kehadiran dari file csv.
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Posisi Amt
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Target Set Stok Barang Group-bijaksana untuk Sales Person ini.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Bekukan Stok Lama Dari [Hari]
-apps/erpnext/erpnext/controllers/accounts_controller.py +528,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: Aset adalah wajib untuk aktiva tetap pembelian / penjualan
+apps/erpnext/erpnext/controllers/accounts_controller.py +531,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: Aset adalah wajib untuk aktiva tetap pembelian / penjualan
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Jika dua atau lebih Aturan Harga yang ditemukan berdasarkan kondisi di atas, Prioritas diterapkan. Prioritas adalah angka antara 0 sampai 20, sementara nilai default adalah nol (kosong). Jumlah yang lebih tinggi berarti akan diutamakan jika ada beberapa Aturan Harga dengan kondisi yang sama."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Tahun Anggaran: {0} tidak ada
 DocType: Currency Exchange,To Currency,Untuk Mata
@@ -3392,15 +3438,15 @@
 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
-DocType: Sales Invoice,Exhibition,Pameran
 apps/erpnext/erpnext/utilities/doctype/address/address.py +77,"Company is mandatory, as it is your company address","Perusahaan adalah wajib, karena alamat perusahaan Anda"
 DocType: Item Attribute,From Range,Dari Rentang
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +81,Syntax error in formula or condition: {0},kesalahan sintaks dalam formula atau kondisi: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +92,Syntax error in formula or condition: {0},kesalahan sintaks dalam formula atau kondisi: {0}
 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
+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 +28,Jobs,Jobs
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,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
@@ -3409,16 +3455,16 @@
 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 +763,Make Supplier Quotation,Membuat Pemasok Quotation
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,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/controllers/sales_and_purchase_return.py +100,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 +42,Casual Leave,Santai Cuti
+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
 DocType: Batch,Batch ID,Batch ID
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,Note: {0},Catatan: {0}
 ,Delivery Note Trends,Tren pengiriman Note
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +103,This Week's Summary,Ringkasan minggu ini
+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
 DocType: Student Group Creation Tool,Get Courses,Dapatkan Program
 DocType: GL Entry,Party,Pihak
@@ -3428,7 +3474,7 @@
 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 +59,Piecework,Pekerjaan yg dibayar menurut hasil yg dikerjakan
+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: Task,Actual Time (in Hours),Waktu Aktual (dalam Jam)
 DocType: Employee,History In Company,Sejarah Dalam Perusahaan
@@ -3445,7 +3491,7 @@
 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.
 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 +162,Black,Hitam
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,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
@@ -3456,13 +3502,13 @@
 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 +69,Customer Id,Konsumen Id
+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
 DocType: Journal Entry Account,Exchange Rate,Nilai Tukar
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Sales Order {0} is not submitted,Order Penjualan {0} tidak Terkirim
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +527,Sales Order {0} is not submitted,Order Penjualan {0} tidak Terkirim
 DocType: Homepage,Tag Line,klimaks
 DocType: Fee Component,Fee Component,biaya Komponen
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +857,Add items from,Menambahkan item dari
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +836,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}
 DocType: Cheque Print Template,Regular,Reguler
 DocType: BOM,Last Purchase Rate,Tingkat Pembelian Terakhir
@@ -3470,6 +3516,7 @@
 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
 ,Sales Person-wise Transaction Summary,Sales Person-bijaksana Rangkuman Transaksi
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +60,Cost Center is required for 'Profit and Loss' account {0}. Please set up a default Cost Center for the Company.,Biaya Pusat diperlukan untuk &#39;Laba Rugi&#39; akun {0}. Silakan mendirikan Cost Center default untuk Perusahaan.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,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
@@ -3480,12 +3527,12 @@
 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 +710,Online,On line
+apps/erpnext/erpnext/accounts/page/pos/pos.js +692,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 +16,Setting this Address Template as default as there is no other default,Mengatur Template Alamat ini sebagai default karena tidak ada standar lainnya
+apps/erpnext/erpnext/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
 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 +74,Quality Management,Manajemen Kualitas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,Manajemen Kualitas
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} has been disabled,Item {0} telah dinonaktifkan
 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
@@ -3496,7 +3543,7 @@
 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: Opportunity,Next Contact,Hubungi Berikutnya
+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
@@ -3507,11 +3554,12 @@
 DocType: Student,Student Email ID,Mahasiswa ID Email
 DocType: Employee,Notice (days),Notice (hari)
 DocType: Tax Rule,Sales Tax Template,Template Pajak Penjualan
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1520,Select items to save the invoice,Pilih item untuk menyimpan faktur
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1544,Select items to save the invoice,Pilih item untuk menyimpan faktur
 DocType: Employee,Encashment Date,Pencairan Tanggal
 DocType: Account,Stock Adjustment,Penyesuaian Stock
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Standar Kegiatan Biaya ada untuk Jenis Kegiatan - {0}
 DocType: Production Order,Planned Operating Cost,Direncanakan Biaya Operasi
+DocType: Academic Term,Term Start Date,Jangka Mulai Tanggal
 apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},Silakan menemukan terlampir {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Bank saldo Laporan per General Ledger
 DocType: Job Applicant,Applicant Name,Nama Pemohon
@@ -3541,17 +3589,17 @@
 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.
 DocType: Company,Distribution,Distribusi
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +8,Amount Paid,Jumlah Dibayar
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Project Manager,Manager Project
+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
 ,Quoted Item Comparison,Dikutip Barang Perbandingan
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Dispatch,Pengiriman
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,Pengiriman
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Diskon Max diperbolehkan untuk item: {0} {1}%
 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.
-DocType: Sales Invoice,Supplier Reference,Supplier Referensi
-apps/erpnext/erpnext/accounts/page/pos/pos.js +844,"Master data syncing, it might take some time","Data master sinkronisasi, itu mungkin memakan waktu"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +832,"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
@@ -3565,7 +3613,7 @@
 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 +83,Error in formula or condition,Kesalahan dalam formula atau kondisi
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,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
@@ -3574,7 +3622,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},Untuk tanggal harus dalam Tahun Anggaran. Dengan asumsi To Date = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Di sini Anda dapat mempertahankan tinggi, berat, alergi, masalah medis dll"
 DocType: Leave Block List,Applies to Company,Berlaku untuk Perusahaan
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +197,Cannot cancel because submitted Stock Entry {0} exists,Tidak bisa membatalkan karena ada Stock entri {0} Terkirim
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +198,Cannot cancel because submitted Stock Entry {0} exists,Tidak bisa membatalkan karena ada Stock entri {0} Terkirim
 DocType: Purchase Invoice,In Words,Dalam Kata
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,Today is {0}'s birthday!,Hari ini adalah {0} 's birthday!
 DocType: Production Planning Tool,Material Request For Warehouse,Permintaan Material Untuk Gudang
@@ -3584,14 +3632,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,Tahun pembukuan Anda dimulai
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Penyusutan aset dan Saldo
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +319,Amount {0} {1} transferred from {2} to {3},Jumlah {0} {1} ditransfer dari {2} untuk {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +322,Amount {0} {1} transferred from {2} to {3},Jumlah {0} {1} ditransfer dari {2} untuk {3}
 DocType: Sales Invoice,Get Advances Received,Dapatkan Uang Muka Diterima
 DocType: Email Digest,Add/Remove Recipients,Tambah / Hapus Penerima
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +432,Transaction not allowed against stopped Production Order {0},Transaksi tidak diperbolehkan berhenti melawan Orde Produksi {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +437,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 +143,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 +652,Item variant {0} exists with same attributes,Item varian {0} ada dengan atribut yang sama
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Item varian {0} ada dengan atribut yang sama
+DocType: Leave Application,LAP/,PUTARAN/
 DocType: Salary Slip,Salary Slip,Slip Gaji
 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
@@ -3599,12 +3648,12 @@
 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 +212,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 +215,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: Employee Education,Employee Education,Pendidikan Karyawan
-apps/erpnext/erpnext/public/js/controllers/transaction.js +866,It is needed to fetch Item Details.,Hal ini diperlukan untuk mengambil Item detail.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +857,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
@@ -3614,14 +3663,14 @@
 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 +178,Invalid {0},Valid {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Sick Leave,Cuti Sakit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,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
 DocType: Warehouse,PIN,PIN
 DocType: Sales Invoice,Base Change Amount (Company Currency),Dasar Perubahan Jumlah (Perusahaan Mata Uang)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +313,No accounting entries for the following warehouses,Tidak ada entri akuntansi untuk gudang berikut
-apps/erpnext/erpnext/projects/doctype/project/project.js +102,Save the document first.,Simpan dokumen terlebih dahulu.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +314,No accounting entries for the following warehouses,Tidak ada entri akuntansi untuk gudang berikut
+apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Simpan dokumen terlebih dahulu.
 DocType: Account,Chargeable,Dapat Dibebankan
 DocType: Company,Change Abbreviation,Ubah Singkatan
 DocType: Expense Claim Detail,Expense Date,Beban Tanggal
@@ -3634,10 +3683,9 @@
 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
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,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
 DocType: Appraisal,Appraisal Template,Template Penilaian
 DocType: Item Group,Item Classification,Klasifikasi Stok Barang
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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
@@ -3647,8 +3695,8 @@
 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 +940,Please select {0} first,Silahkan pilih {0} terlebih dahulu
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +749,Batch {0} of Item {1} has expired.,Batch {0} Item {1} telah berakhir.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +953,Please select {0} first,Silahkan pilih {0} terlebih dahulu
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +757,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
@@ -3676,8 +3724,8 @@
  {% 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 +92,Warehouse not found in the system,Gudang tidak ditemukan dalam sistem
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +106,This Month's Summary,Ringkasan ini Bulan ini
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Gudang tidak ditemukan dalam sistem
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Ringkasan ini Bulan ini
 DocType: Quality Inspection Reading,Quality Inspection Reading,Inspeksi Kualitas Reading
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Freeze Stock yang sudah lebih lama dari` harus lebih kecil dari %d hari.
 DocType: Tax Rule,Purchase Tax Template,Pembelian Template Pajak
@@ -3687,21 +3735,22 @@
 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 +87,Please set Next Depreciation Date,Silahkan mengatur Berikutnya Penyusutan Tanggal
-DocType: Payment Gateway,Payment Gateway,Gerbang pembayaran
 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 +378,Operation Time must be greater than 0 for Operation {0},Operasi Waktu harus lebih besar dari 0 untuk operasi {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +380,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
 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)
 DocType: Program,Program Abbreviation,Singkatan Program
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,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: Appraisal,Start Date,Tanggal Mulai
@@ -3717,21 +3766,22 @@
 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
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Misalnya. smsgateway.com / api / send_sms.cgi
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +27,Transaction currency must be same as Payment Gateway currency,Transaksi mata uang harus sama dengan Payment Gateway mata uang
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Transaction currency must be same as Payment Gateway currency,Transaksi mata uang harus sama dengan Payment Gateway mata uang
 DocType: Payment Entry,Receive,Menerima
+apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,kutipan:
 DocType: Maintenance Visit,Fully Completed,Sepenuhnya Selesai
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Lengkap
 DocType: Employee,Educational Qualification,Kualifikasi Pendidikan
 DocType: Workstation,Operating Costs,Biaya Operasional
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Tindakan jika Akumulasi Anggaran Bulanan Melebihi
 DocType: Purchase Invoice,Submit on creation,Kirim pada penciptaan
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +432,Currency for {0} must be {1},Mata uang untuk {0} harus {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +435,Currency for {0} must be {1},Mata uang untuk {0} harus {1}
 DocType: Asset,Disposal Date,pembuangan Tanggal
 DocType: Employee Leave Approver,Employee Leave Approver,Approver Cuti Karyawan
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,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 +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/crm/doctype/opportunity/opportunity.py +79,"Cannot declare as lost, because Quotation has been made.","Tidak dapat mendeklarasikan sebagai hilang, karena Quotation telah dibuat."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Master Manajer Pembelian
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +429,Production Order {0} must be submitted,Order produksi {0} harus diserahkan
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +434,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
@@ -3741,25 +3791,27 @@
 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
 DocType: Price List,Price List Name,Daftar Harga Nama
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +181,Totals,Total
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,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 +113,Warning: Leave application contains following block dates,Peringatan: Cuti aplikasi berisi tanggal blok berikut
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +120,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
 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.
+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 +181,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/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 +793,All records are synced.,Semua catatan disinkronkan.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +781,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
 DocType: Cost Center,Cost Center Name,Nama Pusat Biaya
@@ -3769,7 +3821,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Paid Amt,Total nilai Bayar
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Pesan lebih dari 160 karakter akan dipecah menjadi beberapa pesan
 DocType: Purchase Receipt Item,Received and Accepted,Diterima dan Diterima
-,Serial No Service Contract Expiry,Serial No Layanan Kontrak kadaluarsa
+,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 +272,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
@@ -3778,36 +3830,36 @@
 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/selling/doctype/quotation/quotation.py +49,Cannot set as Lost as Sales Order is made.,Tidak dapat ditetapkan sebagai Hilang sebagai Sales Order dibuat.
-DocType: Student Applicant,Mother's Name,Nama ibu
 DocType: Request for Quotation Item,Supplier Part No,Pemasok Bagian Tidak
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +348,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',tidak bisa memotong ketika kategori adalah untuk &#39;Penilaian&#39; atau &#39;Vaulation dan Total&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Received From,Diterima dari
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Received From,Diterima dari
 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/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 +93,Row {0}: Hours value must be greater than zero.,Row {0}: nilai Jam harus lebih besar dari nol.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +117,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
 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 +172,{0} {1} does not exist,{0} {1} tidak ada
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +175,{0} {1} does not exist,{0} {1} tidak ada
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,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 +72,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
 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/public/js/setup_wizard.js +48,What does it do?,Apa gunanya?
+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
 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 +109,Electrical,Listrik
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Electrical,Listrik
 DocType: Stock Entry,Total Value Difference (Out - In),Total Nilai Selisih (Out - Dalam)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,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}
@@ -3815,7 +3867,7 @@
 DocType: Item,Customer Code,Kode Konsumen
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +210,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 +292,Debit To account must be a Balance Sheet account,Debit Untuk akun harus rekening Neraca
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Stok Asset
@@ -3827,11 +3879,11 @@
 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 +301,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 +313,Salary Slip of employee {0} already created for time sheet {1},Slip Gaji karyawan {0} sudah dibuat untuk lembar waktu {1}
 DocType: Sales Order Item,Ordered Qty,Qty Terorder
-apps/erpnext/erpnext/stock/doctype/item/item.py +673,Item {0} is disabled,Item {0} dinonaktifkan
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,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 +838,BOM does not contain any stock item,BOM tidak mengandung stok barang
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +809,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.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Buat Slip Gaji
@@ -3839,23 +3891,24 @@
 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)
-apps/erpnext/erpnext/stock/doctype/item/item.py +485,Row #{0}: Please set reorder quantity,Row # {0}: Silakan mengatur kuantitas menyusun ulang
+DocType: Sales Invoice Timesheet,Billing Hours,Jam penagihan
+apps/erpnext/erpnext/stock/doctype/item/item.py +487,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 +62,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
+DocType: Payment Entry,Allocate Payment Amount,Alokasikan Jumlah Pembayaran
 DocType: Employee External Work History,Salary,Gaji
 DocType: Serial No,Delivery Document Type,Tipe Nota Pengiriman
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Menyerahkan semua slip gaji kriteria pilihan di atas
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} Item telah disinkronkan
 DocType: Sales Order,Partly Delivered,Terkirim Sebagian
-DocType: Sales Invoice,Existing Customer,Konsumen yang sudah ada
 DocType: Email Digest,Receivables,Piutang
+DocType: Lead Source,Lead Source,Sumber utama
 DocType: Customer,Additional information regarding the customer.,Informasi tambahan mengenai customer.
 DocType: Quality Inspection Reading,Reading 5,Membaca 5
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +38,Campaign Name is required,Nama Kampanye Promosi diwajibkan
 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
@@ -3864,10 +3917,9 @@
 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 +129,BOM and Manufacturing Quantity are required,BOM dan Manufaktur Kuantitas diperlukan
+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/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Rentang Ageing 2
 DocType: SG Creation Tool Course,Max Strength,Max Kekuatan
-DocType: Bank Reconciliation Detail,Amount,Jumlah
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM diganti
 ,Sales Analytics,Analitika Penjualan
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +113,Available {0},Tersedia {0}
@@ -3875,14 +3927,14 @@
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Persiapan Email
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +96,Please enter default currency in Company Master,Entrikan mata uang default di Perusahaan Guru
 DocType: Stock Entry Detail,Stock Entry Detail,Stock Entri Detil
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +100,Daily Reminders,Pengingat Harian
+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/account/account_tree.js +23,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 +71,Customer Service,Layanan Konsumen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Customer Service,Layanan Pelanggan
 DocType: Homepage Featured Product,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
@@ -3891,8 +3943,9 @@
 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
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Standar Gudang Work In Progress
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1570,Total nos of serial no is not equal to quantity.,Total nos tidak ada seri tidak sama dengan kuantitas.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1594,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
 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
@@ -3900,9 +3953,10 @@
 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 +82,Engineer,Insinyur
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,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 +370,Item Code required at Row No {0},Item Code dibutuhkan pada Row ada {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +398,Item Code required at Row No {0},Item Code dibutuhkan pada Row ada {0}
 DocType: Sales Partner,Partner Type,Tipe Mitra/Partner
 DocType: Purchase Taxes and Charges,Actual,Aktual
 DocType: Authorization Rule,Customerwise Discount,Diskon Berdasar Konsumen
@@ -3918,16 +3972,18 @@
 DocType: BOM,Raw Material Cost,Biaya Bahan Baku
 DocType: Item Reorder,Re-Order Level,Tingkat Re-order
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Entrikan item dan qty direncanakan untuk yang Anda ingin meningkatkan Order produksi atau download bahan baku untuk analisis.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +55,Part-time,Part-time
+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
 DocType: Employee,Applicable Holiday List,Daftar Hari Libur yang Berlaku
 DocType: Employee,Cheque,Cek
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Seri Diperbarui
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +57,Series Updated,Seri Diperbarui
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Jenis Laporan adalah wajib
 DocType: Item,Serial Number Series,Serial Number Series
 apps/erpnext/erpnext/buying/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 +87,Clearance Date updated,Cukai Tanggal diperbarui
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Berhasil Direkonsiliasi
@@ -3941,7 +3997,7 @@
 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 +513,Posting date and posting time is mandatory,Tanggal posting dan posting waktu adalah wajib
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Tanggal posting dan posting waktu adalah wajib
 apps/erpnext/erpnext/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.
@@ -3951,7 +4007,7 @@
 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/stock/doctype/stock_entry/stock_entry.py +158,Target warehouse in row {0} must be same as Production Order,Target gudang di baris {0} harus sama dengan Orde Produksi
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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
 DocType: Company,Round Off Account,Akun Pembulatan
@@ -3960,30 +4016,29 @@
 DocType: Customer Group,Parent Customer Group,Induk Grup Konsumen
 DocType: Purchase Invoice,Contact Email,Email Kontak
 DocType: Appraisal Goal,Score Earned,Skor Earned
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Notice Period,Masa Pemberitahuan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,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 +4,New Sales Person Name,Nama baru Sales Person
 DocType: Packing Slip,Gross Weight UOM,UOM Berat Kotor
-DocType: Email Digest,Receivables / Payables,Piutang / Hutang
 DocType: Delivery Note Item,Against Sales Invoice,Terhadap Faktur Penjualan
 DocType: Bin,Reserved Qty for Production,Dicadangkan Jumlah Produksi
 DocType: Asset,Frequency of Depreciation (Months),Frekuensi Penyusutan (Bulan)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +469,Credit Account,Akun kredit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Credit Account,Akun kredit
 DocType: Landed Cost Item,Landed Cost Item,Jenis Barang Biaya Landing
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +55,Show zero values,Tampilkan nilai nol
+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
 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 +647,Please specify Attribute Value for attribute {0},Silakan tentukan Atribut Nilai untuk atribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Silakan tentukan Atribut Nilai untuk atribut {0}
 DocType: Item,Default Warehouse,Standar Gudang
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +39,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 /Layanan
+DocType: Issue,Support Team,Tim Support
 DocType: Appraisal,Total Score (Out of 5),Skor Total (Out of 5)
 DocType: Fee Structure,FS.,FS.
 DocType: Batch,Batch,Batch
@@ -3998,19 +4053,22 @@
 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
-DocType: Sales Invoice,Cold Calling,Calling Dingin
 DocType: SMS Parameter,SMS Parameter,Parameter SMS
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,Anggaran dan Pusat Biaya
 DocType: Maintenance Schedule Item,Half Yearly,Setengah Tahunan
 DocType: Lead,Blog Subscriber,Blog Subscriber
+DocType: Guardian,Alternate Number,Jumlah alternatif
 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.
+DocType: Stock Reconciliation Item,Quantity Difference,kuantitas Perbedaan
 apps/erpnext/erpnext/config/hr.py +253,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 +141,Set as Lost,Set as Hilang/Kalah
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,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 +5,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
 DocType: Supplier,Credit Days Based On,Hari Kredit Berdasarkan
@@ -4022,11 +4080,10 @@
 ,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 +941,Select or add new customer,Pilih atau menambahkan pelanggan baru
+apps/erpnext/erpnext/accounts/page/pos/pos.js +930,Select or add new customer,Pilih atau menambahkan pelanggan baru
 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 +5,This is based on the attendance of this Employee,Hal ini didasarkan pada kehadiran Karyawan ini
-DocType: Sales Invoice,Frequency,Frekuensi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +463,Debit Account,Akun Debit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,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)
@@ -4035,27 +4092,27 @@
 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 +210,Supplier Quotation {0} created,Pemasok Quotation {0} dibuat
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +208,Supplier Quotation {0} created,Pemasok Quotation {0} dibuat
 apps/erpnext/erpnext/accounts/report/financial_statements.py +90,End Year cannot be before Start Year,Akhir Tahun tidak boleh sebelum Mulai Tahun
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Employee Benefits,Manfaat Karyawan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,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 +228,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 +232,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 +499,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 +500,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 +1007,Price List not found or disabled,Daftar Harga tidak ditemukan atau dinonaktifkan
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1008,Price List not found or disabled,Daftar Harga tidak ditemukan atau dinonaktifkan
 DocType: Expense Claim,Approved,Disetujui
 DocType: Pricing Rule,Price,Harga
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +244,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 +256,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
@@ -4066,12 +4123,12 @@
 DocType: Address,Office,Kantor
 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 +259,Please select Employee Record first.,Silakan pilih Rekam Karyawan terlebih dahulu.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +266,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 +190,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 +235,Please enter Expense Account,Masukan Entrikan Beban Akun
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,Please enter Expense Account,Masukan Entrikan Beban Akun
 DocType: Account,Stock,Stock
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,"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 +976,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Dokumen Referensi Type harus menjadi salah satu Purchase Order, Faktur Pembelian atau Journal Entri"
 DocType: Employee,Current Address,Alamat saat ini
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Jika item adalah varian dari item lain maka deskripsi, gambar, harga, pajak dll akan ditetapkan dari template kecuali secara eksplisit ditentukan"
 DocType: Serial No,Purchase / Manufacture Details,Detail Pembelian / Produksi
@@ -4086,9 +4143,10 @@
 DocType: Asset Movement,Transaction Date,Transaction Tanggal
 DocType: Production Plan Item,Planned Qty,Qty Planning
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,Total Pajak
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,For Quantity (Manufactured Qty) is mandatory,Untuk Quantity (Diproduksi Qty) adalah wajib
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,For Quantity (Manufactured Qty) is mandatory,Untuk Quantity (Diproduksi Qty) adalah wajib
 DocType: Stock Entry,Default Target Warehouse,Standar Sasaran Gudang
 DocType: Purchase Invoice,Net Total (Company Currency),Jumlah Bersih (Perusahaan Mata Uang)
+apps/erpnext/erpnext/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 +78,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: Production Order,Actual Start Date,Tanggal Mulai Aktual
@@ -4103,9 +4161,11 @@
 DocType: Warranty Claim,If different than customer address,Jika berbeda dari alamat Konsumen
 DocType: BOM Operation,BOM Operation,BOM Operation
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Pada Sebelumnya Row Jumlah
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +226,Transfer Asset,pengalihan Aset
+DocType: Student,Home Address,Alamat rumah
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +227,Transfer Asset,pengalihan Aset
 DocType: POS Profile,POS Profile,POS Profil
 apps/erpnext/erpnext/config/schools.py +33,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 +129,"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
@@ -4115,8 +4175,8 @@
 DocType: Assessment,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 +765,Material to Supplier,Bahan untuk Supplier
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +189,Excise Invoice,Cukai Faktur
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,Material to Supplier,Bahan untuk Supplier
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,Cukai Faktur
 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
@@ -4126,7 +4186,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,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: Scheduling Tool,Scheduling Tool,Alat penjadwalan
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +136,Credit Card,Kartu Kredit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,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.
 DocType: Purchase Invoice,Next Date,Tanggal Berikutnya
@@ -4134,6 +4194,7 @@
 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: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Di sini Anda dapat mempertahankan rincian keluarga seperti nama dan pekerjaan orang tua, pasangan dan anak-anak"
+DocType: Academic Term,Term End Date,Istilah Tanggal Akhir
 DocType: Hub Settings,Seller Name,Nama Penjual
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Pajak dan Biaya Dikurangi (Perusahaan Mata Uang)
 DocType: Item Group,General Settings,Pengaturan Umum
@@ -4145,7 +4206,7 @@
 DocType: Customer,Commission Rate,Tingkat Komisi
 apps/erpnext/erpnext/stock/doctype/item/item.js +261,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 +115,"Payment Type must be one of Receive, Pay and Internal Transfer","Jenis Pembayaran harus menjadi salah satu Menerima, Pay dan Internal Transfer"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +118,"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/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Cart adalah Kosong
 DocType: Production Order,Actual Operating Cost,Biaya Operasi Aktual
@@ -4160,10 +4221,10 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,Silakan pilih file csv
 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 +92,Designer,Perancang
+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
 DocType: Serial No,Delivery Details,Detail Pengiriman
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +469,Cost Center is required in row {0} in Taxes table for type {1},Biaya Pusat diperlukan dalam baris {0} dalam tabel Pajak untuk tipe {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +472,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
 ,Item-wise Purchase Register,Stok Barang-bijaksana Pembelian Register
 DocType: Batch,Expiry Date,Tanggal Berakhir
@@ -4173,12 +4234,12 @@
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Master Proyek
 apps/erpnext/erpnext/controllers/status_updater.py +174,"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 +417, (Half Day),(Setengah Hari)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425, (Half Day),(Setengah Hari)
 DocType: Supplier,Credit Days,Hari Kredit
 DocType: Leave Type,Is Carry Forward,Apakah Carry Teruskan
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +740,Get Items from BOM,Dapatkan item dari BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +711,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 +549,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/controllers/accounts_controller.py +552,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
 ,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
diff --git a/erpnext/translations/is.csv b/erpnext/translations/is.csv
index e9ee788..7dfebb5 100644
--- a/erpnext/translations/is.csv
+++ b/erpnext/translations/is.csv
@@ -18,11 +18,10 @@
 DocType: Sales Partner,Dealer,söluaðila
 DocType: Employee,Rented,leigt
 DocType: Purchase Order,PO-,PO-
-apps/erpnext/erpnext/accounts/report/financial_statements.py +19,Start Year {0} not found.,Upphafsár {0} fannst ekki.
 DocType: POS Profile,Applicable for User,Gildir fyrir notanda
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +191,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Hætt framleiðslu Order er ekki hægt að hætt, Unstop það fyrst til að fá ensku"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +197,Do you really want to scrap this asset?,Viltu virkilega að skrappa þessa eign?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +17,Select Default Supplier,Veldu Default Birgir
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +192,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Hætt framleiðslu Order er ekki hægt að hætt, Unstop það fyrst til að fá ensku"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +198,Do you really want to scrap this asset?,Viltu virkilega að skrappa þessa eign?
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Veldu Default Birgir
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,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
@@ -42,46 +41,45 @@
 DocType: Sales Invoice,Customer Name,Nafn viðskiptavinar
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +126,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 +180,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 +183,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 +148,Series Updated Successfully,Series Uppfært Tókst
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +149,Series Updated Successfully,Series Uppfært Tókst
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Athuga
 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ð
-DocType: Quality Inspection Reading,Parameter,Parameter
 apps/erpnext/erpnext/projects/doctype/project/project.py +54,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 +239,New Leave Application,Ný Leave Umsókn
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,New Leave Application,Ný Leave Umsókn
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +20,Attendance Record {0} exists against Student {1} for Course Schedule {2},Aðsókn Record {0} hendi á móti Student {1} fyrir Kennsluáætlun {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Bank Draft,Bank Draft
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,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
 DocType: Academic Term,Academic Term,fræðihugtak
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +13,Material,efni
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Quantity,magn
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +511,Accounts table cannot be blank.,Reikninga borð getur ekki verið autt.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +616,Quantity,magn
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +512,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)
 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/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 +142,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
-DocType: Purchase Invoice,Monthly,Mánaðarleg
 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/buying/doctype/purchase_order/purchase_order.js +771,Invoice,reikningur
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +750,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 +198,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 +74,Row # {0}:,Row # {0}:
+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 +127,Please select Price List,Vinsamlegast veldu verðskrá
@@ -93,7 +91,7 @@
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +47,Course Schedules created:,Course Skrár búið:
 apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},New {0}: # {1}
 ,Sales Partners Commission,Velta Partners Commission
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +22,Abbreviation cannot have more than 5 characters,Skammstöfun getur ekki haft fleiri en 5 stafir
+apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +22,Abbreviation cannot have more than 5 characters,Skammstöfun getur ekki haft fleiri en 5 stafi
 DocType: Payment Request,Payment Request,greiðsla Beiðni
 DocType: Asset,Value After Depreciation,Gildi Eftir Afskriftir
 DocType: Employee,O+,O +
@@ -112,8 +110,8 @@
 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 +589,Get items from,Fá atriði úr
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +382,Stock cannot be updated against Delivery Note {0},Stock Ekki er hægt að uppfæra móti afhendingarseðlinum {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Fá atriði úr
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,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
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,matvöruverslun
@@ -122,7 +120,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,lífeyrissjóðir
 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 +156,Salary Structure Missing,Laun Uppbygging vantar
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,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
@@ -130,10 +128,11 @@
 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 +156,Credit limit has been crossed for customer {0} {1}/{2},Hámarksupphæð hefur verið yfir fyrir viðskiptavin {0} {1} / {2}
-apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Er Fast Asset&quot; getur ekki verið valið, eins Asset met hendi á móti hlut"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +189,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"
 DocType: Tax Rule,Tax Type,Tax Type
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +144,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}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,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/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
@@ -143,18 +142,17 @@
 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 +165,Opening,opnun
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,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/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Viðskiptavinur&gt; Viðskiptavinur Group&gt; Territory
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Reikningur Pay Aðeins
 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.
 DocType: Lead,Product Enquiry,vara Fyrirspurnir
 DocType: Academic Term,Schools,skólar
 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 +335,Please select Company first,Vinsamlegast veldu Company fyrst
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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
@@ -164,7 +162,7 @@
 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
 DocType: Purchase Invoice Item,Is Fixed Asset,Er fast eign
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Available qty is {0}, you need {1}","Laus Magn er {0}, þú þarft {1}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +225,"Available qty is {0}, you need {1}","Laus Magn er {0}, þú þarft {1}"
 DocType: Expense Claim Detail,Claim Amount,bótafjárhæðir
 DocType: Employee,Mr,herra
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Birgir Type / Birgir
@@ -173,25 +171,26 @@
 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: Assessment Result,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 +171,Annual Salary,árslaunum
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Annual Salary,árslaunum
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,lager Útgjöld
-apps/erpnext/erpnext/accounts/report/financial_statements.py +22,End Year {0} not found.,End Ár {0} fannst ekki.
 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}
 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 +130,At least one mode of payment is required for POS invoice.,Að minnsta kosti einn háttur af greiðslu er krafist fyrir POS reikningi.
 DocType: Products Settings,Show Products as a List,Sýna vörur sem lista
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Sæktu sniðmát, fylla viðeigandi gögn og hengja við um hana. Allt dagsetningar og starfsmaður samspil völdu tímabili mun koma í sniðmát, með núverandi aðsóknarmet"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +451,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/stock/doctype/stock_entry/stock_entry.py +456,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/controllers/accounts_controller.py +614,"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/controllers/accounts_controller.py +617,"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 +166,Settings for HR Module,Stillingar fyrir HR Module
 DocType: SMS Center,SMS Center,SMS Center
 DocType: Sales Invoice,Change Amount,Breyta Upphæð
@@ -203,13 +202,13 @@
 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 +147,Execution,framkvæmd
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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/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}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,Cost Center {0} does not belong to Company {1},Kostnaður Center {0} ekki tilheyra félaginu {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +100,Cost Center {0} does not belong to Company {1},Kostnaður Center {0} ekki tilheyra félaginu {1}
 DocType: Customer,Individual,einstök
 DocType: Interest,Academics User,fræðimenn User
 DocType: Cheque Print Template,Amount In Figure,Upphæð Á mynd
@@ -225,30 +224,32 @@
 DocType: Production Planning Tool,Sales Orders,velta Pantanir
 DocType: Purchase Taxes and Charges,Valuation,verðmat
 ,Purchase Order Trends,Purchase Order Trends
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,The request for quotation can be accessed by clicking on the following link,Beiðni um tilvitnun er hægt að nálgast með því að smella á eftirfarandi tengil
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,Úthluta lauf á árinu.
 DocType: SG Creation Tool Course,SG Creation Tool Course,SG Creation Tool Course
 DocType: Student Group Creation Tool,Leave blank if you wish to fetch all courses for selected academic term,Skildu eftir autt ef þú vilt ná öllum námskeiðum fyrir valin fræðihugtak
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,Insufficient Stock,ófullnægjandi Stock
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227,Insufficient Stock,ófullnægjandi Stock
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Slökkva Stærð Skipulags- og Time mælingar
+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: 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/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} does not belong to Company {1},Reikningur {0} ekki tilheyra félaginu {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +86,Account {0} does not belong to Company {1},Reikningur {0} ekki tilheyra félaginu {1}
 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}
 DocType: Naming Series,Series List for this Transaction,Series List fyrir þessa færslu
 DocType: Sales Invoice,Is Opening Entry,Er Opnun færslu
 DocType: Customer Group,Mention if non-standard receivable account applicable,Umtal ef non-staðall nái reikning við
 DocType: Course Schedule,Instructor Name,kennari Name
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,For Warehouse is required before Submit,Fyrir Lager er krafist áður Senda
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,For Warehouse is required before Submit,Fyrir Lager er krafist áður Senda
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,fékk á
 DocType: Sales Partner,Reseller,sölumaður
 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 +1436,"LocalStorage is full , did not save","LocalStorage er fullt, ekki spara"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1460,"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}
@@ -261,39 +262,42 @@
 apps/erpnext/erpnext/templates/generators/item.html +78,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 +5,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/leave_application/leave_application.py +206,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/leave_application/leave_application.py +213,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 +114,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 +179,Leaves per Year,Leaves á ári
+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 +103,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}
+DocType: Email Digest,Profit & Loss,Hagnaður &amp; Tap
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,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 +435,Leave Blocked,Skildu Bannaður
-apps/erpnext/erpnext/stock/doctype/item/item.py +669,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 +443,Leave Blocked,Skildu Bannaður
+apps/erpnext/erpnext/stock/doctype/item/item.py +671,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 +83,Annual,Árleg
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +86,Annual,Árleg
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Sættir Item
-DocType: Stock Entry,Sales Invoice No,Velta Invoice Nei
+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
 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 +91,Software Developer,Forritari
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,Forritari
 DocType: Item,Minimum Order Qty,Lágmark Order Magn
 DocType: Pricing Rule,Supplier Type,birgir Type
 DocType: Scheduling Tool,Course Start Date,Auðvitað Start Date
 DocType: Item,Publish in Hub,Birta á Hub
+DocType: Student Admission,Student Admission,Student Aðgangseyrir
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is cancelled,Liður {0} er hætt
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Material Request,efni Beiðni
+apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} is cancelled,Liður {0} er hætt
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +823,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 +28,Abbreviation already used for another salary component,Skammstöfun þegar notuð fyrir annað laun hluti
+apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +28,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 +328,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}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +333,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/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
@@ -309,20 +313,21 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +130,Please select Charge Type first,Vinsamlegast veldu Charge Tegund fyrst
 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: Email Digest,New Quotations,ný Tilvitnun
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Fyrsti Leyfi samþykkjari á listanum verður sett sem sjálfgefið Leave samþykkjari
 DocType: Tax Rule,Shipping County,Sendingar County
 apps/erpnext/erpnext/config/desktop.py +158,Learn,Frekari
 DocType: Asset,Next Depreciation Date,Næsta Afskriftir Dagsetning
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Virkni Kostnaður á hvern starfsmann
 DocType: Accounts Settings,Settings for Accounts,Stillingar fyrir reikninga
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +626,Supplier Invoice No exists in Purchase Invoice {0},Birgir Invoice Nei er í kaupa Reikningar {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +629,Supplier Invoice No exists in Purchase Invoice {0},Birgir Invoice Nei er í kaupa Reikningar {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Stjórna velta manneskja Tree.
 DocType: Job Applicant,Cover Letter,Kynningarbréf
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Framúrskarandi Tékkar og Innlán til að hreinsa
 DocType: Item,Synced With Hub,Samstillt Með Hub
 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 +348,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 +86,Circular Reference Error,Hringlaga Tilvísun Villa
@@ -334,15 +339,16 @@
 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 +806,Delivery Note,Afhendingarseðilinn
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +800,Delivery Note,Afhendingarseðilinn
 apps/erpnext/erpnext/config/learn.py +87,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 +233,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/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/setup/doctype/email_digest/email_digest.py +104,Summary for this week and pending activities,Samantekt fyrir þessa viku og bið starfsemi
+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"
 DocType: Employee,Company Email,fyrirtæki Email
@@ -354,27 +360,28 @@
 apps/erpnext/erpnext/config/hr.py +186,"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
-apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Kaup Invoice ekki hægt að gera við núverandi eign {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +554,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 +54,{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 +812,Select Item,Veldu Item
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +791,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 \
 					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 +142,Purchase Invoice {0} is already submitted,Purchase Invoice {0} er þegar lögð
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Hópur Nei verður að vera það sama og {1} {2}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +143,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.
 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 +342,Please see attachment,Vinsamlega sjá viðhengi
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,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 +19,Setup Already Complete!!,Skipulag þegar lokið !!
 ,Finished Goods,fullunnum
 DocType: Delivery Note,Instructions,leiðbeiningar
 DocType: Quality Inspection,Inspected By,skoðað með
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Birgir&gt; Birgir Tegund
 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/public/js/utils/item_selector.js +12,Add Items,Bæta Hlutir
@@ -388,29 +395,29 @@
 DocType: Currency Exchange,Currency Exchange,gjaldeyri
 DocType: Purchase Invoice Item,Item Name,Item Name
 DocType: Authorization Rule,Approving User  (above authorized value),Samþykkir notandi (yfir viðurkennda gildi)
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Inneignin
+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/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 +736,Purchase Return,kaup Return
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +715,Purchase Return,kaup Return
 ,Purchase Register,kaup Register
 DocType: 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 +202,{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 +209,{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 +143,Reason for losing,Ástæðan fyrir að tapa
-apps/erpnext/erpnext/accounts/utils.py +239,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 +163,Reason for losing,Ástæðan fyrir að tapa
+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æð
 DocType: Announcement,Receiver,Receiver
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,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: 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 +225,Please enter Cost Center,Vinsamlegast sláðu Kostnaður Center
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,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
@@ -423,26 +430,26 @@
 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
 DocType: Account,Is Group,er hópur
+DocType: Email Digest,Pending Purchase Orders,Bíður Purchase Pantanir
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Sjálfkrafa Setja Serial Nos miðað FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Athuga Birgir Reikningur númer Sérstöðu
 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 +102,Non Profit,non Profit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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: Stock Reconciliation Item,Do not include symbols (ex. $),Ekki eru tákn (ex. $)
 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 +638,Attribute {0} selected multiple times in Attributes Table,Eiginleiki {0} valin mörgum sinnum í eigindum töflu
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Eiginleiki {0} valin mörgum sinnum í eigindum töflu
 DocType: HR Settings,Employee record is created using selected field. ,Starfsmaður færsla er búin til með völdu sviði.
 DocType: Sales Order,Not Applicable,Á ekki við
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Holiday skipstjóri.
 DocType: Request for Quotation Item,Required Date,Áskilið Dagsetning
 DocType: Delivery Note,Billing Address,Greiðslufang
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +862,Please enter Item Code.,Vinsamlegast sláðu Item Code.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +847,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æð
@@ -456,12 +463,12 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Verðbréfa
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Samtals lauf úthlutað er nauðsynlegur
 DocType: Job Opening,Description of a Job Opening,Lýsing á starf opnun
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Pending activities for today,Bið starfsemi fyrir dag
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Bið starfsemi fyrir dag
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Aðsókn met.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Laun Component fyrir timesheet byggt launaskrá.
 DocType: Sales Order Item,Used for Production Plan,Notað fyrir framleiðslu áætlun
 DocType: Manufacturing Settings,Time Between Operations (in mins),Tími milli rekstrar (í mín)
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +92,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} Fjárhagsáætlun fyrir reikning {1} gegn Kostnaður Center {2} er {3}. Það mun fara yfir um {4}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +95,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} Fjárhagsáætlun fyrir reikning {1} gegn Kostnaður Center {2} er {3}. Það mun fara yfir um {4}
 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
@@ -469,16 +476,16 @@
 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/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 +86,Administrative Officer,Administrative Officer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,Administrative Officer
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +23,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 +319,Please select Company,Vinsamlegast veldu Company
-DocType: Stock Entry,Difference Account,munurinn Reikningur
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +309,Please select Company,Vinsamlegast veldu Company
+DocType: Stock Entry Detail,Difference Account,munurinn Reikningur
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,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 +398,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 +399,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 +530,"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 +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"
 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 +28,Buy,kaupa
@@ -486,7 +493,7 @@
 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 +1563,Serial no item cannot be a fraction,Serial engin lið getur ekki verið brot
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1587,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
@@ -495,13 +502,14 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Account {0} does not belong to company: {1},Reikningur {0} ekki tilheyra fyrirtæki: {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation already used for another company,Skammstöfun þegar notuð fyrir annað fyrirtæki
 DocType: Selling Settings,Default Customer Group,Sjálfgefið Group Viðskiptavinur
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Supplier is required against Payable account {0},Birgir er krafist á móti ber að greiða reikninginn {0}
 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
 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 +313,Reference No and Reference Date is mandatory for Bank transaction,Tilvísun Nei og Frestdagur er nauðsynlegur fyrir banka viðskiptin
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +316,Reference No and Reference Date is mandatory for Bank transaction,Tilvísun Nei og Frestdagur er nauðsynlegur fyrir banka viðskiptin
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Bæta við / breyta sköttum og gjöldum
 DocType: Purchase Invoice,Supplier Invoice No,Birgir Reikningur nr
 DocType: Territory,For reference,til viðmiðunar
@@ -512,7 +520,6 @@
 DocType: Installation Note Item,Installation Note Item,Uppsetning Note Item
 DocType: Production Plan Item,Pending Qty,Bíður Magn
 DocType: Budget,Ignore,Hunsa
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Item Code&gt; Item Group&gt; Brand
 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/config/accounts.py +241,Setup cheque dimensions for printing,Skipulag athuga mál fyrir prentun
 DocType: Salary Slip,Salary Slip Timesheet,Laun Slip Timesheet
@@ -523,11 +530,11 @@
 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/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 +28,Please select Company and Party Type first,Vinsamlegast veldu Company og Party Gerð fyrst
+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/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 +707,Make Sales Order,Gera Velta Order
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +701,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
@@ -543,7 +550,8 @@
 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 +734,Sales Return,velta Return
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +728,Sales Return,velta Return
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +91,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)
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Gagnagrunnur hugsanlegra viðskiptavina.
@@ -552,14 +560,13 @@
 DocType: Quotation,Quotation To,Tilvitnun Til
 DocType: Lead,Middle Income,Middle Tekjur
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +212,Opening (Cr),Opening (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +795,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,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 +237,Allocated amount can not be negative,Úthlutað magn getur ekki verið neikvæð
+apps/erpnext/erpnext/stock/doctype/item/item.py +797,Default Unit of Measure for Item {0} cannot be changed directly because 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æð
 DocType: Purchase Order Item,Billed Amt,billed Amt
 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: Sales Invoice Timesheet,Sales Invoice Timesheet,Velta Invoice Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},Tilvísunarnúmer &amp; Frestdagur er nauðsynlegt fyrir {0}
-DocType: Sales Invoice,Customer's Vendor,Vendor viðskiptavinar
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Proposal Writing,Tillaga Ritun
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,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
@@ -568,13 +575,14 @@
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,tími mælingar
 DocType: Fiscal Year Company,Fiscal Year Company,Reikningsár Company
 DocType: Packing Slip Item,DN Detail,DN Detail
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +257,Already supplier quotation has created,Þegar birgir tilvitnun hefur skapað
 DocType: Timesheet,Billed,billed
 DocType: Batch,Batch Description,hópur Lýsing
+apps/erpnext/erpnext/accounts/utils.py +685,"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 +733,View Offline Records,Skoða Offline Records
+apps/erpnext/erpnext/accounts/page/pos/pos.js +715,View Offline Records,Skoða Offline Records
+DocType: Student,Sibling Details,systkini Upplýsingar
 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: Payment Reconciliation,Invoice/Journal Entry Details,Invoice / Journal Entry Details
@@ -588,19 +596,20 @@
 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á
 DocType: Employee,Passport Number,Vegabréfs númer
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Manager,framkvæmdastjóri
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,framkvæmdastjóri
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,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,&quot;Byggt á &#39;og&#39; hóp eftir &#39;getur ekki verið það sama
+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ð
 DocType: Installation Note,IN-,í-
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter email address,Vinsamlegast sláðu inn netfangið
 DocType: Production Order Operation,In minutes,í mínútum
 DocType: Issue,Resolution Date,upplausn Dagsetning
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +299,Timesheet created:,Timesheet búið:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +715,Please set default Cash or Bank account in Mode of Payment {0},Vinsamlegast settu sjálfgefinn Cash eða bankareikning í háttur á greiðslu {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +300,Timesheet created:,Timesheet búið:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +772,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
 DocType: Selling Settings,Customer Naming By,Viðskiptavinur Nafngift By
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vinsamlegast skipulag Starfsmaður nafngiftir kerfi í Mannauðsstjórnun&gt; HR Stillingar
 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
@@ -625,6 +634,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,Ljúka
 DocType: Pricing Rule,Sales Manager,Sölufulltrúi
 DocType: Salary Structure Employee,Base,Base
+DocType: Timesheet,Total Billed Hours,Samtals Greidd Hours
 DocType: Journal Entry,Write Off Amount,Skrifaðu Off Upphæð
 DocType: Journal Entry,Bill No,Bill Nei
 DocType: Company,Gain/Loss Account on Asset Disposal,Hagnaður / tap reikning á Asset förgun
@@ -639,11 +649,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +9,Pre Sales,Forsala
 DocType: Purchase Receipt,Other Details,aðrar upplýsingar
 DocType: Account,Accounts,Reikningar
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Marketing,markaðssetning
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +227,Payment Entry is already created,Greiðsla Entry er þegar búið
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,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 +538,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 +21,Preview Salary Slip,Preview Laun Slip
+apps/erpnext/erpnext/controllers/accounts_controller.py +541,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 +38,Preview Salary Slip,Preview Laun Slip
 DocType: Company,Deafult Cost Center,Deafult Kostnaður Center
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +48,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
@@ -652,7 +662,7 @@
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,Vinsamlegast veldu Student Group
 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 +617,Item has variants.,Liður hefur afbrigði.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Liður hefur afbrigði.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,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
@@ -672,7 +682,7 @@
 DocType: Purchase Order,Supply Raw Materials,Supply Raw Materials
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,Dagsetningin sem næst verður reikningur mynda. Það er myndaður á senda.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Veltufjármunir
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,{0} is not a stock Item,{0} er ekki birgðir Item
+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 +169,Lead must be set if Opportunity is made from Lead,Lead verður að setja ef Tækifæri er gert úr Lead
@@ -739,26 +749,25 @@
 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 +709,No Permission,engin heimild
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +710,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}
 apps/erpnext/erpnext/public/js/setup_wizard.js +298,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 +542,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} Leggja skal fram
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} Leggja skal fram
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Enginn starfsmaður fannst
 DocType: Supplier Quotation,Stopped,Tappi
 DocType: Item,If subcontracted to a vendor,Ef undirverktaka til seljanda
 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.
 DocType: Warehouse,Tree Details,Tree Upplýsingar
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Senda Nú
 ,Support Analytics,Stuðningur Analytics
 DocType: Item,Website Warehouse,Vefsíða Warehouse
 DocType: Payment Reconciliation,Minimum Invoice Amount,Lágmark Reikningsupphæð
 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/sales_invoice/sales_invoice.py +227,Timesheet {0} is already completed or cancelled,Timesheet {0} er þegar lokið eða hætt
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +259,Timesheet {0} is already completed or cancelled,Timesheet {0} er þegar lokið eða hætt
 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
@@ -774,13 +783,13 @@
 apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,námskeið Stundaskrá
 DocType: Maintenance Visit,Completion Status,Gengið Staða
 DocType: HR Settings,Enter retirement age in years,Sláðu eftirlaunaaldur í ár
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +229,Target Warehouse,Target Warehouse
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +230,Target Warehouse,Target Warehouse
 DocType: Cheque Print Template,Starting location from left edge,Byrjun stað frá vinstri kanti
 DocType: Item,Allow over delivery or receipt upto this percent,Leyfa yfir afhendingu eða viðtöku allt uppí þennan prósent
 DocType: Stock Entry,STE-,STE-
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Sales Order Date,Áætlaðan fæðingardag getur ekki verið áður Sales Order Dagsetning
 DocType: Upload Attendance,Import Attendance,innflutningur Aðsókn
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Allir Item Hópar
+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/config/setup.py +89,Automatically compose message on submission of transactions.,Sjálfkrafa semja skilaboð á framlagningu viðskiptum.
@@ -792,13 +801,15 @@
 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/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
 DocType: Expense Claim,Expenses,útgjöld
 DocType: Item Variant Attribute,Item Variant Attribute,Liður Variant Attribute
 ,Purchase Receipt Trends,Kvittun Trends
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Research & Development,Rannsóknir og þróun
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Rannsóknir og þróun
 ,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
@@ -807,7 +818,7 @@
 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/controllers/accounts_controller.py +340,"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."
+apps/erpnext/erpnext/controllers/accounts_controller.py +343,"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
@@ -829,12 +840,12 @@
 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 +756,Purchase Receipt,Kvittun
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +735,Purchase Receipt,Kvittun
 ,Received Items To Be Billed,Móttekin Items verður innheimt
 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 +167,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 +282,Unable to find Time Slot in the next {0} days for Operation {1},Ekki er hægt að finna tíma rifa á næstu {0} dögum fyrir aðgerð {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +170,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 +283,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 +439,BOM {0} must be active,BOM {0} verður að vera virkt
@@ -845,7 +856,7 @@
 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 +214,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 +217,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
@@ -859,9 +870,9 @@
 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
 DocType: Fee Structure,Components,Hluti
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,Please enter Asset Category in Item {0},Vinsamlegast sláðu eignaflokki í lið {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +612,Item Variants {0} updated,Liður Afbrigði {0} uppfærð
+apps/erpnext/erpnext/stock/doctype/item/item.py +614,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 +843,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 +854,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ú
@@ -876,69 +887,72 @@
 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 +728,New Sales Invoice,Ný Velta Invoice
+apps/erpnext/erpnext/accounts/page/pos/pos.js +710,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 +728,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
 DocType: Material Request Item,Lead Time Date,Lead Time Dagsetning
 DocType: Guardian,Guardian Name,Guardian Name
 DocType: Cheque Print Template,Has Print Format,Hefur prenta sniði
-apps/erpnext/erpnext/accounts/page/pos/pos.js +86, 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 +109,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 +619,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","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/page/pos/pos.js +75, 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 +613,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing 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 +606,Supplier Invoice Date cannot be greater than Posting Date,Birgir Invoice Dagsetning má ekki vera meiri en Staða Dagsetning
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +609,Supplier Invoice Date cannot be greater than Posting Date,Birgir Invoice Dagsetning má ekki vera meiri en Staða Dagsetning
 DocType: Purchase Invoice Item,Purchase Order Item,Purchase Order Item
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +130,Indirect Income,Óbein Tekjur
 DocType: Cheque Print Template,Date Settings,Dagsetning Stillingar
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,dreifni
 ,Company Name,nafn fyrirtækis
 DocType: SMS Center,Total Message(s),Total Message (s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +810,Select Item for Transfer,Veldu Atriði til flutnings
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +789,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.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Leyfa notanda að breyta gjaldskránni Rate í viðskiptum
 DocType: Pricing Rule,Max Qty,max Magn
-DocType: Student Applicant,Father's Name,Heiti föður
 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 +105,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
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +686,All items have already been transferred for this Production Order.,Allir hlutir hafa þegar verið flutt í þessari framleiðslu Order.
+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
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +694,All items have already been transferred for this Production Order.,Allir hlutir hafa þegar verið flutt í þessari framleiðslu Order.
 DocType: Process Payroll,Select Payroll Year and Month,Veldu Launaskrá mánuður og ár
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,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
-DocType: Opportunity,Walk In,Ganga í
 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 +12,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: Timesheet Detail,Bill,Bill
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,White,White
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,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
 DocType: SMS Center,All Lead (Open),Allt Lead (Open)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +228,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})
+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 +731,Make ,gera
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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.
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Karfan mín
-apps/erpnext/erpnext/controllers/selling_controller.py +154,Order Type must be one of {0},Order Type verður að vera einn af {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Order Type verður að vera einn af {0}
 DocType: Lead,Next Contact Date,Næsta samband við þann
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,opnun Magn
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +393,Please enter Account for Change Amount,Vinsamlegast sláðu inn reikning fyrir Change Upphæð
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,Please enter Account for Change Amount,Vinsamlegast sláðu inn reikning fyrir Change Upphæð
 DocType: Student Batch,Student Batch Name,Student Hópur Name
 DocType: Holiday List,Holiday List Name,Holiday List Nafn
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js +8,Schedule Course,Dagskrá Námskeið
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Stock Options,Kaupréttir
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Kaupréttir
 DocType: Journal Entry Account,Expense Claim,Expense Krafa
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +211,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 +237,Qty for {0},Magn {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +212,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 +238,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
@@ -947,9 +961,9 @@
 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/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Fjarlægðar atriði með engin breyting á magni eða verðmæti.
+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 +635,Attribute table is mandatory,Eiginleiki borð er nauðsynlegur
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Eiginleiki borð er nauðsynlegur
 DocType: Production Planning Tool,Get Sales Orders,Fá sölu skipunum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{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
@@ -974,7 +988,7 @@
 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/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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Serial Nei {0} er undir viðhald samning uppí {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +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
@@ -986,7 +1000,7 @@
 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/controllers/selling_controller.py +231,Sales Order {0} is {1},Velta Order {0} er {1}
+apps/erpnext/erpnext/controllers/selling_controller.py +232,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
 DocType: Packing Slip,Net Weight UOM,Net Weight UOM
@@ -996,25 +1010,24 @@
 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
 DocType: Sales Person,Select company name first.,Select nafn fyrirtækis fyrst.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Dr,dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Dr,dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Tilvitnanir berast frá birgja.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},Til {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Meðalaldur
 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/templates/pages/home.html +32,View All Products,Sjá allar vörur
+apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Sjá allar vörur
 DocType: Company,Default Currency,sjálfgefið mynt
 DocType: Contact,Enter designation of this Contact,Sláðu tilnefningu tengiliðs
 DocType: Expense Claim,From Employee,frá starfsmanni
-apps/erpnext/erpnext/controllers/accounts_controller.py +400,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
+apps/erpnext/erpnext/controllers/accounts_controller.py +403,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/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,og ár:
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +191,{0} {1} must be submitted,{0} {1} Leggja skal fram
-DocType: Email Digest,Annual Expense,árleg Expense
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,{0} {1} must be submitted,{0} {1} Leggja skal fram
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +145,Quantity must be less than or equal to {0},Magn verður að vera minna en eða jafnt og {0}
 DocType: SMS Center,Total Characters,Samtals Stafir
 apps/erpnext/erpnext/controllers/buying_controller.py +156,Please select BOM in BOM field for Item {0},Vinsamlegast veldu BOM á BOM sviði í lið {0}
@@ -1025,30 +1038,31 @@
 DocType: Sales Partner,Distributor,dreifingaraðili
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Shopping Cart Shipping Rule
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +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 +62,Please set 'Apply Additional Discount On',Vinsamlegast settu &#39;Virkja Viðbótarupplýsingar afslátt&#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +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
 DocType: Global Defaults,Global Defaults,Global Vanskil
 apps/erpnext/erpnext/projects/doctype/project/project.py +153,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
 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 +327,Capacity Planning Error,Getu Planning Villa
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,Getu Planning Villa
 ,Trial Balance for Party,Trial Balance fyrir aðila
 DocType: Lead,Consultant,Ráðgjafi
 DocType: Salary Slip,Earnings,Hagnaður
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +362,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/stock/doctype/stock_entry/stock_entry.py +367,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
 DocType: Sales Invoice Advance,Sales Invoice Advance,Velta Invoice Advance
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +499,Nothing to request,Ekkert til að biðja
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +500,Nothing to request,Ekkert til að biðja
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'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 +73,Management,Stjórn
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},Annaðhvort skuldfærslu eða inneign upphæð er nauðsynlegt fyrir {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,Stjórn
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +55,Either debit or credit amount is required for {0},Annaðhvort skuldfærslu eða inneign upphæð er nauðsynlegt fyrir {0}
 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 +161,Blue,Blue
+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
@@ -1058,12 +1072,12 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +23,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
 DocType: Stock Settings,Default Item Group,Sjálfgefið Item Group
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1374,Do you really want to submit the invoice?,Viltu virkilega að senda reikninginn?
+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 +685,Cost Center For Item with Item Code ',Kostnaður Center For lið með Item Code &#39;
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1526,"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 +679,Cost Center For Item with Item Code ',Kostnaður Center For lið með Item Code &#39;
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1550,"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/accounts/doctype/account/account_tree.js +26,"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
@@ -1083,104 +1097,106 @@
 DocType: Payment Reconciliation,Unreconciled Payment Details,Unreconciled Upplýsingar Greiðsla
 DocType: Global Defaults,Current Fiscal Year,Yfirstandandi reikningsári
 DocType: Global Defaults,Disable Rounded Total,Slökkva á Ávalur Samtals
-DocType: Lead,Call,Call
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +417,'Entries' cannot be empty,&#39;Færslur&#39; má ekki vera autt
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +418,'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 +214,Fiscal Year {0} not found,Reikningsár {0} fannst ekki
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +221,Fiscal Year {0} not found,Reikningsár {0} fannst ekki
 apps/erpnext/erpnext/config/hr.py +238,Setting up Employees,Setja upp Starfsmenn
 DocType: Sales Order,SO-,SO-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Vinsamlegast veldu forskeyti fyrst
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Please select prefix first,Vinsamlegast veldu forskeyti fyrst
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Research,Rannsókn
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,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 +43,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 +57,View Ledger,Skoða Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,elstu
-apps/erpnext/erpnext/stock/doctype/item/item.py +504,"An Item Group exists with same name, please change the item name or rename the item group","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 +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/setup/setup_wizard/setup_wizard.py +437,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
 ,Budget Variance Report,Budget Dreifni Report
 DocType: Salary Slip,Gross Pay,Gross Pay
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +90,Row {0}: Activity Type is mandatory.,Row {0}: Activity Type er nauðsynlegur.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +114,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/public/js/controllers/stock_controller.js +40,Accounting Ledger,bókhald Ledger
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,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é
 DocType: BOM Item,Item Description,Lýsing á hlut
+DocType: Student Sibling,Student Sibling,Student systkini
 DocType: Purchase Invoice,Is Recurring,er Fastir
 DocType: Purchase Invoice,Supplied Items,Meðfylgjandi Items
 DocType: Student,STUD.,STUD.
 DocType: Production Order,Qty To Manufacture,Magn To Framleiðsla
+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/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 +131,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 +175,Valuation Rate required for Item in row {0},Verðmat Gefa þarf fyrir lið í röð {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,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
 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 +87, to ,að
+apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,að
 DocType: Item,Lead Time in days,Lead Time í dögum
 ,Accounts Payable Summary,Viðskiptaskuldir Yfirlit
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Not authorized to edit frozen Account {0},Ekki heimild til að breyta frosinn reikning {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,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 +62,Sales Order {0} is not valid,Velta Order {0} er ekki gilt
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Velta Order {0} er ekki gilt
 apps/erpnext/erpnext/setup/doctype/company/company.py +185,"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 +152,Small,Lítil
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,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}
 ,Invoiced Amount (Exculsive Tax),Upphæð á reikningi (Exculsive Tax)
-DocType: Student Applicant,Mother's / Guardian 1 Email ID,Móður / forráðamaður 1 Email ID
 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 +160,Green,grænn
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,grænn
 DocType: Supplier,SUPP-,SUPP-
 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 +57,Contract,Samningur
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,Samningur
 DocType: Email Digest,Add Quote,Bæta Quote
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +498,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 +503,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 +80,Row {0}: Qty is mandatory,Row {0}: Magn er nauðsynlegur
+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 +737,Sync Master Data,Sync Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +719,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
 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óð
+DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Þetta er rót atriði hóp og ekki hægt að breyta.
+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.
 DocType: Journal Entry Account,Purchase Order,Pöntun
 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 +345,"{0}: Employee email not found, hence email not sent","{0}: Starfsmaður tölvupósti fannst ekki, þess vegna email ekki sent"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +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
 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 +118,"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/accounts/doctype/sales_invoice/sales_invoice.py +474,Delivery Note {0} is not submitted,Afhending Note {0} er ekki lögð
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Delivery Note {0} is not submitted,Afhending Note {0} er ekki lögð
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Sub-contracted Item,Liður {0} verður að vera Sub-dregist Item
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Capital útbúnaður
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Verðlagning Regla er fyrst valið byggist á &#39;Virkja Á&#39; sviði, sem getur verið Item, Item Group eða Brand."
 DocType: Hub Settings,Seller Website,Seljandi Website
 DocType: Item,ITEM-,ITEM-
-apps/erpnext/erpnext/controllers/selling_controller.py +147,Total allocated percentage for sales team should be 100,Samtals úthlutað hlutfall fyrir Söluteymi ætti að vera 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +110,Production Order status is {0},Framleiðsla Order staðan er {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Samtals úthlutað hlutfall fyrir Söluteymi ætti að vera 100
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Framleiðsla Order staðan er {0}
 DocType: Appraisal Goal,Goal,Markmið
 DocType: Sales Invoice Item,Edit Description,Breyta Lýsing
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +757,For Supplier,fyrir Birgir
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +723,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
@@ -1196,10 +1212,11 @@
 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
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Sendu Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +445,BOM {0} does not belong to Item {1},BOM {0} ekki tilheyra lið {1}
 DocType: Sales Partner,Target Distribution,Target Dreifing
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1667,Deafault warehouse is required for selected item,Deafault vöruhús er nauðsynlegt fyrir valinn hlut
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Deafault warehouse is required for selected item,Deafault vöruhús er nauðsynlegt fyrir valinn hlut
 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
@@ -1208,23 +1225,23 @@
 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 +110,Hardware,Vélbúnaður
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,Vélbúnaður
 DocType: Sales Order,Recurring Upto,Fastir uppí
 DocType: Attendance,HR Manager,HR Manager
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Vinsamlegast veldu Company
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Privilege Leave,Privilege Leave
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,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 +79,You need to enable Shopping Cart,Þú þarft að virkja Shopping Cart
 DocType: Payment Entry,Writeoff,Afskrifa
 DocType: Appraisal Template Goal,Appraisal Template Goal,Úttekt Snið Goal
-DocType: Salary Slip,Earning,earnings
+DocType: Salary Component,Earning,earnings
 DocType: Purchase Invoice,Party Account Currency,Party Reikningur Gjaldmiðill
 ,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 +171,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 +174,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_data.py +358,Food,Matur
+apps/erpnext/erpnext/demo/setup/setup_data.py +301,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/course_schedule/course_schedule.js +103,Mark Attendence,Mark Attendence
@@ -1258,12 +1275,12 @@
 DocType: Sales Order Item,Planned Quantity,Áætlaðir Magn
 DocType: Purchase Invoice Item,Item Tax Amount,Liður Tax Upphæð
 DocType: Item,Maintain Stock,halda lager
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +209,Stock Entries already created for Production Order ,Lager Færslur nú þegar búið til framleiðslu Order
+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
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,Net Breyting á fast eign
 DocType: Leave Control Panel,Leave blank if considered for all designations,Skildu eftir autt ef það er talið fyrir alla heita
-apps/erpnext/erpnext/controllers/accounts_controller.py +620,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 +238,Max: {0},Max: {0}
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +15,From Datetime,frá DATETIME
+apps/erpnext/erpnext/controllers/accounts_controller.py +623,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 +239,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 +153,"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."
@@ -1271,8 +1288,8 @@
 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 +552,cannot be greater than 100,getur ekki verið meiri en 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +680,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 +546,cannot be greater than 100,getur ekki verið meiri en 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,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
@@ -1286,10 +1303,9 @@
 DocType: GL Entry,GL Entry,GL Entry
 DocType: HR Settings,Employee Settings,Employee Stillingar
 ,Batch-Wise Balance History,Hópur-Wise Balance Saga
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Til að gera lista
 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 +61,Apprentice,lærlingur
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +102,Negative Quantity is not allowed,Neikvætt Magn er ekki leyfð
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,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 +152,Employee cannot report to himself.,Starfsmaður getur ekki skýrslu við sjálfan sig.
@@ -1310,15 +1326,14 @@
 DocType: Asset,Asset Name,Asset Name
 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 +141,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 +719,Packing Slip,pökkun Slip
+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 +713,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/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,Beiðni um tilvitnun má aðgang með því að smella á eftirfarandi tengil
 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 +81,Analyst,Analyst
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,Analyst
 DocType: Item,Inventory,Skrá
 DocType: Item,Sales Details,velta Upplýsingar
 DocType: Quality Inspection,QI-,QI-
@@ -1326,7 +1341,7 @@
 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 +103,Government,ríkisstjórn
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,ríkisstjórn
 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
 DocType: Company,Services,Þjónusta
@@ -1342,6 +1357,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,Financial Year Start Date,Fjárhagsár Start Date
 DocType: POS Profile,Apply Discount,gilda Afsláttur
 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
 DocType: Program Course,Program Course,program Námskeið
@@ -1382,12 +1398,12 @@
 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
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +110,Accounting Entry for {0} can only be made in currency: {1},Bókhald Entry fyrir {0} Aðeins er hægt að gera í gjaldmiðli: {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Bókhald Entry fyrir {0} Aðeins er hægt að gera í gjaldmiðli: {1}
 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
 DocType: Shopping Cart Settings,Payment Success URL,Greiðsla Velgengni URL
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +78,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: aftur hlut {1} er ekki til í {2} {3}
+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
@@ -1396,44 +1412,43 @@
 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/stock/doctype/stock_entry/stock_entry.py +339,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/stock/doctype/stock_entry/stock_entry.py +344,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 +545,Manufacturing Quantity is mandatory,Framleiðsla Magn er nauðsynlegur
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Framleiðsla Magn er nauðsynlegur
 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 +71,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 +162,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/projects/doctype/timesheet/timesheet.py +186,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
 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 +130,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 +137,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
 DocType: Dependent Task,Dependent Task,Dependent Task
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,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/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 +190,Leave of type {0} cannot be longer than {1},Leyfi af gerð {0} má ekki vera lengri en {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +197,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
 DocType: SMS Center,Receiver List,Receiver List
-apps/erpnext/erpnext/accounts/page/pos/pos.js +921,Search Item,leit Item
+apps/erpnext/erpnext/accounts/page/pos/pos.js +910,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 +546,Already completed,þegar lokið
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +22,Payment Request already exists {0},Greiðsla Beiðni þegar til staðar {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +550,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 +241,Quantity must not be more than {0},Magn má ekki vera meira en {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Quantity must not be more than {0},Magn má ekki vera meira en {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +76,Previous Financial Year is not closed,Næstliðnu reikningsári er ekki lokað
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +44,Age (Days),Aldur (dagar)
 DocType: Quotation Item,Quotation Item,Tilvitnun Item
-DocType: Account,Account Name,Reikningur Name
+DocType: Account,Account Name,Nafn reiknings
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,Frá Dagsetning má ekki vera meiri en hingað til
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Serial Nei {0} magn {1} getur ekki verið brot
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Birgir Type húsbóndi.
@@ -1446,7 +1461,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +221,Purchase Receipt {0} is not submitted,Kvittun {0} er ekki lögð
 DocType: Company,Default Payable Account,Sjálfgefið Greiðist Reikningur
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Stillingar fyrir online innkaupakörfu ss reglur skipum, verðlista o.fl."
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +83,{0}% Billed,{0}% Billed
+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
@@ -1458,12 +1473,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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/schools/doctype/fees/fees.js +22,Collect,safna
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,safna
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,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 +225,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
-DocType: Payment Reconciliation,Payments,greiðslur
 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
@@ -1475,7 +1489,7 @@
 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 +9,Procurement,Öflun
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,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/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
 ,Lead Details,Lead Upplýsingar
 DocType: Purchase Invoice,End date of current invoice's period,Lokadagur tímabils núverandi reikningi er
@@ -1500,7 +1514,7 @@
 DocType: Purchase Invoice,Additional Discount,Viðbótarupplýsingar Afsláttur
 DocType: Selling Settings,Selling Settings,selja Stillingar
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Online Uppboð
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +97,Please specify either Quantity or Valuation Rate or both,Vinsamlegast tilgreindu annaðhvort magni eða Verðmat Meta eða bæði
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,Vinsamlegast tilgreindu annaðhvort magni eða Verðmat Meta eða bæði
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +13,Fulfillment,fylling
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Company, mánuður og Fiscal Year er nauðsynlegur"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,markaðskostnaður
@@ -1521,14 +1535,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,ERPNext Uppsetningu lokið!
 DocType: Item,Weightage,weightage
 DocType: Packing Slip,PS-,PS
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +93,A Customer Group exists with same name please change the Customer name or rename the Customer Group,A Viðskiptavinur Group til staðar með sama nafni vinsamlegast breyta Customer Name eða endurnefna Viðskiptavinur Group
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +126,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
 DocType: Stock Entry,Material Receipt,efni Kvittun
 DocType: Homepage,Products,Vörur
 DocType: Announcement,Instructor,kennari
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},Party Gerð og Party er nauðsynlegt fyrir / viðskiptakröfur reikninginn {0}
 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ð
@@ -1539,7 +1552,7 @@
 ,Item-wise Sales Register,Item-vitur Sales Register
 DocType: Asset,Gross Purchase Amount,Gross Kaup Upphæð
 DocType: Asset,Depreciation Method,Afskriftir Method
-apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Offline,offline
+apps/erpnext/erpnext/accounts/page/pos/pos.js +686,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ð
@@ -1557,25 +1570,27 @@
 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
 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 +858,Make Purchase Order,Gera Purchase Order
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +852,Make Purchase Order,Gera Purchase Order
 DocType: SMS Center,Send To,Senda til
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,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 +148,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
 DocType: Stock Reconciliation,Stock Reconciliation,Stock Sættir
 DocType: Territory,Territory Name,Territory Name
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +172,Work-in-Progress Warehouse is required before Submit,Work-í-gangi Warehouse er krafist áður Senda
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,Work-in-Progress Warehouse is required before Submit,Work-í-gangi Warehouse er krafist áður Senda
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Umsækjandi um starf.
 DocType: Purchase Order Item,Warehouse and Reference,Warehouse og Tilvísun
 DocType: Supplier,Statutory info and other general information about your Supplier,Lögbundin upplýsingar og aðrar almennar upplýsingar um birgir
-apps/erpnext/erpnext/hooks.py +88,Addresses,Heimilisföng
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Birgir&gt; Birgir Tegund
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +212,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/hooks.py +95,Addresses,Heimilisföng
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +215,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
 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)
 DocType: Sales Order,To Deliver and Bill,Að skila og Bill
@@ -1583,11 +1598,10 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,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 +731,Payment,greiðsla
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,Payment,greiðsla
 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: Pricing Rule,Brand,vörumerki
 DocType: Course,Course Abbreviation,Auðvitað Skammstöfun
 DocType: Item,Will also apply for variants,Mun einnig gilda fyrir afbrigði
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +142,"Asset cannot be cancelled, as it is already {0}","Eign er ekki hætt, eins og það er nú þegar {0}"
@@ -1599,7 +1613,7 @@
 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."
 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 +85,Associate,Félagi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,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
@@ -1607,7 +1621,7 @@
 DocType: Production Planning Tool,Material Requests,efni Beiðnir
 DocType: Warranty Claim,Issue Date,Útgáfudagur
 DocType: Activity Cost,Activity Cost,virkni Kostnaður
-DocType: Timesheet Detail,Timesheet Detail,timesheet Detail
+DocType: Sales Invoice Timesheet,Timesheet Detail,timesheet Detail
 DocType: Purchase Receipt Item Supplied,Consumed Qty,neytt Magn
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Fjarskipti
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Gefur til kynna að pakki er hluti af þessari fæðingu (Only Draft)
@@ -1630,6 +1644,7 @@
 DocType: Production Plan Material Request,Material Request Date,Efni Beiðni Dagsetning
 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
 DocType: Item,Has Variants,hefur Afbrigði
 DocType: Monthly Distribution,Name of the Monthly Distribution,Heiti Monthly Distribution
 DocType: Sales Person,Parent Sales Person,Móðurfélag Sales Person
@@ -1642,30 +1657,31 @@
 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 +44,"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/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.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +502,Error: {0} &gt; {1},Villa: {0}&gt; {1}
 DocType: Item,Is Sales Item,Er Sales Item
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Liður Group Tree
 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öru eða þjónustu
+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.
 DocType: Naming Series,Current Value,Núverandi Value
-apps/erpnext/erpnext/controllers/accounts_controller.py +235,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/controllers/accounts_controller.py +238,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
 DocType: Delivery Note Item,Against Sales Order,Against Sales Order
 ,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 +458,Item table can not be blank,Item borð getur ekki verið autt
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +443,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 +5,This is based on stock movement. See {0} for details,Þetta er byggt á lager hreyfingu. Sjá {0} for details
 DocType: Pricing Rule,Selling,selja
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +341,Amount {0} {1} deducted against {2},Upphæð {0} {1} frádráttar {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +344,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
@@ -1680,16 +1696,16 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +144,Cannot refer row number greater than or equal to current row number for this Charge type,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 +159,Red,Red
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Vinsamlegast smelltu á &#39;Búa Stundaskrá&#39; að ná Serial Nei bætt við fyrir lið {0}
+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
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Base Magn (Company Gjaldmiðill)
 DocType: Payment Reconciliation Payment,Reference Row,Tilvísun Row
 DocType: Installation Note,Installation Time,uppsetning Time
-DocType: Sales Invoice,Accounting Details,bókhald Upplýsingar
+DocType: Sales Invoice,Accounting Details,Bókhalds Upplýsingar
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,Eyða öllum viðskiptum fyrir þetta fyrirtæki
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +187,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Row # {0}: Operation {1} er ekki lokið fyrir {2} Fjöldi fullunnum vörum í framleiðslu Order # {3}. Uppfærðu rekstur stöðu með Time Logs
+apps/erpnext/erpnext/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,Row # {0}: Operation {1} er ekki lokið fyrir {2} Fjöldi fullunnum vörum í framleiðslu Order # {3}. Uppfærðu rekstur stöðu með Time Logs
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,Fjárfestingar
 DocType: Issue,Resolution Details,upplausn Upplýsingar
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,úthlutanir
@@ -1725,16 +1741,17 @@
 DocType: Bank Reconciliation Detail,Against Account,Against reikninginn
 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}
 DocType: Delivery Note,Excise Page Number,Vörugjöld Page Number
 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}
 ,Maintenance Schedules,viðhald Skrár
 DocType: Task,Actual End Date (via Time Sheet),Raunveruleg End Date (með Time Sheet)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Amount {0} {1} against {2} {3},Upphæð {0} {1} gegn {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +339,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 +138,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 +295,Debit To account must be a Receivable account,Debit Til reikning verður að vera Krafa reikning
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,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æð
 DocType: Purchase Invoice Item,Conversion Factor,ummyndun Factor
@@ -1742,10 +1759,10 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +137,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
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +90,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Samtals úthlutað leyfi {0} má ekki vera minna en þegar hafa verið samþykktar lauf {1} fyrir tímabilið
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +93,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 +22,Enter Paid Amount,Sláðu greitt upphæð
+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
@@ -1755,13 +1772,15 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,timesheets
 DocType: HR Settings,HR Settings,HR Stillingar
 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 +524,"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."
+apps/erpnext/erpnext/controllers/accounts_controller.py +527,"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 +249,Abbr can not be blank or space,Skammst má ekki vera autt eða rúm
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,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
 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/stock/get_item_details.py +123,Please specify Company,Vinsamlegast tilgreinið Company
 ,Customer Acquisition and Loyalty,Viðskiptavinur Kaup og Hollusta
@@ -1772,17 +1791,19 @@
 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 +183,Closing (Opening + Totals),Lokun (Opnun Samtölur +)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),Lokun (Opnun Samtölur +)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,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/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
-apps/erpnext/erpnext/controllers/accounts_controller.py +272,Account {0} is invalid. Account Currency must be {1},Reikningur {0} er ógild. Reikningur Gjaldmiðill verður að vera {1}
+DocType: Email Digest,Pending Sales Orders,Bíður sölu skipunum
+apps/erpnext/erpnext/controllers/accounts_controller.py +275,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 +956,"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 Slip,Deduction,frádráttur
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +87,Row {0}: From Time and To Time is mandatory.,Row {0}: Frá Time og til tími er nauðsynlegur.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +969,"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 +111,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 +262,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 +7,Please enter Employee Id of this sales person,Vinsamlegast sláðu Starfsmaður Id þessarar velta manneskja
@@ -1790,7 +1811,7 @@
 DocType: Project,% Tasks Completed,% Verkefni Lokið
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,Munurinn Upphæð verður að vera núll
 DocType: Project,Gross Margin,Heildarframlegð
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +194,Please enter Production Item first,Vinsamlegast sláðu Production Item fyrst
+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
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Tilvitnun
@@ -1799,53 +1820,54 @@
 DocType: Maintenance Visit,Maintenance User,viðhald User
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +149,Cost Updated,kostnaður Uppfært
 DocType: Employee,Date of Birth,Fæðingardagur
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +86,Item {0} has already been returned,Liður {0} hefur þegar verið skilað
+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}
+DocType: Student Admission,Eligibility,hæfi
 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 +177,Job Description,Starfslýsing
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,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 +126,"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 +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Sérstafir nema &quot;-&quot; &quot;.&quot;, &quot;#&quot;, og &quot;/&quot; ekki leyfð í nafngiftir röð"
 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."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +24,Welcome to POS: Create your POS Profile,Velkomin á POS: Búa POS prófíl þínum
 DocType: Expense Claim,Approver,samþykkjari
 ,SO Qty,SO Magn
+DocType: Guardian,Work Address,vinna Address
 DocType: Appraisal,Calculate Total Score,Reikna aðaleinkunn
 DocType: Request for Quotation,Manufacturing Manager,framleiðsla Manager
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serial Nei {0} er undir ábyrgð uppí {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +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 +74,Shipments,sendingar
+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
 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 +153,Row # ,Row #
+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 +156,Get From,Fáðu Frá
+apps/erpnext/erpnext/public/js/utils.js +167,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 +167,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 +416,"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
+apps/erpnext/erpnext/controllers/accounts_controller.py +419,"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
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} is disabled,User {0} er óvirk
 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 ...
 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 +171,"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 +346,{0} is mandatory for Item {1},{0} er nauðsynlegur fyrir lið {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,{0} is mandatory for Item {1},{0} er nauðsynlegur fyrir lið {1}
 DocType: Currency Exchange,From Currency,frá Gjaldmiðill
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Vinsamlegast veldu úthlutað magn, tegundir innheimtuseðla og reikningsnúmerið í atleast einni röð"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,Kostnaður við nýja kaup
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},Velta Order krafist fyrir lið {0}
 DocType: Purchase Invoice Item,Rate (Company Currency),Hlutfall (Company Gjaldmiðill)
-apps/erpnext/erpnext/demo/setup_data.py +360,Others,aðrir
+DocType: Student Guardian,Others,aðrir
 DocType: Payment Entry,Unallocated Amount,óráðstafað Upphæð
 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
@@ -1865,17 +1887,16 @@
 apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,serialized Inventory
 DocType: Activity Type,Default Billing Rate,Sjálfgefið Billing Rate
 DocType: Sales Invoice,Total Billing Amount,Alls innheimtu upphæð
-apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +54,Receivable Account,viðskiptakröfur Reikningur
-apps/erpnext/erpnext/controllers/accounts_controller.py +546,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} er þegar {2}
+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 +549,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 +79,CEO,forstjóri
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,forstjóri
 DocType: Expense Claim Detail,Expense Claim Detail,Expense Krafa Detail
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +808,Please select correct account,Vinsamlegast veldu réttan reikning
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +809,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
-DocType: Purchase Invoice Item,Page Break,Page Break
 DocType: Production Order Operation,Pending,Bíður
 DocType: Course,Course Name,Auðvitað Name
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Notendur sem getur samþykkt yfirgefa forrit tiltekins starfsmanns
@@ -1884,14 +1905,15 @@
 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 +54,Full-time,Fullt
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,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: Student,Guardians,forráðamenn
 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 +289,Debit To is required,Skuldfærslu Til er krafist
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +321,Debit To is required,Skuldfærslu Til er krafist
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Kaupverðið List
 DocType: Offer Letter Term,Offer Term,Tilboð Term
 DocType: Quality Inspection,Quality Manager,gæðastjóri
@@ -1899,6 +1921,7 @@
 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/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
@@ -1909,18 +1932,17 @@
 DocType: Production Order Operation,Completed Qty,lokið Magn
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"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 +273,Price List {0} is disabled,Verðlisti {0} er óvirk
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +99,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/projects/doctype/timesheet/timesheet.py +123,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
 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}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Núverandi Verðmat Rate
 DocType: Item,Customer Item Codes,Viðskiptavinur Item Codes
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,Gengishagnaður / tap
 DocType: Opportunity,Lost Reason,Lost Ástæða
-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/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/purchase_receipt/purchase_receipt.py +378,All items have already been invoiced,Allir hlutir hafa nú þegar verið færðar á vörureikning
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +379,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
@@ -1936,24 +1958,25 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Viðskiptavinir þínir
 apps/erpnext/erpnext/projects/doctype/project/project.py +141,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/job_opening.html +19,Apply Now,Sæktu um núna
+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."
 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
-apps/erpnext/erpnext/utilities/doctype/address/address.py +164,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: Fee Structure,Fee Structure,Gjald Uppbygging
 DocType: Timesheet Detail,Costing Amount,kosta Upphæð
+DocType: Student Admission,Application Fee,Umsókn Fee
 DocType: Process Payroll,Submit Salary Slip,Senda Laun Slip
-apps/erpnext/erpnext/controllers/selling_controller.py +161,Maxiumm discount for Item {0} is {1}%,Maxiumm afsláttur fyrir Liður {0} er {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,Maxiumm afsláttur fyrir Liður {0} er {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Innflutningur á lausu
 DocType: Sales Partner,Address & Contacts,Heimilisfang og Tengiliðir
 DocType: SMS Log,Sender Name,Sendandi Nafn
 DocType: POS Profile,[Select],[Veldu]
 DocType: SMS Log,Sent To,send til
-DocType: Payment Request,Make Sales Invoice,Gera sölureikningi
+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
 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}
@@ -1972,21 +1995,21 @@
 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_data.py +361,Travel,ferðalög
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +155,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 +304,Travel,ferðalög
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +167,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 +23,Update Cost,Uppfæra Kostnaður
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,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 +36,Show Salary Slip,Sýna Laun Slip
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +748,Transfer Material,Transfer Efni
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +53,Show Salary Slip,Sýna Laun Slip
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +166,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 +923,Please set recurring after saving,Vinsamlegast settu endurtekin eftir vistun
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +646,Select change amount account,Veldu breyting upphæð reiknings
+apps/erpnext/erpnext/public/js/controllers/transaction.js +914,Please set recurring after saving,Vinsamlegast settu endurtekin eftir vistun
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +703,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
@@ -1998,31 +2021,32 @@
 DocType: Quality Inspection,Verified By,staðfest af
 DocType: Address,Subsidiary,dótturfélag
 apps/erpnext/erpnext/setup/doctype/company/company.py +64,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","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: Quality Inspection,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 +33,Traceability,rekjanleiki
 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 +352,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}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,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: Appraisal,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 +217,{0} {1} is fully billed,{0} {1} er að fullu innheimt
 DocType: Workstation Working Hour,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 +100,LMS,LMS
+apps/erpnext/erpnext/config/schools.py +104,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/config/crm.py +6,Sales Pipeline,velta Pipeline
 DocType: Student Batch Student,Student Batch Student,Student Hópur Student
-DocType: Sales Invoice,Mass Mailing,Mass Póstlisti
+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 +199,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/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 +297,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 +111,Pharmaceutical,Pharmaceutical
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +309,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/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
@@ -2037,27 +2061,28 @@
 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 +814,Please specify Company to proceed,Vinsamlegast tilgreinið Company til að halda áfram
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +793,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 +44,Compensatory Off,jöfnunaraðgerðir Off
-DocType: Quality Inspection Reading,Accepted,Tekið
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,jöfnunaraðgerðir Off
+DocType: Quality Inspection Reading,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.
 DocType: Room,Room Number,Room Number
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Ógild vísun {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +161,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) getur ekki verið meiri en áætlað quanitity ({2}) í framleiðslu Order {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +162,{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 +217,Raw Materials cannot be blank.,Hráefni má ekki vera auður.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,"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 +460,Quick Journal Entry,Quick Journal Entry
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +111,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/accounts/doctype/sales_invoice/sales_invoice.py +441,"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 +450,Quick Journal Entry,Quick Journal Entry
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +103,You can not change rate if BOM mentioned agianst any item,Þú getur ekki breytt hlutfall ef BOM getið agianst hvaða atriði
 DocType: Employee,Previous Work Experience,Fyrri Starfsreynsla
 DocType: Stock Entry,For Quantity,fyrir Magn
 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 +214,{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
 ,Minutes to First Response for Issues,Mínútur til First Response fyrir málefni
 DocType: Purchase Invoice,Terms and Conditions1,Skilmálar og Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +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.
@@ -2066,16 +2091,17 @@
 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 +398,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
 ,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 +739,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/stock/doctype/stock_entry/stock_entry.py +747,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
 DocType: Fiscal Year,Year End Date,Ár Lokadagur
 DocType: Task Depends On,Task Depends On,Verkefni veltur á
-DocType: Lead,Opportunity,tækifæri
+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
@@ -2088,7 +2114,7 @@
 DocType: Student,Joining Date,Tengja Dagsetning
 ,Employees working on a holiday,Starfsmenn sem vinna í frí
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Mark Present
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},Viðhald Upphafsdagur getur ekki verið áður fæðingardag fyrir Raðnúmer {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},Viðhald Upphafsdagur getur ekki verið áður fæðingardag fyrir Raðnúmer {0}
 DocType: Production Order,Actual End Date,Raunveruleg Lokadagur
 DocType: Purchase Invoice,PINV-,PINV-
 DocType: Authorization Rule,Applicable To (Role),Gildir til (Hlutverk)
@@ -2103,7 +2129,7 @@
 DocType: SMS Log,No of Requested SMS,Ekkert af Beðið um SMS
 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 +729,Please supply the specified items at the best possible rates,Gefðu tilgreind atriði í besta mögulega verð
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +695,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 +117,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-
@@ -2112,7 +2138,7 @@
 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 +14,This is an example website auto-generated from ERPNext,Þetta er dæmi website sjálfvirkt mynda frá ERPNext
+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
 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.
 
@@ -2139,13 +2165,14 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd Magn
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +54,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 +103,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 +504,Stock Entry {0} is not submitted,Stock Entry {0} er ekki lögð
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,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 +505,Stock Entry {0} is not submitted,Stock Entry {0} er ekki lögð
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / Cash Account
 DocType: Tax Rule,Billing City,Innheimta City
 DocType: Salary Component Account,Salary Component Account,Laun Component Reikningur
 DocType: Global Defaults,Hide Currency Symbol,Fela gjaldmiðilinn
 apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card","td Bank, Cash, Credit Card"
+DocType: Lead Source,Source Name,Source Name
 DocType: Journal Entry,Credit Note,Inneignarnótu
 DocType: Warranty Claim,Service Address,þjónusta Address
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furnitures and Fixtures,Húsgögnum og innréttingum
@@ -2157,6 +2184,7 @@
 DocType: Opportunity,Customer / Lead Name,Viðskiptavinur / Lead Name
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +89,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/controllers/trends.py +19,Total(Qty),Alls (Magn)
 DocType: Sales Invoice,This Document,Þetta skjal
@@ -2168,15 +2196,15 @@
 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 +176,Organization branch master.,Stofnun útibú húsbóndi.
-apps/erpnext/erpnext/controllers/accounts_controller.py +273, or ,eða
+apps/erpnext/erpnext/controllers/accounts_controller.py +276, 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
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,gagnsemi Útgjöld
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-Above
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +203,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: Journal Entry {1} hefur ekki reikning {2} eða þegar samsvarandi gegn öðrum skírteini
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +206,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 +90,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 +93,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
@@ -2192,7 +2220,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +56,Ledger,Ledger
 DocType: Target Detail,Target  Amount,Target Upphæð
 DocType: Shopping Cart Settings,Shopping Cart Settings,Shopping Cart Stillingar
-DocType: Journal Entry,Accounting Entries,bókhald Entries
+DocType: Journal Entry,Accounting Entries,Bókhalds Færslur
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},Afrit Entry. Vinsamlegast athugaðu Heimild Rule {0}
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +26,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
@@ -2204,8 +2232,8 @@
 DocType: Product Bundle,Parent Item,Parent Item
 DocType: Account,Account Type,Tegund reiknings
 DocType: Delivery Note,DN-RET-,DN-RET-
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +115,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 +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Viðhald Dagskrá er ekki mynda að öllum þeim atriðum. Vinsamlegast smelltu á &#39;Búa Stundaskrá&#39;
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +118,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 +163,"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"
@@ -2217,13 +2245,13 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +32,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 +748,Delivery,Afhending
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +742,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
 DocType: Payment Entry,Total Allocated Amount,Samtals úthlutað magn
 DocType: Item Reorder,Material Request Type,Efni Beiðni Type
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +82,Row {0}: UOM Conversion Factor is mandatory,Row {0}: UOM viðskipta Factor er nauðsynlegur
+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
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,skírteini #
@@ -2234,13 +2262,13 @@
 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 +90,Head of Marketing and Sales,Forstöðumaður markaðssetning og sala
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Tekjuskattur
+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 +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.
 DocType: Item Supplier,Item Supplier,Liður Birgir
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +403,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 +770,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 +397,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 +764,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"
@@ -2252,28 +2280,29 @@
 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 +100,Issues,Vandamál
+apps/erpnext/erpnext/hooks.py +109,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}
 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
 ,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
 DocType: Supplier,Billing Currency,Innheimta Gjaldmiðill
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Large,Auka stór
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Extra Large,Auka stór
 ,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 +507,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 +107,Local,Local
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +508,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/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 +154,Large,stór
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Large,stór
 DocType: Homepage Featured Product,Homepage Featured Product,Heimasíðan Valin Vara
 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 +225,Total {0} ({1}),Alls {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +224,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ð
@@ -2319,9 +2348,9 @@
 DocType: Attendance,Leave Type,Leave Type
 apps/erpnext/erpnext/controllers/stock_controller.py +173,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/hr/doctype/salary_slip/salary_slip.py +79,Name error: {0},Nafn villa: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +90,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 +178,{0} {1} does not associated with {2} {3},{0} {1} er ekki tengd við {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +181,{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)
 DocType: Warehouse,Parent Warehouse,Parent Warehouse
@@ -2340,7 +2369,7 @@
 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
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,Atleast eitt atriði skal færa með neikvæðum magni í staðinn skjal
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Atleast one item should be entered with negative quantity in return document,Atleast eitt atriði skal færa með neikvæðum magni í staðinn skjal
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operation {0} lengur en öllum tiltækum vinnutíma í vinnustöð {1}, brjóta niður rekstur í mörgum aðgerðum"
 ,Requested,Umbeðin
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +83,No Remarks,engar athugasemdir
@@ -2352,46 +2381,46 @@
 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/stock/doctype/purchase_receipt/purchase_receipt.py +98,Quality Inspection required for Item {0},Quality Inspection krafist fyrir lið {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,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
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Stjórna Territory Tree.
-DocType: Journal Entry Account,Sales Invoice,velta Invoice
+DocType: Journal Entry Account,Sales Invoice,Reikningar
 DocType: Journal Entry Account,Party Balance,Party Balance
-apps/erpnext/erpnext/accounts/page/pos/pos.js +475,Please select Apply Discount On,Vinsamlegast veldu Virkja afsláttur á
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +92,Salary Slip Created,Laun Slip Búið
+apps/erpnext/erpnext/accounts/page/pos/pos.js +464,Please select Apply Discount On,Vinsamlegast veldu Virkja afsláttur á
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +95,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
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,Afsláttur Hlutfall hægt að beita annaðhvort á móti verðskrá eða fyrir alla verðlista.
 DocType: Purchase Invoice,Half-yearly,Hálfsárs
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +384,Accounting Entry for Stock,Bókhald Entry fyrir lager
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +387,Accounting Entry for Stock,Bókhalds Færsla fyrir Lager
 DocType: Sales Invoice,Sales Team1,velta TEAM1
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,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 +96,Row {0}: Completed Qty must be greater than zero.,Row {0}: Lokið Magn verður að vera hærri en núll.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +120,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 +88,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Get ekki skila meira en {1} fyrir lið {2}
+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
 DocType: Item Group,Show this slideshow at the top of the page,Sýna þessa myndasýningu efst á síðunni
 DocType: BOM,Item UOM,Liður UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Skatthlutfall Eftir Afsláttur Upphæð (Company Gjaldmiðill)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +147,Target warehouse is mandatory for row {0},Target vöruhús er nauðsynlegur fyrir röð {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +141,Target warehouse is mandatory for row {0},Target vöruhús er nauðsynlegur fyrir röð {0}
 DocType: Cheque Print Template,Primary Settings,Primary Stillingar
 DocType: Purchase Invoice,Select Supplier Address,Veldu Birgir Address
 DocType: Quality Inspection,Quality Inspection,Quality Inspection
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Extra Small,Extra Small
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +194,Account {0} is frozen,Reikningur {0} er frosinn
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Extra Small
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +690,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 +197,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 +606,Can only make payment against unbilled {0},Getur aðeins gera greiðslu gegn ógreitt {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +126,Commission rate cannot be greater than 100,hlutfall Framkvæmdastjórnin getur ekki verið meiri en 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +609,Can only make payment against unbilled {0},Getur aðeins gera greiðslu gegn ógreitt {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,hlutfall Framkvæmdastjórnin getur ekki verið meiri en 100
 DocType: Stock Entry,Subcontract,undirverktaka
 apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,Vinsamlegast sláðu inn {0} fyrst
 DocType: Production Order Operation,Actual End Time,Raunveruleg Lokatími
@@ -2402,30 +2431,30 @@
 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 +158,Colour,Colour
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,Colour
 DocType: Maintenance Visit,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
 DocType: Student Log,Academic,Academic
-apps/erpnext/erpnext/controllers/accounts_controller.py +469,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Total fyrirfram ({0}) gegn Order {1} er ekki vera meiri en GRAND Samtals ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +472,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Total fyrirfram ({0}) gegn Order {1} er ekki vera meiri en GRAND Samtals ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Veldu Hlaupa dreifingu til ójafnt dreifa skotmörk yfir mánuði.
 DocType: Purchase Invoice Item,Valuation Rate,verðmat Rate
+DocType: Stock Reconciliation,SR/,SR /
 apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,Verðlisti Gjaldmiðill ekki valinn
 DocType: Assessment,Results,Niðurstöður
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +168,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 +175,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: Student Applicant,Father's/ Guardian 2 Email ID,Föður / forráðamaður 2 Email ID
 DocType: Maintenance Visit Purpose,Against Document No,Against Document nr
 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 +228,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 +231,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/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 +93,Researcher,Rannsóknarmaður
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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.
@@ -2437,25 +2466,25 @@
 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"
 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: Sales Invoice,Advertisement,Fáðu
 DocType: Asset Category Account,Depreciation Expense Account,Afskriftir kostnað reiknings
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Probationary Period,reynslutíma
-apps/erpnext/erpnext/hooks.py +102,Announcements,Tilkynningar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,reynslutíma
+apps/erpnext/erpnext/hooks.py +111,Announcements,Tilkynningar
 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 +109,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 +16,To Datetime,til DATETIME
+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/scheduling_tool/scheduling_tool.py +51,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/setup/doctype/email_digest/templates/default.html +36,Pending Activities,bið Starfsemi
+DocType: Accounts Settings,Make Payment via Journal Entry,Greiða í gegnum dagbókarfærslu
+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 +127,Please enter relieving date.,Vinsamlegast sláðu létta dagsetningu.
-apps/erpnext/erpnext/controllers/trends.py +145,Amt,Amt
+apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,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 +26,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ð
@@ -2467,20 +2496,21 @@
 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
-DocType: Purchase Invoice Item,Accepted Warehouse,Samþykkt Warehouse
+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ð
 apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1},Ekki er hægt að finna gengi fyrir {0} til {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Mark Half Day
 DocType: Sales Invoice,Sales Team,velta Team
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Duplicate entry,afrit færslu
+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 +490,[Error],[Villa]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +484,[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
 apps/erpnext/erpnext/controllers/status_updater.py +175,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.
 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
@@ -2496,22 +2526,22 @@
 ,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 +25,All Jobs,Allir Jobs
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,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
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Amount {0} {1} {2} {3},Upphæð {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Amount {0} {1} {2} {3},Upphæð {0} {1} {2} {3}
 DocType: Account,Depreciation,gengislækkun
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Birgir (s)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Starfsmaður Aðsókn Tool
 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 +372,Payment Entries {0} are un-linked,Greiðsla Færslur {0} eru un-tengd
+apps/erpnext/erpnext/accounts/utils.py +449,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
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +497,Material Requests {0} created,Efni Beiðnir {0} búnar
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +498,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.
 DocType: Purchase Invoice,Address and Contact,Heimilisfang og samband við
@@ -2550,7 +2580,7 @@
 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 +848,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 +859,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 +233,Closing (Dr),Lokun (Dr)
 DocType: Cheque Print Template,Cheque Size,ávísun Size
@@ -2571,7 +2601,8 @@
 ,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.
-apps/erpnext/erpnext/controllers/accounts_controller.py +555,'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: Student Guardian,Father,faðir
+apps/erpnext/erpnext/controllers/accounts_controller.py +558,'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
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,fá uppfærslur
 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
@@ -2581,15 +2612,15 @@
 DocType: Sales Order,Fully Delivered,Alveg Skilað
 DocType: Lead,Lower Income,neðri Tekjur
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","Reikningurinn höfuð undir ábyrgð, þar sem Hagnaður / Tap verður færður"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +166,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 +238,"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 +81,Purchase Order number required for Item {0},Innkaupapöntunarnúmeri þarf fyrir lið {0}
+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/purchase_receipt/purchase_receipt.py +82,Purchase Order number required for Item {0},Innkaupapöntunarnúmeri þarf fyrir lið {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á Dagsetning &#39;verður að vera eftir&#39; Til Dagsetning &#39;
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +17,Cannot change status as student {0} is linked with student application {1},Get ekki breytt stöðu sem nemandi {0} er tengd við beitingu nemandi {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +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: Timesheet,"List of employee which has ""Salary Slip Based on Timesheet"" is enabled in salary structure.",Listi yfir starfsmanni sem hefur &quot;laun Slip Byggt á tímaskráningar&quot; er virkt í laun uppbyggingu.
 DocType: Asset,Fully Depreciated,Alveg afskrifaðar
 ,Stock Projected Qty,Stock Áætlaðar Magn
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Customer {0} does not belong to project {1},Viðskiptavinur {0} ekki tilheyra verkefninu {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,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
 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
@@ -2601,7 +2632,7 @@
 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/patches/v7_0/create_warehouse_nestedset.py +55,All Warehouses,Allir Vöruhús
+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 +105,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
@@ -2613,10 +2644,10 @@
 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/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Gera Laun Slip
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +26,Browse BOM,Fletta BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,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/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 Year,Academic Year,skólaárinu
+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
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,Úttekt
@@ -2624,12 +2655,12 @@
 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 +197,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 +204,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: Workstation Working Hour,Start Time,Byrjunartími
 DocType: Item Price,Bulk Import Help,Magn Import Hjálp
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +256,Select Quantity,Select Magn
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +257,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
@@ -2646,6 +2677,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Annaðhvort miða Magn eða miða upphæð er nauðsynlegur.
 apps/erpnext/erpnext/config/projects.py +45,Cost of various activities,Kostnaður við ýmiss konar starfsemi
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Stilling viðburðir til {0}, þar sem Starfsmannafélag fylgir að neðan sölufólk er ekki með notendanafn {1}"
+DocType: Timesheet,Billing Details,Billing Upplýsingar
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +149,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}
 DocType: Item,Inspection Required,skoðun Required
@@ -2665,7 +2697,7 @@
 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 +138,Wire Transfer,millifærsla
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,millifærsla
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Athugaðu alla
 DocType: Sales Order,Recurring Order,Fastir Order
 DocType: Company,Default Income Account,Sjálfgefið Tekjur Reikningur
@@ -2677,21 +2709,19 @@
 ,Welcome to ERPNext,Velkomið að ERPNext
 apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,Leiða til tilvitnun
 DocType: Lead,From Customer,frá viðskiptavinar
-apps/erpnext/erpnext/demo/setup_data.py +357,Calls,símtöl
+apps/erpnext/erpnext/demo/setup/setup_data.py +300,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/stock/doctype/item/item.py +466,"As there are existing transactions for this item, \
-							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Eins og það eru núverandi reiðufé fyrir þetta atriði, \ þú getur ekki breytt gildum &quot;Hefur Serial Nei &#39;,&#39; hefur Hópur Nei &#39;,&#39; Er Stock Item&quot; og &quot;Verðmatsaðferð &#39;"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,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/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 +139,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: Issue,Opening Date,opnun Date
-apps/erpnext/erpnext/schools/api.py +58,Attendance has been marked successfully.,Aðsókn hefur verið merkt með góðum árangri.
+apps/erpnext/erpnext/schools/api.py +57,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 +136,Account Type for {0} must be {1},Reikningur Type fyrir {0} verður að vera {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +139,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
@@ -2706,12 +2736,13 @@
 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/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 +20,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 +1190,Please select customer,Vinsamlegast veldu viðskiptavin
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1193,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
@@ -2721,6 +2752,7 @@
 ,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 +50,Missing Currency Exchange Rates for {0},Vantar gjaldeyri Verð fyrir {0}
 DocType: Assessment,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-
@@ -2738,11 +2770,12 @@
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Topic Name
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Atleast einn af selja eða kaupa verður að vera valinn
+DocType: Grading Structure,Grade Intervals,gráðu Hlé
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Veldu eðli rekstrar þíns.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Hvar framleiðslu aðgerðir eru gerðar.
 DocType: Asset Movement,Source Warehouse,Source Warehouse
 DocType: Installation Note,Installation Date,uppsetning Dagsetning
-apps/erpnext/erpnext/controllers/accounts_controller.py +534,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} ekki tilheyra félaginu {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +537,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
@@ -2756,28 +2789,31 @@
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Laus Hópur Magn á frá vöruhúsi
 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ú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 +111,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/scheduling_tool/scheduling_tool.py +49,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 +87,{0}% Delivered,{0}% Skilað
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% Skilað
 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).,Liður {0}: Pantaði Magn {1} má ekki vera minna en lágmarks röð Fjöldi {2} (sem skilgreindur er í lið).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Mánaðarleg Dreifing Hlutfall
 DocType: Territory,Territory Targets,Territory markmið
 DocType: Delivery Note,Transporter Info,Transporter Upplýsingar
-apps/erpnext/erpnext/accounts/utils.py +379,Please set default {0} in Company {1},Vinsamlegast settu sjálfgefið {0} í félaginu {1}
+apps/erpnext/erpnext/accounts/utils.py +456,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
 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.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Titlar til prenta sniðmát td Próformareikningur.
+DocType: Student Guardian,Student Guardian,Student Guardian
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +184,Valuation type charges can not marked as Inclusive,Verðmat gerð gjöld geta ekki merkt sem Inclusive
 DocType: POS Profile,Update Stock,Uppfæra Stock
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Mismunandi UOM að atriðum mun leiða til rangrar (alls) nettóþyngd gildi. Gakktu úr skugga um að nettóþyngd hvern hlut er í sama UOM.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
 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 +349,Journal Entries {0} are un-linked,Journal Entries {0} eru un-tengd
+apps/erpnext/erpnext/accounts/utils.py +426,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
@@ -2801,6 +2837,7 @@
 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
+DocType: Homepage,"URL for ""All Products""",URL fyrir &quot;Allar vörur&quot;
 DocType: Leave Application,Leave Balance Before Application,Skildu Balance Áður Umsókn
 DocType: SMS Center,Send SMS,Senda SMS
 DocType: Cheque Print Template,Width of amount in word,Breidd upphæð í orði
@@ -2809,7 +2846,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 +29,Current Job Openings,Núverandi Op Atvinna
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,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
@@ -2822,7 +2859,7 @@
 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 +850,Show tax break-up,Sýna skattur brjóta upp
+apps/erpnext/erpnext/public/js/controllers/transaction.js +841,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/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"
@@ -2832,10 +2869,11 @@
 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 +534,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 +80,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 +162,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/selling/doctype/customer/customer.py +195,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 +5,This is based on the attendance of this Student,Þetta er byggt á mætingu þessa Student
@@ -2844,12 +2882,11 @@
 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 +75,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 +138,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/hr/doctype/leave_application/leave_application.py +145,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: Program Enrollment Fee,Program Enrollment Fee,Program innritunargjöld
 DocType: Item,Supplier Items,birgir Items
 DocType: Opportunity,Opportunity Type,tækifæri Type
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,ný Company
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,Cost Center is required for 'Profit and Loss' account {0},Kostnaður Center er nauðsynlegt að &#39;hagnaður og tap Reikningurinn {0}
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Viðskipti er einungis hægt að eytt af skapara félagsins
 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.,Rangur fjöldi General Ledger færslur fundust. Þú gætir hafa valið rangt reikning í viðskiptum.
 DocType: Cheque Print Template,Cheque Width,ávísun Breidd
@@ -2858,16 +2895,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Fæðingardagur getur ekki verið meiri en í dag.
 ,Stock Ageing,Stock Ageing
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,Tímatafla
-apps/erpnext/erpnext/controllers/accounts_controller.py +228,{0} '{1}' is disabled,{0} &#39;{1}&#39; er óvirk
+apps/erpnext/erpnext/controllers/accounts_controller.py +231,{0} '{1}' is disabled,{0} &#39;{1}&#39; er óvirk
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Setja sem Open
 DocType: Cheque Print Template,Scanned Cheque,skönnuð ávísun
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Senda sjálfvirkar tölvupóst til Tengiliði á Sendi viðskiptum.
+DocType: Timesheet,Total Billable Amount,Alls Reikningur Upphæð
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Liður 3
 DocType: Purchase Order,Customer Contact Email,Viðskiptavinur samband við Tölvupóstur
 DocType: Warranty Claim,Item and Warranty Details,Item og Ábyrgð Details
 DocType: Sales Team,Contribution (%),Framlag (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Ath: Greiðsla Entry verður ekki búið síðan &#39;Cash eða Bank Account &quot;var ekki tilgreint
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Responsibilities,ábyrgð
+apps/erpnext/erpnext/controllers/accounts_controller.py +78,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ð
 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
@@ -2875,6 +2913,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Bæta notendur
 DocType: Pricing Rule,Item Group,Liður Group
 DocType: Item,Safety Stock,Safety Stock
+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: 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)
@@ -2884,7 +2923,6 @@
 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: Timesheet,Total Hours,Samtals Hours
 DocType: Journal Entry,Printing Settings,prentun Stillingar
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,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
@@ -2897,13 +2935,14 @@
 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 +71,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
+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: Purchase Invoice Item,Rate,Gefa
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Intern,Intern
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,Intern
 DocType: Stock Entry,From BOM,frá BOM
 DocType: Assessment,Assessment Code,mat Code
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +32,Basic,Basic
+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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',Vinsamlegast smelltu á &#39;Búa Stundaskrá&#39;
+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 +95,Reference No is mandatory if you entered Reference Date,Tilvísunarnúmer er nauðsynlegt ef þú færð viðmiðunardagur
@@ -2912,11 +2951,11 @@
 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 +752,Issue Material,Issue Efni
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +723,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 +683,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 +665,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.
 DocType: Hub Settings,Access Token,aðgangur Token
 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
@@ -2924,39 +2963,41 @@
 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 +1122,Enter value must be positive,Sláðu gildi verður að vera jákvæð
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,All Territories,Allir Territories
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1125,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
 DocType: Purchase Invoice,Items,atriði
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +23,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 +221,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 +233,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 +96,Request for Quotations,Beiðni um tilvitnanir
+apps/erpnext/erpnext/hooks.py +104,Request for Quotations,Beiðni um tilvitnanir
 DocType: Payment Reconciliation,Maximum Invoice Amount,Hámarks Invoice Amount
 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 +628,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Default Mælieiningin fyrir Variant &#39;{0}&#39; verða að vera sama og í sniðmáti &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Default Mælieiningin fyrir Variant &#39;{0}&#39; verða að vera sama og í sniðmáti &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Reikna miðað við
 DocType: Delivery Note Item,From Warehouse,frá Warehouse
 DocType: Assessment,Supervisor Name,Umsjón Name
+DocType: Assessment,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
 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 +27,Default Address Template cannot be deleted,Sjálfgefið heimilisfang Snið getur ekki eytt
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,Sjálfgefið heimilisfang Snið getur ekki eytt
 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/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,&quot;Dagar frá síðustu Order &#39;verður að vera meiri en eða jafnt og núll
+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: Asset,Amended From,breytt Frá
 apps/erpnext/erpnext/public/js/setup_wizard.js +295,Raw Material,Hrátt efni
 DocType: Leave Application,Follow via Email,Fylgdu með tölvupósti
@@ -2965,8 +3006,8 @@
 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/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 +485,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 +336,Please select Posting Date first,Vinsamlegast veldu dagsetningu birtingar fyrst
+apps/erpnext/erpnext/stock/get_item_details.py +486,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 +326,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
@@ -2982,6 +3023,7 @@
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Passa Greiðslur með Reikningar
 DocType: Journal Entry,Bank Entry,Bank Entry
 DocType: Authorization Rule,Applicable To (Designation),Gildir til (Tilnefning)
+,Profitability Analysis,arðsemi Greining
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,Bæta í körfu
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Group By
 DocType: Guardian,Interests,Áhugasvið
@@ -2994,21 +3036,21 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,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 +141,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Serialized Item {0} Ekki er hægt að uppfæra \ nota lager Sættir
 DocType: Scheduling Tool,Day,dagur
 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 +122,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 +129,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
-DocType: Student Applicant,AP.,AP.
 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 +639,Point of Sale,Sölustaður
+apps/erpnext/erpnext/accounts/page/pos/pos.js +634,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
 DocType: Production Planning Tool,Production Planning Tool,Framleiðsla Planning Tool
@@ -3017,74 +3059,77 @@
 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 +373,Quantity to Manufacture must be greater than 0.,Magn á Framleiðsla verður að vera hærri en 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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 Profile,Customer Group,viðskiptavinur Group
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,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/doctype/asset/asset.py +83,Next Depreciation Date must be on or after today,Næsta Afskriftir Date verður að vera á eða eftir dag
 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 +145,Please cancel Purchase Invoice {0} first,Vinsamlegast hætta kaupa Reikningar {0} fyrst
 DocType: Serial No,AMC Expiry Date,AMC Fyrningardagsetning
 ,Sales Register,velta Nýskráning
 DocType: Quotation,Quotation Lost Reason,Tilvitnun Lost Ástæða
+apps/erpnext/erpnext/utilities/doctype/address/address.py +164,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.
 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 +330,Transaction reference no {0} dated {1},Tilvísunarnúmer viðskipta engin {0} dagsett {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,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 +107,Summary for this month and pending activities,Samantekt fyrir þennan mánuð og bið starfsemi
+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/accounts/doctype/sales_invoice/sales_invoice.py +406,Please remove this Invoice {0} from C-Form {1},Vinsamlegast fjarlægðu þennan reikning {0} úr C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,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 +644,Get Items,fá atriði
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +623,Get Items,fá atriði
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +210,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 +41,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
 DocType: Payment Request,Initiated,hafin
 DocType: Production Order,Planned Start Date,Áætlaðir Start Date
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,Customer is required against Receivable account {0},Viðskiptavinur er krafist móti óinnheimt reikninginn {0}
 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 +265,Project-wise data is not available for Quotation,Project-vitur gögn eru ekki í boði fyrir Tilvitnun
+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 +101,Commercial,Commercial
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,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: Supplier Quotation,Supplier Address,birgir Address
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +648,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/accounts/doctype/purchase_invoice/purchase_invoice.py +651,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 +30,Series is mandatory,Series er nauðsynlegur
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +50,Series is mandatory,Series er nauðsynlegur
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Financial Services
 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æð
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +165,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 +155,Cr,cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Cr,cr
 DocType: Tax Rule,Billing State,Innheimta State
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +250,Transfer,Transfer
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +187,{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 +825,Fetch exploded BOM (including sub-assemblies),Ná sprakk BOM (þ.mt undireiningar)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +254,Transfer,Transfer
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +190,{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 +796,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 +115,Due Date is mandatory,Skiladagur er nauðsynlegur
+apps/erpnext/erpnext/controllers/accounts_controller.py +118,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
 DocType: Journal Entry,Pay To / Recd From,Greiða til / Recd Frá
 DocType: Naming Series,Setup Series,skipulag Series
 DocType: Payment Reconciliation,To Invoice Date,Til dagsetningu reiknings
 DocType: Supplier,Contact HTML,Viltu samband við HTML
 ,Inactive Customers,óvirka viðskiptamenn
+DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Purchase Kvittanir
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Hvernig Verðlagning Regla er beitt?
 DocType: Quality Inspection,Delivery Note No,Afhending Note Nei
@@ -3093,7 +3138,7 @@
 DocType: Company,Retail,Smásala
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +120,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 +587,Product Bundle,vara Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Product Bundle,vara Bundle
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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ð
@@ -3103,8 +3148,8 @@
 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 +742,Send Supplier Emails,Senda Birgir póst
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +104,"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/buying/doctype/request_for_quotation/request_for_quotation.js +708,Send Supplier Emails,Senda Birgir póst
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,"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
 DocType: Guardian Interest,Guardian Interest,Guardian Vextir
 DocType: Timesheet,Employee Detail,starfsmaður Detail
@@ -3115,9 +3160,9 @@
 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}
 DocType: Salary Slip,Earning & Deduction,Launin &amp; Frádráttur
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +77,Account {0} cannot be a Group,Reikningur {0} getur ekki verið Group
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} cannot be a Group,Reikningur {0} getur ekki verið Group
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +31,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 +107,Negative Valuation Rate is not allowed,Neikvætt Verðmat Rate er ekki leyfð
+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ð
 DocType: Holiday List,Weekly Off,Vikuleg Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Fyrir td 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +39,Provisional Profit / Loss (Credit),Bráðabirgða Hagnaður / Tap (Credit)
@@ -3131,16 +3176,16 @@
 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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Kostnaður Center er nauðsynlegur fyrir lið {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +626,Get Items from Product Bundle,Fá atriði úr Vara Knippi
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +605,Get Items from Product Bundle,Fá atriði úr Vara Knippi
 DocType: Asset,Straight Line,Bein lína
 DocType: Project User,Project User,Project User
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} is inactive,Reikningur {0} er óvirkur
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} is inactive,Reikningur {0} er óvirkur
 DocType: GL Entry,Is Advance,er Advance
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Aðsókn Frá Dagsetning og Aðsókn hingað til er nauðsynlegur
 apps/erpnext/erpnext/controllers/buying_controller.py +148,Please enter 'Is Subcontracted' as Yes or No,Vinsamlegast sláðu inn &quot;Er undirverktöku&quot; eins já eða nei
 DocType: Sales Team,Contact No.,Viltu samband við No.
 DocType: Bank Reconciliation,Payment Entries,Greiðsla Entries
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,'Profit and Loss' type account {0} not allowed in Opening Entry,&quot;Rekstrarreikningur&quot; tegund reiknings {0} ekki leyfð í Opnun Entry
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +71,'Profit and Loss' type account {0} not allowed in Opening Entry,&quot;Rekstrarreikningur&quot; tegund reiknings {0} ekki leyfð í Opnun Entry
 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
@@ -3159,7 +3204,7 @@
 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,Þóknun á sölu
 DocType: Offer Letter Term,Value / Description,Gildi / Lýsing
-apps/erpnext/erpnext/controllers/accounts_controller.py +558,"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}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +561,"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: Production Order,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}.
@@ -3172,13 +3217,13 @@
 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/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Legal Expenses,málskostnaðar
 DocType: Purchase Invoice,Posting Time,staða Time
-DocType: Sales Order,% Amount Billed,% Magn Billed
+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.
 apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},Ekkert atriði með Serial nr {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Opið Tilkynningar
+DocType: Email Digest,Open Notifications,Opið Tilkynningar
 DocType: Payment Entry,Difference Amount (Company Currency),Munurinn Magn (Company Gjaldmiðill)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,bein Útgjöld
 apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
@@ -3186,7 +3231,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Ný Tekjur Viðskiptavinur
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,Ferðakostnaður
 DocType: Maintenance Visit,Breakdown,Brotna niður
-apps/erpnext/erpnext/controllers/accounts_controller.py +634,Account: {0} with currency: {1} can not be selected,Reikningur: {0} með gjaldeyri: {1} Ekki er hægt að velja
+apps/erpnext/erpnext/controllers/accounts_controller.py +637,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}
 DocType: Program Enrollment Tool,Student Applicants,Student Umsækjendur
@@ -3194,15 +3239,15 @@
 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 +56,Probation,reynslulausn
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Probation,reynslulausn
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,laun Hluti
 DocType: Program Enrollment Tool,New Academic Year,Nýtt skólaár
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Payment of salary for the month {0} and year {1},Greiðsla laun fyrir mánuðinn {0} og ár {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Payment of salary for the month {0} and year {1},Greiðsla laun fyrir mánuðinn {0} og ár {1}
 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 +144,Planning,áætlanagerð
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,áætlanagerð
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,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
@@ -3215,11 +3260,10 @@
 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.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Sales invoice submitted sucessfully.,Sölureikninginn lögð sen.
 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}
 DocType: Assessment Result,Student Name,Student Name
-apps/erpnext/erpnext/hooks.py +104,Assessment Schedule,mat Dagskrá
+apps/erpnext/erpnext/hooks.py +113,Assessment Schedule,mat Dagskrá
 DocType: Brand,Item Manager,Item Manager
 DocType: Buying Settings,Default Supplier Type,Sjálfgefið Birgir Type
 DocType: Production Order,Total Operating Cost,Samtals rekstrarkostnaður
@@ -3229,6 +3273,7 @@
 DocType: GL Entry,Party Type,Party Type
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +78,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
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Laun sniðmát húsbóndi.
 DocType: Leave Type,Max Days Leave Allowed,Max Days Leave leyfðar
@@ -3240,18 +3285,19 @@
 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 +99,All Customer Groups,Allir hópar viðskiptavina
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +78,Accumulated Monthly,Uppsafnaður Monthly
-apps/erpnext/erpnext/controllers/accounts_controller.py +595,{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/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Allir hópar viðskiptavina
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +81,Accumulated Monthly,Uppsafnaður Monthly
+apps/erpnext/erpnext/controllers/accounts_controller.py +598,{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
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Verðlisti Rate (Company Gjaldmiðill)
 DocType: Products Settings,Products Settings,Vörur Stillingar
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +188,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
 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 +84,Secretary,ritari
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,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
@@ -3260,24 +3306,22 @@
 ,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
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,Row # {0}: Serial Nei er nauðsynlegur
+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 +859,Supplier Quotation,birgir Tilvitnun
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +838,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 +7,Collect Fees,innheimta gjald
+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}
 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ð.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Viðburðir á næstunni
 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/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
-DocType: Email Digest,Income / Expense,Tekjur / kostnað
 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."
@@ -3288,13 +3332,14 @@
 DocType: Customer,From Lead,frá Lead
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Pantanir út fyrir framleiðslu.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Veldu fjárhagsársins ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,POS Profile required to make POS Entry,POS Profile þarf að gera POS Entry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +509,POS Profile required to make POS Entry,POS Profile þarf að gera POS Entry
 DocType: Program Enrollment Tool,Enroll Students,innritast Nemendur
 DocType: Hub Settings,Name Token,heiti Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard Selja
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Atleast one warehouse is mandatory,Atleast einn vöruhús er nauðsynlegur
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +129,Atleast one warehouse is mandatory,Atleast einn vöruhús er nauðsynlegur
 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 +330,{0} against Sales Invoice {1},{0} gegn sölureikningi {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,nafn verkefnis
@@ -3315,10 +3360,11 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Leaves verður úthlutað margfeldi af 0,5"
 DocType: Production Order,Operation Cost,Operation Kostnaður
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,Hlaða mætingu úr .csv skrá
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Framúrskarandi Amt
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Setja markmið Item Group-vitur fyrir þetta velta manneskja.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Frysta Stocks eldri en [Days]
-apps/erpnext/erpnext/controllers/accounts_controller.py +528,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: Asset er nauðsynlegur fyrir fast eign kaup / sölu
+apps/erpnext/erpnext/controllers/accounts_controller.py +531,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: Asset er nauðsynlegur fyrir fast eign kaup / sölu
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Ef tveir eða fleiri Verðlagning Reglur finnast miðað við ofangreindar aðstæður, Forgangur er beitt. Forgangur er fjöldi milli 0 til 20 en Sjálfgefið gildi er núll (auður). Hærri tala þýðir að það mun hafa forgang ef það eru margar Verðlagning Reglur með sömu skilyrðum."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Fiscal Year: {0} er ekki til
 DocType: Currency Exchange,To Currency,til Gjaldmiðill
@@ -3335,15 +3381,15 @@
 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
-DocType: Sales Invoice,Exhibition,Sýning
 apps/erpnext/erpnext/utilities/doctype/address/address.py +77,"Company is mandatory, as it is your company address","Félagið er nauðsynlegur, eins og það er fyrirtæki netfang þitt"
 DocType: Item Attribute,From Range,frá Range
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +81,Syntax error in formula or condition: {0},Málskipanarvilla í formúlu eða ástandi: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +92,Syntax error in formula or condition: {0},Málskipanarvilla í formúlu eða ástandi: {0}
 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
+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 +28,Jobs,Störf
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,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
@@ -3352,16 +3398,16 @@
 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 +763,Make Supplier Quotation,Gera Birgir Tilvitnun
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,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/controllers/sales_and_purchase_return.py +100,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 +42,Casual Leave,Kjóll Leave
+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
 DocType: Batch,Batch ID,hópur ID
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,Note: {0},Ath: {0}
 ,Delivery Note Trends,Afhending Ath Trends
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +103,This Week's Summary,Samantekt Í þessari viku er
+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
 DocType: Student Group Creation Tool,Get Courses,fá Námskeið
 DocType: GL Entry,Party,Party
@@ -3371,7 +3417,7 @@
 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 +59,Piecework,ákvæðisvinnu
+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: Task,Actual Time (in Hours),Tíminn (í klst)
 DocType: Employee,History In Company,Saga In Company
@@ -3388,7 +3434,7 @@
 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.
 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 +162,Black,Black
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,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
@@ -3399,13 +3445,13 @@
 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 +69,Customer Id,Auðkenni viðskiptavinar
+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
 DocType: Journal Entry Account,Exchange Rate,Exchange Rate
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Sales Order {0} is not submitted,Velta Order {0} er ekki lögð
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +527,Sales Order {0} is not submitted,Velta Order {0} er ekki lögð
 DocType: Homepage,Tag Line,tag Line
 DocType: Fee Component,Fee Component,Fee Component
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +857,Add items from,Bæta atriði úr
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +836,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}
 DocType: Cheque Print Template,Regular,Venjulegur
 DocType: BOM,Last Purchase Rate,Síðasta Kaup Rate
@@ -3413,6 +3459,7 @@
 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
 ,Sales Person-wise Transaction Summary,Sala Person-vitur Transaction Samantekt
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +60,Cost Center is required for 'Profit and Loss' account {0}. Please set up a default Cost Center for the Company.,Kostnaður Center er nauðsynlegt fyrir &#39;rekstrarreikninginn&#39; reikninginn {0}. Vinsamlegast setja upp sjálfgefið kostnaðarstað til félagsins.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,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
@@ -3423,12 +3470,12 @@
 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 +710,Online,Online
+apps/erpnext/erpnext/accounts/page/pos/pos.js +692,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 +16,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ð
+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ð
 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 +74,Quality Management,Gæðastjórnun
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,Gæðastjórnun
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} has been disabled,Liður {0} hefur verið gerð óvirk
 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
@@ -3450,11 +3497,12 @@
 DocType: Student,Student Email ID,Student Email ID
 DocType: Employee,Notice (days),Tilkynning (dagar)
 DocType: Tax Rule,Sales Tax Template,Söluskattur Snið
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1520,Select items to save the invoice,Veldu atriði til að bjarga reikning
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1544,Select items to save the invoice,Veldu atriði til að bjarga reikning
 DocType: Employee,Encashment Date,Encashment Dagsetning
 DocType: Account,Stock Adjustment,Stock Leiðrétting
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Sjálfgefið Activity Kostnaður er fyrir hendi Activity Tegund - {0}
 DocType: Production Order,Planned Operating Cost,Áætlaðir rekstrarkostnaður
+DocType: Academic Term,Term Start Date,Term Start Date
 apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},Meðfylgjandi {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Bankayfirlit jafnvægi eins og á General Ledger
 DocType: Job Applicant,Applicant Name,umsækjandi Nafn
@@ -3484,17 +3532,17 @@
 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.
 DocType: Company,Distribution,Dreifing
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +8,Amount Paid,Greidd upphæð
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Project Manager,Verkefnastjóri
+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
 ,Quoted Item Comparison,Vitnað Item Samanburður
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Dispatch,Sending
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,Sending
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,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.
-DocType: Sales Invoice,Supplier Reference,birgir Tilvísun
-apps/erpnext/erpnext/accounts/page/pos/pos.js +844,"Master data syncing, it might take some time","Master gögn syncing, gæti það tekið smá tíma"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +832,"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
@@ -3508,7 +3556,7 @@
 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 +83,Error in formula or condition,Villa í formúlu eða ástandi
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,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
@@ -3517,7 +3565,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},Til Dagsetning ætti að vera innan fjárhagsársins. Að því gefnu að Dagsetning = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Hér er hægt að halda hæð, þyngd, ofnæmi, læknis áhyggjum etc"
 DocType: Leave Block List,Applies to Company,Gildir til félagsins
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +197,Cannot cancel because submitted Stock Entry {0} exists,Ekki er hægt að hætta við vegna þess að lögð Stock Entry {0} hendi
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +198,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: Purchase Invoice,In Words,í orðum
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,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
@@ -3527,14 +3575,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,Fjárhagsár þinn byrjar á
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Eignastýring Afskriftir og jafnvægi
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +319,Amount {0} {1} transferred from {2} to {3},Upphæð {0} {1} flutt frá {2} til {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +322,Amount {0} {1} transferred from {2} to {3},Upphæð {0} {1} flutt frá {2} til {3}
 DocType: Sales Invoice,Get Advances Received,Fá Framfarir móttekin
 DocType: Email Digest,Add/Remove Recipients,Bæta við / fjarlægja viðtakendur
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +432,Transaction not allowed against stopped Production Order {0},Transaction ekki leyft móti hætt framleiðslu Order {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +437,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 +143,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 +652,Item variant {0} exists with same attributes,Liður afbrigði {0} hendi með sömu eiginleika
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Liður afbrigði {0} hendi með sömu eiginleika
+DocType: Leave Application,LAP/,LAP /
 DocType: Salary Slip,Salary Slip,laun Slip
 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
@@ -3542,12 +3591,12 @@
 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 +212,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 +215,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: Employee Education,Employee Education,starfsmaður Menntun
-apps/erpnext/erpnext/public/js/controllers/transaction.js +866,It is needed to fetch Item Details.,Það er nauðsynlegt að ná Item upplýsingar.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +857,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
@@ -3557,14 +3606,14 @@
 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 +178,Invalid {0},Ógild {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Sick Leave,Veikindaleyfi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,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
 DocType: Warehouse,PIN,PIN
 DocType: Sales Invoice,Base Change Amount (Company Currency),Base Breyta Upphæð (Company Gjaldmiðill)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +313,No accounting entries for the following warehouses,Engar bókhald færslur fyrir eftirfarandi vöruhús
-apps/erpnext/erpnext/projects/doctype/project/project.js +102,Save the document first.,Vistaðu skjalið fyrst.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +314,No accounting entries for the following warehouses,Engar bókhald færslur fyrir eftirfarandi vöruhús
+apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Vistaðu skjalið fyrst.
 DocType: Account,Chargeable,ákæru
 DocType: Company,Change Abbreviation,Breyta Skammstöfun
 DocType: Expense Claim Detail,Expense Date,Expense Dagsetning
@@ -3577,10 +3626,9 @@
 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
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,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
 DocType: Appraisal,Appraisal Template,Úttekt Snið
 DocType: Item Group,Item Classification,Liður Flokkun
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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
@@ -3590,8 +3638,8 @@
 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 +940,Please select {0} first,Vinsamlegast veldu {0} fyrst
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +749,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 +953,Please select {0} first,Vinsamlegast veldu {0} fyrst
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +757,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
@@ -3608,8 +3656,8 @@
 {% 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 +92,Warehouse not found in the system,Warehouse fannst ekki í kerfinu
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +106,This Month's Summary,Samantekt þessa mánaðar
+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
 DocType: Quality Inspection Reading,Quality Inspection Reading,Quality Inspection Reading
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Freeze Stocks Eldri Than` ætti að vera minni en% d daga.
 DocType: Tax Rule,Purchase Tax Template,Kaup Tax sniðmáti
@@ -3619,21 +3667,22 @@
 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 +87,Please set Next Depreciation Date,Vinsamlegast settu Next Afskriftir Dagsetning
-DocType: Payment Gateway,Payment Gateway,greiðsla Gateway
 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 +378,Operation Time must be greater than 0 for Operation {0},Operation Time verður að vera hærri en 0 fyrir notkun {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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/accounts/doctype/account/account.py +170,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)
 DocType: Program,Program Abbreviation,program Skammstöfun
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,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: Appraisal,Start Date,Upphafsdagur
@@ -3649,21 +3698,22 @@
 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ð
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Td. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +27,Transaction currency must be same as Payment Gateway currency,Transaction gjaldmiðli skal vera það sama og Greiðsla Gateway gjaldmiðil
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Transaction currency must be same as Payment Gateway currency,Transaction gjaldmiðli skal vera það sama og Greiðsla Gateway gjaldmiðil
 DocType: Payment Entry,Receive,fá
+apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,Tilvitnun:
 DocType: Maintenance Visit,Fully Completed,fullu lokið
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Complete
 DocType: Employee,Educational Qualification,námsgráðu
 DocType: Workstation,Operating Costs,því að rekstrarkostnaðurinn
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Aðgerð ef Uppsafnaður mánuðinn Budget meiri en
 DocType: Purchase Invoice,Submit on creation,Senda á sköpun
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +432,Currency for {0} must be {1},Gjaldeyri fyrir {0} verður að vera {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +435,Currency for {0} must be {1},Gjaldeyri fyrir {0} verður að vera {1}
 DocType: Asset,Disposal Date,förgun Dagsetning
 DocType: Employee Leave Approver,Employee Leave Approver,Starfsmaður Leave samþykkjari
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,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 +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/crm/doctype/opportunity/opportunity.py +79,"Cannot declare as lost, because Quotation has been made.","Get ekki lýst því sem glatast, af því Tilvitnun hefur verið gert."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Kaup Master Manager
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +429,Production Order {0} must be submitted,Framleiðslu Order {0} Leggja skal fram
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +434,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
@@ -3673,25 +3723,27 @@
 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
 DocType: Price List,Price List Name,Verðskrá Name
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +181,Totals,Samtölur
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,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 +113,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 +120,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ð
 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.
+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 +181,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/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 +793,All records are synced.,Allar færslur eru samstillt.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +781,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
 DocType: Cost Center,Cost Center Name,Kostnaður Center Name
@@ -3710,21 +3762,20 @@
 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/selling/doctype/quotation/quotation.py +49,Cannot set as Lost as Sales Order is made.,Get ekki stillt eins Lost og Sales Order er gert.
-DocType: Student Applicant,Mother's Name,Heiti móður
 DocType: Request for Quotation Item,Supplier Part No,Birgir Part No
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +348,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Get ekki draga þegar flokkur er fyrir &#39;Verðmat&#39; eða &#39;Vaulation og heildar&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Received From,fékk frá
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Received From,fékk frá
 DocType: Lead,Converted,converted
 DocType: Item,Has Serial No,Hefur Serial Nei
 DocType: Employee,Date of Issue,Útgáfudagur
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{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 +93,Row {0}: Hours value must be greater than zero.,Row {0}: Hours verður að vera stærri en núll.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +117,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
 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 +172,{0} {1} does not exist,{0} {1} er ekki til
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +175,{0} {1} does not exist,{0} {1} er ekki til
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,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 +72,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
@@ -3733,13 +3784,14 @@
 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/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
 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 +109,Electrical,Electrical
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Electrical,Electrical
 DocType: Stock Entry,Total Value Difference (Out - In),Heildarverðmæti Mismunur (Out - In)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,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}
@@ -3747,7 +3799,7 @@
 DocType: Item,Customer Code,viðskiptavinur Code
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +210,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 +292,Debit To account must be a Balance Sheet account,Debit Til reikning verður að vera Efnahagur reikning
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,lager Eignir
@@ -3759,11 +3811,11 @@
 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 +301,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 +313,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: Sales Order Item,Ordered Qty,Raðaður Magn
-apps/erpnext/erpnext/stock/doctype/item/item.py +673,Item {0} is disabled,Liður {0} er óvirk
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,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 +838,BOM does not contain any stock item,BOM inniheldur ekki lager atriði
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +809,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.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Búa Laun laumar
@@ -3771,23 +3823,24 @@
 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)
-apps/erpnext/erpnext/stock/doctype/item/item.py +485,Row #{0}: Please set reorder quantity,Row # {0}: Vinsamlegast settu pöntunarmark magn
+DocType: Sales Invoice Timesheet,Billing Hours,Billing Hours
+apps/erpnext/erpnext/stock/doctype/item/item.py +487,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 +62,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
+DocType: Payment Entry,Allocate Payment Amount,Úthluta Greiðsla Upphæð
 DocType: Employee External Work History,Salary,Laun
 DocType: Serial No,Delivery Document Type,Afhending Document Type
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Senda öll laun laumar fyrir ofan valin forsendum
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} Items samstillt
 DocType: Sales Order,Partly Delivered,hluta Skilað
-DocType: Sales Invoice,Existing Customer,núverandi viðskiptavinir
 DocType: Email Digest,Receivables,Viðskiptakröfur
+DocType: Lead Source,Lead Source,Lead Source
 DocType: Customer,Additional information regarding the customer.,Viðbótarupplýsingar um viðskiptavininn.
 DocType: Quality Inspection Reading,Reading 5,lestur 5
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +38,Campaign Name is required,Nafn herferð er krafist
 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
@@ -3795,10 +3848,9 @@
 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 +129,BOM and Manufacturing Quantity are required,BOM og framleiðsla Magn þarf
+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/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Ageing Range 2
 DocType: SG Creation Tool Course,Max Strength,max Strength
-DocType: Bank Reconciliation Detail,Amount,upphæð
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM stað
 ,Sales Analytics,velta Analytics
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +113,Available {0},Laus {0}
@@ -3806,14 +3858,14 @@
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Setja upp tölvupóst
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +96,Please enter default currency in Company Master,Vinsamlegast sláðu inn sjálfgefið mynt í félaginu Master
 DocType: Stock Entry Detail,Stock Entry Detail,Stock Entry Detail
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +100,Daily Reminders,Daglegar áminningar
+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/account/account_tree.js +23,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 +71,Customer Service,Þjónustuver
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Customer Service,Þjónustuver
 DocType: Homepage Featured Product,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.
@@ -3822,8 +3874,9 @@
 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
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Sjálfgefið Work In Progress Warehouse
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1570,Total nos of serial no is not equal to quantity.,Samtals nos af Serial Nei er ekki jafn magn.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1594,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
 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
@@ -3831,9 +3884,10 @@
 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 +82,Engineer,verkfræðingur
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,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 +370,Item Code required at Row No {0},Item Code þörf á Row nr {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +398,Item Code required at Row No {0},Item Code þörf á Row nr {0}
 DocType: Sales Partner,Partner Type,Gerð Partner
 DocType: Purchase Taxes and Charges,Actual,Raunveruleg
 DocType: Authorization Rule,Customerwise Discount,Customerwise Afsláttur
@@ -3849,16 +3903,18 @@
 DocType: BOM,Raw Material Cost,Raw Material Kostnaður
 DocType: Item Reorder,Re-Order Level,Re-Order Level
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Sláðu atriði og fyrirhugað Magn sem þú vilt að hækka framleiðslu pantanir eða sækja hráefni til greiningar.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +55,Part-time,Hluta
+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
 DocType: Employee,Applicable Holiday List,Gildandi Holiday List
 DocType: Employee,Cheque,ávísun
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Series Uppfært
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +57,Series Updated,Series Uppfært
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Tegund skýrslu er nauðsynlegur
 DocType: Item,Serial Number Series,Serial Number Series
 apps/erpnext/erpnext/buying/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 +87,Clearance Date updated,Úthreinsun Date uppfært
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,tókst Samræmd
@@ -3872,7 +3928,7 @@
 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 +513,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 +518,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.
@@ -3882,7 +3938,7 @@
 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/stock/doctype/stock_entry/stock_entry.py +158,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/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
 DocType: Company,Round Off Account,Umferð Off reikning
@@ -3891,23 +3947,22 @@
 DocType: Customer Group,Parent Customer Group,Parent Group Viðskiptavinur
 DocType: Purchase Invoice,Contact Email,Netfang tengiliðar
 DocType: Appraisal Goal,Score Earned,skora aflað
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Notice Period,uppsagnarfrestur
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,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 +4,New Sales Person Name,Nýtt Sales Person Name
 DocType: Packing Slip,Gross Weight UOM,Gross Weight UOM
-DocType: Email Digest,Receivables / Payables,Skammtímakröfur / Skuldir
 DocType: Delivery Note Item,Against Sales Invoice,Against sölureikningi
 DocType: Bin,Reserved Qty for Production,Frátekið Magn fyrir framleiðslu
 DocType: Asset,Frequency of Depreciation (Months),Tíðni Afskriftir (mánuðir)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +469,Credit Account,Credit Reikningur
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Credit Account,Credit Reikningur
 DocType: Landed Cost Item,Landed Cost Item,Landað kostnaðarliðurinn
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +55,Show zero values,Sýna núll gildi
+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
 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 +647,Please specify Attribute Value for attribute {0},Vinsamlegast tilgreindu Attribute virði fyrir eigind {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Vinsamlegast tilgreindu Attribute virði fyrir eigind {0}
 DocType: Item,Default Warehouse,Sjálfgefið Warehouse
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +39,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ð
@@ -3929,19 +3984,22 @@
 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
-DocType: Sales Invoice,Cold Calling,Cold Calling
 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: Maintenance Schedule Item,Half Yearly,Half Árlega
 DocType: Lead,Blog Subscriber,Blog Notandanúmer
+DocType: Guardian,Alternate Number,varamaður Number
 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.
+DocType: Stock Reconciliation Item,Quantity Difference,magn Mismunur
 apps/erpnext/erpnext/config/hr.py +253,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 +141,Set as Lost,Setja sem Lost
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,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 +5,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
 DocType: Supplier,Credit Days Based On,Credit Days Byggt á
@@ -3953,11 +4011,10 @@
 ,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 +941,Select or add new customer,Veldu eða bæta við nýjum viðskiptavin
+apps/erpnext/erpnext/accounts/page/pos/pos.js +930,Select or add new customer,Veldu eða bæta við nýjum viðskiptavin
 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 +5,This is based on the attendance of this Employee,Þetta er byggt á mætingu þessa starfsmanns
-DocType: Sales Invoice,Frequency,tíðni
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +463,Debit Account,skuldfærslureikning
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,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)
@@ -3966,27 +4023,27 @@
 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 +210,Supplier Quotation {0} created,Birgir Tilvitnun {0} búin
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +208,Supplier Quotation {0} created,Birgir Tilvitnun {0} búin
 apps/erpnext/erpnext/accounts/report/financial_statements.py +90,End Year cannot be before Start Year,Árslok getur ekki verið áður Start Ár
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Employee Benefits,starfskjör
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,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 +228,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 +232,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 +499,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 +500,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 +1007,Price List not found or disabled,Verðlisti fannst ekki eða fatlaður
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1008,Price List not found or disabled,Verðlisti fannst ekki eða fatlaður
 DocType: Expense Claim,Approved,samþykkt
 DocType: Pricing Rule,Price,verð
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +244,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 +256,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
@@ -3997,12 +4054,12 @@
 DocType: Address,Office,Office
 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 +259,Please select Employee Record first.,Vinsamlegast veldu Starfsmaður Taka fyrst.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +266,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 +190,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 +235,Please enter Expense Account,Vinsamlegast sláðu inn kostnað reikning
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,Please enter Expense Account,Vinsamlegast sláðu inn kostnað reikning
 DocType: Account,Stock,Stock
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,"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 +976,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Tilvísun Document Type verður að vera einn af Purchase Order, Purchase Invoice eða Journal Entry"
 DocType: Employee,Current Address,Núverandi heimilisfang
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Ef hluturinn er afbrigði af annað lið þá lýsingu, mynd, verðlagningu, skatta osfrv sett verður úr sniðmátinu nema skýrt tilgreint"
 DocType: Serial No,Purchase / Manufacture Details,Kaup / Framleiðsla Upplýsingar
@@ -4017,9 +4074,10 @@
 DocType: Asset Movement,Transaction Date,Færsla Dagsetning
 DocType: Production Plan Item,Planned Qty,Planned Magn
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,Total Tax
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,For Quantity (Manufactured Qty) is mandatory,Fyrir Magn (Framleiðandi Magn) er nauðsynlegur
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,For Quantity (Manufactured Qty) is mandatory,Fyrir Magn (Framleiðandi Magn) er nauðsynlegur
 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 +78,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: Production Order,Actual Start Date,Raunbyrjunardagsetning
@@ -4034,9 +4092,11 @@
 DocType: Warranty Claim,If different than customer address,Ef öðruvísi en viðskiptavinur heimilisfangi
 DocType: BOM Operation,BOM Operation,BOM Operation
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Á fyrri röð Upphæð
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +226,Transfer Asset,Transfer Asset
+DocType: Student,Home Address,Heimilisfangið
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +227,Transfer Asset,Transfer Asset
 DocType: POS Profile,POS Profile,POS Profile
 apps/erpnext/erpnext/config/schools.py +33,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 +129,"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
@@ -4046,8 +4106,8 @@
 DocType: Assessment,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 +765,Material to Supplier,Efni til Birgir
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +189,Excise Invoice,vörugjöld Invoice
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,Material to Supplier,Efni til Birgir
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,vörugjöld Invoice
 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
@@ -4057,7 +4117,7 @@
 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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,Nemenda Hópar búin.
 DocType: Scheduling Tool,Scheduling Tool,Tímasetningar Tool
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +136,Credit Card,Kreditkort
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,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.
 DocType: Purchase Invoice,Next Date,næsta Dagsetning
@@ -4065,6 +4125,7 @@
 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: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Hér er hægt að halda upplýsingar fjölskyldu eins og nafn og starfsheiti foreldri, maka og börn"
+DocType: Academic Term,Term End Date,Term Lokadagur
 DocType: Hub Settings,Seller Name,Seljandi Name
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Skattar og gjöld FrÃ¡ (Company Gjaldmiðill)
 DocType: Item Group,General Settings,Almennar stillingar
@@ -4076,7 +4137,7 @@
 DocType: Customer,Commission Rate,Framkvæmdastjórnin Rate
 apps/erpnext/erpnext/stock/doctype/item/item.js +261,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 +115,"Payment Type must be one of Receive, Pay and Internal Transfer","Greiðsla Type verður að vera einn af fáum, Borga og Innri Transfer"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +118,"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/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Karfan er tóm
 DocType: Production Order,Actual Operating Cost,Raunveruleg rekstrarkostnaður
@@ -4091,10 +4152,10 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,Vinsamlegast veldu csv skrá
 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 +92,Designer,hönnuður
+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ð
 DocType: Serial No,Delivery Details,Afhending Upplýsingar
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +469,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}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +472,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
 ,Item-wise Purchase Register,Item-vitur Purchase Register
 DocType: Batch,Expiry Date,Fyrningardagsetning
@@ -4104,12 +4165,12 @@
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Project húsbóndi.
 apps/erpnext/erpnext/controllers/status_updater.py +174,"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 +417, (Half Day),(Hálfur dagur)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425, (Half Day),(Hálfur dagur)
 DocType: Supplier,Credit Days,Credit Days
 DocType: Leave Type,Is Carry Forward,Er bera fram
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +740,Get Items from BOM,Fá atriði úr BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +711,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 +549,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/controllers/accounts_controller.py +552,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
 ,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
diff --git a/erpnext/translations/it.csv b/erpnext/translations/it.csv
index 9e08b0a..4a09d95 100644
--- a/erpnext/translations/it.csv
+++ b/erpnext/translations/it.csv
@@ -18,11 +18,10 @@
 DocType: Sales Partner,Dealer,Rivenditore
 DocType: Employee,Rented,Affittato
 DocType: Purchase Order,PO-,PO-
-apps/erpnext/erpnext/accounts/report/financial_statements.py +19,Start Year {0} not found.,Anno di inizio {0} non trovato.
 DocType: POS Profile,Applicable for User,Applicabile per utente
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +191,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Produzione Arrestato Ordine non può essere annullato, Unstop è prima di cancellare"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +197,Do you really want to scrap this asset?,Vuoi davvero di accantonare questo bene?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +17,Select Default Supplier,Selezionare Predefinito Fornitore
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +192,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Produzione Arrestato Ordine non può essere annullato, Unstop è prima di cancellare"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +198,Do you really want to scrap this asset?,Vuoi davvero di accantonare questo bene?
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Selezionare Predefinito Fornitore
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},È richiesto di valuta per il listino prezzi {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Sarà calcolato nella transazione
 DocType: Address,County,contea
@@ -42,46 +41,45 @@
 DocType: Sales Invoice,Customer Name,Nome Cliente
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +126,Bank account cannot be named as {0},Conto bancario non può essere nominato come {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 +180,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 +183,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 +148,Series Updated Successfully,Serie Aggiornato con successo
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +149,Series Updated Successfully,Serie Aggiornato con successo
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Check-out
 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
-DocType: Quality Inspection Reading,Parameter,Parametro
 apps/erpnext/erpnext/projects/doctype/project/project.py +54,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 +239,New Leave Application,Nuovo Lascia Application
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,New Leave Application,Nuovo Lascia Application
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +20,Attendance Record {0} exists against Student {1} for Course Schedule {2},Record di presenze {0} esiste contro Student {1} per Programma corso {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Bank Draft,Assegno Bancario
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,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
 DocType: Academic Term,Academic Term,Termine Accademico
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +13,Material,Materiale
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Quantity,Quantità
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +511,Accounts table cannot be blank.,La tabella dei conti non può essere vuota.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +616,Quantity,Quantità
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +512,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à )
 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/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 +142,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
-DocType: Purchase Invoice,Monthly,Mensile
 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/buying/doctype/purchase_order/purchase_order.js +771,Invoice,Fattura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +750,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 +198,Row {0}: {1} {2} does not match with {3},Riga {0}: {1} {2} non corrisponde con {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Row # {0}:
+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 +127,Please select Price List,Seleziona Listino Prezzi
@@ -112,8 +110,8 @@
 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 +589,Get items from,Ottenere elementi dal
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +382,Stock cannot be updated against Delivery Note {0},Stock non può essere aggiornata contro Consegna Nota {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Ottenere elementi dal
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,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
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Drogheria
@@ -122,7 +120,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Fondi Pensione
 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 +156,Salary Structure Missing,Stipendio Struttura mancante
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,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
@@ -130,10 +128,11 @@
 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 +156,Credit limit has been crossed for customer {0} {1}/{2},Limite di credito è stato attraversato per il cliente {0} {1} / {2}
-apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;È di capitale fisso&quot; non può essere deselezionata, in quanto esiste registrare Asset contro la voce"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +189,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"
 DocType: Tax Rule,Tax Type,Tipo fiscale
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +144,You are not authorized to add or update entries before {0},Non sei autorizzato ad aggiungere o aggiornare le voci prima di {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},Non sei autorizzato ad aggiungere o aggiornare le voci prima di {0}
 DocType: Item,Item Image (if not slideshow),Immagine Articolo (se non slideshow)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Esiste un cliente con lo stesso nome
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Tasso Orario / 60) * tempo operazione effettivo
@@ -143,18 +142,17 @@
 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 +165,Opening,Apertura
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,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: Journal Entry,Opening Entry,Apertura Entry
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Clienti&gt; Gruppi clienti&gt; Territorio
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Solo conto pay
 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.
 DocType: Lead,Product Enquiry,Prodotto Inchiesta
 DocType: Academic Term,Schools,scuole
 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 +335,Please select Company first,Seleziona prima azienda
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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
@@ -164,7 +162,7 @@
 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
 DocType: Purchase Invoice Item,Is Fixed Asset,È cespite
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Available qty is {0}, you need {1}","Disponibile Quantità è {0}, è necessario {1}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +225,"Available qty is {0}, you need {1}","Disponibile Quantità è {0}, è necessario {1}"
 DocType: Expense Claim Detail,Claim Amount,Importo Reclamo
 DocType: Employee,Mr,Sig.
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Fornitore Tipo / fornitore
@@ -173,26 +171,27 @@
 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: Assessment Result,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 +171,Annual Salary,Stipendio Annuo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Annual Salary,Stipendio Annuo
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Spese Giacenza
-apps/erpnext/erpnext/accounts/report/financial_statements.py +22,End Year {0} not found.,Fine Anno {0} non trovato.
 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}
 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 +130,At least one mode of payment is required for POS invoice.,è richiesto almeno una modalità di pagamento per POS fattura.
 DocType: Products Settings,Show Products as a List,Mostra prodotti sotto forma di elenco
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Scarica il modello, compilare i dati appropriati e allegare il file modificato.
  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 +451,Item {0} is not active or end of life has been reached,L'articolo {0} non è attivo o la fine della vita è stato raggiunta
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +456,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/controllers/accounts_controller.py +614,"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/controllers/accounts_controller.py +617,"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 +166,Settings for HR Module,Impostazioni per il modulo HR
 DocType: SMS Center,SMS Center,Centro SMS
 DocType: Sales Invoice,Change Amount,quantità di modifica
@@ -204,13 +203,13 @@
 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 +147,Execution,esecuzione
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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/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}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,Cost Center {0} does not belong to Company {1},Centro di costo {0} non appartiene alla società {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +100,Cost Center {0} does not belong to Company {1},Centro di costo {0} non appartiene alla società {1}
 DocType: Customer,Individual,Individuale
 DocType: Interest,Academics User,accademici utente
 DocType: Cheque Print Template,Amount In Figure,Importo Nella figura
@@ -226,30 +225,32 @@
 DocType: Production Planning Tool,Sales Orders,Ordini di vendita
 DocType: Purchase Taxes and Charges,Valuation,Valorizzazione
 ,Purchase Order Trends,Acquisto Tendenze Ordine
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,The request for quotation can be accessed by clicking on the following link,La richiesta di offerta si può accedere cliccando sul seguente link
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,Assegnare le foglie per l' anno.
 DocType: SG Creation Tool Course,SG Creation Tool Course,SG Corso strumento di creazione
 DocType: Student Group Creation Tool,Leave blank if you wish to fetch all courses for selected academic term,Lasciare vuoto se si desidera recuperare tutti i corsi per il termine accademico selezionato
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,Insufficient Stock,insufficiente della
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227,Insufficient Stock,insufficiente della
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Capacity Planning e Disabilita Time Tracking
+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: 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/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} does not belong to Company {1},Il Conto {0} non appartiene alla società {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +86,Account {0} does not belong to Company {1},Il Conto {0} non appartiene alla società {1}
 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}
 DocType: Naming Series,Series List for this Transaction,Lista Serie per questa transazione
 DocType: Sales Invoice,Is Opening Entry,Sta aprendo Entry
 DocType: Customer Group,Mention if non-standard receivable account applicable,Menzione se conto credito non standard applicabile
 DocType: Course Schedule,Instructor Name,Istruttore Nome
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,For Warehouse is required before Submit,Per è necessario Warehouse prima Submit
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,For Warehouse is required before Submit,Per è necessario Warehouse prima Submit
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Ricevuto On
 DocType: Sales Partner,Reseller,Rivenditore
 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 +1436,"LocalStorage is full , did not save","LocalStorage è piena, non ha salvato"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1460,"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}
@@ -262,18 +263,19 @@
 apps/erpnext/erpnext/templates/generators/item.html +78,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 +5,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/leave_application/leave_application.py +206,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/leave_application/leave_application.py +213,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 +114,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 +179,Leaves per Year,Lascia per Anno
+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 +103,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}
+DocType: Email Digest,Profit & Loss,Profit &amp; Loss
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,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 +435,Leave Blocked,Lascia Bloccato
-apps/erpnext/erpnext/stock/doctype/item/item.py +669,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/leave_application/leave_application.py +443,Leave Blocked,Lascia Bloccato
+apps/erpnext/erpnext/stock/doctype/item/item.py +671,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 +83,Annual,annuale
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +86,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
@@ -281,20 +283,22 @@
 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
 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 +91,Software Developer,Software Developer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Qtà ordine minimo
 DocType: Pricing Rule,Supplier Type,Tipo Fornitore
 DocType: Scheduling Tool,Course Start Date,Data inizio corso
 DocType: Item,Publish in Hub,Pubblicare in Hub
+DocType: Student Admission,Student Admission,L&#39;ammissione degli studenti
 ,Terretory,Territorio
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is cancelled,L'articolo {0} è annullato
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Material Request,Richiesta materiale
+apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} is cancelled,L'articolo {0} è annullato
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +823,Material Request,Richiesta materiale
 DocType: Bank Reconciliation,Update Clearance Date,Aggiornare Liquidazione Data
 apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +28,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 +328,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Articolo {0} non trovato tra le 'Materie Prime Fornite' tabella in Ordine di Acquisto {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +333,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/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
@@ -310,20 +314,21 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +130,Please select Charge Type first,Seleziona il tipo di carica prima
 DocType: Student Group Student,Student Group Student,Student Student Group
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,ultimo
+DocType: Email Digest,New Quotations,Nuovo Preventivo
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Il primo responsabile ferie della lista sarà impostato come il responsabile ferie di default
 DocType: Tax Rule,Shipping County,County spedizione
 apps/erpnext/erpnext/config/desktop.py +158,Learn,Imparare
 DocType: Asset,Next Depreciation Date,Successivo ammortamento Data
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Costo attività per dipendente
 DocType: Accounts Settings,Settings for Accounts,Impostazioni per gli account
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +626,Supplier Invoice No exists in Purchase Invoice {0},Fornitore fattura n esiste in Acquisto Fattura {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +629,Supplier Invoice No exists in Purchase Invoice {0},Fornitore fattura n esiste in Acquisto Fattura {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Gestire venditori ad albero
 DocType: Job Applicant,Cover Letter,Lettera di presentazione
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Gli assegni in circolazione e depositi per cancellare
 DocType: Item,Synced With Hub,Sincronizzati con Hub
 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 +348,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 +86,Circular Reference Error,Circular Error Reference
@@ -335,15 +340,16 @@
 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 +806,Delivery Note,Nota Consegna
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +800,Delivery Note,Nota Consegna
 apps/erpnext/erpnext/config/learn.py +87,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 +233,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/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/setup/doctype/email_digest/email_digest.py +104,Summary for this week and pending activities,Riepilogo per questa settimana e le attività in corso
+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"
 DocType: Employee,Company Email,azienda Email
@@ -355,27 +361,28 @@
 apps/erpnext/erpnext/config/hr.py +186,"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
-apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Acquisto fattura non può essere fatta contro un bene esistente {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +554,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 +54,{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 +812,Select Item,Seleziona elemento
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +791,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 \
 					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 +142,Purchase Invoice {0} is already submitted,Acquisto Fattura {0} è già presentato
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Fila # {0}: Lotto n deve essere uguale a {1} {2}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +143,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
 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 +342,Please see attachment,Si prega di vedere allegato
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,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 +19,Setup Already Complete!!,Setup già completo !
 ,Finished Goods,Beni finiti
 DocType: Delivery Note,Instructions,Istruzione
 DocType: Quality Inspection,Inspected By,Verifica a cura di
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Fornitore&gt; Tipo Fornitore
 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/public/js/utils/item_selector.js +12,Add Items,Aggiungi Articoli
@@ -389,29 +396,29 @@
 DocType: Currency Exchange,Currency Exchange,Cambio Valuta
 DocType: Purchase Invoice Item,Item Name,Nome dell&#39;articolo
 DocType: Authorization Rule,Approving User  (above authorized value),Approvazione utente (sopra il valore autorizzato)
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Balance Credit
+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/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 +736,Purchase Return,Acquisto Ritorno
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +715,Purchase Return,Acquisto Ritorno
 ,Purchase Register,Registro Acquisti
 DocType: 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 +202,{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 +209,{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 +143,Reason for losing,Motivo per Perdere
-apps/erpnext/erpnext/accounts/utils.py +239,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 +163,Reason for losing,Motivo per Perdere
+apps/erpnext/erpnext/accounts/utils.py +316,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 +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation è chiuso nei seguenti giorni secondo l'elenco di vacanza: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Opportunità
 DocType: Employee,Single,Singolo
 DocType: Account,Cost of Goods Sold,Costo del venduto
 DocType: Purchase Invoice,Yearly,Annuale
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +225,Please enter Cost Center,Inserisci Centro di costo
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,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
@@ -424,26 +431,26 @@
 DocType: Purchase Invoice,Supplier Name,Nome fornitore
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Leggere il manuale ERPNext
 DocType: Account,Is Group,Is Group
+DocType: Email Digest,Pending Purchase Orders,In attesa di ordini di acquisto
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Imposta automaticamente seriale Nos sulla base FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Controllare fornitore Numero fattura Uniqueness
 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 +102,Non Profit,Non Profit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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: Stock Reconciliation Item,Do not include symbols (ex. $),Non includere i simboli (es. $)
 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 +638,Attribute {0} selected multiple times in Attributes Table,Attributo {0} selezionato più volte in Attributi Tabella
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Attributo {0} selezionato più volte in Attributi Tabella
 DocType: HR Settings,Employee record is created using selected field. ,Record dipendente viene creato utilizzando campo selezionato.
 DocType: Sales Order,Not Applicable,Non Applicabile
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Vacanza principale.
 DocType: Request for Quotation Item,Required Date,Data richiesta
 DocType: Delivery Note,Billing Address,Indirizzo Fatturazione
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +862,Please enter Item Code.,Inserisci il codice dell'articolo.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +847,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"
@@ -457,12 +464,12 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,I titoli e depositi
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Foglie totali assegnate è obbligatoria
 DocType: Job Opening,Description of a Job Opening,Descrizione di una apertura di lavoro
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Pending activities for today,Attività di attesa per oggi
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Attività di attesa per oggi
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Archivio Presenze
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Componente Stipendio per il libro paga base scheda attività.
 DocType: Sales Order Item,Used for Production Plan,Usato per Piano di Produzione
 DocType: Manufacturing Settings,Time Between Operations (in mins),Tempo tra le operazioni (in minuti)
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +92,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} budget per l&#39;account {1} contro Centro di costo {2} è {3}. Si supererà da {4}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +95,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} budget per l&#39;account {1} contro Centro di costo {2} è {3}. Si supererà da {4}
 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
@@ -470,16 +477,16 @@
 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/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 +86,Administrative Officer,responsabile amministrativo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,responsabile amministrativo
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +23,Acutal Qty {0} / Waiting Qty {1},Acutal Quantità {0} / attesa Quantità {1}
 DocType: Timesheet Detail,Hrs,ore
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +319,Please select Company,Selezionare prego
-DocType: Stock Entry,Difference Account,account differenza
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +309,Please select Company,Selezionare prego
+DocType: Stock Entry Detail,Difference Account,account differenza
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Impossibile chiudere compito il compito dipendente {0} non è chiuso.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,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 +399,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 +530,"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 +532,"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 +28,Buy,Acquistare
@@ -487,7 +494,7 @@
 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 +1563,Serial no item cannot be a fraction,Serial nessun elemento non può essere una frazione
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1587,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
@@ -496,13 +503,14 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Account {0} does not belong to company: {1},Il Conto {0} non appartiene alla società: {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation already used for another company,Abbreviazione già utilizzata per un'altra società
 DocType: Selling Settings,Default Customer Group,Gruppo Clienti Predefinito
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Supplier is required against Payable account {0},Fornitore è richiesto contro conto da pagare {0}
 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
 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 +313,Reference No and Reference Date is mandatory for Bank transaction,Di riferimento e di riferimento Data è obbligatoria per la transazione Bank
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +316,Reference No and Reference Date is mandatory for Bank transaction,Di riferimento e di riferimento Data è obbligatoria per la transazione Bank
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Aggiungere / Modificare tasse e ricarichi
 DocType: Purchase Invoice,Supplier Invoice No,Fornitore fattura n
 DocType: Territory,For reference,Per riferimento
@@ -513,7 +521,6 @@
 DocType: Installation Note Item,Installation Note Item,Installazione Nota articolo
 DocType: Production Plan Item,Pending Qty,In attesa Quantità
 DocType: Budget,Ignore,Ignora
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Codice Articolo&gt; Gruppo Articolo&gt; Brand
 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/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
@@ -524,11 +531,11 @@
 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/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 +28,Please select Company and Party Type first,Selezionare prego e Partito Tipo primo
+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/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 +707,Make Sales Order,Crea Ordine di vendita
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +701,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
@@ -544,7 +551,8 @@
 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 +734,Sales Return,Ritorno di vendite
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +728,Sales Return,Ritorno di vendite
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +91,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)
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Database Potenziali Clienti.
@@ -553,14 +561,13 @@
 DocType: Quotation,Quotation To,Preventivo Per
 DocType: Lead,Middle Income,Reddito Medio
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +212,Opening (Cr),Opening ( Cr )
-apps/erpnext/erpnext/stock/doctype/item/item.py +795,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,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 +237,Allocated amount can not be negative,Importo concesso non può essere negativo
+apps/erpnext/erpnext/stock/doctype/item/item.py +797,Default Unit of Measure for Item {0} cannot be changed directly because 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
 DocType: Purchase Order Item,Billed Amt,Importo Fatturato
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Magazzino logico utilizzato per l'entrata giacenza.
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Fattura Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},N. di riferimento & Reference Data è necessario per {0}
-DocType: Sales Invoice,Customer's Vendor,Fornitore del Cliente
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Proposal Writing,Scrivere proposta
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,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"
@@ -569,13 +576,14 @@
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,Monitoraggio tempo
 DocType: Fiscal Year Company,Fiscal Year Company,Anno Fiscale Società
 DocType: Packing Slip Item,DN Detail,Dettaglio DN
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +257,Already supplier quotation has created,Già fornitore citazione ha creato
 DocType: Timesheet,Billed,Addebbitato
 DocType: Batch,Batch Description,Descrizione Batch
+apps/erpnext/erpnext/accounts/utils.py +685,"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 +733,View Offline Records,Vista non in linea Records
+apps/erpnext/erpnext/accounts/page/pos/pos.js +715,View Offline Records,Vista non in linea Records
+DocType: Student,Sibling Details,Dettagli sibling
 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: Payment Reconciliation,Invoice/Journal Entry Details,Dettagli Fattura/Registro
@@ -589,7 +597,7 @@
 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
 DocType: Employee,Passport Number,Numero di passaporto
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Manager,Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,Manager
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,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
@@ -598,10 +606,11 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter email address,Si prega di inserire l'indirizzo email
 DocType: Production Order Operation,In minutes,In pochi minuti
 DocType: Issue,Resolution Date,Risoluzione Data
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +299,Timesheet created:,Timesheet creato:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +715,Please set default Cash or Bank account in Mode of Payment {0},Si prega di impostare di default Contanti o conto bancario in Modalità di pagamento {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +300,Timesheet created:,Timesheet creato:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +772,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
 DocType: Selling Settings,Customer Naming By,Cliente nominato di
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,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: 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à
@@ -626,6 +635,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,finire
 DocType: Pricing Rule,Sales Manager,Sales Manager
 DocType: Salary Structure Employee,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
@@ -640,11 +650,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +9,Pre Sales,Le vendite Pre
 DocType: Purchase Receipt,Other Details,Altri dettagli
 DocType: Account,Accounts,Accounts
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Marketing,Marketing
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +227,Payment Entry is already created,Pagamento L&#39;ingresso è già stato creato
+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,Pagamento L&#39;ingresso è già stato creato
 DocType: Purchase Receipt Item Supplied,Current Stock,Giacenza Corrente
-apps/erpnext/erpnext/controllers/accounts_controller.py +538,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 +21,Preview Salary Slip,Anteprima foglio paga
+apps/erpnext/erpnext/controllers/accounts_controller.py +541,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 +38,Preview Salary Slip,Anteprima foglio paga
 DocType: Company,Deafult Cost Center,Centro di costo Deafult
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +48,Account {0} has been entered multiple times,Account {0} è stato inserito più volte
 DocType: Account,Expenses Included In Valuation,Spese incluse nella valutazione
@@ -653,7 +663,7 @@
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,Si prega di selezionare un gruppo di studenti
 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 +617,Item has variants.,Articolo ha varianti.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Articolo ha varianti.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,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
@@ -673,7 +683,7 @@
 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.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Attività correnti
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,{0} is not a stock Item,{0} non è un articolo in scorta
+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 +169,Lead must be set if Opportunity is made from Lead,Contatto deve essere impostato se Opportunità generata da Contatto
@@ -759,26 +769,25 @@
 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 +709,No Permission,Nessuna autorizzazione
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +710,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}
 apps/erpnext/erpnext/public/js/setup_wizard.js +298,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 +542,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} deve essere presentata
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} deve essere presentata
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Nessun dipendente trovato
 DocType: Supplier Quotation,Stopped,Arrestato
 DocType: Item,If subcontracted to a vendor,Se subappaltato a un fornitore
 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/setup/doctype/email_digest/email_digest.js +27,Send Now,Invia Ora
 ,Support Analytics,Analytics Support
 DocType: Item,Website Warehouse,Magazzino sito web
 DocType: Payment Reconciliation,Minimum Invoice Amount,Importo Minimo Fattura
 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/sales_invoice/sales_invoice.py +227,Timesheet {0} is already completed or cancelled,Timesheet {0} è già completato o annullato
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +259,Timesheet {0} is already completed or cancelled,Timesheet {0} è già completato o annullato
 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
@@ -794,13 +803,13 @@
 apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Orario del corso
 DocType: Maintenance Visit,Completion Status,Stato Completamento
 DocType: HR Settings,Enter retirement age in years,Inserire l&#39;età pensionabile in anni
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +229,Target Warehouse,Obiettivo Warehouse
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +230,Target Warehouse,Obiettivo Warehouse
 DocType: Cheque Print Template,Starting location from left edge,A partire da posizione bordo sinistro
 DocType: Item,Allow over delivery or receipt upto this percent,Consenti superamento ricezione o invio fino a questa percentuale
 DocType: Stock Entry,STE-,STEREO
 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 +17,All Item Groups,Tutti i gruppi di articoli
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Tutti i gruppi di articoli
 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/config/setup.py +89,Automatically compose message on submission of transactions.,Comporre automaticamente il messaggio di presentazione delle transazioni .
@@ -812,13 +821,15 @@
 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/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
 DocType: Expense Claim,Expenses,Spese
 DocType: Item Variant Attribute,Item Variant Attribute,Prodotto Modello attributo
 ,Purchase Receipt Trends,Acquisto Tendenze Receipt
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Research & Development,Ricerca & Sviluppo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Ricerca & Sviluppo
 ,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
@@ -827,7 +838,7 @@
 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/controllers/accounts_controller.py +340,"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."
+apps/erpnext/erpnext/controllers/accounts_controller.py +343,"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
@@ -849,12 +860,12 @@
 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 +756,Purchase Receipt,RICEVUTA
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +735,Purchase Receipt,RICEVUTA
 ,Received Items To Be Billed,Oggetti ricevuti da fatturare
 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 +167,Reference Doctype must be one of {0},Riferimento Doctype deve essere uno dei {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +282,Unable to find Time Slot in the next {0} days for Operation {1},Impossibile trovare tempo di slot nei prossimi {0} giorni per l&#39;operazione {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +170,Reference Doctype must be one of {0},Riferimento Doctype deve essere uno dei {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,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 +439,BOM {0} must be active,BOM {0} deve essere attivo
@@ -865,7 +876,7 @@
 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 +214,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 +217,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
@@ -879,9 +890,9 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Employee {0} non è attiva o non esiste
 DocType: Fee Structure,Components,componenti
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,Please enter Asset Category in Item {0},Si prega di inserire Asset categoria al punto {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +612,Item Variants {0} updated,Voce Varianti {0} aggiornato
+apps/erpnext/erpnext/stock/doctype/item/item.py +614,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 +843,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 +854,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
@@ -896,68 +907,71 @@
 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 +728,New Sales Invoice,Nuova fattura di vendita
+apps/erpnext/erpnext/accounts/page/pos/pos.js +710,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 +728,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
 DocType: Material Request Item,Lead Time Date,Data Tempo di Esecuzione
 DocType: Guardian,Guardian Name,Nome della guardia
 DocType: Cheque Print Template,Has Print Format,Ha Formato di stampa
-apps/erpnext/erpnext/accounts/page/pos/pos.js +86, 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 +109,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 +619,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","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/page/pos/pos.js +75, 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 +613,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing 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 +606,Supplier Invoice Date cannot be greater than Posting Date,Fornitore Data fattura non può essere maggiore di Data Pubblicazione
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +609,Supplier Invoice Date cannot be greater than Posting Date,Fornitore Data fattura non può essere maggiore di Data Pubblicazione
 DocType: Purchase Invoice Item,Purchase Order Item,Ordine di acquisto dell&#39;oggetto
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +130,Indirect Income,Proventi indiretti
 DocType: Cheque Print Template,Date Settings,Impostazioni di data
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Varianza
 ,Company Name,Nome Azienda
 DocType: SMS Center,Total Message(s),Messaggio Total ( s )
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +810,Select Item for Transfer,Selezionare la voce per il trasferimento
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +789,Select Item for Transfer,Selezionare la voce per il trasferimento
 DocType: Purchase Invoice,Additional Discount Percentage,Additional Percentuale di sconto
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Visualizzare un elenco di tutti i video di aiuto
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Selezionare conto capo della banca in cui assegno è stato depositato.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Consenti all&#39;utente di modificare Listino cambio nelle transazioni
 DocType: Pricing Rule,Max Qty,Qtà max
-DocType: Student Applicant,Father's Name,Nome del Padre
 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 +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Riga {0}: Pagamento contro vendite / ordine di acquisto deve essere sempre contrassegnato come anticipo
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,chimico
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +686,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/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
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +694,All items have already been transferred for this Production Order.,Tutti gli articoli sono già stati trasferiti per questo ordine di produzione.
 DocType: Process Payroll,Select Payroll Year and Month,Selezionare Payroll Anno e mese
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,Meter,metro
 DocType: Workstation,Electricity Cost,Costo Elettricità
 DocType: HR Settings,Don't send Employee Birthday Reminders,Non inviare Dipendente Birthday Reminders
-DocType: Opportunity,Walk In,Walk In
 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 +12,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: Timesheet Detail,Bill,Conto
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,White,Bianco
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,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
 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 +731,Make ,Fare
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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 .
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Il mio carrello
-apps/erpnext/erpnext/controllers/selling_controller.py +154,Order Type must be one of {0},Tipo ordine deve essere uno dei {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Tipo ordine deve essere uno dei {0}
 DocType: Lead,Next Contact Date,Successivo Contact Data
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Quantità di apertura
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +393,Please enter Account for Change Amount,Si prega di inserire account per quantità di modifica
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,Please enter Account for Change Amount,Si prega di inserire account per quantità di modifica
 DocType: Student Batch,Student Batch Name,Studente Batch Nome
 DocType: Holiday List,Holiday List Name,Nome elenco vacanza
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js +8,Schedule Course,Programma del corso
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Stock Options,Stock Options
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Stock Options
 DocType: Journal Entry Account,Expense Claim,Rimborso Spese
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +211,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 +237,Qty for {0},Quantità per {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +212,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 +238,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
@@ -966,9 +980,9 @@
 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/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Elementi rimossi senza variazione di quantità o valore.
+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 +635,Attribute table is mandatory,Tavolo attributo è obbligatorio
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Tavolo attributo è obbligatorio
 DocType: Production Planning Tool,Get Sales Orders,Ottieni Ordini di Vendita
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{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
@@ -993,7 +1007,7 @@
 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/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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Serial No {0} è sotto contratto di manutenzione fino a {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +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
@@ -1005,7 +1019,7 @@
 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/controllers/selling_controller.py +231,Sales Order {0} is {1},Sales Order {0} è {1}
+apps/erpnext/erpnext/controllers/selling_controller.py +232,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
 DocType: Packing Slip,Net Weight UOM,Peso Netto (UdM)
@@ -1015,25 +1029,24 @@
 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
 DocType: Sales Person,Select company name first.,Selezionare il nome della società prima.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Preventivi ricevuti dai Fornitori.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},Per {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Età media
 DocType: 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/templates/pages/home.html +32,View All Products,Visualizza tutti i prodotti
+apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Visualizza tutti i prodotti
 DocType: Company,Default Currency,Valuta Predefinita
 DocType: Contact,Enter designation of this Contact,Inserisci designazione di questo contatto
 DocType: Expense Claim,From Employee,Da Dipendente
-apps/erpnext/erpnext/controllers/accounts_controller.py +400,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
+apps/erpnext/erpnext/controllers/accounts_controller.py +403,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/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,e anno:
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +191,{0} {1} must be submitted,{0} {1} deve essere presentato
-DocType: Email Digest,Annual Expense,Spesa annua
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,{0} {1} must be submitted,{0} {1} deve essere presentato
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +145,Quantity must be less than or equal to {0},La quantità deve essere minore o uguale a {0}
 DocType: SMS Center,Total Characters,Totale Personaggi
 apps/erpnext/erpnext/controllers/buying_controller.py +156,Please select BOM in BOM field for Item {0},Seleziona BOM BOM in campo per la voce {0}
@@ -1044,30 +1057,31 @@
 DocType: Sales Partner,Distributor,Distributore
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Carrello Regola Spedizione
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +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 +62,Please set 'Apply Additional Discount On',Impostare &#39;Applica ulteriore sconto On&#39;
+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
 DocType: Global Defaults,Global Defaults,Predefiniti Globali
 apps/erpnext/erpnext/projects/doctype/project/project.py +153,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
 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 +327,Capacity Planning Error,Capacity Planning Errore
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,Capacity Planning Errore
 ,Trial Balance for Party,Bilancio di verifica per il partito
 DocType: Lead,Consultant,Consulente
 DocType: Salary Slip,Earnings,Rendimenti
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +362,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/stock/doctype/stock_entry/stock_entry.py +367,Finished Item {0} must be entered for Manufacture type entry,Voce Finito {0} deve essere inserito per il tipo di fabbricazione ingresso
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Apertura bilancio contabile
 DocType: Sales Invoice Advance,Sales Invoice Advance,Fattura di vendita (anticipata)
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +499,Nothing to request,Niente da chiedere
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +500,Nothing to request,Niente da chiedere
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','Data Inizio effettivo' non può essere maggiore di 'Data di fine effettiva'
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Management,Amministrazione
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},È obbligatorio debito o importo del credito per {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,Amministrazione
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +55,Either debit or credit amount is required for {0},È obbligatorio debito o importo del credito per {0}
 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 +161,Blue,Blu
+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
@@ -1077,12 +1091,12 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +23,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/accounts/page/pos/pos.js +1374,Do you really want to submit the invoice?,Vuoi davvero a presentare la fattura?
+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 +685,Cost Center For Item with Item Code ',Centro di costo per articoli con Codice Prodotto '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1526,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Modalità di pagamento non è configurato. Si prega di verificare, se account è stato impostato sulla modalità di pagamento o su POS profilo."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +679,Cost Center For Item with Item Code ',Centro di costo per articoli con Codice Prodotto '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1550,"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/accounts/doctype/account/account_tree.js +26,"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
@@ -1102,104 +1116,106 @@
 DocType: Payment Reconciliation,Unreconciled Payment Details,Non riconciliate Particolari di pagamento
 DocType: Global Defaults,Current Fiscal Year,Anno Fiscale Corrente
 DocType: Global Defaults,Disable Rounded Total,Disabilita Arrotondamento su Totale
-DocType: Lead,Call,Chiama
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +417,'Entries' cannot be empty,'le voci' non possono essere vuote
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +418,'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 +214,Fiscal Year {0} not found,Anno fiscale {0} non trovato
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +221,Fiscal Year {0} not found,Anno fiscale {0} non trovato
 apps/erpnext/erpnext/config/hr.py +238,Setting up Employees,Impostazione dipendenti
 DocType: Sales Order,SO-,COSÌ-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Si prega di selezionare il prefisso prima
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Please select prefix first,Si prega di selezionare il prefisso prima
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Research,ricerca
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,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 +43,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 +57,View Ledger,vista Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,La prima
-apps/erpnext/erpnext/stock/doctype/item/item.py +504,"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 +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/setup/setup_wizard/setup_wizard.py +437,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
 ,Budget Variance Report,Report Variazione Budget
 DocType: Salary Slip,Gross Pay,Paga lorda
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +90,Row {0}: Activity Type is mandatory.,Riga {0}: Tipo Attività è obbligatoria.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +114,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/public/js/controllers/stock_controller.js +40,Accounting Ledger,Libro mastro contabile
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,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
 DocType: BOM Item,Item Description,Descrizione Articolo
+DocType: Student Sibling,Student Sibling,Student Sibling
 DocType: Purchase Invoice,Is Recurring,È ricorrente
 DocType: Purchase Invoice,Supplied Items,Elementi in dotazione
 DocType: Student,STUD.,PERNO.
 DocType: Production Order,Qty To Manufacture,Qtà da Produrre
+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/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 +131,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 +175,Valuation Rate required for Item in row {0},Valutazione tasso richiesto per la voce nella riga {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,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
 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 +87, to ,a
+apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,a
 DocType: Item,Lead Time in days,Tempi di Esecuzione in giorni
 ,Accounts Payable Summary,Conti pagabili Sommario
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Not authorized to edit frozen Account {0},Non autorizzato a modificare account congelati {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,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 +62,Sales Order {0} is not valid,Sales Order {0} non è valido
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Sales Order {0} non è valido
 apps/erpnext/erpnext/setup/doctype/company/company.py +185,"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 +152,Small,Piccolo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,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}
 ,Invoiced Amount (Exculsive Tax),Importo fatturato ( Exculsive Tax)
-DocType: Student Applicant,Mother's / Guardian 1 Email ID,della madre / tutore ID 1 e-mail
 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 +160,Green,Verde
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,Verde
 DocType: Supplier,SUPP-,SUPP-
 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 +57,Contract,contratto
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,contratto
 DocType: Email Digest,Add Quote,Aggiungere Citazione
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +498,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 +503,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 +80,Row {0}: Qty is mandatory,Riga {0}: Quantità è obbligatorio
+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 +737,Sync Master Data,Sync Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +719,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/public/js/setup_wizard.js +283,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
+DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Questo è un gruppo elemento principale e non può essere modificato .
+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: Warehouse,Warehouse Contact Info,Magazzino contatto
 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 +345,"{0}: Employee email not found, hence email not sent","{0}: e-mail dei dipendenti non trovato, quindi non e-mail inviata"
+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
 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 +118,"For {0}, only credit accounts can be linked against another debit entry","Per {0}, solo i conti di credito possono essere collegati contro un'altra voce di addebito"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Delivery Note {0} is not submitted,Consegna Note {0} non è presentata
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Delivery Note {0} is not submitted,Consegna Note {0} non è presentata
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Sub-contracted Item,L'Articolo {0} deve essere di un sub-contratto
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Attrezzature Capital
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Regola Prezzi viene prima selezionato in base al 'applicare sul campo', che può essere prodotto, Articolo di gruppo o di marca."
 DocType: Hub Settings,Seller Website,Venditore Sito
 DocType: Item,ITEM-,ARTICOLO-
-apps/erpnext/erpnext/controllers/selling_controller.py +147,Total allocated percentage for sales team should be 100,Totale percentuale assegnato per il team di vendita dovrebbe essere di 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +110,Production Order status is {0},Stato ordine di produzione è {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Totale percentuale assegnato per il team di vendita dovrebbe essere di 100
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Stato ordine di produzione è {0}
 DocType: Appraisal Goal,Goal,Obiettivo
 DocType: Sales Invoice Item,Edit Description,Modifica Descrizione
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +757,For Supplier,per Fornitore
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +723,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
@@ -1215,10 +1231,11 @@
 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
 DocType: Workstation,Workstation Name,Nome workstation
+DocType: Grade Interval,Grade Code,Codice grado
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email di Sintesi:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +445,BOM {0} does not belong to Item {1},BOM {0} non appartiene alla voce {1}
 DocType: Sales Partner,Target Distribution,Distribuzione di destinazione
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1667,Deafault warehouse is required for selected item,magazzino deafault è richiesto per l&#39;elemento selezionato
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Deafault warehouse is required for selected item,magazzino deafault è richiesto per l&#39;elemento selezionato
 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
@@ -1227,23 +1244,23 @@
 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 +110,Hardware,Hardware
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,Hardware
 DocType: Sales Order,Recurring Upto,ricorrente Fino
 DocType: Attendance,HR Manager,HR Manager
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Seleziona una società
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Privilege Leave,Lascia Privilege
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,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 +79,You need to enable Shopping Cart,È necessario abilitare Carrello
 DocType: Payment Entry,Writeoff,Cancellare
 DocType: Appraisal Template Goal,Appraisal Template Goal,Valutazione Modello Obiettivo
-DocType: Salary Slip,Earning,Rendimento
+DocType: Salary Component,Earning,Rendimento
 DocType: Purchase Invoice,Party Account Currency,Partito Conto Valuta
 ,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 +171,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 +174,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_data.py +358,Food,cibo
+apps/erpnext/erpnext/demo/setup/setup_data.py +301,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/course_schedule/course_schedule.js +103,Mark Attendence,Mark Attendence
@@ -1277,12 +1294,12 @@
 DocType: Sales Order Item,Planned Quantity,Prevista Quantità
 DocType: Purchase Invoice Item,Item Tax Amount,Articolo fiscale Ammontare
 DocType: Item,Maintain Stock,Scorta da mantenere
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +209,Stock Entries already created for Production Order ,Le voci di archivio già creati per ordine di produzione
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,Le voci di archivio già creati per ordine di produzione
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,Variazione netta delle immobilizzazioni
 DocType: Leave Control Panel,Leave blank if considered for all designations,Lasciare vuoto se considerato per tutte le designazioni
-apps/erpnext/erpnext/controllers/accounts_controller.py +620,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 +238,Max: {0},Max: {0}
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +15,From Datetime,Da Datetime
+apps/erpnext/erpnext/controllers/accounts_controller.py +623,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 +239,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 +153,"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."
@@ -1290,8 +1307,8 @@
 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 +552,cannot be greater than 100,non può essere superiore a 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +680,Item {0} is not a stock Item,L'articolo {0} non è in Giagenza
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +546,cannot be greater than 100,non può essere superiore a 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,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
@@ -1305,10 +1322,9 @@
 DocType: GL Entry,GL Entry,GL Entry
 DocType: HR Settings,Employee Settings,Impostazioni dipendente
 ,Batch-Wise Balance History,Cronologia Bilanciamento Lotti-Wise
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,To Do List
 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 +61,Apprentice,apprendista
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +102,Negative Quantity is not allowed,Quantità negative non è consentito
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,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"
@@ -1330,15 +1346,14 @@
 DocType: Asset,Asset Name,Asset Nome
 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 +141,Source warehouse is mandatory for row {0},Magazzino Source è obbligatorio per riga {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +719,Packing Slip,Documento di trasporto
+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 +713,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/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,Richiesta di offerta può essere l&#39;accesso cliccando seguente link
 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 +81,Analyst,analista
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,analista
 DocType: Item,Inventory,Inventario
 DocType: Item,Sales Details,Dettagli di vendita
 DocType: Quality Inspection,QI-,Qi-
@@ -1346,7 +1361,7 @@
 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 +103,Government,Governo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,Governo
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,Nome Istituto
 apps/erpnext/erpnext/config/stock.py +289,Item Variants,Varianti Voce
 DocType: Company,Services,Servizi
@@ -1362,6 +1377,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,Financial Year Start Date,Esercizio Data di inizio
 DocType: POS Profile,Apply Discount,applicare Sconto
 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
 DocType: Program Course,Program Course,programma del Corso
@@ -1402,12 +1418,12 @@
 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
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +110,Accounting Entry for {0} can only be made in currency: {1},Ingresso contabile per {0} può essere fatta solo in valuta: {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Ingresso contabile per {0} può essere fatta solo in valuta: {1}
 DocType: Pricing Rule,Pricing Rule,Regola Prezzi
 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: Shopping Cart Settings,Payment Success URL,Pagamento Successo URL
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +78,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: restituito Voce {1} non esiste in {2} {3}
+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
@@ -1416,40 +1432,39 @@
 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/stock/doctype/stock_entry/stock_entry.py +339,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Non è consentito trasferire più {0} di {1} per Ordine d'Acquisto {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +344,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 +545,Manufacturing Quantity is mandatory,La quantità da produrre è obbligatoria
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,La quantità da produrre è obbligatoria
 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 +71,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 +162,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/projects/doctype/timesheet/timesheet.py +186,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
 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 +130,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 +137,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
 DocType: Dependent Task,Dependent Task,Task dipendente
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,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/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 +190,Leave of type {0} cannot be longer than {1},Lascia di tipo {0} non può essere superiore a {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +197,Leave of type {0} cannot be longer than {1},Lascia di tipo {0} non può essere superiore a {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Provare le operazioni per X giorni in programma in anticipo.
 DocType: HR Settings,Stop Birthday Reminders,Arresto Compleanno Promemoria
 DocType: SMS Center,Receiver List,Lista Ricevitore
-apps/erpnext/erpnext/accounts/page/pos/pos.js +921,Search Item,Cerca articolo
+apps/erpnext/erpnext/accounts/page/pos/pos.js +910,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 +546,Already completed,Già completato
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +22,Payment Request already exists {0},Richiesta di pagamento già esistente {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +550,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 +241,Quantity must not be more than {0},Quantità non deve essere superiore a {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Quantity must not be more than {0},Quantità non deve essere superiore a {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +76,Previous Financial Year is not closed,Precedente Esercizio non è chiuso
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +44,Age (Days),Età (Giorni)
 DocType: Quotation Item,Quotation Item,Preventivo Articolo
@@ -1466,7 +1481,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +221,Purchase Receipt {0} is not submitted,Acquisto Ricevuta {0} non è presentata
 DocType: Company,Default Payable Account,Conto da pagare Predefinito
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Impostazioni per in linea carrello della spesa, come le regole di trasporto, il listino prezzi ecc"
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +83,{0}% Billed,{0}% Fatturato
+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
@@ -1478,12 +1493,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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/schools/doctype/fees/fees.js +22,Collect,Collezionare
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Collezionare
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,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 +225,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
-DocType: Payment Reconciliation,Payments,Pagamenti
 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
@@ -1495,7 +1509,7 @@
 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 +9,Procurement,Approvvigionamento
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,Nessuno articolo ha modifiche in termini di quantità o di valore.
+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
 ,Lead Details,Dettagli Lead
 DocType: Purchase Invoice,End date of current invoice's period,Data di fine del periodo di fatturazione corrente
@@ -1520,7 +1534,7 @@
 DocType: Purchase Invoice,Additional Discount,Sconto aggiuntivo
 DocType: Selling Settings,Selling Settings,Vendere Impostazioni
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Aste online
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +97,Please specify either Quantity or Valuation Rate or both,Si prega di specificare Quantitativo o Tasso di valutazione o di entrambi
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,Si prega di specificare Quantitativo o Tasso di valutazione o di entrambi
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +13,Fulfillment,Compimento
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Società , mese e anno fiscale è obbligatoria"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Spese di Marketing
@@ -1541,14 +1555,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,Installazione ERPNext completa!
 DocType: Item,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +93,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Esiste un Gruppo Clienti con lo stesso nome, per favore cambiare il nome del Cliente o rinominare il Gruppo Clienti"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +126,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
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},Partito Tipo e partito è richiesto per Crediti / Debiti conto {0}
 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
@@ -1559,7 +1572,7 @@
 ,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 +704,Offline,disconnesso
+apps/erpnext/erpnext/accounts/page/pos/pos.js +686,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
@@ -1577,25 +1590,27 @@
 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
 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 +858,Make Purchase Order,Crea ordine d'acquisto
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +852,Make Purchase Order,Crea ordine d'acquisto
 DocType: SMS Center,Send To,Invia a
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,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 +148,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
 DocType: Stock Reconciliation,Stock Reconciliation,Riconciliazione Giacenza
 DocType: Territory,Territory Name,Territorio Nome
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +172,Work-in-Progress Warehouse is required before Submit,Work- in- Progress Warehouse è necessario prima Submit
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,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: Supplier,Statutory info and other general information about your Supplier,Sindaco informazioni e altre informazioni generali sulla tua Fornitore
-apps/erpnext/erpnext/hooks.py +88,Addresses,Indirizzi
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Fornitore&gt; Tipo Fornitore
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +212,Against Journal Entry {0} does not have any unmatched {1} entry,Contro diario {0} non ha alcun ineguagliata {1} entry
+apps/erpnext/erpnext/hooks.py +95,Addresses,Indirizzi
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +215,Against Journal Entry {0} does not have any unmatched {1} entry,Contro diario {0} non ha alcun ineguagliata {1} entry
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,perizie
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Inserito Numero di Serie duplicato per l'articolo {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Una condizione per una regola di trasporto
+DocType: Grading Structure,Grading Intervals,Intervalli di classificazione
+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
 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).
 DocType: Sales Order,To Deliver and Bill,Per Consegnare e Bill
@@ -1603,11 +1618,10 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,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 +731,Payment,Versamento
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,Payment,Versamento
 DocType: Production Order Operation,Actual Time and Cost,Tempo reale e costi
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Richiesta materiale di massimo {0} può essere fatto per la voce {1} contro Sales Order {2}
 DocType: Employee,Salutation,Appellativo
-DocType: Pricing Rule,Brand,Marca
 DocType: Course,Course Abbreviation,Abbreviazione corso
 DocType: Item,Will also apply for variants,Si applica anche per le varianti
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +142,"Asset cannot be cancelled, as it is already {0}","Asset non può essere annullato, in quanto è già {0}"
@@ -1619,7 +1633,7 @@
 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 .
 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 +85,Associate,Associate
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,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
@@ -1627,7 +1641,7 @@
 DocType: Production Planning Tool,Material Requests,Richieste di materiale
 DocType: Warranty Claim,Issue Date,Data di Emissione
 DocType: Activity Cost,Activity Cost,Costo attività
-DocType: Timesheet Detail,Timesheet Detail,Particolare timesheet
+DocType: Sales Invoice Timesheet,Timesheet Detail,Particolare timesheet
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Q.tà Consumata
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telecomunicazioni
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indica che il pacchetto è una parte di questa consegna (solo Bozza)
@@ -1650,6 +1664,7 @@
 DocType: Production Plan Material Request,Material Request Date,Materiale richiesta Data
 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
 DocType: Item,Has Variants,Ha varianti
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nome della distribuzione mensile
 DocType: Sales Person,Parent Sales Person,Parent Sales Person
@@ -1662,31 +1677,32 @@
 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 +44,"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/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.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +502,Error: {0} &gt; {1},Errore: {0}&gt; {1}
 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/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.
 DocType: Naming Series,Current Value,Valore Corrente
-apps/erpnext/erpnext/controllers/accounts_controller.py +235,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/controllers/accounts_controller.py +238,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
 DocType: Delivery Note Item,Against Sales Order,Contro Sales Order
 ,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 +458,Item table can not be blank,Tavolo articolo non può essere vuoto
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +443,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}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +5,This is based on stock movement. See {0} for details,Questo si basa sul movimento magazzino. Vedere {0} per i dettagli
 DocType: Pricing Rule,Selling,Vendite
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +341,Amount {0} {1} deducted against {2},Importo {0} {1} dedotto contro {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +344,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
@@ -1701,8 +1717,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +144,Cannot refer row number greater than or equal to current row number for this Charge type,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 +159,Red,Rosso
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Si prega di cliccare su ' Generate Schedule ' a prendere Serial No aggiunto per la voce {0}
+apps/erpnext/erpnext/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)
@@ -1710,7 +1726,7 @@
 DocType: Installation Note,Installation Time,Tempo di installazione
 DocType: Sales Invoice,Accounting Details,Dettagli contabile
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,Eliminare tutte le Operazioni per questa Azienda
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +187,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Row # {0}: Operazione {1} non è completato per {2} qty di prodotti finiti in ordine di produzione # {3}. Si prega di aggiornare lo stato di funzionamento tramite registri Tempo
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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,Row # {0}: Operazione {1} non è completato per {2} qty di prodotti finiti in ordine di produzione # {3}. Si prega di aggiornare lo stato di funzionamento tramite registri Tempo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,Investimenti
 DocType: Issue,Resolution Details,Dettagli risoluzione
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,Accantonamenti
@@ -1746,16 +1762,17 @@
 DocType: Bank Reconciliation Detail,Against Account,Previsione Conto
 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}
 DocType: Delivery Note,Excise Page Number,Accise Numero Pagina
 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)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Amount {0} {1} against {2} {3},Importo {0} {1} contro {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +339,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 +138,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 +295,Debit To account must be a Receivable account,Debito Per account deve essere un account di Credito
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Receivable account,Debito Per account deve essere un account di Credito
 DocType: Shipping Rule Condition,Shipping Amount,Importo spedizione
 ,Pending Amount,In attesa di Importo
 DocType: Purchase Invoice Item,Conversion Factor,Fattore di Conversione
@@ -1763,10 +1780,10 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +137,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à
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +90,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Totale foglie assegnati {0} non può essere inferiore a foglie già approvati {1} per il periodo
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +93,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 +22,Enter Paid Amount,Inserisci Importo pagato
+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
@@ -1776,13 +1793,15 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,schede attività
 DocType: HR Settings,HR Settings,Impostazioni HR
 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 +524,"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."
+apps/erpnext/erpnext/controllers/accounts_controller.py +527,"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 +249,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
 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/stock/get_item_details.py +123,Please specify Company,Si prega di specificare Azienda
 ,Customer Acquisition and Loyalty,Acquisizione e fidelizzazione dei clienti
@@ -1793,17 +1812,19 @@
 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 +183,Closing (Opening + Totals),Chiusura (apertura + totali)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),Chiusura (apertura + totali)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Si prega di specificare la valuta in azienda
 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/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
-apps/erpnext/erpnext/controllers/accounts_controller.py +272,Account {0} is invalid. Account Currency must be {1},Account {0} non valido. La valuta del conto deve essere {1}
+DocType: Email Digest,Pending Sales Orders,In attesa di ordini di vendita
+apps/erpnext/erpnext/controllers/accounts_controller.py +275,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 +956,"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 Slip,Deduction,Deduzioni
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +87,Row {0}: From Time and To Time is mandatory.,Riga {0}: From Time To Time ed è obbligatoria.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +969,"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 +111,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 +262,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 +7,Please enter Employee Id of this sales person,Inserisci ID dipendente di questa persona di vendite
@@ -1811,7 +1832,7 @@
 DocType: Project,% Tasks Completed,% Attività Completate
 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
 DocType: Project,Gross Margin,Margine lordo
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +194,Please enter Production Item first,Inserisci Produzione articolo prima
+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
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Quotazione
@@ -1820,53 +1841,54 @@
 DocType: Maintenance Visit,Maintenance User,Manutenzione utente
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +149,Cost Updated,Costo Aggiornato
 DocType: Employee,Date of Birth,Data Compleanno
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +86,Item {0} has already been returned,L'articolo {0} è già stato restituito
+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}
+DocType: Student Admission,Eligibility,Eleggibilità
 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 +177,Job Description,Descrizione Del Lavoro
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,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 +126,"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 +127,"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."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +24,Welcome to POS: Create your POS Profile,Benvenuti al POS: Crea il tuo profilo POS
 DocType: Expense Claim,Approver,Responsabile / Approvatore
 ,SO Qty,SO Quantità
+DocType: Guardian,Work Address,Indirizzo di lavoro
 DocType: Appraisal,Calculate Total Score,Calcolare il punteggio totale
 DocType: Request for Quotation,Manufacturing Manager,Responsabile di produzione
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serial No {0} è in garanzia fino a {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +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 +74,Shipments,Spedizioni
+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
 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 +153,Row # ,Row #
+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 +156,Get From,Ottieni da
+apps/erpnext/erpnext/public/js/utils.js +167,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 +167,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 +416,"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"
+apps/erpnext/erpnext/controllers/accounts_controller.py +419,"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
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} is disabled,Utente {0} è disattivato
 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 ...
 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 +171,"Types of employment (permanent, contract, intern etc.).","Tipi di occupazione (permanente , contratti , ecc intern ) ."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +346,{0} is mandatory for Item {1},{0} è obbligatorio per la voce {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,{0} is mandatory for Item {1},{0} è obbligatorio per la voce {1}
 DocType: Currency Exchange,From Currency,Da Valuta
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Seleziona importo assegnato, Tipo fattura e fattura numero in almeno uno di fila"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,Costo del nuovo acquisto
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},Ordine di vendita necessaria per la voce {0}
 DocType: Purchase Invoice Item,Rate (Company Currency),Tariffa (Valuta Azienda)
-apps/erpnext/erpnext/demo/setup_data.py +360,Others,Altri
+DocType: Student Guardian,Others,Altri
 DocType: Payment Entry,Unallocated Amount,quantità non assegnata
 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
@@ -1886,17 +1908,16 @@
 apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,Serialized Inventario
 DocType: Activity Type,Default Billing Rate,Predefinito fatturazione Tasso
 DocType: Sales Invoice,Total Billing Amount,Importo totale di fatturazione
-apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +54,Receivable Account,Conto Crediti
-apps/erpnext/erpnext/controllers/accounts_controller.py +546,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} è già {2}
+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 +549,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 +79,CEO,Amministratore delegato
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,Amministratore delegato
 DocType: Expense Claim Detail,Expense Claim Detail,Dettaglio Rimborso Spese
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +808,Please select correct account,Seleziona account corretto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +809,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
-DocType: Purchase Invoice Item,Page Break,Interruzione di pagina
 DocType: Production Order Operation,Pending,In attesa
 DocType: Course,Course Name,Nome del corso
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Gli utenti che possono approvare le applicazioni lasciare un specifico del dipendente
@@ -1905,14 +1926,15 @@
 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 +54,Full-time,Tempo pieno
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,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: Student,Guardians,Guardiani
 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 +289,Debit To is required,Debito A è richiesto
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +321,Debit To is required,Debito A è richiesto
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Acquisto Listino Prezzi
 DocType: Offer Letter Term,Offer Term,Termine Offerta
 DocType: Quality Inspection,Quality Manager,Responsabile Qualità
@@ -1920,6 +1942,7 @@
 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/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
@@ -1930,18 +1953,17 @@
 DocType: Production Order Operation,Completed Qty,Q.tà Completata
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"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 +273,Price List {0} is disabled,Prezzo di listino {0} è disattivato
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +99,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/projects/doctype/timesheet/timesheet.py +123,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
 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}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Corrente Tasso di Valutazione
 DocType: Item,Customer Item Codes,Codici Voce clienti
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,Guadagno Exchange / Perdita
 DocType: Opportunity,Lost Reason,Perso Motivo
-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/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/purchase_receipt/purchase_receipt.py +378,All items have already been invoiced,Tutti gli articoli sono già stati fatturati
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +379,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
@@ -1957,18 +1979,19 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,I vostri clienti
 apps/erpnext/erpnext/projects/doctype/project/project.py +141,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/job_opening.html +19,Apply Now,Applica ora
+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 ."
 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
-apps/erpnext/erpnext/utilities/doctype/address/address.py +164,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: Fee Structure,Fee Structure,Fee Struttura
 DocType: Timesheet Detail,Costing Amount,Costing Importo
+DocType: Student Admission,Application Fee,Tassa d&#39;iscrizione
 DocType: Process Payroll,Submit Salary Slip,Invia Stipendio slittamento
-apps/erpnext/erpnext/controllers/selling_controller.py +161,Maxiumm discount for Item {0} is {1}%,Sconto Maxiumm per la voce {0} {1} %
+apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,Sconto Maxiumm per la voce {0} {1} %
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Importazione Collettiva
 DocType: Sales Partner,Address & Contacts,Indirizzi & Contatti
 DocType: SMS Log,Sender Name,Nome mittente
@@ -1993,21 +2016,21 @@
 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_data.py +361,Travel,viaggi
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +155,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 +304,Travel,viaggi
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +167,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 +23,Update Cost,aggiornamento dei costi
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,aggiornamento dei costi
 DocType: Item Reorder,Item Reorder,Articolo riordino
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +36,Show Salary Slip,Visualizza foglio paga
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +748,Transfer Material,Material Transfer
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +53,Show Salary Slip,Visualizza foglio paga
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +166,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 +923,Please set recurring after saving,Si prega di impostare ricorrenti dopo il salvataggio
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +646,Select change amount account,conto importo Selezionare cambiamento
+apps/erpnext/erpnext/public/js/controllers/transaction.js +914,Please set recurring after saving,Si prega di impostare ricorrenti dopo il salvataggio
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +703,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
@@ -2019,31 +2042,32 @@
 DocType: Quality Inspection,Verified By,Verificato da
 DocType: Address,Subsidiary,Sussidiario
 apps/erpnext/erpnext/setup/doctype/company/company.py +64,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","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: Quality Inspection,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 +33,Traceability,tracciabilità
 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 +352,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Quantità in riga {0} ( {1} ) deve essere uguale quantità prodotta {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Quantità in riga {0} ( {1} ) deve essere uguale quantità prodotta {2}
 DocType: Appraisal,Employee,Dipendente
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Invita come utente
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} è completamente fatturato
 DocType: Workstation Working Hour,End Time,Ora fine
 DocType: Payment Entry,Payment Deductions or Loss,Deduzioni di pagamento o la perdita
-apps/erpnext/erpnext/config/schools.py +100,LMS,LMS
+apps/erpnext/erpnext/config/schools.py +104,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/config/crm.py +6,Sales Pipeline,pipeline di vendita
 DocType: Student Batch Student,Student Batch Student,Student Batch Student
-DocType: Sales Invoice,Mass Mailing,Mass Mailing
+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 +199,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/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 +297,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 +111,Pharmaceutical,farmaceutico
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +309,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/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
@@ -2058,27 +2082,28 @@
 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 +814,Please specify Company to proceed,Si prega di specificare Società di procedere
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +793,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 +44,Compensatory Off,compensativa Off
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,compensativa Off
 DocType: Quality Inspection Reading,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.
 DocType: Room,Room Number,Numero di Camera
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Riferimento non valido {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +161,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) non può essere superiore alla quantità pianificata ({2}) nell'ordine di produzione {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +162,{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 +217,Raw Materials cannot be blank.,Materie prime non può essere vuoto.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,"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 +460,Quick Journal Entry,Breve diario
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +111,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/accounts/doctype/sales_invoice/sales_invoice.py +441,"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 +450,Quick Journal Entry,Breve diario
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +103,You can not change rate if BOM mentioned agianst any item,Non è possibile cambiare tariffa se la distinta (BOM) è già assegnata a un articolo
 DocType: Employee,Previous Work Experience,Lavoro precedente esperienza
 DocType: Stock Entry,For Quantity,Per Quantità
 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 +214,{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
 ,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.
@@ -2087,16 +2112,17 @@
 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 +398,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
 ,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 +739,Item or Warehouse for row {0} does not match Material Request,Voce o Magazzino per riga {0} non corrisponde Material Request
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +747,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
 DocType: Fiscal Year,Year End Date,Data di fine anno
 DocType: Task Depends On,Task Depends On,Attività dipende
-DocType: Lead,Opportunity,Opportunità
+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
@@ -2109,7 +2135,7 @@
 DocType: Student,Joining Date,Unire Data
 ,Employees working on a holiday,I dipendenti che lavorano in un giorno festivo
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Mark Presente
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},La data di inizio manutenzione non può essere precedente alla consegna del Serial No {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},La data di inizio manutenzione non può essere precedente alla consegna del Serial No {0}
 DocType: Production Order,Actual End Date,Data di fine effettiva
 DocType: Purchase Invoice,PINV-,PINV-
 DocType: Authorization Rule,Applicable To (Role),Applicabile a (Ruolo)
@@ -2124,7 +2150,7 @@
 DocType: SMS Log,No of Requested SMS,Num. di SMS richiesto
 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 +729,Please supply the specified items at the best possible rates,Si prega di fornire gli elementi specificati ai migliori prezzi possibili
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +695,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 +117,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-
@@ -2133,7 +2159,7 @@
 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)
-apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +14,This is an example website auto-generated from ERPNext,Questo è un sito di esempio generato automaticamente da ERPNext
+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.
 
@@ -2180,13 +2206,14 @@
 DocType: Purchase Receipt Item,Recd Quantity,RECD Quantità
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +54,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 +103,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 +504,Stock Entry {0} is not submitted,Giacenza {0} non inserita
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Non può produrre più Voce {0} di Sales Order quantità {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +505,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à
 DocType: Salary Component Account,Salary Component Account,Conto Stipendio Componente
 DocType: Global Defaults,Hide Currency Symbol,Nascondi Simbolo Valuta
 apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card","p. es. Banca, Bonifico, Contanti, Carta di credito"
+DocType: Lead Source,Source Name,Source Name
 DocType: Journal Entry,Credit Note,Nota Credito
 DocType: Warranty Claim,Service Address,Service Indirizzo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furnitures and Fixtures,Mobili e Infissi
@@ -2198,6 +2225,7 @@
 DocType: Opportunity,Customer / Lead Name,Nome Cliente / Contatto
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +89,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/controllers/trends.py +19,Total(Qty),Totale (Quantità)
 DocType: Sales Invoice,This Document,Questo documento
@@ -2209,15 +2237,15 @@
 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 +176,Organization branch master.,Ramo Organizzazione master.
-apps/erpnext/erpnext/controllers/accounts_controller.py +273, or ,oppure
+apps/erpnext/erpnext/controllers/accounts_controller.py +276, or ,oppure
 DocType: Sales Order,Billing Status,Stato Fatturazione
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Segnala un problema
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,Spese Utility
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-Sopra
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +203,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: diario {1} non ha conto {2} o già confrontato con un altro buono
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +206,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 +90,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 +93,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
@@ -2245,8 +2273,8 @@
 DocType: Product Bundle,Parent Item,Parent Item
 DocType: Account,Account Type,Tipo di account
 DocType: Delivery Note,DN-RET-,DN-RET-
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +115,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 +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Programma di manutenzione non generato per tutte le voci. Rieseguire 'Genera Programma'
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +118,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 +163,"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"
@@ -2258,13 +2286,13 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +32,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 +748,Delivery,Recapito
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +742,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à
 DocType: Payment Entry,Total Allocated Amount,Totale importo assegnato
 DocType: Item Reorder,Material Request Type,Tipo di richiesta materiale
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +82,Row {0}: UOM Conversion Factor is mandatory,Riga {0}: UOM fattore di conversione è obbligatoria
+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
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Voucher #
@@ -2275,13 +2303,13 @@
 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 +90,Head of Marketing and Sales,Responsabile Marketing e Vendite
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Tassazione Proventi
+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 +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.
 DocType: Item Supplier,Item Supplier,Articolo Fornitore
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +403,Please enter Item Code to get batch no,Inserisci il codice Item per ottenere lotto non
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +770,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 +397,Please enter Item Code to get batch no,Inserisci il codice Item per ottenere lotto non
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +764,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"
@@ -2293,28 +2321,29 @@
 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 +100,Issues,Questioni
+apps/erpnext/erpnext/hooks.py +109,Issues,Questioni
 apps/erpnext/erpnext/controllers/status_updater.py +13,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
 ,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
 DocType: Supplier,Billing Currency,Fatturazione valuta
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Large,Extra Large
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Extra Large,Extra Large
 ,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 +507,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 +107,Local,Locale
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +508,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/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 +154,Large,Grande
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Large,Grande
 DocType: Homepage Featured Product,Homepage Featured Product,Homepage prodotto in vetrina
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Nuovo nome Magazzino
-apps/erpnext/erpnext/accounts/report/financial_statements.py +225,Total {0} ({1}),Totale {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +224,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
@@ -2372,9 +2401,9 @@
 DocType: Attendance,Leave Type,Lascia Tipo
 apps/erpnext/erpnext/controllers/stock_controller.py +173,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/hr/doctype/salary_slip/salary_slip.py +79,Name error: {0},Nome di errore: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +90,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 +178,{0} {1} does not associated with {2} {3},{0} {1} non associata a {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +181,{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)
 DocType: Warehouse,Parent Warehouse,Magazzino Parent
@@ -2393,7 +2422,7 @@
 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
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,Atleast un elemento deve essere introdotto con quantità negativa nel documento ritorno
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Atleast one item should be entered with negative quantity in return document,Atleast un elemento deve essere introdotto con quantità negativa nel documento ritorno
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operazione {0} più di tutte le ore di lavoro disponibili a workstation {1}, abbattere l&#39;operazione in più operazioni"
 ,Requested,richiesto
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +83,No Remarks,Nessun Commento
@@ -2405,46 +2434,46 @@
 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/stock/doctype/purchase_receipt/purchase_receipt.py +98,Quality Inspection required for Item {0},Controllo qualità richiesta per la voce {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,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
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Gestire territorio ad albero
 DocType: Journal Entry Account,Sales Invoice,Fattura di Vendita
 DocType: Journal Entry Account,Party Balance,Balance Partito
-apps/erpnext/erpnext/accounts/page/pos/pos.js +475,Please select Apply Discount On,Si prega di selezionare Applica sconto su
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +92,Salary Slip Created,Retribuzione slittamento Creato
+apps/erpnext/erpnext/accounts/page/pos/pos.js +464,Please select Apply Discount On,Si prega di selezionare Applica sconto su
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +95,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
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,Percentuale di sconto può essere applicato sia contro un listino prezzi o per tutti Listino.
 DocType: Purchase Invoice,Half-yearly,Semestrale
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +384,Accounting Entry for Stock,Voce contabilità per giacenza
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +387,Accounting Entry for Stock,Voce contabilità per giacenza
 DocType: Sales Invoice,Sales Team1,Vendite Team1
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,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 +96,Row {0}: Completed Qty must be greater than zero.,Riga {0}: Quantità compilato deve essere maggiore di zero.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +120,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 +88,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Impossibile restituire più di {1} per la voce {2}
+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
 DocType: Item Group,Show this slideshow at the top of the page,Mostra questo slideshow in cima alla pagina
 DocType: BOM,Item UOM,Articolo UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Fiscale Ammontare Dopo Ammontare Sconto (Società valuta)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +147,Target warehouse is mandatory for row {0},Magazzino di destinazione è obbligatoria per riga {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +141,Target warehouse is mandatory for row {0},Magazzino di destinazione è obbligatoria per riga {0}
 DocType: Cheque Print Template,Primary Settings,Impostazioni primarie
 DocType: Purchase Invoice,Select Supplier Address,Selezione indirizzo del fornitore
 DocType: Quality Inspection,Quality Inspection,Controllo Qualità
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Extra Small,Extra Small
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +194,Account {0} is frozen,Il Conto {0} è congelato
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Extra Small
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +690,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 +197,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 +606,Can only make payment against unbilled {0},Posso solo effettuare il pagamento non ancora fatturate contro {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +126,Commission rate cannot be greater than 100,Tasso Commissione non può essere superiore a 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +609,Can only make payment against unbilled {0},Posso solo effettuare il pagamento non ancora fatturate contro {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,Tasso Commissione non può essere superiore a 100
 DocType: Stock Entry,Subcontract,Subappaltare
 apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,Si prega di inserire {0} prima
 DocType: Production Order Operation,Actual End Time,Ora di fine effettiva
@@ -2455,30 +2484,30 @@
 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 +158,Colour,Colore
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,Colore
 DocType: Maintenance Visit,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"
 DocType: Student Log,Academic,Accademico
-apps/erpnext/erpnext/controllers/accounts_controller.py +469,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Anticipo totale ({0}) contro l&#39;ordine {1} non può essere superiore al totale complessivo ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +472,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Anticipo totale ({0}) contro l&#39;ordine {1} non può essere superiore al totale complessivo ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Selezionare distribuzione mensile per distribuire in modo non uniforme obiettivi attraverso mesi.
 DocType: Purchase Invoice Item,Valuation Rate,Tasso Valutazione
+DocType: Stock Reconciliation,SR/,SR /
 apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,Listino Prezzi Valuta non selezionati
 DocType: Assessment,Results,risultati
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +168,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 +175,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: Student Applicant,Father's/ Guardian 2 Email ID,Padre / guardiano ID 2 e-mail
 DocType: Maintenance Visit Purpose,Against Document No,Per Documento N
 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 +228,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 +231,Warehouses with existing transaction can not be converted to group.,Magazzini con transazione esistenti non possono essere convertiti in gruppo.
 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 +93,Researcher,ricercatore
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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.
@@ -2490,25 +2519,25 @@
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Per la comodità dei clienti, questi codici possono essere utilizzati in formati di stampa, come fatture e bolle di consegna"
 DocType: Sales Invoice,Time Sheet List,Tempo Lista Sheet
 DocType: Employee,You can enter any date manually,È possibile immettere qualsiasi data manualmente
-DocType: Sales Invoice,Advertisement,Pubblicità
 DocType: Asset Category Account,Depreciation Expense Account,Ammortamento spese account
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Probationary Period,Periodo Di Prova
-apps/erpnext/erpnext/hooks.py +102,Announcements,Annunci
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Periodo Di Prova
+apps/erpnext/erpnext/hooks.py +111,Announcements,Annunci
 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 +109,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 +16,To Datetime,Per Data Ora
+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/scheduling_tool/scheduling_tool.py +51,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/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Attività in sospeso
+DocType: Accounts Settings,Make Payment via Journal Entry,Effettuare il pagamento via voce diario
+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 +127,Please enter relieving date.,Inserisci la data alleviare .
-apps/erpnext/erpnext/controllers/trends.py +145,Amt,Amt
+apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,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 +26,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
@@ -2526,14 +2555,15 @@
 apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1},Impossibile trovare il tasso di cambio per {0} a {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Mark Mezza giornata
 DocType: Sales Invoice,Sales Team,Team di vendita
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Duplicate entry,Duplicate entry
+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 +490,[Error],[Errore]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +484,[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
 apps/erpnext/erpnext/controllers/status_updater.py +175,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.
 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
@@ -2549,22 +2579,22 @@
 ,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 +25,All Jobs,tutti i lavori
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,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
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Amount {0} {1} {2} {3},Importo {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Amount {0} {1} {2} {3},Importo {0} {1} {2} {3}
 DocType: Account,Depreciation,ammortamento
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Fornitore (s)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Impiegato presenze Strumento
 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 +372,Payment Entries {0} are un-linked,Le voci di pagamento {0} sono non-linked
+apps/erpnext/erpnext/accounts/utils.py +449,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
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +497,Material Requests {0} created,Richieste di materiale {0} creato
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +498,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.
 DocType: Purchase Invoice,Address and Contact,Indirizzo e contatto
@@ -2603,7 +2633,7 @@
 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 +848,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 +859,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 +233,Closing (Dr),Chiusura (Dr)
 DocType: Cheque Print Template,Cheque Size,Assegno Size
@@ -2624,7 +2654,8 @@
 ,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.
-apps/erpnext/erpnext/controllers/accounts_controller.py +555,'Update Stock' cannot be checked for fixed asset sale,&#39;Aggiornamento della&#39; non può essere controllato per vendita asset fissi
+DocType: Student Guardian,Father,Padre
+apps/erpnext/erpnext/controllers/accounts_controller.py +558,'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
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Ricevi aggiornamenti
 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
@@ -2634,15 +2665,15 @@
 DocType: Sales Order,Fully Delivered,Completamente Consegnato
 DocType: Lead,Lower Income,Reddito più basso
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","La testa account con responsabilità, in cui sarà prenotato Utile / Perdita"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +166,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 +238,"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 +81,Purchase Order number required for Item {0},Numero ordine di acquisto richiesto per la voce {0}
+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/purchase_receipt/purchase_receipt.py +82,Purchase Order number required for Item {0},Numero ordine di acquisto richiesto per la voce {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',' Dalla Data' deve essere successivo a 'Alla Data'
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +17,Cannot change status as student {0} is linked with student application {1},Impossibile cambiare status di studente {0} è collegata con l&#39;applicazione studente {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +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: Timesheet,"List of employee which has ""Salary Slip Based on Timesheet"" is enabled in salary structure.",Elenco dei dipendenti che ha &quot;foglio paga base di scheda attività&quot; è attivata nella struttura di stipendio.
 DocType: Asset,Fully Depreciated,completamente ammortizzato
 ,Stock Projected Qty,Qtà Prevista Giacenza
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Customer {0} does not belong to project {1},Cliente {0} non appartiene a proiettare {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,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
 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
@@ -2654,7 +2685,7 @@
 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/patches/v7_0/create_warehouse_nestedset.py +55,All Warehouses,tutti i Magazzini
+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 +105,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
@@ -2666,10 +2697,10 @@
 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/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Crea Busta paga
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +26,Browse BOM,Sfoglia BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,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/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 Year,Academic Year,Anno accademico
+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à
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,Valutazione
@@ -2677,12 +2708,12 @@
 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 +197,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 +204,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: Workstation Working Hour,Start Time,Ora di inizio
 DocType: Item Price,Bulk Import Help,Bulk Import Aiuto
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +256,Select Quantity,Seleziona Quantità
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +257,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
@@ -2699,6 +2730,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Sia qty destinazione o importo obiettivo è obbligatoria .
 apps/erpnext/erpnext/config/projects.py +45,Cost of various activities,Costo di varie attività
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Impostazione Eventi a {0}, in quanto il dipendente attaccato al di sotto personale di vendita non dispone di un ID utente {1}"
+DocType: Timesheet,Billing Details,Dettagli di fatturazione
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +149,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}
 DocType: Item,Inspection Required,Ispezione Obbligatorio
@@ -2718,7 +2750,7 @@
 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 +138,Wire Transfer,Bonifico bancario
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,Bonifico bancario
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Seleziona tutto
 DocType: Sales Order,Recurring Order,Ordine Ricorrente
 DocType: Company,Default Income Account,Conto predefinito Entrate
@@ -2730,21 +2762,19 @@
 ,Welcome to ERPNext,Benvenuti a ERPNext
 apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,Contatto per Preventivo
 DocType: Lead,From Customer,Da Cliente
-apps/erpnext/erpnext/demo/setup_data.py +357,Calls,chiamate
+apps/erpnext/erpnext/demo/setup/setup_data.py +300,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/stock/doctype/item/item.py +466,"As there are existing transactions for this item, \
-							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Come ci sono transazioni esistenti per questo articolo, \ non è possibile modificare i valori di &#39;non ha di serie&#39;, &#39;ha Batch No&#39;, &#39;è articolo di&#39; e &#39;metodo di valutazione&#39;"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,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/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 +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota : Il sistema non controlla over - consegna e over -booking per la voce {0} come la quantità o la quantità è 0
 DocType: Notification Control,Quotation Message,Messaggio Preventivo
 DocType: Issue,Opening Date,Data di apertura
-apps/erpnext/erpnext/schools/api.py +58,Attendance has been marked successfully.,La partecipazione è stata segnata con successo.
+apps/erpnext/erpnext/schools/api.py +57,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 +136,Account Type for {0} must be {1},Tipo di account per {0} deve essere {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +139,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à
@@ -2755,16 +2785,17 @@
 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 +40,Acutal qty in stock,qty acutal in magazzino
+apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +40,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/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 +20,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 +1190,Please select customer,Seleziona cliente
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1193,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
@@ -2774,6 +2805,7 @@
 ,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 +50,Missing Currency Exchange Rates for {0},Manca valuta Tassi di cambio in {0}
 DocType: Assessment,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-
@@ -2791,11 +2823,12 @@
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Nome argomento
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,", Almeno una delle vendere o acquistare deve essere selezionata"
+DocType: Grading Structure,Grade Intervals,Intervalli grade
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Selezionare la natura della vostra attività.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Dove si svolgono le operazioni di fabbricazione.
 DocType: Asset Movement,Source Warehouse,Fonte Warehouse
 DocType: Installation Note,Installation Date,Data di installazione
-apps/erpnext/erpnext/controllers/accounts_controller.py +534,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} non appartiene alla società {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +537,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
@@ -2809,28 +2842,31 @@
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Disponibile Quantità batch a partire 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 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 +111,Date Of Retirement must be greater than Date of Joining,Data del pensionamento deve essere maggiore di Data Assunzione
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +49,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 +87,{0}% Delivered,{0}% Consegnato
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% Consegnato
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Articolo {0}: Qtà ordinata {1} non può essere inferiore a Qtà minima per ordine {2} (definita per l'Articolo).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Percentuale Distribuzione Mensile
 DocType: Territory,Territory Targets,Obiettivi Territorio
 DocType: Delivery Note,Transporter Info,Info Transporter
-apps/erpnext/erpnext/accounts/utils.py +379,Please set default {0} in Company {1},Si prega di impostare di default {0} nell&#39;azienda {1}
+apps/erpnext/erpnext/accounts/utils.py +456,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
 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 .
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Titoli di modelli di stampa p. es. Fattura proforma
+DocType: Student Guardian,Student Guardian,Student Guardiano
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +184,Valuation type charges can not marked as Inclusive,Spese tipo di valutazione non possono contrassegnata come Inclusive
 DocType: POS Profile,Update Stock,Aggiornare Giacenza
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Diverso UOM per gli elementi porterà alla non corretta ( Total) Valore di peso netto . Assicurarsi che il peso netto di ogni articolo è nella stessa UOM .
 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 +349,Journal Entries {0} are un-linked,Journal Entries {0} sono un-linked
+apps/erpnext/erpnext/accounts/utils.py +426,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
@@ -2851,9 +2887,10 @@
 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 +79,"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 salvarlo
+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
+DocType: Homepage,"URL for ""All Products""",URL per &quot;tutti i prodotti&quot;
 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
@@ -2862,7 +2899,7 @@
 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 +29,Current Job Openings,Offerte di lavoro
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,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
@@ -2875,7 +2912,7 @@
 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/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 +850,Show tax break-up,Mostra fiscale break-up
+apps/erpnext/erpnext/public/js/controllers/transaction.js +841,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/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"
@@ -2885,10 +2922,11 @@
 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 +534,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 +80,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 +162,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/selling/doctype/customer/customer.py +195,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 +5,This is based on the attendance of this Student,Questo si basa sulla presenza di questo Student
@@ -2897,12 +2935,11 @@
 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 +75,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 +138,Note: There is not enough leave balance for Leave Type {0},Nota : Non c'è equilibrio congedo sufficiente per Leave tipo {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Note: There is not enough leave balance for Leave Type {0},Nota : Non c'è equilibrio congedo sufficiente per Leave tipo {0}
 DocType: Program Enrollment Fee,Program Enrollment Fee,Programma Tassa di iscrizione
 DocType: Item,Supplier Items,Fornitore Articoli
 DocType: Opportunity,Opportunity Type,Tipo di Opportunità
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,Nuova Azienda
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,Cost Center is required for 'Profit and Loss' account {0},È necessario un Centro di Costo per il 'Conto Economico' {0}
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Le transazioni possono essere eliminati solo dal creatore della Società
 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.,Numero errato di contabilità generale dell `trovato. Potreste aver selezionato un conto sbagliato nella transazione.
 DocType: Cheque Print Template,Cheque Width,Larghezza Assegno
@@ -2911,16 +2948,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,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/manufacturing/doctype/production_order/production_order.js +128,Timesheet,timesheet
-apps/erpnext/erpnext/controllers/accounts_controller.py +228,{0} '{1}' is disabled,{0} '{1}' è disabilitato
+apps/erpnext/erpnext/controllers/accounts_controller.py +231,{0} '{1}' is disabled,{0} '{1}' è disabilitato
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Imposta come Aperto
 DocType: Cheque Print Template,Scanned Cheque,Scanned Assegno
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Invia e-mail automatica di contatti su operazioni Invio.
+DocType: Timesheet,Total Billable Amount,Importo totale fatturabile
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Articolo 3
 DocType: Purchase Order,Customer Contact Email,Customer Contact Email
 DocType: Warranty Claim,Item and Warranty Details,Voce e garanzia Dettagli
 DocType: Sales Team,Contribution (%),Contributo (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Nota : non verrà creato il pagamento poiché non è stato specificato 'conto bancario o fido'
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Responsibilities,Responsabilità
+apps/erpnext/erpnext/controllers/accounts_controller.py +78,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à
 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
@@ -2928,6 +2966,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Aggiungi Utenti
 DocType: Pricing Rule,Item Group,Gruppo Articoli
 DocType: Item,Safety Stock,Scorta di sicurezza
+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: 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)
@@ -2937,7 +2976,6 @@
 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: Timesheet,Total Hours,Totale ore
 DocType: Journal Entry,Printing Settings,Impostazioni di stampa
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,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
@@ -2950,13 +2988,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investment Banking
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +71,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
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Clienti&gt; Gruppi clienti&gt; Territorio
 DocType: Purchase Invoice Item,Rate,Tariffa
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Intern,Stagista
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,Stagista
 DocType: Stock Entry,From BOM,Da Distinta Base
 DocType: Assessment,Assessment Code,Codice Assessment
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +32,Basic,Base
+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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',Si prega di cliccare su ' Generate Schedule '
+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 +95,Reference No is mandatory if you entered Reference Date,N. di riferimento è obbligatoria se hai inserito Reference Data
@@ -2965,11 +3004,11 @@
 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 +752,Issue Material,Fornire Materiale
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +723,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 +683,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 +665,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.
 DocType: Hub Settings,Access Token,Token di accesso
 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
@@ -2977,33 +3016,35 @@
 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 +1122,Enter value must be positive,Inserire il valore deve essere positivo
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,All Territories,tutti i Territori
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1125,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
 DocType: Purchase Invoice,Items,Articoli
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +23,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 +221,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 +233,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 +96,Request for Quotations,Richiesta di Citazioni
+apps/erpnext/erpnext/hooks.py +104,Request for Quotations,Richiesta di Citazioni
 DocType: Payment Reconciliation,Maximum Invoice Amount,Importo Massimo Fattura
 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 +628,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unità di misura predefinita per la variante &#39;{0}&#39; deve essere lo stesso in Template &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unità di misura predefinita per la variante &#39;{0}&#39; deve essere lo stesso in Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Calcola in base a
 DocType: Delivery Note Item,From Warehouse,Dal magazzino
 DocType: Assessment,Supervisor Name,Nome supervisore
+DocType: Assessment,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
 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 +27,Default Address Template cannot be deleted,Indirizzo modello predefinito non può essere eliminato
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,Indirizzo modello predefinito non può essere eliminato
 DocType: Sales Invoice,Shipping Rule,Spedizione Rule
 DocType: Manufacturer,Limited to 12 characters,Limitato a 12 caratteri
 DocType: Journal Entry,Print Heading,Stampa Rubrica
@@ -3018,8 +3059,8 @@
 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/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 +485,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 +336,Please select Posting Date first,Seleziona Data Pubblicazione primo
+apps/erpnext/erpnext/stock/get_item_details.py +486,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 +326,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à
@@ -3035,6 +3076,7 @@
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Partita pagamenti con fatture
 DocType: Journal Entry,Bank Entry,Bank Entry
 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
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Raggruppa per
 DocType: Guardian,Interests,Interessi
@@ -3047,22 +3089,22 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,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 +141,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Serialized Voce {0} non può essere aggiornato tramite \
  riconciliazione Archivio"
 DocType: Scheduling Tool,Day,Giorno
 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 +122,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 +129,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
-DocType: Student Applicant,AP.,AP.
 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 +639,Point of Sale,Punto di vendita
+apps/erpnext/erpnext/accounts/page/pos/pos.js +634,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
 DocType: Production Planning Tool,Production Planning Tool,Production Planning Tool
@@ -3071,74 +3113,77 @@
 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 +373,Quantity to Manufacture must be greater than 0.,Quantità di Fabbricazione deve essere maggiore di 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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 Profile,Customer Group,Gruppo Cliente
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,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/doctype/asset/asset.py +83,Next Depreciation Date must be on or after today,Successivo ammortamento data deve essere acceso o dopo oggi
 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 +145,Please cancel Purchase Invoice {0} first,Si prega di annullare Acquisto Fattura {0} prima
 DocType: Serial No,AMC Expiry Date,AMC Data Scadenza
 ,Sales Register,Registro Vendite
 DocType: Quotation,Quotation Lost Reason,Motivo Preventivo Perso
+apps/erpnext/erpnext/utilities/doctype/address/address.py +164,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.
 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 +330,Transaction reference no {0} dated {1},di riferimento della transazione non {0} {1} datato
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,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 +107,Summary for this month and pending activities,Riepilogo per questo mese e le attività in corso
+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/accounts/doctype/sales_invoice/sales_invoice.py +406,Please remove this Invoice {0} from C-Form {1},Si prega di rimuovere questo Invoice {0} dal C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,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 +644,Get Items,Ottieni articoli
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +623,Get Items,Ottieni articoli
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +210,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 +41,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
 DocType: Payment Request,Initiated,Iniziato
 DocType: Production Order,Planned Start Date,Data prevista di inizio
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,Customer is required against Receivable account {0},Il Cliente è tenuto conto contro Credito {0}
 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 +265,Project-wise data is not available for Quotation,Dati di progetto non sono disponibile per Preventivo
+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 +101,Commercial,commerciale
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,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: Supplier Quotation,Supplier Address,Fornitore Indirizzo
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +648,Row {0}# Account must be of type 'Fixed Asset',Riga {0} # account deve essere di tipo &#39;cespite&#39;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,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 +30,Series is mandatory,Series è obbligatorio
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +50,Series is mandatory,Series è obbligatorio
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Servizi finanziari
 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
 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}
 DocType: Leave Allocation,Unused leaves,Foglie non utilizzati
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Cr,Cr
 DocType: Tax Rule,Billing State,Stato di fatturazione
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +250,Transfer,Trasferimento
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +187,{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 +825,Fetch exploded BOM (including sub-assemblies),Fetch BOM esplosa ( inclusi sottoassiemi )
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +254,Transfer,Trasferimento
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +190,{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 +796,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 +115,Due Date is mandatory,Data di scadenza è obbligatoria
+apps/erpnext/erpnext/controllers/accounts_controller.py +118,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
 DocType: Journal Entry,Pay To / Recd From,Pay To / RECD Da
 DocType: Naming Series,Setup Series,Serie Setup
 DocType: Payment Reconciliation,To Invoice Date,Per Data fattura
 DocType: Supplier,Contact HTML,Contatto HTML
 ,Inactive Customers,I clienti inattivi
+DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Ricevute di acquisto
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Come viene applicata la Regola Tariffaria?
 DocType: Quality Inspection,Delivery Note No,Documento di Trasporto N.
@@ -3147,7 +3192,7 @@
 DocType: Company,Retail,Vendita al dettaglio
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +120,Customer {0} does not exist,{0} non esiste clienti
 DocType: Attendance,Absent,Assente
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +587,Product Bundle,Bundle prodotto
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Product Bundle,Bundle prodotto
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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
@@ -3157,8 +3202,8 @@
 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 +742,Send Supplier Emails,Inviare e-mail del fornitore
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +104,"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/buying/doctype/request_for_quotation/request_for_quotation.js +708,Send Supplier Emails,Inviare e-mail del fornitore
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,"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
 DocType: Guardian Interest,Guardian Interest,Guardiano interesse
 DocType: Timesheet,Employee Detail,Dettaglio dei dipendenti
@@ -3169,9 +3214,9 @@
 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}
 DocType: Salary Slip,Earning & Deduction,Rendimento & Detrazione
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +77,Account {0} cannot be a Group,Il Conto {0} non può essere un gruppo
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} cannot be a Group,Il Conto {0} non può essere un gruppo
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +31,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 +107,Negative Valuation Rate is not allowed,Negativo Tasso valutazione non è consentito
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Negativo Tasso valutazione non è consentito
 DocType: Holiday List,Weekly Off,Settimanale Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Per es. 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +39,Provisional Profit / Loss (Credit),Risultato provvisorio / Perdita (credito)
@@ -3185,16 +3230,16 @@
 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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: centro di costo è obbligatorio per la voce {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +626,Get Items from Product Bundle,Ottenere elementi dal pacchetto di prodotti
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +605,Get Items from Product Bundle,Ottenere elementi dal pacchetto di prodotti
 DocType: Asset,Straight Line,Retta
 DocType: Project User,Project User,progetto utente
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} is inactive,Il Conto {0} è inattivo
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} is inactive,Il Conto {0} è inattivo
 DocType: GL Entry,Is Advance,È Advance
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Inizio e Fine data della frequenza soo obbligatori
 apps/erpnext/erpnext/controllers/buying_controller.py +148,Please enter 'Is Subcontracted' as Yes or No,Si prega di inserire ' è appaltata ' come Yes o No
 DocType: Sales Team,Contact No.,Contatto N.
 DocType: Bank Reconciliation,Payment Entries,Le voci di pagamento
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,'Profit and Loss' type account {0} not allowed in Opening Entry,Il tipo di conto {0} 'Profitti e Perdite' non consentito nella voce di apertura
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +71,'Profit and Loss' type account {0} not allowed in Opening Entry,Il tipo di conto {0} 'Profitti e Perdite' non consentito nella voce di apertura
 DocType: 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
@@ -3213,7 +3258,7 @@
 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,Commissione sulle vendite
 DocType: Offer Letter Term,Value / Description,Valore / Descrizione
-apps/erpnext/erpnext/controllers/accounts_controller.py +558,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} non può essere presentata, è già {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +561,"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: Production Order,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}.
@@ -3226,13 +3271,13 @@
 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/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Legal Expenses,Spese legali
 DocType: Purchase Invoice,Posting Time,Tempo Distacco
-DocType: Sales Order,% Amount Billed,% Importo Fatturato
+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.
 apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},Nessun Articolo con Numero di Serie {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Aperte Notifiche
+DocType: Email Digest,Open Notifications,Aperte Notifiche
 DocType: Payment Entry,Difference Amount (Company Currency),Differenza Importo (Società di valuta)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,spese dirette
 apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
@@ -3240,7 +3285,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Nuovi Ricavi Cliente
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,Spese di viaggio
 DocType: Maintenance Visit,Breakdown,Esaurimento
-apps/erpnext/erpnext/controllers/accounts_controller.py +634,Account: {0} with currency: {1} can not be selected,Account: {0} con valuta: {1} non può essere selezionato
+apps/erpnext/erpnext/controllers/accounts_controller.py +637,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}
 DocType: Program Enrollment Tool,Student Applicants,I candidati per studenti
@@ -3248,15 +3293,15 @@
 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 +56,Probation,prova
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Probation,prova
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Componenti stipendio
 DocType: Program Enrollment Tool,New Academic Year,Nuovo anno accademico
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Payment of salary for the month {0} and year {1},Il pagamento dello stipendio del mese {0} e l'anno {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Payment of salary for the month {0} and year {1},Il pagamento dello stipendio del mese {0} e l'anno {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Inserimento automatico tasso Listino se mancante
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Importo totale pagato
 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 +144,Planning,pianificazione
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,pianificazione
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,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
@@ -3269,11 +3314,10 @@
 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.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Sales invoice submitted sucessfully.,fattura di vendita presentato con successo.
 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}
 DocType: Assessment Result,Student Name,Nome dello studente
-apps/erpnext/erpnext/hooks.py +104,Assessment Schedule,Programma di valutazione
+apps/erpnext/erpnext/hooks.py +113,Assessment Schedule,Programma di valutazione
 DocType: Brand,Item Manager,Manager del'Articolo
 DocType: Buying Settings,Default Supplier Type,Tipo Fornitore Predefinito
 DocType: Production Order,Total Operating Cost,Totale costi di esercizio
@@ -3283,6 +3327,7 @@
 DocType: GL Entry,Party Type,Tipo partito
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +78,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
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Modello Stipendio master.
 DocType: Leave Type,Max Days Leave Allowed,Max giorni di ferie domestici
@@ -3294,18 +3339,19 @@
 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 +99,All Customer Groups,Tutti i gruppi di clienti
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +78,Accumulated Monthly,accumulato mensile
-apps/erpnext/erpnext/controllers/accounts_controller.py +595,{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/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Tutti i gruppi di clienti
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +81,Accumulated Monthly,accumulato mensile
+apps/erpnext/erpnext/controllers/accounts_controller.py +598,{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
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Prezzo di listino (Valuta Azienda)
 DocType: Products Settings,Products Settings,Impostazioni Prodotti
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +188,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
 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 +84,Secretary,segretario
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,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
@@ -3314,24 +3360,22 @@
 ,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
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,Fila # {0}: N. di serie è obbligatoria
+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 +859,Supplier Quotation,Preventivo Fornitore
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +838,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 +7,Collect Fees,riscuotere i canoni
+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}
 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 .
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Prossimi eventi
 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/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
-DocType: Email Digest,Income / Expense,Proventi / Spese
 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."
@@ -3342,13 +3386,14 @@
 DocType: Customer,From Lead,Da Contatto
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Gli ordini rilasciati per la produzione.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Selezionare l'anno fiscale ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,POS Profile required to make POS Entry,POS Profilo tenuto a POS Entry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +509,POS Profile required to make POS Entry,POS Profilo tenuto a POS Entry
 DocType: Program Enrollment Tool,Enroll Students,iscrivere gli studenti
 DocType: Hub Settings,Name Token,Nome Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Selling standard
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Atleast one warehouse is mandatory,Almeno un Magazzino è obbligatorio
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +129,Atleast one warehouse is mandatory,Almeno un Magazzino è obbligatorio
 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 +330,{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
@@ -3369,10 +3414,11 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Le foglie devono essere assegnati in multipli di 0,5"
 DocType: Production Order,Operation Cost,Operazione Costo
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,Carica presenze da un file. Csv
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Eccezionale Amt
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Fissare obiettivi Item Group-saggio per questo venditore.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Congelare Stocks Older Than [ giorni]
-apps/erpnext/erpnext/controllers/accounts_controller.py +528,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: Asset è obbligatorio per cespite acquisto / vendita
+apps/erpnext/erpnext/controllers/accounts_controller.py +531,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: Asset è obbligatorio per cespite acquisto / vendita
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Se due o più regole sui prezzi sono trovate delle condizioni di cui sopra, viene applicata la priorità. La priorità è un numero compreso tra 0 a 20, mentre il valore di default è pari a zero (vuoto). Numero maggiore significa che avrà la precedenza se ci sono più regole sui prezzi con le stesse condizioni."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Anno fiscale: {0} non esiste
 DocType: Currency Exchange,To Currency,Per valuta
@@ -3389,15 +3435,15 @@
 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
-DocType: Sales Invoice,Exhibition,Esposizione
 apps/erpnext/erpnext/utilities/doctype/address/address.py +77,"Company is mandatory, as it is your company address","Società è obbligatoria, in quanto è la vostra ditta"
 DocType: Item Attribute,From Range,Da Gamma
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +81,Syntax error in formula or condition: {0},Errore di sintassi nella formula o una condizione: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +92,Syntax error in formula or condition: {0},Errore di sintassi nella formula o una condizione: {0}
 apps/erpnext/erpnext/stock/utils.py +99,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 +28,Jobs,Lavori
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,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
@@ -3406,16 +3452,16 @@
 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 +763,Make Supplier Quotation,Crea Quotazione fornitore
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,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/controllers/sales_and_purchase_return.py +100,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 +42,Casual Leave,Casual Leave
+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
 DocType: Batch,Batch ID,Lotto ID
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,Note: {0},Nota : {0}
 ,Delivery Note Trends,Nota Consegna Tendenza
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +103,This Week's Summary,Sintesi di questa settimana
+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
 DocType: Student Group Creation Tool,Get Courses,Get Corsi
 DocType: GL Entry,Party,Partito
@@ -3425,7 +3471,7 @@
 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 +59,Piecework,lavoro a cottimo
+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: Task,Actual Time (in Hours),Tempo reale (in ore)
 DocType: Employee,History In Company,Storia aziendale
@@ -3439,10 +3485,10 @@
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +4,Approve,Approvare
 DocType: Customer,Sales Partner and Commission,Partner vendite e Commissione
 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} necessario in {2} per completare la transazione.
+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.
 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 +162,Black,Nero
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,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
@@ -3453,13 +3499,13 @@
 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 +69,Customer Id,Id Cliente
+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
 DocType: Journal Entry Account,Exchange Rate,Tasso di cambio:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Sales Order {0} is not submitted,Sales Order {0} non è presentata
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +527,Sales Order {0} is not submitted,Sales Order {0} non è presentata
 DocType: Homepage,Tag Line,tag linea
 DocType: Fee Component,Fee Component,Fee Componente
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +857,Add items from,Aggiungere elementi da
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +836,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}
 DocType: Cheque Print Template,Regular,Regolare
 DocType: BOM,Last Purchase Rate,Ultimo Purchase Rate
@@ -3467,6 +3513,7 @@
 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
 ,Sales Person-wise Transaction Summary,Sales Person-saggio Sintesi dell&#39;Operazione
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +60,Cost Center is required for 'Profit and Loss' account {0}. Please set up a default Cost Center for the Company.,Centro di costo è richiesto per conto &#39;economico&#39; {0}. Si prega di istituire un centro di costo di default per la Società.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,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
@@ -3477,12 +3524,12 @@
 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 +710,Online,online
+apps/erpnext/erpnext/accounts/page/pos/pos.js +692,Online,online
 ,Available Stock for Packing Items,Disponibile Magazzino per imballaggio elementi
 DocType: Item Variant,Item Variant,Elemento Variant
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,L'impostazione di questo modello di indirizzo di default perché non c'è altro difetto
+apps/erpnext/erpnext/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
 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 +74,Quality Management,Gestione della qualità
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,Gestione della qualità
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} has been disabled,Voce {0} è stato disabilitato
 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
@@ -3504,11 +3551,12 @@
 DocType: Student,Student Email ID,Student Email ID
 DocType: Employee,Notice (days),Avviso ( giorni )
 DocType: Tax Rule,Sales Tax Template,Sales Tax Template
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1520,Select items to save the invoice,Selezionare gli elementi per salvare la fattura
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1544,Select items to save the invoice,Selezionare gli elementi per salvare la fattura
 DocType: Employee,Encashment Date,Data Incasso
 DocType: Account,Stock Adjustment,Regolazione della
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Esiste di default Attività Costo per il tipo di attività - {0}
 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
 DocType: Job Applicant,Applicant Name,Nome del Richiedente
@@ -3538,17 +3586,17 @@
 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 .
 DocType: Company,Distribution,Distribuzione
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +8,Amount Paid,Importo pagato
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Project Manager,Project Manager
+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
 ,Quoted Item Comparison,Articolo Citato Confronto
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Dispatch,Spedizione
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,Spedizione
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Sconto massimo consentito per la voce: {0} {1}%
 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.
-DocType: Sales Invoice,Supplier Reference,Fornitore di riferimento
-apps/erpnext/erpnext/accounts/page/pos/pos.js +844,"Master data syncing, it might take some time","sincronizzazione dei dati master, potrebbe richiedere un certo tempo"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +832,"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
@@ -3562,7 +3610,7 @@
 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 +83,Error in formula or condition,Errore nella formula o condizione
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,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
@@ -3571,7 +3619,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},'A Data' deve essere entro l'anno fiscale. Assumendo A Data = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Qui è possibile mantenere l'altezza, il peso, le allergie, le preoccupazioni mediche ecc"
 DocType: Leave Block List,Applies to Company,Applica ad Azienda
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +197,Cannot cancel because submitted Stock Entry {0} exists,Impossibile annullare perché esiste una giacenza {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +198,Cannot cancel because submitted Stock Entry {0} exists,Impossibile annullare perché esiste una giacenza {0}
 DocType: Purchase Invoice,In Words,In Parole
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,Today is {0}'s birthday!,Oggi è {0} 's compleanno!
 DocType: Production Planning Tool,Material Request For Warehouse,Richiesta di materiale per il magazzino
@@ -3581,14 +3629,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,Il tuo anno finanziario comincia il
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Asset Ammortamenti e saldi
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +319,Amount {0} {1} transferred from {2} to {3},Importo {0} {1} trasferito da {2} a {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +322,Amount {0} {1} transferred from {2} to {3},Importo {0} {1} trasferito da {2} a {3}
 DocType: Sales Invoice,Get Advances Received,ottenere anticipo Ricevuto
 DocType: Email Digest,Add/Remove Recipients,Aggiungere/Rimuovere Destinatario
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +432,Transaction not allowed against stopped Production Order {0},Operazione non ammessi contro Production smesso di ordine {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +437,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 +143,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 +652,Item variant {0} exists with same attributes,Variante item {0} esiste con le stesse caratteristiche
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Variante item {0} esiste con le stesse caratteristiche
+DocType: Leave Application,LAP/,GIRO/
 DocType: Salary Slip,Salary Slip,Busta paga
 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
@@ -3596,12 +3645,12 @@
 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 +212,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 +215,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: Employee Education,Employee Education,Istruzione Dipendente
-apps/erpnext/erpnext/public/js/controllers/transaction.js +866,It is needed to fetch Item Details.,E &#39;necessario per recuperare Dettagli elemento.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +857,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
@@ -3611,14 +3660,14 @@
 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 +178,Invalid {0},Non valido {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Sick Leave,Sick Leave
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,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
 DocType: Warehouse,PIN,PIN
 DocType: Sales Invoice,Base Change Amount (Company Currency),Base quantità di modifica (Società di valuta)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +313,No accounting entries for the following warehouses,Nessuna scritture contabili per le seguenti magazzini
-apps/erpnext/erpnext/projects/doctype/project/project.js +102,Save the document first.,Salvare prima il documento.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +314,No accounting entries for the following warehouses,Nessuna scritture contabili per le seguenti magazzini
+apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Salvare prima il documento.
 DocType: Account,Chargeable,Addebitabile
 DocType: Company,Change Abbreviation,Change Abbreviazione
 DocType: Expense Claim Detail,Expense Date,Data Spesa
@@ -3631,10 +3680,9 @@
 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
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,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
 DocType: Appraisal,Appraisal Template,Valutazione Modello
 DocType: Item Group,Item Classification,Classificazione Articolo
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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
@@ -3644,8 +3692,8 @@
 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 +940,Please select {0} first,Si prega di selezionare {0} prima
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +749,Batch {0} of Item {1} has expired.,Il lotto {0} di {1} scaduto.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +953,Please select {0} first,Si prega di selezionare {0} prima
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +757,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
@@ -3673,8 +3721,8 @@
  {% 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 +92,Warehouse not found in the system,Warehouse non trovato nel sistema
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +106,This Month's Summary,Sommario di questo mese
+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
 DocType: Quality Inspection Reading,Quality Inspection Reading,Lettura Controllo Qualità
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Blocca Scorte più vecchie di` dovrebbero essere inferiori %d giorni .
 DocType: Tax Rule,Purchase Tax Template,Acquisto fiscale Template
@@ -3684,21 +3732,22 @@
 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 +87,Please set Next Depreciation Date,Si prega di impostare Successivo Ammortamenti Data
-DocType: Payment Gateway,Payment Gateway,Casello stradale
 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 +378,Operation Time must be greater than 0 for Operation {0},Tempo di funzionamento deve essere maggiore di 0 per Operation {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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/accounts/doctype/account/account.py +170,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)
 DocType: Program,Program Abbreviation,Abbreviazione programma
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,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: Appraisal,Start Date,Data di inizio
@@ -3714,21 +3763,22 @@
 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
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Ad es. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +27,Transaction currency must be same as Payment Gateway currency,Valuta di transazione deve essere uguale a pagamento moneta Gateway
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Transaction currency must be same as Payment Gateway currency,Valuta di transazione deve essere uguale a pagamento moneta Gateway
 DocType: Payment Entry,Receive,Ricevere
+apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,Citazioni:
 DocType: Maintenance Visit,Fully Completed,Debitamente compilato
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Completato
 DocType: Employee,Educational Qualification,Titolo di Studio
 DocType: Workstation,Operating Costs,Costi operativi
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Azione se cumulate mensili Budget superato
 DocType: Purchase Invoice,Submit on creation,Invia sulla creazione
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +432,Currency for {0} must be {1},Valuta per {0} deve essere {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +435,Currency for {0} must be {1},Valuta per {0} deve essere {1}
 DocType: Asset,Disposal Date,Smaltimento Data
 DocType: Employee Leave Approver,Employee Leave Approver,Responsabile / Approvatore Ferie
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,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 +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/crm/doctype/opportunity/opportunity.py +79,"Cannot declare as lost, because Quotation has been made.","Non è possibile dichiarare come perduto, perché è stato fatto il Preventivo."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Acquisto Maestro Direttore
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +429,Production Order {0} must be submitted,Ordine di produzione {0} deve essere presentata
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +434,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'
@@ -3738,25 +3788,27 @@
 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
 DocType: Price List,Price List Name,Prezzo di listino Nome
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +181,Totals,Totali
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,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 +113,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 +120,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
 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} necessario in {2} a {3} {4} di {5} per completare la transazione.
+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.
+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 +181,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/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 +793,All records are synced.,Tutti i record vengono sincronizzati.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +781,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
 DocType: Cost Center,Cost Center Name,Nome Centro di Costo
@@ -3775,21 +3827,20 @@
 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/selling/doctype/quotation/quotation.py +49,Cannot set as Lost as Sales Order is made.,Impossibile impostare come persa come è fatto Sales Order .
-DocType: Student Applicant,Mother's Name,Nome della madre
 DocType: Request for Quotation Item,Supplier Part No,Di parte del fornitore No
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +348,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Non può dedurre quando categoria è per &#39;valutazione&#39; o &#39;Vaulation e Total&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Received From,Ricevuto da
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Received From,Ricevuto da
 DocType: Lead,Converted,Convertito
 DocType: Item,Has Serial No,Ha numero di serie
 DocType: Employee,Date of Issue,Data Pubblicazione
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{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 +93,Row {0}: Hours value must be greater than zero.,Riga {0}: valore Ore deve essere maggiore di zero.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +117,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
 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 +172,{0} {1} does not exist,{0} {1} non esiste
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +175,{0} {1} does not exist,{0} {1} non esiste
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,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 +72,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
@@ -3798,13 +3849,14 @@
 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/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
 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 +109,Electrical,elettrico
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Electrical,elettrico
 DocType: Stock Entry,Total Value Difference (Out - In),Totale Valore Differenza (Out - In)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,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}
@@ -3812,7 +3864,7 @@
 DocType: Item,Customer Code,Codice Cliente
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +210,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 +292,Debit To account must be a Balance Sheet account,Debito Per account deve essere un account di Stato Patrimoniale
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To account must be a Balance Sheet account,Debito Per account deve essere un account di Stato Patrimoniale
 DocType: Buying Settings,Naming Series,Naming Series
 DocType: Leave Block List,Leave Block List Name,Lascia Block List Nome
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Attivo Immagini
@@ -3824,11 +3876,11 @@
 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 +301,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 +313,Salary Slip of employee {0} already created for time sheet {1},Salario Slip of dipendente {0} già creato per foglio di tempo {1}
 DocType: Sales Order Item,Ordered Qty,Quantità ordinato
-apps/erpnext/erpnext/stock/doctype/item/item.py +673,Item {0} is disabled,Voce {0} è disattivato
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,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 +838,BOM does not contain any stock item,BOM non contiene alcun elemento magazzino
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +809,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.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generare buste paga
@@ -3836,23 +3888,24 @@
 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)
-apps/erpnext/erpnext/stock/doctype/item/item.py +485,Row #{0}: Please set reorder quantity,Fila # {0}: Si prega di impostare la quantità di riordino
+DocType: Sales Invoice Timesheet,Billing Hours,Ore di fatturazione
+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
 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 +62,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
+DocType: Payment Entry,Allocate Payment Amount,Allocare Importo di Pagamento
 DocType: Employee External Work History,Salary,Stipendio
 DocType: Serial No,Delivery Document Type,Tipo Documento Consegna
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Inviare tutti i fogli paga per i criteri sopra selezionati
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} elementi sincronizzati
 DocType: Sales Order,Partly Delivered,Parzialmente Consegnato
-DocType: Sales Invoice,Existing Customer,Cliente Esistente
 DocType: Email Digest,Receivables,Crediti
+DocType: Lead Source,Lead Source,Piombo Fonte
 DocType: Customer,Additional information regarding the customer.,Ulteriori informazioni relative al cliente.
 DocType: Quality Inspection Reading,Reading 5,Lettura 5
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +38,Campaign Name is required,Nome Campagna obbligatorio
 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
@@ -3860,10 +3913,9 @@
 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 +129,BOM and Manufacturing Quantity are required,BOM e Quantità  Produzione richiesti
+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/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Gamma Ageing 2
 DocType: SG Creation Tool Course,Max Strength,Forza Max
-DocType: Bank Reconciliation Detail,Amount,Importo
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM sostituita
 ,Sales Analytics,Analisi dei dati di vendita
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +113,Available {0},Disponibile {0}
@@ -3871,14 +3923,14 @@
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Configurazione della posta elettronica
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +96,Please enter default currency in Company Master,Inserisci valuta predefinita in Azienda Maestro
 DocType: Stock Entry Detail,Stock Entry Detail,Dettaglio Giacenza
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +100,Daily Reminders,Promemoria quotidiani
+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/account/account_tree.js +23,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 +71,Customer Service,Servizio clienti
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Customer Service,Servizio clienti
 DocType: Homepage Featured Product,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.
@@ -3887,8 +3939,9 @@
 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
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Work In Progress Magazzino di default
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1570,Total nos of serial no is not equal to quantity.,Totale nos di numero di serie non è uguale alla quantità.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1594,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
 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
@@ -3896,9 +3949,10 @@
 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 +82,Engineer,Ingegnere
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,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 +370,Item Code required at Row No {0},Codice Articolo richiesto alla Riga N. {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +398,Item Code required at Row No {0},Codice Articolo richiesto alla Riga N. {0}
 DocType: Sales Partner,Partner Type,Tipo di partner
 DocType: Purchase Taxes and Charges,Actual,Attuale
 DocType: Authorization Rule,Customerwise Discount,Sconto Cliente saggio
@@ -3914,16 +3968,18 @@
 DocType: BOM,Raw Material Cost,Costo Materie Prime
 DocType: Item Reorder,Re-Order Level,Livello Ri-ordino
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Inserisci articoli e q.tà programmate per i quali si desidera raccogliere gli ordini di produzione o scaricare materie prime per l'analisi.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +55,Part-time,A tempo parziale
+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
 DocType: Employee,Applicable Holiday List,Lista Vacanze Applicabile
 DocType: Employee,Cheque,Assegno
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,serie Aggiornato
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +57,Series Updated,serie Aggiornato
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Tipo di rapporto è obbligatoria
 DocType: Item,Serial Number Series,Serial Number Series
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Magazzino è obbligatorio per l'Articolo in Giacenza {0} alla Riga {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Retail & Wholesale
 DocType: Issue,First Responded On,Ha risposto prima su
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Croce Listing dell'oggetto in più gruppi
+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 +87,Clearance Date updated,Liquidazione Data di aggiornamento
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Riconciliati con successo
@@ -3937,7 +3993,7 @@
 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 +513,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 +518,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.
@@ -3947,7 +4003,7 @@
 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/stock/doctype/stock_entry/stock_entry.py +158,Target warehouse in row {0} must be same as Production Order,Magazzino Target in riga {0} deve essere uguale ordine di produzione
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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
 DocType: Company,Round Off Account,Arrotondamento Account
@@ -3956,23 +4012,22 @@
 DocType: Customer Group,Parent Customer Group,Parent Gruppo clienti
 DocType: Purchase Invoice,Contact Email,Email Contatto
 DocType: Appraisal Goal,Score Earned,Punteggio Earned
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Notice Period,Periodo Di Preavviso
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,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 +4,New Sales Person Name,Nome nuova persona vendite
 DocType: Packing Slip,Gross Weight UOM,Peso lordo U.M.
-DocType: Email Digest,Receivables / Payables,Crediti / Debiti
 DocType: Delivery Note Item,Against Sales Invoice,Per Fattura Vendita
 DocType: Bin,Reserved Qty for Production,Riservato Quantità per Produzione
 DocType: Asset,Frequency of Depreciation (Months),Frequenza di ammortamento (Mesi)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +469,Credit Account,Conto di credito
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Credit Account,Conto di credito
 DocType: Landed Cost Item,Landed Cost Item,Landed Cost articolo
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +55,Show zero values,Mostra valori zero
+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
 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 +647,Please specify Attribute Value for attribute {0},Si prega di specificare Attributo Valore per l&#39;attributo {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Si prega di specificare Attributo Valore per l&#39;attributo {0}
 DocType: Item,Default Warehouse,Magazzino Predefinito
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +39,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
@@ -3994,19 +4049,22 @@
 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
-DocType: Sales Invoice,Cold Calling,Chiamata Fredda
 DocType: SMS Parameter,SMS Parameter,SMS Parametro
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,Bilancio e Centro di costo
 DocType: Maintenance Schedule Item,Half Yearly,Semestrale
 DocType: Lead,Blog Subscriber,Abbonati Blog
+DocType: Guardian,Alternate Number,Numero alternativo
 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.
+DocType: Stock Reconciliation Item,Quantity Difference,Quantità Differenza
 apps/erpnext/erpnext/config/hr.py +253,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 +141,Set as Lost,Imposta come persa
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,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 +5,This is based on transactions against this Customer. See timeline below for details,Questo si basa su operazioni contro questo cliente. Vedere cronologia sotto per i dettagli
 DocType: Supplier,Credit Days Based On,Giorni di credito in funzione
@@ -4018,11 +4076,10 @@
 ,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 +941,Select or add new customer,Selezionare o aggiungere nuovo cliente
+apps/erpnext/erpnext/accounts/page/pos/pos.js +930,Select or add new customer,Selezionare o aggiungere nuovo cliente
 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 +5,This is based on the attendance of this Employee,Questo si basa sulla presenza di questo dipendente
-DocType: Sales Invoice,Frequency,Frequenza
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +463,Debit Account,Conto di addebito
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,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)
@@ -4031,27 +4088,27 @@
 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 +210,Supplier Quotation {0} created,Preventivo Fornitore {0} creato
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +208,Supplier Quotation {0} created,Preventivo Fornitore {0} creato
 apps/erpnext/erpnext/accounts/report/financial_statements.py +90,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 +173,Employee Benefits,Benefici per i dipendenti
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,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 +228,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 +232,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 +499,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 +500,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 +1007,Price List not found or disabled,Listino Prezzi non trovato o disattivato
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1008,Price List not found or disabled,Listino Prezzi non trovato o disattivato
 DocType: Expense Claim,Approved,Approvato
 DocType: Pricing Rule,Price,prezzo
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +244,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 +256,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
@@ -4062,12 +4119,12 @@
 DocType: Address,Office,Ufficio
 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 +259,Please select Employee Record first.,Si prega di selezionare i dipendenti Record prima.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +266,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 +190,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 +235,Please enter Expense Account,Inserisci il Conto uscite
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,Please enter Expense Account,Inserisci il Conto uscite
 DocType: Account,Stock,Magazzino
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,"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 +976,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Riferimento Tipo di documento deve essere uno di Ordine di Acquisto, fatture di acquisto o diario"
 DocType: Employee,Current Address,Indirizzo Corrente
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Se l'articolo è una variante di un altro elemento poi descrizione, immagini, prezzi, tasse ecc verrà impostata dal modello se non espressamente specificato"
 DocType: Serial No,Purchase / Manufacture Details,Acquisto / Produzione Dettagli
@@ -4082,9 +4139,10 @@
 DocType: Asset Movement,Transaction Date,Transaction Data
 DocType: Production Plan Item,Planned Qty,Qtà Planned
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,Totale IVA
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,For Quantity (Manufactured Qty) is mandatory,Per quantità (Quantità Prodotto) è obbligatorio
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,For Quantity (Manufactured Qty) is mandatory,Per quantità (Quantità Prodotto) è obbligatorio
 DocType: Stock Entry,Default Target Warehouse,Magazzino Destinazione Predefinito
 DocType: Purchase Invoice,Net Total (Company Currency),Totale Netto (Valuta Azienda)
+apps/erpnext/erpnext/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 +78,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: Production Order,Actual Start Date,Data inizio effettiva
@@ -4099,9 +4157,11 @@
 DocType: Warranty Claim,If different than customer address,Se diverso da indirizzo del cliente
 DocType: BOM Operation,BOM Operation,Operazione BOM
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Sul Fila Indietro Importo
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +226,Transfer Asset,Trasferimento Asset
+DocType: Student,Home Address,Indirizzo di casa
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +227,Transfer Asset,Trasferimento Asset
 DocType: POS Profile,POS Profile,POS Profilo
 apps/erpnext/erpnext/config/schools.py +33,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 +129,"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
@@ -4111,8 +4171,8 @@
 DocType: Assessment,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 +765,Material to Supplier,Materiale da Fornitore
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +189,Excise Invoice,Accise Fattura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,Material to Supplier,Materiale da Fornitore
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,Accise Fattura
 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
@@ -4122,7 +4182,7 @@
 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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,Gruppi di studenti hanno creato.
 DocType: Scheduling Tool,Scheduling Tool,Strumento di pianificazione
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +136,Credit Card,carta di credito
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,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 .
 DocType: Purchase Invoice,Next Date,Successiva Data
@@ -4130,6 +4190,7 @@
 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: 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
@@ -4141,7 +4202,7 @@
 DocType: Customer,Commission Rate,Tasso Commissione
 apps/erpnext/erpnext/stock/doctype/item/item.js +261,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 +115,"Payment Type must be one of Receive, Pay and Internal Transfer","Tipo di pagamento deve essere uno dei Ricevere, Pay e di trasferimento interno"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +118,"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/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Carrello è Vuoto
 DocType: Production Order,Actual Operating Cost,Costo operativo effettivo
@@ -4156,10 +4217,10 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,Seleziona un file csv
 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 +92,Designer,Designer
+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
 DocType: Serial No,Delivery Details,Dettagli Consegna
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +469,Cost Center is required in row {0} in Taxes table for type {1},Centro di costo è richiesto in riga {0} nella tabella Tasse per il tipo {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +472,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
 ,Item-wise Purchase Register,Articolo-saggio Acquisto Registrati
 DocType: Batch,Expiry Date,Data Scadenza
@@ -4169,12 +4230,12 @@
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Progetto Master.
 apps/erpnext/erpnext/controllers/status_updater.py +174,"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 +417, (Half Day),(Mezza giornata)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425, (Half Day),(Mezza giornata)
 DocType: Supplier,Credit Days,Giorni Credito
 DocType: Leave Type,Is Carry Forward,È Portare Avanti
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +740,Get Items from BOM,Recupera elementi da Distinta Base
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +711,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 +549,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/controllers/accounts_controller.py +552,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
 ,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
diff --git a/erpnext/translations/ja.csv b/erpnext/translations/ja.csv
index 563aaf9..b37f119 100644
--- a/erpnext/translations/ja.csv
+++ b/erpnext/translations/ja.csv
@@ -18,11 +18,10 @@
 DocType: Sales Partner,Dealer,ディーラー
 DocType: Employee,Rented,賃貸
 DocType: Purchase Order,PO-,PO-
-apps/erpnext/erpnext/accounts/report/financial_statements.py +19,Start Year {0} not found.,開始年は{0}が見つかりません。
 DocType: POS Profile,Applicable for User,ユーザーに適用
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +191,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",停止中の製造指示をキャンセルすることはできません。キャンセルする前に停止解除してください
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +197,Do you really want to scrap this asset?,本当にこの資産を廃棄しますか？
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +17,Select Default Supplier,デフォルトサプライヤーを選択
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +192,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",停止中の製造指示をキャンセルすることはできません。キャンセルする前に停止解除してください
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +198,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 +36,Currency is required for Price List {0},価格表{0}には通貨が必要です
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,※取引内で計算されます。
 DocType: Address,County,郡
@@ -42,46 +41,45 @@
 DocType: Sales Invoice,Customer Name,顧客名
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +126,Bank account cannot be named as {0},銀行口座は {0} のように名前を付けることはできません
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,会計エントリに対する科目（またはグループ）が作成され、残高が維持されます
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +180,Outstanding for {0} cannot be less than zero ({1}),{0}の残高はゼロより小さくすることはできません（{1}）
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,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 +148,Series Updated Successfully,シリーズを正常に更新しました
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +149,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,全てのサプライヤー連絡先
-DocType: Quality Inspection Reading,Parameter,パラメータ
 apps/erpnext/erpnext/projects/doctype/project/project.py +54,Expected End Date can not be less than Expected Start Date,終了予定日は、予想開始日より前にすることはできません
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,行＃{0}：単価は {1}と同じである必要があります：{2}（{3} / {4}）
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +239,New Leave Application,新しい休暇申請
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,New Leave Application,新しい休暇申請
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +20,Attendance Record {0} exists against Student {1} for Course Schedule {2},出席はレコード{0}コーススケジュールのために学生{1}に対して存在している{2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Bank Draft,銀行為替手形
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,銀行為替手形
 DocType: Mode of Payment Account,Mode of Payment Account,支払口座のモード
 apps/erpnext/erpnext/stock/doctype/item/item.js +52,Show Variants,バリエーションを表示
 DocType: Academic Term,Academic Term,学術用語
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +13,Material,材料
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Quantity,数量
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +511,Accounts table cannot be blank.,アカウントの表は、空白にすることはできません。
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +616,Quantity,数量
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +512,Accounts table cannot be blank.,アカウントの表は、空白にすることはできません。
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,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/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 +142,User {0} is already assigned to Employee {1},ユーザー{0}はすでに従業員{1}に割り当てられています
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,健康管理
-DocType: Purchase Invoice,Monthly,月次
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),支払遅延（日数）
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +771,Invoice,請求
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +750,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 +198,Row {0}: {1} {2} does not match with {3},行{0}：{1} {2} は {3}と一致しません
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,行 {0}：
+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 +127,Please select Price List,価格表を選択してください
@@ -112,8 +110,8 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,同じ会社が複数回入力されています
 DocType: Employee,Married,結婚してる
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},{0} は許可されていません
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +589,Get items from,からアイテムを取得します
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +382,Stock cannot be updated against Delivery Note {0},納品書{0}に対して在庫を更新することはできません
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,からアイテムを取得します
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,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,食料品
@@ -122,7 +120,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 +156,Salary Structure Missing,給与構造の欠落
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Salary Structure Missing,給与構造の欠落
 DocType: Lead,Person Name,人名
 DocType: Sales Invoice Item,Sales Invoice Item,請求明細
 DocType: Account,Credit,貸方
@@ -130,10 +128,11 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",例えば、「小学校」や「大学」
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,在庫レポート
 DocType: Warehouse,Warehouse Detail,倉庫の詳細
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,Credit limit has been crossed for customer {0} {1}/{2},顧客{0}の与信限度額を超えました {1} / {2}
-apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",資産レコードが項目に対して存在するように、オフにすることはできません「固定資産です」
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +189,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",資産レコードが項目に対して存在するように、オフにすることはできません「固定資産です」
 DocType: Tax Rule,Tax Type,税タイプ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +144,You are not authorized to add or update entries before {0},{0}以前のエントリーを追加または更新する権限がありません
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},{0}以前のエントリーを追加または更新する権限がありません
 DocType: Item,Item Image (if not slideshow),アイテム画像（スライドショーされていない場合）
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,同名の顧客が存在します
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,（時間単価 ÷ 60）× 実際の作業時間
@@ -143,18 +142,17 @@
 DocType: Student Log,Student Log,学生ログイン
 DocType: Quality Inspection,Get Specification Details,仕様詳細を取得
 DocType: Lead,Interested,関心あり
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +165,Opening,期首
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,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/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,顧客&gt;顧客グループ&gt;テリトリー
 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.,既存の取引を持つアカウントをグループに変換することはできません。
 DocType: Lead,Product Enquiry,製品のお問い合わせ
 DocType: Academic Term,Schools,学校
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,最初の「会社」を入力してください
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Company first,会社を選択してください
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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,費用合計
@@ -164,7 +162,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,決算報告
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,医薬品
 DocType: Purchase Invoice Item,Is Fixed Asset,固定資産であります
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Available qty is {0}, you need {1}",利用可能な数量は{0}、あなたが必要とされている{1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +225,"Available qty is {0}, you need {1}",利用可能な数量は{0}、あなたが必要とされている{1}
 DocType: Expense Claim Detail,Claim Amount,請求額
 DocType: Employee,Mr,氏
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,サプライヤータイプ/サプライヤー
@@ -173,26 +171,27 @@
 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: Assessment Result,Grade,グレード
 DocType: Sales Invoice Item,Delivered By Supplier,サプライヤーにより配送済
 DocType: SMS Center,All Contact,全ての連絡先
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Annual Salary,年俸
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,在庫経費
-apps/erpnext/erpnext/accounts/report/financial_statements.py +22,End Year {0} not found.,終了年{0}が見つかりません。
 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}の受領数と等しくなければなりません
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,購入のための原材料供給
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +130,At least one mode of payment is required for POS invoice.,支払いの少なくとも1モードはPOS請求書に必要とされます。
 DocType: Products Settings,Show Products as a List,製品を表示するリストとして
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","テンプレートをダウンロードし、適切なデータを記入した後、変更したファイルを添付してください。
 選択した期間内のすべての日付と従業員の組み合わせは、既存の出勤記録と一緒に、テンプレートに入ります"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +451,Item {0} is not active or end of life has been reached,アイテム{0}は、アクティブでないか、販売終了となっています
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +456,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/controllers/accounts_controller.py +614,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",アイテム料金の行{0}に税を含めるには、行{1}の税も含まれていなければなりません
+apps/erpnext/erpnext/controllers/accounts_controller.py +617,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",アイテム料金の行{0}に税を含めるには、行{1}の税も含まれていなければなりません
 apps/erpnext/erpnext/config/hr.py +166,Settings for HR Module,人事モジュール設定
 DocType: SMS Center,SMS Center,SMSセンター
 DocType: Sales Invoice,Change Amount,変化量
@@ -204,13 +203,13 @@
 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 +147,Execution,実行
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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,アイテムと価格
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},合計時間：{0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},開始日は当会計年度内にする必要があります。（もしかして：開始日= {0}）
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,Cost Center {0} does not belong to Company {1},コストセンター{0}は会社{1}に属していません
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +100,Cost Center {0} does not belong to Company {1},コストセンター{0}は会社{1}に属していません
 DocType: Customer,Individual,個人
 DocType: Interest,Academics User,学者ユーザー
 DocType: Cheque Print Template,Amount In Figure,図では量
@@ -226,30 +225,32 @@
 DocType: Production Planning Tool,Sales Orders,受注
 DocType: Purchase Taxes and Charges,Valuation,評価
 ,Purchase Order Trends,発注傾向
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,The request for quotation can be accessed by clicking on the following link,見積依頼は、以下のリンクをクリックすることによってアクセスすることができます
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,今年の休暇を割り当てる。
 DocType: SG Creation Tool Course,SG Creation Tool Course,SG作成ツールコース
 DocType: Student Group Creation Tool,Leave blank if you wish to fetch all courses for selected academic term,あなたが選択した学術用語のためにすべてのコースを取得したい場合は空白のまま
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,Insufficient Stock,不十分な証券
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227,Insufficient Stock,不十分な証券
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,キャパシティプランニングとタイムトラッキングを無効にします
+DocType: Email Digest,New Sales Orders,新しい注文
 DocType: Bank Reconciliation,Bank Account,銀行口座
 DocType: Leave Type,Allow Negative Balance,マイナス残高を許可
 DocType: Selling Settings,Default Territory,デフォルト地域
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,TV
 DocType: Production Order Operation,Updated via 'Time Log',「時間ログ」から更新
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} does not belong to Company {1},アカウント{0}は会社{1}に属していません
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +86,Account {0} does not belong to Company {1},アカウント{0}は会社{1}に属していません
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},前払金は {0} {1} より大きくすることはできません
 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 +174,For Warehouse is required before Submit,提出前に必要とされる倉庫用
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,For Warehouse is required before Submit,提出前に必要とされる倉庫用
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,受領日
 DocType: Sales Partner,Reseller,リセラー
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,「会社」を入力してください
 DocType: Delivery Note Item,Against Sales Invoice Item,対販売伝票アイテム
 ,Production Orders in Progress,進行中の製造指示
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Cash from Financing,財務によるキャッシュ・フロー
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1436,"LocalStorage is full , did not save",localStorageがいっぱいになった、保存されませんでした
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1460,"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} 上に作成されます
@@ -262,18 +263,19 @@
 apps/erpnext/erpnext/templates/generators/item.html +78,No description given,説明がありません
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,仕入要求
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +5,This is based on the Time Sheets created against this project,これは、このプロジェクトに対して作成されたタイムシートに基づいています
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Only the selected Leave Approver can submit this Leave Application,選択した休暇承認者のみ、休暇申請を提出可能です
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +213,Only the selected Leave Approver can submit this Leave Application,選択した休暇承認者のみ、休暇申請を提出可能です
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,退職日は入社日より後でなければなりません
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Leaves per Year,年次休暇
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,年次休暇
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,行{0}：前払エントリである場合、アカウント{1}に対する「前払」をご確認ください
 apps/erpnext/erpnext/stock/utils.py +188,Warehouse {0} does not belong to company {1},倉庫{0}は会社{1}に属していません
+DocType: Email Digest,Profit & Loss,利益損失
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,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 +435,Leave Blocked,休暇
-apps/erpnext/erpnext/stock/doctype/item/item.py +669,Item {0} has reached its end of life on {1},アイテム{0}は{1}に耐用年数の終わりに達します
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +443,Leave Blocked,休暇
+apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item {0} has reached its end of life on {1},アイテム{0}は{1}に耐用年数の終わりに達します
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +95,Bank Entries,銀行エントリー
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +83,Annual,年次
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +86,Annual,年次
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,在庫棚卸アイテム
 DocType: Stock Entry,Sales Invoice No,請求番号
 DocType: Material Request Item,Min Order Qty,最小注文数量
@@ -281,20 +283,22 @@
 DocType: Lead,Do Not Contact,コンタクト禁止
 apps/erpnext/erpnext/public/js/setup_wizard.js +360,People who teach at your organisation,あなたの組織で教える人
 DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,定期的な請求書を全て追跡するための一意のIDで、提出時に生成されます
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Software Developer,ソフトウェア開発者
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,ソフトウェア開発者
 DocType: Item,Minimum Order Qty,最小注文数量
 DocType: Pricing Rule,Supplier Type,サプライヤータイプ
 DocType: Scheduling Tool,Course Start Date,コース開始日
 DocType: Item,Publish in Hub,ハブに公開
+DocType: Student Admission,Student Admission,学生の入学
 ,Terretory,地域
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is cancelled,アイテム{0}をキャンセルしました
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Material Request,資材要求
+apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} is cancelled,アイテム{0}をキャンセルしました
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +823,Material Request,資材要求
 DocType: Bank Reconciliation,Update Clearance Date,清算日の更新
 apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +28,Abbreviation already used for another salary component,すでに別の給与のコンポーネントに使用される略語
 DocType: Item,Purchase Details,仕入詳細
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +328,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},仕入注文 {1} の「原材料供給」テーブルにアイテム {0} が見つかりません
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +333,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/config/selling.py +18,Confirmed orders from Customers.,お客様からのご注文確認。
 DocType: Purchase Receipt Item,Rejected Quantity,拒否された数量
 DocType: SMS Settings,SMS Sender Name,SMS送信者名
@@ -310,20 +314,21 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +130,Please select Charge Type first,請求タイプを最初に選択してください
 DocType: Student Group Student,Student Group Student,学生グループ学生
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,新着
+DocType: Email Digest,New Quotations,新しい請求書
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,リストに最初に追加される休暇承認者は、デフォルト休暇承認者として設定されます。
 DocType: Tax Rule,Shipping County,配送郡
 apps/erpnext/erpnext/config/desktop.py +158,Learn,学ぶ
 DocType: Asset,Next Depreciation Date,次の減価償却日
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,従業員一人あたりの活動費用
 DocType: Accounts Settings,Settings for Accounts,アカウント設定
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +626,Supplier Invoice No exists in Purchase Invoice {0},サプライヤ請求書なしでは購入請求書に存在する{0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +629,Supplier Invoice No exists in Purchase Invoice {0},サプライヤ請求書なしでは購入請求書に存在する{0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,セールスパーソンツリーを管理します。
 DocType: Job Applicant,Cover Letter,カバーレター
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,明らかに優れた小切手および預金
 DocType: Item,Synced With Hub,ハブと同期
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,間違ったパスワード
 DocType: Item,Variant Of,バリエーション元
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,Completed Qty can not be greater than 'Qty to Manufacture',完成した数量は「製造数量」より大きくすることはできません
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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 +86,Circular Reference Error,循環参照エラー
@@ -335,15 +340,16 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,自動的な資材要求の作成時にメールで通知
 DocType: Journal Entry,Multi Currency,複数通貨
 DocType: Payment Reconciliation Invoice,Invoice Type,請求書タイプ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +806,Delivery Note,納品書
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +800,Delivery Note,納品書
 apps/erpnext/erpnext/config/learn.py +87,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 +233,Payment Entry has been modified after you pulled it. Please pull it again.,支払エントリが変更されています。引用しなおしてください
+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/setup/doctype/email_digest/email_digest.py +104,Summary for this week and pending activities,今週と保留中の活動の概要
+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",カンマで区切られたメールアドレスを入力すると、請求が特定の日に自動的に送信されます
 DocType: Employee,Company Email,会社の電子メール
@@ -356,28 +362,29 @@
 apps/erpnext/erpnext/config/hr.py +186,"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,顧客通貨が顧客の基本通貨に換算されるレート
-apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},行＃{0}：購入請求書は、既存の資産に対して行うことはできません。{1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +554,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},行＃{0}：購入請求書は、既存の資産に対して行うことはできません。{1}
 DocType: Item Tax,Tax Rate,税率
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} は従業員 {1} の期間 {2} から {3} へ既に割り当てられています
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +812,Select Item,アイテムを選択
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +791,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/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,仕入請求{0}はすでに提出されています
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},行＃{0}：バッチ番号は {1} {2}と同じである必要があります
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +143,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.,アイテムのバッチ（ロット）
 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 +342,Please see attachment,添付ファイルを参照してください
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,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 +19,Setup Already Complete!!,セットアップはすでに完了しています！
 ,Finished Goods,完成品
 DocType: Delivery Note,Instructions,説明書
 DocType: Quality Inspection,Inspected By,検査担当
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,サプライヤー&gt;サプライヤータイプ
 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,アイテムを追加
@@ -391,29 +398,29 @@
 DocType: Currency Exchange,Currency Exchange,為替
 DocType: Purchase Invoice Item,Item Name,アイテム名
 DocType: Authorization Rule,Approving User  (above authorized value),ユーザーの承認（許可値以上）
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,貸方残高
+DocType: Email Digest,Credit Balance,貸方残高
 DocType: Employee,Widowed,死別
 DocType: Request for Quotation,Request for Quotation,見積依頼
 DocType: Salary Slip Timesheet,Working Hours,労働時間
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,既存のシリーズについて、開始／現在の連続番号を変更します。
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.",複数の価格設定ルールが優先しあった場合、ユーザーは、競合を解決するために、手動で優先度を設定するように求められます。
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +736,Purchase Return,仕入返品
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +715,Purchase Return,仕入返品
 ,Purchase Register,仕入帳
 DocType: Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,適用料金
 DocType: Workstation,Consumable Cost,消耗品費
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +202,{0} ({1}) must have role 'Leave Approver',{0}（{1}）は「休暇承認者」の役割を持っている必要があります
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,{0} ({1}) must have role 'Leave Approver',{0}（{1}）は「休暇承認者」の役割を持っている必要があります
 DocType: Purchase Receipt,Vehicle Date,車両日付
 DocType: Student Log,Medical,検診
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,失敗の原因
-apps/erpnext/erpnext/accounts/utils.py +239,Allocated amount can not greater than unadjusted amount,配分される金額未調整の量よりも多くすることはできません
+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,配分される金額未調整の量よりも多くすることはできません
 DocType: Announcement,Receiver,受信機
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},作業所は、休日リストに従って、次の日に休業します：{0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,機会
 DocType: Employee,Single,シングル
 DocType: Account,Cost of Goods Sold,売上原価
 DocType: Purchase Invoice,Yearly,毎年
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +225,Please enter Cost Center,「コストセンター」を入力してください
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,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,審査官の名前
@@ -426,26 +433,26 @@
 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,サプライヤー請求番号が一意であることを確認してください
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',「終了事例番号」は「開始事例番号」より前にはできません
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,Non Profit,非営利
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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: Stock Reconciliation Item,Do not include symbols (ex. $),記号を含めないでください（例：$）
 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 +638,Attribute {0} selected multiple times in Attributes Table,属性 {0} は属性表内で複数回選択されています
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,属性 {0} は属性表内で複数回選択されています
 DocType: HR Settings,Employee record is created using selected field. ,従業員レコードは選択されたフィールドを使用して作成されます。
 DocType: Sales Order,Not Applicable,特になし
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,休日マスター
 DocType: Request for Quotation Item,Required Date,要求日
 DocType: Delivery Note,Billing Address,請求先住所
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +862,Please enter Item Code.,アイテムコードを入力してください
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +847,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",チェックすると、税額が既に表示上の単価／額に含まれているものと見なされます
@@ -459,12 +466,12 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,有価証券および預金
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,割り当てられた総葉は必須です
 DocType: Job Opening,Description of a Job Opening,求人の説明
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Pending activities for today,今日のために保留中の活動
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,今日のために保留中の活動
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,出勤レコード
 DocType: Salary Structure,Salary Component for timesheet based payroll.,タイムシートベースの給与の給与コンポーネント。
 DocType: Sales Order Item,Used for Production Plan,生産計画に使用
 DocType: Manufacturing Settings,Time Between Operations (in mins),操作の間の時間（分単位）
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +92,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0}アカウントの予算が{1}コストセンターに対して{2} {3}です。これは、{4}によって超えてしまいます
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +95,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0}アカウントの予算が{1}コストセンターに対して{2} {3}です。これは、{4}によって超えてしまいます
 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が同じ項目のためではありません
@@ -472,16 +479,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +238,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 +86,Administrative Officer,管理担当者
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,管理担当者
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +23,Acutal Qty {0} / Waiting Qty {1},Acutal数量{0} /待機数量{1}
 DocType: Timesheet Detail,Hrs,時間
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +319,Please select Company,会社を選択してください
-DocType: Stock Entry,Difference Account,差損益
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +309,Please select Company,会社を選択してください
+DocType: Stock Entry Detail,Difference Account,差損益
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,依存するタスク{0}がクローズされていないため、タスクをクローズできません
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Please enter Warehouse for which Material Request will be raised,資材要求が発生する倉庫を入力してください
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +399,Please enter Warehouse for which Material Request will be raised,資材要求が発生する倉庫を入力してください
 DocType: Production Order,Additional Operating Cost,追加の営業費用
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,化粧品
-apps/erpnext/erpnext/stock/doctype/item/item.py +530,"To merge, following properties must be same for both items",マージするには、両方のアイテムで次の属性が同じである必要があります。
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,"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 +28,Buy,購入
@@ -489,7 +496,7 @@
 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 +1563,Serial no item cannot be a fraction,シリアル番号の項目は、分数ではできません
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1587,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,業務委託管理
@@ -498,13 +505,14 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Account {0} does not belong to company: {1},アカウント{0}は会社{1}に属していません
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation already used for another company,略称が既に別の会社で使用されています
 DocType: Selling Settings,Default Customer Group,デフォルトの顧客グループ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Supplier is required against Payable account {0},サプライヤーは、買掛金勘定に対して必要とされている{0}
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction",無効にすると、「四捨五入された合計」欄は各取引には表示されなくなります
 DocType: BOM,Operating Cost,運用費
 DocType: Sales Order Item,Gross Profit,粗利益
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +42,Increment cannot be 0,増分は0にすることはできません
 DocType: Production Planning Tool,Material Requirement,資材所要量
 DocType: Company,Delete Company Transactions,会社の取引を削除
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +313,Reference No and Reference Date is mandatory for Bank transaction,リファレンスはありませんし、基準日は、銀行取引のために必須です
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +316,Reference No and Reference Date is mandatory for Bank transaction,リファレンスはありませんし、基準日は、銀行取引のために必須です
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,租税公課の追加/編集
 DocType: Purchase Invoice,Supplier Invoice No,サプライヤー請求番号
 DocType: Territory,For reference,参考のため
@@ -515,7 +523,6 @@
 DocType: Installation Note Item,Installation Note Item,設置票アイテム
 DocType: Production Plan Item,Pending Qty,保留中の数量
 DocType: Budget,Ignore,無視
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,商品コード&gt;項目グループ&gt;ブランド
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,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,給与スリップタイムシート
@@ -526,11 +533,11 @@
 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/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,請求書テーブルにレコードが見つかりません
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +28,Please select Company and Party Type first,最初の会社と当事者タイプを選択してください
+apps/erpnext/erpnext/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/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 +707,Make Sales Order,受注を作成
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +701,Make Sales Order,受注を作成
 DocType: Project Task,Project Task,プロジェクトタスク
 ,Lead Id,リードID
 DocType: C-Form Invoice Detail,Grand Total,総額
@@ -546,7 +553,8 @@
 DocType: Job Applicant,Resume Attachment,再開アタッチメント
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,リピート顧客
 DocType: Leave Control Panel,Allocate,割当
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +734,Sales Return,販売返品
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +728,Sales Return,販売返品
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +91,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,注：総割り当てられた葉を{0}の期間のためにすでに承認された葉{1}を下回ってはいけません
 DocType: Announcement,Posted By,投稿者
 DocType: Item,Delivered by Supplier (Drop Ship),サプライヤーより配送済（ドロップシッピング）
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,潜在顧客データベース
@@ -555,14 +563,13 @@
 DocType: Quotation,Quotation To,見積先
 DocType: Lead,Middle Income,中収益
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +212,Opening (Cr),開く（貸方）
-apps/erpnext/erpnext/stock/doctype/item/item.py +795,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,すでに別の測定単位でいくつかのトランザクションを行っているので、項目のデフォルトの単位は、{0}を直接変更することはできません。あなたは、異なるデフォルトのUOMを使用する新しいアイテムを作成する必要があります。
-apps/erpnext/erpnext/accounts/utils.py +237,Allocated amount can not be negative,割当額をマイナスにすることはできません
+apps/erpnext/erpnext/stock/doctype/item/item.py +797,Default Unit of Measure for Item {0} cannot be changed directly because 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,割当額をマイナスにすることはできません
 DocType: Purchase Order Item,Billed 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 +91,Reference No & Reference Date is required for {0},{0}には参照番号・参照日が必要です
-DocType: Sales Invoice,Customer's Vendor,顧客のベンダー
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Proposal Writing,提案の作成
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,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",チェックした場合、サブ契約しているアイテムの原料は、素材の要求に含まれます
@@ -571,13 +578,14 @@
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,タイムトラッキング
 DocType: Fiscal Year Company,Fiscal Year Company,会計年度（会社）
 DocType: Packing Slip Item,DN Detail,請求書詳細
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +257,Already supplier quotation has created,すでにサプライヤー引用は作成しています
 DocType: Timesheet,Billed,課金
 DocType: Batch,Batch Description,バッチ説明
+apps/erpnext/erpnext/accounts/utils.py +685,"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 +733,View Offline Records,ビューオフラインレコード
+apps/erpnext/erpnext/accounts/page/pos/pos.js +715,View Offline Records,ビューオフラインレコード
+DocType: Student,Sibling Details,兄弟詳細
 DocType: Employee,Reason for Resignation,退職理由
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,業績評価用テンプレート
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,請求／仕訳詳細
@@ -591,7 +599,7 @@
 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,在庫の純変更
 DocType: Employee,Passport Number,パスポート番号
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Manager,マネージャー
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,マネージャー
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,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,「参照元」と「グループ元」は同じにすることはできません
@@ -600,10 +608,11 @@
 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 +299,Timesheet created:,タイムシートを作成しました：
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +715,Please set default Cash or Bank account in Mode of Payment {0},支払方法{0}にデフォルトの現金や銀行口座を設定してください
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +300,Timesheet created:,タイムシートを作成しました：
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +772,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,登録します
 DocType: Selling Settings,Customer Naming By,顧客名設定
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,人事でのシステムの命名してくださいセットアップ社員&gt; HRの設定
 DocType: Depreciation Schedule,Depreciation Amount,減価償却額
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,グループへの変換
 DocType: Activity Cost,Activity Type,活動タイプ
@@ -628,6 +637,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,仕上げ
 DocType: Pricing Rule,Sales Manager,営業部長
 DocType: Salary Structure Employee,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,資産売却益/損失勘定
@@ -642,11 +652,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +9,Pre Sales,事前販売
 DocType: Purchase Receipt,Other Details,その他の詳細
 DocType: Account,Accounts,アカウント
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Marketing,マーケティング
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +227,Payment Entry is already created,支払エントリがすでに作成されています
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,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 +538,Row #{0}: Asset {1} does not linked to Item {2},行＃{0}：{1}資産はアイテムにリンクされていません{2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +21,Preview Salary Slip,プレビュー給与スリップ
+apps/erpnext/erpnext/controllers/accounts_controller.py +541,Row #{0}: Asset {1} does not linked to Item {2},行＃{0}：{1}資産はアイテムにリンクされていません{2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +38,Preview Salary Slip,プレビュー給与スリップ
 DocType: Company,Deafult Cost Center,Deafultコストセンター
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +48,Account {0} has been entered multiple times,アカウント{0}を複数回入力されました
 DocType: Account,Expenses Included In Valuation,評価中経費
@@ -655,7 +665,7 @@
 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 +617,Item has variants.,アイテムはバリエーションがあります
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,アイテムはバリエーションがあります
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,アイテム{0}が見つかりません
 DocType: Bin,Stock Value,在庫価値
 apps/erpnext/erpnext/accounts/doctype/account/account.py +25,Company {0} does not exist,当社{0}は存在しません。
@@ -675,7 +685,7 @@
 DocType: Purchase Order,Supply Raw Materials,原材料供給
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,次の請求が生成される日（提出すると生成されます）
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,流動資産
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,{0} is not a stock Item,{0}は在庫アイテムではありません
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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 +169,Lead must be set if Opportunity is made from Lead,リードから機会を作る場合は、リードが設定されている必要があります
@@ -768,26 +778,25 @@
 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 +709,No Permission,権限がありませんん
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +710,No Permission,権限がありませんん
 DocType: Company,Default Bank Account,デフォルト銀行口座
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",「当事者」に基づいてフィルタリングするには、最初の「当事者タイプ」を選択してください
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},アイテムが{0}経由で配送されていないため、「在庫更新」はチェックできません
 apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,番号
 DocType: Item,Items with higher weightage will be shown higher,高い比重を持つアイテムはより高く表示されます
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,銀行勘定調整詳細
-apps/erpnext/erpnext/controllers/accounts_controller.py +542,Row #{0}: Asset {1} must be submitted,行＃{0}：アセット{1}提出しなければなりません
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,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から在庫残高をアップロード
 DocType: Warehouse,Tree Details,ツリーの詳細
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,今すぐ送信
 ,Support Analytics,サポート分析
 DocType: Item,Website Warehouse,ウェブサイトの倉庫
 DocType: Payment Reconciliation,Minimum Invoice Amount,最小請求額
 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/sales_invoice/sales_invoice.py +227,Timesheet {0} is already completed or cancelled,タイムシート{0}はすでに完了またはキャンセルされます
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +259,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以下でなければなりません
@@ -803,13 +812,13 @@
 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 +229,Target Warehouse,ターゲット倉庫
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +230,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-,ステ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Sales Order Date,納品予定日は受注日より前にすることはできません
 DocType: Upload Attendance,Import Attendance,出勤インポート
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,全てのアイテムグループ
+apps/erpnext/erpnext/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/config/setup.py +89,Automatically compose message on submission of transactions.,取引の送信時、自動的にメッセージを作成します。
@@ -821,13 +830,15 @@
 DocType: Sales Invoice,Payment Due Date,支払期日
 apps/erpnext/erpnext/stock/doctype/item/item.js +278,Item Variant {0} already exists with same attributes,アイテムバリエーション{0}は既に同じ属性で存在しています
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',「オープニング」
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,行うにオープン
 DocType: Notification Control,Delivery Note Message,納品書のメッセージ
 DocType: Expense Claim,Expenses,経費
 DocType: Item Variant Attribute,Item Variant Attribute,アイテムバリエーション属性
 ,Purchase Receipt Trends,領収書傾向
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Research & Development,研究開発
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,研究開発
 ,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,価格または割引
@@ -836,7 +847,7 @@
 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/controllers/accounts_controller.py +340,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",それはこの請求書には、予めよう引っ張られるべきである場合に支払いエントリ{0}は注文{1}に対してリンクされているが、確認してください。
+apps/erpnext/erpnext/controllers/accounts_controller.py +343,"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
@@ -858,12 +869,12 @@
 DocType: Supplier Quotation,Is Subcontracted,下請け
 DocType: Item Attribute,Item Attribute Values,アイテムの属性値
 DocType: Examination Result,Examination Result,テスト結果
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +756,Purchase Receipt,領収書
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +735,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 +167,Reference Doctype must be one of {0},リファレンスDOCTYPEが{0}のいずれかでなければなりません
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +282,Unable to find Time Slot in the next {0} days for Operation {1},操作{1}のための時間スロットは次の{0}日間に存在しません
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +170,Reference Doctype must be one of {0},リファレンスDOCTYPEが{0}のいずれかでなければなりません
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,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 +439,BOM {0} must be active,部品表{0}はアクティブでなければなりません
@@ -874,7 +885,7 @@
 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 +214,Warehouses with existing transaction can not be converted to ledger.,既存の取引に倉庫は元帳に変換することはできません。
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +217,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,製造指示
@@ -888,9 +899,9 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,従業員{0}はアクティブでないか、存在しません
 DocType: Fee Structure,Components,コンポーネント
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,Please enter Asset Category in Item {0},アイテムのアセットカテゴリを入力してください{0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +612,Item Variants {0} updated,アイテムバリエーション{0}を更新しました
+apps/erpnext/erpnext/stock/doctype/item/item.py +614,Item Variants {0} updated,アイテムバリエーション{0}を更新しました
 DocType: Quality Inspection Reading,Reading 6,報告要素6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +843,Cannot {0} {1} {2} without any negative outstanding invoice,することができません{0} {1} {2}任意の負の優れたインボイスなし
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +854,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,今すぐ同期
@@ -905,71 +916,74 @@
 DocType: Item,Is Purchase Item,仕入アイテム
 DocType: Asset,Purchase Invoice,仕入請求
 DocType: Stock Ledger Entry,Voucher Detail No,伝票詳細番号
-apps/erpnext/erpnext/accounts/page/pos/pos.js +728,New Sales Invoice,新しい売上請求書
+apps/erpnext/erpnext/accounts/page/pos/pos.js +710,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 +728,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: Cheque Print Template,Has Print Format,印刷形式を持っています
-apps/erpnext/erpnext/accounts/page/pos/pos.js +86, is mandatory. Maybe Currency Exchange record is not created for ,必須です。為替レコードが作成されない可能性があります
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +109,Row #{0}: Please specify Serial No for Item {1},行 {0}：アイテム{1}のシリアル番号を指定してください
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +619,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.",「製品付属品」アイテム、倉庫、シリアル番号、バッチ番号は、「梱包リスト」テーブルから検討します。倉庫とバッチ番号が任意の「製品付属品」アイテムのすべての梱包アイテムと同じであれば、これらの値はメインのアイテムテーブルに入力することができ、「梱包リスト」テーブルにコピーされます。
+apps/erpnext/erpnext/accounts/page/pos/pos.js +75, 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 +613,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing 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 +606,Supplier Invoice Date cannot be greater than Posting Date,サプライヤの請求書の日付は、転記日を超えることはできません
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +609,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: 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 +810,Select Item for Transfer,配送のためのアイテムを選択
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +789,Select Item for Transfer,配送のためのアイテムを選択
 DocType: Purchase Invoice,Additional Discount Percentage,追加割引パーセンテージ
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,ヘルプ動画リストを表示
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,小切手が預けられた銀行の勘定科目を選択してください
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,ユーザーに取引の価格表単価の編集を許可
 DocType: Pricing Rule,Max Qty,最大数量
-DocType: Student Applicant,Father's Name,父の名前
 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 +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,行{0}：受発注書に対する支払いは、常に前払金としてマークする必要があります
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,化学
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +686,All items have already been transferred for this Production Order.,アイテムは全てこの製造指示に移動されています。
+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}を確認して、もう一度お試しください
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +694,All items have already been transferred for this Production Order.,アイテムは全てこの製造指示に移動されています。
 DocType: Process Payroll,Select Payroll Year and Month,賃金台帳 年と月を選択
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,Meter,メーター
 DocType: Workstation,Electricity Cost,電気代
 DocType: HR Settings,Don't send Employee Birthday Reminders,従業員の誕生日リマインダを送信しないでください
-DocType: Opportunity,Walk In,立入
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,在庫エントリ
 DocType: Item,Inspection Criteria,検査基準
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,移転済
 apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,レターヘッドとロゴをアップロードします（後で編集可能です）
 DocType: Timesheet Detail,Bill,ビル
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,White,ホワイト
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date is entered as past date,次の減価償却日は過去の日付として入力され、
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +167,White,ホワイト
 DocType: SMS Center,All Lead (Open),全リード（オープン）
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +228,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),行{0}：（{2} {3}）エントリの時間を掲示で{1}倉庫内の{4}の数量は利用できません
+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 +731,Make ,作成
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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,Myカート
-apps/erpnext/erpnext/controllers/selling_controller.py +154,Order Type must be one of {0},注文タイプは{0}のいずれかである必要があります
+apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},注文タイプは{0}のいずれかである必要があります
 DocType: Lead,Next Contact Date,次回連絡日
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,数量を開く
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +393,Please enter Account for Change Amount,変更金額のためにアカウントを入力してください
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,Please enter Account for Change Amount,変更金額のためにアカウントを入力してください
 DocType: Student Batch,Student Batch Name,学生バッチ名
 DocType: Holiday List,Holiday List Name,休日リストの名前
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js +8,Schedule Course,スケジュールコース
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Stock Options,ストックオプション
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,ストックオプション
 DocType: Journal Entry Account,Expense Claim,経費請求
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +211,Do you really want to restore this scrapped asset?,本当にこの廃棄資産を復元しますか？
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +237,Qty for {0},{0}用数量
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +212,Do you really want to restore this scrapped asset?,本当にこの廃棄資産を復元しますか？
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,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,休暇リスト日付
@@ -978,9 +992,9 @@
 DocType: Company,Default Terms,デフォルト規約
 DocType: Packing Slip Item,Packing Slip Item,梱包伝票項目
 DocType: Purchase Invoice,Cash/Bank Account,現金/銀行口座
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,数量または値の変化のないアイテムを削除しました。
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,数量または値の変化のないアイテムを削除しました。
 DocType: Delivery Note,Delivery To,納品先
-apps/erpnext/erpnext/stock/doctype/item/item.py +635,Attribute table is mandatory,属性表は必須です
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,属性表は必須です
 DocType: Production Planning Tool,Get Sales Orders,注文を取得
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0}はマイナスにできません
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,学生を選択してください
@@ -1005,7 +1019,7 @@
 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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},シリアル番号{0}は {1}まで保守契約下にあります
+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,組織名
@@ -1017,7 +1031,7 @@
 DocType: GL Entry,Against,に対して
 DocType: Item,Default Selling Cost Center,デフォルト販売コストセンター
 DocType: Sales Partner,Implementation Partner,導入パートナー
-apps/erpnext/erpnext/controllers/selling_controller.py +231,Sales Order {0} is {1},受注{0}は{1}です
+apps/erpnext/erpnext/controllers/selling_controller.py +232,Sales Order {0} is {1},受注{0}は{1}です
 DocType: Opportunity,Contact Info,連絡先情報
 apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,在庫エントリを作成
 DocType: Packing Slip,Net Weight UOM,正味重量単位
@@ -1027,25 +1041,24 @@
 DocType: Holiday List,Get Weekly Off Dates,週の休日を取得する
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,終了日は開始日より前にすることはできません
 DocType: Sales Person,Select company name first.,はじめに会社名を選択してください
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Dr,借方
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Dr,借方
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,サプライヤーから受け取った見積。
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},{0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,平均年齢
 DocType: 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/templates/pages/home.html +32,View All Products,すべての製品を見ます
+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 +400,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,警告：{1}のアイテム{0} がゼロのため、システムは超過請求をチェックしません
+apps/erpnext/erpnext/controllers/accounts_controller.py +403,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/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,＆年：
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +191,{0} {1} must be submitted,{0} {1}は提出しなければなりません
-DocType: Email Digest,Annual Expense,年間経費
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,{0} {1} must be submitted,{0} {1}は提出しなければなりません
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +145,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}の部品表フィールドで部品表を選択してください
@@ -1056,30 +1069,31 @@
 DocType: Sales Partner,Distributor,販売代理店
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,ショッピングカート出荷ルール
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +211,Production Order {0} must be cancelled before cancelling this Sales Order,受注キャンセルには製造指示{0}のキャンセルをしなければなりません
-apps/erpnext/erpnext/public/js/controllers/transaction.js +62,Please set 'Apply Additional Discount On',設定」で追加の割引を適用」してください
+apps/erpnext/erpnext/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,範囲開始は範囲終了よりも小さくなければなりません
 DocType: Global Defaults,Global Defaults,共通デフォルト設定
 apps/erpnext/erpnext/projects/doctype/project/project.py +153,Project Collaboration Invitation,プロジェクトコラボレーション招待
 DocType: Salary Slip,Deductions,控除
+DocType: Leave Allocation,LAL/,LAL /
 apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,開始年
 DocType: Purchase Invoice,Start date of current invoice's period,請求期限の開始日
 DocType: Salary Slip,Leave Without Pay,無給休暇
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +327,Capacity Planning Error,キャパシティプランニングのエラー
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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 +362,Finished Item {0} must be entered for Manufacture type entry,完成アイテム{0}は製造タイプのエントリで入力する必要があります
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +367,Finished Item {0} must be entered for Manufacture type entry,完成アイテム{0}は製造タイプのエントリで入力する必要があります
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,期首残高
 DocType: Sales Invoice Advance,Sales Invoice Advance,前払金
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +499,Nothing to request,要求するものがありません
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +500,Nothing to request,要求するものがありません
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',「実際の開始日」は、「実際の終了日」より後にすることはできません
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Management,マネジメント
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},{0}には借方計・貸方計のどちらかが必要です
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,マネジメント
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +55,Either debit or credit amount is required for {0},{0}には借方計・貸方計のどちらかが必要です
 DocType: Cheque Print Template,Payer Settings,支払人の設定
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""",これはバリエーションのアイテムコードに追加されます。あなたの略称が「SM」であり、アイテムコードが「T-SHIRT」である場合は、バリエーションのアイテムコードは、「T-SHIRT-SM」になります
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,給与伝票を保存すると給与が表示されます。
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,Blue,青
+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,メールアドレスを設定してください
@@ -1089,12 +1103,12 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +23,POS Profile {0} already created for user: {1} and company {2},POSプロファイル {0} はユーザー：{1} ・会社 {2} で作成済です
 DocType: Purchase Order Item,UOM Conversion Factor,数量単位の変換係数
 DocType: Stock Settings,Default Item Group,デフォルトアイテムグループ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1374,Do you really want to submit the invoice?,あなたは本当に、請求書を提出しますか？
+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 +685,Cost Center For Item with Item Code ',アイテムコードのあるアイテムのためのコストセンター
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1526,"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 +679,Cost Center For Item with Item Code ',アイテムコードのあるアイテムのためのコストセンター
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1550,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",お支払いモードが設定されていません。アカウントが支払いのモードやPOSプロファイルに設定されているかどうか、確認してください。
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,営業担当者には、顧客訪問日にリマインドが表示されます。
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,"Further accounts can be made under Groups, but entries can be made against non-Groups",アカウントはさらにグループの下に作成できますが、エントリは非グループに対して作成できます
 DocType: Lead,Lead,リード
@@ -1114,104 +1128,106 @@
 DocType: Payment Reconciliation,Unreconciled Payment Details,未照合支払いの詳細
 DocType: Global Defaults,Current Fiscal Year,現在の会計年度
 DocType: Global Defaults,Disable Rounded Total,合計の四捨五入を無効にする
-DocType: Lead,Call,電話
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +417,'Entries' cannot be empty,「エントリ」は空にできません
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +418,'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 +214,Fiscal Year {0} not found,年度は、{0}が見つかりません
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +221,Fiscal Year {0} not found,年度は、{0}が見つかりません
 apps/erpnext/erpnext/config/hr.py +238,Setting up Employees,従業員設定
 DocType: Sales Order,SO-,そう-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,接頭辞を選択してください
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Please select prefix first,接頭辞を選択してください
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Research,リサーチ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,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 +43,Item {0} must be a non-stock item,アイテム{0}は非在庫アイテムでなければなりません
 DocType: Contact,User ID,ユーザー ID
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +57,View Ledger,元帳の表示
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,最初
-apps/erpnext/erpnext/stock/doctype/item/item.py +504,"An Item Group exists with same name, please change the item name or rename the item group",同名のアイテムグループが存在しますので、アイテム名を変えるか、アイテムグループ名を変更してください
+apps/erpnext/erpnext/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 +437,Rest Of The World,その他の地域
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,アイテム{0}はバッチを持てません
 ,Budget Variance Report,予算差異レポート
 DocType: Salary Slip,Gross Pay,給与総額
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +90,Row {0}: Activity Type is mandatory.,行{0}：活動タイプは必須です。
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +114,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/public/js/controllers/stock_controller.js +40,Accounting Ledger,会計元帳
+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,内部留保
 DocType: BOM Item,Item Description,アイテム説明
+DocType: Student Sibling,Student Sibling,学生兄弟
 DocType: Purchase Invoice,Is Recurring,繰り返し
 DocType: Purchase Invoice,Supplied Items,サプライヤー供給アイテム
 DocType: Student,STUD.,STUD。
 DocType: Production Order,Qty To Manufacture,製造数
+DocType: Email Digest,New Income,新しい収入
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,仕入サイクル全体で同じレートを維持
 DocType: Opportunity Item,Opportunity Item,機会アイテム
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,仮勘定期首
 ,Employee Leave Balance,従業員の残休暇数
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +131,Balance for Account {0} must always be {1},アカウントの残高は{0}は常に{1}でなければなりません
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +175,Valuation Rate required for Item in row {0},行{0}のアイテムには評価レートが必要です
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,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,例：コンピュータサイエンスの修士
 DocType: Purchase Invoice,Rejected Warehouse,拒否された倉庫
 DocType: GL Entry,Against Voucher,対伝票
 DocType: Item,Default Buying Cost Center,デフォルト購入コストセンター
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.",ERPNextを最大限にするには、我々はあなたがいくつかの時間がかかるし、これらのヘルプビデオを見ることをお勧めします。
-apps/erpnext/erpnext/accounts/page/pos/pos.js +87, to ,へ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,へ
 DocType: Item,Lead Time in days,リードタイム日数
 ,Accounts Payable Summary,買掛金の概要
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Not authorized to edit frozen Account {0},凍結されたアカウント{0}を編集する権限がありません
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},凍結されたアカウント{0}を編集する権限がありません
 DocType: Journal Entry,Get Outstanding Invoices,未払いの請求を取得
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +62,Sales Order {0} is not valid,受注{0}は有効ではありません
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,受注{0}は有効ではありません
 apps/erpnext/erpnext/setup/doctype/company/company.py +185,"Sorry, companies cannot be merged",企業はマージできません
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +139,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",素材要求の総発行/転送量{0}が{1} \項目のための要求数量{2}を超えることはできません{3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Small,S
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,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} から試してみてください
 ,Invoiced Amount (Exculsive Tax),請求額（外税）
-DocType: Student Applicant,Mother's / Guardian 1 Email ID,母の/ガーディアン1メールID
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,アイテム2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,勘定科目{0}を作成しました
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +160,Green,グリーン
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,グリーン
 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 +57,Contract,契約書
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,契約書
 DocType: Email Digest,Add Quote,引用を追加
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +498,UOM coversion factor required for UOM: {0} in Item: {1},アイテム{1}の{0}には数量単位変換係数が必要です
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +503,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 +80,Row {0}: Qty is mandatory,行{0}：数量は必須です
+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 +737,Sync Master Data,同期マスタデータ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +719,Sync Master Data,同期マスタデータ
 apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,あなたの製品またはサービス
 DocType: Mode of Payment,Mode of Payment,支払方法
 apps/erpnext/erpnext/stock/doctype/item/item.py +178,Website Image should be a public file or website URL,ウェブサイト画像は、公開ファイルまたはウェブサイトのURLを指定する必要があります
+DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,これは、ルートアイテムグループであり、編集することはできません。
+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 +345,"{0}: Employee email not found, hence email not sent",{0}：したがって、電子メールで送信されないことがわかっていない従業員の電子メール、
+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,あなたの会社の住所があります
 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 +118,"For {0}, only credit accounts can be linked against another debit entry",{0}には、別の借方エントリに対する貸方勘定のみリンクすることができます
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Delivery Note {0} is not submitted,納品書{0}は提出されていません
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Delivery Note {0} is not submitted,納品書{0}は提出されていません
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Sub-contracted Item,アイテム{0}は下請けアイテムでなければなりません
 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,販売者のウェブサイト
 DocType: Item,ITEM-,項目-
-apps/erpnext/erpnext/controllers/selling_controller.py +147,Total allocated percentage for sales team should be 100,営業チームの割当率の合計は100でなければなりません
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +110,Production Order status is {0},製造指示のステータスは{0}です
+apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,営業チームの割当率の合計は100でなければなりません
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},製造指示のステータスは{0}です
 DocType: Appraisal Goal,Goal,目標
 DocType: Sales Invoice Item,Edit Description,説明編集
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +757,For Supplier,サプライヤー用
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +723,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,印刷形式を作成します。
@@ -1227,10 +1243,11 @@
 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,グレードコード
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,メールダイジェスト：
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +445,BOM {0} does not belong to Item {1},部品表 {0}はアイテム{1}に属していません
 DocType: Sales Partner,Target Distribution,ターゲット区分
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1667,Deafault warehouse is required for selected item,Deafault倉庫は、選択した項目のために必要とされます
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Deafault warehouse is required for selected item,Deafault倉庫は、選択した項目のために必要とされます
 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
@@ -1239,23 +1256,23 @@
 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 +110,Hardware,ハードウェア
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,ハードウェア
 DocType: Sales Order,Recurring Upto,定期的な点で最大
 DocType: Attendance,HR Manager,人事マネージャー
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,会社を選択してください
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Privilege Leave,特別休暇
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,特別休暇
 DocType: Purchase Invoice,Supplier Invoice Date,サプライヤー請求日
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,「ショッピングカート」を有効にしてください
 DocType: Payment Entry,Writeoff,帳消し
 DocType: Appraisal Template Goal,Appraisal Template Goal,査定テンプレート目標
-DocType: Salary Slip,Earning,収益
+DocType: Salary Component,Earning,収益
 DocType: Purchase Invoice,Party Account Currency,当事者アカウント通貨
 ,BOM Browser,部品表（BOM）ブラウザ
 DocType: Purchase Taxes and Charges,Add or Deduct,増減
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,次の条件が重複しています：
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +171,Against Journal Entry {0} is already adjusted against some other voucher,対仕訳{0}はすでにいくつか他の伝票に対して適応されています
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,対仕訳{0}はすでにいくつか他の伝票に対して適応されています
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,注文価値合計
-apps/erpnext/erpnext/demo/setup_data.py +358,Food,食べ物
+apps/erpnext/erpnext/demo/setup/setup_data.py +301,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/course_schedule/course_schedule.js +103,Mark Attendence,マークAttendence
@@ -1289,12 +1306,12 @@
 DocType: Sales Order Item,Planned Quantity,計画数
 DocType: Purchase Invoice Item,Item Tax Amount,アイテムごとの税額
 DocType: Item,Maintain Stock,在庫維持
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +209,Stock Entries already created for Production Order ,製造指示が作成済の在庫エントリー
+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,固定資産の純変動
 DocType: Leave Control Panel,Leave blank if considered for all designations,全ての肩書を対象にする場合は空白のままにします
-apps/erpnext/erpnext/controllers/accounts_controller.py +620,Charge of type 'Actual' in row {0} cannot be included in Item Rate,行{0}の料金タイプ「実費」はアイテムの料金に含めることはできません
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,Max: {0},最大：{0}
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +15,From Datetime,開始日時
+apps/erpnext/erpnext/controllers/accounts_controller.py +623,Charge of type 'Actual' in row {0} cannot be included in Item Rate,行{0}の料金タイプ「実費」はアイテムの料金に含めることはできません
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +239,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 +153,"Request for Quotation is disabled to access from portal, for more check portal settings.",見積依頼は、複数のチェックポータルの設定のために、ポータルからのアクセスに無効になっています。
@@ -1302,8 +1319,8 @@
 DocType: Sales Invoice,Shipping Address Name,配送先住所
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,勘定科目表
 DocType: Material Request,Terms and Conditions Content,規約の内容
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +552,cannot be greater than 100,100を超えることはできません
-apps/erpnext/erpnext/stock/doctype/item/item.py +680,Item {0} is not a stock Item,アイテム{0}は在庫アイテムではありません
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +546,cannot be greater than 100,100を超えることはできません
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is not a stock Item,アイテム{0}は在庫アイテムではありません
 DocType: Maintenance Visit,Unscheduled,スケジュール解除済
 DocType: Employee,Owned,所有済
 DocType: Salary Detail,Depends on Leave Without Pay,無給休暇に依存
@@ -1317,10 +1334,9 @@
 DocType: GL Entry,GL Entry,総勘定元帳エントリー
 DocType: HR Settings,Employee Settings,従業員の設定
 ,Batch-Wise Balance History,バッチごとの残高履歴
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,やることリスト
 apps/erpnext/erpnext/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 +61,Apprentice,見習
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +102,Negative Quantity is not allowed,マイナスの数量は許可されていません
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,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","文字列としてアイテムマスタから取得され、このフィールドに格納されている税詳細テーブル。
 租税公課のために使用されます"
@@ -1342,15 +1358,14 @@
 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 +141,Source warehouse is mandatory for row {0},行{0}には出庫元が必須です
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +719,Packing Slip,梱包伝票
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Source warehouse is mandatory for row {0},行{0}には出庫元が必須です
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +713,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/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,見積依頼は、以下のリンクをクリックしてアクセスすることができます
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,インポートが失敗しました！
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,アドレスがまだ追加されていません
 DocType: Workstation Working Hour,Workstation Working Hour,作業所の労働時間
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Analyst,アナリスト
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,アナリスト
 DocType: Item,Inventory,在庫
 DocType: Item,Sales Details,販売明細
 DocType: Quality Inspection,QI-,気-
@@ -1358,7 +1373,7 @@
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,数量中
 DocType: Notification Control,Expense Claim Rejected,経費請求が拒否
 DocType: Item Attribute,Item Attribute,アイテム属性
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +103,Government,政府
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,政府
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,研究所の名前
 apps/erpnext/erpnext/config/stock.py +289,Item Variants,アイテムバリエーション
 DocType: Company,Services,サービス
@@ -1374,6 +1389,7 @@
 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/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,投資活動によるキャッシュフロー
 DocType: Program Course,Program Course,プログラムのコース
@@ -1416,12 +1432,12 @@
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,受領者リストが空です。受領者リストを作成してください
 DocType: Production Plan Sales Order,Production Plan Sales Order,製造計画受注
 DocType: Sales Partner,Sales Partner Target,販売パートナー目標
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +110,Accounting Entry for {0} can only be made in currency: {1},{0}の勘定科目は通貨{1}でのみ作成可能です
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},{0}の勘定科目は通貨{1}でのみ作成可能です
 DocType: Pricing Rule,Pricing Rule,価格設定ルール
 DocType: Budget,Action if Annual Budget Exceeded,アクションの年間予算は、超えた場合
 apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,仕入注文のための資材要求
 DocType: Shopping Cart Settings,Payment Success URL,支払成功URL
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +78,Row # {0}: Returned Item {1} does not exists in {2} {3},行＃{0}：返品アイテム {1} は {2} {3}に存在しません
+apps/erpnext/erpnext/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,銀行勘定調整表
@@ -1430,39 +1446,39 @@
 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/stock/doctype/stock_entry/stock_entry.py +339,Not allowed to tranfer more {0} than {1} against Purchase Order {2},発注{2}に対して{1}より{0}以上を配送することはできません
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +344,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 +545,Manufacturing Quantity is mandatory,製造数量は必須です
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,製造数量は必須です
 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 +71,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 +186,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,在庫負債
 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 +130,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 +137,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,その他のレポート
 DocType: Dependent Task,Dependent Task,依存タスク
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,人事でのシステムの命名してくださいセットアップ社員&gt; HRの設定
 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 +190,Leave of type {0} cannot be longer than {1},休暇タイプ{0}は、{1}よりも長くすることはできません
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +197,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 +921,Search Item,探索項目
+apps/erpnext/erpnext/accounts/page/pos/pos.js +910,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 +546,Already completed,すでに完了
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +22,Payment Request already exists {0},支払い要求がすでに存在している{0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +550,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 +241,Quantity must not be more than {0},数量は{0}以下でなければなりません
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Quantity must not be more than {0},数量は{0}以下でなければなりません
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +76,Previous Financial Year is not closed,前会計年度が閉じられていません
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +44,Age (Days),期間（日）
 DocType: Quotation Item,Quotation Item,見積項目
@@ -1479,7 +1495,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +221,Purchase Receipt {0} is not submitted,領収書{0}は提出されていません
 DocType: Company,Default Payable Account,デフォルト買掛金勘定
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.",オンラインショッピングカート設定（出荷ルール・価格表など）
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +83,{0}% Billed,{0}％支払済
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}％支払済
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,予約数量
 DocType: Party Account,Party Account,当事者アカウント
 apps/erpnext/erpnext/config/setup.py +116,Human Resources,人事
@@ -1491,12 +1507,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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 +22,Collect,収集します
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,収集します
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,Against Supplier Invoice {0} dated {1},対サプライヤー請求書{0} 日付{1}
 DocType: Customer,Default Price List,デフォルト価格表
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +225,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: Payment Reconciliation,Payments,支払
 DocType: Journal Entry,Entry Type,エントリタイプ
 ,Customer Credit Balance,顧客貸方残高
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Payable,買掛金の純変動
@@ -1508,7 +1523,7 @@
 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 +9,Procurement,調達
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,数量または値に変化のあるアイテムはありません
+apps/erpnext/erpnext/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,保証請求
 ,Lead Details,リード詳細
 DocType: Purchase Invoice,End date of current invoice's period,現在の請求書の期間の終了日
@@ -1534,7 +1549,7 @@
 DocType: Purchase Invoice,Additional Discount,追加割引
 DocType: Selling Settings,Selling Settings,販売設定
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,オンラインオークション
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +97,Please specify either Quantity or Valuation Rate or both,数量または評価レートのいずれか、または両方を指定してください
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,数量または評価レートのいずれか、または両方を指定してください
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +13,Fulfillment,フルフィルメント
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory",会社、月と年度は必須です
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,マーケティング費用
@@ -1555,7 +1570,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,ERPNextのセットアップが完了！
 DocType: Item,Weightage,重み付け
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +93,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"同じ名前の顧客グループが存在します
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +126,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,上位地域
@@ -1563,7 +1578,6 @@
 DocType: Stock Entry,Material Receipt,資材領収書
 DocType: Homepage,Products,商品
 DocType: Announcement,Instructor,インストラクター
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},売掛金／買掛金勘定{0}には当事者タイプと当事者が必要です。
 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,次回連絡
@@ -1574,7 +1588,7 @@
 ,Item-wise Sales Register,アイテムごとの販売登録
 DocType: Asset,Gross Purchase Amount,購入総額
 DocType: Asset,Depreciation Method,減価償却法
-apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Offline,オフライン
+apps/erpnext/erpnext/accounts/page/pos/pos.js +686,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,必須
@@ -1592,25 +1606,27 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +425,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 +858,Make Purchase Order,発注を作成
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +852,Make Purchase Order,発注を作成
 DocType: SMS Center,Send To,送信先
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,There is not enough leave balance for Leave Type {0},休暇タイプ{0}のための休暇残が足りません
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,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 +172,Work-in-Progress Warehouse is required before Submit,提出する前に作業中の倉庫が必要です
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,Work-in-Progress Warehouse is required before Submit,提出する前に作業中の倉庫が必要です
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,求職者
 DocType: Purchase Order Item,Warehouse and Reference,倉庫と問い合わせ先
 DocType: Supplier,Statutory info and other general information about your Supplier,サプライヤーに関する法定の情報とその他の一般情報
-apps/erpnext/erpnext/hooks.py +88,Addresses,住所
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,サプライヤー&gt;サプライヤータイプ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +212,Against Journal Entry {0} does not have any unmatched {1} entry,対仕訳{0}に該当しないエントリ{1}
+apps/erpnext/erpnext/hooks.py +95,Addresses,住所
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +215,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,アイテムまたは倉庫に基づくフィルタを設定してください
 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,配送・請求する
@@ -1618,11 +1634,10 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,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 +731,Payment,支払
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,Payment,支払
 DocType: Production Order Operation,Actual Time and Cost,実際の時間とコスト
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},資材要求の最大値{0}は、注{2}に対するアイテム{1}から作られます
 DocType: Employee,Salutation,敬称（例：Mr. Ms.）
-DocType: Pricing Rule,Brand,ブランド
 DocType: Course,Course Abbreviation,コースの略
 DocType: Item,Will also apply for variants,バリエーションについても適用されます
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +142,"Asset cannot be cancelled, as it is already {0}",{0}として既に存在する資産をキャンセルすることはできません
@@ -1634,7 +1649,7 @@
 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.",あなたが購入または売却する製品やサービスの一覧を表示します。あなたが起動したときに項目グループ、測定およびその他のプロパティの単位を確認してください。
 DocType: Hub Settings,Hub Node,ハブノード
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,同じ商品が重複入力されました。修正してやり直してください
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Associate,同僚
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,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,受領者リストを作成
@@ -1642,7 +1657,7 @@
 DocType: Production Planning Tool,Material Requests,資材要求
 DocType: Warranty Claim,Issue Date,課題日
 DocType: Activity Cost,Activity Cost,活動費用
-DocType: Timesheet Detail,Timesheet Detail,タイムシートの詳細
+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),この納品の一部であることを梱包に示します（「下書き」のみ）
@@ -1665,6 +1680,7 @@
 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,バリエーションあり
 DocType: Monthly Distribution,Name of the Monthly Distribution,月次配分の名前
 DocType: Sales Person,Parent Sales Person,親販売担当者
@@ -1677,30 +1693,31 @@
 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 +44,"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/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.,請求書を保存すると表示される表記内。
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +502,Error: {0} &gt; {1},エラー：{0}&gt; {1}
 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.,期間開始日は、用語がリンクされている年度の年度開始日より前にすることはできません（アカデミック・イヤー{}）。日付を訂正して、もう一度お試しください。
 DocType: Naming Series,Current Value,現在の値
-apps/erpnext/erpnext/controllers/accounts_controller.py +235,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,日付 {0} には複数の会計年度が存在します。会計年度に会社を設定してください
+apps/erpnext/erpnext/controllers/accounts_controller.py +238,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 +458,Item table can not be blank,アイテムテーブルは空白にすることはできません
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +443,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 +5,This is based on stock movement. See {0} for details,これは、株式の動きに基づいています。詳細については、{0}を参照してください。
 DocType: Pricing Rule,Selling,販売
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +341,Amount {0} {1} deducted against {2},量は{0} {1} {2}に対する控除します
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +344,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,期限日を転記日付より前にすることはできません
@@ -1715,8 +1732,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +144,Cannot refer row number greater than or equal to current row number for this Charge type,この請求タイプの行数以上の行番号を参照することはできません
 DocType: Asset,Sold,販売：
 ,Item-wise Purchase History,アイテムごとの仕入履歴
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Red,レッド
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},アイテム{0}に付加されたシリアル番号を取得するためには「生成スケジュール」をクリックしてください
+apps/erpnext/erpnext/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,製造指示を開く
 DocType: Sales Invoice Payment,Base Amount (Company Currency),基準額（会社通貨）
@@ -1724,7 +1741,7 @@
 DocType: Installation Note,Installation Time,設置時間
 DocType: Sales Invoice,Accounting Details,会計詳細
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,この会社の全ての取引を削除
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +187,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,"行 {0}：注文番号{3}には完成品{2}個が必要なため、作業{1}は完了していません。
+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}：注文番号{3}には完成品{2}個が必要なため、作業{1}は完了していません。
 時間ログから作業ステータスを更新してください"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,投資
 DocType: Issue,Resolution Details,課題解決詳細
@@ -1761,16 +1778,17 @@
 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}
 DocType: Delivery Note,Excise Page Number,物品税ページ番号
 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}
 ,Maintenance Schedules,メンテナンス予定
 DocType: Task,Actual End Date (via Time Sheet),（タイムシートを介して）実際の終了日
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Amount {0} {1} against {2} {3},量{0} {1} {2} {3}に対して、
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +339,Amount {0} {1} against {2} {3},量{0} {1} {2} {3}に対して、
 ,Quotation Trends,見積傾向
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},アイテム{0}のアイテムマスターにはアイテムグループが記載されていません
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +295,Debit To account must be a Receivable account,借方計上は売掛金勘定でなければなりません
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Receivable account,借方計上は売掛金勘定でなければなりません
 DocType: Shipping Rule Condition,Shipping Amount,出荷量
 ,Pending Amount,保留中の金額
 DocType: Purchase Invoice Item,Conversion Factor,換算係数
@@ -1778,10 +1796,10 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +137,Expected value after useful life must be greater than or equal to {0},耐用年数後の期待値は以上である必要があります{0}
 DocType: Purchase Receipt,Vehicle Number,車両番号
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,繰り返し請求停止予定日
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +90,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,総割り当てられた葉{0}の期間のために既に承認された葉{1}より小さくすることはできません
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +93,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 +22,Enter Paid Amount,有料金額を入力してください
+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,マルチレベルの部品表を使用
@@ -1791,13 +1809,15 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,タイムシート
 DocType: HR Settings,HR Settings,人事設定
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Expense Claim is pending approval. Only the Expense Approver can update status.,経費請求は承認待ちです。経費承認者のみ、ステータスを更新することができます。
+DocType: Email Digest,New Expenses,新しい経費
 DocType: Purchase Invoice,Additional Discount Amount,追加割引額
-apps/erpnext/erpnext/controllers/accounts_controller.py +524,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",行＃{0}：項目は固定資産であるとして数量は、1でなければなりません。複数の数量のための個別の行を使用してください。
+apps/erpnext/erpnext/controllers/accounts_controller.py +527,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",行＃{0}：項目は固定資産であるとして数量は、1でなければなりません。複数の数量のための個別の行を使用してください。
 DocType: Leave Block List Allow,Leave Block List Allow,許可する休暇リスト
 apps/erpnext/erpnext/setup/doctype/company/company.py +249,Abbr can not be blank or space,略称は、空白またはスペースにすることはできません
 apps/erpnext/erpnext/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/stock/get_item_details.py +123,Please specify Company,会社を指定してください
 ,Customer Acquisition and Loyalty,顧客獲得とロイヤルティ
@@ -1808,17 +1828,19 @@
 apps/erpnext/erpnext/projects/doctype/task/task.js +26,Expense Claims,経費請求
 DocType: Issue,Support,サポート
 ,BOM Search,部品表（BOM）検索
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Closing (Opening + Totals),期末（期首＋合計）
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),期末（期首＋合計）
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,会社に通貨を指定してください
 DocType: Workstation,Wages per hour,時間あたり賃金
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +50,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,以下の資料の要求は、アイテムの再オーダーレベルに基づいて自動的に提起されています
-apps/erpnext/erpnext/controllers/accounts_controller.py +272,Account {0} is invalid. Account Currency must be {1},アカウント{0}は無効です。アカウントの通貨は{1}でなければなりません
+DocType: Email Digest,Pending Sales Orders,保留中の受注
+apps/erpnext/erpnext/controllers/accounts_controller.py +275,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 +956,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",行＃{0}：リファレンスドキュメントタイプは受注、納品書や仕訳のいずれかでなければなりません
-DocType: Salary Slip,Deduction,控除
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +87,Row {0}: From Time and To Time is mandatory.,行{0}：時間との時間からは必須です。
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +969,"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 +111,Row {0}: From Time and To Time is mandatory.,行{0}：時間との時間からは必須です。
+DocType: Stock Reconciliation Item,Amount Difference,量差
 apps/erpnext/erpnext/stock/get_item_details.py +262,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 +7,Please enter Employee Id of this sales person,営業担当者の従業員IDを入力してください
@@ -1826,7 +1848,7 @@
 DocType: Project,% Tasks Completed,％作業完了
 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 +194,Please enter Production Item first,最初の生産アイテムを入力してください
+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,無効なユーザー
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,見積
@@ -1835,53 +1857,54 @@
 DocType: Maintenance Visit,Maintenance User,メンテナンスユーザー
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +149,Cost Updated,費用更新
 DocType: Employee,Date of Birth,生年月日
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +86,Item {0} has already been returned,アイテム{0}はすでに返品されています
+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証明書が無効です
+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 +177,Job Description,仕事内容
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,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 +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series",「-」「#」「.」「/」以外の記号は、シリーズ名に使用できません
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series",「-」「#」「.」「/」以外の記号は、シリーズ名に使用できません
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.",セールスキャンペーンを追跡します。投資収益率を測定するために、キャンペーンから受注、見積、リードなどを追跡します。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +24,Welcome to POS: Create your POS Profile,POSへようこそ：あなたのPOSプロファイルの作成
 DocType: Expense Claim,Approver,承認者
 ,SO Qty,受注数量
+DocType: Guardian,Work Address,仕事の住所
 DocType: Appraisal,Calculate Total Score,合計スコアを計算
 DocType: Request for Quotation,Manufacturing Manager,製造マネージャー
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},シリアル番号{0}は {1}まで保証期間内です
+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 +74,Shipments,出荷
+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 +153,Row # ,行＃
+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 +156,Get From,取得元
+apps/erpnext/erpnext/public/js/utils.js +167,Get From,取得元
 DocType: C-Form,Quarter,四半期
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Miscellaneous Expenses,雑費
 DocType: Global Defaults,Default Company,デフォルトの会社
 apps/erpnext/erpnext/controllers/stock_controller.py +167,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,在庫に影響するアイテム{0}には、費用または差損益が必須です
-apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings",行{1}のアイテム{0}は{2}以上超過請求することはできません。超過請求を許可するには「在庫設定」で設定してください
+apps/erpnext/erpnext/controllers/accounts_controller.py +419,"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,以上
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} is disabled,ユーザー{0}無効になっています
 DocType: Leave Application,Total Leave Days,総休暇日数
 DocType: Email Digest,Note: Email will not be sent to disabled users,注意：ユーザーを無効にするとメールは送信されなくなります
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,会社を選択...
 DocType: Leave Control Panel,Leave blank if considered for all departments,全部門が対象の場合は空白のままにします
 apps/erpnext/erpnext/config/hr.py +171,"Types of employment (permanent, contract, intern etc.).",雇用タイプ（正社員、契約社員、インターンなど）
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +346,{0} is mandatory for Item {1},{0}はアイテム{1}に必須です
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,{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",割当額、請求タイプ、請求書番号を少なくとも1つの行から選択してください
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,新規購入のコスト
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},受注に必要な項目{0}
 DocType: Purchase Invoice Item,Rate (Company Currency),レート（報告通貨）
-apps/erpnext/erpnext/demo/setup_data.py +360,Others,その他
+DocType: Student Guardian,Others,その他
 DocType: Payment Entry,Unallocated Amount,未割り当て額
 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,租税公課
@@ -1901,17 +1924,16 @@
 apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,シリアル番号を付与した目録
 DocType: Activity Type,Default Billing Rate,デフォルト請求単価
 DocType: Sales Invoice,Total Billing Amount,総請求額
-apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +54,Receivable Account,売掛金勘定
-apps/erpnext/erpnext/controllers/accounts_controller.py +546,Row #{0}: Asset {1} is already {2},行＃{0}：アセット{1} {2}既にあります
+apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,売掛金勘定
+apps/erpnext/erpnext/controllers/accounts_controller.py +549,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 +79,CEO,最高経営責任者（CEO）
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,最高経営責任者（CEO）
 DocType: Expense Claim Detail,Expense Claim Detail,経費請求の詳細
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +808,Please select correct account,正しいアカウントを選択してください
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +809,Please select correct account,正しいアカウントを選択してください
 DocType: Item,Weight UOM,重量単位
 DocType: Salary Structure Employee,Salary Structure Employee,給与構造の従業員
 DocType: Employee,Blood Group,血液型
-DocType: Purchase Invoice Item,Page Break,改ページ
 DocType: Production Order Operation,Pending,保留
 DocType: Course,Course Name,コース名
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,特定の従業員の休暇申請を承認することができるユーザー
@@ -1920,14 +1942,15 @@
 DocType: Fiscal Year,Companies,企業
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,電子機器
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,在庫が再注文レベルに達したときに原材料要求を挙げる
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Full-time,フルタイム
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,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: 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,収入価値合計
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Debit To is required,デビットへが必要とされます
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +321,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,品質管理者
@@ -1935,6 +1958,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/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,請求額合計
@@ -1945,18 +1969,17 @@
 DocType: Production Order Operation,Completed Qty,完成した数量
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"For {0}, only debit accounts can be linked against another credit entry",{0}には、別の貸方エントリに対する借方勘定のみリンクすることができます
 apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,価格表{0}は無効になっています
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +99,Row {0}: Completed Qty cannot be more than {1} for operation {2},行{0}：完了数量は{2}操作{1}を超えることはできません
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +123,Row {0}: Completed Qty cannot be more than {1} for operation {2},行{0}：完了数量は{2}操作{1}を超えることはできません
 DocType: Manufacturing Settings,Allow Overtime,残業を許可
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,アイテム {1} には {0} 件のシリアル番号が必要です。{2} 件指定されています
 DocType: Stock Reconciliation Item,Current Valuation Rate,現在の評価額
 DocType: Item,Customer Item Codes,顧客アイテムコード
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,取引利益/損失
 DocType: Opportunity,Lost Reason,失われた理由
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,してください[設定]&gt; [ナンバリングシリーズを経由して出席するための設定採番シリーズ
 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/purchase_receipt/purchase_receipt.py +378,All items have already been invoiced,全てのアイテムはすでに請求済みです
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +379,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,外部
@@ -1972,18 +1995,19 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,あなたの顧客
 apps/erpnext/erpnext/projects/doctype/project/project.py +141,You have been invited to collaborate on the project: {0},プロジェクト：{0} の共同作業に招待されました
 DocType: Leave Block List Date,Block Date,ブロック日付
-apps/erpnext/erpnext/templates/generators/job_opening.html +19,Apply Now,今すぐ適用
+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.",日次・週次・月次のメールダイジェストを作成・管理
 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,建物
-apps/erpnext/erpnext/utilities/doctype/address/address.py +164,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,デフォルトのアドレステンプレートが見つかりませんでした。 [設定]&gt; [印刷とブランディング&gt;アドレステンプレートから新しいものを作成してください。
 DocType: Fee Structure,Fee Structure,料金体系
 DocType: Timesheet Detail,Costing Amount,原価計算額
+DocType: Student Admission,Application Fee,出願料
 DocType: Process Payroll,Submit Salary Slip,給与伝票を提出
-apps/erpnext/erpnext/controllers/selling_controller.py +161,Maxiumm discount for Item {0} is {1}%,アイテム{0}の最大割引は {1}％です
+apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,アイテム{0}の最大割引は {1}％です
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,一括でインポート
 DocType: Sales Partner,Address & Contacts,住所・連絡先
 DocType: SMS Log,Sender Name,送信者名
@@ -2008,21 +2032,21 @@
 DocType: Serial No,Delivery Time,納品時間
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,エイジング基準
 DocType: Item,End of Life,提供終了
-apps/erpnext/erpnext/demo/setup_data.py +361,Travel,移動
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +155,No active or default Salary Structure found for employee {0} for the given dates,与えられた日付の従業員{0}が見つかりませアクティブまたはデフォルトの給与構造はありません
+apps/erpnext/erpnext/demo/setup/setup_data.py +304,Travel,移動
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +167,No active or default Salary Structure found for employee {0} for the given dates,与えられた日付の従業員{0}が見つかりませアクティブまたはデフォルトの給与構造はありません
 DocType: Leave Block List,Allow Users,ユーザーを許可
 DocType: Purchase Order,Customer Mobile No,顧客携帯電話番号
 DocType: Sales Invoice,Recurring,繰り返し
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,製品の業種や部門ごとに個別の収益と費用を追跡します
 DocType: Rename Tool,Rename Tool,ツール名称変更
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +23,Update Cost,費用更新
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,費用更新
 DocType: Item Reorder,Item Reorder,アイテム再注文
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +36,Show Salary Slip,ショー給与スリップ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +748,Transfer Material,資材配送
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +53,Show Salary Slip,ショー給与スリップ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +166,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 +923,Please set recurring after saving,保存した後、繰り返し設定をしてください
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +646,Select change amount account,変化量のアカウントを選択
+apps/erpnext/erpnext/public/js/controllers/transaction.js +914,Please set recurring after saving,保存した後、繰り返し設定をしてください
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +703,Select change amount account,変化量のアカウントを選択
 DocType: Purchase Invoice,Price List Currency,価格表の通貨
 DocType: Naming Series,User must always select,ユーザーは常に選択する必要があります
 DocType: Stock Settings,Allow Negative Stock,マイナス在庫を許可
@@ -2035,31 +2059,32 @@
 DocType: Address,Subsidiary,子会社
 apps/erpnext/erpnext/setup/doctype/company/company.py +64,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","既存の取引が存在するため、会社のデフォルトの通貨を変更することができません。
 デフォルトの通貨を変更するには取引をキャンセルする必要があります。"
+DocType: Grade Interval,Grade Description,等級説明
 DocType: Quality Inspection,Purchase Receipt No,領収書番号
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,手付金
 DocType: Process Payroll,Create Salary Slip,給与伝票を作成する
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +33,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 +352,Quantity in row {0} ({1}) must be same as manufactured quantity {2},行の数量{0}（{1}）で製造量{2}と同じでなければなりません
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Quantity in row {0} ({1}) must be same as manufactured quantity {2},行の数量{0}（{1}）で製造量{2}と同じでなければなりません
 DocType: Appraisal,Employee,従業員
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,ユーザーとして招待
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1}は支払済です
 DocType: Workstation Working Hour,End Time,終了時間
 DocType: Payment Entry,Payment Deductions or Loss,支払控除や損失
-apps/erpnext/erpnext/config/schools.py +100,LMS,LMS
+apps/erpnext/erpnext/config/schools.py +104,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,セールスパイプライン
 DocType: Student Batch Student,Student Batch Student,学生バッチ学生
-DocType: Sales Invoice,Mass Mailing,大量送付
+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 +199,Purchse Order number required for Item {0},アイテム{0}には発注番号が必要です
 apps/erpnext/erpnext/controllers/buying_controller.py +262,Specified BOM {0} does not exist for Item {1},アイテム{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 +297,Salary Slip of employee {0} already created for this period,従業員の給与スリップ{0}はすでにこの期間のために作成します
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Pharmaceutical,医薬品
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +309,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/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,貸方へ
@@ -2074,27 +2099,28 @@
 DocType: Upload Attendance,Attendance To Date,出勤日
 DocType: Warranty Claim,Raised By,要求者
 DocType: Payment Gateway Account,Payment Account,支払勘定
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +814,Please specify Company to proceed,続行する会社を指定してください
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +793,Please specify Company to proceed,続行する会社を指定してください
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Receivable,売掛金の純変更
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Compensatory Off,代償オフ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,代償オフ
 DocType: Quality Inspection Reading,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.,本当にこの会社のすべての取引を削除するか確認してください。マスタデータは残ります。このアクションは、元に戻すことはできません。
 DocType: Room,Room Number,部屋番号
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},無効な参照 {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +161,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0}（{1}）は製造指示{3}において計画数量（{2}）より大きくすることはできません
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +162,{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 +217,Raw Materials cannot be blank.,原材料は空白にできません。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,"Could not update stock, invoice contains drop shipping item.",請求書は、ドロップシッピングの項目を含む、株式を更新できませんでした。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +460,Quick Journal Entry,クイック仕訳エントリー
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +111,You can not change rate if BOM mentioned agianst any item,アイテムに対して部品表が記載されている場合は、レートを変更することができません
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +441,"Could not update stock, invoice contains drop shipping item.",請求書は、ドロップシッピングの項目を含む、株式を更新できませんでした。
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Quick Journal Entry,クイック仕訳エントリー
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +103,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 +214,{0} {1} is not submitted,{0} {1}は提出されていません
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,アイテム要求
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,各完成品それぞれに独立した製造指示が作成されます。
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +121,{0} must be negative in return document,{0}の戻り文書では負でなければなりません
 ,Minutes to First Response for Issues,問題のためのファースト・レスポンス分
 DocType: Purchase Invoice,Terms and Conditions1,規約１
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,あなたはこのシステムを設定している研究所の名前。
@@ -2103,16 +2129,17 @@
 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 +398,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 +739,Item or Warehouse for row {0} does not match Material Request,行{0}のアイテムまたは倉庫が資材要求と一致していません
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +747,Item or Warehouse for row {0} does not match Material Request,行{0}のアイテムまたは倉庫が資材要求と一致していません
 apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,数量単位
 DocType: Fiscal Year,Year End Date,年終日
 DocType: Task Depends On,Task Depends On,依存するタスク
-DocType: Lead,Opportunity,機会
+DocType: Supplier Quotation,Opportunity,機会
 ,Completed Production Orders,完成した製造指示
 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,デフォルト作業所
@@ -2125,7 +2152,7 @@
 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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},メンテナンスの開始日は、シリアル番号{0}の納品日より前にすることはできません
+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,実際の終了日
 DocType: Purchase Invoice,PINV-,PINV-
 DocType: Authorization Rule,Applicable To (Role),（役割）に適用
@@ -2140,7 +2167,7 @@
 DocType: SMS Log,No of Requested SMS,要求されたSMSの数
 DocType: Campaign,Campaign-.####,キャンペーン。＃＃＃＃
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,次のステップ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,Please supply the specified items at the best possible rates,可能な限り最高のレートで指定した項目を入力してください
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +695,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 +117,Contract End Date must be greater than Date of Joining,契約終了日は、入社日よりも大きくなければなりません
 DocType: Delivery Note,DN-,DN-
@@ -2149,7 +2176,7 @@
 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 +14,This is an example website auto-generated from ERPNext,これはERPNextの自動生成ウェブサイトの例です。
+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,エイジングレンジ１
 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.
 
@@ -2203,13 +2230,14 @@
 DocType: Purchase Receipt Item,Recd Quantity,受領数量
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +54,Fee Records Created - {0},作成したフィーレコード -  {0}
 DocType: Asset Category Account,Asset Category Account,資産カテゴリーアカウント
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +103,Cannot produce more Item {0} than Sales Order quantity {1},受注数{1}より多くのアイテム{0}を製造することはできません
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Stock Entry {0} is not submitted,在庫エントリ{0}は提出されていません
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},受注数{1}より多くのアイテム{0}を製造することはできません
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +505,Stock Entry {0} is not submitted,在庫エントリ{0}は提出されていません
 DocType: Payment Reconciliation,Bank / Cash Account,銀行/現金勘定
 DocType: Tax Rule,Billing City,請求先の市
 DocType: Salary Component Account,Salary Component Account,給与コンポーネントのアカウント
 DocType: Global Defaults,Hide Currency Symbol,通貨記号を非表示にする
 apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card",例「銀行」「現金払い」「クレジットカード払い」
+DocType: Lead Source,Source Name,ソース名
 DocType: Journal Entry,Credit Note,貸方票
 DocType: Warranty Claim,Service Address,所在地
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furnitures and Fixtures,家具や備品
@@ -2221,6 +2249,7 @@
 DocType: Opportunity,Customer / Lead Name,顧客／リード名
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +89,Clearance Date not mentioned,決済日が記入されていません
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,製造
+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/controllers/trends.py +19,Total(Qty),合計（量）
 DocType: Sales Invoice,This Document,この文書
@@ -2232,15 +2261,15 @@
 DocType: Purchase Receipt,Time at which materials were received,資材受領時刻
 DocType: Stock Ledger Entry,Outgoing Rate,出庫率
 apps/erpnext/erpnext/config/hr.py +176,Organization branch master.,組織支部マスター。
-apps/erpnext/erpnext/controllers/accounts_controller.py +273, or ,または
+apps/erpnext/erpnext/controllers/accounts_controller.py +276, 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 +203,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,行＃{0}：仕訳は、{1}アカウント{2}を持っているか、すでに別のバウチャーに対して一致しません
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +206,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 +90,No employee for the above selected criteria OR salary slip already created,上記の選択基準又は給与のスリップには従業員がすでに作成されていません
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +93,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,支払タイプ
@@ -2268,8 +2297,8 @@
 DocType: Product Bundle,Parent Item,親アイテム
 DocType: Account,Account Type,アカウントタイプ
 DocType: Delivery Note,DN-RET-,DN-RET-
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +115,Leave Type {0} cannot be carry-forwarded,{0}キャリー転送できないタイプを残します
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',メンテナンススケジュールが全てのアイテムに生成されていません。「スケジュールを生成」をクリックしてください
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +118,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 +163,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",{1}の行{0}では、アイテム単価に{2}を含める場合、行{3}も含まれている必要があります
@@ -2281,13 +2310,13 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +32,Disabled template must not be default template,[無効]テンプレートは、デフォルトのテンプレートであってはなりません
 DocType: Account,Income Account,収益勘定
 DocType: Payment Request,Amount in customer's currency,顧客通貨での金額
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +748,Delivery,配送
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +742,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,重要責任分野
 DocType: Payment Entry,Total Allocated Amount,総配分される金額
 DocType: Item Reorder,Material Request Type,資材要求タイプ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +82,Row {0}: UOM Conversion Factor is mandatory,行{0}：数量単位（UOM）換算係数は必須です
+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,コストセンター
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,伝票番号
@@ -2298,13 +2327,13 @@
 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 +90,Head of Marketing and Sales,マーケティングおよび販売部長
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,所得税
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,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 +403,Please enter Item Code to get batch no,バッチ番号を取得するためにアイテムコードを入力をしてください
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +770,Please select a value for {0} quotation_to {1},{0} quotation_to {1} の値を選択してください
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +397,Please enter Item Code to get batch no,バッチ番号を取得するためにアイテムコードを入力をしてください
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +764,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",両方のレコードで次のプロパティが同じである場合、マージのみ可能です。グループ、ルートタイプ、会社です
@@ -2316,28 +2345,29 @@
 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 +100,Issues,課題
+apps/erpnext/erpnext/hooks.py +109,Issues,課題
 apps/erpnext/erpnext/controllers/status_updater.py +13,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,請求通貨
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Large,XL
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Extra Large,XL
 ,Profit and Loss Statement,損益計算書
 DocType: Bank Reconciliation Detail,Cheque Number,小切手番号
 ,Sales Browser,販売ブラウザ
 DocType: Journal Entry,Total Credit,貸方合計
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +507,Warning: Another {0} # {1} exists against stock entry {2},警告：別の{0}＃{1}が在庫エントリ{2}に対して存在します
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Local,現地
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +508,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),ローンと貸付金（資産）
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,債務者
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Large,L
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Large,L
 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 +225,Total {0} ({1}),合計{0}（{1}）
+apps/erpnext/erpnext/accounts/report/financial_statements.py +224,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,デフォルト評価方法
@@ -2394,9 +2424,9 @@
 DocType: Attendance,Leave Type,休暇タイプ
 apps/erpnext/erpnext/controllers/stock_controller.py +173,Expense / Difference account ({0}) must be a 'Profit or Loss' account,費用／差損益（{0}）は「損益」アカウントである必要があります
 DocType: Account,Accounts User,会計ユーザー
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Name error: {0},名前のエラー：{0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +90,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 +178,{0} {1} does not associated with {2} {3},{0} {1} {2} {3}に関連付けられていません
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +181,{0} {1} does not associated with {2} {3},{0} {1} {2} {3}に関連付けられていません
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,従業員{0}の出勤はすでにマークされています
 DocType: Packing Slip,If more than one package of the same type (for print),同じタイプで複数パッケージの場合（印刷用）
 DocType: Warehouse,Parent Warehouse,親倉庫
@@ -2415,7 +2445,7 @@
 DocType: BOM Item,Scrap %,スクラップ％
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection",料金は、選択によって、アイテムの数量または量に基づいて均等に分割されます
 DocType: Maintenance Visit,Purposes,目的
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,還付書内では、少なくとも1つの項目がマイナスで入力されていなければなりません
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Atleast one item should be entered with negative quantity in return document,還付書内では、少なくとも1つの項目がマイナスで入力されていなければなりません
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations",操作{0}は、ワークステーション{1}で使用可能な作業時間よりも長いため、複数の操作に分解してください
 ,Requested,要求済
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +83,No Remarks,備考がありません
@@ -2427,46 +2457,46 @@
 DocType: Item,Total Projected Qty,全投影数量
 DocType: Monthly Distribution,Distribution Name,配布名
 DocType: Course,Course Code,コースコード
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Quality Inspection required for Item {0},アイテム{0}に必要な品質検査
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Quality Inspection required for Item {0},アイテム{0}に必要な品質検査
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,顧客の通貨が会社の基本通貨に換算されるレート
 DocType: Purchase Invoice Item,Net Rate (Company Currency),正味単価（会社通貨）
 DocType: Salary Detail,Condition and Formula Help,条件と式のヘルプ
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,地域ツリーを管理
 DocType: Journal Entry Account,Sales Invoice,請求書
 DocType: Journal Entry Account,Party Balance,当事者残高
-apps/erpnext/erpnext/accounts/page/pos/pos.js +475,Please select Apply Discount On,「割引を適用」を選択してください
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +92,Salary Slip Created,給与スリップを作成します
+apps/erpnext/erpnext/accounts/page/pos/pos.js +464,Please select Apply Discount On,「割引を適用」を選択してください
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +95,Salary Slip Created,給与スリップを作成します
 DocType: Company,Default Receivable Account,デフォルト売掛金勘定
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,上記選択条件に支払われる総給与のための銀行エントリを作成
 DocType: Stock Entry,Material Transfer for Manufacture,製造用資材移送
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,割引率は、価格表に対して、またはすべての価格リストのいずれかを適用することができます。
 DocType: Purchase Invoice,Half-yearly,半年ごと
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +384,Accounting Entry for Stock,在庫の会計エントリー
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +387,Accounting Entry for Stock,在庫の会計エントリー
 DocType: Sales Invoice,Sales Team1,販売チーム1
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,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 +96,Row {0}: Completed Qty must be greater than zero.,行{0}：完了数量はゼロより大きくなければなりません。
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +120,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 +88,Row # {0}: Cannot return more than {1} for Item {2},行＃{0}：アイテム {2} では {1} 以上を返すことはできません
+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,プロット
 DocType: Item Group,Show this slideshow at the top of the page,ページの上部にこのスライドショーを表示
 DocType: BOM,Item UOM,アイテム数量単位
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),割引後税額（会社通貨）
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +147,Target warehouse is mandatory for row {0},{0}行にターゲット倉庫が必須です。
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +141,Target warehouse is mandatory for row {0},{0}行にターゲット倉庫が必須です。
 DocType: Cheque Print Template,Primary Settings,プライマリ設定
 DocType: Purchase Invoice,Select Supplier Address,サプライヤー住所を選択
 DocType: Quality Inspection,Quality Inspection,品質検査
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Extra Small,XS
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,Warning: Material Requested Qty is less than Minimum Order Qty,警告：資材要求数が注文最小数を下回っています。
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +194,Account {0} is frozen,アカウント{0}は凍結されています
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,XS
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +690,Warning: Material Requested Qty is less than Minimum Order Qty,警告：資材要求数が注文最小数を下回っています。
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,アカウント{0}は凍結されています
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,組織内で別々の勘定科目を持つ法人／子会社
 DocType: Payment Request,Mute Email,ミュートメール
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco",食品、飲料＆タバコ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +606,Can only make payment against unbilled {0},唯一の未請求{0}に対して支払いを行うことができます
-apps/erpnext/erpnext/controllers/selling_controller.py +126,Commission rate cannot be greater than 100,手数料率は、100を超えることはできません。
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +609,Can only make payment against unbilled {0},唯一の未請求{0}に対して支払いを行うことができます
+apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,手数料率は、100を超えることはできません。
 DocType: Stock Entry,Subcontract,下請
 apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,先に{0}を入力してください
 DocType: Production Order Operation,Actual End Time,実際の終了時間
@@ -2477,30 +2507,30 @@
 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 +158,Colour,カラー
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,カラー
 DocType: Maintenance Visit,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",「在庫アイテム」が「いいえ」であり「販売アイテム」が「はい」であり他の製品付属品が無いアイテムを選択してください。
 DocType: Student Log,Academic,アカデミック
-apps/erpnext/erpnext/controllers/accounts_controller.py +469,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),注文に対する総事前（{0}）{1}（{2}）総合計よりも大きくすることはできません。
+apps/erpnext/erpnext/controllers/accounts_controller.py +472,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),注文に対する総事前（{0}）{1}（{2}）総合計よりも大きくすることはできません。
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,月をまたがってターゲットを不均等に配分するには、「月次配分」を選択してください
 DocType: Purchase Invoice Item,Valuation Rate,評価額
+DocType: Stock Reconciliation,SR/,SR /
 apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,価格表の通貨が選択されていません
 DocType: Assessment,Results,結果
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +168,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 +175,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: Student Applicant,Father's/ Guardian 2 Email ID,父の/ガーディアン2メールID
 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 +228,Warehouses with existing transaction can not be converted to group.,既存の取引に倉庫を基に変換することはできません。
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +231,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 +93,Researcher,リサーチャー
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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.,収入品質検査。
@@ -2512,25 +2542,25 @@
 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: Sales Invoice,Advertisement,広告宣伝
 DocType: Asset Category Account,Depreciation Expense Account,減価償却費アカウント
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Probationary Period,試用期間
-apps/erpnext/erpnext/hooks.py +102,Announcements,お知らせ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,試用期間
+apps/erpnext/erpnext/hooks.py +111,Announcements,お知らせ
 DocType: Customer Group,Only leaf nodes are allowed in transaction,取引にはリーフノードのみ許可されています
 DocType: Expense Claim,Expense Approver,経費承認者
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +109,Row {0}: Advance against Customer must be credit,行{0}：お客様に対する事前クレジットでなければなりません
 apps/erpnext/erpnext/accounts/doctype/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 +16,To Datetime,終了日時
+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/scheduling_tool/scheduling_tool.py +51,Course Schedules deleted:,コーススケジュールを削除します：
 apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,SMSの配信状態を維持管理するためのログ
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,保留中の活動
+DocType: Accounts Settings,Make Payment via Journal Entry,仕訳を経由して支払いを行います
+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 +127,Please enter relieving date.,退職日を入力してください。
-apps/erpnext/erpnext/controllers/trends.py +145,Amt,量／額
+apps/erpnext/erpnext/controllers/trends.py +149,Amt,量／額
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,Only Leave Applications with status 'Approved' can be submitted,ステータスを「承認」とした休暇申請のみ提出可能です
 apps/erpnext/erpnext/utilities/doctype/address/address.py +26,Address Title is mandatory.,住所タイトルは必須です。
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,問い合わせの内容がキャンペーンの場合は、キャンペーンの名前を入力してください
@@ -2548,14 +2578,15 @@
 apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1},{0} {1}への為替レートを見つけることができません。
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,マーク半日
 DocType: Sales Invoice,Sales Team,営業チーム
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Duplicate entry,エントリーを複製
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,エントリーを複製
 DocType: Program Enrollment Tool,Get Students,学生を取得
 DocType: Serial No,Under Warranty,保証期間中
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +490,[Error],[エラー]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +484,[Error],[エラー]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,受注を保存すると表示される表記内。
 ,Employee Birthday,従業員の誕生日
 apps/erpnext/erpnext/controllers/status_updater.py +175,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}はすでに存在している「中期名」との学術用語。これらのエントリを変更して、もう一度お試しください。
 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}は存在しません
@@ -2571,22 +2602,22 @@
 ,Issued Items Against Production Order,製造指示に対して発行されたアイテム
 DocType: Pricing Rule,Purchase Manager,仕入マネージャー
 DocType: Target Detail,Target Detail,ターゲット詳細
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +25,All Jobs,すべてのジョブ
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,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 +323,Amount {0} {1} {2} {3},量{0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,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: Supplier,Credit Limit,与信限度
 DocType: Production Plan Sales Order,Salse Order Date,受注日
 DocType: Salary Component,Salary Component,給与コンポーネント
-apps/erpnext/erpnext/accounts/utils.py +372,Payment Entries {0} are un-linked,支払エントリ{0}は未リンクされています
+apps/erpnext/erpnext/accounts/utils.py +449,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 +497,Material Requests {0} created,資材要求{0}は作成済
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +498,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.,規約・契約用テンプレート
 DocType: Purchase Invoice,Address and Contact,住所・連絡先
@@ -2625,7 +2656,7 @@
 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 +848,Paid Amount cannot be greater than total negative outstanding amount {0},有料額は合計マイナスの残高を超えることはできません{0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +859,Paid Amount cannot be greater than total negative outstanding amount {0},有料額は合計マイナスの残高を超えることはできません{0}
 DocType: Employee Internal Work History,Employee Internal Work History,従業員の入社後の職歴
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +233,Closing (Dr),（借方）を閉じる
 DocType: Cheque Print Template,Cheque Size,小切手サイズ
@@ -2646,7 +2677,8 @@
 ,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 +555,'Update Stock' cannot be checked for fixed asset sale,「アップデート証券は「固定資産売却をチェックすることはできません
+DocType: Student Guardian,Father,お父さん
+apps/erpnext/erpnext/controllers/accounts_controller.py +558,'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/buying/doctype/purchase_order/purchase_order.py +132,Material Request {0} is cancelled or stopped,資材要求{0}はキャンセルまたは停止されています
@@ -2656,15 +2688,15 @@
 DocType: Sales Order,Fully Delivered,全て納品済
 DocType: Lead,Lower Income,低収益
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked",損益における負債の勘定科目が記帳されます
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +166,Source and target warehouse cannot be same for row {0},出庫元／入庫先を同じ行{0}に入れることはできません
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",この在庫棚卸が繰越エントリであるため、差異勘定は資産／負債タイプのアカウントである必要があります
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +81,Purchase Order number required for Item {0},アイテム{0}には発注番号が必要です
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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/purchase_receipt/purchase_receipt.py +82,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 +17,Cannot change status as student {0} is linked with student application {1},学生としてのステータスを変更することはできません{0}学生のアプリケーションとリンクされている{1}
+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: Timesheet,"List of employee which has ""Salary Slip Based on Timesheet"" is enabled in salary structure.",「タイムシートに基づいて給与のスリップ」を持つ従業員のリストは、給与構造で有効になっています。
 DocType: Asset,Fully Depreciated,完全に減価償却
 ,Stock Projected Qty,予測在庫数
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Customer {0} does not belong to project {1},顧客{0}はプロジェクト{1}に属していません
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,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,シリアル番号とバッチ
@@ -2676,7 +2708,7 @@
 DocType: Purchase Invoice,Purchase Taxes and Charges,購入租税公課
 ,Qty to Receive,受領数
 DocType: Leave Block List,Leave Block List Allowed,許可済休暇リスト
-apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +55,All Warehouses,すべての倉庫
+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 +105,Credit To account must be a Balance Sheet account,貸方アカウントは貸借対照表アカウントである必要があります
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,全てのサプライヤータイプ
@@ -2688,10 +2720,10 @@
 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/manufacturing/doctype/bom/bom.js +26,Browse BOM,部品表（BOM）を表示
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,部品表（BOM）を表示
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,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 Year,Academic Year,学年
+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
 DocType: Appraisal,Appraisal,査定
@@ -2699,12 +2731,12 @@
 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 +197,Leave approver must be one of {0},休暇承認者は{0}のいずれかである必要があります
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,Leave approver must be one of {0},休暇承認者は{0}のいずれかである必要があります
 DocType: Hub Settings,Seller Email,販売者のメール
 DocType: Project,Total Purchase Cost (via Purchase Invoice),総仕入費用（仕入請求書経由）
 DocType: Workstation Working Hour,Start Time,開始時間
 DocType: Item Price,Bulk Import Help,一括インポートヘルプ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +256,Select Quantity,数量を選択
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +257,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,送信されたメッセージ
@@ -2721,6 +2753,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,ターゲット数量や目標量のどちらかが必須です。
 apps/erpnext/erpnext/config/projects.py +45,Cost of various activities,様々な活動の費用
 apps/erpnext/erpnext/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 +149,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}よりも古い在庫取引を更新することはできません
 DocType: Item,Inspection Required,要検査
@@ -2740,7 +2773,7 @@
 DocType: Expense Claim,Approval Status,承認ステータス
 DocType: Hub Settings,Publish Items to Hub,ハブにアイテムを公開
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},行{0}の値以下の値でなければなりません
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Wire Transfer,電信振込
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,電信振込
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,すべてチェック
 DocType: Sales Order,Recurring Order,定期的な注文
 DocType: Company,Default Income Account,デフォルト損益勘定
@@ -2752,21 +2785,19 @@
 ,Welcome to ERPNext,ERPNextへようこそ
 apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,見積へのリード
 DocType: Lead,From Customer,顧客から
-apps/erpnext/erpnext/demo/setup_data.py +357,Calls,電話
+apps/erpnext/erpnext/demo/setup/setup_data.py +300,Calls,電話
 DocType: Project,Total Costing Amount (via Time Logs),総原価額（時間ログ経由）
 DocType: Purchase Order Item Supplied,Stock UOM,在庫単位
-apps/erpnext/erpnext/stock/doctype/item/item.py +466,"As there are existing transactions for this item, \
-							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'",既存の取引はあなたが値を変更することはできません\この項目のためにあるように「シリアル番号を持っています &#39;、&#39;バッチを持っていません &#39;、&#39;在庫アイテムである」と「評価方法」
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,Purchase Order {0} is not submitted,発注{0}は提出されていません
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,予想
 apps/erpnext/erpnext/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 +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,注：アイテム{0}の数量が0であるため、システムは超過納品や超過注文をチェックしません。
 DocType: Notification Control,Quotation Message,見積メッセージ
 DocType: Issue,Opening Date,日付を開く
-apps/erpnext/erpnext/schools/api.py +58,Attendance has been marked successfully.,出席が正常にマークされています。
+apps/erpnext/erpnext/schools/api.py +57,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 +136,Account Type for {0} must be {1},{0}のアカウントの種類でなければなりません{1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +139,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,両方の倉庫は同じ会社に属している必要があります
@@ -2781,12 +2812,13 @@
 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/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 +20,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 +1190,Please select customer,顧客を選択してください
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1193,Please select customer,顧客を選択してください
 DocType: C-Form,I,私
 DocType: Company,Asset Depreciation Cost Center,資産減価償却コストセンター
 DocType: Sales Order Item,Sales Order Date,受注日
@@ -2796,6 +2828,7 @@
 ,Payment Period Based On Invoice Date,請求書の日付に基づく支払期間
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},{0}用の為替レートがありません
 DocType: Assessment,Examiner,審査官
+DocType: Student,Siblings,同胞種
 DocType: Journal Entry,Stock Entry,在庫エントリー
 DocType: Payment Entry,Payment References,支払参照
 DocType: C-Form,C-FORM-,C-FORM-
@@ -2813,11 +2846,12 @@
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,トピック名
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,販売または購入のいずれかを選択する必要があります
+DocType: Grading Structure,Grade Intervals,グレード間隔
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,あなたのビジネスの性質を選択します。
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,製造作業が行なわれる場所
 DocType: Asset Movement,Source Warehouse,出庫元
 DocType: Installation Note,Installation Date,設置日
-apps/erpnext/erpnext/controllers/accounts_controller.py +534,Row #{0}: Asset {1} does not belong to company {2},行＃{0}：アセット{1}の会社に属していない{2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +537,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,販売ユーザー
@@ -2831,28 +2865,31 @@
 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 +111,Date Of Retirement must be greater than Date of Joining,退職日は入社日より後でなければなりません
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +49,There were errors while scheduling course on :,上のコースをスケジューリングするときにエラーが発生しました：
 DocType: Sales Invoice,Against Income Account,対損益勘定
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +87,{0}% Delivered,{0}％配送済
+apps/erpnext/erpnext/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 +379,Please set default {0} in Company {1},会社のデフォルト{0}を設定してください。{1}
+apps/erpnext/erpnext/accounts/utils.py +456,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,売上総利益/損失
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,発注アイテム供給済
 apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,会社名は、当社にすることはできません
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,印刷テンプレートのレターヘッド。
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,印刷テンプレートのタイトル（例：「見積送り状」）
+DocType: Student Guardian,Student Guardian,学生ガーディアン
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +184,Valuation type charges can not marked as Inclusive,評価タイプの請求は「包括的」にマークすることはえきません
 DocType: POS Profile,Update Stock,在庫更新
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,アイテムごとに数量単位が異なると、（合計）正味重量値が正しくなりません。各アイテムの正味重量が同じ単位になっていることを確認してください。
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,部品表通貨レート
 DocType: Asset,Journal Entry for Scrap,スクラップ用の仕訳
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,納品書からアイテムを抽出してください
-apps/erpnext/erpnext/accounts/utils.py +349,Journal Entries {0} are un-linked,仕訳{0}はリンク解除されています
+apps/erpnext/erpnext/accounts/utils.py +426,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,会社の丸め誤差コストセンターを指定してください
@@ -2876,6 +2913,7 @@
 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,コミュニティフォーラム
+DocType: Homepage,"URL for ""All Products""",「すべての製品」のURL
 DocType: Leave Application,Leave Balance Before Application,申請前休暇残数
 DocType: SMS Center,Send SMS,SMSを送信
 DocType: Cheque Print Template,Width of amount in word,単語の金額の幅
@@ -2884,7 +2922,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 +29,Current Job Openings,現在の求人
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,Current Job Openings,現在の求人
 DocType: Company,Stock Adjustment Account,在庫調整勘定
 DocType: Journal Entry,Write Off,償却
 DocType: Timesheet Detail,Operation ID,操作ID
@@ -2897,7 +2935,7 @@
 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 +850,Show tax break-up,表示減税アップ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +841,Show tax break-up,表示減税アップ
 apps/erpnext/erpnext/accounts/party.py +308,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}に対して存在します
@@ -2907,10 +2945,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 +534,Please select Posting Date before selecting Party,パーティーを選択する前に転記日付を選択してください
 DocType: Serial No,Out of AMC,年間保守契約外
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +80,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 +162,Please contact to the user who have Sales Master Manager {0} role,販売マスターマネージャー{0}の役割を持っているユーザーに連絡してください
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +195,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 +5,This is based on the attendance of this Student,これは、この生徒の出席に基づいています
@@ -2919,12 +2958,11 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,この受注をキャンセルする前に、納品書{0}をキャンセルしなければなりません
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +75,Paid amount + Write Off Amount can not be greater than Grand Total,支払額＋償却額は総計を超えることはできません
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,{0} is not a valid Batch Number for Item {1},{0}はアイテム{1}に対して有効なバッチ番号ではありません
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +138,Note: There is not enough leave balance for Leave Type {0},注：休暇タイプ{0}のための休暇残高が足りません
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,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,機会タイプ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,新しい会社
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,Cost Center is required for 'Profit and Loss' account {0},「損益」アカウント{0}にはコストセンターが必要です
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,取引は、「会社」の作成者によってのみ削除することができます
 apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,総勘定元帳のエントリの数が正しくありませんが見つかりました。取引に間違った勘定を選択している場合があります。
 DocType: Cheque Print Template,Cheque Width,小切手幅
@@ -2933,16 +2971,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,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 +228,{0} '{1}' is disabled,{0} '{1}'は無効になっています
+apps/erpnext/erpnext/controllers/accounts_controller.py +231,{0} '{1}' is disabled,{0} '{1}'は無効になっています
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,オープンに設定
 DocType: Cheque Print Template,Scanned Cheque,スキャンした小切手
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,取引を処理した時に連絡先に自動メールを送信
+DocType: Timesheet,Total Billable Amount,合計請求可能な金額
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,アイテム3
 DocType: Purchase Order,Customer Contact Email,顧客連絡先メールアドレス
 DocType: Warranty Claim,Item and Warranty Details,アイテムおよび保証詳細
 DocType: Sales Team,Contribution (%),寄与度（％）
-apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,注：「現金または銀行口座」が指定されていないため、支払エントリが作成されません
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Responsibilities,責任
+apps/erpnext/erpnext/controllers/accounts_controller.py +78,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,責任
 DocType: Expense Claim Account,Expense Claim Account,経費請求アカウント
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,テンプレート
 DocType: Sales Person,Sales Person Name,営業担当者名
@@ -2950,6 +2989,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,ユーザー追加
 DocType: Pricing Rule,Item Group,アイテムグループ
 DocType: Item,Safety Stock,安全在庫
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,商品コード&gt;項目グループ&gt;ブランド
 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),租税公課が追加されました。（報告通貨）
@@ -2959,7 +2999,6 @@
 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: Timesheet,Total Hours,時間合計
 DocType: Journal Entry,Printing Settings,印刷設定
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Total Debit must be equal to Total Credit. The difference is {0},借方合計は貸方合計に等しくなければなりません。{0}の差があります。
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,自動車
@@ -2972,13 +3011,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,投資銀行
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +71,Cash or Bank Account is mandatory for making payment entry,現金または銀行口座は、支払いのエントリを作成するための必須です
 DocType: Purchase Invoice,Price List Exchange Rate,価格表為替レート
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,顧客&gt;顧客グループ&gt;テリトリー
 DocType: Purchase Invoice Item,Rate,単価／率
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Intern,インターン
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,インターン
 DocType: Stock Entry,From BOM,参照元部品表
 DocType: Assessment,Assessment Code,評価コード
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +32,Basic,基本
+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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',「スケジュール生成」をクリックしてください
+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 +95,Reference No is mandatory if you entered Reference Date,参照日を入力した場合は参照番号が必須です
@@ -2987,11 +3027,11 @@
 DocType: Salary Slip,Salary Structure,給与体系
 DocType: Account,Bank,銀行
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,航空会社
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +752,Issue Material,資材課題
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +723,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 +683,You are in offline mode. You will not be able to reload until you have network.,オフラインモードになっています。あなたがネットワークを持ってまで、リロードすることができません。
+apps/erpnext/erpnext/accounts/page/pos/pos.js +665,You are in offline mode. You will not be able to reload until you have network.,オフラインモードになっています。あなたがネットワークを持ってまで、リロードすることができません。
 DocType: Hub Settings,Access Token,アクセストークン
 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,シリアル番号
@@ -2999,33 +3039,35 @@
 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 +1122,Enter value must be positive,入力値は正でなければなりません
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,All Territories,全ての領域
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1125,Enter value must be positive,入力値は正でなければなりません
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,全ての領域
 DocType: Purchase Invoice,Items,アイテム
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +23,Student is already enrolled.,学生はすでに登録されています。
 DocType: Fiscal Year,Year Name,年の名前
 DocType: Process Payroll,Process Payroll,給与支払
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,休日数が月営業日数を上回っています
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +233,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 +96,Request for Quotations,見積依頼
+apps/erpnext/erpnext/hooks.py +104,Request for Quotations,見積依頼
 DocType: Payment Reconciliation,Maximum Invoice Amount,最大請求額
 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 +628,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',バリエーションのデフォルト単位 '{0}' はテンプレート '{1}' と同じである必要があります
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',バリエーションのデフォルト単位 '{0}' はテンプレート '{1}' と同じである必要があります
 DocType: Shipping Rule,Calculate Based On,計算基準
 DocType: Delivery Note Item,From Warehouse,倉庫から
 DocType: Assessment,Supervisor Name,上司の名前
+DocType: Assessment,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,仕入ユーザー
 DocType: Notification Control,Customize the Notification,通知をカスタマイズ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Cash Flow from Operations,営業活動によるキャッシュフロー
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,デフォルトのアドレステンプレートを削除することはできません
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,デフォルトのアドレステンプレートを削除することはできません
 DocType: Sales Invoice,Shipping Rule,出荷ルール
 DocType: Manufacturer,Limited to 12 characters,12文字に制限されています
 DocType: Journal Entry,Print Heading,印刷見出し
@@ -3040,8 +3082,8 @@
 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/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,ターゲット数量や目標量のどちらかが必須です
-apps/erpnext/erpnext/stock/get_item_details.py +485,No default BOM exists for Item {0},アイテム{0}にはデフォルトの部品表が存在しません
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +336,Please select Posting Date first,最初の転記日付を選択してください
+apps/erpnext/erpnext/stock/get_item_details.py +486,No default BOM exists for Item {0},アイテム{0}にはデフォルトの部品表が存在しません
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +326,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,既存の取引があるコストセンターは、元帳に変換することはできません
@@ -3057,6 +3099,7 @@
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,請求書と一致支払い
 DocType: Journal Entry,Bank Entry,銀行取引記帳
 DocType: Authorization Rule,Applicable To (Designation),（肩書）に適用
+,Profitability Analysis,収益性分析
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,カートに追加
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,グループ化
 DocType: Guardian,Interests,興味
@@ -3069,21 +3112,21 @@
 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 +141,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",シリアル番号が付与されたアイテム{0}は「在庫棚卸」を使用して更新することはできません
 DocType: Scheduling Tool,Day,日
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,新しいシリアル番号には倉庫を指定することができません。倉庫は在庫エントリーか領収書によって設定する必要があります
 DocType: Lead,Lead Type,リードタイプ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,You are not authorized to approve leaves on Block Dates,休暇申請を承認する権限がありません
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,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: Student Applicant,AP.,AP。
 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 +639,Point of Sale,POS
+apps/erpnext/erpnext/accounts/page/pos/pos.js +634,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,税
 DocType: Production Planning Tool,Production Planning Tool,製造計画ツール
@@ -3092,74 +3135,77 @@
 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 +373,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 Entry,Update Rate and Availability,単価と残量をアップデート
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,注文数に対して受領または提供が許可されている割合。例：100単位の注文を持っている状態で、割当が10％だった場合、110単位の受領を許可されます。
 DocType: POS Profile,Customer Group,顧客グループ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,Expense account is mandatory for item {0},アイテム{0}には経費科目が必須です
 DocType: Item,Website Description,ウェブサイトの説明
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date must be on or after today,次の減価償却日は、今日の日以降である必要があります
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,資本の純変動
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +145,Please cancel Purchase Invoice {0} first,最初の購入請求書{0}をキャンセルしてください
 DocType: Serial No,AMC Expiry Date,年間保守契約の有効期限日
 ,Sales Register,販売登録
 DocType: Quotation,Quotation Lost Reason,失注理由
+apps/erpnext/erpnext/utilities/doctype/address/address.py +164,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,デフォルトのアドレステンプレートが見つかりませんでした。 [設定]&gt; [印刷とブランディング&gt;アドレステンプレートから新しいものを作成してください。
 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 +330,Transaction reference no {0} dated {1},トランザクションの参照には{0} {1}日付けません
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Transaction reference no {0} dated {1},トランザクションの参照には{0} {1}日付けません
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,編集するものがありません
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,Summary for this month and pending activities,今月と保留中の活動の概要
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,今月と保留中の活動の概要
 DocType: Customer Group,Customer Group Name,顧客グループ名
 apps/erpnext/erpnext/public/js/financial_statements.js +54,Cash Flow Statement,キャッシュフロー計算書
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Please remove this Invoice {0} from C-Form {1},C-フォーム{1}から請求書{0}を削除してください
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,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 +644,Get Items,項目を取得
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +623,Get Items,項目を取得
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +210,Please enter Write Off Account,償却勘定を入力してください
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,最終注文日
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +41,Account {0} does not belongs to company {1},アカウント{0} は会社 {1} に所属していません
+DocType: Student,Guardian Details,ガーディアン詳細
 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,計画開始日
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,Customer is required against Receivable account {0},お客様は、売掛金勘定に対して必要とされている{0}
 DocType: Serial No,Creation Document Type,作成ドキュメントの種類
 DocType: Leave Type,Is Encash,現金化済
 DocType: Purchase Invoice,Mobile No,携帯番号
 DocType: Leave Allocation,New Leaves Allocated,新しい有給休暇
-apps/erpnext/erpnext/controllers/trends.py +265,Project-wise data is not available for Quotation,プロジェクトごとのデータは、引用符は使用できません
+apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,プロジェクトごとのデータは、引用符は使用できません
 DocType: Project,Expected End Date,終了予定日
 DocType: Budget Account,Budget Amount,予算額
 DocType: Appraisal Template,Appraisal Template Title,査定テンプレートタイトル
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,Commercial,営利企業
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,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 +648,Row {0}# Account must be of type 'Fixed Asset',行{0}＃のアカウントタイプでなければなりません &quot;固定資産&quot;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,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 +30,Series is mandatory,シリーズは必須です
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +50,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}には倉庫が必要です
 DocType: Leave Allocation,Unused leaves,未使用の休暇
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Cr,貸方
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Cr,貸方
 DocType: Tax Rule,Billing State,請求状況
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +250,Transfer,移転
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +187,{0} {1} does not associated with Party Account {2},{0} {1}党のアカウントに関連付けられていません{2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,Fetch exploded BOM (including sub-assemblies),（部分組立品を含む）展開した部品表を取得する
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +254,Transfer,移転
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +190,{0} {1} does not associated with Party Account {2},{0} {1}党のアカウントに関連付けられていません{2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +796,Fetch exploded BOM (including sub-assemblies),（部分組立品を含む）展開した部品表を取得する
 DocType: Authorization Rule,Applicable To (Employee),（従業員）に適用
-apps/erpnext/erpnext/controllers/accounts_controller.py +115,Due Date is mandatory,期日は必須です
+apps/erpnext/erpnext/controllers/accounts_controller.py +118,Due Date is mandatory,期日は必須です
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,属性 {0} の増分は0にすることはできません
 DocType: Journal Entry,Pay To / Recd From,支払先／受領元
 DocType: Naming Series,Setup Series,シリーズ設定
 DocType: Payment Reconciliation,To Invoice Date,請求書の日付へ
 DocType: Supplier,Contact HTML,連絡先HTML
 ,Inactive Customers,非アクティブ顧客
+DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,仕入領収書
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,どのように価格設定ルールが適用されている？
 DocType: Quality Inspection,Delivery Note No,納品書はありません
@@ -3168,7 +3214,7 @@
 DocType: Company,Retail,小売
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +120,Customer {0} does not exist,顧客{0}は存在しません
 DocType: Attendance,Absent,欠勤
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +587,Product Bundle,製品付属品
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Product Bundle,製品付属品
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Invalid reference {1},行{0}：無効参照{1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,購入租税公課テンプレート
 DocType: Upload Attendance,Download Template,テンプレートのダウンロード
@@ -3178,8 +3224,8 @@
 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 +742,Send Supplier Emails,サプライヤーメールを送信
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +104,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",給与はすでに{0}と{1}、この日付範囲の間にすることはできません申請期間を残すとの間の期間のために処理しました。
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +708,Send Supplier Emails,サプライヤーメールを送信
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,"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,ガーディアンインタレスト
 DocType: Timesheet,Employee Detail,従業員の詳細
@@ -3190,9 +3236,9 @@
 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/accounts/doctype/gl_entry/gl_entry.py +77,Account {0} cannot be a Group,アカウント{0}はグループにすることはできません
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} cannot be a Group,アカウント{0}はグループにすることはできません
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +31,Optional. This setting will be used to filter in various transactions.,（オプション）この設定は、様々な取引をフィルタリングするために使用されます。
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +107,Negative Valuation Rate is not allowed,マイナスの評価額は許可されていません
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,マイナスの評価額は許可されていません
 DocType: Holiday List,Weekly Off,週休
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","例：2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +39,Provisional Profit / Loss (Credit),暫定損益（貸方）
@@ -3206,16 +3252,16 @@
 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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}：項目{2}には「コストセンター」が必須です
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +626,Get Items from Product Bundle,付属品からアイテムを取得
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +605,Get Items from Product Bundle,付属品からアイテムを取得
 DocType: Asset,Straight Line,直線
 DocType: Project User,Project User,プロジェクトユーザー
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} is inactive,アカウント{0}はアクティブではありません
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} is inactive,アカウント{0}はアクティブではありません
 DocType: GL Entry,Is Advance,前払金
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,出勤開始日と出勤日は必須です
 apps/erpnext/erpnext/controllers/buying_controller.py +148,Please enter 'Is Subcontracted' as Yes or No,「下請」にはYesかNoを入力してください
 DocType: Sales Team,Contact No.,連絡先番号
 DocType: Bank Reconciliation,Payment Entries,支払エントリ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,'Profit and Loss' type account {0} not allowed in Opening Entry,開いているエントリでは「損益」タイプアカウント{0}は許可されていません
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +71,'Profit and Loss' type account {0} not allowed in Opening Entry,開いているエントリでは「損益」タイプアカウント{0}は許可されていません
 DocType: Program Enrollment Tool,Get Students From,からの留学生を取得
 DocType: Hub Settings,Seller Country,販売者所在国
 apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,ウェブサイト上でアイテムを公開
@@ -3234,7 +3280,7 @@
 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 +558,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",行＃{0}：アセット{1}提出することができない、それはすでに{2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +561,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",行＃{0}：アセット{1}提出することができない、それはすでに{2}
 DocType: Tax Rule,Billing Country,請求先の国
 DocType: Production Order,Expected Delivery Date,配送予定日
 apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,{0} #{1}の借方と貸方が等しくありません。差は{2} です。
@@ -3247,13 +3293,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +202,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: Sales Order,% Amount Billed,％請求
+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 +117,No Item with Serial No {0},シリアル番号{0}のアイテムはありません
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,お知らせを開く
+DocType: Email Digest,Open Notifications,お知らせを開く
 DocType: Payment Entry,Difference Amount (Company Currency),差額（会社通貨）
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,直接経費
 apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
@@ -3261,7 +3307,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,新規顧客の収益
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,旅費交通費
 DocType: Maintenance Visit,Breakdown,故障
-apps/erpnext/erpnext/controllers/accounts_controller.py +634,Account: {0} with currency: {1} can not be selected,アカウント：{0} で通貨：{1}を選択することはできません
+apps/erpnext/erpnext/controllers/accounts_controller.py +637,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}に属していません
 DocType: Program Enrollment Tool,Student Applicants,学生の応募者
@@ -3269,15 +3315,15 @@
 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 +56,Probation,試用
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Probation,試用
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,給与コンポーネント
 DocType: Program Enrollment Tool,New Academic Year,新学期
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Payment of salary for the month {0} and year {1},{1}年{0}月の給与支払
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Payment of salary for the month {0} and year {1},{1}年{0}月の給与支払
 DocType: Stock Settings,Auto insert Price List rate if missing,空の場合価格表の単価を自動挿入
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,支出額合計
 DocType: Production Order Item,Transferred Qty,移転数量
 apps/erpnext/erpnext/config/learn.py +11,Navigating,ナビゲート
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Planning,計画
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,計画
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,課題
 DocType: Project,Total Billing Amount (via Time Logs),総請求金額（時間ログ経由）
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,We sell this Item,このアイテムを売る
@@ -3290,11 +3336,10 @@
 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/accounts/page/pos/pos.js +1376,Sales invoice submitted sucessfully.,売上請求書はsucessfully提出しました。
 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}に、デフォルトのアカウントを設定してください
 DocType: Assessment Result,Student Name,学生の名前
-apps/erpnext/erpnext/hooks.py +104,Assessment Schedule,評価スケジュール
+apps/erpnext/erpnext/hooks.py +113,Assessment Schedule,評価スケジュール
 DocType: Brand,Item Manager,アイテムマネージャ
 DocType: Buying Settings,Default Supplier Type,デフォルトサプライヤータイプ
 DocType: Production Order,Total Operating Cost,営業費合計
@@ -3304,6 +3349,7 @@
 DocType: GL Entry,Party Type,当事者タイプ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +78,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}の限界を超えているので認証されません
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,給与テンプレートマスター
 DocType: Leave Type,Max Days Leave Allowed,休暇割当最大日数
@@ -3315,18 +3361,19 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,リードや顧客への見積。
 DocType: Stock Settings,Role Allowed to edit frozen stock,凍結在庫の編集が許可された役割
 ,Territory Target Variance Item Group-Wise,地域ターゲット差違（アイテムグループごと）
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Customer Groups,全ての顧客グループ
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +78,Accumulated Monthly,月間累計
-apps/erpnext/erpnext/controllers/accounts_controller.py +595,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0}は必須です。おそらく{1}から {2}のための通貨変換レコードが作成されていません
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,全ての顧客グループ
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +81,Accumulated Monthly,月間累計
+apps/erpnext/erpnext/controllers/accounts_controller.py +598,{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}が存在しません
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),価格表単価（会社通貨）
 DocType: Products Settings,Products Settings,製品の設定
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +188,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,[設定]&gt; [設定]&gt; [ネーミングシリーズを経由して{0}のためのシリーズのネーミング設定してください
 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 +84,Secretary,秘書
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,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,購入
@@ -3335,24 +3382,22 @@
 ,Reqd By Date,要求済日付
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Creditors,債権者
 DocType: Assessment,Assessment Name,アセスメントの名前
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,行＃{0}：シリアル番号は必須です
+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 +859,Supplier Quotation,サプライヤー見積
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +838,Supplier Quotation,サプライヤー見積
 DocType: Quotation,In Words will be visible once you save the Quotation.,見積を保存すると表示される表記内。
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +7,Collect Fees,料金を徴収
+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}で使用済です
 DocType: Lead,Add to calendar on this date,この日付でカレンダーに追加
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,送料を追加するためのルール
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,今後のイベント
 DocType: Item,Opening Stock,期首在庫
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,顧客が必要です
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,返品には {0} が必須です
 DocType: Purchase Order,To Receive,受領する
 apps/erpnext/erpnext/public/js/setup_wizard.js +195,user@example.com,user@example.com
-DocType: Email Digest,Income / Expense,収益/費用
 DocType: Employee,Personal Email,個人メールアドレス
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,派生の合計
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.",有効にすると、システムは自動的に在庫の会計エントリーを投稿します
@@ -3363,13 +3408,14 @@
 DocType: Customer,From Lead,リードから
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,製造の指示
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,年度選択...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,POS Profile required to make POS Entry,POSエントリを作成するためにはPOSプロフィールが必要です
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +509,POS Profile required to make POS Entry,POSエントリを作成するためにはPOSプロフィールが必要です
 DocType: Program Enrollment Tool,Enroll Students,学生を登録
 DocType: Hub Settings,Name Token,名前トークン
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,標準販売
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Atleast one warehouse is mandatory,倉庫は少なくとも1つ必須です
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +129,Atleast one warehouse is mandatory,倉庫は少なくとも1つ必須です
 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 +330,{0} against Sales Invoice {1},納品書{1}に対する{0}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,プロジェクト名
@@ -3390,10 +3436,11 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,休暇は0.5の倍数で割り当てられなければなりません
 DocType: Production Order,Operation Cost,作業費用
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,CSVファイルで出勤アップロード
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,未払額
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,この営業担当者にアイテムグループごとの目標を設定する
 DocType: Stock Settings,Freeze Stocks Older Than [Days],[日]より古い在庫を凍結
-apps/erpnext/erpnext/controllers/accounts_controller.py +528,Row #{0}: Asset is mandatory for fixed asset purchase/sale,行＃{0}：資産は、固定資産の購入/販売のために必須です
+apps/erpnext/erpnext/controllers/accounts_controller.py +531,Row #{0}: Asset is mandatory for fixed asset purchase/sale,行＃{0}：資産は、固定資産の購入/販売のために必須です
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","上記の条件内に二つ以上の価格設定ルールがある場合、優先順位が適用されます。
 優先度は0〜20の間の数で、デフォルト値はゼロ（空白）です。同じ条件で複数の価格設定ルールがある場合、大きい数字が優先されることになります。"
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,会計年度：{0}は存在しません
@@ -3411,15 +3458,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,未公開株式
 DocType: Maintenance Visit,Customer Feedback,顧客フィードバック
 DocType: Account,Expense,経費
-DocType: Sales Invoice,Exhibition,展示会
 apps/erpnext/erpnext/utilities/doctype/address/address.py +77,"Company is mandatory, as it is your company address",会社住所には会社が必須です
 DocType: Item Attribute,From Range,範囲開始
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +81,Syntax error in formula or condition: {0},式または条件の構文エラー：{0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +92,Syntax error in formula or condition: {0},式または条件の構文エラー：{0}
 apps/erpnext/erpnext/stock/utils.py +99,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 +28,Jobs,ジョブズ
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,ジョブズ
 ,Sales Order Trends,受注の傾向
 DocType: Employee,Held On,開催
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,生産アイテム
@@ -3428,16 +3475,16 @@
 DocType: Stock Entry Detail,Additional Cost,追加費用
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,会計年度終了日
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher",伝票でグループ化されている場合、伝票番号でフィルタリングすることはできません。
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +763,Make Supplier Quotation,サプライヤ見積を作成
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,Make Supplier Quotation,サプライヤ見積を作成
 DocType: Quality Inspection,Incoming,収入
 DocType: BOM,Materials Required (Exploded),資材が必要です（展開）
 apps/erpnext/erpnext/public/js/setup_wizard.js +185,"Add users to your organization, other than yourself",自分以外のユーザーを組織に追加
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,Row # {0}: Serial No {1} does not match with {2} {3},行＃{0}：シリアル番号 {1} が {2} {3}と一致しません
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +42,Casual Leave,臨時休暇
+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,臨時休暇
 DocType: Batch,Batch ID,バッチID
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,Note: {0},注：{0}
 ,Delivery Note Trends,納品書の動向
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +103,This Week's Summary,今週の概要
+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}のみ株式取引を介して更新することができます
 DocType: Student Group Creation Tool,Get Courses,コースを取得
 DocType: GL Entry,Party,当事者
@@ -3447,7 +3494,7 @@
 DocType: Request for Quotation Item,Request for Quotation Item,見積明細の要求
 DocType: Purchase Order,To Bill,請求先
 DocType: Material Request,% Ordered,％注文済
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Piecework,出来高制
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Piecework,出来高制
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,平均購入レート
 DocType: Task,Actual Time (in Hours),実際の時間（時）
 DocType: Employee,History In Company,会社での履歴
@@ -3464,7 +3511,7 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +350,{0} units of {1} needed in {2} to complete this transaction.,{0}は、このトランザクションを完了するために、{2}に必要な{1}の単位。
 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 +162,Black,黒
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,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}アイテム
@@ -3475,13 +3522,13 @@
 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 +69,Customer Id,顧客ID
+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,マーク不在
 DocType: Journal Entry Account,Exchange Rate,為替レート
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Sales Order {0} is not submitted,受注{0}は提出されていません
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +527,Sales Order {0} is not submitted,受注{0}は提出されていません
 DocType: Homepage,Tag Line,タグライン
 DocType: Fee Component,Fee Component,手数料コンポーネント
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +857,Add items from,から項目を追加します。
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +836,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}に属していません
 DocType: Cheque Print Template,Regular,レギュラー
 DocType: BOM,Last Purchase Rate,最新の仕入料金
@@ -3489,6 +3536,7 @@
 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}の在庫は存在させることができません
 ,Sales Person-wise Transaction Summary,各営業担当者の取引概要
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +60,Cost Center is required for 'Profit and Loss' account {0}. Please set up a default Cost Center for the Company.,コストセンターは、「損益」アカウント{0}のために必要とされます。会社のデフォルトのコストセンターを設定してください。
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,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,月次配分割合
@@ -3499,12 +3547,12 @@
 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 +710,Online,オンライン
+apps/erpnext/erpnext/accounts/page/pos/pos.js +692,Online,オンライン
 ,Available Stock for Packing Items,梱包可能な在庫
 DocType: Item Variant,Item Variant,アイテムバリエーション
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,他にデフォルトがないので、このアドレステンプレートをデフォルトとして設定します
+apps/erpnext/erpnext/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 +74,Quality Management,品質管理
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,品質管理
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,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,従業員の職歴
@@ -3526,11 +3574,12 @@
 DocType: Student,Student Email ID,学生メールID
 DocType: Employee,Notice (days),お知らせ（日）
 DocType: Tax Rule,Sales Tax Template,販売税テンプレート
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1520,Select items to save the invoice,請求書を保存する項目を選択します
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1544,Select items to save the invoice,請求書を保存する項目を選択します
 DocType: Employee,Encashment Date,現金化日
 DocType: Account,Stock Adjustment,在庫調整
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},デフォルトの活動コストが活動タイプ -  {0} に存在します
 DocType: Production Order,Planned Operating Cost,予定営業費用
+DocType: Academic Term,Term Start Date,用語開始日
 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,申請者名
@@ -3560,17 +3609,17 @@
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,倉庫（継続記録）のアカウントは、このアカウントの下に作成されます。
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +119,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,在庫元帳にエントリーが存在する倉庫を削除することはできません。
 DocType: Company,Distribution,配布
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +8,Amount Paid,支払額
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Project Manager,プロジェクトマネージャー
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,支払額
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,プロジェクトマネージャー
 ,Quoted Item Comparison,引用符で囲まれた項目の比較
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Dispatch,発送
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,発送
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,アイテムの許可最大割引：{0}が{1}％
 apps/erpnext/erpnext/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.,設定された与信限度額を超えた取引を提出することが許可されている役割
-DocType: Sales Invoice,Supplier Reference,サプライヤーリファレンス
-apps/erpnext/erpnext/accounts/page/pos/pos.js +844,"Master data syncing, it might take some time",マスタデータの同期、それはいくつかの時間がかかる場合があります
+apps/erpnext/erpnext/accounts/page/pos/pos.js +832,"Master data syncing, it might take some time",マスタデータの同期、それはいくつかの時間がかかる場合があります
 DocType: Item,Material Issue,資材課題
 DocType: Hub Settings,Seller Description,販売者の説明
 DocType: Employee Education,Qualification,資格
@@ -3584,7 +3633,7 @@
 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 +83,Error in formula or condition,式または条件でエラーが発生しました
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,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,すべて選択解除
@@ -3593,7 +3642,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},開始日は会計年度内でなければなりません（もしかして：{0}）
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc",ここでは、身長、体重、アレルギー、医療問題などを保持することができます
 DocType: Leave Block List,Applies to Company,会社に適用
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +197,Cannot cancel because submitted Stock Entry {0} exists,登録済みの在庫エントリ{0}が存在するため、キャンセルすることができません
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +198,Cannot cancel because submitted Stock Entry {0} exists,登録済みの在庫エントリ{0}が存在するため、キャンセルすることができません
 DocType: Purchase Invoice,In Words,文字表記
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,Today is {0}'s birthday!,今日は {0} の誕生日です！
 DocType: Production Planning Tool,Material Request For Warehouse,倉庫への資材要求
@@ -3603,14 +3652,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,会計年度開始日
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,資産減価償却と残高
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +319,Amount {0} {1} transferred from {2} to {3},量は{0} {1} {3}に{2}から転送します
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +322,Amount {0} {1} transferred from {2} to {3},量は{0} {1} {3}に{2}から転送します
 DocType: Sales Invoice,Get Advances Received,前受金を取得
 DocType: Email Digest,Add/Remove Recipients,受信者の追加／削除
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +432,Transaction not allowed against stopped Production Order {0},停止された製造指示{0}に対しては取引が許可されていません
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +437,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 +143,Join,参加
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,不足数量
-apps/erpnext/erpnext/stock/doctype/item/item.py +652,Item variant {0} exists with same attributes,アイテムバリエーション{0}は同じ属性で存在しています
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,アイテムバリエーション{0}は同じ属性で存在しています
+DocType: Leave Application,LAP/,ラップ/
 DocType: Salary Slip,Salary 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,「終了日」が必要です
@@ -3618,12 +3668,12 @@
 DocType: Sales Invoice Item,Sales Order Item,受注項目
 DocType: Salary Slip,Payment Days,支払日
 DocType: Customer,Dormant,休眠
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +212,Warehouses with child nodes cannot be converted to ledger,子ノードを持つ倉庫は、元帳に変換することはできません
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +215,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/public/js/controllers/transaction.js +866,It is needed to fetch Item Details.,これは、アイテムの詳細を取得するために必要とされます。
+apps/erpnext/erpnext/public/js/controllers/transaction.js +857,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}はすでに受領されています
@@ -3633,14 +3683,14 @@
 DocType: Expense Claim,Total Claimed Amount,請求額合計
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,潜在的販売機会
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,Invalid {0},無効な {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Sick Leave,病欠
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,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,デパート
 DocType: Warehouse,PIN,ピン
 DocType: Sales Invoice,Base Change Amount (Company Currency),基本変化量（会社通貨）
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +313,No accounting entries for the following warehouses,次の倉庫には会計エントリーがありません
-apps/erpnext/erpnext/projects/doctype/project/project.js +102,Save the document first.,先に文書を保存してください
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +314,No accounting entries for the following warehouses,次の倉庫には会計エントリーがありません
+apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,先に文書を保存してください
 DocType: Account,Chargeable,請求可能
 DocType: Company,Change Abbreviation,略語を変更
 DocType: Expense Claim Detail,Expense Date,経費日付
@@ -3653,10 +3703,9 @@
 DocType: Purchase Invoice,Recurring Print Format,繰り返し用印刷フォーマット
 DocType: C-Form,Series,シリーズ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,Expected Delivery Date cannot be before Purchase Order Date,納品予定日は発注日より前にすることはできません
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,[設定]&gt; [設定]&gt; [ネーミングシリーズを経由して{0}のためのシリーズのネーミング設定してください
 DocType: Appraisal,Appraisal Template,査定テンプレート
 DocType: Item Group,Item Classification,アイテム分類
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Business Development Manager,ビジネス開発マネージャー
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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,総勘定元帳
@@ -3666,8 +3715,8 @@
 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 +940,Please select {0} first,{0}を選択してください
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +749,Batch {0} of Item {1} has expired.,アイテム {1}のバッチ {0} は期限切れです
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +953,Please select {0} first,{0}を選択してください
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +757,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,小計
@@ -3695,8 +3744,8 @@
  {％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 +92,Warehouse not found in the system,システムに倉庫がありません。
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +106,This Month's Summary,今月の概要
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,システムに倉庫がありません。
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,今月の概要
 DocType: Quality Inspection Reading,Quality Inspection Reading,品質検査報告要素
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,「〜より古い在庫を凍結する」は %d 日よりも小さくしなくてはなりません
 DocType: Tax Rule,Purchase Tax Template,購入税テンプレート
@@ -3706,21 +3755,22 @@
 DocType: Item Customer Detail,Ref Code,参照コード
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,従業員レコード
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Please set Next Depreciation Date,次の減価償却日を設定してください
-DocType: Payment Gateway,Payment Gateway,ペイメントゲートウェイ
 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 +378,Operation Time must be greater than 0 for Operation {0},作業 {0} の作業時間は0以上でなければなりません
+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/accounts/doctype/account/account.py +170,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(縦)が最適です
 DocType: Program,Program Abbreviation,プログラムの略
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,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: Appraisal,Start Date,開始日
@@ -3736,21 +3786,22 @@
 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,料金がそのアイテムに適用できない場合は、アイテムを削除する
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,例「smsgateway.com/api/send_sms.cgi」
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +27,Transaction currency must be same as Payment Gateway currency,取引通貨は、ペイメントゲートウェイ通貨と同じでなければなりません
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Transaction currency must be same as Payment Gateway currency,取引通貨は、ペイメントゲートウェイ通貨と同じでなければなりません
 DocType: Payment Entry,Receive,受信
+apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,名言：
 DocType: Maintenance Visit,Fully Completed,全て完了
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}％完了
 DocType: Employee,Educational Qualification,学歴
 DocType: Workstation,Operating Costs,営業費用
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,アクション毎月の予算が超過累積場合
 DocType: Purchase Invoice,Submit on creation,作成時に提出
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +432,Currency for {0} must be {1},{0} {1}でなければならないための通貨
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +435,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 +493,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}：この倉庫{1}には既に再注文エントリが存在しています
+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/crm/doctype/opportunity/opportunity.py +79,"Cannot declare as lost, because Quotation has been made.",見積が作成されているため、失注を宣言できません
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,仕入マスターマネージャー
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +429,Production Order {0} must be submitted,製造指示{0}を提出しなければなりません
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +434,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,終了日を開始日の前にすることはできません
@@ -3760,25 +3811,27 @@
 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 +181,Totals,合計
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,合計
 DocType: BOM,Manufacturing,製造
 ,Ordered Items To Be Delivered,納品予定の注文済アイテム
 DocType: Account,Income,収入
 DocType: Industry Type,Industry Type,業種タイプ
 apps/erpnext/erpnext/templates/includes/cart.js +141,Something went wrong!,問題発生！
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,Warning: Leave application contains following block dates,警告：休暇申請に次の期間が含まれています。
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +120,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}このトランザクションを完了するための単位。
+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 +181,Organization unit (department) master.,組織単位（部門）マスター。
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,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 +793,All records are synced.,すべてのレコードが同期されます。
+apps/erpnext/erpnext/accounts/page/pos/pos.js +781,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,コストセンター名
@@ -3797,21 +3850,20 @@
 DocType: Address,Name of person or organization that this address belongs to.,このアドレスが所属する個人または組織の名前。
 apps/erpnext/erpnext/public/js/setup_wizard.js +260,Your Suppliers,サプライヤー
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +49,Cannot set as Lost as Sales Order is made.,受注が作成されているため、失注にできません
-DocType: Student Applicant,Mother's Name,母親の名前
 DocType: Request for Quotation Item,Supplier Part No,サプライヤー型番
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +348,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',カテゴリが「評価」または「Vaulationと合計」のためのものであるときに控除することはできません。
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Received From,受領元
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,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}： {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 +93,Row {0}: Hours value must be greater than zero.,行{0}：時間値がゼロより大きくなければなりません。
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +117,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}が見つかりません
 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 +172,{0} {1} does not exist,{0} {1}が存在しません
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +175,{0} {1} does not exist,{0} {1}が存在しません
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,Please check Multi Currency option to allow accounts with other currency,アカウントで他の通貨の使用を可能にするには「複数通貨」オプションをチェックしてください
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +72,Item: {0} does not exist in the system,アイテム：{0}はシステムに存在しません
 apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,凍結された値を設定する権限がありません
@@ -3820,13 +3872,14 @@
 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/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,出勤は将来の日付にマークを付けることができません
 DocType: Pricing Rule,Pricing Rule Help,価格設定ルールヘルプ
 DocType: Purchase Taxes and Charges,Account Head,勘定科目
 apps/erpnext/erpnext/config/stock.py +163,Update additional costs to calculate landed cost of items,アイテムの陸揚費用を計算するために、追加の費用を更新してください
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Electrical,電気
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Electrical,電気
 DocType: Stock Entry,Total Value Difference (Out - In),価値差違合計（出 - 入）
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,Row {0}: Exchange Rate is mandatory,行{0}：為替レートは必須です
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},従業員{0}のユーザーIDが未設定です。
@@ -3834,7 +3887,7 @@
 DocType: Item,Customer Code,顧客コード
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +210,Birthday Reminder for {0},{0}のための誕生日リマインダー
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,最新注文からの日数
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +292,Debit To account must be a Balance Sheet account,借方アカウントは貸借対照表アカウントである必要があります
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To account must be a Balance Sheet account,借方アカウントは貸借対照表アカウントである必要があります
 DocType: Buying Settings,Naming Series,シリーズ名を付ける
 DocType: Leave Block List,Leave Block List Name,休暇リスト名
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,在庫資産
@@ -3846,11 +3899,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 +301,Salary Slip of employee {0} already created for time sheet {1},従業員の給与スリップ{0}はすでにタイムシート用に作成した{1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +313,Salary Slip of employee {0} already created for time sheet {1},従業員の給与スリップ{0}はすでにタイムシート用に作成した{1}
 DocType: Sales Order Item,Ordered Qty,注文数
-apps/erpnext/erpnext/stock/doctype/item/item.py +673,Item {0} is disabled,アイテム{0}は無効です
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} is disabled,アイテム{0}は無効です
 DocType: Stock Settings,Stock Frozen Upto,在庫凍結
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +838,BOM does not contain any stock item,BOMは、どの在庫品目が含まれていません
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +809,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,給与明細を生成
@@ -3858,23 +3911,24 @@
 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 +485,Row #{0}: Please set reorder quantity,行＃{0}：再注文数量を設定してください
+DocType: Sales Invoice Timesheet,Billing Hours,課金時間
+apps/erpnext/erpnext/stock/doctype/item/item.py +487,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 +62,Please set {0},{0}を設定してください
 DocType: Purchase Invoice,Repeat on Day of Month,毎月繰り返し
 DocType: Employee,Health Details,健康の詳細
 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,上で選択した条件で全ての給与伝票を提出
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} アイテム同期
 DocType: Sales Order,Partly Delivered,一部納品済
-DocType: Sales Invoice,Existing Customer,既存の顧客
 DocType: Email Digest,Receivables,売掛金
+DocType: Lead Source,Lead Source,リード元
 DocType: Customer,Additional information regarding the customer.,顧客に関する追加情報
 DocType: Quality Inspection Reading,Reading 5,報告要素5
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +38,Campaign Name is required,キャンペーン名が必要です
 DocType: Maintenance Visit,Maintenance Date,メンテナンス日
 DocType: Purchase Invoice Item,Rejected Serial No,拒否されたシリアル番号
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +80,Year start date or end date is overlapping with {0}. To avoid please set company,年の開始日や終了日が{0}と重なっています。回避のため会社を設定してください
@@ -3884,10 +3938,9 @@
 取引にシリーズが設定されかつシリアル番号が記載されていない場合、自動シリアル番号は、このシリーズに基づいて作成されます。
 このアイテムのシリアル番号を常に明示的に記載したい場合、これを空白のままにします。"
 DocType: Upload Attendance,Upload Attendance,出勤アップロード
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +129,BOM and Manufacturing Quantity are required,部品表と生産数量が必要です
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,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,最大強度
-DocType: Bank Reconciliation Detail,Amount,額
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,部品表交換
 ,Sales Analytics,販売分析
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +113,Available {0},利用可能な{0}
@@ -3895,14 +3948,14 @@
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,メール設定
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +96,Please enter default currency in Company Master,会社マスターにデフォルトの通貨を入力してください
 DocType: Stock Entry Detail,Stock Entry Detail,在庫エントリー詳細
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +100,Daily Reminders,日次リマインダー
+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/account/account_tree.js +23,New Account Name,新しいアカウント名
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,原材料供給費用
 DocType: Selling Settings,Settings for Selling Module,販売モジュール設定
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Customer Service,顧客サービス
+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/config/hr.py +50,Offer candidate a Job.,雇用候補者
@@ -3911,8 +3964,9 @@
 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}は在庫アイテムでなければなりません
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,デフォルト作業中倉庫
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1570,Total nos of serial no is not equal to quantity.,シリアル番号の合計NOSは、数量と同じではありません。
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1594,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?,エラー：有効なIDではない？
 DocType: Naming Series,Update Series Number,シリーズ番号更新
@@ -3920,9 +3974,10 @@
 DocType: Sales Order,Printing Details,印刷詳細
 DocType: Task,Closing Date,締切日
 DocType: Sales Order Item,Produced Quantity,生産数量
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Engineer,エンジニア
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Engineer,エンジニア
+DocType: Journal Entry,Total Amount Currency,総額通貨
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,組立部品を検索
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Item Code required at Row No {0},行番号{0}にアイテムコードが必要です
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +398,Item Code required at Row No {0},行番号{0}にアイテムコードが必要です
 DocType: Sales Partner,Partner Type,パートナーの種類
 DocType: Purchase Taxes and Charges,Actual,実際
 DocType: Authorization Rule,Customerwise Discount,顧客ごと割引
@@ -3938,16 +3993,18 @@
 DocType: BOM,Raw Material Cost,原材料費
 DocType: Item Reorder,Re-Order Level,再注文レベル
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,製造指示を出すまたは分析用に原材料をダウンロードするための、アイテムと計画数を入力してください。
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +55,Part-time,パートタイム
+apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,ガントチャート
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,パートタイム
 DocType: Employee,Applicable Holiday List,適切な休日リスト
 DocType: Employee,Cheque,小切手
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,シリーズ更新
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +57,Series Updated,シリーズ更新
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,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 +87,Clearance Date updated,クリアランス日更新
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,照合完了
@@ -3961,7 +4018,7 @@
 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 +513,Posting date and posting time is mandatory,転記日時は必須です
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,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.,発注を保存すると表示される表記内。
@@ -3971,7 +4028,7 @@
 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/stock/doctype/stock_entry/stock_entry.py +158,Target warehouse in row {0} must be same as Production Order,{0}列のターゲット倉庫は製造注文と同じでなければなりません。
+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,他の通貨を使用してエントリーを作成した後には通貨を変更することができません
 DocType: Company,Round Off Account,丸め誤差アカウント
@@ -3980,23 +4037,22 @@
 DocType: Customer Group,Parent Customer Group,親顧客グループ
 DocType: Purchase Invoice,Contact Email,連絡先 メール
 DocType: Appraisal Goal,Score Earned,スコア獲得
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Notice Period,通知期間
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,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 +4,New Sales Person Name,新しい営業担当者の名前
 DocType: Packing Slip,Gross Weight UOM,総重量数量単位
-DocType: Email Digest,Receivables / Payables,売掛／買掛
 DocType: Delivery Note Item,Against Sales Invoice,対納品書
 DocType: Bin,Reserved Qty for Production,生産のための予約済み数量
 DocType: Asset,Frequency of Depreciation (Months),減価償却費の周波数（ヶ月）
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +469,Credit Account,貸方アカウント
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Credit Account,貸方アカウント
 DocType: Landed Cost Item,Landed Cost Item,輸入費用項目
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +55,Show zero values,ゼロ値を表示
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,ゼロ値を表示
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,与えられた原材料の数量から製造／再梱包した後に得られたアイテムの数量
 apps/erpnext/erpnext/public/js/setup_wizard.js +315,Setup a simple website for my organization,セットアップ自分の組織のためのシンプルなウェブサイト
 DocType: Payment Reconciliation,Receivable / Payable Account,売掛金／買掛金
 DocType: Delivery Note Item,Against Sales Order Item,対受注アイテム
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Please specify Attribute Value for attribute {0},属性 {0} の属性値を指定してください
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},属性 {0} の属性値を指定してください
 DocType: Item,Default Warehouse,デフォルト倉庫
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +39,Budget cannot be assigned against Group Account {0},グループアカウント{0}に対して予算を割り当てることができません
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,親コストセンターを入力してください
@@ -4018,19 +4074,22 @@
 DocType: Journal Entry,Total Debit,借方合計
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,デフォルト完成品倉庫
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,営業担当
-DocType: Sales Invoice,Cold Calling,コールドコール（リードを育成せずに電話営業）
 DocType: SMS Parameter,SMS Parameter,SMSパラメータ
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,予算とコストセンター
 DocType: Maintenance Schedule Item,Half Yearly,半年ごと
 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",チェックした場合、営業日数は全て祝日を含みますが、これにより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.,期間終了日は、期間開始日より前にすることはできません。日付を訂正して、もう一度お試しください。
+DocType: Stock Reconciliation Item,Quantity Difference,数量違い
 apps/erpnext/erpnext/config/hr.py +253,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 +141,Set as Lost,失注として設定
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,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 +5,This is based on transactions against this Customer. See timeline below for details,これは、この顧客に対するトランザクションに基づいています。詳細については、以下のタイムラインを参照してください。
 DocType: Supplier,Credit Days Based On,与信日数基準
@@ -4042,11 +4101,10 @@
 ,Items To Be Requested,要求されるアイテム
 DocType: Purchase Order,Get Last Purchase Rate,最新の購入料金を取得
 DocType: Company,Company Info,会社情報
-apps/erpnext/erpnext/accounts/page/pos/pos.js +941,Select or add new customer,選択するか、新規顧客を追加
+apps/erpnext/erpnext/accounts/page/pos/pos.js +930,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 +5,This is based on the attendance of this Employee,これは、この従業員の出席に基づいています
-DocType: Sales Invoice,Frequency,周波数
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +463,Debit Account,借方アカウント
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Debit Account,借方アカウント
 DocType: Fiscal Year,Year Start Date,年始日
 DocType: Attendance,Employee Name,従業員名
 DocType: Sales Invoice,Rounded Total (Company Currency),合計（四捨五入）（会社通貨）
@@ -4055,27 +4113,27 @@
 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 +210,Supplier Quotation {0} created,サプライヤー見積 {0} 作成済
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +208,Supplier Quotation {0} created,サプライヤー見積 {0} 作成済
 apps/erpnext/erpnext/accounts/report/financial_statements.py +90,End Year cannot be before Start Year,終了年は開始年前にすることはできません
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Employee Benefits,従業員給付
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,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 +228,Please set a default Holiday List for Employee {0} or Company {1},従業員のデフォルト休日リストを設定してください{0}または当社{1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +232,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 +499,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},行番号 {0}：経費請求{1}に対して保留額より大きい額は指定できません。保留額は {2} です
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +500,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},行番号 {0}：経費請求{1}に対して保留額より大きい額は指定できません。保留額は {2} です
 DocType: Maintenance Schedule,Schedule,スケジュール
 DocType: Account,Parent Account,親勘定
 DocType: Quality Inspection Reading,Reading 3,報告要素3
 ,Hub,ハブ
 DocType: GL Entry,Voucher Type,伝票タイプ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1007,Price List not found or disabled,価格表が見つからないか無効になっています
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1008,Price List not found or disabled,価格表が見つからないか無効になっています
 DocType: Expense Claim,Approved,承認済
 DocType: Pricing Rule,Price,価格
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +244,Employee relieved on {0} must be set as 'Left',{0}から取り除かれた従業員は「退職」に設定されなければなりません
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +256,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} が作成されました
@@ -4086,12 +4144,12 @@
 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 +259,Please select Employee Record first.,先に従業員レコードを選択してください
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +266,Please select Employee Record first.,先に従業員レコードを選択してください
 DocType: POS Profile,Account for Change Amount,変化量のためのアカウント
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +190,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},行{0}：当事者／アカウントが {3} {4} の {1} / {2}と一致しません
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +235,Please enter Expense Account,経費勘定を入力してください
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,Please enter Expense Account,経費勘定を入力してください
 DocType: Account,Stock,在庫
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,"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 +976,"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,仕入／製造の詳細
@@ -4106,9 +4164,10 @@
 DocType: Asset Movement,Transaction Date,取引日
 DocType: Production Plan Item,Planned Qty,計画数量
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,税合計
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,For Quantity (Manufactured Qty) is mandatory,数量（製造数量）が必須です
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,For Quantity (Manufactured Qty) is mandatory,数量（製造数量）が必須です
 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 +78,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,実際の開始日
@@ -4123,9 +4182,11 @@
 DocType: Warranty Claim,If different than customer address,顧客の住所と異なる場合
 DocType: BOM Operation,BOM Operation,部品表の操作
 DocType: Purchase Taxes and Charges,On Previous Row Amount,前行の額
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +226,Transfer Asset,資産を譲渡
+DocType: Student,Home Address,ホームアドレス
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +227,Transfer Asset,資産を譲渡
 DocType: POS Profile,POS Profile,POSプロフィール
 apps/erpnext/erpnext/config/schools.py +33,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 +129,"Item {0} is a template, please select one of its variants",アイテム{0}はテンプレートです。バリエーションのいずれかを選択してください
 DocType: Asset,Asset Category,資産カテゴリー
@@ -4135,8 +4196,8 @@
 DocType: Assessment,Room,ルーム
 DocType: Purchase Order,Advance Paid,立替金
 DocType: Item,Item Tax,アイテムごとの税
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +765,Material to Supplier,サプライヤー用資材
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +189,Excise Invoice,消費税の請求書
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,Material to Supplier,サプライヤー用資材
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,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,流動負債
@@ -4146,7 +4207,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,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 +136,Credit Card,クレジットカード
+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.,在庫取引のデフォルト設定
 DocType: Purchase Invoice,Next Date,次の日
@@ -4154,6 +4215,7 @@
 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: Academic Term,Term End Date,期末日
 DocType: Hub Settings,Seller Name,販売者名
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),租税公課控除（会社通貨）
 DocType: Item Group,General Settings,一般設定
@@ -4165,7 +4227,7 @@
 DocType: Customer,Commission Rate,手数料率
 apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,バリエーション作成
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,部門別休暇申請
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +115,"Payment Type must be one of Receive, Pay and Internal Transfer",お支払い方法の種類は、受信のいずれかで支払うと内部転送する必要があります
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +118,"Payment Type must be one of Receive, Pay and Internal Transfer",お支払い方法の種類は、受信のいずれかで支払うと内部転送する必要があります
 apps/erpnext/erpnext/config/selling.py +169,Analytics,分析
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,カートは空です
 DocType: Production Order,Actual Operating Cost,実際の営業費用
@@ -4180,10 +4242,10 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,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 +92,Designer,デザイナー
+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/accounts/doctype/purchase_invoice/purchase_invoice.py +469,Cost Center is required in row {0} in Taxes table for type {1},タイプ{1}のための税金テーブルの行{0}にコストセンターが必要です
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +472,Cost Center is required in row {0} in Taxes table for type {1},タイプ{1}のための税金テーブルの行{0}にコストセンターが必要です
 DocType: Program,Program Code,プログラム・コード
 ,Item-wise Purchase Register,アイテムごとの仕入登録
 DocType: Batch,Expiry Date,有効期限
@@ -4193,12 +4255,12 @@
 apps/erpnext/erpnext/config/projects.py +13,Project master.,プロジェクトマスター
 apps/erpnext/erpnext/controllers/status_updater.py +174,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.",証券取引設定]または[アイテムの「手当」を更新し、課金オーバーまたは過剰発注できるようにするには。
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,次の通貨に$などのような任意のシンボルを表示しません。
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +417, (Half Day),（半日）
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425, (Half Day),（半日）
 DocType: Supplier,Credit Days,信用日数
 DocType: Leave Type,Is Carry Forward,繰越済
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +740,Get Items from BOM,部品表からアイテムを取得
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +711,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 +549,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},資産の転記日付購入日と同じでなければなりません{1} {2}：行＃{0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +552,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,上記の表に受注を入力してください
 ,Stock Summary,株式の概要
 apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,別の倉庫から資産を移します
diff --git a/erpnext/translations/km.csv b/erpnext/translations/km.csv
index 6ed4d05..59deb28 100644
--- a/erpnext/translations/km.csv
+++ b/erpnext/translations/km.csv
@@ -18,11 +18,10 @@
 DocType: Sales Partner,Dealer,អ្នកចែកបៀ
 DocType: Employee,Rented,ជួល
 DocType: Purchase Order,PO-,PO-
-apps/erpnext/erpnext/accounts/report/financial_statements.py +19,Start Year {0} not found.,ការចាប់ផ្តើមឆ្នាំរកមិនឃើញ {0} ។
 DocType: POS Profile,Applicable for User,អាចប្រើប្រាស់បានសំរាប់អ្នកប្រើប្រាស់
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +191,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",បញ្ឈប់ការបញ្ជាទិញផលិតផលដែលមិនអាចត្រូវបានលុបចោលឮវាជាលើកដំបូងដើម្បីបោះបង់
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +197,Do you really want to scrap this asset?,តើអ្នកពិតជាចង់លុបចោលទ្រព្យសម្បត្តិនេះ?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +17,Select Default Supplier,ជ្រើសផ្គត់ផ្គង់លំនាំដើម
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +192,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",បញ្ឈប់ការបញ្ជាទិញផលិតផលដែលមិនអាចត្រូវបានលុបចោលឮវាជាលើកដំបូងដើម្បីបោះបង់
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +198,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 +36,Currency is required for Price List {0},រូបិយប័ណ្ណត្រូវបានទាមទារសម្រាប់តារាងតម្លៃ {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* នឹងត្រូវបានគណនាក្នុងប្រតិបត្តិការនេះ។
 DocType: Address,County,ខោនធី
@@ -42,46 +41,45 @@
 DocType: Sales Invoice,Customer Name,ឈ្មោះអតិថិជន
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +126,Bank account cannot be named as {0},គណនីធនាគារដែលមិនអាចត្រូវបានដាក់ឈ្មោះថាជា {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,ក្បាល (ឬក្រុម) ប្រឆាំងនឹងធាតុគណនេយ្យនិងតុល្យភាពត្រូវបានធ្វើឡើងត្រូវបានរក្សា។
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +180,Outstanding for {0} cannot be less than zero ({1}),ឆ្នើមសម្រាប់ {0} មិនអាចតិចជាងសូន្យ ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,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 +148,Series Updated Successfully,កម្រងឯកសារបន្ទាន់សម័យដោយជោគជ័យ
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +149,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,ទាំងអស់ផ្គត់ផ្គង់ទំនាក់ទំនង
-DocType: Quality Inspection Reading,Parameter,ប៉ារ៉ាម៉ែត្រ
 apps/erpnext/erpnext/projects/doctype/project/project.py +54,Expected End Date can not be less than Expected Start Date,គេរំពឹងថានឹងកាលបរិច្ឆេទបញ្ចប់មិនអាចតិចជាងការរំពឹងទុកការចាប់ផ្តើមកាលបរិច្ឆេទ
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,ជួរដេក # {0}: អត្រាការប្រាក់ត្រូវតែមានដូចគ្នា {1} {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +239,New Leave Application,ចាកចេញកម្មវិធីថ្មី
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,New Leave Application,ចាកចេញកម្មវិធីថ្មី
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +20,Attendance Record {0} exists against Student {1} for Course Schedule {2},ការចូលរួមកំណត់ត្រា {0} មានប្រឆាំងនឹងនិស្សិត {1} សម្រាប់វគ្គសិក្សាកាលវិភាគ {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Bank Draft,សេចក្តីព្រាងធនាគារ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,សេចក្តីព្រាងធនាគារ
 DocType: Mode of Payment Account,Mode of Payment Account,របៀបនៃការទូទាត់គណនី
 apps/erpnext/erpnext/stock/doctype/item/item.js +52,Show Variants,បង្ហាញវ៉ារ្យ៉ង់
 DocType: Academic Term,Academic Term,រយៈពេលនៃការសិក្សា
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +13,Material,សម្ភារៈ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Quantity,បរិមាណដែលត្រូវទទួលទាន
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +511,Accounts table cannot be blank.,តារាងគណនីមិនអាចទទេ។
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +616,Quantity,បរិមាណដែលត្រូវទទួលទាន
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +512,Accounts table cannot be blank.,តារាងគណនីមិនអាចទទេ។
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,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/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 +142,User {0} is already assigned to Employee {1},{0} អ្នកប្រើត្រូវបានកំណត់រួចទៅបុគ្គលិក {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,ការថែទាំសុខភាព
-DocType: Purchase Invoice,Monthly,ប្រចាំខែ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),ពន្យាពេលក្នុងការទូទាត់ (ថ្ងៃ)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +771,Invoice,វិក័យប័ត្រ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +750,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 +198,Row {0}: {1} {2} does not match with {3},ជួរដេក {0}: {1} {2} មិនផ្គូផ្គងនឹង {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,ជួរដេក # {0}:
+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 +127,Please select Price List,សូមជ្រើសតារាងតម្លៃ
@@ -112,8 +110,8 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,ក្រុមហ៊ុនដូចគ្នាត្រូវបានបញ្ចូលច្រើនជាងម្ដង
 DocType: Employee,Married,រៀបការជាមួយ
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},មិនត្រូវបានអនុញ្ញាតសម្រាប់ {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +589,Get items from,ទទួលបានធាតុពី
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +382,Stock cannot be updated against Delivery Note {0},ភាគហ៊ុនដែលមិនអាចធ្វើបច្ចុប្បន្នភាពការប្រឆាំងនឹងការដឹកជញ្ជូនចំណាំ {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,ទទួលបានធាតុពី
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,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,គ្រឿងទេស
@@ -122,7 +120,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 +156,Salary Structure Missing,បាត់ប្រាក់ខែរចនាសម្ព័ន្ធ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Salary Structure Missing,បាត់ប្រាក់ខែរចនាសម្ព័ន្ធ
 DocType: Lead,Person Name,ឈ្មោះបុគ្គល
 DocType: Sales Invoice Item,Sales Invoice Item,ការលក់វិក័យប័ត្រធាតុ
 DocType: Account,Credit,ឥណទាន
@@ -130,10 +128,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 +156,Credit limit has been crossed for customer {0} {1}/{2},ដែនកំណត់ឥណទានត្រូវបានឆ្លងកាត់សម្រាប់អតិថិជន {0} {1} / {2}
-apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",«តើអចលន &quot;មិនអាចត្រូវបានធីកមានទ្រព្យសម្បត្តិដែលជាកំណត់ត្រាប្រឆាំងនឹងធាតុ
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +189,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;មិនអាចត្រូវបានធីកមានទ្រព្យសម្បត្តិដែលជាកំណត់ត្រាប្រឆាំងនឹងធាតុ
 DocType: Tax Rule,Tax Type,ប្រភេទពន្ធលើ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +144,You are not authorized to add or update entries before {0},អ្នកមិនត្រូវបានអនុញ្ញាតឱ្យបន្ថែមឬធ្វើឱ្យទាន់សម័យធាតុមុន {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},អ្នកមិនត្រូវបានអនុញ្ញាតឱ្យបន្ថែមឬធ្វើឱ្យទាន់សម័យធាតុមុន {0}
 DocType: Item,Item Image (if not slideshow),រូបភាពធាតុ (ប្រសិនបើមិនមានការបញ្ចាំងស្លាយ)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,អតិថិជនមួយដែលមានឈ្មោះដូចគ្នា
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(ហួរអត្រា / 60) * ជាក់ស្តែងប្រតិបត្តិការម៉ោង
@@ -143,18 +142,17 @@
 DocType: Student Log,Student Log,កំណត់ហេតុរបស់សិស្ស
 DocType: Quality Inspection,Get Specification Details,ទទួលបានព័ត៌មានលម្អិតជាក់លាក់
 DocType: Lead,Interested,មានការចាប់អារម្មណ៍
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +165,Opening,ពិធីបើក
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,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/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,អតិថិជន&gt; ក្រុមផ្ទាល់ខ្លួន&gt; ដែនដី
 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.,គណនីប្រតិបត្តិការដែលមានស្រាប់ដែលមិនអាចត្រូវបានបម្លែងទៅជាក្រុម។
 DocType: Lead,Product Enquiry,ផលិតផលសំណួរ
 DocType: Academic Term,Schools,សាលារៀន
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,សូមបញ្ចូលក្រុមហ៊ុនដំបូង
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Company first,សូមជ្រើសរើសក្រុមហ៊ុនដំបូង
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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,ការចំណាយសរុប
@@ -164,7 +162,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,សេចក្តីថ្លែងការណ៍របស់គណនី
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,ឱសថ
 DocType: Purchase Invoice Item,Is Fixed Asset,ជាទ្រព្យថេរ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Available qty is {0}, you need {1}","qty អាចប្រើបានគឺ {0}, អ្នកត្រូវ {1}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +225,"Available qty is {0}, you need {1}","qty អាចប្រើបានគឺ {0}, អ្នកត្រូវ {1}"
 DocType: Expense Claim Detail,Claim Amount,ចំនួនពាក្យបណ្តឹង
 DocType: Employee,Mr,លោក
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,ប្រភេទក្រុមហ៊ុនផ្គត់ផ្គង់ / ផ្គត់ផ្គង់
@@ -173,25 +171,26 @@
 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: Assessment Result,Grade,ថ្នាក់ទី
 DocType: Sales Invoice Item,Delivered By Supplier,បានបញ្ជូនដោយអ្នកផ្គត់ផ្គង់
 DocType: SMS Center,All Contact,ទំនាក់ទំនងទាំងអស់
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Annual Salary,ប្រាក់បៀវត្សប្រចាំឆ្នាំប្រាក់
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,ការចំណាយភាគហ៊ុន
-apps/erpnext/erpnext/accounts/report/financial_statements.py +22,End Year {0} not found.,ឆ្នាំបញ្ចប់ {0} មិនត្រូវបានរកឃើញ។
 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}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,ការផ្គត់ផ្គង់សម្ភារៈសម្រាប់ការទិញសាច់ឆៅ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +130,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 +451,Item {0} is not active or end of life has been reached,ធាតុ {0} គឺមិនសកម្មឬទីបញ្ចប់នៃជីវិតត្រូវបានឈានដល់
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +456,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/controllers/accounts_controller.py +614,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",ដើម្បីរួមបញ្ចូលពន្ធក្នុងជួរ {0} នៅក្នុងអត្រាធាតុពន្ធក្នុងជួរដេក {1} ត្រូវតែត្រូវបានរួមបញ្ចូល
+apps/erpnext/erpnext/controllers/accounts_controller.py +617,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",ដើម្បីរួមបញ្ចូលពន្ធក្នុងជួរ {0} នៅក្នុងអត្រាធាតុពន្ធក្នុងជួរដេក {1} ត្រូវតែត្រូវបានរួមបញ្ចូល
 apps/erpnext/erpnext/config/hr.py +166,Settings for HR Module,ការកំណត់សម្រាប់ម៉ូឌុលធនធានមនុស្ស
 DocType: SMS Center,SMS Center,ផ្ញើសារជាអក្សរមជ្ឈមណ្ឌល
 DocType: Sales Invoice,Change Amount,ការផ្លាស់ប្តូរចំនួនទឹកប្រាក់
@@ -203,13 +202,13 @@
 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 +147,Execution,ការប្រតិបត្តិ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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,ធាតុនិងតម្លៃ
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},ម៉ោងសរុប: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},ពីកាលបរិច្ឆេទគួរជានៅក្នុងឆ្នាំសារពើពន្ធ។ សន្មត់ថាពីកាលបរិច្ឆេទ = {0}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,Cost Center {0} does not belong to Company {1},ចំណាយប្រាក់អស់មជ្ឈមណ្ឌល {0} មិនមែនជាកម្មសិទ្ធិរបស់ក្រុមហ៊ុន {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +100,Cost Center {0} does not belong to Company {1},ចំណាយប្រាក់អស់មជ្ឈមណ្ឌល {0} មិនមែនជាកម្មសិទ្ធិរបស់ក្រុមហ៊ុន {1}
 DocType: Customer,Individual,បុគគល
 DocType: Interest,Academics User,អ្នកប្រើប្រាស់សាស្ត្រាចារ្យ
 DocType: Cheque Print Template,Amount In Figure,ចំនួនទឹកប្រាក់ក្នុងរូបភាព
@@ -225,30 +224,32 @@
 DocType: Production Planning Tool,Sales Orders,ការបញ្ជាទិញការលក់
 DocType: Purchase Taxes and Charges,Valuation,ការវាយតម្លៃ
 ,Purchase Order Trends,ទិញលំដាប់និន្នាការ
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,The request for quotation can be accessed by clicking on the following link,សំណើរសម្រាប់សម្រង់នេះអាចត្រូវបានចូលដំណើរការដោយចុចលើតំណខាងក្រោម
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,បម្រុងទុកស្លឹកសម្រាប់ឆ្នាំនេះ។
 DocType: SG Creation Tool Course,SG Creation Tool Course,វគ្គឧបករណ៍បង្កើត SG
 DocType: Student Group Creation Tool,Leave blank if you wish to fetch all courses for selected academic term,ទុកឱ្យនៅទទេប្រសិនបើអ្នកមានបំណងចង់ប្រមូលយកវគ្គសិក្សាទាំងអស់សម្រាប់រយៈពេលនៃការសិក្សាដែលបានជ្រើសរើស
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,Insufficient Stock,ហ៊ុនមិនគ្រប់គ្រាន់
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227,Insufficient Stock,ហ៊ុនមិនគ្រប់គ្រាន់
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,បិទការធ្វើផែនការតាមដានម៉ោងសមត្ថភាពនិង
+DocType: Email Digest,New Sales Orders,ការបញ្ជាទិញការលក់ការថ្មី
 DocType: Bank Reconciliation,Bank Account,គណនីធនាគារ
 DocType: Leave Type,Allow Negative Balance,អនុញ្ញាតឱ្យមានតុល្យភាពអវិជ្ជមាន
 DocType: Selling Settings,Default Territory,ដែនដីលំនាំដើម
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,ទូរទស្សន៏
 DocType: Production Order Operation,Updated via 'Time Log',ធ្វើឱ្យទាន់សម័យតាមរយៈ &quot;ពេលវេលាកំណត់ហេតុ &#39;
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} does not belong to Company {1},គណនី {0} មិនមែនជាកម្មសិទ្ធិរបស់ក្រុមហ៊ុន {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +86,Account {0} does not belong to Company {1},គណនី {0} មិនមែនជាកម្មសិទ្ធិរបស់ក្រុមហ៊ុន {1}
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},ចំនួនទឹកប្រាក់ជាមុនមិនអាចច្រើនជាង {0} {1}
 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 +174,For Warehouse is required before Submit,សម្រាប់ឃ្លាំងត្រូវទាមទារមុនពេលដាក់ស្នើ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,For Warehouse is required before Submit,សម្រាប់ឃ្លាំងត្រូវទាមទារមុនពេលដាក់ស្នើ
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,ទទួលបាននៅលើ
 DocType: Sales Partner,Reseller,លក់បន្ត
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,សូមបញ្ចូលក្រុមហ៊ុន
 DocType: Delivery Note Item,Against Sales Invoice Item,ការប្រឆាំងនឹងការធាតុលក់វិក័យប័ត្រ
 ,Production Orders in Progress,ការបញ្ជាទិញផលិតកម្មក្នុងវឌ្ឍនភាព
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Cash from Financing,សាច់ប្រាក់សុទ្ធពីការផ្តល់ហិរញ្ញប្បទាន
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1436,"LocalStorage is full , did not save","ផ្ទុកទិន្នន័យមូលដ្ឋានជាការពេញលេញ, មិនបានរក្សាទុក"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1460,"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}
@@ -261,18 +262,19 @@
 apps/erpnext/erpnext/templates/generators/item.html +78,No description given,ការពិពណ៌នាដែលបានផ្ដល់ឱ្យមិនមាន
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,ស្នើសុំសម្រាប់ការទិញ។
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +5,This is based on the Time Sheets created against this project,នេះមានមូលដ្ឋានលើតារាងពេលវេលាដែលបានបង្កើតការប្រឆាំងនឹងគម្រោងនេះ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Only the selected Leave Approver can submit this Leave Application,មានតែការយល់ព្រមចាកចេញជ្រើសអាចដាក់ពាក្យសុំចាកចេញនេះ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +213,Only the selected Leave Approver can submit this Leave Application,មានតែការយល់ព្រមចាកចេញជ្រើសអាចដាក់ពាក្យសុំចាកចេញនេះ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,បន្ថយកាលបរិច្ឆេទត្រូវតែធំជាងកាលបរិច្ឆេទនៃការចូលរួម
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Leaves per Year,ស្លឹកមួយឆ្នាំ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,ស្លឹកមួយឆ្នាំ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,ជួរដេក {0}: សូមពិនិត្យមើលតើជាមុនប្រឆាំងគណនី {1} ប្រសិនបើនេះជាធាតុជាមុន។
 apps/erpnext/erpnext/stock/utils.py +188,Warehouse {0} does not belong to company {1},ឃ្លាំង {0} មិនមែនជាកម្មសិទ្ធិរបស់ក្រុមហ៊ុន {1}
+DocType: Email Digest,Profit & Loss,ប្រាក់ចំណេញនិងការបាត់បង់
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,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 +435,Leave Blocked,ទុកឱ្យទប់ស្កាត់
-apps/erpnext/erpnext/stock/doctype/item/item.py +669,Item {0} has reached its end of life on {1},ធាតុ {0} បានឈានដល់ទីបញ្ចប់នៃជីវិតរបស់ខ្លួននៅលើ {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +443,Leave Blocked,ទុកឱ្យទប់ស្កាត់
+apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item {0} has reached its end of life on {1},ធាតុ {0} បានឈានដល់ទីបញ្ចប់នៃជីវិតរបស់ខ្លួននៅលើ {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +95,Bank Entries,ធាតុធនាគារ
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +83,Annual,ប្រចាំឆ្នាំ
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +86,Annual,ប្រចាំឆ្នាំ
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,ធាតុភាគហ៊ុនការផ្សះផ្សា
 DocType: Stock Entry,Sales Invoice No,ការលក់វិក័យប័ត្រគ្មាន
 DocType: Material Request Item,Min Order Qty,លោក Min លំដាប់ Qty
@@ -280,20 +282,22 @@
 DocType: Lead,Do Not Contact,កុំទំនាក់ទំនង
 apps/erpnext/erpnext/public/js/setup_wizard.js +360,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 +91,Software Developer,អភិវឌ្ឍន៍កម្មវិធី
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,អភិវឌ្ឍន៍កម្មវិធី
 DocType: Item,Minimum Order Qty,អប្បរមាលំដាប់ Qty
 DocType: Pricing Rule,Supplier Type,ប្រភេទក្រុមហ៊ុនផ្គត់ផ្គង់
 DocType: Scheduling Tool,Course Start Date,វគ្គសិក្សាបានចាប់ផ្តើមកាលបរិច្ឆេទ
 DocType: Item,Publish in Hub,បោះពុម្ពផ្សាយនៅក្នុងមជ្ឈមណ្ឌល
+DocType: Student Admission,Student Admission,ការចូលរបស់សិស្ស
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is cancelled,ធាតុ {0} ត្រូវបានលុបចោល
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Material Request,សម្ភារៈស្នើសុំ
+apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} is cancelled,ធាតុ {0} ត្រូវបានលុបចោល
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +823,Material Request,សម្ភារៈស្នើសុំ
 DocType: Bank Reconciliation,Update Clearance Date,ធ្វើឱ្យទាន់សម័យបោសសំអាតកាលបរិច្ឆេទ
 apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +28,Abbreviation already used for another salary component,អក្សរសង្ខេបដែលបានប្រើរួចហើយសម្រាប់សមាសភាគប្រាក់ខែមួយទៀត
 DocType: Item,Purchase Details,ពត៌មានលំអិតទិញ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +328,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},ធាតុ {0} មិនត្រូវបានរកឃើញនៅក្នុង &#39;វត្ថុធាតុដើមការី &quot;តារាងក្នុងការទិញលំដាប់ {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +333,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/config/selling.py +18,Confirmed orders from Customers.,ការបញ្ជាទិញបានបញ្ជាក់អះអាងពីអតិថិជន។
 DocType: Purchase Receipt Item,Rejected Quantity,បរិមាណដែលត្រូវបានច្រានចោល
 DocType: SMS Settings,SMS Sender Name,ឈ្មោះរបស់អ្នកផ្ញើសារជាអក្សរ
@@ -309,20 +313,21 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +130,Please select Charge Type first,សូមជ្រើសប្រភេទទទួលបន្ទុកជាលើកដំបូង
 DocType: Student Group Student,Student Group Student,សិស្សគ្រុបសិស្ស
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,មានចុងក្រោយ
+DocType: Email Digest,New Quotations,សម្រង់សម្តីដែលថ្មី
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,ការអនុម័តចាកចេញដំបូងក្នុងបញ្ជីនេះនឹងត្រូវបានកំណត់ជាលំនាំដើមចាកចេញការអនុម័ត
 DocType: Tax Rule,Shipping County,ការដឹកជញ្ជូនខោនធី
 apps/erpnext/erpnext/config/desktop.py +158,Learn,រៀន
 DocType: Asset,Next Depreciation Date,រំលស់បន្ទាប់កាលបរិច្ឆេទ
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,តម្លៃសកម្មភាពដោយបុគ្គលិក
 DocType: Accounts Settings,Settings for Accounts,ការកំណត់សម្រាប់គណនី
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +626,Supplier Invoice No exists in Purchase Invoice {0},ក្រុមហ៊ុនផ្គត់ផ្គង់មានក្នុងវិក័យប័ត្រគ្មានវិក័យប័ត្រទិញ {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +629,Supplier Invoice No exists in Purchase Invoice {0},ក្រុមហ៊ុនផ្គត់ផ្គង់មានក្នុងវិក័យប័ត្រគ្មានវិក័យប័ត្រទិញ {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,គ្រប់គ្រងការលក់បុគ្គលដើមឈើ។
 DocType: Job Applicant,Cover Letter,លិខិត
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,មូលប្បទានប័ត្រឆ្នើមនិងប្រាក់បញ្ញើដើម្បីជម្រះ
 DocType: Item,Synced With Hub,ធ្វើសមកាលកម្មជាមួយនឹងការហាប់
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,ពាក្យសម្ងាត់មិនត្រឹមត្រូវ
 DocType: Item,Variant Of,វ៉ារ្យ៉ង់របស់
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,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 +86,Circular Reference Error,កំហុសក្នុងការយោងសារាចរ
@@ -334,15 +339,16 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,ជូនដំណឹងដោយអ៊ីមែលនៅលើការបង្កើតសម្ភារៈស្នើសុំដោយស្វ័យប្រវត្តិ
 DocType: Journal Entry,Multi Currency,រូបិយប័ណ្ណពហុ
 DocType: Payment Reconciliation Invoice,Invoice Type,ប្រភេទវិក័យប័ត្រ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +806,Delivery Note,ដឹកជញ្ជូនចំណាំ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +800,Delivery Note,ដឹកជញ្ជូនចំណាំ
 apps/erpnext/erpnext/config/learn.py +87,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 +233,Payment Entry has been modified after you pulled it. Please pull it again.,ចូលការទូទាត់ត្រូវបានកែប្រែបន្ទាប់ពីអ្នកបានទាញវា។ សូមទាញវាម្តងទៀត។
+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/setup/doctype/email_digest/email_digest.py +104,Summary for this week and pending activities,សង្ខេបសម្រាប់សប្តាហ៍នេះនិងសកម្មភាពដែលមិនទាន់សម្រេច
+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","បញ្ចូលលេខសម្គាល់អ៊ីម៉ែលដែលបំបែកដោយសញ្ញាក្បៀស, វិក័យប័ត្រដែលនឹងត្រូវបានផ្ញើដោយស្វ័យប្រវត្តិនៅលើកាលបរិច្ឆេទជាក់លាក់"
 DocType: Employee,Company Email,ក្រុមហ៊ុនអ៊ីម៉ែល
@@ -354,27 +360,28 @@
 apps/erpnext/erpnext/config/hr.py +186,"Employee designation (e.g. CEO, Director etc.).",រចនាបុគ្គលិក (ឧនាយកប្រតិបត្តិនាយកជាដើម) ។
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,សូមបញ្ចូល &#39;ធ្វើម្តងទៀតនៅថ្ងៃនៃខែ&#39; តម្លៃវាល
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,អត្រាដែលរូបិយវត្ថុរបស់អតិថិជនត្រូវបានបម្លែងទៅជារូបិយប័ណ្ណមូលដ្ឋានរបស់អតិថិជន
-apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},ជួរដេក # {0}: ការទិញវិក័យប័ត្រដែលមិនអាចត្រូវបានធ្វើឡើងប្រឆាំងនឹងទ្រព្យសម្បត្តិដែលមានស្រាប់ {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +554,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},ជួរដេក # {0}: ការទិញវិក័យប័ត្រដែលមិនអាចត្រូវបានធ្វើឡើងប្រឆាំងនឹងទ្រព្យសម្បត្តិដែលមានស្រាប់ {1}
 DocType: Item Tax,Tax Rate,អត្រាអាករ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} បម្រុងទុកសម្រាប់បុគ្គលិក {1} សម្រាប់រយៈពេល {2} ទៅ {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +812,Select Item,ជ្រើសធាតុ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +791,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/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,ទិញ {0} វិក័យប័ត្រត្រូវបានដាក់ស្នើរួចទៅហើយ
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},ជួរដេក # {0}: បាច់មិនមានត្រូវតែមានដូចគ្នា {1} {2}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +143,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.,បាច់ (ច្រើន) នៃវត្ថុមួយ។
 DocType: C-Form Invoice Detail,Invoice Date,វិក័យប័ត្រកាលបរិច្ឆេទ
 DocType: GL Entry,Debit Amount,ចំនួនឥណពន្ធ
 apps/erpnext/erpnext/accounts/party.py +242,There can only be 1 Account per Company in {0} {1},មានតែអាចមានគណនីមួយក្រុមហ៊ុន 1 ក្នុង {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +4,Your email address,អាសយដ្ឋានអ៊ីម៉ែលរបស់អ្នក
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +342,Please see attachment,សូមមើលឯកសារភ្ជាប់
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,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 +19,Setup Already Complete!!,ការដំឡើងពេញលេញរួចទៅហើយ !!
 ,Finished Goods,ទំនិញបានបញ្ចប់
 DocType: Delivery Note,Instructions,សេចក្តីណែនាំ
 DocType: Quality Inspection,Inspected By,បានត្រួតពិនិត្យដោយ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,ក្រុមហ៊ុនផ្គត់ផ្គង់&gt; ប្រភេទផ្គត់ផ្គង់
 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,បន្ថែមធាតុ
@@ -388,29 +395,29 @@
 DocType: Currency Exchange,Currency Exchange,ការផ្លាស់ប្តូររូបិយវត្ថុ
 DocType: Purchase Invoice Item,Item Name,ឈ្មោះធាតុ
 DocType: Authorization Rule,Approving User  (above authorized value),ការអនុម័តអ្នកប្រើ (ខាងលើតម្លៃដែលបានអនុញ្ញាត)
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,សមតុល្យឥណទាន
+DocType: Email Digest,Credit Balance,សមតុល្យឥណទាន
 DocType: Employee,Widowed,មេម៉ាយ
 DocType: Request for Quotation,Request for Quotation,សំណើរសម្រាប់សម្រង់
 DocType: Salary Slip Timesheet,Working Hours,ម៉ោងធ្វើការ
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,ផ្លាស់ប្តូរការចាប់ផ្តើមលេខលំដាប់ / នាពេលបច្ចុប្បន្ននៃស៊េរីដែលមានស្រាប់។
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","បើសិនជាវិធានការបន្តតម្លៃជាច្រើនដែលមានជ័យជំនះ, អ្នកប្រើត្រូវបានសួរដើម្បីកំណត់អាទិភាពដោយដៃដើម្បីដោះស្រាយជម្លោះ។"
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +736,Purchase Return,ត្រឡប់ទិញ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +715,Purchase Return,ត្រឡប់ទិញ
 ,Purchase Register,ទិញចុះឈ្មោះ
 DocType: Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,ការចោទប្រកាន់ដែលអាចអនុវត្តបាន
 DocType: Workstation,Consumable Cost,ការចំណាយរបស់អតិថិជនបាន
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +202,{0} ({1}) must have role 'Leave Approver',{0} ({1}) ត្រូវតែមានតួនាទី &quot;ចាកចេញអនុម័ត&quot;
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,{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 +143,Reason for losing,ហេតុផលសម្រាប់ការសម្រក
-apps/erpnext/erpnext/accounts/utils.py +239,Allocated amount can not greater than unadjusted amount,ចំនួនទឹកប្រាក់ដែលបានបម្រុងទុកមិនអាចធំជាងចំនួនសរុបមិនបានកែតម្រូវ
+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,ចំនួនទឹកប្រាក់ដែលបានបម្រុងទុកមិនអាចធំជាងចំនួនសរុបមិនបានកែតម្រូវ
 DocType: Announcement,Receiver,អ្នកទទួល
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},ស្ថានីយការងារត្រូវបានបិទនៅលើកាលបរិច្ឆេទដូចខាងក្រោមដូចជាក្នុងបញ្ជីថ្ងៃឈប់សម្រាក: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,ឱកាសការងារ
 DocType: Employee,Single,នៅលីវ
 DocType: Account,Cost of Goods Sold,តម្លៃនៃការលក់ទំនិញ
 DocType: Purchase Invoice,Yearly,រាល់ឆ្នាំ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +225,Please enter Cost Center,សូមបញ្ចូលមជ្ឈមណ្ឌលការចំណាយ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,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,ពិនិត្យឈ្មោះ
@@ -423,26 +430,26 @@
 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,កំណត់សម្គាល់ Nos ដោយស្វ័យប្រវត្តិដោយផ្អែកលើ FIFO &amp; ‧;
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,ពិនិត្យហាងទំនិញវិក័យប័ត្រលេខពិសេស
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',&#39;ដើម្បីសំណុំរឿងលេខ &quot; មិនអាចតិចជាងពីសំណុំរឿងលេខ &quot;
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,Non Profit,មិនរកប្រាក់ចំណេញ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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: Stock Reconciliation Item,Do not include symbols (ex. $),មិនរួមបញ្ចូលនិមិត្តសញ្ញា (អតីត $) ។
 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 +638,Attribute {0} selected multiple times in Attributes Table,គុណលក្ខណៈ {0} បានជ្រើសរើសច្រើនដងក្នុងតារាងគុណលក្ខណៈ
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,គុណលក្ខណៈ {0} បានជ្រើសរើសច្រើនដងក្នុងតារាងគុណលក្ខណៈ
 DocType: HR Settings,Employee record is created using selected field. ,កំណត់ត្រាបុគ្គលិកត្រូវបានបង្កើតដោយប្រើវាលដែលបានជ្រើស។
 DocType: Sales Order,Not Applicable,ដែលមិនអាចអនុវត្តបាន
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,ចៅហ្វាយថ្ងៃឈប់សម្រាក។
 DocType: Request for Quotation Item,Required Date,កាលបរិច្ឆេទដែលបានទាមទារ
 DocType: Delivery Note,Billing Address,វិក័យប័ត្រអាសយដ្ឋាន
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +862,Please enter Item Code.,សូមបញ្ចូលលេខកូដធាតុ។
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +847,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",ប្រសិនបើបានធីកចំនួនប្រាក់ពន្ធដែលនឹងត្រូវបានចាត់ទុកជាបានរួមបញ្ចូលរួចហើយនៅក្នុងអត្រាការបោះពុម្ព / បោះពុម្ពចំនួនទឹកប្រាក់
@@ -456,12 +463,12 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,មូលបត្រនិងប្រាក់បញ្ញើ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,ចំនួនសរុបដែលបានបម្រុងទុកគឺស្លឹកដែលចាំបាច់
 DocType: Job Opening,Description of a Job Opening,ការពិពណ៌នាសង្ខេបនៃការបើកការងារ
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Pending activities for today,សកម្មភាពដែលមិនទាន់សម្រេចសម្រាប់ថ្ងៃនេះ
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,សកម្មភាពដែលមិនទាន់សម្រេចសម្រាប់ថ្ងៃនេះ
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,កំណត់ត្រាចូលរួម។
 DocType: Salary Structure,Salary Component for timesheet based payroll.,សមាសភាគបញ្ជីបើកប្រាក់ខែដែលមានមូលដ្ឋានលើប្រាក់បៀវត្សសម្រាប់ timesheet ។
 DocType: Sales Order Item,Used for Production Plan,ត្រូវបានប្រើសម្រាប់ផែនការផលិតកម្ម
 DocType: Manufacturing Settings,Time Between Operations (in mins),ពេលវេលារវាងការប្រតិបត្តិការ (នៅក្នុងនាទី)
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +92,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} ថវិកាសម្រាប់គណនី {1} ប្រឆាំងនឹងមជ្ឈមណ្ឌលតម្លៃ {2} គឺ {3} ។ វានឹងលើសដោយ {4}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +95,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} ថវិកាសម្រាប់គណនី {1} ប្រឆាំងនឹងមជ្ឈមណ្ឌលតម្លៃ {2} គឺ {3} ។ វានឹងលើសដោយ {4}
 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 បានជ្រើសរើសគឺមិនមែនសម្រាប់ធាតុដូចគ្នា
@@ -469,16 +476,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +238,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 +86,Administrative Officer,មន្រ្តីរដ្ឋបាល
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,មន្រ្តីរដ្ឋបាល
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +23,Acutal Qty {0} / Waiting Qty {1},ស្រួចស្រាវ Qty {0} / រង់ចាំ Qty {1}
 DocType: Timesheet Detail,Hrs,ម៉ោង
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +319,Please select Company,សូមជ្រើសរើសក្រុមហ៊ុន
-DocType: Stock Entry,Difference Account,គណនីមានភាពខុសគ្នា
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +309,Please select Company,សូមជ្រើសរើសក្រុមហ៊ុន
+DocType: Stock Entry Detail,Difference Account,គណនីមានភាពខុសគ្នា
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,មិនអាចភារកិច្ចជិតស្និទ្ធដូចជាការពឹងផ្អែករបស់ខ្លួនមានភារកិច្ច {0} គឺមិនត្រូវបានបិទ។
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Please enter Warehouse for which Material Request will be raised,សូមបញ្ចូលឃ្លាំងដែលសម្ភារៈស្នើសុំនឹងត្រូវបានលើកឡើង
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +399,Please enter Warehouse for which Material Request will be raised,សូមបញ្ចូលឃ្លាំងដែលសម្ភារៈស្នើសុំនឹងត្រូវបានលើកឡើង
 DocType: Production Order,Additional Operating Cost,ចំណាយប្រតិបត្តិការបន្ថែម
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,គ្រឿងសំអាង
-apps/erpnext/erpnext/stock/doctype/item/item.py +530,"To merge, following properties must be same for both items",រួមបញ្ចូលគ្នានោះមានលក្ខណៈសម្បត្តិដូចខាងក្រោមនេះត្រូវដូចគ្នាសម្រាប់ធាតុទាំងពីរ
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,"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 +28,Buy,ទិញ
@@ -486,7 +493,7 @@
 DocType: Sales Invoice,Offline POS Name,ឈ្មោះម៉ាស៊ីនឆូតកាតក្រៅបណ្តាញ
 DocType: Sales Order,To Deliver,ដើម្បីរំដោះ
 DocType: Purchase Invoice Item,Item,ធាតុ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1563,Serial no item cannot be a fraction,សៀរៀលធាតុគ្មានមិនអាចត្រូវប្រភាគ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1587,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,ការគ្រប់គ្រងអ្នកម៉ៅការបន្ត
@@ -495,13 +502,14 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Account {0} does not belong to company: {1},គណនី {0} មិនមែនជាកម្មសិទ្ធិរបស់ក្រុមហ៊ុន: {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation already used for another company,អក្សរសង្ខេបដែលបានប្រើរួចហើយសម្រាប់ក្រុមហ៊ុនផ្សេងទៀត
 DocType: Selling Settings,Default Customer Group,លំនាំដើមគ្រុបអតិថិជន
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Supplier is required against Payable account {0},ក្រុមហ៊ុនផ្គត់ផ្គង់គឺត្រូវបានទាមទារប្រឆាំងនឹងគណនីទូទាត់ {0}
 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
 DocType: Production Planning Tool,Material Requirement,សម្ភារៈតម្រូវ
 DocType: Company,Delete Company Transactions,លុបប្រតិបត្តិការក្រុមហ៊ុន
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +313,Reference No and Reference Date is mandatory for Bank transaction,សេចក្តីយោងកាលបរិច្ឆេទទេនិងយោងចាំបាច់សម្រាប់ប្រតិបត្តិការគឺធនាគារ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +316,Reference No and Reference Date is mandatory for Bank transaction,សេចក្តីយោងកាលបរិច្ឆេទទេនិងយោងចាំបាច់សម្រាប់ប្រតិបត្តិការគឺធនាគារ
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,បន្ថែម / កែសម្រួលពន្ធនិងការចោទប្រកាន់
 DocType: Purchase Invoice,Supplier Invoice No,វិក័យប័ត្រគ្មានការផ្គត់ផ្គង់
 DocType: Territory,For reference,សម្រាប់ជាឯកសារយោង
@@ -512,7 +520,6 @@
 DocType: Installation Note Item,Installation Note Item,ធាតុចំណាំការដំឡើង
 DocType: Production Plan Item,Pending Qty,ដំណើ Qty
 DocType: Budget,Ignore,មិនអើពើ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,កូដធាតុ&gt; ធាតុគ្រុប&gt; ម៉ាក
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,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 ប្រាក់បៀវត្សរ៍ប័ណ្ណ
@@ -523,11 +530,11 @@
 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/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,បានរកឃើញនៅក្នុងតារាងវិក័យប័ត្រកំណត់ត្រាគ្មាន
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +28,Please select Company and Party Type first,សូមជ្រើសប្រភេទក្រុមហ៊ុននិងបក្សទីមួយ
+apps/erpnext/erpnext/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/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 +707,Make Sales Order,ធ្វើឱ្យការលក់សណ្តាប់ធ្នាប់
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +701,Make Sales Order,ធ្វើឱ្យការលក់សណ្តាប់ធ្នាប់
 DocType: Project Task,Project Task,គម្រោងការងារ
 ,Lead Id,ការនាំមុខលេខសម្គាល់
 DocType: C-Form Invoice Detail,Grand Total,សម្ពោធសរុប
@@ -543,7 +550,8 @@
 DocType: Job Applicant,Resume Attachment,ឯកសារភ្ជាប់ប្រវត្តិរូប
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,អតិថិជនម្តងទៀត
 DocType: Leave Control Panel,Allocate,ការបម្រុងទុក
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +734,Sales Return,ត្រឡប់មកវិញការលក់
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +728,Sales Return,ត្រឡប់មកវិញការលក់
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +91,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),ថ្លែងដោយហាងទំនិញ (ទម្លាក់នាវា)
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,មូលដ្ឋានទិន្នន័យរបស់អតិថិជនសក្តានុពល។
@@ -552,14 +560,13 @@
 DocType: Quotation,Quotation To,សម្រង់ដើម្បី
 DocType: Lead,Middle Income,ប្រាក់ចំណូលពាក់កណ្តាល
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +212,Opening (Cr),ពិធីបើក (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +795,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,ឯកតាលំនាំដើមសម្រាប់ធាតុវិធានការ {0} មិនអាចត្រូវបានផ្លាស់ប្តូរដោយផ្ទាល់ដោយសារតែអ្នកបានធ្វើប្រតិបត្តិការមួយចំនួន (s) ដែលមាន UOM មួយទៀតរួចទៅហើយ។ អ្នកនឹងត្រូវការដើម្បីបង្កើតធាតុថ្មីមួយក្នុងការប្រើ UOM លំនាំដើមផ្សេងគ្នា។
-apps/erpnext/erpnext/accounts/utils.py +237,Allocated amount can not be negative,ចំនួនទឹកប្រាក់ដែលបានបម្រុងទុកសម្រាប់មិនអាចជាអវិជ្ជមាន
+apps/erpnext/erpnext/stock/doctype/item/item.py +797,Default Unit of Measure for Item {0} cannot be changed directly because 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,ចំនួនទឹកប្រាក់ដែលបានបម្រុងទុកសម្រាប់មិនអាចជាអវិជ្ជមាន
 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,ការលក់វិក័យប័ត្រ Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},សេចក្តីយោង &amp; ទេយោងកាលបរិច្ឆេទត្រូវបានទាមទារសម្រាប់ {0}
-DocType: Sales Invoice,Customer's Vendor,អតិថិជនរបស់អ្នកលក់
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Proposal Writing,ការសរសេរសំណើរ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,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",ប្រសិនបើបានធីកវត្ថុធាតុដើមសម្រាប់ធាតុដែលបានចុះកិច្ចសន្យាជាមួយនឹងត្រូវបញ្ចូលក្នុងសំណើធនធានទិន្នន័យ
@@ -568,13 +575,14 @@
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,តាមដានពេលវេលា
 DocType: Fiscal Year Company,Fiscal Year Company,ក្រុមហ៊ុនឆ្នាំសារពើពន្ធ
 DocType: Packing Slip Item,DN Detail,ពត៌មានលំអិត DN
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +257,Already supplier quotation has created,រួចហើយបានបង្កើតការដកស្រង់ក្រុមហ៊ុនផ្គត់ផ្គង់
 DocType: Timesheet,Billed,ផ្សព្វផ្សាយ
 DocType: Batch,Batch Description,បាច់ការពិពណ៌នាសង្ខេប
+apps/erpnext/erpnext/accounts/utils.py +685,"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 +733,View Offline Records,មើលកំណត់ត្រាក្រៅបណ្តាញ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +715,View Offline Records,មើលកំណត់ត្រាក្រៅបណ្តាញ
+DocType: Student,Sibling Details,សេចក្ដីលម្អិតបងប្អូនបង្កើត
 DocType: Employee,Reason for Resignation,ហេតុផលសម្រាប់ការលាលែងពីតំណែង
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,ការវាយតម្លៃការងារសម្រាប់ពុម្ព។
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,វិក័យប័ត្រ / ធាតុទិនានុប្បវត្តិពត៌មានលំអិត
@@ -588,7 +596,7 @@
 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,ការផ្លាស់ប្តូរសុទ្ធនៅសារពើភ័ណ្ឌ
 DocType: Employee,Passport Number,លេខលិខិតឆ្លងដែន
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Manager,កម្មវិធីគ្រប់គ្រង
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,កម្មវិធីគ្រប់គ្រង
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,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; មិនអាចជាដូចគ្នា
@@ -597,10 +605,11 @@
 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 +299,Timesheet created:,Timesheet បង្កើត:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +715,Please set default Cash or Bank account in Mode of Payment {0},សូមកំណត់លំនាំដើមឬគណនីសាច់ប្រាក់របស់ធនាគារក្នុងរបៀបនៃការទូទាត់ {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +300,Timesheet created:,Timesheet បង្កើត:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +772,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,ចុះឈ្មោះ
 DocType: Selling Settings,Customer Naming By,ឈ្មោះអតិថិជនដោយ
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,សូមរៀបចំបុគ្គលិកដាក់ឈ្មោះប្រព័ន្ធជាធនធានមនុ&gt; ការកំណត់ធនធានមនុស្ស
 DocType: Depreciation Schedule,Depreciation Amount,ចំនួនទឹកប្រាក់រំលស់
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,បម្លែងទៅជាក្រុម
 DocType: Activity Cost,Activity Type,ប្រភេទសកម្មភាព
@@ -625,6 +634,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,បញ្ចប់
 DocType: Pricing Rule,Sales Manager,ប្រធានផ្នែកលក់
 DocType: Salary Structure Employee,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,គណនីកើនឡើង / ខាតបោះចោលទ្រព្យសកម្ម
@@ -639,11 +649,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +9,Pre Sales,ការលក់ជាមុន
 DocType: Purchase Receipt,Other Details,ពត៌មានលំអិតផ្សេងទៀត
 DocType: Account,Accounts,គណនី
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Marketing,ទីផ្សារ
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +227,Payment Entry is already created,ចូលក្នុងការទូទាត់ត្រូវបានបង្កើតឡើងរួចទៅហើយ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,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 +538,Row #{0}: Asset {1} does not linked to Item {2},ជួរដេក # {0}: ទ្រព្យសកម្ម {1} មិនបានភ្ជាប់ទៅនឹងធាតុ {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +21,Preview Salary Slip,គ្រូពេទ្យប្រហែលជាប្រាក់ខែការមើលជាមុន
+apps/erpnext/erpnext/controllers/accounts_controller.py +541,Row #{0}: Asset {1} does not linked to Item {2},ជួរដេក # {0}: ទ្រព្យសកម្ម {1} មិនបានភ្ជាប់ទៅនឹងធាតុ {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +38,Preview Salary Slip,គ្រូពេទ្យប្រហែលជាប្រាក់ខែការមើលជាមុន
 DocType: Company,Deafult Cost Center,មជ្ឈមណ្ឌលតម្លៃ Deafult
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +48,Account {0} has been entered multiple times,គណនី {0} ត្រូវបានបញ្ចូលច្រើនដង
 DocType: Account,Expenses Included In Valuation,ការចំណាយដែលបានរួមបញ្ចូលនៅក្នុងការវាយតម្លៃ
@@ -652,7 +662,7 @@
 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 +617,Item has variants.,ធាតុមានវ៉ារ្យ៉ង់។
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,ធាតុមានវ៉ារ្យ៉ង់។
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,ធាតុ {0} មិនបានរកឃើញ
 DocType: Bin,Stock Value,ភាគហ៊ុនតម្លៃ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +25,Company {0} does not exist,ក្រុមហ៊ុន {0} មិនមានទេ
@@ -672,7 +682,7 @@
 DocType: Purchase Order,Supply Raw Materials,ផ្គត់ផ្គង់សំភារៈឆៅ
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,កាលបរិច្ឆេទដែលវិក័យប័ត្រក្រោយនឹងត្រូវបានបង្កើត។ វាត្រូវបានគេបង្កើតនៅលើការដាក់ស្នើ។
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,ទ្រព្យនាពេលបច្ចុប្បន្ន
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,{0} is not a stock Item,{0} គឺមិនមានធាតុភាគហ៊ុន
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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 +169,Lead must be set if Opportunity is made from Lead,ការនាំមុខត្រូវតែត្រូវបានកំណត់ប្រសិនបើមានឱកាសត្រូវបានធ្វើពីអ្នកដឹកនាំ
@@ -739,26 +749,25 @@
 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 +709,No Permission,គ្មានសិទ្ធិ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +710,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,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 +542,Row #{0}: Asset {1} must be submitted,ជួរដេក # {0}: ទ្រព្យសកម្ម {1} ត្រូវតែត្រូវបានដាក់ជូន
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,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 ។
 DocType: Warehouse,Tree Details,ដើមឈើលំអិត
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,ផ្ញើឥឡូវ
 ,Support Analytics,ការគាំទ្រវិភាគ
 DocType: Item,Website Warehouse,វេបសាយឃ្លាំង
 DocType: Payment Reconciliation,Minimum Invoice Amount,ចំនួនវិក័យប័ត្រអប្បបរមា
 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/sales_invoice/sales_invoice.py +227,Timesheet {0} is already completed or cancelled,Timesheet {0} ត្រូវបានបញ្ចប់រួចទៅហើយឬលុបចោល
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +259,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
@@ -774,13 +783,13 @@
 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 +229,Target Warehouse,គោលដៅឃ្លាំង
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +230,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-,STE-
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Sales Order Date,គេរំពឹងថាការដឹកជញ្ជូនមិនអាចកាលបរិច្ឆេទត្រូវតែមុនពេលការលក់លំដាប់កាលបរិច្ឆេទ
 DocType: Upload Attendance,Import Attendance,នាំចូលវត្តមាន
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,ក្រុមធាតុទាំងអស់
+apps/erpnext/erpnext/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/config/setup.py +89,Automatically compose message on submission of transactions.,តែងសារស្វ័យប្រវត្តិនៅលើការដាក់ប្រតិបត្តិការ។
@@ -792,13 +801,15 @@
 DocType: Sales Invoice,Payment Due Date,ការទូទាត់កាលបរិច្ឆេទ
 apps/erpnext/erpnext/stock/doctype/item/item.js +278,Item Variant {0} already exists with same attributes,ធាតុវ៉ារ្យង់ {0} រួចហើយដែលមានគុណលក្ខណៈដូចគ្នា
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&quot;ការបើក&quot;
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,ការបើកចំហរដើម្បីធ្វើ
 DocType: Notification Control,Delivery Note Message,សារដឹកជញ្ជូនចំណាំ
 DocType: Expense Claim,Expenses,ការចំណាយ
 DocType: Item Variant Attribute,Item Variant Attribute,ធាតុគុណលក្ខណៈវ៉ារ្យង់
 ,Purchase Receipt Trends,និន្នាការបង្កាន់ដៃទិញ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Research & Development,ស្រាវជ្រាវនិងអភិវឌ្ឍន៍
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,ស្រាវជ្រាវនិងអភិវឌ្ឍន៍
 ,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,ថ្លៃឬការបញ្ចុះតម្លៃ
@@ -807,7 +818,7 @@
 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/controllers/accounts_controller.py +340,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","ចូលការទូទាត់ {0} ត្រូវបានផ្សារភ្ជាប់នឹងដីកាសម្រេច {1}, ពិនិត្យមើលថាតើវាគួរតែត្រូវបានដកមុននៅក្នុងវិក័យប័ត្រដែលជានេះ។"
+apps/erpnext/erpnext/controllers/accounts_controller.py +343,"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,ចំណុចនៃការលក់
@@ -829,12 +840,12 @@
 DocType: Supplier Quotation,Is Subcontracted,ត្រូវបានម៉ៅការបន្ត
 DocType: Item Attribute,Item Attribute Values,តម្លៃគុណលក្ខណៈធាតុ
 DocType: Examination Result,Examination Result,លទ្ធផលការពិនិត្យសុខភាព
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +756,Purchase Receipt,បង្កាន់ដៃទិញ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +735,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 +167,Reference Doctype must be one of {0},សេចក្តីយោង DOCTYPE ត្រូវតែជាផ្នែកមួយនៃ {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +282,Unable to find Time Slot in the next {0} days for Operation {1},មិនអាចរកឃើញរន្ធពេលវេលាក្នុងការ {0} ថ្ងៃទៀតសម្រាប់ប្រតិបត្ដិការ {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +170,Reference Doctype must be one of {0},សេចក្តីយោង DOCTYPE ត្រូវតែជាផ្នែកមួយនៃ {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Unable to find Time Slot in the next {0} days for Operation {1},មិនអាចរកឃើញរន្ធពេលវេលាក្នុងការ {0} ថ្ងៃទៀតសម្រាប់ប្រតិបត្ដិការ {1}
 DocType: Production Order,Plan material for sub-assemblies,សម្ភារៈផែនការសម្រាប់ការអនុសភា
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,ដៃគូការលក់និងទឹកដី
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be active,Bom {0} ត្រូវតែសកម្ម
@@ -845,7 +856,7 @@
 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 +214,Warehouses with existing transaction can not be converted to ledger.,ប្រតិបត្តិការដែលមានស្រាប់ឃ្លាំងដោយមានមិនអាចត្រូវបានបម្លែងទៅជាសៀវភៅ។
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +217,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,ការបញ្ជាទិញ
@@ -859,9 +870,9 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,បុគ្គលិក {0} គឺមិនសកម្មឬមិនមានទេ
 DocType: Fee Structure,Components,សមាសភាគ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,Please enter Asset Category in Item {0},សូមបញ្ចូលប្រភេទទ្រព្យសម្បត្តិនៅក្នុងធាតុ {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +612,Item Variants {0} updated,ធាតុវ៉ារ្យ៉ង់ {0} ធ្វើឱ្យទាន់សម័យ
+apps/erpnext/erpnext/stock/doctype/item/item.py +614,Item Variants {0} updated,ធាតុវ៉ារ្យ៉ង់ {0} ធ្វើឱ្យទាន់សម័យ
 DocType: Quality Inspection Reading,Reading 6,ការអាន 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +843,Cannot {0} {1} {2} without any negative outstanding invoice,មិនអាច {0} {1} {2} ដោយគ្មានវិក័យប័ត្រឆ្នើមអវិជ្ជមាន
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +854,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,ធ្វើសមកាលកម្មឥឡូវ
@@ -876,69 +887,72 @@
 DocType: Item,Is Purchase Item,តើមានធាតុទិញ
 DocType: Asset,Purchase Invoice,ការទិញវិក័យប័ត្រ
 DocType: Stock Ledger Entry,Voucher Detail No,ពត៌មានលំអិតកាតមានទឹកប្រាក់គ្មាន
-apps/erpnext/erpnext/accounts/page/pos/pos.js +728,New Sales Invoice,វិក័យប័ត្រលក់ថ្មី
+apps/erpnext/erpnext/accounts/page/pos/pos.js +710,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 +728,Sync Offline Invoices,ធ្វើសមកាលកម្មវិកិយប័ត្រក្រៅបណ្តាញ
 DocType: Payment Request,Paid,Paid
 DocType: Program Fee,Program Fee,ថ្លៃសេវាកម្មវិធី
 DocType: Salary Slip,Total in words,សរុបនៅក្នុងពាក្យ
 DocType: Material Request Item,Lead Time Date,កាលបរិច្ឆេទពេលវេលានាំមុខ
 DocType: Guardian,Guardian Name,ឈ្មោះ Guardian បាន
 DocType: Cheque Print Template,Has Print Format,មានទ្រង់ទ្រាយបោះពុម្ព
-apps/erpnext/erpnext/accounts/page/pos/pos.js +86, is mandatory. Maybe Currency Exchange record is not created for ,គឺជាចាំបាច់។ ប្រហែលជាកំណត់ត្រាប្តូររូបិយប័ណ្ណដែលមិនត្រូវបានបង្កើតឡើងសម្រាប់
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +109,Row #{0}: Please specify Serial No for Item {1},ជួរដេក # {0}: សូមបញ្ជាក់សម្រាប់ធាតុសៀរៀលគ្មាន {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +619,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","សម្រាប់ធាតុ &quot;ផលិតផលកញ្ចប់, ឃ្លាំង, សៀរៀល, គ្មានទេនិងបាច់ &amp; ‧នឹងត្រូវបានចាត់ទុកថាពី&quot; ការវេចខ្ចប់បញ្ជី &quot;តារាង។ បើសិនជាគ្មានឃ្លាំងនិងជំនាន់ដូចគ្នាសម្រាប់ធាតុដែលមានទាំងអស់សម្រាប់វេចខ្ចប់ធាតុណាមួយ &quot;ផលិតផលជាកញ្ចប់&quot; តម្លៃទាំងនោះអាចត្រូវបានបញ្ចូលនៅក្នុងតារាងធាតុដ៏សំខាន់, តម្លៃនឹងត្រូវបានចម្លងទៅ &#39;វេចខ្ចប់បញ្ជី &quot;តារាង។"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +75, 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 +613,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing 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 +606,Supplier Invoice Date cannot be greater than Posting Date,វិក័យប័ត្រក្រុមហ៊ុនផ្គត់ផ្គង់កាលបរិច្ឆេទមិនអាចច្រើនជាងកាលបរិច្ឆេទប្រកាស
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +609,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: Cheque Print Template,Date Settings,ការកំណត់កាលបរិច្ឆេទ
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,អថេរ
 ,Company Name,ឈ្មោះក្រុមហ៊ុន
 DocType: SMS Center,Total Message(s),សារសរុប (s បាន)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +810,Select Item for Transfer,ជ្រើសធាតុសម្រាប់ការផ្ទេរ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +789,Select Item for Transfer,ជ្រើសធាតុសម្រាប់ការផ្ទេរ
 DocType: Purchase Invoice,Additional Discount Percentage,ការបញ្ចុះតម្លៃបន្ថែមទៀតភាគរយ
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,មើលបញ្ជីនៃការជួយវីដេអូទាំងអស់
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,ជ្រើសប្រធានគណនីរបស់ធនាគារនេះដែលជាកន្លែងដែលការត្រួតពិនិត្យត្រូវបានតម្កល់ទុក។
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,អនុញ្ញាតឱ្យអ្នកប្រើដើម្បីកែសម្រួលអត្រាតំលៃបញ្ជីនៅក្នុងប្រតិបត្តិការ
 DocType: Pricing Rule,Max Qty,អតិបរមា Qty
-DocType: Student Applicant,Father's Name,ឈ្មោះឪពុក
 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 +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,ជួរដេក {0}: ការទូទាត់ប្រឆាំងនឹងការលក់ / ការបញ្ជាទិញគួរតែងតែត្រូវបានសម្គាល់ជាមុន
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,គីមី
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +686,All items have already been transferred for this Production Order.,ធាតុទាំងអស់ត្រូវបានបញ្ជូនរួចហើយសម្រាប់ការបញ្ជាទិញផលិតផលនេះ។
+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} និងព្យាយាមម្ដងទៀត
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +694,All items have already been transferred for this Production Order.,ធាតុទាំងអស់ត្រូវបានបញ្ជូនរួចហើយសម្រាប់ការបញ្ជាទិញផលិតផលនេះ។
 DocType: Process Payroll,Select Payroll Year and Month,ជ្រើសបើកប្រាក់បៀវត្សឆ្នាំនិងខែ
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,Meter,ម៉ែត្រ
 DocType: Workstation,Electricity Cost,តម្លៃអគ្គិសនី
 DocType: HR Settings,Don't send Employee Birthday Reminders,កុំផ្ញើបុគ្គលិករំលឹកខួបកំណើត
-DocType: Opportunity,Walk In,ដើរក្នុង
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,ធាតុភាគហ៊ុន
 DocType: Item,Inspection Criteria,លក្ខណៈវិនិច្ឆ័យអធិការកិច្ច
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,ផ្ទេរប្រាក់
 apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,ផ្ទុកឡើងក្បាលលិខិតនិងស្លាកសញ្ញារបស់អ្នក។ (អ្នកអាចកែសម្រួលពួកវានៅពេលក្រោយ) ។
 DocType: Timesheet Detail,Bill,វិក័យប័ត្រ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,White,សេត
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date is entered as past date,រំលស់ត្រូវបានបញ្ចូលកាលបរិច្ឆេទបន្ទាប់កាលបរិច្ឆេទកន្លងមកដែលជា
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +167,White,សេត
 DocType: SMS Center,All Lead (Open),អ្នកដឹកនាំការទាំងអស់ (ការបើកចំហ)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +228,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),ជួរដេក {0}: Qty មិនមានសម្រាប់ {4} នៅក្នុងឃ្លាំង {1} នៅក្នុងប្រកាសពេលនៃធាតុ ({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}),ជួរដេក {0}: Qty មិនមានសម្រាប់ {4} នៅក្នុងឃ្លាំង {1} នៅក្នុងប្រកាសពេលនៃធាតុ ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,ទទួលបានការវិវត្តបង់ប្រាក់
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +731,Make ,ធ្វើឱ្យ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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 +154,Order Type must be one of {0},ប្រភេទការបញ្ជាទិញត្រូវតែជាផ្នែកមួយនៃ {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},ប្រភេទការបញ្ជាទិញត្រូវតែជាផ្នែកមួយនៃ {0}
 DocType: Lead,Next Contact Date,ទំនាក់ទំនងបន្ទាប់កាលបរិច្ឆេទ
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,បើក Qty
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +393,Please enter Account for Change Amount,សូមបញ្ចូលគណនីសម្រាប់ការផ្លាស់ប្តូរចំនួនទឹកប្រាក់
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,Please enter Account for Change Amount,សូមបញ្ចូលគណនីសម្រាប់ការផ្លាស់ប្តូរចំនួនទឹកប្រាក់
 DocType: Student Batch,Student Batch Name,ឈ្មោះបាច់សិស្ស
 DocType: Holiday List,Holiday List Name,បញ្ជីថ្ងៃឈប់សម្រាកឈ្មោះ
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js +8,Schedule Course,វគ្គកាលវិភាគ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Stock Options,ជម្រើសភាគហ៊ុន
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,ជម្រើសភាគហ៊ុន
 DocType: Journal Entry Account,Expense Claim,ពាក្យបណ្តឹងលើការចំណាយ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +211,Do you really want to restore this scrapped asset?,តើអ្នកពិតជាចង់ស្តារទ្រព្យសកម្មបោះបង់ចោលនេះ?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +237,Qty for {0},qty សម្រាប់ {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +212,Do you really want to restore this scrapped asset?,តើអ្នកពិតជាចង់ស្តារទ្រព្យសកម្មបោះបង់ចោលនេះ?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,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,ទុកឱ្យប្លុកថ្ងៃបញ្ជី
@@ -947,9 +961,9 @@
 DocType: Company,Default Terms,លក្ខខណ្ឌលំនាំដើម
 DocType: Packing Slip Item,Packing Slip Item,វេចខ្ចប់ធាតុគ្រូពេទ្យប្រហែលជា
 DocType: Purchase Invoice,Cash/Bank Account,សាច់ប្រាក់ / គណនីធនាគារ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,ធាតុបានយកចេញដោយការផ្លាស់ប្តូរក្នុងបរិមាណឬតម្លៃទេ។
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,ធាតុបានយកចេញដោយការផ្លាស់ប្តូរក្នុងបរិមាណឬតម្លៃទេ។
 DocType: Delivery Note,Delivery To,ដឹកជញ្ជូនដើម្បី
-apps/erpnext/erpnext/stock/doctype/item/item.py +635,Attribute table is mandatory,តារាងគុណលក្ខណៈគឺជាការចាំបាច់
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,តារាងគុណលក្ខណៈគឺជាការចាំបាច់
 DocType: Production Planning Tool,Get Sales Orders,ទទួលបានការបញ្ជាទិញលក់
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} មិនអាចជាអវិជ្ជមាន
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,សូមជ្រើសរើសសិស្ស
@@ -974,7 +988,7 @@
 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,ឃ្លាំង WIP
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},សៀរៀលគ្មាន {0} គឺស្ថិតនៅក្រោមកិច្ចសន្យាថែរក្សារីករាយជាមួយនឹង {1}
+apps/erpnext/erpnext/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,ឈ្មោះអង្គភាព
@@ -986,7 +1000,7 @@
 DocType: GL Entry,Against,ប្រឆាំងនឹងការ
 DocType: Item,Default Selling Cost Center,ចំណាយលើការលក់លំនាំដើមរបស់មជ្ឈមណ្ឌល
 DocType: Sales Partner,Implementation Partner,ដៃគូអនុវត្ដន៍
-apps/erpnext/erpnext/controllers/selling_controller.py +231,Sales Order {0} is {1},លំដាប់ការលក់ {0} គឺ {1}
+apps/erpnext/erpnext/controllers/selling_controller.py +232,Sales Order {0} is {1},លំដាប់ការលក់ {0} គឺ {1}
 DocType: Opportunity,Contact Info,ពត៌មានទំនាក់ទំនង
 apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,ការធ្វើឱ្យធាតុហ៊ុន
 DocType: Packing Slip,Net Weight UOM,សុទ្ធទម្ងន់ UOM
@@ -996,25 +1010,24 @@
 DocType: Holiday List,Get Weekly Off Dates,ដើម្បីទទួលបានកាលបរិច្ឆេទការបិទប្រចាំសប្តាហ៍
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,កាលបរិច្ឆេទបញ្ចប់មិនអាចតិចជាងការចាប់ផ្តើមកាលបរិច្ឆេទ
 DocType: Sales Person,Select company name first.,ជ្រើសឈ្មោះក្រុមហ៊ុនជាលើកដំបូង។
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Dr,លោកបណ្ឌិត
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Dr,លោកបណ្ឌិត
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,សម្រង់ពាក្យដែលទទួលបានពីការផ្គត់ផ្គង់។
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},ដើម្បី {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,អាយុជាមធ្យម
 DocType: 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/templates/pages/home.html +32,View All Products,មើលផលិតផលទាំងអស់
+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 +400,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,ព្រមាន: ប្រព័ន្ធនឹងមិនពិនិត្យមើល overbilling ចាប់តាំងពីចំនួនទឹកប្រាក់សម្រាប់ធាតុ {0} {1} ក្នុងសូន្យ
+apps/erpnext/erpnext/controllers/accounts_controller.py +403,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/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,និងឆ្នាំ:
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +191,{0} {1} must be submitted,{0} {1} ត្រូវតែត្រូវបានដាក់ជូន
-DocType: Email Digest,Annual Expense,ចំណាយប្រចាំឆ្នាំ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,{0} {1} must be submitted,{0} {1} ត្រូវតែត្រូវបានដាក់ជូន
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +145,Quantity must be less than or equal to {0},បរិមាណដែលត្រូវទទួលទានត្រូវតែតិចជាងឬស្មើទៅនឹង {0}
 DocType: SMS Center,Total Characters,តួអក្សរសរុប
 apps/erpnext/erpnext/controllers/buying_controller.py +156,Please select BOM in BOM field for Item {0},សូមជ្រើស Bom នៅក្នុងវាល Bom សម្រាប់ធាតុ {0}
@@ -1025,30 +1038,31 @@
 DocType: Sales Partner,Distributor,ចែកចាយ
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,ការដើរទិញឥវ៉ាន់វិធានការដឹកជញ្ជូនក្នុងកន្រ្តក
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +211,Production Order {0} must be cancelled before cancelling this Sales Order,ផលិតកម្មលំដាប់ {0} ត្រូវតែបានលុបចោលមុនពេលលុបចោលការបញ្ជាលក់នេះ
-apps/erpnext/erpnext/public/js/controllers/transaction.js +62,Please set 'Apply Additional Discount On',សូមកំណត់ &#39;អនុវត្តការបញ្ចុះតម្លៃបន្ថែមទៀតនៅលើ &quot;
+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,ពីជួរមានដើម្បីឱ្យមានតិចជាងដើម្បីជួរ
 DocType: Global Defaults,Global Defaults,លំនាំដើមជាសកល
 apps/erpnext/erpnext/projects/doctype/project/project.py +153,Project Collaboration Invitation,ការអញ្ជើញសហការគម្រោង
 DocType: Salary Slip,Deductions,ការកាត់
+DocType: Leave Allocation,LAL/,លោក Lal /
 apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,ការចាប់ផ្តើមឆ្នាំ
 DocType: Purchase Invoice,Start date of current invoice's period,ការចាប់ផ្តើមកាលបរិច្ឆេទនៃការរយៈពេលបច្ចុប្បន្នរបស់វិក័យប័ត្រ
 DocType: Salary Slip,Leave Without Pay,ទុកឱ្យដោយគ្មានការបង់
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +327,Capacity Planning Error,កំហុសក្នុងការធ្វើផែនការការកសាងសមត្ថភាព
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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 +362,Finished Item {0} must be entered for Manufacture type entry,ធាតុបានបញ្ចប់ {0} អាចត្រូវបានបញ្ចូលសម្រាប់ធាតុប្រភេទការផលិត
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +367,Finished Item {0} must be entered for Manufacture type entry,ធាតុបានបញ្ចប់ {0} អាចត្រូវបានបញ្ចូលសម្រាប់ធាតុប្រភេទការផលិត
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,បើកសមតុល្យគណនី
 DocType: Sales Invoice Advance,Sales Invoice Advance,ការលក់វិក័យប័ត្រជាមុន
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +499,Nothing to request,គ្មានអ្វីដែលត្រូវស្នើសុំ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +500,Nothing to request,គ្មានអ្វីដែលត្រូវស្នើសុំ
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',&quot;ជាក់ស្តែងកាលបរិច្ឆេទចាប់ផ្តើម&quot; មិនអាចជាធំជាងជាក់ស្តែងកាលបរិច្ឆេទបញ្ចប់ &quot;
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Management,ការគ្រប់គ្រង
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},ទាំងចំនួនឥណពន្ធឬឥណទានគឺត្រូវបានទាមទារសម្រាប់ {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,ការគ្រប់គ្រង
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +55,Either debit or credit amount is required for {0},ទាំងចំនួនឥណពន្ធឬឥណទានគឺត្រូវបានទាមទារសម្រាប់ {0}
 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 +161,Blue,ពណ៌ខៀវ
+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,សូមកំណត់លេខសម្គាល់អ៊ីម៉ែល
@@ -1058,12 +1072,12 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +23,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,លំនាំដើមធាតុគ្រុប
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1374,Do you really want to submit the invoice?,តើអ្នកពិតជាចង់ដាក់វិក័យប័ត្រនេះ?
+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 +685,Cost Center For Item with Item Code ',មជ្ឈមណ្ឌលចំណាយសម្រាប់ធាតុដែលមានលេខកូដធាតុ &quot;
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1526,"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 +679,Cost Center For Item with Item Code ',មជ្ឈមណ្ឌលចំណាយសម្រាប់ធាតុដែលមានលេខកូដធាតុ &quot;
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1550,"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 +26,"Further accounts can be made under Groups, but entries can be made against non-Groups",គណនីដែលមានបន្ថែមទៀតអាចត្រូវបានធ្វើក្រោមការក្រុមនោះទេតែធាតុដែលអាចត្រូវបានធ្វើប្រឆាំងនឹងការដែលមិនមែនជាក្រុម
 DocType: Lead,Lead,ការនាំមុខ
@@ -1083,104 +1097,106 @@
 DocType: Payment Reconciliation,Unreconciled Payment Details,ពត៌មានលំអិតការទូទាត់ Unreconciled
 DocType: Global Defaults,Current Fiscal Year,ឆ្នាំសារពើពន្ធនាពេលបច្ចុប្បន្ន
 DocType: Global Defaults,Disable Rounded Total,បិទការសរុបមូល
-DocType: Lead,Call,ការហៅ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +417,'Entries' cannot be empty,&quot;ធាតុ&quot; មិនអាចទទេ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +418,'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 +214,Fiscal Year {0} not found,ឆ្នាំសារពើពន្ធ {0} មិនបានរកឃើញ
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +221,Fiscal Year {0} not found,ឆ្នាំសារពើពន្ធ {0} មិនបានរកឃើញ
 apps/erpnext/erpnext/config/hr.py +238,Setting up Employees,ការរៀបចំបុគ្គលិក
 DocType: Sales Order,SO-,SO-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,សូមជ្រើសបុព្វបទជាលើកដំបូង
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Please select prefix first,សូមជ្រើសបុព្វបទជាលើកដំបូង
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Research,ស្រាវជ្រាវ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,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 +43,Item {0} must be a non-stock item,ធាតុ {0} ត្រូវតែជាធាតុដែលមិនមានភាគហ៊ុន
 DocType: Contact,User ID,លេខសម្គាល់អ្នកប្រើ
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +57,View Ledger,មើលសៀវភៅ
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,ដំបូងបំផុត
-apps/erpnext/erpnext/stock/doctype/item/item.py +504,"An Item Group exists with same name, please change the item name or rename the item group",ធាតុមួយពូលមានឈ្មោះដូចគ្នាសូមប្ដូរឈ្មោះធាតុឬប្ដូរឈ្មោះធាតុដែលជាក្រុម
+apps/erpnext/erpnext/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 +437,Rest Of The World,នៅសល់នៃពិភពលោក
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,ធាតុនេះ {0} មិនអាចមានបាច់
 ,Budget Variance Report,របាយការណ៍អថេរថវិការ
 DocType: Salary Slip,Gross Pay,បង់សរុបបាន
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +90,Row {0}: Activity Type is mandatory.,ជួរដេក {0}: ប្រភេទសកម្មភាពគឺជាការចាំបាច់។
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +114,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/public/js/controllers/stock_controller.js +40,Accounting Ledger,គណនេយ្យសៀវភៅធំ
+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,ប្រាក់ចំណូលរក្សាទុក
 DocType: BOM Item,Item Description,ធាតុការពិពណ៌នាសង្ខេប
+DocType: Student Sibling,Student Sibling,បងប្អូនបង្កើតរបស់សិស្ស
 DocType: Purchase Invoice,Is Recurring,តើការកើតឡើង
 DocType: Purchase Invoice,Supplied Items,ធាតុដែលបានផ្គត់ផ្គង់
 DocType: Student,STUD.,Stud ។
 DocType: Production Order,Qty To Manufacture,qty ដើម្បីផលិត
+DocType: Email Digest,New Income,ប្រាក់ចំនូលថ្មី
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,រក្សាអត្រាការប្រាក់ដូចគ្នាពេញមួយវដ្តនៃការទិញ
 DocType: Opportunity Item,Opportunity Item,ធាតុឱកាសការងារ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,ពិធីបើកបណ្តោះអាសន្ន
 ,Employee Leave Balance,បុគ្គលិកចាកចេញតុល្យភាព
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +131,Balance for Account {0} must always be {1},តុល្យភាពសម្រាប់គណនី {0} តែងតែត្រូវតែមាន {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +175,Valuation Rate required for Item in row {0},អត្រាការវាយតម្លៃដែលបានទាមទារសម្រាប់ធាតុនៅក្នុងជួរដេក {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,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,ឧទាហរណ៍: ថ្នាក់អនុបណ្ឌិតវិទ្យាសាស្រ្តកុំព្យូទ័រ
 DocType: Purchase Invoice,Rejected Warehouse,ឃ្លាំងច្រានចោល
 DocType: GL Entry,Against Voucher,ប្រឆាំងនឹងប័ណ្ណ
 DocType: Item,Default Buying Cost Center,មជ្ឈមណ្ឌលការចំណាយទិញលំនាំដើម
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.",ដើម្បីទទួលបានប្រយោជន៍ច្រើនបំផុតក្នុង ERPNext យើងផ្ដល់អនុសាសន៍ថាអ្នកបានយកពេលវេលាមួយចំនួននិងមើលវីដេអូបានជំនួយទាំងនេះ។
-apps/erpnext/erpnext/accounts/page/pos/pos.js +87, to ,ដើម្បី
+apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,ដើម្បី
 DocType: Item,Lead Time in days,អ្នកដឹកនាំការពេលវេលានៅក្នុងថ្ងៃ
 ,Accounts Payable Summary,គណនីចងការប្រាក់សង្ខេប
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Not authorized to edit frozen Account {0},មិនអនុញ្ញាតឱ្យកែគណនីកក {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},មិនអនុញ្ញាតឱ្យកែគណនីកក {0}
 DocType: Journal Entry,Get Outstanding Invoices,ទទួលបានវិកិយប័ត្រឆ្នើម
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +62,Sales Order {0} is not valid,លំដាប់ការលក់ {0} មិនត្រឹមត្រូវ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,លំដាប់ការលក់ {0} មិនត្រឹមត្រូវ
 apps/erpnext/erpnext/setup/doctype/company/company.py +185,"Sorry, companies cannot be merged","សូមអភ័យទោស, ក្រុមហ៊ុនមិនអាចត្រូវបានបញ្ចូលគ្នា"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +139,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",បរិមាណបញ្ហា / សេវាផ្ទេរប្រាក់សរុប {0} នៅក្នុងសំណើសម្ភារៈ {1} \ មិនអាចច្រើនជាងបរិមាណដែលបានស្នើរសុំ {2} សម្រាប់ធាតុ {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Small,ខ្នាតតូច
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,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}
 ,Invoiced Amount (Exculsive Tax),ចំនួន invoiced (ពន្ធលើ Exculsive)
-DocType: Student Applicant,Mother's / Guardian 1 Email ID,/ អាណាព្យាបាលលេខសម្គាល់របស់ម្តាយអ៊ីមែល 1
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,ធាតុ 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,ប្រធានគណនី {0} បង្កើតឡើង
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +160,Green,ពណ៌បៃតង
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,ពណ៌បៃតង
 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 +57,Contract,ការចុះកិច្ចសន្យា
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,ការចុះកិច្ចសន្យា
 DocType: Email Digest,Add Quote,បន្ថែមសម្រង់
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +498,UOM coversion factor required for UOM: {0} in Item: {1},កត្តាគ្របដណ្តប់ UOM បានទាមទារសម្រាប់ការ UOM: {0} នៅក្នុងធាតុ: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +503,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 +80,Row {0}: Qty is mandatory,ជួរដេក {0}: Qty គឺជាការចាំបាច់
+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 +737,Sync Master Data,ធ្វើសមកាលកម្មទិន្នន័យអនុបណ្ឌិត
+apps/erpnext/erpnext/accounts/page/pos/pos.js +719,Sync Master Data,ធ្វើសមកាលកម្មទិន្នន័យអនុបណ្ឌិត
 apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,ផលិតផលឬសេវាកម្មរបស់អ្នក
 DocType: Mode of Payment,Mode of Payment,របៀបនៃការទូទាត់
 apps/erpnext/erpnext/stock/doctype/item/item.py +178,Website Image should be a public file or website URL,វេបសាយរូបភាពគួរតែជាឯកសារសាធារណៈឬគេហទំព័ររបស់ URL
+DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,Bom
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,នេះគឺជាក្រុមមួយដែលធាតុ root និងមិនអាចត្រូវបានកែសម្រួល។
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,នេះគឺជាក្រុមមួយដែលធាតុ root និងមិនអាចត្រូវបានកែសម្រួល។
 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 +345,"{0}: Employee email not found, hence email not sent","{0}: រកមិនឃើញអ៊ីម៉ែលបុគ្គលិក, ហេតុនេះមិនបានចាត់អ៊ីមែល"
+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,គឺជាអាសយដ្ឋានក្រុមហ៊ុនរបស់អ្នក
 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 +118,"For {0}, only credit accounts can be linked against another debit entry",{0} មានតែគណនីឥណទានអាចត្រូវបានតភ្ជាប់ប្រឆាំងនឹងធាតុឥណពន្ធផ្សេងទៀត
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Delivery Note {0} is not submitted,ការដឹកជញ្ជូនចំណាំ {0} គឺមិនត្រូវបានដាក់ស្នើ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Delivery Note {0} is not submitted,ការដឹកជញ្ជូនចំណាំ {0} គឺមិនត្រូវបានដាក់ស្នើ
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Sub-contracted Item,ធាតុ {0} ត្រូវតែជាធាតុអនុចុះកិច្ចសន្យា
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,ឧបករណ៍រាជធានី
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",វិធានកំណត់តម្លៃដំបូងត្រូវបានជ្រើសដោយផ្អែកលើ &#39;អនុវត្តនៅលើ&#39; វាលដែលអាចជាធាតុធាតុក្រុមឬម៉ាក។
 DocType: Hub Settings,Seller Website,វេបសាយអ្នកលក់
 DocType: Item,ITEM-,ITEM-
-apps/erpnext/erpnext/controllers/selling_controller.py +147,Total allocated percentage for sales team should be 100,ចំនួនភាគរយត្រៀមបម្រុងទុកសរុបសម្រាប់លក់ក្រុមគួរមាន 100 នាក់
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +110,Production Order status is {0},ស្ថានភាពលំដាប់ផលិតកម្មគឺ {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,ចំនួនភាគរយត្រៀមបម្រុងទុកសរុបសម្រាប់លក់ក្រុមគួរមាន 100 នាក់
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},ស្ថានភាពលំដាប់ផលិតកម្មគឺ {0}
 DocType: Appraisal Goal,Goal,គ្រាប់បាល់បញ្ចូលទី
 DocType: Sales Invoice Item,Edit Description,កែសម្រួលការបរិយាយ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +757,For Supplier,សម្រាប់ផ្គត់ផ្គង់
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +723,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,បង្កើតការបោះពុម្ពទ្រង់ទ្រាយ
@@ -1196,10 +1212,11 @@
 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,កូដថ្នាក់ទី
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,សង្ខេបអ៊ីម៉ែល:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +445,BOM {0} does not belong to Item {1},Bom {0} មិនមែនជារបស់ធាតុ {1}
 DocType: Sales Partner,Target Distribution,ចែកចាយគោលដៅ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1667,Deafault warehouse is required for selected item,ឃ្លាំង Deafault ត្រូវបានទាមទារសម្រាប់ធាតុដែលបានជ្រើស
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Deafault warehouse is required for selected item,ឃ្លាំង Deafault ត្រូវបានទាមទារសម្រាប់ធាតុដែលបានជ្រើស
 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
@@ -1208,23 +1225,23 @@
 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 +110,Hardware,ផ្នែករឹង
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,ផ្នែករឹង
 DocType: Sales Order,Recurring Upto,រីករាយជាមួយនឹងកើតឡើង
 DocType: Attendance,HR Manager,កម្មវិធីគ្រប់គ្រងធនធានមនុស្ស
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,សូមជ្រើសរើសក្រុមហ៊ុន
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Privilege Leave,ឯកសិទ្ធិចាកចេញ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,ឯកសិទ្ធិចាកចេញ
 DocType: Purchase Invoice,Supplier Invoice Date,កាលបរិច្ឆេទផ្គត់ផ្គង់វិក័យប័ត្រ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,អ្នកត្រូវអនុញ្ញាតកន្រ្តកទំនិញ
 DocType: Payment Entry,Writeoff,សរសេរបិទ
 DocType: Appraisal Template Goal,Appraisal Template Goal,គោលដៅវាយតម្លៃទំព័រគំរូ
-DocType: Salary Slip,Earning,រកប្រាក់ចំណូល
+DocType: Salary Component,Earning,រកប្រាក់ចំណូល
 DocType: Purchase Invoice,Party Account Currency,គណបក្សគណនីរូបិយប័ណ្ណ
 ,BOM Browser,កម្មវិធីរុករក Bom
 DocType: Purchase Taxes and Charges,Add or Deduct,បន្ថែមឬកាត់កង
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,លក្ខខណ្ឌត្រួតស៊ីគ្នាបានរកឃើញរវាង:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +171,Against Journal Entry {0} is already adjusted against some other voucher,ប្រឆាំងនឹង Journal Entry {0} ត្រូវបានលៃតម្រូវរួចទៅហើយប្រឆាំងនឹងកាតមានទឹកប្រាក់មួយចំនួនផ្សេងទៀត
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,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_data.py +358,Food,អាហារ
+apps/erpnext/erpnext/demo/setup/setup_data.py +301,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/course_schedule/course_schedule.js +103,Mark Attendence,លោក Mark ការចូលរួម
@@ -1258,12 +1275,12 @@
 DocType: Sales Order Item,Planned Quantity,បរិមាណដែលបានគ្រោងទុក
 DocType: Purchase Invoice Item,Item Tax Amount,ចំនួនទឹកប្រាក់ពន្ធលើធាតុ
 DocType: Item,Maintain Stock,ការរក្សាហ៊ុន
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +209,Stock Entries already created for Production Order ,ធាតុភាគហ៊ុនដែលបានបង្កើតរួចផលិតកម្មលំដាប់
+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,ការផ្លាស់ប្តូរសុទ្ធនៅលើអចលនទ្រព្យ
 DocType: Leave Control Panel,Leave blank if considered for all designations,ប្រសិនបើអ្នកទុកវាឱ្យទទេសម្រាប់ការរចនាទាំងអស់បានពិចារណាថា
-apps/erpnext/erpnext/controllers/accounts_controller.py +620,Charge of type 'Actual' in row {0} cannot be included in Item Rate,បន្ទុកនៃប្រភេទ &#39;ជាក់ស្តែង &quot;នៅក្នុងជួរដេកដែលបាន {0} មិនអាចត្រូវបានរួមបញ្ចូលនៅក្នុងអត្រាធាតុ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,Max: {0},អតិបរមា: {0}
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +15,From Datetime,ចាប់ពី Datetime
+apps/erpnext/erpnext/controllers/accounts_controller.py +623,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 +239,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 +153,"Request for Quotation is disabled to access from portal, for more check portal settings.",សំណើរសម្រាប់សម្រង់ត្រូវបានបិទដើម្បីចូលដំណើរការបានពីវិបផតថលសម្រាប់ការកំណត់វិបផតថលពិនិត្យបន្ថែមទៀត។
@@ -1271,8 +1288,8 @@
 DocType: Sales Invoice,Shipping Address Name,ការដឹកជញ្ជូនឈ្មោះអាសយដ្ឋាន
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,គំនូសតាងគណនី
 DocType: Material Request,Terms and Conditions Content,លក្ខខណ្ឌមាតិកា
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +552,cannot be greater than 100,មិនអាចជាធំជាង 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +680,Item {0} is not a stock Item,ធាតុ {0} គឺមិនមានធាតុភាគហ៊ុន
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +546,cannot be greater than 100,មិនអាចជាធំជាង 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is not a stock Item,ធាតុ {0} គឺមិនមានធាតុភាគហ៊ុន
 DocType: Maintenance Visit,Unscheduled,គ្មានការគ្រោងទុក
 DocType: Employee,Owned,កម្មសិទ្ធផ្ទាល់ខ្លួន
 DocType: Salary Detail,Depends on Leave Without Pay,អាស្រ័យនៅលើស្លឹកដោយគ្មានប្រាក់ខែ
@@ -1286,10 +1303,9 @@
 DocType: GL Entry,GL Entry,ចូល GL ដើម
 DocType: HR Settings,Employee Settings,ការកំណត់បុគ្គលិក
 ,Batch-Wise Balance History,ប្រាជ្ញាតុល្យភាពបាច់ប្រវត្តិ
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,ដើម្បីធ្វើបញ្ជី
 apps/erpnext/erpnext/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 +61,Apprentice,សិស្ស
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +102,Negative Quantity is not allowed,បរិមាណដែលត្រូវទទួលទានអវិជ្ជមានមិនត្រូវបានអនុញ្ញាត
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,សិស្ស
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +103,Negative Quantity is not allowed,បរិមាណដែលត្រូវទទួលទានអវិជ្ជមានមិនត្រូវបានអនុញ្ញាត
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",តារាងពន្ធលើការដែលបានទៅយកពីព័ត៌មានលម្អិតធាតុដែលម្ចាស់ជាខ្សែអក្សរមួយនិងបានរក្សាទុកនៅក្នុងវាលនេះ។ ត្រូវបានប្រើសម្រាប់ការបង់ពន្ធនិងបន្ទុក
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +152,Employee cannot report to himself.,បុគ្គលិកមិនអាចរាយការណ៍ទៅខ្លួនឯង។
@@ -1310,15 +1326,14 @@
 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 +141,Source warehouse is mandatory for row {0},ឃ្លាំងប្រភពចាំបាច់សម្រាប់ជួរ {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +719,Packing Slip,គ្រូពេទ្យប្រហែលជាវេចខ្ចប់
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Source warehouse is mandatory for row {0},ឃ្លាំងប្រភពចាំបាច់សម្រាប់ជួរ {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +713,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/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,សំណើរសុំឱ្យអាចមានសិទ្ធិចូលដំណើរការដកស្រង់ដោយចុចតំណខាងក្រោម
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,នាំចូលបានបរាជ័យ!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,គ្មានអាសយដ្ឋានបន្ថែមនៅឡើយទេ។
 DocType: Workstation Working Hour,Workstation Working Hour,ស្ថានីយការងារការងារហួរ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Analyst,អ្នកវិភាគ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,អ្នកវិភាគ
 DocType: Item,Inventory,សារពើភ័ណ្ឌ
 DocType: Item,Sales Details,ពត៌មានលំអិតការលក់
 DocType: Quality Inspection,QI-,QI-
@@ -1326,7 +1341,7 @@
 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 +103,Government,រដ្ឋាភិបាល
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,រដ្ឋាភិបាល
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,ឈ្មោះវិទ្យាស្ថាន
 apps/erpnext/erpnext/config/stock.py +289,Item Variants,វ៉ារ្យ៉ង់ធាតុ
 DocType: Company,Services,ការផ្តល់សេវា
@@ -1342,6 +1357,7 @@
 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/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,លំហូរសាច់ប្រាក់ចេញពីការវិនិយោគ
 DocType: Program Course,Program Course,វគ្គសិក្សាកម្មវិធី
@@ -1382,12 +1398,12 @@
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,បញ្ជីអ្នកទទួលគឺទទេ។ សូមបង្កើតបញ្ជីអ្នកទទួល
 DocType: Production Plan Sales Order,Production Plan Sales Order,ផលិតកម្មផែនការលក់សណ្តាប់ធ្នាប់
 DocType: Sales Partner,Sales Partner Target,ដៃគូគោលដៅការលក់
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +110,Accounting Entry for {0} can only be made in currency: {1},ចូលគណនីសម្រាប់ {0} អាចត្រូវបានធ្វើតែនៅក្នុងរូបិយប័ណ្ណ: {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},ចូលគណនីសម្រាប់ {0} អាចត្រូវបានធ្វើតែនៅក្នុងរូបិយប័ណ្ណ: {1}
 DocType: Pricing Rule,Pricing Rule,វិធានការកំណត់តម្លៃ
 DocType: Budget,Action if Annual Budget Exceeded,ប្រសិនបើមានថវិកាប្រចាំឆ្នាំសកម្មភាពលើសពី
 apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,សម្ភារៈសំណើទិញសណ្តាប់ធ្នាប់
 DocType: Shopping Cart Settings,Payment Success URL,ការទូទាត់ URL ដែលទទួលបានភាពជោគជ័យ
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +78,Row # {0}: Returned Item {1} does not exists in {2} {3},ជួរដេក # {0}: ធាតុមាតុភូមិនិវត្តន៍ {1} មិនមាននៅក្នុង {2} {3}
+apps/erpnext/erpnext/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,សេចក្តីថ្លែងការរបស់ធនាគារការផ្សះផ្សា
@@ -1396,40 +1412,39 @@
 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/stock/doctype/stock_entry/stock_entry.py +339,Not allowed to tranfer more {0} than {1} against Purchase Order {2},មិនអនុញ្ញាតឱ្យការផ្តល់ជាច្រើនទៀត {0} {1} ជាជាងការប្រឆាំងនឹងការទិញលំដាប់ {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +344,Not allowed to tranfer more {0} than {1} against Purchase Order {2},មិនអនុញ្ញាតឱ្យការផ្តល់ជាច្រើនទៀត {0} {1} ជាជាងការប្រឆាំងនឹងការទិញលំដាប់ {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},ទុកបម្រុងទុកដោយជោគជ័យសម្រាប់ {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,គ្មានធាតុខ្ចប់
 DocType: Shipping Rule Condition,From Value,ពីតម្លៃ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +545,Manufacturing Quantity is mandatory,បរិមាណដែលត្រូវទទួលទានគឺចាំបាច់កម្មន្តសាល
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,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 +71,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 +162,Row {0}: From Time and To Time of {1} is overlapping with {2},ជួរដេក {0}: ពីពេលវេលានិងពេលវេលានៃ {1} ត្រូវបានត្រួតស៊ីគ្នាជាមួយ {2}
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +186,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,បំណុលភាគហ៊ុន
 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 +130,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 +137,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,របាយការណ៍ផ្សេងទៀត
 DocType: Dependent Task,Dependent Task,ការងារពឹងផ្អែក
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,សូមរៀបចំបុគ្គលិកដាក់ឈ្មោះប្រព័ន្ធជាធនធានមនុ&gt; ការកំណត់ធនធានមនុស្ស
 apps/erpnext/erpnext/stock/doctype/item/item.py +411,Conversion factor for default Unit of Measure must be 1 in row {0},កត្តាប្រែចិត្តជឿសម្រាប់អង្គភាពលំនាំដើមត្រូវតែមានវិធានការក្នុងមួយជួរដេក 1 {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,Leave of type {0} cannot be longer than {1},ការឈប់សម្រាកនៃប្រភេទ {0} មិនអាចមានយូរជាង {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +197,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 +921,Search Item,ស្វែងរកធាតុ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +910,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 +546,Already completed,បានបញ្ចប់រួចទៅហើយ
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +22,Payment Request already exists {0},ស្នើសុំការទូទាត់រួចហើយ {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +550,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 +241,Quantity must not be more than {0},បរិមាណមិនត្រូវការច្រើនជាង {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Quantity must not be more than {0},បរិមាណមិនត្រូវការច្រើនជាង {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +76,Previous Financial Year is not closed,មុនឆ្នាំហិរញ្ញវត្ថុមិនត្រូវបានបិទ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +44,Age (Days),អាយុ (ថ្ងៃ)
 DocType: Quotation Item,Quotation Item,ធាតុសម្រង់
@@ -1446,7 +1461,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +221,Purchase Receipt {0} is not submitted,ការទិញការទទួល {0} គឺមិនត្រូវបានដាក់ស្នើ
 DocType: Company,Default Payable Account,គណនីទូទាត់លំនាំដើម
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.",ការកំណត់សម្រាប់រទេះដើរទិញឥវ៉ាន់អនឡាញដូចជាវិធានការដឹកជញ្ជូនបញ្ជីតម្លៃល
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +83,{0}% Billed,{0}% បានបង់ប្រាក់
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}% បានបង់ប្រាក់
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,រក្សា Qty
 DocType: Party Account,Party Account,គណនីគណបក្ស
 apps/erpnext/erpnext/config/setup.py +116,Human Resources,ធនធានមនុស្ស
@@ -1458,12 +1473,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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 +22,Collect,ប្រមូល
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,ប្រមូល
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,Against Supplier Invoice {0} dated {1},ប្រឆាំងនឹងការផ្គត់ផ្គង់វិក័យប័ត្រ {0} {1} ចុះកាលបរិច្ឆេទ
 DocType: Customer,Default Price List,តារាងតម្លៃលំនាំដើម
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +225,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: Payment Reconciliation,Payments,ការទូទាត់
 DocType: Journal Entry,Entry Type,ប្រភេទធាតុ
 ,Customer Credit Balance,សមតុល្យឥណទានអតិថិជន
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Payable,ការផ្លាស់ប្តូរសុទ្ធក្នុងគណនីទូទាត់
@@ -1475,7 +1489,7 @@
 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 +9,Procurement,លទ្ធកម្ម
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,គ្មានការធាតុមានការផ្លាស់ប្តូណាមួយក្នុងបរិមាណឬតម្លៃ។
+apps/erpnext/erpnext/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,បណ្តឹងធានា
 ,Lead Details,ពត៌មានលំអិតនាំមុខ
 DocType: Purchase Invoice,End date of current invoice's period,កាលបរិច្ឆេទបញ្ចប់នៃរយៈពេលបច្ចុប្បន្នរបស់វិក័យប័ត្រ
@@ -1500,7 +1514,7 @@
 DocType: Purchase Invoice,Additional Discount,បញ្ចុះតំលៃបន្ថែម
 DocType: Selling Settings,Selling Settings,ការលក់ការកំណត់
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,ការដេញថ្លៃលើបណ្តាញ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +97,Please specify either Quantity or Valuation Rate or both,សូមបរិមាណឬអត្រាវាយតម្លៃឬទាំងពីរបានបញ្ជាក់
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,សូមបរិមាណឬអត្រាវាយតម្លៃឬទាំងពីរបានបញ្ជាក់
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +13,Fulfillment,ការបំពេញ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","ក្រុមហ៊ុន, ខែនិងឆ្នាំសារពើពន្ធចាំបាច់"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,ចំណាយទីផ្សារ
@@ -1521,14 +1535,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,ការដំឡើង ERPNext ទាំងស្រុង!
 DocType: Item,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +93,A Customer Group exists with same name please change the Customer name or rename the Customer Group,ការគ្រុបអតិថិជនមានឈ្មោះដូចគ្នាសូមផ្លាស់ប្តូរឈ្មោះរបស់អតិថិជនឬប្តូរឈ្មោះក្រុមរបស់អតិថិជន
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +126,A Customer Group exists with same name please change the Customer name or rename the Customer Group,ការគ្រុបអតិថិជនមានឈ្មោះដូចគ្នាសូមផ្លាស់ប្តូរឈ្មោះរបស់អតិថិជនឬប្តូរឈ្មោះក្រុមរបស់អតិថិជន
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,ទំនាក់ទំនងថ្មី
 DocType: Territory,Parent Territory,ដែនដីមាតាឬបិតា
 DocType: Quality Inspection Reading,Reading 2,ការអាន 2
 DocType: Stock Entry,Material Receipt,សម្ភារៈបង្កាន់ដៃ
 DocType: Homepage,Products,ផលិតផល
 DocType: Announcement,Instructor,គ្រូបង្រៀន
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},បក្សនិងបក្សប្រភេទត្រូវបានទាមទារសម្រាប់ការទទួលគណនី / បង់ {0}
 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,ទំនាក់ទំនងបន្ទាប់ដោយ
@@ -1539,7 +1552,7 @@
 ,Item-wise Sales Register,ធាតុប្រាជ្ញាលក់ចុះឈ្មោះ
 DocType: Asset,Gross Purchase Amount,ចំនួនទឹកប្រាក់សរុបការទិញ
 DocType: Asset,Depreciation Method,វិធីសាស្រ្តរំលស់
-apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Offline,ក្រៅបណ្តាញ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +686,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,ត្រូវការ
@@ -1557,25 +1570,27 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +425,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 +858,Make Purchase Order,ធ្វើឱ្យការទិញសណ្តាប់ធ្នាប់
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +852,Make Purchase Order,ធ្វើឱ្យការទិញសណ្តាប់ធ្នាប់
 DocType: SMS Center,Send To,បញ្ជូនទៅ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,There is not enough leave balance for Leave Type {0},មិនមានតុល្យភាពឈប់សម្រាកឱ្យបានគ្រប់គ្រាន់សម្រាប់ទុកឱ្យប្រភេទ {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,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 +172,Work-in-Progress Warehouse is required before Submit,ការងារក្នុងវឌ្ឍនភាពឃ្លាំងត្រូវទាមទារមុនពេលដាក់ស្នើ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,Work-in-Progress Warehouse is required before Submit,ការងារក្នុងវឌ្ឍនភាពឃ្លាំងត្រូវទាមទារមុនពេលដាក់ស្នើ
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,កម្មវិធីសម្រាប់ការងារនេះ។
 DocType: Purchase Order Item,Warehouse and Reference,ឃ្លាំងនិងឯកសារយោង
 DocType: Supplier,Statutory info and other general information about your Supplier,ពត៌មានច្បាប់និងព័ត៌មានទូទៅអំពីផ្គត់ផ្គង់របស់អ្នក
-apps/erpnext/erpnext/hooks.py +88,Addresses,អាសយដ្ឋាន
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,ក្រុមហ៊ុនផ្គត់ផ្គង់&gt; ប្រភេទផ្គត់ផ្គង់
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +212,Against Journal Entry {0} does not have any unmatched {1} entry,ប្រឆាំងនឹង Journal Entry {0} មិនមានធាតុមិនផ្គូផ្គងណាមួយ {1}
+apps/erpnext/erpnext/hooks.py +95,Addresses,អាសយដ្ឋាន
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +215,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,សូមកំណត់តម្រងដែលមានមូលដ្ឋានលើធាតុឬឃ្លាំង
 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,ដើម្បីផ្តល់និង Bill
@@ -1583,11 +1598,10 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} must be submitted,Bom {0} ត្រូវតែត្រូវបានដាក់ជូន
 DocType: Authorization Control,Authorization Control,ការត្រួតពិនិត្យសេចក្តីអនុញ្ញាត
 apps/erpnext/erpnext/controllers/buying_controller.py +300,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},ជួរដេក # {0}: ឃ្លាំងគឺជាការចាំបាច់បានច្រានចោលការប្រឆាំងនឹងធាតុច្រានចោល {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +731,Payment,ការទូទាត់
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,Payment,ការទូទាត់
 DocType: Production Order Operation,Actual Time and Cost,ពេលវេលាពិតប្រាកដនិងការចំណាយ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},ស្នើសុំសម្ភារៈនៃអតិបរមា {0} អាចត្រូវបានធ្វើឡើងសម្រាប់ធាតុ {1} នឹងដីកាសម្រេចលក់ {2}
 DocType: Employee,Salutation,ពាក្យសួរសុខទុក្ខ
-DocType: Pricing Rule,Brand,ម៉ាក
 DocType: Course,Course Abbreviation,អក្សរកាត់ការពិតណាស់
 DocType: Item,Will also apply for variants,ក៏នឹងអនុវត្តសម្រាប់វ៉ារ្យ៉ង់
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +142,"Asset cannot be cancelled, as it is already {0}","ទ្រព្យសម្បត្តិដែលមិនអាចត្រូវបានលុបចោល, ដូចដែលវាមានរួចទៅ {0}"
@@ -1599,7 +1613,7 @@
 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 ដែលជាឯកតារង្វាស់និងលក្ខណៈសម្បត្តិផ្សេងទៀតនៅពេលដែលអ្នកចាប់ផ្តើម។
 DocType: Hub Settings,Hub Node,ហាប់ថ្នាំង
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,អ្នកបានបញ្ចូលធាតុស្ទួន។ សូមកែតម្រូវនិងព្យាយាមម្ដងទៀត។
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Associate,រង
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,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,បង្កើតបញ្ជីអ្នកទទួល
@@ -1607,7 +1621,7 @@
 DocType: Production Planning Tool,Material Requests,សំណើសម្ភារៈ
 DocType: Warranty Claim,Issue Date,បញ្ហាកាលបរិច្ឆេទ
 DocType: Activity Cost,Activity Cost,ការចំណាយសកម្មភាព
-DocType: Timesheet Detail,Timesheet Detail,លំអិត Timesheet
+DocType: Sales Invoice Timesheet,Timesheet Detail,លំអិត Timesheet
 DocType: Purchase Receipt Item Supplied,Consumed Qty,ប្រើប្រាស់ Qty
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,ទូរគមនាគមន៍
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),បង្ហាញថាកញ្ចប់នេះគឺជាផ្នែកមួយនៃរឿងនេះការចែកចាយ (មានតែសេចក្តីព្រាង)
@@ -1630,6 +1644,7 @@
 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,មានវ៉ារ្យ៉ង់
 DocType: Monthly Distribution,Name of the Monthly Distribution,ឈ្មោះរបស់ចែកចាយប្រចាំខែ
 DocType: Sales Person,Parent Sales Person,ឪពុកម្តាយរបស់បុគ្គលលក់
@@ -1642,29 +1657,30 @@
 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 +44,"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
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,នៅក្នុងពាក្យនោះនឹងត្រូវបានមើលឃើញនៅពេលដែលអ្នករក្សាទុកវិក័យប័ត្រលក់។
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +502,Error: {0} &gt; {1},កំហុស: {0}&gt; {1}
 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,ថែទាំម៉ោង
 ,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.,រយៈពេលកាលបរិច្ឆេទចាប់ផ្ដើមមិនអាចមានមុនជាងឆ្នាំចាប់ផ្ដើមកាលបរិច្ឆេទនៃឆ្នាំសិក្សាដែលរយៈពេលនេះត្រូវបានតភ្ជាប់ (អប់រំឆ្នាំ {}) ។ សូមកែកាលបរិច្ឆេទនិងព្យាយាមម្ដងទៀត។
 DocType: Naming Series,Current Value,តម្លៃបច្ចុប្បន្ន
-apps/erpnext/erpnext/controllers/accounts_controller.py +235,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,ឆ្នាំសារពើពន្ធច្រើនមានសម្រាប់កាលបរិច្ឆេទ {0} ។ សូមកំណត់ក្រុមហ៊ុននៅក្នុងឆ្នាំសារពើពន្ធ
+apps/erpnext/erpnext/controllers/accounts_controller.py +238,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 +458,Item table can not be blank,តារាងធាតុមិនអាចទទេ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +443,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 +5,This is based on stock movement. See {0} for details,នេះត្រូវបានផ្អែកលើចលនាភាគហ៊ុន។ សូមមើល {0} សម្រាប់សេចក្តីលម្អិត
 DocType: Pricing Rule,Selling,លក់
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +341,Amount {0} {1} deducted against {2},ចំនួនទឹកប្រាក់ {0} {1} បានកាត់ប្រឆាំងនឹង {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +344,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,កាលបរិច្ឆេទដោយសារតែមិនអាចមានមុនពេលការប្រកាសកាលបរិច្ឆេទ
@@ -1679,8 +1695,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +144,Cannot refer row number greater than or equal to current row number for this Charge type,មិនអាចយោងលេខជួរដេកធំជាងឬស្មើទៅនឹងចំនួនជួរដេកបច្ចុប្បន្នសម្រាប់ប្រភេទការចោទប្រកាន់នេះ
 DocType: Asset,Sold,លក់ចេញ
 ,Item-wise Purchase History,ប្រវត្តិទិញប្រាជ្ញាធាតុ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Red,ពណ៌ក្រហម
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},សូមចុចលើ &#39;បង្កើតតារាង &quot;ដើម្បីទៅប្រមូលយកសៀរៀលគ្មានបានបន្ថែមសម្រាប់ធាតុ {0}
+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,ការបើកចំហរការបញ្ជាទិញផលិតកម្ម
 DocType: Sales Invoice Payment,Base Amount (Company Currency),ចំនួនមូលដ្ឋាន (ក្រុមហ៊ុនរូបិយប័ណ្ណ)
@@ -1688,7 +1704,7 @@
 DocType: Installation Note,Installation Time,ពេលដំឡើង
 DocType: Sales Invoice,Accounting Details,សេចក្ដីលម្អិតគណនី
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,លុបប្រតិបត្តិការទាំងអស់សម្រាប់ក្រុមហ៊ុននេះ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +187,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,ជួរដេក # {0}: ប្រតិបត្ដិការ {1} មិនត្រូវបានបញ្ចប់សម្រាប់ {2} qty ទំនិញសម្រេចនៅក្នុងផលិតកម្មលំដាប់ # {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,ជួរដេក # {0}: ប្រតិបត្ដិការ {1} មិនត្រូវបានបញ្ចប់សម្រាប់ {2} qty ទំនិញសម្រេចនៅក្នុងផលិតកម្មលំដាប់ # {3} ។ សូមធ្វើឱ្យទាន់សម័យស្ថានភាពកំណត់ហេតុម៉ោងប្រតិបត្ដិការតាមរយៈការ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,ការវិនិយោគ
 DocType: Issue,Resolution Details,ពត៌មានលំអិតការដោះស្រាយ
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,តុល្យភាព
@@ -1724,16 +1740,17 @@
 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}
 DocType: Delivery Note,Excise Page Number,រដ្ឋាករលេខទំព័រ
 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}
 ,Maintenance Schedules,កាលវិភាគថែរក្សា
 DocType: Task,Actual End Date (via Time Sheet),បញ្ចប់ពិតប្រាកដកាលបរិច្ឆេទ (តាមរយៈសន្លឹកម៉ោង)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Amount {0} {1} against {2} {3},ចំនួនទឹកប្រាក់ {0} {1} ប្រឆាំងនឹង {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +339,Amount {0} {1} against {2} {3},ចំនួនទឹកប្រាក់ {0} {1} ប្រឆាំងនឹង {2} {3}
 ,Quotation Trends,សម្រង់និន្នាការ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},ធាតុគ្រុបមិនបានរៀបរាប់នៅក្នុងមេធាតុសម្រាប់ធាតុ {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +295,Debit To account must be a Receivable account,ឥណពន្ធវីសាទៅគណនីត្រូវតែជាគណនីដែលទទួល
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Receivable account,ឥណពន្ធវីសាទៅគណនីត្រូវតែជាគណនីដែលទទួល
 DocType: Shipping Rule Condition,Shipping Amount,ចំនួនទឹកប្រាក់ការដឹកជញ្ជូន
 ,Pending Amount,ចំនួនទឹកប្រាក់ដែលមិនទាន់សម្រេច
 DocType: Purchase Invoice Item,Conversion Factor,ការប្រែចិត្តជឿកត្តា
@@ -1741,10 +1758,10 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +137,Expected value after useful life must be greater than or equal to {0},តម្លៃដែលរំពឹងទុកបន្ទាប់ពីជីវិតដែលមានប្រយោជន៍ត្រូវតែធំជាងឬស្មើទៅនឹង {0}
 DocType: Purchase Receipt,Vehicle Number,ចំនួនរថយន្ត
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,ថ្ងៃដែលនឹងត្រូវកើតឡើងវិក្កយបត្របញ្ឈប់ការ
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +90,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,ចំនួនសរុបដែលបានបម្រុងទុកស្លឹក {0} មិនអាចតិចជាងស្លឹកត្រូវបានអនុម័តរួចទៅហើយ {1} សម្រាប់រយៈពេលនេះ
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +93,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 +22,Enter Paid Amount,បញ្ចូលចំនួនទឹកប្រាក់ដែលបង់ប្រាក់
+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
@@ -1754,13 +1771,15 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,Timesheets
 DocType: HR Settings,HR Settings,ការកំណត់ធនធានមនុស្ស
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Expense Claim is pending approval. Only the Expense Approver can update status.,ពាក្យបណ្តឹងលើការចំណាយគឺត្រូវរង់ចាំការអនុម័ត។ មានតែការអនុម័តលើការចំណាយនេះអាចធ្វើឱ្យស្ថានភាពទាន់សម័យ។
+DocType: Email Digest,New Expenses,ការចំណាយថ្មី
 DocType: Purchase Invoice,Additional Discount Amount,ចំនួនទឹកប្រាក់ដែលបញ្ចុះតម្លៃបន្ថែម
-apps/erpnext/erpnext/controllers/accounts_controller.py +524,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","ជួរដេក # {0}: Qty ត្រូវតែ 1, ជាធាតុជាទ្រព្យសកម្មថេរ។ សូមប្រើជួរដាច់ដោយឡែកសម្រាប់ qty ច្រើន។"
+apps/erpnext/erpnext/controllers/accounts_controller.py +527,"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 +249,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/stock/get_item_details.py +123,Please specify Company,សូមបញ្ជាក់ក្រុមហ៊ុន
 ,Customer Acquisition and Loyalty,ការទិញរបស់អតិថិជននិងភាពស្មោះត្រង់
@@ -1771,17 +1790,19 @@
 apps/erpnext/erpnext/projects/doctype/task/task.js +26,Expense Claims,ប្តឹងទាមទារសំណងលើការចំណាយ
 DocType: Issue,Support,ការគាំទ្រ
 ,BOM Search,ស្វែងរក Bom
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Closing (Opening + Totals),បិទ (បើក + + សរុប)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),បិទ (បើក + + សរុប)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,សូមបញ្ជាក់រូបិយប័ណ្ណនៅក្នុងក្រុមហ៊ុន
 DocType: Workstation,Wages per hour,ប្រាក់ឈ្នួលក្នុងមួយម៉ោង
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +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/controllers/accounts_controller.py +272,Account {0} is invalid. Account Currency must be {1},គណនី {0} មិនត្រឹមត្រូវ។ រូបិយប័ណ្ណគណនីត្រូវតែ {1}
+DocType: Email Digest,Pending Sales Orders,ការរង់ចាំការបញ្ជាទិញលក់
+apps/erpnext/erpnext/controllers/accounts_controller.py +275,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 +956,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","ជួរដេក # {0}: យោងប្រភេទឯកសារត្រូវតែជាផ្នែកមួយនៃដីកាលក់, ការលក់វិក័យប័ត្រឬធាតុទិនានុប្បវត្តិ"
-DocType: Salary Slip,Deduction,ការដក
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +87,Row {0}: From Time and To Time is mandatory.,ជួរដេក {0}: ពីពេលវេលានិងទៅពេលវេលាគឺជាការចាំបាច់។
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +969,"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 +111,Row {0}: From Time and To Time is mandatory.,ជួរដេក {0}: ពីពេលវេលានិងទៅពេលវេលាគឺជាការចាំបាច់។
+DocType: Stock Reconciliation Item,Amount Difference,ភាពខុសគ្នាចំនួនទឹកប្រាក់
 apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},ថ្លៃទំនិញបានបន្ថែមសម្រាប់ {0} នៅក្នុងបញ្ជីតម្លៃ {1}
 DocType: Address Template,Address Template,អាសយដ្ឋានទំព័រគំរូ
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +7,Please enter Employee Id of this sales person,សូមបញ្ចូលនិយោជិតលេខសម្គាល់នេះបុគ្គលការលក់
@@ -1789,7 +1810,7 @@
 DocType: Project,% Tasks Completed,% ភារកិច្ចបានបញ្ចប់
 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 +194,Please enter Production Item first,សូមបញ្ចូលធាតុដំបូងផលិតកម្ម
+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,អ្នកប្រើដែលបានបិទ
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,សម្រង់
@@ -1798,53 +1819,54 @@
 DocType: Maintenance Visit,Maintenance User,អ្នកប្រើប្រាស់ថែទាំ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +149,Cost Updated,ការចំណាយបន្ទាន់សម័យ
 DocType: Employee,Date of Birth,ថ្ងៃខែឆ្នាំកំណើត
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +86,Item {0} has already been returned,ធាតុ {0} ត្រូវបានត្រឡប់មកវិញរួចហើយ
+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: 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 +177,Job Description,ការពិពណ៌នាការងារ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,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 +126,"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 +127,"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.","រក្សាដាននៃការលក់យុទ្ធនាការ។ រក្សាដាននៃការនាំមុខ, សម្រង់សម្តី, ការលក់លំដាប់លពីយុទ្ធនាការដើម្បីវាស់ស្ទង់ត្រឡប់ទៅលើការវិនិយោគ។"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +24,Welcome to POS: Create your POS Profile,សូមស្វាគមន៍មកកាន់ម៉ាស៊ីនឆូតកាត: បង្កើតប្រវត្តិម៉ាស៊ីនឆូតកាតរបស់អ្នក
 DocType: Expense Claim,Approver,ការអនុម័ត
 ,SO Qty,សូ Qty
+DocType: Guardian,Work Address,អាសយដ្ឋានការងារ
 DocType: Appraisal,Calculate Total Score,គណនាពិន្ទុសរុប
 DocType: Request for Quotation,Manufacturing Manager,កម្មវិធីគ្រប់គ្រងកម្មន្តសាល
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},សៀរៀល {0} គ្មានរីករាយជាមួយនឹងស្ថិតនៅក្រោមការធានា {1}
+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 +74,Shipments,ការនាំចេញ
+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 +153,Row # ,ជួរដេក #
+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 +156,Get From,ទទួលបានពី
+apps/erpnext/erpnext/public/js/utils.js +167,Get From,ទទួលបានពី
 DocType: C-Form,Quarter,ត្រីមាស
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Miscellaneous Expenses,ការចំណាយនានា
 DocType: Global Defaults,Default Company,ក្រុមហ៊ុនលំនាំដើម
 apps/erpnext/erpnext/controllers/stock_controller.py +167,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,ការចំណាយឬគណនីភាពខុសគ្នាគឺជាការចាំបាច់សម្រាប់ធាតុ {0} វាជាការរួមភាគហ៊ុនតម្លៃផលប៉ះពាល់
-apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings",មិនអាច overbill សម្រាប់ធាតុនៅ {0} {1} ជួរដេកច្រើនជាង {2} ។ ដើម្បីអនុញ្ញាតឱ្យ overbilling សូមកំណត់នៅក្នុងការកំណត់ហ៊ុន
+apps/erpnext/erpnext/controllers/accounts_controller.py +419,"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
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} is disabled,ប្រើ {0} ត្រូវបានបិទ
 DocType: Leave Application,Total Leave Days,សរុបថ្ងៃស្លឹក
 DocType: Email Digest,Note: Email will not be sent to disabled users,ចំណាំ: អ៊ីម៉ែលនឹងមិនត្រូវបានផ្ញើទៅកាន់អ្នកប្រើជនពិការ
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,ជ្រើសក្រុមហ៊ុន ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,ប្រសិនបើអ្នកទុកវាឱ្យទទេទាំងអស់ពិចារណាសម្រាប់នាយកដ្ឋាន
 apps/erpnext/erpnext/config/hr.py +171,"Types of employment (permanent, contract, intern etc.).",ប្រភេទការងារ (អចិន្ត្រយ៍កិច្ចសន្យាហាត់ជាដើម) ។
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +346,{0} is mandatory for Item {1},{0} គឺជាការចាំបាច់សម្រាប់ធាតុ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,{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","សូមជ្រើសចំនួនទឹកប្រាក់ដែលបានបម្រុងទុក, ប្រភេទវិក័យប័ត្រនិងលេខវិក្កយបត្រក្នុងមួយជួរដេកយ៉ាងហោចណាស់"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,តម្លៃនៃការទិញថ្មី
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},លំដាប់ការលក់បានទាមទារសម្រាប់ធាតុ {0}
 DocType: Purchase Invoice Item,Rate (Company Currency),អត្រាការប្រាក់ (ក្រុមហ៊ុនរូបិយវត្ថុ)
-apps/erpnext/erpnext/demo/setup_data.py +360,Others,អ្នកផ្សេងទៀត
+DocType: Student Guardian,Others,អ្នកផ្សេងទៀត
 DocType: Payment Entry,Unallocated Amount,ចំនួនទឹកប្រាក់ដែលមិនទាន់បែងចែក
 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,ពន្ធនិងការចោទប្រកាន់
@@ -1864,17 +1886,16 @@
 apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,សារពើភ័ណ្ឌស៊េរី
 DocType: Activity Type,Default Billing Rate,អត្រាការប្រាក់វិក័យប័ត្រលំនាំដើម
 DocType: Sales Invoice,Total Billing Amount,ចំនួនទឹកប្រាក់សរុបវិក័យប័ត្រ
-apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +54,Receivable Account,គណនីត្រូវទទួល
-apps/erpnext/erpnext/controllers/accounts_controller.py +546,Row #{0}: Asset {1} is already {2},ជួរដេក # {0}: ទ្រព្យសកម្ម {1} មានរួចហើយ {2}
+apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,គណនីត្រូវទទួល
+apps/erpnext/erpnext/controllers/accounts_controller.py +549,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 +79,CEO,នាយកប្រតិបត្តិ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,នាយកប្រតិបត្តិ
 DocType: Expense Claim Detail,Expense Claim Detail,ពត៌មានលំអិតពាក្យបណ្តឹងលើការចំណាយ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +808,Please select correct account,សូមជ្រើសរើសគណនីដែលត្រឹមត្រូវ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +809,Please select correct account,សូមជ្រើសរើសគណនីដែលត្រឹមត្រូវ
 DocType: Item,Weight UOM,ទំងន់ UOM
 DocType: Salary Structure Employee,Salary Structure Employee,និយោជិតបានប្រាក់ខែរចនាសម្ព័ន្ធ
 DocType: Employee,Blood Group,ក្រុមឈាម
-DocType: Purchase Invoice Item,Page Break,ការបំបែកទំព័រ
 DocType: Production Order Operation,Pending,ឡុងេពល
 DocType: Course,Course Name,ឈ្មោះវគ្គសិក្សាបាន
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,អ្នកប្រើដែលអាចអនុម័តកម្មវិធីដែលបានឈប់សម្រាកជាក់លាក់របស់បុគ្គលិក
@@ -1883,14 +1904,15 @@
 DocType: Fiscal Year,Companies,មានក្រុមហ៊ុន
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,ឡិចត្រូនិច
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,ចូរលើកសំណើសុំនៅពេលដែលភាគហ៊ុនសម្ភារៈឈានដល់កម្រិតបញ្ជាទិញឡើងវិញ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Full-time,ពេញម៉ោង
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,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: 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,តម្លៃចូលសរុប
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Debit To is required,ឥណពន្ធវីសាដើម្បីត្រូវបានទាមទារ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +321,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,គ្រប់គ្រងគុណភាព
@@ -1898,6 +1920,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/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
@@ -1908,18 +1931,17 @@
 DocType: Production Order Operation,Completed Qty,Qty បានបញ្ចប់
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"For {0}, only debit accounts can be linked against another credit entry",{0} មានតែគណនីឥណពន្ធអាចត្រូវបានតភ្ជាប់ប្រឆាំងនឹងធាតុឥណទានផ្សេងទៀត
 apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,បញ្ជីតម្លៃ {0} ត្រូវបានបិទ
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +99,Row {0}: Completed Qty cannot be more than {1} for operation {2},ជួរដេក {0}: Qty បញ្ចប់មិនអាចមានច្រើនជាង {1} សម្រាប់ប្រតិបត្តិការ {2}
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +123,Row {0}: Completed Qty cannot be more than {1} for operation {2},ជួរដេក {0}: Qty បញ្ចប់មិនអាចមានច្រើនជាង {1} សម្រាប់ប្រតិបត្តិការ {2}
 DocType: Manufacturing Settings,Allow Overtime,អនុញ្ញាតឱ្យបន្ថែមម៉ោង
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} លេខសៀរៀលដែលបានទាមទារសម្រាប់ធាតុ {1} ។ អ្នកបានផ្ដល់ {2} ។
 DocType: Stock Reconciliation Item,Current Valuation Rate,អត្រាវាយតម្លៃនាពេលបច្ចុប្បន្ន
 DocType: Item,Customer Item Codes,កូដធាតុអតិថិជន
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,អត្រាប្តូរប្រាក់ចំណេញ / បាត់បង់
 DocType: Opportunity,Lost Reason,បាត់បង់មូលហេតុ
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,សូមរៀបចំស៊េរីសម្រាប់ការចូលរួមចំនួនតាមរយៈការដំឡើង&gt; លេខរៀងកម្រងឯកសារ
 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/purchase_receipt/purchase_receipt.py +378,All items have already been invoiced,ធាតុទាំងអស់ត្រូវបាន invoiced រួចទៅហើយ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +379,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,ខាងក្រៅ
@@ -1935,18 +1957,19 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,អតិថិជនរបស់អ្នក
 apps/erpnext/erpnext/projects/doctype/project/project.py +141,You have been invited to collaborate on the project: {0},អ្នកបានត្រូវអញ្ជើញដើម្បីសហការគ្នាលើគម្រោងនេះ: {0}
 DocType: Leave Block List Date,Block Date,ប្លុកកាលបរិច្ឆេទ
-apps/erpnext/erpnext/templates/generators/job_opening.html +19,Apply Now,ដាក់ពាក្យឥឡូវនេះ
+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.",បង្កើតនិងគ្រប់គ្រងការរំលាយអាហារបានអ៊ីម៉ែលជារៀងរាល់ថ្ងៃប្រចាំសប្តាហ៍និងប្រចាំខែ។
 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,អគារ
-apps/erpnext/erpnext/utilities/doctype/address/address.py +164,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,រកមិនឃើញអាសយដ្ឋានលំនាំដើមពុម្ព។ សូមបង្កើតថ្មីមួយពីការដំឡើង&gt; បោះពុម្ពនិងម៉ាក&gt; អាស័យពុម្ព។
 DocType: Fee Structure,Fee Structure,រចនាសម្ព័ន្ធថ្លៃសេវា
 DocType: Timesheet Detail,Costing Amount,ចំនួនទឹកប្រាក់ដែលចំណាយថវិកាអស់
+DocType: Student Admission,Application Fee,ថ្លៃសេវាកម្មវិធី
 DocType: Process Payroll,Submit Salary Slip,ដាក់ស្នើប្រាក់ខែគ្រូពេទ្យប្រហែលជា
-apps/erpnext/erpnext/controllers/selling_controller.py +161,Maxiumm discount for Item {0} is {1}%,ការបញ្ចុះតម្លៃ Maxiumm សម្រាប់ធាតុ {0} គឺ {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,ការបញ្ចុះតម្លៃ Maxiumm សម្រាប់ធាតុ {0} គឺ {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,នាំចូលក្នុងក្រុម
 DocType: Sales Partner,Address & Contacts,អាសយដ្ឋាន &amp; ទំនាក់ទំនង
 DocType: SMS Log,Sender Name,ឈ្មោះរបស់អ្នកផ្ញើ
@@ -1971,20 +1994,20 @@
 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_data.py +361,Travel,ការធ្វើដំណើរ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +155,No active or default Salary Structure found for employee {0} for the given dates,គ្មានប្រាក់ខែរចនាសម្ព័ន្ធសកម្មឬបានរកឃើញសម្រាប់បុគ្គលិកលំនាំដើម {0} សម្រាប់កាលបរិច្ឆេទដែលបានផ្ដល់ឱ្យ
+apps/erpnext/erpnext/demo/setup/setup_data.py +304,Travel,ការធ្វើដំណើរ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +167,No active or default Salary Structure found for employee {0} for the given dates,គ្មានប្រាក់ខែរចនាសម្ព័ន្ធសកម្មឬបានរកឃើញសម្រាប់បុគ្គលិកលំនាំដើម {0} សម្រាប់កាលបរិច្ឆេទដែលបានផ្ដល់ឱ្យ
 DocType: Leave Block List,Allow Users,អនុញ្ញាតឱ្យអ្នកប្រើ
 DocType: Purchase Order,Customer Mobile No,គ្មានគយចល័ត
 DocType: Sales Invoice,Recurring,កើតឡើង
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,តាមដានចំណូលដាច់ដោយឡែកនិងចំសម្រាប់បញ្ឈរផលិតផលឬការបែកបាក់។
 DocType: Rename Tool,Rename Tool,ឧបករណ៍ប្តូរឈ្មោះ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +23,Update Cost,តម្លៃដែលធ្វើឱ្យទាន់សម័យ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,តម្លៃដែលធ្វើឱ្យទាន់សម័យ
 DocType: Item Reorder,Item Reorder,ធាតុរៀបចំ
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +36,Show Salary Slip,គ្រូពេទ្យប្រហែលជាបង្ហាញប្រាក់ខែ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +748,Transfer Material,សម្ភារៈសេវាផ្ទេរប្រាក់
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +53,Show Salary Slip,គ្រូពេទ្យប្រហែលជាបង្ហាញប្រាក់ខែ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,Transfer Material,សម្ភារៈសេវាផ្ទេរប្រាក់
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","បញ្ជាក់ប្រតិបត្តិការ, ការចំណាយប្រតិបត្ដិការនិងផ្ដល់ឱ្យនូវប្រតិបត្ដិការតែមួយគត់នោះទេដើម្បីឱ្យប្រតិបត្តិការរបស់អ្នក។"
-apps/erpnext/erpnext/public/js/controllers/transaction.js +923,Please set recurring after saving,សូមកំណត់កើតឡើងបន្ទាប់ពីរក្សាទុក
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +646,Select change amount account,គណនីចំនួនទឹកប្រាក់ជ្រើសការផ្លាស់ប្តូរ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +914,Please set recurring after saving,សូមកំណត់កើតឡើងបន្ទាប់ពីរក្សាទុក
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +703,Select change amount account,គណនីចំនួនទឹកប្រាក់ជ្រើសការផ្លាស់ប្តូរ
 DocType: Purchase Invoice,Price List Currency,បញ្ជីតម្លៃរូបិយប័ណ្ណ
 DocType: Naming Series,User must always select,អ្នកប្រើដែលត្រូវតែជ្រើសតែងតែ
 DocType: Stock Settings,Allow Negative Stock,អនុញ្ញាតឱ្យហ៊ុនអវិជ្ជមាន
@@ -1996,31 +2019,32 @@
 DocType: Quality Inspection,Verified By,បានផ្ទៀងផ្ទាត់ដោយ
 DocType: Address,Subsidiary,ក្រុមហ៊ុនបុត្រសម្ព័ន្ធ
 apps/erpnext/erpnext/setup/doctype/company/company.py +64,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.",មិនអាចផ្លាស់ប្តូរូបិយប័ណ្ណលំនាំដើមរបស់ក្រុមហ៊ុនដោយសារតែមានប្រតិបតិ្តការដែលមានស្រាប់។ ប្រតិបត្ដិការត្រូវតែត្រូវបានលុបចោលការផ្លាស់ប្តូររូបិយប័ណ្ណលំនាំដើម។
+DocType: Grade Interval,Grade Description,ថ្នាក់ទីបរិយាយ
 DocType: Quality Inspection,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 +33,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 +352,Quantity in row {0} ({1}) must be same as manufactured quantity {2},បរិមាណដែលត្រូវទទួលទានក្នុងមួយជួរដេក {0} ({1}) ត្រូវតែមានដូចគ្នាបរិមាណផលិត {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Quantity in row {0} ({1}) must be same as manufactured quantity {2},បរិមាណដែលត្រូវទទួលទានក្នុងមួយជួរដេក {0} ({1}) ត្រូវតែមានដូចគ្នាបរិមាណផលិត {2}
 DocType: Appraisal,Employee,បុគ្គលិក
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,អញ្ជើញជាអ្នកប្រើប្រាស់
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} ត្រូវបានផ្សព្វផ្សាយឱ្យបានពេញលេញ
 DocType: Workstation Working Hour,End Time,ពេលវេលាបញ្ចប់
 DocType: Payment Entry,Payment Deductions or Loss,កាត់ការទូទាត់ឬការបាត់បង់
-apps/erpnext/erpnext/config/schools.py +100,LMS,LMS
+apps/erpnext/erpnext/config/schools.py +104,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,បំពង់បង្ហូរប្រេងការលក់
 DocType: Student Batch Student,Student Batch Student,សិស្សជំនាន់ទីរបស់សិស្ស
-DocType: Sales Invoice,Mass Mailing,អភិបូជាសំបុត្ររួម
+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 +199,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/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 +297,Salary Slip of employee {0} already created for this period,ប័ណ្ណប្រាក់ខែរបស់បុគ្គលិក {0} បានបង្កើតឡើងរួចទៅហើយសម្រាប់រយៈពេលនេះ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Pharmaceutical,ឱសថ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +309,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/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,ការផ្តល់ឥណទានដល់
@@ -2035,27 +2059,28 @@
 DocType: Upload Attendance,Attendance To Date,ចូលរួមកាលបរិច្ឆេទ
 DocType: Warranty Claim,Raised By,បានលើកឡើងដោយ
 DocType: Payment Gateway Account,Payment Account,គណនីទូទាត់ប្រាក់
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +814,Please specify Company to proceed,សូមបញ្ជាក់ក្រុមហ៊ុនដើម្បីបន្ត
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +793,Please specify Company to proceed,សូមបញ្ជាក់ក្រុមហ៊ុនដើម្បីបន្ត
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Receivable,ការផ្លាស់ប្តូរសុទ្ធក្នុងគណនីអ្នកទទួល
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Compensatory Off,ទូទាត់បិទ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,ទូទាត់បិទ
 DocType: Quality Inspection Reading,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.,សូមប្រាកដថាអ្នកពិតជាចង់លុបប្រតិបតិ្តការទាំងអស់សម្រាប់ក្រុមហ៊ុននេះ។ ទិន្នន័យមេរបស់អ្នកនឹងនៅតែជាវាគឺជា។ សកម្មភាពនេះមិនអាចមិនធ្វើវិញ។
 DocType: Room,Room Number,លេខបន្ទប់
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},សេចក្ដីយោងមិនត្រឹមត្រូវ {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +161,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) មិនអាចច្រើនជាងការគ្រោងទុក quanitity ({2}) នៅក្នុងផលិតកម្មលំដាប់ {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +162,{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 +217,Raw Materials cannot be blank.,វត្ថុធាតុដើមដែលមិនអាចត្រូវបានទទេ។
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,"Could not update stock, invoice contains drop shipping item.","មិនអាចធ្វើឱ្យទាន់សម័យហ៊ុន, វិក័យប័ត្រមានធាតុដឹកជញ្ជូនទម្លាក់។"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +460,Quick Journal Entry,ធាតុទិនានុប្បវត្តិរហ័ស
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +111,You can not change rate if BOM mentioned agianst any item,អ្នកមិនអាចផ្លាស់ប្តូរអត្រាការបានប្រសិនបើ Bom បានរៀបរាប់ agianst ធាតុណាមួយ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +441,"Could not update stock, invoice contains drop shipping item.","មិនអាចធ្វើឱ្យទាន់សម័យហ៊ុន, វិក័យប័ត្រមានធាតុដឹកជញ្ជូនទម្លាក់។"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Quick Journal Entry,ធាតុទិនានុប្បវត្តិរហ័ស
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +103,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},សូមបញ្ចូលសម្រាប់ធាតុគ្រោងទុក Qty {0} នៅក្នុងជួរដេក {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is not submitted,{0} {1} មិនត្រូវបានដាក់ស្នើ
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,សំណើសម្រាប់ធាតុ។
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,គោលបំណងផលិតដោយឡែកពីគ្នានឹងត្រូវបានបង្កើតសម្រាប់ធាតុដ៏ល្អគ្នាបានបញ្ចប់។
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +121,{0} must be negative in return document,{0} ត្រូវតែអវិជ្ជមាននៅក្នុងឯកសារត្រឡប់មកវិញ
 ,Minutes to First Response for Issues,នាទីដើម្បីឆ្លើយតបដំបូងសម្រាប់បញ្ហា
 DocType: Purchase Invoice,Terms and Conditions1,លក្ខខណ្ឌនិង Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,ឈ្មោះរបស់វិទ្យាស្ថាននេះដែលអ្នកកំពុងកំណត់ប្រព័ន្ធនេះ។
@@ -2064,16 +2089,17 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,ស្ថានភាពគម្រោង
 DocType: UOM,Check this to disallow fractions. (for Nos),ធីកប្រអប់នេះដើម្បីមិនអនុញ្ញាតឱ្យប្រភាគ។ (សម្រាប់ Nos)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +398,The following Production Orders were created:,លំដាប់ខាងក្រោមនេះត្រូវបានបង្កើតផលិតកម្ម:
+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 +739,Item or Warehouse for row {0} does not match Material Request,ធាតុឬឃ្លាំងសំរាប់ជួរ {0} មិនផ្គូផ្គងសំណើសម្ភារៈ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +747,Item or Warehouse for row {0} does not match Material Request,ធាតុឬឃ្លាំងសំរាប់ជួរ {0} មិនផ្គូផ្គងសំណើសម្ភារៈ
 apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,ឯកតារង្វាស់
 DocType: Fiscal Year,Year End Date,ឆ្នាំបញ្ចប់កាលបរិច្ឆេទ
 DocType: Task Depends On,Task Depends On,ភារកិច្ចអាស្រ័យលើ
-DocType: Lead,Opportunity,ឱកាសការងារ
+DocType: Supplier Quotation,Opportunity,ឱកាសការងារ
 ,Completed Production Orders,បានបញ្ចប់លើការបញ្ជាទិញផលិតកម្ម
 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,ស្ថានីយការងារលំនាំដើម
@@ -2086,7 +2112,7 @@
 DocType: Student,Joining Date,កាលបរិច្ឆេទការចូលរួម
 ,Employees working on a holiday,កម្មករនិយោជិតធ្វើការនៅលើថ្ងៃឈប់សម្រាកមួយ
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,លោក Mark បច្ចុប្បន្ន
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},កាលបរិច្ឆេទចាប់ផ្តើថែទាំមិនអាចត្រូវបានចែកចាយសម្រាប់ការមុនកាលបរិច្ឆេទសៀរៀលគ្មាន {0}
+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,ជាក់ស្តែកាលបរិច្ឆេទបញ្ចប់
 DocType: Purchase Invoice,PINV-,PINV-
 DocType: Authorization Rule,Applicable To (Role),ដែលអាចអនុវត្តទៅ (តួនាទី)
@@ -2101,7 +2127,7 @@
 DocType: SMS Log,No of Requested SMS,គ្មានសារជាអក្សរដែលបានស្នើ
 DocType: Campaign,Campaign-.####,យុទ្ធនាការ។ - ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,ជំហានបន្ទាប់
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,Please supply the specified items at the best possible rates,សូមផ្ដល់ធាតុដែលបានបញ្ជាក់នៅក្នុងអត្រាការប្រាក់ល្អបំផុតដែលអាចធ្វើទៅបាន
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +695,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 +117,Contract End Date must be greater than Date of Joining,កិច្ចសន្យាដែលកាលបរិច្ឆេទបញ្ចប់ត្រូវតែធំជាងកាលបរិច្ឆេទនៃការចូលរួម
 DocType: Delivery Note,DN-,DN-
@@ -2110,7 +2136,7 @@
 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 +14,This is an example website auto-generated from ERPNext,នេះត្រូវបានគេហទំព័រជាឧទាហរណ៍មួយបង្កើតដោយស្វ័យប្រវត្តិពី ERPNext
+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
 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.
 
@@ -2137,13 +2163,14 @@
 DocType: Purchase Receipt Item,Recd Quantity,បរិមាណដែលត្រូវទទួលទាន Recd
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +54,Fee Records Created - {0},កំណត់ត្រាថ្លៃសេវាបានបង្កើត - {0}
 DocType: Asset Category Account,Asset Category Account,គណនីទ្រព្យសកម្មប្រភេទ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +103,Cannot produce more Item {0} than Sales Order quantity {1},មិនអាចបង្កើតធាតុជាច្រើនទៀត {0} ជាងបរិមាណលំដាប់លក់ {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Stock Entry {0} is not submitted,ភាគហ៊ុនចូល {0} គឺមិនត្រូវបានដាក់ស្នើ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},មិនអាចបង្កើតធាតុជាច្រើនទៀត {0} ជាងបរិមាណលំដាប់លក់ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +505,Stock Entry {0} is not submitted,ភាគហ៊ុនចូល {0} គឺមិនត្រូវបានដាក់ស្នើ
 DocType: Payment Reconciliation,Bank / Cash Account,គណនីធនាគារ / សាច់ប្រាក់
 DocType: Tax Rule,Billing City,ទីក្រុងវិក័យប័ត្រ
 DocType: Salary Component Account,Salary Component Account,គណនីប្រាក់បៀវត្សសមាសភាគ
 DocType: Global Defaults,Hide Currency Symbol,រូបិយប័ណ្ណនិមិត្តសញ្ញាលាក់
 apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card","ឧធនាគារសាច់ប្រាក់, កាតឥណទាន"
+DocType: Lead Source,Source Name,ឈ្មោះប្រភព
 DocType: Journal Entry,Credit Note,ឥណទានចំណាំ
 DocType: Warranty Claim,Service Address,សេវាអាសយដ្ឋាន
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furnitures and Fixtures,គ្រឿងសង្ហារឹមនិងព្រឹត្តិការណ៍ប្រកួត
@@ -2155,6 +2182,7 @@
 DocType: Opportunity,Customer / Lead Name,អតិថិជននាំឱ្យឈ្មោះ /
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +89,Clearance Date not mentioned,ការបោសសំអាតកាលបរិច្ឆេទមិនបានលើកឡើង
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,ផលិតកម្ម
+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/controllers/trends.py +19,Total(Qty),សរុប (Qty)
 DocType: Sales Invoice,This Document,ឯកសារនេះ
@@ -2166,15 +2194,15 @@
 DocType: Purchase Receipt,Time at which materials were received,ពេលវេលាដែលបានសមា្ភារៈត្រូវបានទទួល
 DocType: Stock Ledger Entry,Outgoing Rate,អត្រាចេញ
 apps/erpnext/erpnext/config/hr.py +176,Organization branch master.,ចៅហ្វាយសាខាអង្គការ។
-apps/erpnext/erpnext/controllers/accounts_controller.py +273, or ,ឬ
+apps/erpnext/erpnext/controllers/accounts_controller.py +276, 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 +203,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,ជួរដេក # {0}: Journal Entry {1} មិនមានគណនី {2} ឬកាតមានទឹកប្រាក់រួចហើយបានផ្គូផ្គងប្រឆាំងនឹងផ្សេងទៀត
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +206,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 +90,No employee for the above selected criteria OR salary slip already created,គ្មាននិយោជិតលក្ខណៈវិនិច្ឆ័យដែលបានជ្រើសខាងលើឬប័ណ្ណប្រាក់បៀវត្សដែលបានបង្កើតរួច
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +93,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,ប្រភេទការទូទាត់
@@ -2202,8 +2230,8 @@
 DocType: Product Bundle,Parent Item,ធាតុមេ
 DocType: Account,Account Type,ប្រភេទគណនី
 DocType: Delivery Note,DN-RET-,DN-RET-
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +115,Leave Type {0} cannot be carry-forwarded,ទុកឱ្យប្រភេទ {0} មិនអាចត្រូវបានយកមកបញ្ជូនបន្ត
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',ថែទាំគឺមិនត្រូវបានបង្កើតកាលវិភាគសម្រាប់ធាតុទាំងអស់នោះ។ សូមចុចលើ &#39;បង្កើតកាលវិភាគ &quot;
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +118,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 +163,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",ចំពោះជួរដេកនៅ {0} {1} ។ ដើម្បីរួមបញ្ចូល {2} នៅក្នុងអត្រាធាតុជួរដេក {3} ត្រូវតែត្រូវបានរួមបញ្ចូល
@@ -2215,13 +2243,13 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +32,Disabled template must not be default template,ពុម្ពជនពិការមិនត្រូវពុម្ពលំនាំដើម
 DocType: Account,Income Account,គណនីប្រាក់ចំណូល
 DocType: Payment Request,Amount in customer's currency,ចំនួនទឹកប្រាក់របស់អតិថិជនជារូបិយប័ណ្ណ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +748,Delivery,ការដឹកជញ្ជូន
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +742,Delivery,ការដឹកជញ្ជូន
 DocType: Stock Reconciliation Item,Current Qty,Qty នាពេលបច្ចុប្បន្ន
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",សូមមើល &quot;អត្រានៃមូលដ្ឋាននៅលើសម្ភារៈ&quot; នៅក្នុងផ្នែកទីផ្សារ
 DocType: Appraisal Goal,Key Responsibility Area,តំបន់ភារកិច្ចសំខាន់
 DocType: Payment Entry,Total Allocated Amount,ចំនួនទឹកប្រាក់ដែលបានបម្រុងទុកសរុប
 DocType: Item Reorder,Material Request Type,ប្រភេទស្នើសុំសម្ភារៈ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +82,Row {0}: UOM Conversion Factor is mandatory,ជួរដេក {0}: UOM ការប្រែចិត្តជឿកត្តាគឺជាការចាំបាច់
+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,មជ្ឈមណ្ឌលការចំណាយ
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,# កាតមានទឹកប្រាក់
@@ -2232,13 +2260,13 @@
 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 +90,Head of Marketing and Sales,ជាប្រធានទីផ្សារនិងលក់
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,ពន្ធលើប្រាក់ចំណូល
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,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.,បទនាំតាមប្រភេទឧស្សាហកម្ម។
 DocType: Item Supplier,Item Supplier,ផ្គត់ផ្គង់ធាតុ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +403,Please enter Item Code to get batch no,សូមបញ្ចូលលេខកូដធាតុដើម្បីទទួលបាច់នោះទេ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +770,Please select a value for {0} quotation_to {1},សូមជ្រើសតម្លៃសម្រាប់ {0} quotation_to {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +397,Please enter Item Code to get batch no,សូមបញ្ចូលលេខកូដធាតុដើម្បីទទួលបាច់នោះទេ
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +764,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 ក្រុមហ៊ុន"
@@ -2250,28 +2278,29 @@
 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 +100,Issues,បញ្ហានានា
+apps/erpnext/erpnext/hooks.py +109,Issues,បញ្ហានានា
 apps/erpnext/erpnext/controllers/status_updater.py +13,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,ការរង់ចាំការធាតុដូច្នេះសម្រាប់សំណើរសុំទិញ
+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,រូបិយប័ណ្ណវិក័យប័ត្រ
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Large,បន្ថែមទៀតដែលមានទំហំធំ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,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 +507,Warning: Another {0} # {1} exists against stock entry {2},ព្រមាន: មួយទៀត {0} {1} # មានប្រឆាំងនឹងធាតុភាគហ៊ុន {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Local,ក្នុងតំបន់
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +508,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),ឥណទាននិងបុរេប្រទាន (ទ្រព្យសម្បត្តិ)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,ជំពាក់បំណុល
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Large,ដែលមានទំហំធំ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,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 +225,Total {0} ({1}),សរុប {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +224,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,វិធីសាស្រ្តវាយតម្លៃលំនាំដើម
@@ -2317,9 +2346,9 @@
 DocType: Attendance,Leave Type,ប្រភេទការឈប់សម្រាក
 apps/erpnext/erpnext/controllers/stock_controller.py +173,Expense / Difference account ({0}) must be a 'Profit or Loss' account,គណនីក្នុងការចំណាយ / ភាពខុសគ្នា ({0}) ត្រូវតែជា &quot;ចំណញឬខាត &#39;គណនី
 DocType: Account,Accounts User,គណនីអ្នកប្រើប្រាស់
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Name error: {0},កំហុសឈ្មោះ: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +90,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 +178,{0} {1} does not associated with {2} {3},{0} {1} មិនបានផ្សារភ្ជាប់ជាមួយនឹង {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +181,{0} {1} does not associated with {2} {3},{0} {1} មិនបានផ្សារភ្ជាប់ជាមួយនឹង {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,ការចូលរួមសម្រាប់ការ {0} បុគ្គលិកត្រូវបានសម្គាល់រួចហើយ
 DocType: Packing Slip,If more than one package of the same type (for print),បើកញ្ចប់ច្រើនជាងមួយនៃប្រភេទដូចគ្នា (សម្រាប់បោះពុម្ព)
 DocType: Warehouse,Parent Warehouse,ឃ្លាំងមាតាបិតា
@@ -2338,7 +2367,7 @@
 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,គោលបំនង
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,យ៉ាងហោចណាស់ធាតុមួយដែលគួរតែត្រូវបញ្ចូលដោយបរិមាណអវិជ្ជមាននៅក្នុងឯកសារវិលត្រឡប់មកវិញ
+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 +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","ប្រតិបត្ដិការ {0} យូរជាងម៉ោងធ្វើការដែលអាចប្រើណាមួយនៅក្នុងស្ថានីយការងារ {1}, បំបែកប្រតិបត្ដិការទៅក្នុងប្រតិបត្ដិការច្រើន"
 ,Requested,បានស្នើរសុំ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +83,No Remarks,គ្មានសុន្ទរកថា
@@ -2350,46 +2379,46 @@
 DocType: Item,Total Projected Qty,សរុបរបស់គម្រោង Qty
 DocType: Monthly Distribution,Distribution Name,ឈ្មោះចែកចាយ
 DocType: Course,Course Code,ក្រមការពិតណាស់
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Quality Inspection required for Item {0},ពិនិត្យគុណភាពបានទាមទារសម្រាប់ធាតុ {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Quality Inspection required for Item {0},ពិនិត្យគុណភាពបានទាមទារសម្រាប់ធាតុ {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,អត្រារូបិយប័ណ្ណអតិថិជនដែលត្រូវបានបម្លែងទៅជារូបិយប័ណ្ណមូលដ្ឋានរបស់ក្រុមហ៊ុន
 DocType: Purchase Invoice Item,Net Rate (Company Currency),អត្រាការប្រាក់សុទ្ធ (ក្រុមហ៊ុនរូបិយវត្ថុ)
 DocType: Salary Detail,Condition and Formula Help,លក្ខខណ្ឌនិងរូបមន្តជំនួយ
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,គ្រប់គ្រងដើមឈើមួយដើមដែនដី។
 DocType: Journal Entry Account,Sales Invoice,វិក័យប័ត្រការលក់
 DocType: Journal Entry Account,Party Balance,តុល្យភាពគណបក្ស
-apps/erpnext/erpnext/accounts/page/pos/pos.js +475,Please select Apply Discount On,សូមជ្រើសរើសអនុវត្តបញ្ចុះតម្លៃនៅលើ
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +92,Salary Slip Created,គ្រូពេទ្យប្រហែលជាត្រូវបានបង្កើតឡើងប្រាក់បៀវត្សរ៍
+apps/erpnext/erpnext/accounts/page/pos/pos.js +464,Please select Apply Discount On,សូមជ្រើសរើសអនុវត្តបញ្ចុះតម្លៃនៅលើ
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +95,Salary Slip Created,គ្រូពេទ្យប្រហែលជាត្រូវបានបង្កើតឡើងប្រាក់បៀវត្សរ៍
 DocType: Company,Default Receivable Account,គណនីអ្នកទទួលលំនាំដើម
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,បង្កើតធាតុរបស់ធនាគារចំពោះប្រាក់បៀវត្សសរុបដែលបានបង់សម្រាប់លក្ខណៈវិនិច្ឆ័យដែលបានជ្រើសខាងលើ
 DocType: Stock Entry,Material Transfer for Manufacture,ផ្ទេរសម្រាប់ការផលិតសម្ភារៈ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,ភាគរយបញ្ចុះតម្លៃអាចត្រូវបានអនុវត្តទាំងការប្រឆាំងនឹងតារាងតម្លៃមួយឬសម្រាប់តារាងតម្លៃទាំងអស់។
 DocType: Purchase Invoice,Half-yearly,ពាក់កណ្តាលប្រចាំឆ្នាំ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +384,Accounting Entry for Stock,ចូលគណនេយ្យសម្រាប់ក្រុមហ៊ុនផ្សារ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +387,Accounting Entry for Stock,ចូលគណនេយ្យសម្រាប់ក្រុមហ៊ុនផ្សារ
 DocType: Sales Invoice,Sales Team1,Team1 ការលក់
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,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 +96,Row {0}: Completed Qty must be greater than zero.,ជួរដេក {0}: Qty បានបញ្ចប់ត្រូវតែធំជាងសូន្យ។
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +120,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 +88,Row # {0}: Cannot return more than {1} for Item {2},ជួរដេក # {0}: មិនអាចវិលត្រឡប់មកវិញច្រើនជាង {1} សម្រាប់ធាតុ {2}
+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,ចំណែកដី
 DocType: Item Group,Show this slideshow at the top of the page,បង្ហាញតែការបញ្ចាំងស្លាយនេះនៅកំពូលនៃទំព័រ
 DocType: BOM,Item UOM,ធាតុ UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),ចំនួនប្រាក់ពន្ធបន្ទាប់ពីចំនួនការបញ្ចុះតម្លៃ (ក្រុមហ៊ុនរូបិយវត្ថុ)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +147,Target warehouse is mandatory for row {0},ឃ្លាំងគោលដៅគឺជាការចាំបាច់សម្រាប់ជួរ {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,ជ្រើសអាសយដ្ឋានផ្គត់ផ្គង់
 DocType: Quality Inspection,Quality Inspection,ពិនិត្យគុណភាព
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Extra Small,បន្ថែមទៀតខ្នាតតូច
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,Warning: Material Requested Qty is less than Minimum Order Qty,ព្រមាន: សម្ភារៈដែលបានស្នើ Qty គឺតិចជាងអប្បបរមាលំដាប់ Qty
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +194,Account {0} is frozen,គណនី {0} គឺការកក
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,បន្ថែមទៀតខ្នាតតូច
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +690,Warning: Material Requested Qty is less than Minimum Order Qty,ព្រមាន: សម្ភារៈដែលបានស្នើ Qty គឺតិចជាងអប្បបរមាលំដាប់ Qty
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,គណនី {0} គឺការកក
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,ផ្នែកច្បាប់អង្គភាព / តារាងរួមផ្សំជាមួយនឹងគណនីដាច់ដោយឡែកមួយដែលជាកម្មសិទ្ធិរបស់អង្គការនេះ។
 DocType: Payment Request,Mute Email,ស្ងាត់អ៊ីម៉ែល
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","អាហារ, ភេសជ្ជៈនិងថ្នាំជក់"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +606,Can only make payment against unbilled {0},ត្រឹមតែអាចធ្វើឱ្យការទូទាត់ប្រឆាំងនឹង unbilled {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +126,Commission rate cannot be greater than 100,អត្រាការគណៈកម្មាការមិនអាចជាធំជាង 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +609,Can only make payment against unbilled {0},ត្រឹមតែអាចធ្វើឱ្យការទូទាត់ប្រឆាំងនឹង unbilled {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,អត្រាការគណៈកម្មាការមិនអាចជាធំជាង 100
 DocType: Stock Entry,Subcontract,របបម៉ៅការ
 apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,សូមបញ្ចូល {0} ដំបូង
 DocType: Production Order Operation,Actual End Time,ជាក់ស្តែងពេលវេលាបញ្ចប់
@@ -2400,30 +2429,30 @@
 DocType: SMS Log,No of Sent SMS,គ្មានសារដែលបានផ្ញើ
 DocType: Account,Expense Account,ចំណាយតាមគណនី
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,កម្មវិធីសម្រាប់បញ្ចូលកុំព្យូទ័រ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Colour,ពណ៌
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,ពណ៌
 DocType: Maintenance Visit,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; ហើយមិនមានកញ្ចប់ផលិតផលផ្សេងទៀត
 DocType: Student Log,Academic,អប់រំ
-apps/erpnext/erpnext/controllers/accounts_controller.py +469,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),ជាមុនសរុប ({0}) នឹងដីកាសម្រេច {1} មិនអាចច្រើនជាងសម្ពោធសរុប ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +472,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),ជាមុនសរុប ({0}) នឹងដីកាសម្រេច {1} មិនអាចច្រើនជាងសម្ពោធសរុប ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,ជ្រើសដើម្បីមិនស្មើគ្នាចែកចាយប្រចាំខែគោលដៅនៅទូទាំងខែចែកចាយ។
 DocType: Purchase Invoice Item,Valuation Rate,អត្រាការវាយតម្លៃ
+DocType: Stock Reconciliation,SR/,SR /
 apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,រូបិយប័ណ្ណបញ្ជីតម្លៃមិនបានជ្រើសរើស
 DocType: Assessment,Results,លទ្ធផល
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +168,Employee {0} has already applied for {1} between {2} and {3},បុគ្គលិក {0} បានអនុវត្តរួចហើយសម្រាប់ {1} រវាង {2} និង {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +175,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: Student Applicant,Father's/ Guardian 2 Email ID,/ អាណាព្យាបាលលេខសម្គាល់អ៊ីមែលរបស់ព្រះបិតា 2
 DocType: Maintenance Visit Purpose,Against Document No,ប្រឆាំងនឹងការ 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 +228,Warehouses with existing transaction can not be converted to group.,ប្រតិបត្តិការដែលមានស្រាប់ឃ្លាំងដោយមានមិនអាចត្រូវបានបម្លែងទៅជាក្រុម។
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +231,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 +93,Researcher,អ្នកស្រាវជ្រាវ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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.,ការត្រួតពិនិត្យដែលមានគុណភាពចូល។
@@ -2435,25 +2464,25 @@
 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: Sales Invoice,Advertisement,ការផ្សព្វផ្សាយ
 DocType: Asset Category Account,Depreciation Expense Account,គណនីរំលស់
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Probationary Period,រយៈពេលសាកល្បង
-apps/erpnext/erpnext/hooks.py +102,Announcements,សេចក្តីប្រកាស
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,រយៈពេលសាកល្បង
+apps/erpnext/erpnext/hooks.py +111,Announcements,សេចក្តីប្រកាស
 DocType: Customer Group,Only leaf nodes are allowed in transaction,មានតែថ្នាំងស្លឹកត្រូវបានអនុញ្ញាតក្នុងប្រតិបត្តិការ
 DocType: Expense Claim,Expense Approver,ការអនុម័តការចំណាយ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +109,Row {0}: Advance against Customer must be credit,ជួរដេក {0}: ជាមុនប្រឆាំងនឹងការអតិថិជនត្រូវតែមានការឥណទាន
 apps/erpnext/erpnext/accounts/doctype/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 +16,To Datetime,ដើម្បី Datetime
+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/scheduling_tool/scheduling_tool.py +51,Course Schedules deleted:,កាលវិភាគវគ្គសិក្សាបានលុប:
 apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,កំណត់ហេតុសម្រាប់ការរក្សាស្ថានភាពចែកចាយផ្ញើសារជាអក្សរ
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,សកម្មភាពដែលមិនទាន់សម្រេច
+DocType: Accounts Settings,Make Payment via Journal Entry,ធ្វើឱ្យសេវាទូទាត់តាមរយៈ Journal Entry
+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 +127,Please enter relieving date.,សូមបញ្ចូលកាលបរិច្ឆេទបន្ថយ។
-apps/erpnext/erpnext/controllers/trends.py +145,Amt,AMT
+apps/erpnext/erpnext/controllers/trends.py +149,Amt,AMT
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,Only Leave Applications with status 'Approved' can be submitted,ទុកឱ្យបានតែកម្មវិធីដែលមានស្ថានភាព &#39;ត្រូវបានអនុម័ត &quot;អាចត្រូវបានដាក់ស្នើ
 apps/erpnext/erpnext/utilities/doctype/address/address.py +26,Address Title is mandatory.,អាសយដ្ឋានចំណងជើងគឺជាចាំបាច់។
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,បញ្ចូលឈ្មោះនៃយុទ្ធនាការបានប្រសិនបើប្រភពនៃការស៊ើបអង្កេតគឺជាយុទ្ធនាការ
@@ -2471,14 +2500,15 @@
 apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1},មិនអាចរកឃើញអត្រាប្តូរប្រាក់សម្រាប់ {0} ទៅ {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,ប្រារព្ធទិវាពាក់កណ្តាល
 DocType: Sales Invoice,Sales Team,ការលក់ក្រុមការងារ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Duplicate entry,ធាតុស្ទួន
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,ធាតុស្ទួន
 DocType: Program Enrollment Tool,Get Students,ទទួលយកនិស្សិត
 DocType: Serial No,Under Warranty,នៅក្រោមការធានា
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +490,[Error],[កំហុសក្នុងការ]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +484,[Error],[កំហុសក្នុងការ]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,នៅក្នុងពាក្យនោះនឹងត្រូវបានមើលឃើញនៅពេលដែលអ្នករក្សាសណ្តាប់ធ្នាប់ការលក់។
 ,Employee Birthday,បុគ្គលិកខួបកំណើត
 apps/erpnext/erpnext/controllers/status_updater.py +175,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} រួចហើយ។ សូមកែប្រែធាតុទាំងនេះនិងព្យាយាមម្ដងទៀត។
 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} មិនមាន
@@ -2494,22 +2524,22 @@
 ,Issued Items Against Production Order,ធាតុដែលបានចេញដីកាបង្គាប់របស់ផលិតកម្មប្រឆាំងនឹង
 DocType: Pricing Rule,Purchase Manager,កម្មវិធីគ្រប់គ្រងការទិញ
 DocType: Target Detail,Target Detail,ពត៌មានលំអិតគោលដៅ
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +25,All Jobs,ការងារទាំងអស់
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,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,ជាមួយនឹងការប្រតិបត្តិការនៃមជ្ឈមណ្ឌលការចំណាយដែលមានស្រាប់ដែលមិនអាចត្រូវបានបម្លែងទៅជាក្រុម
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Amount {0} {1} {2} {3},ចំនួនទឹកប្រាក់ {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Amount {0} {1} {2} {3},ចំនួនទឹកប្រាក់ {0} {1} {2} {3}
 DocType: Account,Depreciation,រំលស់
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),ក្រុមហ៊ុនផ្គត់ផ្គង់ (s បាន)
 DocType: Employee Attendance Tool,Employee Attendance Tool,ឧបករណ៍វត្តមានបុគ្គលិក
 DocType: Supplier,Credit Limit,ដែនកំណត់ឥណទាន
 DocType: Production Plan Sales Order,Salse Order Date,កាលបរិច្ឆេទ Salse លំដាប់
 DocType: Salary Component,Salary Component,សមាសភាគប្រាក់ខែ
-apps/erpnext/erpnext/accounts/utils.py +372,Payment Entries {0} are un-linked,ធាតុការទូទាត់ {0} គឺជាតំណភ្ជាប់របស់អង្គការសហប្រជាជាតិ
+apps/erpnext/erpnext/accounts/utils.py +449,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 +497,Material Requests {0} created,សំណើសម្ភារៈ {0} បង្កើតឡើង
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +498,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.,ទំព័រគំរូនៃពាក្យឬកិច្ចសន្យា។
 DocType: Purchase Invoice,Address and Contact,អាស័យដ្ឋាននិងទំនាក់ទំនង
@@ -2548,7 +2578,7 @@
 DocType: Serial No,Warranty / AMC Details,ការធានា / AMC ពត៌មានលំអិត
 DocType: Journal Entry,User Remark,សំគាល់របស់អ្នកប្រើ
 DocType: Lead,Market Segment,ចំណែកទីផ្សារ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +848,Paid Amount cannot be greater than total negative outstanding amount {0},ចំនួនទឹកប្រាក់ដែលត្រូវចំណាយប្រាក់មិនអាចត្រូវបានធំជាងចំនួនទឹកប្រាក់សរុបអវិជ្ជមាន {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +859,Paid Amount cannot be greater than total negative outstanding amount {0},ចំនួនទឹកប្រាក់ដែលត្រូវចំណាយប្រាក់មិនអាចត្រូវបានធំជាងចំនួនទឹកប្រាក់សរុបអវិជ្ជមាន {0}
 DocType: Employee Internal Work History,Employee Internal Work History,ប្រវត្តិការងាររបស់បុគ្គលិកផ្ទៃក្នុង
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +233,Closing (Dr),បិទ (លោកបណ្ឌិត)
 DocType: Cheque Print Template,Cheque Size,ទំហំមូលប្បទានប័ត្រ
@@ -2569,7 +2599,8 @@
 ,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 ដើម្បីលុបចោល។
-apps/erpnext/erpnext/controllers/accounts_controller.py +555,'Update Stock' cannot be checked for fixed asset sale,&quot;ធ្វើឱ្យទាន់សម័យហ៊ុន &#39;មិនអាចត្រូវបានពិនិត្យរកការលក់ទ្រព្យសកម្មថេរ
+DocType: Student Guardian,Father,ព្រះបិតា
+apps/erpnext/erpnext/controllers/accounts_controller.py +558,'Update Stock' cannot be checked for fixed asset sale,&quot;ធ្វើឱ្យទាន់សម័យហ៊ុន &#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} ត្រូវបានលុបចោលឬបញ្ឈប់
@@ -2579,15 +2610,15 @@
 DocType: Sales Order,Fully Delivered,ផ្តល់ឱ្យបានពេញលេញ
 DocType: Lead,Lower Income,ប្រាក់ចំណូលទាប
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","ក្បាលត្រូវស្ថិតក្រោមការទទួលខុសត្រូវមានគណនី, ដែលក្នុងនោះប្រាក់ចំនេញ / ការបាត់បង់នឹងត្រូវបានកក់"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +166,Source and target warehouse cannot be same for row {0},ប្រភពនិងឃ្លាំងគោលដៅមិនអាចមានដូចគ្នាសម្រាប់ជួរដេក {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",គណនីមានភាពខុសគ្នាត្រូវតែជាគណនីប្រភេទទ្រព្យសកម្ម / ការទទួលខុសត្រូវចាប់តាំងពីការផ្សះផ្សានេះគឺផ្សារភាគហ៊ុនការបើកជាមួយធាតុ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +81,Purchase Order number required for Item {0},ទិញចំនួនលំដាប់ដែលបានទាមទារសម្រាប់ធាតុ {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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/purchase_receipt/purchase_receipt.py +82,Purchase Order number required for Item {0},ទិញចំនួនលំដាប់ដែលបានទាមទារសម្រាប់ធាតុ {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&quot;ពីកាលបរិច្ឆេទ&quot; ត្រូវតែមានបន្ទាប់ &#39;ដើម្បីកាលបរិច្ឆេទ &quot;
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +17,Cannot change status as student {0} is linked with student application {1},មិនអាចផ្លាស់ប្តូរស្ថានភាពជានិស្សិត {0} ត្រូវបានផ្សារភ្ជាប់ជាមួយនឹងកម្មវិធីនិស្សិត {1}
+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: Timesheet,"List of employee which has ""Salary Slip Based on Timesheet"" is enabled in salary structure.",បញ្ជីនៃបុគ្គលិកដែលមាន &quot;ប័ណ្ណប្រាក់ដោយផ្អែកលើ Timesheet&quot; ត្រូវបានអនុញ្ញាតនៅក្នុងរចនាសម្ព័នប្រាក់ខែ។
 DocType: Asset,Fully Depreciated,ធ្លាក់ថ្លៃយ៉ាងពេញលេញ
 ,Stock Projected Qty,គម្រោង Qty ផ្សារភាគហ៊ុន
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Customer {0} does not belong to project {1},អតិថិជន {0} មិនមែនជារបស់គម្រោង {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,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,សៀរៀលទេនិងបាច់ &amp; ‧;
@@ -2599,7 +2630,7 @@
 DocType: Purchase Invoice,Purchase Taxes and Charges,ទិញពន្ធនិងការចោទប្រកាន់
 ,Qty to Receive,qty ទទួល
 DocType: Leave Block List,Leave Block List Allowed,ទុកឱ្យប្លុកដែលបានអនុញ្ញាតក្នុងបញ្ជី
-apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +55,All Warehouses,ឃ្លាំងទាំងអស់
+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 +105,Credit To account must be a Balance Sheet account,ឥណទានទៅគណនីត្រូវតែមានតារាងតុល្យការគណនី
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,ក្រុមហ៊ុនផ្គត់ផ្គង់គ្រប់ប្រភេទ
@@ -2611,10 +2642,10 @@
 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/manufacturing/doctype/bom/bom.js +26,Browse BOM,រកមើល Bom
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,រកមើល Bom
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,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 Year,Academic Year,ឆ្នាំសិក្សា
+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
 DocType: Appraisal,Appraisal,ការវាយតម្លៃ
@@ -2622,12 +2653,12 @@
 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 +197,Leave approver must be one of {0},ទុកឱ្យការអនុម័តត្រូវតែជាផ្នែកមួយនៃ {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,Leave approver must be one of {0},ទុកឱ្យការអនុម័តត្រូវតែជាផ្នែកមួយនៃ {0}
 DocType: Hub Settings,Seller Email,អ្នកលក់អ៊ីម៉ែល
 DocType: Project,Total Purchase Cost (via Purchase Invoice),ការចំណាយទិញសរុប (តាមរយៈការទិញវិក័យប័ត្រ)
 DocType: Workstation Working Hour,Start Time,ពេលវេលាចាប់ផ្ដើម
 DocType: Item Price,Bulk Import Help,ជំនួយភាគច្រើននាំចូល
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +256,Select Quantity,ជ្រើសបរិមាណ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +257,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,សារដែលបានផ្ញើ
@@ -2644,6 +2675,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,ទាំង qty គោលដៅឬគោលដៅចំនួនទឹកប្រាក់គឺជាចាំបាច់។
 apps/erpnext/erpnext/config/projects.py +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}"
+DocType: Timesheet,Billing Details,សេចក្ដីលម្អិតវិក័យប័ត្រ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +149,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}
 DocType: Item,Inspection Required,អធិការកិច្ចដែលបានទាមទារ
@@ -2663,7 +2695,7 @@
 DocType: Expense Claim,Approval Status,ស្ថានភាពការអនុម័ត
 DocType: Hub Settings,Publish Items to Hub,បោះពុម្ពផ្សាយធាតុហាប់
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},ពីតម្លៃត្រូវតែតិចជាងទៅនឹងតម្លៃនៅក្នុងជួរដេក {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Wire Transfer,ការផ្ទេរខ្សែ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,ការផ្ទេរខ្សែ
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,សូមពិនិត្យមើលទាំងអស់
 DocType: Sales Order,Recurring Order,លំដាប់កើតឡើង
 DocType: Company,Default Income Account,គណនីចំណូលលំនាំដើម
@@ -2675,21 +2707,19 @@
 ,Welcome to ERPNext,សូមស្វាគមន៍មកកាន់ ERPNext
 apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,នាំឱ្យមានការសម្រង់
 DocType: Lead,From Customer,ពីអតិថិជន
-apps/erpnext/erpnext/demo/setup_data.py +357,Calls,ការហៅទូរស័ព្ទ
+apps/erpnext/erpnext/demo/setup/setup_data.py +300,Calls,ការហៅទូរស័ព្ទ
 DocType: Project,Total Costing Amount (via Time Logs),ចំនួនទឹកប្រាក់ផ្សារសរុប (តាមរយៈការពេលវេលាកំណត់ហេតុ)
 DocType: Purchase Order Item Supplied,Stock UOM,ភាគហ៊ុន UOM
-apps/erpnext/erpnext/stock/doctype/item/item.py +466,"As there are existing transactions for this item, \
-							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","ដូចជាមានប្រតិបត្តិការដែលមានស្រាប់សម្រាប់ធាតុនេះ \ អ្នកមិនអាចផ្លាស់ប្តូរតម្លៃនៃ &quot;គ្មានសៀរៀល &#39;,&#39; មានជំនាន់ទីគ្មាន &#39;,&#39; គឺជាធាតុហ៊ុន&quot; និង &quot;វិធីសាស្រ្តវាយតម្លៃ&quot;"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,Purchase Order {0} is not submitted,ទិញលំដាប់ {0} គឺមិនត្រូវបានដាក់ស្នើ
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,ការព្យាករ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},សៀរៀលគ្មាន {0} មិនមែនជារបស់ឃ្លាំង {1}
 apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,ចំណាំ: ប្រព័ន្ធនឹងមិនបានពិនិត្យមើលលើការចែកចាយនិងការកក់សម្រាប់ធាតុ {0} ជាបរិមាណឬចំនួនទឹកប្រាក់គឺ 0
 DocType: Notification Control,Quotation Message,សារសម្រង់
 DocType: Issue,Opening Date,ពិធីបើកកាលបរិច្ឆេទ
-apps/erpnext/erpnext/schools/api.py +58,Attendance has been marked successfully.,ការចូលរួមត្រូវបានគេបានសម្គាល់ដោយជោគជ័យ។
+apps/erpnext/erpnext/schools/api.py +57,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 +136,Account Type for {0} must be {1},ប្រភេទគណនីសម្រាប់ {0} ត្រូវតែជា {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +139,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,ឃ្លាំងទាំងពីរត្រូវតែជាកម្មសិទ្ធិរបស់ក្រុមហ៊ុនដូចគ្នា
@@ -2704,12 +2734,13 @@
 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/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 +20,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 +1190,Please select customer,សូមជ្រើសអតិថិជន
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1193,Please select customer,សូមជ្រើសអតិថិជន
 DocType: C-Form,I,ខ្ញុំ
 DocType: Company,Asset Depreciation Cost Center,មជ្ឈមណ្ឌលតម្លៃរំលស់ទ្រព្យសម្បត្តិ
 DocType: Sales Order Item,Sales Order Date,លំដាប់ការលក់កាលបរិច្ឆេទ
@@ -2719,6 +2750,7 @@
 ,Payment Period Based On Invoice Date,អំឡុងពេលបង់ប្រាក់ដែលមានមូលដ្ឋានលើវិក័យប័ត្រកាលបរិច្ឆេទ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},បាត់ខ្លួនរូបិយប័ណ្ណប្តូរប្រាក់អត្រាការប្រាក់សម្រាប់ {0}
 DocType: Assessment,Examiner,ត្រួតពិនិត្យ
+DocType: Student,Siblings,បងប្អូន
 DocType: Journal Entry,Stock Entry,ភាគហ៊ុនចូល
 DocType: Payment Entry,Payment References,ឯកសារយោងការទូទាត់
 DocType: C-Form,C-FORM-,C-FORM-
@@ -2736,11 +2768,12 @@
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,ប្រធានបទឈ្មោះ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,យ៉ាងហោចណាស់មួយនៃការលក់ឬទិញត្រូវតែត្រូវបានជ្រើស &amp; ‧;
+DocType: Grading Structure,Grade Intervals,ចន្លោះពេលថ្នាក់ទី
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,ជ្រើសធម្មជាតិនៃអាជីវកម្មរបស់អ្នក។
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,ដែលជាកន្លែងដែលប្រតិបត្ដិការផលិតត្រូវបានអនុវត្ត។
 DocType: Asset Movement,Source Warehouse,ឃ្លាំងប្រភព
 DocType: Installation Note,Installation Date,កាលបរិច្ឆេទនៃការដំឡើង
-apps/erpnext/erpnext/controllers/accounts_controller.py +534,Row #{0}: Asset {1} does not belong to company {2},ជួរដេក # {0}: ទ្រព្យសកម្ម {1} មិនមែនជាកម្មសិទ្ធិរបស់ក្រុមហ៊ុន {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +537,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,ការលក់របស់អ្នកប្រើប្រាស់
@@ -2754,28 +2787,31 @@
 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,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 +111,Date Of Retirement must be greater than Date of Joining,កាលបរិច្ឆេទនៃការចូលនិវត្តន៍ត្រូវតែធំជាងកាលបរិច្ឆេទនៃការចូលរួម
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +49,There were errors while scheduling course on :,មានកំហុសខណៈពេលរៀបចំការពិតណាស់នៅលើគេ:
 DocType: Sales Invoice,Against Income Account,ប្រឆាំងនឹងគណនីចំណូល
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +87,{0}% Delivered,{0}% ផ្តល់
+apps/erpnext/erpnext/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}: qty លំដាប់ {1} មិនអាចតិចជាង qty គោលបំណងអប្បរមា {2} (បានកំណត់ក្នុងធាតុ) ។
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,ភាគរយចែកចាយប្រចាំខែ
 DocType: Territory,Territory Targets,ទឹកដីគោលដៅ
 DocType: Delivery Note,Transporter Info,ពត៌មាន transporter
-apps/erpnext/erpnext/accounts/utils.py +379,Please set default {0} in Company {1},សូមកំណត់លំនាំដើមនៅ {0} {1} ក្រុមហ៊ុន
+apps/erpnext/erpnext/accounts/utils.py +456,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,ប្រាក់ចំណេញសរុប / បាត់បង់
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,ដីកាបង្គាប់របស់សហការីការទិញធាតុ
 apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,ឈ្មោះក្រុមហ៊ុនមិនអាចត្រូវបានក្រុមហ៊ុន
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,ប្រមុខលិខិតសម្រាប់ពុម្ពអក្សរ។
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,ការផ្តល់ប័ណ្ណសម្រាប់ពុម្ពដែលបោះពុម្ពឧ Proforma វិក័យប័ត្រ។
+DocType: Student Guardian,Student Guardian,អាណាព្យាបាលរបស់សិស្ស
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +184,Valuation type charges can not marked as Inclusive,ការចោទប្រកាន់មិនអាចវាយតម្លៃប្រភេទសម្គាល់ថាជាការរួមបញ្ចូល
 DocType: POS Profile,Update Stock,ធ្វើឱ្យទាន់សម័យហ៊ុន
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM ផ្សេងគ្នាសម្រាប់ធាតុនឹងនាំឱ្យមានមិនត្រឹមត្រូវ (សរុប) តម្លៃទម្ងន់សុទ្ធ។ សូមប្រាកដថាទម្ងន់សុទ្ធនៃធាតុគ្នាគឺនៅ UOM ដូចគ្នា។
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,អត្រា Bom
 DocType: Asset,Journal Entry for Scrap,ទិនានុប្បវត្តិធាតុសម្រាប់សំណល់អេតចាយ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,សូមទាញធាតុពីការដឹកជញ្ជូនចំណាំ
-apps/erpnext/erpnext/accounts/utils.py +349,Journal Entries {0} are un-linked,ធាតុទិនានុប្បវត្តិ {0} គឺជាតំណភ្ជាប់របស់អង្គការសហប្រជាជាតិ
+apps/erpnext/erpnext/accounts/utils.py +426,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,សូមនិយាយពីមជ្ឈមណ្ឌលការចំណាយមូលបិទក្នុងក្រុមហ៊ុន
@@ -2799,6 +2835,7 @@
 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,វេទិកាសហគមន៍
+DocType: Homepage,"URL for ""All Products""",URL សម្រាប់ &quot;ផលិតផលទាំងអស់&quot;
 DocType: Leave Application,Leave Balance Before Application,ទុកឱ្យតុល្យភាពមុនពេលដាក់ពាក្យស្នើសុំ
 DocType: SMS Center,Send SMS,ផ្ញើសារជាអក្សរ
 DocType: Cheque Print Template,Width of amount in word,ទទឹងនៃចំនួនទឹកប្រាក់នៅក្នុងពាក្យ
@@ -2807,7 +2844,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 +29,Current Job Openings,ការងារបច្ចុប្បន្ន
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,Current Job Openings,ការងារបច្ចុប្បន្ន
 DocType: Company,Stock Adjustment Account,គណនីកែតម្រូវភាគហ៊ុន
 DocType: Journal Entry,Write Off,បិទការសរសេរ
 DocType: Timesheet Detail,Operation ID,លេខសម្គាល់ការប្រតិបត្ដិការ
@@ -2820,7 +2857,7 @@
 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 +850,Show tax break-up,សម្រាកឡើងពន្ធលើការបង្ហាញ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +841,Show tax break-up,សម្រាកឡើងពន្ធលើការបង្ហាញ
 apps/erpnext/erpnext/accounts/party.py +308,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}, ហេតុនេះអ្នកមិនអាចឡើងវិញបានផ្តល់តម្លៃឬកែប្រែវា"
@@ -2830,10 +2867,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 +534,Please select Posting Date before selecting Party,សូមជ្រើសរើសកាលបរិច្ឆេទមុនការជ្រើសគណបក្ស
 DocType: Serial No,Out of AMC,ចេញពីមជ្ឈមណ្ឌល AMC
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +80,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 +162,Please contact to the user who have Sales Master Manager {0} role,សូមទាក់ទងទៅអ្នកប្រើដែលមានការលក់កម្មវិធីគ្រប់គ្រងអនុបណ្ឌិតតួនាទី {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +195,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 +5,This is based on the attendance of this Student,នេះត្រូវបានផ្អែកលើការចូលរួមរបស់សិស្សនេះ
@@ -2842,12 +2880,11 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,ភក្ដិកំណត់ត្រាកំណត់ការដឹកជញ្ជូន {0} ត្រូវតែបានលុបចោលមុនពេលលុបចោលការបញ្ជាលក់នេះ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +75,Paid amount + Write Off Amount can not be greater than Grand Total,ចំនួនទឹកប្រាក់ដែលបង់ + + បិទសរសេរចំនួនទឹកប្រាក់ដែលមិនអាចត្រូវបានធំជាងសម្ពោធសរុប
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,{0} is not a valid Batch Number for Item {1},{0} គឺមិនមែនជាលេខបាច់ត្រឹមត្រូវសម្រាប់ធាតុ {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +138,Note: There is not enough leave balance for Leave Type {0},ចំណាំ: មិនមានតុល្យភាពឈប់សម្រាកឱ្យបានគ្រប់គ្រាន់សម្រាប់ទុកឱ្យប្រភេទ {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,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,ប្រភេទឱកាសការងារ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,ក្រុមហ៊ុនថ្មី
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,Cost Center is required for 'Profit and Loss' account {0},មជ្ឈមណ្ឌលការចំណាយគឺត្រូវបានទាមទារសម្រាប់ &#39;ប្រាក់ចំណេញនិងការបាត់បង់&#39; គណនី {0}
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,តិបត្តិការអាចលុបបានតែដោយអ្នកបង្កើតក្រុមហ៊ុន
 apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,លេខមិនត្រឹមត្រូវនៃធាតុសៀវភៅទូទៅបានរកឃើញ។ អ្នកប្រហែលជាបានជ្រើសគណនីខុសក្នុងប្រតិបត្តិការនេះ។
 DocType: Cheque Print Template,Cheque Width,ទទឹងមូលប្បទានប័ត្រ
@@ -2856,16 +2893,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,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 +228,{0} '{1}' is disabled,{0} &#39;{1} &quot;ត្រូវបានបិទ
+apps/erpnext/erpnext/controllers/accounts_controller.py +231,{0} '{1}' is disabled,{0} &#39;{1} &quot;ត្រូវបានបិទ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ដែលបានកំណត់ជាបើកទូលាយ
 DocType: Cheque Print Template,Scanned Cheque,មូលប្បទានប័ត្រដែលបានស្កេន
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,ផ្ញើអ៊ីម៉ែលដោយស្វ័យប្រវត្តិទៅទំនាក់ទំនងនៅលើដាក់ស្នើប្រតិបត្តិការ។
+DocType: Timesheet,Total Billable Amount,ចំនួនទឹកប្រាក់អាចចេញវិក្កយបត្រសរុប
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,ធាតុ 3
 DocType: Purchase Order,Customer Contact Email,ទំនាក់ទំនងអតិថិជនអ៊ីម៉ែល
 DocType: Warranty Claim,Item and Warranty Details,លម្អិតអំពីធាតុនិងការធានា
 DocType: Sales Team,Contribution (%),ចំែណក (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,ចំណាំ: ការទូទាត់នឹងមិនចូលត្រូវបានបង្កើតតាំងពីសាច់ប្រាក់ឬគណនីធនាគារ &#39;មិនត្រូវបានបញ្ជាក់
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Responsibilities,ការទទួលខុសត្រូវ
+apps/erpnext/erpnext/controllers/accounts_controller.py +78,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,ការទទួលខុសត្រូវ
 DocType: Expense Claim Account,Expense Claim Account,គណនីបណ្តឹងទាមទារការចំណាយ
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,ទំព័រគំរូ
 DocType: Sales Person,Sales Person Name,ការលក់ឈ្មោះបុគ្គល
@@ -2873,6 +2911,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,បន្ថែមអ្នកប្រើ
 DocType: Pricing Rule,Item Group,ធាតុគ្រុប
 DocType: Item,Safety Stock,ហ៊ុនសុវត្ថិភាព
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,កូដធាតុ&gt; ធាតុគ្រុប&gt; ម៉ាក
 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),ពន្ធនិងការចោទប្រកាន់បន្ថែម (ក្រុមហ៊ុនរូបិយវត្ថុ)
@@ -2882,7 +2921,6 @@
 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: Timesheet,Total Hours,ម៉ោងសរុប
 DocType: Journal Entry,Printing Settings,ការកំណត់បោះពុម្ព
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Total Debit must be equal to Total Credit. The difference is {0},ឥណពន្ធសរុបត្រូវតែស្មើនឹងឥណទានសរុប។ ភាពខុសគ្នានេះគឺ {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,រថយន្ដ
@@ -2895,13 +2933,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,ធនាគារវិនិយោគ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +71,Cash or Bank Account is mandatory for making payment entry,គណនីសាច់ប្រាក់ឬធនាគារជាការចាំបាច់សម្រាប់ការធ្វើឱ្យធាតុដែលបានទូទាត់ប្រាក់
 DocType: Purchase Invoice,Price List Exchange Rate,តារាងតម្លៃអត្រាប្តូរប្រាក់
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,អតិថិជន&gt; ក្រុមផ្ទាល់ខ្លួន&gt; ដែនដី
 DocType: Purchase Invoice Item,Rate,អត្រាការប្រាក់
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Intern,ហាត់ការ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,ហាត់ការ
 DocType: Stock Entry,From BOM,ចាប់ពី Bom
 DocType: Assessment,Assessment Code,ក្រមការវាយតំលៃ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +32,Basic,ជាមូលដ្ឋាន
+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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',សូមចុចលើ &#39;បង្កើតកាលវិភាគ &quot;
+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 +95,Reference No is mandatory if you entered Reference Date,សេចក្តីយោងមិនមានជាការចាំបាច់បំផុតប្រសិនបើអ្នកបានបញ្ចូលសេចក្តីយោងកាលបរិច្ឆេទ
@@ -2910,11 +2949,11 @@
 DocType: Salary Slip,Salary Structure,រចនាសម្ព័ន្ធប្រាក់បៀវត្ស
 DocType: Account,Bank,ធនាគារ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,ក្រុមហ៊ុនអាកាសចរណ៍
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +752,Issue Material,សម្ភារៈបញ្ហា
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +723,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 +683,You are in offline mode. You will not be able to reload until you have network.,អ្នកគឺជាអ្នកនៅក្នុងរបៀបក្រៅបណ្ដាញ។ អ្នកនឹងមិនអាចផ្ទុកឡើងវិញរហូតដល់អ្នកមានបណ្តាញ។
+apps/erpnext/erpnext/accounts/page/pos/pos.js +665,You are in offline mode. You will not be able to reload until you have network.,អ្នកគឺជាអ្នកនៅក្នុងរបៀបក្រៅបណ្ដាញ។ អ្នកនឹងមិនអាចផ្ទុកឡើងវិញរហូតដល់អ្នកមានបណ្តាញ។
 DocType: Hub Settings,Access Token,ការចូលដំណើរការ Token
 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,សៀរៀលគ្មាន
@@ -2922,33 +2961,35 @@
 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 +1122,Enter value must be positive,បញ្ចូលតម្លៃត្រូវតែវិជ្ជមាន
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,All Territories,ទឹកដីទាំងអស់
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1125,Enter value must be positive,បញ្ចូលតម្លៃត្រូវតែវិជ្ជមាន
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,ទឹកដីទាំងអស់
 DocType: Purchase Invoice,Items,ធាតុ
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +23,Student is already enrolled.,និស្សិតត្រូវបានចុះឈ្មោះរួចហើយ។
 DocType: Fiscal Year,Year Name,ឈ្មោះចូលឆ្នាំ
 DocType: Process Payroll,Process Payroll,បើកប្រាក់បៀវត្សដំណើរការ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,មានថ្ងៃឈប់សម្រាកច្រើនជាងថ្ងៃធ្វើការខែនេះ។
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +233,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 +96,Request for Quotations,សំណើរពីតំលៃ
+apps/erpnext/erpnext/hooks.py +104,Request for Quotations,សំណើរពីតំលៃ
 DocType: Payment Reconciliation,Maximum Invoice Amount,ចំនួនវិក័យប័ត្រអតិបរមា
 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 +628,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',អង្គភាពលំនាំដើមនៃវិធានការសម្រាប់វ៉ារ្យង់ &#39;{0} &quot;ត្រូវតែមានដូចគ្នានៅក្នុងទំព័រគំរូ&#39; {1} &#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',អង្គភាពលំនាំដើមនៃវិធានការសម្រាប់វ៉ារ្យង់ &#39;{0} &quot;ត្រូវតែមានដូចគ្នានៅក្នុងទំព័រគំរូ&#39; {1} &#39;
 DocType: Shipping Rule,Calculate Based On,គណនាមូលដ្ឋាននៅលើ
 DocType: Delivery Note Item,From Warehouse,ចាប់ពីឃ្លាំង
 DocType: Assessment,Supervisor Name,ឈ្មោះអ្នកគ្រប់គ្រង
+DocType: Assessment,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,អ្នកប្រើប្រាស់ទិញ
 DocType: Notification Control,Customize the Notification,ប្ដូរតាមសេចក្តីជូនដំណឹងនេះ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Cash Flow from Operations,លំហូរសាច់ប្រាក់ពីការប្រតិបត្ដិការ
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,អាសយដ្ឋានលំនាំដើមទំព័រគំរូមិនអាចត្រូវបានលុប
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,អាសយដ្ឋានលំនាំដើមទំព័រគំរូមិនអាចត្រូវបានលុប
 DocType: Sales Invoice,Shipping Rule,វិធានការដឹកជញ្ជូន
 DocType: Manufacturer,Limited to 12 characters,កំណត់ទៅជា 12 តួអក្សរ
 DocType: Journal Entry,Print Heading,បោះពុម្ពក្បាល
@@ -2963,8 +3004,8 @@
 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/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,ទាំង qty គោលដៅឬចំនួនគោលដៅគឺជាចាំបាច់
-apps/erpnext/erpnext/stock/get_item_details.py +485,No default BOM exists for Item {0},គ្មាន Bom លំនាំដើមសម្រាប់ធាតុមាន {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +336,Please select Posting Date first,សូមជ្រើសរើសកាលបរិច្ឆេទដំបូងគេបង្អស់
+apps/erpnext/erpnext/stock/get_item_details.py +486,No default BOM exists for Item {0},គ្មាន Bom លំនាំដើមសម្រាប់ធាតុមាន {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +326,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,មជ្ឈមណ្ឌលប្រាក់ដែលមានស្រាប់ការចំណាយដែលមិនអាចត្រូវបានបម្លែងទៅជាសៀវភៅ
@@ -2980,6 +3021,7 @@
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,វិកិយប័ត្រទូទាត់ប្រកួតជាមួយ
 DocType: Journal Entry,Bank Entry,ចូលធនាគារ
 DocType: Authorization Rule,Applicable To (Designation),ដែលអាចអនុវត្តទៅ (រចនា)
+,Profitability Analysis,វិភាគប្រាក់ចំណេញ
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,បញ្ចូលទៅក្នុងរទេះ
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,ក្រុមតាម
 DocType: Guardian,Interests,ចំណាប់អារម្មណ៍
@@ -2992,21 +3034,21 @@
 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 +141,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",ធាតុសៀរៀល {0} មិនអាចត្រូវបានធ្វើឱ្យទាន់សម័យ \ ប្រើប្រាស់ហ៊ុនផ្សះផ្សា
 DocType: Scheduling Tool,Day,ថ្ងៃ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,គ្មានស៊េរីថ្មីនេះមិនអាចមានឃ្លាំង។ ឃ្លាំងត្រូវតែត្រូវបានកំណត់ដោយបង្កាន់ដៃហ៊ុនទិញចូលឬ
 DocType: Lead,Lead Type,ការនាំមុខប្រភេទ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,You are not authorized to approve leaves on Block Dates,អ្នកមិនត្រូវបានអនុញ្ញាតឱ្យអនុម័តស្លឹកនៅលើកាលបរិច្ឆេទប្លុក
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,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,លំនាំដើមសម្ភារៈប្រភេទសំណើ
-DocType: Student Applicant,AP.,AP ។
 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 +639,Point of Sale,ចំណុចនៃការលក់
+apps/erpnext/erpnext/accounts/page/pos/pos.js +634,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,ការបង់ពន្ធ
 DocType: Production Planning Tool,Production Planning Tool,ឧបករណ៍ផែនការផលិតកម្ម
@@ -3015,74 +3057,77 @@
 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 +373,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 Entry,Update Rate and Availability,អត្រាធ្វើឱ្យទាន់សម័យនិងអាចរកបាន
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,ចំនួនភាគរយដែលអ្នកត្រូវបានអនុញ្ញាតឱ្យទទួលបានច្រើនជាងការប្រឆាំងនឹងឬផ្តល់នូវបរិមាណបញ្ជាឱ្យ។ ឧទាហរណ៍: ប្រសិនបើអ្នកបានបញ្ជាឱ្យបាន 100 គ្រឿង។ និងអនុញ្ញាតឱ្យរបស់អ្នកគឺ 10% បន្ទាប់មកលោកអ្នកត្រូវបានអនុញ្ញាតឱ្យទទួលបាន 110 គ្រឿង។
 DocType: POS Profile,Customer Group,ក្រុមផ្ទាល់ខ្លួន
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,Expense account is mandatory for item {0},គណនីក្នុងការចំណាយជាការចាំបាច់សម្រាប់ធាតុ {0}
 DocType: Item,Website Description,វេបសាយការពិពណ៌នាសង្ខេប
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date must be on or after today,រំលស់បន្ទាប់កាលបរិច្ឆេទត្រូវតែមាននៅលើឬបន្ទាប់ពីថ្ងៃនេះ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,ការផ្លាស់ប្តូរសុទ្ធនៅសមភាព
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +145,Please cancel Purchase Invoice {0} first,សូមបោះបង់ការទិញវិក័យប័ត្រ {0} ដំបូង
 DocType: Serial No,AMC Expiry Date,កាលបរិច្ឆេទ AMC ផុតកំណត់
 ,Sales Register,ការលក់ចុះឈ្មោះ
 DocType: Quotation,Quotation Lost Reason,សម្រង់បាត់បង់មូលហេតុ
+apps/erpnext/erpnext/utilities/doctype/address/address.py +164,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,រកមិនឃើញអាសយដ្ឋានលំនាំដើមពុម្ព។ សូមបង្កើតថ្មីមួយពីការដំឡើង&gt; បោះពុម្ពនិងម៉ាក&gt; អាស័យពុម្ព។
 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 +330,Transaction reference no {0} dated {1},សេចក្ដីយោងប្រតិបត្តិការមិនមាន {0} {1} ចុះកាលបរិច្ឆេទ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Transaction reference no {0} dated {1},សេចក្ដីយោងប្រតិបត្តិការមិនមាន {0} {1} ចុះកាលបរិច្ឆេទ
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,មិនមានអ្វីដើម្បីកែសម្រួលទេ។
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,Summary for this month and pending activities,សង្ខេបសម្រាប់ខែនេះនិងសកម្មភាពដែលមិនទាន់សម្រេច
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,សង្ខេបសម្រាប់ខែនេះនិងសកម្មភាពដែលមិនទាន់សម្រេច
 DocType: Customer Group,Customer Group Name,ឈ្មោះក្រុមអតិថិជន
 apps/erpnext/erpnext/public/js/financial_statements.js +54,Cash Flow Statement,សេចក្តីថ្លែងការណ៍លំហូរសាច់ប្រាក់
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Please remove this Invoice {0} from C-Form {1},សូមយកវិក័យប័ត្រនេះ {0} ពី C-សំណុំបែបបទ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Please remove this Invoice {0} from C-Form {1},សូមយកវិក័យប័ត្រនេះ {0} ពី C-សំណុំបែបបទ {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,សូមជ្រើសយកការទៅមុខផងដែរប្រសិនបើអ្នកចង់រួមបញ្ចូលតុល្យភាពឆ្នាំមុនសារពើពន្ធរបស់ទុកនឹងឆ្នាំសារពើពន្ធនេះ
 DocType: GL Entry,Against Voucher Type,ប្រឆាំងនឹងប្រភេទប័ណ្ណ
 DocType: Item,Attributes,គុណលក្ខណៈ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +644,Get Items,ទទួលបានធាតុ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +623,Get Items,ទទួលបានធាតុ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +210,Please enter Write Off Account,សូមបញ្ចូលបិទសរសេរគណនី
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,លំដាប់ចុងក្រោយកាលបរិច្ឆេទ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +41,Account {0} does not belongs to company {1},គណនី {0} មិនជាកម្មសិទ្ធិរបស់ក្រុមហ៊ុន {1}
+DocType: Student,Guardian Details,កាសែត Guardian លំអិត
 DocType: C-Form,C-Form,C-សំណុំបែបបទ
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,លោក Mark វត្តមានសម្រាប់បុគ្គលិកច្រើន
 DocType: Payment Request,Initiated,ផ្តួចផ្តើម
 DocType: Production Order,Planned Start Date,ដែលបានគ្រោងទុកកាលបរិច្ឆេទចាប់ផ្តើម
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,Customer is required against Receivable account {0},អតិថិជនគឺត្រូវបានទាមទារឱ្យមានការប្រឆាំងនឹងគណនីអ្នកទទួល {0}
 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 +265,Project-wise data is not available for Quotation,ទិន្នន័យគម្រោងប្រាជ្ញាគឺមិនអាចប្រើបានសម្រាប់សម្រង់
+apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,ទិន្នន័យគម្រោងប្រាជ្ញាគឺមិនអាចប្រើបានសម្រាប់សម្រង់
 DocType: Project,Expected End Date,គេរំពឹងថានឹងកាលបរិច្ឆេទបញ្ចប់
 DocType: Budget Account,Budget Amount,ថវិកាចំនួន
 DocType: Appraisal Template,Appraisal Template Title,ការវាយតម្លៃទំព័រគំរូចំណងជើង
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,Commercial,ពាណិជ្ជ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,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 +648,Row {0}# Account must be of type 'Fixed Asset',ជួរដេក {0} # គណនីត្រូវតែមានប្រភេទ &quot;ទ្រព្យ&quot;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,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 +30,Series is mandatory,កម្រងឯកសារចាំបាច់
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +50,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}
 DocType: Leave Allocation,Unused leaves,ស្លឹកមិនប្រើ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Cr,CR
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Cr,CR
 DocType: Tax Rule,Billing State,រដ្ឋវិក័យប័ត្រ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +250,Transfer,សេវាផ្ទេរប្រាក់
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +187,{0} {1} does not associated with Party Account {2},{0} {1} មិនបានភ្ជាប់ជាមួយគណនីរបស់គណបក្ស {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,Fetch exploded BOM (including sub-assemblies),យក Bom ផ្ទុះ (រួមបញ្ចូលទាំងសភាអនុ)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +254,Transfer,សេវាផ្ទេរប្រាក់
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +190,{0} {1} does not associated with Party Account {2},{0} {1} មិនបានភ្ជាប់ជាមួយគណនីរបស់គណបក្ស {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +796,Fetch exploded BOM (including sub-assemblies),យក Bom ផ្ទុះ (រួមបញ្ចូលទាំងសភាអនុ)
 DocType: Authorization Rule,Applicable To (Employee),ដែលអាចអនុវត្តទៅ (បុគ្គលិក)
-apps/erpnext/erpnext/controllers/accounts_controller.py +115,Due Date is mandatory,កាលបរិច្ឆេទដល់កំណត់គឺជាចាំបាច់
+apps/erpnext/erpnext/controllers/accounts_controller.py +118,Due Date is mandatory,កាលបរិច្ឆេទដល់កំណត់គឺជាចាំបាច់
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,ចំនួនបន្ថែមសម្រាប់គុណលក្ខណៈ {0} មិនអាចជា 0
 DocType: Journal Entry,Pay To / Recd From,ចំណាយប្រាក់ដើម្បី / Recd ពី
 DocType: Naming Series,Setup Series,ការរៀបចំស៊េរី
 DocType: Payment Reconciliation,To Invoice Date,ដើម្បី invoice កាលបរិច្ឆេទ
 DocType: Supplier,Contact HTML,ការទំនាក់ទំនងរបស់ HTML
 ,Inactive Customers,អតិថិជនអសកម្ម
+DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,បង្កាន់ដៃទិញ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,តើធ្វើដូចម្តេចតម្លៃវិធានត្រូវបានអនុវត្ត?
 DocType: Quality Inspection,Delivery Note No,ដឹកជញ្ជូនចំណាំគ្មាន
@@ -3091,7 +3136,7 @@
 DocType: Company,Retail,ការលក់រាយ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +120,Customer {0} does not exist,អតិថិជន {0} មិនមាន
 DocType: Attendance,Absent,អវត្តមាន
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +587,Product Bundle,កញ្ចប់ផលិតផល
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Product Bundle,កញ្ចប់ផលិតផល
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Invalid reference {1},ជួរដេក {0}: សេចក្ដីយោងមិនត្រឹមត្រូវ {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,ទិញពន្ធនិងការចោទប្រកាន់ពីទំព័រគំរូ
 DocType: Upload Attendance,Download Template,ទំព័រគំរូទាញយក
@@ -3101,8 +3146,8 @@
 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 +742,Send Supplier Emails,ផ្ញើអ៊ីម៉ែលផ្គត់ផ្គង់
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +104,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","ប្រាក់បៀវត្សដែលបានដំណើរការរួចទៅហើយសម្រាប់សម័យនេះរវាង {0} និង {1}, ទុកឱ្យរយៈពេលកម្មវិធីមិនអាចមានរវាងជួរកាលបរិច្ឆេទនេះ។"
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +708,Send Supplier Emails,ផ្ញើអ៊ីម៉ែលផ្គត់ផ្គង់
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,"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,កាសែត The Guardian ការប្រាក់
 DocType: Timesheet,Employee Detail,បុគ្គលិកលំអិត
@@ -3113,9 +3158,9 @@
 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/accounts/doctype/gl_entry/gl_entry.py +77,Account {0} cannot be a Group,គណនី {0} មិនអាចជាក្រុមមួយ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} cannot be a Group,គណនី {0} មិនអាចជាក្រុមមួយ
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +31,Optional. This setting will be used to filter in various transactions.,ស្រេចចិត្ត។ ការកំណត់នេះនឹងត្រូវបានប្រើដើម្បីត្រងនៅក្នុងប្រតិបត្តិការនានា។
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +107,Negative Valuation Rate is not allowed,អត្រាវាយតម្លៃអវិជ្ជមានមិនត្រូវបានអនុញ្ញាត
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,អត្រាវាយតម្លៃអវិជ្ជមានមិនត្រូវបានអនុញ្ញាត
 DocType: Holiday List,Weekly Off,បិទប្រចាំសប្តាហ៍
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","ឧទាហរណ៍ៈឆ្នាំ 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +39,Provisional Profit / Loss (Credit),ប្រាក់ចំនេញជាបណ្តោះអាសន្ន / បាត់បង់ (ឥណទាន)
@@ -3129,16 +3174,16 @@
 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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: មជ្ឈមណ្ឌលចំណាយគឺជាការចាំបាច់សម្រាប់ធាតុ {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +626,Get Items from Product Bundle,ទទួលបានធាតុពីកញ្ចប់ផលិតផល
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +605,Get Items from Product Bundle,ទទួលបានធាតុពីកញ្ចប់ផលិតផល
 DocType: Asset,Straight Line,បន្ទាត់ត្រង់
 DocType: Project User,Project User,អ្នកប្រើប្រាស់គម្រោង
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} is inactive,គណនី {0} អសកម្ម
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} is inactive,គណនី {0} អសកម្ម
 DocType: GL Entry,Is Advance,តើការជាមុន
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,ការចូលរួមពីកាលបរិច្ឆេទនិងចូលរួមកាលបរិច្ឆេទគឺជាចាំបាច់
 apps/erpnext/erpnext/controllers/buying_controller.py +148,Please enter 'Is Subcontracted' as Yes or No,សូមបញ្ចូល &lt;តើកិច្ចសន្យាបន្ដ &#39;ជាបាទឬទេ
 DocType: Sales Team,Contact No.,លេខទំនាក់ទំនងទៅ
 DocType: Bank Reconciliation,Payment Entries,ធាតុការទូទាត់
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,'Profit and Loss' type account {0} not allowed in Opening Entry,&quot;ប្រាក់ចំណេញនិងការបាត់បង់ &#39;គណនីប្រភេទ {0} មិនត្រូវបានអនុញ្ញាតក្នុងការបើកចូល
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +71,'Profit and Loss' type account {0} not allowed in Opening Entry,&quot;ប្រាក់ចំណេញនិងការបាត់បង់ &#39;គណនីប្រភេទ {0} មិនត្រូវបានអនុញ្ញាតក្នុងការបើកចូល
 DocType: Program Enrollment Tool,Get Students From,ទទួលយកសិស្សពី
 DocType: Hub Settings,Seller Country,អ្នកលក់ប្រទេស
 apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,បោះពុម្ពផ្សាយធាតុលើវេបសាយ
@@ -3157,7 +3202,7 @@
 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 +558,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","ជួរដេក # {0}: ទ្រព្យសកម្ម {1} មិនអាចត្រូវបានដាក់ស្នើ, វារួចទៅហើយ {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +561,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","ជួរដេក # {0}: ទ្រព្យសកម្ម {1} មិនអាចត្រូវបានដាក់ស្នើ, វារួចទៅហើយ {2}"
 DocType: Tax Rule,Billing Country,វិក័យប័ត្រប្រទេស
 DocType: Production Order,Expected Delivery Date,គេរំពឹងថាការដឹកជញ្ជូនកាលបរិច្ឆេទ
 apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,ឥណពន្ធនិងឥណទានមិនស្មើគ្នាសម្រាប់ {0} # {1} ។ ភាពខុសគ្នាគឺ {2} ។
@@ -3170,13 +3215,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +202,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: Sales Order,% Amount Billed,% ចំនួន billed
+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.,ធីកប្រអប់នេះប្រសិនបើអ្នកចង់បង្ខំឱ្យអ្នកប្រើជ្រើសស៊េរីមុនពេលរក្សាទុក។ វានឹងជាលំនាំដើមប្រសិនបើអ្នកធីកនេះ។
 apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},គ្មានធាតុជាមួយសៀរៀលគ្មាន {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,ការជូនដំណឹងបើកទូលាយ
+DocType: Email Digest,Open Notifications,ការជូនដំណឹងបើកទូលាយ
 DocType: Payment Entry,Difference Amount (Company Currency),ចំនួនទឹកប្រាក់ផ្សេងគ្នា (ក្រុមហ៊ុនរូបិយប័ណ្ណ)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,ការចំណាយដោយផ្ទាល់
 apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
@@ -3184,7 +3229,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,ប្រាក់ចំណូលអតិថិជនថ្មី
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,ការចំណាយការធ្វើដំណើរ
 DocType: Maintenance Visit,Breakdown,ការវិភាគ
-apps/erpnext/erpnext/controllers/accounts_controller.py +634,Account: {0} with currency: {1} can not be selected,គណនី: {0} ដែលមានរូបិយប័ណ្ណ: {1} មិនអាចត្រូវបានជ្រើស &amp; ‧;
+apps/erpnext/erpnext/controllers/accounts_controller.py +637,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}
 DocType: Program Enrollment Tool,Student Applicants,បេក្ខជនសិស្ស
@@ -3192,15 +3237,15 @@
 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 +56,Probation,ការសាកល្បង
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Probation,ការសាកល្បង
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,សមាសភាគប្រាក់ខែ
 DocType: Program Enrollment Tool,New Academic Year,ឆ្នាំសិក្សាថ្មី
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Payment of salary for the month {0} and year {1},ការទូទាត់នៃប្រាក់ខែសម្រាប់ខែនេះ {0} និងឆ្នាំ {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Payment of salary for the month {0} and year {1},ការទូទាត់នៃប្រាក់ខែសម្រាប់ខែនេះ {0} និងឆ្នាំ {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,បញ្ចូលដោយស្វ័យប្រវត្តិប្រសិនបើអ្នកមានអត្រាតារាងតម្លៃបាត់ខ្លួន
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,ចំនួនទឹកប្រាក់ដែលបង់សរុប
 DocType: Production Order Item,Transferred Qty,ផ្ទេរ Qty
 apps/erpnext/erpnext/config/learn.py +11,Navigating,ការរុករក
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Planning,ការធ្វើផែនការ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,ការធ្វើផែនការ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,ចេញផ្សាយ
 DocType: Project,Total Billing Amount (via Time Logs),ចំនួនវិក័យប័ត្រសរុប (តាមរយៈការពេលវេលាកំណត់ហេតុ)
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,We sell this Item,យើងលក់ធាតុនេះ
@@ -3213,11 +3258,10 @@
 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.,ផ្ញើរបាយការណ៍សេចក្ដីសង្ខេបជាទៀងទាត់តាមរយៈអ៊ីម៉ែល។
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Sales invoice submitted sucessfully.,វិក័យប័ត្រការលក់បានដាក់ស្នើដោយជោគជ័យ។
 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}
 DocType: Assessment Result,Student Name,ឈ្មោះរបស់និស្សិត
-apps/erpnext/erpnext/hooks.py +104,Assessment Schedule,កាលវិភាគការវាយតំលៃ
+apps/erpnext/erpnext/hooks.py +113,Assessment Schedule,កាលវិភាគការវាយតំលៃ
 DocType: Brand,Item Manager,កម្មវិធីគ្រប់គ្រងធាតុ
 DocType: Buying Settings,Default Supplier Type,ប្រភេទហាងទំនិញលំនាំដើម
 DocType: Production Order,Total Operating Cost,ថ្លៃប្រតិបត្តិការ
@@ -3227,6 +3271,7 @@
 DocType: GL Entry,Party Type,ប្រភេទគណបក្ស
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +78,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,អតិបរមាដែលបានអនុញ្ញាតទុកថ្ងៃ
@@ -3238,18 +3283,19 @@
 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 +99,All Customer Groups,ក្រុមអតិថិជនទាំងអស់
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +78,Accumulated Monthly,បង្គរប្រចាំខែ
-apps/erpnext/erpnext/controllers/accounts_controller.py +595,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} គឺជាចាំបាច់។ ប្រហែលជាកំណត់ត្រាប្តូររូបិយប័ណ្ណមិនត្រូវបានបង្កើតឡើងសម្រាប់ {1} ទៅ {2} ។
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,ក្រុមអតិថិជនទាំងអស់
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +81,Accumulated Monthly,បង្គរប្រចាំខែ
+apps/erpnext/erpnext/controllers/accounts_controller.py +598,{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} មិនមាន
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),បញ្ជីតម្លៃដែលអត្រា (ក្រុមហ៊ុនរូបិយវត្ថុ)
 DocType: Products Settings,Products Settings,ការកំណត់ផលិតផល
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +188,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,សូមកំណត់ការដាក់ឈ្មោះកម្រងឯកសារ {0} តាមរយៈការដំឡើង&gt; ករកំណត់&gt; ដាក់ឈ្មោះកម្រងឯកសារ
 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 +84,Secretary,លេខាធិការ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,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,ការទិញ
@@ -3258,24 +3304,22 @@
 ,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,ឈ្មោះការវាយតំលៃ
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,ជួរដេក # {0}: មិនស៊េរីគឺជាការចាំបាច់
+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 +859,Supplier Quotation,សម្រង់ក្រុមហ៊ុនផ្គត់ផ្គង់
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +838,Supplier Quotation,សម្រង់ក្រុមហ៊ុនផ្គត់ផ្គង់
 DocType: Quotation,In Words will be visible once you save the Quotation.,នៅក្នុងពាក្យនោះនឹងត្រូវបានមើលឃើញនៅពេលដែលអ្នករក្សាទុកការសម្រង់នេះ។
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +7,Collect Fees,ប្រមូលថ្លៃ
+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}
 DocType: Lead,Add to calendar on this date,បញ្ចូលទៅក្នុងប្រតិទិនស្តីពីកាលបរិច្ឆេទនេះ
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,ក្បួនសម្រាប់ការបន្ថែមការចំណាយលើការដឹកជញ្ជូន។
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,ព្រឹត្តិការណ៍ជិតមកដល់
 DocType: Item,Opening Stock,ការបើកផ្សារហ៊ុន
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,អតិថិជនគឺត្រូវបានទាមទារ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} គឺជាការចាំបាច់សម្រាប់ការត្រឡប់
 DocType: Purchase Order,To Receive,ដើម្បីទទួលបាន
 apps/erpnext/erpnext/public/js/setup_wizard.js +195,user@example.com,user@example.com
-DocType: Email Digest,Income / Expense,ប្រាក់ចំណូល / ចំណាយ
 DocType: Employee,Personal Email,អ៊ីម៉ែលផ្ទាល់ខ្លួន
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,អថេរចំនួនសរុប
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.",បើអនុញ្ញាតប្រព័ន្ធនេះនឹងផ្តល់ការបញ្ចូលគណនីសម្រាប់ការដោយស្វ័យប្រវត្តិ។
@@ -3286,13 +3330,14 @@
 DocType: Customer,From Lead,បានមកពីអ្នកដឹកនាំ
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,ការបញ្ជាទិញដែលបានចេញផ្សាយសម្រាប់ការផលិត។
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,ជ្រើសឆ្នាំសារពើពន្ធ ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,POS Profile required to make POS Entry,ម៉ាស៊ីនឆូតកាតពត៌មានផ្ទាល់ខ្លួនត្រូវបានទាមទារដើម្បីធ្វើឱ្យធាតុរបស់ម៉ាស៊ីនឆូតកាត
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +509,POS Profile required to make POS Entry,ម៉ាស៊ីនឆូតកាតពត៌មានផ្ទាល់ខ្លួនត្រូវបានទាមទារដើម្បីធ្វើឱ្យធាតុរបស់ម៉ាស៊ីនឆូតកាត
 DocType: Program Enrollment Tool,Enroll Students,ចុះឈ្មោះសិស្ស
 DocType: Hub Settings,Name Token,ឈ្មោះនិមិត្តសញ្ញា
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,ស្តង់ដាលក់
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Atleast one warehouse is mandatory,យ៉ាងហោចណាស់មានម្នាក់ឃ្លាំងគឺជាចាំបាច់
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +129,Atleast one warehouse is mandatory,យ៉ាងហោចណាស់មានម្នាក់ឃ្លាំងគឺជាចាំបាច់
 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 +330,{0} against Sales Invoice {1},{0} ប្រឆាំងនឹងការលក់វិក័យប័ត្រ {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,ឈ្មោះគម្រោង
@@ -3313,10 +3358,11 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"ស្លឹកត្រូវតែត្រូវបានបម្រុងទុកនៅក្នុង 0,5 ច្រើន"
 DocType: Production Order,Operation Cost,ប្រតិបត្ដិការចំណាយ
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,ការចូលរួមពីឯកសារដែលបានផ្ទុកឡើង .csv មួយ
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,ឆ្នើម AMT
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,ធាតុសំណុំក្រុមគោលដៅប្រាជ្ញាសម្រាប់ការនេះការលក់បុគ្គល។
 DocType: Stock Settings,Freeze Stocks Older Than [Days],ភាគហ៊ុនបង្កកចាស់ជាង [ថ្ងៃ]
-apps/erpnext/erpnext/controllers/accounts_controller.py +528,Row #{0}: Asset is mandatory for fixed asset purchase/sale,ជួរដេក # {0}: ទ្រព្យសកម្មគឺជាការចាំបាច់សម្រាប់ទ្រព្យសកម្មថេរទិញ / លក់
+apps/erpnext/erpnext/controllers/accounts_controller.py +531,Row #{0}: Asset is mandatory for fixed asset purchase/sale,ជួរដេក # {0}: ទ្រព្យសកម្មគឺជាការចាំបាច់សម្រាប់ទ្រព្យសកម្មថេរទិញ / លក់
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.",បើសិនជាវិធានតម្លៃពីរឬច្រើនត្រូវបានរកឃើញដោយផ្អែកលើលក្ខខណ្ឌខាងលើអាទិភាពត្រូវបានអនុវត្ត។ អាទិភាពគឺជាលេខរវាង 0 ទៅ 20 ខណៈពេលតម្លៃលំនាំដើមគឺសូន្យ (ទទេ) ។ ចំនួនខ្ពស់មានន័យថាវានឹងយកអាទិភាពប្រសិនបើមិនមានវិធានតម្លៃច្រើនដែលមានស្ថានភាពដូចគ្នា។
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,ឆ្នាំសារពើពន្ធ: {0} មិនមាន
 DocType: Currency Exchange,To Currency,ដើម្បីរូបិយប័ណ្ណ
@@ -3333,15 +3379,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,សមធម៌ឯកជន
 DocType: Maintenance Visit,Customer Feedback,ការឆ្លើយតបរបស់អតិថិជន
 DocType: Account,Expense,ការចំណាយ
-DocType: Sales Invoice,Exhibition,ការតាំងពិព័រណ៍
 apps/erpnext/erpnext/utilities/doctype/address/address.py +77,"Company is mandatory, as it is your company address","ក្រុមហ៊ុនចាំបាច់, ដូចដែលវាគឺជាអាសយដ្ឋានក្រុមហ៊ុនរបស់អ្នក"
 DocType: Item Attribute,From Range,ពីជួរ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +81,Syntax error in formula or condition: {0},កំហុសវាក្យសម្ព័ន្ធនៅក្នុងរូបមន្តឬស្ថានភាព: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +92,Syntax error in formula or condition: {0},កំហុសវាក្យសម្ព័ន្ធនៅក្នុងរូបមន្តឬស្ថានភាព: {0}
 apps/erpnext/erpnext/stock/utils.py +99,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 +28,Jobs,លោក Steve Jobs
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,លោក Steve Jobs
 ,Sales Order Trends,ការលក់លំដាប់និន្នាការ
 DocType: Employee,Held On,ប្រារព្ធឡើងនៅថ្ងៃទី
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,ផលិតកម្មធាតុ
@@ -3350,16 +3396,16 @@
 DocType: Stock Entry Detail,Additional Cost,ការចំណាយបន្ថែមទៀត
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,កាលបរិច្ឆេទឆ្នាំហិរញ្ញវត្ថុបញ្ចប់
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher",មិនអាចត្រងដោយផ្អែកលើប័ណ្ណគ្មានប្រសិនបើដាក់ជាក្រុមតាមប័ណ្ណ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +763,Make Supplier Quotation,ធ្វើឱ្យសម្រង់ផ្គត់ផ្គង់
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,Make Supplier Quotation,ធ្វើឱ្យសម្រង់ផ្គត់ផ្គង់
 DocType: Quality Inspection,Incoming,មកដល់
 DocType: BOM,Materials Required (Exploded),សំភារៈទាមទារ (ផ្ទុះ)
 apps/erpnext/erpnext/public/js/setup_wizard.js +185,"Add users to your organization, other than yourself",បន្ថែមអ្នកប្រើប្រាស់ក្នុងអង្គការរបស់អ្នកក្រៅពីខ្លួនអ្នកផ្ទាល់
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,Row # {0}: Serial No {1} does not match with {2} {3},ជួរដេក # {0}: សៀរៀលគ្មាន {1} មិនផ្គូផ្គងនឹង {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +42,Casual Leave,ចាកចេញធម្មតា
+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,ចាកចេញធម្មតា
 DocType: Batch,Batch ID,លេខសម្គាល់បាច់
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,Note: {0},ចំណាំ: {0}
 ,Delivery Note Trends,និន្នាការដឹកជញ្ជូនចំណាំ
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +103,This Week's Summary,សប្តាហ៍នេះមានសេចក្តីសង្ខេប
+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} អាចត្រូវបានធ្វើឱ្យទាន់សម័យបានតែតាមរយៈប្រតិបត្តិការហ៊ុន
 DocType: Student Group Creation Tool,Get Courses,ទទួលបានវគ្គសិក្សា
 DocType: GL Entry,Party,គណបក្ស
@@ -3369,7 +3415,7 @@
 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 +59,Piecework,ម៉ៅការ
+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: Task,Actual Time (in Hours),ពេលវេលាពិតប្រាកដ (នៅក្នុងម៉ោងធ្វើការ)
 DocType: Employee,History In Company,ប្រវត្តិសាស្រ្តនៅក្នុងក្រុមហ៊ុន
@@ -3386,7 +3432,7 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +350,{0} units of {1} needed in {2} to complete this transaction.,{0} គ្រឿង {1} ត្រូវការជាចាំបាច់ក្នុង {2} ដើម្បីបញ្ចប់ការប្រតិបត្តិការនេះ។
 DocType: SMS Settings,SMS Settings,កំណត់ការផ្ញើសារជាអក្សរ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Temporary Accounts,គណនីបណ្តោះអាសន្ន
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Black,ពណ៌ខ្មៅ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,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} ធាតុផលិត
@@ -3397,13 +3443,13 @@
 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 +69,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,លោក Mark អវត្តមាន
 DocType: Journal Entry Account,Exchange Rate,អត្រាប្តូរប្រាក់
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Sales Order {0} is not submitted,ការលក់លំដាប់ {0} គឺមិនត្រូវបានដាក់ស្នើ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +527,Sales Order {0} is not submitted,ការលក់លំដាប់ {0} គឺមិនត្រូវបានដាក់ស្នើ
 DocType: Homepage,Tag Line,បន្ទាត់ស្លាក
 DocType: Fee Component,Fee Component,សមាសភាគថ្លៃសេវា
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +857,Add items from,បន្ថែមធាតុពី
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +836,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: Cheque Print Template,Regular,ទៀងទាត
 DocType: BOM,Last Purchase Rate,អត្រាទិញចុងក្រោយ
@@ -3411,6 +3457,7 @@
 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} តាំងពីមានវ៉ារ្យ៉ង់
 ,Sales Person-wise Transaction Summary,ការលក់បុគ្គលប្រាជ្ញាសង្ខេបប្រតិបត្តិការ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +60,Cost Center is required for 'Profit and Loss' account {0}. Please set up a default Cost Center for the Company.,មជ្ឈមណ្ឌលការចំណាយគឺត្រូវបានទាមទារសម្រាប់ &#39;ប្រាក់ចំណេញនិងការបាត់បង់&#39; គណនី {0} ។ សូមបង្កើតមជ្ឈមណ្ឌលតម្លៃលំនាំដើមសម្រាប់ក្រុមហ៊ុន។
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,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,ចំនួនភាគរយចែកចាយប្រចាំខែ
@@ -3421,12 +3468,12 @@
 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 +710,Online,លើបណ្តាញ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +692,Online,លើបណ្តាញ
 ,Available Stock for Packing Items,អាចរកបានសម្រាប់វេចខ្ចប់ហ៊ុនរបស់របរ
 DocType: Item Variant,Item Variant,ធាតុវ៉ារ្យង់
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,ការកំណត់អាសយដ្ឋានទំព័រគំរូជាលំនាំដើមនេះដូចជាមិនមានការលំនាំដើមផ្សេងទៀត
+apps/erpnext/erpnext/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'","សមតុល្យគណនីរួចហើយនៅក្នុងឥណពន្ធ, អ្នកមិនត្រូវបានអនុញ្ញាតឱ្យកំណត់ទឹកប្រាក់ត្រូវតែ &quot;ជា&quot; ឥណទាន &quot;"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Quality Management,គ្រប់គ្រងគុណភាព
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,គ្រប់គ្រងគុណភាព
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,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,បុគ្គលិកខាងក្រៅប្រវត្តិការងារ
@@ -3448,11 +3495,12 @@
 DocType: Student,Student Email ID,លេខសម្គាល់អ៊ីមែលរបស់សិស្ស
 DocType: Employee,Notice (days),សេចក្តីជូនដំណឹង (ថ្ងៃ)
 DocType: Tax Rule,Sales Tax Template,ទំព័រគំរូពន្ធលើការលក់
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1520,Select items to save the invoice,ជ្រើសធាតុដើម្បីរក្សាទុកការវិក្ក័យប័ត្រ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1544,Select items to save the invoice,ជ្រើសធាតុដើម្បីរក្សាទុកការវិក្ក័យប័ត្រ
 DocType: Employee,Encashment Date,Encashment កាលបរិច្ឆេទ
 DocType: Account,Stock Adjustment,ការលៃតម្រូវភាគហ៊ុន
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},តម្លៃលំនាំដើមមានសម្រាប់សកម្មភាពប្រភេទសកម្មភាព - {0}
 DocType: Production Order,Planned Operating Cost,ចំណាយប្រតិបត្តិការដែលបានគ្រោងទុក
+DocType: Academic Term,Term Start Date,រយៈពេលចាប់ផ្តើមកាលបរិច្ឆេទ
 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,ឈ្មោះកម្មវិធី
@@ -3482,17 +3530,17 @@
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,គណនីសម្រាប់ឃ្លាំង (សារពើភ័ណ្ឌងូត) នឹងត្រូវបានបង្កើតឡើងក្រោមគណនីនេះ។
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +119,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,ឃ្លាំងមិនអាចលុបធាតុដែលបានចុះក្នុងសៀវភៅភាគហ៊ុនមានសម្រាប់ឃ្លាំងនេះ។
 DocType: Company,Distribution,ចែកចាយ
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +8,Amount Paid,ចំនួនទឹកប្រាក់ដែលបង់
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Project Manager,ប្រធានគ្រប់គ្រងគម្រោង
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,ចំនួនទឹកប្រាក់ដែលបង់
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,ប្រធានគ្រប់គ្រងគម្រោង
 ,Quoted Item Comparison,ធាតុដកស្រង់សម្តីប្រៀបធៀប
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Dispatch,បញ្ជូន
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,បញ្ជូន
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,ការបញ្ចុះតម្លៃអតិបរមាដែលបានអនុញ្ញាតសម្រាប់ធាតុ: {0} គឺ {1}%
 apps/erpnext/erpnext/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.,តួនាទីដែលត្រូវបានអនុញ្ញាតឱ្យដាក់ស្នើតិបត្តិការដែលលើសពីដែនកំណត់ឥណទានបានកំណត់។
-DocType: Sales Invoice,Supplier Reference,យោងក្រុមហ៊ុនផ្គត់ផ្គង់
-apps/erpnext/erpnext/accounts/page/pos/pos.js +844,"Master data syncing, it might take some time","ធ្វើសមកាលកម្មទិន្នន័យអនុបណ្ឌិត, វាអាចចំណាយពេលខ្លះ"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +832,"Master data syncing, it might take some time","ធ្វើសមកាលកម្មទិន្នន័យអនុបណ្ឌិត, វាអាចចំណាយពេលខ្លះ"
 DocType: Item,Material Issue,សម្ភារៈបញ្ហា
 DocType: Hub Settings,Seller Description,អ្នកលក់ការពិពណ៌នាសង្ខេប
 DocType: Employee Education,Qualification,គុណវុឌ្ឍិ
@@ -3506,7 +3554,7 @@
 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 +83,Error in formula or condition,កំហុសនៅក្នុងរូបមន្តឬស្ថានភាព
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,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,ដោះធីកទាំងអស់
@@ -3515,7 +3563,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},ដើម្បីកាលបរិច្ឆេទគួរតែនៅចន្លោះឆ្នាំសារពើពន្ធ។ សន្មត់ថាដើម្បីកាលបរិច្ឆេទ = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","នៅទីនេះអ្នកអាចរក្សាកម្ពស់, ទម្ងន់, អាឡែស៊ី, មានការព្រួយបារម្ភវេជ្ជសាស្រ្តល"
 DocType: Leave Block List,Applies to Company,អនុវត្តទៅក្រុមហ៊ុន
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +197,Cannot cancel because submitted Stock Entry {0} exists,មិនអាចលុបចោលដោយសារតែការដាក់ស្នើផ្សារការធាតុមាន {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +198,Cannot cancel because submitted Stock Entry {0} exists,មិនអាចលុបចោលដោយសារតែការដាក់ស្នើផ្សារការធាតុមាន {0}
 DocType: Purchase Invoice,In Words,នៅក្នុងពាក្យ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,Today is {0}'s birthday!,ថ្ងៃនេះគឺជា {0} &#39;s បានថ្ងៃខួបកំណើត!
 DocType: Production Planning Tool,Material Request For Warehouse,សម្ភារៈស្នើសុំសម្រាប់ឃ្លាំង
@@ -3525,14 +3573,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,កាលពីឆ្នាំហិរញ្ញវត្ថុរបស់អ្នកចាប់ផ្តើមនៅ
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,សមតុលយទ្រព្យសកម្មរំលស់និងការ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +319,Amount {0} {1} transferred from {2} to {3},ចំនួនទឹកប្រាក់ {0} {1} បានផ្ទេរពី {2} ទៅ {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +322,Amount {0} {1} transferred from {2} to {3},ចំនួនទឹកប្រាក់ {0} {1} បានផ្ទេរពី {2} ទៅ {3}
 DocType: Sales Invoice,Get Advances Received,ទទួលបុរេប្រទានបានទទួល
 DocType: Email Digest,Add/Remove Recipients,បន្ថែម / យកអ្នកទទួល
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +432,Transaction not allowed against stopped Production Order {0},ប្រតិបត្តិការមិនត្រូវបានអនុញ្ញាតប្រឆាំងនឹងផលិតកម្មបានឈប់លំដាប់ {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +437,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 +143,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 +652,Item variant {0} exists with same attributes,វ៉ារ្យ៉ង់ធាតុ {0} មានដែលមានគុណលក្ខណៈដូចគ្នា
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,វ៉ារ្យ៉ង់ធាតុ {0} មានដែលមានគុណលក្ខណៈដូចគ្នា
+DocType: Leave Application,LAP/,ភ្លៅ /
 DocType: Salary Slip,Salary 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,&#39;ដើម្បីកាលបរិច្ឆេទ&#39; ត្រូវបានទាមទារ
@@ -3540,12 +3589,12 @@
 DocType: Sales Invoice Item,Sales Order Item,ធាតុលំដាប់ការលក់
 DocType: Salary Slip,Payment Days,ថ្ងៃការទូទាត់
 DocType: Customer,Dormant,អសកម្ម
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +212,Warehouses with child nodes cannot be converted to ledger,ឃ្លាំងជាមួយថ្នាំងជាកូនមិនអាចត្រូវបានបម្លែងទៅសៀវភៅ
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +215,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/public/js/controllers/transaction.js +866,It is needed to fetch Item Details.,វាត្រូវបានគេត្រូវការដើម្បីទៅយកលំអិតធាតុ។
+apps/erpnext/erpnext/public/js/controllers/transaction.js +857,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} គ្មានត្រូវបានទទួលរួចហើយ
@@ -3555,14 +3604,14 @@
 DocType: Expense Claim,Total Claimed Amount,ចំនួនទឹកប្រាក់អះអាងសរុប
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,ឱកាសក្នុងការមានសក្តានុពលសម្រាប់ការលក់។
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,Invalid {0},មិនត្រឹមត្រូវ {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Sick Leave,ស្លឹកឈឺ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,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,ហាងលក់នាយកដ្ឋាន
 DocType: Warehouse,PIN,ម្ជុល
 DocType: Sales Invoice,Base Change Amount (Company Currency),មូលដ្ឋានផ្លាស់ប្តូរចំនួនទឹកប្រាក់ (ក្រុមហ៊ុនរូបិយប័ណ្ណ)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +313,No accounting entries for the following warehouses,គ្មានការបញ្ចូលគណនីសម្រាប់ឃ្លាំងដូចខាងក្រោមនេះ
-apps/erpnext/erpnext/projects/doctype/project/project.js +102,Save the document first.,រក្សាទុកឯកសារជាលើកដំបូង។
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +314,No accounting entries for the following warehouses,គ្មានការបញ្ចូលគណនីសម្រាប់ឃ្លាំងដូចខាងក្រោមនេះ
+apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,រក្សាទុកឯកសារជាលើកដំបូង។
 DocType: Account,Chargeable,បន្ទុក
 DocType: Company,Change Abbreviation,ការផ្លាស់ប្តូរអក្សរកាត់
 DocType: Expense Claim Detail,Expense Date,ការចំណាយកាលបរិច្ឆេទ
@@ -3575,10 +3624,9 @@
 DocType: Purchase Invoice,Recurring Print Format,កើតឡើងទ្រង់ទ្រាយបោះពុម្ព
 DocType: C-Form,Series,កម្រងឯកសារ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,Expected Delivery Date cannot be before Purchase Order Date,គេរំពឹងថាការដឹកជញ្ជូនមិនអាចកាលបរិច្ឆេទត្រូវតែមុនពេលការទិញលំដាប់កាលបរិច្ឆេទ
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,សូមកំណត់ការដាក់ឈ្មោះកម្រងឯកសារ {0} តាមរយៈការដំឡើង&gt; ករកំណត់&gt; ដាក់ឈ្មោះកម្រងឯកសារ
 DocType: Appraisal,Appraisal Template,ការវាយតម្លៃទំព័រគំរូ
 DocType: Item Group,Item Classification,ចំណាត់ថ្នាក់ធាតុ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Business Development Manager,ប្រធានផ្នែកអភិវឌ្ឍន៍ពាណិជ្ជកម្ម
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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,ទូទៅសៀវភៅ
@@ -3588,8 +3636,8 @@
 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 +940,Please select {0} first,សូមជ្រើស {0} ដំបូង
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +749,Batch {0} of Item {1} has expired.,បាច់នៃ {0} {1} ធាតុបានផុតកំណត់។
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +953,Please select {0} first,សូមជ្រើស {0} ដំបូង
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +757,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,សរុបរង
@@ -3606,8 +3654,8 @@
 {% 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 +92,Warehouse not found in the system,រកមិនឃើញឃ្លាំងក្នុងប្រព័ន្ធ
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +106,This Month's Summary,សង្ខេបខែនេះ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,រកមិនឃើញឃ្លាំងក្នុងប្រព័ន្ធ
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,សង្ខេបខែនេះ
 DocType: Quality Inspection Reading,Quality Inspection Reading,កំរោងអានគម្ពីរមានគុណភាពអធិការកិច្ច
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`បង្កកដែលមានវ័យចំណាស់ Than` ភាគហ៊ុនគួរមានទំហំតូចជាងថ្ងៃ% d ។
 DocType: Tax Rule,Purchase Tax Template,ទិញពន្ធលើទំព័រគំរូ
@@ -3617,21 +3665,22 @@
 DocType: Item Customer Detail,Ref Code,យោងលេខកូដ
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,កំណត់ត្រាបុគ្គលិក។
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Please set Next Depreciation Date,សូមកំណត់កាលបរិច្ឆេទបន្ទាប់រំលស់
-DocType: Payment Gateway,Payment Gateway,ការទូទាត់
 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 +378,Operation Time must be greater than 0 for Operation {0},ប្រតិបត្ដិការពេលវេលាត្រូវតែធំជាង 0 សម្រាប់ប្រតិបត្ដិការ {0}
+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/accounts/doctype/account/account.py +170,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 (ម៉ោង)
 DocType: Program,Program Abbreviation,អក្សរកាត់កម្មវិធី
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,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: Appraisal,Start Date,ថ្ងៃចាប់ផ្តើម
@@ -3647,21 +3696,22 @@
 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,យកធាតុប្រសិនបើការចោទប្រកាន់គឺអាចអនុវត្តទៅធាតុដែល
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,ឧទាហរណ៏។ smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +27,Transaction currency must be same as Payment Gateway currency,រូបិយប័ណ្ណប្រតិបត្តិការត្រូវតែមានដូចគ្នាជារូបិយប័ណ្ណទូទាត់
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Transaction currency must be same as Payment Gateway currency,រូបិយប័ណ្ណប្រតិបត្តិការត្រូវតែមានដូចគ្នាជារូបិយប័ណ្ណទូទាត់
 DocType: Payment Entry,Receive,ទទួលបាន
+apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,សម្រង់សម្តី:
 DocType: Maintenance Visit,Fully Completed,បានបញ្ចប់យ៉ាងពេញលេញ
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% ពេញលេញ
 DocType: Employee,Educational Qualification,គុណវុឌ្ឍិអប់រំ
 DocType: Workstation,Operating Costs,ចំណាយប្រតិបត្តិការ
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,ប្រសិនបើអ្នកបានប្រមូលថវិកាសកម្មភាពលើសពីប្រចាំខែ
 DocType: Purchase Invoice,Submit on creation,ដាក់ស្នើលើការបង្កើត
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +432,Currency for {0} must be {1},រូបិយប័ណ្ណសម្រាប់ {0} ត្រូវតែជា {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +435,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 +493,Row {0}: An Reorder entry already exists for this warehouse {1},ជួរដេក {0}: ធាតុរៀបចំមួយរួចហើយសម្រាប់ឃ្លាំងនេះ {1}
+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/crm/doctype/opportunity/opportunity.py +79,"Cannot declare as lost, because Quotation has been made.",មិនអាចប្រកាសបាត់បង់នោះទេព្រោះសម្រង់ត្រូវបានធ្វើឡើង។
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,ការទិញកម្មវិធីគ្រប់គ្រងអនុបណ្ឌិត
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +429,Production Order {0} must be submitted,ផលិតកម្មលំដាប់ {0} ត្រូវតែត្រូវបានដាក់ជូន
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +434,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,ដើម្បីកាលបរិច្ឆេទមិនអាចមានមុនពេលចេញពីកាលបរិច្ឆេទ
@@ -3671,24 +3721,26 @@
 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 +181,Totals,សរុប
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,សរុប
 DocType: BOM,Manufacturing,កម្មន្តសាល
 ,Ordered Items To Be Delivered,ធាតុបញ្ជាឱ្យនឹងត្រូវបានបញ្ជូន
 DocType: Account,Income,ប្រាក់ចំណូល
 DocType: Industry Type,Industry Type,ប្រភេទវិស័យឧស្សាហកម្ម
 apps/erpnext/erpnext/templates/includes/cart.js +141,Something went wrong!,អ្វីមួយដែលខុស!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,Warning: Leave application contains following block dates,ព្រមាន &amp; ‧;: កម្មវិធីទុកឱ្យមានកាលបរិច្ឆេទនៃការហាមឃាត់ដូចខាងក្រោម
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +120,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} ត្រូវបានដាក់ស្នើរួចទៅហើយ
 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 +181,Organization unit (department) master.,អង្គភាព (ក្រសួង) មេ។
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,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 +793,All records are synced.,កំណត់ត្រាទាំងអស់ត្រូវបានធ្វើសមកាលកម្ម។
+apps/erpnext/erpnext/accounts/page/pos/pos.js +781,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,ការផ្តល់កម្ចីដោយគ្មានសុវត្ថិភាព
 DocType: Cost Center,Cost Center Name,ឈ្មោះមជ្ឈមណ្ឌលចំណាយអស់
@@ -3707,21 +3759,20 @@
 DocType: Address,Name of person or organization that this address belongs to.,ឈ្មោះរបស់មនុស្សម្នាក់ឬអង្គការមួយដែលមានអាស័យដ្ឋានជារបស់វា។
 apps/erpnext/erpnext/public/js/setup_wizard.js +260,Your Suppliers,អ្នកផ្គត់ផ្គង់របស់អ្នក
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +49,Cannot set as Lost as Sales Order is made.,មិនអាចបាត់បង់ដូចដែលបានកំណត់ជាលំដាប់ត្រូវបានធ្វើឱ្យការលក់រថយន្ត។
-DocType: Student Applicant,Mother's Name,ឈ្មោះរបស់ម្តាយ
 DocType: Request for Quotation Item,Supplier Part No,ក្រុមហ៊ុនផ្គត់ផ្គង់គ្រឿងបន្លាស់គ្មាន
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +348,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',មិនអាចកាត់ពេលដែលប្រភេទគឺសម្រាប់ &#39;វាយតម្លៃ&#39; ឬ &#39;Vaulation និងសរុប
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Received From,ទទួលបានពី
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Received From,ទទួលបានពី
 DocType: Lead,Converted,ប្រែចិត្តជឿ
 DocType: Item,Has Serial No,គ្មានសៀរៀល
 DocType: Employee,Date of Issue,កាលបរិច្ឆេទនៃបញ្ហា
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: ពី {0} {1} សម្រាប់
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +153,Row #{0}: Set Supplier for item {1},ជួរដេក # {0}: កំណត់ផ្គត់ផ្គង់សម្រាប់ធាតុ {1}
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +93,Row {0}: Hours value must be greater than zero.,ជួរដេក {0}: តម្លៃប៉ុន្មានម៉ោងត្រូវតែធំជាងសូន្យ។
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +117,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} មិនអាចត្រូវបានរកឃើញ
 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 +172,{0} {1} does not exist,{0} {1} មិនមាន
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +175,{0} {1} does not exist,{0} {1} មិនមាន
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,Please check Multi Currency option to allow accounts with other currency,សូមពិនិត្យមើលជម្រើសរូបិយវត្ថុពហុដើម្បីអនុញ្ញាតឱ្យគណនីជារូបិយប័ណ្ណផ្សេងទៀត
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +72,Item: {0} does not exist in the system,ធាតុ: {0} មិនមាននៅក្នុងប្រព័ន្ធ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,អ្នកមិនត្រូវបានអនុញ្ញាតឱ្យកំណត់តម្លៃទឹកកក
@@ -3730,13 +3781,14 @@
 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/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,ការចូលរួមមិនអាចត្រូវបានសម្គាល់សម្រាប់កាលបរិច្ឆេទនាពេលអនាគត
 DocType: Pricing Rule,Pricing Rule Help,វិធានកំណត់តម្លៃជំនួយ
 DocType: Purchase Taxes and Charges,Account Head,នាយកគណនី
 apps/erpnext/erpnext/config/stock.py +163,Update additional costs to calculate landed cost of items,ធ្វើឱ្យទាន់សម័យការចំណាយបន្ថែមទៀតដើម្បីគណនាការចំណាយចុះចតនៃធាតុ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Electrical,អគ្គិសនី
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Electrical,អគ្គិសនី
 DocType: Stock Entry,Total Value Difference (Out - In),ភាពខុសគ្នាតម្លៃសរុប (ចេញ - ក្នុង)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,Row {0}: Exchange Rate is mandatory,ជួរដេក {0}: អត្រាប្តូរប្រាក់គឺជាការចាំបាច់
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},លេខសម្គាល់អ្នកប្រើដែលមិនបានកំណត់សម្រាប់បុគ្គលិក {0}
@@ -3744,7 +3796,7 @@
 DocType: Item,Customer Code,លេខកូដអតិថិជន
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +210,Birthday Reminder for {0},កម្មវិធីរំលឹកខួបកំណើតសម្រាប់ {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,ថ្ងៃចាប់ពីលំដាប់ចុងក្រោយ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +292,Debit To account must be a Balance Sheet account,ឥណពន្ធវីសាទៅគណនីត្រូវតែមានតារាងតុល្យការគណនី
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To account must be a Balance Sheet account,ឥណពន្ធវីសាទៅគណនីត្រូវតែមានតារាងតុល្យការគណនី
 DocType: Buying Settings,Naming Series,ដាក់ឈ្មោះកម្រងឯកសារ
 DocType: Leave Block List,Leave Block List Name,ទុកឱ្យឈ្មោះបញ្ជីប្លុក
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,ភាគហ៊ុនទ្រព្យសកម្ម
@@ -3756,11 +3808,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 +301,Salary Slip of employee {0} already created for time sheet {1},ប័ណ្ណប្រាក់ខែរបស់បុគ្គលិក {0} បានបង្កើតឡើងរួចហើយសម្រាប់តារាងពេលវេលា {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +313,Salary Slip of employee {0} already created for time sheet {1},ប័ណ្ណប្រាក់ខែរបស់បុគ្គលិក {0} បានបង្កើតឡើងរួចហើយសម្រាប់តារាងពេលវេលា {1}
 DocType: Sales Order Item,Ordered Qty,បានបញ្ជាឱ្យ Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +673,Item {0} is disabled,ធាតុ {0} ត្រូវបានបិទ
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} is disabled,ធាតុ {0} ត្រូវបានបិទ
 DocType: Stock Settings,Stock Frozen Upto,រីករាយជាមួយនឹងផ្សារភាគហ៊ុនទឹកកក
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +838,BOM does not contain any stock item,Bom មិនមានភាគហ៊ុនណាមួយឡើយធាតុ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +809,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,បង្កើតប្រាក់ខែគ្រូពេទ្យប្រហែលជា
@@ -3768,23 +3820,24 @@
 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 +485,Row #{0}: Please set reorder quantity,ជួរដេក # {0}: សូមកំណត់បរិមាណតម្រៀបឡើងវិញ
+DocType: Sales Invoice Timesheet,Billing Hours,ម៉ោងវិក័យប័ត្រ
+apps/erpnext/erpnext/stock/doctype/item/item.py +487,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 +62,Please set {0},សូមកំណត់ {0}
 DocType: Purchase Invoice,Repeat on Day of Month,ធ្វើម្តងទៀតនៅថ្ងៃនៃខែ
 DocType: Employee,Health Details,ពត៌មានលំអិតសុខភាព
 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,ដាក់ស្នើគ្រូពេទ្យប្រហែលជាបានប្រាក់ខែទាំងអស់សម្រាប់លក្ខណៈវិនិច្ឆ័យដែលបានជ្រើសខាងលើ
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} ធាតុដែលបានធ្វើសមកាលកម្ម
 DocType: Sales Order,Partly Delivered,ផ្តល់មួយផ្នែក
-DocType: Sales Invoice,Existing Customer,អតិថិជនដែលមានស្រាប់
 DocType: Email Digest,Receivables,អ្នកទទួល
+DocType: Lead Source,Lead Source,អ្នកដឹកនាំការប្រភព
 DocType: Customer,Additional information regarding the customer.,ពត៍មានបន្ថែមទាក់ទងនឹងការអតិថិជន។
 DocType: Quality Inspection Reading,Reading 5,ការអាន 5
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +38,Campaign Name is required,ឈ្មោះត្រូវបានទាមទារយុទ្ធនាការឃោសនា
 DocType: Maintenance Visit,Maintenance Date,ថែទាំកាលបរិច្ឆេទ
 DocType: Purchase Invoice Item,Rejected Serial No,គ្មានសៀរៀលច្រានចោល
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +80,Year start date or end date is overlapping with {0}. To avoid please set company,កាលបរិច្ឆេទចាប់ផ្ដើមកាលពីឆ្នាំឬកាលបរិច្ឆេទចុងត្រូវបានត្រួតស៊ីគ្នានឹង {0} ។ ដើម្បីជៀសវាងសូមកំណត់របស់ក្រុមហ៊ុន
@@ -3792,10 +3845,9 @@
 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 +129,BOM and Manufacturing Quantity are required,កម្មន្តសាលចំនូន Bom និងត្រូវបានតម្រូវ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,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,កម្លាំងអតិបរមា
-DocType: Bank Reconciliation Detail,Amount,ចំនួនទឹកប្រាក់
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Bom បានជំនួស
 ,Sales Analytics,វិភាគការលក់
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +113,Available {0},ដែលអាចប្រើបាន {0}
@@ -3803,14 +3855,14 @@
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,ការបង្កើតអ៊ីម៉ែ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +96,Please enter default currency in Company Master,សូមបញ្ចូលរូបិយប័ណ្ណលំនាំដើមនៅក្នុងក្រុមហ៊ុនអនុបណ្ឌិត
 DocType: Stock Entry Detail,Stock Entry Detail,ពត៌មាននៃភាគហ៊ុនចូល
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +100,Daily Reminders,ការរំលឹកជារៀងរាល់ថ្ងៃ
+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/account/account_tree.js +23,New Account Name,ឈ្មោះគណនីថ្មី
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,ការចំណាយវត្ថុធាតុដើមការី
 DocType: Selling Settings,Settings for Selling Module,ម៉ូឌុលការកំណត់សម្រាប់លក់
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Customer Service,សេវាបំរើអតិថិជន
+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/config/hr.py +50,Offer candidate a Job.,បេក្ខជនផ្ដល់ការងារ។
@@ -3819,8 +3871,9 @@
 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} ត្រូវតែជាធាតុភាគហ៊ុន
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,ការងារលំនាំដើមនៅក្នុងឃ្លាំងវឌ្ឍនភាព
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1570,Total nos of serial no is not equal to quantity.,បាន NOS សរុបនៃការមិនមានសៀរៀលគឺជាការមិនស្មើទៅនឹងបរិមាណ។
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1594,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,កម្រងឯកសារលេខធ្វើឱ្យទាន់សម័យ
@@ -3828,9 +3881,10 @@
 DocType: Sales Order,Printing Details,សេចក្ដីលម្អិតការបោះពុម្ព
 DocType: Task,Closing Date,ថ្ងៃផុតកំណត់
 DocType: Sales Order Item,Produced Quantity,បរិមាណដែលបានផលិត
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Engineer,វិស្វករ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Engineer,វិស្វករ
+DocType: Journal Entry,Total Amount Currency,រូបិយប័ណ្ណចំនួនសរុប
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,សភាអនុស្វែងរក
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Item Code required at Row No {0},កូដធាតុបានទាមទារនៅជួរដេកគ្មាន {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +398,Item Code required at Row No {0},កូដធាតុបានទាមទារនៅជួរដេកគ្មាន {0}
 DocType: Sales Partner,Partner Type,ប្រភេទជាដៃគូ
 DocType: Purchase Taxes and Charges,Actual,ពិតប្រាកដ
 DocType: Authorization Rule,Customerwise Discount,Customerwise បញ្ចុះតំលៃ
@@ -3846,16 +3900,18 @@
 DocType: BOM,Raw Material Cost,វត្ថុធាតុដើមដែលការចំណាយ
 DocType: Item Reorder,Re-Order Level,ដីកាសម្រេចកម្រិតឡើងវិញ
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,បញ្ចូលធាតុនិងការដែលបានគ្រោងទុក qty ដែលអ្នកចង់បានដើម្បីបង្កើនការបញ្ជាទិញផលិតផលឬទាញយកវត្ថុធាតុដើមសម្រាប់ការវិភាគ។
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +55,Part-time,ពេញម៉ោង
+apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,គំនូសតាង Gantt
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,ពេញម៉ោង
 DocType: Employee,Applicable Holiday List,បញ្ជីថ្ងៃឈប់សម្រាកដែលអាចអនុវត្តបាន
 DocType: Employee,Cheque,មូលប្បទានប័ត្រ
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,បានបន្ទាន់សម័យស៊េរី
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +57,Series Updated,បានបន្ទាន់សម័យស៊េរី
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,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 +87,Clearance Date updated,បោសសំអាតកាលបរិច្ឆេទធ្វើឱ្យទាន់សម័យ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,ផ្សះផ្សាដោយជោគជ័យ
@@ -3869,7 +3925,7 @@
 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 +513,Posting date and posting time is mandatory,ប្រកាសកាលបរិច្ឆេទនិងពេលវេលាជាការចាំបាច់បង្ហោះ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,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.,នៅក្នុងពាក្យនោះនឹងត្រូវបានមើលឃើញនៅពេលដែលអ្នករក្សាទុកការបញ្ជាទិញនេះ។
@@ -3878,7 +3934,7 @@
 DocType: Task,Review Date,ពិនិត្យឡើងវិញកាលបរិច្ឆេទ
 DocType: Purchase Invoice,Advance Payments,ការទូទាត់ជាមុន
 DocType: Purchase Taxes and Charges,On Net Total,នៅលើសុទ្ធសរុប
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +158,Target warehouse in row {0} must be same as Production Order,ឃ្លាំងគោលដៅក្នុងជួរ {0} ត្រូវតែមានដូចគ្នាដូចដែលបញ្ជាទិញផលិតផល
+apps/erpnext/erpnext/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,រូបិយប័ណ្ណមិនអាចត្រូវបានផ្លាស់ប្តូរបន្ទាប់ពីធ្វើការធាតុប្រើប្រាស់រូបិយប័ណ្ណផ្សេងទៀតមួយចំនួន
 DocType: Company,Round Off Account,បិទការប្រកួតជុំទីគណនី
@@ -3887,23 +3943,22 @@
 DocType: Customer Group,Parent Customer Group,ឪពុកម្តាយដែលជាក្រុមអតិថិជន
 DocType: Purchase Invoice,Contact Email,ទំនាក់ទំនងតាមអ៊ីមែល
 DocType: Appraisal Goal,Score Earned,គ្រាប់បាល់បញ្ចូលទីទទួលបាន
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Notice Period,រយៈពេលជូនដំណឹង
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,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 +4,New Sales Person Name,ឈ្មោះថ្មីលក់បុគ្គល
 DocType: Packing Slip,Gross Weight UOM,សរុបបានទំ UOM
-DocType: Email Digest,Receivables / Payables,ទទួល / បង់
 DocType: Delivery Note Item,Against Sales Invoice,ប្រឆាំងនឹងការវិក័យប័ត្រលក់
 DocType: Bin,Reserved Qty for Production,បម្រុងទុក Qty សម្រាប់ផលិតកម្ម
 DocType: Asset,Frequency of Depreciation (Months),ភាពញឹកញាប់នៃការរំលស់ (ខែ)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +469,Credit Account,គណនីឥណទាន
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Credit Account,គណនីឥណទាន
 DocType: Landed Cost Item,Landed Cost Item,ធាតុតម្លៃដែលបានចុះចត
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +55,Show zero values,បង្ហាញតម្លៃសូន្យ
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,បង្ហាញតម្លៃសូន្យ
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,បរិមាណនៃការផលិតធាតុដែលទទួលបានបន្ទាប់ / វែចខ្ចប់ឡើងវិញពីបរិមាណដែលបានផ្តល់វត្ថុធាតុដើម
 apps/erpnext/erpnext/public/js/setup_wizard.js +315,Setup a simple website for my organization,ការរៀបចំវែបសាយសាមញ្ញសម្រាប់អង្គការរបស់ខ្ញុំ
 DocType: Payment Reconciliation,Receivable / Payable Account,ទទួលគណនី / ចងការប្រាក់
 DocType: Delivery Note Item,Against Sales Order Item,ការប្រឆាំងនឹងការធាតុលក់សណ្តាប់ធ្នាប់
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Please specify Attribute Value for attribute {0},សូមបញ្ជាក់គុណតម្លៃសម្រាប់គុណលក្ខណៈ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},សូមបញ្ជាក់គុណតម្លៃសម្រាប់គុណលក្ខណៈ {0}
 DocType: Item,Default Warehouse,ឃ្លាំងលំនាំដើម
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +39,Budget cannot be assigned against Group Account {0},ថវិកាដែលមិនអាចត្រូវបានផ្ដល់ប្រឆាំងនឹងគណនីគ្រុប {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,សូមបញ្ចូលមជ្ឈមណ្ឌលចំណាយឪពុកម្តាយ
@@ -3925,19 +3980,22 @@
 DocType: Journal Entry,Total Debit,ឥណពន្ធសរុប
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,ឃ្លាំងទំនិញលំនាំដើមបានបញ្ចប់
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,ការលក់បុគ្គល
-DocType: Sales Invoice,Cold Calling,ហៅត្រជាក់
 DocType: SMS Parameter,SMS Parameter,ផ្ញើសារជាអក្សរប៉ារ៉ាម៉ែត្រ
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,មជ្ឈមណ្ឌលថវិកានិងការចំណាយ
 DocType: Maintenance Schedule Item,Half Yearly,ពាក់កណ្តាលប្រចាំឆ្នាំ
 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 +253,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 +141,Set as Lost,ដែលបានកំណត់ជាបាត់បង់
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,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 +5,This is based on transactions against this Customer. See timeline below for details,នេះផ្អែកលើប្រតិបត្តិការប្រឆាំងនឹងអតិថិជននេះ។ សូមមើលខាងក្រោមសម្រាប់សេចក្ដីលម្អិតកំណត់ពេលវេលា
 DocType: Supplier,Credit Days Based On,ថ្ងៃដោយផ្អែកលើការផ្តល់ឥណទាន
@@ -3949,11 +4007,10 @@
 ,Items To Be Requested,ធាតុដែលនឹងត្រូវបានស្នើ
 DocType: Purchase Order,Get Last Purchase Rate,ទទួលបានអត្រាការទិញចុងក្រោយ
 DocType: Company,Company Info,ពត៌មានរបស់ក្រុមហ៊ុន
-apps/erpnext/erpnext/accounts/page/pos/pos.js +941,Select or add new customer,ជ្រើសឬបន្ថែមអតិថិជនថ្មី
+apps/erpnext/erpnext/accounts/page/pos/pos.js +930,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 +5,This is based on the attendance of this Employee,នេះត្រូវបានផ្អែកលើការចូលរួមរបស់បុគ្គលិកនេះ
-DocType: Sales Invoice,Frequency,ភពញឹកញប់
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +463,Debit Account,គណនីឥណពន្ធវីសា
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Debit Account,គណនីឥណពន្ធវីសា
 DocType: Fiscal Year,Year Start Date,នៅឆ្នាំកាលបរិច្ឆេទចាប់ផ្តើម
 DocType: Attendance,Employee Name,ឈ្មោះបុគ្គលិក
 DocType: Sales Invoice,Rounded Total (Company Currency),សរុបមូល (ក្រុមហ៊ុនរូបិយវត្ថុ)
@@ -3962,27 +4019,27 @@
 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 +210,Supplier Quotation {0} created,សម្រង់ក្រុមហ៊ុនផ្គត់ផ្គង់ {0} បង្កើតឡើង
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +208,Supplier Quotation {0} created,សម្រង់ក្រុមហ៊ុនផ្គត់ផ្គង់ {0} បង្កើតឡើង
 apps/erpnext/erpnext/accounts/report/financial_statements.py +90,End Year cannot be before Start Year,ឆ្នាំបញ្ចប់មិនអាចជាការចាប់ផ្តើមឆ្នាំមុន
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Employee Benefits,អត្ថប្រយោជន៍បុគ្គលិក
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,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 +228,Please set a default Holiday List for Employee {0} or Company {1},សូមកំណត់លំនាំដើមបញ្ជីថ្ងៃឈប់សម្រាកសម្រាប់បុគ្គលិកឬ {0} {1} ក្រុមហ៊ុន
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +232,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 +499,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ជួរដេកគ្មាន {0}: ចំនួនទឹកប្រាក់មិនអាចមានចំនួនច្រើនជាងការរង់ចាំការប្រឆាំងនឹងពាក្យបណ្តឹងការចំណាយទឹកប្រាក់ {1} ។ ចំនួនទឹកប្រាក់ដែលមិនទាន់សម្រេចគឺ {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +500,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ជួរដេកគ្មាន {0}: ចំនួនទឹកប្រាក់មិនអាចមានចំនួនច្រើនជាងការរង់ចាំការប្រឆាំងនឹងពាក្យបណ្តឹងការចំណាយទឹកប្រាក់ {1} ។ ចំនួនទឹកប្រាក់ដែលមិនទាន់សម្រេចគឺ {2}
 DocType: Maintenance Schedule,Schedule,កាលវិភាគ
 DocType: Account,Parent Account,គណនីមាតាឬបិតា
 DocType: Quality Inspection Reading,Reading 3,ការអានទី 3
 ,Hub,ហាប់
 DocType: GL Entry,Voucher Type,ប្រភេទកាតមានទឹកប្រាក់
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1007,Price List not found or disabled,រកមិនឃើញបញ្ជីថ្លៃឬជនពិការ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1008,Price List not found or disabled,រកមិនឃើញបញ្ជីថ្លៃឬជនពិការ
 DocType: Expense Claim,Approved,បានអនុម័ត
 DocType: Pricing Rule,Price,តំលៃលក់
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +244,Employee relieved on {0} must be set as 'Left',បុគ្គលិកធូរស្រាលនៅលើ {0} ត្រូវតែត្រូវបានកំណត់ជា &quot;ឆ្វេង&quot;
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +256,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} នៅក្នុងជួរកាលបរិច្ឆេទដែលបានផ្ដល់
@@ -3993,12 +4050,12 @@
 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 +259,Please select Employee Record first.,សូមជ្រើសរើសបុគ្គលិកកំណត់ត្រាដំបូង។
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +266,Please select Employee Record first.,សូមជ្រើសរើសបុគ្គលិកកំណត់ត្រាដំបូង។
 DocType: POS Profile,Account for Change Amount,គណនីសម្រាប់ការផ្លាស់ប្តូរចំនួនទឹកប្រាក់
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +190,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},ជួរដេក {0}: គណបក្ស / គណនីមិនផ្គូផ្គងនឹង {1} / {2} នៅក្នុង {3} {4}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +235,Please enter Expense Account,សូមបញ្ចូលចំណាយតាមគណនី
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,Please enter Expense Account,សូមបញ្ចូលចំណាយតាមគណនី
 DocType: Account,Stock,ភាគហ៊ុន
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,"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 +976,"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,ទិញ / ពត៌មានលំអិតការផលិត
@@ -4013,9 +4070,10 @@
 DocType: Asset Movement,Transaction Date,ប្រតិបត្តិការកាលបរិច្ឆេទ
 DocType: Production Plan Item,Planned Qty,បានគ្រោងទុក Qty
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,ការប្រមូលពន្ធលើចំនួនសរុប
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,For Quantity (Manufactured Qty) is mandatory,ចប់ (ផលិត Qty) គឺជាចាំបាច់
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,For Quantity (Manufactured Qty) is mandatory,ចប់ (ផលិត Qty) គឺជាចាំបាច់
 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 +78,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,កាលបរិច្ឆេទពិតប្រាកដចាប់ផ្តើម
@@ -4030,9 +4088,11 @@
 DocType: Warranty Claim,If different than customer address,បើសិនជាខុសគ្នាជាងអាសយដ្ឋានអតិថិជន
 DocType: BOM Operation,BOM Operation,Bom ប្រតិបត្តិការ
 DocType: Purchase Taxes and Charges,On Previous Row Amount,នៅថ្ងៃទីចំនួនជួរដេកមុន
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +226,Transfer Asset,ផ្ទេរទ្រព្យសម្បត្តិ
+DocType: Student,Home Address,អាសយដ្ឋានផ្ទះ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +227,Transfer Asset,ផ្ទេរទ្រព្យសម្បត្តិ
 DocType: POS Profile,POS Profile,ម៉ាស៊ីនឆូតកាតពត៌មានផ្ទាល់ខ្លួន
 apps/erpnext/erpnext/config/schools.py +33,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 +129,"Item {0} is a template, please select one of its variants",ធាតុ {0} គឺពុម្ពមួយសូមជ្រើសមួយក្នុងចំណោមវ៉ារ្យ៉ង់របស់ខ្លួន
 DocType: Asset,Asset Category,ប្រភេទទ្រព្យសកម្ម
@@ -4042,8 +4102,8 @@
 DocType: Assessment,Room,បន្ទប់
 DocType: Purchase Order,Advance Paid,មុនបង់ប្រាក់
 DocType: Item,Item Tax,ការប្រមូលពន្ធលើធាតុ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +765,Material to Supplier,សម្ភារៈដើម្បីផ្គត់ផ្គង់
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +189,Excise Invoice,រដ្ឋាករវិក័យប័ត្រ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,Material to Supplier,សម្ភារៈដើម្បីផ្គត់ផ្គង់
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,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,បំណុលនាពេលបច្ចុប្បន្ន
@@ -4053,7 +4113,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,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 +136,Credit Card,កាតឥណទាន
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,កាតឥណទាន
 DocType: BOM,Item to be manufactured or repacked,ធាតុនឹងត្រូវបានផលិតឬ repacked
 apps/erpnext/erpnext/config/stock.py +174,Default settings for stock transactions.,ការកំណត់លំនាំដើមសម្រាប់ប្រតិបត្តិការភាគហ៊ុន។
 DocType: Purchase Invoice,Next Date,កាលបរិច្ឆេទបន្ទាប់
@@ -4061,6 +4121,7 @@
 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: Academic Term,Term End Date,រយៈពេលកាលបរិច្ឆេទបញ្ចប់
 DocType: Hub Settings,Seller Name,ឈ្មោះអ្នកលក់
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),ពន្ធនិងការចោទប្រកាន់កាត់ (ក្រុមហ៊ុនរូបិយវត្ថុ)
 DocType: Item Group,General Settings,ការកំណត់ទូទៅ
@@ -4072,7 +4133,7 @@
 DocType: Customer,Commission Rate,អត្រាប្រាក់កំរៃ
 apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,ធ្វើឱ្យវ៉ារ្យង់
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,កម្មវិធីដែលបានឈប់សម្រាកប្លុកដោយនាយកដ្ឋាន។
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +115,"Payment Type must be one of Receive, Pay and Internal Transfer",ប្រភេទការទូទាត់ត្រូវតែជាផ្នែកមួយនៃការទទួលបានការសងប្រាក់និងផ្ទេរប្រាក់បរទេស
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +118,"Payment Type must be one of Receive, Pay and Internal Transfer",ប្រភេទការទូទាត់ត្រូវតែជាផ្នែកមួយនៃការទទួលបានការសងប្រាក់និងផ្ទេរប្រាក់បរទេស
 apps/erpnext/erpnext/config/selling.py +169,Analytics,វិធីវិភាគ
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,រទេះទទេ
 DocType: Production Order,Actual Operating Cost,ការចំណាយប្រតិបត្តិការបានពិតប្រាកដ
@@ -4087,10 +4148,10 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,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 +92,Designer,អ្នករចនា
+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/accounts/doctype/purchase_invoice/purchase_invoice.py +469,Cost Center is required in row {0} in Taxes table for type {1},មជ្ឈមណ្ឌលការចំណាយគឺត្រូវបានទាមទារនៅក្នុងជួរដេក {0} នៅក្នុងពន្ធតារាងសម្រាប់ប្រភេទ {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +472,Cost Center is required in row {0} in Taxes table for type {1},មជ្ឈមណ្ឌលការចំណាយគឺត្រូវបានទាមទារនៅក្នុងជួរដេក {0} នៅក្នុងពន្ធតារាងសម្រាប់ប្រភេទ {1}
 DocType: Program,Program Code,កូដកម្មវិធី
 ,Item-wise Purchase Register,ចុះឈ្មោះទិញធាតុប្រាជ្ញា
 DocType: Batch,Expiry Date,កាលបរិច្ឆេទផុតកំណត់
@@ -4100,12 +4161,12 @@
 apps/erpnext/erpnext/config/projects.py +13,Project master.,ចៅហ្វាយគម្រោង។
 apps/erpnext/erpnext/controllers/status_updater.py +174,"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 +417, (Half Day),(ពាក់កណ្តាលថ្ងៃ)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425, (Half Day),(ពាក់កណ្តាលថ្ងៃ)
 DocType: Supplier,Credit Days,ថ្ងៃឥណទាន
 DocType: Leave Type,Is Carry Forward,គឺត្រូវបានអនុវត្តទៅមុខ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +740,Get Items from BOM,ទទួលបានធាតុពី Bom
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +711,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 +549,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},ជួរដេក # {0}: ប្រកាសកាលបរិច្ឆេទត្រូវតែមានដូចគ្នាកាលបរិច្ឆេទទិញ {1} នៃទ្រព្យសម្បត្តិ {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +552,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,ផ្ទេរទ្រព្យសម្បត្តិមួយពីឃ្លាំងមួយទៅមួយទៀត
diff --git a/erpnext/translations/kn.csv b/erpnext/translations/kn.csv
index 4770377..fdfc9fd 100644
--- a/erpnext/translations/kn.csv
+++ b/erpnext/translations/kn.csv
@@ -18,11 +18,10 @@
 DocType: Sales Partner,Dealer,ವ್ಯಾಪಾರಿ
 DocType: Employee,Rented,ಬಾಡಿಗೆ
 DocType: Purchase Order,PO-,PO-
-apps/erpnext/erpnext/accounts/report/financial_statements.py +19,Start Year {0} not found.,{0} ಕಂಡುಬಂದಿಲ್ಲ ಆರಂಭದ ವರ್ಷ.
 DocType: POS Profile,Applicable for User,ಬಳಕೆದಾರ ಅನ್ವಯಿಸುವುದಿಲ್ಲ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +191,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","ನಿಲ್ಲಿಸಿತು ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ರದ್ದುಗೊಳಿಸಲಾಗದು, ರದ್ದು ಮೊದಲು ಅಡ್ಡಿಯಾಗಿರುವುದನ್ನು ಬಿಡಿಸು"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +197,Do you really want to scrap this asset?,ನೀವು ನಿಜವಾಗಿಯೂ ಈ ಆಸ್ತಿ ಸ್ಕ್ರ್ಯಾಪ್ ಬಯಸುತ್ತೀರಾ?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +17,Select Default Supplier,ಡೀಫಾಲ್ಟ್ ಸರಬರಾಜುದಾರ ಆಯ್ಕೆ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +192,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","ನಿಲ್ಲಿಸಿತು ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ರದ್ದುಗೊಳಿಸಲಾಗದು, ರದ್ದು ಮೊದಲು ಅಡ್ಡಿಯಾಗಿರುವುದನ್ನು ಬಿಡಿಸು"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +198,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 +36,Currency is required for Price List {0},ಕರೆನ್ಸಿ ಬೆಲೆ ಪಟ್ಟಿ ಅಗತ್ಯವಿದೆ {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* ಲೆಕ್ಕಾಚಾರ ಮಾಡಲಾಗುತ್ತದೆ ವ್ಯವಹಾರದಲ್ಲಿ ಆಗಿದೆ .
 DocType: Address,County,ಕೌಂಟಿ
@@ -42,46 +41,45 @@
 DocType: Sales Invoice,Customer Name,ಗ್ರಾಹಕ ಹೆಸರು
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +126,Bank account cannot be named as {0},ಬ್ಯಾಂಕ್ ಖಾತೆಯಿಂದ ಹೆಸರಿನ ಸಾಧ್ಯವಿಲ್ಲ {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,ತಲೆ (ಅಥವಾ ಗುಂಪುಗಳು) ವಿರುದ್ಧ ಲೆಕ್ಕಪರಿಶೋಧಕ ನಮೂದುಗಳನ್ನು ಮಾಡಲಾಗುತ್ತದೆ ಮತ್ತು ಸಮತೋಲನಗಳ ನಿರ್ವಹಿಸುತ್ತದೆ.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +180,Outstanding for {0} cannot be less than zero ({1}),ಮಹೋನ್ನತ {0} ಕಡಿಮೆ ಶೂನ್ಯ ಸಾಧ್ಯವಿಲ್ಲ ( {1} )
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,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 +148,Series Updated Successfully,ಸರಣಿ ಯಶಸ್ವಿಯಾಗಿ ನವೀಕರಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +149,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,ಎಲ್ಲಾ ಸಂಪರ್ಕಿಸಿ ಸರಬರಾಜುದಾರ
-DocType: Quality Inspection Reading,Parameter,ನಿಯತಾಂಕ
 apps/erpnext/erpnext/projects/doctype/project/project.py +54,Expected End Date can not be less than Expected Start Date,ನಿರೀಕ್ಷಿತ ಅಂತಿಮ ದಿನಾಂಕ ನಿರೀಕ್ಷಿತ ಪ್ರಾರಂಭ ದಿನಾಂಕ ಕಡಿಮೆ ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,ರೋ # {0}: ದರ ಅದೇ ಇರಬೇಕು {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +239,New Leave Application,ಹೊಸ ರಜೆ ಅಪ್ಲಿಕೇಶನ್
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,New Leave Application,ಹೊಸ ರಜೆ ಅಪ್ಲಿಕೇಶನ್
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +20,Attendance Record {0} exists against Student {1} for Course Schedule {2},ಹಾಜರಾತಿ {0} ಕೋರ್ಸ್ ಶೆಡ್ಯೂಲ್ ವಿದ್ಯಾರ್ಥಿ {1} ವಿರುದ್ಧ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Bank Draft,ಬ್ಯಾಂಕ್ ಡ್ರಾಫ್ಟ್
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,ಬ್ಯಾಂಕ್ ಡ್ರಾಫ್ಟ್
 DocType: Mode of Payment Account,Mode of Payment Account,ಪಾವತಿ ಖಾತೆಯಿಂದ ಮೋಡ್
 apps/erpnext/erpnext/stock/doctype/item/item.js +52,Show Variants,ತೋರಿಸು ಮಾರ್ಪಾಟುಗಳು
 DocType: Academic Term,Academic Term,ಶೈಕ್ಷಣಿಕ ಟರ್ಮ್
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +13,Material,ವಸ್ತು
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Quantity,ಪ್ರಮಾಣ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +511,Accounts table cannot be blank.,ಟೇಬಲ್ ಖಾತೆಗಳು ಖಾಲಿ ಇರುವಂತಿಲ್ಲ.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +616,Quantity,ಪ್ರಮಾಣ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +512,Accounts table cannot be blank.,ಟೇಬಲ್ ಖಾತೆಗಳು ಖಾಲಿ ಇರುವಂತಿಲ್ಲ.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,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/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 +142,User {0} is already assigned to Employee {1},ಬಳಕೆದಾರ {0} ಈಗಾಗಲೇ ನೌಕರರ ನಿಗದಿಪಡಿಸಲಾಗಿದೆ {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,ಆರೋಗ್ಯ
-DocType: Purchase Invoice,Monthly,ಮಾಸಿಕ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),ಪಾವತಿ ವಿಳಂಬ (ದಿನಗಳು)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +771,Invoice,ಸರಕುಪಟ್ಟಿ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +750,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 +198,Row {0}: {1} {2} does not match with {3},ಸಾಲು {0}: {1} {2} ಹೊಂದಿಕೆಯಾಗುವುದಿಲ್ಲ {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,ರೋ # {0}:
+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 +127,Please select Price List,ಬೆಲೆ ಪಟ್ಟಿ ಆಯ್ಕೆ ಮಾಡಿ
@@ -112,8 +110,8 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,ಅದೇ ಕಂಪನಿಯ ಒಂದಕ್ಕಿಂತ ಹೆಚ್ಚು ಬಾರಿ ದಾಖಲಿಸಿದರೆ
 DocType: Employee,Married,ವಿವಾಹಿತರು
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},ಜಾಹೀರಾತು ಅನುಮತಿಯಿಲ್ಲ {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +589,Get items from,ಐಟಂಗಳನ್ನು ಪಡೆಯಿರಿ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +382,Stock cannot be updated against Delivery Note {0},ಸ್ಟಾಕ್ ಡೆಲಿವರಿ ಗಮನಿಸಿ ವಿರುದ್ಧ ನವೀಕರಿಸಲಾಗುವುದಿಲ್ಲ {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,ಐಟಂಗಳನ್ನು ಪಡೆಯಿರಿ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,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,ದಿನಸಿ
@@ -122,7 +120,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 +156,Salary Structure Missing,ಸಂಬಳ ರಚನೆ ಮಿಸ್ಸಿಂಗ್
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Salary Structure Missing,ಸಂಬಳ ರಚನೆ ಮಿಸ್ಸಿಂಗ್
 DocType: Lead,Person Name,ವ್ಯಕ್ತಿ ಹೆಸರು
 DocType: Sales Invoice Item,Sales Invoice Item,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಐಟಂ
 DocType: Account,Credit,ಕ್ರೆಡಿಟ್
@@ -130,10 +128,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 +156,Credit limit has been crossed for customer {0} {1}/{2},ಕ್ರೆಡಿಟ್ ಮಿತಿಯನ್ನು ಗ್ರಾಹಕ ದಾಟಿದೆ ಮಾಡಲಾಗಿದೆ {0} {1} / {2}
-apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;ಸ್ಥಿರ ಆಸ್ತಿ&quot; ಆಸ್ತಿ ದಾಖಲೆ ಐಟಂ ವಿರುದ್ಧ ಅಸ್ತಿತ್ವದಲ್ಲಿರುವಂತೆ, ಪರಿಶೀಲಿಸದೆ ಸಾಧ್ಯವಿಲ್ಲ"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +189,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; ಆಸ್ತಿ ದಾಖಲೆ ಐಟಂ ವಿರುದ್ಧ ಅಸ್ತಿತ್ವದಲ್ಲಿರುವಂತೆ, ಪರಿಶೀಲಿಸದೆ ಸಾಧ್ಯವಿಲ್ಲ"
 DocType: Tax Rule,Tax Type,ಜನಪ್ರಿಯ ಕೌಟುಂಬಿಕತೆ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +144,You are not authorized to add or update entries before {0},ನೀವು ಮೊದಲು ನಮೂದುಗಳನ್ನು ಸೇರಿಸಲು ಅಥವ ಅಪ್ಡೇಟ್ ಅಧಿಕಾರ {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},ನೀವು ಮೊದಲು ನಮೂದುಗಳನ್ನು ಸೇರಿಸಲು ಅಥವ ಅಪ್ಡೇಟ್ ಅಧಿಕಾರ {0}
 DocType: Item,Item Image (if not slideshow),ಐಟಂ ಚಿತ್ರ (ಇಲ್ಲದಿದ್ದರೆ ಸ್ಲೈಡ್ಶೋ )
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,ಗ್ರಾಹಕ ಅದೇ ಹೆಸರಿನ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(ಅವರ್ ದರ / 60) * ವಾಸ್ತವಿಕ ಆಪರೇಷನ್ ಟೈಮ್
@@ -143,18 +142,17 @@
 DocType: Student Log,Student Log,ವಿದ್ಯಾರ್ಥಿ ಲಾಗ್
 DocType: Quality Inspection,Get Specification Details,ವಿಶಿಷ್ಟ ವಿವರಗಳನ್ನು ಪಡೆಯಲು
 DocType: Lead,Interested,ಆಸಕ್ತಿ
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +165,Opening,ಆರಂಭಿಕ
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,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/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ಗ್ರಾಹಕ&gt; ಗ್ರಾಹಕನಿಗೆ ಗ್ರೂಪ್&gt; ಟೆರಿಟರಿ
 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.,ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ವಹಿವಾಟು ಖಾತೆ ಗುಂಪು ಪರಿವರ್ತನೆ ಸಾಧ್ಯವಿಲ್ಲ .
 DocType: Lead,Product Enquiry,ಉತ್ಪನ್ನ ವಿಚಾರಣೆ
 DocType: Academic Term,Schools,ಶಾಲೆಗಳು
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,ಮೊದಲ ಕಂಪನಿ ನಮೂದಿಸಿ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Company first,ಮೊದಲ ಕಂಪನಿ ಆಯ್ಕೆ ಮಾಡಿ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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,ಒಟ್ಟು ವೆಚ್ಚ
@@ -164,7 +162,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,ಖಾತೆ ಹೇಳಿಕೆ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,ಫಾರ್ಮಾಸ್ಯುಟಿಕಲ್ಸ್
 DocType: Purchase Invoice Item,Is Fixed Asset,ಸ್ಥಿರ ಆಸ್ತಿ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Available qty is {0}, you need {1}","ಲಭ್ಯವಿರುವ ಪ್ರಮಾಣ ಇದೆ {0}, ನೀವು {1}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +225,"Available qty is {0}, you need {1}","ಲಭ್ಯವಿರುವ ಪ್ರಮಾಣ ಇದೆ {0}, ನೀವು {1}"
 DocType: Expense Claim Detail,Claim Amount,ಹಕ್ಕು ಪ್ರಮಾಣವನ್ನು
 DocType: Employee,Mr,ಶ್ರೀ
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,ಸರಬರಾಜುದಾರ ಟೈಪ್ / ಸರಬರಾಜುದಾರ
@@ -173,26 +171,27 @@
 DocType: Employee,B-,ಬಿ
 DocType: Upload Attendance,Import Log,ಆಮದು ಲಾಗ್
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,ಮೇಲೆ ಮಾನದಂಡಗಳನ್ನು ಆಧರಿಸಿ ರೀತಿಯ ತಯಾರಿಕೆ ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ ಪುಲ್
+DocType: Assessment Result,Grade,ಗ್ರೇಡ್
 DocType: Sales Invoice Item,Delivered By Supplier,ಸರಬರಾಜುದಾರ ವಿತರಣೆ
 DocType: SMS Center,All Contact,ಎಲ್ಲಾ ಸಂಪರ್ಕಿಸಿ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Annual Salary,ವಾರ್ಷಿಕ ಸಂಬಳ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,ಸ್ಟಾಕ್ ವೆಚ್ಚಗಳು
-apps/erpnext/erpnext/accounts/report/financial_statements.py +22,End Year {0} not found.,ಅಂತ್ಯ ವರ್ಷ {0} ಕಂಡುಬಂದಿಲ್ಲ.
 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}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,ಪೂರೈಕೆ ಕಚ್ಚಾ ವಸ್ತುಗಳ ಖರೀದಿ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +130,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 +451,Item {0} is not active or end of life has been reached,ಐಟಂ {0} ಸಕ್ರಿಯವಾಗಿಲ್ಲ ಅಥವಾ ಜೀವನದ ಕೊನೆಯಲ್ಲಿ ತಲುಪಿತು ಮಾಡಲಾಗಿದೆ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +456,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/controllers/accounts_controller.py +614,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","ಸತತವಾಗಿ ತೆರಿಗೆ ಸೇರಿಸಲು {0} ಐಟಂ ಪ್ರಮಾಣದಲ್ಲಿ , ಸಾಲುಗಳಲ್ಲಿ ತೆರಿಗೆ {1} , ಎಂದು ಸೇರಿಸಲೇಬೇಕು"
+apps/erpnext/erpnext/controllers/accounts_controller.py +617,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","ಸತತವಾಗಿ ತೆರಿಗೆ ಸೇರಿಸಲು {0} ಐಟಂ ಪ್ರಮಾಣದಲ್ಲಿ , ಸಾಲುಗಳಲ್ಲಿ ತೆರಿಗೆ {1} , ಎಂದು ಸೇರಿಸಲೇಬೇಕು"
 apps/erpnext/erpnext/config/hr.py +166,Settings for HR Module,ಮಾನವ ಸಂಪನ್ಮೂಲ ಮಾಡ್ಯೂಲ್ ಸೆಟ್ಟಿಂಗ್ಗಳು
 DocType: SMS Center,SMS Center,ಸಂಚಿಕೆ ಸೆಂಟರ್
 DocType: Sales Invoice,Change Amount,ಪ್ರಮಾಣವನ್ನು ಬದಲಾವಣೆ
@@ -204,13 +203,13 @@
 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 +147,Execution,ಎಕ್ಸಿಕ್ಯೂಶನ್
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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,ಐಟಂಗಳನ್ನು ಮತ್ತು ಬೆಲೆ
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},ಒಟ್ಟು ಗಂಟೆಗಳ: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},ದಿನಾಂಕದಿಂದ ಹಣಕಾಸಿನ ವರ್ಷದ ಒಳಗೆ ಇರಬೇಕು. ದಿನಾಂಕದಿಂದ ಭಾವಿಸಿಕೊಂಡು = {0}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,Cost Center {0} does not belong to Company {1},ವೆಚ್ಚ ಸೆಂಟರ್ {0} ಸೇರುವುದಿಲ್ಲ ಕಂಪನಿ {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +100,Cost Center {0} does not belong to Company {1},ವೆಚ್ಚ ಸೆಂಟರ್ {0} ಸೇರುವುದಿಲ್ಲ ಕಂಪನಿ {1}
 DocType: Customer,Individual,ಇಂಡಿವಿಜುವಲ್
 DocType: Interest,Academics User,ಶೈಕ್ಷಣಿಕ ಬಳಕೆದಾರ
 DocType: Cheque Print Template,Amount In Figure,ಚಿತ್ರದಲ್ಲಿ ಪ್ರಮಾಣ
@@ -226,30 +225,32 @@
 DocType: Production Planning Tool,Sales Orders,ಮಾರಾಟ ಆದೇಶಗಳಿಗೆ
 DocType: Purchase Taxes and Charges,Valuation,ಬೆಲೆಕಟ್ಟುವಿಕೆ
 ,Purchase Order Trends,ಆರ್ಡರ್ ಟ್ರೆಂಡ್ಸ್ ಖರೀದಿಸಿ
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,The request for quotation can be accessed by clicking on the following link,ಉದ್ಧರಣ ವಿನಂತಿಯನ್ನು ಕೆಳಗಿನ ಲಿಂಕ್ ಕ್ಲಿಕ್ಕಿಸಿ ನಿಲುಕಿಸಿಕೊಳ್ಳಬಹುದು
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,ವರ್ಷದ ಎಲೆಗಳು ನಿಯೋಜಿಸಿ.
 DocType: SG Creation Tool Course,SG Creation Tool Course,ಎಸ್ಜಿ ಸೃಷ್ಟಿ ಉಪಕರಣ ಕೋರ್ಸ್
 DocType: Student Group Creation Tool,Leave blank if you wish to fetch all courses for selected academic term,ನೀವು ಆಯ್ಕೆ ಶೈಕ್ಷಣಿಕ ಅವಧಿಗೆ ಎಲ್ಲಾ ಶಿಕ್ಷಣ ತರಲು ಬಯಸಿದರೆ ಖಾಲಿ ಬಿಡಿ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,Insufficient Stock,ಸಾಕಷ್ಟು ಸ್ಟಾಕ್
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227,Insufficient Stock,ಸಾಕಷ್ಟು ಸ್ಟಾಕ್
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ ಸಾಮರ್ಥ್ಯವನ್ನು ಯೋಜನೆ ಮತ್ತು ಟೈಮ್ ಟ್ರಾಕಿಂಗ್
+DocType: Email Digest,New Sales Orders,ಹೊಸ ಮಾರಾಟ ಆದೇಶಗಳನ್ನು
 DocType: Bank Reconciliation,Bank Account,ಠೇವಣಿ ವಿವರ
 DocType: Leave Type,Allow Negative Balance,ನಕಾರಾತ್ಮಕ ಬ್ಯಾಲೆನ್ಸ್ ಅನುಮತಿಸಿ
 DocType: Selling Settings,Default Territory,ಡೀಫಾಲ್ಟ್ ಪ್ರದೇಶ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,ಟೆಲಿವಿಷನ್
 DocType: Production Order Operation,Updated via 'Time Log','ಟೈಮ್ ಲಾಗ್' ಮೂಲಕ ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} does not belong to Company {1},ಖಾತೆ {0} ಕಂಪನಿ ಸೇರುವುದಿಲ್ಲ {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +86,Account {0} does not belong to Company {1},ಖಾತೆ {0} ಕಂಪನಿ ಸೇರುವುದಿಲ್ಲ {1}
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},ಅಡ್ವಾನ್ಸ್ ಪ್ರಮಾಣವನ್ನು ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ {0} {1}
 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 +174,For Warehouse is required before Submit,ವೇರ್ಹೌಸ್ ಬೇಕಾಗುತ್ತದೆ ಮೊದಲು ಸಲ್ಲಿಸಿ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,For Warehouse is required before Submit,ವೇರ್ಹೌಸ್ ಬೇಕಾಗುತ್ತದೆ ಮೊದಲು ಸಲ್ಲಿಸಿ
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,ಪಡೆಯುವಂತಹ
 DocType: Sales Partner,Reseller,ಮರುಮಾರಾಟ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,ಕಂಪನಿ ನಮೂದಿಸಿ
 DocType: Delivery Note Item,Against Sales Invoice Item,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಐಟಂ ವಿರುದ್ಧ
 ,Production Orders in Progress,ಪ್ರೋಗ್ರೆಸ್ ಉತ್ಪಾದನೆ ಆರ್ಡರ್ಸ್
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Cash from Financing,ಹಣಕಾಸು ನಿವ್ವಳ ನಗದು
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1436,"LocalStorage is full , did not save","ಸ್ಥಳಿಯಸಂಗ್ರಹಣೆ ಪೂರ್ಣ, ಉಳಿಸಲು ಮಾಡಲಿಲ್ಲ"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1460,"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}
@@ -262,18 +263,19 @@
 apps/erpnext/erpnext/templates/generators/item.html +78,No description given,ಯಾವುದೇ ವಿವರಣೆ givenName
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,ಖರೀದಿ ವಿನಂತಿ .
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +5,This is based on the Time Sheets created against this project,ಈ ಯೋಜನೆಯ ವಿರುದ್ಧ ಕಾಲ ಶೀಟ್ಸ್ ಆಧರಿಸಿದೆ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Only the selected Leave Approver can submit this Leave Application,ಕೇವಲ ಆಯ್ದ ಲೀವ್ ಅನುಮೋದಕ ಈ ರಜೆ ಅಪ್ಲಿಕೇಶನ್ ಸಲ್ಲಿಸಬಹುದು
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +213,Only the selected Leave Approver can submit this Leave Application,ಕೇವಲ ಆಯ್ದ ಲೀವ್ ಅನುಮೋದಕ ಈ ರಜೆ ಅಪ್ಲಿಕೇಶನ್ ಸಲ್ಲಿಸಬಹುದು
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,ದಿನಾಂಕ ನಿವಾರಿಸುವ ಸೇರುವ ದಿನಾಂಕ ಹೆಚ್ಚಿನ ಇರಬೇಕು
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Leaves per Year,ವರ್ಷಕ್ಕೆ ಎಲೆಗಳು
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,ವರ್ಷಕ್ಕೆ ಎಲೆಗಳು
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,ಸಾಲು {0}: ಪರಿಶೀಲಿಸಿ ಖಾತೆ ವಿರುದ್ಧ 'ಅಡ್ವಾನ್ಸ್ ಈಸ್' {1} ಈ ಮುಂಗಡ ಪ್ರವೇಶ ವೇಳೆ.
 apps/erpnext/erpnext/stock/utils.py +188,Warehouse {0} does not belong to company {1},ವೇರ್ಹೌಸ್ {0} ಸೇರುವುದಿಲ್ಲ ಕಂಪನಿ {1}
+DocType: Email Digest,Profit & Loss,ಲಾಭ ನಷ್ಟ
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,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 +435,Leave Blocked,ಬಿಡಿ ನಿರ್ಬಂಧಿಸಿದ
-apps/erpnext/erpnext/stock/doctype/item/item.py +669,Item {0} has reached its end of life on {1},ಐಟಂ {0} ಜೀವನದ ತನ್ನ ಕೊನೆಯಲ್ಲಿ ತಲುಪಿದೆ {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +443,Leave Blocked,ಬಿಡಿ ನಿರ್ಬಂಧಿಸಿದ
+apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item {0} has reached its end of life on {1},ಐಟಂ {0} ಜೀವನದ ತನ್ನ ಕೊನೆಯಲ್ಲಿ ತಲುಪಿದೆ {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +95,Bank Entries,ಬ್ಯಾಂಕ್ ನಮೂದುಗಳು
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +83,Annual,ವಾರ್ಷಿಕ
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +86,Annual,ವಾರ್ಷಿಕ
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,ಸ್ಟಾಕ್ ಸಾಮರಸ್ಯ ಐಟಂ
 DocType: Stock Entry,Sales Invoice No,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ನಂ
 DocType: Material Request Item,Min Order Qty,ಮಿನ್ ಪ್ರಮಾಣ ಆದೇಶ
@@ -281,20 +283,22 @@
 DocType: Lead,Do Not Contact,ಸಂಪರ್ಕಿಸಿ ಇಲ್ಲ
 apps/erpnext/erpnext/public/js/setup_wizard.js +360,People who teach at your organisation,ನಿಮ್ಮ ಸಂಘಟನೆಯಲ್ಲಿ ಕಲಿಸಲು ಜನರು
 DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,ಎಲ್ಲಾ ಮರುಕಳಿಸುವ ಇನ್ವಾಯ್ಸ್ ಟ್ರ್ಯಾಕ್ ಅನನ್ಯ ID . ಇದು ಸಲ್ಲಿಸಲು ಮೇಲೆ ಉತ್ಪಾದಿಸಲಾಗುತ್ತದೆ.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Software Developer,ಸಾಫ್ಟ್ವೇರ್ ಡೆವಲಪರ್
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,ಸಾಫ್ಟ್ವೇರ್ ಡೆವಲಪರ್
 DocType: Item,Minimum Order Qty,ಕನಿಷ್ಠ ಪ್ರಮಾಣ ಆದೇಶ
 DocType: Pricing Rule,Supplier Type,ಸರಬರಾಜುದಾರ ಪ್ರಕಾರ
 DocType: Scheduling Tool,Course Start Date,ಕೋರ್ಸ್ ಪ್ರಾರಂಭ ದಿನಾಂಕ
 DocType: Item,Publish in Hub,ಹಬ್ ಪ್ರಕಟಿಸಿ
+DocType: Student Admission,Student Admission,ವಿದ್ಯಾರ್ಥಿ ಪ್ರವೇಶ
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is cancelled,ಐಟಂ {0} ರದ್ದು
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Material Request,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ
+apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} is cancelled,ಐಟಂ {0} ರದ್ದು
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +823,Material Request,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ
 DocType: Bank Reconciliation,Update Clearance Date,ಅಪ್ಡೇಟ್ ಕ್ಲಿಯರೆನ್ಸ್ ದಿನಾಂಕ
 apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +28,Abbreviation already used for another salary component,ಸಂಕ್ಷೇಪಣ ಈಗಾಗಲೇ ಮತ್ತೊಂದು ಸಂಬಳ ಘಟಕವನ್ನು ಬಳಸಲಾಗುತ್ತದೆ
 DocType: Item,Purchase Details,ಖರೀದಿ ವಿವರಗಳು
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +328,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},ಖರೀದಿ ಆದೇಶದ &#39;ಕಚ್ಚಾ ವಸ್ತುಗಳ ಸರಬರಾಜು ಕೋಷ್ಟಕದಲ್ಲಿ ಕಂಡುಬಂದಿಲ್ಲ ಐಟಂ {0} {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +333,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/config/selling.py +18,Confirmed orders from Customers.,ಗ್ರಾಹಕರಿಂದ ಕನ್ಫರ್ಮ್ಡ್ ಆದೇಶಗಳನ್ನು .
 DocType: Purchase Receipt Item,Rejected Quantity,ತಿರಸ್ಕರಿಸಲಾಗಿದೆ ಪ್ರಮಾಣ
 DocType: SMS Settings,SMS Sender Name,ಎಸ್ಎಂಎಸ್ ಕಳುಹಿಸಿದವರ ಹೆಸರು
@@ -310,20 +314,21 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +130,Please select Charge Type first,ಮೊದಲ ಬ್ಯಾಚ್ ಪ್ರಕಾರವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ
 DocType: Student Group Student,Student Group Student,ವಿದ್ಯಾರ್ಥಿ ಗುಂಪು ವಿದ್ಯಾರ್ಥಿ
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,ಇತ್ತೀಚಿನ
+DocType: Email Digest,New Quotations,ಹೊಸ ಉಲ್ಲೇಖಗಳು
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,ಪಟ್ಟಿಯಲ್ಲಿ ಮೊದಲ ಲೀವ್ ಅನುಮೋದಕ ಡೀಫಾಲ್ಟ್ ಲೀವ್ ಅನುಮೋದಕ ಎಂದು ಸೆಟ್ ಮಾಡಲಾಗುತ್ತದೆ
 DocType: Tax Rule,Shipping County,ಶಿಪ್ಪಿಂಗ್ ಕೌಂಟಿ
 apps/erpnext/erpnext/config/desktop.py +158,Learn,ಕಲಿಯಿರಿ
 DocType: Asset,Next Depreciation Date,ಮುಂದಿನ ಸವಕಳಿ ದಿನಾಂಕ
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,ನೌಕರರ ಚಟುವಟಿಕೆಗಳನ್ನು ವೆಚ್ಚ
 DocType: Accounts Settings,Settings for Accounts,ಖಾತೆಗಳಿಗೆ ಸೆಟ್ಟಿಂಗ್ಗಳು
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +626,Supplier Invoice No exists in Purchase Invoice {0},ಸರಬರಾಜುದಾರ ಸರಕುಪಟ್ಟಿ ಯಾವುದೇ ಖರೀದಿ ಸರಕುಪಟ್ಟಿ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +629,Supplier Invoice No exists in Purchase Invoice {0},ಸರಬರಾಜುದಾರ ಸರಕುಪಟ್ಟಿ ಯಾವುದೇ ಖರೀದಿ ಸರಕುಪಟ್ಟಿ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,ಮಾರಾಟಗಾರನ ಟ್ರೀ ನಿರ್ವಹಿಸಿ .
 DocType: Job Applicant,Cover Letter,ಕವರ್ ಲೆಟರ್
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,ಅತ್ಯುತ್ತಮ ಚೆಕ್ ಮತ್ತು ತೆರವುಗೊಳಿಸಲು ಠೇವಣಿಗಳ
 DocType: Item,Synced With Hub,ಹಬ್ ಸಿಂಕ್
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,ತಪ್ಪು ಪಾಸ್ವರ್ಡ್
 DocType: Item,Variant Of,ಭಿನ್ನ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,Completed Qty can not be greater than 'Qty to Manufacture',ಹೆಚ್ಚು 'ಪ್ರಮಾಣ ತಯಾರಿಸಲು' ಮುಗಿದಿದೆ ಪ್ರಮಾಣ ಹೆಚ್ಚಾಗಿರುವುದು ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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 +86,Circular Reference Error,ಸುತ್ತೋಲೆ ಆಧಾರದೋಷ
@@ -335,15 +340,16 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,ಸ್ವಯಂಚಾಲಿತ ವಸ್ತು ವಿನಂತಿಯನ್ನು ಸೃಷ್ಟಿ ಮೇಲೆ ಈಮೇಲ್ ಸೂಚಿಸಿ
 DocType: Journal Entry,Multi Currency,ಮಲ್ಟಿ ಕರೆನ್ಸಿ
 DocType: Payment Reconciliation Invoice,Invoice Type,ಸರಕುಪಟ್ಟಿ ಪ್ರಕಾರ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +806,Delivery Note,ಡೆಲಿವರಿ ಗಮನಿಸಿ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +800,Delivery Note,ಡೆಲಿವರಿ ಗಮನಿಸಿ
 apps/erpnext/erpnext/config/learn.py +87,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 +233,Payment Entry has been modified after you pulled it. Please pull it again.,ನೀವು ಹೊರಹಾಕಿದ ನಂತರ ಪಾವತಿ ಎಂಟ್ರಿ ಮಾರ್ಪಡಿಸಲಾಗಿದೆ. ಮತ್ತೆ ಎಳೆಯಲು ದಯವಿಟ್ಟು.
+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/setup/doctype/email_digest/email_digest.py +104,Summary for this week and pending activities,ಈ ವಾರ ಬಾಕಿ ಚಟುವಟಿಕೆಗಳಿಗೆ ಸಾರಾಂಶ
+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",ಬೇರ್ಪಡಿಸಲಾಗಿರುತ್ತದೆ ಇಮೇಲ್ ಐಡಿ ಯನ್ನು ಸರಕುಪಟ್ಟಿ ನಿರ್ದಿಷ್ಟ ದಿನಾಂಕವನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಮೇಲ್ ಆಗುತ್ತದೆ
 DocType: Employee,Company Email,ಕಂಪನಿ ಇಮೇಲ್
@@ -355,28 +361,29 @@
 apps/erpnext/erpnext/config/hr.py +186,"Employee designation (e.g. CEO, Director etc.).","ನೌಕರರ ಹುದ್ದೆ ( ಇ ಜಿ ಸಿಇಒ , ನಿರ್ದೇಶಕ , ಇತ್ಯಾದಿ ) ."
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,ನಮೂದಿಸಿ fieldValue ' ತಿಂಗಳಿನ ದಿನ ಪುನರಾವರ್ತಿಸಿ '
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,ಗ್ರಾಹಕ ಕರೆನ್ಸಿ ದರ ಗ್ರಾಹಕ ಬೇಸ್ ಕರೆನ್ಸಿ ಪರಿವರ್ತನೆ
-apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},ರೋ # {0} ಖರೀದಿ ಸರಕುಪಟ್ಟಿ ಸಾಧ್ಯವಿಲ್ಲ ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ಆಸ್ತಿಯ ಕುರಿತು ಮಾಡಿದ {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +554,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},ರೋ # {0} ಖರೀದಿ ಸರಕುಪಟ್ಟಿ ಸಾಧ್ಯವಿಲ್ಲ ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ಆಸ್ತಿಯ ಕುರಿತು ಮಾಡಿದ {1}
 DocType: Item Tax,Tax Rate,ತೆರಿಗೆ ದರ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} ಈಗಾಗಲೇ ನೌಕರರ ಹಂಚಿಕೆ {1} ಗೆ ಅವಧಿಯಲ್ಲಿ {2} ಫಾರ್ {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +812,Select Item,ಆಯ್ಕೆ ಐಟಂ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +791,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/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,ಖರೀದಿ ಸರಕುಪಟ್ಟಿ {0} ಈಗಾಗಲೇ ಸಲ್ಲಿಸಿದ
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},ರೋ # {0}: ಬ್ಯಾಚ್ ಯಾವುದೇ ಅದೇ ಇರಬೇಕು {1} {2}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +143,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.,ಐಟಂ ಬ್ಯಾಚ್ ( ಬಹಳಷ್ಟು ) .
 DocType: C-Form Invoice Detail,Invoice Date,ಸರಕುಪಟ್ಟಿ ದಿನಾಂಕ
 DocType: GL Entry,Debit Amount,ಡೆಬಿಟ್ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/accounts/party.py +242,There can only be 1 Account per Company in {0} {1},ಮಾತ್ರ ಕಂಪನಿ ಪ್ರತಿ 1 ಖಾತೆ ಇಲ್ಲದಂತಾಗುತ್ತದೆ {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +4,Your email address,ನಿಮ್ಮ ಈಮೇಲ್ ವಿಳಾಸ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +342,Please see attachment,ಬಾಂಧವ್ಯ ನೋಡಿ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,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 +19,Setup Already Complete!!,ಈಗಾಗಲೇ ಸೆಟಪ್ ಪೂರ್ಣಗೊಳಿಸಲು!
 ,Finished Goods,ಪೂರ್ಣಗೊಂಡ ಸರಕನ್ನು
 DocType: Delivery Note,Instructions,ಸೂಚನೆಗಳು
 DocType: Quality Inspection,Inspected By,ಪರಿಶೀಲನೆ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,ಸರಬರಾಜುದಾರ&gt; ಸರಬರಾಜುದಾರ ಕೌಟುಂಬಿಕತೆ
 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,ವಸ್ತುಗಳು ಸೇರಿಸಿ
@@ -390,29 +397,29 @@
 DocType: Currency Exchange,Currency Exchange,ಕರೆನ್ಸಿ ವಿನಿಮಯ
 DocType: Purchase Invoice Item,Item Name,ಐಟಂ ಹೆಸರು
 DocType: Authorization Rule,Approving User  (above authorized value),(ಅಧಿಕಾರ ಮೌಲ್ಯವನ್ನು ಮೇಲೆ) ಬಳಕೆದಾರ ಅನುಮೋದನೆ
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,ಸಾಲ ಬಾಕಿ
+DocType: Email Digest,Credit Balance,ಸಾಲ ಬಾಕಿ
 DocType: Employee,Widowed,ಒಂಟಿಯಾದ
 DocType: Request for Quotation,Request for Quotation,ಉದ್ಧರಣ ವಿನಂತಿ
 DocType: Salary Slip Timesheet,Working Hours,ದುಡಿಮೆಯು
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ಸರಣಿಯ ಆರಂಭಿಕ / ಪ್ರಸ್ತುತ ಅನುಕ್ರಮ ಸಂಖ್ಯೆ ಬದಲಾಯಿಸಿ.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","ಅನೇಕ ಬೆಲೆ ನಿಯಮಗಳು ಮೇಲುಗೈ ಮುಂದುವರಿದರೆ, ಬಳಕೆದಾರರು ಸಂಘರ್ಷ ಪರಿಹರಿಸಲು ಕೈಯಾರೆ ಆದ್ಯತಾ ಸೆಟ್ ತಿಳಿಸಲಾಗುತ್ತದೆ."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +736,Purchase Return,ಖರೀದಿ ರಿಟರ್ನ್
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +715,Purchase Return,ಖರೀದಿ ರಿಟರ್ನ್
 ,Purchase Register,ಖರೀದಿ ನೋಂದಣಿ
 DocType: Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,ಅನ್ವಯಿಸುವ ಆರೋಪಗಳನ್ನು
 DocType: Workstation,Consumable Cost,ಉಪಭೋಗ್ಯ ವೆಚ್ಚ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +202,{0} ({1}) must have role 'Leave Approver',{0} ({1}) ಪಾತ್ರ ಹೊಂದಿರಬೇಕು 'ಬಿಡಿ ಅನುಮೋದಕ'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,{0} ({1}) must have role 'Leave Approver',{0} ({1}) ಪಾತ್ರ ಹೊಂದಿರಬೇಕು 'ಬಿಡಿ ಅನುಮೋದಕ'
 DocType: Purchase Receipt,Vehicle Date,ವಾಹನ ದಿನಾಂಕ
 DocType: Student Log,Medical,ವೈದ್ಯಕೀಯ
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,ಸೋತ ಕಾರಣ
-apps/erpnext/erpnext/accounts/utils.py +239,Allocated amount can not greater than unadjusted amount,ಹಂಚಿಕೆ ಪ್ರಮಾಣವನ್ನು ಹೊರಹೊಮ್ಮಿತು ಪ್ರಮಾಣದ ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ
+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,ಹಂಚಿಕೆ ಪ್ರಮಾಣವನ್ನು ಹೊರಹೊಮ್ಮಿತು ಪ್ರಮಾಣದ ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Announcement,Receiver,ಸ್ವೀಕರಿಸುವವರ
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},ಕಾರ್ಯಸ್ಥಳ ಹಾಲಿಡೇ ಪಟ್ಟಿ ಪ್ರಕಾರ ಕೆಳಗಿನ ದಿನಾಂಕಗಳಂದು ಮುಚ್ಚಲಾಗಿದೆ: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,ಅವಕಾಶಗಳು
 DocType: Employee,Single,ಏಕೈಕ
 DocType: Account,Cost of Goods Sold,ಮಾರಿದ ವಸ್ತುಗಳ ಬೆಲೆ
 DocType: Purchase Invoice,Yearly,ವಾರ್ಷಿಕ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +225,Please enter Cost Center,ಒಂದು ವೆಚ್ಚದ ಕೇಂದ್ರವಾಗಿ ನಮೂದಿಸಿ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,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,ಎಕ್ಸಾಮಿನರ್ ಹೆಸರು
@@ -425,26 +432,26 @@
 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,ಚೆಕ್ ಸರಬರಾಜುದಾರ ಸರಕುಪಟ್ಟಿ ಸಂಖ್ಯೆ ವೈಶಿಷ್ಟ್ಯ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',' ನಂ ಪ್ರಕರಣಕ್ಕೆ . ' ' ಕೇಸ್ ನಂ ಗೆ . ' ಕಡಿಮೆ ಸಾಧ್ಯವಿಲ್ಲ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,Non Profit,ಲಾಭಾಪೇಕ್ಷೆಯಿಲ್ಲದ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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: Stock Reconciliation Item,Do not include symbols (ex. $),ಚಿಹ್ನೆಗಳು ಸೇರಿಸಬೇಡಿ (ಉದಾ. $)
 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 +638,Attribute {0} selected multiple times in Attributes Table,ಗುಣಲಕ್ಷಣ {0} ಗುಣಲಕ್ಷಣಗಳು ಟೇಬಲ್ ಅನೇಕ ಬಾರಿ ಆಯ್ಕೆ
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,ಗುಣಲಕ್ಷಣ {0} ಗುಣಲಕ್ಷಣಗಳು ಟೇಬಲ್ ಅನೇಕ ಬಾರಿ ಆಯ್ಕೆ
 DocType: HR Settings,Employee record is created using selected field. ,
 DocType: Sales Order,Not Applicable,ಅನ್ವಯಿಸುವುದಿಲ್ಲ
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,ಹಾಲಿಡೇ ಮಾಸ್ಟರ್ .
 DocType: Request for Quotation Item,Required Date,ಅಗತ್ಯವಿರುವ ದಿನಾಂಕ
 DocType: Delivery Note,Billing Address,ಬಿಲ್ಲಿಂಗ್ ವಿಳಾಸ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +862,Please enter Item Code.,ಐಟಂ ಕೋಡ್ ನಮೂದಿಸಿ.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +847,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","ಪರಿಶೀಲಿಸಿದರೆ ಈಗಾಗಲೇ ಮುದ್ರಣ ದರ / ಪ್ರಿಂಟ್ ಪ್ರಮಾಣ ಸೇರಿಸಲಾಗಿದೆ ಎಂದು , ತೆರಿಗೆ ಪ್ರಮಾಣವನ್ನು ಪರಿಗಣಿಸಲಾಗುವುದು"
@@ -458,12 +465,12 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,ಸೆಕ್ಯುರಿಟೀಸ್ ಮತ್ತು ನಿಕ್ಷೇಪಗಳು
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,ಹಂಚಿಕೆ ಒಟ್ಟು ಎಲೆಗಳು ಕಡ್ಡಾಯ
 DocType: Job Opening,Description of a Job Opening,ಒಂದು ಉದ್ಯೋಗಾವಕಾಶದ ವಿವರಣೆ
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Pending activities for today,ಇಂದು ಬಾಕಿ ಚಟುವಟಿಕೆಗಳನ್ನು
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,ಇಂದು ಬಾಕಿ ಚಟುವಟಿಕೆಗಳನ್ನು
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,ಹಾಜರಾತಿ .
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Timesheet ಆಧಾರಿತ ವೇತನದಾರರ ಸಂಬಳ ಕಾಂಪೊನೆಂಟ್.
 DocType: Sales Order Item,Used for Production Plan,ಉತ್ಪಾದನೆ ಯೋಜನೆ ಉಪಯೋಗಿಸಿದ
 DocType: Manufacturing Settings,Time Between Operations (in mins),(ನಿಮಿಷಗಳು) ಕಾರ್ಯಾಚರಣೆ ನಡುವೆ ಸಮಯ
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +92,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} ಖಾತೆ {1} ವೆಚ್ಚದ ಕೇಂದ್ರ ವಿರುದ್ಧ ಬಜೆಟ್ನ {2} ಆಗಿದೆ {3}. ಇದು ಮೂಲಕ ಮೀರುತ್ತದೆ {4}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +95,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} ಖಾತೆ {1} ವೆಚ್ಚದ ಕೇಂದ್ರ ವಿರುದ್ಧ ಬಜೆಟ್ನ {2} ಆಗಿದೆ {3}. ಇದು ಮೂಲಕ ಮೀರುತ್ತದೆ {4}
 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 ಒಂದೇ ಐಟಂ ಅಲ್ಲ
@@ -471,16 +478,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +238,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 +86,Administrative Officer,ಆಡಳಿತಾಧಿಕಾರಿ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,ಆಡಳಿತಾಧಿಕಾರಿ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +23,Acutal Qty {0} / Waiting Qty {1},Acutal ಪ್ರಮಾಣ {0} / ವೇಟಿಂಗ್ ಪ್ರಮಾಣ {1}
 DocType: Timesheet Detail,Hrs,ಗಂಟೆಗಳ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +319,Please select Company,ಕಂಪನಿ ಆಯ್ಕೆಮಾಡಿ
-DocType: Stock Entry,Difference Account,ವ್ಯತ್ಯಾಸ ಖಾತೆ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +309,Please select Company,ಕಂಪನಿ ಆಯ್ಕೆಮಾಡಿ
+DocType: Stock Entry Detail,Difference Account,ವ್ಯತ್ಯಾಸ ಖಾತೆ
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,ಇದನ್ನು ಅವಲಂಬಿಸಿರುವ ಕೆಲಸವನ್ನು {0} ಮುಚ್ಚಿಲ್ಲ ಹತ್ತಿರಕ್ಕೆ ಕೆಲಸವನ್ನು ಸಾಧ್ಯವಿಲ್ಲ.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Please enter Warehouse for which Material Request will be raised,ವೇರ್ಹೌಸ್ ವಸ್ತು ವಿನಂತಿಯನ್ನು ಏರಿಸಲಾಗುತ್ತದೆ ಇದಕ್ಕಾಗಿ ನಮೂದಿಸಿ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +399,Please enter Warehouse for which Material Request will be raised,ವೇರ್ಹೌಸ್ ವಸ್ತು ವಿನಂತಿಯನ್ನು ಏರಿಸಲಾಗುತ್ತದೆ ಇದಕ್ಕಾಗಿ ನಮೂದಿಸಿ
 DocType: Production Order,Additional Operating Cost,ಹೆಚ್ಚುವರಿ ವೆಚ್ಚವನ್ನು
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,ಕಾಸ್ಮೆಟಿಕ್ಸ್
-apps/erpnext/erpnext/stock/doctype/item/item.py +530,"To merge, following properties must be same for both items","ವಿಲೀನಗೊಳ್ಳಲು , ನಂತರ ಲಕ್ಷಣಗಳು ಐಟಂಗಳನ್ನು ಸಾಮಾನ್ಯ ಇರಬೇಕು"
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,"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 +28,Buy,ಖರೀದಿ
@@ -488,7 +495,7 @@
 DocType: Sales Invoice,Offline POS Name,ಆಫ್ಲೈನ್ ಪಿಓಎಸ್ ಹೆಸರು
 DocType: Sales Order,To Deliver,ತಲುಪಿಸಲು
 DocType: Purchase Invoice Item,Item,ವಸ್ತು
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1563,Serial no item cannot be a fraction,ಸೀರಿಯಲ್ ಯಾವುದೇ ಐಟಂ ಭಾಗವನ್ನು ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1587,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,ವ್ಯವಸ್ಥಾಪಕ ಉಪಗುತ್ತಿಗೆ
@@ -497,13 +504,14 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Account {0} does not belong to company: {1},ಖಾತೆ {0} ಕಂಪನಿ ಸೇರುವುದಿಲ್ಲ: {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation already used for another company,ಸಂಕ್ಷೇಪಣ ಈಗಾಗಲೇ ಮತ್ತೊಂದು ಕಂಪನಿಗೆ ಬಳಸಲಾಗುತ್ತದೆ
 DocType: Selling Settings,Default Customer Group,ಡೀಫಾಲ್ಟ್ ಗ್ರಾಹಕ ಗುಂಪಿನ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Supplier is required against Payable account {0},ಸರಬರಾಜುದಾರ ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆಯನ್ನು ವಿರುದ್ಧ ಅಗತ್ಯವಿದೆ {0}
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿದಲ್ಲಿ, ' ದುಂಡಾದ ಒಟ್ಟು ' ಕ್ಷೇತ್ರದಲ್ಲಿ ಯಾವುದೇ ವ್ಯವಹಾರದಲ್ಲಿ ಕಾಣಿಸುವುದಿಲ್ಲ"
 DocType: BOM,Operating Cost,ವೆಚ್ಚವನ್ನು
 DocType: Sales Order Item,Gross Profit,ನಿವ್ವಳ ಲಾಭ
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +42,Increment cannot be 0,ಹೆಚ್ಚಳವನ್ನು 0 ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Production Planning Tool,Material Requirement,ಮೆಟೀರಿಯಲ್ ಅವಶ್ಯಕತೆ
 DocType: Company,Delete Company Transactions,ಕಂಪನಿ ಟ್ರಾನ್ಸಾಕ್ಷನ್ಸ್ ಅಳಿಸಿ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +313,Reference No and Reference Date is mandatory for Bank transaction,ರೆಫರೆನ್ಸ್ ಯಾವುದೇ ಮತ್ತು ರೆಫರೆನ್ಸ್ ದಿನಾಂಕ ಬ್ಯಾಂಕ್ ವ್ಯವಹಾರ ಕಡ್ಡಾಯವಾಗಿದೆ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +316,Reference No and Reference Date is mandatory for Bank transaction,ರೆಫರೆನ್ಸ್ ಯಾವುದೇ ಮತ್ತು ರೆಫರೆನ್ಸ್ ದಿನಾಂಕ ಬ್ಯಾಂಕ್ ವ್ಯವಹಾರ ಕಡ್ಡಾಯವಾಗಿದೆ
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,ಸೇರಿಸಿ / ಸಂಪಾದಿಸಿ ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು
 DocType: Purchase Invoice,Supplier Invoice No,ಸರಬರಾಜುದಾರ ಸರಕುಪಟ್ಟಿ ನಂ
 DocType: Territory,For reference,ಪರಾಮರ್ಶೆಗಾಗಿ
@@ -514,7 +522,6 @@
 DocType: Installation Note Item,Installation Note Item,ಅನುಸ್ಥಾಪನೆ ಸೂಚನೆ ಐಟಂ
 DocType: Production Plan Item,Pending Qty,ಬಾಕಿ ಪ್ರಮಾಣ
 DocType: Budget,Ignore,ಕಡೆಗಣಿಸು
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,ಐಟಂ ಕೋಡ್&gt; ಐಟಂ ಗ್ರೂಪ್&gt; ಬ್ರ್ಯಾಂಡ್
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,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
@@ -525,11 +532,11 @@
 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/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,ಸರಕುಪಟ್ಟಿ ಕೋಷ್ಟಕದಲ್ಲಿ ಯಾವುದೇ ದಾಖಲೆಗಳು
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +28,Please select Company and Party Type first,ಮೊದಲ ಕಂಪನಿ ಮತ್ತು ಪಕ್ಷದ ಕೌಟುಂಬಿಕತೆ ಆಯ್ಕೆ ಮಾಡಿ
+apps/erpnext/erpnext/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/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 +707,Make Sales Order,ಮಾಡಿ ಮಾರಾಟದ ಆರ್ಡರ್
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +701,Make Sales Order,ಮಾಡಿ ಮಾರಾಟದ ಆರ್ಡರ್
 DocType: Project Task,Project Task,ಪ್ರಾಜೆಕ್ಟ್ ಟಾಸ್ಕ್
 ,Lead Id,ಲೀಡ್ ಸಂ
 DocType: C-Form Invoice Detail,Grand Total,ಗ್ರ್ಯಾಂಡ್ ಒಟ್ಟು
@@ -545,7 +552,8 @@
 DocType: Job Applicant,Resume Attachment,ಪುನರಾರಂಭಿಸು ಲಗತ್ತು
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,ಮತ್ತೆ ಗ್ರಾಹಕರ
 DocType: Leave Control Panel,Allocate,ಗೊತ್ತುಪಡಿಸು
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +734,Sales Return,ಮಾರಾಟದ ರಿಟರ್ನ್
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +728,Sales Return,ಮಾರಾಟದ ರಿಟರ್ನ್
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +91,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,ಗಮನಿಸಿ: ಒಟ್ಟು ನಿಯೋಜಿತವಾದ ಎಲೆಗಳನ್ನು {0} ಈಗಾಗಲೇ ಅನುಮೋದನೆ ಎಲೆಗಳು ಕಡಿಮೆ ಮಾಡಬಾರದು {1} ಕಾಲ
 DocType: Announcement,Posted By,ಪೋಸ್ಟ್ ಮಾಡಿದವರು
 DocType: Item,Delivered by Supplier (Drop Ship),ಸರಬರಾಜುದಾರ ವಿತರಣೆ (ಡ್ರಾಪ್ ಹಡಗು)
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,ಸಂಭಾವ್ಯ ಗ್ರಾಹಕರು ಡೇಟಾಬೇಸ್ .
@@ -554,14 +562,13 @@
 DocType: Quotation,Quotation To,ಉದ್ಧರಣಾ
 DocType: Lead,Middle Income,ಮಧ್ಯಮ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +212,Opening (Cr),ತೆರೆಯುತ್ತಿದೆ ( ಸಿಆರ್)
-apps/erpnext/erpnext/stock/doctype/item/item.py +795,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,ನೀವು ಈಗಾಗಲೇ ಮತ್ತೊಂದು ಮೈಸೂರು ವಿಶ್ವವಿದ್ಯಾನಿಲದ ಕೆಲವು ವ್ಯವಹಾರ (ರು) ಮಾಡಿರುವ ಕಾರಣ ಐಟಂ ಚಟುವಟಿಕೆ ಡೀಫಾಲ್ಟ್ ಘಟಕ {0} ನೇರವಾಗಿ ಬದಲಾಯಿಸಲಾಗುವುದಿಲ್ಲ. ನೀವು ಬೇರೆ ಡೀಫಾಲ್ಟ್ ಮೈಸೂರು ವಿಶ್ವವಿದ್ಯಾನಿಲದ ಬಳಸಲು ಹೊಸ ಐಟಂ ರಚಿಸಬೇಕಾಗಿದೆ.
-apps/erpnext/erpnext/accounts/utils.py +237,Allocated amount can not be negative,ಹಂಚಿಕೆ ಪ್ರಮಾಣವನ್ನು ಋಣಾತ್ಮಕ ಇರುವಂತಿಲ್ಲ
+apps/erpnext/erpnext/stock/doctype/item/item.py +797,Default Unit of Measure for Item {0} cannot be changed directly because 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,ಹಂಚಿಕೆ ಪ್ರಮಾಣವನ್ನು ಋಣಾತ್ಮಕ ಇರುವಂತಿಲ್ಲ
 DocType: Purchase Order Item,Billed Amt,ಖ್ಯಾತವಾದ ಕಚೇರಿ
 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 +91,Reference No & Reference Date is required for {0},ರೆಫರೆನ್ಸ್ ನಂ & ರೆಫರೆನ್ಸ್ ದಿನಾಂಕ ಅಗತ್ಯವಿದೆ {0}
-DocType: Sales Invoice,Customer's Vendor,ಗ್ರಾಹಕರ ಮಾರಾಟಗಾರರ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Proposal Writing,ಪ್ರೊಪೋಸಲ್ ಬರವಣಿಗೆ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,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","ಉಪ ಗುತ್ತಿಗೆ ಮೆಟೀರಿಯಲ್ ವಿನಂತಿಗಳು ಸೇರಿಸಲಾಗುವುದು ಎಂದು ಐಟಂಗಳನ್ನು ಪರಿಶೀಲಿಸಿದ, ಕಚ್ಚಾ ವಸ್ತುಗಳ ವೇಳೆ"
@@ -570,13 +577,14 @@
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,ಟೈಮ್ ಟ್ರಾಕಿಂಗ್
 DocType: Fiscal Year Company,Fiscal Year Company,ಹಣಕಾಸಿನ ವರ್ಷ ಕಂಪನಿ
 DocType: Packing Slip Item,DN Detail,ಡಿ ವಿವರ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +257,Already supplier quotation has created,ಈಗಾಗಲೇ ಸರಬರಾಜು ಉದ್ಧರಣ ಸೃಷ್ಟಿಸಿದೆ
 DocType: Timesheet,Billed,ಖ್ಯಾತವಾದ
 DocType: Batch,Batch Description,ಬ್ಯಾಚ್ ವಿವರಣೆ
+apps/erpnext/erpnext/accounts/utils.py +685,"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 +733,View Offline Records,ಆಫ್ಲೈನ್ ರೆಕಾರ್ಡ್ಸ್ ವೀಕ್ಷಿಸಿ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +715,View Offline Records,ಆಫ್ಲೈನ್ ರೆಕಾರ್ಡ್ಸ್ ವೀಕ್ಷಿಸಿ
+DocType: Student,Sibling Details,ಒಡಹುಟ್ಟಿದವರು ವಿವರಗಳು
 DocType: Employee,Reason for Resignation,ರಾಜೀನಾಮೆಗೆ ಕಾರಣ
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,ಪ್ರದರ್ಶನ ಅಂದಾಜಿಸುವಿಕೆಯು ಟೆಂಪ್ಲೇಟ್.
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,ಸರಕುಪಟ್ಟಿ / ಜರ್ನಲ್ ಎಂಟ್ರಿ ವಿವರಗಳು
@@ -590,7 +598,7 @@
 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,ಇನ್ವೆಂಟರಿ ನಿವ್ವಳ ವ್ಯತ್ಯಾಸದ
 DocType: Employee,Passport Number,ಪಾಸ್ಪೋರ್ಟ್ ಸಂಖ್ಯೆ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Manager,ವ್ಯವಸ್ಥಾಪಕ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,ವ್ಯವಸ್ಥಾಪಕ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,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,'ಆಧರಿಸಿ ' ಮತ್ತು ' ಗುಂಪಿನ ' ಇರಲಾಗುವುದಿಲ್ಲ
@@ -599,10 +607,11 @@
 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 +299,Timesheet created:,Timesheet ದಾಖಲಿಸಿದವರು:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +715,Please set default Cash or Bank account in Mode of Payment {0},ಪಾವತಿಯ ಮಾದರಿಯು ಡೀಫಾಲ್ಟ್ ನಗದು ಅಥವಾ ಬ್ಯಾಂಕ್ ಖಾತೆ ಸೆಟ್ ದಯವಿಟ್ಟು {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +300,Timesheet created:,Timesheet ದಾಖಲಿಸಿದವರು:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +772,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,ದಾಖಲಾಗಿ
 DocType: Selling Settings,Customer Naming By,ಗ್ರಾಹಕ ಹೆಸರಿಸುವ ಮೂಲಕ
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,ದಯವಿಟ್ಟು ಸೆಟಪ್ ನೌಕರರ ಮಾನವ ಸಂಪನ್ಮೂಲ ವ್ಯವಸ್ಥೆ ಹೆಸರಿಸುವ&gt; ಮಾನವ ಸಂಪನ್ಮೂಲ ಸೆಟ್ಟಿಂಗ್ಗಳು
 DocType: Depreciation Schedule,Depreciation Amount,ಸವಕಳಿ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,ಗ್ರೂಪ್ ಗೆ ಪರಿವರ್ತಿಸಿ
 DocType: Activity Cost,Activity Type,ಚಟುವಟಿಕೆ ವಿಧ
@@ -627,6 +636,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,ಮುಕ್ತಾಯ
 DocType: Pricing Rule,Sales Manager,ಸೇಲ್ಸ್ ಮ್ಯಾನೇಜರ್
 DocType: Salary Structure Employee,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,ಆಸ್ತಿ ವಿಲೇವಾರಿ ಮೇಲೆ ಗಳಿಕೆ / ನಷ್ಟ ಖಾತೆ
@@ -641,11 +651,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +9,Pre Sales,ಪೂರ್ವ ಮಾರಾಟದ
 DocType: Purchase Receipt,Other Details,ಇತರೆ ವಿವರಗಳು
 DocType: Account,Accounts,ಅಕೌಂಟ್ಸ್
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Marketing,ಮಾರ್ಕೆಟಿಂಗ್
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +227,Payment Entry is already created,ಪಾವತಿ ಎಂಟ್ರಿ ಈಗಾಗಲೇ ರಚಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,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 +538,Row #{0}: Asset {1} does not linked to Item {2},ರೋ # {0}: ಆಸ್ತಿ {1} ಐಟಂ ಲಿಂಕ್ ಇಲ್ಲ {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +21,Preview Salary Slip,ಮುನ್ನೋಟ ಸಂಬಳ ಸ್ಲಿಪ್
+apps/erpnext/erpnext/controllers/accounts_controller.py +541,Row #{0}: Asset {1} does not linked to Item {2},ರೋ # {0}: ಆಸ್ತಿ {1} ಐಟಂ ಲಿಂಕ್ ಇಲ್ಲ {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +38,Preview Salary Slip,ಮುನ್ನೋಟ ಸಂಬಳ ಸ್ಲಿಪ್
 DocType: Company,Deafult Cost Center,Deafult ವೆಚ್ಚದ ಕೇಂದ್ರ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +48,Account {0} has been entered multiple times,ಖಾತೆ {0} ಅನೇಕ ಬಾರಿ ನಮೂದಿಸಲಾದ
 DocType: Account,Expenses Included In Valuation,ವೆಚ್ಚಗಳು ಮೌಲ್ಯಾಂಕನ ಸೇರಿಸಲಾಗಿದೆ
@@ -654,7 +664,7 @@
 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 +617,Item has variants.,ಐಟಂ ವೇರಿಯಂಟ್.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,ಐಟಂ ವೇರಿಯಂಟ್.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,ಐಟಂ {0} ಕಂಡುಬಂದಿಲ್ಲ
 DocType: Bin,Stock Value,ಸ್ಟಾಕ್ ಮೌಲ್ಯ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +25,Company {0} does not exist,ಕಂಪನಿ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
@@ -674,7 +684,7 @@
 DocType: Purchase Order,Supply Raw Materials,ಪೂರೈಕೆ ರಾ ಮೆಟೀರಿಯಲ್ಸ್
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,ಮುಂದಿನ ಸರಕುಪಟ್ಟಿ ಉತ್ಪಾದಿಸಬಹುದಾಗಿದೆ ಯಾವ ದಿನಾಂಕ. ಒಪ್ಪಿಸಬಹುದು ಮೇಲೆ ಉತ್ಪಾದಿಸಲಾಗುತ್ತದೆ.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,ಪ್ರಸಕ್ತ ಆಸ್ತಿಪಾಸ್ತಿಗಳು
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,{0} is not a stock Item,{0} ಸ್ಟಾಕ್ ಐಟಂ ಅಲ್ಲ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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 +169,Lead must be set if Opportunity is made from Lead,ಅವಕಾಶ ಪ್ರಮುಖ ತಯಾರಿಸಲಾಗುತ್ತದೆ ವೇಳೆ ಲೀಡ್ ಸೆಟ್ ಮಾಡಬೇಕು
@@ -760,26 +770,25 @@
 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 +709,No Permission,ಯಾವುದೇ ಅನುಮತಿ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +710,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}
 apps/erpnext/erpnext/public/js/setup_wizard.js +298,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 +542,Row #{0}: Asset {1} must be submitted,ರೋ # {0}: ಆಸ್ತಿ {1} ಸಲ್ಲಿಸಬೇಕು
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,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,ಮಾರಾಟಗಾರರ ಗೆ subcontracted ವೇಳೆ
 DocType: SMS Center,All Customer Contact,ಎಲ್ಲಾ ಗ್ರಾಹಕ ಸಂಪರ್ಕ
 apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,CSV ಮೂಲಕ ಸ್ಟಾಕ್ ಸಮತೋಲನ ಅಪ್ಲೋಡ್ .
 DocType: Warehouse,Tree Details,ಟ್ರೀ ವಿವರಗಳು
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,ಈಗ ಕಳುಹಿಸಿ
 ,Support Analytics,ಬೆಂಬಲ ಅನಾಲಿಟಿಕ್ಸ್
 DocType: Item,Website Warehouse,ವೆಬ್ಸೈಟ್ ವೇರ್ಹೌಸ್
 DocType: Payment Reconciliation,Minimum Invoice Amount,ಕನಿಷ್ಠ ಸರಕುಪಟ್ಟಿ ಪ್ರಮಾಣವನ್ನು
 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/sales_invoice/sales_invoice.py +227,Timesheet {0} is already completed or cancelled,Timesheet {0} ಈಗಾಗಲೇ ಪೂರ್ಣಗೊಂಡ ಅಥವಾ ರದ್ದು
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +259,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 ಸಮಾನವಾಗಿರಬೇಕು
@@ -795,13 +804,13 @@
 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 +229,Target Warehouse,ಟಾರ್ಗೆಟ್ ವೇರ್ಹೌಸ್
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +230,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-,STE-
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Sales Order Date,ನಿರೀಕ್ಷಿತ ವಿತರಣಾ ದಿನಾಂಕದ ಮೊದಲು ಮಾರಾಟದ ಆದೇಶ ದಿನಾಂಕ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Upload Attendance,Import Attendance,ಆಮದು ಅಟೆಂಡೆನ್ಸ್
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,ಎಲ್ಲಾ ಐಟಂ ಗುಂಪುಗಳು
+apps/erpnext/erpnext/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/config/setup.py +89,Automatically compose message on submission of transactions.,ಸ್ವಯಂಚಾಲಿತವಾಗಿ ವ್ಯವಹಾರಗಳ ಸಲ್ಲಿಕೆಯಲ್ಲಿ ಸಂದೇಶವನ್ನು ರಚಿಸಿದರು .
@@ -813,13 +822,15 @@
 DocType: Sales Invoice,Payment Due Date,ಪಾವತಿ ಕಾರಣ ದಿನಾಂಕ
 apps/erpnext/erpnext/stock/doctype/item/item.js +278,Item Variant {0} already exists with same attributes,ಐಟಂ ಭಿನ್ನ {0} ಈಗಾಗಲೇ ಅದೇ ಲಕ್ಷಣಗಳು ಅಸ್ತಿತ್ವದಲ್ಲಿದ್ದರೆ
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',ಉದ್ಘಾಟಿಸುತ್ತಿರುವುದು
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,ಮಾಡಬೇಕಾದುದು ಓಪನ್
 DocType: Notification Control,Delivery Note Message,ಡೆಲಿವರಿ ಗಮನಿಸಿ ಸಂದೇಶ
 DocType: Expense Claim,Expenses,ವೆಚ್ಚಗಳು
 DocType: Item Variant Attribute,Item Variant Attribute,ಐಟಂ ಭಿನ್ನ ಲಕ್ಷಣ
 ,Purchase Receipt Trends,ಖರೀದಿ ರಸೀತಿ ಟ್ರೆಂಡ್ಸ್
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Research & Development,ಸಂಶೋಧನೆ ಮತ್ತು ಅಭಿವೃದ್ಧಿ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,ಸಂಶೋಧನೆ ಮತ್ತು ಅಭಿವೃದ್ಧಿ
 ,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,ಬೆಲೆ ಅಥವಾ ಡಿಸ್ಕೌಂಟ್
@@ -828,7 +839,7 @@
 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/controllers/accounts_controller.py +340,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","ಪಾವತಿ ಎಂಟ್ರಿ {0} ಆರ್ಡರ್ {1}, ಈ ಸರಕುಪಟ್ಟಿ ಮುಂಚಿತವಾಗಿ ಮಾಹಿತಿ ನಿಲ್ಲಿಸಲು ಏನನ್ನು ಪರೀಕ್ಷಿಸಲು ವಿರುದ್ಧ ಲಿಂಕ್ ಇದೆ."
+apps/erpnext/erpnext/controllers/accounts_controller.py +343,"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,ಪಾಯಿಂಟ್ ಯಾ ಮಾರಾಟಕ್ಕೆ
@@ -850,12 +861,12 @@
 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 +756,Purchase Receipt,ಖರೀದಿ ರಸೀತಿ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +735,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 +167,Reference Doctype must be one of {0},ರೆಫರೆನ್ಸ್ Doctype ಒಂದು ಇರಬೇಕು {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +282,Unable to find Time Slot in the next {0} days for Operation {1},ಆಪರೇಷನ್ ಮುಂದಿನ {0} ದಿನಗಳಲ್ಲಿ ಟೈಮ್ ಸ್ಲಾಟ್ ಕಾಣಬರಲಿಲ್ಲ {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +170,Reference Doctype must be one of {0},ರೆಫರೆನ್ಸ್ Doctype ಒಂದು ಇರಬೇಕು {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Unable to find Time Slot in the next {0} days for Operation {1},ಆಪರೇಷನ್ ಮುಂದಿನ {0} ದಿನಗಳಲ್ಲಿ ಟೈಮ್ ಸ್ಲಾಟ್ ಕಾಣಬರಲಿಲ್ಲ {1}
 DocType: Production Order,Plan material for sub-assemblies,ಉಪ ಜೋಡಣೆಗಳಿಗೆ ಯೋಜನೆ ವಸ್ತು
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,ಮಾರಾಟದ ಪಾರ್ಟ್ನರ್ಸ್ ಮತ್ತು ಸಂಸ್ಥಾನದ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be active,ಬಿಒಎಮ್ {0} ಸಕ್ರಿಯ ಇರಬೇಕು
@@ -866,7 +877,7 @@
 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 +214,Warehouses with existing transaction can not be converted to ledger.,ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ವಹಿವಾಟು ಗೋದಾಮುಗಳು ಲೆಡ್ಜರ್ ಪರಿವರ್ತಿಸಬಹುದು ಸಾಧ್ಯವಿಲ್ಲ.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +217,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,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ಸ್
@@ -880,9 +891,9 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,ನೌಕರರ {0} ಸಕ್ರಿಯವಾಗಿಲ್ಲ ಅಥವಾ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
 DocType: Fee Structure,Components,ಘಟಕಗಳು
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,Please enter Asset Category in Item {0},ಐಟಂ ರಲ್ಲಿ ಆಸ್ತಿ ವರ್ಗ ನಮೂದಿಸಿ {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +612,Item Variants {0} updated,ಐಟಂ ಮಾರ್ಪಾಟುಗಳು {0} ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/stock/doctype/item/item.py +614,Item Variants {0} updated,ಐಟಂ ಮಾರ್ಪಾಟುಗಳು {0} ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ
 DocType: Quality Inspection Reading,Reading 6,6 ಓದುವಿಕೆ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +843,Cannot {0} {1} {2} without any negative outstanding invoice,ಅಲ್ಲ {0} {1} {2} ಯಾವುದೇ ಋಣಾತ್ಮಕ ಮಹೋನ್ನತ ಸರಕುಪಟ್ಟಿ ಕ್ಯಾನ್
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +854,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,ಸಿಂಕ್ ಈಗ
@@ -897,69 +908,72 @@
 DocType: Item,Is Purchase Item,ಖರೀದಿ ಐಟಂ
 DocType: Asset,Purchase Invoice,ಖರೀದಿ ಸರಕುಪಟ್ಟಿ
 DocType: Stock Ledger Entry,Voucher Detail No,ಚೀಟಿ ವಿವರ ನಂ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +728,New Sales Invoice,ಹೊಸ ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +710,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 +728,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: Cheque Print Template,Has Print Format,ಪ್ರಿಂಟ್ ಫಾರ್ಮ್ಯಾಟ್ ಹೊಂದಿದೆ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +86, is mandatory. Maybe Currency Exchange record is not created for ,ಕಡ್ಡಾಯ. ಬಹುಶಃ ಕರೆನ್ಸಿ ವಿನಿಮಯ ದಾಖಲೆ ರಚಿಸಲಾಗಲಿಲ್ಲ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +109,Row #{0}: Please specify Serial No for Item {1},ರೋ # {0}: ಐಟಂ ಯಾವುದೇ ಸೀರಿಯಲ್ ಸೂಚಿಸಲು ದಯವಿಟ್ಟು {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +619,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","&#39;ಉತ್ಪನ್ನ ಕಟ್ಟು&#39; ಐಟಂಗಳನ್ನು, ವೇರ್ಹೌಸ್, ಸೀರಿಯಲ್ ಯಾವುದೇ ಮತ್ತು ಬ್ಯಾಚ್ ಯಾವುದೇ &#39;ಪ್ಯಾಕಿಂಗ್ ಪಟ್ಟಿ ಮೇಜಿನಿಂದ ಪರಿಗಣಿಸಲಾಗುವುದು. ವೇರ್ಹೌಸ್ ಮತ್ತು ಬ್ಯಾಚ್ ಯಾವುದೇ ಯಾವುದೇ &#39;ಉತ್ಪನ್ನ ಕಟ್ಟು&#39; ಐಟಂ ಎಲ್ಲಾ ಪ್ಯಾಕಿಂಗ್ ವಸ್ತುಗಳನ್ನು ಅದೇ ಇದ್ದರೆ, ಆ ಮೌಲ್ಯಗಳು ಮುಖ್ಯ ಐಟಂ ಕೋಷ್ಟಕದಲ್ಲಿ ಪ್ರವೇಶಿಸಬಹುದಾದ, ಮೌಲ್ಯಗಳನ್ನು ಟೇಬಲ್ &#39;ಪ್ಯಾಕಿಂಗ್ ಪಟ್ಟಿ&#39; ನಕಲು ನಡೆಯಲಿದೆ."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +75, 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 +613,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing 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 +606,Supplier Invoice Date cannot be greater than Posting Date,ಸರಬರಾಜುದಾರ ಸರಕುಪಟ್ಟಿ ದಿನಾಂಕ ಪೋಸ್ಟಿಂಗ್ ದಿನಾಂಕ ಹೆಚ್ಚಿನ ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +609,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: 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 +810,Select Item for Transfer,ವರ್ಗಾವಣೆ ಆಯ್ಕೆ ಐಟಂ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +789,Select Item for Transfer,ವರ್ಗಾವಣೆ ಆಯ್ಕೆ ಐಟಂ
 DocType: Purchase Invoice,Additional Discount Percentage,ಹೆಚ್ಚುವರಿ ರಿಯಾಯಿತಿ ಶೇಕಡಾವಾರು
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,ಎಲ್ಲಾ ಸಹಾಯ ವೀಡಿಯೊಗಳನ್ನು ಪಟ್ಟಿಯನ್ನು ವೀಕ್ಷಿಸಿ
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,ಅಲ್ಲಿ ಚೆಕ್ ಠೇವಣಿ ಏನು ಬ್ಯಾಂಕ್ ಖಾತೆ ಮುಖ್ಯಸ್ಥ ಆಯ್ಕೆ .
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,ಬಳಕೆದಾರ ವ್ಯವಹಾರಗಳಲ್ಲಿ ಬೆಲೆ ಪಟ್ಟಿ ದರ ಸಂಪಾದಿಸಲು ಅನುಮತಿಸಿ
 DocType: Pricing Rule,Max Qty,ಮ್ಯಾಕ್ಸ್ ಪ್ರಮಾಣ
-DocType: Student Applicant,Father's Name,ತಂದೆಯ ಹೆಸರು
 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 +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,ಸಾಲು {0}: ಮಾರಾಟದ / ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ವಿರುದ್ಧ ಪಾವತಿ ಯಾವಾಗಲೂ ಮುಂಚಿತವಾಗಿ ಎಂದು ಗುರುತಿಸಲಾಗಿದೆ ಮಾಡಬೇಕು
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,ರಾಸಾಯನಿಕ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +686,All items have already been transferred for this Production Order.,ಎಲ್ಲಾ ಐಟಂಗಳನ್ನು ಈಗಾಗಲೇ ಈ ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ವರ್ಗಾಯಿಸಲಾಗಿದೆ.
+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} ಹಾಗೂ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +694,All items have already been transferred for this Production Order.,ಎಲ್ಲಾ ಐಟಂಗಳನ್ನು ಈಗಾಗಲೇ ಈ ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ವರ್ಗಾಯಿಸಲಾಗಿದೆ.
 DocType: Process Payroll,Select Payroll Year and Month,ವೇತನದಾರರ ವರ್ಷ ಮತ್ತು ತಿಂಗಳು ಆಯ್ಕೆ
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,Meter,ಮೀಟರ್
 DocType: Workstation,Electricity Cost,ವಿದ್ಯುತ್ ಬೆಲೆ
 DocType: HR Settings,Don't send Employee Birthday Reminders,ನೌಕರರ ಜನ್ಮದಿನ ಜ್ಞಾಪನೆಗಳನ್ನು ಕಳುಹಿಸಬೇಡಿ
-DocType: Opportunity,Walk In,ವಲ್ಕ್
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,ಸ್ಟಾಕ್ ನಮೂದುಗಳು
 DocType: Item,Inspection Criteria,ಇನ್ಸ್ಪೆಕ್ಷನ್ ಮಾನದಂಡ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,ವರ್ಗಾವಣೆಯ
 apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,ನಿಮ್ಮ ಪತ್ರ ತಲೆ ಮತ್ತು ಲೋಗೋ ಅಪ್ಲೋಡ್. (ನೀವು ಅವುಗಳನ್ನು ನಂತರ ಸಂಪಾದಿಸಬಹುದು).
 DocType: Timesheet Detail,Bill,ಬಿಲ್
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,White,ಬಿಳಿ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date is entered as past date,ಮುಂದಿನ ಸವಕಳಿ ದಿನಾಂಕ ಕಳೆದ ದಿನಾಂಕ ದಾಖಲಿಸಿದರೆ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +167,White,ಬಿಳಿ
 DocType: SMS Center,All Lead (Open),ಎಲ್ಲಾ ಪ್ರಮುಖ ( ಓಪನ್ )
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +228,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),ರೋ {0}: ಫಾರ್ ಪ್ರಮಾಣ ಲಭ್ಯವಿಲ್ಲ {4} ಉಗ್ರಾಣದಲ್ಲಿ {1} ಪ್ರವೇಶ ಸಮಯದಲ್ಲಿ ಪೋಸ್ಟ್ ನಲ್ಲಿ ({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}),ರೋ {0}: ಫಾರ್ ಪ್ರಮಾಣ ಲಭ್ಯವಿಲ್ಲ {4} ಉಗ್ರಾಣದಲ್ಲಿ {1} ಪ್ರವೇಶ ಸಮಯದಲ್ಲಿ ಪೋಸ್ಟ್ ನಲ್ಲಿ ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,ಪಾವತಿಸಿದ ಅಡ್ವಾನ್ಸಸ್ ಪಡೆಯಿರಿ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +731,Make ,ಮಾಡಿ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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 +154,Order Type must be one of {0},ಆರ್ಡರ್ ಪ್ರಕಾರ ಒಂದು ಇರಬೇಕು {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},ಆರ್ಡರ್ ಪ್ರಕಾರ ಒಂದು ಇರಬೇಕು {0}
 DocType: Lead,Next Contact Date,ಮುಂದೆ ಸಂಪರ್ಕಿಸಿ ದಿನಾಂಕ
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,ಆರಂಭಿಕ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +393,Please enter Account for Change Amount,ದಯವಿಟ್ಟು ಪ್ರಮಾಣ ಚೇಂಜ್ ಖಾತೆಯನ್ನು ನಮೂದಿಸಿ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,Please enter Account for Change Amount,ದಯವಿಟ್ಟು ಪ್ರಮಾಣ ಚೇಂಜ್ ಖಾತೆಯನ್ನು ನಮೂದಿಸಿ
 DocType: Student Batch,Student Batch Name,ವಿದ್ಯಾರ್ಥಿ ಬ್ಯಾಚ್ ಹೆಸರು
 DocType: Holiday List,Holiday List Name,ಹಾಲಿಡೇ ಪಟ್ಟಿ ಹೆಸರು
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js +8,Schedule Course,ವೇಳಾಪಟ್ಟಿ ಕೋರ್ಸ್
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Stock Options,ಸ್ಟಾಕ್ ಆಯ್ಕೆಗಳು
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,ಸ್ಟಾಕ್ ಆಯ್ಕೆಗಳು
 DocType: Journal Entry Account,Expense Claim,ಖರ್ಚು ಹಕ್ಕು
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +211,Do you really want to restore this scrapped asset?,ನೀವು ನಿಜವಾಗಿಯೂ ಈ ಕೈಬಿಟ್ಟಿತು ಆಸ್ತಿ ಪುನಃಸ್ಥಾಪಿಸಲು ಬಯಸುವಿರಾ?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +237,Qty for {0},ಫಾರ್ ಪ್ರಮಾಣ {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +212,Do you really want to restore this scrapped asset?,ನೀವು ನಿಜವಾಗಿಯೂ ಈ ಕೈಬಿಟ್ಟಿತು ಆಸ್ತಿ ಪುನಃಸ್ಥಾಪಿಸಲು ಬಯಸುವಿರಾ?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,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,ಖಂಡ ದಿನಾಂಕ ಬಿಡಿ
@@ -968,9 +982,9 @@
 DocType: Company,Default Terms,ಡೀಫಾಲ್ಟ್ ನಿಯಮಗಳು
 DocType: Packing Slip Item,Packing Slip Item,ಪ್ಯಾಕಿಂಗ್ ಸ್ಲಿಪ್ ಐಟಂ
 DocType: Purchase Invoice,Cash/Bank Account,ನಗದು / ಬ್ಯಾಂಕ್ ಖಾತೆ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,ಪ್ರಮಾಣ ಅಥವಾ ಮೌಲ್ಯವನ್ನು ಯಾವುದೇ ಬದಲಾವಣೆ ತೆಗೆದುಹಾಕಲಾಗಿದೆ ಐಟಂಗಳನ್ನು.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,ಪ್ರಮಾಣ ಅಥವಾ ಮೌಲ್ಯವನ್ನು ಯಾವುದೇ ಬದಲಾವಣೆ ತೆಗೆದುಹಾಕಲಾಗಿದೆ ಐಟಂಗಳನ್ನು.
 DocType: Delivery Note,Delivery To,ವಿತರಣಾ
-apps/erpnext/erpnext/stock/doctype/item/item.py +635,Attribute table is mandatory,ಗುಣಲಕ್ಷಣ ಟೇಬಲ್ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,ಗುಣಲಕ್ಷಣ ಟೇಬಲ್ ಕಡ್ಡಾಯ
 DocType: Production Planning Tool,Get Sales Orders,ಮಾರಾಟದ ಆರ್ಡರ್ಸ್ ಪಡೆಯಿರಿ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} ಋಣಾತ್ಮಕ ಇರುವಂತಿಲ್ಲ
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,ದಯವಿಟ್ಟು ವಿದ್ಯಾರ್ಥಿ ಆಯ್ಕೆ
@@ -995,7 +1009,7 @@
 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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},ಯಾವುದೇ ಸೀರಿಯಲ್ {0} ವರೆಗೆ ನಿರ್ವಹಣೆ ಒಪ್ಪಂದ {1}
+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,ಸಂಸ್ಥೆ ಹೆಸರು
@@ -1007,7 +1021,7 @@
 DocType: GL Entry,Against,ವಿರುದ್ಧವಾಗಿ
 DocType: Item,Default Selling Cost Center,ಡೀಫಾಲ್ಟ್ ಮಾರಾಟ ವೆಚ್ಚ ಸೆಂಟರ್
 DocType: Sales Partner,Implementation Partner,ಅನುಷ್ಠಾನ ಸಂಗಾತಿ
-apps/erpnext/erpnext/controllers/selling_controller.py +231,Sales Order {0} is {1},ಮಾರಾಟದ ಆರ್ಡರ್ {0} ಯನ್ನು {1}
+apps/erpnext/erpnext/controllers/selling_controller.py +232,Sales Order {0} is {1},ಮಾರಾಟದ ಆರ್ಡರ್ {0} ಯನ್ನು {1}
 DocType: Opportunity,Contact Info,ಸಂಪರ್ಕ ಮಾಹಿತಿ
 apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,ಸ್ಟಾಕ್ ನಮೂದುಗಳು ಮೇಕಿಂಗ್
 DocType: Packing Slip,Net Weight UOM,ನೆಟ್ ತೂಕ UOM
@@ -1017,25 +1031,24 @@
 DocType: Holiday List,Get Weekly Off Dates,ದಿನಾಂಕ ವೀಕ್ಲಿ ಆಫ್ ಪಡೆಯಿರಿ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,ಅಂತಿಮ ದಿನಾಂಕ ಪ್ರಾರಂಭ ದಿನಾಂಕ ಕಡಿಮೆ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Sales Person,Select company name first.,ಮೊದಲ ಕಂಪನಿ ಹೆಸರು ಆಯ್ಕೆ ಮಾಡಿ.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Dr,ಡಾ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Dr,ಡಾ
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,ಉಲ್ಲೇಖಗಳು ವಿತರಕರಿಂದ ಪಡೆದ .
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},ಗೆ {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,ಸರಾಸರಿ ವಯಸ್ಸು
 DocType: 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/templates/pages/home.html +32,View All Products,ಎಲ್ಲಾ ಉತ್ಪನ್ನಗಳು ವೀಕ್ಷಿಸಿ
+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 +400,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,ಎಚ್ಚರಿಕೆ: ಸಿಸ್ಟಮ್ {0} {1} ಶೂನ್ಯ ರಲ್ಲಿ ಐಟಂ ಪ್ರಮಾಣದ overbilling ರಿಂದ ಪರೀಕ್ಷಿಸುವುದಿಲ್ಲ
+apps/erpnext/erpnext/controllers/accounts_controller.py +403,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/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +191,{0} {1} must be submitted,{0} {1} ಸಲ್ಲಿಸಬೇಕು
-DocType: Email Digest,Annual Expense,ವಾರ್ಷಿಕ ಖರ್ಚು
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,{0} {1} must be submitted,{0} {1} ಸಲ್ಲಿಸಬೇಕು
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +145,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}
@@ -1046,30 +1059,31 @@
 DocType: Sales Partner,Distributor,ವಿತರಕ
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,ಶಾಪಿಂಗ್ ಕಾರ್ಟ್ ಶಿಪ್ಪಿಂಗ್ ರೂಲ್
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +211,Production Order {0} must be cancelled before cancelling this Sales Order,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ {0} ಈ ಮಾರಾಟದ ಆದೇಶವನ್ನು ರದ್ದುಗೊಳಿಸುವ ಮೊದಲು ರದ್ದು ಮಾಡಬೇಕು
-apps/erpnext/erpnext/public/js/controllers/transaction.js +62,Please set 'Apply Additional Discount On',ಸೆಟ್ &#39;ಹೆಚ್ಚುವರಿ ರಿಯಾಯಿತಿ ಅನ್ವಯಿಸು&#39; ದಯವಿಟ್ಟು
+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,ರೇಂಜ್ ಕಡಿಮೆ ಎಂದು ಹೊಂದಿದೆ ಹೆಚ್ಚಾಗಿ ಶ್ರೇಣಿಗೆ
 DocType: Global Defaults,Global Defaults,ಜಾಗತಿಕ ಪೂರ್ವನಿಯೋಜಿತಗಳು
 apps/erpnext/erpnext/projects/doctype/project/project.py +153,Project Collaboration Invitation,ಪ್ರಾಜೆಕ್ಟ್ ಸಹಯೋಗ ಆಮಂತ್ರಣ
 DocType: Salary Slip,Deductions,ನಿರ್ಣಯಗಳಿಂದ
+DocType: Leave Allocation,LAL/,ಲಾಲ್ /
 apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,ಪ್ರಾರಂಭ ವರ್ಷ
 DocType: Purchase Invoice,Start date of current invoice's period,ಪ್ರಸ್ತುತ ಅವಧಿಯ ಸರಕುಪಟ್ಟಿ ದಿನಾಂಕ ಪ್ರಾರಂಭಿಸಿ
 DocType: Salary Slip,Leave Without Pay,ಪೇ ಇಲ್ಲದೆ ಬಿಡಿ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +327,Capacity Planning Error,ಸಾಮರ್ಥ್ಯವನ್ನು ಯೋಜನೆ ದೋಷ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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 +362,Finished Item {0} must be entered for Manufacture type entry,ಮುಗಿದ ಐಟಂ {0} ತಯಾರಿಕೆ ರೀತಿಯ ಪ್ರವೇಶ ನಮೂದಿಸಲಾಗುವ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +367,Finished Item {0} must be entered for Manufacture type entry,ಮುಗಿದ ಐಟಂ {0} ತಯಾರಿಕೆ ರೀತಿಯ ಪ್ರವೇಶ ನಮೂದಿಸಲಾಗುವ
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,ತೆರೆಯುವ ಲೆಕ್ಕಪರಿಶೋಧಕ ಬ್ಯಾಲೆನ್ಸ್
 DocType: Sales Invoice Advance,Sales Invoice Advance,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಅಡ್ವಾನ್ಸ್
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +499,Nothing to request,ಮನವಿ ನಥಿಂಗ್
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +500,Nothing to request,ಮನವಿ ನಥಿಂಗ್
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',' ನಿಜವಾದ ಆರಂಭ ದಿನಾಂಕ ' ಗ್ರೇಟರ್ ದ್ಯಾನ್ ' ನಿಜವಾದ ಅಂತಿಮ ದಿನಾಂಕ ' ಸಾಧ್ಯವಿಲ್ಲ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Management,ಆಡಳಿತ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},ಡೆಬಿಟ್ ಅಥವಾ ಕ್ರೆಡಿಟ್ ಪ್ರಮಾಣದ ಒಂದೋ ಅಗತ್ಯವಿದೆ {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,ಆಡಳಿತ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +55,Either debit or credit amount is required for {0},ಡೆಬಿಟ್ ಅಥವಾ ಕ್ರೆಡಿಟ್ ಪ್ರಮಾಣದ ಒಂದೋ ಅಗತ್ಯವಿದೆ {0}
 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 +161,Blue,ಬ್ಲೂ
+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,ಈಮೇಲ್ ಅಡ್ರೆಸ್ ಹೊಂದಿಸಿ
@@ -1079,12 +1093,12 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +23,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,ಡೀಫಾಲ್ಟ್ ಐಟಂ ಗುಂಪು
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1374,Do you really want to submit the invoice?,ನೀವು ನಿಜವಾಗಿಯೂ ಸರಕುಪಟ್ಟಿ ಸಲ್ಲಿಸಲು ಬಯಸುವಿರಾ?
+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 +685,Cost Center For Item with Item Code ','ಐಟಂ ಕೋಡ್ನೊಂದಿಗೆ ಐಟಂ ಸೆಂಟರ್ ವೆಚ್ಚ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1526,"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 +679,Cost Center For Item with Item Code ','ಐಟಂ ಕೋಡ್ನೊಂದಿಗೆ ಐಟಂ ಸೆಂಟರ್ ವೆಚ್ಚ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1550,"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 +26,"Further accounts can be made under Groups, but entries can be made against non-Groups","ಮತ್ತಷ್ಟು ಖಾತೆಗಳನ್ನು ಗುಂಪುಗಳು ಅಡಿಯಲ್ಲಿ ಮಾಡಬಹುದು, ಆದರೆ ನಮೂದುಗಳನ್ನು ಅಲ್ಲದ ಗುಂಪುಗಳ ವಿರುದ್ಧ ಮಾಡಬಹುದು"
 DocType: Lead,Lead,ಲೀಡ್
@@ -1104,104 +1118,106 @@
 DocType: Payment Reconciliation,Unreconciled Payment Details,ರಾಜಿಯಾಗದ ಪಾವತಿ ವಿವರಗಳು
 DocType: Global Defaults,Current Fiscal Year,ಪ್ರಸಕ್ತ ಆರ್ಥಿಕ ವರ್ಷದ
 DocType: Global Defaults,Disable Rounded Total,ದುಂಡಾದ ಒಟ್ಟು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ
-DocType: Lead,Call,ಕರೆ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +417,'Entries' cannot be empty,' ನಮೂದುಗಳು ' ಖಾಲಿ ಇರುವಂತಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +418,'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 +214,Fiscal Year {0} not found,ಹಣಕಾಸಿನ ವರ್ಷ {0} ಕಂಡುಬಂದಿಲ್ಲ
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +221,Fiscal Year {0} not found,ಹಣಕಾಸಿನ ವರ್ಷ {0} ಕಂಡುಬಂದಿಲ್ಲ
 apps/erpnext/erpnext/config/hr.py +238,Setting up Employees,ನೌಕರರು ಹೊಂದಿಸಲಾಗುತ್ತಿದೆ
 DocType: Sales Order,SO-,ಆದ್ದರಿಂದ-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,ಮೊದಲ ಪೂರ್ವಪ್ರತ್ಯಯ ಆಯ್ಕೆ ಮಾಡಿ
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Please select prefix first,ಮೊದಲ ಪೂರ್ವಪ್ರತ್ಯಯ ಆಯ್ಕೆ ಮಾಡಿ
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Research,ರಿಸರ್ಚ್
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,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 +43,Item {0} must be a non-stock item,ಐಟಂ {0} ನಾನ್ ಸ್ಟಾಕ್ ಐಟಂ ಇರಬೇಕು
 DocType: Contact,User ID,ಬಳಕೆದಾರ ID
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +57,View Ledger,ವೀಕ್ಷಿಸು ಲೆಡ್ಜರ್
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,ಮುಂಚಿನ
-apps/erpnext/erpnext/stock/doctype/item/item.py +504,"An Item Group exists with same name, please change the item name or rename the item group","ಐಟಂ ಗುಂಪು ಅದೇ ಹೆಸರಿನಲ್ಲಿ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ , ಐಟಂ ಹೆಸರನ್ನು ಬದಲಾಯಿಸಲು ಅಥವಾ ಐಟಂ ಗುಂಪು ಹೆಸರನ್ನು ದಯವಿಟ್ಟು"
+apps/erpnext/erpnext/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 +437,Rest Of The World,ವಿಶ್ವದ ಉಳಿದ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,ಐಟಂ {0} ಬ್ಯಾಚ್ ಹೊಂದುವಂತಿಲ್ಲ
 ,Budget Variance Report,ಬಜೆಟ್ ವೈಷಮ್ಯವನ್ನು ವರದಿ
 DocType: Salary Slip,Gross Pay,ಗ್ರಾಸ್ ಪೇ
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +90,Row {0}: Activity Type is mandatory.,ರೋ {0}: ಚಟುವಟಿಕೆ ಕೌಟುಂಬಿಕತೆ ಕಡ್ಡಾಯವಾಗಿದೆ.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +114,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/public/js/controllers/stock_controller.js +40,Accounting Ledger,ಲೆಕ್ಕಪತ್ರ ಲೆಡ್ಜರ್
+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,ಇಟ್ಟುಕೊಂಡ ಗಳಿಕೆಗಳು
 DocType: BOM Item,Item Description,ಐಟಂ ವಿವರಣೆ
+DocType: Student Sibling,Student Sibling,ವಿದ್ಯಾರ್ಥಿ ಒಡಹುಟ್ಟಿದವರು
 DocType: Purchase Invoice,Is Recurring,ಮರುಕಳಿಸುವ ಆಗಿದೆ
 DocType: Purchase Invoice,Supplied Items,ವಿತರಿಸಿದ ವಸ್ತುಗಳನ್ನು
 DocType: Student,STUD.,ಸ್ಟಡ್.
 DocType: Production Order,Qty To Manufacture,ತಯಾರಿಸಲು ಪ್ರಮಾಣ
+DocType: Email Digest,New Income,ಹೊಸ ಆದಾಯ
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,ಖರೀದಿ ಪ್ರಕ್ರಿಯೆಯ ಉದ್ದಕ್ಕೂ ಅದೇ ದರವನ್ನು ಕಾಯ್ದುಕೊಳ್ಳಲು
 DocType: Opportunity Item,Opportunity Item,ಅವಕಾಶ ಐಟಂ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,ತಾತ್ಕಾಲಿಕ ಉದ್ಘಾಟನಾ
 ,Employee Leave Balance,ನೌಕರರ ಲೀವ್ ಬ್ಯಾಲೆನ್ಸ್
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +131,Balance for Account {0} must always be {1},{0} ಯಾವಾಗಲೂ ಇರಬೇಕು ಖಾತೆ ಬಾಕಿ {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +175,Valuation Rate required for Item in row {0},ಸತತವಾಗಿ ಐಟಂ ಅಗತ್ಯವಿದೆ ಮೌಲ್ಯಾಂಕನ ದರ {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,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,ಉದಾಹರಣೆ: ಕಂಪ್ಯೂಟರ್ ಸೈನ್ಸ್ ಮಾಸ್ಟರ್ಸ್
 DocType: Purchase Invoice,Rejected Warehouse,ತಿರಸ್ಕರಿಸಲಾಗಿದೆ ವೇರ್ಹೌಸ್
 DocType: GL Entry,Against Voucher,ಚೀಟಿ ವಿರುದ್ಧ
 DocType: Item,Default Buying Cost Center,ಡೀಫಾಲ್ಟ್ ಖರೀದಿ ವೆಚ್ಚ ಸೆಂಟರ್
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","ERPNext ಅತ್ಯುತ್ತಮ ಔಟ್ ಪಡೆಯಲು, ನೀವು ಸ್ವಲ್ಪ ಸಮಯ ತೆಗೆದುಕೊಳ್ಳುತ್ತದೆ ಮತ್ತು ಈ ಸಹಾಯ ವೀಡಿಯೊಗಳನ್ನು ವೀಕ್ಷಿಸಲು ಶಿಫಾರಸು."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +87, to ,ಗೆ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,ಗೆ
 DocType: Item,Lead Time in days,ದಿನಗಳಲ್ಲಿ ಪ್ರಮುಖ ಸಮಯ
 ,Accounts Payable Summary,ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆಗಳು ಸಾರಾಂಶ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Not authorized to edit frozen Account {0},ಹೆಪ್ಪುಗಟ್ಟಿದ ಖಾತೆ ಸಂಪಾದಿಸಲು ಅಧಿಕಾರ {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},ಹೆಪ್ಪುಗಟ್ಟಿದ ಖಾತೆ ಸಂಪಾದಿಸಲು ಅಧಿಕಾರ {0}
 DocType: Journal Entry,Get Outstanding Invoices,ಮಹೋನ್ನತ ಇನ್ವಾಯ್ಸಸ್ ಪಡೆಯಿರಿ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +62,Sales Order {0} is not valid,ಮಾರಾಟದ ಆರ್ಡರ್ {0} ಮಾನ್ಯವಾಗಿಲ್ಲ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,ಮಾರಾಟದ ಆರ್ಡರ್ {0} ಮಾನ್ಯವಾಗಿಲ್ಲ
 apps/erpnext/erpnext/setup/doctype/company/company.py +185,"Sorry, companies cannot be merged","ಕ್ಷಮಿಸಿ, ಕಂಪನಿಗಳು ವಿಲೀನಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +139,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",ಒಟ್ಟು ಸಂಚಿಕೆ / ವರ್ಗಾವಣೆ ಪ್ರಮಾಣ {0} ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ ರಲ್ಲಿ {1} \ ವಿನಂತಿಸಿದ ಪ್ರಮಾಣ {2} ಐಟಂ ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Small,ಸಣ್ಣ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,Small,ಸಣ್ಣ
 DocType: Employee,Employee Number,ನೌಕರರ ಸಂಖ್ಯೆ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},ಕೇಸ್ ಇಲ್ಲ (ಗಳು) ಈಗಾಗಲೇ ಬಳಕೆಯಲ್ಲಿದೆ. ಪ್ರಕರಣ ಸಂಖ್ಯೆ ನಿಂದ ಪ್ರಯತ್ನಿಸಿ {0}
 ,Invoiced Amount (Exculsive Tax),ಸರಕುಪಟ್ಟಿ ಪ್ರಮಾಣ ( ತೆರಿಗೆ Exculsive )
-DocType: Student Applicant,Mother's / Guardian 1 Email ID,ತಾಯಿಯ / ಗಾರ್ಡಿಯನ್ 1 ಈಮೇಲ್ ಅಡ್ರೆಸ್
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,ಐಟಂ 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,ಖಾತೆ ತಲೆ {0} ದಾಖಲಿಸಿದವರು
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +160,Green,ಹಸಿರು
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,ಹಸಿರು
 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 +57,Contract,ಒಪ್ಪಂದ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,ಒಪ್ಪಂದ
 DocType: Email Digest,Add Quote,ಉದ್ಧರಣ ಸೇರಿಸಿ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +498,UOM coversion factor required for UOM: {0} in Item: {1},UOM ಅಗತ್ಯವಿದೆ UOM coversion ಫ್ಯಾಕ್ಟರ್: {0} ಐಟಂ ರಲ್ಲಿ: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +503,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 +80,Row {0}: Qty is mandatory,ರೋ {0}: ಪ್ರಮಾಣ ಕಡ್ಡಾಯ
+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 +737,Sync Master Data,ಸಿಂಕ್ ಮಾಸ್ಟರ್ ಡಾಟಾ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +719,Sync Master Data,ಸಿಂಕ್ ಮಾಸ್ಟರ್ ಡಾಟಾ
 apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,ನಿಮ್ಮ ಉತ್ಪನ್ನಗಳನ್ನು ಅಥವಾ ಸೇವೆಗಳನ್ನು
 DocType: Mode of Payment,Mode of Payment,ಪಾವತಿಯ ಮಾದರಿಯು
 apps/erpnext/erpnext/stock/doctype/item/item.py +178,Website Image should be a public file or website URL,ವೆಬ್ಸೈಟ್ ಚಿತ್ರ ಸಾರ್ವಜನಿಕ ಕಡತ ಅಥವಾ ವೆಬ್ಸೈಟ್ URL ಇರಬೇಕು
+DocType: Student Applicant,AP,ಎಪಿ
 DocType: Purchase Invoice Item,BOM,ಬಿಒಎಮ್
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,ಈ ಒಂದು ಮೂಲ ಐಟಂ ಗುಂಪು ಮತ್ತು ಸಂಪಾದಿತವಾಗಿಲ್ಲ .
+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 +345,"{0}: Employee email not found, hence email not sent","{0}: ನೌಕರರ ಇಮೇಲ್ ಕಂಡುಬಂದಿಲ್ಲ, ಆದ್ದರಿಂದ ಕಳುಹಿಸಲಾಗಿಲ್ಲ ಇಮೇಲ್"
+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,ನಿಮ್ಮ ಕಂಪನಿ ವಿಳಾಸ
 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 +118,"For {0}, only credit accounts can be linked against another debit entry","{0}, ಮಾತ್ರ ಕ್ರೆಡಿಟ್ ಖಾತೆಗಳನ್ನು ಮತ್ತೊಂದು ಡೆಬಿಟ್ ಪ್ರವೇಶ ವಿರುದ್ಧ ಲಿಂಕ್ ಮಾಡಬಹುದು ಫಾರ್"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Delivery Note {0} is not submitted,ಡೆಲಿವರಿ ಗಮನಿಸಿ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Delivery Note {0} is not submitted,ಡೆಲಿವರಿ ಗಮನಿಸಿ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Sub-contracted Item,ಐಟಂ {0} ಒಂದು ಉಪ ಒಪ್ಪಂದ ಐಟಂ ಇರಬೇಕು
 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,ಮಾರಾಟಗಾರ ವೆಬ್ಸೈಟ್
 DocType: Item,ITEM-,ITEM-
-apps/erpnext/erpnext/controllers/selling_controller.py +147,Total allocated percentage for sales team should be 100,ಮಾರಾಟದ ತಂಡಕ್ಕೆ ಹಂಚಿಕೆ ಶೇಕಡಾವಾರು ಒಟ್ಟು 100 ಶುಡ್
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +110,Production Order status is {0},ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ಸ್ಥಿತಿ {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,ಮಾರಾಟದ ತಂಡಕ್ಕೆ ಹಂಚಿಕೆ ಶೇಕಡಾವಾರು ಒಟ್ಟು 100 ಶುಡ್
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ಸ್ಥಿತಿ {0}
 DocType: Appraisal Goal,Goal,ಗುರಿ
 DocType: Sales Invoice Item,Edit Description,ಸಂಪಾದಿಸಿ ವಿವರಣೆ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +757,For Supplier,ಸರಬರಾಜುದಾರನ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +723,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,ಪ್ರಿಂಟ್ ಫಾರ್ಮ್ಯಾಟ್ ರಚಿಸಿ
@@ -1217,10 +1233,11 @@
 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,ಗ್ರೇಡ್ ಕೋಡ್
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ಡೈಜೆಸ್ಟ್ ಇಮೇಲ್:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +445,BOM {0} does not belong to Item {1},ಬಿಒಎಮ್ {0} ಐಟಂ ಸೇರುವುದಿಲ್ಲ {1}
 DocType: Sales Partner,Target Distribution,ಟಾರ್ಗೆಟ್ ಡಿಸ್ಟ್ರಿಬ್ಯೂಶನ್
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1667,Deafault warehouse is required for selected item,Deafault ಗೋದಾಮಿನ ಆಯ್ದುಕೊಂಡ ಅಗತ್ಯವಿದೆ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Deafault warehouse is required for selected item,Deafault ಗೋದಾಮಿನ ಆಯ್ದುಕೊಂಡ ಅಗತ್ಯವಿದೆ
 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 ಓದುವಿಕೆ
@@ -1229,23 +1246,23 @@
 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 +110,Hardware,ಹಾರ್ಡ್ವೇರ್
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,ಹಾರ್ಡ್ವೇರ್
 DocType: Sales Order,Recurring Upto,ಮರುಕಳಿಸುವ ವರೆಗೆ
 DocType: Attendance,HR Manager,ಮಾನವ ಸಂಪನ್ಮೂಲ ಮ್ಯಾನೇಜರ್
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,ಒಂದು ಕಂಪನಿ ಆಯ್ಕೆಮಾಡಿ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Privilege Leave,ಸವಲತ್ತು ಲೀವ್
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,ಸವಲತ್ತು ಲೀವ್
 DocType: Purchase Invoice,Supplier Invoice Date,ಸರಬರಾಜುದಾರ ಸರಕುಪಟ್ಟಿ ದಿನಾಂಕ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,ನೀವು ಶಾಪಿಂಗ್ ಕಾರ್ಟ್ ಶಕ್ತಗೊಳಿಸಬೇಕಾಗುತ್ತದೆ
 DocType: Payment Entry,Writeoff,Writeoff
 DocType: Appraisal Template Goal,Appraisal Template Goal,ಅಪ್ರೇಸಲ್ ಟೆಂಪ್ಲೇಟು ಗೋಲ್
-DocType: Salary Slip,Earning,ಗಳಿಕೆ
+DocType: Salary Component,Earning,ಗಳಿಕೆ
 DocType: Purchase Invoice,Party Account Currency,ಪಕ್ಷದ ಖಾತೆ ಕರೆನ್ಸಿ
 ,BOM Browser,BOM ಬ್ರೌಸರ್
 DocType: Purchase Taxes and Charges,Add or Deduct,ಸೇರಿಸಿ ಅಥವಾ ಕಡಿತಗೊಳಿಸುವ
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,ನಡುವೆ ಕಂಡುಬರುವ ಅತಿಕ್ರಮಿಸುವ ಪರಿಸ್ಥಿತಿಗಳು :
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +171,Against Journal Entry {0} is already adjusted against some other voucher,ಜರ್ನಲ್ ವಿರುದ್ಧ ಎಂಟ್ರಿ {0} ಈಗಾಗಲೇ ಕೆಲವು ಚೀಟಿ ವಿರುದ್ಧ ಸರಿಹೊಂದಿಸಲಾಗುತ್ತದೆ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,ಜರ್ನಲ್ ವಿರುದ್ಧ ಎಂಟ್ರಿ {0} ಈಗಾಗಲೇ ಕೆಲವು ಚೀಟಿ ವಿರುದ್ಧ ಸರಿಹೊಂದಿಸಲಾಗುತ್ತದೆ
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,ಒಟ್ಟು ಆರ್ಡರ್ ಮೌಲ್ಯ
-apps/erpnext/erpnext/demo/setup_data.py +358,Food,ಆಹಾರ
+apps/erpnext/erpnext/demo/setup/setup_data.py +301,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/course_schedule/course_schedule.js +103,Mark Attendence,ಮಾರ್ಕ್ Attendence
@@ -1279,12 +1296,12 @@
 DocType: Sales Order Item,Planned Quantity,ಯೋಜಿತ ಪ್ರಮಾಣ
 DocType: Purchase Invoice Item,Item Tax Amount,ಐಟಂ ತೆರಿಗೆ ಪ್ರಮಾಣ
 DocType: Item,Maintain Stock,ಸ್ಟಾಕ್ ನಿರ್ವಹಿಸುವುದು
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +209,Stock Entries already created for Production Order ,ಈಗಾಗಲೇ ಉತ್ಪಾದನೆ ಆರ್ಡರ್ ದಾಖಲಿಸಿದವರು ಸ್ಟಾಕ್ ನಮೂದುಗಳು
+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,ಸ್ಥಿರ ಸಂಪತ್ತಾದ ನಿವ್ವಳ ವ್ಯತ್ಯಾಸದ
 DocType: Leave Control Panel,Leave blank if considered for all designations,ಎಲ್ಲಾ ಅಂಕಿತಗಳು ಪರಿಗಣಿಸಲ್ಪಡುವ ವೇಳೆ ಖಾಲಿ ಬಿಡಿ
-apps/erpnext/erpnext/controllers/accounts_controller.py +620,Charge of type 'Actual' in row {0} cannot be included in Item Rate,ಮಾದರಿ ಸಾಲು {0} ನಲ್ಲಿ 'ವಾಸ್ತವಿಕ' ಉಸ್ತುವಾರಿ ಐಟಂ ದರದಲ್ಲಿ ಸೇರಿಸಲಾಗಿದೆ ಸಾಧ್ಯವಿಲ್ಲ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,Max: {0},ಮ್ಯಾಕ್ಸ್: {0}
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +15,From Datetime,Datetime ಗೆ
+apps/erpnext/erpnext/controllers/accounts_controller.py +623,Charge of type 'Actual' in row {0} cannot be included in Item Rate,ಮಾದರಿ ಸಾಲು {0} ನಲ್ಲಿ 'ವಾಸ್ತವಿಕ' ಉಸ್ತುವಾರಿ ಐಟಂ ದರದಲ್ಲಿ ಸೇರಿಸಲಾಗಿದೆ ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +239,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 +153,"Request for Quotation is disabled to access from portal, for more check portal settings.","ಉದ್ಧರಣ ವಿನಂತಿ ಹೆಚ್ಚು ಚೆಕ್ ಪೋರ್ಟಲ್ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು, ಪೋರ್ಟಲ್ ಪ್ರವೇಶವನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ."
@@ -1292,8 +1309,8 @@
 DocType: Sales Invoice,Shipping Address Name,ಶಿಪ್ಪಿಂಗ್ ವಿಳಾಸ ಹೆಸರು
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,ಖಾತೆಗಳ ಚಾರ್ಟ್
 DocType: Material Request,Terms and Conditions Content,ನಿಯಮಗಳು ಮತ್ತು ನಿಯಮಗಳು ವಿಷಯ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +552,cannot be greater than 100,100 ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ
-apps/erpnext/erpnext/stock/doctype/item/item.py +680,Item {0} is not a stock Item,ಐಟಂ {0} ಸ್ಟಾಕ್ ಐಟಂ ಅಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +546,cannot be greater than 100,100 ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is not a stock Item,ಐಟಂ {0} ಸ್ಟಾಕ್ ಐಟಂ ಅಲ್ಲ
 DocType: Maintenance Visit,Unscheduled,ಅನಿಗದಿತ
 DocType: Employee,Owned,ಸ್ವಾಮ್ಯದ
 DocType: Salary Detail,Depends on Leave Without Pay,ಸಂಬಳ ಇಲ್ಲದೆ ಬಿಟ್ಟು ಅವಲಂಬಿಸಿರುತ್ತದೆ
@@ -1307,10 +1324,9 @@
 DocType: GL Entry,GL Entry,ಜಿಎಲ್ ಎಂಟ್ರಿ
 DocType: HR Settings,Employee Settings,ನೌಕರರ ಸೆಟ್ಟಿಂಗ್ಗಳು
 ,Batch-Wise Balance History,ಬ್ಯಾಚ್ ವೈಸ್ ಬ್ಯಾಲೆನ್ಸ್ ಇತಿಹಾಸ
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,ಪಟ್ಟಿ ಮಾಡಿ
 apps/erpnext/erpnext/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 +61,Apprentice,ಹೊಸಗಸುಬಿ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +102,Negative Quantity is not allowed,ನಕಾರಾತ್ಮಕ ಪ್ರಮಾಣ ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,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","ಸ್ಟ್ರಿಂಗ್ ಐಟಂ ಮಾಸ್ಟರ್ ರಿಂದ ಗಳಿಸಿತು ಮತ್ತು ಈ ಕ್ಷೇತ್ರದಲ್ಲಿ ಸಂಗ್ರಹಿಸಲಾಗಿದೆ ತೆರಿಗೆ ವಿವರ ಟೇಬಲ್.
  ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು ಉಪಯೋಗಿಸಿದ"
@@ -1332,15 +1348,14 @@
 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 +141,Source warehouse is mandatory for row {0},ಮೂಲ ಗೋದಾಮಿನ ಸಾಲು ಕಡ್ಡಾಯ {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +719,Packing Slip,ಪ್ಯಾಕಿಂಗ್ ಸ್ಲಿಪ್
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Source warehouse is mandatory for row {0},ಮೂಲ ಗೋದಾಮಿನ ಸಾಲು ಕಡ್ಡಾಯ {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +713,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/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,ಉದ್ಧರಣ ವಿನಂತಿ ಕೆಳಗಿನ ಲಿಂಕ್ ಕ್ಲಿಕ್ ಪ್ರವೇಶ ಮಾಡಬಹುದು
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,ಆಮದು ವಿಫಲವಾಗಿದೆ!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,ಯಾವುದೇ ವಿಳಾಸ ಇನ್ನೂ ಸೇರಿಸಲಾಗಿದೆ.
 DocType: Workstation Working Hour,Workstation Working Hour,ಕಾರ್ಯಸ್ಥಳ ವರ್ಕಿಂಗ್ ಅವರ್
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Analyst,ವಿಶ್ಲೇಷಕ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,ವಿಶ್ಲೇಷಕ
 DocType: Item,Inventory,ತಪಶೀಲು ಪಟ್ಟಿ
 DocType: Item,Sales Details,ಮಾರಾಟದ ವಿವರಗಳು
 DocType: Quality Inspection,QI-,QI-
@@ -1348,7 +1363,7 @@
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,ಸೇರಿಸಿ ಪ್ರಮಾಣ
 DocType: Notification Control,Expense Claim Rejected,ಖರ್ಚು ಹೇಳಿಕೆಯನ್ನು ತಿರಸ್ಕರಿಸಿದರು
 DocType: Item Attribute,Item Attribute,ಐಟಂ ಲಕ್ಷಣ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +103,Government,ಸರ್ಕಾರ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,ಸರ್ಕಾರ
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,ಇನ್ಸ್ಟಿಟ್ಯೂಟ್ ಹೆಸರು
 apps/erpnext/erpnext/config/stock.py +289,Item Variants,ಐಟಂ ಮಾರ್ಪಾಟುಗಳು
 DocType: Company,Services,ಸೇವೆಗಳು
@@ -1364,6 +1379,7 @@
 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/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,ಹೂಡಿಕೆ ಹಣದ ಹರಿವನ್ನು
 DocType: Program Course,Program Course,ಕಾರ್ಯಕ್ರಮದಲ್ಲಿ ಕೋರ್ಸ್
@@ -1404,12 +1420,12 @@
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,ಸ್ವೀಕರಿಸುವವರ ಪಟ್ಟಿ ಖಾಲಿಯಾಗಿದೆ . ಸ್ವೀಕರಿಸುವವರ ಪಟ್ಟಿ ದಯವಿಟ್ಟು ರಚಿಸಿ
 DocType: Production Plan Sales Order,Production Plan Sales Order,ನಿರ್ಮಾಣ ವೇಳಾಪಟ್ಟಿಯು ಮಾರಾಟದ ಆರ್ಡರ್
 DocType: Sales Partner,Sales Partner Target,ಮಾರಾಟದ ಸಂಗಾತಿ ಟಾರ್ಗೆಟ್
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +110,Accounting Entry for {0} can only be made in currency: {1},{0} ಲೆಕ್ಕಪರಿಶೋಧಕ ಎಂಟ್ರಿ ಮಾತ್ರ ಕರೆನ್ಸಿ ಮಾಡಬಹುದು: {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},{0} ಲೆಕ್ಕಪರಿಶೋಧಕ ಎಂಟ್ರಿ ಮಾತ್ರ ಕರೆನ್ಸಿ ಮಾಡಬಹುದು: {1}
 DocType: Pricing Rule,Pricing Rule,ಬೆಲೆ ರೂಲ್
 DocType: Budget,Action if Annual Budget Exceeded,ಆಕ್ಷನ್ ವಾರ್ಷಿಕ ಬಜೆಟ್ ಮೀರಿದ್ದಲ್ಲಿ
 apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,ಆರ್ಡರ್ ಖರೀದಿಸಿ ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ
 DocType: Shopping Cart Settings,Payment Success URL,ಪಾವತಿ ಯಶಸ್ಸು URL
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +78,Row # {0}: Returned Item {1} does not exists in {2} {3},ರೋ # {0}: ರಿಟರ್ನ್ಡ ಐಟಂ {1} ಅಲ್ಲ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ ಇಲ್ಲ {2} {3}
+apps/erpnext/erpnext/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,ಬ್ಯಾಂಕ್ ಸಾಮರಸ್ಯ ಹೇಳಿಕೆ
@@ -1418,40 +1434,39 @@
 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/stock/doctype/stock_entry/stock_entry.py +339,Not allowed to tranfer more {0} than {1} against Purchase Order {2},ಹೆಚ್ಚು ವರ್ಗಾಯಿಸುವುದೇ ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ {0} ಹೆಚ್ಚು {1} ಆರ್ಡರ್ ಖರೀದಿಸಿ ವಿರುದ್ಧ {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +344,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 +545,Manufacturing Quantity is mandatory,ಮ್ಯಾನುಫ್ಯಾಕ್ಚರಿಂಗ್ ಪ್ರಮಾಣ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,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 +71,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 +162,Row {0}: From Time and To Time of {1} is overlapping with {2},ರೋ {0}: ಗೆ ಸಮಯ ಮತ್ತು ಸಮಯ {1} ಜೊತೆ ಅತಿಕ್ರಮಿಸುವ {2}
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +186,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,ಸ್ಟಾಕ್ ಭಾದ್ಯತೆಗಳನ್ನು
 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 +130,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 +137,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,ಇತರ ವರದಿಗಳು
 DocType: Dependent Task,Dependent Task,ಅವಲಂಬಿತ ಟಾಸ್ಕ್
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,ದಯವಿಟ್ಟು ಸೆಟಪ್ ನೌಕರರ ಮಾನವ ಸಂಪನ್ಮೂಲ ವ್ಯವಸ್ಥೆ ಹೆಸರಿಸುವ&gt; ಮಾನವ ಸಂಪನ್ಮೂಲ ಸೆಟ್ಟಿಂಗ್ಗಳು
 apps/erpnext/erpnext/stock/doctype/item/item.py +411,Conversion factor for default Unit of Measure must be 1 in row {0},ಅಳತೆ ಡೀಫಾಲ್ಟ್ ಘಟಕ ಪರಿವರ್ತಿಸುವುದರ ಸತತವಾಗಿ 1 ಇರಬೇಕು {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,Leave of type {0} cannot be longer than {1},ರೀತಿಯ ಲೀವ್ {0} ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +197,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 +921,Search Item,ಹುಡುಕಾಟ ಐಟಂ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +910,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 +546,Already completed,ಈಗಾಗಲೇ
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +22,Payment Request already exists {0},ಪಾವತಿ ವಿನಂತಿ ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +550,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 +241,Quantity must not be more than {0},ಪ್ರಮಾಣ ಹೆಚ್ಚು ಇರಬಾರದು {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Quantity must not be more than {0},ಪ್ರಮಾಣ ಹೆಚ್ಚು ಇರಬಾರದು {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +76,Previous Financial Year is not closed,ಹಿಂದಿನ ಹಣಕಾಸು ವರ್ಷದ ಮುಚ್ಚಿಲ್ಲ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +44,Age (Days),ವಯಸ್ಸು (ದಿನಗಳು)
 DocType: Quotation Item,Quotation Item,ನುಡಿಮುತ್ತುಗಳು ಐಟಂ
@@ -1468,7 +1483,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +221,Purchase Receipt {0} is not submitted,ಖರೀದಿ ರಸೀತಿ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
 DocType: Company,Default Payable Account,ಡೀಫಾಲ್ಟ್ ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆ
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","ಉದಾಹರಣೆಗೆ ಹಡಗು ನಿಯಮಗಳು, ಬೆಲೆ ಪಟ್ಟಿ ಇತ್ಯಾದಿ ಆನ್ಲೈನ್ ಶಾಪಿಂಗ್ ಕಾರ್ಟ್ ಸೆಟ್ಟಿಂಗ್ಗಳು"
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +83,{0}% Billed,{0}% ಖ್ಯಾತವಾದ
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}% ಖ್ಯಾತವಾದ
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,ಕಾಯ್ದಿರಿಸಲಾಗಿದೆ ಪ್ರಮಾಣ
 DocType: Party Account,Party Account,ಪಕ್ಷದ ಖಾತೆ
 apps/erpnext/erpnext/config/setup.py +116,Human Resources,ಮಾನವ ಸಂಪನ್ಮೂಲ
@@ -1480,12 +1495,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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 +22,Collect,ಸಂಗ್ರಹಿಸಿ
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,ಸಂಗ್ರಹಿಸಿ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,Against Supplier Invoice {0} dated {1},ಸರಬರಾಜುದಾರ ವಿರುದ್ಧ ಸರಕುಪಟ್ಟಿ {0} ರ {1}
 DocType: Customer,Default Price List,ಡೀಫಾಲ್ಟ್ ಬೆಲೆ ಪಟ್ಟಿ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +225,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: Payment Reconciliation,Payments,ಪಾವತಿಗಳು
 DocType: Journal Entry,Entry Type,ಎಂಟ್ರಿ ಟೈಪ್
 ,Customer Credit Balance,ಗ್ರಾಹಕ ಕ್ರೆಡಿಟ್ ಬ್ಯಾಲೆನ್ಸ್
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Payable,ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆಗಳು ನಿವ್ವಳ ವ್ಯತ್ಯಾಸದ
@@ -1497,7 +1511,7 @@
 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 +9,Procurement,ಖರೀದಿ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,ಐಟಂಗಳನ್ನು ಯಾವುದೇ ಪ್ರಮಾಣ ಅಥವಾ ಮೌಲ್ಯವನ್ನು ಯಾವುದೇ ಬದಲಾವಣೆ.
+apps/erpnext/erpnext/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,ಖಾತರಿ ಹಕ್ಕು
 ,Lead Details,ಲೀಡ್ ವಿವರಗಳು
 DocType: Purchase Invoice,End date of current invoice's period,ಪ್ರಸ್ತುತ ಅವಧಿಯ ಸರಕುಪಟ್ಟಿ ಅಂತಿಮ ದಿನಾಂಕ
@@ -1522,7 +1536,7 @@
 DocType: Purchase Invoice,Additional Discount,ಹೆಚ್ಚುವರಿ ರಿಯಾಯಿತಿ
 DocType: Selling Settings,Selling Settings,ಸೆಟ್ಟಿಂಗ್ಗಳು ಮಾರಾಟ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,ಆನ್ಲೈನ್ ಹರಾಜಿನಲ್ಲಿ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +97,Please specify either Quantity or Valuation Rate or both,ಪ್ರಮಾಣ ಅಥವಾ ಮೌಲ್ಯಾಂಕನ ದರ ಅಥವಾ ಎರಡೂ ಸೂಚಿಸಲು ದಯವಿಟ್ಟು
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,ಪ್ರಮಾಣ ಅಥವಾ ಮೌಲ್ಯಾಂಕನ ದರ ಅಥವಾ ಎರಡೂ ಸೂಚಿಸಲು ದಯವಿಟ್ಟು
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +13,Fulfillment,ಈಡೇರಿದ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","ಕಂಪನಿ , ತಿಂಗಳ ಮತ್ತು ಹಣಕಾಸಿನ ವರ್ಷ ಕಡ್ಡಾಯ"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,ಮಾರ್ಕೆಟಿಂಗ್ ವೆಚ್ಚಗಳು
@@ -1543,14 +1557,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,ERPNext ಸೆಟಪ್ ಪೂರ್ಣಗೊಳಿಸಿ!
 DocType: Item,Weightage,weightage
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +93,A Customer Group exists with same name please change the Customer name or rename the Customer Group,ಎ ಗ್ರಾಹಕ ಗುಂಪಿನ ಅದೇ ಹೆಸರಿನಲ್ಲಿ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ ಗ್ರಾಹಕ ಹೆಸರನ್ನು ಬದಲಾಯಿಸಲು ಅಥವಾ ಗ್ರಾಹಕ ಗುಂಪಿನ ಹೆಸರನ್ನು ದಯವಿಟ್ಟು
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +126,A Customer Group exists with same name please change the Customer name or rename the Customer Group,ಎ ಗ್ರಾಹಕ ಗುಂಪಿನ ಅದೇ ಹೆಸರಿನಲ್ಲಿ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ ಗ್ರಾಹಕ ಹೆಸರನ್ನು ಬದಲಾಯಿಸಲು ಅಥವಾ ಗ್ರಾಹಕ ಗುಂಪಿನ ಹೆಸರನ್ನು ದಯವಿಟ್ಟು
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,ಹೊಸ ಸಂಪರ್ಕ
 DocType: Territory,Parent Territory,ಪೋಷಕ ಪ್ರದೇಶ
 DocType: Quality Inspection Reading,Reading 2,2 ಓದುವಿಕೆ
 DocType: Stock Entry,Material Receipt,ಮೆಟೀರಿಯಲ್ ರಸೀತಿ
 DocType: Homepage,Products,ಉತ್ಪನ್ನಗಳು
 DocType: Announcement,Instructor,ಬೋಧಕ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},ಪಕ್ಷದ ಕೌಟುಂಬಿಕತೆ ಮತ್ತು ಪಕ್ಷದ ಸ್ವೀಕರಿಸುವಂತಹ / ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆಯನ್ನು ಅಗತ್ಯವಿದೆ {0}
 DocType: Employee,AB+,ಎಬಿ +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","ಈ ಐಟಂ ವೇರಿಯಂಟ್, ಅದು ಮಾರಾಟ ಆದೇಶಗಳಿಗೆ ಇತ್ಯಾದಿ ಆಯ್ಕೆ ಸಾಧ್ಯವಿಲ್ಲ"
 DocType: Lead,Next Contact By,ಮುಂದೆ ಸಂಪರ್ಕಿಸಿ
@@ -1561,7 +1574,7 @@
 ,Item-wise Sales Register,ಐಟಂ ಬಲ್ಲ ಮಾರಾಟದ ರಿಜಿಸ್ಟರ್
 DocType: Asset,Gross Purchase Amount,ಒಟ್ಟು ಖರೀದಿಯ ಮೊತ್ತ
 DocType: Asset,Depreciation Method,ಸವಕಳಿ ವಿಧಾನ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Offline,ಆಫ್ಲೈನ್
+apps/erpnext/erpnext/accounts/page/pos/pos.js +686,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,ಅಗತ್ಯ
@@ -1579,25 +1592,27 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +425,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 +858,Make Purchase Order,ಮಾಡಿ ಪರ್ಚೇಸ್ ಆರ್ಡರ್
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +852,Make Purchase Order,ಮಾಡಿ ಪರ್ಚೇಸ್ ಆರ್ಡರ್
 DocType: SMS Center,Send To,ಕಳಿಸಿ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,There is not enough leave balance for Leave Type {0},ಲೀವ್ ಪ್ರಕಾರ ಸಾಕಷ್ಟು ರಜೆ ಸಮತೋಲನ ಇಲ್ಲ {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,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 +172,Work-in-Progress Warehouse is required before Submit,ಕೆಲಸ ಪ್ರಗತಿಯಲ್ಲಿರುವ ವೇರ್ಹೌಸ್ ಸಲ್ಲಿಸಿ ಮೊದಲು ಅಗತ್ಯವಿದೆ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,Work-in-Progress Warehouse is required before Submit,ಕೆಲಸ ಪ್ರಗತಿಯಲ್ಲಿರುವ ವೇರ್ಹೌಸ್ ಸಲ್ಲಿಸಿ ಮೊದಲು ಅಗತ್ಯವಿದೆ
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,ಕೆಲಸ ಸಂ .
 DocType: Purchase Order Item,Warehouse and Reference,ವೇರ್ಹೌಸ್ ಮತ್ತು ರೆಫರೆನ್ಸ್
 DocType: Supplier,Statutory info and other general information about your Supplier,ಕಾನೂನುಸಮ್ಮತ ಮಾಹಿತಿಯನ್ನು ನಿಮ್ಮ ಸರಬರಾಜುದಾರ ಬಗ್ಗೆ ಇತರ ಸಾಮಾನ್ಯ ಮಾಹಿತಿ
-apps/erpnext/erpnext/hooks.py +88,Addresses,ವಿಳಾಸಗಳು
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,ಸರಬರಾಜುದಾರ&gt; ಸರಬರಾಜುದಾರ ಕೌಟುಂಬಿಕತೆ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +212,Against Journal Entry {0} does not have any unmatched {1} entry,ಜರ್ನಲ್ ವಿರುದ್ಧ ಎಂಟ್ರಿ {0} ಯಾವುದೇ ಸಾಟಿಯಿಲ್ಲದ {1} ದಾಖಲೆಗಳನ್ನು ಹೊಂದಿಲ್ಲ
+apps/erpnext/erpnext/hooks.py +95,Addresses,ವಿಳಾಸಗಳು
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +215,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,ಐಟಂ ಅಥವಾ ವೇರ್ಹೌಸ್ ಮೇಲೆ ಫಿಲ್ಟರ್ ಸೆಟ್ ಮಾಡಿ
 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,ತಲುಪಿಸಿ ಮತ್ತು ಬಿಲ್
@@ -1605,11 +1620,10 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,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 +731,Payment,ಪಾವತಿ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,Payment,ಪಾವತಿ
 DocType: Production Order Operation,Actual Time and Cost,ನಿಜವಾದ ಸಮಯ ಮತ್ತು ವೆಚ್ಚ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},ಗರಿಷ್ಠ ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ {0} ಐಟಂ {1} {2} ಮಾರಾಟದ ಆರ್ಡರ್ ವಿರುದ್ಧ ಮಾಡಬಹುದು
 DocType: Employee,Salutation,ವಂದನೆ
-DocType: Pricing Rule,Brand,ಬೆಂಕಿ
 DocType: Course,Course Abbreviation,ಕೋರ್ಸ್ ಸಂಕ್ಷೇಪಣ
 DocType: Item,Will also apply for variants,ಸಹ ರೂಪಾಂತರಗಳು ಅನ್ವಯವಾಗುವುದು
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +142,"Asset cannot be cancelled, as it is already {0}",ಇದು ಈಗಾಗಲೇ ಆಸ್ತಿ ರದ್ದು ಸಾಧ್ಯವಿಲ್ಲ {0}
@@ -1621,7 +1635,7 @@
 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.",ನಿಮ್ಮ ಉತ್ಪನ್ನಗಳನ್ನು ಅಥವಾ ಖರೀದಿ ಅಥವಾ ಮಾರಾಟ ಸೇವೆಗಳು ಪಟ್ಟಿ .
 DocType: Hub Settings,Hub Node,ಹಬ್ ನೋಡ್
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,ನೀವು ನಕಲಿ ಐಟಂಗಳನ್ನು ನಮೂದಿಸಿದ್ದೀರಿ. ನಿವಾರಿಸಿಕೊಳ್ಳಲು ಹಾಗೂ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ .
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Associate,ಜತೆಗೂಡಿದ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,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,ಸ್ವೀಕರಿಸುವವರ ಪಟ್ಟಿ ರಚಿಸಿ
@@ -1629,7 +1643,7 @@
 DocType: Production Planning Tool,Material Requests,ವಸ್ತು ವಿನಂತಿಗಳು
 DocType: Warranty Claim,Issue Date,ಸಂಚಿಕೆ ದಿನಾಂಕ
 DocType: Activity Cost,Activity Cost,ಚಟುವಟಿಕೆ ವೆಚ್ಚ
-DocType: Timesheet Detail,Timesheet Detail,timesheet ವಿವರ
+DocType: Sales Invoice Timesheet,Timesheet Detail,timesheet ವಿವರ
 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),ಪ್ಯಾಕೇಜ್ ಈ ವಿತರಣಾ ಒಂದು ಭಾಗ ಎಂದು ಸೂಚಿಸುತ್ತದೆ (ಮಾತ್ರ Draft)
@@ -1652,6 +1666,7 @@
 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,ವೇರಿಯಂಟ್
 DocType: Monthly Distribution,Name of the Monthly Distribution,ಮಾಸಿಕ ವಿತರಣೆ ಹೆಸರು
 DocType: Sales Person,Parent Sales Person,ಪೋಷಕ ಮಾರಾಟಗಾರ್ತಿ
@@ -1664,31 +1679,32 @@
 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 +44,"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/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.,ನೀವು ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಉಳಿಸಲು ಒಮ್ಮೆ ವರ್ಡ್ಸ್ ಗೋಚರಿಸುತ್ತದೆ.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +502,Error: {0} &gt; {1},ದೋಷ: {0}&gt; {1}
 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.,ಟರ್ಮ್ ಪ್ರಾರಂಭ ದಿನಾಂಕ ಶೈಕ್ಷಣಿಕ ವರ್ಷದ ಪ್ರಾರಂಭ ವರ್ಷ ದಿನಾಂಕ ಪದವನ್ನು ಸಂಪರ್ಕಿತ ಮುಂಚಿತವಾಗಿರಬೇಕು ಸಾಧ್ಯವಿಲ್ಲ (ಅಕಾಡೆಮಿಕ್ ಇಯರ್ {}). ದಯವಿಟ್ಟು ದಿನಾಂಕಗಳನ್ನು ಸರಿಪಡಿಸಲು ಹಾಗೂ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ.
 DocType: Naming Series,Current Value,ಪ್ರಸ್ತುತ ಮೌಲ್ಯ
-apps/erpnext/erpnext/controllers/accounts_controller.py +235,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,ಬಹು ಹಣಕಾಸಿನ ವರ್ಷಗಳ ದಿನಾಂಕ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿವೆ. ದಯವಿಟ್ಟು ವರ್ಷದಲ್ಲಿ ಕಂಪನಿ ಸೆಟ್
+apps/erpnext/erpnext/controllers/accounts_controller.py +238,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 +458,Item table can not be blank,ಐಟಂ ಟೇಬಲ್ ಖಾಲಿ ಇರಕೂಡದು
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +443,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 +5,This is based on stock movement. See {0} for details,ಈ ಸ್ಟಾಕ್ ಚಲನೆಯನ್ನು ಆಧರಿಸಿದೆ. ನೋಡಿ {0} ವಿವರಗಳಿಗಾಗಿ
 DocType: Pricing Rule,Selling,ವಿಕ್ರಯ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +341,Amount {0} {1} deducted against {2},ಪ್ರಮಾಣ {0} {1} ವಿರುದ್ಧ ಕಡಿತಗೊಳಿಸಲಾಗುತ್ತದೆ {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +344,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,ಕಾರಣ ದಿನಾಂಕ ದಿನಾಂಕ ಪೋಸ್ಟ್ ಮುನ್ನ ಸಾಧ್ಯವಿಲ್ಲ
@@ -1703,8 +1719,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +144,Cannot refer row number greater than or equal to current row number for this Charge type,ಈ ಬ್ಯಾಚ್ ಮಾದರಿ ಸಾಲು ಸಂಖ್ಯೆ ಹೆಚ್ಚಿನ ಅಥವಾ ಪ್ರಸ್ತುತ ಸಾಲಿನ ಸಂಖ್ಯೆ ಸಮಾನವಾಗಿರುತ್ತದೆ ಸೂಚಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Asset,Sold,ಮಾರಾಟ
 ,Item-wise Purchase History,ಐಟಂ ಬುದ್ಧಿವಂತ ಖರೀದಿ ಇತಿಹಾಸ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Red,ಕೆಂಪು
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},ಯಾವುದೇ ಸೀರಿಯಲ್ ಐಟಂ ಸೇರಿಸಲಾಗಿದೆ ತರಲು ' ರಚಿಸಿ ' ವೇಳಾಪಟ್ಟಿ ' ಕ್ಲಿಕ್ ಮಾಡಿ {0}
+apps/erpnext/erpnext/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,ಓಪನ್ ಉತ್ಪಾದನೆ ಆರ್ಡರ್ಸ್
 DocType: Sales Invoice Payment,Base Amount (Company Currency),ಬೇಸ್ ಪ್ರಮಾಣ (ಕಂಪನಿ ಕರೆನ್ಸಿ)
@@ -1712,7 +1728,7 @@
 DocType: Installation Note,Installation Time,ಅನುಸ್ಥಾಪನ ಟೈಮ್
 DocType: Sales Invoice,Accounting Details,ಲೆಕ್ಕಪರಿಶೋಧಕ ವಿವರಗಳು
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,ಈ ಕಂಪೆನಿಗೆ ಎಲ್ಲಾ ಟ್ರಾನ್ಸಾಕ್ಷನ್ಸ್ ಅಳಿಸಿ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +187,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,ರೋ # {0}: ಆಪರೇಷನ್ {1} ಉತ್ಪಾದನೆ ತಯಾರಾದ ಸರಕುಗಳ {2} ಪ್ರಮಾಣ ಫಾರ್ ಪೂರ್ಣಗೊಳಿಸಿಲ್ಲ ಆರ್ಡರ್ # {3}. ಟೈಮ್ ದಾಖಲೆಗಳು ಮೂಲಕ ಕಾರ್ಯಾಚರಣೆ ಸ್ಥಿತಿ ನವೀಕರಿಸಿ
+apps/erpnext/erpnext/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}. ಟೈಮ್ ದಾಖಲೆಗಳು ಮೂಲಕ ಕಾರ್ಯಾಚರಣೆ ಸ್ಥಿತಿ ನವೀಕರಿಸಿ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,ಇನ್ವೆಸ್ಟ್ಮೆಂಟ್ಸ್
 DocType: Issue,Resolution Details,ರೆಸಲ್ಯೂಶನ್ ವಿವರಗಳು
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,ಹಂಚಿಕೆಯು
@@ -1748,16 +1764,17 @@
 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}
 DocType: Delivery Note,Excise Page Number,ಅಬಕಾರಿ ಪುಟ ಸಂಖ್ಯೆ
 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}
 ,Maintenance Schedules,ನಿರ್ವಹಣಾ ವೇಳಾಪಟ್ಟಿಗಳು
 DocType: Task,Actual End Date (via Time Sheet),ನಿಜವಾದ ಅಂತಿಮ ದಿನಾಂಕ (ಟೈಮ್ ಶೀಟ್ ಮೂಲಕ)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Amount {0} {1} against {2} {3},ಪ್ರಮಾಣ {0} {1} ವಿರುದ್ಧ {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +339,Amount {0} {1} against {2} {3},ಪ್ರಮಾಣ {0} {1} ವಿರುದ್ಧ {2} {3}
 ,Quotation Trends,ನುಡಿಮುತ್ತುಗಳು ಟ್ರೆಂಡ್ಸ್
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},ಐಟಂ ಐಟಂ ಮಾಸ್ಟರ್ ಉಲ್ಲೇಖಿಸಿಲ್ಲ ಐಟಂ ಗ್ರೂಪ್ {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +295,Debit To account must be a Receivable account,ಖಾತೆಗೆ ಡೆಬಿಟ್ ಒಂದು ಸ್ವೀಕರಿಸುವಂತಹ ಖಾತೆಯನ್ನು ಇರಬೇಕು
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Receivable account,ಖಾತೆಗೆ ಡೆಬಿಟ್ ಒಂದು ಸ್ವೀಕರಿಸುವಂತಹ ಖಾತೆಯನ್ನು ಇರಬೇಕು
 DocType: Shipping Rule Condition,Shipping Amount,ಶಿಪ್ಪಿಂಗ್ ಪ್ರಮಾಣ
 ,Pending Amount,ಬಾಕಿ ಪ್ರಮಾಣ
 DocType: Purchase Invoice Item,Conversion Factor,ಪರಿವರ್ತಿಸುವುದರ
@@ -1765,10 +1782,10 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +137,Expected value after useful life must be greater than or equal to {0},ಉಪಯುಕ್ತ ಜೀವನದ ನಂತರ ನಿರೀಕ್ಷಿತ ಮೌಲ್ಯ ಹೆಚ್ಚು ಅಥವಾ ಸಮನಾಗಿರಬೇಕು {0}
 DocType: Purchase Receipt,Vehicle Number,ವಾಹನ ಸಂಖ್ಯೆ
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,ಮರುಕಳಿಸುವ ಸರಕುಪಟ್ಟಿ ಸ್ಟಾಪ್ ಯಾವ ದಿನಾಂಕ
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +90,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,ಒಟ್ಟು ಹಂಚಿಕೆ ಎಲೆಗಳು {0} ಕಡಿಮೆ ಸಾಧ್ಯವಿಲ್ಲ ಕಾಲ ಈಗಾಗಲೇ ಅನುಮೋದನೆ ಎಲೆಗಳು {1} ಹೆಚ್ಚು
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +93,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 +22,Enter Paid Amount,ಪಾವತಿಸಿದ ಪ್ರಮಾಣವನ್ನು ನಮೂದಿಸಿ
+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 ಬಳಸಿ
@@ -1778,13 +1795,15 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,timesheets
 DocType: HR Settings,HR Settings,ಮಾನವ ಸಂಪನ್ಮೂಲ ಸೆಟ್ಟಿಂಗ್ಗಳು
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Expense Claim is pending approval. Only the Expense Approver can update status.,ಖರ್ಚು ಹಕ್ಕು ಅನುಮೋದನೆ ಬಾಕಿ ಇದೆ . ಮಾತ್ರ ಖರ್ಚು ಅನುಮೋದಕ ಡೇಟ್ ಮಾಡಬಹುದು .
+DocType: Email Digest,New Expenses,ಹೊಸ ವೆಚ್ಚಗಳು
 DocType: Purchase Invoice,Additional Discount Amount,ಹೆಚ್ಚುವರಿ ರಿಯಾಯಿತಿ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/controllers/accounts_controller.py +524,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","ರೋ # {0}: ಪ್ರಮಾಣ 1, ಐಟಂ ಸ್ಥಿರ ಆಸ್ತಿ ಇರಬೇಕು. ದಯವಿಟ್ಟು ಬಹು ಪ್ರಮಾಣ ಪ್ರತ್ಯೇಕ ಸಾಲು ಬಳಸಿ."
+apps/erpnext/erpnext/controllers/accounts_controller.py +527,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","ರೋ # {0}: ಪ್ರಮಾಣ 1, ಐಟಂ ಸ್ಥಿರ ಆಸ್ತಿ ಇರಬೇಕು. ದಯವಿಟ್ಟು ಬಹು ಪ್ರಮಾಣ ಪ್ರತ್ಯೇಕ ಸಾಲು ಬಳಸಿ."
 DocType: Leave Block List Allow,Leave Block List Allow,ಬ್ಲಾಕ್ ಲಿಸ್ಟ್ ಅನುಮತಿಸಿ ಬಿಡಿ
 apps/erpnext/erpnext/setup/doctype/company/company.py +249,Abbr can not be blank or space,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/stock/get_item_details.py +123,Please specify Company,ಕಂಪನಿ ನಮೂದಿಸಿ
 ,Customer Acquisition and Loyalty,ಗ್ರಾಹಕ ಸ್ವಾಧೀನ ಮತ್ತು ನಿಷ್ಠೆ
@@ -1795,17 +1814,19 @@
 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 +183,Closing (Opening + Totals),ಕ್ಲೋಸಿಂಗ್ (+ ಒಟ್ಟು ತೆರೆಯುವ)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),ಕ್ಲೋಸಿಂಗ್ (+ ಒಟ್ಟು ತೆರೆಯುವ)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,ಕಂಪನಿ ಕರೆನ್ಸಿ ಸೂಚಿಸಿ
 DocType: Workstation,Wages per hour,ಗಂಟೆಗೆ ವೇತನ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +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/controllers/accounts_controller.py +272,Account {0} is invalid. Account Currency must be {1},ಖಾತೆ {0} ಅಮಾನ್ಯವಾಗಿದೆ. ಖಾತೆ ಕರೆನ್ಸಿ ಇರಬೇಕು {1}
+DocType: Email Digest,Pending Sales Orders,ಮಾರಾಟದ ಆದೇಶಗಳನ್ನು ಬಾಕಿ
+apps/erpnext/erpnext/controllers/accounts_controller.py +275,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 +956,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","ರೋ # {0}: ರೆಫರೆನ್ಸ್ ಡಾಕ್ಯುಮೆಂಟ್ ಕೌಟುಂಬಿಕತೆ ಮಾರಾಟದ ಆರ್ಡರ್ ಒಂದು, ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಅಥವಾ ಜರ್ನಲ್ ಎಂಟ್ರಿ ಇರಬೇಕು"
-DocType: Salary Slip,Deduction,ವ್ಯವಕಲನ
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +87,Row {0}: From Time and To Time is mandatory.,ರೋ {0}: ಸಮಯ ಮತ್ತು ಟೈಮ್ ಕಡ್ಡಾಯ.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +969,"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 +111,Row {0}: From Time and To Time is mandatory.,ರೋ {0}: ಸಮಯ ಮತ್ತು ಟೈಮ್ ಕಡ್ಡಾಯ.
+DocType: Stock Reconciliation Item,Amount Difference,ಪ್ರಮಾಣ ವ್ಯತ್ಯಾಸ
 apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},ಐಟಂ ಬೆಲೆ ಸೇರ್ಪಡೆ {0} ದರ ಪಟ್ಟಿ ರಲ್ಲಿ {1}
 DocType: Address Template,Address Template,ವಿಳಾಸ ಟೆಂಪ್ಲೇಟು
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +7,Please enter Employee Id of this sales person,ಈ ಮಾರಾಟಗಾರನ ಉದ್ಯೋಗಿ ಅನ್ನು ನಮೂದಿಸಿ
@@ -1813,7 +1834,7 @@
 DocType: Project,% Tasks Completed,% ಪೂರ್ಣಗೊಂಡಿದೆ ಕಾರ್ಯಗಳು
 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 +194,Please enter Production Item first,ಮೊದಲ ಉತ್ಪಾದನೆ ಐಟಂ ನಮೂದಿಸಿ
+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,ಅಂಗವಿಕಲ ಬಳಕೆದಾರರ
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,ಉದ್ಧರಣ
@@ -1822,53 +1843,54 @@
 DocType: Maintenance Visit,Maintenance User,ನಿರ್ವಹಣೆ ಬಳಕೆದಾರ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +149,Cost Updated,ವೆಚ್ಚ ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ
 DocType: Employee,Date of Birth,ಜನ್ಮ ದಿನಾಂಕ
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +86,Item {0} has already been returned,ಐಟಂ {0} ಈಗಾಗಲೇ ಮರಳಿದರು
+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: 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 +177,Job Description,ಜಾಬ್ ವಿವರಣೆ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,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 +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","ಹೊರತುಪಡಿಸಿ ವಿಶೇಷ ಅಕ್ಷರಗಳು ""-"" ""."", ""#"", ಮತ್ತು ""/"" ಸರಣಿ ಹೆಸರಿಸುವ ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","ಹೊರತುಪಡಿಸಿ ವಿಶೇಷ ಅಕ್ಷರಗಳು ""-"" ""."", ""#"", ಮತ್ತು ""/"" ಸರಣಿ ಹೆಸರಿಸುವ ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.",ಮಾರಾಟದ ಶಿಬಿರಗಳು ಟ್ರ್ಯಾಕ್. ಲೀಡ್ಸ್ ಉಲ್ಲೇಖಗಳು ಜಾಡನ್ನು ಮಾರಾಟದ ಆರ್ಡರ್ ಇತ್ಯಾದಿ ಶಿಬಿರಗಳು ರಿಂದ ಹೂಡಿಕೆ ಮೇಲೆ ರಿಟರ್ನ್ ಅಳೆಯುವ.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +24,Welcome to POS: Create your POS Profile,ಪಿಓಎಸ್ ಸ್ವಾಗತ: ನಿಮ್ಮ ಪಿಓಎಸ್ ಪ್ರೊಫೈಲ್ ರಚಿಸಿ
 DocType: Expense Claim,Approver,ಅನಪುಮೋದಕ
 ,SO Qty,ಆದ್ದರಿಂದ ಪ್ರಮಾಣ
+DocType: Guardian,Work Address,ಕೆಲಸದ ವಿಳಾಸ
 DocType: Appraisal,Calculate Total Score,ಒಟ್ಟು ಸ್ಕೋರ್ ಲೆಕ್ಕ
 DocType: Request for Quotation,Manufacturing Manager,ಉತ್ಪಾದನಾ ಮ್ಯಾನೇಜರ್
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},ಯಾವುದೇ ಸೀರಿಯಲ್ {0} ವರೆಗೆ ವಾರಂಟಿ {1}
+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 +74,Shipments,ಸಾಗಣೆಗಳು
+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 +153,Row # ,ರೋ #
+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 +156,Get From,ಗೆ ಪಡೆಯಿರಿ
+apps/erpnext/erpnext/public/js/utils.js +167,Get From,ಗೆ ಪಡೆಯಿರಿ
 DocType: C-Form,Quarter,ಕಾಲು ಭಾಗ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Miscellaneous Expenses,ವಿವಿಧ ಖರ್ಚುಗಳು
 DocType: Global Defaults,Default Company,ಡೀಫಾಲ್ಟ್ ಕಂಪನಿ
 apps/erpnext/erpnext/controllers/stock_controller.py +167,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,ಖರ್ಚು ಅಥವಾ ವ್ಯತ್ಯಾಸ ಖಾತೆ ಕಡ್ಡಾಯ ಐಟಂ {0} ಪರಿಣಾಮ ಬೀರುತ್ತದೆ ಒಟ್ಟಾರೆ ಸ್ಟಾಕ್ ಮೌಲ್ಯ
-apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","ಸತತವಾಗಿ ಐಟಂ {0} ಫಾರ್ overbill ಸಾಧ್ಯವಿಲ್ಲ {1} ಹೆಚ್ಚು {2}. Overbilling, ಸ್ಟಾಕ್ ಸೆಟ್ಟಿಂಗ್ಗಳು ದಯವಿಟ್ಟು ಅವಕಾಶ"
+apps/erpnext/erpnext/controllers/accounts_controller.py +419,"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
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} is disabled,ಬಳಕೆದಾರ {0} ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
 DocType: Leave Application,Total Leave Days,ಒಟ್ಟು ರಜೆಯ ದಿನಗಳಲ್ಲಿ
 DocType: Email Digest,Note: Email will not be sent to disabled users,ಗಮನಿಸಿ : ಇಮೇಲ್ ಅಂಗವಿಕಲ ಬಳಕೆದಾರರಿಗೆ ಕಳುಹಿಸಲಾಗುವುದಿಲ್ಲ
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,ಕಂಪನಿ ಆಯ್ಕೆ ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,ಎಲ್ಲಾ ವಿಭಾಗಗಳು ಪರಿಗಣಿಸಲ್ಪಡುವ ವೇಳೆ ಖಾಲಿ ಬಿಡಿ
 apps/erpnext/erpnext/config/hr.py +171,"Types of employment (permanent, contract, intern etc.).","ಉದ್ಯೋಗ ವಿಧಗಳು ( ಶಾಶ್ವತ , ಒಪ್ಪಂದ , ಇಂಟರ್ನ್ , ಇತ್ಯಾದಿ ) ."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +346,{0} is mandatory for Item {1},{0} ಐಟಂ ಕಡ್ಡಾಯ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,{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","ಕನಿಷ್ಠ ಒಂದು ಸತತವಾಗಿ ನಿಗದಿ ಪ್ರಮಾಣ, ಸರಕುಪಟ್ಟಿ ಕೌಟುಂಬಿಕತೆ ಮತ್ತು ಸರಕುಪಟ್ಟಿ ಸಂಖ್ಯೆ ಆಯ್ಕೆಮಾಡಿ"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,ಹೊಸ ಖರೀದಿ ವೆಚ್ಚ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},ಮಾರಾಟದ ಆರ್ಡರ್ ಐಟಂ ಅಗತ್ಯವಿದೆ {0}
 DocType: Purchase Invoice Item,Rate (Company Currency),ದರ ( ಕಂಪನಿ ಕರೆನ್ಸಿ )
-apps/erpnext/erpnext/demo/setup_data.py +360,Others,ಇತರೆ
+DocType: Student Guardian,Others,ಇತರೆ
 DocType: Payment Entry,Unallocated Amount,ನಿಯೋಜಿಸದೆ ಪ್ರಮಾಣ
 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,ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು
@@ -1888,17 +1910,16 @@
 apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,ಧಾರಾವಾಹಿಯಾಗಿ ಇನ್ವೆಂಟರಿ
 DocType: Activity Type,Default Billing Rate,ಡೀಫಾಲ್ಟ್ ಬಿಲ್ಲಿಂಗ್ ದರ
 DocType: Sales Invoice,Total Billing Amount,ಒಟ್ಟು ಬಿಲ್ಲಿಂಗ್ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +54,Receivable Account,ಸ್ವೀಕರಿಸುವಂತಹ ಖಾತೆ
-apps/erpnext/erpnext/controllers/accounts_controller.py +546,Row #{0}: Asset {1} is already {2},ರೋ # {0}: ಆಸ್ತಿ {1} ಈಗಾಗಲೇ {2}
+apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,ಸ್ವೀಕರಿಸುವಂತಹ ಖಾತೆ
+apps/erpnext/erpnext/controllers/accounts_controller.py +549,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 +79,CEO,ಸಿಇಒ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,ಸಿಇಒ
 DocType: Expense Claim Detail,Expense Claim Detail,ಖರ್ಚು ಹಕ್ಕು ವಿವರ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +808,Please select correct account,ಸರಿಯಾದ ಖಾತೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +809,Please select correct account,ಸರಿಯಾದ ಖಾತೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ
 DocType: Item,Weight UOM,ತೂಕ UOM
 DocType: Salary Structure Employee,Salary Structure Employee,ಸಂಬಳ ರಚನೆ ನೌಕರರ
 DocType: Employee,Blood Group,ರಕ್ತ ಗುಂಪು
-DocType: Purchase Invoice Item,Page Break,ಪುಟ ಬ್ರೇಕ್
 DocType: Production Order Operation,Pending,ಬಾಕಿ
 DocType: Course,Course Name,ಕೋರ್ಸ್ ಹೆಸರು
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,ನಿರ್ದಿಷ್ಟ ನೌಕರನ ರಜೆ ಅನ್ವಯಗಳನ್ನು ಒಪ್ಪಿಗೆ ಬಳಕೆದಾರರು
@@ -1907,14 +1928,15 @@
 DocType: Fiscal Year,Companies,ಕಂಪನಿಗಳು
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,ಇಲೆಕ್ಟ್ರಾನಿಕ್ ಶಾಸ್ತ್ರ
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,ಸ್ಟಾಕ್ ಮತ್ತೆ ಸಲುವಾಗಿ ಮಟ್ಟ ತಲುಪಿದಾಗ ವಸ್ತು ವಿನಂತಿಗಳನ್ನು ರೈಸ್
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Full-time,ಪೂರ್ಣ ಬಾರಿ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,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: 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,ಒಟ್ಟು ಒಳಬರುವ ಮೌಲ್ಯ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Debit To is required,ಡೆಬಿಟ್ ಅಗತ್ಯವಿದೆ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +321,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,ಗುಣಮಟ್ಟದ ಮ್ಯಾನೇಜರ್
@@ -1922,6 +1944,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/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,ಒಟ್ಟು ಸರಕುಪಟ್ಟಿ ಆಮ್ಟ್
@@ -1932,18 +1955,17 @@
 DocType: Production Order Operation,Completed Qty,ಪೂರ್ಣಗೊಂಡಿದೆ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"For {0}, only debit accounts can be linked against another credit entry","{0}, ಮಾತ್ರ ಡೆಬಿಟ್ ಖಾತೆಗಳನ್ನು ಇನ್ನೊಂದು ಕ್ರೆಡಿಟ್ ಪ್ರವೇಶ ವಿರುದ್ಧ ಲಿಂಕ್ ಮಾಡಬಹುದು ಫಾರ್"
 apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,ಬೆಲೆ ಪಟ್ಟಿ {0} ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +99,Row {0}: Completed Qty cannot be more than {1} for operation {2},ರೋ {0}: ಪೂರ್ಣಗೊಂಡಿದೆ ಪ್ರಮಾಣ ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ {1} ಕಾರ್ಯಾಚರಣೆಗೆ {2}
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +123,Row {0}: Completed Qty cannot be more than {1} for operation {2},ರೋ {0}: ಪೂರ್ಣಗೊಂಡಿದೆ ಪ್ರಮಾಣ ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ {1} ಕಾರ್ಯಾಚರಣೆಗೆ {2}
 DocType: Manufacturing Settings,Allow Overtime,ಓವರ್ಟೈಮ್ ಅವಕಾಶ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} ಐಟಂ ಬೇಕಾದ ಸೀರಿಯಲ್ ಸಂಖ್ಯೆಗಳು {1}. ನೀವು ಒದಗಿಸಿದ {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,ಪ್ರಸ್ತುತ ಮೌಲ್ಯಮಾಪನ ದರ
 DocType: Item,Customer Item Codes,ಗ್ರಾಹಕ ಐಟಂ ಕೋಡ್ಸ್
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,ವಿನಿಮಯ ಗಳಿಕೆ / ನಷ್ಟ
 DocType: Opportunity,Lost Reason,ಲಾಸ್ಟ್ ಕಾರಣ
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ಸೆಟಪ್ ಸೆಟಪ್ ಮೂಲಕ ಅಟೆಂಡೆನ್ಸ್ ಸಂಖ್ಯಾ ದಯವಿಟ್ಟು ಸರಣಿ&gt; ನಂಬರಿಂಗ್ ಸರಣಿ
 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/purchase_receipt/purchase_receipt.py +378,All items have already been invoiced,ಎಲ್ಲಾ ಐಟಂಗಳನ್ನು ಈಗಾಗಲೇ ಸರಕುಪಟ್ಟಿ ಮಾಡಲಾಗಿದೆ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +379,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,ಬಾಹ್ಯ
@@ -1959,18 +1981,19 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,ನಿಮ್ಮ ಗ್ರಾಹಕರು
 apps/erpnext/erpnext/projects/doctype/project/project.py +141,You have been invited to collaborate on the project: {0},ನೀವು ಯೋಜನೆಯ ಸಹಯೋಗಿಸಲು ಆಮಂತ್ರಿಸಲಾಗಿದೆ: {0}
 DocType: Leave Block List Date,Block Date,ಬ್ಲಾಕ್ ದಿನಾಂಕ
-apps/erpnext/erpnext/templates/generators/job_opening.html +19,Apply Now,ಈಗ ಅನ್ವಯಿಸು
+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.","ರಚಿಸಿ ಮತ್ತು , ದೈನಂದಿನ ಸಾಪ್ತಾಹಿಕ ಮತ್ತು ಮಾಸಿಕ ಇಮೇಲ್ ಡೈಜೆಸ್ಟ್ ನಿರ್ವಹಿಸಿ ."
 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,ಕಟ್ಟಡಗಳು
-apps/erpnext/erpnext/utilities/doctype/address/address.py +164,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,ಡೀಫಾಲ್ಟ್ ವಿಳಾಸ ಟೆಂಪ್ಲೇಟು ಕಂಡುಬಂದಿಲ್ಲ. ದಯವಿಟ್ಟು ಸೆಟಪ್&gt; ಮುದ್ರಣ ಮತ್ತು ಬ್ರ್ಯಾಂಡಿಂಗ್&gt; ವಿಳಾಸ ಟೆಂಪ್ಲೇಟು ಹೊಸದನ್ನು ರಚಿಸಲು.
 DocType: Fee Structure,Fee Structure,ಶುಲ್ಕ ರಚನೆ
 DocType: Timesheet Detail,Costing Amount,ವೆಚ್ಚದ ಪ್ರಮಾಣ
+DocType: Student Admission,Application Fee,ಅರ್ಜಿ ಶುಲ್ಕ
 DocType: Process Payroll,Submit Salary Slip,ಸಂಬಳ ಸ್ಲಿಪ್ ಸಲ್ಲಿಸಿ
-apps/erpnext/erpnext/controllers/selling_controller.py +161,Maxiumm discount for Item {0} is {1}%,ಐಟಂ Maxiumm ರಿಯಾಯಿತಿ {0} {1} % ಆಗಿದೆ
+apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,ಐಟಂ Maxiumm ರಿಯಾಯಿತಿ {0} {1} % ಆಗಿದೆ
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,ದೊಡ್ಡ ಆಮದು
 DocType: Sales Partner,Address & Contacts,ವಿಳಾಸ ಮತ್ತು ಸಂಪರ್ಕಗಳು
 DocType: SMS Log,Sender Name,ಹೆಸರು
@@ -1995,21 +2018,21 @@
 DocType: Serial No,Delivery Time,ಡೆಲಿವರಿ ಟೈಮ್
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,ರಂದು ಆಧರಿಸಿ ಏಜಿಂಗ್
 DocType: Item,End of Life,ಲೈಫ್ ಅಂತ್ಯ
-apps/erpnext/erpnext/demo/setup_data.py +361,Travel,ಓಡಾಡು
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +155,No active or default Salary Structure found for employee {0} for the given dates,ಯಾವುದೇ ಸಕ್ರಿಯ ಅಥವಾ ಡೀಫಾಲ್ಟ್ ಸಂಬಳ ರಚನೆ ನೀಡಿದ ದಿನಾಂಕಗಳನ್ನು ಉದ್ಯೋಗಿ {0} ಕಂಡುಬಂದಿಲ್ಲ
+apps/erpnext/erpnext/demo/setup/setup_data.py +304,Travel,ಓಡಾಡು
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +167,No active or default Salary Structure found for employee {0} for the given dates,ಯಾವುದೇ ಸಕ್ರಿಯ ಅಥವಾ ಡೀಫಾಲ್ಟ್ ಸಂಬಳ ರಚನೆ ನೀಡಿದ ದಿನಾಂಕಗಳನ್ನು ಉದ್ಯೋಗಿ {0} ಕಂಡುಬಂದಿಲ್ಲ
 DocType: Leave Block List,Allow Users,ಬಳಕೆದಾರರನ್ನು ಅನುಮತಿಸಿ
 DocType: Purchase Order,Customer Mobile No,ಗ್ರಾಹಕ ಮೊಬೈಲ್ ಯಾವುದೇ
 DocType: Sales Invoice,Recurring,ಮರುಕಳಿಸುವ
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,ಪ್ರತ್ಯೇಕ ಆದಾಯ ಟ್ರ್ಯಾಕ್ ಮತ್ತು ಉತ್ಪನ್ನ ಸಂಸ್ಥಾ ಅಥವಾ ವಿಭಾಗಗಳು ಖರ್ಚು.
 DocType: Rename Tool,Rename Tool,ಟೂಲ್ ಮರುಹೆಸರಿಸು
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +23,Update Cost,ನವೀಕರಣ ವೆಚ್ಚ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,ನವೀಕರಣ ವೆಚ್ಚ
 DocType: Item Reorder,Item Reorder,ಐಟಂ ಮರುಕ್ರಮಗೊಳಿಸಿ
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +36,Show Salary Slip,ಸಂಬಳ ಶೋ ಸ್ಲಿಪ್
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +748,Transfer Material,ಟ್ರಾನ್ಸ್ಫರ್ ವಸ್ತು
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +53,Show Salary Slip,ಸಂಬಳ ಶೋ ಸ್ಲಿಪ್
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +166,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 +923,Please set recurring after saving,ಉಳಿಸುವ ನಂತರ ಮರುಕಳಿಸುವ ಸೆಟ್ ಮಾಡಿ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +646,Select change amount account,ಬದಲಾವಣೆ ಆಯ್ಕೆ ಪ್ರಮಾಣದ ಖಾತೆಯನ್ನು
+apps/erpnext/erpnext/public/js/controllers/transaction.js +914,Please set recurring after saving,ಉಳಿಸುವ ನಂತರ ಮರುಕಳಿಸುವ ಸೆಟ್ ಮಾಡಿ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +703,Select change amount account,ಬದಲಾವಣೆ ಆಯ್ಕೆ ಪ್ರಮಾಣದ ಖಾತೆಯನ್ನು
 DocType: Purchase Invoice,Price List Currency,ಬೆಲೆ ಪಟ್ಟಿ ಕರೆನ್ಸಿ
 DocType: Naming Series,User must always select,ಬಳಕೆದಾರ ಯಾವಾಗಲೂ ಆಯ್ಕೆ ಮಾಡಬೇಕು
 DocType: Stock Settings,Allow Negative Stock,ನಕಾರಾತ್ಮಕ ಸ್ಟಾಕ್ ಅನುಮತಿಸಿ
@@ -2021,31 +2044,32 @@
 DocType: Quality Inspection,Verified By,ಪರಿಶೀಲಿಸಲಾಗಿದೆ
 DocType: Address,Subsidiary,ಸಹಕಾರಿ
 apps/erpnext/erpnext/setup/doctype/company/company.py +64,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ವ್ಯವಹಾರಗಳು ಇರುವುದರಿಂದ, ಕಂಪನಿಯ ಡೀಫಾಲ್ಟ್ ಕರೆನ್ಸಿ ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ . ಟ್ರಾನ್ಸಾಕ್ಷನ್ಸ್ ಡೀಫಾಲ್ಟ್ ಕರೆನ್ಸಿ ಬದಲಾಯಿಸಲು ರದ್ದು ಮಾಡಬೇಕು ."
+DocType: Grade Interval,Grade Description,ಗ್ರೇಡ್ ವಿವರಣೆ
 DocType: Quality Inspection,Purchase Receipt No,ಖರೀದಿ ರಸೀತಿ ನಂ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,ಅರ್ನೆಸ್ಟ್ ಮನಿ
 DocType: Process Payroll,Create Salary Slip,ಸಂಬಳ ಸ್ಲಿಪ್ ರಚಿಸಿ
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +33,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 +352,Quantity in row {0} ({1}) must be same as manufactured quantity {2},ಪ್ರಮಾಣ ಸತತವಾಗಿ {0} ( {1} ) ಅದೇ ಇರಬೇಕು ತಯಾರಿಸಿದ ಪ್ರಮಾಣ {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Quantity in row {0} ({1}) must be same as manufactured quantity {2},ಪ್ರಮಾಣ ಸತತವಾಗಿ {0} ( {1} ) ಅದೇ ಇರಬೇಕು ತಯಾರಿಸಿದ ಪ್ರಮಾಣ {2}
 DocType: Appraisal,Employee,ನೌಕರರ
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,ಬಳಕೆದಾರ ಎಂದು ಆಹ್ವಾನಿಸಿ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} ಸಂಪೂರ್ಣವಾಗಿ ವಿಧಿಸಲಾಗುತ್ತದೆ
 DocType: Workstation Working Hour,End Time,ಎಂಡ್ ಟೈಮ್
 DocType: Payment Entry,Payment Deductions or Loss,ಪಾವತಿ ಕಡಿತಗೊಳಿಸುವಿಕೆಗಳ ಅಥವಾ ನಷ್ಟ
-apps/erpnext/erpnext/config/schools.py +100,LMS,LMS
+apps/erpnext/erpnext/config/schools.py +104,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,ಮಾರಾಟದ ಪೈಪ್ಲೈನ್
 DocType: Student Batch Student,Student Batch Student,ವಿದ್ಯಾರ್ಥಿ ಬ್ಯಾಚ್ ವಿದ್ಯಾರ್ಥಿ
-DocType: Sales Invoice,Mass Mailing,ಸಾಮೂಹಿಕ ಮೇಲಿಂಗ್
+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 +199,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/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 +297,Salary Slip of employee {0} already created for this period,ಉದ್ಯೋಗಿ ಸಂಬಳ ಸ್ಲಿಪ್ {0} ಈಗಾಗಲೇ ಈ ಅವಧಿಯಲ್ಲಿ ರಚಿಸಿದ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Pharmaceutical,ಔಷಧೀಯ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +309,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/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,ಕ್ರೆಡಿಟ್
@@ -2060,27 +2084,28 @@
 DocType: Upload Attendance,Attendance To Date,ದಿನಾಂಕ ಹಾಜರಿದ್ದ
 DocType: Warranty Claim,Raised By,ಬೆಳೆಸಿದರು
 DocType: Payment Gateway Account,Payment Account,ಪಾವತಿ ಖಾತೆ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +814,Please specify Company to proceed,ಮುಂದುವರೆಯಲು ಕಂಪನಿ ನಮೂದಿಸಿ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +793,Please specify Company to proceed,ಮುಂದುವರೆಯಲು ಕಂಪನಿ ನಮೂದಿಸಿ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Receivable,ಸ್ವೀಕರಿಸುವಂತಹ ಖಾತೆಗಳು ನಿವ್ವಳ ವ್ಯತ್ಯಾಸದ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Compensatory Off,ಪರಿಹಾರ ಆಫ್
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,ಪರಿಹಾರ ಆಫ್
 DocType: Quality Inspection Reading,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.,ನೀವು ನಿಜವಾಗಿಯೂ ಈ ಕಂಪನಿಗೆ ಎಲ್ಲಾ ವ್ಯವಹಾರಗಳ ಅಳಿಸಲು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ. ಅದು ಎಂದು ನಿಮ್ಮ ಮಾಸ್ಟರ್ ಡೇಟಾ ಉಳಿಯುತ್ತದೆ. ಈ ಕಾರ್ಯವನ್ನು ರದ್ದುಪಡಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ.
 DocType: Room,Room Number,ಕೋಣೆ ಸಂಖ್ಯೆ
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},ಅಮಾನ್ಯವಾದ ಉಲ್ಲೇಖ {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +161,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ಯೋಜನೆ quanitity ಅಧಿಕವಾಗಿರುತ್ತದೆ ಸಾಧ್ಯವಿಲ್ಲ ({2}) ಉತ್ಪಾದನೆಯಲ್ಲಿನ ಆರ್ಡರ್ {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +162,{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 +217,Raw Materials cannot be blank.,ರಾ ಮೆಟೀರಿಯಲ್ಸ್ ಖಾಲಿ ಇರುವಂತಿಲ್ಲ.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,"Could not update stock, invoice contains drop shipping item.","ಸ್ಟಾಕ್ ನವೀಕರಣಗೊಳ್ಳುವುದಿಲ್ಲ, ಸರಕುಪಟ್ಟಿ ಡ್ರಾಪ್ ಹಡಗು ಐಟಂ ಹೊಂದಿದೆ."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +460,Quick Journal Entry,ತ್ವರಿತ ಜರ್ನಲ್ ಎಂಟ್ರಿ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +111,You can not change rate if BOM mentioned agianst any item,BOM ಯಾವುದೇ ಐಟಂ agianst ಪ್ರಸ್ತಾಪಿಸಿದ್ದಾರೆ ವೇಳೆ ನೀವು ದರ ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +441,"Could not update stock, invoice contains drop shipping item.","ಸ್ಟಾಕ್ ನವೀಕರಣಗೊಳ್ಳುವುದಿಲ್ಲ, ಸರಕುಪಟ್ಟಿ ಡ್ರಾಪ್ ಹಡಗು ಐಟಂ ಹೊಂದಿದೆ."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Quick Journal Entry,ತ್ವರಿತ ಜರ್ನಲ್ ಎಂಟ್ರಿ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +103,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 +214,{0} {1} is not submitted,{0} {1} ಸಲ್ಲಿಸದಿದ್ದರೆ
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,ಐಟಂಗಳನ್ನು ವಿನಂತಿಗಳು .
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,ಪ್ರತ್ಯೇಕ ಉತ್ಪಾದನಾ ಸಲುವಾಗಿ ಪ್ರತಿ ಸಿದ್ಧಪಡಿಸಿದ ಉತ್ತಮ ಐಟಂ ನಿರ್ಮಿಸಲಾಗುತ್ತದೆ .
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +121,{0} must be negative in return document,{0} ರಿಟರ್ನ್ ದಸ್ತಾವೇಜು ಋಣಾತ್ಮಕ ಇರಬೇಕು
 ,Minutes to First Response for Issues,ಇಷ್ಯೂಸ್ ಮೊದಲ ರೆಸ್ಪಾನ್ಸ್ ನಿಮಿಷಗಳ
 DocType: Purchase Invoice,Terms and Conditions1,ನಿಯಮಗಳು ಮತ್ತು Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,ಸಂಸ್ಥೆಯ ಹೆಸರು ಇದಕ್ಕಾಗಿ ನೀವು ಈ ವ್ಯವಸ್ಥೆಯ ಹೊಂದಿಸುವಾಗ.
@@ -2089,16 +2114,17 @@
 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 +398,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 +739,Item or Warehouse for row {0} does not match Material Request,ಸಾಲು ಐಟಂ ಅಥವಾ ಗೋದಾಮಿನ {0} ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ ಹೊಂದಿಕೆಯಾಗುವುದಿಲ್ಲ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +747,Item or Warehouse for row {0} does not match Material Request,ಸಾಲು ಐಟಂ ಅಥವಾ ಗೋದಾಮಿನ {0} ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ ಹೊಂದಿಕೆಯಾಗುವುದಿಲ್ಲ
 apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,ಅಳತೆಯ ಘಟಕ
 DocType: Fiscal Year,Year End Date,ವರ್ಷಾಂತ್ಯದ ದಿನಾಂಕ
 DocType: Task Depends On,Task Depends On,ಟಾಸ್ಕ್ ಅವಲಂಬಿಸಿರುತ್ತದೆ
-DocType: Lead,Opportunity,ಅವಕಾಶ
+DocType: Supplier Quotation,Opportunity,ಅವಕಾಶ
 ,Completed Production Orders,ಪೂರ್ಣಗೊಂಡಿದೆ ಉತ್ಪಾದನೆ ಆರ್ಡರ್ಸ್
 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,ಡೀಫಾಲ್ಟ್ ವರ್ಕ್ಸ್ಟೇಷನ್
@@ -2111,7 +2137,7 @@
 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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},ನಿರ್ವಹಣೆ ಆರಂಭ ದಿನಾಂಕ ಯಾವುದೇ ಸೀರಿಯಲ್ ವಿತರಣಾ ದಿನಾಂಕದ ಮೊದಲು ಸಾಧ್ಯವಿಲ್ಲ {0}
+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,ನಿಜವಾದ ಅಂತಿಮ ದಿನಾಂಕ
 DocType: Purchase Invoice,PINV-,PINV-
 DocType: Authorization Rule,Applicable To (Role),ಅನ್ವಯವಾಗುತ್ತದೆ ( ಪಾತ್ರ )
@@ -2126,7 +2152,7 @@
 DocType: SMS Log,No of Requested SMS,ವಿನಂತಿಸಲಾಗಿದೆ SMS ನ ನಂ
 DocType: Campaign,Campaign-.####,ಕ್ಯಾಂಪೇನ್ . # # # #
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,ಮುಂದಿನ ಕ್ರಮಗಳು
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,Please supply the specified items at the best possible rates,ದಯವಿಟ್ಟು ಸಾಧ್ಯವಾದಷ್ಟು ದರಗಳಲ್ಲಿ ನಿರ್ದಿಷ್ಟಪಡಿಸಿದ ಐಟಂಗಳನ್ನು ಸರಬರಾಜು
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +695,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 +117,Contract End Date must be greater than Date of Joining,ಕಾಂಟ್ರಾಕ್ಟ್ ಎಂಡ್ ದಿನಾಂಕ ಸೇರುವ ದಿನಾಂಕ ಹೆಚ್ಚಿನ ಇರಬೇಕು
 DocType: Delivery Note,DN-,DN-
@@ -2135,7 +2161,7 @@
 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 +14,This is an example website auto-generated from ERPNext,ಈ ERPNext ನಿಂದ ಸ್ವಯಂ ರಚಿತವಾದ ಒಂದು ಉದಾಹರಣೆ ವೆಬ್ಸೈಟ್
+apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,ಈ ERPNext ನಿಂದ ಸ್ವಯಂ ರಚಿತವಾದ ಒಂದು ಉದಾಹರಣೆ ವೆಬ್ಸೈಟ್
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,ಏಜಿಂಗ್ ರೇಂಜ್ 1
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
@@ -2182,13 +2208,14 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd ಪ್ರಮಾಣ
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +54,Fee Records Created - {0},ಶುಲ್ಕ ರೆಕಾರ್ಡ್ಸ್ ರಚಿಸಲಾಗಿದೆ - {0}
 DocType: Asset Category Account,Asset Category Account,ಆಸ್ತಿ ವರ್ಗ ಖಾತೆ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +103,Cannot produce more Item {0} than Sales Order quantity {1},ಹೆಚ್ಚು ಐಟಂ ಉತ್ಪಾದಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ {0} ಹೆಚ್ಚು ಮಾರಾಟದ ಆರ್ಡರ್ ಪ್ರಮಾಣ {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Stock Entry {0} is not submitted,ಸ್ಟಾಕ್ ಎಂಟ್ರಿ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},ಹೆಚ್ಚು ಐಟಂ ಉತ್ಪಾದಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ {0} ಹೆಚ್ಚು ಮಾರಾಟದ ಆರ್ಡರ್ ಪ್ರಮಾಣ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +505,Stock Entry {0} is not submitted,ಸ್ಟಾಕ್ ಎಂಟ್ರಿ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
 DocType: Payment Reconciliation,Bank / Cash Account,ಬ್ಯಾಂಕ್ / ನಗದು ಖಾತೆ
 DocType: Tax Rule,Billing City,ಬಿಲ್ಲಿಂಗ್ ನಗರ
 DocType: Salary Component Account,Salary Component Account,ಸಂಬಳ ಕಾಂಪೊನೆಂಟ್ ಖಾತೆ
 DocType: Global Defaults,Hide Currency Symbol,ಕರೆನ್ಸಿ ಸಂಕೇತ ಮರೆಮಾಡಿ
 apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card","ಇ ಜಿ ಬ್ಯಾಂಕ್ , ನಗದು, ಕ್ರೆಡಿಟ್ ಕಾರ್ಡ್"
+DocType: Lead Source,Source Name,ಮೂಲ ಹೆಸರು
 DocType: Journal Entry,Credit Note,ಕ್ರೆಡಿಟ್ ಸ್ಕೋರ್
 DocType: Warranty Claim,Service Address,ಸೇವೆ ವಿಳಾಸ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furnitures and Fixtures,ಪೀಠೋಪಕರಣಗಳು ಮತ್ತು ನೆಲೆವಸ್ತುಗಳ
@@ -2200,6 +2227,7 @@
 DocType: Opportunity,Customer / Lead Name,ಗ್ರಾಹಕ / ಲೀಡ್ ಹೆಸರು
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +89,Clearance Date not mentioned,ಕ್ಲಿಯರೆನ್ಸ್ ದಿನಾಂಕ ಪ್ರಸ್ತಾಪಿಸಿದ್ದಾರೆ
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,ಉತ್ಪಾದನೆ
+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/controllers/trends.py +19,Total(Qty),ಒಟ್ಟು (ಪ್ರಮಾಣ)
 DocType: Sales Invoice,This Document,ಈ ಡಾಕ್ಯುಮೆಂಟ್
@@ -2211,15 +2239,15 @@
 DocType: Purchase Receipt,Time at which materials were received,ವಸ್ತುಗಳನ್ನು ಸ್ವೀಕರಿಸಿದ ಯಾವ ಸಮಯದಲ್ಲಿ
 DocType: Stock Ledger Entry,Outgoing Rate,ಹೊರಹೋಗುವ ದರ
 apps/erpnext/erpnext/config/hr.py +176,Organization branch master.,ಸಂಸ್ಥೆ ಶಾಖೆ ಮಾಸ್ಟರ್ .
-apps/erpnext/erpnext/controllers/accounts_controller.py +273, or ,ಅಥವಾ
+apps/erpnext/erpnext/controllers/accounts_controller.py +276, 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 +203,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,ರೋ # {0}: ಜರ್ನಲ್ ಎಂಟ್ರಿ {1} ಖಾತೆಯನ್ನು ಹೊಂದಿಲ್ಲ {2} ಅಥವಾ ಈಗಾಗಲೇ ಮತ್ತೊಂದು ಚೀಟಿ ವಿರುದ್ಧ ದಾಖಲೆಗಳುಸರಿಹೊಂದಿವೆ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +206,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 +90,No employee for the above selected criteria OR salary slip already created,ಮೇಲೆ ಆಯ್ಕೆ ಮಾಡಿದ ಮಾನದಂಡ ಅಥವಾ ಸಂಬಳ ಸ್ಲಿಪ್ ಯಾವುದೇ ಉದ್ಯೋಗಿ ಈಗಾಗಲೇ ರಚಿಸಿದ
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +93,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,ಪಾವತಿ ಪ್ರಕಾರ
@@ -2247,8 +2275,8 @@
 DocType: Product Bundle,Parent Item,ಪೋಷಕ ಐಟಂ
 DocType: Account,Account Type,ಖಾತೆ ಪ್ರಕಾರ
 DocType: Delivery Note,DN-RET-,ಡಿ-RET-
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +115,Leave Type {0} cannot be carry-forwarded,{0} ಸಾಗಿಸುವ-ಫಾರ್ವರ್ಡ್ ಸಾಧ್ಯವಿಲ್ಲ ಕೌಟುಂಬಿಕತೆ ಬಿಡಿ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',ನಿರ್ವಹಣೆ ವೇಳಾಪಟ್ಟಿ ಎಲ್ಲಾ ಐಟಂಗಳನ್ನು ಉತ್ಪತ್ತಿಯಾಗುವುದಿಲ್ಲ. ವೇಳಾಪಟ್ಟಿ ' ' ರಚಿಸಿ 'ಅನ್ನು ಕ್ಲಿಕ್ ಮಾಡಿ
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +118,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 +163,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","ಸಾಲು {0} ನಲ್ಲಿ {1}. ಐಟಂ ದರ {2} ಸೇರಿವೆ, ಸಾಲುಗಳನ್ನು {3} ಸಹ ಸೇರಿಸಲೇಬೇಕು"
@@ -2260,13 +2288,13 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +32,Disabled template must not be default template,ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ ಟೆಂಪ್ಲೇಟ್ ಡೀಫಾಲ್ಟ್ ಟೆಂಪ್ಲೇಟ್ ಇರಬಾರದು
 DocType: Account,Income Account,ಆದಾಯ ಖಾತೆ
 DocType: Payment Request,Amount in customer's currency,ಗ್ರಾಹಕರ ಕರೆನ್ಸಿ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +748,Delivery,ಡೆಲಿವರಿ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +742,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,ಪ್ರಮುಖ ಜವಾಬ್ದಾರಿ ಪ್ರದೇಶ
 DocType: Payment Entry,Total Allocated Amount,ಒಟ್ಟು ನಿಗದಿ ಪ್ರಮಾಣ
 DocType: Item Reorder,Material Request Type,ಮೆಟೀರಿಯಲ್ RequestType
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +82,Row {0}: UOM Conversion Factor is mandatory,ಸಾಲು {0}: ಮೈಸೂರು ವಿಶ್ವವಿದ್ಯಾನಿಲದ ಪರಿವರ್ತನಾ ಕಾರಕ ಕಡ್ಡಾಯ
+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,ವೆಚ್ಚ ಸೆಂಟರ್
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,ಚೀಟಿ #
@@ -2277,13 +2305,13 @@
 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 +90,Head of Marketing and Sales,ಮಾರ್ಕೆಟಿಂಗ್ ಮತ್ತು ಮಾರಾಟದ ಮುಖ್ಯಸ್ಥ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,ವರಮಾನ ತೆರಿಗೆ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,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 +403,Please enter Item Code to get batch no,ಯಾವುದೇ ಐಟಂ ಬ್ಯಾಚ್ ಪಡೆಯಲು ಕೋಡ್ ನಮೂದಿಸಿ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +770,Please select a value for {0} quotation_to {1},{0} {1} quotation_to ಒಂದು ಮೌಲ್ಯವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +397,Please enter Item Code to get batch no,ಯಾವುದೇ ಐಟಂ ಬ್ಯಾಚ್ ಪಡೆಯಲು ಕೋಡ್ ನಮೂದಿಸಿ
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +764,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","ಕೆಳಗಿನ ಲಕ್ಷಣಗಳು ದಾಖಲೆಗಳಲ್ಲಿ ಅದೇ ವೇಳೆ ಮರ್ಜಿಂಗ್ ಮಾತ್ರ ಸಾಧ್ಯ. ಗ್ರೂಪ್, ರೂಟ್ ಕೌಟುಂಬಿಕತೆ, ಕಂಪನಿ"
@@ -2295,28 +2323,29 @@
 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 +100,Issues,ತೊಂದರೆಗಳು
+apps/erpnext/erpnext/hooks.py +109,Issues,ತೊಂದರೆಗಳು
 apps/erpnext/erpnext/controllers/status_updater.py +13,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,ಬಿಲ್ಲಿಂಗ್ ಕರೆನ್ಸಿ
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Large,ಎಕ್ಸ್ಟ್ರಾ ದೊಡ್ಡದು
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,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 +507,Warning: Another {0} # {1} exists against stock entry {2},ಎಚ್ಚರಿಕೆ: ಮತ್ತೊಂದು {0} # {1} ಸ್ಟಾಕ್ ಪ್ರವೇಶ ವಿರುದ್ಧ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Local,ಸ್ಥಳೀಯ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +508,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),ಸಾಲ ಮತ್ತು ಅಡ್ವಾನ್ಸಸ್ ( ಆಸ್ತಿಗಳು )
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,ಸಾಲಗಾರರು
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Large,ದೊಡ್ಡ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,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 +225,Total {0} ({1}),ಒಟ್ಟು {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +224,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,ಡೀಫಾಲ್ಟ್ ಮೌಲ್ಯಮಾಪನ ವಿಧಾನ
@@ -2374,9 +2403,9 @@
 DocType: Attendance,Leave Type,ಪ್ರಕಾರ ಬಿಡಿ
 apps/erpnext/erpnext/controllers/stock_controller.py +173,Expense / Difference account ({0}) must be a 'Profit or Loss' account,ಖರ್ಚು / ವ್ಯತ್ಯಾಸ ಖಾತೆ ({0}) ಒಂದು 'ಲಾಭ ಅಥವಾ ನಷ್ಟ' ಖಾತೆ ಇರಬೇಕು
 DocType: Account,Accounts User,ಬಳಕೆದಾರ ಖಾತೆಗಳು
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Name error: {0},ಹೆಸರು ದೋಷ: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +90,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 +178,{0} {1} does not associated with {2} {3},{0} {1} ಸಂಬಂಧಿಸಿದ ಇಲ್ಲ {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +181,{0} {1} does not associated with {2} {3},{0} {1} ಸಂಬಂಧಿಸಿದ ಇಲ್ಲ {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,ನೌಕರ ಅಟೆಂಡೆನ್ಸ್ {0} ಈಗಾಗಲೇ ಗುರುತಿಸಲಾಗಿದೆ
 DocType: Packing Slip,If more than one package of the same type (for print),ವೇಳೆ ( ಮುದ್ರಣ ) ಅದೇ ರೀತಿಯ ಒಂದಕ್ಕಿಂತ ಹೆಚ್ಚು ಪ್ಯಾಕೇಜ್
 DocType: Warehouse,Parent Warehouse,ಪೋಷಕ ವೇರ್ಹೌಸ್
@@ -2395,7 +2424,7 @@
 DocType: BOM Item,Scrap %,ಸ್ಕ್ರ್ಯಾಪ್ %
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection","ಆರೋಪಗಳನ್ನು ಸೂಕ್ತ ಪ್ರಮಾಣದಲ್ಲಿ ನಿಮ್ಮ ಆಯ್ಕೆಯ ಪ್ರಕಾರ, ಐಟಂ ಪ್ರಮಾಣ ಅಥವಾ ಪ್ರಮಾಣವನ್ನು ಆಧರಿಸಿ ಹಂಚಲಾಗುತ್ತದೆ"
 DocType: Maintenance Visit,Purposes,ಉದ್ದೇಶಗಳಿಗಾಗಿ
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,ಕನಿಷ್ಠ ಒಂದು ಐಟಂ ರಿಟರ್ನ್ ದಸ್ತಾವೇಜು ನಕಾರಾತ್ಮಕ ಪ್ರಮಾಣ ದಾಖಲಿಸಬೇಕಾಗುತ್ತದೆ
+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 +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","ಆಪರೇಷನ್ {0} ಕಾರ್ಯಸ್ಥಳ ಯಾವುದೇ ಲಭ್ಯವಿರುವ ಕೆಲಸದ ಹೆಚ್ಚು {1}, ಅನೇಕ ಕಾರ್ಯಾಚರಣೆಗಳು ಆಪರೇಷನ್ ಮುರಿಯಲು"
 ,Requested,ವಿನಂತಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +83,No Remarks,ಯಾವುದೇ ಟೀಕೆಗಳನ್ನು
@@ -2407,46 +2436,46 @@
 DocType: Item,Total Projected Qty,ಒಟ್ಟು ಯೋಜಿತ ಪ್ರಮಾಣ
 DocType: Monthly Distribution,Distribution Name,ವಿತರಣೆ ಹೆಸರು
 DocType: Course,Course Code,ಕೋರ್ಸ್ ಕೋಡ್
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Quality Inspection required for Item {0},ಐಟಂ ಬೇಕಾದ ಗುಣಮಟ್ಟ ತಪಾಸಣೆ {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Quality Inspection required for Item {0},ಐಟಂ ಬೇಕಾದ ಗುಣಮಟ್ಟ ತಪಾಸಣೆ {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,ಗ್ರಾಹಕ ಕರೆನ್ಸಿ ದರ ಕಂಪನಿಯ ಬೇಸ್ ಕರೆನ್ಸಿ ಪರಿವರ್ತನೆ
 DocType: Purchase Invoice Item,Net Rate (Company Currency),ನೆಟ್ ದರ (ಕಂಪನಿ ಕರೆನ್ಸಿ)
 DocType: Salary Detail,Condition and Formula Help,ಪರಿಸ್ಥಿತಿ ಮತ್ತು ಫಾರ್ಮುಲಾ ಸಹಾಯ
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,ಪ್ರದೇಶ ಮ್ಯಾನೇಜ್ಮೆಂಟ್ ಟ್ರೀ .
 DocType: Journal Entry Account,Sales Invoice,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ
 DocType: Journal Entry Account,Party Balance,ಪಕ್ಷದ ಬ್ಯಾಲೆನ್ಸ್
-apps/erpnext/erpnext/accounts/page/pos/pos.js +475,Please select Apply Discount On,ರಿಯಾಯತಿ ಅನ್ವಯಿಸು ಆಯ್ಕೆಮಾಡಿ
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +92,Salary Slip Created,ಸಂಬಳ ಸ್ಲಿಪ್ ರಚಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +464,Please select Apply Discount On,ರಿಯಾಯತಿ ಅನ್ವಯಿಸು ಆಯ್ಕೆಮಾಡಿ
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +95,Salary Slip Created,ಸಂಬಳ ಸ್ಲಿಪ್ ರಚಿಸಲಾಗಿದೆ
 DocType: Company,Default Receivable Account,ಡೀಫಾಲ್ಟ್ ಸ್ವೀಕರಿಸುವಂತಹ ಖಾತೆ
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,ಮೇಲೆ ಆಯ್ಕೆ ಮಾನದಂಡದ ಒಟ್ಟು ವೇತನ ಬ್ಯಾಂಕ್ ಎಂಟ್ರಿ ರಚಿಸಿ
 DocType: Stock Entry,Material Transfer for Manufacture,ತಯಾರಿಕೆಗೆ ವಸ್ತು ವರ್ಗಾವಣೆ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,ರಿಯಾಯಿತಿ ಶೇಕಡಾವಾರು ಬೆಲೆ ಪಟ್ಟಿ ವಿರುದ್ಧ ಅಥವಾ ಎಲ್ಲಾ ಬೆಲೆ ಪಟ್ಟಿ ಎರಡೂ ಅನ್ವಯಿಸಬಹುದು.
 DocType: Purchase Invoice,Half-yearly,ಅರ್ಧವಾರ್ಷಿಕ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +384,Accounting Entry for Stock,ಸ್ಟಾಕ್ ಲೆಕ್ಕಪರಿಶೋಧಕ ಎಂಟ್ರಿ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +387,Accounting Entry for Stock,ಸ್ಟಾಕ್ ಲೆಕ್ಕಪರಿಶೋಧಕ ಎಂಟ್ರಿ
 DocType: Sales Invoice,Sales Team1,ಮಾರಾಟದ team1
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,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 +96,Row {0}: Completed Qty must be greater than zero.,ರೋ {0}: ಪೂರ್ಣಗೊಂಡಿದೆ ಪ್ರಮಾಣ ಹೆಚ್ಚಾಗಿದೆ ಶೂನ್ಯ ಇರಬೇಕು.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +120,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 +88,Row # {0}: Cannot return more than {1} for Item {2},ರೋ # {0}: ಹೆಚ್ಚು ಮರಳಲು ಸಾಧ್ಯವಿಲ್ಲ {1} ಐಟಂ {2}
+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,ಪ್ಲಾಟ್
 DocType: Item Group,Show this slideshow at the top of the page,ಪುಟದ ಮೇಲಿರುವ ಈ ಸ್ಲೈಡ್ಶೋ ತೋರಿಸು
 DocType: BOM,Item UOM,ಐಟಂ UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),ಡಿಸ್ಕೌಂಟ್ ಪ್ರಮಾಣದ ನಂತರ ತೆರಿಗೆ ಪ್ರಮಾಣ (ಕಂಪನಿ ಕರೆನ್ಸಿ)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +147,Target warehouse is mandatory for row {0},ಟಾರ್ಗೆಟ್ ಗೋದಾಮಿನ ಸಾಲು ಕಡ್ಡಾಯ {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,ಸರಬರಾಜುದಾರ ವಿಳಾಸ ಆಯ್ಕೆ
 DocType: Quality Inspection,Quality Inspection,ಗುಣಮಟ್ಟದ ತಪಾಸಣೆ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Extra Small,ಹೆಚ್ಚುವರಿ ಸಣ್ಣ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,Warning: Material Requested Qty is less than Minimum Order Qty,ಎಚ್ಚರಿಕೆ : ಪ್ರಮಾಣ ವಿನಂತಿಸಿದ ವಸ್ತು ಕನಿಷ್ಠ ಪ್ರಮಾಣ ಆದೇಶ ಕಡಿಮೆ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +194,Account {0} is frozen,ಖಾತೆ {0} ಹೆಪ್ಪುಗಟ್ಟಿರುವ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,ಹೆಚ್ಚುವರಿ ಸಣ್ಣ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +690,Warning: Material Requested Qty is less than Minimum Order Qty,ಎಚ್ಚರಿಕೆ : ಪ್ರಮಾಣ ವಿನಂತಿಸಿದ ವಸ್ತು ಕನಿಷ್ಠ ಪ್ರಮಾಣ ಆದೇಶ ಕಡಿಮೆ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,ಖಾತೆ {0} ಹೆಪ್ಪುಗಟ್ಟಿರುವ
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,ಸಂಸ್ಥೆ ಸೇರಿದ ಖಾತೆಗಳ ಪ್ರತ್ಯೇಕ ಚಾರ್ಟ್ ಜೊತೆಗೆ ಕಾನೂನು ಘಟಕದ / ಅಂಗಸಂಸ್ಥೆ.
 DocType: Payment Request,Mute Email,ಮ್ಯೂಟ್ ಇಮೇಲ್
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","ಆಹಾರ , ಪಾನೀಯ ಮತ್ತು ತಂಬಾಕು"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +606,Can only make payment against unbilled {0},ಮಾತ್ರ ವಿರುದ್ಧ ಪಾವತಿ ಮಾಡಬಹುದು unbilled {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +126,Commission rate cannot be greater than 100,ಕಮಿಷನ್ ದರ 100 ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +609,Can only make payment against unbilled {0},ಮಾತ್ರ ವಿರುದ್ಧ ಪಾವತಿ ಮಾಡಬಹುದು unbilled {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,ಕಮಿಷನ್ ದರ 100 ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Stock Entry,Subcontract,subcontract
 apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,ಮೊದಲ {0} ನಮೂದಿಸಿ
 DocType: Production Order Operation,Actual End Time,ನಿಜವಾದ ಎಂಡ್ ಟೈಮ್
@@ -2457,30 +2486,30 @@
 DocType: SMS Log,No of Sent SMS,ಕಳುಹಿಸಲಾಗಿದೆ ಎಸ್ಎಂಎಸ್ ಸಂಖ್ಯೆ
 DocType: Account,Expense Account,ವೆಚ್ಚದಲ್ಲಿ ಖಾತೆಯನ್ನು
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,ತಂತ್ರಾಂಶ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Colour,ಬಣ್ಣದ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,ಬಣ್ಣದ
 DocType: Maintenance Visit,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; ಐಟಂ ಆಯ್ಕೆ ಮತ್ತು ಯಾವುದೇ ಉತ್ಪನ್ನ ಕಟ್ಟು ಇಲ್ಲ ದಯವಿಟ್ಟು
 DocType: Student Log,Academic,ಶೈಕ್ಷಣಿಕ
-apps/erpnext/erpnext/controllers/accounts_controller.py +469,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),ಒಟ್ಟು ಮುಂಚಿತವಾಗಿ ({0}) ಆರ್ಡರ್ ವಿರುದ್ಧ {1} ಗ್ರ್ಯಾಂಡ್ ಒಟ್ಟು ಅಧಿಕವಾಗಿರುತ್ತದೆ ಸಾಧ್ಯವಿಲ್ಲ ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +472,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),ಒಟ್ಟು ಮುಂಚಿತವಾಗಿ ({0}) ಆರ್ಡರ್ ವಿರುದ್ಧ {1} ಗ್ರ್ಯಾಂಡ್ ಒಟ್ಟು ಅಧಿಕವಾಗಿರುತ್ತದೆ ಸಾಧ್ಯವಿಲ್ಲ ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,ಅಸಮಾನವಾಗಿ ತಿಂಗಳ ಅಡ್ಡಲಾಗಿ ಗುರಿಗಳನ್ನು ವಿತರಿಸಲು ಮಾಸಿಕ ವಿತರಣೆ ಆಯ್ಕೆ.
 DocType: Purchase Invoice Item,Valuation Rate,ಮೌಲ್ಯಾಂಕನ ದರ
+DocType: Stock Reconciliation,SR/,ಎಸ್ಆರ್ /
 apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,ಬೆಲೆ ಪಟ್ಟಿ ಕರೆನ್ಸಿ ಆಯ್ಕೆ ಇಲ್ಲ
 DocType: Assessment,Results,ಫಲಿತಾಂಶಗಳು
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +168,Employee {0} has already applied for {1} between {2} and {3},ನೌಕರರ {0} ಈಗಾಗಲೇ {1} {2} ಮತ್ತು ನಡುವೆ ಅನ್ವಯಿಸಿದ್ದಾರೆ {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +175,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: Student Applicant,Father's/ Guardian 2 Email ID,ತಂದೆಯ / ಗಾರ್ಡಿಯನ್ 2 ಈಮೇಲ್ ಅಡ್ರೆಸ್
 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 +228,Warehouses with existing transaction can not be converted to group.,ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ವಹಿವಾಟು ಗೋದಾಮುಗಳು ಗುಂಪು ಪರಿವರ್ತಿಸಬಹುದು ಸಾಧ್ಯವಿಲ್ಲ.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +231,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 +93,Researcher,ಸಂಶೋಧಕ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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.,ಒಳಬರುವ ಗುಣಮಟ್ಟ ತಪಾಸಣೆ .
@@ -2492,25 +2521,25 @@
 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: Sales Invoice,Advertisement,ಜಾಹೀರಾತು
 DocType: Asset Category Account,Depreciation Expense Account,ಸವಕಳಿ ಖರ್ಚುವೆಚ್ಚ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Probationary Period,ಉಮೇದುವಾರಿಕೆಯ ಅವಧಿಯಲ್ಲಿ
-apps/erpnext/erpnext/hooks.py +102,Announcements,ಪ್ರಕಟಣೆಗಳು
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,ಉಮೇದುವಾರಿಕೆಯ ಅವಧಿಯಲ್ಲಿ
+apps/erpnext/erpnext/hooks.py +111,Announcements,ಪ್ರಕಟಣೆಗಳು
 DocType: Customer Group,Only leaf nodes are allowed in transaction,ಮಾತ್ರ ಲೀಫ್ ನೋಡ್ಗಳು ವ್ಯವಹಾರದಲ್ಲಿ ಅವಕಾಶ
 DocType: Expense Claim,Expense Approver,ವೆಚ್ಚದಲ್ಲಿ ಅನುಮೋದಕ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +109,Row {0}: Advance against Customer must be credit,ಸಾಲು {0}: ಗ್ರಾಹಕ ವಿರುದ್ಧ ಅಡ್ವಾನ್ಸ್ ಕ್ರೆಡಿಟ್ ಇರಬೇಕು
 apps/erpnext/erpnext/accounts/doctype/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 +16,To Datetime,Datetime ಗೆ
+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/scheduling_tool/scheduling_tool.py +51,Course Schedules deleted:,ಕೋರ್ಸ್ ವೇಳಾಪಟ್ಟಿಗಳು ಅಳಿಸಲಾಗಿದೆ:
 apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,SMS ಡೆಲಿವರಿ ಸ್ಥಾನಮಾನ ಕಾಯ್ದುಕೊಳ್ಳುವುದು ದಾಖಲೆಗಳು
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,ಬಾಕಿ ಚಟುವಟಿಕೆಗಳು
+DocType: Accounts Settings,Make Payment via Journal Entry,ಜರ್ನಲ್ ಎಂಟ್ರಿ ಮೂಲಕ ಪಾವತಿ ಮಾಡಲು
+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 +127,Please enter relieving date.,ದಿನಾಂಕ ನಿವಾರಿಸುವ ನಮೂದಿಸಿ.
-apps/erpnext/erpnext/controllers/trends.py +145,Amt,ಮೊತ್ತ
+apps/erpnext/erpnext/controllers/trends.py +149,Amt,ಮೊತ್ತ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,Only Leave Applications with status 'Approved' can be submitted,ಮಾತ್ರ ಸಲ್ಲಿಸಿದ ಮಾಡಬಹುದು 'ಅಂಗೀಕಾರವಾದ' ಸ್ಥಿತಿಯನ್ನು ಅನ್ವಯಗಳಲ್ಲಿ ಬಿಡಿ
 apps/erpnext/erpnext/utilities/doctype/address/address.py +26,Address Title is mandatory.,ವಿಳಾಸ ಶೀರ್ಷಿಕೆ ಕಡ್ಡಾಯ.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,ವಿಚಾರಣೆಯ ಮೂಲ ಪ್ರಚಾರ ವೇಳೆ ಪ್ರಚಾರ ಹೆಸರನ್ನು ನಮೂದಿಸಿ
@@ -2528,14 +2557,15 @@
 apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1},{0} ಗೆ ವಿನಿಮಯ ದರದ ಹುಡುಕಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,ಮಾರ್ಕ್ ಅರ್ಧ ದಿನ
 DocType: Sales Invoice,Sales Team,ಮಾರಾಟದ ತಂಡ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Duplicate entry,ಪ್ರವೇಶ ನಕಲು
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,ಪ್ರವೇಶ ನಕಲು
 DocType: Program Enrollment Tool,Get Students,ವಿದ್ಯಾರ್ಥಿಗಳು ಪಡೆಯಿರಿ
 DocType: Serial No,Under Warranty,ವಾರಂಟಿ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +490,[Error],[ದೋಷ]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +484,[Error],[ದೋಷ]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,ನೀವು ಮಾರಾಟದ ಆರ್ಡರ್ ಉಳಿಸಲು ಒಮ್ಮೆ ವರ್ಡ್ಸ್ ಗೋಚರಿಸುತ್ತದೆ.
 ,Employee Birthday,ನೌಕರರ ಜನ್ಮದಿನ
 apps/erpnext/erpnext/controllers/status_updater.py +175,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} ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ. ದಯವಿಟ್ಟು ಈ ನಮೂದುಗಳನ್ನು ಮಾರ್ಪಡಿಸಲು ಹಾಗೂ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ.
 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} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
@@ -2551,22 +2581,22 @@
 ,Issued Items Against Production Order,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ವಿರುದ್ಧ ನೀಡಲ್ಪಟ್ಟ ಐಟಂಗಳು
 DocType: Pricing Rule,Purchase Manager,ಖರೀದಿ ಮ್ಯಾನೇಜರ್
 DocType: Target Detail,Target Detail,ವಿವರ ಟಾರ್ಗೆಟ್
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +25,All Jobs,ಎಲ್ಲಾ ಉದ್ಯೋಗ
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,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 +323,Amount {0} {1} {2} {3},ಪ್ರಮಾಣ {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,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: Supplier,Credit Limit,ಕ್ರೆಡಿಟ್ ಮಿತಿಯನ್ನು
 DocType: Production Plan Sales Order,Salse Order Date,ಮಣ್ಣಿನ ಜ್ವಾಲಾಮುಖಿ ಆದೇಶ ದಿನಾಂಕ
 DocType: Salary Component,Salary Component,ಸಂಬಳ ಕಾಂಪೊನೆಂಟ್
-apps/erpnext/erpnext/accounts/utils.py +372,Payment Entries {0} are un-linked,ಪಾವತಿ ನಮೂದುಗಳು {0} ಅನ್ ಬಂಧಿಸಿಲ್ಲ
+apps/erpnext/erpnext/accounts/utils.py +449,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 +497,Material Requests {0} created,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿಗಳನ್ನು {0} ದಾಖಲಿಸಿದವರು
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +498,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.,ನಿಯಮಗಳು ಅಥವಾ ಒಪ್ಪಂದದ ಟೆಂಪ್ಲೇಟು .
 DocType: Purchase Invoice,Address and Contact,ವಿಳಾಸ ಮತ್ತು ಸಂಪರ್ಕ
@@ -2605,7 +2635,7 @@
 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 +848,Paid Amount cannot be greater than total negative outstanding amount {0},ಪಾವತಿಸಿದ ಮೊತ್ತ ಒಟ್ಟು ಋಣಾತ್ಮಕ ಬಾಕಿ ಮೊತ್ತದ ಹೆಚ್ಚಿನ ಸಾಧ್ಯವಿಲ್ಲ {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +859,Paid Amount cannot be greater than total negative outstanding amount {0},ಪಾವತಿಸಿದ ಮೊತ್ತ ಒಟ್ಟು ಋಣಾತ್ಮಕ ಬಾಕಿ ಮೊತ್ತದ ಹೆಚ್ಚಿನ ಸಾಧ್ಯವಿಲ್ಲ {0}
 DocType: Employee Internal Work History,Employee Internal Work History,ಆಂತರಿಕ ಕೆಲಸದ ಇತಿಹಾಸ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +233,Closing (Dr),ಮುಚ್ಚುವ (ಡಾ)
 DocType: Cheque Print Template,Cheque Size,ಚೆಕ್ ಗಾತ್ರ
@@ -2626,7 +2656,8 @@
 ,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 +555,'Update Stock' cannot be checked for fixed asset sale,&#39;ಅಪ್ಡೇಟ್ ಸ್ಟಾಕ್&#39; ಸ್ಥಿರ ಸಂಪತ್ತಾದ ಮಾರಾಟ ಪರಿಶೀಲಿಸಲಾಗುವುದಿಲ್ಲ
+DocType: Student Guardian,Father,ತಂದೆ
+apps/erpnext/erpnext/controllers/accounts_controller.py +558,'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} ರದ್ದು ಅಥವಾ ನಿಲ್ಲಿಸಿದಾಗ
@@ -2636,15 +2667,15 @@
 DocType: Sales Order,Fully Delivered,ಸಂಪೂರ್ಣವಾಗಿ ತಲುಪಿಸಲಾಗಿದೆ
 DocType: Lead,Lower Income,ಕಡಿಮೆ ವರಮಾನ
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","ಲಾಭ / ನಷ್ಟ ಗೊತ್ತು ಯಾವ ಹೊಣೆಗಾರಿಕೆ ಅಡಿಯಲ್ಲಿ ಖಾತೆ ತಲೆ ,"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +166,Source and target warehouse cannot be same for row {0},ಮೂಲ ಮತ್ತು ಗುರಿ ಗೋದಾಮಿನ ಸಾಲಿನ ಇರಲಾಗುವುದಿಲ್ಲ {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","ಈ ಸ್ಟಾಕ್ ಸಾಮರಸ್ಯ ಒಂದು ಆರಂಭಿಕ ಎಂಟ್ರಿ ಏಕೆಂದರೆ ವ್ಯತ್ಯಾಸ ಖಾತೆ, ಒಂದು ಆಸ್ತಿ / ಹೊಣೆಗಾರಿಕೆ ರೀತಿಯ ಖಾತೆ ಇರಬೇಕು"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +81,Purchase Order number required for Item {0},ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ಸಂಖ್ಯೆ ಐಟಂ ಅಗತ್ಯವಿದೆ {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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/purchase_receipt/purchase_receipt.py +82,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 +17,Cannot change status as student {0} is linked with student application {1},ಅಲ್ಲ ವಿದ್ಯಾರ್ಥಿಯಾಗಿ ಸ್ಥಿತಿಯನ್ನು ಬದಲಾಯಿಸಬಹುದು {0} ವಿದ್ಯಾರ್ಥಿ ಅಪ್ಲಿಕೇಶನ್ ಸಂಬಂಧ ಇದೆ {1}
+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: Timesheet,"List of employee which has ""Salary Slip Based on Timesheet"" is enabled in salary structure.",&quot;ಸಂಬಳ ಸ್ಲಿಪ್ Timesheet ಆಧರಿಸಿ&quot; ಹೊಂದಿರುವ ನೌಕರ ಪಟ್ಟಿ ಸಂಬಳ ರಚನೆ ಸಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ.
 DocType: Asset,Fully Depreciated,ಸಂಪೂರ್ಣವಾಗಿ Depreciated
 ,Stock Projected Qty,ಸ್ಟಾಕ್ ಪ್ರಮಾಣ ಯೋಜಿತ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Customer {0} does not belong to project {1},ಗ್ರಾಹಕ {0} ಅಭಿವ್ಯಕ್ತಗೊಳಿಸಲು ಸೇರಿಲ್ಲ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,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,ಸೀರಿಯಲ್ ಯಾವುದೇ ಮತ್ತು ಬ್ಯಾಚ್
@@ -2656,7 +2687,7 @@
 DocType: Purchase Invoice,Purchase Taxes and Charges,ಖರೀದಿ ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು
 ,Qty to Receive,ಸ್ವೀಕರಿಸುವ ಪ್ರಮಾಣ
 DocType: Leave Block List,Leave Block List Allowed,ಖಂಡ ಅನುಮತಿಸಲಾಗಿದೆ ಬಿಡಿ
-apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +55,All Warehouses,ಎಲ್ಲಾ ಗೋದಾಮುಗಳು
+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 +105,Credit To account must be a Balance Sheet account,ಖಾತೆಗೆ ಕ್ರೆಡಿಟ್ ಬ್ಯಾಲೆನ್ಸ್ ಶೀಟ್ ಖಾತೆ ಇರಬೇಕು
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,ಎಲ್ಲಾ ವಿಧಗಳು ಸರಬರಾಜುದಾರ
@@ -2668,10 +2699,10 @@
 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/manufacturing/doctype/bom/bom.js +26,Browse BOM,ಬ್ರೌಸ್ BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,ಬ್ರೌಸ್ BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,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 Year,Academic Year,ಶೈಕ್ಷಣಿಕ ವರ್ಷ
+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,ಸಿಆರ್ಎಂ
 DocType: Appraisal,Appraisal,ಬೆಲೆಕಟ್ಟುವಿಕೆ
@@ -2679,12 +2710,12 @@
 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 +197,Leave approver must be one of {0},ಬಿಡಿ ಅನುಮೋದಕ ಒಂದು ಇರಬೇಕು {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,Leave approver must be one of {0},ಬಿಡಿ ಅನುಮೋದಕ ಒಂದು ಇರಬೇಕು {0}
 DocType: Hub Settings,Seller Email,ಮಾರಾಟಗಾರ ಇಮೇಲ್
 DocType: Project,Total Purchase Cost (via Purchase Invoice),ಒಟ್ಟು ಖರೀದಿ ವೆಚ್ಚ (ಖರೀದಿ ಸರಕುಪಟ್ಟಿ ಮೂಲಕ)
 DocType: Workstation Working Hour,Start Time,ಟೈಮ್
 DocType: Item Price,Bulk Import Help,ದೊಡ್ಡ ಆಮದು ಸಹಾಯ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +256,Select Quantity,ಆಯ್ಕೆ ಪ್ರಮಾಣ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +257,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,ಕಳುಹಿಸಿದ ಸಂದೇಶವನ್ನು
@@ -2701,6 +2732,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,ಗುರಿ ಪ್ರಮಾಣ ಅಥವಾ ಗುರಿ ಪ್ರಮಾಣವನ್ನು ಒಂದೋ ಕಡ್ಡಾಯ.
 apps/erpnext/erpnext/config/projects.py +45,Cost of various activities,ಅನೇಕ ಚಟುವಟಿಕೆಗಳ ವೆಚ್ಚ
 apps/erpnext/erpnext/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 +149,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}
 DocType: Item,Inspection Required,ಇನ್ಸ್ಪೆಕ್ಷನ್ ಅಗತ್ಯವಿದೆ
@@ -2720,7 +2752,7 @@
 DocType: Expense Claim,Approval Status,ಅನುಮೋದನೆ ಸ್ಥಿತಿ
 DocType: Hub Settings,Publish Items to Hub,ಹಬ್ ಐಟಂಗಳು ಪ್ರಕಟಿಸಿ
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},ಮೌಲ್ಯದಿಂದ ಸತತವಾಗಿ ಮೌಲ್ಯಕ್ಕೆ ಕಡಿಮೆ ಇರಬೇಕು {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Wire Transfer,ವೈರ್ ಟ್ರಾನ್ಸ್ಫರ್
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,ವೈರ್ ಟ್ರಾನ್ಸ್ಫರ್
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,ಎಲ್ಲಾ ಪರಿಶೀಲಿಸಿ
 DocType: Sales Order,Recurring Order,ಮರುಕಳಿಸುವ ಆರ್ಡರ್
 DocType: Company,Default Income Account,ಡೀಫಾಲ್ಟ್ ಆದಾಯ ಖಾತೆ
@@ -2732,21 +2764,19 @@
 ,Welcome to ERPNext,ERPNext ಸ್ವಾಗತ
 apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,ಉದ್ಧರಣ ದಾರಿ
 DocType: Lead,From Customer,ಗ್ರಾಹಕ
-apps/erpnext/erpnext/demo/setup_data.py +357,Calls,ಕರೆಗಳು
+apps/erpnext/erpnext/demo/setup/setup_data.py +300,Calls,ಕರೆಗಳು
 DocType: Project,Total Costing Amount (via Time Logs),ಒಟ್ಟು ಕಾಸ್ಟಿಂಗ್ ಪ್ರಮಾಣ (ಸಮಯ ದಾಖಲೆಗಳು ಮೂಲಕ)
 DocType: Purchase Order Item Supplied,Stock UOM,ಸ್ಟಾಕ್ UOM
-apps/erpnext/erpnext/stock/doctype/item/item.py +466,"As there are existing transactions for this item, \
-							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","\ ನೀವು ಮೌಲ್ಯಗಳನ್ನು ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ ಈ ಐಟಂ ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ವ್ಯವಹಾರ ಇರುವುದರಿಂದ &#39;ಸೀರಿಯಲ್ ಯಾವುದೇ ಹೊಂದಿದೆ&#39;, &#39;ಬ್ಯಾಚ್ ಹೊಂದಿದೆ ಇಲ್ಲ&#39;, &#39;ಸ್ಟಾಕ್ ಐಟಂ&#39; ಮತ್ತು &#39;ಮೌಲ್ಯಮಾಪನ ವಿಧಾನ&#39;"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,Purchase Order {0} is not submitted,ಪರ್ಚೇಸ್ ಆರ್ಡರ್ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,ಯೋಜಿತ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},ಯಾವುದೇ ಸೀರಿಯಲ್ {0} ವೇರ್ಹೌಸ್ ಸೇರುವುದಿಲ್ಲ {1}
 apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,ಗಮನಿಸಿ : ಸಿಸ್ಟಮ್ ಐಟಂ ಡೆಲಿವರಿ ಮೇಲೆ ಮತ್ತು ಅತಿ ಬುಕಿಂಗ್ ಪರೀಕ್ಷಿಸುವುದಿಲ್ಲ {0} ಪ್ರಮಾಣ ಅಥವಾ ಪ್ರಮಾಣದ 0
 DocType: Notification Control,Quotation Message,ನುಡಿಮುತ್ತುಗಳು ಸಂದೇಶ
 DocType: Issue,Opening Date,ದಿನಾಂಕ ತೆರೆಯುವ
-apps/erpnext/erpnext/schools/api.py +58,Attendance has been marked successfully.,ಅಟೆಂಡೆನ್ಸ್ ಯಶಸ್ವಿಯಾಗಿ ಗುರುತಿಸಲಾಗಿದೆ.
+apps/erpnext/erpnext/schools/api.py +57,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 +136,Account Type for {0} must be {1},ಖಾತೆ ಕೌಟುಂಬಿಕತೆ {0} ಇರಬೇಕು {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +139,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,ಎರಡೂ ಗೋದಾಮಿನ ಅದೇ ಕಂಪನಿ ಸೇರಿರಬೇಕು
@@ -2761,12 +2791,13 @@
 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/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 +20,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 +1190,Please select customer,ದಯವಿಟ್ಟು ಗ್ರಾಹಕರ ಆಯ್ಕೆ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1193,Please select customer,ದಯವಿಟ್ಟು ಗ್ರಾಹಕರ ಆಯ್ಕೆ
 DocType: C-Form,I,ನಾನು
 DocType: Company,Asset Depreciation Cost Center,ಆಸ್ತಿ ಸವಕಳಿ ವೆಚ್ಚದ ಕೇಂದ್ರ
 DocType: Sales Order Item,Sales Order Date,ಮಾರಾಟದ ಆದೇಶ ದಿನಾಂಕ
@@ -2776,6 +2807,7 @@
 ,Payment Period Based On Invoice Date,ಸರಕುಪಟ್ಟಿ ದಿನಾಂಕವನ್ನು ಆಧರಿಸಿ ಪಾವತಿ ಅವಧಿ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},ಕಾಣೆಯಾಗಿದೆ ಕರೆನ್ಸಿ ವಿನಿಮಯ ದರಗಳು {0}
 DocType: Assessment,Examiner,ಎಕ್ಸಾಮಿನರ್
+DocType: Student,Siblings,ಒಡಹುಟ್ಟಿದವರ
 DocType: Journal Entry,Stock Entry,ಸ್ಟಾಕ್ ಎಂಟ್ರಿ
 DocType: Payment Entry,Payment References,ಪಾವತಿ ಉಲ್ಲೇಖಗಳು
 DocType: C-Form,C-FORM-,ಸಿ ಫಾರ್ಮ್-
@@ -2793,11 +2825,12 @@
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,ವಿಷಯ ಹೆಸರು
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,ಮಾರಾಟ ಅಥವಾ ಖರೀದಿ ಆಫ್ ಕನಿಷ್ಠ ಒಂದು ಆಯ್ಕೆ ಮಾಡಬೇಕು
+DocType: Grading Structure,Grade Intervals,ಗ್ರೇಡ್ ಮಧ್ಯಂತರಗಳು
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,ನಿಮ್ಮ ವ್ಯಾಪಾರ ಸ್ವರೂಪ ಆಯ್ಕೆಮಾಡಿ.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,ಉತ್ಪಾದನಾ ಕಾರ್ಯಗಳ ಅಲ್ಲಿ ನಿರ್ವಹಿಸುತ್ತಾರೆ.
 DocType: Asset Movement,Source Warehouse,ಮೂಲ ವೇರ್ಹೌಸ್
 DocType: Installation Note,Installation Date,ಅನುಸ್ಥಾಪನ ದಿನಾಂಕ
-apps/erpnext/erpnext/controllers/accounts_controller.py +534,Row #{0}: Asset {1} does not belong to company {2},ರೋ # {0}: ಆಸ್ತಿ {1} ಕಂಪನಿಗೆ ಇಲ್ಲ ಸೇರುವುದಿಲ್ಲ {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +537,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,ಮಾರಾಟ ಬಳಕೆದಾರ
@@ -2811,28 +2844,31 @@
 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 +111,Date Of Retirement must be greater than Date of Joining,ನಿವೃತ್ತಿ ದಿನಾಂಕ ಸೇರುವ ದಿನಾಂಕ ಹೆಚ್ಚಿನ ಇರಬೇಕು
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +49,There were errors while scheduling course on :,ಮೇಲೆ ತೆರಳಬೇಕಾದರೆ ಸಹಜವಾಗಿ ಸಂದರ್ಭದಲ್ಲಿ ದೋಷಗಳು ಇದ್ದವು:
 DocType: Sales Invoice,Against Income Account,ಆದಾಯ ಖಾತೆ ವಿರುದ್ಧ
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +87,{0}% Delivered,{0}% ತಲುಪಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/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 +379,Please set default {0} in Company {1},ದಯವಿಟ್ಟು ಡೀಫಾಲ್ಟ್ {0} ಕಂಪನಿ ಸೆಟ್ {1}
+apps/erpnext/erpnext/accounts/utils.py +456,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,ಒಟ್ಟು ಲಾಭ / ನಷ್ಟ
 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 .
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,ಮುದ್ರಣ ಶೀರ್ಷಿಕೆ ಇ ಜಿ ಟೆಂಪ್ಲೇಟ್ಗಳು Proforma ಸರಕುಪಟ್ಟಿ .
+DocType: Student Guardian,Student Guardian,ವಿದ್ಯಾರ್ಥಿ ಗಾರ್ಡಿಯನ್
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +184,Valuation type charges can not marked as Inclusive,ಮೌಲ್ಯಾಂಕನ ರೀತಿಯ ಆರೋಪಗಳನ್ನು ಇನ್ಕ್ಲೂಸಿವ್ ಎಂದು ಗುರುತಿಸಲಾಗಿದೆ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: POS Profile,Update Stock,ಸ್ಟಾಕ್ ನವೀಕರಿಸಲು
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,ಐಟಂಗಳನ್ನು ವಿವಿಧ UOM ತಪ್ಪು ( ಒಟ್ಟು ) ನೆಟ್ ತೂಕ ಮೌಲ್ಯವನ್ನು ಕಾರಣವಾಗುತ್ತದೆ . ಪ್ರತಿ ಐಟಂ ಮಾಡಿ surethat ನೆಟ್ ತೂಕ ಅದೇ UOM ಹೊಂದಿದೆ .
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,ಬಿಒಎಮ್ ದರ
 DocType: Asset,Journal Entry for Scrap,ಸ್ಕ್ರ್ಯಾಪ್ ಜರ್ನಲ್ ಎಂಟ್ರಿ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,ಡೆಲಿವರಿ ಗಮನಿಸಿ ಐಟಂಗಳನ್ನು ಪುಲ್ ದಯವಿಟ್ಟು
-apps/erpnext/erpnext/accounts/utils.py +349,Journal Entries {0} are un-linked,ಜರ್ನಲ್ ನಮೂದುಗಳು {0} ಅನ್ ಬಂಧಿಸಿಲ್ಲ
+apps/erpnext/erpnext/accounts/utils.py +426,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,ಕಂಪನಿಯಲ್ಲಿ ರೌಂಡ್ ಆಫ್ ವೆಚ್ಚ ಸೆಂಟರ್ ಬಗ್ಗೆ ದಯವಿಟ್ಟು
@@ -2856,6 +2892,7 @@
 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,ಸಮುದಾಯ ವೇದಿಕೆ
+DocType: Homepage,"URL for ""All Products""",&quot;ಎಲ್ಲಾ ಉತ್ಪನ್ನಗಳು&quot; URL ಅನ್ನು
 DocType: Leave Application,Leave Balance Before Application,ಅಪ್ಲಿಕೇಶನ್ ಮೊದಲು ಬ್ಯಾಲೆನ್ಸ್ ಬಿಡಿ
 DocType: SMS Center,Send SMS,ಎಸ್ಎಂಎಸ್ ಕಳುಹಿಸಿ
 DocType: Cheque Print Template,Width of amount in word,ಪದ ಯಲ್ಲಿ ಪ್ರಮಾಣದ ಅಗಲ
@@ -2864,7 +2901,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 +29,Current Job Openings,ಪ್ರಸ್ತುತ ಉದ್ಯೋಗ ಅವಕಾಶಗಳನ್ನು
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,Current Job Openings,ಪ್ರಸ್ತುತ ಉದ್ಯೋಗ ಅವಕಾಶಗಳನ್ನು
 DocType: Company,Stock Adjustment Account,ಸ್ಟಾಕ್ ಹೊಂದಾಣಿಕೆ ಖಾತೆ
 DocType: Journal Entry,Write Off,ಆಫ್ ಬರೆಯಿರಿ
 DocType: Timesheet Detail,Operation ID,ಆಪರೇಷನ್ ಐಡಿ
@@ -2877,7 +2914,7 @@
 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 +850,Show tax break-up,ಶೋ ತೆರಿಗೆ ಮುರಿದುಕೊಂಡು
+apps/erpnext/erpnext/public/js/controllers/transaction.js +841,Show tax break-up,ಶೋ ತೆರಿಗೆ ಮುರಿದುಕೊಂಡು
 apps/erpnext/erpnext/accounts/party.py +308,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} ವಿರುದ್ಧ ಅಸ್ತಿತ್ವದಲ್ಲಿವೆ ಆದ್ದರಿಂದ ನೀವು ಮರು ನಿಯೋಜಿಸಲು ಅಥವಾ ಮಾರ್ಪಡಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"
@@ -2887,10 +2924,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 +534,Please select Posting Date before selecting Party,ದಯವಿಟ್ಟು ಪಕ್ಷದ ಆರಿಸುವ ಮೊದಲು ಪೋಸ್ಟಿಂಗ್ ದಿನಾಂಕ ಆಯ್ಕೆ
 DocType: Serial No,Out of AMC,ಎಎಂಸಿ ಔಟ್
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +80,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 +162,Please contact to the user who have Sales Master Manager {0} role,ಮಾರಾಟದ ಮಾಸ್ಟರ್ ಮ್ಯಾನೇಜರ್ {0} ಪಾತ್ರದಲ್ಲಿ ಹೊಂದಿರುವ ಬಳಕೆದಾರರಿಗೆ ಸಂಪರ್ಕಿಸಿ
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +195,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 +5,This is based on the attendance of this Student,ಈ ವಿದ್ಯಾರ್ಥಿ ಹಾಜರಾತಿ ಆಧರಿಸಿದೆ
@@ -2899,12 +2937,11 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,ಡೆಲಿವರಿ ಟಿಪ್ಪಣಿಗಳು {0} ಈ ಮಾರಾಟದ ಆದೇಶವನ್ನು ರದ್ದುಗೊಳಿಸುವ ಮೊದಲು ರದ್ದು ಮಾಡಬೇಕು
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +75,Paid amount + Write Off Amount can not be greater than Grand Total,ಪಾವತಿಸಿದ ಪ್ರಮಾಣದ + ಆಫ್ ಬರೆಯಿರಿ ಪ್ರಮಾಣ ಹೆಚ್ಚಿನ ಗ್ರ್ಯಾಂಡ್ ಒಟ್ಟು ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,{0} is not a valid Batch Number for Item {1},{0} ಐಟಂ ಮಾನ್ಯ ಬ್ಯಾಚ್ ಸಂಖ್ಯೆ ಅಲ್ಲ {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +138,Note: There is not enough leave balance for Leave Type {0},ಗಮನಿಸಿ : ಲೀವ್ ಪ್ರಕಾರ ಸಾಕಷ್ಟು ರಜೆ ಸಮತೋಲನ ಇಲ್ಲ {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,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,ಅವಕಾಶ ಪ್ರಕಾರ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,ಹೊಸ ಕಂಪನಿ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,Cost Center is required for 'Profit and Loss' account {0},ವೆಚ್ಚ ಸೆಂಟರ್ ' ಲಾಭ ಮತ್ತು ನಷ್ಟ ' ಖಾತೆ ಅಗತ್ಯವಿದೆ {0}
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,ಟ್ರಾನ್ಸಾಕ್ಷನ್ಸ್ ಮಾತ್ರ ಕಂಪನಿ ಸೃಷ್ಟಿಸಿದ ಅಳಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,ಸಾಮಾನ್ಯ ಲೆಡ್ಜರ್ ನಮೂದುಗಳನ್ನು ತಪ್ಪಾದ ಸಂಖ್ಯೆಯ ಕಂಡುಬಂದಿಲ್ಲ. ನೀವು ವ್ಯವಹಾರದ ಒಂದು ತಪ್ಪು ಖಾತೆ ಆಯ್ಕೆ ಮಾಡಿರಬಹುದು.
 DocType: Cheque Print Template,Cheque Width,ಚೆಕ್ ಅಗಲ
@@ -2913,16 +2950,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,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 +228,{0} '{1}' is disabled,{0} '{1}' ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/controllers/accounts_controller.py +231,{0} '{1}' is disabled,{0} '{1}' ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ಓಪನ್ ಹೊಂದಿಸಿ
 DocType: Cheque Print Template,Scanned Cheque,ಸ್ಕ್ಯಾನ್ ಚೆಕ್
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,ಸಲ್ಲಿಸಲಾಗುತ್ತಿದೆ ವ್ಯವಹಾರಗಳ ಮೇಲೆ ಸಂಪರ್ಕಗಳು ಸ್ವಯಂಚಾಲಿತ ಕಳುಹಿಸು.
+DocType: Timesheet,Total Billable Amount,ಒಟ್ಟು ಬಿಲ್ ಮಾಡಬಹುದಾದ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,ಐಟಂ 3
 DocType: Purchase Order,Customer Contact Email,ಗ್ರಾಹಕ ಸಂಪರ್ಕ ಇಮೇಲ್
 DocType: Warranty Claim,Item and Warranty Details,ಐಟಂ ಮತ್ತು ಖಾತರಿ ವಿವರಗಳು
 DocType: Sales Team,Contribution (%),ಕೊಡುಗೆ ( % )
-apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,ಗಮನಿಸಿ : ಪಾವತಿ ಎಂಟ್ರಿ 'ನಗದು ಅಥವಾ ಬ್ಯಾಂಕ್ ಖಾತೆ ' ಏನು ನಿರ್ದಿಷ್ಟಪಡಿಸಿಲ್ಲ ರಿಂದ ರಚಿಸಲಾಗುವುದಿಲ್ಲ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Responsibilities,ಜವಾಬ್ದಾರಿಗಳನ್ನು
+apps/erpnext/erpnext/controllers/accounts_controller.py +78,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,ಜವಾಬ್ದಾರಿಗಳನ್ನು
 DocType: Expense Claim Account,Expense Claim Account,ಖರ್ಚು ಹಕ್ಕು ಖಾತೆ
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,ಟೆಂಪ್ಲೇಟು
 DocType: Sales Person,Sales Person Name,ಮಾರಾಟಗಾರನ ಹೆಸರು
@@ -2930,6 +2968,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,ಬಳಕೆದಾರರು ಸೇರಿಸಿ
 DocType: Pricing Rule,Item Group,ಐಟಂ ಗುಂಪು
 DocType: Item,Safety Stock,ಸುರಕ್ಷತೆ ಸ್ಟಾಕ್
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,ಐಟಂ ಕೋಡ್&gt; ಐಟಂ ಗ್ರೂಪ್&gt; ಬ್ರ್ಯಾಂಡ್
 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),ಸೇರಿಸಲಾಗಿದೆ ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು ( ಕಂಪನಿ ಕರೆನ್ಸಿ )
@@ -2939,7 +2978,6 @@
 DocType: Item,Default BOM,ಡೀಫಾಲ್ಟ್ BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Please re-type company name to confirm,ಮರು ಮಾದರಿ ಕಂಪನಿ ಹೆಸರು ದೃಢೀಕರಿಸಿ ದಯವಿಟ್ಟು
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +67,Total Outstanding Amt,ಒಟ್ಟು ಅತ್ಯುತ್ತಮ ಆಮ್ಟ್
-DocType: Timesheet,Total Hours,ಒಟ್ಟು ಅವರ್ಸ್
 DocType: Journal Entry,Printing Settings,ಮುದ್ರಣ ಸೆಟ್ಟಿಂಗ್ಗಳು
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Total Debit must be equal to Total Credit. The difference is {0},ಒಟ್ಟು ಡೆಬಿಟ್ ಒಟ್ಟು ಕ್ರೆಡಿಟ್ ಸಮಾನವಾಗಿರಬೇಕು . ವ್ಯತ್ಯಾಸ {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,ಆಟೋಮೋಟಿವ್
@@ -2952,13 +2990,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,ಇನ್ವೆಸ್ಟ್ಮೆಂಟ್ ಬ್ಯಾಂಕಿಂಗ್
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +71,Cash or Bank Account is mandatory for making payment entry,ನಗದು ಅಥವಾ ಬ್ಯಾಂಕ್ ಖಾತೆ ಪಾವತಿ ಪ್ರವೇಶ ಮಾಡುವ ಕಡ್ಡಾಯ
 DocType: Purchase Invoice,Price List Exchange Rate,ಬೆಲೆ ಪಟ್ಟಿ ವಿನಿಮಯ ದರ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ಗ್ರಾಹಕ&gt; ಗ್ರಾಹಕನಿಗೆ ಗ್ರೂಪ್&gt; ಟೆರಿಟರಿ
 DocType: Purchase Invoice Item,Rate,ದರ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Intern,ಆಂತರಿಕ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,ಆಂತರಿಕ
 DocType: Stock Entry,From BOM,BOM ಗೆ
 DocType: Assessment,Assessment Code,ಅಸೆಸ್ಮೆಂಟ್ ಕೋಡ್
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +32,Basic,ಮೂಲಭೂತ
+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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',ವೇಳಾಪಟ್ಟಿ ' ' ರಚಿಸಿ 'ಅನ್ನು ಕ್ಲಿಕ್ ಮಾಡಿ
+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 +95,Reference No is mandatory if you entered Reference Date,ನೀವು ರೆಫರೆನ್ಸ್ ದಿನಾಂಕ ನಮೂದಿಸಿದರೆ ರೆಫರೆನ್ಸ್ ನಂ ಕಡ್ಡಾಯ
@@ -2967,11 +3006,11 @@
 DocType: Salary Slip,Salary Structure,ಸಂಬಳ ರಚನೆ
 DocType: Account,Bank,ಬ್ಯಾಂಕ್
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,ಏರ್ಲೈನ್
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +752,Issue Material,ಸಂಚಿಕೆ ಮೆಟೀರಿಯಲ್
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +723,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 +683,You are in offline mode. You will not be able to reload until you have network.,ಆಫ್ಲೈನ್ ಕ್ರಮದಲ್ಲಿ ಇವೆ. ನೀವು ಜಾಲಬಂಧ ತನಕ ರಿಲೋಡ್ ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +665,You are in offline mode. You will not be able to reload until you have network.,ಆಫ್ಲೈನ್ ಕ್ರಮದಲ್ಲಿ ಇವೆ. ನೀವು ಜಾಲಬಂಧ ತನಕ ರಿಲೋಡ್ ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ.
 DocType: Hub Settings,Access Token,ಪ್ರವೇಶ ಟೋಕನ್
 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,ಅನುಕ್ರಮ ಸಂಖ್ಯೆ
@@ -2979,33 +3018,35 @@
 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 +1122,Enter value must be positive,ನಮೂದಿಸಿ ಮೌಲ್ಯವನ್ನು ಧನಾತ್ಮಕವಾಗಿರಬೇಕು
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,All Territories,ಎಲ್ಲಾ ಪ್ರಾಂತ್ಯಗಳು
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1125,Enter value must be positive,ನಮೂದಿಸಿ ಮೌಲ್ಯವನ್ನು ಧನಾತ್ಮಕವಾಗಿರಬೇಕು
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,ಎಲ್ಲಾ ಪ್ರಾಂತ್ಯಗಳು
 DocType: Purchase Invoice,Items,ಐಟಂಗಳನ್ನು
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +23,Student is already enrolled.,ವಿದ್ಯಾರ್ಥಿ ಈಗಾಗಲೇ ದಾಖಲಿಸಲಾಗಿದೆ.
 DocType: Fiscal Year,Year Name,ವರ್ಷದ ಹೆಸರು
 DocType: Process Payroll,Process Payroll,ಪ್ರಕ್ರಿಯೆ ವೇತನದಾರರ ಪಟ್ಟಿ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,ಈ ತಿಂಗಳ ದಿನಗಳ ಕೆಲಸ ಹೆಚ್ಚು ರಜಾದಿನಗಳಲ್ಲಿ ಇವೆ .
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +233,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 +96,Request for Quotations,ಉಲ್ಲೇಖಗಳು ವಿನಂತಿ
+apps/erpnext/erpnext/hooks.py +104,Request for Quotations,ಉಲ್ಲೇಖಗಳು ವಿನಂತಿ
 DocType: Payment Reconciliation,Maximum Invoice Amount,ಗರಿಷ್ಠ ಸರಕುಪಟ್ಟಿ ಪ್ರಮಾಣವನ್ನು
 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 +628,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',ಭಿನ್ನ ಚಟುವಟಿಕೆ ಡೀಫಾಲ್ಟ್ ಘಟಕ &#39;{0}&#39; ಟೆಂಪ್ಲೇಟು ಅದೇ ಇರಬೇಕು &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',ಭಿನ್ನ ಚಟುವಟಿಕೆ ಡೀಫಾಲ್ಟ್ ಘಟಕ &#39;{0}&#39; ಟೆಂಪ್ಲೇಟು ಅದೇ ಇರಬೇಕು &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,ಆಧರಿಸಿದ ಲೆಕ್ಕ
 DocType: Delivery Note Item,From Warehouse,ಗೋದಾಮಿನ
 DocType: Assessment,Supervisor Name,ಮೇಲ್ವಿಚಾರಕ ಹೆಸರು
+DocType: Assessment,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,ಖರೀದಿ ಬಳಕೆದಾರ
 DocType: Notification Control,Customize the Notification,ಅಧಿಸೂಚನೆ ಕಸ್ಟಮೈಸ್
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Cash Flow from Operations,ಕಾರ್ಯಾಚರಣೆ ಕ್ಯಾಶ್ ಫ್ಲೋ
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,ಡೀಫಾಲ್ಟ್ ವಿಳಾಸ ಟೆಂಪ್ಲೇಟು ಅಳಿಸಲಾಗಿಲ್ಲ
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,ಡೀಫಾಲ್ಟ್ ವಿಳಾಸ ಟೆಂಪ್ಲೇಟು ಅಳಿಸಲಾಗಿಲ್ಲ
 DocType: Sales Invoice,Shipping Rule,ಶಿಪ್ಪಿಂಗ್ ರೂಲ್
 DocType: Manufacturer,Limited to 12 characters,"12 ಪಾತ್ರಗಳು,"
 DocType: Journal Entry,Print Heading,ಪ್ರಿಂಟ್ ಶಿರೋನಾಮೆ
@@ -3020,8 +3061,8 @@
 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/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,ಗುರಿ ಪ್ರಮಾಣ ಅಥವಾ ಗುರಿ ಪ್ರಮಾಣವನ್ನು ಒಂದೋ ಕಡ್ಡಾಯ
-apps/erpnext/erpnext/stock/get_item_details.py +485,No default BOM exists for Item {0},ಯಾವುದೇ ಡೀಫಾಲ್ಟ್ BOM ಐಟಂ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +336,Please select Posting Date first,ಮೊದಲ ಪೋಸ್ಟಿಂಗ್ ದಿನಾಂಕ ಆಯ್ಕೆಮಾಡಿ
+apps/erpnext/erpnext/stock/get_item_details.py +486,No default BOM exists for Item {0},ಯಾವುದೇ ಡೀಫಾಲ್ಟ್ BOM ಐಟಂ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +326,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,ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ವ್ಯವಹಾರಗಳು ವೆಚ್ಚ ಸೆಂಟರ್ ಲೆಡ್ಜರ್ ಪರಿವರ್ತನೆ ಸಾಧ್ಯವಿಲ್ಲ
@@ -3037,6 +3078,7 @@
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,ಇನ್ವಾಯ್ಸ್ಗಳು ಜೊತೆ ಪಾವತಿಗಳು ಹೊಂದಿಕೆ
 DocType: Journal Entry,Bank Entry,ಬ್ಯಾಂಕ್ ಎಂಟ್ರಿ
 DocType: Authorization Rule,Applicable To (Designation),ಅನ್ವಯವಾಗುತ್ತದೆ ( ಹುದ್ದೆ )
+,Profitability Analysis,ಲಾಭದಾಯಕತೆಯು ವಿಶ್ಲೇಷಣೆ
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,ಕಾರ್ಟ್ ಸೇರಿಸಿ
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,ಗುಂಪಿನ
 DocType: Guardian,Interests,ಆಸಕ್ತಿಗಳು
@@ -3049,22 +3091,22 @@
 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 +141,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","ಧಾರಾವಾಹಿಯಾಗಿ ಐಟಂ {0} ಸ್ಟಾಕ್ ಸಾಮರಸ್ಯ ಬಳಸಿಕೊಂಡು \
  ನವೀಕರಿಸಲಾಗುವುದಿಲ್ಲ"
 DocType: Scheduling Tool,Day,ದಿನ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,ಹೊಸ ಸೀರಿಯಲ್ ನಂ ಗೋದಾಮಿನ ಸಾಧ್ಯವಿಲ್ಲ . ವೇರ್ಹೌಸ್ ಷೇರು ಖರೀದಿ ರಸೀತಿ ಎಂಟ್ರಿ ಅಥವಾ ಸೆಟ್ ಮಾಡಬೇಕು
 DocType: Lead,Lead Type,ಲೀಡ್ ಪ್ರಕಾರ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,You are not authorized to approve leaves on Block Dates,ನೀವು ಬ್ಲಾಕ್ ದಿನಾಂಕ ಎಲೆಗಳು ಅನುಮೋದಿಸಲು ನಿನಗೆ ಅಧಿಕಾರವಿಲ್ಲ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,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: Student Applicant,AP.,ಎಪಿ.
 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 +639,Point of Sale,ಪಾಯಿಂಟ್ ಆಫ್ ಸೇಲ್
+apps/erpnext/erpnext/accounts/page/pos/pos.js +634,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,ತೆರಿಗೆ
 DocType: Production Planning Tool,Production Planning Tool,ತಯಾರಿಕಾ ಯೋಜನೆ ಉಪಕರಣ
@@ -3073,74 +3115,77 @@
 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 +373,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 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 Profile,Customer Group,ಗ್ರಾಹಕ ಗುಂಪಿನ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,Expense account is mandatory for item {0},ವೆಚ್ಚದಲ್ಲಿ ಖಾತೆಯನ್ನು ಐಟಂ ಕಡ್ಡಾಯ {0}
 DocType: Item,Website Description,ವೆಬ್ಸೈಟ್ ವಿವರಣೆ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date must be on or after today,ಮುಂದಿನ ಸವಕಳಿ ದಿನಾಂಕ ಅಥವಾ ಇಂದು ನಂತರ ಆಗಿರಬೇಕು
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,ಇಕ್ವಿಟಿ ನಿವ್ವಳ ವ್ಯತ್ಯಾಸದ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +145,Please cancel Purchase Invoice {0} first,ಖರೀದಿ ಸರಕುಪಟ್ಟಿ {0} ರದ್ದು ಮೊದಲು
 DocType: Serial No,AMC Expiry Date,ಎಎಂಸಿ ಅಂತ್ಯ ದಿನಾಂಕ
 ,Sales Register,ಮಾರಾಟದ ರಿಜಿಸ್ಟರ್
 DocType: Quotation,Quotation Lost Reason,ನುಡಿಮುತ್ತುಗಳು ಲಾಸ್ಟ್ ಕಾರಣ
+apps/erpnext/erpnext/utilities/doctype/address/address.py +164,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,ಡೀಫಾಲ್ಟ್ ವಿಳಾಸ ಟೆಂಪ್ಲೇಟು ಕಂಡುಬಂದಿಲ್ಲ. ದಯವಿಟ್ಟು ಸೆಟಪ್&gt; ಮುದ್ರಣ ಮತ್ತು ಬ್ರ್ಯಾಂಡಿಂಗ್&gt; ವಿಳಾಸ ಟೆಂಪ್ಲೇಟು ಹೊಸದನ್ನು ರಚಿಸಲು.
 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 +330,Transaction reference no {0} dated {1},ವ್ಯವಹಾರ ಉಲ್ಲೇಖ ಯಾವುದೇ {0} ರ {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Transaction reference no {0} dated {1},ವ್ಯವಹಾರ ಉಲ್ಲೇಖ ಯಾವುದೇ {0} ರ {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,ಸಂಪಾದಿಸಲು ಏನೂ ಇಲ್ಲ.
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,Summary for this month and pending activities,ಈ ತಿಂಗಳ ಬಾಕಿ ಚಟುವಟಿಕೆಗಳಿಗೆ ಸಾರಾಂಶ
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,ಈ ತಿಂಗಳ ಬಾಕಿ ಚಟುವಟಿಕೆಗಳಿಗೆ ಸಾರಾಂಶ
 DocType: Customer Group,Customer Group Name,ಗ್ರಾಹಕ ಗುಂಪಿನ ಹೆಸರು
 apps/erpnext/erpnext/public/js/financial_statements.js +54,Cash Flow Statement,ಕ್ಯಾಶ್ ಫ್ಲೋ ಹೇಳಿಕೆ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Please remove this Invoice {0} from C-Form {1},ಸಿ ಫಾರ್ಮ್ ಈ ಸರಕುಪಟ್ಟಿ {0} ತೆಗೆದುಹಾಕಿ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,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 +644,Get Items,ಐಟಂಗಳನ್ನು ಪಡೆಯಿರಿ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +623,Get Items,ಐಟಂಗಳನ್ನು ಪಡೆಯಿರಿ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +210,Please enter Write Off Account,ಖಾತೆ ಆಫ್ ಬರೆಯಿರಿ ನಮೂದಿಸಿ
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,ಕೊನೆಯ ಆದೇಶ ದಿನಾಂಕ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +41,Account {0} does not belongs to company {1},ಖಾತೆ {0} ಮಾಡುತ್ತದೆ ಕಂಪನಿ ಸೇರಿದೆ ಅಲ್ಲ {1}
+DocType: Student,Guardian Details,ಗಾರ್ಡಿಯನ್ ವಿವರಗಳು
 DocType: C-Form,C-Form,ಸಿ ಆಕಾರ
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,ಅನೇಕ ನೌಕರರು ಮಾರ್ಕ್ ಅಟೆಂಡೆನ್ಸ್
 DocType: Payment Request,Initiated,ಚಾಲನೆ
 DocType: Production Order,Planned Start Date,ಯೋಜನೆ ಪ್ರಾರಂಭ ದಿನಾಂಕ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,Customer is required against Receivable account {0},ಗ್ರಾಹಕ ಸ್ವೀಕರಿಸುವಂತಹ ಖಾತೆಯನ್ನು ವಿರುದ್ಧ ಅಗತ್ಯವಿದೆ {0}
 DocType: Serial No,Creation Document Type,ಸೃಷ್ಟಿ ಡಾಕ್ಯುಮೆಂಟ್ ಕೌಟುಂಬಿಕತೆ
 DocType: Leave Type,Is Encash,ಮುರಿಸು ಇದೆ
 DocType: Purchase Invoice,Mobile No,ಮೊಬೈಲ್ ಸಂಖ್ಯೆ
 DocType: Leave Allocation,New Leaves Allocated,ನಿಗದಿ ಹೊಸ ಎಲೆಗಳು
-apps/erpnext/erpnext/controllers/trends.py +265,Project-wise data is not available for Quotation,ಪ್ರಾಜೆಕ್ಟ್ ಬಲ್ಲ ದಶಮಾಂಶ ಉದ್ಧರಣ ಲಭ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,ಪ್ರಾಜೆಕ್ಟ್ ಬಲ್ಲ ದಶಮಾಂಶ ಉದ್ಧರಣ ಲಭ್ಯವಿಲ್ಲ
 DocType: Project,Expected End Date,ನಿರೀಕ್ಷಿತ ಅಂತಿಮ ದಿನಾಂಕ
 DocType: Budget Account,Budget Amount,ಬಜೆಟ್ ಪ್ರಮಾಣ
 DocType: Appraisal Template,Appraisal Template Title,ಅಪ್ರೇಸಲ್ ಟೆಂಪ್ಲೇಟು ಶೀರ್ಷಿಕೆ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,Commercial,ವ್ಯಾಪಾರದ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,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 +648,Row {0}# Account must be of type 'Fixed Asset',ರೋ {0} # ಖಾತೆ ರೀತಿಯ ಇರಬೇಕು &#39;ಸ್ಥಿರ ಸ್ವತ್ತು&#39;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Row {0}# Account must be of type 'Fixed Asset',ರೋ {0} # ಖಾತೆ ರೀತಿಯ ಇರಬೇಕು &#39;ಸ್ಥಿರ ಸ್ವತ್ತು&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,ಪ್ರಮಾಣ ಔಟ್
 apps/erpnext/erpnext/config/accounts.py +278,Rules to calculate shipping amount for a sale,ಒಂದು ಮಾರಾಟ ಹಡಗು ಪ್ರಮಾಣವನ್ನು ಲೆಕ್ಕಾಚಾರ ನಿಯಮಗಳು
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +30,Series is mandatory,ಸರಣಿ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +50,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}
 DocType: Leave Allocation,Unused leaves,ಬಳಕೆಯಾಗದ ಎಲೆಗಳು
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Cr,ಕೋಟಿ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Cr,ಕೋಟಿ
 DocType: Tax Rule,Billing State,ಬಿಲ್ಲಿಂಗ್ ರಾಜ್ಯ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +250,Transfer,ವರ್ಗಾವಣೆ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +187,{0} {1} does not associated with Party Account {2},{0} {1} ಪಕ್ಷದ ಖಾತೆಗೆ ಸಂಬಂಧಿಸಿದ ಇಲ್ಲ {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,Fetch exploded BOM (including sub-assemblies),( ಉಪ ಜೋಡಣೆಗಳಿಗೆ ಸೇರಿದಂತೆ ) ಸ್ಫೋಟಿಸಿತು BOM ಪಡೆದುಕೊಳ್ಳಿ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +254,Transfer,ವರ್ಗಾವಣೆ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +190,{0} {1} does not associated with Party Account {2},{0} {1} ಪಕ್ಷದ ಖಾತೆಗೆ ಸಂಬಂಧಿಸಿದ ಇಲ್ಲ {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +796,Fetch exploded BOM (including sub-assemblies),( ಉಪ ಜೋಡಣೆಗಳಿಗೆ ಸೇರಿದಂತೆ ) ಸ್ಫೋಟಿಸಿತು BOM ಪಡೆದುಕೊಳ್ಳಿ
 DocType: Authorization Rule,Applicable To (Employee),ಅನ್ವಯವಾಗುತ್ತದೆ ( ಉದ್ಯೋಗಗಳು)
-apps/erpnext/erpnext/controllers/accounts_controller.py +115,Due Date is mandatory,ಕಾರಣ ದಿನಾಂಕ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/controllers/accounts_controller.py +118,Due Date is mandatory,ಕಾರಣ ದಿನಾಂಕ ಕಡ್ಡಾಯ
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,ಗುಣಲಕ್ಷಣ ಹೆಚ್ಚಳವನ್ನು {0} 0 ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Journal Entry,Pay To / Recd From,Recd ಗೆ / ಕಟ್ಟುವುದನ್ನು
 DocType: Naming Series,Setup Series,ಸೆಟಪ್ ಸರಣಿ
 DocType: Payment Reconciliation,To Invoice Date,ದಿನಾಂಕ ಸರಕುಪಟ್ಟಿ
 DocType: Supplier,Contact HTML,ಸಂಪರ್ಕಿಸಿ ಎಚ್ಟಿಎಮ್ಎಲ್
 ,Inactive Customers,ನಿಷ್ಕ್ರಿಯ ಗ್ರಾಹಕರು
+DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,ಖರೀದಿ ರಸೀದಿಗಳನ್ನು
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,ಹೇಗೆ ಬೆಲೆ ರೂಲ್ ಅನ್ವಯಿಸಲಾಗುತ್ತದೆ?
 DocType: Quality Inspection,Delivery Note No,ಡೆಲಿವರಿ ನೋಟ್ ನಂ
@@ -3149,7 +3194,7 @@
 DocType: Company,Retail,ಚಿಲ್ಲರೆ ವ್ಯಪಾರ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +120,Customer {0} does not exist,ಗ್ರಾಹಕ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
 DocType: Attendance,Absent,ಆಬ್ಸೆಂಟ್
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +587,Product Bundle,ಉತ್ಪನ್ನ ಬಂಡಲ್
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Product Bundle,ಉತ್ಪನ್ನ ಬಂಡಲ್
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Invalid reference {1},ಸಾಲು {0}: ಅಮಾನ್ಯ ಉಲ್ಲೇಖಿತ {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು ಟೆಂಪ್ಲೇಟು ಖರೀದಿಸಿ
 DocType: Upload Attendance,Download Template,ಡೌನ್ಲೋಡ್ ಟೆಂಪ್ಲೇಟು
@@ -3159,8 +3204,8 @@
 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 +742,Send Supplier Emails,ಸರಬರಾಜುದಾರ ಇಮೇಲ್ಗಳನ್ನು ಕಳುಹಿಸಿ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +104,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","ಸಂಬಳ ಈಗಾಗಲೇ ನಡುವೆ {0} ಮತ್ತು {1}, ಬಿಡಿ ಅಪ್ಲಿಕೇಶನ್ ಅವಧಿಯಲ್ಲಿ ಈ ದಿನಾಂಕ ಶ್ರೇಣಿ ನಡುವೆ ಸಾಧ್ಯವಿಲ್ಲ ಕಾಲ ಸಂಸ್ಕರಿಸಿದ."
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +708,Send Supplier Emails,ಸರಬರಾಜುದಾರ ಇಮೇಲ್ಗಳನ್ನು ಕಳುಹಿಸಿ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,"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,ಗಾರ್ಡಿಯನ್ ಬಡ್ಡಿ
 DocType: Timesheet,Employee Detail,ನೌಕರರ ವಿವರ
@@ -3171,9 +3216,9 @@
 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/accounts/doctype/gl_entry/gl_entry.py +77,Account {0} cannot be a Group,ಖಾತೆ {0} ಒಂದು ಗುಂಪು ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} cannot be a Group,ಖಾತೆ {0} ಒಂದು ಗುಂಪು ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +31,Optional. This setting will be used to filter in various transactions.,ಐಚ್ಛಿಕ . ಈ ಸೆಟ್ಟಿಂಗ್ ವಿವಿಧ ವ್ಯವಹಾರಗಳಲ್ಲಿ ಫಿಲ್ಟರ್ ಬಳಸಲಾಗುತ್ತದೆ.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +107,Negative Valuation Rate is not allowed,ನಕಾರಾತ್ಮಕ ಮೌಲ್ಯಾಂಕನ ದರ ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,ನಕಾರಾತ್ಮಕ ಮೌಲ್ಯಾಂಕನ ದರ ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ
 DocType: Holiday List,Weekly Off,ಸಾಪ್ತಾಹಿಕ ಆಫ್
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","ಇ ಜಿ ಫಾರ್ 2012 , 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +39,Provisional Profit / Loss (Credit),ಹಂಗಾಮಿ ಲಾಭ / ನಷ್ಟ (ಕ್ರೆಡಿಟ್)
@@ -3187,16 +3232,16 @@
 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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: ವೆಚ್ಚ ಸೆಂಟರ್ ಐಟಂ ಕಡ್ಡಾಯ {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +626,Get Items from Product Bundle,ಉತ್ಪನ್ನ ಬಂಡಲ್ ವಸ್ತುಗಳನ್ನು ಪಡೆಯಲು
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +605,Get Items from Product Bundle,ಉತ್ಪನ್ನ ಬಂಡಲ್ ವಸ್ತುಗಳನ್ನು ಪಡೆಯಲು
 DocType: Asset,Straight Line,ಸರಳ ರೇಖೆ
 DocType: Project User,Project User,ಪ್ರಾಜೆಕ್ಟ್ ಬಳಕೆದಾರ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} is inactive,ಖಾತೆ {0} ನಿಷ್ಕ್ರಿಯ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} is inactive,ಖಾತೆ {0} ನಿಷ್ಕ್ರಿಯ
 DocType: GL Entry,Is Advance,ಮುಂಗಡ ಹೊಂದಿದೆ
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,ದಿನಾಂಕದಿಂದ ಮತ್ತು ದಿನಾಂಕ ಅಟೆಂಡೆನ್ಸ್ ಹಾಜರಿದ್ದ ಕಡ್ಡಾಯ
 apps/erpnext/erpnext/controllers/buying_controller.py +148,Please enter 'Is Subcontracted' as Yes or No,ನಮೂದಿಸಿ ಹೌದು ಅಥವಾ ಇಲ್ಲ ಎಂದು ' subcontracted ಈಸ್'
 DocType: Sales Team,Contact No.,ಸಂಪರ್ಕಿಸಿ ನಂ
 DocType: Bank Reconciliation,Payment Entries,ಪಾವತಿ ನಮೂದುಗಳು
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,'Profit and Loss' type account {0} not allowed in Opening Entry,' ಲಾಭ ಮತ್ತು ನಷ್ಟ ' ಮಾದರಿ ಖಾತೆಯನ್ನು {0} ಎಂಟ್ರಿ ತೆರೆಯುವ ಅನುಮತಿ ಇಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +71,'Profit and Loss' type account {0} not allowed in Opening Entry,' ಲಾಭ ಮತ್ತು ನಷ್ಟ ' ಮಾದರಿ ಖಾತೆಯನ್ನು {0} ಎಂಟ್ರಿ ತೆರೆಯುವ ಅನುಮತಿ ಇಲ್ಲ
 DocType: Program Enrollment Tool,Get Students From,ವಿದ್ಯಾರ್ಥಿಗಳನ್ನು ಪಡೆಯಿರಿ
 DocType: Hub Settings,Seller Country,ಮಾರಾಟಗಾರ ಕಂಟ್ರಿ
 apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,ವೆಬ್ಸೈಟ್ನಲ್ಲಿ ಐಟಂಗಳನ್ನು ಪ್ರಕಟಿಸಿ
@@ -3215,7 +3260,7 @@
 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 +558,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","ರೋ # {0}: ಆಸ್ತಿ {1} ಮಾಡಬಹುದು ಸಲ್ಲಿಸಲಾಗುತ್ತದೆ, ಇದು ಈಗಾಗಲೇ {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +561,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","ರೋ # {0}: ಆಸ್ತಿ {1} ಮಾಡಬಹುದು ಸಲ್ಲಿಸಲಾಗುತ್ತದೆ, ಇದು ಈಗಾಗಲೇ {2}"
 DocType: Tax Rule,Billing Country,ಬಿಲ್ಲಿಂಗ್ ಕಂಟ್ರಿ
 DocType: Production Order,Expected Delivery Date,ನಿರೀಕ್ಷಿತ ಡೆಲಿವರಿ ದಿನಾಂಕ
 apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,ಡೆಬಿಟ್ ಮತ್ತು ಕ್ರೆಡಿಟ್ {0} # ಸಮಾನ ಅಲ್ಲ {1}. ವ್ಯತ್ಯಾಸ {2}.
@@ -3228,13 +3273,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +202,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: Sales Order,% Amount Billed,ಖ್ಯಾತವಾದ % ಪ್ರಮಾಣ
+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 +117,No Item with Serial No {0},ಯಾವುದೇ ಸೀರಿಯಲ್ ಐಟಂ ಅನ್ನು {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,ಓಪನ್ ಸೂಚನೆಗಳು
+DocType: Email Digest,Open Notifications,ಓಪನ್ ಸೂಚನೆಗಳು
 DocType: Payment Entry,Difference Amount (Company Currency),ವ್ಯತ್ಯಾಸ ಪ್ರಮಾಣ (ಕಂಪನಿ ಕರೆನ್ಸಿ)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,ನೇರ ವೆಚ್ಚಗಳು
 apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
@@ -3242,7 +3287,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,ಹೊಸ ಗ್ರಾಹಕ ಕಂದಾಯ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,ಪ್ರಯಾಣ ವೆಚ್ಚ
 DocType: Maintenance Visit,Breakdown,ಅನಾರೋಗ್ಯದಿಂದ ಕುಸಿತ
-apps/erpnext/erpnext/controllers/accounts_controller.py +634,Account: {0} with currency: {1} can not be selected,ಖಾತೆ: {0} ಕರೆನ್ಸಿಗೆ: {1} ಆಯ್ಕೆ ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/controllers/accounts_controller.py +637,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}
 DocType: Program Enrollment Tool,Student Applicants,ವಿದ್ಯಾರ್ಥಿ ಅರ್ಜಿದಾರರು
@@ -3250,15 +3295,15 @@
 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 +56,Probation,ಪರೀಕ್ಷಣೆ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Probation,ಪರೀಕ್ಷಣೆ
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,ಸಂಬಳ ಘಟಕಗಳು
 DocType: Program Enrollment Tool,New Academic Year,ಹೊಸ ಶೈಕ್ಷಣಿಕ ವರ್ಷದ
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Payment of salary for the month {0} and year {1},ತಿಂಗಳು ಮತ್ತು ವರ್ಷದ ಸಂಬಳ ಪಾವತಿ {0} {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Payment of salary for the month {0} and year {1},ತಿಂಗಳು ಮತ್ತು ವರ್ಷದ ಸಂಬಳ ಪಾವತಿ {0} {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,ಆಟೋ ಇನ್ಸರ್ಟ್ ದರ ಪಟ್ಟಿ ದರ ಕಾಣೆಯಾಗಿದೆ ವೇಳೆ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,ಒಟ್ಟು ಗಳಿಸುವ ಪ್ರಮಾಣ
 DocType: Production Order Item,Transferred Qty,ಪ್ರಮಾಣ ವರ್ಗಾಯಿಸಲಾಯಿತು
 apps/erpnext/erpnext/config/learn.py +11,Navigating,ನ್ಯಾವಿಗೇಟ್
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Planning,ಯೋಜನೆ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,ಯೋಜನೆ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,ಬಿಡುಗಡೆ
 DocType: Project,Total Billing Amount (via Time Logs),ಒಟ್ಟು ಬಿಲ್ಲಿಂಗ್ ಪ್ರಮಾಣ (ಸಮಯ ದಾಖಲೆಗಳು ಮೂಲಕ)
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,We sell this Item,ನಾವು ಈ ಐಟಂ ಮಾರಾಟ
@@ -3271,11 +3316,10 @@
 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.,ಇಮೇಲ್ ಮೂಲಕ ಸಾಮಾನ್ಯ ಸಾರಾಂಶ ವರದಿ ಕಳುಹಿಸಿ.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Sales invoice submitted sucessfully.,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಯಶಸ್ವಿಯಾಗಿ ಸಲ್ಲಿಸಿದ.
 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}
 DocType: Assessment Result,Student Name,ವಿದ್ಯಾರ್ಥಿಯ ಹೆಸರು
-apps/erpnext/erpnext/hooks.py +104,Assessment Schedule,ಅಸೆಸ್ಮೆಂಟ್ ವೇಳಾಪಟ್ಟಿ
+apps/erpnext/erpnext/hooks.py +113,Assessment Schedule,ಅಸೆಸ್ಮೆಂಟ್ ವೇಳಾಪಟ್ಟಿ
 DocType: Brand,Item Manager,ಐಟಂ ಮ್ಯಾನೇಜರ್
 DocType: Buying Settings,Default Supplier Type,ಡೀಫಾಲ್ಟ್ ಸರಬರಾಜುದಾರ ಪ್ರಕಾರ
 DocType: Production Order,Total Operating Cost,ಒಟ್ಟು ವೆಚ್ಚವನ್ನು
@@ -3285,6 +3329,7 @@
 DocType: GL Entry,Party Type,ಪಕ್ಷದ ಪ್ರಕಾರ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +78,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 ಮಾಡಿರುವುದಿಲ್ಲ
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,ಸಂಬಳ ಮಾಸ್ಟರ್ ಟೆಂಪ್ಲೆಟ್ .
 DocType: Leave Type,Max Days Leave Allowed,ಮ್ಯಾಕ್ಸ್ ಡೇಸ್ ಹೊರಹೋಗಲು ಆಸ್ಪದ
@@ -3296,18 +3341,19 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,ಪಾತ್ರಗಳ ಅಥವಾ ಗ್ರಾಹಕರಿಗೆ ಹಿಟ್ಟಿಗೆ .
 DocType: Stock Settings,Role Allowed to edit frozen stock,ಪಾತ್ರ ಹೆಪ್ಪುಗಟ್ಟಿದ ಸ್ಟಾಕ್ ಸಂಪಾದಿಸಲು ಅನುಮತಿಸಲಾಗಿದೆ
 ,Territory Target Variance Item Group-Wise,ಪ್ರದೇಶ ಟಾರ್ಗೆಟ್ ವೈಷಮ್ಯವನ್ನು ಐಟಂ ಗ್ರೂಪ್ ವೈಸ್
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Customer Groups,ಎಲ್ಲಾ ಗ್ರಾಹಕ ಗುಂಪುಗಳು
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +78,Accumulated Monthly,ಕ್ರೋಢಿಕೃತ ಮಾಸಿಕ
-apps/erpnext/erpnext/controllers/accounts_controller.py +595,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} ಕಡ್ಡಾಯ. ಬಹುಶಃ ಕರೆನ್ಸಿ ವಿನಿಮಯ ದಾಖಲೆ {2} ಗೆ {1} ದಾಖಲಿಸಿದವರು ಇದೆ.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,ಎಲ್ಲಾ ಗ್ರಾಹಕ ಗುಂಪುಗಳು
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +81,Accumulated Monthly,ಕ್ರೋಢಿಕೃತ ಮಾಸಿಕ
+apps/erpnext/erpnext/controllers/accounts_controller.py +598,{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} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),ಬೆಲೆ ಪಟ್ಟಿ ದರ ( ಕಂಪನಿ ಕರೆನ್ಸಿ )
 DocType: Products Settings,Products Settings,ಉತ್ಪನ್ನಗಳು ಸೆಟ್ಟಿಂಗ್ಗಳು
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +188,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} ಸೆಟಪ್&gt; ಸೆಟ್ಟಿಂಗ್ಗಳು ಮೂಲಕ&gt; ಹೆಸರಿಸುವ ಸರಣಿಯ ಸರಣಿ ಹೆಸರಿಸುವ ಸೆಟ್ ಮಾಡಿ
 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 +84,Secretary,ಕಾರ್ಯದರ್ಶಿ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,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,ಖರೀದಿ
@@ -3316,24 +3362,22 @@
 ,Reqd By Date,ಬೇಕಾಗಿದೆ ದಿನಾಂಕ ಮೂಲಕ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Creditors,ಸಾಲ
 DocType: Assessment,Assessment Name,ಅಸೆಸ್ಮೆಂಟ್ ಹೆಸರು
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,ರೋ # {0}: ಸೀರಿಯಲ್ ಯಾವುದೇ ಕಡ್ಡಾಯ
+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 +859,Supplier Quotation,ಸರಬರಾಜುದಾರ ನುಡಿಮುತ್ತುಗಳು
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +838,Supplier Quotation,ಸರಬರಾಜುದಾರ ನುಡಿಮುತ್ತುಗಳು
 DocType: Quotation,In Words will be visible once you save the Quotation.,ನೀವು ಉದ್ಧರಣ ಉಳಿಸಲು ಒಮ್ಮೆ ವರ್ಡ್ಸ್ ಗೋಚರಿಸುತ್ತದೆ.
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +7,Collect Fees,ಶುಲ್ಕ ಸಂಗ್ರಹಿಸಿ
+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}
 DocType: Lead,Add to calendar on this date,ಈ ದಿನಾಂಕದಂದು ಕ್ಯಾಲೆಂಡರ್ಗೆ ಸೇರಿಸು
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,ಹಡಗು ವೆಚ್ಚ ಸೇರಿಸುವ ನಿಯಮಗಳು .
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,ಮುಂಬರುವ ಕಾರ್ಯಕ್ರಮಗಳು
 DocType: Item,Opening Stock,ಸ್ಟಾಕ್ ತೆರೆಯುವ
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,ಗ್ರಾಹಕ ಅಗತ್ಯವಿದೆ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} ರಿಟರ್ನ್ ಕಡ್ಡಾಯ
 DocType: Purchase Order,To Receive,ಪಡೆಯಲು
 apps/erpnext/erpnext/public/js/setup_wizard.js +195,user@example.com,user@example.com
-DocType: Email Digest,Income / Expense,ಆದಾಯ / ಖರ್ಚು
 DocType: Employee,Personal Email,ಸ್ಟಾಫ್ ಇಮೇಲ್
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,ಒಟ್ಟು ಭಿನ್ನಾಭಿಪ್ರಾಯ
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","ಶಕ್ತಗೊಂಡಿದ್ದಲ್ಲಿ , ಗಣಕವು ದಾಸ್ತಾನು ಲೆಕ್ಕಪರಿಶೋಧಕ ನಮೂದುಗಳನ್ನು ಪೋಸ್ಟ್ ಕಾಣಿಸುತ್ತದೆ ."
@@ -3345,13 +3389,14 @@
 DocType: Customer,From Lead,ಮುಂಚೂಣಿಯಲ್ಲಿವೆ
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,ಉತ್ಪಾದನೆಗೆ ಬಿಡುಗಡೆ ಆರ್ಡರ್ಸ್ .
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,ಹಣಕಾಸಿನ ವರ್ಷ ಆಯ್ಕೆ ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,POS Profile required to make POS Entry,ಪಿಓಎಸ್ ಪ್ರೊಫೈಲ್ ಪಿಓಎಸ್ ಎಂಟ್ರಿ ಮಾಡಲು ಅಗತ್ಯವಿದೆ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +509,POS Profile required to make POS Entry,ಪಿಓಎಸ್ ಪ್ರೊಫೈಲ್ ಪಿಓಎಸ್ ಎಂಟ್ರಿ ಮಾಡಲು ಅಗತ್ಯವಿದೆ
 DocType: Program Enrollment Tool,Enroll Students,ವಿದ್ಯಾರ್ಥಿಗಳು ದಾಖಲು
 DocType: Hub Settings,Name Token,ಹೆಸರು ಟೋಕನ್
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,ಸ್ಟ್ಯಾಂಡರ್ಡ್ ವಿಕ್ರಯ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Atleast one warehouse is mandatory,ಕನಿಷ್ಠ ಒಂದು ಗೋದಾಮಿನ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +129,Atleast one warehouse is mandatory,ಕನಿಷ್ಠ ಒಂದು ಗೋದಾಮಿನ ಕಡ್ಡಾಯ
 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 +330,{0} against Sales Invoice {1},{0} ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ವಿರುದ್ಧ {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,ಪ್ರಾಜೆಕ್ಟ್ ಹೆಸರು
@@ -3372,10 +3417,11 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,ಎಲೆಗಳು ಹಂಚಿಕೆ 0.5 ಗುಣಾತ್ಮಕವಾಗಿ ಇರಬೇಕು
 DocType: Production Order,Operation Cost,ಆಪರೇಷನ್ ವೆಚ್ಚ
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,ಒಂದು . CSV ಕಡತ ಹಾಜರಾತಿ ಅಪ್ಲೋಡ್
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,ಅತ್ಯುತ್ತಮ ಆಮ್ಟ್
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,ಸೆಟ್ ಗುರಿಗಳನ್ನು ಐಟಂ ಗುಂಪು ಬಲ್ಲ ಈ ಮಾರಾಟ ವ್ಯಕ್ತಿಗೆ .
 DocType: Stock Settings,Freeze Stocks Older Than [Days],ಫ್ರೀಜ್ ಸ್ಟಾಕ್ಗಳು ಹಳೆಯದಾಗಿರುವ [ ಡೇಸ್ ]
-apps/erpnext/erpnext/controllers/accounts_controller.py +528,Row #{0}: Asset is mandatory for fixed asset purchase/sale,ರೋ # {0}: ಆಸ್ತಿ ಸ್ಥಿರ ಆಸ್ತಿ ಖರೀದಿ / ಮಾರಾಟ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/controllers/accounts_controller.py +531,Row #{0}: Asset is mandatory for fixed asset purchase/sale,ರೋ # {0}: ಆಸ್ತಿ ಸ್ಥಿರ ಆಸ್ತಿ ಖರೀದಿ / ಮಾರಾಟ ಕಡ್ಡಾಯ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","ಎರಡು ಅಥವಾ ಹೆಚ್ಚು ಬೆಲೆ ನಿಯಮಗಳು ಮೇಲೆ ಆಧರಿಸಿ ಕಂಡುಬರದಿದ್ದಲ್ಲಿ, ಆದ್ಯತಾ ಅನ್ವಯಿಸಲಾಗುತ್ತದೆ. ಡೀಫಾಲ್ಟ್ ಮೌಲ್ಯವನ್ನು ಶೂನ್ಯ (ಖಾಲಿ) ಹಾಗೆಯೇ ಆದ್ಯತಾ 20 0 ನಡುವೆ ಸಂಖ್ಯೆ. ಹೆಚ್ಚಿನ ಸಂಖ್ಯೆ ಅದೇ ಪರಿಸ್ಥಿತಿಗಳು ಅನೇಕ ಬೆಲೆ ನಿಯಮಗಳು ಇವೆ ಅದು ಪ್ರಾಧಾನ್ಯತೆಯನ್ನು ತೆಗೆದುಕೊಳ್ಳುತ್ತದೆ ಅರ್ಥ."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,ಹಣಕಾಸಿನ ವರ್ಷ: {0} ಮಾಡುವುದಿಲ್ಲ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ
 DocType: Currency Exchange,To Currency,ಕರೆನ್ಸಿ
@@ -3392,15 +3438,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,ಖಾಸಗಿ ಈಕ್ವಿಟಿ
 DocType: Maintenance Visit,Customer Feedback,ಪ್ರತಿಕ್ರಿಯೆ
 DocType: Account,Expense,ಖರ್ಚುವೆಚ್ಚಗಳು
-DocType: Sales Invoice,Exhibition,ಪ್ರದರ್ಶನ
 apps/erpnext/erpnext/utilities/doctype/address/address.py +77,"Company is mandatory, as it is your company address","ನಿಮ್ಮ ಕಂಪನಿಗೆ ವಿಳಾಸ ಕಂಪನಿ, ಕಡ್ಡಾಯ"
 DocType: Item Attribute,From Range,ವ್ಯಾಪ್ತಿಯ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +81,Syntax error in formula or condition: {0},ಸೂತ್ರ ಅಥವಾ ಸ್ಥಿತಿಯಲ್ಲಿ ಸಿಂಟ್ಯಾಕ್ಸ್ ದೋಷ: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +92,Syntax error in formula or condition: {0},ಸೂತ್ರ ಅಥವಾ ಸ್ಥಿತಿಯಲ್ಲಿ ಸಿಂಟ್ಯಾಕ್ಸ್ ದೋಷ: {0}
 apps/erpnext/erpnext/stock/utils.py +99,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 +28,Jobs,ಉದ್ಯೋಗ
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,ಉದ್ಯೋಗ
 ,Sales Order Trends,ಮಾರಾಟದ ಆರ್ಡರ್ ಟ್ರೆಂಡ್ಸ್
 DocType: Employee,Held On,ನಡೆದ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,ಪ್ರೊಡಕ್ಷನ್ ಐಟಂ
@@ -3409,16 +3455,16 @@
 DocType: Stock Entry Detail,Additional Cost,ಹೆಚ್ಚುವರಿ ವೆಚ್ಚ
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,ಹಣಕಾಸು ವರ್ಷಾಂತ್ಯದ ದಿನಾಂಕ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","ಚೀಟಿ ಮೂಲಕ ವರ್ಗೀಕರಿಸಲಾಗಿದೆ ವೇಳೆ , ಚೀಟಿ ಸಂಖ್ಯೆ ಆಧರಿಸಿ ಫಿಲ್ಟರ್ ಸಾಧ್ಯವಿಲ್ಲ"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +763,Make Supplier Quotation,ಸರಬರಾಜುದಾರ ಉದ್ಧರಣ ಮಾಡಿ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,Make Supplier Quotation,ಸರಬರಾಜುದಾರ ಉದ್ಧರಣ ಮಾಡಿ
 DocType: Quality Inspection,Incoming,ಒಳಬರುವ
 DocType: BOM,Materials Required (Exploded),ಬೇಕಾದ ಸಾಮಗ್ರಿಗಳು (ಸ್ಫೋಟಿಸಿತು )
 apps/erpnext/erpnext/public/js/setup_wizard.js +185,"Add users to your organization, other than yourself","ನಿಮ್ಮನ್ನು ಬೇರೆ, ನಿಮ್ಮ ಸಂಸ್ಥೆಗೆ ಬಳಕೆದಾರರು ಸೇರಿಸಿ"
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,Row # {0}: Serial No {1} does not match with {2} {3},ರೋ # {0}: ಸೀರಿಯಲ್ ಯಾವುದೇ {1} ಹೊಂದಿಕೆಯಾಗುವುದಿಲ್ಲ {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +42,Casual Leave,ರಜೆ
+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,ರಜೆ
 DocType: Batch,Batch ID,ಬ್ಯಾಚ್ ID
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,Note: {0},ರೇಟಿಂಗ್ : {0}
 ,Delivery Note Trends,ಡೆಲಿವರಿ ಗಮನಿಸಿ ಪ್ರವೃತ್ತಿಗಳು
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +103,This Week's Summary,ಈ ವಾರದ ಸಾರಾಂಶ
+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} ಮಾತ್ರ ಸ್ಟಾಕ್ ಟ್ರಾನ್ಸಾಕ್ಷನ್ಸ್ ಮೂಲಕ ಅಪ್ಡೇಟ್ ಮಾಡಬಹುದು
 DocType: Student Group Creation Tool,Get Courses,ಕೋರ್ಸ್ಗಳು ಪಡೆಯಿರಿ
 DocType: GL Entry,Party,ಪಕ್ಷ
@@ -3428,7 +3474,7 @@
 DocType: Request for Quotation Item,Request for Quotation Item,ಉದ್ಧರಣ ಐಟಂ ವಿನಂತಿ
 DocType: Purchase Order,To Bill,ಬಿಲ್
 DocType: Material Request,% Ordered,% ಆದೇಶ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Piecework,Piecework
+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: Task,Actual Time (in Hours),(ಘಂಟೆಗಳಲ್ಲಿ) ವಾಸ್ತವ ಟೈಮ್
 DocType: Employee,History In Company,ಕಂಪನಿ ಇತಿಹಾಸ
@@ -3445,7 +3491,7 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +350,{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 +162,Black,ಬ್ಲಾಕ್
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,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} ನಿರ್ಮಾಣ ಐಟಂಗಳನ್ನು
@@ -3456,13 +3502,13 @@
 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 +69,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,ಮಾರ್ಕ್ ಆಬ್ಸೆಂಟ್
 DocType: Journal Entry Account,Exchange Rate,ವಿನಿಮಯ ದರ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Sales Order {0} is not submitted,ಮಾರಾಟದ ಆರ್ಡರ್ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +527,Sales Order {0} is not submitted,ಮಾರಾಟದ ಆರ್ಡರ್ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
 DocType: Homepage,Tag Line,ಟ್ಯಾಗ್ ಲೈನ್
 DocType: Fee Component,Fee Component,ಶುಲ್ಕ ಕಾಂಪೊನೆಂಟ್
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +857,Add items from,ಐಟಂಗಳನ್ನು ಸೇರಿಸಿ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +836,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}
 DocType: Cheque Print Template,Regular,ನಿಯಮಿತ
 DocType: BOM,Last Purchase Rate,ಕೊನೆಯ ಖರೀದಿ ದರ
@@ -3470,6 +3516,7 @@
 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} ರಿಂದ ವೇರಿಯಂಟ್
 ,Sales Person-wise Transaction Summary,ಮಾರಾಟಗಾರನ ಬಲ್ಲ ಟ್ರಾನ್ಸಾಕ್ಷನ್ ಸಾರಾಂಶ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +60,Cost Center is required for 'Profit and Loss' account {0}. Please set up a default Cost Center for the Company.,ವೆಚ್ಚದ ಕೇಂದ್ರ &#39;ಲಾಭ ಮತ್ತು ನಷ್ಟ&#39; ಖಾತೆಯನ್ನು {0} ಅಗತ್ಯವಿದೆ. ಕಂಪನಿ ಒಂದು ಡೀಫಾಲ್ಟ್ ವೆಚ್ಚದ ಕೇಂದ್ರ ಸ್ಥಾಪಿಸಲು ದಯವಿಟ್ಟು.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,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,ಮಾಸಿಕ ವಿತರಣೆ ಶೇಕಡಾವಾರು
@@ -3480,12 +3527,12 @@
 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 +710,Online,ಆನ್ಲೈನ್
+apps/erpnext/erpnext/accounts/page/pos/pos.js +692,Online,ಆನ್ಲೈನ್
 ,Available Stock for Packing Items,ಐಟಂಗಳು ಪ್ಯಾಕಿಂಗ್ ಸ್ಟಾಕ್ ಲಭ್ಯವಿದೆ
 DocType: Item Variant,Item Variant,ಐಟಂ ಭಿನ್ನ
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,ಯಾವುದೇ ಡೀಫಾಲ್ಟ್ ಇಲ್ಲ ಎಂದು ಪೂರ್ವನಿಯೋಜಿತವಾಗಿ ಈ ವಿಳಾಸ ಟೆಂಪ್ಲೇಟ್ ಹೊಂದಿಸುವ
+apps/erpnext/erpnext/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 +74,Quality Management,ಗುಣಮಟ್ಟ ನಿರ್ವಹಣೆ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,ಗುಣಮಟ್ಟ ನಿರ್ವಹಣೆ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,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,ಬಾಹ್ಯ ಕೆಲಸದ ಇತಿಹಾಸ
@@ -3507,11 +3554,12 @@
 DocType: Student,Student Email ID,ವಿದ್ಯಾರ್ಥಿ ಈಮೇಲ್ ಅಡ್ರೆಸ್
 DocType: Employee,Notice (days),ಎಚ್ಚರಿಕೆ ( ದಿನಗಳು)
 DocType: Tax Rule,Sales Tax Template,ಮಾರಾಟ ತೆರಿಗೆ ಟೆಂಪ್ಲೇಟು
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1520,Select items to save the invoice,ಸರಕುಪಟ್ಟಿ ಉಳಿಸಲು ಐಟಂಗಳನ್ನು ಆಯ್ಕೆ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1544,Select items to save the invoice,ಸರಕುಪಟ್ಟಿ ಉಳಿಸಲು ಐಟಂಗಳನ್ನು ಆಯ್ಕೆ
 DocType: Employee,Encashment Date,ನಗದೀಕರಣ ದಿನಾಂಕ
 DocType: Account,Stock Adjustment,ಸ್ಟಾಕ್ ಹೊಂದಾಣಿಕೆ
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},ಡೀಫಾಲ್ಟ್ ಚಟುವಟಿಕೆ ವೆಚ್ಚ ಚಟುವಟಿಕೆ ಕೌಟುಂಬಿಕತೆ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ - {0}
 DocType: Production Order,Planned Operating Cost,ಯೋಜನೆ ವೆಚ್ಚವನ್ನು
+DocType: Academic Term,Term Start Date,ಟರ್ಮ್ ಪ್ರಾರಂಭ ದಿನಾಂಕ
 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,ಅರ್ಜಿದಾರರ ಹೆಸರು
@@ -3541,17 +3589,17 @@
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,ಗೋದಾಮಿನ ( ಸಾರ್ವಕಾಲಿಕ ದಾಸ್ತಾನು ) ಖಾತೆ ಈ ಖಾತೆಯ ಅಡಿಯಲ್ಲಿ ನಿರ್ಮಿಸಲಾಗುತ್ತದೆ.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +119,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,ಸ್ಟಾಕ್ ಲೆಡ್ಜರ್ ಪ್ರವೇಶ ಈ ಗೋದಾಮಿನ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ ಎಂದು ವೇರ್ಹೌಸ್ ಅಳಿಸಲಾಗುವುದಿಲ್ಲ .
 DocType: Company,Distribution,ಹಂಚುವುದು
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +8,Amount Paid,ಮೊತ್ತವನ್ನು
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Project Manager,ಪ್ರಾಜೆಕ್ಟ್ ಮ್ಯಾನೇಜರ್
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,ಮೊತ್ತವನ್ನು
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,ಪ್ರಾಜೆಕ್ಟ್ ಮ್ಯಾನೇಜರ್
 ,Quoted Item Comparison,ಉಲ್ಲೇಖಿಸಿದ ಐಟಂ ಹೋಲಿಕೆ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Dispatch,ರವಾನಿಸು
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,ರವಾನಿಸು
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,ಮ್ಯಾಕ್ಸ್ ರಿಯಾಯಿತಿ ಐಟಂ ಅವಕಾಶ: {0} {1}% ಆಗಿದೆ
 apps/erpnext/erpnext/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.,ಪಾತ್ರ ವ್ಯವಹಾರ ಸೆಟ್ ಕ್ರೆಡಿಟ್ ಮಿತಿಯನ್ನು ಮಾಡಲಿಲ್ಲ ಸಲ್ಲಿಸಲು ಅವಕಾಶ ನೀಡಲಿಲ್ಲ .
-DocType: Sales Invoice,Supplier Reference,ಸರಬರಾಜುದಾರ ರೆಫರೆನ್ಸ್
-apps/erpnext/erpnext/accounts/page/pos/pos.js +844,"Master data syncing, it might take some time","ಮಾಸ್ಟರ್ ಡಾಟಾ ಸಿಂಕ್, ಇದು ಸ್ವಲ್ಪ ಸಮಯ ತೆಗೆದುಕೊಳ್ಳಬಹುದು"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +832,"Master data syncing, it might take some time","ಮಾಸ್ಟರ್ ಡಾಟಾ ಸಿಂಕ್, ಇದು ಸ್ವಲ್ಪ ಸಮಯ ತೆಗೆದುಕೊಳ್ಳಬಹುದು"
 DocType: Item,Material Issue,ಮೆಟೀರಿಯಲ್ ಸಂಚಿಕೆ
 DocType: Hub Settings,Seller Description,ಮಾರಾಟಗಾರ ವಿವರಣೆ
 DocType: Employee Education,Qualification,ಅರ್ಹತೆ
@@ -3565,7 +3613,7 @@
 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 +83,Error in formula or condition,ಸೂತ್ರ ಅಥವಾ ಸ್ಥಿತಿಯಲ್ಲಿ ದೋಷ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,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,ಎಲ್ಲವನ್ನೂ
@@ -3574,7 +3622,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},ದಿನಾಂಕ ಹಣಕಾಸಿನ ವರ್ಷದ ಒಳಗೆ ಇರಬೇಕು. ದಿನಾಂಕ ಭಾವಿಸಿಕೊಂಡು = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","ಇಲ್ಲಿ ನೀವು ಎತ್ತರ, ತೂಕ, ಅಲರ್ಜಿ , ವೈದ್ಯಕೀಯ ಇತ್ಯಾದಿ ಕನ್ಸರ್ನ್ಸ್ ಕಾಯ್ದುಕೊಳ್ಳಬಹುದು"
 DocType: Leave Block List,Applies to Company,ಕಂಪನಿ ಅನ್ವಯಿಸುತ್ತದೆ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +197,Cannot cancel because submitted Stock Entry {0} exists,ಸಲ್ಲಿಸಿದ ಸ್ಟಾಕ್ ಎಂಟ್ರಿ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ ಏಕೆಂದರೆ ರದ್ದುಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +198,Cannot cancel because submitted Stock Entry {0} exists,ಸಲ್ಲಿಸಿದ ಸ್ಟಾಕ್ ಎಂಟ್ರಿ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ ಏಕೆಂದರೆ ರದ್ದುಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Purchase Invoice,In Words,ವರ್ಡ್ಸ್
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,Today is {0}'s birthday!,ಇಂದು {0} ಅವರ ಜನ್ಮದಿನ!
 DocType: Production Planning Tool,Material Request For Warehouse,ವೇರ್ಹೌಸ್ ವಸ್ತು ವಿನಂತಿ
@@ -3584,14 +3632,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,ನಿಮ್ಮ ಹಣಕಾಸಿನ ವರ್ಷ ಆರಂಭವಾಗುವ
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,ಆಸ್ತಿ Depreciations ಮತ್ತು ಸಮತೋಲನ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +319,Amount {0} {1} transferred from {2} to {3},ಪ್ರಮಾಣ {0} {1} ವರ್ಗಾಯಿಸಲಾಯಿತು {2} ನಿಂದ {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +322,Amount {0} {1} transferred from {2} to {3},ಪ್ರಮಾಣ {0} {1} ವರ್ಗಾಯಿಸಲಾಯಿತು {2} ನಿಂದ {3}
 DocType: Sales Invoice,Get Advances Received,ಅಡ್ವಾನ್ಸಸ್ ಸ್ವೀಕರಿಸಲಾಗಿದೆ ಪಡೆಯಿರಿ
 DocType: Email Digest,Add/Remove Recipients,ಸೇರಿಸಿ / ತೆಗೆದುಹಾಕಿ ಸ್ವೀಕೃತದಾರರ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +432,Transaction not allowed against stopped Production Order {0},ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ ಟ್ರಾನ್ಸಾಕ್ಷನ್ ಉತ್ಪಾದನೆ ಆರ್ಡರ್ ವಿರುದ್ಧ ನಿಲ್ಲಿಸಿತು {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +437,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 +143,Join,ಸೇರಲು
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,ಕೊರತೆ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/stock/doctype/item/item.py +652,Item variant {0} exists with same attributes,ಐಟಂ ಭಿನ್ನ {0} ಅದೇ ಲಕ್ಷಣಗಳು ಅಸ್ತಿತ್ವದಲ್ಲಿದ್ದರೆ
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,ಐಟಂ ಭಿನ್ನ {0} ಅದೇ ಲಕ್ಷಣಗಳು ಅಸ್ತಿತ್ವದಲ್ಲಿದ್ದರೆ
+DocType: Leave Application,LAP/,ಲ್ಯಾಪ್ /
 DocType: Salary Slip,Salary 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,' ದಿನಾಂಕ ' ಅಗತ್ಯವಿದೆ
@@ -3599,12 +3648,12 @@
 DocType: Sales Invoice Item,Sales Order Item,ಮಾರಾಟದ ಆರ್ಡರ್ ಐಟಂ
 DocType: Salary Slip,Payment Days,ಪಾವತಿ ಡೇಸ್
 DocType: Customer,Dormant,ಸುಪ್ತ
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +212,Warehouses with child nodes cannot be converted to ledger,ಚೈಲ್ಡ್ ನೋಡ್ಗಳ ಜೊತೆ ಗೋದಾಮುಗಳು ಲೆಡ್ಜರ್ ಪರಿವರ್ತಿಸಬಹುದು ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +215,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/public/js/controllers/transaction.js +866,It is needed to fetch Item Details.,ಇದು ಐಟಂ ವಿವರಗಳು ತರಲು ಅಗತ್ಯವಿದೆ.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +857,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} ಈಗಾಗಲೇ ಸ್ವೀಕರಿಸಲಾಗಿದೆ
@@ -3614,14 +3663,14 @@
 DocType: Expense Claim,Total Claimed Amount,ಹಕ್ಕು ಪಡೆದ ಒಟ್ಟು ಪ್ರಮಾಣ
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,ಮಾರಾಟ ಸಮರ್ಥ ಅವಕಾಶಗಳನ್ನು .
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,Invalid {0},ಅಮಾನ್ಯವಾದ {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Sick Leave,ಸಿಕ್ ಲೀವ್
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,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,ಡಿಪಾರ್ಟ್ಮೆಂಟ್ ಸ್ಟೋರ್ಸ್
 DocType: Warehouse,PIN,ಪಿನ್
 DocType: Sales Invoice,Base Change Amount (Company Currency),ಬೇಸ್ ಬದಲಾಯಿಸಬಹುದು ಪ್ರಮಾಣ (ಕಂಪನಿ ಕರೆನ್ಸಿ)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +313,No accounting entries for the following warehouses,ನಂತರ ಗೋದಾಮುಗಳು ಯಾವುದೇ ಲೆಕ್ಕಪರಿಶೋಧಕ ನಮೂದುಗಳನ್ನು
-apps/erpnext/erpnext/projects/doctype/project/project.js +102,Save the document first.,ಮೊದಲ ದಾಖಲೆ ಉಳಿಸಿ.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +314,No accounting entries for the following warehouses,ನಂತರ ಗೋದಾಮುಗಳು ಯಾವುದೇ ಲೆಕ್ಕಪರಿಶೋಧಕ ನಮೂದುಗಳನ್ನು
+apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,ಮೊದಲ ದಾಖಲೆ ಉಳಿಸಿ.
 DocType: Account,Chargeable,ಪೂರಣಮಾಡಬಲ್ಲ
 DocType: Company,Change Abbreviation,ಬದಲಾವಣೆ ಸಂಕ್ಷೇಪಣ
 DocType: Expense Claim Detail,Expense Date,ಖರ್ಚು ದಿನಾಂಕ
@@ -3634,10 +3683,9 @@
 DocType: Purchase Invoice,Recurring Print Format,ಮರುಕಳಿಸುವ ಪ್ರಿಂಟ್ ಫಾರ್ಮ್ಯಾಟ್
 DocType: C-Form,Series,ಸರಣಿ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,Expected Delivery Date cannot be before Purchase Order Date,ನಿರೀಕ್ಷಿತ ಡೆಲಿವರಿ ದಿನಾಂಕ ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ದಿನಾಂಕ ಮೊದಲು ಸಾಧ್ಯವಿಲ್ಲ
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} ಸೆಟಪ್&gt; ಸೆಟ್ಟಿಂಗ್ಗಳು ಮೂಲಕ&gt; ಹೆಸರಿಸುವ ಸರಣಿಯ ಸರಣಿ ಹೆಸರಿಸುವ ಸೆಟ್ ಮಾಡಿ
 DocType: Appraisal,Appraisal Template,ಅಪ್ರೇಸಲ್ ಟೆಂಪ್ಲೇಟು
 DocType: Item Group,Item Classification,ಐಟಂ ವರ್ಗೀಕರಣ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Business Development Manager,ವ್ಯವಹಾರ ಅಭಿವೃದ್ಧಿ ವ್ಯವಸ್ಥಾಪಕ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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,ಸಾಮಾನ್ಯ ಲೆಡ್ಜರ್
@@ -3647,8 +3695,8 @@
 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 +940,Please select {0} first,ಮೊದಲ {0} ಆಯ್ಕೆ ಮಾಡಿ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +749,Batch {0} of Item {1} has expired.,ಐಟಂ ಬ್ಯಾಚ್ {0} {1} ಮುಗಿದಿದೆ.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +953,Please select {0} first,ಮೊದಲ {0} ಆಯ್ಕೆ ಮಾಡಿ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +757,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,ಉಪಮೊತ್ತ
@@ -3676,8 +3724,8 @@
  {% ವೇಳೆ email_id%} ಇಮೇಲ್: {{email_id}} & lt; br & gt {% endif -%} 
  </ code> </ ಪೂರ್ವ>"
 DocType: Salary Detail,Default Amount,ಡೀಫಾಲ್ಟ್ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +92,Warehouse not found in the system,ವ್ಯವಸ್ಥೆಯ ಕಂಡುಬಂದಿಲ್ಲ ವೇರ್ಹೌಸ್
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +106,This Month's Summary,ಈ ತಿಂಗಳ ಸಾರಾಂಶ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,ವ್ಯವಸ್ಥೆಯ ಕಂಡುಬಂದಿಲ್ಲ ವೇರ್ಹೌಸ್
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,ಈ ತಿಂಗಳ ಸಾರಾಂಶ
 DocType: Quality Inspection Reading,Quality Inspection Reading,ಗುಣಮಟ್ಟದ ತಪಾಸಣೆ ಓದುವಿಕೆ
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,` ಸ್ಟಾಕ್ಗಳು ದ್ಯಾನ್ ಫ್ರೀಜ್ ` ಹಳೆಯ % d ದಿನಗಳಲ್ಲಿ ಹೆಚ್ಚು ಚಿಕ್ಕದಾಗಿರಬೇಕು.
 DocType: Tax Rule,Purchase Tax Template,ತೆರಿಗೆ ಟೆಂಪ್ಲೇಟು ಖರೀದಿಸಿ
@@ -3687,21 +3735,22 @@
 DocType: Item Customer Detail,Ref Code,ಉಲ್ಲೇಖ ಕೋಡ್
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,ನೌಕರರ ದಾಖಲೆಗಳು .
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Please set Next Depreciation Date,ಮುಂದಿನ ಸವಕಳಿ ದಿನಾಂಕ ಸೆಟ್ ಮಾಡಿ
-DocType: Payment Gateway,Payment Gateway,ಪೇಮೆಂಟ್ ಗೇಟ್ ವೇ
 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 +378,Operation Time must be greater than 0 for Operation {0},ಆಪರೇಷನ್ ಟೈಮ್ ಆಪರೇಷನ್ 0 ಹೆಚ್ಚು ಇರಬೇಕು {0}
+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/accounts/doctype/account/account.py +170,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 )
 DocType: Program,Program Abbreviation,ಕಾರ್ಯಕ್ರಮದಲ್ಲಿ ಸಂಕ್ಷೇಪಣ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,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: Appraisal,Start Date,ಪ್ರಾರಂಭ ದಿನಾಂಕ
@@ -3717,21 +3766,22 @@
 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,ಆರೋಪಗಳನ್ನು ಐಟಂ ಅನ್ವಯಿಸುವುದಿಲ್ಲ ವೇಳೆ ಐಟಂ ತೆಗೆದುಹಾಕಿ
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,ಉದಾ . smsgateway.com / API / send_sms.cgi
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +27,Transaction currency must be same as Payment Gateway currency,ವ್ಯವಹಾರ ಕರೆನ್ಸಿ ಪೇಮೆಂಟ್ ಗೇಟ್ ವೇ ಕರೆನ್ಸಿ ಅದೇ ಇರಬೇಕು
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Transaction currency must be same as Payment Gateway currency,ವ್ಯವಹಾರ ಕರೆನ್ಸಿ ಪೇಮೆಂಟ್ ಗೇಟ್ ವೇ ಕರೆನ್ಸಿ ಅದೇ ಇರಬೇಕು
 DocType: Payment Entry,Receive,ಸ್ವೀಕರಿಸಿ
+apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,ಉಲ್ಲೇಖಗಳು:
 DocType: Maintenance Visit,Fully Completed,ಸಂಪೂರ್ಣವಾಗಿ
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% ಕಂಪ್ಲೀಟ್
 DocType: Employee,Educational Qualification,ಶೈಕ್ಷಣಿಕ ಅರ್ಹತೆ
 DocType: Workstation,Operating Costs,ವೆಚ್ಚದ
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,ಆಕ್ಷನ್ ಮಾಸಿಕ ಬಜೆಟ್ ಮೀರಿದೆ ತನ್ನತ್ತ
 DocType: Purchase Invoice,Submit on creation,ಸೃಷ್ಟಿ ಸಲ್ಲಿಸಿ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +432,Currency for {0} must be {1},ಕರೆನ್ಸಿ {0} ಇರಬೇಕು {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +435,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 +493,Row {0}: An Reorder entry already exists for this warehouse {1},ಸಾಲು {0}: ಒಂದು ಮರುಕ್ರಮಗೊಳಿಸಿ ಪ್ರವೇಶ ಈಗಾಗಲೇ ಈ ಗೋದಾಮಿನ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {1}
+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/crm/doctype/opportunity/opportunity.py +79,"Cannot declare as lost, because Quotation has been made.","ಸೋತು ಉದ್ಧರಣ ಮಾಡಲಾಗಿದೆ ಏಕೆಂದರೆ , ಘೋಷಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,ಖರೀದಿ ಮಾಸ್ಟರ್ ಮ್ಯಾನೇಜರ್
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +429,Production Order {0} must be submitted,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ {0} ಸಲ್ಲಿಸಬೇಕು
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +434,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 ಮೊದಲು ಸಾಧ್ಯವಿಲ್ಲ
@@ -3741,25 +3791,27 @@
 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 +181,Totals,ಮೊತ್ತವನ್ನು
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,ಮೊತ್ತವನ್ನು
 DocType: BOM,Manufacturing,ಮ್ಯಾನುಫ್ಯಾಕ್ಚರಿಂಗ್
 ,Ordered Items To Be Delivered,ನೀಡಬೇಕಾಗಿದೆ ಐಟಂಗಳು ಆದೇಶ
 DocType: Account,Income,ಆದಾಯ
 DocType: Industry Type,Industry Type,ಉದ್ಯಮ ಪ್ರಕಾರ
 apps/erpnext/erpnext/templates/includes/cart.js +141,Something went wrong!,ಏನೋ ತಪ್ಪಾಗಿದೆ!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,Warning: Leave application contains following block dates,ಎಚ್ಚರಿಕೆ : ಅಪ್ಲಿಕೇಶನ್ ಬಿಡಿ ಕೆಳಗಿನ ಬ್ಲಾಕ್ ದಿನಾಂಕಗಳನ್ನು ಒಳಗೊಂಡಿರುತ್ತದೆ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +120,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} ಈ ವ್ಯವಹಾರವನ್ನು ಪೂರ್ಣಗೊಳಿಸಲು ಮೇಲೆ ಘಟಕಗಳು.
+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 +181,Organization unit (department) master.,ಸಂಸ್ಥೆ ಘಟಕ ( ಇಲಾಖೆ ) ಮಾಸ್ಟರ್ .
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,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 +793,All records are synced.,ಎಲ್ಲಾ ದಾಖಲೆಗಳನ್ನು ಸಿಂಕ್ ಮಾಡಲಾಗಿದೆ.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +781,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,ವೆಚ್ಚದ ಕೇಂದ್ರವಾಗಿ ಹೆಸರು
@@ -3778,21 +3830,20 @@
 DocType: Address,Name of person or organization that this address belongs to.,ವ್ಯಕ್ತಿ ಅಥವಾ ಸಂಸ್ಥೆಯ ಹೆಸರು ಈ ವಿಳಾಸಕ್ಕೆ ಸೇರುತ್ತದೆ .
 apps/erpnext/erpnext/public/js/setup_wizard.js +260,Your Suppliers,ನಿಮ್ಮ ಪೂರೈಕೆದಾರರು
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +49,Cannot set as Lost as Sales Order is made.,ಮಾರಾಟದ ಆರ್ಡರ್ ಮಾಡಿದ ಎಂದು ಕಳೆದು ಹೊಂದಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ .
-DocType: Student Applicant,Mother's Name,ತಾಯಿಯ ಹೆಸರು
 DocType: Request for Quotation Item,Supplier Part No,ಸರಬರಾಜುದಾರ ಭಾಗ ಯಾವುದೇ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +348,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 +326,Received From,ಸ್ವೀಕರಿಸಿದ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Received From,ಸ್ವೀಕರಿಸಿದ
 DocType: Lead,Converted,ಪರಿವರ್ತಿತ
 DocType: Item,Has Serial No,ಅನುಕ್ರಮ ಸಂಖ್ಯೆ ಹೊಂದಿದೆ
 DocType: Employee,Date of Issue,ಸಂಚಿಕೆ ದಿನಾಂಕ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: ಗೆ {0} ಫಾರ್ {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +153,Row #{0}: Set Supplier for item {1},ರೋ # {0}: ಐಟಂ ಹೊಂದಿಸಿ ಸರಬರಾಜುದಾರ {1}
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +93,Row {0}: Hours value must be greater than zero.,ರೋ {0}: ಗಂಟೆಗಳು ಮೌಲ್ಯವನ್ನು ಶೂನ್ಯ ಹೆಚ್ಚು ಇರಬೇಕು.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +117,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} ದೊರೆಯುತ್ತಿಲ್ಲ
 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 +172,{0} {1} does not exist,{0} {1} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +175,{0} {1} does not exist,{0} {1} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,Please check Multi Currency option to allow accounts with other currency,ಇತರ ಕರೆನ್ಸಿ ಖಾತೆಗಳನ್ನು ಅವಕಾಶ ಮಲ್ಟಿ ಕರೆನ್ಸಿ ಆಯ್ಕೆಯನ್ನು ಪರಿಶೀಲಿಸಿ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +72,Item: {0} does not exist in the system,ಐಟಂ: {0} ವ್ಯವಸ್ಥೆಯ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,ನೀವು ಫ್ರೋಜನ್ ಮೌಲ್ಯವನ್ನು ಅಧಿಕಾರ
@@ -3801,13 +3852,14 @@
 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/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,ಅಟೆಂಡೆನ್ಸ್ ಭವಿಷ್ಯದ ದಿನಾಂಕ ಗುರುತಿಸಲಾಗಿದೆ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Pricing Rule,Pricing Rule Help,ಬೆಲೆ ನಿಯಮ ಸಹಾಯ
 DocType: Purchase Taxes and Charges,Account Head,ಖಾತೆ ಹೆಡ್
 apps/erpnext/erpnext/config/stock.py +163,Update additional costs to calculate landed cost of items,ಐಟಂಗಳ ಬಂದಿಳಿದ ವೆಚ್ಚ ಲೆಕ್ಕ ಹೆಚ್ಚುವರಿ ವೆಚ್ಚ ನವೀಕರಿಸಿ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Electrical,ವಿದ್ಯುತ್ತಿನ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Electrical,ವಿದ್ಯುತ್ತಿನ
 DocType: Stock Entry,Total Value Difference (Out - In),ಒಟ್ಟು ಮೌಲ್ಯ ವ್ಯತ್ಯಾಸ (ಔಟ್ - ರಲ್ಲಿ)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,Row {0}: Exchange Rate is mandatory,ಸಾಲು {0}: ವಿನಿಮಯ ದರ ಕಡ್ಡಾಯ
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ಬಳಕೆದಾರ ID ನೌಕರ ಸೆಟ್ {0}
@@ -3815,7 +3867,7 @@
 DocType: Item,Customer Code,ಗ್ರಾಹಕ ಕೋಡ್
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +210,Birthday Reminder for {0},ಹುಟ್ಟುಹಬ್ಬದ ಜ್ಞಾಪನೆ {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,ದಿನಗಳಿಂದಲೂ ಕೊನೆಯ ಆರ್ಡರ್
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +292,Debit To account must be a Balance Sheet account,ಖಾತೆಗೆ ಡೆಬಿಟ್ ಬ್ಯಾಲೆನ್ಸ್ ಶೀಟ್ ಖಾತೆ ಇರಬೇಕು
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To account must be a Balance Sheet account,ಖಾತೆಗೆ ಡೆಬಿಟ್ ಬ್ಯಾಲೆನ್ಸ್ ಶೀಟ್ ಖಾತೆ ಇರಬೇಕು
 DocType: Buying Settings,Naming Series,ಸರಣಿ ಹೆಸರಿಸುವ
 DocType: Leave Block List,Leave Block List Name,ಖಂಡ ಬಿಡಿ ಹೆಸರು
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,ಸ್ಟಾಕ್ ಸ್ವತ್ತುಗಳು
@@ -3827,11 +3879,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 +301,Salary Slip of employee {0} already created for time sheet {1},ಉದ್ಯೋಗಿ ಸಂಬಳ ಸ್ಲಿಪ್ {0} ಈಗಾಗಲೇ ಸಮಯ ಹಾಳೆ ದಾಖಲಿಸಿದವರು {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +313,Salary Slip of employee {0} already created for time sheet {1},ಉದ್ಯೋಗಿ ಸಂಬಳ ಸ್ಲಿಪ್ {0} ಈಗಾಗಲೇ ಸಮಯ ಹಾಳೆ ದಾಖಲಿಸಿದವರು {1}
 DocType: Sales Order Item,Ordered Qty,ಪ್ರಮಾಣ ಆದೇಶ
-apps/erpnext/erpnext/stock/doctype/item/item.py +673,Item {0} is disabled,ಐಟಂ {0} ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} is disabled,ಐಟಂ {0} ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
 DocType: Stock Settings,Stock Frozen Upto,ಸ್ಟಾಕ್ ಘನೀಕೃತ ವರೆಗೆ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +838,BOM does not contain any stock item,ಬಿಒಎಮ್ ಯಾವುದೇ ಸ್ಟಾಕ್ ಐಟಂ ಹೊಂದಿಲ್ಲ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +809,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.,ಪ್ರಾಜೆಕ್ಟ್ ಚಟುವಟಿಕೆ / ಕೆಲಸ .
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,ಸಂಬಳ ಚೂರುಗಳನ್ನು ರಚಿಸಿ
@@ -3839,23 +3891,24 @@
 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 +485,Row #{0}: Please set reorder quantity,ರೋ # {0}: ಮರುಕ್ರಮಗೊಳಿಸಿ ಪ್ರಮಾಣ ಹೊಂದಿಸಿ
+DocType: Sales Invoice Timesheet,Billing Hours,ಬಿಲ್ಲಿಂಗ್ ಅವರ್ಸ್
+apps/erpnext/erpnext/stock/doctype/item/item.py +487,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 +62,Please set {0},ಸೆಟ್ ದಯವಿಟ್ಟು {0}
 DocType: Purchase Invoice,Repeat on Day of Month,ತಿಂಗಳಿನ ದಿನ ಪುನರಾವರ್ತಿಸಿ
 DocType: Employee,Health Details,ಆರೋಗ್ಯ ವಿವರಗಳು
 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,ಮೇಲೆ ಆಯ್ಕೆ ಮಾನದಂಡಗಳನ್ನು ಎಲ್ಲಾ ಸಂಬಳ ಚೂರುಗಳನ್ನು ಸಲ್ಲಿಸಿ
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} ಐಟಂಗಳು ಸಿಂಕ್
 DocType: Sales Order,Partly Delivered,ಭಾಗಶಃ ತಲುಪಿಸಲಾಗಿದೆ
-DocType: Sales Invoice,Existing Customer,ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ಗ್ರಾಹಕ
 DocType: Email Digest,Receivables,ಕರಾರು
+DocType: Lead Source,Lead Source,ಲೀಡ್ ಮೂಲ
 DocType: Customer,Additional information regarding the customer.,ಗ್ರಾಹಕ ಬಗ್ಗೆ ಹೆಚ್ಚುವರಿ ಮಾಹಿತಿಯನ್ನು.
 DocType: Quality Inspection Reading,Reading 5,5 ಓದುವಿಕೆ
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +38,Campaign Name is required,ಕ್ಯಾಂಪೇನ್ ಹೆಸರು ಅಗತ್ಯವಿದೆ
 DocType: Maintenance Visit,Maintenance Date,ನಿರ್ವಹಣೆ ದಿನಾಂಕ
 DocType: Purchase Invoice Item,Rejected Serial No,ತಿರಸ್ಕರಿಸಲಾಗಿದೆ ಅನುಕ್ರಮ ಸಂಖ್ಯೆ
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +80,Year start date or end date is overlapping with {0}. To avoid please set company,ವರ್ಷದ ಆರಂಭದ ದಿನಾಂಕ ಅಥವಾ ಅಂತಿಮ ದಿನಾಂಕ {0} ಜೊತೆ ಅತಿಕ್ರಮಿಸುವ. ತಪ್ಪಿಸಲು ಕಂಪನಿ ಸೆಟ್ ಮಾಡಿ
@@ -3864,10 +3917,9 @@
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","ಉದಾಹರಣೆಗೆ:. ಸರಣಿ ಹೊಂದಿಸಲಾಗಿದೆ ಮತ್ತು ಸೀರಿಯಲ್ ಯಾವುದೇ ವ್ಯವಹಾರಗಳಲ್ಲಿ ಉಲ್ಲೇಖಿಸಲ್ಪಟ್ಟಿಲ್ಲ ವೇಳೆ ABCD ##### 
 , ನಂತರ ಸ್ವಯಂಚಾಲಿತ ಕ್ರಮಸಂಖ್ಯೆ ಈ ಸರಣಿ ಮೇಲೆ ನಡೆಯಲಿದೆ. ನೀವು ಯಾವಾಗಲೂ ಸ್ಪಷ್ಟವಾಗಿ ಈ ಐಟಂ ಸೀರಿಯಲ್ ನಾವು ಬಗ್ಗೆ ಬಯಸಿದರೆ. ಈ ಜಾಗವನ್ನು ಖಾಲಿ ಬಿಡುತ್ತಾರೆ."
 DocType: Upload Attendance,Upload Attendance,ಅಟೆಂಡೆನ್ಸ್ ಅಪ್ಲೋಡ್
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +129,BOM and Manufacturing Quantity are required,BOM ಮತ್ತು ಉತ್ಪಾದನೆ ಪ್ರಮಾಣ ಅಗತ್ಯವಿದೆ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,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,ಮ್ಯಾಕ್ಸ್ ಸಾಮರ್ಥ್ಯ
-DocType: Bank Reconciliation Detail,Amount,ಪ್ರಮಾಣ
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM ಬದಲಾಯಿಸಲ್ಪಟ್ಟಿದೆ
 ,Sales Analytics,ಮಾರಾಟದ ಅನಾಲಿಟಿಕ್ಸ್
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +113,Available {0},ಲಭ್ಯವಿರುವ {0}
@@ -3875,14 +3927,14 @@
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,ಇಮೇಲ್ ಹೊಂದಿಸಲಾಗುತ್ತಿದೆ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +96,Please enter default currency in Company Master,CompanyMaster ಡೀಫಾಲ್ಟ್ ಕರೆನ್ಸಿ ನಮೂದಿಸಿ
 DocType: Stock Entry Detail,Stock Entry Detail,ಸ್ಟಾಕ್ ಎಂಟ್ರಿ ವಿವರಗಳು
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +100,Daily Reminders,ದೈನಂದಿನ ಜ್ಞಾಪನೆಗಳನ್ನು
+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/account/account_tree.js +23,New Account Name,ಹೊಸ ಖಾತೆ ಹೆಸರು
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,ರಾ ಮೆಟೀರಿಯಲ್ಸ್ ಸರಬರಾಜು ವೆಚ್ಚ
 DocType: Selling Settings,Settings for Selling Module,ಮಾಡ್ಯೂಲ್ ಮಾರಾಟವಾಗುವ ಸೆಟ್ಟಿಂಗ್ಗಳು
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Customer Service,ಗ್ರಾಹಕ ಸೇವೆ
+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/config/hr.py +50,Offer candidate a Job.,ಆಫರ್ ಅಭ್ಯರ್ಥಿ ಒಂದು ಜಾಬ್.
@@ -3891,8 +3943,9 @@
 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} ಸ್ಟಾಕ್ ಐಟಂ ಇರಬೇಕು
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,ಪ್ರೋಗ್ರೆಸ್ ಉಗ್ರಾಣದಲ್ಲಿ ಡೀಫಾಲ್ಟ್ ಕೆಲಸ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1570,Total nos of serial no is not equal to quantity.,ಸರಣಿ ಯಾವುದೇ ಒಟ್ಟು ನಮ್ಮನ್ನು ಪ್ರಮಾಣಕ್ಕೆ ಸಮ ಅಲ್ಲ.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1594,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,ಅಪ್ಡೇಟ್ ಸರಣಿ ಸಂಖ್ಯೆ
@@ -3900,9 +3953,10 @@
 DocType: Sales Order,Printing Details,ಮುದ್ರಣ ವಿವರಗಳು
 DocType: Task,Closing Date,ದಿನಾಂಕ ಕ್ಲೋಸಿಂಗ್
 DocType: Sales Order Item,Produced Quantity,ಉತ್ಪಾದನೆಯ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Engineer,ಇಂಜಿನಿಯರ್
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Engineer,ಇಂಜಿನಿಯರ್
+DocType: Journal Entry,Total Amount Currency,ಒಟ್ಟು ಪ್ರಮಾಣ ಕರೆನ್ಸಿ
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,ಹುಡುಕು ಉಪ ಅಸೆಂಬ್ಲೀಸ್
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Item Code required at Row No {0},ರೋ ನಂ ಅಗತ್ಯವಿದೆ ಐಟಂ ಕೋಡ್ {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +398,Item Code required at Row No {0},ರೋ ನಂ ಅಗತ್ಯವಿದೆ ಐಟಂ ಕೋಡ್ {0}
 DocType: Sales Partner,Partner Type,ಸಂಗಾತಿ ಪ್ರಕಾರ
 DocType: Purchase Taxes and Charges,Actual,ವಾಸ್ತವಿಕ
 DocType: Authorization Rule,Customerwise Discount,Customerwise ಡಿಸ್ಕೌಂಟ್
@@ -3918,16 +3972,18 @@
 DocType: BOM,Raw Material Cost,ರಾ ಮೆಟೀರಿಯಲ್ ವೆಚ್ಚ
 DocType: Item Reorder,Re-Order Level,ಮರು ಕ್ರಮಾಂಕದ ಮಟ್ಟ
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,ನೀವು ಉತ್ಪಾದನೆ ಆದೇಶಗಳನ್ನು ಹೆಚ್ಚಿಸಲು ಅಥವಾ ವಿಶ್ಲೇಷಣೆ ಕಚ್ಚಾ ವಸ್ತುಗಳನ್ನು ಡೌನ್ಲೋಡ್ ಬಯಸುವ ಐಟಂಗಳನ್ನು ಮತ್ತು ಯೋಜಿಸಿದ ಪ್ರಮಾಣ ನಮೂದಿಸಿ.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +55,Part-time,ಅರೆಕಾಲಿಕ
+apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,ಗಂಟ್ ಚಾರ್ಟ್
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,ಅರೆಕಾಲಿಕ
 DocType: Employee,Applicable Holiday List,ಅನ್ವಯಿಸುವ ಹಾಲಿಡೇ ಪಟ್ಟಿ
 DocType: Employee,Cheque,ಚೆಕ್
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,ಸರಣಿ Updated
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +57,Series Updated,ಸರಣಿ Updated
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,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 +87,Clearance Date updated,ಕ್ಲಿಯರೆನ್ಸ್ ದಿನಾಂಕ ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,ಯಶಸ್ವಿಯಾಗಿ ಮರುಕೌನ್ಸಿಲ್
@@ -3941,7 +3997,7 @@
 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 +513,Posting date and posting time is mandatory,ಪೋಸ್ಟಿಂಗ್ ದಿನಾಂಕ ಮತ್ತು ಪೋಸ್ಟ್ ಸಮಯದಲ್ಲಿ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,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.,ನೀವು ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ಉಳಿಸಲು ಒಮ್ಮೆ ವರ್ಡ್ಸ್ ಗೋಚರಿಸುತ್ತದೆ.
@@ -3951,7 +4007,7 @@
 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/stock/doctype/stock_entry/stock_entry.py +158,Target warehouse in row {0} must be same as Production Order,ಸತತವಾಗಿ ಟಾರ್ಗೆಟ್ ಗೋದಾಮಿನ {0} ಅದೇ ಇರಬೇಕು ಉತ್ಪಾದನೆ ಆರ್ಡರ್
+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,ಕರೆನ್ಸಿ ಕೆಲವು ಇತರ ಕರೆನ್ಸಿ ಬಳಸಿಕೊಂಡು ನಮೂದುಗಳನ್ನು ಮಾಡಿದ ನಂತರ ಬದಲಾಯಿಸಲಾಗುವುದಿಲ್ಲ
 DocType: Company,Round Off Account,ಖಾತೆ ಆಫ್ ಸುತ್ತ
@@ -3960,23 +4016,22 @@
 DocType: Customer Group,Parent Customer Group,ಪೋಷಕ ಗ್ರಾಹಕ ಗುಂಪಿನ
 DocType: Purchase Invoice,Contact Email,ಇಮೇಲ್ ಮೂಲಕ ಸಂಪರ್ಕಿಸಿ
 DocType: Appraisal Goal,Score Earned,ಸ್ಕೋರ್ ಗಳಿಸಿದರು
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Notice Period,ಎಚ್ಚರಿಕೆ ಅವಧಿಯ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,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 +4,New Sales Person Name,ಹೊಸ ಮಾರಾಟದ ವ್ಯಕ್ತಿ ಹೆಸರು
 DocType: Packing Slip,Gross Weight UOM,ಒಟ್ಟಾರೆ ತೂಕದ UOM
-DocType: Email Digest,Receivables / Payables,ಕರಾರು / ಸಂದಾಯಗಳು
 DocType: Delivery Note Item,Against Sales Invoice,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ವಿರುದ್ಧ
 DocType: Bin,Reserved Qty for Production,ಪ್ರೊಡಕ್ಷನ್ ಪ್ರಮಾಣ ಕಾಯ್ದಿರಿಸಲಾಗಿದೆ
 DocType: Asset,Frequency of Depreciation (Months),ಸವಕಳಿ ಆವರ್ತನ (ತಿಂಗಳ)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +469,Credit Account,ಕ್ರೆಡಿಟ್ ಖಾತೆ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Credit Account,ಕ್ರೆಡಿಟ್ ಖಾತೆ
 DocType: Landed Cost Item,Landed Cost Item,ಇಳಿಯಿತು ವೆಚ್ಚ ಐಟಂ
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +55,Show zero values,ಶೂನ್ಯ ಮೌಲ್ಯಗಳು ತೋರಿಸಿ
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,ಶೂನ್ಯ ಮೌಲ್ಯಗಳು ತೋರಿಸಿ
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,ಕಚ್ಚಾ ವಸ್ತುಗಳ givenName ಪ್ರಮಾಣದಲ್ಲಿ repacking / ತಯಾರಿಕಾ ನಂತರ ಪಡೆದುಕೊಂಡು ಐಟಂ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/public/js/setup_wizard.js +315,Setup a simple website for my organization,ಸೆಟಪ್ ನನ್ನ ಸಂಸ್ಥೆಗೆ ಒಂದು ಸರಳ ವೆಬ್ಸೈಟ್
 DocType: Payment Reconciliation,Receivable / Payable Account,ಸ್ವೀಕರಿಸುವಂತಹ / ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆ
 DocType: Delivery Note Item,Against Sales Order Item,ಮಾರಾಟದ ಆರ್ಡರ್ ಐಟಂ ವಿರುದ್ಧ
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Please specify Attribute Value for attribute {0},ಗುಣಲಕ್ಷಣ ಮೌಲ್ಯ ಗುಣಲಕ್ಷಣ ಸೂಚಿಸಿ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},ಗುಣಲಕ್ಷಣ ಮೌಲ್ಯ ಗುಣಲಕ್ಷಣ ಸೂಚಿಸಿ {0}
 DocType: Item,Default Warehouse,ಡೀಫಾಲ್ಟ್ ವೇರ್ಹೌಸ್
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +39,Budget cannot be assigned against Group Account {0},ಬಜೆಟ್ ಗ್ರೂಪ್ ಖಾತೆ ವಿರುದ್ಧ ನಿಯೋಜಿಸಲಾಗುವುದು ಸಾಧ್ಯವಿಲ್ಲ {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,ಮೂಲ ವೆಚ್ಚ ಸೆಂಟರ್ ನಮೂದಿಸಿ
@@ -3998,19 +4053,22 @@
 DocType: Journal Entry,Total Debit,ಒಟ್ಟು ಡೆಬಿಟ್
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,ಡೀಫಾಲ್ಟ್ ತಯಾರಾದ ಸರಕುಗಳು ವೇರ್ಹೌಸ್
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,ಮಾರಾಟಗಾರ
-DocType: Sales Invoice,Cold Calling,ಶೀತಲ ದೂರವಾಣಿ
 DocType: SMS Parameter,SMS Parameter,ಎಸ್ಎಂಎಸ್ ನಿಯತಾಂಕಗಳನ್ನು
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,ಬಜೆಟ್ ಮತ್ತು ವೆಚ್ಚದ ಕೇಂದ್ರ
 DocType: Maintenance Schedule Item,Half Yearly,ಅರ್ಧ ವಾರ್ಷಿಕ
 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 +253,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 +141,Set as Lost,ಲಾಸ್ಟ್ ಹೊಂದಿಸಿ
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,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 +5,This is based on transactions against this Customer. See timeline below for details,ಈ ಗ್ರಾಹಕ ವಿರುದ್ಧ ವ್ಯವಹಾರ ಆಧರಿಸಿದೆ. ಮಾಹಿತಿಗಾಗಿ ಕೆಳಗೆ ಟೈಮ್ಲೈನ್ ನೋಡಿ
 DocType: Supplier,Credit Days Based On,ಕ್ರೆಡಿಟ್ ಡೇಸ್ ರಂದು ಆಧರಿಸಿ
@@ -4022,11 +4080,10 @@
 ,Items To Be Requested,ಮನವಿ ಐಟಂಗಳನ್ನು
 DocType: Purchase Order,Get Last Purchase Rate,ಕೊನೆಯ ಖರೀದಿ ದರ ಸಿಗುತ್ತದೆ
 DocType: Company,Company Info,ಕಂಪನಿ ಮಾಹಿತಿ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +941,Select or add new customer,ಆಯ್ಕೆಮಾಡಿ ಅಥವಾ ಹೊಸ ಗ್ರಾಹಕ ಸೇರಿಸು
+apps/erpnext/erpnext/accounts/page/pos/pos.js +930,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 +5,This is based on the attendance of this Employee,ಈ ನೌಕರರ ಹಾಜರಾತಿ ಆಧರಿಸಿದೆ
-DocType: Sales Invoice,Frequency,ಆವರ್ತನ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +463,Debit Account,ಡೆಬಿಟ್ ಖಾತೆ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Debit Account,ಡೆಬಿಟ್ ಖಾತೆ
 DocType: Fiscal Year,Year Start Date,ವರ್ಷದ ಆರಂಭ ದಿನಾಂಕ
 DocType: Attendance,Employee Name,ನೌಕರರ ಹೆಸರು
 DocType: Sales Invoice,Rounded Total (Company Currency),ದುಂಡಾದ ಒಟ್ಟು ( ಕಂಪನಿ ಕರೆನ್ಸಿ )
@@ -4035,27 +4092,27 @@
 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 +210,Supplier Quotation {0} created,ಸರಬರಾಜುದಾರ ಉದ್ಧರಣ {0} ದಾಖಲಿಸಿದವರು
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +208,Supplier Quotation {0} created,ಸರಬರಾಜುದಾರ ಉದ್ಧರಣ {0} ದಾಖಲಿಸಿದವರು
 apps/erpnext/erpnext/accounts/report/financial_statements.py +90,End Year cannot be before Start Year,ಅಂತ್ಯ ವರ್ಷ ಪ್ರಾರಂಭ ವರ್ಷ ಮೊದಲು ಸಾಧ್ಯವಿಲ್ಲ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Employee Benefits,ಉದ್ಯೋಗಿ ಸೌಲಭ್ಯಗಳು
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,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 +228,Please set a default Holiday List for Employee {0} or Company {1},ದಯವಿಟ್ಟು ಡೀಫಾಲ್ಟ್ ನೌಕರರ ಹಾಲಿಡೇ ಪಟ್ಟಿ ಸೆಟ್ {0} ಅಥವಾ ಕಂಪನಿ {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +232,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 +499,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ರೋ ಯಾವುದೇ {0}: ಪ್ರಮಾಣ ಖರ್ಚು ಹಕ್ಕು {1} ವಿರುದ್ಧ ಪ್ರಮಾಣ ಬಾಕಿ ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ. ಬಾಕಿ ಪ್ರಮಾಣ {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +500,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ರೋ ಯಾವುದೇ {0}: ಪ್ರಮಾಣ ಖರ್ಚು ಹಕ್ಕು {1} ವಿರುದ್ಧ ಪ್ರಮಾಣ ಬಾಕಿ ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ. ಬಾಕಿ ಪ್ರಮಾಣ {2}
 DocType: Maintenance Schedule,Schedule,ಕಾರ್ಯಕ್ರಮ
 DocType: Account,Parent Account,ಪೋಷಕರ ಖಾತೆಯ
 DocType: Quality Inspection Reading,Reading 3,3 ಓದುವಿಕೆ
 ,Hub,ಹಬ್
 DocType: GL Entry,Voucher Type,ಚೀಟಿ ಪ್ರಕಾರ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1007,Price List not found or disabled,ದರ ಪಟ್ಟಿ ಕಂಡುಬಂದಿಲ್ಲ ಅಥವಾ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1008,Price List not found or disabled,ದರ ಪಟ್ಟಿ ಕಂಡುಬಂದಿಲ್ಲ ಅಥವಾ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
 DocType: Expense Claim,Approved,Approved
 DocType: Pricing Rule,Price,ಬೆಲೆ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +244,Employee relieved on {0} must be set as 'Left',{0} ಮೇಲೆ ಬಿಡುಗಡೆ ನೌಕರರ ' ಎಡ ' ಹೊಂದಿಸಿ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +256,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 ದಿನಾಂಕ ವ್ಯಾಪ್ತಿಯಲ್ಲಿ
@@ -4066,12 +4123,12 @@
 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 +259,Please select Employee Record first.,ಮೊದಲ ನೌಕರರ ರೆಕಾರ್ಡ್ ಆಯ್ಕೆಮಾಡಿ.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +266,Please select Employee Record first.,ಮೊದಲ ನೌಕರರ ರೆಕಾರ್ಡ್ ಆಯ್ಕೆಮಾಡಿ.
 DocType: POS Profile,Account for Change Amount,ಪ್ರಮಾಣ ಚೇಂಜ್ ಖಾತೆ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +190,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},ಸಾಲು {0}: ಪಕ್ಷದ / ಖಾತೆ ಹೊಂದಿಕೆಯಾಗುವುದಿಲ್ಲ {1} / {2} ನಲ್ಲಿ {3} {4}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +235,Please enter Expense Account,ವೆಚ್ಚದಲ್ಲಿ ಖಾತೆಯನ್ನು ನಮೂದಿಸಿ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,Please enter Expense Account,ವೆಚ್ಚದಲ್ಲಿ ಖಾತೆಯನ್ನು ನಮೂದಿಸಿ
 DocType: Account,Stock,ಸ್ಟಾಕ್
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,"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 +976,"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,ಖರೀದಿ / ತಯಾರಿಕೆ ವಿವರಗಳು
@@ -4086,9 +4143,10 @@
 DocType: Asset Movement,Transaction Date,TransactionDate
 DocType: Production Plan Item,Planned Qty,ಯೋಜಿಸಿದ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,ಒಟ್ಟು ತೆರಿಗೆ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,For Quantity (Manufactured Qty) is mandatory,ಪ್ರಮಾಣ (ಪ್ರಮಾಣ ತಯಾರಿಸಲ್ಪಟ್ಟ) ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,For Quantity (Manufactured Qty) is mandatory,ಪ್ರಮಾಣ (ಪ್ರಮಾಣ ತಯಾರಿಸಲ್ಪಟ್ಟ) ಕಡ್ಡಾಯ
 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 +78,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,ನಿಜವಾದ ಆರಂಭ ದಿನಾಂಕ
@@ -4103,9 +4161,11 @@
 DocType: Warranty Claim,If different than customer address,ಗ್ರಾಹಕ ವಿಳಾಸಕ್ಕೆ ವಿಭಿನ್ನವಾದ
 DocType: BOM Operation,BOM Operation,BOM ಕಾರ್ಯಾಚರಣೆ
 DocType: Purchase Taxes and Charges,On Previous Row Amount,ಹಿಂದಿನ ಸಾಲು ಪ್ರಮಾಣ ರಂದು
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +226,Transfer Asset,ಟ್ರಾನ್ಸ್ಫರ್ ಸ್ವತ್ತು
+DocType: Student,Home Address,ಮನೆ ವಿಳಾಸ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +227,Transfer Asset,ಟ್ರಾನ್ಸ್ಫರ್ ಸ್ವತ್ತು
 DocType: POS Profile,POS Profile,ಪಿಓಎಸ್ ವಿವರ
 apps/erpnext/erpnext/config/schools.py +33,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 +129,"Item {0} is a template, please select one of its variants","{0} ಐಟಂ ಒಂದು ಟೆಂಪ್ಲೇಟ್ ಆಗಿದೆ, ಅದರ ರೂಪಾಂತರಗಳು ಒಂದಾಗಿದೆ ಆಯ್ಕೆ ಮಾಡಿ"
 DocType: Asset,Asset Category,ಆಸ್ತಿ ವರ್ಗ
@@ -4115,8 +4175,8 @@
 DocType: Assessment,Room,ಕೊಠಡಿ
 DocType: Purchase Order,Advance Paid,ಅಡ್ವಾನ್ಸ್ ಪಾವತಿಸಿದ
 DocType: Item,Item Tax,ಐಟಂ ತೆರಿಗೆ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +765,Material to Supplier,ಸರಬರಾಜುದಾರ ವಸ್ತು
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +189,Excise Invoice,ಅಬಕಾರಿ ಸರಕುಪಟ್ಟಿ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,Material to Supplier,ಸರಬರಾಜುದಾರ ವಸ್ತು
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,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,ಪ್ರಸಕ್ತ ಹಣಕಾಸಿನ ಹೊಣೆಗಾರಿಕೆಗಳು
@@ -4126,7 +4186,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,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 +136,Credit Card,ಕ್ರೆಡಿಟ್ ಕಾರ್ಡ್
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,ಕ್ರೆಡಿಟ್ ಕಾರ್ಡ್
 DocType: BOM,Item to be manufactured or repacked,ಉತ್ಪಾದಿತ ಅಥವಾ repacked ಎಂದು ಐಟಂ
 apps/erpnext/erpnext/config/stock.py +174,Default settings for stock transactions.,ಸ್ಟಾಕ್ ವ್ಯವಹಾರ ಡೀಫಾಲ್ಟ್ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು .
 DocType: Purchase Invoice,Next Date,NextDate
@@ -4134,6 +4194,7 @@
 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: Academic Term,Term End Date,ಟರ್ಮ್ ಅಂತಿಮ ದಿನಾಂಕ
 DocType: Hub Settings,Seller Name,ಮಾರಾಟಗಾರ ಹೆಸರು
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),ಕಡಿತಗೊಳಿಸಲಾಗುತ್ತದೆ ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು ( ಕಂಪನಿ ಕರೆನ್ಸಿ )
 DocType: Item Group,General Settings,ಸಾಮಾನ್ಯ ಸೆಟ್ಟಿಂಗ್ಗಳು
@@ -4145,7 +4206,7 @@
 DocType: Customer,Commission Rate,ಕಮಿಷನ್ ದರ
 apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,ಭಿನ್ನ ಮಾಡಿ
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,ಇಲಾಖೆ ರಜೆ ಅನ್ವಯಗಳನ್ನು ನಿರ್ಬಂಧಿಸಿ .
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +115,"Payment Type must be one of Receive, Pay and Internal Transfer","ಪಾವತಿ ಕೌಟುಂಬಿಕತೆ, ಸ್ವೀಕರಿಸಿ ಒಂದು ಇರಬೇಕು ಪೇ ಮತ್ತು ಆಂತರಿಕ ಟ್ರಾನ್ಸ್ಫರ್"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +118,"Payment Type must be one of Receive, Pay and Internal Transfer","ಪಾವತಿ ಕೌಟುಂಬಿಕತೆ, ಸ್ವೀಕರಿಸಿ ಒಂದು ಇರಬೇಕು ಪೇ ಮತ್ತು ಆಂತರಿಕ ಟ್ರಾನ್ಸ್ಫರ್"
 apps/erpnext/erpnext/config/selling.py +169,Analytics,ಅನಾಲಿಟಿಕ್ಸ್
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,ಕಾರ್ಟ್ ಖಾಲಿಯಾಗಿದೆ
 DocType: Production Order,Actual Operating Cost,ನಿಜವಾದ ವೆಚ್ಚವನ್ನು
@@ -4160,10 +4221,10 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,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 +92,Designer,ಡಿಸೈನರ್
+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/accounts/doctype/purchase_invoice/purchase_invoice.py +469,Cost Center is required in row {0} in Taxes table for type {1},ವೆಚ್ಚ ಸೆಂಟರ್ ಸಾಲು ಅಗತ್ಯವಿದೆ {0} ತೆರಿಗೆಗಳು ಕೋಷ್ಟಕದಲ್ಲಿ ಮಾದರಿ {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +472,Cost Center is required in row {0} in Taxes table for type {1},ವೆಚ್ಚ ಸೆಂಟರ್ ಸಾಲು ಅಗತ್ಯವಿದೆ {0} ತೆರಿಗೆಗಳು ಕೋಷ್ಟಕದಲ್ಲಿ ಮಾದರಿ {1}
 DocType: Program,Program Code,ಕಾರ್ಯಕ್ರಮದಲ್ಲಿ ಕೋಡ್
 ,Item-wise Purchase Register,ಐಟಂ ಬುದ್ಧಿವಂತ ಖರೀದಿ ನೋಂದಣಿ
 DocType: Batch,Expiry Date,ಅಂತ್ಯ ದಿನಾಂಕ
@@ -4173,12 +4234,12 @@
 apps/erpnext/erpnext/config/projects.py +13,Project master.,ಪ್ರಾಜೆಕ್ಟ್ ಮಾಸ್ಟರ್ .
 apps/erpnext/erpnext/controllers/status_updater.py +174,"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 +417, (Half Day),(ಅರ್ಧ ದಿನ)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425, (Half Day),(ಅರ್ಧ ದಿನ)
 DocType: Supplier,Credit Days,ಕ್ರೆಡಿಟ್ ಡೇಸ್
 DocType: Leave Type,Is Carry Forward,ಮುಂದಕ್ಕೆ ಸಾಗಿಸುವ ಇದೆ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +740,Get Items from BOM,BOM ಐಟಂಗಳು ಪಡೆಯಿರಿ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +711,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 +549,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},ರೋ # {0}: ಪೋಸ್ಟಿಂಗ್ ದಿನಾಂಕ ಖರೀದಿ ದಿನಾಂಕ ಅದೇ ಇರಬೇಕು {1} ಸ್ವತ್ತಿನ {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +552,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,ಮತ್ತೊಂದು ಗೋದಾಮಿನ ಒಂದು ಆಸ್ತಿ ವರ್ಗಾವಣೆ
diff --git a/erpnext/translations/ko.csv b/erpnext/translations/ko.csv
index 9f0fdbc..e060d4f 100644
--- a/erpnext/translations/ko.csv
+++ b/erpnext/translations/ko.csv
@@ -18,11 +18,10 @@
 DocType: Sales Partner,Dealer,상인
 DocType: Employee,Rented,대여
 DocType: Purchase Order,PO-,PO-
-apps/erpnext/erpnext/accounts/report/financial_statements.py +19,Start Year {0} not found.,해를 시작하는 {0}를 찾을 수 없습니다.
 DocType: POS Profile,Applicable for User,사용자에 대한 적용
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +191,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","중지 생산 주문이 취소 될 수 없으며, 취소 먼저 ...의 마개를 따다"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +197,Do you really want to scrap this asset?,당신은 정말이 자산을 스크랩 하시겠습니까?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +17,Select Default Supplier,선택 기본 공급 업체
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +192,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","중지 생산 주문이 취소 될 수 없으며, 취소 먼저 ...의 마개를 따다"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +198,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 +36,Currency is required for Price List {0},환율은 가격 목록에 필요한 {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* 트랜잭션에서 계산됩니다.
 DocType: Address,County,군
@@ -42,46 +41,45 @@
 DocType: Sales Invoice,Customer Name,고객 이름
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +126,Bank account cannot be named as {0},은행 계정으로 명명 할 수없는 {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,머리 (또는 그룹)에있는 회계 항목은 만들어와 균형이 유지된다.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +180,Outstanding for {0} cannot be less than zero ({1}),뛰어난 {0}보다 작을 수 없습니다에 대한 ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,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 +148,Series Updated Successfully,시리즈가 업데이트
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +149,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,모든 공급 업체에게 연락 해주기
-DocType: Quality Inspection Reading,Parameter,매개변수
 apps/erpnext/erpnext/projects/doctype/project/project.py +54,Expected End Date can not be less than Expected Start Date,예상 종료 날짜는 예상 시작 날짜보다 작을 수 없습니다
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,행 번호 {0} : 속도가 동일해야합니다 {1} {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +239,New Leave Application,새로운 허가 신청
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,New Leave Application,새로운 허가 신청
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +20,Attendance Record {0} exists against Student {1} for Course Schedule {2},출석 기록은 {0} 코스 일정에 대한 학생 {1}에있는 {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Bank Draft,은행 어음
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,은행 어음
 DocType: Mode of Payment Account,Mode of Payment Account,지불 계정의 모드
 apps/erpnext/erpnext/stock/doctype/item/item.js +52,Show Variants,쇼 변형
 DocType: Academic Term,Academic Term,학술 용어
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +13,Material,자료
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Quantity,수량
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +511,Accounts table cannot be blank.,계정 테이블은 비워 둘 수 없습니다.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +616,Quantity,수량
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +512,Accounts table cannot be blank.,계정 테이블은 비워 둘 수 없습니다.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,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/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 +142,User {0} is already assigned to Employee {1},사용자 {0}이 (가) 이미 직원에 할당 된 {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,건강 관리
-DocType: Purchase Invoice,Monthly,월
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),지급 지연 (일)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +771,Invoice,송장
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +750,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 +198,Row {0}: {1} {2} does not match with {3},행 {0} : {1} {2}과 일치하지 않는 {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,행 번호 {0} :
+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 +127,Please select Price List,가격리스트를 선택하세요
@@ -112,8 +110,8 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,같은 회사가 두 번 이상 입력
 DocType: Employee,Married,결혼 한
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},허용되지 {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +589,Get items from,에서 항목을 가져 오기
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +382,Stock cannot be updated against Delivery Note {0},스톡 배달 주에 업데이트 할 수 없습니다 {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,에서 항목을 가져 오기
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,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,식료품 점
@@ -122,7 +120,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 +156,Salary Structure Missing,급여 구조 누락
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Salary Structure Missing,급여 구조 누락
 DocType: Lead,Person Name,사람 이름
 DocType: Sales Invoice Item,Sales Invoice Item,판매 송장 상품
 DocType: Account,Credit,신용
@@ -130,10 +128,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 +156,Credit limit has been crossed for customer {0} {1}/{2},신용 한도는 고객에 대한 교차 된 {0} {1} / {2}
-apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","자산 레코드 항목에 대해 존재하는, 선택 해제 할 수 없습니다 &quot;고정 자산&quot;"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +189,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;"
 DocType: Tax Rule,Tax Type,세금의 종류
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +144,You are not authorized to add or update entries before {0},당신은 전에 항목을 추가하거나 업데이트 할 수있는 권한이 없습니다 {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},당신은 전에 항목을 추가하거나 업데이트 할 수있는 권한이 없습니다 {0}
 DocType: Item,Item Image (if not slideshow),상품의 이미지 (그렇지 않으면 슬라이드 쇼)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,고객은 같은 이름을 가진
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(시간  / 60) * 실제 작업 시간
@@ -143,18 +142,17 @@
 DocType: Student Log,Student Log,학생 로그인
 DocType: Quality Inspection,Get Specification Details,사양 세부 사항을 얻을
 DocType: Lead,Interested,관심
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +165,Opening,열기
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,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/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,고객 센터&gt; 고객 그룹&gt; 지역
 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.,기존 거래와 계정 그룹으로 변환 할 수 없습니다.
 DocType: Lead,Product Enquiry,제품 문의
 DocType: Academic Term,Schools,학교
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,첫 번째 회사를 입력하십시오
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Company first,처음 회사를 선택하세요
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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,총 비용
@@ -164,7 +162,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,거래명세표
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,제약
 DocType: Purchase Invoice Item,Is Fixed Asset,고정 자산입니다
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Available qty is {0}, you need {1}","사용 가능한 수량은 {0}, 당신은 필요가있다 {1}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +225,"Available qty is {0}, you need {1}","사용 가능한 수량은 {0}, 당신은 필요가있다 {1}"
 DocType: Expense Claim Detail,Claim Amount,청구 금액
 DocType: Employee,Mr,씨
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,공급 업체 유형 / 공급 업체
@@ -173,26 +171,27 @@
 DocType: Employee,B-,비-
 DocType: Upload Attendance,Import Log,가져 오기 로그
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,위의 기준에 따라 유형 제조의 자료 요청을 당겨
+DocType: Assessment Result,Grade,학년
 DocType: Sales Invoice Item,Delivered By Supplier,공급 업체에 의해 전달
 DocType: SMS Center,All Contact,모든 연락처
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Annual Salary,연봉
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,재고 비용
-apps/erpnext/erpnext/accounts/report/financial_statements.py +22,End Year {0} not found.,최종 년도 {0}를 찾을 수 없습니다.
 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}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,공급 원료 구매
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +130,At least one mode of payment is required for POS invoice.,결제 적어도 하나의 모드는 POS 송장이 필요합니다.
 DocType: Products Settings,Show Products as a List,제품 표시 목록으로
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records",", 템플릿을 다운로드 적절한 데이터를 입력하고 수정 된 파일을 첨부합니다.
  선택한 기간의 모든 날짜와 직원 조합은 기존의 출석 기록과 함께, 템플릿에 올 것이다"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +451,Item {0} is not active or end of life has been reached,{0} 항목을 활성화하지 않거나 수명이 도달했습니다
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +456,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/controllers/accounts_controller.py +614,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","행에있는 세금을 포함하려면 {0} 항목의 요금에, 행의 세금은 {1}도 포함되어야한다"
+apps/erpnext/erpnext/controllers/accounts_controller.py +617,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","행에있는 세금을 포함하려면 {0} 항목의 요금에, 행의 세금은 {1}도 포함되어야한다"
 apps/erpnext/erpnext/config/hr.py +166,Settings for HR Module,HR 모듈에 대한 설정
 DocType: SMS Center,SMS Center,SMS 센터
 DocType: Sales Invoice,Change Amount,변화량
@@ -204,13 +203,13 @@
 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 +147,Execution,실행
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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,품목 및 가격
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},총 시간 : {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},날짜에서 회계 연도 내에 있어야합니다.날짜 가정 = {0}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,Cost Center {0} does not belong to Company {1},코스트 센터 {0}에 속하지 않는 회사 {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +100,Cost Center {0} does not belong to Company {1},코스트 센터 {0}에 속하지 않는 회사 {1}
 DocType: Customer,Individual,개교회들과 사역들은 생겼다가 사라진다.
 DocType: Interest,Academics User,학사 사용자
 DocType: Cheque Print Template,Amount In Figure,그림에서 양
@@ -226,30 +225,32 @@
 DocType: Production Planning Tool,Sales Orders,판매 주문
 DocType: Purchase Taxes and Charges,Valuation,평가
 ,Purchase Order Trends,주문 동향을 구매
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,The request for quotation can be accessed by clicking on the following link,견적 요청은 다음 링크를 클릭하여 액세스 할 수 있습니다
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,올해 잎을 할당합니다.
 DocType: SG Creation Tool Course,SG Creation Tool Course,SG 생성 도구 코스
 DocType: Student Group Creation Tool,Leave blank if you wish to fetch all courses for selected academic term,선택한 학기의 모든 과정을 반입하고자하는 경우 비워 둡니다
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,Insufficient Stock,부족 증권
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227,Insufficient Stock,부족 증권
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,사용 안 함 용량 계획 및 시간 추적
+DocType: Email Digest,New Sales Orders,새로운 판매 주문
 DocType: Bank Reconciliation,Bank Account,은행 계좌
 DocType: Leave Type,Allow Negative Balance,음의 균형이 허용
 DocType: Selling Settings,Default Territory,기본 지역
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,텔레비전
 DocType: Production Order Operation,Updated via 'Time Log','소요시간 로그'를 통해 업데이트 되었습니다.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} does not belong to Company {1},계정 {0}이 회사에 속하지 않는 {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +86,Account {0} does not belong to Company {1},계정 {0}이 회사에 속하지 않는 {1}
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},사전 금액보다 클 수 없습니다 {0} {1}
 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 +174,For Warehouse is required before Submit,창고가 필요한 내용은 이전에 제출
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,For Warehouse is required before Submit,창고가 필요한 내용은 이전에 제출
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,에 수신
 DocType: Sales Partner,Reseller,리셀러
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,회사를 입력하십시오
 DocType: Delivery Note Item,Against Sales Invoice Item,견적서 항목에 대하여
 ,Production Orders in Progress,진행 중 생산 주문
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Cash from Financing,Financing의 순 현금
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1436,"LocalStorage is full , did not save","로컬 저장이 가득, 저장하지 않은"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1460,"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}
@@ -262,18 +263,19 @@
 apps/erpnext/erpnext/templates/generators/item.html +78,No description given,주어진 설명이 없습니다
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,구입 요청합니다.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +5,This is based on the Time Sheets created against this project,이는이 프로젝트에 대해 만든 시간 시트를 기반으로
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Only the selected Leave Approver can submit this Leave Application,만 선택 안함 승인자이 허가 신청을 제출할 수 있습니다
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +213,Only the selected Leave Approver can submit this Leave Application,만 선택 안함 승인자이 허가 신청을 제출할 수 있습니다
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,날짜를 완화하는 것은 가입 날짜보다 커야합니다
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Leaves per Year,연간 잎
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,연간 잎
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,행 {0} : 확인하시기 바랍니다이 계정에 대한 '사전인가'{1}이 사전 항목 인 경우.
 apps/erpnext/erpnext/stock/utils.py +188,Warehouse {0} does not belong to company {1},웨어 하우스는 {0}에 속하지 않는 회사 {1}
+DocType: Email Digest,Profit & Loss,이익 및 손실
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,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 +435,Leave Blocked,남겨 차단
-apps/erpnext/erpnext/stock/doctype/item/item.py +669,Item {0} has reached its end of life on {1},항목 {0}에 수명이 다한 {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +443,Leave Blocked,남겨 차단
+apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item {0} has reached its end of life on {1},항목 {0}에 수명이 다한 {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +95,Bank Entries,은행 입장
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +83,Annual,연간
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +86,Annual,연간
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,재고 조정 항목
 DocType: Stock Entry,Sales Invoice No,판매 송장 번호
 DocType: Material Request Item,Min Order Qty,최소 주문 수량
@@ -281,20 +283,22 @@
 DocType: Lead,Do Not Contact,연락하지 말라
 apps/erpnext/erpnext/public/js/setup_wizard.js +360,People who teach at your organisation,조직에서 가르치는 사람들
 DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,모든 반복 송장을 추적하는 고유 ID.그것은 제출에 생성됩니다.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Software Developer,소프트웨어 개발자
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,소프트웨어 개발자
 DocType: Item,Minimum Order Qty,최소 주문 수량
 DocType: Pricing Rule,Supplier Type,공급 업체 유형
 DocType: Scheduling Tool,Course Start Date,코스 시작 날짜
 DocType: Item,Publish in Hub,허브에 게시
+DocType: Student Admission,Student Admission,학생 입학
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is cancelled,{0} 항목 취소
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Material Request,자료 요청
+apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} is cancelled,{0} 항목 취소
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +823,Material Request,자료 요청
 DocType: Bank Reconciliation,Update Clearance Date,업데이트 통관 날짜
 apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +28,Abbreviation already used for another salary component,약어는 이미 다른 급여의 구성 요소에 사용
 DocType: Item,Purchase Details,구매 상세 정보
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +328,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},구매 주문에 &#39;원료 공급&#39;테이블에없는 항목 {0} {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +333,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/config/selling.py +18,Confirmed orders from Customers.,고객의 확정 주문.
 DocType: Purchase Receipt Item,Rejected Quantity,거부 수량
 DocType: SMS Settings,SMS Sender Name,SMS 보낸 사람 이름
@@ -310,20 +314,21 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +130,Please select Charge Type first,충전 유형을 먼저 선택하세요
 DocType: Student Group Student,Student Group Student,학생 그룹 학생
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,최근
+DocType: Email Digest,New Quotations,새로운 인용
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,목록의 첫 번째 허가 승인자는 기본 남겨 승인자로 설정됩니다
 DocType: Tax Rule,Shipping County,배송 카운티
 apps/erpnext/erpnext/config/desktop.py +158,Learn,배우다
 DocType: Asset,Next Depreciation Date,다음 감가 상각 날짜
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,직원 당 활동 비용
 DocType: Accounts Settings,Settings for Accounts,계정에 대한 설정
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +626,Supplier Invoice No exists in Purchase Invoice {0},공급 업체 송장 번호는 구매 송장에 존재 {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +629,Supplier Invoice No exists in Purchase Invoice {0},공급 업체 송장 번호는 구매 송장에 존재 {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,판매 인 나무를 관리합니다.
 DocType: Job Applicant,Cover Letter,커버 레터
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,뛰어난 수표 및 취소 예금
 DocType: Item,Synced With Hub,허브와 동기화
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,잘못된 비밀번호
 DocType: Item,Variant Of,의 변형
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,Completed Qty can not be greater than 'Qty to Manufacture',보다 '수량 제조하는'완료 수량은 클 수 없습니다
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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 +86,Circular Reference Error,순환 참조 오류
@@ -335,15 +340,16 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,자동 자료 요청의 생성에 이메일로 통보
 DocType: Journal Entry,Multi Currency,멀티 통화
 DocType: Payment Reconciliation Invoice,Invoice Type,송장 유형
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +806,Delivery Note,상품 수령증
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +800,Delivery Note,상품 수령증
 apps/erpnext/erpnext/config/learn.py +87,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 +233,Payment Entry has been modified after you pulled it. Please pull it again.,당신이 그것을 끌어 후 결제 항목이 수정되었습니다.다시 당깁니다.
+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/setup/doctype/email_digest/email_digest.py +104,Summary for this week and pending activities,이번 주 보류중인 활동에 대한 요약
+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를 입력, 송장은 특정 날짜에 자동으로 발송됩니다"
 DocType: Employee,Company Email,회사 이메일
@@ -355,28 +361,29 @@
 apps/erpnext/erpnext/config/hr.py +186,"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,고객 통화는 고객의 기본 통화로 변환하는 속도에
-apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},행 # {0} : 구매 송장 기존 자산에 대해 할 수 없습니다 {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +554,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},행 # {0} : 구매 송장 기존 자산에 대해 할 수 없습니다 {1}
 DocType: Item Tax,Tax Rate,세율
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} 이미 직원에 할당 {1}에 기간 {2}에 대한 {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +812,Select Item,항목 선택
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +791,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/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,구매 송장 {0}이 (가) 이미 제출
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},행 번호 {0} : 일괄 없음은 동일해야합니다 {1} {2}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +143,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).
 DocType: C-Form Invoice Detail,Invoice Date,송장의 날짜
 DocType: GL Entry,Debit Amount,직불 금액
 apps/erpnext/erpnext/accounts/party.py +242,There can only be 1 Account per Company in {0} {1},만에 회사 당 1 계정이있을 수 있습니다 {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +4,Your email address,귀하의 이메일 주소
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +342,Please see attachment,첨부 파일을 참조하시기 바랍니다
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,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 +19,Setup Already Complete!!,이미 설치 완료!
 ,Finished Goods,완성품
 DocType: Delivery Note,Instructions,지침
 DocType: Quality Inspection,Inspected By,검사
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,공급 업체&gt; 공급 업체 유형
 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,항목 추가
@@ -390,29 +397,29 @@
 DocType: Currency Exchange,Currency Exchange,환전
 DocType: Purchase Invoice Item,Item Name,품명
 DocType: Authorization Rule,Approving User  (above authorized value),(승인 된 값 이상) 사용 승인
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,신용 잔액
+DocType: Email Digest,Credit Balance,신용 잔액
 DocType: Employee,Widowed,과부
 DocType: Request for Quotation,Request for Quotation,견적 요청
 DocType: Salary Slip Timesheet,Working Hours,근무 시간
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,기존 시리즈의 시작 / 현재의 순서 번호를 변경합니다.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","여러 가격의 규칙이 우선 계속되면, 사용자는 충돌을 해결하기 위해 수동으로 우선 순위를 설정하라는 메시지가 표시됩니다."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +736,Purchase Return,구매 돌아 가기
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +715,Purchase Return,구매 돌아 가기
 ,Purchase Register,회원에게 구매
 DocType: Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,적용 요금
 DocType: Workstation,Consumable Cost,소모품 비용
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +202,{0} ({1}) must have role 'Leave Approver',{0} ({1}) 역할이 있어야합니다 '휴가 승인'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,{0} ({1}) must have role 'Leave Approver',{0} ({1}) 역할이 있어야합니다 '휴가 승인'
 DocType: Purchase Receipt,Vehicle Date,차량 날짜
 DocType: Student Log,Medical,의료
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,잃는 이유
-apps/erpnext/erpnext/accounts/utils.py +239,Allocated amount can not greater than unadjusted amount,할당 된 금액은 조정되지 않은 금액보다 큰 수
+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,할당 된 금액은 조정되지 않은 금액보다 큰 수
 DocType: Announcement,Receiver,리시버
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},워크 스테이션 홀리데이 목록에 따라 다음과 같은 날짜에 닫혀 : {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,기회
 DocType: Employee,Single,미혼
 DocType: Account,Cost of Goods Sold,매출원가
 DocType: Purchase Invoice,Yearly,매년
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +225,Please enter Cost Center,비용 센터를 입력 해주십시오
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,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,심사관 이름
@@ -425,26 +432,26 @@
 DocType: Purchase Invoice,Supplier Name,공급 업체 이름
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,ERPNext 설명서를 읽어
 DocType: Account,Is Group,IS 그룹
+DocType: Email Digest,Pending Purchase Orders,구매 주문을 보류
 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 +102,Non Profit,비영리
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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: Stock Reconciliation Item,Do not include symbols (ex. $),기호를 포함하지 마십시오 (예. $)
 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 +638,Attribute {0} selected multiple times in Attributes Table,속성 {0} 속성 테이블에서 여러 번 선택
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,속성 {0} 속성 테이블에서 여러 번 선택
 DocType: HR Settings,Employee record is created using selected field. ,
 DocType: Sales Order,Not Applicable,적용 할 수 없음
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,휴일 마스터.
 DocType: Request for Quotation Item,Required Date,필요한 날짜
 DocType: Delivery Note,Billing Address,청구 주소
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +862,Please enter Item Code.,상품 코드를 입력 해 주시기 바랍니다.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +847,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",선택하면 이미 인쇄 속도 / 인쇄 금액에 포함되어있는 세액은 간주됩니다
@@ -458,12 +465,12 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,증권 및 예치금
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,할당 된 총 잎은 필수입니다
 DocType: Job Opening,Description of a Job Opening,구인에 대한 설명
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Pending activities for today,오늘 보류 활동
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,오늘 보류 활동
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,출석 기록.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,작업 표 기반의 급여에 대한 급여의 구성 요소.
 DocType: Sales Order Item,Used for Production Plan,생산 계획에 사용
 DocType: Manufacturing Settings,Time Between Operations (in mins),(분에) 작업 사이의 시간
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +92,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},코스트 센터에 대한 계정 {1}에 대한 {0} 예산 {2}는 {3}. 그것은에 의해 초과 {4}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +95,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},코스트 센터에 대한 계정 {1}에 대한 {0} 예산 {2}는 {3}. 그것은에 의해 초과 {4}
 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의 동일한 항목에 대한 없습니다
@@ -471,16 +478,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +238,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 +86,Administrative Officer,관리 책임자
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,관리 책임자
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +23,Acutal Qty {0} / Waiting Qty {1},Acutal 수량 {0} / 대기 수량 {1}
 DocType: Timesheet Detail,Hrs,시간
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +319,Please select Company,회사를 선택하세요
-DocType: Stock Entry,Difference Account,차이 계정
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +309,Please select Company,회사를 선택하세요
+DocType: Stock Entry Detail,Difference Account,차이 계정
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,종속 작업 {0}이 닫혀 있지 가까운 작업을 할 수 없습니다.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Please enter Warehouse for which Material Request will be raised,자료 요청이 발생합니다있는 창고를 입력 해주십시오
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +399,Please enter Warehouse for which Material Request will be raised,자료 요청이 발생합니다있는 창고를 입력 해주십시오
 DocType: Production Order,Additional Operating Cost,추가 운영 비용
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,화장품
-apps/erpnext/erpnext/stock/doctype/item/item.py +530,"To merge, following properties must be same for both items",병합하려면 다음과 같은 속성이 두 항목에 대해 동일해야합니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,"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 +28,Buy,사다
@@ -488,7 +495,7 @@
 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 +1563,Serial no item cannot be a fraction,일련 번호 항목 일부가 될 수 없습니다
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1587,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,관리 하도급
@@ -497,13 +504,14 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Account {0} does not belong to company: {1},계정 {0} 회사에 속하지 않는 {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation already used for another company,약어는 이미 다른 회사에 사용
 DocType: Selling Settings,Default Customer Group,기본 고객 그룹
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Supplier is required against Payable account {0},공급 업체는 채무 계정에 필요한 {0}
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","사용하지 않으면, '둥근 총'이 필드는 모든 트랜잭션에서 볼 수 없습니다"
 DocType: BOM,Operating Cost,운영 비용
 DocType: Sales Order Item,Gross Profit,매출 총 이익
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +42,Increment cannot be 0,증가는 0이 될 수 없습니다
 DocType: Production Planning Tool,Material Requirement,자료 요구
 DocType: Company,Delete Company Transactions,회사 거래 삭제
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +313,Reference No and Reference Date is mandatory for Bank transaction,참조 번호 및 참조 날짜는 은행 거래를위한 필수입니다
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +316,Reference No and Reference Date is mandatory for Bank transaction,참조 번호 및 참조 날짜는 은행 거래를위한 필수입니다
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,세금과 요금 추가/편집
 DocType: Purchase Invoice,Supplier Invoice No,공급 업체 송장 번호
 DocType: Territory,For reference,참고로
@@ -514,7 +522,6 @@
 DocType: Installation Note Item,Installation Note Item,설치 노트 항목
 DocType: Production Plan Item,Pending Qty,보류 수량
 DocType: Budget,Ignore,무시
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,상품 코드&gt; 항목 그룹&gt; 브랜드
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,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,급여 슬립 표
@@ -525,11 +532,11 @@
 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/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,송장 테이블에있는 레코드 없음
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +28,Please select Company and Party Type first,첫번째 회사와 파티 유형을 선택하세요
+apps/erpnext/erpnext/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/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 +707,Make Sales Order,확인 판매 주문
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +701,Make Sales Order,확인 판매 주문
 DocType: Project Task,Project Task,프로젝트 작업
 ,Lead Id,리드 아이디
 DocType: C-Form Invoice Detail,Grand Total,총 합계
@@ -545,7 +552,8 @@
 DocType: Job Applicant,Resume Attachment,이력서 첨부
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,반복 고객
 DocType: Leave Control Panel,Allocate,할당
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +734,Sales Return,판매로 돌아 가기
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +728,Sales Return,판매로 돌아 가기
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +91,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,참고 : 총 할당 잎 {0} 이미 승인 나뭇잎 이상이어야한다 {1} 기간 동안
 DocType: Announcement,Posted By,에 의해 게시 됨
 DocType: Item,Delivered by Supplier (Drop Ship),공급 업체에 의해 전달 (드롭 선박)
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,잠재 고객의 데이터베이스.
@@ -554,14 +562,13 @@
 DocType: Quotation,Quotation To,에 견적
 DocType: Lead,Middle Income,중간 소득
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +212,Opening (Cr),오프닝 (CR)
-apps/erpnext/erpnext/stock/doctype/item/item.py +795,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,이미 다른 UOM 일부 거래 (들)을 만들었 때문에 항목에 대한 측정의 기본 단위는 {0} 직접 변경할 수 없습니다. 당신은 다른 기본 UOM을 사용하여 새 항목을 작성해야합니다.
-apps/erpnext/erpnext/accounts/utils.py +237,Allocated amount can not be negative,할당 된 금액은 음수 일 수 없습니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +797,Default Unit of Measure for Item {0} cannot be changed directly because 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,할당 된 금액은 음수 일 수 없습니다
 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 +91,Reference No & Reference Date is required for {0},참조 번호 및 참고 날짜가 필요합니다 {0}
-DocType: Sales Invoice,Customer's Vendor,고객의 공급 업체
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Proposal Writing,제안서 작성
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,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","자재 요청에 포함됩니다 하청있는 항목에 대해, 원료를 선택하면"
@@ -570,13 +577,14 @@
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,시간 추적
 DocType: Fiscal Year Company,Fiscal Year Company,회계 연도 회사
 DocType: Packing Slip Item,DN Detail,DN 세부 정보
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +257,Already supplier quotation has created,이미 공급 업체 인용 만들었습니다
 DocType: Timesheet,Billed,청구
 DocType: Batch,Batch Description,일괄처리 설명
+apps/erpnext/erpnext/accounts/utils.py +685,"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 +733,View Offline Records,보기 오프라인 기록
+apps/erpnext/erpnext/accounts/page/pos/pos.js +715,View Offline Records,보기 오프라인 기록
+DocType: Student,Sibling Details,형제의 자세한 사항
 DocType: Employee,Reason for Resignation,사임 이유
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,성과 평가를위한 템플릿.
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,송장 / 분개 세부 사항
@@ -590,7 +598,7 @@
 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,재고의 순 변화
 DocType: Employee,Passport Number,여권 번호
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Manager,관리자
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,관리자
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,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'는 달라야 합니다.
@@ -599,10 +607,11 @@
 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 +299,Timesheet created:,작업 표 작성 :
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +715,Please set default Cash or Bank account in Mode of Payment {0},지불 모드로 기본 현금 또는 은행 계정을 설정하십시오 {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +300,Timesheet created:,작업 표 작성 :
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +772,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,싸다
 DocType: Selling Settings,Customer Naming By,고객 이름 지정으로
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,하십시오&gt; 인적 자원에 HR 설정을 시스템 이름 지정 설치 직원
 DocType: Depreciation Schedule,Depreciation Amount,감가 상각 금액
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,그룹으로 변환
 DocType: Activity Cost,Activity Type,활동 유형
@@ -627,6 +636,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,끝
 DocType: Pricing Rule,Sales Manager,영업 관리자
 DocType: Salary Structure Employee,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,자산 처분 이익 / 손실 계정
@@ -641,11 +651,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +9,Pre Sales,사전 판매
 DocType: Purchase Receipt,Other Details,기타 세부 사항
 DocType: Account,Accounts,회계
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Marketing,마케팅
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +227,Payment Entry is already created,결제 항목이 이미 생성
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,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 +538,Row #{0}: Asset {1} does not linked to Item {2},행 번호는 {0} : {1} 자산이 항목에 연결되지 않는 {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +21,Preview Salary Slip,미리보기 연봉 슬립
+apps/erpnext/erpnext/controllers/accounts_controller.py +541,Row #{0}: Asset {1} does not linked to Item {2},행 번호는 {0} : {1} 자산이 항목에 연결되지 않는 {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +38,Preview Salary Slip,미리보기 연봉 슬립
 DocType: Company,Deafult Cost Center,Deafult 코스트 센터
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +48,Account {0} has been entered multiple times,계정 {0} 여러 번 입력 된
 DocType: Account,Expenses Included In Valuation,비용은 평가에 포함
@@ -654,7 +664,7 @@
 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 +617,Item has variants.,항목 변종이있다.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,항목 변종이있다.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,{0} 항목을 찾을 수 없습니다
 DocType: Bin,Stock Value,재고 가치
 apps/erpnext/erpnext/accounts/doctype/account/account.py +25,Company {0} does not exist,회사 {0} 존재하지 않습니다
@@ -674,7 +684,7 @@
 DocType: Purchase Order,Supply Raw Materials,공급 원료
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,다음 송장이 생성됩니다되는 날짜입니다. 그것은 제출에 생성됩니다.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,유동 자산
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,{0} is not a stock Item,{0} 재고 상품이 아닌
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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 +169,Lead must be set if Opportunity is made from Lead,기회고객을 리드고객으로 만든 경우 리드고객를 설정해야합니다
@@ -760,26 +770,25 @@
 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 +709,No Permission,아무 권한이 없습니다
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +710,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}
 apps/erpnext/erpnext/public/js/setup_wizard.js +298,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 +542,Row #{0}: Asset {1} must be submitted,행 번호 {0} 자산이 {1} 제출해야합니다
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,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를 통해 재고의 균형을 업로드 할 수 있습니다.
 DocType: Warehouse,Tree Details,트리 세부 사항
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,지금 보내기
 ,Support Analytics,지원 분석
 DocType: Item,Website Warehouse,웹 사이트 창고
 DocType: Payment Reconciliation,Minimum Invoice Amount,최소 송장 금액
 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 +227,Timesheet {0} is already completed or cancelled,표 {0} 이미 완료 또는 취소
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +259,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 같아야
@@ -795,13 +804,13 @@
 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 +229,Target Warehouse,목표웨어 하우스
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +230,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-,스테
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Sales Order Date,예상 배달 날짜 이전에 판매 주문 날짜가 될 수 없습니다
 DocType: Upload Attendance,Import Attendance,수입 출석
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,모든 상품 그룹
+apps/erpnext/erpnext/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/config/setup.py +89,Automatically compose message on submission of transactions.,자동 거래의 제출에 메시지를 작성합니다.
@@ -813,13 +822,15 @@
 DocType: Sales Invoice,Payment Due Date,지불 기한
 apps/erpnext/erpnext/stock/doctype/item/item.js +278,Item Variant {0} already exists with same attributes,항목 변형 {0} 이미 동일한 속성을 가진 존재
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;열기&#39;
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,수행하려면 열기
 DocType: Notification Control,Delivery Note Message,납품서 메시지
 DocType: Expense Claim,Expenses,비용
 DocType: Item Variant Attribute,Item Variant Attribute,항목 변형 특성
 ,Purchase Receipt Trends,구매 영수증 동향
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Research & Development,연구 개발 (R & D)
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,연구 개발 (R & D)
 ,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,가격 또는 할인
@@ -828,7 +839,7 @@
 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/controllers/accounts_controller.py +340,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","결제 항목 {0} 주문이이 송장에 미리으로 당겨 할 필요가있는 경우 {1}, 확인에 연결되어 있습니다."
+apps/erpnext/erpnext/controllers/accounts_controller.py +343,"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,판매 시점
@@ -850,12 +861,12 @@
 DocType: Supplier Quotation,Is Subcontracted,하청
 DocType: Item Attribute,Item Attribute Values,항목 속성 값
 DocType: Examination Result,Examination Result,시험 결과
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +756,Purchase Receipt,구입 영수증
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +735,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 +167,Reference Doctype must be one of {0},참고없는 Doctype 중 하나 여야합니다 {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +282,Unable to find Time Slot in the next {0} days for Operation {1},작업에 대한 다음 {0} 일 시간 슬롯을 찾을 수 없습니다 {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +170,Reference Doctype must be one of {0},참고없는 Doctype 중 하나 여야합니다 {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Unable to find Time Slot in the next {0} days for Operation {1},작업에 대한 다음 {0} 일 시간 슬롯을 찾을 수 없습니다 {1}
 DocType: Production Order,Plan material for sub-assemblies,서브 어셈블리 계획 물질
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,판매 파트너 및 지역
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be active,BOM {0}이 활성화되어 있어야합니다
@@ -866,7 +877,7 @@
 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 +214,Warehouses with existing transaction can not be converted to ledger.,기존 거래와 창고가 원장으로 변환 할 수 없습니다.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +217,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,생산 주문
@@ -880,9 +891,9 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,직원 {0} 활성화되지 않거나 존재하지 않습니다
 DocType: Fee Structure,Components,구성 요소들
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,Please enter Asset Category in Item {0},상품에 자산 카테고리를 입력하세요 {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +612,Item Variants {0} updated,항목 변형 {0} 업데이트
+apps/erpnext/erpnext/stock/doctype/item/item.py +614,Item Variants {0} updated,항목 변형 {0} 업데이트
 DocType: Quality Inspection Reading,Reading 6,6 읽기
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +843,Cannot {0} {1} {2} without any negative outstanding invoice,하지 {0} {1} {2}없이 음의 뛰어난 송장 수
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +854,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,지금 동기화
@@ -897,69 +908,72 @@
 DocType: Item,Is Purchase Item,구매 상품입니다
 DocType: Asset,Purchase Invoice,구매 송장
 DocType: Stock Ledger Entry,Voucher Detail No,바우처 세부 사항 없음
-apps/erpnext/erpnext/accounts/page/pos/pos.js +728,New Sales Invoice,새로운 판매 송장
+apps/erpnext/erpnext/accounts/page/pos/pos.js +710,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 +728,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: Cheque Print Template,Has Print Format,인쇄 형식
-apps/erpnext/erpnext/accounts/page/pos/pos.js +86, is mandatory. Maybe Currency Exchange record is not created for ,필수입니다. 환율 레코드가 생성되지 않았습니다.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +109,Row #{0}: Please specify Serial No for Item {1},행 번호는 {0} 항목에 대한 일련 번호를 지정하십시오 {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +619,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","&#39;제품 번들&#39;항목, 창고, 일련 번호 및 배치에 대해 아니오 &#39;포장 목록&#39;테이블에서 고려 될 것이다. 창고 및 배치 없음 어떤 &#39;제품 번들&#39;항목에 대한 모든 포장 항목에 대해 동일한 경우, 그 값이 주요 항목 테이블에 입력 할 수는 값이 테이블 &#39;목록 포장&#39;을 복사됩니다."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +75, 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 +613,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing 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 +606,Supplier Invoice Date cannot be greater than Posting Date,공급 업체 송장 날짜 게시 날짜보다 클 수 없습니다
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +609,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: 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 +810,Select Item for Transfer,전송 항목 선택
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +789,Select Item for Transfer,전송 항목 선택
 DocType: Purchase Invoice,Additional Discount Percentage,추가 할인 비율
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,모든 도움말 동영상 목록보기
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,검사가 입금 된 은행 계좌 머리를 선택합니다.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,사용자가 거래 가격리스트 평가를 편집 할 수
 DocType: Pricing Rule,Max Qty,최대 수량
-DocType: Student Applicant,Father's Name,아버지의 이름
 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 +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,행 {0} : 판매 / 구매 주문에 대한 결제가 항상 사전으로 표시해야
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,화학
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +686,All items have already been transferred for this Production Order.,모든 항목은 이미 생산 주문에 대한 전송되었습니다.
+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} 다시 시도
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +694,All items have already been transferred for this Production Order.,모든 항목은 이미 생산 주문에 대한 전송되었습니다.
 DocType: Process Payroll,Select Payroll Year and Month,급여 연도와 월을 선택
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,Meter,미터
 DocType: Workstation,Electricity Cost,전기 비용
 DocType: HR Settings,Don't send Employee Birthday Reminders,직원 생일 알림을 보내지 마십시오
-DocType: Opportunity,Walk In,걷다
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,재고 항목
 DocType: Item,Inspection Criteria,검사 기준
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,옮겨진
 apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,편지의 머리와 로고를 업로드합니다. (나중에 편집 할 수 있습니다).
 DocType: Timesheet Detail,Bill,계산서
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,White,화이트
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date is entered as past date,다음 감가 상각 날짜는 과거 날짜로 입력
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +167,White,화이트
 DocType: SMS Center,All Lead (Open),모든 납 (열기)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +228,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),행 {0}에 대한 수량을 사용할 수없는 {4}웨어 하우스의 {1} 항목의 시간을 게시에 ({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}),행 {0}에 대한 수량을 사용할 수없는 {4}웨어 하우스의 {1} 항목의 시간을 게시에 ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,선불지급
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +731,Make ,확인
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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 +154,Order Type must be one of {0},주문 유형 중 하나 여야합니다 {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},주문 유형 중 하나 여야합니다 {0}
 DocType: Lead,Next Contact Date,다음 접촉 날짜
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,열기 수량
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +393,Please enter Account for Change Amount,변경 금액에 대한 계정을 입력하세요
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,Please enter Account for Change Amount,변경 금액에 대한 계정을 입력하세요
 DocType: Student Batch,Student Batch Name,학생 배치 이름
 DocType: Holiday List,Holiday List Name,휴일 목록 이름
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js +8,Schedule Course,일정 코스
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Stock Options,스톡 옵션
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,스톡 옵션
 DocType: Journal Entry Account,Expense Claim,비용 청구
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +211,Do you really want to restore this scrapped asset?,당신은 정말이 폐기 자산을 복원 하시겠습니까?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +237,Qty for {0},대한 수량 {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +212,Do you really want to restore this scrapped asset?,당신은 정말이 폐기 자산을 복원 하시겠습니까?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,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,차단 목록 날짜를 남겨
@@ -968,9 +982,9 @@
 DocType: Company,Default Terms,기본 약관
 DocType: Packing Slip Item,Packing Slip Item,패킹 슬립 상품
 DocType: Purchase Invoice,Cash/Bank Account,현금 / 은행 계좌
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,양 또는 값의 변화없이 제거 항목.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,양 또는 값의 변화없이 제거 항목.
 DocType: Delivery Note,Delivery To,에 배달
-apps/erpnext/erpnext/stock/doctype/item/item.py +635,Attribute table is mandatory,속성 테이블은 필수입니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,속성 테이블은 필수입니다
 DocType: Production Planning Tool,Get Sales Orders,판매 주문을 받아보세요
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} 음수가 될 수 없습니다
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,학생을 선택하세요
@@ -995,7 +1009,7 @@
 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,WIP 창고
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},일련 번호는 {0}까지 유지 보수 계약에 따라 {1}
+apps/erpnext/erpnext/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,조직 이름
@@ -1007,7 +1021,7 @@
 DocType: GL Entry,Against,에 대하여
 DocType: Item,Default Selling Cost Center,기본 판매 비용 센터
 DocType: Sales Partner,Implementation Partner,구현 파트너
-apps/erpnext/erpnext/controllers/selling_controller.py +231,Sales Order {0} is {1},판매 주문 {0}를 {1}
+apps/erpnext/erpnext/controllers/selling_controller.py +232,Sales Order {0} is {1},판매 주문 {0}를 {1}
 DocType: Opportunity,Contact Info,연락처 정보
 apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,재고 항목 만들기
 DocType: Packing Slip,Net Weight UOM,순 중량 UOM
@@ -1017,25 +1031,24 @@
 DocType: Holiday List,Get Weekly Off Dates,날짜 매주 하차
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,종료 날짜는 시작 날짜보다 작을 수 없습니다
 DocType: Sales Person,Select company name first.,첫 번째 회사 이름을 선택합니다.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Dr,박사
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Dr,박사
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,인용문은 공급 업체에서 받았다.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},에 {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,평균 연령
 DocType: 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/templates/pages/home.html +32,View All Products,모든 제품보기
+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 +400,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,경고 : 시스템이 {0} {1} 제로의 항목에 대한 금액 때문에 과다 청구를 확인하지 않습니다
+apps/erpnext/erpnext/controllers/accounts_controller.py +403,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/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,그리고 일년
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +191,{0} {1} must be submitted,{0} {1} 제출해야합니다
-DocType: Email Digest,Annual Expense,연간 비용
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,{0} {1} must be submitted,{0} {1} 제출해야합니다
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +145,Quantity must be less than or equal to {0},수량보다 작거나 같아야합니다 {0}
 DocType: SMS Center,Total Characters,전체 문자
 apps/erpnext/erpnext/controllers/buying_controller.py +156,Please select BOM in BOM field for Item {0},상품에 대한 BOM 필드에서 BOM을 선택하세요 {0}
@@ -1046,30 +1059,31 @@
 DocType: Sales Partner,Distributor,분배 자
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,쇼핑 카트 배송 규칙
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +211,Production Order {0} must be cancelled before cancelling this Sales Order,생산 순서는 {0}이 판매 주문을 취소하기 전에 취소해야합니다
-apps/erpnext/erpnext/public/js/controllers/transaction.js +62,Please set 'Apply Additional Discount On',설정 &#39;에 추가 할인을 적용&#39;하세요
+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,범위이어야한다보다는에게 범위
 DocType: Global Defaults,Global Defaults,글로벌 기본값
 apps/erpnext/erpnext/projects/doctype/project/project.py +153,Project Collaboration Invitation,프로젝트 협력 초대
 DocType: Salary Slip,Deductions,공제
+DocType: Leave Allocation,LAL/,LAL /
 apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,시작 년도
 DocType: Purchase Invoice,Start date of current invoice's period,현재 송장의 기간의 시작 날짜
 DocType: Salary Slip,Leave Without Pay,지불하지 않고 종료
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +327,Capacity Planning Error,용량 계획 오류
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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 +362,Finished Item {0} must be entered for Manufacture type entry,완료 항목 {0} 제조 유형 항목을 입력해야합니다
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +367,Finished Item {0} must be entered for Manufacture type entry,완료 항목 {0} 제조 유형 항목을 입력해야합니다
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,개시 잔고
 DocType: Sales Invoice Advance,Sales Invoice Advance,선행 견적서
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +499,Nothing to request,요청하지 마
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +500,Nothing to request,요청하지 마
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','시작 날짜가' '종료 날짜 '보다 클 수 없습니다
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Management,관리
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},직불 카드 또는 신용 금액 중 하나가 필요합니다 {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,관리
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +55,Either debit or credit amount is required for {0},직불 카드 또는 신용 금액 중 하나가 필요합니다 {0}
 DocType: Cheque Print Template,Payer Settings,지불 설정
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","이 변형의 상품 코드에 추가됩니다.귀하의 약어는 ""SM""이며, 예를 들어, 아이템 코드는 ""T-SHIRT"", ""T-SHIRT-SM""입니다 변형의 항목 코드"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,당신이 급여 슬립을 저장하면 (즉) 순 유료가 표시됩니다.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,Blue,푸른
+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를 설정하십시오
@@ -1079,12 +1093,12 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +23,POS Profile {0} already created for user: {1} and company {2},POS 프로필 {0} 이미 사용자 생성 : {1}과 회사 {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM 변환 계수
 DocType: Stock Settings,Default Item Group,기본 항목 그룹
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1374,Do you really want to submit the invoice?,당신은 정말 송장을 제출 하시겠습니까?
+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 +685,Cost Center For Item with Item Code ','상품 코드와 항목에 대한 센터 비용
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1526,"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 +679,Cost Center For Item with Item Code ','상품 코드와 항목에 대한 센터 비용
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1550,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",지불 방식은 구성되어 있지 않습니다. 계정 결제의 모드 또는 POS 프로필에 설정되어 있는지 확인하십시오.
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,귀하의 영업 사원은 고객에게 연락이 날짜에 알림을 얻을 것이다
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,"Further accounts can be made under Groups, but entries can be made against non-Groups","또한 계정의 그룹에서 제조 될 수 있지만, 항목은 비 - 그룹에 대해 만들어 질 수있다"
 DocType: Lead,Lead,리드 고객
@@ -1104,104 +1118,106 @@
 DocType: Payment Reconciliation,Unreconciled Payment Details,비 조정 지불 세부 사항
 DocType: Global Defaults,Current Fiscal Year,당해 사업 연도
 DocType: Global Defaults,Disable Rounded Total,둥근 전체에게 사용 안 함
-DocType: Lead,Call,전화
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +417,'Entries' cannot be empty,'항목란'을 채워 주세요.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +418,'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 +214,Fiscal Year {0} not found,찾을 수 없습니다 회계 연도 {0}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +221,Fiscal Year {0} not found,찾을 수 없습니다 회계 연도 {0}
 apps/erpnext/erpnext/config/hr.py +238,Setting up Employees,직원 설정
 DocType: Sales Order,SO-,그래서-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,첫 번째 접두사를 선택하세요
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Please select prefix first,첫 번째 접두사를 선택하세요
 DocType: Employee,O-,영형-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Research,연구
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,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 +43,Item {0} must be a non-stock item,{0} 상품은 재고 항목 있어야합니다
 DocType: Contact,User ID,사용자 ID
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +57,View Ledger,보기 원장
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,처음
-apps/erpnext/erpnext/stock/doctype/item/item.py +504,"An Item Group exists with same name, please change the item name or rename the item group",항목 그룹이 동일한 이름을 가진 항목의 이름을 변경하거나 항목 그룹의 이름을 바꾸십시오
+apps/erpnext/erpnext/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 +437,Rest Of The World,세계의 나머지
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,항목 {0} 배치를 가질 수 없습니다
 ,Budget Variance Report,예산 차이 보고서
 DocType: Salary Slip,Gross Pay,총 지불
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +90,Row {0}: Activity Type is mandatory.,행 {0} : 활동 유형은 필수입니다.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +114,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/public/js/controllers/stock_controller.js +40,Accounting Ledger,회계 원장
+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,이익 잉여금
 DocType: BOM Item,Item Description,항목 설명
+DocType: Student Sibling,Student Sibling,학생 형제
 DocType: Purchase Invoice,Is Recurring,반복인가
 DocType: Purchase Invoice,Supplied Items,제공 한
 DocType: Student,STUD.,마개.
 DocType: Production Order,Qty To Manufacture,제조하는 수량
+DocType: Email Digest,New Income,새로운 소득
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,구매주기 동안 동일한 비율을 유지
 DocType: Opportunity Item,Opportunity Item,기회 상품
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,임시 열기
 ,Employee Leave Balance,직원 허가 밸런스
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +131,Balance for Account {0} must always be {1},{0} 계정 잔고는 항상 {1}  이어야합니다
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +175,Valuation Rate required for Item in row {0},행 항목에 필요한 평가 비율 {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,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,예 : 컴퓨터 과학 석사
 DocType: Purchase Invoice,Rejected Warehouse,거부 창고
 DocType: GL Entry,Against Voucher,바우처에 대한
 DocType: Item,Default Buying Cost Center,기본 구매 비용 센터
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","ERPNext 중 최고를 얻으려면, 우리는 당신이 약간의 시간이 걸릴 이러한 도움 비디오를 시청할 것을 권장합니다."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +87, to ,에
+apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,에
 DocType: Item,Lead Time in days,일 리드 타임
 ,Accounts Payable Summary,미지급금 합계
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Not authorized to edit frozen Account {0},동결 계정을 편집 할 수있는 권한이 없습니다 {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},동결 계정을 편집 할 수있는 권한이 없습니다 {0}
 DocType: Journal Entry,Get Outstanding Invoices,미결제 송장를 얻을
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +62,Sales Order {0} is not valid,판매 주문 {0} 유효하지 않습니다
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,판매 주문 {0} 유효하지 않습니다
 apps/erpnext/erpnext/setup/doctype/company/company.py +185,"Sorry, companies cannot be merged","죄송합니다, 회사는 병합 할 수 없습니다"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +139,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",자료 요청의 총 발행 / 전송 양 {0} {1} \ 항목에 대한 요청한 수량 {2}보다 클 수 없습니다 {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Small,작은
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,Small,작은
 DocType: Employee,Employee Number,직원 수
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},케이스 없음 (들)을 이미 사용.케이스 없음에서 시도 {0}
 ,Invoiced Amount (Exculsive Tax),송장에 청구 된 금액 (Exculsive 세금)
-DocType: Student Applicant,Mother's / Guardian 1 Email ID,어머니 / 보호자 1 이메일 ID
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,항목 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,계정 머리 {0} 생성
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +160,Green,녹색
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,녹색
 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 +57,Contract,계약직
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,계약직
 DocType: Email Digest,Add Quote,견적 추가
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +498,UOM coversion factor required for UOM: {0} in Item: {1},UOM에 필요한 UOM coversion 인자 : {0} 항목 {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +503,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 +80,Row {0}: Qty is mandatory,행 {0} : 수량은 필수입니다
+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 +737,Sync Master Data,싱크 마스터 데이터
+apps/erpnext/erpnext/accounts/page/pos/pos.js +719,Sync Master Data,싱크 마스터 데이터
 apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,귀하의 제품이나 서비스
 DocType: Mode of Payment,Mode of Payment,결제 방식
 apps/erpnext/erpnext/stock/doctype/item/item.py +178,Website Image should be a public file or website URL,웹 사이트의 이미지가 공개 파일 또는 웹 사이트 URL이어야합니다
+DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,이 루트 항목 그룹 및 편집 할 수 없습니다.
+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 +345,"{0}: Employee email not found, hence email not sent","{0} : 직원의 이메일을 찾을 수 없습니다, 따라서 보낸 이메일이 아닌"
+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,귀하의 회사 주소입니다
 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 +118,"For {0}, only credit accounts can be linked against another debit entry",{0} 만 신용 계정은 자동 이체 항목에 링크 할 수 있습니다 들어
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Delivery Note {0} is not submitted,배송 참고 {0} 제출되지
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Delivery Note {0} is not submitted,배송 참고 {0} 제출되지
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Sub-contracted Item,{0} 항목 하위 계약 품목이어야합니다
 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,판매자 웹 사이트
 DocType: Item,ITEM-,목-
-apps/erpnext/erpnext/controllers/selling_controller.py +147,Total allocated percentage for sales team should be 100,영업 팀의 총 할당 비율은 100해야한다
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +110,Production Order status is {0},생산 오더의 상태는 {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,영업 팀의 총 할당 비율은 100해야한다
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},생산 오더의 상태는 {0}
 DocType: Appraisal Goal,Goal,골
 DocType: Sales Invoice Item,Edit Description,편집 설명
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +757,For Supplier,공급 업체
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +723,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,인쇄 형식 만들기
@@ -1217,10 +1233,11 @@
 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,등급 코드
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,다이제스트 이메일 :
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +445,BOM {0} does not belong to Item {1},BOM {0} 아이템에 속하지 않는 {1}
 DocType: Sales Partner,Target Distribution,대상 배포
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1667,Deafault warehouse is required for selected item,Deafault 창고가 선택 항목에 대한 필요
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Deafault warehouse is required for selected item,Deafault 창고가 선택 항목에 대한 필요
 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 읽기
@@ -1229,23 +1246,23 @@
 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 +110,Hardware,하드웨어
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,하드웨어
 DocType: Sales Order,Recurring Upto,반복 개까지
 DocType: Attendance,HR Manager,HR 관리자
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,회사를 선택하세요
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Privilege Leave,권한 허가
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,권한 허가
 DocType: Purchase Invoice,Supplier Invoice Date,공급 업체 송장 날짜
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,당신은 쇼핑 카트를 활성화해야
 DocType: Payment Entry,Writeoff,청구 취소
 DocType: Appraisal Template Goal,Appraisal Template Goal,평가 템플릿 목표
-DocType: Salary Slip,Earning,당기순이익
+DocType: Salary Component,Earning,당기순이익
 DocType: Purchase Invoice,Party Account Currency,파티 계정 환율
 ,BOM Browser,BOM 브라우저
 DocType: Purchase Taxes and Charges,Add or Deduct,추가 공제
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,사이에있는 중복 조건 :
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +171,Against Journal Entry {0} is already adjusted against some other voucher,저널에 대하여 항목은 {0}이 (가) 이미 다른 쿠폰에 대해 조정
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,저널에 대하여 항목은 {0}이 (가) 이미 다른 쿠폰에 대해 조정
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,총 주문액
-apps/erpnext/erpnext/demo/setup_data.py +358,Food,음식
+apps/erpnext/erpnext/demo/setup/setup_data.py +301,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/course_schedule/course_schedule.js +103,Mark Attendence,마크 출석율
@@ -1279,12 +1296,12 @@
 DocType: Sales Order Item,Planned Quantity,계획 수량
 DocType: Purchase Invoice Item,Item Tax Amount,항목 세액
 DocType: Item,Maintain Stock,재고 유지
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +209,Stock Entries already created for Production Order ,이미 생산 오더에 대 한 만든 항목
+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,고정 자산의 순 변화
 DocType: Leave Control Panel,Leave blank if considered for all designations,모든 지정을 고려하는 경우 비워 둡니다
-apps/erpnext/erpnext/controllers/accounts_controller.py +620,Charge of type 'Actual' in row {0} cannot be included in Item Rate,유형 행 {0}에있는 '실제'의 책임은 상품 요금에 포함 할 수 없습니다
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,Max: {0},최대 : {0}
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +15,From Datetime,날짜 시간에서
+apps/erpnext/erpnext/controllers/accounts_controller.py +623,Charge of type 'Actual' in row {0} cannot be included in Item Rate,유형 행 {0}에있는 '실제'의 책임은 상품 요금에 포함 할 수 없습니다
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +239,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 +153,"Request for Quotation is disabled to access from portal, for more check portal settings.","견적 요청은 더 체크 포털 설정을 위해, 포털에서 액세스를 사용할 수 없습니다."
@@ -1292,8 +1309,8 @@
 DocType: Sales Invoice,Shipping Address Name,배송 주소 이름
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,계정 차트
 DocType: Material Request,Terms and Conditions Content,약관 내용
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +552,cannot be greater than 100,100보다 큰 수 없습니다
-apps/erpnext/erpnext/stock/doctype/item/item.py +680,Item {0} is not a stock Item,{0} 항목을 재고 항목이 없습니다
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +546,cannot be greater than 100,100보다 큰 수 없습니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is not a stock Item,{0} 항목을 재고 항목이 없습니다
 DocType: Maintenance Visit,Unscheduled,예약되지 않은
 DocType: Employee,Owned,소유
 DocType: Salary Detail,Depends on Leave Without Pay,무급 휴가에 따라 다름
@@ -1307,10 +1324,9 @@
 DocType: GL Entry,GL Entry,GL 등록
 DocType: HR Settings,Employee Settings,직원 설정
 ,Batch-Wise Balance History,배치 식 밸런스 역사
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,할일 목록
 apps/erpnext/erpnext/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 +61,Apprentice,도제
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +102,Negative Quantity is not allowed,음의 수량은 허용되지 않습니다
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,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","문자열로 품목 마스터에서 가져온이 분야에 저장 세금 세부 테이블.
  세금 및 요금에 사용"
@@ -1332,15 +1348,14 @@
 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 +141,Source warehouse is mandatory for row {0},소스웨어 하우스는 행에 대해 필수입니다 {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +719,Packing Slip,포장 명세서
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Source warehouse is mandatory for row {0},소스웨어 하우스는 행에 대해 필수입니다 {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +713,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/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,견적 요청은 다음 링크를 클릭하여 액세스 할 수 있습니다
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,가져 오기 실패!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,어떤 주소는 아직 추가되지 않습니다.
 DocType: Workstation Working Hour,Workstation Working Hour,워크 스테이션 작업 시간
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Analyst,분석자
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,분석자
 DocType: Item,Inventory,재고
 DocType: Item,Sales Details,판매 세부 사항
 DocType: Quality Inspection,QI-,QI-
@@ -1348,7 +1363,7 @@
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,수량에
 DocType: Notification Control,Expense Claim Rejected,비용 청구는 거부
 DocType: Item Attribute,Item Attribute,항목 속성
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +103,Government,통치 체제
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,통치 체제
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,연구소 이름
 apps/erpnext/erpnext/config/stock.py +289,Item Variants,항목 변형
 DocType: Company,Services,Services (서비스)
@@ -1364,6 +1379,7 @@
 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/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,투자의 현금 흐름
 DocType: Program Course,Program Course,프로그램 과정
@@ -1404,12 +1420,12 @@
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,수신기 목록이 비어 있습니다.수신기 목록을 만드십시오
 DocType: Production Plan Sales Order,Production Plan Sales Order,생산 계획 판매 주문
 DocType: Sales Partner,Sales Partner Target,영업 파트너 대상
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +110,Accounting Entry for {0} can only be made in currency: {1},{0}에 대한 회계 항목 만 통화 할 수있다 : {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},{0}에 대한 회계 항목 만 통화 할 수있다 : {1}
 DocType: Pricing Rule,Pricing Rule,가격 규칙
 DocType: Budget,Action if Annual Budget Exceeded,액션 연간 예산 초과하는 경우
 apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,주문을 (를) 구매하려면 자료 요청
 DocType: Shopping Cart Settings,Payment Success URL,지불 성공 URL
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +78,Row # {0}: Returned Item {1} does not exists in {2} {3},행 번호 {0} : 반환 항목 {1}에 존재하지 않는 {2} {3}
+apps/erpnext/erpnext/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,은행 계정 조정 계산서
@@ -1418,40 +1434,39 @@
 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/stock/doctype/stock_entry/stock_entry.py +339,Not allowed to tranfer more {0} than {1} against Purchase Order {2},더 tranfer 할 수 없습니다 {0}보다 {1} 구매 주문에 대한 {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +344,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 +545,Manufacturing Quantity is mandatory,제조 수량이 필수입니다
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,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 +71,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 +162,Row {0}: From Time and To Time of {1} is overlapping with {2},행 {0}의 시간과 시간에서 {1}과 중첩된다 {2}
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +186,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,재고 부채
 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 +130,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 +137,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,기타 보고서
 DocType: Dependent Task,Dependent Task,종속 작업
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,하십시오&gt; 인적 자원에 HR 설정을 시스템 이름 지정 설치 직원
 apps/erpnext/erpnext/stock/doctype/item/item.py +411,Conversion factor for default Unit of Measure must be 1 in row {0},측정의 기본 단위에 대한 변환 계수는 행에 반드시 1이 {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,Leave of type {0} cannot be longer than {1},유형의 휴가는 {0}을 넘을 수 없습니다 {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +197,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 +921,Search Item,검색 항목
+apps/erpnext/erpnext/accounts/page/pos/pos.js +910,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 +546,Already completed,이미 완료
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +22,Payment Request already exists {0},지불 요청이 이미 존재 {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +550,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 +241,Quantity must not be more than {0},수량 이하이어야한다 {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Quantity must not be more than {0},수량 이하이어야한다 {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +76,Previous Financial Year is not closed,이전 회계 연도가 종료되지 않습니다
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +44,Age (Days),나이 (일)
 DocType: Quotation Item,Quotation Item,견적 상품
@@ -1468,7 +1483,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +221,Purchase Receipt {0} is not submitted,구입 영수증 {0} 제출되지
 DocType: Company,Default Payable Account,기본 지불 계정
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","이러한 운송 규칙, 가격 목록 등 온라인 쇼핑 카트에 대한 설정"
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +83,{0}% Billed,{0} % 청구
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0} % 청구
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,예약 수량
 DocType: Party Account,Party Account,당 계정
 apps/erpnext/erpnext/config/setup.py +116,Human Resources,인적 자원
@@ -1480,12 +1495,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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 +22,Collect,수집
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,수집
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,Against Supplier Invoice {0} dated {1},공급 업체 청구서를 {0} 일자 {1}
 DocType: Customer,Default Price List,기본 가격리스트
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +225,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: Payment Reconciliation,Payments,지불
 DocType: Journal Entry,Entry Type,항목 유형
 ,Customer Credit Balance,고객 신용 잔액
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Payable,외상 매입금의 순 변화
@@ -1497,7 +1511,7 @@
 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 +9,Procurement,획득
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,항목 중에 양 또는 값의 변화가 없다.
+apps/erpnext/erpnext/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,보증 청구
 ,Lead Details,리드 세부 사항
 DocType: Purchase Invoice,End date of current invoice's period,현재 송장의 기간의 종료 날짜
@@ -1522,7 +1536,7 @@
 DocType: Purchase Invoice,Additional Discount,추가 할인
 DocType: Selling Settings,Selling Settings,판매 설정
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,온라인 경매
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +97,Please specify either Quantity or Valuation Rate or both,수량이나 평가 비율 또는 둘 중 하나를 지정하십시오
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,수량이나 평가 비율 또는 둘 중 하나를 지정하십시오
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +13,Fulfillment,이행
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","회사, 월, 회계 연도는 필수입니다"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,마케팅 비용
@@ -1543,14 +1557,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,ERPNext 설치가 완료!
 DocType: Item,Weightage,Weightage
 DocType: Packing Slip,PS-,추신-
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +93,A Customer Group exists with same name please change the Customer name or rename the Customer Group,고객 그룹이 동일한 이름으로 존재하는 것은 고객의 이름을 변경하거나 고객 그룹의 이름을 바꾸십시오
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +126,A Customer Group exists with same name please change the Customer name or rename the Customer Group,고객 그룹이 동일한 이름으로 존재하는 것은 고객의 이름을 변경하거나 고객 그룹의 이름을 바꾸십시오
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,새 연락처
 DocType: Territory,Parent Territory,상위 지역
 DocType: Quality Inspection Reading,Reading 2,2 읽기
 DocType: Stock Entry,Material Receipt,소재 영수증
 DocType: Homepage,Products,제품
 DocType: Announcement,Instructor,강사
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},파티 형 파티는 채권 / 채무 계정이 필요합니다 {0}
 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,다음 접촉
@@ -1561,7 +1574,7 @@
 ,Item-wise Sales Register,상품이 많다는 판매 등록
 DocType: Asset,Gross Purchase Amount,총 구매 금액
 DocType: Asset,Depreciation Method,감가 상각 방법
-apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Offline,오프라인
+apps/erpnext/erpnext/accounts/page/pos/pos.js +686,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,필수
@@ -1579,25 +1592,27 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +425,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 +858,Make Purchase Order,확인 구매 주문
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +852,Make Purchase Order,확인 구매 주문
 DocType: SMS Center,Send To,보내기
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,There is not enough leave balance for Leave Type {0},허가 유형에 대한 충분한 휴가 밸런스가 없습니다 {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,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 +172,Work-in-Progress Warehouse is required before Submit,작업중인 창고는 제출하기 전에 필요
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,Work-in-Progress Warehouse is required before Submit,작업중인 창고는 제출하기 전에 필요
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,작업을 위해 신청자.
 DocType: Purchase Order Item,Warehouse and Reference,창고 및 참조
 DocType: Supplier,Statutory info and other general information about your Supplier,법정 정보 및 공급 업체에 대한 다른 일반적인 정보
-apps/erpnext/erpnext/hooks.py +88,Addresses,주소
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,공급 업체&gt; 공급 업체 유형
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +212,Against Journal Entry {0} does not have any unmatched {1} entry,저널에 대하여 항목 {0} 어떤 타의 추종을 불허 {1} 항목이없는
+apps/erpnext/erpnext/hooks.py +95,Addresses,주소
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +215,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,상품 또는웨어 하우스를 기반으로 필터를 설정하십시오
 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,제공 및 법안
@@ -1605,11 +1620,10 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} must be submitted,BOM은 {0} 제출해야합니다
 DocType: Authorization Control,Authorization Control,권한 제어
 apps/erpnext/erpnext/controllers/buying_controller.py +300,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},행 번호 {0} : 창고 거부 거부 항목에 대해 필수입니다 {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +731,Payment,지불
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,Payment,지불
 DocType: Production Order Operation,Actual Time and Cost,실제 시간과 비용
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},최대의 자료 요청은 {0} 항목에 대한 {1}에 대해 수행 할 수있는 판매 주문 {2}
 DocType: Employee,Salutation,인사말
-DocType: Pricing Rule,Brand,상표
 DocType: Course,Course Abbreviation,코스 약어
 DocType: Item,Will also apply for variants,또한 변형 적용됩니다
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +142,"Asset cannot be cancelled, as it is already {0}",이미 같이 자산은 취소 할 수 없습니다 {0}
@@ -1621,7 +1635,7 @@
 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.","귀하의 제품이나 제품을 구매하거나 판매하는 서비스를 나열합니다.당신이 시작할 때 항목 그룹, 측정 및 기타 속성의 단위를 확인해야합니다."
 DocType: Hub Settings,Hub Node,허브 노드
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,중복 항목을 입력했습니다.조정하고 다시 시도하십시오.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Associate,준
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,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,수신기 목록 만들기
@@ -1629,7 +1643,7 @@
 DocType: Production Planning Tool,Material Requests,자료 요청
 DocType: Warranty Claim,Issue Date,발행일
 DocType: Activity Cost,Activity Cost,활동 비용
-DocType: Timesheet Detail,Timesheet Detail,작업 표 세부 정보
+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),패키지이 배달의 일부임을 나타냅니다 (만 안)
@@ -1652,6 +1666,7 @@
 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,변형을 가지고
 DocType: Monthly Distribution,Name of the Monthly Distribution,월별 분포의 이름
 DocType: Sales Person,Parent Sales Person,부모 판매 사람
@@ -1664,31 +1679,32 @@
 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 +44,"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/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.,당신이 판매 송장을 저장 한 단어에서 볼 수 있습니다.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +502,Error: {0} &gt; {1},오류 : {0}&gt; {1}
 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.,계약 기간의 시작 날짜는 용어가 연결되는 학술 올해의 올해의 시작 날짜보다 이전이 될 수 없습니다 (학년 {}). 날짜를 수정하고 다시 시도하십시오.
 DocType: Naming Series,Current Value,현재 값
-apps/erpnext/erpnext/controllers/accounts_controller.py +235,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,여러 회계 연도 날짜 {0} 존재한다. 회계 연도에 회사를 설정하세요
+apps/erpnext/erpnext/controllers/accounts_controller.py +238,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 +458,Item table can not be blank,항목 테이블은 비워 둘 수 없습니다
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +443,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 +5,This is based on stock movement. See {0} for details,이는 재고의 움직임을 기반으로합니다. 참조 {0} 자세한 내용은
 DocType: Pricing Rule,Selling,판매
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +341,Amount {0} {1} deducted against {2},금액은 {0} {1}에 대해 공제 {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +344,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,기한 날짜를 게시하기 전에 할 수 없습니다
@@ -1703,8 +1719,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +144,Cannot refer row number greater than or equal to current row number for this Charge type,이 충전 유형에 대한보다 크거나 현재의 행의 수와 동일한 행 번호를 참조 할 수 없습니다
 DocType: Asset,Sold,판매
 ,Item-wise Purchase History,상품 현명한 구입 내역
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Red,빨간
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},시리얼 번호는 항목에 대한 추가 가져 오기 위해 '생성 일정'을 클릭하십시오 {0}
+apps/erpnext/erpnext/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,오픈 생산 주문
 DocType: Sales Invoice Payment,Base Amount (Company Currency),자료의 양 (회사 통화)
@@ -1712,7 +1728,7 @@
 DocType: Installation Note,Installation Time,설치 시간
 DocType: Sales Invoice,Accounting Details,회계 세부 사항
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,이 회사의 모든 거래를 삭제
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +187,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,행 번호 {0} : 작업 {1} 생산에서 완제품 {2} 수량에 대한 완료되지 않은 주문 # {3}.시간 로그를 통해 동작 상태를 업데이트하세요
+apps/erpnext/erpnext/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}.시간 로그를 통해 동작 상태를 업데이트하세요
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,투자
 DocType: Issue,Resolution Details,해상도 세부 사항
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,할당
@@ -1748,16 +1764,17 @@
 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}
 DocType: Delivery Note,Excise Page Number,소비세의 페이지 번호
 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}
 ,Maintenance Schedules,관리 스케줄
 DocType: Task,Actual End Date (via Time Sheet),실제 종료 날짜 (시간 시트를 통해)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Amount {0} {1} against {2} {3},양 {0} {1}에 대한 {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +339,Amount {0} {1} against {2} {3},양 {0} {1}에 대한 {2} {3}
 ,Quotation Trends,견적 동향
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},항목에 대한 항목을 마스터에 언급되지 않은 항목 그룹 {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +295,Debit To account must be a Receivable account,차변계정은 채권 계정이어야합니다
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Receivable account,차변계정은 채권 계정이어야합니다
 DocType: Shipping Rule Condition,Shipping Amount,배송 금액
 ,Pending Amount,대기중인 금액
 DocType: Purchase Invoice Item,Conversion Factor,변환 계수
@@ -1765,10 +1782,10 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +137,Expected value after useful life must be greater than or equal to {0},연수 후 예상 값보다 크거나 같아야합니다 {0}
 DocType: Purchase Receipt,Vehicle Number,차량 번호
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,반복 송장이 중단 될 일자
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +90,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,총 할당 된 잎 {0} 작을 수 없습니다 기간 동안 이미 승인 된 잎 {1}보다
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +93,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 +22,Enter Paid Amount,유료 금액을 입력
+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
@@ -1778,13 +1795,15 @@
 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 +524,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",행 번호 {0} 항목이 고정 자산이기 때문에 수량은 1이어야합니다. 여러 수량에 대해 별도의 행을 사용하십시오.
+apps/erpnext/erpnext/controllers/accounts_controller.py +527,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",행 번호 {0} 항목이 고정 자산이기 때문에 수량은 1이어야합니다. 여러 수량에 대해 별도의 행을 사용하십시오.
 DocType: Leave Block List Allow,Leave Block List Allow,차단 목록은 허용 남겨
 apps/erpnext/erpnext/setup/doctype/company/company.py +249,Abbr can not be blank or space,약어는 비워둘수 없습니다
 apps/erpnext/erpnext/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/stock/get_item_details.py +123,Please specify Company,회사를 지정하십시오
 ,Customer Acquisition and Loyalty,고객 확보 및 충성도
@@ -1795,17 +1814,19 @@
 apps/erpnext/erpnext/projects/doctype/task/task.js +26,Expense Claims,비용 청구
 DocType: Issue,Support,기술 지원
 ,BOM Search,BOM 검색
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Closing (Opening + Totals),닫기 (+ 합계 열기)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),닫기 (+ 합계 열기)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,회사에 통화를 지정하십시오
 DocType: Workstation,Wages per hour,시간당 임금
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +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/controllers/accounts_controller.py +272,Account {0} is invalid. Account Currency must be {1},계정 {0} 유효하지 않습니다. 계정 통화가 있어야합니다 {1}
+DocType: Email Digest,Pending Sales Orders,판매 주문을 보류
+apps/erpnext/erpnext/controllers/accounts_controller.py +275,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 +956,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","행 번호 {0} 참조 문서 형식은 판매 주문 중 하나, 판매 송장 또는 분개해야합니다"
-DocType: Salary Slip,Deduction,공제
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +87,Row {0}: From Time and To Time is mandatory.,행 {0} : 시간에서와 시간은 필수입니다.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +969,"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 +111,Row {0}: From Time and To Time is mandatory.,행 {0} : 시간에서와 시간은 필수입니다.
+DocType: Stock Reconciliation Item,Amount Difference,금액 차이
 apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},상품 가격은 추가 {0} 가격 목록에서 {1}
 DocType: Address Template,Address Template,주소 템플릿
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +7,Please enter Employee Id of this sales person,이 영업 사원의 직원 ID를 입력하십시오
@@ -1813,7 +1834,7 @@
 DocType: Project,% Tasks Completed,% 작업 완료
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,차이 금액이 0이어야합니다
 DocType: Project,Gross Margin,매출 총 이익률
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +194,Please enter Production Item first,첫 번째 생산 품목을 입력하십시오
+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,사용하지 않는 사용자
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,인용
@@ -1822,53 +1843,54 @@
 DocType: Maintenance Visit,Maintenance User,유지 보수 사용자
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +149,Cost Updated,비용 업데이트
 DocType: Employee,Date of Birth,생일
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +86,Item {0} has already been returned,항목 {0}이 (가) 이미 반환 된
+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: 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 +177,Job Description,작업 설명
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,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 +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","를 제외한 특수 문자 ""-"" ""."", ""#"", 그리고 ""/""시리즈 이름에 사용할 수 없습니다"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","를 제외한 특수 문자 ""-"" ""."", ""#"", 그리고 ""/""시리즈 이름에 사용할 수 없습니다"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","판매 캠페인을 추적.리드, 인용문을 추적, 판매 주문 등 캠페인에서 투자 수익을 측정합니다."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +24,Welcome to POS: Create your POS Profile,POS에 오신 것을 환영합니다 : 당신의 POS 프로필 만들기
 DocType: Expense Claim,Approver,승인자
 ,SO Qty,SO 수량
+DocType: Guardian,Work Address,직장 주소
 DocType: Appraisal,Calculate Total Score,총 점수를 계산
 DocType: Request for Quotation,Manufacturing Manager,제조 관리자
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},일련 번호는 {0}까지 보증 {1}
+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 +74,Shipments,선적
+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 +153,Row # ,행 #
+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 +156,Get From,에서 가져 오기
+apps/erpnext/erpnext/public/js/utils.js +167,Get From,에서 가져 오기
 DocType: C-Form,Quarter,지구
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Miscellaneous Expenses,기타 비용
 DocType: Global Defaults,Default Company,기본 회사
 apps/erpnext/erpnext/controllers/stock_controller.py +167,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,비용이나 차이 계정은 필수 항목에 대한 {0}에 영향을 미치기 전체 재고 가치로
-apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings",행의 항목 {0}에 대한 청구 되요 수 없습니다 {1}보다 {2}.과다 청구가 재고 설정에서 설정하시기 바랍니다 허용하려면
+apps/erpnext/erpnext/controllers/accounts_controller.py +419,"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,-위
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} is disabled,{0} 사용자가 비활성화되어 있습니다
 DocType: Leave Application,Total Leave Days,총 허가 일
 DocType: Email Digest,Note: Email will not be sent to disabled users,참고 : 전자 메일을 사용할 사용자에게 전송되지 않습니다
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,회사를 선택 ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,모든 부서가 있다고 간주 될 경우 비워 둡니다
 apps/erpnext/erpnext/config/hr.py +171,"Types of employment (permanent, contract, intern etc.).","고용 (영구, 계약, 인턴 등)의 종류."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +346,{0} is mandatory for Item {1},{0} 항목에 대한 필수입니다 {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,{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","이어야 한 행에 할당 된 금액, 송장 유형 및 송장 번호를 선택하세요"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,새로운 구매 비용
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},상품에 필요한 판매 주문 {0}
 DocType: Purchase Invoice Item,Rate (Company Currency),속도 (회사 통화)
-apps/erpnext/erpnext/demo/setup_data.py +360,Others,기타사항
+DocType: Student Guardian,Others,기타사항
 DocType: Payment Entry,Unallocated Amount,할당되지 않은 금액
 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,세금과 요금
@@ -1888,17 +1910,16 @@
 apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,직렬화 된 재고
 DocType: Activity Type,Default Billing Rate,기본 결제 요금
 DocType: Sales Invoice,Total Billing Amount,총 결제 금액
-apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +54,Receivable Account,채권 계정
-apps/erpnext/erpnext/controllers/accounts_controller.py +546,Row #{0}: Asset {1} is already {2},행 번호 {0} 자산이 {1} 이미 {2}
+apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,채권 계정
+apps/erpnext/erpnext/controllers/accounts_controller.py +549,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 +79,CEO,최고 경영자
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,최고 경영자
 DocType: Expense Claim Detail,Expense Claim Detail,비용 청구 상세 정보
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +808,Please select correct account,올바른 계정을 선택하세요
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +809,Please select correct account,올바른 계정을 선택하세요
 DocType: Item,Weight UOM,무게 UOM
 DocType: Salary Structure Employee,Salary Structure Employee,급여 구조의 직원
 DocType: Employee,Blood Group,혈액 그룹
-DocType: Purchase Invoice Item,Page Break,페이지 나누기
 DocType: Production Order Operation,Pending,대기 중
 DocType: Course,Course Name,코스 명
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,특정 직원의 휴가 응용 프로그램을 승인 할 수 있습니다 사용자
@@ -1907,14 +1928,15 @@
 DocType: Fiscal Year,Companies,회사
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,전자 공학
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,재고가 다시 주문 수준에 도달 할 때 자료 요청을 올립니다
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Full-time,전 시간
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,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: 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,총 수신 값
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Debit To is required,직불 카드에 대한이 필요합니다
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +321,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,품질 관리자
@@ -1922,6 +1944,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/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 사의
@@ -1932,18 +1955,17 @@
 DocType: Production Order Operation,Completed Qty,완료 수량
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"For {0}, only debit accounts can be linked against another credit entry",{0} 만 직불 계정은 다른 신용 항목에 링크 할 수 있습니다 들어
 apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,가격 목록 {0} 비활성화
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +99,Row {0}: Completed Qty cannot be more than {1} for operation {2},행 {0} : 완성 된 수량보다 더 많은 수 없습니다 {1} 조작 {2}
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +123,Row {0}: Completed Qty cannot be more than {1} for operation {2},행 {0} : 완성 된 수량보다 더 많은 수 없습니다 {1} 조작 {2}
 DocType: Manufacturing Settings,Allow Overtime,초과 근무 허용
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} 항목에 필요한 일련 번호 {1}. 당신이 제공 한 {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,현재 평가 비율
 DocType: Item,Customer Item Codes,고객 상품 코드
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,교환 이득 / 손실
 DocType: Opportunity,Lost Reason,분실 된 이유
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,설정이 번호 시리즈&gt; 설정을 통해 출석을 위해 일련 번호하세요
 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/purchase_receipt/purchase_receipt.py +378,All items have already been invoiced,모든 상품은 이미 청구 된
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +379,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,외부
@@ -1959,18 +1981,19 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,고객
 apps/erpnext/erpnext/projects/doctype/project/project.py +141,You have been invited to collaborate on the project: {0},당신은 프로젝트 공동 작업에 초대되었습니다 : {0}
 DocType: Leave Block List Date,Block Date,블록 날짜
-apps/erpnext/erpnext/templates/generators/job_opening.html +19,Apply Now,지금 적용
+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.","만들고, 매일, 매주 및 매월 이메일 다이제스트를 관리 할 수 있습니다."
 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,건물
-apps/erpnext/erpnext/utilities/doctype/address/address.py +164,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,디폴트 주소 템플릿을 찾을 수 없습니다. 설정&gt; 인쇄 및 브랜딩&gt; 주소 템플릿에서 새 일을 만드십시오.
 DocType: Fee Structure,Fee Structure,요금 구조
 DocType: Timesheet Detail,Costing Amount,원가 계산 금액
+DocType: Student Admission,Application Fee,신청비
 DocType: Process Payroll,Submit Salary Slip,급여 슬립 제출
-apps/erpnext/erpnext/controllers/selling_controller.py +161,Maxiumm discount for Item {0} is {1}%,항목에 대한 Maxiumm 할인은 {0} {1} %에게 is
+apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,항목에 대한 Maxiumm 할인은 {0} {1} %에게 is
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,대량 수입
 DocType: Sales Partner,Address & Contacts,주소 및 연락처
 DocType: SMS Log,Sender Name,보낸 사람 이름
@@ -1995,21 +2018,21 @@
 DocType: Serial No,Delivery Time,배달 시간
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,을 바탕으로 고령화
 DocType: Item,End of Life,수명 종료
-apps/erpnext/erpnext/demo/setup_data.py +361,Travel,여행
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +155,No active or default Salary Structure found for employee {0} for the given dates,지정된 날짜에 대해 직원 {0}에 대한 검색 활성 또는 기본 급여 구조 없다
+apps/erpnext/erpnext/demo/setup/setup_data.py +304,Travel,여행
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +167,No active or default Salary Structure found for employee {0} for the given dates,지정된 날짜에 대해 직원 {0}에 대한 검색 활성 또는 기본 급여 구조 없다
 DocType: Leave Block List,Allow Users,사용자에게 허용
 DocType: Purchase Order,Customer Mobile No,고객 모바일 없음
 DocType: Sales Invoice,Recurring,반복
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,별도의 소득을 추적하고 제품 수직 또는 부서에 대한 비용.
 DocType: Rename Tool,Rename Tool,이름바꾸기 툴
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +23,Update Cost,업데이트 비용
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,업데이트 비용
 DocType: Item Reorder,Item Reorder,항목 순서 바꾸기
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +36,Show Salary Slip,쇼 급여 슬립
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +748,Transfer Material,전송 자료
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +53,Show Salary Slip,쇼 급여 슬립
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +166,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 +923,Please set recurring after saving,저장 한 후 반복 설정하십시오
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +646,Select change amount account,선택 변화량 계정
+apps/erpnext/erpnext/public/js/controllers/transaction.js +914,Please set recurring after saving,저장 한 후 반복 설정하십시오
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +703,Select change amount account,선택 변화량 계정
 DocType: Purchase Invoice,Price List Currency,가격리스트 통화
 DocType: Naming Series,User must always select,사용자는 항상 선택해야합니다
 DocType: Stock Settings,Allow Negative Stock,음의 재고 허용
@@ -2021,31 +2044,32 @@
 DocType: Quality Inspection,Verified By,에 의해 확인
 DocType: Address,Subsidiary,자회사
 apps/erpnext/erpnext/setup/doctype/company/company.py +64,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","기존의 트랜잭션이 있기 때문에, 회사의 기본 통화를 변경할 수 없습니다.거래 기본 통화를 변경하려면 취소해야합니다."
+DocType: Grade Interval,Grade Description,등급 설명
 DocType: Quality Inspection,Purchase Receipt No,구입 영수증 없음
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,계약금
 DocType: Process Payroll,Create Salary Slip,급여 슬립을 만듭니다
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +33,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 +352,Quantity in row {0} ({1}) must be same as manufactured quantity {2},수량은 행에서 {0} ({1})와 동일해야합니다 제조 수량 {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Quantity in row {0} ({1}) must be same as manufactured quantity {2},수량은 행에서 {0} ({1})와 동일해야합니다 제조 수량 {2}
 DocType: Appraisal,Employee,종업원
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,사용자로 초대하기
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} 전액 지불되었습니다.
 DocType: Workstation Working Hour,End Time,종료 시간
 DocType: Payment Entry,Payment Deductions or Loss,지불 공제 또는 손실
-apps/erpnext/erpnext/config/schools.py +100,LMS,LMS
+apps/erpnext/erpnext/config/schools.py +104,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,판매 파이프 라인
 DocType: Student Batch Student,Student Batch Student,학생 일괄 학생
-DocType: Sales Invoice,Mass Mailing,대량 메일 링
+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 +199,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/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 +297,Salary Slip of employee {0} already created for this period,직원의 급여 슬립은 {0} 이미이 기간 동안 생성
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Pharmaceutical,제약
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +309,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/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,신용에
@@ -2060,27 +2084,28 @@
 DocType: Upload Attendance,Attendance To Date,날짜 출석
 DocType: Warranty Claim,Raised By,에 의해 제기
 DocType: Payment Gateway Account,Payment Account,결제 계정
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +814,Please specify Company to proceed,진행하는 회사를 지정하십시오
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +793,Please specify Company to proceed,진행하는 회사를 지정하십시오
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Receivable,채권에 순 변경
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Compensatory Off,보상 오프
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,보상 오프
 DocType: Quality Inspection Reading,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.,당신이 정말로이 회사에 대한 모든 트랜잭션을 삭제 하시겠습니까 확인하시기 바랍니다. 그대로 마스터 데이터는 유지됩니다. 이 작업은 취소 할 수 없습니다.
 DocType: Room,Room Number,방 번호
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},잘못된 참조 {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +161,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{3}  생산 주문시 {0} ({1}) 수량은 ({2})} 보다 클 수 없습니다.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +162,{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 +217,Raw Materials cannot be blank.,원료는 비워 둘 수 없습니다.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,"Could not update stock, invoice contains drop shipping item.","주식을 업데이트 할 수 없습니다, 송장은 하락 선박 항목이 포함되어 있습니다."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +460,Quick Journal Entry,빠른 분개
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +111,You can not change rate if BOM mentioned agianst any item,BOM 어떤 항목 agianst 언급 한 경우는 속도를 변경할 수 없습니다
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +441,"Could not update stock, invoice contains drop shipping item.","주식을 업데이트 할 수 없습니다, 송장은 하락 선박 항목이 포함되어 있습니다."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Quick Journal Entry,빠른 분개
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +103,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 +214,{0} {1} is not submitted,{0} {1} 제출되지 않았습니다.
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,상품에 대한 요청.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,별도의 생산 순서는 각 완제품 항목에 대해 작성됩니다.
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +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.,연구소의 이름은 당신이 시스템을 설정하고 있습니다.
@@ -2089,16 +2114,17 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,프로젝트 상태
 DocType: UOM,Check this to disallow fractions. (for Nos),분수를 허용하려면이 옵션을 선택합니다. (NOS의 경우)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +398,The following Production Orders were created:,다음 생산 오더가 생성했다 :
+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 +739,Item or Warehouse for row {0} does not match Material Request,행에 대한 항목이나 창고 {0} 물자의 요청과 일치하지 않습니다
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +747,Item or Warehouse for row {0} does not match Material Request,행에 대한 항목이나 창고 {0} 물자의 요청과 일치하지 않습니다
 apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,측정 단위
 DocType: Fiscal Year,Year End Date,연도 종료 날짜
 DocType: Task Depends On,Task Depends On,작업에 따라 다릅니다
-DocType: Lead,Opportunity,기회
+DocType: Supplier Quotation,Opportunity,기회
 ,Completed Production Orders,완료 생산 주문
 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,기본 워크 스테이션
@@ -2111,7 +2137,7 @@
 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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},유지 보수 시작 날짜 일련 번호에 대한 배달 날짜 이전 할 수 없습니다 {0}
+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,실제 종료 날짜
 DocType: Purchase Invoice,PINV-,PINV-
 DocType: Authorization Rule,Applicable To (Role),에 적용 (역할)
@@ -2126,7 +2152,7 @@
 DocType: SMS Log,No of Requested SMS,요청 SMS 없음
 DocType: Campaign,Campaign-.####,캠페인.# # # #
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,다음 단계
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,Please supply the specified items at the best possible rates,최상의 요금으로 지정된 항목을 제공하십시오
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +695,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 +117,Contract End Date must be greater than Date of Joining,계약 종료 날짜는 가입 날짜보다 커야합니다
 DocType: Delivery Note,DN-,DN-
@@ -2135,7 +2161,7 @@
 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 +14,This is an example website auto-generated from ERPNext,이 ERPNext에서 자동으로 생성 예를 들어 웹 사이트입니다
+apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,이 ERPNext에서 자동으로 생성 예를 들어 웹 사이트입니다
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,고령화 범위 1
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
@@ -2182,13 +2208,14 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd 수량
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +54,Fee Records Created - {0},요금 기록 작성 - {0}
 DocType: Asset Category Account,Asset Category Account,자산 분류 계정
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +103,Cannot produce more Item {0} than Sales Order quantity {1},더 많은 항목을 생성 할 수 없습니다 {0}보다 판매 주문 수량 {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Stock Entry {0} is not submitted,재고 항목 {0} 제출되지
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},더 많은 항목을 생성 할 수 없습니다 {0}보다 판매 주문 수량 {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +505,Stock Entry {0} is not submitted,재고 항목 {0} 제출되지
 DocType: Payment Reconciliation,Bank / Cash Account,은행 / 현금 계정
 DocType: Tax Rule,Billing City,결제시
 DocType: Salary Component Account,Salary Component Account,급여 구성 요소 계정
 DocType: Global Defaults,Hide Currency Symbol,통화 기호에게 숨기기
 apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card","예) 은행, 현금, 신용 카드"
+DocType: Lead Source,Source Name,원본 이름
 DocType: Journal Entry,Credit Note,신용 주
 DocType: Warranty Claim,Service Address,서비스 주소
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furnitures and Fixtures,가구 및 비품
@@ -2200,6 +2227,7 @@
 DocType: Opportunity,Customer / Lead Name,고객 / 리드 명
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +89,Clearance Date not mentioned,통관 날짜가 언급되지 않았습니다
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,생산
+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/controllers/trends.py +19,Total(Qty),합계 (수량)
 DocType: Sales Invoice,This Document,이 문서
@@ -2211,15 +2239,15 @@
 DocType: Purchase Receipt,Time at which materials were received,재료가 수신 된 시간입니다
 DocType: Stock Ledger Entry,Outgoing Rate,보내는 속도
 apps/erpnext/erpnext/config/hr.py +176,Organization branch master.,조직 분기의 마스터.
-apps/erpnext/erpnext/controllers/accounts_controller.py +273, or ,또는
+apps/erpnext/erpnext/controllers/accounts_controller.py +276, 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 +203,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,행 번호 {0} 저널 항목 {1} 계정이없는이 {2} 또는 이미 다른 쿠폰에 대해 일치
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +206,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 +90,No employee for the above selected criteria OR salary slip already created,위의 선택 기준 또는 급여 명세서에 대한 어떤 직원이 이미 만들어
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +93,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,지불 유형
@@ -2247,8 +2275,8 @@
 DocType: Product Bundle,Parent Item,상위 항목
 DocType: Account,Account Type,계정 유형
 DocType: Delivery Note,DN-RET-,DN-RET-
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +115,Leave Type {0} cannot be carry-forwarded,{0} 수행-전달할 수 없습니다 유형을 남겨주세요
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',유지 보수 일정은 모든 항목에 대해 생성되지 않습니다.'생성 일정'을 클릭 해주세요
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +118,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 +163,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",행에 대해 {0}에서 {1}. 상품 요금에 {2} 포함하려면 행은 {3}도 포함해야
@@ -2260,13 +2288,13 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +32,Disabled template must not be default template,장애인 템플릿은 기본 템플릿이 아니어야합니다
 DocType: Account,Income Account,수익 계정
 DocType: Payment Request,Amount in customer's currency,고객의 통화 금액
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +748,Delivery,배달
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +742,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,주요 책임 지역
 DocType: Payment Entry,Total Allocated Amount,총 할당 된 금액
 DocType: Item Reorder,Material Request Type,자료 요청 유형
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +82,Row {0}: UOM Conversion Factor is mandatory,행 {0} : UOM 변환 계수는 필수입니다
+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,비용 센터
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,상품권 #
@@ -2277,13 +2305,13 @@
 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 +90,Head of Marketing and Sales,마케팅 및 영업 책임자
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,소득세
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,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 +403,Please enter Item Code to get batch no,더 배치를 얻을 수 상품 코드를 입력하시기 바랍니다
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +770,Please select a value for {0} quotation_to {1},값을 선택하세요 {0} quotation_to {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +397,Please enter Item Code to get batch no,더 배치를 얻을 수 상품 코드를 입력하시기 바랍니다
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +764,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","다음과 같은 속성이 모두 기록에 같은 경우 병합에만 가능합니다. 그룹, 루트 유형, 회사는"
@@ -2295,28 +2323,29 @@
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,재고에
 DocType: Appraisal,HR User,HR 사용자
 DocType: Purchase Invoice,Taxes and Charges Deducted,차감 세금과 요금
-apps/erpnext/erpnext/hooks.py +100,Issues,문제
+apps/erpnext/erpnext/hooks.py +109,Issues,문제
 apps/erpnext/erpnext/controllers/status_updater.py +13,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,거래 후 실제 수량
 ,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} 비활성화
 DocType: Supplier,Billing Currency,결제 통화
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Large,아주 큰
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,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 +507,Warning: Another {0} # {1} exists against stock entry {2},경고 : 또 다른 {0} # {1} 재고 항목에 대해 존재 {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Local,지역정보 검색
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +508,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),대출 및 선수금 (자산)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,외상매출금
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Large,큰
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,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 +225,Total {0} ({1}),총 {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +224,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,기본 평가 방법
@@ -2374,9 +2403,9 @@
 DocType: Attendance,Leave Type,휴가 유형
 apps/erpnext/erpnext/controllers/stock_controller.py +173,Expense / Difference account ({0}) must be a 'Profit or Loss' account,비용 / 차이 계정 ({0})의 이익 또는 손실 '계정이어야합니다
 DocType: Account,Accounts User,회계시용자
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Name error: {0},이름 오류 : {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +90,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 +178,{0} {1} does not associated with {2} {3},{0} {1}과 연관되지 않는 {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +181,{0} {1} does not associated with {2} {3},{0} {1}과 연관되지 않는 {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,직원의 출석 {0}이 (가) 이미 표시되어
 DocType: Packing Slip,If more than one package of the same type (for print),만약 (프린트) 동일한 유형의 하나 이상의 패키지
 DocType: Warehouse,Parent Warehouse,부모 창고
@@ -2395,7 +2424,7 @@
 DocType: BOM Item,Scrap %,스크랩 %
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection","요금은 비례 적으로 사용자의 선택에 따라, 상품 수량 또는 금액에 따라 배포됩니다"
 DocType: Maintenance Visit,Purposes,목적
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,이어야 하나의 항목이 반환 문서에 부정적인 수량 입력해야합니다
+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 +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","작업 {0} 워크 스테이션에서 사용 가능한 근무 시간 이상 {1}, 여러 작업으로 작업을 분해"
 ,Requested,요청
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +83,No Remarks,없음 비고
@@ -2407,46 +2436,46 @@
 DocType: Item,Total Projected Qty,총 예상 수량
 DocType: Monthly Distribution,Distribution Name,배포 이름
 DocType: Course,Course Code,코스 코드
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Quality Inspection required for Item {0},상품에 필요한 품질 검사 {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Quality Inspection required for Item {0},상품에 필요한 품질 검사 {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,고객의 통화는 회사의 기본 통화로 변환하는 속도에
 DocType: Purchase Invoice Item,Net Rate (Company Currency),인터넷 속도 (회사 통화)
 DocType: Salary Detail,Condition and Formula Help,조건 및 수식 도움말
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,지역의 나무를 관리합니다.
 DocType: Journal Entry Account,Sales Invoice,판매 송장
 DocType: Journal Entry Account,Party Balance,파티 밸런스
-apps/erpnext/erpnext/accounts/page/pos/pos.js +475,Please select Apply Discount On,할인에 적용을 선택하세요
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +92,Salary Slip Created,급여 슬립이 만든
+apps/erpnext/erpnext/accounts/page/pos/pos.js +464,Please select Apply Discount On,할인에 적용을 선택하세요
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +95,Salary Slip Created,급여 슬립이 만든
 DocType: Company,Default Receivable Account,기본 채권 계정
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,위의 선택 기준에 대해 지불 한 총 연봉 은행 항목 만들기
 DocType: Stock Entry,Material Transfer for Manufacture,제조에 대한 자료 전송
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,할인 비율은 가격 목록에 대해 또는 전체 가격 목록에 하나를 적용 할 수 있습니다.
 DocType: Purchase Invoice,Half-yearly,반년마다
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +384,Accounting Entry for Stock,재고에 대한 회계 항목
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +387,Accounting Entry for Stock,재고에 대한 회계 항목
 DocType: Sales Invoice,Sales Team1,판매 Team1
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,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 +96,Row {0}: Completed Qty must be greater than zero.,행 {0} : 완성 된 수량은 0보다 커야합니다.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +120,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 +88,Row # {0}: Cannot return more than {1} for Item {2},행 번호 {0} : 이상 반환 할 수 없습니다 {1} 항목에 대한 {2}
+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,줄거리
 DocType: Item Group,Show this slideshow at the top of the page,페이지 상단에이 슬라이드 쇼보기
 DocType: BOM,Item UOM,상품 UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),할인 금액 후 세액 (회사 통화)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +147,Target warehouse is mandatory for row {0},목표웨어 하우스는 행에 대해 필수입니다 {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,선택 공급 업체 주소
 DocType: Quality Inspection,Quality Inspection,품질 검사
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Extra Small,매우 작은
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,Warning: Material Requested Qty is less than Minimum Order Qty,경고 : 수량 요청 된 자료는 최소 주문 수량보다 적은
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +194,Account {0} is frozen,계정 {0} 동결
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,매우 작은
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +690,Warning: Material Requested Qty is less than Minimum Order Qty,경고 : 수량 요청 된 자료는 최소 주문 수량보다 적은
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,계정 {0} 동결
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,조직에 속한 계정의 별도의 차트와 법인 / 자회사.
 DocType: Payment Request,Mute Email,음소거 이메일
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","음식, 음료 및 담배"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +606,Can only make payment against unbilled {0},단지에 대한 지불을 할 수 미 청구 {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +126,Commission rate cannot be greater than 100,수수료율은 100보다 큰 수 없습니다
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +609,Can only make payment against unbilled {0},단지에 대한 지불을 할 수 미 청구 {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,수수료율은 100보다 큰 수 없습니다
 DocType: Stock Entry,Subcontract,하청
 apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,첫 번째 {0}을 입력하세요
 DocType: Production Order Operation,Actual End Time,실제 종료 시간
@@ -2457,30 +2486,30 @@
 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 +158,Colour,컬러
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,컬러
 DocType: Maintenance Visit,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;인 항목을 선택하고 다른 제품 번들이없는하세요
 DocType: Student Log,Academic,학생
-apps/erpnext/erpnext/controllers/accounts_controller.py +469,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),전체 사전 ({0})의 순서에 대하여 {1} 총합계보다 클 수 없습니다 ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +472,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),전체 사전 ({0})의 순서에 대하여 {1} 총합계보다 클 수 없습니다 ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,고르지 개월에 걸쳐 목표를 배포하는 월별 분포를 선택합니다.
 DocType: Purchase Invoice Item,Valuation Rate,평가 평가
+DocType: Stock Reconciliation,SR/,SR /
 apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,가격리스트 통화 선택하지
 DocType: Assessment,Results,결과
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +168,Employee {0} has already applied for {1} between {2} and {3},직원 {0}이 (가) 이미 사이에 {1}를 신청했다 {2}와 {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +175,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: Student Applicant,Father's/ Guardian 2 Email ID,아버지의 / 보호자 2 이메일 ID
 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 +228,Warehouses with existing transaction can not be converted to group.,기존 거래와 창고 그룹으로 변환 할 수 없습니다.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +231,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 +93,Researcher,연구원
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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.,수신 품질 검사.
@@ -2492,25 +2521,25 @@
 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: Sales Invoice,Advertisement,광고
 DocType: Asset Category Account,Depreciation Expense Account,감가 상각 비용 계정
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Probationary Period,수습 기간
-apps/erpnext/erpnext/hooks.py +102,Announcements,공지 사항
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,수습 기간
+apps/erpnext/erpnext/hooks.py +111,Announcements,공지 사항
 DocType: Customer Group,Only leaf nodes are allowed in transaction,만 잎 노드는 트랜잭션에 허용
 DocType: Expense Claim,Expense Approver,지출 승인
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +109,Row {0}: Advance against Customer must be credit,행 {0} : 고객에 대한 사전 신용해야합니다
 apps/erpnext/erpnext/accounts/doctype/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 +16,To Datetime,날짜 시간에
+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/scheduling_tool/scheduling_tool.py +51,Course Schedules deleted:,코스 스케줄 삭제 :
 apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,SMS 전달 상태를 유지하기위한 로그
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,보류 활동
+DocType: Accounts Settings,Make Payment via Journal Entry,분개를 통해 결제하기
+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 +127,Please enter relieving date.,날짜를 덜어 입력 해 주시기 바랍니다.
-apps/erpnext/erpnext/controllers/trends.py +145,Amt,AMT
+apps/erpnext/erpnext/controllers/trends.py +149,Amt,AMT
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,Only Leave Applications with status 'Approved' can be submitted,휴가신청은  '승인'상태로 제출 될 수있다
 apps/erpnext/erpnext/utilities/doctype/address/address.py +26,Address Title is mandatory.,주소 제목은 필수입니다.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,메시지의 소스 캠페인 경우 캠페인의 이름을 입력
@@ -2528,14 +2557,15 @@
 apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1},{0}에 대한 환율을 찾을 수 없습니다 {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,마크 반나절
 DocType: Sales Invoice,Sales Team,판매 팀
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Duplicate entry,항목을 중복
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,항목을 중복
 DocType: Program Enrollment Tool,Get Students,학생들 가져 오기
 DocType: Serial No,Under Warranty,보증에 따른
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +490,[Error],[오류]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +484,[Error],[오류]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,당신이 판매 주문을 저장하면 단어에서 볼 수 있습니다.
 ,Employee Birthday,직원 생일
 apps/erpnext/erpnext/controllers/status_updater.py +175,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} 이미 존재합니다. 이 항목을 수정하고 다시 시도하십시오.
 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}이 (가) 없습니다
@@ -2551,22 +2581,22 @@
 ,Issued Items Against Production Order,생산 오더에 대해 실행 항목
 DocType: Pricing Rule,Purchase Manager,구매 관리자
 DocType: Target Detail,Target Detail,세부 목표
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +25,All Jobs,모든 작업
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,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 +323,Amount {0} {1} {2} {3},양 {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,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: Supplier,Credit Limit,신용 한도
 DocType: Production Plan Sales Order,Salse Order Date,Salse 주문 날짜
 DocType: Salary Component,Salary Component,급여 구성 요소
-apps/erpnext/erpnext/accounts/utils.py +372,Payment Entries {0} are un-linked,결제 항목은 {0}-않은 링크입니다
+apps/erpnext/erpnext/accounts/utils.py +449,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 +497,Material Requests {0} created,자료 요청 {0} 생성
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +498,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.,조건 또는 계약의 템플릿.
 DocType: Purchase Invoice,Address and Contact,주소와 연락처
@@ -2605,7 +2635,7 @@
 DocType: Serial No,Warranty / AMC Details,보증 / AMC의 자세한 사항
 DocType: Journal Entry,User Remark,사용자 비고
 DocType: Lead,Market Segment,시장 세분
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +848,Paid Amount cannot be greater than total negative outstanding amount {0},지불 금액은 총 음의 뛰어난 금액보다 클 수 없습니다 {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +859,Paid Amount cannot be greater than total negative outstanding amount {0},지불 금액은 총 음의 뛰어난 금액보다 클 수 없습니다 {0}
 DocType: Employee Internal Work History,Employee Internal Work History,직원 내부 작업 기록
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +233,Closing (Dr),결산 (박사)
 DocType: Cheque Print Template,Cheque Size,수표 크기
@@ -2626,7 +2656,8 @@
 ,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 +555,'Update Stock' cannot be checked for fixed asset sale,&#39;업데이트 증권은&#39;고정 자산의 판매 확인할 수 없습니다
+DocType: Student Guardian,Father,아버지
+apps/erpnext/erpnext/controllers/accounts_controller.py +558,'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} 취소 또는 정지
@@ -2636,15 +2667,15 @@
 DocType: Sales Order,Fully Delivered,완전 배달
 DocType: Lead,Lower Income,낮은 소득
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","이익 / 손실은 기장 할 수있는 부채 계정 헤드,"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +166,Source and target warehouse cannot be same for row {0},소스와 목표웨어 하우스는 행에 대해 동일 할 수 없습니다 {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","콘텐츠 화해는 열기 항목이기 때문에 차이 계정, 자산 / 부채 형 계정이어야합니다"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +81,Purchase Order number required for Item {0},구매 주문 번호 항목에 필요한 {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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/purchase_receipt/purchase_receipt.py +82,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 +17,Cannot change status as student {0} is linked with student application {1},학생으로 상태를 변경할 수 없습니다 {0} 학생 응용 프로그램과 연결되어 {1}
+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: Timesheet,"List of employee which has ""Salary Slip Based on Timesheet"" is enabled in salary structure.",&quot;표를 바탕으로 급여 슬립&quot;가 직원의 목록 급여 구조로 사용할 수 있습니다.
 DocType: Asset,Fully Depreciated,완전 상각
 ,Stock Projected Qty,재고 수량을 예상
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Customer {0} does not belong to project {1},고객 {0} 프로젝트에 속하지 않는 {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,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,일련 번호 및 배치
@@ -2656,7 +2687,7 @@
 DocType: Purchase Invoice,Purchase Taxes and Charges,구매 세금과 요금
 ,Qty to Receive,받도록 수량
 DocType: Leave Block List,Leave Block List Allowed,차단 목록은 허용 남겨
-apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +55,All Warehouses,모든 창고
+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 +105,Credit To account must be a Balance Sheet account,계정에 신용은 대차 대조표 계정이어야합니다
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,모든 공급 유형
@@ -2668,10 +2699,10 @@
 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/manufacturing/doctype/bom/bom.js +26,Browse BOM,찾아 BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,찾아 BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,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 Year,Academic Year,학년
+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
 DocType: Appraisal,Appraisal,펑가
@@ -2679,12 +2710,12 @@
 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 +197,Leave approver must be one of {0},남겨 승인 중 하나 여야합니다 {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,Leave approver must be one of {0},남겨 승인 중 하나 여야합니다 {0}
 DocType: Hub Settings,Seller Email,판매자 이메일
 DocType: Project,Total Purchase Cost (via Purchase Invoice),총 구매 비용 (구매 송장을 통해)
 DocType: Workstation Working Hour,Start Time,시작 시간
 DocType: Item Price,Bulk Import Help,대량 가져 오기 도움말
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +256,Select Quantity,수량 선택
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +257,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,보낸 메시지
@@ -2701,6 +2732,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,목표 수량 또는 목표량 하나는 필수입니다.
 apps/erpnext/erpnext/config/projects.py +45,Cost of various activities,다양한 활동 비용
 apps/erpnext/erpnext/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 +149,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}
 DocType: Item,Inspection Required,검사 필수
@@ -2720,7 +2752,7 @@
 DocType: Expense Claim,Approval Status,승인 상태
 DocType: Hub Settings,Publish Items to Hub,허브에 항목을 게시
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},값에서 행의 값보다 작아야합니다 {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Wire Transfer,송금
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,송금
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,모두 확인
 DocType: Sales Order,Recurring Order,반복 주문
 DocType: Company,Default Income Account,기본 수입 계정
@@ -2732,21 +2764,19 @@
 ,Welcome to ERPNext,ERPNext에 오신 것을 환영합니다
 apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,리드고객에게 견적?
 DocType: Lead,From Customer,고객의
-apps/erpnext/erpnext/demo/setup_data.py +357,Calls,통화
+apps/erpnext/erpnext/demo/setup/setup_data.py +300,Calls,통화
 DocType: Project,Total Costing Amount (via Time Logs),총 원가 계산 금액 (시간 로그를 통해)
 DocType: Purchase Order Item Supplied,Stock UOM,재고 UOM
-apps/erpnext/erpnext/stock/doctype/item/item.py +466,"As there are existing transactions for this item, \
-							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","기존의 트랜잭션이이 값을 변경할 수 없습니다 \이 항목에 대한 있기 때문에 &#39;시리얼 번호를 가지고&#39;, &#39;배치를 가지고 없음&#39;, &#39;재고 상품인가&#39;와 &#39;평가 방법&#39;"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,Purchase Order {0} is not submitted,구매 주문 {0} 제출되지
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,예상
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},일련 번호 {0} 창고에 속하지 않는 {1}
 apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,주 : 시스템이 항목에 대한 납품에 이상 - 예약 확인하지 않습니다 {0} 수량 또는 금액으로 0이됩니다
 DocType: Notification Control,Quotation Message,견적 메시지
 DocType: Issue,Opening Date,Opening 날짜
-apps/erpnext/erpnext/schools/api.py +58,Attendance has been marked successfully.,출석이 성공적으로 표시되었습니다.
+apps/erpnext/erpnext/schools/api.py +57,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 +136,Account Type for {0} must be {1},계정 유형 {0}해야합니다에 대한 {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +139,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,두 창고는 같은 회사에 속해 있어야합니다
@@ -2761,12 +2791,13 @@
 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/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 +20,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 +1190,Please select customer,고객을 선택하세요
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1193,Please select customer,고객을 선택하세요
 DocType: C-Form,I,나는
 DocType: Company,Asset Depreciation Cost Center,자산 감가 상각 비용 센터
 DocType: Sales Order Item,Sales Order Date,판매 주문 날짜
@@ -2776,6 +2807,7 @@
 ,Payment Period Based On Invoice Date,송장의 날짜를 기준으로 납부 기간
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},대한 누락 된 통화 환율 {0}
 DocType: Assessment,Examiner,시험관
+DocType: Student,Siblings,동기
 DocType: Journal Entry,Stock Entry,재고 항목
 DocType: Payment Entry,Payment References,지불 참조
 DocType: C-Form,C-FORM-,C-서식 -
@@ -2793,11 +2825,12 @@
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,항목 이름
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,판매 또는 구매의이어야 하나를 선택해야합니다
+DocType: Grading Structure,Grade Intervals,학년 간격
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,비즈니스의 성격을 선택합니다.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,제조 작업은 어디를 수행한다.
 DocType: Asset Movement,Source Warehouse,자료 창고
 DocType: Installation Note,Installation Date,설치 날짜
-apps/erpnext/erpnext/controllers/accounts_controller.py +534,Row #{0}: Asset {1} does not belong to company {2},행 번호 {0} 자산이 {1} 회사에 속하지 않는 {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +537,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,판매 사용자
@@ -2811,28 +2844,31 @@
 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 +111,Date Of Retirement must be greater than Date of Joining,은퇴 날짜 가입 날짜보다 커야합니다
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +49,There were errors while scheduling course on :,에 코스를 예약하는 동안 오류가 발생했습니다 :
 DocType: Sales Invoice,Against Income Account,손익 계정에 대한
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +87,{0}% Delivered,{0} % 배달
+apps/erpnext/erpnext/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 +379,Please set default {0} in Company {1},회사의 기본 {0}을 설정하십시오 {1}
+apps/erpnext/erpnext/accounts/utils.py +456,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,총 이익 / 손실
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,구매 주문 상품 공급
 apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,회사 이름은 회사가 될 수 없습니다
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,인쇄 템플릿에 대한 편지 머리.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,인쇄 템플릿의 제목은 형식 상 청구서를 예.
+DocType: Student Guardian,Student Guardian,가디언
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +184,Valuation type charges can not marked as Inclusive,평가 유형 요금은 포괄적으로 표시 할 수 없습니다
 DocType: POS Profile,Update Stock,재고 업데이트
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,항목에 대해 서로 다른 UOM가 잘못 (총) 순 중량 값으로 이어질 것입니다.각 항목의 순 중량이 동일한 UOM에 있는지 확인하십시오.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM 평가
 DocType: Asset,Journal Entry for Scrap,스크랩에 대한 분개
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,배달 주에서 항목을 뽑아주세요
-apps/erpnext/erpnext/accounts/utils.py +349,Journal Entries {0} are un-linked,저널 항목은 {0}-않은 링크 된
+apps/erpnext/erpnext/accounts/utils.py +426,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,회사에 라운드 오프 비용 센터를 언급 해주십시오
@@ -2856,6 +2892,7 @@
 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,커뮤니티 포럼
+DocType: Homepage,"URL for ""All Products""",&quot;모든 제품&quot;에 대한 URL
 DocType: Leave Application,Leave Balance Before Application,응용 프로그램의 앞에 균형을 남겨주세요
 DocType: SMS Center,Send SMS,SMS 보내기
 DocType: Cheque Print Template,Width of amount in word,단어 양의 폭
@@ -2864,7 +2901,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 +29,Current Job Openings,현재 채용
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,Current Job Openings,현재 채용
 DocType: Company,Stock Adjustment Account,재고 조정 계정
 DocType: Journal Entry,Write Off,탕치다
 DocType: Timesheet Detail,Operation ID,작업 ID
@@ -2877,7 +2914,7 @@
 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 +850,Show tax break-up,쇼 세금 해체
+apps/erpnext/erpnext/public/js/controllers/transaction.js +841,Show tax break-up,쇼 세금 해체
 apps/erpnext/erpnext/accounts/party.py +308,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} 창고에 존재"
@@ -2887,10 +2924,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 +534,Please select Posting Date before selecting Party,파티를 선택하기 전에 게시 날짜를 선택하세요
 DocType: Serial No,Out of AMC,AMC의 아웃
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +80,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 +162,Please contact to the user who have Sales Master Manager {0} role,판매 마스터 관리자 {0} 역할이 사용자에게 문의하시기 바랍니다
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +195,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 +5,This is based on the attendance of this Student,이이 학생의 출석을 기반으로
@@ -2899,12 +2937,11 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,배달 노트는 {0}이 판매 주문을 취소하기 전에 취소해야합니다
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +75,Paid amount + Write Off Amount can not be greater than Grand Total,지불 금액 + 금액 오프 쓰기 총합보다 클 수 없습니다
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,{0} is not a valid Batch Number for Item {1},{0} 항목에 대한 유효한 배치 번호없는 {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +138,Note: There is not enough leave balance for Leave Type {0},참고 : 허가 유형에 대한 충분한 휴가 밸런스가 없습니다 {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,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,기회의 유형
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,새로운 회사
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,Cost Center is required for 'Profit and Loss' account {0},비용 센터는 '손익'계정이 필요합니다 {0}
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,트랜잭션은 회사의 작성자에 의해 삭제 될 수 있습니다
 apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,원장 항목의 개수가 잘못되었습니다 발견.당신은 트랜잭션에 잘못된 계정을 선택했을 수 있습니다.
 DocType: Cheque Print Template,Cheque Width,수표 폭
@@ -2913,16 +2950,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,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 +228,{0} '{1}' is disabled,{0} '{1}' 사용할 수 없습니다.
+apps/erpnext/erpnext/controllers/accounts_controller.py +231,{0} '{1}' is disabled,{0} '{1}' 사용할 수 없습니다.
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,열기로 설정
 DocType: Cheque Print Template,Scanned Cheque,스캔 한 수표
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,제출 거래에 연락처에 자동으로 이메일을 보내십시오.
+DocType: Timesheet,Total Billable Amount,총 청구 금액
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,항목 3
 DocType: Purchase Order,Customer Contact Email,고객 연락처 이메일
 DocType: Warranty Claim,Item and Warranty Details,상품 및 보증의 자세한 사항
 DocType: Sales Team,Contribution (%),기여도 (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,참고 : 결제 항목이 '현금 또는 은행 계좌'이 지정되지 않았기 때문에 생성되지 않습니다
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Responsibilities,책임
+apps/erpnext/erpnext/controllers/accounts_controller.py +78,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,책임
 DocType: Expense Claim Account,Expense Claim Account,경비 청구서 계정
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,템플릿
 DocType: Sales Person,Sales Person Name,영업 사원명
@@ -2930,6 +2968,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,사용자 추가
 DocType: Pricing Rule,Item Group,항목 그룹
 DocType: Item,Safety Stock,안전 재고
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,상품 코드&gt; 항목 그룹&gt; 브랜드
 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),추가 세금 및 수수료 (회사 통화)
@@ -2939,7 +2978,6 @@
 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: Timesheet,Total Hours,총 시간
 DocType: Journal Entry,Printing Settings,인쇄 설정
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Total Debit must be equal to Total Credit. The difference is {0},총 직불 카드는 전체 신용 동일해야합니다.차이는 {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,자동차
@@ -2952,13 +2990,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,투자 은행
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +71,Cash or Bank Account is mandatory for making payment entry,현금 또는 은행 계좌 결제 항목을 만들기위한 필수입니다
 DocType: Purchase Invoice,Price List Exchange Rate,가격 기준 환율
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,고객 센터&gt; 고객 그룹&gt; 지역
 DocType: Purchase Invoice Item,Rate,비율
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Intern,인턴
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,인턴
 DocType: Stock Entry,From BOM,BOM에서
 DocType: Assessment,Assessment Code,평가 코드
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +32,Basic,기본
+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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule','생성 일정'을 클릭 해주세요
+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 +95,Reference No is mandatory if you entered Reference Date,당신이 참조 날짜를 입력 한 경우 참조 번호는 필수입니다
@@ -2967,11 +3006,11 @@
 DocType: Salary Slip,Salary Structure,급여 체계
 DocType: Account,Bank,은행
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,항공 회사
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +752,Issue Material,문제의 소재
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +723,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 +683,You are in offline mode. You will not be able to reload until you have network.,당신은 오프라인 모드에 있습니다. 당신은 당신이 네트워크를 때까지 다시로드 할 수 없습니다.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +665,You are in offline mode. You will not be able to reload until you have network.,당신은 오프라인 모드에 있습니다. 당신은 당신이 네트워크를 때까지 다시로드 할 수 없습니다.
 DocType: Hub Settings,Access Token,액세스 토큰
 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,일련 번호
@@ -2979,33 +3018,35 @@
 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 +1122,Enter value must be positive,입력 값은 양수 여야합니다
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,All Territories,모든 국가
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1125,Enter value must be positive,입력 값은 양수 여야합니다
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,모든 국가
 DocType: Purchase Invoice,Items,아이템
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +23,Student is already enrolled.,학생이 이미 등록되어 있습니다.
 DocType: Fiscal Year,Year Name,올해의 이름
 DocType: Process Payroll,Process Payroll,프로세스 급여
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,이번 달 작업 일 이상 휴일이 있습니다.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +233,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 +96,Request for Quotations,견적 요청
+apps/erpnext/erpnext/hooks.py +104,Request for Quotations,견적 요청
 DocType: Payment Reconciliation,Maximum Invoice Amount,최대 송장 금액
 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 +628,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',변형에 대한 측정의 기본 단위는 &#39;{0}&#39;템플릿에서와 동일해야합니다 &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',변형에 대한 측정의 기본 단위는 &#39;{0}&#39;템플릿에서와 동일해야합니다 &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,에 의거에게 계산
 DocType: Delivery Note Item,From Warehouse,창고에서
 DocType: Assessment,Supervisor Name,관리자 이름
+DocType: Assessment,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,구매 사용자
 DocType: Notification Control,Customize the Notification,알림 사용자 지정
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Cash Flow from Operations,운영으로 인한 현금 흐름
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,기본 주소 템플릿을 삭제할 수 없습니다
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,기본 주소 템플릿을 삭제할 수 없습니다
 DocType: Sales Invoice,Shipping Rule,배송 규칙
 DocType: Manufacturer,Limited to 12 characters,12 자로 제한
 DocType: Journal Entry,Print Heading,인쇄 제목
@@ -3020,8 +3061,8 @@
 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/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,목표 수량 또는 목표량 하나는 필수입니다
-apps/erpnext/erpnext/stock/get_item_details.py +485,No default BOM exists for Item {0},기본의 BOM은 존재하지 않습니다 항목에 대한 {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +336,Please select Posting Date first,첫 번째 게시 날짜를 선택하세요
+apps/erpnext/erpnext/stock/get_item_details.py +486,No default BOM exists for Item {0},기본의 BOM은 존재하지 않습니다 항목에 대한 {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +326,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,기존의 트랜잭션 비용 센터 원장으로 변환 할 수 없습니다
@@ -3037,6 +3078,7 @@
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,송장과 일치 결제
 DocType: Journal Entry,Bank Entry,은행 입장
 DocType: Authorization Rule,Applicable To (Designation),에 적용 (지정)
+,Profitability Analysis,수익성 분석
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,쇼핑 카트에 담기
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,그룹으로
 DocType: Guardian,Interests,이해
@@ -3049,22 +3091,22 @@
 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 +141,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","직렬화 된 항목 {0} 재고 조정을 사용 \
  업데이트 할 수 없습니다"
 DocType: Scheduling Tool,Day,일
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,새로운 시리얼 번호는 창고를 가질 수 없습니다.창고 재고 항목 또는 구입 영수증으로 설정해야합니다
 DocType: Lead,Lead Type,리드 타입
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,You are not authorized to approve leaves on Block Dates,당신은 블록 날짜에 잎을 승인 할 수있는 권한이 없습니다
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,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: Student Applicant,AP.,AP.
 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 +639,Point of Sale,판매 시점
+apps/erpnext/erpnext/accounts/page/pos/pos.js +634,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,세금
 DocType: Production Planning Tool,Production Planning Tool,생산 계획 도구
@@ -3073,74 +3115,77 @@
 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 +373,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 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 Profile,Customer Group,고객 그룹
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,Expense account is mandatory for item {0},비용 계정 항목에 대한 필수 {0}
 DocType: Item,Website Description,웹 사이트 설명
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date must be on or after today,다음 감가 상각 날짜 나 오늘 이후 여야합니다
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,자본에 순 변경
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +145,Please cancel Purchase Invoice {0} first,첫 번째 구매 송장 {0}을 취소하십시오
 DocType: Serial No,AMC Expiry Date,AMC 유효 날짜
 ,Sales Register,판매 등록
 DocType: Quotation,Quotation Lost Reason,견적 잃어버린 이유
+apps/erpnext/erpnext/utilities/doctype/address/address.py +164,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,디폴트 주소 템플릿을 찾을 수 없습니다. 설정&gt; 인쇄 및 브랜딩&gt; 주소 템플릿에서 새 일을 만드십시오.
 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 +330,Transaction reference no {0} dated {1},거래 기준은 {0}에 제출하지 {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Transaction reference no {0} dated {1},거래 기준은 {0}에 제출하지 {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,편집 할 수있는 것은 아무 것도 없습니다.
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,Summary for this month and pending activities,이 달 보류중인 활동에 대한 요약
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,이 달 보류중인 활동에 대한 요약
 DocType: Customer Group,Customer Group Name,고객 그룹 이름
 apps/erpnext/erpnext/public/js/financial_statements.js +54,Cash Flow Statement,현금 흐름표
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Please remove this Invoice {0} from C-Form {1},C-양식에서이 송장 {0}을 제거하십시오 {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,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 +644,Get Items,항목 가져 오기
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +623,Get Items,항목 가져 오기
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +210,Please enter Write Off Account,계정을 끄기 쓰기 입력하십시오
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,마지막 주문 날짜
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +41,Account {0} does not belongs to company {1},계정 {0} 수행은 회사 소유하지 {1}
+DocType: Student,Guardian Details,가디언의 자세한 사항
 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,계획 시작 날짜
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,Customer is required against Receivable account {0},고객은 채권 계정에 필요한 {0}
 DocType: Serial No,Creation Document Type,작성 문서 형식
 DocType: Leave Type,Is Encash,현금화는
 DocType: Purchase Invoice,Mobile No,모바일 없음
 DocType: Leave Allocation,New Leaves Allocated,할당 된 새로운 잎
-apps/erpnext/erpnext/controllers/trends.py +265,Project-wise data is not available for Quotation,프로젝트 와이즈 데이터는 견적을 사용할 수 없습니다
+apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,프로젝트 와이즈 데이터는 견적을 사용할 수 없습니다
 DocType: Project,Expected End Date,예상 종료 날짜
 DocType: Budget Account,Budget Amount,예산 금액
 DocType: Appraisal Template,Appraisal Template Title,평가 템플릿 제목
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,Commercial,광고 방송
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,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 +648,Row {0}# Account must be of type 'Fixed Asset',행 {0} # 계정 유형이어야합니다 &#39;고정 자산&#39;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Row {0}# Account must be of type 'Fixed Asset',행 {0} # 계정 유형이어야합니다 &#39;고정 자산&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,수량 아웃
 apps/erpnext/erpnext/config/accounts.py +278,Rules to calculate shipping amount for a sale,판매 배송 금액을 계산하는 규칙
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +30,Series is mandatory,시리즈는 필수입니다
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +50,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}
 DocType: Leave Allocation,Unused leaves,사용하지 않는 잎
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Cr,CR
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Cr,CR
 DocType: Tax Rule,Billing State,결제 주
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +250,Transfer,이체
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +187,{0} {1} does not associated with Party Account {2},{0} {1} 파티 계정과 연결되어 있지 않습니다 {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,Fetch exploded BOM (including sub-assemblies),(서브 어셈블리 포함) 폭발 BOM 가져 오기
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +254,Transfer,이체
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +190,{0} {1} does not associated with Party Account {2},{0} {1} 파티 계정과 연결되어 있지 않습니다 {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +796,Fetch exploded BOM (including sub-assemblies),(서브 어셈블리 포함) 폭발 BOM 가져 오기
 DocType: Authorization Rule,Applicable To (Employee),에 적용 (직원)
-apps/erpnext/erpnext/controllers/accounts_controller.py +115,Due Date is mandatory,마감일은 필수입니다
+apps/erpnext/erpnext/controllers/accounts_controller.py +118,Due Date is mandatory,마감일은 필수입니다
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,속성에 대한 증가는 {0} 0이 될 수 없습니다
 DocType: Journal Entry,Pay To / Recd From,지불 / 수취처
 DocType: Naming Series,Setup Series,설치 시리즈
 DocType: Payment Reconciliation,To Invoice Date,날짜를 청구 할
 DocType: Supplier,Contact HTML,연락 HTML
 ,Inactive Customers,비활성 고객
+DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,구매 영수증
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,어떻게 가격의 규칙이 적용됩니다?
 DocType: Quality Inspection,Delivery Note No,납품서 없음
@@ -3149,7 +3194,7 @@
 DocType: Company,Retail,소매의
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +120,Customer {0} does not exist,고객 {0}이 (가) 없습니다
 DocType: Attendance,Absent,없는
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +587,Product Bundle,번들 제품
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Product Bundle,번들 제품
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Invalid reference {1},행 {0} : 잘못된 참조 {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,구매세금 및 요금 템플릿
 DocType: Upload Attendance,Download Template,다운로드 템플릿
@@ -3159,8 +3204,8 @@
 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 +742,Send Supplier Emails,공급 업체 이메일 보내기
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +104,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","급여는 이미 {0}과 {1},이 기간 사이가 될 수 없습니다 신청 기간을 남겨 사이의 기간에 대해 처리."
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +708,Send Supplier Emails,공급 업체 이메일 보내기
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,"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,가디언 관심
 DocType: Timesheet,Employee Detail,직원 세부 정보
@@ -3171,9 +3216,9 @@
 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/accounts/doctype/gl_entry/gl_entry.py +77,Account {0} cannot be a Group,계정 {0} 그룹이 될 수 없습니다
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} cannot be a Group,계정 {0} 그룹이 될 수 없습니다
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +31,Optional. This setting will be used to filter in various transactions.,선택.이 설정은 다양한 거래를 필터링하는 데 사용됩니다.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +107,Negative Valuation Rate is not allowed,부정 평가 비율은 허용되지 않습니다
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,부정 평가 비율은 허용되지 않습니다
 DocType: Holiday List,Weekly Off,주간 끄기
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","예를 들어, 2012 년, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +39,Provisional Profit / Loss (Credit),임시 이익 / 손실 (신용)
@@ -3187,16 +3232,16 @@
 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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1} : 코스트 센터는 항목에 대해 필수입니다 {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +626,Get Items from Product Bundle,제품 번들에서 항목 가져 오기
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +605,Get Items from Product Bundle,제품 번들에서 항목 가져 오기
 DocType: Asset,Straight Line,일직선
 DocType: Project User,Project User,프로젝트 사용자
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} is inactive,계정 {0} 비활성
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} is inactive,계정 {0} 비활성
 DocType: GL Entry,Is Advance,사전인가
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,날짜에 날짜 및 출석 출석은 필수입니다
 apps/erpnext/erpnext/controllers/buying_controller.py +148,Please enter 'Is Subcontracted' as Yes or No,입력 해주십시오은 예 또는 아니오로 '하청'
 DocType: Sales Team,Contact No.,연락 번호
 DocType: Bank Reconciliation,Payment Entries,결제 항목
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,'Profit and Loss' type account {0} not allowed in Opening Entry,'손익' 타입 계정  {0}은 입력하도록 하용되지 않습니다
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +71,'Profit and Loss' type account {0} not allowed in Opening Entry,'손익' 타입 계정  {0}은 입력하도록 하용되지 않습니다
 DocType: Program Enrollment Tool,Get Students From,학생들 가져 오기
 DocType: Hub Settings,Seller Country,판매자 나라
 apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,웹 사이트에 항목을 게시
@@ -3215,7 +3260,7 @@
 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 +558,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","행 번호 {0} 자산이 {1} 제출할 수 없습니다, 그것은 이미 {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +561,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","행 번호 {0} 자산이 {1} 제출할 수 없습니다, 그것은 이미 {2}"
 DocType: Tax Rule,Billing Country,결제 나라
 DocType: Production Order,Expected Delivery Date,예상 배송 날짜
 apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,직불 및 신용 {0} #에 대한 동일하지 {1}. 차이는 {2}.
@@ -3228,13 +3273,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +202,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: Sales Order,% Amount Billed,청구 % 금액
+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 +117,No Item with Serial No {0},시리얼 번호와 어떤 항목이 없습니다 {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,열기 알림
+DocType: Email Digest,Open Notifications,열기 알림
 DocType: Payment Entry,Difference Amount (Company Currency),차이 금액 (회사 통화)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,직접 비용
 apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
@@ -3242,7 +3287,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,새로운 고객 수익
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,여행 비용
 DocType: Maintenance Visit,Breakdown,고장
-apps/erpnext/erpnext/controllers/accounts_controller.py +634,Account: {0} with currency: {1} can not be selected,계정 : {0} 통화로 : {1}을 선택할 수 없습니다
+apps/erpnext/erpnext/controllers/accounts_controller.py +637,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}
 DocType: Program Enrollment Tool,Student Applicants,학생 지원자
@@ -3250,15 +3295,15 @@
 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 +56,Probation,근신
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Probation,근신
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,급여의 구성 요소
 DocType: Program Enrollment Tool,New Academic Year,새 학년
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Payment of salary for the month {0} and year {1},달의 급여의 지급 {0}과 연도 {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Payment of salary for the month {0} and year {1},달의 급여의 지급 {0}과 연도 {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,자동 삽입 가격표 속도없는 경우
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,총 지불 금액
 DocType: Production Order Item,Transferred Qty,수량에게 전송
 apps/erpnext/erpnext/config/learn.py +11,Navigating,탐색
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Planning,계획
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,계획
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,발행 된
 DocType: Project,Total Billing Amount (via Time Logs),총 결제 금액 (시간 로그를 통해)
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,We sell this Item,우리는이 품목을
@@ -3271,11 +3316,10 @@
 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/accounts/page/pos/pos.js +1376,Sales invoice submitted sucessfully.,판매 송장이 성공적으로 제출했다.
 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}
 DocType: Assessment Result,Student Name,학생 이름
-apps/erpnext/erpnext/hooks.py +104,Assessment Schedule,평가 일정
+apps/erpnext/erpnext/hooks.py +113,Assessment Schedule,평가 일정
 DocType: Brand,Item Manager,항목 관리자
 DocType: Buying Settings,Default Supplier Type,기본 공급자 유형
 DocType: Production Order,Total Operating Cost,총 영업 비용
@@ -3285,6 +3329,7 @@
 DocType: GL Entry,Party Type,파티 형
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +78,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
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,급여 템플릿 마스터.
 DocType: Leave Type,Max Days Leave Allowed,최대 일 허가 허용
@@ -3296,18 +3341,19 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,리드 또는 고객에게 인용.
 DocType: Stock Settings,Role Allowed to edit frozen stock,동결 재고을 편집 할 수 있는 역할
 ,Territory Target Variance Item Group-Wise,지역 대상 분산 상품 그룹 와이즈
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Customer Groups,모든 고객 그룹
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +78,Accumulated Monthly,누적 월별
-apps/erpnext/erpnext/controllers/accounts_controller.py +595,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} 필수입니다.아마 통화 기록은 {2}로 {1}에 만들어지지 않습니다.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,모든 고객 그룹
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +81,Accumulated Monthly,누적 월별
+apps/erpnext/erpnext/controllers/accounts_controller.py +598,{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}이 (가) 없습니다
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),가격 목록 비율 (회사 통화)
 DocType: Products Settings,Products Settings,제품 설정
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +188,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} 설정&gt; 설정을 통해&gt; 명명 시리즈에 대한 시리즈를 명명 설정하십시오
 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 +84,Secretary,비서
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,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,구매
@@ -3316,24 +3362,22 @@
 ,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,평가의 이름
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,행 번호 {0} : 일련 번호는 필수입니다
+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 +859,Supplier Quotation,공급 업체 견적
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +838,Supplier Quotation,공급 업체 견적
 DocType: Quotation,In Words will be visible once you save the Quotation.,당신은 견적을 저장 한 단어에서 볼 수 있습니다.
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +7,Collect Fees,수수료를 수집
+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}
 DocType: Lead,Add to calendar on this date,이 날짜에 캘린더에 추가
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,비용을 추가하는 규칙.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,다가오는 이벤트
 DocType: Item,Opening Stock,열기 증권
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,고객이 필요합니다
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} 반환을위한 필수입니다
 DocType: Purchase Order,To Receive,받다
 apps/erpnext/erpnext/public/js/setup_wizard.js +195,user@example.com,user@example.com
-DocType: Email Digest,Income / Expense,수익 / 비용
 DocType: Employee,Personal Email,개인 이메일
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,총 분산
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","활성화되면, 시스템이 자동으로 재고에 대한 회계 항목을 게시 할 예정입니다."
@@ -3344,13 +3388,14 @@
 DocType: Customer,From Lead,리드에서
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,생산 발표 순서.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,회계 연도 선택 ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,POS Profile required to make POS Entry,POS 프로필 POS 항목을 만드는 데 필요한
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +509,POS Profile required to make POS Entry,POS 프로필 POS 항목을 만드는 데 필요한
 DocType: Program Enrollment Tool,Enroll Students,학생 등록
 DocType: Hub Settings,Name Token,이름 토큰
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,표준 판매
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Atleast one warehouse is mandatory,이어야 한 창고는 필수입니다
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +129,Atleast one warehouse is mandatory,이어야 한 창고는 필수입니다
 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 +330,{0} against Sales Invoice {1},{0} 견적서에 대한 {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,프로젝트 이름
@@ -3371,10 +3416,11 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,잎은 0.5의 배수로 할당해야합니다
 DocType: Production Order,Operation Cost,운영 비용
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,. csv 파일에서 출석을 업로드
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,뛰어난 AMT 사의
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,목표를 설정 항목 그룹 방향이 판매 사람입니다.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],고정 재고 이전보다 [일]
-apps/erpnext/erpnext/controllers/accounts_controller.py +528,Row #{0}: Asset is mandatory for fixed asset purchase/sale,행 # {0} : 자산은 고정 자산 구매 / 판매를위한 필수입니다
+apps/erpnext/erpnext/controllers/accounts_controller.py +531,Row #{0}: Asset is mandatory for fixed asset purchase/sale,행 # {0} : 자산은 고정 자산 구매 / 판매를위한 필수입니다
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","둘 이상의 가격 결정 규칙은 상기 조건에 따라 발견되면, 우선 적용된다.기본 값이 0 (공백) 동안 우선 순위는 0-20 사이의 숫자입니다.숫자가 높을수록 동일한 조건으로 여러 가격 규칙이있는 경우는 우선 순위를 의미합니다."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,회계 연도 : {0} 수행하지 존재
 DocType: Currency Exchange,To Currency,통화로
@@ -3391,15 +3437,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,사모
 DocType: Maintenance Visit,Customer Feedback,고객 의견
 DocType: Account,Expense,지출
-DocType: Sales Invoice,Exhibition,전시회
 apps/erpnext/erpnext/utilities/doctype/address/address.py +77,"Company is mandatory, as it is your company address",이 회사 주소로 회사는 필수입니다
 DocType: Item Attribute,From Range,범위에서
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +81,Syntax error in formula or condition: {0},식 또는 조건에 구문 오류 : {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +92,Syntax error in formula or condition: {0},식 또는 조건에 구문 오류 : {0}
 apps/erpnext/erpnext/stock/utils.py +99,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 +28,Jobs,채용 정보
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,채용 정보
 ,Sales Order Trends,판매 주문 동향
 DocType: Employee,Held On,개최
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,생산 품목
@@ -3408,16 +3454,16 @@
 DocType: Stock Entry Detail,Additional Cost,추가 비용
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,회계 연도 종료일
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","바우처를 기반으로 필터링 할 수 없음, 바우처로 그룹화하는 경우"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +763,Make Supplier Quotation,공급 업체의 견적을
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,Make Supplier Quotation,공급 업체의 견적을
 DocType: Quality Inspection,Incoming,수신
 DocType: BOM,Materials Required (Exploded),필요한 재료 (분해)
 apps/erpnext/erpnext/public/js/setup_wizard.js +185,"Add users to your organization, other than yourself",자신보다 다른 조직에 사용자를 추가
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,Row # {0}: Serial No {1} does not match with {2} {3},행 번호 {0} : 일련 번호 {1}과 일치하지 않는 {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +42,Casual Leave,캐주얼 허가
+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,캐주얼 허가
 DocType: Batch,Batch ID,일괄 처리 ID
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,Note: {0},참고 : {0}
 ,Delivery Note Trends,배송 참고 동향
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +103,This Week's Summary,이번 주 요약
+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} 만 재고 거래를 통해 업데이트 할 수 있습니다
 DocType: Student Group Creation Tool,Get Courses,과정을 받으세요
 DocType: GL Entry,Party,파티
@@ -3427,7 +3473,7 @@
 DocType: Request for Quotation Item,Request for Quotation Item,견적 항목에 대한 요청
 DocType: Purchase Order,To Bill,빌
 DocType: Material Request,% Ordered,% 발주
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Piecework,일한 분량에 따라 공임을 지급받는 일
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Piecework,일한 분량에 따라 공임을 지급받는 일
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,평균. 구매 비율
 DocType: Task,Actual Time (in Hours),(시간) 실제 시간
 DocType: Employee,History In Company,회사의 역사
@@ -3444,7 +3490,7 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +350,{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 +162,Black,검정
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,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} 항목
@@ -3455,13 +3501,13 @@
 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 +69,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,마크 결석
 DocType: Journal Entry Account,Exchange Rate,환율
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Sales Order {0} is not submitted,판매 주문 {0} 제출되지 않았습니다.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +527,Sales Order {0} is not submitted,판매 주문 {0} 제출되지 않았습니다.
 DocType: Homepage,Tag Line,태그 라인
 DocType: Fee Component,Fee Component,요금 구성 요소
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +857,Add items from,에서 항목 추가
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +836,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: Cheque Print Template,Regular,정규병
 DocType: BOM,Last Purchase Rate,마지막 구매 비율
@@ -3469,6 +3515,7 @@
 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} 이후 변종이있다
 ,Sales Person-wise Transaction Summary,판매 사람이 많다는 거래 요약
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +60,Cost Center is required for 'Profit and Loss' account {0}. Please set up a default Cost Center for the Company.,코스트 센터는 &#39;손익&#39;계정 {0}이 필요합니다. 회사의 기본 비용 센터를 설치하시기 바랍니다.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,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,예산 월간 배분 백분율
@@ -3479,12 +3526,12 @@
 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 +710,Online,온라인으로
+apps/erpnext/erpnext/accounts/page/pos/pos.js +692,Online,온라인으로
 ,Available Stock for Packing Items,항목 포장 재고품
 DocType: Item Variant,Item Variant,항목 변형
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,다른 기본이 없기 때문에 기본적으로이 주소 템플릿 설정
+apps/erpnext/erpnext/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 +74,Quality Management,품질 관리
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,품질 관리
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,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,직원 외부 일 역사
@@ -3506,11 +3553,12 @@
 DocType: Student,Student Email ID,학생 이메일 ID
 DocType: Employee,Notice (days),공지 사항 (일)
 DocType: Tax Rule,Sales Tax Template,판매 세 템플릿
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1520,Select items to save the invoice,송장을 저장하는 항목을 선택
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1544,Select items to save the invoice,송장을 저장하는 항목을 선택
 DocType: Employee,Encashment Date,현금화 날짜
 DocType: Account,Stock Adjustment,재고 조정
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},기본 활동 비용은 활동 유형에 대해 존재 - {0}
 DocType: Production Order,Planned Operating Cost,계획 운영 비용
+DocType: Academic Term,Term Start Date,기간 시작 날짜
 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,신청자 이름
@@ -3540,17 +3588,17 @@
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,웨어 하우스 (영구 재고)에 대한 계정은이 계정이 생성됩니다.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +119,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,재고 원장 항목이 창고에 존재하는웨어 하우스는 삭제할 수 없습니다.
 DocType: Company,Distribution,유통
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +8,Amount Paid,지불 금액
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Project Manager,프로젝트 매니저
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,지불 금액
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,프로젝트 매니저
 ,Quoted Item Comparison,인용 상품 비교
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Dispatch,파견
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,파견
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,최대 할인 품목을 허용 : {0} {1} %이
 apps/erpnext/erpnext/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.,설정 신용 한도를 초과하는 거래를 제출하도록 허용 역할.
-DocType: Sales Invoice,Supplier Reference,공급 업체 참조
-apps/erpnext/erpnext/accounts/page/pos/pos.js +844,"Master data syncing, it might take some time","마스터 데이터 동기화, 그것은 시간이 걸릴 수 있습니다"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +832,"Master data syncing, it might take some time","마스터 데이터 동기화, 그것은 시간이 걸릴 수 있습니다"
 DocType: Item,Material Issue,소재 호
 DocType: Hub Settings,Seller Description,판매자 설명
 DocType: Employee Education,Qualification,자격
@@ -3564,7 +3612,7 @@
 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 +83,Error in formula or condition,식 또는 조건에서 오류
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,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,모두 선택 취소
@@ -3573,7 +3621,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},현재까지의 회계 연도 내에 있어야합니다.날짜에 가정 = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","여기서 당신은 신장, 체중, 알레르기, 의료 문제 등 유지 관리 할 수 있습니다"
 DocType: Leave Block List,Applies to Company,회사에 적용
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +197,Cannot cancel because submitted Stock Entry {0} exists,제출 된 재고 항목 {0}이 존재하기 때문에 취소 할 수 없습니다
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +198,Cannot cancel because submitted Stock Entry {0} exists,제출 된 재고 항목 {0}이 존재하기 때문에 취소 할 수 없습니다
 DocType: Purchase Invoice,In Words,즉
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,Today is {0}'s birthday!,오늘은 {0} '의 생일입니다!
 DocType: Production Planning Tool,Material Request For Warehouse,창고 자재 요청
@@ -3583,14 +3631,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,귀하의 회계 연도가 시작됩니다
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,자산 감가 상각 및 잔액
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +319,Amount {0} {1} transferred from {2} to {3},금액은 {0} {1}에서 전송 {2}에 {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +322,Amount {0} {1} transferred from {2} to {3},금액은 {0} {1}에서 전송 {2}에 {3}
 DocType: Sales Invoice,Get Advances Received,선불수취
 DocType: Email Digest,Add/Remove Recipients,추가 /받는 사람을 제거
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +432,Transaction not allowed against stopped Production Order {0},거래 정지 생산 오더에 대해 허용되지 {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +437,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 +143,Join,어울리다
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,부족 수량
-apps/erpnext/erpnext/stock/doctype/item/item.py +652,Item variant {0} exists with same attributes,항목 변형 {0} 같은 속성을 가진 존재
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,항목 변형 {0} 같은 속성을 가진 존재
+DocType: Leave Application,LAP/,무릎/
 DocType: Salary Slip,Salary 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,'마감일자'가 필요합니다.
@@ -3598,12 +3647,12 @@
 DocType: Sales Invoice Item,Sales Order Item,판매 주문 품목
 DocType: Salary Slip,Payment Days,지불 일
 DocType: Customer,Dormant,잠자는
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +212,Warehouses with child nodes cannot be converted to ledger,자식 노드와 창고가 원장으로 변환 할 수 없습니다
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +215,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/public/js/controllers/transaction.js +866,It is needed to fetch Item Details.,그것은 상품 상세을 가져 오기 위해 필요하다.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +857,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}이 (가) 이미 수신 된
@@ -3613,14 +3662,14 @@
 DocType: Expense Claim,Total Claimed Amount,총 주장 금액
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,판매를위한 잠재적 인 기회.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,Invalid {0},잘못된 {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Sick Leave,병가
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,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,백화점
 DocType: Warehouse,PIN,핀
 DocType: Sales Invoice,Base Change Amount (Company Currency),자료 변경 금액 (회사 통화)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +313,No accounting entries for the following warehouses,다음 창고에 대한 회계 항목이 없음
-apps/erpnext/erpnext/projects/doctype/project/project.js +102,Save the document first.,먼저 문서를 저장합니다.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +314,No accounting entries for the following warehouses,다음 창고에 대한 회계 항목이 없음
+apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,먼저 문서를 저장합니다.
 DocType: Account,Chargeable,청구
 DocType: Company,Change Abbreviation,변경 요약
 DocType: Expense Claim Detail,Expense Date,비용 날짜
@@ -3633,10 +3682,9 @@
 DocType: Purchase Invoice,Recurring Print Format,반복 인쇄 형식
 DocType: C-Form,Series,시리즈
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,Expected Delivery Date cannot be before Purchase Order Date,예상 배송 날짜는 구매 주문 날짜 전에 할 수 없습니다
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} 설정&gt; 설정을 통해&gt; 명명 시리즈에 대한 시리즈를 명명 설정하십시오
 DocType: Appraisal,Appraisal Template,평가 템플릿
 DocType: Item Group,Item Classification,품목 분류
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Business Development Manager,비즈니스 개발 매니저
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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,원장
@@ -3646,8 +3694,8 @@
 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 +940,Please select {0} first,먼저 {0}를 선택하세요
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +749,Batch {0} of Item {1} has expired.,항목의 일괄 {0} {1} 만료되었습니다.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +953,Please select {0} first,먼저 {0}를 선택하세요
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +757,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,소계
@@ -3675,8 +3723,8 @@
  {% 경우 email_id %} 이메일 : {{email_id}} & LT; BR된다 {% ENDIF - %} 
  </ 코드> </ 사전>"
 DocType: Salary Detail,Default Amount,기본 금액
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +92,Warehouse not found in the system,시스템에서 찾을 수없는 창고
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +106,This Month's Summary,이 달의 요약
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,시스템에서 찾을 수없는 창고
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,이 달의 요약
 DocType: Quality Inspection Reading,Quality Inspection Reading,품질 검사 읽기
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`확정된 재고'는 `% d의 일보다 작아야한다.
 DocType: Tax Rule,Purchase Tax Template,세금 템플릿을 구입
@@ -3686,21 +3734,22 @@
 DocType: Item Customer Detail,Ref Code,참조 코드
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,직원 기록.
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Please set Next Depreciation Date,다음 감가 상각 날짜를 설정하십시오
-DocType: Payment Gateway,Payment Gateway,지불 게이트웨이
 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 +378,Operation Time must be greater than 0 for Operation {0},작업 시간은 작업에 대한 0보다 큰 수 있어야 {0}
+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/accounts/doctype/account/account.py +170,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)
 DocType: Program,Program Abbreviation,프로그램의 약자
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,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: Appraisal,Start Date,시작 날짜
@@ -3716,21 +3765,22 @@
 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,요금은 해당 항목에 적용 할 수없는 경우 항목을 제거
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,예. smsgateway.com / API / send_sms.cgi
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +27,Transaction currency must be same as Payment Gateway currency,거래 통화는 지불 게이트웨이 통화와 동일해야합니다
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Transaction currency must be same as Payment Gateway currency,거래 통화는 지불 게이트웨이 통화와 동일해야합니다
 DocType: Payment Entry,Receive,수신
+apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,인용 :
 DocType: Maintenance Visit,Fully Completed,완전히 완료
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0} % 완료
 DocType: Employee,Educational Qualification,교육 자격
 DocType: Workstation,Operating Costs,운영 비용
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,액션 월별 예산이 초과 축적 된 경우
 DocType: Purchase Invoice,Submit on creation,창조에 제출
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +432,Currency for {0} must be {1},환율 {0}해야합니다에 대한 {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +435,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 +493,Row {0}: An Reorder entry already exists for this warehouse {1},행 {0} : 재주문 항목이 이미이웨어 하우스 존재 {1}
+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/crm/doctype/opportunity/opportunity.py +79,"Cannot declare as lost, because Quotation has been made.","손실로 견적이되었습니다 때문에, 선언 할 수 없습니다."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,구매 마스터 관리자
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +429,Production Order {0} must be submitted,생산 오더 {0} 제출해야합니다
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +434,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,지금까지 날로부터 이전 할 수 없습니다
@@ -3740,25 +3790,27 @@
 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 +181,Totals,합계
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,합계
 DocType: BOM,Manufacturing,생산
 ,Ordered Items To Be Delivered,전달 될 품목을 주문
 DocType: Account,Income,수익
 DocType: Industry Type,Industry Type,산업 유형
 apps/erpnext/erpnext/templates/includes/cart.js +141,Something went wrong!,문제가 발생했습니다!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,Warning: Leave application contains following block dates,경고 : 응용 프로그램이 다음 블록 날짜를 포함 남겨
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +120,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}이 거래를 완료 할 수의 단위.
+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 +181,Organization unit (department) master.,조직 단위 (현)의 마스터.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,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 +793,All records are synced.,모든 기록은 동기화됩니다.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +781,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,코스트 센터의 이름
@@ -3777,21 +3829,20 @@
 DocType: Address,Name of person or organization that this address belongs to.,이 주소가 속해있는 개인이나 조직의 이름입니다.
 apps/erpnext/erpnext/public/js/setup_wizard.js +260,Your Suppliers,공급 업체
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +49,Cannot set as Lost as Sales Order is made.,판매 주문이 이루어질으로 분실로 설정할 수 없습니다.
-DocType: Student Applicant,Mother's Name,엄마의 이름
 DocType: Request for Quotation Item,Supplier Part No,공급 업체 부품 번호
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +348,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 +326,Received From,에서 수신
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Received From,에서 수신
 DocType: Lead,Converted,변환
 DocType: Item,Has Serial No,시리얼 No에게 있습니다
 DocType: Employee,Date of Issue,발행일
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}에서 {0}에 대한 {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +153,Row #{0}: Set Supplier for item {1},행 번호 {0} 항목에 대한 설정 공급 업체 {1}
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +93,Row {0}: Hours value must be greater than zero.,행 {0} : 시간의 값은 0보다 커야합니다.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +117,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}를 찾을 수없는
 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 +172,{0} {1} does not exist,{0} {1} 존재하지 않습니다
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +175,{0} {1} does not exist,{0} {1} 존재하지 않습니다
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,Please check Multi Currency option to allow accounts with other currency,다른 통화와 계정을 허용하는 다중 통화 옵션을 확인하시기 바랍니다
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +72,Item: {0} does not exist in the system,상품 : {0} 시스템에 존재하지 않을
 apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,당신은 고정 된 값을 설정할 수있는 권한이 없습니다
@@ -3800,13 +3851,14 @@
 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/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,출석은 미래의 날짜에 표시 할 수 없습니다
 DocType: Pricing Rule,Pricing Rule Help,가격 규칙 도움말
 DocType: Purchase Taxes and Charges,Account Head,계정 헤드
 apps/erpnext/erpnext/config/stock.py +163,Update additional costs to calculate landed cost of items,상품의 도착 비용을 계산하기 위해 추가적인 비용을 업데이트
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Electrical,전기의
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Electrical,전기의
 DocType: Stock Entry,Total Value Difference (Out - In),총 가치 차이 (아웃 -에서)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,Row {0}: Exchange Rate is mandatory,행 {0} : 환율은 필수입니다
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},사용자 ID 직원에 대한 설정하지 {0}
@@ -3814,7 +3866,7 @@
 DocType: Item,Customer Code,고객 코드
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +210,Birthday Reminder for {0},생일 알림 {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,일 이후 마지막 주문
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +292,Debit To account must be a Balance Sheet account,계정에 직불는 대차 대조표 계정이어야합니다
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To account must be a Balance Sheet account,계정에 직불는 대차 대조표 계정이어야합니다
 DocType: Buying Settings,Naming Series,시리즈 이름 지정
 DocType: Leave Block List,Leave Block List Name,차단 목록의 이름을 남겨주세요
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,재고 자산
@@ -3826,11 +3878,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 +301,Salary Slip of employee {0} already created for time sheet {1},직원의 급여 슬립 {0} 이미 시간 시트 생성 {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +313,Salary Slip of employee {0} already created for time sheet {1},직원의 급여 슬립 {0} 이미 시간 시트 생성 {1}
 DocType: Sales Order Item,Ordered Qty,수량 주문
-apps/erpnext/erpnext/stock/doctype/item/item.py +673,Item {0} is disabled,항목 {0} 사용할 수 없습니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} is disabled,항목 {0} 사용할 수 없습니다
 DocType: Stock Settings,Stock Frozen Upto,재고 동결 개까지
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +838,BOM does not contain any stock item,BOM은 재고 아이템을 포함하지 않는
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +809,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,급여 전표 생성
@@ -3838,23 +3890,24 @@
 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 +485,Row #{0}: Please set reorder quantity,행 번호 {0} : 재주문 수량을 설정하세요
+DocType: Sales Invoice Timesheet,Billing Hours,결제 시간
+apps/erpnext/erpnext/stock/doctype/item/item.py +487,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 +62,Please set {0},설정하십시오 {0}
 DocType: Purchase Invoice,Repeat on Day of Month,이달의 날 반복
 DocType: Employee,Health Details,건강의 자세한 사항
 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,위의 선택 기준에 대한 모든 급여 전표 제출
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} 항목 동기화
 DocType: Sales Order,Partly Delivered,일부 배달
-DocType: Sales Invoice,Existing Customer,기존 고객
 DocType: Email Digest,Receivables,채권
+DocType: Lead Source,Lead Source,리드 소스
 DocType: Customer,Additional information regarding the customer.,고객에 대한 추가 정보.
 DocType: Quality Inspection Reading,Reading 5,5 읽기
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +38,Campaign Name is required,캠페인 이름이 필요합니다
 DocType: Maintenance Visit,Maintenance Date,유지 보수 날짜
 DocType: Purchase Invoice Item,Rejected Serial No,시리얼 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}과 중첩된다. 회사를 설정하시기 바랍니다 방지하려면
@@ -3863,10 +3916,9 @@
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","예 :. 시리즈가 설정되고 일련 번호가 트랜잭션에 언급되지 않은 경우 ABCD ##### 
  후 자동 일련 번호는이 시리즈를 기반으로 생성됩니다.당신은 항상 명시 적으로이 항목에 대한 일련 번호를 언급합니다. 이 비워 둡니다."
 DocType: Upload Attendance,Upload Attendance,출석 업로드
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +129,BOM and Manufacturing Quantity are required,BOM 및 제조 수량이 필요합니다
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,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,최대 강도
-DocType: Bank Reconciliation Detail,Amount,양
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM 교체
 ,Sales Analytics,판매 분석
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +113,Available {0},사용 가능한 {0}
@@ -3874,14 +3926,14 @@
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,이메일 설정
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +96,Please enter default currency in Company Master,회사 마스터에 기본 통화를 입력 해주십시오
 DocType: Stock Entry Detail,Stock Entry Detail,재고 항목의 세부 사항
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +100,Daily Reminders,매일 알림
+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/account/account_tree.js +23,New Account Name,새 계정 이름
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,원료 공급 비용
 DocType: Selling Settings,Settings for Selling Module,모듈 판매에 대한 설정
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Customer Service,고객 서비스
+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/config/hr.py +50,Offer candidate a Job.,제공 후보 작업.
@@ -3890,8 +3942,9 @@
 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} 항목을 재고 품목 수 있어야합니다
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,진행웨어 하우스의 기본 작업
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1570,Total nos of serial no is not equal to quantity.,일련 번호의 총 번호 수량과 동일하지 않습니다.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1594,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?,오류 : 유효한 ID?
 DocType: Naming Series,Update Series Number,업데이트 시리즈 번호
@@ -3899,9 +3952,10 @@
 DocType: Sales Order,Printing Details,인쇄 세부 사항
 DocType: Task,Closing Date,마감일
 DocType: Sales Order Item,Produced Quantity,생산 수량
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Engineer,기사
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Engineer,기사
+DocType: Journal Entry,Total Amount Currency,합계 금액 통화
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,검색 서브 어셈블리
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Item Code required at Row No {0},행 번호에 필요한 상품 코드 {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +398,Item Code required at Row No {0},행 번호에 필요한 상품 코드 {0}
 DocType: Sales Partner,Partner Type,파트너 유형
 DocType: Purchase Taxes and Charges,Actual,실제
 DocType: Authorization Rule,Customerwise Discount,Customerwise 할인
@@ -3917,16 +3971,18 @@
 DocType: BOM,Raw Material Cost,원료 비용
 DocType: Item Reorder,Re-Order Level,다시 주문 수준
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,당신이 생산 주문을 올리거나 분석을위한 원시 자료를 다운로드하고자하는 항목 및 계획 수량을 입력합니다.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +55,Part-time,파트 타임으로
+apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,Gantt 차트
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,파트 타임으로
 DocType: Employee,Applicable Holiday List,해당 휴일 목록
 DocType: Employee,Cheque,수표
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,시리즈 업데이트
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +57,Series Updated,시리즈 업데이트
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,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 +87,Clearance Date updated,정리 날짜 업데이트
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,성공적으로 조정 됨
@@ -3940,7 +3996,7 @@
 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 +513,Posting date and posting time is mandatory,게시 날짜 및 게시 시간이 필수입니다
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,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.,당신이 구매 주문을 저장 한 단어에서 볼 수 있습니다.
@@ -3950,7 +4006,7 @@
 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/stock/doctype/stock_entry/stock_entry.py +158,Target warehouse in row {0} must be same as Production Order,행의 목표웨어 하우스가 {0}과 동일해야합니다 생산 주문
+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,환율이 다른 통화를 사용하여 항목을 한 후 변경할 수 없습니다
 DocType: Company,Round Off Account,반올림
@@ -3959,23 +4015,22 @@
 DocType: Customer Group,Parent Customer Group,상위 고객 그룹
 DocType: Purchase Invoice,Contact Email,담당자 이메일
 DocType: Appraisal Goal,Score Earned,점수 획득
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Notice Period,통지 기간
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,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 +4,New Sales Person Name,새로운 판매 사람 이름
 DocType: Packing Slip,Gross Weight UOM,총중량 UOM
-DocType: Email Digest,Receivables / Payables,채권 / 채무
 DocType: Delivery Note Item,Against Sales Invoice,견적서에 대하여
 DocType: Bin,Reserved Qty for Production,생산 수량 예약
 DocType: Asset,Frequency of Depreciation (Months),감가 상각의 주파수 (월)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +469,Credit Account,신용 계정
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Credit Account,신용 계정
 DocType: Landed Cost Item,Landed Cost Item,착륙 비용 항목
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +55,Show zero values,0 값을보기
+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,설정 내 조직에 대한 간단한 웹 사이트
 DocType: Payment Reconciliation,Receivable / Payable Account,채권 / 채무 계정
 DocType: Delivery Note Item,Against Sales Order Item,판매 주문 항목에 대하여
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Please specify Attribute Value for attribute {0},속성에 대한 속성 값을 지정하십시오 {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},속성에 대한 속성 값을 지정하십시오 {0}
 DocType: Item,Default Warehouse,기본 창고
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +39,Budget cannot be assigned against Group Account {0},예산은 그룹 계정에 할당 할 수 없습니다 {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,부모의 비용 센터를 입력 해주십시오
@@ -3997,19 +4052,22 @@
 DocType: Journal Entry,Total Debit,총 직불
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,기본 완제품 창고
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,영업 사원
-DocType: Sales Invoice,Cold Calling,콜드 콜링
 DocType: SMS Parameter,SMS Parameter,SMS 매개 변수
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,예산 및 비용 센터
 DocType: Maintenance Schedule Item,Half Yearly,반년
 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 +253,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 +141,Set as Lost,분실로 설정
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,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 +5,This is based on transactions against this Customer. See timeline below for details,이이 고객에 대한 거래를 기반으로합니다. 자세한 내용은 아래 일정을 참조하십시오
 DocType: Supplier,Credit Days Based On,신용 일을 기준으로
@@ -4021,11 +4079,10 @@
 ,Items To Be Requested,요청 할 항목
 DocType: Purchase Order,Get Last Purchase Rate,마지막 구매께서는보세요
 DocType: Company,Company Info,회사 소개
-apps/erpnext/erpnext/accounts/page/pos/pos.js +941,Select or add new customer,선택하거나 새로운 고객을 추가
+apps/erpnext/erpnext/accounts/page/pos/pos.js +930,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 +5,This is based on the attendance of this Employee,이이 직원의 출석을 기반으로
-DocType: Sales Invoice,Frequency,회수
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +463,Debit Account,자동 이체 계좌
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Debit Account,자동 이체 계좌
 DocType: Fiscal Year,Year Start Date,년 시작 날짜
 DocType: Attendance,Employee Name,직원 이름
 DocType: Sales Invoice,Rounded Total (Company Currency),둥근 합계 (회사 통화)
@@ -4034,27 +4091,27 @@
 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 +210,Supplier Quotation {0} created,공급 업체의 견적 {0} 작성
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +208,Supplier Quotation {0} created,공급 업체의 견적 {0} 작성
 apps/erpnext/erpnext/accounts/report/financial_statements.py +90,End Year cannot be before Start Year,종료 연도는 시작 연도 이전 될 수 없습니다
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Employee Benefits,종업원 급여
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,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 +228,Please set a default Holiday List for Employee {0} or Company {1},직원에 대한 기본 홀리데이 목록을 설정하십시오 {0} 또는 회사 {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +232,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 +499,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},행 번호 {0} : 금액 경비 요청 {1}에 대해 금액을 보류보다 클 수 없습니다. 등록되지 않은 금액은 {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +500,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},행 번호 {0} : 금액 경비 요청 {1}에 대해 금액을 보류보다 클 수 없습니다. 등록되지 않은 금액은 {2}
 DocType: Maintenance Schedule,Schedule,일정
 DocType: Account,Parent Account,부모 계정
 DocType: Quality Inspection Reading,Reading 3,3 읽기
 ,Hub,허브
 DocType: GL Entry,Voucher Type,바우처 유형
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1007,Price List not found or disabled,가격 목록 발견되지 않았거나 비활성화
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1008,Price List not found or disabled,가격 목록 발견되지 않았거나 비활성화
 DocType: Expense Claim,Approved,인가 된
 DocType: Pricing Rule,Price,가격
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +244,Employee relieved on {0} must be set as 'Left',{0}에 안심 직원은 '왼쪽'으로 설정해야합니다
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +256,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} 지정된 날짜 범위에서 직원에 대해 생성
@@ -4065,12 +4122,12 @@
 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 +259,Please select Employee Record first.,먼저 직원 레코드를 선택하십시오.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +266,Please select Employee Record first.,먼저 직원 레코드를 선택하십시오.
 DocType: POS Profile,Account for Change Amount,변경 금액에 대한 계정
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +190,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},행 {0} : 파티 / 계정과 일치하지 않는 {1} / {2}에서 {3} {4}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +235,Please enter Expense Account,비용 계정을 입력하십시오
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,Please enter Expense Account,비용 계정을 입력하십시오
 DocType: Account,Stock,재고
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,"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 +976,"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,구매 / 제조 세부 사항
@@ -4085,9 +4142,10 @@
 DocType: Asset Movement,Transaction Date,거래 날짜
 DocType: Production Plan Item,Planned Qty,계획 수량
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,총 세금
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,For Quantity (Manufactured Qty) is mandatory,수량 (수량 제조) 필수
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,For Quantity (Manufactured Qty) is mandatory,수량 (수량 제조) 필수
 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 +78,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,실제 시작 날짜
@@ -4102,9 +4160,11 @@
 DocType: Warranty Claim,If different than customer address,만약 고객 주소와 다른
 DocType: BOM Operation,BOM Operation,BOM 운영
 DocType: Purchase Taxes and Charges,On Previous Row Amount,이전 행의 양에
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +226,Transfer Asset,전송 자산
+DocType: Student,Home Address,집 주소
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +227,Transfer Asset,전송 자산
 DocType: POS Profile,POS Profile,POS 프로필
 apps/erpnext/erpnext/config/schools.py +33,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 +129,"Item {0} is a template, please select one of its variants","{0} 항목 템플릿이며, 그 변종 중 하나를 선택하십시오"
 DocType: Asset,Asset Category,자산의 종류
@@ -4114,8 +4174,8 @@
 DocType: Assessment,Room,방
 DocType: Purchase Order,Advance Paid,사전 유료
 DocType: Item,Item Tax,상품의 세금
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +765,Material to Supplier,공급 업체에 소재
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +189,Excise Invoice,소비세 송장
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,Material to Supplier,공급 업체에 소재
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,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,유동 부채
@@ -4125,7 +4185,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,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 +136,Credit Card,신용카드
+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.,재고 거래의 기본 설정.
 DocType: Purchase Invoice,Next Date,다음 날짜
@@ -4133,6 +4193,7 @@
 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: Academic Term,Term End Date,기간 종료 날짜
 DocType: Hub Settings,Seller Name,판매자 이름
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),차감 세금 및 수수료 (회사 통화)
 DocType: Item Group,General Settings,일반 설정
@@ -4144,7 +4205,7 @@
 DocType: Customer,Commission Rate,위원회 평가
 apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,변형을 확인
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,부서에서 허가 응용 프로그램을 차단합니다.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +115,"Payment Type must be one of Receive, Pay and Internal Transfer","결제 유형, 수신 중 하나가 될 지불하고 내부 전송합니다"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +118,"Payment Type must be one of Receive, Pay and Internal Transfer","결제 유형, 수신 중 하나가 될 지불하고 내부 전송합니다"
 apps/erpnext/erpnext/config/selling.py +169,Analytics,해석학
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,바구니가 비어 있습니다
 DocType: Production Order,Actual Operating Cost,실제 운영 비용
@@ -4159,10 +4220,10 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,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 +92,Designer,디자이너
+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/accounts/doctype/purchase_invoice/purchase_invoice.py +469,Cost Center is required in row {0} in Taxes table for type {1},비용 센터가 행에 필요한 {0} 세금 테이블의 유형에 대한 {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +472,Cost Center is required in row {0} in Taxes table for type {1},비용 센터가 행에 필요한 {0} 세금 테이블의 유형에 대한 {1}
 DocType: Program,Program Code,프로그램 코드
 ,Item-wise Purchase Register,상품 현명한 구매 등록
 DocType: Batch,Expiry Date,유효 기간
@@ -4172,12 +4233,12 @@
 apps/erpnext/erpnext/config/projects.py +13,Project master.,프로젝트 마스터.
 apps/erpnext/erpnext/controllers/status_updater.py +174,"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 +417, (Half Day),(반나절)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425, (Half Day),(반나절)
 DocType: Supplier,Credit Days,신용 일
 DocType: Leave Type,Is Carry Forward,이월된다
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +740,Get Items from BOM,BOM에서 항목 가져 오기
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +711,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 +549,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},행 # {0} : 날짜를 게시하면 구입 날짜와 동일해야합니다 {1} 자산의 {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +552,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,다른 한 창고에서 자산을 이동
diff --git a/erpnext/translations/ku.csv b/erpnext/translations/ku.csv
index f7bede6..e74a63d 100644
--- a/erpnext/translations/ku.csv
+++ b/erpnext/translations/ku.csv
@@ -18,11 +18,10 @@
 DocType: Sales Partner,Dealer,Dealer
 DocType: Employee,Rented,bi kirê
 DocType: Purchase Order,PO-,"ramyarî,"
-apps/erpnext/erpnext/accounts/report/financial_statements.py +19,Start Year {0} not found.,Destpêk Sal {0} nehate dîtin.
 DocType: POS Profile,Applicable for User,Wergirtinê ji bo User
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +191,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Rawestandin Production Order ne dikarin bên îptal kirin, ew unstop yekem to cancel"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +197,Do you really want to scrap this asset?,Ma tu bi rastî dixwazî bibit vê hebûnê?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +17,Select Default Supplier,Supplier Default Hilbijêre
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +192,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Rawestandin Production Order ne dikarin bên îptal kirin, ew unstop yekem to cancel"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +198,Do you really want to scrap this asset?,Ma tu bi rastî dixwazî bibit vê hebûnê?
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Supplier Default Hilbijêre
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,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
@@ -42,46 +41,45 @@
 DocType: Sales Invoice,Customer Name,Navê mişterî
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +126,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 +180,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 +183,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 +148,Series Updated Successfully,Series Demê serket
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +149,Series Updated Successfully,Series Demê serket
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Lêkolîn
 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
-DocType: Quality Inspection Reading,Parameter,parametreyê
 apps/erpnext/erpnext/projects/doctype/project/project.py +54,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 +239,New Leave Application,New Leave Application
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,New Leave Application,New Leave Application
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +20,Attendance Record {0} exists against Student {1} for Course Schedule {2},"Amadebûna Record {0} dijî Student {1} de heye ji bo biryargirtinê, Kurs {2}"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Bank Draft,pêşnûmeya Bank
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,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
 DocType: Academic Term,Academic Term,Term (Ekadîmî)
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +13,Material,Mal
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Quantity,Jimarî
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +511,Accounts table cannot be blank.,table Hesabên nikare bibe vala.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +616,Quantity,Jimarî
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +512,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)
 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/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 +142,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ê
-DocType: Purchase Invoice,Monthly,Mehane
 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/buying/doctype/purchase_order/purchase_order.js +771,Invoice,Biha
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +750,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 +198,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 +74,Row # {0}:,Row # {0}:
+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 +127,Please select Price List,Ji kerema xwe ve List Price hilbijêre
@@ -112,8 +110,8 @@
 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 +589,Get items from,Get tomar ji
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +382,Stock cannot be updated against Delivery Note {0},Stock dikare li hember Delivery Têbînî ne bê ewe {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Get tomar ji
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,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
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,torpîl
@@ -122,7 +120,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,kalîyê
 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 +156,Salary Structure Missing,Missing Structure meaş
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,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î
@@ -130,10 +128,11 @@
 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 +156,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/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Ma Asset Fixed&quot; nikare bibe nedixwest, wek record Asset li dijî babete heye"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +189,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"
 DocType: Tax Rule,Tax Type,Type bacê
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +144,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}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,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/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
@@ -143,18 +142,17 @@
 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 +165,Opening,Dergeh
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,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/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Mişterî&gt; Mişterî Pol&gt; Herêma
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Account Pay Tenê
 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.
 DocType: Lead,Product Enquiry,Lêpirsînê ya Product
 DocType: Academic Term,Schools,dibistanên
 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 +335,Please select Company first,Ji kerema xwe ve yekem Company hilbijêre
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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
@@ -164,7 +162,7 @@
 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
 DocType: Purchase Invoice Item,Is Fixed Asset,E Asset Fixed
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Available qty is {0}, you need {1}","QTY de derbasdar e {0}, divê hûn {1}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +225,"Available qty is {0}, you need {1}","QTY de derbasdar e {0}, divê hûn {1}"
 DocType: Expense Claim Detail,Claim Amount,Şêwaz îdîaya
 DocType: Employee,Mr,Birêz
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Supplier Type / Supplier
@@ -173,25 +171,26 @@
 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: Assessment Result,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 +171,Annual Salary,Salary salane
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Annual Salary,Salary salane
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Mesref Stock
-apps/erpnext/erpnext/accounts/report/financial_statements.py +22,End Year {0} not found.,End Sal {0} nehate dîtin.
 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}"
 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 +130,At least one mode of payment is required for POS invoice.,De bi kêmanî yek mode of tezmînat ji bo fatûra POS pêwîst e.
 DocType: Products Settings,Show Products as a List,Show Products wek List
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Download Şablon, welat guncaw tije û pelê de hate guherandin ve girêbidin. Hemû dîrokên û karker combination di dema hilbijartî dê di şablon bên, bi records amadebûnê heyî"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +451,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/stock/doctype/stock_entry/stock_entry.py +456,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/controllers/accounts_controller.py +614,"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/controllers/accounts_controller.py +617,"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 +166,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
@@ -203,13 +202,13 @@
 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 +147,Execution,Birêverbirî
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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/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}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,Cost Center {0} does not belong to Company {1},Mesrefa Navenda {0} nayê to Company girêdayî ne {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +100,Cost Center {0} does not belong to Company {1},Mesrefa Navenda {0} nayê to Company girêdayî ne {1}
 DocType: Customer,Individual,Şexsî
 DocType: Interest,Academics User,akademîsyenên Bikarhêner
 DocType: Cheque Print Template,Amount In Figure,Mîqdar Li Figure
@@ -225,30 +224,32 @@
 DocType: Production Planning Tool,Sales Orders,ordênên Sales
 DocType: Purchase Taxes and Charges,Valuation,Texmînî
 ,Purchase Order Trends,Bikirin 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,Daxwaz ji bo gotinên li dikare were bi tikandina li ser vê lînkê tê xwestin
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,"Veqetandin, pelên ji bo sala."
 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,"Vala bihêlin, eger tu bixwazî pędivî hemû ders ji bo dema akademîk hilbijartin"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,Insufficient Stock,Stock Têrê nake
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227,Insufficient Stock,Stock Têrê nake
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Planning þiyanên Disable û Time Tracking
+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: 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/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} does not belong to Company {1},Account {0} nayê to Company girêdayî ne {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +86,Account {0} does not belong to Company {1},Account {0} nayê to Company girêdayî ne {1}
 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}
 DocType: Naming Series,Series List for this Transaction,Lîsteya Series ji bo vê Transaction
 DocType: Sales Invoice,Is Opening Entry,Ma Opening Peyam
 DocType: Customer Group,Mention if non-standard receivable account applicable,"Behs, eger ne-standard account teleb pêkanîn,"
 DocType: Course Schedule,Instructor Name,Navê Instructor
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,For Warehouse is required before Submit,Ji bo Warehouse berî pêwîst e Submit
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,For Warehouse is required before Submit,Ji bo Warehouse berî pêwîst e Submit
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,pêşwazî li
 DocType: Sales Partner,Reseller,Reseller
 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 +1436,"LocalStorage is full , did not save","LocalStorage tije ye, rizgar ne"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1460,"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}
@@ -261,18 +262,19 @@
 apps/erpnext/erpnext/templates/generators/item.html +78,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 +5,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/leave_application/leave_application.py +206,Only the selected Leave Approver can submit this Leave Application,Tenê hilbijartin Leave Approver dikarin vê Leave Application submit
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +213,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 +114,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 +179,Leaves per Year,Dihêle per Sal
+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 +103,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}
+DocType: Email Digest,Profit & Loss,Qezencê &amp; Loss
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,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 +435,Leave Blocked,Dev ji astengkirin
-apps/erpnext/erpnext/stock/doctype/item/item.py +669,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 +443,Leave Blocked,Dev ji astengkirin
+apps/erpnext/erpnext/stock/doctype/item/item.py +671,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 +83,Annual,Yeksalî
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +86,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
@@ -280,20 +282,22 @@
 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î
 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 +91,Software Developer,Developer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,Developer
 DocType: Item,Minimum Order Qty,Siparîşa hindiktirîn Qty
 DocType: Pricing Rule,Supplier Type,Supplier Type
 DocType: Scheduling Tool,Course Start Date,Kurs Date Start
 DocType: Item,Publish in Hub,Weşana Hub
+DocType: Student Admission,Student Admission,Admission Student
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is cancelled,Babetê {0} betal e
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Material Request,Daxwaza maddî
+apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} is cancelled,Babetê {0} betal e
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +823,Material Request,Daxwaza maddî
 DocType: Bank Reconciliation,Update Clearance Date,Update Date Clearance
 apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +28,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 +328,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}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +333,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/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î
@@ -309,20 +313,21 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +130,Please select Charge Type first,Ji kerema xwe ve yekem Charge Type hilbijêre
 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: Email Digest,New Quotations,Quotations New
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,"The yekem Approver Leave di lîsteyê de, wê bê weke default Leave Approver danîn"
 DocType: Tax Rule,Shipping County,Shipping County
 apps/erpnext/erpnext/config/desktop.py +158,Learn,Fêrbûn
 DocType: Asset,Next Depreciation Date,Next Date Farhad.
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Cost Activity per Employee
 DocType: Accounts Settings,Settings for Accounts,Mîhengên ji bo Accounts
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +626,Supplier Invoice No exists in Purchase Invoice {0},Supplier bi fatûreyên No li Purchase bi fatûreyên heye {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +629,Supplier Invoice No exists in Purchase Invoice {0},Supplier bi fatûreyên No li Purchase bi fatûreyên heye {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Manage Sales Person Tree.
 DocType: Job Applicant,Cover Letter,Paldana ser
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Cheques Outstanding û meden ji bo paqijkirina
 DocType: Item,Synced With Hub,Senkronîzekirin Bi Hub
 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 +348,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 +86,Circular Reference Error,Error Reference bezandin
@@ -334,15 +339,16 @@
 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 +806,Delivery Note,Delivery Note
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +800,Delivery Note,Delivery Note
 apps/erpnext/erpnext/config/learn.py +87,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 +233,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/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/setup/doctype/email_digest/email_digest.py +104,Summary for this week and pending activities,Nasname ji bo vê hefteyê û çalakiyên hîn
+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"
 DocType: Employee,Company Email,Company Email
@@ -354,27 +360,28 @@
 apps/erpnext/erpnext/config/hr.py +186,"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
-apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Purchase bi fatûreyên nikare li hemberî sermaye heyî ne bên kirin {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +554,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 +54,{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 +812,Select Item,Hilbijêre babetî
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +791,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 \
 					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 +142,Purchase Invoice {0} is already submitted,Bikirin bi fatûreyên {0} ji xwe şandin
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch No divê eynî wek {1} {2}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +143,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î.
 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 +342,Please see attachment,Ji kerema xwe ve attachment bibînin
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,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 +19,Setup Already Complete!!,Setup Jixwe Complete !!
 ,Finished Goods,Goods qedand
 DocType: Delivery Note,Instructions,Telîmata
 DocType: Quality Inspection,Inspected By,teftîş kirin By
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Supplier&gt; Type Supplier
 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/public/js/utils/item_selector.js +12,Add Items,lê zêde bike babetî
@@ -388,29 +395,29 @@
 DocType: Currency Exchange,Currency Exchange,Exchange
 DocType: Purchase Invoice Item,Item Name,Navê babetî
 DocType: Authorization Rule,Approving User  (above authorized value),Erêkirina User (li jorê nirxa destûr)
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Balance Credit
+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/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 +736,Purchase Return,Return kirîn
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +715,Purchase Return,Return kirîn
 ,Purchase Register,Buy Register
 DocType: 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 +202,{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 +209,{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 +143,Reason for losing,Sedem ji bo winda
-apps/erpnext/erpnext/accounts/utils.py +239,Allocated amount can not greater than unadjusted amount,butçe dikare ne mezintir mîqdara unadjusted
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +163,Reason for losing,Sedem ji bo winda
+apps/erpnext/erpnext/accounts/utils.py +316,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 +79,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: Account,Cost of Goods Sold,Cost mal Sold
 DocType: Purchase Invoice,Yearly,Hit
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +225,Please enter Cost Center,Ji kerema xwe ve Navenda Cost binivîse
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,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ê
@@ -423,26 +430,26 @@
 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
 DocType: Account,Is Group,Is Group
+DocType: Email Digest,Pending Purchase Orders,Hîn Orders Purchase
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Otomatîk Set Serial Nos li ser FIFOScheduler
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Check Supplier bi fatûreyên Hejmara bêhempabûna
 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 +102,Non Profit,Profit non
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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: Stock Reconciliation Item,Do not include symbols (ex. $),Ma sembolên de ne (ex. $)
 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 +638,Attribute {0} selected multiple times in Attributes Table,Pêşbîr {0} çend caran li Attributes Table hilbijartin
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Pêşbîr {0} çend caran li Attributes Table hilbijartin
 DocType: HR Settings,Employee record is created using selected field. ,record Employee bikaranîna hilbijartî tên afirandin e.
 DocType: Sales Order,Not Applicable,Rêveber
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,master Holiday.
 DocType: Request for Quotation Item,Required Date,Date pêwîst
 DocType: Delivery Note,Billing Address,Telefona berîkan
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +862,Please enter Item Code.,Tikaye kodî babetî bikevin.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +847,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"
@@ -456,12 +463,12 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Birûmet û meden
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Hemû pelên bi rêk û wêneke e
 DocType: Job Opening,Description of a Job Opening,Description of a Opening Job
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Pending activities for today,çalakiyên hîn ji bo îro
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,çalakiyên hîn ji bo îro
 apps/erpnext/erpnext/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: Manufacturing Settings,Time Between Operations (in mins),Time di navbera Operasyonên (li mins)
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +92,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} Budget bo Account {1} dijî Navenda Cost {2} e {3}. Ev dê ji aliyê biqede {4}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +95,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} Budget bo Account {1} dijî Navenda Cost {2} e {3}. Ev dê ji aliyê biqede {4}
 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
@@ -469,16 +476,16 @@
 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/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 +86,Administrative Officer,Berpirsê kargêrî
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,Berpirsê kargêrî
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +23,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 +319,Please select Company,Ji kerema xwe ve Company hilbijêre
-DocType: Stock Entry,Difference Account,Account Cudahiya
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +309,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 +44,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 +398,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 +399,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 +530,"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 +532,"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 +28,Buy,Kirrîn
@@ -486,7 +493,7 @@
 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 +1563,Serial no item cannot be a fraction,Serial no babete nikare bibe fraction
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1587,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
@@ -495,13 +502,14 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Account {0} does not belong to company: {1},Account {0} nayê ji şîrketa girêdayî ne: {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation already used for another company,Kurtenivîsên SYR ji berê ve ji bo şîrketa din tê bikaranîn
 DocType: Selling Settings,Default Customer Group,Default Mişterî Group
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Supplier is required against Payable account {0},Supplier dijî account cîhde pêwîst e {0}
 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
 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 +313,Reference No and Reference Date is mandatory for Bank transaction,Çavkanî No û Date: Çavkanî ji bo muameleyan Bank wêneke e
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +316,Reference No and Reference Date is mandatory for Bank transaction,Çavkanî No û Date: Çavkanî ji bo muameleyan Bank wêneke e
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Lê zêde bike Baca / Edit û doz li
 DocType: Purchase Invoice,Supplier Invoice No,Supplier bi fatûreyên No
 DocType: Territory,For reference,ji bo referansa
@@ -512,7 +520,6 @@
 DocType: Installation Note Item,Installation Note Item,Installation Têbînî babetî
 DocType: Production Plan Item,Pending Qty,Pending Qty
 DocType: Budget,Ignore,Berçavnegirtin
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Code babete&gt; babete Pol&gt; Brand
 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/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
@@ -523,11 +530,11 @@
 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/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 +28,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 +19,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 +707,Make Sales Order,Make Sales Order
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +701,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î
@@ -543,7 +550,8 @@
 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 +734,Sales Return,Return Sales
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +728,Sales Return,Return Sales
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +91,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)
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Database yên mişterî.
@@ -552,14 +560,13 @@
 DocType: Quotation,Quotation To,quotation To
 DocType: Lead,Middle Income,Dahata Navîn
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +212,Opening (Cr),Opening (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +795,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,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 +237,Allocated amount can not be negative,butçe ne dikare bibe neyînî
+apps/erpnext/erpnext/stock/doctype/item/item.py +797,Default Unit of Measure for Item {0} cannot be changed directly because 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î
 DocType: Purchase Order Item,Billed Amt,billed Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,A Warehouse mantiqî li dijî ku entries stock made bi.
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Sales bi fatûreyên timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},Çavkanî No &amp; Date: Çavkanî pêwîst e ji bo {0}
-DocType: Sales Invoice,Customer's Vendor,Vendor mişterî
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Proposal Writing,Writing Pêşniyarek
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,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"
@@ -568,13 +575,14 @@
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,Tracking Time
 DocType: Fiscal Year Company,Fiscal Year Company,Sal Company malî
 DocType: Packing Slip Item,DN Detail,Detail DN
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +257,Already supplier quotation has created,Jixwe dabînkerê amator tên afirandin hatiye
 DocType: Timesheet,Billed,billed
 DocType: Batch,Batch Description,batch Description
+apps/erpnext/erpnext/accounts/utils.py +685,"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 +733,View Offline Records,View girêdayî Records
+apps/erpnext/erpnext/accounts/page/pos/pos.js +715,View Offline Records,View girêdayî Records
+DocType: Student,Sibling Details,Details Sibling
 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: Payment Reconciliation,Invoice/Journal Entry Details,Bi fatûreyên / Journal Details Peyam
@@ -588,7 +596,7 @@
 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
 DocType: Employee,Passport Number,Nimareya pasaportê
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Manager,Rêvebir
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,Rêvebir
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,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
@@ -597,10 +605,11 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter email address,Ji kerema xwe re email address binivîse
 DocType: Production Order Operation,In minutes,li minutes
 DocType: Issue,Resolution Date,Date Resolution
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +299,Timesheet created:,Timesheet tên afirandin:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +715,Please set default Cash or Bank account in Mode of Payment {0},Ji kerema xwe ve Cash default an account Bank set li Mode of Payment {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +300,Timesheet created:,Timesheet tên afirandin:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +772,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
 DocType: Selling Settings,Customer Naming By,Qada Mişterî By
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,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: 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
@@ -625,6 +634,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,Qedandin
 DocType: Pricing Rule,Sales Manager,Manager Sales
 DocType: Salary Structure Employee,Base,Bingeh
+DocType: Timesheet,Total Billed Hours,Total Hours billed
 DocType: Journal Entry,Write Off Amount,Hewe Off Mîqdar
 DocType: Journal Entry,Bill No,Bill No
 DocType: Company,Gain/Loss Account on Asset Disposal,Account qezenc / Loss li ser çespandina Asset
@@ -639,11 +649,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +9,Pre Sales,Sales Pre
 DocType: Purchase Receipt,Other Details,din Details
 DocType: Account,Accounts,bikarhênerên
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Marketing,marketing
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +227,Payment Entry is already created,Peyam di peredana ji nuha ve tên afirandin
+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,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 +538,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 +21,Preview Salary Slip,Preview Bikini Salary
+apps/erpnext/erpnext/controllers/accounts_controller.py +541,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 +38,Preview Salary Slip,Preview Bikini Salary
 DocType: Company,Deafult Cost Center,Navenda Cost Deafult
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +48,Account {0} has been entered multiple times,Account {0} hatiye bicihkirin çend caran
 DocType: Account,Expenses Included In Valuation,Mesrefên di nav Valuation
@@ -652,7 +662,7 @@
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,Ji kerema xwe re Komeleya Xwendekarên hilbijêre
 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 +617,Item has variants.,Em babete Guhertoyên.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Em babete Guhertoyên.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,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
@@ -672,7 +682,7 @@
 DocType: Purchase Order,Supply Raw Materials,Supply Alav Raw
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,Roja ku fatûra next bi giştî wê bê. Ev li ser submit bi giştî.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,heyînên vegeryayî
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,{0} is not a stock Item,{0} e a stock babet ne
+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 +169,Lead must be set if Opportunity is made from Lead,Lead bê mîhenkirin eger derfetek e ji Lead kirin
@@ -739,26 +749,25 @@
 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 +709,No Permission,No Destûr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +710,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}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +298,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 +542,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} de divê bê şandin
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} de divê bê şandin
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,No karker dîtin
 DocType: Supplier Quotation,Stopped,rawestandin
 DocType: Item,If subcontracted to a vendor,Eger ji bo vendor subcontracted
 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.
 DocType: Warehouse,Tree Details,Details dara
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Send Now
 ,Support Analytics,Analytics Support
 DocType: Item,Website Warehouse,Warehouse Website
 DocType: Payment Reconciliation,Minimum Invoice Amount,Herî kêm Mîqdar bi fatûreyên
 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/sales_invoice/sales_invoice.py +227,Timesheet {0} is already completed or cancelled,Timesheet {0} ji xwe temam an jî betalkirin
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +259,Timesheet {0} is already completed or cancelled,Timesheet {0} ji xwe temam an jî betalkirin
 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
@@ -774,13 +783,13 @@
 apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Cedwela Kurs
 DocType: Maintenance Visit,Completion Status,Rewş cebîr
 DocType: HR Settings,Enter retirement age in years,temenê teqawidîyê Enter di salên
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +229,Target Warehouse,Warehouse target
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +230,Target Warehouse,Warehouse target
 DocType: Cheque Print Template,Starting location from left edge,Guherandinên location ji devê hiştin
 DocType: Item,Allow over delivery or receipt upto this percent,Destûrê bide ser teslîmkirina an jî meqbûza upto ev ji sedî
 DocType: Stock Entry,STE-,STE-
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Sales Order Date,Hêvîkirin Date Delivery nikarim li ber Sales Order Date be
 DocType: Upload Attendance,Import Attendance,Beşdariyê Import
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Hemû Groups babetî
+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/config/setup.py +89,Automatically compose message on submission of transactions.,"Otomatîk helbestan, peyamek li ser sertewandina muamele."
@@ -792,13 +801,15 @@
 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/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
 DocType: Expense Claim,Expenses,mesrefên
 DocType: Item Variant Attribute,Item Variant Attribute,Babetê Pêşbîr Variant
 ,Purchase Receipt Trends,Trends kirînê Meqbûz
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Research & Development,Lêkolîn &amp; Development
+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
 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
@@ -807,7 +818,7 @@
 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/controllers/accounts_controller.py +340,"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."
+apps/erpnext/erpnext/controllers/accounts_controller.py +343,"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
@@ -829,12 +840,12 @@
 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 +756,Purchase Receipt,Meqbûz kirîn
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +735,Purchase Receipt,Meqbûz kirîn
 ,Received Items To Be Billed,Pêşwaziya Nawy ye- Be
 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 +167,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 +282,Unable to find Time Slot in the next {0} days for Operation {1},Nikare bibînin Slot Time di pêş {0} rojan de ji bo Operasyona {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +170,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 +283,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 +439,BOM {0} must be active,BOM {0} divê çalak be
@@ -845,7 +856,7 @@
 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 +214,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 +217,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
@@ -859,9 +870,9 @@
 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
 DocType: Fee Structure,Components,Components
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,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 +612,Item Variants {0} updated,Babetê Variants {0} ve
+apps/erpnext/erpnext/stock/doctype/item/item.py +614,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 +843,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 +854,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
@@ -876,69 +887,72 @@
 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 +728,New Sales Invoice,New bi fatûreyên Sales
+apps/erpnext/erpnext/accounts/page/pos/pos.js +710,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 +728,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
 DocType: Material Request Item,Lead Time Date,Lead Date Time
 DocType: Guardian,Guardian Name,Navê Guardian
 DocType: Cheque Print Template,Has Print Format,Has Print Format
-apps/erpnext/erpnext/accounts/page/pos/pos.js +86, 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 +109,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 +619,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","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/page/pos/pos.js +75, 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 +613,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing 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 +606,Supplier Invoice Date cannot be greater than Posting Date,Date Supplier bi fatûreyên ne dikarin bibin mezintir Mesaj Date
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +609,Supplier Invoice Date cannot be greater than Posting Date,Date Supplier bi fatûreyên ne dikarin bibin mezintir Mesaj Date
 DocType: Purchase Invoice Item,Purchase Order Item,Bikirin Order babetî
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +130,Indirect Income,Dahata nerasterast di
 DocType: Cheque Print Template,Date Settings,Settings Date
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Variance
 ,Company Name,Navê Company
 DocType: SMS Center,Total Message(s),Total Message (s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +810,Select Item for Transfer,Hilbijêre babet ji bo transfera
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +789,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û.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Destûrê bide bikarhêneran ji bo weşînertiya Price List Rate li muamele
 DocType: Pricing Rule,Max Qty,Max Qty
-DocType: Student Applicant,Father's Name,Navê Bav
 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 +105,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î
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +686,All items have already been transferred for this Production Order.,Hemû tomar niha ji bo vê Production Order hatine veguhastin.
+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
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +694,All items have already been transferred for this Production Order.,Hemû tomar niha ji bo vê Production Order hatine veguhastin.
 DocType: Process Payroll,Select Payroll Year and Month,Select payroll Sal û Month
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,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
-DocType: Opportunity,Walk In,Walk In
 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 +12,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: Timesheet Detail,Bill,Hesab
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,White,Spî
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,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î
 DocType: SMS Center,All Lead (Open),Hemû Lead (Open)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +228,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})
+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 +731,Make ,Kirin
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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."
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Têxe min
-apps/erpnext/erpnext/controllers/selling_controller.py +154,Order Type must be one of {0},"Order Type, divê yek ji yên bê {0}"
+apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},"Order Type, divê yek ji yên bê {0}"
 DocType: Lead,Next Contact Date,Next Contact Date
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,vekirina Qty
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +393,Please enter Account for Change Amount,Ji kerema xwe ve Account ji bo Guhertina Mîqdar binivîse
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,Please enter Account for Change Amount,Ji kerema xwe ve Account ji bo Guhertina Mîqdar binivîse
 DocType: Student Batch,Student Batch Name,Xwendekarên Name Batch
 DocType: Holiday List,Holiday List Name,Navê Lîsteya Holiday
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js +8,Schedule Course,Kurs de Cedwela
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Stock Options,Vebijêrkên Stock
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Vebijêrkên Stock
 DocType: Journal Entry Account,Expense Claim,mesrefan
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +211,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 +237,Qty for {0},Qty ji bo {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +212,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 +238,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
@@ -947,9 +961,9 @@
 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/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,tomar rakirin bi ti guhertinek di dorpêçê de an nirxê.
+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 +635,Attribute table is mandatory,table taybetmendiyê de bivênevê ye
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,table taybetmendiyê de bivênevê ye
 DocType: Production Planning Tool,Get Sales Orders,Get Orders Sales
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{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
@@ -974,7 +988,7 @@
 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/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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Serial No {0} e di bin peymana parastina upto {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +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
@@ -986,7 +1000,7 @@
 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/controllers/selling_controller.py +231,Sales Order {0} is {1},Sales Order {0} e {1}
+apps/erpnext/erpnext/controllers/selling_controller.py +232,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
 DocType: Packing Slip,Net Weight UOM,Net Loss UOM
@@ -996,25 +1010,24 @@
 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
 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 +155,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Quotations ji Suppliers wergirt.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},{0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Average Age
 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/templates/pages/home.html +32,View All Products,View All Products
+apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,View All Products
 DocType: Company,Default Currency,Default Exchange
 DocType: Contact,Enter designation of this Contact,Îlankirina vê Contact binivîse
 DocType: Expense Claim,From Employee,ji xebatkara
-apps/erpnext/erpnext/controllers/accounts_controller.py +400,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
+apps/erpnext/erpnext/controllers/accounts_controller.py +403,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/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,û sal:
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +191,{0} {1} must be submitted,{0} {1} de divê bê şandin
-DocType: Email Digest,Annual Expense,Expense salane
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,{0} {1} must be submitted,{0} {1} de divê bê şandin
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +145,Quantity must be less than or equal to {0},Quantity gerek kêmtir an jî wekhev be {0}
 DocType: SMS Center,Total Characters,Total Characters
 apps/erpnext/erpnext/controllers/buying_controller.py +156,Please select BOM in BOM field for Item {0},Ji kerema xwe ve BOM di warê BOM hilbijêre ji bo babet {0}
@@ -1025,30 +1038,31 @@
 DocType: Sales Partner,Distributor,Belavkirina
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Têxe selikê Rule Shipping
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +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 +62,Please set 'Apply Additional Discount On',Ji kerema xwe ve set &#39;Bisepîne Discount Additional Li ser&#39; &#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +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
 DocType: Global Defaults,Global Defaults,Têrbûn Global
 apps/erpnext/erpnext/projects/doctype/project/project.py +153,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
 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 +327,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
 ,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 +362,Finished Item {0} must be entered for Manufacture type entry,"Xilas babet {0} kirin, divê ji bo cureyê Manufacture entry ketin"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +367,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
 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 +499,Nothing to request,Tu tişt ji bo daxwazkirina
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +500,Nothing to request,Tu tişt ji bo daxwazkirina
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'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 +73,Management,Serekî
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},An debît an kredîyê mîqdara ji bo pêwîst e {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,Serekî
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +55,Either debit or credit amount is required for {0},An debît an kredîyê mîqdara ji bo pêwîst e {0}
 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 +161,Blue,Şîn
+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
@@ -1058,12 +1072,12 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +23,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
 DocType: Stock Settings,Default Item Group,Default babetî Pula
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1374,Do you really want to submit the invoice?,Ma tu bi rastî dixwazî ji bo pêşkêşkirina fatûra?
+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 +685,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 +1526,"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 +679,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 +1550,"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/accounts/doctype/account/account_tree.js +26,"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
@@ -1083,104 +1097,106 @@
 DocType: Payment Reconciliation,Unreconciled Payment Details,Unreconciled Details Payment
 DocType: Global Defaults,Current Fiscal Year,Niha Sal Fiscal
 DocType: Global Defaults,Disable Rounded Total,Disable Rounded Total
-DocType: Lead,Call,Bang
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +417,'Entries' cannot be empty,&#39;Arşîva&#39; ne vala be
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +418,'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 +214,Fiscal Year {0} not found,Sal malî {0} nehate dîtin
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +221,Fiscal Year {0} not found,Sal malî {0} nehate dîtin
 apps/erpnext/erpnext/config/hr.py +238,Setting up Employees,Avakirina Karmendên
 DocType: Sales Order,SO-,WIHA-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Ji kerema xwe ve yekem prefix hilbijêre
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Please select prefix first,Ji kerema xwe ve yekem prefix hilbijêre
 DocType: Employee,O-,öó
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Research,Lêkolîn
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,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 +43,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 +57,View Ledger,View Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Kevintirîn
-apps/erpnext/erpnext/stock/doctype/item/item.py +504,"An Item Group exists with same name, please change the item name or rename the item group","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 +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/setup/setup_wizard/setup_wizard.py +437,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
 ,Budget Variance Report,Budceya Report Variance
 DocType: Salary Slip,Gross Pay,Pay Gross
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +90,Row {0}: Activity Type is mandatory.,Row {0}: Type Activity bivênevê ye.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +114,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/public/js/controllers/stock_controller.js +40,Accounting Ledger,Accounting Ledger
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,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,"
 DocType: BOM Item,Item Description,Babetê Description
+DocType: Student Sibling,Student Sibling,Xwendekarên Sibling
 DocType: Purchase Invoice,Is Recurring,nûkirin e
 DocType: Purchase Invoice,Supplied Items,Nawy Supplied
 DocType: Student,STUD.,Fehlan.
 DocType: Production Order,Qty To Manufacture,Qty To Manufacture
+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/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 +131,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 +175,Valuation Rate required for Item in row {0},Rate Valuation pêwîst ji bo vî babetî di rêza {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,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
 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 +87, to ,ber
+apps/erpnext/erpnext/accounts/page/pos/pos.js +76, 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/accounts/doctype/gl_entry/gl_entry.py +196,Not authorized to edit frozen Account {0},destûr ne ji bo weşînertiya frozen Account {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,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 +62,Sales Order {0} is not valid,Sales Order {0} ne derbasdar e
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Sales Order {0} ne derbasdar e
 apps/erpnext/erpnext/setup/doctype/company/company.py +185,"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 +152,Small,Biçûk
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,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}
 ,Invoiced Amount (Exculsive Tax),Şêwaz fatore (Exculsive Bacê)
-DocType: Student Applicant,Mother's / Guardian 1 Email ID,/ Guardian ID 1 Email Dayîk
 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 +160,Green,Kesk
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,Kesk
 DocType: Supplier,SUPP-,kreditupp-
 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 +57,Contract,Peyman
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,Peyman
 DocType: Email Digest,Add Quote,lê zêde bike Gotinên baş
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +498,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 +503,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 +80,Row {0}: Qty is mandatory,Row {0}: Qty wêneke e
+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 +737,Sync Master Data,Syncê Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +719,Sync Master Data,Syncê Master Data
 apps/erpnext/erpnext/public/js/setup_wizard.js +283,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"
+DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Ev komeke babete root e û ne jî dikarim di dahatûyê de were.
+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.
 DocType: Journal Entry Account,Purchase Order,Buy Order
 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 +345,"{0}: Employee email not found, hence email not sent","{0}: email Employee dîtin ne, yanî email şandin ne"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +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
 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 +118,"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/accounts/doctype/sales_invoice/sales_invoice.py +474,Delivery Note {0} is not submitted,Delivery Têbînî {0} tê şandin ne
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Delivery Note {0} is not submitted,Delivery Têbînî {0} tê şandin ne
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Sub-contracted Item,"Babetê {0}, divê babete-bînrawe bi peyman be"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Teçxîzatên hatiye capital
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Rule Pricing is yekem li ser esasê hilbijartin &#39;Bisepîne Li ser&#39; qada, ku dikare bê Babetê, Babetê Pol an Brand."
 DocType: Hub Settings,Seller Website,Seller Website
 DocType: Item,ITEM-,ŞANÎ-
-apps/erpnext/erpnext/controllers/selling_controller.py +147,Total allocated percentage for sales team should be 100,Total beşek veqetand ji bo tîma firotina divê 100 be
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +110,Production Order status is {0},Production Order status e {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Total beşek veqetand ji bo tîma firotina divê 100 be
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Production Order status e {0}
 DocType: Appraisal Goal,Goal,Armanc
 DocType: Sales Invoice Item,Edit Description,biguherîne Description
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +757,For Supplier,ji bo Supplier
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +723,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
@@ -1196,10 +1212,11 @@
 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
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +445,BOM {0} does not belong to Item {1},BOM {0} nayê to Babetê girêdayî ne {1}
 DocType: Sales Partner,Target Distribution,Belavkariya target
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1667,Deafault warehouse is required for selected item,warehouse Deafault bo em babete kilîk pêwîst e
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Deafault warehouse is required for selected item,warehouse Deafault bo em babete kilîk pêwîst e
 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
@@ -1208,23 +1225,23 @@
 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 +110,Hardware,Car
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,Car
 DocType: Sales Order,Recurring Upto,nişankirin Upto
 DocType: Attendance,HR Manager,Manager HR
 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 +48,Privilege Leave,Privilege Leave
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,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 +79,You need to enable Shopping Cart,Divê tu ji bo çalakkirina Têxe selikê
 DocType: Payment Entry,Writeoff,Writeoff
 DocType: Appraisal Template Goal,Appraisal Template Goal,Goal Appraisal Şablon
-DocType: Salary Slip,Earning,Earning
+DocType: Salary Component,Earning,Earning
 DocType: Purchase Invoice,Party Account Currency,Partiya Account Exchange
 ,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 +171,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 +174,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_data.py +358,Food,Xûrek
+apps/erpnext/erpnext/demo/setup/setup_data.py +301,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/course_schedule/course_schedule.js +103,Mark Attendence,Mark Attendence
@@ -1258,12 +1275,12 @@
 DocType: Sales Order Item,Planned Quantity,Quantity plankirin
 DocType: Purchase Invoice Item,Item Tax Amount,Şêwaz Bacê babetî
 DocType: Item,Maintain Stock,Pêkanîna Stock
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +209,Stock Entries already created for Production Order ,Stock berheman jixwe ji bo Production Order tên afirandin
+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
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,Change Net di Asset Fixed
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Vala bihêlin, eger ji bo hemû deverî nirxandin"
-apps/erpnext/erpnext/controllers/accounts_controller.py +620,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 +238,Max: {0},Max: {0}
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +15,From Datetime,ji DateTime
+apps/erpnext/erpnext/controllers/accounts_controller.py +623,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 +239,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 +153,"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."
@@ -1271,8 +1288,8 @@
 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 +552,cannot be greater than 100,dikarin bibin mezintir 100 ne
-apps/erpnext/erpnext/stock/doctype/item/item.py +680,Item {0} is not a stock Item,Babetê {0} e a stock babete ne
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +546,cannot be greater than 100,dikarin bibin mezintir 100 ne
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,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
@@ -1286,10 +1303,9 @@
 DocType: GL Entry,GL Entry,Peyam GL
 DocType: HR Settings,Employee Settings,Settings karker
 ,Batch-Wise Balance History,Batch-Wise Dîroka Balance
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,To Do List
 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 +61,Apprentice,Şagird
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +102,Negative Quantity is not allowed,Elemanekî negatîvî nayê ne bi destûr
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,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 +152,Employee cannot report to himself.,Xebatkarê ne dikarin ji xwe re rapor.
@@ -1310,15 +1326,14 @@
 DocType: Asset,Asset Name,Navê Asset
 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 +141,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 +719,Packing Slip,Packing Slip
+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 +713,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/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,Daxwaza ji bo gotinên li dikare bibe access bi tikandina vê lînkê
 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 +81,Analyst,Analîstê
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,Analîstê
 DocType: Item,Inventory,Inventory
 DocType: Item,Sales Details,Details Sales
 DocType: Quality Inspection,QI-,QI-
@@ -1326,7 +1341,7 @@
 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 +103,Government,Rêvebir
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,Rêvebir
 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î
 DocType: Company,Services,Services
@@ -1342,6 +1357,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,Financial Year Start Date,Financial Sal Serî Date
 DocType: POS Profile,Apply Discount,Apply Discount
 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
 DocType: Program Course,Program Course,Kurs Program
@@ -1382,12 +1398,12 @@
 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
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +110,Accounting Entry for {0} can only be made in currency: {1},Peyam Accounting ji bo {0} tenê dikare li ser dirava kir: {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Peyam Accounting ji bo {0} tenê dikare li ser dirava kir: {1}
 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
 DocType: Shopping Cart Settings,Payment Success URL,Payment URL bi serket
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +78,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: vegeriya babet {1} nayê di heye ne {2} {3}
+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ê
@@ -1396,40 +1412,39 @@
 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/stock/doctype/stock_entry/stock_entry.py +339,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/stock/doctype/stock_entry/stock_entry.py +344,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 +545,Manufacturing Quantity is mandatory,Manufacturing Quantity wêneke e
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Manufacturing Quantity wêneke e
 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 +71,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 +162,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/projects/doctype/timesheet/timesheet.py +186,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
 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 +130,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 +137,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
 DocType: Dependent Task,Dependent Task,Task girêdayî
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,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/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 +190,Leave of type {0} cannot be longer than {1},Leave a type {0} nikare were êdî ji {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +197,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
 DocType: SMS Center,Receiver List,Lîsteya Receiver
-apps/erpnext/erpnext/accounts/page/pos/pos.js +921,Search Item,Search babetî
+apps/erpnext/erpnext/accounts/page/pos/pos.js +910,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 +546,Already completed,jixwe temam
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +22,Payment Request already exists {0},Daxwaza peredana ji berê ve heye {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +550,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 +241,Quantity must not be more than {0},"Dorpêçê de ne, divê bêhtir ji {0}"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Quantity must not be more than {0},"Dorpêçê de ne, divê bêhtir ji {0}"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +76,Previous Financial Year is not closed,Previous Financial Sal is girtî ne
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +44,Age (Days),Age (Days)
 DocType: Quotation Item,Quotation Item,Babetê quotation
@@ -1446,7 +1461,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +221,Purchase Receipt {0} is not submitted,Buy Meqbûz {0} tê şandin ne
 DocType: Company,Default Payable Account,Default Account cîhde
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Mîhengên ji bo Têxe selikê bike wek qaîdeyên shipping, lîsteya buhayên hwd."
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +83,{0}% Billed,{0}% billed
+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î
@@ -1458,12 +1473,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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/schools/doctype/fees/fees.js +22,Collect,Berhevkirin
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Berhevkirin
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,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 +225,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
-DocType: Payment Reconciliation,Payments,Payments
 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
@@ -1475,7 +1489,7 @@
 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 +9,Procurement,Procurement
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,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/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
 ,Lead Details,Details Lead
 DocType: Purchase Invoice,End date of current invoice's period,roja dawî ji dema fatûra niha ya
@@ -1500,7 +1514,7 @@
 DocType: Purchase Invoice,Additional Discount,Discount Additional
 DocType: Selling Settings,Selling Settings,Firoştina Settings
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Auctions bike
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +97,Please specify either Quantity or Valuation Rate or both,"Ji kerema xwe, yan Quantity an Rate Valuation an hem diyar bike"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,"Ji kerema xwe, yan Quantity an Rate Valuation an hem diyar bike"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +13,Fulfillment,Bicihanînî
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Company, Meh û sala diravî wêneke e"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Mesref marketing
@@ -1521,14 +1535,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,ERPNext Sazkirin Qediya!
 DocType: Item,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +93,A Customer Group exists with same name please change the Customer name or rename the Customer Group,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/selling/doctype/customer/customer.py +126,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
 DocType: Stock Entry,Material Receipt,Meqbûz maddî
 DocType: Homepage,Products,Products
 DocType: Announcement,Instructor,Dersda
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},Type Partî û Partiya bo teleb / account cîhde pêwîst e {0}
 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
@@ -1539,7 +1552,7 @@
 ,Item-wise Sales Register,Babetê-şehreza Sales Register
 DocType: Asset,Gross Purchase Amount,Şêwaz Purchase Gross
 DocType: Asset,Depreciation Method,Method Farhad.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Offline,Ne girêdayî
+apps/erpnext/erpnext/accounts/page/pos/pos.js +686,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
@@ -1557,25 +1570,27 @@
 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"
 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 +858,Make Purchase Order,Make Purchase Order
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +852,Make Purchase Order,Make Purchase Order
 DocType: SMS Center,Send To,Send To
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,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 +148,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î
 DocType: Stock Reconciliation,Stock Reconciliation,Stock Lihevkirinê
 DocType: Territory,Territory Name,Name axa
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +172,Work-in-Progress Warehouse is required before Submit,Kar-li-Terakî Warehouse berî pêwîst e Submit
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,Work-in-Progress Warehouse is required before Submit,Kar-li-Terakî Warehouse berî pêwîst e Submit
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Applicant bo Job.
 DocType: Purchase Order Item,Warehouse and Reference,Warehouse û Reference
 DocType: Supplier,Statutory info and other general information about your Supplier,"info ya zagonî û din, agahiyên giştî li ser Supplier te"
-apps/erpnext/erpnext/hooks.py +88,Addresses,Navnîşan
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Supplier&gt; Type Supplier
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +212,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/hooks.py +95,Addresses,Navnîşan
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +215,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
 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)
 DocType: Sales Order,To Deliver and Bill,To azad û Bill
@@ -1583,11 +1598,10 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,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 +731,Payment,Diravdanî
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,Payment,Diravdanî
 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: Pricing Rule,Brand,Şanika şewatê
 DocType: Course,Course Abbreviation,Abbreviation Kurs
 DocType: Item,Will also apply for variants,jî wê ji bo Guhertoyên serî
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +142,"Asset cannot be cancelled, as it is already {0}","Sermaye ne bi dikarin bên îptal kirin, wekî ku ji niha ve {0}"
@@ -1599,7 +1613,7 @@
 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."
 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 +85,Associate,Şirîk
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,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
@@ -1607,7 +1621,7 @@
 DocType: Production Planning Tool,Material Requests,Daxwazên maddî
 DocType: Warranty Claim,Issue Date,Doza Date
 DocType: Activity Cost,Activity Cost,Cost Activity
-DocType: Timesheet Detail,Timesheet Detail,Detail timesheet
+DocType: Sales Invoice Timesheet,Timesheet Detail,Detail timesheet
 DocType: Purchase Receipt Item Supplied,Consumed Qty,telef Qty
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Agahdanyarî
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Nîşan dide ku, pakêta beşek ji vê delivery (Tenê bi Pêşnûmeya) e"
@@ -1630,6 +1644,7 @@
 DocType: Production Plan Material Request,Material Request Date,Maddî Date Daxwaza
 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
 DocType: Item,Has Variants,has Variants
 DocType: Monthly Distribution,Name of the Monthly Distribution,Name ji Belavkariya Ayda
 DocType: Sales Person,Parent Sales Person,Person bav Sales
@@ -1642,30 +1657,31 @@
 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 +44,"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/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.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +502,Error: {0} &gt; {1},Çewtî: {0}&gt; {1}
 DocType: Item,Is Sales Item,E babet Sales
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Babetê Pol Tree
 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.
 DocType: Naming Series,Current Value,Nirx niha:
-apps/erpnext/erpnext/controllers/accounts_controller.py +235,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/controllers/accounts_controller.py +238,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
 DocType: Delivery Note Item,Against Sales Order,Li dijî Sales Order
 ,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 +458,Item table can not be blank,table babete nikare bibe vala
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +443,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 +5,This is based on stock movement. See {0} for details,Ev li ser tevgera stock bingeha. Dîtina {0} Ji bo hûragahiyan li
 DocType: Pricing Rule,Selling,firotin
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +341,Amount {0} {1} deducted against {2},Şêwaz {0} {1} dabirîn dijî {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +344,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
@@ -1680,8 +1696,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +144,Cannot refer row number greater than or equal to current row number for this Charge type,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 +159,Red,Sor
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Ji kerema xwe re li ser &#39;Çêneke Cedwela&#39; click to pędivî Serial No bo Babetê added {0}
+apps/erpnext/erpnext/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
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Şêwaz Base (Company Exchange)
@@ -1689,7 +1705,7 @@
 DocType: Installation Note,Installation Time,installation Time
 DocType: Sales Invoice,Accounting Details,Details Accounting
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,Vemirandina hemû Transactions ji bo vê Company
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +187,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Row # {0}: Operation {1} ji bo {2} QTY ji malê xilas li Production temam ne Order # {3}. Ji kerema xwe ve status Karê rojanekirina via Têketin Time
+apps/erpnext/erpnext/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,Row # {0}: Operation {1} ji bo {2} QTY ji malê xilas li Production temam ne Order # {3}. Ji kerema xwe ve status Karê rojanekirina via Têketin Time
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,învêstîsîaên
 DocType: Issue,Resolution Details,Resolution Details
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,xercî
@@ -1725,16 +1741,17 @@
 DocType: Bank Reconciliation Detail,Against Account,li dijî Account
 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}
 DocType: Delivery Note,Excise Page Number,Baca Hejmara Page
 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}
 ,Maintenance Schedules,Schedules Maintenance
 DocType: Task,Actual End Date (via Time Sheet),Rastî End Date (via Time Sheet)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Amount {0} {1} against {2} {3},Şêwaz {0} {1} dijî {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +339,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 +138,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 +295,Debit To account must be a Receivable account,"Debit To account, divê hesabekî teleb be"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,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
 DocType: Purchase Invoice Item,Conversion Factor,Factor converter
@@ -1742,10 +1759,10 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +137,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
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +90,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Hemû pelên bi rêk û {0} nikare were kêmî ji pelên jixwe pejirandin {1} ji bo dema
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +93,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 +22,Enter Paid Amount,Şêwaz Paid binivîse
+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
@@ -1755,13 +1772,15 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,timesheets
 DocType: HR Settings,HR Settings,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.,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 +524,"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."
+apps/erpnext/erpnext/controllers/accounts_controller.py +527,"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 +249,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
 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/stock/get_item_details.py +123,Please specify Company,Ji kerema xwe ve Company diyar
 ,Customer Acquisition and Loyalty,Mişterî Milk û rêzgirtin ji
@@ -1772,17 +1791,19 @@
 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 +183,Closing (Opening + Totals),Girtina (Opening + Totals)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),Girtina (Opening + Totals)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,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/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
-apps/erpnext/erpnext/controllers/accounts_controller.py +272,Account {0} is invalid. Account Currency must be {1},Account {0} ne derbasdar e. Account Exchange divê {1}
+DocType: Email Digest,Pending Sales Orders,Hîn Orders Sales
+apps/erpnext/erpnext/controllers/accounts_controller.py +275,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 +956,"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 Slip,Deduction,Jêkişî
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +87,Row {0}: From Time and To Time is mandatory.,Row {0}: Ji Time û To Time de bivênevê ye.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +969,"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 +111,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 +262,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 +7,Please enter Employee Id of this sales person,Ji kerema xwe ve Employee Id bikevin vî kesî yên firotina
@@ -1790,7 +1811,7 @@
 DocType: Project,% Tasks Completed,% Peywir Qediya
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,Şêwaz Cudahiya divê sifir be
 DocType: Project,Gross Margin,Kenarê Gross
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +194,Please enter Production Item first,Ji kerema xwe ve yekemîn babet Production binivîse
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +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
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Girtebêje
@@ -1799,53 +1820,54 @@
 DocType: Maintenance Visit,Maintenance User,Maintenance Bikarhêner
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +149,Cost Updated,cost Demê
 DocType: Employee,Date of Birth,Rojbûn
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +86,Item {0} has already been returned,Babetê {0} ji niha ve hatine vegerandin
+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}
+DocType: Student Admission,Eligibility,ku mafê
 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 +177,Job Description,Job Description
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,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 +126,"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 +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Characters taybet ji bilî &quot;-&quot; &quot;.&quot;, &quot;#&quot;, û &quot;/&quot; li Beyazit, series destûr ne"
 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."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +24,Welcome to POS: Create your POS Profile,ji bo POS hatî: Create Profile POS te
 DocType: Expense Claim,Approver,Approver
 ,SO Qty,SO Qty
+DocType: Guardian,Work Address,Navnîşana karê
 DocType: Appraisal,Calculate Total Score,Calcolo Total Score
 DocType: Request for Quotation,Manufacturing Manager,manufacturing Manager
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serial No {0} e bin garantiya upto {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +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 +74,Shipments,Barên
+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î
 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 +153,Row # ,row #
+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 +156,Get From,Get From
+apps/erpnext/erpnext/public/js/utils.js +167,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 +167,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 +416,"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"
+apps/erpnext/erpnext/controllers/accounts_controller.py +419,"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
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} is disabled,Bikarhêner {0} neçalak e
 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 ...
 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 +171,"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 +346,{0} is mandatory for Item {1},{0} ji bo babet wêneke e {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,{0} is mandatory for Item {1},{0} ji bo babet wêneke e {1}
 DocType: Currency Exchange,From Currency,ji Exchange
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Ji kerema xwe ve butçe, Type bi fatûreyên û Number bi fatûreyên li Hindîstan û yek row hilbijêre"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,Cost ji Buy New
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},Sales Order pêwîst ji bo vî babetî {0}
 DocType: Purchase Invoice Item,Rate (Company Currency),Rate (Company Exchange)
-apps/erpnext/erpnext/demo/setup_data.py +360,Others,yên din
+DocType: Student Guardian,Others,yên din
 DocType: Payment Entry,Unallocated Amount,Şêwaz PV
 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
@@ -1865,17 +1887,16 @@
 apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,Inventory weşandin
 DocType: Activity Type,Default Billing Rate,Rate Billing Default
 DocType: Sales Invoice,Total Billing Amount,Şêwaz Total Billing
-apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +54,Receivable Account,Account teleb
-apps/erpnext/erpnext/controllers/accounts_controller.py +546,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} berê ji {2}
+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 +549,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 +79,CEO,CEO
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,CEO
 DocType: Expense Claim Detail,Expense Claim Detail,Expense Detail Îdîaya
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +808,Please select correct account,Ji kerema xwe ve hesabê xwe rast hilbijêre
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +809,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
-DocType: Purchase Invoice Item,Page Break,Page Break
 DocType: Production Order Operation,Pending,Nexelas
 DocType: Course,Course Name,Navê Kurs
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Bikarhêner ku dikarin sepanên îzna a karker taybetî ya erê
@@ -1884,14 +1905,15 @@
 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 +54,Full-time,Dijwar lîstin
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,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: Student,Guardians,serperişt
 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 +289,Debit To is required,Debit To pêwîst e
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +321,Debit To is required,Debit To pêwîst e
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Buy List Price
 DocType: Offer Letter Term,Offer Term,Term Pêşnîyaza
 DocType: Quality Inspection,Quality Manager,Manager Quality
@@ -1899,6 +1921,7 @@
 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/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
@@ -1909,18 +1932,17 @@
 DocType: Production Order Operation,Completed Qty,Qediya Qty
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"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 +273,Price List {0} is disabled,List Price {0} neçalak e
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +99,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/projects/doctype/timesheet/timesheet.py +123,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ê
 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}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Rate Valuation niha:
 DocType: Item,Customer Item Codes,Codes babet Mişterî
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,Exchange Gain / Loss
 DocType: Opportunity,Lost Reason,ji dest Sedem
-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/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/purchase_receipt/purchase_receipt.py +378,All items have already been invoiced,Hemû tomar niha ji fatore dîtin
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +379,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î
@@ -1936,18 +1958,19 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,muşteriyan te
 apps/erpnext/erpnext/projects/doctype/project/project.py +141,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/job_opening.html +19,Apply Now,Apply Now
+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."
 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
-apps/erpnext/erpnext/utilities/doctype/address/address.py +164,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: Fee Structure,Fee Structure,Structure Fee
 DocType: Timesheet Detail,Costing Amount,yên arzane ku Mîqdar
+DocType: Student Admission,Application Fee,Fee application
 DocType: Process Payroll,Submit Salary Slip,Submit Slip Salary
-apps/erpnext/erpnext/controllers/selling_controller.py +161,Maxiumm discount for Item {0} is {1}%,discount Maxiumm ji bo babet {0} e {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,discount Maxiumm ji bo babet {0} e {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Import li Gir
 DocType: Sales Partner,Address & Contacts,Navnîşana &amp; Têkilî
 DocType: SMS Log,Sender Name,Navê virrêkerî
@@ -1972,21 +1995,21 @@
 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_data.py +361,Travel,Gerrîn
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +155,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 +304,Travel,Gerrîn
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +167,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 +23,Update Cost,update Cost
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,update Cost
 DocType: Item Reorder,Item Reorder,Babetê DIRTYHERTZ
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +36,Show Salary Slip,Slip Show Salary
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +748,Transfer Material,transfer Material
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +53,Show Salary Slip,Slip Show Salary
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +166,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 +923,Please set recurring after saving,Ji kerema xwe ve set dubare piştî tomarkirinê
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +646,Select change amount account,Hilbijêre guhertina account mîqdara
+apps/erpnext/erpnext/public/js/controllers/transaction.js +914,Please set recurring after saving,Ji kerema xwe ve set dubare piştî tomarkirinê
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +703,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
@@ -1998,31 +2021,32 @@
 DocType: Quality Inspection,Verified By,Sîîrtê By
 DocType: Address,Subsidiary,Şîrketa girêdayî
 apps/erpnext/erpnext/setup/doctype/company/company.py +64,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","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: Quality Inspection,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 +33,Traceability,Traceability
 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 +352,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}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,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: Appraisal,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 +217,{0} {1} is fully billed,"{0} {1} e, bi temamî billed"
 DocType: Workstation Working Hour,End Time,Time End
 DocType: Payment Entry,Payment Deductions or Loss,Daşikandinên Payment an Loss
-apps/erpnext/erpnext/config/schools.py +100,LMS,LMS
+apps/erpnext/erpnext/config/schools.py +104,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/config/crm.py +6,Sales Pipeline,pipeline Sales
 DocType: Student Batch Student,Student Batch Student,Xwendekarên Student Batch
-DocType: Sales Invoice,Mass Mailing,Peyaman Mass
+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 +199,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/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 +297,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 +111,Pharmaceutical,dermanan
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +309,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/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
@@ -2037,27 +2061,28 @@
 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 +814,Please specify Company to proceed,Ji kerema xwe ve Company diyar bike ji bo berdewamiyê
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +793,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 +44,Compensatory Off,heger Off
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,heger Off
 DocType: Quality Inspection Reading,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.
 DocType: Room,Room Number,Hejmara room
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Referansa çewt {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +161,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ne dikarin bibin mezintir quanitity plankirin ({2}) li Production Order {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +162,{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 +217,Raw Materials cannot be blank.,Madeyên xav nikare bibe vala.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,"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 +460,Quick Journal Entry,Peyam di Journal Quick
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +111,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/accounts/doctype/sales_invoice/sales_invoice.py +441,"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 +450,Quick Journal Entry,Peyam di Journal Quick
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +103,You can not change rate if BOM mentioned agianst any item,"Tu dikarî rêjeya nayê guhertin, eger BOM agianst tu babete behsa"
 DocType: Employee,Previous Work Experience,Previous serê kurda
 DocType: Stock Entry,For Quantity,ji bo Diravan
 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 +214,{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
 ,Minutes to First Response for Issues,Minutes ji bo First Response bo Issues
 DocType: Purchase Invoice,Terms and Conditions1,Termên û Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +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ê.
@@ -2066,16 +2091,17 @@
 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 +398,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î
 ,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 +739,Item or Warehouse for row {0} does not match Material Request,Babetê an Warehouse bo row {0} nayê nagirin Daxwaza Material
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +747,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
 DocType: Fiscal Year,Year End Date,Sal Date End
 DocType: Task Depends On,Task Depends On,Task Dimîne li ser
-DocType: Lead,Opportunity,Fersend
+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
@@ -2088,7 +2114,7 @@
 DocType: Student,Joining Date,Dîroka tevlêbûnê
 ,Employees working on a holiday,Karmendên li ser dixebitin ku cejna
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Present Mark
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},date destpêka Maintenance nikarim li ber roja çêbûna ji bo Serial No be {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},date destpêka Maintenance nikarim li ber roja çêbûna ji bo Serial No be {0}
 DocType: Production Order,Actual End Date,Rastî Date End
 DocType: Purchase Invoice,PINV-,PINV-
 DocType: Authorization Rule,Applicable To (Role),To de evin: (Role)
@@ -2103,7 +2129,7 @@
 DocType: SMS Log,No of Requested SMS,No yên SMS Wîkîpediyayê
 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 +729,Please supply the specified items at the best possible rates,"Ji kerema xwe wan tedarîk bikin ji tomar xwe bişinî at the best, rêjeya muhtemel"
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +695,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 +117,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-
@@ -2112,7 +2138,7 @@
 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 +14,This is an example website auto-generated from ERPNext,Ev malperek nimûne auto-generated ji ERPNext
+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
 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.
 
@@ -2139,13 +2165,14 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd Diravan
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +54,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 +103,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 +504,Stock Entry {0} is not submitted,Stock Peyam di {0} tê şandin ne
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,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 +505,Stock Entry {0} is not submitted,Stock Peyam di {0} tê şandin ne
 DocType: Payment Reconciliation,Bank / Cash Account,Account Bank / Cash
 DocType: Tax Rule,Billing City,Billing City
 DocType: Salary Component Account,Salary Component Account,Account meaş Component
 DocType: Global Defaults,Hide Currency Symbol,Naverokan veşêre Exchange Symbol
 apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card","eg Bank, Cash, Credit Card"
+DocType: Lead Source,Source Name,Navê Source
 DocType: Journal Entry,Credit Note,Credit Note
 DocType: Warranty Claim,Service Address,xizmeta Address
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furnitures and Fixtures,Navmal û Fixtures
@@ -2157,6 +2184,7 @@
 DocType: Opportunity,Customer / Lead Name,Mişterî / Name Lead
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +89,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/controllers/trends.py +19,Total(Qty),Total (Qty)
 DocType: Sales Invoice,This Document,Ev Document
@@ -2168,15 +2196,15 @@
 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 +176,Organization branch master.,master şaxê Organization.
-apps/erpnext/erpnext/controllers/accounts_controller.py +273, or ,an
+apps/erpnext/erpnext/controllers/accounts_controller.py +276, or ,an
 DocType: Sales Order,Billing Status,Rewş Billing
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Report an Dozî Kurd
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,Mesref Bikaranîn
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-Li jorê
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +203,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: Journal Peyam {1} nayê Hesabê te nîne {2} an ji niha ve bi rêk û pêk li dijî fîşeke din
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +206,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 +90,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 +93,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
@@ -2204,8 +2232,8 @@
 DocType: Product Bundle,Parent Item,Babetê dê û bav
 DocType: Account,Account Type,Type account
 DocType: Delivery Note,DN-RET-,DN-direvin
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +115,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 +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Maintenance nehatî ji bo hemû tomar bi giştî ne. Ji kerema xwe re li ser &#39;Çêneke Cedwela&#39; klîk bike
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +118,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 +163,"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ê"
@@ -2217,13 +2245,13 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +32,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 +748,Delivery,Şandinî
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +742,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
 DocType: Payment Entry,Total Allocated Amount,Temamê meblaxa veqetandin
 DocType: Item Reorder,Material Request Type,Maddî request type
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +82,Row {0}: UOM Conversion Factor is mandatory,Row {0}: UOM Factor Converter wêneke e
+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
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,fîşeke #
@@ -2234,13 +2262,13 @@
 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 +90,Head of Marketing and Sales,Head of Marketing û Nest
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Bacê hatina
+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 +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.
 DocType: Item Supplier,Item Supplier,Supplier babetî
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +403,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 +770,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 +397,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 +764,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"
@@ -2252,28 +2280,29 @@
 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 +100,Issues,pirsên
+apps/erpnext/erpnext/hooks.py +109,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}"
 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
 ,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
 DocType: Supplier,Billing Currency,Billing Exchange
 DocType: Sales Invoice,SINV-RET-,SINV-direvin
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Large,Extra Large
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Extra Large,Extra Large
 ,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 +507,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 +107,Local,Herêmî
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +508,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/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 +154,Large,Mezin
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Large,Mezin
 DocType: Homepage Featured Product,Homepage Featured Product,Homepage Product Dawiyê
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,New Name Warehouse
-apps/erpnext/erpnext/accounts/report/financial_statements.py +225,Total {0} ({1}),Total {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +224,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
@@ -2319,9 +2348,9 @@
 DocType: Attendance,Leave Type,Type Leave
 apps/erpnext/erpnext/controllers/stock_controller.py +173,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/hr/doctype/salary_slip/salary_slip.py +79,Name error: {0},error Name: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +90,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 +178,{0} {1} does not associated with {2} {3},{0} {1} nayê bi têkildar ne {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +181,{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)
 DocType: Warehouse,Parent Warehouse,Warehouse dê û bav
@@ -2340,7 +2369,7 @@
 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
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,Li Hindîstan û yek babete divê bi elemanekî negatîvî di belgeya vegera ketin
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Atleast one item should be entered with negative quantity in return document,Li Hindîstan û yek babete divê bi elemanekî negatîvî di belgeya vegera ketin
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operasyona {0} êdî ji hemû dema xebatê di linux {1}, birûxîne operasyona nav operasyonên piralî"
 ,Requested,xwestin
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +83,No Remarks,No têbînî
@@ -2352,46 +2381,46 @@
 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/stock/doctype/purchase_receipt/purchase_receipt.py +98,Quality Inspection required for Item {0},Serperiştiya Quality pêwîst ji bo vî babetî {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,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î
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Manage Tree Herêmê.
 DocType: Journal Entry Account,Sales Invoice,bi fatûreyên Sales
 DocType: Journal Entry Account,Party Balance,Balance Partiya
-apps/erpnext/erpnext/accounts/page/pos/pos.js +475,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 +92,Salary Slip Created,Slip meaş Created
+apps/erpnext/erpnext/accounts/page/pos/pos.js +464,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 +95,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
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,Rêjeya Discount jî yan li dijî List Price an jî ji bo hemû List Price sepandin.
 DocType: Purchase Invoice,Half-yearly,Nîvsal carekî pişkinînên didanan
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +384,Accounting Entry for Stock,Peyam Accounting bo Stock
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +387,Accounting Entry for Stock,Peyam Accounting bo Stock
 DocType: Sales Invoice,Sales Team1,Team1 Sales
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,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 +96,Row {0}: Completed Qty must be greater than zero.,Row {0}: Qediya Qty divê ji sifirê mezintir be.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +120,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 +88,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Nikare zêdetir vegerin {1} ji bo babet {2}
+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
 DocType: Item Group,Show this slideshow at the top of the page,Nîşan bide vî slideshow li jor li ser vê rûpelê
 DocType: BOM,Item UOM,Babetê UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Şêwaz Bacê Piştî Mîqdar Discount (Company Exchange)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +147,Target warehouse is mandatory for row {0},warehouse Target bo row wêneke e {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +141,Target warehouse is mandatory for row {0},warehouse Target bo row wêneke e {0}
 DocType: Cheque Print Template,Primary Settings,Settings seretayî ya
 DocType: Purchase Invoice,Select Supplier Address,Address Supplier Hilbijêre
 DocType: Quality Inspection,Quality Inspection,Serperiştiya Quality
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Extra Small,Extra Small
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +194,Account {0} is frozen,Account {0} frozen e
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Extra Small
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +690,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 +197,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 +606,Can only make payment against unbilled {0},dikarin bi tenê peredayînê dijî make unbilled {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +126,Commission rate cannot be greater than 100,rêjeya Komîsyona ne dikarin bibin mezintir ji 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +609,Can only make payment against unbilled {0},dikarin bi tenê peredayînê dijî make unbilled {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,rêjeya Komîsyona ne dikarin bibin mezintir ji 100
 DocType: Stock Entry,Subcontract,Subcontract
 apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,Ji kerema xwe {0} yekem binivîse
 DocType: Production Order Operation,Actual End Time,Time rastî End
@@ -2402,30 +2431,30 @@
 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 +158,Colour,Reng
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,Reng
 DocType: Maintenance Visit,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ê
 DocType: Student Log,Academic,Danişgayî
-apps/erpnext/erpnext/controllers/accounts_controller.py +469,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Total pêşwext ({0}) li dijî Order {1} nikare were mezintir li Grand Total ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +472,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Total pêşwext ({0}) li dijî Order {1} nikare were mezintir li Grand Total ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Select Belavkariya mehane ya ji bo yeksan belavkirin armancên li seranserî mehan.
 DocType: Purchase Invoice Item,Valuation Rate,Rate Valuation
+DocType: Stock Reconciliation,SR/,SR /
 apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,List Price Exchange hilbijartî ne
 DocType: Assessment,Results,results
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +168,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 +175,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: Student Applicant,Father's/ Guardian 2 Email ID,/ Guardian ID 2 Email Bav
 DocType: Maintenance Visit Purpose,Against Document No,Li dijî dokumênt No
 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 +228,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 +231,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/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 +93,Researcher,lêkolîner
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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.
@@ -2437,25 +2466,25 @@
 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"
 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: Sales Invoice,Advertisement,Gilî
 DocType: Asset Category Account,Depreciation Expense Account,Account qereçî Expense
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Probationary Period,ceribandinê de
-apps/erpnext/erpnext/hooks.py +102,Announcements,Di belavokan da
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,ceribandinê de
+apps/erpnext/erpnext/hooks.py +111,Announcements,Di belavokan da
 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 +109,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 +16,To Datetime,to DateTime
+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/scheduling_tool/scheduling_tool.py +51,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/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Çalakî hîn
+DocType: Accounts Settings,Make Payment via Journal Entry,Make Payment via Peyam di Journal
+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 +127,Please enter relieving date.,Ji kerema xwe ve date ûjdanê xwe binivîse.
-apps/erpnext/erpnext/controllers/trends.py +145,Amt,Amt
+apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,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 +26,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"
@@ -2473,14 +2502,15 @@
 apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1},Nikare bibînin rate ji bo {0} ji bo {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Day Mark Half
 DocType: Sales Invoice,Sales Team,Team Sales
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Duplicate entry,entry Pekana
+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 +490,[Error],[Şaşî]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +484,[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
 apps/erpnext/erpnext/controllers/status_updater.py +175,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.
 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
@@ -2496,22 +2526,22 @@
 ,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 +25,All Jobs,Hemû Jobs
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,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
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Amount {0} {1} {2} {3},Şêwaz {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Amount {0} {1} {2} {3},Şêwaz {0} {1} {2} {3}
 DocType: Account,Depreciation,Farhad.
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Supplier (s)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Xebatkarê Tool Beşdariyê
 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 +372,Payment Entries {0} are un-linked,Arşîva Payment {0} un-girêdayî ne
+apps/erpnext/erpnext/accounts/utils.py +449,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
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +497,Material Requests {0} created,Daxwazên maddî {0} tên afirandin
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +498,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.
 DocType: Purchase Invoice,Address and Contact,Address û Contact
@@ -2550,7 +2580,7 @@
 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 +848,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 +859,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 +233,Closing (Dr),Girtina (Dr)
 DocType: Cheque Print Template,Cheque Size,Size Cheque
@@ -2571,7 +2601,8 @@
 ,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.
-apps/erpnext/erpnext/controllers/accounts_controller.py +555,'Update Stock' cannot be checked for fixed asset sale,&#39;Update Stock&#39; dikarin for sale sermaye sabît nayê kontrolkirin
+DocType: Student Guardian,Father,Bav
+apps/erpnext/erpnext/controllers/accounts_controller.py +558,'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ê
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Get rojanekirî
 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î
@@ -2581,15 +2612,15 @@
 DocType: Sales Order,Fully Delivered,bi temamî Çiyan
 DocType: Lead,Lower Income,Dahata Lower
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","Serê account di bin mesulîyetê, li ku Profit / Loss tê veqetandin, wê bê"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +166,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 +238,"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 +81,Purchase Order number required for Item {0},Bikirin siparîşê pêwîst ji bo vî babetî {0}
+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/purchase_receipt/purchase_receipt.py +82,Purchase Order number required for Item {0},Bikirin siparîşê pêwîst ji bo vî babetî {0}
 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 +17,Cannot change status as student {0} is linked with student application {1},Dikare biguhere status wek xwendekarê bi {0} bi serlêdana xwendekaran ve girêdayî {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +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: Timesheet,"List of employee which has ""Salary Slip Based on Timesheet"" is enabled in salary structure.",List of Xebatkarê ku &quot;Slip Salary Li ser timesheet&quot; di avahiya meaş vekirî be.
 DocType: Asset,Fully Depreciated,bi temamî bicūkkirin
 ,Stock Projected Qty,Stock projeya Qty
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Customer {0} does not belong to project {1},Mişterî {0} ne aîdî raxe {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,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
 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
@@ -2601,7 +2632,7 @@
 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/patches/v7_0/create_warehouse_nestedset.py +55,All Warehouses,Hemû enbar
+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 +105,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
@@ -2613,10 +2644,10 @@
 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/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Make Slip Salary
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +26,Browse BOM,Browse BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,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/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 Year,Academic Year,Sala (Ekadîmî)
+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
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,Qinetbirrînî
@@ -2624,12 +2655,12 @@
 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 +197,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 +204,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: Workstation Working Hour,Start Time,Time Start
 DocType: Item Price,Bulk Import Help,Gir Import Alîkarî
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +256,Select Quantity,Hilbijêre Diravan
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +257,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
@@ -2646,6 +2677,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,An QTY hedef an target mîqdara bivênevê ye.
 apps/erpnext/erpnext/config/projects.py +45,Cost of various activities,Cost ji çalakiyên cuda
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Bikin Events {0}, ji ber ku Employee girêdayî jêr Persons Sales nade a ID&#39;ya bikarhêner heye ne {1}"
+DocType: Timesheet,Billing Details,Details Billing
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +149,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}
 DocType: Item,Inspection Required,Serperiştiya Required
@@ -2665,7 +2697,7 @@
 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 +138,Wire Transfer,Transfer wire
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,Transfer wire
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Check hemû
 DocType: Sales Order,Recurring Order,nişankirin Order
 DocType: Company,Default Income Account,Account Default da-
@@ -2677,21 +2709,19 @@
 ,Welcome to ERPNext,ji bo ERPNext hatî
 apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,Rê ji bo Quotation
 DocType: Lead,From Customer,ji Mişterî
-apps/erpnext/erpnext/demo/setup_data.py +357,Calls,Banga
+apps/erpnext/erpnext/demo/setup/setup_data.py +300,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/stock/doctype/item/item.py +466,"As there are existing transactions for this item, \
-							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","As in muamele heyî ji bo em babete, \ tu nirxên wê yên nayê guhertin heye &#39;Has No Serial&#39;, &#39;Has Batch No&#39;, &#39;Gelo Stock Babetê&#39; û &#39;Method Valuation&#39;"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,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/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 +139,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: Issue,Opening Date,Date vekirinê
-apps/erpnext/erpnext/schools/api.py +58,Attendance has been marked successfully.,Amadebûna serkeftin nîşankirin.
+apps/erpnext/erpnext/schools/api.py +57,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 +136,Account Type for {0} must be {1},Type hesabekî ji {0} divê {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +139,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î"
@@ -2706,12 +2736,13 @@
 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/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 +20,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 +1190,Please select customer,Ji kerema xwe ve mişterî hilbijêre
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1193,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
@@ -2721,6 +2752,7 @@
 ,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 +50,Missing Currency Exchange Rates for {0},Exchange wenda Exchange ji bo {0}
 DocType: Assessment,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
@@ -2738,11 +2770,12 @@
 DocType: Journal Entry,JV-,nájv-
 DocType: Topic,Topic Name,Navê topic
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Li Hindîstan û yek ji Selling an Buying divê bên hilbijartin
+DocType: Grading Structure,Grade Intervals,navberan pola
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,xwezaya business xwe hilbijêrin.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Li ku derê operasyonên bi aktîvîteyên bi çalakiyek hatiye lidarxistin.
 DocType: Asset Movement,Source Warehouse,Warehouse Source
 DocType: Installation Note,Installation Date,Date installation
-apps/erpnext/erpnext/controllers/accounts_controller.py +534,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} ne ji şîrketa girêdayî ne {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +537,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
@@ -2756,28 +2789,31 @@
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Qty Batch li 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 û 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 +111,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/scheduling_tool/scheduling_tool.py +49,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 +87,{0}% Delivered,{0}% Çiyan
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% Çiyan
 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).,Babetê {0}: QTY fermana {1} nikare were kêmî ji kêm QTY da {2} (danasîn li babete).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Rêjeya Belavkariya mehane
 DocType: Territory,Territory Targets,Armanc axa
 DocType: Delivery Note,Transporter Info,Transporter Info
-apps/erpnext/erpnext/accounts/utils.py +379,Please set default {0} in Company {1},Ji kerema xwe ve set default {0} li Company {1}
+apps/erpnext/erpnext/accounts/utils.py +456,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
 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.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Titles ji bo şablonan print wek proforma.
+DocType: Student Guardian,Student Guardian,Xwendekarên Guardian
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +184,Valuation type charges can not marked as Inclusive,doz type Valuation ne dikarin weke berfireh nîşankirin
 DocType: POS Profile,Update Stock,update Stock
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM cuda ji bo tomar dê ji bo Şaşî (Total) nirxa Loss Net rê. Bawer bî ku Loss Net ji hev babete di UOM heman e.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
 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 +349,Journal Entries {0} are un-linked,Journal Arşîva {0} un-girêdayî ne
+apps/erpnext/erpnext/accounts/utils.py +426,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
@@ -2801,6 +2837,7 @@
 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î
+DocType: Homepage,"URL for ""All Products""",URL ji bo &quot;Hemû Products&quot;
 DocType: Leave Application,Leave Balance Before Application,Dev ji Balance Berî Application
 DocType: SMS Center,Send SMS,Send SMS
 DocType: Cheque Print Template,Width of amount in word,Width ji meblexa di peyvê de
@@ -2809,7 +2846,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 +29,Current Job Openings,Openings Job niha:
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,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
@@ -2822,7 +2859,7 @@
 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 +850,Show tax break-up,Show bacê break-up
+apps/erpnext/erpnext/public/js/controllers/transaction.js +841,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/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"
@@ -2832,10 +2869,11 @@
 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 +534,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 +80,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 +162,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/selling/doctype/customer/customer.py +195,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 +5,This is based on the attendance of this Student,Ev li ser amadebûna vê Xwendekarên li
@@ -2844,12 +2882,11 @@
 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 +75,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 +138,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/hr/doctype/leave_application/leave_application.py +145,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: Program Enrollment Fee,Program Enrollment Fee,Program hejmartina Fee
 DocType: Item,Supplier Items,Nawy Supplier
 DocType: Opportunity,Opportunity Type,Type derfet
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,New Company
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,Cost Center is required for 'Profit and Loss' account {0},Navenda mesrefa ji bo &#39;Profit û wendakirin&#39; pêwîst e account {0}
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Transactions tenê dikare bi destê afirînerê kompaniya deleted
 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.,hejmara şaş ya Giştî Ledger berheman dîtin. Hûn a Account nerast di mêjera hilbijart.
 DocType: Cheque Print Template,Cheque Width,Firehiya Cheque
@@ -2858,16 +2895,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Roja bûyînê ne dikarin bibin mezintir îro.
 ,Stock Ageing,Stock Ageing
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,timesheet
-apps/erpnext/erpnext/controllers/accounts_controller.py +228,{0} '{1}' is disabled,{0} &#39;{1}&#39; neçalak e
+apps/erpnext/erpnext/controllers/accounts_controller.py +231,{0} '{1}' is disabled,{0} &#39;{1}&#39; neçalak e
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Set as Open
 DocType: Cheque Print Template,Scanned Cheque,Scanned Cheque
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Send emails otomatîk ji Têkilî li ser danûstandinên Radestkirina.
+DocType: Timesheet,Total Billable Amount,Temamê meblaxa Billable
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Babetê 3
 DocType: Purchase Order,Customer Contact Email,Mişterî Contact Email
 DocType: Warranty Claim,Item and Warranty Details,Babetê û Warranty Details
 DocType: Sales Team,Contribution (%),Alîkarên (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Têbînî: em Peyam Pere dê ji ber ku tên afirandin, ne bê &#39;Cash an Account Bank&#39; ne diyar bû"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Responsibilities,berpirsiyariya
+apps/erpnext/erpnext/controllers/accounts_controller.py +78,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
 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
@@ -2875,6 +2913,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,lê zêde bike Users
 DocType: Pricing Rule,Item Group,Babetê Group
 DocType: Item,Safety Stock,Stock Safety
+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: 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)
@@ -2884,7 +2923,6 @@
 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: Timesheet,Total Hours,Total Hours
 DocType: Journal Entry,Printing Settings,Settings çapkirinê
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,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
@@ -2897,13 +2935,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Banking Investment
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +71,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
+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: Purchase Invoice Item,Rate,Qûrs
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Intern,Pizişka destpêker
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,Pizişka destpêker
 DocType: Stock Entry,From BOM,ji BOM
 DocType: Assessment,Assessment Code,Code nirxandina
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +32,Basic,Bingehîn
+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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',Ji kerema xwe re li ser &#39;Çêneke Cedwela&#39; klîk bike
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +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 +95,Reference No is mandatory if you entered Reference Date,"Çavkanî No diyarkirî ye, eger tu ketin Date Reference"
@@ -2912,11 +2951,11 @@
 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 +752,Issue Material,Doza Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +723,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 +683,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 +665,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ê."
 DocType: Hub Settings,Access Token,Têketinê Token
 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
@@ -2924,33 +2963,35 @@
 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 +1122,Enter value must be positive,Enter nirxa divê erênî be
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,All Territories,Hemû Territories
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1125,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
 DocType: Purchase Invoice,Items,Nawy
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +23,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 +221,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 +233,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 +96,Request for Quotations,Daxwaza ji bo Quotations
+apps/erpnext/erpnext/hooks.py +104,Request for Quotations,Daxwaza ji bo Quotations
 DocType: Payment Reconciliation,Maximum Invoice Amount,Maximum Mîqdar bi fatûreyên
 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 +628,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Default Unit ji pîvanê ji bo Variant &#39;{0}&#39;, divê wekî li Şablon be &#39;{1}&#39;"
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Default Unit ji pîvanê ji bo Variant &#39;{0}&#39;, divê wekî li Şablon be &#39;{1}&#39;"
 DocType: Shipping Rule,Calculate Based On,Calcolo li ser
 DocType: Delivery Note Item,From Warehouse,ji Warehouse
 DocType: Assessment,Supervisor Name,Navê Supervisor
+DocType: Assessment,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
 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 +27,Default Address Template cannot be deleted,Default Address Şablon ne jêbirin
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,Default Address Şablon ne jêbirin
 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
@@ -2965,8 +3006,8 @@
 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/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 +485,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 +336,Please select Posting Date first,Ji kerema xwe ve yekem Mesaj Date hilbijêre
+apps/erpnext/erpnext/stock/get_item_details.py +486,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 +326,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
@@ -2982,6 +3023,7 @@
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Payments Match bi fatûreyên
 DocType: Journal Entry,Bank Entry,Peyam Bank
 DocType: Authorization Rule,Applicable To (Designation),To de evin: (teklîfê)
+,Profitability Analysis,Analysis bêhtir bi
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,Têxe
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Pol By
 DocType: Guardian,Interests,berjewendiyên
@@ -2994,21 +3036,21 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,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 +141,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Babetê weşandin {0} bi \ bikaranîna Stock Lihevkirinê ve were
 DocType: Scheduling Tool,Day,Roj
 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 +122,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 +129,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
-DocType: Student Applicant,AP.,AP.
 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 +639,Point of Sale,Point of Sale
+apps/erpnext/erpnext/accounts/page/pos/pos.js +634,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
 DocType: Production Planning Tool,Production Planning Tool,Production Tool Planning
@@ -3017,74 +3059,77 @@
 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 +373,Quantity to Manufacture must be greater than 0.,Diravan ji bo Manufacture divê mezintir 0 be.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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 Profile,Customer Group,mişterî Group
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,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/doctype/asset/asset.py +83,Next Depreciation Date must be on or after today,"Next Date Farhad, divê li ser an, piştî îro be"
 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 +145,Please cancel Purchase Invoice {0} first,Ji kerema xwe ve poşmaniya kirînê bi fatûreyên {0} pêşîn
 DocType: Serial No,AMC Expiry Date,AMC Expiry Date
 ,Sales Register,Sales Register
 DocType: Quotation,Quotation Lost Reason,Quotation Lost Sedem
+apps/erpnext/erpnext/utilities/doctype/address/address.py +164,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.
 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 +330,Transaction reference no {0} dated {1},Muameleyan referansa no {0} dîroka {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,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 +107,Summary for this month and pending activities,Nasname ji bo vê mehê de û çalakiyên hîn
+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/accounts/doctype/sales_invoice/sales_invoice.py +406,Please remove this Invoice {0} from C-Form {1},Ji kerema xwe re vê bi fatûreyên {0} ji C-Form jê {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,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 +644,Get Items,Get babetî
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +623,Get Items,Get babetî
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +210,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 +41,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
 DocType: Payment Request,Initiated,destpêkirin
 DocType: Production Order,Planned Start Date,Plankirin Date Start
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,Customer is required against Receivable account {0},Mişterî li dijî account teleb pêwîst e {0}
 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 +265,Project-wise data is not available for Quotation,Daneyên Project-aqil e ji bo Quotation ne amade ne
+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 +101,Commercial,Commercial
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,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: Supplier Quotation,Supplier Address,Address Supplier
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +648,Row {0}# Account must be of type 'Fixed Asset',Row {0} # Account divê ji type be &#39;Asset Fixed&#39;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,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 +30,Series is mandatory,Series wêneke e
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +50,Series is mandatory,Series wêneke e
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Financial Services
 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
 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}
 DocType: Leave Allocation,Unused leaves,pelên Unused
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Cr,Kr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Cr,Kr
 DocType: Tax Rule,Billing State,Dewletê Billing
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +250,Transfer,Derbaskirin
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +187,{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 +825,Fetch exploded BOM (including sub-assemblies),Fetch BOM teqiya (di nav wan de sub-meclîs)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +254,Transfer,Derbaskirin
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +190,{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 +796,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 +115,Due Date is mandatory,Date ji ber wêneke e
+apps/erpnext/erpnext/controllers/accounts_controller.py +118,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
 DocType: Journal Entry,Pay To / Recd From,Pay To / Recd From
 DocType: Naming Series,Setup Series,Series Setup
 DocType: Payment Reconciliation,To Invoice Date,To bi fatûreyên Date
 DocType: Supplier,Contact HTML,Contact HTML
 ,Inactive Customers,muşteriyan neçalak e
+DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Receipts kirîn
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Çawa Pricing Rule sepandin?
 DocType: Quality Inspection,Delivery Note No,Delivery Têbînî No
@@ -3093,7 +3138,7 @@
 DocType: Company,Retail,Yektacirî
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +120,Customer {0} does not exist,Mişterî {0} tune
 DocType: Attendance,Absent,Neamade
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +587,Product Bundle,Bundle Product
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Product Bundle,Bundle Product
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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
@@ -3103,8 +3148,8 @@
 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 +742,Send Supplier Emails,Send Emails Supplier
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +104,"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/buying/doctype/request_for_quotation/request_for_quotation.js +708,Send Supplier Emails,Send Emails Supplier
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,"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
 DocType: Guardian Interest,Guardian Interest,Guardian Interest
 DocType: Timesheet,Employee Detail,Detail karker
@@ -3115,9 +3160,9 @@
 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}
 DocType: Salary Slip,Earning & Deduction,Maaş &amp; dabirîna
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +77,Account {0} cannot be a Group,Account {0} nikare bibe Group
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} cannot be a Group,Account {0} nikare bibe Group
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +31,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 +107,Negative Valuation Rate is not allowed,Rate Valuation neyînî nayê ne bi destûr
+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
 DocType: Holiday List,Weekly Off,Weekly Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Ji bo nimûne, 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +39,Provisional Profit / Loss (Credit),Wextî Profit / Loss (Credit)
@@ -3131,16 +3176,16 @@
 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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Navenda Cost ji bo babet wêneke e {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +626,Get Items from Product Bundle,Get Nawy ji Bundle Product
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +605,Get Items from Product Bundle,Get Nawy ji Bundle Product
 DocType: Asset,Straight Line,Line Straight
 DocType: Project User,Project User,Project Bikarhêner
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} is inactive,Account {0} neçalak e
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} is inactive,Account {0} neçalak e
 DocType: GL Entry,Is Advance,e Advance
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Alîkarîkirinê ji Date û amadebûnê To Date wêneke e
 apps/erpnext/erpnext/controllers/buying_controller.py +148,Please enter 'Is Subcontracted' as Yes or No,Ji kerema xwe re têkevin &#39;Ma Subcontracted&#39; wek Yes an No
 DocType: Sales Team,Contact No.,Contact No.
 DocType: Bank Reconciliation,Payment Entries,Arşîva Payment
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,'Profit and Loss' type account {0} not allowed in Opening Entry,&#39;Profit û wendakirin&#39; account type {0} li Opening Peyam destûr ne
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +71,'Profit and Loss' type account {0} not allowed in Opening Entry,&#39;Profit û wendakirin&#39; account type {0} li Opening Peyam destûr ne
 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
@@ -3159,7 +3204,7 @@
 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,Komîsyona li ser Sales
 DocType: Offer Letter Term,Value / Description,Nirx / Description
-apps/erpnext/erpnext/controllers/accounts_controller.py +558,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} ne dikarin bên şandin, ev e jixwe {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +561,"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: Production Order,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}.
@@ -3172,13 +3217,13 @@
 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/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Legal Expenses,Mesref Yasayî
 DocType: Purchase Invoice,Posting Time,deaktîv bike Time
-DocType: Sales Order,% Amount Billed,% Mîqdar billed
+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."
 apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},No babet bi Serial No {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Open Notifications
+DocType: Email Digest,Open Notifications,Open Notifications
 DocType: Payment Entry,Difference Amount (Company Currency),Cudahiya di Mîqdar (Company Exchange)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,Mesref direct
 apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
@@ -3186,7 +3231,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Hatiniyên Mişterî New
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,Travel Expenses
 DocType: Maintenance Visit,Breakdown,Qeza
-apps/erpnext/erpnext/controllers/accounts_controller.py +634,Account: {0} with currency: {1} can not be selected,Account: {0} bi currency: {1} ne bên hilbijartin
+apps/erpnext/erpnext/controllers/accounts_controller.py +637,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}
 DocType: Program Enrollment Tool,Student Applicants,Applicants Student
@@ -3194,15 +3239,15 @@
 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 +56,Probation,Dema cerribandinê
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Probation,Dema cerribandinê
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Components meaş
 DocType: Program Enrollment Tool,New Academic Year,New Year (Ekadîmî)
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Payment of salary for the month {0} and year {1},Dayina meaş ji bo meha {0} û sala {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Payment of salary for the month {0} and year {1},Dayina meaş ji bo meha {0} û sala {1}
 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 +144,Planning,Pîlankirinî
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,Pîlankirinî
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,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î
@@ -3215,11 +3260,10 @@
 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.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Sales invoice submitted sucessfully.,fatûra firotina sucessfully radestkirin.
 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}
 DocType: Assessment Result,Student Name,Navê Student
-apps/erpnext/erpnext/hooks.py +104,Assessment Schedule,Cedwela nirxandina
+apps/erpnext/erpnext/hooks.py +113,Assessment Schedule,Cedwela nirxandina
 DocType: Brand,Item Manager,Manager babetî
 DocType: Buying Settings,Default Supplier Type,Default Type Supplier
 DocType: Production Order,Total Operating Cost,Total Cost Operating
@@ -3229,6 +3273,7 @@
 DocType: GL Entry,Party Type,Type Partiya
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +78,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
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,master şablonê meaş.
 DocType: Leave Type,Max Days Leave Allowed,"Max Rojan Leave, nehiştin"
@@ -3240,18 +3285,19 @@
 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 +99,All Customer Groups,Hemû Groups Mişterî
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +78,Accumulated Monthly,Accumulated Ayda
-apps/erpnext/erpnext/controllers/accounts_controller.py +595,{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/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Hemû Groups Mişterî
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +81,Accumulated Monthly,Accumulated Ayda
+apps/erpnext/erpnext/controllers/accounts_controller.py +598,{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
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Price List Rate (Company Exchange)
 DocType: Products Settings,Products Settings,Products Settings
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +188,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
 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 +84,Secretary,Sekreter
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,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
@@ -3260,24 +3306,22 @@
 ,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
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,Row # {0}: No Serial wêneke e
+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 +859,Supplier Quotation,Supplier Quotation
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +838,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 +7,Collect Fees,berhev Fees
+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}
 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ê."
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Upcoming Events
 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/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
-DocType: Email Digest,Income / Expense,Hatina / Expense
 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."
@@ -3288,13 +3332,14 @@
 DocType: Customer,From Lead,ji Lead
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Emir ji bo hilberîna berdan.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Select Fiscal Sal ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,POS Profile required to make POS Entry,POS Profile pêwîst ji bo Peyam POS
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +509,POS Profile required to make POS Entry,POS Profile pêwîst ji bo Peyam POS
 DocType: Program Enrollment Tool,Enroll Students,kul Xwendekarên
 DocType: Hub Settings,Name Token,Navê Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Selling Standard
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Atleast one warehouse is mandatory,Li Hindîstan û yek warehouse wêneke e
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +129,Atleast one warehouse is mandatory,Li Hindîstan û yek warehouse wêneke e
 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 +330,{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
@@ -3315,10 +3360,11 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,Pelên divê li mamoste ji 0.5 terxan kirin
 DocType: Production Order,Operation Cost,Cost Operation
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,Upload amadebûnê ji pel .csv
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Outstanding Amt
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,armancên Set babetî Pula-şehreza ji bo vê Person Sales.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Rêzefîlma Cîran Cîran Freeze kevintir Than [Rojan]
-apps/erpnext/erpnext/controllers/accounts_controller.py +528,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: Asset ji bo sermaye sabît kirîn / sale wêneke e
+apps/erpnext/erpnext/controllers/accounts_controller.py +531,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: Asset ji bo sermaye sabît kirîn / sale wêneke e
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Eger du an jî zêdetir Rules Pricing dîtin li ser şert û mercên li jor li, Priority sepandin. Girîngî hejmareke di navbera 0 to 20 e dema ku nirxa standard zero (vala) e. hejmara Bilind tê wê wateyê ku ew dê sertir eger ne Rules Pricing multiple bi eynî şert û li wir bigirin."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Sal malî: {0} nayê heye ne
 DocType: Currency Exchange,To Currency,to Exchange
@@ -3335,15 +3381,15 @@
 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î
-DocType: Sales Invoice,Exhibition,Pêşkêşî
 apps/erpnext/erpnext/utilities/doctype/address/address.py +77,"Company is mandatory, as it is your company address","Company wêneke e, wekî ku address şirketa we ye"
 DocType: Item Attribute,From Range,ji Range
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +81,Syntax error in formula or condition: {0},Çewtiya Hevoksaziyê li formula an rewşa: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +92,Syntax error in formula or condition: {0},Çewtiya Hevoksaziyê li formula an rewşa: {0}
 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
+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 +28,Jobs,Jobs
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,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
@@ -3352,16 +3398,16 @@
 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 +763,Make Supplier Quotation,Make Supplier Quotation
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,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/controllers/sales_and_purchase_return.py +100,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 +42,Casual Leave,Leave Casual
+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
 DocType: Batch,Batch ID,ID batch
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,Note: {0},Têbînî: {0}
 ,Delivery Note Trends,Trends Delivery Note
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +103,This Week's Summary,Nasname vê hefteyê
+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
 DocType: Student Group Creation Tool,Get Courses,Get Kursên
 DocType: GL Entry,Party,Partî
@@ -3371,7 +3417,7 @@
 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 +59,Piecework,Piecework
+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: Task,Actual Time (in Hours),Time rastî (di Hours)
 DocType: Employee,History In Company,Dîroka Li Company
@@ -3388,7 +3434,7 @@
 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.
 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 +162,Black,Reş
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,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
@@ -3399,13 +3445,13 @@
 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 +69,Customer Id,Id mişterî
+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
 DocType: Journal Entry Account,Exchange Rate,Rate
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Sales Order {0} is not submitted,Sales Order {0} tê şandin ne
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +527,Sales Order {0} is not submitted,Sales Order {0} tê şandin ne
 DocType: Homepage,Tag Line,Line Tag
 DocType: Fee Component,Fee Component,Fee Component
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +857,Add items from,Lê zêde bike tomar ji
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +836,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}"
 DocType: Cheque Print Template,Regular,Rêzbirêz
 DocType: BOM,Last Purchase Rate,Last Rate Purchase
@@ -3413,6 +3459,7 @@
 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
 ,Sales Person-wise Transaction Summary,Nasname Transaction firotina Person-şehreza
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +60,Cost Center is required for 'Profit and Loss' account {0}. Please set up a default Cost Center for the Company.,Navenda mesrefa ji bo &#39;Profit û wendakirin&#39; account {0} pêwîst e. Ji kerema xwe ve set up a Navenda Cost default ji bo Company.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,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
@@ -3423,12 +3470,12 @@
 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 +710,Online,bike
+apps/erpnext/erpnext/accounts/page/pos/pos.js +692,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 +16,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ê
+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ê
 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 +74,Quality Management,Management Quality
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,Management Quality
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} has been disabled,Babetê {0} neçalakirin
 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
@@ -3450,11 +3497,12 @@
 DocType: Student,Student Email ID,Xwendekarên ID Email
 DocType: Employee,Notice (days),Notice (rojan)
 DocType: Tax Rule,Sales Tax Template,Şablon firotina Bacê
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1520,Select items to save the invoice,Select tomar bo rizgarkirina fatûra
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1544,Select items to save the invoice,Select tomar bo rizgarkirina fatûra
 DocType: Employee,Encashment Date,Date Encashment
 DocType: Account,Stock Adjustment,Adjustment Stock
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Default Activity Cost bo Type Activity heye - {0}
 DocType: Production Order,Planned Operating Cost,Plankirin Cost Operating
+DocType: Academic Term,Term Start Date,Term Serî Date
 apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},Ji kerema xwe ve bibînin girêdayî {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,balance Statement Bank wek per General Ledger
 DocType: Job Applicant,Applicant Name,Navê Applicant
@@ -3484,17 +3532,17 @@
 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.
 DocType: Company,Distribution,Belavkirinî
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +8,Amount Paid,Şêwaz: Destkeftiyên
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Project Manager,Project Manager
+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
 ,Quoted Item Comparison,Babetê têbinî eyna
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Dispatch,Dispatch
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,Dispatch
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,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.
-DocType: Sales Invoice,Supplier Reference,Supplier Reference
-apps/erpnext/erpnext/accounts/page/pos/pos.js +844,"Master data syncing, it might take some time","Master senkronîzekirina welat, bibe hinek dem bigire"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +832,"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î
@@ -3508,7 +3556,7 @@
 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 +83,Error in formula or condition,Çewtî di formula an rewşa
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,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û
@@ -3517,7 +3565,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},To Date divê di nava sala diravî be. Bihesibînin To Date = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Li vir tu dikarî height, giranî, alerjî, fikarên tibbî û hwd. Bidomînin"
 DocType: Leave Block List,Applies to Company,Ji bo Company
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +197,Cannot cancel because submitted Stock Entry {0} exists,ne dikarin betal bike ji ber ku nehatine şandin Stock Peyam di {0} heye
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +198,Cannot cancel because submitted Stock Entry {0} exists,ne dikarin betal bike ji ber ku nehatine şandin Stock Peyam di {0} heye
 DocType: Purchase Invoice,In Words,li Words
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,Today is {0}'s birthday!,Îro {0} &#39;s birthday e!
 DocType: Production Planning Tool,Material Request For Warehouse,Daxwaza maddî Ji bo Warehouse
@@ -3527,14 +3575,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,sala te ya aborî dest pê dike li ser
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Depreciations Asset û hevsengiyên
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +319,Amount {0} {1} transferred from {2} to {3},Şêwaz {0} {1} veguhestin ji {2} ji bo {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +322,Amount {0} {1} transferred from {2} to {3},Şêwaz {0} {1} veguhestin ji {2} ji bo {3}
 DocType: Sales Invoice,Get Advances Received,Get pêşketina pêşwazî
 DocType: Email Digest,Add/Remove Recipients,Zêde Bike / Rake Recipients
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +432,Transaction not allowed against stopped Production Order {0},Bo danûstandina li dijî Production rawestandin destûr ne Order {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +437,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 +143,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 +652,Item variant {0} exists with same attributes,variant babete {0} bi taybetmendiyên xwe heman heye
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,variant babete {0} bi taybetmendiyên xwe heman heye
+DocType: Leave Application,LAP/,HIMBÊZ/
 DocType: Salary Slip,Salary Slip,Slip meaş
 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
@@ -3542,12 +3591,12 @@
 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 +212,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 +215,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: Employee Education,Employee Education,Perwerde karker
-apps/erpnext/erpnext/public/js/controllers/transaction.js +866,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 +857,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
@@ -3557,14 +3606,14 @@
 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 +178,Invalid {0},Invalid {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Sick Leave,Leave nexweş
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,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
 DocType: Warehouse,PIN,DERZÎ
 DocType: Sales Invoice,Base Change Amount (Company Currency),Base Change Mîqdar (Company Exchange)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +313,No accounting entries for the following warehouses,No entries hisêba ji bo wargehan de li jêr
-apps/erpnext/erpnext/projects/doctype/project/project.js +102,Save the document first.,Save yekemîn belgeya.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +314,No accounting entries for the following warehouses,No entries hisêba ji bo wargehan de li jêr
+apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Save yekemîn belgeya.
 DocType: Account,Chargeable,Chargeable
 DocType: Company,Change Abbreviation,Change Abbreviation
 DocType: Expense Claim Detail,Expense Date,Date Expense
@@ -3577,10 +3626,9 @@
 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
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,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
 DocType: Appraisal,Appraisal Template,appraisal Şablon
 DocType: Item Group,Item Classification,Classification babetî
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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î
@@ -3590,8 +3638,8 @@
 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 +940,Please select {0} first,Ji kerema xwe {0} hilbijêre yekem
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +749,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 +953,Please select {0} first,Ji kerema xwe {0} hilbijêre yekem
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +757,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
@@ -3608,8 +3656,8 @@
 {% 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 +92,Warehouse not found in the system,Warehouse li sîstema nehat dîtin
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +106,This Month's Summary,Nasname vê mehê da
+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
 DocType: Quality Inspection Reading,Quality Inspection Reading,Reading Berhemên Quality
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Cîran Cîran Freeze kevintir Than` divê kêmtir ji% d roj be.
 DocType: Tax Rule,Purchase Tax Template,Bikirin Şablon Bacê
@@ -3619,21 +3667,22 @@
 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 +87,Please set Next Depreciation Date,Ji kerema xwe ve set Next Date Farhad.
-DocType: Payment Gateway,Payment Gateway,Gateway Payment
 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 +378,Operation Time must be greater than 0 for Operation {0},Operasyona Time divê mezintir 0 bo operasyonê bibin {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +380,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
 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)
 DocType: Program,Program Abbreviation,Abbreviation Program
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,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: Appraisal,Start Date,Destpêk Date
@@ -3649,21 +3698,22 @@
 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
 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 +27,Transaction currency must be same as Payment Gateway currency,currency muameleyan divê eynî wek Payment Gateway pereyan be
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Transaction currency must be same as Payment Gateway currency,currency muameleyan divê eynî wek Payment Gateway pereyan be
 DocType: Payment Entry,Receive,Wergirtin
+apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,Çavkanî:
 DocType: Maintenance Visit,Fully Completed,bi temamî Qediya
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Complete
 DocType: Employee,Educational Qualification,Qualification perwerdeyî
 DocType: Workstation,Operating Costs,Mesrefên xwe Operating
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Action eger Accumulated Ayda Budget derbas
 DocType: Purchase Invoice,Submit on creation,Submit li ser çêkirina
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +432,Currency for {0} must be {1},Pereyan ji bo {0} divê {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +435,Currency for {0} must be {1},Pereyan ji bo {0} divê {1}
 DocType: Asset,Disposal Date,Date çespandina
 DocType: Employee Leave Approver,Employee Leave Approver,Xebatkarê Leave Approver
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,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 +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/crm/doctype/opportunity/opportunity.py +79,"Cannot declare as lost, because Quotation has been made.","ne dikare ragihîne wek wenda, ji ber ku Quotation hatiye çêkirin."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Buy Master Manager
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +429,Production Order {0} must be submitted,Production Order {0} de divê bê şandin
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +434,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
@@ -3673,25 +3723,27 @@
 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
 DocType: Price List,Price List Name,List Price Name
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +181,Totals,Totals
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,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 +113,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 +120,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
 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.
+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 +181,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/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 +793,All records are synced.,Hemû qeydên bi senkronîzekirin.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +781,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.
 DocType: Cost Center,Cost Center Name,Mesrefa Name Navenda
@@ -3710,21 +3762,20 @@
 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/selling/doctype/quotation/quotation.py +49,Cannot set as Lost as Sales Order is made.,ne dikarin set wek Lost wek Sales Order çêkirin.
-DocType: Student Applicant,Mother's Name,Navê Dayîk
 DocType: Request for Quotation Item,Supplier Part No,Supplier Part No
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +348,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',ne dikarin dadixînin dema kategoriyê e ji bo &#39;Valuation&#39; an jî &#39;Vaulation û Total&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Received From,pêşwaziya From
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Received From,pêşwaziya From
 DocType: Lead,Converted,xwe guhert
 DocType: Item,Has Serial No,Has No Serial
 DocType: Employee,Date of Issue,Date of Dozî Kurd
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{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 +93,Row {0}: Hours value must be greater than zero.,Row {0}: value Hours divê ji sifirê mezintir be.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +117,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
 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 +172,{0} {1} does not exist,{0} {1} tune
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +175,{0} {1} does not exist,{0} {1} tune
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,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 +72,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
@@ -3733,13 +3784,14 @@
 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/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
 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 +109,Electrical,Electrical
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Electrical,Electrical
 DocType: Stock Entry,Total Value Difference (Out - In),Cudahiya di Total Nirx (Out - In)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,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}
@@ -3747,7 +3799,7 @@
 DocType: Item,Customer Code,Code mişterî
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +210,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 +292,Debit To account must be a Balance Sheet account,"Debit To account, divê hesabekî Bîlançoya be"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Stock Maldarî
@@ -3759,11 +3811,11 @@
 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 +301,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 +313,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: Sales Order Item,Ordered Qty,emir kir Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +673,Item {0} is disabled,Babetê {0} neçalak e
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,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 +838,BOM does not contain any stock item,BOM nade ti stock babete ne
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +809,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.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Çêneke Salary Slips
@@ -3771,23 +3823,24 @@
 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)
-apps/erpnext/erpnext/stock/doctype/item/item.py +485,Row #{0}: Please set reorder quantity,Row # {0}: Hêvîye set dorpêçê de DIRTYHERTZ
+DocType: Sales Invoice Timesheet,Billing Hours,Saet Billing
+apps/erpnext/erpnext/stock/doctype/item/item.py +487,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 +62,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
+DocType: Payment Entry,Allocate Payment Amount,"Veqetandin, Mîqdar Payment"
 DocType: Employee External Work History,Salary,Meaş
 DocType: Serial No,Delivery Document Type,Delivery Corî dokumênt
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Submit hemû slips meaş ji bo ku krîterên ku li jor hatiye hilbijartin
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} Nawy senkronîzekirin
 DocType: Sales Order,Partly Delivered,hinekî Çiyan
-DocType: Sales Invoice,Existing Customer,Mişterî heyî
 DocType: Email Digest,Receivables,telebê
+DocType: Lead Source,Lead Source,Source Lead
 DocType: Customer,Additional information regarding the customer.,agahiyên zêdetir di derbarê mişterî.
 DocType: Quality Inspection Reading,Reading 5,Reading 5
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +38,Campaign Name is required,Navê kampanyaya pêwîst e
 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
@@ -3795,10 +3848,9 @@
 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 +129,BOM and Manufacturing Quantity are required,BOM û Manufacturing Quantity pêwîst in
+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/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Range Ageing 2
 DocType: SG Creation Tool Course,Max Strength,Max Hêz
-DocType: Bank Reconciliation Detail,Amount,Biha
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM şûna
 ,Sales Analytics,Analytics Sales
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +113,Available {0},Available {0}
@@ -3806,14 +3858,14 @@
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Avakirina Email
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +96,Please enter default currency in Company Master,Ji kerema xwe ve currency default li Company Master binivîse
 DocType: Stock Entry Detail,Stock Entry Detail,Detail Stock Peyam
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +100,Daily Reminders,Reminders rojane
+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/account/account_tree.js +23,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 +71,Customer Service,Balkeş bûn
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Customer Service,Balkeş bûn
 DocType: Homepage Featured Product,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.
@@ -3822,8 +3874,9 @@
 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
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Default Kar In Warehouse Progress
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1570,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/accounts/page/pos/pos.js +1594,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
 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
@@ -3831,9 +3884,10 @@
 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 +82,Engineer,Hendese
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,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 +370,Item Code required at Row No {0},Code babete pêwîst li Row No {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +398,Item Code required at Row No {0},Code babete pêwîst li Row No {0}
 DocType: Sales Partner,Partner Type,Type partner
 DocType: Purchase Taxes and Charges,Actual,Rast
 DocType: Authorization Rule,Customerwise Discount,Customerwise Discount
@@ -3849,16 +3903,18 @@
 DocType: BOM,Raw Material Cost,Cost Raw
 DocType: Item Reorder,Re-Order Level,Re-Order Level
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,tomar û QTY plan ji bo ku tu dixwazî bilind emir hilberîna an download madeyên xav ji bo analîzê binivîse.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +55,Part-time,Nîvdem
+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
 DocType: Employee,Applicable Holiday List,Lîsteya Holiday wergirtinê
 DocType: Employee,Cheque,Berçavkirinî
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Series Demê
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +57,Series Updated,Series Demê
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Report Type wêneke e
 DocType: Item,Serial Number Series,Series Hejmara Serial
 apps/erpnext/erpnext/buying/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 +87,Clearance Date updated,Date Clearance ve
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,bi serkeftî li hev
@@ -3872,7 +3928,7 @@
 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 +513,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 +518,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.
@@ -3882,7 +3938,7 @@
 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/stock/doctype/stock_entry/stock_entry.py +158,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/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
 DocType: Company,Round Off Account,Li dora Off Account
@@ -3891,23 +3947,22 @@
 DocType: Customer Group,Parent Customer Group,Dê û bav Mişterî Group
 DocType: Purchase Invoice,Contact Email,Contact Email
 DocType: Appraisal Goal,Score Earned,score Earned
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Notice Period,Notice Period
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,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 +4,New Sales Person Name,Navê New Person Sales
 DocType: Packing Slip,Gross Weight UOM,Gross Loss UOM
-DocType: Email Digest,Receivables / Payables,Telebê / Payables
 DocType: Delivery Note Item,Against Sales Invoice,Li dijî bi fatûreyên Sales
 DocType: Bin,Reserved Qty for Production,Qty Reserved bo Production
 DocType: Asset,Frequency of Depreciation (Months),Frequency ji Farhad (meh)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +469,Credit Account,Account Credit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Credit Account,Account Credit
 DocType: Landed Cost Item,Landed Cost Item,Landed babet Cost
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +55,Show zero values,Nîşan bide nirxên zero
+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
 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 +647,Please specify Attribute Value for attribute {0},Ji kerema xwe binivîsin nirxê taybetmendiyê ji bo pêşbîrê {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Ji kerema xwe binivîsin nirxê taybetmendiyê ji bo pêşbîrê {0}
 DocType: Item,Default Warehouse,Default Warehouse
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +39,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
@@ -3929,19 +3984,22 @@
 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
-DocType: Sales Invoice,Cold Calling,Calling sar
 DocType: SMS Parameter,SMS Parameter,parametreyê SMS
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,Budceya û Navenda Cost
 DocType: Maintenance Schedule Item,Half Yearly,nîv Hit
 DocType: Lead,Blog Subscriber,abonetiyê Blog
+DocType: Guardian,Alternate Number,Hejmara Alternatîf
 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.
+DocType: Stock Reconciliation Item,Quantity Difference,Cudahiya di Diravan
 apps/erpnext/erpnext/config/hr.py +253,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 +141,Set as Lost,Set as Lost
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,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 +5,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
 DocType: Supplier,Credit Days Based On,Credit Rojan li ser bingeha
@@ -3953,11 +4011,10 @@
 ,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 +941,Select or add new customer,Select an jî lê zêde bike mişterî nû
+apps/erpnext/erpnext/accounts/page/pos/pos.js +930,Select or add new customer,Select an jî lê zêde bike mişterî nû
 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 +5,This is based on the attendance of this Employee,Ev li ser amadebûna vê Xebatkara li
-DocType: Sales Invoice,Frequency,Pircarînî
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +463,Debit Account,Account Debit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,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)
@@ -3966,27 +4023,27 @@
 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 +210,Supplier Quotation {0} created,Supplier Quotation {0} tên afirandin
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +208,Supplier Quotation {0} created,Supplier Quotation {0} tên afirandin
 apps/erpnext/erpnext/accounts/report/financial_statements.py +90,End Year cannot be before Start Year,End Sal nikarim li ber Serî Sal be
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Employee Benefits,Qezenca kardarîyê
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,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 +228,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 +232,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 +499,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 +500,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 +1007,Price List not found or disabled,List Price nehate dîtin an jî neçalakirinName
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1008,Price List not found or disabled,List Price nehate dîtin an jî neçalakirinName
 DocType: Expense Claim,Approved,pejirandin
 DocType: Pricing Rule,Price,Biha
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +244,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 +256,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
@@ -3997,12 +4054,12 @@
 DocType: Address,Office,Dayre
 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 +259,Please select Employee Record first.,Ji kerema xwe ve yekem Employee Record hilbijêre.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +266,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 +190,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 +235,Please enter Expense Account,Ji kerema xwe ve Expense Account binivîse
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,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 +963,"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 +976,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: World: Kurdî: Corî dokumênt, divê yek ji Purchase Order, Buy bi fatûreyên an Peyam Journal be"
 DocType: Employee,Current Address,niha Address
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Ger babete guhertoya yên babete din wê description, wêne, sewqiyata, bac û hwd dê ji şablonê set e, heta ku eşkere û diyar"
 DocType: Serial No,Purchase / Manufacture Details,Buy / Details Manufacture
@@ -4017,9 +4074,10 @@
 DocType: Asset Movement,Transaction Date,Date de mêjera
 DocType: Production Plan Item,Planned Qty,bi plan Qty
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,Total Bacê
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,For Quantity (Manufactured Qty) is mandatory,Ji bo Diravan (Manufactured Qty) wêneke e
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,For Quantity (Manufactured Qty) is mandatory,Ji bo Diravan (Manufactured Qty) wêneke e
 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 +78,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: Production Order,Actual Start Date,Date Serî rastî
@@ -4034,9 +4092,11 @@
 DocType: Warranty Claim,If different than customer address,Eger cuda ji adresa mişterî
 DocType: BOM Operation,BOM Operation,BOM Operation
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Li ser Previous Mîqdar Row
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +226,Transfer Asset,Asset transfer
+DocType: Student,Home Address,Navnîşana malê
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +227,Transfer Asset,Asset transfer
 DocType: POS Profile,POS Profile,Profile POS
 apps/erpnext/erpnext/config/schools.py +33,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 +129,"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î
@@ -4046,8 +4106,8 @@
 DocType: Assessment,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 +765,Material to Supplier,Madî ji bo Supplier
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +189,Excise Invoice,baca bi fatûreyên
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,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
 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:
@@ -4057,7 +4117,7 @@
 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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,Komên xwendekaran tên afirandin.
 DocType: Scheduling Tool,Scheduling Tool,Amûra scheduling
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +136,Credit Card,Li kû çûn
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,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ê.
 DocType: Purchase Invoice,Next Date,Date Next
@@ -4065,6 +4125,7 @@
 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: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Li vir tu dikarî hûragahiyan li malbata wek name û dagirkirina dê û bav, hevjîn û zarokên bidomînin"
+DocType: Academic Term,Term End Date,Term End Date
 DocType: Hub Settings,Seller Name,Navê Seller
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Bac û doz li dabirîn (Company Exchange)
 DocType: Item Group,General Settings,Mîhengên giştî
@@ -4076,7 +4137,7 @@
 DocType: Customer,Commission Rate,Rate Komîsyona
 apps/erpnext/erpnext/stock/doctype/item/item.js +261,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 +115,"Payment Type must be one of Receive, Pay and Internal Transfer","Type pereyî, divê yek ji peyamek be, Pay û Şandina Hundirîn"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +118,"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/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Têxe vala ye
 DocType: Production Order,Actual Operating Cost,Cost Operating rastî
@@ -4091,10 +4152,10 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,Ji kerema xwe re file CSV hilbijêre
 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 +92,Designer,Şikilda
+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
 DocType: Serial No,Delivery Details,Details Delivery
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +469,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}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +472,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
 ,Item-wise Purchase Register,Babetê-şehreza Register Purchase
 DocType: Batch,Expiry Date,Date Expiry
@@ -4104,12 +4165,12 @@
 apps/erpnext/erpnext/config/projects.py +13,Project master.,master Project.
 apps/erpnext/erpnext/controllers/status_updater.py +174,"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 +417, (Half Day),(Day Half)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425, (Half Day),(Day Half)
 DocType: Supplier,Credit Days,Rojan Credit
 DocType: Leave Type,Is Carry Forward,Ma çêşît Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +740,Get Items from BOM,Get Nawy ji BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +711,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 +549,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/controllers/accounts_controller.py +552,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
 ,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
diff --git a/erpnext/translations/lo.csv b/erpnext/translations/lo.csv
index 4971ba2..5f0e764 100644
--- a/erpnext/translations/lo.csv
+++ b/erpnext/translations/lo.csv
@@ -18,11 +18,10 @@
 DocType: Sales Partner,Dealer,ຕົວແທນຈໍາຫນ່າຍ
 DocType: Employee,Rented,ເຊົ່າ
 DocType: Purchase Order,PO-,PO-
-apps/erpnext/erpnext/accounts/report/financial_statements.py +19,Start Year {0} not found.,ເລີ່ມຕົ້ນປີ {0} ບໍ່ໄດ້ພົບເຫັນ.
 DocType: POS Profile,Applicable for User,ສາມາດນໍາໃຊ້ສໍາລັບຜູ້ໃຊ້
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +191,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","ໃບສັ່ງຜະລິດຢຸດເຊົາບໍ່ສາມາດໄດ້ຮັບການຍົກເລີກ, ຈຸກມັນຄັ້ງທໍາອິດເພື່ອຍົກເລີກການ"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +197,Do you really want to scrap this asset?,ທ່ານກໍ່ຕ້ອງການທີ່ຈະ scrap ຊັບສິນນີ້?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +17,Select Default Supplier,ເລືອກຜູ້ຜະລິດມາດຕະຖານ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +192,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","ໃບສັ່ງຜະລິດຢຸດເຊົາບໍ່ສາມາດໄດ້ຮັບການຍົກເລີກ, ຈຸກມັນຄັ້ງທໍາອິດເພື່ອຍົກເລີກການ"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +198,Do you really want to scrap this asset?,ທ່ານກໍ່ຕ້ອງການທີ່ຈະ scrap ຊັບສິນນີ້?
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,ເລືອກຜູ້ຜະລິດມາດຕະຖານ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},ສະກຸນເງິນແມ່ນຕ້ອງການສໍາລັບລາຄາ {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* ຈະໄດ້ຮັບການຄິດໄລ່ໃນການໄດ້.
 DocType: Address,County,county
@@ -42,46 +41,45 @@
 DocType: Sales Invoice,Customer Name,ຊື່ຂອງລູກຄ້າ
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +126,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 +180,Outstanding for {0} cannot be less than zero ({1}),ທີ່ຍັງຄ້າງຄາສໍາລັບ {0} ບໍ່ສາມາດຈະຫນ້ອຍກ່ວາສູນ ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,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 +148,Series Updated Successfully,ຊຸດອັບເດດຮຽບຮ້ອຍ
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +149,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,ທັງຫມົດຂອງຜູ້ຕິດຕໍ່
-DocType: Quality Inspection Reading,Parameter,ພາລາມິເຕີ
 apps/erpnext/erpnext/projects/doctype/project/project.py +54,Expected End Date can not be less than Expected Start Date,ຄາດວ່າສິ້ນສຸດວັນທີ່ບໍ່ສາມາດຈະຫນ້ອຍກ່ວາຄາດວ່າຈະເລີ່ມວັນທີ່
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,"ຕິດຕໍ່ກັນ, {0}: ອັດຕາຈະຕ້ອງດຽວກັນເປັນ {1}: {2} ({3} / {4})"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +239,New Leave Application,ການນໍາໃຊ້ອອກໃຫມ່
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,New Leave Application,ການນໍາໃຊ້ອອກໃຫມ່
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +20,Attendance Record {0} exists against Student {1} for Course Schedule {2},ຜູ້ເຂົ້າຮ່ວມບັນທຶກ {0} ມີຢູ່ກັບນັກສຶກສາ {1} ສໍາລັບຕາຕະລາງຂອງລາຍວິຊາ {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Bank Draft,ຮ່າງຂອງທະນາຄານ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,ຮ່າງຂອງທະນາຄານ
 DocType: Mode of Payment Account,Mode of Payment Account,ຮູບແບບຂອງບັນຊີຊໍາລະເງິນ
 apps/erpnext/erpnext/stock/doctype/item/item.js +52,Show Variants,ສະແດງໃຫ້ເຫັນທີ່ແຕກຕ່າງກັນ
 DocType: Academic Term,Academic Term,ໄລຍະທາງວິຊາການ
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +13,Material,ອຸປະກອນການ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Quantity,ປະລິມານ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +511,Accounts table cannot be blank.,ຕາຕະລາງບັນຊີບໍ່ສາມາດມີຊ່ອງຫວ່າງ.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +616,Quantity,ປະລິມານ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +512,Accounts table cannot be blank.,ຕາຕະລາງບັນຊີບໍ່ສາມາດມີຊ່ອງຫວ່າງ.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,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/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 +142,User {0} is already assigned to Employee {1},ຜູ້ໃຊ້ {0} ແມ່ນກໍາຫນົດໃຫ້ກັບພະນັກງານ {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,ຮັກສາສຸຂະພາບ
-DocType: Purchase Invoice,Monthly,ປະຈໍາເດືອນ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),ຄວາມຊັກຊ້າໃນການຈ່າຍເງິນ (ວັນ)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +771,Invoice,ໃບເກັບເງິນ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +750,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 +198,Row {0}: {1} {2} does not match with {3},ຕິດຕໍ່ກັນ {0}: {1} {2} ບໍ່ກົງກັບ {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,"ຕິດຕໍ່ກັນ, {0}:"
+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 +127,Please select Price List,ກະລຸນາເລືອກລາຄາ
@@ -112,8 +110,8 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,ບໍລິສັດດຽວກັນແມ່ນເຂົ້າໄປຫຼາຍກ່ວາຫນຶ່ງຄັ້ງ
 DocType: Employee,Married,ການແຕ່ງງານ
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},ບໍ່ອະນຸຍາດໃຫ້ສໍາລັບການ {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +589,Get items from,ໄດ້ຮັບການລາຍການຈາກ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +382,Stock cannot be updated against Delivery Note {0},Stock ບໍ່ສາມາດຮັບການປັບປຸງຕໍ່ການສົ່ງເງິນ {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,ໄດ້ຮັບການລາຍການຈາກ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,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,ທໍາ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,ຂາຍເຄື່ອງແຫ້ງ
@@ -122,7 +120,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 +156,Salary Structure Missing,ໂຄງປະກອບການເງິນເດືອນທີ່ຫາຍໄປ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Salary Structure Missing,ໂຄງປະກອບການເງິນເດືອນທີ່ຫາຍໄປ
 DocType: Lead,Person Name,ຊື່ບຸກຄົນ
 DocType: Sales Invoice Item,Sales Invoice Item,ສິນຄ້າລາຄາ Invoice
 DocType: Account,Credit,ການປ່ອຍສິນເຊື່ອ
@@ -130,10 +128,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,ບົດລາຍງານ Stock
 DocType: Warehouse,Warehouse Detail,ຂໍ້ມູນ Warehouse
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,Credit limit has been crossed for customer {0} {1}/{2},ຂອບເຂດຈໍາກັດການປ່ອຍສິນເຊື່ອໄດ້ຮັບການ crossed ສໍາລັບລູກຄ້າ {0} {1} / {2}
-apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;ແມ່ນຊັບສິນຄົງທີ່&quot; ບໍ່ສາມາດຈະມີການກວດກາ, ເປັນການບັນທຶກຊັບສິນລາຄາຕໍ່ລາຍການ"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +189,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; ບໍ່ສາມາດຈະມີການກວດກາ, ເປັນການບັນທຶກຊັບສິນລາຄາຕໍ່ລາຍການ"
 DocType: Tax Rule,Tax Type,ປະເພດອາກອນ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +144,You are not authorized to add or update entries before {0},ເຈົ້າຍັງບໍ່ໄດ້ອະນຸຍາດໃຫ້ເພີ່ມຫຼືການປັບປຸງການອອກສຽງກ່ອນ {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},ເຈົ້າຍັງບໍ່ໄດ້ອະນຸຍາດໃຫ້ເພີ່ມຫຼືການປັບປຸງການອອກສຽງກ່ອນ {0}
 DocType: Item,Item Image (if not slideshow),ລາຍການຮູບພາບ (ຖ້າຫາກວ່າບໍ່ໂຊ)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,ການລູກຄ້າທີ່ມີຢູ່ມີຊື່ດຽວກັນ
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(ຊົ່ວໂມງອັດຕາ / 60) * ຈິງທີ່ໃຊ້ເວລາການດໍາເນີນງານ
@@ -143,18 +142,17 @@
 DocType: Student Log,Student Log,ເຂົ້າສູ່ລະບົບນັກສຶກສາ
 DocType: Quality Inspection,Get Specification Details,ໄດ້ຮັບລາຍລະອຽດຂໍ້ມູນຈໍາເພາະ
 DocType: Lead,Interested,ຄວາມສົນໃຈ
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +165,Opening,ເປີດ
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,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/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ລູກຄ້າ&gt; Group ລູກຄ້າ&gt; ອານາເຂດ
 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.,ບັນຊີກັບທຸລະກໍາທີ່ມີຢູ່ແລ້ວບໍ່ສາມາດປ່ຽນໃຈເຫລື້ອມໃສກຸ່ມ.
 DocType: Lead,Product Enquiry,ສອບຖາມຂໍ້ມູນຜະລິດຕະພັນ
 DocType: Academic Term,Schools,ໂຮງຮຽນ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,ກະລຸນາໃສ່ບໍລິສັດທໍາອິດ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Company first,ກະລຸນາເລືອກບໍລິສັດທໍາອິດ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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,ຄ່າໃຊ້ຈ່າຍທັງຫມົດ
@@ -164,7 +162,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,ຖະແຫຼງການຂອງບັນຊີ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,ຢາ
 DocType: Purchase Invoice Item,Is Fixed Asset,ແມ່ນຊັບສິນຄົງທີ່
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Available qty is {0}, you need {1}","ຈໍານວນທີ່ມີຢູ່ແມ່ນ {0}, ທ່ານຈໍາເປັນຕ້ອງ {1}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +225,"Available qty is {0}, you need {1}","ຈໍານວນທີ່ມີຢູ່ແມ່ນ {0}, ທ່ານຈໍາເປັນຕ້ອງ {1}"
 DocType: Expense Claim Detail,Claim Amount,ຈໍານວນການຮ້ອງຂໍ
 DocType: Employee,Mr,ທ້າວ
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,ປະເພດຜະລິດ / ຜູ້ຈັດຈໍາຫນ່າຍ
@@ -173,25 +171,26 @@
 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: Assessment Result,Grade,Grade
 DocType: Sales Invoice Item,Delivered By Supplier,ສົ່ງໂດຍຜູ້ສະຫນອງ
 DocType: SMS Center,All Contact,ທັງຫມົດຕິດຕໍ່
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Annual Salary,ເງິນເດືອນປະຈໍາປີ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Annual Salary,ເງິນເດືອນປະຈໍາປີ
 DocType: Period Closing Voucher,Closing Fiscal Year,ປິດປີງົບປະມານ
 apps/erpnext/erpnext/accounts/party.py +349,{0} {1} is frozen,{0} {1} ແມ່ນ frozen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,ຄ່າໃຊ້ຈ່າຍ Stock
-apps/erpnext/erpnext/accounts/report/financial_statements.py +22,End Year {0} not found.,ປີສຸດທ້າຍ {0} ບໍ່ໄດ້ພົບເຫັນ.
 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}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,ວັດສະດຸສະຫນອງວັດຖຸດິບສໍາຫລັບການຊື້
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +130,At least one mode of payment is required for POS invoice.,ຢ່າງຫນ້ອຍຫນຶ່ງຮູບແບບຂອງການຈ່າຍເງິນເປັນສິ່ງຈໍາເປັນສໍາລັບໃບເກັບເງິນ POS.
 DocType: Products Settings,Show Products as a List,ສະແດງໃຫ້ເຫັນຜະລິດຕະພັນເປັນຊີ
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","ດາວນ໌ໂຫລດແມ່ແບບ, ໃຫ້ຕື່ມຂໍ້ມູນທີ່ເຫມາະສົມແລະຕິດແຟ້ມທີ່ແກ້ໄຂໄດ້. ທັງຫມົດກໍານົດວັນທີແລະພະນັກງານປະສົມປະສານໃນໄລຍະເວລາທີ່ເລືອກຈະມາໃນແມ່ແບບ, ມີການບັນທຶກການເຂົ້າຮຽນທີ່ມີຢູ່ແລ້ວ"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +451,Item {0} is not active or end of life has been reached,ລາຍການ {0} ບໍ່ເຮັດວຽກຫຼືໃນຕອນທ້າຍຂອງຊີວິດໄດ້ຮັບການບັນລຸໄດ້
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +456,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/controllers/accounts_controller.py +614,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","ເພື່ອປະກອບມີພາສີໃນການຕິດຕໍ່ກັນ {0} ໃນອັດຕາການສິນຄ້າ, ພາສີອາກອນໃນແຖວເກັດທີ່ຢູ່ {1} ຍັງຕ້ອງໄດ້ຮັບການປະກອບ"
+apps/erpnext/erpnext/controllers/accounts_controller.py +617,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","ເພື່ອປະກອບມີພາສີໃນການຕິດຕໍ່ກັນ {0} ໃນອັດຕາການສິນຄ້າ, ພາສີອາກອນໃນແຖວເກັດທີ່ຢູ່ {1} ຍັງຕ້ອງໄດ້ຮັບການປະກອບ"
 apps/erpnext/erpnext/config/hr.py +166,Settings for HR Module,ການຕັ້ງຄ່າສໍາລັບ Module HR
 DocType: SMS Center,SMS Center,SMS Center
 DocType: Sales Invoice,Change Amount,ການປ່ຽນແປງຈໍານວນເງິນ
@@ -203,13 +202,13 @@
 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 +147,Execution,ການປະຕິບັດ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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,ລາຍການແລະລາຄາ
 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}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,Cost Center {0} does not belong to Company {1},ມີລາຄາຖືກ Center {0} ບໍ່ໄດ້ຂຶ້ນກັບບໍລິສັດ {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +100,Cost Center {0} does not belong to Company {1},ມີລາຄາຖືກ Center {0} ບໍ່ໄດ້ຂຶ້ນກັບບໍລິສັດ {1}
 DocType: Customer,Individual,ບຸກຄົນ
 DocType: Interest,Academics User,ນັກວິຊາການຜູ້ໃຊ້
 DocType: Cheque Print Template,Amount In Figure,ຈໍານວນເງິນໃນຮູບ
@@ -225,30 +224,32 @@
 DocType: Production Planning Tool,Sales Orders,ຄໍາສັ່ງການຂາຍ
 DocType: Purchase Taxes and Charges,Valuation,ປະເມີນມູນຄ່າ
 ,Purchase Order Trends,ຊື້ແນວໂນ້ມຄໍາສັ່ງ
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,The request for quotation can be accessed by clicking on the following link,ການຮ້ອງຂໍສໍາລັບວົງຢືມສາມາດໄດ້ຮັບການເຂົ້າເຖິງໄດ້ໂດຍການຄລິກໃສ່ການເຊື່ອມຕໍ່ດັ່ງຕໍ່ໄປນີ້
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,ຈັດສັນໃບສໍາລັບປີ.
 DocType: SG Creation Tool Course,SG Creation Tool Course,SG ຂອງລາຍວິຊາເຄື່ອງມືການສ້າງ
 DocType: Student Group Creation Tool,Leave blank if you wish to fetch all courses for selected academic term,ໃຫ້ຫວ່າງໄວ້ຖ້າຫາກວ່າທ່ານຕ້ອງການທີ່ຈະດຶງຂໍ້ມູນຫຼັກສູດການທັງຫມົດສໍາລັບໄລຍະທາງວິຊາການການຄັດເລືອກ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,Insufficient Stock,ບໍ່ພຽງພໍ Stock
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227,Insufficient Stock,ບໍ່ພຽງພໍ Stock
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,ການວາງແຜນຄວາມອາດສາມາດປິດການໃຊ້ງານແລະການຕິດຕາມທີ່ໃຊ້ເວລາ
+DocType: Email Digest,New Sales Orders,ໃບສັ່ງຂາຍໃຫມ່
 DocType: Bank Reconciliation,Bank Account,ບັນຊີທະນາຄານ
 DocType: Leave Type,Allow Negative Balance,ອະນຸຍາດໃຫ້ສົມດູນທາງລົບ
 DocType: Selling Settings,Default Territory,ມາດຕະຖານອານາເຂດ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,ໂທລະທັດ
 DocType: Production Order Operation,Updated via 'Time Log',ການປັບປຸງໂດຍຜ່ານການ &#39;ທີ່ໃຊ້ເວລາເຂົ້າ&#39;
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} does not belong to Company {1},ບັນຊີ {0} ບໍ່ໄດ້ຂຶ້ນກັບບໍລິສັດ {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +86,Account {0} does not belong to Company {1},ບັນຊີ {0} ບໍ່ໄດ້ຂຶ້ນກັບບໍລິສັດ {1}
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},ຈໍານວນເງິນລ່ວງຫນ້າບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາ {0} {1}
 DocType: Naming Series,Series List for this Transaction,ບັນຊີໄລຍະສໍາລັບການນີ້
 DocType: Sales Invoice,Is Opening Entry,ຄືການເປີດ Entry
 DocType: Customer Group,Mention if non-standard receivable account applicable,ເວົ້າເຖິງຖ້າຫາກວ່າບໍ່ໄດ້ມາດຕະຖານບັນຊີລູກຫນີ້ສາມາດນໍາໃຊ້
 DocType: Course Schedule,Instructor Name,ຊື່ instructor
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,For Warehouse is required before Submit,ສໍາລັບການຄັງສິນຄ້າທີ່ຕ້ອງການກ່ອນທີ່ຈະຍື່ນສະເຫນີການ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,For Warehouse is required before Submit,ສໍາລັບການຄັງສິນຄ້າທີ່ຕ້ອງການກ່ອນທີ່ຈະຍື່ນສະເຫນີການ
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,ໄດ້ຮັບກ່ຽວກັບ
 DocType: Sales Partner,Reseller,ຕົວແທນຈໍາຫນ່າຍ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,ກະລຸນາໃສ່ບໍລິສັດ
 DocType: Delivery Note Item,Against Sales Invoice Item,ຕໍ່ຕ້ານການຂາຍໃບແຈ້ງຫນີ້ສິນຄ້າ
 ,Production Orders in Progress,ໃບສັ່ງຜະລິດໃນຄວາມຄືບຫນ້າ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Cash from Financing,ເງິນສົດສຸດທິຈາກການເງິນ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1436,"LocalStorage is full , did not save","LocalStorage ແມ່ນອັນເຕັມທີ່, ບໍ່ໄດ້ປະຢັດ"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1460,"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}
@@ -261,18 +262,19 @@
 apps/erpnext/erpnext/templates/generators/item.html +78,No description given,ບໍ່ໄດ້ຮັບການອະທິບາຍ
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,ຮ້ອງຂໍໃຫ້ມີສໍາລັບການຊື້.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +5,This is based on the Time Sheets created against this project,ນີ້ແມ່ນອີງໃສ່ແຜ່ນທີ່ໃຊ້ເວລາສ້າງຕໍ່ຕ້ານໂຄງການນີ້
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Only the selected Leave Approver can submit this Leave Application,ພຽງແຕ່ອະນຸມັດອອກຈາກການຄັດເລືອກສາມາດສົ່ງຄໍາຮ້ອງສະຫມັກອອກຈາກ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +213,Only the selected Leave Approver can submit this Leave Application,ພຽງແຕ່ອະນຸມັດອອກຈາກການຄັດເລືອກສາມາດສົ່ງຄໍາຮ້ອງສະຫມັກອອກຈາກ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,ບັນເທົາອາການທີ່ສະຫມັກຈະຕ້ອງຫຼາຍກ່ວາວັນຂອງການເຂົ້າຮ່ວມ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Leaves per Year,ໃບຕໍ່ປີ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,ໃບຕໍ່ປີ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,ຕິດຕໍ່ກັນ {0}: ກະລຸນາກວດສອບຄື Advance &#39;ກັບບັນຊີ {1} ຖ້າຫາກວ່ານີ້ເປັນການເຂົ້າລ່ວງຫນ້າ.
 apps/erpnext/erpnext/stock/utils.py +188,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,ລິດ
 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 +435,Leave Blocked,ອອກຈາກສະກັດ
-apps/erpnext/erpnext/stock/doctype/item/item.py +669,Item {0} has reached its end of life on {1},ລາຍການ {0} ໄດ້ບັນລຸໃນຕອນທ້າຍຂອງຊີວິດໃນ {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +443,Leave Blocked,ອອກຈາກສະກັດ
+apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item {0} has reached its end of life on {1},ລາຍການ {0} ໄດ້ບັນລຸໃນຕອນທ້າຍຂອງຊີວິດໃນ {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +95,Bank Entries,ການອອກສຽງທະນາຄານ
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +83,Annual,ປະຈໍາປີ
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +86,Annual,ປະຈໍາປີ
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Reconciliation Item
 DocType: Stock Entry,Sales Invoice No,ຂາຍໃບເກັບເງິນທີ່ບໍ່ມີ
 DocType: Material Request Item,Min Order Qty,ນາທີສັ່ງຊື້ຈໍານວນ
@@ -280,20 +282,22 @@
 DocType: Lead,Do Not Contact,ບໍ່ໄດ້ຕິດຕໍ່
 apps/erpnext/erpnext/public/js/setup_wizard.js +360,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 +91,Software Developer,ຊອບແວພັດທະນາ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,ຊອບແວພັດທະນາ
 DocType: Item,Minimum Order Qty,ຈໍານວນການສັ່ງຊື້ຂັ້ນຕ່ໍາ
 DocType: Pricing Rule,Supplier Type,ປະເພດຜູ້ສະຫນອງ
 DocType: Scheduling Tool,Course Start Date,ແນ່ນອນວັນທີ່
 DocType: Item,Publish in Hub,ເຜີຍແຜ່ໃນ Hub
+DocType: Student Admission,Student Admission,ຮັບສະຫມັກນັກສຶກສາ
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is cancelled,ລາຍການ {0} ຈະຖືກຍົກເລີກ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Material Request,ຂໍອຸປະກອນການ
+apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} is cancelled,ລາຍການ {0} ຈະຖືກຍົກເລີກ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +823,Material Request,ຂໍອຸປະກອນການ
 DocType: Bank Reconciliation,Update Clearance Date,ວັນທີ່ປັບປຸງການເກັບກູ້
 apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +28,Abbreviation already used for another salary component,ຕົວຫຍໍ້ທີ່ໃຊ້ແລ້ວສໍາລັບອົງປະກອບເງິນເດືອນອື່ນ
 DocType: Item,Purchase Details,ລາຍລະອຽດການຊື້
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +328,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},ລາຍການ {0} ບໍ່ພົບເຫັນຢູ່ໃນຕາຕະລາງ &#39;ຈໍາຫນ່າຍວັດຖຸດິບໃນການສັ່ງຊື້ {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +333,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},ລາຍການ {0} ບໍ່ພົບເຫັນຢູ່ໃນຕາຕະລາງ &#39;ຈໍາຫນ່າຍວັດຖຸດິບໃນການສັ່ງຊື້ {1}
 DocType: Employee,Relation,ປະຊາສໍາພັນ
 DocType: Shipping Rule,Worldwide Shipping,ສົ່ງທົ່ວໂລກ
+DocType: Student Guardian,Mother,ແມ່
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,ຢືນຢັນຄໍາສັ່ງຈາກລູກຄ້າ.
 DocType: Purchase Receipt Item,Rejected Quantity,ປະລິມານການປະຕິເສດ
 DocType: SMS Settings,SMS Sender Name,SMS ຊື່ຜູ້ສົ່ງ
@@ -309,20 +313,21 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +130,Please select Charge Type first,ກະລຸນາເລືອກປະເພດຄ່າໃຊ້ຈ່າຍຄັ້ງທໍາອິດ
 DocType: Student Group Student,Student Group Student,ນັກສຶກສານັກສຶກສາ Group
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,ຫຼ້າສຸດ
+DocType: Email Digest,New Quotations,ຄວາມຫມາຍໃຫມ່
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,ການອະນຸມັດອອກຄັ້ງທໍາອິດໃນບັນຊີລາຍການຈະໄດ້ຮັບການກໍານົດເປັນມາດຕະຖານອອກຈາກອະນຸມັດ
 DocType: Tax Rule,Shipping County,Shipping County
 apps/erpnext/erpnext/config/desktop.py +158,Learn,ຮຽນຮູ້
 DocType: Asset,Next Depreciation Date,ຕໍ່ໄປວັນທີ່ຄ່າເສື່ອມລາຄາ
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,ຄ່າໃຊ້ຈ່າຍຂອງກິດຈະກໍາຕໍ່ພະນັກງານ
 DocType: Accounts Settings,Settings for Accounts,ການຕັ້ງຄ່າສໍາລັບການບັນຊີ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +626,Supplier Invoice No exists in Purchase Invoice {0},Supplier Invoice ບໍ່ມີລາຄາໃນການຊື້ Invoice {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +629,Supplier Invoice No exists in Purchase Invoice {0},Supplier Invoice ບໍ່ມີລາຄາໃນການຊື້ Invoice {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,ການຄຸ້ມຄອງການຂາຍສ່ວນບຸກຄົນເປັນໄມ້ຢືນຕົ້ນ.
 DocType: Job Applicant,Cover Letter,ການປົກຫຸ້ມຂອງຈົດຫມາຍສະບັບ
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,ເຊັກທີ່ຍັງຄ້າງຄາແລະຄ່າມັດຈໍາເພື່ອອະນາໄມ
 DocType: Item,Synced With Hub,ຊິ້ງຂໍ້ມູນກັບ Hub
 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 +348,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 +86,Circular Reference Error,Error Reference ວົງ
@@ -334,15 +339,16 @@
 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 +806,Delivery Note,ການສົ່ງເງິນ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +800,Delivery Note,ການສົ່ງເງິນ
 apps/erpnext/erpnext/config/learn.py +87,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 +233,Payment Entry has been modified after you pulled it. Please pull it again.,Entry ການຊໍາລະເງິນໄດ້ຮັບການແກ້ໄຂພາຍຫຼັງທີ່ທ່ານໄດ້ດຶງມັນ. ກະລຸນາດຶງມັນອີກເທື່ອຫນຶ່ງ.
+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/setup/doctype/email_digest/email_digest.py +104,Summary for this week and pending activities,ສະຫຼຸບສັງລວມສໍາລັບອາທິດນີ້ແລະກິດຈະກໍາທີ່ຍັງຄ້າງ
+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","ກະລຸນາໃສ່ອີເມວຂັ້ນດ້ວຍຈໍ້າຈຸດ, ໃບແຈ້ງຫນີ້ຈະໄດ້ຮັບການສົ່ງອັດຕະໂນມັດໃນວັນທີສະເພາະໃດຫນຶ່ງ"
 DocType: Employee,Company Email,Email ບໍລິສັດ
@@ -354,27 +360,28 @@
 apps/erpnext/erpnext/config/hr.py +186,"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,ອັດຕາທີ່ສະກຸນເງິນຂອງລູກຄ້າຈະຖືກແປງເປັນສະກຸນເງິນຂອງລູກຄ້າຂອງພື້ນຖານ
-apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},"ຕິດຕໍ່ກັນ, {0}: Purchase Invoice ບໍ່ສາມາດຈະດໍາເນີນຕໍ່ຊັບສິນທີ່ມີຢູ່ແລ້ວ {1}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +554,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 +54,{0} already allocated for Employee {1} for period {2} to {3},{0} ຈັດສັນແລ້ວສໍາລັບພະນັກງານ {1} ສໍາລັບໄລຍະເວລາ {2} ກັບ {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +812,Select Item,ເລືອກລາຍການ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +791,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} ການຄຸ້ມຄອງ batch ທີ່ສະຫລາດ, ບໍ່ສາມາດໄດ້ຮັບການຄືນການນໍາໃຊ້ \ Stock Reconciliation, ແທນທີ່ຈະນໍາໃຊ້ຫຼັກຊັບການອອກສຽງ"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,ຊື້ Invoice {0} ໄດ້ຖືກສົ່ງແລ້ວ
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},"ຕິດຕໍ່ກັນ, {0}: Batch ບໍ່ຕ້ອງເຊັ່ນດຽວກັນກັບ {1} {2}"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +143,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 (ຫຼາຍ) ຂອງສິນຄ້າ.
 DocType: C-Form Invoice Detail,Invoice Date,ວັນທີ່ໃບເກັບເງິນ
 DocType: GL Entry,Debit Amount,ຈໍານວນເງິນເດບິດ
 apps/erpnext/erpnext/accounts/party.py +242,There can only be 1 Account per Company in {0} {1},ມີພຽງແຕ່ສາມາດ 1 ບັນຊີຕໍ່ບໍລິສັດໃນ {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +4,Your email address,ທີ່ຢູ່ອີເມວຂອງເຈົ້າ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +342,Please see attachment,ກະລຸນາເບິ່ງການຕິດ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,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 +19,Setup Already Complete!!,ຕິດຕັ້ງແລ້ວສົມບູນ !!
 ,Finished Goods,ສິນຄ້າສໍາເລັດຮູບ
 DocType: Delivery Note,Instructions,ຄໍາແນະນໍາ
 DocType: Quality Inspection,Inspected By,ການກວດກາໂດຍ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,ຜູ້ຜະລິດ&gt; ປະເພດຜະລິດ
 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/public/js/utils/item_selector.js +12,Add Items,ເພີ່ມລາຍການລາຍ
@@ -388,29 +395,29 @@
 DocType: Currency Exchange,Currency Exchange,ການແລກປ່ຽນສະກຸນເງິນ
 DocType: Purchase Invoice Item,Item Name,ຊື່ລາຍການ
 DocType: Authorization Rule,Approving User  (above authorized value),ການອະນຸມັດຜູ້ໃຊ້ (ສູງກວ່າຄ່າອະນຸຍາດ)
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,ເຄດິດ
+DocType: Email Digest,Credit Balance,ເຄດິດ
 DocType: Employee,Widowed,ຜູ້ທີ່ເປັນຫມ້າຍ
 DocType: Request for Quotation,Request for Quotation,ການຮ້ອງຂໍສໍາລັບວົງຢືມ
 DocType: Salary Slip Timesheet,Working Hours,ຊົ່ວໂມງເຮັດວຽກ
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,ການປ່ຽນແປງ / ຈໍານວນລໍາດັບການເລີ່ມຕົ້ນໃນປັດຈຸບັນຂອງໄລຍະການທີ່ມີຢູ່ແລ້ວ.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","ຖ້າຫາກວ່າກົດລະບຽບການຕັ້ງລາຄາທີ່ຫຼາກຫຼາຍສືບຕໍ່ໄຊຊະນະ, ຜູ້ໃຊ້ໄດ້ຮ້ອງຂໍໃຫ້ກໍານົດບຸລິມະສິດດ້ວຍຕົນເອງເພື່ອແກ້ໄຂບັນຫາຂໍ້ຂັດແຍ່ງ."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +736,Purchase Return,Return ຊື້
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +715,Purchase Return,Return ຊື້
 ,Purchase Register,ລົງທະບຽນການຊື້
 DocType: Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,ຄ່າບໍລິການສາມາດນໍາໃຊ້
 DocType: Workstation,Consumable Cost,ຄ່າໃຊ້ຈ່າຍຜູ້ບໍລິໂພກ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +202,{0} ({1}) must have role 'Leave Approver',{0} ({1}) ຕ້ອງມີພາລະບົດບາດ &#39;ອອກຈາກການອະນຸມັດ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,{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 +143,Reason for losing,ເຫດຜົນສໍາລັບການສູນເສຍ
-apps/erpnext/erpnext/accounts/utils.py +239,Allocated amount can not greater than unadjusted amount,ຈໍານວນເງິນທີ່ຈັດສັນສາມາດເຮັດໄດ້ບໍ່ຫຼາຍກ່ວາຈໍານວນ unadjusted
+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,ຈໍານວນເງິນທີ່ຈັດສັນສາມາດເຮັດໄດ້ບໍ່ຫຼາຍກ່ວາຈໍານວນ unadjusted
 DocType: Announcement,Receiver,ຮັບ
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation ຈະປິດໃນວັນທີດັ່ງຕໍ່ໄປນີ້ຕໍ່ຊີ Holiday: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,ກາລະໂອກາດ
 DocType: Employee,Single,ດຽວ
 DocType: Account,Cost of Goods Sold,ຄ່າໃຊ້ຈ່າຍຂອງສິນຄ້າຂາຍ
 DocType: Purchase Invoice,Yearly,ປະຈໍາປີ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +225,Please enter Cost Center,ກະລຸນາໃສ່ສູນຕົ້ນທຶນ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,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,ຊື່ຜູ້ກວດສອບ
@@ -423,26 +430,26 @@
 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,ກໍານົດ Serial Nos ອັດຕະໂນມັດຂຶ້ນຢູ່ກັບ FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,ການກວດສອບຜະລິດ Invoice ຈໍານວນເປັນເອກະລັກ
 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 +102,Non Profit,Non Profit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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: Stock Reconciliation Item,Do not include symbols (ex. $),ບໍ່ປະກອບມີສັນຍາລັກ (ex. $)
 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 +638,Attribute {0} selected multiple times in Attributes Table,ຄຸນລັກສະນະ {0} ເລືອກເວລາຫຼາຍໃນຕາຕະລາງຄຸນສົມບັດ
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,ຄຸນລັກສະນະ {0} ເລືອກເວລາຫຼາຍໃນຕາຕະລາງຄຸນສົມບັດ
 DocType: HR Settings,Employee record is created using selected field. ,ການບັນທຶກຂອງພະນັກງານແມ່ນການສ້າງຕັ້ງການນໍາໃຊ້ພາກສະຫນາມການຄັດເລືອກ.
 DocType: Sales Order,Not Applicable,ບໍ່ສາມາດໃຊ້
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,ຕົ້ນສະບັບວັນພັກ.
 DocType: Request for Quotation Item,Required Date,ວັນທີ່ສະຫມັກທີ່ກໍານົດໄວ້
 DocType: Delivery Note,Billing Address,ທີ່ຢູ່ໃບບິນ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +862,Please enter Item Code.,ກະລຸນາໃສ່ລະຫັດສິນຄ້າ.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +847,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","ຖ້າຫາກວ່າການກວດກາ, ຈໍານວນເງິນພາສີຈະໄດ້ຮັບການພິຈາລະນາເປັນລວມຢູ່ໃນອັດຕາການພິມ / ການພິມຈໍານວນເງິນ"
@@ -456,12 +463,12 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,ຫລັກຊັບແລະເງິນຝາກ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,ໃບທັງຫມົດການຈັດສັນແມ່ນການບັງຄັບ
 DocType: Job Opening,Description of a Job Opening,ລາຍລະອຽດຂອງການໃຊ້ວຽກ
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Pending activities for today,ກິດຈະກໍາທີ່ຍັງຄ້າງສໍາລັບມື້ນີ້
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,ກິດຈະກໍາທີ່ຍັງຄ້າງສໍາລັບມື້ນີ້
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,ບັນທຶກການເຂົ້າຮຽນ.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,ອົງປະກອບເງິນເດືອນສໍາລັບເງິນເດືອນຕາມ timesheet.
 DocType: Sales Order Item,Used for Production Plan,ນໍາໃຊ້ສໍາລັບແຜນການຜະລິດ
 DocType: Manufacturing Settings,Time Between Operations (in mins),ທີ່ໃຊ້ເວລາລະຫວ່າງການປະຕິບັດ (ໃນນາທີ)
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +92,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} ງົບປະມານສໍາລັບບັນຊີ {1} ຕໍ່ສູນຕົ້ນທຶນ {2} ແມ່ນ {3}. ມັນຈະຫຼາຍກວ່າ {4}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +95,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} ງົບປະມານສໍາລັບບັນຊີ {1} ຕໍ່ສູນຕົ້ນທຶນ {2} ແມ່ນ {3}. ມັນຈະຫຼາຍກວ່າ {4}
 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,ໄດ້ແອບເປີ້ນເລືອກບໍ່ໄດ້ສໍາລັບການບໍ່ວ່າຈະເປັນ
@@ -469,16 +476,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +238,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 +86,Administrative Officer,ຫ້ອງການປົກຄອງ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,ຫ້ອງການປົກຄອງ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +23,Acutal Qty {0} / Waiting Qty {1},ສ້ວຍແຫຼມຈໍານວນ {0} / ລໍຖ້າຈໍານວນ {1}
 DocType: Timesheet Detail,Hrs,ຊົ່ວໂມງ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +319,Please select Company,ກະລຸນາເລືອກບໍລິສັດ
-DocType: Stock Entry,Difference Account,ບັນຊີທີ່ແຕກຕ່າງກັນ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +309,Please select Company,ກະລຸນາເລືອກບໍລິສັດ
+DocType: Stock Entry Detail,Difference Account,ບັນຊີທີ່ແຕກຕ່າງກັນ
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,ສາມາດເຮັດໄດ້ບໍ່ແມ່ນວຽກງານຢ່າງໃກ້ຊິດເປັນວຽກງານຂຶ້ນຂອງຕົນ {0} ບໍ່ໄດ້ປິດ.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Please enter Warehouse for which Material Request will be raised,ກະລຸນາໃສ່ Warehouse ສໍາລັບການທີ່ວັດສະດຸການຈອງຈະໄດ້ຮັບການຍົກຂຶ້ນມາ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +399,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 +530,"To merge, following properties must be same for both items",ການຜະສານຄຸນສົມບັດດັ່ງຕໍ່ໄປນີ້ຈະຕ້ອງດຽວກັນສໍາລັບການລາຍການທັງສອງ
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,"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 +28,Buy,ຊື້
@@ -486,7 +493,7 @@
 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 +1563,Serial no item cannot be a fraction,Serial ລາຍການທີ່ບໍ່ມີບໍ່ສາມາດຈະສ່ວນຫນຶ່ງເປັນ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1587,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
@@ -495,13 +502,14 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Account {0} does not belong to company: {1},ບັນຊີ {0} ບໍ່ໄດ້ຂຶ້ນກັບບໍລິສັດ: {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation already used for another company,ຕົວຫຍໍ້ທີ່ໃຊ້ສໍາລັບການບໍລິສັດອື່ນ
 DocType: Selling Settings,Default Customer Group,ມາດຕະຖານກຸ່ມລູກຄ້າ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Supplier is required against Payable account {0},ຜູ້ຜະລິດຈໍາເປັນຕ້ອງຕໍ່ບັນຊີ Payable {0}
 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
 DocType: Production Planning Tool,Material Requirement,ຄວາມຕ້ອງການອຸປະກອນການ
 DocType: Company,Delete Company Transactions,ລົບລາຍະການບໍລິສັດ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +313,Reference No and Reference Date is mandatory for Bank transaction,ກະສານອ້າງອີງບໍ່ມີແລະວັນທີເອກະສານແມ່ນການບັງຄັບສໍາລັບການເຮັດທຸລະກໍາທະນາຄານ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +316,Reference No and Reference Date is mandatory for Bank transaction,ກະສານອ້າງອີງບໍ່ມີແລະວັນທີເອກະສານແມ່ນການບັງຄັບສໍາລັບການເຮັດທຸລະກໍາທະນາຄານ
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,ເພີ່ມ / ແກ້ໄຂພາສີອາກອນແລະຄ່າບໍລິການ
 DocType: Purchase Invoice,Supplier Invoice No,Supplier Invoice No
 DocType: Territory,For reference,ສໍາລັບການກະສານອ້າງອີງ
@@ -512,7 +520,6 @@
 DocType: Installation Note Item,Installation Note Item,ການຕິດຕັ້ງຫມາຍເຫດລາຍການ
 DocType: Production Plan Item,Pending Qty,ຢູ່ລະຫວ່າງການຈໍານວນ
 DocType: Budget,Ignore,ບໍ່ສົນໃຈ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,ລະຫັດສິນຄ້າ&gt; ກຸ່ມສິນຄ້າ&gt; ສິນຄ້າ
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,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
@@ -523,11 +530,11 @@
 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/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,ບໍ່ມີພົບເຫັນຢູ່ໃນຕາຕະລາງການບັນທຶກການໃບເກັບເງິນ
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +28,Please select Company and Party Type first,ກະລຸນາເລືອກບໍລິສັດແລະພັກປະເພດທໍາອິດ
+apps/erpnext/erpnext/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/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 +707,Make Sales Order,ເຮັດໃຫ້ຂາຍສິນຄ້າ
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +701,Make Sales Order,ເຮັດໃຫ້ຂາຍສິນຄ້າ
 DocType: Project Task,Project Task,ໂຄງການ Task
 ,Lead Id,Id ນໍາ
 DocType: C-Form Invoice Detail,Grand Total,ລວມທັງຫມົດ
@@ -543,7 +550,8 @@
 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 +734,Sales Return,Return ຂາຍ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +728,Sales Return,Return ຂາຍ
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +91,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 ການຂົນສົ່ງ)
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,ຖານຂໍ້ມູນຂອງລູກຄ້າທີ່ອາດມີ.
@@ -552,14 +560,13 @@
 DocType: Quotation,Quotation To,ສະເຫນີລາຄາການ
 DocType: Lead,Middle Income,ລາຍໄດ້ປານກາງ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +212,Opening (Cr),ເປີດ (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +795,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,ມາດຕະຖານ Unit of Measure ສໍາລັບລາຍການ {0} ບໍ່ສາມາດໄດ້ຮັບການປ່ຽນແປງໂດຍກົງເພາະວ່າທ່ານໄດ້ເຮັດແລ້ວການເຮັດທຸລະກໍາບາງ (s) ມີ UOM ອື່ນ. ທ່ານຈະຕ້ອງການເພື່ອສ້າງເປັນລາຍການໃຫມ່ທີ່ຈະນໍາໃຊ້ UOM ມາດຕະຖານທີ່ແຕກຕ່າງກັນ.
-apps/erpnext/erpnext/accounts/utils.py +237,Allocated amount can not be negative,ຈໍານວນເງິນທີ່ຈັດສັນບໍ່ສາມາດຈະກະທົບທາງລົບ
+apps/erpnext/erpnext/stock/doctype/item/item.py +797,Default Unit of Measure for Item {0} cannot be changed directly because 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,ຈໍານວນເງິນທີ່ຈັດສັນບໍ່ສາມາດຈະກະທົບທາງລົບ
 DocType: Purchase Order Item,Billed Amt,ບັນຊີລາຍ Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,A Warehouse ຢ່າງມີເຫດຜົນການຕໍ່ຕ້ານທີ່ entries ຫຼັກຊັບໄດ້.
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,ຂາຍ Invoice Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},ກະສານອ້າງອີງບໍ່ມີວັນແລະເວລາກະສານອ້າງອີງຕ້ອງການສໍາລັບ {0}
-DocType: Sales Invoice,Customer's Vendor,ຜູ້ໃຫ້ບໍລິການລູກຄ້າ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Proposal Writing,ຂຽນບົດສະເຫນີ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,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","ຖ້າຫາກວ່າການກວດກາ, ວັດຖຸດິບສໍາລັບການລາຍການທີ່ມີອະນຸສັນຍາຈະລວມຢູ່ໃນການຮ້ອງຂໍການວັດສະດຸ"
@@ -568,13 +575,14 @@
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,ການຕິດຕາມທີ່ໃຊ້ເວລາ
 DocType: Fiscal Year Company,Fiscal Year Company,ບໍລິສັດປີງົບປະມານ
 DocType: Packing Slip Item,DN Detail,DN ຂໍ້ມູນ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +257,Already supplier quotation has created,ແລ້ວວົງຜູ້ສະຫນອງໄດ້ສ້າງ
 DocType: Timesheet,Billed,ບິນ
 DocType: Batch,Batch Description,ລາຍລະອຽດຊຸດ
+apps/erpnext/erpnext/accounts/utils.py +685,"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 +733,View Offline Records,View Offline ບັນທຶກ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +715,View Offline Records,View Offline ບັນທຶກ
+DocType: Student,Sibling Details,ລາຍລະອຽດໃຫ້ແກ່ອ້າຍນ້ອງ
 DocType: Employee,Reason for Resignation,ເຫດຜົນສໍາລັບການລາອອກ
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,ແມ່ແບບສໍາລັບການປະເມີນຜົນການປະຕິບັດ.
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,ໃບເກັບເງິນ / ວາລະສານລາຍລະອຽດການອອກສຽງ
@@ -588,7 +596,7 @@
 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,ການປ່ຽນແປງສຸດທິໃນສິນຄ້າຄົງຄັງ
 DocType: Employee,Passport Number,ຈໍານວນຫນັງສືຜ່ານແດນ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Manager,ຜູ້ຈັດການ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,ຜູ້ຈັດການ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,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; ບໍ່ສາມາດຈະເປັນຄືກັນ
@@ -597,10 +605,11 @@
 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 +299,Timesheet created:,Timesheet ສ້າງ:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +715,Please set default Cash or Bank account in Mode of Payment {0},ກະລຸນາທີ່ກໍານົດໄວ້ເງິນສົດໃນຕອນຕົ້ນຫຼືບັນຊີທະນາຄານໃນຮູບແບບການຊໍາລະເງິນ {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +300,Timesheet created:,Timesheet ສ້າງ:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +772,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,ລົງທະບຽນ
 DocType: Selling Settings,Customer Naming By,ຊື່ລູກຄ້າໂດຍ
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,ກະລຸນາຕິດຕັ້ງພະນັກງານແຜນການຕັ້ງຊື່ລະບົບຊັບພະຍາກອນມະນຸດ&gt; Settings HR
 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,ປະເພດຂອງກິດຈະກໍາ
@@ -625,6 +634,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,ສໍາເລັດຮູບ
 DocType: Pricing Rule,Sales Manager,ຜູ້ຈັດການຝ່າຍຂາຍ
 DocType: Salary Structure Employee,Base,ຖານ
+DocType: Timesheet,Total Billed Hours,ທັງຫມົດຊົ່ວໂມງບິນ
 DocType: Journal Entry,Write Off Amount,ຂຽນ Off ຈໍານວນ
 DocType: Journal Entry,Bill No,ບັນຊີລາຍການບໍ່ມີ
 DocType: Company,Gain/Loss Account on Asset Disposal,ບັນຊີກໍາໄຮ / ຂາດທຶນຈາກການທໍາລາຍຊັບສິນ
@@ -639,11 +649,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +9,Pre Sales,Sales Pre
 DocType: Purchase Receipt,Other Details,ລາຍລະອຽດອື່ນໆ
 DocType: Account,Accounts,ບັນຊີ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Marketing,ການຕະຫຼາດ
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +227,Payment Entry is already created,Entry ການຈ່າຍເງິນແມ່ນສ້າງຮຽບຮ້ອຍແລ້ວ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,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 +538,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 +21,Preview Salary Slip,ສະແດງຄວາມຜິດພາດພຽງເງິນເດືອນ
+apps/erpnext/erpnext/controllers/accounts_controller.py +541,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 +38,Preview Salary Slip,ສະແດງຄວາມຜິດພາດພຽງເງິນເດືອນ
 DocType: Company,Deafult Cost Center,ສູນຕົ້ນທຶນ Deafult
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +48,Account {0} has been entered multiple times,ບັນຊີ {0} ໄດ້ຮັບການປ້ອນເວລາຫຼາຍ
 DocType: Account,Expenses Included In Valuation,ຄ່າໃຊ້ຈ່າຍລວມຢູ່ໃນການປະເມີນຄ່າ
@@ -652,7 +662,7 @@
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,ກະລຸນາເລືອກກຸ່ມນັກສຶກສາ
 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 +617,Item has variants.,ລາຍການມີ variants.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,ລາຍການມີ variants.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,ບໍ່ພົບລາຍການ {0}
 DocType: Bin,Stock Value,ມູນຄ່າຫຼັກຊັບ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +25,Company {0} does not exist,ບໍລິສັດ {0} ບໍ່ມີ
@@ -672,7 +682,7 @@
 DocType: Purchase Order,Supply Raw Materials,ການສະຫນອງວັດຖຸດິບ
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,ວັນທີ່ໃບເກັບເງິນຕໍ່ໄປຈະໄດ້ຮັບການຜະລິດ. ມັນຖືກສ້າງຂຶ້ນກ່ຽວກັບການ.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,ຊັບສິນປັດຈຸບັນ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,{0} is not a stock Item,{0} ບໍ່ແມ່ນຫົວຂໍ້ຫຼັກຊັບ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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 +169,Lead must be set if Opportunity is made from Lead,ຜູ້ນໍາພາຕ້ອງໄດ້ຮັບການກໍານົດຖ້າຫາກວ່າໂອກາດແມ່ນໄດ້ມາຈາກຜູ້ນໍາ
@@ -739,26 +749,25 @@
 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 +709,No Permission,ບໍ່ມີການອະນຸຍາດ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +710,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}
 apps/erpnext/erpnext/public/js/setup_wizard.js +298,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 +542,Row #{0}: Asset {1} must be submitted,"ຕິດຕໍ່ກັນ, {0}: Asset {1} ຕ້ອງໄດ້ຮັບການສົ່ງ"
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,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,ທັງຫມົດຕິດຕໍ່ລູກຄ້າ
 apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,ອັບຍອດຫຸ້ນຜ່ານ csv.
 DocType: Warehouse,Tree Details,ລາຍລະອຽດເປັນໄມ້ຢືນຕົ້ນ
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,ສົ່ງໃນປັດຈຸບັນ
 ,Support Analytics,ການວິເຄາະສະຫນັບສະຫນູນ
 DocType: Item,Website Warehouse,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}&#39; ຕາຕະລາງ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +227,Timesheet {0} is already completed or cancelled,Timesheet {0} ແມ່ນໄດ້ສໍາເລັດໄປແລ້ວຫລືຍົກເລີກ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +259,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
@@ -774,13 +783,13 @@
 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 +229,Target Warehouse,Warehouse ເປົ້າຫມາຍ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +230,Target Warehouse,Warehouse ເປົ້າຫມາຍ
 DocType: Cheque Print Template,Starting location from left edge,ເລີ່ມຕົ້ນສະຖານທີ່ຈາກແຂບໄວ້
 DocType: Item,Allow over delivery or receipt upto this percent,ອະນຸຍາດໃຫ້ໃນໄລຍະການຈັດສົ່ງຫຼືໄດ້ຮັບບໍ່ເກີນຮ້ອຍນີ້
 DocType: Stock Entry,STE-,STE-
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Sales Order Date,ວັນທີຄາດວ່າສົ່ງບໍ່ສາມາດກ່ອນທີ່ຂາຍສິນຄ້າວັນ
 DocType: Upload Attendance,Import Attendance,ການນໍາເຂົ້າເຂົ້າຮ່ວມ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,ທັງຫມົດກຸ່ມສິນຄ້າ
+apps/erpnext/erpnext/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/config/setup.py +89,Automatically compose message on submission of transactions.,ປະກອບອັດຕະໂນມັດຂໍ້ຄວາມກ່ຽວກັບການຍື່ນສະເຫນີຂອງກິດຈະກໍາ.
@@ -792,13 +801,15 @@
 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/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,ການສົ່ງເງິນເຖິງຂໍ້ຄວາມ
 DocType: Expense Claim,Expenses,ຄ່າໃຊ້ຈ່າຍ
 DocType: Item Variant Attribute,Item Variant Attribute,ລາຍການ Variant ຄຸນລັກສະນະ
 ,Purchase Receipt Trends,ແນວໂນ້ມການຊື້ຮັບ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Research & Development,ການວິໄຈແລະການພັດທະນາ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,ການວິໄຈແລະການພັດທະນາ
 ,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,ລາຄາຫຼືສ່ວນລົດ
@@ -807,7 +818,7 @@
 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/controllers/accounts_controller.py +340,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Entry ການຊໍາລະເງິນ {0} ແມ່ນການເຊື່ອມຕໍ່ກັບຄໍາສັ່ງ {1}, ເບິ່ງວ່າມັນຄວນຈະໄດ້ຮັບການດຶງເປັນລ່ວງຫນ້າໃນໃບເກັບເງິນນີ້."
+apps/erpnext/erpnext/controllers/accounts_controller.py +343,"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,ຈຸດຂອງການຂາຍ
@@ -829,12 +840,12 @@
 DocType: Supplier Quotation,Is Subcontracted,ແມ່ນເຫມົາຊ່ວງ
 DocType: Item Attribute,Item Attribute Values,ຄ່າລາຍການຄຸນລັກສະນະ
 DocType: Examination Result,Examination Result,ຜົນການສອບເສັງ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +756,Purchase Receipt,ຮັບຊື້
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +735,Purchase Receipt,ຮັບຊື້
 ,Received Items To Be Billed,ລາຍການທີ່ໄດ້ຮັບການໄດ້ຮັບການ 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 +167,Reference Doctype must be one of {0},ກະສານອ້າງອີງ DOCTYPE ຕ້ອງເປັນຫນຶ່ງໃນ {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +282,Unable to find Time Slot in the next {0} days for Operation {1},ບໍ່ສາມາດຊອກຫາສະລັອດຕິງໃຊ້ເວລາໃນ {0} ວັນຕໍ່ໄປສໍາລັບການດໍາເນີນງານ {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +170,Reference Doctype must be one of {0},ກະສານອ້າງອີງ DOCTYPE ຕ້ອງເປັນຫນຶ່ງໃນ {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,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 +439,BOM {0} must be active,BOM {0} ຕ້ອງມີການເຄື່ອນໄຫວ
@@ -845,7 +856,7 @@
 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 +214,Warehouses with existing transaction can not be converted to ledger.,ຄັງສິນຄ້າກັບການຊື້ຂາຍທີ່ມີຢູ່ແລ້ວບໍ່ສາມາດປ່ຽນໃຈເຫລື້ອມໃສຊີແຍກປະເພດ.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +217,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,ສັ່ງຊື້ສິນຄ້າ
@@ -859,9 +870,9 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Employee {0} ບໍ່ແມ່ນການເຄື່ອນໄຫວຫຼືບໍ່ມີ
 DocType: Fee Structure,Components,ອົງປະກອບ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,Please enter Asset Category in Item {0},ກະລຸນາໃສ່ປະເພດຊັບສິນໃນ Item {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +612,Item Variants {0} updated,ລາຍການທີ່ແຕກຕ່າງກັນ {0} ການປັບປຸງ
+apps/erpnext/erpnext/stock/doctype/item/item.py +614,Item Variants {0} updated,ລາຍການທີ່ແຕກຕ່າງກັນ {0} ການປັບປຸງ
 DocType: Quality Inspection Reading,Reading 6,ອ່ານ 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +843,Cannot {0} {1} {2} without any negative outstanding invoice,ສາມາດເຮັດໄດ້ບໍ່ {0} {1} {2} ໂດຍບໍ່ມີການໃບເກັບເງິນທີ່ຍັງຄ້າງຄາໃນທາງລົບ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +854,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 ໃນປັດຈຸບັນ
@@ -876,69 +887,72 @@
 DocType: Item,Is Purchase Item,ສັ່ງຊື້ສິນຄ້າ
 DocType: Asset,Purchase Invoice,ໃບເກັບເງິນຊື້
 DocType: Stock Ledger Entry,Voucher Detail No,ຂໍ້ມູນຄູປອງ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +728,New Sales Invoice,ໃບເກັບເງິນໃນການຂາຍໃຫມ່
+apps/erpnext/erpnext/accounts/page/pos/pos.js +710,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 +728,Sync Offline Invoices,Sync Offline ໃບແຈ້ງຫນີ້
 DocType: Payment Request,Paid,ການຊໍາລະເງິນ
 DocType: Program Fee,Program Fee,ຄ່າບໍລິການໂຄງການ
 DocType: Salary Slip,Total in words,ທັງຫມົດໃນຄໍາສັບຕ່າງໆ
 DocType: Material Request Item,Lead Time Date,Lead ວັນທີ່ເວລາ
 DocType: Guardian,Guardian Name,ຊື່ຜູ້ປົກຄອງ
 DocType: Cheque Print Template,Has Print Format,ມີຮູບແບບພິມ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +86, is mandatory. Maybe Currency Exchange record is not created for ,ເປັນການບັງຄັບ. ບາງທີບັນທຶກຕາແລກປ່ຽນເງິນບໍ່ໄດ້ສ້າງຂື້ນສໍາລັບການ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +109,Row #{0}: Please specify Serial No for Item {1},"ຕິດຕໍ່ກັນ, {0}: ກະລຸນາລະບຸ Serial No ສໍາລັບລາຍການ {1}"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +619,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","ສໍາລັບລາຍການ &#39;Bundle ຜະລິດພັນ, ຄັງສິນຄ້າ, ບໍ່ມີ Serial ແລະ Batch ບໍ່ມີຈະໄດ້ຮັບການພິຈາລະນາຈາກ&#39; Packing ຊີ &#39;ຕາຕະລາງ. ຖ້າຫາກວ່າ Warehouse ແລະ Batch ບໍ່ແມ່ນອັນດຽວກັນສໍາລັບລາຍການບັນຈຸທັງຫມົດສໍາລັບຄວາມຮັກ &#39;Bundle ຜະລິດພັນສິນຄ້າ, ຄຸນຄ່າເຫຼົ່ານັ້ນສາມາດໄດ້ຮັບເຂົ້າໄປໃນຕາຕະລາງລາຍການຕົ້ນຕໍ, ຄຸນຄ່າຈະໄດ້ຮັບການຄັດລອກໄປທີ່&#39; Packing ຊີ &#39;ຕາຕະລາງ."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +75, 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 +613,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing 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 +606,Supplier Invoice Date cannot be greater than Posting Date,ວັນທີ່ສະຫມັກສະຫນອງ Invoice ບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາປະກາດວັນທີ່
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +609,Supplier Invoice Date cannot be greater than Posting Date,ວັນທີ່ສະຫມັກສະຫນອງ Invoice ບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາປະກາດວັນທີ່
 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: Cheque Print Template,Date Settings,ການຕັ້ງຄ່າວັນທີ່
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,ການປ່ຽນແປງ
 ,Company Name,ຊື່ບໍລິສັດ
 DocType: SMS Center,Total Message(s),ຂໍ້ຄວາມທັງຫມົດ (s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +810,Select Item for Transfer,ເລືອກລາຍການສໍາລັບການຖ່າຍໂອນ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +789,Select Item for Transfer,ເລືອກລາຍການສໍາລັບການຖ່າຍໂອນ
 DocType: Purchase Invoice,Additional Discount Percentage,ເພີ່ມເຕີມຮ້ອຍສ່ວນລົດ
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,ເບິ່ງບັນຊີລາຍຊື່ຂອງການທັງຫມົດການຊ່ວຍເຫຼືອວິດີໂອໄດ້
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,ເລືອກຫົວບັນຊີຂອງທະນາຄານບ່ອນທີ່ເຊັກອິນໄດ້ຝາກ.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,ອະນຸຍາດໃຫ້ຜູ້ໃຊ້ເພື່ອແກ້ໄຂລາຄາອັດຕາການທຸລະກໍາ
 DocType: Pricing Rule,Max Qty,ນ້ໍາຈໍານວນ
-DocType: Student Applicant,Father's Name,ຊື່ຂອງພຣະບິດາ
 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 +105,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,ສານເຄມີ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +686,All items have already been transferred for this Production Order.,ລາຍການທັງຫມົດໄດ້ຮັບການຍົກຍ້າຍສໍາລັບໃບສັ່ງຜະລິດນີ້.
+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} ແລະພະຍາຍາມອີກເທື່ອຫນຶ່ງ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +694,All items have already been transferred for this Production Order.,ລາຍການທັງຫມົດໄດ້ຮັບການຍົກຍ້າຍສໍາລັບໃບສັ່ງຜະລິດນີ້.
 DocType: Process Payroll,Select Payroll Year and Month,ເລືອກ Payroll ປີແລະເດືອນ
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,Meter,Meter
 DocType: Workstation,Electricity Cost,ຄ່າໃຊ້ຈ່າຍໄຟຟ້າ
 DocType: HR Settings,Don't send Employee Birthday Reminders,ບໍ່ໄດ້ສົ່ງພະນັກງານວັນເດືອນປີເກີດເຕືອນ
-DocType: Opportunity,Walk In,ຍ່າງເຂົ້າ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,ການອອກສຽງສະຕັອກ
 DocType: Item,Inspection Criteria,ເງື່ອນໄຂການກວດກາ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Transfered
 apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,ອັບຫົວຈົດຫມາຍສະບັບແລະສັນຍາລັກຂອງທ່ານ. (ທ່ານສາມາດແກ້ໄຂໃຫ້ເຂົາເຈົ້າຕໍ່ມາ).
 DocType: Timesheet Detail,Bill,ບັນຊີລາຍການ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,White,ສີຂາວ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date is entered as past date,ຕໍ່ໄປວັນທີ່ຄ່າເສື່ອມລາຄາແມ່ນເຂົ້າໄປເປັນວັນທີ່ຜ່ານມາ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +167,White,ສີຂາວ
 DocType: SMS Center,All Lead (Open),Lead ທັງຫມົດ (ເປີດ)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +228,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),ຕິດຕໍ່ກັນ {0}: ຈໍານວນບໍ່ສາມາດໃຊ້ສໍາລັບການ {4} ໃນສາງ {1} ທີ່ປຊຊກິນທີ່ໃຊ້ເວລາຂອງການເຂົ້າມາ ({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}),ຕິດຕໍ່ກັນ {0}: ຈໍານວນບໍ່ສາມາດໃຊ້ສໍາລັບການ {4} ໃນສາງ {1} ທີ່ປຊຊກິນທີ່ໃຊ້ເວລາຂອງການເຂົ້າມາ ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,ໄດ້ຮັບການຄວາມກ້າວຫນ້າຂອງການຊໍາລະເງິນ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +731,Make ,ເຮັດໃຫ້
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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 +154,Order Type must be one of {0},ປະເພດຕ້ອງໄດ້ຮັບການຫນຶ່ງຂອງ {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},ປະເພດຕ້ອງໄດ້ຮັບການຫນຶ່ງຂອງ {0}
 DocType: Lead,Next Contact Date,ຖັດໄປວັນທີ່
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,ເປີດຈໍານວນ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +393,Please enter Account for Change Amount,ກະລຸນາໃສ່ບັນຊີສໍາລັບການປ່ຽນແປງຈໍານວນເງິນ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,Please enter Account for Change Amount,ກະລຸນາໃສ່ບັນຊີສໍາລັບການປ່ຽນແປງຈໍານວນເງິນ
 DocType: Student Batch,Student Batch Name,ຊື່ນັກ Batch
 DocType: Holiday List,Holiday List Name,ລາຍຊື່ຂອງວັນພັກ
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js +8,Schedule Course,ຂອງລາຍວິຊາກໍານົດເວລາ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Stock Options,ທາງເລືອກຫຼັກຊັບ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,ທາງເລືອກຫຼັກຊັບ
 DocType: Journal Entry Account,Expense Claim,ການຮ້ອງຂໍຄ່າໃຊ້ຈ່າຍ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +211,Do you really want to restore this scrapped asset?,ທ່ານກໍ່ຕ້ອງການທີ່ຈະຟື້ນຟູຊັບສິນຢຸດນີ້?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +237,Qty for {0},ຈໍານວນ {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +212,Do you really want to restore this scrapped asset?,ທ່ານກໍ່ຕ້ອງການທີ່ຈະຟື້ນຟູຊັບສິນຢຸດນີ້?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,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 ຊີ
@@ -947,9 +961,9 @@
 DocType: Company,Default Terms,ເງື່ອນໄຂມາດຕະຖານ
 DocType: Packing Slip Item,Packing Slip Item,ການຫຸ້ມຫໍ່ສິນຄ້າ Slip
 DocType: Purchase Invoice,Cash/Bank Account,ເງິນສົດ / ບັນຊີທະນາຄານ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,ລາຍການໂຍກຍ້າຍອອກມີການປ່ຽນແປງໃນປະລິມານຫຼືມູນຄ່າບໍ່ມີ.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,ລາຍການໂຍກຍ້າຍອອກມີການປ່ຽນແປງໃນປະລິມານຫຼືມູນຄ່າບໍ່ມີ.
 DocType: Delivery Note,Delivery To,ການຈັດສົ່ງກັບ
-apps/erpnext/erpnext/stock/doctype/item/item.py +635,Attribute table is mandatory,ຕາຕະລາງຄຸນສົມບັດເປັນການບັງຄັບ
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,ຕາຕະລາງຄຸນສົມບັດເປັນການບັງຄັບ
 DocType: Production Planning Tool,Get Sales Orders,ໄດ້ຮັບໃບສັ່ງຂາຍ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} ບໍ່ສາມາດຈະກະທົບທາງລົບ
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,ກະລຸນາເລືອກເອົານັກຮຽນເປັນ
@@ -974,7 +988,7 @@
 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,Warehouse WIP
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Serial No {0} ແມ່ນຢູ່ພາຍໃຕ້ສັນຍາບໍາລຸງຮັກສາບໍ່ເກີນ {1}
+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,ຊື່ອົງການຈັດຕັ້ງ
@@ -986,7 +1000,7 @@
 DocType: GL Entry,Against,ຕໍ່
 DocType: Item,Default Selling Cost Center,ມາດຕະຖານສູນຕົ້ນທຶນຂາຍ
 DocType: Sales Partner,Implementation Partner,Partner ການປະຕິບັດ
-apps/erpnext/erpnext/controllers/selling_controller.py +231,Sales Order {0} is {1},ໃບສັ່ງຂາຍ {0} ເປັນ {1}
+apps/erpnext/erpnext/controllers/selling_controller.py +232,Sales Order {0} is {1},ໃບສັ່ງຂາຍ {0} ເປັນ {1}
 DocType: Opportunity,Contact Info,ຂໍ້ມູນຕິດຕໍ່
 apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,ເຮັດໃຫ້ການອອກສຽງ Stock
 DocType: Packing Slip,Net Weight UOM,ສຸດທິ UOM ນ້ໍາຫນັກ
@@ -996,25 +1010,24 @@
 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,ວັນທີ່ສິ້ນສຸດບໍ່ສາມາດຈະຫນ້ອຍກ່ວາການເລີ່ມຕົ້ນວັນທີ່
 DocType: Sales Person,Select company name first.,ເລືອກຊື່ບໍລິສັດທໍາອິດ.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,ສະເຫນີລາຄາທີ່ໄດ້ຮັບຈາກຜູ້ຜະລິດ.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},ເພື່ອ {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,ສະເລ່ຍອາຍຸ
 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/templates/pages/home.html +32,View All Products,ເບິ່ງສິນຄ້າທັງຫມົດ
+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 +400,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,ການເຕືອນໄພ: ລະບົບຈະບໍ່ກວດສອບ overbilling ນັບຕັ້ງແຕ່ຈໍານວນເງິນສໍາລັບລາຍການ {0} ໃນ {1} ເປັນສູນ
+apps/erpnext/erpnext/controllers/accounts_controller.py +403,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/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,ແລະໃນປີ:
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +191,{0} {1} must be submitted,{0} {1} ຕ້ອງໄດ້ຮັບການສົ່ງ
-DocType: Email Digest,Annual Expense,ຄ່າໃຊ້ຈ່າຍປະຈໍາປີ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,{0} {1} must be submitted,{0} {1} ຕ້ອງໄດ້ຮັບການສົ່ງ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +145,Quantity must be less than or equal to {0},ປະລິມານຈະຕ້ອງຫນ້ອຍກ່ວາຫຼືເທົ່າກັບ {0}
 DocType: SMS Center,Total Characters,ລັກສະນະທັງຫມົດ
 apps/erpnext/erpnext/controllers/buying_controller.py +156,Please select BOM in BOM field for Item {0},ກະລຸນາເລືອກ BOM ໃນພາກສະຫນາມ BOM ສໍາລັບລາຍການ {0}
@@ -1025,30 +1038,31 @@
 DocType: Sales Partner,Distributor,ຈໍາຫນ່າຍ
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,ການຄ້າໂຄງຮ່າງກົດລະບຽບ Shipping
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +211,Production Order {0} must be cancelled before cancelling this Sales Order,ສັ່ງຊື້ສິນຄ້າ {0} ຕ້ອງໄດ້ຮັບການຍົກເລີກກ່ອນການຍົກເລີກການຂາຍສິນຄ້ານີ້
-apps/erpnext/erpnext/public/js/controllers/transaction.js +62,Please set 'Apply Additional Discount On',ກະລຸນາຕັ້ງ &#39;ສະຫມັກຕໍາສ່ວນລົດເພີ່ມເຕີມກ່ຽວກັບ&#39;
+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
 DocType: Global Defaults,Global Defaults,ຄ່າເລີ່ມຕົ້ນຂອງໂລກ
 apps/erpnext/erpnext/projects/doctype/project/project.py +153,Project Collaboration Invitation,ເຊີນຮ່ວມມືໂຄງການ
 DocType: Salary Slip,Deductions,ຫັກຄ່າໃຊ້ຈ່າຍ
+DocType: Leave Allocation,LAL/,LAL /
 apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,ປີເລີ່ມຕົ້ນ
 DocType: Purchase Invoice,Start date of current invoice's period,ວັນທີເລີ່ມຕົ້ນຂອງໄລຍະເວລາໃບເກັບເງິນໃນປັດຈຸບັນ
 DocType: Salary Slip,Leave Without Pay,ອອກຈາກໂດຍບໍ່ມີການຈ່າຍ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +327,Capacity Planning Error,Error ວາງແຜນຄວາມອາດສາມາດ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,Error ວາງແຜນຄວາມອາດສາມາດ
 ,Trial Balance for Party,ດຸນການທົດລອງສໍາລັບການພັກ
 DocType: Lead,Consultant,ທີ່ປຶກສາ
 DocType: Salary Slip,Earnings,ລາຍຮັບຈາກການ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +362,Finished Item {0} must be entered for Manufacture type entry,ສໍາເລັດການ Item {0} ຕ້ອງໄດ້ຮັບການເຂົ້າສໍາລັບການເຂົ້າປະເພດຜະລິດ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +367,Finished Item {0} must be entered for Manufacture type entry,ສໍາເລັດການ Item {0} ຕ້ອງໄດ້ຮັບການເຂົ້າສໍາລັບການເຂົ້າປະເພດຜະລິດ
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,ການເປີດບັນຊີດຸ່ນດ່ຽງ
 DocType: Sales Invoice Advance,Sales Invoice Advance,ຂາຍ Invoice Advance
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +499,Nothing to request,ບໍ່ມີຫຍັງໃນການຮ້ອງຂໍ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +500,Nothing to request,ບໍ່ມີຫຍັງໃນການຮ້ອງຂໍ
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'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 +73,Management,ການຈັດການ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},ທັງຈໍານວນບັດເດບິດເຄດິດເປັນສິ່ງຈໍາເປັນສໍາຫລັບ {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,ການຈັດການ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +55,Either debit or credit amount is required for {0},ທັງຈໍານວນບັດເດບິດເຄດິດເປັນສິ່ງຈໍາເປັນສໍາຫລັບ {0}
 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 +161,Blue,blue
+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
@@ -1058,12 +1072,12 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +23,POS Profile {0} already created for user: {1} and company {2},ຂໍ້ມູນ POS {0} ສ້າງຮຽບຮ້ອຍແລ້ວສໍາລັບຜູ້ໃຊ້: {1} ແລະບໍລິສັດ {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM Factor ແປງ
 DocType: Stock Settings,Default Item Group,ກຸ່ມສິນຄ້າມາດຕະຖານ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1374,Do you really want to submit the invoice?,ທ່ານກໍ່ຕ້ອງການທີ່ຈະສົ່ງໃບເກັບເງິນ?
+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 +685,Cost Center For Item with Item Code ',ສູນເສຍຄ່າໃຊ້ຈ່າຍສໍາລັບການລາຍການທີ່ມີລະຫັດສິນຄ້າ &#39;
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1526,"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 +679,Cost Center For Item with Item Code ',ສູນເສຍຄ່າໃຊ້ຈ່າຍສໍາລັບການລາຍການທີ່ມີລະຫັດສິນຄ້າ &#39;
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1550,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","ການຊໍາລະເງິນບໍ່ໄດ້ຖືກຕັ້ງ. ກະລຸນາກວດສອບ, ບໍ່ວ່າຈະເປັນບັນຊີໄດ້ຮັບການກໍານົດກ່ຽວກັບຮູບແບບການຊໍາລະເງິນຫຼືຂໍ້ມູນ POS."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,ຄົນຂາຍຂອງທ່ານຈະໄດ້ຮັບການເຕືອນໃນວັນນີ້ຈະຕິດຕໍ່ຫາລູກຄ້າ
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,"Further accounts can be made under Groups, but entries can be made against non-Groups","ບັນຊີເພີ່ມເຕີມສາມາດເຮັດໄດ້ພາຍໃຕ້ການກຸ່ມ, ແຕ່ການອອກສຽງສາມາດຈະດໍາເນີນຕໍ່ບໍ່ແມ່ນ Groups"
 DocType: Lead,Lead,ເປັນຜູ້ນໍາພາ
@@ -1083,104 +1097,106 @@
 DocType: Payment Reconciliation,Unreconciled Payment Details,ລາຍລະອຽດການຊໍາລະເງິນ Unreconciled
 DocType: Global Defaults,Current Fiscal Year,ປັດຈຸບັນປີງົບປະມານ
 DocType: Global Defaults,Disable Rounded Total,ປິດການໃຊ້ງານມົນທັງຫມົດ
-DocType: Lead,Call,Call
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +417,'Entries' cannot be empty,&#39;ການອອກສຽງ&#39; ບໍ່ສາມາດປ່ອຍຫວ່າງ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +418,'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 +214,Fiscal Year {0} not found,ປີງົບປະມານ {0} ບໍ່ໄດ້ພົບເຫັນ
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +221,Fiscal Year {0} not found,ປີງົບປະມານ {0} ບໍ່ໄດ້ພົບເຫັນ
 apps/erpnext/erpnext/config/hr.py +238,Setting up Employees,ການສ້າງຕັ້ງພະນັກງານ
 DocType: Sales Order,SO-,ພົນລະ
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,ກະລຸນາເລືອກຄໍານໍາຫນ້າທໍາອິດ
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Please select prefix first,ກະລຸນາເລືອກຄໍານໍາຫນ້າທໍາອິດ
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Research,ການຄົ້ນຄວ້າ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,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 +43,Item {0} must be a non-stock item,ລາຍການ {0} ຈະຕ້ອງເປັນລາຍການບໍ່ແມ່ນຫຼັກຊັບ
 DocType: Contact,User ID,User ID
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +57,View Ledger,View Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,ທໍາອິດ
-apps/erpnext/erpnext/stock/doctype/item/item.py +504,"An Item Group exists with same name, please change the item name or rename the item group","ເປັນກຸ່ມສິນຄ້າລາຄາທີ່ມີຊື່ດຽວກັນ, ກະລຸນາມີການປ່ຽນແປງຊື່ສິນຄ້າຫລືປ່ຽນຊື່ກຸ່ມລາຍການ"
+apps/erpnext/erpnext/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 +437,Rest Of The World,ສ່ວນທີ່ເຫຼືອຂອງໂລກ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,ລາຍການ {0} ບໍ່ສາມາດມີ Batch
 ,Budget Variance Report,ງົບປະມານລາຍຕ່າງ
 DocType: Salary Slip,Gross Pay,ຈ່າຍລວມທັງຫມົດ
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +90,Row {0}: Activity Type is mandatory.,ຕິດຕໍ່ກັນ {0}: ປະເພດຂອງກິດຈະກໍາແມ່ນບັງຄັບ.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +114,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/public/js/controllers/stock_controller.js +40,Accounting Ledger,Ledger ການບັນຊີ
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,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,ລາຍຮັບຈາກການເກັບຮັກສາ
 DocType: BOM Item,Item Description,ລາຍລະອຽດສິນຄ້າ
+DocType: Student Sibling,Student Sibling,ລູກຫຼານນັກສຶກສາ
 DocType: Purchase Invoice,Is Recurring,ແມ່ນ Recurring
 DocType: Purchase Invoice,Supplied Items,ລາຍະການ Supplied
 DocType: Student,STUD.,STUD.
 DocType: Production Order,Qty To Manufacture,ຈໍານວນການຜະລິດ
+DocType: Email Digest,New Income,ລາຍໄດ້ໃຫມ່
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,ຮັກສາອັດຕາການດຽວກັນຕະຫຼອດວົງຈອນການຊື້
 DocType: Opportunity Item,Opportunity Item,ໂອກາດສິນຄ້າ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,ເປີດຊົ່ວຄາວ
 ,Employee Leave Balance,ພະນັກງານອອກຈາກດຸນ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +131,Balance for Account {0} must always be {1},ການດຸ່ນດ່ຽງບັນຊີ {0} ຕ້ອງສະເຫມີໄປຈະ {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +175,Valuation Rate required for Item in row {0},ອັດຕາມູນຄ່າທີ່ກໍານົດໄວ້ສໍາລັບລາຍການຕິດຕໍ່ກັນ {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,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,ຍົກຕົວຢ່າງ: ປະລິນຍາໂທໃນວິທະຍາສາດຄອມພິວເຕີ
 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 +87, to ,ການ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,ການ
 DocType: Item,Lead Time in days,ທີ່ໃຊ້ເວລາເປັນຜູ້ນໍາພາໃນວັນເວລາ
 ,Accounts Payable Summary,Accounts Payable Summary
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Not authorized to edit frozen Account {0},ບໍ່ອະນຸຍາດໃຫ້ແກ້ໄຂບັນຊີ frozen {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,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 +62,Sales Order {0} is not valid,ໃບສັ່ງຂາຍ {0} ບໍ່ຖືກຕ້ອງ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,ໃບສັ່ງຂາຍ {0} ບໍ່ຖືກຕ້ອງ
 apps/erpnext/erpnext/setup/doctype/company/company.py +185,"Sorry, companies cannot be merged","ຂໍອະໄພ, ບໍລິສັດບໍ່ສາມາດລວມ"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +139,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",ປະລິມານທີ່ຈົດທະບຽນ / ການຖ່າຍໂອນທັງຫມົດ {0} ໃນວັດສະດຸການຈອງ {1} \ ບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາປະລິມານການຮ້ອງຂໍ {2} ສໍາລັບລາຍການ {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Small,ຂະຫນາດນ້ອຍ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,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}
 ,Invoiced Amount (Exculsive Tax),ອະນຸຈໍານວນເງິນ (exculsive ພາສີ)
-DocType: Student Applicant,Mother's / Guardian 1 Email ID,/ ຜູ້ປົກຄອງ ID 1 Email ຂອງແມ່
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,ລາຍການ 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,ຫົວຫນ້າບັນຊີ {0} ສ້າງ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +160,Green,ສີຂຽວ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,ສີຂຽວ
 DocType: Supplier,SUPP-,SUPP-
 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 +57,Contract,ສັນຍາ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,ສັນຍາ
 DocType: Email Digest,Add Quote,ຕື່ມການ Quote
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +498,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 +503,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 +80,Row {0}: Qty is mandatory,ຕິດຕໍ່ກັນ {0}: ຈໍານວນເປັນການບັງຄັບ
+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 +737,Sync Master Data,Sync ຂໍ້ມູນຫລັກ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +719,Sync Master Data,Sync ຂໍ້ມູນຫລັກ
 apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,ຜະລິດຕະພັນຫຼືການບໍລິການຂອງທ່ານ
 DocType: Mode of Payment,Mode of Payment,ຮູບແບບການຊໍາລະເງິນ
 apps/erpnext/erpnext/stock/doctype/item/item.py +178,Website Image should be a public file or website URL,ເວັບໄຊທ໌ຮູບພາບຄວນຈະເປັນເອກະສານສາທາລະນະຫຼືທີ່ຢູ່ເວັບເວັບໄຊທ໌
+DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,ນີ້ເປັນກຸ່ມລາຍການຮາກແລະບໍ່ສາມາດໄດ້ຮັບການແກ້ໄຂ.
+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,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 +345,"{0}: Employee email not found, hence email not sent","{0}: ບໍ່ໄດ້ພົບເຫັນ email ພະນັກງານ, ເພາະສະນັ້ນອີເມວບໍ່ໄດ້ສົ່ງ"
+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,ທີ່ຢູ່ຂອງບໍລິສັດ
 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 +118,"For {0}, only credit accounts can be linked against another debit entry","{0}, ພຽງແຕ່ລະເງິນກູ້ຢືມສາມາດໄດ້ຮັບການເຊື່ອມຕໍ່ເຂົ້າເດບິດອື່ນ"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Delivery Note {0} is not submitted,ສົ່ງຫມາຍເຫດ {0} ບໍ່ໄດ້ສົ່ງ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Delivery Note {0} is not submitted,ສົ່ງຫມາຍເຫດ {0} ບໍ່ໄດ້ສົ່ງ
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Sub-contracted Item,ລາຍການ {0} ຈະຕ້ອງເປັນອະນຸສັນຍາລາຍການ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,ອຸປະກອນນະຄອນຫຼວງ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","ກົດລະບຽບການຕັ້ງລາຄາໄດ້ຖືກຄັດເລືອກທໍາອິດໂດຍອີງໃສ່ &#39;ສະຫມັກຕໍາກ່ຽວກັບ&#39; ພາກສະຫນາມ, ທີ່ສາມາດຈະມີລາຍການ, ກຸ່ມສິນຄ້າຫຼືຍີ່ຫໍ້."
 DocType: Hub Settings,Seller Website,ຜູ້ຂາຍເວັບໄຊທ໌
 DocType: Item,ITEM-,ITEM-
-apps/erpnext/erpnext/controllers/selling_controller.py +147,Total allocated percentage for sales team should be 100,ອັດຕາສ່ວນການຈັດສັນທັງຫມົດສໍາລັບທີມງານການຂາຍຄວນຈະເປັນ 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +110,Production Order status is {0},ສະຖານະການສັ່ງຊື້ຜະລິດຕະພັນ {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,ອັດຕາສ່ວນການຈັດສັນທັງຫມົດສໍາລັບທີມງານການຂາຍຄວນຈະເປັນ 100
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},ສະຖານະການສັ່ງຊື້ຜະລິດຕະພັນ {0}
 DocType: Appraisal Goal,Goal,ເປົ້າຫມາຍຂອງ
 DocType: Sales Invoice Item,Edit Description,ແກ້ໄຂລາຍລະອຽດ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +757,For Supplier,ສໍາລັບຜູ້ຜະລິດ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +723,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,ສ້າງຮູບແບບພິມ
@@ -1196,10 +1212,11 @@
 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
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ອີເມວສໍາຄັນ:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +445,BOM {0} does not belong to Item {1},BOM {0} ບໍ່ໄດ້ຂຶ້ນກັບ Item {1}
 DocType: Sales Partner,Target Distribution,ການແຜ່ກະຈາຍເປົ້າຫມາຍ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1667,Deafault warehouse is required for selected item,warehouse Deafault ແມ່ນຕ້ອງການສໍາລັບລາຍການທີ່ເລືອກ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Deafault warehouse is required for selected item,warehouse Deafault ແມ່ນຕ້ອງການສໍາລັບລາຍການທີ່ເລືອກ
 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
@@ -1208,23 +1225,23 @@
 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 +110,Hardware,ອຸປະກອນ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,ອຸປະກອນ
 DocType: Sales Order,Recurring Upto,Recurring ເກີນ
 DocType: Attendance,HR Manager,Manager HR
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,ກະລຸນາເລືອກບໍລິສັດ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Privilege Leave,ສິດທິພິເສດອອກຈາກ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,ສິດທິພິເສດອອກຈາກ
 DocType: Purchase Invoice,Supplier Invoice Date,ຜູ້ສະຫນອງວັນໃບກໍາກັບ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,ທ່ານຕ້ອງການເພື່ອເຮັດໃຫ້ໂຄງຮ່າງການຊື້
 DocType: Payment Entry,Writeoff,Writeoff
 DocType: Appraisal Template Goal,Appraisal Template Goal,ເປົ້າຫມາຍການປະເມີນຜົນແບບ
-DocType: Salary Slip,Earning,ໄດ້ຮັບ
+DocType: Salary Component,Earning,ໄດ້ຮັບ
 DocType: Purchase Invoice,Party Account Currency,ສະກຸນເງິນບັນຊີພັກ
 ,BOM Browser,BOM ຂອງຕົວທ່ອງເວັບ
 DocType: Purchase Taxes and Charges,Add or Deduct,ເພີ່ມຫຼືຫັກ
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,ເງື່ອນໄຂທີ່ທັບຊ້ອນກັນພົບເຫັນລະຫວ່າງ:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +171,Against Journal Entry {0} is already adjusted against some other voucher,ຕໍ່ຕ້ານອະນຸ {0} ຈະຖືກປັບແລ້ວຕໍ່ບາງ voucher ອື່ນໆ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,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_data.py +358,Food,ສະບຽງອາຫານ
+apps/erpnext/erpnext/demo/setup/setup_data.py +301,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/course_schedule/course_schedule.js +103,Mark Attendence,ເຄື່ອງຫມາຍຜູ້ເຂົ້າຮ່ວມ
@@ -1258,12 +1275,12 @@
 DocType: Sales Order Item,Planned Quantity,ການວາງແຜນຈໍານວນ
 DocType: Purchase Invoice Item,Item Tax Amount,ຈໍານວນເງິນພາສີລາຍ
 DocType: Item,Maintain Stock,ຮັກສາ Stock
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +209,Stock Entries already created for Production Order ,Stock Entries ສ້າງຮຽບຮ້ອຍແລ້ວສໍາລັບການສັ່ງຊື້ສິນຄ້າ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,Stock Entries ສ້າງຮຽບຮ້ອຍແລ້ວສໍາລັບການສັ່ງຊື້ສິນຄ້າ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,ການປ່ຽນແປງສຸດທິໃນຊັບສິນຄົງທີ່
 DocType: Leave Control Panel,Leave blank if considered for all designations,ໃຫ້ຫວ່າງໄວ້ຖ້າພິຈາລະນາສໍາລັບການອອກແບບທັງຫມົດ
-apps/erpnext/erpnext/controllers/accounts_controller.py +620,Charge of type 'Actual' in row {0} cannot be included in Item Rate,ຮັບຜິດຊອບຂອງປະເພດ &#39;ທີ່ແທ້ຈິງໃນການຕິດຕໍ່ກັນ {0} ບໍ່ສາມາດລວມຢູ່ໃນລາຄາສິນຄ້າ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,Max: {0},ສູງສຸດທີ່ເຄຍ: {0}
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +15,From Datetime,ຈາກ DATETIME
+apps/erpnext/erpnext/controllers/accounts_controller.py +623,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 +239,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 +153,"Request for Quotation is disabled to access from portal, for more check portal settings.","ການຮ້ອງຂໍສໍາລັບວົງຢືມໄດ້ຖືກປິດການເຂົ້າເຖິງຈາກປະຕູ, ສໍາລັບການຫຼາຍການຕັ້ງຄ່າປະຕູການກວດກາ."
@@ -1271,8 +1288,8 @@
 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 +552,cannot be greater than 100,ບໍ່ສາມາດຈະຫຼາຍກ່ວາ 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +680,Item {0} is not a stock Item,ລາຍການ {0} ບໍ່ແມ່ນຫົວຂໍ້ຫຼັກຊັບ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +546,cannot be greater than 100,ບໍ່ສາມາດຈະຫຼາຍກ່ວາ 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is not a stock Item,ລາຍການ {0} ບໍ່ແມ່ນຫົວຂໍ້ຫຼັກຊັບ
 DocType: Maintenance Visit,Unscheduled,ນອກເຫນືອຈາກ
 DocType: Employee,Owned,ເປັນເຈົ້າຂອງ
 DocType: Salary Detail,Depends on Leave Without Pay,ຂຶ້ນຢູ່ກັບອອກໂດຍບໍ່ມີການຈ່າຍ
@@ -1286,10 +1303,9 @@
 DocType: GL Entry,GL Entry,GL Entry
 DocType: HR Settings,Employee Settings,ການຕັ້ງຄ່າພະນັກງານ
 ,Batch-Wise Balance History,"batch, Wise History Balance"
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,ສິ່ງທີ່ຕ້ອງເຮັດ
 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 +61,Apprentice,ຝຶກຫັດງານ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +102,Negative Quantity is not allowed,ຈໍານວນລົບບໍ່ໄດ້ຮັບອະນຸຍາດ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,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 +152,Employee cannot report to himself.,ພະນັກງານບໍ່ສາມາດລາຍງານໃຫ້ຕົນເອງ.
@@ -1310,15 +1326,14 @@
 DocType: Asset,Asset Name,ຊື່ຊັບສິນ
 DocType: Shipping Rule Condition,To Value,ກັບມູນຄ່າ
 DocType: Asset Movement,Stock Manager,Manager Stock
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +141,Source warehouse is mandatory for row {0},ຄັງສິນຄ້າທີ່ມາເປັນການບັງຄັບສໍາລັບການຕິດຕໍ່ກັນ {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +719,Packing Slip,ບັນຈຸ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Source warehouse is mandatory for row {0},ຄັງສິນຄ້າທີ່ມາເປັນການບັງຄັບສໍາລັບການຕິດຕໍ່ກັນ {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +713,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/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,ການຮ້ອງຂໍສໍາລັບວົງຢືມສາມາດເຂົ້າເຖິງໂດຍການຄລິກການເຊື່ອມຕໍ່ດັ່ງຕໍ່ໄປນີ້
 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 +81,Analyst,ນັກວິເຄາະ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,ນັກວິເຄາະ
 DocType: Item,Inventory,ສິນຄ້າຄົງຄັງ
 DocType: Item,Sales Details,ລາຍລະອຽດການຂາຍ
 DocType: Quality Inspection,QI-,QI-
@@ -1326,7 +1341,7 @@
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,ໃນຈໍານວນ
 DocType: Notification Control,Expense Claim Rejected,ຄ່າໃຊ້ຈ່າຍການຮ້ອງຂໍຖືກປະຕິເສດ
 DocType: Item Attribute,Item Attribute,ຄຸນລັກສະນະລາຍການ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +103,Government,ລັດຖະບານ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,ລັດຖະບານ
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,ຊື່ສະຖາບັນ
 apps/erpnext/erpnext/config/stock.py +289,Item Variants,Variants ລາຍການ
 DocType: Company,Services,ການບໍລິການ
@@ -1342,6 +1357,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,Financial Year Start Date,ວັນທີ່ທາງດ້ານການເງິນ Start
 DocType: POS Profile,Apply Discount,ສະຫມັກຕໍາລົດ
 DocType: Employee External Work History,Total Experience,ຕໍາແຫນ່ງທີ່ທັງຫມົດ
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70,Open Projects,ເປີດໂຄງການ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,ບັນຈຸ (s) ຍົກເລີກ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Cash Flow from Investing,ກະແສເງິນສົດຈາກການລົງທຶນ
 DocType: Program Course,Program Course,ຫລັກສູດ
@@ -1382,12 +1398,12 @@
 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 ເປົ້າຫມາຍ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +110,Accounting Entry for {0} can only be made in currency: {1},Entry ບັນຊີສໍາລັບ {0} ສາມາດເຮັດໄດ້ພຽງແຕ່ຢູ່ໃນສະກຸນເງິນ: {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Entry ບັນຊີສໍາລັບ {0} ສາມາດເຮັດໄດ້ພຽງແຕ່ຢູ່ໃນສະກຸນເງິນ: {1}
 DocType: Pricing Rule,Pricing Rule,ກົດລະບຽບການຕັ້ງລາຄາ
 DocType: Budget,Action if Annual Budget Exceeded,ການປະຕິບັດຖ້າຫາກວ່າງົບປະມານປະຈໍາປີເກີນ
 apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,ຂໍອຸປະກອນການການສັ່ງຊື້
 DocType: Shopping Cart Settings,Payment Success URL,ການຊໍາລະເງິນ URL ສົບຜົນສໍາເລັດ
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +78,Row # {0}: Returned Item {1} does not exists in {2} {3},"ຕິດຕໍ່ກັນ, {0}: ກັບຄືນລາຍການ {1} ບໍ່ໄດ້ຢູ່ໃນ {2} {3}"
+apps/erpnext/erpnext/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,ທະນາຄານສ້າງຄວາມປອງດອງ
@@ -1396,40 +1412,39 @@
 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/stock/doctype/stock_entry/stock_entry.py +339,Not allowed to tranfer more {0} than {1} against Purchase Order {2},ບໍ່ອະນຸຍາດໃຫ້ໂອນຫຼາຍ {0} ກວ່າ {1} ຕໍ່ສັ່ງຊື້ {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +344,Not allowed to tranfer more {0} than {1} against Purchase Order {2},ບໍ່ອະນຸຍາດໃຫ້ໂອນຫຼາຍ {0} ກວ່າ {1} ຕໍ່ສັ່ງຊື້ {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},ໃບຈັດສັນສົບຜົນສໍາເລັດສໍາລັບການ {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,ບໍ່ມີສິນຄ້າທີ່ຈະຊອງ
 DocType: Shipping Rule Condition,From Value,ຈາກມູນຄ່າ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +545,Manufacturing Quantity is mandatory,ປະລິມານການຜະລິດເປັນການບັງຄັບ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,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 +71,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 +162,Row {0}: From Time and To Time of {1} is overlapping with {2},ຕິດຕໍ່ກັນ {0}: ຈາກທີ່ໃຊ້ເວລາແລະການໃຊ້ເວລາຂອງ {1} ແມ່ນ overlapping ກັບ {2}
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +186,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
 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 +130,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 +137,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,ບົດລາຍງານອື່ນ ໆ
 DocType: Dependent Task,Dependent Task,Task ຂຶ້ນ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,ກະລຸນາຕິດຕັ້ງພະນັກງານແຜນການຕັ້ງຊື່ລະບົບຊັບພະຍາກອນມະນຸດ&gt; Settings HR
 apps/erpnext/erpnext/stock/doctype/item/item.py +411,Conversion factor for default Unit of Measure must be 1 in row {0},ປັດໄຈທີ່ປ່ຽນແປງສໍາລັບຫນ່ວຍໃນຕອນຕົ້ນຂອງການປະມານ 1 ປີຕິດຕໍ່ກັນ {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,Leave of type {0} cannot be longer than {1},ອອກຈາກການປະເພດ {0} ບໍ່ສາມາດຈະຕໍ່ໄປອີກແລ້ວກ່ວາ {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +197,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 +921,Search Item,ຄົ້ນຫາສິນຄ້າ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +910,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 +546,Already completed,ສໍາເລັດແລ້ວ
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +22,Payment Request already exists {0},ຄໍາຂໍຊໍາລະຢູ່ແລ້ວ {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +550,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 +241,Quantity must not be more than {0},ປະລິມານຈະຕ້ອງບໍ່ຫຼາຍກ່ວາ {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Quantity must not be more than {0},ປະລິມານຈະຕ້ອງບໍ່ຫຼາຍກ່ວາ {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +76,Previous Financial Year is not closed,ກ່ອນຫນ້າປີດ້ານການເງິນແມ່ນບໍ່ມີການປິດ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +44,Age (Days),ອາຍຸສູງສຸດ (ວັນ)
 DocType: Quotation Item,Quotation Item,ສະເຫນີລາຄາສິນຄ້າ
@@ -1446,7 +1461,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +221,Purchase Receipt {0} is not submitted,ຊື້ຮັບ {0} ບໍ່ໄດ້ສົ່ງ
 DocType: Company,Default Payable Account,ມາດຕະຖານບັນຊີເຈົ້າຫນີ້
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","ການຕັ້ງຄ່າສໍາລັບໂຄງຮ່າງການໄປຊື້ເຄື່ອງອອນໄລນ໌ເຊັ່ນ: ກົດລະບຽບການຂົນສົ່ງ, ບັນຊີລາຍການລາຄາແລະອື່ນໆ"
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +83,{0}% Billed,{0}% ບິນ
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}% ບິນ
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Reserved ຈໍານວນ
 DocType: Party Account,Party Account,ບັນຊີພັກ
 apps/erpnext/erpnext/config/setup.py +116,Human Resources,ຊັບພະຍາກອນມະນຸດ
@@ -1458,12 +1473,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Row {0}: Advance against Supplier must be debit,ຕິດຕໍ່ກັນ {0}: Advance ຕໍ່ຜູ້ຜະລິດຕ້ອງໄດ້ຮັບການຫັກ
 DocType: Company,Default Values,ຄ່າເລີ່ມຕົ້ນ
 DocType: Expense Claim,Total Amount Reimbursed,ຈໍານວນທັງຫມົດການຊົດເຊີຍຄືນ
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +22,Collect,ເກັບກໍາ
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,ເກັບກໍາ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,Against Supplier Invoice {0} dated {1},ຕໍ່ Supplier Invoice {0} ວັນ {1}
 DocType: Customer,Default Price List,ລາຄາມາດຕະຖານ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +225,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
-DocType: Payment Reconciliation,Payments,ການຊໍາລະເງິນ
 DocType: Journal Entry,Entry Type,ປະເພດເຂົ້າ
 ,Customer Credit Balance,ຍອດສິນເຊື່ອລູກຄ້າ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Payable,ການປ່ຽນແປງສຸດທິໃນບັນຊີເຈົ້າຫນີ້
@@ -1475,7 +1489,7 @@
 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 +9,Procurement,ການຈັດຊື້
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,ບໍ່ມີລາຍການທີ່ມີການປ່ຽນແປງໃນປະລິມານຫຼືມູນຄ່າ.
+apps/erpnext/erpnext/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,ການຮ້ອງຂໍການຮັບປະກັນ
 ,Lead Details,ລາຍລະອຽດນໍາ
 DocType: Purchase Invoice,End date of current invoice's period,ວັນທີໃນຕອນທ້າຍຂອງໄລຍະເວລາໃບເກັບເງິນໃນປັດຈຸບັນ
@@ -1500,7 +1514,7 @@
 DocType: Purchase Invoice,Additional Discount,ສ່ວນລົດເພີ່ມເຕີມ
 DocType: Selling Settings,Selling Settings,ຂາຍ Settings
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,ການປະມູນອອນໄລນ໌
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +97,Please specify either Quantity or Valuation Rate or both,ກະລຸນາລະບຸບໍ່ວ່າຈະປະລິມານຫຼືອັດຕາການປະເມີນມູນຄ່າຫຼືທັງສອງຢ່າງ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,ກະລຸນາລະບຸບໍ່ວ່າຈະປະລິມານຫຼືອັດຕາການປະເມີນມູນຄ່າຫຼືທັງສອງຢ່າງ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +13,Fulfillment,ປະຕິບັດຕາມ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","ບໍລິສັດ, ເດືອນແລະປີງົບປະມານເປັນການບັງຄັບ"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,ຄ່າໃຊ້ຈ່າຍການຕະຫຼາດ
@@ -1521,14 +1535,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,Setup ERPNext ສໍາເລັດ!
 DocType: Item,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +93,A Customer Group exists with same name please change the Customer name or rename the Customer Group,A ກຸ່ມລູກຄ້າທີ່ມີຢູ່ມີຊື່ດຽວກັນກະລຸນາມີການປ່ຽນແປງຊື່ລູກຄ້າຫຼືປ່ຽນຊື່ກຸ່ມລູກຄ້າ
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +126,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
 DocType: Stock Entry,Material Receipt,ຮັບອຸປະກອນການ
 DocType: Homepage,Products,ຜະລິດຕະພັນ
 DocType: Announcement,Instructor,instructor
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},ພັກປະເພດແລະພັກຈໍາເປັນຕ້ອງມີສໍາລັບການຮັບ / ບັນຊີ Payable {0}
 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,ຕິດຕໍ່ຕໍ່ໄປໂດຍ
@@ -1539,7 +1552,7 @@
 ,Item-wise Sales Register,ລາຍການສະຫລາດ Sales ຫມັກສະມາຊິກ
 DocType: Asset,Gross Purchase Amount,ການຊື້ທັງຫມົດ
 DocType: Asset,Depreciation Method,ວິທີການຄ່າເສື່ອມລາຄາ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Offline,ອອຟໄລ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +686,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,ທີ່ກໍານົດໄວ້
@@ -1557,25 +1570,27 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +425,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 +858,Make Purchase Order,ເຮັດໃຫ້ການສັ່ງຊື້
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +852,Make Purchase Order,ເຮັດໃຫ້ການສັ່ງຊື້
 DocType: SMS Center,Send To,ສົ່ງເຖິງ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,There is not enough leave balance for Leave Type {0},ຍັງບໍ່ທັນມີຄວາມສົມດູນອອກພຽງພໍສໍາລັບການອອກຈາກປະເພດ {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,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,Stock Reconciliation
 DocType: Territory,Territory Name,ຊື່ອານາເຂດ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +172,Work-in-Progress Warehouse is required before Submit,ການເຮັດວຽກໃນຄວາມຄືບຫນ້າ Warehouse ກ່ອນການຍື່ນສະເຫນີການ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,Work-in-Progress Warehouse is required before Submit,ການເຮັດວຽກໃນຄວາມຄືບຫນ້າ Warehouse ກ່ອນການຍື່ນສະເຫນີການ
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,ສະຫມັກສໍາລັບການວຽກເຮັດງານທໍາໄດ້.
 DocType: Purchase Order Item,Warehouse and Reference,ຄັງສິນຄ້າແລະເອກສານອ້າງອິງ
 DocType: Supplier,Statutory info and other general information about your Supplier,ຂໍ້ມູນນິຕິບັນຍັດແລະຂໍ້ມູນທົ່ວໄປອື່ນໆກ່ຽວກັບຜູ້ຜະລິດຂອງທ່ານ
-apps/erpnext/erpnext/hooks.py +88,Addresses,ທີ່ຢູ່
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,ຜູ້ຜະລິດ&gt; ປະເພດຜະລິດ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +212,Against Journal Entry {0} does not have any unmatched {1} entry,ຕໍ່ຕ້ານອະນຸ {0} ບໍ່ມີການ unmatched {1} ເຂົ້າ
+apps/erpnext/erpnext/hooks.py +95,Addresses,ທີ່ຢູ່
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +215,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
 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,ການສົ່ງແລະບັນຊີລາຍການ
@@ -1583,11 +1598,10 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,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 +731,Payment,ການຊໍາລະເງິນ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,Payment,ການຊໍາລະເງິນ
 DocType: Production Order Operation,Actual Time and Cost,ທີ່ໃຊ້ເວລາແລະຄ່າໃຊ້ຈ່າຍຕົວຈິງ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},ຂໍອຸປະກອນການສູງສຸດ {0} ສາມາດເຮັດໄດ້ສໍາລັບລາຍການ {1} ຕໍ່ຂາຍສິນຄ້າ {2}
 DocType: Employee,Salutation,ຄໍາຂຶ້ນຕົ້ນ
-DocType: Pricing Rule,Brand,ຍີ່ຫໍ້
 DocType: Course,Course Abbreviation,ຊື່ຫຍໍ້ຂອງລາຍວິຊາ
 DocType: Item,Will also apply for variants,ຍັງຈະນໍາໃຊ້ສໍາລັບການ variants
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +142,"Asset cannot be cancelled, as it is already {0}","ຊັບສິນບໍ່ສາມາດໄດ້ຮັບການຍົກເລີກ, ເປັນມັນແມ່ນແລ້ວ {0}"
@@ -1599,7 +1613,7 @@
 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.","ລາຍຊື່ຜະລິດຕະພັນຫຼືການບໍລິການຂອງທ່ານທີ່ທ່ານຈະຊື້ຫຼືຂາຍ. ເຮັດໃຫ້ແນ່ໃຈວ່າການກວດສອບການກຸ່ມສິນຄ້າ, ຫນ່ວຍງານຂອງມາດຕະການແລະຄຸນສົມບັດອື່ນໆໃນເວລາທີ່ທ່ານຈະເລີ່ມຕົ້ນ."
 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 +85,Associate,ສະມາຄົມ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,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,ສ້າງບັນຊີຮັບ
@@ -1607,7 +1621,7 @@
 DocType: Production Planning Tool,Material Requests,ການຮ້ອງຂໍອຸປະກອນການ
 DocType: Warranty Claim,Issue Date,ວັນທີ່ອອກ
 DocType: Activity Cost,Activity Cost,ຄ່າໃຊ້ຈ່າຍຂອງກິດຈະກໍາ
-DocType: Timesheet Detail,Timesheet Detail,ຂໍ້ມູນ Timesheet
+DocType: Sales Invoice Timesheet,Timesheet Detail,ຂໍ້ມູນ Timesheet
 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),ຊີ້ໃຫ້ເຫັນວ່າຊຸດແມ່ນສ່ວນຫນຶ່ງຂອງການຈັດສົ່ງ (ພຽງແຕ່ Draft) ນີ້
@@ -1630,6 +1644,7 @@
 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,ມີ Variants
 DocType: Monthly Distribution,Name of the Monthly Distribution,ຊື່ຂອງການແຜ່ກະຈາຍລາຍເດືອນ
 DocType: Sales Person,Parent Sales Person,ບຸກຄົນຜູ້ປົກຄອງ Sales
@@ -1642,30 +1657,31 @@
 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 +44,"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/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.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +502,Error: {0} &gt; {1},ຄວາມຜິດພາດ: {0}&gt; {1}
 DocType: Item,Is Sales Item,ເປັນສິນຄ້າລາຄາ
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,ລາຍ Group ເປັນໄມ້ຢືນຕົ້ນ
 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.,ວັນທີໄລຍະເລີ່ມຕົ້ນບໍ່ສາມາດຈະກ່ອນຫນ້ານັ້ນກ່ວາປີເລີ່ມວັນທີຂອງປີທາງວິຊາການທີ່ໃນໄລຍະການມີການເຊື່ອມຕໍ່ (ປີທາງວິຊາການ {}). ກະລຸນາແກ້ໄຂຂໍ້ມູນວັນແລະພະຍາຍາມອີກເທື່ອຫນຶ່ງ.
 DocType: Naming Series,Current Value,ມູນຄ່າປະຈຸບັນ
-apps/erpnext/erpnext/controllers/accounts_controller.py +235,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,ປີງົບປະມານຫຼາຍມີສໍາລັບວັນທີ {0}. ກະລຸນາຕັ້ງບໍລິສັດໃນປີງົບປະມານ
+apps/erpnext/erpnext/controllers/accounts_controller.py +238,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,ບໍ່ມີ Serial ສະຖານະ
 DocType: Payment Entry Reference,Outstanding,ທີ່ຍັງຄ້າງຄາ
 ,Daily Timesheet Summary,Summary Timesheet ປະຈໍາວັນ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +458,Item table can not be blank,ຕາຕະລາງລາຍການບໍ່ສາມາດມີຊ່ອງຫວ່າງ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +443,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 +5,This is based on stock movement. See {0} for details,ນີ້ແມ່ນອີງໃສ່ການເຄື່ອນຍ້າຍ. ເບິ່ງ {0} ສໍາລັບລາຍລະອຽດ
 DocType: Pricing Rule,Selling,ຂາຍ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +341,Amount {0} {1} deducted against {2},ຈໍານວນ {0} {1} ຫັກຕໍ່ {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +344,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,ເນື່ອງຈາກວັນທີບໍ່ສາມາດກ່ອນທີ່ໂພດວັນທີ່
@@ -1680,8 +1696,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +144,Cannot refer row number greater than or equal to current row number for this Charge type,ບໍ່ສາມາດສົ່ງຈໍານວນການຕິດຕໍ່ກັນຫຼາຍກ່ວາຫຼືເທົ່າກັບຈໍານວນການຕິດຕໍ່ກັນໃນປັດຈຸບັນສໍາລັບປະເພດຄ່າໃຊ້ຈ່າຍນີ້
 DocType: Asset,Sold,ຂາຍ
 ,Item-wise Purchase History,ປະວັດການຊື້ລາຍການທີ່ສະຫລາດ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Red,ສີແດງ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},ກະລຸນາຄລິກໃສ່ &quot;ສ້າງຕາຕະລາງ &#39;ມາດດຶງຂໍ້ມູນ Serial No ເພີ່ມຂຶ້ນສໍາລັບສິນຄ້າ {0}
+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,ໃບສັ່ງຜະລິດເປີດ
 DocType: Sales Invoice Payment,Base Amount (Company Currency),ຈໍານວນພື້ນຖານ (ບໍລິສັດສະກຸນເງິນ)
@@ -1689,7 +1705,7 @@
 DocType: Installation Note,Installation Time,ທີ່ໃຊ້ເວລາການຕິດຕັ້ງ
 DocType: Sales Invoice,Accounting Details,ລາຍລະອຽດການບັນຊີ
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,ລົບລາຍະການທັງຫມົດສໍາລັບການບໍລິສັດນີ້
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +187,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,"ຕິດຕໍ່ກັນ, {0}: ການດໍາເນີນງານ {1} ບໍ່ໄດ້ສໍາເລັດສໍາລັບການ {2} ຈໍານວນຂອງສິນຄ້າສໍາເລັດໃນການຜະລິດລໍາດັບທີ່ {3}. ກະລຸນາປັບປຸງສະຖານະພາບການດໍາເນີນງານໂດຍຜ່ານທີ່ໃຊ້ເວລາບັນທຶກ"
+apps/erpnext/erpnext/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}. ກະລຸນາປັບປຸງສະຖານະພາບການດໍາເນີນງານໂດຍຜ່ານທີ່ໃຊ້ເວລາບັນທຶກ"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,ການລົງທຶນ
 DocType: Issue,Resolution Details,ລາຍລະອຽດຄວາມລະອຽດ
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,ການຈັດສັນ
@@ -1725,16 +1741,17 @@
 DocType: Bank Reconciliation Detail,Against Account,ຕໍ່ບັນຊີ
 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}
 DocType: Delivery Note,Excise Page Number,ອາກອນຊົມໃຊ້ຈໍານວນຫນ້າ
 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}
 ,Maintenance Schedules,ຕາຕະລາງການບໍາລຸງຮັກສາ
 DocType: Task,Actual End Date (via Time Sheet),ຕົວຈິງວັນທີ່ສິ້ນສຸດ (ຜ່ານທີ່ໃຊ້ເວລາ Sheet)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Amount {0} {1} against {2} {3},ຈໍານວນ {0} {1} ກັບ {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +339,Amount {0} {1} against {2} {3},ຈໍານວນ {0} {1} ກັບ {2} {3}
 ,Quotation Trends,ແນວໂນ້ມວົງຢືມ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},ກຸ່ມສິນຄ້າບໍ່ໄດ້ກ່າວເຖິງໃນຕົ້ນສະບັບລາຍການສໍາລັບການ item {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +295,Debit To account must be a Receivable account,ເດບິດການບັນຊີຈະຕ້ອງບັນຊີລູກຫນີ້
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Receivable account,ເດບິດການບັນຊີຈະຕ້ອງບັນຊີລູກຫນີ້
 DocType: Shipping Rule Condition,Shipping Amount,ການຂົນສົ່ງຈໍານວນເງິນ
 ,Pending Amount,ທີ່ຍັງຄ້າງຈໍານວນ
 DocType: Purchase Invoice Item,Conversion Factor,ປັດໄຈການປ່ຽນແປງ
@@ -1742,10 +1759,10 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +137,Expected value after useful life must be greater than or equal to {0},ມູນຄ່າຄາດວ່າຫຼັງຈາກຊີວິດທີ່ເປັນປະໂຫຍດຕ້ອງໄດ້ຫຼາຍກ່ວາຫຼືເທົ່າກັບ {0}
 DocType: Purchase Receipt,Vehicle Number,ຈໍານວນຍານພາຫະນະ
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,ວັນທີ່ໃບເກັບເງິນທີ່ເກີດຂຶ້ນຈະໄດ້ຮັບການຢຸດເຊົາການ
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +90,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,ໃບຈັດສັນທັງຫມົດ {0} ບໍ່ສາມາດຈະຫນ້ອຍກ່ວາໃບອະນຸມັດແລ້ວ {1} ສໍາລັບໄລຍະເວລາ
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +93,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 +22,Enter Paid Amount,ກະລຸນາໃສ່ຈໍານວນເງິນທີ່ຊໍາລະເງິນ
+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
@@ -1755,13 +1772,15 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,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 +524,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","ຕິດຕໍ່ກັນ, {0}: ຈໍານວນປະມານ 1 ປີ, ເປັນລາຍການເປັນສິນຊັບຖາວອນ. ກະລຸນາໃຊ້ຕິດຕໍ່ກັນທີ່ແຍກຕ່າງຫາກສໍາລັບການຈໍານວນຫຼາຍ."
+apps/erpnext/erpnext/controllers/accounts_controller.py +527,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","ຕິດຕໍ່ກັນ, {0}: ຈໍານວນປະມານ 1 ປີ, ເປັນລາຍການເປັນສິນຊັບຖາວອນ. ກະລຸນາໃຊ້ຕິດຕໍ່ກັນທີ່ແຍກຕ່າງຫາກສໍາລັບການຈໍານວນຫຼາຍ."
 DocType: Leave Block List Allow,Leave Block List Allow,ອອກຈາກສະໄຫມອະນຸຍາດໃຫ້
 apps/erpnext/erpnext/setup/doctype/company/company.py +249,Abbr can not be blank or space,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/stock/get_item_details.py +123,Please specify Company,ກະລຸນາລະບຸບໍລິສັດ
 ,Customer Acquisition and Loyalty,ຂອງທີ່ໄດ້ມາຂອງລູກຄ້າແລະຄວາມຈົງຮັກພັກ
@@ -1772,17 +1791,19 @@
 apps/erpnext/erpnext/projects/doctype/task/task.js +26,Expense Claims,ການຮຽກຮ້ອງຄ່າໃຊ້ຈ່າຍ
 DocType: Issue,Support,ສະຫນັບສະຫນູນ
 ,BOM Search,ຄົ້ນຫາ BOM
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Closing (Opening + Totals),ປິດ (ການເປີດກວ້າງການທັງຫມົດ +)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),ປິດ (ການເປີດກວ້າງການທັງຫມົດ +)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,ກະລຸນາລະບຸສະກຸນເງິນໃນບໍລິສັດ
 DocType: Workstation,Wages per hour,ຄ່າແຮງງານຕໍ່ຊົ່ວໂມງ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +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/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,ປະຕິບັດຕາມການຮ້ອງຂໍການວັດສະດຸໄດ້ຮັບການຍົກຂຶ້ນມາອັດຕະໂນມັດອີງຕາມລະດັບ Re: ສັ່ງຊື້ສິນຄ້າຂອງ
-apps/erpnext/erpnext/controllers/accounts_controller.py +272,Account {0} is invalid. Account Currency must be {1},ບັນຊີ {0} ບໍ່ຖືກຕ້ອງ. ບັນຊີສະກຸນເງິນຈະຕ້ອງ {1}
+DocType: Email Digest,Pending Sales Orders,ລໍຖ້າຄໍາສັ່ງຂາຍ
+apps/erpnext/erpnext/controllers/accounts_controller.py +275,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 +956,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","ຕິດຕໍ່ກັນ, {0}: Reference ປະເພດເອກະສານຕ້ອງເປັນສ່ວນຫນຶ່ງຂອງຄໍາສັ່ງຂາຍ, ຂາຍໃບເກັບເງິນຫຼືການອະນຸທິນ"
-DocType: Salary Slip,Deduction,ການຫັກ
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +87,Row {0}: From Time and To Time is mandatory.,ຕິດຕໍ່ກັນ {0}: ຈາກທີ່ໃຊ້ເວລາແລະຈະໃຊ້ເວລາເປັນການບັງຄັບ.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +969,"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 +111,Row {0}: From Time and To Time is mandatory.,ຕິດຕໍ່ກັນ {0}: ຈາກທີ່ໃຊ້ເວລາແລະຈະໃຊ້ເວລາເປັນການບັງຄັບ.
+DocType: Stock Reconciliation Item,Amount Difference,ຈໍານວນທີ່ແຕກຕ່າງກັນ
 apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},ລາຍການລາຄາເພີ່ມຂຶ້ນສໍາລັບ {0} ໃນລາຄາ {1}
 DocType: Address Template,Address Template,ແມ່ແບບທີ່ຢູ່
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +7,Please enter Employee Id of this sales person,ກະລຸນາໃສ່ລະຫັດພະນັກງານຂອງບຸກຄົນການຂາຍນີ້
@@ -1790,7 +1811,7 @@
 DocType: Project,% Tasks Completed,% ວຽກງານສໍາເລັດ
 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 +194,Please enter Production Item first,ກະລຸນາໃສ່ການຜະລິດສິນຄ້າຄັ້ງທໍາອິດ
+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,ຜູ້ໃຊ້ຄົນພິການ
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,ວົງຢືມ
@@ -1799,53 +1820,54 @@
 DocType: Maintenance Visit,Maintenance User,ຜູ້ໃຊ້ບໍາລຸງຮັກສາ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +149,Cost Updated,ຄ່າໃຊ້ຈ່າຍ Updated
 DocType: Employee,Date of Birth,ວັນເດືອນປີເກີດ
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +86,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**.,** ປີງົບປະມານ ** ເປັນຕົວແທນເປັນປີການເງິນ. entries ບັນຊີທັງຫມົດແລະເຮັດທຸລະກໍາທີ່ສໍາຄັນອື່ນໆມີການຕິດຕາມຕໍ່ປີງົບປະມານ ** **.
 DocType: Opportunity,Customer / Lead Address,ລູກຄ້າ / ທີ່ຢູ່ນໍາ
 apps/erpnext/erpnext/stock/doctype/item/item.py +208,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 +177,Job Description,ລາຍລະອຽດວຽກເຮັດງານທໍາ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,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 +126,"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 +127,"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 ຈາກໂຄສະນາການວັດແທກຜົນຕອບແທນຈາກການລົງທຶນ."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +24,Welcome to POS: Create your POS Profile,ຍິນດີຕ້ອນຮັບ POS: ເມື່ອຂໍ້ມູນ POS ຂອງທ່ານ
 DocType: Expense Claim,Approver,ອະນຸມັດ
 ,SO Qty,ດັ່ງນັ້ນຈໍານວນ
+DocType: Guardian,Work Address,ຢູ່ບ່ອນເຮັດວຽກ
 DocType: Appraisal,Calculate Total Score,ຄິດໄລ່ຄະແນນທັງຫມົດ
 DocType: Request for Quotation,Manufacturing Manager,ຜູ້ຈັດການການຜະລິດ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serial No {0} ແມ່ນຢູ່ພາຍໃຕ້ການຮັບປະກັນບໍ່ເກີນ {1}
+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 +74,Shipments,ການຂົນສົ່ງ
+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,Serial No {0} ບໍ່ໄດ້ຂຶ້ນກັບ Warehouse ໃດ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,Row # ,"ຕິດຕໍ່ກັນ,"
+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 +156,Get From,ໄດ້ຮັບຈາກ
+apps/erpnext/erpnext/public/js/utils.js +167,Get From,ໄດ້ຮັບຈາກ
 DocType: C-Form,Quarter,ໄຕມາດ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Miscellaneous Expenses,ຄ່າໃຊ້ຈ່າຍອື່ນ ໆ
 DocType: Global Defaults,Default Company,ບໍລິສັດມາດຕະຖານ
 apps/erpnext/erpnext/controllers/stock_controller.py +167,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,ຄ່າໃຊ້ຈ່າຍຂອງບັນຊີທີ່ແຕກຕ່າງກັນເປັນການບັງຄັບສໍາລັບລາຍການ {0} ເປັນຜົນກະທົບຕໍ່ມູນຄ່າຫຼັກຊັບໂດຍລວມ
-apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","ບໍ່ສາມາດ overbill ສໍາລັບລາຍການ {0} ຕິດຕໍ່ກັນ {1} ຫຼາຍກ່ວາ {2}. ການອະນຸຍາດໃຫ້ overbilling, ກະລຸນາທີ່ກໍານົດໄວ້ໃນການຕັ້ງຄ່າ Stock"
+apps/erpnext/erpnext/controllers/accounts_controller.py +419,"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
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} is disabled,ຜູ້ໃຊ້ {0} ເປັນຄົນພິການ
 DocType: Leave Application,Total Leave Days,ທັງຫມົດວັນອອກ
 DocType: Email Digest,Note: Email will not be sent to disabled users,ຫມາຍເຫດ: ອີເມວຈະບໍ່ຖືກສົ່ງກັບຜູ້ໃຊ້ຄົນພິການ
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,ເລືອກບໍລິສັດ ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,ໃຫ້ຫວ່າງໄວ້ຖ້າພິຈາລະນາສໍາລັບການພະແນກການທັງຫມົດ
 apps/erpnext/erpnext/config/hr.py +171,"Types of employment (permanent, contract, intern etc.).","ປະເພດຂອງການຈ້າງງານ (ຖາວອນ, ສັນຍາ, ແລະອື່ນໆພາຍໃນ)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +346,{0} is mandatory for Item {1},{0} ເປັນການບັງຄັບສໍາລັບລາຍການ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,{0} is mandatory for Item {1},{0} ເປັນການບັງຄັບສໍາລັບລາຍການ {1}
 DocType: Currency Exchange,From Currency,ຈາກສະກຸນເງິນ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","ກະລຸນາເລືອກນວນການຈັດສັນ, ປະເພດໃບເກັບເງິນແລະຈໍານວນໃບເກັບເງິນໃນ atleast ຫນຶ່ງຕິດຕໍ່ກັນ"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,ຄ່າໃຊ້ຈ່າຍຂອງການສັ່ງຊື້ໃຫມ່
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},ຂາຍສິນຄ້າຕ້ອງການສໍາລັບລາຍການ {0}
 DocType: Purchase Invoice Item,Rate (Company Currency),ອັດຕາການ (ບໍລິສັດສະກຸນເງິນ)
-apps/erpnext/erpnext/demo/setup_data.py +360,Others,ຄົນອື່ນ
+DocType: Student Guardian,Others,ຄົນອື່ນ
 DocType: Payment Entry,Unallocated Amount,ຈໍານວນເງິນບໍ່ໄດ້ປັນສ່ວນ
 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,ພາສີອາກອນແລະຄ່າບໍລິການ
@@ -1865,17 +1887,16 @@
 apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,Inventory ຕໍ່ເນື່ອງ
 DocType: Activity Type,Default Billing Rate,ມາດຕະຖານອັດຕາການເອີ້ນເກັບເງິນ
 DocType: Sales Invoice,Total Billing Amount,ຈໍານວນການເອີ້ນເກັບເງິນທັງຫມົດ
-apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +54,Receivable Account,Account Receivable
-apps/erpnext/erpnext/controllers/accounts_controller.py +546,Row #{0}: Asset {1} is already {2},"ຕິດຕໍ່ກັນ, {0}: Asset {1} ແມ່ນແລ້ວ {2}"
+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 +549,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 +79,CEO,CEO
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,CEO
 DocType: Expense Claim Detail,Expense Claim Detail,ຄ່າໃຊ້ຈ່າຍຂໍ້ມູນການຮ້ອງຂໍ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +808,Please select correct account,ກະລຸນາເລືອກບັນຊີທີ່ຖືກຕ້ອງ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +809,Please select correct account,ກະລຸນາເລືອກບັນຊີທີ່ຖືກຕ້ອງ
 DocType: Item,Weight UOM,ນ້ໍາຫນັກ UOM
 DocType: Salary Structure Employee,Salary Structure Employee,ພະນັກງານໂຄງສ້າງເງິນເດືອນ
 DocType: Employee,Blood Group,Group ເລືອດ
-DocType: Purchase Invoice Item,Page Break,ຫນ້າພັກຜ່ອນ
 DocType: Production Order Operation,Pending,ທີ່ຍັງຄ້າງ
 DocType: Course,Course Name,ຫລັກສູດ
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,ຜູ້ໃຊ້ທີ່ສາມາດອະນຸມັດຄໍາຮ້ອງສະຫມັກອອກຈາກພະນັກງານສະເພາະຂອງ
@@ -1884,14 +1905,15 @@
 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 +54,Full-time,ເຕັມເວລາ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,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: 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,ມູນຄ່າຂາເຂົ້າທັງຫມົດ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Debit To is required,ເດບິດການຈໍາເປັນຕ້ອງ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +321,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,ຜູ້ຈັດການຄຸນະພາບ
@@ -1899,6 +1921,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/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
@@ -1909,18 +1932,17 @@
 DocType: Production Order Operation,Completed Qty,ສໍາເລັດຈໍານວນ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"For {0}, only debit accounts can be linked against another credit entry","{0}, ພຽງແຕ່ບັນຊີເດບິດສາມາດເຊື່ອມໂຍງກັບເຂົ້າການປ່ອຍສິນເຊື່ອອີກ"
 apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,ລາຄາ {0} ເປັນຄົນພິການ
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +99,Row {0}: Completed Qty cannot be more than {1} for operation {2},ຕິດຕໍ່ກັນ {0}: ສໍາເລັດຈໍານວນບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາ {1} ສໍາລັບການດໍາເນີນງານ {2}
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +123,Row {0}: Completed Qty cannot be more than {1} for operation {2},ຕິດຕໍ່ກັນ {0}: ສໍາເລັດຈໍານວນບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາ {1} ສໍາລັບການດໍາເນີນງານ {2}
 DocType: Manufacturing Settings,Allow Overtime,ອະນຸຍາດໃຫ້ເຮັດວຽກລ່ວງເວ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} ຈໍານວນ Serial ຕ້ອງການສໍາລັບລາຍການ {1}. ທ່ານໄດ້ສະຫນອງ {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,ອັດຕາປະເມີນມູນຄ່າໃນປະຈຸບັນ
 DocType: Item,Customer Item Codes,ລະຫັດລູກຄ້າສິນຄ້າ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,ແລກປ່ຽນເງິນຕາໄດ້ຮັບ / ການສູນເສຍ
 DocType: Opportunity,Lost Reason,ລືມເຫດຜົນ
-apps/erpnext/erpnext/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/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/purchase_receipt/purchase_receipt.py +378,All items have already been invoiced,ລາຍການທັງຫມົດໄດ້ຮັບການອະນຸແລ້ວ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +379,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,ພາຍນອກ
@@ -1936,18 +1958,19 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,ລູກຄ້າຂອງທ່ານ
 apps/erpnext/erpnext/projects/doctype/project/project.py +141,You have been invited to collaborate on the project: {0},ທ່ານໄດ້ຖືກເຊື້ອເຊີນເພື່ອເຮັດວຽກຮ່ວມກັນກ່ຽວກັບໂຄງການ: {0}
 DocType: Leave Block List Date,Block Date,Block ວັນທີ່
-apps/erpnext/erpnext/templates/generators/job_opening.html +19,Apply Now,ສະຫມັກວຽກນີ້
+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.","ສ້າງແລະຄຸ້ມຄອງປະຈໍາວັນ, ປະຈໍາອາທິດແລະປະຈໍາເດືອນຫົວເລື່ອງອີເມລ໌."
 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,ອາຄານ
-apps/erpnext/erpnext/utilities/doctype/address/address.py +164,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,ບໍ່ມີແມ່ແບບທີ່ຢູ່ໃນຕອນຕົ້ນພົບ. ກະລຸນາສ້າງບັນຊີໃຫມ່ຈາກ Setup&gt; ການພິມແລະຍີ່ຫໍ້&gt; Template ທີ່ຢູ່.
 DocType: Fee Structure,Fee Structure,ຄ່າບໍລິການ
 DocType: Timesheet Detail,Costing Amount,ການໃຊ້ຈ່າຍຈໍານວນເງິນ
+DocType: Student Admission,Application Fee,ຄໍາຮ້ອງສະຫມັກຄ່າທໍານຽມ
 DocType: Process Payroll,Submit Salary Slip,ຍື່ນສະເຫນີການ Slip ເງິນເດືອນ
-apps/erpnext/erpnext/controllers/selling_controller.py +161,Maxiumm discount for Item {0} is {1}%,ສ່ວນລົດ Maxiumm ສໍາລັບລາຍການ {0} ເປັນ {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,ສ່ວນລົດ Maxiumm ສໍາລັບລາຍການ {0} ເປັນ {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,ການນໍາເຂົ້າໃນການເປັນກຸ່ມ
 DocType: Sales Partner,Address & Contacts,ທີ່ຢູ່ແລະຕິດຕໍ່ພົວພັນ
 DocType: SMS Log,Sender Name,ຊື່ຜູ້ສົ່ງ
@@ -1972,21 +1995,21 @@
 DocType: Serial No,Delivery Time,ເວລາຂົນສົ່ງ
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,ຜູ້ສູງອາຍຸຈາກຈໍານວນກ່ຽວກັບ
 DocType: Item,End of Life,ໃນຕອນທ້າຍຂອງການມີຊີວິດ
-apps/erpnext/erpnext/demo/setup_data.py +361,Travel,ການເດີນທາງ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +155,No active or default Salary Structure found for employee {0} for the given dates,ບໍ່ມີການເຄື່ອນໄຫວຫຼືເລີ່ມຕົ້ນເງິນເດືອນໂຄງປະກອບການທີ່ພົບເຫັນສໍາລັບພະນັກງານ {0} ສໍາລັບກໍານົດວັນທີດັ່ງກ່າວ
+apps/erpnext/erpnext/demo/setup/setup_data.py +304,Travel,ການເດີນທາງ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +167,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 +23,Update Cost,ການປັບປຸງຄ່າໃຊ້ຈ່າຍ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,ການປັບປຸງຄ່າໃຊ້ຈ່າຍ
 DocType: Item Reorder,Item Reorder,ລາຍການຮຽງລໍາດັບໃຫມ່
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +36,Show Salary Slip,Slip ສະແດງໃຫ້ເຫັນເງິນເດືອນ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +748,Transfer Material,ການຖ່າຍໂອນການວັດສະດຸ
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +53,Show Salary Slip,Slip ສະແດງໃຫ້ເຫັນເງິນເດືອນ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +166,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 +923,Please set recurring after saving,ກະລຸນາທີ່ກໍານົດໄວ້ໄດ້ເກີດຂຶ້ນຫລັງຈາກບັນທຶກ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +646,Select change amount account,ບັນຊີຈໍານວນເລືອກການປ່ຽນແປງ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +914,Please set recurring after saving,ກະລຸນາທີ່ກໍານົດໄວ້ໄດ້ເກີດຂຶ້ນຫລັງຈາກບັນທຶກ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +703,Select change amount account,ບັນຊີຈໍານວນເລືອກການປ່ຽນແປງ
 DocType: Purchase Invoice,Price List Currency,ລາຄາສະກຸນເງິນ
 DocType: Naming Series,User must always select,ຜູ້ໃຊ້ຕ້ອງໄດ້ເລືອກ
 DocType: Stock Settings,Allow Negative Stock,ອະນຸຍາດໃຫ້ລົບ Stock
@@ -1998,31 +2021,32 @@
 DocType: Quality Inspection,Verified By,ການຢັ້ງຢືນໂດຍ
 DocType: Address,Subsidiary,ບໍລິສັດຍ່ອຍ
 apps/erpnext/erpnext/setup/doctype/company/company.py +64,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","ບໍ່ສາມາດມີການປ່ຽນແປງສະກຸນເງິນເລີ່ມຂອງບໍລິສັດ, ເນື່ອງຈາກວ່າມີທຸລະກໍາທີ່ມີຢູ່ແລ້ວ. ເຮັດທຸລະກໍາຕ້ອງໄດ້ຮັບການຍົກເລີກການປ່ຽນແປງສະກຸນເງິນໄວ້ໃນຕອນຕົ້ນ."
+DocType: Grade Interval,Grade Description,Grade ລາຍລະອຽດ
 DocType: Quality Inspection,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 +33,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 +352,Quantity in row {0} ({1}) must be same as manufactured quantity {2},ປະລິມານໃນການຕິດຕໍ່ກັນ {0} ({1}) ຈະຕ້ອງດຽວກັນກັບປະລິມານການຜະລິດ {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Quantity in row {0} ({1}) must be same as manufactured quantity {2},ປະລິມານໃນການຕິດຕໍ່ກັນ {0} ({1}) ຈະຕ້ອງດຽວກັນກັບປະລິມານການຜະລິດ {2}
 DocType: Appraisal,Employee,ພະນັກງານ
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,ເຊີນມາເປັນຜູ້ໃຊ້
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} ແມ່ນບິນໄດ້ຢ່າງເຕັມສ່ວນ
 DocType: Workstation Working Hour,End Time,ທີ່ໃຊ້ເວລາສຸດທ້າຍ
 DocType: Payment Entry,Payment Deductions or Loss,ນຫັກລົບການຊໍາລະເງິນຫຼືການສູນເສຍ
-apps/erpnext/erpnext/config/schools.py +100,LMS,LMS
+apps/erpnext/erpnext/config/schools.py +104,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/config/crm.py +6,Sales Pipeline,ແຜນການຂາຍ
 DocType: Student Batch Student,Student Batch Student,ນັກສຶກສາ Batch ນັກສຶກສາ
-DocType: Sales Invoice,Mass Mailing,ທາງໄປສະນີມະຫາຊົນ
+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 +199,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/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 +297,Salary Slip of employee {0} already created for this period,Slip ເງິນເດືອນຂອງພະນັກງານ {0} ສ້າງຮຽບຮ້ອຍແລ້ວສໍາລັບການໄລຍະເວລານີ້
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Pharmaceutical,ຢາ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +309,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/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,ການປ່ອຍສິນເຊື່ອເພື່ອ
@@ -2037,27 +2061,28 @@
 DocType: Upload Attendance,Attendance To Date,ຜູ້ເຂົ້າຮ່ວມເຖິງວັນທີ່
 DocType: Warranty Claim,Raised By,ຍົກຂຶ້ນມາໂດຍ
 DocType: Payment Gateway Account,Payment Account,ບັນຊີຊໍາລະເງິນ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +814,Please specify Company to proceed,ກະລຸນາລະບຸບໍລິສັດເພື່ອດໍາເນີນການ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +793,Please specify Company to proceed,ກະລຸນາລະບຸບໍລິສັດເພື່ອດໍາເນີນການ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Receivable,ການປ່ຽນແປງສຸດທິໃນບັນຊີລູກຫນີ້
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Compensatory Off,ການຊົດເຊີຍ Off
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,ການຊົດເຊີຍ Off
 DocType: Quality Inspection Reading,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.,ກະລຸນາເຮັດໃຫ້ແນ່ໃຈວ່າທ່ານຕ້ອງການທີ່ຈະລົບເຮັດທຸລະກໍາທັງຫມົດຂອງບໍລິສັດນີ້. ຂໍ້ມູນຕົ້ນສະບັບຂອງທ່ານຈະຍັງຄົງເປັນມັນເປັນ. ການດໍາເນີນການນີ້ບໍ່ສາມາດຍົກເລີກໄດ້.
 DocType: Room,Room Number,ຈໍານວນຫ້ອງ
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},ກະສານອ້າງອີງທີ່ບໍ່ຖືກຕ້ອງ {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +161,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາ quanitity ການວາງແຜນ ({2}) ໃນການຜະລິດການສັ່ງຊື້ {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +162,{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 +217,Raw Materials cannot be blank.,ວັດຖຸດິບບໍ່ສາມາດມີຊ່ອງຫວ່າງ.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,"Could not update stock, invoice contains drop shipping item.","ບໍ່ສາມາດປັບປຸງຫຼັກຊັບ, ໃບເກັບເງິນປະກອບດ້ວຍການຫຼຸດລົງລາຍການການຂົນສົ່ງ."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +460,Quick Journal Entry,ໄວອະນຸທິນ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +111,You can not change rate if BOM mentioned agianst any item,ທ່ານບໍ່ສາມາດມີການປ່ຽນແປງອັດຕາການຖ້າຫາກວ່າ BOM ທີ່ໄດ້ກ່າວມາ agianst ລາຍການໃດ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +441,"Could not update stock, invoice contains drop shipping item.","ບໍ່ສາມາດປັບປຸງຫຼັກຊັບ, ໃບເກັບເງິນປະກອບດ້ວຍການຫຼຸດລົງລາຍການການຂົນສົ່ງ."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Quick Journal Entry,ໄວອະນຸທິນ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +103,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 +214,{0} {1} is not submitted,{0} {1} ບໍ່ໄດ້ສົ່ງ
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,ການຮ້ອງຂໍສໍາລັບລາຍການ.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,ຄໍາສັ່ງການຜະລິດແຍກຕ່າງຫາກຈະໄດ້ຮັບການສ້າງຕັ້ງຂື້ນສໍາລັບລາຍການດີໃນແຕ່ລະສໍາເລັດຮູບ.
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +121,{0} must be negative in return document,{0} ຕ້ອງກະທົບທາງລົບໃນເອກະສານຜົນຕອບແທນ
 ,Minutes to First Response for Issues,ນາທີຄວາມຮັບຜິດຊອບຫນ້າທໍາອິດສໍາລັບບັນຫາ
 DocType: Purchase Invoice,Terms and Conditions1,ຂໍ້ກໍານົດແລະ Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,ຊື່ຂອງສະຖາບັນສໍາລັບການທີ່ທ່ານຈະຕິດຕັ້ງລະບົບນີ້.
@@ -2066,16 +2091,17 @@
 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 +398,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,ກະລຸນາໃສ່ແຜນທີ່ຕິດຕໍ່ນີ້ເປັນ
 ,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 +739,Item or Warehouse for row {0} does not match Material Request,ລາຍການຫຼືໂກດັງຕິດຕໍ່ກັນ {0} ບໍ່ມີຄໍາວ່າວັດສະດຸຂໍ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +747,Item or Warehouse for row {0} does not match Material Request,ລາຍການຫຼືໂກດັງຕິດຕໍ່ກັນ {0} ບໍ່ມີຄໍາວ່າວັດສະດຸຂໍ
 apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,ຫນ່ວຍບໍລິການຂອງມາດຕະການ
 DocType: Fiscal Year,Year End Date,ປີສິ້ນສຸດວັນທີ່
 DocType: Task Depends On,Task Depends On,ວຽກງານຂຶ້ນໃນ
-DocType: Lead,Opportunity,ໂອກາດ
+DocType: Supplier Quotation,Opportunity,ໂອກາດ
 ,Completed Production Orders,ສໍາເລັດໃບສັ່ງຜະລິດ
 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 ມາດຕະຖານ
@@ -2088,7 +2114,7 @@
 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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},ວັນທີເລີ່ມຕົ້ນບໍາລຸງຮັກສາບໍ່ສາມາດກ່ອນທີ່ວັນທີສໍາລັບການບໍ່ມີ Serial {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},ວັນທີເລີ່ມຕົ້ນບໍາລຸງຮັກສາບໍ່ສາມາດກ່ອນທີ່ວັນທີສໍາລັບການບໍ່ມີ Serial {0}
 DocType: Production Order,Actual End Date,ຕົວຈິງວັນທີ່ສິ້ນສຸດ
 DocType: Purchase Invoice,PINV-,PINV-
 DocType: Authorization Rule,Applicable To (Role),ສາມາດນໍາໃຊ້ການ (ພາລະບົດບາດ)
@@ -2103,7 +2129,7 @@
 DocType: SMS Log,No of Requested SMS,ບໍ່ມີຂອງ SMS ຂໍ
 DocType: Campaign,Campaign-.####,ຂະບວນການ -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,ຂັ້ນຕອນຕໍ່ໄປ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,Please supply the specified items at the best possible rates,ກະລຸນາສະຫນອງໃຫ້ແກ່ລາຍການທີ່ລະບຸໄວ້ໃນລາຄາທີ່ເປັນໄປໄດ້ທີ່ດີທີ່ສຸດ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +695,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 +117,Contract End Date must be greater than Date of Joining,ສຸດທ້າຍສັນຍາວັນຕ້ອງໄດ້ຫຼາຍກ່ວາວັນຂອງການເຂົ້າຮ່ວມ
 DocType: Delivery Note,DN-,DN-
@@ -2112,7 +2138,7 @@
 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 +14,This is an example website auto-generated from ERPNext,ນີ້ແມ່ນເວັບໄຊທ໌ຕົວຢ່າງອັດຕະໂນມັດສ້າງຈາກ ERPNext
+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
 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.
 
@@ -2139,13 +2165,14 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd ຈໍານວນ
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +54,Fee Records Created - {0},ຄ່າບໍລິການບັນທຶກຂຽນເມື່ອຫລາຍ - {0}
 DocType: Asset Category Account,Asset Category Account,ບັນຊີຊັບສິນປະເພດ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +103,Cannot produce more Item {0} than Sales Order quantity {1},ບໍ່ສາມາດຜະລິດສິນຄ້າຫຼາຍ {0} ກ່ວາປະລິມານສັ່ງຂາຍ {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Stock Entry {0} is not submitted,Stock Entry {0} ບໍ່ໄດ້ສົ່ງ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},ບໍ່ສາມາດຜະລິດສິນຄ້າຫຼາຍ {0} ກ່ວາປະລິມານສັ່ງຂາຍ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +505,Stock Entry {0} is not submitted,Stock Entry {0} ບໍ່ໄດ້ສົ່ງ
 DocType: Payment Reconciliation,Bank / Cash Account,ບັນຊີທະນາຄານ / ເງິນສົດ
 DocType: Tax Rule,Billing City,City Billing
 DocType: Salary Component Account,Salary Component Account,ບັນຊີເງິນເດືອນ Component
 DocType: Global Defaults,Hide Currency Symbol,ຊ່ອນສະກຸນເງິນ Symbol
 apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card","ຕົວຢ່າງ: ທະນາຄານ, ເງິນສົດ, ບັດເຄຣດິດ"
+DocType: Lead Source,Source Name,ແຫຼ່ງຊື່
 DocType: Journal Entry,Credit Note,Credit Note
 DocType: Warranty Claim,Service Address,ທີ່ຢູ່ບໍລິການ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furnitures and Fixtures,ເຟີນິເຈີແລະການແຂ່ງຂັນ
@@ -2157,6 +2184,7 @@
 DocType: Opportunity,Customer / Lead Name,ລູກຄ້າ / ຊື່ Lead
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +89,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/controllers/trends.py +19,Total(Qty),ທັງຫມົດ (ຈໍານວນ)
 DocType: Sales Invoice,This Document,ເອກະສານນີ້
@@ -2168,15 +2196,15 @@
 DocType: Purchase Receipt,Time at which materials were received,ເວລາທີ່ອຸປະກອນທີ່ໄດ້ຮັບ
 DocType: Stock Ledger Entry,Outgoing Rate,ອັດຕາລາຍຈ່າຍ
 apps/erpnext/erpnext/config/hr.py +176,Organization branch master.,ຕົ້ນສະບັບສາຂາອົງການຈັດຕັ້ງ.
-apps/erpnext/erpnext/controllers/accounts_controller.py +273, or ,ຫຼື
+apps/erpnext/erpnext/controllers/accounts_controller.py +276, 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 +203,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,"ຕິດຕໍ່ກັນ, {0}: Journal Entry {1} ບໍ່ມີບັນຊີ {2} ຫລືແລ້ວປຽບທຽບ voucher ອື່ນ"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +206,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 +90,No employee for the above selected criteria OR salary slip already created,ພະນັກງານສໍາລັບເງື່ອນໄຂການຄັດເລືອກຂ້າງເທິງຫຼືຫຼຸດເງິນເດືອນບໍ່ສ້າງແລ້ວ
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +93,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,ປະເພດການຊໍາລະເງິນ
@@ -2204,8 +2232,8 @@
 DocType: Product Bundle,Parent Item,ສິນຄ້າຂອງພໍ່ແມ່
 DocType: Account,Account Type,ປະເພດບັນຊີ
 DocType: Delivery Note,DN-RET-,"DN, RET-"
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +115,Leave Type {0} cannot be carry-forwarded,"ອອກຈາກປະເພດ {0} ບໍ່ສາມາດໄດ້ຮັບການປະຕິບັດ, ການສົ່ງ"
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',ບໍາລຸງຮັກສາເປັນເວລາທີ່ບໍ່ໄດ້ສ້າງຂຶ້ນສໍາລັບການລາຍການທັງຫມົດ. ກະລຸນາຄລິກໃສ່ &quot;ສ້າງຕາຕະລາງ&quot;
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +118,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 +163,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","ສໍາລັບການຕິດຕໍ່ກັນ {0} ໃນ {1}. ເພື່ອປະກອບມີ {2} ໃນອັດຕາການສິນຄ້າ, ແຖວເກັດທີ່ຢູ່ {3} ຍັງຕ້ອງໄດ້ຮັບການປະກອບ"
@@ -2217,13 +2245,13 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +32,Disabled template must not be default template,ແມ່ແບບຄົນພິການຈະຕ້ອງບໍ່ແມ່ແບບມາດຕະຖານ
 DocType: Account,Income Account,ບັນຊີລາຍໄດ້
 DocType: Payment Request,Amount in customer's currency,ຈໍານວນເງິນໃນສະກຸນເງິນຂອງລູກຄ້າ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +748,Delivery,ສົ່ງ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +742,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,ຄວາມຮັບຜິດຊອບທີ່ສໍາຄັນ
 DocType: Payment Entry,Total Allocated Amount,ນວນການຈັດສັນທັງຫມົດ
 DocType: Item Reorder,Material Request Type,ອຸປະກອນການຮ້ອງຂໍປະເພດ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +82,Row {0}: UOM Conversion Factor is mandatory,ຕິດຕໍ່ກັນ {0}: UOM ປັດໄຈການແປງເປັນການບັງຄັບ
+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,ສູນຕົ້ນທຶນ
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Voucher #
@@ -2234,13 +2262,13 @@
 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 +90,Head of Marketing and Sales,ຫົວຫນ້າການຕະຫຼາດແລະການຂາຍ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,ອາກອນລາຍໄດ້
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,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.,ການຕິດຕາມຊີ້ນໍາໂດຍປະເພດອຸດສາຫະກໍາ.
 DocType: Item Supplier,Item Supplier,ຜູ້ຜະລິດລາຍການ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +403,Please enter Item Code to get batch no,ກະລຸນາໃສ່ລະຫັດສິນຄ້າເພື່ອໃຫ້ໄດ້ຮັບ batch ທີ່ບໍ່ມີ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +770,Please select a value for {0} quotation_to {1},ກະລຸນາເລືອກຄ່າ {0} quotation_to {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +397,Please enter Item Code to get batch no,ກະລຸນາໃສ່ລະຫັດສິນຄ້າເພື່ອໃຫ້ໄດ້ຮັບ batch ທີ່ບໍ່ມີ
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +764,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","ການລວມເປັນໄປໄດ້ພຽງແຕ່ຖ້າຫາກວ່າມີຄຸນສົມບັດດັ່ງຕໍ່ໄປນີ້ແມ່ນອັນດຽວກັນໃນການບັນທຶກການທັງສອງ. ເປັນກຸ່ມ, ປະເພດຮາກ, ບໍລິສັດ"
@@ -2252,28 +2280,29 @@
 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 +100,Issues,ບັນຫາ
+apps/erpnext/erpnext/hooks.py +109,Issues,ບັນຫາ
 apps/erpnext/erpnext/controllers/status_updater.py +13,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} ເປັນຄົນພິການ
 DocType: Supplier,Billing Currency,ສະກຸນເງິນ Billing
 DocType: Sales Invoice,SINV-RET-,"SINV, RET-"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Large,ຂະຫນາດໃຫຍ່ພິເສດ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,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 +507,Warning: Another {0} # {1} exists against stock entry {2},ການເຕືອນໄພ: ອີກປະການຫນຶ່ງ {0} # {1} ມີຢູ່ຕໍ່ການເຂົ້າຫຸ້ນ {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Local,ທ້ອງຖິ່ນ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +508,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),ເງິນກູ້ຢືມແລະອື່ນ ໆ (ຊັບສິນ)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,ລູກຫນີ້
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Large,ຂະຫນາດໃຫຍ່
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Large,ຂະຫນາດໃຫຍ່
 DocType: Homepage Featured Product,Homepage Featured Product,ຫນ້າທໍາອິດຜະລິດຕະພັນທີ່ແນະນໍາ
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,ຊື່ Warehouse ໃຫມ່
-apps/erpnext/erpnext/accounts/report/financial_statements.py +225,Total {0} ({1}),ທັງຫມົດ {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +224,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,ວິທີການປະເມີນມູນຄ່າໃນຕອນຕົ້ນ
@@ -2319,9 +2348,9 @@
 DocType: Attendance,Leave Type,ປະເພດອອກຈາກ
 apps/erpnext/erpnext/controllers/stock_controller.py +173,Expense / Difference account ({0}) must be a 'Profit or Loss' account,ບັນຊີຄ່າໃຊ້ຈ່າຍ / ຄວາມແຕກຕ່າງ ({0}) ຈະຕ້ອງບັນຊີກໍາໄຮຫລືຂາດທຶນ &#39;
 DocType: Account,Accounts User,ບັນຊີຜູ້ໃຊ້
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Name error: {0},ຄວາມຜິດພາດຊື່: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +90,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 +178,{0} {1} does not associated with {2} {3},{0} {1} ບໍ່ທີ່ກ່ຽວຂ້ອງກັບ {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +181,{0} {1} does not associated with {2} {3},{0} {1} ບໍ່ທີ່ກ່ຽວຂ້ອງກັບ {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,ຜູ້ເຂົ້າຮ່ວມສໍາລັບພະນັກງານ {0} ແມ່ນຫມາຍແລ້ວ
 DocType: Packing Slip,If more than one package of the same type (for print),ຖ້າຫາກວ່າຫຼາຍກ່ວາຫນຶ່ງຊຸດຂອງປະເພດດຽວກັນ (ສໍາລັບການພິມ)
 DocType: Warehouse,Parent Warehouse,Warehouse ພໍ່ແມ່
@@ -2340,7 +2369,7 @@
 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,ວັດຖຸປະສົງ
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,atleast ຫນຶ່ງລາຍການຄວນຈະໄດ້ຮັບເຂົ້າໄປໃນປະລິມານກະທົບທາງລົບໃນເອກະສານຜົນຕອບແທນ
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Atleast one item should be entered with negative quantity in return document,atleast ຫນຶ່ງລາຍການຄວນຈະໄດ້ຮັບເຂົ້າໄປໃນປະລິມານກະທົບທາງລົບໃນເອກະສານຜົນຕອບແທນ
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","ການດໍາເນີນງານ {0} ຕໍ່ໄປອີກແລ້ວກ່ວາຊົ່ວໂມງການເຮັດວຽກທີ່ມີຢູ່ໃນເວີກສະເຕຊັນ {1}, ທໍາລາຍລົງດໍາເນີນການເຂົ້າໄປໃນການດໍາເນີນງານຫຼາຍ"
 ,Requested,ການຮ້ອງຂໍ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +83,No Remarks,ບໍ່ມີຂໍ້ສັງເກດ
@@ -2352,46 +2381,46 @@
 DocType: Item,Total Projected Qty,ທັງຫມົດໂຄງການຈໍານວນ
 DocType: Monthly Distribution,Distribution Name,ຊື່ການແຜ່ກະຈາຍ
 DocType: Course,Course Code,ລະຫັດຂອງລາຍວິຊາ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Quality Inspection required for Item {0},ກວດສອບຄຸນນະພາບທີ່ຕ້ອງການສໍາລັບລາຍການ {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,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
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,ການຄຸ້ມຄອງການເປັນໄມ້ຢືນຕົ້ນອານາເຂດຂອງ.
 DocType: Journal Entry Account,Sales Invoice,ໃບເກັບເງິນການຂາຍ
 DocType: Journal Entry Account,Party Balance,ດຸນພັກ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +475,Please select Apply Discount On,ກະລຸນາເລືອກສະຫມັກຕໍາ Discount On
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +92,Salary Slip Created,ເງິນເດືອນ Slip ຂຽນເມື່ອ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +464,Please select Apply Discount On,ກະລຸນາເລືອກສະຫມັກຕໍາ Discount On
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +95,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,ອຸປະກອນການໂອນສໍາລັບການຜະລິດ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,ເປີເຊັນສ່ວນລົດສາມາດນໍາໃຊ້ບໍ່ວ່າຈະຕໍ່ລາຄາຫຼືສໍາລັບລາຄາທັງຫມົດ.
 DocType: Purchase Invoice,Half-yearly,ເຄິ່ງຫນຶ່ງຂອງການປະຈໍາປີ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +384,Accounting Entry for Stock,Entry ບັນຊີສໍາລັບ Stock
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +387,Accounting Entry for Stock,Entry ບັນຊີສໍາລັບ Stock
 DocType: Sales Invoice,Sales Team1,Team1 ຂາຍ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,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 +96,Row {0}: Completed Qty must be greater than zero.,ຕິດຕໍ່ກັນ {0}: ສໍາເລັດຈໍານວນຕ້ອງໄດ້ຫຼາຍກ່ວາສູນ.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +120,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 +88,Row # {0}: Cannot return more than {1} for Item {2},"ຕິດຕໍ່ກັນ, {0}: ບໍ່ສາມາດກັບຄືນຫຼາຍກ່ວາ {1} ສໍາລັບລາຍການ {2}"
+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,ຕອນດິນຂອງຕົນ
 DocType: Item Group,Show this slideshow at the top of the page,ສະແດງໃຫ້ເຫັນ slideshow ນີ້ຢູ່ສົ້ນເທິງຂອງຫນ້າ
 DocType: BOM,Item UOM,ລາຍການ UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),ຈໍານວນເງິນພາສີຫຼັງຈາກຈໍານວນສ່ວນລົດ (ບໍລິສັດສະກຸນເງິນ)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +147,Target warehouse is mandatory for row {0},ຄັງສິນຄ້າເປົ້າຫມາຍມີຜົນບັງຄັບສໍາລັບການຕິດຕໍ່ກັນ {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,ເລືອກທີ່ຢູ່ຜູ້ຜະລິດ
 DocType: Quality Inspection,Quality Inspection,ກວດສອບຄຸນະພາບ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Extra Small,ພິເສດຂະຫນາດນ້ອຍ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,Warning: Material Requested Qty is less than Minimum Order Qty,ການເຕືອນໄພ: ວັດສະດຸຂໍຈໍານວນແມ່ນຫນ້ອຍກ່ວາສັ່ງຊື້ຂັ້ນຕ່ໍາຈໍານວນ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +194,Account {0} is frozen,ບັນຊີ {0} ແມ່ນ frozen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,ພິເສດຂະຫນາດນ້ອຍ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +690,Warning: Material Requested Qty is less than Minimum Order Qty,ການເຕືອນໄພ: ວັດສະດຸຂໍຈໍານວນແມ່ນຫນ້ອຍກ່ວາສັ່ງຊື້ຂັ້ນຕ່ໍາຈໍານວນ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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 +606,Can only make payment against unbilled {0},ພຽງແຕ່ສາມາດເຮັດໃຫ້ຊໍາລະເງິນກັບຍັງບໍ່ເອີ້ນເກັບ {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +126,Commission rate cannot be greater than 100,ອັດຕາການຄະນະກໍາມະບໍ່ສາມາດຈະຫຼາຍກ່ວາ 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +609,Can only make payment against unbilled {0},ພຽງແຕ່ສາມາດເຮັດໃຫ້ຊໍາລະເງິນກັບຍັງບໍ່ເອີ້ນເກັບ {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,ອັດຕາການຄະນະກໍາມະບໍ່ສາມາດຈະຫຼາຍກ່ວາ 100
 DocType: Stock Entry,Subcontract,Subcontract
 apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,ກະລຸນາໃສ່ {0} ທໍາອິດ
 DocType: Production Order Operation,Actual End Time,ທີ່ແທ້ຈິງທີ່ໃຊ້ເວລາສຸດທ້າຍ
@@ -2402,30 +2431,30 @@
 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 +158,Colour,ສີ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,ສີ
 DocType: Maintenance Visit,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; ແລະບໍ່ມີມັດຜະລິດຕະພັນອື່ນໆ
 DocType: Student Log,Academic,ວິຊາການ
-apps/erpnext/erpnext/controllers/accounts_controller.py +469,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),ທັງຫມົດລ່ວງຫນ້າ ({0}) ຕໍ່ Order {1} ບໍ່ສາມາດຈະຫຼາຍກ່ວາຈໍານວນທັງຫມົດ ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +472,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),ທັງຫມົດລ່ວງຫນ້າ ({0}) ຕໍ່ Order {1} ບໍ່ສາມາດຈະຫຼາຍກ່ວາຈໍານວນທັງຫມົດ ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,ເລືອກການແຜ່ກະຈາຍລາຍເດືອນກັບ unevenly ແຈກຢາຍເປົ້າຫມາຍໃນທົ່ວເດືອນ.
 DocType: Purchase Invoice Item,Valuation Rate,ອັດຕາປະເມີນມູນຄ່າ
+DocType: Stock Reconciliation,SR/,SR /
 apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,ລາຄາສະກຸນເງິນບໍ່ໄດ້ເລືອກ
 DocType: Assessment,Results,ຜົນການຄົ້ນຫາ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +168,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 +175,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: Student Applicant,Father's/ Guardian 2 Email ID,/ ຜູ້ປົກຄອງ ID 2 Email ຂອງພຣະບິດາ
 DocType: Maintenance Visit Purpose,Against Document No,ຕໍ່ຕ້ານເອກະສານທີ່ບໍ່ມີ
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,ການຄຸ້ມຄອງ Partners ຂາຍ.
 DocType: Quality Inspection,Inspection Type,ປະເພດການກວດກາ
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +228,Warehouses with existing transaction can not be converted to group.,ຄັງສິນຄ້າກັບການຊື້ຂາຍທີ່ມີຢູ່ແລ້ວບໍ່ສາມາດປ່ຽນໃຈເຫລື້ອມໃສກຸ່ມ.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +231,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 ແບບຟອມ No
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,ຜູ້ເຂົ້າຮ່ວມບໍ່ມີເຄື່ອງຫມາຍ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Researcher,ນັກຄົ້ນຄວ້າ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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.,ການກວດກາຄຸນນະພາບເຂົ້າມາ.
@@ -2437,25 +2466,25 @@
 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,ທີ່ໃຊ້ເວລາຊີ Sheet
 DocType: Employee,You can enter any date manually,ທ່ານສາມາດເຂົ້າວັນທີ່ໃດ ໆ ດ້ວຍຕົນເອງ
-DocType: Sales Invoice,Advertisement,ການໂຄສະນາ
 DocType: Asset Category Account,Depreciation Expense Account,ບັນຊີຄ່າເສື່ອມລາຄາຄ່າໃຊ້ຈ່າຍ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Probationary Period,ໄລຍະເວລາແຫ່ງການທົດລອງ
-apps/erpnext/erpnext/hooks.py +102,Announcements,ປະກາດ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,ໄລຍະເວລາແຫ່ງການທົດລອງ
+apps/erpnext/erpnext/hooks.py +111,Announcements,ປະກາດ
 DocType: Customer Group,Only leaf nodes are allowed in transaction,ພຽງແຕ່ໂຫນດໃບອະນຸຍາດໃຫ້ໃນການເຮັດທຸ
 DocType: Expense Claim,Expense Approver,ຜູ້ອະນຸມັດຄ່າໃຊ້ຈ່າຍ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +109,Row {0}: Advance against Customer must be credit,ຕິດຕໍ່ກັນ {0}: 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 +16,To Datetime,ການ DATETIME
+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/scheduling_tool/scheduling_tool.py +51,Course Schedules deleted:,ຕາຕະລາງການຂອງລາຍວິຊາການລຶບ:
 apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,ຂໍ້ມູນບັນທຶກການຮັກສາສະຖານະພາບການຈັດສົ່ງ sms
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,ກິດຈະກໍາທີ່ຍັງຄ້າງ
+DocType: Accounts Settings,Make Payment via Journal Entry,ເຮັດໃຫ້ການຊໍາລະເງິນໂດຍຜ່ານການອະນຸທິນ
+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 +127,Please enter relieving date.,ກະລຸນາໃສ່ການເຈັບວັນທີ.
-apps/erpnext/erpnext/controllers/trends.py +145,Amt,amt
+apps/erpnext/erpnext/controllers/trends.py +149,Amt,amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,Only Leave Applications with status 'Approved' can be submitted,ອອກພຽງແຕ່ຄໍາຮ້ອງສະຫມັກທີ່ມີສະຖານະພາບ &#39;ອະນຸມັດ&#39; ສາມາດໄດ້ຮັບການສົ່ງ
 apps/erpnext/erpnext/utilities/doctype/address/address.py +26,Address Title is mandatory.,ທີ່ຢູ່ Title ແມ່ນບັງຄັບ.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,ກະລຸນາໃສ່ຊື່ຂອງຂະບວນການຖ້າຫາກວ່າແຫລ່ງທີ່ມາຂອງຄໍາຖາມແມ່ນການໂຄສະນາ
@@ -2473,14 +2502,15 @@
 apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1},ບໍ່ສາມາດຊອກຫາອັດຕາແລກປ່ຽນ {0} ກັບ {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,ເຄື່ອງຫມາຍວັນເຄິ່ງຫນຶ່ງ
 DocType: Sales Invoice,Sales Team,ທີມງານການຂາຍ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Duplicate entry,ເຂົ້າຊ້ໍາກັນ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,ເຂົ້າຊ້ໍາກັນ
 DocType: Program Enrollment Tool,Get Students,ໄດ້ຮັບນັກສຶກສາ
 DocType: Serial No,Under Warranty,ພາຍໃຕ້ການຮັບປະກັນ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +490,[Error],[ຂາຍ]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +484,[Error],[ຂາຍ]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,ໃນຄໍາສັບຕ່າງໆຈະສັງເກດເຫັນເມື່ອທ່ານຊ່ວຍປະຢັດໃບສັ່ງຂາຍ.
 ,Employee Birthday,ພະນັກງານວັນເດືອນປີເກີດ
 apps/erpnext/erpnext/controllers/status_updater.py +175,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} ມີຢູ່ແລ້ວ. ກະລຸນາປັບປຸງແກ້ໄຂການອອກສຽງເຫຼົ່ານີ້ແລະພະຍາຍາມອີກເທື່ອຫນຶ່ງ.
 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} ບໍ່ມີ
@@ -2496,22 +2526,22 @@
 ,Issued Items Against Production Order,ການອອກຕໍ່ສັ່ງຜະລິດ
 DocType: Pricing Rule,Purchase Manager,ຜູ້ຈັດການຊື້
 DocType: Target Detail,Target Detail,ຄາດຫມາຍລະອຽດ
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +25,All Jobs,ວຽກເຮັດງານທໍາທັງຫມົດ
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,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,ສູນຕົ້ນທຶນກັບທຸລະກໍາທີ່ມີຢູ່ແລ້ວບໍ່ສາມາດປ່ຽນໃຈເຫລື້ອມໃສກຸ່ມ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Amount {0} {1} {2} {3},ຈໍານວນ {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Amount {0} {1} {2} {3},ຈໍານວນ {0} {1} {2} {3}
 DocType: Account,Depreciation,ຄ່າເສື່ອມລາຄາ
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),ຜູ້ສະຫນອງ (s)
 DocType: Employee Attendance Tool,Employee Attendance Tool,ເຄື່ອງມືການເຂົ້າຮ່ວມຂອງພະນັກງານ
 DocType: 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 +372,Payment Entries {0} are un-linked,ການອອກສຽງການຊໍາລະເງິນ {0} ມີ un ການເຊື່ອມຕໍ່
+apps/erpnext/erpnext/accounts/utils.py +449,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,ຜູ້ຮັບຂໍ້ຄວາມແລະລາຍລະອຽດການຊໍາລະເງິນ
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +497,Material Requests {0} created,ການຮ້ອງຂໍອຸປະກອນການ {0} ສ້າງ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +498,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.,ຮູບແບບຂອງຂໍ້ກໍານົດຫຼືການເຮັດສັນຍາ.
 DocType: Purchase Invoice,Address and Contact,ທີ່ຢູ່ແລະຕິດຕໍ່
@@ -2550,7 +2580,7 @@
 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 +848,Paid Amount cannot be greater than total negative outstanding amount {0},ການຊໍາລະເງິນຈໍານວນບໍ່ສາມາດຈະຫຼາຍກ່ວາຈໍານວນທັງຫມົດປະລິມານທີ່ຍັງຄ້າງຄາໃນທາງລົບ {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +859,Paid Amount cannot be greater than total negative outstanding amount {0},ການຊໍາລະເງິນຈໍານວນບໍ່ສາມາດຈະຫຼາຍກ່ວາຈໍານວນທັງຫມົດປະລິມານທີ່ຍັງຄ້າງຄາໃນທາງລົບ {0}
 DocType: Employee Internal Work History,Employee Internal Work History,ພະນັກງານປະຫວັດການເຮັດພາຍໃນປະເທດ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +233,Closing (Dr),ປິດ (Dr)
 DocType: Cheque Print Template,Cheque Size,ຂະຫນາດກະແສລາຍວັນ
@@ -2571,7 +2601,8 @@
 ,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 ເພື່ອຍົກເລີກການ.
-apps/erpnext/erpnext/controllers/accounts_controller.py +555,'Update Stock' cannot be checked for fixed asset sale,&#39;ປັບປຸງ Stock&#39; ບໍ່ສາມາດໄດ້ຮັບການກວດສອບສໍາລັບການຂາຍຊັບສົມບັດຄົງ
+DocType: Student Guardian,Father,ພຣະບິດາ
+apps/erpnext/erpnext/controllers/accounts_controller.py +558,'Update Stock' cannot be checked for fixed asset sale,&#39;ປັບປຸງ Stock&#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} ຈະຖືກຍົກເລີກຫຼືຢຸດເຊົາການ
@@ -2581,15 +2612,15 @@
 DocType: Sales Order,Fully Delivered,ສົ່ງຢ່າງເຕັມທີ່
 DocType: Lead,Lower Income,ລາຍໄດ້ຕ່ໍາ
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","ຫົວຫນ້າບັນຊີພາຍໃຕ້ຄວາມຮັບຜິດຊອບ, ໃນທີ່ກໍາໄຮ / ການສູນເສຍຈະໄດ້ຮັບການຈອງ"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +166,Source and target warehouse cannot be same for row {0},ແຫຼ່ງຂໍ້ມູນແລະຄັງສິນຄ້າເປົ້າຫມາຍບໍ່ສາມາດຈະດຽວກັນສໍາລັບການຕິດຕໍ່ກັນ {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","ບັນຊີທີ່ແຕກຕ່າງກັນຈະຕ້ອງບັນຊີປະເພດຊັບສິນ / ຫນີ້ສິນ, ນັບຕັ້ງແຕ່ນີ້ Stock Reconciliation ເປັນ Entry ເປີດ"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +81,Purchase Order number required for Item {0},ຊື້ຈໍານວນຄໍາສັ່ງທີ່ຕ້ອງການສໍາລັບລາຍການ {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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/purchase_receipt/purchase_receipt.py +82,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;
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +17,Cannot change status as student {0} is linked with student application {1},ບໍ່ສາມາດມີການປ່ຽນແປງສະຖານະພາບເປັນນັກສຶກສາ {0} ແມ່ນການເຊື່ອມຕໍ່ກັບຄໍາຮ້ອງສະຫມັກນັກສຶກສາ {1}
+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: Timesheet,"List of employee which has ""Salary Slip Based on Timesheet"" is enabled in salary structure.",ບັນຊີລາຍຊື່ຂອງພະນັກງານທີ່ມີ &quot;ຄວາມຜິດພາດພຽງເງິນເດືອນຈາກ Timesheet&quot; ຖືກເປີດໃຊ້ວຽກໃນໂຄງປະກອບການເງິນເດືອນ.
 DocType: Asset,Fully Depreciated,ຄ່າເສື່ອມລາຄາຢ່າງເຕັມສ່ວນ
 ,Stock Projected Qty,Stock ປະມານການຈໍານວນ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Customer {0} does not belong to project {1},ລູກຄ້າ {0} ບໍ່ໄດ້ຂຶ້ນກັບໂຄງການ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,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 ແລະ Batch
@@ -2601,7 +2632,7 @@
 DocType: Purchase Invoice,Purchase Taxes and Charges,ຊື້ພາສີອາກອນແລະຄ່າບໍລິການ
 ,Qty to Receive,ຈໍານວນທີ່ຈະໄດ້ຮັບ
 DocType: Leave Block List,Leave Block List Allowed,ອອກຈາກສະໄຫມອະນຸຍາດໃຫ້
-apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +55,All Warehouses,ຄັງສິນຄ້າທັງຫມົດ
+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 +105,Credit To account must be a Balance Sheet account,ການປ່ອຍສິນເຊື່ອການບັນຊີຈະຕ້ອງບັນຊີງົບດຸນ
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,ທຸກປະເພດຜະລິດ
@@ -2613,10 +2644,10 @@
 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/manufacturing/doctype/bom/bom.js +26,Browse BOM,Browse BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,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/asset/depreciation.py +94,Please set Depreciation related Accounts in Asset Category {0} or Company {1},ກະລຸນາທີ່ກໍານົດໄວ້ບັນຊີທີ່ກ່ຽວຂ້ອງກັບຄ່າເສື່ອມລາຄາໃນສິນຊັບປະເພດ {0} ຫລືບໍລິສັດ {1}
-DocType: Academic Year,Academic Year,ປີທາງວິຊາການ
+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 ເປີດ
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,ການປະເມີນຜົນ
@@ -2624,12 +2655,12 @@
 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 +197,Leave approver must be one of {0},ອອກຈາກອະນຸມັດຕ້ອງເປັນຫນຶ່ງໃນ {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,Leave approver must be one of {0},ອອກຈາກອະນຸມັດຕ້ອງເປັນຫນຶ່ງໃນ {0}
 DocType: Hub Settings,Seller Email,ຜູ້ຂາຍ Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),ມູນຄ່າທັງຫມົດຊື້ (ຜ່ານຊື້ Invoice)
 DocType: Workstation Working Hour,Start Time,ທີ່ໃຊ້ເວລາເລີ່ມຕົ້ນ
 DocType: Item Price,Bulk Import Help,ນໍາເຂົ້າຫຼາຍຊ່ວຍເຫລືອ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +256,Select Quantity,ເລືອກປະລິມານ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +257,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,ຂໍ້ຄວາມທີ່ສົ່ງ
@@ -2646,6 +2677,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,ທັງຈໍານວນເປົ້າຫມາຍຫຼືເປົ້າຫມາຍຈໍານວນແມ່ນບັງຄັບ.
 apps/erpnext/erpnext/config/projects.py +45,Cost of various activities,ຄ່າໃຊ້ຈ່າຍຂອງກິດຈະກໍາຕ່າງໆ
 apps/erpnext/erpnext/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 +149,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}
 DocType: Item,Inspection Required,ການກວດກາຕ້ອງ
@@ -2665,7 +2697,7 @@
 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 +138,Wire Transfer,ການໂອນ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,ການໂອນ
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,ກວດເບິ່ງທັງຫມົດ
 DocType: Sales Order,Recurring Order,Order Recurring
 DocType: Company,Default Income Account,ບັນຊີມາດຕະຖານລາຍໄດ້
@@ -2677,21 +2709,19 @@
 ,Welcome to ERPNext,ຍິນດີຕ້ອນຮັບ ERPNext
 apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,ນໍາໄປສູ່ການສະເຫນີລາຄາ
 DocType: Lead,From Customer,ຈາກລູກຄ້າ
-apps/erpnext/erpnext/demo/setup_data.py +357,Calls,ໂທຫາເຄືອຂ່າຍ
+apps/erpnext/erpnext/demo/setup/setup_data.py +300,Calls,ໂທຫາເຄືອຂ່າຍ
 DocType: Project,Total Costing Amount (via Time Logs),ຈໍານວນເງິນຕົ້ນທຶນ (ໂດຍຜ່ານທີ່ໃຊ້ເວລາບັນທຶກ)
 DocType: Purchase Order Item Supplied,Stock UOM,Stock UOM
-apps/erpnext/erpnext/stock/doctype/item/item.py +466,"As there are existing transactions for this item, \
-							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","ເນື່ອງຈາກວ່າມີທຸລະກໍາທີ່ມີຢູ່ແລ້ວສໍາລັບລາຍການນີ້, \ ທ່ານບໍ່ສາມາດປ່ຽນແປງຄຸນຄ່າຂອງ &quot;ມີບໍ່ມີ Serial &#39;,&#39; ມີ Batch No &#39;,&quot; ແມ່ນ Stock ລາຍະການ&#39; ແລະ &#39;ວິທີການປະເມີນມູນຄ່າ&#39;"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,Purchase Order {0} is not submitted,ການສັ່ງຊື້ {0} ບໍ່ໄດ້ສົ່ງ
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,ຄາດ
 apps/erpnext/erpnext/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 +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,ຫມາຍເຫດ: ລະບົບຈະບໍ່ກວດສອບໃນໄລຍະການຈັດສົ່ງແລະໃນໄລຍະການຈອງສໍາລັບລາຍການ {0} ກັບປະລິມານຫຼືຈໍານວນເງິນທັງຫມົດ 0
 DocType: Notification Control,Quotation Message,ວົງຢືມຂໍ້ຄວາມ
 DocType: Issue,Opening Date,ວັນທີ່ສະຫມັກເປີດ
-apps/erpnext/erpnext/schools/api.py +58,Attendance has been marked successfully.,ຜູ້ເຂົ້າຮ່ວມໄດ້ຮັບການຫມາຍຢ່າງສໍາເລັດຜົນ.
+apps/erpnext/erpnext/schools/api.py +57,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 +136,Account Type for {0} must be {1},ປະເພດບັນຊີສໍາລັບ {0} ຕ້ອງ {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +139,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 ຕ້ອງເປັນບໍລິສັດດຽວກັນ
@@ -2706,12 +2736,13 @@
 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/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 +20,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 +1190,Please select customer,ກະລຸນາເລືອກລູກຄ້າ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1193,Please select customer,ກະລຸນາເລືອກລູກຄ້າ
 DocType: C-Form,I,ຂ້າພະເຈົ້າ
 DocType: Company,Asset Depreciation Cost Center,Asset Center ຄ່າເສື່ອມລາຄາຄ່າໃຊ້ຈ່າຍ
 DocType: Sales Order Item,Sales Order Date,ວັນທີ່ສະຫມັກໃບສັ່ງຂາຍ
@@ -2721,6 +2752,7 @@
 ,Payment Period Based On Invoice Date,ໄລຍະເວລາການຊໍາລະເງິນໂດຍອີງໃສ່ວັນ Invoice
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},ອັດຕາແລກປ່ຽນທີ່ຂາດຫາຍໄປສະກຸນເງິນສໍາລັບ {0}
 DocType: Assessment,Examiner,ການກວດສອບ
+DocType: Student,Siblings,ອ້າຍເອື້ອຍນ້ອງ
 DocType: Journal Entry,Stock Entry,Entry Stock
 DocType: Payment Entry,Payment References,ເອກະສານການຊໍາລະເງິນ
 DocType: C-Form,C-FORM-,C-FORM-
@@ -2738,11 +2770,12 @@
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,ຊື່ກະທູ້
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,atleast ຫນຶ່ງຂອງການຂາຍຫຼືຊື້ຕ້ອງໄດ້ຮັບການຄັດເລືອກ
+DocType: Grading Structure,Grade Intervals,ໄລຍະການຮຽນ
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,ເລືອກລັກສະນະຂອງທຸລະກິດຂອງທ່ານ.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,ບ່ອນທີ່ການດໍາເນີນງານການຜະລິດກໍາລັງດໍາເນີນ.
 DocType: Asset Movement,Source Warehouse,Warehouse Source
 DocType: Installation Note,Installation Date,ວັນທີ່ສະຫມັກການຕິດຕັ້ງ
-apps/erpnext/erpnext/controllers/accounts_controller.py +534,Row #{0}: Asset {1} does not belong to company {2},"ຕິດຕໍ່ກັນ, {0}: Asset {1} ບໍ່ໄດ້ຂຶ້ນກັບບໍລິສັດ {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +537,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 ຂາຍ
@@ -2756,28 +2789,31 @@
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,ຈໍານວນ Batch ມີຢູ່ຈາກ 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 Slip
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,ວັນທີ່ສະຫມັກຂອງເງິນກະສຽນຈະຕ້ອງຫຼາຍກ່ວາວັນທີຂອງການເຂົ້າຮ່ວມ
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +49,There were errors while scheduling course on :,ມີຄວາມຜິດພາດໃນຂະນະທີ່ການຕັ້ງເວລາແນ່ນອນກ່ຽວກັບຄື:
 DocType: Sales Invoice,Against Income Account,ຕໍ່ບັນຊີລາຍໄດ້
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +87,{0}% Delivered,{0}% ສົ່ງ
+apps/erpnext/erpnext/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 +379,Please set default {0} in Company {1},ກະລຸນາທີ່ກໍານົດໄວ້ໃນຕອນຕົ້ນ {0} ໃນບໍລິສັດ {1}
+apps/erpnext/erpnext/accounts/utils.py +456,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,ກໍາໄຮຂັ້ນຕົ້ນ / ການສູນເສຍ
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,ການສັ່ງຊື້ສິນຄ້າທີ່ຈໍາຫນ່າຍ
 apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,ຊື່ບໍລິສັດບໍ່ສາມາດບໍລິສັດ
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,ຫົວຫນ້າຈົດຫມາຍສະບັບສໍາລັບການພິມແມ່ແບບ.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,ຫົວຂໍ້ສໍາລັບແມ່ແບບພິມເຊັ່ນ Proforma Invoice.
+DocType: Student Guardian,Student Guardian,ຜູ້ປົກຄອງນັກສຶກສາ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +184,Valuation type charges can not marked as Inclusive,ຄ່າບໍລິການປະເພດການປະເມີນຄ່າບໍ່ສາມາດເຮັດເຄື່ອງຫມາຍເປັນ Inclusive
 DocType: POS Profile,Update Stock,ຫລັກຊັບ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM ທີ່ແຕກຕ່າງກັນສໍາລັບລາຍການທີ່ຈະນໍາໄປສູ່ການທີ່ບໍ່ຖືກຕ້ອງ (Total) ຄ່ານ້ໍາຫນັກສຸດທິ. ໃຫ້ແນ່ໃຈວ່ານ້ໍາຫນັກສຸດທິຂອງແຕ່ລະລາຍການແມ່ນຢູ່ໃນ UOM ດຽວກັນ.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM ອັດຕາ
 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 +349,Journal Entries {0} are un-linked,ວາລະສານການອອກສຽງ {0} ມີ un ການເຊື່ອມຕໍ່
+apps/erpnext/erpnext/accounts/utils.py +426,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 ສູນຕົ້ນທຶນໃນບໍລິສັດ
@@ -2801,6 +2837,7 @@
 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 ຊຸມຊົນ
+DocType: Homepage,"URL for ""All Products""",URL ສໍາລັບການ &quot;ຜະລິດຕະພັນທັງຫມົດ&quot;
 DocType: Leave Application,Leave Balance Before Application,ອອກຈາກດຸນກ່ອນການນໍາໃຊ້
 DocType: SMS Center,Send SMS,ສົ່ງ SMS
 DocType: Cheque Print Template,Width of amount in word,ຄວາມກວ້າງຂອງຈໍານວນເງິນທີ່ຢູ່ໃນພຣະຄໍາ
@@ -2809,7 +2846,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 +29,Current Job Openings,ເປີດຮັບສະຫມັກໃນປະຈຸບັນ
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,Current Job Openings,ເປີດຮັບສະຫມັກໃນປະຈຸບັນ
 DocType: Company,Stock Adjustment Account,ບັນຊີການປັບ Stock
 DocType: Journal Entry,Write Off,ຂຽນ Off
 DocType: Timesheet Detail,Operation ID,ການດໍາເນີນງານ ID
@@ -2822,7 +2859,7 @@
 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 +850,Show tax break-up,"ສະແດງໃຫ້ເຫັນອາການພັກຜ່ອນ, ເຖິງ"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +841,Show tax break-up,"ສະແດງໃຫ້ເຫັນອາການພັກຜ່ອນ, ເຖິງ"
 apps/erpnext/erpnext/accounts/party.py +308,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}, ເພາະສະນັ້ນທ່ານບໍ່ສາມາດມີການກໍາຫນົດຫຼືປັບປຸງແກ້ໄຂມັນ"
@@ -2832,10 +2869,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 +534,Please select Posting Date before selecting Party,ກະລຸນາເລືອກວັນທີ່ປະກາດກ່ອນທີ່ຈະເລືອກພັກ
 DocType: Serial No,Out of AMC,ອອກຈາກ AMC
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +80,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 +162,Please contact to the user who have Sales Master Manager {0} role,ກະລຸນາຕິດຕໍ່ກັບຜູ້ໃຊ້ທີ່ມີການຂາຍລິນຍາໂທ Manager {0} ພາລະບົດບາດ
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +195,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 +5,This is based on the attendance of this Student,ນີ້ແມ່ນອີງໃສ່ການເຂົ້າຮ່ວມຂອງນັກສຶກສານີ້
@@ -2844,12 +2882,11 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,ການຈັດສົ່ງ {0} ຕ້ອງໄດ້ຮັບການຍົກເລີກກ່ອນການຍົກເລີກການຂາຍສິນຄ້ານີ້
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +75,Paid amount + Write Off Amount can not be greater than Grand Total,ຈໍານວນເງິນທີ່ຊໍາລະເງິນ + ຂຽນ 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 +138,Note: There is not enough leave balance for Leave Type {0},ຫມາຍເຫດ: ຍັງບໍ່ທັນມີຄວາມສົມດູນອອກພຽງພໍສໍາລັບການອອກຈາກປະເພດ {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,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,ປະເພດໂອກາດ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,ບໍລິສັດໃຫມ່
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,Cost Center is required for 'Profit and Loss' account {0},ສູນຕົ້ນທຶນທີ່ຕ້ອງການສໍາລັບການ &#39;ກໍາໄຮຂາດທຶນບັນຊີ {0}
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,ເຮັດທຸລະກໍາພຽງແຕ່ສາມາດໄດ້ຮັບການລຶບໂດຍຜູ້ສ້າງຂອງບໍລິສັດ
 apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,ຈໍານວນທີ່ບໍ່ຖືກຕ້ອງຂອງຊີແຍກປະເພດການອອກສຽງພົບ. ທ່ານອາດຈະໄດ້ຄັດເລືອກເອົາບັນຊີຜິດພາດໃນການເຮັດທຸລະກໍາ.
 DocType: Cheque Print Template,Cheque Width,Width Cheque
@@ -2858,16 +2895,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,ວັນທີຂອງການເກີດບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາໃນມື້ນີ້.
 ,Stock Ageing,Stock Ageing
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,Timesheet
-apps/erpnext/erpnext/controllers/accounts_controller.py +228,{0} '{1}' is disabled,{0} {1} &#39;ແມ່ນຄົນພິການ
+apps/erpnext/erpnext/controllers/accounts_controller.py +231,{0} '{1}' is disabled,{0} {1} &#39;ແມ່ນຄົນພິການ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ກໍານົດເປັນທຸກ
 DocType: Cheque Print Template,Scanned Cheque,ສະແກນກະແສລາຍວັນ
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,ສົ່ງອີເມວອັດຕະໂນມັດທີ່ຈະຕິດຕໍ່ພົວພັນກ່ຽວກັບການໂອນສົ່ງ.
+DocType: Timesheet,Total Billable Amount,ຈໍານວນເງິນເອີ້ນເກັບເງິນ
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,ຂໍ້ 3
 DocType: Purchase Order,Customer Contact Email,ລູກຄ້າຕິດຕໍ່ Email
 DocType: Warranty Claim,Item and Warranty Details,ລາຍການແລະການຮັບປະກັນລາຍລະອຽດ
 DocType: Sales Team,Contribution (%),ການປະກອບສ່ວນ (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,ຫມາຍເຫດ: ແບບການຊໍາລະເງິນຈະບໍ່ໄດ້ຮັບການສ້າງຂຶ້ນຕັ້ງແຕ່ &#39;ເງິນສົດຫຼືບັນຊີທະນາຄານບໍ່ໄດ້ລະບຸ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Responsibilities,ຄວາມຮັບຜິດຊອບ
+apps/erpnext/erpnext/controllers/accounts_controller.py +78,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,ຄວາມຮັບຜິດຊອບ
 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 ຊື່
@@ -2875,6 +2913,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,ເພີ່ມຜູ້ໃຊ້
 DocType: Pricing Rule,Item Group,ກຸ່ມສິນຄ້າ
 DocType: Item,Safety Stock,Stock ຄວາມປອດໄພ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,ລະຫັດສິນຄ້າ&gt; ກຸ່ມສິນຄ້າ&gt; ສິນຄ້າ
 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),ພາສີອາກອນແລະຄ່າບໍລິການເພີ່ມ (ບໍລິສັດສະກຸນເງິນ)
@@ -2884,7 +2923,6 @@
 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: Timesheet,Total Hours,ຊົ່ວໂມງໃນການທັງຫມົດ
 DocType: Journal Entry,Printing Settings,ການຕັ້ງຄ່າການພິມ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Total Debit must be equal to Total Credit. The difference is {0},ເດບິດທັງຫມົດຈະຕ້ອງເທົ່າທຽມກັນກັບການປ່ອຍສິນເຊື່ອທັງຫມົດ. ຄວາມແຕກຕ່າງກັນເປັນ {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,ຍານຍົນ
@@ -2897,13 +2935,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,ທະນາຄານການລົງທຶນ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +71,Cash or Bank Account is mandatory for making payment entry,ເງິນສົດຫຼືທະນາຄານບັນຊີເປັນການບັງຄັບສໍາລັບການເຮັດເຂົ້າການຊໍາລະເງິນ
 DocType: Purchase Invoice,Price List Exchange Rate,ລາຄາອັດຕາແລກປ່ຽນບັນຊີ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ລູກຄ້າ&gt; Group ລູກຄ້າ&gt; ອານາເຂດ
 DocType: Purchase Invoice Item,Rate,ອັດຕາການ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Intern,Intern
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,Intern
 DocType: Stock Entry,From BOM,ຈາກ BOM
 DocType: Assessment,Assessment Code,ລະຫັດການປະເມີນຜົນ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +32,Basic,ພື້ນຖານ
+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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',ກະລຸນາຄລິກໃສ່ &quot;ສ້າງຕາຕະລາງ&quot;
+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 +95,Reference No is mandatory if you entered Reference Date,ກະສານອ້າງອີງທີ່ບໍ່ມີແມ່ນການບັງຄັບຖ້າຫາກວ່າທ່ານເຂົ້າໄປວັນກະສານອ້າງອີງ
@@ -2912,11 +2951,11 @@
 DocType: Salary Slip,Salary Structure,ໂຄງສ້າງເງິນເດືອນ
 DocType: Account,Bank,ທະນາຄານ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,ສາຍການບິນ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +752,Issue Material,ວັດສະດຸບັນຫາ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +723,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 +683,You are in offline mode. You will not be able to reload until you have network.,ທ່ານຢູ່ໃນຮູບແບບອອຟໄລ. ທ່ານຈະບໍ່ສາມາດທີ່ຈະໂຫລດຈົນກ່ວາທ່ານມີເຄືອຂ່າຍ.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +665,You are in offline mode. You will not be able to reload until you have network.,ທ່ານຢູ່ໃນຮູບແບບອອຟໄລ. ທ່ານຈະບໍ່ສາມາດທີ່ຈະໂຫລດຈົນກ່ວາທ່ານມີເຄືອຂ່າຍ.
 DocType: Hub Settings,Access Token,ການເຂົ້າເຖິງ Token
 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
@@ -2924,33 +2963,35 @@
 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 +1122,Enter value must be positive,ມູນຄ່າໃສ່ຈະຕ້ອງໃນທາງບວກ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,All Territories,ອານາເຂດທັງຫມົດ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1125,Enter value must be positive,ມູນຄ່າໃສ່ຈະຕ້ອງໃນທາງບວກ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,ອານາເຂດທັງຫມົດ
 DocType: Purchase Invoice,Items,ລາຍການ
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +23,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 +221,There are more holidays than working days this month.,ມີວັນພັກຫຼາຍກ່ວາມື້ທີ່ເຮັດວຽກໃນເດືອນນີ້ແມ່ນ.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +233,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 +96,Request for Quotations,ການຮ້ອງຂໍສໍາລັບວົງຢືມ
+apps/erpnext/erpnext/hooks.py +104,Request for Quotations,ການຮ້ອງຂໍສໍາລັບວົງຢືມ
 DocType: Payment Reconciliation,Maximum Invoice Amount,ຈໍານວນໃບເກັບເງິນສູງສຸດ
 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 +628,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',ມາດຕະຖານຫນ່ວຍງານຂອງມາດຕະການ Variant &#39;{0}&#39; ຈະຕ້ອງເຊັ່ນດຽວກັນກັບໃນແມ່ &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',ມາດຕະຖານຫນ່ວຍງານຂອງມາດຕະການ Variant &#39;{0}&#39; ຈະຕ້ອງເຊັ່ນດຽວກັນກັບໃນແມ່ &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,ຄິດໄລ່ພື້ນຖານກ່ຽວກັບ
 DocType: Delivery Note Item,From Warehouse,ຈາກ Warehouse
 DocType: Assessment,Supervisor Name,ຊື່ Supervisor
+DocType: Assessment,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 ຊື້
 DocType: Notification Control,Customize the Notification,ປັບແຈ້ງການ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Cash Flow from Operations,ກະແສເງິນສົດຈາກການດໍາເນີນວຽກ
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,ແມ່ແບບມາດຕະຖານທີ່ຢູ່ບໍ່ສາມາດໄດ້ຮັບການລຶບ
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,ແມ່ແບບມາດຕະຖານທີ່ຢູ່ບໍ່ສາມາດໄດ້ຮັບການລຶບ
 DocType: Sales Invoice,Shipping Rule,ກົດລະບຽບການຂົນສົ່ງ
 DocType: Manufacturer,Limited to 12 characters,ຈໍາກັດເຖິງ 12 ລັກສະນະ
 DocType: Journal Entry,Print Heading,ຫົວພິມ
@@ -2965,8 +3006,8 @@
 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/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,ທັງຈໍານວນເປົ້າຫມາຍຫຼືຈໍານວນເປົ້າຫມາຍແມ່ນການບັງຄັບ
-apps/erpnext/erpnext/stock/get_item_details.py +485,No default BOM exists for Item {0},ບໍ່ມີມາດຕະຖານ BOM ຢູ່ສໍາລັບລາຍການ {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +336,Please select Posting Date first,ກະລຸນາເລືອກວັນທີ່ປະກາດຄັ້ງທໍາອິດ
+apps/erpnext/erpnext/stock/get_item_details.py +486,No default BOM exists for Item {0},ບໍ່ມີມາດຕະຖານ BOM ຢູ່ສໍາລັບລາຍການ {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +326,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,ສູນຕົ້ນທຶນກັບທຸລະກໍາທີ່ມີຢູ່ແລ້ວບໍ່ສາມາດປ່ຽນໃຈເຫລື້ອມໃສຊີແຍກປະເພດ
@@ -2982,6 +3023,7 @@
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,ການຊໍາລະເງິນກົງກັບໃບແຈ້ງຫນີ້
 DocType: Journal Entry,Bank Entry,ທະນາຄານເຂົ້າ
 DocType: Authorization Rule,Applicable To (Designation),ສາມາດນໍາໃຊ້ການ (ການອອກແບບ)
+,Profitability Analysis,ການວິເຄາະຜົນກໍາໄລ
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,ຕື່ມການກັບໂຄງຮ່າງການ
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,ກຸ່ມໂດຍ
 DocType: Guardian,Interests,ຜົນປະໂຫຍດ
@@ -2994,21 +3036,21 @@
 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 +141,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",ສິນຄ້າເນື່ອງ {0} ບໍ່ສາມາດຮັບການປັບປຸງ \ ໃຊ້ Stock Reconciliation
 DocType: Scheduling Tool,Day,ວັນ
 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 +122,You are not authorized to approve leaves on Block Dates,ເຈົ້າຍັງບໍ່ໄດ້ອະນຸຍາດໃຫ້ອະນຸມັດໃບໃນວັນທີ Block
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,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,ມາດຕະຖານການວັດສະດຸປະເພດຂໍ
-DocType: Student Applicant,AP.,AP.
 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 +639,Point of Sale,ຈຸດຂອງການຂາຍ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +634,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,ພາສີ
 DocType: Production Planning Tool,Production Planning Tool,ການຜະລິດເຄື່ອງມືການວາງແຜນ
@@ -3017,74 +3059,77 @@
 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 +373,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 Entry,Update Rate and Availability,ການປັບປຸງອັດຕາແລະຈໍາຫນ່າຍ
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,ອັດຕາສ່ວນທີ່ທ່ານກໍາລັງອະນຸຍາດໃຫ້ໄດ້ຮັບຫຼືໃຫ້ຫຼາຍຕໍ່ກັບປະລິມານຂອງຄໍາສັ່ງ. ສໍາລັບການຍົກຕົວຢ່າງ: ຖ້າຫາກວ່າທ່ານມີຄໍາສັ່ງ 100 ຫົວຫນ່ວຍ. ແລະອະນຸຍາດຂອງທ່ານແມ່ນ 10% ຫຼັງຈາກນັ້ນທ່ານກໍາລັງອະນຸຍາດໃຫ້ໄດ້ຮັບ 110 ຫົວຫນ່ວຍ.
 DocType: POS Profile,Customer Group,ກຸ່ມລູກຄ້າ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,Expense account is mandatory for item {0},ບັນຊີຄ່າໃຊ້ຈ່າຍເປັນການບັງຄັບສໍາລັບ item {0}
 DocType: Item,Website Description,ລາຍລະອຽດເວັບໄຊທ໌
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date must be on or after today,ຕໍ່ໄປວັນທີ່ຄ່າເສື່ອມລາຄາຈະຕ້ອງກ່ຽວກັບຫຼືຫຼັງຈາກມື້ນີ້
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,ການປ່ຽນແປງສຸດທິໃນການລົງທຶນ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +145,Please cancel Purchase Invoice {0} first,ກະລຸນາຍົກເລີກການຊື້ Invoice {0} ທໍາອິດ
 DocType: Serial No,AMC Expiry Date,AMC ຫມົດເຂດ
 ,Sales Register,ລົງທະບຽນການຂາຍ
 DocType: Quotation,Quotation Lost Reason,ວົງຢືມລືມເຫດຜົນ
+apps/erpnext/erpnext/utilities/doctype/address/address.py +164,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,ບໍ່ມີແມ່ແບບທີ່ຢູ່ໃນຕອນຕົ້ນພົບ. ກະລຸນາສ້າງບັນຊີໃຫມ່ຈາກ Setup&gt; ການພິມແລະຍີ່ຫໍ້&gt; Template ທີ່ຢູ່.
 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 +330,Transaction reference no {0} dated {1},ກະສານອ້າງອີງການທີ່ບໍ່ມີ {0} ວັນ {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Transaction reference no {0} dated {1},ກະສານອ້າງອີງການທີ່ບໍ່ມີ {0} ວັນ {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,ມີບໍ່ມີຫຍັງທີ່ຈະແກ້ໄຂແມ່ນ.
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,Summary for this month and pending activities,ສະຫຼຸບສັງລວມສໍາລັບເດືອນນີ້ແລະກິດຈະກໍາທີ່ຍັງຄ້າງ
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,ສະຫຼຸບສັງລວມສໍາລັບເດືອນນີ້ແລະກິດຈະກໍາທີ່ຍັງຄ້າງ
 DocType: Customer Group,Customer Group Name,ຊື່ກຸ່ມລູກຄ້າ
 apps/erpnext/erpnext/public/js/financial_statements.js +54,Cash Flow Statement,ຖະແຫຼງການກະແສເງິນສົດ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Please remove this Invoice {0} from C-Form {1},ກະລຸນາເອົາໃບເກັບເງິນນີ້ {0} ຈາກ C ແບບຟອມ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,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 +644,Get Items,ຮັບສິນຄ້າ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +623,Get Items,ຮັບສິນຄ້າ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +210,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 +41,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,ເຄື່ອງຫມາຍຜູ້ເຂົ້າຮ່ວມສໍາລັບພະນັກງານທີ່ຫຼາກຫຼາຍ
 DocType: Payment Request,Initiated,ການລິເລີ່ມ
 DocType: Production Order,Planned Start Date,ການວາງແຜນວັນທີ່
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,Customer is required against Receivable account {0},ລູກຄ້າທີ່ຕ້ອງການກັບບັນຊີລູກຫນີ້ {0}
 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 +265,Project-wise data is not available for Quotation,ຂໍ້ມູນໂຄງການທີ່ສະຫລາດບໍ່ສາມາດໃຊ້ສໍາລັບການສະເຫນີລາຄາ
+apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,ຂໍ້ມູນໂຄງການທີ່ສະຫລາດບໍ່ສາມາດໃຊ້ສໍາລັບການສະເຫນີລາຄາ
 DocType: Project,Expected End Date,ຄາດວ່າສິ້ນສຸດວັນທີ່
 DocType: Budget Account,Budget Amount,ງົບປະມານຈໍານວນ
 DocType: Appraisal Template,Appraisal Template Title,ການປະເມີນ Template Title
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,Commercial,ການຄ້າ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,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 +648,Row {0}# Account must be of type 'Fixed Asset',ຕິດຕໍ່ກັນ {0} # ບັນຊີຈະຕ້ອງການປະເພດ &#39;ສິນຊັບຖາວອນ&#39;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Row {0}# Account must be of type 'Fixed Asset',ຕິດຕໍ່ກັນ {0} # ບັນຊີຈະຕ້ອງການປະເພດ &#39;ສິນຊັບຖາວອນ&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,ອອກຈໍານວນ
 apps/erpnext/erpnext/config/accounts.py +278,Rules to calculate shipping amount for a sale,ກົດລະບຽບການຄິດໄລ່ຈໍານວນການຂົນສົ່ງສໍາລັບການຂາຍ
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +30,Series is mandatory,Series ເປັນການບັງຄັບ
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +50,Series is mandatory,Series ເປັນການບັງຄັບ
 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,Sales
 DocType: Stock Entry Detail,Basic Amount,ຈໍານວນພື້ນຖານ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +165,Warehouse required for stock Item {0},Warehouse ຕ້ອງການສໍາລັບສິນຄ້າຫຼັກຊັບ {0}
 DocType: Leave Allocation,Unused leaves,ໃບທີ່ບໍ່ໄດ້ໃຊ້
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Cr,Cr
 DocType: Tax Rule,Billing State,State Billing
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +250,Transfer,ການຖ່າຍໂອນ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +187,{0} {1} does not associated with Party Account {2},{0} {1} ບໍ່ທີ່ກ່ຽວຂ້ອງກັບບັນຊີພັກ {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,Fetch exploded BOM (including sub-assemblies),ມາດດຶງຂໍ້ມູນລະເບີດ BOM (ລວມທັງອະນຸປະກອບ)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +254,Transfer,ການຖ່າຍໂອນ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +190,{0} {1} does not associated with Party Account {2},{0} {1} ບໍ່ທີ່ກ່ຽວຂ້ອງກັບບັນຊີພັກ {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +796,Fetch exploded BOM (including sub-assemblies),ມາດດຶງຂໍ້ມູນລະເບີດ BOM (ລວມທັງອະນຸປະກອບ)
 DocType: Authorization Rule,Applicable To (Employee),ສາມາດນໍາໃຊ້ການ (ພະນັກງານ)
-apps/erpnext/erpnext/controllers/accounts_controller.py +115,Due Date is mandatory,ອັນເນື່ອງມາຈາກວັນທີ່ເປັນການບັງຄັບ
+apps/erpnext/erpnext/controllers/accounts_controller.py +118,Due Date is mandatory,ອັນເນື່ອງມາຈາກວັນທີ່ເປັນການບັງຄັບ
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,ເພີ່ມຂຶ້ນສໍາລັບຄຸນສົມບັດ {0} ບໍ່ສາມາດຈະເປັນ 0
 DocType: Journal Entry,Pay To / Recd From,ຈ່າຍໄປ / Recd ຈາກ
 DocType: Naming Series,Setup Series,Series ຕິດຕັ້ງ
 DocType: Payment Reconciliation,To Invoice Date,ສົ່ງໃບເກັບເງິນວັນທີ່
 DocType: Supplier,Contact HTML,ຕິດຕໍ່ HTML
 ,Inactive Customers,ລູກຄ້າບໍ່ໄດ້ໃຊ້ວຽກ
+DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,ລາຍໄດ້ຈາກການຊື້
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,ວິທີການກົດລະບຽບລາຄາຖືກນໍາໃຊ້?
 DocType: Quality Inspection,Delivery Note No,ການສົ່ງເງິນເຖິງບໍ່ມີ
@@ -3093,7 +3138,7 @@
 DocType: Company,Retail,ຂາຍຍ່ອຍ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +120,Customer {0} does not exist,ລູກຄ້າ {0} ບໍ່ມີ
 DocType: Attendance,Absent,ບໍ່
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +587,Product Bundle,Bundle ຜະລິດຕະພັນ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Product Bundle,Bundle ຜະລິດຕະພັນ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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
@@ -3103,8 +3148,8 @@
 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 +742,Send Supplier Emails,ສົ່ງອີເມວ Supplier
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +104,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","ເງິນເດືອນດໍາເນີນການສໍາລັບການໄລຍະເວລາລະຫວ່າງ {0} ແລະ {1}, ອອກຈາກໄລຍະເວລາຄໍາຮ້ອງສະຫມັກບໍ່ສາມາດຈະຢູ່ລະຫວ່າງລະດັບວັນທີນີ້."
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +708,Send Supplier Emails,ສົ່ງອີເມວ Supplier
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,"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
 DocType: Guardian Interest,Guardian Interest,ຜູ້ປົກຄອງທີ່ຫນ້າສົນໃຈ
 DocType: Timesheet,Employee Detail,ຂໍ້ມູນພະນັກງານ
@@ -3115,9 +3160,9 @@
 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/accounts/doctype/gl_entry/gl_entry.py +77,Account {0} cannot be a Group,ບັນຊີ {0} ບໍ່ສາມາດເປັນກຸ່ມ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} cannot be a Group,ບັນຊີ {0} ບໍ່ສາມາດເປັນກຸ່ມ
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +31,Optional. This setting will be used to filter in various transactions.,ຖ້າຕ້ອງການ. ການຕັ້ງຄ່ານີ້ຈະໄດ້ຮັບການນໍາໃຊ້ການກັ່ນຕອງໃນການຄ້າຂາຍຕ່າງໆ.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +107,Negative Valuation Rate is not allowed,ອັດຕາການປະເມີນຄ່າທາງລົບບໍ່ໄດ້ຮັບອະນຸຍາດ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,ອັດຕາການປະເມີນຄ່າທາງລົບບໍ່ໄດ້ຮັບອະນຸຍາດ
 DocType: Holiday List,Weekly Off,ອາທິດ Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","ສໍາລັບຕົວຢ່າງ: 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +39,Provisional Profit / Loss (Credit),ຊົ່ວຄາວກໍາໄຮ / ການສູນເສຍ (Credit)
@@ -3131,16 +3176,16 @@
 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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: ສູນຕົ້ນທຶນເປັນການບັງຄັບສໍາລັບລາຍການ {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +626,Get Items from Product Bundle,ຮັບສິນຄ້າຈາກມັດດຽວກັນຜະລິດຕະພັນ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +605,Get Items from Product Bundle,ຮັບສິນຄ້າຈາກມັດດຽວກັນຜະລິດຕະພັນ
 DocType: Asset,Straight Line,Line ຊື່
 DocType: Project User,Project User,User ໂຄງການ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} is inactive,ບັນຊີ {0} ແມ່ນ inactive
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} is inactive,ບັນຊີ {0} ແມ່ນ inactive
 DocType: GL Entry,Is Advance,ແມ່ນ Advance
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,ຜູ້ເຂົ້າຮ່ວມຈາກວັນທີ່ສະຫມັກແລະຜູ້ເຂົ້າຮ່ວມເຖິງວັນທີ່ມີຜົນບັງຄັບ
 apps/erpnext/erpnext/controllers/buying_controller.py +148,Please enter 'Is Subcontracted' as Yes or No,ກະລຸນາໃສ່ &#39;ແມ່ນເຫມົາຊ່ວງເປັນ Yes or No
 DocType: Sales Team,Contact No.,ເລກທີ່
 DocType: Bank Reconciliation,Payment Entries,ການອອກສຽງການຊໍາລະເງິນ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,'Profit and Loss' type account {0} not allowed in Opening Entry,&#39;ກໍາໄຮແລະການສູນເສຍ&#39; ປະເພດບັນຊີ {0} ບໍ່ອະນຸຍາດໃຫ້ໃນການເປີດກວ້າງການເຂົ້າ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +71,'Profit and Loss' type account {0} not allowed in Opening Entry,&#39;ກໍາໄຮແລະການສູນເສຍ&#39; ປະເພດບັນຊີ {0} ບໍ່ອະນຸຍາດໃຫ້ໃນການເປີດກວ້າງການເຂົ້າ
 DocType: Program Enrollment Tool,Get Students From,ໄດ້ຮັບນັກສຶກສາຈາກ
 DocType: Hub Settings,Seller Country,ຜູ້ຂາຍປະເທດ
 apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,ເຜີຍແຜ່ລາຍການກ່ຽວກັບເວັບໄຊທ໌
@@ -3159,7 +3204,7 @@
 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 +558,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","ຕິດຕໍ່ກັນ, {0}: Asset {1} ບໍ່ສາມາດໄດ້ຮັບການສົ່ງ, ມັນແມ່ນແລ້ວ {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +561,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","ຕິດຕໍ່ກັນ, {0}: Asset {1} ບໍ່ສາມາດໄດ້ຮັບການສົ່ງ, ມັນແມ່ນແລ້ວ {2}"
 DocType: Tax Rule,Billing Country,ປະເທດໃບບິນ
 DocType: Production Order,Expected Delivery Date,ວັນທີຄາດວ່າການຈັດສົ່ງ
 apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,ບັດເດບິດແລະເຄຣດິດບໍ່ເທົ່າທຽມກັນສໍາລັບ {0} # {1}. ຄວາມແຕກຕ່າງກັນເປັນ {2}.
@@ -3172,13 +3217,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +202,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: Sales Order,% Amount Billed,% ຈໍານວນເງິນບິນ
+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.,ກວດສອບການຖ້າຫາກວ່າທ່ານຕ້ອງການທີ່ຈະບັງຄັບໃຫ້ຜູ້ໃຊ້ສາມາດເລືອກໄລຍະກ່ອນທີ່ຈະປະຢັດ. ຈະມີບໍ່ມີມາດຕະຖານຖ້າຫາກວ່າທ່ານກວດສອບນີ້.
 apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},ບໍ່ມີລາຍການທີ່ມີ Serial No {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,ເປີດການແຈ້ງເຕືອນ
+DocType: Email Digest,Open Notifications,ເປີດການແຈ້ງເຕືອນ
 DocType: Payment Entry,Difference Amount (Company Currency),ຄວາມແຕກຕ່າງກັນຈໍານວນເງິນ (ບໍລິສັດສະກຸນເງິນ)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,ຄ່າໃຊ້ຈ່າຍໂດຍກົງ
 apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
@@ -3186,7 +3231,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,ລາຍການລູກຄ້າໃຫມ່
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,ຄ່າໃຊ້ຈ່າຍເດີນທາງ
 DocType: Maintenance Visit,Breakdown,ລາຍລະອຽດ
-apps/erpnext/erpnext/controllers/accounts_controller.py +634,Account: {0} with currency: {1} can not be selected,ບັນຊີ: {0} ກັບສະກຸນເງິນ: {1} ບໍ່ສາມາດໄດ້ຮັບການຄັດເລືອກ
+apps/erpnext/erpnext/controllers/accounts_controller.py +637,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}
 DocType: Program Enrollment Tool,Student Applicants,ສະຫມັກນັກສຶກສາ
@@ -3194,15 +3239,15 @@
 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 +56,Probation,ການທົດລອງ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Probation,ການທົດລອງ
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,ອົງປະກອບເງິນເດືອນ
 DocType: Program Enrollment Tool,New Academic Year,ປີທາງວິຊາການໃຫມ່
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Payment of salary for the month {0} and year {1},ການຊໍາລະເງິນຂອງເງິນເດືອນສໍາລັບເດືອນ {0} ແລະປີ {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Payment of salary for the month {0} and year {1},ການຊໍາລະເງິນຂອງເງິນເດືອນສໍາລັບເດືອນ {0} ແລະປີ {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,ໃສ່ອັດຕະໂນມັດອັດຕາລາຄາຖ້າຫາກວ່າຫາຍສາບສູນ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,ຈໍານວນເງິນທີ່ຊໍາລະທັງຫມົດ
 DocType: Production Order Item,Transferred Qty,ການຍົກຍ້າຍຈໍານວນ
 apps/erpnext/erpnext/config/learn.py +11,Navigating,ການຄົ້ນຫາ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Planning,ການວາງແຜນ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,ການວາງແຜນ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,ອອກ
 DocType: Project,Total Billing Amount (via Time Logs),ຈໍານວນການເອີ້ນເກັບເງິນທັງຫມົດ (ໂດຍຜ່ານທີ່ໃຊ້ເວລາບັນທຶກ)
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,We sell this Item,ພວກເຮົາຂາຍສິນຄ້ານີ້
@@ -3215,11 +3260,10 @@
 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.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Sales invoice submitted sucessfully.,ໃບເກັບເງິນການຂາຍສົ່ງ sucessfully.
 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}
 DocType: Assessment Result,Student Name,ນາມສະກຸນ
-apps/erpnext/erpnext/hooks.py +104,Assessment Schedule,ຕາຕະລາງປະເມີນຜົນ
+apps/erpnext/erpnext/hooks.py +113,Assessment Schedule,ຕາຕະລາງປະເມີນຜົນ
 DocType: Brand,Item Manager,ການບໍລິຫານ
 DocType: Buying Settings,Default Supplier Type,ມາດຕະຖານປະເພດຜະລິດ
 DocType: Production Order,Total Operating Cost,ຄ່າໃຊ້ຈ່າຍປະຕິບັດການທັງຫມົດ
@@ -3229,6 +3273,7 @@
 DocType: GL Entry,Party Type,ປະເພດພັກ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +78,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} ເກີນຈໍາກັດ
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,ແມ່ແບບຕົ້ນສະບັບເງິນເດືອນ.
 DocType: Leave Type,Max Days Leave Allowed,ນ້ໍາວັນອອກອະນຸຍາດ
@@ -3240,18 +3285,19 @@
 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 +99,All Customer Groups,ກຸ່ມສົນທະນາຂອງລູກຄ້າທັງຫມົດ
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +78,Accumulated Monthly,ສະສົມລາຍເດືອນ
-apps/erpnext/erpnext/controllers/accounts_controller.py +595,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} ເປັນການບັງຄັບ. ບາງທີບັນທຶກຕາແລກປ່ຽນເງິນບໍ່ໄດ້ສ້າງຂື້ນສໍາລັບ {1} ກັບ {2}.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,ກຸ່ມສົນທະນາຂອງລູກຄ້າທັງຫມົດ
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +81,Accumulated Monthly,ສະສົມລາຍເດືອນ
+apps/erpnext/erpnext/controllers/accounts_controller.py +598,{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} ບໍ່ມີ
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),ລາຄາອັດຕາ (ບໍລິສັດສະກຸນເງິນ)
 DocType: Products Settings,Products Settings,ການຕັ້ງຄ່າຜະລິດຕະພັນ
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +188,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,ກະລຸນາຕັ້ງຊື່ທີ່ Series {0} ຜ່ານ Setup&gt; Settings&gt; ຕັ້ງຊື່ Series
 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 +84,Secretary,ເລຂາທິການ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,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,ຊື້
@@ -3260,24 +3306,22 @@
 ,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,ຊື່ການປະເມີນຜົນ
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,"ຕິດຕໍ່ກັນ, {0}: ບໍ່ມີ Serial ເປັນການບັງຄັບ"
+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 +859,Supplier Quotation,ສະເຫນີລາຄາຜູ້ຜະລິດ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +838,Supplier Quotation,ສະເຫນີລາຄາຜູ້ຜະລິດ
 DocType: Quotation,In Words will be visible once you save the Quotation.,ໃນຄໍາສັບຕ່າງໆຈະສັງເກດເຫັນເມື່ອທ່ານຊ່ວຍປະຢັດການຊື້ຂາຍ.
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +7,Collect Fees,ເກັບຄ່າທໍານຽມ
+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}
 DocType: Lead,Add to calendar on this date,ຕື່ມການກັບປະຕິທິນໃນວັນນີ້
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,ກົດລະບຽບສໍາລັບການເພີ່ມຄ່າໃຊ້ຈ່າຍໃນການຂົນສົ່ງ.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,ເຫດການ upcoming
 DocType: Item,Opening Stock,ເປີດ Stock
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,ລູກຄ້າທີ່ຕ້ອງການ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} ເປັນການບັງຄັບສໍາລັບການກັບຄືນ
 DocType: Purchase Order,To Receive,ທີ່ຈະໄດ້ຮັບ
 apps/erpnext/erpnext/public/js/setup_wizard.js +195,user@example.com,user@example.com
-DocType: Email Digest,Income / Expense,ລາຍຮັບ / ລາຍຈ່າຍ
 DocType: Employee,Personal Email,ອີເມວສ່ວນຕົວ
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,ຕ່າງທັງຫມົດ
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","ຖ້າຫາກວ່າເປີດການໃຊ້ງານ, ລະບົບຈະສະແດງການອອກສຽງການບັນຊີສໍາລັບສິນຄ້າຄົງຄັງອັດຕະໂນມັດ."
@@ -3288,13 +3332,14 @@
 DocType: Customer,From Lead,ຈາກ Lead
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,ຄໍາສັ່ງປ່ອຍອອກມາເມື່ອສໍາລັບການຜະລິດ.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,ເລືອກປີງົບປະມານ ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,POS Profile required to make POS Entry,POS ຂໍ້ມູນທີ່ຕ້ອງການເພື່ອເຮັດໃຫ້ POS Entry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +509,POS Profile required to make POS Entry,POS ຂໍ້ມູນທີ່ຕ້ອງການເພື່ອເຮັດໃຫ້ POS Entry
 DocType: Program Enrollment Tool,Enroll Students,ລົງທະບຽນນັກສຶກສາ
 DocType: Hub Settings,Name Token,ຊື່ Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,ຂາຍມາດຕະຖານ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Atleast one warehouse is mandatory,atleast ຫນຶ່ງ warehouse ເປັນການບັງຄັບ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +129,Atleast one warehouse is mandatory,atleast ຫນຶ່ງ warehouse ເປັນການບັງຄັບ
 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 +330,{0} against Sales Invoice {1},{0} ກັບການຂາຍທີ່ເຊັນ {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,ຊື່ໂຄງການ
@@ -3315,10 +3360,11 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,ໃບຕ້ອງໄດ້ຮັບການຈັດສັນຫລາຍຂອງ 05
 DocType: Production Order,Operation Cost,ຕົ້ນທຶນການດໍາເນີນງານ
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,ອັບໂຫລດເຂົ້າຈາກໄຟລ໌ .csv
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,ທີ່ຍັງຄ້າງຄາ Amt
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,ກໍານົດເປົ້າຫມາຍສິນຄ້າກຸ່ມສະຫລາດນີ້ເປັນສ່ວນຕົວຂາຍ.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Freeze ຫຸ້ນເກີນ [ວັນ]
-apps/erpnext/erpnext/controllers/accounts_controller.py +528,Row #{0}: Asset is mandatory for fixed asset purchase/sale,"ຕິດຕໍ່ກັນ, {0}: ຊັບສິນເປັນການບັງຄັບສໍາລັບຊັບສິນຄົງທີ່ຊື້ / ຂາຍ"
+apps/erpnext/erpnext/controllers/accounts_controller.py +531,Row #{0}: Asset is mandatory for fixed asset purchase/sale,"ຕິດຕໍ່ກັນ, {0}: ຊັບສິນເປັນການບັງຄັບສໍາລັບຊັບສິນຄົງທີ່ຊື້ / ຂາຍ"
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","ຖ້າຫາກວ່າທັງສອງຫຼືຫຼາຍກວ່າກົດລະບຽບລາຄາຖືກພົບເຫັນຢູ່ຕາມເງື່ອນໄຂຂ້າງເທິງນີ້, ບູລິມະສິດໄດ້ຖືກນໍາໃຊ້. ບູລິມະສິດເປັນຈໍານວນລະຫວ່າງ 0 ເຖິງ 20 ໃນຂະນະທີ່ຄ່າເລີ່ມຕົ້ນຄືສູນ (ເປົ່າ). ຈໍານວນທີ່ສູງຂຶ້ນຫມາຍຄວາມວ່າມັນຈະໃຊ້ເວລາກ່ອນຖ້າຫາກວ່າມີກົດລະບຽບການຕັ້ງລາຄາດ້ວຍສະພາບດຽວກັນ."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,ປີງົບປະມານ: {0} ບໍ່ໄດ້ຢູ່
 DocType: Currency Exchange,To Currency,ການສະກຸນເງິນ
@@ -3335,15 +3381,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,ພາກເອກກະຊົນ
 DocType: Maintenance Visit,Customer Feedback,ຜົນຕອບຮັບຂອງລູກຄ້າ
 DocType: Account,Expense,ຄ່າໃຊ້ຈ່າຍ
-DocType: Sales Invoice,Exhibition,ການວາງສະແດງ
 apps/erpnext/erpnext/utilities/doctype/address/address.py +77,"Company is mandatory, as it is your company address","ບໍລິສັດເປັນການບັງຄັບ, ເປັນມັນແມ່ນຢູ່ບໍລິສັດຂອງທ່ານ"
 DocType: Item Attribute,From Range,ຈາກ Range
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +81,Syntax error in formula or condition: {0},ຄວາມຜິດພາດ syntax ໃນສູດຫຼືສະພາບ: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +92,Syntax error in formula or condition: {0},ຄວາມຜິດພາດ syntax ໃນສູດຫຼືສະພາບ: {0}
 apps/erpnext/erpnext/stock/utils.py +99,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 +28,Jobs,ວຽກເຮັດງານທໍາ
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,ວຽກເຮັດງານທໍາ
 ,Sales Order Trends,Sales ແນວໂນ້ມຄໍາສັ່ງ
 DocType: Employee,Held On,ຈັດຂຶ້ນໃນວັນກ່ຽວກັບ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,ສິນຄ້າການຜະລິດ
@@ -3352,16 +3398,16 @@
 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 +763,Make Supplier Quotation,ເຮັດໃຫ້ສະເຫນີລາຄາຜູ້ຜະລິດ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,Make Supplier Quotation,ເຮັດໃຫ້ສະເຫນີລາຄາຜູ້ຜະລິດ
 DocType: Quality Inspection,Incoming,ເຂົ້າມາ
 DocType: BOM,Materials Required (Exploded),ອຸປະກອນທີ່ຕ້ອງການ (ລະເບີດ)
 apps/erpnext/erpnext/public/js/setup_wizard.js +185,"Add users to your organization, other than yourself","ເພີ່ມຜູ້ຊົມໃຊ້ທີ່ອົງການຈັດຕັ້ງຂອງທ່ານ, ນອກຈາກຕົວທ່ານເອງ"
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,Row # {0}: Serial No {1} does not match with {2} {3},"ຕິດຕໍ່ກັນ, {0}: ບໍ່ມີ Serial {1} ບໍ່ກົງກັບ {2} {3}"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +42,Casual Leave,ອອກຈາກການບາດເຈັບແລະ
+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,ອອກຈາກການບາດເຈັບແລະ
 DocType: Batch,Batch ID,ID batch
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,Note: {0},ຫມາຍເຫດ: {0}
 ,Delivery Note Trends,ທ່າອ່ຽງການສົ່ງເງິນ
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +103,This Week's Summary,Summary ອາທິດນີ້
+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} ພຽງແຕ່ສາມາດໄດ້ຮັບການປັບປຸງໂດຍຜ່ານທຸລະກໍາຫຼັກຊັບ
 DocType: Student Group Creation Tool,Get Courses,ໄດ້ຮັບວິຊາ
 DocType: GL Entry,Party,ພັກ
@@ -3371,7 +3417,7 @@
 DocType: Request for Quotation Item,Request for Quotation Item,ການຮ້ອງຂໍສໍາລັບການສະເຫນີລາຄາສິນຄ້າ
 DocType: Purchase Order,To Bill,ການບັນຊີລາຍການ
 DocType: Material Request,% Ordered,% ຄໍາສັ່ງ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Piecework,ເຫມົາ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Piecework,ເຫມົາ
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,avg. ອັດຕາການຊື້
 DocType: Task,Actual Time (in Hours),ທີ່ໃຊ້ເວລາຕົວຈິງ (ໃນຊົ່ວໂມງ)
 DocType: Employee,History In Company,ປະຫວັດສາດໃນບໍລິສັດ
@@ -3388,7 +3434,7 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +350,{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 +162,Black,ສີດໍາ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,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} ລາຍການຜະລິດ
@@ -3399,13 +3445,13 @@
 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 +69,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,ເຄື່ອງຫມາຍຂາດ
 DocType: Journal Entry Account,Exchange Rate,ອັດຕາແລກປ່ຽນ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Sales Order {0} is not submitted,ໃບສັ່ງຂາຍ {0} ບໍ່ໄດ້ສົ່ງ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +527,Sales Order {0} is not submitted,ໃບສັ່ງຂາຍ {0} ບໍ່ໄດ້ສົ່ງ
 DocType: Homepage,Tag Line,Line Tag
 DocType: Fee Component,Fee Component,ຄ່າບໍລິການສ່ວນປະກອບ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +857,Add items from,ເພີ່ມລາຍການລາຍການ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +836,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}
 DocType: Cheque Print Template,Regular,ເປັນປົກກະຕິ
 DocType: BOM,Last Purchase Rate,ອັດຕາການຊື້ຫຼ້າສຸດ
@@ -3413,6 +3459,7 @@
 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
 ,Sales Person-wise Transaction Summary,Summary ທຸລະກໍາຄົນສະຫລາດ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +60,Cost Center is required for 'Profit and Loss' account {0}. Please set up a default Cost Center for the Company.,ສູນຕົ້ນທຶນທີ່ຕ້ອງການສໍາລັບການ &#39;ກໍາໄຮຂາດທຶນບັນຊີ {0}. ກະລຸນາສ້າງຕັ້ງຂຶ້ນເປັນສູນຕົ້ນທຶນມາດຕະຖານສໍາລັບການບໍລິສັດ.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,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,ອັດຕາສ່ວນການແຜ່ກະຈາຍປະຈໍາເດືອນ
@@ -3423,12 +3470,12 @@
 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 +710,Online,ອອນໄລນ໌
+apps/erpnext/erpnext/accounts/page/pos/pos.js +692,Online,ອອນໄລນ໌
 ,Available Stock for Packing Items,ສິນຄ້າສໍາລັບການບັນຈຸ
 DocType: Item Variant,Item Variant,ລາຍການ Variant
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,ການສ້າງຕັ້ງ Template ທີ່ຢູ່ນີ້ເປັນຄ່າເລີ່ມຕົ້ນຍ້ອນບໍ່ມີແມ່ນບໍ່ມີມາດຕະຖານອື່ນໆ
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +19,Setting this Address Template as default as there is no other default,ການສ້າງຕັ້ງ Template ທີ່ຢູ່ນີ້ເປັນຄ່າເລີ່ມຕົ້ນຍ້ອນບໍ່ມີແມ່ນບໍ່ມີມາດຕະຖານອື່ນໆ
 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 +74,Quality Management,ການບໍລິຫານຄຸນະພາບ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,ການບໍລິຫານຄຸນະພາບ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,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,ພະນັກງານປະຫວັດການເຮັດ External
@@ -3450,11 +3497,12 @@
 DocType: Student,Student Email ID,ID Email ນັກສຶກສາ
 DocType: Employee,Notice (days),ຫນັງສືແຈ້ງການ (ວັນ)
 DocType: Tax Rule,Sales Tax Template,ແມ່ແບບພາສີການຂາຍ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1520,Select items to save the invoice,ເລືອກລາຍການທີ່ຈະຊ່ວຍປະຢັດໃບເກັບເງິນ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1544,Select items to save the invoice,ເລືອກລາຍການທີ່ຈະຊ່ວຍປະຢັດໃບເກັບເງິນ
 DocType: Employee,Encashment Date,ວັນທີ່ສະຫມັກ Encashment
 DocType: Account,Stock Adjustment,ການປັບ Stock
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},ມາດຕະຖານຂອງກິດຈະກໍາຕົ້ນທຶນທີ່ມີຢູ່ສໍາລັບການປະເພດຂອງກິດຈະກໍາ - {0}
 DocType: Production Order,Planned Operating Cost,ຄ່າໃຊ້ຈ່າຍປະຕິບັດການວາງແຜນ
+DocType: Academic Term,Term Start Date,ວັນທີ່ສະຫມັກໃນໄລຍະເລີ່ມຕົ້ນ
 apps/erpnext/erpnext/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,ຊື່ຜູ້ສະຫມັກ
@@ -3484,17 +3532,17 @@
 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 ບໍ່ສາມາດໄດ້ຮັບການລຶບເປັນການເຂົ້າຫຸ້ນຊີແຍກປະເພດທີ່ມີຢູ່ສໍາລັບການສາງນີ້.
 DocType: Company,Distribution,ການແຜ່ກະຈາຍ
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +8,Amount Paid,ຈໍານວນເງິນທີ່ຊໍາລະເງິນ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Project Manager,ຜູ້ຈັດການໂຄງການ
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,ຈໍານວນເງິນທີ່ຊໍາລະເງິນ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,ຜູ້ຈັດການໂຄງການ
 ,Quoted Item Comparison,ປຽບທຽບບາຍດີທຸກທ່ານ Item
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Dispatch,ຫນັງສືທາງການ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,ຫນັງສືທາງການ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,ພິເສດນ້ໍາອະນຸຍາດໃຫ້ສໍາລັບລາຍການ: {0} ເປັນ {1}%
 apps/erpnext/erpnext/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.,ພາລະບົດບາດທີ່ຖືກອະນຸຍາດໃຫ້ສົ່ງການທີ່ເກີນຂອບເຂດຈໍາກັດການປ່ອຍສິນເຊື່ອທີ່ກໍານົດໄວ້.
-DocType: Sales Invoice,Supplier Reference,ເອກະສານສະຫນອງ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +844,"Master data syncing, it might take some time","ຕົ້ນສະບັບການຊິ້ງຂໍ້ມູນຂໍ້ມູນ, ມັນອາດຈະໃຊ້ເວລາທີ່ໃຊ້ເວລາບາງ"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +832,"Master data syncing, it might take some time","ຕົ້ນສະບັບການຊິ້ງຂໍ້ມູນຂໍ້ມູນ, ມັນອາດຈະໃຊ້ເວລາທີ່ໃຊ້ເວລາບາງ"
 DocType: Item,Material Issue,ສະບັບອຸປະກອນການ
 DocType: Hub Settings,Seller Description,ຜູ້ຂາຍລາຍລະອຽດ
 DocType: Employee Education,Qualification,ຄຸນສົມບັດ
@@ -3508,7 +3556,7 @@
 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 +83,Error in formula or condition,ຄວາມຜິດພາດໃນສູດຫຼືສະພາບ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,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,ຍົກເລີກທັງຫມົດ
@@ -3517,7 +3565,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},ຈົນເຖິງວັນທີ່ຄວນຈະຢູ່ໃນປີງົບປະມານ. ສົມມຸດວ່າການ Date = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","ໃນທີ່ນີ້ທ່ານສາມາດຮັກສາລະດັບຄວາມສູງ, ນ້ໍາ, ອາການແພ້, ຄວາມກັງວົນດ້ານການປິ່ນປົວແລະອື່ນໆ"
 DocType: Leave Block List,Applies to Company,ໃຊ້ໄດ້ກັບບໍລິສັດ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +197,Cannot cancel because submitted Stock Entry {0} exists,ບໍ່ສາມາດຍົກເລີກເພາະວ່າສົ່ງ Stock Entry {0} ມີຢູ່
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +198,Cannot cancel because submitted Stock Entry {0} exists,ບໍ່ສາມາດຍົກເລີກເພາະວ່າສົ່ງ Stock Entry {0} ມີຢູ່
 DocType: Purchase Invoice,In Words,ໃນຄໍາສັບຕ່າງໆ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,Today is {0}'s birthday!,ໃນມື້ນີ້ແມ່ນ {0} &#39;s ວັນເດືອນປີເກີດ!
 DocType: Production Planning Tool,Material Request For Warehouse,ຂໍອຸປະກອນການສໍາລັບການສາງ
@@ -3527,14 +3575,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,ປີທາງດ້ານການເງິນຂອງທ່ານຈະເລີ່ມຕົ້ນໃນ
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,ຄ່າເສື່ອມລາຄາຂອງຊັບສິນແລະຍອດ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +319,Amount {0} {1} transferred from {2} to {3},ຈໍານວນ {0} {1} ການຍົກຍ້າຍຈາກ {2} ກັບ {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +322,Amount {0} {1} transferred from {2} to {3},ຈໍານວນ {0} {1} ການຍົກຍ້າຍຈາກ {2} ກັບ {3}
 DocType: Sales Invoice,Get Advances Received,ໄດ້ຮັບການຄວາມກ້າວຫນ້າທີ່ໄດ້ຮັບ
 DocType: Email Digest,Add/Remove Recipients,Add / Remove ຜູ້ຮັບ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +432,Transaction not allowed against stopped Production Order {0},ການບໍ່ອະນຸຍາດໃຫ້ຕໍ່ຕ້ານການຜະລິດຢຸດເຊົາການສັ່ງຊື້ {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +437,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 +143,Join,ເຂົ້າຮ່ວມ
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,ການຂາດແຄນຈໍານວນ
-apps/erpnext/erpnext/stock/doctype/item/item.py +652,Item variant {0} exists with same attributes,variant item {0} ມີຢູ່ກັບຄຸນລັກສະນະດຽວກັນ
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,variant item {0} ມີຢູ່ກັບຄຸນລັກສະນະດຽວກັນ
+DocType: Leave Application,LAP/,LAP /
 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,&#39;ເຖິງວັນທີ່ແມ່ນຈໍາເປັນເພື່ອ
@@ -3542,12 +3591,12 @@
 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 +212,Warehouses with child nodes cannot be converted to ledger,ຄັງສິນຄ້າທີ່ມີຂໍ້ເດັກນ້ອຍທີ່ບໍ່ສາມາດໄດ້ຮັບການປ່ຽນແປງເພື່ອຊີແຍກປະເພດ
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +215,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: Employee Education,Employee Education,ການສຶກສາພະນັກງານ
-apps/erpnext/erpnext/public/js/controllers/transaction.js +866,It is needed to fetch Item Details.,ມັນຕ້ອງການເພື່ອດຶງຂໍ້ມູນລາຍລະອຽດສິນຄ້າ.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +857,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} ໄດ້ຮັບແລ້ວ
@@ -3557,14 +3606,14 @@
 DocType: Expense Claim,Total Claimed Amount,ຈໍານວນທັງຫມົດອ້າງວ່າ
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,ກາລະໂອກາດທີ່ອາດມີສໍາລັບການຂາຍ.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,Invalid {0},ບໍ່ຖືກຕ້ອງ {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Sick Leave,ລາປ່ວຍ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,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,ພະແນກຮ້ານຄ້າ
 DocType: Warehouse,PIN,PIN
 DocType: Sales Invoice,Base Change Amount (Company Currency),ຖານການປ່ຽນແປງຈໍານວນເງິນ (ບໍລິສັດສະກຸນເງິນ)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +313,No accounting entries for the following warehouses,ບໍ່ມີການຈົດບັນຊີສໍາລັບການສາງດັ່ງຕໍ່ໄປນີ້
-apps/erpnext/erpnext/projects/doctype/project/project.js +102,Save the document first.,ຊ່ວຍປະຢັດເອກະສານທໍາອິດ.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +314,No accounting entries for the following warehouses,ບໍ່ມີການຈົດບັນຊີສໍາລັບການສາງດັ່ງຕໍ່ໄປນີ້
+apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,ຊ່ວຍປະຢັດເອກະສານທໍາອິດ.
 DocType: Account,Chargeable,ຄ່າບໍລິການ
 DocType: Company,Change Abbreviation,ການປ່ຽນແປງສະບັບຫຍໍ້
 DocType: Expense Claim Detail,Expense Date,ວັນທີ່ສະຫມັກຄ່າໃຊ້ຈ່າຍ
@@ -3577,10 +3626,9 @@
 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,ວັນທີຄາດວ່າສົ່ງບໍ່ສາມາດກ່ອນທີ່ໃບສັ່ງຊື້ວັນທີ່
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,ກະລຸນາຕັ້ງຊື່ທີ່ Series {0} ຜ່ານ Setup&gt; Settings&gt; ຕັ້ງຊື່ Series
 DocType: Appraisal,Appraisal Template,ແມ່ແບບການປະເມີນຜົນ
 DocType: Item Group,Item Classification,ການຈັດປະເພດສິນຄ້າ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Business Development Manager,ຜູ້ຈັດການພັດທະນາທຸລະກິດ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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,ຊີແຍກປະເພດ
@@ -3590,8 +3638,8 @@
 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 +940,Please select {0} first,ກະລຸນາເລືອກ {0} ທໍາອິດ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +749,Batch {0} of Item {1} has expired.,Batch {0} ຂໍ້ມູນ {1} ໄດ້ຫມົດອາຍຸແລ້ວ.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +953,Please select {0} first,ກະລຸນາເລືອກ {0} ທໍາອິດ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +757,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,ການເພີ່ມເຕີມ
@@ -3608,8 +3656,8 @@
 {% 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 +92,Warehouse not found in the system,ບໍ່ພົບຄັງສິນຄ້າໃນລະບົບ
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +106,This Month's Summary,ຂອງເດືອນນີ້ Summary
+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
 DocType: Quality Inspection Reading,Quality Inspection Reading,ມີຄຸນະພາບກວດສອບການອ່ານຫນັງສື
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Freeze ຫຸ້ນເກົ່າ Than` ຄວນຈະເປັນຂະຫນາດນ້ອຍກ່ວາ% d ມື້.
 DocType: Tax Rule,Purchase Tax Template,ຊື້ແມ່ແບບພາສີ
@@ -3619,21 +3667,22 @@
 DocType: Item Customer Detail,Ref Code,ລະຫັດກະສານອ້າງອີງ
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,ການບັນທຶກຂອງພະນັກງານ.
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Please set Next Depreciation Date,ກະລຸນາທີ່ກໍານົດໄວ້ຕໍ່ໄປວັນທີ່ຄ່າເສື່ອມລາຄາ
-DocType: Payment Gateway,Payment Gateway,Gateway ຊໍາລະເງິນ
 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 +378,Operation Time must be greater than 0 for Operation {0},ການດໍາເນີນງານທີ່ໃຊ້ເວລາຕ້ອງໄດ້ຫຼາຍກ່ວາ 0 ສໍາລັບການດໍາເນີນງານ {0}
+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/accounts/doctype/account/account.py +170,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)
 DocType: Program,Program Abbreviation,ຊື່ຫຍໍ້ໂຄງການ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,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: Appraisal,Start Date,ວັນທີ່ເລີ່ມ
@@ -3649,21 +3698,22 @@
 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,ເອົາລາຍການຖ້າຫາກວ່າຄ່າໃຊ້ຈ່າຍແມ່ນບໍ່ສາມາດໃຊ້ກັບສິນຄ້າທີ່
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,ຕົວຢ່າງ:. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +27,Transaction currency must be same as Payment Gateway currency,ສະກຸນເງິນລະຕ້ອງໄດ້ຮັບເຊັ່ນດຽວກັນກັບການຊໍາລະເງິນສະກຸນເງິນ Gateway
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Transaction currency must be same as Payment Gateway currency,ສະກຸນເງິນລະຕ້ອງໄດ້ຮັບເຊັ່ນດຽວກັນກັບການຊໍາລະເງິນສະກຸນເງິນ Gateway
 DocType: Payment Entry,Receive,ໄດ້ຮັບ
+apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,ການຊື້ຂາຍ:
 DocType: Maintenance Visit,Fully Completed,ສໍາເລັດຢ່າງເຕັມສ່ວນ
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Complete
 DocType: Employee,Educational Qualification,ຄຸນສົມບັດການສຶກສາ
 DocType: Workstation,Operating Costs,ຄ່າໃຊ້ຈ່າຍປະຕິບັດການ
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,ການປະຕິບັດຖ້າຫາກວ່າສະສົມງົບປະມານປະຈໍາເດືອນເກີນ
 DocType: Purchase Invoice,Submit on creation,ຍື່ນສະເຫນີກ່ຽວກັບການສ້າງ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +432,Currency for {0} must be {1},ສະກຸນເງິນສໍາລັບ {0} ຕ້ອງ {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +435,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 +493,Row {0}: An Reorder entry already exists for this warehouse {1},ຕິດຕໍ່ກັນ {0}: ຍະການຮຽງລໍາດັບໃຫມ່ທີ່ມີຢູ່ແລ້ວສໍາລັບການສາງນີ້ {1}
+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/crm/doctype/opportunity/opportunity.py +79,"Cannot declare as lost, because Quotation has been made.","ບໍ່ສາມາດປະກາດເປັນການສູນເສຍ, ເນື່ອງຈາກວ່າສະເຫນີລາຄາໄດ້ຖືກເຮັດໃຫ້."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,ການຊື້ Manager ລິນຍາໂທ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +429,Production Order {0} must be submitted,ສັ່ງຊື້ສິນຄ້າ {0} ຕ້ອງໄດ້ຮັບການສົ່ງ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +434,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,ວັນທີບໍ່ສາມາດຈະກ່ອນທີ່ຈະຈາກວັນທີ່
@@ -3673,25 +3723,27 @@
 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 +181,Totals,ຈໍານວນທັງຫມົດ
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,ຈໍານວນທັງຫມົດ
 DocType: BOM,Manufacturing,ການຜະລິດ
 ,Ordered Items To Be Delivered,ລາຍການຄໍາສັ່ງທີ່ຈະສົ່ງ
 DocType: Account,Income,ລາຍໄດ້
 DocType: Industry Type,Industry Type,ປະເພດອຸດສາຫະກໍາ
 apps/erpnext/erpnext/templates/includes/cart.js +141,Something went wrong!,ບາງສິ່ງບາງຢ່າງໄດ້ຜິດພາດ!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,Warning: Leave application contains following block dates,ການເຕືອນໄພ: ອອກຈາກຄໍາຮ້ອງສະຫມັກປະກອບດ້ວຍຂໍ້ມູນວັນ block ດັ່ງຕໍ່ໄປນີ້
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +120,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} ໄດ້ຖືກສົ່ງແລ້ວ
 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} ເພື່ອໃຫ້ສໍາເລັດການນີ້.
+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 +181,Organization unit (department) master.,ຫນ່ວຍບໍລິການອົງການຈັດຕັ້ງ (ຈັງຫວັດ) ຕົ້ນສະບັບ.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,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 +793,All records are synced.,ການບັນທຶກການທັງຫມົດແມ່ນໄດ້ຊິ້ງ.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +781,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,ມີລາຄາຖືກຊື່ Center
@@ -3710,21 +3762,20 @@
 DocType: Address,Name of person or organization that this address belongs to.,ຊື່ຂອງບຸກຄົນຫຼືອົງການຈັດຕັ້ງທີ່ຢູ່ນີ້ເປັນ.
 apps/erpnext/erpnext/public/js/setup_wizard.js +260,Your Suppliers,ຜູ້ສະຫນອງຂອງທ່ານ
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +49,Cannot set as Lost as Sales Order is made.,ບໍ່ສາມາດກໍານົດເປັນການສູນເສຍທີ່ເປັນຄໍາສັ່ງຂາຍແມ່ນ.
-DocType: Student Applicant,Mother's Name,ຊື່ຂອງແມ່
 DocType: Request for Quotation Item,Supplier Part No,Supplier Part No
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +348,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',ບໍ່ສາມາດຫັກໃນເວລາທີ່ປະເພດແມ່ນສໍາລັບການ &#39;ປະເມີນມູນຄ່າ&#39; ຫຼື &#39;Vaulation ແລະລວມ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Received From,ໄດ້ຮັບຈາກ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Received From,ໄດ້ຮັບຈາກ
 DocType: Lead,Converted,ປ່ຽນໃຈເຫລື້ອມໃສ
 DocType: Item,Has Serial No,ມີບໍ່ມີ Serial
 DocType: Employee,Date of Issue,ວັນທີຂອງການຈົດທະບຽນ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: ຈາກ {0} ສໍາລັບ {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +153,Row #{0}: Set Supplier for item {1},"ຕິດຕໍ່ກັນ, {0} ຕັ້ງຄ່າການຜະລິດສໍາລັບການ item {1}"
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +93,Row {0}: Hours value must be greater than zero.,ຕິດຕໍ່ກັນ {0}: ມູນຄ່າຊົ່ວໂມງຕ້ອງມີຄ່າຫລາຍກ່ວາສູນ.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +117,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} ບໍ່ສາມາດໄດ້ຮັບການພົບເຫັນ
 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 +172,{0} {1} does not exist,{0} {1} ບໍ່ມີ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +175,{0} {1} does not exist,{0} {1} ບໍ່ມີ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,Please check Multi Currency option to allow accounts with other currency,ກະລຸນາກວດສອບຕົວເລືອກສະກຸນເງິນ Multi ອະນຸຍາດໃຫ້ບັນຊີດ້ວຍສະກຸນເງິນອື່ນ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +72,Item: {0} does not exist in the system,ສິນຄ້າ: {0} ບໍ່ມີຢູ່ໃນລະບົບ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,ເຈົ້າຍັງບໍ່ໄດ້ອະນຸຍາດໃຫ້ຕັ້ງຄ່າ Frozen
@@ -3733,13 +3784,14 @@
 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/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,ຜູ້ເຂົ້າຮ່ວມບໍ່ສາມາດໄດ້ຮັບການຫມາຍໄວ້ສໍາລັບກໍານົດວັນທີໃນອະນາຄົດ
 DocType: Pricing Rule,Pricing Rule Help,ລາຄາກົດລະບຽບຊ່ວຍເຫລືອ
 DocType: Purchase Taxes and Charges,Account Head,ຫົວຫນ້າບັນຊີ
 apps/erpnext/erpnext/config/stock.py +163,Update additional costs to calculate landed cost of items,ປັບປຸງຄ່າໃຊ້ຈ່າຍເພີ່ມເຕີມທີ່ຈະຄິດໄລ່ຄ່າໃຊ້ຈ່າຍລູກຈ້າງຂອງລາຍການລາຍການ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Electrical,ໄຟຟ້າ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Electrical,ໄຟຟ້າ
 DocType: Stock Entry,Total Value Difference (Out - In),ມູນຄ່າຄວາມແຕກຕ່າງ (Out - ໃນ)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,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}
@@ -3747,7 +3799,7 @@
 DocType: Item,Customer Code,ລະຫັດລູກຄ້າ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +210,Birthday Reminder for {0},ເຕືອນວັນເດືອນປີເກີດສໍາລັບ {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,ວັນນັບຕັ້ງແຕ່ສັ່ງຫຼ້າສຸດ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +292,Debit To account must be a Balance Sheet account,ເດບິດການບັນຊີຈະຕ້ອງບັນຊີງົບດຸນ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,ຊັບສິນ Stock
@@ -3759,11 +3811,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} ປິດຈະຕ້ອງເປັນຂອງປະເພດຄວາມຮັບຜິດຊອບ / Equity
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +301,Salary Slip of employee {0} already created for time sheet {1},Slip ເງິນເດືອນຂອງພະນັກງານ {0} ສ້າງຮຽບຮ້ອຍແລ້ວສໍາລັບເອກະສານທີ່ໃຊ້ເວລາ {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +313,Salary Slip of employee {0} already created for time sheet {1},Slip ເງິນເດືອນຂອງພະນັກງານ {0} ສ້າງຮຽບຮ້ອຍແລ້ວສໍາລັບເອກະສານທີ່ໃຊ້ເວລາ {1}
 DocType: Sales Order Item,Ordered Qty,ຄໍາສັ່ງຈໍານວນ
-apps/erpnext/erpnext/stock/doctype/item/item.py +673,Item {0} is disabled,ລາຍການ {0} ເປັນຄົນພິການ
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} is disabled,ລາຍການ {0} ເປັນຄົນພິການ
 DocType: Stock Settings,Stock Frozen Upto,Stock Frozen ເກີນ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +838,BOM does not contain any stock item,BOM ບໍ່ໄດ້ປະກອບດ້ວຍລາຍການຫຼັກຊັບໃດຫນຶ່ງ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +809,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,ສ້າງເງິນເດືອນ Slips
@@ -3771,23 +3823,24 @@
 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 ຈໍານວນເງິນ (ບໍລິສັດສະກຸນເງິນ)
-apps/erpnext/erpnext/stock/doctype/item/item.py +485,Row #{0}: Please set reorder quantity,"ຕິດຕໍ່ກັນ, {0}: ກະລຸນາທີ່ກໍານົດໄວ້ປະລິມານ reorder"
+DocType: Sales Invoice Timesheet,Billing Hours,ຊົ່ວໂມງໃນການເກັບເງິນ
+apps/erpnext/erpnext/stock/doctype/item/item.py +487,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 +62,Please set {0},ກະລຸນາຕັ້ງ {0}
 DocType: Purchase Invoice,Repeat on Day of Month,ເຮັດເລື້ມຄືນໃນວັນປະຈໍາເດືອນ
 DocType: Employee,Health Details,ລາຍລະອຽດສຸຂະພາບ
 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,ຍື່ນສະເຫນີການຄວາມຜິດພາດພຽງເງິນເດືອນທັງຫມົດສໍາລັບເງື່ອນໄຂການຄັດເລືອກຂ້າງເທິງ
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} ລາຍະການຊິ້ງຂໍ້ມູນ
 DocType: Sales Order,Partly Delivered,ສົ່ງສ່ວນຫນຶ່ງແມ່ນ
-DocType: Sales Invoice,Existing Customer,ລູກຄ້າທີ່ມີຢູ່ແລ້ວ
 DocType: Email Digest,Receivables,ລູກຫນີ້
+DocType: Lead Source,Lead Source,ມາເປັນຜູ້ນໍາພາ
 DocType: Customer,Additional information regarding the customer.,ຂໍ້ມູນເພີ່ມເຕີມກ່ຽວກັບການລູກຄ້າ.
 DocType: Quality Inspection Reading,Reading 5,ອ່ານ 5
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +38,Campaign Name is required,ຊື່ຂະບວນການທີ່ຕ້ອງການ
 DocType: Maintenance Visit,Maintenance Date,ວັນທີ່ສະຫມັກບໍາລຸງຮັກສາ
 DocType: Purchase Invoice Item,Rejected Serial No,ປະຕິເສດບໍ່ມີ 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}. ເພື່ອຫຼີກເວັ້ນການກະລຸນາຕັ້ງບໍລິສັດ
@@ -3795,10 +3848,9 @@
 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 +129,BOM and Manufacturing Quantity are required,BOM ແລະປະລິມານການຜະລິດຈໍາເປັນຕ້ອງ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,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,ຄວາມສູງສຸດທີ່ເຄຍ
-DocType: Bank Reconciliation Detail,Amount,ຈໍານວນ
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM ທົດແທນ
 ,Sales Analytics,ການວິເຄາະການຂາຍ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +113,Available {0},ມີ {0}
@@ -3806,14 +3858,14 @@
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,ສ້າງຕັ້ງອີເມວ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +96,Please enter default currency in Company Master,ກະລຸນາໃສ່ສະກຸນເງິນເລີ່ມຕົ້ນໃນບໍລິສັດລິນຍາໂທ
 DocType: Stock Entry Detail,Stock Entry Detail,Entry ຕ໊ອກ
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +100,Daily Reminders,ເຕືອນປະຈໍາວັນ
+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/account/account_tree.js +23,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 +71,Customer Service,ການບໍລິການລູກຄ້າ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Customer Service,ການບໍລິການລູກຄ້າ
 DocType: Homepage Featured Product,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,ລາຍການຂໍ້ມູນລູກຄ້າ
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,ຜູ້ສະຫມັກສະເຫນີວຽກເຮັດງານທໍາ.
@@ -3822,8 +3874,9 @@
 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} ຈະຕ້ອງເປັນລາຍການຫຼັກຊັບ
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,ເຮັດໃນຕອນຕົ້ນໃນ Warehouse Progress
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1570,Total nos of serial no is not equal to quantity.,ພວກເຮົາທັງຫມົດທີ່ບໍ່ມີ serial ບໍ່ທຽບເທົ່າກັບປະລິມານ.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1594,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,ວັນທີທີ່ຄາດບໍ່ສາມາດກ່ອນທີ່ວັດສະດຸການຈອງວັນທີ່
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,ຄວາມຜິດພາດ: ບໍ່ເປັນ id ທີ່ຖືກຕ້ອງ?
 DocType: Naming Series,Update Series Number,ຈໍານວນ Series ປັບປຸງ
@@ -3831,9 +3884,10 @@
 DocType: Sales Order,Printing Details,ລາຍລະອຽດການພິມ
 DocType: Task,Closing Date,ວັນປິດ
 DocType: Sales Order Item,Produced Quantity,ປະລິມານການຜະລິດ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Engineer,ວິສະວະກອນ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,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 +370,Item Code required at Row No {0},ລະຫັດສິນຄ້າທີ່ຕ້ອງການຢູ່ໃນແຖວບໍ່ {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +398,Item Code required at Row No {0},ລະຫັດສິນຄ້າທີ່ຕ້ອງການຢູ່ໃນແຖວບໍ່ {0}
 DocType: Sales Partner,Partner Type,ປະເພດຄູ່ຮ່ວມງານ
 DocType: Purchase Taxes and Charges,Actual,ທີ່ແທ້ຈິງ
 DocType: Authorization Rule,Customerwise Discount,Customerwise ສ່ວນລົດ
@@ -3849,16 +3903,18 @@
 DocType: BOM,Raw Material Cost,ຕົ້ນທຶນວັດຖຸດິບ
 DocType: Item Reorder,Re-Order Level,Re: ຄໍາສັ່ງລະດັບ
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,ກະລຸນາໃສ່ລາຍການແລະການວາງແຜນຈໍານວນທີ່ທ່ານຕ້ອງການທີ່ຈະຍົກສູງບົດບາດສັ່ງຜະລິດຫຼືດາວໂຫຼດອຸປະກອນການເປັນວັດຖຸດິບສໍາລັບການວິເຄາະ.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +55,Part-time,ສ່ວນທີ່ໃຊ້ເວລາ
+apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,ຕາຕະລາງ Gantt
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,ສ່ວນທີ່ໃຊ້ເວລາ
 DocType: Employee,Applicable Holiday List,ບັນຊີ Holiday ສາມາດນໍາໃຊ້
 DocType: Employee,Cheque,ກະແສລາຍວັນ
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Series Updated
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +57,Series Updated,Series Updated
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,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 +87,Clearance Date updated,ການເກັບກູ້ວັນທີ່ປັບປຸງ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,ຄືນສົບຜົນສໍາເລັດ
@@ -3872,7 +3928,7 @@
 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 +513,Posting date and posting time is mandatory,ປຊຊກິນວັນແລະປຊຊກິນທີ່ໃຊ້ເວລາເປັນການບັງຄັບ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,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.,ໃນຄໍາສັບຕ່າງໆຈະສັງເກດເຫັນເມື່ອທ່ານຊ່ວຍປະຢັດໃບສັ່ງຊື້.
@@ -3882,7 +3938,7 @@
 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/stock/doctype/stock_entry/stock_entry.py +158,Target warehouse in row {0} must be same as Production Order,ຄັງສິນຄ້າເປົ້າຫມາຍໃນການຕິດຕໍ່ກັນ {0} ຈະຕ້ອງດຽວກັນເປັນໃບສັ່ງຜະລິດ
+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,ສະກຸນເງິນບໍ່ສາມາດມີການປ່ຽນແປງຫຼັງຈາກການເຮັດໃຫ້ການອອກສຽງການນໍາໃຊ້ສະກຸນເງິນອື່ນ ໆ
 DocType: Company,Round Off Account,ຕະຫຼອດໄປ Account
@@ -3891,23 +3947,22 @@
 DocType: Customer Group,Parent Customer Group,ກຸ່ມລູກຄ້າຂອງພໍ່ແມ່
 DocType: Purchase Invoice,Contact Email,ການຕິດຕໍ່
 DocType: Appraisal Goal,Score Earned,ຄະແນນທີ່ໄດ້ຮັບ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Notice Period,ໄລຍະເວລາຫນັງສືແຈ້ງການ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,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 +4,New Sales Person Name,ຊື່ໃຫມ່ຂາຍສ່ວນບຸກຄົນ
 DocType: Packing Slip,Gross Weight UOM,ນ້ໍາຫນັກ UOM
-DocType: Email Digest,Receivables / Payables,ລູກຫນີ້ / ເຈົ້າຫນີ້
 DocType: Delivery Note Item,Against Sales Invoice,ຕໍ່ Invoice Sales
 DocType: Bin,Reserved Qty for Production,ລິຂະສິດຈໍານວນການຜະລິດ
 DocType: Asset,Frequency of Depreciation (Months),ຄວາມຖີ່ຂອງການເສື່ອມລາຄາ (ເດືອນ)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +469,Credit Account,ການບັນຊີ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Credit Account,ການບັນຊີ
 DocType: Landed Cost Item,Landed Cost Item,ລູກຈ້າງສິນຄ້າຕົ້ນທຶນ
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +55,Show zero values,ສະແດງໃຫ້ເຫັນຄຸນຄ່າສູນ
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,ສະແດງໃຫ້ເຫັນຄຸນຄ່າສູນ
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,ປະລິມານຂອງສິນຄ້າໄດ້ຮັບຫຼັງຈາກການຜະລິດ / repacking ຈາກປະລິມານຂອງວັດຖຸດິບ
 apps/erpnext/erpnext/public/js/setup_wizard.js +315,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 +647,Please specify Attribute Value for attribute {0},ກະລຸນາລະບຸຄຸນສົມບັດມູນຄ່າສໍາລັບເຫດຜົນ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},ກະລຸນາລະບຸຄຸນສົມບັດມູນຄ່າສໍາລັບເຫດຜົນ {0}
 DocType: Item,Default Warehouse,ມາດຕະຖານ Warehouse
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +39,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,ກະລຸນາເຂົ້າໄປໃນສູນຄ່າໃຊ້ຈ່າຍຂອງພໍ່ແມ່
@@ -3929,19 +3984,22 @@
 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,ຄົນຂາຍ
-DocType: Sales Invoice,Cold Calling,ໂທເຢັນ
 DocType: SMS Parameter,SMS Parameter,SMS ພາລາມິເຕີ
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,ງົບປະມານແລະສູນຕົ້ນທຶນ
 DocType: Maintenance Schedule Item,Half Yearly,ເຄິ່ງຫນຶ່ງປະຈໍາປີ
 DocType: Lead,Blog Subscriber,ຈອງ Blog
+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,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 +253,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 +141,Set as Lost,ກໍານົດເປັນການສູນເສຍ
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,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 +5,This is based on transactions against this Customer. See timeline below for details,ນີ້ແມ່ນອີງໃສ່ການເຮັດທຸລະກໍາຕໍ່ລູກຄ້ານີ້. ເບິ່ງໄລຍະເວລາຂ້າງລຸ່ມນີ້ສໍາລັບລາຍລະອຽດ
 DocType: Supplier,Credit Days Based On,Days ການປ່ອຍສິນເຊື່ອທີ່ກ່ຽວກັບ
@@ -3953,11 +4011,10 @@
 ,Items To Be Requested,ລາຍການທີ່ຈະໄດ້ຮັບການຮ້ອງຂໍ
 DocType: Purchase Order,Get Last Purchase Rate,ໄດ້ຮັບຫຼ້າສຸດອັດຕາການຊື້
 DocType: Company,Company Info,ຂໍ້ມູນບໍລິສັດ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +941,Select or add new customer,ເລືອກຫລືເພີ່ມລູກຄ້າໃຫມ່
+apps/erpnext/erpnext/accounts/page/pos/pos.js +930,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 +5,This is based on the attendance of this Employee,ນີ້ແມ່ນອີງໃສ່ການເຂົ້າຮ່ວມຂອງພະນັກງານນີ້
-DocType: Sales Invoice,Frequency,ຄວາມຖີ່ຂອງການ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +463,Debit Account,ບັນຊີເດບິດ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Debit Account,ບັນຊີເດບິດ
 DocType: Fiscal Year,Year Start Date,ປີເລີ່ມວັນທີ່
 DocType: Attendance,Employee Name,ຊື່ພະນັກງານ
 DocType: Sales Invoice,Rounded Total (Company Currency),ກົມທັງຫມົດ (ບໍລິສັດສະກຸນເງິນ)
@@ -3966,27 +4023,27 @@
 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 +210,Supplier Quotation {0} created,ສະເຫນີລາຄາຜູ້ຜະລິດ {0} ສ້າງ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +208,Supplier Quotation {0} created,ສະເຫນີລາຄາຜູ້ຜະລິດ {0} ສ້າງ
 apps/erpnext/erpnext/accounts/report/financial_statements.py +90,End Year cannot be before Start Year,ປີສຸດທ້າຍບໍ່ສາມາດກ່ອນທີ່ Start ປີ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Employee Benefits,ຜົນປະໂຫຍດພະນັກງານ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,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 +228,Please set a default Holiday List for Employee {0} or Company {1},ກະລຸນາທີ່ກໍານົດໄວ້ມາດຕະຖານບັນຊີພັກຜ່ອນສໍາລັບພະນັກງານ {0} ຫລືບໍລິສັດ {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +232,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 +499,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 +500,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 +1007,Price List not found or disabled,ລາຄາບໍ່ພົບຫຼືຄົນພິການ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1008,Price List not found or disabled,ລາຄາບໍ່ພົບຫຼືຄົນພິການ
 DocType: Expense Claim,Approved,ການອະນຸມັດ
 DocType: Pricing Rule,Price,ລາຄາ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +244,Employee relieved on {0} must be set as 'Left',ພະນັກງານສະບາຍໃຈໃນ {0} ຕ້ອງໄດ້ຮັບການສ້າງຕັ້ງເປັນ &#39;ຊ້າຍ&#39;
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +256,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} ໃນຊ່ວງວັນທີ່ໄດ້ຮັບ
@@ -3997,12 +4054,12 @@
 DocType: Address,Office,ຫ້ອງການ
 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 +259,Please select Employee Record first.,ກະລຸນາເລືອກບັນທຶກພະນັກງານຄັ້ງທໍາອິດ.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +266,Please select Employee Record first.,ກະລຸນາເລືອກບັນທຶກພະນັກງານຄັ້ງທໍາອິດ.
 DocType: POS Profile,Account for Change Amount,ບັນຊີສໍາລັບການປ່ຽນແປງຈໍານວນເງິນ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +190,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},ຕິດຕໍ່ກັນ {0}: ພັກ / ບັນຊີບໍ່ກົງກັບ {1} / {2} ໃນ {3} {4}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +235,Please enter Expense Account,ກະລຸນາໃສ່ທີ່ຄຸ້ມຄ່າ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,Please enter Expense Account,ກະລຸນາໃສ່ທີ່ຄຸ້ມຄ່າ
 DocType: Account,Stock,Stock
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,"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 +976,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","ຕິດຕໍ່ກັນ, {0}: Reference ປະເພດເອກະສານຕ້ອງເປັນສ່ວນຫນຶ່ງຂອງຄໍາສັ່ງຊື້, ຊື້ໃບເກັບເງິນຫຼືການອະນຸທິນ"
 DocType: Employee,Current Address,ທີ່ຢູ່ປະຈຸບັນ
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","ຖ້າຫາກວ່າລາຍການແມ່ນ variant ຂອງລາຍການອື່ນຫຼັງຈາກນັ້ນອະທິບາຍ, ຮູບພາບ, ລາຄາ, ພາສີອາກອນແລະອື່ນໆຈະໄດ້ຮັບການກໍານົດໄວ້ຈາກແມ່ແບບເວັ້ນເສຍແຕ່ລະບຸຢ່າງຊັດເຈນ"
 DocType: Serial No,Purchase / Manufacture Details,ຊື້ / ລາຍລະອຽດຜະລິດ
@@ -4017,9 +4074,10 @@
 DocType: Asset Movement,Transaction Date,ວັນທີ່ສະຫມັກເຮັດທຸລະກໍາ
 DocType: Production Plan Item,Planned Qty,ການວາງແຜນການຈໍານວນ
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,ພາສີທັງຫມົດ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,For Quantity (Manufactured Qty) is mandatory,ສໍາລັບປະລິມານ (ຜະລິດຈໍານວນ) ເປັນການບັງຄັບ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,For Quantity (Manufactured Qty) is mandatory,ສໍາລັບປະລິມານ (ຜະລິດຈໍານວນ) ເປັນການບັງຄັບ
 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 +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,ຕິດຕໍ່ກັນ {0}: ພັກປະເພດແລະພັກແມ່ນມີພຽງແຕ່ສາມາດນໍາໃຊ້ຕໍ່ Receivable / ບັນຊີເຈົ້າຫນີ້
 DocType: Notification Control,Purchase Receipt Message,ຊື້ຂໍ້ຄວາມຮັບ
 DocType: Production Order,Actual Start Date,ຕົວຈິງວັນທີ່
@@ -4034,9 +4092,11 @@
 DocType: Warranty Claim,If different than customer address,ຖ້າຫາກວ່າທີ່ແຕກຕ່າງກັນກ່ວາຢູ່ຂອງລູກຄ້າ
 DocType: BOM Operation,BOM Operation,BOM ການດໍາເນີນງານ
 DocType: Purchase Taxes and Charges,On Previous Row Amount,ກ່ຽວກັບຈໍານວນແຖວ Previous
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +226,Transfer Asset,Asset ການຖ່າຍໂອນ
+DocType: Student,Home Address,ທີ່ຢູ່ເຮືອນ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +227,Transfer Asset,Asset ການຖ່າຍໂອນ
 DocType: POS Profile,POS Profile,ຂໍ້ມູນ POS
 apps/erpnext/erpnext/config/schools.py +33,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 +129,"Item {0} is a template, please select one of its variants","ລາຍການ {0} ເປັນແມ່ແບບໄດ້, ກະລຸນາເລືອກເອົາຫນຶ່ງຂອງ variants ຂອງຕົນ"
 DocType: Asset,Asset Category,ປະເພດຊັບສິນ
@@ -4046,8 +4106,8 @@
 DocType: Assessment,Room,ຫ້ອງ
 DocType: Purchase Order,Advance Paid,ລ່ວງຫນ້າການຊໍາລະເງິນ
 DocType: Item,Item Tax,ພາສີລາຍ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +765,Material to Supplier,ອຸປະກອນການຜະລິດ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +189,Excise Invoice,ອາກອນຊົມໃຊ້ໃບເກັບເງິນ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,Material to Supplier,ອຸປະກອນການຜະລິດ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,ອາກອນຊົມໃຊ້ໃບເກັບເງິນ
 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,ຫນີ້ສິນໃນປະຈຸບັນ
@@ -4057,7 +4117,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,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 +136,Credit Card,ບັດເຄຣດິດ
+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.,ການຕັ້ງຄ່າມາດຕະຖານສໍາລັບການເຮັດທຸລະກໍາຫຼັກຊັບ.
 DocType: Purchase Invoice,Next Date,ວັນຖັດໄປ
@@ -4065,6 +4125,7 @@
 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: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","ໃນທີ່ນີ້ທ່ານສາມາດຮັກສາລາຍລະອຽດຂອງຄອບຄົວເຊັ່ນ: ຊື່ແລະອາຊີບຂອງພໍ່ແມ່, ຄູ່ສົມລົດແລະເດັກນ້ອຍ"
+DocType: Academic Term,Term End Date,ໄລຍະສຸດທ້າຍວັນທີ່
 DocType: Hub Settings,Seller Name,ຊື່ຜູ້ຂາຍ
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),ພາສີອາກອນແລະຄ່າບໍລິການຫັກ (ບໍລິສັດສະກຸນເງິນ)
 DocType: Item Group,General Settings,ການຕັ້ງຄ່າທົ່ວໄປ
@@ -4076,7 +4137,7 @@
 DocType: Customer,Commission Rate,ອັດຕາຄະນະກໍາມະ
 apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,ເຮັດໃຫ້ Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,ຄໍາຮ້ອງສະຫມັກ Block ໃບໂດຍພະແນກ.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +115,"Payment Type must be one of Receive, Pay and Internal Transfer","ປະເພດການຈ່າຍເງິນຕ້ອງເປັນຫນຶ່ງໃນໄດ້ຮັບການ, ການຊໍາລະເງິນແລະພາຍໃນການຖ່າຍໂອນ"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +118,"Payment Type must be one of Receive, Pay and Internal Transfer","ປະເພດການຈ່າຍເງິນຕ້ອງເປັນຫນຶ່ງໃນໄດ້ຮັບການ, ການຊໍາລະເງິນແລະພາຍໃນການຖ່າຍໂອນ"
 apps/erpnext/erpnext/config/selling.py +169,Analytics,ການວິເຄາະ
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,ໂຄງຮ່າງການແມ່ນບໍ່ມີ
 DocType: Production Order,Actual Operating Cost,ຄ່າໃຊ້ຈ່າຍປະຕິບັດຕົວຈິງ
@@ -4091,10 +4152,10 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,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 +92,Designer,ການອອກແບບ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Designer,ການອອກແບບ
 apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,ຂໍ້ກໍານົດແລະເງື່ອນໄຂ Template
 DocType: Serial No,Delivery Details,ລາຍລະອຽດການຈັດສົ່ງ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +469,Cost Center is required in row {0} in Taxes table for type {1},ສູນຕົ້ນທຶນທີ່ຕ້ອງການໃນການຕິດຕໍ່ກັນ {0} ໃນພາສີອາກອນຕາຕະລາງສໍາລັບປະເພດ {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +472,Cost Center is required in row {0} in Taxes table for type {1},ສູນຕົ້ນທຶນທີ່ຕ້ອງການໃນການຕິດຕໍ່ກັນ {0} ໃນພາສີອາກອນຕາຕະລາງສໍາລັບປະເພດ {1}
 DocType: Program,Program Code,ລະຫັດໂຄງການ
 ,Item-wise Purchase Register,ລາຍການສະຫລາດຊື້ຫມັກສະມາຊິກ
 DocType: Batch,Expiry Date,ວັນຫມົດອາຍຸ
@@ -4104,12 +4165,12 @@
 apps/erpnext/erpnext/config/projects.py +13,Project master.,ຕົ້ນສະບັບຂອງໂຄງການ.
 apps/erpnext/erpnext/controllers/status_updater.py +174,"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 +417, (Half Day),(ຄຶ່ງວັນ)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425, (Half Day),(ຄຶ່ງວັນ)
 DocType: Supplier,Credit Days,Days ການປ່ອຍສິນເຊື່ອ
 DocType: Leave Type,Is Carry Forward,ແມ່ນປະຕິບັດຕໍ່
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +740,Get Items from BOM,ຮັບສິນຄ້າຈາກ BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +711,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 +549,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},"ຕິດຕໍ່ກັນ, {0}: ປະກາດວັນທີ່ຈະຕ້ອງເຊັ່ນດຽວກັນກັບວັນທີ່ຊື້ {1} ຂອງຊັບສິນ {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +552,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,ໂອນຊັບສິນຈາກສາງກັບຄົນອື່ນ
diff --git a/erpnext/translations/lt.csv b/erpnext/translations/lt.csv
index 9d09fbc..8342aec 100644
--- a/erpnext/translations/lt.csv
+++ b/erpnext/translations/lt.csv
@@ -18,11 +18,10 @@
 DocType: Sales Partner,Dealer,prekiautojas
 DocType: Employee,Rented,nuomojamos
 DocType: Purchase Order,PO-,po-
-apps/erpnext/erpnext/accounts/report/financial_statements.py +19,Start Year {0} not found.,Pradėti metai {0} nerastas.
 DocType: POS Profile,Applicable for User,Taikoma Vartotojo
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +191,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Sustabdyta Gamybos nurodymas negali būti atšauktas, atkišti ji pirmą kartą atšaukti"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +197,Do you really want to scrap this asset?,Ar tikrai norite atsisakyti šios turtą?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +17,Select Default Supplier,Pasirinkti Default Tiekėjas
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +192,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Sustabdyta Gamybos nurodymas negali būti atšauktas, atkišti ji pirmą kartą atšaukti"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +198,Do you really want to scrap this asset?,Ar tikrai norite atsisakyti šios turtą?
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Pasirinkti Default Tiekėjas
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,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
@@ -39,49 +38,48 @@
 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,Kliento vardas
+DocType: Sales Invoice,Customer Name,Klientas
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +126,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 +180,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 +183,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 +148,Series Updated Successfully,Serija Atnaujinta sėkmingai
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +149,Series Updated Successfully,Serija Atnaujinta sėkmingai
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Užsakymas
 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
-DocType: Quality Inspection Reading,Parameter,Parametras
 apps/erpnext/erpnext/projects/doctype/project/project.py +54,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 +239,New Leave Application,Nauja atostogos taikymas
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,New Leave Application,Nauja atostogos taikymas
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +20,Attendance Record {0} exists against Student {1} for Course Schedule {2},Lankomumas Įrašų {0} egzistuoja nuo Studentų {1} ir užsiėmimų tvarkaraštis {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Bank Draft,bankas projektas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,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
 DocType: Academic Term,Academic Term,akademinė terminas
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +13,Material,medžiaga
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Quantity,kiekis
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +511,Accounts table cannot be blank.,Sąskaitos lentelė gali būti tuščias.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +616,Quantity,kiekis
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +512,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)
 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/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 +142,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
-DocType: Purchase Invoice,Monthly,kas mėnesį
 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/buying/doctype/purchase_order/purchase_order.js +771,Invoice,faktūra
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +750,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 +198,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 +74,Row # {0}:,Eilutės # {0}:
+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 +127,Please select Price List,Prašome pasirinkti Kainoraštis
@@ -112,8 +110,8 @@
 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 +589,Get items from,Gauk elementus iš
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +382,Stock cannot be updated against Delivery Note {0},"Akcijų, negali būti atnaujintas prieš važtaraštyje {0}"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Gauk elementus iš
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,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
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Parduotuvė
@@ -122,7 +120,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,pensijų fondai
 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 +156,Salary Structure Missing,Darbo užmokesčio struktūrą Trūksta
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,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
@@ -130,10 +128,11 @@
 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 +156,Credit limit has been crossed for customer {0} {1}/{2},Kredito limitas buvo kirto klientui {0} {1} / {2}
-apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;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 +189,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"
 DocType: Tax Rule,Tax Type,mokesčių tipas
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +144,You are not authorized to add or update entries before {0},Jūs nesate įgaliotas pridėti ar atnaujinti įrašus prieš {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,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/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
@@ -143,18 +142,17 @@
 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 +165,Opening,atidarymas
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,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/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Klientų&gt; Klientų grupė&gt; teritorija
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Sąskaita mokate tik
 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ę.
 DocType: Lead,Product Enquiry,Prekės Užklausa
 DocType: Academic Term,Schools,Mokyklos
 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 +335,Please select Company first,Prašome pasirinkti Company pirmas
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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ų
@@ -164,7 +162,7 @@
 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
 DocType: Purchase Invoice Item,Is Fixed Asset,Ar Ilgalaikio turto
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Available qty is {0}, you need {1}","Turimas Kiekis yra {0}, jums reikia {1}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +225,"Available qty is {0}, you need {1}","Turimas Kiekis yra {0}, jums reikia {1}"
 DocType: Expense Claim Detail,Claim Amount,reikalavimo suma
 DocType: Employee,Mr,Ponas
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Tiekėjas Tipas / Tiekėjas
@@ -173,25 +171,26 @@
 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: Assessment Result,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 +171,Annual Salary,Metinis atlyginimas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Annual Salary,Metinis atlyginimas
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Akcijų išlaidos
-apps/erpnext/erpnext/accounts/report/financial_statements.py +22,End Year {0} not found.,Pabaigos metai {0} nerastas.
 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}
 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 +130,At least one mode of payment is required for POS invoice.,Bent vienas režimas mokėjimo reikalingas POS sąskaitą.
 DocType: Products Settings,Show Products as a List,Rodyti produktus sąraše
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Atsisiųskite šabloną, užpildykite reikiamus duomenis ir pridėti naują failą. Visos datos ir darbuotojas kombinacija Pasirinkto laikotarpio ateis šabloną, su esamais lankomumo įrašų"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +451,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/stock/doctype/stock_entry/stock_entry.py +456,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/controllers/accounts_controller.py +614,"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/controllers/accounts_controller.py +617,"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 +166,Settings for HR Module,Nustatymai HR modulio
 DocType: SMS Center,SMS Center,SMS centro
 DocType: Sales Invoice,Change Amount,Pakeisti suma
@@ -203,13 +202,13 @@
 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 +147,Execution,vykdymas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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/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}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,Cost Center {0} does not belong to Company {1},Kainuos centras {0} nepriklauso Company {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +100,Cost Center {0} does not belong to Company {1},Kainuos centras {0} nepriklauso Company {1}
 DocType: Customer,Individual,individualus
 DocType: Interest,Academics User,akademikai Vartotojas
 DocType: Cheque Print Template,Amount In Figure,Suma pav
@@ -225,30 +224,32 @@
 DocType: Production Planning Tool,Sales Orders,pardavimų užsakymai
 DocType: Purchase Taxes and Charges,Valuation,įvertinimas
 ,Purchase Order Trends,Pirkimui užsakyti tendencijos
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,The request for quotation can be accessed by clicking on the following link,Už citatos prašymas gali būti atvertas paspaudę šią nuorodą
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,Skirti lapai per metus.
 DocType: SG Creation Tool Course,SG Creation Tool Course,SG kūrimo įrankis kursai
 DocType: Student Group Creation Tool,Leave blank if you wish to fetch all courses for selected academic term,"Palikite tuščią, jei norite paimti visus kursus pasirinktų akademinės laikotarpiu"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,Insufficient Stock,nepakankamas sandėlyje
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227,Insufficient Stock,nepakankamas sandėlyje
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Išjungti pajėgumų planavimas ir laiko sekimo
+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: 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/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} does not belong to Company {1},Sąskaita {0} nepriklauso Company {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +86,Account {0} does not belong to Company {1},Sąskaita {0} nepriklauso Company {1}
 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}
 DocType: Naming Series,Series List for this Transaction,Serija sąrašas šio sandorio
 DocType: Sales Invoice,Is Opening Entry,Ar atidarymas įrašą
 DocType: Customer Group,Mention if non-standard receivable account applicable,"Nurodyk, jei nestandartinis gautinos sąskaitos taikoma"
 DocType: Course Schedule,Instructor Name,instruktorius Vardas
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,For Warehouse is required before Submit,Sandėliavimo reikalingas prieš Pateikti
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,For Warehouse is required before Submit,Sandėliavimo reikalingas prieš Pateikti
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,gautas
 DocType: Sales Partner,Reseller,perpardavinėjimo
 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 +1436,"LocalStorage is full , did not save","LocalStorage &quot;yra pilna, neišsaugojo"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1460,"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}
@@ -261,18 +262,19 @@
 apps/erpnext/erpnext/templates/generators/item.html +78,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 +5,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/leave_application/leave_application.py +206,Only the selected Leave Approver can submit this Leave Application,Tik pasirinktas atostogos Tvirtintojas gali pateikti šias atostogas taikymas
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +213,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 +114,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 +179,Leaves per Year,Lapai per metus
+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 +103,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}
+DocType: Email Digest,Profit & Loss,Pelnas ir nuostoliai
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,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 +435,Leave Blocked,Palikite Užblokuoti
-apps/erpnext/erpnext/stock/doctype/item/item.py +669,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 +443,Leave Blocked,Palikite Užblokuoti
+apps/erpnext/erpnext/stock/doctype/item/item.py +671,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 +83,Annual,metinis
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +86,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
@@ -280,20 +282,22 @@
 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ą"
 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 +91,Software Developer,Programinės įrangos kūrėjas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,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: Scheduling Tool,Course Start Date,Žinoma pradžios data
 DocType: Item,Publish in Hub,Skelbia Hub
+DocType: Student Admission,Student Admission,Studentų Priėmimas
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is cancelled,Prekė {0} atšaukiamas
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Material Request,medžiaga Prašymas
+apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} is cancelled,Prekė {0} atšaukiamas
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +823,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 +28,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 +328,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Prekė {0} nerastas &quot;In žaliavos&quot; stalo Užsakymo {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +333,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/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
@@ -309,20 +313,21 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +130,Please select Charge Type first,Prašome pasirinkti mokesčių rūšis pirmą kartą
 DocType: Student Group Student,Student Group Student,Studentų grupė studentė
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,paskutinis
+DocType: Email Digest,New Quotations,Nauja citatos
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Pirmasis atostogos Tvirtintojas sąraše bus nustatytas kaip numatytasis Palikite jį patvirtinusio
 DocType: Tax Rule,Shipping County,Pristatymas apskritis
 apps/erpnext/erpnext/config/desktop.py +158,Learn,Mokytis
 DocType: Asset,Next Depreciation Date,Kitas Nusidėvėjimas data
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Veiklos sąnaudos vienam darbuotojui
 DocType: Accounts Settings,Settings for Accounts,Nustatymai sąskaitų
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +626,Supplier Invoice No exists in Purchase Invoice {0},Tiekėjas sąskaitoje Nr egzistuoja pirkimo sąskaitoje faktūroje {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +629,Supplier Invoice No exists in Purchase Invoice {0},Tiekėjas sąskaitoje Nr egzistuoja pirkimo sąskaitoje faktūroje {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Valdyti pardavimo asmuo medį.
 DocType: Job Applicant,Cover Letter,lydraštis
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Neįvykdyti čekiai ir užstatai ir išvalyti
 DocType: Item,Synced With Hub,Sinchronizuojami su Hub
 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 +348,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 +86,Circular Reference Error,Ciklinę nuorodą Klaida
@@ -334,15 +339,16 @@
 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 +806,Delivery Note,Važtaraštis
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +800,Delivery Note,Važtaraštis
 apps/erpnext/erpnext/config/learn.py +87,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 +233,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/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/setup/doctype/email_digest/email_digest.py +104,Summary for this week and pending activities,Santrauka šią savaitę ir laukiant veikla
+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ą"
 DocType: Employee,Company Email,Įmonės paštas
@@ -354,27 +360,28 @@
 apps/erpnext/erpnext/config/hr.py +186,"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"
-apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Eilutės # {0}: Pirkimo sąskaita faktūra negali būti pareikštas esamo turto {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +554,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 +54,{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 +812,Select Item,Pasirinkite punktas
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +791,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 \
 					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 +142,Purchase Invoice {0} is already submitted,Pirkimo sąskaita faktūra {0} jau pateiktas
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},"Eilutės # {0}: Serijos Nr turi būti toks pat, kaip {1} {2}"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +143,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.
 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 +342,Please see attachment,Žiūrėkite priedą
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,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 +19,Setup Already Complete!!,Sąranka jau baigti !!
 ,Finished Goods,gatavų prekių
 DocType: Delivery Note,Instructions,instrukcijos
 DocType: Quality Inspection,Inspected By,tikrina
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Tiekėjas tiekiantis&gt; Tiekėjas tipas
 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/public/js/utils/item_selector.js +12,Add Items,Pridėti prekę
@@ -388,29 +395,29 @@
 DocType: Currency Exchange,Currency Exchange,Valiutos keitykla
 DocType: Purchase Invoice Item,Item Name,Daikto pavadinimas
 DocType: Authorization Rule,Approving User  (above authorized value),Patvirtinimo vartotoją (virš įgalioto vertės)
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Kredito balansas
+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/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 +736,Purchase Return,pirkimo Grįžti
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +715,Purchase Return,pirkimo Grįžti
 ,Purchase Register,pirkimo Registruotis
 DocType: 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 +202,{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 +209,{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 +143,Reason for losing,"Priežastis, dėl kurios praranda"
-apps/erpnext/erpnext/accounts/utils.py +239,Allocated amount can not greater than unadjusted amount,Paskirti suma gali ne didesnis nei originalios suma
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +163,Reason for losing,"Priežastis, dėl kurios praranda"
+apps/erpnext/erpnext/accounts/utils.py +316,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 +79,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: Account,Cost of Goods Sold,Parduotų prekių kaina
 DocType: Purchase Invoice,Yearly,kasmet
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +225,Please enter Cost Center,Prašome įvesti sąnaudų centro
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,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
@@ -423,26 +430,26 @@
 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
 DocType: Account,Is Group,yra grupė
+DocType: Email Digest,Pending Purchase Orders,Kol Pirkimų užsakymus
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Automatiškai Eilės Nr remiantis FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Patikrinkite Tiekėjas sąskaitos faktūros numeris Unikalumas
 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 +102,Non Profit,nepelno
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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: Stock Reconciliation Item,Do not include symbols (ex. $),Neįtraukite simbolius (pvz. $)
 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 +638,Attribute {0} selected multiple times in Attributes Table,Įgūdis {0} pasirinktas kelis kartus požymiai lentelėje
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Įgūdis {0} pasirinktas kelis kartus požymiai lentelėje
 DocType: HR Settings,Employee record is created using selected field. ,Darbuotojų įrašas sukurtas naudojant pasirinktą lauką.
 DocType: Sales Order,Not Applicable,Netaikoma
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Atostogų meistras.
 DocType: Request for Quotation Item,Required Date,Reikalinga data
 DocType: Delivery Note,Billing Address,atsiskaitymo Adresas
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +862,Please enter Item Code.,Prašome įvesti Prekės kodas.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +847,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"
@@ -456,12 +463,12 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Vertybiniai popieriai ir užstatai
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,skiriamos viso lapai yra privalomi
 DocType: Job Opening,Description of a Job Opening,Aprašymas apie Darbo skelbimai
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Pending activities for today,Kol veikla šiandien
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Kol veikla šiandien
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Lankomumas įrašas.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Pajamos komponentas žiniaraštis pagrįstą darbo užmokesčio.
 DocType: Sales Order Item,Used for Production Plan,Naudojamas gamybos planas
 DocType: Manufacturing Settings,Time Between Operations (in mins),Laikas tarp operacijų (minutėmis)
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +92,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} biudžetas paskyra {1} prieš sąnaudų centro {2} yra {3}. Jis bus viršyti {4}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +95,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} biudžetas paskyra {1} prieš sąnaudų centro {2} yra {3}. Jis bus viršyti {4}
 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
@@ -469,16 +476,16 @@
 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/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 +86,Administrative Officer,administracijos pareigūnas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,administracijos pareigūnas
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +23,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 +319,Please select Company,Prašome pasirinkti kompaniją
-DocType: Stock Entry,Difference Account,skirtumas paskyra
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +309,Please select Company,Prašome pasirinkti kompaniją
+DocType: Stock Entry Detail,Difference Account,skirtumas paskyra
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,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 +398,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 +399,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 +530,"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 +532,"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 +28,Buy,nupirkti
@@ -486,7 +493,7 @@
 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 +1563,Serial no item cannot be a fraction,Serijos Nr punktas negali būti frakcija
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1587,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
@@ -495,13 +502,14 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Account {0} does not belong to company: {1},Sąskaita {0} nepriklauso įmonės: {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation already used for another company,Santrumpa jau naudojamas kitos bendrovės
 DocType: Selling Settings,Default Customer Group,Pagal nutylėjimą klientų grupei
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Supplier is required against Payable account {0},Tiekėjas privalo prieš MOKĖTINOS sąskaitą {0}
 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,"
 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 +313,Reference No and Reference Date is mandatory for Bank transaction,Nuorodos Nr ir nuoroda data yra privalomas banko sandorio
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +316,Reference No and Reference Date is mandatory for Bank transaction,Nuorodos Nr ir nuoroda data yra privalomas banko sandorio
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Įdėti / Redaguoti mokesčių ir rinkliavų
 DocType: Purchase Invoice,Supplier Invoice No,Tiekėjas sąskaitoje Nr
 DocType: Territory,For reference,prašymą priimti prejudicinį sprendimą
@@ -512,7 +520,6 @@
 DocType: Installation Note Item,Installation Note Item,Įrengimas Pastaba Prekė
 DocType: Production Plan Item,Pending Qty,Kol Kiekis
 DocType: Budget,Ignore,ignoruoti
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Prekės kodas&gt; Prekė grupė&gt; Mascus Prekės Ženklo
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,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ą
@@ -523,14 +530,14 @@
 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/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 +28,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 +19,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 +707,Make Sales Order,Padaryti pardavimo užsakymų
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +701,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,Iš viso
+DocType: C-Form Invoice Detail,Grand Total,Bendra suma
 DocType: Assessment,Course,kursas
 DocType: Timesheet,Payslip,algalapį
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +38,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Finansiniai metai pradžios data turėtų būti ne didesnis nei finansinių metų pabaigos data
@@ -543,7 +550,8 @@
 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 +734,Sales Return,pardavimų Grįžti
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +728,Sales Return,pardavimų Grįžti
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +91,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)
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Duomenų bazė potencialiems klientams.
@@ -552,14 +560,13 @@
 DocType: Quotation,Quotation To,citatos
 DocType: Lead,Middle Income,vidutines pajamas
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +212,Opening (Cr),Anga (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +795,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"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 +237,Allocated amount can not be negative,Paskirti suma negali būti neigiama
+apps/erpnext/erpnext/stock/doctype/item/item.py +797,Default Unit of Measure for Item {0} cannot be changed directly because 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
 DocType: Purchase Order Item,Billed Amt,Apmokestinti Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Logiškas Sandėlių nuo kurių akcijų įrašai būtų daromi.
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Pardavimų sąskaita faktūra Lapą
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},Nuorodos Nr &amp; nuoroda data reikalingas {0}
-DocType: Sales Invoice,Customer's Vendor,Kliento Pardavėjas
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Proposal Writing,Pasiūlymas rašymas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,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"
@@ -568,13 +575,14 @@
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,laikas stebėjimas
 DocType: Fiscal Year Company,Fiscal Year Company,Finansiniai metai Įmonės
 DocType: Packing Slip Item,DN Detail,DN detalės
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +257,Already supplier quotation has created,Jau tiekėjas citatos sukūrė
 DocType: Timesheet,Billed,įvardintas
 DocType: Batch,Batch Description,Serija Aprašymas
+apps/erpnext/erpnext/accounts/utils.py +685,"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 +733,View Offline Records,Peržiūrėti Atsijungęs Įrašai
+apps/erpnext/erpnext/accounts/page/pos/pos.js +715,View Offline Records,Peržiūrėti Atsijungęs Įrašai
+DocType: Student,Sibling Details,Giminystės detalės
 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: Payment Reconciliation,Invoice/Journal Entry Details,Sąskaita / leidinys Įėjimo detalės
@@ -588,7 +596,7 @@
 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
 DocType: Employee,Passport Number,Paso numeris
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Manager,vadybininkas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,vadybininkas
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,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
@@ -597,10 +605,11 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter email address,"Prašome įvesti elektroninio pašto adresą,"
 DocType: Production Order Operation,In minutes,per kelias minutes
 DocType: Issue,Resolution Date,geba data
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +299,Timesheet created:,Lapą sukurta:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +715,Please set default Cash or Bank account in Mode of Payment {0},Prašome nustatyti numatytąją grynaisiais ar banko sąskaitą mokėjimo būdas {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +300,Timesheet created:,Lapą sukurta:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +772,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
 DocType: Selling Settings,Customer Naming By,Klientų įvardijimas Iki
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,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: 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
@@ -625,6 +634,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,Baigti
 DocType: Pricing Rule,Sales Manager,Pardavimų vadybininkas
 DocType: Salary Structure Employee,Base,Bazė
+DocType: Timesheet,Total Billed Hours,Iš viso Apmokestintos valandos
 DocType: Journal Entry,Write Off Amount,Nurašyti suma
 DocType: Journal Entry,Bill No,Billas Nėra
 DocType: Company,Gain/Loss Account on Asset Disposal,Pelnas / nuostolis paskyra nuo turto perdavimo
@@ -639,11 +649,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +9,Pre Sales,Pre Pardavimai
 DocType: Purchase Receipt,Other Details,Kitos detalės
 DocType: Account,Accounts,sąskaitos
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Marketing,prekyba
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +227,Payment Entry is already created,Mokėjimo įrašas jau yra sukurta
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,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 +538,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 +21,Preview Salary Slip,Peržiūrėti darbo užmokestį
+apps/erpnext/erpnext/controllers/accounts_controller.py +541,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 +38,Preview Salary Slip,Peržiūrėti darbo užmokestį
 DocType: Company,Deafult Cost Center,Deafult Kaina centras
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +48,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"
@@ -652,7 +662,7 @@
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,Pasirinkite studentų grupę
 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 +617,Item has variants.,Prekė turi variantus.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Prekė turi variantus.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,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
@@ -672,7 +682,7 @@
 DocType: Purchase Order,Supply Raw Materials,Tiekimo Žaliavos
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Data, kada bus sukurtas sekančią sąskaitą faktūrą. Jis generuoja pateikti."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Turimas turtas
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,{0} is not a stock Item,{0} nėra sandėlyje punktas
+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 +169,Lead must be set if Opportunity is made from Lead,"Švinas turi būti nustatyti, jei galimybės yra pagamintas iš švino"
@@ -739,26 +749,25 @@
 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 +709,No Permission,Nėra leidimo
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +710,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}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +298,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 +542,Row #{0}: Asset {1} must be submitted,Eilutės # {0}: Turto {1} turi būti pateiktas
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset {1} must be submitted,Eilutės # {0}: Turto {1} turi būti pateiktas
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Nėra darbuotojas nerasta
 DocType: Supplier Quotation,Stopped,sustabdyta
 DocType: Item,If subcontracted to a vendor,Jei subrangos sutartį pardavėjas
 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.
 DocType: Warehouse,Tree Details,medis detalės
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Išsiusti dabar
 ,Support Analytics,paramos Analytics &quot;
 DocType: Item,Website Warehouse,Interneto svetainė sandėlis
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimalus sąskaitos faktūros suma
 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/sales_invoice/sales_invoice.py +227,Timesheet {0} is already completed or cancelled,Lapą {0} jau baigė arba atšaukti
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +259,Timesheet {0} is already completed or cancelled,Lapą {0} jau baigė arba atšaukti
 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
@@ -774,13 +783,13 @@
 apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Žinoma Tvarkaraštis
 DocType: Maintenance Visit,Completion Status,užbaigimo būsena
 DocType: HR Settings,Enter retirement age in years,Įveskite pensinį amžių metais
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +229,Target Warehouse,Tikslinė sandėlis
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +230,Target Warehouse,Tikslinė sandėlis
 DocType: Cheque Print Template,Starting location from left edge,Nuo vietą iš kairiojo krašto
 DocType: Item,Allow over delivery or receipt upto this percent,Leisti per pristatymą ar gavimo net iki šio proc
 DocType: Stock Entry,STE-,STE-
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Sales Order Date,Numatomas pristatymo data gali būti ne anksčiau Pardavimų įsakymu data
 DocType: Upload Attendance,Import Attendance,importas Lankomumas
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Visi punktas Grupės
+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/config/setup.py +89,Automatically compose message on submission of transactions.,Automatiškai kurti pranešimą pateikus sandorius.
@@ -792,13 +801,15 @@
 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/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
 DocType: Expense Claim,Expenses,išlaidos
 DocType: Item Variant Attribute,Item Variant Attribute,Prekė variantas Įgūdis
 ,Purchase Receipt Trends,Pirkimo kvito tendencijos
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Research & Development,Tyrimai ir plėtra
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Tyrimai ir plėtra
 ,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
@@ -807,7 +818,7 @@
 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/controllers/accounts_controller.py +340,"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."
+apps/erpnext/erpnext/controllers/accounts_controller.py +343,"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
@@ -829,12 +840,12 @@
 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 +756,Purchase Receipt,pirkimo kvito
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +735,Purchase Receipt,pirkimo kvito
 ,Received Items To Be Billed,Gauti duomenys turi būti apmokestinama
 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 +167,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 +282,Unable to find Time Slot in the next {0} days for Operation {1},Nepavyko rasti laiko tarpsnių per ateinančius {0} dienų darbui {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +170,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 +283,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 +439,BOM {0} must be active,BOM {0} turi būti aktyvus
@@ -845,7 +856,7 @@
 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 +214,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 +217,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
@@ -859,9 +870,9 @@
 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
 DocType: Fee Structure,Components,komponentai
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,Please enter Asset Category in Item {0},Prašome įvesti Turto kategorija prekės {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +612,Item Variants {0} updated,Prekė Variantai {0} atnaujinama
+apps/erpnext/erpnext/stock/doctype/item/item.py +614,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 +843,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 +854,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
@@ -876,69 +887,72 @@
 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 +728,New Sales Invoice,Nauja pardavimo sąskaita-faktūra
+apps/erpnext/erpnext/accounts/page/pos/pos.js +710,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 +728,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
 DocType: Material Request Item,Lead Time Date,Švinas Laikas Data
 DocType: Guardian,Guardian Name,globėjas Vardas
 DocType: Cheque Print Template,Has Print Format,Ar spausdintos
-apps/erpnext/erpnext/accounts/page/pos/pos.js +86, 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 +109,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 +619,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","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/page/pos/pos.js +75, 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 +613,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing 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 +606,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
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +609,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
 DocType: Purchase Invoice Item,Purchase Order Item,Pirkimui užsakyti Elementą
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +130,Indirect Income,netiesioginė pajamos
 DocType: Cheque Print Template,Date Settings,data Nustatymai
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,variantiškumas
 ,Company Name,Įmonės pavadinimas
 DocType: SMS Center,Total Message(s),Bendras pranešimas (-ai)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +810,Select Item for Transfer,Pasirinkite punktas perkelti
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +789,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.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Leisti vartotojui redaguoti kainoraštį Balsuok sandoriuose
 DocType: Pricing Rule,Max Qty,Maksimalus Kiekis
-DocType: Student Applicant,Father's Name,Tėvo vardas
 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 +105,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
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +686,All items have already been transferred for this Production Order.,Visos prekės jau buvo pervestos šios produkcijos įsakymu.
+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ą
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +694,All items have already been transferred for this Production Order.,Visos prekės jau buvo pervestos šios produkcijos įsakymu.
 DocType: Process Payroll,Select Payroll Year and Month,Pasirinkite Darbo užmokesčio metai ir mėnuo
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,Meter,matuoklis
 DocType: Workstation,Electricity Cost,elektros kaina
 DocType: HR Settings,Don't send Employee Birthday Reminders,Nesiųskite Darbuotojų Gimimo diena Priminimai
-DocType: Opportunity,Walk In,įeiti
 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 +12,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: Timesheet Detail,Bill,sąskaita
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,White,baltas
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,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
 DocType: SMS Center,All Lead (Open),Visi švinas (Atviras)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +228,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})
+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 +731,Make ,padaryti
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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."
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Mano krepšelis
-apps/erpnext/erpnext/controllers/selling_controller.py +154,Order Type must be one of {0},Pavedimo tipas turi būti vienas iš {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Pavedimo tipas turi būti vienas iš {0}
 DocType: Lead,Next Contact Date,Kitas Kontaktinė data
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,atidarymo Kiekis
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +393,Please enter Account for Change Amount,Prašome įvesti sąskaitą pokyčio sumą
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,Please enter Account for Change Amount,Prašome įvesti sąskaitą pokyčio sumą
 DocType: Student Batch,Student Batch Name,Studentų Serija Vardas
 DocType: Holiday List,Holiday List Name,Atostogų sąrašas Vardas
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js +8,Schedule Course,Tvarkaraštis Kurso
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Stock Options,Akcijų pasirinkimai
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Akcijų pasirinkimai
 DocType: Journal Entry Account,Expense Claim,Kompensuojamos Pretenzija
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +211,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 +237,Qty for {0},Kiekis dėl {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +212,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 +238,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
@@ -947,9 +961,9 @@
 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/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,"Pašalinti elementai, be jokių kiekio ar vertės pokyčius."
+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 +635,Attribute table is mandatory,Įgūdis lentelė yra privalomi
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Įgūdis lentelė yra privalomi
 DocType: Production Planning Tool,Get Sales Orders,Gauk pardavimo užsakymus
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{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
@@ -974,7 +988,7 @@
 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/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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Serijos Nr {0} yra pagal priežiūros sutartį net iki {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +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
@@ -986,7 +1000,7 @@
 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/controllers/selling_controller.py +231,Sales Order {0} is {1},Pardavimų užsakymų {0} yra {1}
+apps/erpnext/erpnext/controllers/selling_controller.py +232,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
 DocType: Packing Slip,Net Weight UOM,Grynasis svoris UOM
@@ -996,25 +1010,24 @@
 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
 DocType: Sales Person,Select company name first.,Pasirinkite įmonės pavadinimas pirmas.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Dr,dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Dr,dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,"Citatos, gautų iš tiekėjų."
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},Norėdami {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Vidutinis amžius
 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/templates/pages/home.html +32,View All Products,Peržiūrėti visus produktus
+apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Peržiūrėti visus produktus
 DocType: Company,Default Currency,Pirminė kainoraščio valiuta
 DocType: Contact,Enter designation of this Contact,Įveskite paskyrimą šio Susisiekite
 DocType: Expense Claim,From Employee,iš darbuotojo
-apps/erpnext/erpnext/controllers/accounts_controller.py +400,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"
+apps/erpnext/erpnext/controllers/accounts_controller.py +403,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/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,ir metai:
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +191,{0} {1} must be submitted,{0} {1} turi būti pateiktas
-DocType: Email Digest,Annual Expense,metinis išlaidų
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,{0} {1} must be submitted,{0} {1} turi būti pateiktas
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +145,Quantity must be less than or equal to {0},Kiekis turi būti mažesnis arba lygus {0}
 DocType: SMS Center,Total Characters,Iš viso Veikėjai
 apps/erpnext/erpnext/controllers/buying_controller.py +156,Please select BOM in BOM field for Item {0},Prašome pasirinkti BOM BOM į lauką punkte {0}
@@ -1025,30 +1038,31 @@
 DocType: Sales Partner,Distributor,skirstytuvas
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Krepšelis Pristatymas taisyklė
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +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 +62,Please set 'Apply Additional Discount On',Prašome nustatyti &quot;Taikyti papildomą nuolaidą On&quot;
+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
 DocType: Global Defaults,Global Defaults,Global Numatytasis
 apps/erpnext/erpnext/projects/doctype/project/project.py +153,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
 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 +327,Capacity Planning Error,Talpa planavimas Klaida
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,Talpa planavimas Klaida
 ,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 +362,Finished Item {0} must be entered for Manufacture type entry,Baigė punktas {0} reikia įvesti Gamyba tipo įrašas
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +367,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
 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 +499,Nothing to request,Nieko prašyti
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +500,Nothing to request,Nieko prašyti
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'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 +73,Management,valdymas
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},Bet debeto ar kredito suma yra reikalingas {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,valdymas
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +55,Either debit or credit amount is required for {0},Bet debeto ar kredito suma yra reikalingas {0}
 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 +161,Blue,mėlynas
+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
@@ -1058,12 +1072,12 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +23,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
 DocType: Stock Settings,Default Item Group,Numatytasis Elementas Grupė
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1374,Do you really want to submit the invoice?,Ar tikrai norite pateikti sąskaitą faktūrą?
+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 +685,Cost Center For Item with Item Code ',Kainuos centras už prekę su Prekės kodas &quot;
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1526,"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 +679,Cost Center For Item with Item Code ',Kainuos centras už prekę su Prekės kodas &quot;
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1550,"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/accounts/doctype/account/account_tree.js +26,"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
@@ -1083,104 +1097,106 @@
 DocType: Payment Reconciliation,Unreconciled Payment Details,Unreconciled Mokėjimo informacija
 DocType: Global Defaults,Current Fiscal Year,Einamuosius fiskalinius metus
 DocType: Global Defaults,Disable Rounded Total,Išjungti Apvalus Iš viso
-DocType: Lead,Call,kvietimas
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +417,'Entries' cannot be empty,&quot;Įrašai&quot; negali būti tuščias
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +418,'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 +214,Fiscal Year {0} not found,Finansiniai metai {0} nerastas
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +221,Fiscal Year {0} not found,Finansiniai metai {0} nerastas
 apps/erpnext/erpnext/config/hr.py +238,Setting up Employees,Įsteigti Darbuotojai
 DocType: Sales Order,SO-,SO
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Prašome pasirinkti prefiksą pirmas
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Please select prefix first,Prašome pasirinkti prefiksą pirmas
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Research,tyrimas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,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 +43,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 +57,View Ledger,Peržiūrėti Ledgeris
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Seniausi
-apps/erpnext/erpnext/stock/doctype/item/item.py +504,"An Item Group exists with same name, please change the item name or rename the item group","Prekę grupė egzistuoja to paties pavadinimo, prašom pakeisti elementą vardą ar pervardyti elementą grupę"
+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/setup/setup_wizard/setup_wizard.py +437,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
 ,Budget Variance Report,Biudžeto Dispersija ataskaita
 DocType: Salary Slip,Gross Pay,Pilna Mokėti
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +90,Row {0}: Activity Type is mandatory.,Eilutės {0}: veiklos rūšis yra privalomas.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +114,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/public/js/controllers/stock_controller.js +40,Accounting Ledger,apskaitos Ledgeris
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,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
 DocType: BOM Item,Item Description,Prekės Aprašymas
+DocType: Student Sibling,Student Sibling,Studentų giminystės
 DocType: Purchase Invoice,Is Recurring,Ar Pasikartojančios
 DocType: Purchase Invoice,Supplied Items,"prekių tiekimu,"
 DocType: Student,STUD.,Stud.
 DocType: Production Order,Qty To Manufacture,Kiekis gaminti
+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/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 +131,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 +175,Valuation Rate required for Item in row {0},"Vertinimo tarifas, kurio reikia už prekę iš eilės {0}"
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,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
 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 +87, to ,į
+apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,į
 DocType: Item,Lead Time in days,Švinas Laikas dienų
 ,Accounts Payable Summary,Mokėtinos sumos Santrauka
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Not authorized to edit frozen Account {0},Neregistruota redaguoti įšaldytą sąskaitą {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,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 +62,Sales Order {0} is not valid,Pardavimų užsakymų {0} negalioja
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Pardavimų užsakymų {0} negalioja
 apps/erpnext/erpnext/setup/doctype/company/company.py +185,"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 +152,Small,mažas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,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}
 ,Invoiced Amount (Exculsive Tax),Sąskaitoje suma (Exculsive Mokesčių)
-DocType: Student Applicant,Mother's / Guardian 1 Email ID,Motinos / globėjas 1-mail ID
 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 +160,Green,žalias
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,žalias
 DocType: Supplier,SUPP-,maitinimo iš tinklo laidas
 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 +57,Contract,sutartis
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,sutartis
 DocType: Email Digest,Add Quote,Pridėti Citata
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +498,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 +503,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 +80,Row {0}: Qty is mandatory,Eilutės {0}: Kiekis yra privalomi
+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 +737,Sync Master Data,Sinchronizavimo Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +719,Sync Master Data,Sinchronizavimo Master Data
 apps/erpnext/erpnext/public/js/setup_wizard.js +283,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
+DocType: Student Applicant,AP,A.
 DocType: Purchase Invoice Item,BOM,BOM
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Tai yra šaknis punktas grupė ir negali būti pakeisti.
+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.
 DocType: Journal Entry Account,Purchase Order,Pirkimo užsakymas
 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 +345,"{0}: Employee email not found, hence email not sent","{0}: Darbuotojų elektroninio pašto nerastas, todėl elektroninių laiškų, nesiunčiamas"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +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
 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 +118,"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/accounts/doctype/sales_invoice/sales_invoice.py +474,Delivery Note {0} is not submitted,Važtaraštis {0} nebus pateiktas
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Delivery Note {0} is not submitted,Važtaraštis {0} nebus pateiktas
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Sub-contracted Item,Prekė {0} turi būti Prekė pagal subrangos sutartis
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,kapitalo įranga
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Kainodaros taisyklė pirmiausia atrenkami remiantis &quot;Taikyti&quot; srityje, kuris gali būti punktas, punktas Grupė ar prekės ženklą."
 DocType: Hub Settings,Seller Website,Pardavėjo Interneto svetainė
 DocType: Item,ITEM-,item-
-apps/erpnext/erpnext/controllers/selling_controller.py +147,Total allocated percentage for sales team should be 100,Iš viso skyrė procentas pardavimų vadybininkas turi būti 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +110,Production Order status is {0},Gamybos Užsakymo statusas yra {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Iš viso skyrė procentas pardavimų vadybininkas turi būti 100
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Gamybos Užsakymo statusas yra {0}
 DocType: Appraisal Goal,Goal,Tikslas
 DocType: Sales Invoice Item,Edit Description,Redaguoti Aprašymas
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +757,For Supplier,tiekėjas
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +723,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
@@ -1196,10 +1212,11 @@
 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
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Siųskite Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +445,BOM {0} does not belong to Item {1},BOM {0} nepriklauso punkte {1}
 DocType: Sales Partner,Target Distribution,Tikslinė pasiskirstymas
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1667,Deafault warehouse is required for selected item,Deafault sandėlis reikalingas pasirinkto elemento
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Deafault warehouse is required for selected item,Deafault sandėlis reikalingas pasirinkto elemento
 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
@@ -1208,23 +1225,23 @@
 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 +110,Hardware,techninė įranga
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,techninė įranga
 DocType: Sales Order,Recurring Upto,pasikartojančios upto
 DocType: Attendance,HR Manager,Žmogiškųjų išteklių vadybininkas
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,"Prašome pasirinkti įmonę,"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Privilege Leave,privilegija atostogos
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,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 +79,You need to enable Shopping Cart,Jums reikia įgalinti Prekių krepšelis
 DocType: Payment Entry,Writeoff,Nusirašinėti
 DocType: Appraisal Template Goal,Appraisal Template Goal,Vertinimas Šablonas tikslas
-DocType: Salary Slip,Earning,Pelningiausi
+DocType: Salary Component,Earning,Pelningiausi
 DocType: Purchase Invoice,Party Account Currency,Šalis paskyra Valiuta
 ,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 +171,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 +174,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_data.py +358,Food,maistas
+apps/erpnext/erpnext/demo/setup/setup_data.py +301,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/course_schedule/course_schedule.js +103,Mark Attendence,Pažymėti Attendence
@@ -1258,12 +1275,12 @@
 DocType: Sales Order Item,Planned Quantity,planuojamas kiekis
 DocType: Purchase Invoice Item,Item Tax Amount,Prekė Mokesčių suma
 DocType: Item,Maintain Stock,išlaikyti Stock
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +209,Stock Entries already created for Production Order ,Akcijų įrašai jau sukurtos gamybos ordino
+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
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,Grynasis pokytis ilgalaikio turto
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Palikite tuščią, jei laikomas visų pavadinimų"
-apps/erpnext/erpnext/controllers/accounts_controller.py +620,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 +238,Max: {0},Max: {0}
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +15,From Datetime,nuo datetime
+apps/erpnext/erpnext/controllers/accounts_controller.py +623,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 +239,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 +153,"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."
@@ -1271,8 +1288,8 @@
 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 +552,cannot be greater than 100,negali būti didesnis nei 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +680,Item {0} is not a stock Item,Prekė {0} nėra sandėlyje punktas
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +546,cannot be greater than 100,negali būti didesnis nei 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,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
@@ -1286,10 +1303,9 @@
 DocType: GL Entry,GL Entry,GL įrašas
 DocType: HR Settings,Employee Settings,darbuotojų Nustatymai
 ,Batch-Wise Balance History,Serija-Išminčius Balansas istorija
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,To Do List
 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 +61,Apprentice,mokinys
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +102,Negative Quantity is not allowed,Neigiama Kiekis neleidžiama
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,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 +152,Employee cannot report to himself.,Darbuotojas negali pranešti pats.
@@ -1310,15 +1326,14 @@
 DocType: Asset,Asset Name,"turto pavadinimas,"
 DocType: Shipping Rule Condition,To Value,Vertinti
 DocType: Asset Movement,Stock Manager,akcijų direktorius
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +141,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 +719,Packing Slip,Pakavimo lapelis
+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 +713,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/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,Prašymas citata gali būti patekti paspaudę šią nuorodą:
 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 +81,Analyst,analitikas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,analitikas
 DocType: Item,Inventory,inventorius
 DocType: Item,Sales Details,pardavimų detalės
 DocType: Quality Inspection,QI-,QI-
@@ -1326,7 +1341,7 @@
 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 +103,Government,vyriausybė
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,vyriausybė
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,institutas Vardas
 apps/erpnext/erpnext/config/stock.py +289,Item Variants,Prekė Variantai
 DocType: Company,Services,Paslaugos
@@ -1342,6 +1357,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,Financial Year Start Date,Finansinių metų pradžios data
 DocType: POS Profile,Apply Discount,taikyti nuolaidą
 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
 DocType: Program Course,Program Course,programos kursas
@@ -1382,12 +1398,12 @@
 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ė
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +110,Accounting Entry for {0} can only be made in currency: {1},Apskaitos įrašas už {0} galima tik valiuta: {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Apskaitos įrašas už {0} galima tik valiuta: {1}
 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
 DocType: Shopping Cart Settings,Payment Success URL,Mokėjimo Sėkmės adresas
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +78,Row # {0}: Returned Item {1} does not exists in {2} {3},Eilutės # {0}: grąžinama prekė {1} nėra egzistuoja {2} {3}
+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
@@ -1396,40 +1412,39 @@
 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/stock/doctype/stock_entry/stock_entry.py +339,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/stock/doctype/stock_entry/stock_entry.py +344,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 +545,Manufacturing Quantity is mandatory,Gamyba Kiekis yra privalomi
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Gamyba Kiekis yra privalomi
 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 +71,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 +162,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/projects/doctype/timesheet/timesheet.py +186,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
 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 +130,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 +137,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
 DocType: Dependent Task,Dependent Task,priklauso nuo darbo
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,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/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 +190,Leave of type {0} cannot be longer than {1},Atostogos tipo {0} negali būti ilgesnis nei {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +197,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
 DocType: SMS Center,Receiver List,imtuvas sąrašas
-apps/erpnext/erpnext/accounts/page/pos/pos.js +921,Search Item,Paieška punktas
+apps/erpnext/erpnext/accounts/page/pos/pos.js +910,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 +546,Already completed,jau baigtas
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +22,Payment Request already exists {0},Mokėjimo prašymas jau yra {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +550,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 +241,Quantity must not be more than {0},Kiekis turi būti ne daugiau kaip {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Quantity must not be more than {0},Kiekis turi būti ne daugiau kaip {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +76,Previous Financial Year is not closed,Praėję finansiniai metai yra neuždarytas
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +44,Age (Days),Amžius (dienomis)
 DocType: Quotation Item,Quotation Item,citata punktas
@@ -1446,7 +1461,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +221,Purchase Receipt {0} is not submitted,Pirkimo kvito {0} nebus pateiktas
 DocType: Company,Default Payable Account,Numatytasis Mokėtina paskyra
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Nustatymai internetinėje krepšelį pavyzdžiui, laivybos taisykles, kainoraštį ir tt"
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +83,{0}% Billed,{0}% Įvardintas
+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
@@ -1458,12 +1473,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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/schools/doctype/fees/fees.js +22,Collect,rinkti
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,rinkti
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,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 +225,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
-DocType: Payment Reconciliation,Payments,Mokėjimai
 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
@@ -1475,7 +1489,7 @@
 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 +9,Procurement,Viešųjų pirkimų
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,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/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
 ,Lead Details,Švino detalės
 DocType: Purchase Invoice,End date of current invoice's period,Pabaigos data einamųjų sąskaitos faktūros laikotarpį
@@ -1500,7 +1514,7 @@
 DocType: Purchase Invoice,Additional Discount,Papildoma nuolaida
 DocType: Selling Settings,Selling Settings,parduoda Nustatymai
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Dabar Aukcionai
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +97,Please specify either Quantity or Valuation Rate or both,Prašome nurodyti arba kiekis ar Vertinimo norma arba abu
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,Prašome nurodyti arba kiekis ar Vertinimo norma arba abu
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +13,Fulfillment,įvykdymas
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Įmonės, mėnuo ir finansiniai metai yra privalomas"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,rinkodaros išlaidos
@@ -1521,14 +1535,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,ERPNext sąranka baigta
 DocType: Item,Weightage,weightage
 DocType: Packing Slip,PS-,PS
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +93,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Klientų grupė egzistuoja to paties pavadinimo prašome pakeisti kliento vardą arba pervardyti klientų grupei
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +126,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
 DocType: Stock Entry,Material Receipt,medžiaga gavimas
 DocType: Homepage,Products,produktai
 DocType: Announcement,Instructor,Instruktorius
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},Šalis rūšis ir šalis yra reikalingas gautinos / mokėtinos sąskaitos {0}
 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
@@ -1539,7 +1552,7 @@
 ,Item-wise Sales Register,Prekė išmintingas Pardavimų Registruotis
 DocType: Asset,Gross Purchase Amount,Pilna Pirkimo suma
 DocType: Asset,Depreciation Method,nusidėvėjimo metodas
-apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Offline,Atsijungęs
+apps/erpnext/erpnext/accounts/page/pos/pos.js +686,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
@@ -1557,25 +1570,27 @@
 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ą
 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 +858,Make Purchase Order,Padaryti pirkinių užsakymą
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +852,Make Purchase Order,Padaryti pirkinių užsakymą
 DocType: SMS Center,Send To,siųsti
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,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 +148,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
 DocType: Stock Reconciliation,Stock Reconciliation,akcijų suderinimas
 DocType: Territory,Territory Name,teritorija Vardas
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +172,Work-in-Progress Warehouse is required before Submit,Darbas-in-progress sandėlio reikalingas prieš Pateikti
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,Work-in-Progress Warehouse is required before Submit,Darbas-in-progress sandėlio reikalingas prieš Pateikti
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Kandidatui į darbą.
 DocType: Purchase Order Item,Warehouse and Reference,Sandėliavimo ir nuoroda
 DocType: Supplier,Statutory info and other general information about your Supplier,Teisės aktų informacijos ir kita bendra informacija apie jūsų tiekėjas
-apps/erpnext/erpnext/hooks.py +88,Addresses,adresai
-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/payment_entry/payment_entry.py +212,Against Journal Entry {0} does not have any unmatched {1} entry,Prieš leidinyje Įėjimo {0} neturi neprilygstamą {1} įrašą
+apps/erpnext/erpnext/hooks.py +95,Addresses,adresai
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +215,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
 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ų)
 DocType: Sales Order,To Deliver and Bill,Pristatyti ir Bill
@@ -1583,11 +1598,10 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,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 +731,Payment,mokėjimas
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,Payment,mokėjimas
 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: Pricing Rule,Brand,markė
 DocType: Course,Course Abbreviation,Žinoma santrumpa
 DocType: Item,Will also apply for variants,Bus taikoma variantų
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +142,"Asset cannot be cancelled, as it is already {0}","Turto negali būti atšauktas, nes jis jau yra {0}"
@@ -1599,7 +1613,7 @@
 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."
 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 +85,Associate,Bendradarbis
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,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
@@ -1607,7 +1621,7 @@
 DocType: Production Planning Tool,Material Requests,Medžiaga Prašymai
 DocType: Warranty Claim,Issue Date,Išdavimo data
 DocType: Activity Cost,Activity Cost,veiklos sąnaudos
-DocType: Timesheet Detail,Timesheet Detail,Lapą detalės
+DocType: Sales Invoice Timesheet,Timesheet Detail,Lapą detalės
 DocType: Purchase Receipt Item Supplied,Consumed Qty,suvartoti Kiekis
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekomunikacijos
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Nurodo, kad paketas yra šio pristatymo (tik projekto) dalis"
@@ -1630,6 +1644,7 @@
 DocType: Production Plan Material Request,Material Request Date,Medžiaga Prašymas data
 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
 DocType: Item,Has Variants,turi variantams
 DocType: Monthly Distribution,Name of the Monthly Distribution,Pavadinimas Mėnesio pasiskirstymas
 DocType: Sales Person,Parent Sales Person,Tėvų pardavimų asmuo
@@ -1642,30 +1657,31 @@
 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 +44,"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/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."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +502,Error: {0} &gt; {1},Klaida: {0}&gt; {1}
 DocType: Item,Is Sales Item,Ar Pardavimų punktas
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Prekė Grupė medis
 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ą."
 DocType: Naming Series,Current Value,Dabartinė vertė
-apps/erpnext/erpnext/controllers/accounts_controller.py +235,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/controllers/accounts_controller.py +238,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ė
 DocType: Delivery Note Item,Against Sales Order,Prieš Pardavimų ordino
 ,Serial No Status,Serijos Nr Būsena
 DocType: Payment Entry Reference,Outstanding,neišspręstas
 ,Daily Timesheet Summary,Dienos Lapą santrauka
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +458,Item table can not be blank,Punkto lentelėje negali būti tuščias
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +443,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 +5,This is based on stock movement. See {0} for details,Tai remiantis akcijų judėjimo. Žiūrėti {0} daugiau informacijos
 DocType: Pricing Rule,Selling,pardavimas
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +341,Amount {0} {1} deducted against {2},Suma {0} {1} išskaičiuota nuo {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +344,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
@@ -1680,8 +1696,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +144,Cannot refer row number greater than or equal to current row number for this Charge type,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 +159,Red,raudonas
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Prašome spausti &quot;Generuoti grafiką&quot; parsiųsti Serijos Nr pridėta punkte {0}
+apps/erpnext/erpnext/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
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Bazinė suma (Įmonės valiuta)
@@ -1689,7 +1705,7 @@
 DocType: Installation Note,Installation Time,montavimo laikas
 DocType: Sales Invoice,Accounting Details,apskaitos informacija
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,Ištrinti visus sandorių šiai bendrovei
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +187,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Eilutės # {0}: Operacija {1} nėra baigtas {2} Kiekis gatavų prekių gamybos Užsakyti # {3}. Atnaujinkite veikimo būseną per Time Įrašai
+apps/erpnext/erpnext/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,Eilutės # {0}: Operacija {1} nėra baigtas {2} Kiekis gatavų prekių gamybos Užsakyti # {3}. Atnaujinkite veikimo būseną per Time Įrašai
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,investicijos
 DocType: Issue,Resolution Details,geba detalės
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,asignavimai
@@ -1725,16 +1741,17 @@
 DocType: Bank Reconciliation Detail,Against Account,prieš sąskaita
 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}
 DocType: Delivery Note,Excise Page Number,Akcizo puslapio numeris
 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}
 ,Maintenance Schedules,priežiūros Tvarkaraščiai
 DocType: Task,Actual End Date (via Time Sheet),Tikrasis Pabaigos data (per Time lapas)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Amount {0} {1} against {2} {3},Suma {0} {1} prieš {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +339,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 +138,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 +295,Debit To account must be a Receivable account,Debeto sąskaitą turi būti Gautinos sąskaitos
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,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
 DocType: Purchase Invoice Item,Conversion Factor,konversijos koeficientas
@@ -1742,10 +1759,10 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +137,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"
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +90,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Iš viso skiriami lapai {0} negali būti mažesnė nei jau patvirtintų lapų {1} laikotarpiu
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +93,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 +22,Enter Paid Amount,Įveskite sumokėta suma
+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
@@ -1755,13 +1772,15 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,laiko apskaitos žiniaraščiai
 DocType: HR Settings,HR Settings,HR Nustatymai
 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 +524,"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."
+apps/erpnext/erpnext/controllers/accounts_controller.py +527,"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 +249,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
 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/stock/get_item_details.py +123,Please specify Company,Prašome nurodyti Company
 ,Customer Acquisition and Loyalty,Klientų įsigijimas ir lojalumo
@@ -1772,17 +1791,19 @@
 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 +183,Closing (Opening + Totals),Uždarymo (atidarymas + suma)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),Uždarymo (atidarymas + suma)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,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/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
-apps/erpnext/erpnext/controllers/accounts_controller.py +272,Account {0} is invalid. Account Currency must be {1},Sąskaita {0} yra neteisinga. Sąskaitos valiuta turi būti {1}
+DocType: Email Digest,Pending Sales Orders,Kol pardavimo užsakymus
+apps/erpnext/erpnext/controllers/accounts_controller.py +275,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 +956,"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 Slip,Deduction,Atskaita
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +87,Row {0}: From Time and To Time is mandatory.,Eilutės {0}: Nuo Laikas ir laiko yra privalomas.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +969,"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 +111,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 +262,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 +7,Please enter Employee Id of this sales person,Prašome įvesti darbuotojo ID Šio pardavimo asmuo
@@ -1790,62 +1811,63 @@
 DocType: Project,% Tasks Completed,% Uždaviniai Įgyvendintas
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,Skirtumas suma turi būti lygi nuliui
 DocType: Project,Gross Margin,bendroji marža
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +194,Please enter Production Item first,Prašome įvesti Gamybos Elementą pirmas
+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
-apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,citata
+apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,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 +149,Cost Updated,kaina Atnaujinta
 DocType: Employee,Date of Birth,Gimimo data
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +86,Item {0} has already been returned,Prekė {0} jau grįžo
+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}
+DocType: Student Admission,Eligibility,Tinkamumas
 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 +177,Job Description,Darbo aprašymas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,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 +126,"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 +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Specialūs simboliai, išskyrus &quot;-&quot;. &quot;,&quot; # &quot;, ir &quot;/&quot; neleidžiama pavadinimų seriją"
 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ąžą."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +24,Welcome to POS: Create your POS Profile,Sveiki atvykę į POS: Sukurti savo POS profilis
 DocType: Expense Claim,Approver,Tvirtintojas
 ,SO Qty,SO Kiekis
+DocType: Guardian,Work Address,Darbovietės adresas
 DocType: Appraisal,Calculate Total Score,Apskaičiuokite bendras rezultatas
 DocType: Request for Quotation,Manufacturing Manager,gamybos direktorius
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serijos Nr {0} yra garantija net iki {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +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 +74,Shipments,vežimas
+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
 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 +153,Row # ,eilutės #
+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 +156,Get From,Gauti iš
+apps/erpnext/erpnext/public/js/utils.js +167,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 +167,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 +416,"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"
+apps/erpnext/erpnext/controllers/accounts_controller.py +419,"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
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} is disabled,Vartotojas {0} yra išjungtas
 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ė ...
 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 +171,"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 +346,{0} is mandatory for Item {1},{0} yra privalomas punktas {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,{0} is mandatory for Item {1},{0} yra privalomas punktas {1}
 DocType: Currency Exchange,From Currency,nuo valiuta
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Prašome pasirinkti skirtos sumos, sąskaitos faktūros tipas ir sąskaitos numerį atleast vienoje eilėje"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,Kaina New pirkimas
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},Pardavimų užsakymų reikalingas punktas {0}
 DocType: Purchase Invoice Item,Rate (Company Currency),Norma (Įmonės valiuta)
-apps/erpnext/erpnext/demo/setup_data.py +360,Others,kiti
+DocType: Student Guardian,Others,kiti
 DocType: Payment Entry,Unallocated Amount,Nepaskirstytas kiekis
 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
@@ -1865,17 +1887,16 @@
 apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,Serijinis Inventorius
 DocType: Activity Type,Default Billing Rate,Numatytasis Atsiskaitymo Balsuok
 DocType: Sales Invoice,Total Billing Amount,Iš viso Atsiskaitymo suma
-apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +54,Receivable Account,gautinos sąskaitos
-apps/erpnext/erpnext/controllers/accounts_controller.py +546,Row #{0}: Asset {1} is already {2},Eilutės # {0}: Turto {1} jau yra {2}
+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 +549,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 +79,CEO,Vadovas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,Vadovas
 DocType: Expense Claim Detail,Expense Claim Detail,Kompensuojamos Pretenzija detalės
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +808,Please select correct account,Prašome pasirinkti tinkamą sąskaitą
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +809,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ė
-DocType: Purchase Invoice Item,Page Break,puslapio lūžį
 DocType: Production Order Operation,Pending,kol
 DocType: Course,Course Name,Kurso pavadinimas
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Vartotojai, kurie gali patvirtinti konkretaus darbuotojo atostogų prašymus"
@@ -1884,14 +1905,15 @@
 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 +54,Full-time,Pilnas laikas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,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: Student,Guardians,globėjai
 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 +289,Debit To is required,Debeto reikalingas
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +321,Debit To is required,Debeto reikalingas
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Pirkimo Kainų sąrašas
 DocType: Offer Letter Term,Offer Term,Siūlau terminas
 DocType: Quality Inspection,Quality Manager,Kokybės vadybininkas
@@ -1899,6 +1921,7 @@
 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/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
@@ -1909,18 +1932,17 @@
 DocType: Production Order Operation,Completed Qty,užbaigtas Kiekis
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"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 +273,Price List {0} is disabled,Kainų sąrašas {0} yra išjungtas
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +99,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/projects/doctype/timesheet/timesheet.py +123,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
 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}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Dabartinis vertinimas Balsuok
 DocType: Item,Customer Item Codes,Klientų punktas kodai
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,Valiutų Pelnas / nuostolis
 DocType: Opportunity,Lost Reason,Pamiršote Priežastis
-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/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/purchase_receipt/purchase_receipt.py +378,All items have already been invoiced,Visos prekės jau išrašyta sąskaita
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +379,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
@@ -1936,18 +1958,19 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Jūsų klientai
 apps/erpnext/erpnext/projects/doctype/project/project.py +141,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/job_opening.html +19,Apply Now,taikyti Dabar
+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."
 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
-apps/erpnext/erpnext/utilities/doctype/address/address.py +164,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: Fee Structure,Fee Structure,mokestis struktūra
 DocType: Timesheet Detail,Costing Amount,Sąnaudų dydis
+DocType: Student Admission,Application Fee,Paraiškos mokestis
 DocType: Process Payroll,Submit Salary Slip,Pateikti darbo užmokestį
-apps/erpnext/erpnext/controllers/selling_controller.py +161,Maxiumm discount for Item {0} is {1}%,Maxiumm nuolaida Prekės {0} yra {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,Maxiumm nuolaida Prekės {0} yra {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Importas į taros
 DocType: Sales Partner,Address & Contacts,Adresas ir kontaktai
 DocType: SMS Log,Sender Name,siuntėjas Vardas
@@ -1972,21 +1995,21 @@
 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_data.py +361,Travel,Kelionė
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +155,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 +304,Travel,Kelionė
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +167,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 +23,Update Cost,Atnaujinti Kaina
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Atnaujinti Kaina
 DocType: Item Reorder,Item Reorder,Prekė Pertvarkyti
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +36,Show Salary Slip,Rodyti Pajamos Kuponas
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +748,Transfer Material,perduoti medžiagą
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +53,Show Salary Slip,Rodyti Pajamos Kuponas
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +166,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 +923,Please set recurring after saving,Prašome nustatyti pasikartojančių po taupymo
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +646,Select change amount account,Pasirinkite Keisti suma sąskaita
+apps/erpnext/erpnext/public/js/controllers/transaction.js +914,Please set recurring after saving,Prašome nustatyti pasikartojančių po taupymo
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +703,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
@@ -1998,31 +2021,32 @@
 DocType: Quality Inspection,Verified By,Patvirtinta
 DocType: Address,Subsidiary,filialas
 apps/erpnext/erpnext/setup/doctype/company/company.py +64,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","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: Quality Inspection,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 +33,Traceability,atsekamumas
 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 +352,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}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,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: Appraisal,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 +217,{0} {1} is fully billed,{0} {1} yra pilnai mokami
 DocType: Workstation Working Hour,End Time,pabaigos laikas
 DocType: Payment Entry,Payment Deductions or Loss,Apmokėjimo Atskaitymai arba nuostolis
-apps/erpnext/erpnext/config/schools.py +100,LMS,LMS
+apps/erpnext/erpnext/config/schools.py +104,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/config/crm.py +6,Sales Pipeline,pardavimų vamzdynų
 DocType: Student Batch Student,Student Batch Student,Studentų Serija studentas
-DocType: Sales Invoice,Mass Mailing,Mišios Pašto
+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 +199,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/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 +297,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 +111,Pharmaceutical,Farmacijos
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +309,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/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
@@ -2037,27 +2061,28 @@
 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 +814,Please specify Company to proceed,Prašome nurodyti Bendrovei toliau
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +793,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 +44,Compensatory Off,kompensacinė Išjungtas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,kompensacinė Išjungtas
 DocType: Quality Inspection Reading,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."
 DocType: Room,Room Number,Kambario numeris
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Neteisingas nuoroda {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +161,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) negali būti didesnis nei planuota quanitity ({2}) Gamybos Užsakyti {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +162,{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 +217,Raw Materials cannot be blank.,Žaliavos negali būti tuščias.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,"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 +460,Quick Journal Entry,Greita leidinys įrašas
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +111,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/accounts/doctype/sales_invoice/sales_invoice.py +441,"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 +450,Quick Journal Entry,Greita leidinys įrašas
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +103,You can not change rate if BOM mentioned agianst any item,"Jūs negalite keisti greitį, jei BOM minėta agianst bet kurį elementą"
 DocType: Employee,Previous Work Experience,Ankstesnis Darbo patirtis
 DocType: Stock Entry,For Quantity,dėl Kiekis
 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 +214,{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ą
 ,Minutes to First Response for Issues,Minučių iki Pirmosios atsakas klausimai
 DocType: Purchase Invoice,Terms and Conditions1,Taisyklės ir sąlygų1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,"Instituto pavadinimas, kurį nustatote šią sistemą."
@@ -2066,16 +2091,17 @@
 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 +398,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"
 ,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 +739,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/stock/doctype/stock_entry/stock_entry.py +747,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
 DocType: Fiscal Year,Year End Date,Dienos iki metų pabaigos
 DocType: Task Depends On,Task Depends On,Užduotis Priklauso nuo
-DocType: Lead,Opportunity,galimybė
+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
@@ -2088,7 +2114,7 @@
 DocType: Student,Joining Date,Prisijungimas data
 ,Employees working on a holiday,"Darbuotojai, dirbantys atostogų"
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Pažymėti dabartis
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},Priežiūra pradžios data negali būti iki pristatymo datos Serijos Nr {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},Priežiūra pradžios data negali būti iki pristatymo datos Serijos Nr {0}
 DocType: Production Order,Actual End Date,Tikrasis Pabaigos data
 DocType: Purchase Invoice,PINV-,PINV-
 DocType: Authorization Rule,Applicable To (Role),Taikoma (vaidmenų)
@@ -2103,7 +2129,7 @@
 DocType: SMS Log,No of Requested SMS,Ne prašomosios SMS
 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 +729,Please supply the specified items at the best possible rates,Prašome pateikti nurodytus elementus ne į geriausias įmanomas normas
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +695,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 +117,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-
@@ -2112,7 +2138,7 @@
 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 +14,This is an example website auto-generated from ERPNext,"Tai yra pavyzdys, svetainė Automatiškai sugeneruota iš ERPNext"
+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
 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.
 
@@ -2139,13 +2165,14 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd Kiekis
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +54,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 +103,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 +504,Stock Entry {0} is not submitted,"Atsargų, {0} nebus pateiktas"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,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 +505,Stock Entry {0} is not submitted,"Atsargų, {0} nebus pateiktas"
 DocType: Payment Reconciliation,Bank / Cash Account,Bankas / Pinigų paskyra
 DocType: Tax Rule,Billing City,atsiskaitymo Miestas
 DocType: Salary Component Account,Salary Component Account,Pajamos Sudėtinės paskyra
 DocType: Global Defaults,Hide Currency Symbol,Slėpti valiutos simbolį
 apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card","pvz bankas, grynieji pinigai, kreditinės kortelės"
+DocType: Lead Source,Source Name,šaltinis Vardas
 DocType: Journal Entry,Credit Note,kredito Pastaba
 DocType: Warranty Claim,Service Address,Paslaugų Adresas
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furnitures and Fixtures,Baldai ir Šviestuvai
@@ -2157,6 +2184,7 @@
 DocType: Opportunity,Customer / Lead Name,Klientas / Švino Vardas
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +89,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/controllers/trends.py +19,Total(Qty),Iš viso (Kiekis)
 DocType: Sales Invoice,This Document,Šis dokumentas
@@ -2168,15 +2196,15 @@
 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 +176,Organization branch master.,Organizacija filialas meistras.
-apps/erpnext/erpnext/controllers/accounts_controller.py +273, or ,arba
+apps/erpnext/erpnext/controllers/accounts_controller.py +276, 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ą
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,Komunalinė sąnaudos
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90 Virš
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +203,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Eilutės # {0}: leidinys Įėjimo {1} neturi paskyros {2} arba jau lyginami su kito kuponą
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +206,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 +90,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 +93,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
@@ -2204,8 +2232,8 @@
 DocType: Product Bundle,Parent Item,tėvų punktas
 DocType: Account,Account Type,Paskyros tipas
 DocType: Delivery Note,DN-RET-,DN-RET-
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +115,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 +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Priežiūra Tvarkaraštis negeneruojama visų daiktų. Prašome spausti &quot;Generuoti grafiką&quot;
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +118,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 +163,"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"
@@ -2217,13 +2245,13 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +32,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 +748,Delivery,pristatymas
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +742,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
 DocType: Payment Entry,Total Allocated Amount,Visos skirtos sumos
 DocType: Item Reorder,Material Request Type,Medžiaga Prašymas tipas
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +82,Row {0}: UOM Conversion Factor is mandatory,Eilutės {0}: UOM konversijos faktorius yra privalomas
+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
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Bon #
@@ -2234,13 +2262,13 @@
 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 +90,Head of Marketing and Sales,Vadovas rinkodarai ir pardavimams
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Pajamų mokestis
+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 +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.
 DocType: Item Supplier,Item Supplier,Prekė Tiekėjas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +403,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 +770,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 +397,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 +764,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"
@@ -2252,28 +2280,29 @@
 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 +100,Issues,Problemos
+apps/erpnext/erpnext/hooks.py +109,Issues,Problemos
 apps/erpnext/erpnext/controllers/status_updater.py +13,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
 ,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
 DocType: Supplier,Billing Currency,atsiskaitymo Valiuta
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Large,Labai didelis
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Extra Large,Labai didelis
 ,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 +507,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 +107,Local,vietinis
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +508,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/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 +154,Large,Didelis
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Large,Didelis
 DocType: Homepage Featured Product,Homepage Featured Product,Pagrindinis puslapis Teminiai Prekė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 +225,Total {0} ({1}),Viso {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +224,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
@@ -2319,9 +2348,9 @@
 DocType: Attendance,Leave Type,atostogos tipas
 apps/erpnext/erpnext/controllers/stock_controller.py +173,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/hr/doctype/salary_slip/salary_slip.py +79,Name error: {0},Vardas klaida: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +90,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 +178,{0} {1} does not associated with {2} {3},{0} {1} nėra susijęs su {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +181,{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)
 DocType: Warehouse,Parent Warehouse,tėvų sandėlis
@@ -2340,7 +2369,7 @@
 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
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,Atleast vienas punktas turi būti įrašomas neigiamas kiekio grąžinimo dokumentą
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Atleast one item should be entered with negative quantity in return document,Atleast vienas punktas turi būti įrašomas neigiamas kiekio grąžinimo dokumentą
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operacija {0} ilgiau nei bet kokiomis darbo valandų darbo vietos {1}, suskaidyti operaciją į kelių operacijų"
 ,Requested,prašoma
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +83,No Remarks,nėra Pastabos
@@ -2352,46 +2381,46 @@
 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/stock/doctype/purchase_receipt/purchase_receipt.py +98,Quality Inspection required for Item {0},Kokybės inspekcija privalo už prekę {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,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
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Tvarkyti Teritorija medį.
 DocType: Journal Entry Account,Sales Invoice,pardavimų sąskaita faktūra
 DocType: Journal Entry Account,Party Balance,šalis balansas
-apps/erpnext/erpnext/accounts/page/pos/pos.js +475,Please select Apply Discount On,Prašome pasirinkti Taikyti nuolaidą
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +92,Salary Slip Created,Pajamos Kuponas Sukurta
+apps/erpnext/erpnext/accounts/page/pos/pos.js +464,Please select Apply Discount On,Prašome pasirinkti Taikyti nuolaidą
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +95,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
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,Nuolaida procentas gali būti taikomas bet prieš kainoraštis arba visų kainų sąrašas.
 DocType: Purchase Invoice,Half-yearly,Kartą per pusmetį
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +384,Accounting Entry for Stock,Apskaitos įrašas už Sandėlyje
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +387,Accounting Entry for Stock,Apskaitos įrašas už Sandėlyje
 DocType: Sales Invoice,Sales Team1,pardavimų team1
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,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 +96,Row {0}: Completed Qty must be greater than zero.,Eilutės {0}: baigė Kiekis turi būti didesnė už nulį.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +120,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 +88,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/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
 DocType: Item Group,Show this slideshow at the top of the page,Parodyti šią demonstraciją prie puslapio viršuje
 DocType: BOM,Item UOM,Prekė UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),"Mokesčių suma, nuolaidos suma (Įmonės valiuta)"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +147,Target warehouse is mandatory for row {0},Tikslinė sandėlis yra privalomas eilės {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +141,Target warehouse is mandatory for row {0},Tikslinė sandėlis yra privalomas eilės {0}
 DocType: Cheque Print Template,Primary Settings,pirminiai nustatymai
 DocType: Purchase Invoice,Select Supplier Address,Pasirinkite Tiekėjas Adresas
 DocType: Quality Inspection,Quality Inspection,kokybės inspekcija
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Extra Small,Papildomas Mažas
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +194,Account {0} is frozen,Sąskaita {0} yra sušaldyti
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Papildomas Mažas
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +690,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 +197,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 +606,Can only make payment against unbilled {0},Gali tik sumokėti prieš Neapmokestinama {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +126,Commission rate cannot be greater than 100,Komisinis mokestis gali būti ne didesnė kaip 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +609,Can only make payment against unbilled {0},Gali tik sumokėti prieš Neapmokestinama {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,Komisinis mokestis gali būti ne didesnė kaip 100
 DocType: Stock Entry,Subcontract,subrangos sutartys
 apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,Prašome įvesti {0} pirmas
 DocType: Production Order Operation,Actual End Time,Tikrasis Pabaigos laikas
@@ -2402,30 +2431,30 @@
 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 +158,Colour,Spalva
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,Spalva
 DocType: Maintenance Visit,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
 DocType: Student Log,Academic,akademinis
-apps/erpnext/erpnext/controllers/accounts_controller.py +469,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Iš viso avansas ({0}) prieš ordino {1} negali būti didesnis nei IŠ VISO ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +472,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Iš viso avansas ({0}) prieš ordino {1} negali būti didesnis nei IŠ VISO ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Pasirinkite Mėnesio pasiskirstymas į netolygiai paskirstyti tikslus visoje mėnesius.
 DocType: Purchase Invoice Item,Valuation Rate,Vertinimo Balsuok
+DocType: Stock Reconciliation,SR/,SR /
 apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,Kainų sąrašas Valiuta nepasirinkote
 DocType: Assessment,Results,rezultatai
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +168,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 +175,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: Student Applicant,Father's/ Guardian 2 Email ID,Tėvo / globėjas 2 E-mail ID
 DocType: Maintenance Visit Purpose,Against Document No,Su dokumentų Nr
 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 +228,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 +231,Warehouses with existing transaction can not be converted to group.,Sandėliai su esamais sandoris negali būti konvertuojamos į grupę.
 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 +93,Researcher,tyrėjas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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.
@@ -2437,25 +2466,25 @@
 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"
 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: Sales Invoice,Advertisement,reklama
 DocType: Asset Category Account,Depreciation Expense Account,Nusidėvėjimo sąnaudos paskyra
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Probationary Period,Bandomasis laikotarpis
-apps/erpnext/erpnext/hooks.py +102,Announcements,Skelbimai
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Bandomasis laikotarpis
+apps/erpnext/erpnext/hooks.py +111,Announcements,Skelbimai
 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 +109,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 +16,To Datetime,Norėdami datetime
+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/scheduling_tool/scheduling_tool.py +51,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/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Kol veiklos
+DocType: Accounts Settings,Make Payment via Journal Entry,Atlikti mokėjimą per žurnalo įrašą
+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 +127,Please enter relieving date.,Prašome įvesti malšinančių datą.
-apps/erpnext/erpnext/controllers/trends.py +145,Amt,amt
+apps/erpnext/erpnext/controllers/trends.py +149,Amt,amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,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 +26,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
@@ -2473,14 +2502,15 @@
 apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1},Nepavyko rasti keitimo kursą {0} ir {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Pažymėti Pusė dienos
 DocType: Sales Invoice,Sales Team,Sales Team
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Duplicate entry,pasikartojantis įrašas
+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 +490,[Error],[ERROR]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +484,[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
 apps/erpnext/erpnext/controllers/status_updater.py +175,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ą.
 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
@@ -2496,22 +2526,22 @@
 ,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 +25,All Jobs,Visi Darbai
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,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
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Amount {0} {1} {2} {3},Suma {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Amount {0} {1} {2} {3},Suma {0} {1} {2} {3}
 DocType: Account,Depreciation,amortizacija
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Tiekėjas (-ai)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Darbuotojų dalyvavimas įrankis
 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 +372,Payment Entries {0} are un-linked,Apmokėjimo Įrašai {0} yra JT susietų
+apps/erpnext/erpnext/accounts/utils.py +449,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
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +497,Material Requests {0} created,Medžiaga Prašymai {0} sukūrė
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +498,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.
 DocType: Purchase Invoice,Address and Contact,Adresas ir kontaktai
@@ -2550,7 +2580,7 @@
 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 +848,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 +859,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 +233,Closing (Dr),Uždarymo (dr)
 DocType: Cheque Print Template,Cheque Size,Komunalinės dydis
@@ -2571,7 +2601,8 @@
 ,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.
-apps/erpnext/erpnext/controllers/accounts_controller.py +555,'Update Stock' cannot be checked for fixed asset sale,&quot;Atnaujinti sandėlyje&quot; negali būti patikrinta dėl ilgalaikio turto pardavimo
+DocType: Student Guardian,Father,tėvas
+apps/erpnext/erpnext/controllers/accounts_controller.py +558,'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
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Gaukite atnaujinimus
 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
@@ -2581,15 +2612,15 @@
 DocType: Sales Order,Fully Delivered,pilnai Paskelbta
 DocType: Lead,Lower Income,mažesnes pajamas
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","Sąskaitos galva pagal atsakomybės, kuriame Pelnas / nuostolis bus nubaustas"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +166,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 +238,"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 +81,Purchase Order number required for Item {0},"Pirkimo užsakymo numerį, reikalingą punkto {0}"
+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/purchase_receipt/purchase_receipt.py +82,Purchase Order number required for Item {0},"Pirkimo užsakymo numerį, reikalingą punkto {0}"
 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 +17,Cannot change status as student {0} is linked with student application {1},Nepavyksta pakeisti statusą kaip studentas {0} yra susijęs su studento taikymo {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +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: Timesheet,"List of employee which has ""Salary Slip Based on Timesheet"" is enabled in salary structure.","Sąrašas darbuotojo, kuris turi &quot;darbo užmokestį, grindžiamos apskaitos žiniaraštis&quot; yra įjungtas darbo užmokesčio struktūrą."
 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 +356,Customer {0} does not belong to project {1},Klientų {0} nepriklauso projekto {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,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
 DocType: Sales Order,Customer's Purchase Order,Kliento Užsakymo
 apps/erpnext/erpnext/config/stock.py +107,Serial No and Batch,Serijos Nr paketais
@@ -2601,7 +2632,7 @@
 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/patches/v7_0/create_warehouse_nestedset.py +55,All Warehouses,Visi Sandėliai
+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 +105,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
@@ -2613,10 +2644,10 @@
 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/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Padaryti darbo užmokestį
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +26,Browse BOM,Žmonės BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,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/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 Year,Academic Year,Mokslo metai
+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ų
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,įvertinimas
@@ -2624,12 +2655,12 @@
 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 +197,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 +204,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: Workstation Working Hour,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 +256,Select Quantity,Pasirinkite Kiekis
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +257,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
@@ -2646,6 +2677,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Bet tikslas Kiekis arba planuojama suma yra privalomas.
 apps/erpnext/erpnext/config/projects.py +45,Cost of various activities,Išlaidos įvairiose veiklos
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Nustatymas įvykių {0}, nes pridedamas prie žemiau pardavėjai darbuotojas neturi naudotojo ID {1}"
+DocType: Timesheet,Billing Details,Atsiskaitymo informacija
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +149,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}
 DocType: Item,Inspection Required,Patikrinimo Reikalinga
@@ -2665,7 +2697,7 @@
 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 +138,Wire Transfer,pavedimu
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,pavedimu
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Viską Patikrink
 DocType: Sales Order,Recurring Order,pasikartojančios Užsakyti
 DocType: Company,Default Income Account,Numatytasis pajamų sąskaita
@@ -2677,21 +2709,19 @@
 ,Welcome to ERPNext,Sveiki atvykę į ERPNext
 apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,Švinas su citavimo
 DocType: Lead,From Customer,nuo Klientui
-apps/erpnext/erpnext/demo/setup_data.py +357,Calls,ragina
+apps/erpnext/erpnext/demo/setup/setup_data.py +300,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/stock/doctype/item/item.py +466,"As there are existing transactions for this item, \
-							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Kadangi yra esami sandoriai šią prekę, \ jūs negalite pakeisti vertybių &quot;Ar Serijos Nr&quot;, &quot;Turi Serija Ne&quot;, &quot;Ar sandėlyje punktas&quot; ir &quot;vertinimo metodas&quot;"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,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/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 +139,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: Issue,Opening Date,atidarymo data
-apps/erpnext/erpnext/schools/api.py +58,Attendance has been marked successfully.,Žiūrovų buvo pažymėta sėkmingai.
+apps/erpnext/erpnext/schools/api.py +57,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 +136,Account Type for {0} must be {1},"Sąskaitos tipas {0}, turi būti {1}"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +139,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ė
@@ -2706,12 +2736,13 @@
 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/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 +20,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 +1190,Please select customer,Prašome pasirinkti klientui
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1193,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
@@ -2721,6 +2752,7 @@
 ,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 +50,Missing Currency Exchange Rates for {0},Trūksta Valiutų kursai už {0}
 DocType: Assessment,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-"
@@ -2738,11 +2770,12 @@
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Temos pavadinimas
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,"Atleast vienas, pardavimas arba pirkimas turi būti parenkamas"
+DocType: Grading Structure,Grade Intervals,intervalai Įvertinimas
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Pasirinkite savo verslo pobūdį.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Kur gamybos operacijos atliekamos.
 DocType: Asset Movement,Source Warehouse,šaltinis sandėlis
 DocType: Installation Note,Installation Date,Įrengimas data
-apps/erpnext/erpnext/controllers/accounts_controller.py +534,Row #{0}: Asset {1} does not belong to company {2},Eilutės # {0}: Turto {1} nepriklauso bendrovei {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +537,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
@@ -2756,28 +2789,31 @@
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Turimas Serija Kiekis ne iš sandėlio
 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,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 +111,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/scheduling_tool/scheduling_tool.py +49,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 +87,{0}% Delivered,{0}% Paskelbta
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% Paskelbta
 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).,Prekė {0}: Užsakytas Kiekis {1} negali būti mažesnis nei minimalus užsakymo Kiekis {2} (apibrėžtą punktas).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Mėnesio pasiskirstymas procentais
 DocType: Territory,Territory Targets,Teritorija tikslai
 DocType: Delivery Note,Transporter Info,transporteris Informacija
-apps/erpnext/erpnext/accounts/utils.py +379,Please set default {0} in Company {1},Prašome nustatyti numatytąjį {0} įmonėje {1}
+apps/erpnext/erpnext/accounts/utils.py +456,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
 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.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Pavadinimus spausdinimo šablonų pvz išankstinio mokėjimo sąskaitą.
+DocType: Student Guardian,Student Guardian,Studentų globėjas
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +184,Valuation type charges can not marked as Inclusive,Vertinimo tipas mokesčiai negali pažymėta kaip įskaičiuota
 DocType: POS Profile,Update Stock,Atnaujinti sandėlyje
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Įvairūs UOM daiktų bus neteisinga (iš viso) Grynasis svoris vertės. Įsitikinkite, kad grynasis svoris kiekvieno elemento yra toje pačioje UOM."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Balsuok
 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 +349,Journal Entries {0} are un-linked,Žurnalas įrašai {0} yra JT susietų
+apps/erpnext/erpnext/accounts/utils.py +426,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
@@ -2801,6 +2837,7 @@
 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
+DocType: Homepage,"URL for ""All Products""",URL &quot;Visi produktai&quot;
 DocType: Leave Application,Leave Balance Before Application,Palikite balansas Prieš taikymas
 DocType: SMS Center,Send SMS,siųsti SMS
 DocType: Cheque Print Template,Width of amount in word,Plotis suma žodžiu
@@ -2809,7 +2846,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 +29,Current Job Openings,Dabartinis darbas Angos
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,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
@@ -2822,20 +2859,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 +850,Show tax break-up,Rodyti mokesčių lengvata viršų
+apps/erpnext/erpnext/public/js/controllers/transaction.js +841,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/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/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 +24,Sell,Parduoti
-DocType: Sales Invoice,Rounded Total,suapvalinti Iš viso
+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 +534,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 +80,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 +162,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/selling/doctype/customer/customer.py +195,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 +5,This is based on the attendance of this Student,"Tai yra, remiantis šio mokinių lankomumą"
@@ -2844,12 +2882,11 @@
 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 +75,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 +138,Note: There is not enough leave balance for Leave Type {0},Pastaba: Nėra pakankamai atostogos balansas Palikti tipas {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Note: There is not enough leave balance for Leave Type {0},Pastaba: Nėra pakankamai atostogos balansas Palikti tipas {0}
 DocType: Program Enrollment Fee,Program Enrollment Fee,Programos Dalyvio mokestis
 DocType: Item,Supplier Items,Tiekėjo daiktai
 DocType: Opportunity,Opportunity Type,galimybė tipas
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,nauja Įmonės
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,Cost Center is required for 'Profit and Loss' account {0},Kaina centras yra reikalingas &quot;Pelno ir nuostolio&quot; paskyros {0}
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Sandoriai gali būti išbraukta tik Bendrovės kūrėjo
 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.,Neteisingas skaičius didžiąją knygą Įrašai nerasta. Galbūt pasirinkote neteisingą sąskaitą sandoryje.
 DocType: Cheque Print Template,Cheque Width,Komunalinės Plotis
@@ -2858,16 +2895,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Gimimo data negali būti didesnis nei dabar.
 ,Stock Ageing,akcijų senėjimas
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,darbo laiko apskaitos žiniaraštis
-apps/erpnext/erpnext/controllers/accounts_controller.py +228,{0} '{1}' is disabled,{0} &quot;{1}&quot; yra išjungta
+apps/erpnext/erpnext/controllers/accounts_controller.py +231,{0} '{1}' is disabled,{0} &quot;{1}&quot; yra išjungta
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Nustatyti kaip Open
 DocType: Cheque Print Template,Scanned Cheque,Nuskaityti čekis
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,"Siųsti automatinius laiškus Kontaktai, kaip pateikti sandorių."
+DocType: Timesheet,Total Billable Amount,Iš viso Apmokestinama suma
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,3 punktas
 DocType: Purchase Order,Customer Contact Email,Klientų Kontaktai El.paštas
 DocType: Warranty Claim,Item and Warranty Details,Punktas ir garantijos informacija
 DocType: Sales Team,Contribution (%),Indėlis (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Pastaba: mokėjimo įrašas nebus sukurtos nuo &quot;pinigais arba banko sąskaitos&quot; nebuvo nurodyta
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Responsibilities,atsakomybė
+apps/erpnext/erpnext/controllers/accounts_controller.py +78,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ė
 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
@@ -2875,6 +2913,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Pridėti Vartotojai
 DocType: Pricing Rule,Item Group,Prekė grupė
 DocType: Item,Safety Stock,saugos kodas
+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: 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)
@@ -2884,7 +2923,6 @@
 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: Timesheet,Total Hours,viso valandų
 DocType: Journal Entry,Printing Settings,Spausdinimo nustatymai
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,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
@@ -2897,13 +2935,14 @@
 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 +71,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,kursas
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Intern,internas
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Klientų&gt; Klientų grupė&gt; teritorija
+DocType: Purchase Invoice Item,Rate,Kaina
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,internas
 DocType: Stock Entry,From BOM,nuo BOM
 DocType: Assessment,Assessment Code,vertinimas kodas
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +32,Basic,pagrindinis
+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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',Prašome spausti &quot;Generuoti grafiką&quot;
+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 +95,Reference No is mandatory if you entered Reference Date,"Nuorodos Nr yra privaloma, jei įvedėte Atskaitos data"
@@ -2912,11 +2951,11 @@
 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 +752,Issue Material,klausimas Medžiaga
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +723,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 +683,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 +665,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ą."
 DocType: Hub Settings,Access Token,Prieigos raktas
 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
@@ -2924,33 +2963,35 @@
 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 +1122,Enter value must be positive,Įveskite vertė turi būti teigiamas
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,All Territories,visos teritorijos
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1125,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
 DocType: Purchase Invoice,Items,Daiktai
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +23,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 +221,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 +233,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 +96,Request for Quotations,Prašymas citatos
+apps/erpnext/erpnext/hooks.py +104,Request for Quotations,Prašymas citatos
 DocType: Payment Reconciliation,Maximum Invoice Amount,Maksimalus Sąskaitos faktūros suma
 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 +628,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Numatytasis vienetas priemonė variantas &quot;{0}&quot; turi būti toks pat, kaip Šablonas &quot;{1}&quot;"
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Numatytasis vienetas priemonė variantas &quot;{0}&quot; turi būti toks pat, kaip Šablonas &quot;{1}&quot;"
 DocType: Shipping Rule,Calculate Based On,Apskaičiuoti remiantis
 DocType: Delivery Note Item,From Warehouse,iš sandėlio
 DocType: Assessment,Supervisor Name,priežiūros Vardas
+DocType: Assessment,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
 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 +27,Default Address Template cannot be deleted,Numatytasis adresas Šablonas ištrinti negalima
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,Numatytasis adresas Šablonas ištrinti negalima
 DocType: Sales Invoice,Shipping Rule,Pristatymas taisyklė
 DocType: Manufacturer,Limited to 12 characters,Ribojamas iki 12 simbolių
 DocType: Journal Entry,Print Heading,Spausdinti pozicijoje
@@ -2965,8 +3006,8 @@
 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/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 +485,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 +336,Please select Posting Date first,Prašome pasirinkti Skelbimo data pirmas
+apps/erpnext/erpnext/stock/get_item_details.py +486,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 +326,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
@@ -2982,6 +3023,7 @@
 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
 DocType: Authorization Rule,Applicable To (Designation),Taikoma (paskyrimas)
+,Profitability Analysis,pelningumo analizė
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,Į krepšelį
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Grupuoti pagal
 DocType: Guardian,Interests,Pomėgiai
@@ -2994,21 +3036,21 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,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 +141,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Serijinis punktas {0} negali būti atnaujintas \ naudojant Inventorinis susitaikymo
 DocType: Scheduling Tool,Day,diena
 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 +122,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 +129,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
-DocType: Student Applicant,AP.,Ap.
 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 +639,Point of Sale,Pardavimo punktas
+apps/erpnext/erpnext/accounts/page/pos/pos.js +634,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
 DocType: Production Planning Tool,Production Planning Tool,Gamybos planavimo įrankis
@@ -3017,74 +3059,77 @@
 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 +373,Quantity to Manufacture must be greater than 0.,"Kiekis, Gamyba turi būti didesnis nei 0."
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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 Profile,Customer Group,Klientų grupė
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,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/doctype/asset/asset.py +83,Next Depreciation Date must be on or after today,Kitas Nusidėvėjimas data turi būti nuo ar po šiandien
 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 +145,Please cancel Purchase Invoice {0} first,Prašome anuliuoti sąskaitą-faktūrą {0} pirmas
 DocType: Serial No,AMC Expiry Date,AMC Galiojimo data
 ,Sales Register,pardavimų Registruotis
 DocType: Quotation,Quotation Lost Reason,Citata Pamiršote Priežastis
+apps/erpnext/erpnext/utilities/doctype/address/address.py +164,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ą.
 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 +330,Transaction reference no {0} dated {1},Operacijos identifikacinis ne {0} data {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,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 +107,Summary for this month and pending activities,Santrauka šį mėnesį ir laukiant veikla
+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/accounts/doctype/sales_invoice/sales_invoice.py +406,Please remove this Invoice {0} from C-Form {1},Prašome pašalinti šioje sąskaitoje faktūroje {0} iš C formos {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,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 +644,Get Items,Gauk daiktai
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +623,Get Items,Gauk daiktai
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +210,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 +41,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ų
 DocType: Payment Request,Initiated,inicijuotas
 DocType: Production Order,Planned Start Date,Planuojama pradžios data
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,Customer is required against Receivable account {0},Klientas turi prieš gautinos sąskaitos {0}
 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 +265,Project-wise data is not available for Quotation,Projektų išmintingas duomenys nėra prieinami Citata
+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 +101,Commercial,prekybos
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,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: Supplier Quotation,Supplier Address,tiekėjas Adresas
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +648,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/accounts/doctype/purchase_invoice/purchase_invoice.py +651,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 +30,Series is mandatory,Serija yra privalomi
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +50,Series is mandatory,Serija yra privalomi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Finansinės paslaugos
 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
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +165,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 +155,Cr,kr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Cr,kr
 DocType: Tax Rule,Billing State,atsiskaitymo valstybė
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +250,Transfer,perkėlimas
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +187,{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 +825,Fetch exploded BOM (including sub-assemblies),Paduok sprogo BOM (įskaitant mazgus)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +254,Transfer,perkėlimas
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +190,{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 +796,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 +115,Due Date is mandatory,Terminas yra privalomi
+apps/erpnext/erpnext/controllers/accounts_controller.py +118,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
 DocType: Journal Entry,Pay To / Recd From,Apmokėti / Recd Nuo
 DocType: Naming Series,Setup Series,Sąranka serija
 DocType: Payment Reconciliation,To Invoice Date,Norėdami sąskaitos faktūros išrašymo data
 DocType: Supplier,Contact HTML,Susisiekite su HTML
 ,Inactive Customers,neaktyvūs Klientai
+DocType: Landed Cost Voucher,LCV,lengvųjų komercinių automobilių
 DocType: Landed Cost Voucher,Purchase Receipts,pirkimo kvitai
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Kaip kainodaros taisyklė yra taikoma?
 DocType: Quality Inspection,Delivery Note No,Važtaraštis Nėra
@@ -3093,7 +3138,7 @@
 DocType: Company,Retail,Mažmeninė
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +120,Customer {0} does not exist,Klientų {0} neegzistuoja
 DocType: Attendance,Absent,nėra
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +587,Product Bundle,Prekės Rinkinys
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Product Bundle,Prekės Rinkinys
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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
@@ -3103,8 +3148,8 @@
 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 +742,Send Supplier Emails,Siųsti Tiekėjo laiškus
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +104,"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/buying/doctype/request_for_quotation/request_for_quotation.js +708,Send Supplier Emails,Siųsti Tiekėjo laiškus
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,"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
 DocType: Guardian Interest,Guardian Interest,globėjas Palūkanos
 DocType: Timesheet,Employee Detail,Darbuotojų detalės
@@ -3115,9 +3160,9 @@
 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}
 DocType: Salary Slip,Earning & Deduction,Pelningiausi &amp; išskaičiavimas
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +77,Account {0} cannot be a Group,Sąskaita {0} negali būti Grupė
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} cannot be a Group,Sąskaita {0} negali būti Grupė
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +31,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 +107,Negative Valuation Rate is not allowed,Neigiamas vertinimas Balsuok neleidžiama
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Neigiamas vertinimas Balsuok neleidžiama
 DocType: Holiday List,Weekly Off,Savaitės Išjungtas
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Dėl pvz 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +39,Provisional Profit / Loss (Credit),Laikinas Pelnas / nuostolis (kreditas)
@@ -3131,16 +3176,16 @@
 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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Kaina centras yra privalomas punktas {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +626,Get Items from Product Bundle,Gauti prekes iš prekė Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +605,Get Items from Product Bundle,Gauti prekes iš prekė Bundle
 DocType: Asset,Straight Line,Tiesi linija
 DocType: Project User,Project User,Projektų Vartotojas
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} is inactive,Sąskaita {0} neaktyvus
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} is inactive,Sąskaita {0} neaktyvus
 DocType: GL Entry,Is Advance,Ar Išankstinis
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Lankomumas Iš data ir lankomumo data yra privalomi
 apps/erpnext/erpnext/controllers/buying_controller.py +148,Please enter 'Is Subcontracted' as Yes or No,"Prašome įvesti &quot;subrangos sutartis&quot;, nes taip ar ne"
 DocType: Sales Team,Contact No.,Kontaktinė Nr
 DocType: Bank Reconciliation,Payment Entries,Apmokėjimo įrašai
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,'Profit and Loss' type account {0} not allowed in Opening Entry,&quot;Pelnas ir nuostoliai&quot; tipo sąskaita {0} neleidžiama atidarymas įrašą
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +71,'Profit and Loss' type account {0} not allowed in Opening Entry,&quot;Pelnas ir nuostoliai&quot; tipo sąskaita {0} neleidžiama atidarymas įrašą
 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
@@ -3159,7 +3204,7 @@
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serijinis #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Commission on Sales,Komisija dėl pardavimo
 DocType: Offer Letter Term,Value / Description,Vertė / Aprašymas
-apps/erpnext/erpnext/controllers/accounts_controller.py +558,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Eilutės # {0}: Turto {1} negali būti pateikti, tai jau {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +561,"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: Production Order,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}.
@@ -3172,13 +3217,13 @@
 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/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: Sales Order,% Amount Billed,% Suma Įvardintas
+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."
 apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},Nėra Prekė su Serijos Nr {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Atviri Pranešimai
+DocType: Email Digest,Open Notifications,Atviri Pranešimai
 DocType: Payment Entry,Difference Amount (Company Currency),Skirtumas Suma (Įmonės valiuta)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,tiesioginės išlaidos
 apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
@@ -3186,7 +3231,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Naujas klientas pajamos
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,Kelionės išlaidos
 DocType: Maintenance Visit,Breakdown,Palaužti
-apps/erpnext/erpnext/controllers/accounts_controller.py +634,Account: {0} with currency: {1} can not be selected,Sąskaita: {0} su valiutos: {1} negalima pasirinkti
+apps/erpnext/erpnext/controllers/accounts_controller.py +637,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}
 DocType: Program Enrollment Tool,Student Applicants,studentų Pareiškėjai
@@ -3194,15 +3239,15 @@
 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 +56,Probation,išbandymas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Probation,išbandymas
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Atlyginimo komponentai
 DocType: Program Enrollment Tool,New Academic Year,Nauja akademiniai metai
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Payment of salary for the month {0} and year {1},Mokėjimo atlyginimo per mėnesį {0} ir metus {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Payment of salary for the month {0} and year {1},Mokėjimo atlyginimo per mėnesį {0} ir metus {1}
 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 +144,Planning,planavimas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,planavimas
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,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ą
@@ -3215,11 +3260,10 @@
 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.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Sales invoice submitted sucessfully.,Pardavimų sąskaita faktūra pateikiama sėkmingai.
 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}
 DocType: Assessment Result,Student Name,Studento vardas
-apps/erpnext/erpnext/hooks.py +104,Assessment Schedule,vertinimas Tvarkaraštis
+apps/erpnext/erpnext/hooks.py +113,Assessment Schedule,vertinimas Tvarkaraštis
 DocType: Brand,Item Manager,Prekė direktorius
 DocType: Buying Settings,Default Supplier Type,Numatytasis Tiekėjas tipas
 DocType: Production Order,Total Operating Cost,Iš viso eksploatavimo išlaidos
@@ -3229,6 +3273,7 @@
 DocType: GL Entry,Party Type,šalis tipas
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +78,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
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Pajamos šablonas meistras.
 DocType: Leave Type,Max Days Leave Allowed,Maksimalus dienų atostogas Leido
@@ -3240,18 +3285,19 @@
 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 +99,All Customer Groups,Visi klientų grupėms
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +78,Accumulated Monthly,sukauptas Mėnesio
-apps/erpnext/erpnext/controllers/accounts_controller.py +595,{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/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Visi klientų grupėms
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +81,Accumulated Monthly,sukauptas Mėnesio
+apps/erpnext/erpnext/controllers/accounts_controller.py +598,{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
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Kainų sąrašas greitis (Įmonės valiuta)
 DocType: Products Settings,Products Settings,produktai Nustatymai
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +188,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
 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 +84,Secretary,sekretorius
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,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
@@ -3260,24 +3306,22 @@
 ,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
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,Eilutės # {0}: Serijos Nr privaloma
+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 +859,Supplier Quotation,tiekėjas Citata
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +838,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 +7,Collect Fees,rinkti mokesčius
+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}
 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.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Artimiausi renginiai
 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/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
-DocType: Email Digest,Income / Expense,Pajamų / išlaidų
 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."
@@ -3288,13 +3332,14 @@
 DocType: Customer,From Lead,nuo švino
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Užsakymai išleido gamybai.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Pasirinkite fiskalinių metų ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,POS Profile required to make POS Entry,"POS profilis reikalaujama, kad POS įrašą"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +509,POS Profile required to make POS Entry,"POS profilis reikalaujama, kad POS įrašą"
 DocType: Program Enrollment Tool,Enroll Students,stoti Studentai
 DocType: Hub Settings,Name Token,vardas ženklas
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standartinė Parduodami
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Atleast one warehouse is mandatory,Atleast vienas sandėlis yra privalomas
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +129,Atleast one warehouse is mandatory,Atleast vienas sandėlis yra privalomas
 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 +330,{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
@@ -3315,10 +3360,11 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Lapai turi būti skiriama kartotinus 0,5"
 DocType: Production Order,Operation Cost,operacijos išlaidas
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,Įkelti lankomumą iš .csv failą
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,neįvykdyti Amt
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Nustatyti tikslai punktas grupė-protingas šiam Pardavimų asmeniui.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Freeze Atsargos senesnis nei [diena]
-apps/erpnext/erpnext/controllers/accounts_controller.py +528,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Eilutės # {0}: turtas yra privalomas ilgalaikio turto pirkimas / pardavimas
+apps/erpnext/erpnext/controllers/accounts_controller.py +531,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Eilutės # {0}: turtas yra privalomas ilgalaikio turto pirkimas / pardavimas
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Jei du ar daugiau Kainodaros taisyklės yra rasta remiantis pirmiau minėtų sąlygų, pirmenybė taikoma. Prioritetas yra skaičius nuo 0 iki 20, o numatytoji reikšmė yra nulis (tuščias). Didesnis skaičius reiškia, kad jis bus viršesnės jei yra keli kainodaros taisyklės, kurių pačiomis sąlygomis."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Fiskalinė Metai: {0} neegzistuoja
 DocType: Currency Exchange,To Currency,valiutos
@@ -3335,15 +3381,15 @@
 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
-DocType: Sales Invoice,Exhibition,paroda
 apps/erpnext/erpnext/utilities/doctype/address/address.py +77,"Company is mandatory, as it is your company address","Bendrovė yra privalomas, nes tai jūsų įmonė adresas"
 DocType: Item Attribute,From Range,nuo spektrui
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +81,Syntax error in formula or condition: {0},Sintaksės klaida formulei ar būklės: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +92,Syntax error in formula or condition: {0},Sintaksės klaida formulei ar būklės: {0}
 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"
+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 +28,Jobs,Darbas
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,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
@@ -3352,16 +3398,16 @@
 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 +763,Make Supplier Quotation,Padaryti Tiekėjo Citata
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,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/controllers/sales_and_purchase_return.py +100,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 +42,Casual Leave,Laisvalaikio atostogos
+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
 DocType: Batch,Batch ID,Serija ID
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,Note: {0},Pastaba: {0}
 ,Delivery Note Trends,Važtaraštis tendencijos
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +103,This Week's Summary,Šios savaitės suvestinė
+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ų
 DocType: Student Group Creation Tool,Get Courses,Gauk kursai
 DocType: GL Entry,Party,šalis
@@ -3371,7 +3417,7 @@
 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 +59,Piecework,vienetinį
+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: Task,Actual Time (in Hours),Tikrasis laikas (valandomis)
 DocType: Employee,History In Company,Istorija Company
@@ -3388,7 +3434,7 @@
 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į.
 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 +162,Black,juodas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,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
@@ -3399,13 +3445,13 @@
 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 +69,Customer Id,Kliento ID
+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
 DocType: Journal Entry Account,Exchange Rate,Valiutos kursas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Sales Order {0} is not submitted,Pardavimų užsakymų {0} nebus pateiktas
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +527,Sales Order {0} is not submitted,Pardavimų užsakymų {0} nebus pateiktas
 DocType: Homepage,Tag Line,Gairė linija
 DocType: Fee Component,Fee Component,mokestis komponentas
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +857,Add items from,Pridėti elementus iš
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +836,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}
 DocType: Cheque Print Template,Regular,reguliarus
 DocType: BOM,Last Purchase Rate,Paskutinis užsakymo kaina
@@ -3413,6 +3459,7 @@
 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
 ,Sales Person-wise Transaction Summary,Pardavimų Asmuo išmintingas Sandorio santrauka
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +60,Cost Center is required for 'Profit and Loss' account {0}. Please set up a default Cost Center for the Company.,Kaina centras yra reikalingas &quot;Pelno nuostolio sąskaitą {0}. Prašome įkurti numatytąją sąnaudų centro bendrovei.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,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
@@ -3423,12 +3470,12 @@
 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 +710,Online,Prisijunges
+apps/erpnext/erpnext/accounts/page/pos/pos.js +692,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 +16,Setting this Address Template as default as there is no other default,"Šis adresas šabloną numatytąjį nustatymą, nes nėra kitos nutylėjimą"
+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ą"
 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 +74,Quality Management,kokybės valdymas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,kokybės valdymas
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} has been disabled,Prekė {0} buvo išjungta
 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
@@ -3450,11 +3497,12 @@
 DocType: Student,Student Email ID,Studentų E-mail ID
 DocType: Employee,Notice (days),Pranešimas (dienų)
 DocType: Tax Rule,Sales Tax Template,Pardavimo mokestis Šablono
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1520,Select items to save the invoice,Pasirinkite elementus išsaugoti sąskaitą faktūrą
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1544,Select items to save the invoice,Pasirinkite elementus išsaugoti sąskaitą faktūrą
 DocType: Employee,Encashment Date,išgryninimo data
 DocType: Account,Stock Adjustment,vertybinių popierių reguliavimas
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Numatytasis Veiklos sąnaudos egzistuoja veiklos rūšis - {0}
 DocType: Production Order,Planned Operating Cost,Planuojamas eksploatavimo išlaidos
+DocType: Academic Term,Term Start Date,Kadencijos pradžios data
 apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},Pridedamas {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Banko pažyma likutis vienam General Ledger
 DocType: Job Applicant,Applicant Name,Vardas pareiškėjas
@@ -3484,17 +3532,17 @@
 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."
 DocType: Company,Distribution,pasiskirstymas
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +8,Amount Paid,Sumokėta suma
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Project Manager,Projekto vadovas
+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
 ,Quoted Item Comparison,Cituojamas punktas Palyginimas
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Dispatch,išsiuntimas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,išsiuntimas
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,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."
-DocType: Sales Invoice,Supplier Reference,tiekėjas Nuoroda
-apps/erpnext/erpnext/accounts/page/pos/pos.js +844,"Master data syncing, it might take some time","Master Data sinchronizavimą, tai gali užtrukti šiek tiek laiko"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +832,"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
@@ -3508,7 +3556,7 @@
 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 +83,Error in formula or condition,Klaida formulę ar būklės
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,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
@@ -3517,8 +3565,8 @@
 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 +197,Cannot cancel because submitted Stock Entry {0} exists,"Negali atšaukti, nes pateiktas sandėlyje Įėjimo {0} egzistuoja"
-DocType: Purchase Invoice,In Words,Žodžiuose
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +198,Cannot cancel because submitted Stock Entry {0} exists,"Negali atšaukti, nes pateiktas sandėlyje Įėjimo {0} egzistuoja"
+DocType: Purchase Invoice,In Words,Žodžiais
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,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
@@ -3527,14 +3575,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,Jūsų finansiniai metai prasideda
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Turto Nusidėvėjimas ir likučiai
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +319,Amount {0} {1} transferred from {2} to {3},Suma {0} {1} perkeliamas iš {2} į {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +322,Amount {0} {1} transferred from {2} to {3},Suma {0} {1} perkeliamas iš {2} į {3}
 DocType: Sales Invoice,Get Advances Received,Gauti gautų išankstinių
 DocType: Email Digest,Add/Remove Recipients,Įdėti / pašalinti gavėjus
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +432,Transaction not allowed against stopped Production Order {0},Sandorio neleidžiama prieš nutraukė gamybą Užsakyti {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +437,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 +143,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 +652,Item variant {0} exists with same attributes,Prekė variantas {0} egzistuoja pačių savybių
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Prekė variantas {0} egzistuoja pačių savybių
+DocType: Leave Application,LAP/,juosmens /
 DocType: Salary Slip,Salary Slip,Pajamos Kuponas
 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
@@ -3542,12 +3591,12 @@
 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 +212,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 +215,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: Employee Education,Employee Education,Darbuotojų Švietimas
-apps/erpnext/erpnext/public/js/controllers/transaction.js +866,It is needed to fetch Item Details.,"Jis reikalingas, kad parsiųsti Išsamesnė informacija."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +857,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
@@ -3557,14 +3606,14 @@
 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 +178,Invalid {0},Neteisingas {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Sick Leave,atostogos dėl ligos
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,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
 DocType: Warehouse,PIN,PIN kodas
 DocType: Sales Invoice,Base Change Amount (Company Currency),Bazinė Pakeisti Suma (Įmonės valiuta)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +313,No accounting entries for the following warehouses,Nieko apskaitos įrašai šiuos sandėlius
-apps/erpnext/erpnext/projects/doctype/project/project.js +102,Save the document first.,Išsaugoti dokumentą pirmas.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +314,No accounting entries for the following warehouses,Nieko apskaitos įrašai šiuos sandėlius
+apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Išsaugoti dokumentą pirmas.
 DocType: Account,Chargeable,Apmokestinimo
 DocType: Company,Change Abbreviation,Pakeisti santrumpa
 DocType: Expense Claim Detail,Expense Date,Kompensuojamos data
@@ -3577,10 +3626,9 @@
 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
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,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
 DocType: Appraisal,Appraisal Template,vertinimas Šablono
 DocType: Item Group,Item Classification,Prekė klasifikavimas
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Business Development Manager,Verslo plėtros vadybininkas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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
@@ -3590,8 +3638,8 @@
 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 +940,Please select {0} first,Prašome pasirinkti {0} pirmas
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +749,Batch {0} of Item {1} has expired.,Serija {0} punkto {1} yra pasibaigęs.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +953,Please select {0} first,Prašome pasirinkti {0} pirmas
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +757,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
@@ -3608,8 +3656,8 @@
 {% 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 +92,Warehouse not found in the system,Sandėlių nerastas sistemos
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +106,This Month's Summary,Šio mėnesio suvestinė
+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ė
 DocType: Quality Inspection Reading,Quality Inspection Reading,Kokybės inspekcija skaitymas
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,&quot;Freeze Atsargos Senesni Than` turėtų būti mažesnis nei% d dienų.
 DocType: Tax Rule,Purchase Tax Template,Pirkimo Mokesčių šabloną
@@ -3619,21 +3667,22 @@
 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 +87,Please set Next Depreciation Date,Prašome nustatyti Kita nusidėvėjimo data
-DocType: Payment Gateway,Payment Gateway,Mokėjimo šliuzai
 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 +378,Operation Time must be greater than 0 for Operation {0},Operacijos metu turi būti didesnis nei 0 darbui {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +380,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
 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)
 DocType: Program,Program Abbreviation,programos santrumpa
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,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: Appraisal,Start Date,Pradžios data
@@ -3649,21 +3698,22 @@
 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
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Pvz. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +27,Transaction currency must be same as Payment Gateway currency,"Operacijos valiuta turi būti toks pat, kaip mokėjimo šliuzai valiuta"
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Transaction currency must be same as Payment Gateway currency,"Operacijos valiuta turi būti toks pat, kaip mokėjimo šliuzai valiuta"
 DocType: Payment Entry,Receive,gauti
+apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,citatos:
 DocType: Maintenance Visit,Fully Completed,visiškai užbaigtas
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Visiškas
 DocType: Employee,Educational Qualification,edukacinė kvalifikacija
 DocType: Workstation,Operating Costs,Veiklos sąnaudos
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,"Veiksmų, jei sukauptos mėnesio biudžetas Viršytas"
 DocType: Purchase Invoice,Submit on creation,Pateikti steigti
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +432,Currency for {0} must be {1},Valiuta {0} turi būti {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +435,Currency for {0} must be {1},Valiuta {0} turi būti {1}
 DocType: Asset,Disposal Date,Atliekų data
 DocType: Employee Leave Approver,Employee Leave Approver,Darbuotojų atostogos Tvirtintojas
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,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 +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/crm/doctype/opportunity/opportunity.py +79,"Cannot declare as lost, because Quotation has been made.","Negali paskelbti, kad prarastas, nes Citata buvo padaryta."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Pirkimo magistras direktorius
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +429,Production Order {0} must be submitted,Gamybos Užsakyti {0} turi būti pateiktas
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +434,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
@@ -3673,25 +3723,27 @@
 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
 DocType: Price List,Price List Name,Kainų sąrašas vardas
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +181,Totals,sumos
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,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 +113,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 +120,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
 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į.
+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 +181,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/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 +793,All records are synced.,Visi įrašai sinchronizuojami.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +781,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
 DocType: Cost Center,Cost Center Name,Kainuos centras vardas
@@ -3710,21 +3762,20 @@
 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/selling/doctype/quotation/quotation.py +49,Cannot set as Lost as Sales Order is made.,Negalima nustatyti kaip Pamiršote nes yra pagamintas pardavimų užsakymų.
-DocType: Student Applicant,Mother's Name,Mamos vardas
 DocType: Request for Quotation Item,Supplier Part No,Tiekėjas partijos nr
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +348,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Negali atskaityti, kai kategorija skirta &quot;Vertinimo&quot; arba &quot;Vaulation ir viso&quot;"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Received From,Gautas nuo
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Received From,Gautas nuo
 DocType: Lead,Converted,Perskaičiuotas
 DocType: Item,Has Serial No,Turi Serijos Nr
 DocType: Employee,Date of Issue,Išleidimo data
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{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 +93,Row {0}: Hours value must be greater than zero.,Eilutės {0}: valandos vertė turi būti didesnė už nulį.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +117,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
 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 +172,{0} {1} does not exist,{0} {1} neegzistuoja
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +175,{0} {1} does not exist,{0} {1} neegzistuoja
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,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 +72,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ę
@@ -3733,13 +3784,14 @@
 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/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
 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 +109,Electrical,elektros
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Electrical,elektros
 DocType: Stock Entry,Total Value Difference (Out - In),Viso vertės skirtumas (iš - į)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,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}
@@ -3747,7 +3799,7 @@
 DocType: Item,Customer Code,Kliento kodas
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +210,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 +292,Debit To account must be a Balance Sheet account,Debeto sąskaitą turi būti balansas sąskaitos
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Akcijų turtas
@@ -3759,11 +3811,11 @@
 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 +301,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 +313,Salary Slip of employee {0} already created for time sheet {1},Pajamos Kuponas darbuotojo {0} jau sukurta laiko lape {1}
 DocType: Sales Order Item,Ordered Qty,Užsakytas Kiekis
-apps/erpnext/erpnext/stock/doctype/item/item.py +673,Item {0} is disabled,Prekė {0} yra išjungtas
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,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 +838,BOM does not contain any stock item,BOM nėra jokių akcijų elementą
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +809,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.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Sukurti apie atlyginimų
@@ -3771,23 +3823,24 @@
 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)
-apps/erpnext/erpnext/stock/doctype/item/item.py +485,Row #{0}: Please set reorder quantity,Eilutės # {0}: Prašome nustatyti pertvarkyti kiekį
+DocType: Sales Invoice Timesheet,Billing Hours,Atsiskaitymo laikas
+apps/erpnext/erpnext/stock/doctype/item/item.py +487,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 +62,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ų
+DocType: Payment Entry,Allocate Payment Amount,Skirti mokėjimo suma
 DocType: Employee External Work History,Salary,atlyginimas
 DocType: Serial No,Delivery Document Type,Pristatymas Dokumento tipas
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Pateikti visus atlyginimų lapelius dėl pirmiau pasirinktus kriterijus
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} Daiktai sinchronizuojami
 DocType: Sales Order,Partly Delivered,dalinai Paskelbta
-DocType: Sales Invoice,Existing Customer,Esamas klientas
 DocType: Email Digest,Receivables,gautinos sumos
+DocType: Lead Source,Lead Source,Švinas Šaltinis
 DocType: Customer,Additional information regarding the customer.,Papildoma informacija apie klientui.
 DocType: Quality Inspection Reading,Reading 5,Skaitymas 5
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +38,Campaign Name is required,Kampanijos pavadinimas reikalingas
 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ę
@@ -3795,10 +3848,9 @@
 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 +129,BOM and Manufacturing Quantity are required,BOM ir gamyba Kiekis yra privalomi
+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/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
-DocType: Bank Reconciliation Detail,Amount,suma
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM pakeisti
 ,Sales Analytics,pardavimų Analytics &quot;
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +113,Available {0},Turimas {0}
@@ -3806,14 +3858,14 @@
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Įsteigti paštu
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +96,Please enter default currency in Company Master,Prašome įvesti numatytasis valiuta įmonėje Master
 DocType: Stock Entry Detail,Stock Entry Detail,Akcijų įrašo informaciją
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +100,Daily Reminders,Dienos Priminimai
+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/account/account_tree.js +23,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 +71,Customer Service,Klientų aptarnavimas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Customer Service,Klientų aptarnavimas
 DocType: Homepage Featured Product,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ą.
@@ -3822,8 +3874,9 @@
 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
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Numatytasis nebaigtos Warehouse
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1570,Total nos of serial no is not equal to quantity.,Iš viso nos iš Serijos Nr nėra lygus kiekiui.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1594,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
 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
@@ -3831,9 +3884,10 @@
 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 +82,Engineer,inžinierius
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,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 +370,Item Code required at Row No {0},Prekės kodas reikalaujama Row Nr {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +398,Item Code required at Row No {0},Prekės kodas reikalaujama Row Nr {0}
 DocType: Sales Partner,Partner Type,partnerio tipas
 DocType: Purchase Taxes and Charges,Actual,faktinis
 DocType: Authorization Rule,Customerwise Discount,Customerwise nuolaida
@@ -3849,16 +3903,18 @@
 DocType: BOM,Raw Material Cost,Žaliavų kaina
 DocType: Item Reorder,Re-Order Level,Re įsakymu lygis
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Įveskite elementus ir planuojamą vnt, už kuriuos norite padidinti gamybos užsakymus arba atsisiųsti žaliavas analizė."
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +55,Part-time,Neakivaizdinės
+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
 DocType: Employee,Applicable Holiday List,Taikoma Atostogų sąrašas
 DocType: Employee,Cheque,Tikrinti
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,serija Atnaujinta
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +57,Series Updated,serija Atnaujinta
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Ataskaitos tipas yra privalomi
 DocType: Item,Serial Number Series,Eilės numeris serija
 apps/erpnext/erpnext/buying/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 +87,Clearance Date updated,Atnaujintas klirensas data
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,sėkmingai Suderinta
@@ -3872,7 +3928,7 @@
 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 +513,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 +518,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."
@@ -3882,7 +3938,7 @@
 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/stock/doctype/stock_entry/stock_entry.py +158,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/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"
 DocType: Company,Round Off Account,Suapvalinti paskyrą
@@ -3891,23 +3947,22 @@
 DocType: Customer Group,Parent Customer Group,Tėvų Klientų grupė
 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 +180,Notice Period,įspėjimo terminas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,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 +4,New Sales Person Name,Nauja pardavimų asmuo Vardas
 DocType: Packing Slip,Gross Weight UOM,Bendras svoris UOM
-DocType: Email Digest,Receivables / Payables,Gautinos / mokėtinos sumos
 DocType: Delivery Note Item,Against Sales Invoice,Prieš pardavimo sąskaita-faktūra
 DocType: Bin,Reserved Qty for Production,Reserved Kiekis dėl gamybos
 DocType: Asset,Frequency of Depreciation (Months),Dažnio nusidėvėjimo (mėnesiais)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +469,Credit Account,Kreditinė sąskaita
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Credit Account,Kreditinė sąskaita
 DocType: Landed Cost Item,Landed Cost Item,Nusileido Kaina punktas
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +55,Show zero values,Rodyti nulines vertes
+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
 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 +647,Please specify Attribute Value for attribute {0},Prašome nurodyti Įgūdis požymio reikšmę {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Prašome nurodyti Įgūdis požymio reikšmę {0}
 DocType: Item,Default Warehouse,numatytasis sandėlis
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +39,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ą
@@ -3929,19 +3984,22 @@
 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
-DocType: Sales Invoice,Cold Calling,cold calling
 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: Maintenance Schedule Item,Half Yearly,pusmečio
 DocType: Lead,Blog Subscriber,Dienoraštis abonento
+DocType: Guardian,Alternate Number,pakaitinis Taškų
 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ą.
+DocType: Stock Reconciliation Item,Quantity Difference,kiekis skirtumas
 apps/erpnext/erpnext/config/hr.py +253,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 +141,Set as Lost,Nustatyti kaip Lost
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,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 +5,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
 DocType: Supplier,Credit Days Based On,Kredito dienų remiantis
@@ -3953,11 +4011,10 @@
 ,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 +941,Select or add new customer,Pasirinkite arba pridėti naujų klientų
+apps/erpnext/erpnext/accounts/page/pos/pos.js +930,Select or add new customer,Pasirinkite arba pridėti naujų klientų
 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 +5,This is based on the attendance of this Employee,"Tai yra, remiantis šio darbuotojo dalyvavimo"
-DocType: Sales Invoice,Frequency,dažnis
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +463,Debit Account,debeto sąskaita
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,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)
@@ -3966,27 +4023,27 @@
 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 +210,Supplier Quotation {0} created,Tiekėjas Citata {0} sukūrė
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +208,Supplier Quotation {0} created,Tiekėjas Citata {0} sukūrė
 apps/erpnext/erpnext/accounts/report/financial_statements.py +90,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 +173,Employee Benefits,Išmokos darbuotojams
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,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 +228,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 +232,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 +499,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 +500,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 +1007,Price List not found or disabled,Kainų sąrašas nerastas arba išjungtas
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1008,Price List not found or disabled,Kainų sąrašas nerastas arba išjungtas
 DocType: Expense Claim,Approved,patvirtinta
 DocType: Pricing Rule,Price,kaina
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +244,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 +256,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
@@ -3997,12 +4054,12 @@
 DocType: Address,Office,biuras
 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 +259,Please select Employee Record first.,Prašome pasirinkti Darbuotojų įrašai pirmą kartą.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +266,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 +190,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 +235,Please enter Expense Account,Prašome įvesti sąskaita paskyrą
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,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 +963,"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 +976,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Eilutės # {0}: Informacinis dokumentas tipas turi būti vienas iš pirkimo tvarka, pirkimo sąskaitoje faktūroje ar žurnalo įrašą"
 DocType: Employee,Current Address,Dabartinis adresas
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Jei elementas yra kito elemento, tada aprašymas, vaizdo, kainodara, mokesčiai ir tt bus nustatytas nuo šablono variantas, nebent aiškiai nurodyta"
 DocType: Serial No,Purchase / Manufacture Details,Pirkimas / Gamyba detalės
@@ -4017,9 +4074,10 @@
 DocType: Asset Movement,Transaction Date,Operacijos data
 DocType: Production Plan Item,Planned Qty,Planuojamas Kiekis
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,Iš viso Mokesčių
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,For Quantity (Manufactured Qty) is mandatory,Dėl Kiekis (Pagaminta Kiekis) yra privalomi
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,For Quantity (Manufactured Qty) is mandatory,Dėl Kiekis (Pagaminta Kiekis) yra privalomi
 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 +78,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: Production Order,Actual Start Date,Tikrasis pradžios data
@@ -4034,9 +4092,11 @@
 DocType: Warranty Claim,If different than customer address,"Jei kitoks, nei klientų adresą"
 DocType: BOM Operation,BOM Operation,BOM operacija
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Dėl ankstesnės eilės Suma
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +226,Transfer Asset,perduoto turto
+DocType: Student,Home Address,Namų adresas
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +227,Transfer Asset,perduoto turto
 DocType: POS Profile,POS Profile,POS profilis
 apps/erpnext/erpnext/config/schools.py +33,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 +129,"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
@@ -4046,8 +4106,8 @@
 DocType: Assessment,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 +765,Material to Supplier,"Medžiaga, iš Tiekėjui"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +189,Excise Invoice,akcizo Sąskaita
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,Material to Supplier,"Medžiaga, iš Tiekėjui"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,akcizo Sąskaita
 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
@@ -4057,7 +4117,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,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: Scheduling Tool,Scheduling Tool,planavimas įrankis
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +136,Credit Card,Kreditinė kortelė
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,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ų.
 DocType: Purchase Invoice,Next Date,Kitas data
@@ -4065,6 +4125,7 @@
 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: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Čia galite išsaugoti šeimos detalės, pavyzdžiui, pavadinimą ir okupacijos patronuojančią įmonę, sutuoktiniui ir vaikams"
+DocType: Academic Term,Term End Date,Kadencijos pabaigos data
 DocType: Hub Settings,Seller Name,pardavėjas Vardas
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Mokesčiai ir rinkliavos Išskaityta (Įmonės valiuta)
 DocType: Item Group,General Settings,Bendrieji nustatymai
@@ -4076,7 +4137,7 @@
 DocType: Customer,Commission Rate,Komisija Balsuok
 apps/erpnext/erpnext/stock/doctype/item/item.js +261,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 +115,"Payment Type must be one of Receive, Pay and Internal Transfer",Mokėjimo tipas turi būti vienas iš Gauti Pay ir vidaus perkėlimo
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +118,"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/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Krepšelis tuščias
 DocType: Production Order,Actual Operating Cost,Tikrasis eksploatavimo išlaidos
@@ -4091,10 +4152,10 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,Prašome pasirinkti CSV failą
 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 +92,Designer,dizaineris
+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
 DocType: Serial No,Delivery Details,Pristatymo informacija
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +469,Cost Center is required in row {0} in Taxes table for type {1},Kaina centras reikalingas eilės {0} mokesčių lentelė tipo {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +472,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
 ,Item-wise Purchase Register,Prekė išmintingas pirkimas Registruotis
 DocType: Batch,Expiry Date,Galiojimo data
@@ -4104,12 +4165,12 @@
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Projektų meistras.
 apps/erpnext/erpnext/controllers/status_updater.py +174,"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 +417, (Half Day),(Pusė dienos)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425, (Half Day),(Pusė dienos)
 DocType: Supplier,Credit Days,kredito dienų
 DocType: Leave Type,Is Carry Forward,Ar perkelti
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +740,Get Items from BOM,Gauti prekes iš BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +711,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 +549,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/controllers/accounts_controller.py +552,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
 ,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ą
diff --git a/erpnext/translations/lv.csv b/erpnext/translations/lv.csv
index 238e489..4ab9af6 100644
--- a/erpnext/translations/lv.csv
+++ b/erpnext/translations/lv.csv
@@ -18,11 +18,10 @@
 DocType: Sales Partner,Dealer,Tirgotājs
 DocType: Employee,Rented,Īrēts
 DocType: Purchase Order,PO-,po-
-apps/erpnext/erpnext/accounts/report/financial_statements.py +19,Start Year {0} not found.,Sākt gads {0} nav atrasts.
 DocType: POS Profile,Applicable for User,Piemērojams Lietotājs
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +191,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Pārtraucis ražošanu rīkojums nevar tikt atcelts, Unstop to vispirms, lai atceltu"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +197,Do you really want to scrap this asset?,Vai jūs tiešām vēlaties atteikties šo aktīvu?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +17,Select Default Supplier,Select Default piegādātājs
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +192,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Pārtraucis ražošanu rīkojums nevar tikt atcelts, Unstop to vispirms, lai atceltu"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +198,Do you really want to scrap this asset?,Vai jūs tiešām vēlaties atteikties šo aktīvu?
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Select Default piegādātājs
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Valūta ir nepieciešama Cenrāža {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Tiks aprēķināts darījumā.
 DocType: Address,County,grāfiste
@@ -42,46 +41,45 @@
 DocType: Sales Invoice,Customer Name,Klienta vārds
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +126,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 +180,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 +183,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 +148,Series Updated Successfully,Series Atjaunots Veiksmīgi
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +149,Series Updated Successfully,Series Atjaunots Veiksmīgi
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,izrakstīšanās
 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
-DocType: Quality Inspection Reading,Parameter,Parametrs
 apps/erpnext/erpnext/projects/doctype/project/project.py +54,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 +239,New Leave Application,Jauns atvaļinājuma pieteikums
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,New Leave Application,Jauns atvaļinājuma pieteikums
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +20,Attendance Record {0} exists against Student {1} for Course Schedule {2},Apmeklējumu Record {0} nepastāv pret Student {1} par kursa sarakstā {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Bank Draft,Banka projekts
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,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
 DocType: Academic Term,Academic Term,Akadēmiskā Term
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +13,Material,materiāls
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Quantity,Daudzums
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +511,Accounts table cannot be blank.,Konti tabula nevar būt tukšs.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +616,Quantity,Daudzums
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +512,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)
 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/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 +142,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
-DocType: Purchase Invoice,Monthly,Ikmēneša
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Maksājuma kavējums (dienas)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +771,Invoice,Pavadzīme
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +750,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 +198,Row {0}: {1} {2} does not match with {3},Rinda {0}: {1}{2} nesakrīt ar {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Row # {0}:
+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 +127,Please select Price List,"Lūdzu, izvēlieties cenrādi"
@@ -112,8 +110,8 @@
 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 +589,Get items from,Dabūtu preces no
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +382,Stock cannot be updated against Delivery Note {0},Preces nevar atjaunināt pret piegāde piezīme {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Dabūtu preces no
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,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
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Pārtikas veikals
@@ -122,7 +120,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Pensiju fondi
 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 +156,Salary Structure Missing,Algu struktūra Trūkst
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,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
@@ -130,10 +128,11 @@
 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 +156,Credit limit has been crossed for customer {0} {1}/{2},Kredīta limits ir šķērsojis klientam {0}{1} / {2}
-apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;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 +189,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"
 DocType: Tax Rule,Tax Type,Nodokļu Type
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +144,You are not authorized to add or update entries before {0},Jums nav atļauts pievienot vai atjaunināt ierakstus pirms {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,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/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
@@ -143,18 +142,17 @@
 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 +165,Opening,Atklāšana
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,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/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Klientu&gt; Klientu Group&gt; Teritorija
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Konts Pay Tikai
 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.
 DocType: Lead,Product Enquiry,Produkts Pieprasījums
 DocType: Academic Term,Schools,skolas
 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 +335,Please select Company first,"Lūdzu, izvēlieties Company pirmais"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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
@@ -164,7 +162,7 @@
 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
 DocType: Purchase Invoice Item,Is Fixed Asset,Vai pamatlīdzekļa
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Available qty is {0}, you need {1}","Pieejams Daudzums ir {0}, jums ir nepieciešams, {1}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +225,"Available qty is {0}, you need {1}","Pieejams Daudzums ir {0}, jums ir nepieciešams, {1}"
 DocType: Expense Claim Detail,Claim Amount,Prasības summa
 DocType: Employee,Mr,Mr
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Piegādātājs Type / piegādātājs
@@ -173,25 +171,26 @@
 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: Assessment Result,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 +171,Annual Salary,Gada alga
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Annual Salary,Gada alga
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Akciju Izdevumi
-apps/erpnext/erpnext/accounts/report/financial_statements.py +22,End Year {0} not found.,Beigu gads {0} nav atrasts.
 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}
 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 +130,At least one mode of payment is required for POS invoice.,Vismaz viens maksājuma veids ir nepieciešams POS rēķinu.
 DocType: Products Settings,Show Products as a List,Rādīt produktus kā sarakstu
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Lejupielādēt veidni, aizpildīt atbilstošus datus un pievienot modificētu failu. Visi datumi un darbinieku saspēles izvēlēto periodu nāks veidnē, ar esošajiem apmeklējuma reģistru"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +451,Item {0} is not active or end of life has been reached,Postenis {0} nav aktīvs vai ir sasniegts nolietoto
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +456,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/controllers/accounts_controller.py +614,"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/controllers/accounts_controller.py +617,"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 +166,Settings for HR Module,Iestatījumi HR moduļa
 DocType: SMS Center,SMS Center,SMS Center
 DocType: Sales Invoice,Change Amount,Mainīt Summa
@@ -203,13 +202,13 @@
 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 +147,Execution,Izpildīšana
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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/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}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,Cost Center {0} does not belong to Company {1},Izmaksās Center {0} nepieder Sabiedrībai {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +100,Cost Center {0} does not belong to Company {1},Izmaksās Center {0} nepieder Sabiedrībai {1}
 DocType: Customer,Individual,Indivīds
 DocType: Interest,Academics User,akadēmiķi User
 DocType: Cheque Print Template,Amount In Figure,Summa attēlā
@@ -225,30 +224,32 @@
 DocType: Production Planning Tool,Sales Orders,Pārdošanas pasūtījumu
 DocType: Purchase Taxes and Charges,Valuation,Vērtējums
 ,Purchase Order Trends,Pirkuma pasūtījuma tendences
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,The request for quotation can be accessed by clicking on the following link,"Par citāts pieprasījumu var piekļūt, uzklikšķinot uz šīs saites"
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,Piešķirt lapas par gadu.
 DocType: SG Creation Tool Course,SG Creation Tool Course,SG Creation Tool Course
 DocType: Student Group Creation Tool,Leave blank if you wish to fetch all courses for selected academic term,"Atstājiet tukšu, ja jūs vēlaties ielādēt visus kursus izvēlētajā akadēmiskajam termiņa"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,Insufficient Stock,nepietiekama Stock
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227,Insufficient Stock,nepietiekama Stock
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Atslēgt Capacity plānošana un laika uzskaites
+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: 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/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} does not belong to Company {1},Konts {0} nepieder Sabiedrībai {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +86,Account {0} does not belong to Company {1},Konts {0} nepieder Sabiedrībai {1}
 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}
 DocType: Naming Series,Series List for this Transaction,Sērija saraksts par šo darījumu
 DocType: Sales Invoice,Is Opening Entry,Vai atvēršana Entry
 DocType: Customer Group,Mention if non-standard receivable account applicable,Pieminēt ja nestandarta saņemama konts piemērojams
 DocType: Course Schedule,Instructor Name,instruktors Name
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,For Warehouse is required before Submit,"Par noliktava ir nepieciešams, pirms iesniegt"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,For Warehouse is required before Submit,"Par noliktava ir nepieciešams, pirms iesniegt"
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Saņemta
 DocType: Sales Partner,Reseller,Reseller
 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 +1436,"LocalStorage is full , did not save","LocalStorage ir pilna, nebija glābt"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1460,"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}
@@ -261,18 +262,19 @@
 apps/erpnext/erpnext/templates/generators/item.html +78,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 +5,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/leave_application/leave_application.py +206,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/leave_application/leave_application.py +213,Only the selected Leave Approver can submit this Leave Application,Tikai izvēlētais Leave apstiprinātājs var iesniegt šo atvaļinājums
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Atbrīvojot datums nedrīkst būt lielāks par datums savienošana
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Leaves per Year,Lapām gadā
+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 +103,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}
+DocType: Email Digest,Profit & Loss,Peļņas un zaudējumu
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,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 +435,Leave Blocked,Atstājiet Bloķēts
-apps/erpnext/erpnext/stock/doctype/item/item.py +669,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 +443,Leave Blocked,Atstājiet Bloķēts
+apps/erpnext/erpnext/stock/doctype/item/item.py +671,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 +83,Annual,Gada
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +86,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
@@ -280,20 +282,22 @@
 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ā"
 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 +91,Software Developer,Software Developer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Minimālais Order Daudz
 DocType: Pricing Rule,Supplier Type,Piegādātājs Type
 DocType: Scheduling Tool,Course Start Date,Kursu sākuma datums
 DocType: Item,Publish in Hub,Publicē Hub
+DocType: Student Admission,Student Admission,Studentu uzņemšana
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is cancelled,Postenis {0} ir atcelts
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Material Request,Materiāls Pieprasījums
+apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} is cancelled,Postenis {0} ir atcelts
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +823,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 +28,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 +328,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},{0} Prece nav atrasts &quot;Izejvielu Kopā&quot; tabulā Pirkuma pasūtījums {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +333,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/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
@@ -309,20 +313,21 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +130,Please select Charge Type first,"Lūdzu, izvēlieties iekasēšanas veids pirmais"
 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: Email Digest,New Quotations,Jauni Citāti
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Pirmais Atstājiet apstiprinātājs sarakstā tiks iestatīts kā noklusējuma Leave apstiprinātāja
 DocType: Tax Rule,Shipping County,Piegāde County
 apps/erpnext/erpnext/config/desktop.py +158,Learn,Mācīties
 DocType: Asset,Next Depreciation Date,Nākamais Nolietojums Datums
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Aktivitāte izmaksas uz vienu darbinieku
 DocType: Accounts Settings,Settings for Accounts,Iestatījumi kontu
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +626,Supplier Invoice No exists in Purchase Invoice {0},Piegādātājs Invoice Nr pastāv pirkuma rēķina {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +629,Supplier Invoice No exists in Purchase Invoice {0},Piegādātājs Invoice Nr pastāv pirkuma rēķina {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Pārvaldīt pārdošanas persona Tree.
 DocType: Job Applicant,Cover Letter,Pavadvēstule
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,"Izcilas Čeki un noguldījumi, lai nodzēstu"
 DocType: Item,Synced With Hub,Sinhronizēts ar Hub
 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 +348,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 +86,Circular Reference Error,Apļveida Reference kļūda
@@ -334,15 +339,16 @@
 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 +806,Delivery Note,Piegāde Note
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +800,Delivery Note,Piegāde Note
 apps/erpnext/erpnext/config/learn.py +87,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 +233,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/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/setup/doctype/email_digest/email_digest.py +104,Summary for this week and pending activities,Kopsavilkums par šo nedēļu un izskatāmo darbību
+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ā"
 DocType: Employee,Company Email,Uzņēmuma e-pasts
@@ -354,27 +360,28 @@
 apps/erpnext/erpnext/config/hr.py +186,"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ā"
-apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Pirkuma rēķins nevar būt pret esošā aktīva {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +554,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 +54,{0} already allocated for Employee {1} for period {2} to {3},{0} jau piešķirtais Darbinieku {1} par periodu {2} līdz {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +812,Select Item,Select postenis
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +791,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 \
 					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 +142,Purchase Invoice {0} is already submitted,Pirkuma rēķins {0} jau ir iesniegts
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Partijas Nr jābūt tāda pati kā {1} {2}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +143,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.
 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 +342,Please see attachment,"Lūdzu, skatiet pielikumu"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,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 +19,Setup Already Complete!!,Setup Jau Complete !!
 ,Finished Goods,Gatavās preces
 DocType: Delivery Note,Instructions,Instrukcijas
 DocType: Quality Inspection,Inspected By,Pārbaudīti Līdz
+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: 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/public/js/utils/item_selector.js +12,Add Items,Pievienot preces
@@ -388,29 +395,29 @@
 DocType: Currency Exchange,Currency Exchange,Valūtas maiņa
 DocType: Purchase Invoice Item,Item Name,Vienības nosaukums
 DocType: Authorization Rule,Approving User  (above authorized value),Apstiprinot lietotāju (virs atļautā vērtība)
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Kredītu atlikums
+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/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 +736,Purchase Return,Pirkuma Return
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +715,Purchase Return,Pirkuma Return
 ,Purchase Register,Pirkuma Reģistrēties
 DocType: 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 +202,{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 +209,{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 +143,Reason for losing,Iemesls zaudēt
-apps/erpnext/erpnext/accounts/utils.py +239,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 +163,Reason for losing,Iemesls zaudēt
+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
 DocType: Announcement,Receiver,Saņēmējs
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},"Darbstacija ir slēgta šādos datumos, kā par Holiday saraksts: {0}"
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Iespējas
 DocType: Employee,Single,Viens
 DocType: 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 +225,Please enter Cost Center,Ievadiet izmaksu centram
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,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
@@ -423,26 +430,26 @@
 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
 DocType: Account,Is Group,Is Group
+DocType: Email Digest,Pending Purchase Orders,Kamēr pirkuma pasūtījumu
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Automātiski iestata Serial Nos pamatojoties uz FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Pārbaudiet Piegādātājs Rēķina numurs Unikalitāte
 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 +102,Non Profit,Non Profit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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: Stock Reconciliation Item,Do not include symbols (ex. $),Neietver simbolus (ex. $)
 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 +638,Attribute {0} selected multiple times in Attributes Table,Prasme {0} izvēlēts vairākas reizes atribūtos tabulā
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Prasme {0} izvēlēts vairākas reizes atribūtos tabulā
 DocType: HR Settings,Employee record is created using selected field. ,"Darbinieku ieraksts tiek izveidota, izmantojot izvēlēto laukumu."
 DocType: Sales Order,Not Applicable,Nav piemērojams
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Brīvdienu pārvaldnieks
 DocType: Request for Quotation Item,Required Date,Nepieciešamais Datums
 DocType: Delivery Note,Billing Address,Norēķinu adrese
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +862,Please enter Item Code.,Ievadiet Preces kods.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +847,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"
@@ -456,12 +463,12 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Vērtspapīri un noguldījumi
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Kopā lapas piešķirtās ir obligāta
 DocType: Job Opening,Description of a Job Opening,Apraksts par vakanču
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Pending activities for today,Neapstiprinātas aktivitātes šodienu
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Neapstiprinātas aktivitātes šodienu
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Apmeklējumu ieraksts.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Alga Component kontrolsaraksts balstīta algas.
 DocType: Sales Order Item,Used for Production Plan,Izmanto ražošanas plānu
 DocType: Manufacturing Settings,Time Between Operations (in mins),Laiks starp operācijām (Min)
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +92,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} budžets konta {1} pret izmaksām centra {2} ir {3}. Tas pārsniegs līdz {4}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +95,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} budžets konta {1} pret izmaksām centra {2} ir {3}. Tas pārsniegs līdz {4}
 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
@@ -469,16 +476,16 @@
 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/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 +86,Administrative Officer,Administratīvā amatpersona
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,Administratīvā amatpersona
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +23,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 +319,Please select Company,"Lūdzu, izvēlieties Uzņēmums"
-DocType: Stock Entry,Difference Account,Atšķirība konts
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +309,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 +44,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 +398,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 +399,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 +530,"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 +532,"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 +28,Buy,pirkt
@@ -486,7 +493,7 @@
 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 +1563,Serial no item cannot be a fraction,Sērijas neviens punkts nevar būt daļa
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1587,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
@@ -495,13 +502,14 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Account {0} does not belong to company: {1},Konts {0} nav pieder uzņēmumam: {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation already used for another company,Abreviatūra jau tiek izmantots citam uzņēmumam
 DocType: Selling Settings,Default Customer Group,Default Klientu Group
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Supplier is required against Payable account {0},Piegādātājam ir pret maksājams kontā {0}
 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
 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 +313,Reference No and Reference Date is mandatory for Bank transaction,Atsauces Nr un atsauces datums ir obligāta Bank darījumu
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +316,Reference No and Reference Date is mandatory for Bank transaction,Atsauces Nr un atsauces datums ir obligāta Bank darījumu
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Pievienot / rediģēt nodokļiem un maksājumiem
 DocType: Purchase Invoice,Supplier Invoice No,Piegādātāju rēķinu Nr
 DocType: Territory,For reference,Par atskaites
@@ -512,7 +520,6 @@
 DocType: Installation Note Item,Installation Note Item,Uzstādīšana Note postenis
 DocType: Production Plan Item,Pending Qty,Kamēr Daudz
 DocType: Budget,Ignore,Ignorēt
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Preces kods&gt; postenis Group&gt; Brand
 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/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
@@ -523,11 +530,11 @@
 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/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 +28,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 +19,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 +707,Make Sales Order,Veikt klientu pasūtījumu
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +701,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ā
@@ -543,7 +550,8 @@
 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 +734,Sales Return,Sales Return
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +728,Sales Return,Sales Return
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +91,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)
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Database potenciālo klientu.
@@ -552,14 +560,13 @@
 DocType: Quotation,Quotation To,Piedāvājums:
 DocType: Lead,Middle Income,Middle Ienākumi
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +212,Opening (Cr),Atvere (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +795,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"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 +237,Allocated amount can not be negative,Piešķirtā summa nevar būt negatīvs
+apps/erpnext/erpnext/stock/doctype/item/item.py +797,Default Unit of Measure for Item {0} cannot be changed directly because 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
 DocType: Purchase Order Item,Billed Amt,Billed Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Loģisks Noliktava pret kuru noliktavas ierakstu veikšanas.
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Pārdošanas rēķins laika kontrolsaraksts
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},Atsauces Nr & Reference datums ir nepieciešama {0}
-DocType: Sales Invoice,Customer's Vendor,Klienta Vendor
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Proposal Writing,Priekšlikums Writing
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,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"
@@ -568,13 +575,14 @@
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,Time Tracking
 DocType: Fiscal Year Company,Fiscal Year Company,Fiskālā Gads Company
 DocType: Packing Slip Item,DN Detail,DN Detail
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +257,Already supplier quotation has created,Jau piegādātājs citāts ir radījis
 DocType: Timesheet,Billed,Rēķins
 DocType: Batch,Batch Description,Partijas Apraksts
+apps/erpnext/erpnext/accounts/utils.py +685,"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 +733,View Offline Records,Skatīt Offline Records
+apps/erpnext/erpnext/accounts/page/pos/pos.js +715,View Offline Records,Skatīt Offline Records
+DocType: Student,Sibling Details,Sibling Details
 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: Payment Reconciliation,Invoice/Journal Entry Details,Rēķins / Journal Entry Details
@@ -588,19 +596,20 @@
 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ā
 DocType: Employee,Passport Number,Pases numurs
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Manager,Vadītājs
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,Vadītājs
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,Same item has been entered multiple times.,Pats priekšmets ir ierakstīta vairākas reizes.
 DocType: SMS Settings,Receiver Parameter,Uztvērējs parametrs
-apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""Pamatojoties uz"" un ""Group By"", nevar būt vienādi"
+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
 DocType: Installation Note,IN-,IN
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter email address,Ievadiet e-pasta adresi
 DocType: Production Order Operation,In minutes,Minūtēs
 DocType: Issue,Resolution Date,Izšķirtspēja Datums
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +299,Timesheet created:,Kontrolsaraksts izveidots:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +715,Please set default Cash or Bank account in Mode of Payment {0},Lūdzu iestatītu standarta kases vai bankas kontu maksājuma veidu {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +300,Timesheet created:,Kontrolsaraksts izveidots:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +772,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
 DocType: Selling Settings,Customer Naming By,Klientu nosaukšana Līdz
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,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: 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
@@ -625,6 +634,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,apdare
 DocType: Pricing Rule,Sales Manager,Pārdošanas vadītājs
 DocType: Salary Structure Employee,Base,bāze
+DocType: Timesheet,Total Billed Hours,Kopā Apmaksājamie Stundas
 DocType: Journal Entry,Write Off Amount,Uzrakstiet Off summa
 DocType: Journal Entry,Bill No,Bill Nr
 DocType: Company,Gain/Loss Account on Asset Disposal,Gain / zaudējumu aprēķins par aktīva atsavināšana
@@ -639,11 +649,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +9,Pre Sales,Pre Sales
 DocType: Purchase Receipt,Other Details,Cita informācija
 DocType: Account,Accounts,Konti
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Marketing,Mārketings
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +227,Payment Entry is already created,Maksājums ieraksts ir jau radīta
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,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 +538,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 +21,Preview Salary Slip,Preview Alga Slip
+apps/erpnext/erpnext/controllers/accounts_controller.py +541,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 +38,Preview Salary Slip,Preview Alga Slip
 DocType: Company,Deafult Cost Center,Deafult Cost Center
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +48,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ā
@@ -652,7 +662,7 @@
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,"Lūdzu, izvēlieties skolēnu grupas"
 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 +617,Item has variants.,Prece ir varianti.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Prece ir varianti.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,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ē
@@ -672,7 +682,7 @@
 DocType: Purchase Order,Supply Raw Materials,Piegādes izejvielas
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Datums, kurā nākamais rēķins tiks radīts. Tas ir radīts apstiprināšanas."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Ilgtermiņa aktīvi
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,{0} is not a stock Item,{0} nav krājums punkts
+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 +169,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"
@@ -739,26 +749,25 @@
 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 +709,No Permission,Nav Atļaujas
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +710,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}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +298,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 +542,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} jāiesniedz
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} jāiesniedz
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Darbinieks nav atrasts
 DocType: Supplier Quotation,Stopped,Apturēts
 DocType: Item,If subcontracted to a vendor,Ja apakšlīgumu nodot pārdevējs
 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.
 DocType: Warehouse,Tree Details,Tree Details
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Nosūtīt tagad
 ,Support Analytics,Atbalsta Analytics
 DocType: Item,Website Warehouse,Web Noliktava
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimālā Rēķina summa
 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/sales_invoice/sales_invoice.py +227,Timesheet {0} is already completed or cancelled,Kontrolsaraksts {0} jau ir pabeigts vai atcelts
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +259,Timesheet {0} is already completed or cancelled,Kontrolsaraksts {0} jau ir pabeigts vai atcelts
 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
@@ -774,13 +783,13 @@
 apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Kursu grafiks
 DocType: Maintenance Visit,Completion Status,Pabeigšana statuss
 DocType: HR Settings,Enter retirement age in years,Ievadiet pensionēšanās vecumu gados
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +229,Target Warehouse,Mērķa Noliktava
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +230,Target Warehouse,Mērķa Noliktava
 DocType: Cheque Print Template,Starting location from left edge,Sākot atrašanās vietu no kreisās malas
 DocType: Item,Allow over delivery or receipt upto this percent,Atļaut pār piegādi vai saņemšanu līdz pat šim procentiem
 DocType: Stock Entry,STE-,STE-
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Sales Order Date,"Paredzams, Piegāde datums nevar būt pirms Sales Order Datums"
 DocType: Upload Attendance,Import Attendance,Import apmeklējums
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Visi punkts grupas
+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/config/setup.py +89,Automatically compose message on submission of transactions.,Automātiski komponēt ziņu iesniegšanas darījumiem.
@@ -792,13 +801,15 @@
 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/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
 DocType: Expense Claim,Expenses,Izdevumi
 DocType: Item Variant Attribute,Item Variant Attribute,Prece Variant Prasme
 ,Purchase Receipt Trends,Pirkuma čeka tendences
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Research & Development,Pētniecība un attīstība
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Pētniecība un attīstība
 ,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
@@ -807,7 +818,7 @@
 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/controllers/accounts_controller.py +340,"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ā."
+apps/erpnext/erpnext/controllers/accounts_controller.py +343,"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
@@ -829,12 +840,12 @@
 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 +756,Purchase Receipt,Pirkuma čeka
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +735,Purchase Receipt,Pirkuma čeka
 ,Received Items To Be Billed,Saņemtie posteņi ir Jāmaksā
 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 +167,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 +282,Unable to find Time Slot in the next {0} days for Operation {1},Nevar atrast laika nišu nākamajos {0} dienas ekspluatācijai {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +170,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 +283,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 +439,BOM {0} must be active,BOM {0} jābūt aktīvam
@@ -845,7 +856,7 @@
 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 +214,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 +217,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
@@ -859,9 +870,9 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Darbinieku {0} nav aktīvs vai neeksistē
 DocType: Fee Structure,Components,sastāvdaļas
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,Please enter Asset Category in Item {0},Ievadiet aktīvu kategorijas postenī {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +612,Item Variants {0} updated,Postenis Variants {0} atjaunināta
+apps/erpnext/erpnext/stock/doctype/item/item.py +614,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 +843,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 +854,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
@@ -876,69 +887,72 @@
 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 +728,New Sales Invoice,Jaunu pārdošanas rēķinu
+apps/erpnext/erpnext/accounts/page/pos/pos.js +710,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 +728,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
 DocType: Material Request Item,Lead Time Date,Izpildes laiks Datums
 DocType: Guardian,Guardian Name,Guardian Name
 DocType: Cheque Print Template,Has Print Format,Ir Drukas formāts
-apps/erpnext/erpnext/accounts/page/pos/pos.js +86, 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 +109,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 +619,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","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/page/pos/pos.js +75, 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 +613,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing 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 +606,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
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +609,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
 DocType: Purchase Invoice Item,Purchase Order Item,Pasūtījuma postenis
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +130,Indirect Income,Netieša Ienākumi
 DocType: Cheque Print Template,Date Settings,Datums iestatījumi
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Pretruna
 ,Company Name,Uzņēmuma nosaukums
 DocType: SMS Center,Total Message(s),Kopējais ziņojumu (-i)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +810,Select Item for Transfer,Izvēlieties Prece pārneses
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +789,Select Item for Transfer,Izvēlieties Prece pārneses
 DocType: Purchase Invoice,Additional Discount Percentage,Papildu Atlaide procentuālā
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Skatīt sarakstu ar visu palīdzību video
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Izvēlieties kontu vadītājs banku, kurā tika deponēts pārbaude."
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Ļauj lietotājam rediģēt Cenrādi Rate darījumos
 DocType: Pricing Rule,Max Qty,Max Daudz
-DocType: Student Applicant,Father's Name,Tēva vārds
 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 +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Rinda {0}: Samaksa pret pārdošanas / pirkšanas ordeņa vienmēr jāmarķē kā iepriekš
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Ķīmisks
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +686,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/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"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +694,All items have already been transferred for this Production Order.,"Visi posteņi jau ir pārskaitīta, lai šim Ražošanas ordeni."
 DocType: Process Payroll,Select Payroll Year and Month,Izvēlieties Algas gads un mēnesis
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,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
-DocType: Opportunity,Walk In,Walk In
 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 +12,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: Timesheet Detail,Bill,Rēķins
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,White,Balts
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,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
 DocType: SMS Center,All Lead (Open),Visi Svins (Open)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +228,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})
+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 +731,Make ,Izveidot
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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."
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Grozs
-apps/erpnext/erpnext/controllers/selling_controller.py +154,Order Type must be one of {0},Rīkojums Type jābūt vienam no {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Rīkojums Type jābūt vienam no {0}
 DocType: Lead,Next Contact Date,Nākamais Contact Datums
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Atklāšanas Daudzums
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +393,Please enter Account for Change Amount,Ievadiet Kontu pārmaiņu summa
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,Please enter Account for Change Amount,Ievadiet Kontu pārmaiņu summa
 DocType: Student Batch,Student Batch Name,Student Partijas nosaukums
 DocType: Holiday List,Holiday List Name,Brīvdienu saraksta Nosaukums
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js +8,Schedule Course,grafiks Course
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Stock Options,Akciju opcijas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Akciju opcijas
 DocType: Journal Entry Account,Expense Claim,Izdevumu Pretenzija
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +211,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 +237,Qty for {0},Daudz par {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +212,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 +238,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
@@ -947,9 +961,9 @@
 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/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Noņemts preces bez izmaiņām daudzumā vai vērtībā.
+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 +635,Attribute table is mandatory,Atribūts tabula ir obligāta
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Atribūts tabula ir obligāta
 DocType: Production Planning Tool,Get Sales Orders,Saņemt klientu pasūtījumu
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{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"
@@ -974,7 +988,7 @@
 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/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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Sērijas Nr {0} ir zem uzturēšanas līgumu līdz pat {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +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
@@ -986,7 +1000,7 @@
 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/controllers/selling_controller.py +231,Sales Order {0} is {1},Sales Order {0} {1}
+apps/erpnext/erpnext/controllers/selling_controller.py +232,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
 DocType: Packing Slip,Net Weight UOM,Neto svara Mērvienība
@@ -996,25 +1010,24 @@
 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
 DocType: Sales Person,Select company name first.,Izvēlieties uzņēmuma nosaukums pirmo reizi.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,"Citāti, kas saņemti no piegādātājiem."
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},Uz {0} | {1}{2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Vidējais vecums
 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/templates/pages/home.html +32,View All Products,Skatīt visus produktus
-DocType: Company,Default Currency,Default Valūtas
+apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Skatīt visus produktus
+DocType: Company,Default Currency,Noklusējuma Valūtas
 DocType: Contact,Enter designation of this Contact,Ievadiet cilmes šo kontaktadresi
 DocType: Expense Claim,From Employee,No darbinieka
-apps/erpnext/erpnext/controllers/accounts_controller.py +400,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"
+apps/erpnext/erpnext/controllers/accounts_controller.py +403,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/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,un gads:
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +191,{0} {1} must be submitted,{0}{1} jāiesniedz
-DocType: Email Digest,Annual Expense,Gada Izdevumu
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,{0} {1} must be submitted,{0}{1} jāiesniedz
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +145,Quantity must be less than or equal to {0},Daudzumam ir jābūt mazākam vai vienādam ar {0}
 DocType: SMS Center,Total Characters,Kopā rakstzīmes
 apps/erpnext/erpnext/controllers/buying_controller.py +156,Please select BOM in BOM field for Item {0},"Lūdzu, izvēlieties BOM BOM jomā postenim {0}"
@@ -1025,30 +1038,31 @@
 DocType: Sales Partner,Distributor,Izplatītājs
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Grozs Piegāde noteikums
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +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 +62,Please set 'Apply Additional Discount On',Lūdzu noteikt &quot;piemērot papildu Atlaide On&quot;
+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
 DocType: Global Defaults,Global Defaults,Globālie Noklusējumi
 apps/erpnext/erpnext/projects/doctype/project/project.py +153,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
 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 +327,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
 ,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 +362,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/stock/doctype/stock_entry/stock_entry.py +367,Finished Item {0} must be entered for Manufacture type entry,"Gatavo postenis {0} ir jāieraksta, lai ražošana tipa ierakstu"
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Atvēršanas Grāmatvedības bilance
 DocType: Sales Invoice Advance,Sales Invoice Advance,PPR Advance
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +499,Nothing to request,Nav ko pieprasīt
-apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',"""Faktiskais sākuma datums"" nevar būt lielāks par ""faktiskā beigu datuma"""
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Management,Vadība
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},Nu debeta vai kredīta summa ir nepieciešama {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +500,Nothing to request,Nav ko pieprasīt
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',"""Faktiskais sākuma datums"" nevar būt lielāks par ""Faktisko beigu datumu"""
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,Vadība
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +55,Either debit or credit amount is required for {0},Nu debeta vai kredīta summa ir nepieciešama {0}
 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 +161,Blue,Zils
+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
@@ -1058,12 +1072,12 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +23,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
 DocType: Stock Settings,Default Item Group,Default Prece Group
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1374,Do you really want to submit the invoice?,"Vai jūs tiešām vēlaties, lai iesniegtu rēķinu?"
+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 +685,Cost Center For Item with Item Code ',"Izmaksās Center postenī ar Preces kods """
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1526,"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 +679,Cost Center For Item with Item Code ',"Izmaksās Center postenī ar Preces kods """
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1550,"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/accounts/doctype/account/account_tree.js +26,"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
@@ -1083,104 +1097,106 @@
 DocType: Payment Reconciliation,Unreconciled Payment Details,Unreconciled maksājumu informācija
 DocType: Global Defaults,Current Fiscal Year,Kārtējā fiskālajā gadā
 DocType: Global Defaults,Disable Rounded Total,Atslēgt noapaļotiem Kopā
-DocType: Lead,Call,Izsaukums
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +417,'Entries' cannot be empty,"""Ieraksti"" nevar būt tukšs"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +418,'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 +214,Fiscal Year {0} not found,Fiskālā gads {0} nav atrasts
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +221,Fiscal Year {0} not found,Fiskālā gads {0} nav atrasts
 apps/erpnext/erpnext/config/hr.py +238,Setting up Employees,Iestatīšana Darbinieki
 DocType: Sales Order,SO-,TĀTAD-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,"Lūdzu, izvēlieties kodu pirmais"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Please select prefix first,"Lūdzu, izvēlieties kodu pirmais"
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Research,Pētniecība
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,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 +43,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 +57,View Ledger,View Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Senākās
-apps/erpnext/erpnext/stock/doctype/item/item.py +504,"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 +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/setup/setup_wizard/setup_wizard.py +437,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
 ,Budget Variance Report,Budžets Variance ziņojums
 DocType: Salary Slip,Gross Pay,Bruto Pay
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +90,Row {0}: Activity Type is mandatory.,Rinda {0}: darbības veids ir obligāta.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +114,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/public/js/controllers/stock_controller.js +40,Accounting Ledger,Grāmatvedības Ledger
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,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
 DocType: BOM Item,Item Description,Vienība Apraksts
+DocType: Student Sibling,Student Sibling,Student Radniecīga
 DocType: Purchase Invoice,Is Recurring,Vai Atkārtojas
 DocType: Purchase Invoice,Supplied Items,Komplektā Items
 DocType: Student,STUD.,STUD.
 DocType: Production Order,Qty To Manufacture,Daudz ražot
+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/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 +131,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 +175,Valuation Rate required for Item in row {0},Vērtēšana Rate nepieciešama postenī rindā {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,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
 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 +87, to ,līdz
+apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,līdz
 DocType: Item,Lead Time in days,Izpildes laiks dienās
 ,Accounts Payable Summary,Kreditoru kopsavilkums
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Not authorized to edit frozen Account {0},Nav atļauts rediģēt iesaldētā kontā {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,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 +62,Sales Order {0} is not valid,Pasūtījumu {0} nav derīga
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Pasūtījumu {0} nav derīga
 apps/erpnext/erpnext/setup/doctype/company/company.py +185,"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 +152,Small,Mazs
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,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}"
 ,Invoiced Amount (Exculsive Tax),Rēķinā Summa (Exculsive nodoklis)
-DocType: Student Applicant,Mother's / Guardian 1 Email ID,Mātes / Guardian 1 Email ID
 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 +160,Green,Zaļš
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,Zaļš
 DocType: Supplier,SUPP-,SUPP-
 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 +57,Contract,Līgums
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,Līgums
 DocType: Email Digest,Add Quote,Pievienot Citēt
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +498,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 +503,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 +80,Row {0}: Qty is mandatory,Rinda {0}: Daudz ir obligāta
+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 +737,Sync Master Data,Sync Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +719,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/public/js/setup_wizard.js +283,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
+DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Tas ir sakne posteni grupas un to nevar rediģēt.
+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.
 DocType: Journal Entry Account,Purchase Order,Pasūtījuma
 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 +345,"{0}: Employee email not found, hence email not sent","{0}: Darbinieku e-pasts nav atrasts, līdz ar to e-pasts nav nosūtīts"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +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
 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 +118,"For {0}, only credit accounts can be linked against another debit entry","Par {0}, tikai kredīta kontus var saistīt pret citu debeta ierakstu"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Delivery Note {0} is not submitted,Piegāde piezīme {0} nav iesniegta
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Delivery Note {0} is not submitted,Piegāde piezīme {0} nav iesniegta
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Sub-contracted Item,Postenis {0} jābūt Apakšuzņēmēju postenis
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Kapitāla Ekipējums
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Cenu noteikums vispirms izvēlas, pamatojoties uz ""Apply On 'jomā, kas var būt punkts, punkts Koncerns vai Brand."
 DocType: Hub Settings,Seller Website,Pārdevējs Website
 DocType: Item,ITEM-,PRIEKŠMETS-
-apps/erpnext/erpnext/controllers/selling_controller.py +147,Total allocated percentage for sales team should be 100,Kopējais piešķirtais procentuālu pārdošanas komanda būtu 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +110,Production Order status is {0},Ražošanas Pasūtījuma statuss ir {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Kopējais piešķirtais procentuālu pārdošanas komanda būtu 100
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Ražošanas Pasūtījuma statuss ir {0}
 DocType: Appraisal Goal,Goal,Mērķis
 DocType: Sales Invoice Item,Edit Description,Edit Apraksts
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +757,For Supplier,Piegādātājam
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +723,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
@@ -1196,10 +1212,11 @@
 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
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-pasts Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +445,BOM {0} does not belong to Item {1},BOM {0} nepieder posteni {1}
 DocType: Sales Partner,Target Distribution,Mērķa Distribution
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1667,Deafault warehouse is required for selected item,Deafault noliktava ir nepieciešama minus posteni
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Deafault warehouse is required for selected item,Deafault noliktava ir nepieciešama minus posteni
 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
@@ -1208,23 +1225,23 @@
 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 +110,Hardware,Detaļas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,Detaļas
 DocType: Sales Order,Recurring Upto,Periodisks Līdz pat
 DocType: Attendance,HR Manager,HR vadītājs
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,"Lūdzu, izvēlieties Company"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Privilege Leave,Privilege Leave
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,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 +79,You need to enable Shopping Cart,"Jums ir nepieciešams, lai dotu iespēju Grozs"
 DocType: Payment Entry,Writeoff,Norakstīt
 DocType: Appraisal Template Goal,Appraisal Template Goal,Izvērtēšana Template Goal
-DocType: Salary Slip,Earning,Nopelnot
+DocType: Salary Component,Earning,Nopelnot
 DocType: Purchase Invoice,Party Account Currency,Party konta valūta
 ,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 +171,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 +174,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_data.py +358,Food,Pārtika
+apps/erpnext/erpnext/demo/setup/setup_data.py +301,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/course_schedule/course_schedule.js +103,Mark Attendence,Mark Attendence
@@ -1258,12 +1275,12 @@
 DocType: Sales Order Item,Planned Quantity,Plānotais daudzums
 DocType: Purchase Invoice Item,Item Tax Amount,Vienība Nodokļa summa
 DocType: Item,Maintain Stock,Uzturēt Noliktava
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +209,Stock Entries already created for Production Order ,Krājumu jau radīti Ražošanas Pasūtīt
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,Krājumu jau radīti Ražošanas Pasūtīt
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,Neto izmaiņas pamatlīdzekļa
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Atstāt tukšu, ja to uzskata par visiem apzīmējumiem"
-apps/erpnext/erpnext/controllers/accounts_controller.py +620,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 +238,Max: {0},Max: {0}
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +15,From Datetime,No DATETIME
+apps/erpnext/erpnext/controllers/accounts_controller.py +623,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 +239,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 +153,"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."
@@ -1271,8 +1288,8 @@
 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 +552,cannot be greater than 100,nevar būt lielāks par 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +680,Item {0} is not a stock Item,Postenis {0} nav krājums punkts
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +546,cannot be greater than 100,nevar būt lielāks par 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,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
@@ -1286,10 +1303,9 @@
 DocType: GL Entry,GL Entry,GL Entry
 DocType: HR Settings,Employee Settings,Darbinieku iestatījumi
 ,Batch-Wise Balance History,Partijas-Wise Balance Vēsture
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,To Do List
 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 +61,Apprentice,Māceklis
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +102,Negative Quantity is not allowed,Negatīva Daudzums nav atļauta
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,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 +152,Employee cannot report to himself.,Darbinieks nevar ziņot sev.
@@ -1310,15 +1326,14 @@
 DocType: Asset,Asset Name,Asset Name
 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 +141,Source warehouse is mandatory for row {0},Source noliktava ir obligāta rindā {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +719,Packing Slip,Iepakošanas Slip
+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 +713,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/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,Pieprasīt piedāvājumu var noklikšķinot uz šīs saites
 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 +81,Analyst,Analītiķis
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,Analītiķis
 DocType: Item,Inventory,Inventārs
 DocType: Item,Sales Details,Pārdošanas Details
 DocType: Quality Inspection,QI-,QI-
@@ -1326,7 +1341,7 @@
 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 +103,Government,Valdība
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,Valdība
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,Institute Name
 apps/erpnext/erpnext/config/stock.py +289,Item Variants,Postenis Variants
 DocType: Company,Services,Pakalpojumi
@@ -1342,6 +1357,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,Financial Year Start Date,Finanšu gada sākuma datums
 DocType: POS Profile,Apply Discount,Piesakies Atlaide
 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
 DocType: Program Course,Program Course,Program Course
@@ -1382,12 +1398,12 @@
 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
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +110,Accounting Entry for {0} can only be made in currency: {1},Grāmatvedības ieraksts par {0} var veikt tikai valūtā: {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Grāmatvedības ieraksts par {0} var veikt tikai valūtā: {1}
 DocType: Pricing Rule,Pricing Rule,Cenu noteikums
 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
 DocType: Shopping Cart Settings,Payment Success URL,Maksājumu Success URL
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +78,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: Atgriezās Vienība {1} jo neeksistē {2} {3}
+apps/erpnext/erpnext/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
@@ -1396,40 +1412,39 @@
 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/stock/doctype/stock_entry/stock_entry.py +339,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Nav atļauts pārsūtīšana vairāk {0} nekā {1} pret Pirkuma pasūtījums {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +344,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 +545,Manufacturing Quantity is mandatory,Ražošanas daudzums ir obligāta
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Ražošanas daudzums ir obligāta
 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 +71,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 +162,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/projects/doctype/timesheet/timesheet.py +186,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
 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 +130,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 +137,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
 DocType: Dependent Task,Dependent Task,Atkarīgs Task
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,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/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 +190,Leave of type {0} cannot be longer than {1},Atvaļinājums tipa {0} nevar būt ilgāks par {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +197,Leave of type {0} cannot be longer than {1},Atvaļinājums tipa {0} nevar būt ilgāks par {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Mēģiniet plānojot operācijas X dienas iepriekš.
 DocType: HR Settings,Stop Birthday Reminders,Stop Birthday atgādinājumi
 DocType: SMS Center,Receiver List,Uztvērējs Latviešu
-apps/erpnext/erpnext/accounts/page/pos/pos.js +921,Search Item,Meklēt punkts
+apps/erpnext/erpnext/accounts/page/pos/pos.js +910,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 +546,Already completed,jau pabeigts
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +22,Payment Request already exists {0},Maksājuma pieprasījums jau eksistē {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +550,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 +241,Quantity must not be more than {0},Daudzums nedrīkst būt lielāks par {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Quantity must not be more than {0},Daudzums nedrīkst būt lielāks par {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +76,Previous Financial Year is not closed,Iepriekšējais finanšu gads nav slēgts
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +44,Age (Days),Vecums (dienas)
 DocType: Quotation Item,Quotation Item,Piedāvājuma rinda
@@ -1446,7 +1461,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +221,Purchase Receipt {0} is not submitted,Pirkuma saņemšana {0} nav iesniegta
 DocType: Company,Default Payable Account,Default Kreditoru konts
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Iestatījumi tiešsaistes iepirkšanās grozs, piemēram, kuģošanas noteikumus, cenrādi uc"
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +83,{0}% Billed,{0}% Jāmaksā
+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
@@ -1458,12 +1473,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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/schools/doctype/fees/fees.js +22,Collect,savākt
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,savākt
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,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 +225,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
-DocType: Payment Reconciliation,Payments,Maksā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
@@ -1475,7 +1489,7 @@
 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 +9,Procurement,iepirkums
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,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/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
 ,Lead Details,Potenciālā klienta detaļas
 DocType: Purchase Invoice,End date of current invoice's period,Beigu datums no kārtējā rēķinā s perioda
@@ -1500,7 +1514,7 @@
 DocType: Purchase Invoice,Additional Discount,Papildu Atlaide
 DocType: Selling Settings,Selling Settings,Pārdošanas iestatījumi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Online Izsoles
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +97,Please specify either Quantity or Valuation Rate or both,"Lūdzu, norādiet nu Daudzums vai Vērtēšanas Rate vai abus"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,"Lūdzu, norādiet nu Daudzums vai Vērtēšanas Rate vai abus"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +13,Fulfillment,izpilde
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Company, mēnesis un gads tiek obligāta"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Mārketinga izdevumi
@@ -1521,14 +1535,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,ERPNext Setup Complete!
 DocType: Item,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +93,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"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/selling/doctype/customer/customer.py +126,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
 DocType: Stock Entry,Material Receipt,Materiālu saņemšana
 DocType: Homepage,Products,Produkti
 DocType: Announcement,Instructor,instruktors
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},Party Type un partija ir nepieciešama / debitoru kontā {0}
 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
@@ -1539,7 +1552,7 @@
 ,Item-wise Sales Register,Postenis gudrs Sales Reģistrēties
 DocType: Asset,Gross Purchase Amount,Gross Pirkuma summa
 DocType: Asset,Depreciation Method,nolietojums metode
-apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Offline,Bezsaistē
+apps/erpnext/erpnext/accounts/page/pos/pos.js +686,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
@@ -1557,25 +1570,27 @@
 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
 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 +858,Make Purchase Order,Izveidot pirkuma pasūtījumu
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +852,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 +141,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 +148,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
 DocType: Stock Reconciliation,Stock Reconciliation,Stock Izlīgums
 DocType: Territory,Territory Name,Teritorija Name
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +172,Work-in-Progress Warehouse is required before Submit,"Work-in-Progress Warehouse ir nepieciešams, pirms iesniegt"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,Work-in-Progress Warehouse is required before Submit,"Work-in-Progress Warehouse ir nepieciešams, pirms iesniegt"
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Pretendents uz darbu.
 DocType: Purchase Order Item,Warehouse and Reference,Noliktavas un atsauce
 DocType: Supplier,Statutory info and other general information about your Supplier,Normatīvais info un citu vispārīgu informāciju par savu piegādātāju
-apps/erpnext/erpnext/hooks.py +88,Addresses,Adreses
-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/payment_entry/payment_entry.py +212,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/hooks.py +95,Addresses,Adreses
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +215,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ā
 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)"
 DocType: Sales Order,To Deliver and Bill,Rīkoties un Bill
@@ -1583,11 +1598,10 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,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 +731,Payment,Maksājums
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,Payment,Maksājums
 DocType: Production Order Operation,Actual Time and Cost,Faktiskais laiks un izmaksas
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Materiāls pieprasījums maksimāli {0} var izdarīt postenī {1} pret pārdošanas ordeņa {2}
 DocType: Employee,Salutation,Sveiciens
-DocType: Pricing Rule,Brand,Brand
 DocType: Course,Course Abbreviation,Protams saīsinājums
 DocType: Item,Will also apply for variants,Attieksies arī uz variantiem
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +142,"Asset cannot be cancelled, as it is already {0}","Asset nevar atcelt, jo tas jau ir {0}"
@@ -1599,7 +1613,7 @@
 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."
 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 +85,Associate,Līdzstrādnieks
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,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
@@ -1607,7 +1621,7 @@
 DocType: Production Planning Tool,Material Requests,Materiālu pieprasījumi
 DocType: Warranty Claim,Issue Date,Emisijas datums
 DocType: Activity Cost,Activity Cost,Aktivitāte Cost
-DocType: Timesheet Detail,Timesheet Detail,kontrolsaraksts Detail
+DocType: Sales Invoice Timesheet,Timesheet Detail,kontrolsaraksts Detail
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Patērētā Daudz
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekomunikācijas
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Norāda, ka pakete ir daļa no šīs piegādes (Tikai projekts)"
@@ -1630,6 +1644,7 @@
 DocType: Production Plan Material Request,Material Request Date,Materiāls pieprasījums Datums
 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
 DocType: Item,Has Variants,Ir Varianti
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nosaukums Mēneša Distribution
 DocType: Sales Person,Parent Sales Person,Parent Sales Person
@@ -1642,30 +1657,31 @@
 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 +44,"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/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."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +502,Error: {0} &gt; {1},Kļūda: {0}&gt; {1}
 DocType: Item,Is Sales Item,Produkts tiek pārdots
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Postenis Group Tree
 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."
 DocType: Naming Series,Current Value,Pašreizējā vērtība
-apps/erpnext/erpnext/controllers/accounts_controller.py +235,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/controllers/accounts_controller.py +238,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
 DocType: Delivery Note Item,Against Sales Order,Pret pārdošanas rīkojumu
 ,Serial No Status,Sērijas Nr statuss
 DocType: Payment Entry Reference,Outstanding,izcils
 ,Daily Timesheet Summary,Ikdienas laika kontrolsaraksts kopsavilkums
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +458,Item table can not be blank,Postenis tabula nevar būt tukšs
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +443,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 +5,This is based on stock movement. See {0} for details,"Tas ir balstīts uz krājumu kustības. Skatīt {0}, lai uzzinātu"
 DocType: Pricing Rule,Selling,Pārdošana
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +341,Amount {0} {1} deducted against {2},Summa {0} {1} atskaitīt pret {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +344,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
@@ -1680,8 +1696,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +144,Cannot refer row number greater than or equal to current row number for this Charge type,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 +159,Red,Sarkans
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Lūdzu, noklikšķiniet uz ""Generate grafiks"" atnest Sērijas Nr piebilda postenī {0}"
+apps/erpnext/erpnext/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
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Base Summa (Company valūta)
@@ -1689,7 +1705,7 @@
 DocType: Installation Note,Installation Time,Uzstādīšana laiks
 DocType: Sales Invoice,Accounting Details,Grāmatvedības Details
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,"Dzēst visas darījumi, par šo uzņēmumu"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +187,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,"Row # {0}: Operation {1} nav pabeigta {2} Daudz gatavo preču ražošanas kārtību # {3}. Lūdzu, atjauniniet darbības statusu, izmantojot Time Baļķi"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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,"Row # {0}: Operation {1} nav pabeigta {2} Daudz gatavo preču ražošanas kārtību # {3}. Lūdzu, atjauniniet darbības statusu, izmantojot Time Baļķi"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,Investīcijas
 DocType: Issue,Resolution Details,Izšķirtspēja Details
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,piešķīrumi
@@ -1725,16 +1741,17 @@
 DocType: Bank Reconciliation Detail,Against Account,Pret kontu
 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}
 DocType: Delivery Note,Excise Page Number,Akcīzes Page Number
 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}
 ,Maintenance Schedules,Apkopes grafiki
 DocType: Task,Actual End Date (via Time Sheet),Faktiskā Beigu datums (via laiks lapas)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Amount {0} {1} against {2} {3},Summa {0} {1} pret {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +339,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 +138,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 +295,Debit To account must be a Receivable account,Debets Lai kontā jābūt pasūtītāju konta
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Receivable account,Debets Lai kontā jābūt pasūtītāju konta
 DocType: Shipping Rule Condition,Shipping Amount,Piegāde Summa
 ,Pending Amount,Kamēr Summa
 DocType: Purchase Invoice Item,Conversion Factor,Conversion Factor
@@ -1742,10 +1759,10 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +137,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"
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +90,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Kopā piešķirtie lapas {0} nevar būt mazāka par jau apstiprināto lapām {1} par periodu
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +93,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 +22,Enter Paid Amount,Ievadiet samaksātā summa
+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
@@ -1755,13 +1772,15 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,timesheets
 DocType: HR Settings,HR Settings,HR iestatījumi
 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 +524,"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."
+apps/erpnext/erpnext/controllers/accounts_controller.py +527,"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 +249,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
 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/stock/get_item_details.py +123,Please specify Company,"Lūdzu, norādiet Company"
 ,Customer Acquisition and Loyalty,Klientu iegāde un lojalitātes
@@ -1772,17 +1791,19 @@
 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 +183,Closing (Opening + Totals),Noslēguma (atvēršana + kopsummas)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),Noslēguma (atvēršana + kopsummas)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,"Lūdzu, norādiet valūtu Company"
 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/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ī"
-apps/erpnext/erpnext/controllers/accounts_controller.py +272,Account {0} is invalid. Account Currency must be {1},Konts {0} ir nederīgs. Konta valūta ir {1}
+DocType: Email Digest,Pending Sales Orders,Kamēr klientu pasūtījumu
+apps/erpnext/erpnext/controllers/accounts_controller.py +275,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 +956,"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 Slip,Deduction,Atskaitīšana
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +87,Row {0}: From Time and To Time is mandatory.,Rinda {0}: laiku un uz laiku ir obligāta.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +969,"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 +111,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 +262,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 +7,Please enter Employee Id of this sales person,Ievadiet Darbinieku Id šīs pārdošanas persona
@@ -1790,7 +1811,7 @@
 DocType: Project,% Tasks Completed,% Uzdevumi Pabeigti
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,Starpības summa ir nulle
 DocType: Project,Gross Margin,Bruto peļņa
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +194,Please enter Production Item first,Ievadiet Ražošanas Prece pirmais
+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
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Piedāvājums
@@ -1799,53 +1820,54 @@
 DocType: Maintenance Visit,Maintenance User,Uzturēšanas lietotājs
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +149,Cost Updated,Izmaksas Atjaunots
 DocType: Employee,Date of Birth,Dzimšanas datums
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +86,Item {0} has already been returned,Postenis {0} jau ir atgriezies
+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}
+DocType: Student Admission,Eligibility,Tiesības
 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 +177,Job Description,Darba apraksts
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,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 +126,"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 +127,"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."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +24,Welcome to POS: Create your POS Profile,Laipni lūdzam POS: Izveidot savu POS profils
 DocType: Expense Claim,Approver,Apstiprinātājs
 ,SO Qty,SO Daudz
+DocType: Guardian,Work Address,darba adrese
 DocType: Appraisal,Calculate Total Score,Aprēķināt kopējo punktu skaitu
 DocType: Request for Quotation,Manufacturing Manager,Ražošanas vadītājs
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Sērijas Nr {0} ir garantijas līdz pat {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +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 +74,Shipments,Sūtījumi
+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
 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 +153,Row # ,Row #
+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 +156,Get From,Nokļūt no
+apps/erpnext/erpnext/public/js/utils.js +167,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,Default Company
+DocType: Global Defaults,Default Company,Noklusējuma uzņēmums
 apps/erpnext/erpnext/controllers/stock_controller.py +167,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 +416,"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"
+apps/erpnext/erpnext/controllers/accounts_controller.py +419,"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
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} is disabled,Lietotāja {0} ir invalīds
 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 ...
 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 +171,"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 +346,{0} is mandatory for Item {1},{0} ir obligāta postenī {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,{0} is mandatory for Item {1},{0} ir obligāta postenī {1}
 DocType: Currency Exchange,From Currency,No Valūta
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Lūdzu, izvēlieties piešķirtā summa, rēķina veidu un rēķina numura atleast vienā rindā"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,Izmaksas jauno pirkumu
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},Pasūtījumu nepieciešams postenī {0}
 DocType: Purchase Invoice Item,Rate (Company Currency),Rate (Company valūta)
-apps/erpnext/erpnext/demo/setup_data.py +360,Others,Pārējie
+DocType: Student Guardian,Others,Pārējie
 DocType: Payment Entry,Unallocated Amount,nepiešķirto Summa
 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
@@ -1865,17 +1887,16 @@
 apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,Serializēja inventarizācija
 DocType: Activity Type,Default Billing Rate,Default Norēķinu Rate
 DocType: Sales Invoice,Total Billing Amount,Kopā Norēķinu summa
-apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +54,Receivable Account,Debitoru konts
-apps/erpnext/erpnext/controllers/accounts_controller.py +546,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} jau {2}
+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 +549,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 +79,CEO,CEO
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,CEO
 DocType: Expense Claim Detail,Expense Claim Detail,Izdevumu Pretenzija Detail
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +808,Please select correct account,"Lūdzu, izvēlieties pareizo kontu"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +809,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
-DocType: Purchase Invoice Item,Page Break,Page Break
 DocType: Production Order Operation,Pending,Līdz
 DocType: Course,Course Name,Kursa nosaukums
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Lietotāji, kuri var apstiprināt konkrētā darbinieka atvaļinājumu pieteikumus"
@@ -1884,14 +1905,15 @@
 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 +54,Full-time,Pilna laika
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,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: Student,Guardians,Guardians
 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 +289,Debit To is required,Debets ir nepieciešama
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +321,Debit To is required,Debets ir nepieciešama
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Pirkuma Cenrādis
 DocType: Offer Letter Term,Offer Term,Piedāvājums Term
 DocType: Quality Inspection,Quality Manager,Kvalitātes vadītājs
@@ -1899,6 +1921,7 @@
 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/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
@@ -1909,18 +1932,17 @@
 DocType: Production Order Operation,Completed Qty,Pabeigts Daudz
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"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 +273,Price List {0} is disabled,Cenrādis {0} ir invalīds
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +99,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/projects/doctype/timesheet/timesheet.py +123,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
 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}."
 DocType: Stock Reconciliation Item,Current Valuation Rate,Pašreizējais Vērtēšanas Rate
 DocType: Item,Customer Item Codes,Klientu punkts Codes
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,Exchange Gain / zaudējumi
 DocType: Opportunity,Lost Reason,Zaudēja Iemesls
-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/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/purchase_receipt/purchase_receipt.py +378,All items have already been invoiced,Visi posteņi jau ir rēķinā
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +379,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
@@ -1936,18 +1958,19 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Jūsu klienti
 apps/erpnext/erpnext/projects/doctype/project/project.py +141,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/job_opening.html +19,Apply Now,Pieteikties tagad
+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."
 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
-apps/erpnext/erpnext/utilities/doctype/address/address.py +164,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: Fee Structure,Fee Structure,maksa struktūra
 DocType: Timesheet Detail,Costing Amount,Izmaksu summa
+DocType: Student Admission,Application Fee,Pieteikuma maksa
 DocType: Process Payroll,Submit Salary Slip,Iesniegt par atalgojumu
-apps/erpnext/erpnext/controllers/selling_controller.py +161,Maxiumm discount for Item {0} is {1}%,Maxiumm atlaide Vienības {0}{1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,Maxiumm atlaide Vienības {0}{1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Import masas
 DocType: Sales Partner,Address & Contacts,Adrese & Kontakti
 DocType: SMS Log,Sender Name,Sūtītājs Vārds
@@ -1972,21 +1995,21 @@
 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_data.py +361,Travel,Ceļot
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +155,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 +304,Travel,Ceļot
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +167,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 +23,Update Cost,Atjaunināt izmaksas
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Atjaunināt izmaksas
 DocType: Item Reorder,Item Reorder,Postenis Pārkārtot
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +36,Show Salary Slip,Rādīt Alga Slip
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +748,Transfer Material,Transfer Materiāls
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +53,Show Salary Slip,Rādīt Alga Slip
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +166,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 +923,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 +646,Select change amount account,Izvēlieties Mainīt summu konts
+apps/erpnext/erpnext/public/js/controllers/transaction.js +914,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 +703,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
@@ -1998,31 +2021,32 @@
 DocType: Quality Inspection,Verified By,Verified by
 DocType: Address,Subsidiary,Filiāle
 apps/erpnext/erpnext/setup/doctype/company/company.py +64,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","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: Quality Inspection,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 +33,Traceability,izsekojamība
 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 +352,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Daudzums rindā {0} ({1}) jābūt tādai pašai kā saražotā apjoma {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Daudzums rindā {0} ({1}) jābūt tādai pašai kā saražotā apjoma {2}
 DocType: Appraisal,Employee,Darbinieks
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Uzaicināt kā lietotājs
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0}{1} ir pilnībā jāmaksā
 DocType: Workstation Working Hour,End Time,Beigu laiks
 DocType: Payment Entry,Payment Deductions or Loss,Maksājumu Atskaitījumi vai zaudējumi
-apps/erpnext/erpnext/config/schools.py +100,LMS,LMS
+apps/erpnext/erpnext/config/schools.py +104,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/config/crm.py +6,Sales Pipeline,Sales Pipeline
 DocType: Student Batch Student,Student Batch Student,Student Partijas Student
-DocType: Sales Invoice,Mass Mailing,Mass Mailing
+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 +199,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/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 +297,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 +111,Pharmaceutical,Farmaceitisks
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +309,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/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
@@ -2037,27 +2061,28 @@
 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 +814,Please specify Company to proceed,"Lūdzu, norādiet Company, lai turpinātu"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +793,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 +44,Compensatory Off,Kompensējošs Off
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,Kompensējošs Off
 DocType: Quality Inspection Reading,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."
 DocType: Room,Room Number,Istabas numurs
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Nederīga atsauce {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +161,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},"{0} ({1}), nevar būt lielāks par plānoto daudzumu ({2}) ražošanas pasūtījumā {3}"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +162,{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 +217,Raw Materials cannot be blank.,Izejvielas nevar būt tukšs.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,"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 +460,Quick Journal Entry,Quick Journal Entry
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +111,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/accounts/doctype/sales_invoice/sales_invoice.py +441,"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 +450,Quick Journal Entry,Quick Journal Entry
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +103,You can not change rate if BOM mentioned agianst any item,"Jūs nevarat mainīt likmi, ja BOM minēja agianst jebkuru posteni"
 DocType: Employee,Previous Work Experience,Iepriekšējā darba pieredze
 DocType: Stock Entry,For Quantity,Par Daudzums
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +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 +214,{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ā
 ,Minutes to First Response for Issues,Minūtes First Response jautājumos
 DocType: Purchase Invoice,Terms and Conditions1,Noteikumi un Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,"Institūta nosaukums, ko jums ir izveidot šo sistēmu."
@@ -2066,16 +2091,17 @@
 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 +398,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"
 ,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 +739,Item or Warehouse for row {0} does not match Material Request,Postenis vai noliktava rindā {0} nesakrīt Material pieprasījumu
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +747,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
 DocType: Fiscal Year,Year End Date,Gada beigu datums
 DocType: Task Depends On,Task Depends On,Uzdevums Atkarīgs On
-DocType: Lead,Opportunity,Iespējas
+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
@@ -2088,7 +2114,7 @@
 DocType: Student,Joining Date,savieno datums
 ,Employees working on a holiday,Darbinieki strādā par brīvdienu
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Mark Present
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},Uzturēšana sākuma datums nevar būt pirms piegādes datuma Serial Nr {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},Uzturēšana sākuma datums nevar būt pirms piegādes datuma Serial Nr {0}
 DocType: Production Order,Actual End Date,Faktiskais beigu datums
 DocType: Purchase Invoice,PINV-,PINV-
 DocType: Authorization Rule,Applicable To (Role),Piemērojamais Lai (loma)
@@ -2103,7 +2129,7 @@
 DocType: SMS Log,No of Requested SMS,Neviens pieprasījuma SMS
 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 +729,Please supply the specified items at the best possible rates,Lūdzu sniegt norādītos objektus pēc iespējas zemas cenas
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +695,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 +117,Contract End Date must be greater than Date of Joining,Līguma beigu datums ir jābūt lielākam nekā datums savienošana
 DocType: Delivery Note,DN-,DN-
@@ -2112,7 +2138,7 @@
 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 +14,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/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
 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.
 
@@ -2139,13 +2165,14 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd daudzums
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +54,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 +103,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 +504,Stock Entry {0} is not submitted,Stock Entry {0} nav iesniegts
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Nevar ražot vairāk Vienību {0} nekā Pasūtījumu daudzums {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +505,Stock Entry {0} is not submitted,Stock Entry {0} nav iesniegts
 DocType: Payment Reconciliation,Bank / Cash Account,Bankas / Naudas konts
 DocType: Tax Rule,Billing City,Norēķinu City
 DocType: Salary Component Account,Salary Component Account,Algas Component konts
 DocType: Global Defaults,Hide Currency Symbol,Slēpt valūtas simbolu
 apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card","piemēram, Bank, Cash, Credit Card"
+DocType: Lead Source,Source Name,Source Name
 DocType: Journal Entry,Credit Note,Kredīts Note
 DocType: Warranty Claim,Service Address,Servisa adrese
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furnitures and Fixtures,Mēbeles un piederumi
@@ -2157,6 +2184,7 @@
 DocType: Opportunity,Customer / Lead Name,Klients / Lead Name
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +89,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/controllers/trends.py +19,Total(Qty),Kopā (Daudz)
 DocType: Sales Invoice,This Document,šo dokumentu
@@ -2168,15 +2196,15 @@
 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 +176,Organization branch master.,Organizācija filiāle meistars.
-apps/erpnext/erpnext/controllers/accounts_controller.py +273, or ,vai
+apps/erpnext/erpnext/controllers/accounts_controller.py +276, 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
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,Utility Izdevumi
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90 Virs
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +203,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: Journal Entry {1} nav konta {2} vai jau saskaņota pret citu talonu
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +206,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 +90,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 +93,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
@@ -2204,8 +2232,8 @@
 DocType: Product Bundle,Parent Item,Parent postenis
 DocType: Account,Account Type,Konta tips
 DocType: Delivery Note,DN-RET-,DN-RET-
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +115,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 +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Uzturēšana Kalendārs nav radīts visiem posteņiem. Lūdzu, noklikšķiniet uz ""Generate sarakstā '"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +118,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 +163,"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ī"
@@ -2217,13 +2245,13 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +32,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 +748,Delivery,Nodošana
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +742,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
 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/stock/doctype/stock_entry/stock_entry.py +82,Row {0}: UOM Conversion Factor is mandatory,Row {0}: UOM Conversion Factor ir obligāta
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Kuponu #
@@ -2234,13 +2262,13 @@
 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 +90,Head of Marketing and Sales,Mārketinga un pārdošanas vadītājs
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Ienākuma nodoklis
+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 +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.
 DocType: Item Supplier,Item Supplier,Postenis piegādātājs
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +403,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 +770,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 +397,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 +764,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"
@@ -2252,28 +2280,29 @@
 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 +100,Issues,Jautājumi
+apps/erpnext/erpnext/hooks.py +109,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}
 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
 ,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
 DocType: Supplier,Billing Currency,Norēķinu valūta
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Large,Īpaši liels
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Extra Large,Īpaši liels
 ,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 +507,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 +107,Local,Vietējs
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +508,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/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 +154,Large,Liels
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Large,Liels
 DocType: Homepage Featured Product,Homepage Featured Product,Homepage Featured Product
 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 +225,Total {0} ({1}),Kopā {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +224,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
@@ -2319,9 +2348,9 @@
 DocType: Attendance,Leave Type,Atvaļinājums Type
 apps/erpnext/erpnext/controllers/stock_controller.py +173,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/hr/doctype/salary_slip/salary_slip.py +79,Name error: {0},Vārds kļūda: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +90,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 +178,{0} {1} does not associated with {2} {3},{0} {1} nav saistīta ar {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +181,{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)"
 DocType: Warehouse,Parent Warehouse,Parent Noliktava
@@ -2340,7 +2369,7 @@
 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
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,Vismaz vienu posteni jānorāda ar negatīvu daudzumu atgriešanās dokumentā
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Atleast one item should be entered with negative quantity in return document,Vismaz vienu posteni jānorāda ar negatīvu daudzumu atgriešanās dokumentā
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Darbība {0} vairāk nekā visus pieejamos darba stundas darbstaciju {1}, nojauktu darbību vairākos operācijām"
 ,Requested,Pieprasīts
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +83,No Remarks,Nav Piezīmes
@@ -2352,46 +2381,46 @@
 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/stock/doctype/purchase_receipt/purchase_receipt.py +98,Quality Inspection required for Item {0},Kvalitātes pārbaudes nepieciešamas postenī {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,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
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Pārvaldīt Territory Tree.
 DocType: Journal Entry Account,Sales Invoice,PPR (Pārdošanas Pavadzīme)
 DocType: Journal Entry Account,Party Balance,Party Balance
-apps/erpnext/erpnext/accounts/page/pos/pos.js +475,Please select Apply Discount On,"Lūdzu, izvēlieties Piesakies atlaide"
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +92,Salary Slip Created,Alga Slip Izveidots
+apps/erpnext/erpnext/accounts/page/pos/pos.js +464,Please select Apply Discount On,"Lūdzu, izvēlieties Piesakies atlaide"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +95,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
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,Atlaide Procentos var piemērot vai nu pret Cenrādī vai visām Cenrāža.
 DocType: Purchase Invoice,Half-yearly,Reizi pusgadā
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +384,Accounting Entry for Stock,Grāmatvedības Entry par noliktavā
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +387,Accounting Entry for Stock,Grāmatvedības Entry par noliktavā
 DocType: Sales Invoice,Sales Team1,Sales team1
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,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 +96,Row {0}: Completed Qty must be greater than zero.,Rinda {0}: Pabeigts Daudz jābūt lielākai par nulli.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +120,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 +88,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Nevar atgriezties vairāk nekā {1} postenī {2}
+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
 DocType: Item Group,Show this slideshow at the top of the page,Parādiet šo slaidrādi augšpusē lapas
 DocType: BOM,Item UOM,Postenis(Item) UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Nodokļa summa pēc atlaides apmērs (Uzņēmējdarbības valūta)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +147,Target warehouse is mandatory for row {0},Mērķa noliktava ir obligāta rindā {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +141,Target warehouse is mandatory for row {0},Mērķa noliktava ir obligāta rindā {0}
 DocType: Cheque Print Template,Primary Settings,primārās iestatījumi
 DocType: Purchase Invoice,Select Supplier Address,Select Piegādātājs adrese
 DocType: Quality Inspection,Quality Inspection,Kvalitātes pārbaudes
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Extra Small,Extra Small
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +194,Account {0} is frozen,Konts {0} ir sasalusi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Extra Small
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +690,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 +197,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 +606,Can only make payment against unbilled {0},Var tikai veikt maksājumus pret unbilled {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +126,Commission rate cannot be greater than 100,Komisijas likme nevar būt lielāka par 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +609,Can only make payment against unbilled {0},Var tikai veikt maksājumus pret unbilled {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,Komisijas likme nevar būt lielāka par 100
 DocType: Stock Entry,Subcontract,Apakšlīgumu
 apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,Ievadiet {0} pirmais
 DocType: Production Order Operation,Actual End Time,Faktiskais Beigu laiks
@@ -2402,30 +2431,30 @@
 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 +158,Colour,Krāsa
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,Krāsa
 DocType: Maintenance Visit,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"
 DocType: Student Log,Academic,akadēmisks
-apps/erpnext/erpnext/controllers/accounts_controller.py +469,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Kopā avanss ({0}) pret rīkojuma {1} nevar būt lielāks par kopsummā ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +472,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Kopā avanss ({0}) pret rīkojuma {1} nevar būt lielāks par kopsummā ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Izvēlieties Mēneša Distribution nevienmērīgi izplatīt mērķus visā mēnešiem.
 DocType: Purchase Invoice Item,Valuation Rate,Vērtēšanas Rate
+DocType: Stock Reconciliation,SR/,SR /
 apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,Cenrādis Valūtu nav izvēlēta
 DocType: Assessment,Results,rezultāti
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +168,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 +175,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: Student Applicant,Father's/ Guardian 2 Email ID,Tēva / Guardian 2 E-pasts ID
 DocType: Maintenance Visit Purpose,Against Document No,Pret dokumentā Nr
 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 +228,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 +231,Warehouses with existing transaction can not be converted to group.,Noliktavas ar esošo darījumu nevar pārvērst grupai.
 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 +93,Researcher,Pētnieks
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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.
@@ -2437,25 +2466,25 @@
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Par ērtības klientiem, šie kodi var izmantot drukas formātos, piemēram, rēķinos un pavadzīmēs"
 DocType: 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: Sales Invoice,Advertisement,Reklāma
 DocType: Asset Category Account,Depreciation Expense Account,Nolietojums Izdevumu konts
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Probationary Period,Pārbaudes laiks
-apps/erpnext/erpnext/hooks.py +102,Announcements,Sludinājumi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Pārbaudes laiks
+apps/erpnext/erpnext/hooks.py +111,Announcements,Sludinājumi
 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 +109,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 +16,To Datetime,Lai DATETIME
+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/scheduling_tool/scheduling_tool.py +51,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/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Neapstiprinātas aktivitātes
+DocType: Accounts Settings,Make Payment via Journal Entry,Veikt maksājumus caur Journal Entry
+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 +127,Please enter relieving date.,Ievadiet atbrīvojot datumu.
-apps/erpnext/erpnext/controllers/trends.py +145,Amt,Amt
+apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,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 +26,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"
@@ -2473,14 +2502,15 @@
 apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1},Nevar atrast valūtas kursu {0} uz {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Mark Half Day
 DocType: Sales Invoice,Sales Team,Sales Team
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Duplicate entry,Dublikāts ieraksts
+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 +490,[Error],[Kļūda]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +484,[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
 apps/erpnext/erpnext/controllers/status_updater.py +175,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.
 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
@@ -2496,22 +2526,22 @@
 ,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 +25,All Jobs,Visas Jobs
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,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"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Amount {0} {1} {2} {3},Summa {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Amount {0} {1} {2} {3},Summa {0} {1} {2} {3}
 DocType: Account,Depreciation,Nolietojums
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Piegādātājs (-i)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Darbinieku apmeklējums Tool
 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 +372,Payment Entries {0} are un-linked,Maksājumu Ieraksti {0} ir ANO saistīti
+apps/erpnext/erpnext/accounts/utils.py +449,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
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +497,Material Requests {0} created,Materiāls Pieprasījumi {0} izveidoti
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +498,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.
 DocType: Purchase Invoice,Address and Contact,Adrese un kontaktinformācija
@@ -2550,7 +2580,7 @@
 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 +848,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 +859,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 +233,Closing (Dr),Noslēguma (Dr)
 DocType: Cheque Print Template,Cheque Size,Čeku Size
@@ -2571,7 +2601,8 @@
 ,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."
-apps/erpnext/erpnext/controllers/accounts_controller.py +555,'Update Stock' cannot be checked for fixed asset sale,&quot;Update Stock&quot; nevar pārbaudīta pamatlīdzekļu pārdošana
+DocType: Student Guardian,Father,tēvs
+apps/erpnext/erpnext/controllers/accounts_controller.py +558,'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
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Saņemt atjauninājumus
 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
@@ -2581,15 +2612,15 @@
 DocType: Sales Order,Fully Delivered,Pilnībā Pasludināts
 DocType: Lead,Lower Income,Lower Ienākumi
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","Konts galva ar atbildību, kuru peļņa / zaudējumi tiks rezervēts"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +166,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 +238,"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 +81,Purchase Order number required for Item {0},"Pasūtījuma skaitu, kas nepieciešams postenī {0}"
+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/purchase_receipt/purchase_receipt.py +82,Purchase Order number required for Item {0},"Pasūtījuma skaitu, kas nepieciešams postenī {0}"
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""No Datuma 'jābūt pēc"" Uz Datumu'"
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +17,Cannot change status as student {0} is linked with student application {1},Nevar mainīt statusu kā studentam {0} ir saistīta ar studentu pieteikumu {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +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: Timesheet,"List of employee which has ""Salary Slip Based on Timesheet"" is enabled in salary structure.","Saraksts darbinieka, kas ir &quot;Algas Slip Pamatojoties uz laika kontrolsaraksts&quot; ir iespējots algu struktūru."
 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 +356,Customer {0} does not belong to project {1},Klientu {0} nepieder projekta {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,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
 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
@@ -2601,7 +2632,7 @@
 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/patches/v7_0/create_warehouse_nestedset.py +55,All Warehouses,Visas Noliktavas
+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 +105,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
@@ -2613,10 +2644,10 @@
 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/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Padarīt par atalgojumu
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +26,Browse BOM,Pārlūkot BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,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/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 Year,Academic Year,Akadēmiskais gads
+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
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,Novērtējums
@@ -2624,12 +2655,12 @@
 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 +197,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 +204,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: Workstation Working Hour,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 +256,Select Quantity,Izvēlieties Daudzums
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +257,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
@@ -2646,6 +2677,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Nu mērķa Daudzums vai paredzētais apjoms ir obligāta.
 apps/erpnext/erpnext/config/projects.py +45,Cost of various activities,Izmaksas dažādu aktivitāšu
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Setting notikumi {0}, jo darbinieku pievienots zemāk Sales personām nav lietotāja ID {1}"
+DocType: Timesheet,Billing Details,Norēķinu Details
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +149,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}"
 DocType: Item,Inspection Required,Inspekcija Nepieciešamais
@@ -2665,7 +2697,7 @@
 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 +138,Wire Transfer,Wire Transfer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,Wire Transfer
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Pārbaudi visu
 DocType: Sales Order,Recurring Order,Atkārtojas rīkojums
 DocType: Company,Default Income Account,Default Ienākumu konta
@@ -2677,21 +2709,19 @@
 ,Welcome to ERPNext,Laipni lūdzam ERPNext
 apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,Potenciālais klients -> Piedāvājums (quotation)
 DocType: Lead,From Customer,No Klienta
-apps/erpnext/erpnext/demo/setup_data.py +357,Calls,Zvani
+apps/erpnext/erpnext/demo/setup/setup_data.py +300,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/stock/doctype/item/item.py +466,"As there are existing transactions for this item, \
-							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Tā kā ir esošie darījumi par šo priekšmetu, \ jūs nevarat mainīt vērtības &quot;Has sērijas nē&quot;, &quot;Vai Partijas Nē&quot;, &quot;Vai Stock Vienība&quot; un &quot;vērtēšanas metode&quot;"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,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/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 +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Piezīme: Sistēma nepārbaudīs pārāk piegādi un pār-rezervāciju postenī {0} kā daudzums vai vērtība ir 0
 DocType: Notification Control,Quotation Message,Piedāvājuma Ziņojums
 DocType: Issue,Opening Date,Atvēršanas datums
-apps/erpnext/erpnext/schools/api.py +58,Attendance has been marked successfully.,Apmeklētība ir veiksmīgi atzīmēts.
+apps/erpnext/erpnext/schools/api.py +57,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 +136,Account Type for {0} must be {1},Konta tips par {0} ir {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +139,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
@@ -2706,12 +2736,13 @@
 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/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 +20,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 +1190,Please select customer,"Lūdzu, izvēlieties klientu"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1193,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
@@ -2721,6 +2752,7 @@
 ,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 +50,Missing Currency Exchange Rates for {0},Trūkst Valūtu kursi par {0}
 DocType: Assessment,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
@@ -2738,11 +2770,12 @@
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Tēma Name
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Jāizvēlas Vismaz viens pirkšana vai pārdošana
+DocType: Grading Structure,Grade Intervals,Novērtējums intervāli
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Izvēlieties raksturu jūsu biznesu.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,"Gadījumos, kad ražošanas darbības tiek veiktas."
 DocType: Asset Movement,Source Warehouse,Source Noliktava
 DocType: Installation Note,Installation Date,Uzstādīšana Datums
-apps/erpnext/erpnext/controllers/accounts_controller.py +534,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} nepieder uzņēmumam {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +537,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
@@ -2756,28 +2789,31 @@
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Pieejams Partijas Daudz at No noliktavas
 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,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 +111,Date Of Retirement must be greater than Date of Joining,Brīža līdz pensionēšanās jābūt lielākam nekā datums savienošana
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +49,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 +87,{0}% Delivered,{0}% Pasludināts
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% Pasludināts
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Prece {0}: pasūtīts Daudzums {1} nevar būt mazāka par minimālo pasūtījuma daudzumu {2} (definēts postenī).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Mēneša procentuālais sadalījums
 DocType: Territory,Territory Targets,Teritorija Mērķi
 DocType: Delivery Note,Transporter Info,Transporter Info
-apps/erpnext/erpnext/accounts/utils.py +379,Please set default {0} in Company {1},Lūdzu iestatīt noklusēto {0} uzņēmumā {1}
+apps/erpnext/erpnext/accounts/utils.py +456,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
 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.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Nosaukumi drukāt veidnes, piemēram, rēķins."
+DocType: Student Guardian,Student Guardian,Student Guardian
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +184,Valuation type charges can not marked as Inclusive,Vērtēšanas veida maksājumus nevar atzīmēts kā Inclusive
 DocType: POS Profile,Update Stock,Update Stock
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Different UOM objektus, novedīs pie nepareizas (kopā) Neto svars vērtību. Pārliecinieties, ka neto svars katru posteni ir tādā pašā UOM."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
 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 +349,Journal Entries {0} are un-linked,Žurnāla ieraksti {0} ir ANO saistītas
+apps/erpnext/erpnext/accounts/utils.py +426,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"
@@ -2801,6 +2837,7 @@
 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
+DocType: Homepage,"URL for ""All Products""",URL &quot;All Products&quot;
 DocType: Leave Application,Leave Balance Before Application,Atstājiet Balance pirms uzklāšanas
 DocType: SMS Center,Send SMS,Sūtit SMS
 DocType: Cheque Print Template,Width of amount in word,Platums no summas vārdos
@@ -2809,7 +2846,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 +29,Current Job Openings,Pašreizējās vakanču
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,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
@@ -2822,7 +2859,7 @@
 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 +850,Show tax break-up,Rādīt nodokļu break-up
+apps/erpnext/erpnext/public/js/controllers/transaction.js +841,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/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"
@@ -2832,10 +2869,11 @@
 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 +534,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 +80,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 +162,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/selling/doctype/customer/customer.py +195,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 +5,This is based on the attendance of this Student,Tas ir balstīts uz piedalīšanos šajā Student
@@ -2844,12 +2882,11 @@
 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 +75,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 +138,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/hr/doctype/leave_application/leave_application.py +145,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: Program Enrollment Fee,Program Enrollment Fee,Program iestāšanās maksa
 DocType: Item,Supplier Items,Piegādātājs preces
 DocType: Opportunity,Opportunity Type,Iespēja Type
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,Jaunais Company
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,Cost Center is required for 'Profit and Loss' account {0},"Izmaksas Center ir nepieciešams peļņas un zaudējumu ""konta {0}"
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Darījumus var dzēst tikai ar radītājs Sabiedrības
 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.,"Izrādījās nepatiesi skaits virsgrāmatas ierakstus. Jūs, iespējams, esat izvēlējies nepareizu kontu darījumā."
 DocType: Cheque Print Template,Cheque Width,Čeku platums
@@ -2858,16 +2895,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,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/manufacturing/doctype/production_order/production_order.js +128,Timesheet,Laika uzskaites tabula
-apps/erpnext/erpnext/controllers/accounts_controller.py +228,{0} '{1}' is disabled,{0} '{1}' ir neaktīvs
+apps/erpnext/erpnext/controllers/accounts_controller.py +231,{0} '{1}' is disabled,{0} '{1}' ir neaktīvs
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Uzstādīt kā Atvērt
 DocType: Cheque Print Template,Scanned Cheque,Skanētie Čeku
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Nosūtīt automātisko e-pastus kontaktiem Iesniedzot darījumiem.
+DocType: Timesheet,Total Billable Amount,Kopā Billable Summa
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Postenis 3
 DocType: Purchase Order,Customer Contact Email,Klientu Kontakti Email
 DocType: Warranty Claim,Item and Warranty Details,Elements un Garantija Details
 DocType: Sales Team,Contribution (%),Ieguldījums (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Piezīme: Maksājumu ievades netiks izveidota, jo ""naudas vai bankas konts"" netika norādīta"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Responsibilities,Pienākumi
+apps/erpnext/erpnext/controllers/accounts_controller.py +78,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
 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
@@ -2875,6 +2913,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Pievienot lietotājus
 DocType: Pricing Rule,Item Group,Postenis Group
 DocType: Item,Safety Stock,Drošības fonds
+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: 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)
@@ -2884,7 +2923,6 @@
 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: Timesheet,Total Hours,Kopējais stundu skaits
 DocType: Journal Entry,Printing Settings,Drukāšanas iestatījumi
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,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
@@ -2897,13 +2935,14 @@
 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 +71,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
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Klientu&gt; Klientu Group&gt; Teritorija
 DocType: Purchase Invoice Item,Rate,Likme
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Intern,Interns
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,Interns
 DocType: Stock Entry,From BOM,No BOM
 DocType: Assessment,Assessment Code,novērtējums Code
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +32,Basic,Pamata
+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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Lūdzu, noklikšķiniet uz ""Generate sarakstā '"
+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 +95,Reference No is mandatory if you entered Reference Date,"Atsauces Nr ir obligāta, ja esat norādījis atsauces datumā"
@@ -2912,11 +2951,11 @@
 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 +752,Issue Material,Jautājums Materiāls
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +723,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 +683,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 +665,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."
 DocType: Hub Settings,Access Token,Access Token
 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
@@ -2924,33 +2963,35 @@
 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 +1122,Enter value must be positive,Ievadiet vērtība ir pozitīva
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,All Territories,Visas teritorijas
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1125,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
 DocType: Purchase Invoice,Items,Preces
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +23,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 +221,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 +233,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 +96,Request for Quotations,Pieprasījums citāti
+apps/erpnext/erpnext/hooks.py +104,Request for Quotations,Pieprasījums citāti
 DocType: Payment Reconciliation,Maximum Invoice Amount,Maksimālais Rēķina summa
 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 +628,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Default mērvienība Variant &#39;{0}&#39; jābūt tāds pats kā Template &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Default mērvienība Variant &#39;{0}&#39; jābūt tāds pats kā Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,"Aprēķināt, pamatojoties uz"
 DocType: Delivery Note Item,From Warehouse,No Noliktavas
 DocType: Assessment,Supervisor Name,uzraudzītājs Name
+DocType: Assessment,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
 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 +27,Default Address Template cannot be deleted,Default Adrese Template nevar izdzēst
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,Default Adrese Template nevar izdzēst
 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
@@ -2965,8 +3006,8 @@
 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/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 +485,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 +336,Please select Posting Date first,"Lūdzu, izvēlieties Publicēšanas datums pirmais"
+apps/erpnext/erpnext/stock/get_item_details.py +486,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 +326,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ā"
@@ -2982,6 +3023,7 @@
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Match Maksājumi ar rēķini
 DocType: Journal Entry,Bank Entry,Banka Entry
 DocType: Authorization Rule,Applicable To (Designation),Piemērojamais Lai (Apzīmējums)
+,Profitability Analysis,rentabilitāte analīze
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,Pievienot grozam
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Group By
 DocType: Guardian,Interests,intereses
@@ -2994,21 +3036,21 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,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 +141,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Sērijveida postenis {0} nevar atjaunināt \ izmantojot krājumu samierināšanās
 DocType: Scheduling Tool,Day,diena
 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 +122,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 +129,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
-DocType: Student Applicant,AP.,AP.
 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 +639,Point of Sale,Point of Sale
+apps/erpnext/erpnext/accounts/page/pos/pos.js +634,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
 DocType: Production Planning Tool,Production Planning Tool,Ražošanas plānošanas rīks
@@ -3017,74 +3059,77 @@
 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 +373,Quantity to Manufacture must be greater than 0.,"Daudzums, ražošana jābūt lielākam par 0."
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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 Profile,Customer Group,Klientu Group
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,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/doctype/asset/asset.py +83,Next Depreciation Date must be on or after today,Nākamais Nolietojums datums ir jābūt vai pēc šodienas
 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 +145,Please cancel Purchase Invoice {0} first,Lūdzu atcelt pirkuma rēķina {0} pirmais
 DocType: Serial No,AMC Expiry Date,AMC Derīguma termiņš
 ,Sales Register,Sales Reģistrēties
 DocType: Quotation,Quotation Lost Reason,Piedāvājuma Zaudējuma Iemesls
+apps/erpnext/erpnext/utilities/doctype/address/address.py +164,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ē."
 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 +330,Transaction reference no {0} dated {1},Darījuma atsauces numurs {0} datēts {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,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 +107,Summary for this month and pending activities,Kopsavilkums par šo mēnesi un izskatāmo darbību
+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/accounts/doctype/sales_invoice/sales_invoice.py +406,Please remove this Invoice {0} from C-Form {1},"Lūdzu, noņemiet šo rēķinu {0} no C-Form {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,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 +644,Get Items,Saņemt Items
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +623,Get Items,Saņemt Items
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +210,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 +41,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
 DocType: Payment Request,Initiated,Uzsāka
 DocType: Production Order,Planned Start Date,Plānotais sākuma datums
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,Customer is required against Receivable account {0},Klientam ir pienākums pret pasūtītāju konta {0}
 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 +265,Project-wise data is not available for Quotation,Projekts gudrs dati nav pieejami aptauja
+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 +101,Commercial,Tirdzniecības
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,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: Supplier Quotation,Supplier Address,Piegādātājs adrese
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +648,Row {0}# Account must be of type 'Fixed Asset',Rinda {0} # jāņem tipa &quot;pamatlīdzekļu&quot;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,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 +30,Series is mandatory,Dokumenta numurs ir obligāts
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +50,Series is mandatory,Dokumenta numurs ir obligāts
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Finanšu pakalpojumi
 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
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +165,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 +155,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Cr,Cr
 DocType: Tax Rule,Billing State,Norēķinu Valsts
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +250,Transfer,Nodošana
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +187,{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 +825,Fetch exploded BOM (including sub-assemblies),Atnest eksplodēja BOM (ieskaitot mezglus)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +254,Transfer,Nodošana
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +190,{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 +796,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 +115,Due Date is mandatory,Due Date ir obligāts
+apps/erpnext/erpnext/controllers/accounts_controller.py +118,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
 DocType: Journal Entry,Pay To / Recd From,Pay / Recd No
 DocType: Naming Series,Setup Series,Dokumentu numuru Iestatījumi
 DocType: Payment Reconciliation,To Invoice Date,Lai rēķina datuma
 DocType: Supplier,Contact HTML,Contact HTML
 ,Inactive Customers,neaktīvi Klienti
+DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Pirkuma Kvītis
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Kā Cenu noteikums tiek piemērots?
 DocType: Quality Inspection,Delivery Note No,Piegāde Note Nr
@@ -3093,7 +3138,7 @@
 DocType: Company,Retail,Mazumtirdzniecība
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +120,Customer {0} does not exist,Klientu {0} nepastāv
 DocType: Attendance,Absent,Nekonstatē
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +587,Product Bundle,Produkta Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Product Bundle,Produkta Bundle
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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
@@ -3103,8 +3148,8 @@
 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 +742,Send Supplier Emails,Nosūtīt Piegādātāja e-pastu
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +104,"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/buying/doctype/request_for_quotation/request_for_quotation.js +708,Send Supplier Emails,Nosūtīt Piegādātāja e-pastu
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,"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
 DocType: Guardian Interest,Guardian Interest,Guardian Procentu
 DocType: Timesheet,Employee Detail,Darbinieku Detail
@@ -3115,9 +3160,9 @@
 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}
 DocType: Salary Slip,Earning & Deduction,Nopelnot & atskaitīšana
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +77,Account {0} cannot be a Group,Konts {0} nevar būt Group
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} cannot be a Group,Konts {0} nevar būt Group
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +31,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 +107,Negative Valuation Rate is not allowed,Negatīva Vērtēšana Rate nav atļauta
+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
 DocType: Holiday List,Weekly Off,Weekly Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Par piemēram, 2012.gada 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +39,Provisional Profit / Loss (Credit),Pagaidu peļņa / zaudējumi (kredīts)
@@ -3131,16 +3176,16 @@
 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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0}{1}: Izmaksu centrs ir obligāta postenī {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +626,Get Items from Product Bundle,Dabūtu preces no produkta Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +605,Get Items from Product Bundle,Dabūtu preces no produkta Bundle
 DocType: Asset,Straight Line,Taisne
 DocType: Project User,Project User,projekta User
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} is inactive,Konts {0} ir neaktīvs
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} is inactive,Konts {0} ir neaktīvs
 DocType: GL Entry,Is Advance,Vai Advance
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Apmeklējumu No Datums un apmeklētība līdz šim ir obligāta
 apps/erpnext/erpnext/controllers/buying_controller.py +148,Please enter 'Is Subcontracted' as Yes or No,"Ievadiet ""tiek slēgti apakšuzņēmuma līgumi"", kā jā vai nē"
 DocType: Sales Team,Contact No.,Contact No.
 DocType: Bank Reconciliation,Payment Entries,maksājumu Ieraksti
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,'Profit and Loss' type account {0} not allowed in Opening Entry,"""Peļņas un zaudējumu"" tipa konts {0} nav atļauts atvēršana Entry"
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +71,'Profit and Loss' type account {0} not allowed in Opening Entry,"""Peļņas un zaudējumu"" tipa konts {0} nav atļauts atvēršana Entry"
 DocType: 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
@@ -3159,7 +3204,7 @@
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Sērijas #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Commission on Sales,Komisijas apjoms
 DocType: Offer Letter Term,Value / Description,Vērtība / Apraksts
-apps/erpnext/erpnext/controllers/accounts_controller.py +558,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} nevar iesniegt, tas jau {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +561,"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: Production Order,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}.
@@ -3172,13 +3217,13 @@
 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/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Legal Expenses,Juridiskie izdevumi
 DocType: Purchase Invoice,Posting Time,Norīkošanu laiks
-DocType: Sales Order,% Amount Billed,% Summa Jāmaksā
+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."
 apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},Pozīcijas ar Serial Nr {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Atvērt Paziņojumus
+DocType: Email Digest,Open Notifications,Atvērt Paziņojumus
 DocType: Payment Entry,Difference Amount (Company Currency),Starpība Summa (Company valūta)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,Tiešie izdevumi
 apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
@@ -3186,7 +3231,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Jaunais klientu Ieņēmumu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,Ceļa izdevumi
 DocType: Maintenance Visit,Breakdown,Avārija
-apps/erpnext/erpnext/controllers/accounts_controller.py +634,Account: {0} with currency: {1} can not be selected,Konts: {0} ar valūtu: {1} nevar atlasīt
+apps/erpnext/erpnext/controllers/accounts_controller.py +637,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}
 DocType: Program Enrollment Tool,Student Applicants,studentu Pretendentiem
@@ -3194,15 +3239,15 @@
 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 +56,Probation,Probācija
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Probation,Probācija
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,algu komponenti
 DocType: Program Enrollment Tool,New Academic Year,Jaunā mācību gada
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Payment of salary for the month {0} and year {1},Samaksa algas par mēnesi {0} un gads {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Payment of salary for the month {0} and year {1},Samaksa algas par mēnesi {0} un gads {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,"Auto ievietot Cenrādis likme, ja trūkst"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Kopējais samaksāto summu
 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 +144,Planning,Plānošana
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,Plānošana
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,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
@@ -3215,11 +3260,10 @@
 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.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Sales invoice submitted sucessfully.,Pārdošanas rēķins iesniegta veiksmīgi.
 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}
 DocType: Assessment Result,Student Name,Studenta vārds
-apps/erpnext/erpnext/hooks.py +104,Assessment Schedule,novērtējums grafiks
+apps/erpnext/erpnext/hooks.py +113,Assessment Schedule,novērtējums grafiks
 DocType: Brand,Item Manager,Prece vadītājs
 DocType: Buying Settings,Default Supplier Type,Default Piegādātājs Type
 DocType: Production Order,Total Operating Cost,Kopā ekspluatācijas izmaksas
@@ -3229,6 +3273,7 @@
 DocType: GL Entry,Party Type,Party Type
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +78,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
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Algu veidni meistars.
 DocType: Leave Type,Max Days Leave Allowed,Max dienu atvaļinājumu Atļauts
@@ -3240,18 +3285,19 @@
 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 +99,All Customer Groups,Visas klientu grupas
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +78,Accumulated Monthly,uzkrātais Mēneša
-apps/erpnext/erpnext/controllers/accounts_controller.py +595,{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/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Visas klientu grupas
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +81,Accumulated Monthly,uzkrātais Mēneša
+apps/erpnext/erpnext/controllers/accounts_controller.py +598,{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ē
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Cenrādis Rate (Company valūta)
 DocType: Products Settings,Products Settings,Produkcija iestatījumi
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +188,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"
 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 +84,Secretary,Sekretārs
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,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
@@ -3260,24 +3306,22 @@
 ,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
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,Row # {0}: Sērijas numurs ir obligāta
+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 +859,Supplier Quotation,Piegādātāja Piedāvājums
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +838,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 +7,Collect Fees,savākt maksas
+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}
 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.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Gaidāmie notikumi
 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/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
-DocType: Email Digest,Income / Expense,Ienākumi / izdevumi
 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."
@@ -3288,13 +3332,14 @@
 DocType: Customer,From Lead,No Lead
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Pasūtījumi izlaists ražošanai.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Izvēlieties fiskālajā gadā ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,POS Profile required to make POS Entry,POS Profile jāveic POS Entry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +509,POS Profile required to make POS Entry,POS Profile jāveic POS Entry
 DocType: Program Enrollment Tool,Enroll Students,uzņemt studentus
 DocType: Hub Settings,Name Token,Nosaukums Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard pārdošana
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Atleast one warehouse is mandatory,Vismaz viena noliktava ir obligāta
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +129,Atleast one warehouse is mandatory,Vismaz viena noliktava ir obligāta
 DocType: Serial No,Out of Warranty,No Garantijas
 DocType: BOM Replace Tool,Replace,Aizstāt
+DocType: Production Order,Unstopped,unstopped
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{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
@@ -3315,10 +3360,11 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,Lapas jāpiešķir var sastāvēt no 0.5
 DocType: Production Order,Operation Cost,Darbība izmaksas
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,Augšupielādēt apmeklēšanu no .csv faila
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Izcila Amt
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Noteikt mērķus Prece Group-gudrs šai Sales Person.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Iesaldēt Krājumi Vecāki par [dienas]
-apps/erpnext/erpnext/controllers/accounts_controller.py +528,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: Asset ir obligāta Pamatlīdzekļu pirkšana / pārdošana
+apps/erpnext/erpnext/controllers/accounts_controller.py +531,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: Asset ir obligāta Pamatlīdzekļu pirkšana / pārdošana
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Ja divi vai vairāki Cenu novērtēšanas noteikumi ir balstīti uz iepriekš minētajiem nosacījumiem, prioritāte tiek piemērota. Prioritāte ir skaitlis no 0 lìdz 20, kamēr noklusējuma vērtība ir nulle (tukšs). Lielāks skaitlis nozīmē, ka tas ir prioritāte, ja ir vairāki cenu veidošanas noteikumi, ar tādiem pašiem nosacījumiem."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Fiskālā Gads: {0} neeksistē
 DocType: Currency Exchange,To Currency,Līdz Valūta
@@ -3335,15 +3381,15 @@
 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
-DocType: Sales Invoice,Exhibition,Izstāde
 apps/erpnext/erpnext/utilities/doctype/address/address.py +77,"Company is mandatory, as it is your company address","Uzņēmums ir obligāta, jo tas ir jūsu uzņēmums adrese"
 DocType: Item Attribute,From Range,No Range
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +81,Syntax error in formula or condition: {0},Sintakses kļūda formulā vai stāvoklī: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +92,Syntax error in formula or condition: {0},Sintakses kļūda formulā vai stāvoklī: {0}
 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"
+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 +28,Jobs,Darbs
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,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
@@ -3352,16 +3398,16 @@
 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 +763,Make Supplier Quotation,Izveidot Piegādātāja piedāvājumu
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,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/controllers/sales_and_purchase_return.py +100,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 +42,Casual Leave,Casual Leave
+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
 DocType: Batch,Batch ID,Partijas ID
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,Note: {0},Piezīme: {0}
 ,Delivery Note Trends,Piegāde Piezīme tendences
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +103,This Week's Summary,ŠONEDĒĻ kopsavilkums
+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
 DocType: Student Group Creation Tool,Get Courses,Iegūt Kursi
 DocType: GL Entry,Party,Partija
@@ -3371,7 +3417,7 @@
 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 +59,Piecework,Gabaldarbs
+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: Task,Actual Time (in Hours),Faktiskais laiks (stundās)
 DocType: Employee,History In Company,Vēsture Company
@@ -3388,7 +3434,7 @@
 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."
 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 +162,Black,Melns
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,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
@@ -3399,13 +3445,13 @@
 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 +69,Customer Id,Klienta ID
+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ē
 DocType: Journal Entry Account,Exchange Rate,Valūtas kurss
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Sales Order {0} is not submitted,Pasūtījumu {0} nav iesniegta
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +527,Sales Order {0} is not submitted,Pasūtījumu {0} nav iesniegta
 DocType: Homepage,Tag Line,Tag Line
 DocType: Fee Component,Fee Component,maksa Component
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +857,Add items from,Pievienot preces no
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +836,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}
 DocType: Cheque Print Template,Regular,regulārs
 DocType: BOM,Last Purchase Rate,"Pēdējā pirkuma ""Rate"""
@@ -3413,6 +3459,7 @@
 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"
 ,Sales Person-wise Transaction Summary,Sales Person-gudrs Transaction kopsavilkums
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +60,Cost Center is required for 'Profit and Loss' account {0}. Please set up a default Cost Center for the Company.,Izmaksas Center ir nepieciešama &quot;peļņas un zaudējumu&quot; kontā {0}. Lūdzu izveidot noklusējuma izmaksu centru uzņēmumam.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,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
@@ -3423,12 +3470,12 @@
 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 +710,Online,Online
+apps/erpnext/erpnext/accounts/page/pos/pos.js +692,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 +16,Setting this Address Template as default as there is no other default,"Šī adrese veidne kā noklusējuma iestatījums, jo nav cita noklusējuma"
+apps/erpnext/erpnext/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"
 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 +74,Quality Management,Kvalitātes vadība
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,Kvalitātes vadība
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} has been disabled,Prece {0} ir atspējota
 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
@@ -3450,11 +3497,12 @@
 DocType: Student,Student Email ID,Student Email ID
 DocType: Employee,Notice (days),Paziņojums (dienas)
 DocType: Tax Rule,Sales Tax Template,Sales Tax Template
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1520,Select items to save the invoice,"Izvēlētos objektus, lai saglabātu rēķinu"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1544,Select items to save the invoice,"Izvēlētos objektus, lai saglabātu rēķinu"
 DocType: Employee,Encashment Date,Inkasācija Datums
 DocType: Account,Stock Adjustment,Stock korekcija
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Default darbības izmaksas pastāv darbības veidam - {0}
 DocType: Production Order,Planned Operating Cost,Plānotais ekspluatācijas izmaksas
+DocType: Academic Term,Term Start Date,Term sākuma datums
 apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},Pievienoju {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Bankas paziņojums bilance kā vienu virsgrāmatas
 DocType: Job Applicant,Applicant Name,Pieteikuma iesniedzēja nosaukums
@@ -3484,17 +3532,17 @@
 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."
 DocType: Company,Distribution,Sadale
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +8,Amount Paid,Samaksātā summa
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Project Manager,Projekta vadītājs
+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
 ,Quoted Item Comparison,Citēts Prece salīdzinājums
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Dispatch,Nosūtīšana
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,Nosūtīšana
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max atlaide atļauta posteni: {0}{1}%
 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."
-DocType: Sales Invoice,Supplier Reference,Piegādātājs Reference
-apps/erpnext/erpnext/accounts/page/pos/pos.js +844,"Master data syncing, it might take some time","Master datu sinhronizācija, tas var aizņemt kādu laiku"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +832,"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
@@ -3508,7 +3556,7 @@
 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 +83,Error in formula or condition,Kļūda formulu vai stāvoklī
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,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
@@ -3517,7 +3565,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},"Līdz šim būtu jāatrodas attiecīgajā taksācijas gadā. Pieņemot, ka līdz šim datumam = {0}"
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Šeit jūs varat saglabāt augstumu, svaru, alerģijas, medicīnas problēmas utt"
 DocType: Leave Block List,Applies to Company,Attiecas uz Company
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +197,Cannot cancel because submitted Stock Entry {0} exists,"Nevar atcelt, jo iesniegts Stock Entry {0} eksistē"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +198,Cannot cancel because submitted Stock Entry {0} exists,"Nevar atcelt, jo iesniegts Stock Entry {0} eksistē"
 DocType: Purchase Invoice,In Words,In Words
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,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
@@ -3527,14 +3575,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,Jūsu finanšu gads sākas
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Aktīvu vērtības kritumu un Svari
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +319,Amount {0} {1} transferred from {2} to {3},Summa {0} {1} pārcelts no {2} līdz {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +322,Amount {0} {1} transferred from {2} to {3},Summa {0} {1} pārcelts no {2} līdz {3}
 DocType: Sales Invoice,Get Advances Received,Get Saņemtā Avansa
 DocType: Email Digest,Add/Remove Recipients,Add / Remove saņēmējus
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +432,Transaction not allowed against stopped Production Order {0},Darījums nav atļauts pret pārtrauca ražošanu Pasūtīt {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +437,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 +143,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 +652,Item variant {0} exists with same attributes,Postenis variants {0} nepastāv ar tiem pašiem atribūtiem
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Postenis variants {0} nepastāv ar tiem pašiem atribūtiem
+DocType: Leave Application,LAP/,LAP /
 DocType: Salary Slip,Salary Slip,Alga Slip
 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"
@@ -3542,12 +3591,12 @@
 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 +212,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 +215,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: Employee Education,Employee Education,Darbinieku izglītība
-apps/erpnext/erpnext/public/js/controllers/transaction.js +866,It is needed to fetch Item Details.,"Tas ir vajadzīgs, lai atnest Papildus informācija."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +857,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
@@ -3557,14 +3606,14 @@
 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 +178,Invalid {0},Nederīga {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Sick Leave,Slimības atvaļinājums
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,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
 DocType: Warehouse,PIN,PIN
 DocType: Sales Invoice,Base Change Amount (Company Currency),Base Change Summa (Company valūta)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +313,No accounting entries for the following warehouses,Nav grāmatvedības ieraksti par šādām noliktavām
-apps/erpnext/erpnext/projects/doctype/project/project.js +102,Save the document first.,Saglabājiet dokumentu pirmās.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +314,No accounting entries for the following warehouses,Nav grāmatvedības ieraksti par šādām noliktavām
+apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Saglabājiet dokumentu pirmās.
 DocType: Account,Chargeable,Iekasējams
 DocType: Company,Change Abbreviation,Mainīt saīsinājums
 DocType: Expense Claim Detail,Expense Date,Izdevumu Datums
@@ -3577,10 +3626,9 @@
 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"
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,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"
 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 +87,Business Development Manager,Biznesa attīstības vadītājs
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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
@@ -3590,8 +3638,8 @@
 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 +940,Please select {0} first,"Lūdzu, izvēlieties {0} pirmais"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +749,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 +953,Please select {0} first,"Lūdzu, izvēlieties {0} pirmais"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +757,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
@@ -3608,10 +3656,10 @@
 {% 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 +92,Warehouse not found in the system,Noliktava nav atrasts sistēmā
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +106,This Month's Summary,Šī mēneša kopsavilkums
+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
 DocType: Quality Inspection Reading,Quality Inspection Reading,Kvalitātes pārbaudes Reading
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`IesaldētKrājumus vecākus par` jābūt mazākam par % dienām.
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Iesaldēt Krājumus vecākus par` jābūt mazākam par %d dienām.
 DocType: Tax Rule,Purchase Tax Template,Iegādāties Nodokļu veidne
 ,Project wise Stock Tracking,Projekts gudrs Stock izsekošana
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Uzturēšana Kalendārs {0} nepastāv pret {0}
@@ -3619,21 +3667,22 @@
 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 +87,Please set Next Depreciation Date,Lūdzu noteikt Next Nolietojums datums
-DocType: Payment Gateway,Payment Gateway,Maksājumu Gateway
 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 +378,Operation Time must be greater than 0 for Operation {0},Darbība Time jābūt lielākam par 0 ekspluatācijai {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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/accounts/doctype/account/account.py +170,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)
 DocType: Program,Program Abbreviation,Program saīsinājums
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,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: Appraisal,Start Date,Sākuma datums
@@ -3649,21 +3698,22 @@
 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"
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Piem. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +27,Transaction currency must be same as Payment Gateway currency,Darījuma valūta jābūt tāds pats kā maksājumu Gateway valūtu
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Transaction currency must be same as Payment Gateway currency,Darījuma valūta jābūt tāds pats kā maksājumu Gateway valūtu
 DocType: Payment Entry,Receive,Saņemt
+apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,Citāti:
 DocType: Maintenance Visit,Fully Completed,Pilnībā Pabeigts
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% pabeigti
 DocType: Employee,Educational Qualification,Izglītības Kvalifikācijas
 DocType: Workstation,Operating Costs,Ekspluatācijas Izmaksas
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Darbība ja uzkrātie ikmēneša budžets pārsniegts
 DocType: Purchase Invoice,Submit on creation,Iesniegt radīšanas
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +432,Currency for {0} must be {1},Valūta {0} ir {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +435,Currency for {0} must be {1},Valūta {0} ir {1}
 DocType: Asset,Disposal Date,Atbrīvošanās datums
 DocType: Employee Leave Approver,Employee Leave Approver,Darbinieku Leave apstiprinātājs
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,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 +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/crm/doctype/opportunity/opportunity.py +79,"Cannot declare as lost, because Quotation has been made.","Nevar atzīt par zaudēto, jo citāts ir veikts."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Pirkuma Master vadītājs
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +429,Production Order {0} must be submitted,Ražošanas Order {0} jāiesniedz
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +434,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
@@ -3673,25 +3723,27 @@
 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
 DocType: Price List,Price List Name,Cenrādis Name
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +181,Totals,Kopsummas
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,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 +113,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 +120,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
 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."
+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 +181,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/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 +793,All records are synced.,Visi ieraksti tiek sinhronizēti.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +781,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
 DocType: Cost Center,Cost Center Name,Cost Center Name
@@ -3710,21 +3762,20 @@
 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/selling/doctype/quotation/quotation.py +49,Cannot set as Lost as Sales Order is made.,Nevar iestatīt kā Lost kā tiek veikts Sales Order.
-DocType: Student Applicant,Mother's Name,Mātes vārds
 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 +348,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Nevar atskaitīt, ja kategorija ir &quot;vērtēšanas&quot; vai &quot;Vaulation un Total&quot;"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Received From,Saņemts no
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Received From,Saņemts no
 DocType: Lead,Converted,Konvertē
 DocType: Item,Has Serial No,Ir Sērijas nr
 DocType: Employee,Date of Issue,Izdošanas datums
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{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 +93,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/projects/doctype/timesheet/timesheet.py +117,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
 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 +172,{0} {1} does not exist,{0} {1} neeksistē
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +175,{0} {1} does not exist,{0} {1} neeksistē
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,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 +72,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
@@ -3733,13 +3784,14 @@
 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/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
 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 +109,Electrical,Elektrības
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Electrical,Elektrības
 DocType: Stock Entry,Total Value Difference (Out - In),Kopējā vērtība Starpība (Out - In)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,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}"
@@ -3747,7 +3799,7 @@
 DocType: Item,Customer Code,Klienta kods
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +210,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 +292,Debit To account must be a Balance Sheet account,Debets kontā jābūt bilance konts
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To account must be a Balance Sheet account,Debets kontā jābūt bilance konts
 DocType: Buying Settings,Naming Series,Nosaucot Series
 DocType: Leave Block List,Leave Block List Name,Atstājiet Block Saraksta nosaukums
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Akciju aktīvi
@@ -3759,11 +3811,11 @@
 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 +301,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 +313,Salary Slip of employee {0} already created for time sheet {1},Alga Slip darbinieka {0} jau radīts laiks lapas {1}
 DocType: Sales Order Item,Ordered Qty,Pasūtīts daudzums
-apps/erpnext/erpnext/stock/doctype/item/item.py +673,Item {0} is disabled,Postenis {0} ir invalīds
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,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 +838,BOM does not contain any stock item,BOM nesatur krājuma priekšmetu
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +809,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.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Izveidot algas lapas
@@ -3771,23 +3823,24 @@
 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)
-apps/erpnext/erpnext/stock/doctype/item/item.py +485,Row #{0}: Please set reorder quantity,Row # {0}: Lūdzu noteikt pasūtīšanas daudzumu
+DocType: Sales Invoice Timesheet,Billing Hours,Norēķinu Stundas
+apps/erpnext/erpnext/stock/doctype/item/item.py +487,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 +62,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
+DocType: Payment Entry,Allocate Payment Amount,Piešķirt Maksājuma summu
 DocType: Employee External Work History,Salary,Alga
 DocType: Serial No,Delivery Document Type,Piegāde Dokumenta tips
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Iesniegt visas algas lapas par iepriekš izvēlētajiem kritērijiem
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} Preces sinhronizētas
 DocType: Sales Order,Partly Delivered,Daļēji Pasludināts
-DocType: Sales Invoice,Existing Customer,Esošās Klientu
 DocType: Email Digest,Receivables,Debitoru parādi
+DocType: Lead Source,Lead Source,Lead Source
 DocType: Customer,Additional information regarding the customer.,Papildu informācija par klientu.
 DocType: Quality Inspection Reading,Reading 5,Lasīšana 5
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +38,Campaign Name is required,Kampaņas nosaukums ir obligāts
 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
@@ -3795,10 +3848,9 @@
 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 +129,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 +113,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
-DocType: Bank Reconciliation Detail,Amount,Summa
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM aizstāj
 ,Sales Analytics,Pārdošanas Analīze
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +113,Available {0},Pieejams {0}
@@ -3806,14 +3858,14 @@
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Iestatīšana E-pasts
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +96,Please enter default currency in Company Master,Ievadiet noklusējuma valūtu Uzņēmuma Master
 DocType: Stock Entry Detail,Stock Entry Detail,Stock Entry Detail
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +100,Daily Reminders,Ikdienas atgādinājumi
+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/account/account_tree.js +23,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 +71,Customer Service,Klientu apkalpošana
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Customer Service,Klientu apkalpošana
 DocType: Homepage Featured Product,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
@@ -3822,8 +3874,9 @@
 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
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Default nepabeigtie Noliktava
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1570,Total nos of serial no is not equal to quantity.,Kopā nos no sērijas nr nav vienāds ar daudzumu.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1594,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"
 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
@@ -3831,9 +3884,10 @@
 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 +82,Engineer,Inženieris
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,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 +370,Item Code required at Row No {0},Postenis Code vajadzīga Row Nr {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +398,Item Code required at Row No {0},Postenis Code vajadzīga Row Nr {0}
 DocType: Sales Partner,Partner Type,Partner Type
 DocType: Purchase Taxes and Charges,Actual,Faktisks
 DocType: Authorization Rule,Customerwise Discount,Customerwise Atlaide
@@ -3849,16 +3903,18 @@
 DocType: BOM,Raw Material Cost,Izejvielas izmaksas
 DocType: Item Reorder,Re-Order Level,Re-Order līmenis
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Ievadiet preces un plānoto qty par kuru vēlaties paaugstināt ražošanas pasūtījumus vai lejupielādēt izejvielas analīzei.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +55,Part-time,Nepilna laika
+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
 DocType: Employee,Applicable Holiday List,Piemērojams brīvdienu sarakstu
 DocType: Employee,Cheque,Čeks
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Series Atjaunots
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +57,Series Updated,Series Atjaunots
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Ziņojums Type ir obligāts
 DocType: Item,Serial Number Series,Sērijas numurs Series
 apps/erpnext/erpnext/buying/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 +87,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
@@ -3872,7 +3928,7 @@
 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 +513,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 +518,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."
@@ -3882,7 +3938,7 @@
 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/stock/doctype/stock_entry/stock_entry.py +158,Target warehouse in row {0} must be same as Production Order,Mērķa noliktava rindā {0} ir jābūt tādai pašai kā Production ordeņa
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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
 DocType: Company,Round Off Account,Noapaļot kontu
@@ -3891,23 +3947,22 @@
 DocType: Customer Group,Parent Customer Group,Parent Klientu Group
 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 +180,Notice Period,Uzteikuma termiņš
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,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 +4,New Sales Person Name,Jauns Sales Person vārds
 DocType: Packing Slip,Gross Weight UOM,Bruto svara Mērvienība
-DocType: Email Digest,Receivables / Payables,Debitori / Parādi
 DocType: Delivery Note Item,Against Sales Invoice,Pret pārdošanas rēķinu
 DocType: Bin,Reserved Qty for Production,Rezervēts Daudzums uz ražošanas
 DocType: Asset,Frequency of Depreciation (Months),Biežums nolietojums (mēneši)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +469,Credit Account,Kredīta konts
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Credit Account,Kredīta konts
 DocType: Landed Cost Item,Landed Cost Item,Izkrauti izmaksu pozīcijas
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +55,Show zero values,Parādīt nulles vērtības
+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
 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 +647,Please specify Attribute Value for attribute {0},"Lūdzu, norādiet īpašības Value atribūtam {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},"Lūdzu, norādiet īpašības Value atribūtam {0}"
 DocType: Item,Default Warehouse,Default Noliktava
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +39,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
@@ -3929,19 +3984,22 @@
 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
-DocType: Sales Invoice,Cold Calling,Cold Calling
 DocType: SMS Parameter,SMS Parameter,SMS parametrs
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,Budžets un izmaksu centrs
 DocType: Maintenance Schedule Item,Half Yearly,Pusgada
 DocType: Lead,Blog Subscriber,Blog Abonenta
+DocType: Guardian,Alternate Number,Alternatīvā 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.
+DocType: Stock Reconciliation Item,Quantity Difference,daudzums Starpība
 apps/erpnext/erpnext/config/hr.py +253,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 +141,Set as Lost,Uzstādīt kā Lost
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,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 +5,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
 DocType: Supplier,Credit Days Based On,Kredīta Dienas Based On
@@ -3953,11 +4011,10 @@
 ,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 +941,Select or add new customer,Izvēlieties vai pievienot jaunu klientu
+apps/erpnext/erpnext/accounts/page/pos/pos.js +930,Select or add new customer,Izvēlieties vai pievienot jaunu klientu
 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 +5,This is based on the attendance of this Employee,Tas ir balstīts uz piedalīšanos šī darbinieka
-DocType: Sales Invoice,Frequency,frekvence
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +463,Debit Account,Debeta kontu
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,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)
@@ -3966,27 +4023,27 @@
 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 +210,Supplier Quotation {0} created,Piegādātājs Piedāvājums {0} izveidots
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +208,Supplier Quotation {0} created,Piegādātājs Piedāvājums {0} izveidots
 apps/erpnext/erpnext/accounts/report/financial_statements.py +90,End Year cannot be before Start Year,Beigu gads nevar būt pirms Start gads
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Employee Benefits,Darbinieku pabalsti
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,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 +228,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 +232,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 +499,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 +500,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 +1007,Price List not found or disabled,Cenrādis nav atrasts vai invalīds
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1008,Price List not found or disabled,Cenrādis nav atrasts vai invalīds
 DocType: Expense Claim,Approved,Apstiprināts
 DocType: Pricing Rule,Price,Cena
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +244,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 +256,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ā
@@ -3997,12 +4054,12 @@
 DocType: Address,Office,Birojs
 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 +259,Please select Employee Record first.,"Lūdzu, izvēlieties Darbinieku Ierakstīt pirmās."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +266,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 +190,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 +235,Please enter Expense Account,Ievadiet izdevumu kontu
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,Please enter Expense Account,Ievadiet izdevumu kontu
 DocType: Account,Stock,Noliktava
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,"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 +976,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Reference Document Type jābūt vienam no Pirkuma ordeņa, Pirkuma rēķins vai Journal Entry"
 DocType: Employee,Current Address,Pašreizējā adrese
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Ja prece ir variants citā postenī, tad aprakstu, attēlu, cenas, nodokļi utt tiks noteikts no šablona, ja vien nav skaidri norādīts"
 DocType: Serial No,Purchase / Manufacture Details,Pirkuma / Ražošana Details
@@ -4017,9 +4074,10 @@
 DocType: Asset Movement,Transaction Date,Darījuma datums
 DocType: Production Plan Item,Planned Qty,Plānotais Daudz
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,Kopā Nodokļu
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,For Quantity (Manufactured Qty) is mandatory,Par Daudzums (Rūpniecības Daudzums) ir obligāts
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,For Quantity (Manufactured Qty) is mandatory,Par Daudzums (Rūpniecības Daudzums) ir obligāts
 DocType: Stock Entry,Default Target Warehouse,Default Mērķa Noliktava
 DocType: Purchase Invoice,Net Total (Company Currency),Neto Kopā (Company valūta)
+apps/erpnext/erpnext/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 +78,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: Production Order,Actual Start Date,Faktiskais sākuma datums
@@ -4034,9 +4092,11 @@
 DocType: Warranty Claim,If different than customer address,Ja savādāka nekā klientu adreses
 DocType: BOM Operation,BOM Operation,BOM Operation
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Uz iepriekšējo rindu summas
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +226,Transfer Asset,Transfer Asset
+DocType: Student,Home Address,Mājas adrese
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +227,Transfer Asset,Transfer Asset
 DocType: POS Profile,POS Profile,POS Profile
 apps/erpnext/erpnext/config/schools.py +33,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 +129,"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
@@ -4046,8 +4106,8 @@
 DocType: Assessment,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 +765,Material to Supplier,Materiāls piegādātājam
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +189,Excise Invoice,Akcīzes Invoice
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,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
 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
@@ -4057,7 +4117,7 @@
 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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,Studentu grupas izveidots.
 DocType: Scheduling Tool,Scheduling Tool,plānošana Tool
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +136,Credit Card,Kredītkarte
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,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.
 DocType: Purchase Invoice,Next Date,Nākamais datums
@@ -4065,6 +4125,7 @@
 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: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Šeit jūs varat saglabāt ģimenes informāciju, piemēram, vārdu un okupācijas mātes, laulātā un bērnu"
+DocType: Academic Term,Term End Date,Term beigu datums
 DocType: Hub Settings,Seller Name,Pārdevējs Vārds
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Nodokļi un maksājumi Atskaitīts (Company valūta)
 DocType: Item Group,General Settings,Vispārīgie iestatījumi
@@ -4076,7 +4137,7 @@
 DocType: Customer,Commission Rate,Komisija Rate
 apps/erpnext/erpnext/stock/doctype/item/item.js +261,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 +115,"Payment Type must be one of Receive, Pay and Internal Transfer","Maksājuma veids ir viens no saņemšana, Pay un Iekšējās Transfer"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +118,"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/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Grozs ir tukšs
 DocType: Production Order,Actual Operating Cost,Faktiskā ekspluatācijas izmaksas
@@ -4091,10 +4152,10 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,"Lūdzu, izvēlieties csv failu"
 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 +92,Designer,Dizainers
+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
 DocType: Serial No,Delivery Details,Piegādes detaļas
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +469,Cost Center is required in row {0} in Taxes table for type {1},Izmaksas Center ir nepieciešama rindā {0} nodokļos tabula veidam {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +472,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
 ,Item-wise Purchase Register,Postenis gudrs iegāde Reģistrēties
 DocType: Batch,Expiry Date,Derīguma termiņš
@@ -4104,12 +4165,12 @@
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Projekts meistars.
 apps/erpnext/erpnext/controllers/status_updater.py +174,"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 +417, (Half Day),(puse dienas)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425, (Half Day),(Puse dienas)
 DocType: Supplier,Credit Days,Kredīta dienas
 DocType: Leave Type,Is Carry Forward,Vai Carry Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +740,Get Items from BOM,Dabūtu preces no BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +711,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 +549,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/controllers/accounts_controller.py +552,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š
 ,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
diff --git a/erpnext/translations/mk.csv b/erpnext/translations/mk.csv
index 405e56e..f29ff55 100644
--- a/erpnext/translations/mk.csv
+++ b/erpnext/translations/mk.csv
@@ -18,11 +18,10 @@
 DocType: Sales Partner,Dealer,Дилер
 DocType: Employee,Rented,Изнајмени
 DocType: Purchase Order,PO-,поли-
-apps/erpnext/erpnext/accounts/report/financial_statements.py +19,Start Year {0} not found.,Почетна година {0} не е пронајден.
 DocType: POS Profile,Applicable for User,Применливи за пристап
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +191,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Престана производството со цел да не може да биде укинат, отпушвам тоа прво да го откажете"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +197,Do you really want to scrap this asset?,Дали навистина сакате да ја укине оваа предност?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +17,Select Default Supplier,Одберете Default Добавувачот
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +192,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Престана производството со цел да не може да биде укинат, отпушвам тоа прво да го откажете"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +198,Do you really want to scrap this asset?,Дали навистина сакате да ја укине оваа предност?
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Одберете Default Добавувачот
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Е потребно валута за Ценовник {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Ќе се пресметува во трансакцијата.
 DocType: Address,County,Каунти
@@ -42,46 +41,45 @@
 DocType: Sales Invoice,Customer Name,Име на Клиент
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +126,Bank account cannot be named as {0},Банкарска сметка не може да се именува како {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"Глави (или групи), против кои се направени на сметководствените ставки и рамнотежи се одржува."
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +180,Outstanding for {0} cannot be less than zero ({1}),Најдобро за {0} не може да биде помала од нула ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,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 +148,Series Updated Successfully,Серија успешно ажурирани
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +149,Series Updated Successfully,Серија успешно ажурирани
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Плаќање
 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,Сите Добавувачот Контакт
-DocType: Quality Inspection Reading,Parameter,Параметар
 apps/erpnext/erpnext/projects/doctype/project/project.py +54,Expected End Date can not be less than Expected Start Date,Се очекува Крај Датум не може да биде помал од очекуваниот почеток Датум
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Ред # {0}: Оцени мора да биде иста како {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +239,New Leave Application,Нов Оставете апликација
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,New Leave Application,Нов Оставете апликација
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +20,Attendance Record {0} exists against Student {1} for Course Schedule {2},Присуство евиденција {0} постои против Студентски {1} за курсот Распоред {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Bank Draft,Банкарски Draft
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,Банкарски Draft
 DocType: Mode of Payment Account,Mode of Payment Account,Начин на плаќање сметка
 apps/erpnext/erpnext/stock/doctype/item/item.js +52,Show Variants,Прикажи Варијанти
 DocType: Academic Term,Academic Term,академски мандат
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +13,Material,материјал
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Quantity,Кол
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +511,Accounts table cannot be blank.,Табела со сметки не може да биде празно.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +616,Quantity,Кол
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +512,Accounts table cannot be blank.,Табела со сметки не може да биде празно.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,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/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 +142,User {0} is already assigned to Employee {1},Корисник {0} е веќе доделен на вработените {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Здравствена заштита
-DocType: Purchase Invoice,Monthly,Месечен
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Задоцнување на плаќањето (во денови)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +771,Invoice,Фактура
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +750,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 +198,Row {0}: {1} {2} does not match with {3},Ред {0}: {1} {2} не се поклопува со {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Ред # {0}:
+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 +127,Please select Price List,Ве молиме изберете Ценовник
@@ -112,8 +110,8 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Истата компанија се внесе повеќе од еднаш
 DocType: Employee,Married,Брак
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Не се дозволени за {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +589,Get items from,Се предмети од
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +382,Stock cannot be updated against Delivery Note {0},Акции не може да се ажурира против Испратница {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Се предмети од
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,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,Бакалница
@@ -122,7 +120,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 +156,Salary Structure Missing,Плата Структура исчезнати
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Salary Structure Missing,Плата Структура исчезнати
 DocType: Lead,Person Name,Име лице
 DocType: Sales Invoice Item,Sales Invoice Item,Продажна Фактура Артикал
 DocType: Account,Credit,Кредит
@@ -130,10 +128,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 +156,Credit limit has been crossed for customer {0} {1}/{2},Кредитен лимит е преминаа за клиентите {0} {1} / {2}
-apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Дали е фиксни средства&quot; не може да се контролира, како што постои евиденција на средствата во однос на точка"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +189,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; не може да се контролира, како што постои евиденција на средствата во однос на точка"
 DocType: Tax Rule,Tax Type,Тип на данок
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +144,You are not authorized to add or update entries before {0},Немате дозвола за да додадете или да ги ажурирате записи пред {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},Немате дозвола за да додадете или да ги ажурирате записи пред {0}
 DocType: Item,Item Image (if not slideshow),Точка слика (доколку не слајдшоу)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Постои клиентите со исто име
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Час Оцени / 60) * Крај на време операција
@@ -143,18 +142,17 @@
 DocType: Student Log,Student Log,студентот се Влез
 DocType: Quality Inspection,Get Specification Details,Земете Спецификација Детали за
 DocType: Lead,Interested,Заинтересирани
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +165,Opening,Отворање
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,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/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Клиентите&gt; клиентот група&gt; Територија
 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.,Сметка со постојните трансакцијата не може да се конвертира во групата.
 DocType: Lead,Product Enquiry,Производ пребарување
 DocType: Academic Term,Schools,училишта
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Ве молиме внесете компанија прв
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Company first,Ве молиме изберете ја првата компанија
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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,Вкупно Трошоци
@@ -164,7 +162,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Состојба на сметката
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Лекови
 DocType: Purchase Invoice Item,Is Fixed Asset,Е фиксни средства
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Available qty is {0}, you need {1}","Достапно Количина е {0}, треба {1}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +225,"Available qty is {0}, you need {1}","Достапно Количина е {0}, треба {1}"
 DocType: Expense Claim Detail,Claim Amount,Износ барање
 DocType: Employee,Mr,Г-дин
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Добавувачот Вид / Добавувачот
@@ -173,25 +171,26 @@
 DocType: Employee,B-,Б-
 DocType: Upload Attendance,Import Log,Увоз Влез
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Повлечете материјал Барање од типот Производство врз основа на горенаведените критериуми
+DocType: Assessment Result,Grade,одделение
 DocType: Sales Invoice Item,Delivered By Supplier,Дадено од страна на Добавувачот
 DocType: SMS Center,All Contact,Сите Контакт
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Annual Salary,Годишна плата
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Акции Трошоци
-apps/erpnext/erpnext/accounts/report/financial_statements.py +22,End Year {0} not found.,Крајот на годината {0} не е пронајден.
 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}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Снабдување на суровини за набавка
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +130,At least one mode of payment is required for POS invoice.,Потребна е барем еден начин за плаќање на POS фактура.
 DocType: Products Settings,Show Products as a List,Прикажи производи во облик на листа
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Преземете ја Шаблон, пополнете соодветни податоци и да го прикачите по промената на податотеката. Сите датуми и вработен комбинација на избраниот период ќе дојде во дефиниција, со постоечките записи посетеност"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +451,Item {0} is not active or end of life has been reached,Точка {0} не е активна или е достигнат крајот на животот
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +456,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/controllers/accounts_controller.py +614,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","За да го вклучите данок во ред {0} на стапката точка, даноци во редови {1} исто така, мора да бидат вклучени"
+apps/erpnext/erpnext/controllers/accounts_controller.py +617,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","За да го вклучите данок во ред {0} на стапката точка, даноци во редови {1} исто така, мора да бидат вклучени"
 apps/erpnext/erpnext/config/hr.py +166,Settings for HR Module,Прилагодувања за Модул со хумани ресурси
 DocType: SMS Center,SMS Center,SMS центарот
 DocType: Sales Invoice,Change Amount,промени Износ
@@ -203,13 +202,13 @@
 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 +147,Execution,Извршување
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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,Теми и цени
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Вкупно часови: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},Од датумот треба да биде во рамките на фискалната година. Претпоставувајќи од датумот = {0}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,Cost Center {0} does not belong to Company {1},Чини Центар {0} не му припаѓа на компанијата {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +100,Cost Center {0} does not belong to Company {1},Чини Центар {0} не му припаѓа на компанијата {1}
 DocType: Customer,Individual,Индивидуални
 DocType: Interest,Academics User,академиците пристап
 DocType: Cheque Print Template,Amount In Figure,Износ во слика
@@ -225,30 +224,32 @@
 DocType: Production Planning Tool,Sales Orders,Продај Нарачка
 DocType: Purchase Taxes and Charges,Valuation,Вреднување
 ,Purchase Order Trends,Нарачка трендови
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,The request for quotation can be accessed by clicking on the following link,Барањето за прибирање на понуди може да се пристапи со кликнување на следниов линк
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,Распредели листови за оваа година.
 DocType: SG Creation Tool Course,SG Creation Tool Course,SG инструмент за создавање на курсот
 DocType: Student Group Creation Tool,Leave blank if you wish to fetch all courses for selected academic term,Оставете го празно ако сакате да достигне цена од сите предмети за избраните академски мандат
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,Insufficient Stock,недоволна Акции
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227,Insufficient Stock,недоволна Акции
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Оневозможи капацитет за планирање и време Следење
+DocType: Email Digest,New Sales Orders,Продажбата на нови нарачки
 DocType: Bank Reconciliation,Bank Account,Банкарска сметка
 DocType: Leave Type,Allow Negative Balance,Им овозможи на негативното салдо
 DocType: Selling Settings,Default Territory,Стандардно Територија
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Телевизија
 DocType: Production Order Operation,Updated via 'Time Log',Ажурираат преку &quot;Време Вклучи се &#39;
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} does not belong to Company {1},На сметка {0} не му припаѓа на компанијата {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +86,Account {0} does not belong to Company {1},На сметка {0} не му припаѓа на компанијата {1}
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},Однапред сума не може да биде поголема од {0} {1}
 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 +174,For Warehouse is required before Submit,За Магацински се бара пред Поднесете
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,For Warehouse is required before Submit,За Магацински се бара пред Поднесете
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Добиени на
 DocType: Sales Partner,Reseller,Препродавач
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,Ве молиме внесете компанијата
 DocType: Delivery Note Item,Against Sales Invoice Item,Во однос на Артикал од Продажна фактура
 ,Production Orders in Progress,Производство налози во прогрес
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Cash from Financing,Нето паричен тек од финансирањето
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1436,"LocalStorage is full , did not save","LocalStorage е полна, не штедеше"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1460,"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}
@@ -261,18 +262,19 @@
 apps/erpnext/erpnext/templates/generators/item.html +78,No description given,Нема опис даден
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Барање за купување.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +5,This is based on the Time Sheets created against this project,Ова се базира на време листови создадени против овој проект
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Only the selected Leave Approver can submit this Leave Application,Само избраните Остави Approver може да го достави овој Оставете апликација
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +213,Only the selected Leave Approver can submit this Leave Application,Само избраните Остави Approver може да го достави овој Оставете апликација
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Ослободување Датум мора да биде поголема од датумот на пристап
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Leaves per Year,Остава на годишно ниво
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,Остава на годишно ниво
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Ред {0}: Ве молиме проверете &quot;Дали напредување против сметка {1} Ако ова е однапред влез.
 apps/erpnext/erpnext/stock/utils.py +188,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,литарски
 DocType: Task,Total Costing Amount (via Time Sheet),Вкупно Износ на трошоци (преку време лист)
 DocType: Item Website Specification,Item Website Specification,Точка на вебсајт Спецификација
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +435,Leave Blocked,Остави блокирани
-apps/erpnext/erpnext/stock/doctype/item/item.py +669,Item {0} has reached its end of life on {1},Точка {0} достигна својот крај на животот на {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +443,Leave Blocked,Остави блокирани
+apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item {0} has reached its end of life on {1},Точка {0} достигна својот крај на животот на {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +95,Bank Entries,Банката записи
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +83,Annual,Годишен
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +86,Annual,Годишен
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Акции помирување Точка
 DocType: Stock Entry,Sales Invoice No,Продажна Фактура Бр.
 DocType: Material Request Item,Min Order Qty,Минимална Подреди Количина
@@ -280,20 +282,22 @@
 DocType: Lead,Do Not Contact,Не го допирајте
 apps/erpnext/erpnext/public/js/setup_wizard.js +360,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 +91,Software Developer,Развивач на софтвер
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,Развивач на софтвер
 DocType: Item,Minimum Order Qty,Минимална Подреди Количина
 DocType: Pricing Rule,Supplier Type,Добавувачот Тип
 DocType: Scheduling Tool,Course Start Date,Се разбира Почеток Датум
 DocType: Item,Publish in Hub,Објави во Hub
+DocType: Student Admission,Student Admission,за прием на студентите
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is cancelled,Точка {0} е откажана
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Material Request,Материјал Барање
+apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} is cancelled,Точка {0} е откажана
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +823,Material Request,Материјал Барање
 DocType: Bank Reconciliation,Update Clearance Date,Ажурирање Чистење Датум
 apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +28,Abbreviation already used for another salary component,Кратенка веќе се користи за друга компонента плата
 DocType: Item,Purchase Details,Купување Детали за
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +328,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Точка {0} не се најде во &quot;суровини испорачува&quot; маса во нарачката {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +333,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/config/selling.py +18,Confirmed orders from Customers.,Потврди налози од клиенти.
 DocType: Purchase Receipt Item,Rejected Quantity,Одбиени Кол
 DocType: SMS Settings,SMS Sender Name,SMS испраќачот Име
@@ -309,20 +313,21 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +130,Please select Charge Type first,Ве молиме изберете Полнење Тип прв
 DocType: Student Group Student,Student Group Student,Група на студенти студент
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Најнови
+DocType: Email Digest,New Quotations,Нов Цитати
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Првиот Leave Approver во листата ќе биде поставена како стандардна Остави Approver
 DocType: Tax Rule,Shipping County,округот превозот
 apps/erpnext/erpnext/config/desktop.py +158,Learn,Научат
 DocType: Asset,Next Depreciation Date,Следна Амортизација Датум
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Трошоци активност по вработен
 DocType: Accounts Settings,Settings for Accounts,Поставки за сметки
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +626,Supplier Invoice No exists in Purchase Invoice {0},Добавувачот фактура не постои во Набавка фактура {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +629,Supplier Invoice No exists in Purchase Invoice {0},Добавувачот фактура не постои во Набавка фактура {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Управување со продажбата на лице дрвото.
 DocType: Job Applicant,Cover Letter,мотивационо писмо
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Најдобро Чекови и депозити да се расчисти
 DocType: Item,Synced With Hub,Синхронизираат со 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 +348,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 +86,Circular Reference Error,Кружни Суд Грешка
@@ -334,15 +339,16 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Да го извести преку е-пошта на создавање на автоматски материјал Барање
 DocType: Journal Entry,Multi Currency,Мулти Валута
 DocType: Payment Reconciliation Invoice,Invoice Type,Тип на фактура
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +806,Delivery Note,Потврда за испорака
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +800,Delivery Note,Потврда за испорака
 apps/erpnext/erpnext/config/learn.py +87,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 +233,Payment Entry has been modified after you pulled it. Please pull it again.,Плаќање Влегување е изменета откако ќе го влечат. Ве молиме да се повлече повторно.
+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/setup/doctype/email_digest/email_digest.py +104,Summary for this week and pending activities,"Резимето на оваа недела, а во очекување на активности"
+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","Внесете е-мејл проект одделени со запирки, фактура ќе бидат испратени автоматски на одреден датум"
 DocType: Employee,Company Email,Компанија е-мејл
@@ -354,27 +360,28 @@
 apps/erpnext/erpnext/config/hr.py +186,"Employee designation (e.g. CEO, Director etc.).","Ознака за вработените (на пример, извршен директор, директор итн)."
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,Ве молиме внесете &quot;Повторување на Денот на месец областа вредност
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Стапка по која клиентите Валута се претвора во основната валута купувачи
-apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Ред # {0}: Набавка фактура не може да се направи против постоечко средство {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +554,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Ред # {0}: Набавка фактура не може да се направи против постоечко средство {1}
 DocType: Item Tax,Tax Rate,Даночна стапка
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} веќе наменети за вработените {1} за период {2} до {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +812,Select Item,Одберете ја изборната ставка
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +791,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/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Купување на фактура {0} е веќе поднесен
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Ред # {0}: Серија Не мора да биде иста како {1} {2}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +143,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.,Серија (дел) од една ставка.
 DocType: C-Form Invoice Detail,Invoice Date,Датум на фактурата
 DocType: GL Entry,Debit Amount,Износ дебитна
 apps/erpnext/erpnext/accounts/party.py +242,There can only be 1 Account per Company in {0} {1},Може да има само 1 профил на компанијата во {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +4,Your email address,Вашиот е-мејл адреса
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +342,Please see attachment,Ве молиме погледнете приврзаност
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,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 +19,Setup Already Complete!!,Поставување веќе е завршено !!
 ,Finished Goods,Готови производи
 DocType: Delivery Note,Instructions,Инструкции
 DocType: Quality Inspection,Inspected By,Прегледано од страна на
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Добавувачот&gt; Добавувачот Тип
 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,додадете објекти
@@ -388,29 +395,29 @@
 DocType: Currency Exchange,Currency Exchange,Размена на валута
 DocType: Purchase Invoice Item,Item Name,Точка Име
 DocType: Authorization Rule,Approving User  (above authorized value),Одобрување на пристап (над овластени вредност)
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Кредитна биланс
+DocType: Email Digest,Credit Balance,Кредитна биланс
 DocType: Employee,Widowed,Вдовци
 DocType: Request for Quotation,Request for Quotation,Барање за прибирање НА ПОНУДИ
 DocType: Salary Slip Timesheet,Working Hours,Работно време
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Промените почетниот / тековниот број на секвенца на постоечки серија.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Ако има повеќе Правила Цените и понатаму преовладуваат, корисниците се бара да поставите приоритет рачно за решавање на конфликтот."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +736,Purchase Return,Купување Враќање
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +715,Purchase Return,Купување Враќање
 ,Purchase Register,Купување Регистрирај се
 DocType: Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Се применува Давачки
 DocType: Workstation,Consumable Cost,Потрошни Цена
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +202,{0} ({1}) must have role 'Leave Approver',{0} ({1}) мора да имаат улога &quot;Остави Approver&quot;
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,{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 +143,Reason for losing,Причина за губење
-apps/erpnext/erpnext/accounts/utils.py +239,Allocated amount can not greater than unadjusted amount,Распределени износ може да не е поголема од износот нерегулиран
+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,Распределени износ може да не е поголема од износот нерегулиран
 DocType: Announcement,Receiver,приемник
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Работна станица е затворена на следните датуми како на летни Листа на: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Можности
 DocType: Employee,Single,Еден
 DocType: Account,Cost of Goods Sold,Трошоците на продадени производи
 DocType: Purchase Invoice,Yearly,Годишно
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +225,Please enter Cost Center,Ве молиме внесете цена центар
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,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,Име испитувачот
@@ -423,26 +430,26 @@
 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,Проверете Добавувачот број на фактурата Единственост
 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 +102,Non Profit,Непрофитна
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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: Stock Reconciliation Item,Do not include symbols (ex. $),Не вклучува и симболи (пр. $)
 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 +638,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} одбрани неколку пати во атрибути на табелата
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} одбрани неколку пати во атрибути на табелата
 DocType: HR Settings,Employee record is created using selected field. ,Рекорд вработен е креирана преку избрани поле.
 DocType: Sales Order,Not Applicable,Не е применливо
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Одмор господар.
 DocType: Request for Quotation Item,Required Date,Бараниот датум
 DocType: Delivery Note,Billing Address,Платежна адреса
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +862,Please enter Item Code.,Ве молиме внесете Точка законик.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +847,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 Оцени / Печатење Износ"
@@ -456,12 +463,12 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Хартии од вредност и депозити
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Вкупно Отсуства распределени е задолжително
 DocType: Job Opening,Description of a Job Opening,Опис на работно место
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Pending activities for today,Во очекување на активности за денес
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Во очекување на активности за денес
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Присуство евиденција.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Плата Компонента за timesheet врз основа на платен список.
 DocType: Sales Order Item,Used for Production Plan,Се користат за производство план
 DocType: Manufacturing Settings,Time Between Operations (in mins),Време помеѓу операции (во минути)
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +92,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} буџетот на сметка {1} од трошоците центар {2} е {3}. Тоа ќе се надмине со {4}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +95,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} буџетот на сметка {1} од трошоците центар {2} е {3}. Тоа ќе се надмине со {4}
 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 не се за истата ставка
@@ -469,16 +476,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +238,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 +86,Administrative Officer,Административен службеник
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,Административен службеник
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +23,Acutal Qty {0} / Waiting Qty {1},Acutal Количина {0} / чекање Количина {1}
 DocType: Timesheet Detail,Hrs,часот
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +319,Please select Company,Ве молиме изберете ја компанијата
-DocType: Stock Entry,Difference Account,Разликата профил
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +309,Please select Company,Ве молиме изберете ја компанијата
+DocType: Stock Entry Detail,Difference Account,Разликата профил
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Не може да се затвори задача како свој зависни задача {0} не е затворена.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Please enter Warehouse for which Material Request will be raised,Ве молиме внесете Магацински за кои ќе се зголеми материјал Барање
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +399,Please enter Warehouse for which Material Request will be raised,Ве молиме внесете Магацински за кои ќе се зголеми материјал Барање
 DocType: Production Order,Additional Operating Cost,Дополнителни оперативни трошоци
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Козметика
-apps/erpnext/erpnext/stock/doctype/item/item.py +530,"To merge, following properties must be same for both items","За да се логирате, следниве својства мора да биде иста за двата предмети"
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,"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 +28,Buy,Размислете за купување
@@ -486,7 +493,7 @@
 DocType: Sales Invoice,Offline POS Name,Надвор од мрежа ПОС Име
 DocType: Sales Order,To Deliver,За да овозможи
 DocType: Purchase Invoice Item,Item,Точка
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1563,Serial no item cannot be a fraction,Сериски број ставка не може да биде дел
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1587,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,Управување Склучување
@@ -495,13 +502,14 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Account {0} does not belong to company: {1},На сметка {0} не му припаѓа на компанијата: {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation already used for another company,Кратенка веќе се користи за друга компанија
 DocType: Selling Settings,Default Customer Group,Стандардната група на потрошувачи
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Supplier is required against Payable account {0},Добавувачот е потребно против плаќа сметка {0}
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Ако е оневозможено, полето 'Вкупно заокружено' нема да биде видливо во сите трансакции"
 DocType: BOM,Operating Cost,Оперативните трошоци
 DocType: Sales Order Item,Gross Profit,Бруто добивка
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +42,Increment cannot be 0,Зголемување не може да биде 0
 DocType: Production Planning Tool,Material Requirement,Материјал Потребно
 DocType: Company,Delete Company Transactions,Избриши компанијата Трансакции
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +313,Reference No and Reference Date is mandatory for Bank transaction,Референтен број и референтен датум е задолжително за банкарски трансакции
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +316,Reference No and Reference Date is mandatory for Bank transaction,Референтен број и референтен датум е задолжително за банкарски трансакции
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Додај / Уреди даноци и такси
 DocType: Purchase Invoice,Supplier Invoice No,Добавувачот Фактура бр
 DocType: Territory,For reference,За референца
@@ -512,7 +520,6 @@
 DocType: Installation Note Item,Installation Note Item,Инсталација Забелешка Точка
 DocType: Production Plan Item,Pending Qty,Во очекување на Количина
 DocType: Budget,Ignore,Игнорирај
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Точка Код&gt; Точка Група&gt; Бренд
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,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
@@ -523,11 +530,11 @@
 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/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Не се пронајдени во табелата Фактура рекорди
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +28,Please select Company and Party Type first,Ве молиме изберете компанија и Партијата Тип прв
+apps/erpnext/erpnext/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/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 +707,Make Sales Order,Направи Продај Побарувања
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +701,Make Sales Order,Направи Продај Побарувања
 DocType: Project Task,Project Task,Проектна задача
 ,Lead Id,Потенцијален клиент Id
 DocType: C-Form Invoice Detail,Grand Total,Сѐ Вкупно
@@ -543,7 +550,8 @@
 DocType: Job Applicant,Resume Attachment,продолжи Прилог
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Повтори клиенти
 DocType: Leave Control Panel,Allocate,Распредели
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +734,Sales Return,Продажбата Враќање
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +728,Sales Return,Продажбата Враќање
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +91,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Забелешка: Вкупно распределени лисја {0} не треба да биде помал од веќе одобрен лисја {1} за периодот
 DocType: Announcement,Posted By,Испратено од
 DocType: Item,Delivered by Supplier (Drop Ship),Дадено од страна на Добавувачот (Капка Брод)
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,База на податоци на потенцијални клиенти.
@@ -552,14 +560,13 @@
 DocType: Quotation,Quotation To,Понуда за
 DocType: Lead,Middle Income,Среден приход
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +212,Opening (Cr),Отворање (ЦР)
-apps/erpnext/erpnext/stock/doctype/item/item.py +795,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Стандардно единица мерка за Точка {0} не можат да се менуваат директно затоа што веќе се направени некои трансакција (а) со друг UOM. Ќе треба да се создаде нова точка да се користи различен Default UOM.
-apps/erpnext/erpnext/accounts/utils.py +237,Allocated amount can not be negative,Распределени износ не може да биде негативен
+apps/erpnext/erpnext/stock/doctype/item/item.py +797,Default Unit of Measure for Item {0} cannot be changed directly because 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,Распределени износ не може да биде негативен
 DocType: Purchase Order Item,Billed Amt,Таксуваната Амт
 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 +91,Reference No & Reference Date is required for {0},Референтен број и референтен датум е потребно за {0}
-DocType: Sales Invoice,Customer's Vendor,Добавувачот на купувачи
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Proposal Writing,Пишување предлози
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,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","Ако е означено, суровини за предмети кои се под-договор ќе бидат вклучени во Материјал Барања"
@@ -568,13 +575,14 @@
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,Следење на времето
 DocType: Fiscal Year Company,Fiscal Year Company,Фискална година компанијата
 DocType: Packing Slip Item,DN Detail,DN Детална
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +257,Already supplier quotation has created,Веќе добавувачот цитат создаде
 DocType: Timesheet,Billed,Фактурирани
 DocType: Batch,Batch Description,Серија Опис
+apps/erpnext/erpnext/accounts/utils.py +685,"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 +733,View Offline Records,Види Офлајн рекорди
+apps/erpnext/erpnext/accounts/page/pos/pos.js +715,View Offline Records,Види Офлајн рекорди
+DocType: Student,Sibling Details,брат Детали
 DocType: Employee,Reason for Resignation,Причина за оставка
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,Шаблон за ефикасност на мислењата.
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,Фактура / весник детали за влез
@@ -588,7 +596,7 @@
 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,Нето промени во Инвентар
 DocType: Employee,Passport Number,Број на пасош
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Manager,Менаџер
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,Менаџер
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,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; не може да биде ист
@@ -597,10 +605,11 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter email address,Ве молиме внесете e-mail адреса
 DocType: Production Order Operation,In minutes,Во минути
 DocType: Issue,Resolution Date,Резолуцијата Датум
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +299,Timesheet created:,Timesheet е основан:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +715,Please set default Cash or Bank account in Mode of Payment {0},Ве молиме да поставите основен готовина или Банкарска сметка во начинот на плаќање {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +300,Timesheet created:,Timesheet е основан:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +772,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,запишат
 DocType: Selling Settings,Customer Naming By,Именувањето на клиентите со
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ве молам поставете вработените Именување систем во управување со хумани ресурси&gt; Поставки за човечки ресурси
 DocType: Depreciation Schedule,Depreciation Amount,амортизација Износ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,Претворат во група
 DocType: Activity Cost,Activity Type,Тип на активност
@@ -625,6 +634,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,Заврши
 DocType: Pricing Rule,Sales Manager,Менаџер за продажба
 DocType: Salary Structure Employee,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,Добивка / загуба сметка за располагање со средства
@@ -639,11 +649,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +9,Pre Sales,пред продажбата
 DocType: Purchase Receipt,Other Details,Други детали
 DocType: Account,Accounts,Сметки
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Marketing,Маркетинг
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +227,Payment Entry is already created,Плаќање Влегување веќе е создадена
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,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 +538,Row #{0}: Asset {1} does not linked to Item {2},Ред # {0}: {1} средства не се поврзани со Точка {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +21,Preview Salary Slip,Преглед Плата фиш
+apps/erpnext/erpnext/controllers/accounts_controller.py +541,Row #{0}: Asset {1} does not linked to Item {2},Ред # {0}: {1} средства не се поврзани со Точка {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +38,Preview Salary Slip,Преглед Плата фиш
 DocType: Company,Deafult Cost Center,Deafult центар за трошоци
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +48,Account {0} has been entered multiple times,Сметка {0} е внесен повеќе пати
 DocType: Account,Expenses Included In Valuation,Трошоци Вклучени Во Вреднување
@@ -652,7 +662,7 @@
 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 +617,Item has variants.,Ставка има варијанти.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Ставка има варијанти.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,Точка {0} не е пронајдена
 DocType: Bin,Stock Value,Акции вредност
 apps/erpnext/erpnext/accounts/doctype/account/account.py +25,Company {0} does not exist,Компанијата {0} не постои
@@ -672,7 +682,7 @@
 DocType: Purchase Order,Supply Raw Materials,Снабдување со суровини
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,Датумот на кој ќе биде генериранa следната фактура. Тоа е генерирана за поднесете.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Тековни средства
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,{0} is not a stock Item,{0} не е парк Точка
+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 +169,Lead must be set if Opportunity is made from Lead,Мора да се креира Потенцијален клиент ако Можноста е направена од Потенцијален клиент
@@ -739,26 +749,25 @@
 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 +709,No Permission,Нема дозвола
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +710,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,Бр
 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 +542,Row #{0}: Asset {1} must be submitted,{0} ред #: средства мора да бидат поднесени {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,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.
 DocType: Warehouse,Tree Details,Детали за дрво
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Испрати Сега
 ,Support Analytics,Поддршка Аналитика
 DocType: Item,Website Warehouse,Веб-страница Магацински
 DocType: Payment Reconciliation,Minimum Invoice Amount,Минималниот износ на фактура
 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/sales_invoice/sales_invoice.py +227,Timesheet {0} is already completed or cancelled,Timesheet {0} е веќе завршен проект или откажани
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +259,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","На ден од месецот на кој авто фактура ќе биде генериран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
@@ -774,13 +783,13 @@
 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 +229,Target Warehouse,Целна Магацински
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +230,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-,STE-
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Sales Order Date,Се очекува испорака датум не може да биде пред Продај Побарувања Датум
 DocType: Upload Attendance,Import Attendance,Увоз Публика
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Сите Точка групи
+apps/erpnext/erpnext/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/config/setup.py +89,Automatically compose message on submission of transactions.,Автоматски компонира порака на поднесување на трансакции.
@@ -792,13 +801,15 @@
 DocType: Sales Invoice,Payment Due Date,Плаќање најдоцна до Датум
 apps/erpnext/erpnext/stock/doctype/item/item.js +278,Item Variant {0} already exists with same attributes,Ставка Варијанта {0} веќе постои со истите атрибути
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;Отворање&#39;
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Отворете го направите
 DocType: Notification Control,Delivery Note Message,Испратница порака
 DocType: Expense Claim,Expenses,Трошоци
 DocType: Item Variant Attribute,Item Variant Attribute,Ставка Варијанта Атрибут
 ,Purchase Receipt Trends,Купување Потврда трендови
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Research & Development,Истражување и развој
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Истражување и развој
 ,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,Цена или попуст
@@ -807,7 +818,7 @@
 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/controllers/accounts_controller.py +340,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Плаќање Влегување {0} е поврзана против редот на {1}, проверете дали тоа треба да се повлече како напредок во оваа фактура."
+apps/erpnext/erpnext/controllers/accounts_controller.py +343,"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-Продажба
@@ -829,12 +840,12 @@
 DocType: Supplier Quotation,Is Subcontracted,Се дава под договор
 DocType: Item Attribute,Item Attribute Values,Точка атрибут вредности
 DocType: Examination Result,Examination Result,испитување резултат
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +756,Purchase Receipt,Купување Потврда
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +735,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 +167,Reference Doctype must be one of {0},Суд DOCTYPE мора да биде еден од {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +282,Unable to find Time Slot in the next {0} days for Operation {1},Не можам да најдам временски слот во следните {0} денови за работа {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +170,Reference Doctype must be one of {0},Суд DOCTYPE мора да биде еден од {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Unable to find Time Slot in the next {0} days for Operation {1},Не можам да најдам временски слот во следните {0} денови за работа {1}
 DocType: Production Order,Plan material for sub-assemblies,План материјал за потсклопови
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Продај Партнери и територија
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be active,Бум {0} мора да биде активен
@@ -845,7 +856,7 @@
 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 +214,Warehouses with existing transaction can not be converted to ledger.,Магацини со постоечките трансакцијата не може да се конвертира во главната книга.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +217,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,Производство Нарачка
@@ -859,9 +870,9 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Вработен {0} не е активна или не постои
 DocType: Fee Structure,Components,делови
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,Please enter Asset Category in Item {0},Ве молиме внесете Категорија средства во точка {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +612,Item Variants {0} updated,Точка Варијанти {0} ажурирани
+apps/erpnext/erpnext/stock/doctype/item/item.py +614,Item Variants {0} updated,Точка Варијанти {0} ажурирани
 DocType: Quality Inspection Reading,Reading 6,Читање 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +843,Cannot {0} {1} {2} without any negative outstanding invoice,Не може да се {0} {1} {2} без никакви негативни извонредна фактура
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +854,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 Сега
@@ -876,69 +887,72 @@
 DocType: Item,Is Purchase Item,Е Набавка Точка
 DocType: Asset,Purchase Invoice,Купување на фактура
 DocType: Stock Ledger Entry,Voucher Detail No,Ваучер Детална Не
-apps/erpnext/erpnext/accounts/page/pos/pos.js +728,New Sales Invoice,Нов почеток на продажбата на фактура
+apps/erpnext/erpnext/accounts/page/pos/pos.js +710,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 +728,Sync Offline Invoices,Sync Офлајн Фактури
 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: Cheque Print Template,Has Print Format,Има печати формат
-apps/erpnext/erpnext/accounts/page/pos/pos.js +86, is mandatory. Maybe Currency Exchange record is not created for ,е задолжително. Можеби не е создаден запис Девизен за
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +109,Row #{0}: Please specify Serial No for Item {1},Ред # {0}: Ве молиме наведете Сериски Не за Точка {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +619,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","За предмети &quot;производ Бовча&quot;, складиште, сериски број и Batch нема да се смета од &quot;Пакување Листа на &#39;табелата. Ако Магацински и Batch Не се исти за сите предмети за пакување ставка било &quot;производ Бовча&quot;, тие вредности може да се влезе во главната маса точка, вредностите ќе биде копирана во &quot;Пакување Листа на &#39;табелата."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +75, 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 +613,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing 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 +606,Supplier Invoice Date cannot be greater than Posting Date,Датум на Добавувачот фактура не може да биде поголем од објавувањето Датум
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +609,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: Cheque Print Template,Date Settings,датум Settings
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Варијанса
 ,Company Name,Име на компанијата
 DocType: SMS Center,Total Message(s),Вкупно пораки
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +810,Select Item for Transfer,Одберете ја изборната ставка за трансфер
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +789,Select Item for Transfer,Одберете ја изборната ставка за трансфер
 DocType: Purchase Invoice,Additional Discount Percentage,Дополнителен попуст Процент
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Преглед на листа на сите помош видеа
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Изберете Account главата на банката во која е депониран чек.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Им овозможи на корисникот да ги уредувате Ценовник стапка во трансакции
 DocType: Pricing Rule,Max Qty,Макс Количина
-DocType: Student Applicant,Father's Name,Татково име
 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 +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Ред {0}: Плаќање против продажба / нарачка секогаш треба да бидат означени како однапред
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Хемиски
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +686,All items have already been transferred for this Production Order.,Сите предмети се веќе префрлени за оваа цел производство.
+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} и обидете се повторно
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +694,All items have already been transferred for this Production Order.,Сите предмети се веќе префрлени за оваа цел производство.
 DocType: Process Payroll,Select Payroll Year and Month,Изберете Даноци година и месец
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,Meter,Метар
 DocType: Workstation,Electricity Cost,Цената на електричната енергија
 DocType: HR Settings,Don't send Employee Birthday Reminders,Не праќај вработените роденден потсетници
-DocType: Opportunity,Walk In,Прошетка во
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,Акции записи
 DocType: Item,Inspection Criteria,Критериуми за инспекција
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Трансферираните
 apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,Внеси писмо главата и логото. (Можете да ги менувате подоцна).
 DocType: Timesheet Detail,Bill,Бил
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,White,Бела
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date is entered as past date,Следна Амортизација Регистриран е внесен како со поминат рок
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +167,White,Бела
 DocType: SMS Center,All Lead (Open),Сите Потенцијални клиенти (Отворени)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +228,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Ред {0}: Количина не се достапни за {4} во магацин {1} на објавување времето на стапување ({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}),Ред {0}: Количина не се достапни за {4} во магацин {1} на објавување времето на стапување ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,Се Напредокот Платени
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +731,Make ,Направете
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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 +154,Order Type must be one of {0},Цел типот мора да биде еден од {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Цел типот мора да биде еден од {0}
 DocType: Lead,Next Contact Date,Следна Контакт Датум
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Отворање Количина
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +393,Please enter Account for Change Amount,Ве молиме внесете го за промени Износ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,Please enter Account for Change Amount,Ве молиме внесете го за промени Износ
 DocType: Student Batch,Student Batch Name,Студентски Серија Име
 DocType: Holiday List,Holiday List Name,Одмор Листа на Име
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js +8,Schedule Course,распоред на курсот
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Stock Options,Опции на акции
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Опции на акции
 DocType: Journal Entry Account,Expense Claim,Сметка побарување
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +211,Do you really want to restore this scrapped asset?,Дали навистина сакате да го направите ова укинати средства?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +237,Qty for {0},Количина за {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +212,Do you really want to restore this scrapped asset?,Дали навистина сакате да го направите ова укинати средства?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,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,Остави Забрани Листа Датуми
@@ -947,9 +961,9 @@
 DocType: Company,Default Terms,Стандардно Услови
 DocType: Packing Slip Item,Packing Slip Item,Пакување фиш Точка
 DocType: Purchase Invoice,Cash/Bank Account,Пари / банка сметка
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Отстранет предмети без промена во количината или вредноста.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Отстранет предмети без промена во количината или вредноста.
 DocType: Delivery Note,Delivery To,Испорака на
-apps/erpnext/erpnext/stock/doctype/item/item.py +635,Attribute table is mandatory,Атрибут маса е задолжително
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Атрибут маса е задолжително
 DocType: Production Planning Tool,Get Sales Orders,Земете Продај Нарачка
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} не може да биде негативен
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,Ве молиме одберете Студентски
@@ -974,7 +988,7 @@
 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,WIP Магацински
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Сериски № {0} е под договор за одржување до {1}
+apps/erpnext/erpnext/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,Име на организацијата
@@ -986,7 +1000,7 @@
 DocType: GL Entry,Against,Против
 DocType: Item,Default Selling Cost Center,Стандарден Продажен трошочен центар
 DocType: Sales Partner,Implementation Partner,Партнер имплементација
-apps/erpnext/erpnext/controllers/selling_controller.py +231,Sales Order {0} is {1},Продај Побарувања {0} е {1}
+apps/erpnext/erpnext/controllers/selling_controller.py +232,Sales Order {0} is {1},Продај Побарувања {0} е {1}
 DocType: Opportunity,Contact Info,Контакт инфо
 apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,Акции правење записи
 DocType: Packing Slip,Net Weight UOM,Нето тежина UOM
@@ -996,25 +1010,24 @@
 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,Датум на крајот не може да биде помал од Почеток Датум
 DocType: Sales Person,Select company name first.,Изберете името на компанијата во прв план.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Dr,Д-р
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Dr,Д-р
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Понуди добиени од Добавувачи.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},{0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Просечна возраст
 DocType: 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/templates/pages/home.html +32,View All Products,Преглед на сите производи
+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 +400,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Предупредување: Систем не ќе ги провери overbilling од износот за ставката {0} од {1} е нула
+apps/erpnext/erpnext/controllers/accounts_controller.py +403,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/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,и година:
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +191,{0} {1} must be submitted,{0} {1} мора да се поднесе
-DocType: Email Digest,Annual Expense,Годишната сметка
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,{0} {1} must be submitted,{0} {1} мора да се поднесе
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +145,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}
@@ -1025,30 +1038,31 @@
 DocType: Sales Partner,Distributor,Дистрибутер
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Корпа за испорака Правило
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +211,Production Order {0} must be cancelled before cancelling this Sales Order,Производство на налози {0} мора да биде укинат пред да го раскине овој Продај Побарувања
-apps/erpnext/erpnext/public/js/controllers/transaction.js +62,Please set 'Apply Additional Discount On',Ве молиме да се постави на &quot;Примени Дополнителни попуст на &#39;
+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,Од опсег мора да биде помала од на опсег
 DocType: Global Defaults,Global Defaults,Глобална Стандардни
 apps/erpnext/erpnext/projects/doctype/project/project.py +153,Project Collaboration Invitation,Проектот Соработка Покана
 DocType: Salary Slip,Deductions,Одбивања
+DocType: Leave Allocation,LAL/,LAL /
 apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,Почетна година
 DocType: Purchase Invoice,Start date of current invoice's period,Датум на почеток на периодот тековната сметка е
 DocType: Salary Slip,Leave Without Pay,Неплатено отсуство
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +327,Capacity Planning Error,Капацитет Грешка планирање
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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 +362,Finished Item {0} must be entered for Manufacture type entry,Заврши Точка {0} Мора да се внесе за влез тип Производство
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +367,Finished Item {0} must be entered for Manufacture type entry,Заврши Точка {0} Мора да се внесе за влез тип Производство
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Отворање Сметководство Биланс
 DocType: Sales Invoice Advance,Sales Invoice Advance,Продажна Про-Фактура
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +499,Nothing to request,Ништо да побара
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +500,Nothing to request,Ништо да побара
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',&quot;Старт на проектот Датум &#39;не може да биде поголема од&#39; Крај на екстремна датум&quot;
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Management,За управување со
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},Или износот дебитна или кредитна е потребно за {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,За управување со
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +55,Either debit or credit amount is required for {0},Или износот дебитна или кредитна е потребно за {0}
 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 +161,Blue,Blue
+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
@@ -1058,12 +1072,12 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +23,POS Profile {0} already created for user: {1} and company {2},POS Профил {0} веќе создадена за корисникот: {1} и компанија {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM конверзија Фактор
 DocType: Stock Settings,Default Item Group,Стандардно Точка група
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1374,Do you really want to submit the invoice?,Дали навистина сакате да ги достави фактура?
+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 +685,Cost Center For Item with Item Code ',Цена центар за предмет со точка законик &quot;
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1526,"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 +679,Cost Center For Item with Item Code ',Цена центар за предмет со точка законик &quot;
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1550,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Начин на плаќање не е конфигуриран. Ве молиме проверете, дали сметка е поставен на режим на пари или на POS профил."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Продажбата на лицето ќе добиете потсетување на овој датум да се јавите на клиент
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,"Further accounts can be made under Groups, but entries can be made against non-Groups","Понатаму сметки може да се направи под Групи, но записи може да се направи врз несрпското групи"
 DocType: Lead,Lead,Потенцијален клиент
@@ -1083,104 +1097,106 @@
 DocType: Payment Reconciliation,Unreconciled Payment Details,Неусогласеност за исплата
 DocType: Global Defaults,Current Fiscal Year,Тековната фискална година
 DocType: Global Defaults,Disable Rounded Total,Оневозможи Вкупно заокружено
-DocType: Lead,Call,Повик
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +417,'Entries' cannot be empty,&quot;Записи&quot; не може да биде празна
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +418,'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 +214,Fiscal Year {0} not found,Фискалната година {0} не е пронајден
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +221,Fiscal Year {0} not found,Фискалната година {0} не е пронајден
 apps/erpnext/erpnext/config/hr.py +238,Setting up Employees,Поставување на вработените
 DocType: Sales Order,SO-,SO-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Ве молиме изберете префикс прв
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Please select prefix first,Ве молиме изберете префикс прв
 DocType: Employee,O-,О-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Research,Истражување
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,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 +43,Item {0} must be a non-stock item,Точка {0} мора да биде точка на не-акции
 DocType: Contact,User ID,ID на корисникот
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +57,View Ledger,Види Леџер
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Први
-apps/erpnext/erpnext/stock/doctype/item/item.py +504,"An Item Group exists with same name, please change the item name or rename the item group","Ставка група постои со истото име, Ве молиме да се промени името на точка или преименувате групата точка"
+apps/erpnext/erpnext/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 +437,Rest Of The World,Остатокот од светот
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,Ставката {0} не може да има Batch
 ,Budget Variance Report,Буџетот Варијанса Злоупотреба
 DocType: Salary Slip,Gross Pay,Бруто плата
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +90,Row {0}: Activity Type is mandatory.,Ред {0}: Тип на активност е задолжително.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +114,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/public/js/controllers/stock_controller.js +40,Accounting Ledger,Сметководство Леџер
+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,Задржана добивка
 DocType: BOM Item,Item Description,Опис
+DocType: Student Sibling,Student Sibling,студент на браќата и сестрите
 DocType: Purchase Invoice,Is Recurring,Е Повторувачки
 DocType: Purchase Invoice,Supplied Items,Испорачани делови
 DocType: Student,STUD.,Обетка.
 DocType: Production Order,Qty To Manufacture,Количина на производство
+DocType: Email Digest,New Income,нови приходи
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Одржување на иста стапка во текот на купувањето циклус
 DocType: Opportunity Item,Opportunity Item,Можност Точка
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,Привремено отворање
 ,Employee Leave Balance,Вработен Остави Биланс
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +131,Balance for Account {0} must always be {1},Биланс на сметка {0} мора секогаш да биде {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +175,Valuation Rate required for Item in row {0},Вреднување курс потребен за ставка во ред {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,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,Пример: Мастерс во Компјутерски науки
 DocType: Purchase Invoice,Rejected Warehouse,Одбиени Магацински
 DocType: GL Entry,Against Voucher,Против ваучер
 DocType: Item,Default Buying Cost Center,Стандардно Купување цена центар
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","За да го добиете најдоброто од ERPNext, ви препорачуваме да се земе некое време и да се види овие видеа помош."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +87, to ,до
+apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,до
 DocType: Item,Lead Time in days,Потенцијален клиент Време во денови
 ,Accounts Payable Summary,Сметки се плаќаат Резиме
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Not authorized to edit frozen Account {0},Кои не се овластени да ги уредувате замрзната сметка {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},Кои не се овластени да ги уредувате замрзната сметка {0}
 DocType: Journal Entry,Get Outstanding Invoices,Земете ненаплатени фактури
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +62,Sales Order {0} is not valid,Продај Побарувања {0} не е валиден
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Продај Побарувања {0} не е валиден
 apps/erpnext/erpnext/setup/doctype/company/company.py +185,"Sorry, companies cannot be merged","За жал, компаниите не можат да се спојат"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +139,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",вкупната количина на прашањето / Трансфер {0} во Материјал Барање {1} \ не може да биде поголема од бараната количина {2} за ставката {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Small,Мали
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,Small,Мали
 DocType: Employee,Employee Number,Број вработен
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Нема случај (и) веќе е во употреба. Обидете се од случај не {0}
 ,Invoiced Amount (Exculsive Tax),Фактурираниот износ (Exculsive на доход)
-DocType: Student Applicant,Mother's / Guardian 1 Email ID,/ Старателот 1 e-mail проект на мајката
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Точка 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,Сметка главата {0} создаде
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +160,Green,Зелени
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,Зелени
 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 +57,Contract,Договор
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,Договор
 DocType: Email Digest,Add Quote,Додади цитат
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +498,UOM coversion factor required for UOM: {0} in Item: {1},UOM фактор coversion потребни за UOM: {0} во точка: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +503,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 +80,Row {0}: Qty is mandatory,Ред {0}: Количина е задолжително
+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 +737,Sync Master Data,Sync мајстор на податоци
+apps/erpnext/erpnext/accounts/page/pos/pos.js +719,Sync Master Data,Sync мајстор на податоци
 apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,Вашите производи или услуги
 DocType: Mode of Payment,Mode of Payment,Начин на плаќање
 apps/erpnext/erpnext/stock/doctype/item/item.py +178,Website Image should be a public file or website URL,Веб-страница на слика треба да биде јавен датотеката или URL на веб страната
+DocType: Student Applicant,AP,АП
 DocType: Purchase Invoice Item,BOM,Бум
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Ова е корен елемент група и не може да се уредува.
+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 +345,"{0}: Employee email not found, hence email not sent","{0}: е-маил на вработените не се најде, па затоа не е-мејл испратен"
+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,Дали вашата компанија адреса
 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 +118,"For {0}, only credit accounts can be linked against another debit entry","За {0}, само кредитни сметки може да се поврзат против друг запис дебитна"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Delivery Note {0} is not submitted,Испратница {0} не е поднесен
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Delivery Note {0} is not submitted,Испратница {0} не е поднесен
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Sub-contracted Item,Точка {0} мора да биде под-договор Точка
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Капитал опрема
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Цените правило е првата избрана врз основа на &quot;Apply On&quot; поле, која може да биде точка, точка група или бренд."
 DocType: Hub Settings,Seller Website,Продавачот веб-страница
 DocType: Item,ITEM-,ITEM-
-apps/erpnext/erpnext/controllers/selling_controller.py +147,Total allocated percentage for sales team should be 100,Вкупно одобрени процентот за продажбата на тимот треба да биде 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +110,Production Order status is {0},Производство статус е {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Вкупно одобрени процентот за продажбата на тимот треба да биде 100
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Производство статус е {0}
 DocType: Appraisal Goal,Goal,Цел
 DocType: Sales Invoice Item,Edit Description,Измени Опис
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +757,For Supplier,За Добавувачот
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +723,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,Креирај печати формат
@@ -1196,10 +1212,11 @@
 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,одделение законик
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-mail билтени:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +445,BOM {0} does not belong to Item {1},Бум {0} не му припаѓа на точката {1}
 DocType: Sales Partner,Target Distribution,Целна Дистрибуција
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1667,Deafault warehouse is required for selected item,се бара Deafault магацин за избраната ставка
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Deafault warehouse is required for selected item,се бара Deafault магацин за избраната ставка
 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
@@ -1208,23 +1225,23 @@
 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 +110,Hardware,Хардвер
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,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 +48,Privilege Leave,Привилегија Leave
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,Привилегија Leave
 DocType: Purchase Invoice,Supplier Invoice Date,Добавувачот датум на фактурата
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Вие треба да им овозможи на Корпа
 DocType: Payment Entry,Writeoff,Отпише
 DocType: Appraisal Template Goal,Appraisal Template Goal,Процена Шаблон Цел
-DocType: Salary Slip,Earning,Заработуваат
+DocType: Salary Component,Earning,Заработуваат
 DocType: Purchase Invoice,Party Account Currency,Партија Валута профил
 ,BOM Browser,Бум 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 +171,Against Journal Entry {0} is already adjusted against some other voucher,Против весник Влегување {0} е веќе приспособена против некои други ваучер
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,Против весник Влегување {0} е веќе приспособена против некои други ваучер
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Вкупна Вредност на Нарачка
-apps/erpnext/erpnext/demo/setup_data.py +358,Food,Храна
+apps/erpnext/erpnext/demo/setup/setup_data.py +301,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/course_schedule/course_schedule.js +103,Mark Attendence,Марк Attendence
@@ -1258,12 +1275,12 @@
 DocType: Sales Order Item,Planned Quantity,Планирана количина
 DocType: Purchase Invoice Item,Item Tax Amount,Точка износ на данокот
 DocType: Item,Maintain Stock,Одржување на берза
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +209,Stock Entries already created for Production Order ,Акции записи веќе создадена за цел производство
+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,Нето промени во основни средства
 DocType: Leave Control Panel,Leave blank if considered for all designations,Оставете го празно ако се земе предвид за сите ознаки
-apps/erpnext/erpnext/controllers/accounts_controller.py +620,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Полнење од типот &quot;Крај&quot; во ред {0} не може да бидат вклучени во точка Оцени
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,Max: {0},Макс: {0}
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +15,From Datetime,Од DateTime
+apps/erpnext/erpnext/controllers/accounts_controller.py +623,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 +239,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 +153,"Request for Quotation is disabled to access from portal, for more check portal settings.",Барање за прибирање понуди е забрането да пристапите од порталот за повеќе поставувања проверка портал.
@@ -1271,8 +1288,8 @@
 DocType: Sales Invoice,Shipping Address Name,Адреса за Испорака Име
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,Сметковниот план
 DocType: Material Request,Terms and Conditions Content,Услови и правила Содржина
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +552,cannot be greater than 100,не може да биде поголема од 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +680,Item {0} is not a stock Item,Точка {0} не е парк Точка
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +546,cannot be greater than 100,не може да биде поголема од 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is not a stock Item,Точка {0} не е парк Точка
 DocType: Maintenance Visit,Unscheduled,Непланирана
 DocType: Employee,Owned,Сопственост
 DocType: Salary Detail,Depends on Leave Without Pay,Зависи неплатено отсуство
@@ -1286,10 +1303,9 @@
 DocType: GL Entry,GL Entry,GL Влегување
 DocType: HR Settings,Employee Settings,Подесувања на вработените
 ,Batch-Wise Balance History,Според групата биланс Историја
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Да се направи листа
 apps/erpnext/erpnext/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 +61,Apprentice,Чирак
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +102,Negative Quantity is not allowed,Негативни Кол не е дозволено
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,Чирак
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +103,Negative Quantity is not allowed,Негативни Кол не е дозволено
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",Данок детали табелата се донесени од точка господар како стринг и се чуваат во оваа област. Се користи за даноци и такси
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +152,Employee cannot report to himself.,Вработените не можат да известуваат за себе.
@@ -1310,15 +1326,14 @@
 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 +141,Source warehouse is mandatory for row {0},Извор склад е задолжително за спорот {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +719,Packing Slip,Пакување фиш
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Source warehouse is mandatory for row {0},Извор склад е задолжително за спорот {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +713,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/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,Барање за прибирање на понуди може да се пристап со кликнување на следниов линк
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Увоз Не успеав!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Постои адреса додаде уште.
 DocType: Workstation Working Hour,Workstation Working Hour,Работна станица работен час
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Analyst,Аналитичарот
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,Аналитичарот
 DocType: Item,Inventory,Инвентар
 DocType: Item,Sales Details,Детали за продажба
 DocType: Quality Inspection,QI-,QI-
@@ -1326,7 +1341,7 @@
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,Во Количина
 DocType: Notification Control,Expense Claim Rejected,Сметка Тврдат Одбиени
 DocType: Item Attribute,Item Attribute,Точка Атрибут
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +103,Government,Владата
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,Владата
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,Име на Институтот
 apps/erpnext/erpnext/config/stock.py +289,Item Variants,Точка Варијанти
 DocType: Company,Services,Услуги
@@ -1342,6 +1357,7 @@
 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/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,Парични текови од инвестициони
 DocType: Program Course,Program Course,Предметна програма
@@ -1382,12 +1398,12 @@
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Листа на приемник е празна. Ве молиме да се создаде листа ресивер
 DocType: Production Plan Sales Order,Production Plan Sales Order,Производство план Продај Побарувања
 DocType: Sales Partner,Sales Partner Target,Продажбата партнер Целна
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +110,Accounting Entry for {0} can only be made in currency: {1},Сметководство за влез на {0} може да се направи само во валута: {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Сметководство за влез на {0} може да се направи само во валута: {1}
 DocType: Pricing Rule,Pricing Rule,Цените Правило
 DocType: Budget,Action if Annual Budget Exceeded,Акција доколку годишниот буџет пречекорување
 apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Материјал Барање за нарачка
 DocType: Shopping Cart Settings,Payment Success URL,Плаќање успех URL
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +78,Row # {0}: Returned Item {1} does not exists in {2} {3},Ред # {0}: Назад Точка {1} не постои во {2} {3}
+apps/erpnext/erpnext/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,Банка помирување изјава
@@ -1396,40 +1412,39 @@
 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/stock/doctype/stock_entry/stock_entry.py +339,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Не е дозволено да tranfer повеќе {0} од {1} против нарачка {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +344,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 +545,Manufacturing Quantity is mandatory,Производство Кол е задолжително
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,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 +71,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 +162,Row {0}: From Time and To Time of {1} is overlapping with {2},Ред {0}: Од време и на време од {1} е се преклопуваат со {2}
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +186,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,Акции Обврски
 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 +130,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 +137,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,други извештаи
 DocType: Dependent Task,Dependent Task,Зависни Task
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ве молам поставете вработените Именување систем во управување со хумани ресурси&gt; Поставки за човечки ресурси
 apps/erpnext/erpnext/stock/doctype/item/item.py +411,Conversion factor for default Unit of Measure must be 1 in row {0},Фактор на конверзија за стандардно единица мерка мора да биде 1 во ред {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,Leave of type {0} cannot be longer than {1},Отсуство од типот {0} не може да биде подолг од {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +197,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 +921,Search Item,Барај точка
+apps/erpnext/erpnext/accounts/page/pos/pos.js +910,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 +546,Already completed,веќе завршени
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +22,Payment Request already exists {0},Веќе постои плаќање Барам {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +550,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 +241,Quantity must not be more than {0},Кол не смее да биде повеќе од {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Quantity must not be more than {0},Кол не смее да биде повеќе од {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +76,Previous Financial Year is not closed,Претходната финансиска година не е затворен
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +44,Age (Days),Возраст (во денови)
 DocType: Quotation Item,Quotation Item,Артикал од Понуда
@@ -1446,7 +1461,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +221,Purchase Receipt {0} is not submitted,Купување Потврда {0} не е поднесен
 DocType: Company,Default Payable Account,Стандардно се плаќаат профил
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Подесувања за онлајн шопинг количка како и со правилата за испорака, ценовник, итн"
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +83,{0}% Billed,{0}% Опишан
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}% Опишан
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Количина задржани
 DocType: Party Account,Party Account,Партијата на профилот
 apps/erpnext/erpnext/config/setup.py +116,Human Resources,Човечки ресурси
@@ -1458,12 +1473,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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 +22,Collect,Собери
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Собери
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,Against Supplier Invoice {0} dated {1},Против Добавувачот Фактура {0} датум {1}
 DocType: Customer,Default Price List,Стандардно Ценовник
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +225,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: Payment Reconciliation,Payments,Плаќања
 DocType: Journal Entry,Entry Type,Тип на влез
 ,Customer Credit Balance,Клиент кредитна биланс
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Payable,Нето промени во сметки се плаќаат
@@ -1475,7 +1489,7 @@
 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 +9,Procurement,набавки
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,Ниту еден од предметите имаат каква било промена во количината или вредноста.
+apps/erpnext/erpnext/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,Гаранција побарување
 ,Lead Details,Детали за Потенцијален клиент
 DocType: Purchase Invoice,End date of current invoice's period,Датум на завршување на периодот тековната сметка е
@@ -1500,7 +1514,7 @@
 DocType: Purchase Invoice,Additional Discount,Дополнителен попуст
 DocType: Selling Settings,Selling Settings,Нагодувања за Продажби
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Онлајн аукции
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +97,Please specify either Quantity or Valuation Rate or both,Ве молиме напишете и некоја Кол или вреднување стапка или двете
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,Ве молиме напишете и некоја Кол или вреднување стапка или двете
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +13,Fulfillment,исполнување
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Компанија, месец и фискалната година е задолжително"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Маркетинг трошоци
@@ -1521,14 +1535,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,ERPNext Setup Complete!
 DocType: Item,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +93,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Веќе има Група на клиенти со истото име, Ве молиме сменете го Името на клиентот или преименувајте ја Групата на клиенти"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +126,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Веќе има Група на клиенти со истото име, Ве молиме сменете го Името на клиентот или преименувајте ја Групата на клиенти"
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Нов контакт
 DocType: Territory,Parent Territory,Родител Територија
 DocType: Quality Inspection Reading,Reading 2,Читање 2
 DocType: Stock Entry,Material Receipt,Материјал Потврда
 DocType: Homepage,Products,Производи
 DocType: Announcement,Instructor,инструктор
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},Партијата Вид и Партијата е потребно за побарувања / Платив сметка {0}
 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,Следна Контакт Со
@@ -1539,7 +1552,7 @@
 ,Item-wise Sales Register,Точка-мудар Продажбата Регистрирај се
 DocType: Asset,Gross Purchase Amount,Бруто купување износ
 DocType: Asset,Depreciation Method,амортизација Метод
-apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Offline,Надвор од мрежа
+apps/erpnext/erpnext/accounts/page/pos/pos.js +686,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,Задолжителни
@@ -1557,25 +1570,27 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +425,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 +858,Make Purchase Order,Направи нарачка
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +852,Make Purchase Order,Направи нарачка
 DocType: SMS Center,Send To,Испрати до
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,There is not enough leave balance for Leave Type {0},Нема доволно одмор биланс за Оставете Тип {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,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 +172,Work-in-Progress Warehouse is required before Submit,Работа во прогрес Магацински се бара пред Прати
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,Work-in-Progress Warehouse is required before Submit,Работа во прогрес Магацински се бара пред Прати
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Подносителот на барањето за работа.
 DocType: Purchase Order Item,Warehouse and Reference,Магацин и упатување
 DocType: Supplier,Statutory info and other general information about your Supplier,Законски информации и други општи информации за вашиот снабдувач
-apps/erpnext/erpnext/hooks.py +88,Addresses,Адреси
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Добавувачот&gt; Добавувачот Тип
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +212,Against Journal Entry {0} does not have any unmatched {1} entry,Против весник Влегување {0} не се имате било какви неспоредлив {1} влез
+apps/erpnext/erpnext/hooks.py +95,Addresses,Адреси
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +215,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,Поставете филтер врз основа на точка или Магацински
 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,Да дава и Бил
@@ -1583,11 +1598,10 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,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 +731,Payment,Плаќање
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,Payment,Плаќање
 DocType: Production Order Operation,Actual Time and Cost,Крај на време и трошоци
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Материјал Барање за максимум {0} може да се направи за ставката {1} против Продај Побарувања {2}
 DocType: Employee,Salutation,Титула
-DocType: Pricing Rule,Brand,Бренд
 DocType: Course,Course Abbreviation,Кратенка на курсот
 DocType: Item,Will also apply for variants,Ќе се применуваат и за варијанти
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +142,"Asset cannot be cancelled, as it is already {0}","Средства не може да се откаже, како што е веќе {0}"
@@ -1599,7 +1613,7 @@
 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.","Листа вашите производи или услуги да ја купите или да го продаде. Бидете сигурни да се провери точка група, Одделение за премер и други својства кога ќе почнете."
 DocType: Hub Settings,Hub Node,Центар Јазол
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Внесовте дупликат предмети. Ве молиме да се поправат и обидете се повторно.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Associate,Соработник
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,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,Креирај Листа ресивер
@@ -1607,7 +1621,7 @@
 DocType: Production Planning Tool,Material Requests,материјал барања
 DocType: Warranty Claim,Issue Date,Датум на издавање
 DocType: Activity Cost,Activity Cost,Цена активност
-DocType: Timesheet Detail,Timesheet Detail,timesheet детали
+DocType: Sales Invoice Timesheet,Timesheet Detail,timesheet детали
 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),Покажува дека пакетот е дел од оваа испорака (Само Предлог)
@@ -1630,6 +1644,7 @@
 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,Има варијанти
 DocType: Monthly Distribution,Name of the Monthly Distribution,Име на месечна Дистрибуција
 DocType: Sales Person,Parent Sales Person,Родител продажбата на лице
@@ -1642,30 +1657,31 @@
 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 +44,"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/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.,Во Зборови ќе бидат видливи кога еднаш ќе ве спаси Фактура на продажба.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +502,Error: {0} &gt; {1},Грешка: {0}&gt; {1}
 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.,Датум на поимот на проектот не може да биде порано од годината Датум на почеток на академската година на кој е поврзан на зборот (академска година {}). Ве молам поправете датумите и обидете се повторно.
 DocType: Naming Series,Current Value,Сегашна вредност
-apps/erpnext/erpnext/controllers/accounts_controller.py +235,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,постојат повеќе фискални години за датумот {0}. Поставете компанијата во фискалната
+apps/erpnext/erpnext/controllers/accounts_controller.py +238,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 +458,Item table can not be blank,Точка маса не може да биде празна
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +443,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 +5,This is based on stock movement. See {0} for details,Ова е врз основа на акциите на движење. Види {0} за повеќе детали
 DocType: Pricing Rule,Selling,Продажби
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +341,Amount {0} {1} deducted against {2},Износот {0} {1} одзема против {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +344,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,Поради Датум не може да биде пред Праќање пораки во Датум
@@ -1680,8 +1696,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +144,Cannot refer row number greater than or equal to current row number for this Charge type,Не може да се однесува ред број е поголема или еднаква на тековниот број на ред за овој тип на полнење
 DocType: Asset,Sold,продаден
 ,Item-wise Purchase History,Точка-мудар Набавка Историја
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Red,Црвена
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Ве молиме кликнете на &quot;Генерирање Распоред&quot; да достигне цена Сериски Без додадеме точка за {0}
+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,Отворен Нарачка производство
 DocType: Sales Invoice Payment,Base Amount (Company Currency),База Износ (Фирма валута)
@@ -1689,7 +1705,7 @@
 DocType: Installation Note,Installation Time,Инсталација време
 DocType: Sales Invoice,Accounting Details,Детали за сметководство
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,Бришење на сите трансакции за оваа компанија
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +187,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Ред # {0}: Операција {1} не е завршена за {2} Количина на готови производи во производството со цел # {3}. Ве молиме да се ажурира статусот работењето преку Време на дневници
+apps/erpnext/erpnext/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}. Ве молиме да се ажурира статусот работењето преку Време на дневници
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,Инвестиции
 DocType: Issue,Resolution Details,Резолуцијата Детали за
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,алокации
@@ -1725,16 +1741,17 @@
 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}
 DocType: Delivery Note,Excise Page Number,Акцизни Број на страница
 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}
 ,Maintenance Schedules,Распоред за одржување
 DocType: Task,Actual End Date (via Time Sheet),Крај Крај Датум (преку време лист)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Amount {0} {1} against {2} {3},Износот {0} {1} од {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +339,Amount {0} {1} against {2} {3},Износот {0} {1} од {2} {3}
 ,Quotation Trends,Трендови на Понуди
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},Точка Група кои не се споменати во точка мајстор за ставката {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +295,Debit To account must be a Receivable account,Дебит сметка мора да биде побарувања сметка
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Receivable account,Дебит сметка мора да биде побарувања сметка
 DocType: Shipping Rule Condition,Shipping Amount,Испорака Износ
 ,Pending Amount,Во очекување Износ
 DocType: Purchase Invoice Item,Conversion Factor,Конверзија Фактор
@@ -1742,10 +1759,10 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +137,Expected value after useful life must be greater than or equal to {0},Предвидена вредност по корисен век мора да биде поголемо од или еднакво на {0}
 DocType: Purchase Receipt,Vehicle Number,Број на возило
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Датумот на кој се повторуваат фактура ќе се запре
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +90,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Вкупно одобрени лисја {0} не може да биде помал од веќе одобрен лисја {1} за периодот
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +93,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 +22,Enter Paid Amount,Внесете уплатениот износ
+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,Користете Мулти-ниво на бирото
@@ -1755,13 +1772,15 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,timesheets
 DocType: HR Settings,HR Settings,Поставки за човечки ресурси
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Expense Claim is pending approval. Only the Expense Approver can update status.,Сметка тврдат дека е во очекување на одобрување. Само на сметка Approver може да го ажурира статусот.
+DocType: Email Digest,New Expenses,нови трошоци
 DocType: Purchase Invoice,Additional Discount Amount,Дополнителен попуст Износ
-apps/erpnext/erpnext/controllers/accounts_controller.py +524,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Ред # {0}: Количина мора да биде 1, како точка е на основните средства. Ве молиме користете посебен ред за повеќе количество."
+apps/erpnext/erpnext/controllers/accounts_controller.py +527,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Ред # {0}: Количина мора да биде 1, како точка е на основните средства. Ве молиме користете посебен ред за повеќе количество."
 DocType: Leave Block List Allow,Leave Block List Allow,Остави Забрани Листа Дозволете
 apps/erpnext/erpnext/setup/doctype/company/company.py +249,Abbr can not be blank or space,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/stock/get_item_details.py +123,Please specify Company,"Ве молиме назначете фирма,"
 ,Customer Acquisition and Loyalty,Стекнување на клиентите и лојалност
@@ -1772,17 +1791,19 @@
 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 +183,Closing (Opening + Totals),Затворање (Отворање + Вкупно)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),Затворање (Отворање + Вкупно)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Ве молиме наведете валута во компанијата
 DocType: Workstation,Wages per hour,Плати по час
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +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/controllers/accounts_controller.py +272,Account {0} is invalid. Account Currency must be {1},Сметка {0} не е валиден. Валута сметка мора да биде {1}
+DocType: Email Digest,Pending Sales Orders,Во очекување Продај Нарачка
+apps/erpnext/erpnext/controllers/accounts_controller.py +275,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 +956,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Ред # {0}: Референтен документ тип треба да биде еден од Продај Побарувања, продажба фактура или весник Влегување"
-DocType: Salary Slip,Deduction,Одбивање
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +87,Row {0}: From Time and To Time is mandatory.,Ред {0}: Од време и на време е задолжително.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +969,"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 +111,Row {0}: From Time and To Time is mandatory.,Ред {0}: Од време и на време е задолжително.
+DocType: Stock Reconciliation Item,Amount Difference,износот на разликата
 apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},Ставка Цена додаде за {0} во Ценовник {1}
 DocType: Address Template,Address Template,Адреса Шаблон
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +7,Please enter Employee Id of this sales person,Ве молиме внесете Id на вработените на ова продажбата на лице
@@ -1790,7 +1811,7 @@
 DocType: Project,% Tasks Completed,% Задачи завршени
 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 +194,Please enter Production Item first,Ве молиме внесете Производство стварта прв
+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,корисник со посебни потреби
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Понуда
@@ -1799,53 +1820,54 @@
 DocType: Maintenance Visit,Maintenance User,Одржување пристап
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +149,Cost Updated,Цена освежено
 DocType: Employee,Date of Birth,Датум на раѓање
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +86,Item {0} has already been returned,Точка {0} веќе се вратени
+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: 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 +177,Job Description,Опис на работата
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,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 +126,"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 +127,"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.","Следете ги Продажните кампањи. Следете ги Потенцијалните клиенти, Понуди, Продажните нарачки итн. од Кампањите за да го измерите Враќањето на инвестицијата."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +24,Welcome to POS: Create your POS Profile,Добредојдовте да ПОС: Направете вашиот ПОС профил
 DocType: Expense Claim,Approver,Approver
 ,SO Qty,ПА Количина
+DocType: Guardian,Work Address,работа адреса
 DocType: Appraisal,Calculate Total Score,Пресметај Вкупен резултат
 DocType: Request for Quotation,Manufacturing Manager,Производство менаџер
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Сериски № {0} е под гаранција до {1}
+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 +74,Shipments,Пратки
+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 +153,Row # ,Ред #
+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 +156,Get From,Добие од
+apps/erpnext/erpnext/public/js/utils.js +167,Get From,Добие од
 DocType: C-Form,Quarter,Четвртина
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Miscellaneous Expenses,Останати трошоци
 DocType: Global Defaults,Default Company,Стандардно компанијата
 apps/erpnext/erpnext/controllers/stock_controller.py +167,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Сметка или сметка разликата е задолжително за ставката {0} што вкупната вредност на акции што влијанија
-apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Не може да overbill за Точка {0} во ред {1} повеќе од {2}. За да се овозможи overbilling, молам постави во парк Settings"
+apps/erpnext/erpnext/controllers/accounts_controller.py +419,"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
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} is disabled,Корисник {0} е исклучен
 DocType: Leave Application,Total Leave Days,Вкупно Денови Отсуство
 DocType: Email Digest,Note: Email will not be sent to disabled users,Забелешка: Е-пошта нема да биде испратена до корисниците со посебни потреби
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,Изберете компанијата ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Оставете го празно ако се земе предвид за сите одделенија
 apps/erpnext/erpnext/config/hr.py +171,"Types of employment (permanent, contract, intern etc.).","Видови на вработување (постојан, договор, стаж итн)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +346,{0} is mandatory for Item {1},{0} е задолжително за ставката {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,{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","Ве молиме изберете распределени износот, видот Фактура и број на фактурата во барем еден ред"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,Цената на нов купувачите
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},Продај Побарувања потребни за Точка {0}
 DocType: Purchase Invoice Item,Rate (Company Currency),Цена (Валута на Фирма)
-apps/erpnext/erpnext/demo/setup_data.py +360,Others,"Други, пак,"
+DocType: Student Guardian,Others,"Други, пак,"
 DocType: Payment Entry,Unallocated Amount,Износ на неиздвоена
 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,Даноци и такси
@@ -1865,17 +1887,16 @@
 apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,Серијали Инвентар
 DocType: Activity Type,Default Billing Rate,Стандардно регистрации курс
 DocType: Sales Invoice,Total Billing Amount,Вкупен Износ на Наплата
-apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +54,Receivable Account,Побарувања профил
-apps/erpnext/erpnext/controllers/accounts_controller.py +546,Row #{0}: Asset {1} is already {2},Ред # {0}: Асет {1} е веќе {2}
+apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,Побарувања профил
+apps/erpnext/erpnext/controllers/accounts_controller.py +549,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 +79,CEO,извршен директор
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,извршен директор
 DocType: Expense Claim Detail,Expense Claim Detail,Барање Детална сметка
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +808,Please select correct account,Ве молиме изберете ја точната сметка
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +809,Please select correct account,Ве молиме изберете ја точната сметка
 DocType: Item,Weight UOM,Тежина UOM
 DocType: Salary Structure Employee,Salary Structure Employee,Плата Структура на вработените
 DocType: Employee,Blood Group,Крвна група
-DocType: Purchase Invoice Item,Page Break,Page Break
 DocType: Production Order Operation,Pending,Во очекување
 DocType: Course,Course Name,Име на курсот
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Корисниците кои може да одобри апликации одмор одредена вработениот
@@ -1884,14 +1905,15 @@
 DocType: Fiscal Year,Companies,Компании
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Електроника
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Подигне материјал Барање кога акциите достигне нивото повторно цел
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Full-time,Со полно работно време
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,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: 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,Вкупно Вредност на Прилив
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Debit To is required,Дебитна Да се бара
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +321,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,Менаџер за квалитет
@@ -1899,6 +1921,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/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,Вкупно Фактурирана изн.
@@ -1909,18 +1932,17 @@
 DocType: Production Order Operation,Completed Qty,Завршено Количина
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"For {0}, only debit accounts can be linked against another credit entry","За {0}, само задолжува сметки може да се поврзат против друга кредитна влез"
 apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,Ценовник {0} е исклучен
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +99,Row {0}: Completed Qty cannot be more than {1} for operation {2},Ред {0}: Завршено Количина не може да биде повеќе од {1} за работа {2}
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +123,Row {0}: Completed Qty cannot be more than {1} for operation {2},Ред {0}: Завршено Количина не може да биде повеќе од {1} за работа {2}
 DocType: Manufacturing Settings,Allow Overtime,Дозволете Прекувремена работа
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} сериски броеви потребно за Точка {1}. Сте ги доставиле {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Тековни Вреднување стапка
 DocType: Item,Customer Item Codes,Клиент Точка Код
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,Размена добивка / загуба
 DocType: Opportunity,Lost Reason,Си ја заборавивте Причина
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ве молам поставете брои серија за присуство преку поставување&gt; нумерација Серија
 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/purchase_receipt/purchase_receipt.py +378,All items have already been invoiced,Сите предмети веќе се фактурира
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +379,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,Надворешни
@@ -1936,18 +1958,19 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Вашите клиенти
 apps/erpnext/erpnext/projects/doctype/project/project.py +141,You have been invited to collaborate on the project: {0},Вие сте поканети да соработуваат на проектот: {0}
 DocType: Leave Block List Date,Block Date,Датум на блок
-apps/erpnext/erpnext/templates/generators/job_opening.html +19,Apply Now,Аплицирај сега
+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.","Креирање и управување со дневни, неделни и месечни Е-содржините."
 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,згради
-apps/erpnext/erpnext/utilities/doctype/address/address.py +164,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Не стандардна адреса Шаблон најде. Ве молиме да се создаде нов една од поставување&gt; Печатење и Брендирање&gt; Адреса дефиниција.
 DocType: Fee Structure,Fee Structure,Провизија Структура
 DocType: Timesheet Detail,Costing Amount,Чини Износ
+DocType: Student Admission,Application Fee,Такса
 DocType: Process Payroll,Submit Salary Slip,Поднесе Плата фиш
-apps/erpnext/erpnext/controllers/selling_controller.py +161,Maxiumm discount for Item {0} is {1}%,Maxiumm попуст за ставката {0} е {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,Maxiumm попуст за ставката {0} е {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Увоз во Масовно
 DocType: Sales Partner,Address & Contacts,Адреса и контакти
 DocType: SMS Log,Sender Name,Испраќачот Име
@@ -1972,21 +1995,21 @@
 DocType: Serial No,Delivery Time,Време на испорака
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Стареењето Врз основа на
 DocType: Item,End of Life,Крајот на животот
-apps/erpnext/erpnext/demo/setup_data.py +361,Travel,Патување
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +155,No active or default Salary Structure found for employee {0} for the given dates,Нема активни или стандардно Плата Структура најде за вработените {0} за дадените датуми
+apps/erpnext/erpnext/demo/setup/setup_data.py +304,Travel,Патување
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +167,No active or default Salary Structure found for employee {0} for the given dates,Нема активни или стандардно Плата Структура најде за вработените {0} за дадените датуми
 DocType: Leave Block List,Allow Users,Им овозможи на корисниците
 DocType: Purchase Order,Customer Mobile No,Клиент Мобилни Не
 DocType: Sales Invoice,Recurring,Повторувачки
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Ги пратите одделни приходи и расходи за вертикали производ или поделби.
 DocType: Rename Tool,Rename Tool,Преименувај алатката
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +23,Update Cost,Ажурирање на трошоците
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Ажурирање на трошоците
 DocType: Item Reorder,Item Reorder,Пренареждане точка
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +36,Show Salary Slip,Прикажи Плата фиш
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +748,Transfer Material,Пренос на материјал
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +53,Show Salary Slip,Прикажи Плата фиш
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +166,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 +923,Please set recurring after saving,Поставете се повторуваат по спасување
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +646,Select change amount account,износот сметка Одберете промени
+apps/erpnext/erpnext/public/js/controllers/transaction.js +914,Please set recurring after saving,Поставете се повторуваат по спасување
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +703,Select change amount account,износот сметка Одберете промени
 DocType: Purchase Invoice,Price List Currency,Ценовник Валута
 DocType: Naming Series,User must always select,Корисникот мора секогаш изберете
 DocType: Stock Settings,Allow Negative Stock,Дозволете негативна состојба
@@ -1998,31 +2021,32 @@
 DocType: Quality Inspection,Verified By,Заверена од
 DocType: Address,Subsidiary,Подружница
 apps/erpnext/erpnext/setup/doctype/company/company.py +64,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Не може да се промени стандардно валута компанијата, бидејќи постојат постојните трансакции. Трансакции треба да бидат откажани да се промени валута на стандардните."
+DocType: Grade Interval,Grade Description,степен Опис
 DocType: Quality Inspection,Purchase Receipt No,Купување Потврда Не
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Искрена пари
 DocType: Process Payroll,Create Salary Slip,Креирај Плата фиш
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +33,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 +352,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Кол во ред {0} ({1}) мора да биде иста како произведени количини {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Кол во ред {0} ({1}) мора да биде иста како произведени количини {2}
 DocType: Appraisal,Employee,Вработен
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Покани како пристап
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} е целосно фактурирани
 DocType: Workstation Working Hour,End Time,Крајот на времето
 DocType: Payment Entry,Payment Deductions or Loss,Плаќање одбивања или загуба
-apps/erpnext/erpnext/config/schools.py +100,LMS,LMS
+apps/erpnext/erpnext/config/schools.py +104,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,гасоводот продажба
 DocType: Student Batch Student,Student Batch Student,Студентски Серија студент
-DocType: Sales Invoice,Mass Mailing,Масовно испраќање
+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 +199,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/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 +297,Salary Slip of employee {0} already created for this period,Плата фиш на вработените {0} веќе создадена за овој период
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Pharmaceutical,Фармацевтската
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +309,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/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,Кредитите за
@@ -2037,27 +2061,28 @@
 DocType: Upload Attendance,Attendance To Date,Публика: Да најдам
 DocType: Warranty Claim,Raised By,Покренати од страна на
 DocType: Payment Gateway Account,Payment Account,Уплатна сметка
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +814,Please specify Company to proceed,"Ве молиме назначете фирма, да се продолжи"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +793,Please specify Company to proceed,"Ве молиме назначете фирма, да се продолжи"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Receivable,Нето промени во Побарувања
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Compensatory Off,Обесштетување Off
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,Обесштетување Off
 DocType: Quality Inspection Reading,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.,Ве молиме бидете сигурни дека навистина сакате да ги избришете сите трансакции за оваа компанија. Вашиот господар на податоци ќе остане како што е. Ова дејство не може да се врати назад.
 DocType: Room,Room Number,Број на соба
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Невалидна референца {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +161,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) не може да биде поголема од планираното quanitity ({2}) во продукција налог {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +162,{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 +217,Raw Materials cannot be blank.,"Суровини, не може да биде празна."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,"Could not update stock, invoice contains drop shipping item.","Не може да го ажурира трговија, фактура содржи капка превозот ставка."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +460,Quick Journal Entry,Брзо весник Влегување
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +111,You can not change rate if BOM mentioned agianst any item,Вие не може да го промени стапка ако Бум споменати agianst која било ставка
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +441,"Could not update stock, invoice contains drop shipping item.","Не може да го ажурира трговија, фактура содржи капка превозот ставка."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Quick Journal Entry,Брзо весник Влегување
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +103,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 +214,{0} {1} is not submitted,{0} {1} не е поднесен
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Барања за предмети.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Одделни производни цел ќе биде направена за секоја завршена добра ствар.
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +121,{0} must be negative in return document,"{0} мора да биде негативен, во замена документ"
 ,Minutes to First Response for Issues,Минути за прв одговор за прашања
 DocType: Purchase Invoice,Terms and Conditions1,Услови и Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,Името на Институтот за кои ќе се поставување на овој систем.
@@ -2066,16 +2091,17 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Статус на проектот
 DocType: UOM,Check this to disallow fractions. (for Nos),Изберете го ова за да ги оневозможите фракции. (За NOS)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +398,The following Production Orders were created:,се создадени по производство наредби:
+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 +739,Item or Warehouse for row {0} does not match Material Request,Точка или складиште ред {0} не се поклопува материјал Барање
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +747,Item or Warehouse for row {0} does not match Material Request,Точка или складиште ред {0} не се поклопува материјал Барање
 apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,Единица мерка
 DocType: Fiscal Year,Year End Date,Годината завршува на Датум
 DocType: Task Depends On,Task Depends On,Задача зависи од
-DocType: Lead,Opportunity,Можност
+DocType: Supplier Quotation,Opportunity,Можност
 ,Completed Production Orders,Завршено Производство Нарачка
 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
@@ -2088,7 +2114,7 @@
 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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},Почеток одржување датум не може да биде пред датумот на испорака за серија № {0}
+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,Крај Крај Датум
 DocType: Purchase Invoice,PINV-,PINV-
 DocType: Authorization Rule,Applicable To (Role),Применливи To (Споредна улога)
@@ -2103,7 +2129,7 @@
 DocType: SMS Log,No of Requested SMS,Број на Побарано СМС
 DocType: Campaign,Campaign-.####,Кампања -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Следните чекори
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,Please supply the specified items at the best possible rates,Внесете ја определени предмети на најдобар можен стапки
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +695,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 +117,Contract End Date must be greater than Date of Joining,Договор Крај Датум мора да биде поголема од датумот на пристап
 DocType: Delivery Note,DN-,DN-
@@ -2112,7 +2138,7 @@
 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 +14,This is an example website auto-generated from ERPNext,Ова е пример веб-сајт автоматски генерирани од ERPNext
+apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Ова е пример веб-сајт автоматски генерирани од ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Стареењето опсег 1
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
@@ -2139,13 +2165,14 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd Кол
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +54,Fee Records Created - {0},Надомест записи создадени - {0}
 DocType: Asset Category Account,Asset Category Account,Средства Категорија сметка
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +103,Cannot produce more Item {0} than Sales Order quantity {1},Не може да произведе повеќе Точка {0} од Продај Побарувања количина {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Stock Entry {0} is not submitted,Акции Влегување {0} не е поднесен
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Не може да произведе повеќе Точка {0} од Продај Побарувања количина {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +505,Stock Entry {0} is not submitted,Акции Влегување {0} не е поднесен
 DocType: Payment Reconciliation,Bank / Cash Account,Банка / готовинска сметка
 DocType: Tax Rule,Billing City,Платежна Сити
 DocType: Salary Component Account,Salary Component Account,Плата Компонента сметка
 DocType: Global Defaults,Hide Currency Symbol,Сокриј Валута Симбол
 apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card","на пример, банка, пари, кредитни картички"
+DocType: Lead Source,Source Name,извор Име
 DocType: Journal Entry,Credit Note,Кредитна Забелешка
 DocType: Warranty Claim,Service Address,Услуга адреса
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furnitures and Fixtures,Мебел и тела
@@ -2157,6 +2184,7 @@
 DocType: Opportunity,Customer / Lead Name,Клиент / Потенцијален клиент
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +89,Clearance Date not mentioned,Чистење Датум кои не се споменати
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Производство
+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/controllers/trends.py +19,Total(Qty),Вкупно (Количина)
 DocType: Sales Invoice,This Document,овој документ
@@ -2168,15 +2196,15 @@
 DocType: Purchase Receipt,Time at which materials were received,На кој беа примени материјали време
 DocType: Stock Ledger Entry,Outgoing Rate,Тековна стапка
 apps/erpnext/erpnext/config/hr.py +176,Organization branch master.,Организација гранка господар.
-apps/erpnext/erpnext/controllers/accounts_controller.py +273, or ,или
+apps/erpnext/erpnext/controllers/accounts_controller.py +276, 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 +203,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Ред # {0}: весник Влегување {1} нема сметка {2} или веќе се исти против друг ваучер
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +206,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 +90,No employee for the above selected criteria OR salary slip already created,Веќе создаде ниту еден вработен за горе избраните критериуми или плата се лизга
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +93,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,Тип на плаќање
@@ -2204,8 +2232,8 @@
 DocType: Product Bundle,Parent Item,Родител Точка
 DocType: Account,Account Type,Тип на сметка
 DocType: Delivery Note,DN-RET-,DN-RET-
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +115,Leave Type {0} cannot be carry-forwarded,Остави Тип {0} не може да се носат-пренасочат
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Распоред за одржување не е генерирана за сите предмети. Ве молиме кликнете на &quot;Генерирање Распоред &#39;
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +118,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 +163,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","На ред {0} во {1}. Да {2} вклучите во стапката точка, редови {3} исто така, мора да бидат вклучени"
@@ -2217,13 +2245,13 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +32,Disabled template must not be default template,Лицата со посебни потреби образецот не мора да биде стандардна дефиниција
 DocType: Account,Income Account,Сметка приходи
 DocType: Payment Request,Amount in customer's currency,Износ во валута на клиентите
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +748,Delivery,Испорака
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +742,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,Клучна одговорност Површина
 DocType: Payment Entry,Total Allocated Amount,"Вкупно лимит,"
 DocType: Item Reorder,Material Request Type,Материјал Тип на Барањето
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +82,Row {0}: UOM Conversion Factor is mandatory,Ред {0}: UOM конверзија фактор е задолжително
+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,Трошоците центар
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Ваучер #
@@ -2234,13 +2262,13 @@
 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 +90,Head of Marketing and Sales,Раководител на маркетинг и продажба
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Данок на доход
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,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.,Следи ги Потенцијалните клиенти по вид на индустрија.
 DocType: Item Supplier,Item Supplier,Точка Добавувачот
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +403,Please enter Item Code to get batch no,Ве молиме внесете Точка законик за да се добие серија не
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +770,Please select a value for {0} quotation_to {1},Ве молиме изберете вредност за {0} quotation_to {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +397,Please enter Item Code to get batch no,Ве молиме внесете Точка законик за да се добие серија не
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +764,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","Спојувањето е можно само ако следниве својства се исти во двата записи. Е група, корен Тип компанијата"
@@ -2252,28 +2280,29 @@
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,Не во парк
 DocType: Appraisal,HR User,HR пристап
 DocType: Purchase Invoice,Taxes and Charges Deducted,Даноци и давачки одземени
-apps/erpnext/erpnext/hooks.py +100,Issues,Прашања
+apps/erpnext/erpnext/hooks.py +109,Issues,Прашања
 apps/erpnext/erpnext/controllers/status_updater.py +13,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,Платежна валута
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Large,Extra Large
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Extra Large,Extra Large
 ,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 +507,Warning: Another {0} # {1} exists against stock entry {2},Постои Друга {0} {1} # против влез парк {2}: опомена
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Local,Локалните
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +508,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Кредити и побарувања (средства)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Должниците
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Large,Големи
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,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 +225,Total {0} ({1}),Вкупно {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +224,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,Метод за проценка стандардно
@@ -2319,9 +2348,9 @@
 DocType: Attendance,Leave Type,Отсуство Тип
 apps/erpnext/erpnext/controllers/stock_controller.py +173,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Расход / Разлика сметка ({0}) мора да биде на сметка &quot;Добивка или загуба&quot;
 DocType: Account,Accounts User,Кориснички сметки
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Name error: {0},Име грешка: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +90,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 +178,{0} {1} does not associated with {2} {3},{0} {1} не се поврзани со {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +181,{0} {1} does not associated with {2} {3},{0} {1} не се поврзани со {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Публика за вработен {0} е веќе означени
 DocType: Packing Slip,If more than one package of the same type (for print),Ако повеќе од еден пакет од ист тип (за печатење)
 DocType: Warehouse,Parent Warehouse,родител Магацински
@@ -2340,7 +2369,7 @@
 DocType: BOM Item,Scrap %,Отпад%
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Кривична пријава ќе биде дистрибуиран пропорционално врз основа на точка количество: Контакт лице или количина, како на вашиот избор"
 DocType: Maintenance Visit,Purposes,Цели
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,Барем една ставка треба да се внесуваат со негативен количество во замена документ
+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 +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Операција {0} подолго од било кој на располагање на работното време во станица {1}, се прекине работењето во повеќе операции"
 ,Requested,Побарано
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +83,No Remarks,Нема забелешки
@@ -2352,46 +2381,46 @@
 DocType: Item,Total Projected Qty,Вкупно планираните Количина
 DocType: Monthly Distribution,Distribution Name,Дистрибуција Име
 DocType: Course,Course Code,Код на предметната програма
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Quality Inspection required for Item {0},Квалитет инспекција потребни за Точка {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Quality Inspection required for Item {0},Квалитет инспекција потребни за Точка {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Стапка по која клиентите валута е претворена во основна валута компанијата
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Нето стапката (Фирма валута)
 DocType: Salary Detail,Condition and Formula Help,Состојба и Формула Помош
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Управување со Територија на дрвото.
 DocType: Journal Entry Account,Sales Invoice,Продажна Фактура
 DocType: Journal Entry Account,Party Balance,Партијата Биланс
-apps/erpnext/erpnext/accounts/page/pos/pos.js +475,Please select Apply Discount On,Ве молиме изберете Примени попуст на
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +92,Salary Slip Created,Плата фиш Created
+apps/erpnext/erpnext/accounts/page/pos/pos.js +464,Please select Apply Discount On,Ве молиме изберете Примени попуст на
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +95,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,Материјал трансфер за Производство
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,Попуст Процент може да се примени или против некој Ценовник или за сите ценовникот.
 DocType: Purchase Invoice,Half-yearly,Полугодишен
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +384,Accounting Entry for Stock,Сметководство за влез на берза
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +387,Accounting Entry for Stock,Сметководство за влез на берза
 DocType: Sales Invoice,Sales Team1,Продажбата Team1
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,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 +96,Row {0}: Completed Qty must be greater than zero.,Ред {0}: Завршено Количина мора да биде поголема од нула.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +120,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 +88,Row # {0}: Cannot return more than {1} for Item {2},Ред # {0}: Не можам да се вратат повеќе од {1} за Точка {2}
+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,Двор
 DocType: Item Group,Show this slideshow at the top of the page,Прикажи Овој слајдшоу на врвот на страната
 DocType: BOM,Item UOM,Точка UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Износот на данокот По Износ попуст (Фирма валута)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +147,Target warehouse is mandatory for row {0},Целна склад е задолжително за спорот {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,Примарен Settings
 DocType: Purchase Invoice,Select Supplier Address,Изберете Добавувачот адреса
 DocType: Quality Inspection,Quality Inspection,Квалитет инспекција
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Extra Small,Екстра Мали
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,Warning: Material Requested Qty is less than Minimum Order Qty,Предупредување: Материјал Бараниот Количина е помалку од Минимална Подреди Количина
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +194,Account {0} is frozen,На сметка {0} е замрзнат
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Екстра Мали
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +690,Warning: Material Requested Qty is less than Minimum Order Qty,Предупредување: Материјал Бараниот Количина е помалку од Минимална Подреди Количина
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,На сметка {0} е замрзнат
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Правното лице / Подружница со посебен сметковен кои припаѓаат на Организацијата.
 DocType: Payment Request,Mute Email,Неми-пошта
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Храна, пијалаци и тутун"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +606,Can only make payment against unbilled {0},Може само да се направи исплата против нефактурираното {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +126,Commission rate cannot be greater than 100,Комисијата стапка не може да биде поголема од 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +609,Can only make payment against unbilled {0},Може само да се направи исплата против нефактурираното {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,Комисијата стапка не може да биде поголема од 100
 DocType: Stock Entry,Subcontract,Поддоговор
 apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,Ве молиме внесете {0} прв
 DocType: Production Order Operation,Actual End Time,Крај Крај
@@ -2402,30 +2431,30 @@
 DocType: SMS Log,No of Sent SMS,Број на испратени СМС
 DocType: Account,Expense Account,Сметка сметка
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Софтвер
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Colour,Боја
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,Боја
 DocType: Maintenance Visit,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; и не постои друг Бовча производ
 DocType: Student Log,Academic,академски
-apps/erpnext/erpnext/controllers/accounts_controller.py +469,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Вкупно Аванс ({0}) во однос на Нарачка {1} не може да биде поголемо од Сѐ Вкупно ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +472,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Вкупно Аванс ({0}) во однос на Нарачка {1} не може да биде поголемо од Сѐ Вкупно ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Изберете Месечен Дистрибуција на нерамномерно дистрибуира цели низ месеци.
 DocType: Purchase Invoice Item,Valuation Rate,Вреднување стапка
+DocType: Stock Reconciliation,SR/,SR /
 apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,Ценовник Валута не е избрано
 DocType: Assessment,Results,резултати
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +168,Employee {0} has already applied for {1} between {2} and {3},Вработен {0} веќе има поднесено барање за {1} помеѓу {2} и {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +175,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: Student Applicant,Father's/ Guardian 2 Email ID,/ Гардијан 2-мејл ID Татко
 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 +228,Warehouses with existing transaction can not be converted to group.,Магацини со постоечките трансакцијата не може да се конвертира во групата.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +231,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 +93,Researcher,Истражувач
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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.,Дојдовен инспекција квалитет.
@@ -2437,25 +2466,25 @@
 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: Sales Invoice,Advertisement,Маркетинг
 DocType: Asset Category Account,Depreciation Expense Account,Амортизација сметка сметка
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Probationary Period,Пробниот период
-apps/erpnext/erpnext/hooks.py +102,Announcements,Соопштенија
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Пробниот период
+apps/erpnext/erpnext/hooks.py +111,Announcements,Соопштенија
 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 +109,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 +16,To Datetime,Да DateTime
+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/scheduling_tool/scheduling_tool.py +51,Course Schedules deleted:,Распоред на курсот избришани:
 apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,Дневници за одржување на статусот на испораката смс
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Активности во тек
+DocType: Accounts Settings,Make Payment via Journal Entry,Се направи исплата преку весник Влегување
+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 +127,Please enter relieving date.,Ве молиме внесете ослободување датум.
-apps/erpnext/erpnext/controllers/trends.py +145,Amt,АМТ
+apps/erpnext/erpnext/controllers/trends.py +149,Amt,АМТ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,Only Leave Applications with status 'Approved' can be submitted,Остави само Пријавите со статус &#39;одобрена &quot;може да се поднесе
 apps/erpnext/erpnext/utilities/doctype/address/address.py +26,Address Title is mandatory.,Наслов адреса е задолжително.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Внесете го името на кампања, ако извор на истрага е кампања"
@@ -2473,14 +2502,15 @@
 apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1},Не може да се најде на девизниот курс за {0} до {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Марк Половина ден
 DocType: Sales Invoice,Sales Team,Тим за продажба
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Duplicate entry,Дупликат внес
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,Дупликат внес
 DocType: Program Enrollment Tool,Get Students,Студентите се добие
 DocType: Serial No,Under Warranty,Под гаранција
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +490,[Error],[Грешка]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +484,[Error],[Грешка]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,Во Зборови ќе бидат видливи откако ќе го спаси Продај Побарувања.
 ,Employee Birthday,Вработен Роденден
 apps/erpnext/erpnext/controllers/status_updater.py +175,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} веќе постои. Ве молиме да ги менувате овие ставки и обидете се повторно."
 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} не постои
@@ -2496,22 +2526,22 @@
 ,Issued Items Against Production Order,Издадени Теми против производството со цел
 DocType: Pricing Rule,Purchase Manager,Купување менаџер
 DocType: Target Detail,Target Detail,Целна Детална
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +25,All Jobs,сите работни места
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,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 +323,Amount {0} {1} {2} {3},Износот {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,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: Supplier,Credit Limit,Кредитен лимит
 DocType: Production Plan Sales Order,Salse Order Date,Salse Уредување Дата
 DocType: Salary Component,Salary Component,плата Компонента
-apps/erpnext/erpnext/accounts/utils.py +372,Payment Entries {0} are un-linked,Плаќање Записи {0} е не-поврзани
+apps/erpnext/erpnext/accounts/utils.py +449,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 +497,Material Requests {0} created,Материјал Барања {0} создаден
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +498,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.,Дефиниција на условите или договор.
 DocType: Purchase Invoice,Address and Contact,Адреса и контакт
@@ -2550,7 +2580,7 @@
 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 +848,Paid Amount cannot be greater than total negative outstanding amount {0},Уплатениот износ нема да биде поголема од вкупните одобрени негативен износ {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +859,Paid Amount cannot be greater than total negative outstanding amount {0},Уплатениот износ нема да биде поголема од вкупните одобрени негативен износ {0}
 DocType: Employee Internal Work History,Employee Internal Work History,Вработен внатрешна работа Историја
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +233,Closing (Dr),Затворање (д-р)
 DocType: Cheque Print Template,Cheque Size,чек Големина
@@ -2571,7 +2601,8 @@
 ,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 +555,'Update Stock' cannot be checked for fixed asset sale,&quot;Ажурирање Акции&quot; не може да се провери за фиксни продажба на средства
+DocType: Student Guardian,Father,татко
+apps/erpnext/erpnext/controllers/accounts_controller.py +558,'Update Stock' cannot be checked for fixed asset sale,&quot;Ажурирање Акции&quot; не може да се провери за фиксни продажба на средства
 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} е откажана или запрена
@@ -2581,15 +2612,15 @@
 DocType: Sales Order,Fully Delivered,Целосно Дадени
 DocType: Lead,Lower Income,Помал приход
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","Шефот на сметка под одговорност, во која Добивка / загуба ќе се резервира"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +166,Source and target warehouse cannot be same for row {0},Изворот и целните склад не може да биде иста за спорот {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Разликата сметките мора да бидат типот на средствата / одговорност сметка, бидејќи овој парк помирување претставува Отворање Влегување"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +81,Purchase Order number required for Item {0},Нарачка број потребен за Точка {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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/purchase_receipt/purchase_receipt.py +82,Purchase Order number required for Item {0},Нарачка број потребен за Точка {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&quot;Од датум&quot; мора да биде по &quot;Да најдам&quot;
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +17,Cannot change status as student {0} is linked with student application {1},не може да го промени својот статус како студент {0} е поврзан со примена студент {1}
+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: Timesheet,"List of employee which has ""Salary Slip Based on Timesheet"" is enabled in salary structure.",Листа на вработен кој има &quot;Плата фиш Врз основа на timesheet&quot; е овозможено во структурата на платите.
 DocType: Asset,Fully Depreciated,целосно амортизираните
 ,Stock Projected Qty,Акции Проектирани Количина
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Customer {0} does not belong to project {1},Клиент {0} не му припаѓа на проектот {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,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,Сериски Не и серија
@@ -2601,7 +2632,7 @@
 DocType: Purchase Invoice,Purchase Taxes and Charges,Купување на даноци и такси
 ,Qty to Receive,Количина да добијам
 DocType: Leave Block List,Leave Block List Allowed,Остави Забрани листата на дозволени
-apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +55,All Warehouses,сите Магацини
+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 +105,Credit To account must be a Balance Sheet account,Кредит на сметка мора да биде на сметка Биланс на состојба
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Сите типови на Добавувачот
@@ -2613,10 +2644,10 @@
 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/manufacturing/doctype/bom/bom.js +26,Browse BOM,Преглед на бирото
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,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/asset/depreciation.py +94,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Поставете Амортизација поврзани сметки во Категорија Средства {0} или куќа {1}
-DocType: Academic Year,Academic Year,Академска година
+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
 DocType: Appraisal,Appraisal,Процена
@@ -2624,12 +2655,12 @@
 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 +197,Leave approver must be one of {0},Остави approver мора да биде еден од {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,Leave approver must be one of {0},Остави approver мора да биде еден од {0}
 DocType: Hub Settings,Seller Email,Продавачот Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Вкупен трошок за Набавка (преку Влезна фактура)
 DocType: Workstation Working Hour,Start Time,Почеток Време
 DocType: Item Price,Bulk Import Help,Рефус увоз Помош
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +256,Select Quantity,Изберете количина
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +257,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,Пораката испратена
@@ -2646,6 +2677,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Или цел количество: Контакт лице или целниот износ е задолжително.
 apps/erpnext/erpnext/config/projects.py +45,Cost of various activities,Цената на различни активности
 apps/erpnext/erpnext/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 +149,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}
 DocType: Item,Inspection Required,Инспекција што се бара
@@ -2665,7 +2697,7 @@
 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 +138,Wire Transfer,Wire Transfer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,Wire Transfer
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Проверете ги сите
 DocType: Sales Order,Recurring Order,Повторувачки Побарувања
 DocType: Company,Default Income Account,Сметка стандардно на доход
@@ -2677,21 +2709,19 @@
 ,Welcome to ERPNext,Добредојдовте на ERPNext
 apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,Потенцијален клиент до Понуда
 DocType: Lead,From Customer,Од Клиент
-apps/erpnext/erpnext/demo/setup_data.py +357,Calls,Повици
+apps/erpnext/erpnext/demo/setup/setup_data.py +300,Calls,Повици
 DocType: Project,Total Costing Amount (via Time Logs),Вкупен Износ на Чинење (преку Временски дневници)
 DocType: Purchase Order Item Supplied,Stock UOM,Акции UOM
-apps/erpnext/erpnext/stock/doctype/item/item.py +466,"As there are existing transactions for this item, \
-							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Како што веќе постојат трансакции за оваа точка, \ вие не може да се промени на вредностите на &quot;Дали сериски Не&quot;, &quot;Има Серија Не&quot;, &quot;Дали Акции Точка&quot; и &quot;Проценка на методот за"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,Purchase Order {0} is not submitted,Нарачка {0} не е поднесен
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,Проектирани
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Сериски № {0} не припаѓаат Магацински {1}
 apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,"Забелешка: системот не ќе ги провери над-испорака и над-резервација за Точка {0}, на пример количината или сума е 0"
 DocType: Notification Control,Quotation Message,Понуда порака
 DocType: Issue,Opening Date,Отворање датум
-apps/erpnext/erpnext/schools/api.py +58,Attendance has been marked successfully.,Присуство е обележан успешно.
+apps/erpnext/erpnext/schools/api.py +57,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 +136,Account Type for {0} must be {1},Тип на сметка за {0} мора да биде {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +139,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,Двете Магацински мора да припаѓа на истата компанија
@@ -2706,12 +2736,13 @@
 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/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 +20,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 +1190,Please select customer,Ве молам изберете клиентите
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1193,Please select customer,Ве молам изберете клиентите
 DocType: C-Form,I,јас
 DocType: Company,Asset Depreciation Cost Center,Центар Амортизација Трошоци средства
 DocType: Sales Order Item,Sales Order Date,Продажбата на Ред Датум
@@ -2721,6 +2752,7 @@
 ,Payment Period Based On Invoice Date,Плаќање период врз основа на датум на фактурата
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Недостасува размена на валута стапки за {0}
 DocType: Assessment,Examiner,испитувачот
+DocType: Student,Siblings,браќа и сестри
 DocType: Journal Entry,Stock Entry,Акции Влегување
 DocType: Payment Entry,Payment References,плаќање Референци
 DocType: C-Form,C-FORM-,C-форма-
@@ -2738,11 +2770,12 @@
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Име на тема
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Најмалку едно мора да биде избрано од Продажби или Купување
+DocType: Grading Structure,Grade Intervals,интервали одделение
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Изберете од природата на вашиот бизнис.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Каде што се врши производните операции.
 DocType: Asset Movement,Source Warehouse,Извор Магацински
 DocType: Installation Note,Installation Date,Инсталација Датум
-apps/erpnext/erpnext/controllers/accounts_controller.py +534,Row #{0}: Asset {1} does not belong to company {2},Ред # {0}: {1} средства не му припаѓа на компанијата {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +537,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,Продажбата пристап
@@ -2756,28 +2789,31 @@
 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 +111,Date Of Retirement must be greater than Date of Joining,Денот на неговото пензионирање мора да биде поголема од датумот на пристап
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +49,There were errors while scheduling course on :,Имаше грешки при закажување разбира на:
 DocType: Sales Invoice,Against Income Account,Против профил доход
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +87,{0}% Delivered,{0}% Дадени
+apps/erpnext/erpnext/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 +379,Please set default {0} in Company {1},Поставете стандардно {0} во компанијата {1}
+apps/erpnext/erpnext/accounts/utils.py +456,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,Бруто добивка / загуба
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Нарачка точка Опрема што се испорачува
 apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,Име на компанија не може да биде компанија
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Писмо глави за печатење на обрасци.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Наслови за печатење шаблони пр проформа фактура.
+DocType: Student Guardian,Student Guardian,студентски Гардијан
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +184,Valuation type charges can not marked as Inclusive,Трошоци тип вреднување не може да го означи како Инклузивна
 DocType: POS Profile,Update Stock,Ажурирање берза
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Различни ЕМ за Артикли ќе доведе до Неточна (Вкупно) вредност за Нето тежина. Проверете дали Нето тежината на секој артикал е во иста ЕМ.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Бум стапка
 DocType: Asset,Journal Entry for Scrap,Весник за влез Отпад
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Ве молиме да се повлече предмети од Испратница
-apps/erpnext/erpnext/accounts/utils.py +349,Journal Entries {0} are un-linked,Весник записи {0} е не-поврзани
+apps/erpnext/erpnext/accounts/utils.py +426,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,Ве молиме спомнете заокружуваат цена центар во компанијата
@@ -2801,6 +2837,7 @@
 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,Форуми во заедницата
+DocType: Homepage,"URL for ""All Products""",URL-то &quot;Сите производи&quot;
 DocType: Leave Application,Leave Balance Before Application,Остави баланс пред апликација
 DocType: SMS Center,Send SMS,Испрати СМС
 DocType: Cheque Print Template,Width of amount in word,Ширина на износот на збор
@@ -2809,7 +2846,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 +29,Current Job Openings,Тековни работни места
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,Current Job Openings,Тековни работни места
 DocType: Company,Stock Adjustment Account,Акциите прилагодување профил
 DocType: Journal Entry,Write Off,Отпис
 DocType: Timesheet Detail,Operation ID,Операција проект
@@ -2822,7 +2859,7 @@
 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 +850,Show tax break-up,Шоуто данок распадот
+apps/erpnext/erpnext/public/js/controllers/transaction.js +841,Show tax break-up,Шоуто данок распадот
 apps/erpnext/erpnext/accounts/party.py +308,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}, па оттука не може повторно да се додели или да ја менувате"
@@ -2832,10 +2869,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 +534,Please select Posting Date before selecting Party,Ве молам изберете Праќање пораки во Датум пред изборот партија
 DocType: Serial No,Out of AMC,Од АМЦ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +80,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 +162,Please contact to the user who have Sales Master Manager {0} role,Ве молиме контактирајте на корисникот кој има {0} функции Продажбата мајстор менаџер
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +195,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 +5,This is based on the attendance of this Student,Ова се базира на присуството на овој студент
@@ -2844,12 +2882,11 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Испорака белешки {0} мора да биде укинат пред да го раскине овој Продај Побарувања
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +75,Paid amount + Write Off Amount can not be greater than Grand Total,Уплатениот износ + Отпишана сума не може да биде поголемо од Сѐ Вкупно
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,{0} is not a valid Batch Number for Item {1},{0} не е валиден сериски број за ставката {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +138,Note: There is not enough leave balance for Leave Type {0},Забелешка: Не е доволно одмор биланс за Оставете Тип {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,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,Можност Тип
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,Новата компанија
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,Cost Center is required for 'Profit and Loss' account {0},Се бара цена Центар за &#39;билансот на успех &quot;на сметка {0}
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Трансакции може да биде избришан само од страна на креаторот на компанијата
 apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,Неточен број на генералниот Леџер записи најде. Можеби сте избрале погрешна сметка во трансакцијата.
 DocType: Cheque Print Template,Cheque Width,чек Ширина
@@ -2858,16 +2895,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,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 +228,{0} '{1}' is disabled,{0} {1} &quot;е оневозможено
+apps/erpnext/erpnext/controllers/accounts_controller.py +231,{0} '{1}' is disabled,{0} {1} &quot;е оневозможено
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Постави како отворено
 DocType: Cheque Print Template,Scanned Cheque,скенирани чекови
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Испрати автоматски пораки до контакти за доставување на трансакции.
+DocType: Timesheet,Total Billable Amount,Вкупно Платимите Износ
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Точка 3
 DocType: Purchase Order,Customer Contact Email,Контакт е-маил клиент
 DocType: Warranty Claim,Item and Warranty Details,Точка и гаранција Детали за
 DocType: Sales Team,Contribution (%),Придонес (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Забелешка: Плаќањето за влез нема да бидат направивме од &quot;Пари или банкарска сметка &#39;не е одредено,"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Responsibilities,Одговорности
+apps/erpnext/erpnext/controllers/accounts_controller.py +78,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,Одговорности
 DocType: Expense Claim Account,Expense Claim Account,Тврдат сметка сметка
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,Шаблон
 DocType: Sales Person,Sales Person Name,Продажбата на лице Име
@@ -2875,6 +2913,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Додади корисници
 DocType: Pricing Rule,Item Group,Точка група
 DocType: Item,Safety Stock,безбедноста на акции
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Точка Код&gt; Точка Група&gt; Бренд
 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),Даноци и давачки Додадено (Фирма валута)
@@ -2884,7 +2923,6 @@
 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: Timesheet,Total Hours,Вкупно Часови
 DocType: Journal Entry,Printing Settings,Поставки за печатење
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Total Debit must be equal to Total Credit. The difference is {0},Вкупно Побарува мора да биде еднаков со Вкупно Должи. Разликата е {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Автомобилски
@@ -2897,13 +2935,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Инвестициско банкарство
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +71,Cash or Bank Account is mandatory for making payment entry,Парични средства или банкарска сметка е задолжително за правење влез плаќање
 DocType: Purchase Invoice,Price List Exchange Rate,Ценовник курс
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Клиентите&gt; клиентот група&gt; Територија
 DocType: Purchase Invoice Item,Rate,Цена
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Intern,Практикант
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,Практикант
 DocType: Stock Entry,From BOM,Од бирото
 DocType: Assessment,Assessment Code,Код оценување
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +32,Basic,Основни
+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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',Ве молиме кликнете на &quot;Генерирање Распоред &#39;
+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 +95,Reference No is mandatory if you entered Reference Date,Референтен број е задолжително ако влезе референтен датум
@@ -2912,11 +2951,11 @@
 DocType: Salary Slip,Salary Structure,Структура плата
 DocType: Account,Bank,Банка
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Авиокомпанијата
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +752,Issue Material,Материјал прашање
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +723,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 +683,You are in offline mode. You will not be able to reload until you have network.,Вие сте моментално во режим без мрежа. Вие нема да бидете во можност да ја превчитате додека имате мрежа.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +665,You are in offline mode. You will not be able to reload until you have network.,Вие сте моментално во режим без мрежа. Вие нема да бидете во можност да ја превчитате додека имате мрежа.
 DocType: Hub Settings,Access Token,Пристап знак
 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,Сериски Не
@@ -2924,33 +2963,35 @@
 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 +1122,Enter value must be positive,Внесете ја вредноста мора да биде позитивен
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,All Territories,Сите територии
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1125,Enter value must be positive,Внесете ја вредноста мора да биде позитивен
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,Сите територии
 DocType: Purchase Invoice,Items,Теми
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +23,Student is already enrolled.,Студентот се веќе запишани.
 DocType: Fiscal Year,Year Name,Име на Година
 DocType: Process Payroll,Process Payroll,Процесот Даноци
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,Постојат повеќе одмори од работни дена овој месец.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +233,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 +96,Request for Quotations,Барање за прибирање на понуди
+apps/erpnext/erpnext/hooks.py +104,Request for Quotations,Барање за прибирање на понуди
 DocType: Payment Reconciliation,Maximum Invoice Amount,Максималниот износ на фактура
 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 +628,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Стандардно единица мерка за Варијанта &#39;{0}&#39; мора да биде иста како и во Мострата &quot;{1}&quot;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Стандардно единица мерка за Варијанта &#39;{0}&#39; мора да биде иста како и во Мострата &quot;{1}&quot;
 DocType: Shipping Rule,Calculate Based On,Се пресмета врз основа на
 DocType: Delivery Note Item,From Warehouse,Од Магацин
 DocType: Assessment,Supervisor Name,Име супервизор
+DocType: Assessment,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,Набавка пристап
 DocType: Notification Control,Customize the Notification,Персонализација на известувањето
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Cash Flow from Operations,Парични текови од работење
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,Стандардно адреса Шаблон не може да се избришат
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,Стандардно адреса Шаблон не може да се избришат
 DocType: Sales Invoice,Shipping Rule,Испорака Правило
 DocType: Manufacturer,Limited to 12 characters,Ограничен на 12 карактери
 DocType: Journal Entry,Print Heading,Печати Заглавие
@@ -2965,8 +3006,8 @@
 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/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Или цел количество: Контакт лице или целниот износ е задолжително
-apps/erpnext/erpnext/stock/get_item_details.py +485,No default BOM exists for Item {0},Постои стандарден Бум постои точка за {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +336,Please select Posting Date first,Ве молиме изберете ја со Мислењата Датум прв
+apps/erpnext/erpnext/stock/get_item_details.py +486,No default BOM exists for Item {0},Постои стандарден Бум постои точка за {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +326,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,Трошоците центар со постојните трансакции не може да се конвертира Леџер
@@ -2982,6 +3023,7 @@
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Натпреварот плаќања со фактури
 DocType: Journal Entry,Bank Entry,Банката Влегување
 DocType: Authorization Rule,Applicable To (Designation),Применливи To (Означување)
+,Profitability Analysis,профитабилноста анализа
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,Додади во кошничка
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Со група
 DocType: Guardian,Interests,Интереси
@@ -2994,21 +3036,21 @@
 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 +141,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Серијали Точка {0} не може да се ажурира \ користење на берза за помирување
 DocType: Scheduling Tool,Day,ден
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Нова серија № не може да има складиште. Склад мора да бидат поставени од страна берза за влез или купување Потврда
 DocType: Lead,Lead Type,Потенцијален клиент Тип
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,You are not authorized to approve leaves on Block Dates,Немате дозвола да го одобри лисјата Забрани Термини
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,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: Student Applicant,AP.,АП.
 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 +639,Point of Sale,Точка на продажба
+apps/erpnext/erpnext/accounts/page/pos/pos.js +634,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,Данок
 DocType: Production Planning Tool,Production Planning Tool,Алатка за производство планирање
@@ -3017,74 +3059,77 @@
 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 +373,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 Entry,Update Rate and Availability,Ажурирање курс и Достапност
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Процент ви е дозволено да примате или да испорача повеќе во однос на количината нареди. На пример: Ако го наредил 100 единици. и вашиот додаток е 10%, тогаш ви е дозволено да се добијат 110 единици."
 DocType: POS Profile,Customer Group,Група на потрошувачи
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,Expense account is mandatory for item {0},Сметка сметка е задолжително за ставката {0}
 DocType: Item,Website Description,Веб-сајт Опис
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date must be on or after today,Следна Амортизација датум мора да е на или после денес
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,Нето промени во капиталот
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +145,Please cancel Purchase Invoice {0} first,Ве молиме откажете купувањето фактура {0} првиот
 DocType: Serial No,AMC Expiry Date,АМЦ датумот на истекување
 ,Sales Register,Продажбата Регистрирај се
 DocType: Quotation,Quotation Lost Reason,Причина за Нереализирана Понуда
+apps/erpnext/erpnext/utilities/doctype/address/address.py +164,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Не стандардна адреса Шаблон најде. Ве молиме да се создаде нов една од поставување&gt; Печатење и Брендирање&gt; Адреса дефиниција.
 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 +330,Transaction reference no {0} dated {1},референтна трансакцијата не {0} {1} датум
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Transaction reference no {0} dated {1},референтна трансакцијата не {0} {1} датум
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Нема ништо да се променат.
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,Summary for this month and pending activities,Резиме за овој месец и во очекување на активности
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Резиме за овој месец и во очекување на активности
 DocType: Customer Group,Customer Group Name,Клиент Име на групата
 apps/erpnext/erpnext/public/js/financial_statements.js +54,Cash Flow Statement,Извештај за паричниот тек
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Please remove this Invoice {0} from C-Form {1},Ве молиме да се отстрани оваа фактура {0} од C-Форма {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Please remove this Invoice {0} from C-Form {1},Ве молиме да се отстрани оваа фактура {0} од C-Форма {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Ве молиме изберете ја носи напред ако вие исто така сакаат да се вклучат во претходната фискална година биланс остава на оваа фискална година
 DocType: GL Entry,Against Voucher Type,Против ваучер Тип
 DocType: Item,Attributes,Атрибути
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +644,Get Items,Се предмети
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +623,Get Items,Се предмети
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +210,Please enter Write Off Account,Ве молиме внесете го отпише профил
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Последните Ред Датум
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +41,Account {0} does not belongs to company {1},На сметка {0} не припаѓа на компанијата {1}
+DocType: Student,Guardian Details,Гардијан Детали
 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,Планираниот почеток Датум
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,Customer is required against Receivable account {0},се бара клиент против побарувања сметка {0}
 DocType: Serial No,Creation Document Type,Креирање Вид на документ
 DocType: Leave Type,Is Encash,Е инкасирам
 DocType: Purchase Invoice,Mobile No,Мобилни Не
 DocType: Leave Allocation,New Leaves Allocated,Нови лисја Распределени
-apps/erpnext/erpnext/controllers/trends.py +265,Project-wise data is not available for Quotation,Проект-мудар податоци не се достапни за котација
+apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Проект-мудар податоци не се достапни за котација
 DocType: Project,Expected End Date,Се очекува Крај Датум
 DocType: Budget Account,Budget Amount,износи од буџетот
 DocType: Appraisal Template,Appraisal Template Title,Процена Шаблон Наслов
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,Commercial,Комерцијален
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,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 +648,Row {0}# Account must be of type 'Fixed Asset',Ред {0} # сметка мора да биде од типот &quot;основни средства&quot;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,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 +30,Series is mandatory,Серија е задолжително
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +50,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}
 DocType: Leave Allocation,Unused leaves,Неискористени листови
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Cr,Cr
 DocType: Tax Rule,Billing State,Платежна држава
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +250,Transfer,Трансфер
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +187,{0} {1} does not associated with Party Account {2},{0} {1} не се поврзани со сметка партија {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,Fetch exploded BOM (including sub-assemblies),Земи експлодира Бум (вклучувајќи ги и потсклопови)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +254,Transfer,Трансфер
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +190,{0} {1} does not associated with Party Account {2},{0} {1} не се поврзани со сметка партија {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +796,Fetch exploded BOM (including sub-assemblies),Земи експлодира Бум (вклучувајќи ги и потсклопови)
 DocType: Authorization Rule,Applicable To (Employee),Применливи To (вработените)
-apps/erpnext/erpnext/controllers/accounts_controller.py +115,Due Date is mandatory,Поради Датум е задолжително
+apps/erpnext/erpnext/controllers/accounts_controller.py +118,Due Date is mandatory,Поради Датум е задолжително
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Интервалот за Атрибут {0} не може да биде 0
 DocType: Journal Entry,Pay To / Recd From,Да се плати / Recd Од
 DocType: Naming Series,Setup Series,Подесување Серија
 DocType: Payment Reconciliation,To Invoice Date,Датум на фактура
 DocType: Supplier,Contact HTML,Контакт HTML
 ,Inactive Customers,неактивни корисници
+DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Набавка Разписки
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Како Цените правило се применува?
 DocType: Quality Inspection,Delivery Note No,Испратница Не
@@ -3093,7 +3138,7 @@
 DocType: Company,Retail,Трговија на мало
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +120,Customer {0} does not exist,Клиент {0} не постои
 DocType: Attendance,Absent,Отсутен
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +587,Product Bundle,Производ Бовча
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Product Bundle,Производ Бовча
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Invalid reference {1},Ред {0}: Невалидна референца {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Купување на даноци и такси Шаблон
 DocType: Upload Attendance,Download Template,Преземи Шаблон
@@ -3103,8 +3148,8 @@
 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 +742,Send Supplier Emails,Испрати Добавувачот пораки
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +104,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",Плата веќе обработени за периодот од {0} и {1} Остави период апликација не може да биде помеѓу овој период.
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +708,Send Supplier Emails,Испрати Добавувачот пораки
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,"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,Гардијан камати
 DocType: Timesheet,Employee Detail,детали за вработените
@@ -3115,9 +3160,9 @@
 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,Заработувајќи &amp; Одбивање
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +77,Account {0} cannot be a Group,На сметка {0} не може да биде група
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} cannot be a Group,На сметка {0} не може да биде група
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +31,Optional. This setting will be used to filter in various transactions.,Опционални. Оваа поставка ќе се користи за филтрирање на различни трансакции.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +107,Negative Valuation Rate is not allowed,Негативни Вреднување стапка не е дозволено
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Негативни Вреднување стапка не е дозволено
 DocType: Holiday List,Weekly Off,Неделен Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","За пример, 2012 година, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +39,Provisional Profit / Loss (Credit),Привремени Добивка / загуба (кредитни)
@@ -3131,16 +3176,16 @@
 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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Цена центар е задолжително за ставката {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +626,Get Items from Product Bundle,Се предмети од производот Бовча
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +605,Get Items from Product Bundle,Се предмети од производот Бовча
 DocType: Asset,Straight Line,Права линија
 DocType: Project User,Project User,корисник на проектот
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} is inactive,На сметка {0} е неактивен
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} is inactive,На сметка {0} е неактивен
 DocType: GL Entry,Is Advance,Е напредување
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Публика од денот и Публика во тек е задолжително
 apps/erpnext/erpnext/controllers/buying_controller.py +148,Please enter 'Is Subcontracted' as Yes or No,"Ве молиме внесете &#39;се дава под договор &quot;, како Да или Не"
 DocType: Sales Team,Contact No.,Контакт број
 DocType: Bank Reconciliation,Payment Entries,записи плаќање
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,'Profit and Loss' type account {0} not allowed in Opening Entry,&quot;Добивка и загуба&quot; тип на сметка {0} не е дозволено во Отворање Влегување
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +71,'Profit and Loss' type account {0} not allowed in Opening Entry,&quot;Добивка и загуба&quot; тип на сметка {0} не е дозволено во Отворање Влегување
 DocType: Program Enrollment Tool,Get Students From,Земете студенти од
 DocType: Hub Settings,Seller Country,Продавачот Земја
 apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,Предмети објавуваат на веб-страницата
@@ -3159,7 +3204,7 @@
 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 +558,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Ред # {0}: {1} средства не може да се поднесе, тоа е веќе {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +561,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Ред # {0}: {1} средства не може да се поднесе, тоа е веќе {2}"
 DocType: Tax Rule,Billing Country,Платежна Земја
 DocType: Production Order,Expected Delivery Date,Се очекува испорака датум
 apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Дебитни и кредитни не се еднакви за {0} # {1}. Разликата е во тоа {2}.
@@ -3172,13 +3217,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +202,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: Sales Order,% Amount Billed,% Износ Опишан
+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 +117,No Item with Serial No {0},Не ставка со Сериски Не {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Отворен Известувања
+DocType: Email Digest,Open Notifications,Отворен Известувања
 DocType: Payment Entry,Difference Amount (Company Currency),Разликата Износ (Фирма валута)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,Директни трошоци
 apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
@@ -3186,7 +3231,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Нов корисник приходи
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,Патни трошоци
 DocType: Maintenance Visit,Breakdown,Дефект
-apps/erpnext/erpnext/controllers/accounts_controller.py +634,Account: {0} with currency: {1} can not be selected,Сметка: {0} со валутна: не може да се одбрани {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +637,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}
 DocType: Program Enrollment Tool,Student Applicants,студентите Кандидатите
@@ -3194,15 +3239,15 @@
 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 +56,Probation,Условна казна
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Probation,Условна казна
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,плата Делови
 DocType: Program Enrollment Tool,New Academic Year,Новата академска година
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Payment of salary for the month {0} and year {1},Исплата на плата за месец {0} и годината {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Payment of salary for the month {0} and year {1},Исплата на плата за месец {0} и годината {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Авто вметнете Ценовник стапка ако недостасува
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Вкупно Исплатен износ
 DocType: Production Order Item,Transferred Qty,Пренесува Количина
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Навигацијата
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Planning,Планирање
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,Планирање
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Издадени
 DocType: Project,Total Billing Amount (via Time Logs),Вкупен Износ на Наплата (преку Временски дневници)
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,We sell this Item,Ние продаваме Оваа содржина
@@ -3215,11 +3260,10 @@
 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.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Sales invoice submitted sucessfully.,Продај фактура поднесени успешно.
 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}
 DocType: Assessment Result,Student Name,студентски Име
-apps/erpnext/erpnext/hooks.py +104,Assessment Schedule,Распоред на оценување
+apps/erpnext/erpnext/hooks.py +113,Assessment Schedule,Распоред на оценување
 DocType: Brand,Item Manager,Точка менаџер
 DocType: Buying Settings,Default Supplier Type,Стандардно Добавувачот Тип
 DocType: Production Order,Total Operating Cost,Вкупни Оперативни трошоци
@@ -3229,6 +3273,7 @@
 DocType: GL Entry,Party Type,Партијата Тип
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +78,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,Макс дена ја напушти Дозволено
@@ -3240,18 +3285,19 @@
 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 +99,All Customer Groups,Сите групи потрошувачи
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +78,Accumulated Monthly,Акумулирана Месечни
-apps/erpnext/erpnext/controllers/accounts_controller.py +595,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} е задолжително. Можеби рекорд размена на валута не е создадена за {1} до {2}.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Сите групи потрошувачи
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +81,Accumulated Monthly,Акумулирана Месечни
+apps/erpnext/erpnext/controllers/accounts_controller.py +598,{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} не постои
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Ценовник стапка (Фирма валута)
 DocType: Products Settings,Products Settings,производи Settings
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +188,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Поставете Именување серија за {0} преку поставување&gt; Прилагодување&gt; Именување Серија
 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 +84,Secretary,Секретар
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,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,Купување
@@ -3260,24 +3306,22 @@
 ,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,проценка Име
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,Ред # {0}: Сериски Не е задолжително
+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 +859,Supplier Quotation,Понуда од Добавувач
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +838,Supplier Quotation,Понуда од Добавувач
 DocType: Quotation,In Words will be visible once you save the Quotation.,Во Зборови ќе бидат видливи откако ќе го спаси котација.
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +7,Collect Fees,собирање на претплатата
+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}
 DocType: Lead,Add to calendar on this date,Додади во календарот на овој датум
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Правила за додавање на трошоците за испорака.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Престојни настани
 DocType: Item,Opening Stock,отворање на Акции
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Се бара купувачи
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} е задолжително за враќање
 DocType: Purchase Order,To Receive,За да добиете
 apps/erpnext/erpnext/public/js/setup_wizard.js +195,user@example.com,user@example.com
-DocType: Email Digest,Income / Expense,Приходи / расходи
 DocType: Employee,Personal Email,Личен е-маил
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Вкупна Варијанса
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Ако е овозможено, системот ќе ја објавите на сметководствените ставки за попис автоматски."
@@ -3288,13 +3332,14 @@
 DocType: Customer,From Lead,Од Потенцијален клиент
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Нарачка пуштени во производство.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Изберете фискалната година ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,POS Profile required to make POS Entry,POS Профил потребно да се направи ПОС Влегување
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +509,POS Profile required to make POS Entry,POS Профил потребно да се направи ПОС Влегување
 DocType: Program Enrollment Tool,Enroll Students,Студентите кои се запишуваат
 DocType: Hub Settings,Name Token,Име знак
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Стандардна Продажба
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Atleast one warehouse is mandatory,Барем еден магацин е задолжително
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +129,Atleast one warehouse is mandatory,Барем еден магацин е задолжително
 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 +330,{0} against Sales Invoice {1},{0} во однос на Продажна фактура {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Име на проектот
@@ -3315,10 +3360,11 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Листови мора да бидат распределени во мултипли од 0,5"
 DocType: Production Order,Operation Cost,Оперативни трошоци
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,Внеси посетеност од CSV датотека
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Најдобро Амт
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Поставените таргети Точка група-мудар за ова продажбата на лице.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Замрзнување резерви постари од [Денови]
-apps/erpnext/erpnext/controllers/accounts_controller.py +528,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Ред # {0}: Асет е задолжително за фиксни средства купување / продажба
+apps/erpnext/erpnext/controllers/accounts_controller.py +531,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Ред # {0}: Асет е задолжително за фиксни средства купување / продажба
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Ако две или повеќе правила Цените се наоѓаат врз основа на горенаведените услови, се применува приоритет. Приоритет е број помеѓу 0 до 20, додека стандардната вредност е нула (празно). Поголем број значи дека ќе имаат предност ако има повеќе Цените правила со истите услови."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Фискална година: {0} не постои
 DocType: Currency Exchange,To Currency,До Валута
@@ -3335,15 +3381,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Приватни инвестициски фондови
 DocType: Maintenance Visit,Customer Feedback,Клиент повратни информации
 DocType: Account,Expense,Сметка
-DocType: Sales Invoice,Exhibition,Изложба
 apps/erpnext/erpnext/utilities/doctype/address/address.py +77,"Company is mandatory, as it is your company address","Компанијата е задолжително, како што е на вашата компанија адреса"
 DocType: Item Attribute,From Range,Од Опсег
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +81,Syntax error in formula or condition: {0},Грешка во синтаксата во формулата или состојба: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +92,Syntax error in formula or condition: {0},Грешка во синтаксата во формулата или состојба: {0}
 apps/erpnext/erpnext/stock/utils.py +99,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 +28,Jobs,Вработувања
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,Вработувања
 ,Sales Order Trends,Продај Побарувања трендови
 DocType: Employee,Held On,Одржана на
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Производство Точка
@@ -3352,16 +3398,16 @@
 DocType: Stock Entry Detail,Additional Cost,Дополнителни трошоци
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,Финансиска година Крај Датум
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","Не може да се филтрираат врз основа на ваучер Не, ако се групираат според ваучер"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +763,Make Supplier Quotation,Направете Добавувачот цитат
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,Make Supplier Quotation,Направете Добавувачот цитат
 DocType: Quality Inspection,Incoming,Дојдовни
 DocType: BOM,Materials Required (Exploded),Потребни материјали (експлодира)
 apps/erpnext/erpnext/public/js/setup_wizard.js +185,"Add users to your organization, other than yourself","Додади корисниците на вашата организација, освен себе"
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,Row # {0}: Serial No {1} does not match with {2} {3},Ред # {0}: Сериски Не {1} не се совпаѓа со {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +42,Casual Leave,Обичните Leave
+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
 DocType: Batch,Batch ID,Серија проект
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,Note: {0},Забелешка: {0}
 ,Delivery Note Trends,Испратница трендови
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +103,This Week's Summary,Краток преглед на оваа недела
+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} можат да се ажурираат само преку акции трансакции
 DocType: Student Group Creation Tool,Get Courses,Земете курсеви
 DocType: GL Entry,Party,Партија
@@ -3371,7 +3417,7 @@
 DocType: Request for Quotation Item,Request for Quotation Item,Барање за прибирање понуди Точка
 DocType: Purchase Order,To Bill,Бил
 DocType: Material Request,% Ordered,Нареди%
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Piecework,Плаќаат на парче
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Piecework,Плаќаат на парче
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,Ср. Купување стапка
 DocType: Task,Actual Time (in Hours),Крај на времето (во часови)
 DocType: Employee,History In Company,Во историјата на компанијата
@@ -3388,7 +3434,7 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +350,{0} units of {1} needed in {2} to complete this transaction.,{0} единици од {1} потребни {2} за да се заврши оваа трансакција.
 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 +162,Black,Црна
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,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} предмети произведени
@@ -3399,13 +3445,13 @@
 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 +69,Customer Id,Id на купувачи
+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,Марк Отсутни
 DocType: Journal Entry Account,Exchange Rate,На девизниот курс
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Sales Order {0} is not submitted,Продај Побарувања {0} не е поднесен
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +527,Sales Order {0} is not submitted,Продај Побарувања {0} не е поднесен
 DocType: Homepage,Tag Line,таг линија
 DocType: Fee Component,Fee Component,надомест Компонента
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +857,Add items from,Додадете ставки од
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +836,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: Cheque Print Template,Regular,редовни
 DocType: BOM,Last Purchase Rate,Последните Набавка стапка
@@ -3413,6 +3459,7 @@
 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} бидејќи има варијанти
 ,Sales Person-wise Transaction Summary,Продажбата на лице-мудар Преглед на трансакциите
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +60,Cost Center is required for 'Profit and Loss' account {0}. Please set up a default Cost Center for the Company.,се бара цена центар за сметката &quot;добивка и загуба &#39;{0}. Ве молиме да се воспостави центар стандардно Цена за компанијата.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,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,Месечен Процентите Дистрибуција
@@ -3423,12 +3470,12 @@
 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 +710,Online,онлајн
+apps/erpnext/erpnext/accounts/page/pos/pos.js +692,Online,онлајн
 ,Available Stock for Packing Items,Достапни берза за материјали за пакување
 DocType: Item Variant,Item Variant,Точка Варијанта
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,Поставуањето на оваа адреса Шаблон како стандардно што не постои друг стандардно
+apps/erpnext/erpnext/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'","Баланс на сметка веќе во Дебитна, не Ви е дозволено да се постави рамнотежа мора да биде &quot;како&quot; кредит &quot;"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Quality Management,Управување со квалитет
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,Управување со квалитет
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,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,Вработен Надворешни Историја работа
@@ -3450,11 +3497,12 @@
 DocType: Student,Student Email ID,Студент e-mail проект
 DocType: Employee,Notice (days),Известување (во денови)
 DocType: Tax Rule,Sales Tax Template,Данок на промет Шаблон
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1520,Select items to save the invoice,Изберете предмети за да се спаси фактура
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1544,Select items to save the invoice,Изберете предмети за да се спаси фактура
 DocType: Employee,Encashment Date,Датум на инкасо
 DocType: Account,Stock Adjustment,Акциите прилагодување
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Постои Цена стандардно активност за Тип на активност - {0}
 DocType: Production Order,Planned Operating Cost,Планираните оперативни трошоци
+DocType: Academic Term,Term Start Date,Терминот Дата на започнување
 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,Подносител на барањето Име
@@ -3484,17 +3532,17 @@
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Сметка за складиште (Вечен Инвентар) ќе бидат создадени во рамките на оваа сметка.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +119,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Склад не може да биде избришан како што постои влез акции Леџер за оваа склад.
 DocType: Company,Distribution,Дистрибуција
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +8,Amount Paid,Уплатениот износ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Project Manager,Проект менаџер
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,Уплатениот износ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,Проект менаџер
 ,Quoted Item Comparison,Цитирано Точка споредба
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Dispatch,Испраќање
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,Испраќање
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Макс попуст дозволено за ставка: {0} е {1}%
 apps/erpnext/erpnext/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.,Улогата што може да поднесе трансакции кои надминуваат кредитни лимити во собата.
-DocType: Sales Invoice,Supplier Reference,Добавувачот Референтен
-apps/erpnext/erpnext/accounts/page/pos/pos.js +844,"Master data syncing, it might take some time","Господар синхронизација на податоци, тоа може да потрае некое време"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +832,"Master data syncing, it might take some time","Господар синхронизација на податоци, тоа може да потрае некое време"
 DocType: Item,Material Issue,Материјал Број
 DocType: Hub Settings,Seller Description,Продавачот Опис
 DocType: Employee Education,Qualification,Квалификација
@@ -3508,7 +3556,7 @@
 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 +83,Error in formula or condition,Грешка во формулата или состојба
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,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,Отстранете ги сите
@@ -3517,7 +3565,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},Датум треба да биде во рамките на фискалната година. Претпоставувајќи Да најдам = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Овде можете да одржите висина, тежина, алергии, медицински проблеми итн"
 DocType: Leave Block List,Applies to Company,Се однесува на компанијата
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +197,Cannot cancel because submitted Stock Entry {0} exists,Не може да се откаже затоа што {0} постои поднесени берза Влегување
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +198,Cannot cancel because submitted Stock Entry {0} exists,Не може да се откаже затоа што {0} постои поднесени берза Влегување
 DocType: Purchase Invoice,In Words,Со зборови
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,Today is {0}'s birthday!,Денес е {0} &#39;е роденден!
 DocType: Production Planning Tool,Material Request For Warehouse,Материјал Барање За Магацински
@@ -3527,14 +3575,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,Вашата финансиска година започнува на
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Средства амортизација и рамнотежа
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +319,Amount {0} {1} transferred from {2} to {3},Износот {0} {1} премина од {2} до {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +322,Amount {0} {1} transferred from {2} to {3},Износот {0} {1} премина од {2} до {3}
 DocType: Sales Invoice,Get Advances Received,Се аванси
 DocType: Email Digest,Add/Remove Recipients,Додадете / отстраните примачи
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +432,Transaction not allowed against stopped Production Order {0},Трансакцијата не е дозволено против запре производството со цел {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +437,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 +143,Join,Зачлени се
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Недостаток Количина
-apps/erpnext/erpnext/stock/doctype/item/item.py +652,Item variant {0} exists with same attributes,Постои ставка варијанта {0} со истите атрибути
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Постои ставка варијанта {0} со истите атрибути
+DocType: Leave Application,LAP/,КРУГ/
 DocType: Salary Slip,Salary 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,&quot;Да најдам &#39;е потребен
@@ -3542,12 +3591,12 @@
 DocType: Sales Invoice Item,Sales Order Item,Продај Побарувања Точка
 DocType: Salary Slip,Payment Days,Плаќање дена
 DocType: Customer,Dormant,хибернација
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +212,Warehouses with child nodes cannot be converted to ledger,Магацини со дете јазли не може да се конвертира Леџер
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +215,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: Employee Education,Employee Education,Вработен образование
-apps/erpnext/erpnext/public/js/controllers/transaction.js +866,It is needed to fetch Item Details.,Потребно е да се достигне цена Ставка Детали.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +857,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} е веќе доби
@@ -3557,14 +3606,14 @@
 DocType: Expense Claim,Total Claimed Amount,Вкупен Износ на Побарувања
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Потенцијални можности за продажба.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,Invalid {0},Неважечки {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Sick Leave,Боледување
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,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,Одделот на мало
 DocType: Warehouse,PIN,PIN
 DocType: Sales Invoice,Base Change Amount (Company Currency),База промени Износ (Фирма валута)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +313,No accounting entries for the following warehouses,Не сметководствените ставки за следните магацини
-apps/erpnext/erpnext/projects/doctype/project/project.js +102,Save the document first.,Зачувај го документот во прв план.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +314,No accounting entries for the following warehouses,Не сметководствените ставки за следните магацини
+apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Зачувај го документот во прв план.
 DocType: Account,Chargeable,Наплатени
 DocType: Company,Change Abbreviation,Промена Кратенка
 DocType: Expense Claim Detail,Expense Date,Датум на сметка
@@ -3577,10 +3626,9 @@
 DocType: Purchase Invoice,Recurring Print Format,Повторувачки печатење формат
 DocType: C-Form,Series,Серија
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,Expected Delivery Date cannot be before Purchase Order Date,Се очекува испорака датум не може да биде пред нарачка Датум
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Поставете Именување серија за {0} преку поставување&gt; Прилагодување&gt; Именување Серија
 DocType: Appraisal,Appraisal Template,Процена Шаблон
 DocType: Item Group,Item Classification,Точка Класификација
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Business Development Manager,Бизнис менаџер за развој
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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,Општи Леџер
@@ -3590,8 +3638,8 @@
 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 +940,Please select {0} first,Ве молиме изберете {0} Првиот
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +749,Batch {0} of Item {1} has expired.,Серија {0} од точка {1} е истечен.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +953,Please select {0} first,Ве молиме изберете {0} Првиот
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +757,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,субтотална
@@ -3608,8 +3656,8 @@
 {% 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 +92,Warehouse not found in the system,Магацински не се најде во системот
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +106,This Month's Summary,Резиме Овој месец
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Магацински не се најде во системот
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Резиме Овој месец
 DocType: Quality Inspection Reading,Quality Inspection Reading,Квалитет инспекција читање
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Замрзнување резерви Постарите Than` треба да биде помала од% d дена.
 DocType: Tax Rule,Purchase Tax Template,Купување Данок Шаблон
@@ -3619,21 +3667,22 @@
 DocType: Item Customer Detail,Ref Code,Реф законик
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Вработен евиденција.
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Please set Next Depreciation Date,Поставете Следна Амортизација Датум
-DocType: Payment Gateway,Payment Gateway,Исплата Портал
 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 +378,Operation Time must be greater than 0 for Operation {0},Операција на времето мора да биде поголема од 0 за операција {0}
+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/accounts/doctype/account/account.py +170,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пк (ж)
 DocType: Program,Program Abbreviation,Програмата Кратенка
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,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: Appraisal,Start Date,Датум на почеток
@@ -3649,21 +3698,22 @@
 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,Отстрани точка ако обвиненијата не се применува на таа ставка
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,На пр. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +27,Transaction currency must be same as Payment Gateway currency,Валута трансакција мора да биде иста како и за исплата портал валута
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Transaction currency must be same as Payment Gateway currency,Валута трансакција мора да биде иста како и за исплата портал валута
 DocType: Payment Entry,Receive,Добивате
+apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,цитати:
 DocType: Maintenance Visit,Fully Completed,Целосно завршен
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Целосно
 DocType: Employee,Educational Qualification,Образовните квалификации
 DocType: Workstation,Operating Costs,Оперативни трошоци
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Акција доколку акумулираните Месечен буџет пречекорување
 DocType: Purchase Invoice,Submit on creation,Достават на создавањето
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +432,Currency for {0} must be {1},Валута за {0} мора да биде {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +435,Currency for {0} must be {1},Валута за {0} мора да биде {1}
 DocType: Asset,Disposal Date,отстранување Датум
 DocType: Employee Leave Approver,Employee Leave Approver,Вработен Остави Approver
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row {0}: An Reorder entry already exists for this warehouse {1},Ред {0}: Тоа е внесување Пренареждане веќе постои за оваа магацин {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +495,Row {0}: An Reorder entry already exists for this warehouse {1},Ред {0}: Тоа е внесување Пренареждане веќе постои за оваа магацин {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +79,"Cannot declare as lost, because Quotation has been made.","Не може да се декларираат како изгубени, бидејќи цитат е направен."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Купување мајстор менаџер
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +429,Production Order {0} must be submitted,Производство на налози {0} мора да се поднесе
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +434,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,До денес не може да биде пред од денот
@@ -3673,25 +3723,27 @@
 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 +181,Totals,Вкупни вредности
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,Вкупни вредности
 DocType: BOM,Manufacturing,Производство
 ,Ordered Items To Be Delivered,Нарачани да бидат испорачани
 DocType: Account,Income,Приходи
 DocType: Industry Type,Industry Type,Индустрија Тип
 apps/erpnext/erpnext/templates/includes/cart.js +141,Something went wrong!,Нешто не беше во ред!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,Warning: Leave application contains following block dates,Предупредување: Оставете апликација ги содржи следниве датуми блок
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +120,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} за да се заврши оваа трансакција.
+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 +181,Organization unit (department) master.,Организациона единица (оддел) господар.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,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 +793,All records are synced.,Сите податоци кои се синхронизирани.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +781,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,Необезбедени кредити
 DocType: Cost Center,Cost Center Name,Чини Име центар
@@ -3710,21 +3762,20 @@
 DocType: Address,Name of person or organization that this address belongs to.,Име на лицето или организацијата која оваа адреса припаѓа.
 apps/erpnext/erpnext/public/js/setup_wizard.js +260,Your Suppliers,Вашите добавувачи
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +49,Cannot set as Lost as Sales Order is made.,Не може да се постави како изгубени како Продај Побарувања е направен.
-DocType: Student Applicant,Mother's Name,Име на мајката
 DocType: Request for Quotation Item,Supplier Part No,Добавувачот Дел Не
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +348,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',не може да се одбие кога категорија е наменета за &quot;оценка&quot; или &quot;Vaulation и вкупно&quot;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Received From,Добиени од
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Received From,Добиени од
 DocType: Lead,Converted,Конвертираната
 DocType: Item,Has Serial No,Има серија №
 DocType: Employee,Date of Issue,Датум на издавање
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: Од {0} {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +153,Row #{0}: Set Supplier for item {1},Ред # {0}: Постави Добавувачот за ставката {1}
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +93,Row {0}: Hours value must be greater than zero.,Ред {0}: часови вредност мора да биде поголема од нула.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +117,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} Не може да се најде
 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 +172,{0} {1} does not exist,{0} {1} не постои
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +175,{0} {1} does not exist,{0} {1} не постои
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,Please check Multi Currency option to allow accounts with other currency,Ве молиме проверете ја опцијата Мулти Валута да им овозможи на сметки со друга валута
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +72,Item: {0} does not exist in the system,Точка: {0} не постои во системот
 apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,Немате дозвола да го поставите Замрзнати вредност
@@ -3733,13 +3784,14 @@
 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/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,Публика не можат да бидат означени за идните датуми
 DocType: Pricing Rule,Pricing Rule Help,Цените Правило Помош
 DocType: Purchase Taxes and Charges,Account Head,Сметка на главата
 apps/erpnext/erpnext/config/stock.py +163,Update additional costs to calculate landed cost of items,Ажурирање на дополнителни трошоци за да се пресмета слета трошоците за предмети
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Electrical,Електрични
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Electrical,Електрични
 DocType: Stock Entry,Total Value Difference (Out - In),Вкупно Разлика во Вредност (Излез - Влез)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,Row {0}: Exchange Rate is mandatory,Ред {0}: курс е задолжително
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID на корисникот не е поставена за вработените {0}
@@ -3747,7 +3799,7 @@
 DocType: Item,Customer Code,Код на клиентите
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +210,Birthday Reminder for {0},Роденден Потсетник за {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Дена од денот на нарачка
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +292,Debit To account must be a Balance Sheet account,Должење на сметка мора да биде на сметка Биланс на состојба
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To account must be a Balance Sheet account,Должење на сметка мора да биде на сметка Биланс на состојба
 DocType: Buying Settings,Naming Series,Именување Серија
 DocType: Leave Block List,Leave Block List Name,Остави Забрани Листа на Име
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Акции средства
@@ -3759,11 +3811,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 +301,Salary Slip of employee {0} already created for time sheet {1},Плата фиш на вработените {0} веќе создадена за време лист {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +313,Salary Slip of employee {0} already created for time sheet {1},Плата фиш на вработените {0} веќе создадена за време лист {1}
 DocType: Sales Order Item,Ordered Qty,Нареди Количина
-apps/erpnext/erpnext/stock/doctype/item/item.py +673,Item {0} is disabled,Ставката {0} е оневозможено
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} is disabled,Ставката {0} е оневозможено
 DocType: Stock Settings,Stock Frozen Upto,Акции Замрзнати до
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +838,BOM does not contain any stock item,Бум не содржи какви било акции точка
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +809,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.,Проектна активност / задача.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Генерирање на исплатните листи
@@ -3771,23 +3823,24 @@
 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 +485,Row #{0}: Please set reorder quantity,Ред # {0}: Поставете редоследот квантитетот
+DocType: Sales Invoice Timesheet,Billing Hours,платежна часа
+apps/erpnext/erpnext/stock/doctype/item/item.py +487,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 +62,Please set {0},Ве молиме да се постави {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Повторете на Денот од месецот
 DocType: Employee,Health Details,Детали за здравство
 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,Да ги достават сите лизга плата за горе избраните критериуми
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} Теми синхронизираат
 DocType: Sales Order,Partly Delivered,Делумно Дадени
-DocType: Sales Invoice,Existing Customer,Постоен корисник
 DocType: Email Digest,Receivables,Побарувања
+DocType: Lead Source,Lead Source,доведе извор
 DocType: Customer,Additional information regarding the customer.,Дополнителни информации во врска со клиентите.
 DocType: Quality Inspection Reading,Reading 5,Читање 5
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +38,Campaign Name is required,Потребно е име на кампања
 DocType: Maintenance Visit,Maintenance Date,Датум на одржување
 DocType: Purchase Invoice Item,Rejected Serial No,Одбиени Сериски Не
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +80,Year start date or end date is overlapping with {0}. To avoid please set company,Година датум за почеток или крај датум се преклопуваат со {0}. За да се избегне молам постави компанијата
@@ -3795,10 +3848,9 @@
 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 +129,BOM and Manufacturing Quantity are required,Бум Производство и Кол се бара
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,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,Макс Сила
-DocType: Bank Reconciliation Detail,Amount,Износ
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Бум замени
 ,Sales Analytics,Продажбата анализи
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +113,Available {0},Достапно {0}
@@ -3806,14 +3858,14 @@
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Поставување Е-пошта
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +96,Please enter default currency in Company Master,Ве молиме внесете го стандардно валута во компанијата мајстор
 DocType: Stock Entry Detail,Stock Entry Detail,Акции Влегување Детална
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +100,Daily Reminders,Дневен Потсетници
+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/account/account_tree.js +23,New Account Name,Нови име на сметка
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Суровини и материјали обезбедени Цена
 DocType: Selling Settings,Settings for Selling Module,Нагодувања за модулот Продажби
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Customer Service,Услуги за Потрошувачи
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Customer Service,Услуги за Потрошувачи
 DocType: Homepage Featured Product,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,Точка Детали за корисници
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Понуда кандидат работа.
@@ -3822,8 +3874,9 @@
 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} мора да биде акции Точка
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Стандардно работа во магацин за напредокот
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1570,Total nos of serial no is not equal to quantity.,Вкупно бр на сериски Не не е еднакво на количината.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1594,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,Ажурирање Серија број
@@ -3831,9 +3884,10 @@
 DocType: Sales Order,Printing Details,Детали за печатење
 DocType: Task,Closing Date,Краен датум
 DocType: Sales Order Item,Produced Quantity,Произведената количина
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Engineer,Инженер
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Engineer,Инженер
+DocType: Journal Entry,Total Amount Currency,Вкупниот износ Валута
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Барај Под собранија
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Item Code required at Row No {0},Точка законик бара во ред Нема {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +398,Item Code required at Row No {0},Точка законик бара во ред Нема {0}
 DocType: Sales Partner,Partner Type,Тип партнер
 DocType: Purchase Taxes and Charges,Actual,Крај
 DocType: Authorization Rule,Customerwise Discount,Customerwise попуст
@@ -3849,16 +3903,18 @@
 DocType: BOM,Raw Material Cost,Суровина трошоци
 DocType: Item Reorder,Re-Order Level,Повторно да Ниво
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Внесете предмети и планирани Количина за која сакате да се зголеми производството наредби или преземете суровини за анализа.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +55,Part-time,Скратено работно време
+apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,Gantt шема
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,Скратено работно време
 DocType: Employee,Applicable Holiday List,Применливи летни Листа
 DocType: Employee,Cheque,Чек
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Серија освежено
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +57,Series Updated,Серија освежено
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,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 +87,Clearance Date updated,Дозвола Датум ажурирани
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Успешно помири
@@ -3872,7 +3928,7 @@
 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 +513,Posting date and posting time is mandatory,Праќање пораки во денот и објавување време е задолжително
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,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.,Во Зборови ќе бидат видливи откако ќе го спаси нарачка.
@@ -3882,7 +3938,7 @@
 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/stock/doctype/stock_entry/stock_entry.py +158,Target warehouse in row {0} must be same as Production Order,Целна магацин во ред {0} мора да биде иста како цел производство
+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,Валута не може да се промени по правење записи со употреба на други валута
 DocType: Company,Round Off Account,Заокружуваат профил
@@ -3891,23 +3947,22 @@
 DocType: Customer Group,Parent Customer Group,Родител група на потрошувачи
 DocType: Purchase Invoice,Contact Email,Контакт E-mail
 DocType: Appraisal Goal,Score Earned,Резултат Заработени
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Notice Period,Отказен рок
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,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 +4,New Sales Person Name,Име на нови продажбата на лице
 DocType: Packing Slip,Gross Weight UOM,Бруто тежина на апаратот UOM
-DocType: Email Digest,Receivables / Payables,Побарувања / Обврските
 DocType: Delivery Note Item,Against Sales Invoice,Во однос на Продажна фактура
 DocType: Bin,Reserved Qty for Production,Резервирано Количина за производство
 DocType: Asset,Frequency of Depreciation (Months),Фреквенција на амортизација (месеци)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +469,Credit Account,Кредитна сметка
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Credit Account,Кредитна сметка
 DocType: Landed Cost Item,Landed Cost Item,Слета Цена Точка
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +55,Show zero values,Прикажи нула вредности
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Прикажи нула вредности
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Кол од точка добиени по производство / препакување од даден количини на суровини
 apps/erpnext/erpnext/public/js/setup_wizard.js +315,Setup a simple website for my organization,Поставување на едноставен веб-сајт за мојата организација
 DocType: Payment Reconciliation,Receivable / Payable Account,Побарувања / Платив сметка
 DocType: Delivery Note Item,Against Sales Order Item,Против Продај Побарувања Точка
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Please specify Attribute Value for attribute {0},Ве молиме наведете Атрибут Вредноста за атрибутот {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Ве молиме наведете Атрибут Вредноста за атрибутот {0}
 DocType: Item,Default Warehouse,Стандардно Магацински
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +39,Budget cannot be assigned against Group Account {0},Буџетот не може да биде доделен од група на сметка {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,Ве молиме внесете цена центар родител
@@ -3929,19 +3984,22 @@
 DocType: Journal Entry,Total Debit,Вкупно Побарува
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Стандардно готови стоки Магацински
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,Продажбата на лице
-DocType: Sales Invoice,Cold Calling,Студената Повикувајќи
 DocType: SMS Parameter,SMS Parameter,SMS Параметар
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,Буџетот и трошоците центар
 DocType: Maintenance Schedule Item,Half Yearly,Половина годишно
 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 +253,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 +141,Set as Lost,Постави како изгубени
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,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 +5,This is based on transactions against this Customer. See timeline below for details,Ова е врз основа на трансакциите од овој корисник. Види времеплов подолу за детали
 DocType: Supplier,Credit Days Based On,Кредитна дена врз основа на
@@ -3953,11 +4011,10 @@
 ,Items To Be Requested,Предмети да се бара
 DocType: Purchase Order,Get Last Purchase Rate,Земете Последна Набавка стапка
 DocType: Company,Company Info,Инфо за компанијата
-apps/erpnext/erpnext/accounts/page/pos/pos.js +941,Select or add new customer,Изберете или да додадете нови клиенти
+apps/erpnext/erpnext/accounts/page/pos/pos.js +930,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 +5,This is based on the attendance of this Employee,Ова се базира на присуството на вработениот
-DocType: Sales Invoice,Frequency,Фреквенција
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +463,Debit Account,Дебитни сметка
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Debit Account,Дебитни сметка
 DocType: Fiscal Year,Year Start Date,Година започнува на Датум
 DocType: Attendance,Employee Name,Име на вработениот
 DocType: Sales Invoice,Rounded Total (Company Currency),Вкупно Заокружено (Валута на Фирма)
@@ -3966,27 +4023,27 @@
 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 +210,Supplier Quotation {0} created,Добавувачот Цитати {0} создадена
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +208,Supplier Quotation {0} created,Добавувачот Цитати {0} создадена
 apps/erpnext/erpnext/accounts/report/financial_statements.py +90,End Year cannot be before Start Year,Крајот на годината не може да биде пред почетокот на годината
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Employee Benefits,Користи за вработените
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,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 +228,Please set a default Holiday List for Employee {0} or Company {1},Поставете стандардно летни Листа за вработените {0} или куќа {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +232,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 +499,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Ред Нема {0}: Износ не може да биде поголема од До Износ против расходи Тврдат {1}. Во очекување сума е {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +500,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Ред Нема {0}: Износ не може да биде поголема од До Износ против расходи Тврдат {1}. Во очекување сума е {2}
 DocType: Maintenance Schedule,Schedule,Распоред
 DocType: Account,Parent Account,Родител профил
 DocType: Quality Inspection Reading,Reading 3,Читање 3
 ,Hub,Центар
 DocType: GL Entry,Voucher Type,Ваучер Тип
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1007,Price List not found or disabled,Ценовник не е пронајдена или со посебни потреби
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1008,Price List not found or disabled,Ценовник не е пронајдена или со посебни потреби
 DocType: Expense Claim,Approved,Одобрени
 DocType: Pricing Rule,Price,Цена
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +244,Employee relieved on {0} must be set as 'Left',Вработен ослободен на {0} мора да биде поставено како &quot;Лево&quot;
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +256,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} во дадениот период
@@ -3997,12 +4054,12 @@
 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 +259,Please select Employee Record first.,Ве молиме изберете Снимај вработените во прв план.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +266,Please select Employee Record first.,Ве молиме изберете Снимај вработените во прв план.
 DocType: POS Profile,Account for Change Amount,Сметка за промени Износ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +190,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Ред {0}: Забава / профилот не се поклопува со {1} / {2} со {3} {4}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +235,Please enter Expense Account,Ве молиме внесете сметка сметка
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,Please enter Expense Account,Ве молиме внесете сметка сметка
 DocType: Account,Stock,На акции
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,"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 +976,"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,Купување / Производство Детали за
@@ -4017,9 +4074,10 @@
 DocType: Asset Movement,Transaction Date,Датум на трансакција
 DocType: Production Plan Item,Planned Qty,Планирани Количина
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,Вкупен Данок
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,For Quantity (Manufactured Qty) is mandatory,За Кол (Произведени Количина) се задолжителни
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,For Quantity (Manufactured Qty) is mandatory,За Кол (Произведени Количина) се задолжителни
 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 +78,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,Старт на проектот Датум
@@ -4034,9 +4092,11 @@
 DocType: Warranty Claim,If different than customer address,Ако се разликува од клиент адреса
 DocType: BOM Operation,BOM Operation,Бум работа
 DocType: Purchase Taxes and Charges,On Previous Row Amount,На претходниот ред Износ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +226,Transfer Asset,пренос на средствата;
+DocType: Student,Home Address,Домашна адреса
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +227,Transfer Asset,пренос на средствата;
 DocType: POS Profile,POS Profile,POS Профил
 apps/erpnext/erpnext/config/schools.py +33,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 +129,"Item {0} is a template, please select one of its variants","Точка {0} е шаблон, ве молиме изберете една од неговите варијанти"
 DocType: Asset,Asset Category,средства Категорија
@@ -4046,8 +4106,8 @@
 DocType: Assessment,Room,соба
 DocType: Purchase Order,Advance Paid,Однапред платени
 DocType: Item,Item Tax,Точка Данок
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +765,Material to Supplier,Материјал на Добавувачот
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +189,Excise Invoice,Акцизни Фактура
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,Material to Supplier,Материјал на Добавувачот
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,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,Тековни обврски
@@ -4057,7 +4117,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,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 +136,Credit Card,Со кредитна картичка
+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.,Стандардните поставувања за акциите трансакции.
 DocType: Purchase Invoice,Next Date,Следниот датум
@@ -4065,6 +4125,7 @@
 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: Academic Term,Term End Date,Терминот Датум на завршување
 DocType: Hub Settings,Seller Name,Продавачот Име
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Даноци и такси одзема (Фирма валута)
 DocType: Item Group,General Settings,Општи поставки
@@ -4076,7 +4137,7 @@
 DocType: Customer,Commission Rate,Комисијата стапка
 apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,Направи Варијанта
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Апликации одмор блок од страна на одделот.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +115,"Payment Type must be one of Receive, Pay and Internal Transfer","Тип на плаќање мора да биде еден од примање, Плати и внатрешен трансфер"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +118,"Payment Type must be one of Receive, Pay and Internal Transfer","Тип на плаќање мора да биде еден од примање, Плати и внатрешен трансфер"
 apps/erpnext/erpnext/config/selling.py +169,Analytics,анализатор
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Кошничка е празна
 DocType: Production Order,Actual Operating Cost,Крај на оперативни трошоци
@@ -4091,10 +4152,10 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,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 +92,Designer,Дизајнер
+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/accounts/doctype/purchase_invoice/purchase_invoice.py +469,Cost Center is required in row {0} in Taxes table for type {1},Цена центар е потребно во ред {0} даноци во табелата за видот {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +472,Cost Center is required in row {0} in Taxes table for type {1},Цена центар е потребно во ред {0} даноци во табелата за видот {1}
 DocType: Program,Program Code,Code програмата
 ,Item-wise Purchase Register,Точка-мудар Набавка Регистрирај се
 DocType: Batch,Expiry Date,Датумот на истекување
@@ -4104,12 +4165,12 @@
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Господар на проектот.
 apps/erpnext/erpnext/controllers/status_updater.py +174,"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 +417, (Half Day),(Пола ден)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425, (Half Day),(Пола ден)
 DocType: Supplier,Credit Days,Кредитна дена
 DocType: Leave Type,Is Carry Forward,Е пренесување
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +740,Get Items from BOM,Се предмети од бирото
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +711,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 +549,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Ред # {0}: Праќање пораки во Датум мора да биде иста како датум на купување {1} на средства {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +552,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,Трансфер на средства од еден склад во друг
diff --git a/erpnext/translations/ml.csv b/erpnext/translations/ml.csv
index cca7841..f77107d 100644
--- a/erpnext/translations/ml.csv
+++ b/erpnext/translations/ml.csv
@@ -18,11 +18,10 @@
 DocType: Sales Partner,Dealer,ഡീലർ
 DocType: Employee,Rented,വാടകയ്ക്ക് എടുത്തത്
 DocType: Purchase Order,PO-,PO-
-apps/erpnext/erpnext/accounts/report/financial_statements.py +19,Start Year {0} not found.,ആരംഭ വർഷം {0} കണ്ടെത്തിയില്ല.
 DocType: POS Profile,Applicable for User,ഉപയോക്താവ് ബാധകമായ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +191,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","പ്രൊഡക്ഷൻ ഓർഡർ റദ്ദാക്കാൻ ആദ്യം Unstop, റദ്ദാക്കാൻ കഴിയില്ല നിർത്തി"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +197,Do you really want to scrap this asset?,ശരിക്കും ഈ അസറ്റ് മുൻസർക്കാരിന്റെ ആഗ്രഹിക്കുന്നുണ്ടോ?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +17,Select Default Supplier,സ്വതേ വിതരണക്കാരൻ തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +192,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","പ്രൊഡക്ഷൻ ഓർഡർ റദ്ദാക്കാൻ ആദ്യം Unstop, റദ്ദാക്കാൻ കഴിയില്ല നിർത്തി"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +198,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 +36,Currency is required for Price List {0},കറൻസി വില പട്ടിക {0} ആവശ്യമാണ്
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* ഇടപാടിലും കണക്കു കൂട്ടുക.
 DocType: Address,County,കൗണ്ടി
@@ -42,46 +41,45 @@
 DocType: Sales Invoice,Customer Name,ഉപഭോക്താവിന്റെ പേര്
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +126,Bank account cannot be named as {0},ബാങ്ക് അക്കൗണ്ട് {0} എന്ന് നാമകരണം ചെയ്യാൻ കഴിയില്ല
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,മേധാവികൾ (അല്ലെങ്കിൽ ഗ്രൂപ്പുകൾ) അക്കൗണ്ടിംഗ് വിഭാഗരേഖകൾ തീർത്തതു നീക്കിയിരിപ്പും സൂക്ഷിക്കുന്ന ഏത് നേരെ.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +180,Outstanding for {0} cannot be less than zero ({1}),പ്രമുഖ {0} പൂജ്യം ({1}) കുറവായിരിക്കണം കഴിയില്ല വേണ്ടി
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,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 +148,Series Updated Successfully,സീരീസ് വിജയകരമായി അപ്ഡേറ്റ്
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +149,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,എല്ലാ വിതരണക്കാരൻ കോൺടാക്റ്റ്
-DocType: Quality Inspection Reading,Parameter,പാരാമീറ്റർ
 apps/erpnext/erpnext/projects/doctype/project/project.py +54,Expected End Date can not be less than Expected Start Date,പ്രതീക്ഷിച്ച അവസാന തീയതി പ്രതീക്ഷിച്ച ആരംഭ തീയതി കുറവായിരിക്കണം കഴിയില്ല
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,വരി # {0}: {2} ({3} / {4}): റേറ്റ് {1} അതേ ആയിരിക്കണം
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +239,New Leave Application,പുതിയ അനുവാദ ആപ്ലിക്കേഷൻ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,New Leave Application,പുതിയ അനുവാദ ആപ്ലിക്കേഷൻ
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +20,Attendance Record {0} exists against Student {1} for Course Schedule {2},ഹാജർ റെക്കോർഡ് {0} സ്റ്റുഡന്റ് {1} കോഴ്സ് പട്ടിക {2} നേരെ നിലവിലുണ്ട്
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Bank Draft,ബാങ്ക് ഡ്രാഫ്റ്റ്
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,ബാങ്ക് ഡ്രാഫ്റ്റ്
 DocType: Mode of Payment Account,Mode of Payment Account,പേയ്മെന്റ് അക്കൗണ്ട് മോഡ്
 apps/erpnext/erpnext/stock/doctype/item/item.js +52,Show Variants,ഷോ രൂപഭേദങ്ങൾ
 DocType: Academic Term,Academic Term,അക്കാദമിക് ടേം
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +13,Material,മെറ്റീരിയൽ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Quantity,ക്വാണ്ടിറ്റി
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +511,Accounts table cannot be blank.,അക്കൗണ്ടുകൾ മേശ ശൂന്യമായിടരുത്.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +616,Quantity,ക്വാണ്ടിറ്റി
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +512,Accounts table cannot be blank.,അക്കൗണ്ടുകൾ മേശ ശൂന്യമായിടരുത്.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,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/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 +142,User {0} is already assigned to Employee {1},ഉപയോക്താവ് {0} ഇതിനകം എംപ്ലോയിസ് {1} നിയോഗിക്കുന്നു
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,ആരോഗ്യ പരിരക്ഷ
-DocType: Purchase Invoice,Monthly,പ്രതിമാസം
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),പേയ്മെന്റ് കാലതാമസം (ദിവസം)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +771,Invoice,വികയപതം
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +750,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 +198,Row {0}: {1} {2} does not match with {3},വരി {0}: {1} {2} {3} കൂടെ പൊരുത്തപ്പെടുന്നില്ല
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,വരി # {0}:
+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 +127,Please select Price List,വില ലിസ്റ്റ് തിരഞ്ഞെടുക്കുക
@@ -112,8 +110,8 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,ഒരേ കമ്പനി ഒന്നിലധികം തവണ നൽകുമ്പോഴുള്ള
 DocType: Employee,Married,വിവാഹിത
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},{0} അനുവദനീയമല്ല
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +589,Get items from,നിന്ന് ഇനങ്ങൾ നേടുക
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +382,Stock cannot be updated against Delivery Note {0},ഓഹരി ഡെലിവറി നോട്ട് {0} നേരെ അപ്ഡേറ്റ് ചെയ്യാൻ സാധിക്കില്ല
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,നിന്ന് ഇനങ്ങൾ നേടുക
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,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,പലചരക്ക്
@@ -122,7 +120,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 ഉണ്ടെങ്കിൽ മാസം ഉടനീളം ബജറ്റ് / target വിതരണം സഹായിക്കുന്നു.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +156,Salary Structure Missing,ശമ്പള ഘടന കാണാതായ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Salary Structure Missing,ശമ്പള ഘടന കാണാതായ
 DocType: Lead,Person Name,വ്യക്തി നാമം
 DocType: Sales Invoice Item,Sales Invoice Item,സെയിൽസ് ഇൻവോയിസ് ഇനം
 DocType: Account,Credit,ക്രെഡിറ്റ്
@@ -130,10 +128,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 +156,Credit limit has been crossed for customer {0} {1}/{2},ക്രെഡിറ്റ് പരിധി {1} / {2} {0} ഉപഭോക്താവിന് മുറിച്ചുകടന്നു ചെയ്തു
-apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;ഫിക്സ്ഡ് സ്വത്ത്&quot; അസറ്റ് റെക്കോർഡ് ഇനം നേരെ നിലവിലുള്ളതിനാൽ, അൺചെക്കുചെയ്തു പാടില്ല"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +189,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; അസറ്റ് റെക്കോർഡ് ഇനം നേരെ നിലവിലുള്ളതിനാൽ, അൺചെക്കുചെയ്തു പാടില്ല"
 DocType: Tax Rule,Tax Type,നികുതി തരം
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +144,You are not authorized to add or update entries before {0},നിങ്ങൾ {0} മുമ്പായി എൻട്രികൾ ചേർക്കാൻ അല്ലെങ്കിൽ അപ്ഡേറ്റ് ചെയ്യാൻ അധികാരമില്ല
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},നിങ്ങൾ {0} മുമ്പായി എൻട്രികൾ ചേർക്കാൻ അല്ലെങ്കിൽ അപ്ഡേറ്റ് ചെയ്യാൻ അധികാരമില്ല
 DocType: Item,Item Image (if not slideshow),ഇനം ഇമേജ് (അതില് അല്ല എങ്കിൽ)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,ഒരു കസ്റ്റമർ സമാന പേരിൽ നിലവിലുണ്ട്
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(അന്ത്യസമയം റേറ്റ് / 60) * യഥാർത്ഥ ഓപ്പറേഷൻ സമയം
@@ -143,18 +142,17 @@
 DocType: Student Log,Student Log,സ്റ്റുഡന്റ് ലോഗ്
 DocType: Quality Inspection,Get Specification Details,സ്പെസിഫിക്കേഷൻ വിശദാംശങ്ങൾ നേടുക
 DocType: Lead,Interested,താല്പര്യം
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +165,Opening,തുറക്കുന്നു
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,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/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,കസ്റ്റമർ&gt; ഉപഭോക്തൃ ഗ്രൂപ്പ്&gt; ടെറിട്ടറി
 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.,നിലവിലുള്ള ഇടപാട് ഉപയോഗിച്ച് അക്കൗണ്ട് ഗ്രൂപ്പ് പരിവർത്തനം ചെയ്യാൻ കഴിയില്ല.
 DocType: Lead,Product Enquiry,ഉൽപ്പന്ന അറിയുവാനുള്ള
 DocType: Academic Term,Schools,സ്കൂളുകൾ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,ആദ്യം കമ്പനി നൽകുക
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Company first,കമ്പനി ആദ്യം തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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,മൊത്തം ചെലവ്
@@ -164,7 +162,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,അക്കൗണ്ട് പ്രസ്താവന
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,ഫാർമസ്യൂട്ടിക്കൽസ്
 DocType: Purchase Invoice Item,Is Fixed Asset,ഫിക്സ്ഡ് സ്വത്ത്
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Available qty is {0}, you need {1}","ലഭ്യമായ അളവ് {0}, നിങ്ങൾ വേണമെങ്കിൽ {1} ആണ്"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +225,"Available qty is {0}, you need {1}","ലഭ്യമായ അളവ് {0}, നിങ്ങൾ വേണമെങ്കിൽ {1} ആണ്"
 DocType: Expense Claim Detail,Claim Amount,ക്ലെയിം തുക
 DocType: Employee,Mr,മിസ്റ്റർ
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,വിതരണക്കമ്പനിയായ ടൈപ്പ് / വിതരണക്കാരൻ
@@ -173,25 +171,26 @@
 DocType: Employee,B-,ലോകോത്തര
 DocType: Upload Attendance,Import Log,ഇറക്കുമതി പ്രവർത്തനരേഖ
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,മുകളിൽ മാനദണ്ഡങ്ങൾ അടിസ്ഥാനമാക്കി തരം ഉത്പാദനം ഭൗതിക അഭ്യർത്ഥന വലിക്കുക
+DocType: Assessment Result,Grade,പദവി
 DocType: Sales Invoice Item,Delivered By Supplier,വിതരണക്കാരൻ രക്ഷപ്പെടുത്തി
 DocType: SMS Center,All Contact,എല്ലാ കോൺടാക്റ്റ്
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Annual Salary,വാർഷിക ശമ്പളം
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,സ്റ്റോക്ക് ചെലവുകൾ
-apps/erpnext/erpnext/accounts/report/financial_statements.py +22,End Year {0} not found.,അവസാനിക്കുന്ന വർഷം {0} കണ്ടെത്തിയില്ല.
 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} ലഭിച്ചത് അളവ് തുല്യമോ ആയിരിക്കണം നിരസിച്ചു
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,വാങ്ങൽ വേണ്ടി സപ്ലൈ അസംസ്കൃത വസ്തുക്കൾ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +130,At least one mode of payment is required for POS invoice.,പേയ്മെന്റ് കുറഞ്ഞത് ഒരു മോഡ് POS ൽ ഇൻവോയ്സ് ആവശ്യമാണ്.
 DocType: Products Settings,Show Products as a List,ഒരു പട്ടിക ഉൽപ്പന്നങ്ങൾ കാണിക്കുക
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","ഫലകം ഡൗൺലോഡ്, ഉചിതമായ ഡാറ്റ പൂരിപ്പിക്കുക പ്രമാണത്തെ കൂട്ടിച്ചേർക്കുക. തിരഞ്ഞെടുത്ത കാലയളവിൽ എല്ലാ തീയതി ജീവനക്കാരൻ കോമ്പിനേഷൻ നിലവിലുള്ള ഹാജർ രേഖകളുമായി, ടെംപ്ലേറ്റ് വരും"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +451,Item {0} is not active or end of life has been reached,ഇനം {0} സജീവ അല്ലെങ്കിൽ ജീവിതാവസാനം അല്ല എത്തികഴിഞ്ഞു
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +456,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/controllers/accounts_controller.py +614,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","നികുതി ഉൾപ്പെടുത്തുന്നതിനായി നിരയിൽ {0} ഇനം നിരക്ക്, വരികൾ {1} ലെ നികുതികൾ കൂടി ഉൾപ്പെടുത്തും വേണം"
+apps/erpnext/erpnext/controllers/accounts_controller.py +617,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","നികുതി ഉൾപ്പെടുത്തുന്നതിനായി നിരയിൽ {0} ഇനം നിരക്ക്, വരികൾ {1} ലെ നികുതികൾ കൂടി ഉൾപ്പെടുത്തും വേണം"
 apps/erpnext/erpnext/config/hr.py +166,Settings for HR Module,എച്ച് മൊഡ്യൂൾ വേണ്ടി ക്രമീകരണങ്ങൾ
 DocType: SMS Center,SMS Center,എസ്എംഎസ് കേന്ദ്രം
 DocType: Sales Invoice,Change Amount,തുക മാറ്റുക
@@ -203,13 +202,13 @@
 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 +147,Execution,വധശിക്ഷയുടെ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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,ഇനങ്ങൾ ഉള്ളവയും
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},ആകെ മണിക്കൂർ: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},തീയതി നിന്നും സാമ്പത്തിക വർഷത്തെ ആയിരിക്കണം. ഈ തീയതി മുതൽ കരുതുന്നു = {0}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,Cost Center {0} does not belong to Company {1},കേന്ദ്രം {0} കോസ്റ്റ് കമ്പനി {1} സ്വന്തമല്ല
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +100,Cost Center {0} does not belong to Company {1},കേന്ദ്രം {0} കോസ്റ്റ് കമ്പനി {1} സ്വന്തമല്ല
 DocType: Customer,Individual,വ്യക്തിഗത
 DocType: Interest,Academics User,അക്കാദമിക ഉപയോക്താവ്
 DocType: Cheque Print Template,Amount In Figure,ചിത്രം തുക
@@ -225,30 +224,32 @@
 DocType: Production Planning Tool,Sales Orders,സെയിൽസ് ഉത്തരവുകൾ
 DocType: Purchase Taxes and Charges,Valuation,വിലമതിക്കല്
 ,Purchase Order Trends,ഓർഡർ ട്രെൻഡുകൾ വാങ്ങുക
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,The request for quotation can be accessed by clicking on the following link,ഉദ്ധരണി അഭ്യർത്ഥന ഇനിപ്പറയുന്ന ലിങ്കിൽ ക്ലിക്കുചെയ്ത് ആക്സസ് ചെയ്യാം
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,വർഷം ഇല മതി.
 DocType: SG Creation Tool Course,SG Creation Tool Course,എസ്.ജി ക്രിയേഷൻ ടൂൾ കോഴ്സ്
 DocType: Student Group Creation Tool,Leave blank if you wish to fetch all courses for selected academic term,നിങ്ങൾ തിരഞ്ഞെടുത്ത അക്കാദമിക് കാലാവധി എല്ലാ കോഴ്സുകൾ ലഭ്യമാക്കാൻ ആഗ്രഹിക്കുന്നെങ്കിൽ ശൂന്യമായിടൂ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,Insufficient Stock,അപര്യാപ്തമായ സ്റ്റോക്ക്
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227,Insufficient Stock,അപര്യാപ്തമായ സ്റ്റോക്ക്
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,ശേഷി ആസൂത്രണ സമയം ട്രാക്കിംഗ് പ്രവർത്തനരഹിതമാക്കുക
+DocType: Email Digest,New Sales Orders,പുതിയ സെയിൽസ് ഓർഡറുകൾ
 DocType: Bank Reconciliation,Bank Account,ബാങ്ക് അക്കൗണ്ട്
 DocType: Leave Type,Allow Negative Balance,നെഗറ്റീവ് ബാലൻസ് അനുവദിക്കുക
 DocType: Selling Settings,Default Territory,സ്ഥിരസ്ഥിതി ടെറിട്ടറി
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,ടെലിവിഷൻ
 DocType: Production Order Operation,Updated via 'Time Log',&#39;ടൈം ലോഗ്&#39; വഴി അപ്ഡേറ്റ്
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} does not belong to Company {1},അക്കൗണ്ട് {0} കമ്പനി {1} സ്വന്തമല്ല
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +86,Account {0} does not belong to Company {1},അക്കൗണ്ട് {0} കമ്പനി {1} സ്വന്തമല്ല
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},അഡ്വാൻസ് തുക {0} {1} ശ്രേഷ്ഠ പാടില്ല
 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 +174,For Warehouse is required before Submit,വെയർഹൗസ് ആവശ്യമാണ് എന്ന മുമ്പ് സമർപ്പിക്കുക
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,For Warehouse is required before Submit,വെയർഹൗസ് ആവശ്യമാണ് എന്ന മുമ്പ് സമർപ്പിക്കുക
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,ഏറ്റുവാങ്ങിയത്
 DocType: Sales Partner,Reseller,റീസെല്ലറിൽ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,കമ്പനി നൽകുക
 DocType: Delivery Note Item,Against Sales Invoice Item,സെയിൽസ് ഇൻവോയിസ് ഇനം എഗെൻസ്റ്റ്
 ,Production Orders in Progress,പുരോഗതിയിലാണ് പ്രൊഡക്ഷൻ ഉത്തരവുകൾ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Cash from Financing,ഫിനാൻസിംഗ് നിന്നുള്ള നെറ്റ് ക്യാഷ്
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1436,"LocalStorage is full , did not save","LocalStorage രക്ഷിച്ചില്ല, നിറഞ്ഞിരിക്കുന്നു"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1460,"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} സൃഷ്ടിക്കപ്പെടും
@@ -261,18 +262,19 @@
 apps/erpnext/erpnext/templates/generators/item.html +78,No description given,വിവരണം നൽകിയിട്ടില്ല
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,വാങ്ങിയതിന് അഭ്യർത്ഥന.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +5,This is based on the Time Sheets created against this project,ഇത് ഈ പദ്ധതി നേരെ സൃഷ്ടിച്ച സമയം ഷീറ്റുകൾ അടിസ്ഥാനമാക്കിയുള്ളതാണ്
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Only the selected Leave Approver can submit this Leave Application,മാത്രം തിരഞ്ഞെടുത്ത അനുവാദ Approver ഈ അനുവാദ ആപ്ലിക്കേഷൻ സമർപ്പിക്കാം
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +213,Only the selected Leave Approver can submit this Leave Application,മാത്രം തിരഞ്ഞെടുത്ത അനുവാദ Approver ഈ അനുവാദ ആപ്ലിക്കേഷൻ സമർപ്പിക്കാം
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,തീയതി വിടുതൽ ചേരുന്നു തീയതി വലുതായിരിക്കണം
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Leaves per Year,പ്രതിവർഷം ഇലകൾ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,പ്രതിവർഷം ഇലകൾ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,വരി {0}: ഈ അഡ്വാൻസ് എൻട്രി ആണ് എങ്കിൽ {1} അക്കൗണ്ട് നേരെ &#39;അഡ്വാൻസ് തന്നെയല്ലേ&#39; പരിശോധിക്കുക.
 apps/erpnext/erpnext/stock/utils.py +188,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,ലിറ്റർ
 DocType: Task,Total Costing Amount (via Time Sheet),ആകെ ആറെണ്ണവും തുക (ടൈം ഷീറ്റ് വഴി)
 DocType: Item Website Specification,Item Website Specification,ഇനം വെബ്സൈറ്റ് സ്പെസിഫിക്കേഷൻ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +435,Leave Blocked,വിടുക തടയപ്പെട്ട
-apps/erpnext/erpnext/stock/doctype/item/item.py +669,Item {0} has reached its end of life on {1},ഇനം {0} {1} ജീവിതം അതിന്റെ അവസാനം എത്തിയിരിക്കുന്നു
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +443,Leave Blocked,വിടുക തടയപ്പെട്ട
+apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item {0} has reached its end of life on {1},ഇനം {0} {1} ജീവിതം അതിന്റെ അവസാനം എത്തിയിരിക്കുന്നു
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +95,Bank Entries,ബാങ്ക് എൻട്രികൾ
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +83,Annual,വാർഷിക
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +86,Annual,വാർഷിക
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,ഓഹരി അനുരഞ്ജനം ഇനം
 DocType: Stock Entry,Sales Invoice No,സെയിൽസ് ഇൻവോയിസ് ഇല്ല
 DocType: Material Request Item,Min Order Qty,കുറഞ്ഞത് ഓർഡർ Qty
@@ -280,20 +282,22 @@
 DocType: Lead,Do Not Contact,ബന്ധപ്പെടുക ചെയ്യരുത്
 apps/erpnext/erpnext/public/js/setup_wizard.js +360,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 +91,Software Developer,സോഫ്റ്റ്വെയർ ഡെവലപ്പർ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,സോഫ്റ്റ്വെയർ ഡെവലപ്പർ
 DocType: Item,Minimum Order Qty,മിനിമം ഓർഡർ Qty
 DocType: Pricing Rule,Supplier Type,വിതരണക്കാരൻ തരം
 DocType: Scheduling Tool,Course Start Date,കോഴ്സ് ആരംഭ തീയതി
 DocType: Item,Publish in Hub,ഹബ് ലെ പ്രസിദ്ധീകരിക്കുക
+DocType: Student Admission,Student Admission,വിദ്യാർത്ഥിയുടെ അഡ്മിഷൻ
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is cancelled,ഇനം {0} റദ്ദാക്കി
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Material Request,മെറ്റീരിയൽ അഭ്യർത്ഥന
+apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} is cancelled,ഇനം {0} റദ്ദാക്കി
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +823,Material Request,മെറ്റീരിയൽ അഭ്യർത്ഥന
 DocType: Bank Reconciliation,Update Clearance Date,അപ്ഡേറ്റ് ക്ലിയറൻസ് തീയതി
 apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +28,Abbreviation already used for another salary component,ഇതിനകം മറ്റൊരു ശമ്പളം ഘടകത്തിന് ഉപയോഗിച്ച ചുരുക്കെഴുത്ത്
 DocType: Item,Purchase Details,വിശദാംശങ്ങൾ വാങ്ങുക
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +328,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},ഇനം {0} വാങ്ങൽ ഓർഡർ {1} ൽ &#39;അസംസ്കൃത വസ്തുക്കളുടെ നൽകിയത് മേശയിൽ കണ്ടെത്തിയില്ല
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +333,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/config/selling.py +18,Confirmed orders from Customers.,ഇടപാടുകാർ നിന്ന് സ്ഥിരീകരിച്ച ഓർഡറുകൾ.
 DocType: Purchase Receipt Item,Rejected Quantity,നിരസിച്ചു ക്വാണ്ടിറ്റി
 DocType: SMS Settings,SMS Sender Name,എസ്എംഎസ് പ്രേഷിതനാമം
@@ -309,20 +313,21 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +130,Please select Charge Type first,ചാർജ് ടൈപ്പ് ആദ്യ തിരഞ്ഞെടുക്കുക
 DocType: Student Group Student,Student Group Student,സ്റ്റുഡന്റ് ഗ്രൂപ്പ് വിദ്യാർത്ഥി
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,പുതിയ
+DocType: Email Digest,New Quotations,പുതിയ ഉദ്ധരണികൾ
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,പട്ടികയിലുള്ള ആദ്യത്തെ അനുവാദ Approver സ്വതവേയുള്ള അനുവാദ Approver സജ്ജമാക്കപ്പെടും
 DocType: Tax Rule,Shipping County,ഷിപ്പിംഗ് കൗണ്ടി
 apps/erpnext/erpnext/config/desktop.py +158,Learn,അറിയുക
 DocType: Asset,Next Depreciation Date,അടുത്ത മൂല്യത്തകർച്ച തീയതി
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,ജീവനക്കാർ ശതമാനം പ്രവർത്തനം ചെലവ്
 DocType: Accounts Settings,Settings for Accounts,അക്കൗണ്ടുകൾക്കുമുള്ള ക്രമീകരണങ്ങൾ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +626,Supplier Invoice No exists in Purchase Invoice {0},വിതരണക്കാരൻ ഇൻവോയ്സ് വാങ്ങൽ ഇൻവോയ്സ് {0} നിലവിലുണ്ട്
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +629,Supplier Invoice No exists in Purchase Invoice {0},വിതരണക്കാരൻ ഇൻവോയ്സ് വാങ്ങൽ ഇൻവോയ്സ് {0} നിലവിലുണ്ട്
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,സെയിൽസ് പേഴ്സൺ ട്രീ നിയന്ത്രിക്കുക.
 DocType: Job Applicant,Cover Letter,കവർ ലെറ്റർ
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,ക്ലിയർ നിലവിലുള്ള ചെക്കുകൾ ആൻഡ് നിക്ഷേപങ്ങൾ
 DocType: Item,Synced With Hub,ഹബ് കൂടി സമന്വയിപ്പിച്ചു
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,തെറ്റായ പാസ്വേഡ്
 DocType: Item,Variant Of,ഓഫ് വേരിയന്റ്
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,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 +86,Circular Reference Error,വൃത്താകൃതിയിലുള്ള റഫറൻസ് പിശക്
@@ -334,15 +339,16 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,ഓട്ടോമാറ്റിക് മെറ്റീരിയൽ അഭ്യർത്ഥന സൃഷ്ടിക്ക് ന് ഇമെയിൽ വഴി അറിയിക്കുക
 DocType: Journal Entry,Multi Currency,മൾട്ടി കറൻസി
 DocType: Payment Reconciliation Invoice,Invoice Type,ഇൻവോയിസ് തരം
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +806,Delivery Note,ഡെലിവറി നോട്ട്
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +800,Delivery Note,ഡെലിവറി നോട്ട്
 apps/erpnext/erpnext/config/learn.py +87,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 +233,Payment Entry has been modified after you pulled it. Please pull it again.,നിങ്ങൾ അതു കടിച്ചുകീറി ശേഷം പെയ്മെന്റ് എൻട്രി പരിഷ്ക്കരിച്ചു. വീണ്ടും തുടയ്ക്കുക ദയവായി.
+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/setup/doctype/email_digest/email_digest.py +104,Summary for this week and pending activities,ഈ ആഴ്ച തിർച്ചപ്പെടുത്താത്ത പ്രവർത്തനങ്ങൾക്കായി ചുരുക്കം
+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","കോമകളാൽ വേർതിരിച്ച ഇമെയിൽ ഐഡി നൽകുക, ഇൻവോയ്സ് പ്രത്യേക തീയതി സ്വയം മെയിൽ ചെയ്യപ്പെടും"
 DocType: Employee,Company Email,കമ്പനി ഇമെയിൽ
@@ -354,27 +360,28 @@
 apps/erpnext/erpnext/config/hr.py +186,"Employee designation (e.g. CEO, Director etc.).","ജീവനക്കാർ പദവിയും (ഉദാ സിഇഒ, ഡയറക്ടർ മുതലായവ)."
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,ഫീൽഡ് മൂല്യം &#39;ഡേ മാസം ആവർത്തിക്കുക&#39; നൽകുക
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,കസ്റ്റമർ നാണയ ഉപഭോക്താവിന്റെ അടിസ്ഥാന കറൻസി മാറ്റുമ്പോൾ തോത്
-apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},വരി # {0}: വാങ്ങൽ ഇൻവോയ്സ് നിലവിലുള്ള അസറ്റ് {1} നേരെ ഉണ്ടാക്കി കഴിയില്ല
+apps/erpnext/erpnext/controllers/accounts_controller.py +554,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},വരി # {0}: വാങ്ങൽ ഇൻവോയ്സ് നിലവിലുള്ള അസറ്റ് {1} നേരെ ഉണ്ടാക്കി കഴിയില്ല
 DocType: Item Tax,Tax Rate,നികുതി നിരക്ക്
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} ഇതിനകം കാലാവധിയിൽ എംപ്ലോയിസ് {1} അനുവദിച്ചിട്ടുണ്ട് {2} {3} വരെ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +812,Select Item,ഇനം തിരഞ്ഞെടുക്കുക
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +791,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/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,വാങ്ങൽ ഇൻവോയിസ് {0} ഇതിനകം സമർപ്പിച്ചു ആണ്
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},വരി # {0}: ബാച്ച് ഇല്ല {1} {2} അതേ ആയിരിക്കണം
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +143,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.,ഒരു ഇനത്തിന്റെ ബാച്ച് (ചീട്ടു).
 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 +342,Please see attachment,അറ്റാച്ച്മെന്റ് ദയവായി
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,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 +19,Setup Already Complete!!,ഇതിനകം പൂർത്തിയാക്കുക സെറ്റപ്പ് !!
 ,Finished Goods,ഫിനിഷ്ഡ് സാധനങ്ങളുടെ
 DocType: Delivery Note,Instructions,നിർദ്ദേശങ്ങൾ
 DocType: Quality Inspection,Inspected By,പരിശോധിച്ചത്
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,വിതരണക്കാരൻ&gt; വിതരണക്കാരൻ ഇനം
 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,ഇനങ്ങൾ ചേർക്കുക
@@ -388,29 +395,29 @@
 DocType: Currency Exchange,Currency Exchange,നാണയ വിനിമയം
 DocType: Purchase Invoice Item,Item Name,ഇനം പേര്
 DocType: Authorization Rule,Approving User  (above authorized value),(അംഗീകൃത മൂല്യം മുകളിൽ) അംഗീകരിച്ചതിന് ഉപയോക്താവ്
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,ക്രെഡിറ്റ് ബാലൻസ്
+DocType: Email Digest,Credit Balance,ക്രെഡിറ്റ് ബാലൻസ്
 DocType: Employee,Widowed,വിധവയായ
 DocType: Request for Quotation,Request for Quotation,ക്വട്ടേഷൻ അഭ്യർത്ഥന
 DocType: Salary Slip Timesheet,Working Hours,ജോലിചെയ്യുന്ന സമയം
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,നിലവിലുള്ള ഒരു പരമ്പരയിലെ തുടങ്ങുന്ന / നിലവിലെ ക്രമസംഖ്യ മാറ്റുക.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","ഒന്നിലധികം പ്രൈസിങ് നിയമങ്ങൾ വിജയം തുടരുകയാണെങ്കിൽ, ഉപയോക്താക്കൾക്ക് വൈരുദ്ധ്യം പരിഹരിക്കാൻ മാനുവലായി മുൻഗണന സജ്ജീകരിക്കാൻ ആവശ്യപ്പെട്ടു."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +736,Purchase Return,വാങ്ങൽ റിട്ടേൺ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +715,Purchase Return,വാങ്ങൽ റിട്ടേൺ
 ,Purchase Register,രജിസ്റ്റർ വാങ്ങുക
 DocType: 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 +202,{0} ({1}) must have role 'Leave Approver',{0} ({1}) പങ്ക് &#39;അനുവാദ Approver&#39; ഉണ്ടായിരിക്കണം
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,{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 +143,Reason for losing,നഷ്ടപ്പെടുമെന്നു കാരണം
-apps/erpnext/erpnext/accounts/utils.py +239,Allocated amount can not greater than unadjusted amount,പദ്ധതി തുക unadjusted തുക ശ്രേഷ്ഠ കഴിയില്ല
+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,പദ്ധതി തുക unadjusted തുക ശ്രേഷ്ഠ കഴിയില്ല
 DocType: Announcement,Receiver,റിസീവർ
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},വർക്ക്സ്റ്റേഷൻ ഹോളിഡേ പട്ടിക പ്രകാരം താഴെപ്പറയുന്ന തീയതികളിൽ അടച്ചിടുന്നു: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,അവസരങ്ങൾ
 DocType: Employee,Single,സിംഗിൾ
 DocType: Account,Cost of Goods Sold,വിറ്റ സാധനങ്ങളുടെ വില
 DocType: Purchase Invoice,Yearly,വാർഷികം
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +225,Please enter Cost Center,കോസ്റ്റ് കേന്ദ്രം നൽകുക
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,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,എക്സാമിനർ പേര്
@@ -423,26 +430,26 @@
 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,വിതരണക്കാരൻ ഇൻവോയിസ് നമ്പർ അദ്വിതീയമാണ് പരിശോധിക്കുക
 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 +102,Non Profit,നോൺ പ്രോഫിറ്റ്
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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: Stock Reconciliation Item,Do not include symbols (ex. $),ചിഹ്നങ്ങൾ (ഉദാ. $) ഉൾപ്പെടുത്തരുത്
 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 +638,Attribute {0} selected multiple times in Attributes Table,ഗുണ {0} വിശേഷണങ്ങൾ പട്ടിക ഒന്നിലധികം തവണ തെരഞ്ഞെടുത്തു
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,ഗുണ {0} വിശേഷണങ്ങൾ പട്ടിക ഒന്നിലധികം തവണ തെരഞ്ഞെടുത്തു
 DocType: HR Settings,Employee record is created using selected field. ,ജീവനക്കാർ റെക്കോർഡ് തിരഞ്ഞെടുത്ത ഫീൽഡ് ഉപയോഗിച്ച് സൃഷ്ടിക്കപ്പെട്ടിരിക്കുന്നത്.
 DocType: Sales Order,Not Applicable,ബാധകമല്ല
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,ഹോളിഡേ മാസ്റ്റർ.
 DocType: Request for Quotation Item,Required Date,ആവശ്യമായ തീയതി
 DocType: Delivery Note,Billing Address,ബില്ലിംഗ് വിലാസം
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +862,Please enter Item Code.,ഇനം കോഡ് നൽകുക.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +847,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","ചെക്കുചെയ്തെങ്കിൽ ഇതിനകം പ്രിന്റ് റേറ്റ് / പ്രിന്റ് തുക ഉൾപ്പെടുത്തിയിട്ടുണ്ട് പോലെ, നികുതി തുക പരിഗണിക്കും"
@@ -456,12 +463,12 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,സെക്യൂരിറ്റീസ് ആൻഡ് നിക്ഷേപങ്ങൾ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,അനുവദിച്ച മൊത്തം ഇലകൾ നിർബന്ധമായും
 DocType: Job Opening,Description of a Job Opening,ഒരു ഇയ്യോബ് തുറക്കുന്നു വിവരണം
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Pending activities for today,ഇന്ന് അവശേഷിക്കുന്ന പ്രവർത്തനങ്ങൾ
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,ഇന്ന് അവശേഷിക്കുന്ന പ്രവർത്തനങ്ങൾ
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,ഹാജർ റെക്കോഡ്.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,timesheet അടിസ്ഥാനമാക്കിയുള്ള പേറോളിന് ശമ്പളം ഘടകം.
 DocType: Sales Order Item,Used for Production Plan,പ്രൊഡക്ഷൻ പ്ലാൻ ഉപയോഗിച്ച
 DocType: Manufacturing Settings,Time Between Operations (in mins),(മിനിറ്റ്) ഓപ്പറേഷൻസ് നുമിടയിൽ സമയം
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +92,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} അക്കൗണ്ട് ബജറ്റ് {1} കോസ്റ്റ് സെന്റർ നേരെ {2} {3} ആണ്. ഇത് {4} വഴി കവിയുമെന്നും
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +95,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} അക്കൗണ്ട് ബജറ്റ് {1} കോസ്റ്റ് സെന്റർ നേരെ {2} {3} ആണ്. ഇത് {4} വഴി കവിയുമെന്നും
 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 ഒരേ ഇനം മാത്രമുള്ളതല്ല
@@ -469,16 +476,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +238,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 +86,Administrative Officer,അഡ്മിനിസ്ട്രേറ്റീവ് ഓഫീസർ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,അഡ്മിനിസ്ട്രേറ്റീവ് ഓഫീസർ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +23,Acutal Qty {0} / Waiting Qty {1},Acutal അളവ് {0} / കാത്തിരിപ്പ് അളവ് {1}
 DocType: Timesheet Detail,Hrs,hrs
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +319,Please select Company,കമ്പനി തിരഞ്ഞെടുക്കുക
-DocType: Stock Entry,Difference Account,വ്യത്യാസം അക്കൗണ്ട്
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +309,Please select Company,കമ്പനി തിരഞ്ഞെടുക്കുക
+DocType: Stock Entry Detail,Difference Account,വ്യത്യാസം അക്കൗണ്ട്
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,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 +398,Please enter Warehouse for which Material Request will be raised,സംഭരണശാല മെറ്റീരിയൽ അഭ്യർത്ഥന ഉയർത്തുകയും ചെയ്യുന്ന വേണ്ടി നൽകുക
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +399,Please enter Warehouse for which Material Request will be raised,സംഭരണശാല മെറ്റീരിയൽ അഭ്യർത്ഥന ഉയർത്തുകയും ചെയ്യുന്ന വേണ്ടി നൽകുക
 DocType: Production Order,Additional Operating Cost,അധിക ഓപ്പറേറ്റിംഗ് ചെലവ്
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,കോസ്മെറ്റിക്സ്
-apps/erpnext/erpnext/stock/doctype/item/item.py +530,"To merge, following properties must be same for both items","ലയിപ്പിക്കാൻ, താഴെ പറയുന്ന ആണ് ഇരു ഇനങ്ങളുടെ ഒരേ ആയിരിക്കണം"
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,"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 +28,Buy,വാങ്ങാൻ
@@ -486,7 +493,7 @@
 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 +1563,Serial no item cannot be a fraction,സീരിയൽ യാതൊരു ഇനം ഒരു അംശം കഴിയില്ല
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1587,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,മാനേജിംഗ് ചൂടുകാലമാണെന്നത്
@@ -495,13 +502,14 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Account {0} does not belong to company: {1},അക്കൗണ്ട് {0} കമ്പനി ഭാഗമല്ല: {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation already used for another company,ഇതിനകം മറ്റൊരു കമ്പനി ഉപയോഗിക്കുന്ന ചുരുക്കെഴുത്ത്
 DocType: Selling Settings,Default Customer Group,സ്ഥിരസ്ഥിതി ഉപഭോക്തൃ ഗ്രൂപ്പ്
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Supplier is required against Payable account {0},വിതരണക്കാരൻ പേയബിൾ അക്കൗണ്ട് {0} നേരെ ആവശ്യമാണ്
 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 ആയിരിക്കും കഴിയില്ല
 DocType: Production Planning Tool,Material Requirement,മെറ്റീരിയൽ ആവശ്യകതകൾ
 DocType: Company,Delete Company Transactions,കമ്പനി ഇടപാടുകൾ ഇല്ലാതാക്കുക
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +313,Reference No and Reference Date is mandatory for Bank transaction,യാതൊരു പരാമർശവുമില്ല ആൻഡ് റഫറൻസ് തീയതി ബാങ്ക് ഇടപാട് നിര്ബന്ധമാണ്
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +316,Reference No and Reference Date is mandatory for Bank transaction,യാതൊരു പരാമർശവുമില്ല ആൻഡ് റഫറൻസ് തീയതി ബാങ്ക് ഇടപാട് നിര്ബന്ധമാണ്
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,/ എഡിറ്റ് നികുതികളും ചുമത്തിയിട്ടുള്ള ചേർക്കുക
 DocType: Purchase Invoice,Supplier Invoice No,വിതരണക്കമ്പനിയായ ഇൻവോയിസ് ഇല്ല
 DocType: Territory,For reference,പരിഗണനയ്ക്കായി
@@ -512,7 +520,6 @@
 DocType: Installation Note Item,Installation Note Item,ഇന്സ്റ്റലേഷന് കുറിപ്പ് ഇനം
 DocType: Production Plan Item,Pending Qty,തീർച്ചപ്പെടുത്തിയിട്ടില്ല Qty
 DocType: Budget,Ignore,അവഗണിക്കുക
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,ഇനം കോഡ്&gt; ഇനം ഗ്രൂപ്പ്&gt; ബ്രാൻഡ്
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,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
@@ -523,11 +530,11 @@
 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/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,ഇൻവോയിസ് പട്ടികയിൽ കണ്ടെത്തിയില്ല റെക്കോർഡുകൾ
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +28,Please select Company and Party Type first,"ആദ്യം കമ്പനി, പാർട്ടി ടൈപ്പ് തിരഞ്ഞെടുക്കുക"
+apps/erpnext/erpnext/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/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 +707,Make Sales Order,സെയിൽസ് ഓർഡർ നിർമ്മിക്കുക
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +701,Make Sales Order,സെയിൽസ് ഓർഡർ നിർമ്മിക്കുക
 DocType: Project Task,Project Task,പ്രോജക്ട് ടാസ്ക്
 ,Lead Id,ലീഡ് ഐഡി
 DocType: C-Form Invoice Detail,Grand Total,ആകെ തുക
@@ -543,7 +550,8 @@
 DocType: Job Applicant,Resume Attachment,പുനരാരംഭിക്കുക അറ്റാച്ച്മെന്റ്
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,ആവർത്തിക്കുക ഇടപാടുകാർ
 DocType: Leave Control Panel,Allocate,നീക്കിവയ്ക്കുക
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +734,Sales Return,സെയിൽസ് മടങ്ങിവരവ്
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +728,Sales Return,സെയിൽസ് മടങ്ങിവരവ്
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +91,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,ശ്രദ്ധിക്കുക: നീക്കിവെച്ചത് മൊത്തം ഇല {0} കാലയളവിൽ {1} ഇതിനകം അംഗീകാരം ഇല കുറവ് പാടില്ല
 DocType: Announcement,Posted By,പോസ്റ്റ് ചെയ്തത്
 DocType: Item,Delivered by Supplier (Drop Ship),വിതരണക്കാരൻ (ഡ്രോപ്പ് കപ്പൽ) നൽകുന്ന
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,സാധ്യതയുള്ള ഉപഭോക്താക്കൾ ഡാറ്റാബേസിൽ.
@@ -552,14 +560,13 @@
 DocType: Quotation,Quotation To,ക്വട്ടേഷൻ ചെയ്യുക
 DocType: Lead,Middle Income,മിഡിൽ ആദായ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +212,Opening (Cr),തുറക്കുന്നു (CR)
-apps/erpnext/erpnext/stock/doctype/item/item.py +795,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,നിങ്ങൾ ഇതിനകം മറ്റൊരു UOM കൊണ്ട് ചില ഇടപാട് (ങ്ങൾ) നടത്തിയതിനാലോ ഇനം അളവ് സ്വതവേയുള്ള യൂണിറ്റ് {0} നേരിട്ട് മാറ്റാൻ കഴിയില്ല. നിങ്ങൾ ഒരു വ്യത്യസ്ത സ്വതേ UOM ഉപയോഗിക്കാൻ ഒരു പുതിയ ഇനം സൃഷ്ടിക്കേണ്ടതുണ്ട്.
-apps/erpnext/erpnext/accounts/utils.py +237,Allocated amount can not be negative,പദ്ധതി തുക നെഗറ്റീവ് ആയിരിക്കാൻ കഴിയില്ല
+apps/erpnext/erpnext/stock/doctype/item/item.py +797,Default Unit of Measure for Item {0} cannot be changed directly because 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,പദ്ധതി തുക നെഗറ്റീവ് ആയിരിക്കാൻ കഴിയില്ല
 DocType: Purchase Order Item,Billed Amt,വസതി ശാരീരിക
 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 +91,Reference No & Reference Date is required for {0},പരാമർശം ഇല്ല &amp; റഫറൻസ് തീയതി {0} ആവശ്യമാണ്
-DocType: Sales Invoice,Customer's Vendor,കസ്റ്റമർ ന്റെ വില്പനക്കാരന്
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Proposal Writing,Proposal എഴുത്ത്
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,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","പരിശോധിച്ചാൽ, സബ് ചുരുങ്ങി ഇനങ്ങൾ അസംസ്കൃത വസ്തുക്കൾ മെറ്റീരിയൽ അഭ്യർത്ഥനകൾ ഉൾപ്പെടുത്തും"
@@ -568,13 +575,14 @@
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,സമയം ട്രാക്കിംഗ്
 DocType: Fiscal Year Company,Fiscal Year Company,ധനകാര്യ വർഷം കമ്പനി
 DocType: Packing Slip Item,DN Detail,ഡിഎൻ വിശദാംശം
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +257,Already supplier quotation has created,ഇതിനകം വിതരണക്കമ്പനിയായ ഉദ്ധരണി സൃഷ്ടിച്ചു
 DocType: Timesheet,Billed,വസതി
 DocType: Batch,Batch Description,ബാച്ച് വിവരണം
+apps/erpnext/erpnext/accounts/utils.py +685,"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 +733,View Offline Records,കാണുക ഓഫ്ലൈൻ റെക്കോർഡ്സ്
+apps/erpnext/erpnext/accounts/page/pos/pos.js +715,View Offline Records,കാണുക ഓഫ്ലൈൻ റെക്കോർഡ്സ്
+DocType: Student,Sibling Details,സിബ്ലിംഗ് വിവരങ്ങൾ
 DocType: Employee,Reason for Resignation,രാജി കാരണം
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,പ്രകടനം യമുനയുടെ വേണ്ടി ഫലകം.
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,ഇൻവോയിസ് / ജേർണൽ എൻട്രി വിവരങ്ങൾ
@@ -588,7 +596,7 @@
 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,ഇൻവെന്ററി ലെ മൊത്തം മാറ്റം
 DocType: Employee,Passport Number,പാസ്പോർട്ട് നമ്പർ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Manager,മാനേജർ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,മാനേജർ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,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;ഗ്രൂപ്പ് സത്യം ഒന്നുതന്നെയായിരിക്കരുത്
@@ -597,10 +605,11 @@
 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 +299,Timesheet created:,Timesheet സൃഷ്ടിച്ചത്:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +715,Please set default Cash or Bank account in Mode of Payment {0},അടക്കേണ്ട രീതി {0} ൽ സ്ഥിരസ്ഥിതി ക്യാഷ് അല്ലെങ്കിൽ ബാങ്ക് അക്കൗണ്ട് സജ്ജീകരിക്കുക
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +300,Timesheet created:,Timesheet സൃഷ്ടിച്ചത്:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +772,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,പേരെഴുതുക
 DocType: Selling Settings,Customer Naming By,ഉപയോക്താക്കൾക്കായി നാമകരണ
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,ദയവായി സെറ്റപ്പ് ജീവനക്കാർ ഹ്യൂമൻ റിസോഴ്സ് ൽ സംവിധാനവും&gt; എച്ച് ക്രമീകരണങ്ങൾ
 DocType: Depreciation Schedule,Depreciation Amount,മൂല്യത്തകർച്ച തുക
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,ഗ്രൂപ്പ് പരിവർത്തനം
 DocType: Activity Cost,Activity Type,പ്രവർത്തന തരം
@@ -625,6 +634,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,തീര്ക്കുക
 DocType: Pricing Rule,Sales Manager,സെയിൽസ് മാനേജർ
 DocType: Salary Structure Employee,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,അസറ്റ് തീർപ്പ് ന് ഗെയിൻ / നഷ്ടം അക്കൗണ്ട്
@@ -639,11 +649,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +9,Pre Sales,പ്രീ സെയിൽസ്
 DocType: Purchase Receipt,Other Details,മറ്റ് വിവരങ്ങൾ
 DocType: Account,Accounts,അക്കൗണ്ടുകൾ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Marketing,മാർക്കറ്റിംഗ്
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +227,Payment Entry is already created,പേയ്മെന്റ് എൻട്രി സൃഷ്ടിക്കപ്പെടാത്ത
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,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 +538,Row #{0}: Asset {1} does not linked to Item {2},വരി # {0}: അസറ്റ് {1} ഇനം {2} ലിങ്കുചെയ്തിട്ടില്ല ഇല്ല
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +21,Preview Salary Slip,പ്രിവ്യൂ ശമ്പളം ജി
+apps/erpnext/erpnext/controllers/accounts_controller.py +541,Row #{0}: Asset {1} does not linked to Item {2},വരി # {0}: അസറ്റ് {1} ഇനം {2} ലിങ്കുചെയ്തിട്ടില്ല ഇല്ല
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +38,Preview Salary Slip,പ്രിവ്യൂ ശമ്പളം ജി
 DocType: Company,Deafult Cost Center,Deafult കോസ്റ്റ് സെന്റർ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +48,Account {0} has been entered multiple times,അക്കൗണ്ട് {0} ഒന്നിലധികം തവണ നൽകിയിട്ടുണ്ടെന്നും
 DocType: Account,Expenses Included In Valuation,മൂലധനം ഉൾപ്പെടുത്തിയിട്ടുണ്ട് ചിലവുകൾ
@@ -652,7 +662,7 @@
 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 +617,Item has variants.,ഇനം വകഭേദങ്ങളും ഉണ്ട്.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,ഇനം വകഭേദങ്ങളും ഉണ്ട്.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,ഇനം {0} കാണാനായില്ല
 DocType: Bin,Stock Value,സ്റ്റോക്ക് മൂല്യം
 apps/erpnext/erpnext/accounts/doctype/account/account.py +25,Company {0} does not exist,കമ്പനി {0} നിലവിലില്ല
@@ -672,7 +682,7 @@
 DocType: Purchase Order,Supply Raw Materials,സപ്ലൈ അസംസ്കൃത വസ്തുക്കൾ
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,അടുത്ത ഇൻവോയ്സ് സൃഷ്ടിക്കപ്പെടില്ല തീയതി. സമർപ്പിക്കുക ന് ഉത്പാദിപ്പിക്കപ്പെടുന്നത്.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,നിലവിലെ ആസ്തി
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,{0} is not a stock Item,{0} ഒരു സ്റ്റോക്ക് ഇനം അല്ല
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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 +169,Lead must be set if Opportunity is made from Lead,അവസരം ലീഡ് നിന്നും ചെയ്താൽ ലീഡ് സജ്ജമാക്കാൻ വേണം
@@ -739,26 +749,25 @@
 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 +709,No Permission,ഇല്ല അനുമതി
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +710,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; പരിശോധിക്കാൻ കഴിയുന്നില്ല
 apps/erpnext/erpnext/public/js/setup_wizard.js +298,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 +542,Row #{0}: Asset {1} must be submitted,വരി # {0}: അസറ്റ് {1} സമർപ്പിക്കേണ്ടതാണ്
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,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,ഒരു വെണ്ടർ വരെ subcontracted എങ്കിൽ
 DocType: SMS Center,All Customer Contact,എല്ലാ കസ്റ്റമർ കോൺടാക്റ്റ്
 apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,CSV വഴി സ്റ്റോക്ക് ബാലൻസ് അപ്ലോഡ് ചെയ്യുക.
 DocType: Warehouse,Tree Details,ട്രീ വിശദാംശങ്ങൾ
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,ഇപ്പോൾ അയയ്ക്കുക
 ,Support Analytics,പിന്തുണ അനലിറ്റിക്സ്
 DocType: Item,Website Warehouse,വെബ്സൈറ്റ് വെയർഹൗസ്
 DocType: Payment Reconciliation,Minimum Invoice Amount,മിനിമം ഇൻവോയിസ് തുക
 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/sales_invoice/sales_invoice.py +227,Timesheet {0} is already completed or cancelled,Timesheet {0} ഇതിനകം പൂർത്തിയായി അല്ലെങ്കിൽ റദ്ദാക്കി
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +259,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 വരെയോ ആയിരിക്കണം
@@ -774,13 +783,13 @@
 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 +229,Target Warehouse,ടാർജറ്റ് വെയർഹൗസ്
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +230,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-,STE-
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Sales Order Date,പ്രതീക്ഷിച്ച ഡെലിവറി തീയതി സെയിൽസ് ഓർഡർ തീയതി മുമ്പ് ആകാൻ പാടില്ല
 DocType: Upload Attendance,Import Attendance,ഇംപോർട്ട് ഹാജർ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,എല്ലാ ഇനം ഗ്രൂപ്പുകൾ
+apps/erpnext/erpnext/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/config/setup.py +89,Automatically compose message on submission of transactions.,യാന്ത്രികമായി ഇടപാടുകളുടെ സമർപ്പിക്കാനുള്ള സന്ദേശം എഴുതുക.
@@ -792,13 +801,15 @@
 DocType: Sales Invoice,Payment Due Date,പെയ്മെന്റ് നിശ്ചിത തീയതിയിൽ
 apps/erpnext/erpnext/stock/doctype/item/item.js +278,Item Variant {0} already exists with same attributes,ഇനം വേരിയന്റ് {0} ഇതിനകം അതേ ആട്രിബ്യൂട്ടുകളുമുള്ള നിലവിലുണ്ട്
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;തുറക്കുന്നു&#39;
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,ചെയ്യാനുള്ളത് തുറക്കുക
 DocType: Notification Control,Delivery Note Message,ഡെലിവറി നോട്ട് സന്ദേശം
 DocType: Expense Claim,Expenses,ചെലവുകൾ
 DocType: Item Variant Attribute,Item Variant Attribute,ഇനം മാറ്റമുള്ള ഗുണം
 ,Purchase Receipt Trends,വാങ്ങൽ രസീത് ട്രെൻഡുകൾ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Research & Development,ഗവേഷണവും വികസനവും
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,ഗവേഷണവും വികസനവും
 ,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,വില അല്ലെങ്കിൽ ഡിസ്ക്കൌണ്ട്
@@ -807,7 +818,7 @@
 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/controllers/accounts_controller.py +340,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","ഈ ഇൻവോയ്സ് ലെ പുരോഗതി എന്ന കടിച്ചുകീറി വേണം എങ്കിൽ പേയ്മെന്റ് എൻട്രി {0} ഓർഡർ {1} ബന്ധപ്പെടുത്തിയിരിക്കുന്നു, പരിശോധിക്കുക."
+apps/erpnext/erpnext/controllers/accounts_controller.py +343,"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,പോയിന്റ്-ഓഫ്-വില്പനയ്ക്ക്
@@ -829,12 +840,12 @@
 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 +756,Purchase Receipt,വാങ്ങൽ രസീത്
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +735,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 +167,Reference Doctype must be one of {0},പരാമർശം Doctype {0} ഒന്ന് ആയിരിക്കണം
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +282,Unable to find Time Slot in the next {0} days for Operation {1},ഓപ്പറേഷൻ {1} അടുത്ത {0} ദിവസങ്ങളിൽ സമയം സ്ലോട്ട് കണ്ടെത്താൻ കഴിഞ്ഞില്ല
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +170,Reference Doctype must be one of {0},പരാമർശം Doctype {0} ഒന്ന് ആയിരിക്കണം
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,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 +439,BOM {0} must be active,BOM ലേക്ക് {0} സജീവ ആയിരിക്കണം
@@ -845,7 +856,7 @@
 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 +214,Warehouses with existing transaction can not be converted to ledger.,നിലവിലുള്ള ഇടപാടിനെ അബദ്ധങ്ങളും ലെഡ്ജർ പരിവർത്തനം ചെയ്യാൻ കഴിയില്ല.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +217,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,പ്രൊഡക്ഷൻ ഓർഡറുകൾ
@@ -859,9 +870,9 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,ജീവനക്കാർ {0} സജീവമല്ല അല്ലെങ്കിൽ നിലവിലില്ല
 DocType: Fee Structure,Components,ഘടകങ്ങൾ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,Please enter Asset Category in Item {0},ദയവായി ഇനം {0} ൽ അസറ്റ് വിഭാഗം നൽകുക
-apps/erpnext/erpnext/stock/doctype/item/item.py +612,Item Variants {0} updated,ഇനം രൂപഭേദങ്ങൾ {0} നവീകരിച്ചത്
+apps/erpnext/erpnext/stock/doctype/item/item.py +614,Item Variants {0} updated,ഇനം രൂപഭേദങ്ങൾ {0} നവീകരിച്ചത്
 DocType: Quality Inspection Reading,Reading 6,6 Reading
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +843,Cannot {0} {1} {2} without any negative outstanding invoice,അല്ല {0} കഴിയുമോ {1} {2} നെഗറ്റിവ് കുടിശ്ശിക ഇൻവോയ്സ് ഇല്ലാതെ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +854,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,ഇപ്പോൾ സമന്വയിപ്പിക്കുക
@@ -876,69 +887,72 @@
 DocType: Item,Is Purchase Item,വാങ്ങൽ ഇനം തന്നെയല്ലേ
 DocType: Asset,Purchase Invoice,വാങ്ങൽ ഇൻവോയിസ്
 DocType: Stock Ledger Entry,Voucher Detail No,സാക്ഷപ്പെടുത്തല് വിശദാംശം ഇല്ല
-apps/erpnext/erpnext/accounts/page/pos/pos.js +728,New Sales Invoice,പുതിയ സെയിൽസ് ഇൻവോയ്സ്
+apps/erpnext/erpnext/accounts/page/pos/pos.js +710,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 +728,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: Cheque Print Template,Has Print Format,ഉണ്ട് പ്രിന്റ് ഫോർമാറ്റ്
-apps/erpnext/erpnext/accounts/page/pos/pos.js +86, is mandatory. Maybe Currency Exchange record is not created for ,നിർബന്ധമാണ്. ഒരുപക്ഷേ കറൻസി എക്സ്ചേഞ്ച് റെക്കോഡ് സൃഷ്ടിച്ചു ചെയ്തിട്ടില്ല
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +109,Row #{0}: Please specify Serial No for Item {1},വരി # {0}: ഇനം {1} വേണ്ടി സീരിയൽ ഇല്ല വ്യക്തമാക്കുക
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +619,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","&#39;ഉൽപ്പന്ന ബണ്ടിൽ&#39; ഇനങ്ങൾ, വെയർഹൗസ്, സീരിയൽ ഇല്ല ആൻഡ് ബാച്ച് യാതൊരു &#39;പായ്ക്കിംഗ് ലിസ്റ്റ് മേശയിൽ നിന്നും പരിഗണിക്കും. സംഭരണശാല ആൻഡ് ബാച്ച് ഇല്ല ഏതെങ്കിലും &#39;ഉൽപ്പന്ന ബണ്ടിൽ&#39; ഇനത്തിനായി എല്ലാ പാക്കിംഗ് ഇനങ്ങളും ഒരേ എങ്കിൽ, ആ മൂല്യങ്ങൾ പ്രധാന ഇനം പട്ടികയിൽ നേടിയെടുക്കുകയും ചെയ്യാം, മൂല്യങ്ങൾ &#39;പാക്കിംഗ് പട്ടിക&#39; മേശയുടെ പകർത്തുന്നു."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +75, 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 +613,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing 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 +606,Supplier Invoice Date cannot be greater than Posting Date,വിതരണക്കാരൻ ഇൻവോയ്സ് തീയതി തീയതി നോട്സ് ശ്രേഷ്ഠ പാടില്ല
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +609,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: 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 +810,Select Item for Transfer,ട്രാൻസ്ഫർ വേണ്ടി ഇനം തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +789,Select Item for Transfer,ട്രാൻസ്ഫർ വേണ്ടി ഇനം തിരഞ്ഞെടുക്കുക
 DocType: Purchase Invoice,Additional Discount Percentage,അധിക കിഴിവും ശതമാനം
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,എല്ലാ സഹായം വീഡിയോ ലിസ്റ്റ് കാണൂ
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,ചെക്ക് സൂക്ഷിച്ചത് എവിടെ ബാങ്കിന്റെ അക്കൗണ്ട് തല തിരഞ്ഞെടുക്കുക.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,ഉപയോക്തൃ ഇടപാടുകൾ ൽ വില പട്ടിക റേറ്റ് എഡിറ്റ് ചെയ്യാൻ അനുവദിക്കുക
 DocType: Pricing Rule,Max Qty,മാക്സ് Qty
-DocType: Student Applicant,Father's Name,പിതാവിന്റെ പേര്
 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 +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,വരി {0}: / വാങ്ങൽ ഓർഡർ എപ്പോഴും മുൻകൂട്ടി എന്ന് അടയാളപ്പെടുത്തി വേണം സെയിൽസ് നേരെ പേയ്മെന്റ്
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,കെമിക്കൽ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +686,All items have already been transferred for this Production Order.,എല്ലാ ഇനങ്ങളും ഇതിനകം ഈ പ്രൊഡക്ഷൻ ഓർഡർ കൈമാറ്റം ചെയ്തു.
+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} പരിശോധിച്ച് വീണ്ടും ശ്രമിക്കുക"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +694,All items have already been transferred for this Production Order.,എല്ലാ ഇനങ്ങളും ഇതിനകം ഈ പ്രൊഡക്ഷൻ ഓർഡർ കൈമാറ്റം ചെയ്തു.
 DocType: Process Payroll,Select Payroll Year and Month,ശമ്പളപ്പട്ടിക വർഷവും മാസവും തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,Meter,മീറ്റർ
 DocType: Workstation,Electricity Cost,വൈദ്യുതി ചെലവ്
 DocType: HR Settings,Don't send Employee Birthday Reminders,എംപ്ലോയീസ് ജന്മദിന ഓർമ്മക്കുറിപ്പുകൾ അയയ്ക്കരുത്
-DocType: Opportunity,Walk In,നടപ്പാൻ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,സ്റ്റോക്ക് എൻട്രികളിൽ
 DocType: Item,Inspection Criteria,ഇൻസ്പെക്ഷൻ മാനദണ്ഡം
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,ട്രാൻസ്ഫർ
 apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,നിങ്ങളുടെ കത്ത് തലയും ലോഗോ അപ്ലോഡ്. (നിങ്ങൾക്ക് പിന്നീട് എഡിറ്റ് ചെയ്യാൻ കഴിയും).
 DocType: Timesheet Detail,Bill,ബില്
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,White,വൈറ്റ്
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date is entered as past date,അടുത്ത മൂല്യത്തകർച്ച തീയതി കഴിഞ്ഞ തീയതി നൽകിയിട്ടുള്ളതെന്ന്
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +167,White,വൈറ്റ്
 DocType: SMS Center,All Lead (Open),എല്ലാ ലീഡ് (തുറക്കുക)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +228,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),വരി {0}: അളവ് ({2} {3}) വെയർഹൗസിൽ ലെ {4} ലഭ്യമല്ല {1} ചേരുന്ന സമയത്ത് പോസ്റ്റുചെയ്യുന്നതിൽ
+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 +731,Make ,നിർമ്മിക്കുക
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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 +154,Order Type must be one of {0},ഓർഡർ ടൈപ്പ് {0} ഒന്നാണ് ആയിരിക്കണം
+apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},ഓർഡർ ടൈപ്പ് {0} ഒന്നാണ് ആയിരിക്കണം
 DocType: Lead,Next Contact Date,അടുത്തത് കോൺടാക്റ്റ് തീയതി
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Qty തുറക്കുന്നു
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +393,Please enter Account for Change Amount,ദയവായി തുക മാറ്റത്തിനായി അക്കൗണ്ട് നൽകുക
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,Please enter Account for Change Amount,ദയവായി തുക മാറ്റത്തിനായി അക്കൗണ്ട് നൽകുക
 DocType: Student Batch,Student Batch Name,വിദ്യാർത്ഥിയുടെ ബാച്ച് പേര്
 DocType: Holiday List,Holiday List Name,ഹോളിഡേ പട്ടിക പേര്
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js +8,Schedule Course,ഷെഡ്യൂൾ കോഴ്സ്
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Stock Options,സ്റ്റോക്ക് ഓപ്ഷനുകൾ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,സ്റ്റോക്ക് ഓപ്ഷനുകൾ
 DocType: Journal Entry Account,Expense Claim,ചിലവേറിയ ക്ലെയിം
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +211,Do you really want to restore this scrapped asset?,നിങ്ങൾക്ക് ശരിക്കും ഈ എന്തുതോന്നുന്നു അസറ്റ് പുനഃസ്ഥാപിക്കാൻ ആഗ്രഹിക്കുന്നുണ്ടോ?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +237,Qty for {0},{0} വേണ്ടി Qty
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +212,Do you really want to restore this scrapped asset?,നിങ്ങൾക്ക് ശരിക്കും ഈ എന്തുതോന്നുന്നു അസറ്റ് പുനഃസ്ഥാപിക്കാൻ ആഗ്രഹിക്കുന്നുണ്ടോ?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,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,ബ്ലോക്ക് പട്ടിക തീയതി വിടുക
@@ -947,9 +961,9 @@
 DocType: Company,Default Terms,സ്ഥിരസ്ഥിതി നിബന്ധനകൾ
 DocType: Packing Slip Item,Packing Slip Item,പാക്കിംഗ് ജി ഇനം
 DocType: Purchase Invoice,Cash/Bank Account,ക്യാഷ് / ബാങ്ക് അക്കൗണ്ട്
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,അളവ് അല്ലെങ്കിൽ മൂല്യം മാറ്റമൊന്നും വരുത്താതെ ഇനങ്ങളെ നീക്കംചെയ്തു.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,അളവ് അല്ലെങ്കിൽ മൂല്യം മാറ്റമൊന്നും വരുത്താതെ ഇനങ്ങളെ നീക്കംചെയ്തു.
 DocType: Delivery Note,Delivery To,ഡെലിവറി
-apps/erpnext/erpnext/stock/doctype/item/item.py +635,Attribute table is mandatory,ഗുണ മേശ നിർബന്ധമാണ്
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,ഗുണ മേശ നിർബന്ധമാണ്
 DocType: Production Planning Tool,Get Sales Orders,സെയിൽസ് ഉത്തരവുകൾ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} നെഗറ്റീവ് ആയിരിക്കാൻ കഴിയില്ല
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,ഒരു വിദ്യാർത്ഥി തിരഞ്ഞെടുക്കുക
@@ -974,7 +988,7 @@
 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,WIP വെയർഹൗസ്
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},സീരിയൽ ഇല്ല {0} {1} വരെ അറ്റകുറ്റപ്പണി കരാർ പ്രകാരം ആണ്
+apps/erpnext/erpnext/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,സംഘടനയുടെ പേര്
@@ -986,7 +1000,7 @@
 DocType: GL Entry,Against,എഗെൻസ്റ്റ്
 DocType: Item,Default Selling Cost Center,സ്ഥിരസ്ഥിതി അതേസമയം ചെലവ് കേന്ദ്രം
 DocType: Sales Partner,Implementation Partner,നടപ്പാക്കൽ പങ്കാളി
-apps/erpnext/erpnext/controllers/selling_controller.py +231,Sales Order {0} is {1},സെയിൽസ് ഓർഡർ {0} {1} ആണ്
+apps/erpnext/erpnext/controllers/selling_controller.py +232,Sales Order {0} is {1},സെയിൽസ് ഓർഡർ {0} {1} ആണ്
 DocType: Opportunity,Contact Info,ബന്ധപ്പെടുന്നതിനുള്ള വിവരം
 apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,സ്റ്റോക്ക് എൻട്രികളിൽ ഉണ്ടാക്കുന്നു
 DocType: Packing Slip,Net Weight UOM,മൊത്തം ഭാരം UOM
@@ -996,25 +1010,24 @@
 DocType: Holiday List,Get Weekly Off Dates,വീക്കിലി ഓഫാക്കുക നേടുക തീയതി
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,അവസാനിക്കുന്ന തീയതി ആരംഭിക്കുന്ന തീയതി കുറവായിരിക്കണം കഴിയില്ല
 DocType: Sales Person,Select company name first.,ആദ്യം കമ്പനിയുടെ പേര് തിരഞ്ഞെടുക്കുക.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Dr,ഡോ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Dr,ഡോ
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,ഉദ്ധരണികളും വിതരണക്കാരിൽനിന്നുമാണ് ലഭിച്ചു.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},{0} ചെയ്യുക | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,ശരാശരി പ്രായം
 DocType: 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/templates/pages/home.html +32,View All Products,എല്ലാ ഉത്പന്നങ്ങളും കാണുക
+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 +400,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,മുന്നറിയിപ്പ്: സിസ്റ്റം ഇനം {0} തുക നു ശേഷം overbilling പരിശോധിക്കില്ല {1} പൂജ്യമാണ് ലെ
+apps/erpnext/erpnext/controllers/accounts_controller.py +403,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/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,വർഷം:
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +191,{0} {1} must be submitted,{0} {1} സമർപ്പിക്കേണ്ടതാണ്
-DocType: Email Digest,Annual Expense,വാർഷിക ചിലവേറിയ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,{0} {1} must be submitted,{0} {1} സമർപ്പിക്കേണ്ടതാണ്
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +145,Quantity must be less than or equal to {0},ക്വാണ്ടിറ്റി കുറവോ {0} തുല്യമായിരിക്കണം
 DocType: SMS Center,Total Characters,ആകെ പ്രതീകങ്ങൾ
 apps/erpnext/erpnext/controllers/buying_controller.py +156,Please select BOM in BOM field for Item {0},ഇനം വേണ്ടി BOM ലേക്ക് വയലിൽ {0} BOM തിരഞ്ഞെടുക്കുക
@@ -1025,30 +1038,31 @@
 DocType: Sales Partner,Distributor,വിതരണക്കാരൻ
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,ഷോപ്പിംഗ് കാർട്ട് ഷിപ്പിംഗ് റൂൾ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +211,Production Order {0} must be cancelled before cancelling this Sales Order,പ്രൊഡക്ഷൻ ഓർഡർ {0} ഈ സെയിൽസ് ഓർഡർ റദ്ദാക്കുന്നതിൽ മുമ്പ് റദ്ദാക്കി വേണം
-apps/erpnext/erpnext/public/js/controllers/transaction.js +62,Please set 'Apply Additional Discount On',&#39;പ്രയോഗിക്കുക അഡീഷണൽ ഡിസ്കൌണ്ട്&#39; സജ്ജീകരിക്കുക
+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,റേഞ്ച് നിന്നും പരിധി വരെ കുറവ് ഉണ്ട്
 DocType: Global Defaults,Global Defaults,ആഗോള സ്ഥിരസ്ഥിതികൾ
 apps/erpnext/erpnext/projects/doctype/project/project.py +153,Project Collaboration Invitation,പ്രോജക്റ്റ് സഹകരണത്തിന് ക്ഷണം
 DocType: Salary Slip,Deductions,പൂർണമായും
+DocType: Leave Allocation,LAL/,ലാൽ /
 apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,ആരംഭ വർഷം
 DocType: Purchase Invoice,Start date of current invoice's period,നിലവിലെ ഇൻവോയ്സ് ന്റെ കാലഘട്ടത്തിലെ തീയതി ആരംഭിക്കുക
 DocType: Salary Slip,Leave Without Pay,ശമ്പള ഇല്ലാതെ വിടുക
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +327,Capacity Planning Error,ശേഷി ആസൂത്രണ പിശക്
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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 +362,Finished Item {0} must be entered for Manufacture type entry,ഫിനിഷ്ഡ് ഇനം {0} ഉൽപാദനം തരം എൻട്രി നൽകിയ വേണം
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +367,Finished Item {0} must be entered for Manufacture type entry,ഫിനിഷ്ഡ് ഇനം {0} ഉൽപാദനം തരം എൻട്രി നൽകിയ വേണം
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,തുറക്കുന്നു അക്കൗണ്ടിംഗ് ബാലൻസ്
 DocType: Sales Invoice Advance,Sales Invoice Advance,സെയിൽസ് ഇൻവോയിസ് അഡ്വാൻസ്
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +499,Nothing to request,അഭ്യർത്ഥിക്കാൻ ഒന്നുമില്ല
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +500,Nothing to request,അഭ്യർത്ഥിക്കാൻ ഒന്നുമില്ല
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',&#39;യഥാർത്ഥ ആരംഭ തീയതി&#39; &#39;യഥാർത്ഥ അവസാന തീയതി&#39; വലുതായിരിക്കും കഴിയില്ല
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Management,മാനേജ്മെന്റ്
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},ഡെബിറ്റ് അല്ലെങ്കിൽ ക്രെഡിറ്റ് തുക {0} ആവശ്യമാണ് ഒന്നുകിൽ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,മാനേജ്മെന്റ്
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +55,Either debit or credit amount is required for {0},ഡെബിറ്റ് അല്ലെങ്കിൽ ക്രെഡിറ്റ് തുക {0} ആവശ്യമാണ് ഒന്നുകിൽ
 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 +161,Blue,ബ്ലൂ
+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,ഇമെയിൽ ഐഡി സജ്ജീകരിക്കുക
@@ -1058,12 +1072,12 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +23,POS Profile {0} already created for user: {1} and company {2},POS പ്രൊഫൈൽ {0} ഇതിനകം ഉപയോക്താവിനുള്ള: {1} കമ്പനി {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM പരിവർത്തന ഫാക്ടർ
 DocType: Stock Settings,Default Item Group,സ്ഥിരസ്ഥിതി ഇനം ഗ്രൂപ്പ്
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1374,Do you really want to submit the invoice?,നിങ്ങൾ ശരിക്കും ഇൻവോയ്സ് സമർപ്പിക്കാൻ താൽപ്പര്യപ്പെടുന്നോ?
+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 +685,Cost Center For Item with Item Code ',ഇനം കോഡ് ഉപയോഗിച്ച് ഇനം വേണ്ടി ചെലവ് കേന്ദ്രം &#39;
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1526,"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 +679,Cost Center For Item with Item Code ',ഇനം കോഡ് ഉപയോഗിച്ച് ഇനം വേണ്ടി ചെലവ് കേന്ദ്രം &#39;
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1550,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","പേയ്മെന്റ് മോഡ് ക്രമീകരിച്ചിട്ടില്ല. അക്കൗണ്ട് പെയ്മെന്റിന്റെയും മോഡ് അല്ലെങ്കിൽ POS ൽ പ്രൊഫൈൽ വെച്ചിരിക്കുന്ന എന്ന്, പരിശോധിക്കുക."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,നിങ്ങളുടെ വിൽപ്പന വ്യക്തിയെ ഉപഭോക്തൃ ബന്ധപ്പെടാൻ ഈ തീയതി ഒരു ഓർമ്മപ്പെടുത്തൽ ലഭിക്കും
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,"Further accounts can be made under Groups, but entries can be made against non-Groups","കൂടുതലായ അക്കൗണ്ടുകൾ ഗ്രൂപ്പ്സ് കീഴിൽ കഴിയും, പക്ഷേ എൻട്രികൾ നോൺ-ഗ്രൂപ്പുകൾ നേരെ കഴിയും"
 DocType: Lead,Lead,ഈയം
@@ -1083,104 +1097,106 @@
 DocType: Payment Reconciliation,Unreconciled Payment Details,Unreconciled പേയ്മെന്റ് വിശദാംശങ്ങൾ
 DocType: Global Defaults,Current Fiscal Year,നടപ്പ് സാമ്പത്തിക വർഷം
 DocType: Global Defaults,Disable Rounded Total,വൃത്തത്തിലുള്ള ആകെ അപ്രാപ്തമാക്കുക
-DocType: Lead,Call,കോൾ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +417,'Entries' cannot be empty,&#39;എൻട്രികൾ&#39; ഒഴിച്ചിടാനാവില്ല
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +418,'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 +214,Fiscal Year {0} not found,സാമ്പത്തിക വർഷത്തെ {0} കണ്ടെത്തിയില്ല
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +221,Fiscal Year {0} not found,സാമ്പത്തിക വർഷത്തെ {0} കണ്ടെത്തിയില്ല
 apps/erpnext/erpnext/config/hr.py +238,Setting up Employees,എംപ്ലോയീസ് സജ്ജമാക്കുന്നു
 DocType: Sales Order,SO-,SO-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,ആദ്യം പ്രിഫിക്സ് തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Please select prefix first,ആദ്യം പ്രിഫിക്സ് തിരഞ്ഞെടുക്കുക
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Research,റിസർച്ച്
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,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 +43,Item {0} must be a non-stock item,ഇനം {0} ഒരു നോൺ-സ്റ്റോക്ക് ഇനം ആയിരിക്കണം
 DocType: Contact,User ID,യൂസർ ഐഡി
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +57,View Ledger,കാണുക ലെഡ്ജർ
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,പഴയവ
-apps/erpnext/erpnext/stock/doctype/item/item.py +504,"An Item Group exists with same name, please change the item name or rename the item group","ഒരു ഇനം ഗ്രൂപ്പ് ഇതേ പേരിലുള്ള നിലവിലുണ്ട്, ഐറ്റം പേര് മാറ്റാനോ ഐറ്റം ഗ്രൂപ്പ് പുനർനാമകരണം ദയവായി"
+apps/erpnext/erpnext/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 +437,Rest Of The World,ലോകം റെസ്റ്റ്
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,ഇനം {0} ബാച്ച് പാടില്ല
 ,Budget Variance Report,ബജറ്റ് പൊരുത്തമില്ലായ്മ റിപ്പോർട്ട്
 DocType: Salary Slip,Gross Pay,മൊത്തം വേതനം
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +90,Row {0}: Activity Type is mandatory.,വരി {0}: പ്രവർത്തന തരം നിർബന്ധമാണ്.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +114,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/public/js/controllers/stock_controller.js +40,Accounting Ledger,ലെഡ്ജർ എണ്ണുകയും
+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,നീക്കിയിരുപ്പ് സമ്പാദ്യം
 DocType: BOM Item,Item Description,ഇനത്തെ കുറിച്ചുള്ള വിശദീകരണം
+DocType: Student Sibling,Student Sibling,സ്റ്റുഡന്റ് സിബ്ലിംഗ്
 DocType: Purchase Invoice,Is Recurring,ആവർത്തക ചെയ്യുന്നുണ്ടോ
 DocType: Purchase Invoice,Supplied Items,സപ്ലൈ ഇനങ്ങൾ
 DocType: Student,STUD.,തമാശയല്ല.
 DocType: Production Order,Qty To Manufacture,നിർമ്മിക്കാനുള്ള Qty
+DocType: Email Digest,New Income,പുതിയ വരുമാന
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,വാങ്ങൽ സൈക്കിൾ ഉടനീളം ഒരേ നിരക്ക് നിലനിറുത്തുക
 DocType: Opportunity Item,Opportunity Item,ഓപ്പർച്യൂനിറ്റി ഇനം
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,താൽക്കാലിക തുറക്കുന്നു
 ,Employee Leave Balance,ജീവനക്കാരുടെ അവധി ബാലൻസ്
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +131,Balance for Account {0} must always be {1},അക്കൗണ്ട് ബാലൻസ് {0} എപ്പോഴും {1} ആയിരിക്കണം
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +175,Valuation Rate required for Item in row {0},മൂലധനം നിരക്ക് വരി {0} ൽ ഇനം ആവശ്യമാണ്
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,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,ഉദാഹരണം: കമ്പ്യൂട്ടർ സയൻസ് മാസ്റ്റേഴ്സ്
 DocType: Purchase Invoice,Rejected Warehouse,നിരസിച്ചു വെയർഹൗസ്
 DocType: GL Entry,Against Voucher,വൗച്ചർ എഗെൻസ്റ്റ്
 DocType: Item,Default Buying Cost Center,സ്ഥിരസ്ഥിതി വാങ്ങൽ ചെലവ് കേന്ദ്രം
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","ERPNext നിന്നു മികച്ച ലഭിക്കാൻ, ഞങ്ങൾ നിങ്ങൾക്ക് കുറച്ച് സമയം എടുത്തു ഈ സഹായം വീഡിയോകൾ കാണാൻ ഞങ്ങൾ ശുപാർശ."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +87, to ,വരെ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,വരെ
 DocType: Item,Lead Time in days,ദിവസങ്ങളിൽ സമയം Lead
 ,Accounts Payable Summary,അക്കൗണ്ടുകൾ അടയ്ക്കേണ്ട ചുരുക്കം
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Not authorized to edit frozen Account {0},ശീതീകരിച്ച അക്കൗണ്ട് {0} എഡിറ്റുചെയ്യാൻ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},ശീതീകരിച്ച അക്കൗണ്ട് {0} എഡിറ്റുചെയ്യാൻ
 DocType: Journal Entry,Get Outstanding Invoices,മികച്ച ഇൻവോയിസുകൾ നേടുക
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +62,Sales Order {0} is not valid,സെയിൽസ് ഓർഡർ {0} സാധുവല്ല
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,സെയിൽസ് ഓർഡർ {0} സാധുവല്ല
 apps/erpnext/erpnext/setup/doctype/company/company.py +185,"Sorry, companies cannot be merged","ക്ഷമിക്കണം, കമ്പനികൾ ലയിപ്പിക്കാൻ കഴിയില്ല"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +139,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",മൊത്തം ഇഷ്യു / ട്രാൻസ്ഫർ അളവ് {0} മെറ്റീരിയൽ അഭ്യർത്ഥനയിൽ {1} \ അഭ്യർത്ഥിച്ച അളവ് {2} ഇനം {3} വേണ്ടി ശ്രേഷ്ഠ പാടില്ല
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Small,ചെറുകിട
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,Small,ചെറുകിട
 DocType: Employee,Employee Number,ജീവനക്കാരുടെ നമ്പർ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},നേരത്തെ ഉപയോഗത്തിലുണ്ട് കേസ് ഇല്ല (കൾ). കേസ് ഇല്ല {0} മുതൽ ശ്രമിക്കുക
 ,Invoiced Amount (Exculsive Tax),Invoiced തുക (Exculsive നികുതി)
-DocType: Student Applicant,Mother's / Guardian 1 Email ID,അമ്മയുടെ / ഗാർഡിയൻ 1 ഇമെയിൽ ഐഡി
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,ഇനം 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,അക്കൗണ്ട് തല {0} സൃഷ്ടിച്ചു
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +160,Green,പച്ച
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,പച്ച
 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 +57,Contract,കരാര്
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,കരാര്
 DocType: Email Digest,Add Quote,ഉദ്ധരണി ചേർക്കുക
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +498,UOM coversion factor required for UOM: {0} in Item: {1},UOM വേണ്ടി ആവശ്യമായ UOM coversion ഘടകം: ഇനം ലെ {0}: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +503,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 +80,Row {0}: Qty is mandatory,വരി {0}: Qty നിർബന്ധമായും
+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 +737,Sync Master Data,സമന്വയം മാസ്റ്റർ ഡാറ്റ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +719,Sync Master Data,സമന്വയം മാസ്റ്റർ ഡാറ്റ
 apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,നിങ്ങളുടെ ഉല്പന്നങ്ങൾ അല്ലെങ്കിൽ സേവനങ്ങൾ
 DocType: Mode of Payment,Mode of Payment,അടക്കേണ്ട മോഡ്
 apps/erpnext/erpnext/stock/doctype/item/item.py +178,Website Image should be a public file or website URL,വെബ്സൈറ്റ് ചിത്രം ഒരു പൊതു ഫയൽ അല്ലെങ്കിൽ വെബ്സൈറ്റ് URL ആയിരിക്കണം
+DocType: Student Applicant,AP,എ.പി.
 DocType: Purchase Invoice Item,BOM,BOM ൽ
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,ഇത് ഒരു റൂട്ട് ഐറ്റം ഗ്രൂപ്പ് ആണ് എഡിറ്റ് ചെയ്യാൻ കഴിയില്ല.
+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 +345,"{0}: Employee email not found, hence email not sent","{0}: ജീവനക്കാരുടെ ഇമെയിൽ കണ്ടെത്തിയില്ല, ഇവിടെനിന്നു മെയിൽ അയച്ചിട്ടില്ല"
+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,നിങ്ങളുടെ കമ്പനി വിലാസമാണ്
 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 +118,"For {0}, only credit accounts can be linked against another debit entry",{0} മാത്രം ക്രെഡിറ്റ് അക്കൗണ്ടുകൾ മറ്റൊരു ഡെബിറ്റ് എൻട്രി നേരെ ലിങ്ക്ഡ് കഴിയും
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Delivery Note {0} is not submitted,ഡെലിവറി നോട്ട് {0} സമർപ്പിച്ചിട്ടില്ലെന്നതും
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Delivery Note {0} is not submitted,ഡെലിവറി നോട്ട് {0} സമർപ്പിച്ചിട്ടില്ലെന്നതും
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Sub-contracted Item,ഇനം {0} ഒരു സബ് കരാറിൽ ഇനം ആയിരിക്കണം
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,ക്യാപ്പിറ്റൽ ഉപകരണങ്ങൾ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","പ്രൈസിങ് റൂൾ ആദ്യം ഇനം, ഇനം ഗ്രൂപ്പ് അല്ലെങ്കിൽ ബ്രാൻഡ് ആകാം വയലിലെ &#39;പുരട്ടുക&#39; അടിസ്ഥാനമാക്കി തിരഞ്ഞെടുത്തുവെന്ന്."
 DocType: Hub Settings,Seller Website,വില്പനക്കാരന്റെ വെബ്സൈറ്റ്
 DocType: Item,ITEM-,ITEM-
-apps/erpnext/erpnext/controllers/selling_controller.py +147,Total allocated percentage for sales team should be 100,വിൽപ്പന സംഘത്തെ വേണ്ടി ആകെ നീക്കിവച്ചിരുന്നു ശതമാനം 100 ആയിരിക്കണം
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +110,Production Order status is {0},പ്രൊഡക്ഷൻ ഓർഡർ നില {0} ആണ്
+apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,വിൽപ്പന സംഘത്തെ വേണ്ടി ആകെ നീക്കിവച്ചിരുന്നു ശതമാനം 100 ആയിരിക്കണം
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},പ്രൊഡക്ഷൻ ഓർഡർ നില {0} ആണ്
 DocType: Appraisal Goal,Goal,ഗോൾ
 DocType: Sales Invoice Item,Edit Description,എഡിറ്റ് വിവരണം
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +757,For Supplier,വിതരണക്കാരൻ വേണ്ടി
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +723,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,പ്രിന്റ് ഫോർമാറ്റ് സൃഷ്ടിക്കുക
@@ -1196,10 +1212,11 @@
 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,ഗ്രേഡ് കോഡ്
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ഡൈജസ്റ്റ് ഇമെയിൽ:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +445,BOM {0} does not belong to Item {1},BOM ലേക്ക് {0} ഇനം വരെ {1} സ്വന്തമല്ല
 DocType: Sales Partner,Target Distribution,ടാർജറ്റ് വിതരണം
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1667,Deafault warehouse is required for selected item,Deafault പണ്ടകശാല തിരഞ്ഞെടുത്ത ഇനം ആവശ്യമാണ്
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Deafault warehouse is required for selected item,Deafault പണ്ടകശാല തിരഞ്ഞെടുത്ത ഇനം ആവശ്യമാണ്
 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
@@ -1208,23 +1225,23 @@
 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 +110,Hardware,ഹാര്ഡ്വെയര്
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,ഹാര്ഡ്വെയര്
 DocType: Sales Order,Recurring Upto,വരെയും ആവർത്തന
 DocType: Attendance,HR Manager,എച്ച് മാനേജർ
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,ഒരു കമ്പനി തിരഞ്ഞെടുക്കുക
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Privilege Leave,പ്രിവിലേജ് അവധി
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,പ്രിവിലേജ് അവധി
 DocType: Purchase Invoice,Supplier Invoice Date,വിതരണക്കാരൻ ഇൻവോയിസ് തീയതി
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,നിങ്ങൾ ഷോപ്പിംഗ് കാർട്ട് പ്രവർത്തനക്ഷമമാക്കേണ്ടതുണ്ട്
 DocType: Payment Entry,Writeoff,എഴുതുക
 DocType: Appraisal Template Goal,Appraisal Template Goal,അപ്രൈസൽ ഫലകം ഗോൾ
-DocType: Salary Slip,Earning,സമ്പാദിക്കാനുള്ള
+DocType: Salary Component,Earning,സമ്പാദിക്കാനുള്ള
 DocType: Purchase Invoice,Party Account Currency,പാർട്ടി അക്കൗണ്ട് കറൻസി
 ,BOM Browser,BOM ബ്രൌസർ
 DocType: Purchase Taxes and Charges,Add or Deduct,ചേർക്കുകയോ കുറയ്ക്കാവുന്നതാണ്
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,തമ്മിൽ ഓവർലാപ്പുചെയ്യുന്ന അവസ്ഥ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +171,Against Journal Entry {0} is already adjusted against some other voucher,ജേർണൽ എൻട്രി {0} എഗെൻസ്റ്റ് ഇതിനകം മറ്റ് ചില വൗച്ചർ നേരെ ക്രമീകരിക്കുന്ന
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,ജേർണൽ എൻട്രി {0} എഗെൻസ്റ്റ് ഇതിനകം മറ്റ് ചില വൗച്ചർ നേരെ ക്രമീകരിക്കുന്ന
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,ആകെ ഓർഡർ മൂല്യം
-apps/erpnext/erpnext/demo/setup_data.py +358,Food,ഭക്ഷ്യ
+apps/erpnext/erpnext/demo/setup/setup_data.py +301,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/course_schedule/course_schedule.js +103,Mark Attendence,മാർക്ക് Attendence
@@ -1258,12 +1275,12 @@
 DocType: Sales Order Item,Planned Quantity,ആസൂത്രണം ചെയ്ത ക്വാണ്ടിറ്റി
 DocType: Purchase Invoice Item,Item Tax Amount,ഇനം നികുതിയും
 DocType: Item,Maintain Stock,സ്റ്റോക്ക് നിലനിറുത്തുക
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +209,Stock Entries already created for Production Order ,ഇതിനകം പ്രൊഡക്ഷൻ ഓർഡർ സൃഷ്ടിച്ചു സ്റ്റോക്ക് എൻട്രികൾ
+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,സ്ഥിര അസറ്റ് ലെ നെറ്റ് മാറ്റുക
 DocType: Leave Control Panel,Leave blank if considered for all designations,എല്ലാ തരത്തിലുള്ള വേണ്ടി പരിഗണിക്കും എങ്കിൽ ശൂന്യമായിടൂ
-apps/erpnext/erpnext/controllers/accounts_controller.py +620,Charge of type 'Actual' in row {0} cannot be included in Item Rate,&#39;യഥാർത്ഥ&#39; തരം ചുമതലയുള്ള വരിയിലെ {0} ഇനം റേറ്റ് ഉൾപ്പെടുത്തിയിട്ടുണ്ട് ചെയ്യാൻ കഴിയില്ല
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,Max: {0},പരമാവധി: {0}
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +15,From Datetime,തീയതി-ൽ
+apps/erpnext/erpnext/controllers/accounts_controller.py +623,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 +239,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 +153,"Request for Quotation is disabled to access from portal, for more check portal settings.","ക്വട്ടേഷൻ അഭ്യർത്ഥന കൂടുതൽ ചെക്ക് പോർട്ടൽ ക്രമീകരണങ്ങൾക്കായി, പോർട്ടലിൽ നിന്നും ആക്സസ് അപ്രാപ്തമാക്കി."
@@ -1271,8 +1288,8 @@
 DocType: Sales Invoice,Shipping Address Name,ഷിപ്പിംഗ് വിലാസം പേര്
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,അക്കൗണ്ട്സ് ചാർട്ട്
 DocType: Material Request,Terms and Conditions Content,നിബന്ധനകളും വ്യവസ്ഥകളും ഉള്ളടക്കം
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +552,cannot be greater than 100,100 വലുതായിരിക്കും കഴിയില്ല
-apps/erpnext/erpnext/stock/doctype/item/item.py +680,Item {0} is not a stock Item,ഇനം {0} ഒരു സ്റ്റോക്ക് ഇനം അല്ല
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +546,cannot be greater than 100,100 വലുതായിരിക്കും കഴിയില്ല
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is not a stock Item,ഇനം {0} ഒരു സ്റ്റോക്ക് ഇനം അല്ല
 DocType: Maintenance Visit,Unscheduled,വരണേ
 DocType: Employee,Owned,ഉടമസ്ഥതയിലുള്ളത്
 DocType: Salary Detail,Depends on Leave Without Pay,ശമ്പള പുറത്തുകടക്കാൻ ആശ്രയിച്ചിരിക്കുന്നു
@@ -1286,10 +1303,9 @@
 DocType: GL Entry,GL Entry,ജി.എൽ എൻട്രി
 DocType: HR Settings,Employee Settings,ജീവനക്കാരുടെ ക്രമീകരണങ്ങൾ
 ,Batch-Wise Balance History,ബാച്ച് യുക്തിമാനും ബാലൻസ് ചരിത്രം
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,പട്ടിക ചെയ്യാനുള്ളത്
 apps/erpnext/erpnext/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 +61,Apprentice,വിദേശികൾക്ക്
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +102,Negative Quantity is not allowed,നെഗറ്റീവ് ക്വാണ്ടിറ്റി അനുവദനീയമല്ല
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,വിദേശികൾക്ക്
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +103,Negative Quantity is not allowed,നെഗറ്റീവ് ക്വാണ്ടിറ്റി അനുവദനീയമല്ല
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",നികുതി വിശദമായി ടേബിൾ സ്ടിംഗ് ഐറ്റം മാസ്റ്റർ നിന്നും പിടിച്ചു ഈ വയലിൽ സൂക്ഷിച്ചു. നികുതികളും ചാർജുകളും ഉപയോഗിച്ച
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +152,Employee cannot report to himself.,ജീവനക്കാർ തനിക്കായി റിപ്പോർട്ട് ചെയ്യാൻ കഴിയില്ല.
@@ -1310,15 +1326,14 @@
 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 +141,Source warehouse is mandatory for row {0},ഉറവിട വെയർഹൗസ് വരി {0} നിര്ബന്ധമാണ്
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +719,Packing Slip,പാക്കിംഗ് സ്ലിപ്പ്
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Source warehouse is mandatory for row {0},ഉറവിട വെയർഹൗസ് വരി {0} നിര്ബന്ധമാണ്
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +713,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/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,ഉദ്ധരണി അഭ്യർത്ഥന താഴെ ലിങ്ക് ക്ലിക്ക് ചെയ്തുകൊണ്ട് ആക്സസ് ആകാം
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,ഇംപോർട്ട് പരാജയപ്പെട്ടു!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,ഇല്ല വിലാസം ഇതുവരെ ചേർത്തു.
 DocType: Workstation Working Hour,Workstation Working Hour,വർക്ക്സ്റ്റേഷൻ ജോലി അന്ത്യസമയം
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Analyst,അനലിസ്റ്റ്
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,അനലിസ്റ്റ്
 DocType: Item,Inventory,ഇൻവെന്ററി
 DocType: Item,Sales Details,സെയിൽസ് വിശദാംശങ്ങൾ
 DocType: Quality Inspection,QI-,QI-
@@ -1326,7 +1341,7 @@
 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 +103,Government,സർക്കാർ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,സർക്കാർ
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,ഇൻസ്റ്റിറ്റ്യൂട്ട് പേര്
 apps/erpnext/erpnext/config/stock.py +289,Item Variants,ഇനം രൂപഭേദങ്ങൾ
 DocType: Company,Services,സേവനങ്ങള്
@@ -1342,6 +1357,7 @@
 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/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,നിക്ഷേപം മുതൽ ക്യാഷ് ഫ്ളോ
 DocType: Program Course,Program Course,പ്രോഗ്രാം കോഴ്സ്
@@ -1382,12 +1398,12 @@
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,റിസീവർ പട്ടിക ശൂന്യമാണ്. റിസീവർ പട്ടിക സൃഷ്ടിക്കാൻ ദയവായി
 DocType: Production Plan Sales Order,Production Plan Sales Order,പ്രൊഡക്ഷൻ പ്ലാൻ സെയിൽസ് ഓർഡർ
 DocType: Sales Partner,Sales Partner Target,സെയിൽസ് പങ്കാളി ടാർജറ്റ്
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +110,Accounting Entry for {0} can only be made in currency: {1},{1}: {0} മാത്രം കറൻസി കഴിയും കണക്കിൻറെ എൻട്രി
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},{1}: {0} മാത്രം കറൻസി കഴിയും കണക്കിൻറെ എൻട്രി
 DocType: Pricing Rule,Pricing Rule,പ്രൈസിങ് റൂൾ
 DocType: Budget,Action if Annual Budget Exceeded,ആക്ഷൻ വാർഷിക ബജറ്റ് കവിഞ്ഞു എങ്കിൽ
 apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,ഓർഡർ വാങ്ങാൻ മെറ്റീരിയൽ അഭ്യർത്ഥന
 DocType: Shopping Cart Settings,Payment Success URL,പേയ്മെന്റ് വിജയം യുആർഎൽ
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +78,Row # {0}: Returned Item {1} does not exists in {2} {3},വരി # {0}: റിട്ടേൺഡ് ഇനം {1} {2} {3} നിലവിലുണ്ട് ഇല്ല
+apps/erpnext/erpnext/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,ബാങ്ക് അനുരഞ്ജനം സ്റ്റേറ്റ്മെന്റ്
@@ -1396,40 +1412,39 @@
 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/stock/doctype/stock_entry/stock_entry.py +339,Not allowed to tranfer more {0} than {1} against Purchase Order {2},വാങ്ങൽ ഓർഡർ {2} നേരെ {1} അധികം {0} കൂടുതൽ കൈമാറണോ അനുവദിച്ചിട്ടില്ല
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +344,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 +545,Manufacturing Quantity is mandatory,ണം ക്വാണ്ടിറ്റി നിർബന്ധമാണ്
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,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 Reading
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,കമ്പനി ചെലവിൽ വേണ്ടി ക്ലെയിമുകൾ.
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +71,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 +162,Row {0}: From Time and To Time of {1} is overlapping with {2},വരി {0}: സമയവും ചെയ്യുക കുറഞ്ഞ സമയത്തിനുള്ളില് {1} {2} ഓവർലാപ്പുചെയ്യുന്നു ആണ്
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +186,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,സ്റ്റോക്ക് ബാദ്ധ്യതകളും
 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 +130,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 +137,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,മറ്റ് റിപ്പോർട്ടുകളിൽ
 DocType: Dependent Task,Dependent Task,ആശ്രിത ടാസ്ക്
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,ദയവായി സെറ്റപ്പ് ജീവനക്കാർ ഹ്യൂമൻ റിസോഴ്സ് ൽ സംവിധാനവും&gt; എച്ച് ക്രമീകരണങ്ങൾ
 apps/erpnext/erpnext/stock/doctype/item/item.py +411,Conversion factor for default Unit of Measure must be 1 in row {0},അളവു സ്വതവേയുള്ള യൂണിറ്റ് വേണ്ടി പരിവർത്തന ഘടകം വരി 1 {0} ആയിരിക്കണം
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,Leave of type {0} cannot be longer than {1},{0} ഇനി {1} അധികം ആകാൻ പാടില്ല തരത്തിലുള്ള വിടുക
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +197,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 +921,Search Item,തിരയൽ ഇനം
+apps/erpnext/erpnext/accounts/page/pos/pos.js +910,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 +546,Already completed,ഇതിനകം പൂർത്തിയായ
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +22,Payment Request already exists {0},പേയ്മെന്റ് അഭ്യർത്ഥന ഇതിനകം {0} നിലവിലുണ്ട്
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +550,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 +241,Quantity must not be more than {0},ക്വാണ്ടിറ്റി {0} അധികം പാടില്ല
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Quantity must not be more than {0},ക്വാണ്ടിറ്റി {0} അധികം പാടില്ല
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +76,Previous Financial Year is not closed,കഴിഞ്ഞ സാമ്പത്തിക വർഷം അടച്ചിട്ടില്ല
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +44,Age (Days),പ്രായം (ദിവസം)
 DocType: Quotation Item,Quotation Item,ക്വട്ടേഷൻ ഇനം
@@ -1446,7 +1461,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +221,Purchase Receipt {0} is not submitted,പർച്ചേസ് റെസീപ്റ്റ് {0} സമർപ്പിച്ചിട്ടില്ലെന്നതും
 DocType: Company,Default Payable Account,സ്ഥിരസ്ഥിതി അടയ്ക്കേണ്ട അക്കൗണ്ട്
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","മുതലായ ഷിപ്പിംഗ് നിയമങ്ങൾ, വില ലിസ്റ്റ് പോലെ ഓൺലൈൻ ഷോപ്പിംഗ് കാർട്ട് ക്രമീകരണങ്ങൾ"
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +83,{0}% Billed,ഈടാക്കൂ {0}%
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,ഈടാക്കൂ {0}%
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,നിക്ഷിപ്തം Qty
 DocType: Party Account,Party Account,പാർട്ടി അക്കൗണ്ട്
 apps/erpnext/erpnext/config/setup.py +116,Human Resources,ഹ്യൂമൻ റിസോഴ്സസ്
@@ -1458,12 +1473,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Row {0}: Advance against Supplier must be debit,വരി {0}: വിതരണക്കാരൻ നേരെ അഡ്വാൻസ് ഡെബിറ്റ് വേണം
 DocType: Company,Default Values,സ്ഥിരസ്ഥിതി മൂല്യങ്ങൾ
 DocType: Expense Claim,Total Amount Reimbursed,ആകെ തുക Reimbursed
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +22,Collect,ശേഖരിക്കുക
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,ശേഖരിക്കുക
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,Against Supplier Invoice {0} dated {1},വിതരണക്കാരൻ ഇൻവോയിസ് {0} എഗെൻസ്റ്റ് {1} dated
 DocType: Customer,Default Price List,സ്ഥിരസ്ഥിതി വില പട്ടിക
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +225,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: Payment Reconciliation,Payments,പേയ്മെൻറുകൾ
 DocType: Journal Entry,Entry Type,എൻട്രി തരം
 ,Customer Credit Balance,കസ്റ്റമർ ക്രെഡിറ്റ് ബാലൻസ്
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Payable,അടയ്ക്കേണ്ട തുക ലെ നെറ്റ് മാറ്റുക
@@ -1475,7 +1489,7 @@
 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 +9,Procurement,നിർവഹണവും
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,ഇനങ്ങളുടെ ഒന്നുമില്ല അളവിലും അല്ലെങ്കിൽ മൂല്യം എന്തെങ്കിലും മാറ്റം ഉണ്ടാകും.
+apps/erpnext/erpnext/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,വാറന്റി ക്ലെയിം
 ,Lead Details,ലീഡ് വിവരങ്ങൾ
 DocType: Purchase Invoice,End date of current invoice's period,നിലവിലെ ഇൻവോയ്സ് ന്റെ കാലയളവിൽ അന്ത്യം തീയതി
@@ -1500,7 +1514,7 @@
 DocType: Purchase Invoice,Additional Discount,അധിക ഡിസ്ക്കൌണ്ട്
 DocType: Selling Settings,Selling Settings,സജ്ജീകരണങ്ങൾ വിൽക്കുന്ന
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,ഓൺലൈൻ ലേലം
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +97,Please specify either Quantity or Valuation Rate or both,ക്വാണ്ടിറ്റി അല്ലെങ്കിൽ മൂലധനം റേറ്റ് അല്ലെങ്കിൽ രണ്ട് വ്യക്തമാക്കുക
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,ക്വാണ്ടിറ്റി അല്ലെങ്കിൽ മൂലധനം റേറ്റ് അല്ലെങ്കിൽ രണ്ട് വ്യക്തമാക്കുക
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +13,Fulfillment,നിർവ്വഹണം
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","കമ്പനി, മാസത്തെയും ധനകാര്യ വർഷം നിർബന്ധമായും"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,മാർക്കറ്റിംഗ് ചെലവുകൾ
@@ -1521,14 +1535,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,സമ്പൂർണ്ണ ERPNext സജ്ജീകരണം!
 DocType: Item,Weightage,വെയിറ്റേജ്
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +93,A Customer Group exists with same name please change the Customer name or rename the Customer Group,ഉപഭോക്താവിനെ ഗ്രൂപ്പ് സമാന പേരിൽ നിലവിലുണ്ട് കസ്റ്റമർ പേര് മാറ്റാനോ കസ്റ്റമർ ഗ്രൂപ്പ് പുനർനാമകരണം ദയവായി
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +126,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
 DocType: Stock Entry,Material Receipt,മെറ്റീരിയൽ രസീത്
 DocType: Homepage,Products,ഉൽപ്പന്നങ്ങൾ
 DocType: Announcement,Instructor,അധാപിക
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},പാർട്ടി ടൈപ്പ് പാർട്ടി സ്വീകാ / അടയ്ക്കേണ്ട അക്കൌണ്ട് ആവശ്യമാണ് {0}
 DocType: Employee,AB+,എബി +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","ഈ ഐറ്റം വകഭേദങ്ങളും ഉണ്ട് എങ്കിൽ, അത് തുടങ്ങിയവ വിൽപ്പന ഉത്തരവ് തിരഞ്ഞെടുക്കാനിടയുള്ളൂ കഴിയില്ല"
 DocType: Lead,Next Contact By,അടുത്തത് കോൺടാക്റ്റ് തന്നെയാണ
@@ -1539,7 +1552,7 @@
 ,Item-wise Sales Register,ഇനം തിരിച്ചുള്ള സെയിൽസ് രജിസ്റ്റർ
 DocType: Asset,Gross Purchase Amount,മൊത്തം വാങ്ങൽ തുക
 DocType: Asset,Depreciation Method,മൂല്യത്തകർച്ച രീതി
-apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Offline,ഓഫ്ലൈൻ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +686,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,ആവശ്യമായ
@@ -1557,25 +1570,27 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +425,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 +858,Make Purchase Order,വാങ്ങൽ ഓർഡർ നിർമ്മിക്കുക
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +852,Make Purchase Order,വാങ്ങൽ ഓർഡർ നിർമ്മിക്കുക
 DocType: SMS Center,Send To,അയക്കുക
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,There is not enough leave balance for Leave Type {0},അനുവാദ ടൈപ്പ് {0} മതി ലീവ് ബാലൻസ് ഒന്നും ഇല്ല
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,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 +172,Work-in-Progress Warehouse is required before Submit,വർക്ക്-ഇൻ-പുരോഗതി വെയർഹൗസ് മുമ്പ് സമർപ്പിക്കുക ആവശ്യമാണ്
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,Work-in-Progress Warehouse is required before Submit,വർക്ക്-ഇൻ-പുരോഗതി വെയർഹൗസ് മുമ്പ് സമർപ്പിക്കുക ആവശ്യമാണ്
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,ഒരു ജോലിക്കായി അപേക്ഷകന്.
 DocType: Purchase Order Item,Warehouse and Reference,വെയർഹൗസ് റഫറൻസ്
 DocType: Supplier,Statutory info and other general information about your Supplier,നിയമപ്രകാരമുള്ള വിവരങ്ങളും നിങ്ങളുടെ വിതരണക്കാരൻ കുറിച്ചുള്ള മറ്റ് ജനറൽ വിവരങ്ങൾ
-apps/erpnext/erpnext/hooks.py +88,Addresses,വിലാസങ്ങൾ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,വിതരണക്കാരൻ&gt; വിതരണക്കാരൻ ഇനം
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +212,Against Journal Entry {0} does not have any unmatched {1} entry,ജേർണൽ എൻട്രി {0} എഗെൻസ്റ്റ് ഏതെങ്കിലും സമാനതകളില്ലാത്ത {1} എൻട്രി ഇല്ല
+apps/erpnext/erpnext/hooks.py +95,Addresses,വിലാസങ്ങൾ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +215,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,ഇനം അപാകതയുണ്ട് അടിസ്ഥാനമാക്കി ഫിൽട്ടർ സജ്ജീകരിക്കുക
 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,എത്തിക്കേണ്ടത് ബിൽ ചെയ്യുക
@@ -1583,11 +1598,10 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} must be submitted,BOM ലേക്ക് {0} സമർപ്പിക്കേണ്ടതാണ്
 DocType: Authorization Control,Authorization Control,അംഗീകാര നിയന്ത്രണ
 apps/erpnext/erpnext/controllers/buying_controller.py +300,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},വരി # {0}: നിരസിച്ചു വെയർഹൗസ് തള്ളിക്കളഞ്ഞ ഇനം {1} നേരെ നിർബന്ധമായും
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +731,Payment,പേയ്മെന്റ്
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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: Pricing Rule,Brand,ബ്രാൻഡ്
 DocType: Course,Course Abbreviation,കോഴ്സ് സംഗ്രഹം
 DocType: Item,Will also apply for variants,കൂടാതെ മോഡലുകൾക്കാണ് ബാധകമാകും
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +142,"Asset cannot be cancelled, as it is already {0}","അത് ഇതിനകം {0} പോലെ, അസറ്റ് റദ്ദാക്കാൻ സാധിക്കില്ല"
@@ -1599,7 +1613,7 @@
 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.","നിങ്ങൾ വാങ്ങാനും വിൽക്കാനും ആ നിങ്ങളുടെ ഉൽപ്പന്നങ്ങൾ അല്ലെങ്കിൽ സേവനങ്ങൾ കാണിയ്ക്കുക. തുടങ്ങുമ്പോൾത്തന്നെ ഇനം ഗ്രൂപ്പ്, അളവിലും മറ്റ് ഉള്ള യൂണിറ്റ് പരിശോധിക്കാൻ ഉറപ്പു വരുത്തുക."
 DocType: Hub Settings,Hub Node,ഹബ് നോഡ്
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,നിങ്ങൾ ഡ്യൂപ്ലിക്കേറ്റ് ഇനങ്ങളുടെ പ്രവേശിച്ചിരിക്കുന്നു. പരിഹരിക്കാൻ വീണ്ടും ശ്രമിക്കുക.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Associate,അസോസിയേറ്റ്
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,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,റിസീവർ ലിസ്റ്റ് സൃഷ്ടിക്കുക
@@ -1607,7 +1621,7 @@
 DocType: Production Planning Tool,Material Requests,മെറ്റീരിയൽ അഭ്യർത്ഥനകൾ
 DocType: Warranty Claim,Issue Date,പുറപ്പെടുവിക്കുന്ന തീയതി
 DocType: Activity Cost,Activity Cost,പ്രവർത്തന ചെലവ്
-DocType: Timesheet Detail,Timesheet Detail,Timesheet വിശദാംശം
+DocType: Sales Invoice Timesheet,Timesheet Detail,Timesheet വിശദാംശം
 DocType: Purchase Receipt Item Supplied,Consumed Qty,ക്ഷയിച്ചിരിക്കുന്നു Qty
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,ടെലികമ്യൂണിക്കേഷൻസ്
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),(മാത്രം ഡ്രാഫ്റ്റ്) പാക്കേജ് ഈ ഡെലിവറി ഒരു ഭാഗമാണ് സൂചിപ്പിക്കുന്നു
@@ -1630,6 +1644,7 @@
 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,രൂപഭേദങ്ങൾ ഉണ്ട്
 DocType: Monthly Distribution,Name of the Monthly Distribution,പ്രതിമാസ വിതരണം പേര്
 DocType: Sales Person,Parent Sales Person,പേരന്റ്ഫോള്ഡര് സെയിൽസ് വ്യാക്തി
@@ -1642,30 +1657,31 @@
 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 +44,"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/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.,നിങ്ങൾ സെയിൽസ് ഇൻവോയിസ് ലാഭിക്കാൻ ഒരിക്കൽ വാക്കുകളിൽ ദൃശ്യമാകും.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +502,Error: {0} &gt; {1},പിശക്: {0}&gt; {1}
 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.,ടേം ആരംഭ തീയതി ഏത് പദം (അക്കാദമിക് വർഷം {}) ബന്ധിപ്പിച്ചിട്ടുള്ളാതാവനായി അക്കാദമിക വർഷത്തിന്റെ വർഷം ആരംഭിക്കുന്ന തീയതിയ്ക്ക് നേരത്തെ പാടില്ല. എൻറർ ശരിയാക്കി വീണ്ടും ശ്രമിക്കുക.
 DocType: Naming Series,Current Value,ഇപ്പോഴത്തെ മൂല്യം
-apps/erpnext/erpnext/controllers/accounts_controller.py +235,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,ഒന്നിലധികം വർഷത്തേക്ക് തീയതി {0} കണക്കേ. സാമ്പത്തിക വർഷം കമ്പനി സജ്ജീകരിക്കുക
+apps/erpnext/erpnext/controllers/accounts_controller.py +238,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 +458,Item table can not be blank,ഇനം ടേബിൾ ശൂന്യമായിരിക്കാൻ കഴിയില്ല
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +443,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 +5,This is based on stock movement. See {0} for details,ഈ സ്റ്റോക്ക് പ്രസ്ഥാനം അടിസ്ഥാനമാക്കിയുള്ളതാണ്. വിവരങ്ങൾക്ക് {0} കാണുക
 DocType: Pricing Rule,Selling,വിൽപ്പനയുള്ളത്
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +341,Amount {0} {1} deducted against {2},തുക {0} {1} {2} നേരെ കുറച്ചുകൊണ്ടിരിക്കും
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +344,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,നിശ്ചിത തീയതി തീയതി പതിച്ച മുമ്പ് ആകാൻ പാടില്ല
@@ -1680,8 +1696,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +144,Cannot refer row number greater than or equal to current row number for this Charge type,ഈ ചാർജ് തരം വേണ്ടി ശ്രേഷ്ഠ അഥവാ നിലവിലെ വരി നമ്പറിലേക്ക് തുല്യ വരി എണ്ണം റെഫർ ചെയ്യാൻ കഴിയില്ല
 DocType: Asset,Sold,വിറ്റത്
 ,Item-wise Purchase History,ഇനം തിരിച്ചുള്ള വാങ്ങൽ ചരിത്രം
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Red,റെഡ്
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},സീരിയൽ ഇല്ല കൊണ്ടുവരുവാൻ &#39;ജനറേറ്റ് ഷെഡ്യൂൾ&#39; ക്ലിക്ക് ചെയ്യുക ദയവായി ഇനം {0} വേണ്ടി ചേർത്തു
+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,ഓപ്പൺ പ്രൊഡക്ഷൻ ഓർഡറുകൾ
 DocType: Sales Invoice Payment,Base Amount (Company Currency),അടിസ്ഥാന സംഖ്യ (കമ്പനി കറൻസി)
@@ -1689,7 +1705,7 @@
 DocType: Installation Note,Installation Time,ഇന്സ്റ്റലേഷന് സമയം
 DocType: Sales Invoice,Accounting Details,അക്കൗണ്ടിംഗ് വിശദാംശങ്ങൾ
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,ഈ കമ്പനി വേണ്ടി എല്ലാ ഇടപാടുകൾ ഇല്ലാതാക്കുക
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +187,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,വരി # {0}: ഓപ്പറേഷൻ {1} പ്രൊഡക്ഷൻ ഓർഡർ # {3} ലെ പൂർത്തിയായി വസ്തുവിൽ {2} qty പൂർത്തിയായി ചെയ്തിട്ടില്ല. സമയം ലോഗുകൾ വഴി ഓപ്പറേഷൻ നില അപ്ഡേറ്റ് ചെയ്യുക
+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} പ്രൊഡക്ഷൻ ഓർഡർ # {3} ലെ പൂർത്തിയായി വസ്തുവിൽ {2} qty പൂർത്തിയായി ചെയ്തിട്ടില്ല. സമയം ലോഗുകൾ വഴി ഓപ്പറേഷൻ നില അപ്ഡേറ്റ് ചെയ്യുക
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,നിക്ഷേപങ്ങൾ
 DocType: Issue,Resolution Details,മിഴിവ് വിശദാംശങ്ങൾ
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,വിഹിതം
@@ -1725,16 +1741,17 @@
 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}
 DocType: Delivery Note,Excise Page Number,എക്സൈസ് പേജ് നമ്പർ
 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; സജ്ജമാക്കുക
 ,Maintenance Schedules,മെയിൻറനൻസ് സമയക്രമങ്ങൾ
 DocType: Task,Actual End Date (via Time Sheet),യഥാർത്ഥ അവസാന തീയതി (ടൈം ഷീറ്റ് വഴി)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Amount {0} {1} against {2} {3},തുക {0} {1} {2} {3} നേരെ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +339,Amount {0} {1} against {2} {3},തുക {0} {1} {2} {3} നേരെ
 ,Quotation Trends,ക്വട്ടേഷൻ ട്രെൻഡുകൾ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},ഐറ്റം {0} ഐറ്റം മാസ്റ്റർ പരാമർശിച്ചു അല്ല ഇനം ഗ്രൂപ്പ്
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +295,Debit To account must be a Receivable account,അക്കൗണ്ടിലേക്ക് ഡെബിറ്റ് ഒരു സ്വീകാ അക്കൗണ്ട് ആയിരിക്കണം
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Receivable account,അക്കൗണ്ടിലേക്ക് ഡെബിറ്റ് ഒരു സ്വീകാ അക്കൗണ്ട് ആയിരിക്കണം
 DocType: Shipping Rule Condition,Shipping Amount,ഷിപ്പിംഗ് തുക
 ,Pending Amount,തീർച്ചപ്പെടുത്തിയിട്ടില്ല തുക
 DocType: Purchase Invoice Item,Conversion Factor,പരിവർത്തന ഫാക്ടർ
@@ -1742,10 +1759,10 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +137,Expected value after useful life must be greater than or equal to {0},ഉപയോഗപ്രദമായ ജീവിതം ശേഷം പ്രതീക്ഷിക്കുന്ന മൂല്യം ശ്രേഷ്ഠ അല്ലെങ്കിൽ {0} തുല്യമായിരിക്കണം
 DocType: Purchase Receipt,Vehicle Number,വാഹന നമ്പർ
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,ആവർത്തന ഇൻവോയ്സ് സ്റ്റോപ്പ് ആയിരിക്കും തീയതി
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +90,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,ആകെ അലോക്കേറ്റഡ് ഇല {0} കാലയളവിലേക്ക് ഇതിനകം അംഗീകരിച്ച ഇല {1} കുറവായിരിക്കണം കഴിയില്ല
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +93,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 +22,Enter Paid Amount,തുക നൽകുക
+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 ഉപയോഗിക്കുക
@@ -1755,13 +1772,15 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,Timesheets
 DocType: HR Settings,HR Settings,എച്ച് ക്രമീകരണങ്ങൾ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Expense Claim is pending approval. Only the Expense Approver can update status.,ചിലവിടൽ ക്ലെയിം അംഗീകാരത്തിനായി ശേഷിക്കുന്നു. മാത്രം ചിലവിടൽ Approver സ്റ്റാറ്റസ് അപ്ഡേറ്റ് ചെയ്യാം.
+DocType: Email Digest,New Expenses,പുതിയ ചെലവുകൾ
 DocType: Purchase Invoice,Additional Discount Amount,അധിക ഡിസ്ക്കൌണ്ട് തുക
-apps/erpnext/erpnext/controllers/accounts_controller.py +524,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","വരി # {0}: അളവ് 1, ഇനം ഒരു നിശ്ചിത അസറ്റ് പോലെ ആയിരിക്കണം. ഒന്നിലധികം അളവ് പ്രത്യേകം വരി ഉപയോഗിക്കുക."
+apps/erpnext/erpnext/controllers/accounts_controller.py +527,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","വരി # {0}: അളവ് 1, ഇനം ഒരു നിശ്ചിത അസറ്റ് പോലെ ആയിരിക്കണം. ഒന്നിലധികം അളവ് പ്രത്യേകം വരി ഉപയോഗിക്കുക."
 DocType: Leave Block List Allow,Leave Block List Allow,അനുവദിക്കുക ബ്ലോക്ക് ലിസ്റ്റ് വിടുക
 apps/erpnext/erpnext/setup/doctype/company/company.py +249,Abbr can not be blank or space,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/stock/get_item_details.py +123,Please specify Company,കമ്പനി വ്യക്തമാക്കുക
 ,Customer Acquisition and Loyalty,കസ്റ്റമർ ഏറ്റെടുക്കൽ ലോയൽറ്റി
@@ -1772,17 +1791,19 @@
 apps/erpnext/erpnext/projects/doctype/task/task.js +26,Expense Claims,ചിലവേറിയ ക്ലെയിമുകൾ
 DocType: Issue,Support,പിന്തുണ
 ,BOM Search,BOM തിരച്ചിൽ
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Closing (Opening + Totals),(+ ആകെ തുറക്കുന്നു) അടയ്ക്കുന്നു
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),(+ ആകെ തുറക്കുന്നു) അടയ്ക്കുന്നു
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,കമ്പനിയിൽ കറൻസി വ്യക്തമാക്കുക
 DocType: Workstation,Wages per hour,മണിക്കൂറിൽ വേതനം
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +50,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,തുടർന്ന് മെറ്റീരിയൽ അഭ്യർത്ഥനകൾ ഇനത്തിന്റെ റീ-ഓർഡർ തലത്തിൽ അടിസ്ഥാനമാക്കി സ്വയം ഉൾപ്പെടും
-apps/erpnext/erpnext/controllers/accounts_controller.py +272,Account {0} is invalid. Account Currency must be {1},അക്കൗണ്ട് {0} അസാധുവാണ്. അക്കൗണ്ട് കറന്സി {1} ആയിരിക്കണം
+DocType: Email Digest,Pending Sales Orders,തീർച്ചപ്പെടുത്തിയിട്ടില്ല സെയിൽസ് ഓർഡറുകൾ
+apps/erpnext/erpnext/controllers/accounts_controller.py +275,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 +956,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","വരി # {0}: പരാമർശം ഡോക്യുമെന്റ് തരം വിൽപ്പന ഓർഡർ, സെയിൽസ് ഇൻവോയ്സ് അല്ലെങ്കിൽ ജേർണൽ എൻട്രി ഒന്ന് ആയിരിക്കണം"
-DocType: Salary Slip,Deduction,കുറയ്ക്കല്
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +87,Row {0}: From Time and To Time is mandatory.,വരി {0}: സമയവും സമയാസമയങ്ങളിൽ നിർബന്ധമാണ്.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +969,"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 +111,Row {0}: From Time and To Time is mandatory.,വരി {0}: സമയവും സമയാസമയങ്ങളിൽ നിർബന്ധമാണ്.
+DocType: Stock Reconciliation Item,Amount Difference,തുക വ്യത്യാസം
 apps/erpnext/erpnext/stock/get_item_details.py +262,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 +7,Please enter Employee Id of this sales person,ഈ വിൽപ്പന ആളിന്റെ ജീവനക്കാരന്റെ ഐഡി നൽകുക
@@ -1790,7 +1811,7 @@
 DocType: Project,% Tasks Completed,% ജോലികളും പൂർത്തിയാക്കി
 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 +194,Please enter Production Item first,പ്രൊഡക്ഷൻ ഇനം ആദ്യം നൽകുക
+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,അപ്രാപ്തമാക്കിയ ഉപയോക്താവിനെ
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,ഉദ്ധരണി
@@ -1799,53 +1820,54 @@
 DocType: Maintenance Visit,Maintenance User,മെയിൻറനൻസ് ഉപയോക്താവ്
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +149,Cost Updated,ചെലവ് അപ്ഡേറ്റ്
 DocType: Employee,Date of Birth,ജനിച്ച ദിവസം
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +86,Item {0} has already been returned,ഇനം {0} ഇതിനകം മടങ്ങി ചെയ്തു
+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 സർട്ടിഫിക്കറ്റ്
+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 +177,Job Description,ജോലി വിവരണം
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,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 +126,"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 +127,"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.","സെയിൽസ് കാമ്പെയ്നുകൾക്കായുള്ള കൃത്യമായി സൂക്ഷിക്കുക. നിക്ഷേപം മടങ്ങിവരിക കണക്കാക്കുന്നതിനുള്ള പടയോട്ടങ്ങൾ നിന്ന് തുടങ്ങിയവ സെയിൽസ് ഓർഡർ, ഉദ്ധരണികൾ, നയിക്കുന്നു ട്രാക്ക് സൂക്ഷിക്കുക."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +24,Welcome to POS: Create your POS Profile,POS ൽ സ്വാഗതം: നിങ്ങളുടെ POS പ്രൊഫൈൽ സൃഷ്ടിക്കുക
 DocType: Expense Claim,Approver,Approver
 ,SO Qty,ഷൂട്ട്ഔട്ട് Qty
+DocType: Guardian,Work Address,ഔദ്യോഗിക വിലാസം
 DocType: Appraisal,Calculate Total Score,ആകെ സ്കോർ കണക്കുകൂട്ടുക
 DocType: Request for Quotation,Manufacturing Manager,ണം മാനേജർ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},സീരിയൽ ഇല്ല {0} {1} വരെ വാറന്റി കീഴിൽ ആണ്
+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 +74,Shipments,കയറ്റുമതി
+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 +153,Row # ,വരി #
+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 +156,Get From,നിന്നും നേടുക
+apps/erpnext/erpnext/public/js/utils.js +167,Get From,നിന്നും നേടുക
 DocType: C-Form,Quarter,ക്വാര്ട്ടര്
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Miscellaneous Expenses,പലവക ചെലവുകൾ
 DocType: Global Defaults,Default Company,സ്ഥിരസ്ഥിതി കമ്പനി
 apps/erpnext/erpnext/controllers/stock_controller.py +167,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,ചിലവേറിയ അല്ലെങ്കിൽ ഈ വ്യത്യാസം അത് കൂട്ടിയിടികൾ പോലെ ഇനം {0} മൊത്തത്തിലുള്ള ഓഹരി മൂല്യം നിര്ബന്ധമാണ്
-apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","{2} അധികം {0} നിരയിൽ {1} കൂടുതൽ ഇനം വേണ്ടി overbill ചെയ്യാൻ കഴിയില്ല. Overbilling അനുവദിക്കാൻ, സ്റ്റോക്ക് ക്രമീകരണങ്ങൾ വെച്ചിരിക്കുന്നതും ദയവായി"
+apps/erpnext/erpnext/controllers/accounts_controller.py +419,"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
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} is disabled,ഉപയോക്താവ് {0} അപ്രാപ്തമാക്കിയിട്ടുണ്ടെങ്കിൽ
 DocType: Leave Application,Total Leave Days,ആകെ അനുവാദ ദിനങ്ങൾ
 DocType: Email Digest,Note: Email will not be sent to disabled users,കുറിപ്പ്: ഇമെയിൽ ഉപയോക്താക്കൾക്ക് അയച്ച ചെയ്യില്ല
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,കമ്പനി തിരഞ്ഞെടുക്കുക ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,എല്ലാ വകുപ്പുകളുടെയും വേണ്ടി പരിഗണിക്കും എങ്കിൽ ശൂന്യമായിടൂ
 apps/erpnext/erpnext/config/hr.py +171,"Types of employment (permanent, contract, intern etc.).","തൊഴിൽ വിവിധതരം (സ്ഥിരമായ, കരാർ, തടവുകാരി മുതലായവ)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +346,{0} is mandatory for Item {1},{0} ഇനം {1} നിര്ബന്ധമാണ്
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,{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","കുറഞ്ഞത് ഒരു വരിയിൽ പദ്ധതി തുക, ഇൻവോയിസ് ടൈപ്പ് ഇൻവോയിസ് നമ്പർ തിരഞ്ഞെടുക്കുക"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,പുതിയ വാങ്ങൽ വില
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},ഇനം {0} വേണ്ടി ആവശ്യമായ സെയിൽസ് ഓർഡർ
 DocType: Purchase Invoice Item,Rate (Company Currency),നിരക്ക് (കമ്പനി കറൻസി)
-apps/erpnext/erpnext/demo/setup_data.py +360,Others,മറ്റുള്ളവ
+DocType: Student Guardian,Others,മറ്റുള്ളവ
 DocType: Payment Entry,Unallocated Amount,ലഭ്യമല്ലാത്ത തുക
 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,നികുതി ചാർജുകളും
@@ -1865,17 +1887,16 @@
 apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,സീരിയൽ ഇൻവെന്ററി
 DocType: Activity Type,Default Billing Rate,സ്ഥിരസ്ഥിതി ബില്ലിംഗ് റേറ്റ്
 DocType: Sales Invoice,Total Billing Amount,ആകെ ബില്ലിംഗ് തുക
-apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +54,Receivable Account,സ്വീകാ അക്കൗണ്ട്
-apps/erpnext/erpnext/controllers/accounts_controller.py +546,Row #{0}: Asset {1} is already {2},വരി # {0}: അസറ്റ് {1} {2} ഇതിനകം
+apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,സ്വീകാ അക്കൗണ്ട്
+apps/erpnext/erpnext/controllers/accounts_controller.py +549,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 +79,CEO,സിഇഒ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,സിഇഒ
 DocType: Expense Claim Detail,Expense Claim Detail,ചിലവേറിയ ക്ലെയിം വിശദാംശം
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +808,Please select correct account,ശരിയായ അക്കൗണ്ട് തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +809,Please select correct account,ശരിയായ അക്കൗണ്ട് തിരഞ്ഞെടുക്കുക
 DocType: Item,Weight UOM,ഭാരോദ്വഹനം UOM
 DocType: Salary Structure Employee,Salary Structure Employee,ശമ്പള ഘടന ജീവനക്കാരുടെ
 DocType: Employee,Blood Group,രക്ത ഗ്രൂപ്പ്
-DocType: Purchase Invoice Item,Page Break,പേജ്
 DocType: Production Order Operation,Pending,തീർച്ചപ്പെടുത്തിയിട്ടില്ല
 DocType: Course,Course Name,കോഴ്സിന്റെ പേര്
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,ഒരു പ്രത്യേക ജീവനക്കാരന്റെ ലീവ് അപേക്ഷകൾ അംഗീകരിക്കാം ഉപയോക്താക്കൾ
@@ -1884,14 +1905,15 @@
 DocType: Fiscal Year,Companies,കമ്പനികൾ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,ഇലക്ട്രോണിക്സ്
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,സ്റ്റോക്ക് റീ-ഓർഡർ തലത്തിൽ എത്തുമ്പോൾ മെറ്റീരിയൽ അഭ്യർത്ഥന ഉയർത്തലും
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Full-time,മുഴുവൻ സമയവും
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,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: 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,ആകെ ഇൻകമിംഗ് മൂല്യം
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Debit To is required,ഡെബിറ്റ് ആവശ്യമാണ്
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +321,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,ക്വാളിറ്റി മാനേജർ
@@ -1899,6 +1921,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/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 ശാരീരിക
@@ -1909,18 +1932,17 @@
 DocType: Production Order Operation,Completed Qty,പൂർത്തിയാക്കി Qty
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"For {0}, only debit accounts can be linked against another credit entry",{0} മാത്രം ഡെബിറ്റ് അക്കൗണ്ടുകൾ മറ്റൊരു ക്രെഡിറ്റ് എൻട്രി നേരെ ലിങ്ക്ഡ് കഴിയും
 apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,വില പട്ടിക {0} പ്രവർത്തനരഹിതമാക്കിയിരിക്കുന്നതിനാൽ
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +99,Row {0}: Completed Qty cannot be more than {1} for operation {2},വരി {0}: പൂർത്തിയായി അളവ് {2} ഓപ്പറേഷൻ അപേക്ഷിച്ച് {1} കൂടുതലാകാൻ പാടില്ല
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +123,Row {0}: Completed Qty cannot be more than {1} for operation {2},വരി {0}: പൂർത്തിയായി അളവ് {2} ഓപ്പറേഷൻ അപേക്ഷിച്ച് {1} കൂടുതലാകാൻ പാടില്ല
 DocType: Manufacturing Settings,Allow Overtime,അധികസമയം അനുവദിക്കുക
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,ഇനം {1} വേണ്ടി ആവശ്യമായ {0} സീരിയൽ സംഖ്യാപുസ്തകം. നിങ്ങൾ {2} നൽകിയിട്ടുള്ള.
 DocType: Stock Reconciliation Item,Current Valuation Rate,ഇപ്പോഴത്തെ മൂലധനം റേറ്റ്
 DocType: Item,Customer Item Codes,കസ്റ്റമർ ഇനം കോഡുകൾ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,എക്സ്ചേഞ്ച് ഗെയിൻ / നഷ്ടം
 DocType: Opportunity,Lost Reason,നഷ്ടപ്പെട്ട കാരണം
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ദയവായി സജ്ജീകരണം&gt; നമ്പറിംഗ് സീരീസ് വഴി ഹാജർ വിവരത്തിനു നമ്പറിംഗ് പരമ്പര
 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/purchase_receipt/purchase_receipt.py +378,All items have already been invoiced,എല്ലാ ഇനങ്ങളും ഇതിനകം invoiced ചെയ്തു
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +379,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,പുറത്തേക്കുള്ള
@@ -1936,18 +1958,19 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,നിങ്ങളുടെ ഉപഭോക്താക്കളെ
 apps/erpnext/erpnext/projects/doctype/project/project.py +141,You have been invited to collaborate on the project: {0},നിങ്ങൾ പദ്ധതി സഹകരിക്കുക ക്ഷണിച്ചു: {0}
 DocType: Leave Block List Date,Block Date,ബ്ലോക്ക് തീയതി
-apps/erpnext/erpnext/templates/generators/job_opening.html +19,Apply Now,ഇപ്പോൾ പ്രയോഗിക്കുക
+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."
 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,കെട്ടിടങ്ങൾ
-apps/erpnext/erpnext/utilities/doctype/address/address.py +164,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,"സഹജമായ വിലാസം ഫലകം കണ്ടെത്തി. സജ്ജീകരണം&gt; അച്ചടി, ബ്രാൻഡിംഗ്&gt; വിലാസം ഫലകം നിന്ന് പുതിയതൊന്ന് സൃഷ്ടിക്കുക."
 DocType: Fee Structure,Fee Structure,ഫീസ് ഘടന
 DocType: Timesheet Detail,Costing Amount,തുക ആറെണ്ണവും
+DocType: Student Admission,Application Fee,അപേക്ഷ ഫീസ്
 DocType: Process Payroll,Submit Salary Slip,ശമ്പളം ജി സമർപ്പിക്കുക
-apps/erpnext/erpnext/controllers/selling_controller.py +161,Maxiumm discount for Item {0} is {1}%,ഇനം {0} വേണ്ടി Maxiumm നല്കിയിട്ടുള്ള {1}% ആണ്
+apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,ഇനം {0} വേണ്ടി Maxiumm നല്കിയിട്ടുള്ള {1}% ആണ്
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,ബൾക്ക് ലെ ഇംപോർട്ട്
 DocType: Sales Partner,Address & Contacts,വിലാസം &amp; ബന്ധങ്ങൾ
 DocType: SMS Log,Sender Name,പ്രേഷിതനാമം
@@ -1972,21 +1995,21 @@
 DocType: Serial No,Delivery Time,വിതരണ സമയം
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,എയ്ജിങ് അടിസ്ഥാനത്തിൽ ഓൺ
 DocType: Item,End of Life,ജീവിതാവസാനം
-apps/erpnext/erpnext/demo/setup_data.py +361,Travel,യാത്ര
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +155,No active or default Salary Structure found for employee {0} for the given dates,സജീവ അല്ലെങ്കിൽ സ്ഥിര ശമ്പള ഘടന തന്നിരിക്കുന്ന തീയതികളിൽ ജീവനക്കാരൻ {0} കണ്ടെത്തിയില്ല
+apps/erpnext/erpnext/demo/setup/setup_data.py +304,Travel,യാത്ര
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +167,No active or default Salary Structure found for employee {0} for the given dates,സജീവ അല്ലെങ്കിൽ സ്ഥിര ശമ്പള ഘടന തന്നിരിക്കുന്ന തീയതികളിൽ ജീവനക്കാരൻ {0} കണ്ടെത്തിയില്ല
 DocType: Leave Block List,Allow Users,അനുവദിക്കുക ഉപയോക്താക്കൾ
 DocType: Purchase Order,Customer Mobile No,കസ്റ്റമർ മൊബൈൽ ഇല്ല
 DocType: Sales Invoice,Recurring,ആവർത്തിക്കുന്നു
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,ഉൽപ്പന്ന ലംബമായുള്ള അല്ലെങ്കിൽ ഡിവിഷനുകൾ വേണ്ടി പ്രത്യേക വരുമാനവും ചിലവേറിയ ട്രാക്ക്.
 DocType: Rename Tool,Rename Tool,ടൂൾ പുനർനാമകരണം ചെയ്യുക
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +23,Update Cost,അപ്ഡേറ്റ് ചെലവ്
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,അപ്ഡേറ്റ് ചെലവ്
 DocType: Item Reorder,Item Reorder,ഇനം പുനഃക്രമീകരിക്കുക
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +36,Show Salary Slip,ശമ്പള ജി കാണിക്കുക
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +748,Transfer Material,മെറ്റീരിയൽ കൈമാറുക
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +53,Show Salary Slip,ശമ്പള ജി കാണിക്കുക
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +166,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 +923,Please set recurring after saving,സംരക്ഷിക്കുന്നതിൽ ശേഷം ആവർത്തിക്കുന്ന സജ്ജമാക്കുക
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +646,Select change amount account,മാറ്റം തുക അക്കൗണ്ട് തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/public/js/controllers/transaction.js +914,Please set recurring after saving,സംരക്ഷിക്കുന്നതിൽ ശേഷം ആവർത്തിക്കുന്ന സജ്ജമാക്കുക
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +703,Select change amount account,മാറ്റം തുക അക്കൗണ്ട് തിരഞ്ഞെടുക്കുക
 DocType: Purchase Invoice,Price List Currency,വില പട്ടിക കറന്സി
 DocType: Naming Series,User must always select,ഉപയോക്താവ് എപ്പോഴും തിരഞ്ഞെടുക്കണം
 DocType: Stock Settings,Allow Negative Stock,നെഗറ്റീവ് സ്റ്റോക്ക് അനുവദിക്കുക
@@ -1998,31 +2021,32 @@
 DocType: Quality Inspection,Verified By,പരിശോധിച്ചു
 DocType: Address,Subsidiary,സഹായകന്
 apps/erpnext/erpnext/setup/doctype/company/company.py +64,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","നിലവിലുള്ള ഇടപാടുകൾ ഉള്ളതിനാൽ, കമ്പനിയുടെ സഹജമായ കറൻസി മാറ്റാൻ കഴിയില്ല. ഇടപാട് സ്വതവേയുള്ള കറൻസി മാറ്റാൻ റദ്ദാക്കി വേണം."
+DocType: Grade Interval,Grade Description,ഗ്രേഡ് വിവരണം
 DocType: Quality Inspection,Purchase Receipt No,വാങ്ങൽ രസീത് ഇല്ല
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,അച്ചാരം മണി
 DocType: Process Payroll,Create Salary Slip,ശമ്പളം ജി സൃഷ്ടിക്കുക
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +33,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 +352,Quantity in row {0} ({1}) must be same as manufactured quantity {2},നിരയിൽ ക്വാണ്ടിറ്റി {0} ({1}) നിർമിക്കുന്ന അളവ് {2} അതേ ആയിരിക്കണം
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Quantity in row {0} ({1}) must be same as manufactured quantity {2},നിരയിൽ ക്വാണ്ടിറ്റി {0} ({1}) നിർമിക്കുന്ന അളവ് {2} അതേ ആയിരിക്കണം
 DocType: Appraisal,Employee,ജീവനക്കാരുടെ
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,ഉപയോക്താവ് ആയി ക്ഷണിക്കുക
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} പൂർണ്ണമായി കൊക്കുമാണ്
 DocType: Workstation Working Hour,End Time,അവസാനിക്കുന്ന സമയം
 DocType: Payment Entry,Payment Deductions or Loss,പേയ്മെന്റ് ിയിളവുകള്ക്ക് അല്ലെങ്കിൽ നഷ്ടം
-apps/erpnext/erpnext/config/schools.py +100,LMS,എൽ.എം.എസ്
+apps/erpnext/erpnext/config/schools.py +104,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,സെയിൽസ് പൈപ്പ്ലൈൻ
 DocType: Student Batch Student,Student Batch Student,വിദ്യാർത്ഥിയുടെ ബാച്ച് വിദ്യാർത്ഥി
-DocType: Sales Invoice,Mass Mailing,മാസ് മെയിലിംഗ്
+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 +199,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/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 +297,Salary Slip of employee {0} already created for this period,ഉദ്യോഗസ്ഥ ജാമ്യം ജി {0} ഇതിനകം ഈ കാലയളവിൽ സൃഷ്ടിച്ച
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Pharmaceutical,ഫാർമസ്യൂട്ടിക്കൽ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +309,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/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,ക്രെഡിറ്റ് ചെയ്യുക
@@ -2037,27 +2061,28 @@
 DocType: Upload Attendance,Attendance To Date,തീയതി ആരംഭിക്കുന്ന ഹാജർ
 DocType: Warranty Claim,Raised By,ഉന്നയിക്കുന്ന
 DocType: Payment Gateway Account,Payment Account,പേയ്മെന്റ് അക്കൗണ്ട്
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +814,Please specify Company to proceed,തുടരാനായി കമ്പനി വ്യക്തമാക്കുക
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +793,Please specify Company to proceed,തുടരാനായി കമ്പനി വ്യക്തമാക്കുക
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Receivable,അക്കൗണ്ടുകൾ സ്വീകാര്യം ലെ നെറ്റ് മാറ്റുക
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Compensatory Off,ഓഫാക്കുക നഷ്ടപരിഹാര
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,ഓഫാക്കുക നഷ്ടപരിഹാര
 DocType: Quality Inspection Reading,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.,ശരിക്കും ഈ കമ്പനിയുടെ എല്ലാ ഇടപാടുകൾ ഇല്ലാതാക്കാൻ ആഗ്രഹിക്കുന്ന ദയവായി ഉറപ്പാക്കുക. അത് പോലെ നിങ്ങളുടെ മാസ്റ്റർ ഡാറ്റ തുടരും. ഈ പ്രവർത്തനം തിരുത്താൻ കഴിയില്ല.
 DocType: Room,Room Number,മുറി നമ്പർ
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},അസാധുവായ റഫറൻസ് {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +161,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) പ്രൊഡക്ഷൻ ഓർഡർ {3} ആസൂത്രണം quanitity ({2}) വലുതായിരിക്കും കഴിയില്ല
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +162,{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 +217,Raw Materials cannot be blank.,അസംസ്കൃത വസ്തുക്കൾ ശൂന്യമായിരിക്കാൻ കഴിയില്ല.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,"Could not update stock, invoice contains drop shipping item.","ഇൻവോയ്സ് ഡ്രോപ്പ് ഷിപ്പിംഗ് ഇനം ഉൾപ്പെടുന്നു, സ്റ്റോക്ക് അപ്ഡേറ്റുചെയ്യാനായില്ല."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +460,Quick Journal Entry,ദ്രുത ജേർണൽ എൻട്രി
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +111,You can not change rate if BOM mentioned agianst any item,BOM ലേക്ക് ഏതെങ്കിലും ഇനത്തിന്റെ agianst പരാമർശിച്ചു എങ്കിൽ നിങ്ങൾ നിരക്ക് മാറ്റാൻ കഴിയില്ല
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +441,"Could not update stock, invoice contains drop shipping item.","ഇൻവോയ്സ് ഡ്രോപ്പ് ഷിപ്പിംഗ് ഇനം ഉൾപ്പെടുന്നു, സ്റ്റോക്ക് അപ്ഡേറ്റുചെയ്യാനായില്ല."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Quick Journal Entry,ദ്രുത ജേർണൽ എൻട്രി
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +103,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} ആസൂത്രണം Qty നൽകുക {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is not submitted,{0} {1} സമർപ്പിച്ചിട്ടില്ലെന്നതും
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,ഇനങ്ങളുടെ വേണ്ടി അപേക്ഷ.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,ഓരോ നല്ല ഇനത്തിനും തീർന്നശേഷം പ്രത്യേക ഉത്പാദനം ഓർഡർ സൃഷ്ടിക്കപ്പെടും.
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +121,{0} must be negative in return document,{0} മടക്കം പ്രമാണത്തിൽ നെഗറ്റീവ് ആയിരിക്കണം
 ,Minutes to First Response for Issues,ഇഷ്യുവിനായുള്ള ആദ്യപ്രതികരണം ലേക്കുള്ള മിനിറ്റ്
 DocType: Purchase Invoice,Terms and Conditions1,നിബന്ധനകളും Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,ഈ സിസ്റ്റത്തിൽ സജ്ജീകരിക്കുന്നത് ഏത് ഇൻസ്റ്റിറ്റ്യൂട്ട് പേര്.
@@ -2066,16 +2091,17 @@
 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 +398,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 +739,Item or Warehouse for row {0} does not match Material Request,വരി ഐറ്റം അപാകതയുണ്ട് {0} മെറ്റീരിയൽ അഭ്യർത്ഥന പൊരുത്തപ്പെടുന്നില്ല
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +747,Item or Warehouse for row {0} does not match Material Request,വരി ഐറ്റം അപാകതയുണ്ട് {0} മെറ്റീരിയൽ അഭ്യർത്ഥന പൊരുത്തപ്പെടുന്നില്ല
 apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,അളവുകോൽ
 DocType: Fiscal Year,Year End Date,വർഷം അവസാന തീയതി
 DocType: Task Depends On,Task Depends On,ടാസ്ക് ആശ്രയിച്ചിരിക്കുന്നു
-DocType: Lead,Opportunity,അവസരം
+DocType: Supplier Quotation,Opportunity,അവസരം
 ,Completed Production Orders,പൂർത്തിയാക്കി പ്രൊഡക്ഷൻ ഓർഡറുകൾ
 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,സ്ഥിരസ്ഥിതി വർക്ക്സ്റ്റേഷൻ
@@ -2088,7 +2114,7 @@
 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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},മെയിൻറനൻസ് ആരംഭ തീയതി സീരിയൽ ഇല്ല {0} വേണ്ടി ഡെലിവറി തീയതി മുമ്പ് ആകാൻ പാടില്ല
+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,യഥാർത്ഥ അവസാന തീയതി
 DocType: Purchase Invoice,PINV-,PINV-
 DocType: Authorization Rule,Applicable To (Role),(റോൾ) ബാധകമായ
@@ -2103,7 +2129,7 @@
 DocType: SMS Log,No of Requested SMS,അഭ്യർത്ഥിച്ച എസ്എംഎസ് ഒന്നും
 DocType: Campaign,Campaign-.####,കാമ്പയിൻ -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,അടുത്ത ഘട്ടങ്ങൾ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,Please supply the specified items at the best possible rates,മികച്ച സാധ്യത നിരക്കിൽ വ്യക്തമാക്കിയ ഇനങ്ങൾ നൽകുക
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +695,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 +117,Contract End Date must be greater than Date of Joining,കരാര് അവസാനിക്കുന്ന തീയതി ചേരുന്നു തീയതി വലുതായിരിക്കണം
 DocType: Delivery Note,DN-,DN-
@@ -2112,7 +2138,7 @@
 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 +14,This is an example website auto-generated from ERPNext,ഈ ERPNext നിന്നുള്ള സ്വയം സൃഷ്ടിച്ചതാണ് ഒരു ഉദാഹരണം വെബ്സൈറ്റ് ആണ്
+apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,ഈ ERPNext നിന്നുള്ള സ്വയം സൃഷ്ടിച്ചതാണ് ഒരു ഉദാഹരണം വെബ്സൈറ്റ് ആണ്
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,എയ്ജിങ് ശ്രേണി 1
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
@@ -2139,13 +2165,14 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd ക്വാണ്ടിറ്റി
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +54,Fee Records Created - {0},സൃഷ്ടിച്ചു ഫീസ് റെക്കോർഡ്സ് - {0}
 DocType: Asset Category Account,Asset Category Account,അസറ്റ് വർഗ്ഗം അക്കൗണ്ട്
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +103,Cannot produce more Item {0} than Sales Order quantity {1},സെയിൽസ് ഓർഡർ അളവ് {1} അധികം ഇനം {0} ഉത്പാദിപ്പിക്കാനുള്ള കഴിയുന്നില്ലേ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Stock Entry {0} is not submitted,ഓഹരി എൻട്രി {0} സമർപ്പിച്ചിട്ടില്ലെന്നതും
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},സെയിൽസ് ഓർഡർ അളവ് {1} അധികം ഇനം {0} ഉത്പാദിപ്പിക്കാനുള്ള കഴിയുന്നില്ലേ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +505,Stock Entry {0} is not submitted,ഓഹരി എൻട്രി {0} സമർപ്പിച്ചിട്ടില്ലെന്നതും
 DocType: Payment Reconciliation,Bank / Cash Account,ബാങ്ക് / ക്യാഷ് അക്കൗണ്ട്
 DocType: Tax Rule,Billing City,ബില്ലിംഗ് സിറ്റി
 DocType: Salary Component Account,Salary Component Account,ശമ്പള ഘടകങ്ങളുടെ അക്കൗണ്ട്
 DocType: Global Defaults,Hide Currency Symbol,കറൻസി ചിഹ്നം മറയ്ക്കുക
 apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card","ഉദാ ബാങ്ക്, ക്യാഷ്, ക്രെഡിറ്റ് കാർഡ്"
+DocType: Lead Source,Source Name,ഉറവിട പേര്
 DocType: Journal Entry,Credit Note,ക്രെഡിറ്റ് കുറിപ്പ്
 DocType: Warranty Claim,Service Address,സേവന വിലാസം
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furnitures and Fixtures,Furnitures ആൻഡ് മതംതീര്ത്ഥാടനംജ്യോതിഷംഉത്സവങ്ങള്വിശ്വസിക്കാമോ
@@ -2157,6 +2184,7 @@
 DocType: Opportunity,Customer / Lead Name,കസ്റ്റമർ / ലീഡ് പേര്
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +89,Clearance Date not mentioned,ക്ലിയറൻസ് തീയതി പറഞ്ഞിട്ടില്ലാത്ത
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,പ്രൊഡക്ഷൻ
+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/controllers/trends.py +19,Total(Qty),ആകെ (Qty)
 DocType: Sales Invoice,This Document,ഈ പ്രമാണം
@@ -2168,15 +2196,15 @@
 DocType: Purchase Receipt,Time at which materials were received,വസ്തുക്കൾ ലഭിച്ച ഏത് സമയം
 DocType: Stock Ledger Entry,Outgoing Rate,ഔട്ട്ഗോയിംഗ് റേറ്റ്
 apps/erpnext/erpnext/config/hr.py +176,Organization branch master.,ഓർഗനൈസേഷൻ ബ്രാഞ്ച് മാസ്റ്റർ.
-apps/erpnext/erpnext/controllers/accounts_controller.py +273, or ,അഥവാ
+apps/erpnext/erpnext/controllers/accounts_controller.py +276, 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 +203,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,വരി # {0}: ജേണൽ എൻട്രി {1} മറ്റൊരു വൗച്ചർ പൊരുത്തപ്പെടും അക്കൗണ്ട് {2} ഞങ്ങൾക്കുണ്ട് അല്ലെങ്കിൽ ഇതിനകം ഇല്ല
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +206,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 +90,No employee for the above selected criteria OR salary slip already created,മുകളിൽ തിരഞ്ഞെടുത്ത മാനദണ്ഡങ്ങൾ OR ശമ്പളം സ്ലിപ്പ് വേണ്ടി ഒരു ജീവനക്കാരനും ഇതിനകം സൃഷ്ടിച്ചു
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +93,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,പേയ്മെന്റ് തരം
@@ -2204,8 +2232,8 @@
 DocType: Product Bundle,Parent Item,പാരന്റ് ഇനം
 DocType: Account,Account Type,അക്കൗണ്ട് തരം
 DocType: Delivery Note,DN-RET-,ഡിഎൻ-RET-
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +115,Leave Type {0} cannot be carry-forwarded,{0} കയറ്റികൊണ്ടു-ഫോർവേഡ് ചെയ്യാൻ കഴിയില്ല ടൈപ്പ് വിടുക
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',മെയിൻറനൻസ് ഷെഡ്യൂൾ എല്ലാ ഇനങ്ങളും വേണ്ടി നിർമ്മിക്കുന്നില്ല ആണ്. &#39;ജനറേറ്റുചെയ്യൂ ഷെഡ്യൂൾ&#39; ക്ലിക്ക് ചെയ്യുക ദയവായി
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +118,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 +163,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","{1} ൽ {0} വരി വേണ്ടി. {2} ഇനം നിരക്ക്, വരികൾ {3} ഉൾപ്പെടുത്തും ഉണ്ടായിരിക്കണം ഉൾപ്പെടുത്തുന്നതിനായി"
@@ -2217,13 +2245,13 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +32,Disabled template must not be default template,അപ്രാപ്തമാക്കി ടെംപ്ലേറ്റ് സ്ഥിരസ്ഥിതി ടെംപ്ലേറ്റ് പാടില്ല
 DocType: Account,Income Account,ആദായ അക്കൗണ്ട്
 DocType: Payment Request,Amount in customer's currency,ഉപഭോക്താവിന്റെ കറൻസി തുക
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +748,Delivery,ഡെലിവറി
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +742,Delivery,ഡെലിവറി
 DocType: Stock Reconciliation Item,Current Qty,ഇപ്പോഴത്തെ Qty
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",വിഭാഗം ആറെണ്ണവും ലെ &quot;മെറ്റീരിയൽസ് അടിസ്ഥാനപ്പെടുത്തിയ ഓൺ നിരക്ക്&quot; കാണുക
 DocType: Appraisal Goal,Key Responsibility Area,കീ ഉത്തരവാദിത്വം ഏരിയ
 DocType: Payment Entry,Total Allocated Amount,ആകെ തുക
 DocType: Item Reorder,Material Request Type,മെറ്റീരിയൽ അഭ്യർത്ഥന തരം
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +82,Row {0}: UOM Conversion Factor is mandatory,വരി {0}: UOM പരിവർത്തന ഫാക്ടർ നിർബന്ധമായും
+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,ചെലവ് കേന്ദ്രം
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,സാക്ഷപ്പെടുത്തല് #
@@ -2234,13 +2262,13 @@
 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 +90,Head of Marketing and Sales,മാർക്കറ്റിങ് ആൻഡ് സെയിൽസ് ഹെഡ്
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,ആദായ നികുതി
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,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.,ട്രാക്ക് ഇൻഡസ്ട്രി തരം നയിക്കുന്നു.
 DocType: Item Supplier,Item Supplier,ഇനം വിതരണക്കാരൻ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +403,Please enter Item Code to get batch no,യാതൊരു ബാച്ച് ലഭിക്കാൻ ഇനം കോഡ് നൽകുക
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +770,Please select a value for {0} quotation_to {1},{1} quotation_to {0} ഒരു മൂല്യം തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +397,Please enter Item Code to get batch no,യാതൊരു ബാച്ച് ലഭിക്കാൻ ഇനം കോഡ് നൽകുക
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +764,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","താഴെ പ്രോപ്പർട്ടികൾ ഇരു രേഖകളിൽ ഒരേ തന്നെയുള്ള സംയോജിപ്പിച്ചുകൊണ്ട് മാത്രമേ സാധിക്കുകയുള്ളൂ. ഗ്രൂപ്പ്, റൂട്ട് ടൈപ്പ്, കമ്പനിയാണ്"
@@ -2252,28 +2280,29 @@
 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 +100,Issues,പ്രശ്നങ്ങൾ
+apps/erpnext/erpnext/hooks.py +109,Issues,പ്രശ്നങ്ങൾ
 apps/erpnext/erpnext/controllers/status_updater.py +13,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,പർച്ചേസ് അഭ്യർത്ഥന അവശേഷിക്കുന്ന ഷൂട്ട്ഔട്ട് ഇനങ്ങൾ
+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,ബില്ലിംഗ് കറന്സി
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Large,അതിബൃഹത്തായ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,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 +507,Warning: Another {0} # {1} exists against stock entry {2},മുന്നറിയിപ്പ്: മറ്റൊരു {0} # {1} സ്റ്റോക്ക് എൻട്രി {2} നേരെ നിലവിലുണ്ട്
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Local,പ്രാദേശിക
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +508,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),വായ്പകളും അഡ്വാൻസുകളും (ആസ്തികൾ)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,കടക്കാർ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Large,വലുത്
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,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 +225,Total {0} ({1}),ആകെ {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +224,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,സ്ഥിരസ്ഥിതി മൂലധനം രീതിയുടെ
@@ -2319,9 +2348,9 @@
 DocType: Attendance,Leave Type,തരം വിടുക
 apps/erpnext/erpnext/controllers/stock_controller.py +173,Expense / Difference account ({0}) must be a 'Profit or Loss' account,ചിലവേറിയ / വ്യത്യാസം അക്കൗണ്ട് ({0}) ഒരു &#39;പ്രോഫിറ്റ് അല്ലെങ്കിൽ നഷ്ടം&#39; അക്കൗണ്ട് ആയിരിക്കണം
 DocType: Account,Accounts User,ഉപയോക്തൃ അക്കൗണ്ടുകൾ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Name error: {0},പേര് പിശക്: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +90,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 +178,{0} {1} does not associated with {2} {3},{0} {1} {2} {3} ബന്ധപ്പെടുത്തിയ ഇല്ല
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +181,{0} {1} does not associated with {2} {3},{0} {1} {2} {3} ബന്ധപ്പെടുത്തിയ ഇല്ല
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,ജീവനക്കാരൻ {0} വേണ്ടി ഹാജർ ഇതിനകം മലിനമായിരിക്കുന്നു
 DocType: Packing Slip,If more than one package of the same type (for print),(പ്രിന്റ് വേണ്ടി) ഒരേ തരത്തിലുള്ള ഒന്നിലധികം പാക്കേജ് എങ്കിൽ
 DocType: Warehouse,Parent Warehouse,രക്ഷാകർതൃ വെയർഹൗസ്
@@ -2340,7 +2369,7 @@
 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,ആവശ്യകതകൾ
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,കുറഞ്ഞത് ഒരു ഐറ്റം മടക്കം പ്രമാണത്തിൽ നെഗറ്റീവ് അളവ് കടന്നു വേണം
+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 +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","ഓപ്പറേഷൻ {0} ഇനി വറ്ക്ക്സ്റ്റേഷൻ {1} ഏതെങ്കിലും ലഭ്യമായ പ്രവ്യത്തി അധികം, ഒന്നിലധികം ഓപ്പറേഷൻസ് കടന്നു ഓപ്പറേഷൻ ഇടിച്ചു"
 ,Requested,അഭ്യർത്ഥിച്ചു
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +83,No Remarks,ഇല്ല അഭിപ്രായപ്രകടനം
@@ -2352,46 +2381,46 @@
 DocType: Item,Total Projected Qty,ആകെ പ്രൊജക്റ്റുചെയ്തു അളവ്
 DocType: Monthly Distribution,Distribution Name,വിതരണ പേര്
 DocType: Course,Course Code,കോഴ്സ് കോഡ്
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Quality Inspection required for Item {0},ഇനം {0} ആവശ്യമുള്ളതിൽ ഗുണനിലവാര പരിശോധന
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Quality Inspection required for Item {0},ഇനം {0} ആവശ്യമുള്ളതിൽ ഗുണനിലവാര പരിശോധന
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,ഉപഭോക്താവിന്റെ കറൻസി കമ്പനിയുടെ അടിത്തറ കറൻസി മാറ്റുമ്പോൾ തോത്
 DocType: Purchase Invoice Item,Net Rate (Company Currency),അറ്റ നിരക്ക് (കമ്പനി കറൻസി)
 DocType: Salary Detail,Condition and Formula Help,കണ്ടീഷൻ ഫോര്മുല സഹായം
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,ടെറിട്ടറി ട്രീ നിയന്ത്രിക്കുക.
 DocType: Journal Entry Account,Sales Invoice,സെയിൽസ് ഇൻവോയിസ്
 DocType: Journal Entry Account,Party Balance,പാർട്ടി ബാലൻസ്
-apps/erpnext/erpnext/accounts/page/pos/pos.js +475,Please select Apply Discount On,ഡിസ്കൌണ്ട് പ്രയോഗിക്കുക തിരഞ്ഞെടുക്കുക
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +92,Salary Slip Created,ശമ്പളം ജി സൃഷ്ടിച്ചത്
+apps/erpnext/erpnext/accounts/page/pos/pos.js +464,Please select Apply Discount On,ഡിസ്കൌണ്ട് പ്രയോഗിക്കുക തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +95,Salary Slip Created,ശമ്പളം ജി സൃഷ്ടിച്ചത്
 DocType: Company,Default Receivable Account,സ്ഥിരസ്ഥിതി സ്വീകാ അക്കൗണ്ട്
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,മുകളിൽ തിരഞ്ഞെടുത്ത തിരയാം അടച്ച മൊത്തം ശമ്പളത്തിനായി ബാങ്ക് എൻട്രി സൃഷ്ടിക്കുക
 DocType: Stock Entry,Material Transfer for Manufacture,ഉല്പാദനത്തിനുള്ള മെറ്റീരിയൽ ട്രാൻസ്ഫർ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,കിഴിവും ശതമാനം ഒരു വില പട്ടിക നേരെ അല്ലെങ്കിൽ എല്ലാ വില പട്ടിക വേണ്ടി ഒന്നുകിൽ പ്രയോഗിക്കാൻ കഴിയും.
 DocType: Purchase Invoice,Half-yearly,അർദ്ധവാർഷികം
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +384,Accounting Entry for Stock,ഓഹരി വേണ്ടി അക്കൗണ്ടിംഗ് എൻട്രി
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +387,Accounting Entry for Stock,ഓഹരി വേണ്ടി അക്കൗണ്ടിംഗ് എൻട്രി
 DocType: Sales Invoice,Sales Team1,സെയിൽസ് ടീം 1
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,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 +96,Row {0}: Completed Qty must be greater than zero.,വരി {0}: പൂർത്തിയായി അളവ് പൂജ്യം വലുതായിരിക്കണം.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +120,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 +88,Row # {0}: Cannot return more than {1} for Item {2},വരി # {0}: {1} ഇനം വേണ്ടി {2} അധികം മടങ്ങിപ്പോകാനാകില്ല
+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,പ്ലോട്ട്
 DocType: Item Group,Show this slideshow at the top of the page,പേജിന്റെ മുകളിലുള്ള ഈ സ്ലൈഡ്ഷോ കാണിക്കുക
 DocType: BOM,Item UOM,ഇനം UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),ഡിസ്കൗണ്ട് തുക (കമ്പനി കറന്സി) ശേഷം നികുതിയും
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +147,Target warehouse is mandatory for row {0},ടാർജറ്റ് വെയർഹൗസ് വരി {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,വിതരണക്കാരൻ വിലാസം തിരഞ്ഞെടുക്കുക
 DocType: Quality Inspection,Quality Inspection,ക്വാളിറ്റി ഇൻസ്പെക്ഷൻ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Extra Small,എക്സ്ട്രാ ചെറുകിട
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,Warning: Material Requested Qty is less than Minimum Order Qty,മുന്നറിയിപ്പ്: Qty അഭ്യർത്ഥിച്ചു മെറ്റീരിയൽ മിനിമം ഓർഡർ Qty കുറവാണ്
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +194,Account {0} is frozen,അക്കൗണ്ട് {0} മരവിച്ചു
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,എക്സ്ട്രാ ചെറുകിട
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +690,Warning: Material Requested Qty is less than Minimum Order Qty,മുന്നറിയിപ്പ്: Qty അഭ്യർത്ഥിച്ചു മെറ്റീരിയൽ മിനിമം ഓർഡർ Qty കുറവാണ്
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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 +606,Can only make payment against unbilled {0},മാത്രം unbilled {0} നേരെ തീർക്കാം കഴിയുമോ
-apps/erpnext/erpnext/controllers/selling_controller.py +126,Commission rate cannot be greater than 100,കമ്മീഷൻ നിരക്ക് 100 വലുതായിരിക്കും കഴിയില്ല
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +609,Can only make payment against unbilled {0},മാത്രം unbilled {0} നേരെ തീർക്കാം കഴിയുമോ
+apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,കമ്മീഷൻ നിരക്ക് 100 വലുതായിരിക്കും കഴിയില്ല
 DocType: Stock Entry,Subcontract,Subcontract
 apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,ആദ്യം {0} നൽകുക
 DocType: Production Order Operation,Actual End Time,യഥാർത്ഥ അവസാനിക്കുന്ന സമയം
@@ -2402,30 +2431,30 @@
 DocType: SMS Log,No of Sent SMS,അയയ്ക്കുന്ന എസ്എംഎസ് ഒന്നും
 DocType: Account,Expense Account,ചിലവേറിയ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,സോഫ്റ്റ്വെയർ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Colour,കളർ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,കളർ
 DocType: Maintenance Visit,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;ആണ് മറ്റൊരു പ്രൊഡക്ട് ബണ്ടിൽ ഇല്ല ദയവായി
 DocType: Student Log,Academic,പണ്ഡിതോചിതമായ
-apps/erpnext/erpnext/controllers/accounts_controller.py +469,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),മുൻകൂർ ({0}) ഉത്തരവിനെതിരെ {1} ({2}) ഗ്രാൻഡ് ആകെ ശ്രേഷ്ഠ പാടില്ല
+apps/erpnext/erpnext/controllers/accounts_controller.py +472,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),മുൻകൂർ ({0}) ഉത്തരവിനെതിരെ {1} ({2}) ഗ്രാൻഡ് ആകെ ശ്രേഷ്ഠ പാടില്ല
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,സമമായി മാസം ഉടനീളമുള്ള ലക്ഷ്യങ്ങളിലൊന്നാണ് വിതരണം ചെയ്യാൻ പ്രതിമാസ വിതരണം തിരഞ്ഞെടുക്കുക.
 DocType: Purchase Invoice Item,Valuation Rate,മൂലധനം റേറ്റ്
+DocType: Stock Reconciliation,SR/,എസ്.ആർ /
 apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,വില പട്ടിക കറന്സി തിരഞ്ഞെടുത്തിട്ടില്ല
 DocType: Assessment,Results,ഫലം
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +168,Employee {0} has already applied for {1} between {2} and {3},ജീവനക്കാർ {0} ഇതിനകം {1} {2} ഉം {3} തമ്മിലുള്ള അപേക്ഷിച്ചു
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +175,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: Student Applicant,Father's/ Guardian 2 Email ID,പിതാവിന്റെ / ഗാർഡിയൻ 2 ഇമെയിൽ ഐഡി
 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 +228,Warehouses with existing transaction can not be converted to group.,നിലവിലുള്ള ഇടപാടിനെ അബദ്ധങ്ങളും ഗ്രൂപ്പ് പരിവർത്തനം ചെയ്യാൻ കഴിയില്ല.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +231,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 +93,Researcher,ഗവേഷകനും
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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.,ഇൻകമിങ് ഗുണമേന്മയുള്ള പരിശോധന.
@@ -2437,25 +2466,25 @@
 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: Sales Invoice,Advertisement,പരസ്യം
 DocType: Asset Category Account,Depreciation Expense Account,മൂല്യത്തകർച്ച ചിലവേറിയ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Probationary Period,പരിശീലന കാലഖട്ടം
-apps/erpnext/erpnext/hooks.py +102,Announcements,പ്രഖ്യാപനങ്ങൾ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,പരിശീലന കാലഖട്ടം
+apps/erpnext/erpnext/hooks.py +111,Announcements,പ്രഖ്യാപനങ്ങൾ
 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 +109,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 +16,To Datetime,തീയതി-ചെയ്യുന്നതിനായി
+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/scheduling_tool/scheduling_tool.py +51,Course Schedules deleted:,കോഴ്സ് സമയക്രമം ഇല്ലാതാക്കി:
 apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,SMS ഡെലിവറി നില പരിപാലിക്കുന്നതിനായി ക്ഌപ്തപ്പെടുത്താവുന്നതാണ്
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,തീർച്ചപ്പെടുത്തിയിട്ടില്ലാത്ത പ്രവർത്തനങ്ങൾ
+DocType: Accounts Settings,Make Payment via Journal Entry,ജേർണൽ എൻട്രി വഴി പേയ്മെന്റ് നിർമ്മിക്കുക
+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 +127,Please enter relieving date.,തീയതി വിടുതൽ നൽകുക.
-apps/erpnext/erpnext/controllers/trends.py +145,Amt,ശാരീരിക
+apps/erpnext/erpnext/controllers/trends.py +149,Amt,ശാരീരിക
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,Only Leave Applications with status 'Approved' can be submitted,സമർപ്പിച്ച കഴിയും &#39;അംഗീകരിച്ചു&#39; നില ആപ്ലിക്കേഷൻസ് മാത്രം വിടുക
 apps/erpnext/erpnext/utilities/doctype/address/address.py +26,Address Title is mandatory.,വിലാസം ശീർഷകം നിർബന്ധമാണ്.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,അന്വേഷണത്തിന് സ്രോതസ് പ്രചാരണം എങ്കിൽ പ്രചാരണത്തിന്റെ പേര് നൽകുക
@@ -2473,14 +2502,15 @@
 apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1},{0} {1} വേണ്ടി വിനിമയ നിരക്ക് കണ്ടെത്താൻ കഴിഞ്ഞില്ല
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,മാർക് ഹാഫ് ഡേ
 DocType: Sales Invoice,Sales Team,സെയിൽസ് ടീം
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Duplicate entry,എൻട്രി തനിപ്പകർപ്പെടുക്കുക
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,എൻട്രി തനിപ്പകർപ്പെടുക്കുക
 DocType: Program Enrollment Tool,Get Students,വിദ്യാർത്ഥികൾ നേടുക
 DocType: Serial No,Under Warranty,വാറന്റി കീഴിൽ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +490,[Error],[പിശക്]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +484,[Error],[പിശക്]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,നിങ്ങൾ സെയിൽസ് ഓർഡർ രക്ഷിക്കും ഒരിക്കൽ വാക്കുകളിൽ ദൃശ്യമാകും.
 ,Employee Birthday,ജീവനക്കാരുടെ ജന്മദിനം
 apps/erpnext/erpnext/controllers/status_updater.py +175,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; ഒരു അക്കാദമിക് കാലാവധി. ഈ എൻട്രികൾ പരിഷ്ക്കരിച്ച് വീണ്ടും ശ്രമിക്കുക."
 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} നിലവിലില്ല
@@ -2496,22 +2526,22 @@
 ,Issued Items Against Production Order,പ്രൊഡക്ഷൻ ഓർഡർ എതിരെ ഇനങ്ങൾ
 DocType: Pricing Rule,Purchase Manager,വാങ്ങൽ മാനേജർ
 DocType: Target Detail,Target Detail,ടാർജറ്റ് വിശദാംശം
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +25,All Jobs,എല്ലാ ജോലി
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,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 +323,Amount {0} {1} {2} {3},തുക {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,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: Supplier,Credit Limit,വായ്പാ പരിധി
 DocType: Production Plan Sales Order,Salse Order Date,Salse ഓർഡർ തീയതി
 DocType: Salary Component,Salary Component,ശമ്പള ഘടക
-apps/erpnext/erpnext/accounts/utils.py +372,Payment Entries {0} are un-linked,പേയ്മെന്റ് എൻട്രികൾ {0} ചെയ്യുന്നു അൺ-ലിങ്ക്ഡ്
+apps/erpnext/erpnext/accounts/utils.py +449,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 +497,Material Requests {0} created,മെറ്റീരിയൽ അഭ്യർത്ഥനകൾ {0} സൃഷ്ടിച്ചു
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +498,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.,നിബന്ധനകളോ കരാറിലെ ഫലകം.
 DocType: Purchase Invoice,Address and Contact,വിശദാംശവും ബന്ധപ്പെടാനുള്ള
@@ -2550,7 +2580,7 @@
 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 +848,Paid Amount cannot be greater than total negative outstanding amount {0},തുക മൊത്തം നെഗറ്റീവ് ശേഷിക്കുന്ന തുക {0} ശ്രേഷ്ഠ പാടില്ല
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +859,Paid Amount cannot be greater than total negative outstanding amount {0},തുക മൊത്തം നെഗറ്റീവ് ശേഷിക്കുന്ന തുക {0} ശ്രേഷ്ഠ പാടില്ല
 DocType: Employee Internal Work History,Employee Internal Work History,ജീവനക്കാർ ആന്തരിക വർക്ക് ചരിത്രം
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +233,Closing (Dr),(ഡോ) അടയ്ക്കുന്നു
 DocType: Cheque Print Template,Cheque Size,ചെക്ക് വലിപ്പം
@@ -2571,7 +2601,8 @@
 ,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.
-apps/erpnext/erpnext/controllers/accounts_controller.py +555,'Update Stock' cannot be checked for fixed asset sale,&#39;അപ്ഡേറ്റ് ഓഹരി&#39; നിർണയത്തിനുള്ള അസറ്റ് വില്പനയ്ക്ക് പരിശോധിക്കാൻ കഴിയുന്നില്ല
+DocType: Student Guardian,Father,പിതാവ്
+apps/erpnext/erpnext/controllers/accounts_controller.py +558,'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} റദ്ദാക്കി അല്ലെങ്കിൽ നിറുത്തി
@@ -2581,15 +2612,15 @@
 DocType: Sales Order,Fully Delivered,പൂർണ്ണമായി കൈമാറി
 DocType: Lead,Lower Income,ലോവർ ആദായ
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","ലാഭം / നഷ്ടം ബുക്ക് ചെയ്യും ഇതിൽ ബാധ്യതാ കീഴിൽ അക്കൗണ്ട് തല,"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +166,Source and target warehouse cannot be same for row {0},ഉറവിടം ടാർഗെറ്റ് വെയർഹൗസ് വരി {0} ഒരേ ആയിരിക്കും കഴിയില്ല
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","ഈ ഓഹരി അനുരഞ്ജനം ഒരു തുറക്കുന്നു എൻട്രി മുതൽ വ്യത്യാസം അക്കൗണ്ട്, ഒരു അസറ്റ് / ബാധ്യത തരം അക്കൌണ്ട് ആയിരിക്കണം"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +81,Purchase Order number required for Item {0},ഇനം {0} വേണ്ടി ആവശ്യമാണ് വാങ്ങൽ ഓർഡർ നമ്പർ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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/purchase_receipt/purchase_receipt.py +82,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 +17,Cannot change status as student {0} is linked with student application {1},ആയി വിദ്യാർഥി {0} വിദ്യാർഥി അപേക്ഷ {1} ലിങ്കുചെയ്തതിരിക്കുന്നതിനാൽ നില മാറ്റാൻ കഴിയില്ല
+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: Timesheet,"List of employee which has ""Salary Slip Based on Timesheet"" is enabled in salary structure.",ഉണ്ട് &quot;Timesheet അടിസ്ഥാനമാക്കി ശമ്പള ജി&quot; ശമ്പളം ഘടനയിൽ പ്രാപ്തമാക്കി ജീവനക്കാരൻ പട്ടിക.
 DocType: Asset,Fully Depreciated,പൂർണ്ണമായി മൂല്യത്തകർച്ചയുണ്ടായ
 ,Stock Projected Qty,ഓഹരി Qty അനുമാനിക്കപ്പെടുന്ന
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Customer {0} does not belong to project {1},കസ്റ്റമർ {0} {1} പ്രൊജക്ട് സ്വന്തമല്ല
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,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,സീരിയൽ ഇല്ല ആൻഡ് ബാച്ച്
@@ -2601,7 +2632,7 @@
 DocType: Purchase Invoice,Purchase Taxes and Charges,നികുതി ചാർജുകളും വാങ്ങുക
 ,Qty to Receive,സ്വീകരിക്കാൻ Qty
 DocType: Leave Block List,Leave Block List Allowed,ബ്ലോക്ക് പട്ടിക അനുവദനീയം വിടുക
-apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +55,All Warehouses,എല്ലാ അബദ്ധങ്ങളും
+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 +105,Credit To account must be a Balance Sheet account,അക്കൗണ്ടിലേക്ക് ക്രെഡിറ്റ് ഒരു ബാലൻസ് ഷീറ്റ് അക്കൗണ്ട് ആയിരിക്കണം
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,എല്ലാ വിതരണക്കാരൻ രീതികൾ
@@ -2613,10 +2644,10 @@
 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/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,ശമ്പളം വ്യതിചലിപ്പിച്ചു
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +26,Browse BOM,ബ്രൗസ് BOM ലേക്ക്
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,ബ്രൗസ് BOM ലേക്ക്
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,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 Year,Academic Year,അധ്യയന വർഷം
+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
 DocType: Appraisal,Appraisal,വിലനിശ്ചയിക്കല്
@@ -2624,12 +2655,12 @@
 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 +197,Leave approver must be one of {0},{0} ഒന്നാണ് ആയിരിക്കണം approver വിടുക
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,Leave approver must be one of {0},{0} ഒന്നാണ് ആയിരിക്കണം approver വിടുക
 DocType: Hub Settings,Seller Email,വില്പനക്കാരന്റെ ഇമെയിൽ
 DocType: Project,Total Purchase Cost (via Purchase Invoice),(വാങ്ങൽ ഇൻവോയിസ് വഴി) ആകെ വാങ്ങൽ ചെലവ്
 DocType: Workstation Working Hour,Start Time,ആരംഭ സമയം
 DocType: Item Price,Bulk Import Help,ബൾക്ക് ഇംപോർട്ട് സഹായം
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +256,Select Quantity,ക്വാണ്ടിറ്റി തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +257,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,സന്ദേശം അയച്ചു
@@ -2646,6 +2677,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,ലക്ഷ്യം qty അല്ലെങ്കിൽ ലക്ഷ്യം തുക ഒന്നുകിൽ നിർബന്ധമാണ്.
 apps/erpnext/erpnext/config/projects.py +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}","സെയിൽസ് പേഴ്സൺസ് താഴെ ഘടിപ്പിച്ചിരിക്കുന്ന ജീവനക്കാർ {1} ഒരു ഉപയോക്താവിന്റെ ഐഡി ഇല്ല ശേഷം, ലേക്കുള്ള {0} ഇവന്റുകൾ ക്രമീകരിക്കുന്നു"
+DocType: Timesheet,Billing Details,ബില്ലിംഗ് വിശദാംശങ്ങൾ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +149,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} ചെന്നവർ സ്റ്റോക്ക് ഇടപാടുകൾ പുതുക്കുന്നതിനായി അനുവാദമില്ല
 DocType: Item,Inspection Required,ഇൻസ്പെക്ഷൻ ആവശ്യമുണ്ട്
@@ -2665,7 +2697,7 @@
 DocType: Expense Claim,Approval Status,അംഗീകാരം അവസ്ഥ
 DocType: Hub Settings,Publish Items to Hub,ഹബ് വരെ ഇനങ്ങൾ പ്രസിദ്ധീകരിക്കുക
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},മൂല്യം നിന്ന് വരി {0} മൂല്യം വരെ താഴെ ആയിരിക്കണം
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Wire Transfer,വയർ ട്രാൻസ്ഫർ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,വയർ ട്രാൻസ്ഫർ
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,എല്ലാം പരിശോധിക്കുക
 DocType: Sales Order,Recurring Order,ആവർത്തക ഓർഡർ
 DocType: Company,Default Income Account,സ്ഥിരസ്ഥിതി ആദായ അക്കൗണ്ട്
@@ -2677,21 +2709,19 @@
 ,Welcome to ERPNext,ERPNext സ്വാഗതം
 apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,ക്വട്ടേഷൻ ഇടയാക്കും
 DocType: Lead,From Customer,കസ്റ്റമർ നിന്ന്
-apps/erpnext/erpnext/demo/setup_data.py +357,Calls,കോളുകൾ
+apps/erpnext/erpnext/demo/setup/setup_data.py +300,Calls,കോളുകൾ
 DocType: Project,Total Costing Amount (via Time Logs),(ടൈം ലോഗുകൾ വഴി) ആകെ ആറെണ്ണവും തുക
 DocType: Purchase Order Item Supplied,Stock UOM,ഓഹരി UOM
-apps/erpnext/erpnext/stock/doctype/item/item.py +466,"As there are existing transactions for this item, \
-							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","ഈ ഇനം നിലവിലുള്ള ഇടപാടുകൾ ഉണ്ട് പോലെ, \ നിങ്ങൾ &#39;സീരിയൽ ഒന്നുമില്ല&#39; മൂല്യങ്ങൾ മാറ്റാൻ കഴിയില്ല, &#39;തുറക്കും ബാച്ച് ഇല്ല&#39; ഉം &#39;മൂലധനം രീതി&#39; &#39;സ്റ്റോക്ക് ഇനം ആണോ&#39;"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,Purchase Order {0} is not submitted,വാങ്ങൽ ഓർഡർ {0} സമർപ്പിച്ചിട്ടില്ലെന്നതും
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,അനുമാനിക്കപ്പെടുന്ന
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},സീരിയൽ ഇല്ല {0} സംഭരണശാല {1} സ്വന്തമല്ല
 apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,കുറിപ്പ്: സിസ്റ്റം ഇനം വേണ്ടി ഡെലിവറി-കടന്നു-ബുക്കിങ് പരിശോധിക്കില്ല {0} അളവ് അല്ലെങ്കിൽ തുക 0 പോലെ
 DocType: Notification Control,Quotation Message,ക്വട്ടേഷൻ സന്ദേശം
 DocType: Issue,Opening Date,തീയതി തുറക്കുന്നു
-apps/erpnext/erpnext/schools/api.py +58,Attendance has been marked successfully.,ഹാജർ വിജയകരമായി അടയാളപ്പെടുത്തി.
+apps/erpnext/erpnext/schools/api.py +57,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 +136,Account Type for {0} must be {1},{0} വേണ്ടി അക്കൗണ്ട് ഇനം ആയിരിക്കണം {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +139,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,രണ്ടും വെയർഹൗസ് ഒരേ കമ്പനി സ്വന്തമായിരിക്കണം
@@ -2706,12 +2736,13 @@
 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/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 +20,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 +1190,Please select customer,കസ്റ്റമർ തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1193,Please select customer,കസ്റ്റമർ തിരഞ്ഞെടുക്കുക
 DocType: C-Form,I,ഞാന്
 DocType: Company,Asset Depreciation Cost Center,അസറ്റ് മൂല്യത്തകർച്ച കോസ്റ്റ് സെന്റർ
 DocType: Sales Order Item,Sales Order Date,സെയിൽസ് ഓർഡർ തീയതി
@@ -2721,6 +2752,7 @@
 ,Payment Period Based On Invoice Date,ഇൻവോയിസ് തീയതി അടിസ്ഥാനമാക്കി പേയ്മെന്റ് പിരീഡ്
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},{0} വേണ്ടി കറൻസി എക്സ്ചേഞ്ച് നിരക്കുകൾ കാണാതായ
 DocType: Assessment,Examiner,എക്സാമിനർ
+DocType: Student,Siblings,സഹോദരങ്ങള്
 DocType: Journal Entry,Stock Entry,ഓഹരി എൻട്രി
 DocType: Payment Entry,Payment References,പേയ്മെന്റ് അവലംബം
 DocType: C-Form,C-FORM-,സി-FORM-
@@ -2738,11 +2770,12 @@
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,വിഷയം പേര്
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,കച്ചവടവും അല്ലെങ്കിൽ വാങ്ങുന്നതിനു കുറഞ്ഞത് ഒരു തിരഞ്ഞെടുത്ത വേണം
+DocType: Grading Structure,Grade Intervals,ഗ്രേഡ് ഇടവേളകൾ
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,നിങ്ങളുടെ ബിസിനസ്സ് സ്വഭാവം തിരഞ്ഞെടുക്കുക.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,എവിടെ നിർമാണ ഓപ്പറേഷനുകൾ നടപ്പിലാക്കുന്നത്.
 DocType: Asset Movement,Source Warehouse,ഉറവിട വെയർഹൗസ്
 DocType: Installation Note,Installation Date,ഇന്സ്റ്റലേഷന് തീയതി
-apps/erpnext/erpnext/controllers/accounts_controller.py +534,Row #{0}: Asset {1} does not belong to company {2},വരി # {0}: അസറ്റ് {1} കമ്പനി ഭാഗമല്ല {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +537,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,സെയിൽസ് ഉപയോക്താവ്
@@ -2756,28 +2789,31 @@
 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,ഇപ്പോഴത്തെ 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 +111,Date Of Retirement must be greater than Date of Joining,വിരമിക്കുന്ന തീയതി ചേരുന്നു തീയതി വലുതായിരിക്കണം
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +49,There were errors while scheduling course on :,ന് കോഴ്സ് ഷെഡ്യൂൾ സമയത്ത് പിശകുകൾ ഉണ്ടായിരുന്നു:
 DocType: Sales Invoice,Against Income Account,ആദായ അക്കൗണ്ടിനെതിരായ
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +87,{0}% Delivered,കൈമാറി {0}%
+apps/erpnext/erpnext/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}: ക്രമപ്പെടുത്തിയ qty {1} {2} (ഇനത്തിലെ നിർവചിച്ചിരിക്കുന്നത്) മിനിമം ഓർഡർ qty താഴെയായിരിക്കണം കഴിയില്ല.
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,പ്രതിമാസ വിതരണ ശതമാനം
 DocType: Territory,Territory Targets,ടെറിറ്ററി ടാർഗെറ്റ്
 DocType: Delivery Note,Transporter Info,ട്രാൻസ്പോർട്ടർ വിവരം
-apps/erpnext/erpnext/accounts/utils.py +379,Please set default {0} in Company {1},കമ്പനി {1} ൽ സ്ഥിര {0} സജ്ജമാക്കുക
+apps/erpnext/erpnext/accounts/utils.py +456,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,മൊത്തം ലാഭം / നഷ്ടം
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,വാങ്ങൽ ഓർഡർ ഇനം നൽകിയത്
 apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,കമ്പനിയുടെ പേര് കമ്പനി ആകാൻ പാടില്ല
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,പ്രിന്റ് ടെംപ്ലേറ്റുകൾക്കായി കത്ത് മേധാവികൾ.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,പ്രിന്റ് ടെംപ്ലേറ്റുകൾക്കായി ശീര്ഷകം ഇൻവോയ്സിന്റെ ഉദാഹരണമാണ്.
+DocType: Student Guardian,Student Guardian,സ്റ്റുഡന്റ് ഗാർഡിയൻ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +184,Valuation type charges can not marked as Inclusive,മൂലധനം തരം ചാർജ് സഹായകം ആയി അടയാളപ്പെടുത്തി കഴിയില്ല
 DocType: POS Profile,Update Stock,സ്റ്റോക്ക് അപ്ഡേറ്റ്
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,ഇനങ്ങളുടെ വ്യത്യസ്ത UOM തെറ്റായ (ആകെ) മൊത്തം ഭാരം മൂല്യം നയിക്കും. ഓരോ ഇനത്തിന്റെ മൊത്തം ഭാരം ഇതേ UOM ഉണ്ടു എന്ന് ഉറപ്പു വരുത്തുക.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM റേറ്റ്
 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 +349,Journal Entries {0} are un-linked,എൻട്രികൾ {0} അൺ-ലിങ്ക്ഡ് ചെയ്യുന്നു
+apps/erpnext/erpnext/accounts/utils.py +426,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,കമ്പനിയിൽ റൌണ്ട് ഓഫാക്കുക സൂചിപ്പിക്കുക കോസ്റ്റ് കേന്ദ്രം
@@ -2801,6 +2837,7 @@
 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,കമ്മ്യൂണിറ്റി ഫോറം
+DocType: Homepage,"URL for ""All Products""",വേണ്ടി &quot;എല്ലാ ഉത്പന്നങ്ങളും&quot; യുആർഎൽ
 DocType: Leave Application,Leave Balance Before Application,മുമ്പായി ബാലൻസ് വിടുക
 DocType: SMS Center,Send SMS,എസ്എംഎസ് അയയ്ക്കുക
 DocType: Cheque Print Template,Width of amount in word,വാക്കിൽ തുക വീതി
@@ -2809,7 +2846,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 +29,Current Job Openings,നിലവിൽ ജോലികൾ
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,Current Job Openings,നിലവിൽ ജോലികൾ
 DocType: Company,Stock Adjustment Account,സ്റ്റോക്ക് ക്രമീകരണ അക്കൗണ്ട്
 DocType: Journal Entry,Write Off,എഴുതുക
 DocType: Timesheet Detail,Operation ID,ഓപ്പറേഷൻ ഐഡി
@@ -2822,7 +2859,7 @@
 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 +850,Show tax break-up,കാണിക്കുക നികുതി ബ്രേക്ക്-അപ്പ്
+apps/erpnext/erpnext/public/js/controllers/transaction.js +841,Show tax break-up,കാണിക്കുക നികുതി ബ്രേക്ക്-അപ്പ്
 apps/erpnext/erpnext/accounts/party.py +308,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} നേരെ നിലവിലില്ല ഇവിടെനിന്നു നിങ്ങൾ വീണ്ടും നിയോഗിക്കുകയോ അല്ലെങ്കിൽ പരിഷ്കരിക്കുന്നതിനായി"
@@ -2832,10 +2869,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 +534,Please select Posting Date before selecting Party,പാർട്ടി തിരഞ്ഞെടുക്കുന്നതിന് മുമ്പ് പോസ്റ്റിംഗ് തീയതി തിരഞ്ഞെടുക്കുക
 DocType: Serial No,Out of AMC,എഎംസി പുറത്താണ്
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +80,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 +162,Please contact to the user who have Sales Master Manager {0} role,സെയിൽസ് മാസ്റ്റർ മാനേജർ {0} പങ്കുണ്ട് ആർ ഉപയോക്താവിന് ബന്ധപ്പെടുക
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +195,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 +5,This is based on the attendance of this Student,ഇത് ഈ വിദ്യാർത്ഥി ഹാജർ അടിസ്ഥാനമാക്കിയുള്ളതാണ്
@@ -2844,12 +2882,11 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,ഡെലിവറി കുറിപ്പുകൾ {0} ഈ സെയിൽസ് ഓർഡർ റദ്ദാക്കുന്നതിൽ മുമ്പ് റദ്ദാക്കി വേണം
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +75,Paid amount + Write Off Amount can not be greater than Grand Total,തുക + തുക ആകെ മൊത്തം വലുതായിരിക്കും കഴിയില്ല ഓഫാക്കുക എഴുതുക
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,{0} is not a valid Batch Number for Item {1},{0} ഇനം {1} ഒരു സാധുവായ ബാച്ച് നമ്പർ അല്ല
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +138,Note: There is not enough leave balance for Leave Type {0},കുറിപ്പ്: വേണ്ടത്ര ലീവ് ബാലൻസ് അനുവാദ ടൈപ്പ് {0} വേണ്ടി ഇല്ല
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,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,ഓപ്പർച്യൂനിറ്റി തരം
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,പുതിയ കമ്പനി
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,Cost Center is required for 'Profit and Loss' account {0},കോസ്റ്റ് കേന്ദ്രം &#39;പ്രോഫിറ്റ് നഷ്ടം&#39; അക്കൗണ്ട് {0} ആവശ്യമാണ്
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,ഇടപാടുകൾ മാത്രമേ കമ്പനി സ്രഷ്ടാവും ഇല്ലാതാക്കാൻ കഴിയും
 apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,ജനറൽ ലെഡ്ജർ എൻട്രികളിൽ തെറ്റായ എണ്ണം കണ്ടെത്തി. നിങ്ങൾ ഇടപാടിലും ഒരു തെറ്റായ അക്കൗണ്ട് തിരഞ്ഞെടുത്ത ചെയ്തേനെ.
 DocType: Cheque Print Template,Cheque Width,ചെക്ക് വീതി
@@ -2858,16 +2895,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,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 +228,{0} '{1}' is disabled,{0} &#39;{1}&#39; അപ്രാപ്തമാക്കിയിട്ടുണ്ടെങ്കിൽ
+apps/erpnext/erpnext/controllers/accounts_controller.py +231,{0} '{1}' is disabled,{0} &#39;{1}&#39; അപ്രാപ്തമാക്കിയിട്ടുണ്ടെങ്കിൽ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ഓപ്പൺ സജ്ജമാക്കുക
 DocType: Cheque Print Template,Scanned Cheque,സ്കാൻ ചെയ്ത ചെക്ക്
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,സമർപ്പിക്കുന്നു ഇടപാടുകൾ ബന്ധങ്ങൾ ഓട്ടോമാറ്റിക് ഇമെയിലുകൾ അയയ്ക്കുക.
+DocType: Timesheet,Total Billable Amount,ആകെ ബില്ലടയ്ക്കണം തുക
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,ഇനം 3
 DocType: Purchase Order,Customer Contact Email,കസ്റ്റമർ കോൺടാക്റ്റ് ഇമെയിൽ
 DocType: Warranty Claim,Item and Warranty Details,ഇനം വാറണ്ടിയുടെയും വിശദാംശങ്ങൾ
 DocType: Sales Team,Contribution (%),കോൺട്രിബ്യൂഷൻ (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,കുറിപ്പ്: &#39;ക്യാഷ് അല്ലെങ്കിൽ ബാങ്ക് അക്കൗണ്ട്&#39; വ്യക്തമാക്കിയില്ല മുതലുള്ള പേയ്മെന്റ് എൻട്രി സൃഷ്ടിച്ച ചെയ്യില്ല
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Responsibilities,ഉത്തരവാദിത്വങ്ങൾ
+apps/erpnext/erpnext/controllers/accounts_controller.py +78,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,ഉത്തരവാദിത്വങ്ങൾ
 DocType: Expense Claim Account,Expense Claim Account,ചിലവേറിയ ക്ലെയിം അക്കൗണ്ട്
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,ഫലകം
 DocType: Sales Person,Sales Person Name,സെയിൽസ് വ്യക്തി നാമം
@@ -2875,6 +2913,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,ഉപയോക്താക്കൾ ചേർക്കുക
 DocType: Pricing Rule,Item Group,ഇനം ഗ്രൂപ്പ്
 DocType: Item,Safety Stock,സുരക്ഷാ സ്റ്റോക്ക്
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,ഇനം കോഡ്&gt; ഇനം ഗ്രൂപ്പ്&gt; ബ്രാൻഡ്
 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),ചേർത്തു നികുതി ചാർജുകളും (കമ്പനി കറൻസി)
@@ -2884,7 +2923,6 @@
 DocType: Item,Default BOM,സ്വതേ BOM ലേക്ക്
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Please re-type company name to confirm,സ്ഥിരീകരിക്കാൻ കമ്പനിയുടെ പേര്-തരം റീ ദയവായി
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +67,Total Outstanding Amt,മൊത്തം ശാരീരിക
-DocType: Timesheet,Total Hours,ആകെ മണിക്കൂർ
 DocType: Journal Entry,Printing Settings,അച്ചടി ക്രമീകരണങ്ങൾ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Total Debit must be equal to Total Credit. The difference is {0},ആകെ ഡെബിറ്റ് ആകെ ക്രെഡിറ്റ് സമാനമോ ആയിരിക്കണം. വ്യത്യാസം {0} ആണ്
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,ഓട്ടോമോട്ടീവ്
@@ -2897,13 +2935,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,നിക്ഷേപ ബാങ്കിംഗ്
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +71,Cash or Bank Account is mandatory for making payment entry,ക്യാഷ് അല്ലെങ്കിൽ ബാങ്ക് അക്കൗണ്ട് പേയ്മെന്റ് എൻട്രി നടത്തുന്നതിനുള്ള നിർബന്ധമായും
 DocType: Purchase Invoice,Price List Exchange Rate,വില പട്ടിക എക്സ്ചേഞ്ച് റേറ്റ്
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,കസ്റ്റമർ&gt; ഉപഭോക്തൃ ഗ്രൂപ്പ്&gt; ടെറിട്ടറി
 DocType: Purchase Invoice Item,Rate,റേറ്റ്
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Intern,തടവുകാരി
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,തടവുകാരി
 DocType: Stock Entry,From BOM,BOM നിന്നും
 DocType: Assessment,Assessment Code,അസസ്മെന്റ് കോഡ്
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +32,Basic,അടിസ്ഥാന
+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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',&#39;ജനറേറ്റുചെയ്യൂ ഷെഡ്യൂൾ&#39; ക്ലിക്ക് ചെയ്യുക ദയവായി
+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 +95,Reference No is mandatory if you entered Reference Date,റഫറൻസ് നിങ്ങൾ റഫറൻസ് തീയതി നൽകിയിട്ടുണ്ടെങ്കിൽ ഇല്ല നിർബന്ധമായും
@@ -2912,11 +2951,11 @@
 DocType: Salary Slip,Salary Structure,ശമ്പളം ഘടന
 DocType: Account,Bank,ബാങ്ക്
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,എയർ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +752,Issue Material,പ്രശ്നം മെറ്റീരിയൽ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +723,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 +683,You are in offline mode. You will not be able to reload until you have network.,നിങ്ങൾ ഓഫ്ലൈൻ മോഡിലാണ്. നിങ്ങൾ നെറ്റ്വർക്ക് ഞങ്ങൾക്കുണ്ട് വരെ ലോഡുചെയ്യണോ കഴിയില്ല.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +665,You are in offline mode. You will not be able to reload until you have network.,നിങ്ങൾ ഓഫ്ലൈൻ മോഡിലാണ്. നിങ്ങൾ നെറ്റ്വർക്ക് ഞങ്ങൾക്കുണ്ട് വരെ ലോഡുചെയ്യണോ കഴിയില്ല.
 DocType: Hub Settings,Access Token,അക്സസ് ടോക്കൺ
 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,സീരിയൽ ഇല്ല
@@ -2924,33 +2963,35 @@
 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 +1122,Enter value must be positive,നൽകുക മൂല്യം പോസിറ്റീവ് ആയിരിക്കണം
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,All Territories,എല്ലാ പ്രദേശങ്ങളും
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1125,Enter value must be positive,നൽകുക മൂല്യം പോസിറ്റീവ് ആയിരിക്കണം
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,എല്ലാ പ്രദേശങ്ങളും
 DocType: Purchase Invoice,Items,ഇനങ്ങൾ
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +23,Student is already enrolled.,വിദ്യാർത്ഥി ഇതിനകം എൻറോൾ ചെയ്തു.
 DocType: Fiscal Year,Year Name,വർഷം പേര്
 DocType: Process Payroll,Process Payroll,പ്രോസസ്സ് ശമ്പളപ്പട്ടിക
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,ഈ മാസം പ്രവർത്തി ദിവസങ്ങളിൽ അധികം വിശേഷദിവസങ്ങൾ ഉണ്ട്.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +233,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 +96,Request for Quotations,ഉദ്ധരണികൾ അഭ്യർത്ഥന
+apps/erpnext/erpnext/hooks.py +104,Request for Quotations,ഉദ്ധരണികൾ അഭ്യർത്ഥന
 DocType: Payment Reconciliation,Maximum Invoice Amount,പരമാവധി ഇൻവോയിസ് തുക
 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 +628,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',മോഡലിന് അളവു യൂണിറ്റ് &#39;{0}&#39; ഫലകം അതേ ആയിരിക്കണം &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',മോഡലിന് അളവു യൂണിറ്റ് &#39;{0}&#39; ഫലകം അതേ ആയിരിക്കണം &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,അടിസ്ഥാനത്തിൽ ഓൺ കണക്കുകൂട്ടുക
 DocType: Delivery Note Item,From Warehouse,വെയർഹൗസിൽ നിന്ന്
 DocType: Assessment,Supervisor Name,സൂപ്പർവൈസർ പേര്
+DocType: Assessment,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,വാങ്ങൽ ഉപയോക്താവ്
 DocType: Notification Control,Customize the Notification,അറിയിപ്പ് ഇഷ്ടാനുസൃതമാക്കുക
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Cash Flow from Operations,ഓപ്പറേഷൻസ് നിന്നുള്ള ക്യാഷ് ഫ്ളോ
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,സ്ഥിരസ്ഥിതി വിലാസം ഫലകം ഇല്ലാതാക്കാൻ കഴിയില്ല
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,സ്ഥിരസ്ഥിതി വിലാസം ഫലകം ഇല്ലാതാക്കാൻ കഴിയില്ല
 DocType: Sales Invoice,Shipping Rule,ഷിപ്പിംഗ് റൂൾ
 DocType: Manufacturer,Limited to 12 characters,12 പ്രതീകങ്ങളായി ലിമിറ്റഡ്
 DocType: Journal Entry,Print Heading,പ്രിന്റ് തലക്കെട്ട്
@@ -2965,8 +3006,8 @@
 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/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,ലക്ഷ്യം qty അല്ലെങ്കിൽ ലക്ഷ്യം തുക ഒന്നുകിൽ നിർബന്ധമായും
-apps/erpnext/erpnext/stock/get_item_details.py +485,No default BOM exists for Item {0},BOM ലേക്ക് ഇനം {0} വേണ്ടി നിലവിലുണ്ട് സഹജമായ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +336,Please select Posting Date first,പോസ്റ്റിംഗ് തീയതി ആദ്യം തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/stock/get_item_details.py +486,No default BOM exists for Item {0},BOM ലേക്ക് ഇനം {0} വേണ്ടി നിലവിലുണ്ട് സഹജമായ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +326,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,നിലവിലുള്ള ഇടപാടുകൾ ചെലവ് കേന്ദ്രം ലെഡ്ജർ പരിവർത്തനം ചെയ്യാൻ കഴിയില്ല
@@ -2982,6 +3023,7 @@
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,ഇൻവോയിസുകൾ കളിയിൽ പേയ്മെന്റുകൾ
 DocType: Journal Entry,Bank Entry,ബാങ്ക് എൻട്രി
 DocType: Authorization Rule,Applicable To (Designation),(തസ്തിക) ബാധകമായ
+,Profitability Analysis,ലാഭവും വിശകലനം
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,കാർട്ടിലേക്ക് ചേർക്കുക
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,ഗ്രൂപ്പ്
 DocType: Guardian,Interests,താൽപ്പര്യങ്ങൾ
@@ -2994,21 +3036,21 @@
 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 +141,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",സീരിയൽ ഇനം {0} ഓഹരി അനുരഞ്ജന ഉപയോഗിച്ച് \ അപ്ഡേറ്റ് ചെയ്യാൻ സാധിക്കില്ല
 DocType: Scheduling Tool,Day,ദിവസം
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,പുതിയ സീരിയൽ പാണ്ടികശാലയും പാടില്ല. വെയർഹൗസ് ഓഹരി എൻട്രി വാങ്ങാനും റെസീപ്റ്റ് സജ്ജമാക്കി വേണം
 DocType: Lead,Lead Type,ലീഡ് തരം
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,You are not authorized to approve leaves on Block Dates,നിങ്ങൾ തടയുക തീയതികളിൽ ഇല അംഗീകരിക്കാൻ അംഗീകാരമില്ല
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,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,സ്വതേ മെറ്റീരിയൽ അഭ്യർത്ഥന ഇനം
-DocType: Student Applicant,AP.,എ.പി..
 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 +639,Point of Sale,വിൽപ്പന പോയിന്റ്
+apps/erpnext/erpnext/accounts/page/pos/pos.js +634,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,നികുതി
 DocType: Production Planning Tool,Production Planning Tool,പ്രൊഡക്ഷൻ ആസൂത്രണ ടൂൾ
@@ -3017,74 +3059,77 @@
 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 +373,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 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 Profile,Customer Group,കസ്റ്റമർ ഗ്രൂപ്പ്
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,Expense account is mandatory for item {0},ചിലവേറിയ ഇനത്തിന്റെ {0} നിര്ബന്ധമാണ്
 DocType: Item,Website Description,വെബ്സൈറ്റ് വിവരണം
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date must be on or after today,അടുത്ത മൂല്യത്തകർച്ച തീയതി ഇന്നത്തെ ന് ശേഷം ആയിരിക്കണം
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,ഇക്വിറ്റി ലെ മൊത്തം മാറ്റം
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +145,Please cancel Purchase Invoice {0} first,വാങ്ങൽ ഇൻവോയ്സ് {0} ആദ്യം റദ്ദാക്കുകയോ ചെയ്യുക
 DocType: Serial No,AMC Expiry Date,എഎംസി കാലഹരണ തീയതി
 ,Sales Register,സെയിൽസ് രജിസ്റ്റർ
 DocType: Quotation,Quotation Lost Reason,ക്വട്ടേഷൻ ലോസ്റ്റ് കാരണം
+apps/erpnext/erpnext/utilities/doctype/address/address.py +164,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,"സഹജമായ വിലാസം ഫലകം കണ്ടെത്തി. സജ്ജീകരണം&gt; അച്ചടി, ബ്രാൻഡിംഗ്&gt; വിലാസം ഫലകം നിന്ന് പുതിയതൊന്ന് സൃഷ്ടിക്കുക."
 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 +330,Transaction reference no {0} dated {1},ഇടപാട് യാതൊരു പരാമർശവുമില്ല {0} dated {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,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 +107,Summary for this month and pending activities,ഈ മാസത്തെ ചുരുക്കം തിർച്ചപ്പെടുത്താത്ത പ്രവർത്തനങ്ങൾ
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,ഈ മാസത്തെ ചുരുക്കം തിർച്ചപ്പെടുത്താത്ത പ്രവർത്തനങ്ങൾ
 DocType: Customer Group,Customer Group Name,കസ്റ്റമർ ഗ്രൂപ്പ് പേര്
 apps/erpnext/erpnext/public/js/financial_statements.js +54,Cash Flow Statement,ക്യാഷ് ഫ്ളോ പ്രസ്താവന
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Please remove this Invoice {0} from C-Form {1},സി-ഫോം {1} നിന്നും ഈ ഇൻവോയിസ് {0} നീക്കം ദയവായി
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,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 +644,Get Items,ഇനങ്ങൾ നേടുക
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +623,Get Items,ഇനങ്ങൾ നേടുക
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +210,Please enter Write Off Account,അക്കൗണ്ട് ഓഫാക്കുക എഴുതുക നൽകുക
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,അവസാന ഓർഡർ തീയതി
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +41,Account {0} does not belongs to company {1},അക്കൗണ്ട് {0} കമ്പനി {1} വകയാണ് ഇല്ല
+DocType: Student,Guardian Details,ഗാർഡിയൻ വിവരങ്ങൾ
 DocType: C-Form,C-Form,സി-ഫോം
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,ഒന്നിലധികം ജീവനക്കാരുടെ അടയാളപ്പെടുത്തുക ഹാജർ
 DocType: Payment Request,Initiated,ആകൃഷ്ടനായി
 DocType: Production Order,Planned Start Date,ആസൂത്രണം ചെയ്ത ആരംഭ തീയതി
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,Customer is required against Receivable account {0},കസ്റ്റമർ സ്വീകാര്യം അക്കൗണ്ട് {0} നേരെ ആവശ്യമാണ്
 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 +265,Project-wise data is not available for Quotation,പ്രോജക്ട് തിരിച്ചുള്ള ഡാറ്റ ക്വട്ടേഷൻ ലഭ്യമല്ല
+apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,പ്രോജക്ട് തിരിച്ചുള്ള ഡാറ്റ ക്വട്ടേഷൻ ലഭ്യമല്ല
 DocType: Project,Expected End Date,പ്രതീക്ഷിച്ച അവസാന തീയതി
 DocType: Budget Account,Budget Amount,ബജറ്റ് തുക
 DocType: Appraisal Template,Appraisal Template Title,അപ്രൈസൽ ഫലകം ശീർഷകം
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,Commercial,ആവശ്യത്തിന്
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,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 +648,Row {0}# Account must be of type 'Fixed Asset',&#39;നിശ്ചിത അസറ്റ്&#39; വരിയുടെ {0} # അക്കൗണ്ട് തരം ആയിരിക്കണം
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,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 +30,Series is mandatory,സീരീസ് നിർബന്ധമാണ്
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +50,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} ആവശ്യമുള്ളതിൽ വെയർഹൗസ്
 DocType: Leave Allocation,Unused leaves,ഉപയോഗിക്കപ്പെടാത്ത ഇല
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Cr,കോടിയുടെ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Cr,കോടിയുടെ
 DocType: Tax Rule,Billing State,ബില്ലിംഗ് സ്റ്റേറ്റ്
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +250,Transfer,ട്രാൻസ്ഫർ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +187,{0} {1} does not associated with Party Account {2},{0} {1} പാർട്ടി അക്കൗണ്ട് {2} ബന്ധപ്പെടുത്തിയ ഇല്ല
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,Fetch exploded BOM (including sub-assemblies),(സബ്-സമ്മേളനങ്ങൾ ഉൾപ്പെടെ) പൊട്ടിത്തെറിക്കുന്ന BOM ലഭ്യമാക്കുക
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +254,Transfer,ട്രാൻസ്ഫർ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +190,{0} {1} does not associated with Party Account {2},{0} {1} പാർട്ടി അക്കൗണ്ട് {2} ബന്ധപ്പെടുത്തിയ ഇല്ല
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +796,Fetch exploded BOM (including sub-assemblies),(സബ്-സമ്മേളനങ്ങൾ ഉൾപ്പെടെ) പൊട്ടിത്തെറിക്കുന്ന BOM ലഭ്യമാക്കുക
 DocType: Authorization Rule,Applicable To (Employee),(ജീവനക്കാർ) ബാധകമായ
-apps/erpnext/erpnext/controllers/accounts_controller.py +115,Due Date is mandatory,അവസാന തീയതി നിർബന്ധമാണ്
+apps/erpnext/erpnext/controllers/accounts_controller.py +118,Due Date is mandatory,അവസാന തീയതി നിർബന്ധമാണ്
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,ഗുണ {0} 0 ആകാൻ പാടില്ല വേണ്ടി വർദ്ധന
 DocType: Journal Entry,Pay To / Recd From,നിന്നും / Recd നൽകാൻ
 DocType: Naming Series,Setup Series,സെറ്റപ്പ് സീരീസ്
 DocType: Payment Reconciliation,To Invoice Date,ഇൻവോയിസ് തീയതി ചെയ്യുക
 DocType: Supplier,Contact HTML,കോൺടാക്റ്റ് എച്ച്ടിഎംഎൽ
 ,Inactive Customers,നിഷ്ക്രിയ ഇടപാടുകാർ
+DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,വാങ്ങൽ രസീതുകൾ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,എങ്ങനെ പ്രൈസിങ് റൂൾ പ്രയോഗിക്കുന്നു?
 DocType: Quality Inspection,Delivery Note No,ഡെലിവറി നോട്ട് ഇല്ല
@@ -3093,7 +3138,7 @@
 DocType: Company,Retail,റീട്ടെയിൽ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +120,Customer {0} does not exist,കസ്റ്റമർ {0} നിലവിലില്ല
 DocType: Attendance,Absent,അസാന്നിദ്ധ്യം
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +587,Product Bundle,ഉൽപ്പന്ന ബണ്ടിൽ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Product Bundle,ഉൽപ്പന്ന ബണ്ടിൽ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Invalid reference {1},വരി {0}: അസാധുവായ റഫറൻസ് {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,നികുതി ചാർജുകളും ഫലകം വാങ്ങുക
 DocType: Upload Attendance,Download Template,ഡൗൺലോഡ് ഫലകം
@@ -3103,8 +3148,8 @@
 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 +742,Send Supplier Emails,വിതരണക്കാരൻ ഇമെയിലുകൾ അയയ്ക്കുക
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +104,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","ശമ്പള ഇതിനകം തമ്മിലുള്ള {0} കാലയളവിൽ പ്രോസസ്സ് {1}, അപ്ലിക്കേഷൻ കാലയളവിൽ വിടുക ഈ തീയതി പരിധിയിൽ തമ്മിലുള്ള പാടില്ല."
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +708,Send Supplier Emails,വിതരണക്കാരൻ ഇമെയിലുകൾ അയയ്ക്കുക
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,"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,ഗാർഡിയൻ പലിശ
 DocType: Timesheet,Employee Detail,ജീവനക്കാരുടെ വിശദാംശം
@@ -3115,9 +3160,9 @@
 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,സമ്പാദിക്കാനുള്ള &amp; കിഴിച്ചുകൊണ്ടു
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +77,Account {0} cannot be a Group,അക്കൗണ്ട് {0} ഒരു ഗ്രൂപ്പ് ആകാൻ പാടില്ല
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} cannot be a Group,അക്കൗണ്ട് {0} ഒരു ഗ്രൂപ്പ് ആകാൻ പാടില്ല
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +31,Optional. This setting will be used to filter in various transactions.,ഓപ്ഷണൽ. ഈ ക്രമീകരണം വിവിധ വ്യവഹാരങ്ങളിൽ ഫിൽട്ടർ ഉപയോഗിക്കും.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +107,Negative Valuation Rate is not allowed,നെഗറ്റീവ് മൂലധനം റേറ്റ് അനുവദനീയമല്ല
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,നെഗറ്റീവ് മൂലധനം റേറ്റ് അനുവദനീയമല്ല
 DocType: Holiday List,Weekly Off,പ്രതിവാര ഓഫാക്കുക
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","ഉദാ 2012 വേണ്ടി, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +39,Provisional Profit / Loss (Credit),താൽക്കാലികഫാ ലാഭം / നഷ്ടം (ക്രെഡിറ്റ്)
@@ -3131,16 +3176,16 @@
 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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: കോസ്റ്റ് കേന്ദ്രം ഇനം {2} നിര്ബന്ധമാണ്
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +626,Get Items from Product Bundle,ഉൽപ്പന്ന ബണ്ടിൽ നിന്നുള്ള ഇനങ്ങൾ നേടുക
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +605,Get Items from Product Bundle,ഉൽപ്പന്ന ബണ്ടിൽ നിന്നുള്ള ഇനങ്ങൾ നേടുക
 DocType: Asset,Straight Line,വര
 DocType: Project User,Project User,പദ്ധതി ഉപയോക്താവ്
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} is inactive,അക്കൗണ്ട് {0} നിഷ്ക്രിയമാണ്
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} is inactive,അക്കൗണ്ട് {0} നിഷ്ക്രിയമാണ്
 DocType: GL Entry,Is Advance,മുൻകൂർ തന്നെയല്ലേ
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,തീയതി ആരംഭിക്കുന്ന തീയതിയും ഹാജർ നിന്ന് ഹാജർ നിർബന്ധമാണ്
 apps/erpnext/erpnext/controllers/buying_controller.py +148,Please enter 'Is Subcontracted' as Yes or No,നൽകുക അതെ അല്ലെങ്കിൽ അല്ല ആയി &#39;Subcontracted മാത്രമാവില്ലല്ലോ&#39;
 DocType: Sales Team,Contact No.,കോൺടാക്റ്റ് നമ്പർ
 DocType: Bank Reconciliation,Payment Entries,പേയ്മെന്റ് എൻട്രികൾ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,'Profit and Loss' type account {0} not allowed in Opening Entry,എൻട്രി തുറക്കുന്നു അനുവദനീയമല്ല &#39;പ്രോഫിറ്റ് നഷ്ടം ടൈപ്പ് അക്കൗണ്ട് {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +71,'Profit and Loss' type account {0} not allowed in Opening Entry,എൻട്രി തുറക്കുന്നു അനുവദനീയമല്ല &#39;പ്രോഫിറ്റ് നഷ്ടം ടൈപ്പ് അക്കൗണ്ട് {0}
 DocType: Program Enrollment Tool,Get Students From,വിദ്യാർത്ഥികൾ നേടുക
 DocType: Hub Settings,Seller Country,വില്പനക്കാരന്റെ രാജ്യം
 apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,വെബ്സൈറ്റ് ഇനങ്ങൾ പ്രസിദ്ധീകരിക്കുക
@@ -3159,7 +3204,7 @@
 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 +558,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","വരി # {0}: അസറ്റ് {1} സമർപ്പിക്കാൻ കഴിയില്ല, അത് ഇതിനകം {2} ആണ്"
+apps/erpnext/erpnext/controllers/accounts_controller.py +561,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","വരി # {0}: അസറ്റ് {1} സമർപ്പിക്കാൻ കഴിയില്ല, അത് ഇതിനകം {2} ആണ്"
 DocType: Tax Rule,Billing Country,ബില്ലിംഗ് രാജ്യം
 DocType: Production Order,Expected Delivery Date,പ്രതീക്ഷിച്ച ഡെലിവറി തീയതി
 apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,"{0} # {1} തുല്യ അല്ല ഡെബിറ്റ്, ക്രെഡിറ്റ്. വ്യത്യാസം {2} ആണ്."
@@ -3172,13 +3217,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +202,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: Sales Order,% Amount Billed,ഈടാക്കൂ% തുക
+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 +117,No Item with Serial No {0},സീരിയൽ ഇല്ല {0} ഉപയോഗിച്ച് ഇല്ല ഇനം
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,ഓപ്പൺ അറിയിപ്പുകൾ
+DocType: Email Digest,Open Notifications,ഓപ്പൺ അറിയിപ്പുകൾ
 DocType: Payment Entry,Difference Amount (Company Currency),വ്യത്യാസം തുക (കമ്പനി കറൻസി)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,നേരിട്ടുള്ള ചെലവുകൾ
 apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
@@ -3186,7 +3231,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,പുതിയ കസ്റ്റമർ റവന്യൂ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,യാത്രാ ചെലവ്
 DocType: Maintenance Visit,Breakdown,പ്രവർത്തന രഹിതം
-apps/erpnext/erpnext/controllers/accounts_controller.py +634,Account: {0} with currency: {1} can not be selected,അക്കൗണ്ട്: {0} കറൻസി കൂടെ: {1} തിരഞ്ഞെടുത്ത ചെയ്യാൻ കഴിയില്ല
+apps/erpnext/erpnext/controllers/accounts_controller.py +637,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}
 DocType: Program Enrollment Tool,Student Applicants,സ്റ്റുഡന്റ് അപേക്ഷകർ
@@ -3194,15 +3239,15 @@
 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 +56,Probation,പരീക്ഷണകാലഘട്ടം
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Probation,പരീക്ഷണകാലഘട്ടം
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,ശമ്പള ഘടകങ്ങൾ
 DocType: Program Enrollment Tool,New Academic Year,ന്യൂ അക്കാദമിക് വർഷം
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Payment of salary for the month {0} and year {1},മാസം {0} ശമ്പളം എന്ന പേയ്മെന്റ് ഉം വർഷം {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Payment of salary for the month {0} and year {1},മാസം {0} ശമ്പളം എന്ന പേയ്മെന്റ് ഉം വർഷം {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,ഓട്ടോ insert വില പട്ടിക നിരക്ക് കാണാനില്ല എങ്കിൽ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,ആകെ തുക
 DocType: Production Order Item,Transferred Qty,മാറ്റിയത് Qty
 apps/erpnext/erpnext/config/learn.py +11,Navigating,നീങ്ങുന്നത്
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Planning,ആസൂത്രണ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,ആസൂത്രണ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,ഇഷ്യൂചെയ്തു
 DocType: Project,Total Billing Amount (via Time Logs),(ടൈം ലോഗുകൾ വഴി) ആകെ ബില്ലിംഗ് തുക
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,We sell this Item,ഞങ്ങൾ ഈ ഇനം വിൽക്കാൻ
@@ -3215,11 +3260,10 @@
 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.,ഇമെയിൽ വഴി പതിവ് സംഗ്രഹം റിപ്പോർട്ടുകൾ അയയ്ക്കുക.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Sales invoice submitted sucessfully.,സെയിൽസ് ഇൻവോയ്സ് മുൻകൂറായി സമർപ്പിച്ചു.
 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} ൽ സ്ഥിര അക്കൗണ്ട് സജ്ജീകരിക്കുക
 DocType: Assessment Result,Student Name,വിദ്യാർഥിയുടെ പേര്
-apps/erpnext/erpnext/hooks.py +104,Assessment Schedule,അസസ്മെന്റ് ഷെഡ്യൂൾ
+apps/erpnext/erpnext/hooks.py +113,Assessment Schedule,അസസ്മെന്റ് ഷെഡ്യൂൾ
 DocType: Brand,Item Manager,ഇനം മാനേജർ
 DocType: Buying Settings,Default Supplier Type,സ്ഥിരസ്ഥിതി വിതരണക്കാരൻ തരം
 DocType: Production Order,Total Operating Cost,ആകെ ഓപ്പറേറ്റിംഗ് ചെലവ്
@@ -3229,6 +3273,7 @@
 DocType: GL Entry,Party Type,പാർട്ടി ടൈപ്പ്
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +78,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 ഒരിക്കലും പാടില്ല
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,ശമ്പളം ടെംപ്ലേറ്റ് മാസ്റ്റർ.
 DocType: Leave Type,Max Days Leave Allowed,മാക്സ് ദിനങ്ങൾ അവധി അനുവദനീയം
@@ -3240,18 +3285,19 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,നയിക്കുന്നു അല്ലെങ്കിൽ ഉപഭോക്താക്കൾക്ക് ഉദ്ധരണികൾ.
 DocType: Stock Settings,Role Allowed to edit frozen stock,ശീതീകരിച്ച സ്റ്റോക്ക് തിരുത്തിയെഴുതുന്നത് അനുവദനീയം റോൾ
 ,Territory Target Variance Item Group-Wise,ടെറിട്ടറി ടാര്ഗറ്റ് പൊരുത്തമില്ലായ്മ ഇനം ഗ്രൂപ്പ് യുക്തിമാനും
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Customer Groups,എല്ലാ ഉപഭോക്തൃ ഗ്രൂപ്പുകൾ
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +78,Accumulated Monthly,പ്രതിമാസം കുമിഞ്ഞു
-apps/erpnext/erpnext/controllers/accounts_controller.py +595,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} നിർബന്ധമാണ്. ഒരുപക്ഷേ കറൻസി എക്സ്ചേഞ്ച് റെക്കോർഡ് {1} {2} വേണ്ടി സൃഷ്ടിക്കപ്പെട്ടിട്ടില്ല.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,എല്ലാ ഉപഭോക്തൃ ഗ്രൂപ്പുകൾ
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +81,Accumulated Monthly,പ്രതിമാസം കുമിഞ്ഞു
+apps/erpnext/erpnext/controllers/accounts_controller.py +598,{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} നിലവിലില്ല
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),വില പട്ടിക നിരക്ക് (കമ്പനി കറൻസി)
 DocType: Products Settings,Products Settings,ഉല്പന്നങ്ങൾ ക്രമീകരണങ്ങൾ
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +188,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,സജ്ജീകരണം&gt; ക്രമീകരണങ്ങൾ&gt; പേരുനൽകുന്നത് സീരീസ് വഴി {0} പരമ്പര പേര് സജ്ജീകരിക്കുക
 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 +84,Secretary,സെക്രട്ടറി
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,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,വാങ്ങൽ
@@ -3260,24 +3306,22 @@
 ,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,അസസ്മെന്റ് പേര്
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,വരി # {0}: സീരിയൽ ഇല്ല നിർബന്ധമാണ്
+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 +859,Supplier Quotation,വിതരണക്കാരൻ ക്വട്ടേഷൻ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +838,Supplier Quotation,വിതരണക്കാരൻ ക്വട്ടേഷൻ
 DocType: Quotation,In Words will be visible once you save the Quotation.,നിങ്ങൾ ക്വട്ടേഷൻ ലാഭിക്കാൻ ഒരിക്കൽ വാക്കുകളിൽ ദൃശ്യമാകും.
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +7,Collect Fees,ഫീസ് ശേഖരിക്കുക
+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} ഉപയോഗിക്കുന്ന
 DocType: Lead,Add to calendar on this date,ഈ തീയതി കലണ്ടർ ചേർക്കുക
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,ഷിപ്പിംഗ് ചിലവും ചേർത്ത് നിയമങ്ങൾ.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,വരാനിരിക്കുന്ന
 DocType: Item,Opening Stock,ഓഹരി തുറക്കുന്നു
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,കസ്റ്റമർ ആവശ്യമാണ്
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} മടങ്ങിവരവ് നിര്ബന്ധമാണ്
 DocType: Purchase Order,To Receive,സ്വീകരിക്കാൻ
 apps/erpnext/erpnext/public/js/setup_wizard.js +195,user@example.com,user@example.com
-DocType: Email Digest,Income / Expense,ആദായ / ചിലവേറിയ
 DocType: Employee,Personal Email,സ്വകാര്യ ഇമെയിൽ
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,ആകെ പൊരുത്തമില്ലായ്മ
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","പ്രവർത്തനക്ഷമമായാൽ, സിസ്റ്റം ഓട്ടോമാറ്റിക്കായി സാധനങ്ങളും വേണ്ടി അക്കൗണ്ടിങ് എൻട്രികൾ പോസ്റ്റ് ചെയ്യും."
@@ -3288,13 +3332,14 @@
 DocType: Customer,From Lead,ലീഡ് നിന്ന്
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,ഉത്പാദനത്തിന് പുറത്തുവിട്ട ഉത്തരവ്.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,ധനകാര്യ വർഷം തിരഞ്ഞെടുക്കുക ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,POS Profile required to make POS Entry,POS ൽ എൻട്രി ഉണ്ടാക്കുവാൻ ആവശ്യമായ POS പ്രൊഫൈൽ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +509,POS Profile required to make POS Entry,POS ൽ എൻട്രി ഉണ്ടാക്കുവാൻ ആവശ്യമായ POS പ്രൊഫൈൽ
 DocType: Program Enrollment Tool,Enroll Students,വിദ്യാർഥികൾ എൻറോൾ
 DocType: Hub Settings,Name Token,ടോക്കൺ പേര്
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,സ്റ്റാൻഡേർഡ് വിൽപ്പനയുള്ളത്
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Atleast one warehouse is mandatory,കുറഞ്ഞത് ഒരു പണ്ടകശാല നിർബന്ധമാണ്
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +129,Atleast one warehouse is mandatory,കുറഞ്ഞത് ഒരു പണ്ടകശാല നിർബന്ധമാണ്
 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 +330,{0} against Sales Invoice {1},{0} സെയിൽസ് ഇൻവോയിസ് {1} നേരെ
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,പ്രോജക്ട് പേര്
@@ -3315,10 +3360,11 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,ഇലകൾ 0.5 ഗുണിതങ്ങളായി നീക്കിവച്ചിരുന്നു വേണം
 DocType: Production Order,Operation Cost,ഓപ്പറേഷൻ ചെലവ്
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,ഒരു .csv ഫയലിൽ നിന്നും ഹാജർ അപ്ലോഡുചെയ്യുക
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,നിലവിലുള്ള ശാരീരിക
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,ഈ സെയിൽസ് പേഴ്സൺ വേണ്ടി ലക്ഷ്യങ്ങളിലൊന്നാണ് ഇനം ഗ്രൂപ്പ് തിരിച്ചുള്ള സജ്ജമാക്കുക.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],[ദിനങ്ങൾ] ചെന്നവർ സ്റ്റോക്കുകൾ ഫ്രീസ്
-apps/erpnext/erpnext/controllers/accounts_controller.py +528,Row #{0}: Asset is mandatory for fixed asset purchase/sale,വരി # {0}: അസറ്റ് നിർണയത്തിനുള്ള അസറ്റ് വാങ്ങൽ / വില്പനയ്ക്ക് നിര്ബന്ധമാണ്
+apps/erpnext/erpnext/controllers/accounts_controller.py +531,Row #{0}: Asset is mandatory for fixed asset purchase/sale,വരി # {0}: അസറ്റ് നിർണയത്തിനുള്ള അസറ്റ് വാങ്ങൽ / വില്പനയ്ക്ക് നിര്ബന്ധമാണ്
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","രണ്ടോ അതിലധികമോ പ്രൈസിങ് നിയമങ്ങൾ മുകളിൽ നിബന്ധനകൾ അടിസ്ഥാനമാക്കി കണ്ടെത്തിയാൽ, മുൻഗണന പ്രയോഗിക്കുന്നു. സ്വതവേയുള്ള മൂല്യം പൂജ്യം (ഇടുക) പോൾ മുൻഗണന 0 20 വരെ തമ്മിലുള്ള ഒരു എണ്ണം. ഹയർ എണ്ണം ഒരേ ഉപാധികളോടെ ഒന്നിലധികം വിലനിർണ്ണയത്തിലേക്ക് അവിടെ കണ്ടാൽ അതിനെ പ്രാധാന്യം എന്നാണ്."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,സാമ്പത്തിക വർഷം: {0} നിലവിലുണ്ട് ഇല്ല
 DocType: Currency Exchange,To Currency,കറൻസി ചെയ്യുക
@@ -3335,15 +3381,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,സ്വകാര്യ ഓഹരി
 DocType: Maintenance Visit,Customer Feedback,കസ്റ്റമർ ഫീഡ്ബാക്ക്
 DocType: Account,Expense,ചിലവേറിയ
-DocType: Sales Invoice,Exhibition,പ്രദർശനം
 apps/erpnext/erpnext/utilities/doctype/address/address.py +77,"Company is mandatory, as it is your company address","അതു നിങ്ങളുടെ കമ്പനി വിലാസം പോലെ കമ്പനി, നിർബന്ധമായും"
 DocType: Item Attribute,From Range,ശ്രേണിയിൽ നിന്നും
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +81,Syntax error in formula or condition: {0},ഫോർമുല അല്ലെങ്കിൽ അവസ്ഥയിൽ വ്യാകരണ പിശക്: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +92,Syntax error in formula or condition: {0},ഫോർമുല അല്ലെങ്കിൽ അവസ്ഥയിൽ വ്യാകരണ പിശക്: {0}
 apps/erpnext/erpnext/stock/utils.py +99,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 +28,Jobs,ജോലി
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,ജോലി
 ,Sales Order Trends,സെയിൽസ് ഓർഡർ ട്രെൻഡുകൾ
 DocType: Employee,Held On,ന് നടക്കും
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,പ്രൊഡക്ഷൻ ഇനം
@@ -3352,16 +3398,16 @@
 DocType: Stock Entry Detail,Additional Cost,അധിക ചെലവ്
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,സാമ്പത്തിക വർഷം അവസാനിക്കുന്ന തീയതി
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","വൗച്ചർ ഭൂഖണ്ടക്രമത്തിൽ എങ്കിൽ, വൗച്ചർ പോസ്റ്റ് അടിസ്ഥാനമാക്കി ഫിൽട്ടർ ചെയ്യാൻ കഴിയില്ല"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +763,Make Supplier Quotation,വിതരണക്കാരൻ ക്വട്ടേഷൻ നിർമ്മിക്കുക
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,Make Supplier Quotation,വിതരണക്കാരൻ ക്വട്ടേഷൻ നിർമ്മിക്കുക
 DocType: Quality Inspection,Incoming,ഇൻകമിംഗ്
 DocType: BOM,Materials Required (Exploded),ആവശ്യമായ മെറ്റീരിയൽസ് (പൊട്ടിത്തെറിക്കുന്ന)
 apps/erpnext/erpnext/public/js/setup_wizard.js +185,"Add users to your organization, other than yourself",നിങ്ങൾ സ്വയം പുറമെ നിങ്ങളുടെ സ്ഥാപനത്തിൻറെ ഉപയോക്താക്കളെ ചേർക്കുക
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,Row # {0}: Serial No {1} does not match with {2} {3},വരി # {0}: സീരിയൽ ഇല്ല {1} {2} {3} കൂടെ പൊരുത്തപ്പെടുന്നില്ല
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +42,Casual Leave,കാഷ്വൽ ലീവ്
+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,കാഷ്വൽ ലീവ്
 DocType: Batch,Batch ID,ബാച്ച് ഐഡി
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,Note: {0},കുറിപ്പ്: {0}
 ,Delivery Note Trends,ഡെലിവറി നോട്ട് ട്രെൻഡുകൾ
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +103,This Week's Summary,ഈ ആഴ്ചത്തെ ചുരുക്കം
+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} മാത്രം ഓഹരി ഇടപാടുകൾ വഴി അപ്ഡേറ്റ് ചെയ്യാൻ കഴിയില്ല
 DocType: Student Group Creation Tool,Get Courses,കോഴ്സുകൾ നേടുക
 DocType: GL Entry,Party,പാർട്ടി
@@ -3371,7 +3417,7 @@
 DocType: Request for Quotation Item,Request for Quotation Item,ക്വട്ടേഷൻ ഇനം അഭ്യർത്ഥന
 DocType: Purchase Order,To Bill,ബില്ലിന്
 DocType: Material Request,% Ordered,% ക്രമപ്പെടുത്തിയ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Piecework,Piecework
+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: Task,Actual Time (in Hours),(അവേഴ്സ്) യഥാർത്ഥ സമയം
 DocType: Employee,History In Company,കമ്പനിയിൽ ചരിത്രം
@@ -3388,7 +3434,7 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +350,{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 +162,Black,ബ്ലാക്ക്
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,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} നിർമ്മിക്കുന്ന ഇനങ്ങൾ
@@ -3399,13 +3445,13 @@
 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 +69,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,മാർക് േചാദി
 DocType: Journal Entry Account,Exchange Rate,വിനിമയ നിരക്ക്
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Sales Order {0} is not submitted,സെയിൽസ് ഓർഡർ {0} സമർപ്പിച്ചിട്ടില്ലെന്നതും
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +527,Sales Order {0} is not submitted,സെയിൽസ് ഓർഡർ {0} സമർപ്പിച്ചിട്ടില്ലെന്നതും
 DocType: Homepage,Tag Line,ടാഗ് ലൈൻ
 DocType: Fee Component,Fee Component,ഫീസ്
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +857,Add items from,നിന്ന് ഇനങ്ങൾ ചേർക്കുക
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +836,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 ഇല്ല
 DocType: Cheque Print Template,Regular,സ്ഥിരമായ
 DocType: BOM,Last Purchase Rate,കഴിഞ്ഞ വാങ്ങൽ റേറ്റ്
@@ -3413,6 +3459,7 @@
 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} വേണ്ടി നിലവിലില്ല കഴിയില്ല
 ,Sales Person-wise Transaction Summary,സെയിൽസ് പേഴ്സൺ തിരിച്ചുള്ള ഇടപാട് ചുരുക്കം
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +60,Cost Center is required for 'Profit and Loss' account {0}. Please set up a default Cost Center for the Company.,കോസ്റ്റ് സെന്റർ &#39;ലാഭവും നഷ്ടവും&#39; അക്കൗണ്ട് {0} ആവശ്യമാണ്. കമ്പനി ഒരു സ്ഥിര കോസ്റ്റ് സെന്റർ സ്ഥാപിക്കും ദയവായി.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,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,പ്രതിമാസ വിതരണ ശതമാനങ്ങൾ
@@ -3423,12 +3470,12 @@
 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 +710,Online,ഓൺലൈൻ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +692,Online,ഓൺലൈൻ
 ,Available Stock for Packing Items,ഇനങ്ങൾ ക്ലാസ്സിലേക് ലഭ്യമാണ് ഓഹരി
 DocType: Item Variant,Item Variant,ഇനം മാറ്റമുള്ള
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,യാതൊരു മറ്റ് സ്വതവേ ഇല്ല സ്വതവേ ഈ വിലാസം ഫലകം ക്രമീകരിക്കുന്നത്
+apps/erpnext/erpnext/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'","ഡെബിറ്റ് ഇതിനകം അക്കൗണ്ട് ബാലൻസ്, നിങ്ങൾ &#39;ക്രെഡിറ്റ്&#39; ആയി &#39;ബാലൻസ് ആയിരിക്കണം&#39; സജ്ജീകരിക്കാൻ അനുവാദമില്ലാത്ത"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Quality Management,ക്വാളിറ്റി മാനേജ്മെന്റ്
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,ക്വാളിറ്റി മാനേജ്മെന്റ്
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,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,ജീവനക്കാർ പുറത്തേക്കുള്ള വർക്ക് ചരിത്രം
@@ -3450,11 +3497,12 @@
 DocType: Student,Student Email ID,വിദ്യാർത്ഥിയുടെ ഇമെയിൽ ഐഡി
 DocType: Employee,Notice (days),അറിയിപ്പ് (ദിവസം)
 DocType: Tax Rule,Sales Tax Template,സെയിൽസ് ടാക്സ് ഫലകം
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1520,Select items to save the invoice,ഇൻവോയ്സ് സംരക്ഷിക്കാൻ ഇനങ്ങൾ തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1544,Select items to save the invoice,ഇൻവോയ്സ് സംരക്ഷിക്കാൻ ഇനങ്ങൾ തിരഞ്ഞെടുക്കുക
 DocType: Employee,Encashment Date,ലീവ് തീയതി
 DocType: Account,Stock Adjustment,സ്റ്റോക്ക് ക്രമീകരണം
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},{0} - സ്വതേ പ്രവർത്തന ചെലവ് പ്രവർത്തനം ഇനം നിലവിലുണ്ട്
 DocType: Production Order,Planned Operating Cost,ആസൂത്രണം ചെയ്ത ഓപ്പറേറ്റിംഗ് ചെലവ്
+DocType: Academic Term,Term Start Date,ടേം ആരംഭ തീയതി
 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,അപേക്ഷകന് പേര്
@@ -3484,17 +3532,17 @@
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,പണ്ടകശാല (നിരന്തരമുള്ള ഇൻവെന്ററി) വേണ്ടി അക്കൗണ്ട് ഈ അക്കൗണ്ട് കീഴിൽ സൃഷ്ടിക്കപ്പെടും.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +119,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,സ്റ്റോക്ക് ലെഡ്ജർ എൻട്രി ഈ വെയർഹൗസ് നിലവിലുണ്ട് പോലെ വെയർഹൗസ് ഇല്ലാതാക്കാൻ കഴിയില്ല.
 DocType: Company,Distribution,വിതരണം
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +8,Amount Paid,തുക
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Project Manager,പ്രോജക്റ്റ് മാനേജർ
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,തുക
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,പ്രോജക്റ്റ് മാനേജർ
 ,Quoted Item Comparison,ഉദ്ധരിച്ച ഇനം താരതമ്യം
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Dispatch,ഡിസ്പാച്ച്
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,ഡിസ്പാച്ച്
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,ഇനത്തിന്റെ അനുവദിച്ചിട്ടുള്ള പരമാവധി കുറഞ്ഞ: {0} ആണ് {1}%
 apps/erpnext/erpnext/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.,സജ്ജമാക്കാൻ ക്രെഡിറ്റ് പരിധി ഇടപാടുകള് സമർപ്പിക്കാൻ അനുവാദമുള്ളൂ ആ റോൾ.
-DocType: Sales Invoice,Supplier Reference,വിതരണക്കാരൻ റഫറൻസ്
-apps/erpnext/erpnext/accounts/page/pos/pos.js +844,"Master data syncing, it might take some time","മാസ്റ്റർ ഡാറ്റ സമന്വയിപ്പിക്കുന്നത്, അതു കുറച്ച് സമയം എടുത്തേക്കാം"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +832,"Master data syncing, it might take some time","മാസ്റ്റർ ഡാറ്റ സമന്വയിപ്പിക്കുന്നത്, അതു കുറച്ച് സമയം എടുത്തേക്കാം"
 DocType: Item,Material Issue,മെറ്റീരിയൽ പ്രശ്നം
 DocType: Hub Settings,Seller Description,വില്പനക്കാരന്റെ വിവരണം
 DocType: Employee Education,Qualification,യോഗ്യത
@@ -3508,7 +3556,7 @@
 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 +83,Error in formula or condition,ഫോർമുല അല്ലെങ്കിൽ കണ്ടീഷൻ പിശക്
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,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,എല്ലാത്തിൻറെയും പരിശോധന
@@ -3517,7 +3565,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},തീയതി സാമ്പത്തിക വർഷത്തിൽ ആയിരിക്കണം. തീയതി = {0} ചെയ്യുക കരുതുന്നു
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","ഇവിടെ നിങ്ങൾ ഉയരം, ഭാരം, അലർജി, മെഡിക്കൽ ആശങ്കകൾ മുതലായവ നിലനിർത്താൻ കഴിയും"
 DocType: Leave Block List,Applies to Company,കമ്പനി പ്രയോഗിക്കുന്നു
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +197,Cannot cancel because submitted Stock Entry {0} exists,സമർപ്പിച്ച ഓഹരി എൻട്രി {0} നിലവിലുണ്ട് കാരണം റദ്ദാക്കാൻ കഴിയില്ല
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +198,Cannot cancel because submitted Stock Entry {0} exists,സമർപ്പിച്ച ഓഹരി എൻട്രി {0} നിലവിലുണ്ട് കാരണം റദ്ദാക്കാൻ കഴിയില്ല
 DocType: Purchase Invoice,In Words,വാക്കുകളിൽ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,Today is {0}'s birthday!,ഇന്ന് {0} ന്റെ ജന്മദിനം ആണ്!
 DocType: Production Planning Tool,Material Request For Warehouse,വെയർഹൗസ് വേണ്ടി മെറ്റീരിയൽ അഭ്യർത്ഥന
@@ -3527,14 +3575,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,നിങ്ങളുടെ സാമ്പത്തിക വർഷം തുടങ്ങുന്നു
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,അസറ്റ് Depreciations നീക്കിയിരിപ്പും
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +319,Amount {0} {1} transferred from {2} to {3},തുക {0} {1} ലേക്ക് {3} {2} നിന്ന് കൈമാറി
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +322,Amount {0} {1} transferred from {2} to {3},തുക {0} {1} ലേക്ക് {3} {2} നിന്ന് കൈമാറി
 DocType: Sales Invoice,Get Advances Received,അഡ്വാൻസുകളും സ്വീകരിച്ചു നേടുക
 DocType: Email Digest,Add/Remove Recipients,ചേർക്കുക / സ്വീകരിക്കുന്നവരെ നീക്കംചെയ്യുക
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +432,Transaction not allowed against stopped Production Order {0},ഇടപാട് നിർത്തിവച്ചു പ്രൊഡക്ഷൻ ഓർഡർ {0} നേരെ അനുവദിച്ചിട്ടില്ല
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +437,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 +143,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 +652,Item variant {0} exists with same attributes,ഇനം വേരിയന്റ് {0} ഒരേ ആട്രിബ്യൂട്ടുകളുമുള്ള നിലവിലുണ്ട്
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,ഇനം വേരിയന്റ് {0} ഒരേ ആട്രിബ്യൂട്ടുകളുമുള്ള നിലവിലുണ്ട്
+DocType: Leave Application,LAP/,ലാപ് /
 DocType: Salary Slip,Salary 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,&#39;തീയതി ആരംഭിക്കുന്ന&#39; ആവശ്യമാണ്
@@ -3542,12 +3591,12 @@
 DocType: Sales Invoice Item,Sales Order Item,സെയിൽസ് ഓർഡർ ഇനം
 DocType: Salary Slip,Payment Days,പേയ്മെന്റ് ദിനങ്ങൾ
 DocType: Customer,Dormant,വായടക്ക്
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +212,Warehouses with child nodes cannot be converted to ledger,കുട്ടി നോഡുകൾ ഉപയോഗിച്ച് അബദ്ധങ്ങളും ലെഡ്ജർ പരിവർത്തനം ചെയ്യാൻ കഴിയില്ല
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +215,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: Employee Education,Employee Education,ജീവനക്കാരുടെ വിദ്യാഭ്യാസം
-apps/erpnext/erpnext/public/js/controllers/transaction.js +866,It is needed to fetch Item Details.,ഇത് ഇനം വിശദാംശങ്ങൾ കൊണ്ടുവരാം ആവശ്യമാണ്.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +857,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} ഇതിനകം ലഭിച്ചു ചെയ്തു
@@ -3557,14 +3606,14 @@
 DocType: Expense Claim,Total Claimed Amount,ആകെ ക്ലെയിം ചെയ്ത തുക
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,വില്ക്കുകയും വരാവുന്ന അവസരങ്ങൾ.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,Invalid {0},അസാധുവായ {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Sick Leave,അസുഖ അവധി
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,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,ഡിപ്പാർട്ട്മെന്റ് സ്റ്റോറുകൾ
 DocType: Warehouse,PIN,പിൻ
 DocType: Sales Invoice,Base Change Amount (Company Currency),തുക ബേസ് മാറ്റുക (കമ്പനി കറൻസി)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +313,No accounting entries for the following warehouses,താഴെ അബദ്ധങ്ങളും വേണ്ടി ഇല്ല അക്കൌണ്ടിങ് എൻട്രികൾ
-apps/erpnext/erpnext/projects/doctype/project/project.js +102,Save the document first.,ആദ്യം പ്രമാണം സംരക്ഷിക്കുക.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +314,No accounting entries for the following warehouses,താഴെ അബദ്ധങ്ങളും വേണ്ടി ഇല്ല അക്കൌണ്ടിങ് എൻട്രികൾ
+apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,ആദ്യം പ്രമാണം സംരക്ഷിക്കുക.
 DocType: Account,Chargeable,ഈടാക്കുന്നതല്ല
 DocType: Company,Change Abbreviation,മാറ്റുക സംഗ്രഹ
 DocType: Expense Claim Detail,Expense Date,ചിലവേറിയ തീയതി
@@ -3577,10 +3626,9 @@
 DocType: Purchase Invoice,Recurring Print Format,ആവർത്തക പ്രിന്റ് ഫോർമാറ്റ്
 DocType: C-Form,Series,സീരീസ്
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,Expected Delivery Date cannot be before Purchase Order Date,പ്രതീക്ഷിച്ച ഡെലിവറി തീയതി വാങ്ങൽ ഓർഡർ തീയതി മുമ്പ് ആകാൻ പാടില്ല
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,സജ്ജീകരണം&gt; ക്രമീകരണങ്ങൾ&gt; പേരുനൽകുന്നത് സീരീസ് വഴി {0} പരമ്പര പേര് സജ്ജീകരിക്കുക
 DocType: Appraisal,Appraisal Template,അപ്രൈസൽ ഫലകം
 DocType: Item Group,Item Classification,ഇനം തിരിക്കൽ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Business Development Manager,ബിസിനസ് ഡെവലപ്മെന്റ് മാനേജർ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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,ജനറൽ ലെഡ്ജർ
@@ -3590,8 +3638,8 @@
 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 +940,Please select {0} first,ആദ്യം {0} തിരഞ്ഞെടുക്കുക
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +749,Batch {0} of Item {1} has expired.,ബാച്ച് {0} ഇനത്തിന്റെ {1} കാലഹരണപ്പെട്ടു.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +953,Please select {0} first,ആദ്യം {0} തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +757,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,ആകെത്തുക
@@ -3608,8 +3656,8 @@
 {% 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 +92,Warehouse not found in the system,വെയർഹൗസ് സിസ്റ്റം കണ്ടെത്തിയില്ല
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +106,This Month's Summary,ഈ മാസം ചുരുക്കം
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,വെയർഹൗസ് സിസ്റ്റം കണ്ടെത്തിയില്ല
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,ഈ മാസം ചുരുക്കം
 DocType: Quality Inspection Reading,Quality Inspection Reading,ക്വാളിറ്റി ഇൻസ്പെക്ഷൻ വായന
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`ഫ്രീസുചെയ്യുക സ്റ്റോക്കുകൾ പഴയ Than`% d ദിവസം കുറവായിരിക്കണം.
 DocType: Tax Rule,Purchase Tax Template,വാങ്ങൽ നികുതി ഫലകം
@@ -3619,21 +3667,22 @@
 DocType: Item Customer Detail,Ref Code,റഫറൻസ് കോഡ്
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,ജീവനക്കാരുടെ റെക്കോർഡുകൾ.
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Please set Next Depreciation Date,അടുത്ത മൂല്യത്തകർച്ച തീയതി സജ്ജമാക്കുക ദയവായി
-DocType: Payment Gateway,Payment Gateway,പേയ്മെന്റ് ഗേറ്റ്വേ
 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 +378,Operation Time must be greater than 0 for Operation {0},ഓപ്പറേഷൻ സമയം ഓപ്പറേഷൻ {0} വേണ്ടി 0 വലുതായിരിക്കണം
+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/accounts/doctype/account/account.py +170,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) നിലനിർത്തുക
 DocType: Program,Program Abbreviation,പ്രോഗ്രാം സംഗ്രഹം
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,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: Appraisal,Start Date,തുടങ്ങുന്ന ദിവസം
@@ -3649,21 +3698,22 @@
 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,ചാർജ് ആ ഇനത്തിനും ബാധകമായ എങ്കിൽ ഇനം നീക്കം
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,ഉദാ. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +27,Transaction currency must be same as Payment Gateway currency,ഇടപാട് കറൻസി പേയ്മെന്റ് ഗേറ്റ്വേ കറൻസി അതേ ആയിരിക്കണം
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Transaction currency must be same as Payment Gateway currency,ഇടപാട് കറൻസി പേയ്മെന്റ് ഗേറ്റ്വേ കറൻസി അതേ ആയിരിക്കണം
 DocType: Payment Entry,Receive,സ്വീകരിക്കുക
+apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,ഉദ്ധരണികൾ:
 DocType: Maintenance Visit,Fully Completed,പൂർണ്ണമായി പൂർത്തിയാക്കി
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,സമ്പൂർണ്ണ {0}%
 DocType: Employee,Educational Qualification,വിദ്യാഭ്യാസ യോഗ്യത
 DocType: Workstation,Operating Costs,ഓപ്പറേറ്റിംഗ് വിലയും
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,സൂക്ഷിക്കുന്നത് പ്രതിമാസം ബജറ്റ് നടപടികൾ കവിഞ്ഞു
 DocType: Purchase Invoice,Submit on creation,സൃഷ്ടിക്കൽ സമർപ്പിക്കുക
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +432,Currency for {0} must be {1},{0} {1} ആയിരിക്കണം വേണ്ടി കറൻസി
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +435,Currency for {0} must be {1},{0} {1} ആയിരിക്കണം വേണ്ടി കറൻസി
 DocType: Asset,Disposal Date,തീർപ്പ് തീയതി
 DocType: Employee Leave Approver,Employee Leave Approver,ജീവനക്കാരുടെ അവധി Approver
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row {0}: An Reorder entry already exists for this warehouse {1},വരി {0}: ഒരു പുനഃക്രമീകരിക്കുക എൻട്രി ഇതിനകം ഈ വെയർഹൗസ് {1} നിലവിലുണ്ട്
+apps/erpnext/erpnext/stock/doctype/item/item.py +495,Row {0}: An Reorder entry already exists for this warehouse {1},വരി {0}: ഒരു പുനഃക്രമീകരിക്കുക എൻട്രി ഇതിനകം ഈ വെയർഹൗസ് {1} നിലവിലുണ്ട്
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +79,"Cannot declare as lost, because Quotation has been made.","നഷ്ടപ്പെട്ട പോലെ ക്വട്ടേഷൻ വെളിപ്പെടുത്താമോ കാരണം, വർണ്ണിക്കും ചെയ്യാൻ കഴിയില്ല."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,വാങ്ങൽ മാസ്റ്റർ മാനേജർ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +429,Production Order {0} must be submitted,പ്രൊഡക്ഷൻ ഓർഡർ {0} സമർപ്പിക്കേണ്ടതാണ്
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +434,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,ഇന്നുവരെ തീയതി മുതൽ മുമ്പ് ആകാൻ പാടില്ല
@@ -3673,25 +3723,27 @@
 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 +181,Totals,ആകെത്തുകകൾ
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,ആകെത്തുകകൾ
 DocType: BOM,Manufacturing,ണം
 ,Ordered Items To Be Delivered,പ്രസവം ഉത്തരവിട്ടു ഇനങ്ങൾ
 DocType: Account,Income,ആദായ
 DocType: Industry Type,Industry Type,വ്യവസായം തരം
 apps/erpnext/erpnext/templates/includes/cart.js +141,Something went wrong!,എന്തോ കുഴപ്പം സംഭവിച്ചു!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,Warning: Leave application contains following block dates,മുന്നറിയിപ്പ്: വിടുക അപേക്ഷ താഴെ ബ്ലോക്ക് തീയതി അടങ്ങിയിരിക്കുന്നു
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +120,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} യൂണിറ്റ്.
+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 +181,Organization unit (department) master.,ഓർഗനൈസേഷൻ യൂണിറ്റ് (വകുപ്പ്) മാസ്റ്റർ.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,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 +793,All records are synced.,എല്ലാ റെക്കോർഡുകളും സമന്വയിപ്പിച്ചു.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +781,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,മുൻവാതിൽ വായ്പകൾ
 DocType: Cost Center,Cost Center Name,കോസ്റ്റ് സെന്റർ പേര്
@@ -3710,21 +3762,20 @@
 DocType: Address,Name of person or organization that this address belongs to.,ഈ വിലാസം ഉൾപ്പെട്ടിരിക്കുന്ന വ്യക്തി അല്ലെങ്കിൽ സംഘടനയുടെ പേര്.
 apps/erpnext/erpnext/public/js/setup_wizard.js +260,Your Suppliers,നിങ്ങളുടെ വിതരണക്കാരും
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +49,Cannot set as Lost as Sales Order is made.,സെയിൽസ് ഓർഡർ കഴിക്കുന്ന പോലെ ലോസ്റ്റ് ആയി സജ്ജമാക്കാൻ കഴിയില്ല.
-DocType: Student Applicant,Mother's Name,അമ്മയുടെ പേര്
 DocType: Request for Quotation Item,Supplier Part No,വിതരണക്കാരൻ ഭാഗം ഇല്ല
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +348,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 +326,Received From,നിന്നു ലഭിച്ച
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Received From,നിന്നു ലഭിച്ച
 DocType: Lead,Converted,പരിവർത്തനം
 DocType: Item,Has Serial No,സീരിയൽ പോസ്റ്റ് ഉണ്ട്
 DocType: Employee,Date of Issue,പുറപ്പെടുവിച്ച തീയതി
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: {0} {1} വേണ്ടി നിന്ന്
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +153,Row #{0}: Set Supplier for item {1},വരി # {0}: ഇനത്തിന്റെ വേണ്ടി സജ്ജമാക്കുക വിതരണക്കാരൻ {1}
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +93,Row {0}: Hours value must be greater than zero.,വരി {0}: മണിക്കൂറുകൾ മൂല്യം പൂജ്യത്തേക്കാൾ വലുതായിരിക്കണം.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +117,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} കണ്ടെത്താൻ കഴിയുന്നില്ല
 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 +172,{0} {1} does not exist,{0} {1} നിലവിലില്ല
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +175,{0} {1} does not exist,{0} {1} നിലവിലില്ല
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,Please check Multi Currency option to allow accounts with other currency,മറ്റ് കറൻസി കൊണ്ട് അക്കൗണ്ടുകൾ അനുവദിക്കുന്നതിന് മൾട്ടി നാണയ ഓപ്ഷൻ പരിശോധിക്കുക
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +72,Item: {0} does not exist in the system,ഇനം: {0} വ്യവസ്ഥിതിയിൽ നിലവിലില്ല
 apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,നിങ്ങൾ ശീതീകരിച്ച മൂല്യം സജ്ജീകരിക്കാൻ അംഗീകാരമില്ല
@@ -3733,13 +3784,14 @@
 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/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,ഹാജർ ഭാവി തീയതി വേണ്ടി അടയാളപ്പെടുത്തും കഴിയില്ല
 DocType: Pricing Rule,Pricing Rule Help,പ്രൈസിങ് റൂൾ സഹായം
 DocType: Purchase Taxes and Charges,Account Head,അക്കൗണ്ട് ഹെഡ്
 apps/erpnext/erpnext/config/stock.py +163,Update additional costs to calculate landed cost of items,ഇനങ്ങളുടെ വന്നിറങ്ങി ചെലവ് കണക്കാക്കാൻ അധിക ചെലവ് അപ്ഡേറ്റ്
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Electrical,ഇലക്ട്രിക്കൽ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Electrical,ഇലക്ട്രിക്കൽ
 DocType: Stock Entry,Total Value Difference (Out - In),(- ഔട്ട്) ആകെ മൂല്യം വ്യത്യാസം
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,Row {0}: Exchange Rate is mandatory,വരി {0}: വിനിമയ നിരക്ക് നിർബന്ധമായും
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ഉപയോക്തൃ ഐഡി ജീവനക്കാരുടെ {0} വെച്ചിരിക്കുന്നു അല്ല
@@ -3747,7 +3799,7 @@
 DocType: Item,Customer Code,കസ്റ്റമർ കോഡ്
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +210,Birthday Reminder for {0},{0} വേണ്ടി ജന്മദിനം
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,കഴിഞ്ഞ ഓർഡർ നു ശേഷം ദിനങ്ങൾ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +292,Debit To account must be a Balance Sheet account,അക്കൗണ്ടിലേക്ക് ഡെബിറ്റ് ഒരു ബാലൻസ് ഷീറ്റ് അക്കൗണ്ട് ആയിരിക്കണം
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To account must be a Balance Sheet account,അക്കൗണ്ടിലേക്ക് ഡെബിറ്റ് ഒരു ബാലൻസ് ഷീറ്റ് അക്കൗണ്ട് ആയിരിക്കണം
 DocType: Buying Settings,Naming Series,സീരീസ് നാമകരണം
 DocType: Leave Block List,Leave Block List Name,ബ്ലോക്ക് പട്ടിക പേര് വിടുക
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,സ്റ്റോക്ക് അസറ്റുകൾ
@@ -3759,11 +3811,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 +301,Salary Slip of employee {0} already created for time sheet {1},ഉദ്യോഗസ്ഥ ജാമ്യം ജി {0} ഇതിനകം സമയം ഷീറ്റ് {1} സൃഷ്ടിച്ച
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +313,Salary Slip of employee {0} already created for time sheet {1},ഉദ്യോഗസ്ഥ ജാമ്യം ജി {0} ഇതിനകം സമയം ഷീറ്റ് {1} സൃഷ്ടിച്ച
 DocType: Sales Order Item,Ordered Qty,ഉത്തരവിട്ടു Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +673,Item {0} is disabled,ഇനം {0} പ്രവർത്തനരഹിതമാക്കിയിരിക്കുന്നതിനാൽ
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} is disabled,ഇനം {0} പ്രവർത്തനരഹിതമാക്കിയിരിക്കുന്നതിനാൽ
 DocType: Stock Settings,Stock Frozen Upto,ഓഹരി ശീതീകരിച്ച വരെ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +838,BOM does not contain any stock item,BOM ലേക്ക് ഏതെങ്കിലും ഓഹരി ഇനം അടങ്ങിയിട്ടില്ല
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +809,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,ശമ്പളം സ്ലിപ്പിൽ ജനറേറ്റുചെയ്യൂ
@@ -3771,23 +3823,24 @@
 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 +485,Row #{0}: Please set reorder quantity,വരി # {0}: സജ്ജീകരിക്കുക പുനഃക്രമീകരിക്കുക അളവ്
+DocType: Sales Invoice Timesheet,Billing Hours,ബില്ലിംഗ് മണിക്കൂർ
+apps/erpnext/erpnext/stock/doctype/item/item.py +487,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 +62,Please set {0},{0} സജ്ജീകരിക്കുക
 DocType: Purchase Invoice,Repeat on Day of Month,മാസം നാളിൽ ആവർത്തിക്കുക
 DocType: Employee,Health Details,ആരോഗ്യ വിശദാംശങ്ങൾ
 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,മുകളിൽ തിരഞ്ഞെടുത്ത തിരയാം എല്ലാ ശമ്പളം സ്ലിപ്പിൽ സമർപ്പിക്കുക
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,സമന്വയിപ്പിച്ചു {0} ഇനങ്ങൾ
 DocType: Sales Order,Partly Delivered,ഭാഗികമായി കൈമാറി
-DocType: Sales Invoice,Existing Customer,നിലവിലുള്ള കസ്റ്റമർ
 DocType: Email Digest,Receivables,Receivables
+DocType: Lead Source,Lead Source,ലീഡ് ഉറവിടം
 DocType: Customer,Additional information regarding the customer.,ഉപഭോക്തൃ സംബന്ധിച്ച കൂടുതൽ വിവരങ്ങൾ.
 DocType: Quality Inspection Reading,Reading 5,5 Reading
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +38,Campaign Name is required,കാമ്പയിൻ പേര് ആവശ്യമാണ്
 DocType: Maintenance Visit,Maintenance Date,മെയിൻറനൻസ് തീയതി
 DocType: Purchase Invoice Item,Rejected Serial No,നിരസിച്ചു സീരിയൽ പോസ്റ്റ്
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +80,Year start date or end date is overlapping with {0}. To avoid please set company,വർഷം ആരംഭിക്കുന്ന തീയതി അല്ലെങ്കിൽ അവസാന തീയതി {0} ഓവർലാപ്പുചെയ്യുന്നു ആണ്. ഒഴിവാക്കാൻ കമ്പനി സജ്ജമാക്കാൻ ദയവായി
@@ -3795,10 +3848,9 @@
 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 +129,BOM and Manufacturing Quantity are required,BOM ലേക്ക് ആൻഡ് ണം ക്വാണ്ടിറ്റി ആവശ്യമാണ്
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,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,മാക്സ് ദൃഢത
-DocType: Bank Reconciliation Detail,Amount,തുക
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM ലേക്ക് മാറ്റിസ്ഥാപിച്ചു
 ,Sales Analytics,സെയിൽസ് അനലിറ്റിക്സ്
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +113,Available {0},ലഭ്യമായ {0}
@@ -3806,14 +3858,14 @@
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,ഇമെയിൽ സജ്ജീകരിക്കുന്നു
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +96,Please enter default currency in Company Master,കമ്പനി മാസ്റ്റർ സ്വതവേയുള്ള കറൻസി നൽകുക
 DocType: Stock Entry Detail,Stock Entry Detail,സ്റ്റോക്ക് എൻട്രി വിശദാംശം
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +100,Daily Reminders,പ്രതിദിന ഓർമപ്പെടുത്തലുകൾ
+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/account/account_tree.js +23,New Account Name,പുതിയ അക്കൗണ്ട് പേര്
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,അസംസ്കൃത വസ്തുക്കൾ ചെലവ് നൽകിയത്
 DocType: Selling Settings,Settings for Selling Module,അതേസമയം മൊഡ്യൂൾ വേണ്ടി ക്രമീകരണങ്ങൾ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Customer Service,കസ്റ്റമർ സർവീസ്
+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/config/hr.py +50,Offer candidate a Job.,സ്ഥാനാർഥി ഒരു ജോലി ഓഫര്.
@@ -3822,8 +3874,9 @@
 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} ഒരു സ്റ്റോക്ക് ഇനം ആയിരിക്കണം
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,പ്രോഗ്രസ് വെയർഹൗസ് സ്വതവെയുള്ള വർക്ക്
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1570,Total nos of serial no is not equal to quantity.,സീരിയൽ യാതൊരു ആകെ എണ്ണം അളവ് തുല്യമല്ല.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1594,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,അപ്ഡേറ്റ് സീരീസ് നമ്പർ
@@ -3831,9 +3884,10 @@
 DocType: Sales Order,Printing Details,അച്ചടി വിശദാംശങ്ങൾ
 DocType: Task,Closing Date,അവസാന തീയതി
 DocType: Sales Order Item,Produced Quantity,നിർമ്മാണം ക്വാണ്ടിറ്റി
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Engineer,എഞ്ചിനീയർ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Engineer,എഞ്ചിനീയർ
+DocType: Journal Entry,Total Amount Currency,ആകെ തുക കറൻസി
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,തിരച്ചിൽ സബ് അസംബ്ലീസ്
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Item Code required at Row No {0},വരി ഇല്ല {0} ആവശ്യമാണ് ഇനം കോഡ്
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +398,Item Code required at Row No {0},വരി ഇല്ല {0} ആവശ്യമാണ് ഇനം കോഡ്
 DocType: Sales Partner,Partner Type,പങ്കാളി തരം
 DocType: Purchase Taxes and Charges,Actual,യഥാർത്ഥ
 DocType: Authorization Rule,Customerwise Discount,Customerwise ഡിസ്കൗണ്ട്
@@ -3849,16 +3903,18 @@
 DocType: BOM,Raw Material Cost,അസംസ്കൃത വസ്തുക്കളുടെ വില
 DocType: Item Reorder,Re-Order Level,വീണ്ടും ഓർഡർ ലെവൽ
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"ഇനങ്ങൾ നൽകുക, നിങ്ങൾ പ്രൊഡക്ഷൻ ഉത്തരവുകൾ ഉയർത്തരുത് വിശകലനം അസംസ്കൃത വസ്തുക്കൾ ഡൌൺലോഡ് ചെയ്യാൻ ആഗ്രഹിക്കുന്ന qty ആസൂത്രണം."
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +55,Part-time,ഭാഗിക സമയം
+apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,Gantt ചാർട്ട്
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,ഭാഗിക സമയം
 DocType: Employee,Applicable Holiday List,ഉപയുക്തമായ ഹോളിഡേ പട്ടിക
 DocType: Employee,Cheque,ചെക്ക്
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,സീരീസ് അപ്ഡേറ്റ്
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +57,Series Updated,സീരീസ് അപ്ഡേറ്റ്
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,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 +87,Clearance Date updated,ക്ലിയറൻസ് തീയതി അപ്ഡേറ്റ്
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,വിജയകരമായി പൊരുത്തപ്പെട്ട
@@ -3872,7 +3928,7 @@
 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 +513,Posting date and posting time is mandatory,തീയതിയും പോസ്റ്റിംഗ് സമയം ചേർക്കൽ നിർബന്ധമായും
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,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.,നിങ്ങൾ വാങ്ങൽ ഓർഡർ രക്ഷിക്കും ഒരിക്കൽ വാക്കുകളിൽ ദൃശ്യമാകും.
@@ -3882,7 +3938,7 @@
 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/stock/doctype/stock_entry/stock_entry.py +158,Target warehouse in row {0} must be same as Production Order,നിരയിൽ ടാർഗെറ്റ് വെയർഹൗസ് {0} പ്രൊഡക്ഷൻ ഓർഡർ അതേ ആയിരിക്കണം
+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,കറൻസി മറ്റ് ചില കറൻസി ഉപയോഗിച്ച് എൻട്രികൾ ചെയ്തശേഷം മാറ്റാൻ കഴിയില്ല
 DocType: Company,Round Off Account,അക്കൗണ്ട് ഓഫാക്കുക റൌണ്ട്
@@ -3891,23 +3947,22 @@
 DocType: Customer Group,Parent Customer Group,പാരന്റ് ഉപഭോക്തൃ ഗ്രൂപ്പ്
 DocType: Purchase Invoice,Contact Email,കോൺടാക്റ്റ് ഇമെയിൽ
 DocType: Appraisal Goal,Score Earned,സ്കോർ നേടി
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Notice Period,നോട്ടീസ് പിരീഡ്
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,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 +4,New Sales Person Name,പുതിയ സെയിൽസ് വ്യക്തി നാമം
 DocType: Packing Slip,Gross Weight UOM,ആകെ ഭാരം UOM
-DocType: Email Digest,Receivables / Payables,Receivables / Payables
 DocType: Delivery Note Item,Against Sales Invoice,സെയിൽസ് ഇൻവോയിസ് എഗെൻസ്റ്റ്
 DocType: Bin,Reserved Qty for Production,പ്രൊഡക്ഷൻ സംവരണം അളവ്
 DocType: Asset,Frequency of Depreciation (Months),മൂല്യത്തകർച്ചയെത്തുടർന്ന് ഫ്രീക്വൻസി (മാസം)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +469,Credit Account,ക്രെഡിറ്റ് അക്കൗണ്ട്
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Credit Account,ക്രെഡിറ്റ് അക്കൗണ്ട്
 DocType: Landed Cost Item,Landed Cost Item,റജിസ്റ്റർ ചെലവ് ഇനം
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +55,Show zero values,പൂജ്യം മൂല്യങ്ങൾ കാണിക്കുക
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,പൂജ്യം മൂല്യങ്ങൾ കാണിക്കുക
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,അസംസ്കൃത വസ്തുക്കളുടെ തന്നിരിക്കുന്ന അളവിൽ നിന്ന് തിരസ്കൃതമൂല്യങ്ങള് / നിര്മ്മാണ ശേഷം ഇനത്തിന്റെ അളവ്
 apps/erpnext/erpnext/public/js/setup_wizard.js +315,Setup a simple website for my organization,സെറ്റപ്പ് എന്റെ ഓർഗനൈസേഷന് ഒരു ലളിതമായ വെബ്സൈറ്റ്
 DocType: Payment Reconciliation,Receivable / Payable Account,സ്വീകാ / അടയ്ക്കേണ്ട അക്കൗണ്ട്
 DocType: Delivery Note Item,Against Sales Order Item,സെയിൽസ് ഓർഡർ ഇനം എഗെൻസ്റ്റ്
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Please specify Attribute Value for attribute {0},ആട്രിബ്യൂട്ട് {0} മൂല്യം ആട്രിബ്യൂട്ട് വ്യക്തമാക്കുക
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},ആട്രിബ്യൂട്ട് {0} മൂല്യം ആട്രിബ്യൂട്ട് വ്യക്തമാക്കുക
 DocType: Item,Default Warehouse,സ്ഥിരസ്ഥിതി വെയർഹൗസ്
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +39,Budget cannot be assigned against Group Account {0},ബജറ്റ് ഗ്രൂപ്പ് അക്കൗണ്ട് {0} നേരെ നിയോഗിക്കുകയും കഴിയില്ല
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,പാരന്റ് കോസ്റ്റ് സെന്റർ നൽകുക
@@ -3929,19 +3984,22 @@
 DocType: Journal Entry,Total Debit,ആകെ ഡെബിറ്റ്
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,സ്വതേ ഉത്പ്പന്ന വെയർഹൗസ് പൂർത്തിയായി
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,സെയിൽസ് വ്യാക്തി
-DocType: Sales Invoice,Cold Calling,കോൾഡ് കാളിംഗ്
 DocType: SMS Parameter,SMS Parameter,എസ്എംഎസ് പാരാമീറ്റർ
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,ബജറ്റ് ചെലവ് കേന്ദ്രം
 DocType: Maintenance Schedule Item,Half Yearly,പകുതി വാർഷികം
 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 +253,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 +141,Set as Lost,ലോസ്റ്റ് സജ്ജമാക്കുക
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,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 +5,This is based on transactions against this Customer. See timeline below for details,ഇത് ഈ കസ്റ്റമർ നേരെ ഇടപാടുകൾ അടിസ്ഥാനമാക്കിയുള്ളതാണ്. വിശദാംശങ്ങൾക്ക് ടൈംലൈൻ കാണുക
 DocType: Supplier,Credit Days Based On,അടിസ്ഥാനമാക്കി ക്രെഡിറ്റ് ദിനങ്ങൾ
@@ -3953,11 +4011,10 @@
 ,Items To Be Requested,അഭ്യർത്ഥിച്ചു ഇനങ്ങൾ
 DocType: Purchase Order,Get Last Purchase Rate,അവസാനം വാങ്ങൽ റേറ്റ് നേടുക
 DocType: Company,Company Info,കമ്പനി വിവരങ്ങൾ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +941,Select or add new customer,പുതിയ ഉപഭോക്തൃ തിരഞ്ഞെടുക്കുക അല്ലെങ്കിൽ ചേർക്കുക
+apps/erpnext/erpnext/accounts/page/pos/pos.js +930,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 +5,This is based on the attendance of this Employee,ഈ ജോലിയില് ഹാജർ അടിസ്ഥാനമാക്കിയുള്ളതാണ്
-DocType: Sales Invoice,Frequency,ഫ്രീക്വൻസി
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +463,Debit Account,ഡെബിറ്റ് അക്കൗണ്ട്
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Debit Account,ഡെബിറ്റ് അക്കൗണ്ട്
 DocType: Fiscal Year,Year Start Date,വർഷം ആരംഭ തീയതി
 DocType: Attendance,Employee Name,ജീവനക്കാരുടെ പേര്
 DocType: Sales Invoice,Rounded Total (Company Currency),വൃത്തത്തിലുള്ള ആകെ (കമ്പനി കറൻസി)
@@ -3966,27 +4023,27 @@
 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 +210,Supplier Quotation {0} created,വിതരണക്കാരൻ ക്വട്ടേഷൻ {0} സൃഷ്ടിച്ചു
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +208,Supplier Quotation {0} created,വിതരണക്കാരൻ ക്വട്ടേഷൻ {0} സൃഷ്ടിച്ചു
 apps/erpnext/erpnext/accounts/report/financial_statements.py +90,End Year cannot be before Start Year,അവസാനിക്കുന്ന വർഷം ആരംഭിക്കുന്ന വർഷം മുമ്പ് ആകാൻ പാടില്ല
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Employee Benefits,ജീവനക്കാരുടെ ആനുകൂല്യങ്ങൾ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,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 +228,Please set a default Holiday List for Employee {0} or Company {1},ഒരു സ്ഥിര ഹോളിഡേ ലിസ്റ്റ് സജ്ജമാക്കാൻ ദയവായി എംപ്ലോയിസ് {0} അല്ലെങ്കിൽ കമ്പനി {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +232,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 +499,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},വരി ഇല്ല {0}: തുക ചിലവിടൽ ക്ലെയിം {1} നേരെ തുക തീർച്ചപ്പെടുത്തിയിട്ടില്ല വലുതായിരിക്കണം കഴിയില്ല. തീർച്ചപ്പെടുത്തിയിട്ടില്ല തുക {2} ആണ്
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +500,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 +1007,Price List not found or disabled,വില പട്ടിക കണ്ടെത്തിയില്ല അല്ലെങ്കിൽ പ്രവർത്തനരഹിതമാക്കിയിട്ടില്ലെന്ന്
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1008,Price List not found or disabled,വില പട്ടിക കണ്ടെത്തിയില്ല അല്ലെങ്കിൽ പ്രവർത്തനരഹിതമാക്കിയിട്ടില്ലെന്ന്
 DocType: Expense Claim,Approved,അംഗീകരിച്ചു
 DocType: Pricing Rule,Price,വില
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +244,Employee relieved on {0} must be set as 'Left',{0} &#39;ഇടത്&#39; ആയി സജ്ജമാക്കാൻ വേണം ന് ആശ്വാസമായി ജീവനക്കാരൻ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +256,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} വേണ്ടി സൃഷ്ടിച്ചു
@@ -3997,12 +4054,12 @@
 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 +259,Please select Employee Record first.,എംപ്ലോയീസ് റെക്കോർഡ് ആദ്യം തിരഞ്ഞെടുക്കുക.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +266,Please select Employee Record first.,എംപ്ലോയീസ് റെക്കോർഡ് ആദ്യം തിരഞ്ഞെടുക്കുക.
 DocType: POS Profile,Account for Change Amount,തുക മാറ്റത്തിനായി അക്കൗണ്ട്
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +190,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},വരി {0}: പാർട്ടി / അക്കൗണ്ട് {3} {4} ൽ {1} / {2} കൂടെ പൊരുത്തപ്പെടുന്നില്ല
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +235,Please enter Expense Account,ചിലവേറിയ നൽകുക
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,Please enter Expense Account,ചിലവേറിയ നൽകുക
 DocType: Account,Stock,സ്റ്റോക്ക്
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,"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 +976,"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,വാങ്ങൽ / ഉത്പാദനം വിവരങ്ങൾ
@@ -4017,9 +4074,10 @@
 DocType: Asset Movement,Transaction Date,ഇടപാട് തീയതി
 DocType: Production Plan Item,Planned Qty,പ്ലാൻ ചെയ്തു Qty
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,ആകെ നികുതി
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,For Quantity (Manufactured Qty) is mandatory,ക്വാണ്ടിറ്റി എന്ന (Qty ഫാക്ടറി) നിർബന്ധമായും
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,For Quantity (Manufactured Qty) is mandatory,ക്വാണ്ടിറ്റി എന്ന (Qty ഫാക്ടറി) നിർബന്ധമായും
 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 +78,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,യഥാർത്ഥ ആരംഭ തീയതി
@@ -4034,9 +4092,11 @@
 DocType: Warranty Claim,If different than customer address,ഉപഭോക്തൃ വിലാസം അധികം വ്യത്യസ്ത എങ്കിൽ
 DocType: BOM Operation,BOM Operation,BOM ഓപ്പറേഷൻ
 DocType: Purchase Taxes and Charges,On Previous Row Amount,മുൻ വരി തുക
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +226,Transfer Asset,അസറ്റ് കൈമാറൽ
+DocType: Student,Home Address,ഹോം വിലാസം
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +227,Transfer Asset,അസറ്റ് കൈമാറൽ
 DocType: POS Profile,POS Profile,POS പ്രൊഫൈൽ
 apps/erpnext/erpnext/config/schools.py +33,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 +129,"Item {0} is a template, please select one of its variants",ഇനം {0} ഫലകം അതിന്റെ വകഭേദങ്ങളും തിരഞ്ഞെടുക്കുക
 DocType: Asset,Asset Category,അസറ്റ് വർഗ്ഗം
@@ -4046,8 +4106,8 @@
 DocType: Assessment,Room,ഇടം
 DocType: Purchase Order,Advance Paid,മുൻകൂർ പണമടച്ചു
 DocType: Item,Item Tax,ഇനം നികുതി
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +765,Material to Supplier,വിതരണക്കാരൻ വരെ മെറ്റീരിയൽ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +189,Excise Invoice,എക്സൈസ് ഇൻവോയിസ്
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,Material to Supplier,വിതരണക്കാരൻ വരെ മെറ്റീരിയൽ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,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,നിലവിലുള്ള ബാധ്യതകൾ
@@ -4057,7 +4117,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,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 +136,Credit Card,ക്രെഡിറ്റ് കാർഡ്
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,ക്രെഡിറ്റ് കാർഡ്
 DocType: BOM,Item to be manufactured or repacked,ഇനം നിർമിക്കുന്ന അല്ലെങ്കിൽ repacked ചെയ്യേണ്ട
 apps/erpnext/erpnext/config/stock.py +174,Default settings for stock transactions.,ഓഹരി ഇടപാടുകൾക്ക് സ്ഥിരസ്ഥിതി ക്രമീകരണങ്ങൾ.
 DocType: Purchase Invoice,Next Date,അടുത്തത് തീയതി
@@ -4065,6 +4125,7 @@
 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: Academic Term,Term End Date,ടേം അവസാന തീയതി
 DocType: Hub Settings,Seller Name,വില്പനക്കാരന്റെ പേര്
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),ഒടുക്കിയ നികുതി ചാർജുകളും (കമ്പനി കറൻസി)
 DocType: Item Group,General Settings,പൊതുവായ ക്രമീകരണങ്ങൾ
@@ -4076,7 +4137,7 @@
 DocType: Customer,Commission Rate,കമ്മീഷൻ നിരക്ക്
 apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,വേരിയന്റ് നിർമ്മിക്കുക
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,വകുപ്പിന്റെ ലീവ് പ്രയോഗങ്ങൾ തടയുക.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +115,"Payment Type must be one of Receive, Pay and Internal Transfer","പേയ്മെന്റ് ഇനം, സ്വീകരിക്കുക ഒന്ന് ആയിരിക്കണം അടച്ച് ആന്തരിക ട്രാൻസ്ഫർ"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +118,"Payment Type must be one of Receive, Pay and Internal Transfer","പേയ്മെന്റ് ഇനം, സ്വീകരിക്കുക ഒന്ന് ആയിരിക്കണം അടച്ച് ആന്തരിക ട്രാൻസ്ഫർ"
 apps/erpnext/erpnext/config/selling.py +169,Analytics,അനലിറ്റിക്സ്
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,കാർട്ട് ശൂന്യമാണ്
 DocType: Production Order,Actual Operating Cost,യഥാർത്ഥ ഓപ്പറേറ്റിംഗ് ചെലവ്
@@ -4091,10 +4152,10 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,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 +92,Designer,ഡിസൈനർ
+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/accounts/doctype/purchase_invoice/purchase_invoice.py +469,Cost Center is required in row {0} in Taxes table for type {1},കോസ്റ്റ് കേന്ദ്രം തരം {1} വേണ്ടി നികുതി പട്ടികയിലെ വരി {0} ആവശ്യമാണ്
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +472,Cost Center is required in row {0} in Taxes table for type {1},കോസ്റ്റ് കേന്ദ്രം തരം {1} വേണ്ടി നികുതി പട്ടികയിലെ വരി {0} ആവശ്യമാണ്
 DocType: Program,Program Code,പ്രോഗ്രാം കോഡ്
 ,Item-wise Purchase Register,ഇനം തിരിച്ചുള്ള വാങ്ങൽ രജിസ്റ്റർ
 DocType: Batch,Expiry Date,കാലഹരണപ്പെടുന്ന തീയതി
@@ -4104,12 +4165,12 @@
 apps/erpnext/erpnext/config/projects.py +13,Project master.,പ്രോജക്ട് മാസ്റ്റർ.
 apps/erpnext/erpnext/controllers/status_updater.py +174,"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 +417, (Half Day),(അര ദിവസം)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425, (Half Day),(അര ദിവസം)
 DocType: Supplier,Credit Days,ക്രെഡിറ്റ് ദിനങ്ങൾ
 DocType: Leave Type,Is Carry Forward,മുന്നോട്ട് വിലക്കുണ്ടോ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +740,Get Items from BOM,BOM ൽ നിന്നുള്ള ഇനങ്ങൾ നേടുക
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +711,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 +549,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},വരി # {0}: {1} പോസ്റ്റുചെയ്ത തീയതി വാങ്ങൽ തീയതി തുല്യമായിരിക്കണം ആസ്തിയുടെ {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +552,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,തമ്മിൽ വെയർഹൗസിൽ നിന്ന് ഒരു അസറ്റ് കൈമാറൽ
diff --git a/erpnext/translations/mr.csv b/erpnext/translations/mr.csv
index 65a581d..94a121f 100644
--- a/erpnext/translations/mr.csv
+++ b/erpnext/translations/mr.csv
@@ -18,11 +18,10 @@
 DocType: Sales Partner,Dealer,विक्रेता
 DocType: Employee,Rented,भाड्याने
 DocType: Purchase Order,PO-,PO-
-apps/erpnext/erpnext/accounts/report/financial_statements.py +19,Start Year {0} not found.,प्रारंभ वर्ष {0} सापडले नाही.
 DocType: POS Profile,Applicable for User,वापरकर्त्यांसाठी  लागू
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +191,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","थांबविलेली  उत्पादन ऑर्डर रद्द करता येणार नाही, रद्द करण्यासाठी प्रथम ती Unstop करा"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +197,Do you really want to scrap this asset?,आपण खरोखर या मालमत्ता स्क्रॅप इच्छित आहे का?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +17,Select Default Supplier,निवडा मुलभूत पुरवठादार
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +192,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","थांबविलेली  उत्पादन ऑर्डर रद्द करता येणार नाही, रद्द करण्यासाठी प्रथम ती Unstop करा"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +198,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 +36,Currency is required for Price List {0},चलन दर सूची आवश्यक आहे {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* व्यवहारामधे  हिशोब केला जाईल.
 DocType: Address,County,काउंटी
@@ -42,46 +41,45 @@
 DocType: Sales Invoice,Customer Name,ग्राहक नाव
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +126,Bank account cannot be named as {0},बँक खाते म्हणून नावाच्या करणे शक्य नाही {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,प्रमुख (किंवा गट) ज्या लेखा नोंदी केले जातात व शिल्लक ठेवली आहेत.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +180,Outstanding for {0} cannot be less than zero ({1}),{0} साठीची बाकी   शून्य ({1}) पेक्षा कमी असू शकत नाही
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,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 +148,Series Updated Successfully,मालिका यशस्वीपणे अद्यतनित
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +149,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,सर्व पुरवठादार संपर्क
-DocType: Quality Inspection Reading,Parameter,मापदंड
 apps/erpnext/erpnext/projects/doctype/project/project.py +54,Expected End Date can not be less than Expected Start Date,अपेक्षित अंतिम तारीख अपेक्षित प्रारंभ तारीख पेक्षा कमी असू शकत नाही
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,रो # {0}: दर सारखाच असणे आवश्यक आहे {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +239,New Leave Application,नवी रजेचा अर्ज
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,New Leave Application,नवी रजेचा अर्ज
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +20,Attendance Record {0} exists against Student {1} for Course Schedule {2},उपस्थिती नोंद {0} कोर्स वेळापत्रक विद्यार्थी {1} विरुद्ध अस्तित्वात {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Bank Draft,बँक ड्राफ्ट
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,बँक ड्राफ्ट
 DocType: Mode of Payment Account,Mode of Payment Account,भरणा खात्याचे  मोड
 apps/erpnext/erpnext/stock/doctype/item/item.js +52,Show Variants,रूपे दर्शवा
 DocType: Academic Term,Academic Term,शैक्षणिक मुदत
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +13,Material,साहित्य
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Quantity,प्रमाण
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +511,Accounts table cannot be blank.,खाती टेबल रिक्त असू शकत नाही.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +616,Quantity,प्रमाण
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +512,Accounts table cannot be blank.,खाती टेबल रिक्त असू शकत नाही.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,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/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 +142,User {0} is already assigned to Employee {1},सदस्य {0} आधीच कर्मचारी  {1} ला  नियुक्त केले आहे
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,हेल्थ केअर
-DocType: Purchase Invoice,Monthly,मासिक
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),भरणा विलंब (दिवस)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +771,Invoice,चलन
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +750,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 +198,Row {0}: {1} {2} does not match with {3},सलग  {0}: {1} {2}  हे  {3}सह जुळत नाही
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,रो # {0}:
+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 +127,Please select Price List,कृपया किंमत सूची निवडा
@@ -112,8 +110,8 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,त्याच कंपनीने  एका  पेक्षा अधिक प्रवेश केला आहे
 DocType: Employee,Married,लग्न
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},{0} ला परवानगी नाही
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +589,Get items from,आयटम मिळवा
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +382,Stock cannot be updated against Delivery Note {0},शेअर वितरण टीप विरुद्ध अद्यतनित करणे शक्य नाही {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,आयटम मिळवा
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,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,किराणा
@@ -122,7 +120,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 +156,Salary Structure Missing,पगार संरचना गहाळ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Salary Structure Missing,पगार संरचना गहाळ
 DocType: Lead,Person Name,व्यक्ती नाव
 DocType: Sales Invoice Item,Sales Invoice Item,विक्री चलन आयटम
 DocType: Account,Credit,क्रेडिट
@@ -130,10 +128,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 +156,Credit limit has been crossed for customer {0} {1}/{2},ग्राहक {0} {1} / {2} साठी क्रेडिट मर्यादा पार गेले आहे
-apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;मुदत मालमत्ता आहे&quot; मालमत्ता रेकॉर्ड आयटम विरुद्ध अस्तित्वात आहे म्हणून, अनचेक केले जाऊ शकत नाही"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +189,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; मालमत्ता रेकॉर्ड आयटम विरुद्ध अस्तित्वात आहे म्हणून, अनचेक केले जाऊ शकत नाही"
 DocType: Tax Rule,Tax Type,कर प्रकार
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +144,You are not authorized to add or update entries before {0},आपल्याला आधी नोंदी जमा करण्यासाठी  किंवा सुधारणा करण्यासाठी अधिकृत नाही {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},आपल्याला आधी नोंदी जमा करण्यासाठी  किंवा सुधारणा करण्यासाठी अधिकृत नाही {0}
 DocType: Item,Item Image (if not slideshow),आयटम प्रतिमा (स्लाईड शो नसेल  तर)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,एक ग्राहक समान नाव अस्तित्वात
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(तास रेट / 60) * प्रत्यक्ष ऑपरेशन वेळ
@@ -143,11 +142,10 @@
 DocType: Student Log,Student Log,विद्यार्थी लॉग
 DocType: Quality Inspection,Get Specification Details,तपशील मिळवा
 DocType: Lead,Interested,इच्छुक
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +165,Opening,उघडणे
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,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/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ग्राहक&gt; ग्राहक गट&gt; प्रदेश
 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.,विद्यमान व्यवहार खाते गट मधे रूपांतरीत केले जाऊ शकत नाही.
@@ -155,7 +153,7 @@
 DocType: Academic Term,Schools,शाळा
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,"पहिली  कंपनीची
 यादी  प्रविष्ट करा"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Company first,कृपया पहिले कंपनी निवडा
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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,एकूण खर्च
@@ -165,7 +163,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,खाते स्टेटमेंट
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,फार्मास्युटिकल्स
 DocType: Purchase Invoice Item,Is Fixed Asset,मुदत मालमत्ता आहे
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Available qty is {0}, you need {1}","उपलब्ध प्रमाण आहे {0}, आपल्याला आवश्यक {1}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +225,"Available qty is {0}, you need {1}","उपलब्ध प्रमाण आहे {0}, आपल्याला आवश्यक {1}"
 DocType: Expense Claim Detail,Claim Amount,दाव्याची रक्कम
 DocType: Employee,Mr,श्री
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,पुरवठादार प्रकार / पुरवठादार
@@ -174,25 +172,26 @@
 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: Assessment Result,Grade,ग्रेड
 DocType: Sales Invoice Item,Delivered By Supplier,पुरवठादार करून वितरित
 DocType: SMS Center,All Contact,सर्व संपर्क
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Annual Salary,वार्षिक पगार
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,शेअर खर्च
-apps/erpnext/erpnext/accounts/report/financial_statements.py +22,End Year {0} not found.,समाप्त वर्ष {0} सापडले नाही.
 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}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,पुरवठा कच्चा माल खरेदी
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +130,At least one mode of payment is required for POS invoice.,पैसे किमान एक मोड POS चलन आवश्यक आहे.
 DocType: Products Settings,Show Products as a List,उत्पादने शो सूची
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","टेम्पलेट डाउनलोड करा , योग्य डेटा भरा आणि संचिकेशी संलग्न करा . निवडलेल्या कालावधीत मध्ये सर्व तारखा आणि कर्मचारी संयोजन , विद्यमान उपस्थिती रेकॉर्ड सह टेम्पलेट मधे येइल"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +451,Item {0} is not active or end of life has been reached,आयटम {0} सक्रिय नाही किंवा आयुष्याच्या शेवट  गाठला  आहे
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +456,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/controllers/accounts_controller.py +614,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","आयटम दर सलग {0} मधे कर समाविष्ट करण्यासाठी, पंक्ती मध्ये कर {1} समाविष्ट करणे आवश्यक आहे"
+apps/erpnext/erpnext/controllers/accounts_controller.py +617,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","आयटम दर सलग {0} मधे कर समाविष्ट करण्यासाठी, पंक्ती मध्ये कर {1} समाविष्ट करणे आवश्यक आहे"
 apps/erpnext/erpnext/config/hr.py +166,Settings for HR Module,एचआर विभाग सेटिंग्ज
 DocType: SMS Center,SMS Center,एसएमएस केंद्र
 DocType: Sales Invoice,Change Amount,रक्कम बदल
@@ -204,13 +203,13 @@
 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 +147,Execution,कार्यवाही
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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,आयटम आणि किंमत
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},एकूण तास: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},तारीख पासून आर्थिक वर्षाच्या आत असावे. गृहीत धरा तारीख पासून  = {0}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,Cost Center {0} does not belong to Company {1},खर्च केंद्र {0} कंपनी  {1} ला संबंधित नाही
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +100,Cost Center {0} does not belong to Company {1},खर्च केंद्र {0} कंपनी  {1} ला संबंधित नाही
 DocType: Customer,Individual,वैयक्तिक
 DocType: Interest,Academics User,शैक्षणिक वापरकर्ता
 DocType: Cheque Print Template,Amount In Figure,आकृती मध्ये रक्कम
@@ -226,30 +225,32 @@
 DocType: Production Planning Tool,Sales Orders,विक्री ऑर्डर
 DocType: Purchase Taxes and Charges,Valuation,मूल्यांकन
 ,Purchase Order Trends,ऑर्डर ट्रेन्ड खरेदी
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,The request for quotation can be accessed by clicking on the following link,अवतरण विनंती खालील लिंक वर क्लिक करून प्रवेश करणे शक्य
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,वर्ष पाने वाटप करा.
 DocType: SG Creation Tool Course,SG Creation Tool Course,एस निर्मिती साधन कोर्स
 DocType: Student Group Creation Tool,Leave blank if you wish to fetch all courses for selected academic term,आपण निवडलेल्या शैक्षणिक मुदत सर्व अभ्यासक्रम प्राप्त करू इच्छित असल्यास रिक्त सोडा
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,Insufficient Stock,अपुरा शेअर
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227,Insufficient Stock,अपुरा शेअर
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,क्षमता नियोजन आणि वेळ ट्रॅकिंग अक्षम करा
+DocType: Email Digest,New Sales Orders,नवी विक्री ऑर्डर
 DocType: Bank Reconciliation,Bank Account,बँक खाते
 DocType: Leave Type,Allow Negative Balance,नकारात्मक शिल्लक परवानगी द्या
 DocType: Selling Settings,Default Territory,मुलभूत प्रदेश
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,दूरदर्शन
 DocType: Production Order Operation,Updated via 'Time Log',&#39;वेळ लॉग&#39; द्वारे अद्यतनित
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} does not belong to Company {1},खाते {0} कंपनी संबंधित नाही {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +86,Account {0} does not belong to Company {1},खाते {0} कंपनी संबंधित नाही {1}
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},आगाऊ रक्कम पेक्षा जास्त असू शकत नाही {0} {1}
 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 +174,For Warehouse is required before Submit,कोठार सादर करा करण्यापूर्वी आवश्यक आहे
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,For Warehouse is required before Submit,कोठार सादर करा करण्यापूर्वी आवश्यक आहे
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,प्राप्त
 DocType: Sales Partner,Reseller,विक्रेता
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,कंपनी प्रविष्ट करा
 DocType: Delivery Note Item,Against Sales Invoice Item,विक्री चलन आयटम विरुद्ध
 ,Production Orders in Progress,प्रगती उत्पादन आदेश
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Cash from Financing,आर्थिक निव्वळ रोख
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1436,"LocalStorage is full , did not save","LocalStorage पूर्ण आहे, जतन नाही"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1460,"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} वर तयार केले जाईल
@@ -262,18 +263,19 @@
 apps/erpnext/erpnext/templates/generators/item.html +78,No description given,वर्णन दिलेले नाही
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,खरेदीसाठी विनंती.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +5,This is based on the Time Sheets created against this project,या या प्रकल्पास विरोध तयार केलेली वेळ पत्रके आधारित आहे
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Only the selected Leave Approver can submit this Leave Application,केवळ निवडलेले रजा साक्षीदार या रजेचा अर्ज सादर करू शकतात
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +213,Only the selected Leave Approver can submit this Leave Application,केवळ निवडलेले रजा साक्षीदार या रजेचा अर्ज सादर करू शकतात
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,relieving तारीख  प्रवेश दिनांक पेक्षा जास्त असणे आवश्यक आहे
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Leaves per Year,रजा वर्ष प्रति
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,रजा वर्ष प्रति
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,रो {0}: कृपया  ' आगाऊ आहे' खाते {1} विरुद्ध  ही  एक आगाऊ नोंद असेल  तर तपासा.
 apps/erpnext/erpnext/stock/utils.py +188,Warehouse {0} does not belong to company {1},कोठार{0}  कंपनी {1} ला  संबंधित नाही
+DocType: Email Digest,Profit & Loss,नफा व तोटा
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,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 +435,Leave Blocked,रजा अवरोधित
-apps/erpnext/erpnext/stock/doctype/item/item.py +669,Item {0} has reached its end of life on {1},आयटम {0} ने त्याच्या जीवनाचा शेवट  {1} वर गाठला  आहे
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +443,Leave Blocked,रजा अवरोधित
+apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item {0} has reached its end of life on {1},आयटम {0} ने त्याच्या जीवनाचा शेवट  {1} वर गाठला  आहे
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +95,Bank Entries,बँक नोंदी
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +83,Annual,वार्षिक
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +86,Annual,वार्षिक
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,शेअर मेळ आयटम
 DocType: Stock Entry,Sales Invoice No,विक्री चलन क्रमांक
 DocType: Material Request Item,Min Order Qty,किमान ऑर्डर Qty
@@ -281,20 +283,22 @@
 DocType: Lead,Do Not Contact,संपर्क करू नका
 apps/erpnext/erpnext/public/js/setup_wizard.js +360,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 +91,Software Developer,सॉफ्टवेअर डेव्हलपर
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,सॉफ्टवेअर डेव्हलपर
 DocType: Item,Minimum Order Qty,किमान ऑर्डर Qty
 DocType: Pricing Rule,Supplier Type,पुरवठादार प्रकार
 DocType: Scheduling Tool,Course Start Date,कोर्स प्रारंभ तारीख
 DocType: Item,Publish in Hub,हब मध्ये प्रकाशित
+DocType: Student Admission,Student Admission,विद्यार्थी प्रवेश
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is cancelled,{0} आयटम रद्द
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Material Request,साहित्य विनंती
+apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} is cancelled,{0} आयटम रद्द
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +823,Material Request,साहित्य विनंती
 DocType: Bank Reconciliation,Update Clearance Date,अद्यतन लाभ तारीख
 apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +28,Abbreviation already used for another salary component,संक्षेप आणखी एक पगार घटक आधीपासून वापरले
 DocType: Item,Purchase Details,खरेदी तपशील
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +328,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},आयटम {0} खरेदी ऑर्डर {1} मध्ये ' कच्चा माल पुरवठा ' टेबल मध्ये आढळला  नाही
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +333,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/config/selling.py +18,Confirmed orders from Customers.,ग्राहक समोर ऑर्डर.
 DocType: Purchase Receipt Item,Rejected Quantity,नाकारल्याचे प्रमाण
 DocType: SMS Settings,SMS Sender Name,एसएमएस प्रेषकाचे नाव
@@ -310,20 +314,21 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +130,Please select Charge Type first,कृपया   पहिले शुल्क प्रकार निवडा
 DocType: Student Group Student,Student Group Student,विद्यार्थी गट विद्यार्थी
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,ताज्या
+DocType: Email Digest,New Quotations,नवी अवतरणे
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,सूचीतील पहिली रजा मंजुरी मुलभूत रजा मंजुरी म्हणून सेट केले जाईल
 DocType: Tax Rule,Shipping County,शिपिंग परगणा
 apps/erpnext/erpnext/config/desktop.py +158,Learn,जाणून घ्या
 DocType: Asset,Next Depreciation Date,पुढील घसारा दिनांक
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,कर्मचारी दर क्रियाकलाप खर्च
 DocType: Accounts Settings,Settings for Accounts,खाती सेटिंग्ज
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +626,Supplier Invoice No exists in Purchase Invoice {0},पुरवठादार चलन कोणतेही चलन खरेदी अस्तित्वात {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +629,Supplier Invoice No exists in Purchase Invoice {0},पुरवठादार चलन कोणतेही चलन खरेदी अस्तित्वात {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,विक्री व्यक्ती वृक्ष व्यवस्थापित करा.
 DocType: Job Applicant,Cover Letter,कव्हर पत्र
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,थकबाकी चेक आणि स्पष्ट ठेवी
 DocType: Item,Synced With Hub,हबला  समक्रमित
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,चुकीचा संकेतशब्द
 DocType: Item,Variant Of,जिच्यामध्ये variant
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,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 +86,Circular Reference Error,परिपत्रक संदर्भ त्रुटी
@@ -335,15 +340,16 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,स्वयंचलित साहित्य विनंती निर्माण ईमेल द्वारे सूचित करा
 DocType: Journal Entry,Multi Currency,मल्टी चलन
 DocType: Payment Reconciliation Invoice,Invoice Type,चलन प्रकार
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +806,Delivery Note,डिलिव्हरी टीप
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +800,Delivery Note,डिलिव्हरी टीप
 apps/erpnext/erpnext/config/learn.py +87,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 +233,Payment Entry has been modified after you pulled it. Please pull it again.,तुम्ही तो pull केल्यानंतर भरणा प्रवेशात   सुधारणा करण्यात आली आहे. तो पुन्हा  खेचा.
+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/setup/doctype/email_digest/email_digest.py +104,Summary for this week and pending activities,या आठवड्यासाठी  आणि प्रलंबित उपक्रम सारांश
+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","स्वल्पविरामाने विभक्त केलेल्या प्रविष्ट करा ई-मेल आयडी, चलन विशिष्ट तारखेला आपोआप पाठविले जाईल"
 DocType: Employee,Company Email,कंपनी ईमेल
@@ -355,27 +361,28 @@
 apps/erpnext/erpnext/config/hr.py +186,"Employee designation (e.g. CEO, Director etc.).","कर्मचारी नाव (उदा मुख्य कार्यकारी अधिकारी, संचालक इ)."
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,फील्ड मूल्य दिन 'म्हणून महिन्याच्या दिवसाची  पुनरावृत्ती' प्रविष्ट करा
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,ग्राहक चलन ग्राहक बेस चलन रूपांतरित दर
-apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},सलग # {0}: चलन खरेदी विद्यमान मालमत्तेचे विरुद्ध केली जाऊ शकत नाही {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +554,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},सलग # {0}: चलन खरेदी विद्यमान मालमत्तेचे विरुद्ध केली जाऊ शकत नाही {1}
 DocType: Item Tax,Tax Rate,कर दर
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} आधीच कर्मचार्यांसाठी वाटप {1} काळात {2} साठी {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +812,Select Item,आयटम निवडा
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +791,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/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,चलन  खरेदी {0} आधीच सादर केलेला आहे
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},रो # {0}: बॅच क्रमांक  {1} {2} ला  समान असणे आवश्यक आहे
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +143,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.,एक आयटम बॅच (भरपूर).
 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 +342,Please see attachment,कृपया संलग्नक पहा
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,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 +19,Setup Already Complete!!,सेटअप आधीच पूर्ण !!
 ,Finished Goods,तयार वस्तू
 DocType: Delivery Note,Instructions,सूचना
 DocType: Quality Inspection,Inspected By,करून पाहणी केली
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,पुरवठादार&gt; पुरवठादार प्रकार
 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,आयटम जोडा
@@ -389,29 +396,29 @@
 DocType: Currency Exchange,Currency Exchange,चलन विनिमय
 DocType: Purchase Invoice Item,Item Name,आयटम नाव
 DocType: Authorization Rule,Approving User  (above authorized value),(अधिकृत मूल्य वरील) वापरकर्ता मंजूर
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,क्रेडिट शिल्लक
+DocType: Email Digest,Credit Balance,क्रेडिट शिल्लक
 DocType: Employee,Widowed,विधवा झालेली किंवा विधुर झालेला
 DocType: Request for Quotation,Request for Quotation,कोटेशन विनंती
 DocType: Salary Slip Timesheet,Working Hours,कामाचे तास
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,विद्यमान मालिकेत सुरू / वर्तमान क्रम संख्या बदला.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","अनेक किंमत नियम विजय सुरू केल्यास, वापरकर्त्यांना संघर्षाचे निराकरण करण्यासाठी स्वतः प्राधान्य सेट करण्यास सांगितले जाते."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +736,Purchase Return,खरेदी परत
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +715,Purchase Return,खरेदी परत
 ,Purchase Register,खरेदी नोंदणी
 DocType: 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 +202,{0} ({1}) must have role 'Leave Approver',{0} ({1}) 'रजा  मंजूर' भूमिका असणे आवश्यक आहे
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,{0} ({1}) must have role 'Leave Approver',{0} ({1}) 'रजा  मंजूर' भूमिका असणे आवश्यक आहे
 DocType: Purchase Receipt,Vehicle Date,वाहन तारीख
 DocType: Student Log,Medical,वैद्यकीय
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,तोट्याचे  कारण
-apps/erpnext/erpnext/accounts/utils.py +239,Allocated amount can not greater than unadjusted amount,रक्कम unadjusted रक्कम अधिक करू शकता
+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,रक्कम unadjusted रक्कम अधिक करू शकता
 DocType: Announcement,Receiver,स्वीकारणारा
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},वर्कस्टेशन सुट्टी यादी नुसार खालील तारखांना बंद आहे: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,संधी
 DocType: Employee,Single,सिंगल
 DocType: Account,Cost of Goods Sold,माल किंमत विक्री
 DocType: Purchase Invoice,Yearly,वार्षिक
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +225,Please enter Cost Center,खर्च केंद्र प्रविष्ट करा
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,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,परीक्षक नाव
@@ -424,26 +431,26 @@
 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,चेक पुरवठादार चलन क्रमांक वैशिष्ट्य
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','प्रकरण क्रमांक' पेक्षा 'प्रकरण क्रमांक पासून' कमी असू शकत नाही
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,Non Profit,नफा नसलेला
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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: Stock Reconciliation Item,Do not include symbols (ex. $),प्रतीक समावेश करू नका (उदा. $)
 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 +638,Attribute {0} selected multiple times in Attributes Table,विशेषता {0} विशेषता टेबल अनेक वेळा निवडले
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,विशेषता {0} विशेषता टेबल अनेक वेळा निवडले
 DocType: HR Settings,Employee record is created using selected field. ,कर्मचारी रेकॉर्ड निवडलेले  फील्ड वापरून तयार आहे.
 DocType: Sales Order,Not Applicable,लागू नाही
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,सुट्टी मास्टर.
 DocType: Request for Quotation Item,Required Date,आवश्यक तारीख
 DocType: Delivery Note,Billing Address,बिलिंग पत्ता
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +862,Please enter Item Code.,आयटम कोड प्रविष्ट करा.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +847,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","तपासल्यास आधीच प्रिंट रेट / प्रिंट रक्कम समाविष्ट म्हणून, कर रक्कम विचारात घेतली जाईल"
@@ -457,12 +464,12 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,सिक्युरिटीज आणि ठेवी
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,वाटप एकूण रजा  अनिवार्य आहे
 DocType: Job Opening,Description of a Job Opening,एक जॉब ओपनिंग वर्णन
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Pending activities for today,आज प्रलंबित उपक्रम
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,आज प्रलंबित उपक्रम
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,उपस्थिती रेकॉर्ड
 DocType: Salary Structure,Salary Component for timesheet based payroll.,timesheet आधारित उपयोग पे रोल पगार घटक.
 DocType: Sales Order Item,Used for Production Plan,उत्पादन योजना करीता वापरले जाते
 DocType: Manufacturing Settings,Time Between Operations (in mins),(मि) प्रक्रिये च्या  दरम्यानची  वेळ
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +92,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} खाते {1} खर्च केंद्र विरुद्ध अर्थसंकल्पात {2} आहे {3}. तो टाकेल {4}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +95,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} खाते {1} खर्च केंद्र विरुद्ध अर्थसंकल्पात {2} आहे {3}. तो टाकेल {4}
 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 सारख्या आयटमसाठी  नाहीत
@@ -470,16 +477,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +238,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 +86,Administrative Officer,प्रशासकीय अधिकारी
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,प्रशासकीय अधिकारी
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +23,Acutal Qty {0} / Waiting Qty {1},Acutal प्रमाण {0} / प्रतीक्षा प्रमाण {1}
 DocType: Timesheet Detail,Hrs,तास
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +319,Please select Company,कृपया कंपनी निवडा
-DocType: Stock Entry,Difference Account,फरक खाते
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +309,Please select Company,कृपया कंपनी निवडा
+DocType: Stock Entry Detail,Difference Account,फरक खाते
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,त्याच्या भोवतालची कार्य {0} बंद नाही म्हणून बंद कार्य करू शकत नाही.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Please enter Warehouse for which Material Request will be raised,ज्या  वखाराविरुद्ध साहित्य विनंती उठविली  जाईल ते  प्रविष्ट करा
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +399,Please enter Warehouse for which Material Request will be raised,ज्या  वखाराविरुद्ध साहित्य विनंती उठविली  जाईल ते  प्रविष्ट करा
 DocType: Production Order,Additional Operating Cost,अतिरिक्त कार्यकारी खर्च
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,सौंदर्यप्रसाधन
-apps/erpnext/erpnext/stock/doctype/item/item.py +530,"To merge, following properties must be same for both items","विलीन करण्यासाठी, खालील गुणधर्म दोन्ही आयटम समान असणे आवश्यक आहे"
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,"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 +28,Buy,खरेदी
@@ -487,7 +494,7 @@
 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 +1563,Serial no item cannot be a fraction,सिरियल नाही आयटम एक अपूर्णांक असू शकत नाही
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1587,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
@@ -496,13 +503,14 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Account {0} does not belong to company: {1},खाते {0} ला  कंपनी {1} संबंधित नाही
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation already used for another company,संक्षेप कंपनीसाठी आधीच वापरला
 DocType: Selling Settings,Default Customer Group,मुलभूत ग्राहक गट
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Supplier is required against Payable account {0},पुरवठादार देय खाते विरुद्ध आवश्यक आहे {0}
 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 असू शकत नाही
 DocType: Production Planning Tool,Material Requirement,साहित्य आवश्यकता
 DocType: Company,Delete Company Transactions,कंपनी व्यवहार हटवा
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +313,Reference No and Reference Date is mandatory for Bank transaction,संदर्भ व संदर्भ तारीख बँक व्यवहार अनिवार्य आहे
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +316,Reference No and Reference Date is mandatory for Bank transaction,संदर्भ व संदर्भ तारीख बँक व्यवहार अनिवार्य आहे
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,कर आणि शुल्क जोडा / संपादित करा
 DocType: Purchase Invoice,Supplier Invoice No,पुरवठादार चलन क्रमांक
 DocType: Territory,For reference,संदर्भासाठी
@@ -513,7 +521,6 @@
 DocType: Installation Note Item,Installation Note Item,प्रतिष्ठापन टीप आयटम
 DocType: Production Plan Item,Pending Qty,प्रलंबित Qty
 DocType: Budget,Ignore,दुर्लक्ष करा
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,आयटम कोड&gt; आयटम गट&gt; ब्रँड
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,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
@@ -524,11 +531,11 @@
 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/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,चलन टेबल मधे  रेकॉर्ड आढळले नाहीत
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +28,Please select Company and Party Type first,कृपया पहिले कंपनी आणि पक्षाचे प्रकार निवडा
+apps/erpnext/erpnext/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/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 +707,Make Sales Order,विक्री ऑर्डर करा
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +701,Make Sales Order,विक्री ऑर्डर करा
 DocType: Project Task,Project Task,प्रकल्प कार्य
 ,Lead Id,लीड आयडी
 DocType: C-Form Invoice Detail,Grand Total,एकूण
@@ -544,7 +551,8 @@
 DocType: Job Applicant,Resume Attachment,सारांश संलग्नक
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,ग्राहक पुन्हा करा
 DocType: Leave Control Panel,Allocate,वाटप
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +734,Sales Return,विक्री परत
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +728,Sales Return,विक्री परत
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +91,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,टीप: एकूण वाटप पाने {0} आधीच मंजूर पाने कमी असू नये {1} कालावधीसाठी
 DocType: Announcement,Posted By,द्वारा पोस्ट केलेले
 DocType: Item,Delivered by Supplier (Drop Ship),पुरवठादार द्वारे वितरित (ड्रॉप जहाज)
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,संभाव्य ग्राहकांच्या डेटाबेस.
@@ -553,14 +561,13 @@
 DocType: Quotation,Quotation To,करण्यासाठी कोटेशन
 DocType: Lead,Middle Income,मध्यम उत्पन्न
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +212,Opening (Cr),उघडणे (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +795,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,आपण अगोदरच काही व्यवहार (चे) दुसर्या UOM केलेल्या कारण {0} थेट बदलले करू शकत नाही आयटम माप मुलभूत युनिट जाईल. आपण वेगळी डीफॉल्ट UOM वापरण्यासाठी एक नवीन आयटम तयार करणे आवश्यक आहे.
-apps/erpnext/erpnext/accounts/utils.py +237,Allocated amount can not be negative,रक्कम नकारात्मक असू शकत नाही
+apps/erpnext/erpnext/stock/doctype/item/item.py +797,Default Unit of Measure for Item {0} cannot be changed directly because 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,रक्कम नकारात्मक असू शकत नाही
 DocType: Purchase Order Item,Billed Amt,बिल रक्कम
 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 +91,Reference No & Reference Date is required for {0},{0} साठी  संदर्भ क्रमांक  आणि संदर्भ तारीख आवश्यक आहे
-DocType: Sales Invoice,Customer's Vendor,ग्राहकाचा  विक्रेता
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Proposal Writing,प्रस्ताव लेखन
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,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","तपासल्यास उप-करारबद्ध साहित्य विनंत्या मध्ये समाविष्ट केले जाईल आहेत की आयटम, कच्चा माल"
@@ -569,13 +576,14 @@
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,वेळ ट्रॅकिंग
 DocType: Fiscal Year Company,Fiscal Year Company,आर्थिक वर्ष कंपनी
 DocType: Packing Slip Item,DN Detail,DN तपशील
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +257,Already supplier quotation has created,आधीच पुरवठादार अवतरण तयार केला आहे
 DocType: Timesheet,Billed,बिल
 DocType: Batch,Batch Description,बॅच वर्णन
+apps/erpnext/erpnext/accounts/utils.py +685,"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 +733,View Offline Records,ऑफलाइन रेकॉर्ड पहा
+apps/erpnext/erpnext/accounts/page/pos/pos.js +715,View Offline Records,ऑफलाइन रेकॉर्ड पहा
+DocType: Student,Sibling Details,भावंडे तपशील
 DocType: Employee,Reason for Resignation,राजीनाम्याचे  कारण
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,कामगिरी मूल्यमापने साचा.
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,चलन / जर्नल प्रवेश तपशील
@@ -589,7 +597,7 @@
 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,यादी निव्वळ बदला
 DocType: Employee,Passport Number,पासपोर्ट क्रमांक
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Manager,व्यवस्थापक
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,व्यवस्थापक
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,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,'आधारीत' आणि 'गट करून' समान असू शकत नाही
@@ -598,10 +606,11 @@
 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 +299,Timesheet created:,Timesheet तयार:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +715,Please set default Cash or Bank account in Mode of Payment {0},मोड ऑफ पेमेंट्स मध्ये डीफॉल्ट रोख किंवा बँक खाते सेट करा {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +300,Timesheet created:,Timesheet तयार:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +772,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,नाव नोंदणी करा
 DocType: Selling Settings,Customer Naming By,करून ग्राहक नामांकन
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,कृपया सेटअप कर्मचारी मानव संसाधन मध्ये प्रणाली नामांकन&gt; एचआर सेटिंग्ज
 DocType: Depreciation Schedule,Depreciation Amount,घसारा रक्कम
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,गट रूपांतरित
 DocType: Activity Cost,Activity Type,क्रियाकलाप प्रकार
@@ -626,6 +635,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,समाप्त
 DocType: Pricing Rule,Sales Manager,विक्री व्यवस्थापक
 DocType: Salary Structure Employee,Base,बेस
+DocType: Timesheet,Total Billed Hours,एकूण बिल आकारले तास
 DocType: Journal Entry,Write Off Amount,Write Off रक्कम
 DocType: Journal Entry,Bill No,बिल नाही
 DocType: Company,Gain/Loss Account on Asset Disposal,लाभ / तोटा लेखा मालमत्ता विल्हेवाट वर
@@ -640,11 +650,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +9,Pre Sales,पूर्व विक्री
 DocType: Purchase Receipt,Other Details,इतर तपशील
 DocType: Account,Accounts,खाते
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Marketing,विपणन
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +227,Payment Entry is already created,भरणा प्रवेश आधीच तयार आहे
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,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 +538,Row #{0}: Asset {1} does not linked to Item {2},सलग # {0}: {1} मालमत्ता आयटम लिंक नाही {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +21,Preview Salary Slip,पूर्वावलोकन पगाराच्या स्लिप्स
+apps/erpnext/erpnext/controllers/accounts_controller.py +541,Row #{0}: Asset {1} does not linked to Item {2},सलग # {0}: {1} मालमत्ता आयटम लिंक नाही {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +38,Preview Salary Slip,पूर्वावलोकन पगाराच्या स्लिप्स
 DocType: Company,Deafult Cost Center,Deafult खर्च केंद्र
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +48,Account {0} has been entered multiple times,खाते {0} अनेक वेळा प्रविष्ट केले गेले आहे
 DocType: Account,Expenses Included In Valuation,खर्च मूल्यांकन मध्ये समाविष्ट
@@ -653,7 +663,7 @@
 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 +617,Item has variants.,आयटमला रूपे आहेत.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,आयटमला रूपे आहेत.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,आयटम {0} आढळला नाही
 DocType: Bin,Stock Value,शेअर मूल्य
 apps/erpnext/erpnext/accounts/doctype/account/account.py +25,Company {0} does not exist,कंपनी {0} अस्तित्वात नाही
@@ -673,7 +683,7 @@
 DocType: Purchase Order,Supply Raw Materials,पुरवठा कच्चा माल
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"पुढील चलन निर्माण केले जातील, ज्या तारखेला. हे सबमिट निर्माण होते."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,वर्तमान मालमत्ता
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,{0} is not a stock Item,{0} एक स्टॉक आयटम नाही
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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 +169,Lead must be set if Opportunity is made from Lead,संधी आघाडी केले आहे तर आघाडी सेट करणे आवश्यक आहे
@@ -740,26 +750,25 @@
 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 +709,No Permission,कोणतीही परवानगी नाही
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +710,No Permission,कोणतीही परवानगी नाही
 DocType: Company,Default Bank Account,मुलभूत बँक खाते
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","पार्टी आधारित फिल्टर कर यासाठी,   पहिले पार्टी पयायय टाइप करा"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},' अद्यतन शेअर ' तपासणे शक्य नाही कारण आयटम द्वारे वितरीत नाही {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,क्रमांक
 DocType: Item,Items with higher weightage will be shown higher,उच्च महत्त्व असलेला आयटम उच्च दर्शविले जाईल
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,बँक मेळ तपशील
-apps/erpnext/erpnext/controllers/accounts_controller.py +542,Row #{0}: Asset {1} must be submitted,सलग # {0}: मालमत्ता {1} सादर करणे आवश्यक आहे
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,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,विक्रेता करण्यासाठी subcontracted असेल  तर
 DocType: SMS Center,All Customer Contact,सर्व ग्राहक संपर्क
 apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,csv द्वारे स्टॉक शिल्लक अपलोड करा.
 DocType: Warehouse,Tree Details,झाड तपशील
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,आता पाठवा
 ,Support Analytics,समर्थन Analytics
 DocType: Item,Website Warehouse,वेबसाइट कोठार
 DocType: Payment Reconciliation,Minimum Invoice Amount,किमान चलन रक्कम
 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/sales_invoice/sales_invoice.py +227,Timesheet {0} is already completed or cancelled,Timesheet {0} आधीच पूर्ण किंवा रद्द
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +259,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 या पेक्षा कमी किंवा या समान असणे आवश्यक आहे
@@ -775,13 +784,13 @@
 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 +229,Target Warehouse,लक्ष्य कोठार
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +230,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-,STE-
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Sales Order Date,अपेक्षित वितरण तारीख विक्री ऑर्डर तारखेच्या आधी असू शकत नाही
 DocType: Upload Attendance,Import Attendance,आयात हजेरी
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,सर्व आयटम गट
+apps/erpnext/erpnext/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/config/setup.py +89,Automatically compose message on submission of transactions.,स्वयंचलितपणे व्यवहार सादर संदेश तयार करा.
@@ -793,13 +802,15 @@
 DocType: Sales Invoice,Payment Due Date,पैसे भरण्याची शेवटची तारिख
 apps/erpnext/erpnext/stock/doctype/item/item.js +278,Item Variant {0} already exists with same attributes,आयटम व्हेरियंट {0} आधीच समान गुणधर्म अस्तित्वात आहे
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;उघडणे&#39;
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,का मुक्त
 DocType: Notification Control,Delivery Note Message,डिलिव्हरी टीप संदेश
 DocType: Expense Claim,Expenses,खर्च
 DocType: Item Variant Attribute,Item Variant Attribute,आयटम व्हेरियंट विशेषता
 ,Purchase Receipt Trends,खरेदी पावती ट्रेन्ड
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Research & Development,संशोधन आणि विकास
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,संशोधन आणि विकास
 ,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,किंमत किंवा सवलत
@@ -808,7 +819,7 @@
 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/controllers/accounts_controller.py +340,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","भरणा प्रवेश {0} ऑर्डर {1}, हे चलन आगाऊ म्हणून कुलशेखरा धावचीत केले पाहिजे की नाही हे तपासण्यासाठी विरूद्ध जोडली आहे."
+apps/erpnext/erpnext/controllers/accounts_controller.py +343,"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,पॉइंट-ऑफ-सेल
@@ -830,12 +841,12 @@
 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 +756,Purchase Receipt,खरेदी पावती
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +735,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 +167,Reference Doctype must be one of {0},संदर्भ Doctype एक असणे आवश्यक आहे {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +282,Unable to find Time Slot in the next {0} days for Operation {1},ऑपरेशन  {1} साठी पुढील {0} दिवसांत वेळ शोधू शकला नाही
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +170,Reference Doctype must be one of {0},संदर्भ Doctype एक असणे आवश्यक आहे {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,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 +439,BOM {0} must be active,BOM {0} सक्रिय असणे आवश्यक आहे
@@ -846,7 +857,7 @@
 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 +214,Warehouses with existing transaction can not be converted to ledger.,विद्यमान व्यवहार गोदामे खातेवही रूपांतरीत केले जाऊ शकत नाही.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +217,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,उत्पादन ऑर्डर
@@ -860,9 +871,9 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,कर्मचारी {0} सक्रिय नाही आहे किंवा अस्तित्वात नाही
 DocType: Fee Structure,Components,घटक
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,Please enter Asset Category in Item {0},आयटम मध्ये मालमत्ता वर्ग प्रविष्ट करा {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +612,Item Variants {0} updated,आयटम रूपे {0} सुधारित
+apps/erpnext/erpnext/stock/doctype/item/item.py +614,Item Variants {0} updated,आयटम रूपे {0} सुधारित
 DocType: Quality Inspection Reading,Reading 6,6 वाचन
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +843,Cannot {0} {1} {2} without any negative outstanding invoice,नाही {0} {1} {2} कोणत्याही नकारात्मक थकबाकी चलन करू शकता
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +854,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,आता समक्रमण
@@ -877,69 +888,72 @@
 DocType: Item,Is Purchase Item,खरेदी आयटम आहे
 DocType: Asset,Purchase Invoice,खरेदी चलन
 DocType: Stock Ledger Entry,Voucher Detail No,प्रमाणक तपशील नाही
-apps/erpnext/erpnext/accounts/page/pos/pos.js +728,New Sales Invoice,नवीन विक्री चलन
+apps/erpnext/erpnext/accounts/page/pos/pos.js +710,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 +728,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: Cheque Print Template,Has Print Format,प्रिंट स्वरूप आहे
-apps/erpnext/erpnext/accounts/page/pos/pos.js +86, is mandatory. Maybe Currency Exchange record is not created for ,बंधनकारक आहे. कदाचित त्यासाठी चलन विनिमय रेकॉर्ड तयार केलेले  नसेल.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +109,Row #{0}: Please specify Serial No for Item {1},रो # {0}: आयटम {1} साठी   सिरियल क्रमांक निर्दिष्ट करा
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +619,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","' उत्पादन बंडल ' आयटम, वखार , सिरीयल व बॅच नाही ' पॅकिंग यादी' टेबल पासून विचार केला जाईल. वखार आणि बॅच कोणत्याही ' उत्पादन बंडल ' आयटम सर्व पॅकिंग आयटम समान असतील तर, त्या मूल्ये मुख्य बाबींचा टेबल मध्ये प्रविष्ट केले जाऊ शकतात , मूल्ये टेबल ' यादी पॅकिंग ' कॉपी केली जाईल ."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +75, 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 +613,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing 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 +606,Supplier Invoice Date cannot be greater than Posting Date,पुरवठादार चलन तारीख पोस्ट दिनांक पेक्षा जास्त असू शकत नाही
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +609,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: 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 +810,Select Item for Transfer,हस्तांतरणासाठी आयटम निवडा
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +789,Select Item for Transfer,हस्तांतरणासाठी आयटम निवडा
 DocType: Purchase Invoice,Additional Discount Percentage,अतिरिक्त सवलत टक्केवारी
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,मदत व्हिडिओ यादी पहा
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,जेथे चेक जमा होतात  ते  बँक प्रमुख खाते निवडा .
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,वापरकर्ता व्यवहार दर सूची दर संपादित करण्याची परवानगी द्या
 DocType: Pricing Rule,Max Qty,कमाल Qty
-DocType: Student Applicant,Father's Name,वडिलांचे नाव
 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 +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,रो {0}: विक्री / खरेदी आदेशा भरणा नेहमी आगाऊ म्हणून चिन्हांकित पाहिजे
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,रासायनिक
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +686,All items have already been transferred for this Production Order.,सर्व आयटम आधीच या उत्पादन ऑर्डर बदल्या करण्यात आल्या आहेत.
+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} आणि पुन्हा प्रयत्न करा
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +694,All items have already been transferred for this Production Order.,सर्व आयटम आधीच या उत्पादन ऑर्डर बदल्या करण्यात आल्या आहेत.
 DocType: Process Payroll,Select Payroll Year and Month,वेतनपट वर्ष आणि महिना निवडा
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,Meter,मीटर
 DocType: Workstation,Electricity Cost,वीज खर्च
 DocType: HR Settings,Don't send Employee Birthday Reminders,कर्मचारी वाढदिवस स्मरणपत्रे पाठवू नका
-DocType: Opportunity,Walk In,मध्ये चाला
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,शेअर नोंदी
 DocType: Item,Inspection Criteria,तपासणी निकष
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,हस्तांतरण
 apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,आपले पत्र डोके आणि लोगो अपलोड करा. (आपण नंतर संपादित करू शकता).
 DocType: Timesheet Detail,Bill,बिल
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,White,व्हाइट
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date is entered as past date,पुढील घसारा तारीख मागील तारीख प्रवेश केला आहे
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +167,White,व्हाइट
 DocType: SMS Center,All Lead (Open),सर्व लीड (उघडा)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +228,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),सलग {0}: प्रमाण उपलब्ध नाही {4} कोठार मध्ये {1} नोंद वेळ पोस्ट करण्यात ({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}),सलग {0}: प्रमाण उपलब्ध नाही {4} कोठार मध्ये {1} नोंद वेळ पोस्ट करण्यात ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,सुधारण अदा करा
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +731,Make ,करा
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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 +154,Order Type must be one of {0},ऑर्डर प्रकार {0} पैकी एक असणे आवश्यक आहे
+apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},ऑर्डर प्रकार {0} पैकी एक असणे आवश्यक आहे
 DocType: Lead,Next Contact Date,पुढील संपर्क तारीख
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Qty उघडणे
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +393,Please enter Account for Change Amount,रक्कम बदल खाते प्रविष्ट करा
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,Please enter Account for Change Amount,रक्कम बदल खाते प्रविष्ट करा
 DocType: Student Batch,Student Batch Name,विद्यार्थी बॅच नाव
 DocType: Holiday List,Holiday List Name,सुट्टी यादी नाव
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js +8,Schedule Course,वेळापत्रक कोर्स
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Stock Options,शेअर पर्याय
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,शेअर पर्याय
 DocType: Journal Entry Account,Expense Claim,खर्च दावा
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +211,Do you really want to restore this scrapped asset?,आपण खरोखर या रद्द मालमत्ता परत करू इच्छिता?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +237,Qty for {0},{0} साठी Qty
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +212,Do you really want to restore this scrapped asset?,आपण खरोखर या रद्द मालमत्ता परत करू इच्छिता?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,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,रजा ब्लॉक यादी तारखा
@@ -948,9 +962,9 @@
 DocType: Company,Default Terms,मुलभूत अटी
 DocType: Packing Slip Item,Packing Slip Item,पॅकिंग स्लिप्स आयटम
 DocType: Purchase Invoice,Cash/Bank Account,रोख / बँक खाते
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,प्रमाणात किंवा मूल्यात बदल नसलेले   आयटम काढले    .
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,प्रमाणात किंवा मूल्यात बदल नसलेले   आयटम काढले    .
 DocType: Delivery Note,Delivery To,वितरण
-apps/erpnext/erpnext/stock/doctype/item/item.py +635,Attribute table is mandatory,विशेषता टेबल अनिवार्य आहे
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,विशेषता टेबल अनिवार्य आहे
 DocType: Production Planning Tool,Get Sales Orders,विक्री ऑर्डर मिळवा
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} नकारात्मक असू शकत नाही
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,कृपया एक विद्यार्थी निवडा
@@ -975,7 +989,7 @@
 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,WIP कोठार
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},सिरियल क्रमांक  {0} हा  {1} पर्यंत देखभाल करार अंतर्गत आहे
+apps/erpnext/erpnext/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,संस्थेचे नाव
@@ -987,7 +1001,7 @@
 DocType: GL Entry,Against,विरुद्ध
 DocType: Item,Default Selling Cost Center,मुलभूत विक्री खर्च केंद्र
 DocType: Sales Partner,Implementation Partner,अंमलबजावणी भागीदार
-apps/erpnext/erpnext/controllers/selling_controller.py +231,Sales Order {0} is {1},विक्री ऑर्डर {0} हे  {1}आहे
+apps/erpnext/erpnext/controllers/selling_controller.py +232,Sales Order {0} is {1},विक्री ऑर्डर {0} हे  {1}आहे
 DocType: Opportunity,Contact Info,संपर्क माहिती
 apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,शेअर नोंदी करून देणे
 DocType: Packing Slip,Net Weight UOM,नेट वजन UOM
@@ -997,25 +1011,24 @@
 DocType: Holiday List,Get Weekly Off Dates,साप्ताहिक बंद तारखा मिळवा
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,समाप्ती तारीख प्रारंभ तारखेच्या पेक्षा कमी असू शकत नाही
 DocType: Sales Person,Select company name first.,प्रथम  कंपनीचे नाव निवडा
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Dr,डॉ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Dr,डॉ
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,अवतरणे पुरवठादारांकडून   प्राप्त झाली.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},करण्यासाठी {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,सरासरी वय
 DocType: 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/templates/pages/home.html +32,View All Products,सर्व उत्पादने पहा
+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 +400,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,चेतावनी: प्रणाली आयटम रक्कम पासून overbilling तपासा नाही {0} मधील {1} शून्य आहे
+apps/erpnext/erpnext/controllers/accounts_controller.py +403,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/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,आणि वर्ष:
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +191,{0} {1} must be submitted,{0} {1} सादर करणे आवश्यक आहे
-DocType: Email Digest,Annual Expense,वार्षिक खर्च
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,{0} {1} must be submitted,{0} {1} सादर करणे आवश्यक आहे
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +145,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} साठी BOM क्षेत्रात BOM निवडा
@@ -1026,30 +1039,31 @@
 DocType: Sales Partner,Distributor,वितरक
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,हे खरेदी सूचीत टाका शिपिंग नियम
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +211,Production Order {0} must be cancelled before cancelling this Sales Order,उत्पादन ऑर्डर {0} या विक्री ऑर्डरआधी  रद्द आधी रद्द करणे आवश्यक आहे
-apps/erpnext/erpnext/public/js/controllers/transaction.js +62,Please set 'Apply Additional Discount On',कृपया 'वर अतिरिक्त सवलत लागू करा'  सेट  करा
+apps/erpnext/erpnext/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,श्रेणी पासून श्रेणी पर्यंत कमी असली पाहिजे
 DocType: Global Defaults,Global Defaults,ग्लोबल डीफॉल्ट
 apps/erpnext/erpnext/projects/doctype/project/project.py +153,Project Collaboration Invitation,प्रकल्प सहयोग आमंत्रण
 DocType: Salary Slip,Deductions,वजावट
+DocType: Leave Allocation,LAL/,लाल /
 apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,प्रारंभ वर्ष
 DocType: Purchase Invoice,Start date of current invoice's period,चालू चलन च्या कालावधी प्रारंभ तारीख
 DocType: Salary Slip,Leave Without Pay,पे न करता रजा
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +327,Capacity Planning Error,क्षमता नियोजन त्रुटी
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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 +362,Finished Item {0} must be entered for Manufacture type entry,पूर्ण आयटम {0} उत्पादन प्रकार नोंदणी करीता प्रविष्ट करणे आवश्यक आहे
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +367,Finished Item {0} must be entered for Manufacture type entry,पूर्ण आयटम {0} उत्पादन प्रकार नोंदणी करीता प्रविष्ट करणे आवश्यक आहे
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,उघडत लेखा शिल्लक
 DocType: Sales Invoice Advance,Sales Invoice Advance,विक्री चलन आगाऊ
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +499,Nothing to request,काहीही विनंती करण्यासाठी
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +500,Nothing to request,काहीही विनंती करण्यासाठी
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','वास्तविक प्रारंभ तारीख' ही 'वास्तविक अंतिम तारीख' यापेक्षा जास्त असू शकत नाही
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Management,व्यवस्थापन
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},एकतर डेबिट किंवा क्रेडिट रक्कम आवश्यक आहे {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,व्यवस्थापन
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +55,Either debit or credit amount is required for {0},एकतर डेबिट किंवा क्रेडिट रक्कम आवश्यक आहे {0}
 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 +161,Blue,ब्लू
+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,ईमेल आयडी सेट करा
@@ -1059,12 +1073,12 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +23,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,मुलभूत आयटम गट
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1374,Do you really want to submit the invoice?,आपण खरोखर चलन जमा करायचा आहे का?
+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 +685,Cost Center For Item with Item Code ',खर्च केंद्र आयटम साठी  'आयटम कोड' बरोबर
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1526,"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 +679,Cost Center For Item with Item Code ',खर्च केंद्र आयटम साठी  'आयटम कोड' बरोबर
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1550,"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 +26,"Further accounts can be made under Groups, but entries can be made against non-Groups","पुढील खाती गट अंतर्गत केले जाऊ शकते, पण नोंदी नॉन-गट  करू शकता"
 DocType: Lead,Lead,लीड
@@ -1084,104 +1098,106 @@
 DocType: Payment Reconciliation,Unreconciled Payment Details,Unreconciled देय तपशील
 DocType: Global Defaults,Current Fiscal Year,चालू आर्थिक वर्ष
 DocType: Global Defaults,Disable Rounded Total,एकूण गोळाबेरीज अक्षम करा
-DocType: Lead,Call,कॉल
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +417,'Entries' cannot be empty,&#39;नोंदी&#39; रिकामे असू शकत नाही
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +418,'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 +214,Fiscal Year {0} not found,आर्थिक वर्ष {0} आढळले नाही
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +221,Fiscal Year {0} not found,आर्थिक वर्ष {0} आढळले नाही
 apps/erpnext/erpnext/config/hr.py +238,Setting up Employees,कर्मचारी सेट अप
 DocType: Sales Order,SO-,SO-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,कृपया पहले उपसर्ग निवडा
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Please select prefix first,कृपया पहले उपसर्ग निवडा
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Research,संशोधन
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,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 +43,Item {0} must be a non-stock item,{0} आयटम एक नॉन-स्टॉक आयटम असणे आवश्यक आहे
 DocType: Contact,User ID,वापरकर्ता आयडी
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +57,View Ledger,लेजर पहा
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,लवकरात लवकर
-apps/erpnext/erpnext/stock/doctype/item/item.py +504,"An Item Group exists with same name, please change the item name or rename the item group","आयटम त्याच नावाने अस्तित्वात  असेल , तर आयटम गट नाव बदल  किंवा आयटम पुनर्नामित करा"
+apps/erpnext/erpnext/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 +437,Rest Of The World,उर्वरित जग
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,आयटम {0} बॅच असू शकत नाही
 ,Budget Variance Report,अर्थसंकल्प फरक अहवाल
 DocType: Salary Slip,Gross Pay,एकूण वेतन
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +90,Row {0}: Activity Type is mandatory.,सलग {0}: क्रियाकलाप प्रकार आवश्यक आहे.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +114,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/public/js/controllers/stock_controller.js +40,Accounting Ledger,लेखा लेजर
+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,कायम ठेवण्यात कमाई
 DocType: BOM Item,Item Description,आयटम वर्णन
+DocType: Student Sibling,Student Sibling,विद्यार्थी भावंड
 DocType: Purchase Invoice,Is Recurring,आवर्ती आहे
 DocType: Purchase Invoice,Supplied Items,पुरवठा आयटम
 DocType: Student,STUD.,STUD.
 DocType: Production Order,Qty To Manufacture,निर्मिती करण्यासाठी  Qty
+DocType: Email Digest,New Income,नवीन उत्पन्न
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,खरेदी सायकल मधे संपूर्ण समान दर ठेवणे
 DocType: Opportunity Item,Opportunity Item,संधी आयटम
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,तात्पुरती उघडणे
 ,Employee Leave Balance,कर्मचारी रजा शिल्लक
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +131,Balance for Account {0} must always be {1},खाते साठी शिल्लक {0} नेहमी असणे आवश्यक आहे {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +175,Valuation Rate required for Item in row {0},मूल्यांकन दर सलग आयटम आवश्यक {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,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,उदाहरण: संगणक विज्ञान मध्ये मास्टर्स
 DocType: Purchase Invoice,Rejected Warehouse,नाकारल्याचे कोठार
 DocType: GL Entry,Against Voucher,व्हाउचर विरुद्ध
 DocType: Item,Default Buying Cost Center,मुलभूत खरेदी खर्च केंद्र
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","ERPNext पासून  सर्वोत्तम प्राप्त करण्यासाठी, आमच्याकडून तुम्हाला काही वेळ घ्या आणि हे मदत व्हिडिओ पाहा  अशी  शिफारसीय आहे."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +87, to ,ते
+apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,ते
 DocType: Item,Lead Time in days,दिवस आघाडीची  वेळ
 ,Accounts Payable Summary,खाती देय सारांश
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Not authorized to edit frozen Account {0},गोठविलेले खाते   {0}  संपादित करण्यासाठी आपण अधिकृत नाही
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},गोठविलेले खाते   {0}  संपादित करण्यासाठी आपण अधिकृत नाही
 DocType: Journal Entry,Get Outstanding Invoices,थकबाकी पावत्या मिळवा
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +62,Sales Order {0} is not valid,विक्री ऑर्डर {0} वैध नाही
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,विक्री ऑर्डर {0} वैध नाही
 apps/erpnext/erpnext/setup/doctype/company/company.py +185,"Sorry, companies cannot be merged","क्षमस्व, कंपन्या विलीन करणे शक्य नाही"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +139,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",एकूण अंक / हस्तांतरण प्रमाणात{0} साहित्य विनंती {1} मध्ये  \ विनंती प्रमाण {2} पेक्षा आयटम{3} साठी    जास्त असू शकत नाही
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Small,लहान
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,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} पासून वापरून पहा
 ,Invoiced Amount (Exculsive Tax),Invoiced रक्कम (Exculsive कर)
-DocType: Student Applicant,Mother's / Guardian 1 Email ID,आईच्या / पालक 1 ईमेल आयडी
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,आयटम 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,खाते प्रमुख {0} तयार
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +160,Green,ग्रीन
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,ग्रीन
 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 +57,Contract,करार
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,करार
 DocType: Email Digest,Add Quote,कोट जोडा
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +498,UOM coversion factor required for UOM: {0} in Item: {1},UOM आवश्यक UOM coversion घटक: {0} आयटम मध्ये: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +503,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 +80,Row {0}: Qty is mandatory,रो {0}: Qty अनिवार्य आहे
+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 +737,Sync Master Data,समक्रमण मास्टर डेटा
+apps/erpnext/erpnext/accounts/page/pos/pos.js +719,Sync Master Data,समक्रमण मास्टर डेटा
 apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,आपली उत्पादने किंवा सेवा
 DocType: Mode of Payment,Mode of Payment,मोड ऑफ पेमेंट्स
 apps/erpnext/erpnext/stock/doctype/item/item.py +178,Website Image should be a public file or website URL,वेबसाइट प्रतिमा सार्वजनिक फाइल किंवा वेबसाइट URL असावी
+DocType: Student Applicant,AP,आंध्र प्रदेश
 DocType: Purchase Invoice Item,BOM,BOM
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,हा रूट आयटम गट आहे आणि संपादित केला जाऊ शकत नाही.
+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 +345,"{0}: Employee email not found, hence email not sent","{0}: कर्मचारी ईमेल आढळले नाही, म्हणून पाठविले नाही ई-मेल"
+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,आपल्या  कंपनीचा  पत्ता आहे का ?
 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 +118,"For {0}, only credit accounts can be linked against another debit entry","{0}, फक्त क्रेडिट खात्यांच्या दुसऱ्या नावे नोंद लिंक जाऊ शकते"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Delivery Note {0} is not submitted,"डिलिव्हरी टीप {0} सबमिट केलेली नाही,"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Delivery Note {0} is not submitted,"डिलिव्हरी टीप {0} सबमिट केलेली नाही,"
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Sub-contracted Item,आयटम {0} सब-करारबद्ध आयटम असणे आवश्यक आहे
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,कॅपिटल उपकरणे
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","किंमत नियम 'रोजी लागू करा' field वर  आधारित पहिले निवडलेला आहे , जो आयटम, आयटम गट किंवा ब्रॅण्ड असू शकतो"
 DocType: Hub Settings,Seller Website,विक्रेता वेबसाइट
 DocType: Item,ITEM-,ITEM-
-apps/erpnext/erpnext/controllers/selling_controller.py +147,Total allocated percentage for sales team should be 100,विक्री संघ एकूण वाटप टक्केवारी 100 असावे
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +110,Production Order status is {0},उत्पादन आदेश स्थिती {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,विक्री संघ एकूण वाटप टक्केवारी 100 असावे
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},उत्पादन आदेश स्थिती {0}
 DocType: Appraisal Goal,Goal,लक्ष्य
 DocType: Sales Invoice Item,Edit Description,वर्णन संपादित करा
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +757,For Supplier,पुरवठादार साठी
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +723,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,प्रिंट स्वरूप तयार करा
@@ -1197,10 +1213,11 @@
 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,ग्रेड कोड
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ई-मेल सारांश:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +445,BOM {0} does not belong to Item {1},BOM {0} आयटम संबंधित नाही {1}
 DocType: Sales Partner,Target Distribution,लक्ष्य वितरण
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1667,Deafault warehouse is required for selected item,Deafault कोठार निवडलेले आयटम आवश्यक आहे
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Deafault warehouse is required for selected item,Deafault कोठार निवडलेले आयटम आवश्यक आहे
 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 वाचन
@@ -1209,23 +1226,23 @@
 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 +110,Hardware,हार्डवेअर
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,हार्डवेअर
 DocType: Sales Order,Recurring Upto,आवर्ती पर्यंत
 DocType: Attendance,HR Manager,एचआर व्यवस्थापक
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,कृपया कंपनी निवडा
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Privilege Leave,रजा
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,रजा
 DocType: Purchase Invoice,Supplier Invoice Date,पुरवठादार चलन तारीख
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,आपण हे खरेदी सूचीत टाका सक्षम करणे आवश्यक आहे
 DocType: Payment Entry,Writeoff,Writeoff
 DocType: Appraisal Template Goal,Appraisal Template Goal,मूल्यांकन साचा लक्ष्य
-DocType: Salary Slip,Earning,कमाई
+DocType: Salary Component,Earning,कमाई
 DocType: Purchase Invoice,Party Account Currency,पार्टी खाते चलन
 ,BOM Browser,BOM ब्राउझर
 DocType: Purchase Taxes and Charges,Add or Deduct,जोडा किंवा वजा
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,दरम्यान आढळलेल्या  आच्छादित अटी:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +171,Against Journal Entry {0} is already adjusted against some other voucher,जर्नल विरुद्ध प्रवेश {0} आधीच काही इतर व्हाउचर विरुद्ध सुस्थीत केले जाते
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,जर्नल विरुद्ध प्रवेश {0} आधीच काही इतर व्हाउचर विरुद्ध सुस्थीत केले जाते
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,एकूण ऑर्डर मूल्य
-apps/erpnext/erpnext/demo/setup_data.py +358,Food,अन्न
+apps/erpnext/erpnext/demo/setup/setup_data.py +301,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/course_schedule/course_schedule.js +103,Mark Attendence,मार्क हजेरी
@@ -1259,12 +1276,12 @@
 DocType: Sales Order Item,Planned Quantity,नियोजनबद्ध प्रमाण
 DocType: Purchase Invoice Item,Item Tax Amount,आयटम कर रक्कम
 DocType: Item,Maintain Stock,शेअर ठेवा
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +209,Stock Entries already created for Production Order ,आधीच उत्पादन ऑर्डर तयार स्टॉक नोंदी
+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,मुदत मालमत्ता निव्वळ बदला
 DocType: Leave Control Panel,Leave blank if considered for all designations,सर्व पदांसाठी  विचारल्यास रिक्त सोडा
-apps/erpnext/erpnext/controllers/accounts_controller.py +620,Charge of type 'Actual' in row {0} cannot be included in Item Rate,प्रकार 'वास्तविक ' सलग शुल्क {0} आयटम रेट मधे  समाविष्ट केले जाऊ शकत नाही
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,Max: {0},कमाल: {0}
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +15,From Datetime,DATETIME पासून
+apps/erpnext/erpnext/controllers/accounts_controller.py +623,Charge of type 'Actual' in row {0} cannot be included in Item Rate,प्रकार 'वास्तविक ' सलग शुल्क {0} आयटम रेट मधे  समाविष्ट केले जाऊ शकत नाही
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +239,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 +153,"Request for Quotation is disabled to access from portal, for more check portal settings.",कोटेशन विनंती अधिक तपासणी पोर्टल सेटिंग्ज पोर्टल प्रवेश करू अक्षम केले आहे.
@@ -1272,8 +1289,8 @@
 DocType: Sales Invoice,Shipping Address Name,शिपिंग पत्ता नाव
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,लेखा चार्ट
 DocType: Material Request,Terms and Conditions Content,अटी आणि शर्ती सामग्री
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +552,cannot be greater than 100,पेक्षा जास्त 100 असू शकत नाही
-apps/erpnext/erpnext/stock/doctype/item/item.py +680,Item {0} is not a stock Item,{0} आयटम स्टॉक आयटम नाही
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +546,cannot be greater than 100,पेक्षा जास्त 100 असू शकत नाही
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is not a stock Item,{0} आयटम स्टॉक आयटम नाही
 DocType: Maintenance Visit,Unscheduled,Unscheduled
 DocType: Employee,Owned,मालकीचे
 DocType: Salary Detail,Depends on Leave Without Pay,वेतन न करता सोडा अवलंबून असते
@@ -1287,10 +1304,9 @@
 DocType: GL Entry,GL Entry,जी.एल. प्रवेश
 DocType: HR Settings,Employee Settings,कर्मचारी सेटिंग्ज
 ,Batch-Wise Balance History,बॅच -वार शिल्लक इतिहास
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,करावे सूची
 apps/erpnext/erpnext/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 +61,Apprentice,शिकाऊ उमेदवार
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +102,Negative Quantity is not allowed,नकारात्मक प्रमाणाला     परवानगी नाही
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,शिकाऊ उमेदवार
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +103,Negative Quantity is not allowed,नकारात्मक प्रमाणाला     परवानगी नाही
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",स्ट्रिंग म्हणून आयटम मालक प्राप्त आणि या क्षेत्रात संग्रहित कर तपशील टेबल. कर आणि शुल्क करीता वापरले जाते
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +152,Employee cannot report to himself.,कर्मचारी स्वत: ला तक्रार करू शकत नाही.
@@ -1311,15 +1327,14 @@
 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 +141,Source warehouse is mandatory for row {0},स्रोत कोठार सलग  {0} साठी  अनिवार्य आहे
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +719,Packing Slip,पॅकिंग स्लिप्स
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Source warehouse is mandatory for row {0},स्रोत कोठार सलग  {0} साठी  अनिवार्य आहे
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +713,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/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,अवतरण विनंती खालील दुव्यावर क्लिक करुन प्रवेश असू शकते
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,आयात अयशस्वी!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,पत्ते  अद्याप जोडले नाहीत
 DocType: Workstation Working Hour,Workstation Working Hour,वर्कस्टेशन कार्यरत तास
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Analyst,विश्लेषक
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,विश्लेषक
 DocType: Item,Inventory,सूची
 DocType: Item,Sales Details,विक्री तपशील
 DocType: Quality Inspection,QI-,QI-
@@ -1327,7 +1342,7 @@
 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 +103,Government,सरकार
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,सरकार
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,संस्था नाव
 apps/erpnext/erpnext/config/stock.py +289,Item Variants,आयटम रूपे
 DocType: Company,Services,सेवा
@@ -1343,6 +1358,7 @@
 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/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,गुंतवणूक रोख प्रवाह
 DocType: Program Course,Program Course,कार्यक्रम कोर्स
@@ -1383,12 +1399,12 @@
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,स्वीकारणार्याची सूची रिक्त आहे. स्वीकारणारा यादी तयार करा
 DocType: Production Plan Sales Order,Production Plan Sales Order,उत्पादन योजना विक्री आदेश
 DocType: Sales Partner,Sales Partner Target,विक्री भागीदार लक्ष्य
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +110,Accounting Entry for {0} can only be made in currency: {1},{0} एकट्या फक्त प्रवेश चलनात केले जाऊ शकते: {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},{0} एकट्या फक्त प्रवेश चलनात केले जाऊ शकते: {1}
 DocType: Pricing Rule,Pricing Rule,किंमत नियम
 DocType: Budget,Action if Annual Budget Exceeded,कृती वार्षिक अर्थसंकल्प ओलांडला तर
 apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,ऑर्डर खरेदी करण्यासाठी साहित्य विनंती
 DocType: Shopping Cart Settings,Payment Success URL,भरणा यशस्वी URL मध्ये
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +78,Row # {0}: Returned Item {1} does not exists in {2} {3},रो # {0}: परत केलेला  आयटम {1} हा  {2} {3} मधे विद्यमान नाही
+apps/erpnext/erpnext/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,बँक मेळ विवरणपत्र
@@ -1397,40 +1413,39 @@
 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/stock/doctype/stock_entry/stock_entry.py +339,Not allowed to tranfer more {0} than {1} against Purchase Order {2},पर्चेस ओर्डर {2} विरुद्ध  {0} पेक्षा  {1} अधिक  transfer करण्याची परवानगी नाही
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +344,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 +545,Manufacturing Quantity is mandatory,उत्पादन प्रमाण अनिवार्य आहे
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,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 +71,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 +162,Row {0}: From Time and To Time of {1} is overlapping with {2},सलग {0}: कडून वेळ आणि वेळ {1} आच्छादित आहे {2}
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +186,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,शेअर दायित्व
 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 +130,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 +137,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,इतर अहवाल
 DocType: Dependent Task,Dependent Task,अवलंबित कार्य
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,कृपया सेटअप कर्मचारी मानव संसाधन मध्ये प्रणाली नामांकन&gt; एचआर सेटिंग्ज
 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 +190,Leave of type {0} cannot be longer than {1},{0} प्रकारच्या रजा  {1} पेक्षा  जास्त असू शकत नाही
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +197,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 +921,Search Item,आयटम शोध
+apps/erpnext/erpnext/accounts/page/pos/pos.js +910,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 +546,Already completed,आधीच पूर्ण
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +22,Payment Request already exists {0},भरणा विनंती आधीपासूनच अस्तित्वात {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +550,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 +241,Quantity must not be more than {0},प्रमाण {0} पेक्षा  जास्त असू शकत नाही
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Quantity must not be more than {0},प्रमाण {0} पेक्षा  जास्त असू शकत नाही
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +76,Previous Financial Year is not closed,मागील आर्थिक वर्ष बंद नाही
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +44,Age (Days),वय (दिवस)
 DocType: Quotation Item,Quotation Item,कोटेशन आयटम
@@ -1447,7 +1462,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +221,Purchase Receipt {0} is not submitted,"खरेदी पावती {0} सबमिट केलेली नाही,"
 DocType: Company,Default Payable Account,मुलभूत देय खाते
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","जसे शिपिंग नियम, किंमत सूची इत्यादी ऑनलाइन शॉपिंग कार्ट सेटिंग्ज"
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +83,{0}% Billed,{0}% बिल
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}% बिल
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,राखीव Qty
 DocType: Party Account,Party Account,पार्टी खाते
 apps/erpnext/erpnext/config/setup.py +116,Human Resources,मानव संसाधन
@@ -1459,12 +1474,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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 +22,Collect,गोळा
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,गोळा
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,Against Supplier Invoice {0} dated {1},पुरवठादार विरुद्ध चलन {0} दिनांक {1}
 DocType: Customer,Default Price List,मुलभूत दर सूची
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +225,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: Payment Reconciliation,Payments,देयके
 DocType: Journal Entry,Entry Type,प्रवेश प्रकार
 ,Customer Credit Balance,ग्राहक क्रेडिट शिल्लक
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Payable,देय खात्यांमध्ये  निव्वळ बदल
@@ -1476,7 +1490,7 @@
 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 +9,Procurement,खरेदी
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,कोणत्याही आयटमधे   प्रमाण किंवा मूल्यांमध्ये  बदल नाहीत .
+apps/erpnext/erpnext/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,हमी दावा
 ,Lead Details,लीड तपशील
 DocType: Purchase Invoice,End date of current invoice's period,चालू चलन च्या कालावधी समाप्ती तारीख
@@ -1501,7 +1515,7 @@
 DocType: Purchase Invoice,Additional Discount,अतिरिक्त सवलत
 DocType: Selling Settings,Selling Settings,सेटिंग्ज विक्री
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,ऑनलाइन लिलाव
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +97,Please specify either Quantity or Valuation Rate or both,कृपया प्रमाण किंवा मूल्यांकन दर किंवा दोन्ही निर्दिष्ट करा
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,कृपया प्रमाण किंवा मूल्यांकन दर किंवा दोन्ही निर्दिष्ट करा
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +13,Fulfillment,पूर्ण
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","कंपनी, महिना आणि आर्थिक वर्ष अनिवार्य आहे"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,विपणन खर्च
@@ -1522,14 +1536,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,ERPNext सेटअप पूर्ण!
 DocType: Item,Weightage,वजन
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +93,A Customer Group exists with same name please change the Customer name or rename the Customer Group,एक ग्राहक गट त्याच नावाने अस्तित्वात असेल तर ग्राहक नाव बदला किंवा ग्राहक गट नाव बदला
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +126,A Customer Group exists with same name please change the Customer name or rename the Customer Group,एक ग्राहक गट त्याच नावाने अस्तित्वात असेल तर ग्राहक नाव बदला किंवा ग्राहक गट नाव बदला
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,नवीन संपर्क
 DocType: Territory,Parent Territory,पालक प्रदेश
 DocType: Quality Inspection Reading,Reading 2,2 वाचन
 DocType: Stock Entry,Material Receipt,साहित्य पावती
 DocType: Homepage,Products,उत्पादने
 DocType: Announcement,Instructor,प्रशिक्षक
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},पक्ष प्रकार आणि पक्षाचे प्राप्तीयोग्य / देय खाते आवश्यक आहे {0}
 DocType: Employee,AB+,अब्राहम +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","या आयटमला  रूपे आहेत, तर तो विक्री आदेश इ मध्ये निवडला जाऊ शकत नाही"
 DocType: Lead,Next Contact By,पुढील संपर्क
@@ -1540,7 +1553,7 @@
 ,Item-wise Sales Register,आयटमनूसार विक्री नोंदणी
 DocType: Asset,Gross Purchase Amount,एकूण खरेदी रक्कम
 DocType: Asset,Depreciation Method,घसारा पद्धत
-apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Offline,ऑफलाइन
+apps/erpnext/erpnext/accounts/page/pos/pos.js +686,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,आवश्यक
@@ -1558,25 +1571,27 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +425,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 +858,Make Purchase Order,खरेदी ऑर्डर करा
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +852,Make Purchase Order,खरेदी ऑर्डर करा
 DocType: SMS Center,Send To,पाठवा
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,There is not enough leave balance for Leave Type {0},रजा प्रकार {0} साठी पुरेशी रजा शिल्लक नाही
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,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 +172,Work-in-Progress Warehouse is required before Submit,कार्य प्रगती मध्ये असलेले कोठार सबमिट करण्यापूर्वी आवश्यक आहे
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,Work-in-Progress Warehouse is required before Submit,कार्य प्रगती मध्ये असलेले कोठार सबमिट करण्यापूर्वी आवश्यक आहे
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,नोकरी साठी अर्जदार
 DocType: Purchase Order Item,Warehouse and Reference,वखार आणि संदर्भ
 DocType: Supplier,Statutory info and other general information about your Supplier,आपल्या पुरवठादार बद्दल वैधानिक माहिती आणि इतर सर्वसाधारण माहिती
-apps/erpnext/erpnext/hooks.py +88,Addresses,पत्ते
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,पुरवठादार&gt; पुरवठादार प्रकार
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +212,Against Journal Entry {0} does not have any unmatched {1} entry,जर्नल विरुद्ध प्रवेश {0} कोणत्याही न जुळणारी {1} नोंद नाही
+apps/erpnext/erpnext/hooks.py +95,Addresses,पत्ते
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +215,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,आयटम किंवा वखार आधारित फिल्टर सेट करा
 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,वितरीत आणि बिल
@@ -1584,11 +1599,10 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} must be submitted,BOM {0} सादर करणे आवश्यक आहे
 DocType: Authorization Control,Authorization Control,प्राधिकृत नियंत्रण
 apps/erpnext/erpnext/controllers/buying_controller.py +300,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},रो # {0}: नाकारलेले वखार नाकारले आयटम विरुद्ध अनिवार्य आहे {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +731,Payment,भरणा
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,Payment,भरणा
 DocType: Production Order Operation,Actual Time and Cost,वास्तविक वेळ आणि खर्च
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},जास्तीत जास्त {0} साहित्याची  विनंती आयटम {1} साठी  विक्री आदेशा विरुद्ध केली  जाऊ शकते {2}
 DocType: Employee,Salutation,नमस्कार
-DocType: Pricing Rule,Brand,ब्रँड
 DocType: Course,Course Abbreviation,अर्थात संक्षेप
 DocType: Item,Will also apply for variants,तसेच रूपे लागू राहील
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +142,"Asset cannot be cancelled, as it is already {0}","मालमत्ता तो आधीपासूनच आहे म्हणून, रद्द करता येणार नाही {0}"
@@ -1600,7 +1614,7 @@
 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 गट,  मोजण्याचे एकक आणि इतर मालमत्ता तपासण्याची खात्री करा"
 DocType: Hub Settings,Hub Node,हब नोड
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,आपण ड्युप्लिकेट आयटम केला आहे. कृपया सरळ आणि पुन्हा प्रयत्न करा.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Associate,सहकारी
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,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,स्वीकारणारा यादी तयार करा
@@ -1608,7 +1622,7 @@
 DocType: Production Planning Tool,Material Requests,साहित्य विनंत्या
 DocType: Warranty Claim,Issue Date,जारी केल्याचा दिनांक
 DocType: Activity Cost,Activity Cost,क्रियाकलाप खर्च
-DocType: Timesheet Detail,Timesheet Detail,Timesheet तपशील
+DocType: Sales Invoice Timesheet,Timesheet Detail,Timesheet तपशील
 DocType: Purchase Receipt Item Supplied,Consumed Qty,नाश Qty
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,दूरसंचार
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),पॅकेज वितरण (फक्त मसुदा) एक भाग आहे असे दर्शवले
@@ -1631,6 +1645,7 @@
 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,रूपे आहेत
 DocType: Monthly Distribution,Name of the Monthly Distribution,मासिक वितरण नाव
 DocType: Sales Person,Parent Sales Person,पालक विक्री व्यक्ती
@@ -1643,30 +1658,31 @@
 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 +44,"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/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.,तुम्ही विक्री चलन एकदा जतन  केल्यावर शब्दा मध्ये दृश्यमान होईल.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +502,Error: {0} &gt; {1},त्रुटी: {0}&gt; {1}
 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.,मुदत प्रारंभ तारीख मुदत लिंक आहे शैक्षणिक वर्ष वर्ष प्रारंभ तारीख पूर्वी पेक्षा असू शकत नाही (शैक्षणिक वर्ष {}). तारखा दुरुस्त करा आणि पुन्हा प्रयत्न करा.
 DocType: Naming Series,Current Value,वर्तमान मूल्य
-apps/erpnext/erpnext/controllers/accounts_controller.py +235,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,अनेक आर्थिक वर्षांमध्ये तारीख {0} अस्तित्वात. आर्थिक वर्ष कंपनी सेट करा
+apps/erpnext/erpnext/controllers/accounts_controller.py +238,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 +458,Item table can not be blank,आयटम टेबल रिक्त ठेवता येणार नाही
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +443,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 +5,This is based on stock movement. See {0} for details,हा स्टॉक चळवळ आधारित आहे. पहा {0} तपशील
 DocType: Pricing Rule,Selling,विक्री
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +341,Amount {0} {1} deducted against {2},रक्कम {0} {1} विरुद्ध वजा {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +344,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,देय तारीख  पोस्ट करण्यापूर्वीची  तारीख असू शकत नाही
@@ -1681,8 +1697,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +144,Cannot refer row number greater than or equal to current row number for this Charge type,या शुल्क प्रकार चालू पंक्ती संख्या पेक्षा मोठे किंवा समान पंक्ती संख्या refer करू शकत नाही
 DocType: Asset,Sold,विक्री
 ,Item-wise Purchase History,आयटमनूसार खरेदी इतिहास
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Red,लाल
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},कृपया   आयटम {0} ला  जोडलेला सिरियल क्रमांक प्राप्त करण्यासाठी 'व्युत्पन्न वेळापत्रक' वर क्लिक करा
+apps/erpnext/erpnext/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,उत्पादन ऑर्डर ओपन करा
 DocType: Sales Invoice Payment,Base Amount (Company Currency),बेस रक्कम (कंपनी चलन)
@@ -1690,7 +1706,7 @@
 DocType: Installation Note,Installation Time,प्रतिष्ठापन वेळ
 DocType: Sales Invoice,Accounting Details,लेखा माहिती
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,ह्या कंपनीसाठी सर्व व्यवहार हटवा
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +187,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,रो # {0}: ऑपरेशन {1} हे  {2} साठी पूर्ण केलेले नाही  ऑर्डर # {3} मधील  उत्पादन पूर्ण माल. वेळ नोंदी द्वारे ऑपरेशन स्थिती अद्यतनित करा
+apps/erpnext/erpnext/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} मधील  उत्पादन पूर्ण माल. वेळ नोंदी द्वारे ऑपरेशन स्थिती अद्यतनित करा
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,गुंतवणूक
 DocType: Issue,Resolution Details,ठराव तपशील
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,वाटप
@@ -1726,16 +1742,17 @@
 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}
 DocType: Delivery Note,Excise Page Number,अबकारी पृष्ठ क्रमांक
 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}
 ,Maintenance Schedules,देखभाल वेळापत्रक
 DocType: Task,Actual End Date (via Time Sheet),प्रत्यक्ष समाप्ती तारीख (वेळ पत्रक द्वारे)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Amount {0} {1} against {2} {3},रक्कम {0} {1} विरुद्ध {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +339,Amount {0} {1} against {2} {3},रक्कम {0} {1} विरुद्ध {2} {3}
 ,Quotation Trends,कोटेशन ट्रेन्ड
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},आयटम गट आयटम मास्त्रे साठी आयटम  {0} मधे  नमूद केलेला नाही
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +295,Debit To account must be a Receivable account,खात्यात डेबिट एक प्राप्तीयोग्य खाते असणे आवश्यक आहे
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Receivable account,खात्यात डेबिट एक प्राप्तीयोग्य खाते असणे आवश्यक आहे
 DocType: Shipping Rule Condition,Shipping Amount,शिपिंग रक्कम
 ,Pending Amount,प्रलंबित रक्कम
 DocType: Purchase Invoice Item,Conversion Factor,रूपांतरण फॅक्टर
@@ -1743,10 +1760,10 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +137,Expected value after useful life must be greater than or equal to {0},उपयुक्त जीवन नंतर अपेक्षित मूल्य पेक्षा मोठे किंवा समान असणे आवश्यक आहे {0}
 DocType: Purchase Receipt,Vehicle Number,वाहन क्रमांक
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,आवर्ती अशी यादी तयार करणे बंद होणार तारीख
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +90,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,एकूण वाटप पाने {0} कालावधीसाठी यापूर्वीच मान्यता देण्यात आलेल्या रजा{1} पेक्षा   कमी असू शकत नाही
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +93,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 +22,Enter Paid Amount,अदा केलेली रक्कम प्रविष्ट करा
+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 वापरा
@@ -1756,13 +1773,15 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,Timesheets
 DocType: HR Settings,HR Settings,एचआर सेटिंग्ज
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Expense Claim is pending approval. Only the Expense Approver can update status.,खर्च दावा मंजुरीसाठी प्रलंबित आहे. फक्त खर्च माफीचा साक्षीदार स्थिती अद्यतनित करू शकता.
+DocType: Email Digest,New Expenses,नवीन खर्च
 DocType: Purchase Invoice,Additional Discount Amount,अतिरिक्त सवलत रक्कम
-apps/erpnext/erpnext/controllers/accounts_controller.py +524,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","सलग # {0}: प्रमाण 1, आयटम निश्चित मालमत्ता आहे असणे आवश्यक आहे. कृपया एकाधिक प्रमाण स्वतंत्र सलग वापरा."
+apps/erpnext/erpnext/controllers/accounts_controller.py +527,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","सलग # {0}: प्रमाण 1, आयटम निश्चित मालमत्ता आहे असणे आवश्यक आहे. कृपया एकाधिक प्रमाण स्वतंत्र सलग वापरा."
 DocType: Leave Block List Allow,Leave Block List Allow,रजा ब्लॉक यादी परवानगी द्या
 apps/erpnext/erpnext/setup/doctype/company/company.py +249,Abbr can not be blank or space,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/stock/get_item_details.py +123,Please specify Company,कृपया कंपनी निर्दिष्ट करा
 ,Customer Acquisition and Loyalty,ग्राहक संपादन आणि लॉयल्टी
@@ -1773,17 +1792,19 @@
 apps/erpnext/erpnext/projects/doctype/task/task.js +26,Expense Claims,खर्च दावे
 DocType: Issue,Support,समर्थन
 ,BOM Search,BOM शोध
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Closing (Opening + Totals),बंद (उघडत+ एकूण )
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),बंद (उघडत+ एकूण )
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,कृपया कंपनीतील  चलन निर्दिष्ट करा
 DocType: Workstation,Wages per hour,ताशी वेतन
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +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/controllers/accounts_controller.py +272,Account {0} is invalid. Account Currency must be {1},खाते {0} अवैध आहे. खाते चलन {1} असणे आवश्यक आहे
+DocType: Email Digest,Pending Sales Orders,प्रलंबित विक्री आदेश
+apps/erpnext/erpnext/controllers/accounts_controller.py +275,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 +956,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","सलग # {0}: संदर्भ दस्तऐवज प्रकार विक्री ऑर्डर एक, विक्री चलन किंवा जर्नल प्रवेश असणे आवश्यक आहे"
-DocType: Salary Slip,Deduction,कपात
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +87,Row {0}: From Time and To Time is mandatory.,सलग {0}: पासून वेळ आणि वेळ करणे बंधनकारक आहे.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +969,"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 +111,Row {0}: From Time and To Time is mandatory.,सलग {0}: पासून वेळ आणि वेळ करणे बंधनकारक आहे.
+DocType: Stock Reconciliation Item,Amount Difference,रक्कम फरक
 apps/erpnext/erpnext/stock/get_item_details.py +262,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 +7,Please enter Employee Id of this sales person,या विक्री व्यक्तीसाठी  कर्मचारी आयडी प्रविष्ट करा
@@ -1791,7 +1812,7 @@
 DocType: Project,% Tasks Completed,% कार्ये पूर्ण
 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 +194,Please enter Production Item first,पहिले  उत्पादन आयटम प्रविष्ट करा
+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,अक्षम वापरकर्ता
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,कोटेशन
@@ -1800,53 +1821,54 @@
 DocType: Maintenance Visit,Maintenance User,देखभाल सदस्य
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +149,Cost Updated,खर्च अद्यतनित
 DocType: Employee,Date of Birth,जन्म तारीख
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +86,Item {0} has already been returned,आयटम {0} आधीच परत आला  आहे
+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: 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 +177,Job Description,कामाचे वर्णन
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,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 +126,"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 +127,"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, अवतरणे, विक्री ऑर्डर इत्यादी मोहीम पासून  गुंतवणूक वर परत गेज."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +24,Welcome to POS: Create your POS Profile,POS वर आपले स्वागत आहे: आपल्या पीओएस प्रोफाइल तयार करा
 DocType: Expense Claim,Approver,माफीचा साक्षीदार
 ,SO Qty,SO Qty
+DocType: Guardian,Work Address,काम पत्ता
 DocType: Appraisal,Calculate Total Score,एकूण धावसंख्या गणना
 DocType: Request for Quotation,Manufacturing Manager,उत्पादन व्यवस्थापक
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},सिरियल क्रमांक {0} हा  {1} पर्यंत हमी अंतर्गत आहे
+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 +74,Shipments,निर्यात
+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 +153,Row # ,रो #
+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 +156,Get From,पासून मिळवा
+apps/erpnext/erpnext/public/js/utils.js +167,Get From,पासून मिळवा
 DocType: C-Form,Quarter,तिमाहीत
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Miscellaneous Expenses,मिश्र खर्च
 DocType: Global Defaults,Default Company,मुलभूत कंपनी
 apps/erpnext/erpnext/controllers/stock_controller.py +167,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,खर्च किंवा फरक खाते आयटम {0} म्हणून परिणाम एकूणच स्टॉक मूल्य अनिवार्य आहे
-apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings",सलग आयटम {0} साठी overbill करू शकत नाही {1} जास्त {2}. Overbilling अनुमती देण्यासाठी शेअर सेटिंग्ज सेट करा
+apps/erpnext/erpnext/controllers/accounts_controller.py +419,"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,-वरती
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} is disabled,सदस्य {0} अक्षम आहे
 DocType: Leave Application,Total Leave Days,एकूण दिवस रजा
 DocType: Email Digest,Note: Email will not be sent to disabled users,टीप: ईमेल वापरकर्त्यांना अक्षम पाठविली जाऊ शकत नाही
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,कंपनी निवडा ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,सर्व विभागांसाठी विचारल्यास रिक्त सोडा
 apps/erpnext/erpnext/config/hr.py +171,"Types of employment (permanent, contract, intern etc.).","रोजगार प्रकार (कायम, करार, हद्दीच्या इ)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +346,{0} is mandatory for Item {1},{0} हा आयटम {1} साठी अनिवार्य आहे
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,{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","किमान एक सलग रक्कम, चलन प्रकार आणि चलन क्रमांक निवडा"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,नवीन खरेदी खर्च
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},आयटम  {0} साठी  आवश्यक विक्री ऑर्डर
 DocType: Purchase Invoice Item,Rate (Company Currency),दर (कंपनी चलन)
-apps/erpnext/erpnext/demo/setup_data.py +360,Others,इतर
+DocType: Student Guardian,Others,इतर
 DocType: Payment Entry,Unallocated Amount,न वाटप केलेली रक्कम
 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,कर आणि शुल्क
@@ -1866,17 +1888,16 @@
 apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,सिरीयलाइज यादी
 DocType: Activity Type,Default Billing Rate,डीफॉल्ट बिलिंग दर
 DocType: Sales Invoice,Total Billing Amount,एकूण बिलिंग रक्कम
-apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +54,Receivable Account,प्राप्त खाते
-apps/erpnext/erpnext/controllers/accounts_controller.py +546,Row #{0}: Asset {1} is already {2},सलग # {0}: मालमत्ता {1} आधीच आहे {2}
+apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,प्राप्त खाते
+apps/erpnext/erpnext/controllers/accounts_controller.py +549,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 +79,CEO,मुख्य कार्यकारी अधिकारी
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,मुख्य कार्यकारी अधिकारी
 DocType: Expense Claim Detail,Expense Claim Detail,खर्च हक्क तपशील
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +808,Please select correct account,कृपया  योग्य खाते निवडा
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +809,Please select correct account,कृपया  योग्य खाते निवडा
 DocType: Item,Weight UOM,वजन UOM
 DocType: Salary Structure Employee,Salary Structure Employee,पगार संरचना कर्मचारी
 DocType: Employee,Blood Group,रक्त गट
-DocType: Purchase Invoice Item,Page Break,पृष्ठ ब्रेक
 DocType: Production Order Operation,Pending,प्रलंबित
 DocType: Course,Course Name,अर्थातच नाव
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,जे वापरकर्ते विशिष्ट कर्मचारी सुट्टीच्या अनुप्रयोग मंजूर करू शकता
@@ -1885,14 +1906,15 @@
 DocType: Fiscal Year,Companies,कंपन्या
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,इलेक्ट्रॉनिक्स
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,स्टॉक पुन्हा आदेश स्तरावर पोहोचते तेव्हा साहित्य विनंती वाढवा
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Full-time,पूर्ण-वेळ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,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: 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,एकूण येणारी  मूल्य
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Debit To is required,डेबिट करणे आवश्यक आहे
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +321,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,गुणवत्ता व्यवस्थापक
@@ -1900,6 +1922,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/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 रक्कम
@@ -1910,18 +1933,17 @@
 DocType: Production Order Operation,Completed Qty,पूर्ण झालेली  Qty
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"For {0}, only debit accounts can be linked against another credit entry","{0}, फक्त डेबिट खाती दुसरे क्रेडिट नोंदणी लिंक जाऊ शकते"
 apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,किंमत सूची {0} अक्षम आहे
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +99,Row {0}: Completed Qty cannot be more than {1} for operation {2},सलग {0}: पूर्ण प्रमाण जास्त असू शकत नाही {1} ऑपरेशन {2}
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +123,Row {0}: Completed Qty cannot be more than {1} for operation {2},सलग {0}: पूर्ण प्रमाण जास्त असू शकत नाही {1} ऑपरेशन {2}
 DocType: Manufacturing Settings,Allow Overtime,जादा वेळ परवानगी द्या
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} सिरिअल क्रमांक हा आयटम {1} साठी आवश्यक आहे. आपल्याला {2} प्रदान केलेल्या आहेत
 DocType: Stock Reconciliation Item,Current Valuation Rate,वर्तमान मूल्यांकन दर
 DocType: Item,Customer Item Codes,ग्राहक आयटम कोड
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,विनिमय लाभ / कमी होणे
 DocType: Opportunity,Lost Reason,कारण गमावले
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,सेटअप सेटअप द्वारे विधान परिषदेच्या मालिका संख्या करा&gt; क्रमांकन मालिका
 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/purchase_receipt/purchase_receipt.py +378,All items have already been invoiced,सर्व आयटम आधीच invoiced आहेत
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +379,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,बाह्य
@@ -1937,18 +1959,19 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,आपले ग्राहक
 apps/erpnext/erpnext/projects/doctype/project/project.py +141,You have been invited to collaborate on the project: {0},आपण प्रकल्प सहयोग करण्यासाठी आमंत्रित आहेत: {0}
 DocType: Leave Block List Date,Block Date,ब्लॉक तारीख
-apps/erpnext/erpnext/templates/generators/job_opening.html +19,Apply Now,आता लागू
+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 तयार करा आणि व्यवस्थापित करा."
 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,इमारती
-apps/erpnext/erpnext/utilities/doctype/address/address.py +164,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,डीफॉल्ट पत्ता साचा आढळले. सेटअप&gt; मुद्रण आणि ब्रँडिंग&gt; पत्ता साचा पासून एक नवीन तयार करा.
 DocType: Fee Structure,Fee Structure,फी
 DocType: Timesheet Detail,Costing Amount,भांडवलाच्या रक्कम
+DocType: Student Admission,Application Fee,अर्ज फी
 DocType: Process Payroll,Submit Salary Slip,पगाराच्या स्लिप्स सादर करा
-apps/erpnext/erpnext/controllers/selling_controller.py +161,Maxiumm discount for Item {0} is {1}%,आयटम {0}  साठी Maxiumm सवलत  {1}% आहे
+apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,आयटम {0}  साठी Maxiumm सवलत  {1}% आहे
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,मोठ्या प्रमाणात आयात
 DocType: Sales Partner,Address & Contacts,पत्ता आणि संपर्क
 DocType: SMS Log,Sender Name,प्रेषकाचे नाव
@@ -1973,21 +1996,21 @@
 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_data.py +361,Travel,प्रवास
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +155,No active or default Salary Structure found for employee {0} for the given dates,दिले तारखा कर्मचारी {0} आढळले सक्रिय नाही किंवा मुलभूत तत्वे
+apps/erpnext/erpnext/demo/setup/setup_data.py +304,Travel,प्रवास
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +167,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 +23,Update Cost,अद्यतन खर्च
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,अद्यतन खर्च
 DocType: Item Reorder,Item Reorder,आयटम पुनर्क्रमित
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +36,Show Salary Slip,पगार शो स्लिप्स
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +748,Transfer Material,ट्रान्सफर साहित्य
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +53,Show Salary Slip,पगार शो स्लिप्स
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +166,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 +923,Please set recurring after saving,जतन केल्यानंतर आवर्ती सेट करा
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +646,Select change amount account,बदल निवडा रक्कम खाते
+apps/erpnext/erpnext/public/js/controllers/transaction.js +914,Please set recurring after saving,जतन केल्यानंतर आवर्ती सेट करा
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +703,Select change amount account,बदल निवडा रक्कम खाते
 DocType: Purchase Invoice,Price List Currency,किंमत सूची चलन
 DocType: Naming Series,User must always select,सदस्य नेहमी निवडणे आवश्यक आहे
 DocType: Stock Settings,Allow Negative Stock,नकारात्मक शेअर परवानगी द्या
@@ -1999,31 +2022,32 @@
 DocType: Quality Inspection,Verified By,द्वारा सत्यापित केली
 DocType: Address,Subsidiary,उपकंपनी
 apps/erpnext/erpnext/setup/doctype/company/company.py +64,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","विद्यमान व्यवहार आहेत कारण, कंपनीच्या मुलभूत चलन बदलू शकत नाही. व्यवहार मुलभूत चलन बदलण्यासाठी रद्द करणे आवश्यक आहे."
+DocType: Grade Interval,Grade Description,ग्रेड वर्णन
 DocType: Quality Inspection,Purchase Receipt No,खरेदी पावती नाही
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,इसा-याची रक्कम
 DocType: Process Payroll,Create Salary Slip,पगाराच्या स्लिप्स तयार करा
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +33,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 +352,Quantity in row {0} ({1}) must be same as manufactured quantity {2},सलग प्रमाण {0} ({1}) उत्पादित प्रमाणात समान असणे आवश्यक आहे {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Quantity in row {0} ({1}) must be same as manufactured quantity {2},सलग प्रमाण {0} ({1}) उत्पादित प्रमाणात समान असणे आवश्यक आहे {2}
 DocType: Appraisal,Employee,कर्मचारी
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,वापरकर्ता म्हणून आमंत्रित करा
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} पूर्णपणे बिल आहे
 DocType: Workstation Working Hour,End Time,समाप्त वेळ
 DocType: Payment Entry,Payment Deductions or Loss,भरणा वजावट किंवा कमी होणे
-apps/erpnext/erpnext/config/schools.py +100,LMS,"असून, यामध्ये एलएमएस"
+apps/erpnext/erpnext/config/schools.py +104,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,विक्री पाईपलाईन
 DocType: Student Batch Student,Student Batch Student,विद्यार्थी बॅच विद्यार्थी
-DocType: Sales Invoice,Mass Mailing,मास मेलींग
+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 +199,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/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 +297,Salary Slip of employee {0} already created for this period,कर्मचारी पगार स्लिप {0} आधीच या काळात निर्माण
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Pharmaceutical,फार्मास्युटिकल
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +309,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/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,श्रेय
@@ -2038,27 +2062,28 @@
 DocType: Upload Attendance,Attendance To Date,उपस्थिती पासून तारीख
 DocType: Warranty Claim,Raised By,उपस्थित
 DocType: Payment Gateway Account,Payment Account,भरणा खाते
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +814,Please specify Company to proceed,कृपया पुढे जाण्यासाठी कंपनी निर्दिष्ट करा
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +793,Please specify Company to proceed,कृपया पुढे जाण्यासाठी कंपनी निर्दिष्ट करा
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Receivable,खाते प्राप्तीयोग्य निव्वळ बदला
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Compensatory Off,भरपाई देणारा बंद
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,भरपाई देणारा बंद
 DocType: Quality Inspection Reading,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  आहे तसा राहील. ही क्रिया पूर्ववत केली जाऊ शकत नाही.
 DocType: Room,Room Number,खोली क्रमांक
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},अवैध संदर्भ {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +161,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},उत्पादन ऑर्डर {3} मधे {0} ({1}) नियोजित प्रमाण पेक्षा जास्त असू शकत नाही ({2})
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +162,{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 +217,Raw Materials cannot be blank.,कच्चा माल रिक्त असू शकत नाही.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,"Could not update stock, invoice contains drop shipping item.","शेअर अद्यतनित करू शकत नाही, चलन ड्रॉप शिपिंग आयटम समाविष्टीत आहे."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +460,Quick Journal Entry,जलद प्रवेश जर्नल
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +111,You can not change rate if BOM mentioned agianst any item,BOM कोणत्याही आयटम agianst उल्लेख केला तर आपण दर बदलू शकत नाही
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +441,"Could not update stock, invoice contains drop shipping item.","शेअर अद्यतनित करू शकत नाही, चलन ड्रॉप शिपिंग आयटम समाविष्टीत आहे."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Quick Journal Entry,जलद प्रवेश जर्नल
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +103,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} येथे साठी नियोजनबद्ध Qty प्रविष्ट करा
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is not submitted,"{0} {1} हे सबमिट केलेली नाही,"
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,आयटम विनंती.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,स्वतंत्र उत्पादन करण्यासाठी प्रत्येक पूर्ण चांगला आयटम निर्माण केले जाईल.
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +121,{0} must be negative in return document,{0} परत दस्तऐवज नकारात्मक असणे आवश्यक आहे
 ,Minutes to First Response for Issues,मुद्दे प्रथम प्रतिसाद मिनिटे
 DocType: Purchase Invoice,Terms and Conditions1,अटी आणि Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,संस्था नाव साठी आपण या प्रणाली सेट आहेत.
@@ -2067,16 +2092,17 @@
 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 +398,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 +739,Item or Warehouse for row {0} does not match Material Request,आयटम किंवा कोठार सलग {0} साठी  सामग्री विनंती  जुळत नाही
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +747,Item or Warehouse for row {0} does not match Material Request,आयटम किंवा कोठार सलग {0} साठी  सामग्री विनंती  जुळत नाही
 apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,माप युनिट
 DocType: Fiscal Year,Year End Date,अंतिम वर्ष  तारीख
 DocType: Task Depends On,Task Depends On,कार्य अवलंबून असते
-DocType: Lead,Opportunity,संधी
+DocType: Supplier Quotation,Opportunity,संधी
 ,Completed Production Orders,उत्पादन ऑर्डर पूर्ण झाला
 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,मुलभूत वर्कस्टेशन
@@ -2089,7 +2115,7 @@
 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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},सिरियल क्रमांक  {0}साठी देखभाल प्रारंभ तारीख माणे वितरणाच्या  तारीखेआधी असू शकत नाही
+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,वास्तविक अंतिम तारीख
 DocType: Purchase Invoice,PINV-,PINV-
 DocType: Authorization Rule,Applicable To (Role),लागू करण्यासाठी (भूमिका)
@@ -2104,7 +2130,7 @@
 DocType: SMS Log,No of Requested SMS,मागणी एसएमएस क्रमांक
 DocType: Campaign,Campaign-.####,मोहीम -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,पुढील पायऱ्या
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,Please supply the specified items at the best possible rates,शक्य तितका सर्वोत्कृष्ट दरात निर्दिष्ट आयटम पुरवठा करा
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +695,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 +117,Contract End Date must be greater than Date of Joining,कंत्राटी अंतिम तारीख प्रवेश दिनांक पेक्षा जास्त असणे आवश्यक आहे
 DocType: Delivery Note,DN-,DN-
@@ -2113,7 +2139,7 @@
 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 +14,This is an example website auto-generated from ERPNext,हा नमुना वेबसाइट ERPNext पासून स्वयं-व्युत्पन्न केलेला  आहे
+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
 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.
 
@@ -2140,13 +2166,14 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd प्रमाण
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +54,Fee Records Created - {0},फी रेकॉर्ड तयार - {0}
 DocType: Asset Category Account,Asset Category Account,मालमत्ता वर्ग खाते
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +103,Cannot produce more Item {0} than Sales Order quantity {1},विक्री ऑर्डर पेक्षा {1} प्रमाणात जास्त {0} item उत्पादन करू शकत नाही
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Stock Entry {0} is not submitted,शेअर प्रवेश {0} सबमिट केलेला  नाही
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},विक्री ऑर्डर पेक्षा {1} प्रमाणात जास्त {0} item उत्पादन करू शकत नाही
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +505,Stock Entry {0} is not submitted,शेअर प्रवेश {0} सबमिट केलेला  नाही
 DocType: Payment Reconciliation,Bank / Cash Account,बँक / रोख खाते
 DocType: Tax Rule,Billing City,बिलिंग शहर
 DocType: Salary Component Account,Salary Component Account,पगार घटक खाते
 DocType: Global Defaults,Hide Currency Symbol,चलन प्रतीक लपवा
 apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card","उदा बँक, रोख, क्रेडिट कार्ड"
+DocType: Lead Source,Source Name,स्रोत नाव
 DocType: Journal Entry,Credit Note,क्रेडिट टीप
 DocType: Warranty Claim,Service Address,सेवा पत्ता
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furnitures and Fixtures,फर्निचर आणि सामने
@@ -2158,6 +2185,7 @@
 DocType: Opportunity,Customer / Lead Name,ग्राहक / लीड नाव
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +89,Clearance Date not mentioned,निपटारा तारीख नमूद केलेली नाही
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,उत्पादन
+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/controllers/trends.py +19,Total(Qty),एकूण (Qty)
 DocType: Sales Invoice,This Document,हा दस्तऐवज
@@ -2169,15 +2197,15 @@
 DocType: Purchase Receipt,Time at which materials were received,"साहित्य प्राप्त झाले, ती  वेळ"
 DocType: Stock Ledger Entry,Outgoing Rate,जाणारे दर
 apps/erpnext/erpnext/config/hr.py +176,Organization branch master.,संघटना शाखा मास्टर.
-apps/erpnext/erpnext/controllers/accounts_controller.py +273, or ,किंवा
+apps/erpnext/erpnext/controllers/accounts_controller.py +276, 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 +203,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,सलग # {0}: जर्नल प्रवेश {1} खाते नाही {2} किंवा आधीच दुसर्या व्हाउचर विरुद्ध जुळलेल्या
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +206,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 +90,No employee for the above selected criteria OR salary slip already created,वर निवडलेल्या निकषानुसार कर्मचारी नाही  किंवा पगारपत्रक आधीच तयार केले आहे
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +93,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,भरणा प्रकार
@@ -2205,8 +2233,8 @@
 DocType: Product Bundle,Parent Item,मुख्य घटक
 DocType: Account,Account Type,खाते प्रकार
 DocType: Delivery Note,DN-RET-,DN-RET-
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +115,Leave Type {0} cannot be carry-forwarded,रजा प्रकार {0} carry-forward केला  जाऊ शकत नाही
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',देखभाल वेळापत्रक सर्व आयटम व्युत्पन्न नाही. &#39;व्युत्पन्न वेळापत्रक&#39; वर क्लिक करा
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +118,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 +163,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","सलग {0} मधील {1} साठी . आयटम दर {2} समाविष्ट करण्यासाठी, पंक्ति {3} समाविष्ट करणे आवश्यक आहे"
@@ -2218,13 +2246,13 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +32,Disabled template must not be default template,अक्षम साचा डीफॉल्ट टेम्पलेट असणे आवश्यक नाही
 DocType: Account,Income Account,उत्पन्न खाते
 DocType: Payment Request,Amount in customer's currency,ग्राहक चलनात रक्कम
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +748,Delivery,डिलिव्हरी
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +742,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,की जबाबदारी क्षेत्र
 DocType: Payment Entry,Total Allocated Amount,एकूण रक्कम
 DocType: Item Reorder,Material Request Type,साहित्य विनंती प्रकार
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +82,Row {0}: UOM Conversion Factor is mandatory,रो {0}: UOM रुपांतर फॅक्टर अनिवार्य आहे
+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,खर्च केंद्र
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,प्रमाणक #
@@ -2235,13 +2263,13 @@
 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 +90,Head of Marketing and Sales,विपणन आणि विक्री प्रमुख
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,आयकर
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,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 +403,Please enter Item Code to get batch no,बॅच नाही मिळविण्यासाठी आयटम कोड प्रविष्ट करा
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +770,Please select a value for {0} quotation_to {1},कृपया {0} साठी एक मूल्य निवडा quotation_to  {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +397,Please enter Item Code to get batch no,बॅच नाही मिळविण्यासाठी आयटम कोड प्रविष्ट करा
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +764,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","खालील गुणधर्म दोन्ही रेकॉर्ड मधे  समान आहेत तर, विलीन फक्त शक्य आहे. गट आहे, रूट प्रकार, कंपनी"
@@ -2253,28 +2281,29 @@
 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 +100,Issues,मुद्दे
+apps/erpnext/erpnext/hooks.py +109,Issues,मुद्दे
 apps/erpnext/erpnext/controllers/status_updater.py +13,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,बिलिंग चलन
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Large,अधिक मोठे
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,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 +507,Warning: Another {0} # {1} exists against stock entry {2},चेतावनी: आणखी {0} # {1} स्टॉक प्रवेश  {2} विरुद्ध अस्तित्वात
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Local,स्थानिक
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +508,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/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 +154,Large,मोठे
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,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 +225,Total {0} ({1}),एकूण {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +224,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,मुलभूत मूल्यांकन पद्धत
@@ -2320,9 +2349,9 @@
 DocType: Attendance,Leave Type,रजा प्रकार
 apps/erpnext/erpnext/controllers/stock_controller.py +173,Expense / Difference account ({0}) must be a 'Profit or Loss' account,खर्च / फरक खाते ({0}) एक &#39;नफा किंवा तोटा&#39; खाते असणे आवश्यक आहे
 DocType: Account,Accounts User,वापरकर्ता खाती
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Name error: {0},नाव त्रुटी: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +90,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 +178,{0} {1} does not associated with {2} {3},{0} {1} संबंधित नाही {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +181,{0} {1} does not associated with {2} {3},{0} {1} संबंधित नाही {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,कर्मचारी {0} हजेरी आधीच खूण आहे
 DocType: Packing Slip,If more than one package of the same type (for print),तर समान प्रकारच्या एकापेक्षा जास्त पॅकेज (मुद्रण)
 DocType: Warehouse,Parent Warehouse,पालक वखार
@@ -2341,7 +2370,7 @@
 DocType: BOM Item,Scrap %,स्क्रॅप%
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection",शुल्क प्रमाणातील आपल्या  निवडीनुसार आयटम प्रमाण किंवा रक्कम आधारित वाटप केले जाणार आहे
 DocType: Maintenance Visit,Purposes,हेतू
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,किमान एक आयटम परत दस्तऐवज नकारात्मक प्रमाणात प्रवेश केला पाहिजे
+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 +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","ऑपरेशन {0} वर्कस्टेशन{1} मधे   कोणत्याही उपलब्ध काम तासांपेक्षा जास्त आहे , ऑपरेशन अनेक ऑपरेशन मध्ये  तोडा"
 ,Requested,विनंती
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +83,No Remarks,शेरा नाही
@@ -2353,46 +2382,46 @@
 DocType: Item,Total Projected Qty,एकूण अंदाज प्रमाण
 DocType: Monthly Distribution,Distribution Name,वितरण नाव
 DocType: Course,Course Code,अर्थात कोड
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Quality Inspection required for Item {0},आयटम आवश्यक गुणवत्ता तपासणी {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Quality Inspection required for Item {0},आयटम आवश्यक गुणवत्ता तपासणी {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,ग्राहकांना चलनात दर कंपनीच्या बेस चलनात रुपांतरीत आहे
 DocType: Purchase Invoice Item,Net Rate (Company Currency),निव्वळ दर (कंपनी चलन)
 DocType: Salary Detail,Condition and Formula Help,परिस्थिती आणि फॉर्म्युला मदत
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,प्रदेश वृक्ष व्यवस्थापित करा.
 DocType: Journal Entry Account,Sales Invoice,विक्री चलन
 DocType: Journal Entry Account,Party Balance,पार्टी शिल्लक
-apps/erpnext/erpnext/accounts/page/pos/pos.js +475,Please select Apply Discount On,कृपया सवलत लागू निवडा
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +92,Salary Slip Created,पगाराच्या स्लिप्स तयार
+apps/erpnext/erpnext/accounts/page/pos/pos.js +464,Please select Apply Discount On,कृपया सवलत लागू निवडा
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +95,Salary Slip Created,पगाराच्या स्लिप्स तयार
 DocType: Company,Default Receivable Account,मुलभूत प्राप्तीयोग्य खाते
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,वर निवडलेल्या निकष देण्यासाठी अदा एकूण पगार बँक नोंद तयार करा
 DocType: Stock Entry,Material Transfer for Manufacture,उत्पादन साठी साहित्य ट्रान्सफर
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,सवलत टक्केवारी एका दर सूची विरुद्ध किंवा सर्व दर सूची एकतर लागू होऊ शकते.
 DocType: Purchase Invoice,Half-yearly,सहामाही
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +384,Accounting Entry for Stock,शेअर एकट्या प्रवेश
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +387,Accounting Entry for Stock,शेअर एकट्या प्रवेश
 DocType: Sales Invoice,Sales Team1,विक्री Team1
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,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 +96,Row {0}: Completed Qty must be greater than zero.,सलग {0}: पूर्ण प्रमाण शून्य पेक्षा जास्त असणे आवश्यक आहे.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +120,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 +88,Row # {0}: Cannot return more than {1} for Item {2},रो # {0}:  आयटम {2} साठी  {1} पेक्षा अधिक परत करू शकत नाही
+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,प्लॉट
 DocType: Item Group,Show this slideshow at the top of the page,पृष्ठाच्या शीर्षस्थानी हा स्लाइडशो दर्शवा
 DocType: BOM,Item UOM,आयटम UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),सवलत रक्कम नंतर कर रक्कम (कंपनी चलन)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +147,Target warehouse is mandatory for row {0},लक्ष्य कोठार सलग {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,पुरवठादाराचा  पत्ता निवडा
 DocType: Quality Inspection,Quality Inspection,गुणवत्ता तपासणी
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Extra Small,अतिरिक्त लहान
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,Warning: Material Requested Qty is less than Minimum Order Qty,चेतावनी:  मागणी साहित्य Qty किमान Qty पेक्षा कमी आहे
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +194,Account {0} is frozen,खाते {0} गोठविले
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,अतिरिक्त लहान
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +690,Warning: Material Requested Qty is less than Minimum Order Qty,चेतावनी:  मागणी साहित्य Qty किमान Qty पेक्षा कमी आहे
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,खाते {0} गोठविले
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,कायदेशीर अस्तित्व / उपकंपनी स्वतंत्र लेखा चार्ट सह संघटनेला संबंधित करते
 DocType: Payment Request,Mute Email,निःशब्द ईमेल
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","अन्न, पेय आणि तंबाखू"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +606,Can only make payment against unbilled {0},फक्त बिल न केलेली विरुद्ध रक्कम करू शकता {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +126,Commission rate cannot be greater than 100,आयोग दर 100 पेक्षा जास्त असू शकत नाही
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +609,Can only make payment against unbilled {0},फक्त बिल न केलेली विरुद्ध रक्कम करू शकता {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,आयोग दर 100 पेक्षा जास्त असू शकत नाही
 DocType: Stock Entry,Subcontract,Subcontract
 apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,प्रथम {0} प्रविष्ट करा
 DocType: Production Order Operation,Actual End Time,वास्तविक समाप्ती वेळ
@@ -2403,30 +2432,30 @@
 DocType: SMS Log,No of Sent SMS,पाठविलेला एसएमएस क्रमांक
 DocType: Account,Expense Account,खर्च खाते
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,सॉफ्टवेअर
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Colour,रंग
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,रंग
 DocType: Maintenance Visit,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","कृपया असा आयटम निवडा जेथे ""शेअर आयटम आहे?""  ""नाही"" आहे  आणि ""विक्री आयटम आहे?"" ""होय "" आहे आणि  तेथे इतर उत्पादन बंडल नाही"
 DocType: Student Log,Academic,शैक्षणिक
-apps/erpnext/erpnext/controllers/accounts_controller.py +469,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),एकूण आगाऊ ({0}) आदेश विरुद्ध {1} एकूण ({2}) पेक्षा जास्त असू शकत नाही
+apps/erpnext/erpnext/controllers/accounts_controller.py +472,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),एकूण आगाऊ ({0}) आदेश विरुद्ध {1} एकूण ({2}) पेक्षा जास्त असू शकत नाही
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,असाधारण महिने ओलांडून लक्ष्य वाटप मासिक वितरण निवडा.
 DocType: Purchase Invoice Item,Valuation Rate,मूल्यांकन दर
+DocType: Stock Reconciliation,SR/,सचिन /
 apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,किंमत सूची चलन निवडलेले नाही
 DocType: Assessment,Results,परिणाम
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +168,Employee {0} has already applied for {1} between {2} and {3},कर्मचारी {0} आधीच अर्ज केला आहे {1} दरम्यान {2} आणि {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +175,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: Student Applicant,Father's/ Guardian 2 Email ID,पित्याच्या / पालक 2 ई मेल आयडी
 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 +228,Warehouses with existing transaction can not be converted to group.,विद्यमान व्यवहार गोदामे गट रूपांतरीत केले जाऊ शकत नाही.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +231,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 +93,Researcher,संशोधक
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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.,येणार्या गुणवत्ता तपासणी.
@@ -2438,25 +2467,25 @@
 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: Sales Invoice,Advertisement,जाहिरात
 DocType: Asset Category Account,Depreciation Expense Account,इतर किरकोळ खर्च खाते
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Probationary Period,परीविक्षण कालावधी
-apps/erpnext/erpnext/hooks.py +102,Announcements,घोषणा
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,परीविक्षण कालावधी
+apps/erpnext/erpnext/hooks.py +111,Announcements,घोषणा
 DocType: Customer Group,Only leaf nodes are allowed in transaction,फक्त पाने नोडस् व्यवहार अनुमत आहेत
 DocType: Expense Claim,Expense Approver,खर्च माफीचा साक्षीदार
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +109,Row {0}: Advance against Customer must be credit,रो {0}: ग्राहक विरुद्ध आगाऊ क्रेडिट असणे आवश्यक आहे
 apps/erpnext/erpnext/accounts/doctype/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 +16,To Datetime,DATETIME करण्यासाठी
+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/scheduling_tool/scheduling_tool.py +51,Course Schedules deleted:,अर्थात वेळापत्रक हटविला:
 apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,एसएमएस स्थिती राखण्यासाठी नोंदी
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,प्रलंबित उपक्रम
+DocType: Accounts Settings,Make Payment via Journal Entry,जर्नल प्रवेश द्वारे रक्कम
+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 +127,Please enter relieving date.,relieving तारीख प्रविष्ट करा.
-apps/erpnext/erpnext/controllers/trends.py +145,Amt,रक्कम
+apps/erpnext/erpnext/controllers/trends.py +149,Amt,रक्कम
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,Only Leave Applications with status 'Approved' can be submitted,फक्त स्थिती 'मंजूर'असलेला रजा अर्ज  सादर केला जाऊ शकतो
 apps/erpnext/erpnext/utilities/doctype/address/address.py +26,Address Title is mandatory.,पत्ता शीर्षक आवश्यक आहे.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,चौकशी स्त्रोत मोहीम असेल तर मोहीम नाव प्रविष्ट करा
@@ -2474,14 +2503,15 @@
 apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1},{0} पासून  {1}  पर्यंत  विनिमय दर शोधण्यात अक्षम
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,मार्क अर्धा दिवस
 DocType: Sales Invoice,Sales Team,विक्री टीम
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Duplicate entry,डुप्लिकेट नोंदणी
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,डुप्लिकेट नोंदणी
 DocType: Program Enrollment Tool,Get Students,विद्यार्थी मिळवा
 DocType: Serial No,Under Warranty,हमी अंतर्गत
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +490,[Error],[त्रुटी]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +484,[Error],[त्रुटी]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,तुम्ही विक्री ऑर्डर एकदा जतन केल्यावर शब्दा मध्ये दृश्यमान होईल.
 ,Employee Birthday,कर्मचारी वाढदिवस
 apps/erpnext/erpnext/controllers/status_updater.py +175,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} आधीच अस्तित्वात आहे. या नोंदी सुधारित आणि पुन्हा प्रयत्न करा.
 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} अस्तित्वात नाही
@@ -2497,22 +2527,22 @@
 ,Issued Items Against Production Order,उत्पादन आदेशा जारी आयटम
 DocType: Pricing Rule,Purchase Manager,खरेदी व्यवस्थापक
 DocType: Target Detail,Target Detail,लक्ष्य तपशील
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +25,All Jobs,सर्व नोकरी
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,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 +323,Amount {0} {1} {2} {3},रक्कम {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,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: Supplier,Credit Limit,क्रेडिट मर्यादा
 DocType: Production Plan Sales Order,Salse Order Date,Salse ऑर्डर तारीख
 DocType: Salary Component,Salary Component,पगार घटक
-apps/erpnext/erpnext/accounts/utils.py +372,Payment Entries {0} are un-linked,भरणा नोंदी {0} रद्द लिंक आहेत
+apps/erpnext/erpnext/accounts/utils.py +449,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 +497,Material Requests {0} created,साहित्य विनंत्या {0} तयार
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +498,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.,अटी किंवा करार साचा.
 DocType: Purchase Invoice,Address and Contact,पत्ता आणि संपर्क
@@ -2551,7 +2581,7 @@
 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 +848,Paid Amount cannot be greater than total negative outstanding amount {0},अदा केलेली रक्कम एकूण नकारात्मक थकबाकी रक्कम पेक्षा जास्त असू शकत नाही {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +859,Paid Amount cannot be greater than total negative outstanding amount {0},अदा केलेली रक्कम एकूण नकारात्मक थकबाकी रक्कम पेक्षा जास्त असू शकत नाही {0}
 DocType: Employee Internal Work History,Employee Internal Work History,कर्मचारी अंतर्गत कार्य इतिहास
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +233,Closing (Dr),बंद (डॉ)
 DocType: Cheque Print Template,Cheque Size,धनादेश आकार
@@ -2572,7 +2602,8 @@
 ,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 +555,'Update Stock' cannot be checked for fixed asset sale,&#39;अद्यतन शेअर&#39; निश्चित मालमत्ता विक्री साठी तपासणे शक्य नाही
+DocType: Student Guardian,Father,वडील
+apps/erpnext/erpnext/controllers/accounts_controller.py +558,'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} रद्द किंवा बंद आहे
@@ -2582,15 +2613,15 @@
 DocType: Sales Order,Fully Delivered,पूर्णतः वितरित
 DocType: Lead,Lower Income,अल्प उत्पन्न
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","दायित्व अंतर्गत  account head  , ज्यामध्ये  नफा / तोटा गुन्हा दाखल होणार"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +166,Source and target warehouse cannot be same for row {0},स्त्रोत आणि लक्ष्य कोठार  {0} रांगेत समान असू शकत नाही
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","फरक खाते, एक मालमत्ता / दायित्व प्रकार खाते असणे आवश्यक आहे कारण  शेअर मेळ हे उदघाटन नोंद आहे"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +81,Purchase Order number required for Item {0},आयटम आवश्यक मागणीसाठी  क्रमांक खरेदी {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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/purchase_receipt/purchase_receipt.py +82,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 +17,Cannot change status as student {0} is linked with student application {1},विद्यार्थी म्हणून स्थिती बदलू शकत नाही {0} विद्यार्थी अर्ज लिंक आहे {1}
+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: Timesheet,"List of employee which has ""Salary Slip Based on Timesheet"" is enabled in salary structure.",आहे &quot;पगाराच्या स्लिप्स Timesheet आधारित&quot; कर्मचारी यादी तत्वे सुरू केले आहे.
 DocType: Asset,Fully Depreciated,पूर्णपणे अवमूल्यन
 ,Stock Projected Qty,शेअर Qty अंदाज
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Customer {0} does not belong to project {1},ग्राहक {0}  प्रोजेक्ट {1} ला संबंधित नाही
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,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,सिरियल क्रमांक आणि बॅच
@@ -2602,7 +2633,7 @@
 DocType: Purchase Invoice,Purchase Taxes and Charges,कर आणि शुल्क खरेदी
 ,Qty to Receive,प्राप्त करण्यासाठी Qty
 DocType: Leave Block List,Leave Block List Allowed,रजा ब्लॉक यादी परवानगी दिली
-apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +55,All Warehouses,सर्व गोदामांची
+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 +105,Credit To account must be a Balance Sheet account,क्रेडिट खाते ताळेबंद खाते असणे आवश्यक आहे
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,सर्व पुरवठादार प्रकार
@@ -2614,10 +2645,10 @@
 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/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,पगाराच्या स्लिप्स करा
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +26,Browse BOM,ब्राउझ करा BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,ब्राउझ करा BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,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 Year,Academic Year,शैक्षणिक वर्ष
+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,सी आर एम
 DocType: Appraisal,Appraisal,मूल्यमापन
@@ -2625,12 +2656,12 @@
 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 +197,Leave approver must be one of {0},माफीचा साक्षीदार  {0} पैकी एक असणे आवश्यक आहे
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,Leave approver must be one of {0},माफीचा साक्षीदार  {0} पैकी एक असणे आवश्यक आहे
 DocType: Hub Settings,Seller Email,विक्रेता ईमेल
 DocType: Project,Total Purchase Cost (via Purchase Invoice),एकूण खरेदी किंमत (खरेदी  चलन द्वारे)
 DocType: Workstation Working Hour,Start Time,प्रारंभ वेळ
 DocType: Item Price,Bulk Import Help,मोठ्या प्रमाणात आयात मदत
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +256,Select Quantity,प्रमाण निवडा
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +257,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,संदेश पाठवला
@@ -2647,6 +2678,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,एकतर लक्ष्य qty किंवा लक्ष्य रक्कम आवश्यक आहे.
 apps/erpnext/erpnext/config/projects.py +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}"
+DocType: Timesheet,Billing Details,बिलिंग तपशील
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +149,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} पेक्षा जुने स्टॉक व्यवहार अद्ययावत करण्याची परवानगी नाही
 DocType: Item,Inspection Required,तपासणी आवश्यक
@@ -2666,7 +2698,7 @@
 DocType: Expense Claim,Approval Status,मंजूरीची स्थिती
 DocType: Hub Settings,Publish Items to Hub,हब करण्यासाठी आयटम प्रकाशित
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},सलग {0} मधे  मूल्य पासून मूल्य पर्यंत कमी असणे आवश्यक आहे
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Wire Transfer,वायर हस्तांतरण
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,वायर हस्तांतरण
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,सर्व चेक करा
 DocType: Sales Order,Recurring Order,आवर्ती ऑर्डर
 DocType: Company,Default Income Account,मुलभूत उत्पन्न खाते
@@ -2678,21 +2710,19 @@
 ,Welcome to ERPNext,ERPNext मधे आपले स्वागत आहे
 apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,आघाडी पासून कोटेशन पर्यंत
 DocType: Lead,From Customer,ग्राहकासाठी
-apps/erpnext/erpnext/demo/setup_data.py +357,Calls,कॉल
+apps/erpnext/erpnext/demo/setup/setup_data.py +300,Calls,कॉल
 DocType: Project,Total Costing Amount (via Time Logs),एकूण भांडवलाची  रक्कम (वेळ नोंदी द्वारे)
 DocType: Purchase Order Item Supplied,Stock UOM,शेअर UOM
-apps/erpnext/erpnext/stock/doctype/item/item.py +466,"As there are existing transactions for this item, \
-							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","\ आपण मूल्ये बदलू शकत नाही हे आयटम, तेथे विद्यमान व्यवहार म्हणून &#39;सिरियल नाही आहे&#39;, &#39;बॅच आहे नाही&#39; आणि &#39;शेअर आयटम आहे&#39; &#39;मूल्यांकन पद्धत&#39;"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,Purchase Order {0} is not submitted,खरेदी ऑर्डर {0} सबमिट केलेली नाही
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,अंदाज
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},सिरियल क्रमांक {0} कोठार  {1} शी संबंधित नाही
 apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,टीप: {0} प्रमाणात किंवा रक्कम 0 आहे म्हणून चेंडू-प्रती आणि-बुकिंग आयटम सिस्टम तपासा नाही
 DocType: Notification Control,Quotation Message,कोटेशन संदेश
 DocType: Issue,Opening Date,उघडण्याची  तारीख
-apps/erpnext/erpnext/schools/api.py +58,Attendance has been marked successfully.,उपस्थिती यशस्वीरित्या चिन्हांकित केले गेले.
+apps/erpnext/erpnext/schools/api.py +57,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 +136,Account Type for {0} must be {1},खाते प्रकार {0} असणे आवश्यक आहे {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +139,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,दोन्ही कोठार त्याच कंपनी संबंधित आवश्यक
@@ -2707,12 +2737,13 @@
 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/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 +20,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 +1190,Please select customer,कृपया ग्राहक निवडा
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1193,Please select customer,कृपया ग्राहक निवडा
 DocType: C-Form,I,मी
 DocType: Company,Asset Depreciation Cost Center,मालमत्ता घसारा खर्च केंद्र
 DocType: Sales Order Item,Sales Order Date,विक्री ऑर्डर तारीख
@@ -2722,6 +2753,7 @@
 ,Payment Period Based On Invoice Date,चलन तारखेला आधारित भरणा कालावधी
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},चलन विनिमय दर {0} साठी  गहाळ
 DocType: Assessment,Examiner,परीक्षक
+DocType: Student,Siblings,भावंड
 DocType: Journal Entry,Stock Entry,शेअर प्रवेश
 DocType: Payment Entry,Payment References,भरणा संदर्भ
 DocType: C-Form,C-FORM-,सी-FORM-
@@ -2739,11 +2771,12 @@
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,विषय नाव
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,विक्री किंवा खरेदी कमीत कमी एक निवडणे आवश्यक आहे
+DocType: Grading Structure,Grade Intervals,ग्रेड मध्यांतरे
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,आपल्या व्यवसाय स्वरूप निवडा.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,उत्पादन ऑपरेशन कोठे नेले जातात.
 DocType: Asset Movement,Source Warehouse,स्त्रोत कोठार
 DocType: Installation Note,Installation Date,प्रतिष्ठापन तारीख
-apps/erpnext/erpnext/controllers/accounts_controller.py +534,Row #{0}: Asset {1} does not belong to company {2},सलग # {0}: मालमत्ता {1} कंपनी संबंधित नाही {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +537,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,विक्री सदस्य
@@ -2757,28 +2790,31 @@
 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 +111,Date Of Retirement must be greater than Date of Joining,निवृत्ती तारीख प्रवेश दिनांक पेक्षा जास्त असणे आवश्यक आहे
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +49,There were errors while scheduling course on :,रोजी अभ्यासक्रम शेड्युल तर त्रुटी होत्या:
 DocType: Sales Invoice,Against Income Account,उत्पन्न खाते विरुद्ध
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +87,{0}% Delivered,{0}% वितरण
+apps/erpnext/erpnext/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}: क्रमांकित qty {1} किमान qty {2} (आयटम मध्ये परिभाषित) पेक्षा कमी असू शकत नाही.
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,मासिक वितरण टक्केवारी
 DocType: Territory,Territory Targets,प्रदेश लक्ष्य
 DocType: Delivery Note,Transporter Info,वाहतुक माहिती
-apps/erpnext/erpnext/accounts/utils.py +379,Please set default {0} in Company {1},कंपनी मध्ये डीफॉल्ट {0} सेट करा {1}
+apps/erpnext/erpnext/accounts/utils.py +456,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,निव्वळ नफा / तोटा
 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.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,प्रिंट टेम्पलेट साठी शोध शिर्षके फाईल नाव उदा. Proforma चलन
+DocType: Student Guardian,Student Guardian,विद्यार्थी पालक
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +184,Valuation type charges can not marked as Inclusive,मूल्यांकन प्रकार शुल्क समावेश म्हणून चिन्हांकित करू शकत नाही
 DocType: POS Profile,Update Stock,अद्यतन शेअर
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,आयटम साठी विविध UOM अयोग्य (एकूण) निव्वळ वजन मूल्य नेईल. प्रत्येक आयटम निव्वळ वजन समान UOM आहे याची खात्री करा.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM दर
 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 +349,Journal Entries {0} are un-linked,जर्नल नोंदी {0} रद्द लिंक नाहीत
+apps/erpnext/erpnext/accounts/utils.py +426,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 खर्च केंद्र खात्याचा   उल्लेख करा
@@ -2802,6 +2838,7 @@
 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,समूह
+DocType: Homepage,"URL for ""All Products""",&quot;सर्व उत्पादने&quot; यूआरएल
 DocType: Leave Application,Leave Balance Before Application,अर्ज करण्यापूर्वी शिल्लक सोडा
 DocType: SMS Center,Send SMS,एसएमएस पाठवा
 DocType: Cheque Print Template,Width of amount in word,शब्द रक्कम रुंदी
@@ -2810,7 +2847,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 +29,Current Job Openings,वर्तमान नोकरी संबंधी
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,Current Job Openings,वर्तमान नोकरी संबंधी
 DocType: Company,Stock Adjustment Account,शेअर समायोजन खाते
 DocType: Journal Entry,Write Off,बंद लिहा
 DocType: Timesheet Detail,Operation ID,ऑपरेशन आयडी
@@ -2823,7 +2860,7 @@
 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 +850,Show tax break-up,ब्रेक अप कर शो
+apps/erpnext/erpnext/public/js/controllers/transaction.js +841,Show tax break-up,ब्रेक अप कर शो
 apps/erpnext/erpnext/accounts/party.py +308,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} वखार विरुद्ध अस्तित्वात त्यामुळे आपण पुन्हा नियुक्त किंवा फेरफार करणे शक्य नाही"
@@ -2833,10 +2870,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 +534,Please select Posting Date before selecting Party,कृपया पार्टी निवड केली पोस्टिंग तारीख निवडा
 DocType: Serial No,Out of AMC,एएमसी पैकी
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +80,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 +162,Please contact to the user who have Sales Master Manager {0} role,ज्या वापरकर्त्याची  विक्री मास्टर व्यवस्थापक {0} भूमिका आहे त्याला कृपया संपर्ग साधा
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +195,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 +5,This is based on the attendance of this Student,हे या विद्यार्थी पोषाख आधारित आहे
@@ -2845,12 +2883,11 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,डिलिव्हरी टिपा {0} या विक्री ऑर्डर रद्द आधी रद्द करणे आवश्यक आहे
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +75,Paid amount + Write Off Amount can not be greater than Grand Total,पेड रक्कम + एकूण रक्कमेपेक्षा   पेक्षा जास्त असू शकत नाही बंद लिहा
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,{0} is not a valid Batch Number for Item {1},{0} आयटम एक वैध बॅच क्रमांक नाही {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +138,Note: There is not enough leave balance for Leave Type {0},टीप: रजा प्रकार पुरेशी रजा शिल्लक नाही {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,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,संधीचा  प्रकार
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,नवी कंपनी
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,Cost Center is required for 'Profit and Loss' account {0},खर्च केंद्र 'नफा व तोटा'  {0} खात्यात आवश्यक आहे
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,व्यवहार फक्त कंपनी निर्माता हटवल्या जाऊ शकतात
 apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,जनरल लेजर नोंदी चुकीची संख्या आढळली आहे . आपण व्यवहार खाते चुकीचे  निवडले असू  शकते.
 DocType: Cheque Print Template,Cheque Width,धनादेश रूंदी
@@ -2859,16 +2896,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,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 +228,{0} '{1}' is disabled,{0} &#39;{1}&#39; अक्षम आहे
+apps/erpnext/erpnext/controllers/accounts_controller.py +231,{0} '{1}' is disabled,{0} &#39;{1}&#39; अक्षम आहे
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,उघडा म्हणून सेट करा
 DocType: Cheque Print Template,Scanned Cheque,स्कॅन धनादेश
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,व्यवहार सादर केल्यावर   संपर्कांना  स्वयंचलित ईमेल पाठवा.
+DocType: Timesheet,Total Billable Amount,एकूण बिल रक्कम
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,आयटम 3
 DocType: Purchase Order,Customer Contact Email,ग्राहक संपर्क ईमेल
 DocType: Warranty Claim,Item and Warranty Details,आयटम आणि हमी तपशील
 DocType: Sales Team,Contribution (%),योगदान (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,टीप: भरणा प्रवेश पासून तयार केले जाणार नाहीत &#39;रोख किंवा बँक खाते&#39; निर्दिष्ट नाही
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Responsibilities,जबाबदारी
+apps/erpnext/erpnext/controllers/accounts_controller.py +78,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,जबाबदारी
 DocType: Expense Claim Account,Expense Claim Account,खर्च दावा खाते
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,साचा
 DocType: Sales Person,Sales Person Name,विक्री व्यक्ती नाव
@@ -2876,6 +2914,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,वापरकर्ते जोडा
 DocType: Pricing Rule,Item Group,आयटम गट
 DocType: Item,Safety Stock,सुरक्षितता शेअर
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,आयटम कोड&gt; आयटम गट&gt; ब्रँड
 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),कर आणि शुल्क जोडले (कंपनी चलन)
@@ -2885,7 +2924,6 @@
 DocType: Item,Default BOM,मुलभूत BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Please re-type company name to confirm,कंपनीचे नाव  पुष्टी करण्यासाठी पुन्हा-टाइप करा
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +67,Total Outstanding Amt,एकूण थकबाकी रक्कम
-DocType: Timesheet,Total Hours,एकूण तास
 DocType: Journal Entry,Printing Settings,मुद्रण सेटिंग्ज
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Total Debit must be equal to Total Credit. The difference is {0},एकूण डेबिट एकूण क्रेडिट समान असणे आवश्यक आहे. फरक  {0}आहे
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,ऑटोमोटिव्ह
@@ -2898,13 +2936,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,गुंतवणूक बँकिंग
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +71,Cash or Bank Account is mandatory for making payment entry,रोख रक्कम किंवा बँक खाते पैसे नोंदणी करण्यासाठी अनिवार्य आहे
 DocType: Purchase Invoice,Price List Exchange Rate,किंमत सूची विनिमय दर
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ग्राहक&gt; ग्राहक गट&gt; प्रदेश
 DocType: Purchase Invoice Item,Rate,दर
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Intern,हद्दीच्या
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,हद्दीच्या
 DocType: Stock Entry,From BOM,BOM पासून
 DocType: Assessment,Assessment Code,मूल्यांकन कोड
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +32,Basic,मूलभूत
+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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',&#39;व्युत्पन्न वेळापत्रक&#39; वर क्लिक करा
+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 +95,Reference No is mandatory if you entered Reference Date,तुम्ही संदर्भ तारीख प्रविष्ट केली  असल्यास संदर्भ क्रमांक बंधनकारक आहे
@@ -2913,11 +2952,11 @@
 DocType: Salary Slip,Salary Structure,वेतन रचना
 DocType: Account,Bank,बँक
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,एयरलाईन
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +752,Issue Material,समस्या साहित्य
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +723,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 +683,You are in offline mode. You will not be able to reload until you have network.,आपण ऑफलाइन मोड मध्ये आहोत. आपण नेटवर्क पर्यंत रीलोड सक्षम होणार नाही.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +665,You are in offline mode. You will not be able to reload until you have network.,आपण ऑफलाइन मोड मध्ये आहोत. आपण नेटवर्क पर्यंत रीलोड सक्षम होणार नाही.
 DocType: Hub Settings,Access Token,प्रवेश टोकन
 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,सिरियल नाही
@@ -2925,33 +2964,35 @@
 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 +1122,Enter value must be positive,प्रविष्ट मूल्य सकारात्मक असणे आवश्यक आहे
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,All Territories,सर्व प्रदेश
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1125,Enter value must be positive,प्रविष्ट मूल्य सकारात्मक असणे आवश्यक आहे
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,सर्व प्रदेश
 DocType: Purchase Invoice,Items,आयटम
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +23,Student is already enrolled.,विद्यार्थी आधीच नोंदणी केली आहे.
 DocType: Fiscal Year,Year Name,वर्ष नाव
 DocType: Process Payroll,Process Payroll,प्रक्रिया वेतनपट
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,कामाच्या  दिवसापेक्षा अधिक सुट्ट्या  या महिन्यात आहेत.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +233,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 +96,Request for Quotations,अवतरणे विनंती
+apps/erpnext/erpnext/hooks.py +104,Request for Quotations,अवतरणे विनंती
 DocType: Payment Reconciliation,Maximum Invoice Amount,कमाल चलन रक्कम
 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 +628,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"'{0}' प्रकार करीता माप मुलभूत युनिट साचा म्हणून समान असणे आवश्यक आहे, '{1}'"
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"'{0}' प्रकार करीता माप मुलभूत युनिट साचा म्हणून समान असणे आवश्यक आहे, '{1}'"
 DocType: Shipping Rule,Calculate Based On,आधारित असणे
 DocType: Delivery Note Item,From Warehouse,वखार पासून
 DocType: Assessment,Supervisor Name,पर्यवेक्षक नाव
+DocType: Assessment,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,खरेदी सदस्य
 DocType: Notification Control,Customize the Notification,सूचना सानुकूलित करा
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Cash Flow from Operations,ऑपरेशन्स रोख प्रवाह
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,मुलभूत पत्ता साचा हटविला  जाऊ शकत नाही
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,मुलभूत पत्ता साचा हटविला  जाऊ शकत नाही
 DocType: Sales Invoice,Shipping Rule,शिपिंग नियम
 DocType: Manufacturer,Limited to 12 characters,12 वर्णांपर्यंत  मर्यादित
 DocType: Journal Entry,Print Heading,मुद्रण शीर्षक
@@ -2966,8 +3007,8 @@
 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/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,एकतर लक्ष्य qty किंवा लक्ष्य रक्कम अनिवार्य आहे
-apps/erpnext/erpnext/stock/get_item_details.py +485,No default BOM exists for Item {0},डीफॉल्ट BOM आयटम {0} साठी अस्तित्वात नाही
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +336,Please select Posting Date first,कृपया पहले पोस्टिंग तारीख निवडा
+apps/erpnext/erpnext/stock/get_item_details.py +486,No default BOM exists for Item {0},डीफॉल्ट BOM आयटम {0} साठी अस्तित्वात नाही
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +326,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,विद्यमान व्यवहार खर्चाच्या केंद्र लेजर मधे रूपांतरीत केले जाऊ शकत नाही
@@ -2983,6 +3024,7 @@
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,पावत्या सह देयके सामना
 DocType: Journal Entry,Bank Entry,बँक प्रवेश
 DocType: Authorization Rule,Applicable To (Designation),लागू करण्यासाठी (पद)
+,Profitability Analysis,नफा विश्लेषण
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,सूचीत टाका
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,गट
 DocType: Guardian,Interests,छंद
@@ -2995,21 +3037,21 @@
 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 +141,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",सिरीयलाइज आयटम {0} शेअर मेळ वापरून \ अद्यतनित करणे शक्य नाही
 DocType: Scheduling Tool,Day,दिवस
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,नवीन सिरिअल क्रमांक कोठार असू  शकत नाही. कोठार शेअर नोंद किंवा खरेदी पावती सेट करणे आवश्यक आहे
 DocType: Lead,Lead Type,लीड प्रकार
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,You are not authorized to approve leaves on Block Dates,आपल्याला ब्लॉक तारखेवर  पाने मंजूर करण्यासाठी अधिकृत नाही
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,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,मुलभूत साहित्य विनंती प्रकार
-DocType: Student Applicant,AP.,आंध्र प्रदेश.
 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 +639,Point of Sale,विक्री पॉइंट
+apps/erpnext/erpnext/accounts/page/pos/pos.js +634,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,कर
 DocType: Production Planning Tool,Production Planning Tool,उत्पादन नियोजन साधन
@@ -3018,74 +3060,77 @@
 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 +373,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 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 Profile,Customer Group,ग्राहक गट
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,Expense account is mandatory for item {0},खर्च खाते आयटम  {0} साठी अनिवार्य आहे
 DocType: Item,Website Description,वेबसाइट वर्णन
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date must be on or after today,पुढील घसारा तारीख किंवा आज नंतर असणे आवश्यक आहे
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,इक्विटी निव्वळ बदला
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +145,Please cancel Purchase Invoice {0} first,चलन खरेदी {0} रद्द करा पहिला
 DocType: Serial No,AMC Expiry Date,एएमसी कालावधी समाप्ती तारीख
 ,Sales Register,विक्री नोंदणी
 DocType: Quotation,Quotation Lost Reason,कोटेशन हरवले कारण
+apps/erpnext/erpnext/utilities/doctype/address/address.py +164,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,डीफॉल्ट पत्ता साचा आढळले. सेटअप&gt; मुद्रण आणि ब्रँडिंग&gt; पत्ता साचा पासून एक नवीन तयार करा.
 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 +330,Transaction reference no {0} dated {1},व्यवहार संदर्भ नाहीत {0} दिनांक {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Transaction reference no {0} dated {1},व्यवहार संदर्भ नाहीत {0} दिनांक {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,संपादित करण्यासाठी काहीही नाही.
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,Summary for this month and pending activities,या महिन्यासाठी  आणि प्रलंबित उपक्रम सारांश
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,या महिन्यासाठी  आणि प्रलंबित उपक्रम सारांश
 DocType: Customer Group,Customer Group Name,ग्राहक गट नाव
 apps/erpnext/erpnext/public/js/financial_statements.js +54,Cash Flow Statement,रोख फ्लो स्टेटमेंट
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Please remove this Invoice {0} from C-Form {1},सी-फॉर्म{1} मधून  चलन {0} काढून टाका
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,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 +644,Get Items,आयटम मिळवा
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +623,Get Items,आयटम मिळवा
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +210,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 +41,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,अनेक कर्मचाऱ्यांना उपस्थिती चिन्ह
 DocType: Payment Request,Initiated,सुरू
 DocType: Production Order,Planned Start Date,नियोजनबद्ध प्रारंभ तारीख
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,Customer is required against Receivable account {0},ग्राहक प्राप्तीयोग्य खाते विरुद्ध आवश्यक आहे {0}
 DocType: Serial No,Creation Document Type,निर्मिती दस्तऐवज क्रमांक
 DocType: Leave Type,Is Encash,रोख रकमेत बदलून आहे
 DocType: Purchase Invoice,Mobile No,मोबाइल क्रमांक
 DocType: Leave Allocation,New Leaves Allocated,नवी पाने वाटप
-apps/erpnext/erpnext/controllers/trends.py +265,Project-wise data is not available for Quotation,प्रकल्प निहाय माहिती कोटेशन उपलब्ध नाही
+apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,प्रकल्प निहाय माहिती कोटेशन उपलब्ध नाही
 DocType: Project,Expected End Date,अपेक्षित शेवटची तारीख
 DocType: Budget Account,Budget Amount,बजेट रक्कम
 DocType: Appraisal Template,Appraisal Template Title,मूल्यांकन साचा शीर्षक
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,Commercial,व्यावसायिक
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,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 +648,Row {0}# Account must be of type 'Fixed Asset',सलग {0} # खाते प्रकार असणे आवश्यक आहे &#39;निश्चित मालमत्ता&#39;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,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 +30,Series is mandatory,मालिका अनिवार्य आहे
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +50,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} साठी आवश्यक कोठार
 DocType: Leave Allocation,Unused leaves,न वापरलेल्या  रजा
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Cr,कोटी
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Cr,कोटी
 DocType: Tax Rule,Billing State,बिलिंग राज्य
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +250,Transfer,ट्रान्सफर
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +187,{0} {1} does not associated with Party Account {2},{0} {1} पार्टी खात्यासह संबद्ध नाही {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,Fetch exploded BOM (including sub-assemblies),(उप-मंडळ्यांना समावेश) स्फोट झाला BOM प्राप्त
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +254,Transfer,ट्रान्सफर
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +190,{0} {1} does not associated with Party Account {2},{0} {1} पार्टी खात्यासह संबद्ध नाही {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +796,Fetch exploded BOM (including sub-assemblies),(उप-मंडळ्यांना समावेश) स्फोट झाला BOM प्राप्त
 DocType: Authorization Rule,Applicable To (Employee),लागू करण्यासाठी (कर्मचारी)
-apps/erpnext/erpnext/controllers/accounts_controller.py +115,Due Date is mandatory,देय तारीख अनिवार्य आहे
+apps/erpnext/erpnext/controllers/accounts_controller.py +118,Due Date is mandatory,देय तारीख अनिवार्य आहे
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,विशेषता साठी बढती {0} 0 असू शकत नाही
 DocType: Journal Entry,Pay To / Recd From,पासून / Recd अदा
 DocType: Naming Series,Setup Series,सेटअप मालिका
 DocType: Payment Reconciliation,To Invoice Date,तारीख चलन करण्यासाठी
 DocType: Supplier,Contact HTML,संपर्क HTML
 ,Inactive Customers,निष्क्रिय ग्राहक
+DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,खरेदी पावती
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,कसे किंमत नियम लागू आहे?
 DocType: Quality Inspection,Delivery Note No,डिलिव्हरी टीप क्रमांक
@@ -3094,7 +3139,7 @@
 DocType: Company,Retail,किरकोळ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +120,Customer {0} does not exist,ग्राहक {0} अस्तित्वात नाही
 DocType: Attendance,Absent,अनुपस्थित
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +587,Product Bundle,उत्पादन बंडल
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Product Bundle,उत्पादन बंडल
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Invalid reference {1},रो {0}: अवैध संदर्भ {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,कर आणि शुल्क साचा खरेदी
 DocType: Upload Attendance,Download Template,डाउनलोड साचा
@@ -3104,8 +3149,8 @@
 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 +742,Send Supplier Emails,पुरवठादार ई-मेल पाठवा
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +104,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",पगार दरम्यान {0} आणि {1} द्या अनुप्रयोग या कालावधीत तारीख श्रेणी दरम्यान असू शकत नाही कालावधीसाठी आधीपासून प्रक्रिया.
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +708,Send Supplier Emails,पुरवठादार ई-मेल पाठवा
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,"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,पालक व्याज
 DocType: Timesheet,Employee Detail,कर्मचारी तपशील
@@ -3116,9 +3161,9 @@
 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/accounts/doctype/gl_entry/gl_entry.py +77,Account {0} cannot be a Group,खाते {0} एक गट असू शकत नाही
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} cannot be a Group,खाते {0} एक गट असू शकत नाही
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +31,Optional. This setting will be used to filter in various transactions.,पर्यायी. हे सेटिंग विविध व्यवहार फिल्टर करण्यासाठी वापरले  जाईल.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +107,Negative Valuation Rate is not allowed,नकारात्मक मूल्यांकन दर परवानगी नाही
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,नकारात्मक मूल्यांकन दर परवानगी नाही
 DocType: Holiday List,Weekly Off,साप्ताहिक बंद
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","उदा 2012, 2012-13 साठी"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +39,Provisional Profit / Loss (Credit),अस्थायी नफा / तोटा (क्रेडिट)
@@ -3132,16 +3177,16 @@
 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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: आयटम {2} ला खर्च केंद्र अनिवार्य आहे
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +626,Get Items from Product Bundle,उत्पादन बंडलचे आयटम मिळवा
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +605,Get Items from Product Bundle,उत्पादन बंडलचे आयटम मिळवा
 DocType: Asset,Straight Line,सरळ रेष
 DocType: Project User,Project User,प्रकल्प वापरकर्ता
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} is inactive,खाते {0} निष्क्रिय आहे
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} is inactive,खाते {0} निष्क्रिय आहे
 DocType: GL Entry,Is Advance,आगाऊ आहे
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,उपस्थिती पासून तारीख आणि उपस्थिती पर्यंत  तारीख अनिवार्य आहे
 apps/erpnext/erpnext/controllers/buying_controller.py +148,Please enter 'Is Subcontracted' as Yes or No,'Subcontracted आहे' होय किंवा नाही म्हणून प्रविष्ट करा
 DocType: Sales Team,Contact No.,संपर्क क्रमांक
 DocType: Bank Reconciliation,Payment Entries,भरणा नोंदी
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,'Profit and Loss' type account {0} not allowed in Opening Entry,'नफा व तोटा' प्रकार खाते {0} प्रवेशास परवानगी नाही
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +71,'Profit and Loss' type account {0} not allowed in Opening Entry,'नफा व तोटा' प्रकार खाते {0} प्रवेशास परवानगी नाही
 DocType: Program Enrollment Tool,Get Students From,पासून विद्यार्थी मिळवा
 DocType: Hub Settings,Seller Country,विक्रेता देश
 apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,वेबसाइट वर प्रकाशित आयटम
@@ -3160,7 +3205,7 @@
 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 +558,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","सलग # {0}: मालमत्ता {1} सादर केला जाऊ शकत नाही, तो आधीपासूनच आहे {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +561,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","सलग # {0}: मालमत्ता {1} सादर केला जाऊ शकत नाही, तो आधीपासूनच आहे {2}"
 DocType: Tax Rule,Billing Country,बिलिंग देश
 DocType: Production Order,Expected Delivery Date,अपेक्षित वितरण तारीख
 apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,डेबिट आणि क्रेडिट {0} # समान नाही {1}. फरक आहे {2}.
@@ -3173,13 +3218,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +202,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: Sales Order,% Amount Billed,% रक्कम बिल
+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.,"आपण जतन करण्यापूर्वी मालिका निवडा वापरकर्ता सक्ती करायचे असल्यास हे  तपासा. आपण या चेक केले, तर मुलभूत नसेल."
 apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},सिरियल क्रमांक  असलेले कोणतेही आयटम  {0} नाहीत
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,ओपन सूचना
+DocType: Email Digest,Open Notifications,ओपन सूचना
 DocType: Payment Entry,Difference Amount (Company Currency),फरक रक्कम (कंपनी चलन)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,थेट खर्च
 apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
@@ -3187,7 +3232,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,नवीन ग्राहक महसूल
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,प्रवास खर्च
 DocType: Maintenance Visit,Breakdown,यंत्रातील बिघाड
-apps/erpnext/erpnext/controllers/accounts_controller.py +634,Account: {0} with currency: {1} can not be selected,खाते: {0} चलन: {1} बरोबर  निवडले जाऊ शकत नाही
+apps/erpnext/erpnext/controllers/accounts_controller.py +637,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} ला संबंधित नाही:
 DocType: Program Enrollment Tool,Student Applicants,विद्यार्थी अर्जदाराच्या
@@ -3195,15 +3240,15 @@
 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 +56,Probation,उमेदवारीचा काळ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Probation,उमेदवारीचा काळ
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,पगार घटक
 DocType: Program Enrollment Tool,New Academic Year,नवीन शैक्षणिक वर्ष
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Payment of salary for the month {0} and year {1},महिना  {0} आणि वर्ष {1} साठी पगारचा भरणा
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Payment of salary for the month {0} and year {1},महिना  {0} आणि वर्ष {1} साठी पगारचा भरणा
 DocType: Stock Settings,Auto insert Price List rate if missing,दर सूची दर गहाळ असेल तर आपोआप घाला
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,एकूण देय रक्कम
 DocType: Production Order Item,Transferred Qty,हस्तांतरित Qty
 apps/erpnext/erpnext/config/learn.py +11,Navigating,नॅव्हिगेट
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Planning,नियोजन
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,नियोजन
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,जारी
 DocType: Project,Total Billing Amount (via Time Logs),एकूण बिलिंग रक्कम (वेळ नोंदी द्वारे)
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,We sell this Item,आम्ही ही  आयटम विक्री
@@ -3216,11 +3261,10 @@
 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.,ईमेल द्वारे नियमित सारांश अहवाल पाठवा.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Sales invoice submitted sucessfully.,विक्री चलन यशस्वीरित्या सादर केला.
 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}
 DocType: Assessment Result,Student Name,विद्यार्थी नाव
-apps/erpnext/erpnext/hooks.py +104,Assessment Schedule,मूल्यांकन वेळापत्रक
+apps/erpnext/erpnext/hooks.py +113,Assessment Schedule,मूल्यांकन वेळापत्रक
 DocType: Brand,Item Manager,आयटम व्यवस्थापक
 DocType: Buying Settings,Default Supplier Type,मुलभूत पुरवठादार प्रकार
 DocType: Production Order,Total Operating Cost,एकूण ऑपरेटिंग खर्च
@@ -3230,6 +3274,7 @@
 DocType: GL Entry,Party Type,पार्टी प्रकार
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +78,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 नाही
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,वेतन टेम्प्लेट मास्टर.
 DocType: Leave Type,Max Days Leave Allowed,कमाल दिवस रजा परवानगी
@@ -3241,18 +3286,19 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,निष्पन्न किंवा ग्राहकांना कोट्स.
 DocType: Stock Settings,Role Allowed to edit frozen stock,भूमिका गोठविलेला  स्टॉक संपादित करण्याची परवानगी
 ,Territory Target Variance Item Group-Wise,प्रदेश लक्ष्य फरक आयटम गट निहाय
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Customer Groups,सर्व ग्राहक गट
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +78,Accumulated Monthly,जमा मासिक
-apps/erpnext/erpnext/controllers/accounts_controller.py +595,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} आवश्यक आहे. कदाचित चलन विनिमय रेकॉर्ड {1} {2} करण्यासाठी तयार केले नाही.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,सर्व ग्राहक गट
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +81,Accumulated Monthly,जमा मासिक
+apps/erpnext/erpnext/controllers/accounts_controller.py +598,{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} अस्तित्वात नाही
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),किंमत सूची दर (कंपनी चलन)
 DocType: Products Settings,Products Settings,उत्पादने सेटिंग्ज
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +188,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} द्वारे सेटअप&gt; सेिटंगेंेंें&gt; नामांकन मालिका मालिका नामांकन सेट करा
 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 +84,Secretary,सचिव
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,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,खरेदी
@@ -3261,24 +3307,22 @@
 ,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,मूल्यांकन नाव
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,रो # {0}: सिरियल क्रमांक  बंधनकारक आहे
+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 +859,Supplier Quotation,पुरवठादार कोटेशन
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +838,Supplier Quotation,पुरवठादार कोटेशन
 DocType: Quotation,In Words will be visible once you save the Quotation.,तुम्ही अवतरण एकदा जतन केल्यावर  शब्दा मध्ये दृश्यमान होईल.
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +7,Collect Fees,शुल्क गोळा
+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}
 DocType: Lead,Add to calendar on this date,या तारखेला कॅलेंडरमध्ये समाविष्ट करा
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,शिपिंग खर्च जोडून नियम.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,पुढील कार्यक्रम
 DocType: Item,Opening Stock,शेअर उघडत
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,ग्राहक आवश्यक आहे
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} परत देण्यासाठी अनिवार्य आहे
 DocType: Purchase Order,To Receive,प्राप्त करण्यासाठी
 apps/erpnext/erpnext/public/js/setup_wizard.js +195,user@example.com,user@example.com
-DocType: Email Digest,Income / Expense,उत्पन्न / खर्च
 DocType: Employee,Personal Email,वैयक्तिक ईमेल
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,एकूण फरक
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","सक्षम असल्यास, प्रणाली आपोआप यादी एकट्या नोंदी पोस्ट होईल."
@@ -3289,13 +3333,14 @@
 DocType: Customer,From Lead,लीड पासून
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,ऑर्डर उत्पादनासाठी  प्रकाशीत.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,आर्थिक वर्ष निवडा ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,POS Profile required to make POS Entry,पीओएस प्रोफाइल पीओएस नोंद करण्यासाठी  आवश्यक
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +509,POS Profile required to make POS Entry,पीओएस प्रोफाइल पीओएस नोंद करण्यासाठी  आवश्यक
 DocType: Program Enrollment Tool,Enroll Students,विद्यार्थी ची नोंदणी करा
 DocType: Hub Settings,Name Token,नाव टोकन
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,मानक विक्री
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Atleast one warehouse is mandatory,किमान एक कोठार अनिवार्य आहे
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +129,Atleast one warehouse is mandatory,किमान एक कोठार अनिवार्य आहे
 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 +330,{0} against Sales Invoice {1},{0} विक्री चलन विरुद्ध {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,प्रकल्प नाव
@@ -3316,10 +3361,11 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,रजा 0.5 च्या पटीत वाटप करणे आवश्यक आहे
 DocType: Production Order,Operation Cost,ऑपरेशन खर्च
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,एक .csv फाइल पासून उपस्थिती अपलोड करा
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,बाकी रक्कम
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,या विक्री व्यक्ती साठी item गट निहाय लक्ष्य सेट करा .
 DocType: Stock Settings,Freeze Stocks Older Than [Days],फ्रीज स्टॉक  पेक्षा जुने [दिवस]
-apps/erpnext/erpnext/controllers/accounts_controller.py +528,Row #{0}: Asset is mandatory for fixed asset purchase/sale,सलग # {0}: मालमत्ता निश्चित मालमत्ता खरेदी / विक्री अनिवार्य आहे
+apps/erpnext/erpnext/controllers/accounts_controller.py +531,Row #{0}: Asset is mandatory for fixed asset purchase/sale,सलग # {0}: मालमत्ता निश्चित मालमत्ता खरेदी / विक्री अनिवार्य आहे
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","दोन किंवा अधिक किंमत नियम वरील स्थितीवर आधारित आढळल्यास, अग्रक्रम लागू आहे. डीफॉल्ट मूल्य शून्य (रिक्त) आहे, तर प्राधान्य 0 ते 20 दरम्यान एक नंबर आहे. उच्च संख्येचा  अर्थ जर तेथे समान परिस्थितीमधे  एकाधिक किंमत नियम असतील तर त्याला प्राधान्य मिळेल"
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,आर्थिक वर्ष: {0} अस्तित्वात नाही
 DocType: Currency Exchange,To Currency,चलन
@@ -3336,15 +3382,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,प्रायव्हेट इक्विटी
 DocType: Maintenance Visit,Customer Feedback,ग्राहक अभिप्राय
 DocType: Account,Expense,खर्च
-DocType: Sales Invoice,Exhibition,प्रदर्शन
 apps/erpnext/erpnext/utilities/doctype/address/address.py +77,"Company is mandatory, as it is your company address","तो आपल्या कंपनीचा पत्ता आहे म्हणून कंपनी, अनिवार्य आहे"
 DocType: Item Attribute,From Range,श्रेणी पासून
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +81,Syntax error in formula or condition: {0},सूत्र किंवा स्थितीत वाक्यरचना त्रुटी: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +92,Syntax error in formula or condition: {0},सूत्र किंवा स्थितीत वाक्यरचना त्रुटी: {0}
 apps/erpnext/erpnext/stock/utils.py +99,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 +28,Jobs,नोकरी
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,नोकरी
 ,Sales Order Trends,विक्री ऑर्डर ट्रेन्ड
 DocType: Employee,Held On,आयोजित रोजी
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,उत्पादन आयटम
@@ -3353,16 +3399,16 @@
 DocType: Stock Entry Detail,Additional Cost,अतिरिक्त खर्च
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,आर्थिक वर्ष अंतिम तारीख
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","व्हाउचर नाही आधारित फिल्टर करू शकत नाही, व्हाउचर प्रमाणे गटात समाविष्ट केले तर"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +763,Make Supplier Quotation,पुरवठादार कोटेशन करा
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,Make Supplier Quotation,पुरवठादार कोटेशन करा
 DocType: Quality Inspection,Incoming,येणार्या
 DocType: BOM,Materials Required (Exploded),साहित्य आवश्यक(स्फोट झालेले )
 apps/erpnext/erpnext/public/js/setup_wizard.js +185,"Add users to your organization, other than yourself","स्वत: पेक्षा इतर, आपल्या संस्थेसाठी वापरकर्ते जोडा"
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,Row # {0}: Serial No {1} does not match with {2} {3},रो # {0}: सिरियल क्रमांक  {1} हा {2} {3}सोबत  जुळत नाही
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +42,Casual Leave,प्रासंगिक रजा
+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,प्रासंगिक रजा
 DocType: Batch,Batch ID,बॅच आयडी
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,Note: {0},टीप: {0}
 ,Delivery Note Trends,डिलिव्हरी टीप ट्रेन्ड
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +103,This Week's Summary,या आठवड्यातील सारांश
+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} केवळ शेअर व्यवहार द्वारे अद्यतनित केले जाऊ शकतात
 DocType: Student Group Creation Tool,Get Courses,अभ्यासक्रम मिळवा
 DocType: GL Entry,Party,पार्टी
@@ -3372,7 +3418,7 @@
 DocType: Request for Quotation Item,Request for Quotation Item,अवतरण आयटम विनंती
 DocType: Purchase Order,To Bill,बिल
 DocType: Material Request,% Ordered,% आदेश दिले
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Piecework,Piecework
+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: Task,Actual Time (in Hours),(तास) वास्तविक वेळ
 DocType: Employee,History In Company,कंपनी मध्ये इतिहास
@@ -3389,7 +3435,7 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +350,{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 +162,Black,ब्लॅक
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,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} आयटम उत्पादन
@@ -3400,13 +3446,13 @@
 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 +69,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,मार्क अनुपिस्थत
 DocType: Journal Entry Account,Exchange Rate,विनिमय दर
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Sales Order {0} is not submitted,"विक्री ऑर्डर {0} सबमिट केलेली नाही,"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +527,Sales Order {0} is not submitted,"विक्री ऑर्डर {0} सबमिट केलेली नाही,"
 DocType: Homepage,Tag Line,टॅग लाइन
 DocType: Fee Component,Fee Component,शुल्क घटक
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +857,Add items from,आयटम जोडा
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +836,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} ला संबंधित नाही
 DocType: Cheque Print Template,Regular,नियमित
 DocType: BOM,Last Purchase Rate,गेल्या खरेदी दर
@@ -3414,6 +3460,7 @@
 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 आहेत
 ,Sales Person-wise Transaction Summary,विक्री व्यक्ती-ज्ञानी व्यवहार सारांश
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +60,Cost Center is required for 'Profit and Loss' account {0}. Please set up a default Cost Center for the Company.,खर्च केंद्र &#39;नफा व तोटा&#39; खाते {0} आवश्यक आहे. कंपनी साठी डीफॉल्ट खर्च केंद्र सेट करा.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,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,मासिक वितरण टक्केवारी
@@ -3424,12 +3471,12 @@
 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 +710,Online,ऑनलाइन
+apps/erpnext/erpnext/accounts/page/pos/pos.js +692,Online,ऑनलाइन
 ,Available Stock for Packing Items,पॅकिंग आयटम उपलब्ध शेअर
 DocType: Item Variant,Item Variant,आयटम व्हेरियंट
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,हा पत्ता साचा मुलभूतरित्या सेट केला कारण तेथे इतर पूर्वनिर्धारीत नाही
+apps/erpnext/erpnext/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 +74,Quality Management,गुणवत्ता व्यवस्थापन
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,गुणवत्ता व्यवस्थापन
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,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,कर्मचारी बाह्य कार्य इतिहास
@@ -3451,11 +3498,12 @@
 DocType: Student,Student Email ID,विद्यार्थी ईमेल आयडी
 DocType: Employee,Notice (days),सूचना (दिवस)
 DocType: Tax Rule,Sales Tax Template,विक्री कर साचा
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1520,Select items to save the invoice,अशी यादी तयार करणे जतन करण्यासाठी आयटम निवडा
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1544,Select items to save the invoice,अशी यादी तयार करणे जतन करण्यासाठी आयटम निवडा
 DocType: Employee,Encashment Date,एनकॅशमेंट तारीख
 DocType: Account,Stock Adjustment,शेअर समायोजन
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},क्रियाकलाप प्रकार करीता मुलभूत क्रियाकलाप खर्च अस्तित्वात आहे  - {0}
 DocType: Production Order,Planned Operating Cost,नियोजनबद्ध ऑपरेटिंग खर्च
+DocType: Academic Term,Term Start Date,मुदत प्रारंभ तारीख
 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,अर्जदाराचे नाव
@@ -3485,17 +3533,17 @@
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,खाते कोठार ( शा्वत यादी ) ह्या खाते अंतर्गत निर्माण केले जाईल.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +119,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,स्टॉक खतावणीत नोंद या कोठार विद्यमान म्हणून कोठार हटविला जाऊ शकत नाही.
 DocType: Company,Distribution,वितरण
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +8,Amount Paid,अदा केलेली रक्कम
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Project Manager,प्रकल्प व्यवस्थापक
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,अदा केलेली रक्कम
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,प्रकल्प व्यवस्थापक
 ,Quoted Item Comparison,उद्धृत बाबींचा तुलना
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Dispatch,पाठवणे
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,पाठवणे
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,आयटम: {0} साठी कमाल {1} % सवलतिची परवानगी आहे
 apps/erpnext/erpnext/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.,भूमिका ज्याला सेट क्रेडिट मर्यादा ओलांडत व्यवहार सादर करण्याची परवानगी आहे .
-DocType: Sales Invoice,Supplier Reference,पुरवठादार संदर्भ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +844,"Master data syncing, it might take some time","मास्टर डेटा समक्रमित करणे, तो काही वेळ लागू शकतो"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +832,"Master data syncing, it might take some time","मास्टर डेटा समक्रमित करणे, तो काही वेळ लागू शकतो"
 DocType: Item,Material Issue,साहित्य अंक
 DocType: Hub Settings,Seller Description,विक्रेता वर्णन
 DocType: Employee Education,Qualification,पात्रता
@@ -3509,7 +3557,7 @@
 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 +83,Error in formula or condition,सूत्र किंवा अट त्रुटी
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,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,सर्व अनचेक करा
@@ -3518,7 +3566,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},तारीखे पर्यंत आर्थिक वर्षाच्या   आत असावे. तारीख पर्यंत= {0}गृहीत धरून
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","येथे आपण इ उंची, वजन, अॅलर्जी, वैद्यकीय चिंता राखण्यास मदत करू  शकता"
 DocType: Leave Block List,Applies to Company,कंपनीसाठी  लागू
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +197,Cannot cancel because submitted Stock Entry {0} exists,सादर शेअर प्रवेश {0} अस्तित्वात असल्याने रद्द करू शकत नाही
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +198,Cannot cancel because submitted Stock Entry {0} exists,सादर शेअर प्रवेश {0} अस्तित्वात असल्याने रद्द करू शकत नाही
 DocType: Purchase Invoice,In Words,शब्द मध्ये
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,Today is {0}'s birthday!,आज {0} चे वाढदिवस आहे!
 DocType: Production Planning Tool,Material Request For Warehouse,कोठार साहित्य विनंती
@@ -3528,14 +3576,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,आपले आर्थिक वर्ष सुरू
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,मालमत्ता Depreciations आणि शिल्लक
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +319,Amount {0} {1} transferred from {2} to {3},रक्कम {0} {1} हस्तांतरित {2} करण्यासाठी {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +322,Amount {0} {1} transferred from {2} to {3},रक्कम {0} {1} हस्तांतरित {2} करण्यासाठी {3}
 DocType: Sales Invoice,Get Advances Received,सुधारण प्राप्त करा
 DocType: Email Digest,Add/Remove Recipients,प्राप्तकर्ते  जोडा / काढा
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +432,Transaction not allowed against stopped Production Order {0},व्यवहार बंद उत्पादन विरुद्ध परवानगी नाही ऑर्डर {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +437,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 +143,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 +652,Item variant {0} exists with same attributes,आयटम  variant {0} ज्याच्यामध्ये समान गुणधर्म अस्तित्वात आहेत
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,आयटम  variant {0} ज्याच्यामध्ये समान गुणधर्म अस्तित्वात आहेत
+DocType: Leave Application,LAP/,LAP /
 DocType: Salary Slip,Salary 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,'तारखेपर्यंत' आवश्यक आहे
@@ -3543,12 +3592,12 @@
 DocType: Sales Invoice Item,Sales Order Item,विक्री ऑर्डर आयटम
 DocType: Salary Slip,Payment Days,भरणा दिवस
 DocType: Customer,Dormant,सुप्त
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +212,Warehouses with child nodes cannot be converted to ledger,मुलाला नोडस् सह गोदामे लेजर रूपांतरीत केले जाऊ शकत नाही
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +215,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/public/js/controllers/transaction.js +866,It is needed to fetch Item Details.,हा आयटम तपशील प्राप्त करण्यासाठी  आवश्यक आहे.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +857,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} आधीच प्राप्त झाला  आहे
@@ -3558,14 +3607,14 @@
 DocType: Expense Claim,Total Claimed Amount,एकूण हक्क सांगितला रक्कम
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,विक्री संभाव्य संधी.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,Invalid {0},अवैध {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Sick Leave,आजारी रजा
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,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,विभाग स्टोअर्स
 DocType: Warehouse,PIN,पिन
 DocType: Sales Invoice,Base Change Amount (Company Currency),बेस बदला रक्कम (कंपनी चलन)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +313,No accounting entries for the following warehouses,खालील गोदामांची लेखा नोंदी नाहीत
-apps/erpnext/erpnext/projects/doctype/project/project.js +102,Save the document first.,पहिला  दस्तऐवज जतन करा.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +314,No accounting entries for the following warehouses,खालील गोदामांची लेखा नोंदी नाहीत
+apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,पहिला  दस्तऐवज जतन करा.
 DocType: Account,Chargeable,आकारण्यास
 DocType: Company,Change Abbreviation,बदला Abbreviation
 DocType: Expense Claim Detail,Expense Date,खर्च तारीख
@@ -3578,10 +3627,9 @@
 DocType: Purchase Invoice,Recurring Print Format,आवर्ती प्रिंट स्वरूप
 DocType: C-Form,Series,मालिका
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,Expected Delivery Date cannot be before Purchase Order Date,अपेक्षित वितरण तारीख पर्चेस तारखेच्या आधी असू शकत नाही
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} द्वारे सेटअप&gt; सेिटंगेंेंें&gt; नामांकन मालिका मालिका नामांकन सेट करा
 DocType: Appraisal,Appraisal Template,मूल्यांकन साचा
 DocType: Item Group,Item Classification,आयटम वर्गीकरण
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Business Development Manager,व्यवसाय विकास व्यवस्थापक
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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,सामान्य खातेवही
@@ -3591,8 +3639,8 @@
 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 +940,Please select {0} first,कृपया प्रथम {0} निवडा
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +749,Batch {0} of Item {1} has expired.,आयटम बॅच {0} {1} कालबाह्य झाले आहे.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +953,Please select {0} first,कृपया प्रथम {0} निवडा
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +757,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,एकूण
@@ -3609,8 +3657,8 @@
 {% 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 +92,Warehouse not found in the system,कोठार प्रणाली आढळली नाही
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +106,This Month's Summary,या  महिन्याचा  सारांश
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,कोठार प्रणाली आढळली नाही
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,या  महिन्याचा  सारांश
 DocType: Quality Inspection Reading,Quality Inspection Reading,गुणवत्ता तपासणी वाचन
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`फ्रीज स्टॉक जुने Than`% d दिवस कमी असणे आवश्यक आहे.
 DocType: Tax Rule,Purchase Tax Template,कर साचा खरेदी
@@ -3620,21 +3668,22 @@
 DocType: Item Customer Detail,Ref Code,संदर्भ कोड
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,कर्मचारी रेकॉर्ड.
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Please set Next Depreciation Date,पुढील घसारा तारीख सेट करा
-DocType: Payment Gateway,Payment Gateway,पेमेंट गेटवे
 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 +378,Operation Time must be greater than 0 for Operation {0},ऑपरेशन वेळ ऑपरेशन  {0} साठी 0 पेक्षा जास्त असणे आवश्यक आहे
+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/accounts/doctype/account/account.py +170,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 ) ठेवा
 DocType: Program,Program Abbreviation,कार्यक्रम संक्षेप
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,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: Appraisal,Start Date,प्रारंभ तारीख
@@ -3650,21 +3699,22 @@
 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,शुल्क जर आयटमला  लागू होत नाही तर आयटम काढा
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,उदा. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +27,Transaction currency must be same as Payment Gateway currency,व्यवहार चलन पेमेंट गेटवे चलन म्हणून समान असणे आवश्यक आहे
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Transaction currency must be same as Payment Gateway currency,व्यवहार चलन पेमेंट गेटवे चलन म्हणून समान असणे आवश्यक आहे
 DocType: Payment Entry,Receive,प्राप्त
+apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,आंतरशालेय:
 DocType: Maintenance Visit,Fully Completed,पूर्णतः पूर्ण
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% पूर्ण
 DocType: Employee,Educational Qualification,शैक्षणिक अर्हता
 DocType: Workstation,Operating Costs,खर्च
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,क्रिया जमा मासिक अंदाजपत्रक ओलांडला तर
 DocType: Purchase Invoice,Submit on creation,निर्माण केल्यावर सबमिट
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +432,Currency for {0} must be {1},चलन {0} असणे आवश्यक आहे {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +435,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 +493,Row {0}: An Reorder entry already exists for this warehouse {1},रो {0}: कोठार {1} साठी एक पुन्हा क्रमवारी लावा नोंद आधीच अस्तित्वात आहे
+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/crm/doctype/opportunity/opportunity.py +79,"Cannot declare as lost, because Quotation has been made.","कोटेशन केले आहे कारण, म्हणून गमवलेले जाहीर करू शकत नाही."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,खरेदी मास्टर व्यवस्थापक
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +429,Production Order {0} must be submitted,उत्पादन ऑर्डर {0} सादर करणे आवश्यक आहे
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +434,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,तारीखे पर्यंत  तारखेपासूनच्या  आधी असू शकत नाही
@@ -3674,25 +3724,27 @@
 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 +181,Totals,एकूण
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,एकूण
 DocType: BOM,Manufacturing,उत्पादन
 ,Ordered Items To Be Delivered,आदेश दिलेले  आयटम वितरित करणे
 DocType: Account,Income,उत्पन्न
 DocType: Industry Type,Industry Type,उद्योग प्रकार
 apps/erpnext/erpnext/templates/includes/cart.js +141,Something went wrong!,काहीतरी चूक झाली!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,Warning: Leave application contains following block dates,चेतावणी: रजा अर्जा मधे खालील  ब्लॉक तारखा समाविष्टीत आहेत
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +120,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} हा व्यवहार पूर्ण करण्यासाठी साठी युनिट.
+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 +181,Organization unit (department) master.,संस्था युनिट (विभाग) मास्टर.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,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 +793,All records are synced.,सर्व रेकॉर्ड समक्रमित केले आहेत.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +781,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,खर्च केंद्र नाव
@@ -3711,21 +3763,20 @@
 DocType: Address,Name of person or organization that this address belongs to.,या पत्त्यावर मालकीची व्यक्ती किंवा संस्थेचे  नाव.
 apps/erpnext/erpnext/public/js/setup_wizard.js +260,Your Suppliers,आपले पुरवठादार
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +49,Cannot set as Lost as Sales Order is made.,विक्री आदेश केली आहे म्हणून गमावले म्हणून सेट करू शकत नाही.
-DocType: Student Applicant,Mother's Name,आईचे नाव
 DocType: Request for Quotation Item,Supplier Part No,पुरवठादार भाग नाही
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +348,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',गटात मूल्यांकन &#39;किंवा&#39; Vaulation आणि एकूण &#39;करिता वजा करू शकत नाही
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Received From,पासून प्राप्त
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Received From,पासून प्राप्त
 DocType: Lead,Converted,रूपांतरित
 DocType: Item,Has Serial No,सिरियल क्रमांक  आहे
 DocType: Employee,Date of Issue,समस्येच्या तारीख
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: {0} पासून {1} साठी
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +153,Row #{0}: Set Supplier for item {1},रो # {0}: पुरवठादार {1} साठी  आयटम सेट करा
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +93,Row {0}: Hours value must be greater than zero.,सलग {0}: तास मूल्य शून्य पेक्षा जास्त असणे आवश्यक आहे.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +117,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} सापडू शकत नाही
 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 +172,{0} {1} does not exist,{0} {1} अस्तित्वात नाही
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +175,{0} {1} does not exist,{0} {1} अस्तित्वात नाही
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,Please check Multi Currency option to allow accounts with other currency,इतर चलनबरोबरचे account परवानगी देण्यासाठी कृपया  मल्टी चलन पर्याय तपासा
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +72,Item: {0} does not exist in the system,आयटम: {0} प्रणालीत  अस्तित्वात नाही
 apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,आपल्याला गोठविलेले  मूल्य सेट करण्यासाठी अधिकृत नाही
@@ -3734,13 +3785,14 @@
 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/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,उपस्थिती भविष्यात तारखा चिन्हांकित केला जाऊ शकत नाही
 DocType: Pricing Rule,Pricing Rule Help,किंमत नियम मदत
 DocType: Purchase Taxes and Charges,Account Head,खाते प्रमुख
 apps/erpnext/erpnext/config/stock.py +163,Update additional costs to calculate landed cost of items,आयटम अतिरिक्त खर्चाची  सुधारणा करण्यासाठी  अतिरिक्त खर्च अद्यतनित करा
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Electrical,इलेक्ट्रिकल
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Electrical,इलेक्ट्रिकल
 DocType: Stock Entry,Total Value Difference (Out - In),एकूण मूल्य फरक (आउट - मध्ये)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,Row {0}: Exchange Rate is mandatory,रो {0}: विनिमय दर अनिवार्य आहे
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},वापरकर्ता आयडी कर्मचारी  {0}साठी सेट नाही
@@ -3748,7 +3800,7 @@
 DocType: Item,Customer Code,ग्राहक कोड
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +210,Birthday Reminder for {0},साठी जन्मदिवस अनुस्मरण {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,गेल्या ऑर्डर असल्याने दिवस
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +292,Debit To account must be a Balance Sheet account,खाते करण्यासाठी डेबिट एक ताळेबंद खाते असणे आवश्यक आहे
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To account must be a Balance Sheet account,खाते करण्यासाठी डेबिट एक ताळेबंद खाते असणे आवश्यक आहे
 DocType: Buying Settings,Naming Series,नामांकन मालिका
 DocType: Leave Block List,Leave Block List Name,रजा ब्लॉक यादी नाव
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,शेअर मालमत्ता
@@ -3760,11 +3812,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 +301,Salary Slip of employee {0} already created for time sheet {1},{0} वेळ पत्रक आधीपासूनच तयार कर्मचा पगाराच्या स्लिप्स {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +313,Salary Slip of employee {0} already created for time sheet {1},{0} वेळ पत्रक आधीपासूनच तयार कर्मचा पगाराच्या स्लिप्स {1}
 DocType: Sales Order Item,Ordered Qty,आदेश दिलेली  Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +673,Item {0} is disabled,आयटम {0} अक्षम आहे
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} is disabled,आयटम {0} अक्षम आहे
 DocType: Stock Settings,Stock Frozen Upto,शेअर फ्रोजन पर्यंत
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +838,BOM does not contain any stock item,BOM कोणत्याही शेअर आयटम असणे नाही
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +809,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,पगार Slips तयार  करा
@@ -3772,23 +3824,24 @@
 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 रक्कम (कंपनी चलन)
-apps/erpnext/erpnext/stock/doctype/item/item.py +485,Row #{0}: Please set reorder quantity,रो # {0}: पुनर्क्रमित प्रमाणात सेट करा
+DocType: Sales Invoice Timesheet,Billing Hours,बिलिंग तास
+apps/erpnext/erpnext/stock/doctype/item/item.py +487,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 +62,Please set {0},{0} सेट करा
 DocType: Purchase Invoice,Repeat on Day of Month,महिन्याच्या  दिवशी पुन्हा करा
 DocType: Employee,Health Details,आरोग्य तपशील
 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,उपरोक्त  निकषा साठी  निवडलेल्या  सर्व पगार स्लिप सादर करा
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} आयटम समक्रमित
 DocType: Sales Order,Partly Delivered,अंशतः वितरण आकारले
-DocType: Sales Invoice,Existing Customer,विद्यमान ग्राहक
 DocType: Email Digest,Receivables,Receivables
+DocType: Lead Source,Lead Source,आघाडी स्रोत
 DocType: Customer,Additional information regarding the customer.,ग्राहक संबंधित अतिरिक्त माहिती.
 DocType: Quality Inspection Reading,Reading 5,5 वाचन
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +38,Campaign Name is required,मोहीम नाव आवश्यक आहे
 DocType: Maintenance Visit,Maintenance Date,देखभाल तारीख
 DocType: Purchase Invoice Item,Rejected Serial No,नाकारल्याचे सिरियल क्रमांक
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +80,Year start date or end date is overlapping with {0}. To avoid please set company,वर्ष प्रारंभ तारीख किंवा समाप्ती तारीख {0} आच्छादित आहे. टाळण्यासाठी कृपया कंपनी
@@ -3796,10 +3849,9 @@
 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 +129,BOM and Manufacturing Quantity are required,BOM व उत्पादन प्रमाण आवश्यक आहे
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,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,कमाल शक्ती
-DocType: Bank Reconciliation Detail,Amount,रक्कम
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM बदलले
 ,Sales Analytics,विक्री Analytics
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +113,Available {0},उपलब्ध {0}
@@ -3807,14 +3859,14 @@
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,ईमेल सेट अप
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +96,Please enter default currency in Company Master,कंपनी मास्टर मध्ये डीफॉल्ट चलन प्रविष्ट करा
 DocType: Stock Entry Detail,Stock Entry Detail,शेअर प्रवेश तपशील
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +100,Daily Reminders,दैनिक स्मरणपत्रे
+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/account/account_tree.js +23,New Account Name,नवीन खाते नाव
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,कच्चा माल प्रदान खर्च
 DocType: Selling Settings,Settings for Selling Module,विभाग विक्री साठी सेटिंग्ज
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Customer Service,ग्राहक सेवा
+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/config/hr.py +50,Offer candidate a Job.,ऑफर उमेदवार जॉब.
@@ -3823,8 +3875,9 @@
 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} एक स्टॉक आयटम असणे आवश्यक आहे
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,प्रगती वखार मध्ये डीफॉल्ट कार्य
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1570,Total nos of serial no is not equal to quantity.,सिरियल नाही एकूण संख्या प्रमाणात समान नाही.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1594,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,अद्यतन मालिका क्रमांक
@@ -3832,9 +3885,10 @@
 DocType: Sales Order,Printing Details,मुद्रण तपशील
 DocType: Task,Closing Date,अखेरची दिनांक
 DocType: Sales Order Item,Produced Quantity,निर्मिती प्रमाण
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Engineer,अभियंता
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Engineer,अभियंता
+DocType: Journal Entry,Total Amount Currency,एकूण रक्कम चलन
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,शोध उप विधानसभा
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Item Code required at Row No {0},आयटम कोड रो क्रमांक   {0} साठी आवश्यक आहे
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +398,Item Code required at Row No {0},आयटम कोड रो क्रमांक   {0} साठी आवश्यक आहे
 DocType: Sales Partner,Partner Type,भागीदार प्रकार
 DocType: Purchase Taxes and Charges,Actual,वास्तविक
 DocType: Authorization Rule,Customerwise Discount,Customerwise सवलत
@@ -3850,16 +3904,18 @@
 DocType: BOM,Raw Material Cost,कच्चा माल खर्च
 DocType: Item Reorder,Re-Order Level,पुन्हा-क्रम स्तर
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,आपण उत्पादन आदेश वाढवण्याची किंवा विश्लेषण कच्चा माल डाउनलोड करू इच्छित असलेल्या आयटम आणि नियोजित प्रमाण प्रविष्ट करा.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +55,Part-time,भाग-वेळ
+apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,Gantt चार्ट
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,भाग-वेळ
 DocType: Employee,Applicable Holiday List,लागू सुट्टी यादी
 DocType: Employee,Cheque,धनादेश
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,मालिका अद्यतनित
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +57,Series Updated,मालिका अद्यतनित
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,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 +87,Clearance Date updated,सुधारित मंजुरी दिनांक
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,यशस्वीरित्या समेट
@@ -3873,7 +3929,7 @@
 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 +513,Posting date and posting time is mandatory,पोस्ट करण्याची तारीख आणि  पोस्ट करण्याची वेळ आवश्यक आहे
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,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.,तुम्ही पर्चेस एकदा जतन  केल्यावर शब्दा मध्ये दृश्यमान होईल.
@@ -3883,7 +3939,7 @@
 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/stock/doctype/stock_entry/stock_entry.py +158,Target warehouse in row {0} must be same as Production Order,सलग {0} मधील  लक्ष्य कोठार उत्पादन आदेश सारखाच असणे आवश्यक आहे
+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,काही इतर चलन वापरून नोंदी बनवून नंतर चलन बदलले जाऊ शकत नाही
 DocType: Company,Round Off Account,खाते बंद फेरीत
@@ -3892,23 +3948,22 @@
 DocType: Customer Group,Parent Customer Group,पालक ग्राहक गट
 DocType: Purchase Invoice,Contact Email,संपर्क ईमेल
 DocType: Appraisal Goal,Score Earned,स्कोअर कमाई
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Notice Period,सूचना कालावधी
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,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 +4,New Sales Person Name,नवीन विक्री व्यक्ती नाव
 DocType: Packing Slip,Gross Weight UOM,एकूण वजन UOM
-DocType: Email Digest,Receivables / Payables,Receivables / देय
 DocType: Delivery Note Item,Against Sales Invoice,विक्री चलन विरुद्ध
 DocType: Bin,Reserved Qty for Production,उत्पादन प्रमाण राखीव
 DocType: Asset,Frequency of Depreciation (Months),घसारा वारंवारता (महिने)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +469,Credit Account,क्रेडिट खाते
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Credit Account,क्रेडिट खाते
 DocType: Landed Cost Item,Landed Cost Item,स्थावर खर्च आयटम
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +55,Show zero values,शून्य मूल्ये दर्शवा
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,शून्य मूल्ये दर्शवा
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,आयटम प्रमाण कच्चा माल दिलेल्या प्रमाणात repacking / उत्पादन नंतर प्राप्त
 apps/erpnext/erpnext/public/js/setup_wizard.js +315,Setup a simple website for my organization,सेटअप माझ्या संस्थेसाठी एक साधी वेबसाइट
 DocType: Payment Reconciliation,Receivable / Payable Account,प्राप्त / देय खाते
 DocType: Delivery Note Item,Against Sales Order Item,विक्री ऑर्डर आयटम विरुद्ध
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Please specify Attribute Value for attribute {0},कृपया विशेषता{0} साठी  विशेषतेसाठी मूल्य निर्दिष्ट करा
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},कृपया विशेषता{0} साठी  विशेषतेसाठी मूल्य निर्दिष्ट करा
 DocType: Item,Default Warehouse,मुलभूत कोठार
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +39,Budget cannot be assigned against Group Account {0},अर्थसंकल्प गट खाते विरुद्ध नियुक्त केला जाऊ शकत नाही {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,पालक खर्च केंद्र प्रविष्ट करा
@@ -3930,19 +3985,22 @@
 DocType: Journal Entry,Total Debit,एकूण डेबिट
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,मुलभूत पूर्ण वस्तू वखार
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,विक्री व्यक्ती
-DocType: Sales Invoice,Cold Calling,थंड कॉलिंग
 DocType: SMS Parameter,SMS Parameter,एसएमएस मापदंड
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,बजेट आणि खर्च केंद्र
 DocType: Maintenance Schedule Item,Half Yearly,सहामाही
 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 +253,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 +141,Set as Lost,हरवले म्हणून सेट करा
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,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 +5,This is based on transactions against this Customer. See timeline below for details,हे या ग्राहक विरुद्ध व्यवहार आधारित आहे. तपशीलासाठी खालील टाइमलाइन पाहू
 DocType: Supplier,Credit Days Based On,क्रेडिट दिवस आधारित
@@ -3954,11 +4012,10 @@
 ,Items To Be Requested,आयटम विनंती करण्यासाठी
 DocType: Purchase Order,Get Last Purchase Rate,गेल्या खरेदी दर मिळवा
 DocType: Company,Company Info,कंपनी माहिती
-apps/erpnext/erpnext/accounts/page/pos/pos.js +941,Select or add new customer,निवडा किंवा नवीन ग्राहक जोडणे
+apps/erpnext/erpnext/accounts/page/pos/pos.js +930,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),निधी मालमत्ता (assets) अर्ज
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +5,This is based on the attendance of this Employee,हे या कर्मचा उपस्थिती आधारित आहे
-DocType: Sales Invoice,Frequency,वारंवारता
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +463,Debit Account,डेबिट खाते
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Debit Account,डेबिट खाते
 DocType: Fiscal Year,Year Start Date,वर्ष प्रारंभ तारीख
 DocType: Attendance,Employee Name,कर्मचारी नाव
 DocType: Sales Invoice,Rounded Total (Company Currency),गोळाबेरीज एकूण (कंपनी चलन)
@@ -3967,27 +4024,27 @@
 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 +210,Supplier Quotation {0} created,पुरवठादार अवतरण {0} तयार
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +208,Supplier Quotation {0} created,पुरवठादार अवतरण {0} तयार
 apps/erpnext/erpnext/accounts/report/financial_statements.py +90,End Year cannot be before Start Year,समाप्त वर्ष प्रारंभ वर्ष असू शकत नाही
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Employee Benefits,कर्मचारी फायदे
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,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 +228,Please set a default Holiday List for Employee {0} or Company {1},एक मुलभूत कर्मचारी सुट्टी यादी सेट करा {0} किंवा कंपनी {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +232,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 +499,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},रो नाही {0}: रक्कम खर्च दावा {1} विरुद्ध रक्कम प्रलंबित पेक्षा जास्त असू शकत नाही. प्रलंबित रक्कम  {2} आहे
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +500,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},रो नाही {0}: रक्कम खर्च दावा {1} विरुद्ध रक्कम प्रलंबित पेक्षा जास्त असू शकत नाही. प्रलंबित रक्कम  {2} आहे
 DocType: Maintenance Schedule,Schedule,वेळापत्रक
 DocType: Account,Parent Account,पालक खाते
 DocType: Quality Inspection Reading,Reading 3,3 वाचन
 ,Hub,हब
 DocType: GL Entry,Voucher Type,प्रमाणक प्रकार
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1007,Price List not found or disabled,किंमत सूची आढळली किंवा अकार्यान्वीत केलेली  नाही
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1008,Price List not found or disabled,किंमत सूची आढळली किंवा अकार्यान्वीत केलेली  नाही
 DocType: Expense Claim,Approved,मंजूर
 DocType: Pricing Rule,Price,किंमत
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +244,Employee relieved on {0} must be set as 'Left',{0} वर मुक्त केलेले कर्मचारी 'Left' म्हणून set करणे आवश्यक आहे
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +256,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} दिलेल्या तारखेपासून श्रेणीत कर्मचारी तयार
@@ -3998,12 +4055,12 @@
 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 +259,Please select Employee Record first.,कृपया  पहिले कर्मचारी नोंद निवडा.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +266,Please select Employee Record first.,कृपया  पहिले कर्मचारी नोंद निवडा.
 DocType: POS Profile,Account for Change Amount,खाते रक्कम बदल
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +190,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},रो {0}: {3} {4} मधील  {1} / {2} पक्ष / खात्याशी जुळत नाही
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +235,Please enter Expense Account,खर्चाचे खाते प्रविष्ट करा
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,Please enter Expense Account,खर्चाचे खाते प्रविष्ट करा
 DocType: Account,Stock,शेअर
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,"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 +976,"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,खरेदी / उत्पादन तपशील
@@ -4018,9 +4075,10 @@
 DocType: Asset Movement,Transaction Date,व्यवहार तारीख
 DocType: Production Plan Item,Planned Qty,नियोजनबद्ध Qty
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,एकूण कर
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,For Quantity (Manufactured Qty) is mandatory,प्रमाण साठी (Qty उत्पादित) करणे आवश्यक आहे
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,For Quantity (Manufactured Qty) is mandatory,प्रमाण साठी (Qty उत्पादित) करणे आवश्यक आहे
 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 +78,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,वास्तविक प्रारंभ तारीख
@@ -4035,9 +4093,11 @@
 DocType: Warranty Claim,If different than customer address,ग्राहक पत्ता पेक्षा भिन्न असेल तर
 DocType: BOM Operation,BOM Operation,BOM ऑपरेशन
 DocType: Purchase Taxes and Charges,On Previous Row Amount,मागील पंक्ती रकमेवर
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +226,Transfer Asset,हस्तांतरण मालमत्ता
+DocType: Student,Home Address,घरचा पत्ता
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +227,Transfer Asset,हस्तांतरण मालमत्ता
 DocType: POS Profile,POS Profile,पीओएस प्रोफाइल
 apps/erpnext/erpnext/config/schools.py +33,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 +129,"Item {0} is a template, please select one of its variants","आयटम {0} एक टेम्प्लेट आहे, कृपया त्याची एखादी  रूपे  निवडा"
 DocType: Asset,Asset Category,मालमत्ता वर्ग
@@ -4047,8 +4107,8 @@
 DocType: Assessment,Room,खोली
 DocType: Purchase Order,Advance Paid,आगाऊ अदा
 DocType: Item,Item Tax,आयटम कर
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +765,Material to Supplier,पुरवठादार साहित्य
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +189,Excise Invoice,उत्पादन शुल्क चलन
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,Material to Supplier,पुरवठादार साहित्य
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,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,वर्तमान दायित्व
@@ -4058,7 +4118,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,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 +136,Credit Card,क्रेडिट कार्ड
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,क्रेडिट कार्ड
 DocType: BOM,Item to be manufactured or repacked,आयटम उत्पादित किंवा repacked करणे
 apps/erpnext/erpnext/config/stock.py +174,Default settings for stock transactions.,स्टॉक व्यवहारासाठी  मुलभूत सेटिंग्ज.
 DocType: Purchase Invoice,Next Date,पुढील तारीख
@@ -4066,6 +4126,7 @@
 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: Academic Term,Term End Date,मुदत समाप्ती तारीख
 DocType: Hub Settings,Seller Name,विक्रेता नाव
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),कर आणि शुल्क वजा (कंपनी चलन)
 DocType: Item Group,General Settings,सामान्य सेटिंग्ज
@@ -4077,7 +4138,7 @@
 DocType: Customer,Commission Rate,आयोगाने दर
 apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,व्हेरियंट करा
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,विभागाने ब्लॉक रजा अनुप्रयोग.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +115,"Payment Type must be one of Receive, Pay and Internal Transfer",भरणा प्रकार मिळतील एक द्या आणि अंतर्गत ट्रान्सफर करणे आवश्यक आहे
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +118,"Payment Type must be one of Receive, Pay and Internal Transfer",भरणा प्रकार मिळतील एक द्या आणि अंतर्गत ट्रान्सफर करणे आवश्यक आहे
 apps/erpnext/erpnext/config/selling.py +169,Analytics,विश्लेषण
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,कार्ट रिक्त आहे
 DocType: Production Order,Actual Operating Cost,वास्तविक ऑपरेटिंग खर्च
@@ -4092,10 +4153,10 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,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 +92,Designer,डिझायनर
+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/accounts/doctype/purchase_invoice/purchase_invoice.py +469,Cost Center is required in row {0} in Taxes table for type {1},खर्च केंद्र सलग {0} त  कर टेबल मधे प्रकार  {1}  आवश्यक आहे
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +472,Cost Center is required in row {0} in Taxes table for type {1},खर्च केंद्र सलग {0} त  कर टेबल मधे प्रकार  {1}  आवश्यक आहे
 DocType: Program,Program Code,कार्यक्रम कोड
 ,Item-wise Purchase Register,आयटमनूसार खरेदी नोंदणी
 DocType: Batch,Expiry Date,कालावधी समाप्ती तारीख
@@ -4105,12 +4166,12 @@
 apps/erpnext/erpnext/config/projects.py +13,Project master.,प्रकल्प मास्टर.
 apps/erpnext/erpnext/controllers/status_updater.py +174,"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 +417, (Half Day),(अर्धा दिवस)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425, (Half Day),(अर्धा दिवस)
 DocType: Supplier,Credit Days,क्रेडिट दिवस
 DocType: Leave Type,Is Carry Forward,कॅरी फॉरवर्ड आहे
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +740,Get Items from BOM,BOM चे आयटम मिळवा
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +711,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 +549,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},सलग # {0}: पोस्ट दिनांक खरेदी तारीख एकच असणे आवश्यक आहे {1} मालमत्ता {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +552,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,एकमेकांना कोठार एक मालमत्ता हस्तांतरण
diff --git a/erpnext/translations/ms.csv b/erpnext/translations/ms.csv
index e91b670..cff17c9 100644
--- a/erpnext/translations/ms.csv
+++ b/erpnext/translations/ms.csv
@@ -18,11 +18,10 @@
 DocType: Sales Partner,Dealer,Peniaga
 DocType: Employee,Rented,Disewa
 DocType: Purchase Order,PO-,po-
-apps/erpnext/erpnext/accounts/report/financial_statements.py +19,Start Year {0} not found.,Mula Tahun {0} tidak dijumpai.
 DocType: POS Profile,Applicable for User,Digunakan untuk Pengguna
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +191,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Perintah Pengeluaran berhenti tidak boleh dibatalkan, Unstop terlebih dahulu untuk membatalkan"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +197,Do you really want to scrap this asset?,Adakah anda benar-benar mahu menghapuskan aset ini?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +17,Select Default Supplier,Pilih Pembekal Lalai
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +192,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Perintah Pengeluaran berhenti tidak boleh dibatalkan, Unstop terlebih dahulu untuk membatalkan"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +198,Do you really want to scrap this asset?,Adakah anda benar-benar mahu menghapuskan aset ini?
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Pilih Pembekal Lalai
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Mata wang diperlukan untuk Senarai Harga {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Akan dikira dalam urus niaga.
 DocType: Address,County,Daerah
@@ -42,46 +41,45 @@
 DocType: Sales Invoice,Customer Name,Nama Pelanggan
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +126,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 +180,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 +183,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 +148,Series Updated Successfully,Siri Dikemaskini Berjaya
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +149,Series Updated Successfully,Siri Dikemaskini Berjaya
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Checkout
 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
-DocType: Quality Inspection Reading,Parameter,Parameter
 apps/erpnext/erpnext/projects/doctype/project/project.py +54,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 +239,New Leave Application,Cuti Permohonan Baru
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,New Leave Application,Cuti Permohonan Baru
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +20,Attendance Record {0} exists against Student {1} for Course Schedule {2},Kehadiran Rekod {0} wujud terhadap Pelajar {1} untuk Jadual Kursus {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Bank Draft,Bank Draf
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,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
 DocType: Academic Term,Academic Term,Jangka akademik
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +13,Material,bahan
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Quantity,Kuantiti
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +511,Accounts table cannot be blank.,Jadual account tidak boleh kosong.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +616,Quantity,Kuantiti
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +512,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)
 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/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 +142,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
-DocType: Purchase Invoice,Monthly,Bulanan
 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/buying/doctype/purchase_order/purchase_order.js +771,Invoice,Invois
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +750,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 +198,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} tidak sepadan dengan {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Row # {0}:
+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 +127,Please select Price List,Sila pilih Senarai Harga
@@ -112,8 +110,8 @@
 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 +589,Get items from,Mendapatkan barangan dari
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +382,Stock cannot be updated against Delivery Note {0},Saham tidak boleh dikemaskini terhadap Penghantaran Nota {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Mendapatkan barangan dari
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,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
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Barang runcit
@@ -122,7 +120,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Dana pencen
 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 +156,Salary Structure Missing,Struktur Gaji Hilang
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,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
@@ -130,10 +128,11 @@
 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 +156,Credit limit has been crossed for customer {0} {1}/{2},Had kredit telah menyeberang untuk pelanggan {0} {1} / {2}
-apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Adakah Aset Tetap&quot; tidak boleh dibiarkan, kerana rekod aset wujud terhadap item"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +189,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"
 DocType: Tax Rule,Tax Type,Jenis Cukai
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +144,You are not authorized to add or update entries before {0},Anda tidak dibenarkan untuk menambah atau update entri sebelum {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,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/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
@@ -143,18 +142,17 @@
 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 +165,Opening,Pembukaan
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,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/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Pelanggan&gt; Kumpulan Pelanggan&gt; Wilayah
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Akaun Pay Hanya
 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.
 DocType: Lead,Product Enquiry,Pertanyaan Produk
 DocType: Academic Term,Schools,sekolah
 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 +335,Please select Company first,Sila pilih Syarikat pertama
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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
@@ -164,7 +162,7 @@
 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
 DocType: Purchase Invoice Item,Is Fixed Asset,Adakah Aset Tetap
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Available qty is {0}, you need {1}","qty yang tersedia {0}, anda perlu {1}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +225,"Available qty is {0}, you need {1}","qty yang tersedia {0}, anda perlu {1}"
 DocType: Expense Claim Detail,Claim Amount,Tuntutan Amaun
 DocType: Employee,Mr,Mr
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Jenis pembekal / Pembekal
@@ -173,25 +171,26 @@
 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: Assessment Result,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 +171,Annual Salary,Gaji Tahunan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Annual Salary,Gaji Tahunan
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Perbelanjaan saham
-apps/erpnext/erpnext/accounts/report/financial_statements.py +22,End Year {0} not found.,Akhir Tahun {0} tidak dijumpai.
 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}
 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 +130,At least one mode of payment is required for POS invoice.,Sekurang-kurangnya satu cara pembayaran adalah diperlukan untuk POS invois.
 DocType: Products Settings,Show Products as a List,Show Produk sebagai Senarai yang
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Muat Template, isikan data yang sesuai dan melampirkan fail yang diubah suai. Semua tarikh dan pekerja gabungan dalam tempoh yang dipilih akan datang dalam template, dengan rekod kehadiran yang sedia ada"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +451,Item {0} is not active or end of life has been reached,Perkara {0} tidak aktif atau akhir hayat telah dicapai
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +456,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/controllers/accounts_controller.py +614,"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/controllers/accounts_controller.py +617,"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 +166,Settings for HR Module,Tetapan untuk HR Modul
 DocType: SMS Center,SMS Center,SMS Center
 DocType: Sales Invoice,Change Amount,Tukar Jumlah
@@ -203,13 +202,13 @@
 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 +147,Execution,Pelaksanaan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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/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}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,Cost Center {0} does not belong to Company {1},Kos Pusat {0} bukan milik Syarikat {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +100,Cost Center {0} does not belong to Company {1},Kos Pusat {0} bukan milik Syarikat {1}
 DocType: Customer,Individual,Individu
 DocType: Interest,Academics User,akademik Pengguna
 DocType: Cheque Print Template,Amount In Figure,Jumlah Dalam Rajah
@@ -225,30 +224,32 @@
 DocType: Production Planning Tool,Sales Orders,Jualan Pesanan
 DocType: Purchase Taxes and Charges,Valuation,Penilaian
 ,Purchase Order Trends,Membeli Trend Pesanan
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,The request for quotation can be accessed by clicking on the following link,Permintaan untuk sebutharga boleh diakses dengan klik pada pautan berikut
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,Memperuntukkan daun bagi tahun ini.
 DocType: SG Creation Tool Course,SG Creation Tool Course,Kursus Alat SG Creation
 DocType: Student Group Creation Tool,Leave blank if you wish to fetch all courses for selected academic term,Biarkan kosong jika anda ingin mengambil semua kursus untuk penggal akademik dipilih
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,Insufficient Stock,Saham yang tidak mencukupi
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227,Insufficient Stock,Saham yang tidak mencukupi
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Perancangan Kapasiti melumpuhkan dan Penjejakan Masa
+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: 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/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} does not belong to Company {1},Akaun {0} bukan milik Syarikat {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +86,Account {0} does not belong to Company {1},Akaun {0} bukan milik Syarikat {1}
 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}
 DocType: Naming Series,Series List for this Transaction,Senarai Siri bagi Urusniaga ini
 DocType: Sales Invoice,Is Opening Entry,Apakah Membuka Entry
 DocType: Customer Group,Mention if non-standard receivable account applicable,Sebut jika akaun belum terima tidak standard yang diguna pakai
 DocType: Course Schedule,Instructor Name,pengajar Nama
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,For Warehouse is required before Submit,Untuk Gudang diperlukan sebelum Hantar
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,For Warehouse is required before Submit,Untuk Gudang diperlukan sebelum Hantar
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Diterima Dalam
 DocType: Sales Partner,Reseller,Penjual Semula
 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 +1436,"LocalStorage is full , did not save","LocalStorage penuh, tidak menyelamatkan"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1460,"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}
@@ -261,18 +262,19 @@
 apps/erpnext/erpnext/templates/generators/item.html +78,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 +5,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/leave_application/leave_application.py +206,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/leave_application/leave_application.py +213,Only the selected Leave Approver can submit this Leave Application,Hanya Pelulus Cuti yang dipilih boleh mengemukakan Permohonan Cuti ini
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Tarikh melegakan mesti lebih besar daripada Tarikh Menyertai
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Leaves per Year,Meninggalkan setiap Tahun
+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 +103,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}
+DocType: Email Digest,Profit & Loss,Untung rugi
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,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 +435,Leave Blocked,Tinggalkan Disekat
-apps/erpnext/erpnext/stock/doctype/item/item.py +669,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 +443,Leave Blocked,Tinggalkan Disekat
+apps/erpnext/erpnext/stock/doctype/item/item.py +671,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 +83,Annual,Tahunan
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +86,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
@@ -280,20 +282,22 @@
 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
 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 +91,Software Developer,Perisian Pemaju
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,Perisian Pemaju
 DocType: Item,Minimum Order Qty,Minimum Kuantiti Pesanan
 DocType: Pricing Rule,Supplier Type,Jenis Pembekal
 DocType: Scheduling Tool,Course Start Date,Kursus Tarikh Mula
 DocType: Item,Publish in Hub,Menyiarkan dalam Hab
+DocType: Student Admission,Student Admission,Kemasukan pelajar
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is cancelled,Perkara {0} dibatalkan
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Material Request,Permintaan bahan
+apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} is cancelled,Perkara {0} dibatalkan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +823,Material Request,Permintaan bahan
 DocType: Bank Reconciliation,Update Clearance Date,Update Clearance Tarikh
 apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +28,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 +328,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Perkara {0} tidak dijumpai dalam &#39;Bahan Mentah Dibekalkan&#39; meja dalam Pesanan Belian {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +333,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/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
@@ -309,20 +313,21 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +130,Please select Charge Type first,Sila pilih Jenis Caj pertama
 DocType: Student Group Student,Student Group Student,Pelajar Kumpulan Pelajar
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Terkini
+DocType: Email Digest,New Quotations,Sebut Harga baru
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Yang pertama Pelulus Cuti dalam senarai akan ditetapkan sebagai lalai Cuti Pelulus yang
 DocType: Tax Rule,Shipping County,Penghantaran County
 apps/erpnext/erpnext/config/desktop.py +158,Learn,Belajar
 DocType: Asset,Next Depreciation Date,Selepas Tarikh Susutnilai
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Kos aktiviti setiap Pekerja
 DocType: Accounts Settings,Settings for Accounts,Tetapan untuk Akaun
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +626,Supplier Invoice No exists in Purchase Invoice {0},Pembekal Invois No wujud dalam Invois Belian {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +629,Supplier Invoice No exists in Purchase Invoice {0},Pembekal Invois No wujud dalam Invois Belian {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Menguruskan Orang Jualan Tree.
 DocType: Job Applicant,Cover Letter,Cover Letter
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Cek cemerlang dan Deposit untuk membersihkan
 DocType: Item,Synced With Hub,Segerakkan Dengan Hub
 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 +348,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 +86,Circular Reference Error,Ralat Rujukan Pekeliling
@@ -334,15 +339,16 @@
 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 +806,Delivery Note,Penghantaran Nota
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +800,Delivery Note,Penghantaran Nota
 apps/erpnext/erpnext/config/learn.py +87,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 +233,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/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/setup/doctype/email_digest/email_digest.py +104,Summary for this week and pending activities,Ringkasan untuk minggu ini dan aktiviti-aktiviti yang belum selesai
+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"
 DocType: Employee,Company Email,Syarikat E-mel
@@ -354,27 +360,28 @@
 apps/erpnext/erpnext/config/hr.py +186,"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
-apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Invois Belian tidak boleh dibuat terhadap aset yang sedia ada {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +554,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 +54,{0} already allocated for Employee {1} for period {2} to {3},{0} telah diperuntukkan untuk pekerja {1} untuk tempoh {2} kepada {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +812,Select Item,Pilih Item
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +791,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 \
 					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 +142,Purchase Invoice {0} is already submitted,Membeli Invois {0} telah dikemukakan
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch No mestilah sama dengan {1} {2}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +143,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.
 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 +342,Please see attachment,Sila lihat lampiran
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,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 +19,Setup Already Complete!!,Persediaan Sudah Lengkap !!
 ,Finished Goods,Barangan selesai
 DocType: Delivery Note,Instructions,Arahan
 DocType: Quality Inspection,Inspected By,Diperiksa oleh
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Pembekal&gt; Jenis pembekal
 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/public/js/utils/item_selector.js +12,Add Items,Tambah Item
@@ -388,29 +395,29 @@
 DocType: Currency Exchange,Currency Exchange,Pertukaran mata wang
 DocType: Purchase Invoice Item,Item Name,Nama Item
 DocType: Authorization Rule,Approving User  (above authorized value),Meluluskan pengguna (di atas nilai yang diberi kuasa)
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Baki kredit
+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/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 +736,Purchase Return,Pembelian Pulangan
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +715,Purchase Return,Pembelian Pulangan
 ,Purchase Register,Pembelian Daftar
 DocType: 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 +202,{0} ({1}) must have role 'Leave Approver',{0} ({1}) mesti mempunyai peranan 'Pelulus Cuti'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,{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 +143,Reason for losing,Sebab bagi kehilangan
-apps/erpnext/erpnext/accounts/utils.py +239,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 +163,Reason for losing,Sebab bagi kehilangan
+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
 DocType: Announcement,Receiver,penerima
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation ditutup pada tarikh-tarikh berikut seperti Senarai Holiday: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Peluang
 DocType: Employee,Single,Single
 DocType: Account,Cost of Goods Sold,Kos Barang Dijual
 DocType: Purchase Invoice,Yearly,Setiap tahun
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +225,Please enter Cost Center,Sila masukkan PTJ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,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
@@ -423,26 +430,26 @@
 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
 DocType: Account,Is Group,Adakah Kumpulan
+DocType: Email Digest,Pending Purchase Orders,Sementara menunggu Pesanan Pembelian
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Set Siri Nos secara automatik berdasarkan FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Semak Pembekal Invois Nombor Keunikan
 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 +102,Non Profit,Keuntungan tidak
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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: Stock Reconciliation Item,Do not include symbols (ex. $),Jangan masukkan simbol (ex. $)
 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 +638,Attribute {0} selected multiple times in Attributes Table,Sifat {0} dipilih beberapa kali dalam Atribut Jadual
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Sifat {0} dipilih beberapa kali dalam Atribut Jadual
 DocType: HR Settings,Employee record is created using selected field. ,Rekod pekerja dicipta menggunakan bidang dipilih.
 DocType: Sales Order,Not Applicable,Tidak Berkenaan
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Master bercuti.
 DocType: Request for Quotation Item,Required Date,Tarikh Diperlukan
 DocType: Delivery Note,Billing Address,Alamat Bil
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +862,Please enter Item Code.,Sila masukkan Kod Item.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +847,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"
@@ -456,12 +463,12 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Sekuriti dan Deposit
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Jumlah daun diperuntukkan adalah wajib
 DocType: Job Opening,Description of a Job Opening,Keterangan yang Lowongan
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Pending activities for today,Sementara menunggu aktiviti untuk hari ini
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Sementara menunggu aktiviti untuk hari ini
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Rekod kehadiran.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Komponen gaji untuk gaji berdasarkan timesheet.
 DocType: Sales Order Item,Used for Production Plan,Digunakan untuk Rancangan Pengeluaran
 DocType: Manufacturing Settings,Time Between Operations (in mins),Masa Antara Operasi (dalam minit)
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +92,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} Bajet akaun {1} terhadap PTJ {2} adalah {3}. Ia akan melebihi oleh {4}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +95,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} Bajet akaun {1} terhadap PTJ {2} adalah {3}. Ia akan melebihi oleh {4}
 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
@@ -469,16 +476,16 @@
 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/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 +86,Administrative Officer,Pegawai Tadbir
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,Pegawai Tadbir
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +23,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 +319,Please select Company,Sila pilih Syarikat
-DocType: Stock Entry,Difference Account,Akaun perbezaan
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +309,Please select Company,Sila pilih Syarikat
+DocType: Stock Entry Detail,Difference Account,Akaun perbezaan
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,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 +398,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 +399,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 +530,"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 +532,"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 +28,Buy,Beli
@@ -486,7 +493,7 @@
 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 +1563,Serial no item cannot be a fraction,Serial tiada perkara tidak boleh menjadi sebahagian kecil
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1587,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
@@ -495,13 +502,14 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Account {0} does not belong to company: {1},Akaun {0} bukan milik syarikat: {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation already used for another company,Singkatan sudah digunakan untuk syarikat lain
 DocType: Selling Settings,Default Customer Group,Default Pelanggan Kumpulan
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Supplier is required against Payable account {0},Pembekal diperlukan terhadap akaun Dibayar {0}
 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
 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 +313,Reference No and Reference Date is mandatory for Bank transaction,Rujukan dan Tarikh Rujukan adalah wajib untuk transaksi Bank
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +316,Reference No and Reference Date is mandatory for Bank transaction,Rujukan dan Tarikh Rujukan adalah wajib untuk transaksi Bank
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Tambah / Edit Cukai dan Caj
 DocType: Purchase Invoice,Supplier Invoice No,Pembekal Invois No
 DocType: Territory,For reference,Untuk rujukan
@@ -512,7 +520,6 @@
 DocType: Installation Note Item,Installation Note Item,Pemasangan Nota Perkara
 DocType: Production Plan Item,Pending Qty,Menunggu Kuantiti
 DocType: Budget,Ignore,Abaikan
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Kod Item&gt; Item Group&gt; Jenama
 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/config/accounts.py +241,Setup cheque dimensions for printing,dimensi Persediaan cek percetakan
 DocType: Salary Slip,Salary Slip Timesheet,Slip Gaji Timesheet
@@ -523,11 +530,11 @@
 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/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 +28,Please select Company and Party Type first,Sila pilih Syarikat dan Parti Jenis pertama
+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/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 +707,Make Sales Order,Buat Jualan Pesanan
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +701,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
@@ -543,7 +550,8 @@
 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 +734,Sales Return,Jualan Pulangan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +728,Sales Return,Jualan Pulangan
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +91,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)
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Pangkalan data pelanggan yang berpotensi.
@@ -552,14 +560,13 @@
 DocType: Quotation,Quotation To,Sebutharga Untuk
 DocType: Lead,Middle Income,Pendapatan Tengah
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +212,Opening (Cr),Pembukaan (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +795,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,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 +237,Allocated amount can not be negative,Jumlah yang diperuntukkan tidak boleh negatif
+apps/erpnext/erpnext/stock/doctype/item/item.py +797,Default Unit of Measure for Item {0} cannot be changed directly because 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
 DocType: Purchase Order Item,Billed Amt,Billed AMT
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Satu Gudang maya di mana kemasukkan stok dibuat.
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Invois Jualan Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},Rujukan &amp; Tarikh Rujukan diperlukan untuk {0}
-DocType: Sales Invoice,Customer's Vendor,Penjual Pelanggan
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Proposal Writing,Penulisan Cadangan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,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"
@@ -568,13 +575,14 @@
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,Tracking masa
 DocType: Fiscal Year Company,Fiscal Year Company,Tahun Anggaran Syarikat
 DocType: Packing Slip Item,DN Detail,Detail DN
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +257,Already supplier quotation has created,Sudah pembekal sebut harga telah mencipta
 DocType: Timesheet,Billed,Dibilkan
 DocType: Batch,Batch Description,Batch Penerangan
+apps/erpnext/erpnext/accounts/utils.py +685,"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 +733,View Offline Records,Lihat Offline Records
+apps/erpnext/erpnext/accounts/page/pos/pos.js +715,View Offline Records,Lihat Offline Records
+DocType: Student,Sibling Details,Maklumat adik-beradik
 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: Payment Reconciliation,Invoice/Journal Entry Details,Invois / Journal Entry Details
@@ -588,7 +596,7 @@
 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
 DocType: Employee,Passport Number,Nombor Pasport
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Manager,Pengurus
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,Pengurus
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,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
@@ -597,10 +605,11 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter email address,Sila masukkan alamat e-mel
 DocType: Production Order Operation,In minutes,Dalam beberapa minit
 DocType: Issue,Resolution Date,Resolusi Tarikh
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +299,Timesheet created:,Timesheet dicipta:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +715,Please set default Cash or Bank account in Mode of Payment {0},Sila tetapkan lalai Tunai atau akaun Bank dalam Mod Bayaran {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +300,Timesheet created:,Timesheet dicipta:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +772,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
 DocType: Selling Settings,Customer Naming By,Menamakan Dengan Pelanggan
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Sila setup pekerja Penamaan Sistem dalam Sumber Manusia&gt; Tetapan HR
 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
@@ -625,6 +634,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,Selesai
 DocType: Pricing Rule,Sales Manager,Pengurus Jualan
 DocType: Salary Structure Employee,Base,base
+DocType: Timesheet,Total Billed Hours,Jumlah Jam Diiktiraf
 DocType: Journal Entry,Write Off Amount,Tulis Off Jumlah
 DocType: Journal Entry,Bill No,Rang Undang-Undang No
 DocType: Company,Gain/Loss Account on Asset Disposal,Akaun Keuntungan / Kerugian daripada Pelupusan Aset
@@ -639,11 +649,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +9,Pre Sales,Jualan pra
 DocType: Purchase Receipt,Other Details,Butiran lain
 DocType: Account,Accounts,Akaun-akaun
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Marketing,Pemasaran
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +227,Payment Entry is already created,Kemasukan bayaran telah membuat
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,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 +538,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 +21,Preview Salary Slip,Preview Slip Gaji
+apps/erpnext/erpnext/controllers/accounts_controller.py +541,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 +38,Preview Salary Slip,Preview Slip Gaji
 DocType: Company,Deafult Cost Center,PTJ Deafult
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +48,Account {0} has been entered multiple times,Akaun {0} telah dibuat beberapa kali
 DocType: Account,Expenses Included In Valuation,Perbelanjaan Termasuk Dalam Penilaian
@@ -652,7 +662,7 @@
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,Sila pilih Kumpulan 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 +617,Item has variants.,Perkara mempunyai varian.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Perkara mempunyai varian.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,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
@@ -672,7 +682,7 @@
 DocType: Purchase Order,Supply Raw Materials,Bekalan Bahan Mentah
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,Tarikh di mana invois akan dijana. Ia dihasilkan di hantar.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Aset Semasa
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,{0} is not a stock Item,{0} bukan perkara stok
+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 +169,Lead must be set if Opportunity is made from Lead,Lead mesti ditetapkan jika Peluang diperbuat daripada Lead
@@ -739,26 +749,25 @@
 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 +709,No Permission,Tiada Kebenaran
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +710,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}
 apps/erpnext/erpnext/public/js/setup_wizard.js +298,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 +542,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} hendaklah dikemukakan
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} hendaklah dikemukakan
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Tiada pekerja didapati
 DocType: Supplier Quotation,Stopped,Berhenti
 DocType: Item,If subcontracted to a vendor,Jika subkontrak kepada vendor
 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.
 DocType: Warehouse,Tree Details,Tree Butiran
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Hantar Sekarang
 ,Support Analytics,Sokongan Analytics
 DocType: Item,Website Warehouse,Laman Web Gudang
 DocType: Payment Reconciliation,Minimum Invoice Amount,Amaun Invois Minimum
 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/sales_invoice/sales_invoice.py +227,Timesheet {0} is already completed or cancelled,Timesheet {0} sudah selesai atau dibatalkan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +259,Timesheet {0} is already completed or cancelled,Timesheet {0} sudah selesai atau dibatalkan
 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
@@ -774,13 +783,13 @@
 apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Jadual kursus
 DocType: Maintenance Visit,Completion Status,Siap Status
 DocType: HR Settings,Enter retirement age in years,Masukkan umur persaraan pada tahun-tahun
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +229,Target Warehouse,Sasaran Gudang
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +230,Target Warehouse,Sasaran Gudang
 DocType: Cheque Print Template,Starting location from left edge,Bermula lokasi dari tepi kiri
 DocType: Item,Allow over delivery or receipt upto this percent,Membolehkan lebih penghantaran atau penerimaan hamper peratus ini
 DocType: Stock Entry,STE-,STE-
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Sales Order Date,Jangkaan Tarikh Penghantaran tidak boleh sebelum Jualan Pesanan Tarikh
 DocType: Upload Attendance,Import Attendance,Import Kehadiran
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Semua Kumpulan Perkara
+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/config/setup.py +89,Automatically compose message on submission of transactions.,Mengarang mesej secara automatik pada penyerahan transaksi.
@@ -792,13 +801,15 @@
 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/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
 DocType: Expense Claim,Expenses,Perbelanjaan
 DocType: Item Variant Attribute,Item Variant Attribute,Perkara Variant Sifat
 ,Purchase Receipt Trends,Trend Resit Pembelian
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Research & Development,Penyelidikan &amp; Pembangunan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Penyelidikan &amp; Pembangunan
 ,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
@@ -807,7 +818,7 @@
 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/controllers/accounts_controller.py +340,"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."
+apps/erpnext/erpnext/controllers/accounts_controller.py +343,"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
@@ -829,12 +840,12 @@
 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 +756,Purchase Receipt,Resit Pembelian
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +735,Purchase Receipt,Resit Pembelian
 ,Received Items To Be Billed,Barangan yang diterima dikenakan caj
 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 +167,Reference Doctype must be one of {0},Rujukan DOCTYPE mesti menjadi salah satu {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +282,Unable to find Time Slot in the next {0} days for Operation {1},Tidak dapat mencari Slot Masa di akhirat {0} hari untuk Operasi {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +170,Reference Doctype must be one of {0},Rujukan DOCTYPE mesti menjadi salah satu {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,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 +439,BOM {0} must be active,BOM {0} mesti aktif
@@ -845,7 +856,7 @@
 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 +214,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 +217,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
@@ -859,9 +870,9 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Pekerja {0} tidak aktif atau tidak wujud
 DocType: Fee Structure,Components,komponen
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,Please enter Asset Category in Item {0},Sila masukkan Kategori Asset dalam Perkara {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +612,Item Variants {0} updated,Perkara Kelainan {0} dikemaskini
+apps/erpnext/erpnext/stock/doctype/item/item.py +614,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 +843,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 +854,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
@@ -876,69 +887,72 @@
 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 +728,New Sales Invoice,New Invois Jualan
+apps/erpnext/erpnext/accounts/page/pos/pos.js +710,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 +728,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
 DocType: Material Request Item,Lead Time Date,Lead Tarikh Masa
 DocType: Guardian,Guardian Name,Nama Guardian
 DocType: Cheque Print Template,Has Print Format,Mempunyai Format Cetak
-apps/erpnext/erpnext/accounts/page/pos/pos.js +86, 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 +109,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 +619,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","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/page/pos/pos.js +75, 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 +613,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing 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 +606,Supplier Invoice Date cannot be greater than Posting Date,Pembekal Invois Tarikh tidak boleh lebih besar daripada Pos Tarikh
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +609,Supplier Invoice Date cannot be greater than Posting Date,Pembekal Invois Tarikh tidak boleh lebih besar daripada Pos Tarikh
 DocType: Purchase Invoice Item,Purchase Order Item,Pesanan Pembelian Item
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +130,Indirect Income,Pendapatan tidak langsung
 DocType: Cheque Print Template,Date Settings,tarikh Tetapan
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Varian
 ,Company Name,Nama Syarikat
 DocType: SMS Center,Total Message(s),Jumlah Mesej (s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +810,Select Item for Transfer,Pilih Item Pemindahan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +789,Select Item for Transfer,Pilih Item Pemindahan
 DocType: Purchase Invoice,Additional Discount Percentage,Peratus Diskaun tambahan
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Lihat senarai semua video bantuan
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Pilih kepala akaun bank di mana cek didepositkan.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Membolehkan pengguna untuk mengedit Senarai Harga Kadar dalam urus niaga
 DocType: Pricing Rule,Max Qty,Max Qty
-DocType: Student Applicant,Father's Name,Nama ayah
 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 +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: Pembayaran terhadap Jualan / Pesanan Belian perlu sentiasa ditandakan sebagai pendahuluan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Kimia
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +686,All items have already been transferred for this Production Order.,Semua barang-barang telah dipindahkan bagi Perintah Pengeluaran ini.
+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
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +694,All items have already been transferred for this Production Order.,Semua barang-barang telah dipindahkan bagi Perintah Pengeluaran ini.
 DocType: Process Payroll,Select Payroll Year and Month,Pilih Tahun Gaji dan Bulan
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,Meter,meter
 DocType: Workstation,Electricity Cost,Kos Elektrik
 DocType: HR Settings,Don't send Employee Birthday Reminders,Jangan hantar Pekerja Hari Lahir Peringatan
-DocType: Opportunity,Walk In,Berjalan Dalam
 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 +12,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: Timesheet Detail,Bill,Rang Undang-Undang
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,White,White
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,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
 DocType: SMS Center,All Lead (Open),Semua Lead (Terbuka)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +228,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})
+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 +731,Make ,Buat
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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.
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Keranjang saya
-apps/erpnext/erpnext/controllers/selling_controller.py +154,Order Type must be one of {0},Perintah Jenis mestilah salah seorang daripada {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Perintah Jenis mestilah salah seorang daripada {0}
 DocType: Lead,Next Contact Date,Hubungi Seterusnya Tarikh
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Membuka Qty
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +393,Please enter Account for Change Amount,Sila masukkan Akaun untuk Perubahan Jumlah
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,Please enter Account for Change Amount,Sila masukkan Akaun untuk Perubahan Jumlah
 DocType: Student Batch,Student Batch Name,Pelajar Batch Nama
 DocType: Holiday List,Holiday List Name,Nama Senarai Holiday
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js +8,Schedule Course,Kursus jadual
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Stock Options,Pilihan Saham
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Pilihan Saham
 DocType: Journal Entry Account,Expense Claim,Perbelanjaan Tuntutan
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +211,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 +237,Qty for {0},Qty untuk {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +212,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 +238,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
@@ -947,9 +961,9 @@
 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/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Barangan dikeluarkan dengan tiada perubahan dalam kuantiti atau nilai.
+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 +635,Attribute table is mandatory,Jadual atribut adalah wajib
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Jadual atribut adalah wajib
 DocType: Production Planning Tool,Get Sales Orders,Dapatkan Perintah Jualan
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{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
@@ -974,7 +988,7 @@
 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/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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},No siri {0} adalah di bawah kontrak penyelenggaraan hamper {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +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
@@ -986,7 +1000,7 @@
 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/controllers/selling_controller.py +231,Sales Order {0} is {1},Pesanan Jualan {0} ialah {1}
+apps/erpnext/erpnext/controllers/selling_controller.py +232,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
 DocType: Packing Slip,Net Weight UOM,Berat UOM bersih
@@ -996,25 +1010,24 @@
 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
 DocType: Sales Person,Select company name first.,Pilih nama syarikat pertama.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Sebut Harga yang diterima daripada Pembekal.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},Untuk {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Purata Umur
 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/templates/pages/home.html +32,View All Products,Lihat Semua Produk
+apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Lihat Semua Produk
 DocType: Company,Default Currency,Mata wang lalai
 DocType: Contact,Enter designation of this Contact,Masukkan penetapan Hubungi ini
 DocType: Expense Claim,From Employee,Dari Pekerja
-apps/erpnext/erpnext/controllers/accounts_controller.py +400,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
+apps/erpnext/erpnext/controllers/accounts_controller.py +403,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/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,dan tahun:
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +191,{0} {1} must be submitted,{0} {1} mestilah diserahkan
-DocType: Email Digest,Annual Expense,Perbelanjaan Tahunan
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,{0} {1} must be submitted,{0} {1} mestilah diserahkan
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +145,Quantity must be less than or equal to {0},Kuantiti mesti kurang daripada atau sama dengan {0}
 DocType: SMS Center,Total Characters,Jumlah Watak
 apps/erpnext/erpnext/controllers/buying_controller.py +156,Please select BOM in BOM field for Item {0},Sila pilih BOM dalam bidang BOM untuk Perkara {0}
@@ -1025,30 +1038,31 @@
 DocType: Sales Partner,Distributor,Pengedar
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Membeli-belah Troli Penghantaran Peraturan
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +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 +62,Please set 'Apply Additional Discount On',Sila menetapkan &#39;Guna Diskaun tambahan On&#39;
+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
 DocType: Global Defaults,Global Defaults,Lalai Global
 apps/erpnext/erpnext/projects/doctype/project/project.py +153,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
 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 +327,Capacity Planning Error,Kapasiti Ralat Perancangan
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,Kapasiti Ralat Perancangan
 ,Trial Balance for Party,Baki percubaan untuk Parti
 DocType: Lead,Consultant,Perunding
 DocType: Salary Slip,Earnings,Pendapatan
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +362,Finished Item {0} must be entered for Manufacture type entry,Mendapat tempat Item {0} mesti dimasukkan untuk masuk jenis Pembuatan
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +367,Finished Item {0} must be entered for Manufacture type entry,Mendapat tempat Item {0} mesti dimasukkan untuk masuk jenis Pembuatan
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Perakaunan membuka Baki
 DocType: Sales Invoice Advance,Sales Invoice Advance,Jualan Invois Advance
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +499,Nothing to request,Tiada apa-apa untuk meminta
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +500,Nothing to request,Tiada apa-apa untuk meminta
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','Tarikh Mula Sebenar' tidak boleh lebih besar daripada 'Tarikh Akhir Sebenar'
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Management,Pengurusan
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},Jumlah debit atau kredit sama ada diperlukan untuk {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,Pengurusan
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +55,Either debit or credit amount is required for {0},Jumlah debit atau kredit sama ada diperlukan untuk {0}
 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 +161,Blue,Blue
+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
@@ -1058,12 +1072,12 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +23,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
 DocType: Stock Settings,Default Item Group,Default Perkara Kumpulan
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1374,Do you really want to submit the invoice?,Adakah anda benar-benar ingin mengemukakan invois?
+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 +685,Cost Center For Item with Item Code ',Pusat Kos Bagi Item Kod Item &#39;
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1526,"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 +679,Cost Center For Item with Item Code ',Pusat Kos Bagi Item Kod Item &#39;
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1550,"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/accounts/doctype/account/account_tree.js +26,"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
@@ -1083,104 +1097,106 @@
 DocType: Payment Reconciliation,Unreconciled Payment Details,Butiran Pembayaran yang belum disatukan
 DocType: Global Defaults,Current Fiscal Year,Fiskal Tahun Semasa
 DocType: Global Defaults,Disable Rounded Total,Melumpuhkan Bulat Jumlah
-DocType: Lead,Call,Panggilan
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +417,'Entries' cannot be empty,&#39;Penyertaan&#39; tidak boleh kosong
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +418,'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 +214,Fiscal Year {0} not found,Tahun Anggaran {0} tidak dijumpai
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +221,Fiscal Year {0} not found,Tahun Anggaran {0} tidak dijumpai
 apps/erpnext/erpnext/config/hr.py +238,Setting up Employees,Menubuhkan Pekerja
 DocType: Sales Order,SO-,demikian-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Sila pilih awalan pertama
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Please select prefix first,Sila pilih awalan pertama
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Research,Penyelidikan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,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 +43,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 +57,View Ledger,Lihat Lejar
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Terawal
-apps/erpnext/erpnext/stock/doctype/item/item.py +504,"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 +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/setup/setup_wizard/setup_wizard.py +437,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
 ,Budget Variance Report,Belanjawan Laporan Varian
 DocType: Salary Slip,Gross Pay,Gaji kasar
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +90,Row {0}: Activity Type is mandatory.,Row {0}: Jenis Aktiviti adalah wajib.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +114,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/public/js/controllers/stock_controller.js +40,Accounting Ledger,Perakaunan Lejar
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,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
 DocType: BOM Item,Item Description,Perkara Penerangan
+DocType: Student Sibling,Student Sibling,Adik-beradik pelajar
 DocType: Purchase Invoice,Is Recurring,Adalah Berulang
 DocType: Purchase Invoice,Supplied Items,Item dibekalkan
 DocType: Student,STUD.,STUD.
 DocType: Production Order,Qty To Manufacture,Qty Untuk Pembuatan
+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/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 +131,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 +175,Valuation Rate required for Item in row {0},Kadar Penilaian diperlukan untuk Item berturut-turut {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,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
 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 +87, to ,kepada
+apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,kepada
 DocType: Item,Lead Time in days,Masa utama dalam hari
 ,Accounts Payable Summary,Ringkasan Akaun Boleh Dibayar
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Not authorized to edit frozen Account {0},Tiada kebenaran untuk mengedit Akaun beku {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,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 +62,Sales Order {0} is not valid,Pesanan Jualan {0} tidak sah
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Pesanan Jualan {0} tidak sah
 apps/erpnext/erpnext/setup/doctype/company/company.py +185,"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 +152,Small,Kecil
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,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}
 ,Invoiced Amount (Exculsive Tax),Invois (Exculsive Cukai)
-DocType: Student Applicant,Mother's / Guardian 1 Email ID,/ Penjaga ID 1 Email Ibu
 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 +160,Green,Green
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,Green
 DocType: Supplier,SUPP-,SUPP-
 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 +57,Contract,Kontrak
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,Kontrak
 DocType: Email Digest,Add Quote,Tambah Quote
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +498,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 +503,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 +80,Row {0}: Qty is mandatory,Row {0}: Qty adalah wajib
+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 +737,Sync Master Data,Sync Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +719,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/public/js/setup_wizard.js +283,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
+DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Ini adalah kumpulan item akar dan tidak boleh diedit.
+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.
 DocType: Journal Entry Account,Purchase Order,Pesanan Pembelian
 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 +345,"{0}: Employee email not found, hence email not sent","{0}: e-mel pekerja tidak dijumpai, maka e-mel tidak dihantar"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +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
 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 +118,"For {0}, only credit accounts can be linked against another debit entry","Untuk {0}, hanya akaun kredit boleh dikaitkan terhadap kemasukan debit lain"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Delivery Note {0} is not submitted,Penghantaran Nota {0} tidak dikemukakan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Delivery Note {0} is not submitted,Penghantaran Nota {0} tidak dikemukakan
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Sub-contracted Item,Perkara {0} mestilah Sub-kontrak Perkara
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Peralatan Modal
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Peraturan harga mula-mula dipilih berdasarkan &#39;Guna Mengenai&#39; bidang, yang boleh menjadi Perkara, Perkara Kumpulan atau Jenama."
 DocType: Hub Settings,Seller Website,Penjual Laman Web
 DocType: Item,ITEM-,ITEM-
-apps/erpnext/erpnext/controllers/selling_controller.py +147,Total allocated percentage for sales team should be 100,Jumlah peratusan yang diperuntukkan bagi pasukan jualan harus 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +110,Production Order status is {0},Status Perintah Pengeluaran adalah {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Jumlah peratusan yang diperuntukkan bagi pasukan jualan harus 100
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Status Perintah Pengeluaran adalah {0}
 DocType: Appraisal Goal,Goal,Matlamat
 DocType: Sales Invoice Item,Edit Description,Edit Penerangan
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +757,For Supplier,Untuk Pembekal
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +723,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
@@ -1196,10 +1212,11 @@
 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
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-mel Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +445,BOM {0} does not belong to Item {1},BOM {0} bukan milik Perkara {1}
 DocType: Sales Partner,Target Distribution,Pengagihan Sasaran
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1667,Deafault warehouse is required for selected item,gudang Deafault diperlukan untuk item yang dipilih
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Deafault warehouse is required for selected item,gudang Deafault diperlukan untuk item yang dipilih
 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
@@ -1208,23 +1225,23 @@
 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 +110,Hardware,Perkakasan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,Perkakasan
 DocType: Sales Order,Recurring Upto,berulang Hamper
 DocType: Attendance,HR Manager,HR Manager
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Sila pilih sebuah Syarikat
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Privilege Leave,Privilege Cuti
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,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 +79,You need to enable Shopping Cart,Anda perlu untuk membolehkan Troli
 DocType: Payment Entry,Writeoff,Hapus kira
 DocType: Appraisal Template Goal,Appraisal Template Goal,Templat Penilaian Matlamat
-DocType: Salary Slip,Earning,Pendapatan
+DocType: Salary Component,Earning,Pendapatan
 DocType: Purchase Invoice,Party Account Currency,Akaun Pihak Mata Wang
 ,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 +171,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 +174,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_data.py +358,Food,Makanan
+apps/erpnext/erpnext/demo/setup/setup_data.py +301,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/course_schedule/course_schedule.js +103,Mark Attendence,Mark Kehadiran
@@ -1258,12 +1275,12 @@
 DocType: Sales Order Item,Planned Quantity,Dirancang Kuantiti
 DocType: Purchase Invoice Item,Item Tax Amount,Jumlah Perkara Cukai
 DocType: Item,Maintain Stock,Mengekalkan Stok
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +209,Stock Entries already created for Production Order ,Penyertaan Saham telah dicipta untuk Perintah Pengeluaran
+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
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,Perubahan Bersih dalam Aset Tetap
 DocType: Leave Control Panel,Leave blank if considered for all designations,Tinggalkan kosong jika dipertimbangkan untuk semua jawatan
-apps/erpnext/erpnext/controllers/accounts_controller.py +620,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 +238,Max: {0},Max: {0}
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +15,From Datetime,Dari datetime
+apps/erpnext/erpnext/controllers/accounts_controller.py +623,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 +239,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 +153,"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."
@@ -1271,8 +1288,8 @@
 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 +552,cannot be greater than 100,tidak boleh lebih besar daripada 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +680,Item {0} is not a stock Item,Perkara {0} bukan Item saham
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +546,cannot be greater than 100,tidak boleh lebih besar daripada 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,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
@@ -1286,10 +1303,9 @@
 DocType: GL Entry,GL Entry,GL Entry
 DocType: HR Settings,Employee Settings,Tetapan pekerja
 ,Batch-Wise Balance History,Batch Bijaksana Baki Sejarah
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,To Do List
 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 +61,Apprentice,Perantis
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +102,Negative Quantity is not allowed,Kuantiti negatif tidak dibenarkan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,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 +152,Employee cannot report to himself.,Pekerja tidak boleh melaporkan kepada dirinya sendiri.
@@ -1310,15 +1326,14 @@
 DocType: Asset,Asset Name,Nama aset
 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 +141,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 +719,Packing Slip,Slip pembungkusan
+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 +713,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/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,Minta sebut harga boleh diakses dengan klik link berikut
 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 +81,Analyst,Penganalisis
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,Penganalisis
 DocType: Item,Inventory,Inventori
 DocType: Item,Sales Details,Jualan Butiran
 DocType: Quality Inspection,QI-,QI-
@@ -1326,7 +1341,7 @@
 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 +103,Government,Kerajaan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,Kerajaan
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,Nama Institut
 apps/erpnext/erpnext/config/stock.py +289,Item Variants,Kelainan Perkara
 DocType: Company,Services,Perkhidmatan
@@ -1342,6 +1357,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,Financial Year Start Date,Tahun Kewangan Tarikh Mula
 DocType: POS Profile,Apply Discount,Gunakan Diskaun
 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
 DocType: Program Course,Program Course,Kursus program
@@ -1382,12 +1398,12 @@
 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
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +110,Accounting Entry for {0} can only be made in currency: {1},Kemasukan Perakaunan untuk {0} hanya boleh dibuat dalam mata wang: {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Kemasukan Perakaunan untuk {0} hanya boleh dibuat dalam mata wang: {1}
 DocType: Pricing Rule,Pricing Rule,Peraturan Harga
 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
 DocType: Shopping Cart Settings,Payment Success URL,Pembayaran URL Kejayaan
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +78,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: Dikembalikan Perkara {1} tidak wujud dalam {2} {3}
+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
@@ -1396,40 +1412,39 @@
 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/stock/doctype/stock_entry/stock_entry.py +339,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Tidak dibenarkan Pindahkan lebih {0} daripada {1} terhadap Perintah Pembelian {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +344,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 +545,Manufacturing Quantity is mandatory,Pembuatan Kuantiti adalah wajib
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Pembuatan Kuantiti adalah wajib
 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 +71,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 +162,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/projects/doctype/timesheet/timesheet.py +186,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
 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 +130,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 +137,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
 DocType: Dependent Task,Dependent Task,Petugas bergantung
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,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/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 +190,Leave of type {0} cannot be longer than {1},Cuti jenis {0} tidak boleh lebih panjang daripada {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +197,Leave of type {0} cannot be longer than {1},Cuti jenis {0} tidak boleh lebih panjang daripada {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Cuba merancang operasi untuk hari X terlebih dahulu.
 DocType: HR Settings,Stop Birthday Reminders,Stop Hari Lahir Peringatan
 DocType: SMS Center,Receiver List,Penerima Senarai
-apps/erpnext/erpnext/accounts/page/pos/pos.js +921,Search Item,Cari Item
+apps/erpnext/erpnext/accounts/page/pos/pos.js +910,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 +546,Already completed,sudah selesai
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +22,Payment Request already exists {0},Permintaan Bayaran sudah wujud {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +550,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 +241,Quantity must not be more than {0},Kuantiti mestilah tidak lebih daripada {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Quantity must not be more than {0},Kuantiti mestilah tidak lebih daripada {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +76,Previous Financial Year is not closed,Sebelum Tahun Kewangan tidak ditutup
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +44,Age (Days),Umur (Hari)
 DocType: Quotation Item,Quotation Item,Sebut Harga Item
@@ -1446,7 +1461,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +221,Purchase Receipt {0} is not submitted,Pembelian Resit {0} tidak dikemukakan
 DocType: Company,Default Payable Account,Default Akaun Belum Bayar
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Tetapan untuk troli membeli-belah dalam talian seperti peraturan perkapalan, senarai harga dan lain-lain"
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +83,{0}% Billed,{0}% dibilkan
+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
@@ -1458,12 +1473,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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/schools/doctype/fees/fees.js +22,Collect,mengumpul
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,mengumpul
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,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 +225,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
-DocType: Payment Reconciliation,Payments,Pembayaran
 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
@@ -1475,7 +1489,7 @@
 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 +9,Procurement,Perolehan
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,Tiada item mempunyai apa-apa perubahan dalam kuantiti atau nilai.
+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
 ,Lead Details,Butiran Lead
 DocType: Purchase Invoice,End date of current invoice's period,Tarikh akhir tempoh invois semasa
@@ -1500,7 +1514,7 @@
 DocType: Purchase Invoice,Additional Discount,Diskaun tambahan
 DocType: Selling Settings,Selling Settings,Menjual Tetapan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Lelong Online
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +97,Please specify either Quantity or Valuation Rate or both,Sila nyatakan sama ada atau Kuantiti Kadar Nilaian atau kedua-duanya
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,Sila nyatakan sama ada atau Kuantiti Kadar Nilaian atau kedua-duanya
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +13,Fulfillment,Fulfillment
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Syarikat, Bulan dan Tahun Anggaran adalah wajib"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Perbelanjaan pemasaran
@@ -1521,14 +1535,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,ERPNext Persediaan Selesai!
 DocType: Item,Weightage,Wajaran
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +93,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Satu Kumpulan Pelanggan sudah wujud dengan nama yang sama, sila tukar nama Pelanggan atau menamakan semula Kumpulan Pelanggan"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +126,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
 DocType: Stock Entry,Material Receipt,Penerimaan Bahan
 DocType: Homepage,Products,Produk
 DocType: Announcement,Instructor,pengajar
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},Jenis Parti dan Parti diperlukan untuk / akaun Dibayar Terima {0}
 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
@@ -1539,7 +1552,7 @@
 ,Item-wise Sales Register,Perkara-bijak Jualan Daftar
 DocType: Asset,Gross Purchase Amount,Jumlah Pembelian Kasar
 DocType: Asset,Depreciation Method,Kaedah susut nilai
-apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Offline,offline
+apps/erpnext/erpnext/accounts/page/pos/pos.js +686,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
@@ -1557,25 +1570,27 @@
 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
 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 +858,Make Purchase Order,Buat Pesanan Belian
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +852,Make Purchase Order,Buat Pesanan Belian
 DocType: SMS Center,Send To,Hantar Kepada
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,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 +148,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
 DocType: Stock Reconciliation,Stock Reconciliation,Saham Penyesuaian
 DocType: Territory,Territory Name,Wilayah Nama
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +172,Work-in-Progress Warehouse is required before Submit,Kerja dalam Kemajuan Gudang diperlukan sebelum Hantar
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,Work-in-Progress Warehouse is required before Submit,Kerja dalam Kemajuan Gudang diperlukan sebelum Hantar
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Pemohon pekerjaan.
 DocType: Purchase Order Item,Warehouse and Reference,Gudang dan Rujukan
 DocType: Supplier,Statutory info and other general information about your Supplier,Maklumat berkanun dan maklumat umum lain mengenai pembekal anda
-apps/erpnext/erpnext/hooks.py +88,Addresses,Alamat
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Pembekal&gt; Jenis pembekal
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +212,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/hooks.py +95,Addresses,Alamat
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +215,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
 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)
 DocType: Sales Order,To Deliver and Bill,Untuk Menghantar dan Rang Undang-undang
@@ -1583,11 +1598,10 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,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 +731,Payment,Pembayaran
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,Payment,Pembayaran
 DocType: Production Order Operation,Actual Time and Cost,Masa sebenar dan Kos
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Permintaan Bahan maksimum {0} boleh dibuat untuk Perkara {1} terhadap Sales Order {2}
 DocType: Employee,Salutation,Salam
-DocType: Pricing Rule,Brand,Jenama
 DocType: Course,Course Abbreviation,Singkatan Course
 DocType: Item,Will also apply for variants,Juga akan memohon varian
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +142,"Asset cannot be cancelled, as it is already {0}","Aset tidak boleh dibatalkan, kerana ia sudah {0}"
@@ -1599,7 +1613,7 @@
 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."
 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 +85,Associate,Madya
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,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
@@ -1607,7 +1621,7 @@
 DocType: Production Planning Tool,Material Requests,Permintaan bahan
 DocType: Warranty Claim,Issue Date,Isu Tarikh
 DocType: Activity Cost,Activity Cost,Kos Aktiviti
-DocType: Timesheet Detail,Timesheet Detail,Detail Timesheet
+DocType: Sales Invoice Timesheet,Timesheet Detail,Detail Timesheet
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Digunakan Qty
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekomunikasi
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Menunjukkan bahawa pakej itu adalah sebahagian daripada penghantaran ini (Hanya Draf)
@@ -1630,6 +1644,7 @@
 DocType: Production Plan Material Request,Material Request Date,Bahan Permintaan Tarikh
 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
 DocType: Item,Has Variants,Mempunyai Kelainan
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nama Pembahagian Bulanan
 DocType: Sales Person,Parent Sales Person,Orang Ibu Bapa Jualan
@@ -1642,30 +1657,31 @@
 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 +44,"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/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.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +502,Error: {0} &gt; {1},Ralat: {0}&gt; {1}
 DocType: Item,Is Sales Item,Adalah Item Jualan
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Perkara Kumpulan Tree
 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.
 DocType: Naming Series,Current Value,Nilai semasa
-apps/erpnext/erpnext/controllers/accounts_controller.py +235,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/controllers/accounts_controller.py +238,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
 DocType: Delivery Note Item,Against Sales Order,Terhadap Perintah Jualan
 ,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 +458,Item table can not be blank,Meja Item tidak boleh kosong
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +443,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 +5,This is based on stock movement. See {0} for details,Ini adalah berdasarkan kepada pergerakan saham. Lihat {0} untuk mendapatkan butiran
 DocType: Pricing Rule,Selling,Jualan
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +341,Amount {0} {1} deducted against {2},Jumlah {0} {1} ditolak daripada {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +344,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
@@ -1680,8 +1696,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +144,Cannot refer row number greater than or equal to current row number for this Charge type,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 +159,Red,Merah
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Sila klik pada &#39;Menjana Jadual&#39; mengambil No Serial ditambah untuk Perkara {0}
+apps/erpnext/erpnext/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
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Base Jumlah (Syarikat Mata Wang)
@@ -1689,7 +1705,7 @@
 DocType: Installation Note,Installation Time,Masa pemasangan
 DocType: Sales Invoice,Accounting Details,Maklumat Perakaunan
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,Memadam semua Transaksi Syarikat ini
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +187,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Row # {0}: Operasi {1} tidak siap untuk {2} qty barangan siap dalam Pengeluaran Pesanan # {3}. Sila kemas kini status operasi melalui Time Logs
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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,Row # {0}: Operasi {1} tidak siap untuk {2} qty barangan siap dalam Pengeluaran Pesanan # {3}. Sila kemas kini status operasi melalui Time Logs
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,Pelaburan
 DocType: Issue,Resolution Details,Resolusi Butiran
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,peruntukan
@@ -1725,16 +1741,17 @@
 DocType: Bank Reconciliation Detail,Against Account,Terhadap Akaun
 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}
 DocType: Delivery Note,Excise Page Number,Eksais Bilangan Halaman
 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}
 ,Maintenance Schedules,Jadual Penyelenggaraan
 DocType: Task,Actual End Date (via Time Sheet),Sebenar Tarikh Akhir (melalui Lembaran Time)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Amount {0} {1} against {2} {3},Jumlah {0} {1} daripada {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +339,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 +138,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 +295,Debit To account must be a Receivable account,Debit Untuk akaun mestilah akaun Belum Terima
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Receivable account,Debit Untuk akaun mestilah akaun Belum Terima
 DocType: Shipping Rule Condition,Shipping Amount,Penghantaran Jumlah
 ,Pending Amount,Sementara menunggu Jumlah
 DocType: Purchase Invoice Item,Conversion Factor,Faktor penukaran
@@ -1742,10 +1759,10 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +137,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
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +90,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Jumlah daun diperuntukkan {0} tidak boleh kurang daripada daun yang telah pun diluluskan {1} bagi tempoh
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +93,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 +22,Enter Paid Amount,Masukkan Jumlah Dibayar
+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
@@ -1755,13 +1772,15 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,timesheets
 DocType: HR Settings,HR Settings,Tetapan HR
 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 +524,"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."
+apps/erpnext/erpnext/controllers/accounts_controller.py +527,"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 +249,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
 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/stock/get_item_details.py +123,Please specify Company,Sila nyatakan Syarikat
 ,Customer Acquisition and Loyalty,Perolehan Pelanggan dan Kesetiaan
@@ -1772,17 +1791,19 @@
 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 +183,Closing (Opening + Totals),Penutup (Membuka Total +)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),Penutup (Membuka Total +)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Sila nyatakan mata wang dalam Syarikat
 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/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
-apps/erpnext/erpnext/controllers/accounts_controller.py +272,Account {0} is invalid. Account Currency must be {1},Akaun {0} tidak sah. Mata Wang Akaun mesti {1}
+DocType: Email Digest,Pending Sales Orders,Sementara menunggu Jualan Pesanan
+apps/erpnext/erpnext/controllers/accounts_controller.py +275,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 +956,"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 Slip,Deduction,Potongan
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +87,Row {0}: From Time and To Time is mandatory.,Row {0}: Dari Masa dan Untuk Masa adalah wajib.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +969,"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 +111,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 +262,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 +7,Please enter Employee Id of this sales person,Sila masukkan ID Pekerja orang jualan ini
@@ -1790,7 +1811,7 @@
 DocType: Project,% Tasks Completed,% Tugas Selesai
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,Perbezaan Jumlah mestilah sifar
 DocType: Project,Gross Margin,Margin kasar
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +194,Please enter Production Item first,Sila masukkan Pengeluaran Perkara pertama
+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
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Sebut Harga
@@ -1799,53 +1820,54 @@
 DocType: Maintenance Visit,Maintenance User,Penyelenggaraan pengguna
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +149,Cost Updated,Kos Dikemaskini
 DocType: Employee,Date of Birth,Tarikh Lahir
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +86,Item {0} has already been returned,Perkara {0} telah kembali
+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}
+DocType: Student Admission,Eligibility,kelayakan
 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 +177,Job Description,Penerangan mengenai Jawatan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,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 +126,"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 +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Watak khas kecuali &quot;-&quot; &quot;.&quot;, &quot;#&quot;, dan &quot;/&quot; tidak dibenarkan dalam menamakan siri"
 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."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +24,Welcome to POS: Create your POS Profile,Selamat datang ke POS: Buat Profil POS anda
 DocType: Expense Claim,Approver,Pelulus
 ,SO Qty,SO Qty
+DocType: Guardian,Work Address,kerja Alamat
 DocType: Appraisal,Calculate Total Score,Kira Jumlah Skor
 DocType: Request for Quotation,Manufacturing Manager,Pembuatan Pengurus
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},No siri {0} adalah di bawah jaminan hamper {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +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 +74,Shipments,Penghantaran
+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
 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 +153,Row # ,Row #
+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 +156,Get From,Dapatkan Daripada
+apps/erpnext/erpnext/public/js/utils.js +167,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 +167,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 +416,"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"
+apps/erpnext/erpnext/controllers/accounts_controller.py +419,"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
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} is disabled,Pengguna {0} adalah orang kurang upaya
 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 ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Tinggalkan kosong jika dipertimbangkan untuk semua jabatan
 apps/erpnext/erpnext/config/hr.py +171,"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 +346,{0} is mandatory for Item {1},{0} adalah wajib bagi Perkara {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,{0} is mandatory for Item {1},{0} adalah wajib bagi Perkara {1}
 DocType: Currency Exchange,From Currency,Dari Mata Wang
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Sila pilih Jumlah Diperuntukkan, Jenis Invois dan Nombor Invois dalam atleast satu baris"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,Kos Pembelian New
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},Pesanan Jualan diperlukan untuk Perkara {0}
 DocType: Purchase Invoice Item,Rate (Company Currency),Kadar (Syarikat mata wang)
-apps/erpnext/erpnext/demo/setup_data.py +360,Others,Lain
+DocType: Student Guardian,Others,Lain
 DocType: Payment Entry,Unallocated Amount,Jumlah yang tidak diperuntukkan
 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
@@ -1865,17 +1887,16 @@
 apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,Inventori bersiri
 DocType: Activity Type,Default Billing Rate,Kadar Bil lalai
 DocType: Sales Invoice,Total Billing Amount,Jumlah Bil
-apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +54,Receivable Account,Akaun Belum Terima
-apps/erpnext/erpnext/controllers/accounts_controller.py +546,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} sudah {2}
+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 +549,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 +79,CEO,Ketua Pegawai Eksekutif
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,Ketua Pegawai Eksekutif
 DocType: Expense Claim Detail,Expense Claim Detail,Perbelanjaan Tuntutan Detail
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +808,Please select correct account,Sila pilih akaun yang betul
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +809,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
-DocType: Purchase Invoice Item,Page Break,Page Break
 DocType: Production Order Operation,Pending,Sementara menunggu
 DocType: Course,Course Name,Nama kursus
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Pengguna yang boleh meluluskan permohonan cuti kakitangan yang khusus
@@ -1884,14 +1905,15 @@
 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 +54,Full-time,Sepenuh masa
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,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: Student,Guardians,penjaga
 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 +289,Debit To is required,Debit Untuk diperlukan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +321,Debit To is required,Debit Untuk diperlukan
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Pembelian Senarai Harga
 DocType: Offer Letter Term,Offer Term,Tawaran Jangka
 DocType: Quality Inspection,Quality Manager,Pengurus Kualiti
@@ -1899,6 +1921,7 @@
 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/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
@@ -1909,18 +1932,17 @@
 DocType: Production Order Operation,Completed Qty,Siap Qty
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"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 +273,Price List {0} is disabled,Senarai Harga {0} adalah orang kurang upaya
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +99,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/projects/doctype/timesheet/timesheet.py +123,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
 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}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Kadar Penilaian semasa
 DocType: Item,Customer Item Codes,Kod Item Pelanggan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,Exchange Keuntungan / Kerugian
 DocType: Opportunity,Lost Reason,Hilang Akal
-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/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/purchase_receipt/purchase_receipt.py +378,All items have already been invoiced,Semua barang-barang telah diinvois
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +379,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
@@ -1936,18 +1958,19 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Pelanggan anda
 apps/erpnext/erpnext/projects/doctype/project/project.py +141,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/job_opening.html +19,Apply Now,Mohon sekarang
+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."
 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
-apps/erpnext/erpnext/utilities/doctype/address/address.py +164,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: Fee Structure,Fee Structure,Struktur Bayaran
 DocType: Timesheet Detail,Costing Amount,Jumlah berharga
+DocType: Student Admission,Application Fee,Bayaran permohonan
 DocType: Process Payroll,Submit Salary Slip,Hantar Slip Gaji
-apps/erpnext/erpnext/controllers/selling_controller.py +161,Maxiumm discount for Item {0} is {1}%,Diskaun Maxiumm untuk Perkara {0} adalah {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,Diskaun Maxiumm untuk Perkara {0} adalah {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Import di Bulk
 DocType: Sales Partner,Address & Contacts,Alamat Kenalan
 DocType: SMS Log,Sender Name,Nama Pengirim
@@ -1972,21 +1995,21 @@
 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_data.py +361,Travel,Perjalanan
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +155,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 +304,Travel,Perjalanan
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +167,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 +23,Update Cost,Update Kos
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Update Kos
 DocType: Item Reorder,Item Reorder,Perkara Reorder
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +36,Show Salary Slip,Show Slip Gaji
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +748,Transfer Material,Pemindahan Bahan
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +53,Show Salary Slip,Show Slip Gaji
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +166,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 +923,Please set recurring after saving,Sila menetapkan berulang selepas menyimpan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +646,Select change amount account,Pilih perubahan kira jumlah
+apps/erpnext/erpnext/public/js/controllers/transaction.js +914,Please set recurring after saving,Sila menetapkan berulang selepas menyimpan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +703,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
@@ -1998,31 +2021,32 @@
 DocType: Quality Inspection,Verified By,Disahkan oleh
 DocType: Address,Subsidiary,Anak Syarikat
 apps/erpnext/erpnext/setup/doctype/company/company.py +64,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","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: Quality Inspection,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 +33,Traceability,kebolehkesanan
 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 +352,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Kuantiti berturut-turut {0} ({1}) mestilah sama dengan kuantiti yang dikeluarkan {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Kuantiti berturut-turut {0} ({1}) mestilah sama dengan kuantiti yang dikeluarkan {2}
 DocType: Appraisal,Employee,Pekerja
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Jemput sebagai pengguna
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} telah dibil sepenuhnya
 DocType: Workstation Working Hour,End Time,Akhir Masa
 DocType: Payment Entry,Payment Deductions or Loss,Potongan bayaran atau Kehilangan
-apps/erpnext/erpnext/config/schools.py +100,LMS,LMS
+apps/erpnext/erpnext/config/schools.py +104,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/config/crm.py +6,Sales Pipeline,Pipeline jualan
 DocType: Student Batch Student,Student Batch Student,Pelajar Batch Pelajar
-DocType: Sales Invoice,Mass Mailing,Mailing massa
+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 +199,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/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 +297,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 +111,Pharmaceutical,Farmasi
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +309,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/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
@@ -2037,27 +2061,28 @@
 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 +814,Please specify Company to proceed,Sila nyatakan Syarikat untuk meneruskan
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +793,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 +44,Compensatory Off,Pampasan Off
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,Pampasan Off
 DocType: Quality Inspection Reading,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.
 DocType: Room,Room Number,Nombor bilik
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Rujukan tidak sah {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +161,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) tidak boleh lebih besar dari kuantiti yang dirancang ({2}) dalam Pesanan Pengeluaran {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +162,{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 +217,Raw Materials cannot be blank.,Bahan mentah tidak boleh kosong.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,"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 +460,Quick Journal Entry,Pantas Journal Kemasukan
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +111,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/accounts/doctype/sales_invoice/sales_invoice.py +441,"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 +450,Quick Journal Entry,Pantas Journal Kemasukan
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +103,You can not change rate if BOM mentioned agianst any item,Anda tidak boleh mengubah kadar jika BOM disebut agianst sebarang perkara
 DocType: Employee,Previous Work Experience,Pengalaman Kerja Sebelumnya
 DocType: Stock Entry,For Quantity,Untuk Kuantiti
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +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 +214,{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
 ,Minutes to First Response for Issues,Minit ke Response Pertama untuk Isu
 DocType: Purchase Invoice,Terms and Conditions1,Terma dan Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,Nama institut yang mana anda menyediakan sistem ini.
@@ -2066,16 +2091,17 @@
 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 +398,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
 ,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 +739,Item or Warehouse for row {0} does not match Material Request,Perkara atau Gudang untuk baris {0} tidak sepadan Bahan Permintaan
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +747,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
 DocType: Fiscal Year,Year End Date,Tahun Tarikh Akhir
 DocType: Task Depends On,Task Depends On,Petugas Bergantung Pada
-DocType: Lead,Opportunity,Peluang
+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
@@ -2088,7 +2114,7 @@
 DocType: Student,Joining Date,menyertai Tarikh
 ,Employees working on a holiday,Kakitangan yang bekerja pada hari cuti
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Mark Hadir
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},Tarikh mula penyelenggaraan tidak boleh sebelum tarikh penghantaran untuk No Serial {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},Tarikh mula penyelenggaraan tidak boleh sebelum tarikh penghantaran untuk No Serial {0}
 DocType: Production Order,Actual End Date,Tarikh Akhir Sebenar
 DocType: Purchase Invoice,PINV-,PINV-
 DocType: Authorization Rule,Applicable To (Role),Terpakai Untuk (Peranan)
@@ -2103,7 +2129,7 @@
 DocType: SMS Log,No of Requested SMS,Jumlah SMS yang diminta
 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 +729,Please supply the specified items at the best possible rates,Sila membekalkan barangan tertentu pada kadar terbaik mungkin
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +695,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 +117,Contract End Date must be greater than Date of Joining,Kontrak Tarikh Akhir mesti lebih besar daripada Tarikh Menyertai
 DocType: Delivery Note,DN-,DN-
@@ -2112,7 +2138,7 @@
 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 +14,This is an example website auto-generated from ERPNext,Ini adalah laman contoh automatik dihasilkan daripada ERPNext
+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
 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.
 
@@ -2139,13 +2165,14 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd Kuantiti
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +54,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 +103,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 +504,Stock Entry {0} is not submitted,Saham Entry {0} tidak dikemukakan
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Tidak boleh menghasilkan Perkara lebih {0} daripada kuantiti Sales Order {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +505,Stock Entry {0} is not submitted,Saham Entry {0} tidak dikemukakan
 DocType: Payment Reconciliation,Bank / Cash Account,Akaun Bank / Tunai
 DocType: Tax Rule,Billing City,Bandar Bil
 DocType: Salary Component Account,Salary Component Account,Akaun Komponen Gaji
 DocType: Global Defaults,Hide Currency Symbol,Menyembunyikan Simbol mata wang
 apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card","contohnya Bank, Tunai, Kad Kredit"
+DocType: Lead Source,Source Name,Nama Source
 DocType: Journal Entry,Credit Note,Nota Kredit
 DocType: Warranty Claim,Service Address,Alamat Perkhidmatan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furnitures and Fixtures,Perabot dan Fixtures
@@ -2157,6 +2184,7 @@
 DocType: Opportunity,Customer / Lead Name,Pelanggan / Nama Lead
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +89,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/controllers/trends.py +19,Total(Qty),Jumlah (Kuantiti)
 DocType: Sales Invoice,This Document,Dokumen ini
@@ -2168,15 +2196,15 @@
 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 +176,Organization branch master.,Master cawangan organisasi.
-apps/erpnext/erpnext/controllers/accounts_controller.py +273, or ,atau
+apps/erpnext/erpnext/controllers/accounts_controller.py +276, or ,atau
 DocType: Sales Order,Billing Status,Bil Status
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Laporkan Isu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,Perbelanjaan utiliti
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90 Ke atas
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +203,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: Journal Kemasukan {1} tidak mempunyai akaun {2} atau sudah dipadankan dengan baucar lain
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +206,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 +90,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 +93,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
@@ -2204,8 +2232,8 @@
 DocType: Product Bundle,Parent Item,Perkara Ibu Bapa
 DocType: Account,Account Type,Jenis Akaun
 DocType: Delivery Note,DN-RET-,DN-RET-
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +115,Leave Type {0} cannot be carry-forwarded,Tinggalkan Jenis {0} tidak boleh bawa dikemukakan
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Jadual penyelenggaraan tidak dihasilkan untuk semua item. Sila klik pada &#39;Menjana Jadual&#39;
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +118,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 +163,"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"
@@ -2217,13 +2245,13 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +32,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 +748,Delivery,Penghantaran
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +742,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
 DocType: Payment Entry,Total Allocated Amount,Jumlah Diperuntukkan
 DocType: Item Reorder,Material Request Type,Permintaan Jenis Bahan
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +82,Row {0}: UOM Conversion Factor is mandatory,Row {0}: Faktor Penukaran UOM adalah wajib
+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
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Baucer #
@@ -2234,13 +2262,13 @@
 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 +90,Head of Marketing and Sales,Ketua Pemasaran dan Jualan
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Cukai Pendapatan
+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 +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.
 DocType: Item Supplier,Item Supplier,Perkara Pembekal
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +403,Please enter Item Code to get batch no,Sila masukkan Kod Item untuk mendapatkan kumpulan tidak
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +770,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 +397,Please enter Item Code to get batch no,Sila masukkan Kod Item untuk mendapatkan kumpulan tidak
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +764,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"
@@ -2252,28 +2280,29 @@
 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 +100,Issues,Isu-isu
+apps/erpnext/erpnext/hooks.py +109,Issues,Isu-isu
 apps/erpnext/erpnext/controllers/status_updater.py +13,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
 ,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
 DocType: Supplier,Billing Currency,Bil Mata Wang
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Large,Lebih Besar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Extra Large,Lebih Besar
 ,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 +507,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 +107,Local,Tempatan
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +508,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/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 +154,Large,Besar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Large,Besar
 DocType: Homepage Featured Product,Homepage Featured Product,Homepage produk yang ditampilkan
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Nama Warehouse New
-apps/erpnext/erpnext/accounts/report/financial_statements.py +225,Total {0} ({1}),Jumlah {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +224,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
@@ -2319,9 +2348,9 @@
 DocType: Attendance,Leave Type,Cuti Jenis
 apps/erpnext/erpnext/controllers/stock_controller.py +173,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/hr/doctype/salary_slip/salary_slip.py +79,Name error: {0},ralat Nama: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +90,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 +178,{0} {1} does not associated with {2} {3},{0} {1} tidak berkaitan dengan {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +181,{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)
 DocType: Warehouse,Parent Warehouse,Warehouse Ibu Bapa
@@ -2340,7 +2369,7 @@
 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
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,Atleast perkara seseorang itu perlu dimasukkan dengan kuantiti negatif dalam dokumen pulangan
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Atleast one item should be entered with negative quantity in return document,Atleast perkara seseorang itu perlu dimasukkan dengan kuantiti negatif dalam dokumen pulangan
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operasi {0} lebih lama daripada mana-mana waktu kerja yang terdapat di stesen kerja {1}, memecahkan operasi ke dalam pelbagai operasi"
 ,Requested,Diminta
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +83,No Remarks,Tidak Catatan
@@ -2352,46 +2381,46 @@
 DocType: Item,Total Projected Qty,Jumlah unjuran Qty
 DocType: Monthly Distribution,Distribution Name,Nama pengedaran
 DocType: Course,Course Code,Kod kursus
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Quality Inspection required for Item {0},Pemeriksaan kualiti yang diperlukan untuk Perkara {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,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
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Mengurus Wilayah Tree.
 DocType: Journal Entry Account,Sales Invoice,Invois jualan
 DocType: Journal Entry Account,Party Balance,Baki pihak
-apps/erpnext/erpnext/accounts/page/pos/pos.js +475,Please select Apply Discount On,Sila pilih Memohon Diskaun Pada
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +92,Salary Slip Created,Slip Gaji Dibuat
+apps/erpnext/erpnext/accounts/page/pos/pos.js +464,Please select Apply Discount On,Sila pilih Memohon Diskaun Pada
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +95,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
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,Peratus diskaun boleh digunakan baik dengan menentang Senarai Harga atau untuk semua Senarai Harga.
 DocType: Purchase Invoice,Half-yearly,Setengah tahun
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +384,Accounting Entry for Stock,Catatan Perakaunan untuk Stok
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +387,Accounting Entry for Stock,Catatan Perakaunan untuk Stok
 DocType: Sales Invoice,Sales Team1,Team1 Jualan
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,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 +96,Row {0}: Completed Qty must be greater than zero.,Row {0}: Bidang Qty mesti lebih besar daripada sifar.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +120,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 +88,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Tidak boleh kembali lebih daripada {1} untuk Perkara {2}
+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
 DocType: Item Group,Show this slideshow at the top of the page,Menunjukkan tayangan gambar ini di bahagian atas halaman
 DocType: BOM,Item UOM,Perkara UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Amaun Cukai Selepas Jumlah Diskaun (Syarikat mata wang)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +147,Target warehouse is mandatory for row {0},Gudang sasaran adalah wajib untuk berturut-turut {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +141,Target warehouse is mandatory for row {0},Gudang sasaran adalah wajib untuk berturut-turut {0}
 DocType: Cheque Print Template,Primary Settings,Tetapan utama
 DocType: Purchase Invoice,Select Supplier Address,Pilih Alamat Pembekal
 DocType: Quality Inspection,Quality Inspection,Pemeriksaan Kualiti
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Extra Small,Tambahan Kecil
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +194,Account {0} is frozen,Akaun {0} dibekukan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Tambahan Kecil
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +690,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 +197,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 +606,Can only make payment against unbilled {0},Hanya boleh membuat pembayaran terhadap belum dibilkan {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +126,Commission rate cannot be greater than 100,Kadar Suruhanjaya tidak boleh lebih besar daripada 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +609,Can only make payment against unbilled {0},Hanya boleh membuat pembayaran terhadap belum dibilkan {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,Kadar Suruhanjaya tidak boleh lebih besar daripada 100
 DocType: Stock Entry,Subcontract,Subkontrak
 apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,Sila masukkan {0} pertama
 DocType: Production Order Operation,Actual End Time,Waktu Tamat Sebenar
@@ -2402,30 +2431,30 @@
 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 +158,Colour,Warna
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,Warna
 DocType: Maintenance Visit,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
 DocType: Student Log,Academic,akademik
-apps/erpnext/erpnext/controllers/accounts_controller.py +469,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Pendahuluan ({0}) terhadap Perintah {1} tidak boleh lebih besar daripada Jumlah Besar ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +472,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Pendahuluan ({0}) terhadap Perintah {1} tidak boleh lebih besar daripada Jumlah Besar ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Pilih Pengagihan Bulanan untuk tidak sekata mengedarkan sasaran seluruh bulan.
 DocType: Purchase Invoice Item,Valuation Rate,Kadar penilaian
+DocType: Stock Reconciliation,SR/,SR /
 apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,Senarai harga mata wang tidak dipilih
 DocType: Assessment,Results,keputusan
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +168,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 +175,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: Student Applicant,Father's/ Guardian 2 Email ID,/ Penjaga ID 2 E-mel Bapa
 DocType: Maintenance Visit Purpose,Against Document No,Terhadap Dokumen No
 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 +228,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 +231,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/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 +93,Researcher,Penyelidik
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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.
@@ -2437,25 +2466,25 @@
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Untuk kemudahan pelanggan, kod-kod ini boleh digunakan dalam format cetak seperti Invois dan Nota Penghantaran"
 DocType: 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: Sales Invoice,Advertisement,Iklan
 DocType: Asset Category Account,Depreciation Expense Account,Akaun Susut Perbelanjaan
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Probationary Period,Tempoh Percubaan
-apps/erpnext/erpnext/hooks.py +102,Announcements,Pengumuman
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Tempoh Percubaan
+apps/erpnext/erpnext/hooks.py +111,Announcements,Pengumuman
 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 +109,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 +16,To Datetime,Untuk datetime
+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/scheduling_tool/scheduling_tool.py +51,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/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Sementara menunggu Aktiviti
+DocType: Accounts Settings,Make Payment via Journal Entry,Buat Pembayaran melalui Journal Kemasukan
+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 +127,Please enter relieving date.,Sila masukkan tarikh melegakan.
-apps/erpnext/erpnext/controllers/trends.py +145,Amt,AMT
+apps/erpnext/erpnext/controllers/trends.py +149,Amt,AMT
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,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 +26,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
@@ -2473,14 +2502,15 @@
 apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1},Tidak dapat mencari kadar pertukaran untuk {0} kepada {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Mark Day Half
 DocType: Sales Invoice,Sales Team,Pasukan Jualan
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Duplicate entry,Entri pendua
+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 +490,[Error],[Ralat]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +484,[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
 apps/erpnext/erpnext/controllers/status_updater.py +175,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.
 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
@@ -2496,22 +2526,22 @@
 ,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 +25,All Jobs,semua Pekerjaan
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,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
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Amount {0} {1} {2} {3},Jumlah {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Amount {0} {1} {2} {3},Jumlah {0} {1} {2} {3}
 DocType: Account,Depreciation,Susutnilai
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Pembekal (s)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Pekerja Tool Kehadiran
 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 +372,Payment Entries {0} are un-linked,Penyertaan Pembayaran {0} adalah un berkaitan
+apps/erpnext/erpnext/accounts/utils.py +449,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
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +497,Material Requests {0} created,Permintaan bahan {0} dicipta
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +498,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.
 DocType: Purchase Invoice,Address and Contact,Alamat dan Perhubungan
@@ -2550,7 +2580,7 @@
 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 +848,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 +859,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 +233,Closing (Dr),Penutup (Dr)
 DocType: Cheque Print Template,Cheque Size,Saiz Cek
@@ -2571,7 +2601,8 @@
 ,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.
-apps/erpnext/erpnext/controllers/accounts_controller.py +555,'Update Stock' cannot be checked for fixed asset sale,&#39;Update Stock&#39; tidak boleh diperiksa untuk jualan aset tetap
+DocType: Student Guardian,Father,Bapa
+apps/erpnext/erpnext/controllers/accounts_controller.py +558,'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
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Dapatkan Maklumat Terbaru
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +132,Material Request {0} is cancelled or stopped,Permintaan bahan {0} dibatalkan atau dihentikan
@@ -2581,15 +2612,15 @@
 DocType: Sales Order,Fully Delivered,Dihantar sepenuhnya
 DocType: Lead,Lower Income,Pendapatan yang lebih rendah
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","Ketua akaun di bawah Liabiliti, di mana Keuntungan / Kerugian akan diberikan kad"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +166,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 +238,"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 +81,Purchase Order number required for Item {0},Membeli nombor Perintah diperlukan untuk Perkara {0}
+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/purchase_receipt/purchase_receipt.py +82,Purchase Order number required for Item {0},Membeli nombor Perintah diperlukan untuk Perkara {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Dari Tarikh' mesti selepas 'Sehingga'
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +17,Cannot change status as student {0} is linked with student application {1},tidak boleh menukar status sebagai pelajar {0} dikaitkan dengan permohonan pelajar {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +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: Timesheet,"List of employee which has ""Salary Slip Based on Timesheet"" is enabled in salary structure.",Senarai pekerja yang mempunyai &quot;Slip Gaji Berdasarkan Timesheet&quot; diaktifkan dalam struktur gaji.
 DocType: Asset,Fully Depreciated,disusutnilai sepenuhnya
 ,Stock Projected Qty,Saham Unjuran Qty
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Customer {0} does not belong to project {1},Pelanggan {0} bukan milik projek {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,Customer {0} does not belong to project {1},Pelanggan {0} bukan milik projek {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Kehadiran ketara HTML
 DocType: Sales Order,Customer's Purchase Order,Pesanan Pelanggan
 apps/erpnext/erpnext/config/stock.py +107,Serial No and Batch,Serial No dan Batch
@@ -2601,7 +2632,7 @@
 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/patches/v7_0/create_warehouse_nestedset.py +55,All Warehouses,semua Gudang
+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 +105,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
@@ -2613,10 +2644,10 @@
 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/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Membuat Slip Gaji
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +26,Browse BOM,Browse BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,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/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 Year,Academic Year,Tahun akademik
+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
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,Penilaian
@@ -2624,12 +2655,12 @@
 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 +197,Leave approver must be one of {0},Tinggalkan Pelulus mestilah salah seorang daripada {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,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: Workstation Working Hour,Start Time,Waktu Mula
 DocType: Item Price,Bulk Import Help,Bulk Bantuan Import
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +256,Select Quantity,Pilih Kuantiti
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +257,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
@@ -2646,6 +2677,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Qty sasaran atau sasaran jumlah sama ada adalah wajib.
 apps/erpnext/erpnext/config/projects.py +45,Cost of various activities,Kos pelbagai aktiviti
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Menetapkan Peristiwa untuk {0}, kerana pekerja yang bertugas di bawah Persons Jualan tidak mempunyai ID Pengguna {1}"
+DocType: Timesheet,Billing Details,Billing Details
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +149,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}
 DocType: Item,Inspection Required,Pemeriksaan Diperlukan
@@ -2665,7 +2697,7 @@
 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 +138,Wire Transfer,Wire Transfer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,Wire Transfer
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Memeriksa semua
 DocType: Sales Order,Recurring Order,Pesanan berulang
 DocType: Company,Default Income Account,Akaun Pendapatan Default
@@ -2677,21 +2709,19 @@
 ,Welcome to ERPNext,Selamat datang ke ERPNext
 apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,Membawa kepada Sebut Harga
 DocType: Lead,From Customer,Daripada Pelanggan
-apps/erpnext/erpnext/demo/setup_data.py +357,Calls,Panggilan
+apps/erpnext/erpnext/demo/setup/setup_data.py +300,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/stock/doctype/item/item.py +466,"As there are existing transactions for this item, \
-							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Oleh kerana terdapat urus niaga yang sedia ada untuk item ini, \ anda tidak boleh menukar nilai &#39;Mempunyai No Siri,&#39; Mempunyai Batch Tidak &#39;,&#39; Adakah Stock Item &#39;dan&#39; Kaedah Penilaian &#39;"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,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/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 +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota: Sistem tidak akan memeriksa terlebih penghantaran dan lebih-tempahan untuk Perkara {0} sebagai kuantiti atau jumlah adalah 0
 DocType: Notification Control,Quotation Message,Sebut Harga Mesej
 DocType: Issue,Opening Date,Tarikh pembukaan
-apps/erpnext/erpnext/schools/api.py +58,Attendance has been marked successfully.,Kehadiran telah ditandakan dengan jayanya.
+apps/erpnext/erpnext/schools/api.py +57,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 +136,Account Type for {0} must be {1},Jenis Akaun untuk {0} mesti {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +139,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
@@ -2706,12 +2736,13 @@
 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/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 +20,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 +1190,Please select customer,Sila pilih pelanggan
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1193,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
@@ -2721,6 +2752,7 @@
 ,Payment Period Based On Invoice Date,Tempoh Pembayaran Berasaskan Tarikh Invois
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Hilang Mata Wang Kadar Pertukaran untuk {0}
 DocType: Assessment,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-
@@ -2738,11 +2770,12 @@
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Topic Nama
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Atleast salah satu atau Jualan Membeli mesti dipilih
+DocType: Grading Structure,Grade Intervals,Selang gred
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Pilih jenis perniagaan anda.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Tempat operasi pembuatan dijalankan.
 DocType: Asset Movement,Source Warehouse,Sumber Gudang
 DocType: Installation Note,Installation Date,Tarikh pemasangan
-apps/erpnext/erpnext/controllers/accounts_controller.py +534,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} bukan milik syarikat {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +537,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
@@ -2756,28 +2789,31 @@
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Disediakan Kuantiti Batch di Dari Gudang
 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 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 +111,Date Of Retirement must be greater than Date of Joining,Tarikh Persaraan mesti lebih besar daripada Tarikh Menyertai
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +49,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 +87,{0}% Delivered,{0}% Dihantar
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% Dihantar
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Perkara {0}: qty Mengarahkan {1} tidak boleh kurang daripada perintah qty minimum {2} (ditakrifkan dalam Perkara).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Taburan Peratus Bulanan
 DocType: Territory,Territory Targets,Sasaran Wilayah
 DocType: Delivery Note,Transporter Info,Maklumat Transporter
-apps/erpnext/erpnext/accounts/utils.py +379,Please set default {0} in Company {1},Sila menetapkan lalai {0} dalam Syarikat {1}
+apps/erpnext/erpnext/accounts/utils.py +456,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
 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.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Tajuk untuk template cetak seperti Proforma Invois.
+DocType: Student Guardian,Student Guardian,Guardian pelajar
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +184,Valuation type charges can not marked as Inclusive,Caj jenis penilaian tidak boleh ditandakan sebagai Inclusive
 DocType: POS Profile,Update Stock,Update Saham
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM berbeza untuk perkara akan membawa kepada tidak betul (Jumlah) Nilai Berat Bersih. Pastikan Berat bersih setiap item adalah dalam UOM yang sama.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Kadar BOM
 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 +349,Journal Entries {0} are un-linked,Jurnal Penyertaan {0} adalah un berkaitan
+apps/erpnext/erpnext/accounts/utils.py +426,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
@@ -2801,6 +2837,7 @@
 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
+DocType: Homepage,"URL for ""All Products""",URL untuk &quot;Semua Produk&quot;
 DocType: Leave Application,Leave Balance Before Application,Tinggalkan Baki Sebelum Permohonan
 DocType: SMS Center,Send SMS,Hantar SMS
 DocType: Cheque Print Template,Width of amount in word,Lebar amaun dalam perkataan
@@ -2809,7 +2846,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 +29,Current Job Openings,Lowongan Kerja Semasa
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,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
@@ -2822,7 +2859,7 @@
 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 +850,Show tax break-up,Show cukai Perpecahan
+apps/erpnext/erpnext/public/js/controllers/transaction.js +841,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/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"
@@ -2832,10 +2869,11 @@
 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 +534,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 +80,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 +162,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/selling/doctype/customer/customer.py +195,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 +5,This is based on the attendance of this Student,Ini adalah berdasarkan kepada kehadiran Pelajar ini
@@ -2844,12 +2882,11 @@
 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 +75,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 +138,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/hr/doctype/leave_application/leave_application.py +145,Note: There is not enough leave balance for Leave Type {0},Nota: Tidak ada baki cuti yang cukup untuk Cuti Jenis {0}
 DocType: Program Enrollment Fee,Program Enrollment Fee,Program Bayaran Pendaftaran
 DocType: Item,Supplier Items,Item Pembekal
 DocType: Opportunity,Opportunity Type,Jenis Peluang
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,Syarikat Baru
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,Cost Center is required for 'Profit and Loss' account {0},Pusat Kos yang diperlukan untuk &#39;Untung Rugi akaun {0}
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Urusniaga hanya boleh dihapuskan oleh pencipta Syarikat
 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.,Jumlah yang tidak betul Lejar Am Penyertaan dijumpai. Anda mungkin telah memilih Akaun salah dalam urus niaga.
 DocType: Cheque Print Template,Cheque Width,Lebar Cek
@@ -2858,16 +2895,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Tarikh Lahir tidak boleh lebih besar daripada hari ini.
 ,Stock Ageing,Saham Penuaan
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,Timesheet
-apps/erpnext/erpnext/controllers/accounts_controller.py +228,{0} '{1}' is disabled,{0} '{1}' dinyahupayakan
+apps/erpnext/erpnext/controllers/accounts_controller.py +231,{0} '{1}' is disabled,{0} '{1}' dinyahupayakan
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Ditetapkan sebagai Open
 DocType: Cheque Print Template,Scanned Cheque,diimbas Cek
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Hantar e-mel automatik ke Kenalan ke atas urus niaga Mengemukakan.
+DocType: Timesheet,Total Billable Amount,Jumlah ditaksir
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Perkara 3
 DocType: Purchase Order,Customer Contact Email,Pelanggan Hubungi E-mel
 DocType: Warranty Claim,Item and Warranty Details,Perkara dan Jaminan Maklumat
 DocType: Sales Team,Contribution (%),Sumbangan (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Nota: Entry Bayaran tidak akan diwujudkan sejak &#39;Tunai atau Akaun Bank tidak dinyatakan
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Responsibilities,Tanggungjawab
+apps/erpnext/erpnext/controllers/accounts_controller.py +78,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
 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
@@ -2875,6 +2913,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Tambah Pengguna
 DocType: Pricing Rule,Item Group,Perkara Kumpulan
 DocType: Item,Safety Stock,Saham keselamatan
+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: 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)
@@ -2884,7 +2923,6 @@
 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: Timesheet,Total Hours,Jumlah Jam
 DocType: Journal Entry,Printing Settings,Tetapan Percetakan
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,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
@@ -2897,13 +2935,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Perbankan Pelaburan
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +71,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
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Pelanggan&gt; Kumpulan Pelanggan&gt; Wilayah
 DocType: Purchase Invoice Item,Rate,Kadar
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Intern,Pelatih
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,Pelatih
 DocType: Stock Entry,From BOM,Dari BOM
 DocType: Assessment,Assessment Code,Kod penilaian
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +32,Basic,Asas
+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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',Sila klik pada &#39;Menjana Jadual&#39;
+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 +95,Reference No is mandatory if you entered Reference Date,Rujukan adalah wajib jika anda masukkan Tarikh Rujukan
@@ -2912,11 +2951,11 @@
 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 +752,Issue Material,Isu Bahan
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +723,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 +683,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 +665,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.
 DocType: Hub Settings,Access Token,Token Akses
 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
@@ -2924,33 +2963,35 @@
 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 +1122,Enter value must be positive,Masukkan nilai mesti positif
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,All Territories,Semua Wilayah
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1125,Enter value must be positive,Masukkan nilai mesti positif
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,Semua Wilayah
 DocType: Purchase Invoice,Items,Item
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +23,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 +221,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 +233,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 +96,Request for Quotations,Tawaran Sebut Harga
+apps/erpnext/erpnext/hooks.py +104,Request for Quotations,Tawaran Sebut Harga
 DocType: Payment Reconciliation,Maximum Invoice Amount,Amaun Invois maksimum
 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 +628,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unit keingkaran Langkah untuk Variant &#39;{0}&#39; hendaklah sama seperti dalam Template &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unit keingkaran Langkah untuk Variant &#39;{0}&#39; hendaklah sama seperti dalam Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Kira Based On
 DocType: Delivery Note Item,From Warehouse,Dari Gudang
 DocType: Assessment,Supervisor Name,Nama penyelia
+DocType: Assessment,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
 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 +27,Default Address Template cannot be deleted,Templat Alamat lalai tidak boleh dipadam
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,Templat Alamat lalai tidak boleh dipadam
 DocType: Sales Invoice,Shipping Rule,Peraturan Penghantaran
 DocType: Manufacturer,Limited to 12 characters,Terhad kepada 12 aksara
 DocType: Journal Entry,Print Heading,Cetak Kepala
@@ -2965,8 +3006,8 @@
 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/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 +485,No default BOM exists for Item {0},Tidak lalai BOM wujud untuk Perkara {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +336,Please select Posting Date first,Sila pilih Penempatan Tarikh pertama
+apps/erpnext/erpnext/stock/get_item_details.py +486,No default BOM exists for Item {0},Tidak lalai BOM wujud untuk Perkara {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +326,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
@@ -2982,6 +3023,7 @@
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Pembayaran perlawanan dengan Invois
 DocType: Journal Entry,Bank Entry,Bank Entry
 DocType: Authorization Rule,Applicable To (Designation),Terpakai Untuk (Jawatan)
+,Profitability Analysis,Analisis keuntungan
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,Dalam Troli
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Group By
 DocType: Guardian,Interests,minat
@@ -2994,21 +3036,21 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,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 +141,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Perkara bersiri {0} tidak boleh dikemaskini \ menggunakan Saham Penyesuaian
 DocType: Scheduling Tool,Day,hari
 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 +122,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 +129,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
-DocType: Student Applicant,AP.,AP.
 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 +639,Point of Sale,Tempat Jualan
+apps/erpnext/erpnext/accounts/page/pos/pos.js +634,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
 DocType: Production Planning Tool,Production Planning Tool,Pengeluaran Alat Perancangan
@@ -3017,74 +3059,77 @@
 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 +373,Quantity to Manufacture must be greater than 0.,Kuantiti untuk pembuatan mesti lebih besar daripada 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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 Profile,Customer Group,Kumpulan pelanggan
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,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/doctype/asset/asset.py +83,Next Depreciation Date must be on or after today,Selepas Tarikh Susutnilai mestilah pada atau selepas hari ini
 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 +145,Please cancel Purchase Invoice {0} first,Sila membatalkan Invois Belian {0} pertama
 DocType: Serial No,AMC Expiry Date,AMC Tarikh Tamat
 ,Sales Register,Jualan Daftar
 DocType: Quotation,Quotation Lost Reason,Sebut Harga Hilang Akal
+apps/erpnext/erpnext/utilities/doctype/address/address.py +164,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.
 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 +330,Transaction reference no {0} dated {1},rujukan transaksi tidak {0} bertarikh {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,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 +107,Summary for this month and pending activities,Ringkasan untuk bulan ini dan aktiviti-aktiviti yang belum selesai
+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/accounts/doctype/sales_invoice/sales_invoice.py +406,Please remove this Invoice {0} from C-Form {1},Sila mengeluarkan Invois ini {0} dari C-Borang {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,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 +644,Get Items,Dapatkan Item
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +623,Get Items,Dapatkan Item
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +210,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 +41,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
 DocType: Payment Request,Initiated,Dimulakan
 DocType: Production Order,Planned Start Date,Dirancang Tarikh Mula
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,Customer is required against Receivable account {0},Pelanggan dikehendaki terhadap akaun Belum Terima {0}
 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 +265,Project-wise data is not available for Quotation,Data projek-bijak tidak tersedia untuk Sebutharga
+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 +101,Commercial,Perdagangan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,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: Supplier Quotation,Supplier Address,Alamat Pembekal
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +648,Row {0}# Account must be of type 'Fixed Asset',Row {0} # Akaun mestilah jenis &#39;Aset Tetap&#39;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,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 +30,Series is mandatory,Siri adalah wajib
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +50,Series is mandatory,Siri adalah wajib
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Perkhidmatan Kewangan
 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
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +165,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 +155,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Cr,Cr
 DocType: Tax Rule,Billing State,Negeri Bil
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +250,Transfer,Pemindahan
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +187,{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 +825,Fetch exploded BOM (including sub-assemblies),Kutip BOM meletup (termasuk sub-pemasangan)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +254,Transfer,Pemindahan
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +190,{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 +796,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 +115,Due Date is mandatory,Tarikh Akhir adalah wajib
+apps/erpnext/erpnext/controllers/accounts_controller.py +118,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
 DocType: Journal Entry,Pay To / Recd From,Bayar Untuk / Recd Dari
 DocType: Naming Series,Setup Series,Persediaan Siri
 DocType: Payment Reconciliation,To Invoice Date,Untuk invois Tarikh
 DocType: Supplier,Contact HTML,Hubungi HTML
 ,Inactive Customers,Pelanggan aktif
+DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Resit Pembelian
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Bagaimana Harga Peraturan digunakan?
 DocType: Quality Inspection,Delivery Note No,Penghantaran Nota Tiada
@@ -3093,7 +3138,7 @@
 DocType: Company,Retail,Runcit
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +120,Customer {0} does not exist,Pelanggan {0} tidak wujud
 DocType: Attendance,Absent,Tidak hadir
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +587,Product Bundle,Bundle Produk
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Product Bundle,Bundle Produk
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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
@@ -3103,8 +3148,8 @@
 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 +742,Send Supplier Emails,Hantar Email Pembekal
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +104,"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/buying/doctype/request_for_quotation/request_for_quotation.js +708,Send Supplier Emails,Hantar Email Pembekal
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,"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
 DocType: Guardian Interest,Guardian Interest,Guardian Faedah
 DocType: Timesheet,Employee Detail,Detail pekerja
@@ -3115,9 +3160,9 @@
 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}
 DocType: Salary Slip,Earning & Deduction,Pendapatan &amp; Potongan
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +77,Account {0} cannot be a Group,Akaun {0} tidak boleh menjadi Kumpulan
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} cannot be a Group,Akaun {0} tidak boleh menjadi Kumpulan
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +31,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 +107,Negative Valuation Rate is not allowed,Kadar Penilaian negatif tidak dibenarkan
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Kadar Penilaian negatif tidak dibenarkan
 DocType: Holiday List,Weekly Off,Mingguan Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Untuk contoh: 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +39,Provisional Profit / Loss (Credit),Sementara Untung / Rugi (Kredit)
@@ -3131,16 +3176,16 @@
 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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Pusat Kos adalah wajib bagi Perkara {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +626,Get Items from Product Bundle,Dapatkan Item daripada Fail Produk
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +605,Get Items from Product Bundle,Dapatkan Item daripada Fail Produk
 DocType: Asset,Straight Line,Garis lurus
 DocType: Project User,Project User,projek Pengguna
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} is inactive,Akaun {0} tidak aktif
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} is inactive,Akaun {0} tidak aktif
 DocType: GL Entry,Is Advance,Adalah Advance
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Kehadiran Dari Tarikh dan Kehadiran Untuk Tarikh adalah wajib
 apps/erpnext/erpnext/controllers/buying_controller.py +148,Please enter 'Is Subcontracted' as Yes or No,Sila masukkan &#39;Apakah Subkontrak&#39; seperti Ya atau Tidak
 DocType: Sales Team,Contact No.,Hubungi No.
 DocType: Bank Reconciliation,Payment Entries,Penyertaan pembayaran
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,'Profit and Loss' type account {0} not allowed in Opening Entry,'Untung dan Rugi' akaun jenis {0} tidak dibenarkan dalam Kemasukan Permulaan
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +71,'Profit and Loss' type account {0} not allowed in Opening Entry,'Untung dan Rugi' akaun jenis {0} tidak dibenarkan dalam Kemasukan Permulaan
 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
@@ -3159,7 +3204,7 @@
 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,Suruhanjaya Jualan
 DocType: Offer Letter Term,Value / Description,Nilai / Penerangan
-apps/erpnext/erpnext/controllers/accounts_controller.py +558,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} tidak boleh dikemukakan, ia sudah {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +561,"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: Production Order,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}.
@@ -3172,13 +3217,13 @@
 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/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Legal Expenses,Perbelanjaan Undang-undang
 DocType: Purchase Invoice,Posting Time,Penempatan Masa
-DocType: Sales Order,% Amount Billed,% Jumlah Dibilkan
+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.
 apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},No Perkara dengan Tiada Serial {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Pemberitahuan Terbuka
+DocType: Email Digest,Open Notifications,Pemberitahuan Terbuka
 DocType: Payment Entry,Difference Amount (Company Currency),Perbezaan Jumlah (Syarikat Mata Wang)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,Perbelanjaan langsung
 apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
@@ -3186,7 +3231,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,New Hasil Pelanggan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,Perbelanjaan Perjalanan
 DocType: Maintenance Visit,Breakdown,Pecahan
-apps/erpnext/erpnext/controllers/accounts_controller.py +634,Account: {0} with currency: {1} can not be selected,Akaun: {0} dengan mata wang: {1} tidak boleh dipilih
+apps/erpnext/erpnext/controllers/accounts_controller.py +637,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}
 DocType: Program Enrollment Tool,Student Applicants,Pemohon pelajar
@@ -3194,15 +3239,15 @@
 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 +56,Probation,Percubaan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Probation,Percubaan
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Komponen gaji
 DocType: Program Enrollment Tool,New Academic Year,New Akademik Tahun
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Payment of salary for the month {0} and year {1},Pembayaran gaji untuk bulan {0} dan tahun {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Payment of salary for the month {0} and year {1},Pembayaran gaji untuk bulan {0} dan tahun {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Masukkan Auto Kadar Senarai Harga jika hilang
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Jumlah Amaun Dibayar
 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 +144,Planning,Perancangan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,Perancangan
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,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
@@ -3215,11 +3260,10 @@
 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.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Sales invoice submitted sucessfully.,Invois jualan yang dikemukakan Berjaya.
 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}
 DocType: Assessment Result,Student Name,Nama pelajar
-apps/erpnext/erpnext/hooks.py +104,Assessment Schedule,Jadual penilaian
+apps/erpnext/erpnext/hooks.py +113,Assessment Schedule,Jadual penilaian
 DocType: Brand,Item Manager,Perkara Pengurus
 DocType: Buying Settings,Default Supplier Type,Default Jenis Pembekal
 DocType: Production Order,Total Operating Cost,Jumlah Kos Operasi
@@ -3229,6 +3273,7 @@
 DocType: GL Entry,Party Type,Jenis Parti
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +78,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
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Master template gaji.
 DocType: Leave Type,Max Days Leave Allowed,Max Hari Cuti dibenarkan
@@ -3240,18 +3285,19 @@
 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 +99,All Customer Groups,Semua Kumpulan Pelanggan
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +78,Accumulated Monthly,terkumpul Bulanan
-apps/erpnext/erpnext/controllers/accounts_controller.py +595,{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/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Semua Kumpulan Pelanggan
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +81,Accumulated Monthly,terkumpul Bulanan
+apps/erpnext/erpnext/controllers/accounts_controller.py +598,{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
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Senarai Harga Kadar (Syarikat mata wang)
 DocType: Products Settings,Products Settings,produk Tetapan
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +188,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
 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 +84,Secretary,Setiausaha
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,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
@@ -3260,24 +3306,22 @@
 ,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
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,Row # {0}: Tiada Serial adalah wajib
+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 +859,Supplier Quotation,Sebutharga Pembekal
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +838,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 +7,Collect Fees,memungut Yuran
+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}
 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.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Acara akan datang
 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/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
-DocType: Email Digest,Income / Expense,Pendapatan / Perbelanjaan
 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."
@@ -3288,13 +3332,14 @@
 DocType: Customer,From Lead,Dari Lead
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Perintah dikeluarkan untuk pengeluaran.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Pilih Tahun Anggaran ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,POS Profile required to make POS Entry,POS Profil dikehendaki membuat POS Entry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +509,POS Profile required to make POS Entry,POS Profil dikehendaki membuat POS Entry
 DocType: Program Enrollment Tool,Enroll Students,Daftarkan Pelajar
 DocType: Hub Settings,Name Token,Nama Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Jualan Standard
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Atleast one warehouse is mandatory,Atleast satu gudang adalah wajib
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +129,Atleast one warehouse is mandatory,Atleast satu gudang adalah wajib
 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 +330,{0} against Sales Invoice {1},{0} terhadap Invois Jualan  {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Nama Projek
@@ -3315,10 +3360,11 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,Daun mesti diperuntukkan dalam gandaan 0.5
 DocType: Production Order,Operation Cost,Operasi Kos
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,Memuat naik kehadiran dari fail csv
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,AMT Cemerlang
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Sasaran yang ditetapkan Perkara Kumpulan-bijak untuk Orang Jualan ini.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Stok Freeze Lama Than [Hari]
-apps/erpnext/erpnext/controllers/accounts_controller.py +528,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: Aset adalah wajib bagi aset tetap pembelian / penjualan
+apps/erpnext/erpnext/controllers/accounts_controller.py +531,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: Aset adalah wajib bagi aset tetap pembelian / penjualan
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Jika dua atau lebih Peraturan Harga yang didapati berdasarkan syarat-syarat di atas, Keutamaan digunakan. Keutamaan adalah nombor antara 0 hingga 20 manakala nilai lalai adalah sifar (kosong). Jumlah yang lebih tinggi bermakna ia akan diberi keutamaan jika terdapat berbilang Peraturan Harga dengan keadaan yang sama."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Tahun fiskal: {0} tidak wujud
 DocType: Currency Exchange,To Currency,Untuk Mata Wang
@@ -3335,15 +3381,15 @@
 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
-DocType: Sales Invoice,Exhibition,Pameran
 apps/erpnext/erpnext/utilities/doctype/address/address.py +77,"Company is mandatory, as it is your company address","Syarikat adalah wajib, kerana ia adalah alamat syarikat anda"
 DocType: Item Attribute,From Range,Dari Range
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +81,Syntax error in formula or condition: {0},Ralat sintaks dalam formula atau keadaan: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +92,Syntax error in formula or condition: {0},Ralat sintaks dalam formula atau keadaan: {0}
 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
+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 +28,Jobs,Pekerjaan
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,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
@@ -3352,16 +3398,16 @@
 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 +763,Make Supplier Quotation,Membuat Sebutharga Pembekal
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,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/controllers/sales_and_purchase_return.py +100,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 +42,Casual Leave,Cuti kasual
+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
 DocType: Batch,Batch ID,ID Batch
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,Note: {0},Nota: {0}
 ,Delivery Note Trends,Trend Penghantaran Nota
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +103,This Week's Summary,Ringkasan Minggu Ini
+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
 DocType: Student Group Creation Tool,Get Courses,Dapatkan Kursus
 DocType: GL Entry,Party,Parti
@@ -3371,7 +3417,7 @@
 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 +59,Piecework,Piecework
+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: Task,Actual Time (in Hours),Masa sebenar (dalam jam)
 DocType: Employee,History In Company,Sejarah Dalam Syarikat
@@ -3388,7 +3434,7 @@
 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.
 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 +162,Black,Black
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,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
@@ -3399,13 +3445,13 @@
 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 +69,Customer Id,Id Pelanggan
+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
 DocType: Journal Entry Account,Exchange Rate,Kadar pertukaran
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Sales Order {0} is not submitted,Sales Order {0} tidak dikemukakan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +527,Sales Order {0} is not submitted,Sales Order {0} tidak dikemukakan
 DocType: Homepage,Tag Line,Line tag
 DocType: Fee Component,Fee Component,Komponen Bayaran
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +857,Add items from,Tambah item dari
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +836,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}
 DocType: Cheque Print Template,Regular,biasa
 DocType: BOM,Last Purchase Rate,Kadar Pembelian lalu
@@ -3413,6 +3459,7 @@
 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
 ,Sales Person-wise Transaction Summary,Jualan Orang-bijak Transaksi Ringkasan
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +60,Cost Center is required for 'Profit and Loss' account {0}. Please set up a default Cost Center for the Company.,PTJ diperlukan untuk &#39;Untung Rugi&#39; akaun {0}. Sila menubuhkan Pusat Kos lalai untuk Syarikat.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,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
@@ -3423,12 +3470,12 @@
 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 +710,Online,talian
+apps/erpnext/erpnext/accounts/page/pos/pos.js +692,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 +16,Setting this Address Template as default as there is no other default,Menetapkan Templat Alamat ini sebagai lalai kerana tidak ada default lain
+apps/erpnext/erpnext/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
 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 +74,Quality Management,Pengurusan Kualiti
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,Pengurusan Kualiti
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} has been disabled,Perkara {0} telah dilumpuhkan
 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
@@ -3450,11 +3497,12 @@
 DocType: Student,Student Email ID,Pelajar Email ID
 DocType: Employee,Notice (days),Notis (hari)
 DocType: Tax Rule,Sales Tax Template,Template Cukai Jualan
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1520,Select items to save the invoice,Pilih item untuk menyelamatkan invois
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1544,Select items to save the invoice,Pilih item untuk menyelamatkan invois
 DocType: Employee,Encashment Date,Penunaian Tarikh
 DocType: Account,Stock Adjustment,Pelarasan saham
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Kos Aktiviti lalai wujud untuk Jenis Kegiatan - {0}
 DocType: Production Order,Planned Operating Cost,Dirancang Kos Operasi
+DocType: Academic Term,Term Start Date,Term Tarikh Mula
 apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},Dilampirkan {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Baki Penyata Bank seperti Lejar Am
 DocType: Job Applicant,Applicant Name,Nama pemohon
@@ -3484,17 +3532,17 @@
 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.
 DocType: Company,Distribution,Pengagihan
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +8,Amount Paid,Amaun Dibayar
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Project Manager,Pengurus Projek
+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
 ,Quoted Item Comparison,Perkara dipetik Perbandingan
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Dispatch,Dispatch
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,Dispatch
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max diskaun yang dibenarkan untuk item: {0} adalah {1}%
 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.
-DocType: Sales Invoice,Supplier Reference,Rujukan Pembekal
-apps/erpnext/erpnext/accounts/page/pos/pos.js +844,"Master data syncing, it might take some time","Master penyegerakan data, ia mungkin mengambil sedikit masa"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +832,"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
@@ -3508,7 +3556,7 @@
 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 +83,Error in formula or condition,Ralat dalam formula atau keadaan
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,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
@@ -3517,7 +3565,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},Tarikh perlu berada dalam Tahun Fiskal. Dengan mengandaikan Untuk Tarikh = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Di sini anda boleh mengekalkan ketinggian, berat badan, alahan, masalah kesihatan dan lain-lain"
 DocType: Leave Block List,Applies to Company,Terpakai kepada Syarikat
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +197,Cannot cancel because submitted Stock Entry {0} exists,Tidak boleh membatalkan kerana dikemukakan Saham Entry {0} wujud
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +198,Cannot cancel because submitted Stock Entry {0} exists,Tidak boleh membatalkan kerana dikemukakan Saham Entry {0} wujud
 DocType: Purchase Invoice,In Words,Dalam Perkataan
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,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
@@ -3527,14 +3575,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,Tahun kewangan anda bermula pada
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Penurunan nilai aset dan Baki
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +319,Amount {0} {1} transferred from {2} to {3},Jumlah {0} {1} dipindahkan dari {2} kepada {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +322,Amount {0} {1} transferred from {2} to {3},Jumlah {0} {1} dipindahkan dari {2} kepada {3}
 DocType: Sales Invoice,Get Advances Received,Mendapatkan Pendahuluan Diterima
 DocType: Email Digest,Add/Remove Recipients,Tambah / Buang Penerima
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +432,Transaction not allowed against stopped Production Order {0},Transaksi tidak dibenarkan terhadap Pengeluaran berhenti Perintah {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +437,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 +143,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 +652,Item variant {0} exists with same attributes,Varian item {0} wujud dengan ciri yang sama
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Varian item {0} wujud dengan ciri yang sama
+DocType: Leave Application,LAP/,LAP /
 DocType: Salary Slip,Salary Slip,Slip Gaji
 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
@@ -3542,12 +3591,12 @@
 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 +212,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 +215,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/public/js/controllers/transaction.js +866,It is needed to fetch Item Details.,Ia diperlukan untuk mengambil Butiran Item.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +857,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
@@ -3557,14 +3606,14 @@
 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 +178,Invalid {0},Tidak sah {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Sick Leave,Cuti Sakit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,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
 DocType: Warehouse,PIN,PIN
 DocType: Sales Invoice,Base Change Amount (Company Currency),Tukar Jumlah Asas (Syarikat Mata Wang)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +313,No accounting entries for the following warehouses,Tiada catatan perakaunan bagi gudang berikut
-apps/erpnext/erpnext/projects/doctype/project/project.js +102,Save the document first.,Simpan dokumen pertama.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +314,No accounting entries for the following warehouses,Tiada catatan perakaunan bagi gudang berikut
+apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Simpan dokumen pertama.
 DocType: Account,Chargeable,Boleh dikenakan cukai
 DocType: Company,Change Abbreviation,Perubahan Singkatan
 DocType: Expense Claim Detail,Expense Date,Perbelanjaan Tarikh
@@ -3577,10 +3626,9 @@
 DocType: Purchase Invoice,Recurring Print Format,Format Cetak berulang
 DocType: C-Form,Series,Siri
 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
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,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
 DocType: Appraisal,Appraisal Template,Templat Penilaian
 DocType: Item Group,Item Classification,Item Klasifikasi
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Business Development Manager,Pengurus Pembangunan Perniagaan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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
@@ -3590,8 +3638,8 @@
 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 +940,Please select {0} first,Sila pilih {0} pertama
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +749,Batch {0} of Item {1} has expired.,Batch {0} Item {1} telah tamat.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +953,Please select {0} first,Sila pilih {0} pertama
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +757,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
@@ -3608,8 +3656,8 @@
 {% 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 +92,Warehouse not found in the system,Gudang tidak dijumpai di dalam sistem
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +106,This Month's Summary,Ringkasan ini Bulan ini
+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
 DocType: Quality Inspection Reading,Quality Inspection Reading,Kualiti Pemeriksaan Reading
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Bekukan Stok Yang Lebih Lama Dari` hendaklah lebih kecil daripada %d hari.
 DocType: Tax Rule,Purchase Tax Template,Membeli Template Cukai
@@ -3619,21 +3667,22 @@
 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 +87,Please set Next Depreciation Date,Sila menetapkan Selepas Tarikh Susutnilai
-DocType: Payment Gateway,Payment Gateway,Gateway Pembayaran
 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 +378,Operation Time must be greater than 0 for Operation {0},Masa operasi mesti lebih besar daripada 0 untuk operasi {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +380,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
 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)
 DocType: Program,Program Abbreviation,Singkatan program
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,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: Appraisal,Start Date,Tarikh Mula
@@ -3649,21 +3698,22 @@
 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
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Contohnya. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +27,Transaction currency must be same as Payment Gateway currency,Mata wang urus niaga mesti sama dengan mata wang Pembayaran Gateway
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Transaction currency must be same as Payment Gateway currency,Mata wang urus niaga mesti sama dengan mata wang Pembayaran Gateway
 DocType: Payment Entry,Receive,Menerima
+apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,Sebutharga:
 DocType: Maintenance Visit,Fully Completed,Siap Sepenuhnya
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Lengkap
 DocType: Employee,Educational Qualification,Kelayakan pendidikan
 DocType: Workstation,Operating Costs,Kos operasi
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Tindakan jika Terkumpul Anggaran Bulanan Melebihi
 DocType: Purchase Invoice,Submit on creation,Mengemukakan kepada penciptaan
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +432,Currency for {0} must be {1},Mata wang untuk {0} mesti {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +435,Currency for {0} must be {1},Mata wang untuk {0} mesti {1}
 DocType: Asset,Disposal Date,Tarikh pelupusan
 DocType: Employee Leave Approver,Employee Leave Approver,Pekerja Cuti Pelulus
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,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 +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/crm/doctype/opportunity/opportunity.py +79,"Cannot declare as lost, because Quotation has been made.","Tidak boleh mengaku sebagai hilang, kerana Sebutharga telah dibuat."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Pembelian Master Pengurus
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +429,Production Order {0} must be submitted,Pengeluaran Pesanan {0} hendaklah dikemukakan
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +434,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
@@ -3673,25 +3723,27 @@
 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/accounts/report/general_ledger/general_ledger.py +181,Totals,Jumlah
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,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 +113,Warning: Leave application contains following block dates,Amaran: Tinggalkan permohonan mengandungi tarikh blok berikut
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +120,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.
+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 +181,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/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 +793,All records are synced.,Semua rekod disegerakkan.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +781,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
 DocType: Cost Center,Cost Center Name,Kos Nama Pusat
@@ -3710,21 +3762,20 @@
 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/selling/doctype/quotation/quotation.py +49,Cannot set as Lost as Sales Order is made.,Tidak boleh ditetapkan sebagai Kalah sebagai Sales Order dibuat.
-DocType: Student Applicant,Mother's Name,Nama ibu
 DocType: Request for Quotation Item,Supplier Part No,Pembekal bahagian No
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +348,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Tidak dapat menolak apabila kategori adalah untuk &#39;Penilaian&#39; atau &#39;Vaulation dan Jumlah&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Received From,Pemberian
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Received From,Pemberian
 DocType: Lead,Converted,Ditukar
 DocType: Item,Has Serial No,Mempunyai No Siri
 DocType: Employee,Date of Issue,Tarikh Keluaran
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{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 +93,Row {0}: Hours value must be greater than zero.,Row {0}: Nilai Waktu mesti lebih besar daripada sifar.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +117,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
 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 +172,{0} {1} does not exist,{0} {1} tidak wujud
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +175,{0} {1} does not exist,{0} {1} tidak wujud
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,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 +72,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
@@ -3733,13 +3784,14 @@
 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/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
 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 +109,Electrical,Elektrik
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,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 +318,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}
@@ -3747,7 +3799,7 @@
 DocType: Item,Customer Code,Kod Pelanggan
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +210,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 +292,Debit To account must be a Balance Sheet account,Debit Untuk akaun perlu menjadi akaun Kunci Kira-kira
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To account must be a Balance Sheet account,Debit Untuk akaun perlu menjadi akaun Kunci Kira-kira
 DocType: Buying Settings,Naming Series,Menamakan Siri
 DocType: Leave Block List,Leave Block List Name,Tinggalkan Nama Sekat Senarai
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Aset saham
@@ -3759,11 +3811,11 @@
 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 +301,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 +313,Salary Slip of employee {0} already created for time sheet {1},Slip Gaji pekerja {0} telah dicipta untuk lembaran masa {1}
 DocType: Sales Order Item,Ordered Qty,Mengarahkan Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +673,Item {0} is disabled,Perkara {0} dilumpuhkan
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,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 +838,BOM does not contain any stock item,BOM tidak mengandungi apa-apa butiran saham
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +809,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.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Menjana Gaji Slip
@@ -3771,23 +3823,24 @@
 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)
-apps/erpnext/erpnext/stock/doctype/item/item.py +485,Row #{0}: Please set reorder quantity,Row # {0}: Sila menetapkan kuantiti pesanan semula
+DocType: Sales Invoice Timesheet,Billing Hours,Waktu Billing
+apps/erpnext/erpnext/stock/doctype/item/item.py +487,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 +62,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
+DocType: Payment Entry,Allocate Payment Amount,Memperuntukkan Jumlah Pembayaran
 DocType: Employee External Work History,Salary,Gaji
 DocType: Serial No,Delivery Document Type,Penghantaran Dokumen Jenis
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Hantar semua slip gaji bagi kriteria yang dipilih di atas
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} perkara-perkara telah diselaraskan
 DocType: Sales Order,Partly Delivered,Sebahagiannya Dihantar
-DocType: Sales Invoice,Existing Customer,Pelanggan sedia ada
 DocType: Email Digest,Receivables,Penghutang
+DocType: Lead Source,Lead Source,Lead Source
 DocType: Customer,Additional information regarding the customer.,Maklumat tambahan mengenai pelanggan.
 DocType: Quality Inspection Reading,Reading 5,Membaca 5
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +38,Campaign Name is required,Nama Kempen diperlukan
 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
@@ -3795,10 +3848,9 @@
 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 +129,BOM and Manufacturing Quantity are required,BOM dan Pembuatan Kuantiti dikehendaki
+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/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Range Penuaan 2
 DocType: SG Creation Tool Course,Max Strength,Max Kekuatan
-DocType: Bank Reconciliation Detail,Amount,Jumlah
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM digantikan
 ,Sales Analytics,Jualan Analytics
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +113,Available {0},Terdapat {0}
@@ -3806,14 +3858,14 @@
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Menubuhkan E-mel
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +96,Please enter default currency in Company Master,Sila masukkan mata wang lalai dalam Syarikat Induk
 DocType: Stock Entry Detail,Stock Entry Detail,Detail saham Entry
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +100,Daily Reminders,Peringatan Harian
+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/account/account_tree.js +23,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 +71,Customer Service,Khidmat Pelanggan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Customer Service,Khidmat Pelanggan
 DocType: Homepage Featured Product,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.
@@ -3822,8 +3874,9 @@
 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
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Kerja Lalai Dalam Kemajuan Warehouse
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1570,Total nos of serial no is not equal to quantity.,Jumlah nos tidak bersiri tidak sama dengan kuantiti.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1594,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
@@ -3831,9 +3884,10 @@
 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 +82,Engineer,Jurutera
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,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 +370,Item Code required at Row No {0},Kod Item diperlukan semasa Row Tiada {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +398,Item Code required at Row No {0},Kod Item diperlukan semasa Row Tiada {0}
 DocType: Sales Partner,Partner Type,Rakan Jenis
 DocType: Purchase Taxes and Charges,Actual,Sebenar
 DocType: Authorization Rule,Customerwise Discount,Customerwise Diskaun
@@ -3849,16 +3903,18 @@
 DocType: BOM,Raw Material Cost,Kos bahan mentah
 DocType: Item Reorder,Re-Order Level,Re-Order Level
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Masukkan item dan qty dirancang yang mana anda mahu untuk meningkatkan pesanan pengeluaran atau memuat turun bahan-bahan mentah untuk analisis.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +55,Part-time,Sambilan
+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
 DocType: Employee,Applicable Holiday List,Senarai Holiday berkenaan
 DocType: Employee,Cheque,Cek
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Siri Dikemaskini
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +57,Series Updated,Siri Dikemaskini
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Jenis Laporan adalah wajib
 DocType: Item,Serial Number Series,Nombor Siri Siri
 apps/erpnext/erpnext/buying/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 +87,Clearance Date updated,Clearance Tarikh update
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Berjaya didamaikan
@@ -3872,7 +3928,7 @@
 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 +513,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 +518,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.
@@ -3882,7 +3938,7 @@
 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/stock/doctype/stock_entry/stock_entry.py +158,Target warehouse in row {0} must be same as Production Order,Gudang sasaran berturut-turut {0} mestilah sama dengan Perintah Pengeluaran
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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
 DocType: Company,Round Off Account,Bundarkan Akaun
@@ -3891,23 +3947,22 @@
 DocType: Customer Group,Parent Customer Group,Ibu Bapa Kumpulan Pelanggan
 DocType: Purchase Invoice,Contact Email,Hubungi E-mel
 DocType: Appraisal Goal,Score Earned,Skor Diperoleh
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Notice Period,Tempoh notis
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,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 +4,New Sales Person Name,Nama New Orang Sales
 DocType: Packing Slip,Gross Weight UOM,Berat kasar UOM
-DocType: Email Digest,Receivables / Payables,Penghutang / Pemiutang
 DocType: Delivery Note Item,Against Sales Invoice,Terhadap Invois Jualan
 DocType: Bin,Reserved Qty for Production,Cipta Terpelihara Kuantiti untuk Pengeluaran
 DocType: Asset,Frequency of Depreciation (Months),Kekerapan Susutnilai (Bulan)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +469,Credit Account,Akaun Kredit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Credit Account,Akaun Kredit
 DocType: Landed Cost Item,Landed Cost Item,Tanah Kos Item
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +55,Show zero values,Menunjukkan nilai-nilai sifar
+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
 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 +647,Please specify Attribute Value for attribute {0},Sila nyatakan Atribut Nilai untuk atribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Sila nyatakan Atribut Nilai untuk atribut {0}
 DocType: Item,Default Warehouse,Gudang Default
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +39,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
@@ -3929,19 +3984,22 @@
 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
-DocType: Sales Invoice,Cold Calling,Panggilan Dingin
 DocType: SMS Parameter,SMS Parameter,SMS Parameter
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,Belanjawan dan PTJ
 DocType: Maintenance Schedule Item,Half Yearly,Setengah Tahunan
 DocType: Lead,Blog Subscriber,Blog Pelanggan
+DocType: Guardian,Alternate Number,Nombor Ganti
 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.
+DocType: Stock Reconciliation Item,Quantity Difference,kuantiti Perbezaan
 apps/erpnext/erpnext/config/hr.py +253,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 +141,Set as Lost,Ditetapkan sebagai Hilang
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,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 +5,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
 DocType: Supplier,Credit Days Based On,Hari Kredit Berasaskan
@@ -3953,11 +4011,10 @@
 ,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 +941,Select or add new customer,Pilih atau menambah pelanggan baru
+apps/erpnext/erpnext/accounts/page/pos/pos.js +930,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 +5,This is based on the attendance of this Employee,Ini adalah berdasarkan kepada kehadiran pekerja ini
-DocType: Sales Invoice,Frequency,kekerapan
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +463,Debit Account,Akaun Debit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,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)
@@ -3966,27 +4023,27 @@
 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 +210,Supplier Quotation {0} created,Sebutharga Pembekal {0} dicipta
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +208,Supplier Quotation {0} created,Sebutharga Pembekal {0} dicipta
 apps/erpnext/erpnext/accounts/report/financial_statements.py +90,End Year cannot be before Start Year,Akhir Tahun tidak boleh sebelum Start Tahun
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Employee Benefits,Manfaat Pekerja
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,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 +228,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 +232,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 +499,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 +500,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 +1007,Price List not found or disabled,Senarai Harga tidak dijumpai atau orang kurang upaya
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1008,Price List not found or disabled,Senarai Harga tidak dijumpai atau orang kurang upaya
 DocType: Expense Claim,Approved,Diluluskan
 DocType: Pricing Rule,Price,Harga
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +244,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 +256,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
@@ -3997,12 +4054,12 @@
 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 +259,Please select Employee Record first.,Sila pilih Rakam Pekerja pertama.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +266,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 +190,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 +235,Please enter Expense Account,Sila masukkan Akaun Perbelanjaan
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,Please enter Expense Account,Sila masukkan Akaun Perbelanjaan
 DocType: Account,Stock,Saham
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,"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 +976,"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
@@ -4017,9 +4074,10 @@
 DocType: Asset Movement,Transaction Date,Transaksi Tarikh
 DocType: Production Plan Item,Planned Qty,Dirancang Kuantiti
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,Jumlah Cukai
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,For Quantity (Manufactured Qty) is mandatory,Untuk Kuantiti (Dikilangkan Qty) adalah wajib
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,For Quantity (Manufactured Qty) is mandatory,Untuk Kuantiti (Dikilangkan Qty) adalah wajib
 DocType: Stock Entry,Default Target Warehouse,Default Gudang Sasaran
 DocType: Purchase Invoice,Net Total (Company Currency),Jumlah bersih (Syarikat mata wang)
+apps/erpnext/erpnext/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 +78,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: Production Order,Actual Start Date,Tarikh Mula Sebenar
@@ -4034,9 +4092,11 @@
 DocType: Warranty Claim,If different than customer address,Jika berbeza daripada alamat pelanggan
 DocType: BOM Operation,BOM Operation,BOM Operasi
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Pada Row Jumlah Sebelumnya
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +226,Transfer Asset,pemindahan Aset
+DocType: Student,Home Address,Alamat rumah
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +227,Transfer Asset,pemindahan Aset
 DocType: POS Profile,POS Profile,POS Profil
 apps/erpnext/erpnext/config/schools.py +33,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 +129,"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
@@ -4046,8 +4106,8 @@
 DocType: Assessment,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 +765,Material to Supplier,Bahan kepada Pembekal
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +189,Excise Invoice,Cukai Invois
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,Material to Supplier,Bahan kepada Pembekal
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,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
@@ -4057,7 +4117,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,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 +136,Credit Card,Kad Kredit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,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.
 DocType: Purchase Invoice,Next Date,Tarikh seterusnya
@@ -4065,6 +4125,7 @@
 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: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Di sini anda boleh mengekalkan butiran keluarga seperti nama dan pekerjaan ibu bapa, suami atau isteri dan anak-anak"
+DocType: Academic Term,Term End Date,Term Tarikh Tamat
 DocType: Hub Settings,Seller Name,Nama Penjual
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Cukai dan Caj Dipotong (Syarikat mata wang)
 DocType: Item Group,General Settings,Tetapan umum
@@ -4076,7 +4137,7 @@
 DocType: Customer,Commission Rate,Kadar komisen
 apps/erpnext/erpnext/stock/doctype/item/item.js +261,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 +115,"Payment Type must be one of Receive, Pay and Internal Transfer","Jenis bayaran mesti menjadi salah satu Menerima, Bayar dan Pindahan Dalaman"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +118,"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/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Troli kosong
 DocType: Production Order,Actual Operating Cost,Kos Sebenar Operasi
@@ -4091,10 +4152,10 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,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 +92,Designer,Designer
+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
 DocType: Serial No,Delivery Details,Penghantaran Details
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +469,Cost Center is required in row {0} in Taxes table for type {1},PTJ diperlukan berturut-turut {0} dalam Cukai meja untuk jenis {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +472,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
 ,Item-wise Purchase Register,Perkara-bijak Pembelian Daftar
 DocType: Batch,Expiry Date,Tarikh Luput
@@ -4104,12 +4165,12 @@
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Induk projek.
 apps/erpnext/erpnext/controllers/status_updater.py +174,"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 +417, (Half Day),(Separuh Hari)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425, (Half Day),(Separuh Hari)
 DocType: Supplier,Credit Days,Hari Kredit
 DocType: Leave Type,Is Carry Forward,Apakah Carry Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +740,Get Items from BOM,Dapatkan Item dari BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +711,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 +549,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/controllers/accounts_controller.py +552,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
diff --git a/erpnext/translations/my.csv b/erpnext/translations/my.csv
index ece7338..569ea05 100644
--- a/erpnext/translations/my.csv
+++ b/erpnext/translations/my.csv
@@ -18,11 +18,10 @@
 DocType: Sales Partner,Dealer,အရောင်းကိုယ်စားလှယ်
 DocType: Employee,Rented,ငှားရမ်းထားသော
 DocType: Purchase Order,PO-,ရည်ညွှန်း
-apps/erpnext/erpnext/accounts/report/financial_statements.py +19,Start Year {0} not found.,Start ကိုတစ်နှစ်တာ {0} ကိုတွေ့မဟုတ်။
 DocType: POS Profile,Applicable for User,အသုံးပြုသူများအတွက်သက်ဆိုင်သော
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +191,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",ထုတ်လုပ်မှုအမိန့်ကိုပယ်ဖျက်ဖို့ပထမဦးဆုံးက Unstop ဖျက်သိမ်းလိုက်ရမရနိုင်ပါရပ်တန့်
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +197,Do you really want to scrap this asset?,သင်အမှန်တကယ်ဒီပိုင်ဆိုင်မှုဖျက်သိမ်းရန်ချင်ပါသလား
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +17,Select Default Supplier,ပုံမှန်ပေးသွင်းကို Select လုပ်ပါ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +192,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",ထုတ်လုပ်မှုအမိန့်ကိုပယ်ဖျက်ဖို့ပထမဦးဆုံးက Unstop ဖျက်သိမ်းလိုက်ရမရနိုင်ပါရပ်တန့်
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +198,Do you really want to scrap this asset?,သင်အမှန်တကယ်ဒီပိုင်ဆိုင်မှုဖျက်သိမ်းရန်ချင်ပါသလား
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,ပုံမှန်ပေးသွင်းကို Select လုပ်ပါ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},ငွေကြေးစျေးနှုန်းစာရင်း {0} သည်လိုအပ်သည်
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* ထိုအရောင်းအဝယ်အတွက်တွက်ချက်ခြင်းကိုခံရလိမ့်မည်။
 DocType: Address,County,ကောင်တီ
@@ -42,46 +41,45 @@
 DocType: Sales Invoice,Customer Name,ဖောက်သည်အမည်
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +126,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 +180,Outstanding for {0} cannot be less than zero ({1}),ထူးချွန် {0} သုည ({1}) ထက်နည်းမဖြစ်နိုင်
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,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 +148,Series Updated Successfully,စီးရီးအောင်မြင်စွာကျင်းပပြီးစီး Updated
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +149,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,အားလုံးသည်ပေးသွင်းဆက်သွယ်ရန်
-DocType: Quality Inspection Reading,Parameter,parameter
 apps/erpnext/erpnext/projects/doctype/project/project.py +54,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 +239,New Leave Application,နယူးထွက်ခွာလျှောက်လွှာ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,New Leave Application,နယူးထွက်ခွာလျှောက်လွှာ
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +20,Attendance Record {0} exists against Student {1} for Course Schedule {2},တက်ရောက်သူမှတ်တမ်း {0} ကျောင်းသားသမဂ္ဂ {1} သင်တန်းအတှကျဇယား {2} ဆန့်ကျင်တည်ရှိ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Bank Draft,ဘဏ်မှမူကြမ်း
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,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
 DocType: Academic Term,Academic Term,ပညာရေးဆိုင်ရာ Term
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +13,Material,ပစ္စည်း
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Quantity,အရေအတွက်
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +511,Accounts table cannot be blank.,စားပွဲအလွတ်မဖွစျနိုငျအကောင့်။
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +616,Quantity,အရေအတွက်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +512,Accounts table cannot be blank.,စားပွဲအလွတ်မဖွစျနိုငျအကောင့်။
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,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/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 +142,User {0} is already assigned to Employee {1},အသုံးပြုသူ {0} ပြီးသားန်ထမ်း {1} မှတာဝန်ပေးသည်
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,ကျန်းမာရေးစောင့်ရှောက်မှု
-DocType: Purchase Invoice,Monthly,လစဉ်
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),ငွေပေးချေမှုအတွက်နှောင့်နှေး (နေ့ရက်များ)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +771,Invoice,ဝယ်ကုန်စာရင်း
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +750,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 +198,Row {0}: {1} {2} does not match with {3},row {0}: {1} {2} {3} နှင့်အတူလိုက်ဖက်ပါဘူး
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,row # {0}:
+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 +127,Please select Price List,စျေးနှုန်း List ကို select လုပ်ပါ ကျေးဇူးပြု.
@@ -112,8 +110,8 @@
 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 +589,Get items from,အထဲကပစ္စည်းတွေကို Get
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +382,Stock cannot be updated against Delivery Note {0},စတော့အိတ် Delivery မှတ်ချက် {0} ဆန့်ကျင် updated မရနိုင်ပါ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,အထဲကပစ္စည်းတွေကို Get
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,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,ပြန်လည်သင့်မြတ်
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,ကုန်စုံ
@@ -122,7 +120,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 +156,Salary Structure Missing,လစာဖွဲ့စည်းပုံပျောက်ဆုံး
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Salary Structure Missing,လစာဖွဲ့စည်းပုံပျောက်ဆုံး
 DocType: Lead,Person Name,လူတစ်ဦးအမည်
 DocType: Sales Invoice Item,Sales Invoice Item,အရောင်းပြေစာ Item
 DocType: Account,Credit,အကြွေး
@@ -130,10 +128,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,ဂိုဒေါင် Detail
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,Credit limit has been crossed for customer {0} {1}/{2},ခရက်ဒစ်န့်သတ်ချက် {1} / {2} {0} ဖောက်သည်များအတွက်ကူးခဲ့
-apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","ပိုင်ဆိုင်မှုစံချိန်ပစ္စည်းဆန့်ကျင်တည်ရှိအဖြစ်, ထိနျးခြုပျမဖွစျနိုငျ &quot;Fixed Asset ရှိ၏&quot;"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +189,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;"
 DocType: Tax Rule,Tax Type,အခွန် Type အမျိုးအစား
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +144,You are not authorized to add or update entries before {0},သင် {0} ခင် entries တွေကို add သို့မဟုတ် update ကိုမှခွင့်ပြုမထား
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,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/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) * အမှန်တကယ်စစ်ဆင်ရေးအချိန်
@@ -143,18 +142,17 @@
 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 +165,Opening,ဖွင့်ပွဲ
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,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/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ဖောက်သည်&gt; ဖောက်သည်အုပ်စု&gt; နယ်မြေတွေကို
 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.,လက်ရှိငွေပေးငွေယူနှင့်အတူအကောင့်ကိုအုပ်စုအဖြစ်ပြောင်းလဲမရနိုင်ပါ။
 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,ပထမဦးဆုံးကုမ္ပဏီတစ်ခုကိုရိုက်ထည့်ပေးပါ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Company first,ကုမ္ပဏီပထမဦးဆုံးကိုရွေးပါ ကျေးဇူးပြု.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,Please select Company first,ကုမ္ပဏီပထမဦးဆုံးကိုရွေးပါ ကျေးဇူးပြု.
 DocType: Employee Education,Under Graduate,ဘွဲ့လွန်အောက်မှာ
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Target ကတွင်
 DocType: BOM,Total Cost,စုစုပေါင်းကုန်ကျစရိတ်
@@ -164,7 +162,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,အကောင့်၏ထုတ်ပြန်ကြေညာချက်
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,ဆေးဝါးများ
 DocType: Purchase Invoice Item,Is Fixed Asset,Fixed Asset Is
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Available qty is {0}, you need {1}","ရရှိနိုင်အရည်အတွက် {0}, သငျသညျ {1} လိုအပ်သည်"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +225,"Available qty is {0}, you need {1}","ရရှိနိုင်အရည်အတွက် {0}, သငျသညျ {1} လိုအပ်သည်"
 DocType: Expense Claim Detail,Claim Amount,ပြောဆိုချက်ကိုငွေပမာဏ
 DocType: Employee,Mr,ဦး
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,ပေးသွင်း Type / ပေးသွင်း
@@ -173,25 +171,26 @@
 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: Assessment Result,Grade,grade
 DocType: Sales Invoice Item,Delivered By Supplier,ပေးသွင်းခြင်းအားဖြင့်ကယ်နှုတ်တော်မူ၏
 DocType: SMS Center,All Contact,အားလုံးသည်ဆက်သွယ်ရန်
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Annual Salary,နှစ်ပတ်လည်လစာ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,စတော့အိတ်အသုံးစရိတ်များ
-apps/erpnext/erpnext/accounts/report/financial_statements.py +22,End Year {0} not found.,အဆုံးတစ်နှစ်တာ {0} ကိုတွေ့မဟုတ်။
 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} သည်ရရှိထားသည့်အရေအတွက်နှင့်ညီမျှဖြစ်ရမည်ငြင်းပယ်
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,ဝယ်ယူခြင်းအဘို့အ supply ကုန်ကြမ်း
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +130,At least one mode of payment is required for POS invoice.,ငွေပေးချေမှု၏အနည်းဆုံး mode ကို POS ငွေတောင်းခံလွှာဘို့လိုအပ်ပါသည်။
 DocType: Products Settings,Show Products as a List,တစ်ဦးစာရင်းအဖြစ် Show ကိုထုတ်ကုန်များ
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Template ကို Download, သင့်လျော်သောအချက်အလက်ဖြည့်စွက်ခြင်းနှင့်ပြုပြင်ထားသောဖိုင်ပူးတွဲ။ ရွေးချယ်ထားတဲ့ကာလအတွက်အားလုံးသည်ရက်စွဲများနှင့်ဝန်ထမ်းပေါင်းစပ်လက်ရှိတက်ရောက်သူမှတ်တမ်းများနှင့်တကွ, template မှာရောက်လိမ့်မည်"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +451,Item {0} is not active or end of life has been reached,item {0} တက်ကြွသို့မဟုတ်အသက်၏အဆုံးသည်မဖြစ်သေးရောက်ရှိခဲ့သည်
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +456,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/controllers/accounts_controller.py +614,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","အခွန်ကိုထည့်သွင်းရန်အတန်းအတွက် {0} Item မှုနှုန်း, အတန်း {1} အတွက်အခွန်ကိုလည်းထည့်သွင်းရပါမည်"
+apps/erpnext/erpnext/controllers/accounts_controller.py +617,"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 +166,Settings for HR Module,HR Module သည် Settings ကို
 DocType: SMS Center,SMS Center,SMS ကို Center က
 DocType: Sales Invoice,Change Amount,ပြောင်းလဲမှုပမာဏ
@@ -203,13 +202,13 @@
 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 +147,Execution,သတ်ခြင်း
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Execution,သတ်ခြင်း
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,ထိုစစ်ဆင်ရေး၏အသေးစိတျထုတျဆောင်သွားကြ၏။
 DocType: Serial No,Maintenance Status,ပြုပြင်ထိန်းသိမ်းမှုနဲ့ Status
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,ပစ္စည်းများနှင့်စျေးနှုန်းများ
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},စုစုပေါင်းနာရီ: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},နေ့စွဲကနေဘဏ္ဍာရေးနှစ်တစ်နှစ်တာအတွင်းတွင်သာဖြစ်သင့်သည်။ နေ့စွဲ မှစ. ယူဆ = {0}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,Cost Center {0} does not belong to Company {1},Center က {0} ကုန်ကျကုမ္ပဏီ {1} ပိုင်ပါဘူး
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +100,Cost Center {0} does not belong to Company {1},Center က {0} ကုန်ကျကုမ္ပဏီ {1} ပိုင်ပါဘူး
 DocType: Customer,Individual,တစ်ဦးချင်း
 DocType: Interest,Academics User,ပညာရှင်တွေအသုံးပြုသူတို့၏
 DocType: Cheque Print Template,Amount In Figure,ပုံထဲမှာပမာဏ
@@ -225,30 +224,32 @@
 DocType: Production Planning Tool,Sales Orders,အရောင်းအမှာ
 DocType: Purchase Taxes and Charges,Valuation,အဘိုးထားခြင်း
 ,Purchase Order Trends,အမိန့်ခေတ်ရေစီးကြောင်းဝယ်ယူ
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,The request for quotation can be accessed by clicking on the following link,quotation အဘို့မေတ္တာရပ်ခံချက်ကိုအောက်ပါ link ကိုနှိပ်ခြင်းအားဖြင့်ဝင်ရောက်စေနိုင်သည်
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,ယခုနှစ်သည်အရွက်ခွဲဝေချထားပေးရန်။
 DocType: SG Creation Tool Course,SG Creation Tool Course,စင်ကာပူဒေါ်လာဖန်ဆင်းခြင်း Tool ကိုသင်တန်းအမှတ်စဥ်
 DocType: Student Group Creation Tool,Leave blank if you wish to fetch all courses for selected academic term,သင်ရွေးချယ်ထားသောပညာသင်နှစ်သက်တမ်းအတွက်အားလုံးသင်တန်းများကိုဆွဲယူဖို့ဆန္ဒရှိမယ်ဆိုရင်အလွတ် Leave
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,Insufficient Stock,မလုံလောက်သောစတော့အိတ်
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227,Insufficient Stock,မလုံလောက်သောစတော့အိတ်
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,စွမ်းဆောင်ရည်မြှင့်စီမံကိန်းနှင့်အချိန်ခြေရာကောက်ကို disable
+DocType: Email Digest,New Sales Orders,နယူးအရောင်းအမိန့်
 DocType: Bank Reconciliation,Bank Account,ဘဏ်မှအကောင့်
 DocType: Leave Type,Allow Negative Balance,အပြုသဘောမဆောင်သော Balance Allow
 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/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} does not belong to Company {1},အကောင့်ကို {0} ကုမ္ပဏီ {1} ပိုင်ပါဘူး
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +86,Account {0} does not belong to Company {1},အကောင့်ကို {0} ကုမ္ပဏီ {1} ပိုင်ပါဘူး
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},ကြိုတင်မဲငွေပမာဏ {0} {1} ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
 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-စံကိုရရန်အကောင့်ကိုသက်ဆိုင်လျှင်ဖော်ပြထားခြင်း
 DocType: Course Schedule,Instructor Name,သှအမည်
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,For Warehouse is required before Submit,ဂိုဒေါင်လိုအပ်သည်သည်ခင် Submit
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,For Warehouse is required before Submit,ဂိုဒေါင်လိုအပ်သည်သည်ခင် Submit
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,တွင်ရရှိထားသည့်
 DocType: Sales Partner,Reseller,Reseller
 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 +1436,"LocalStorage is full , did not save","LocalStorage ပြည့်ဝ၏, မကယ်တင်ခဲ့"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1460,"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} အပေါ်နေသူများကဖန်တီးလိမ့်မည်
@@ -261,18 +262,19 @@
 apps/erpnext/erpnext/templates/generators/item.html +78,No description given,ဖော်ပြချက်ပေးအပ်မရှိပါ
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,ဝယ်ယူတောင်းဆိုခြင်း။
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +5,This is based on the Time Sheets created against this project,ဒီစီမံကိနျးကိုဆန့်ကျင်ဖန်တီးအချိန် Sheet များအပေါ်အခြေခံသည်
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Only the selected Leave Approver can submit this Leave Application,ကိုသာရွေးချယ်ထားထွက်ခွာခွင့်ပြုချက်ဒီထွက်ခွာလျှောက်လွှာတင်သွင်းနိုင်
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +213,Only the selected Leave Approver can submit this Leave Application,ကိုသာရွေးချယ်ထားထွက်ခွာခွင့်ပြုချက်ဒီထွက်ခွာလျှောက်လွှာတင်သွင်းနိုင်
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,နေ့စွဲ Relieving အတူနေ့စွဲထက် သာ. ကြီးမြတ်ဖြစ်ရမည်
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Leaves per Year,တစ်နှစ်တာနှုန်းအရွက်
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,တစ်နှစ်တာနှုန်းအရွက်
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,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} ပိုင်ပါဘူး
+DocType: Email Digest,Profit & Loss,အမြတ်အစွန်း &amp; ဆုံးရှုံးမှု
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,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 +435,Leave Blocked,Leave Blocked
-apps/erpnext/erpnext/stock/doctype/item/item.py +669,Item {0} has reached its end of life on {1},item {0} {1} အပေါ်အသက်၏အဆုံးရောက်ရှိခဲ့သည်
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +443,Leave Blocked,Leave Blocked
+apps/erpnext/erpnext/stock/doctype/item/item.py +671,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 +83,Annual,နှစ်ပတ်လည်
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +86,Annual,နှစ်ပတ်လည်
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,စတော့အိတ်ပြန်လည်ရင်ကြားစေ့ရေး Item
 DocType: Stock Entry,Sales Invoice No,အရောင်းပြေစာမရှိ
 DocType: Material Request Item,Min Order Qty,min မိန့် Qty
@@ -280,20 +282,22 @@
 DocType: Lead,Do Not Contact,ဆက်သွယ်ရန်မ
 apps/erpnext/erpnext/public/js/setup_wizard.js +360,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 +91,Software Developer,Software ကို Developer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,Software ကို Developer
 DocType: Item,Minimum Order Qty,နိမ့်ဆုံးအမိန့် Qty
 DocType: Pricing Rule,Supplier Type,ပေးသွင်း Type
 DocType: Scheduling Tool,Course Start Date,သင်တန်းကို Start နေ့စွဲ
 DocType: Item,Publish in Hub,Hub အတွက်ထုတ်ဝေ
+DocType: Student Admission,Student Admission,ကျောင်းသားသမဂ္ဂင်ခွင့်
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is cancelled,item {0} ဖျက်သိမ်းလိုက်
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Material Request,material တောင်းဆိုခြင်း
+apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} is cancelled,item {0} ဖျက်သိမ်းလိုက်
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +823,Material Request,material တောင်းဆိုခြင်း
 DocType: Bank Reconciliation,Update Clearance Date,Update ကိုရှင်းလင်းရေးနေ့စွဲ
 apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +28,Abbreviation already used for another salary component,ပြီးသားအခြားလစာအစိတ်အပိုင်းအတွက်အသုံးပြုအတိုကောက်
 DocType: Item,Purchase Details,အသေးစိတ်ဝယ်ယူ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +328,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},item {0} ဝယ်ယူခြင်းအမိန့် {1} အတွက် &#39;&#39; ကုန်ကြမ်းထောက်ပံ့ &#39;&#39; table ထဲမှာမတှေ့
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +333,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},item {0} ဝယ်ယူခြင်းအမိန့် {1} အတွက် &#39;&#39; ကုန်ကြမ်းထောက်ပံ့ &#39;&#39; table ထဲမှာမတှေ့
 DocType: Employee,Relation,ဆှေမြိုး
 DocType: Shipping Rule,Worldwide Shipping,Worldwide မှသဘောင်္တင်ခ
+DocType: Student Guardian,Mother,မိခင်
 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 ကိုပေးပို့သူအမည်
@@ -309,20 +313,21 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +130,Please select Charge Type first,တာဝန်ခံကအမျိုးအစားပထမဦးဆုံးကိုရွေးပါ ကျေးဇူးပြု.
 DocType: Student Group Student,Student Group Student,ကျောင်းသားအုပ်စုကျောင်းသားသမဂ္ဂ
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,နောက်ဆုံး
+DocType: Email Digest,New Quotations,နယူးကိုးကားချက်များ
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,စာရင်းထဲတွင်ပထမဦးဆုံးထွက်ခွာခွင့်ပြုချက်ကို default ထွက်ခွာခွင့်ပြုချက်အဖြစ်သတ်မှတ်ကြလိမ့်မည်
 DocType: Tax Rule,Shipping County,သဘောင်္တင်ခတီ
 apps/erpnext/erpnext/config/desktop.py +158,Learn,Learn
 DocType: Asset,Next Depreciation Date,Next ကိုတန်ဖိုးနေ့စွဲ
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,ထမ်းနှုန်းဖြင့်လုပ်ဆောင်ချက်ကုန်ကျစရိတ်
 DocType: Accounts Settings,Settings for Accounts,ငွေစာရင်းသည် Settings ကို
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +626,Supplier Invoice No exists in Purchase Invoice {0},ပေးသွင်းငွေတောင်းခံလွှာဘယ်သူမျှမကအရစ်ကျငွေတောင်းခံလွှာ {0} အတွက်တည်ရှိ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +629,Supplier Invoice No exists in Purchase Invoice {0},ပေးသွင်းငွေတောင်းခံလွှာဘယ်သူမျှမကအရစ်ကျငွေတောင်းခံလွှာ {0} အတွက်တည်ရှိ
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,အရောင်းပုဂ္ဂိုလ် Tree Manage ။
 DocType: Job Applicant,Cover Letter,ပေးပို့သည့်အကြောင်းရင်းအားရှင်းပြသည့်စာ
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,ရှင်းရှင်းလင်းလင်းမှထူးချွန်ထက်မြက် Cheques နှင့်စာရင်း
 DocType: Item,Synced With Hub,Hub နှင့်အတူ Sync လုပ်ထား
 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 +348,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 +86,Circular Reference Error,မြို့ပတ်ရထားကိုးကားစရာအမှား
@@ -334,15 +339,16 @@
 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 +806,Delivery Note,Delivery မှတ်ချက်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +800,Delivery Note,Delivery မှတ်ချက်
 apps/erpnext/erpnext/config/learn.py +87,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 +233,Payment Entry has been modified after you pulled it. Please pull it again.,သင်ကထွက်ခွာသွားပြီးနောက်ငွေပေးချေမှုရမည့် Entry modified သိရသည်။ တဖန်ဆွဲပေးပါ။
+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/setup/doctype/email_digest/email_digest.py +104,Summary for this week and pending activities,ယခုရက်သတ္တပတ်များနှင့် Pend လှုပ်ရှားမှုများအကျဉ်းချုပ်
+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 ကိုထည့်ငွေတောင်းခံလွှာအထူးသဖြင့်နေ့စွဲအပေါ်ကိုအလိုအလျောက်ပေးပို့လိမ့်မည်
 DocType: Employee,Company Email,ကုမ္ပဏီအီးမေးလ်
@@ -354,27 +360,28 @@
 apps/erpnext/erpnext/config/hr.py +186,"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
-apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},အတန်း # {0}: အရစ်ကျငွေတောင်းခံလွှာရှိပြီးသားပိုင်ဆိုင်မှု {1} ဆန့်ကျင်ရာ၌မရနိုငျ
+apps/erpnext/erpnext/controllers/accounts_controller.py +554,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},အတန်း # {0}: အရစ်ကျငွေတောင်းခံလွှာရှိပြီးသားပိုင်ဆိုင်မှု {1} ဆန့်ကျင်ရာ၌မရနိုငျ
 DocType: Item Tax,Tax Rate,အခွန်နှုန်း
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} ပြီးသားကာလထမ်း {1} များအတွက်ခွဲဝေ {2} {3} မှ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +812,Select Item,Item ကိုရွေးပါ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +791,Select Item,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","item: {0} သုတ်ပညာစီမံခန့်ခွဲ, \ စတော့အိတ်ပြန်လည်ရင်ကြားစေ့ရေးကို အသုံးပြု. ပြန်. မရနိုင်ပါ, အစားစတော့အိတ် Entry &#39;ကိုသုံး"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,ဝယ်ယူခြင်းပြေစာ {0} ပြီးသားတင်သွင်းတာဖြစ်ပါတယ်
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},row # {0}: Batch မရှိပါ {1} {2} အဖြစ်အတူတူဖြစ်ရပါမည်
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +143,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 (အများကြီး) ။
 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 +342,Please see attachment,ပူးတွဲဖိုင်ကြည့်ပေးပါ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,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 +19,Setup Already Complete!!,ယခုပင်လျှင် Complete Setup ကို !!
 ,Finished Goods,လက်စသတ်ကုန်စည်
 DocType: Delivery Note,Instructions,ညွှန်ကြားချက်များ
 DocType: Quality Inspection,Inspected By,အားဖြင့်ကြည့်ရှုစစ်ဆေးသည်
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,ပေးသွင်း&gt; ပေးသွင်းအမျိုးအစား
 DocType: Maintenance Visit,Maintenance Type,ပြုပြင်ထိန်းသိမ်းမှု 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} Delivery မှတ်ချက် {1} ပိုင်ပါဘူး
 apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,ပစ္စည်းများ Add
@@ -388,29 +395,29 @@
 DocType: Currency Exchange,Currency Exchange,ငွေကြေးလဲလှယ်မှု
 DocType: Purchase Invoice Item,Item Name,item အမည်
 DocType: Authorization Rule,Approving User  (above authorized value),(ခွင့်ပြုချက် value ကိုအထက်) အတည်ပြုအသုံးပြုသူ
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,ခရက်ဒစ် Balance
+DocType: Email Digest,Credit Balance,ခရက်ဒစ် 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.,ရှိပြီးသားစီးရီး၏စတင်ကာ / လက်ရှိ 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 +736,Purchase Return,အရစ်ကျသို့ပြန်သွားသည်
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +715,Purchase Return,အရစ်ကျသို့ပြန်သွားသည်
 ,Purchase Register,မှတ်ပုံတင်မည်ဝယ်ယူ
 DocType: Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,သက်ဆိုင်စွပ်စွဲချက်
 DocType: Workstation,Consumable Cost,စားသုံးသူများကုန်ကျစရိတ်
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +202,{0} ({1}) must have role 'Leave Approver',{0} ({1}) အခန်းကဏ္ဍ &#39;&#39; ထွက်ခွာခွင့်ပြုချက် &#39;&#39; ရှိရမယ်
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,{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 +143,Reason for losing,ဆုံးရှုံးရသည့်အကြောင်းရင်း
-apps/erpnext/erpnext/accounts/utils.py +239,Allocated amount can not greater than unadjusted amount,ခွဲဝေငွေပမာဏ unadjusted ငွေပမာဏထက် သာ. ကြီးမြတ်သည်မဟုတ်နိုင်
+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,ခွဲဝေငွေပမာဏ unadjusted ငွေပမာဏထက် သာ. ကြီးမြတ်သည်မဟုတ်နိုင်
 DocType: Announcement,Receiver,receiver
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation နှင့်အားလပ်ရက်များစာရင်းနှုန်းအဖြစ်အောက်ပါရက်စွဲများအပေါ်ပိတ်ထားသည်: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,အခွင့်အလမ်းများ
 DocType: Employee,Single,တခုတည်းသော
 DocType: Account,Cost of Goods Sold,ရောင်းချကုန်စည်၏ကုန်ကျစရိတ်
 DocType: Purchase Invoice,Yearly,နှစ်အလိုက်
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +225,Please enter Cost Center,ကုန်ကျစရိတ် Center ကရိုက်ထည့်ပေးပါ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,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,စစျဆေးသူအမည်
@@ -423,26 +430,26 @@
 DocType: Purchase Invoice,Supplier Name,ပေးသွင်းအမည်
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,ထို ERPNext လက်စွဲစာအုပ် Read
 DocType: Account,Is Group,အုပ်စုဖြစ်ပါတယ်
+DocType: Email Digest,Pending Purchase Orders,ဆိုင်းငံ့အရစ်ကျအမိန့်
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,FIFO အပေါ်အခြေခံပြီးအလိုအလြောကျ Set Serial အမှတ်
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,ပေးသွင်းပြေစာနံပါတ်ထူးခြားသောစစ်ဆေး
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',&#39;&#39; အမှုအမှတ်နိုင်ရန် &#39;&#39; &#39;&#39; အမှုအမှတ် မှစ. &#39;&#39; ထက်နည်းမဖွစျနိုငျ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,Non Profit,non အကျိုးအမြတ်
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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: Stock Reconciliation Item,Do not include symbols (ex. $),သင်္ကေတ (ဟောင်း။ $) မပါဝင်ပါနဲ့
 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 +638,Attribute {0} selected multiple times in Attributes Table,attribute {0} Attribute တွေကစားပွဲတင်အတွက်အကြိမ်ပေါင်းများစွာကိုရှေးခယျြ
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,attribute {0} Attribute တွေကစားပွဲတင်အတွက်အကြိမ်ပေါင်းများစွာကိုရှေးခယျြ
 DocType: HR Settings,Employee record is created using selected field. ,ဝန်ထမ်းစံချိန်ရွေးချယ်ထားသောလယ်ကို အသုံးပြု. နေသူများကဖန်တီး။
 DocType: Sales Order,Not Applicable,မသက်ဆိုင်ပါ
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,အားလပ်ရက်မာစတာ။
 DocType: Request for Quotation Item,Required Date,လိုအပ်သောနေ့စွဲ
 DocType: Delivery Note,Billing Address,ကျသင့်ငွေတောင်းခံလွှာပေးပို့မည့်လိပ်စာ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +862,Please enter Item Code.,Item Code ကိုရိုက်ထည့်ပေးပါ။
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +847,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 / ပုံနှိပ်ပမာဏတွင်ထည့်သွင်းသကဲ့သို့, အခွန်ပမာဏကိုထည့်သွင်းစဉ်းစားလိမ့်မည်"
@@ -456,12 +463,12 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Securities and စာရင်း
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,ခွဲဝေ Total ကုမ္ပဏီအရွက်မဖြစ်မနေဖြစ်ပါသည်
 DocType: Job Opening,Description of a Job Opening,တစ်ဦးယောဘဖွင့်ပွဲ၏ဖော်ပြချက်များ
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Pending activities for today,ယနေ့ဆိုင်းငံ့ထားလှုပ်ရှားမှုများ
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,ယနေ့ဆိုင်းငံ့ထားလှုပ်ရှားမှုများ
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,တက်ရောက်သူစံချိန်တင်။
 DocType: Salary Structure,Salary Component for timesheet based payroll.,timesheet အခြေစိုက်လုပ်ခလစာများအတွက်လစာစိတျအပိုငျး။
 DocType: Sales Order Item,Used for Production Plan,ထုတ်လုပ်ရေးစီမံကိန်းအတွက်အသုံးပြု
 DocType: Manufacturing Settings,Time Between Operations (in mins),(မိနစ်အတွက်) Operations အကြားတွင်အချိန်
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +92,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} အကောင့်အတွက်ဘတ်ဂျက် {1} ကုန်ကျစရိတ်စင်တာဆန့်ကျင် {2} {3} ဖြစ်ပါတယ်။ ဒါဟာ {4} အားဖြင့်ကျော်လွန်ပါလိမ့်မယ်
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +95,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} အကောင့်အတွက်ဘတ်ဂျက် {1} ကုန်ကျစရိတ်စင်တာဆန့်ကျင် {2} {3} ဖြစ်ပါတယ်။ ဒါဟာ {4} အားဖြင့်ကျော်လွန်ပါလိမ့်မယ်
 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 တူညီတဲ့အရာအတွက်မဟုတ်
@@ -469,16 +476,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +238,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 +86,Administrative Officer,စီမံခန့်ခွဲရေးဆိုင်ရာအရာရှိချုပ်
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,စီမံခန့်ခွဲရေးဆိုင်ရာအရာရှိချုပ်
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +23,Acutal Qty {0} / Waiting Qty {1},acute အရည်အတွက် {0} / စောငျ့အရည်အတွက် {1}
 DocType: Timesheet Detail,Hrs,နာရီ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +319,Please select Company,ကုမ္ပဏီကို select ကျေးဇူးပြု.
-DocType: Stock Entry,Difference Account,ခြားနားချက်အကောင့်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +309,Please select Company,ကုမ္ပဏီကို select ကျေးဇူးပြု.
+DocType: Stock Entry Detail,Difference Account,ခြားနားချက်အကောင့်
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,၎င်း၏မှီခိုအလုပ်တစ်ခုကို {0} တံခါးပိတ်မဟုတ်ပါအဖြစ်အနီးကပ်အလုပ်တစ်ခုကိုမနိုင်သလား။
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Please enter Warehouse for which Material Request will be raised,ဂိုဒေါင်ပစ္စည်းတောင်းဆိုမှုမွောကျလိမျ့မညျအရာအဘို့အရိုက်ထည့်ပေးပါ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +399,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 +530,"To merge, following properties must be same for both items","ပေါင်းစည်းဖို့, အောက်ပါဂုဏ်သတ္တိနှစ်မျိုးလုံးပစ္စည်းများသည်အတူတူပင်ဖြစ်ရပါမည်"
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,"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 +28,Buy,ယ်ယူရန်
@@ -486,7 +493,7 @@
 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 +1563,Serial no item cannot be a fraction,serial မရှိ item ကိုတစ်အစိတ်အပိုင်းမဖွစျနိုငျ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1587,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
@@ -495,13 +502,14 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Account {0} does not belong to company: {1},အကောင့်ကို {0} ကုမ္ပဏီပိုင်ပါဘူး: {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation already used for another company,ပြီးသားအခြားကုမ္ပဏီအတွက်အသုံးပြုအတိုကောက်
 DocType: Selling Settings,Default Customer Group,default ဖောက်သည်အုပ်စု
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Supplier is required against Payable account {0},ပေးသွင်းပေးချေအကောင့် {0} ဆန့်ကျင်လိုအပ်ပါသည်
 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 င်မဖွစျနိုငျ
 DocType: Production Planning Tool,Material Requirement,ပစ္စည်းလိုအပ်ချက်
 DocType: Company,Delete Company Transactions,ကုမ္ပဏီငွေကြေးကိစ္စရှင်းလင်းမှု Delete
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +313,Reference No and Reference Date is mandatory for Bank transaction,ကိုးကားစရာအဘယ်သူမျှမနှင့်ကိုးကားစရာနေ့စွဲဘဏ်မှငွေပေးငွေယူဘို့မဖြစ်မနေဖြစ်ပါသည်
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +316,Reference No and Reference Date is mandatory for Bank transaction,ကိုးကားစရာအဘယ်သူမျှမနှင့်ကိုးကားစရာနေ့စွဲဘဏ်မှငွေပေးငွေယူဘို့မဖြစ်မနေဖြစ်ပါသည်
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,/ Edit ကိုအခွန်နှင့်စွပ်စွဲချက် Add
 DocType: Purchase Invoice,Supplier Invoice No,ပေးသွင်းပြေစာမရှိ
 DocType: Territory,For reference,ကိုးကားနိုင်ရန်
@@ -512,7 +520,6 @@
 DocType: Installation Note Item,Installation Note Item,Installation မှတ်ချက် Item
 DocType: Production Plan Item,Pending Qty,ဆိုင်းငံ့ထား Qty
 DocType: Budget,Ignore,ဂရုမပြု
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,item Code ကို&gt; item Group မှ&gt; အမှတ်တံဆိပ်
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,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
@@ -523,11 +530,11 @@
 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/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 +28,Please select Company and Party Type first,ပထမဦးဆုံးကုမ္ပဏီနှင့်ပါတီ Type ကိုရွေးပါ ကျေးဇူးပြု.
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +19,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 +707,Make Sales Order,အရောင်းအမိန့်လုပ်ပါ
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +701,Make Sales Order,အရောင်းအမိန့်လုပ်ပါ
 DocType: Project Task,Project Task,စီမံကိန်းရဲ့ Task
 ,Lead Id,ခဲ Id
 DocType: C-Form Invoice Detail,Grand Total,စုစုပေါင်း
@@ -543,7 +550,8 @@
 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 +734,Sales Return,အရောင်းသို့ပြန်သွားသည်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +728,Sales Return,အရောင်းသို့ပြန်သွားသည်
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +91,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 သင်္ဘော) ဖြင့်ကယ်လွှတ်
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,အလားအလာရှိသောဖောက်သည်၏ဒေတာဘေ့စ။
@@ -552,14 +560,13 @@
 DocType: Quotation,Quotation To,စျေးနှုန်းရန်
 DocType: Lead,Middle Income,အလယျပိုငျးဝင်ငွေခွန်
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +212,Opening (Cr),ဖွင့်ပွဲ (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +795,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,သင်ပြီးသားကိုအခြား UOM နှင့်အတူအချို့သောအရောင်းအဝယ် (s) ကိုရာ၌ခန့်ထားပြီဖြစ်သောကြောင့်ပစ္စည်းအဘို့အတိုင်း၏ default အနေနဲ့ယူနစ် {0} ကိုတိုက်ရိုက်ပြောင်းလဲသွားမရနိုင်ပါ။ သင်တစ်ဦးကွဲပြားခြားနားသောပုံမှန် UOM သုံးစွဲဖို့အသစ်တစ်ခုပစ္စည်းကိုဖန်တီးရန်လိုအပ်ပါလိမ့်မည်။
-apps/erpnext/erpnext/accounts/utils.py +237,Allocated amount can not be negative,ခွဲဝေငွေပမာဏအနုတ်လက္ခဏာမဖြစ်နိုင်
+apps/erpnext/erpnext/stock/doctype/item/item.py +797,Default Unit of Measure for Item {0} cannot be changed directly because 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,ခွဲဝေငွေပမာဏအနုတ်လက္ခဏာမဖြစ်နိုင်
 DocType: Purchase Order Item,Billed Amt,Bill Amt
 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 +91,Reference No & Reference Date is required for {0},ကိုးကားစရာမရှိပါ &amp; ကိုးကားစရာနေ့စွဲ {0} သည်လိုအပ်သည်
-DocType: Sales Invoice,Customer's Vendor,customer ရဲ့ vendor
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Proposal Writing,အဆိုပြုချက်ကို Writing
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,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-ကန်ထရိုက်ဖြစ်ကြောင်းပစ္စည်းများများအတွက်ကုန်ကြမ်းကိုပစ္စည်းတောင်းဆိုချက်များတွင်ထည့်သွင်းပါလိမ့်မည်"
@@ -568,13 +575,14 @@
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,အချိန်ခြေရာကောက်
 DocType: Fiscal Year Company,Fiscal Year Company,ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာကုမ္ပဏီ
 DocType: Packing Slip Item,DN Detail,ဒန Detail
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +257,Already supplier quotation has created,ယခုပင်လျှင်ပေးသွင်း quotation အနေသူများကဖန်တီးထားပါတယ်
 DocType: Timesheet,Billed,Bill
 DocType: Batch,Batch Description,batch ဖော်ပြချက်များ
+apps/erpnext/erpnext/accounts/utils.py +685,"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 +733,View Offline Records,ကြည့်ရန်အော့ဖ်လိုင်းဖြင့် Records ကို
+apps/erpnext/erpnext/accounts/page/pos/pos.js +715,View Offline Records,ကြည့်ရန်အော့ဖ်လိုင်းဖြင့် Records ကို
+DocType: Student,Sibling Details,မှေးခငျြးအသေးစိတ်
 DocType: Employee,Reason for Resignation,ရာထူးမှနုတ်ထွက်ရသည့်အကြောင်းရင်း
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,စွမ်းဆောင်ရည်အကဲဖြတ်သုံးသပ်ဖို့သည် template ။
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,ကုန်ပို့လွှာ / ဂျာနယ် Entry &#39;အသေးစိတ်ကို
@@ -588,7 +596,7 @@
 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 ထဲမှာပိုက်ကွန်ကိုပြောင်းရန်
 DocType: Employee,Passport Number,နိုင်ငံကူးလက်မှတ်နံပါတ်
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Manager,Manager က
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,Manager က
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,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; အတူတူမဖွစျနိုငျ
@@ -597,10 +605,11 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter email address,အီးမေးလ်လိပ်စာရိုက်ထည့်ပေးပါ
 DocType: Production Order Operation,In minutes,မိနစ်
 DocType: Issue,Resolution Date,resolution နေ့စွဲ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +299,Timesheet created:,Timesheet ကဖန်တီး:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +715,Please set default Cash or Bank account in Mode of Payment {0},ငွေပေးချေမှုရမည့်၏ Mode ကို {0} အတွက် default အနေနဲ့ငွေသို့မဟုတ်ဘဏ်မှအကောင့်ကိုသတ်မှတ်ပေးပါ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +300,Timesheet created:,Timesheet ကဖန်တီး:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +772,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,စာရင်းသွင်း
 DocType: Selling Settings,Customer Naming By,အားဖြင့်ဖောက်သည် Name
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,လူ့စွမ်းအားအရင်းအမြစ်အတွက် System ကိုအမည်ဖြင့်သမုတ် ကျေးဇူးပြု. setup ကိုထမ်း&gt; HR က Settings
 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,လုပ်ဆောင်ချက်ကအမျိုးအစား
@@ -625,6 +634,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,အပြီးသတ်
 DocType: Pricing Rule,Sales Manager,အရောင်းမန်နေဂျာ
 DocType: Salary Structure Employee,Base,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,ပိုင်ဆိုင်မှုရှင်းအပေါ်အမြတ် / ပျောက်ဆုံးခြင်းအကောင့်
@@ -639,11 +649,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +9,Pre Sales,အကြိုအရောင်း
 DocType: Purchase Receipt,Other Details,အခြားအသေးစိတ်
 DocType: Account,Accounts,ငွေစာရင်း
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Marketing,marketing
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +227,Payment Entry is already created,ငွေပေးချေမှုရမည့် Entry &#39;ပြီးသားနေသူများကဖန်တီး
+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,ငွေပေးချေမှုရမည့် Entry &#39;ပြီးသားနေသူများကဖန်တီး
 DocType: Purchase Receipt Item Supplied,Current Stock,လက်ရှိစတော့အိတ်
-apps/erpnext/erpnext/controllers/accounts_controller.py +538,Row #{0}: Asset {1} does not linked to Item {2},အတန်း # {0}: ပိုင်ဆိုင်မှု {1} Item {2} နှင့်ဆက်စပ်ပါဘူး
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +21,Preview Salary Slip,ကို Preview လစာစလစ်ဖြတ်ပိုင်းပုံစံ
+apps/erpnext/erpnext/controllers/accounts_controller.py +541,Row #{0}: Asset {1} does not linked to Item {2},အတန်း # {0}: ပိုင်ဆိုင်မှု {1} Item {2} နှင့်ဆက်စပ်ပါဘူး
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +38,Preview Salary Slip,ကို Preview လစာစလစ်ဖြတ်ပိုင်းပုံစံ
 DocType: Company,Deafult Cost Center,Deafult ကုန်ကျစရိတ်စင်တာ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +48,Account {0} has been entered multiple times,အကောင့် {0} အကြိမ်ပေါင်းများစွာသို့ဝင်ခဲ့
 DocType: Account,Expenses Included In Valuation,အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည်တွင်ထည့်သွင်းကုန်ကျစရိတ်
@@ -652,7 +662,7 @@
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,တစ်ကျောင်းသားအုပ်စုကို select လုပ်ပါကျေးဇူးပြုပြီး
 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 +617,Item has variants.,item မျိုးကွဲရှိပါတယ်။
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,item မျိုးကွဲရှိပါတယ်။
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,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} မတည်ရှိပါဘူး
@@ -672,7 +682,7 @@
 DocType: Purchase Order,Supply Raw Materials,supply ကုန်ကြမ်း
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,လာမယ့်ကုန်ပို့လွှာ generated လိမ့်မည်သည့်နေ့ရက်။ ဒါဟာတင်ပြရန်အပေါ် generated ဖြစ်ပါတယ်။
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,လက်ရှိပိုင်ဆိုင်မှုများ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,{0} is not a stock Item,{0} တစ်စတော့ရှယ်ယာ Item မဟုတ်ပါဘူး
+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 +169,Lead must be set if Opportunity is made from Lead,အခွင့်အလမ်းများခဲကနေလုပ်ပါကခဲသတ်မှတ်ရမည်
@@ -739,26 +749,25 @@
 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 +709,No Permission,အဘယ်သူမျှမခွင့်ပြုချက်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +710,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 မရနိုင်ပါ"
 apps/erpnext/erpnext/public/js/setup_wizard.js +298,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 +542,Row #{0}: Asset {1} must be submitted,အတန်း # {0}: ပိုင်ဆိုင်မှု {1} တင်သွင်းရဦးမည်
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,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,တစ်ရောင်းချသူမှ subcontracted မယ်ဆိုရင်
 DocType: SMS Center,All Customer Contact,အားလုံးသည်ဖောက်သည်ဆက်သွယ်ရန်
 apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,CSV ကနေတဆင့်စတော့ရှယ်ယာချိန်ခွင်လျှာ upload ။
 DocType: Warehouse,Tree Details,သစ်ပင်ကိုအသေးစိတ်
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,အခုတော့ Send
 ,Support Analytics,ပံ့ပိုးမှု Analytics
 DocType: Item,Website Warehouse,website ဂိုဒေါင်
 DocType: Payment Reconciliation,Minimum Invoice Amount,နိမ့်ဆုံးပမာဏပြေစာ
 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/sales_invoice/sales_invoice.py +227,Timesheet {0} is already completed or cancelled,Timesheet {0} ပြီးသားပြီးစီးခဲ့သို့မဟုတ်ဖျက်သိမ်းလိုက်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +259,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 မှတန်းတူဖြစ်ရမည်
@@ -774,13 +783,13 @@
 apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,သင်တန်းဇယား
 DocType: Maintenance Visit,Completion Status,ပြီးစီးနဲ့ Status
 DocType: HR Settings,Enter retirement age in years,နှစ်များတွင်အငြိမ်းစားအသက်အရွယ် Enter
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +229,Target Warehouse,Target ကဂိုဒေါင်
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +230,Target Warehouse,Target ကဂိုဒေါင်
 DocType: Cheque Print Template,Starting location from left edge,ကျန်ရစ်အစွန်းကနေတည်နေရာစတင်ခြင်း
 DocType: Item,Allow over delivery or receipt upto this percent,ဒီရာခိုင်နှုန်းအထိပေးပို့သို့မဟုတ်လက်ခံရရှိကျော် Allow
 DocType: Stock Entry,STE-,STE-
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Sales Order Date,မျှော်လင့်ထားသည့် Delivery Date ကိုအရောင်းအမိန့်နေ့စွဲခင်မဖွစျနိုငျ
 DocType: Upload Attendance,Import Attendance,သွင်းကုန်တက်ရောက်
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,All item အဖွဲ့များ
+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/config/setup.py +89,Automatically compose message on submission of transactions.,အလိုအလျှောက်ငွေကြေးလွှဲပြောင်းမှုမှာတင်သွင်းခဲ့တဲ့အပေါ်သတင်းစကား compose ။
@@ -792,13 +801,15 @@
 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/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
 DocType: Expense Claim,Expenses,ကုန်ကျစရိတ်
 DocType: Item Variant Attribute,Item Variant Attribute,item Variant Attribute
 ,Purchase Receipt Trends,ဝယ်ယူခြင်းပြေစာခေတ်ရေစီးကြောင်း
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Research & Development,သုတေသနနှင့်ဖွံ့ဖြိုးရေး
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,သုတေသနနှင့်ဖွံ့ဖြိုးရေး
 ,Amount to Bill,ဘီလ်မှငွေပမာဏကို
 DocType: Company,Registration Details,မှတ်ပုံတင်ခြင်းအသေးစိတ်ကို
+DocType: Timesheet,Total Billed Amount,စုစုပေါင်းကောက်ခံခဲ့ပမာဏ
 DocType: Item Reorder,Re-Order Qty,Re-Order Qty
 DocType: Leave Block List Date,Leave Block List Date,Block List ကိုနေ့စွဲ Leave
 DocType: Pricing Rule,Price or Discount,စျေးနှုန်းသို့မဟုတ်လျှော့
@@ -807,7 +818,7 @@
 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/controllers/accounts_controller.py +340,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","ဒါကြောင့်ဒီငွေတောင်းခံလွှာအတွက်ကြိုတင်မဲအဖြစ်ဆွဲထုတ်ထားရမည်ဆိုပါကငွေပေးချေမှုရမည့် Entry &#39;{0} အမိန့် {1} ဆန့်ကျင်နှင့်ဆက်စပ်နေသည်, စစ်ဆေးပါ။"
+apps/erpnext/erpnext/controllers/accounts_controller.py +343,"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
@@ -829,12 +840,12 @@
 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 +756,Purchase Receipt,ဝယ်ယူခြင်း Receipt
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +735,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 +167,Reference Doctype must be one of {0},ကိုးကားစရာ DOCTYPE {0} တယောက်ဖြစ်ရပါမည်
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +282,Unable to find Time Slot in the next {0} days for Operation {1},စစ်ဆင်ရေး {1} သည်လာမည့် {0} လက်ထက်ကာလ၌အချိန်အပေါက်ရှာတွေ့ဖို့မအောင်မြင်ဘူး
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +170,Reference Doctype must be one of {0},ကိုးကားစရာ DOCTYPE {0} တယောက်ဖြစ်ရပါမည်
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,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 +439,BOM {0} must be active,BOM {0} တက်ကြွဖြစ်ရမည်
@@ -845,7 +856,7 @@
 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 +214,Warehouses with existing transaction can not be converted to ledger.,လက်ရှိငွေပေးငွေယူနှင့်အတူသိုလှောင်ရုံလယ်ဂျာကူးပြောင်းမရနိုင်ပါ။
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +217,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,ထုတ်လုပ်မှုအမိန့်
@@ -859,9 +870,9 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,ဝန်ထမ်း {0} တက်ကြွမဟုတ်ပါဘူးသို့မဟုတ်မတည်ရှိပါဘူး
 DocType: Fee Structure,Components,components
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,Please enter Asset Category in Item {0},Item {0} အတွက်ပိုင်ဆိုင်မှုအမျိုးအစားကိုရိုက်သွင်းပါ
-apps/erpnext/erpnext/stock/doctype/item/item.py +612,Item Variants {0} updated,item Variant {0} updated
+apps/erpnext/erpnext/stock/doctype/item/item.py +614,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 +843,Cannot {0} {1} {2} without any negative outstanding invoice,နိုင်သလားမ {0} {1} {2} မည်သည့်အနှုတ်လက္ခဏာထူးချွန်ငွေတောင်းခံလွှာမပါဘဲ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +854,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 ကို
@@ -876,69 +887,72 @@
 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 +728,New Sales Invoice,နယူးအရောင်းပြေစာ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +710,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 +728,Sync Offline Invoices,Sync ကိုအော့ဖ်လိုင်းဖြင့်ငွေတောင်းခံလွှာ
 DocType: Payment Request,Paid,Paid
 DocType: Program Fee,Program Fee,Program ကိုလျှောက်လွှာကြေး
 DocType: Salary Slip,Total in words,စကားစုစုပေါင်း
 DocType: Material Request Item,Lead Time Date,ခဲအချိန်နေ့စွဲ
 DocType: Guardian,Guardian Name,ဂါးဒီးယန်းသတင်းစာအမည်
 DocType: Cheque Print Template,Has Print Format,ရှိပါတယ်ပရင့်ထုတ်ရန် Format ကို
-apps/erpnext/erpnext/accounts/page/pos/pos.js +86, is mandatory. Maybe Currency Exchange record is not created for ,မဖြစ်မနေဖြစ်ပါတယ်။ ဒီတစ်ခါလည်းငွေကြေးစနစ်အိတ်ချိန်းစံချိန်ဖန်တီးသည်မ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +109,Row #{0}: Please specify Serial No for Item {1},row # {0}: Item {1} သည် Serial No ကိုသတ်မှတ်ပေးပါ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +619,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","&#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/page/pos/pos.js +75, 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 +613,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing 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 +606,Supplier Invoice Date cannot be greater than Posting Date,ပေးသွင်းငွေတောင်းခံလွှာနေ့စွဲနေ့စွဲပို့စ်တင်ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +609,Supplier Invoice Date cannot be greater than Posting Date,ပေးသွင်းငွေတောင်းခံလွှာနေ့စွဲနေ့စွဲပို့စ်တင်ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
 DocType: Purchase Invoice Item,Purchase Order Item,ဝယ်ယူခြင်းအမိန့် Item
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +130,Indirect Income,သွယ်ဝိုက်ဝင်ငွေခွန်
 DocType: Cheque Print Template,Date Settings,နေ့စွဲက Settings
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,ကှဲလှဲ
 ,Company Name,ကုမ္ပဏီအမည်
 DocType: SMS Center,Total Message(s),စုစုပေါင်း Message (s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +810,Select Item for Transfer,လွှဲပြောင်းသည် Item ကိုရွေးပါ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +789,Select Item for Transfer,လွှဲပြောင်းသည် Item ကိုရွေးပါ
 DocType: Purchase Invoice,Additional Discount Percentage,အပိုဆောင်းလျှော့ရာခိုင်နှုန်း
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,အားလုံးအကူအညီနဲ့ဗီဒီယိုစာရင်းကိုကြည့်ခြင်း
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,စစ်ဆေးမှုများအနည်ရာဘဏ်အကောင့်ဖွင့်ဦးခေါင်းကိုရွေးချယ်ပါ။
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,အသုံးပြုသူငွေကြေးလွှဲပြောင်းမှုမှာစျေးနှုန်း List ကို Rate တည်းဖြတ်ရန် Allow
 DocType: Pricing Rule,Max Qty,max Qty
-DocType: Student Applicant,Father's Name,ခမညျးတျော၏နာမတျော
 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 +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,row {0}: / ဝယ်ယူခြင်းအမိန့်ကိုအမြဲကြိုတင်အဖြစ်မှတ်သားထားသင့်အရောင်းဆန့်ကျင်ငွေပေးချေမှုရမည့်
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,ဓါတုဗေဒ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +686,All items have already been transferred for this Production Order.,ပစ္စည်းများအားလုံးပြီးပြီဒီထုတ်လုပ်မှုအမိန့်သည်ပြောင်းရွှေ့ခဲ့တာဖြစ်ပါတယ်။
+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} စစ်ဆေးထပ်ကြိုးစားပါ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +694,All items have already been transferred for this Production Order.,ပစ္စည်းများအားလုံးပြီးပြီဒီထုတ်လုပ်မှုအမိန့်သည်ပြောင်းရွှေ့ခဲ့တာဖြစ်ပါတယ်။
 DocType: Process Payroll,Select Payroll Year and Month,လစာတစ်နှစ်တာနှင့်လကိုရွေးချယ်ပါ
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,Meter,မီတာ
 DocType: Workstation,Electricity Cost,လျှပ်စစ်မီးကုန်ကျစရိတ်
 DocType: HR Settings,Don't send Employee Birthday Reminders,န်ထမ်းမွေးနေသတိပေးချက်များမပို့ပါနဲ့
-DocType: Opportunity,Walk In,ခုနှစ်တွင် Walk
 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 +12,Transfered,Transferable
 apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,သင့်ရဲ့စာကိုဦးခေါင်းနှင့်လိုဂို upload ။ (သင်နောက်ပိုင်းမှာသူတို့ကိုတည်းဖြတ်နိုင်သည်) ။
 DocType: Timesheet Detail,Bill,ဘီလ်
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,White,အဖြူ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date is entered as past date,Next ကိုတန်ဖိုးနေ့စွဲအတိတ်နေ့စွဲအဖြစ်ထဲသို့ဝင်သည်
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +167,White,အဖြူ
 DocType: SMS Center,All Lead (Open),အားလုံးသည်ခဲ (ပွင့်လင်း)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +228,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),အတန်း {0}: ({2} {3}) entry ကို၏အချိန်ပို့စ်တင်မှာ {1} ဂိုဒေါင်ထဲမှာ {4} များအတွက်အရည်အတွက်ရရှိနိုင်မ
+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 +731,Make ,လုပ်ပါ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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 ကိုဆက်သွယ်ပါ။
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,အကြှနျုပျ၏လှည်း
-apps/erpnext/erpnext/controllers/selling_controller.py +154,Order Type must be one of {0},အမိန့် Type {0} တယောက်ဖြစ်ရပါမည်
+apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},အမိန့် Type {0} တယောက်ဖြစ်ရပါမည်
 DocType: Lead,Next Contact Date,Next ကိုဆက်သွယ်ရန်နေ့စွဲ
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Qty ဖွင့်လှစ်
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +393,Please enter Account for Change Amount,ပြောင်းလဲမှုပမာဏအဘို့အကောင့်ရိုက်ထည့်ပေးပါ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,Please enter Account for Change Amount,ပြောင်းလဲမှုပမာဏအဘို့အကောင့်ရိုက်ထည့်ပေးပါ
 DocType: Student Batch,Student Batch Name,ကျောင်းသားအသုတ်လိုက်အမည်
 DocType: Holiday List,Holiday List Name,အားလပ်ရက် List ကိုအမည်
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js +8,Schedule Course,ဇယားသင်တန်းအမှတ်စဥ်
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Stock Options,စတော့အိတ် Options ကို
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,စတော့အိတ် Options ကို
 DocType: Journal Entry Account,Expense Claim,စရိတ်တောင်းဆိုမှုများ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +211,Do you really want to restore this scrapped asset?,သင်အမှန်တကယ်ဒီဖျက်သိမ်းပိုင်ဆိုင်မှု restore ချင်ပါသလား?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +237,Qty for {0},{0} သည် Qty
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +212,Do you really want to restore this scrapped asset?,သင်အမှန်တကယ်ဒီဖျက်သိမ်းပိုင်ဆိုင်မှု restore ချင်ပါသလား?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,Qty for {0},{0} သည် Qty
 DocType: Leave Application,Leave Application,လျှောက်လွှာ Leave
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,ဖြန့်ဝေ Tool ကို Leave
 DocType: Leave Block List,Leave Block List Dates,Block List ကိုနေ့ရက်များ Leave
@@ -947,9 +961,9 @@
 DocType: Company,Default Terms,default သက်မှတ်ချက်များ
 DocType: Packing Slip Item,Packing Slip Item,ထုပ်ပိုး Item စလစ်ဖြတ်ပိုင်းပုံစံ
 DocType: Purchase Invoice,Cash/Bank Account,ငွေသား / ဘဏ်မှအကောင့်
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,အရေအတွက်သို့မဟုတ်တန်ဖိုးမျှပြောင်းလဲမှုနှင့်အတူပစ္စည်းများကိုဖယ်ရှားခဲ့သည်။
+apps/erpnext/erpnext/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 +635,Attribute table is mandatory,attribute စားပွဲပေါ်မှာမဖြစ်မနေဖြစ်ပါသည်
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,attribute စားပွဲပေါ်မှာမဖြစ်မနေဖြစ်ပါသည်
 DocType: Production Planning Tool,Get Sales Orders,အရောင်းအမိန့် Get
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} အနုတ်လက္ခဏာမဖြစ်နိုင်
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,တစ်ဦးကျောင်းသားသမဂ္ဂကို select လုပ်ပါကျေးဇူးပြုပြီး
@@ -974,7 +988,7 @@
 apps/erpnext/erpnext/config/stock.py +190,"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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},serial No {0} {1} ထိပြုပြင်ထိန်းသိမ်းမှုစာချုပ်အောက်မှာဖြစ်ပါတယ်
+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,အစည်းအရုံးအမည်
@@ -986,7 +1000,7 @@
 DocType: GL Entry,Against,ဆန့်ကျင်
 DocType: Item,Default Selling Cost Center,default ရောင်းချသည့်ကုန်ကျစရိတ် Center က
 DocType: Sales Partner,Implementation Partner,အကောင်အထည်ဖော်ရေး Partner
-apps/erpnext/erpnext/controllers/selling_controller.py +231,Sales Order {0} is {1},အရောင်းအမှာစာ {0} {1} ဖြစ်ပါသည်
+apps/erpnext/erpnext/controllers/selling_controller.py +232,Sales Order {0} is {1},အရောင်းအမှာစာ {0} {1} ဖြစ်ပါသည်
 DocType: Opportunity,Contact Info,Contact Info
 apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,စတော့အိတ် Entries ဖော်ဆောင်ရေး
 DocType: Packing Slip,Net Weight UOM,Net ကအလေးချိန် UOM
@@ -996,25 +1010,24 @@
 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 ကိုနေ့စွဲထက်လျော့နည်းမဖွစျနိုငျ
 DocType: Sales Person,Select company name first.,ပထမဦးဆုံးကုမ္ပဏီ၏နာမကိုရွေးချယ်ပါ။
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Dr,ဒေါက်တာ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Dr,ဒေါက်တာ
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,ကိုးကားချက်များပေးသွင်းထံမှလက်ခံရရှိခဲ့သည်။
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},{1} {2} | {0} မှ
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,ပျမ်းမျှအားဖြင့်ခေတ်
 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/templates/pages/home.html +32,View All Products,အားလုံးကုန်ပစ္စည်းများ View
+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
 DocType: Expense Claim,From Employee,န်ထမ်းအနေဖြင့်
-apps/erpnext/erpnext/controllers/accounts_controller.py +400,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,သတိပေးချက်: စနစ် Item {0} သည်ငွေပမာဏကတည်းက overbilling စစ်ဆေးမည်မဟုတ် {1} သုညဖြစ်ပါသည်အတွက်
+apps/erpnext/erpnext/controllers/accounts_controller.py +403,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/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,နှင့်တစ်နှစ်:
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +191,{0} {1} must be submitted,{0} {1} တင်သွင်းရဦးမည်
-DocType: Email Digest,Annual Expense,နှစ်ပတ်လည်သုံးစွဲမှု
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,{0} {1} must be submitted,{0} {1} တင်သွင်းရဦးမည်
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +145,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},Item သည် BOM လယ်ပြင်၌ {0} BOM ကို select ကျေးဇူးပြု.
@@ -1025,30 +1038,31 @@
 DocType: Sales Partner,Distributor,ဖြန့်ဖြူး
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,စျေးဝယ်တွန်းလှည်း Shipping Rule
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +211,Production Order {0} must be cancelled before cancelling this Sales Order,ထုတ်လုပ်မှုအမိန့် {0} ဒီအရောင်းအမိန့်ကိုပယ်ဖျက်မီဖျက်သိမ်းရပါမည်
-apps/erpnext/erpnext/public/js/controllers/transaction.js +62,Please set 'Apply Additional Discount On',&#39;&#39; Apply ဖြည့်စွက်လျှော့တွင် &#39;&#39; set ကျေးဇူးပြု.
+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 မျိုးမျိုးရန်ထက်လျော့နည်းဖြစ်ဖို့ရှိပါတယ်
 DocType: Global Defaults,Global Defaults,ဂလိုဘယ် Defaults ကို
 apps/erpnext/erpnext/projects/doctype/project/project.py +153,Project Collaboration Invitation,စီမံကိန်းပူးပေါင်းဆောင်ရွက်ဖိတ်ကြားလွှာ
 DocType: Salary Slip,Deductions,ဖြတ်ငွေများ
+DocType: Leave Allocation,LAL/,Lal /
 apps/erpnext/erpnext/public/js/financial_statements.js +73,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 +327,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 +362,Finished Item {0} must be entered for Manufacture type entry,လက်စသတ် Item {0} Manufacturing အမျိုးအစား entry အဝသို့ဝင်ရမည်
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +367,Finished Item {0} must be entered for Manufacture type entry,လက်စသတ် Item {0} Manufacturing အမျိုးအစား entry အဝသို့ဝင်ရမည်
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,ဖွင့်လှစ်စာရင်းကိုင် Balance
 DocType: Sales Invoice Advance,Sales Invoice Advance,အရောင်းပြေစာကြိုတင်ထုတ်
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +499,Nothing to request,တောင်းဆိုရန်ဘယ်အရာမှ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +500,Nothing to request,တောင်းဆိုရန်ဘယ်အရာမှ
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',&#39;&#39; အမှန်တကယ် Start ကိုနေ့စွဲ &#39;&#39; အမှန်တကယ် End Date ကို &#39;&#39; ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Management,စီမံခန့်ခွဲမှု
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},debit သို့မဟုတ်ခရက်ဒစ်ပမာဏကို {0} သည်လိုအပ်သည်ဖြစ်စေ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,စီမံခန့်ခွဲမှု
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +55,Either debit or credit amount is required for {0},debit သို့မဟုတ်ခရက်ဒစ်ပမာဏကို {0} သည်လိုအပ်သည်ဖြစ်စေ
 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 +161,Blue,ပြာသော
+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 ကိုသတ်မှတ် ကျေးဇူးပြု.
@@ -1058,12 +1072,12 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +23,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 က
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1374,Do you really want to submit the invoice?,သငျသညျတကယ်ငွေတောင်းခံလွှာကိုတင်သွင်းဖို့လိုသလား?
+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 +685,Cost Center For Item with Item Code ',Item Code ကိုအတူ Item သည်ကုန်ကျစရိတ် Center က &#39;&#39;
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1526,"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 +679,Cost Center For Item with Item Code ',Item Code ကိုအတူ Item သည်ကုန်ကျစရိတ် Center က &#39;&#39;
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1550,"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 +26,"Further accounts can be made under Groups, but entries can be made against non-Groups",နောက်ထပ်အကောင့်အဖွဲ့များအောက်မှာလုပ်နိုင်ပေမယ့် entries တွေကို Non-အဖွဲ့များဆန့်ကျင်စေနိုင်ပါတယ်
 DocType: Lead,Lead,ခဲ
@@ -1083,104 +1097,106 @@
 DocType: Payment Reconciliation,Unreconciled Payment Details,Unreconciled ငွေပေးချေမှုရမည့်အသေးစိတ်
 DocType: Global Defaults,Current Fiscal Year,လက်ရှိဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ
 DocType: Global Defaults,Disable Rounded Total,Rounded စုစုပေါင်းကို disable
-DocType: Lead,Call,တယ်လီဖုန်းဆက်
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +417,'Entries' cannot be empty,&#39;&#39; Entries &#39;လွတ်နေတဲ့မဖွစျနိုငျ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +418,'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 +214,Fiscal Year {0} not found,ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ {0} မတွေ့ရှိ
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +221,Fiscal Year {0} not found,ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ {0} မတွေ့ရှိ
 apps/erpnext/erpnext/config/hr.py +238,Setting up Employees,ဝန်ထမ်းများကိုတည်ဆောက်ခြင်း
 DocType: Sales Order,SO-,SO-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,ပထမဦးဆုံးရှေ့ဆက်ကိုရွေးပါ ကျေးဇူးပြု.
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Please select prefix first,ပထမဦးဆုံးရှေ့ဆက်ကိုရွေးပါ ကျေးဇူးပြု.
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Research,သုတေသန
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,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 +43,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 +57,View Ledger,view လယ်ဂျာ
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,အစောဆုံး
-apps/erpnext/erpnext/stock/doctype/item/item.py +504,"An Item Group exists with same name, please change the item name or rename the item group","တစ်ဦး Item Group မှအမည်တူနှင့်အတူရှိနေတယ်, ပစ္စည်းအမည်ကိုပြောင်းလဲသို့မဟုတ်ပစ္စည်းအုပ်စုအမည်ပြောင်းကျေးဇူးတင်ပါ"
+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/setup/setup_wizard/setup_wizard.py +437,Rest Of The World,ကမ္ဘာ့အရာကြွင်းလေ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,အဆိုပါ Item {0} Batch ရှိသည်မဟုတ်နိုင်
 ,Budget Variance Report,ဘဏ္ဍာငွေအရအသုံးကှဲလှဲအစီရင်ခံစာ
 DocType: Salary Slip,Gross Pay,gross Pay ကို
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +90,Row {0}: Activity Type is mandatory.,အတန်း {0}: Activity ကိုအမျိုးအစားမဖြစ်မနေဖြစ်ပါတယ်။
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +114,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/public/js/controllers/stock_controller.js +40,Accounting Ledger,လယ်ဂျာစာရင်းကိုင်
+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,ထိန်းသိမ်းထားသောဝင်ငွေများ
 DocType: BOM Item,Item Description,item ဖော်ပြချက်များ
+DocType: Student Sibling,Student Sibling,ကျောင်းသားမောင်နှမ
 DocType: Purchase Invoice,Is Recurring,ထပ်တလဲလဲဖြစ်ပါတယ်
 DocType: Purchase Invoice,Supplied Items,ထောက်ပံ့ရေးပစ္စည်းများ
 DocType: Student,STUD.,လုံး။
 DocType: Production Order,Qty To Manufacture,ထုတ်လုပ်ခြင်းရန် Qty
+DocType: Email Digest,New Income,နယူးဝင်ငွေခွန်
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,ဝယ်ယူသံသရာတလျှောက်လုံးအတူတူနှုန်းကထိန်းသိမ်းနည်း
 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 +131,Balance for Account {0} must always be {1},အကောင့်သည်ချိန်ခွင် {0} အမြဲ {1} ဖြစ်ရမည်
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +175,Valuation Rate required for Item in row {0},အတန်း {0} အတွက် Item များအတွက်လိုအပ်သောအဘိုးပြတ်နှုန်း
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,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,ဥပမာ: ကွန်ပျူတာသိပ္ပံအတွက်မာစတာ
 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 +87, to ,ရန်
+apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,ရန်
 DocType: Item,Lead Time in days,လက်ထက်ကာလ၌အချိန်ကိုဦးဆောင်
 ,Accounts Payable Summary,Accounts ကိုပေးဆောင်အကျဉ်းချုပ်
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Not authorized to edit frozen Account {0},အေးခဲအကောင့် {0} တည်းဖြတ်ခွင့်ပြုချက်မရ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},အေးခဲအကောင့် {0} တည်းဖြတ်ခွင့်ပြုချက်မရ
 DocType: Journal Entry,Get Outstanding Invoices,ထူးချွန်ငွေတောင်းခံလွှာကိုရယူပါ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +62,Sales Order {0} is not valid,အရောင်းအမှာစာ {0} တရားဝင်မဟုတ်
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,အရောင်းအမှာစာ {0} တရားဝင်မဟုတ်
 apps/erpnext/erpnext/setup/doctype/company/company.py +185,"Sorry, companies cannot be merged","စိတ်မကောင်းပါဘူး, ကုမ္ပဏီများပေါင်းစည်းမရနိုင်ပါ"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +139,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",စုစုပေါင်းစာစောင် / လွှဲပြောင်းအရေအတွက် {0} ပစ္စည်းတောင်းဆိုမှုအတွက် {1} \ မေတ္တာရပ်ခံအရေအတွက် {2} Item {3} သည်ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Small,သေးငယ်သော
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,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} ကနေကြိုးစား
 ,Invoiced Amount (Exculsive Tax),Invoiced ငွေပမာဏ (Exculsive ခွန်)
-DocType: Student Applicant,Mother's / Guardian 1 Email ID,မိခင်ရဲ့ / အုပ်ထိန်းသူ 1 အီးမေးလ် ID ကို
 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 +160,Green,စိမ်းလန်းသော
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,စိမ်းလန်းသော
 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 +57,Contract,စာချုပ်
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,စာချုပ်
 DocType: Email Digest,Add Quote,Quote Add
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +498,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 +503,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 +80,Row {0}: Qty is mandatory,row {0}: Qty မသင်မနေရ
+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 +737,Sync Master Data,Sync ကိုမာစတာ Data ကို
+apps/erpnext/erpnext/accounts/page/pos/pos.js +719,Sync Master Data,Sync ကိုမာစတာ Data ကို
 apps/erpnext/erpnext/public/js/setup_wizard.js +283,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 ကိုဖြစ်သင့်
+DocType: Student Applicant,AP,အေပီ
 DocType: Purchase Invoice Item,BOM,BOM
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,ဒါကအမြစ်ကို item အဖွဲ့နှင့်တည်းဖြတ်မရနိုင်ပါ။
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,ဒါကအမြစ်ကို item အဖွဲ့နှင့်တည်းဖြတ်မရနိုင်ပါ။
 DocType: Journal Entry Account,Purchase Order,ကုန်ပစ္စည်းအမှာစာ
 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 +345,"{0}: Employee email not found, hence email not sent","{0}: ဤအရပ်အီးမေးလ်ပို့မပို့နိုင်မတွေ့ရှိထမ်းအီးမေးလ်,"
+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,သင့်ရဲ့ကုမ္ပဏီလိပ်စာဖြစ်ပါသည်
 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 +118,"For {0}, only credit accounts can be linked against another debit entry",{0} သည်ကိုသာအကြွေးအကောင့်အသစ်များ၏အခြား debit entry ကိုဆန့်ကျင်နှင့်ဆက်စပ်နိုင်
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Delivery Note {0} is not submitted,Delivery မှတ်ချက် {0} တင်သွင်းသည်မဟုတ်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Delivery Note {0} is not submitted,Delivery မှတ်ချက် {0} တင်သွင်းသည်မဟုတ်
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Sub-contracted Item,item {0} တစ် Sub-စာချုပ်ချုပ်ဆို Item ဖြစ်ရမည်
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,မြို့တော်ပစ္စည်းများ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","စျေးနှုန်း Rule ပထမဦးဆုံး Item, Item အုပ်စုသို့မဟုတ်အမှတ်တံဆိပ်ဖြစ်နိုငျသောလယ်ပြင်၌, &#39;&#39; တွင် Apply &#39;&#39; အပေါ်အခြေခံပြီးရွေးချယ်ထားဖြစ်ပါတယ်။"
 DocType: Hub Settings,Seller Website,ရောင်းချသူဝက်ဘ်ဆိုက်
 DocType: Item,ITEM-,ITEM-
-apps/erpnext/erpnext/controllers/selling_controller.py +147,Total allocated percentage for sales team should be 100,အရောင်းအဖွဲ့မှာသည်စုစုပေါင်းခွဲဝေရာခိုင်နှုန်းက 100 ဖြစ်သင့်
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +110,Production Order status is {0},ထုတ်လုပ်မှုအမိန့် status ကို {0} သည်
+apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,အရောင်းအဖွဲ့မှာသည်စုစုပေါင်းခွဲဝေရာခိုင်နှုန်းက 100 ဖြစ်သင့်
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},ထုတ်လုပ်မှုအမိန့် status ကို {0} သည်
 DocType: Appraisal Goal,Goal,ရည်မှန်းချက်
 DocType: Sales Invoice Item,Edit Description,Edit ကိုဖော်ပြချက်
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +757,For Supplier,ပေးသွင်းအကြောင်းမူကား
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +723,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
@@ -1196,10 +1212,11 @@
 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 ကို
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,အီးမေးလ် Digest မဂ္ဂဇင်း:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +445,BOM {0} does not belong to Item {1},BOM {0} Item မှ {1} ပိုင်ပါဘူး
 DocType: Sales Partner,Target Distribution,Target ကဖြန့်ဖြူး
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1667,Deafault warehouse is required for selected item,Deafault ဂိုဒေါင်ရွေးချယ်ထားသောအရာအတွက်လိုအပ်သည်
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Deafault warehouse is required for selected item,Deafault ဂိုဒေါင်ရွေးချယ်ထားသောအရာအတွက်လိုအပ်သည်
 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
@@ -1208,23 +1225,23 @@
 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 +110,Hardware,hardware
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,hardware
 DocType: Sales Order,Recurring Upto,နူန်းကျော်ကျော်ထပ်တလဲလဲ
 DocType: Attendance,HR Manager,HR Manager
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,တစ်ကုမ္ပဏီလီမိတက်ကို select ကျေးဇူးပြု.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Privilege Leave,အခွင့်ထူးထွက်ခွာ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,အခွင့်ထူးထွက်ခွာ
 DocType: Purchase Invoice,Supplier Invoice Date,ပေးသွင်းပြေစာနေ့စွဲ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,သင်ကစျေးဝယ်ခြင်းတွန်းလှည်း enable ရန်လိုအပ်သည်
 DocType: Payment Entry,Writeoff,အကြွေးလျှော်ပစ်ခြင်း
 DocType: Appraisal Template Goal,Appraisal Template Goal,စိစစ်ရေး Template: Goal
-DocType: Salary Slip,Earning,ဝင်ငွေ
+DocType: Salary Component,Earning,ဝင်ငွေ
 DocType: Purchase Invoice,Party Account Currency,ပါတီ၏အကောင့်ကိုငွေကြေးစနစ်
 ,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 +171,Against Journal Entry {0} is already adjusted against some other voucher,ဂျာနယ် Entry &#39;{0} ဆန့်ကျင်နေပြီအချို့သောအခြားဘောက်ချာဆန့်ကျင်ညှိယူဖြစ်ပါတယ်
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,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_data.py +358,Food,အစာ
+apps/erpnext/erpnext/demo/setup/setup_data.py +301,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/course_schedule/course_schedule.js +103,Mark Attendence,မာကုကိုတက်ရောက်ဖို့
@@ -1258,12 +1275,12 @@
 DocType: Sales Order Item,Planned Quantity,စီစဉ်ထားတဲ့ပမာဏ
 DocType: Purchase Invoice Item,Item Tax Amount,item အခွန်ပမာဏ
 DocType: Item,Maintain Stock,စတော့အိတ်ထိန်းသိမ်းနည်း
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +209,Stock Entries already created for Production Order ,ပြီးသားထုတ်လုပ်မှုအမိန့်ဖန်တီးစတော့အိတ် Entries
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,ပြီးသားထုတ်လုပ်မှုအမိန့်ဖန်တီးစတော့အိတ် Entries
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,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 +620,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 +238,Max: {0},Max: {0}
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +15,From Datetime,Datetime ကနေ
+apps/erpnext/erpnext/controllers/accounts_controller.py +623,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 +239,Max: {0},Max: {0}
+apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Datetime ကနေ
 DocType: Email Digest,For Company,ကုမ္ပဏီ
 apps/erpnext/erpnext/config/support.py +17,Communication log.,ဆက်သွယ်ရေးမှတ်တမ်း။
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +153,"Request for Quotation is disabled to access from portal, for more check portal settings.","စျေးနှုန်းအဘို့တောင်းဆိုခြင်းပိုပြီးစစ်ဆေးမှုများပေါ်တယ် setting များကိုအဘို့, ပေါ်တယ်မှလက်လှမ်းမီဖို့ကိုပိတ်ထားသည်။"
@@ -1271,8 +1288,8 @@
 DocType: Sales Invoice,Shipping Address Name,သဘောင်္တင်ခလိပ်စာအမည်
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,ငွေစာရင်း၏ဇယား
 DocType: Material Request,Terms and Conditions Content,စည်းကမ်းသတ်မှတ်ချက်များအကြောင်းအရာ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +552,cannot be greater than 100,100 ကိုထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
-apps/erpnext/erpnext/stock/doctype/item/item.py +680,Item {0} is not a stock Item,item {0} တစ်စတော့ရှယ်ယာ Item မဟုတ်ပါဘူး
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +546,cannot be greater than 100,100 ကိုထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,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 ကိုမရှိရင်ထွက်ခွာအပေါ်မူတည်
@@ -1286,10 +1303,9 @@
 DocType: GL Entry,GL Entry,GL Entry &#39;
 DocType: HR Settings,Employee Settings,ဝန်ထမ်း Settings ကို
 ,Batch-Wise Balance History,batch-ပညာရှိ Balance သမိုင်း
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,စာရင်းလုပ်ပါမှ
 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 +61,Apprentice,အလုပ်သင်သူ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +102,Negative Quantity is not allowed,အနုတ်လက္ခဏာပမာဏခွင့်ပြုမထားဘူး
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,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 +152,Employee cannot report to himself.,ဝန်ထမ်းကိုယ်တော်တိုင်မှသတင်းပို့လို့မရပါဘူး။
@@ -1310,15 +1326,14 @@
 DocType: Asset,Asset Name,ပိုင်ဆိုင်မှုအမည်
 DocType: Shipping Rule Condition,To Value,Value တစ်ခုမှ
 DocType: Asset Movement,Stock Manager,စတော့အိတ် Manager က
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +141,Source warehouse is mandatory for row {0},source ဂိုဒေါင်အတန်း {0} သည်မသင်မနေရ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +719,Packing Slip,ထုပ်ပိုးစလစ်ဖြတ်ပိုင်းပုံစံ
+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 +713,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/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,quotation အဘို့တောင်းဆိုခြင်းအောက်ပါ link ကိုနှိပ်ခြင်းအားဖြင့်ဝင်ရောက်ခွင့်ရှိနိုင်ပါသည်
 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 +81,Analyst,လေ့လာဆန်းစစ်သူ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,လေ့လာဆန်းစစ်သူ
 DocType: Item,Inventory,စာရင်း
 DocType: Item,Sales Details,အရောင်းအသေးစိတ်ကို
 DocType: Quality Inspection,QI-,QI-
@@ -1326,7 +1341,7 @@
 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 +103,Government,အစိုးရ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,အစိုးရ
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,Institute မှအမည်
 apps/erpnext/erpnext/config/stock.py +289,Item Variants,item Variant
 DocType: Company,Services,န်ဆောင်မှုများ
@@ -1342,6 +1357,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,Financial Year Start Date,ဘဏ္ဍာရေးတစ်နှစ်တာ Start ကိုနေ့စွဲ
 DocType: POS Profile,Apply Discount,လျှော့ Apply
 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,ရင်းနှီးမြုပ်နှံထံမှငွေကြေးစီးဆင်းမှု
 DocType: Program Course,Program Course,Program ကိုသင်တန်းအမှတ်စဥ်
@@ -1382,12 +1398,12 @@
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,receiver List ကိုအချည်းနှီးပါပဲ။ Receiver များစာရင်းဖန်တီး ကျေးဇူးပြု.
 DocType: Production Plan Sales Order,Production Plan Sales Order,ထုတ်လုပ်မှုစီမံကိန်းအရောင်းအမိန့်
 DocType: Sales Partner,Sales Partner Target,အရောင်း Partner Target က
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +110,Accounting Entry for {0} can only be made in currency: {1},{1}: {0} သာငွေကြေးကိုအတွက်ဖန်ဆင်းနိုင်ပါတယ်များအတွက်စာရင်းကိုင် Entry &#39;
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},{1}: {0} သာငွေကြေးကိုအတွက်ဖန်ဆင်းနိုင်ပါတယ်များအတွက်စာရင်းကိုင် Entry &#39;
 DocType: Pricing Rule,Pricing Rule,စျေးနှုန်း Rule
 DocType: Budget,Action if Annual Budget Exceeded,လှုပ်ရှားမှုနှစ်ပတ်လည်ဘတ်ဂျက်ကျော်သွားပါပြီလျှင်
 apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,အမိန့်ကိုဝယ်ယူအသုံးပြုမှ material တောင်းဆိုခြင်း
 DocType: Shopping Cart Settings,Payment Success URL,ငွေပေးချေမှုရမည့်အောင်မြင်မှု URL ကို
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +78,Row # {0}: Returned Item {1} does not exists in {2} {3},row # {0}: Return Item {1} {2} {3} ထဲမှာရှိနေပြီပါဘူး
+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,ဘဏ်မှပြန်လည်ရင်ကြားစေ့ရေးထုတ်ပြန်ကြေညာချက်
@@ -1396,40 +1412,39 @@
 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/stock/doctype/stock_entry/stock_entry.py +339,Not allowed to tranfer more {0} than {1} against Purchase Order {2},ဝယ်ယူခြင်းအမိန့် {2} ဆန့်ကျင် {1} ထက် {0} ပိုပြီး tranfer ခွင့်မပြုခဲ့
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +344,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 +545,Manufacturing Quantity is mandatory,ကုန်ထုတ်လုပ်မှုပမာဏမသင်မနေရ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,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 +71,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 +162,Row {0}: From Time and To Time of {1} is overlapping with {2},အတန်း {0}: အချိန်နှင့်ရန်ကနေ {1} ၏အချိန် {2} နှင့်အတူထပ်ဖြစ်ပါတယ်
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +186,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,စတော့အိတ်မှုစိစစ်
 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 +130,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 +137,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,အခြားအစီရင်ခံစာများ
 DocType: Dependent Task,Dependent Task,မှီခို Task
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,လူ့စွမ်းအားအရင်းအမြစ်အတွက် System ကိုအမည်ဖြင့်သမုတ် ကျေးဇူးပြု. setup ကိုထမ်း&gt; HR က Settings
 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 +190,Leave of type {0} cannot be longer than {1},{0} တော့ဘူး {1} ထက်မဖွစျနိုငျအမျိုးအစား Leave
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +197,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 +921,Search Item,ရှာရန် Item
+apps/erpnext/erpnext/accounts/page/pos/pos.js +910,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 +546,Already completed,ယခုပင်လျှင်ပြီးစီး
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +22,Payment Request already exists {0},ငွေပေးချေမှုရမည့်တောင်းခံခြင်းပြီးသား {0} ရှိတယ်ဆိုတဲ့
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +550,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 +241,Quantity must not be more than {0},အရေအတွက် {0} ထက်ပိုပြီးမဖြစ်ရပါမည်
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Quantity must not be more than {0},အရေအတွက် {0} ထက်ပိုပြီးမဖြစ်ရပါမည်
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +76,Previous Financial Year is not closed,ယခင်ဘဏ္ဍာရေးတစ်နှစ်တာပိတ်လိုက်သည်မဟုတ်
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +44,Age (Days),အသက်အရွယ် (နေ့ရက်များ)
 DocType: Quotation Item,Quotation Item,စျေးနှုန်း Item
@@ -1446,7 +1461,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +221,Purchase Receipt {0} is not submitted,ဝယ်ယူခြင်း Receipt {0} တင်သွင်းသည်မဟုတ်
 DocType: Company,Default Payable Account,default ပေးဆောင်အကောင့်
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","ထိုကဲ့သို့သောစသည်တို့ရေကြောင်းစည်းမျဉ်းစည်းကမ်းများ, စျေးနှုန်းစာရင်းအဖြစ်အွန်လိုင်းစျေးဝယ်လှည်းသည် Settings ကို"
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +83,{0}% Billed,ကြေညာတဲ့ {0}%
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,ကြေညာတဲ့ {0}%
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Reserved Qty
 DocType: Party Account,Party Account,ပါတီအကောင့်
 apps/erpnext/erpnext/config/setup.py +116,Human Resources,လူ့အင်အားအရင်းအမြစ်
@@ -1458,12 +1473,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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/schools/doctype/fees/fees.js +22,Collect,စုဝေး
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,စုဝေး
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,Against Supplier Invoice {0} dated {1},ပေးသွင်းပြေစာ {0} ဆန့်ကျင် {1} ရက်စွဲပါ
 DocType: Customer,Default Price List,default စျေးနှုန်းများစာရင်း
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +225,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 အနေနဲ့အဖြစ်သတ်မှတ်
-DocType: Payment Reconciliation,Payments,ငွေပေးချေမှု
 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,ပေးဆောင်ရမည့်ငွေစာရင်းထဲမှာပိုက်ကွန်ကိုပြောင်းရန်
@@ -1475,7 +1489,7 @@
 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 +9,Procurement,ဝယ်ယူရေး
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,ထိုပစ္စည်းများကိုအဘယ်သူအားမျှအရေအတွက်သို့မဟုတ်တန်ဖိုးကိုအတွက်မည်သည့်အပြောင်းအလဲရှိသည်။
+apps/erpnext/erpnext/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,အာမခံပြောဆိုချက်ကို
 ,Lead Details,ခဲအသေးစိတ်ကို
 DocType: Purchase Invoice,End date of current invoice's period,လက်ရှိကုန်ပို့လွှာရဲ့ကာလ၏အဆုံးနေ့စွဲ
@@ -1500,7 +1514,7 @@
 DocType: Purchase Invoice,Additional Discount,အပိုဆောင်းလျှော့
 DocType: Selling Settings,Selling Settings,Settings ကိုရောင်းချနေ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,အကြီးဆုံးအွန်လိုင်းအဘိဓါန်လေလံ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +97,Please specify either Quantity or Valuation Rate or both,ပမာဏသို့မဟုတ်အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည် Rate သို့မဟုတ်နှစ်ဦးစလုံးဖြစ်စေသတ်မှတ် ကျေးဇူးပြု.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,ပမာဏသို့မဟုတ်အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည် Rate သို့မဟုတ်နှစ်ဦးစလုံးဖြစ်စေသတ်မှတ် ကျေးဇူးပြု.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +13,Fulfillment,ပွညျ့စုံ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","ကုမ္ပဏီ, လနှင့်ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာမသင်မနေရ"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,marketing အသုံးစရိတ်များ
@@ -1521,14 +1535,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,အပြီးအစီး ERPNext Setup ကို!
 DocType: Item,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +93,A Customer Group exists with same name please change the Customer name or rename the Customer Group,တစ်ဖောက်သည်အုပ်စုနာမည်တူနှင့်အတူတည်ရှိသုံးစွဲသူအမည်ကိုပြောင်းလဲဒါမှမဟုတ်ဖောက်သည်အုပ်စုအမည်ပြောင်းကျေးဇူးတင်ပါ
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +126,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
 DocType: Stock Entry,Material Receipt,material Receipt
 DocType: Homepage,Products,ထုတ်ကုန်များ
 DocType: Announcement,Instructor,နည်းပြဆရာ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},ပါတီ Type နှင့်ပါတီ receiver / ပေးဆောင်အကောင့်လိုအပ်သည် {0}
 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 ကိုဆက်သွယ်ရန်အားဖြင့်
@@ -1539,7 +1552,7 @@
 ,Item-wise Sales Register,item-ပညာရှိသအရောင်းမှတ်ပုံတင်မည်
 DocType: Asset,Gross Purchase Amount,စုစုပေါင်းအရစ်ကျငွေပမာဏ
 DocType: Asset,Depreciation Method,တန်ဖိုး Method ကို
-apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Offline,အော့ဖ်လိုင်း
+apps/erpnext/erpnext/accounts/page/pos/pos.js +686,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,တောင်းဆိုနေတဲ့
@@ -1557,25 +1570,27 @@
 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 ကိုသည်တက်ကြွသောဖြစ်ရမည်
 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 +858,Make Purchase Order,ဝယ်ယူခြင်းအမိန့်လုပ်ပါ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +852,Make Purchase Order,ဝယ်ယူခြင်းအမိန့်လုပ်ပါ
 DocType: SMS Center,Send To,ရန် Send
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,There is not enough leave balance for Leave Type {0},ထွက်ခွာ Type {0} လုံလောက်ခွင့်ချိန်ခွင်မရှိ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,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 ကို
 DocType: Stock Reconciliation,Stock Reconciliation,စတော့အိတ်ပြန်လည်ရင်ကြားစေ့ရေး
 DocType: Territory,Territory Name,နယ်မြေတွေကိုအမည်
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +172,Work-in-Progress Warehouse is required before Submit,အလုပ်-In-တိုးတက်ရေးပါတီဂိုဒေါင်ခင် Submit လိုအပ်သည်
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,Work-in-Progress Warehouse is required before Submit,အလုပ်-In-တိုးတက်ရေးပါတီဂိုဒေါင်ခင် Submit လိုအပ်သည်
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,တစ်ဦးယောဘသည်လျှောက်ထားသူ။
 DocType: Purchase Order Item,Warehouse and Reference,ဂိုဒေါင်နှင့်ကိုးကားစရာ
 DocType: Supplier,Statutory info and other general information about your Supplier,ပြဋ္ဌာန်းဥပဒေအချက်အလက်နှင့်သင်၏ပေးသွင်းအကြောင်းကိုအခြားအထွေထွေသတင်းအချက်အလက်
-apps/erpnext/erpnext/hooks.py +88,Addresses,လိပ်စာများ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,ပေးသွင်း&gt; ပေးသွင်းအမျိုးအစား
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +212,Against Journal Entry {0} does not have any unmatched {1} entry,ဂျာနယ် Entry &#39;{0} ဆန့်ကျင်မည်သည့် unmatched {1} entry ကိုမရှိပါဘူး
+apps/erpnext/erpnext/hooks.py +95,Addresses,လိပ်စာများ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +215,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 ကိုသတ်မှတ်ထားပေးပါ
 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,လှတျတျောမူနှင့်ဘီလ်မှ
@@ -1583,11 +1598,10 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,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 +731,Payment,ငွေပေးချေမှုရမည့်
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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: Pricing Rule,Brand,ကုန်အမှတ်တံဆိပ်
 DocType: Course,Course Abbreviation,သင်တန်းအတိုကောက်
 DocType: Item,Will also apply for variants,စမျိုးကွဲလျှောက်ထားလိမ့်မည်ဟု
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +142,"Asset cannot be cancelled, as it is already {0}","ဒါကြောင့် {0} ပြီးသားဖြစ်သကဲ့သို့ပိုင်ဆိုင်မှု, ဖျက်သိမ်းမရနိုငျ"
@@ -1599,7 +1613,7 @@
 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 အုပ်စု, တိုင်းနှင့်အခြားဂုဏ်သတ္တိ၏ယူနစ်ကိုစစ်ဆေးသေချာအောင်လုပ်ပါ။"
 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 +85,Associate,အပေါင်းအဖေါ်
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,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
@@ -1607,7 +1621,7 @@
 DocType: Production Planning Tool,Material Requests,ပစ္စည်းတောင်းဆိုချက်များ
 DocType: Warranty Claim,Issue Date,ထုတ်ပြန်ရက်စွဲ
 DocType: Activity Cost,Activity Cost,လုပ်ဆောင်ချက်ကုန်ကျစရိတ်
-DocType: Timesheet Detail,Timesheet Detail,Timesheet Detail
+DocType: Sales Invoice Timesheet,Timesheet Detail,Timesheet Detail
 DocType: Purchase Receipt Item Supplied,Consumed Qty,ကျွမ်းလောင် Qty
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,ဆက်သွယ်ရေးလုပ်ငန်း
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),(သာလျှင် Draft) ကို package ကိုဒီပို့ဆောင်မှု၏အစိတ်အပိုင်းတစ်ခုဖြစ်တယ်ဆိုတာဆိုတာကိုပြသ
@@ -1630,6 +1644,7 @@
 DocType: Production Plan Material Request,Material Request Date,ပစ္စည်းတောင်းဆိုမှုနေ့စွဲ
 DocType: Purchase Order Item,Supplier Quotation Item,ပေးသွင်းစျေးနှုန်း 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,မူကွဲရှိပါတယ်
 DocType: Monthly Distribution,Name of the Monthly Distribution,အဆိုပါလစဉ်ဖြန့်ဖြူးအမည်
 DocType: Sales Person,Parent Sales Person,မိဘအရောင်းပုဂ္ဂိုလ်
@@ -1642,30 +1657,31 @@
 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 +44,"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/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.,သင်အရောင်းပြေစာကိုကယ်တင်တစ်ချိန်ကစကားမြင်နိုင်ပါလိမ့်မည်။
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +502,Error: {0} &gt; {1},အမှား: {0}&gt; {1}
 DocType: Item,Is Sales Item,အရောင်း Item ဖြစ်ပါတယ်
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,item Group ကသစ်ပင်
 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 ကိုနေ့စွဲထက်အစောပိုင်းမှာမဖြစ်နိုင်ပါ။ အရက်စွဲများပြင်ဆင်ရန်နှင့်ထပ်ကြိုးစားပါ။
 DocType: Naming Series,Current Value,လက်ရှိ Value တစ်ခု
-apps/erpnext/erpnext/controllers/accounts_controller.py +235,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,အကွိမျမြားစှာဘဏ္ဍာရေးနှစ်အနှစ်ရက်စွဲ {0} အဘို့တည်ရှိတယ်။ ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာအတွက်ကုမ္ပဏီသတ်မှတ်ထားပေးပါ
+apps/erpnext/erpnext/controllers/accounts_controller.py +238,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,serial မရှိပါနဲ့ Status
 DocType: Payment Entry Reference,Outstanding,ထူးချွန်
 ,Daily Timesheet Summary,Daily သတင်းစာ Timesheet အကျဉ်းချုပ်
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +458,Item table can not be blank,item table ကိုအလွတ်မဖွစျနိုငျ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +443,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 +5,This is based on stock movement. See {0} for details,ဒီစတော့ရှယ်ယာလှုပ်ရှားမှုအပေါ်အခြေခံသည်။ အသေးစိတျအဘို့ {0} ကိုကြည့်ပါ
 DocType: Pricing Rule,Selling,အရောင်းရဆုံး
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +341,Amount {0} {1} deducted against {2},ငွေပမာဏ {0} {1} {2} ဆန့်ကျင်နုတ်ယူ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +344,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,ကြောင့်နေ့စွဲနေ့စွဲများသို့တင်ပြခြင်းမပြုမီမဖွစျနိုငျ
@@ -1680,8 +1696,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +144,Cannot refer row number greater than or equal to current row number for this Charge type,ဒီတာဝန်ခံအမျိုးအစားသည်ထက် သာ. ကြီးမြတ်သို့မဟုတ်လက်ရှိအတန်းအရေအတွက်တန်းတူအတန်းအရေအတွက်ကိုရည်ညွှန်းနိုင်ဘူး
 DocType: Asset,Sold,ကိုရောင်းချ
 ,Item-wise Purchase History,item-ပညာရှိသဝယ်ယူခြင်းသမိုင်း
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Red,နီသော
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Serial No ဆွဲယူဖို့ &#39;&#39; Generate ဇယား &#39;&#39; ကို click ပါ ကျေးဇူးပြု. Item {0} သည်ကဆက်ပြောသည်
+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,ပွင့်လင်းထုတ်လုပ်မှုအမိန့်
 DocType: Sales Invoice Payment,Base Amount (Company Currency),base ငွေပမာဏ (ကုမ္ပဏီငွေကြေးစနစ်)
@@ -1689,7 +1705,7 @@
 DocType: Installation Note,Installation Time,Installation လုပ်တဲ့အချိန်
 DocType: Sales Invoice,Accounting Details,စာရင်းကိုင် Details ကို
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,ဒီကုမ္ပဏီအပေါငျးတို့သငွေကြေးကိစ္စရှင်းလင်းမှု Delete
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +187,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,row # {0}: စစ်ဆင်ရေး {1} ထုတ်လုပ်မှုအမိန့် # {3} အတွက်ချောကုန်စည် {2} qty သည်ပြီးစီးသည်မဟုတ်။ အချိန် Logs ကနေတဆင့်စစ်ဆင်ရေးအဆင့်အတန်းကို update ကျေးဇူးပြု.
+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,row # {0}: စစ်ဆင်ရေး {1} ထုတ်လုပ်မှုအမိန့် # {3} အတွက်ချောကုန်စည် {2} qty သည်ပြီးစီးသည်မဟုတ်။ အချိန် Logs ကနေတဆင့်စစ်ဆင်ရေးအဆင့်အတန်းကို update ကျေးဇူးပြု.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,ရင်းနှီးမြှုပ်နှံမှုများ
 DocType: Issue,Resolution Details,resolution အသေးစိတ်ကို
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,နေရာချထားခြင်း
@@ -1725,16 +1741,17 @@
 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}
 DocType: Delivery Note,Excise Page Number,ယစ်မျိုးစာမျက်နှာနံပါတ်
 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 ကျေးဇူးပြု.
 ,Maintenance Schedules,ပြုပြင်ထိန်းသိမ်းမှုအချိန်ဇယား
 DocType: Task,Actual End Date (via Time Sheet),(အချိန်စာရွက်မှတဆင့်) အမှန်တကယ်ပြီးဆုံးရက်စွဲ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Amount {0} {1} against {2} {3},ငွေပမာဏ {0} {1} {2} {3} ဆန့်ကျင်
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +339,Amount {0} {1} against {2} {3},ငွေပမာဏ {0} {1} {2} {3} ဆန့်ကျင်
 ,Quotation Trends,စျေးနှုန်းခေတ်ရေစီးကြောင်း
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},ကို item {0} သည်ကို item မာစတာတှငျဖျောပွမ item Group က
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +295,Debit To account must be a Receivable account,အကောင့်ဖွင့်ရန် debit တစ် receiver အကောင့်ကိုရှိရမည်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Receivable account,အကောင့်ဖွင့်ရန် debit တစ် receiver အကောင့်ကိုရှိရမည်
 DocType: Shipping Rule Condition,Shipping Amount,သဘောင်္တင်ခပမာဏ
 ,Pending Amount,ဆိုင်းငံ့ထားသောငွေပမာဏ
 DocType: Purchase Invoice Item,Conversion Factor,ကူးပြောင်းခြင်း Factor
@@ -1742,10 +1759,10 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +137,Expected value after useful life must be greater than or equal to {0},အသုံးဝင်သောဘဝပြီးနောက်မျှော်မှန်းတန်ဖိုးထက်ထက် သာ. ကြီးမြတ်သို့မဟုတ် {0} တန်းတူဖြစ်ရပါမည်
 DocType: Purchase Receipt,Vehicle Number,မော်တော်ယာဉ်နံပါတ်
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,ထပ်တလဲလဲကုန်ပို့လွှာရပ်တန့်ဖြစ်ရလိမ့်မည်သည့်နေ့ရက်
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +90,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Total ကုမ္ပဏီခွဲဝေအရွက် {0} ကာလအဘို့ပြီးသားအတည်ပြုပြီးအရွက် {1} ထက်လျော့နည်းမဖွစျနိုငျ
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +93,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 +22,Enter Paid Amount,Paid ငွေပမာဏကိုရိုက်ထည့်
+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 ကိုသုံးပါ
@@ -1755,13 +1772,15 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,Timesheets
 DocType: HR Settings,HR Settings,HR Settings ကို
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Expense Claim is pending approval. Only the Expense Approver can update status.,စရိတ်တောင်းဆိုမှုများအတည်ပြုချက်ဆိုင်းငံ့ထားတာဖြစ်ပါတယ်။ ကိုသာသုံးစွဲမှုအတည်ပြုချက် status ကို update ပြုလုပ်နိုင်ပါသည်။
+DocType: Email Digest,New Expenses,နယူးကုန်ကျစရိတ်
 DocType: Purchase Invoice,Additional Discount Amount,အပိုဆောင်းလျှော့ငွေပမာဏ
-apps/erpnext/erpnext/controllers/accounts_controller.py +524,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","အတန်း # {0}: item ကိုသတ်မှတ်ထားတဲ့အရာတစ်ခုပါပဲအဖြစ်အရည်အတွက်, 1 ဖြစ်ရမည်။ မျိုးစုံအရည်အတွက်ကိုခွဲတန်းကိုသုံးပေးပါ။"
+apps/erpnext/erpnext/controllers/accounts_controller.py +527,"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 +249,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/stock/get_item_details.py +123,Please specify Company,ကုမ္ပဏီသတ်မှတ် ကျေးဇူးပြု.
 ,Customer Acquisition and Loyalty,customer သိမ်းယူမှုနှင့်သစ္စာ
@@ -1772,17 +1791,19 @@
 apps/erpnext/erpnext/projects/doctype/task/task.js +26,Expense Claims,စရိတ်စွပ်စွဲ
 DocType: Issue,Support,ထောက်ပံ့
 ,BOM Search,BOM ရှာရန်
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Closing (Opening + Totals),(+ စုစုပေါင်းမှတ်တမ်းဖွင့်လှစ်) ပိတ်ပစ်
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),(+ စုစုပေါင်းမှတ်တမ်းဖွင့်လှစ်) ပိတ်ပစ်
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,ကုမ္ပဏီအတွက်ငွေကြေးသတ်မှတ် ကျေးဇူးပြု.
 DocType: Workstation,Wages per hour,တစ်နာရီလုပ်ခ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +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/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,အောက်ပါပစ္စည်းများတောင်းဆိုမှုများပစ္စည်းရဲ့ Re-အမိန့် level ကိုအပေါ်အခြေခံပြီးအလိုအလြောကျထမြောက်ကြပါပြီ
-apps/erpnext/erpnext/controllers/accounts_controller.py +272,Account {0} is invalid. Account Currency must be {1},အကောင့်ကို {0} မမှန်ကန်ဘူး။ အကောင့်ကိုငွေကြေးစနစ် {1} ဖြစ်ရပါမည်
+DocType: Email Digest,Pending Sales Orders,ဆိုင်းငံ့အရောင်းအမိန့်
+apps/erpnext/erpnext/controllers/accounts_controller.py +275,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 +956,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",အတန်း # {0}: ကိုးကားစရာစာရွက်စာတမ်းအမျိုးအစားအရောင်းအမိန့်အရောင်းပြေစာသို့မဟုတ်ဂျာနယ် Entry တယောက်ဖြစ်ရပါမည်
-DocType: Salary Slip,Deduction,သဘောအယူအဆ
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +87,Row {0}: From Time and To Time is mandatory.,အတန်း {0}: အချိန်နှင့်ရန်အချိန် မှစ. မဖြစ်မနေဖြစ်ပါတယ်။
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +969,"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 +111,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 +262,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 +7,Please enter Employee Id of this sales person,ဒီအရောင်းလူတစ်ဦး၏န်ထမ်း Id ကိုရိုက်ထည့်ပေးပါ
@@ -1790,7 +1811,7 @@
 DocType: Project,% Tasks Completed,% Tasks ကို Completed
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,ကွာခြားချက်ပမာဏသုညဖြစ်ရပါမည်
 DocType: Project,Gross Margin,gross Margin
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +194,Please enter Production Item first,ထုတ်လုပ်မှု Item ပထမဦးဆုံးရိုက်ထည့်ပေးပါ
+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,မသန်မစွမ်းအသုံးပြုသူ
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,ကိုးကာချက်
@@ -1799,53 +1820,54 @@
 DocType: Maintenance Visit,Maintenance User,ပြုပြင်ထိန်းသိမ်းမှုအသုံးပြုသူတို့၏
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +149,Cost Updated,ကုန်ကျစရိတ် Updated
 DocType: Employee,Date of Birth,မွေးနေ့
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +86,Item {0} has already been returned,item {0} ပြီးသားပြန်ထားပြီ
+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 ကိုလက်မှတ်ကို
+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 +177,Job Description,လုပ်ငန်းတာဝန်သတ်မှတ်ချက်
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,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 +126,"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 +127,"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 အောင်ထားပါ။ ရင်းနှီးမြှုပ်နှံမှုအပေါ်သို့ပြန်သွားသည်ကိုခန့်မှန်းရန်လှုံ့ဆော်မှုများအနေဖြင့်စသည်တို့ကိုအရောင်းအမိန့်, ကိုးကားချက်များ, ခဲခြေရာခံစောင့်ရှောက်ကြလော့။"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +24,Welcome to POS: Create your POS Profile,POS မှလှိုက်လှဲစွာကြိုဆိုပါသည်: သင်၏ POS Profile Create
 DocType: Expense Claim,Approver,ခွင့်ပြုချက်
 ,SO Qty,SO Qty
+DocType: Guardian,Work Address,အလုပ်လိပ်စာ
 DocType: Appraisal,Calculate Total Score,စုစုပေါင်းရမှတ်ကိုတွက်ချက်
 DocType: Request for Quotation,Manufacturing Manager,ကုန်ထုတ်လုပ်မှု Manager က
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},serial No {0} {1} ထိအာမခံအောက်မှာဖြစ်ပါတယ်
+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 +74,Shipments,တင်ပို့ရောင်းချမှု
+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,serial မရှိပါ {0} ဆိုဂိုဒေါင်ပိုင်ပါဘူး
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,Row # ,row #
+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 +156,Get From,မှစ. Get
+apps/erpnext/erpnext/public/js/utils.js +167,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 +167,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 +416,"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 ကိုကိုထားကိုကျေးဇူးတင်ပါ"
+apps/erpnext/erpnext/controllers/accounts_controller.py +419,"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
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} is disabled,အသုံးပြုသူ {0} ပိတ်ထားတယ်
 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...,ကုမ္ပဏီကိုရွေးချယ်ပါ ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,အားလုံးဌာနများစဉ်းစားလျှင်အလွတ် Leave
 apps/erpnext/erpnext/config/hr.py +171,"Types of employment (permanent, contract, intern etc.).","အလုပ်အကိုင်အခွင့်အအမျိုးအစားများ (ရာသက်ပန်, စာချုပ်, အလုပ်သင်ဆရာဝန်စသည်တို့) ။"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +346,{0} is mandatory for Item {1},{0} Item {1} သည်မသင်မနေရ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,{0} is mandatory for Item {1},{0} Item {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 တယောက်အတန်းအတွက်ခွဲဝေငွေပမာဏ, ပြေစာ Type နှင့်ပြေစာနံပါတ်ကို select ကျေးဇူးပြု."
 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},Item {0} လိုအပ်အရောင်းအမိန့်
 DocType: Purchase Invoice Item,Rate (Company Currency),rate (ကုမ္ပဏီငွေကြေးစနစ်)
-apps/erpnext/erpnext/demo/setup_data.py +360,Others,အခြားသူများ
+DocType: Student Guardian,Others,အခြားသူများ
 DocType: Payment Entry,Unallocated Amount,ထဲကအသုံးမပြုတဲ့ငွေပမာဏ
 apps/erpnext/erpnext/templates/includes/product_page.js +65,Cannot find a matching Item. Please select some other value for {0}.,တစ်ကိုက်ညီတဲ့ပစ္စည်းရှာမတှေ့နိုငျပါသညျ။ {0} များအတွက်အချို့သောအခြား value ကို select လုပ်ပါကိုကျေးဇူးတင်ပါ။
 DocType: POS Profile,Taxes and Charges,အခွန်နှင့်စွပ်စွဲချက်
@@ -1865,17 +1887,16 @@
 apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,Serial Inventory
 DocType: Activity Type,Default Billing Rate,Default အနေနဲ့ငွေတောင်းခံလွှာနှုန်း
 DocType: Sales Invoice,Total Billing Amount,စုစုပေါင်း Billing ငွေပမာဏ
-apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +54,Receivable Account,receiver အကောင့်
-apps/erpnext/erpnext/controllers/accounts_controller.py +546,Row #{0}: Asset {1} is already {2},အတန်း # {0}: ပိုင်ဆိုင်မှု {1} {2} ပြီးသားဖြစ်ပါတယ်
+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 +549,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 +79,CEO,စီအီးအို
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,စီအီးအို
 DocType: Expense Claim Detail,Expense Claim Detail,စရိတ်တောင်းဆိုမှုများ Detail
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +808,Please select correct account,မှန်ကန်သောအကောင့်ကို select လုပ်ပါ ကျေးဇူးပြု.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +809,Please select correct account,မှန်ကန်သောအကောင့်ကို select လုပ်ပါ ကျေးဇူးပြု.
 DocType: Item,Weight UOM,အလေးချိန် UOM
 DocType: Salary Structure Employee,Salary Structure Employee,လစာဖွဲ့စည်းပုံထမ်း
 DocType: Employee,Blood Group,လူအသွေး Group က
-DocType: Purchase Invoice Item,Page Break,စာမျက်နှာ Break
 DocType: Production Order Operation,Pending,လာမည့်
 DocType: Course,Course Name,သင်တန်းအမည်
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,အတိအကျန်ထမ်းရဲ့ခွင့်ပလီကေးရှင်းကိုအတည်ပြုနိုင်သူသုံးစွဲသူများက
@@ -1884,14 +1905,15 @@
 DocType: Fiscal Year,Companies,ကုမ္ပဏီများ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,အီလက်ထရောနစ်
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,စတော့ရှယ်ယာပြန်လည်မိန့်အဆင့်ရောက်ရှိသည့်အခါပစ္စည်းတောင်းဆိုမှုမြှင်
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Full-time,အချိန်ပြည့်
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,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 ထဲမှာတစ်ဦးစံ template ကိုဖန်တီးခဲ့လျှင်, တယောက်ရွေးပြီးအောက်တွင်ဖော်ပြထားသော button ကို click လုပ်ပါ။"
+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,ဒီအသဘောင်္တင်စိုးမိုးရေးများအတွက်တိုင်းပြည် specify သို့မဟုတ် Worldwide မှသဘောင်္တင်စစ်ဆေးပါ
 DocType: Stock Entry,Total Incoming Value,စုစုပေါင်း Incoming Value တစ်ခု
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Debit To is required,debit ရန်လိုအပ်သည်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +321,Debit To is required,debit ရန်လိုအပ်သည်
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,ဝယ်ယူစျေးနှုန်းများစာရင်း
 DocType: Offer Letter Term,Offer Term,ကမ်းလှမ်းမှုကို Term
 DocType: Quality Inspection,Quality Manager,အရည်အသွေးအ Manager က
@@ -1899,6 +1921,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/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
@@ -1909,18 +1932,17 @@
 DocType: Production Order Operation,Completed Qty,ပြီးစီး Qty
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"For {0}, only debit accounts can be linked against another credit entry","{0} အဘို့, သာ debit အကောင့်အသစ်များ၏အခြားအကြွေး entry ကိုဆန့်ကျင်နှင့်ဆက်စပ်နိုင်"
 apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,စျေးနှုန်းစာရင်း {0} ပိတ်ထားတယ်
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +99,Row {0}: Completed Qty cannot be more than {1} for operation {2},အတန်း {0}: Completed အရည်အတွက် {2} စစ်ဆင်ရေးများအတွက် {1} ထက်ပိုပြီးမဖွစျနိုငျ
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +123,Row {0}: Completed Qty cannot be more than {1} for operation {2},အတန်း {0}: Completed အရည်အတွက် {2} စစ်ဆင်ရေးများအတွက် {1} ထက်ပိုပြီးမဖွစျနိုငျ
 DocType: Manufacturing Settings,Allow Overtime,အချိန်ပို Allow
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,Item {1} များအတွက်လိုအပ်သော {0} Serial Number ။ သငျသညျ {2} ထောက်ပံ့ကြပါပြီ။
 DocType: Stock Reconciliation Item,Current Valuation Rate,လက်ရှိအကောက်ခွန်တန်ဖိုးသတ်မှတ်မည် Rate
 DocType: Item,Customer Item Codes,customer Item ကုဒ်တွေဟာ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,ချိန်း Gain / ပျောက်ဆုံးခြင်း
 DocType: Opportunity,Lost Reason,ပျောက်ဆုံးသွားရသည့်အကြောင်းရင်း
-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/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/purchase_receipt/purchase_receipt.py +378,All items have already been invoiced,ပစ္စည်းများအားလုံးပြီးသား invoiced ပြီ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +379,All items have already been invoiced,ပစ္စည်းများအားလုံးပြီးသား invoiced ပြီ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',&#39;&#39; အမှုအမှတ် မှစ. &#39;&#39; တရားဝင်သတ်မှတ် ကျေးဇူးပြု.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,နောက်ထပ်ကုန်ကျစရိတ်စင်တာများအဖွဲ့များအောက်မှာလုပ်နိုင်ပေမယ့် entries တွေကို Non-အဖွဲ့များဆန့်ကျင်စေနိုင်ပါတယ်
 DocType: Project,External,external
@@ -1936,18 +1958,19 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,သင့် Customer
 apps/erpnext/erpnext/projects/doctype/project/project.py +141,You have been invited to collaborate on the project: {0},သငျသညျစီမံကိန်းကိုအပေါ်ပူးပေါင်းဖို့ဖိတ်ခေါ်ခဲ့ကြ: {0}
 DocType: Leave Block List Date,Block Date,block နေ့စွဲ
-apps/erpnext/erpnext/templates/generators/job_opening.html +19,Apply Now,အခုဆိုရင် Apply
+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 ။"
 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,အဆောက်အဦးများ
-apps/erpnext/erpnext/utilities/doctype/address/address.py +164,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: Fee Structure,Fee Structure,အခကြေးငွေဖွဲ့စည်းပုံ
 DocType: Timesheet Detail,Costing Amount,ငွေပမာဏကုန်ကျ
+DocType: Student Admission,Application Fee,လျှောက်လွှာကြေး
 DocType: Process Payroll,Submit Salary Slip,လစာစလစ်ဖြတ်ပိုင်းပုံစံ Submit
-apps/erpnext/erpnext/controllers/selling_controller.py +161,Maxiumm discount for Item {0} is {1}%,Item {0} သည် Maxiumm လျှော့စျေး {1}% ဖြစ်ပါသည်
+apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,Item {0} သည် Maxiumm လျှော့စျေး {1}% ဖြစ်ပါသည်
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,ထုထည်ကြီးအတွက်သွင်းကုန်
 DocType: Sales Partner,Address & Contacts,လိပ်စာ &amp; ဆက်သွယ်ရန်
 DocType: SMS Log,Sender Name,ပေးပို့သူအမည်
@@ -1972,21 +1995,21 @@
 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_data.py +361,Travel,ခရီးသွား
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +155,No active or default Salary Structure found for employee {0} for the given dates,ပေးထားသောရက်စွဲများအတွက်ဝန်ထမ်း {0} ဘို့မျှမတွေ့တက်ကြွသို့မဟုတ် default အနေနဲ့လစာဖွဲ့စည်းပုံ
+apps/erpnext/erpnext/demo/setup/setup_data.py +304,Travel,ခရီးသွား
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +167,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 +23,Update Cost,Update ကိုကုန်ကျစရိတ်
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Update ကိုကုန်ကျစရိတ်
 DocType: Item Reorder,Item Reorder,item Reorder
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +36,Show Salary Slip,Show ကိုလစာစလစ်ဖြတ်ပိုင်းပုံစံ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +748,Transfer Material,ပစ္စည်းလွှဲပြောင်း
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +53,Show Salary Slip,Show ကိုလစာစလစ်ဖြတ်ပိုင်းပုံစံ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +166,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 +923,Please set recurring after saving,ချွေပြီးနောက်ထပ်တလဲလဲသတ်မှတ်ထားပေးပါ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +646,Select change amount account,ပြောင်းလဲမှုငွေပမာဏကိုအကောင့်ကို Select လုပ်ပါ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +914,Please set recurring after saving,ချွေပြီးနောက်ထပ်တလဲလဲသတ်မှတ်ထားပေးပါ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +703,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
@@ -1998,31 +2021,32 @@
 DocType: Quality Inspection,Verified By,By Verified
 DocType: Address,Subsidiary,ထောက်ခံသောကုမ္ပဏီ
 apps/erpnext/erpnext/setup/doctype/company/company.py +64,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","လက်ရှိအရောင်းအရှိပါသည်ကြောင့်, ကုမ္ပဏီ၏ default ငွေကြေးမပြောင်းနိုင်ပါတယ်။ အရောင်းအကို default ငွေကြေးပြောင်းလဲဖို့ဖျက်သိမ်းရပါမည်။"
+DocType: Grade Interval,Grade Description,grade ဖျေါပွခကျြ
 DocType: Quality Inspection,Purchase Receipt No,ဝယ်ယူခြင်းပြေစာမရှိ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,စားရန်ဖြစ်တော်မူ၏ငွေ
 DocType: Process Payroll,Create Salary Slip,လစာစလစ်ဖြတ်ပိုင်းပုံစံ Create
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +33,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 +352,Quantity in row {0} ({1}) must be same as manufactured quantity {2},အတန်းအတွက်အရေအတွက် {0} ({1}) ထုတ်လုပ်သောအရေအတွက် {2} အဖြစ်အတူတူသာဖြစ်ရမည်
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Quantity in row {0} ({1}) must be same as manufactured quantity {2},အတန်းအတွက်အရေအတွက် {0} ({1}) ထုတ်လုပ်သောအရေအတွက် {2} အဖြစ်အတူတူသာဖြစ်ရမည်
 DocType: Appraisal,Employee,လုပ်သား
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,အသုံးပြုသူအဖြစ် Invite
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} အပြည့်အဝကြေညာတာဖြစ်ပါတယ်
 DocType: Workstation Working Hour,End Time,အဆုံးအချိန်
 DocType: Payment Entry,Payment Deductions or Loss,ငွေပေးချေမှုရမည့်ဖြတ်တောက်ခြင်းများကိုသို့မဟုတ်ပျောက်ဆုံးခြင်း
-apps/erpnext/erpnext/config/schools.py +100,LMS,LMS
+apps/erpnext/erpnext/config/schools.py +104,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,အရောင်းပိုက်လိုင်း
 DocType: Student Batch Student,Student Batch Student,ကျောင်းသားအသုတ်လိုက်ကျောင်းသားသမဂ္ဂ
-DocType: Sales Invoice,Mass Mailing,mass စာပို့
+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 +199,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/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 +297,Salary Slip of employee {0} already created for this period,ဝန်ထမ်း၏လစာစလစ်ဖြတ်ပိုင်းပုံစံ {0} ပြီးသားဤကာလအဘို့ဖန်တီး
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Pharmaceutical,ဆေးဝါး
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +309,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/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,ခရက်ဒစ်ရန်
@@ -2037,27 +2061,28 @@
 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 +814,Please specify Company to proceed,ဆက်လက်ဆောင်ရွက်ရန်ကုမ္ပဏီသတ်မှတ် ကျေးဇူးပြု.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +793,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 +44,Compensatory Off,ပိတ် Compensatory
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,ပိတ် Compensatory
 DocType: Quality Inspection Reading,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 ပြင်. မရပါ။
 DocType: Room,Room Number,အခန်းနံပတ်
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},မမှန်ကန်ခြင်းရည်ညွှန်းကိုးကား {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +161,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ထုတ်လုပ်မှုအမိန့် {3} အတွက်စီစဉ်ထား quanitity ({2}) ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +162,{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 +217,Raw Materials cannot be blank.,ကုန်ကြမ်းပစ္စည်းများအလွတ်မဖြစ်နိုင်။
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,"Could not update stock, invoice contains drop shipping item.","ငွေတောင်းခံလွှာတစ်စက်ရေကြောင်းကို item များပါရှိသည်, စတော့ရှယ်ယာကို update မရနိုင်ပါ။"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +460,Quick Journal Entry,လျင်မြန်စွာ Journal မှ Entry &#39;
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +111,You can not change rate if BOM mentioned agianst any item,BOM ဆိုတဲ့ item agianst ဖော်ပြခဲ့သောဆိုရင်နှုန်းကိုမပြောင်းနိုင်ပါ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +441,"Could not update stock, invoice contains drop shipping item.","ငွေတောင်းခံလွှာတစ်စက်ရေကြောင်းကို item များပါရှိသည်, စတော့ရှယ်ယာကို update မရနိုင်ပါ။"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Quick Journal Entry,လျင်မြန်စွာ Journal မှ Entry &#39;
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +103,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 +214,{0} {1} is not submitted,{0} {1} တင်သွင်းသည်မဟုတ်
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,ပစ္စည်းများသည်တောင်းဆိုမှုများ။
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,အသီးအသီးကောင်းဆောင်းပါးတပုဒ်ကိုလက်စသတ်သည်သီးခြားထုတ်လုပ်မှုအမိန့်ကိုဖန်တီးလိမ့်မည်။
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +121,{0} must be negative in return document,{0} ပြန်လာစာရွက်စာတမ်းအတွက်အနုတ်လက္ခဏာဖြစ်ရပါမည်
 ,Minutes to First Response for Issues,ကိစ္စများများအတွက်ပထမဦးဆုံးတုံ့ပြန်မှုမှမိနစ်
 DocType: Purchase Invoice,Terms and Conditions1,စည်းကမ်းချက်များနှင့် Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,သငျသညျဤစနစ်တည်ထောင်ထားတဲ့များအတွက်အဖွဲ့အစည်း၏နာမတော်။
@@ -2066,16 +2091,17 @@
 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 +398,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 +739,Item or Warehouse for row {0} does not match Material Request,အတန်းသည် item သို့မဟုတ်ဂိုဒေါင် {0} ပစ္စည်းတောင်းဆိုမှုနှင့်ကိုက်ညီပါဘူး
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +747,Item or Warehouse for row {0} does not match Material Request,အတန်းသည် item သို့မဟုတ်ဂိုဒေါင် {0} ပစ္စည်းတောင်းဆိုမှုနှင့်ကိုက်ညီပါဘူး
 apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,တိုင်း၏ယူနစ်
 DocType: Fiscal Year,Year End Date,တစ်နှစ်တာအဆုံးနေ့စွဲ
 DocType: Task Depends On,Task Depends On,Task အပေါ်မူတည်
-DocType: Lead,Opportunity,အခွင့်အရေး
+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 နှင့်
@@ -2088,7 +2114,7 @@
 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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},ပြုပြင်ထိန်းသိမ်းမှုစတင်နေ့စွဲ Serial No {0} သည်ပို့ဆောင်မှုနေ့စွဲခင်မဖွစျနိုငျ
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},ပြုပြင်ထိန်းသိမ်းမှုစတင်နေ့စွဲ Serial No {0} သည်ပို့ဆောင်မှုနေ့စွဲခင်မဖွစျနိုငျ
 DocType: Production Order,Actual End Date,အမှန်တကယ် End Date ကို
 DocType: Purchase Invoice,PINV-,PINV-
 DocType: Authorization Rule,Applicable To (Role),(အခန်းက္ပ) ရန်သက်ဆိုင်သော
@@ -2103,7 +2129,7 @@
 DocType: SMS Log,No of Requested SMS,တောင်းဆိုထားသော SMS ၏မရှိပါ
 DocType: Campaign,Campaign-.####,ကင်ပိန်း - ။ ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Next ကိုခြေလှမ်းများ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,Please supply the specified items at the best possible rates,အကောငျးဆုံးနှုန်းထားများမှာသတ်မှတ်ထားသောပစ္စည်းများထောက်ပံ့ပေးပါ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +695,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 +117,Contract End Date must be greater than Date of Joining,စာချုပ်ကုန်ဆုံးတော့နေ့စွဲအတူနေ့စွဲထက် သာ. ကြီးမြတ်ဖြစ်ရမည်
 DocType: Delivery Note,DN-,DN-
@@ -2112,7 +2138,7 @@
 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 +14,This is an example website auto-generated from ERPNext,ဒါဟာ ERPNext ကနေ Auto-generated ဥပမာတစ်ခုဝက်ဆိုက်
+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
 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.
 
@@ -2139,13 +2165,14 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd ပမာဏ
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +54,Fee Records Created - {0},Created ကြေး Records ကို - {0}
 DocType: Asset Category Account,Asset Category Account,ပိုင်ဆိုင်မှုအမျိုးအစားအကောင့်
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +103,Cannot produce more Item {0} than Sales Order quantity {1},အရောင်းအမိန့်အရေအတွက် {1} ထက်ပိုပစ္စည်း {0} မထုတ်လုပ်နိုင်သ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Stock Entry {0} is not submitted,စတော့အိတ် Entry &#39;{0} တင်သွင်းသည်မဟုတ်
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},အရောင်းအမိန့်အရေအတွက် {1} ထက်ပိုပစ္စည်း {0} မထုတ်လုပ်နိုင်သ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +505,Stock Entry {0} is not submitted,စတော့အိတ် Entry &#39;{0} တင်သွင်းသည်မဟုတ်
 DocType: Payment Reconciliation,Bank / Cash Account,ဘဏ်မှ / ငွေအကောင့်
 DocType: Tax Rule,Billing City,ငွေတောင်းခံစီးတီး
 DocType: Salary Component Account,Salary Component Account,လစာစိတျအပိုငျးအကောင့်
 DocType: Global Defaults,Hide Currency Symbol,ငွေကြေးစနစ်သင်္ကေတဝှက်
 apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card","ဥပမာဘဏ်, ငွေ, Credit Card ကို"
+DocType: Lead Source,Source Name,source အမည်
 DocType: Journal Entry,Credit Note,ခရက်ဒစ်မှတ်ချက်
 DocType: Warranty Claim,Service Address,Service ကိုလိပ်စာ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furnitures and Fixtures,ပရိဘောဂများနှင့်ပွဲတွင်
@@ -2157,6 +2184,7 @@
 DocType: Opportunity,Customer / Lead Name,customer / ခဲအမည်
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +89,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/controllers/trends.py +19,Total(Qty),စုစုပေါင်း (Qty)
 DocType: Sales Invoice,This Document,ဒီစာရွက်စာတမ်း
@@ -2168,15 +2196,15 @@
 DocType: Purchase Receipt,Time at which materials were received,ပစ္စည်းများလက်ခံရရှိခဲ့ကြသည်မှာအချိန်
 DocType: Stock Ledger Entry,Outgoing Rate,outgoing Rate
 apps/erpnext/erpnext/config/hr.py +176,Organization branch master.,"အစည်းအရုံး, အခက်အလက်မာစတာ။"
-apps/erpnext/erpnext/controllers/accounts_controller.py +273, or ,သို့မဟုတ်
+apps/erpnext/erpnext/controllers/accounts_controller.py +276, or ,သို့မဟုတ်
 DocType: Sales Order,Billing Status,ငွေတောင်းခံနဲ့ Status
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,တစ်ဦး Issue သတင်းပို့
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,Utility ကိုအသုံးစရိတ်များ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-အထက်
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +203,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,အတန်း # {0}: ဂျာနယ် Entry &#39;{1} အကောင့် {2} ရှိသည်သို့မဟုတ်ပြီးသားအခြားဘောက်ချာဆန့်ကျင်လိုက်ဖက်ပါဘူး
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +206,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 +90,No employee for the above selected criteria OR salary slip already created,အထက်ပါရွေးချယ်ထားသောစံနှုန်းများကို OR လစာစလစ်အဘို့အဘယ်သူမျှမကန်ထမ်းပြီးသားနေသူများကဖန်တီး
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +93,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
@@ -2204,8 +2232,8 @@
 DocType: Product Bundle,Parent Item,မိဘ Item
 DocType: Account,Account Type,Account Type
 DocType: Delivery Note,DN-RET-,DN-RET-
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +115,Leave Type {0} cannot be carry-forwarded,{0} သယ်-forward နိုင်သည်မရနိုင်ပါ Type နေရာမှာ Leave
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',ပြုပြင်ထိန်းသိမ်းမှုဇယားအပေါငျးတို့သပစ္စည်းများသည် generated မဟုတ်ပါ။ &#39;&#39; Generate ဇယား &#39;&#39; ကို click ပါ ကျေးဇူးပြု.
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +118,Leave Type {0} cannot be carry-forwarded,{0} သယ်-forward နိုင်သည်မရနိုင်ပါ Type နေရာမှာ Leave
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',ပြုပြင်ထိန်းသိမ်းမှုဇယားအပေါငျးတို့သပစ္စည်းများသည် generated မဟုတ်ပါ။ &#39;&#39; Generate ဇယား &#39;&#39; ကို click ပါ ကျေးဇူးပြု.
 ,To Produce,ထုတ်လုပ်
 apps/erpnext/erpnext/config/hr.py +93,Payroll,အခစာရင်း
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +163,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","{1} အတွက် {0} အတန်းသည်။ {2} Item မှုနှုန်း, အတန်း {3} ကိုလည်းထည့်သွင်းရမည်ကိုထည့်သွင်းရန်"
@@ -2217,13 +2245,13 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +32,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 +748,Delivery,delivery
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +742,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 ကိုတာဝန်သိမှုဧရိယာ
 DocType: Payment Entry,Total Allocated Amount,စုစုပေါင်းခွဲဝေပမာဏ
 DocType: Item Reorder,Material Request Type,material တောင်းဆိုမှုကအမျိုးအစား
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +82,Row {0}: UOM Conversion Factor is mandatory,row {0}: UOM ကူးပြောင်းခြင်း Factor နဲ့မဖြစ်မနေဖြစ်ပါသည်
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +79,Row {0}: UOM Conversion Factor is mandatory,row {0}: UOM ကူးပြောင်းခြင်း Factor နဲ့မဖြစ်မနေဖြစ်ပါသည်
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Budget,Cost Center,ကုန်ကျစရိတ် Center က
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,ဘောက်ချာ #
@@ -2234,13 +2262,13 @@
 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 +90,Head of Marketing and Sales,ဈေးကွက်နှင့်အရောင်း၏ဦးခေါင်းကို
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,ဝင်ငွေခွန်
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,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 ။
 DocType: Item Supplier,Item Supplier,item ပေးသွင်း
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +403,Please enter Item Code to get batch no,အဘယ်သူမျှမသုတ်ရ Item Code ကိုရိုက်ထည့်ပေးပါ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +770,Please select a value for {0} quotation_to {1},{1} quotation_to {0} လို့တန်ဖိုးကို select ကျေးဇူးပြု.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +397,Please enter Item Code to get batch no,အဘယ်သူမျှမသုတ်ရ Item Code ကိုရိုက်ထည့်ပေးပါ
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +764,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, ကုမ္ပဏီဖြစ်ပါတယ်"
@@ -2252,28 +2280,29 @@
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,မစတော့အိတ်အတွက်
 DocType: Appraisal,HR User,HR အသုံးပြုသူတို့၏
 DocType: Purchase Invoice,Taxes and Charges Deducted,အခွန်နှင့်စွပ်စွဲချက်နုတ်ယူ
-apps/erpnext/erpnext/hooks.py +100,Issues,အရေးကိစ္စများ
+apps/erpnext/erpnext/hooks.py +109,Issues,အရေးကိစ္စများ
 apps/erpnext/erpnext/controllers/status_updater.py +13,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} ကိုပိတ်ထားသည်
 DocType: Supplier,Billing Currency,ငွေတောင်းခံငွေကြေးစနစ်
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Large,အပိုအကြီးစား
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,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 +507,Warning: Another {0} # {1} exists against stock entry {2},သတိပေးချက်: နောက်ထပ် {0} # {1} စတော့ရှယ်ယာ entry ကို {2} ဆန့်ကျင်ရှိတယျဆိုတာကို
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Local,ဒေသဆိုင်ရာ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +508,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),ချေးငွေနှင့်ကြိုတင်ငွေ (ပိုင်ဆိုင်မှုများ)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,ငျြ့ရမညျအကွောငျး
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Large,အကြီးစား
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,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 +225,Total {0} ({1}),စုစုပေါင်း {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +224,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 အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည်နည်းနိဿယ
@@ -2319,9 +2348,9 @@
 DocType: Attendance,Leave Type,Type Leave
 apps/erpnext/erpnext/controllers/stock_controller.py +173,Expense / Difference account ({0}) must be a 'Profit or Loss' account,စရိတ် / Difference အကောင့်ကို ({0}) တစ်ဦး &#39;&#39; အကျိုးအမြတ်သို့မဟုတ်ပျောက်ဆုံးခြင်း &#39;&#39; အကောင့်ကိုရှိရမည်
 DocType: Account,Accounts User,အသုံးပြုသူအကောင့်
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Name error: {0},အမှားအမည်: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +90,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 +178,{0} {1} does not associated with {2} {3},{0} {1} {2} {3} နှင့်ဆက်စပ်ပါဘူး
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +181,{0} {1} does not associated with {2} {3},{0} {1} {2} {3} နှင့်ဆက်စပ်ပါဘူး
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,ဝန်ထမ်း {0} သည်တက်ရောက်သူပြီးသားမှတ်သားသည်
 DocType: Packing Slip,If more than one package of the same type (for print),(ပုံနှိပ်သည်) တူညီသောအမျိုးအစားတစ်ခုထက် ပို. package ကို အကယ်.
 DocType: Warehouse,Parent Warehouse,မိဘဂိုဒေါင်
@@ -2340,7 +2369,7 @@
 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,ရည်ရွယ်ချက်
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,Atleast တယောက်ကို item ပြန်လာစာရွက်စာတမ်းအတွက်အနုတ်လက္ခဏာအရေအတွက်နှင့်အတူသို့ဝင်သင့်ပါတယ်
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Atleast one item should be entered with negative quantity in return document,Atleast တယောက်ကို item ပြန်လာစာရွက်စာတမ်းအတွက်အနုတ်လက္ခဏာအရေအတွက်နှင့်အတူသို့ဝင်သင့်ပါတယ်
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","စစ်ဆင်ရေး {0} ရှည်ကို Workstation {1} အတွက်မဆိုရရှိနိုင်အလုပ်လုပ်နာရီထက်, မျိုးစုံစစ်ဆင်ရေးသို့စစ်ဆင်ရေးဖြိုဖျက်"
 ,Requested,မေတ္တာရပ်ခံ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +83,No Remarks,အဘယ်သူမျှမမှတ်ချက်
@@ -2352,46 +2381,46 @@
 DocType: Item,Total Projected Qty,စုစုပေါင်းစီမံကိန်းအရည်အတွက်
 DocType: Monthly Distribution,Distribution Name,ဖြန့်ဖြူးအမည်
 DocType: Course,Course Code,သင်တန်း Code ကို
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Quality Inspection required for Item {0},Item {0} သည်လိုအပ်သောအရည်အသွေးပြည့်စစ်ဆေးရေး
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,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,အခြေအနေနှင့်ဖော်မြူလာအကူအညီ
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,နယ်မြေတွေကို Tree Manage ။
 DocType: Journal Entry Account,Sales Invoice,အရောင်းပြေစာ
 DocType: Journal Entry Account,Party Balance,ပါတီ Balance
-apps/erpnext/erpnext/accounts/page/pos/pos.js +475,Please select Apply Discount On,လျှော့တွင် Apply ကို select ကျေးဇူးပြု.
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +92,Salary Slip Created,လစာစလစ်ဖြတ်ပိုင်းပုံစံ Created
+apps/erpnext/erpnext/accounts/page/pos/pos.js +464,Please select Apply Discount On,လျှော့တွင် Apply ကို select ကျေးဇူးပြု.
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +95,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 သည်ပစ္စည်းလွှဲပြောင်း
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,လျော့စျေးရာခိုင်နှုန်းတစ်စျေးနှုန်း List ကိုဆန့်ကျင်သို့မဟုတ်အားလုံးစျေးနှုန်းစာရင်းများအတွက်လည်းကောင်းလျှောက်ထားနိုင်ပါသည်။
 DocType: Purchase Invoice,Half-yearly,ဝက်နှစ်စဉ်
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +384,Accounting Entry for Stock,စတော့အိတ်သည်စာရင်းကိုင် Entry &#39;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +387,Accounting Entry for Stock,စတော့အိတ်သည်စာရင်းကိုင် Entry &#39;
 DocType: Sales Invoice,Sales Team1,အရောင်း Team1
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,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 +96,Row {0}: Completed Qty must be greater than zero.,အတန်း {0}: Completed အရည်အတွက်သုညထက်ကြီးမြတ်ဖြစ်ရပါမည်။
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +120,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 +88,Row # {0}: Cannot return more than {1} for Item {2},row # {0}: {1} Item သည် {2} ထက်ပိုမပြန်နိုင်သလား
+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,မွေကှကျ
 DocType: Item Group,Show this slideshow at the top of the page,စာမျက်နှာရဲ့ထိပ်မှာဒီဆလိုက်ရှိုးပြရန်
 DocType: BOM,Item UOM,item UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),လျှော့ငွေပမာဏ (ကုမ္ပဏီငွေကြေးစနစ်) ပြီးနောက်အခွန်ပမာဏ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +147,Target warehouse is mandatory for row {0},Target ကဂိုဒေါင်အတန်း {0} သည်မသင်မနေရ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +141,Target warehouse is mandatory for row {0},Target ကဂိုဒေါင်အတန်း {0} သည်မသင်မနေရ
 DocType: Cheque Print Template,Primary Settings,မူလတန်းက Settings
 DocType: Purchase Invoice,Select Supplier Address,ပေးသွင်းလိပ်စာကို Select လုပ်ပါ
 DocType: Quality Inspection,Quality Inspection,အရည်အသွေးအစစ်ဆေးရေး
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Extra Small,အပိုအသေးစား
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,Warning: Material Requested Qty is less than Minimum Order Qty,သတိပေးချက်: Qty တောင်းဆိုထားသောပစ္စည်းအနည်းဆုံးအမိန့် Qty ထက်နည်းသော
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +194,Account {0} is frozen,အကောင့်ကို {0} အေးခဲသည်
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,အပိုအသေးစား
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +690,Warning: Material Requested Qty is less than Minimum Order Qty,သတိပေးချက်: Qty တောင်းဆိုထားသောပစ္စည်းအနည်းဆုံးအမိန့် Qty ထက်နည်းသော
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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 +606,Can only make payment against unbilled {0},သာ unbilled {0} ဆန့်ကျင်ငွေပေးချေမှုကိုဖြစ်စေနိုင်ပါတယ်
-apps/erpnext/erpnext/controllers/selling_controller.py +126,Commission rate cannot be greater than 100,ကော်မရှင်နှုန်းက 100 မှာထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +609,Can only make payment against unbilled {0},သာ unbilled {0} ဆန့်ကျင်ငွေပေးချေမှုကိုဖြစ်စေနိုင်ပါတယ်
+apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,ကော်မရှင်နှုန်းက 100 မှာထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
 DocType: Stock Entry,Subcontract,Subcontract
 apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,ပထမဦးဆုံး {0} မဝင်ရ ကျေးဇူးပြု.
 DocType: Production Order Operation,Actual End Time,အမှန်တကယ် End အချိန်
@@ -2402,30 +2431,30 @@
 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 +158,Colour,အရောင်
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,အရောင်
 DocType: Maintenance Visit,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 ကိုလည်းရှိ၏ ကျေးဇူးပြု.
 DocType: Student Log,Academic,ပညာရပ်ဆိုင်ရာ
-apps/erpnext/erpnext/controllers/accounts_controller.py +469,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),အမိန့်ဆန့်ကျင်စုစုပေါင်းကြိုတင်မဲ ({0}) {1} ({2}) ကိုဂရန်းစုစုပေါင်းထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
+apps/erpnext/erpnext/controllers/accounts_controller.py +472,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),အမိန့်ဆန့်ကျင်စုစုပေါင်းကြိုတင်မဲ ({0}) {1} ({2}) ကိုဂရန်းစုစုပေါင်းထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,ညီလအတွင်းအနှံ့ပစ်မှတ်ဖြန့်ဝေရန်လစဉ်ဖြန့်ဖြူးကိုရွေးချယ်ပါ။
 DocType: Purchase Invoice Item,Valuation Rate,အဘိုးပြတ် Rate
+DocType: Stock Reconciliation,SR/,SR /
 apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,စျေးနှုန်း List ကိုငွေကြေးစနစ်ကိုမရွေးချယ်
 DocType: Assessment,Results,ရလဒ်များ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +168,Employee {0} has already applied for {1} between {2} and {3},ဝန်ထမ်း {0} ပြီးသား {1} {2} နှင့် {3} အကြားလျှောက်ထားခဲ့သည်
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +175,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
-DocType: Student Applicant,Father's/ Guardian 2 Email ID,ခမည်းတော်၏ / အုပ်ထိန်းသူ 2 အီးမေးလ် ID ကို
 DocType: Maintenance Visit Purpose,Against Document No,Document ဖိုင်မျှဆန့်ကျင်
 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 +228,Warehouses with existing transaction can not be converted to group.,လက်ရှိငွေပေးငွေယူနှင့်အတူဂိုဒေါင်အုပ်စုအဖြစ်ပြောင်းလဲမရနိုင်ပါ။
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +231,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 +93,Researcher,သုတေသီတစ်ဦး
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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 အရည်အသွေးအစစ်ဆေးခံရ။
@@ -2437,25 +2466,25 @@
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",ဖောက်သည်များအဆင်ပြေဤ codes တွေကိုငွေတောင်းခံလွှာနှင့် Delivery မှတ်စုများတူပုံနှိပ်ပုံစံများဖြင့်အသုံးပြုနိုင်
 DocType: Sales Invoice,Time Sheet List,အချိန်စာရွက်စာရင်း
 DocType: Employee,You can enter any date manually,သင်တို့ကိုကို manually မဆိုနေ့စွဲကိုရိုက်ထည့်နိုင်ပါတယ်
-DocType: Sales Invoice,Advertisement,ကျွွောငာခကျြ
 DocType: Asset Category Account,Depreciation Expense Account,တန်ဖိုးသုံးစွဲမှုအကောင့်
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Probationary Period,Probationary Period
-apps/erpnext/erpnext/hooks.py +102,Announcements,ကြေညာချက်များ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Probationary Period
+apps/erpnext/erpnext/hooks.py +111,Announcements,ကြေညာချက်များ
 DocType: Customer Group,Only leaf nodes are allowed in transaction,သာအရွက်ဆုံမှတ်များအရောင်းအဝယ်အတွက်ခွင့်ပြု
 DocType: Expense Claim,Expense Approver,စရိတ်အတည်ပြုချက်
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +109,Row {0}: Advance against Customer must be credit,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 +16,To Datetime,Datetime မှ
+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/scheduling_tool/scheduling_tool.py +51,Course Schedules deleted:,သင်တန်းအချိန်ဇယားကိုဖျက်လိုက်ပါ:
 apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,SMS ပေးပို့အဆင့်အတန်းကိုထိန်းသိမ်းသည် logs
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,ဆိုင်းငံ့ထားလှုပ်ရှားမှုများ
+DocType: Accounts Settings,Make Payment via Journal Entry,ဂျာနယ် Entry မှတဆင့်ငွေပေးချေမှုရမည့် Make
+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 +127,Please enter relieving date.,နေ့စွဲ relieving ရိုက်ထည့်ပေးပါ။
-apps/erpnext/erpnext/controllers/trends.py +145,Amt,Amt
+apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,Only Leave Applications with status 'Approved' can be submitted,တင်သွင်းနိုင်ပါတယ် &#39;&#39; Approved &#39;&#39; အဆင့်အတန်းနှင့်အတူ Applications ကိုသာ Leave
 apps/erpnext/erpnext/utilities/doctype/address/address.py +26,Address Title is mandatory.,လိပ်စာခေါင်းစဉ်မဖြစ်မနေဖြစ်ပါတယ်။
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,စုံစမ်းရေးအရင်းအမြစ်မဲဆွယ်စည်းရုံးရေးလျှင်ကင်ပိန်းအမည်ကိုထည့်
@@ -2473,14 +2502,15 @@
 apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1},{0} {1} ရန်အဘို့အငွေလဲနှုန်းရှာတွေ့ဖို့မအောင်မြင်ဘူး
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,မာကုတစ်ဝက်နေ့
 DocType: Sales Invoice,Sales Team,အရောင်းရေးအဖွဲ့
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Duplicate entry,entry ကို Duplicate
+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 +490,[Error],[အမှား]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +484,[Error],[အမှား]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,သင်အရောင်းအမိန့်ကိုကယ်တင်တစ်ချိန်ကစကားမြင်နိုင်ပါလိမ့်မည်။
 ,Employee Birthday,ဝန်ထမ်းမွေးနေ့
 apps/erpnext/erpnext/controllers/status_updater.py +175,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 တွေကိုပြုပြင်မွမ်းမံခြင်းနှင့်ထပ်ကြိုးစားပါ။
 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} မတည်ရှိပါဘူး
@@ -2496,22 +2526,22 @@
 ,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 +25,All Jobs,အားလုံးဂျော့ဘ်
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,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 ကအုပ်စုအဖြစ်ပြောင်းလဲမပြနိုင်
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Amount {0} {1} {2} {3},ငွေပမာဏ {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Amount {0} {1} {2} {3},ငွေပမာဏ {0} {1} {2} {3}
 DocType: Account,Depreciation,တန်ဖိုး
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),ပေးသွင်းသူ (များ)
 DocType: Employee Attendance Tool,Employee Attendance Tool,ဝန်ထမ်းတက်ရောက် Tool ကို
 DocType: Supplier,Credit Limit,ခရက်ဒစ်ကန့်သတ်
 DocType: Production Plan Sales Order,Salse Order Date,Salse အမိန့်နေ့စွဲ
 DocType: Salary Component,Salary Component,လစာစိတျအပိုငျး
-apps/erpnext/erpnext/accounts/utils.py +372,Payment Entries {0} are un-linked,ငွေပေးချေမှုရမည့် Entries {0} un-နှင့်ဆက်စပ်လျက်ရှိ
+apps/erpnext/erpnext/accounts/utils.py +449,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 ထိုအငွေပေးချေမှုရမည့်အသေးစိတ်
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +497,Material Requests {0} created,material တောင်းဆို {0} နေသူများကဖန်တီး
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +498,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 ။
 DocType: Purchase Invoice,Address and Contact,လိပ်စာနှင့်ဆက်သွယ်ရန်
@@ -2550,7 +2580,7 @@
 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 +848,Paid Amount cannot be greater than total negative outstanding amount {0},Paid ငွေပမာဏစုစုပေါင်းအနုတ်ထူးချွန်ငွေပမာဏ {0} ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +859,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 +233,Closing (Dr),(ဒေါက်တာ) ပိတ်ပွဲ
 DocType: Cheque Print Template,Cheque Size,Cheque တစ်စောင်လျှင် Size ကို
@@ -2571,7 +2601,8 @@
 ,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.,ပိတ်ထားသောအမိန့်ကိုဖျက်သိမ်းမရနိုင်ပါ။ ဖျက်သိမ်းဖို့မပိတ်ထားသည့်။
-apps/erpnext/erpnext/controllers/accounts_controller.py +555,'Update Stock' cannot be checked for fixed asset sale,&#39;&#39; Update ကိုစတော့အိတ် &#39;&#39; သတ်မှတ်ထားတဲ့ပိုင်ဆိုင်မှုရောင်းမည်အမှန်ခြစ်မရနိုငျ
+DocType: Student Guardian,Father,ဖခင်
+apps/erpnext/erpnext/controllers/accounts_controller.py +558,'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/buying/doctype/purchase_order/purchase_order.py +132,Material Request {0} is cancelled or stopped,material တောင်းဆိုမှု {0} ကိုပယ်ဖျက်သို့မဟုတ်ရပ်တန့်နေသည်
@@ -2581,15 +2612,15 @@
 DocType: Sales Order,Fully Delivered,အပြည့်အဝကိုကယ်နှုတ်
 DocType: Lead,Lower Income,lower ဝင်ငွေခွန်
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","အမြတ်ခွန် / ပျောက်ဆုံးခြင်းကြိုတင်ဘွတ်ကင်လိမ့်မည်သည့်ဆိုက်အောက်ရှိ account ကိုဦးခေါင်း,"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +166,Source and target warehouse cannot be same for row {0},အရင်းအမြစ်နှင့်ပစ်မှတ်ဂိုဒေါင်အတန်း {0} သည်အတူတူပင်ဖြစ်နိုင်သေး
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",ဒီစတော့အိတ်ပြန်လည်ရင်ကြားစေ့ရေးတစ်ဦးဖွင့်ပွဲ Entry ဖြစ်ပါတယ်ကတည်းကခြားနားချက်အကောင့်တစ်ခု Asset / ဆိုက်အမျိုးအစားအကောင့်ကိုရှိရမည်
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +81,Purchase Order number required for Item {0},Item {0} လိုအပ်ဝယ်ယူခြင်းအမိန့်အရေအတွက်
+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/purchase_receipt/purchase_receipt.py +82,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 +17,Cannot change status as student {0} is linked with student application {1},ကျောင်းသား {0} ကျောင်းသားလျှောက်လွှာ {1} နှင့်အတူဆက်စပ်အဖြစ်အဆင့်အတန်းမပြောင်းနိုင်သ
+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: Timesheet,"List of employee which has ""Salary Slip Based on Timesheet"" is enabled in salary structure.",&quot;Timesheet အပေါ်အခြေခံပြီးလစာစလစ်ဖြတ်ပိုင်းပုံစံ&quot; လစာကဖွဲ့စည်းပုံထဲမှာ enabled ဖြစ်ပါတယ်သည့်န်ထမ်းများစာရင်း။
 DocType: Asset,Fully Depreciated,အပြည့်အဝတန်ဖိုးလျော့ကျ
 ,Stock Projected Qty,စတော့အိတ် Qty စီမံကိန်း
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Customer {0} does not belong to project {1},customer {0} {1} သည်စီမံကိန်းပိုင်ပါဘူး
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,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 ဘယ်သူမျှမကနှင့်အသုတ်လိုက်
@@ -2601,7 +2632,7 @@
 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/patches/v7_0/create_warehouse_nestedset.py +55,All Warehouses,အားလုံးသိုလှောင်ရုံ
+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 +105,Credit To account must be a Balance Sheet account,အကောင့်ကိုရန်အကြွေးတစ်ဦး Balance ကိုစာရွက်အကောင့်ကိုသူဖြစ်ရမည်
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,အားလုံးသည်ပေးသွင်းအမျိုးအစားများ
@@ -2613,10 +2644,10 @@
 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/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,လစာစလစ်ဖြတ်ပိုင်းပုံစံလုပ်ပါ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +26,Browse BOM,Browse ကို BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,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/asset/depreciation.py +94,Please set Depreciation related Accounts in Asset Category {0} or Company {1},ပိုင်ဆိုင်မှုအမျိုးအစား {0} သို့မဟုတ်ကုမ္ပဏီ {1} အတွက်တန်ဖိုးနှင့်ဆက်စပ်သော Accounts ကိုသတ်မှတ်ထားပေးပါ
-DocType: Academic Year,Academic Year,စာသင်နှစ်
+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 ဖွင့်လှစ်
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,တန်ဖိုးခြင်း
@@ -2624,12 +2655,12 @@
 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 +197,Leave approver must be one of {0},{0} တယောက်ဖြစ်ရပါမည်အတည်ပြုချက် Leave
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,Leave approver must be one of {0},{0} တယောက်ဖြစ်ရပါမည်အတည်ပြုချက် Leave
 DocType: Hub Settings,Seller Email,ရောင်းချသူအီးမေးလ်
 DocType: Project,Total Purchase Cost (via Purchase Invoice),(ဝယ်ယူခြင်းပြေစာကနေတဆင့်) စုစုပေါင်းဝယ်ယူကုန်ကျစရိတ်
 DocType: Workstation Working Hour,Start Time,Start ကိုအချိန်
 DocType: Item Price,Bulk Import Help,ထုထည်ကြီးသွင်းကုန်အကူအညီ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +256,Select Quantity,ပမာဏကိုရွေးပါ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +257,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
@@ -2646,6 +2677,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,ပစ်မှတ် qty သို့မဟုတ်ပစ်မှတ်ပမာဏကိုဖြစ်စေမဖြစ်မနေဖြစ်ပါတယ်။
 apps/erpnext/erpnext/config/projects.py +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}",အရောင်း Persons အောက်ကမှပူးတွဲထမ်းတစ်ဦးအသုံးပြုသူ ID {1} ရှိသည်ပါဘူးကတည်းက {0} မှပွဲများကိုပြင်ဆင်ခြင်း
+DocType: Timesheet,Billing Details,ငွေတောင်းခံအသေးစိတ်
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +149,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 လုပ်ဖို့ခွင့်မပြု
 DocType: Item,Inspection Required,စစ်ဆေးရေးလိုအပ်ပါသည်
@@ -2665,7 +2697,7 @@
 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 +138,Wire Transfer,ငွေလွှဲခြင်း
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,ငွေလွှဲခြင်း
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,အားလုံး Check
 DocType: Sales Order,Recurring Order,ထပ်တလဲလဲအမိန့်
 DocType: Company,Default Income Account,default ဝင်ငွေခွန်အကောင့်
@@ -2677,21 +2709,19 @@
 ,Welcome to ERPNext,ERPNext မှလှိုက်လှဲစွာကြိုဆိုပါသည်
 apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,စျေးနှုန်းဆီသို့ဦးတည်
 DocType: Lead,From Customer,ဖောက်သည်ထံမှ
-apps/erpnext/erpnext/demo/setup_data.py +357,Calls,ဖုန်းခေါ်ဆိုမှု
+apps/erpnext/erpnext/demo/setup/setup_data.py +300,Calls,ဖုန်းခေါ်ဆိုမှု
 DocType: Project,Total Costing Amount (via Time Logs),(အချိန် Logs ကနေတဆင့်) စုစုပေါင်းကုန်ကျငွေပမာဏ
 DocType: Purchase Order Item Supplied,Stock UOM,စတော့အိတ် UOM
-apps/erpnext/erpnext/stock/doctype/item/item.py +466,"As there are existing transactions for this item, \
-							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","ဒီအရာအတွက်လက်ရှိအရောင်းအရှိဖြစ်သကဲ့သို့, \ သင်သည် &#39;&#39; Serial ဘယ်သူမျှမကရှိပါတယ် &#39;&#39; ၏တန်ဖိုးများကိုမပြောင်းနိုင်, &#39;&#39; အသုတ်လိုက်အဘယ်သူမျှမနေခဲ့ဖူး &#39;&#39; နှင့် &#39;&#39; အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည် Method ကို &#39;&#39; စတော့အိတ် Item Is &#39;&#39;"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,Purchase Order {0} is not submitted,ဝယ်ယူခြင်းအမိန့် {0} တင်သွင်းသည်မဟုတ်
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,စီမံကိန်း
 apps/erpnext/erpnext/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 +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,မှတ်ချက်: System ကို Item သည်ပို့ဆောင်မှု-ထပ်ခါထပ်ခါ-ဘွတ်ကင်စစ်ဆေးမည်မဟုတ် {0} အရေအတွက်သို့မဟုတ်ပမာဏပါ 0 င်သည်အဖြစ်
 DocType: Notification Control,Quotation Message,စျေးနှုန်း Message
 DocType: Issue,Opening Date,နေ့စွဲဖွင့်လှစ်
-apps/erpnext/erpnext/schools/api.py +58,Attendance has been marked successfully.,တက်ရောက်သူအောင်မြင်စွာမှတ်လိုက်ပါပြီ။
+apps/erpnext/erpnext/schools/api.py +57,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 +136,Account Type for {0} must be {1},{0} ဘို့အကောင့်အမျိုးအစားဖြစ်ရပါမည် {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +139,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,နှစ်ဦးစလုံးဂိုဒေါင်အတူတူကုမ္ပဏီပိုင်ရမယ်
@@ -2706,12 +2736,13 @@
 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/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 +20,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 +1190,Please select customer,ဖောက်သည်ကို select လုပ်ပါကျေးဇူးပြုပြီး
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1193,Please select customer,ဖောက်သည်ကို select လုပ်ပါကျေးဇူးပြုပြီး
 DocType: C-Form,I,ငါ
 DocType: Company,Asset Depreciation Cost Center,ပိုင်ဆိုင်မှုတန်ဖိုးကုန်ကျစရိတ်စင်တာ
 DocType: Sales Order Item,Sales Order Date,အရောင်းအမှာစာနေ့စွဲ
@@ -2721,6 +2752,7 @@
 ,Payment Period Based On Invoice Date,ပြေစာနေ့စွဲတွင် အခြေခံ. ငွေပေးချေမှုရမည့်ကာလ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},{0} သည်ငွေကြေးစနစ်ငွေလဲနှုန်းဦးပျောက်ဆုံးနေ
 DocType: Assessment,Examiner,စစျဆေးသူ
+DocType: Student,Siblings,မောင်နှမ
 DocType: Journal Entry,Stock Entry,စတော့အိတ် Entry &#39;
 DocType: Payment Entry,Payment References,ငွေပေးချေမှုရမည့်ကိုးကား
 DocType: C-Form,C-FORM-,C-FORM-
@@ -2738,11 +2770,12 @@
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,ခေါင်းစဉ်အမည်
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,ရောင်းစျေးသို့မဟုတ်ဝယ်ယူ၏ Atleast တယောက်ရွေးချယ်ထားရမည်ဖြစ်သည်
+DocType: Grading Structure,Grade Intervals,grade Interval
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,သင့်ရဲ့စီးပွားရေးလုပ်ငန်း၏သဘောသဘာဝကို Select လုပ်ပါ။
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,အဘယ်မှာရှိကုန်ထုတ်လုပ်မှုလုပ်ငန်းများကိုသယ်ဆောင်ကြသည်။
 DocType: Asset Movement,Source Warehouse,source ဂိုဒေါင်
 DocType: Installation Note,Installation Date,Installation လုပ်တဲ့နေ့စွဲ
-apps/erpnext/erpnext/controllers/accounts_controller.py +534,Row #{0}: Asset {1} does not belong to company {2},အတန်း # {0}: ပိုင်ဆိုင်မှု {1} ကုမ္ပဏီမှ {2} ပိုင်ပါဘူး
+apps/erpnext/erpnext/controllers/accounts_controller.py +537,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,အရောင်းအသုံးပြုသူတို့၏
@@ -2756,28 +2789,31 @@
 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 +111,Date Of Retirement must be greater than Date of Joining,အငြိမ်းစားအမျိုးမျိုးနေ့စွဲအတူနေ့စွဲထက် သာ. ကြီးမြတ်ဖြစ်ရမည်
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +49,There were errors while scheduling course on :,အပေါ်သင်တန်းအချိန်ဇယားဆွဲနေစဉ်အမှားအယွင်းများရှိခဲ့သည်:
 DocType: Sales Invoice,Against Income Account,ဝင်ငွေခွန်အကောင့်ဆန့်ကျင်
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +87,{0}% Delivered,ကယ်နှုတ်တော်မူ၏ {0}%
+apps/erpnext/erpnext/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).,item {0}: မိန့် qty {1} {2} (Item မှာသတ်မှတ်ထားတဲ့) နိမ့်ဆုံးအမိန့် qty ထက်နည်းမဖြစ်နိုင်။
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,လစဉ်ဖြန့်ဖြူးရာခိုင်နှုန်း
 DocType: Territory,Territory Targets,နယ်မြေတွေကိုပစ်မှတ်များ
 DocType: Delivery Note,Transporter Info,Transporter Info
-apps/erpnext/erpnext/accounts/utils.py +379,Please set default {0} in Company {1},ကုမ္ပဏီ {1} အတွက် default အနေနဲ့ {0} သတ်မှတ်ထားပေးပါ
+apps/erpnext/erpnext/accounts/utils.py +456,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,စုစုပေါင်းအမြတ် / ပျောက်ဆုံးခြင်း
 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.,ပုံနှိပ်တင်းပလိတ်များအဘို့အပေးစာခေါင်းဆောင်များ။
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,ပုံနှိပ်တင်းပလိတ်များသည်ခေါင်းစဉ်များငွေလွှဲစာတမ်းတန်ဖိုးပြေစာဥပမာ။
+DocType: Student Guardian,Student Guardian,ကျောင်းသားသမဂ္ဂဂါးဒီးယန်း
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +184,Valuation type charges can not marked as Inclusive,အဘိုးပြတ်သည်အတိုင်း type ကိုစွဲချက် Inclusive အဖြစ်မှတ်သားမရပါဘူး
 DocType: POS Profile,Update Stock,စတော့အိတ် Update
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,ပစ္စည်းများသည်ကွဲပြားခြားနားသော UOM မမှန်ကန် (Total) Net ကအလေးချိန်တန်ဖိုးကိုဆီသို့ဦးတည်ပါလိမ့်မယ်။ အသီးအသီးကို item ၏ Net ကအလေးချိန်တူညီ UOM အတွက်ကြောင်းသေချာပါစေ။
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
 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 +349,Journal Entries {0} are un-linked,ဂျာနယ် Entries {0} un-နှင့်ဆက်စပ်လျက်ရှိ
+apps/erpnext/erpnext/accounts/utils.py +426,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 က
@@ -2801,6 +2837,7 @@
 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,ကွန်မြူနတီဖိုရမ်၏
+DocType: Homepage,"URL for ""All Products""",&quot;အားလုံးထုတ်ကုန်များ&quot; အတွက် URL ကို
 DocType: Leave Application,Leave Balance Before Application,လျှောက်လွှာခင်မှာ Balance Leave
 DocType: SMS Center,Send SMS,SMS ပို့
 DocType: Cheque Print Template,Width of amount in word,စကား၌ပမာဏ၏ width
@@ -2809,7 +2846,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 +29,Current Job Openings,လက်ရှိယောဘသည်င့်
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,Current Job Openings,လက်ရှိယောဘသည်င့်
 DocType: Company,Stock Adjustment Account,စတော့အိတ်ချိန်ညှိအကောင့်
 DocType: Journal Entry,Write Off,အကြွေးလျှော်ပစ်ခြင်း
 DocType: Timesheet Detail,Operation ID,စစ်ဆင်ရေး ID ကို
@@ -2822,7 +2859,7 @@
 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 +850,Show tax break-up,Show ကိုအခွန်ချိုး-up က
+apps/erpnext/erpnext/public/js/controllers/transaction.js +841,Show tax break-up,Show ကိုအခွန်ချိုး-up က
 apps/erpnext/erpnext/accounts/party.py +308,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} ဆန့်ကျင်တည်ရှိ"
@@ -2832,10 +2869,11 @@
 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 +534,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 +80,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 +162,Please contact to the user who have Sales Master Manager {0} role,အရောင်းမဟာ Manager က {0} အခန်းကဏ္ဍကိုသူအသုံးပြုသူမှဆက်သွယ်ပါ
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +195,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 +5,This is based on the attendance of this Student,ဒီကျောင်းသားသမဂ္ဂများ၏တက်ရောက်သူအပေါ်အခြေခံသည်
@@ -2844,12 +2882,11 @@
 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 +75,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 +138,Note: There is not enough leave balance for Leave Type {0},မှတ်ချက်: လုံလောက်တဲ့ခွင့်ချိန်ခွင်လျှာထွက်ခွာ Type {0} သည်မရှိ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Note: There is not enough leave balance for Leave Type {0},မှတ်ချက်: လုံလောက်တဲ့ခွင့်ချိန်ခွင်လျှာထွက်ခွာ Type {0} သည်မရှိ
 DocType: Program Enrollment Fee,Program Enrollment Fee,Program ကိုကျောင်းအပ်ကြေး
 DocType: Item,Supplier Items,ပေးသွင်းပစ္စည်းများ
 DocType: Opportunity,Opportunity Type,အခွင့်အလမ်းကအမျိုးအစား
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,နယူးကုမ္ပဏီ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,Cost Center is required for 'Profit and Loss' account {0},ကုန်ကျစရိတ် Center က &#39;&#39; အကျိုးအမြတ်နှင့်ဆုံးရှုံးမှု &#39;&#39; အကောင့်ကို {0} သည်လိုအပ်သည်
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,အရောင်းအသာကုမ္ပဏီ၏ဖန်ဆင်းရှင်အားဖြင့်ဖျက်ပစ်နိုင်ပါတယ်
 apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,အထွေထွေလယ်ဂျာ Entries ၏မမှန်ကန်အရေအတွက်တွေ့ရှိခဲ့ပါတယ်။ သင်အရောင်းအဝယ်အတွက်မှားယွင်းတဲ့အကောင့်ကိုရွေးချယ်ကြပေလိမ့်မည်။
 DocType: Cheque Print Template,Cheque Width,Cheque တစ်စောင်လျှင်အကျယ်
@@ -2858,16 +2895,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,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 +228,{0} '{1}' is disabled,{0} {1} &#39;&#39; ပိတ်ထားတယ်
+apps/erpnext/erpnext/controllers/accounts_controller.py +231,{0} '{1}' is disabled,{0} {1} &#39;&#39; ပိတ်ထားတယ်
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ပွင့်လင်းအဖြစ် Set
 DocType: Cheque Print Template,Scanned Cheque,Scan Cheque တစ်စောင်လျှင်
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,မ့အရောင်းအပေါ်ဆက်သွယ်ရန်မှအလိုအလျှောက်အီးမေးလ်များကိုပေးပို့ပါ။
+DocType: Timesheet,Total Billable Amount,စုစုပေါင်းဘီလ်ဆောင်ပမာဏ
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,item 3
 DocType: Purchase Order,Customer Contact Email,customer ဆက်သွယ်ရန်အီးမေးလ်
 DocType: Warranty Claim,Item and Warranty Details,item နှင့်အာမခံအသေးစိတ်
 DocType: Sales Team,Contribution (%),contribution (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,မှတ်ချက်: &#39;&#39; ငွေသို့မဟုတ်ဘဏ်မှအကောင့် &#39;&#39; သတ်မှတ်ထားသောမဟုတ်ခဲ့ကတည်းကငွေပေးချေမှုရမည့် Entry နေသူများကဖန်တီးမည်မဟုတ်
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Responsibilities,တာဝန်ဝတ္တရားများ
+apps/erpnext/erpnext/controllers/accounts_controller.py +78,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,တာဝန်ဝတ္တရားများ
 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,အရောင်းပုဂ္ဂိုလ်အမည်
@@ -2875,6 +2913,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,အသုံးပြုသူများအ Add
 DocType: Pricing Rule,Item Group,item Group က
 DocType: Item,Safety Stock,အန္တရာယ်ကင်းရှင်းရေးစတော့အိတ်
+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: 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 အခွန်အခများနှင့်စွပ်စွဲချက် (ကုမ္ပဏီငွေကြေးစနစ်)
@@ -2884,7 +2923,6 @@
 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: Timesheet,Total Hours,စုစုပေါင်းနာရီ
 DocType: Journal Entry,Printing Settings,ပုံနှိပ်ခြင်းက Settings
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,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,မော်တော်ယာဉ်
@@ -2897,13 +2935,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,ရင်းနှီးမြှုပ်နှံမှုဘဏ်လုပ်ငန်း
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +71,Cash or Bank Account is mandatory for making payment entry,ငွေသားသို့မဟုတ်ဘဏ်မှအကောင့်ငွေပေးချေမှု entry ကိုအောင်သည်မသင်မနေရ
 DocType: Purchase Invoice,Price List Exchange Rate,စျေးနှုန်း List ကိုချိန်း Rate
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ဖောက်သည်&gt; ဖောက်သည်အုပ်စု&gt; နယ်မြေတွေကို
 DocType: Purchase Invoice Item,Rate,rate
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Intern,အလုပ်သင်ဆရာဝန်
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,အလုပ်သင်ဆရာဝန်
 DocType: Stock Entry,From BOM,BOM ကနေ
 DocType: Assessment,Assessment Code,အကဲဖြတ် Code ကို
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +32,Basic,အခြေခံပညာ
+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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',&#39;&#39; Generate ဇယား &#39;&#39; ကို click ပါ ကျေးဇူးပြု.
+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 +95,Reference No is mandatory if you entered Reference Date,ရည်ညွန်းသင်ကိုးကားစရာနေ့စွဲသို့ဝင်လျှင်အဘယ်သူမျှမသင်မနေရ
@@ -2912,11 +2951,11 @@
 DocType: Salary Slip,Salary Structure,လစာဖွဲ့စည်းပုံ
 DocType: Account,Bank,ကမ်း
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,လကွောငျး
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +752,Issue Material,ပြဿနာပစ္စည်း
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +723,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 +683,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 +665,You are in offline mode. You will not be able to reload until you have network.,သငျသညျအော့ဖ်လိုင်း mode မှာရှိပါတယ်။ သငျသညျကှနျယရှိသည်သည်အထိသင်ပြန်ဖွင့်နိုင်ပါလိမ့်မည်မဟုတ်။
 DocType: Hub Settings,Access Token,Access Token
 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
@@ -2924,33 +2963,35 @@
 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 +1122,Enter value must be positive,တန်ဖိုးအားအပြုသဘောဆောင်သူဖြစ်ရမည် Enter
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,All Territories,အားလုံးသည် Territories
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1125,Enter value must be positive,တန်ဖိုးအားအပြုသဘောဆောင်သူဖြစ်ရမည် Enter
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,အားလုံးသည် Territories
 DocType: Purchase Invoice,Items,items
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +23,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 +221,There are more holidays than working days this month.,ယခုလအလုပ်လုပ်ရက်ပတ်လုံးထက်ပိုပြီးအားလပ်ရက်ရှိပါသည်။
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +233,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 +96,Request for Quotations,ကိုးကားချက်များတောင်းခံ
+apps/erpnext/erpnext/hooks.py +104,Request for Quotations,ကိုးကားချက်များတောင်းခံ
 DocType: Payment Reconciliation,Maximum Invoice Amount,အမြင့်ဆုံးပမာဏပြေစာ
 apps/erpnext/erpnext/config/selling.py +23,Customers,Customer များ
+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,Securities မှ &amp; ကုန်စည်ဒိုင်
-apps/erpnext/erpnext/stock/doctype/item/item.py +628,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Variant များအတွက်တိုင်း၏ default အနေနဲ့ Unit မှ &#39;&#39; {0} &#39;&#39; Template: ထဲမှာရှိသကဲ့သို့တူညီသူဖြစ်ရမည် &#39;&#39; {1} &#39;&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Variant များအတွက်တိုင်း၏ default အနေနဲ့ Unit မှ &#39;&#39; {0} &#39;&#39; Template: ထဲမှာရှိသကဲ့သို့တူညီသူဖြစ်ရမည် &#39;&#39; {1} &#39;&#39;
 DocType: Shipping Rule,Calculate Based On,အခြေတွင်တွက်ချက်
 DocType: Delivery Note Item,From Warehouse,ဂိုဒေါင်ထဲကနေ
 DocType: Assessment,Supervisor Name,ကြီးကြပ်ရေးမှူးအမည်
+DocType: Assessment,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,ဝယ်ယူအသုံးပြုသူ
 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 +27,Default Address Template cannot be deleted,default လိပ်စာ Template ဖျက်ပြီးမရနိုင်ပါ
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,default လိပ်စာ Template ဖျက်ပြီးမရနိုင်ပါ
 DocType: Sales Invoice,Shipping Rule,သဘောင်္တင်ခ Rule
 DocType: Manufacturer,Limited to 12 characters,12 ဇာတ်ကောင်များကန့်သတ်
 DocType: Journal Entry,Print Heading,ပုံနှိပ် HEAD
@@ -2965,8 +3006,8 @@
 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/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,ပစ်မှတ် qty သို့မဟုတ်ပစ်မှတ်ပမာဏကိုဖြစ်စေမဖြစ်မနေဖြစ်ပါသည်
-apps/erpnext/erpnext/stock/get_item_details.py +485,No default BOM exists for Item {0},BOM Item {0} သည်တည်ရှိမရှိပါက default
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +336,Please select Posting Date first,Post date ပထမဦးဆုံးကိုရွေးပါ ကျေးဇူးပြု.
+apps/erpnext/erpnext/stock/get_item_details.py +486,No default BOM exists for Item {0},BOM Item {0} သည်တည်ရှိမရှိပါက default
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +326,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 သယ်
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,လက်ရှိအရောင်းအနှင့်အတူကုန်ကျစရိတ် Center ကလယ်ဂျာမှပြောင်းလဲမပြနိုင်
@@ -2982,6 +3023,7 @@
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,ငွေတောင်းခံလွှာနှင့်အတူပွဲစဉ်ငွေပေးချေ
 DocType: Journal Entry,Bank Entry,ဘဏ်မှ Entry &#39;
 DocType: Authorization Rule,Applicable To (Designation),(သတ်မှတ်ပေးထားခြင်း) ရန်သက်ဆိုင်သော
+,Profitability Analysis,အမြတ်အစွန်းအားသုံးသပ်ခြင်း
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,စျေးဝယ်ခြင်းထဲသို့ထည့်သည်
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Group မှဖြင့်
 DocType: Guardian,Interests,စိတ်ဝင်စားမှုများ
@@ -2994,21 +3036,21 @@
 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 +141,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Serial Item {0} စတော့အိတ်ပြန်လည်ရင်ကြားစေ့ရေးကို အသုံးပြု. \ updated မရနိုင်ပါ
 DocType: Scheduling Tool,Day,နေ့
 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 +122,You are not authorized to approve leaves on Block Dates,သငျသညျ Block ကိုနေ့အပေါ်အရွက်အတည်ပြုခွင့်ကြသည်မဟုတ်
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,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 ပစ္စည်းတောင်းဆိုမှုအမျိုးအစား
-DocType: Student Applicant,AP.,အေပီ။
 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 +639,Point of Sale,ရောင်းမည်၏ပွိုင့်
+apps/erpnext/erpnext/accounts/page/pos/pos.js +634,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,အခွန်
 DocType: Production Planning Tool,Production Planning Tool,ထုတ်လုပ်မှုစီမံကိန်း Tool ကို
@@ -3017,74 +3059,77 @@
 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 +373,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 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 Profile,Customer Group,ဖောက်သည်အုပ်စု
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,Expense account is mandatory for item {0},စရိတ် account item ကို {0} သည်မသင်မနေရ
 DocType: Item,Website Description,website ဖော်ပြချက်များ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date must be on or after today,Next ကိုတန်ဖိုးနေ့စွဲယနေ့ပေါ်တွင်သို့မဟုတ်ပြီးနောက်သူဖြစ်ရမည်
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,Equity အတွက်ပိုက်ကွန်ကိုပြောင်းရန်
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +145,Please cancel Purchase Invoice {0} first,ပထမဦးဆုံးဝယ်ယူငွေတောင်းခံလွှာ {0} ဖျက်သိမ်းပေးပါ
 DocType: Serial No,AMC Expiry Date,AMC သက်တမ်းကုန်ဆုံးသည့်ရက်စွဲ
 ,Sales Register,အရောင်းမှတ်ပုံတင်မည်
 DocType: Quotation,Quotation Lost Reason,စျေးနှုန်းပျောက်ဆုံးသွားသောအကြောင်းရင်း
+apps/erpnext/erpnext/utilities/doctype/address/address.py +164,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 ကနေအသစ်တစ်ခုကိုတဦးတည်းဖန်တီးပေးပါ။
 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 +330,Transaction reference no {0} dated {1},ငွေသွင်းငွေထုတ်ရည်ညွှန်းမရှိ {0} {1} ရက်စွဲပါ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Transaction reference no {0} dated {1},ငွေသွင်းငွေထုတ်ရည်ညွှန်းမရှိ {0} {1} ရက်စွဲပါ
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,တည်းဖြတ်ရန်မရှိပါ။
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,Summary for this month and pending activities,ဒီလအတှကျအကျဉ်းချုပ်နှင့် Pend လှုပ်ရှားမှုများ
+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/accounts/doctype/sales_invoice/sales_invoice.py +406,Please remove this Invoice {0} from C-Form {1},C-Form တွင် {1} ကနေဒီပြေစာ {0} ကိုဖယ်ရှား ကျေးဇူးပြု.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,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 +644,Get Items,ပစ္စည်းများ Get
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +623,Get Items,ပစ္စည်းများ Get
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +210,Please enter Write Off Account,အကောင့်ပိတ်ရေးထားရိုက်ထည့်ပေးပါ
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,နောက်ဆုံးအမိန့်နေ့စွဲ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +41,Account {0} does not belongs to company {1},အကောင့်ကို {0} ကုမ္ပဏီ {1} ပိုင်ပါဘူး
+DocType: Student,Guardian Details,ဂါးဒီးယန်းအသေးစိတ်
 DocType: C-Form,C-Form,C-Form တွင်
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,မျိုးစုံန်ထမ်းများအတွက်မာကုတက်ရောက်
 DocType: Payment Request,Initiated,စတင်ခဲ့သည်
 DocType: Production Order,Planned Start Date,စီစဉ်ထား Start ကိုနေ့စွဲ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,Customer is required against Receivable account {0},ဖောက်သည် receiver အကောင့် {0} ဆန့်ကျင်လိုအပ်ပါသည်
 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 +265,Project-wise data is not available for Quotation,Project သည်ပညာ data တွေကိုစျေးနှုန်းသည်မရရှိနိုင်ပါသည်
+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 +101,Commercial,ကုန်သွယ်လုပ်ငန်းခွန်
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,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/purchase_invoice/purchase_invoice.py +648,Row {0}# Account must be of type 'Fixed Asset',အတန်း {0} # အကောင့်အမျိုးအစားဖြစ်ရပါမည် &#39;&#39; Fixed Asset &#39;&#39;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,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 +30,Series is mandatory,စီးရီးမသင်မနေရ
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +50,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},စတော့ရှယ်ယာ Item {0} လိုအပ်ဂိုဒေါင်
 DocType: Leave Allocation,Unused leaves,အသုံးမပြုသောအရွက်
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Cr,Cr
 DocType: Tax Rule,Billing State,ငွေတောင်းခံပြည်နယ်
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +250,Transfer,လွှဲပြောင်း
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +187,{0} {1} does not associated with Party Account {2},{0} {1} ပါတီအကောင့် {2} နှင့်ဆက်စပ်ပါဘူး
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,Fetch exploded BOM (including sub-assemblies),(Sub-အသင်းတော်များအပါအဝင်) ပေါက်ကွဲခဲ့ BOM Fetch
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +254,Transfer,လွှဲပြောင်း
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +190,{0} {1} does not associated with Party Account {2},{0} {1} ပါတီအကောင့် {2} နှင့်ဆက်စပ်ပါဘူး
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +796,Fetch exploded BOM (including sub-assemblies),(Sub-အသင်းတော်များအပါအဝင်) ပေါက်ကွဲခဲ့ BOM Fetch
 DocType: Authorization Rule,Applicable To (Employee),(န်ထမ်း) ရန်သက်ဆိုင်သော
-apps/erpnext/erpnext/controllers/accounts_controller.py +115,Due Date is mandatory,ကြောင့်နေ့စွဲမသင်မနေရ
+apps/erpnext/erpnext/controllers/accounts_controller.py +118,Due Date is mandatory,ကြောင့်နေ့စွဲမသင်မနေရ
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Attribute {0} ပါ 0 င်မဖွစျနိုငျဘို့ increment
 DocType: Journal Entry,Pay To / Recd From,From / Recd ရန်ပေးဆောင်
 DocType: Naming Series,Setup Series,Setup ကိုစီးရီး
 DocType: Payment Reconciliation,To Invoice Date,ပြေစာနေ့စွဲဖို့
 DocType: Supplier,Contact HTML,ဆက်သွယ်ရန် HTML ကို
 ,Inactive Customers,မလှုပ်မရှား Customer များ
+DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,ဝယ်ယူလက်ခံ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,ဘယ်လိုစျေးနှုန်းများ Rule လျှောက်ထားသလဲ?
 DocType: Quality Inspection,Delivery Note No,Delivery မှတ်ချက်မရှိပါ
@@ -3093,7 +3138,7 @@
 DocType: Company,Retail,လက်လီ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +120,Customer {0} does not exist,customer {0} မတည်ရှိပါဘူး
 DocType: Attendance,Absent,မရှိသော
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +587,Product Bundle,ထုတ်ကုန်ပစ္စည်း Bundle ကို
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Product Bundle,ထုတ်ကုန်ပစ္စည်း Bundle ကို
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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:
@@ -3103,8 +3148,8 @@
 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 +742,Send Supplier Emails,ပေးသွင်းထားတဲ့အီးမေးလ်ပို့ပါ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +104,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","လစာပြီးသားဤရက်စွဲအကွာအဝေးအကြားမဖွစျနိုငျ {0} အကြားကာလအတွက်လုပ်ငန်းများ၌နှင့် {1}, လျှောက်လွှာကာလချန်ထားပါ။"
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +708,Send Supplier Emails,ပေးသွင်းထားတဲ့အီးမေးလ်ပို့ပါ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,"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 နံပါတ်ထည့်သွင်းခြင်းစံချိန်တင်
 DocType: Guardian Interest,Guardian Interest,ဂါးဒီးယန်းအကျိုးစီးပွား
 DocType: Timesheet,Employee Detail,ဝန်ထမ်း Detail
@@ -3115,9 +3160,9 @@
 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}
 DocType: Salary Slip,Earning & Deduction,ဝင်ငွေ &amp; ထုတ်ယူ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +77,Account {0} cannot be a Group,အကောင့်ကို {0} တစ်ဦးအုပ်စုမဖွစျနိုငျ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} cannot be a Group,အကောင့်ကို {0} တစ်ဦးအုပ်စုမဖွစျနိုငျ
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +31,Optional. This setting will be used to filter in various transactions.,optional ။ ဒီ setting ကိုအမျိုးမျိုးသောငွေကြေးလွှဲပြောင်းမှုမှာ filter မှအသုံးပြုလိမ့်မည်။
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +107,Negative Valuation Rate is not allowed,negative အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည် Rate ခွင့်မပြု
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,negative အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည် Rate ခွင့်မပြု
 DocType: Holiday List,Weekly Off,အပတ်စဉ်ထုတ်ပိတ်
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","ဥပမာ 2012 ခုနှစ်, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +39,Provisional Profit / Loss (Credit),ယာယီအမြတ်ခွန် / ပျောက်ဆုံးခြင်းစဉ် (Credit)
@@ -3131,16 +3176,16 @@
 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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: ကုန်ကျစရိတ် Center က Item {2} သည်မသင်မနေရ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +626,Get Items from Product Bundle,ထုတ်ကုန်ပစ္စည်း Bundle ကိုထံမှပစ္စည်းများ Get
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +605,Get Items from Product Bundle,ထုတ်ကုန်ပစ္စည်း Bundle ကိုထံမှပစ္စည်းများ Get
 DocType: Asset,Straight Line,မျဥ်းဖြောင့်
 DocType: Project User,Project User,Project မှအသုံးပြုသူတို့၏
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} is inactive,အကောင့်ကို {0} လှုပျမရှားသည်
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} is inactive,အကောင့်ကို {0} လှုပျမရှားသည်
 DocType: GL Entry,Is Advance,ကြိုတင်ထုတ်သည်
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,နေ့စွဲရန်နေ့စွဲနှင့်တက်ရောက် မှစ. တက်ရောက်သူမသင်မနေရ
 apps/erpnext/erpnext/controllers/buying_controller.py +148,Please enter 'Is Subcontracted' as Yes or No,ရိုက်ထည့်ပေးပါဟုတ်ကဲ့သို့မဟုတ်မရှိပါအဖြစ် &#39;&#39; Subcontracted သည် &#39;&#39;
 DocType: Sales Team,Contact No.,ဆက်သွယ်ရန်အမှတ်
 DocType: Bank Reconciliation,Payment Entries,ငွေပေးချေမှုရမည့် Entries
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,'Profit and Loss' type account {0} not allowed in Opening Entry,Entry &#39;ဖွင့်လှစ်ခွင့်ပြုမ&#39; &#39;အကျိုးအမြတ်နှင့်ဆုံးရှုံးမှု&#39; &#39;type ကိုအကောင့်ကို {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +71,'Profit and Loss' type account {0} not allowed in Opening Entry,Entry &#39;ဖွင့်လှစ်ခွင့်ပြုမ&#39; &#39;အကျိုးအမြတ်နှင့်ဆုံးရှုံးမှု&#39; &#39;type ကိုအကောင့်ကို {0}
 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
@@ -3159,7 +3204,7 @@
 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,Value တစ်ခု / ဖော်ပြချက်များ
-apps/erpnext/erpnext/controllers/accounts_controller.py +558,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","အတန်း # {0}: ပိုင်ဆိုင်မှု {1} တင်သွင်းမရနိုငျ, က {2} ပြီးသားဖြစ်ပါတယ်"
+apps/erpnext/erpnext/controllers/accounts_controller.py +561,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","အတန်း # {0}: ပိုင်ဆိုင်မှု {1} တင်သွင်းမရနိုငျ, က {2} ပြီးသားဖြစ်ပါတယ်"
 DocType: Tax Rule,Billing Country,ငွေတောင်းခံနိုင်ငံ
 DocType: Production Order,Expected Delivery Date,မျှော်လင့်ထားသည့် 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} ဖြစ်ပါတယ်။
@@ -3172,13 +3217,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +202,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,posting အချိန်
-DocType: Sales Order,% Amount Billed,ကြေညာတဲ့% ပမာဏ
+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 ရှိပါတယ်ဖြစ်လိမ့်မည်။
 apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},Serial No {0} နှင့်အတူမရှိပါ Item
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,ပွင့်လင်းအသိပေးချက်များ
+DocType: Email Digest,Open Notifications,ပွင့်လင်းအသိပေးချက်များ
 DocType: Payment Entry,Difference Amount (Company Currency),ကွာခြားချက်ပမာဏ (ကုမ္ပဏီငွေကြေးစနစ်)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,တိုက်ရိုက်အသုံးစရိတ်များ
 apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
@@ -3186,7 +3231,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,နယူးဖောက်သည်အခွန်ဝန်ကြီးဌာန
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,ခရီးသွားအသုံးစရိတ်များ
 DocType: Maintenance Visit,Breakdown,ပျက်သည်
-apps/erpnext/erpnext/controllers/accounts_controller.py +634,Account: {0} with currency: {1} can not be selected,အကောင့်ဖွင်: {0} ငွေကြေးနှင့်အတူ: {1} ကိုရှေးခယျြမရနိုငျ
+apps/erpnext/erpnext/controllers/accounts_controller.py +637,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}
 DocType: Program Enrollment Tool,Student Applicants,ကျောင်းသားသမဂ္ဂလျှောက်ထား
@@ -3194,15 +3239,15 @@
 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 +56,Probation,အစမ်းထား
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Probation,အစမ်းထား
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,လစာ Components
 DocType: Program Enrollment Tool,New Academic Year,နယူးပညာရေးဆိုင်ရာတစ်နှစ်တာ
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Payment of salary for the month {0} and year {1},လ {0} သည်လစာ၏ငွေပေးချေမှုရမည့်နှင့်တစ်နှစ် {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Payment of salary for the month {0} and year {1},လ {0} သည်လစာ၏ငွေပေးချေမှုရမည့်နှင့်တစ်နှစ် {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,auto INSERT စျေးနှုန်းကိုစာရင်းနှုန်းကပျောက်ဆုံးနေဆဲလျှင်
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,စုစုပေါင်း Paid ငွေပမာဏ
 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 +144,Planning,စီမံကိန်း
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,စီမံကိန်း
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,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 ရောင်းချ
@@ -3215,11 +3260,10 @@
 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.,အီးမေးလ်ကနေတဆင့်ပုံမှန်အကျဉ်းချုပ်အစီရင်ခံစာပေးပို့ပါ။
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Sales invoice submitted sucessfully.,အရောင်းပြေစာ sucessfully တင်သွင်းခဲ့ပါသည်။
 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 အနေနဲ့အကောင့်သတ်မှတ်ထားပေးပါ
 DocType: Assessment Result,Student Name,ကျောင်းသားအမည်
-apps/erpnext/erpnext/hooks.py +104,Assessment Schedule,အကဲဖြတ်ဇယား
+apps/erpnext/erpnext/hooks.py +113,Assessment Schedule,အကဲဖြတ်ဇယား
 DocType: Brand,Item Manager,item Manager က
 DocType: Buying Settings,Default Supplier Type,default ပေးသွင်း Type
 DocType: Production Order,Total Operating Cost,စုစုပေါင်း Operating ကုန်ကျစရိတ်
@@ -3229,6 +3273,7 @@
 DocType: GL Entry,Party Type,ပါတီ Type
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +78,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 မဟုတ်
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,လစာ template ကိုမာစတာ။
 DocType: Leave Type,Max Days Leave Allowed,max Days ထွက်ခွာခွင့်ပြု
@@ -3240,18 +3285,19 @@
 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 +99,All Customer Groups,အားလုံးသည်ဖောက်သည်အဖွဲ့များ
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +78,Accumulated Monthly,လစဉ်စုဆောင်း
-apps/erpnext/erpnext/controllers/accounts_controller.py +595,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} မဖြစ်မနေဖြစ်ပါတယ်။ ဖြစ်ရင်ငွေကြေးစနစ်ချိန်းစံချိန် {1} {2} မှဖန်တီးသည်မဟုတ်။
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,အားလုံးသည်ဖောက်သည်အဖွဲ့များ
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +81,Accumulated Monthly,လစဉ်စုဆောင်း
+apps/erpnext/erpnext/controllers/accounts_controller.py +598,{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} မတည်ရှိပါဘူး
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),စျေးနှုန်း List ကို Rate (ကုမ္ပဏီငွေကြေးစနစ်)
 DocType: Products Settings,Products Settings,ထုတ်ကုန်များချိန်ညှိ
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +188,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Setup ကို Settings&gt;&gt; အမည်ဖြင့်သမုတ်စီးရီးကနေတဆင့် {0} များအတွက်စီးရီးအမည်ဖြင့်သမုတ်သတ်မှတ်ထားပေးပါ
 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 +84,Secretary,အတွင်းဝန်
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,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,ဝယ်
@@ -3260,24 +3306,22 @@
 ,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,အကဲဖြတ်အမည်
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,row # {0}: Serial မရှိပါမဖြစ်မနေဖြစ်ပါသည်
+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 +859,Supplier Quotation,ပေးသွင်းစျေးနှုန်း
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +838,Supplier Quotation,ပေးသွင်းစျေးနှုန်း
 DocType: Quotation,In Words will be visible once you save the Quotation.,သင်စျေးနှုန်းကိုကယ်တင်တစ်ချိန်ကစကားမြင်နိုင်ပါလိမ့်မည်။
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +7,Collect Fees,အခကြေးငွေများစုဆောင်း
+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} များတွင်အသုံးပြု
 DocType: Lead,Add to calendar on this date,ဒီနေ့စွဲအပေါ်ပြက္ခဒိန်မှ Add
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,သင်္ဘောစရိတ်ပေါင်းထည့်သည်နည်းဥပဒေများ။
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,လာမည့်အဖြစ်အပျက်များ
 DocType: Item,Opening Stock,စတော့အိတ်ဖွင့်လှစ်
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,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
-DocType: Email Digest,Income / Expense,ဝင်ငွေခွန် / သုံးစွဲမှု
 DocType: Employee,Personal Email,ပုဂ္ဂိုလ်ရေးအီးမေးလ်
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,စုစုပေါင်းကှဲလှဲ
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","enabled လျှင်, system ကိုအလိုအလျှောက်စာရင်းသည်စာရင်းကိုင် entries တွေကို post လိမ့်မည်။"
@@ -3288,13 +3332,14 @@
 DocType: Customer,From Lead,ခဲကနေ
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,ထုတ်လုပ်မှုပြန်လွှတ်ပေးခဲ့အမိန့်။
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာကိုရွေးပါ ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,POS Profile required to make POS Entry,POS Entry &#39;ပါစေရန်လိုအပ်သည် POS ကိုယ်ရေးအချက်အလက်များ profile
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +509,POS Profile required to make POS Entry,POS Entry &#39;ပါစေရန်လိုအပ်သည် POS ကိုယ်ရေးအချက်အလက်များ profile
 DocType: Program Enrollment Tool,Enroll Students,ကျောင်းသားများကျောင်းအပ်
 DocType: Hub Settings,Name Token,Token အမည်
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,စံရောင်းချသည့်
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Atleast one warehouse is mandatory,Atleast တယောက်ဂိုဒေါင်မသင်မနေရ
+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,အစားထိုးဖို့
+DocType: Production Order,Unstopped,Unstopped
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Invoice {1},{0} အရောင်းပြေစာ {1} ဆန့်ကျင်
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,စီမံကိန်းအမည်
@@ -3315,10 +3360,11 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,အရွက် 0.5 အလီလီခွဲဝေရမည်
 DocType: Production Order,Operation Cost,စစ်ဆင်ရေးကုန်ကျစရိတ်
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,တစ် .csv file ကိုထံမှတက်ရောက်သူ upload
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,ထူးချွန် Amt
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,ဒီအရောင်းပုဂ္ဂိုလ်များအတွက်ပစ်မှတ် Item Group မှပညာ Set ။
 DocType: Stock Settings,Freeze Stocks Older Than [Days],[Days] သန်း Older စတော့စျေးကွက်အေးခဲ
-apps/erpnext/erpnext/controllers/accounts_controller.py +528,Row #{0}: Asset is mandatory for fixed asset purchase/sale,အတန်း # {0}: ပိုင်ဆိုင်မှုသတ်မှတ်ထားတဲ့ပိုင်ဆိုင်မှုဝယ်ယူ / ရောင်းမည်မဖြစ်မနေဖြစ်ပါသည်
+apps/erpnext/erpnext/controllers/accounts_controller.py +531,Row #{0}: Asset is mandatory for fixed asset purchase/sale,အတန်း # {0}: ပိုင်ဆိုင်မှုသတ်မှတ်ထားတဲ့ပိုင်ဆိုင်မှုဝယ်ယူ / ရောင်းမည်မဖြစ်မနေဖြစ်ပါသည်
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","နှစ်ခုသို့မဟုတ်ထို့ထက်ပိုသောစျေးနှုန်းနည်းဥပဒေများအထက်ဖော်ပြပါအခြေအနေများအပေါ် အခြေခံ. တွေ့ရှိနေတယ်ဆိုရင်, ဦးစားပေးလျှောက်ထားတာဖြစ်ပါတယ်။ default value ကိုသုည (အလွတ်) ဖြစ်ပါသည်စဉ်ဦးစားပေး 0 င်မှ 20 အကြားတစ်ဦးအရေအတွက်ဖြစ်ပါတယ်။ ပိုမိုမြင့်မားသောအရေအတွက်တူညီသည့်အခြေအနေများနှင့်အတူမျိုးစုံစျေးနှုန်းများနည်းဥပဒေများရှိပါတယ်လျှင်ဦးစားပေးယူလိမ့်မည်ဆိုလိုသည်။"
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ: {0} တည်ရှိပါဘူး
 DocType: Currency Exchange,To Currency,ငွေကြေးစနစ်မှ
@@ -3335,15 +3381,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,ပုဂ္ဂလိက Equity
 DocType: Maintenance Visit,Customer Feedback,customer တုံ့ပြန်ချက်
 DocType: Account,Expense,သုံးငှေ
-DocType: Sales Invoice,Exhibition,ပွပှဲ
 apps/erpnext/erpnext/utilities/doctype/address/address.py +77,"Company is mandatory, as it is your company address","ဒါကြောင့်သင့်ရဲ့ကုမ္ပဏီလိပ်စာဖြစ်သကဲ့သို့ကုမ္ပဏီ, မဖြစ်မနေဖြစ်ပါသည်"
 DocType: Item Attribute,From Range,Range ထဲထဲကနေ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +81,Syntax error in formula or condition: {0},ဖော်မြူလာသို့မဟုတ်အခြေအနေ syntax အမှား: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +92,Syntax error in formula or condition: {0},ဖော်မြူလာသို့မဟုတ်အခြေအနေ syntax အမှား: {0}
 apps/erpnext/erpnext/stock/utils.py +99,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 +28,Jobs,ဂျော့ဘ်
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,ဂျော့ဘ်
 ,Sales Order Trends,အရောင်းအမိန့်ခေတ်ရေစီးကြောင်း
 DocType: Employee,Held On,တွင်ကျင်းပ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,ထုတ်လုပ်မှု Item
@@ -3352,16 +3398,16 @@
 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 +763,Make Supplier Quotation,ပေးသွင်းစျေးနှုန်းလုပ်ပါ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,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/controllers/sales_and_purchase_return.py +100,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 +42,Casual Leave,ကျပန်းထွက်ခွာ
+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,ကျပန်းထွက်ခွာ
 DocType: Batch,Batch ID,batch ID ကို
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,Note: {0},မှတ်စု: {0}
 ,Delivery Note Trends,Delivery မှတ်ချက်ခေတ်ရေစီးကြောင်း
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +103,This Week's Summary,This Week ရဲ့အကျဉ်းချုပ်
+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 နိုင်ပါတယ်
 DocType: Student Group Creation Tool,Get Courses,သင်တန်းများ get
 DocType: GL Entry,Party,ပါတီ
@@ -3371,7 +3417,7 @@
 DocType: Request for Quotation Item,Request for Quotation Item,စျေးနှုန်းပစ္စည်းများအတွက်တောင်းဆိုခြင်း
 DocType: Purchase Order,To Bill,ဘီလ်မှ
 DocType: Material Request,% Ordered,% မိန့်ထုတ်
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Piecework,Piecework
+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
 DocType: Task,Actual Time (in Hours),(နာရီအတွက်) အမှန်တကယ်အချိန်
 DocType: Employee,History In Company,ကုမ္ပဏီခုနှစ်တွင်သမိုင်းကြောင်း
@@ -3388,7 +3434,7 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +350,{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 +162,Black,black
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,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} ပစ္စည်းများ
@@ -3399,13 +3445,13 @@
 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 +69,Customer Id,customer Id
+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,မာကုဒူးယောင်
 DocType: Journal Entry Account,Exchange Rate,ငွေလဲလှယ်နှုန်း
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Sales Order {0} is not submitted,အရောင်းအမှာစာ {0} တင်သွင်းသည်မဟုတ်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +527,Sales Order {0} is not submitted,အရောင်းအမှာစာ {0} တင်သွင်းသည်မဟုတ်
 DocType: Homepage,Tag Line,tag ကိုလိုင်း
 DocType: Fee Component,Fee Component,အခကြေးငွေစိတျအပိုငျး
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +857,Add items from,အထဲကပစ္စည်းတွေကို Add
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +836,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 ပါဘူး
 DocType: Cheque Print Template,Regular,ပုံမှန်အစည်းအဝေး
 DocType: BOM,Last Purchase Rate,နောက်ဆုံးဝယ်ယူ Rate
@@ -3413,6 +3459,7 @@
 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} သည်မတည်ရှိနိုင်
 ,Sales Person-wise Transaction Summary,အရောင်းပုဂ္ဂိုလ်ပညာ Transaction အကျဉ်းချုပ်
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +60,Cost Center is required for 'Profit and Loss' account {0}. Please set up a default Cost Center for the Company.,ကုန်ကျစရိတ်စင်တာ &#39;&#39; အကျိုးအမြတ်နှင့်ဆုံးရှုံးမှု &#39;&#39; အကောင့် {0} ဘို့လိုအပ်ပါသည်။ ကုမ္ပဏီတစ်ခုက default ကုန်ကျစရိတ်စင်တာထူထောင်ပေးပါ။
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,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,လစဉ်ဖြန့်ဖြူးရာခိုင်နှုန်း
@@ -3423,12 +3470,12 @@
 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 +710,Online,အွန်လိုင်း
+apps/erpnext/erpnext/accounts/page/pos/pos.js +692,Online,အွန်လိုင်း
 ,Available Stock for Packing Items,ပစ္စည်းများထုပ်ပိုးရရှိနိုင်ပါသည်စတော့အိတ်
 DocType: Item Variant,Item Variant,item Variant
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,ငါမှတပါးအခြားသော default အရှိအဖြစ်ကို default အတိုင်းဤလိပ်စာ Template ပြင်ဆင်ခြင်း
+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 ပြင်ဆင်ခြင်း
 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 +74,Quality Management,အရည်အသွေးအစီမံခန့်ခွဲမှု
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,အရည်အသွေးအစီမံခန့်ခွဲမှု
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,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,ဝန်ထမ်းပြင်ပလုပ်ငန်းခွင်သမိုင်း
@@ -3450,11 +3497,12 @@
 DocType: Student,Student Email ID,ကျောင်းသားသမဂ္ဂအီးမေးလ် ID ကို
 DocType: Employee,Notice (days),အသိပေးစာ (ရက်)
 DocType: Tax Rule,Sales Tax Template,အရောင်းခွန် Template ကို
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1520,Select items to save the invoice,ငွေတောင်းခံလွှာကိုကယ်တင်ပစ္စည်းများကို Select လုပ်ပါ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1544,Select items to save the invoice,ငွေတောင်းခံလွှာကိုကယ်တင်ပစ္စည်းများကို Select လုပ်ပါ
 DocType: Employee,Encashment Date,Encashment နေ့စွဲ
 DocType: Account,Stock Adjustment,စတော့အိတ် Adjustments
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},{0} - default လုပ်ဆောင်ချက်ကုန်ကျစရိတ်လုပ်ဆောင်ချက်ကအမျိုးအစားသည်တည်ရှိ
 DocType: Production Order,Planned Operating Cost,စီစဉ်ထားတဲ့ Operating ကုန်ကျစရိတ်
+DocType: Academic Term,Term Start Date,သက်တမ်း Start ကိုနေ့စွဲ
 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,အထွေထွေလယ်ဂျာနှုန်းအဖြစ် Bank မှဖော်ပြချက်ချိန်ခွင်လျှာ
 DocType: Job Applicant,Applicant Name,လျှောက်ထားသူအမည်
@@ -3484,17 +3532,17 @@
 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 ကိုဒီကိုဂိုဒေါင်သည်တည်ရှိအဖြစ်ဂိုဒေါင်ဖျက်ပြီးမရနိုင်ပါ။
 DocType: Company,Distribution,ဖြန့်ဝေ
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +8,Amount Paid,Paid ငွေပမာဏ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Project Manager,စီမံကိန်းမန်နေဂျာ
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,Paid ငွေပမာဏ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,စီမံကိန်းမန်နေဂျာ
 ,Quoted Item Comparison,ကိုးကားအရာဝတ္ထုနှိုင်းယှဉ်ခြင်း
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Dispatch,dispatch
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,dispatch
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,item တခုကိုခွင့်ပြုထား max ကိုလျှော့စျေး: {0} သည် {1}%
 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.,ထားချေးငွေကန့်သတ်ထက်ကျော်လွန်ကြောင်းကိစ္စများကိုတင်ပြခွင့်ပြုခဲ့ကြောင်းအခန်းကဏ္ဍကို။
-DocType: Sales Invoice,Supplier Reference,ပေးသွင်းကိုးကားစရာ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +844,"Master data syncing, it might take some time","မဟာဒေတာထပ်တူပြုခြင်း, ကအချို့သောအချိန်ယူစေခြင်းငှါ,"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +832,"Master data syncing, it might take some time","မဟာဒေတာထပ်တူပြုခြင်း, ကအချို့သောအချိန်ယူစေခြင်းငှါ,"
 DocType: Item,Material Issue,material Issue
 DocType: Hub Settings,Seller Description,ရောင်းချသူဖော်ပြချက်များ
 DocType: Employee Education,Qualification,အရည်အချင်း
@@ -3508,7 +3556,7 @@
 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 +83,Error in formula or condition,ဖော်မြူလာသို့မဟုတ်အခြေအနေအမှား
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,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 လုပ်
@@ -3517,7 +3565,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},နေ့စွဲဖို့ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာအတွင်းတွင်သာဖြစ်သင့်သည်။ နေ့စွဲ = {0} နိုင်ရန်ယူဆ
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","ဒီနေရာတွင်အမြင့်, အလေးချိန်, ဓါတ်မတည်, ဆေးဘက်ဆိုင်ရာစိုးရိမ်ပူပန်မှုများစသည်တို့ကိုထိန်းသိမ်းထားနိုင်ပါတယ်"
 DocType: Leave Block List,Applies to Company,ကုမ္ပဏီသက်ဆိုင်
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +197,Cannot cancel because submitted Stock Entry {0} exists,"တင်သွင်းစတော့အိတ် Entry &#39;{0} တည်ရှိသောကြောင့်, ဖျက်သိမ်းနိုင်ဘူး"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +198,Cannot cancel because submitted Stock Entry {0} exists,"တင်သွင်းစတော့အိတ် Entry &#39;{0} တည်ရှိသောကြောင့်, ဖျက်သိမ်းနိုင်ဘူး"
 DocType: Purchase Invoice,In Words,စကားအတွက်
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,Today is {0}'s birthday!,ဒီနေ့ {0} &#39;s မွေးနေ့ပါ!
 DocType: Production Planning Tool,Material Request For Warehouse,ဂိုဒေါင်သည် material တောင်းဆိုခြင်း
@@ -3527,14 +3575,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,သင့်ရဲ့ဘဏ္ဍာရေးနှစ်တွင်အပေါ်စတင်ခဲ့သည်
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,ပိုင်ဆိုင်မှုတန်ဖိုးနှင့် Balance
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +319,Amount {0} {1} transferred from {2} to {3},ငွေပမာဏ {0} {1} {3} မှ {2} ကနေလွှဲပြောင်း
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +322,Amount {0} {1} transferred from {2} to {3},ငွေပမာဏ {0} {1} {3} မှ {2} ကနေလွှဲပြောင်း
 DocType: Sales Invoice,Get Advances Received,ကြိုတင်ငွေရရှိထားသည့် Get
 DocType: Email Digest,Add/Remove Recipients,Add / Remove လက်ခံရယူ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +432,Transaction not allowed against stopped Production Order {0},transaction ရပ်တန့်ထုတ်လုပ်ရေးအမိန့် {0} ဆန့်ကျင်ခွင့်မပြု
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +437,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 +143,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 +652,Item variant {0} exists with same attributes,item မူကွဲ {0} အတူတူ Attribute တွေနှင့်အတူတည်ရှိမှု့
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,item မူကွဲ {0} အတူတူ Attribute တွေနှင့်အတူတည်ရှိမှု့
+DocType: Leave Application,LAP/,ရင်ခွင် /
 DocType: Salary Slip,Salary Slip,လစာစလစ်ဖြတ်ပိုင်းပုံစံ
 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; လိုအပ်သည်
@@ -3542,12 +3591,12 @@
 DocType: Sales Invoice Item,Sales Order Item,အရောင်းအမှာစာ Item
 DocType: Salary Slip,Payment Days,ငွေပေးချေမှုရမည့်ကာလသ
 DocType: Customer,Dormant,မြုံ
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +212,Warehouses with child nodes cannot be converted to ledger,ကလေး node များနှင့်အတူသိုလှောင်ရုံလယ်ဂျာကူးပြောင်းမရနိုငျ
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +215,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/public/js/controllers/transaction.js +866,It is needed to fetch Item Details.,ဒါဟာပစ္စည်း Details ကိုဆွဲယူဖို့လိုသည်။
+apps/erpnext/erpnext/public/js/controllers/transaction.js +857,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} ပြီးသားကိုလက်ခံရရှိခဲ့ပြီး
@@ -3557,14 +3606,14 @@
 DocType: Expense Claim,Total Claimed Amount,စုစုပေါင်းအခိုင်အမာငွေပမာဏ
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,ရောင်းချခြင်းသည်အလားအလာရှိသောအခွင့်အလမ်း။
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,Invalid {0},မမှန်ကန်ခြင်း {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Sick Leave,နေမကောင်းထွက်ခွာ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,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,ဦးစီးဌာနအရောင်းဆိုင်များ
 DocType: Warehouse,PIN,PIN ကို
 DocType: Sales Invoice,Base Change Amount (Company Currency),base ပြောင်းလဲမှုပမာဏ (ကုမ္ပဏီငွေကြေးစနစ်)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +313,No accounting entries for the following warehouses,အောက်ပါသိုလှောင်ရုံမရှိပါစာရင်းကိုင် posts များ
-apps/erpnext/erpnext/projects/doctype/project/project.js +102,Save the document first.,ပထမဦးဆုံးစာရွက်စာတမ်း Save လိုက်ပါ။
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +314,No accounting entries for the following warehouses,အောက်ပါသိုလှောင်ရုံမရှိပါစာရင်းကိုင် posts များ
+apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,ပထမဦးဆုံးစာရွက်စာတမ်း Save လိုက်ပါ။
 DocType: Account,Chargeable,နှော
 DocType: Company,Change Abbreviation,ပြောင်းလဲမှုအတိုကောက်
 DocType: Expense Claim Detail,Expense Date,စရိတ်နေ့စွဲ
@@ -3577,10 +3626,9 @@
 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,မျှော်လင့်ထားသည့် Delivery Date ကိုဝယ်ယူခြင်းအမိန့်နေ့စွဲခင်မဖွစျနိုငျ
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Setup ကို Settings&gt;&gt; အမည်ဖြင့်သမုတ်စီးရီးကနေတဆင့် {0} များအတွက်စီးရီးအမည်ဖြင့်သမုတ်သတ်မှတ်ထားပေးပါ
 DocType: Appraisal,Appraisal Template,စိစစ်ရေး Template:
 DocType: Item Group,Item Classification,item ခွဲခြား
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Business Development Manager,စီးပွားရေးဖွံ့ဖြိုးတိုးတက်ရေးမန်နေဂျာ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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,အထွေထွေလယ်ဂျာ
@@ -3590,8 +3638,8 @@
 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 +940,Please select {0} first,ပထမဦးဆုံး {0} ကို select ကျေးဇူးပြု.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +749,Batch {0} of Item {1} has expired.,batch {0} Item ၏ {1} သက်တမ်းကုန်ဆုံးခဲ့သည်။
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +953,Please select {0} first,ပထမဦးဆုံး {0} ကို select ကျေးဇူးပြု.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +757,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,စုစုပေါင်း
@@ -3608,8 +3656,8 @@
 {% 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 +92,Warehouse not found in the system,ဂိုဒေါင်ကို system ထဲမှာမတှေ့
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +106,This Month's Summary,ဒီလရဲ့အကျဉ်းချုပ်
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,ဂိုဒေါင်ကို system ထဲမှာမတှေ့
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,ဒီလရဲ့အကျဉ်းချုပ်
 DocType: Quality Inspection Reading,Quality Inspection Reading,အရည်အသွေးအစစ်ဆေးရေးစာဖတ်ခြင်း
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Freeze တော့စျေးကွက် Older Than`% ဃရက်ပတ်လုံးထက်သေးငယ်ဖြစ်သင့်သည်။
 DocType: Tax Rule,Purchase Tax Template,ဝယ်ယူခွန် Template ကို
@@ -3619,21 +3667,22 @@
 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 +87,Please set Next Depreciation Date,Next ကိုတန်ဖိုးနေ့စွဲသတ်မှတ်ထားပေးပါ
-DocType: Payment Gateway,Payment Gateway,ငွေပေးချေမှုရမည့် Gateway မှာ
 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 +378,Operation Time must be greater than 0 for Operation {0},စစ်ဆင်ရေးအချိန်ကစစ်ဆင်ရေး {0} များအတွက် 0 င်ထက် သာ. ကြီးမြတ်ဖြစ်ရပါမည်
+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/accounts/doctype/account/account.py +170,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) သည်ထိုပွဲကို
 DocType: Program,Program Abbreviation,Program ကိုအတိုကောက်
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,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: Appraisal,Start Date,စတင်သည့်ရက်စွဲ
@@ -3649,21 +3698,22 @@
 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
 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 +27,Transaction currency must be same as Payment Gateway currency,transaction ငွေကြေးငွေပေးချေမှုရမည့် Gateway မှာငွေကြေးအဖြစ်အတူတူဖြစ်ရပါမည်
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Transaction currency must be same as Payment Gateway currency,transaction ငွေကြေးငွေပေးချေမှုရမည့် Gateway မှာငွေကြေးအဖြစ်အတူတူဖြစ်ရပါမည်
 DocType: Payment Entry,Receive,လက်ခံရရှိ
+apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,ကိုးကား:
 DocType: Maintenance Visit,Fully Completed,အပြည့်အဝပြီးစီး
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,Complete {0}%
 DocType: Employee,Educational Qualification,ပညာရေးဆိုင်ရာအရည်အချင်း
 DocType: Workstation,Operating Costs,operating ကုန်ကျစရိတ်
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,စုဆောင်းမိလစဉ်ဘတ်ဂျက်လျှင်လှုပ်ရှားမှုကျော်သွားပါပြီ
 DocType: Purchase Invoice,Submit on creation,ဖန်ဆင်းခြင်းအပေါ် Submit
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +432,Currency for {0} must be {1},{0} {1} ရှိရမည်များအတွက်ငွေကြေး
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +435,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 +493,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 +495,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 +79,"Cannot declare as lost, because Quotation has been made.","ဆုံးရှုံးအဖြစ်စျေးနှုန်းကိုဖန်ဆင်းခဲ့ပြီးကြောင့်, ကြေညာလို့မရပါဘူး။"
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,ဝယ်ယူမဟာ Manager က
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +429,Production Order {0} must be submitted,ထုတ်လုပ်မှုအမိန့် {0} တင်သွင်းရမည်
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +434,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,ယနေ့အထိသည့်နေ့ရက်မှခင်မဖွစျနိုငျ
@@ -3673,25 +3723,27 @@
 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 +181,Totals,စုစုပေါင်း
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,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 +113,Warning: Leave application contains following block dates,သတိပေးချက်: Leave ပလီကေးရှင်းအောက်ပါလုပ်ကွက်ရက်စွဲများင်
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +120,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} ၏ယူနစ်။
+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 +181,Organization unit (department) master.,အစည်းအရုံးယူနစ် (ဌာန၏) သခင်သည်။
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,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 +793,All records are synced.,အားလုံးမှတ်တမ်းများတစ်ပြိုင်တည်းချိန်ကိုက်ကြသည်။
+apps/erpnext/erpnext/accounts/page/pos/pos.js +781,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,မလုံခြုံချေးငွေ
 DocType: Cost Center,Cost Center Name,ကုန်ကျ Center ကအမည်
@@ -3710,21 +3762,20 @@
 DocType: Address,Name of person or organization that this address belongs to.,ဒီလိပ်စာကိုပိုင်ဆိုင်ကြောင်းလူတစ်ဦးသို့မဟုတ်အဖွဲ့အစည်း၏အမည်ပြောပါ။
 apps/erpnext/erpnext/public/js/setup_wizard.js +260,Your Suppliers,သင့်ရဲ့ပေးသွင်း
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +49,Cannot set as Lost as Sales Order is made.,အရောင်းအမိန့်ကိုဖန်ဆင်းသည်အဖြစ်ပျောက်ဆုံးသွားသောအဖြစ်သတ်မှတ်လို့မရပါဘူး။
-DocType: Student Applicant,Mother's Name,မိခင်ရဲ့အမည်
 DocType: Request for Quotation Item,Supplier Part No,ပေးသွင်းအပိုင်းဘယ်သူမျှမက
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +348,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',အမျိုးအစား &#39;&#39; အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည် &#39;သို့မဟုတ်&#39; &#39;Vaulation နှင့်စုစုပေါင်း&#39; &#39;အဘို့ဖြစ်၏ရသောအခါနုတ်မနိုင်
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Received From,မှစ. ရရှိထားသည့်
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Received From,မှစ. ရရှိထားသည့်
 DocType: Lead,Converted,ပွောငျး
 DocType: Item,Has Serial No,Serial No ရှိပါတယ်
 DocType: Employee,Date of Issue,ထုတ်ဝေသည့်ရက်စွဲ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: {0} {1} သည် မှစ.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +153,Row #{0}: Set Supplier for item {1},row # {0}: ကို item များအတွက် Set ပေးသွင်း {1}
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +93,Row {0}: Hours value must be greater than zero.,အတန်း {0}: နာရီတန်ဖိုးကိုသုညထက်ကြီးမြတ်ဖြစ်ရပါမည်။
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +117,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} မတွေ့ရှိနိုင်
 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 +172,{0} {1} does not exist,{0} {1} မတည်ရှိပါဘူး
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +175,{0} {1} does not exist,{0} {1} မတည်ရှိပါဘူး
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,Please check Multi Currency option to allow accounts with other currency,အခြားအငွေကြေးကိုနှင့်အတူအကောင့်အသစ်များ၏ခွင့်ပြုပါရန်ဘက်စုံငွေကြေးစနစ် option ကိုစစ်ဆေးပါ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +72,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 တန်ဖိုးကိုသတ်မှတ်ခွင့်မဟုတ်
@@ -3733,13 +3784,14 @@
 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/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,တက်ရောက်သူအနာဂတ်ရက်စွဲများကိုချောင်းမြောင်းမရနိုင်ပါ
 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 +109,Electrical,electrical
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Electrical,electrical
 DocType: Stock Entry,Total Value Difference (Out - In),(- ခုနှစ်တွင် Out) စုစုပေါင်းတန်ဖိုး Difference
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,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} သည်စွဲလမ်းခြင်းမ
@@ -3747,7 +3799,7 @@
 DocType: Item,Customer Code,customer Code ကို
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +210,Birthday Reminder for {0},{0} သည်မွေးနေသတိပေး
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,ပြီးခဲ့သည့်အမိန့် ခုနှစ်မှစ. ရက်ပတ်လုံး
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +292,Debit To account must be a Balance Sheet account,အကောင့်ကိုရန် debit တစ်ဦး Balance ကိုစာရွက်အကောင့်ကိုသူဖြစ်ရမည်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To account must be a Balance Sheet account,အကောင့်ကိုရန် debit တစ်ဦး Balance ကိုစာရွက်အကောင့်ကိုသူဖြစ်ရမည်
 DocType: Buying Settings,Naming Series,စီးရီးအမည်
 DocType: Leave Block List,Leave Block List Name,Block List ကိုအမည် Leave
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,စတော့အိတ်ပိုင်ဆိုင်မှုများ
@@ -3759,11 +3811,11 @@
 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 +301,Salary Slip of employee {0} already created for time sheet {1},ဝန်ထမ်း၏လစာစလစ်ဖြတ်ပိုင်းပုံစံ {0} ပြီးသားအချိန်စာရွက် {1} ဖန်တီး
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +313,Salary Slip of employee {0} already created for time sheet {1},ဝန်ထမ်း၏လစာစလစ်ဖြတ်ပိုင်းပုံစံ {0} ပြီးသားအချိန်စာရွက် {1} ဖန်တီး
 DocType: Sales Order Item,Ordered Qty,အမိန့် Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +673,Item {0} is disabled,item {0} ပိတ်ထားတယ်
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} is disabled,item {0} ပိတ်ထားတယ်
 DocType: Stock Settings,Stock Frozen Upto,စတော့အိတ် Frozen အထိ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +838,BOM does not contain any stock item,BOM ဆိုစတော့ရှယ်ယာကို item ဆံ့မပါဘူး
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +809,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.,စီမံကိန်းလှုပ်ရှားမှု / အလုပ်တစ်ခုကို။
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,လစာစလစ် Generate
@@ -3771,23 +3823,24 @@
 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 မှငွေကြေးစနစ်)
-apps/erpnext/erpnext/stock/doctype/item/item.py +485,Row #{0}: Please set reorder quantity,row # {0}: set ကျေးဇူးပြု. reorder အအရေအတွက်
+DocType: Sales Invoice Timesheet,Billing Hours,ငွေတောင်းခံနာရီ
+apps/erpnext/erpnext/stock/doctype/item/item.py +487,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 +62,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,ကမ်းလှမ်းမှုကိုပေးစာသက်မှတ်ချက်များ
+DocType: Payment Entry,Allocate Payment Amount,ငွေပေးချေမှုရမည့်ငွေပမာဏခွဲဝေချထားပေးရန်
 DocType: Employee External Work History,Salary,လခ
 DocType: Serial No,Delivery Document Type,Delivery Document ဖိုင် Type
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,အထက်ပါရွေးချယ်ထားသောသတ်မှတ်ချက်များပေါင်းသည်တလုံးလစာတနိုင်ငံအညွန့ Submit
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,Sync လုပ်ထား {0} ပစ္စည်းများ
 DocType: Sales Order,Partly Delivered,တစ်စိတ်တစ်ပိုင်းကယ်နှုတ်တော်မူ၏
-DocType: Sales Invoice,Existing Customer,လက်ရှိဖောက်သည်
 DocType: Email Digest,Receivables,receiver
+DocType: Lead Source,Lead Source,ခဲရင်းမြစ်
 DocType: Customer,Additional information regarding the customer.,ဖောက်သည်နှင့်ပတ်သတ်သောအချက်အလက်ပို။
 DocType: Quality Inspection Reading,Reading 5,5 Reading
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +38,Campaign Name is required,ကင်ပိန်းအမည်လိုအပ်သည်
 DocType: Maintenance Visit,Maintenance Date,ပြုပြင်ထိန်းသိမ်းမှုနေ့စွဲ
 DocType: Purchase Invoice Item,Rejected Serial No,ပယ်ချ 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} နှင့်အတူထပ်ဖြစ်ပါတယ်။ ရှောင်ရှားရန်ကုမ္ပဏီသတ်မှတ်ထားကျေးဇူးပြုပြီး
@@ -3795,10 +3848,9 @@
 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 +129,BOM and Manufacturing Quantity are required,BOM နှင့်ကုန်ထုတ်လုပ်မှုပမာဏလိုအပ်သည်
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,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,မက်စ်အစွမ်းသတ္တိ
-DocType: Bank Reconciliation Detail,Amount,ငွေပမာဏ
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM အစားထိုး
 ,Sales Analytics,အရောင်း Analytics
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +113,Available {0},ရရှိနိုင် {0}
@@ -3806,14 +3858,14 @@
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,အီးမေးလ်ကိုတည်ဆောက်ခြင်း
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +96,Please enter default currency in Company Master,ကုမ္ပဏီနှင့် Master အတွက် default အနေနဲ့ငွေကြေးရိုက်ထည့်ပေးပါ
 DocType: Stock Entry Detail,Stock Entry Detail,စတော့အိတ် Entry Detail
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +100,Daily Reminders,Daily သတင်းစာသတိပေးချက်များ
+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/account/account_tree.js +23,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 +71,Customer Service,ဧည့်ဝန်ဆောင်မှု
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Customer Service,ဧည့်ဝန်ဆောင်မှု
 DocType: Homepage Featured Product,Thumbnail,thumbnail
 DocType: Item Customer Detail,Item Customer Detail,item ဖောက်သည် Detail
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,ကိုယ်စားလှယ်လောင်းတစ်ဦးယောဘငှေပါ။
@@ -3822,8 +3874,9 @@
 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 ဖြစ်ရမည်
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,တိုးတက်ရေးပါတီဂိုဒေါင်ခုနှစ်တွင် Default အနေနဲ့သူ Work
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1570,Total nos of serial no is not equal to quantity.,အမှတ်စဉ်မရှိစုစုပေါင်း nos အရေအတွက်နှင့်ညီမျှသည်မဟုတ်။
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1594,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 ကိုစီးရီးနံပါတ်
@@ -3831,9 +3884,10 @@
 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 +82,Engineer,အင်ဂျင်နီယာ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,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 +370,Item Code required at Row No {0},Row မရှိပါ {0} မှာလိုအပ်သည့် item Code ကို
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +398,Item Code required at Row No {0},Row မရှိပါ {0} မှာလိုအပ်သည့် item Code ကို
 DocType: Sales Partner,Partner Type,partner ကအမျိုးအစား
 DocType: Purchase Taxes and Charges,Actual,အမှန်တကယ်
 DocType: Authorization Rule,Customerwise Discount,Customerwise လျှော့
@@ -3849,16 +3903,18 @@
 DocType: BOM,Raw Material Cost,ကုန်ကြမ်းပစ္စည်းကုန်ကျစရိတ်
 DocType: Item Reorder,Re-Order Level,Re-Order အဆင့်
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,ပစ္စည်းများကို Enter နှင့်သင်ထုတ်လုပ်မှုအမိန့်မြှင်သို့မဟုတ်ခွဲခြမ်းစိတ်ဖြာများအတွက်ကုန်ကြမ်းကို download လုပ်လိုသည့်အဘို့အ qty စီစဉ်ခဲ့ပါတယ်။
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +55,Part-time,အချိန်ပိုင်း
+apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,Gantt ဇယား
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,အချိန်ပိုင်း
 DocType: Employee,Applicable Holiday List,သက်ဆိုင်အားလပ်ရက်များစာရင်း
 DocType: Employee,Cheque,Cheques
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,စီးရီး Updated
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +57,Series Updated,စီးရီး Updated
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,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 +87,Clearance Date updated,ရှင်းလင်းရေးနေ့စွဲ updated
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,အောင်မြင်စွာ ပြန်.
@@ -3872,7 +3928,7 @@
 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 +513,Posting date and posting time is mandatory,ရက်စွဲနှင့် posting အချိန်များသို့တင်ပြမသင်မနေရ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,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.,သင်ဝယ်ယူခြင်းအမိန့်ကိုကယ်တင်တစ်ချိန်ကစကားမြင်နိုင်ပါလိမ့်မည်။
@@ -3882,7 +3938,7 @@
 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/stock/doctype/stock_entry/stock_entry.py +158,Target warehouse in row {0} must be same as Production Order,အတန်းအတွက်ပစ်မှတ်ဂိုဒေါင် {0} ထုတ်လုပ်မှုအမိန့်အဖြစ်အတူတူသာဖြစ်ရမည်
+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 တွေကိုချမှတ်ပြီးနောက်ပြောင်းလဲသွားမရနိုငျ
 DocType: Company,Round Off Account,အကောင့်ပိတ် round
@@ -3891,23 +3947,22 @@
 DocType: Customer Group,Parent Customer Group,မိဘဖောက်သည်အုပ်စု
 DocType: Purchase Invoice,Contact Email,ဆက်သွယ်ရန်အီးမေးလ်
 DocType: Appraisal Goal,Score Earned,ရမှတ်ရရှိခဲ့သည်
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Notice Period,သတိပေးချက်ကာလ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,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 +4,New Sales Person Name,နယူးအရောင်းပုဂ္ဂိုလ်အမည်
 DocType: Packing Slip,Gross Weight UOM,gross အလေးချိန် UOM
-DocType: Email Digest,Receivables / Payables,receiver / ပေးဆောင်
 DocType: Delivery Note Item,Against Sales Invoice,အရောင်းပြေစာဆန့်ကျင်
 DocType: Bin,Reserved Qty for Production,ထုတ်လုပ်မှုများအတွက် Reserved အရည်အတွက်
 DocType: Asset,Frequency of Depreciation (Months),တန်ဖိုး၏ frequency (လ)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +469,Credit Account,ခရက်ဒစ်အကောင့်ကို
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Credit Account,ခရက်ဒစ်အကောင့်ကို
 DocType: Landed Cost Item,Landed Cost Item,ဆင်းသက်ကုန်ကျစရိတ် Item
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +55,Show zero values,သုညတန်ဖိုးများကိုပြရန်
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,သုညတန်ဖိုးများကိုပြရန်
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,ကုန်ကြမ်းပေးသောပမာဏကနေ repacking / ထုတ်လုပ်ပြီးနောက်ရရှိသောတဲ့ item ၏အရေအတွက်
 apps/erpnext/erpnext/public/js/setup_wizard.js +315,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 +647,Please specify Attribute Value for attribute {0},attribute က {0} များအတွက် Value ကို Attribute ကိုသတ်မှတ် ကျေးဇူးပြု.
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},attribute က {0} များအတွက် Value ကို Attribute ကိုသတ်မှတ် ကျေးဇူးပြု.
 DocType: Item,Default Warehouse,default ဂိုဒေါင်
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +39,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,မိဘကုန်ကျစရိတ်အလယ်ဗဟိုကိုရိုက်ထည့်ပေးပါ
@@ -3929,19 +3984,22 @@
 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,အရောင်းပုဂ္ဂိုလ်
-DocType: Sales Invoice,Cold Calling,အေး Calling မှ
 DocType: SMS Parameter,SMS Parameter,SMS ကို Parameter
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,ဘတ်ဂျက်နှင့်ကုန်ကျစရိတ်စင်တာ
 DocType: Maintenance Schedule Item,Half Yearly,တစ်ဝက်နှစ်အလိုက်
 DocType: Lead,Blog Subscriber,ဘလော့ Subscriber
+DocType: Guardian,Alternate Number,alternate အရေအတွက်
 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 ကိုနေ့စွဲထက်အစောပိုင်းမှာမဖြစ်နိုင်ပါ။ အရက်စွဲများပြင်ဆင်ရန်နှင့်ထပ်ကြိုးစားပါ။
+DocType: Stock Reconciliation Item,Quantity Difference,အရေအတွက် Difference
 apps/erpnext/erpnext/config/hr.py +253,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 +141,Set as Lost,ပျောက်ဆုံးသွားသောအဖြစ် Set
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,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 +5,This is based on transactions against this Customer. See timeline below for details,ဒီဖောက်သည်ဆန့်ကျင်ငွေကြေးလွှဲပြောင်းမှုမှာအပေါ်အခြေခံသည်။ အသေးစိတျအဘို့ကိုအောက်တွင်အချိန်ဇယားကိုကြည့်ပါ
 DocType: Supplier,Credit Days Based On,တွင် အခြေခံ. credit Days
@@ -3953,11 +4011,10 @@
 ,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 +941,Select or add new customer,အသစ်ဖောက်သည်ကို Select လုပ်ပါသို့မဟုတ် add
+apps/erpnext/erpnext/accounts/page/pos/pos.js +930,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 +5,This is based on the attendance of this Employee,ဒီထမ်းများ၏တက်ရောက်သူအပေါ်အခြေခံသည်
-DocType: Sales Invoice,Frequency,frequency
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +463,Debit Account,debit အကောင့်ကို
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Debit Account,debit အကောင့်ကို
 DocType: Fiscal Year,Year Start Date,တစ်နှစ်တာ Start ကိုနေ့စွဲ
 DocType: Attendance,Employee Name,ဝန်ထမ်းအမည်
 DocType: Sales Invoice,Rounded Total (Company Currency),rounded စုစုပေါင်း (ကုမ္ပဏီငွေကြေးစနစ်)
@@ -3966,27 +4023,27 @@
 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 +210,Supplier Quotation {0} created,ပေးသွင်းစျေးနှုန်း {0} ကဖန်တီး
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +208,Supplier Quotation {0} created,ပေးသွင်းစျေးနှုန်း {0} ကဖန်တီး
 apps/erpnext/erpnext/accounts/report/financial_statements.py +90,End Year cannot be before Start Year,အဆုံးတစ်နှစ်တာ Start ကိုတစ်နှစ်တာမတိုင်မီမဖွစျနိုငျ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Employee Benefits,ဝန်ထမ်းအကျိုးကျေးဇူးများ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,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 +228,Please set a default Holiday List for Employee {0} or Company {1},{1} ထမ်း {0} သို့မဟုတ်ကုမ္ပဏီတစ်ခုက default အားလပ်ရက် List ကိုသတ်မှတ်ထားပေးပါ
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +232,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 +499,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},အတန်းမရှိ {0}: ပမာဏသုံးစွဲမှုတောင်းဆိုမှုများ {1} ဆန့်ကျင်ငွေပမာဏဆိုင်းငံ့ထားထက် သာ. ကြီးမြတ်မဖြစ်နိုင်။ ဆိုင်းငံ့ထားသောငွေပမာဏ {2} သည်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +500,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 +1007,Price List not found or disabled,စျေးနှုန်း List ကိုတွေ့ရှိသို့မဟုတ်မသန်မစွမ်းမဟုတ်
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1008,Price List not found or disabled,စျေးနှုန်း List ကိုတွေ့ရှိသို့မဟုတ်မသန်မစွမ်းမဟုတ်
 DocType: Expense Claim,Approved,Approved
 DocType: Pricing Rule,Price,စျေးနှုန်း
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +244,Employee relieved on {0} must be set as 'Left',{0} &#39;&#39; လက်ဝဲ &#39;အဖြစ်သတ်မှတ်ရမည်အပေါ်စိတ်သက်သာရာန်ထမ်း
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +256,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} ဖန်တီး
@@ -3997,12 +4054,12 @@
 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 +259,Please select Employee Record first.,န်ထမ်းမှတ်တမ်းပထမဦးဆုံးရွေးချယ်ပါ။
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +266,Please select Employee Record first.,န်ထမ်းမှတ်တမ်းပထမဦးဆုံးရွေးချယ်ပါ။
 DocType: POS Profile,Account for Change Amount,ပြောင်းလဲမှုပမာဏအဘို့အကောင့်
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +190,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 +235,Please enter Expense Account,အသုံးအကောင့်ကိုရိုက်ထည့်ပေးပါ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,Please enter Expense Account,အသုံးအကောင့်ကိုရိုက်ထည့်ပေးပါ
 DocType: Account,Stock,စတော့အိတ်
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,"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 +976,"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,ဝယ်ယူခြင်း / ထုတ်လုပ်ခြင်းလုပ်ငန်းအသေးစိတ်ကို
@@ -4017,9 +4074,10 @@
 DocType: Asset Movement,Transaction Date,transaction နေ့စွဲ
 DocType: Production Plan Item,Planned Qty,စီစဉ်ထား Qty
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,စုစုပေါင်းအခွန်
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,For Quantity (Manufactured Qty) is mandatory,ပမာဏအတွက် (Qty ကုန်ပစ္စည်းထုတ်လုပ်) မသင်မနေရ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,For Quantity (Manufactured Qty) is mandatory,ပမာဏအတွက် (Qty ကုန်ပစ္စည်းထုတ်လုပ်) မသင်မနေရ
 DocType: Stock Entry,Default Target Warehouse,default Target ကဂိုဒေါင်
 DocType: Purchase Invoice,Net Total (Company Currency),Net ကစုစုပေါင်း (ကုမ္ပဏီငွေကြေးစနစ်)
+apps/erpnext/erpnext/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 +78,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: Production Order,Actual Start Date,အမှန်တကယ် Start ကိုနေ့စွဲ
@@ -4034,9 +4092,11 @@
 DocType: Warranty Claim,If different than customer address,ဖောက်သည်လိပ်စာတခုထက်ကွဲပြားခြားနားနေလျှင်
 DocType: BOM Operation,BOM Operation,BOM စစ်ဆင်ရေး
 DocType: Purchase Taxes and Charges,On Previous Row Amount,ယခင် Row ပမာဏတွင်
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +226,Transfer Asset,ပိုင်ဆိုင်မှုလွှဲပြောင်း
+DocType: Student,Home Address,အိမ်လိပ်စာ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +227,Transfer Asset,ပိုင်ဆိုင်မှုလွှဲပြောင်း
 DocType: POS Profile,POS Profile,POS ကိုယ်ရေးအချက်အလက်များ profile
 apps/erpnext/erpnext/config/schools.py +33,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 +129,"Item {0} is a template, please select one of its variants",item {0} တဲ့ template ကိုသည်၎င်း၏မျိုးကွဲတွေထဲကရွေးချယ်ရန်
 DocType: Asset,Asset Category,ပိုင်ဆိုင်မှုအမျိုးအစား
@@ -4046,8 +4106,8 @@
 DocType: Assessment,Room,အခန်းတခန်း
 DocType: Purchase Order,Advance Paid,ကြိုတင်မဲ Paid
 DocType: Item,Item Tax,item ခွန်
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +765,Material to Supplier,ပေးသွင်းဖို့ material
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +189,Excise Invoice,ယစ်မျိုးပြေစာ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,Material to Supplier,ပေးသွင်းဖို့ material
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,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,လက်ရှိမှုစိစစ်
@@ -4057,7 +4117,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,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 +136,Credit Card,အကြွေးဝယ်ကဒ်
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,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 များ။
 DocType: Purchase Invoice,Next Date,Next ကိုနေ့စွဲ
@@ -4065,6 +4125,7 @@
 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: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","ဒီနေရာတွင်မိဘ, အိမ်ထောင်ဖက်နှင့်ကလေးများ၏အမည်နှင့်အလုပ်အကိုင်တူမိသားစုကအသေးစိတ်ထိနျးသိမျးထားနိုငျ"
+DocType: Academic Term,Term End Date,သက်တမ်းအဆုံးနေ့စွဲ
 DocType: Hub Settings,Seller Name,ရောင်းချသူအမည်
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),နုတ်ယူအခွန်အခများနှင့်စွပ်စွဲချက် (ကုမ္ပဏီငွေကြေးစနစ်)
 DocType: Item Group,General Settings,General Settings
@@ -4076,7 +4137,7 @@
 DocType: Customer,Commission Rate,ကော်မရှင် Rate
 apps/erpnext/erpnext/stock/doctype/item/item.js +261,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 +115,"Payment Type must be one of Receive, Pay and Internal Transfer","ငွေပေးချေမှုရမည့်အမျိုးအစား, လက်ခံတယောက်ဖြစ် Pay နှင့်ပြည်တွင်းလွှဲပြောင်းရမယ်"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +118,"Payment Type must be one of Receive, Pay and Internal Transfer","ငွေပေးချေမှုရမည့်အမျိုးအစား, လက်ခံတယောက်ဖြစ် Pay နှင့်ပြည်တွင်းလွှဲပြောင်းရမယ်"
 apps/erpnext/erpnext/config/selling.py +169,Analytics,analytics
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,လှည်း Empty ဖြစ်ပါသည်
 DocType: Production Order,Actual Operating Cost,အမှန်တကယ် Operating ကုန်ကျစရိတ်
@@ -4091,10 +4152,10 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,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 +92,Designer,ပုံစံရေးဆှဲသူ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Designer,ပုံစံရေးဆှဲသူ
 apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,စည်းကမ်းသတ်မှတ်ချက်များ Template:
 DocType: Serial No,Delivery Details,Delivery အသေးစိတ်ကို
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +469,Cost Center is required in row {0} in Taxes table for type {1},ကုန်ကျစရိတ် Center ကအမျိုးအစား {1} သည်အခွန် table ထဲမှာအတန်း {0} အတွက်လိုအပ်သည်
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +472,Cost Center is required in row {0} in Taxes table for type {1},ကုန်ကျစရိတ် Center ကအမျိုးအစား {1} သည်အခွန် table ထဲမှာအတန်း {0} အတွက်လိုအပ်သည်
 DocType: Program,Program Code,Program ကို Code ကို
 ,Item-wise Purchase Register,item-ပညာရှိသောသူသည်ဝယ်ယူမှတ်ပုံတင်မည်
 DocType: Batch,Expiry Date,သက်တမ်းကုန်ဆုံးရက်
@@ -4104,12 +4165,12 @@
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Project မှမာစတာ။
 apps/erpnext/erpnext/controllers/status_updater.py +174,"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 +417, (Half Day),(တစ်ဝက်နေ့)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425, (Half Day),(တစ်ဝက်နေ့)
 DocType: Supplier,Credit Days,ခရက်ဒစ် Days
 DocType: Leave Type,Is Carry Forward,Forward ယူသွားတာဖြစ်ပါတယ်
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +740,Get Items from BOM,BOM ထံမှပစ္စည်းများ Get
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +711,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 +549,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},ပိုင်ဆိုင်မှု၏ CV ကိုနေ့စွဲဝယ်ယူနေ့စွဲအဖြစ်အတူတူပင်ဖြစ်ရပါမည် {1} {2}: row # {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +552,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,တယောက်ကိုတယောက်ဂိုဒေါင်တစ်ဦးထံမှပစ္စည်းလွှဲပြောင်း
diff --git a/erpnext/translations/nl.csv b/erpnext/translations/nl.csv
index b7e600e..8b097c4 100644
--- a/erpnext/translations/nl.csv
+++ b/erpnext/translations/nl.csv
@@ -18,11 +18,10 @@
 DocType: Sales Partner,Dealer,Dealer
 DocType: Employee,Rented,Verhuurd
 DocType: Purchase Order,PO-,PO
-apps/erpnext/erpnext/accounts/report/financial_statements.py +19,Start Year {0} not found.,Start Jaar {0} niet gevonden.
 DocType: POS Profile,Applicable for User,Toepasselijk voor gebruiker
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +191,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Gestopt productieorder kan niet worden geannuleerd, opendraaien het eerst te annuleren"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +197,Do you really want to scrap this asset?,Wilt u dit actief echt schrappen?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +17,Select Default Supplier,Selecteer Standaard Leverancier
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +192,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Gestopt productieorder kan niet worden geannuleerd, opendraaien het eerst te annuleren"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +198,Do you really want to scrap this asset?,Wilt u dit actief echt schrappen?
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Selecteer Standaard Leverancier
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Munt is nodig voor prijslijst {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Zal worden berekend in de transactie.
 DocType: Address,County,Provincie
@@ -42,46 +41,45 @@
 DocType: Sales Invoice,Customer Name,Klantnaam
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +126,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 +180,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 +183,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 +148,Series Updated Successfully,Reeks succesvol bijgewerkt
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +149,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
-DocType: Quality Inspection Reading,Parameter,Parameter
 apps/erpnext/erpnext/projects/doctype/project/project.py +54,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 +239,New Leave Application,Nieuwe Verlofaanvraag
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,New Leave Application,Nieuwe Verlofaanvraag
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +20,Attendance Record {0} exists against Student {1} for Course Schedule {2},Attendance Record {0} bestaat tegen Student {1} voor Cursusschema {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Bank Draft,Bankcheque
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,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
 DocType: Academic Term,Academic Term,academische Term
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +13,Material,Materiaal
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Quantity,Hoeveelheid
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +511,Accounts table cannot be blank.,Accounts tabel mag niet leeg zijn.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +616,Quantity,Hoeveelheid
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +512,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)
 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/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 +142,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
-DocType: Purchase Invoice,Monthly,Maandelijks
 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/buying/doctype/purchase_order/purchase_order.js +771,Invoice,Factuur
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +750,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 +198,Row {0}: {1} {2} does not match with {3},Rij {0}: {1} {2} niet overeenkomt met {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Rij # {0}:
+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 +127,Please select Price List,Selecteer Prijslijst
@@ -112,8 +110,8 @@
 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 +589,Get items from,Krijgen items uit
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +382,Stock cannot be updated against Delivery Note {0},Voorraad kan niet worden bijgewerkt obv Vrachtbrief {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Krijgen items uit
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,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
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Kruidenierswinkel
@@ -122,7 +120,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 +156,Salary Structure Missing,Salarisstructuur Missing
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Salary Structure Missing,Salarisstructuur Missing
 DocType: Lead,Person Name,Persoon Naam
 DocType: Sales Invoice Item,Sales Invoice Item,Verkoopfactuur Artikel
 DocType: Account,Credit,Krediet
@@ -130,10 +128,11 @@
 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 +156,Credit limit has been crossed for customer {0} {1}/{2},Kredietlimiet is overschreden voor de klant {0} {1} / {2}
-apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Is vaste activa&quot; niet kan worden uitgeschakeld, als Asset record bestaat tegen het item"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +189,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"
 DocType: Tax Rule,Tax Type,Belasting Type
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +144,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}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,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/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
@@ -143,18 +142,17 @@
 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 +165,Opening,Opening
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,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/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Klant&gt; Customer Group&gt; Territory
 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 .
 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
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Company first,Selecteer Company eerste
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,Please select Company first,Selecteer Company eerste
 DocType: Employee Education,Under Graduate,Student zonder graad
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Doel op
 DocType: BOM,Total Cost,Totale kosten
@@ -164,7 +162,7 @@
 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
 DocType: Purchase Invoice Item,Is Fixed Asset,Is vaste activa
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Available qty is {0}, you need {1}","Beschikbare aantal is {0}, moet u {1}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +225,"Available qty is {0}, you need {1}","Beschikbare aantal is {0}, moet u {1}"
 DocType: Expense Claim Detail,Claim Amount,Claim Bedrag
 DocType: Employee,Mr,De heer
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Leverancier Type / leverancier
@@ -173,25 +171,26 @@
 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: Assessment Result,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 +171,Annual Salary,Jaarsalaris
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Annual Salary,Jaarsalaris
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Voorraadkosten
-apps/erpnext/erpnext/accounts/report/financial_statements.py +22,End Year {0} not found.,Eindjaar {0} niet gevonden.
 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}
 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 +130,At least one mode of payment is required for POS invoice.,Ten minste één wijze van betaling is vereist voor POS factuur.
 DocType: Products Settings,Show Products as a List,Producten weergeven als een lijst
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Download de Template, vul de juiste gegevens in en voeg het gewijzigde bestand bij. Alle data en toegewezen werknemer in de geselecteerde periode zullen in de sjabloon komen, met bestaande presentielijsten"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +451,Item {0} is not active or end of life has been reached,ARtikel {0} is niet actief of heeft einde levensduur bereikt
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +456,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/controllers/accounts_controller.py +614,"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/controllers/accounts_controller.py +617,"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 +166,Settings for HR Module,Instellingen voor HR Module
 DocType: SMS Center,SMS Center,SMS Center
 DocType: Sales Invoice,Change Amount,Change Bedrag
@@ -203,13 +202,13 @@
 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 +147,Execution,Uitvoering
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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/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
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,Cost Center {0} does not belong to Company {1},Kostenplaats {0} behoort niet tot Bedrijf {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +100,Cost Center {0} does not belong to Company {1},Kostenplaats {0} behoort niet tot Bedrijf {1}
 DocType: Customer,Individual,Individueel
 DocType: Interest,Academics User,academici Gebruiker
 DocType: Cheque Print Template,Amount In Figure,Bedrag In figuur
@@ -225,30 +224,32 @@
 DocType: Production Planning Tool,Sales Orders,Verkooporders
 DocType: Purchase Taxes and Charges,Valuation,Waardering
 ,Purchase Order Trends,Inkooporder Trends
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,The request for quotation can be accessed by clicking on the following link,Het verzoek voor een offerte kan worden geopend door te klikken op de volgende link
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,Toewijzen verloven voor het gehele jaar.
 DocType: SG Creation Tool Course,SG Creation Tool Course,SG Creation Tool Course
 DocType: Student Group Creation Tool,Leave blank if you wish to fetch all courses for selected academic term,Laat leeg als u alle cursussen voor geselecteerde academische termijn te halen
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,Insufficient Stock,onvoldoende Stock
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227,Insufficient Stock,onvoldoende Stock
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Uitschakelen Capacity Planning en Time Tracking
+DocType: Email Digest,New Sales Orders,Nieuwe Verkooporders
 DocType: Bank Reconciliation,Bank Account,Bankrekening
 DocType: Leave Type,Allow Negative Balance,Laat negatief saldo
 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/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} does not belong to Company {1},Rekening {0} behoort niet tot Bedrijf {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +86,Account {0} does not belong to Company {1},Rekening {0} behoort niet tot Bedrijf {1}
 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}
 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
 DocType: Course Schedule,Instructor Name,instructeur Naam
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,For Warehouse is required before Submit,Voor Magazijn is vereist voor het Indienen
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,For Warehouse is required before Submit,Voor Magazijn is vereist voor het Indienen
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Ontvangen op
 DocType: Sales Partner,Reseller,Reseller
 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 +1436,"LocalStorage is full , did not save","LocalStorage vol is, niet te redden"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1460,"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}
@@ -261,18 +262,19 @@
 apps/erpnext/erpnext/templates/generators/item.html +78,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 +5,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/leave_application/leave_application.py +206,Only the selected Leave Approver can submit this Leave Application,Alleen de geselecteerde Verlof Goedkeurder kan deze verlofaanvraag indienen
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +213,Only the selected Leave Approver can submit this Leave Application,Alleen de geselecteerde Verlof Goedkeurder kan deze verlofaanvraag indienen
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Ontslagdatum moet groter zijn dan datum van indiensttreding
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Leaves per Year,Verlaat per jaar
+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 +103,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}
+DocType: Email Digest,Profit & Loss,Verlies
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,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 +435,Leave Blocked,Verlof Geblokkeerd
-apps/erpnext/erpnext/stock/doctype/item/item.py +669,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 +443,Leave Blocked,Verlof Geblokkeerd
+apps/erpnext/erpnext/stock/doctype/item/item.py +671,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 +83,Annual,jaar-
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +86,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
@@ -280,20 +282,22 @@
 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
 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 +91,Software Developer,Software Ontwikkelaar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,Software Ontwikkelaar
 DocType: Item,Minimum Order Qty,Minimum bestel aantal
 DocType: Pricing Rule,Supplier Type,Leverancier Type
 DocType: Scheduling Tool,Course Start Date,Cursus Startdatum
 DocType: Item,Publish in Hub,Publiceren in Hub
+DocType: Student Admission,Student Admission,student Toelating
 ,Terretory,Regio
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is cancelled,Artikel {0} is geannuleerd
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Material Request,Materiaal Aanvraag
+apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} is cancelled,Artikel {0} is geannuleerd
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +823,Material Request,Materiaal Aanvraag
 DocType: Bank Reconciliation,Update Clearance Date,Werk Clearance Datum bij
 apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +28,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 +328,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Item {0} niet gevonden in &#39;Raw Materials geleverd&#39; tafel in Purchase Order {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +333,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Item {0} niet gevonden in &#39;Raw Materials geleverd&#39; tafel in Purchase Order {1}
 DocType: Employee,Relation,Relatie
 DocType: Shipping Rule,Worldwide Shipping,Wereldwijde verzending
+DocType: Student Guardian,Mother,Moeder
 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
@@ -309,20 +313,21 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +130,Please select Charge Type first,Selecteer eerst een Charge Type
 DocType: Student Group Student,Student Group Student,Student Group Student
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,laatst
+DocType: Email Digest,New Quotations,Nieuwe Offertes
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,De eerste Verlofgoedkeurder in de lijst wordt als de standaard Verlofgoedkeurder ingesteld
 DocType: Tax Rule,Shipping County,verzending County
 apps/erpnext/erpnext/config/desktop.py +158,Learn,Leren
 DocType: Asset,Next Depreciation Date,Volgende Afschrijvingen Date
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Activiteitskosten per werknemer
 DocType: Accounts Settings,Settings for Accounts,Instellingen voor accounts
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +626,Supplier Invoice No exists in Purchase Invoice {0},Leverancier factuur nr bestaat in Purchase Invoice {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +629,Supplier Invoice No exists in Purchase Invoice {0},Leverancier factuur nr bestaat in Purchase Invoice {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Beheer Sales Person Boom .
 DocType: Job Applicant,Cover Letter,Voorblad
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Uitstekende Cheques en Deposito&#39;s te ontruimen
 DocType: Item,Synced With Hub,Gesynchroniseerd met Hub
 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 +348,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 +86,Circular Reference Error,Kringverwijzing Error
@@ -334,15 +339,16 @@
 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 +806,Delivery Note,Vrachtbrief
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +800,Delivery Note,Vrachtbrief
 apps/erpnext/erpnext/config/learn.py +87,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 +233,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/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/setup/doctype/email_digest/email_digest.py +104,Summary for this week and pending activities,Samenvatting voor deze week en in afwachting van activiteiten
+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"
 DocType: Employee,Company Email,Bedrijf e-mail
@@ -354,28 +360,29 @@
 apps/erpnext/erpnext/config/hr.py +186,"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.
-apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Rij # {0}: Aankoop factuur kan niet worden ingediend tegen een bestaand actief {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +554,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 +54,{0} already allocated for Employee {1} for period {2} to {3},{0} reeds toegewezen voor Employee {1} voor periode {2} te {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +812,Select Item,Selecteer Item
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +791,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 \
 					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 +142,Purchase Invoice {0} is already submitted,Inkoopfactuur {0} is al ingediend
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Rij # {0}: Batch Geen moet hetzelfde zijn als zijn {1} {2}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +143,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.
 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 +342,Please see attachment,Zie bijlage
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,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 +19,Setup Already Complete!!,Installatie al voltooid !
 ,Finished Goods,Gereed Product
 DocType: Delivery Note,Instructions,Instructies
 DocType: Quality Inspection,Inspected By,Geïnspecteerd door
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Leverancier&gt; Leverancier Type
 DocType: Maintenance Visit,Maintenance Type,Onderhoud Type
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serienummer {0} behoort niet tot Vrachtbrief {1}
 apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Items toevoegen
@@ -389,29 +396,29 @@
 DocType: Currency Exchange,Currency Exchange,Wisselkoersen
 DocType: Purchase Invoice Item,Item Name,Artikelnaam
 DocType: Authorization Rule,Approving User  (above authorized value),Goedkeuren gebruiker (boven de toegestane waarde)
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Batig saldo
+DocType: Email Digest,Credit Balance,Batig saldo
 DocType: Employee,Widowed,Weduwe
 DocType: Request for Quotation,Request for Quotation,Offerte
 DocType: Salary Slip Timesheet,Working Hours,Werkuren
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Wijzig het start-/ huidige volgnummer van een bestaande serie.
 apps/erpnext/erpnext/accounts/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 +736,Purchase Return,Inkoop Retour
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +715,Purchase Return,Inkoop Retour
 ,Purchase Register,Inkoop Register
 DocType: 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 +202,{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 +209,{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 +143,Reason for losing,Reden voor het verliezen
-apps/erpnext/erpnext/accounts/utils.py +239,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 +163,Reason for losing,Reden voor het verliezen
+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
 DocType: Announcement,Receiver,Ontvanger
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Werkstation is gesloten op de volgende data als per Holiday Lijst: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Kansen
 DocType: Employee,Single,Enkele
 DocType: Account,Cost of Goods Sold,Kostprijs verkochte goederen
 DocType: Purchase Invoice,Yearly,Jaarlijks
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +225,Please enter Cost Center,Vul kostenplaats in
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,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
@@ -424,26 +431,26 @@
 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
 DocType: Account,Is Group,Is Group
+DocType: Email Digest,Pending Purchase Orders,In afwachting van Bestellingen
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Automatisch instellen serienummers op basis van FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Controleer Leverancier Factuurnummer Uniqueness
 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 +102,Non Profit,Non-Profit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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: Stock Reconciliation Item,Do not include symbols (ex. $),Neem geen symbolen (ex. $)
 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 +638,Attribute {0} selected multiple times in Attributes Table,Kenmerk {0} meerdere keren geselecteerd in Attributes Tabel
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Kenmerk {0} meerdere keren geselecteerd in Attributes Tabel
 DocType: HR Settings,Employee record is created using selected field. ,Werknemer regel wordt gemaakt met behulp van geselecteerd veld.
 DocType: Sales Order,Not Applicable,Niet van toepassing
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Vakantie meester .
 DocType: Request for Quotation Item,Required Date,Benodigd op datum
 DocType: Delivery Note,Billing Address,Factuuradres
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +862,Please enter Item Code.,Vul Artikelcode in.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +847,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"
@@ -457,12 +464,12 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Effecten en Deposito's
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Totaal bladeren toegewezen is verplicht
 DocType: Job Opening,Description of a Job Opening,Omschrijving van een Vacature
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Pending activities for today,Afwachting van activiteiten voor vandaag
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Afwachting van activiteiten voor vandaag
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Aanwezigheid record.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Salaris Component voor rooster gebaseerde payroll.
 DocType: Sales Order Item,Used for Production Plan,Gebruikt voor Productie Plan
 DocType: Manufacturing Settings,Time Between Operations (in mins),Time Between Operations (in minuten)
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +92,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} Budget voor Account {1} tegen Cost Center {2} is {3}. Het zal overschrijden {4}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +95,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} Budget voor Account {1} tegen Cost Center {2} is {3}. Het zal overschrijden {4}
 DocType: Customer,Buyer of Goods and Services.,Koper van goederen en diensten.
 DocType: Journal Entry,Accounts Payable,Crediteuren
 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
@@ -470,16 +477,16 @@
 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/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 +86,Administrative Officer,Boekhouder
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,Boekhouder
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +23,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 +319,Please select Company,Selecteer Company
-DocType: Stock Entry,Difference Account,Verschillenrekening
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +309,Please select Company,Selecteer Company
+DocType: Stock Entry Detail,Difference Account,Verschillenrekening
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,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 +398,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 +399,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 +530,"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 +532,"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 +28,Buy,Kopen
@@ -487,7 +494,7 @@
 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 +1563,Serial no item cannot be a fraction,Serial geen item kan niet een fractie te zijn
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1587,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
@@ -496,13 +503,14 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Account {0} does not belong to company: {1},Rekening {0} behoort niet tot bedrijf: {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation already used for another company,Afkorting al gebruikt voor een ander bedrijf
 DocType: Selling Settings,Default Customer Group,Standaard Klant Groep
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Supplier is required against Payable account {0},Leverancier is vereist tegen Payable account {0}
 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
 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 +313,Reference No and Reference Date is mandatory for Bank transaction,Referentienummer en Reference Data is verplicht voor Bank transactie
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +316,Reference No and Reference Date is mandatory for Bank transaction,Referentienummer en Reference Data is verplicht voor Bank transactie
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Toevoegen / Bewerken Belastingen en Heffingen
 DocType: Purchase Invoice,Supplier Invoice No,Factuurnr. Leverancier
 DocType: Territory,For reference,Ter referentie
@@ -513,7 +521,6 @@
 DocType: Installation Note Item,Installation Note Item,Installatie Opmerking Item
 DocType: Production Plan Item,Pending Qty,In afwachting Aantal
 DocType: Budget,Ignore,Negeren
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Item Code&gt; Item Group&gt; Brand
 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/config/accounts.py +241,Setup cheque dimensions for printing,Setup check afmetingen voor afdrukken
 DocType: Salary Slip,Salary Slip Timesheet,Loonstrook Timesheet
@@ -524,11 +531,11 @@
 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/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 +28,Please select Company and Party Type first,Selecteer Company en Party Type eerste
+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/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 +707,Make Sales Order,Maak verkooporder
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +701,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
@@ -544,7 +551,8 @@
 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 +734,Sales Return,Terugkerende verkoop
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +728,Sales Return,Terugkerende verkoop
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +91,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)
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Database van potentiële klanten.
@@ -553,14 +561,13 @@
 DocType: Quotation,Quotation To,Offerte Voor
 DocType: Lead,Middle Income,Modaal Inkomen
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +212,Opening (Cr),Opening ( Cr )
-apps/erpnext/erpnext/stock/doctype/item/item.py +795,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"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 +237,Allocated amount can not be negative,Toegekende bedrag kan niet negatief zijn
+apps/erpnext/erpnext/stock/doctype/item/item.py +797,Default Unit of Measure for Item {0} cannot be changed directly because 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
 DocType: Purchase Order Item,Billed Amt,Gefactureerd Bedr
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Een logisch Magazijn waartegen voorraadboekingen worden gemaakt.
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Sales Invoice Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},Referentienummer en referentiedatum nodig is voor {0}
-DocType: Sales Invoice,Customer's Vendor,Leverancier van Klant
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Proposal Writing,Voorstel Schrijven
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,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"
@@ -569,13 +576,14 @@
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,tijdregistratie
 DocType: Fiscal Year Company,Fiscal Year Company,Fiscale Jaar Company
 DocType: Packing Slip Item,DN Detail,DN Detail
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +257,Already supplier quotation has created,Reeds leverancier offerte heeft gecreëerd
 DocType: Timesheet,Billed,Gefactureerd
 DocType: Batch,Batch Description,Batch Beschrijving
+apps/erpnext/erpnext/accounts/utils.py +685,"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 +733,View Offline Records,Bekijk Offline Records
+apps/erpnext/erpnext/accounts/page/pos/pos.js +715,View Offline Records,Bekijk Offline Records
+DocType: Student,Sibling Details,sibling Details
 DocType: Employee,Reason for Resignation,Reden voor ontslag
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,Sjabloon voor functioneringsgesprekken .
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,Factuur / Journal Entry Details
@@ -589,7 +597,7 @@
 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
 DocType: Employee,Passport Number,Paspoortnummer
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Manager,Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,Manager
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,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
@@ -598,10 +606,11 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter email address,Vul het e-mailadres in
 DocType: Production Order Operation,In minutes,In minuten
 DocType: Issue,Resolution Date,Oplossing Datum
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +299,Timesheet created:,Rooster gemaakt:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +715,Please set default Cash or Bank account in Mode of Payment {0},Stel een standaard Kas- of Bankrekening in bij Betaalwijze {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +300,Timesheet created:,Rooster gemaakt:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +772,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
 DocType: Selling Settings,Customer Naming By,Klant Naming Door
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Gelieve setup Employee Naming System in Human Resource&gt; HR-instellingen
 DocType: Depreciation Schedule,Depreciation Amount,afschrijvingen Bedrag
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,Converteren naar Groep
 DocType: Activity Cost,Activity Type,Activiteit Type
@@ -626,6 +635,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,Afwerking
 DocType: Pricing Rule,Sales Manager,Verkoopsmanager
 DocType: Salary Structure Employee,Base,Baseren
+DocType: Timesheet,Total Billed Hours,Totaal gefactureerd Hours
 DocType: Journal Entry,Write Off Amount,Afschrijvingsbedrag
 DocType: Journal Entry,Bill No,Factuur nr
 DocType: Company,Gain/Loss Account on Asset Disposal,Winst / verliesrekening op de verkoop van activa
@@ -640,11 +650,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +9,Pre Sales,Voorverkoop
 DocType: Purchase Receipt,Other Details,Andere Details
 DocType: Account,Accounts,Rekeningen
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Marketing,Marketing
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +227,Payment Entry is already created,Betaling Entry is al gemaakt
+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,Betaling Entry is al gemaakt
 DocType: Purchase Receipt Item Supplied,Current Stock,Huidige voorraad
-apps/erpnext/erpnext/controllers/accounts_controller.py +538,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 +21,Preview Salary Slip,Voorbeschouwing loonstrook
+apps/erpnext/erpnext/controllers/accounts_controller.py +541,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 +38,Preview Salary Slip,Voorbeschouwing loonstrook
 DocType: Company,Deafult Cost Center,Deafult kostenplaats
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +48,Account {0} has been entered multiple times,Account {0} is meerdere keren ingevoerd
 DocType: Account,Expenses Included In Valuation,Kosten inbegrepen in waardering
@@ -653,7 +663,7 @@
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,Selecteer een Student Group
 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 +617,Item has variants.,Item heeft varianten.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Item heeft varianten.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,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
@@ -673,7 +683,7 @@
 DocType: Purchase Order,Supply Raw Materials,Supply Grondstoffen
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,De datum waarop de volgende factuur wordt gegenereerd. Het wordt gegenereerd op te leggen.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Vlottende Activa
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,{0} is not a stock Item,{0} is geen voorraad artikel
+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 +169,Lead must be set if Opportunity is made from Lead,Lead moet worden ingesteld als de opportuniteit is gemaakt obv een lead
@@ -759,26 +769,25 @@
 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 +709,No Permission,Geen toestemming
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +710,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}
 apps/erpnext/erpnext/public/js/setup_wizard.js +298,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 +542,Row #{0}: Asset {1} must be submitted,Rij # {0}: Asset {1} moet worden ingediend
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset {1} must be submitted,Rij # {0}: Asset {1} moet worden ingediend
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Geen werknemer gevonden
 DocType: Supplier Quotation,Stopped,Gestopt
 DocType: Item,If subcontracted to a vendor,Als uitbesteed aan een leverancier
 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.
 DocType: Warehouse,Tree Details,Tree Details
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Nu verzenden
 ,Support Analytics,Support Analyse
 DocType: Item,Website Warehouse,Website Magazijn
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimum Factuurbedrag
 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/sales_invoice/sales_invoice.py +227,Timesheet {0} is already completed or cancelled,Timesheet {0} is al voltooid of geannuleerd
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +259,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
@@ -794,13 +803,13 @@
 apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Course Schedule
 DocType: Maintenance Visit,Completion Status,Voltooiingsstatus
 DocType: HR Settings,Enter retirement age in years,Voer de pensioengerechtigde leeftijd in jaren
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +229,Target Warehouse,Doel Magazijn
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +230,Target Warehouse,Doel Magazijn
 DocType: Cheque Print Template,Starting location from left edge,Startlocatie van linkerrand
 DocType: Item,Allow over delivery or receipt upto this percent,Laat dan levering of ontvangst upto deze procent
 DocType: Stock Entry,STE-,STEREO
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Sales Order Date,Verwachte leverdatum kan niet voor de Verkooporder Datum
 DocType: Upload Attendance,Import Attendance,Import Toeschouwers
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Alle Artikel Groepen
+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/config/setup.py +89,Automatically compose message on submission of transactions.,Bericht automatisch samenstellen overlegging van transacties .
@@ -812,13 +821,15 @@
 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/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
 DocType: Expense Claim,Expenses,Uitgaven
 DocType: Item Variant Attribute,Item Variant Attribute,Artikel Variant Kenmerk
 ,Purchase Receipt Trends,Ontvangstbevestiging Trends
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Research & Development,Research & Development
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Research & Development
 ,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
 DocType: Leave Block List Date,Leave Block List Date,Laat Block List Datum
 DocType: Pricing Rule,Price or Discount,Prijs of korting
@@ -827,7 +838,7 @@
 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/controllers/accounts_controller.py +340,"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."
+apps/erpnext/erpnext/controllers/accounts_controller.py +343,"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
@@ -849,12 +860,12 @@
 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 +756,Purchase Receipt,Ontvangstbevestiging
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +735,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 +167,Reference Doctype must be one of {0},Referentie Doctype moet een van {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +282,Unable to find Time Slot in the next {0} days for Operation {1},Kan Time Slot in de volgende {0} dagen voor Operatie vinden {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +170,Reference Doctype must be one of {0},Referentie Doctype moet een van {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,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 +439,BOM {0} must be active,Stuklijst {0} moet actief zijn
@@ -865,7 +876,7 @@
 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 +214,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 +217,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
@@ -879,9 +890,9 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Werknemer {0} is niet actief of bestaat niet
 DocType: Fee Structure,Components,Components
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,Please enter Asset Category in Item {0},Vul Asset Categorie op post {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +612,Item Variants {0} updated,Item Varianten {0} bijgewerkt
+apps/erpnext/erpnext/stock/doctype/item/item.py +614,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 +843,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 +854,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
@@ -896,69 +907,72 @@
 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 +728,New Sales Invoice,Nieuwe Sales Invoice
+apps/erpnext/erpnext/accounts/page/pos/pos.js +710,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 +728,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
 DocType: Material Request Item,Lead Time Date,Lead Tijd Datum
 DocType: Guardian,Guardian Name,Naam pleegouder
 DocType: Cheque Print Template,Has Print Format,Heeft Print Format
-apps/erpnext/erpnext/accounts/page/pos/pos.js +86, 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 +109,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 +619,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","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/page/pos/pos.js +75, 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 +613,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing 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 +606,Supplier Invoice Date cannot be greater than Posting Date,Leverancier Factuurdatum kan niet groter zijn dan Posting Date
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +609,Supplier Invoice Date cannot be greater than Posting Date,Leverancier Factuurdatum kan niet groter zijn dan Posting Date
 DocType: Purchase Invoice Item,Purchase Order Item,Inkooporder Artikel
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +130,Indirect Income,Indirecte Inkomsten
 DocType: Cheque Print Template,Date Settings,date Settings
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Variantie
 ,Company Name,Bedrijfsnaam
 DocType: SMS Center,Total Message(s),Totaal Bericht(en)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +810,Select Item for Transfer,Kies Punt voor Overdracht
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +789,Select Item for Transfer,Kies Punt voor Overdracht
 DocType: Purchase Invoice,Additional Discount Percentage,Extra Korting Procent
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Bekijk een overzicht van alle hulp video&#39;s
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Selecteer hoofdrekening van de bank waar cheque werd gedeponeerd.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Zodat de gebruiker te bewerken prijslijst Rate bij transacties
 DocType: Pricing Rule,Max Qty,Max Aantal
-DocType: Student Applicant,Father's Name,Naam van de vader
 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 +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Rij {0}: Betaling tegen Sales / Purchase Order moet altijd worden gemarkeerd als voorschot
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Chemisch
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +686,All items have already been transferred for this Production Order.,Alle items zijn al overgebracht voor deze productieorder.
+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
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +694,All items have already been transferred for this Production Order.,Alle items zijn al overgebracht voor deze productieorder.
 DocType: Process Payroll,Select Payroll Year and Month,Selecteer Payroll Jaar en Maand
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,Meter,Meter
 DocType: Workstation,Electricity Cost,elektriciteitskosten
 DocType: HR Settings,Don't send Employee Birthday Reminders,Stuur geen Werknemer verjaardagsherinneringen
-DocType: Opportunity,Walk In,Walk In
 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 +12,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).
 DocType: Timesheet Detail,Bill,Bill
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,White,Wit
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,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
 DocType: SMS Center,All Lead (Open),Alle Leads (Open)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +228,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})
+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 +731,Make ,Maken
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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 .
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Mijn winkelwagen
-apps/erpnext/erpnext/controllers/selling_controller.py +154,Order Type must be one of {0},Order Type moet één van {0} zijn
+apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Order Type moet één van {0} zijn
 DocType: Lead,Next Contact Date,Volgende Contact Datum
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Opening Aantal
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +393,Please enter Account for Change Amount,Vul Account for Change Bedrag
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,Please enter Account for Change Amount,Vul Account for Change Bedrag
 DocType: Student Batch,Student Batch Name,Student batchnaam
 DocType: Holiday List,Holiday List Name,Holiday Lijst Naam
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js +8,Schedule Course,Schedule Course
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Stock Options,Aandelenopties
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Aandelenopties
 DocType: Journal Entry Account,Expense Claim,Kostendeclaratie
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +211,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 +237,Qty for {0},Aantal voor {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +212,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 +238,Qty for {0},Aantal voor {0}
 DocType: Leave Application,Leave Application,Verlofaanvraag
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Verlof Toewijzing Tool
 DocType: Leave Block List,Leave Block List Dates,Laat Block List Data
@@ -967,9 +981,9 @@
 DocType: Company,Default Terms,Default Voorwaarden
 DocType: Packing Slip Item,Packing Slip Item,Pakbon Artikel
 DocType: Purchase Invoice,Cash/Bank Account,Kas/Bankrekening
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Verwijderde items met geen verandering in de hoeveelheid of waarde.
+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 +635,Attribute table is mandatory,Attributentabel is verplicht
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Attributentabel is verplicht
 DocType: Production Planning Tool,Get Sales Orders,Get Verkooporders
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{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
@@ -994,7 +1008,7 @@
 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/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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Serienummer {0} valt binnen onderhoudscontract tot {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +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
@@ -1006,7 +1020,7 @@
 DocType: GL Entry,Against,Tegen
 DocType: Item,Default Selling Cost Center,Standaard Verkoop kostenplaats
 DocType: Sales Partner,Implementation Partner,Implementatie Partner
-apps/erpnext/erpnext/controllers/selling_controller.py +231,Sales Order {0} is {1},Sales Order {0} is {1}
+apps/erpnext/erpnext/controllers/selling_controller.py +232,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
 DocType: Packing Slip,Net Weight UOM,Netto Gewicht Eenheid
@@ -1016,25 +1030,24 @@
 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
 DocType: Sales Person,Select company name first.,Kies eerst een bedrijfsnaam.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Offertes ontvangen van leveranciers.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},Naar {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Gemiddelde Leeftijd
 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/templates/pages/home.html +32,View All Products,Bekijk alle producten
+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
 DocType: Expense Claim,From Employee,Van Medewerker
-apps/erpnext/erpnext/controllers/accounts_controller.py +400,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
+apps/erpnext/erpnext/controllers/accounts_controller.py +403,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/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,en jaar:
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +191,{0} {1} must be submitted,{0} {1} moet worden ingediend
-DocType: Email Digest,Annual Expense,Jaarlijkse Expense
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,{0} {1} must be submitted,{0} {1} moet worden ingediend
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +145,Quantity must be less than or equal to {0},Hoeveelheid moet kleiner dan of gelijk aan {0}
 DocType: SMS Center,Total Characters,Totaal Tekens
 apps/erpnext/erpnext/controllers/buying_controller.py +156,Please select BOM in BOM field for Item {0},Selecteer BOM in BOM veld voor post {0}
@@ -1045,30 +1058,31 @@
 DocType: Sales Partner,Distributor,Distributeur
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Winkelwagen Verzenden Regel
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +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 +62,Please set 'Apply Additional Discount On',Stel &#39;Solliciteer Extra Korting op&#39;
+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
 DocType: Global Defaults,Global Defaults,Global Standaardwaarden
 apps/erpnext/erpnext/projects/doctype/project/project.py +153,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
 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 +327,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 +362,Finished Item {0} must be entered for Manufacture type entry,Afgewerkte product {0} moet worden ingevoerd voor het type Productie binnenkomst
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +367,Finished Item {0} must be entered for Manufacture type entry,Afgewerkte product {0} moet worden ingevoerd voor het type Productie binnenkomst
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Het openen van Accounting Balance
 DocType: Sales Invoice Advance,Sales Invoice Advance,Verkoopfactuur Voorschot
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +499,Nothing to request,Niets aan te vragen
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +500,Nothing to request,Niets aan te vragen
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','Werkelijke Startdatum' kan niet groter zijn dan 'Werkelijke Einddatum'
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Management,Beheer
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},Ofwel debet of credit bedrag is nodig voor {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,Beheer
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +55,Either debit or credit amount is required for {0},Ofwel debet of credit bedrag is nodig voor {0}
 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 +161,Blue,Blauw
+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
@@ -1078,12 +1092,12 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +23,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
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1374,Do you really want to submit the invoice?,Wil je echt wilt de factuur in te dienen?
+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 +685,Cost Center For Item with Item Code ',Kostenplaats Item met Item Code '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1526,"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 +679,Cost Center For Item with Item Code ',Kostenplaats Item met Item Code '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1550,"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 +26,"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
@@ -1103,104 +1117,106 @@
 DocType: Payment Reconciliation,Unreconciled Payment Details,Niet overeenstemmende betalingsgegevens
 DocType: Global Defaults,Current Fiscal Year,Huidige fiscale jaar
 DocType: Global Defaults,Disable Rounded Total,Deactiveer Afgerond Totaal
-DocType: Lead,Call,Bellen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +417,'Entries' cannot be empty,'Invoer' kan niet leeg zijn
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +418,'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 +214,Fiscal Year {0} not found,Boekjaar {0} niet gevonden
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +221,Fiscal Year {0} not found,Boekjaar {0} niet gevonden
 apps/erpnext/erpnext/config/hr.py +238,Setting up Employees,Het opzetten van Werknemers
 DocType: Sales Order,SO-,ZO-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Selecteer eerst een voorvoegsel
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Please select prefix first,Selecteer eerst een voorvoegsel
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Research,onderzoek
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,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 +43,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 +57,View Ledger,Bekijk Grootboek
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Vroegst
-apps/erpnext/erpnext/stock/doctype/item/item.py +504,"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 +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/setup/setup_wizard/setup_wizard.py +437,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
 ,Budget Variance Report,Budget Variantie Rapport
 DocType: Salary Slip,Gross Pay,Brutoloon
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +90,Row {0}: Activity Type is mandatory.,Rij {0}: Activiteit Type is verplicht.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +114,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/public/js/controllers/stock_controller.js +40,Accounting Ledger,Accounting Ledger
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,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
 DocType: BOM Item,Item Description,Artikelomschrijving
+DocType: Student Sibling,Student Sibling,student Sibling
 DocType: Purchase Invoice,Is Recurring,Is Terugkerende
 DocType: Purchase Invoice,Supplied Items,Geleverde Artikelen
 DocType: Student,STUD.,Stud.
 DocType: Production Order,Qty To Manufacture,Aantal te produceren
+DocType: Email Digest,New Income,nieuwe Inkomen
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Handhaaf zelfde tarief gedurende inkoopcyclus
 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 +131,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 +175,Valuation Rate required for Item in row {0},Valuation Rate vereist voor post in rij {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,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
 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 +87, to ,naar
+apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,naar
 DocType: Item,Lead Time in days,Levertijd in dagen
 ,Accounts Payable Summary,Crediteuren Samenvatting
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Not authorized to edit frozen Account {0},Niet bevoegd om bevroren rekening te bewerken {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,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 +62,Sales Order {0} is not valid,Verkooporder {0} is niet geldig
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Verkooporder {0} is niet geldig
 apps/erpnext/erpnext/setup/doctype/company/company.py +185,"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 +152,Small,Klein
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,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}
 ,Invoiced Amount (Exculsive Tax),Factuurbedrag (excl BTW)
-DocType: Student Applicant,Mother's / Guardian 1 Email ID,Mother&#39;s / Guardian 1 Email ID
 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 +160,Green,Groen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,Groen
 DocType: Supplier,SUPP-,SUPP-
 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 +57,Contract,Contract
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,Contract
 DocType: Email Digest,Add Quote,Quote voegen
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +498,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 +503,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 +80,Row {0}: Qty is mandatory,Rij {0}: Aantal is verplicht
+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 +737,Sync Master Data,Sync Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +719,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/public/js/setup_wizard.js +283,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
+DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Dit is een basis artikelgroep en kan niet worden bewerkt .
+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 .
 DocType: Journal Entry Account,Purchase Order,Inkooporder
 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 +345,"{0}: Employee email not found, hence email not sent","{0}: Employee e-mail niet gevonden, dus geen e-mail verzonden"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +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
 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 +118,"For {0}, only credit accounts can be linked against another debit entry","Voor {0}, kan alleen credit accounts worden gekoppeld tegen een andere debetboeking"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Delivery Note {0} is not submitted,Vrachtbrief {0} is niet ingediend
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Delivery Note {0} is not submitted,Vrachtbrief {0} is niet ingediend
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Sub-contracted Item,Artikel {0} moet een uitbesteed artikel zijn
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Kapitaalgoederen
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Prijsbepalingsregel wordt eerst geselecteerd op basis van 'Toepassen op' veld, dat kan zijn artikel, artikelgroep of merk."
 DocType: Hub Settings,Seller Website,Verkoper Website
 DocType: Item,ITEM-,ITEM-
-apps/erpnext/erpnext/controllers/selling_controller.py +147,Total allocated percentage for sales team should be 100,Totaal toegewezen percentage voor verkoopteam moet 100 zijn
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +110,Production Order status is {0},Productie Order status is {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Totaal toegewezen percentage voor verkoopteam moet 100 zijn
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Productie Order status is {0}
 DocType: Appraisal Goal,Goal,Doel
 DocType: Sales Invoice Item,Edit Description,Bewerken Beschrijving
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +757,For Supplier,voor Leverancier
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +723,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
@@ -1216,10 +1232,11 @@
 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
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-mail Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +445,BOM {0} does not belong to Item {1},Stuklijst {0} behoort niet tot Artikel {1}
 DocType: Sales Partner,Target Distribution,Doel Distributie
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1667,Deafault warehouse is required for selected item,Deafault magazijn is nodig voor geselecteerde item
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Deafault warehouse is required for selected item,Deafault magazijn is nodig voor geselecteerde item
 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
@@ -1228,23 +1245,23 @@
 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 +110,Hardware,hardware
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,hardware
 DocType: Sales Order,Recurring Upto,terugkerende Tot
 DocType: Attendance,HR Manager,HR Manager
 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 +48,Privilege Leave,Bijzonder Verlof
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,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 +79,You need to enable Shopping Cart,U moet Winkelwagen activeren.
 DocType: Payment Entry,Writeoff,Afschrijven
 DocType: Appraisal Template Goal,Appraisal Template Goal,Beoordeling Sjabloon Doel
-DocType: Salary Slip,Earning,Verdienen
+DocType: Salary Component,Earning,Verdienen
 DocType: Purchase Invoice,Party Account Currency,Party account Valuta
 ,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 +171,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 +174,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_data.py +358,Food,Voeding
+apps/erpnext/erpnext/demo/setup/setup_data.py +301,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/course_schedule/course_schedule.js +103,Mark Attendence,Mark presentielijst
@@ -1278,12 +1295,12 @@
 DocType: Sales Order Item,Planned Quantity,Gepland Aantal
 DocType: Purchase Invoice Item,Item Tax Amount,Artikel BTW-bedrag
 DocType: Item,Maintain Stock,Handhaaf Stock
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +209,Stock Entries already created for Production Order ,Stock Entries al gemaakt voor de productieorder
+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
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,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 +620,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 +238,Max: {0},Max: {0}
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +15,From Datetime,Van Datetime
+apps/erpnext/erpnext/controllers/accounts_controller.py +623,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 +239,Max: {0},Max: {0}
+apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Van Datetime
 DocType: Email Digest,For Company,Voor Bedrijf
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Communicatie log.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +153,"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."
@@ -1291,8 +1308,8 @@
 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 +552,cannot be greater than 100,mag niet groter zijn dan 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +680,Item {0} is not a stock Item,Artikel {0} is geen voorraadartikel
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +546,cannot be greater than 100,mag niet groter zijn dan 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,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
@@ -1306,10 +1323,9 @@
 DocType: GL Entry,GL Entry,GL Entry
 DocType: HR Settings,Employee Settings,Werknemer Instellingen
 ,Batch-Wise Balance History,Batchgewijze balansgeschiedenis
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Actie Lijst
 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 +61,Apprentice,leerling
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +102,Negative Quantity is not allowed,Negatieve Hoeveelheid is niet toegestaan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,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"
@@ -1331,15 +1347,14 @@
 DocType: Asset,Asset Name,Asset Naam
 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 +141,Source warehouse is mandatory for row {0},Bron magazijn is verplicht voor rij {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +719,Packing Slip,Pakbon
+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 +713,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/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,Offerte aanvragen kan de toegang worden door te klikken op deze link
 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 +81,Analyst,analist
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,analist
 DocType: Item,Inventory,Voorraad
 DocType: Item,Sales Details,Verkoop Details
 DocType: Quality Inspection,QI-,Qi-
@@ -1347,7 +1362,7 @@
 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 +103,Government,Overheid
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,Overheid
 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
 DocType: Company,Services,Services
@@ -1363,6 +1378,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,Financial Year Start Date,Boekjaar Startdatum
 DocType: POS Profile,Apply Discount,Solliciteer Discount
 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
 DocType: Program Course,Program Course,programma Course
@@ -1403,12 +1419,12 @@
 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
 DocType: Production Plan Sales Order,Production Plan Sales Order,Productie Plan Verkooporder
 DocType: Sales Partner,Sales Partner Target,Verkoop Partner Doel
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +110,Accounting Entry for {0} can only be made in currency: {1},Post voor {0} kan alleen worden gemaakt in valuta: {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Post voor {0} kan alleen worden gemaakt in valuta: {1}
 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
 DocType: Shopping Cart Settings,Payment Success URL,Betaling Succes URL
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +78,Row # {0}: Returned Item {1} does not exists in {2} {3},Rij # {0}: Teruggekeerde Item {1} bestaat niet in {2} {3}
+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
@@ -1417,40 +1433,39 @@
 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/stock/doctype/stock_entry/stock_entry.py +339,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Niet toegestaan om meer tranfer {0} dan {1} tegen Purchase Order {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +344,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 +545,Manufacturing Quantity is mandatory,Productie Aantal is verplicht
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,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 +71,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 +162,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/projects/doctype/timesheet/timesheet.py +186,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
 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 +130,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 +137,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
 DocType: Dependent Task,Dependent Task,Afhankelijke taak
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,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/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 +190,Leave of type {0} cannot be longer than {1},Verlof van type {0} kan niet langer zijn dan {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +197,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 +921,Search Item,Zoekitem
+apps/erpnext/erpnext/accounts/page/pos/pos.js +910,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 +546,Already completed,Reeds voltooid
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +22,Payment Request already exists {0},Betalingsverzoek bestaat al {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +550,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 +241,Quantity must not be more than {0},Hoeveelheid mag niet meer zijn dan {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Quantity must not be more than {0},Hoeveelheid mag niet meer zijn dan {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +76,Previous Financial Year is not closed,Vorig boekjaar is niet gesloten
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +44,Age (Days),Leeftijd (dagen)
 DocType: Quotation Item,Quotation Item,Offerte Artikel
@@ -1467,7 +1482,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +221,Purchase Receipt {0} is not submitted,Ontvangstbevestiging {0} is niet ingediend
 DocType: Company,Default Payable Account,Standaard Payable Account
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Instellingen voor online winkelwagentje zoals scheepvaart regels, prijslijst enz."
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +83,{0}% Billed,{0}% gefactureerd
+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
@@ -1479,12 +1494,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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/schools/doctype/fees/fees.js +22,Collect,Verzamelen
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Verzamelen
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,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 +225,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
-DocType: Payment Reconciliation,Payments,Betalingen
 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
@@ -1496,7 +1510,7 @@
 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 +9,Procurement,Inkoop
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,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/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
 ,Lead Details,Lead Details
 DocType: Purchase Invoice,End date of current invoice's period,Einddatum van de huidige factuurperiode
@@ -1521,7 +1535,7 @@
 DocType: Purchase Invoice,Additional Discount,EXTRA KORTING
 DocType: Selling Settings,Selling Settings,Verkoop Instellingen
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,online Veilingen
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +97,Please specify either Quantity or Valuation Rate or both,Specificeer ofwel Hoeveelheid of Waarderingstarief of beide
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,Specificeer ofwel Hoeveelheid of Waarderingstarief of beide
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +13,Fulfillment,Vervulling
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Bedrijf , maand en het fiscale jaar is verplicht"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Marketingkosten
@@ -1542,14 +1556,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,ERPNext Setup is voltooid!
 DocType: Item,Weightage,Weging
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +93,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Een Klantgroep met dezelfde naam bestaat. Gelieve de naam van de Klant of de Klantgroep  wijzigen
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +126,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
 DocType: Stock Entry,Material Receipt,Materiaal ontvangst
 DocType: Homepage,Products,producten
 DocType: Announcement,Instructor,Instructeur
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},Partij Type en Partij is nodig voor Debiteuren / Crediteuren rekening {0}
 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
@@ -1560,7 +1573,7 @@
 ,Item-wise Sales Register,Artikelgebaseerde Verkoop Register
 DocType: Asset,Gross Purchase Amount,Gross Aankoopbedrag
 DocType: Asset,Depreciation Method,afschrijvingsmethode
-apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Offline,offline
+apps/erpnext/erpnext/accounts/page/pos/pos.js +686,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
@@ -1578,25 +1591,27 @@
 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
 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 +858,Make Purchase Order,Maak inkooporder
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +852,Make Purchase Order,Maak inkooporder
 DocType: SMS Center,Send To,Verzenden naar
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,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 +148,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
 DocType: Stock Reconciliation,Stock Reconciliation,Voorraad Aflettering
 DocType: Territory,Territory Name,Regio Naam
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +172,Work-in-Progress Warehouse is required before Submit,Werk in uitvoering Magazijn is vereist alvorens in te dienen
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,Work-in-Progress Warehouse is required before Submit,Werk in uitvoering Magazijn is vereist alvorens in te dienen
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Kandidaat voor een baan.
 DocType: Purchase Order Item,Warehouse and Reference,Magazijn en Referentie
 DocType: Supplier,Statutory info and other general information about your Supplier,Wettelijke info en andere algemene informatie over uw leverancier
-apps/erpnext/erpnext/hooks.py +88,Addresses,Adressen
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Leverancier&gt; Leverancier Type
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +212,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/hooks.py +95,Addresses,Adressen
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +215,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
 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
@@ -1604,11 +1619,10 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,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 +731,Payment,Betaling
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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: Pricing Rule,Brand,Merk
 DocType: Course,Course Abbreviation,cursus Afkorting
 DocType: Item,Will also apply for variants,Geldt ook voor varianten
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +142,"Asset cannot be cancelled, as it is already {0}","Asset kan niet worden geannuleerd, want het is al {0}"
@@ -1620,7 +1634,7 @@
 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 .
 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 +85,Associate,associëren
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,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
@@ -1628,7 +1642,7 @@
 DocType: Production Planning Tool,Material Requests,materiaal aanvragen
 DocType: Warranty Claim,Issue Date,Uitgiftedatum
 DocType: Activity Cost,Activity Cost,Activiteit Kosten
-DocType: Timesheet Detail,Timesheet Detail,Timesheet Detail
+DocType: Sales Invoice Timesheet,Timesheet Detail,Timesheet Detail
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Verbruikt aantal
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,telecommunicatie
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Geeft aan dat het pakket een onderdeel is van deze levering (alleen ontwerp)
@@ -1651,6 +1665,7 @@
 DocType: Production Plan Material Request,Material Request Date,Materiaal Aanvraagdatum
 DocType: Purchase Order Item,Supplier Quotation Item,Leverancier Offerte Artikel
 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
 DocType: Monthly Distribution,Name of the Monthly Distribution,Naam van de verdeling per maand
 DocType: Sales Person,Parent Sales Person,Parent Sales Person
@@ -1663,31 +1678,32 @@
 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 +44,"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/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.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +502,Error: {0} &gt; {1},Fout: {0}&gt; {1}
 DocType: Item,Is Sales Item,Is verkoopartikel
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Artikel groepstructuur
 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.
 DocType: Naming Series,Current Value,Huidige waarde
-apps/erpnext/erpnext/controllers/accounts_controller.py +235,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/controllers/accounts_controller.py +238,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
 DocType: Delivery Note Item,Against Sales Order,Tegen klantorder
 ,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 +458,Item table can not be blank,Artikel tabel kan niet leeg zijn
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +443,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}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +5,This is based on stock movement. See {0} for details,Dit is gebaseerd op voorraad beweging. Zie {0} voor meer informatie
 DocType: Pricing Rule,Selling,Verkoop
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +341,Amount {0} {1} deducted against {2},Bedrag {0} {1} in mindering gebracht tegen {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +344,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
@@ -1702,8 +1718,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +144,Cannot refer row number greater than or equal to current row number for this Charge type,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 +159,Red,Rood
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Klik op 'Genereer Planning' om serienummer op te halen voor Artikel {0}
+apps/erpnext/erpnext/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
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Basisbedrag (Company Munt)
@@ -1711,7 +1727,7 @@
 DocType: Installation Note,Installation Time,Installatie Tijd
 DocType: Sales Invoice,Accounting Details,Boekhouding Details
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,Verwijder alle transacties voor dit bedrijf
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +187,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Rij # {0}: Operation {1} is niet voltooid voor {2} aantal van afgewerkte goederen in productieorders # {3}. Gelieve operatie status bijwerken via Time Logs
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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,Rij # {0}: Operation {1} is niet voltooid voor {2} aantal van afgewerkte goederen in productieorders # {3}. Gelieve operatie status bijwerken via Time Logs
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,Investeringen
 DocType: Issue,Resolution Details,Oplossing Details
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,Toekenningen
@@ -1747,16 +1763,17 @@
 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}
 DocType: Delivery Note,Excise Page Number,Accijnzen Paginanummer
 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}
 ,Maintenance Schedules,Onderhoudsschema&#39;s
 DocType: Task,Actual End Date (via Time Sheet),Werkelijke Einddatum (via Urenregistratie)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Amount {0} {1} against {2} {3},Bedrag {0} {1} tegen {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +339,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 +138,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 +295,Debit To account must be a Receivable account,Debet Om rekening moet een vordering-account
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Receivable account,Debet Om rekening moet een vordering-account
 DocType: Shipping Rule Condition,Shipping Amount,Verzendbedrag
 ,Pending Amount,In afwachting van Bedrag
 DocType: Purchase Invoice Item,Conversion Factor,Conversiefactor
@@ -1764,10 +1781,10 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +137,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 +90,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
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +93,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 +22,Enter Paid Amount,Voer betaalde bedrag
+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
@@ -1777,13 +1794,15 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,timesheets
 DocType: HR Settings,HR Settings,HR-instellingen
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Expense Claim is pending approval. Only the Expense Approver can update status.,Kostendeclaratie is in afwachting van goedkeuring. Alleen de Kosten Goedkeurder kan status bijwerken.
+DocType: Email Digest,New Expenses,nieuwe Uitgaven
 DocType: Purchase Invoice,Additional Discount Amount,Extra korting Bedrag
-apps/erpnext/erpnext/controllers/accounts_controller.py +524,"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.
+apps/erpnext/erpnext/controllers/accounts_controller.py +527,"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 +249,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/stock/get_item_details.py +123,Please specify Company,Specificeer Bedrijf
 ,Customer Acquisition and Loyalty,Klantenwerving en behoud
@@ -1794,17 +1813,19 @@
 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 +183,Closing (Opening + Totals),Sluiting (openen + Totalen)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),Sluiting (openen + Totalen)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Omschrijf valuta Company
 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/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
-apps/erpnext/erpnext/controllers/accounts_controller.py +272,Account {0} is invalid. Account Currency must be {1},Account {0} is ongeldig. Account Valuta moet {1} zijn
+DocType: Email Digest,Pending Sales Orders,In afwachting van klantorders
+apps/erpnext/erpnext/controllers/accounts_controller.py +275,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 +956,"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 Slip,Deduction,Aftrek
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +87,Row {0}: From Time and To Time is mandatory.,Rij {0}: Van tijd en binnen Tijd is verplicht.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +969,"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 +111,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 +262,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 +7,Please enter Employee Id of this sales person,Vul Employee Id van deze verkoper
@@ -1812,7 +1833,7 @@
 DocType: Project,% Tasks Completed,% van de taken afgerond
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,Verschil Bedrag moet nul zijn
 DocType: Project,Gross Margin,Bruto Marge
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +194,Please enter Production Item first,Vul eerst Productie Artikel in
+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
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Offerte
@@ -1821,53 +1842,54 @@
 DocType: Maintenance Visit,Maintenance User,Onderhoud Gebruiker
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +149,Cost Updated,Kosten Bijgewerkt
 DocType: Employee,Date of Birth,Geboortedatum
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +86,Item {0} has already been returned,Artikel {0} is al geretourneerd
+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}
+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 +177,Job Description,Functiebeschrijving
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,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 +126,"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 +127,"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."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +24,Welcome to POS: Create your POS Profile,Welkom bij POS: Maak je POS Profile
 DocType: Expense Claim,Approver,Goedkeurder
 ,SO Qty,VO Aantal
+DocType: Guardian,Work Address,Werk adres
 DocType: Appraisal,Calculate Total Score,Bereken Totaalscore
 DocType: Request for Quotation,Manufacturing Manager,Productie Manager
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serienummer {0} is onder garantie tot {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +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 +74,Shipments,Zendingen
+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
 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 +153,Row # ,Rij #
+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 +156,Get From,Krijg Van
+apps/erpnext/erpnext/public/js/utils.js +167,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 +167,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 +416,"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"
+apps/erpnext/erpnext/controllers/accounts_controller.py +419,"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
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} is disabled,Gebruiker {0} is uitgeschakeld
 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 ...
 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 +171,"Types of employment (permanent, contract, intern etc.).","Vormen van dienstverband (permanent, contract, stage, etc. ) ."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +346,{0} is mandatory for Item {1},{0} is verplicht voor Artikel {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,{0} is mandatory for Item {1},{0} is verplicht voor Artikel {1}
 DocType: Currency Exchange,From Currency,Van Valuta
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Selecteer toegewezen bedrag, Factuur Type en factuurnummer in tenminste één rij"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,Kosten van nieuwe aankoop
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},Verkooporder nodig voor Artikel {0}
 DocType: Purchase Invoice Item,Rate (Company Currency),Tarief (Bedrijfsvaluta)
-apps/erpnext/erpnext/demo/setup_data.py +360,Others,anderen
+DocType: Student Guardian,Others,anderen
 DocType: Payment Entry,Unallocated Amount,Niet-toegewezen bedrag
 apps/erpnext/erpnext/templates/includes/product_page.js +65,Cannot find a matching Item. Please select some other value for {0}.,Kan een bijpassende Item niet vinden. Selecteer een andere waarde voor {0}.
 DocType: POS Profile,Taxes and Charges,Belastingen en Toeslagen
@@ -1887,17 +1909,16 @@
 apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,Geserialiseerde Inventory
 DocType: Activity Type,Default Billing Rate,Default Billing Rate
 DocType: Sales Invoice,Total Billing Amount,Totaal factuurbedrag
-apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +54,Receivable Account,Vorderingen Account
-apps/erpnext/erpnext/controllers/accounts_controller.py +546,Row #{0}: Asset {1} is already {2},Rij # {0}: Asset {1} al {2}
+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 +549,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 +79,CEO,Directeur
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,Directeur
 DocType: Expense Claim Detail,Expense Claim Detail,Kostendeclaratie Detail
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +808,Please select correct account,Selecteer juiste account
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +809,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
-DocType: Purchase Invoice Item,Page Break,Pagina-einde
 DocType: Production Order Operation,Pending,In afwachting van
 DocType: Course,Course Name,Cursus naam
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Gebruikers die verlofaanvragen een bepaalde werknemer kan goedkeuren
@@ -1906,14 +1927,15 @@
 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 +54,Full-time,Full-time
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Full-time,Full-time
 DocType: Salary Structure,Employees,werknemers
 DocType: Employee,Contact Details,Contactgegevens
 DocType: C-Form,Received Date,Ontvangstdatum
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Als u een standaard template in Sales en -heffingen Template hebt gemaakt, selecteert u een en klik op de knop hieronder."
+DocType: Student,Guardians,Guardians
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +29,Please specify a country for this Shipping Rule or check Worldwide Shipping,Geef aub een land dat voor deze verzending Rule of kijk Wereldwijde verzending
 DocType: Stock Entry,Total Incoming Value,Totaal Inkomende Waarde
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Debit To is required,Debet Om vereist
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +321,Debit To is required,Debet Om vereist
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Purchase Price List
 DocType: Offer Letter Term,Offer Term,Aanbod Term
 DocType: Quality Inspection,Quality Manager,Quality Manager
@@ -1921,6 +1943,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/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
@@ -1931,18 +1954,17 @@
 DocType: Production Order Operation,Completed Qty,Voltooid aantal
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"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 +273,Price List {0} is disabled,Prijslijst {0} is uitgeschakeld
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +99,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/projects/doctype/timesheet/timesheet.py +123,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
 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}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Huidige Valuation Rate
 DocType: Item,Customer Item Codes,Customer Item Codes
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,Exchange winst / verlies
 DocType: Opportunity,Lost Reason,Reden van verlies
-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/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/purchase_receipt/purchase_receipt.py +378,All items have already been invoiced,Alle items zijn reeds gefactureerde
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +379,All items have already been invoiced,Alle items zijn reeds gefactureerde
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Geef een geldig 'Van Zaaknummer'
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Verdere kostenplaatsen kan in groepen worden gemaakt, maar items kunnen worden gemaakt tegen niet-Groepen"
 DocType: Project,External,Extern
@@ -1958,18 +1980,19 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Uw Klanten
 apps/erpnext/erpnext/projects/doctype/project/project.py +141,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/job_opening.html +19,Apply Now,Nu toepassen
+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."
 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
-apps/erpnext/erpnext/utilities/doctype/address/address.py +164,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: Fee Structure,Fee Structure,fee Structuur
 DocType: Timesheet Detail,Costing Amount,Costing Bedrag
+DocType: Student Admission,Application Fee,Aanvraagkosten
 DocType: Process Payroll,Submit Salary Slip,Indienen salarisstrook
-apps/erpnext/erpnext/controllers/selling_controller.py +161,Maxiumm discount for Item {0} is {1}%,Maximum korting voor artikel {0} is {1} %
+apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,Maximum korting voor artikel {0} is {1} %
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Import in bulk
 DocType: Sales Partner,Address & Contacts,Adres & Contacten
 DocType: SMS Log,Sender Name,Naam afzender
@@ -1994,21 +2017,21 @@
 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_data.py +361,Travel,reizen
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +155,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 +304,Travel,reizen
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +167,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 +23,Update Cost,Kosten bijwerken
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Kosten bijwerken
 DocType: Item Reorder,Item Reorder,Artikel opnieuw ordenen
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +36,Show Salary Slip,Show loonstrook
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +748,Transfer Material,Verplaats Materiaal
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +53,Show Salary Slip,Show loonstrook
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +166,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 +923,Please set recurring after saving,Stel terugkerende na het opslaan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +646,Select change amount account,Selecteer verandering bedrag rekening
+apps/erpnext/erpnext/public/js/controllers/transaction.js +914,Please set recurring after saving,Stel terugkerende na het opslaan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +703,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
@@ -2020,31 +2043,32 @@
 DocType: Quality Inspection,Verified By,Geverifieerd door
 DocType: Address,Subsidiary,Dochteronderneming
 apps/erpnext/erpnext/setup/doctype/company/company.py +64,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.",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: Quality Inspection,Purchase Receipt No,Ontvangstbevestiging nummer
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Onderpand
 DocType: Process Payroll,Create Salary Slip,Maak loonstrook
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +33,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 +352,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Hoeveelheid in rij {0} ({1}) moet hetzelfde zijn als geproduceerde hoeveelheid {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Hoeveelheid in rij {0} ({1}) moet hetzelfde zijn als geproduceerde hoeveelheid {2}
 DocType: Appraisal,Employee,Werknemer
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Uitnodigen als gebruiker
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} is volledig gefactureerd
 DocType: Workstation Working Hour,End Time,Eindtijd
 DocType: Payment Entry,Payment Deductions or Loss,Betaling Aftrek of verlies
-apps/erpnext/erpnext/config/schools.py +100,LMS,LMS
+apps/erpnext/erpnext/config/schools.py +104,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/config/crm.py +6,Sales Pipeline,Sales Pipeline
 DocType: Student Batch Student,Student Batch Student,Student Batch Student
-DocType: Sales Invoice,Mass Mailing,Mass Mailing
+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 +199,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/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 +297,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 +111,Pharmaceutical,Farmaceutisch
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +309,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/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
@@ -2059,27 +2083,28 @@
 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 +814,Please specify Company to proceed,Specificeer Bedrijf om verder te gaan
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +793,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 +44,Compensatory Off,compenserende Off
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,compenserende Off
 DocType: Quality Inspection Reading,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.
 DocType: Room,Room Number,Kamernummer
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Ongeldige referentie {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +161,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) kan niet groter zijn dan geplande hoeveelheid ({2}) in productieorders {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +162,{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 +217,Raw Materials cannot be blank.,Grondstoffen kan niet leeg zijn.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,"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 +460,Quick Journal Entry,Quick Journal Entry
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +111,You can not change rate if BOM mentioned agianst any item,U kunt het tarief niet veranderen als een artikel Stuklijst-gerelateerd is.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +441,"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 +450,Quick Journal Entry,Quick Journal Entry
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +103,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 +214,{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
 ,Minutes to First Response for Issues,Minuten naar First Response voor problemen
 DocType: Purchase Invoice,Terms and Conditions1,Algemene Voorwaarden1
 apps/erpnext/erpnext/public/js/setup_wizard.js +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.
@@ -2088,16 +2113,17 @@
 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 +398,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 +739,Item or Warehouse for row {0} does not match Material Request,Artikel of Magazijn voor rij {0} komt niet overeen met Materiaal Aanvraag
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +747,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
 DocType: Fiscal Year,Year End Date,Jaar Einddatum
 DocType: Task Depends On,Task Depends On,Taak Hangt On
-DocType: Lead,Opportunity,Opportunity
+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
@@ -2110,7 +2136,7 @@
 DocType: Student,Joining Date,Deelnemen Date
 ,Employees working on a holiday,Werknemers die op vakantie
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Mark Present
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},Onderhoud startdatum kan niet voor de leveringsdatum voor Serienummer {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},Onderhoud startdatum kan niet voor de leveringsdatum voor Serienummer {0}
 DocType: Production Order,Actual End Date,Werkelijke Einddatum
 DocType: Purchase Invoice,PINV-,PINV-
 DocType: Authorization Rule,Applicable To (Role),Van toepassing zijn op (Rol)
@@ -2125,7 +2151,7 @@
 DocType: SMS Log,No of Requested SMS,Aantal gevraagde SMS
 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 +729,Please supply the specified items at the best possible rates,Gelieve de opgegeven items aan de best mogelijke prijzen
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +695,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 +117,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
@@ -2134,7 +2160,7 @@
 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 +14,This is an example website auto-generated from ERPNext,"Dit is een voorbeeld website, automatisch gegenereerd door ERPNext"
+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
 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.
 
@@ -2181,13 +2207,14 @@
 DocType: Purchase Receipt Item,Recd Quantity,Benodigde hoeveelheid
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +54,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 +103,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 +504,Stock Entry {0} is not submitted,Stock Entry {0} is niet ingediend
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Kan niet meer produceren van Artikel {0} dan de Verkooporder hoeveelheid {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +505,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: Salary Component Account,Salary Component Account,Salaris Component Account
 DocType: Global Defaults,Hide Currency Symbol,Verberg Valutasymbool
 apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card","bijv. Bank, Kas, Credit Card"
+DocType: Lead Source,Source Name,Bron naam
 DocType: Journal Entry,Credit Note,Creditnota
 DocType: Warranty Claim,Service Address,Service Adres
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furnitures and Fixtures,Meubels en Wedstrijden
@@ -2199,6 +2226,7 @@
 DocType: Opportunity,Customer / Lead Name,Klant / Lead Naam
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +89,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/controllers/trends.py +19,Total(Qty),Totaal (Aantal)
 DocType: Sales Invoice,This Document,Dit document
@@ -2210,15 +2238,15 @@
 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 +176,Organization branch master.,Organisatie tak meester .
-apps/erpnext/erpnext/controllers/accounts_controller.py +273, or ,of
+apps/erpnext/erpnext/controllers/accounts_controller.py +276, or ,of
 DocType: Sales Order,Billing Status,Factuurstatus
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Issue melden?
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,Utiliteitskosten
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-Boven
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +203,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Rij # {0}: Journal Entry {1} heeft geen account {2} of al vergeleken met een ander voucher
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +206,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 +90,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 +93,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
@@ -2246,8 +2274,8 @@
 DocType: Product Bundle,Parent Item,Bovenliggend Artikel
 DocType: Account,Account Type,Rekening Type
 DocType: Delivery Note,DN-RET-,DN-terugwerkende
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +115,Leave Type {0} cannot be carry-forwarded,Verlaat Type {0} kan niet worden doorgestuurd dragen-
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Onderhoudsschema wordt niet gegenereerd voor alle items . Klik op ' Generate Schedule'
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +118,Leave Type {0} cannot be carry-forwarded,Verlaat Type {0} kan niet worden doorgestuurd dragen-
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Onderhoudsschema wordt niet gegenereerd voor alle items . Klik op ' Generate Schedule'
 ,To Produce,Produceren
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Loonlijst
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +163,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Voor rij {0} in {1}. Om {2} onder in punt tarief, rijen {3} moet ook opgenomen worden"
@@ -2259,13 +2287,13 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +32,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 +748,Delivery,Levering
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +742,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
 DocType: Payment Entry,Total Allocated Amount,Totaal toegewezen bedrag
 DocType: Item Reorder,Material Request Type,Materiaal Aanvraag Type
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +82,Row {0}: UOM Conversion Factor is mandatory,Rij {0}: Verpakking Conversie Factor is verplicht
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +79,Row {0}: UOM Conversion Factor is mandatory,Rij {0}: Verpakking Conversie Factor is verplicht
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Budget,Cost Center,Kostenplaats
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Boekstuk nr
@@ -2276,13 +2304,13 @@
 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 +90,Head of Marketing and Sales,Hoofd Marketing en Verkoop
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Inkomstenbelasting
+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 +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.
 DocType: Item Supplier,Item Supplier,Artikel Leverancier
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +403,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 +770,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 +397,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 +764,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"
@@ -2294,28 +2322,29 @@
 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 +100,Issues,Kwesties
+apps/erpnext/erpnext/hooks.py +109,Issues,Kwesties
 apps/erpnext/erpnext/controllers/status_updater.py +13,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
 DocType: Supplier,Billing Currency,Valuta
 DocType: Sales Invoice,SINV-RET-,SINV-terugwerkende
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Large,Extra Groot
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,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 +507,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 +107,Local,Lokaal
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +508,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/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 +154,Large,Groot
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,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 +225,Total {0} ({1}),Totaal {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +224,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
@@ -2373,9 +2402,9 @@
 DocType: Attendance,Leave Type,Verlof Type
 apps/erpnext/erpnext/controllers/stock_controller.py +173,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/hr/doctype/salary_slip/salary_slip.py +79,Name error: {0},Naam fout: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +90,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 +178,{0} {1} does not associated with {2} {3},{0} {1} niet gekoppeld aan {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +181,{0} {1} does not associated with {2} {3},{0} {1} niet gekoppeld aan {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Aanwezigheid voor werknemer {0} is al gemarkeerd
 DocType: Packing Slip,If more than one package of the same type (for print),Als er meer dan een pakket van hetzelfde type (voor afdrukken)
 DocType: Warehouse,Parent Warehouse,Parent Warehouse
@@ -2394,7 +2423,7 @@
 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
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,Minstens één punt moet in ruil document worden ingevoerd met een negatieve hoeveelheid
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Atleast one item should be entered with negative quantity in return document,Minstens één punt moet in ruil document worden ingevoerd met een negatieve hoeveelheid
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operation {0} langer dan alle beschikbare werktijd in werkstation {1}, breken de operatie in meerdere operaties"
 ,Requested,Aangevraagd
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +83,No Remarks,Geen Opmerkingen
@@ -2406,46 +2435,46 @@
 DocType: Item,Total Projected Qty,Totale geraamde Aantal
 DocType: Monthly Distribution,Distribution Name,Distributie Naam
 DocType: Course,Course Code,cursus Code
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Quality Inspection required for Item {0},Kwaliteitscontrole vereist voor Artikel {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,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
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Beheer Grondgebied Boom.
 DocType: Journal Entry Account,Sales Invoice,Verkoopfactuur
 DocType: Journal Entry Account,Party Balance,Partij Balans
-apps/erpnext/erpnext/accounts/page/pos/pos.js +475,Please select Apply Discount On,Selecteer Apply Korting op
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +92,Salary Slip Created,Loonstrook Gemaakt
+apps/erpnext/erpnext/accounts/page/pos/pos.js +464,Please select Apply Discount On,Selecteer Apply Korting op
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +95,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
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,Kortingspercentage kan worden toegepast tegen een prijslijst of voor alle prijslijsten.
 DocType: Purchase Invoice,Half-yearly,Halfjaarlijks
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +384,Accounting Entry for Stock,Boekingen voor Voorraad
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +387,Accounting Entry for Stock,Boekingen voor Voorraad
 DocType: Sales Invoice,Sales Team1,Verkoop Team1
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,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 +96,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 +120,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 +88,Row # {0}: Cannot return more than {1} for Item {2},Rij # {0}: Kan niet meer dan terugkeren {1} voor post {2}
+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
 DocType: Item Group,Show this slideshow at the top of the page,Laat deze slideshow aan de bovenkant van de pagina
 DocType: BOM,Item UOM,Artikel Eenheid
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Belasting Bedrag na korting Bedrag (Company valuta)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +147,Target warehouse is mandatory for row {0},Doel magazijn is verplicht voor rij {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +141,Target warehouse is mandatory for row {0},Doel magazijn is verplicht voor rij {0}
 DocType: Cheque Print Template,Primary Settings,Primaire Instellingen
 DocType: Purchase Invoice,Select Supplier Address,Select Leverancier Adres
 DocType: Quality Inspection,Quality Inspection,Kwaliteitscontrole
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Extra Small,Extra Small
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +194,Account {0} is frozen,Rekening {0} is bevroren
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Extra Small
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +690,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 +197,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 +606,Can only make payment against unbilled {0},Kan alleen betaling uitvoeren voor ongefactureerde {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +126,Commission rate cannot be greater than 100,Commissietarief kan niet groter zijn dan 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +609,Can only make payment against unbilled {0},Kan alleen betaling uitvoeren voor ongefactureerde {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,Commissietarief kan niet groter zijn dan 100
 DocType: Stock Entry,Subcontract,Subcontract
 apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,Voer {0} eerste
 DocType: Production Order Operation,Actual End Time,Werkelijke Eindtijd
@@ -2456,30 +2485,30 @@
 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 +158,Colour,Kleur
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,Kleur
 DocType: Maintenance Visit,Scheduled,Geplande
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Aanvraag voor een offerte.
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Selecteer Item, waar &quot;Is Stock Item&quot; is &quot;Nee&quot; en &quot;Is Sales Item&quot; is &quot;Ja&quot; en er is geen enkel ander product Bundle"
 DocType: Student Log,Academic,Academic
-apps/erpnext/erpnext/controllers/accounts_controller.py +469,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Totaal vooraf ({0}) tegen Orde {1} kan niet groter zijn dan de Grand totaal zijn ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +472,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Totaal vooraf ({0}) tegen Orde {1} kan niet groter zijn dan de Grand totaal zijn ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Selecteer Maandelijkse Distribution om ongelijk te verdelen doelen in heel maanden.
 DocType: Purchase Invoice Item,Valuation Rate,Waardering Tarief
+DocType: Stock Reconciliation,SR/,SR /
 apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,Prijslijst Valuta nog niet geselecteerd
 DocType: Assessment,Results,resultaten
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +168,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 +175,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
-DocType: Student Applicant,Father's/ Guardian 2 Email ID,Vader / Guardian 2 Email ID
 DocType: Maintenance Visit Purpose,Against Document No,Tegen Document nr.
 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 +228,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 +231,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 +93,Researcher,onderzoeker
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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.
@@ -2491,25 +2520,25 @@
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Voor het gemak van de klanten, kunnen deze codes worden gebruikt in gedrukte formaten zoals facturen en de leveringsbonnen"
 DocType: Sales Invoice,Time Sheet List,Urenregistratie List
 DocType: Employee,You can enter any date manually,U kunt elke datum handmatig ingeven
-DocType: Sales Invoice,Advertisement,Advertentie
 DocType: Asset Category Account,Depreciation Expense Account,Afschrijvingen Account
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Probationary Period,Proeftijd
-apps/erpnext/erpnext/hooks.py +102,Announcements,Mededelingen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Proeftijd
+apps/erpnext/erpnext/hooks.py +111,Announcements,Mededelingen
 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 +109,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 +16,To Datetime,Om Datetime
+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/scheduling_tool/scheduling_tool.py +51,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/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Afwachting Activiteiten
+DocType: Accounts Settings,Make Payment via Journal Entry,Betalen via Journal Entry
+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 +127,Please enter relieving date.,Vul het verlichten datum .
-apps/erpnext/erpnext/controllers/trends.py +145,Amt,Amt
+apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,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 +26,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
@@ -2527,14 +2556,15 @@
 apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1},Niet in staat om wisselkoers voor {0} te vinden {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Mark Halve dag
 DocType: Sales Invoice,Sales Team,Verkoop Team
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Duplicate entry,Dubbele invoer
+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 +490,[Error],[Fout]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +484,[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
 apps/erpnext/erpnext/controllers/status_updater.py +175,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.
 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
@@ -2550,22 +2580,22 @@
 ,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 +25,All Jobs,alle vacatures
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,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
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Amount {0} {1} {2} {3},Bedrag {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Amount {0} {1} {2} {3},Bedrag {0} {1} {2} {3}
 DocType: Account,Depreciation,Afschrijvingskosten
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Leverancier(s)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Employee Attendance Tool
 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 +372,Payment Entries {0} are un-linked,Betaling Entries {0} zijn un-linked
+apps/erpnext/erpnext/accounts/utils.py +449,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
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +497,Material Requests {0} created,Materiaal Aanvragen {0} aangemaakt
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +498,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
 DocType: Purchase Invoice,Address and Contact,Adres en contactgegevens
@@ -2604,7 +2634,7 @@
 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 +848,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 +859,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 +233,Closing (Dr),Sluiten (Db)
 DocType: Cheque Print Template,Cheque Size,Cheque Size
@@ -2625,7 +2655,8 @@
 ,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.
-apps/erpnext/erpnext/controllers/accounts_controller.py +555,'Update Stock' cannot be checked for fixed asset sale,&#39;Bijwerken Stock&#39; kan niet worden gecontroleerd op vaste activa te koop
+DocType: Student Guardian,Father,Vader
+apps/erpnext/erpnext/controllers/accounts_controller.py +558,'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/buying/doctype/purchase_order/purchase_order.py +132,Material Request {0} is cancelled or stopped,Materiaal Aanvraag {0} is geannuleerd of gestopt
@@ -2635,15 +2666,15 @@
 DocType: Sales Order,Fully Delivered,Volledig geleverd
 DocType: Lead,Lower Income,Lager inkomen
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","De hoofdrekening onder Passiva, waarin Winst of Verlies zal worden geboekt"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +166,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 +238,"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 +81,Purchase Order number required for Item {0},Inkoopordernummer nodig voor Artikel {0}
+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/purchase_receipt/purchase_receipt.py +82,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 +17,Cannot change status as student {0} is linked with student application {1},Kan niet status als student te veranderen {0} is gekoppeld aan student toepassing {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Kan niet status als student te veranderen {0} is gekoppeld aan student toepassing {1}
 DocType: Timesheet,"List of employee which has ""Salary Slip Based on Timesheet"" is enabled in salary structure.",Lijst van de werknemer die &quot;salarisstrook Op basis van Timesheet&quot; heeft ingeschakeld in salarisstructuur.
 DocType: Asset,Fully Depreciated,volledig is afgeschreven
 ,Stock Projected Qty,Verwachte voorraad hoeveelheid
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Customer {0} does not belong to project {1},Klant {0} behoort niet tot project {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,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
@@ -2655,7 +2686,7 @@
 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/patches/v7_0/create_warehouse_nestedset.py +55,All Warehouses,Alle magazijnen
+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 +105,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
@@ -2667,10 +2698,10 @@
 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/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Maak Salarisstrook
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +26,Browse BOM,Bladeren BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,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/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 Year,Academic Year,Academisch jaar
+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
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,Beoordeling
@@ -2678,12 +2709,12 @@
 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 +197,Leave approver must be one of {0},Verlof goedkeurder moet een zijn van {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,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: Workstation Working Hour,Start Time,Starttijd
 DocType: Item Price,Bulk Import Help,Bulk Import Help
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +256,Select Quantity,Kies aantal
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +257,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
@@ -2700,6 +2731,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Ofwel doelwit aantal of streefbedrag is verplicht.
 apps/erpnext/erpnext/config/projects.py +45,Cost of various activities,Kosten van verschillende activiteiten
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Instellen Events naar {0}, omdat de werknemer die aan de onderstaande Sales Personen die niet beschikt over een gebruikers-ID {1}"
+DocType: Timesheet,Billing Details,Billing Details
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +149,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
 DocType: Item,Inspection Required,Inspectie Verplicht
@@ -2719,7 +2751,7 @@
 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 +138,Wire Transfer,overboeking
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,overboeking
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Alles aanvinken
 DocType: Sales Order,Recurring Order,Terugkerende Bestel
 DocType: Company,Default Income Account,Standaard Inkomstenrekening
@@ -2731,21 +2763,19 @@
 ,Welcome to ERPNext,Welkom bij ERPNext
 apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,Leiden tot Offerte
 DocType: Lead,From Customer,Van Klant
-apps/erpnext/erpnext/demo/setup_data.py +357,Calls,Oproepen
+apps/erpnext/erpnext/demo/setup/setup_data.py +300,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/stock/doctype/item/item.py +466,"As there are existing transactions for this item, \
-							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Als er bestaande transacties voor deze post, \ u niet de waarden van kunnen veranderen &#39;Heeft Serial No&#39;, &#39;Heeft Batch Nee&#39;, &#39;Is Stock Item&#39; en &#39;Valuation Method&#39;"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,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/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 +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Opmerking : Het systeem controleert niet over- levering en overboeking voor post {0} als hoeveelheid of bedrag 0
 DocType: Notification Control,Quotation Message,Offerte Bericht
 DocType: Issue,Opening Date,Openingsdatum
-apps/erpnext/erpnext/schools/api.py +58,Attendance has been marked successfully.,Aanwezigheid is met succes gemarkeerd.
+apps/erpnext/erpnext/schools/api.py +57,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 +136,Account Type for {0} must be {1},Account Type voor {0} moet {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +139,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
@@ -2760,12 +2790,13 @@
 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/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 +20,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 +1190,Please select customer,Maak een keuze van de klant
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1193,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
@@ -2775,6 +2806,7 @@
 ,Payment Period Based On Invoice Date,Betaling Periode gebaseerd op factuurdatum
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Ontbrekende Wisselkoersen voor {0}
 DocType: Assessment,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-
@@ -2792,11 +2824,12 @@
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,topic Naam
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Tenminste een van de verkopen of aankopen moeten worden gekozen
+DocType: Grading Structure,Grade Intervals,Grade intervallen
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Selecteer de aard van uw bedrijf.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Waar de productie-activiteiten worden uitgevoerd.
 DocType: Asset Movement,Source Warehouse,Bron Magazijn
 DocType: Installation Note,Installation Date,Installatie Datum
-apps/erpnext/erpnext/controllers/accounts_controller.py +534,Row #{0}: Asset {1} does not belong to company {2},Rij # {0}: Asset {1} hoort niet bij bedrijf {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +537,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
@@ -2810,28 +2843,31 @@
 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 +111,Date Of Retirement must be greater than Date of Joining,Pensioneringsdatum moet groter zijn dan datum van indiensttreding
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +49,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 +87,{0}% Delivered,{0}% Geleverd
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% Geleverd
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Item {0}: Bestelde aantal {1} kan niet kleiner dan de minimale afname {2} (gedefinieerd in punt) zijn.
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Maandelijkse Verdeling Percentage
 DocType: Territory,Territory Targets,Regio Doelen
 DocType: Delivery Note,Transporter Info,Vervoerder Info
-apps/erpnext/erpnext/accounts/utils.py +379,Please set default {0} in Company {1},Stel default {0} in Company {1}
+apps/erpnext/erpnext/accounts/utils.py +456,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
 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.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Titels voor print sjablonen bijv. Proforma Factuur.
+DocType: Student Guardian,Student Guardian,student Guardian
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +184,Valuation type charges can not marked as Inclusive,Soort waardering kosten kunnen niet zo Inclusive gemarkeerd
 DocType: POS Profile,Update Stock,Voorraad bijwerken
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Verschillende eenheden voor artikelen zal leiden tot een onjuiste (Totaal) Netto gewicht. Zorg ervoor dat Netto gewicht van elk artikel in dezelfde eenheid is.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Stuklijst tarief
 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 +349,Journal Entries {0} are un-linked,Journaalposten {0} zijn un-linked
+apps/erpnext/erpnext/accounts/utils.py +426,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
@@ -2855,6 +2891,7 @@
 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
+DocType: Homepage,"URL for ""All Products""",URL voor &quot;Alle producten&quot;
 DocType: Leave Application,Leave Balance Before Application,Verlofsaldo voor aanvraag
 DocType: SMS Center,Send SMS,SMS versturen
 DocType: Cheque Print Template,Width of amount in word,Breedte van de hoeveelheid in woord
@@ -2863,7 +2900,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 +29,Current Job Openings,Huidige vacatures
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,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
@@ -2876,7 +2913,7 @@
 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 +850,Show tax break-up,Toon tax break-up
+apps/erpnext/erpnext/public/js/controllers/transaction.js +841,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/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"
@@ -2886,10 +2923,11 @@
 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 +534,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 +80,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 +162,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/selling/doctype/customer/customer.py +195,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 +5,This is based on the attendance of this Student,Dit is gebaseerd op de aanwezigheid van de Student
@@ -2898,12 +2936,11 @@
 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 +75,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 +138,Note: There is not enough leave balance for Leave Type {0},Opmerking: Er is niet genoeg verlofsaldo voor Verlof type {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Note: There is not enough leave balance for Leave Type {0},Opmerking: Er is niet genoeg verlofsaldo voor Verlof type {0}
 DocType: Program Enrollment Fee,Program Enrollment Fee,Programma inschrijvingsgeld
 DocType: Item,Supplier Items,Leverancier Artikelen
 DocType: Opportunity,Opportunity Type,Type opportuniteit
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,Nieuw Bedrijf
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,Cost Center is required for 'Profit and Loss' account {0},Kostenplaats is vereist voor 'winst- en verliesrekening' rekening {0}
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Transacties kunnen alleen worden verwijderd door de maker van de Vennootschap
 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.,Onjuist aantal Grootboekposten gevonden. U zou een verkeerde rekening kunnen hebben geselecteerd in de transactie.
 DocType: Cheque Print Template,Cheque Width,Cheque Breedte
@@ -2912,16 +2949,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,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 +228,{0} '{1}' is disabled,{0} '{1}'is uitgeschakeld
+apps/erpnext/erpnext/controllers/accounts_controller.py +231,{0} '{1}' is disabled,{0} '{1}'is uitgeschakeld
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Instellen als Open
 DocType: Cheque Print Template,Scanned Cheque,gescande Cheque
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Stuur automatische e-mails naar Contactpersonen op Indienen transacties.
+DocType: Timesheet,Total Billable Amount,Totaal bedrag Factureerbare
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Punt 3
 DocType: Purchase Order,Customer Contact Email,E-mail Contactpersoon Klant
 DocType: Warranty Claim,Item and Warranty Details,Item en garantie Details
 DocType: Sales Team,Contribution (%),Bijdrage (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Opmerking: De betaling wordt niet aangemaakt, aangezien de 'Kas- of Bankrekening' niet gespecificeerd is."
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Responsibilities,Verantwoordelijkheden
+apps/erpnext/erpnext/controllers/accounts_controller.py +78,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
 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
@@ -2929,6 +2967,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Gebruikers toevoegen
 DocType: Pricing Rule,Item Group,Artikelgroep
 DocType: Item,Safety Stock,Veiligheidsvoorraad
+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: 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)
@@ -2938,7 +2977,6 @@
 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: Timesheet,Total Hours,Totaal Uren
 DocType: Journal Entry,Printing Settings,Instellingen afdrukken
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,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
@@ -2951,13 +2989,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investment Banking
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +71,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
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Klant&gt; Customer Group&gt; Territory
 DocType: Purchase Invoice Item,Rate,Tarief
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Intern,intern
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,intern
 DocType: Stock Entry,From BOM,Van BOM
 DocType: Assessment,Assessment Code,assessment Code
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +32,Basic,Basis
+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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',Klik op 'Genereer Planning'
+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 +95,Reference No is mandatory if you entered Reference Date,Referentienummer is verplicht als u een referentiedatum hebt ingevoerd
@@ -2966,11 +3005,11 @@
 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 +752,Issue Material,Materiaal uitgeven
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +723,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 +683,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 +665,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.
 DocType: Hub Settings,Access Token,Toegang Token
 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
@@ -2978,33 +3017,35 @@
 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 +1122,Enter value must be positive,Voer waarde moet positief zijn
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,All Territories,Alle gebieden
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1125,Enter value must be positive,Voer waarde moet positief zijn
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,Alle gebieden
 DocType: Purchase Invoice,Items,Artikelen
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +23,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 +221,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 +233,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 +96,Request for Quotations,Verzoek om Offertes
+apps/erpnext/erpnext/hooks.py +104,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
 DocType: Asset,Partially Depreciated,gedeeltelijk afgeschreven
 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 +628,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standaard maateenheid voor Variant &#39;{0}&#39; moet hetzelfde zijn als in zijn Template &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standaard maateenheid voor Variant &#39;{0}&#39; moet hetzelfde zijn als in zijn Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Berekenen gebaseerd op
 DocType: Delivery Note Item,From Warehouse,Van Warehouse
 DocType: Assessment,Supervisor Name,supervisor Naam
+DocType: Assessment,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
 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 +27,Default Address Template cannot be deleted,Standaard Adres Sjabloon kan niet worden verwijderd
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,Standaard Adres Sjabloon kan niet worden verwijderd
 DocType: Sales Invoice,Shipping Rule,Verzendregel
 DocType: Manufacturer,Limited to 12 characters,Beperkt tot 12 tekens
 DocType: Journal Entry,Print Heading,Print Kop
@@ -3019,8 +3060,8 @@
 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/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 +485,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 +336,Please select Posting Date first,Selecteer Boekingsdatum eerste
+apps/erpnext/erpnext/stock/get_item_details.py +486,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 +326,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
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Kostenplaats met bestaande transacties kan niet worden omgezet naar grootboek
@@ -3036,6 +3077,7 @@
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Match Betalingen met Facturen
 DocType: Journal Entry,Bank Entry,Bank Invoer
 DocType: Authorization Rule,Applicable To (Designation),Van toepassing zijn op (Benaming)
+,Profitability Analysis,winstgevendheid Analyse
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,In winkelwagen
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Groeperen volgens
 DocType: Guardian,Interests,Interesses
@@ -3048,22 +3090,22 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,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 +141,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Geserialiseerde Item {0} kan niet worden bijgewerkt \
  behulp Stock Verzoening"
 DocType: Scheduling Tool,Day,Dag
 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 +122,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 +129,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
-DocType: Student Applicant,AP.,AP.
 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 +639,Point of Sale,Point of Sale
+apps/erpnext/erpnext/accounts/page/pos/pos.js +634,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
 DocType: Production Planning Tool,Production Planning Tool,Productie Planning Tool
@@ -3072,74 +3114,77 @@
 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 +373,Quantity to Manufacture must be greater than 0.,Hoeveelheid voor fabricage moet groter dan 0 zijn.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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 Profile,Customer Group,Klantengroep
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,Expense account is mandatory for item {0},Kostenrekening is verplicht voor artikel {0}
 DocType: Item,Website Description,Website Beschrijving
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date must be on or after today,Volgende Afschrijvingen datum moet op of na vandaag
 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 +145,Please cancel Purchase Invoice {0} first,Annuleer Purchase Invoice {0} eerste
 DocType: Serial No,AMC Expiry Date,AMC Vervaldatum
 ,Sales Register,Verkoopregister
 DocType: Quotation,Quotation Lost Reason,Reden verlies van Offerte
+apps/erpnext/erpnext/utilities/doctype/address/address.py +164,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.
 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 +330,Transaction reference no {0} dated {1},Transactiereferentie geen {0} van {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,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 +107,Summary for this month and pending activities,Samenvatting voor deze maand en in afwachting van activiteiten
+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/accounts/doctype/sales_invoice/sales_invoice.py +406,Please remove this Invoice {0} from C-Form {1},Verwijder dit Invoice {0} van C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,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 +644,Get Items,Get Items
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +623,Get Items,Get Items
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +210,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 +41,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
 DocType: Payment Request,Initiated,Geïnitieerd
 DocType: Production Order,Planned Start Date,Geplande Startdatum
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,Customer is required against Receivable account {0},Klant is vereist tegen Vordering account {0}
 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 +265,Project-wise data is not available for Quotation,Projectgegevens zijn niet beschikbaar voor Offertes
+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 +101,Commercial,commercieel
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,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: Supplier Quotation,Supplier Address,Adres Leverancier
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +648,Row {0}# Account must be of type 'Fixed Asset',Rij {0} # Account moet van het type zijn &#39;Vaste Activa&#39;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,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 +30,Series is mandatory,Reeks is verplicht
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +50,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
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +165,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 +155,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Cr,Cr
 DocType: Tax Rule,Billing State,Billing State
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +250,Transfer,Verplaatsen
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +187,{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 +825,Fetch exploded BOM (including sub-assemblies),Haal uitgeklapte Stuklijst op (inclusief onderdelen)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +254,Transfer,Verplaatsen
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +190,{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 +796,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 +115,Due Date is mandatory,Vervaldatum is verplicht
+apps/erpnext/erpnext/controllers/accounts_controller.py +118,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
 DocType: Journal Entry,Pay To / Recd From,Betaal aan / Ontv van
 DocType: Naming Series,Setup Series,Instellen Reeksen
 DocType: Payment Reconciliation,To Invoice Date,Om factuurdatum
 DocType: Supplier,Contact HTML,Contact HTML
 ,Inactive Customers,inactieve klanten
+DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Aankoopfacturen
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Hoe wordt de Prijsregel toegepast?
 DocType: Quality Inspection,Delivery Note No,Vrachtbrief Nr
@@ -3148,7 +3193,7 @@
 DocType: Company,Retail,Retail
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +120,Customer {0} does not exist,Klant {0} bestaat niet
 DocType: Attendance,Absent,Afwezig
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +587,Product Bundle,Product Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Product Bundle,Product Bundle
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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
@@ -3158,8 +3203,8 @@
 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 +742,Send Supplier Emails,Stuur Leverancier Emails
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +104,"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/buying/doctype/request_for_quotation/request_for_quotation.js +708,Send Supplier Emails,Stuur Leverancier Emails
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,"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
 DocType: Guardian Interest,Guardian Interest,Guardian Interest
 DocType: Timesheet,Employee Detail,werknemer Detail
@@ -3170,9 +3215,9 @@
 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}
 DocType: Salary Slip,Earning & Deduction,Verdienen &amp; Aftrek
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +77,Account {0} cannot be a Group,Rekening {0} kan geen groep zijn
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} cannot be a Group,Rekening {0} kan geen groep zijn
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +31,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 +107,Negative Valuation Rate is not allowed,Negatieve Waarderingstarief is niet toegestaan
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Negatieve Waarderingstarief is niet toegestaan
 DocType: Holiday List,Weekly Off,Wekelijks Vrij
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Voor bijvoorbeeld 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +39,Provisional Profit / Loss (Credit),Voorlopige winst / verlies (Credit)
@@ -3186,16 +3231,16 @@
 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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: kostenplaats is verplicht voor Artikel {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +626,Get Items from Product Bundle,Krijg Items uit Product Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +605,Get Items from Product Bundle,Krijg Items uit Product Bundle
 DocType: Asset,Straight Line,Rechte lijn
 DocType: Project User,Project User,project Gebruiker
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} is inactive,Rekening {0} is niet actief
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} is inactive,Rekening {0} is niet actief
 DocType: GL Entry,Is Advance,Is voorschot
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Aanwezigheid Van Datum en Aanwezigheid Tot Datum zijn verplicht.
 apps/erpnext/erpnext/controllers/buying_controller.py +148,Please enter 'Is Subcontracted' as Yes or No,Vul 'Is Uitbesteed' in als Ja of Nee
 DocType: Sales Team,Contact No.,Contact Nr
 DocType: Bank Reconciliation,Payment Entries,betaling Entries
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,'Profit and Loss' type account {0} not allowed in Opening Entry,'Winst- en verliesrekening' rekeningtype {0} niet toegestaan in Openings Invoer
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +71,'Profit and Loss' type account {0} not allowed in Opening Entry,'Winst- en verliesrekening' rekeningtype {0} niet toegestaan in Openings Invoer
 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
@@ -3214,7 +3259,7 @@
 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,Commissie op de verkoop
 DocType: Offer Letter Term,Value / Description,Waarde / Beschrijving
-apps/erpnext/erpnext/controllers/accounts_controller.py +558,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Rij # {0}: Asset {1} kan niet worden ingediend, is het al {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +561,"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: Production Order,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}.
@@ -3227,13 +3272,13 @@
 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/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Legal Expenses,Juridische Kosten
 DocType: Purchase Invoice,Posting Time,Plaatsing Time
-DocType: Sales Order,% Amount Billed,% Gefactureerd Bedrag
+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.
 apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},Geen Artikel met Serienummer {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Open Meldingen
+DocType: Email Digest,Open Notifications,Open Meldingen
 DocType: Payment Entry,Difference Amount (Company Currency),Verschil Bedrag (Company Munt)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,Directe Kosten
 apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
@@ -3241,7 +3286,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Nieuwe klant Revenue
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,Reiskosten
 DocType: Maintenance Visit,Breakdown,Storing
-apps/erpnext/erpnext/controllers/accounts_controller.py +634,Account: {0} with currency: {1} can not be selected,Account: {0} met valuta: {1} kan niet worden geselecteerd
+apps/erpnext/erpnext/controllers/accounts_controller.py +637,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}
 DocType: Program Enrollment Tool,Student Applicants,student Aanvragers
@@ -3249,15 +3294,15 @@
 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 +56,Probation,proeftijd
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Probation,proeftijd
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,salaris Components
 DocType: Program Enrollment Tool,New Academic Year,New Academisch Jaar
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Payment of salary for the month {0} and year {1},Betaling van salaris voor de maand {0} en jaar {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Payment of salary for the month {0} and year {1},Betaling van salaris voor de maand {0} en jaar {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Auto insert Prijslijst tarief als vermist
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Totale betaalde bedrag
 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 +144,Planning,planning
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,planning
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,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
@@ -3270,11 +3315,10 @@
 DocType: Sales Partner,Contact Desc,Contact Omschr
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Type verloven zoals, buitengewoon, ziekte, etc."
 DocType: Email Digest,Send regular summary reports via Email.,Stuur regelmatige samenvattende rapporten via e-mail.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Sales invoice submitted sucessfully.,Verkoopfactuur met succes ingediend.
 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}
 DocType: Assessment Result,Student Name,Studenten naam
-apps/erpnext/erpnext/hooks.py +104,Assessment Schedule,assessment Schedule
+apps/erpnext/erpnext/hooks.py +113,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
@@ -3284,6 +3328,7 @@
 DocType: GL Entry,Party Type,partij Type
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +78,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
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Salaris sjabloon stam .
 DocType: Leave Type,Max Days Leave Allowed,Max Dagen Verlof toegestaan
@@ -3295,18 +3340,19 @@
 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 +99,All Customer Groups,Alle Doelgroepen
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +78,Accumulated Monthly,verzameld Maandelijkse
-apps/erpnext/erpnext/controllers/accounts_controller.py +595,{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/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Alle Doelgroepen
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +81,Accumulated Monthly,verzameld Maandelijkse
+apps/erpnext/erpnext/controllers/accounts_controller.py +598,{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
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Prijslijst Tarief (Bedrijfsvaluta)
 DocType: Products Settings,Products Settings,producten Instellingen
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +188,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
 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 +84,Secretary,secretaresse
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,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
@@ -3315,24 +3361,22 @@
 ,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
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,Rij # {0}: Serienummer is verplicht
+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 +859,Supplier Quotation,Leverancier Offerte
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +838,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 +7,Collect Fees,Verzamel Vergoedingen
+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}
 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.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Geplande evenementen
 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
-DocType: Email Digest,Income / Expense,Inkomsten / Uitgaven
 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."
@@ -3344,13 +3388,14 @@
 DocType: Customer,From Lead,Van Lead
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Orders vrijgegeven voor productie.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Selecteer boekjaar ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,POS Profile required to make POS Entry,POS profiel nodig om POS Entry maken
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +509,POS Profile required to make POS Entry,POS profiel nodig om POS Entry maken
 DocType: Program Enrollment Tool,Enroll Students,inschrijven Studenten
 DocType: Hub Settings,Name Token,Naam Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standaard Verkoop
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Atleast one warehouse is mandatory,Tenminste een magazijn is verplicht
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +129,Atleast one warehouse is mandatory,Tenminste een magazijn is verplicht
 DocType: Serial No,Out of Warranty,Uit de garantie
 DocType: BOM Replace Tool,Replace,Vervang
+DocType: Production Order,Unstopped,ontsloten
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{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
@@ -3371,10 +3416,11 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Verloven moeten in veelvouden van 0,5 worden toegewezen"
 DocType: Production Order,Operation Cost,Operatie Cost
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,Upload aanwezigheid uit een .csv-bestand
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Openstaande Amt
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Set richt Item Group-wise voor deze verkoper.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Bevries Voorraden ouder dan [dagen]
-apps/erpnext/erpnext/controllers/accounts_controller.py +528,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Rij # {0}: Asset is verplicht voor vaste activa aankoop / verkoop
+apps/erpnext/erpnext/controllers/accounts_controller.py +531,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Rij # {0}: Asset is verplicht voor vaste activa aankoop / verkoop
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Als twee of meer Pricing Regels zijn gevonden op basis van de bovenstaande voorwaarden, wordt prioriteit toegepast. Prioriteit is een getal tussen 0 en 20, terwijl standaardwaarde nul (blanco). Hoger aantal betekent dat het voorrang krijgen als er meerdere prijzen Regels met dezelfde voorwaarden."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Boekjaar: {0} bestaat niet
 DocType: Currency Exchange,To Currency,Naar Valuta
@@ -3391,15 +3437,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Klantenfeedback
 DocType: Account,Expense,Kosten
-DocType: Sales Invoice,Exhibition,Tentoonstelling
 apps/erpnext/erpnext/utilities/doctype/address/address.py +77,"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 +81,Syntax error in formula or condition: {0},Syntaxisfout in formule of aandoening: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +92,Syntax error in formula or condition: {0},Syntaxisfout in formule of aandoening: {0}
 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
+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 +28,Jobs,Jobs
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,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
@@ -3408,16 +3454,16 @@
 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 +763,Make Supplier Quotation,Maak Leverancier Offerte
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,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/controllers/sales_and_purchase_return.py +100,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 +42,Casual Leave,Casual Leave
+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
 DocType: Batch,Batch ID,Partij ID
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,Note: {0},Opmerking : {0}
 ,Delivery Note Trends,Vrachtbrief Trends
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +103,This Week's Summary,Samenvatting van deze week
+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
 DocType: Student Group Creation Tool,Get Courses,krijg Cursussen
 DocType: GL Entry,Party,Partij
@@ -3427,7 +3473,7 @@
 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 +59,Piecework,stukwerk
+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
 DocType: Task,Actual Time (in Hours),Werkelijke tijd (in uren)
 DocType: Employee,History In Company,Geschiedenis In Bedrijf
@@ -3444,7 +3490,7 @@
 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.
 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 +162,Black,Zwart
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,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
@@ -3455,13 +3501,13 @@
 DocType: Project Task,Pending Review,In afwachting van Beoordeling
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +106,"Asset {0} cannot be scrapped, as it is already {1}","Asset {0} kan niet worden gesloopt, want het is al {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Total Expense Claim (via Expense Claim)
-apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +69,Customer Id,Klantnummer
+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
 DocType: Journal Entry Account,Exchange Rate,Wisselkoers
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Sales Order {0} is not submitted,Verkooporder {0} is niet ingediend
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +527,Sales Order {0} is not submitted,Verkooporder {0} is niet ingediend
 DocType: Homepage,Tag Line,tag Line
 DocType: Fee Component,Fee Component,fee Component
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +857,Add items from,Items uit voegen
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +836,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}
 DocType: Cheque Print Template,Regular,regelmatig
 DocType: BOM,Last Purchase Rate,Laatste inkooptarief
@@ -3469,6 +3515,7 @@
 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.
 ,Sales Person-wise Transaction Summary,Verkopergebaseerd Transactie Overzicht
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +60,Cost Center is required for 'Profit and Loss' account {0}. Please set up a default Cost Center for the Company.,Cost Center is nodig voor &#39;Winst- en verliesrekening&#39; account {0}. Gelieve het opzetten van een standaard kostenplaats voor de onderneming.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,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
@@ -3479,12 +3526,12 @@
 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 +710,Online,Online
+apps/erpnext/erpnext/accounts/page/pos/pos.js +692,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 +16,Setting this Address Template as default as there is no other default,Dit adres Template instellen als standaard als er geen andere standaard
+apps/erpnext/erpnext/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
 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 +74,Quality Management,Quality Management
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,Quality Management
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,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
@@ -3506,11 +3553,12 @@
 DocType: Student,Student Email ID,Student Email ID
 DocType: Employee,Notice (days),Kennisgeving ( dagen )
 DocType: Tax Rule,Sales Tax Template,Sales Tax Template
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1520,Select items to save the invoice,Selecteer items om de factuur te slaan
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1544,Select items to save the invoice,Selecteer items om de factuur te slaan
 DocType: Employee,Encashment Date,Betalingsdatum
 DocType: Account,Stock Adjustment,Voorraad aanpassing
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Default Activiteit Kosten bestaat voor Activity Type - {0}
 DocType: Production Order,Planned Operating Cost,Geplande bedrijfskosten
+DocType: Academic Term,Term Start Date,Term Startdatum
 apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},In bijlage vindt u {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Bankafschrift saldo per General Ledger
 DocType: Job Applicant,Applicant Name,Aanvrager Naam
@@ -3540,17 +3588,17 @@
 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.
 DocType: Company,Distribution,Distributie
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +8,Amount Paid,Betaald bedrag
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Project Manager,Project Manager
+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
 ,Quoted Item Comparison,Geciteerd Item Vergelijking
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Dispatch,Dispatch
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,Dispatch
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Maximale korting toegestaan voor artikel: {0} is {1}%
 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 .
-DocType: Sales Invoice,Supplier Reference,Leverancier Referentie
-apps/erpnext/erpnext/accounts/page/pos/pos.js +844,"Master data syncing, it might take some time","Master data synchronisatie, kan het enige tijd duren"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +832,"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
@@ -3564,7 +3612,7 @@
 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 +83,Error in formula or condition,Fout in formule of aandoening
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,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
@@ -3573,7 +3621,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},Tot Datum moet binnen het boekjaar vallenn. Ervan uitgaande dat Tot Datum = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Hier kunt u onderhouden lengte, gewicht, allergieën, medische zorgen, enz."
 DocType: Leave Block List,Applies to Company,Geldt voor Bedrijf
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +197,Cannot cancel because submitted Stock Entry {0} exists,Kan niet annuleren omdat ingediende Voorraad Invoer {0} bestaat
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +198,Cannot cancel because submitted Stock Entry {0} exists,Kan niet annuleren omdat ingediende Voorraad Invoer {0} bestaat
 DocType: Purchase Invoice,In Words,In Woorden
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,Today is {0}'s birthday!,Vandaag is {0} 's verjaardag!
 DocType: Production Planning Tool,Material Request For Warehouse,Materiaal Aanvraag voor magazijn
@@ -3583,14 +3631,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,Uw financiële jaar begint op
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Asset Afschrijvingen en Weegschalen
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +319,Amount {0} {1} transferred from {2} to {3},Bedrag {0} {1} overgebracht van {2} naar {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +322,Amount {0} {1} transferred from {2} to {3},Bedrag {0} {1} overgebracht van {2} naar {3}
 DocType: Sales Invoice,Get Advances Received,Get ontvangen voorschotten
 DocType: Email Digest,Add/Remove Recipients,Toevoegen / verwijderen Ontvangers
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +432,Transaction not allowed against stopped Production Order {0},Transactie niet toegestaan met gestopte productieorder {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +437,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 +143,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 +652,Item variant {0} exists with same attributes,Artikel variant {0} bestaat met dezelfde kenmerken
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Artikel variant {0} bestaat met dezelfde kenmerken
+DocType: Leave Application,LAP/,RONDE/
 DocType: Salary Slip,Salary Slip,Salarisstrook
 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
@@ -3598,12 +3647,12 @@
 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 +212,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 +215,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/public/js/controllers/transaction.js +866,It is needed to fetch Item Details.,Het is nodig om Item Details halen.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +857,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
@@ -3613,14 +3662,14 @@
 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 +178,Invalid {0},Ongeldige {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Sick Leave,Ziekteverlof
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,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
 DocType: Warehouse,PIN,PIN
 DocType: Sales Invoice,Base Change Amount (Company Currency),Base Change Bedrag (Company Munt)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +313,No accounting entries for the following warehouses,Geen boekingen voor de volgende magazijnen
-apps/erpnext/erpnext/projects/doctype/project/project.js +102,Save the document first.,Sla het document eerst.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +314,No accounting entries for the following warehouses,Geen boekingen voor de volgende magazijnen
+apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Sla het document eerst.
 DocType: Account,Chargeable,Aan te rekenen
 DocType: Company,Change Abbreviation,Afkorting veranderen
 DocType: Expense Claim Detail,Expense Date,Kosten Datum
@@ -3633,10 +3682,9 @@
 DocType: Purchase Invoice,Recurring Print Format,Terugkerende Print Format
 DocType: C-Form,Series,Reeksen
 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
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,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
 DocType: Appraisal,Appraisal Template,Beoordeling Sjabloon
 DocType: Item Group,Item Classification,Item Classificatie
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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
@@ -3646,8 +3694,8 @@
 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 +940,Please select {0} first,Selecteer eerst {0}
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +749,Batch {0} of Item {1} has expired.,Batch {0} van Item {1} is verlopen.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +953,Please select {0} first,Selecteer eerst {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +757,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
@@ -3675,8 +3723,8 @@
  {% 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 +92,Warehouse not found in the system,Magazijn niet gevonden in het systeem
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +106,This Month's Summary,Samenvatting van deze maand
+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
 DocType: Quality Inspection Reading,Quality Inspection Reading,Kwaliteitscontrole Meting
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,'Bevries Voorraden Ouder dan' moet minder dan %d dagen zijn.
 DocType: Tax Rule,Purchase Tax Template,Kopen Tax Template
@@ -3686,21 +3734,22 @@
 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 +87,Please set Next Depreciation Date,Stel Volgende Afschrijvingen Date
-DocType: Payment Gateway,Payment Gateway,Payment Gateway
 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 +378,Operation Time must be greater than 0 for Operation {0},Operatie tijd moet groter zijn dan 0 voor de operatie zijn {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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/accounts/doctype/account/account.py +170,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)
 DocType: Program,Program Abbreviation,programma Afkorting
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,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: Appraisal,Start Date,Startdatum
@@ -3716,21 +3765,22 @@
 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
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Bijv. smsgateway.com / api / send_sms.cgi
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +27,Transaction currency must be same as Payment Gateway currency,Transactie valuta moet hetzelfde zijn als Payment Gateway valuta
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Transaction currency must be same as Payment Gateway currency,Transactie valuta moet hetzelfde zijn als Payment Gateway valuta
 DocType: Payment Entry,Receive,Ontvangen
+apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,citaten:
 DocType: Maintenance Visit,Fully Completed,Volledig afgerond
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% voltooid
 DocType: Employee,Educational Qualification,Educatieve Kwalificatie
 DocType: Workstation,Operating Costs,Bedrijfskosten
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Actie als gezamenlijke maandelijkse budget overschreden
 DocType: Purchase Invoice,Submit on creation,Toevoegen aan de creatie
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +432,Currency for {0} must be {1},Munt voor {0} moet {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +435,Currency for {0} must be {1},Munt voor {0} moet {1}
 DocType: Asset,Disposal Date,verwijdering Date
 DocType: Employee Leave Approver,Employee Leave Approver,Werknemer Verlof Fiatteur
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,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 +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/crm/doctype/opportunity/opportunity.py +79,"Cannot declare as lost, because Quotation has been made.","Kan niet als verloren instellen, omdat offerte is gemaakt."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Aankoop Master Manager
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +429,Production Order {0} must be submitted,Productie Order {0} moet worden ingediend
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +434,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
@@ -3740,25 +3790,27 @@
 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/accounts/report/general_ledger/general_ledger.py +181,Totals,Totalen
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,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 +113,Warning: Leave application contains following block dates,Waarschuwing: Verlof applicatie bevat volgende blok data
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +120,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.
+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 +181,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/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 +793,All records are synced.,Alle records zijn gesynchroniseerd.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +781,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
 DocType: Cost Center,Cost Center Name,Kostenplaats Naam
@@ -3777,21 +3829,20 @@
 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/selling/doctype/quotation/quotation.py +49,Cannot set as Lost as Sales Order is made.,"Kan niet als verloren instellen, omdat er al een verkooporder is gemaakt."
-DocType: Student Applicant,Mother's Name,Moeders naam
 DocType: Request for Quotation Item,Supplier Part No,Leverancier Part No
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +348,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Kan niet aftrekken als categorie is voor &#39;Valuation&#39; of &#39;Vaulation en Total&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Received From,Gekregen van
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Received From,Gekregen van
 DocType: Lead,Converted,Omgezet
 DocType: Item,Has Serial No,Heeft Serienummer
 DocType: Employee,Date of Issue,Datum van afgifte
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{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 +93,Row {0}: Hours value must be greater than zero.,Rij {0}: Aantal uren moet groter zijn dan nul.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +117,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
 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 +172,{0} {1} does not exist,{0} {1} bestaat niet
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +175,{0} {1} does not exist,{0} {1} bestaat niet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,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 +72,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
@@ -3800,13 +3851,14 @@
 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/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
 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 +109,Electrical,elektrisch
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,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 +318,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}
@@ -3814,7 +3866,7 @@
 DocType: Item,Customer Code,Klantcode
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +210,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 +292,Debit To account must be a Balance Sheet account,Debitering van rekening moet een balansrekening zijn
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To account must be a Balance Sheet account,Debitering van rekening moet een balansrekening zijn
 DocType: Buying Settings,Naming Series,Benoemen Series
 DocType: Leave Block List,Leave Block List Name,Laat Block List Name
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Voorraad Activa
@@ -3826,11 +3878,11 @@
 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 +301,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 +313,Salary Slip of employee {0} already created for time sheet {1},Loonstrook van de werknemer {0} al gemaakt voor urenregistratie {1}
 DocType: Sales Order Item,Ordered Qty,Besteld Aantal
-apps/erpnext/erpnext/stock/doctype/item/item.py +673,Item {0} is disabled,Punt {0} is uitgeschakeld
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,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 +838,BOM does not contain any stock item,BOM geen voorraad artikel bevatten
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +809,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.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Genereer Salarisstroken
@@ -3838,23 +3890,24 @@
 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)
-apps/erpnext/erpnext/stock/doctype/item/item.py +485,Row #{0}: Please set reorder quantity,Rij # {0}: Stel nabestelling hoeveelheid
+DocType: Sales Invoice Timesheet,Billing Hours,Billing Hours
+apps/erpnext/erpnext/stock/doctype/item/item.py +487,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 +62,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
+DocType: Payment Entry,Allocate Payment Amount,Toewijzen Betaling Bedrag
 DocType: Employee External Work History,Salary,Salaris
 DocType: Serial No,Delivery Document Type,Levering Soort document
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Dien alle salarisstroken in voor de bovenstaande geselecteerde criteria
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} items gesynchroniseerd
 DocType: Sales Order,Partly Delivered,Deels geleverd
-DocType: Sales Invoice,Existing Customer,Bestaande klant
 DocType: Email Digest,Receivables,Debiteuren
+DocType: Lead Source,Lead Source,Lead Bron
 DocType: Customer,Additional information regarding the customer.,Aanvullende informatie over de klant.
 DocType: Quality Inspection Reading,Reading 5,Meting 5
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +38,Campaign Name is required,Campagne Naam is vereist
 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
@@ -3862,10 +3915,9 @@
 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 +129,BOM and Manufacturing Quantity are required,BOM en Productie Hoeveelheid nodig
+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/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Vergrijzing Range 2
 DocType: SG Creation Tool Course,Max Strength,Max Strength
-DocType: Bank Reconciliation Detail,Amount,Bedrag
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Stuklijst vervangen
 ,Sales Analytics,Verkoop analyse
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +113,Available {0},Beschikbaar {0}
@@ -3873,14 +3925,14 @@
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Het opzetten van e-mail
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +96,Please enter default currency in Company Master,Vul de standaard valuta in in Bedrijfsstam
 DocType: Stock Entry Detail,Stock Entry Detail,Voorraadtransactie Detail
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +100,Daily Reminders,Dagelijkse herinneringen
+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/account/account_tree.js +23,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 +71,Customer Service,Klantenservice
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Customer Service,Klantenservice
 DocType: Homepage Featured Product,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.
@@ -3889,8 +3941,9 @@
 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
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Standaard Work In Progress Warehouse
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1570,Total nos of serial no is not equal to quantity.,Totaal nos van het serienummer is niet gelijk aan kwantiteit.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1594,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
@@ -3898,9 +3951,10 @@
 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 +82,Engineer,Ingenieur
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,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 +370,Item Code required at Row No {0},Artikelcode vereist bij rijnummer {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +398,Item Code required at Row No {0},Artikelcode vereist bij rijnummer {0}
 DocType: Sales Partner,Partner Type,Partner Type
 DocType: Purchase Taxes and Charges,Actual,Werkelijk
 DocType: Authorization Rule,Customerwise Discount,Klantgebaseerde Korting
@@ -3916,16 +3970,18 @@
 DocType: BOM,Raw Material Cost,Grondstofprijzen
 DocType: Item Reorder,Re-Order Level,Re-order Niveau
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Voer de artikelen en geplande aantallen in waarvoor u productieorders wilt aanmaken, of grondstoffen voor analyse wilt downloaden."
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +55,Part-time,Deeltijds
+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
 DocType: Employee,Applicable Holiday List,Toepasselijk Holiday Lijst
 DocType: Employee,Cheque,Cheque
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Reeks bijgewerkt
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +57,Series Updated,Reeks bijgewerkt
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Rapport type is verplicht
 DocType: Item,Serial Number Series,Serienummer Reeksen
 apps/erpnext/erpnext/buying/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 +87,Clearance Date updated,Ontruiming Geactualiseerd
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Succesvol Afgeletterd
@@ -3939,7 +3995,7 @@
 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 +513,Posting date and posting time is mandatory,Plaatsingsdatum en -tijd is verplicht
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Plaatsingsdatum en -tijd is verplicht
 apps/erpnext/erpnext/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
@@ -3949,7 +4005,7 @@
 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/stock/doctype/stock_entry/stock_entry.py +158,Target warehouse in row {0} must be same as Production Order,Doel magazijn in rij {0} moet hetzelfde zijn als productieorder
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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
 DocType: Company,Round Off Account,Afronden Account
@@ -3958,23 +4014,22 @@
 DocType: Customer Group,Parent Customer Group,Bovenliggende klantgroep
 DocType: Purchase Invoice,Contact Email,Contact E-mail
 DocType: Appraisal Goal,Score Earned,Verdiende Score
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Notice Period,Opzegtermijn
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,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 +4,New Sales Person Name,Nieuwe Sales Person Naam
 DocType: Packing Slip,Gross Weight UOM,Bruto Gewicht Eenheid
-DocType: Email Digest,Receivables / Payables,Debiteuren / Crediteuren
 DocType: Delivery Note Item,Against Sales Invoice,Tegen Sales Invoice
 DocType: Bin,Reserved Qty for Production,Aantal voorbehouden voor productie
 DocType: Asset,Frequency of Depreciation (Months),Frequentie van afschrijvingen (Maanden)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +469,Credit Account,Credit Account
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Credit Account,Credit Account
 DocType: Landed Cost Item,Landed Cost Item,Vrachtkosten Artikel
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +55,Show zero values,Toon nulwaarden
+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
 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 +647,Please specify Attribute Value for attribute {0},Geef aub attribuut Waarde voor kenmerk {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Geef aub attribuut Waarde voor kenmerk {0}
 DocType: Item,Default Warehouse,Standaard Magazijn
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +39,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
@@ -3996,19 +4051,22 @@
 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
-DocType: Sales Invoice,Cold Calling,Cold Calling
 DocType: SMS Parameter,SMS Parameter,SMS Parameter
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,Begroting en Cost Center
 DocType: Maintenance Schedule Item,Half Yearly,Halfjaarlijkse
 DocType: Lead,Blog Subscriber,Blog Abonnee
+DocType: Guardian,Alternate Number,Alternate Number
 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.
+DocType: Stock Reconciliation Item,Quantity Difference,Aantal Verschil
 apps/erpnext/erpnext/config/hr.py +253,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 +141,Set as Lost,Instellen als Verloren
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,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 +5,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
 DocType: Supplier,Credit Days Based On,Credit dagen op basis van
@@ -4020,11 +4078,10 @@
 ,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 +941,Select or add new customer,Selecteer of voeg nieuwe klant
+apps/erpnext/erpnext/accounts/page/pos/pos.js +930,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 +5,This is based on the attendance of this Employee,Dit is gebaseerd op de aanwezigheid van deze werknemer
-DocType: Sales Invoice,Frequency,Frequentie
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +463,Debit Account,Debetrekening
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,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)
@@ -4033,27 +4090,27 @@
 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 +210,Supplier Quotation {0} created,Leverancier Offerte {0} aangemaakt
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +208,Supplier Quotation {0} created,Leverancier Offerte {0} aangemaakt
 apps/erpnext/erpnext/accounts/report/financial_statements.py +90,End Year cannot be before Start Year,Eindjaar kan niet voor Start Jaar
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Employee Benefits,Employee Benefits
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,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 +228,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 +232,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 +499,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 +500,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 +1007,Price List not found or disabled,Prijslijst niet gevonden of uitgeschakeld
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1008,Price List not found or disabled,Prijslijst niet gevonden of uitgeschakeld
 DocType: Expense Claim,Approved,Aangenomen
 DocType: Pricing Rule,Price,prijs
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +244,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 +256,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
@@ -4064,12 +4121,12 @@
 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 +259,Please select Employee Record first.,Selecteer eerst Werknemer Record.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +266,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 +190,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 +235,Please enter Expense Account,Vul Kostenrekening in
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,Please enter Expense Account,Vul Kostenrekening in
 DocType: Account,Stock,Voorraad
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,"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 +976,"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
@@ -4084,9 +4141,10 @@
 DocType: Asset Movement,Transaction Date,Transactie Datum
 DocType: Production Plan Item,Planned Qty,Gepland Aantal
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,Total Tax
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,For Quantity (Manufactured Qty) is mandatory,Voor Hoeveelheid (Geproduceerd Aantal) is verplicht
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,For Quantity (Manufactured Qty) is mandatory,Voor Hoeveelheid (Geproduceerd Aantal) is verplicht
 DocType: Stock Entry,Default Target Warehouse,Standaard Doelmagazijn
 DocType: Purchase Invoice,Net Total (Company Currency),Netto Totaal (Bedrijfsvaluta)
+apps/erpnext/erpnext/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 +78,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: Production Order,Actual Start Date,Werkelijke Startdatum
@@ -4101,9 +4159,11 @@
 DocType: Warranty Claim,If different than customer address,Indien anders dan klantadres
 DocType: BOM Operation,BOM Operation,Stuklijst Operatie
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Aantal van vorige rij
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +226,Transfer Asset,Transfer Asset
+DocType: Student,Home Address,Thuisadres
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +227,Transfer Asset,Transfer Asset
 DocType: POS Profile,POS Profile,POS Profiel
 apps/erpnext/erpnext/config/schools.py +33,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 +129,"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
@@ -4113,8 +4173,8 @@
 DocType: Assessment,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 +765,Material to Supplier,Materiaal aan Leverancier
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +189,Excise Invoice,Accijnzen Factuur
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,Material to Supplier,Materiaal aan Leverancier
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,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
@@ -4124,7 +4184,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,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 +136,Credit Card,Kredietkaart
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,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 .
 DocType: Purchase Invoice,Next Date,Volgende datum
@@ -4132,6 +4192,7 @@
 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: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Hier kunt u onderhouden familie gegevens zoals naam en beroep van de ouder, echtgenoot en kinderen"
+DocType: Academic Term,Term End Date,Term Einddatum
 DocType: Hub Settings,Seller Name,Verkoper Naam
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Belastingen en Toeslagen afgetrokken (Bedrijfsvaluta)
 DocType: Item Group,General Settings,Algemene Instellingen
@@ -4143,7 +4204,7 @@
 DocType: Customer,Commission Rate,Commissie Rate
 apps/erpnext/erpnext/stock/doctype/item/item.js +261,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 +115,"Payment Type must be one of Receive, Pay and Internal Transfer","Betaling Type moet een van te ontvangen, betalen en Internal Transfer"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +118,"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/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Winkelwagen is leeg
 DocType: Production Order,Actual Operating Cost,Werkelijke operationele kosten
@@ -4158,10 +4219,10 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,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 +92,Designer,Ontwerper
+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
 DocType: Serial No,Delivery Details,Levering Details
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +469,Cost Center is required in row {0} in Taxes table for type {1},Kostenplaats is vereist in regel {0} in Belastingen tabel voor type {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +472,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
 ,Item-wise Purchase Register,Artikelgebaseerde Inkoop Register
 DocType: Batch,Expiry Date,Vervaldatum
@@ -4171,12 +4232,12 @@
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Project stam.
 apps/erpnext/erpnext/controllers/status_updater.py +174,"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 +417, (Half Day),(Halve Dag)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425, (Half Day),(Halve Dag)
 DocType: Supplier,Credit Days,Credit Dagen
 DocType: Leave Type,Is Carry Forward,Is Forward Carry
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +740,Get Items from BOM,Artikelen ophalen van Stuklijst
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +711,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 +549,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/controllers/accounts_controller.py +552,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
diff --git a/erpnext/translations/no.csv b/erpnext/translations/no.csv
index 600e889..879f9ca 100644
--- a/erpnext/translations/no.csv
+++ b/erpnext/translations/no.csv
@@ -18,11 +18,10 @@
 DocType: Sales Partner,Dealer,Dealer
 DocType: Employee,Rented,Leide
 DocType: Purchase Order,PO-,PO-
-apps/erpnext/erpnext/accounts/report/financial_statements.py +19,Start Year {0} not found.,Begynn År {0} ble ikke funnet.
 DocType: POS Profile,Applicable for User,Gjelder for User
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +191,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Stoppet produksjonsordre kan ikke avbestilles, Døves det første å avbryte"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +197,Do you really want to scrap this asset?,Har du virkelig ønsker å hugge denne eiendelen?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +17,Select Default Supplier,Velg Standard Leverandør
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +192,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Stoppet produksjonsordre kan ikke avbestilles, Døves det første å avbryte"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +198,Do you really want to scrap this asset?,Har du virkelig ønsker å hugge denne eiendelen?
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Velg Standard Leverandør
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Valuta er nødvendig for Prisliste {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Vil bli beregnet i transaksjonen.
 DocType: Address,County,fylke
@@ -42,46 +41,45 @@
 DocType: Sales Invoice,Customer Name,Kundenavn
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +126,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 +180,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 +183,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 +148,Series Updated Successfully,Serien er oppdatert
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +149,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
-DocType: Quality Inspection Reading,Parameter,Parameter
 apps/erpnext/erpnext/projects/doctype/project/project.py +54,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 +239,New Leave Application,New La Application
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,New Leave Application,New La Application
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +20,Attendance Record {0} exists against Student {1} for Course Schedule {2},Oppmøte Record {0} finnes mot Student {1} for kursplanen {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Bank Draft,Bank Draft
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,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
 DocType: Academic Term,Academic Term,semester
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +13,Material,Materiale
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Quantity,Antall
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +511,Accounts table cannot be blank.,Regnskap bordet kan ikke være tomt.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +616,Quantity,Antall
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +512,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)
 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/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 +142,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
-DocType: Purchase Invoice,Monthly,Månedlig
 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/buying/doctype/purchase_order/purchase_order.js +771,Invoice,Faktura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +750,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 +198,Row {0}: {1} {2} does not match with {3},Rad {0}: {1} {2} samsvarer ikke med {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Row # {0}:
+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 +127,Please select Price List,Vennligst velg Prisliste
@@ -112,8 +110,8 @@
 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 +589,Get items from,Få elementer fra
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +382,Stock cannot be updated against Delivery Note {0},Stock kan ikke oppdateres mot følgeseddel {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Få elementer fra
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,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
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Dagligvare
@@ -122,7 +120,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 +156,Salary Structure Missing,Lønn Struktur Missing
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,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
@@ -130,10 +128,11 @@
 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 +156,Credit limit has been crossed for customer {0} {1}/{2},Kredittgrense er krysset for kunde {0} {1} / {2}
-apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Er Fixed Asset&quot; ikke kan være ukontrollert, som Asset post eksisterer mot elementet"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +189,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"
 DocType: Tax Rule,Tax Type,Skatt Type
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +144,You are not authorized to add or update entries before {0},Du er ikke autorisert til å legge til eller oppdatere bloggen før {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,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/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
@@ -143,18 +142,17 @@
 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 +165,Opening,Åpning
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,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/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Customer&gt; Kunde Group&gt; Territory
 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.
 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
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Company first,Vennligst velg selskapet først
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,Please select Company first,Vennligst velg selskapet først
 DocType: Employee Education,Under Graduate,Under Graduate
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Target På
 DocType: BOM,Total Cost,Totalkostnad
@@ -164,7 +162,7 @@
 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
 DocType: Purchase Invoice Item,Is Fixed Asset,Er Fast Asset
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Available qty is {0}, you need {1}","Tilgjengelig stk er {0}, må du {1}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +225,"Available qty is {0}, you need {1}","Tilgjengelig stk er {0}, må du {1}"
 DocType: Expense Claim Detail,Claim Amount,Krav Beløp
 DocType: Employee,Mr,Mr
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Leverandør Type / leverandør
@@ -173,25 +171,26 @@
 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: Assessment Result,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 +171,Annual Salary,Årslønn
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Annual Salary,Årslønn
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Aksje Utgifter
-apps/erpnext/erpnext/accounts/report/financial_statements.py +22,End Year {0} not found.,Slutt År {0} ble ikke funnet.
 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}
 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 +130,At least one mode of payment is required for POS invoice.,I det minste én modus av betaling er nødvendig for POS faktura.
 DocType: Products Settings,Show Products as a List,Vis produkter på en liste
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Last ned mal, fyll riktige data og fest den endrede filen. Alle datoer og ansatt kombinasjon i den valgte perioden vil komme i malen, med eksisterende møteprotokoller"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +451,Item {0} is not active or end of life has been reached,Element {0} er ikke aktiv eller slutten av livet er nådd
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +456,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/controllers/accounts_controller.py +614,"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/controllers/accounts_controller.py +617,"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 +166,Settings for HR Module,Innstillinger for HR Module
 DocType: SMS Center,SMS Center,SMS-senter
 DocType: Sales Invoice,Change Amount,endring Beløp
@@ -203,13 +202,13 @@
 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 +147,Execution,Execution
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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/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}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,Cost Center {0} does not belong to Company {1},Kostnadssteds {0} ikke tilhører selskapet {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +100,Cost Center {0} does not belong to Company {1},Kostnadssteds {0} ikke tilhører selskapet {1}
 DocType: Customer,Individual,Individuell
 DocType: Interest,Academics User,akademikere Bruker
 DocType: Cheque Print Template,Amount In Figure,Beløp I figur
@@ -225,30 +224,32 @@
 DocType: Production Planning Tool,Sales Orders,Salgsordrer
 DocType: Purchase Taxes and Charges,Valuation,Verdivurdering
 ,Purchase Order Trends,Innkjøpsordre Trender
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,The request for quotation can be accessed by clicking on the following link,Anmodningen om sitatet kan nås ved å klikke på følgende link
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,Bevilge blader for året.
 DocType: SG Creation Tool Course,SG Creation Tool Course,SG Creation Tool Course
 DocType: Student Group Creation Tool,Leave blank if you wish to fetch all courses for selected academic term,La det stå tomt hvis du ønsker å hente alle kurs for valgt semester
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,Insufficient Stock,utilstrekkelig Stock
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227,Insufficient Stock,utilstrekkelig Stock
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Deaktiver kapasitetsplanlegging og Time Tracking
+DocType: Email Digest,New Sales Orders,Nye salgsordrer
 DocType: Bank Reconciliation,Bank Account,Bankkonto
 DocType: Leave Type,Allow Negative Balance,Tillat negativ saldo
 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/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} does not belong to Company {1},Konto {0} tilhører ikke selskapet {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +86,Account {0} does not belong to Company {1},Konto {0} tilhører ikke selskapet {1}
 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}
 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
 DocType: Course Schedule,Instructor Name,instruktør Name
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,For Warehouse is required before Submit,For Warehouse er nødvendig før Send
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,For Warehouse is required before Submit,For Warehouse er nødvendig før Send
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Mottatt On
 DocType: Sales Partner,Reseller,Reseller
 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 +1436,"LocalStorage is full , did not save","Localstorage er full, ikke spare"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1460,"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}
@@ -261,18 +262,19 @@
 apps/erpnext/erpnext/templates/generators/item.html +78,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 +5,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/leave_application/leave_application.py +206,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/leave_application/leave_application.py +213,Only the selected Leave Approver can submit this Leave Application,Bare den valgte La Godkjenner kan sende dette La Application
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Lindrende Dato må være større enn tidspunktet for inntreden
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Leaves per Year,Later per år
+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 +103,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}
+DocType: Email Digest,Profit & Loss,Profitt tap
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,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 +435,Leave Blocked,La Blokkert
-apps/erpnext/erpnext/stock/doctype/item/item.py +669,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 +443,Leave Blocked,La Blokkert
+apps/erpnext/erpnext/stock/doctype/item/item.py +671,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 +83,Annual,Årlig
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +86,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
@@ -280,20 +282,22 @@
 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
 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 +91,Software Developer,Programvareutvikler
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,Programvareutvikler
 DocType: Item,Minimum Order Qty,Minimum Antall
 DocType: Pricing Rule,Supplier Type,Leverandør Type
 DocType: Scheduling Tool,Course Start Date,Kursstart
 DocType: Item,Publish in Hub,Publisere i Hub
+DocType: Student Admission,Student Admission,student Entre
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is cancelled,Element {0} er kansellert
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Material Request,Materialet Request
+apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} is cancelled,Element {0} er kansellert
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +823,Material Request,Materialet Request
 DocType: Bank Reconciliation,Update Clearance Date,Oppdater Lagersalg Dato
 apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +28,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 +328,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Element {0} ble ikke funnet i &#39;Råvare Leveres&#39; bord i innkjøpsordre {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +333,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Element {0} ble ikke funnet i &#39;Råvare Leveres&#39; bord i innkjøpsordre {1}
 DocType: Employee,Relation,Relasjon
 DocType: Shipping Rule,Worldwide Shipping,Worldwide Shipping
+DocType: Student Guardian,Mother,Mor
 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
@@ -309,20 +313,21 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +130,Please select Charge Type first,Vennligst velg Charge Type først
 DocType: Student Group Student,Student Group Student,Student Gruppe Student
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Siste
+DocType: Email Digest,New Quotations,Nye Sitater
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Den første La Godkjenner i listen vil bli definert som standard La Godkjenner
 DocType: Tax Rule,Shipping County,Shipping fylke
 apps/erpnext/erpnext/config/desktop.py +158,Learn,Lære
 DocType: Asset,Next Depreciation Date,Neste Avskrivninger Dato
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Aktivitet Kostnad per Employee
 DocType: Accounts Settings,Settings for Accounts,Innstillinger for kontoer
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +626,Supplier Invoice No exists in Purchase Invoice {0},Leverandør Faktura Ingen eksisterer i fakturaen {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +629,Supplier Invoice No exists in Purchase Invoice {0},Leverandør Faktura Ingen eksisterer i fakturaen {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Administrer Sales Person treet.
 DocType: Job Applicant,Cover Letter,Cover Letter
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Utestående Sjekker og Innskudd å tømme
 DocType: Item,Synced With Hub,Synkronisert Med Hub
 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 +348,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 +86,Circular Reference Error,Rundskriv Reference Error
@@ -334,15 +339,16 @@
 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 +806,Delivery Note,Levering Note
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +800,Delivery Note,Levering Note
 apps/erpnext/erpnext/config/learn.py +87,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 +233,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/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/setup/doctype/email_digest/email_digest.py +104,Summary for this week and pending activities,Oppsummering for denne uken og ventende aktiviteter
+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"
 DocType: Employee,Company Email,Selskapet E-post
@@ -354,27 +360,28 @@
 apps/erpnext/erpnext/config/hr.py +186,"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
-apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Kjøp Faktura kan ikke gjøres mot en eksisterende eiendel {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +554,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 +54,{0} already allocated for Employee {1} for period {2} to {3},{0} allerede bevilget for Employee {1} for perioden {2} til {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +812,Select Item,Velg element
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +791,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 \
 					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 +142,Purchase Invoice {0} is already submitted,Fakturaen {0} er allerede sendt
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch No må være samme som {1} {2}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +143,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.
 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 +342,Please see attachment,Vennligst se vedlegg
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,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 +19,Setup Already Complete!!,Oppsett Allerede Komplett !!
 ,Finished Goods,Ferdigvarer
 DocType: Delivery Note,Instructions,Bruksanvisning
 DocType: Quality Inspection,Inspected By,Inspisert av
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Leverandør&gt; Leverandør Type
 DocType: Maintenance Visit,Maintenance Type,Vedlikehold 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} tilhører ikke følgeseddel {1}
 apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Legg varer
@@ -388,29 +395,29 @@
 DocType: Currency Exchange,Currency Exchange,Valutaveksling
 DocType: Purchase Invoice Item,Item Name,Navn
 DocType: Authorization Rule,Approving User  (above authorized value),Godkjenne Bruker (ovenfor autorisert verdi)
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Credit Balance
+DocType: Email Digest,Credit Balance,Credit Balance
 DocType: Employee,Widowed,Enke
 DocType: Request for Quotation,Request for Quotation,Forespørsel om kostnadsoverslag
 DocType: Salary Slip Timesheet,Working Hours,Arbeidstid
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Endre start / strøm sekvensnummer av en eksisterende serie.
 apps/erpnext/erpnext/accounts/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 +736,Purchase Return,Kjøp Return
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +715,Purchase Return,Kjøp Return
 ,Purchase Register,Kjøp Register
 DocType: 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 +202,{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 +209,{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 +143,Reason for losing,Grunnen for å tape
-apps/erpnext/erpnext/accounts/utils.py +239,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 +163,Reason for losing,Grunnen for å tape
+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
 DocType: Announcement,Receiver,mottaker
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation er stengt på følgende datoer som per Holiday Liste: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Muligheter
 DocType: Employee,Single,Enslig
 DocType: Account,Cost of Goods Sold,Varekostnad
 DocType: Purchase Invoice,Yearly,Årlig
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +225,Please enter Cost Center,Skriv inn kostnadssted
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,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
@@ -423,26 +430,26 @@
 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
 DocType: Account,Is Group,Is Gruppe
+DocType: Email Digest,Pending Purchase Orders,Avventer innkjøpsordrer
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Automatisk Sett Serial Nos basert på FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Sjekk Leverandør fakturanummer Unikhet
 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 +102,Non Profit,Non Profit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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: Stock Reconciliation Item,Do not include symbols (ex. $),Ikke ta med symboler (ex. $)
 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 +638,Attribute {0} selected multiple times in Attributes Table,Attributtet {0} valgt flere ganger i attributter Table
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Attributtet {0} valgt flere ganger i attributter Table
 DocType: HR Settings,Employee record is created using selected field. ,Ansatt posten er opprettet ved hjelp av valgte feltet.
 DocType: Sales Order,Not Applicable,Gjelder ikke
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Holiday mester.
 DocType: Request for Quotation Item,Required Date,Nødvendig Dato
 DocType: Delivery Note,Billing Address,Fakturaadresse
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +862,Please enter Item Code.,Skriv inn Element Code.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +847,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"
@@ -456,12 +463,12 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Verdipapirer og innskudd
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Totalt blader tildelte er obligatorisk
 DocType: Job Opening,Description of a Job Opening,Beskrivelse av en ledig jobb
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Pending activities for today,Ventende aktiviteter for i dag
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Ventende aktiviteter for i dag
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Tilskuerrekord.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Lønn Component for timebasert lønn.
 DocType: Sales Order Item,Used for Production Plan,Brukes for Produksjonsplan
 DocType: Manufacturing Settings,Time Between Operations (in mins),Time Between Operations (i minutter)
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +92,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} budsjettet for kontoen {1} mot kostnadssted {2} er {3}. Det vil overstige ved {4}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +95,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} budsjettet for kontoen {1} mot kostnadssted {2} er {3}. Det vil overstige ved {4}
 DocType: Customer,Buyer of Goods and Services.,Kjøper av varer og tjenester.
 DocType: Journal Entry,Accounts Payable,Leverandørgjeld
 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
@@ -469,16 +476,16 @@
 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/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 +86,Administrative Officer,Administrative Officer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,Administrative Officer
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +23,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 +319,Please select Company,Vennligst velg selskapet
-DocType: Stock Entry,Difference Account,Forskjellen konto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +309,Please select Company,Vennligst velg selskapet
+DocType: Stock Entry Detail,Difference Account,Forskjellen konto
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,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 +398,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 +399,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 +530,"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 +532,"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 +28,Buy,Kjøpe
@@ -486,7 +493,7 @@
 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 +1563,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 +1587,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
@@ -495,13 +502,14 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Account {0} does not belong to company: {1},Konto {0} tilhører ikke selskapet: {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation already used for another company,Forkortelse allerede brukt for et annet selskap
 DocType: Selling Settings,Default Customer Group,Standard Kundegruppe
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Supplier is required against Payable account {0},Leverandør er nødvendig mot Betales konto {0}
 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
 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 +313,Reference No and Reference Date is mandatory for Bank transaction,Referansenummer og Reference Date er obligatorisk for Bank transaksjon
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +316,Reference No and Reference Date is mandatory for Bank transaction,Referansenummer og Reference Date er obligatorisk for Bank transaksjon
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Legg til / Rediger skatter og avgifter
 DocType: Purchase Invoice,Supplier Invoice No,Leverandør Faktura Nei
 DocType: Territory,For reference,For referanse
@@ -512,7 +520,6 @@
 DocType: Installation Note Item,Installation Note Item,Installasjon Merk Element
 DocType: Production Plan Item,Pending Qty,Venter Stk
 DocType: Budget,Ignore,Ignorer
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Sak Kode&gt; Element Group&gt; Brand
 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/config/accounts.py +241,Setup cheque dimensions for printing,Oppsett sjekk dimensjoner for utskrift
 DocType: Salary Slip,Salary Slip Timesheet,Lønn Slip Timeregistrering
@@ -523,11 +530,11 @@
 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/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 +28,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 +19,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 +707,Make Sales Order,Gjør Salgsordre
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +701,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
@@ -543,7 +550,8 @@
 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 +734,Sales Return,Sales Return
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +728,Sales Return,Sales Return
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +91,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)
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Database med potensielle kunder.
@@ -552,14 +560,13 @@
 DocType: Quotation,Quotation To,Sitat Å
 DocType: Lead,Middle Income,Middle Income
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +212,Opening (Cr),Åpning (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +795,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,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 +237,Allocated amount can not be negative,Bevilget beløpet kan ikke være negativ
+apps/erpnext/erpnext/stock/doctype/item/item.py +797,Default Unit of Measure for Item {0} cannot be changed directly because 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
 DocType: Purchase Order Item,Billed Amt,Billed Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,En logisk Warehouse mot som lager oppføringer er gjort.
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Salg Faktura Timeregistrering
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},Referansenummer og Reference Date er nødvendig for {0}
-DocType: Sales Invoice,Customer's Vendor,Kundens Vendor
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Proposal Writing,Forslaget Writing
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,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"
@@ -568,13 +575,14 @@
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,Time Tracking
 DocType: Fiscal Year Company,Fiscal Year Company,Regnskapsåret selskapet
 DocType: Packing Slip Item,DN Detail,DN Detalj
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +257,Already supplier quotation has created,Allerede leverandør sitatet har skapt
 DocType: Timesheet,Billed,Fakturert
 DocType: Batch,Batch Description,Batch Beskrivelse
+apps/erpnext/erpnext/accounts/utils.py +685,"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 +733,View Offline Records,Se Offline Records
+apps/erpnext/erpnext/accounts/page/pos/pos.js +715,View Offline Records,Se Offline Records
+DocType: Student,Sibling Details,søsken Detaljer
 DocType: Employee,Reason for Resignation,Grunnen til Resignasjon
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,Mal for medarbeidersamtaler.
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,Faktura / Journal Entry Detaljer
@@ -588,7 +596,7 @@
 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
 DocType: Employee,Passport Number,Passnummer
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Manager,Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,Manager
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,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
@@ -597,10 +605,11 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter email address,Skriv inn e-postadresse
 DocType: Production Order Operation,In minutes,I løpet av minutter
 DocType: Issue,Resolution Date,Oppløsning Dato
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +299,Timesheet created:,Timeregistrering opprettet:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +715,Please set default Cash or Bank account in Mode of Payment {0},Vennligst angi standard kontanter eller bankkontoen i modus for betaling {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +300,Timesheet created:,Timeregistrering opprettet:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +772,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
 DocType: Selling Settings,Customer Naming By,Kunden Naming Av
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vennligst oppsett Employee Naming System i Human Resource&gt; HR-innstillinger
 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
 DocType: Activity Cost,Activity Type,Aktivitetstype
@@ -625,6 +634,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,Bli ferdig
 DocType: Pricing Rule,Sales Manager,Salgssjef
 DocType: Salary Structure Employee,Base,Utgangspunkt
+DocType: Timesheet,Total Billed Hours,Totalt fakturert timer
 DocType: Journal Entry,Write Off Amount,Skriv Off Beløp
 DocType: Journal Entry,Bill No,Bill Nei
 DocType: Company,Gain/Loss Account on Asset Disposal,Gevinst / tap-konto på Asset Avhending
@@ -639,11 +649,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +9,Pre Sales,Før salg
 DocType: Purchase Receipt,Other Details,Andre detaljer
 DocType: Account,Accounts,Kontoer
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Marketing,Markedsføring
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +227,Payment Entry is already created,Betaling Entry er allerede opprettet
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,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 +538,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 +21,Preview Salary Slip,Forhåndsvisning Lønn Slip
+apps/erpnext/erpnext/controllers/accounts_controller.py +541,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 +38,Preview Salary Slip,Forhåndsvisning Lønn Slip
 DocType: Company,Deafult Cost Center,Deafult kostnadssted
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +48,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
@@ -652,7 +662,7 @@
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,Velg en studentgruppe
 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 +617,Item has variants.,Elementet har varianter.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Elementet har varianter.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,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
@@ -672,7 +682,7 @@
 DocType: Purchase Order,Supply Raw Materials,Leverer råvare
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,Datoen da neste faktura vil bli generert. Det genereres på send.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Omløpsmidler
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,{0} is not a stock Item,{0} er ikke en lagervare
+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 +169,Lead must be set if Opportunity is made from Lead,Lead må stilles inn hvis Opportunity er laget av Lead
@@ -739,26 +749,25 @@
 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 +709,No Permission,Ingen tillatelse
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +710,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}
 apps/erpnext/erpnext/public/js/setup_wizard.js +298,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 +542,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} må fremlegges
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} må fremlegges
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Ingen ansatte funnet
 DocType: Supplier Quotation,Stopped,Stoppet
 DocType: Item,If subcontracted to a vendor,Dersom underleverandør til en leverandør
 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.
 DocType: Warehouse,Tree Details,Tree Informasjon
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Send Nå
 ,Support Analytics,Støtte Analytics
 DocType: Item,Website Warehouse,Nettsted Warehouse
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimum Fakturert beløp
 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/sales_invoice/sales_invoice.py +227,Timesheet {0} is already completed or cancelled,Timeregistrering {0} er allerede gjennomført eller kansellert
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +259,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
@@ -774,13 +783,13 @@
 apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Kursplan
 DocType: Maintenance Visit,Completion Status,Completion Status
 DocType: HR Settings,Enter retirement age in years,Skriv inn pensjonsalder i år
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +229,Target Warehouse,Target Warehouse
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +230,Target Warehouse,Target Warehouse
 DocType: Cheque Print Template,Starting location from left edge,Starter plassering fra venstre kant
 DocType: Item,Allow over delivery or receipt upto this percent,Tillat løpet levering eller mottak opp denne prosent
 DocType: Stock Entry,STE-,an- drogene
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Sales Order Date,Forventet Leveringsdato kan ikke være før Salgsordre Dato
 DocType: Upload Attendance,Import Attendance,Import Oppmøte
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Alle varegrupper
+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/config/setup.py +89,Automatically compose message on submission of transactions.,Skriv melding automatisk ved innlevering av transaksjoner.
@@ -792,13 +801,15 @@
 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/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
 DocType: Expense Claim,Expenses,Utgifter
 DocType: Item Variant Attribute,Item Variant Attribute,Sak Variant Egenskap
 ,Purchase Receipt Trends,Kvitteringen Trender
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Research & Development,Forskning Og Utvikling
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Forskning Og Utvikling
 ,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
 DocType: Leave Block List Date,Leave Block List Date,La Block List Dato
 DocType: Pricing Rule,Price or Discount,Pris eller rabatt
@@ -807,7 +818,7 @@
 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/controllers/accounts_controller.py +340,"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."
+apps/erpnext/erpnext/controllers/accounts_controller.py +343,"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
@@ -829,12 +840,12 @@
 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 +756,Purchase Receipt,Kvitteringen
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +735,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 +167,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 +282,Unable to find Time Slot in the next {0} days for Operation {1},Å finne tidsluke i de neste {0} dager for Operation klarer {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +170,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 +283,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 +439,BOM {0} must be active,BOM {0} må være aktiv
@@ -845,7 +856,7 @@
 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 +214,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 +217,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
@@ -859,9 +870,9 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Ansatt {0} er ikke aktiv eller ikke eksisterer
 DocType: Fee Structure,Components,komponenter
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,Please enter Asset Category in Item {0},Fyll inn Asset kategori i Element {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +612,Item Variants {0} updated,Sak Varianter {0} oppdatert
+apps/erpnext/erpnext/stock/doctype/item/item.py +614,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 +843,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 +854,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å
@@ -876,69 +887,72 @@
 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 +728,New Sales Invoice,Ny salgsfaktura
+apps/erpnext/erpnext/accounts/page/pos/pos.js +710,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 +728,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
 DocType: Material Request Item,Lead Time Date,Lead Tid Dato
 DocType: Guardian,Guardian Name,Guardian navn
 DocType: Cheque Print Template,Has Print Format,Har Print Format
-apps/erpnext/erpnext/accounts/page/pos/pos.js +86, 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 +109,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 +619,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","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/page/pos/pos.js +75, 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 +613,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing 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 +606,Supplier Invoice Date cannot be greater than Posting Date,Leverandør Fakturadato kan ikke være større enn konteringsdato
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +609,Supplier Invoice Date cannot be greater than Posting Date,Leverandør Fakturadato kan ikke være større enn konteringsdato
 DocType: Purchase Invoice Item,Purchase Order Item,Innkjøpsordre Element
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +130,Indirect Income,Indirekte inntekt
 DocType: Cheque Print Template,Date Settings,Dato Innstillinger
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Varians
 ,Company Name,Selskapsnavn
 DocType: SMS Center,Total Message(s),Total melding (er)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +810,Select Item for Transfer,Velg elementet for Transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +789,Select Item for Transfer,Velg elementet for Transfer
 DocType: Purchase Invoice,Additional Discount Percentage,Ekstra rabatt Prosent
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Vis en liste over alle hjelpevideoer
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Velg kontoen leder av banken der sjekken ble avsatt.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Tillater brukeren å redigere Prisliste Rate i transaksjoner
 DocType: Pricing Rule,Max Qty,Max Antall
-DocType: Student Applicant,Father's Name,Farens navn
 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 +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Rad {0}: Betaling mot Salg / innkjøpsordre skal alltid merkes som forskudd
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Kjemisk
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +686,All items have already been transferred for this Production Order.,Alle elementene er allerede blitt overført til denne produksjonsordre.
+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
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +694,All items have already been transferred for this Production Order.,Alle elementene er allerede blitt overført til denne produksjonsordre.
 DocType: Process Payroll,Select Payroll Year and Month,Velg Lønn år og måned
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,Meter,Måler
 DocType: Workstation,Electricity Cost,Elektrisitet Cost
 DocType: HR Settings,Don't send Employee Birthday Reminders,Ikke send Employee bursdagspåminnelser
-DocType: Opportunity,Walk In,Gå Inn
 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 +12,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).
 DocType: Timesheet Detail,Bill,Regning
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,White,Hvit
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,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
 DocType: SMS Center,All Lead (Open),All Lead (Open)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +228,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})
+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 +731,Make ,Gjøre
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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.
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Handlekurv
-apps/erpnext/erpnext/controllers/selling_controller.py +154,Order Type must be one of {0},Ordretype må være en av {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Ordretype må være en av {0}
 DocType: Lead,Next Contact Date,Neste Kontakt Dato
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Antall åpne
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +393,Please enter Account for Change Amount,Vennligst oppgi konto for Change Beløp
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,Please enter Account for Change Amount,Vennligst oppgi konto for Change Beløp
 DocType: Student Batch,Student Batch Name,Student Batch Name
 DocType: Holiday List,Holiday List Name,Holiday Listenavn
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js +8,Schedule Course,Schedule Course
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Stock Options,Aksjeopsjoner
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Aksjeopsjoner
 DocType: Journal Entry Account,Expense Claim,Expense krav
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +211,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 +237,Qty for {0},Antall for {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +212,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 +238,Qty for {0},Antall for {0}
 DocType: Leave Application,Leave Application,La Application
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,La Allocation Tool
 DocType: Leave Block List,Leave Block List Dates,La Block List Datoer
@@ -947,9 +961,9 @@
 DocType: Company,Default Terms,Standard Terms
 DocType: Packing Slip Item,Packing Slip Item,Pakking Slip Element
 DocType: Purchase Invoice,Cash/Bank Account,Cash / Bank Account
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Fjernet elementer med ingen endring i mengde eller verdi.
+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 +635,Attribute table is mandatory,Attributt tabellen er obligatorisk
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Attributt tabellen er obligatorisk
 DocType: Production Planning Tool,Get Sales Orders,Få salgsordrer
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{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
@@ -974,7 +988,7 @@
 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/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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Serial No {0} er under vedlikeholdskontrakt opp {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +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
@@ -986,7 +1000,7 @@
 DocType: GL Entry,Against,Against
 DocType: Item,Default Selling Cost Center,Standard Selling kostnadssted
 DocType: Sales Partner,Implementation Partner,Gjennomføring Partner
-apps/erpnext/erpnext/controllers/selling_controller.py +231,Sales Order {0} is {1},Salgsordre {0} er {1}
+apps/erpnext/erpnext/controllers/selling_controller.py +232,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
 DocType: Packing Slip,Net Weight UOM,Vekt målenheter
@@ -996,25 +1010,24 @@
 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
 DocType: Sales Person,Select company name first.,Velg firmanavn først.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Sitater mottatt fra leverandører.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},Til {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Gjennomsnittsalder
 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/templates/pages/home.html +32,View All Products,Se alle produkter
+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
 DocType: Expense Claim,From Employee,Fra Employee
-apps/erpnext/erpnext/controllers/accounts_controller.py +400,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
+apps/erpnext/erpnext/controllers/accounts_controller.py +403,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/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,og år:
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +191,{0} {1} must be submitted,{0} {1} må sendes
-DocType: Email Digest,Annual Expense,Årlig Expense
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,{0} {1} must be submitted,{0} {1} må sendes
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +145,Quantity must be less than or equal to {0},Antall må være mindre enn eller lik {0}
 DocType: SMS Center,Total Characters,Totalt tegn
 apps/erpnext/erpnext/controllers/buying_controller.py +156,Please select BOM in BOM field for Item {0},Vennligst velg BOM i BOM felt for Element {0}
@@ -1025,30 +1038,31 @@
 DocType: Sales Partner,Distributor,Distributør
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Handlevogn Shipping Rule
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +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 +62,Please set 'Apply Additional Discount On',Vennligst sett &#39;Apply Ytterligere rabatt på&#39;
+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
 DocType: Global Defaults,Global Defaults,Global Defaults
 apps/erpnext/erpnext/projects/doctype/project/project.py +153,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
 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 +327,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 +362,Finished Item {0} must be entered for Manufacture type entry,Ferdig Element {0} må angis for Produksjon typen oppføring
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +367,Finished Item {0} must be entered for Manufacture type entry,Ferdig Element {0} må angis for Produksjon typen oppføring
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Åpning Regnskap Balanse
 DocType: Sales Invoice Advance,Sales Invoice Advance,Salg Faktura Advance
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +499,Nothing to request,Ingenting å be om
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +500,Nothing to request,Ingenting å be om
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',&#39;Faktisk startdato&#39; ikke kan være større enn &quot;Actual End Date &#39;
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Management,Ledelse
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},Enten debet- eller kredittbeløpet er nødvendig for {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,Ledelse
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +55,Either debit or credit amount is required for {0},Enten debet- eller kredittbeløpet er nødvendig for {0}
 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 +161,Blue,Blå
+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
@@ -1058,12 +1072,12 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +23,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
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1374,Do you really want to submit the invoice?,Har du virkelig ønsker å sende faktura?
+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 +685,Cost Center For Item with Item Code ',Koste Center For Element med Element kode &#39;
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1526,"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 +679,Cost Center For Item with Item Code ',Koste Center For Element med Element kode &#39;
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1550,"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 +26,"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
@@ -1083,104 +1097,106 @@
 DocType: Payment Reconciliation,Unreconciled Payment Details,Avstemte Betalingsopplysninger
 DocType: Global Defaults,Current Fiscal Year,Værende regnskapsår
 DocType: Global Defaults,Disable Rounded Total,Deaktiver Avrundet Total
-DocType: Lead,Call,Call
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +417,'Entries' cannot be empty,&#39;Innlegg&#39; kan ikke være tomt
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +418,'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 +214,Fiscal Year {0} not found,Regnskapsåret {0} ikke funnet
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +221,Fiscal Year {0} not found,Regnskapsåret {0} ikke funnet
 apps/erpnext/erpnext/config/hr.py +238,Setting up Employees,Sette opp ansatte
 DocType: Sales Order,SO-,SÅ-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Vennligst velg først prefiks
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Please select prefix first,Vennligst velg først prefiks
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Research,Forskning
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,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 +43,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 +57,View Ledger,Vis Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Tidligste
-apps/erpnext/erpnext/stock/doctype/item/item.py +504,"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 +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/setup/setup_wizard/setup_wizard.py +437,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
 ,Budget Variance Report,Budsjett Avvik Rapporter
 DocType: Salary Slip,Gross Pay,Brutto Lønn
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +90,Row {0}: Activity Type is mandatory.,Rad {0}: Aktivitetstype er obligatorisk.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +114,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/public/js/controllers/stock_controller.js +40,Accounting Ledger,Regnskap Ledger
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,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
 DocType: BOM Item,Item Description,Element Beskrivelse
+DocType: Student Sibling,Student Sibling,student Søsken
 DocType: Purchase Invoice,Is Recurring,Er Recurring
 DocType: Purchase Invoice,Supplied Items,Leveringen
 DocType: Student,STUD.,STUD.
 DocType: Production Order,Qty To Manufacture,Antall å produsere
+DocType: Email Digest,New Income,New Inntekt
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Opprettholde samme tempo gjennom hele kjøpssyklusen
 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 +131,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 +175,Valuation Rate required for Item in row {0},Verdsettelse Rate kreves for varen i rad {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,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
 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 +87, to ,til
+apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,til
 DocType: Item,Lead Time in days,Lead Tid i dager
 ,Accounts Payable Summary,Leverandørgjeld Sammendrag
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Not authorized to edit frozen Account {0},Ikke autorisert til å redigere fryst kontoen {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,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 +62,Sales Order {0} is not valid,Salgsordre {0} er ikke gyldig
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Salgsordre {0} er ikke gyldig
 apps/erpnext/erpnext/setup/doctype/company/company.py +185,"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 +152,Small,Liten
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,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}
 ,Invoiced Amount (Exculsive Tax),Fakturert beløp (exculsive Tax)
-DocType: Student Applicant,Mother's / Guardian 1 Email ID,Mors / fore en e-ID
 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 +160,Green,Grønn
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,Grønn
 DocType: Supplier,SUPP-,leve-
 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 +57,Contract,Kontrakts
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,Kontrakts
 DocType: Email Digest,Add Quote,Legg Sitat
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +498,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 +503,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 +80,Row {0}: Qty is mandatory,Rad {0}: Antall er obligatorisk
+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 +737,Sync Master Data,Sync Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +719,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/public/js/setup_wizard.js +283,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
+DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Dette er en rot varegruppe og kan ikke redigeres.
+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.
 DocType: Journal Entry Account,Purchase Order,Bestilling
 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 +345,"{0}: Employee email not found, hence email not sent","{0}: Ansattes e-post ikke funnet, derav e-posten ikke sendt"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +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
 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 +118,"For {0}, only credit accounts can be linked against another debit entry",For {0} kan bare kredittkontoer kobles mot en annen belastning oppføring
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Delivery Note {0} is not submitted,Levering Note {0} er ikke innsendt
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Delivery Note {0} is not submitted,Levering Note {0} er ikke innsendt
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Sub-contracted Item,Elementet {0} må være en underleverandør Element
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Capital Equipments
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Prising Rule først valgt basert på &quot;Apply On-feltet, som kan være varen, varegruppe eller Brand."
 DocType: Hub Settings,Seller Website,Selger Hjemmeside
 DocType: Item,ITEM-,PUNKT-
-apps/erpnext/erpnext/controllers/selling_controller.py +147,Total allocated percentage for sales team should be 100,Totalt bevilget prosent for salgsteam skal være 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +110,Production Order status is {0},Produksjonsordrestatus er {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Totalt bevilget prosent for salgsteam skal være 100
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Produksjonsordrestatus er {0}
 DocType: Appraisal Goal,Goal,Mål
 DocType: Sales Invoice Item,Edit Description,Rediger Beskrivelse
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +757,For Supplier,For Leverandør
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +723,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
@@ -1196,10 +1212,11 @@
 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
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-post Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +445,BOM {0} does not belong to Item {1},BOM {0} tilhører ikke Element {1}
 DocType: Sales Partner,Target Distribution,Target Distribution
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1667,Deafault warehouse is required for selected item,Deafault lageret er nødvendig for valgt element
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Deafault warehouse is required for selected item,Deafault lageret er nødvendig for valgt element
 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
@@ -1208,23 +1225,23 @@
 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 +110,Hardware,Hardware
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,Hardware
 DocType: Sales Order,Recurring Upto,Tilbakevendende Opp
 DocType: Attendance,HR Manager,HR Manager
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Vennligst velg et selskap
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Privilege Leave,Privilege La
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,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 +79,You need to enable Shopping Cart,Du må aktivere Handlevogn
 DocType: Payment Entry,Writeoff,writeoff
 DocType: Appraisal Template Goal,Appraisal Template Goal,Appraisal Mal Goal
-DocType: Salary Slip,Earning,Tjene
+DocType: Salary Component,Earning,Tjene
 DocType: Purchase Invoice,Party Account Currency,Partiet konto Valuta
 ,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 +171,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 +174,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_data.py +358,Food,Mat
+apps/erpnext/erpnext/demo/setup/setup_data.py +301,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/course_schedule/course_schedule.js +103,Mark Attendence,Mark frammøte
@@ -1258,12 +1275,12 @@
 DocType: Sales Order Item,Planned Quantity,Planlagt Antall
 DocType: Purchase Invoice Item,Item Tax Amount,Sak Skattebeløp
 DocType: Item,Maintain Stock,Oppretthold Stock
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +209,Stock Entries already created for Production Order ,Arkiv Innlegg allerede opprettet for produksjonsordre
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,Arkiv Innlegg allerede opprettet for produksjonsordre
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,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 +620,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 +238,Max: {0},Max: {0}
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +15,From Datetime,Fra Datetime
+apps/erpnext/erpnext/controllers/accounts_controller.py +623,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 +239,Max: {0},Max: {0}
+apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Fra Datetime
 DocType: Email Digest,For Company,For selskapet
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Kommunikasjonsloggen.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +153,"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.
@@ -1271,8 +1288,8 @@
 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 +552,cannot be greater than 100,kan ikke være større enn 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +680,Item {0} is not a stock Item,Element {0} er ikke en lagervare
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +546,cannot be greater than 100,kan ikke være større enn 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,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
@@ -1286,10 +1303,9 @@
 DocType: GL Entry,GL Entry,GL Entry
 DocType: HR Settings,Employee Settings,Medarbeider Innstillinger
 ,Batch-Wise Balance History,Batch-Wise Balance Historie
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Gjøremålsliste
 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 +61,Apprentice,Lærling
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +102,Negative Quantity is not allowed,Negative Antall er ikke tillatt
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,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 +152,Employee cannot report to himself.,Arbeidstaker kan ikke rapportere til seg selv.
@@ -1310,15 +1326,14 @@
 DocType: Asset,Asset Name,Asset Name
 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 +141,Source warehouse is mandatory for row {0},Kilde lageret er obligatorisk for rad {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +719,Packing Slip,Pakkseddel
+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 +713,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/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,Forespørsel om tilbud kan være tilgang ved å klikke på følgende link
 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 +81,Analyst,Analytiker
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,Analytiker
 DocType: Item,Inventory,Inventar
 DocType: Item,Sales Details,Salgs Detaljer
 DocType: Quality Inspection,QI-,QI-
@@ -1326,7 +1341,7 @@
 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 +103,Government,Regjeringen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,Regjeringen
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,Institute Name
 apps/erpnext/erpnext/config/stock.py +289,Item Variants,Element Varianter
 DocType: Company,Services,Tjenester
@@ -1342,6 +1357,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,Financial Year Start Date,Regnskapsår Startdato
 DocType: POS Profile,Apply Discount,Bruk rabatt
 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
 DocType: Program Course,Program Course,program Course
@@ -1382,12 +1398,12 @@
 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
 DocType: Production Plan Sales Order,Production Plan Sales Order,Produksjonsplan Salgsordre
 DocType: Sales Partner,Sales Partner Target,Sales Partner Target
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +110,Accounting Entry for {0} can only be made in currency: {1},Regnskap Entry for {0} kan bare gjøres i valuta: {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Regnskap Entry for {0} kan bare gjøres i valuta: {1}
 DocType: Pricing Rule,Pricing Rule,Prising Rule
 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
 DocType: Shopping Cart Settings,Payment Success URL,Betaling Suksess URL
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +78,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: Returned Element {1} ikke eksisterer i {2} {3}
+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
@@ -1396,40 +1412,39 @@
 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/stock/doctype/stock_entry/stock_entry.py +339,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Ikke lov til å overfør mer {0} enn {1} mot innkjøpsordre {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +344,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 +545,Manufacturing Quantity is mandatory,Manufacturing Antall er obligatorisk
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,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 +71,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 +162,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/projects/doctype/timesheet/timesheet.py +186,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
 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 +130,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 +137,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
 DocType: Dependent Task,Dependent Task,Avhengig Task
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,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/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 +190,Leave of type {0} cannot be longer than {1},Permisjon av typen {0} kan ikke være lengre enn {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +197,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 +921,Search Item,Søk Element
+apps/erpnext/erpnext/accounts/page/pos/pos.js +910,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 +546,Already completed,allerede fullført
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +22,Payment Request already exists {0},Betaling Request allerede eksisterer {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +550,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 +241,Quantity must not be more than {0},Antall må ikke være mer enn {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Quantity must not be more than {0},Antall må ikke være mer enn {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +76,Previous Financial Year is not closed,Foregående regnskapsår er ikke stengt
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +44,Age (Days),Alder (dager)
 DocType: Quotation Item,Quotation Item,Sitat Element
@@ -1446,7 +1461,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +221,Purchase Receipt {0} is not submitted,Kvitteringen {0} er ikke innsendt
 DocType: Company,Default Payable Account,Standard Betales konto
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Innstillinger for online shopping cart som skipsregler, prisliste etc."
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +83,{0}% Billed,{0}% Fakturert
+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
@@ -1458,12 +1473,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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/schools/doctype/fees/fees.js +22,Collect,Samle inn
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Samle inn
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,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 +225,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
-DocType: Payment Reconciliation,Payments,Betalinger
 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
@@ -1475,7 +1489,7 @@
 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 +9,Procurement,innkjøp
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,Ingen av elementene har noen endring i mengde eller verdi.
+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
 ,Lead Details,Lead Detaljer
 DocType: Purchase Invoice,End date of current invoice's period,Sluttdato for gjeldende faktura periode
@@ -1500,7 +1514,7 @@
 DocType: Purchase Invoice,Additional Discount,Ekstra rabatt
 DocType: Selling Settings,Selling Settings,Selge Innstillinger
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Online auksjoner
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +97,Please specify either Quantity or Valuation Rate or both,Vennligst oppgi enten Mengde eller Verdivurdering Rate eller begge deler
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,Vennligst oppgi enten Mengde eller Verdivurdering Rate eller begge deler
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +13,Fulfillment,Oppfyllelse
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Company, Måned og regnskapsåret er obligatorisk"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Markedsføringskostnader
@@ -1521,14 +1535,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,ERPNext Setup Complete!
 DocType: Item,Weightage,Weightage
 DocType: Packing Slip,PS-,PS
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +93,A Customer Group exists with same name please change the Customer name or rename the Customer Group,En kundegruppe eksisterer med samme navn kan du endre Kundens navn eller endre navn på Kundegruppe
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +126,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
 DocType: Stock Entry,Material Receipt,Materialet Kvittering
 DocType: Homepage,Products,Produkter
 DocType: Announcement,Instructor,Instruktør
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},Partiet Type og Party er nødvendig for fordringer / gjeld konto {0}
 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
@@ -1539,7 +1552,7 @@
 ,Item-wise Sales Register,Element-messig Sales Register
 DocType: Asset,Gross Purchase Amount,Bruttobeløpet
 DocType: Asset,Depreciation Method,avskrivningsmetode
-apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Offline,offline
+apps/erpnext/erpnext/accounts/page/pos/pos.js +686,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å
@@ -1557,25 +1570,27 @@
 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
 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 +858,Make Purchase Order,Gjør innkjøpsordre
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +852,Make Purchase Order,Gjør innkjøpsordre
 DocType: SMS Center,Send To,Send Til
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,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 +148,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
 DocType: Stock Reconciliation,Stock Reconciliation,Stock Avstemming
 DocType: Territory,Territory Name,Territorium Name
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +172,Work-in-Progress Warehouse is required before Submit,Work-in-progress Warehouse er nødvendig før Send
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,Work-in-Progress Warehouse is required before Submit,Work-in-progress Warehouse er nødvendig før Send
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Kandidat til en jobb.
 DocType: Purchase Order Item,Warehouse and Reference,Warehouse og Reference
 DocType: Supplier,Statutory info and other general information about your Supplier,Lovfestet info og annen generell informasjon om din Leverandør
-apps/erpnext/erpnext/hooks.py +88,Addresses,Adresser
-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/payment_entry/payment_entry.py +212,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/hooks.py +95,Addresses,Adresser
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +215,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
 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
@@ -1583,11 +1598,10 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,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 +731,Payment,Betaling
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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: Pricing Rule,Brand,Brand
 DocType: Course,Course Abbreviation,Kurs forkortelse
 DocType: Item,Will also apply for variants,Vil også gjelde for varianter
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +142,"Asset cannot be cancelled, as it is already {0}","Asset kan ikke avbestilles, som det allerede er {0}"
@@ -1599,7 +1613,7 @@
 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."
 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 +85,Associate,Forbinder
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,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
@@ -1607,7 +1621,7 @@
 DocType: Production Planning Tool,Material Requests,material~~POS=TRUNC Forespørsler
 DocType: Warranty Claim,Issue Date,Utgivelsesdato
 DocType: Activity Cost,Activity Cost,Aktivitet Kostnad
-DocType: Timesheet Detail,Timesheet Detail,Timeregistrering Detalj
+DocType: Sales Invoice Timesheet,Timesheet Detail,Timeregistrering Detalj
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Forbrukes Antall
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekommunikasjon
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indikerer at pakken er en del av denne leveransen (Kun Draft)
@@ -1630,6 +1644,7 @@
 DocType: Production Plan Material Request,Material Request Date,Materiale Request Dato
 DocType: Purchase Order Item,Supplier Quotation Item,Leverandør sitat Element
 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
 DocType: Monthly Distribution,Name of the Monthly Distribution,Navn på Monthly Distribution
 DocType: Sales Person,Parent Sales Person,Parent Sales Person
@@ -1642,30 +1657,31 @@
 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 +44,"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/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.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +502,Error: {0} &gt; {1},Feil: {0}&gt; {1}
 DocType: Item,Is Sales Item,Er Sales Element
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Varegruppe treet
 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."
 DocType: Naming Series,Current Value,Nåværende Verdi
-apps/erpnext/erpnext/controllers/accounts_controller.py +235,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/controllers/accounts_controller.py +238,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
 DocType: Delivery Note Item,Against Sales Order,Mot Salgsordre
 ,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 +458,Item table can not be blank,Sak bordet kan ikke være tomt
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +443,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 +5,This is based on stock movement. See {0} for details,Dette er basert på lagerbevegelse. Se {0} for detaljer
 DocType: Pricing Rule,Selling,Selling
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +341,Amount {0} {1} deducted against {2},Mengden {0} {1} trukket mot {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +344,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
@@ -1680,8 +1696,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +144,Cannot refer row number greater than or equal to current row number for this Charge type,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 +159,Red,Rød
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Vennligst klikk på &quot;Generer Schedule &#39;for å hente serienummer lagt for Element {0}
+apps/erpnext/erpnext/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
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Grunnbeløp (Selskap Valuta)
@@ -1689,7 +1705,7 @@
 DocType: Installation Note,Installation Time,Installasjon Tid
 DocType: Sales Invoice,Accounting Details,Regnskap Detaljer
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,Slett alle transaksjoner for dette selskapet
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +187,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Row # {0}: Operation {1} er ikke fullført for {2} qty av ferdigvarer i Produksjonsordre # {3}. Vennligst oppdater driftsstatus via Tid Logger
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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,Row # {0}: Operation {1} er ikke fullført for {2} qty av ferdigvarer i Produksjonsordre # {3}. Vennligst oppdater driftsstatus via Tid Logger
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,Investeringer
 DocType: Issue,Resolution Details,Oppløsning Detaljer
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,Avsetninger
@@ -1725,16 +1741,17 @@
 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}
 DocType: Delivery Note,Excise Page Number,Vesenet Page Number
 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}
 ,Maintenance Schedules,Vedlikeholdsplaner
 DocType: Task,Actual End Date (via Time Sheet),Faktisk Sluttdato (via Timeregistrering)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Amount {0} {1} against {2} {3},Mengden {0} {1} mot {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +339,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 +138,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 +295,Debit To account must be a Receivable account,Uttak fra kontoen må være en fordring konto
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Receivable account,Uttak fra kontoen må være en fordring konto
 DocType: Shipping Rule Condition,Shipping Amount,Fraktbeløp
 ,Pending Amount,Avventer Beløp
 DocType: Purchase Invoice Item,Conversion Factor,Omregningsfaktor
@@ -1742,10 +1759,10 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +137,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 +90,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
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +93,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 +22,Enter Paid Amount,Skriv inn beløpet som betales
+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
@@ -1755,13 +1772,15 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,Timelister
 DocType: HR Settings,HR Settings,HR-innstillinger
 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 venter på godkjenning. Bare den Expense Godkjenner kan oppdatere status.
+DocType: Email Digest,New Expenses,nye Utgifter
 DocType: Purchase Invoice,Additional Discount Amount,Ekstra rabatt Beløp
-apps/erpnext/erpnext/controllers/accounts_controller.py +524,"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.
+apps/erpnext/erpnext/controllers/accounts_controller.py +527,"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 +249,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/stock/get_item_details.py +123,Please specify Company,Vennligst oppgi selskapet
 ,Customer Acquisition and Loyalty,Kunden Oppkjøp og Loyalty
@@ -1772,17 +1791,19 @@
 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 +183,Closing (Opening + Totals),Lukking (Åpning + Totals)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),Lukking (Åpning + Totals)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Vennligst oppgi valuta i selskapet
 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/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å
-apps/erpnext/erpnext/controllers/accounts_controller.py +272,Account {0} is invalid. Account Currency must be {1},Konto {0} er ugyldig. Account Valuta må være {1}
+DocType: Email Digest,Pending Sales Orders,Avventer salgsordrer
+apps/erpnext/erpnext/controllers/accounts_controller.py +275,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 +956,"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 Slip,Deduction,Fradrag
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +87,Row {0}: From Time and To Time is mandatory.,Rad {0}: Fra tid og Tid er obligatorisk.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +969,"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 +111,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 +262,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 +7,Please enter Employee Id of this sales person,Skriv inn Employee Id av denne salgs person
@@ -1790,7 +1811,7 @@
 DocType: Project,% Tasks Completed,% Oppgaver Fullført
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,Forskjellen Beløpet må være null
 DocType: Project,Gross Margin,Bruttomargin
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +194,Please enter Production Item first,Skriv inn Produksjon varen først
+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
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Sitat
@@ -1799,53 +1820,54 @@
 DocType: Maintenance Visit,Maintenance User,Vedlikehold Bruker
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +149,Cost Updated,Kostnad Oppdatert
 DocType: Employee,Date of Birth,Fødselsdato
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +86,Item {0} has already been returned,Element {0} er allerede returnert
+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}
+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 +177,Job Description,Stillingsbeskrivelse
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,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 +126,"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 +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Spesialtegn unntatt &quot;-&quot; &quot;.&quot;, &quot;#&quot;, og &quot;/&quot; ikke tillatt i navngi serie"
 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."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +24,Welcome to POS: Create your POS Profile,Velkommen til POS: Lag din POS profil
 DocType: Expense Claim,Approver,Godkjenner
 ,SO Qty,SO Antall
+DocType: Guardian,Work Address,arbeid Adresse
 DocType: Appraisal,Calculate Total Score,Beregn Total Score
 DocType: Request for Quotation,Manufacturing Manager,Produksjonssjef
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serial No {0} er under garanti opptil {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +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 +74,Shipments,Forsendelser
+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
 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 +153,Row # ,Row #
+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 +156,Get From,Få Fra
+apps/erpnext/erpnext/public/js/utils.js +167,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 +167,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 +416,"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"
+apps/erpnext/erpnext/controllers/accounts_controller.py +419,"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
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} is disabled,Bruker {0} er deaktivert
 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 ...
 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 +171,"Types of employment (permanent, contract, intern etc.).","Typer arbeid (fast, kontrakt, lærling etc.)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +346,{0} is mandatory for Item {1},{0} er obligatorisk for Element {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,{0} is mandatory for Item {1},{0} er obligatorisk for Element {1}
 DocType: Currency Exchange,From Currency,Fra Valuta
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Vennligst velg avsatt beløp, fakturatype og fakturanummer i minst én rad"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,Kostnad for nye kjøp
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},Salgsordre kreves for Element {0}
 DocType: Purchase Invoice Item,Rate (Company Currency),Rate (Selskap Valuta)
-apps/erpnext/erpnext/demo/setup_data.py +360,Others,Annet
+DocType: Student Guardian,Others,Annet
 DocType: Payment Entry,Unallocated Amount,uallokert Beløp
 apps/erpnext/erpnext/templates/includes/product_page.js +65,Cannot find a matching Item. Please select some other value for {0}.,Kan ikke finne en matchende element. Vennligst velg en annen verdi for {0}.
 DocType: POS Profile,Taxes and Charges,Skatter og avgifter
@@ -1865,17 +1887,16 @@
 apps/erpnext/erpnext/config/stock.py +304,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/accounts/report/item_wise_sales_register/item_wise_sales_register.py +54,Receivable Account,Fordring konto
-apps/erpnext/erpnext/controllers/accounts_controller.py +546,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} er allerede {2}
+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 +549,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 +79,CEO,administrerende direktør
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,administrerende direktør
 DocType: Expense Claim Detail,Expense Claim Detail,Expense krav Detalj
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +808,Please select correct account,Velg riktig konto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +809,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
-DocType: Purchase Invoice Item,Page Break,Page Break
 DocType: Production Order Operation,Pending,Avventer
 DocType: Course,Course Name,Course Name
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Brukere som kan godkjenne en bestemt ansattes permisjon applikasjoner
@@ -1884,14 +1905,15 @@
 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 +54,Full-time,Fulltid
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Full-time,Fulltid
 DocType: Salary Structure,Employees,medarbeidere
 DocType: Employee,Contact Details,Kontaktinformasjon
 DocType: C-Form,Received Date,Mottatt 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 opprettet en standard mal i salgs skatter og avgifter mal, velger du ett og klikk på knappen under."
+DocType: Student,Guardians,Voktere
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +29,Please specify a country for this Shipping Rule or check Worldwide Shipping,Vennligst oppgi et land for denne Shipping Regel eller sjekk Worldwide Shipping
 DocType: Stock Entry,Total Incoming Value,Total Innkommende Verdi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Debit To is required,Debet Å kreves
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +321,Debit To is required,Debet Å kreves
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Kjøp Prisliste
 DocType: Offer Letter Term,Offer Term,Tilbudet Term
 DocType: Quality Inspection,Quality Manager,Quality Manager
@@ -1899,6 +1921,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/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
@@ -1909,18 +1932,17 @@
 DocType: Production Order Operation,Completed Qty,Fullført Antall
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"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 +273,Price List {0} is disabled,Prisliste {0} er deaktivert
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +99,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/projects/doctype/timesheet/timesheet.py +123,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
 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}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Nåværende Verdivurdering Rate
 DocType: Item,Customer Item Codes,Kunden element Codes
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,Valutagevinst / tap
 DocType: Opportunity,Lost Reason,Mistet Reason
-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/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/purchase_receipt/purchase_receipt.py +378,All items have already been invoiced,Alle elementene er allerede blitt fakturert
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +379,All items have already been invoiced,Alle elementene er allerede blitt fakturert
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Vennligst oppgi en gyldig &quot;Fra sak nr &#39;
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,Ytterligere kostnadsbærere kan gjøres under Grupper men oppføringene kan gjøres mot ikke-grupper
 DocType: Project,External,Ekstern
@@ -1936,18 +1958,19 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Dine kunder
 apps/erpnext/erpnext/projects/doctype/project/project.py +141,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/job_opening.html +19,Apply Now,Søk nå
+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."
 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
-apps/erpnext/erpnext/utilities/doctype/address/address.py +164,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: Fee Structure,Fee Structure,Avgiftsstruktur struktur~~POS=HEADCOMP
 DocType: Timesheet Detail,Costing Amount,Costing Beløp
+DocType: Student Admission,Application Fee,Påmeldingsavgift
 DocType: Process Payroll,Submit Salary Slip,Send Lønn Slip
-apps/erpnext/erpnext/controllers/selling_controller.py +161,Maxiumm discount for Item {0} is {1}%,Maxiumm rabatt for Element {0} er {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,Maxiumm rabatt for Element {0} er {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Import i Bulk
 DocType: Sales Partner,Address & Contacts,Adresse og Kontakt
 DocType: SMS Log,Sender Name,Avsender Navn
@@ -1972,21 +1995,21 @@
 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_data.py +361,Travel,Reise
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +155,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 +304,Travel,Reise
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +167,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 +23,Update Cost,Oppdater Cost
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Oppdater Cost
 DocType: Item Reorder,Item Reorder,Sak Omgjøre
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +36,Show Salary Slip,Vis Lønn Slip
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +748,Transfer Material,Transfer Material
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +53,Show Salary Slip,Vis Lønn Slip
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +166,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 +923,Please set recurring after saving,Vennligst sett gjentakende etter lagring
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +646,Select change amount account,Velg endring mengde konto
+apps/erpnext/erpnext/public/js/controllers/transaction.js +914,Please set recurring after saving,Vennligst sett gjentakende etter lagring
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +703,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
@@ -1998,31 +2021,32 @@
 DocType: Quality Inspection,Verified By,Verified by
 DocType: Address,Subsidiary,Datterselskap
 apps/erpnext/erpnext/setup/doctype/company/company.py +64,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Kan ikke endre selskapets standardvaluta, fordi det er eksisterende transaksjoner. Transaksjoner må avbestilles å endre valgt valuta."
+DocType: Grade Interval,Grade Description,grade Beskrivelse
 DocType: Quality Inspection,Purchase Receipt No,Kvitteringen Nei
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Earnest Penger
 DocType: Process Payroll,Create Salary Slip,Lag Lønn Slip
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +33,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 +352,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Antall på rad {0} ({1}) må være det samme som produsert mengde {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Antall på rad {0} ({1}) må være det samme som produsert mengde {2}
 DocType: Appraisal,Employee,Ansatt
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Inviter som User
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} er fullt fakturert
 DocType: Workstation Working Hour,End Time,Sluttid
 DocType: Payment Entry,Payment Deductions or Loss,Betalings fradrag eller tap
-apps/erpnext/erpnext/config/schools.py +100,LMS,LMS
+apps/erpnext/erpnext/config/schools.py +104,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/config/crm.py +6,Sales Pipeline,salgs~~POS=TRUNC
 DocType: Student Batch Student,Student Batch Student,Student Batch Student
-DocType: Sales Invoice,Mass Mailing,Masseutsendelse
+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 +199,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/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 +297,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 +111,Pharmaceutical,Pharmaceutical
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +309,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/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
@@ -2037,27 +2061,28 @@
 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 +814,Please specify Company to proceed,Vennligst oppgi selskapet å fortsette
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +793,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 +44,Compensatory Off,Kompenserende Off
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,Kompenserende Off
 DocType: Quality Inspection Reading,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.
 DocType: Room,Room Number,Romnummer
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Ugyldig referanse {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +161,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) kan ikke være større enn planlagt quanitity ({2}) i produksjonsordre {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +162,{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 +217,Raw Materials cannot be blank.,Råvare kan ikke være blank.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,"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 +460,Quick Journal Entry,Hurtig Journal Entry
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +111,You can not change rate if BOM mentioned agianst any item,Du kan ikke endre prisen dersom BOM nevnt agianst ethvert element
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +441,"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 +450,Quick Journal Entry,Hurtig Journal Entry
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +103,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 +214,{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
 ,Minutes to First Response for Issues,Minutter til First Response for Issues
 DocType: Purchase Invoice,Terms and Conditions1,Vilkår og forhold 1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,Navnet på institutt for som du setter opp dette systemet.
@@ -2066,16 +2091,17 @@
 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 +398,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 +739,Item or Warehouse for row {0} does not match Material Request,Element eller Warehouse for rad {0} samsvarer ikke Material Request
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +747,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
 DocType: Fiscal Year,Year End Date,År Sluttdato
 DocType: Task Depends On,Task Depends On,Task Avhenger
-DocType: Lead,Opportunity,Opportunity
+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
@@ -2088,7 +2114,7 @@
 DocType: Student,Joining Date,Bli med dato
 ,Employees working on a holiday,Arbeidstakere som arbeider på ferie
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Mark Present
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},Vedlikehold startdato kan ikke være før leveringsdato for Serial No {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},Vedlikehold startdato kan ikke være før leveringsdato for Serial No {0}
 DocType: Production Order,Actual End Date,Selve sluttdato
 DocType: Purchase Invoice,PINV-,PINV-
 DocType: Authorization Rule,Applicable To (Role),Gjelder til (Role)
@@ -2103,7 +2129,7 @@
 DocType: SMS Log,No of Requested SMS,Ingen av Spurt SMS
 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 +729,Please supply the specified items at the best possible rates,Vennligst oppgi de angitte elementene på de best mulige priser
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +695,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 +117,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-
@@ -2112,7 +2138,7 @@
 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 +14,This is an example website auto-generated from ERPNext,Dette er et eksempel nettsiden automatisk generert fra ERPNext
+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
 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.
 
@@ -2139,13 +2165,14 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd Antall
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +54,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 +103,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 +504,Stock Entry {0} is not submitted,Stock Entry {0} er ikke innsendt
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Kan ikke produsere mer Element {0} enn Salgsordre kvantitet {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +505,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: Salary Component Account,Salary Component Account,Lønn Component konto
 DocType: Global Defaults,Hide Currency Symbol,Skjule Valutasymbol
 apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card","f.eks Bank, Cash, Kredittkort"
+DocType: Lead Source,Source Name,Source Name
 DocType: Journal Entry,Credit Note,Kreditnota
 DocType: Warranty Claim,Service Address,Tjenesten Adresse
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furnitures and Fixtures,Møbler og inventar
@@ -2157,6 +2184,7 @@
 DocType: Opportunity,Customer / Lead Name,Kunde / Lead navn
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +89,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/controllers/trends.py +19,Total(Qty),Total (Stk)
 DocType: Sales Invoice,This Document,dette dokumentet
@@ -2168,15 +2196,15 @@
 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 +176,Organization branch master.,Organisering gren mester.
-apps/erpnext/erpnext/controllers/accounts_controller.py +273, or ,eller
+apps/erpnext/erpnext/controllers/accounts_controller.py +276, or ,eller
 DocType: Sales Order,Billing Status,Billing Status
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Melde om et problem
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,Utility Utgifter
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-Above
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +203,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: Bilagsregistrering {1} har ikke konto {2} eller allerede matchet mot en annen kupong
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +206,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 +90,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 +93,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
@@ -2204,8 +2232,8 @@
 DocType: Product Bundle,Parent Item,Parent Element
 DocType: Account,Account Type,Kontotype
 DocType: Delivery Note,DN-RET-,DN-RET-
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +115,Leave Type {0} cannot be carry-forwarded,La Type {0} kan ikke bære-videre
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Vedlikeholdsplan genereres ikke for alle elementene. Vennligst klikk på &quot;Generer Schedule &#39;
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +118,Leave Type {0} cannot be carry-forwarded,La Type {0} kan ikke bære-videre
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Vedlikeholdsplan genereres ikke for alle elementene. Vennligst klikk på &quot;Generer Schedule &#39;
 ,To Produce,Å Produsere
 apps/erpnext/erpnext/config/hr.py +93,Payroll,lønn
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +163,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","For rad {0} i {1}. For å inkludere {2} i Element rate, rader {3} må også inkluderes"
@@ -2217,13 +2245,13 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +32,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 +748,Delivery,Levering
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +742,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
 DocType: Payment Entry,Total Allocated Amount,Totalt tildelte beløp
 DocType: Item Reorder,Material Request Type,Materialet Request Type
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +82,Row {0}: UOM Conversion Factor is mandatory,Rad {0}: målenheter omregningsfaktor er obligatorisk
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +79,Row {0}: UOM Conversion Factor is mandatory,Rad {0}: målenheter omregningsfaktor er obligatorisk
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Budget,Cost Center,Kostnadssted
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Kupong #
@@ -2234,13 +2262,13 @@
 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 +90,Head of Marketing and Sales,Head of Marketing and Sales
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Inntektsskatt
+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 +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.
 DocType: Item Supplier,Item Supplier,Sak Leverandør
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +403,Please enter Item Code to get batch no,Skriv inn Element kode for å få batch no
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +770,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 +397,Please enter Item Code to get batch no,Skriv inn Element kode for å få batch no
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +764,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"
@@ -2252,28 +2280,29 @@
 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 +100,Issues,Problemer
+apps/erpnext/erpnext/hooks.py +109,Issues,Problemer
 apps/erpnext/erpnext/controllers/status_updater.py +13,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
 DocType: Supplier,Billing Currency,Faktureringsvaluta
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Large,Extra large
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,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 +507,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 +107,Local,Lokal
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +508,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/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 +154,Large,Stor
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,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 +225,Total {0} ({1}),Totalt {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +224,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
@@ -2319,9 +2348,9 @@
 DocType: Attendance,Leave Type,La Type
 apps/erpnext/erpnext/controllers/stock_controller.py +173,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/hr/doctype/salary_slip/salary_slip.py +79,Name error: {0},Navn feil: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +90,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 +178,{0} {1} does not associated with {2} {3},{0} {1} ikke er knyttet til {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +181,{0} {1} does not associated with {2} {3},{0} {1} ikke er knyttet til {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Oppmøte for arbeidstaker {0} er allerede merket
 DocType: Packing Slip,If more than one package of the same type (for print),Hvis mer enn en pakke av samme type (for print)
 DocType: Warehouse,Parent Warehouse,Parent Warehouse
@@ -2340,7 +2369,7 @@
 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
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,Atleast ett element bør legges inn med negativt antall i retur dokument
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Atleast one item should be entered with negative quantity in return document,Atleast ett element bør legges inn med negativt antall i retur dokument
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operation {0} lenger enn noen tilgjengelige arbeidstimer i arbeidsstasjonen {1}, bryte ned driften i flere operasjoner"
 ,Requested,Spurt
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +83,No Remarks,Nei Anmerkninger
@@ -2352,46 +2381,46 @@
 DocType: Item,Total Projected Qty,Samlet forventet Antall
 DocType: Monthly Distribution,Distribution Name,Distribusjon Name
 DocType: Course,Course Code,Kurskode
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Quality Inspection required for Item {0},Quality Inspection nødvendig for Element {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,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
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Administrer Territory treet.
 DocType: Journal Entry Account,Sales Invoice,Salg Faktura
 DocType: Journal Entry Account,Party Balance,Fest Balance
-apps/erpnext/erpnext/accounts/page/pos/pos.js +475,Please select Apply Discount On,Vennligst velg Bruk rabatt på
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +92,Salary Slip Created,Lønn Slip Laget
+apps/erpnext/erpnext/accounts/page/pos/pos.js +464,Please select Apply Discount On,Vennligst velg Bruk rabatt på
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +95,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
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,Rabattprosenten kan brukes enten mot en prisliste eller for alle Prisliste.
 DocType: Purchase Invoice,Half-yearly,Halvårs
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +384,Accounting Entry for Stock,Regnskap Entry for Stock
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +387,Accounting Entry for Stock,Regnskap Entry for Stock
 DocType: Sales Invoice,Sales Team1,Salg TEAM1
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,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 +96,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 +120,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 +88,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Kan ikke returnere mer enn {1} for Element {2}
+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
 DocType: Item Group,Show this slideshow at the top of the page,Vis lysbildefremvisning på toppen av siden
 DocType: BOM,Item UOM,Sak målenheter
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Skattebeløp Etter Rabattbeløp (Company Valuta)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +147,Target warehouse is mandatory for row {0},Target lageret er obligatorisk for rad {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +141,Target warehouse is mandatory for row {0},Target lageret er obligatorisk for rad {0}
 DocType: Cheque Print Template,Primary Settings,primære Innstillinger
 DocType: Purchase Invoice,Select Supplier Address,Velg Leverandør Adresse
 DocType: Quality Inspection,Quality Inspection,Quality Inspection
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Extra Small,Extra Small
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +194,Account {0} is frozen,Konto {0} er frosset
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Extra Small
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +690,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 +197,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 +606,Can only make payment against unbilled {0},Kan bare gjøre betaling mot fakturert {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +126,Commission rate cannot be greater than 100,Kommisjon kan ikke være større enn 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +609,Can only make payment against unbilled {0},Kan bare gjøre betaling mot fakturert {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,Kommisjon kan ikke være større enn 100
 DocType: Stock Entry,Subcontract,Underentrepriser
 apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,Fyll inn {0} først
 DocType: Production Order Operation,Actual End Time,Faktisk Sluttid
@@ -2402,30 +2431,30 @@
 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 +158,Colour,Farge
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,Farge
 DocType: Maintenance Visit,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"
 DocType: Student Log,Academic,akademisk
-apps/erpnext/erpnext/controllers/accounts_controller.py +469,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Total forhånd ({0}) mot Bestill {1} kan ikke være større enn totalsummen ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +472,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Total forhånd ({0}) mot Bestill {1} kan ikke være større enn totalsummen ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Velg Månedlig Distribusjon til ujevnt fordele målene gjennom måneder.
 DocType: Purchase Invoice Item,Valuation Rate,Verdivurdering Rate
+DocType: Stock Reconciliation,SR/,SR /
 apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,Prisliste Valuta ikke valgt
 DocType: Assessment,Results,resultater
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +168,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 +175,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
-DocType: Student Applicant,Father's/ Guardian 2 Email ID,Fars / Guardian 2 e-ID
 DocType: Maintenance Visit Purpose,Against Document No,Mot Dokument nr
 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 +228,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 +231,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 +93,Researcher,Forsker
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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.
@@ -2437,25 +2466,25 @@
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","For det lettere for kunder, kan disse kodene brukes i trykte formater som regningene og leveringssedlene"
 DocType: Sales Invoice,Time Sheet List,Timeregistrering List
 DocType: Employee,You can enter any date manually,Du kan legge inn noen dato manuelt
-DocType: Sales Invoice,Advertisement,Annonse
 DocType: Asset Category Account,Depreciation Expense Account,Avskrivninger konto
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Probationary Period,Prøvetid
-apps/erpnext/erpnext/hooks.py +102,Announcements,Kunngjøringer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Prøvetid
+apps/erpnext/erpnext/hooks.py +111,Announcements,Kunngjøringer
 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 +109,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 +16,To Datetime,Til Datetime
+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/scheduling_tool/scheduling_tool.py +51,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/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Ventende Aktiviteter
+DocType: Accounts Settings,Make Payment via Journal Entry,Utfør betaling via bilagsregistrering
+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 +127,Please enter relieving date.,Skriv inn lindrende dato.
-apps/erpnext/erpnext/controllers/trends.py +145,Amt,Amt
+apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,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 +26,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
@@ -2473,14 +2502,15 @@
 apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1},Å finne kursen for {0} klarer {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Mark Half Day
 DocType: Sales Invoice,Sales Team,Sales Team
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Duplicate entry,Duplicate entry
+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 +490,[Error],[Error]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +484,[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
 apps/erpnext/erpnext/controllers/status_updater.py +175,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.
 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
@@ -2496,22 +2526,22 @@
 ,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 +25,All Jobs,alle jobber
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,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
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Amount {0} {1} {2} {3},Mengden {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Amount {0} {1} {2} {3},Mengden {0} {1} {2} {3}
 DocType: Account,Depreciation,Avskrivninger
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Leverandør (er)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Employee Oppmøte Tool
 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 +372,Payment Entries {0} are un-linked,Betalings Innlegg {0} er un-linked
+apps/erpnext/erpnext/accounts/utils.py +449,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
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +497,Material Requests {0} created,Materielle Forespørsler {0} er opprettet
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +498,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.
 DocType: Purchase Invoice,Address and Contact,Adresse og Kontakt
@@ -2550,7 +2580,7 @@
 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 +848,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 +859,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 +233,Closing (Dr),Lukking (Dr)
 DocType: Cheque Print Template,Cheque Size,sjekk Size
@@ -2571,7 +2601,8 @@
 ,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.
-apps/erpnext/erpnext/controllers/accounts_controller.py +555,'Update Stock' cannot be checked for fixed asset sale,&#39;Oppdater Stock &quot;kan ikke kontrolleres for driftsmiddel salg
+DocType: Student Guardian,Father,Far
+apps/erpnext/erpnext/controllers/accounts_controller.py +558,'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/buying/doctype/purchase_order/purchase_order.py +132,Material Request {0} is cancelled or stopped,Materialet Request {0} blir kansellert eller stoppet
@@ -2581,15 +2612,15 @@
 DocType: Sales Order,Fully Delivered,Fullt Leveres
 DocType: Lead,Lower Income,Lavere inntekt
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","Kontoen hodet etter Ansvar, hvor gevinst / tap vil bli bokført"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +166,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 +238,"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 +81,Purchase Order number required for Item {0},Innkjøpsordrenummeret som kreves for Element {0}
+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/purchase_receipt/purchase_receipt.py +82,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 +17,Cannot change status as student {0} is linked with student application {1},Kan ikke endre status som student {0} er knyttet til studentens søknad {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Kan ikke endre status som student {0} er knyttet til studentens søknad {1}
 DocType: Timesheet,"List of employee which has ""Salary Slip Based on Timesheet"" is enabled in salary structure.",Liste over ansatte som har &quot;Lønn Slip Basert på Timeregistrering&quot; er aktivert i lønn struktur.
 DocType: Asset,Fully Depreciated,fullt avskrevet
 ,Stock Projected Qty,Lager Antall projiserte
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Customer {0} does not belong to project {1},Kunden {0} ikke hører til prosjektet {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,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
@@ -2601,7 +2632,7 @@
 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/patches/v7_0/create_warehouse_nestedset.py +55,All Warehouses,alle Næringslokaler
+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 +105,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
@@ -2613,10 +2644,10 @@
 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/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Gjør Lønn Slip
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +26,Browse BOM,Bla BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,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/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 Year,Academic Year,Studieår
+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
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,Appraisal
@@ -2624,12 +2655,12 @@
 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 +197,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 +204,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: Workstation Working Hour,Start Time,Starttid
 DocType: Item Price,Bulk Import Help,Bulk Import Hjelp
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +256,Select Quantity,Velg Antall
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +257,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
@@ -2646,6 +2677,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Enten målet stk eller mål beløpet er obligatorisk.
 apps/erpnext/erpnext/config/projects.py +45,Cost of various activities,Kostnad for ulike aktiviteter
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Innstilling Hendelser til {0}, siden den ansatte knyttet til under selgerne ikke har en bruker-ID {1}"
+DocType: Timesheet,Billing Details,Fakturadetaljer
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +149,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}
 DocType: Item,Inspection Required,Inspeksjon påkrevd
@@ -2665,7 +2697,7 @@
 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 +138,Wire Transfer,Wire Transfer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,Wire Transfer
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Sjekk alt
 DocType: Sales Order,Recurring Order,Gjentakende Bestill
 DocType: Company,Default Income Account,Standard Inntekt konto
@@ -2677,21 +2709,19 @@
 ,Welcome to ERPNext,Velkommen til ERPNext
 apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,Føre til prisanslag
 DocType: Lead,From Customer,Fra Customer
-apps/erpnext/erpnext/demo/setup_data.py +357,Calls,Samtaler
+apps/erpnext/erpnext/demo/setup/setup_data.py +300,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/stock/doctype/item/item.py +466,"As there are existing transactions for this item, \
-							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Ettersom det er eksisterende transaksjoner for dette elementet, \ du ikke kan endre verdiene til &#39;Har Serial No &quot;,&quot; Har Batch No&#39;, &#39;Er Stock Element &quot;og&quot; verdsettelsesmetode&#39;"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,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/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 +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Merk: Systemet vil ikke sjekke over-levering og over-booking for Element {0} som mengde eller beløpet er 0
 DocType: Notification Control,Quotation Message,Sitat Message
 DocType: Issue,Opening Date,Åpningsdato
-apps/erpnext/erpnext/schools/api.py +58,Attendance has been marked successfully.,Oppmøte er merket med hell.
+apps/erpnext/erpnext/schools/api.py +57,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 +136,Account Type for {0} must be {1},Kontotype for {0} må være {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +139,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
@@ -2706,12 +2736,13 @@
 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/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 +20,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 +1190,Please select customer,Velg kunde
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1193,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
@@ -2721,6 +2752,7 @@
 ,Payment Period Based On Invoice Date,Betaling perioden basert på Fakturadato
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Mangler valutakurser for {0}
 DocType: Assessment,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-
@@ -2738,11 +2770,12 @@
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,emne Name
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Minst én av de selge eller kjøpe må velges
+DocType: Grading Structure,Grade Intervals,Vurder intervaller
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Velg formålet med virksomheten.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Hvor fabrikasjonsvirksomhet gjennomføres.
 DocType: Asset Movement,Source Warehouse,Kilde Warehouse
 DocType: Installation Note,Installation Date,Installasjonsdato
-apps/erpnext/erpnext/controllers/accounts_controller.py +534,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} ikke tilhører selskapet {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +537,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
@@ -2756,28 +2789,31 @@
 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 +111,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/scheduling_tool/scheduling_tool.py +49,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 +87,{0}% Delivered,{0}% Leveres
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% Leveres
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Element {0}: Bestilte qty {1} kan ikke være mindre enn minimum ordreantall {2} (definert i punkt).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Månedlig Distribution Prosent
 DocType: Territory,Territory Targets,Terri Targets
 DocType: Delivery Note,Transporter Info,Transporter Info
-apps/erpnext/erpnext/accounts/utils.py +379,Please set default {0} in Company {1},Vennligst sett standard {0} i selskapet {1}
+apps/erpnext/erpnext/accounts/utils.py +456,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
 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.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Titler for utskriftsmaler f.eks Proforma Faktura.
+DocType: Student Guardian,Student Guardian,student Guardian
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +184,Valuation type charges can not marked as Inclusive,Verdsettelse typen kostnader kan ikke merket som Inclusive
 DocType: POS Profile,Update Stock,Oppdater Stock
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Ulik målenheter for elementer vil føre til feil (Total) Netto vekt verdi. Sørg for at nettovekt av hvert element er i samme målenheter.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
 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 +349,Journal Entries {0} are un-linked,Journal Entries {0} er un-linked
+apps/erpnext/erpnext/accounts/utils.py +426,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
@@ -2801,6 +2837,7 @@
 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
+DocType: Homepage,"URL for ""All Products""",URL for &quot;Alle produkter&quot;
 DocType: Leave Application,Leave Balance Before Application,La Balance Før Application
 DocType: SMS Center,Send SMS,Send SMS
 DocType: Cheque Print Template,Width of amount in word,Bredde på beløpet i ord
@@ -2809,7 +2846,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 +29,Current Job Openings,Nåværende jobb Åpninger
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,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
@@ -2822,7 +2859,7 @@
 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 +850,Show tax break-up,Vis skatt break-up
+apps/erpnext/erpnext/public/js/controllers/transaction.js +841,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/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"
@@ -2832,10 +2869,11 @@
 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 +534,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 +80,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 +162,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/selling/doctype/customer/customer.py +195,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 +5,This is based on the attendance of this Student,Dette er basert på tilstedeværelse av denne Student
@@ -2844,12 +2882,11 @@
 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 +75,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 +138,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/hr/doctype/leave_application/leave_application.py +145,Note: There is not enough leave balance for Leave Type {0},Merk: Det er ikke nok permisjon balanse for La Type {0}
 DocType: Program Enrollment Fee,Program Enrollment Fee,Program innmeldingsavgift
 DocType: Item,Supplier Items,Leverandør Items
 DocType: Opportunity,Opportunity Type,Opportunity Type
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,Nytt firma
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,Cost Center is required for 'Profit and Loss' account {0},Kostnadssted er nødvendig for &#39;resultat&#39; konto {0}
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Transaksjoner kan bare slettes av skaperen av selskapet
 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.,Feil antall hovedbok Entries funnet. Du kan ha valgt feil konto i transaksjonen.
 DocType: Cheque Print Template,Cheque Width,sjekk Bredde
@@ -2858,16 +2895,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,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 +228,{0} '{1}' is disabled,{0} {1} er deaktivert
+apps/erpnext/erpnext/controllers/accounts_controller.py +231,{0} '{1}' is disabled,{0} {1} er deaktivert
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Sett som Åpen
 DocType: Cheque Print Template,Scanned Cheque,skannede Cheque
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Send automatisk e-poster til Kontakter på Sende transaksjoner.
+DocType: Timesheet,Total Billable Amount,Total Fakturerbart Beløp
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Sak 3
 DocType: Purchase Order,Customer Contact Email,Kundekontakt E-post
 DocType: Warranty Claim,Item and Warranty Details,Element og Garanti Detaljer
 DocType: Sales Team,Contribution (%),Bidrag (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Merk: Betaling Entry vil ikke bli laget siden &quot;Cash eller bankkontoen ble ikke spesifisert
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Responsibilities,Ansvarsområder
+apps/erpnext/erpnext/controllers/accounts_controller.py +78,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
 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
@@ -2875,6 +2913,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Legg til brukere
 DocType: Pricing Rule,Item Group,Varegruppe
 DocType: Item,Safety Stock,Safety Stock
+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: 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)
@@ -2884,7 +2923,6 @@
 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: Timesheet,Total Hours,Totalt antall timer
 DocType: Journal Entry,Printing Settings,Utskriftsinnstillinger
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,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
@@ -2897,13 +2935,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investment Banking
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +71,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
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Customer&gt; Kunde Group&gt; Territory
 DocType: Purchase Invoice Item,Rate,Rate
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Intern,Intern
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,Intern
 DocType: Stock Entry,From BOM,Fra BOM
 DocType: Assessment,Assessment Code,Assessment Kode
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +32,Basic,Grunnleggende
+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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',Vennligst klikk på &quot;Generer Schedule &#39;
+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 +95,Reference No is mandatory if you entered Reference Date,Referansenummer er obligatorisk hvis du skrev Reference Date
@@ -2912,11 +2951,11 @@
 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 +752,Issue Material,Issue Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +723,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 +683,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 +665,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.
 DocType: Hub Settings,Access Token,Tilgang Token
 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
@@ -2924,33 +2963,35 @@
 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 +1122,Enter value must be positive,Oppgi verdien skal være positiv
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,All Territories,Alle Territories
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1125,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
 DocType: Purchase Invoice,Items,Elementer
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +23,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 +221,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 +233,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 +96,Request for Quotations,Forespørsel om Sitater
+apps/erpnext/erpnext/hooks.py +104,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
 DocType: Asset,Partially Depreciated,delvis Avskrives
 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 +628,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standard Enhet for Variant {0} må være samme som i malen {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standard Enhet for Variant {0} må være samme som i malen {1}
 DocType: Shipping Rule,Calculate Based On,Beregn basert på
 DocType: Delivery Note Item,From Warehouse,Fra Warehouse
 DocType: Assessment,Supervisor Name,Supervisor Name
+DocType: Assessment,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
 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 +27,Default Address Template cannot be deleted,Standard adresse mal kan ikke slettes
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,Standard adresse mal kan ikke slettes
 DocType: Sales Invoice,Shipping Rule,Shipping Rule
 DocType: Manufacturer,Limited to 12 characters,Begrenset til 12 tegn
 DocType: Journal Entry,Print Heading,Print Overskrift
@@ -2965,8 +3006,8 @@
 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/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 +485,No default BOM exists for Item {0},Ingen standard BOM finnes for Element {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +336,Please select Posting Date first,Vennligst velg Publiseringsdato først
+apps/erpnext/erpnext/stock/get_item_details.py +486,No default BOM exists for Item {0},Ingen standard BOM finnes for Element {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +326,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
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Kostnadssted med eksisterende transaksjoner kan ikke konverteres til Ledger
@@ -2982,6 +3023,7 @@
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Match Betalinger med Fakturaer
 DocType: Journal Entry,Bank Entry,Bank Entry
 DocType: Authorization Rule,Applicable To (Designation),Gjelder til (Betegnelse)
+,Profitability Analysis,lønnsomhets~~POS=TRUNC
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,Legg til i handlevogn
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Grupper etter
 DocType: Guardian,Interests,Interesser
@@ -2994,21 +3036,21 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,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 +141,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Serialisert Element {0} kan ikke oppdateres \ bruker Stock Avstemming
 DocType: Scheduling Tool,Day,Dag
 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 +122,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 +129,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
-DocType: Student Applicant,AP.,AP.
 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 +639,Point of Sale,Utsalgssted
+apps/erpnext/erpnext/accounts/page/pos/pos.js +634,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
 DocType: Production Planning Tool,Production Planning Tool,Produksjonsplanlegging Tool
@@ -3017,74 +3059,77 @@
 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 +373,Quantity to Manufacture must be greater than 0.,Antall å Manufacture må være større enn 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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 Profile,Customer Group,Kundegruppe
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,Expense account is mandatory for item {0},Utgiftskonto er obligatorisk for elementet {0}
 DocType: Item,Website Description,Website Beskrivelse
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date must be on or after today,Neste avskrivningsdato må være på eller etter i dag
 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 +145,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: Quotation,Quotation Lost Reason,Sitat av Lost Reason
+apps/erpnext/erpnext/utilities/doctype/address/address.py +164,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.
 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 +330,Transaction reference no {0} dated {1},Transaksjonsreferanse ikke {0} datert {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,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 +107,Summary for this month and pending activities,Oppsummering for denne måneden og ventende aktiviteter
+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/accounts/doctype/sales_invoice/sales_invoice.py +406,Please remove this Invoice {0} from C-Form {1},Vennligst fjern denne Faktura {0} fra C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,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 +644,Get Items,Få Items
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +623,Get Items,Få Items
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +210,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 +41,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
 DocType: Payment Request,Initiated,Initiert
 DocType: Production Order,Planned Start Date,Planlagt startdato
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,Customer is required against Receivable account {0},Kunden er nødvendig mot fordringer konto {0}
 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 +265,Project-wise data is not available for Quotation,Prosjekt-messig data er ikke tilgjengelig for prisanslag
+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 +101,Commercial,Commercial
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,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/purchase_invoice/purchase_invoice.py +648,Row {0}# Account must be of type 'Fixed Asset',Rad {0} # konto må være av typen &quot;Fixed Asset &#39;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,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 +30,Series is mandatory,Serien er obligatorisk
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +50,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
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +165,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 +155,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Cr,Cr
 DocType: Tax Rule,Billing State,Billing State
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +250,Transfer,Transfer
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +187,{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 +825,Fetch exploded BOM (including sub-assemblies),Hente eksploderte BOM (inkludert underenheter)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +254,Transfer,Transfer
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +190,{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 +796,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 +115,Due Date is mandatory,Due Date er obligatorisk
+apps/erpnext/erpnext/controllers/accounts_controller.py +118,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
 DocType: Journal Entry,Pay To / Recd From,Betal Til / recd From
 DocType: Naming Series,Setup Series,Oppsett Series
 DocType: Payment Reconciliation,To Invoice Date,Å Fakturadato
 DocType: Supplier,Contact HTML,Kontakt HTML
 ,Inactive Customers,inaktive kunder
+DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Kjøps Kvitteringer
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Hvordan Pricing Rule er brukt?
 DocType: Quality Inspection,Delivery Note No,Levering Note Nei
@@ -3093,7 +3138,7 @@
 DocType: Company,Retail,Retail
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +120,Customer {0} does not exist,Kunden {0} finnes ikke
 DocType: Attendance,Absent,Fraværende
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +587,Product Bundle,Produktet Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Product Bundle,Produktet Bundle
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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
@@ -3103,8 +3148,8 @@
 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 +742,Send Supplier Emails,Send Leverandør e-post
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +104,"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/buying/doctype/request_for_quotation/request_for_quotation.js +708,Send Supplier Emails,Send Leverandør e-post
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,"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.
 DocType: Guardian Interest,Guardian Interest,Guardian Rente
 DocType: Timesheet,Employee Detail,Medarbeider Detalj
@@ -3115,9 +3160,9 @@
 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}
 DocType: Salary Slip,Earning & Deduction,Tjene &amp; Fradrag
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +77,Account {0} cannot be a Group,Konto {0} kan ikke være en gruppe
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} cannot be a Group,Konto {0} kan ikke være en gruppe
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +31,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 +107,Negative Valuation Rate is not allowed,Negative Verdivurdering Rate er ikke tillatt
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Negative Verdivurdering Rate er ikke tillatt
 DocType: Holiday List,Weekly Off,Ukentlig Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","For eksempel 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +39,Provisional Profit / Loss (Credit),Foreløpig Profit / Loss (Credit)
@@ -3131,16 +3176,16 @@
 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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Kostnadssted er obligatorisk for Element {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +626,Get Items from Product Bundle,Få Elementer fra Produkt Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +605,Get Items from Product Bundle,Få Elementer fra Produkt Bundle
 DocType: Asset,Straight Line,Rett linje
 DocType: Project User,Project User,prosjekt Bruker
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} is inactive,Konto {0} er inaktiv
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} is inactive,Konto {0} er inaktiv
 DocType: GL Entry,Is Advance,Er Advance
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Oppmøte Fra Dato og oppmøte To Date er obligatorisk
 apps/erpnext/erpnext/controllers/buying_controller.py +148,Please enter 'Is Subcontracted' as Yes or No,Skriv inn &#39;Er underleverandør&#39; som Ja eller Nei
 DocType: Sales Team,Contact No.,Kontaktnummer.
 DocType: Bank Reconciliation,Payment Entries,Betalings Entries
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,'Profit and Loss' type account {0} not allowed in Opening Entry,&quot;Resultat &#39;type konto {0} ikke tillatt i Åpning Entry
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +71,'Profit and Loss' type account {0} not allowed in Opening Entry,&quot;Resultat &#39;type konto {0} ikke tillatt i Åpning Entry
 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
@@ -3159,7 +3204,7 @@
 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,Provisjon på salg
 DocType: Offer Letter Term,Value / Description,Verdi / beskrivelse
-apps/erpnext/erpnext/controllers/accounts_controller.py +558,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} kan ikke sendes inn, er det allerede {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +561,"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: Production Order,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}.
@@ -3172,13 +3217,13 @@
 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/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Legal Expenses,Rettshjelp
 DocType: Purchase Invoice,Posting Time,Postering Tid
-DocType: Sales Order,% Amount Billed,% Mengde Fakturert
+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.
 apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},Ingen Element med Serial No {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Åpne Påminnelser
+DocType: Email Digest,Open Notifications,Åpne Påminnelser
 DocType: Payment Entry,Difference Amount (Company Currency),Forskjell Beløp (Selskap Valuta)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,Direkte kostnader
 apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
@@ -3186,7 +3231,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Ny kunde Revenue
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,Reiseutgifter
 DocType: Maintenance Visit,Breakdown,Sammenbrudd
-apps/erpnext/erpnext/controllers/accounts_controller.py +634,Account: {0} with currency: {1} can not be selected,Konto: {0} med valuta: {1} kan ikke velges
+apps/erpnext/erpnext/controllers/accounts_controller.py +637,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}
 DocType: Program Enrollment Tool,Student Applicants,student Søkere
@@ -3194,15 +3239,15 @@
 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 +56,Probation,Prøvetid
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Probation,Prøvetid
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,lønn Components
 DocType: Program Enrollment Tool,New Academic Year,Nytt studieår
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Payment of salary for the month {0} and year {1},Utbetaling av lønn for måneden {0} og år {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Payment of salary for the month {0} and year {1},Utbetaling av lønn for måneden {0} og år {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Auto innsats Prisliste rente hvis mangler
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Totalt innbetalt beløp
 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 +144,Planning,Planlegging
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,Planlegging
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,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
@@ -3215,11 +3260,10 @@
 DocType: Sales Partner,Contact Desc,Kontakt Desc
 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.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Sales invoice submitted sucessfully.,Salg faktura sendes vellykket.
 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}
 DocType: Assessment Result,Student Name,Student navn
-apps/erpnext/erpnext/hooks.py +104,Assessment Schedule,Assessment Schedule
+apps/erpnext/erpnext/hooks.py +113,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
@@ -3229,6 +3273,7 @@
 DocType: GL Entry,Party Type,Partiet Type
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +78,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
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Lønn mal mester.
 DocType: Leave Type,Max Days Leave Allowed,Max Dager La tillatt
@@ -3240,18 +3285,19 @@
 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 +99,All Customer Groups,Alle kundegrupper
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +78,Accumulated Monthly,akkumulert pr måned
-apps/erpnext/erpnext/controllers/accounts_controller.py +595,{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/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Alle kundegrupper
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +81,Accumulated Monthly,akkumulert pr måned
+apps/erpnext/erpnext/controllers/accounts_controller.py +598,{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
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Prisliste Rate (Selskap Valuta)
 DocType: Products Settings,Products Settings,Produkter Innstillinger
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +188,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
 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 +84,Secretary,Sekretær
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,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
@@ -3260,24 +3306,22 @@
 ,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
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,Row # {0}: Serial No er obligatorisk
+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 +859,Supplier Quotation,Leverandør sitat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +838,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 +7,Collect Fees,samle gebyrer
+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}
 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.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Kommende arrangementer
 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
-DocType: Email Digest,Income / Expense,Inntekt / Kostnad
 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."
@@ -3288,13 +3332,14 @@
 DocType: Customer,From Lead,Fra Lead
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Bestillinger frigitt for produksjon.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Velg regnskapsår ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,POS Profile required to make POS Entry,POS Profile nødvendig å foreta POS Entry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +509,POS Profile required to make POS Entry,POS Profile nødvendig å foreta POS Entry
 DocType: Program Enrollment Tool,Enroll Students,Meld Studenter
 DocType: Hub Settings,Name Token,Navn Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard Selling
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Atleast one warehouse is mandatory,Minst én lageret er obligatorisk
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +129,Atleast one warehouse is mandatory,Minst én lageret er obligatorisk
 DocType: Serial No,Out of Warranty,Ut av Garanti
 DocType: BOM Replace Tool,Replace,Erstatt
+DocType: Production Order,Unstopped,lukkes
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Invoice {1},{0} mot Sales Faktura {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Prosjektnavn
@@ -3315,10 +3360,11 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Bladene skal avsettes i multipler av 0,5"
 DocType: Production Order,Operation Cost,Operation Cost
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,Last opp oppmøte fra en CSV-fil
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Enestående Amt
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Sette mål varegruppe-messig for Sales Person.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Freeze Aksjer Eldre enn [dager]
-apps/erpnext/erpnext/controllers/accounts_controller.py +528,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: Asset er obligatorisk for anleggsmiddel kjøp / salg
+apps/erpnext/erpnext/controllers/accounts_controller.py +531,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: Asset er obligatorisk for anleggsmiddel kjøp / salg
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Hvis to eller flere Prising Reglene er funnet basert på de ovennevnte forhold, er Priority brukt. Prioritet er et tall mellom 0 og 20, mens standardverdi er null (blank). Høyere tall betyr at det vil ha forrang dersom det er flere Prising regler med samme betingelser."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Fiscal Year: {0} ikke eksisterer
 DocType: Currency Exchange,To Currency,Å Valuta
@@ -3335,15 +3381,15 @@
 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
-DocType: Sales Invoice,Exhibition,Utstilling
 apps/erpnext/erpnext/utilities/doctype/address/address.py +77,"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 +81,Syntax error in formula or condition: {0},Syntaksfeil i formelen eller tilstand: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +92,Syntax error in formula or condition: {0},Syntaksfeil i formelen eller tilstand: {0}
 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
+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 +28,Jobs,Jobs
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,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
@@ -3352,16 +3398,16 @@
 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 +763,Make Supplier Quotation,Gjør Leverandør sitat
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,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/controllers/sales_and_purchase_return.py +100,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 +42,Casual Leave,Casual La
+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
 DocType: Batch,Batch ID,Batch ID
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,Note: {0},Merk: {0}
 ,Delivery Note Trends,Levering Note Trender
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +103,This Week's Summary,Denne ukens oppsummering
+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
 DocType: Student Group Creation Tool,Get Courses,Få Kurs
 DocType: GL Entry,Party,Selskap
@@ -3371,7 +3417,7 @@
 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 +59,Piecework,Akkord
+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
 DocType: Task,Actual Time (in Hours),Virkelig tid (i timer)
 DocType: Employee,History In Company,Historie I selskapet
@@ -3388,7 +3434,7 @@
 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.
 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 +162,Black,Svart
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,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
@@ -3399,13 +3445,13 @@
 DocType: Project Task,Pending Review,Avventer omtale
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +106,"Asset {0} cannot be scrapped, as it is already {1}","Asset {0} kan ikke bli vraket, som det er allerede {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Total Expense krav (via Expense krav)
-apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +69,Customer Id,Kunde-ID
+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
 DocType: Journal Entry Account,Exchange Rate,Vekslingskurs
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Sales Order {0} is not submitted,Salgsordre {0} er ikke innsendt
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +527,Sales Order {0} is not submitted,Salgsordre {0} er ikke innsendt
 DocType: Homepage,Tag Line,tag Linje
 DocType: Fee Component,Fee Component,Fee Component
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +857,Add items from,Legg elementer fra
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +836,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}
 DocType: Cheque Print Template,Regular,Regelmessig
 DocType: BOM,Last Purchase Rate,Siste Purchase Rate
@@ -3413,6 +3459,7 @@
 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
 ,Sales Person-wise Transaction Summary,Transaksjons Oppsummering Sales Person-messig
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +60,Cost Center is required for 'Profit and Loss' account {0}. Please set up a default Cost Center for the Company.,Kostnadssted er nødvendig for &#39;resultat&#39; konto {0}. Sett opp en standardkostnadssted for selskapet.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,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
@@ -3423,12 +3470,12 @@
 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 +710,Online,på nett
+apps/erpnext/erpnext/accounts/page/pos/pos.js +692,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 +16,Setting this Address Template as default as there is no other default,Sette dette Adressemal som standard så er det ingen andre standard
+apps/erpnext/erpnext/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
 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 +74,Quality Management,Kvalitetsstyring
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,Kvalitetsstyring
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,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
@@ -3450,11 +3497,12 @@
 DocType: Student,Student Email ID,Student Email ID
 DocType: Employee,Notice (days),Varsel (dager)
 DocType: Tax Rule,Sales Tax Template,Merverdiavgift Mal
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1520,Select items to save the invoice,Velg elementer for å lagre fakturaen
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1544,Select items to save the invoice,Velg elementer for å lagre fakturaen
 DocType: Employee,Encashment Date,Encashment Dato
 DocType: Account,Stock Adjustment,Stock Adjustment
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Standard Aktivitet Kostnad finnes for Aktivitetstype - {0}
 DocType: Production Order,Planned Operating Cost,Planlagt driftskostnader
+DocType: Academic Term,Term Start Date,Term Startdato
 apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},Vedlagt {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Kontoutskrift balanse pr hovedbok
 DocType: Job Applicant,Applicant Name,Søkerens navn
@@ -3484,17 +3532,17 @@
 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.
 DocType: Company,Distribution,Distribusjon
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +8,Amount Paid,Beløpet Betalt
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Project Manager,Prosjektleder
+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
 ,Quoted Item Comparison,Sitert Element Sammenligning
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Dispatch,Dispatch
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,Dispatch
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Maks rabatt tillatt for element: {0} er {1}%
 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.
-DocType: Sales Invoice,Supplier Reference,Leverandør Reference
-apps/erpnext/erpnext/accounts/page/pos/pos.js +844,"Master data syncing, it might take some time","Master data synkronisering, kan det ta litt tid"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +832,"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
@@ -3508,7 +3556,7 @@
 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 +83,Error in formula or condition,Feil i formelen eller tilstand
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,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
@@ -3517,7 +3565,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},To Date bør være innenfor regnskapsåret. Antar To Date = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Her kan du opprettholde høyde, vekt, allergier, medisinske bekymringer etc"
 DocType: Leave Block List,Applies to Company,Gjelder Selskapet
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +197,Cannot cancel because submitted Stock Entry {0} exists,Kan ikke avbryte fordi innsendt Stock Entry {0} finnes
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +198,Cannot cancel because submitted Stock Entry {0} exists,Kan ikke avbryte fordi innsendt Stock Entry {0} finnes
 DocType: Purchase Invoice,In Words,I Words
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,Today is {0}'s birthday!,I dag er {0} s bursdag!
 DocType: Production Planning Tool,Material Request For Warehouse,Materialet Request For Warehouse
@@ -3527,14 +3575,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,Din regnskapsår begynner på
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Asset Avskrivninger og Balanserer
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +319,Amount {0} {1} transferred from {2} to {3},Mengden {0} {1} overført fra {2} til {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +322,Amount {0} {1} transferred from {2} to {3},Mengden {0} {1} overført fra {2} til {3}
 DocType: Sales Invoice,Get Advances Received,Få Fremskritt mottatt
 DocType: Email Digest,Add/Remove Recipients,Legg til / fjern Mottakere
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +432,Transaction not allowed against stopped Production Order {0},Transaksjonen ikke lov mot stoppet Produksjonsordre {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +437,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 +143,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 +652,Item variant {0} exists with same attributes,Sak variant {0} finnes med samme attributtene
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Sak variant {0} finnes med samme attributtene
+DocType: Leave Application,LAP/,RUNDE/
 DocType: Salary Slip,Salary Slip,Lønn Slip
 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
@@ -3542,12 +3591,12 @@
 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 +212,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 +215,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/public/js/controllers/transaction.js +866,It is needed to fetch Item Details.,Det er nødvendig å hente Element detaljer.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +857,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
@@ -3557,14 +3606,14 @@
 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 +178,Invalid {0},Ugyldig {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Sick Leave,Sykefravær
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,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
 DocType: Warehouse,PIN,PIN
 DocType: Sales Invoice,Base Change Amount (Company Currency),Base Endre Beløp (Selskap Valuta)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +313,No accounting entries for the following warehouses,Ingen regnskapspostene for følgende varehus
-apps/erpnext/erpnext/projects/doctype/project/project.js +102,Save the document first.,Lagre dokumentet først.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +314,No accounting entries for the following warehouses,Ingen regnskapspostene for følgende varehus
+apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Lagre dokumentet først.
 DocType: Account,Chargeable,Avgift
 DocType: Company,Change Abbreviation,Endre Forkortelse
 DocType: Expense Claim Detail,Expense Date,Expense Dato
@@ -3577,10 +3626,9 @@
 DocType: Purchase Invoice,Recurring Print Format,Gjentakende 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 Purchase Order Date
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,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
 DocType: Appraisal,Appraisal Template,Appraisal Mal
 DocType: Item Group,Item Classification,Sak Klassifisering
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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
@@ -3590,8 +3638,8 @@
 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 +940,Please select {0} first,Vennligst velg {0} først
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +749,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 +953,Please select {0} first,Vennligst velg {0} først
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +757,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
@@ -3608,8 +3656,8 @@
 {% 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 +92,Warehouse not found in the system,Warehouse ikke funnet i systemet
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +106,This Month's Summary,Denne måneden Oppsummering
+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
 DocType: Quality Inspection Reading,Quality Inspection Reading,Quality Inspection Reading
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Freeze Aksjer Eldre Than` bør være mindre enn% d dager.
 DocType: Tax Rule,Purchase Tax Template,Kjøpe Tax Mal
@@ -3619,21 +3667,22 @@
 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 +87,Please set Next Depreciation Date,Vennligst sett Neste Avskrivninger Dato
-DocType: Payment Gateway,Payment Gateway,Betaling Gateway
 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 +378,Operation Time must be greater than 0 for Operation {0},Operation Tid må være større enn 0 for operasjon {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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/accounts/doctype/account/account.py +170,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)
 DocType: Program,Program Abbreviation,program forkortelse
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,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: Appraisal,Start Date,Startdato
@@ -3649,21 +3698,22 @@
 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
 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 +27,Transaction currency must be same as Payment Gateway currency,Transaksjons valuta må være samme som Payment Gateway valuta
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Transaction currency must be same as Payment Gateway currency,Transaksjons valuta må være samme som Payment Gateway valuta
 DocType: Payment Entry,Receive,Motta
+apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,sitater:
 DocType: Maintenance Visit,Fully Completed,Fullt Fullført
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Komplett
 DocType: Employee,Educational Qualification,Pedagogiske Kvalifikasjoner
 DocType: Workstation,Operating Costs,Driftskostnader
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Tiltak hvis Snø Månedlig budsjett Skredet
 DocType: Purchase Invoice,Submit on creation,Send inn på skapelse
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +432,Currency for {0} must be {1},Valuta for {0} må være {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +435,Currency for {0} must be {1},Valuta for {0} må være {1}
 DocType: Asset,Disposal Date,Deponering Dato
 DocType: Employee Leave Approver,Employee Leave Approver,Ansatt La Godkjenner
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,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 +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/crm/doctype/opportunity/opportunity.py +79,"Cannot declare as lost, because Quotation has been made.","Kan ikke erklære som tapt, fordi tilbudet er gjort."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Kjøp Master manager
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +429,Production Order {0} must be submitted,Produksjonsordre {0} må sendes
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +434,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
@@ -3673,25 +3723,27 @@
 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/accounts/report/general_ledger/general_ledger.py +181,Totals,Totals
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,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 +113,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 +120,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.
+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 +181,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/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 +793,All records are synced.,Alle poster er synkronisert.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +781,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
 DocType: Cost Center,Cost Center Name,Kostnadssteds Name
@@ -3710,21 +3762,20 @@
 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/selling/doctype/quotation/quotation.py +49,Cannot set as Lost as Sales Order is made.,Kan ikke settes som tapt som Salgsordre er gjort.
-DocType: Student Applicant,Mother's Name,Mors navn
 DocType: Request for Quotation Item,Supplier Part No,Leverandør varenummer
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +348,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Kan ikke trekke når kategorien er for verdsetting &#39;eller&#39; Vaulation og Total &#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Received From,Mottatt fra
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Received From,Mottatt fra
 DocType: Lead,Converted,Omregnet
 DocType: Item,Has Serial No,Har Serial No
 DocType: Employee,Date of Issue,Utstedelsesdato
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{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 +93,Row {0}: Hours value must be greater than zero.,Rad {0}: Timer verdien må være større enn null.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +117,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
 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 +172,{0} {1} does not exist,{0} {1} finnes ikke
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +175,{0} {1} does not exist,{0} {1} finnes ikke
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,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 +72,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
@@ -3733,13 +3784,14 @@
 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/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
 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 +109,Electrical,Elektrisk
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Electrical,Elektrisk
 DocType: Stock Entry,Total Value Difference (Out - In),Total verdi Difference (ut -)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,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}
@@ -3747,7 +3799,7 @@
 DocType: Item,Customer Code,Kunden Kode
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +210,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 +292,Debit To account must be a Balance Sheet account,Uttak fra kontoen må være en balansekonto
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To account must be a Balance Sheet account,Uttak fra kontoen må være en balansekonto
 DocType: Buying Settings,Naming Series,Navngi Series
 DocType: Leave Block List,Leave Block List Name,La Block List Name
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Aksje Eiendeler
@@ -3759,11 +3811,11 @@
 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 +301,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 +313,Salary Slip of employee {0} already created for time sheet {1},Lønn Slip av ansattes {0} allerede opprettet for timeregistrering {1}
 DocType: Sales Order Item,Ordered Qty,Bestilte Antall
-apps/erpnext/erpnext/stock/doctype/item/item.py +673,Item {0} is disabled,Element {0} er deaktivert
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,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 +838,BOM does not contain any stock item,BOM inneholder ikke lagervare
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +809,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.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generere lønnsslipper
@@ -3771,23 +3823,24 @@
 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)
-apps/erpnext/erpnext/stock/doctype/item/item.py +485,Row #{0}: Please set reorder quantity,Row # {0}: Vennligst sett omgjøring kvantitet
+DocType: Sales Invoice Timesheet,Billing Hours,fakturerings~~POS=TRUNC Timer
+apps/erpnext/erpnext/stock/doctype/item/item.py +487,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 +62,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
+DocType: Payment Entry,Allocate Payment Amount,Fordele Betalingsbeløp
 DocType: Employee External Work History,Salary,Lønn
 DocType: Serial No,Delivery Document Type,Levering dokumenttype
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Send inn alle lønnsslipper for de ovenfor valgte kriterier
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} elementer synkronisert
 DocType: Sales Order,Partly Delivered,Delvis Leveres
-DocType: Sales Invoice,Existing Customer,Eksisterende kunde
 DocType: Email Digest,Receivables,Fordringer
+DocType: Lead Source,Lead Source,Lead Source
 DocType: Customer,Additional information regarding the customer.,Ytterligere informasjon om kunden.
 DocType: Quality Inspection Reading,Reading 5,Reading 5
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +38,Campaign Name is required,Kampanjenavn er påkrevd
 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
@@ -3795,10 +3848,9 @@
 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 +129,BOM and Manufacturing Quantity are required,BOM og Industri Antall kreves
+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/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Aldring Range 2
 DocType: SG Creation Tool Course,Max Strength,Max Strength
-DocType: Bank Reconciliation Detail,Amount,Beløp
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM erstattet
 ,Sales Analytics,Salgs Analytics
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +113,Available {0},Tilgjengelig {0}
@@ -3806,14 +3858,14 @@
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Sette opp e-post
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +96,Please enter default currency in Company Master,Skriv inn standardvaluta i selskapet Master
 DocType: Stock Entry Detail,Stock Entry Detail,Stock Entry Detail
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +100,Daily Reminders,Daglige påminnelser
+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/account/account_tree.js +23,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 +71,Customer Service,Kundeservice
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Customer Service,Kundeservice
 DocType: Homepage Featured Product,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.
@@ -3822,8 +3874,9 @@
 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
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Standard Work In Progress Warehouse
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1570,Total nos of serial no is not equal to quantity.,Totalt nos av serienummer er ikke lik mengde.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1594,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
@@ -3831,9 +3884,10 @@
 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 +82,Engineer,Ingeniør
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,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 +370,Item Code required at Row No {0},Elementkode kreves ved Row Nei {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +398,Item Code required at Row No {0},Elementkode kreves ved Row Nei {0}
 DocType: Sales Partner,Partner Type,Partner Type
 DocType: Purchase Taxes and Charges,Actual,Faktiske
 DocType: Authorization Rule,Customerwise Discount,Customerwise Rabatt
@@ -3849,16 +3903,18 @@
 DocType: BOM,Raw Material Cost,Raw Material Cost
 DocType: Item Reorder,Re-Order Level,Re-Order nivå
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Skriv inn elementer og planlagt stk som du ønsker å heve produksjonsordrer eller laste råvarer for analyse.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +55,Part-time,Deltid
+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
 DocType: Employee,Applicable Holiday List,Gjelder Holiday List
 DocType: Employee,Cheque,Cheque
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Serien Oppdatert
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +57,Series Updated,Serien Oppdatert
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Rapporter Type er obligatorisk
 DocType: Item,Serial Number Series,Serienummer Series
 apps/erpnext/erpnext/buying/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 +87,Clearance Date updated,Lagersalg oppdatert
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Vellykket Forsonet
@@ -3872,7 +3928,7 @@
 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 +513,Posting date and posting time is mandatory,Konteringsdato og legger tid er obligatorisk
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Konteringsdato og legger tid er obligatorisk
 apps/erpnext/erpnext/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.
@@ -3882,7 +3938,7 @@
 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/stock/doctype/stock_entry/stock_entry.py +158,Target warehouse in row {0} must be same as Production Order,Target lager i rad {0} må være samme som produksjonsordre
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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
 DocType: Company,Round Off Account,Rund av konto
@@ -3891,23 +3947,22 @@
 DocType: Customer Group,Parent Customer Group,Parent Kundegruppe
 DocType: Purchase Invoice,Contact Email,Kontakt Epost
 DocType: Appraisal Goal,Score Earned,Resultat tjent
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Notice Period,Oppsigelsestid
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,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 +4,New Sales Person Name,New Sales Person navn
 DocType: Packing Slip,Gross Weight UOM,Bruttovekt målenheter
-DocType: Email Digest,Receivables / Payables,Fordringer / gjeld
 DocType: Delivery Note Item,Against Sales Invoice,Mot Salg Faktura
 DocType: Bin,Reserved Qty for Production,Reservert Antall for produksjon
 DocType: Asset,Frequency of Depreciation (Months),Frekvens av Avskrivninger (måneder)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +469,Credit Account,Credit konto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Credit Account,Credit konto
 DocType: Landed Cost Item,Landed Cost Item,Landed Cost Element
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +55,Show zero values,Vis nullverdier
+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
 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 +647,Please specify Attribute Value for attribute {0},Vennligst oppgi data Verdi for attributtet {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Vennligst oppgi data Verdi for attributtet {0}
 DocType: Item,Default Warehouse,Standard Warehouse
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +39,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
@@ -3929,19 +3984,22 @@
 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
-DocType: Sales Invoice,Cold Calling,Cold Calling
 DocType: SMS Parameter,SMS Parameter,SMS Parameter
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,Budsjett og kostnadssted
 DocType: Maintenance Schedule Item,Half Yearly,Halvårlig
 DocType: Lead,Blog Subscriber,Blogg Subscriber
+DocType: Guardian,Alternate Number,Alternativ nummer
 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."
+DocType: Stock Reconciliation Item,Quantity Difference,Antall Difference
 apps/erpnext/erpnext/config/hr.py +253,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 +141,Set as Lost,Sett som tapte
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,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 +5,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
 DocType: Supplier,Credit Days Based On,Kreditt Days Based On
@@ -3953,11 +4011,10 @@
 ,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 +941,Select or add new customer,Velg eller legg til ny kunde
+apps/erpnext/erpnext/accounts/page/pos/pos.js +930,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 +5,This is based on the attendance of this Employee,Dette er basert på tilstedeværelse av denne Employee
-DocType: Sales Invoice,Frequency,Hyppighet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +463,Debit Account,Debet konto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,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)
@@ -3966,27 +4023,27 @@
 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 +210,Supplier Quotation {0} created,Leverandør sitat {0} er opprettet
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +208,Supplier Quotation {0} created,Leverandør sitat {0} er opprettet
 apps/erpnext/erpnext/accounts/report/financial_statements.py +90,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 +173,Employee Benefits,Ytelser til ansatte
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,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 +228,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 +232,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 +499,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 +500,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 +1007,Price List not found or disabled,Prisliste ikke funnet eller deaktivert
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1008,Price List not found or disabled,Prisliste ikke funnet eller deaktivert
 DocType: Expense Claim,Approved,Godkjent
 DocType: Pricing Rule,Price,Pris
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +244,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 +256,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
@@ -3997,12 +4054,12 @@
 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 +259,Please select Employee Record first.,Vennligst velg Employee Record først.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +266,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 +190,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 +235,Please enter Expense Account,Skriv inn Expense konto
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,Please enter Expense Account,Skriv inn Expense konto
 DocType: Account,Stock,Lager
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,"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 +976,"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
@@ -4017,9 +4074,10 @@
 DocType: Asset Movement,Transaction Date,Transaksjonsdato
 DocType: Production Plan Item,Planned Qty,Planlagt Antall
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,Total Skatte
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,For Quantity (Manufactured Qty) is mandatory,For Mengde (Produsert Stk) er obligatorisk
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,For Quantity (Manufactured Qty) is mandatory,For Mengde (Produsert Stk) er obligatorisk
 DocType: Stock Entry,Default Target Warehouse,Standard Target Warehouse
 DocType: Purchase Invoice,Net Total (Company Currency),Net Total (Selskap Valuta)
+apps/erpnext/erpnext/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 +78,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: Production Order,Actual Start Date,Faktisk startdato
@@ -4034,9 +4092,11 @@
 DocType: Warranty Claim,If different than customer address,Hvis annerledes enn kunden adresse
 DocType: BOM Operation,BOM Operation,BOM Operation
 DocType: Purchase Taxes and Charges,On Previous Row Amount,På Forrige Row Beløp
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +226,Transfer Asset,Transfer Asset
+DocType: Student,Home Address,Hjemmeadresse
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +227,Transfer Asset,Transfer Asset
 DocType: POS Profile,POS Profile,POS Profile
 apps/erpnext/erpnext/config/schools.py +33,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 +129,"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
@@ -4046,8 +4106,8 @@
 DocType: Assessment,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 +765,Material to Supplier,Materiale til Leverandør
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +189,Excise Invoice,Vesenet Faktura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,Material to Supplier,Materiale til Leverandør
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,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
@@ -4057,7 +4117,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,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 +136,Credit Card,Kredittkort
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,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.
 DocType: Purchase Invoice,Next Date,Neste dato
@@ -4065,6 +4125,7 @@
 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: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Her kan du opprettholde familie informasjon som navn og okkupasjon av foreldre, ektefelle og barn"
+DocType: Academic Term,Term End Date,Term Sluttdato
 DocType: Hub Settings,Seller Name,Selger Navn
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Skatter og avgifter fratrukket (Company Valuta)
 DocType: Item Group,General Settings,Generelle Innstillinger
@@ -4076,7 +4137,7 @@
 DocType: Customer,Commission Rate,Kommisjon
 apps/erpnext/erpnext/stock/doctype/item/item.js +261,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 +115,"Payment Type must be one of Receive, Pay and Internal Transfer","Betalingstype må være en av Motta, Lønn og Internal Transfer"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +118,"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/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Handlevognen er tom
 DocType: Production Order,Actual Operating Cost,Faktiske driftskostnader
@@ -4091,10 +4152,10 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,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 +92,Designer,Designer
+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
 DocType: Serial No,Delivery Details,Levering Detaljer
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +469,Cost Center is required in row {0} in Taxes table for type {1},Kostnadssted er nødvendig i rad {0} i skatter tabell for typen {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +472,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
 ,Item-wise Purchase Register,Element-messig Purchase Register
 DocType: Batch,Expiry Date,Utløpsdato
@@ -4104,12 +4165,12 @@
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Prosjektet mester.
 apps/erpnext/erpnext/controllers/status_updater.py +174,"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 +417, (Half Day),(Halv Dag)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425, (Half Day),(Halv Dag)
 DocType: Supplier,Credit Days,Kreditt Days
 DocType: Leave Type,Is Carry Forward,Er fremføring
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +740,Get Items from BOM,Få Elementer fra BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +711,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 +549,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/controllers/accounts_controller.py +552,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
diff --git a/erpnext/translations/pl.csv b/erpnext/translations/pl.csv
index e0124d0..cd6d29b 100644
--- a/erpnext/translations/pl.csv
+++ b/erpnext/translations/pl.csv
@@ -18,11 +18,10 @@
 DocType: Sales Partner,Dealer,Diler
 DocType: Employee,Rented,Wynajęty
 DocType: Purchase Order,PO-,PO-
-apps/erpnext/erpnext/accounts/report/financial_statements.py +19,Start Year {0} not found.,Zacznij Rok {0} nie została znaleziona.
 DocType: POS Profile,Applicable for User,Zastosowanie dla użytkownika
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +191,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Zatrzymany Zamówienie produkcji nie mogą być anulowane, odetkać najpierw anulować"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +197,Do you really want to scrap this asset?,Czy naprawdę chcemy zlikwidować ten atut?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +17,Select Default Supplier,Wybierz Domyślne Dostawca
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +192,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Zatrzymany Zamówienie produkcji nie mogą być anulowane, odetkać najpierw anulować"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +198,Do you really want to scrap this asset?,Czy naprawdę chcemy zlikwidować ten atut?
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Wybierz Domyślne Dostawca
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Waluta jest wymagana dla Cenniku {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Zostanie policzony dla transakcji.
 DocType: Address,County,Hrabstwo
@@ -42,46 +41,45 @@
 DocType: Sales Invoice,Customer Name,Nazwa klienta
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +126,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 +180,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 +183,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 +148,Series Updated Successfully,Seria zaktualizowana
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +149,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
-DocType: Quality Inspection Reading,Parameter,Parametr
 apps/erpnext/erpnext/projects/doctype/project/project.py +54,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 +239,New Leave Application,Druk Nowego Zwolnienia
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,New Leave Application,Druk Nowego Zwolnienia
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +20,Attendance Record {0} exists against Student {1} for Course Schedule {2},Obecność Record {0} istnieje przeciwko Student {1} dla zajęć {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Bank Draft,Przekaz bankowy
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,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
 DocType: Academic Term,Academic Term,semestr
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +13,Material,Materiał
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Quantity,Ilość
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +511,Accounts table cannot be blank.,Konta tabeli nie może być puste.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +616,Quantity,Ilość
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +512,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)
 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/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 +142,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
-DocType: Purchase Invoice,Monthly,Miesięcznie
 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/buying/doctype/purchase_order/purchase_order.js +771,Invoice,Faktura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +750,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 +198,Row {0}: {1} {2} does not match with {3},Wiersz {0}: {1} {2} nie zgadza się z {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Wiersz # {0}:
+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 +127,Please select Price List,Wybierz Cennik
@@ -112,8 +110,8 @@
 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 +589,Get items from,Pobierz zawartość z
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +382,Stock cannot be updated against Delivery Note {0},
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Pobierz zawartość z
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,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ć
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Artykuły spożywcze
@@ -122,7 +120,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 +156,Salary Structure Missing,Struktura Wynagrodzenie Brakujący
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,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,
@@ -130,10 +128,11 @@
 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 +156,Credit limit has been crossed for customer {0} {1}/{2},Limit kredytowy został przekroczony dla klienta {0} {1} / {2}
-apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Czy trwałego&quot; nie może być zaznaczone, jak istnieje rekord zasobu przeciwko pozycji"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +189,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","&quot;Czy trwałego&quot; nie może być zaznaczone, jak istnieje rekord zasobu przeciwko pozycji"
 DocType: Tax Rule,Tax Type,Rodzaj podatku
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +144,You are not authorized to add or update entries before {0},Nie masz uprawnień aby zmieniać lub dodawać elementy przed {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,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/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
@@ -143,18 +142,17 @@
 DocType: Student Log,Student Log,Student Zaloguj
 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 +165,Opening,Otwarcie
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,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/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Klient&gt; Grupa klientów&gt; Terytorium
 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).
 DocType: Lead,Product Enquiry,Zapytanie o produkt
 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 +335,Please select Company first,Najpierw wybierz firmę
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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
@@ -164,7 +162,7 @@
 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
 DocType: Purchase Invoice Item,Is Fixed Asset,Czy trwałego
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Available qty is {0}, you need {1}","Ilość dostępnych jest {0}, musisz {1}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +225,"Available qty is {0}, you need {1}","Ilość dostępnych jest {0}, musisz {1}"
 DocType: Expense Claim Detail,Claim Amount,Kwota roszczenia
 DocType: Employee,Mr,Pan
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Typ dostawy / dostawca
@@ -173,26 +171,27 @@
 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: Assessment Result,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 +171,Annual Salary,Roczne Wynagrodzenie
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Annual Salary,Roczne Wynagrodzenie
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Wydatki na składowanie
-apps/erpnext/erpnext/accounts/report/financial_statements.py +22,End Year {0} not found.,Koniec roku {0} nie została znaleziona.
 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})
 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 +130,At least one mode of payment is required for POS invoice.,Co najmniej jeden tryb płatności POS jest wymagane dla faktury.
 DocType: Products Settings,Show Products as a List,Wyświetl produkty w układzie listy
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Pobierz szablon, wypełnić odpowiednie dane i dołączyć zmodyfikowanego pliku.
  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 +451,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/stock/doctype/stock_entry/stock_entry.py +456,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/controllers/accounts_controller.py +614,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",
+apps/erpnext/erpnext/controllers/accounts_controller.py +617,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",
 apps/erpnext/erpnext/config/hr.py +166,Settings for HR Module,Ustawienia dla modułu HR
 DocType: SMS Center,SMS Center,Centrum SMS
 DocType: Sales Invoice,Change Amount,Zmień Kwota
@@ -204,13 +203,13 @@
 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 +147,Execution,Wykonanie
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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/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}"
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,Cost Center {0} does not belong to Company {1},Centrum kosztów {0} nie należy do Firmy {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +100,Cost Center {0} does not belong to Company {1},Centrum kosztów {0} nie należy do Firmy {1}
 DocType: Customer,Individual,Indywidualny
 DocType: Interest,Academics User,akademicy użytkownika
 DocType: Cheque Print Template,Amount In Figure,Kwota Na rysunku
@@ -226,30 +225,32 @@
 DocType: Production Planning Tool,Sales Orders,Zlecenia sprzedaży
 DocType: Purchase Taxes and Charges,Valuation,Wycena
 ,Purchase Order Trends,Trendy Zamówienia Kupna
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,The request for quotation can be accessed by clicking on the following link,Wniosek o cytat można uzyskać klikając na poniższy link
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,Przydziel zwolnienia dla roku.
 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/stock/doctype/stock_entry/stock_entry.py +233,Insufficient Stock,niewystarczająca Zdjęcie
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227,Insufficient Stock,niewystarczająca Zdjęcie
 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
 DocType: Leave Type,Allow Negative Balance,Dozwolony ujemny bilans
 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/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} does not belong to Company {1},Konto {0} nie jest przypisane do Firmy {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +86,Account {0} does not belong to Company {1},Konto {0} nie jest przypisane do Firmy {1}
 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}
 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"
 DocType: Course Schedule,Instructor Name,Instruktor Nazwa
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,For Warehouse is required before Submit,Dla magazynu jest wymagane przed wysłaniem
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,For Warehouse is required before Submit,Dla magazynu jest wymagane przed wysłaniem
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Otrzymana w dniu
 DocType: Sales Partner,Reseller,Dystrybutor
 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 +1436,"LocalStorage is full , did not save","LocalStorage jest pełna, nie zapisać"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1460,"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}
@@ -262,18 +263,19 @@
 apps/erpnext/erpnext/templates/generators/item.html +78,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 +5,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/leave_application/leave_application.py +206,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/leave_application/leave_application.py +213,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 +114,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 +179,Leaves per Year,Urlopy na Rok
+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 +103,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}
+DocType: Email Digest,Profit & Loss,Rachunek zysków i strat
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,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 +435,Leave Blocked,Urlop Zablokowany
-apps/erpnext/erpnext/stock/doctype/item/item.py +669,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 +443,Leave Blocked,Urlop Zablokowany
+apps/erpnext/erpnext/stock/doctype/item/item.py +671,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 +83,Annual,Roczny
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +86,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
@@ -281,20 +283,22 @@
 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"
 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 +91,Software Developer,Programista
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,Programista
 DocType: Item,Minimum Order Qty,Minimalna wartość zamówienia
 DocType: Pricing Rule,Supplier Type,Typ dostawcy
 DocType: Scheduling Tool,Course Start Date,Data rozpoczęcia kursu
 DocType: Item,Publish in Hub,Publikowanie w Hub
+DocType: Student Admission,Student Admission,Wstęp Student
 ,Terretory,Obszar
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is cancelled,Element {0} jest anulowany
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Material Request,Zamówienie produktu
+apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} is cancelled,Element {0} jest anulowany
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +823,Material Request,Zamówienie produktu
 DocType: Bank Reconciliation,Update Clearance Date,Aktualizacja daty rozliczenia
 apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +28,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 +328,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Element {0} nie znajdują się w &quot;materiały dostarczane&quot; tabeli w Zamówieniu {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +333,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Element {0} nie znajdują się w &quot;materiały dostarczane&quot; tabeli w Zamówieniu {1}
 DocType: Employee,Relation,Relacja
 DocType: Shipping Rule,Worldwide Shipping,Wysyłka na całym świecie
+DocType: Student Guardian,Mother,Mama
 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
@@ -310,20 +314,21 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +130,Please select Charge Type first,Najpierw wybierz typ opłaty
 DocType: Student Group Student,Student Group Student,Student Grupa Student
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Ostatnie
+DocType: Email Digest,New Quotations,Nowe Cytaty
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,
 DocType: Tax Rule,Shipping County,Dostawa County
 apps/erpnext/erpnext/config/desktop.py +158,Learn,Samouczek
 DocType: Asset,Next Depreciation Date,Następny Amortyzacja Data
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Koszt aktywność na pracownika
 DocType: Accounts Settings,Settings for Accounts,Ustawienia Konta
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +626,Supplier Invoice No exists in Purchase Invoice {0},Dostawca Faktura Nie istnieje faktura zakupu {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +629,Supplier Invoice No exists in Purchase Invoice {0},Dostawca Faktura Nie istnieje faktura zakupu {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Zarządzaj Drzewem Sprzedawców
 DocType: Job Applicant,Cover Letter,List motywacyjny
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,"Wybitni Czeki i depozytów, aby usunąć"
 DocType: Item,Synced With Hub,Synchronizowane z Hub
 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 +348,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 +86,Circular Reference Error,Circular Error Referencje
@@ -335,15 +340,16 @@
 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 +806,Delivery Note,Dowód dostawy
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +800,Delivery Note,Dowód dostawy
 apps/erpnext/erpnext/config/learn.py +87,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 +233,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/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/setup/doctype/email_digest/email_digest.py +104,Summary for this week and pending activities,Podsumowanie na ten tydzień i działań toczących
+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"
 DocType: Employee,Company Email,Email do firmy
@@ -355,28 +361,29 @@
 apps/erpnext/erpnext/config/hr.py +186,"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
-apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Wiersz # {0}: Zakup Faktura nie może być dokonywane wobec istniejącego zasobu {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +554,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 +54,{0} already allocated for Employee {1} for period {2} to {3},{0} już przydzielone Pracodawcy {1} dla okresu {2} do {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +812,Select Item,Wybierz produkt
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +791,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 \
 					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 +142,Purchase Invoice {0} is already submitted,Faktura zakupu {0} została już wysłana
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},"Wiersz # {0}: Batch Nie musi być taki sam, jak {1} {2}"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +143,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.
 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 +342,Please see attachment,Proszę przejrzeć załącznik
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,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 +19,Setup Already Complete!!,Konfiguracja właśnie zakończyła się!!
 ,Finished Goods,Ukończone dobra
 DocType: Delivery Note,Instructions,Instrukcje
 DocType: Quality Inspection,Inspected By,Skontrolowane przez
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Dostawca&gt; Typ Dostawca
 DocType: Maintenance Visit,Maintenance Type,Typ Konserwacji
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Nr seryjny {0} nie należy do żadnego potwierdzenia dostawy {1}
 apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Dodaj produkty
@@ -390,29 +397,29 @@
 DocType: Currency Exchange,Currency Exchange,Wymiana Walut
 DocType: Purchase Invoice Item,Item Name,Nazwa pozycji
 DocType: Authorization Rule,Approving User  (above authorized value),Zatwierdzanie autoryzowanego użytkownika (powyżej wartości)
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Saldo kredytowe
+DocType: Email Digest,Credit Balance,Saldo kredytowe
 DocType: Employee,Widowed,Wdowiec / Wdowa
 DocType: Request for Quotation,Request for Quotation,Zapytanie ofertowe
 DocType: Salary Slip Timesheet,Working Hours,Godziny pracy
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Zmień początkowy / obecny numer seryjny istniejącej serii.
 apps/erpnext/erpnext/accounts/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 +736,Purchase Return,Zwrot zakupu
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +715,Purchase Return,Zwrot zakupu
 ,Purchase Register,Rejestracja Zakupu
 DocType: 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 +202,{0} ({1}) must have role 'Leave Approver',{0} ({1}) musi mieć rolę 'Leave Approver'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,{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 +143,Reason for losing,Powód straty
-apps/erpnext/erpnext/accounts/utils.py +239,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 +163,Reason for losing,Powód straty
+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
 DocType: Announcement,Receiver,Odbiorca
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Stacja robocza jest zamknięta w następujących terminach wg listy wakacje: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Możliwości
 DocType: Employee,Single,Pojedynczy
 DocType: 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 +225,Please enter Cost Center,Wprowadź Centrum Kosztów
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,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
@@ -425,26 +432,26 @@
 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: Accounts Settings,Check Supplier Invoice Number Uniqueness,Sprawdź Dostawca numer faktury Wyjątkowość
 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 +102,Non Profit,Brak Zysków
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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: Stock Reconciliation Item,Do not include symbols (ex. $),Nie zawierają symbole (np. $)
 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 +638,Attribute {0} selected multiple times in Attributes Table,Atrybut {0} wybrane atrybuty kilka razy w tabeli
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Atrybut {0} wybrane atrybuty kilka razy w tabeli
 DocType: HR Settings,Employee record is created using selected field. ,Rekord pracownika tworzony jest przy użyciu zaznaczonego pola.
 DocType: Sales Order,Not Applicable,Nie dotyczy
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,
 DocType: Request for Quotation Item,Required Date,Data wymagana
 DocType: Delivery Note,Billing Address,Adres Faktury
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +862,Please enter Item Code.,Proszę wpisać Kod Produktu
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +847,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"
@@ -458,12 +465,12 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Papiery wartościowe i depozyty
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Wszystkich liście przeznaczone jest obowiązkowe
 DocType: Job Opening,Description of a Job Opening,Opis Ogłoszenia o Pracę
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Pending activities for today,Działania oczekujące na dziś
-apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Rekord frekwencji.
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Działania oczekujące na dziś
+apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Wpis Obecności
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Składnik wynagrodzenia za płac opartego grafik.
 DocType: Sales Order Item,Used for Production Plan,Używane do Planu Produkcji
 DocType: Manufacturing Settings,Time Between Operations (in mins),Czas między operacjami (w min)
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +92,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},Budżet {0} dla Konta {1} wobec Miejsca Powstawania Kosztów {2} i {3}. Zostanie przekroczony o {4}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +95,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},Budżet {0} dla Konta {1} wobec Miejsca Powstawania Kosztów {2} i {3}. Zostanie przekroczony o {4}
 DocType: Customer,Buyer of Goods and Services.,Nabywca towarów i usług.
 DocType: Journal Entry,Accounts Payable,Zobowiązania
 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
@@ -471,16 +478,16 @@
 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/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 +86,Administrative Officer,Urzędnik administracyjny
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,Urzędnik administracyjny
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +23,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 +319,Please select Company,Proszę wybrać firmę
-DocType: Stock Entry,Difference Account,Konto Różnic
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +309,Please select Company,Proszę wybrać firmę
+DocType: Stock Entry Detail,Difference Account,Konto Różnic
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,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 +398,Please enter Warehouse for which Material Request will be raised,
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +399,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 +530,"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 +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"
 DocType: Shipping Rule,Net Weight,Waga netto
 DocType: Employee,Emergency Phone,Telefon bezpieczeństwa
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +28,Buy,Kupować
@@ -488,7 +495,7 @@
 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 +1563,Serial no item cannot be a fraction,Nr seryjny element nie może być ułamkiem
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1587,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
@@ -497,13 +504,14 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Account {0} does not belong to company: {1},Konto {0} nie należy do firmy: {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation already used for another company,Skrót już używany przez inną firmę
 DocType: Selling Settings,Default Customer Group,Domyślna grupa klientów
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Supplier is required against Payable account {0},Dostawca jest zobowiązany wobec Płatne konta {0}
 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
 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 +313,Reference No and Reference Date is mandatory for Bank transaction,Numer referencyjny i data jest obowiązkowe dla transakcji Banku
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +316,Reference No and Reference Date is mandatory for Bank transaction,Numer referencyjny i data jest obowiązkowe dla transakcji Banku
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,
 DocType: Purchase Invoice,Supplier Invoice No,Nr faktury dostawcy
 DocType: Territory,For reference,Dla referencji
@@ -514,7 +522,6 @@
 DocType: Installation Note Item,Installation Note Item,
 DocType: Production Plan Item,Pending Qty,Oczekuje szt
 DocType: Budget,Ignore,Ignoruj
-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
 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/config/accounts.py +241,Setup cheque dimensions for printing,Wymiary Sprawdź konfigurację do druku
 DocType: Salary Slip,Salary Slip Timesheet,Slip Wynagrodzenie grafiku
@@ -525,14 +532,14 @@
 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/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 +28,Please select Company and Party Type first,"Najpierw wybierz typ firmy, a Party"
+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/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 +707,Make Sales Order,Stwórz Zamówienie Sprzedaży
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +701,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,Całkowita suma
+DocType: C-Form Invoice Detail,Grand Total,Suma Całkowita
 DocType: Assessment,Course,Kurs
 DocType: Timesheet,Payslip,Odcinek wypłaty
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +38,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Data rozpoczęcia roku obrotowego nie powinny być większe niż data zakończenia roku obrotowego
@@ -541,11 +548,12 @@
 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: Payment Entry,Type of Payment,Rodzaj płatności
-DocType: Sales Order,Billing and Delivery Status,Fakturowanie i dostawy status
+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 +734,Sales Return,Zwrot sprzedaży
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +728,Sales Return,Zwrot sprzedaży
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +91,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)
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Baza danych potencjalnych klientów.
@@ -554,14 +562,13 @@
 DocType: Quotation,Quotation To,Wycena dla
 DocType: Lead,Middle Income,Średni Dochód
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +212,Opening (Cr),Otwarcie (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +795,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"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 +237,Allocated amount can not be negative,Przydzielona kwota nie może być ujemna
+apps/erpnext/erpnext/stock/doctype/item/item.py +797,Default Unit of Measure for Item {0} cannot be changed directly because 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
 DocType: Purchase Order Item,Billed Amt,Rozliczona Ilość
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Logiczny Magazyn przeciwny do zapisów.
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Faktura sprzedaży grafiku
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},Nr Odniesienia & Data Odniesienia jest wymagana do {0}
-DocType: Sales Invoice,Customer's Vendor,
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Proposal Writing,Pisanie Wniosku
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,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"
@@ -570,13 +577,14 @@
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,time Tracking
 DocType: Fiscal Year Company,Fiscal Year Company,Rok podatkowy firmy
 DocType: Packing Slip Item,DN Detail,
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +257,Already supplier quotation has created,Już cytat dostawca stworzył
 DocType: Timesheet,Billed,Rozliczony
 DocType: Batch,Batch Description,Opis partii
+apps/erpnext/erpnext/accounts/utils.py +685,"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 +733,View Offline Records,Zobacz Offline Records
+apps/erpnext/erpnext/accounts/page/pos/pos.js +715,View Offline Records,Zobacz Offline Records
+DocType: Student,Sibling Details,rodzeństwo Szczegóły
 DocType: Employee,Reason for Resignation,Powód rezygnacji
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,Szablon do oceny wyników.
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,Szczegóły Faktury / Wpisu dziennika
@@ -590,7 +598,7 @@
 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
 DocType: Employee,Passport Number,Numer Paszportu
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Manager,Menager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,Menager
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,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"
@@ -599,10 +607,11 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter email address,Proszę wpisać adres e-mail
 DocType: Production Order Operation,In minutes,W ciągu kilku minut
 DocType: Issue,Resolution Date,Data Rozstrzygnięcia
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +299,Timesheet created:,Grafiku stworzył:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +715,Please set default Cash or Bank account in Mode of Payment {0},Proszę ustawić domyślne konto Gotówka lub Bank dla płatności typu {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +300,Timesheet created:,Grafiku stworzył:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +772,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ć
 DocType: Selling Settings,Customer Naming By,
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Proszę setup Pracownik Naming System w Human Resource&gt; Ustawienia HR
 DocType: Depreciation Schedule,Depreciation Amount,Kwota amortyzacji
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,Przekształć w Grupę
 DocType: Activity Cost,Activity Type,Rodzaj aktywności
@@ -627,13 +636,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,koniec
 DocType: Pricing Rule,Sales Manager,Menadżer Sprzedaży
 DocType: Salary Structure Employee,Base,Baza
+DocType: Timesheet,Total Billed Hours,Wszystkich Zafakturowane Godziny
 DocType: Journal Entry,Write Off Amount,Wartość Odpisu
 DocType: Journal Entry,Bill No,Numer Rachunku
 DocType: Company,Gain/Loss Account on Asset Disposal,Konto Zysk / Strata na Aktywów pozbywaniu
 DocType: Purchase Invoice,Quarterly,Kwartalnie
 DocType: Selling Settings,Delivery Note Required,Dowód dostawy jest wymagany
 DocType: Sales Order Item,Basic Rate (Company Currency),Podstawowy wskaźnik (Waluta Firmy)
-DocType: Student Attendance,Student Attendance,Obecność Student
+DocType: Student Attendance,Student Attendance,Obecność Studenta
 DocType: Sales Invoice Timesheet,Time Sheet,Czas Sheet
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Płukanie surowce na podstawie
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,Please enter item details,Proszę wpisać Szczegóły Przedmiotu
@@ -641,11 +651,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +9,Pre Sales,Przedsprzedaż
 DocType: Purchase Receipt,Other Details,Pozostałe szczegóły
 DocType: Account,Accounts,Księgowość
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Marketing,Marketing
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +227,Payment Entry is already created,Wejście Płatność jest już utworzony
+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,Wejście Płatność jest już utworzony
 DocType: Purchase Receipt Item Supplied,Current Stock,Bieżący asortyment
-apps/erpnext/erpnext/controllers/accounts_controller.py +538,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 +21,Preview Salary Slip,Podgląd Zarobki Slip
+apps/erpnext/erpnext/controllers/accounts_controller.py +541,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 +38,Preview Salary Slip,Podgląd Zarobki Slip
 DocType: Company,Deafult Cost Center,Deafult MPK
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +48,Account {0} has been entered multiple times,Konto {0} została wprowadzona wielokrotnie
 DocType: Account,Expenses Included In Valuation,Zaksięgowane wydatki w wycenie
@@ -654,7 +664,7 @@
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,Proszę wybrać grupy studentów
 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 +617,Item has variants.,Pozycja ma warianty.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Pozycja ma warianty.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,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
@@ -674,7 +684,7 @@
 DocType: Purchase Order,Supply Raw Materials,Zaopatrzenia w surowce
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Dzień, w którym będą generowane następne faktury. Generowanie wykonywane jest na żądanie."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Aktywa finansowe
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,{0} is not a stock Item,{0} nie jest przechowywany na magazynie
+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 +169,Lead must be set if Opportunity is made from Lead,
@@ -760,26 +770,25 @@
 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 +709,No Permission,Brak uprawnień
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +710,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}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +298,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 +542,Row #{0}: Asset {1} must be submitted,Wiersz # {0}: {1} aktywami muszą być złożone
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset {1} must be submitted,Wiersz # {0}: {1} aktywami muszą być złożone
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Nie znaleziono pracowników
 DocType: Supplier Quotation,Stopped,Zatrzymany
 DocType: Item,If subcontracted to a vendor,Jeśli zlecona dostawcy
 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.
 DocType: Warehouse,Tree Details,drzewo Szczegóły
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Wyślij teraz
 ,Support Analytics,
 DocType: Item,Website Warehouse,Magazyn strony WWW
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimalna kwota faktury
 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/sales_invoice/sales_invoice.py +227,Timesheet {0} is already completed or cancelled,Grafiku {0} jest już zakończone lub anulowane
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +259,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
@@ -795,13 +804,13 @@
 apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Plan zajęć
 DocType: Maintenance Visit,Completion Status,Status ukończenia
 DocType: HR Settings,Enter retirement age in years,Podaj wiek emerytalny w latach
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +229,Target Warehouse,Magazyn docelowy
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +230,Target Warehouse,Magazyn docelowy
 DocType: Cheque Print Template,Starting location from left edge,Zaczynając od lewej krawędzi lokalizację
 DocType: Item,Allow over delivery or receipt upto this percent,Pozostawić na dostawę lub odbiór zapisu do tego procent
 DocType: Stock Entry,STE-,STEMI
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Sales Order Date,Spodziewana data odbioru przesyłki nie może być wcześniejsza od daty sprzedaży
-DocType: Upload Attendance,Import Attendance,
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Wszystkie grupy produktów
+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/config/setup.py +89,Automatically compose message on submission of transactions.,Automatyczna wiadomość o założeniu transakcji
@@ -813,13 +822,15 @@
 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/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
 DocType: Expense Claim,Expenses,Wydatki
 DocType: Item Variant Attribute,Item Variant Attribute,Pozycja Wersja Atrybut
 ,Purchase Receipt Trends,Trendy Potwierdzenia Zakupu
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Research & Development,Badania i rozwój
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Badania i rozwój
 ,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
 DocType: Leave Block List Date,Leave Block List Date,Opuść Zablokowaną Listę Dat
 DocType: Pricing Rule,Price or Discount,Cena albo Zniżka
@@ -828,7 +839,7 @@
 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/controllers/accounts_controller.py +340,"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."
+apps/erpnext/erpnext/controllers/accounts_controller.py +343,"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
@@ -850,12 +861,12 @@
 DocType: Supplier Quotation,Is Subcontracted,Czy zlecony
 DocType: Item Attribute,Item Attribute Values,Wartości Element Atrybut
 DocType: Examination Result,Examination Result,badanie Wynik
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +756,Purchase Receipt,Potwierdzenia Zakupu
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +735,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 +167,Reference Doctype must be one of {0},Doctype referencyjny musi być jednym z {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +282,Unable to find Time Slot in the next {0} days for Operation {1},Nie udało się znaleźć wolnego przedziału czasu w najbliższych {0} dniach do pracy {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +170,Reference Doctype must be one of {0},Doctype referencyjny musi być jednym z {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,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 +439,BOM {0} must be active,BOM {0} musi być aktywny
@@ -866,7 +877,7 @@
 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 +214,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 +217,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
@@ -880,9 +891,9 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Pracownik {0} jest nieaktywny lub nie istnieje
 DocType: Fee Structure,Components,składniki
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,Please enter Asset Category in Item {0},Proszę podać kategorię aktywów w pozycji {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +612,Item Variants {0} updated,Pozycja Warianty {0} zaktualizowane
+apps/erpnext/erpnext/stock/doctype/item/item.py +614,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 +843,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 +854,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
@@ -897,69 +908,72 @@
 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 +728,New Sales Invoice,Nowa faktura sprzedaży
+apps/erpnext/erpnext/accounts/page/pos/pos.js +710,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 +728,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
 DocType: Material Request Item,Lead Time Date,Termin realizacji
 DocType: Guardian,Guardian Name,Nazwa Stróża
 DocType: Cheque Print Template,Has Print Format,Ma format wydruku
-apps/erpnext/erpnext/accounts/page/pos/pos.js +86, 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 +109,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 +619,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","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/page/pos/pos.js +75, 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 +613,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing 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 +606,Supplier Invoice Date cannot be greater than Posting Date,Faktura dostawca Data nie może być większe niż Data publikacji
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +609,Supplier Invoice Date cannot be greater than Posting Date,Faktura dostawca Data nie może być większe niż Data publikacji
 DocType: Purchase Invoice Item,Purchase Order Item,Przedmiot Zamówienia Kupna
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +130,Indirect Income,Przychody pośrednie
 DocType: Cheque Print Template,Date Settings,Data Ustawienia
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Zmienność
 ,Company Name,Nazwa firmy
 DocType: SMS Center,Total Message(s),Razem ilość wiadomości
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +810,Select Item for Transfer,Wybierz produkt Transferu
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +789,Select Item for Transfer,Wybierz produkt Transferu
 DocType: Purchase Invoice,Additional Discount Percentage,Dodatkowy rabat procentowy
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Zobacz listę wszystkich filmów pomocy
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Zezwól użytkowi edytować cenę i stawkę w transakcjach
 DocType: Pricing Rule,Max Qty,Maks. Ilość
-DocType: Student Applicant,Father's Name,Imię Ojca
 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 +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Wiersz {0}: Płatność przeciwko sprzedaży / Zamówienia powinny być zawsze oznaczone jako góry
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Chemiczny
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +686,All items have already been transferred for this Production Order.,Dla tego zamówienia produkcji wszystkie pozycje zostały już przeniesione.
+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
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +694,All items have already been transferred for this Production Order.,Dla tego zamówienia produkcji wszystkie pozycje zostały już przeniesione.
 DocType: Process Payroll,Select Payroll Year and Month,Wybierz Płace Rok i miesiąc
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,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
-DocType: Opportunity,Walk In,Wejście
 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 +12,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).
 DocType: Timesheet Detail,Bill,Rachunek
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,White,Biały
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,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
 DocType: SMS Center,All Lead (Open),Wszystkie Leady (Otwarte)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +228,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})
+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 +731,Make ,Stwórz
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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ł.
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Mój koszyk
-apps/erpnext/erpnext/controllers/selling_controller.py +154,Order Type must be one of {0},Rodzaj zlecenia musi być jednym z {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Rodzaj zlecenia musi być jednym z {0}
 DocType: Lead,Next Contact Date,Data Następnego Kontaktu
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Ilość Otwarcia
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +393,Please enter Account for Change Amount,Proszę wpisać uwagę do zmiany kwoty
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,Please enter Account for Change Amount,Proszę wpisać uwagę do zmiany kwoty
 DocType: Student Batch,Student Batch Name,Student Batch Nazwa
 DocType: Holiday List,Holiday List Name,Lista imion na wakacje
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js +8,Schedule Course,Plan zajęć
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Stock Options,Opcje magazynu
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Opcje magazynu
 DocType: Journal Entry Account,Expense Claim,Zwrot Kosztów
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +211,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 +237,Qty for {0},Ilość dla {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +212,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 +238,Qty for {0},Ilość dla {0}
 DocType: Leave Application,Leave Application,Wniosek o Urlop
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Narzędzie do przydziału urlopu
 DocType: Leave Block List,Leave Block List Dates,Opuść Zablokowaną Listę Dat
@@ -968,9 +982,9 @@
 DocType: Company,Default Terms,Regulamin domyślne
 DocType: Packing Slip Item,Packing Slip Item,Pozycja listu przewozowego
 DocType: Purchase Invoice,Cash/Bank Account,Konto Kasa / Bank
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Usunięte pozycje bez zmian w ilości lub wartości.
+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 +635,Attribute table is mandatory,Stół atrybut jest obowiązkowy
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Stół atrybut jest obowiązkowy
 DocType: Production Planning Tool,Get Sales Orders,Pobierz zamówienia sprzedaży
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{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
@@ -995,7 +1009,7 @@
 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/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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Nr seryjny {0} w ramach umowy serwisowej do {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +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
@@ -1007,7 +1021,7 @@
 DocType: GL Entry,Against,Wyklucza
 DocType: Item,Default Selling Cost Center,Domyśle Centrum Kosztów Sprzedaży
 DocType: Sales Partner,Implementation Partner,Partner Wdrożeniowy
-apps/erpnext/erpnext/controllers/selling_controller.py +231,Sales Order {0} is {1},Zamówienie sprzedaży jest {0} {1}
+apps/erpnext/erpnext/controllers/selling_controller.py +232,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
 DocType: Packing Slip,Net Weight UOM,Jednostka miary wagi netto
@@ -1017,25 +1031,24 @@
 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"
 DocType: Sales Person,Select company name first.,Wybierz najpierw nazwę firmy
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Wyceny otrzymane od dostawców
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},Do {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Średni wiek
 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/templates/pages/home.html +32,View All Products,Pokaż wszystke
+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
 DocType: Expense Claim,From Employee,Od pracownika
-apps/erpnext/erpnext/controllers/accounts_controller.py +400,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,
+apps/erpnext/erpnext/controllers/accounts_controller.py +403,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,Usługa od dnia
+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/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,i rok:
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +191,{0} {1} must be submitted,{0} {1} musi zostać dodane
-DocType: Email Digest,Annual Expense,Rocznych kosztów
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,{0} {1} must be submitted,{0} {1} musi zostać dodane
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +145,Quantity must be less than or equal to {0},Ilość musi być mniejsze niż lub równe {0}
 DocType: SMS Center,Total Characters,Wszystkich Postacie
 apps/erpnext/erpnext/controllers/buying_controller.py +156,Please select BOM in BOM field for Item {0},Proszę wybrać LM w dziedzinie BOM dla pozycji {0}
@@ -1046,30 +1059,31 @@
 DocType: Sales Partner,Distributor,Dystrybutor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Koszyk Wysyłka Reguła
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +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 +62,Please set 'Apply Additional Discount On',Proszę ustawić &quot;Zastosuj dodatkowe zniżki na &#39;
+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
 DocType: Global Defaults,Global Defaults,Globalne wartości domyślne
 apps/erpnext/erpnext/projects/doctype/project/project.py +153,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
 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 +327,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 +362,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/stock/doctype/stock_entry/stock_entry.py +367,Finished Item {0} must be entered for Manufacture type entry,Zakończone Pozycja {0} musi być wprowadzony do wejścia typu Produkcja
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Stan z bilansu otwarcia
 DocType: Sales Invoice Advance,Sales Invoice Advance,Faktura Zaliczkowa
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +499,Nothing to request,Brak żądań
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +500,Nothing to request,Brak żądań
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Management,Zarząd
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},Wymagana jest debetowa lub kredytowa kwota dla {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,Zarząd
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +55,Either debit or credit amount is required for {0},Wymagana jest debetowa lub kredytowa kwota dla {0}
 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 +161,Blue,Niebieski
+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
@@ -1079,12 +1093,12 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +23,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
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1374,Do you really want to submit the invoice?,Czy na pewno chcesz przesłać fakturę?
+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 +685,Cost Center For Item with Item Code ',Centrum kosztów dla Przedmiotu z Kodem Przedmiotu '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1526,"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 +679,Cost Center For Item with Item Code ',Centrum kosztów dla Przedmiotu z Kodem Przedmiotu '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1550,"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 +26,"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
@@ -1104,104 +1118,106 @@
 DocType: Payment Reconciliation,Unreconciled Payment Details,Szczegóły płatności nieuzgodnione
 DocType: Global Defaults,Current Fiscal Year,Obecny rok fiskalny
 DocType: Global Defaults,Disable Rounded Total,Wyłącz Zaokrąglanie Sumy
-DocType: Lead,Call,Połączenie
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +417,'Entries' cannot be empty,Pole 'Wpisy' nie może być puste
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +418,'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 +214,Fiscal Year {0} not found,Rok fiskalny {0} Nie znaleziono
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +221,Fiscal Year {0} not found,Rok fiskalny {0} Nie znaleziono
 apps/erpnext/erpnext/config/hr.py +238,Setting up Employees,Konfigurowanie Pracownicy
 DocType: Sales Order,SO-,WIĘC-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Wybierz prefix
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Please select prefix first,Wybierz prefix
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Research,Badania
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,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 +43,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 +57,View Ledger,Podgląd księgi
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Najwcześniejszy
-apps/erpnext/erpnext/stock/doctype/item/item.py +504,"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 +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/setup/setup_wizard/setup_wizard.py +437,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
 ,Budget Variance Report,Raport z weryfikacji budżetu
 DocType: Salary Slip,Gross Pay,Płaca brutto
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +90,Row {0}: Activity Type is mandatory.,Wiersz {0}: Typ aktywny jest obowiązkowe.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +114,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/public/js/controllers/stock_controller.js +40,Accounting Ledger,Ledger rachunkowości
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,Accounting Ledger,Ledger rachunkowości
 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
 DocType: BOM Item,Item Description,Opis produktu
+DocType: Student Sibling,Student Sibling,Student Rodzeństwo
 DocType: Purchase Invoice,Is Recurring,Czy cykliczne
 DocType: Purchase Invoice,Supplied Items,Dostarczone przedmioty
 DocType: Student,STUD.,STADNINA.
 DocType: Production Order,Qty To Manufacture,Ilość do wyprodukowania
+DocType: Email Digest,New Income,Nowy dochodowy
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Utrzymanie stałej stawki przez cały cykl zakupu
 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 +131,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 +175,Valuation Rate required for Item in row {0},Wycena Oceń wymagane dla pozycji w wierszu {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,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
 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 +87, to ,do
+apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,do
 DocType: Item,Lead Time in days,Czas oczekiwania w dniach
 ,Accounts Payable Summary,Zobowiązania Podsumowanie
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Not authorized to edit frozen Account {0},Brak autoryzacji do edycji zamrożonego Konta {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,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 +62,Sales Order {0} is not valid,Zlecenie Sprzedaży {0} jest niepoprawne
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Zlecenie Sprzedaży {0} jest niepoprawne
 apps/erpnext/erpnext/setup/doctype/company/company.py +185,"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 +152,Small,Mały
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,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}
 ,Invoiced Amount (Exculsive Tax),Zafakturowana kwota netto
-DocType: Student Applicant,Mother's / Guardian 1 Email ID,Matki / opiekuna 1 Email ID
 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 +160,Green,Zielony
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,Zielony
 DocType: Supplier,SUPP-,CO TAM-
 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 +57,Contract,Kontrakt
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,Kontrakt
 DocType: Email Digest,Add Quote,Dodaj Cytat
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +498,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 +503,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 +80,Row {0}: Qty is mandatory,Wiersz {0}: Ilość jest obowiązkowe
+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 +737,Sync Master Data,Sync Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +719,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/public/js/setup_wizard.js +283,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
+DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,To jest grupa przedmiotów root i nie mogą być edytowane.
+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.
 DocType: Journal Entry Account,Purchase Order,Zamówienie kupna
 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 +345,"{0}: Employee email not found, hence email not sent","{0}: Pracownik e-mail nie zostanie znaleziony, dlatego nie E-mail wysłany"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +358,"{0}: Employee email not found, hence email not sent","{0}: Pracownik e-mail nie zostanie znaleziony, dlatego nie E-mail wysłany"
 DocType: Address,City/Town,Miasto/Miejscowość
 DocType: Address,Is Your Company Address,Czy Twój adres firmy
 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 +118,"For {0}, only credit accounts can be linked against another debit entry","Dla {0}, tylko rachunki kredytowe mogą być połączone z innym wejściem debetowej"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Delivery Note {0} is not submitted,Dowód dostawy {0} nie został wysłany
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Delivery Note {0} is not submitted,Dowód dostawy {0} nie został wysłany
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Sub-contracted Item,
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Wycena Zasada jest najpierw wybiera się na podstawie ""Zastosuj Na"" polu, które może być pozycja, poz Grupa lub Marka."
 DocType: Hub Settings,Seller Website,Sprzedawca WWW
 DocType: Item,ITEM-,POZYCJA-
-apps/erpnext/erpnext/controllers/selling_controller.py +147,Total allocated percentage for sales team should be 100,Łącznie przydzielony procent sprzedaży dla zespołu powinien wynosić 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +110,Production Order status is {0},Zlecenie produkcji ma status: {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Łącznie przydzielony procent sprzedaży dla zespołu powinien wynosić 100
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Zlecenie produkcji ma status: {0}
 DocType: Appraisal Goal,Goal,Cel
 DocType: Sales Invoice Item,Edit Description,Edytuj opis
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +757,For Supplier,Dla dostawcy
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +723,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
@@ -1217,10 +1233,11 @@
 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
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,przetwarzanie maila
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +445,BOM {0} does not belong to Item {1},BOM {0} nie należy do pozycji {1}
 DocType: Sales Partner,Target Distribution,Dystrybucja docelowa
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1667,Deafault warehouse is required for selected item,Deafault magazynu jest wymagana dla wybranego elementu
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Deafault warehouse is required for selected item,Deafault magazynu jest wymagana dla wybranego elementu
 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
@@ -1229,23 +1246,23 @@
 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 +110,Hardware,Sprzęt komputerowy
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,Sprzęt komputerowy
 DocType: Sales Order,Recurring Upto,Cyklicznie upto
 DocType: Attendance,HR Manager,
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Wybierz firmę
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Privilege Leave,
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,
 DocType: Purchase Invoice,Supplier Invoice Date,Data faktury dostawcy
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Musisz włączyć Koszyk
 DocType: Payment Entry,Writeoff,Writeoff
 DocType: Appraisal Template Goal,Appraisal Template Goal,Cel szablonu oceny
-DocType: Salary Slip,Earning,Dochód
+DocType: Salary Component,Earning,Dochód
 DocType: Purchase Invoice,Party Account Currency,Partia konto Waluta
 ,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 +171,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 +174,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_data.py +358,Food,Żywność
+apps/erpnext/erpnext/demo/setup/setup_data.py +301,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/course_schedule/course_schedule.js +103,Mark Attendence,Mark Attendence
@@ -1279,12 +1296,12 @@
 DocType: Sales Order Item,Planned Quantity,Planowana ilość
 DocType: Purchase Invoice Item,Item Tax Amount,Wysokość podatku dla tej pozycji
 DocType: Item,Maintain Stock,Utrzymanie Zapasów
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +209,Stock Entries already created for Production Order ,Wpisy dla zasobów już utworzone na podst. Zlecenia Produkcji
+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
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,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 +620,Charge of type 'Actual' in row {0} cannot be included in Item Rate,
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,Max: {0},Max: {0}
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +15,From Datetime,Od DateTime
+apps/erpnext/erpnext/controllers/accounts_controller.py +623,Charge of type 'Actual' in row {0} cannot be included in Item Rate,
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +239,Max: {0},Max: {0}
+apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Od DateTime
 DocType: Email Digest,For Company,Dla firmy
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Rejestr komunikacji
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +153,"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."
@@ -1292,8 +1309,8 @@
 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 +552,cannot be greater than 100,nie może być większa niż 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +680,Item {0} is not a stock Item,Element {0} nie jest w magazynie
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +546,cannot be greater than 100,nie może być większa niż 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,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
@@ -1307,10 +1324,9 @@
 DocType: GL Entry,GL Entry,Wejście GL
 DocType: HR Settings,Employee Settings,Ustawienia pracownika
 ,Batch-Wise Balance History,
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,"Lista ""Do zrobienia"""
 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 +61,Apprentice,Uczeń
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +102,Negative Quantity is not allowed,Ilość nie może być wyrażana na minusie
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,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"
@@ -1332,15 +1348,14 @@
 DocType: Asset,Asset Name,Zaleta Nazwa
 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 +141,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 +719,Packing Slip,List przewozowy
+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 +713,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/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,"Zapytanie ofertowe może być dostęp, klikając poniższy link"
 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 +81,Analyst,Analityk
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,Analityk
 DocType: Item,Inventory,Inwentarz
 DocType: Item,Sales Details,Szczegóły sprzedaży
 DocType: Quality Inspection,QI-,QI-
@@ -1348,7 +1363,7 @@
 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 +103,Government,Rząd
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,Rząd
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,Nazwa Instytutu
 apps/erpnext/erpnext/config/stock.py +289,Item Variants,Warianty artykuł
 DocType: Company,Services,Usługi
@@ -1364,6 +1379,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,Financial Year Start Date,Data początku roku finansowego
 DocType: POS Profile,Apply Discount,Zastosuj zniżkę
 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
 DocType: Program Course,Program Course,Program kursu
@@ -1404,12 +1420,12 @@
 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
 DocType: Production Plan Sales Order,Production Plan Sales Order,Zamówienie sprzedaży plany produkcji
 DocType: Sales Partner,Sales Partner Target,Cel Partnera Sprzedaży
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +110,Accounting Entry for {0} can only be made in currency: {1},Wprowadzenie danych księgowych dla {0} może być dokonywane wyłącznie w walucie: {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Wprowadzenie danych księgowych dla {0} może być dokonywane wyłącznie w walucie: {1}
 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
 DocType: Shopping Cart Settings,Payment Success URL,Płatność Sukces URL
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +78,Row # {0}: Returned Item {1} does not exists in {2} {3},Wiersz # {0}: wracającą rzecz {1} nie istnieje w {2} {3}
+apps/erpnext/erpnext/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
@@ -1418,40 +1434,39 @@
 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/stock/doctype/stock_entry/stock_entry.py +339,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Nie wolno przesyłaj więcej niż {0} {1} przeciwko Zamówienia {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +344,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 +545,Manufacturing Quantity is mandatory,Ilość wyprodukowanych jest obowiązkowa
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,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 +71,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 +162,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/projects/doctype/timesheet/timesheet.py +186,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
 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 +130,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 +137,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
 DocType: Dependent Task,Dependent Task,Zadanie zależne
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,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/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 +190,Leave of type {0} cannot be longer than {1},Urlop typu {0} nie może być dłuższy niż {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +197,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 +921,Search Item,Szukaj przedmiotu
+apps/erpnext/erpnext/accounts/page/pos/pos.js +910,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 +546,Already completed,Zakończone
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +22,Payment Request already exists {0},Płatność Zapytanie już istnieje {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +550,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 +241,Quantity must not be more than {0},Ilość nie może być większa niż {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Quantity must not be more than {0},Ilość nie może być większa niż {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +76,Previous Financial Year is not closed,Poprzedni rok finansowy nie jest zamknięta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +44,Age (Days),Wiek (dni)
 DocType: Quotation Item,Quotation Item,Przedmiot Wyceny
@@ -1468,7 +1483,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +221,Purchase Receipt {0} is not submitted,Potwierdzenie Zakupu {0} nie zostało wysłane
 DocType: Company,Default Payable Account,Domyślne konto Rozrachunki z dostawcami
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Ustawienia dla internetowego koszyka, takie jak zasady żeglugi, cennika itp"
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +83,{0}% Billed,{0}% rozliczono
+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
@@ -1480,12 +1495,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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/schools/doctype/fees/fees.js +22,Collect,Zebrać
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Zebrać
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,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 +225,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
-DocType: Payment Reconciliation,Payments,Płatności
 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ń
@@ -1497,7 +1511,7 @@
 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 +9,Procurement,Dostarczanie
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,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/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
 ,Lead Details,Dane Tropu
 DocType: Purchase Invoice,End date of current invoice's period,Data zakończenia okresu bieżącej faktury
@@ -1522,7 +1536,7 @@
 DocType: Purchase Invoice,Additional Discount,Dodatkowe zniżki
 DocType: Selling Settings,Selling Settings,Ustawienia Sprzedaży
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Aukcje Online
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +97,Please specify either Quantity or Valuation Rate or both,Podaj dokładnie Ilość lub Stawkę lub obie
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,Podaj dokładnie Ilość lub Stawkę lub obie
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +13,Fulfillment,Spełnienie
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory",
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Wydatki marketingowe
@@ -1543,14 +1557,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,Konfiguracja ERPNext zakończona!
 DocType: Item,Weightage,Waga/wiek
 DocType: Packing Slip,PS-,PS
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +93,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Grupa Odbiorców posiada taką nazwę - wprowadź inną nazwę Odbiorcy lub zmień nazwę Grupy
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +126,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
 DocType: Stock Entry,Material Receipt,Przyjęcie materiałów
 DocType: Homepage,Products,Produkty
 DocType: Announcement,Instructor,Instruktor
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},Strona Typ i Partia jest wymagany do otrzymania / rachunku Płatne {0}
 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
@@ -1561,7 +1574,7 @@
 ,Item-wise Sales Register,
 DocType: Asset,Gross Purchase Amount,Zakup Kwota brutto
 DocType: Asset,Depreciation Method,Metoda amortyzacji
-apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Offline,Offline
+apps/erpnext/erpnext/accounts/page/pos/pos.js +686,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
@@ -1579,25 +1592,27 @@
 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
 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 +858,Make Purchase Order,Wprowadź Zamówienie
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +852,Make Purchase Order,Wprowadź Zamówienie
 DocType: SMS Center,Send To,Wyślij do
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,There is not enough leave balance for Leave Type {0},
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,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
 DocType: Stock Reconciliation,Stock Reconciliation,Uzgodnienia stanu
 DocType: Territory,Territory Name,Nazwa Regionu
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +172,Work-in-Progress Warehouse is required before Submit,Magazyn z produkcją w toku jest wymagany przed wysłaniem
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,Work-in-Progress Warehouse is required before Submit,Magazyn z produkcją w toku jest wymagany przed wysłaniem
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Aplikant do Pracy.
 DocType: Purchase Order Item,Warehouse and Reference,Magazyn i punkt odniesienia
 DocType: Supplier,Statutory info and other general information about your Supplier,Informacje prawne na temat dostawcy
-apps/erpnext/erpnext/hooks.py +88,Addresses,Adresy
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Dostawca&gt; Typ Dostawca
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +212,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/hooks.py +95,Addresses,Adresy
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +215,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
 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
@@ -1605,11 +1620,10 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,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 +731,Payment,Płatność
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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: Pricing Rule,Brand,Marka
 DocType: Course,Course Abbreviation,Skrót golfowe
 DocType: Item,Will also apply for variants,Również zastosowanie do wariantów
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +142,"Asset cannot be cancelled, as it is already {0}","Aktywów nie mogą być anulowane, ponieważ jest już {0}"
@@ -1621,7 +1635,7 @@
 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."
 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 +85,Associate,Współpracownik
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,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
@@ -1629,7 +1643,7 @@
 DocType: Production Planning Tool,Material Requests,materiał Wnioski
 DocType: Warranty Claim,Issue Date,Data zdarzenia
 DocType: Activity Cost,Activity Cost,Aktywny Koszt
-DocType: Timesheet Detail,Timesheet Detail,Szczegółowy grafik
+DocType: Sales Invoice Timesheet,Timesheet Detail,Szczegółowy grafik
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Skonsumowana ilość
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekomunikacja
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Wskazuje, że pakiet jest częścią tej dostawy (Tylko projektu)"
@@ -1652,6 +1666,7 @@
 DocType: Production Plan Material Request,Material Request Date,Materiał Zapytanie Data
 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,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
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nazwa dystrybucji miesięcznej
 DocType: Sales Person,Parent Sales Person,Nadrzędny Przedstawiciel Handlowy
@@ -1664,31 +1679,32 @@
 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 +44,"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/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"
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +502,Error: {0} &gt; {1},Błąd: {0}&gt; {1}
 DocType: Item,Is Sales Item,Jest pozycją sprzedawalną
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Drzewo kategorii
 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."
 DocType: Naming Series,Current Value,Bieżąca Wartość
-apps/erpnext/erpnext/controllers/accounts_controller.py +235,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/controllers/accounts_controller.py +238,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
 DocType: Delivery Note Item,Against Sales Order,Na podstawie zamówienia sprzedaży
 ,Serial No Status,Status nr seryjnego
 DocType: Payment Entry Reference,Outstanding,Wybitny
 ,Daily Timesheet Summary,Codzienne grafiku Podsumowanie
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +458,Item table can not be blank,Element tabela nie może być pusta
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +443,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}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +5,This is based on stock movement. See {0} for details,Jest to oparte na ruchu zapasów. Zobacz {0} o szczegóły
 DocType: Pricing Rule,Selling,Sprzedaż
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +341,Amount {0} {1} deducted against {2},Kwota {0} {1} odliczone przed {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +344,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
@@ -1703,8 +1719,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +144,Cannot refer row number greater than or equal to current row number for this Charge type,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 +159,Red,Czerwony
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Proszę kliknąć na ""Generowanie Harmonogramu"", aby sprowadzić nr seryjny dodany do pozycji {0}"
+apps/erpnext/erpnext/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
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Kwota bazowa (Spółka waluty)
@@ -1712,7 +1728,7 @@
 DocType: Installation Note,Installation Time,Czas instalacji
 DocType: Sales Invoice,Accounting Details,Dane księgowe
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,"Usuń wszystkie transakcje, dla tej firmy"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +187,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Wiersz # {0}: {1} operacja nie zostanie zakończona do {2} Ilość wyrobów gotowych w produkcji Zamówienie # {3}. Proszę zaktualizować stan pracy za pomocą Time Logs
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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,Wiersz # {0}: {1} operacja nie zostanie zakończona do {2} Ilość wyrobów gotowych w produkcji Zamówienie # {3}. Proszę zaktualizować stan pracy za pomocą Time Logs
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,Inwestycje
 DocType: Issue,Resolution Details,Szczegóły Rozstrzygnięcia
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,przydziały
@@ -1748,16 +1764,17 @@
 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}
 DocType: Delivery Note,Excise Page Number,Akcyza numeru strony
 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}
 ,Maintenance Schedules,Plany Konserwacji
 DocType: Task,Actual End Date (via Time Sheet),Faktyczna data zakończenia (przez czas arkuszu)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Amount {0} {1} against {2} {3},Kwota {0} {1} przeciwko {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +339,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 +138,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 +295,Debit To account must be a Receivable account,Debet na konto musi być rachunkiem otrzymującym
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Receivable account,Debet na konto musi być rachunkiem otrzymującym
 DocType: Shipping Rule Condition,Shipping Amount,Ilość dostawy
 ,Pending Amount,Kwota Oczekiwana
 DocType: Purchase Invoice Item,Conversion Factor,Współczynnik konwersji
@@ -1765,10 +1782,10 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +137,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 +90,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
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +93,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 +22,Enter Paid Amount,Wprowadź wpłaconej kwoty
+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
@@ -1778,13 +1795,15 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,ewidencja czasu pracy
 DocType: HR Settings,HR Settings,Ustawienia HR
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Expense Claim is pending approval. Only the Expense Approver can update status.,Zwrot Kosztów jest w oczekiwaniu na potwierdzenie. Tylko osoba zatwierdzająca wydatki może uaktualnić status.
+DocType: Email Digest,New Expenses,Nowe wydatki
 DocType: Purchase Invoice,Additional Discount Amount,Kwota dodatkowego rabatu
-apps/erpnext/erpnext/controllers/accounts_controller.py +524,"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."
+apps/erpnext/erpnext/controllers/accounts_controller.py +527,"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 +249,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/stock/get_item_details.py +123,Please specify Company,Sprecyzuj Firmę
 ,Customer Acquisition and Loyalty,
@@ -1795,17 +1814,19 @@
 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 +183,Closing (Opening + Totals),Zamknięcie (otwarcie + suma)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),Zamknięcie (otwarcie + suma)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Proszę określić walutę w Spółce
 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/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
-apps/erpnext/erpnext/controllers/accounts_controller.py +272,Account {0} is invalid. Account Currency must be {1},Konto {0} jest nieprawidłowe. Walutą konta musi być {1}
+DocType: Email Digest,Pending Sales Orders,W oczekiwaniu zleceń sprzedaży
+apps/erpnext/erpnext/controllers/accounts_controller.py +275,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 +956,"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 Slip,Deduction,Odliczenie
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +87,Row {0}: From Time and To Time is mandatory.,Wiersz {0}: od czasu do czasu i jest obowiązkowe.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +969,"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 +111,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 +262,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 +7,Please enter Employee Id of this sales person,Proszę podać ID pracownika tej osoby ze sprzedaży
@@ -1813,7 +1834,7 @@
 DocType: Project,% Tasks Completed,% Zadania Zakończone
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,Różnica Kwota musi wynosić zero
 DocType: Project,Gross Margin,Marża brutto
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +194,Please enter Production Item first,Wprowadź jako pierwszą Produkowaną Rzecz
+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
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Wycena
@@ -1822,53 +1843,54 @@
 DocType: Maintenance Visit,Maintenance User,Użytkownik Konserwacji
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +149,Cost Updated,Koszt Zaktualizowano
 DocType: Employee,Date of Birth,Data urodzenia
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +86,Item {0} has already been returned,Element {0} został zwrócony
+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}
+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 +177,Job Description,Opis stanowiska Pracy
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,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 +126,"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 +127,"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."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +24,Welcome to POS: Create your POS Profile,Witamy POS: Stwórz swój profil POS
 DocType: Expense Claim,Approver,Osoba zatwierdzająca
 ,SO Qty,
+DocType: Guardian,Work Address,Adres miejsca pracy
 DocType: Appraisal,Calculate Total Score,Oblicz całkowity wynik
 DocType: Request for Quotation,Manufacturing Manager,Kierownik Produkcji
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Nr seryjny {0} w ramach gwarancji do {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +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 +74,Shipments,Przesyłki
+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
 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 +153,Row # ,Wiersz #
+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 +156,Get From,Pobierz Z
+apps/erpnext/erpnext/public/js/utils.js +167,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 +167,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 +416,"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"
+apps/erpnext/erpnext/controllers/accounts_controller.py +419,"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
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} is disabled,Użytkownik {0} jest wyłączony
 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ą ...
 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 +171,"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 +346,{0} is mandatory for Item {1},{0} jest obowiązkowe dla elementu {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,{0} is mandatory for Item {1},{0} jest obowiązkowe dla elementu {1}
 DocType: Currency Exchange,From Currency,Od Waluty
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Proszę wybrać Przyznana kwota, faktury i faktury Rodzaj numer w conajmniej jednym rzędzie"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,Koszt zakupu nowego
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},Zlecenie Sprzedaży jest wymagane dla Elementu {0}
 DocType: Purchase Invoice Item,Rate (Company Currency),Stawka (waluta firmy)
-apps/erpnext/erpnext/demo/setup_data.py +360,Others,Inni
+DocType: Student Guardian,Others,Inni
 DocType: Payment Entry,Unallocated Amount,Kwota nieprzydzielone
 apps/erpnext/erpnext/templates/includes/product_page.js +65,Cannot find a matching Item. Please select some other value for {0}.,Nie możesz znaleźć pasujący element. Proszę wybrać jakąś inną wartość dla {0}.
 DocType: POS Profile,Taxes and Charges,Podatki i opłaty
@@ -1888,17 +1910,16 @@
 apps/erpnext/erpnext/config/stock.py +304,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/accounts/report/item_wise_sales_register/item_wise_sales_register.py +54,Receivable Account,Konto Należności
-apps/erpnext/erpnext/controllers/accounts_controller.py +546,Row #{0}: Asset {1} is already {2},Wiersz # {0}: {1} aktywami jest już {2}
+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 +549,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 +79,CEO,CEO
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,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 +808,Please select correct account,Proszę wybrać prawidłową konto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +809,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
-DocType: Purchase Invoice Item,Page Break,Znak końca strony
 DocType: Production Order Operation,Pending,W toku
 DocType: Course,Course Name,Nazwa przedmiotu
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Użytkownicy którzy mogą zatwierdzić wnioski o urlop konkretnych użytkowników
@@ -1907,14 +1928,15 @@
 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 +54,Full-time,Na cały etet
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,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
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Jeśli utworzono standardowy szablon w podatku od sprzedaży i Prowizji szablonu, wybierz jedną i kliknij na przycisk poniżej."
+DocType: Student,Guardians,Strażnicy
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +29,Please specify a country for this Shipping Rule or check Worldwide Shipping,"Proszę podać kraj, w tym wysyłka Reguły lub sprawdź wysyłka na cały świat"
 DocType: Stock Entry,Total Incoming Value,Całkowita wartość przychodów
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Debit To is required,Aby debetowej wymagane jest
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +321,Debit To is required,Aby debetowej wymagane jest
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Cennik zakupowy
 DocType: Offer Letter Term,Offer Term,Oferta Term
 DocType: Quality Inspection,Quality Manager,Manager Jakości
@@ -1922,6 +1944,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/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
@@ -1932,18 +1955,17 @@
 DocType: Production Order Operation,Completed Qty,Ukończona wartość
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"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 +273,Price List {0} is disabled,Cennik {0} jest wyłączony
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +99,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/projects/doctype/timesheet/timesheet.py +123,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
 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}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Aktualny Wycena Cena
 DocType: Item,Customer Item Codes,Kody Pozycja klienta
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,Wymiana Zysk / Strata
 DocType: Opportunity,Lost Reason,Powód straty
-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/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/purchase_receipt/purchase_receipt.py +378,All items have already been invoiced,Wszystkie pozycje zostały już zafakturowane
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +379,All items have already been invoiced,Wszystkie pozycje zostały już zafakturowane
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Kolejne centra kosztów mogą być wykonane w ramach grup, ale wpisy mogą być wykonane przed spoza grup"
 DocType: Project,External,Zewnętrzny
@@ -1959,18 +1981,19 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Twoi Klienci
 apps/erpnext/erpnext/projects/doctype/project/project.py +141,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/job_opening.html +19,Apply Now,Aplikuj teraz
+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.",
 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
-apps/erpnext/erpnext/utilities/doctype/address/address.py +164,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: Fee Structure,Fee Structure,Struktura opłat
 DocType: Timesheet Detail,Costing Amount,Kwota zestawienia kosztów
+DocType: Student Admission,Application Fee,Opłata za zgłoszenie
 DocType: Process Payroll,Submit Salary Slip,Zatwierdź potrącenie z pensji
-apps/erpnext/erpnext/controllers/selling_controller.py +161,Maxiumm discount for Item {0} is {1}%,Maksymalny rabat dla produktu {0} to {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,Maksymalny rabat dla produktu {0} to {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Masowego importu
 DocType: Sales Partner,Address & Contacts,Adresy i kontakty
 DocType: SMS Log,Sender Name,Nazwa Nadawcy
@@ -1995,21 +2018,21 @@
 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_data.py +361,Travel,Podróż
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +155,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 +304,Travel,Podróż
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +167,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 +23,Update Cost,Zaktualizuj Koszt
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Zaktualizuj Koszt
 DocType: Item Reorder,Item Reorder,Element Zamów ponownie
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +36,Show Salary Slip,Slip Pokaż Wynagrodzenie
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +748,Transfer Material,Transfer materiału
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +53,Show Salary Slip,Slip Pokaż Wynagrodzenie
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +166,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 +923,Please set recurring after saving,Proszę ustawić cykliczne po zapisaniu
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +646,Select change amount account,Wybierz opcję Zmień konto kwotę
+apps/erpnext/erpnext/public/js/controllers/transaction.js +914,Please set recurring after saving,Proszę ustawić cykliczne po zapisaniu
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +703,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
@@ -2021,31 +2044,32 @@
 DocType: Quality Inspection,Verified By,Zweryfikowane przez
 DocType: Address,Subsidiary,Pomocniczy
 apps/erpnext/erpnext/setup/doctype/company/company.py +64,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","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: Quality Inspection,Purchase Receipt No,Nr Potwierdzenia Zakupu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Pieniądze zaliczkowe
 DocType: Process Payroll,Create Salary Slip,Utwórz pasek wynagrodzenia
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +33,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 +352,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Ilość w rzędzie  {0} ({1}) musi być taka sama jak wyprodukowana ilość {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Ilość w rzędzie  {0} ({1}) musi być taka sama jak wyprodukowana ilość {2}
 DocType: Appraisal,Employee,Pracownik
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Zaproś jako Użytkownik
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} jest w pełni rozliczone
 DocType: Workstation Working Hour,End Time,Czas zakończenia
 DocType: Payment Entry,Payment Deductions or Loss,Odliczenia płatności lub strata
-apps/erpnext/erpnext/config/schools.py +100,LMS,LMS
+apps/erpnext/erpnext/config/schools.py +104,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/config/crm.py +6,Sales Pipeline,Pipeline sprzedaży
 DocType: Student Batch Student,Student Batch Student,Student Student Batch
-DocType: Sales Invoice,Mass Mailing,Mailing Masowy
+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 +199,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/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 +297,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 +111,Pharmaceutical,Farmaceutyczny
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +309,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/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,
@@ -2057,30 +2081,31 @@
 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"
 DocType: Buying Settings,Buying Settings,Ustawienia Kupna
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,
-DocType: Upload Attendance,Attendance To Date,Frekwencja - usługa do dnia
+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 +814,Please specify Company to proceed,Sprecyzuj firmę aby przejść dalej
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +793,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 +44,Compensatory Off,
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,
 DocType: Quality Inspection Reading,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ąć."
 DocType: Room,Room Number,Numer pokoju
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Nieprawidłowy odniesienia {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +161,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) nie może być większa niż zaplanowana ilość ({2}) w Zleceniu Produkcyjnym {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +162,{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 +217,Raw Materials cannot be blank.,Surowce nie może być puste.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,"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 +460,Quick Journal Entry,Szybkie Księgowanie
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +111,You can not change rate if BOM mentioned agianst any item,Nie możesz zmienić danych jeśli BOM jest przeciw jakiejkolwiek rzeczy
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +441,"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 +450,Quick Journal Entry,Szybkie Księgowanie
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +103,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 +214,{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
 ,Minutes to First Response for Issues,Minutes to pierwsza odpowiedź do Spraw
 DocType: Purchase Invoice,Terms and Conditions1,Warunki1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,"Nazwa instytutu, dla którego jest utworzenie tego systemu."
@@ -2089,16 +2114,17 @@
 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 +398,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 +739,Item or Warehouse for row {0} does not match Material Request,
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +747,Item or Warehouse for row {0} does not match Material Request,
 apps/erpnext/erpnext/config/stock.py +184,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: Lead,Opportunity,Oferta
+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
@@ -2107,11 +2133,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{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 Bill of Materials
-DocType: Student,Joining Date,Dołączenie Data
+apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Drzewo Zestawienia materiałów
+DocType: Student,Joining Date,Data Dołączenia
 ,Employees working on a holiday,Pracownicy zatrudnieni na wakacje
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Mark Present
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},Początek daty konserwacji nie może być wcześniejszy od daty numeru seryjnego {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},Początek daty konserwacji nie może być wcześniejszy od daty numeru seryjnego {0}
 DocType: Production Order,Actual End Date,Rzeczywista Data Zakończenia
 DocType: Purchase Invoice,PINV-,PINV-
 DocType: Authorization Rule,Applicable To (Role),Stosowne dla (Rola)
@@ -2126,7 +2152,7 @@
 DocType: SMS Log,No of Requested SMS,Numer wymaganego SMS
 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 +729,Please supply the specified items at the best possible rates,Proszę dostarczyć określone przedmioty w najlepszych możliwych cenach
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +695,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 +117,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-
@@ -2135,7 +2161,7 @@
 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 +14,This is an example website auto-generated from ERPNext,Ta przykładowa strona została automatycznie wygenerowana przez ERPNext
+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
 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.
 
@@ -2182,13 +2208,14 @@
 DocType: Purchase Receipt Item,Recd Quantity,Zapisana Ilość
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +54,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 +103,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 +504,Stock Entry {0} is not submitted,Zdjęcie Wejście {0} nie jest składany
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Nie można wyprodukować więcej przedmiotów {0} niż wartość {1} na Zamówieniu
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +505,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: Salary Component Account,Salary Component Account,Konto Wynagrodzenie Komponent
 DocType: Global Defaults,Hide Currency Symbol,Ukryj symbol walutowy
 apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card","np. Bank, Gotówka, Karta kredytowa"
+DocType: Lead Source,Source Name,Źródło Nazwa
 DocType: Journal Entry,Credit Note,
 DocType: Warranty Claim,Service Address,Adres usługi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furnitures and Fixtures,Meble i wyposażenie
@@ -2200,6 +2227,7 @@
 DocType: Opportunity,Customer / Lead Name,Nazwa Klienta / Tropu
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +89,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/controllers/trends.py +19,Total(Qty),Razem (szt)
 DocType: Sales Invoice,This Document,Ten dokument
@@ -2211,15 +2239,15 @@
 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 +176,Organization branch master.,Szef oddziału Organizacji
-apps/erpnext/erpnext/controllers/accounts_controller.py +273, or ,lub
+apps/erpnext/erpnext/controllers/accounts_controller.py +276, or ,lub
 DocType: Sales Order,Billing Status,Status Faktury
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Zgłoś problem
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,Wydatki na usługi komunalne
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-Ponad
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +203,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Wiersz # {0}: Journal Entry {1} nie masz konta {2} lub już porównywana z innym kuponie
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +206,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 +90,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 +93,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
@@ -2247,8 +2275,8 @@
 DocType: Product Bundle,Parent Item,Element nadrzędny
 DocType: Account,Account Type,Typ konta
 DocType: Delivery Note,DN-RET-,DN-RET
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +115,Leave Type {0} cannot be carry-forwarded,Zostaw typu {0} nie może być przenoszenie przekazywane
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Plan Konserwacji nie jest generowany dla wszystkich przedmiotów. Proszę naciśnij ""generuj plan"""
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +118,Leave Type {0} cannot be carry-forwarded,Zostaw typu {0} nie może być przenoszenie przekazywane
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Plan Konserwacji nie jest generowany dla wszystkich przedmiotów. Proszę naciśnij ""generuj plan"""
 ,To Produce,Do produkcji
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Lista płac
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +163,"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"
@@ -2260,13 +2288,13 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +32,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 +748,Delivery,Dostarczanie
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +742,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
 DocType: Payment Entry,Total Allocated Amount,Łączna kwota przyznanego wsparcia
 DocType: Item Reorder,Material Request Type,Typ zamówienia produktu
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +82,Row {0}: UOM Conversion Factor is mandatory,Wiersz {0}: JM Współczynnik konwersji jest obowiązkowe
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +79,Row {0}: UOM Conversion Factor is mandatory,Wiersz {0}: JM Współczynnik konwersji jest obowiązkowe
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Budget,Cost Center,Centrum kosztów
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Bon #
@@ -2277,13 +2305,13 @@
 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 +90,Head of Marketing and Sales,Kierownik Marketingu i Sprzedaży
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Podatek dochodowy
+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 +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
 DocType: Item Supplier,Item Supplier,Dostawca
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +403,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 +770,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 +397,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 +764,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"
@@ -2295,28 +2323,29 @@
 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 +100,Issues,Zagadnienia
+apps/erpnext/erpnext/hooks.py +109,Issues,Zagadnienia
 apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},Status musi być jednym z {0}
 DocType: Sales Invoice,Debit To,Debet na
 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
 DocType: Supplier,Billing Currency,Waluta Rozliczenia
 DocType: Sales Invoice,SINV-RET-,SINV-RET
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Large,Bardzo Duży
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,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 +507,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 +107,Local,Lokalne
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +508,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/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 +154,Large,Duży
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,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 +225,Total {0} ({1}),Razem {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +224,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
@@ -2374,9 +2403,9 @@
 DocType: Attendance,Leave Type,Typ urlopu
 apps/erpnext/erpnext/controllers/stock_controller.py +173,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/hr/doctype/salary_slip/salary_slip.py +79,Name error: {0},Błąd Nazwa: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +90,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 +178,{0} {1} does not associated with {2} {3},{0} {1} nie jest skojarzony z {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +181,{0} {1} does not associated with {2} {3},{0} {1} nie jest skojarzony z {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Frekwencja pracownika {0} jest już zaznaczona
 DocType: Packing Slip,If more than one package of the same type (for print),Jeśli więcej niż jedna paczka tego samego typu (do druku)
 DocType: Warehouse,Parent Warehouse,Dominująca Magazyn
@@ -2395,7 +2424,7 @@
 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
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,Conajmniej jedna pozycja powinna być wpisana w ilości negatywnej w dokumencie powrotnej
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Atleast one item should be entered with negative quantity in return document,Conajmniej jedna pozycja powinna być wpisana w ilości negatywnej w dokumencie powrotnej
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operacja {0} dłużej niż wszelkie dostępne w godzinach pracy stacji roboczej {1}, rozbić na kilka operacji operacji"
 ,Requested,Zamówiony
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +83,No Remarks,Brak Uwag
@@ -2407,46 +2436,46 @@
 DocType: Item,Total Projected Qty,Łącznej prognozowanej szt
 DocType: Monthly Distribution,Distribution Name,Nazwa Dystrybucji
 DocType: Course,Course Code,Kod kursu
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Quality Inspection required for Item {0},Kontrola jakości wymagana dla Przedmiotu {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,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
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Zarządzaj drzewem terytorium
 DocType: Journal Entry Account,Sales Invoice,Faktura sprzedaży
 DocType: Journal Entry Account,Party Balance,Bilans Grupy
-apps/erpnext/erpnext/accounts/page/pos/pos.js +475,Please select Apply Discount On,Proszę wybrać Zastosuj RABAT
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +92,Salary Slip Created,Wygenerowano pasek wynagrodzenia
+apps/erpnext/erpnext/accounts/page/pos/pos.js +464,Please select Apply Discount On,Proszę wybrać Zastosuj RABAT
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +95,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
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,Rabat procentowy może być stosowany zarówno przed cenniku dla wszystkich Cenniku.
 DocType: Purchase Invoice,Half-yearly,Półroczny
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +384,Accounting Entry for Stock,Zapis księgowy dla zapasów
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +387,Accounting Entry for Stock,Zapis księgowy dla zapasów
 DocType: Sales Invoice,Sales Team1,Team Sprzedażowy1
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,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 +96,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 +120,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 +88,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/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
 DocType: Item Group,Show this slideshow at the top of the page,Pokaż slideshow na górze strony
 DocType: BOM,Item UOM,Jednostka miary produktu
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Kwota podatku po uwzględnieniu rabatu (waluta firmy)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +147,Target warehouse is mandatory for row {0},Magazyn docelowy jest obowiązkowy dla wiersza {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +141,Target warehouse is mandatory for row {0},Magazyn docelowy jest obowiązkowy dla wiersza {0}
 DocType: Cheque Print Template,Primary Settings,Ustawienia podstawowe
 DocType: Purchase Invoice,Select Supplier Address,Wybierz Dostawca Adres
 DocType: Quality Inspection,Quality Inspection,Kontrola jakości
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Extra Small,Extra Small
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +194,Account {0} is frozen,Konto {0} jest zamrożone
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Extra Small
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +690,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 +197,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 +606,Can only make payment against unbilled {0},Mogą jedynie wpłaty przed Unbilled {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +126,Commission rate cannot be greater than 100,Wartość prowizji nie może być większa niż 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +609,Can only make payment against unbilled {0},Mogą jedynie wpłaty przed Unbilled {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,Wartość prowizji nie może być większa niż 100
 DocType: Stock Entry,Subcontract,Zlecenie
 apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,Podaj {0} pierwszy
 DocType: Production Order Operation,Actual End Time,Rzeczywisty czas zakończenia
@@ -2457,30 +2486,30 @@
 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 +158,Colour,Kolor
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,Kolor
 DocType: Maintenance Visit,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"
 DocType: Student Log,Academic,Akademicki
-apps/erpnext/erpnext/controllers/accounts_controller.py +469,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Suma zaliczki ({0}) przed zamówieniem {1} nie może być większa od ogólnej sumy ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +472,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Suma zaliczki ({0}) przed zamówieniem {1} nie może być większa od ogólnej sumy ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Wybierz dystrybucji miesięcznej się nierównomiernie rozprowadzić cele całej miesięcy.
 DocType: Purchase Invoice Item,Valuation Rate,Wskaźnik wyceny
+DocType: Stock Reconciliation,SR/,SR /
 apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,Nie wybrano Cennika w Walucie
 DocType: Assessment,Results,wyniki
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +168,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 +175,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
-DocType: Student Applicant,Father's/ Guardian 2 Email ID,/ Opiekun 2 Email ID ojca
 DocType: Maintenance Visit Purpose,Against Document No,
 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 +228,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 +231,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,Nieoznakowany Frekwencja
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Researcher,Researcher
+DocType: Employee Attendance Tool,Unmarked Attendance,Obecność nieoznaczona
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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.
@@ -2492,25 +2521,25 @@
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Dla wygody klientów, te kody mogą być użyte w formacie drukowania jak faktury czy dowody dostawy"
 DocType: 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: Sales Invoice,Advertisement,Reklama
 DocType: Asset Category Account,Depreciation Expense Account,Konto amortyzacji wydatków
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Probationary Period,Okres próbny
-apps/erpnext/erpnext/hooks.py +102,Announcements,Ogłoszenia
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Okres próbny
+apps/erpnext/erpnext/hooks.py +111,Announcements,Ogłoszenia
 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 +109,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 +16,To Datetime,Aby DateTime
+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/scheduling_tool/scheduling_tool.py +51,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/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Oczekujące Inne
+DocType: Accounts Settings,Make Payment via Journal Entry,Dokonaj płatności za pośrednictwem Journal Entry
+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 +127,Please enter relieving date.,
-apps/erpnext/erpnext/controllers/trends.py +145,Amt,Amt
+apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,Only Leave Applications with status 'Approved' can be submitted,
 apps/erpnext/erpnext/utilities/doctype/address/address.py +26,Address Title is mandatory.,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ą
@@ -2528,14 +2557,15 @@
 apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1},Nie można znaleźć kurs wymiany dla {0} {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Oznacz pół dnia
 DocType: Sales Invoice,Sales Team,Team Sprzedażowy
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Duplicate entry,Wpis zduplikowany
+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 +490,[Error],[Błąd]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +484,[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
 apps/erpnext/erpnext/controllers/status_updater.py +175,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.
 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
@@ -2551,22 +2581,22 @@
 ,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 +25,All Jobs,Wszystkie Oferty pracy
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,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ę
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Amount {0} {1} {2} {3},Kwota {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Amount {0} {1} {2} {3},Kwota {0} {1} {2} {3}
 DocType: Account,Depreciation,Amortyzacja
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Dostawca(y)
-DocType: Employee Attendance Tool,Employee Attendance Tool,Pracownik Frekwencja Narzędzie
+DocType: Employee Attendance Tool,Employee Attendance Tool,Narzędzie Frekwencji
 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 +372,Payment Entries {0} are un-linked,Wpisy płatności {0} są un-linked
+apps/erpnext/erpnext/accounts/utils.py +449,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
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +497,Material Requests {0} created,
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +498,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ą.
 DocType: Purchase Invoice,Address and Contact,Adres i Kontakt
@@ -2605,12 +2635,12 @@
 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 +848,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 +859,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 +233,Closing (Dr),Zamknięcie (Dr)
 DocType: Cheque Print Template,Cheque Size,Czek Rozmiar
 DocType: Contact,Passive,Nie aktywny
-apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.js +49,View attendance,Zobacz frekwencja
+apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.js +49,View attendance,Przeglądaj obecność
 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.
 DocType: Sales Invoice,Write Off Outstanding Amount,Nieuregulowana Wartość Odpisu
@@ -2626,7 +2656,8 @@
 ,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ć.
-apps/erpnext/erpnext/controllers/accounts_controller.py +555,'Update Stock' cannot be checked for fixed asset sale,Opcja 'Aktualizuj Stan' nie może być zaznaczona dla sprzedaży środka trwałego
+DocType: Student Guardian,Father,Ojciec
+apps/erpnext/erpnext/controllers/accounts_controller.py +558,'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/buying/doctype/purchase_order/purchase_order.py +132,Material Request {0} is cancelled or stopped,Zamówienie produktu {0} jest anulowane lub wstrzymane
@@ -2636,16 +2667,16 @@
 DocType: Sales Order,Fully Delivered,Całkowicie dostarczono
 DocType: Lead,Lower Income,Niższy przychód
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked",
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +166,Source and target warehouse cannot be same for row {0},Źródło i magazyn docelowy nie mogą być takie sama dla wiersza {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","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 +81,Purchase Order number required for Item {0},Numer Zamówienia Kupna wymagany do {0}
+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/purchase_receipt/purchase_receipt.py +82,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 +17,Cannot change status as student {0} is linked with student application {1},Nie można zmienić status studenta {0} jest powiązany z aplikacją studentów {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Nie można zmienić status studenta {0} jest powiązany z aplikacją studentów {1}
 DocType: Timesheet,"List of employee which has ""Salary Slip Based on Timesheet"" is enabled in salary structure.","Lista pracownika, który ma &quot;Slip Pensja Na podstawie grafiku&quot; jest włączona w struktury płac."
 DocType: Asset,Fully Depreciated,pełni zamortyzowanych
 ,Stock Projected Qty,Przewidywana ilość zapasów
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Customer {0} does not belong to project {1},Klient {0} nie należy do projektu {1}
-DocType: Employee Attendance Tool,Marked Attendance HTML,Zaznaczony Frekwencja HTML
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,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
 DocType: Warranty Claim,From Company,Od Firmy
@@ -2656,7 +2687,7 @@
 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/patches/v7_0/create_warehouse_nestedset.py +55,All Warehouses,Wszystkie Magazyny
+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 +105,Credit To account must be a Balance Sheet account,Konto kredytowane powinno być kontem bilansowym
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Typy wszystkich dostawców
@@ -2668,10 +2699,10 @@
 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/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +26,Browse BOM,Przeglądaj BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,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/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 Year,Academic Year,Rok akademicki
+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
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,Ocena
@@ -2679,12 +2710,12 @@
 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 +197,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 +204,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: Workstation Working Hour,Start Time,Czas rozpoczęcia
 DocType: Item Price,Bulk Import Help,Luzem Importuj Pomoc
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +256,Select Quantity,Wybierz ilość
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +257,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
@@ -2701,6 +2732,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Wymagana jest ilość lub kwota docelowa
 apps/erpnext/erpnext/config/projects.py +45,Cost of various activities,Koszt różnych działań
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Ustawianie zdarzenia do {0}, ponieważ urzędnik dołączone do sprzedaży poniżej osób nie posiada identyfikator użytkownika {1}"
+DocType: Timesheet,Billing Details,Szczegóły płatności
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +149,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}
 DocType: Item,Inspection Required,Wymagana kontrola
@@ -2720,7 +2752,7 @@
 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 +138,Wire Transfer,Przelew
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,Przelew
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Zaznacz wszystkie
 DocType: Sales Order,Recurring Order,Powtarzające się Zamówienie
 DocType: Company,Default Income Account,Domyślne konto przychodów
@@ -2732,21 +2764,19 @@
 ,Welcome to ERPNext,Zapraszamy do ERPNext
 apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,Trop do Wyceny
 DocType: Lead,From Customer,Od klienta
-apps/erpnext/erpnext/demo/setup_data.py +357,Calls,Połączenia
+apps/erpnext/erpnext/demo/setup/setup_data.py +300,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/stock/doctype/item/item.py +466,"As there are existing transactions for this item, \
-							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Ponieważ istnieje istniejące transakcje dla tego produktu, \ nie można zmienić wartości &quot;Has Nr seryjny&quot;, &quot;Nie ma Batch&quot;, &quot;Czy pozycja Grafika&quot; i &quot;Metoda wyceny&quot;"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,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/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 +139,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 +58,Attendance has been marked successfully.,Widownia została oznaczona pomyślnie.
+apps/erpnext/erpnext/schools/api.py +57,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 +136,Account Type for {0} must be {1},Typ konta dla {0} musi być {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +139,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
@@ -2761,12 +2791,13 @@
 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/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 +20,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 +1190,Please select customer,Wybierz klienta
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1193,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
@@ -2776,6 +2807,7 @@
 ,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 +50,Missing Currency Exchange Rates for {0},Brakujące Wymiana walut stawki dla {0}
 DocType: Assessment,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-
@@ -2793,11 +2825,12 @@
 DocType: Journal Entry,JV-,V-
 DocType: Topic,Topic Name,Nazwa tematu
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Conajmniej jeden sprzedaż lub zakup musi być wybrany
+DocType: Grading Structure,Grade Intervals,Stopień Odstępy
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Wybierz charakteru swojej działalności.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,"W przypadku, gdy czynności wytwórcze są prowadzone."
 DocType: Asset Movement,Source Warehouse,Magazyn źródłowy
 DocType: Installation Note,Installation Date,Data instalacji
-apps/erpnext/erpnext/controllers/accounts_controller.py +534,Row #{0}: Asset {1} does not belong to company {2},Wiersz # {0}: {1} aktywami nie należy do firmy {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +537,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
@@ -2811,28 +2844,31 @@
 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 +111,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/scheduling_tool/scheduling_tool.py +49,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 +87,{0}% Delivered,{0}% dostarczono
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% dostarczono
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Element {0}: Zamówione szt {1} nie może być mniejsza niż minimalna Ilość zamówień {2} (określonego w pkt).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Miesięczny rozkład procentowy
 DocType: Territory,Territory Targets,Cele Regionalne
 DocType: Delivery Note,Transporter Info,Informacje dotyczące przewoźnika
-apps/erpnext/erpnext/accounts/utils.py +379,Please set default {0} in Company {1},Proszę ustawić domyślny {0} w towarzystwie {1}
+apps/erpnext/erpnext/accounts/utils.py +456,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
 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
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Tytuł szablonu wydruku np.: Faktura Proforma
+DocType: Student Guardian,Student Guardian,Student Stróża
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +184,Valuation type charges can not marked as Inclusive,Opłaty typu Wycena nie oznaczone jako Inclusive
 DocType: POS Profile,Update Stock,Aktualizuj Stan
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Kursy
 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 +349,Journal Entries {0} are un-linked,Zapisy księgowe {0} są un-linked
+apps/erpnext/erpnext/accounts/utils.py +426,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
@@ -2856,6 +2892,7 @@
 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
+DocType: Homepage,"URL for ""All Products""",URL &quot;Wszystkie produkty&quot;
 DocType: Leave Application,Leave Balance Before Application,Status Urlopu przed Wnioskiem
 DocType: SMS Center,Send SMS,Wyślij SMS
 DocType: Cheque Print Template,Width of amount in word,Szerokość kwoty w słowie
@@ -2864,7 +2901,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 +29,Current Job Openings,Aktualne ofert pracy
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,Current Job Openings,Aktualne ofert pracy
 DocType: Company,Stock Adjustment Account,Konto korekty
 DocType: Journal Entry,Write Off,Strata do odpisania
 DocType: Timesheet Detail,Operation ID,Operacja ID
@@ -2877,7 +2914,7 @@
 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 +850,Show tax break-up,Pokaż Podatek rozpad
+apps/erpnext/erpnext/public/js/controllers/transaction.js +841,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/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ć"
@@ -2887,10 +2924,11 @@
 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 +534,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 +80,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 +162,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/selling/doctype/customer/customer.py +195,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 +5,This is based on the attendance of this Student,Jest to oparte na obecności tego Studenta
@@ -2899,12 +2937,11 @@
 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 +75,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 +138,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/hr/doctype/leave_application/leave_application.py +145,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: Program Enrollment Fee,Program Enrollment Fee,Program Rejestracji Opłata
 DocType: Item,Supplier Items,Dostawca przedmioty
 DocType: Opportunity,Opportunity Type,Typ szansy
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,Nowa firma
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,Cost Center is required for 'Profit and Loss' account {0},Centrum kosztów jest wymagane dla konta 'Zysków i Strat' {0}
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Transakcje mogą być usunięte tylko przez twórcę Spółki
 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.,Nieprawidłowa liczba zapisów w Księdze głównej. Być może wybrano niewłaściwe konto w transakcji.
 DocType: Cheque Print Template,Cheque Width,Czek Szerokość
@@ -2913,16 +2950,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,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 +228,{0} '{1}' is disabled,{0} '{1}' jest wyłączony
+apps/erpnext/erpnext/controllers/accounts_controller.py +231,{0} '{1}' is disabled,{0} '{1}' jest wyłączony
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Ustaw jako Otwarty
 DocType: Cheque Print Template,Scanned Cheque,zeskanowanych Czek
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Automatycznie wysyłać e-maile do kontaktów z transakcji Zgłaszanie.
+DocType: Timesheet,Total Billable Amount,Całkowita kwota podlegająca rozliczeniom
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Pozycja 3
 DocType: Purchase Order,Customer Contact Email,Kontakt z klientem e-mail
 DocType: Warranty Claim,Item and Warranty Details,Przedmiot i gwarancji Szczegóły
 DocType: Sales Team,Contribution (%),Udział (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Uwaga: Wejście płatność nie zostanie utworzone, gdyż nie została określona wartość ""gotówka lub rachunek bankowy"""
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Responsibilities,Obowiązki
+apps/erpnext/erpnext/controllers/accounts_controller.py +78,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Uwaga: Wejście płatność nie zostanie utworzone, gdyż nie została określona wartość ""gotówka lub rachunek bankowy"""
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,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
@@ -2930,16 +2968,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Dodaj użytkowników
 DocType: Pricing Rule,Item Group,Kategoria
 DocType: Item,Safety Stock,Bezpieczeństwo Zdjęcie
+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: 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,
 DocType: Sales Order,Partly Billed,Częściowo Zapłacono
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} must be a Fixed Asset Item,Element {0} musi być trwałego przedmiotu
-DocType: Item,Default BOM,Domyślny Wykaz Materiałów
+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: Timesheet,Total Hours,Całkowita liczba godzin
 DocType: Journal Entry,Printing Settings,Ustawienia drukowania
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Total Debit must be equal to Total Credit. The difference is {0},Całkowita kwota debetu powinna być równa całkowitej kwocie kredytu. Różnica wynosi {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,
@@ -2952,13 +2990,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Bankowość inwestycyjna
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +71,Cash or Bank Account is mandatory for making payment entry,Konto Kasa lub Bank jest wymagane dla tworzenia zapisów Płatności
 DocType: Purchase Invoice,Price List Exchange Rate,Cennik Kursowy
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Klient&gt; Grupa klientów&gt; Terytorium
 DocType: Purchase Invoice Item,Rate,Stawka
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Intern,Stażysta
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,Stażysta
 DocType: Stock Entry,From BOM,Od BOM
 DocType: Assessment,Assessment Code,Kod Assessment
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +32,Basic,Podstawowy
+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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Proszę kliknąć na ""Wygeneruj Harmonogram"""
+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 +95,Reference No is mandatory if you entered Reference Date,Nr Odniesienia jest obowiązkowy jest wprowadzono Datę Odniesienia
@@ -2967,11 +3006,11 @@
 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 +752,Issue Material,Wydanie Materiał
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +723,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 +683,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 +665,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ć.
 DocType: Hub Settings,Access Token,Dostęp za pomocą Tokenu
 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
@@ -2979,33 +3018,35 @@
 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 +1122,Enter value must be positive,Wprowadź wartość musi być dodatnia
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,All Territories,Wszystkie obszary
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1125,Enter value must be positive,Wprowadź wartość musi być dodatnia
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,Wszystkie obszary
 DocType: Purchase Invoice,Items,Produkty
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +23,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 +221,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 +233,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 +96,Request for Quotations,Zapytanie o cenę
+apps/erpnext/erpnext/hooks.py +104,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
 DocType: Asset,Partially Depreciated,częściowo Zamortyzowany
 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 +628,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Domyślne jednostki miary dla wariantu &quot;{0}&quot; musi być taki sam, jak w szablonie &#39;{1}&#39;"
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Domyślne jednostki miary dla wariantu &quot;{0}&quot; musi być taki sam, jak w szablonie &#39;{1}&#39;"
 DocType: Shipping Rule,Calculate Based On,Obliczone na podstawie
 DocType: Delivery Note Item,From Warehouse,Z magazynu
 DocType: Assessment,Supervisor Name,Nazwa Supervisor
+DocType: Assessment,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
 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 +27,Default Address Template cannot be deleted,Szablon domyślny Adresu nie może być usunięty
+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
 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
@@ -3020,8 +3061,8 @@
 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/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 +485,No default BOM exists for Item {0},Brak standardowego BOM dla produktu {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +336,Please select Posting Date first,Najpierw wybierz zamieszczenia Data
+apps/erpnext/erpnext/stock/get_item_details.py +486,No default BOM exists for Item {0},Brak standardowego BOM dla produktu {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +326,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
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Centrum Kosztów z istniejącą transakcją nie może być przekształcone w rejestr
@@ -3037,6 +3078,7 @@
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Płatności mecz fakturami
 DocType: Journal Entry,Bank Entry,Operacja bankowa
 DocType: Authorization Rule,Applicable To (Designation),Stosowne dla (Nominacja)
+,Profitability Analysis,Analiza rentowności
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,Dodaj do Koszyka
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Grupuj według
 DocType: Guardian,Interests,Zainteresowania
@@ -3049,22 +3091,22 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,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 +141,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Odcinkach Element {0} nie może być aktualizowana \
  Zdjęcie Pojednania za pomocą"
 DocType: Scheduling Tool,Day,Dzień
 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 +122,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 +129,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
-DocType: Student Applicant,AP.,AP.
 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 +639,Point of Sale,Punkt Sprzedaży (POS)
+apps/erpnext/erpnext/accounts/page/pos/pos.js +634,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
 DocType: Production Planning Tool,Production Planning Tool,Narzędzie do planowania produkcji
@@ -3073,74 +3115,77 @@
 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 +373,Quantity to Manufacture must be greater than 0.,Ilość do produkcji musi być większy niż 0 ° C.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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 Profile,Customer Group,Grupa Klientów
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,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/doctype/asset/asset.py +83,Next Depreciation Date must be on or after today,Następny Amortyzacja Data musi być w dniu lub po dzień dzisiejszy
 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 +145,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: Quotation,Quotation Lost Reason,Utracony Powód Wyceny
+apps/erpnext/erpnext/utilities/doctype/address/address.py +164,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.
 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 +330,Transaction reference no {0} dated {1},Transakcja ma odniesienia {0} z {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,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 +107,Summary for this month and pending activities,Podsumowanie dla tego miesiąca i działań toczących
+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/accounts/doctype/sales_invoice/sales_invoice.py +406,Please remove this Invoice {0} from C-Form {1},Proszę usunąć tę fakturę {0} z C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,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 +644,Get Items,Pobierz
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +623,Get Items,Pobierz
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +210,Please enter Write Off Account,Proszę zdefiniować konto odpisów (strat)
 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 +41,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,Mark Obecność wielu pracowników
+apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Zaznacz Obecność dla wielu pracowników
 DocType: Payment Request,Initiated,Zapoczątkowany
 DocType: Production Order,Planned Start Date,Planowana data rozpoczęcia
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,Customer is required against Receivable account {0},Klient zobowiązany jest przed Należności koncie {0}
 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 +265,Project-wise data is not available for Quotation,
+apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,
 DocType: Project,Expected End Date,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 +101,Commercial,Komercyjny
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,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: Supplier Quotation,Supplier Address,Adres dostawcy
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +648,Row {0}# Account must be of type 'Fixed Asset',Wiersz {0} # Konto musi być typu &quot;trwałego&quot;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,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 +30,Series is mandatory,Serie jest obowiązkowa
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +50,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
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +165,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 +155,Cr,Kr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Cr,Kr
 DocType: Tax Rule,Billing State,Stan Billing
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +250,Transfer,Transfer
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +187,{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 +825,Fetch exploded BOM (including sub-assemblies),
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +254,Transfer,Transfer
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +190,{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 +796,Fetch exploded BOM (including sub-assemblies),
 DocType: Authorization Rule,Applicable To (Employee),Stosowne dla (Pracownik)
-apps/erpnext/erpnext/controllers/accounts_controller.py +115,Due Date is mandatory,Due Date jest obowiązkowe
+apps/erpnext/erpnext/controllers/accounts_controller.py +118,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
 DocType: Journal Entry,Pay To / Recd From,Zapłać / Rachunek od
 DocType: Naming Series,Setup Series,Konfigurowanie serii
 DocType: Payment Reconciliation,To Invoice Date,Aby Data faktury
 DocType: Supplier,Contact HTML,HTML kontaktu
 ,Inactive Customers,Nieaktywne Klienci
+DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Potwierdzenia Zakupu
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Jak reguła jest stosowana Wycena?
 DocType: Quality Inspection,Delivery Note No,Nr dowodu dostawy
@@ -3149,7 +3194,7 @@
 DocType: Company,Retail,Detal
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +120,Customer {0} does not exist,Klient {0} nie istnieje
 DocType: Attendance,Absent,Nieobecny
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +587,Product Bundle,Pakiet produktów
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Product Bundle,Pakiet produktów
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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
@@ -3159,8 +3204,8 @@
 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 +742,Send Supplier Emails,Wyślij e-maile Dostawca
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +104,"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/buying/doctype/request_for_quotation/request_for_quotation.js +708,Send Supplier Emails,Wyślij e-maile Dostawca
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,"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: Guardian Interest,Guardian Interest,Strażnik Odsetki
 DocType: Timesheet,Employee Detail,Szczegóły urzędnik
@@ -3171,9 +3216,9 @@
 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}
 DocType: Salary Slip,Earning & Deduction,Dochód i Odliczenie
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +77,Account {0} cannot be a Group,Konto {0} nie może być grupą
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} cannot be a Group,Konto {0} nie może być grupą
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +31,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 +107,Negative Valuation Rate is not allowed,Błąd Szacowania Wartość nie jest dozwolona
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Błąd Szacowania Wartość nie jest dozwolona
 DocType: Holiday List,Weekly Off,Tygodniowy wyłączony
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","np. 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +39,Provisional Profit / Loss (Credit),Wstępny Zysk / Strata (Credit)
@@ -3187,16 +3232,16 @@
 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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: MPK jest obowiązkowe dla pozycji {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +626,Get Items from Product Bundle,Elementy z Bundle produktu
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +605,Get Items from Product Bundle,Elementy z Bundle produktu
 DocType: Asset,Straight Line,Linia prosta
 DocType: Project User,Project User,Użytkownik projektu
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} is inactive,Konto {0} jest nieaktywne
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} is inactive,Konto {0} jest nieaktywne
 DocType: GL Entry,Is Advance,Zaawansowany proces
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Frekwencja od dnia i usługa do dnia jest obowiązkowa
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Obecnośc od i do Daty są obowiązkowe
 apps/erpnext/erpnext/controllers/buying_controller.py +148,Please enter 'Is Subcontracted' as Yes or No,"Proszę wprowadź ""Zlecona"" jako Tak lub Nie"
 DocType: Sales Team,Contact No.,Numer Kontaktu
 DocType: Bank Reconciliation,Payment Entries,Wpisy płatności
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,'Profit and Loss' type account {0} not allowed in Opening Entry,Konto typu 'Zyski i Straty' ({0}) nie może być wpisem otwierającym rok
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +71,'Profit and Loss' type account {0} not allowed in Opening Entry,Konto typu 'Zyski i Straty' ({0}) nie może być wpisem otwierającym rok
 DocType: 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
@@ -3215,7 +3260,7 @@
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Seryjny #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Commission on Sales,Prowizja od sprzedaży
 DocType: Offer Letter Term,Value / Description,Wartość / Opis
-apps/erpnext/erpnext/controllers/accounts_controller.py +558,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Wiersz # {0}: {1} aktywami nie mogą być składane, jest już {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +561,"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: Production Order,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}.
@@ -3228,13 +3273,13 @@
 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/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: Sales Order,% Amount Billed,% wartości rozliczonej
+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.,
 apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},Brak przedmiotu o podanym numerze seryjnym {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Otwarte Powiadomienia
+DocType: Email Digest,Open Notifications,Otwarte Powiadomienia
 DocType: Payment Entry,Difference Amount (Company Currency),Różnica Kwota (waluta firmy)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,Wydatki bezpośrednie
 apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
@@ -3242,7 +3287,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Nowy Przychody klienta
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,Wydatki na podróże
 DocType: Maintenance Visit,Breakdown,Rozkład
-apps/erpnext/erpnext/controllers/accounts_controller.py +634,Account: {0} with currency: {1} can not be selected,Konto: {0} z waluty: nie można wybrać {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +637,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}
 DocType: Program Enrollment Tool,Student Applicants,Wnioskodawcy studenckie
@@ -3250,15 +3295,15 @@
 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 +56,Probation,Wyrok lub staż
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Probation,Wyrok lub staż
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,składników wynagrodzenia
 DocType: Program Enrollment Tool,New Academic Year,Nowy rok akademicki
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Payment of salary for the month {0} and year {1},Płatność pensji za miesiąć {0} i rok {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Payment of salary for the month {0} and year {1},Płatność pensji za miesiąć {0} i rok {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,"Cennik stopy wkładka auto, jeśli brakuje"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Kwota całkowita Płatny
 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 +144,Planning,Planowanie
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,Planowanie
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,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
@@ -3271,11 +3316,10 @@
 DocType: Sales Partner,Contact Desc,Opis kontaktu
 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.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Sales invoice submitted sucessfully.,Faktura sprzedaży złożone z powodzeniem.
 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}
 DocType: Assessment Result,Student Name,Nazwa Student
-apps/erpnext/erpnext/hooks.py +104,Assessment Schedule,Harmonogram oceny
+apps/erpnext/erpnext/hooks.py +113,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
@@ -3285,6 +3329,7 @@
 DocType: GL Entry,Party Type,Typ Grupy
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +78,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,Wejście Płatność już istnieje
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Brak autoryzacji od {0} przekroczono granice
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Szablon wynagrodzenia
 DocType: Leave Type,Max Days Leave Allowed,Udzielono maksymalna ilość dni zwolnienia
@@ -3296,18 +3341,19 @@
 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 +99,All Customer Groups,Wszystkie grupy klientów
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +78,Accumulated Monthly,skumulowana miesięczna
-apps/erpnext/erpnext/controllers/accounts_controller.py +595,{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/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Wszystkie grupy klientów
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +81,Accumulated Monthly,skumulowana miesięczna
+apps/erpnext/erpnext/controllers/accounts_controller.py +598,{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
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Wartość w cenniku (waluta firmy)
 DocType: Products Settings,Products Settings,produkty Ustawienia
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +188,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
 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 +84,Secretary,Sekretarka
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,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
@@ -3316,24 +3362,22 @@
 ,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
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,Wiersz # {0}: Numer seryjny jest obowiązkowe
+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 +859,Supplier Quotation,Wyznaczony dostawca
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +838,Supplier Quotation,Wyznaczony dostawca
 DocType: Quotation,In Words will be visible once you save the Quotation.,
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +7,Collect Fees,pobierania opłat
+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}
 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.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,nadchodzące wydarzenia
 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
-DocType: Email Digest,Income / Expense,Przychody / Wydatki
 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."
@@ -3345,13 +3389,14 @@
 DocType: Customer,From Lead,Od śladu
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Zamówienia puszczone do produkcji.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Wybierz rok finansowy ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,POS Profile required to make POS Entry,Profil POS wymagany do tworzenia wpisu z POS
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +509,POS Profile required to make POS Entry,Profil POS wymagany do tworzenia wpisu z POS
 DocType: Program Enrollment Tool,Enroll Students,zapisać studentów
 DocType: Hub Settings,Name Token,Nazwa jest już w użyciu
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard sprzedaży
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Atleast one warehouse is mandatory,Co najmniej jeden magazyn jest wymagany
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +129,Atleast one warehouse is mandatory,Co najmniej jeden magazyn jest wymagany
 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 +330,{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
@@ -3371,11 +3416,12 @@
 DocType: Account,Debit,Debet
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,Urlop musi by przyporządkowany w mnożniku 0.5
 DocType: Production Order,Operation Cost,Koszt operacji
-apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,Prześlij Frekwencję z pliku .csv
+apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,Prześlij obecności z pliku .csv
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Zaległa wartość
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Zamroź asortyment starszy niż [dni]
-apps/erpnext/erpnext/controllers/accounts_controller.py +528,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Wiersz # {0}: atutem jest obowiązkowe w przypadku środków trwałych kupna / sprzedaży
+apps/erpnext/erpnext/controllers/accounts_controller.py +531,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Wiersz # {0}: atutem jest obowiązkowe w przypadku środków trwałych kupna / sprzedaży
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Jeśli dwóch lub więcej Zasady ustalania cen na podstawie powyższych warunków, jest stosowana Priorytet. Priorytetem jest liczba z zakresu od 0 do 20, podczas gdy wartość domyślna wynosi zero (puste). Wyższa liczba oznacza, że będzie mieć pierwszeństwo, jeśli istnieje wiele przepisów dotyczących cen z samych warunkach."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Rok fiskalny: {0} nie istnieje
 DocType: Currency Exchange,To Currency,Do przewalutowania
@@ -3392,15 +3438,15 @@
 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
-DocType: Sales Invoice,Exhibition,Wystawa
 apps/erpnext/erpnext/utilities/doctype/address/address.py +77,"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 +81,Syntax error in formula or condition: {0},Błąd składni we wzorze lub stanu: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +92,Syntax error in formula or condition: {0},Błąd składni we wzorze lub stanu: {0}
 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"
+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 +28,Jobs,Oferty pracy
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,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
@@ -3409,16 +3455,16 @@
 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 +763,Make Supplier Quotation,
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,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/controllers/sales_and_purchase_return.py +100,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 +42,Casual Leave,Urlop okolicznościowy
+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
 DocType: Batch,Batch ID,Identyfikator Partii
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,Note: {0},Uwaga: {0}
 ,Delivery Note Trends,Trendy Dowodów Dostawy
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +103,This Week's Summary,Podsumowanie W tym tygodniu
+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
 DocType: Student Group Creation Tool,Get Courses,Uzyskaj kursy
 DocType: GL Entry,Party,Grupa
@@ -3428,7 +3474,7 @@
 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 +59,Piecework,Praca akordowa
+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
 DocType: Task,Actual Time (in Hours),Rzeczywisty czas (w godzinach)
 DocType: Employee,History In Company,Historia Firmy
@@ -3445,7 +3491,7 @@
 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ę."
 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 +162,Black,Czarny
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,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
@@ -3456,13 +3502,13 @@
 DocType: Project Task,Pending Review,Czekający na rewizję
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +106,"Asset {0} cannot be scrapped, as it is already {1}","Składnik {0} nie może zostać wycofane, jak to jest już {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Razem zwrot kosztów (przez zwrot kosztów)
-apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +69,Customer Id,ID klienta
+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
 DocType: Journal Entry Account,Exchange Rate,Kurs wymiany
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Sales Order {0} is not submitted,Zlecenie Sprzedaży {0} nie jest jeszcze złożone
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +527,Sales Order {0} is not submitted,Zlecenie Sprzedaży {0} nie jest jeszcze złożone
 DocType: Homepage,Tag Line,tag Linia
 DocType: Fee Component,Fee Component,opłata Komponent
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +857,Add items from,Dodaj elementy z
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +836,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}
 DocType: Cheque Print Template,Regular,Regularny
 DocType: BOM,Last Purchase Rate,Data Ostatniego Zakupu
@@ -3470,6 +3516,7 @@
 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"
 ,Sales Person-wise Transaction Summary,
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +60,Cost Center is required for 'Profit and Loss' account {0}. Please set up a default Cost Center for the Company.,MPK jest wymagane dla &quot;zysków i strat&quot; konta {0}. Proszę ustawić domyślny centrum kosztów dla firmy.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,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
@@ -3480,12 +3527,12 @@
 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 +710,Online,online
+apps/erpnext/erpnext/accounts/page/pos/pos.js +692,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 +16,Setting this Address Template as default as there is no other default,"Ustawienie tego adresu jako domyślnego szablonu, ponieważ nie ma innej domyślnej"
+apps/erpnext/erpnext/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"
 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 +74,Quality Management,Zarządzanie jakością
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,Zarządzanie jakością
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,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ą
@@ -3507,11 +3554,12 @@
 DocType: Student,Student Email ID,Student ID email
 DocType: Employee,Notice (days),Wymówienie (dni)
 DocType: Tax Rule,Sales Tax Template,Szablon Podatek od sprzedaży
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1520,Select items to save the invoice,"Wybierz elementy, aby zapisać fakturę"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1544,Select items to save the invoice,"Wybierz elementy, aby zapisać fakturę"
 DocType: Employee,Encashment Date,Data Inkaso
 DocType: Account,Stock Adjustment,Korekta
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Istnieje Domyślnie aktywny Koszt rodzajów działalności - {0}
 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
 DocType: Job Applicant,Applicant Name,Imię Aplikanta
@@ -3522,7 +3570,7 @@
 
 For Example: If you are selling Laptops and Backpacks separately and have a special price if the customer buys both, then the Laptop + Backpack will be a new Product Bundle Item.
 
-Note: BOM = Bill of Materials","Łą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ł &quot;Czy Pozycja Zdjęcie&quot;, jak &quot;Nie&quot; i &quot;Czy Sales Item&quot;, jak &quot;Tak&quot;. 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: LM = Bill of Materials"
+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
@@ -3541,17 +3589,17 @@
 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.
 DocType: Company,Distribution,Dystrybucja
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +8,Amount Paid,Kwota zapłacona
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Project Manager,Menadżer Projektu
+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
 ,Quoted Item Comparison,Porównanie cytowany Item
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Dispatch,Wyślij
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,Wyślij
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Maksymalna zniżka pozwoliło na pozycji: {0} jest {1}%
 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."
-DocType: Sales Invoice,Supplier Reference,
-apps/erpnext/erpnext/accounts/page/pos/pos.js +844,"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 +832,"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
@@ -3565,7 +3613,7 @@
 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,Wpis Odpisu
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +83,Error in formula or condition,Błąd wzoru lub stanu
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,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
@@ -3574,7 +3622,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},Aby Data powinna być w tym roku podatkowym. Zakładając To Date = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Tutaj wypełnij i przechowaj dane takie jak wzrost, waga, alergie, problemy medyczne itd"
 DocType: Leave Block List,Applies to Company,Dotyczy Firmy
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +197,Cannot cancel because submitted Stock Entry {0} exists,"Nie można anulować, ponieważ wskazane Wprowadzenie na magazyn {0} istnieje"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +198,Cannot cancel because submitted Stock Entry {0} exists,"Nie można anulować, ponieważ wskazane Wprowadzenie na magazyn {0} istnieje"
 DocType: Purchase Invoice,In Words,Słownie
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,Today is {0}'s birthday!,Dziś jest {0} 'urodziny!
 DocType: Production Planning Tool,Material Request For Warehouse,Zamówienie produktu dla Magazynu
@@ -3584,14 +3632,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,Rozpoczęcie roku podatkowego
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Aktywów Amortyzacja i salda
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +319,Amount {0} {1} transferred from {2} to {3},"Kwota {0} {1} przeniesione z {2} {3}, aby"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +322,Amount {0} {1} transferred from {2} to {3},"Kwota {0} {1} przeniesione z {2} {3}, aby"
 DocType: Sales Invoice,Get Advances Received,Uzyskaj otrzymane zaliczki
 DocType: Email Digest,Add/Remove Recipients,Dodaj / Usuń odbiorców
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +432,Transaction not allowed against stopped Production Order {0},
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +437,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 +143,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 +652,Item variant {0} exists with same attributes,Pozycja wariant {0} istnieje z samymi atrybutami
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Pozycja wariant {0} istnieje z samymi atrybutami
+DocType: Leave Application,LAP/,PODOŁEK/
 DocType: Salary Slip,Salary Slip,Pasek wynagrodzenia
 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
@@ -3599,12 +3648,12 @@
 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 +212,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 +215,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/public/js/controllers/transaction.js +866,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 +857,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
@@ -3614,14 +3663,14 @@
 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 +178,Invalid {0},Nieprawidłowy {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Sick Leave,Urlop chorobowy
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,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,
 DocType: Warehouse,PIN,KOŁEK
 DocType: Sales Invoice,Base Change Amount (Company Currency),Kwota bazowa Change (Spółka waluty)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +313,No accounting entries for the following warehouses,Brak zapisów księgowych dla następujących magazynów
-apps/erpnext/erpnext/projects/doctype/project/project.js +102,Save the document first.,Zapisz dokument jako pierwszy.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +314,No accounting entries for the following warehouses,Brak zapisów księgowych dla następujących magazynów
+apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Zapisz dokument jako pierwszy.
 DocType: Account,Chargeable,Odpowedni do pobierania opłaty.
 DocType: Company,Change Abbreviation,Zmień Skrót
 DocType: Expense Claim Detail,Expense Date,Data wydatku
@@ -3634,10 +3683,9 @@
 DocType: Purchase Invoice,Recurring Print Format,Format wydruku cykliczne
 DocType: C-Form,Series,Seria
 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
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,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
 DocType: Appraisal,Appraisal Template,Szablon oceny
 DocType: Item Group,Item Classification,Pozycja Klasyfikacja
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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
@@ -3647,8 +3695,8 @@
 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 +940,Please select {0} first,Proszę najpierw wybrać {0}
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +749,Batch {0} of Item {1} has expired.,Batch {0} pozycji {1} wygasł.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +953,Please select {0} first,Proszę najpierw wybrać {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +757,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
@@ -3676,8 +3724,8 @@
  {% 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 +92,Warehouse not found in the system,Magazyn nie został znaleziony w systemie
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +106,This Month's Summary,Podsumowanie tego miesiąca
+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
 DocType: Quality Inspection Reading,Quality Inspection Reading,Odczyt kontroli jakości
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,Zapasy starsze niż' powinny być starczyć na %d dni
 DocType: Tax Rule,Purchase Tax Template,Szablon podatkowy zakupów
@@ -3687,21 +3735,22 @@
 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 +87,Please set Next Depreciation Date,Proszę ustawić Następny Amortyzacja Data
-DocType: Payment Gateway,Payment Gateway,Bramki płatności
 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 +378,Operation Time must be greater than 0 for Operation {0},Czas działania musi być większy niż 0 do operacji {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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/accounts/doctype/account/account.py +170,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ść)
 DocType: Program,Program Abbreviation,Skrót programu
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,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: Appraisal,Start Date,Data startu
@@ -3717,21 +3766,22 @@
 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"
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,np. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +27,Transaction currency must be same as Payment Gateway currency,"Waluta transakcji musi być taka sama, jak waluta wybranej płatności"
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Transaction currency must be same as Payment Gateway currency,"Waluta transakcji musi być taka sama, jak waluta wybranej płatności"
 DocType: Payment Entry,Receive,Odbierać
+apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,cytaty:
 DocType: Maintenance Visit,Fully Completed,Całkowicie ukończono
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% kompletne
 DocType: Employee,Educational Qualification,Kwalifikacje edukacyjne
 DocType: Workstation,Operating Costs,Koszty operacyjne
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Działanie w przypadku nagromadzonych miesięcznego budżetu Przekroczono
 DocType: Purchase Invoice,Submit on creation,Prześlij na tworzeniu
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +432,Currency for {0} must be {1},Waluta dla {0} musi być {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +435,Currency for {0} must be {1},Waluta dla {0} musi być {1}
 DocType: Asset,Disposal Date,Utylizacja Data
 DocType: Employee Leave Approver,Employee Leave Approver,Zgoda na zwolnienie dla pracownika
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,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 +495,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 +79,"Cannot declare as lost, because Quotation has been made.",Nie można zadeklarować jako zagubiony z powodu utworzenia kwotacji
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Główny Menadżer Zakupów
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +429,Production Order {0} must be submitted,Zamówienie Produkcji {0} musi być zgłoszone
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +434,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"""
@@ -3741,25 +3791,27 @@
 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/accounts/report/general_ledger/general_ledger.py +181,Totals,Sumy całkowite
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,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 +113,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 +120,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.
+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 +181,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/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 +793,All records are synced.,Wszystkie zapisy są synchronizowane.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +781,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
 DocType: Cost Center,Cost Center Name,Nazwa Centrum Kosztów
@@ -3778,21 +3830,20 @@
 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
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +49,Cannot set as Lost as Sales Order is made.,Nie można ustawić jako Utracone Zamówienia Sprzedaży
-DocType: Student Applicant,Mother's Name,Imię matki
 DocType: Request for Quotation Item,Supplier Part No,Dostawca Część nr
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +348,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Nie można odliczyć, gdy kategoria jest dla &#39;Wycena&#39; lub &#39;Vaulation i Total&#39;"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Received From,Otrzymane od
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Received From,Otrzymane od
 DocType: Lead,Converted,Przekształcono
 DocType: Item,Has Serial No,Posiada numer seryjny
 DocType: Employee,Date of Issue,Data wydania
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{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 +93,Row {0}: Hours value must be greater than zero.,Wiersz {0}: Godziny wartość musi być większa od zera.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +117,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źć
 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 +172,{0} {1} does not exist,{0} {1} nie istnieje
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +175,{0} {1} does not exist,{0} {1} nie istnieje
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,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 +72,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
@@ -3801,13 +3852,14 @@
 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/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,Usługa nie może być oznaczana na przyszłość
+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ść
 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 +109,Electrical,Elektryczne
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,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 +318,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}
@@ -3815,7 +3867,7 @@
 DocType: Item,Customer Code,Kod Klienta
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +210,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 +292,Debit To account must be a Balance Sheet account,Konto debetowane powinno być kontem bilansowym
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To account must be a Balance Sheet account,Konto debetowane powinno 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Kapitał zasobów
@@ -3827,11 +3879,11 @@
 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 +301,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 +313,Salary Slip of employee {0} already created for time sheet {1},Slip Wynagrodzenie pracownika {0} już stworzony dla arkusza czasu {1}
 DocType: Sales Order Item,Ordered Qty,Ilość Zamówiona
-apps/erpnext/erpnext/stock/doctype/item/item.py +673,Item {0} is disabled,Element {0} jest wyłączony
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,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 +838,BOM does not contain any stock item,BOM nie zawiera żadnego elementu akcji
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +809,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
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Utwórz Paski Wypłaty
@@ -3839,23 +3891,24 @@
 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),Napisz Off Kwota (Spółka Waluta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +485,Row #{0}: Please set reorder quantity,Wiersz # {0}: Proszę ustawić ilość zmienić kolejność
+DocType: Sales Invoice Timesheet,Billing Hours,Godziny billingowe
+apps/erpnext/erpnext/stock/doctype/item/item.py +487,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 +62,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
+DocType: Payment Entry,Allocate Payment Amount,Przeznaczyć Kwota płatności
 DocType: Employee External Work History,Salary,Wynagrodzenia
 DocType: Serial No,Delivery Document Type,Typ dokumentu dostawy
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Zatwierdź Paski Wypłaty dla wskazanych wyżej kryteriów.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} elementów zostało zsynchronizowane
 DocType: Sales Order,Partly Delivered,Częściowo Dostarczono
-DocType: Sales Invoice,Existing Customer,Istniejący Klient
 DocType: Email Digest,Receivables,Należności
+DocType: Lead Source,Lead Source,
 DocType: Customer,Additional information regarding the customer.,Dodatkowe informacje na temat klienta.
 DocType: Quality Inspection Reading,Reading 5,Odczyt 5
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +38,Campaign Name is required,Nazwa kampanii jest wymagana
 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ę
@@ -3863,11 +3916,10 @@
 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,Prześlij Frekwencję
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +129,BOM and Manufacturing Quantity are required,BOM i ilości są wymagane Manufacturing
+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/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Starzenie Zakres 2
 DocType: SG Creation Tool Course,Max Strength,Maksymalna siła
-DocType: Bank Reconciliation Detail,Amount,Wartość
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,
 ,Sales Analytics,Analityka sprzedaży
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +113,Available {0},Dostępne {0}
@@ -3875,14 +3927,14 @@
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Konfiguracja e-mail
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +96,Please enter default currency in Company Master,Proszę dodać domyślną walutę w Głównych Ustawieniach Firmy
 DocType: Stock Entry Detail,Stock Entry Detail,Szczególy zapisu magazynowego
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +100,Daily Reminders,Codzienne Przypomnienia
+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}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +23,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 +71,Customer Service,Obsługa Klienta
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Customer Service,Obsługa Klienta
 DocType: Homepage Featured Product,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ę
@@ -3891,18 +3943,20 @@
 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
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Domyślnie Work In Progress Warehouse
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1570,Total nos of serial no is not equal to quantity.,Wszystkich ino o numer seryjny nie jest równa ilości.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1594,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
-DocType: Sales Order,Printing Details,Szczegóły Drukarnie
+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 +82,Engineer,Inżynier
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,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 +370,Item Code required at Row No {0},Wymagany jest kod elementu w wierszu nr {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +398,Item Code required at Row No {0},Wymagany jest kod elementu w wierszu nr {0}
 DocType: Sales Partner,Partner Type,Typ Partnera
 DocType: Purchase Taxes and Charges,Actual,Właściwy
 DocType: Authorization Rule,Customerwise Discount,Zniżka dla klienta
@@ -3918,16 +3972,18 @@
 DocType: BOM,Raw Material Cost,Koszt surowców
 DocType: Item Reorder,Re-Order Level,Próg ponowienia zamówienia
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Wpisz nazwy przedmiotów i planowaną ilość dla której chcesz zwiększyć produkcję zamówień lub ściągnąć surowe elementy dla analizy.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +55,Part-time,Niepełnoetatowy
+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
 DocType: Employee,Applicable Holiday List,Stosowna Lista Urlopów
 DocType: Employee,Cheque,Czek
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Aktualizacja serii
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +57,Series Updated,Aktualizacja serii
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Typ raportu jest wymagany
 DocType: Item,Serial Number Series,Seria nr seryjnego
 apps/erpnext/erpnext/buying/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 +87,Clearance Date updated,Rozliczenie Data aktualizacji
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Pomyślnie uzgodnione
@@ -3937,11 +3993,11 @@
 DocType: Tax Rule,Validity,Ważność
 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,Usługa
+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 +513,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 +518,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
@@ -3951,7 +4007,7 @@
 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/stock/doctype/stock_entry/stock_entry.py +158,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/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
 DocType: Company,Round Off Account,Konto kwot zaokrągleń
@@ -3960,23 +4016,22 @@
 DocType: Customer Group,Parent Customer Group,Nadrzędna Grupa Klientów
 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 +180,Notice Period,Okres wypowiedzenia
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,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 +4,New Sales Person Name,Nazwa nowej osoby Sprzedaży
 DocType: Packing Slip,Gross Weight UOM,Waga brutto Jednostka miary
-DocType: Email Digest,Receivables / Payables,Należności / Zobowiązania
 DocType: Delivery Note Item,Against Sales Invoice,Na podstawie faktury sprzedaży
 DocType: Bin,Reserved Qty for Production,Reserved Ilość Produkcji
 DocType: Asset,Frequency of Depreciation (Months),Częstotliwość Amortyzacja (miesiące)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +469,Credit Account,Konto kredytowe
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Credit Account,Konto kredytowe
 DocType: Landed Cost Item,Landed Cost Item,Koszt Przedmiotu
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +55,Show zero values,Pokaż wartości zerowe
+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
 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 +647,Please specify Attribute Value for attribute {0},Proszę podać wartość atrybutu dla atrybutu {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Proszę podać wartość atrybutu dla atrybutu {0}
 DocType: Item,Default Warehouse,Domyślny magazyn
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +39,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
@@ -3998,19 +4053,22 @@
 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
-DocType: Sales Invoice,Cold Calling,
 DocType: SMS Parameter,SMS Parameter,Parametr SMS
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,Budżet i MPK
 DocType: Maintenance Schedule Item,Half Yearly,Pół Roku
 DocType: Lead,Blog Subscriber,Subskrybent Bloga
+DocType: Guardian,Alternate Number,Alternatywny numer
 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.
+DocType: Stock Reconciliation Item,Quantity Difference,Ilość Różnica
 apps/erpnext/erpnext/config/hr.py +253,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 +141,Set as Lost,Ustaw jako utracony
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,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 +5,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
 DocType: Supplier,Credit Days Based On,Dni kredytowe w oparciu o
@@ -4022,11 +4080,10 @@
 ,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 +941,Select or add new customer,Wybierz lub dodaj nowego klienta
+apps/erpnext/erpnext/accounts/page/pos/pos.js +930,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 +5,This is based on the attendance of this Employee,Jest to oparte o udziale tego pracownika
-DocType: Sales Invoice,Frequency,Częstotliwość
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +463,Debit Account,Konto debetowe
+apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +5,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 +453,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)
@@ -4035,27 +4092,27 @@
 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 +210,Supplier Quotation {0} created,Dostawca notowań {0} tworzone
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +208,Supplier Quotation {0} created,Dostawca notowań {0} tworzone
 apps/erpnext/erpnext/accounts/report/financial_statements.py +90,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 +173,Employee Benefits,Świadczenia pracownicze
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,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 +228,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 +232,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 +499,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 +500,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 +1007,Price List not found or disabled,Cennik nie został znaleziony lub wyłączone
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1008,Price List not found or disabled,Cennik nie został znaleziony lub wyłączone
 DocType: Expense Claim,Approved,Zatwierdzono
 DocType: Pricing Rule,Price,Cena
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +244,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 +256,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
@@ -4066,12 +4123,12 @@
 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 +259,Please select Employee Record first.,Proszę wybrać pierwszego pracownika
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +266,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 +190,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 +235,Please enter Expense Account,Wprowadź konto Wydatków
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,Please enter Expense Account,Wprowadź konto Wydatków
 DocType: Account,Stock,Asortyment
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,"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 +976,"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
@@ -4086,9 +4143,10 @@
 DocType: Asset Movement,Transaction Date,Data transakcji
 DocType: Production Plan Item,Planned Qty,Planowana ilość
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,Razem podatkowa
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,For Quantity (Manufactured Qty) is mandatory,Do Ilość (Wyprodukowano kopie) są obowiązkowe
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,For Quantity (Manufactured Qty) is mandatory,Do Ilość (Wyprodukowano kopie) są obowiązkowe
 DocType: Stock Entry,Default Target Warehouse,Domyślny magazyn docelowy
 DocType: Purchase Invoice,Net Total (Company Currency),Łączna wartość netto (waluta firmy)
+apps/erpnext/erpnext/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 +78,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: Production Order,Actual Start Date,Rzeczywista data rozpoczęcia
@@ -4103,9 +4161,11 @@
 DocType: Warranty Claim,If different than customer address,Jeśli jest inny niż adres klienta
 DocType: BOM Operation,BOM Operation,
 DocType: Purchase Taxes and Charges,On Previous Row Amount,
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +226,Transfer Asset,Przeniesienie aktywów
+DocType: Student,Home Address,Adres domowy
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +227,Transfer Asset,Przeniesienie aktywów
 DocType: POS Profile,POS Profile,POS profilu
 apps/erpnext/erpnext/config/schools.py +33,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 +129,"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
@@ -4115,10 +4175,10 @@
 DocType: Assessment,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 +765,Material to Supplier,Materiał do Dostawcy
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +189,Excise Invoice,Akcyza Faktura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,Material to Supplier,Materiał do Dostawcy
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,Akcyza Faktura
 DocType: Expense Claim,Employees Email Id,Email ID pracownika
-DocType: Employee Attendance Tool,Marked Attendance,Oznaczone Obecność
+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
 DocType: Program,Program Name,Nazwa programu
@@ -4126,7 +4186,7 @@
 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/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 +136,Credit Card,
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,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
 DocType: Purchase Invoice,Next Date,Następna Data
@@ -4134,6 +4194,7 @@
 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: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children",
+DocType: Academic Term,Term End Date,Term Data zakończenia
 DocType: Hub Settings,Seller Name,Sprzedawca Nazwa
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Podatki i opłaty potrącone (Firmowe)
 DocType: Item Group,General Settings,Ustawienia ogólne
@@ -4145,7 +4206,7 @@
 DocType: Customer,Commission Rate,Wartość prowizji
 apps/erpnext/erpnext/stock/doctype/item/item.js +261,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 +115,"Payment Type must be one of Receive, Pay and Internal Transfer",Typ płatności musi być jednym z Odbierz Pay and przelew wewnętrzny
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +118,"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/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Koszyk jest pusty
 DocType: Production Order,Actual Operating Cost,Rzeczywisty koszt operacyjny
@@ -4160,10 +4221,10 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,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 +92,Designer,Projektant
+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
 DocType: Serial No,Delivery Details,Szczegóły dostawy
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +469,Cost Center is required in row {0} in Taxes table for type {1},
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +472,Cost Center is required in row {0} in Taxes table for type {1},
 DocType: Program,Program Code,Kod programu
 ,Item-wise Purchase Register,
 DocType: Batch,Expiry Date,Data ważności
@@ -4173,12 +4234,12 @@
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Dyrektor projektu
 apps/erpnext/erpnext/controllers/status_updater.py +174,"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 +417, (Half Day),(Pół dnia)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425, (Half Day),(Pół dnia)
 DocType: Supplier,Credit Days,
 DocType: Leave Type,Is Carry Forward,
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +740,Get Items from BOM,Weź produkty z zestawienia materiałowego
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +711,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 +549,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/controllers/accounts_controller.py +552,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
diff --git a/erpnext/translations/ps.csv b/erpnext/translations/ps.csv
index 6cb2599..7552279 100644
--- a/erpnext/translations/ps.csv
+++ b/erpnext/translations/ps.csv
@@ -18,11 +18,10 @@
 DocType: Sales Partner,Dealer,مشتری
 DocType: Employee,Rented,د کشت
 DocType: Purchase Order,PO-,تبديليږي
-apps/erpnext/erpnext/accounts/report/financial_statements.py +19,Start Year {0} not found.,بیا کال {0} ونه موندل شو.
 DocType: POS Profile,Applicable for User,د کارن د تطبيق وړ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +191,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",ودرول تولید نظم نه لغوه شي کولای، نو دا د لومړي Unstop لغوه
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +197,Do you really want to scrap this asset?,آيا تاسو په رښتيا غواړئ چې دا شتمني راټولوي؟
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +17,Select Default Supplier,انتخاب Default عرضه
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +192,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",ودرول تولید نظم نه لغوه شي کولای، نو دا د لومړي Unstop لغوه
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +198,Do you really want to scrap this asset?,آيا تاسو په رښتيا غواړئ چې دا شتمني راټولوي؟
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,انتخاب Default عرضه
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},د اسعارو د بیې په لېست کې د اړتیا {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* به په راکړې ورکړې محاسبه شي.
 DocType: Address,County,County
@@ -42,46 +41,45 @@
 DocType: Sales Invoice,Customer Name,پیریدونکي نوم
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +126,Bank account cannot be named as {0},بانکي حساب په توګه نه ونومول شي کولای {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,سرونه (یا ډلو) په وړاندې چې د محاسبې توکي دي او انډول وساتل شي.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +180,Outstanding for {0} cannot be less than zero ({1}),بيالنس د {0} کولای شي او نه د صفر څخه کم ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,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 +148,Series Updated Successfully,لړۍ Updated په بریالیتوب
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +149,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,ټول عرضه سره اړيکي
-DocType: Quality Inspection Reading,Parameter,د پاراميټر
 apps/erpnext/erpnext/projects/doctype/project/project.py +54,Expected End Date can not be less than Expected Start Date,د تمی د پای نیټه نه شي کولای په پرتله د تمی د پیل نیټه کمه وي
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,د کتارونو تر # {0}: کچه باید په توګه ورته وي {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +239,New Leave Application,نوي اجازه کاریال
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,New Leave Application,نوي اجازه کاریال
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +20,Attendance Record {0} exists against Student {1} for Course Schedule {2},د حاضرۍ دثبت {0} لپاره د کورس د مهال ويش د زده کونکو د {1} په وړاندې موجود دی {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Bank Draft,بانک مسوده
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,بانک مسوده
 DocType: Mode of Payment Account,Mode of Payment Account,د تادیاتو حساب اکر
 apps/erpnext/erpnext/stock/doctype/item/item.js +52,Show Variants,انکړپټه ښودل تانبه
 DocType: Academic Term,Academic Term,علمي مهاله
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +13,Material,د مادي
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Quantity,کمیت
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +511,Accounts table cannot be blank.,جوړوي جدول نه خالي وي.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +616,Quantity,کمیت
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +512,Accounts table cannot be blank.,جوړوي جدول نه خالي وي.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,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/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 +142,User {0} is already assigned to Employee {1},کارن {0} لا د مخه د کارکونکو ګمارل {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,روغتیایی پاملرنه
-DocType: Purchase Invoice,Monthly,میاشتنی
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),د ځنډ په پیسو (ورځې)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +771,Invoice,صورتحساب
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +750,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 +198,Row {0}: {1} {2} does not match with {3},د کتارونو تر {0}: {1} {2} سره سمون نه خوري {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,د کتارونو تر # {0}:
+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 +127,Please select Price List,مهرباني غوره بیې لېست
@@ -112,8 +110,8 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,همدې شرکت څخه یو ځل بیا ننوتل
 DocType: Employee,Married,واده
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},لپاره نه اجازه {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +589,Get items from,له توکي ترلاسه کړئ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +382,Stock cannot be updated against Delivery Note {0},دحمل د سپارنې يادونه په وړاندې د تازه نه شي {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,له توکي ترلاسه کړئ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,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,دغذا
@@ -122,7 +120,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 +156,Salary Structure Missing,معاش جوړښت ورک
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Salary Structure Missing,معاش جوړښت ورک
 DocType: Lead,Person Name,کس نوم
 DocType: Sales Invoice Item,Sales Invoice Item,خرڅلاو صورتحساب د قالب
 DocType: Account,Credit,د اعتبار
@@ -130,10 +128,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 +156,Credit limit has been crossed for customer {0} {1}/{2},پورونو د حد لپاره د مشتريانو د اوښتي دي {0} د {1} / {2}
-apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",&quot;آیا ثابته شتمني&quot; کولای وناکتل نه وي، ځکه چې د توکي په وړاندې د شتمنیو د ثبت شتون لري
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +189,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; کولای وناکتل نه وي، ځکه چې د توکي په وړاندې د شتمنیو د ثبت شتون لري
 DocType: Tax Rule,Tax Type,د مالياتو ډول
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +144,You are not authorized to add or update entries before {0},تاسو اختيار نه لري چې مخکې ثبت کرښې زیاتولی او یا تازه {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},تاسو اختيار نه لري چې مخکې ثبت کرښې زیاتولی او یا تازه {0}
 DocType: Item,Item Image (if not slideshow),د قالب د انځور (که سلاید نه)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,د پيرودونکو سره په همدې نوم شتون لري
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(قيامت Rate / 60) * د عملیاتو د وخت
@@ -143,18 +142,17 @@
 DocType: Student Log,Student Log,د زده کونکو د ننوتنه
 DocType: Quality Inspection,Get Specification Details,ترلاسه کړئ د ځانګړتیاوو په بشپړه توګه کتل
 DocType: Lead,Interested,علاقمند
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +165,Opening,د پرانستلو
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,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/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,پيرودونکو&gt; پيرودونکو ګروپ&gt; خاوره
 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.,د موجوده د راکړې ورکړې حساب ته ډلې بدل نه شي.
 DocType: Lead,Product Enquiry,د محصول د ږنو
 DocType: Academic Term,Schools,د ښوونځيو
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,مهرباني وکړئ لومړی شرکت ته ننوځي
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Company first,مهرباني غوره شرکت لومړۍ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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,ټولیز لګښت،
@@ -164,7 +162,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,د حساب اعلامیه
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,د درملو د
 DocType: Purchase Invoice Item,Is Fixed Asset,ده ثابته شتمني
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Available qty is {0}, you need {1}",موجود qty دی {0}، تاسو بايد د {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +225,"Available qty is {0}, you need {1}",موجود qty دی {0}، تاسو بايد د {1}
 DocType: Expense Claim Detail,Claim Amount,ادعا مقدار
 DocType: Employee,Mr,ښاغلی
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,عرضه ډول / عرضه
@@ -173,25 +171,26 @@
 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: Assessment Result,Grade,ټولګي
 DocType: Sales Invoice Item,Delivered By Supplier,تحویلوونکی By عرضه
 DocType: SMS Center,All Contact,ټول سره اړيکي
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Annual Salary,کلنی معاش
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,دحمل داخراجاتو
-apps/erpnext/erpnext/accounts/report/financial_statements.py +22,End Year {0} not found.,د پای کال {0} ونه موندل شو.
 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}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,رسولو لپاره خام توکي د رانيول
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +130,At least one mode of payment is required for POS invoice.,د پیسو تر لږه یوه اکر لپاره POS صورتحساب ته اړتيا لري.
 DocType: Products Settings,Show Products as a List,انکړپټه ښودل محصوالت په توګه بشپړفهرست
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records",دانلود د کينډۍ، د مناسبو معلوماتو د ډکولو او د دوتنه کې ضمیمه کړي. د ټاکل شوې مودې په ټولو نیټې او کارمند ترکیب به په کېنډۍ کې راغلي، د موجوده حاضري سوابق
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +451,Item {0} is not active or end of life has been reached,{0} د قالب فعاله نه وي او يا د ژوند د پای ته رسیدلی دی شوی
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +456,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/controllers/accounts_controller.py +614,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",په قطار {0} په قالب کچه د ماليې شامل دي، چې په قطارونو ماليه {1} هم باید شامل شي
+apps/erpnext/erpnext/controllers/accounts_controller.py +617,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",په قطار {0} په قالب کچه د ماليې شامل دي، چې په قطارونو ماليه {1} هم باید شامل شي
 apps/erpnext/erpnext/config/hr.py +166,Settings for HR Module,د بشري حقونو د څانګې ماډل امستنې
 DocType: SMS Center,SMS Center,SMS مرکز
 DocType: Sales Invoice,Change Amount,د بدلون لپاره د مقدار
@@ -203,13 +202,13 @@
 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 +147,Execution,د اجرا
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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,توکي او د بیې ټاکل
 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}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,Cost Center {0} does not belong to Company {1},لګښت مرکز {0} کوي چې د دې شرکت سره تړاو نه لري {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +100,Cost Center {0} does not belong to Company {1},لګښت مرکز {0} کوي چې د دې شرکت سره تړاو نه لري {1}
 DocType: Customer,Individual,انفرادي
 DocType: Interest,Academics User,پوهانو کارن
 DocType: Cheque Print Template,Amount In Figure,اندازه په شکل کې
@@ -225,30 +224,32 @@
 DocType: Production Planning Tool,Sales Orders,خرڅلاو امر
 DocType: Purchase Taxes and Charges,Valuation,سنجي
 ,Purchase Order Trends,پیري نظم رجحانات
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,The request for quotation can be accessed by clicking on the following link,د مادیاتو په غوښتنه په کېکاږلو سره په لاندې لینک رسی شي
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,د کال لپاره د پاڼي تخصيص.
 DocType: SG Creation Tool Course,SG Creation Tool Course,SG خلقت اسباب کورس
 DocType: Student Group Creation Tool,Leave blank if you wish to fetch all courses for selected academic term,که تاسو غواړئ چې د غوره علمي اصطلاح د ټولو کورسونه راوړي خالي پريږدئ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,Insufficient Stock,ناکافي دحمل
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227,Insufficient Stock,ناکافي دحمل
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,ناتوانې ظرفیت د پلان او د وخت د معلومولو
+DocType: Email Digest,New Sales Orders,نوي خرڅلاو امر
 DocType: Bank Reconciliation,Bank Account,د بانک ګڼوڼ
 DocType: Leave Type,Allow Negative Balance,د منفی توازن اجازه
 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/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} does not belong to Company {1},ګڼون {0} کوي چې د دې شرکت سره تړاو نه لري {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +86,Account {0} does not belong to Company {1},ګڼون {0} کوي چې د دې شرکت سره تړاو نه لري {1}
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},پرمختللی اندازه نه شي کولای څخه ډيره وي {0} د {1}
 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 +174,For Warehouse is required before Submit,د ګدام مخکې اړتیا سپارل
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,For Warehouse is required before Submit,د ګدام مخکې اړتیا سپارل
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,د ترلاسه
 DocType: Sales Partner,Reseller,د پلورنې
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,مهرباني وکړئ د شرکت ته ننوځي
 DocType: Delivery Note Item,Against Sales Invoice Item,په وړاندې د خرڅلاو صورتحساب د قالب
 ,Production Orders in Progress,په پرمختګ تولید امر
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Cash from Financing,له مالي خالص د نغدو
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1436,"LocalStorage is full , did not save",LocalStorage ډک شي، نه د ژغورلو نه
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1460,"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}
@@ -261,18 +262,19 @@
 apps/erpnext/erpnext/templates/generators/item.html +78,No description given,نه توضيحات ورکړل
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,لپاره د اخیستلو غوښتنه وکړي.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +5,This is based on the Time Sheets created against this project,دا کار د وخت د سکيچ جوړ د دې پروژې پر وړاندې پر بنسټ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Only the selected Leave Approver can submit this Leave Application,یوازې د ټاکل اجازه Approver دا اجازه او د غوښتنليک وسپاري
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +213,Only the selected Leave Approver can submit this Leave Application,یوازې د ټاکل اجازه Approver دا اجازه او د غوښتنليک وسپاري
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,کرارولو نېټه بايد په پرتله په یوځای کېدو نېټه ډيره وي
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Leaves per Year,روان شو هر کال
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,روان شو هر کال
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,د کتارونو تر {0}: مهرباني وکړئ وګورئ &#39;آیا پرمختللی&#39; حساب په وړاندې د {1} که دا د يو داسې پرمختللي ننوتلو ده.
 apps/erpnext/erpnext/stock/utils.py +188,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,ني
 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 +435,Leave Blocked,د وتو بنديز لګېدلی
-apps/erpnext/erpnext/stock/doctype/item/item.py +669,Item {0} has reached its end of life on {1},{0} د قالب په خپلو د ژوند پای ته ورسېدئ {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +443,Leave Blocked,د وتو بنديز لګېدلی
+apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item {0} has reached its end of life on {1},{0} د قالب په خپلو د ژوند پای ته ورسېدئ {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +95,Bank Entries,بانک توکي
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +83,Annual,کلنی
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +86,Annual,کلنی
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,دحمل پخلاينې د قالب
 DocType: Stock Entry,Sales Invoice No,خرڅلاو صورتحساب نه
 DocType: Material Request Item,Min Order Qty,Min نظم Qty
@@ -280,20 +282,22 @@
 DocType: Lead,Do Not Contact,نه د اړيکې
 apps/erpnext/erpnext/public/js/setup_wizard.js +360,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 +91,Software Developer,د پوستکالي د پراختیا
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,د پوستکالي د پراختیا
 DocType: Item,Minimum Order Qty,لږ تر لږه نظم Qty
 DocType: Pricing Rule,Supplier Type,عرضه ډول
 DocType: Scheduling Tool,Course Start Date,د کورس د پیل نیټه
 DocType: Item,Publish in Hub,په مرکز د خپرېدو
+DocType: Student Admission,Student Admission,د زده کونکو د شاملیدو
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is cancelled,{0} د قالب دی لغوه
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Material Request,د موادو غوښتنه
+apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} is cancelled,{0} د قالب دی لغوه
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +823,Material Request,د موادو غوښتنه
 DocType: Bank Reconciliation,Update Clearance Date,تازه چاڼېزو نېټه
 apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +28,Abbreviation already used for another salary component,Abbreviation لا د بل معاش جز کارول
 DocType: Item,Purchase Details,رانيول نورولوله
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +328,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},د قالب {0} په خام مواد &#39;جدول په اخستلو امر ونه موندل {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +333,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},د قالب {0} په خام مواد &#39;جدول په اخستلو امر ونه موندل {1}
 DocType: Employee,Relation,د خپلوي
 DocType: Shipping Rule,Worldwide Shipping,د نړۍ په نقل
+DocType: Student Guardian,Mother,مور
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,له پېرودونکي تاييد امر.
 DocType: Purchase Receipt Item,Rejected Quantity,رد مقدار
 DocType: SMS Settings,SMS Sender Name,SMS استوونکی نوم
@@ -309,20 +313,21 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +130,Please select Charge Type first,مهرباني وکړئ لومړی د ټاکلو مسؤوليت په ډول
 DocType: Student Group Student,Student Group Student,د زده کونکو د ګروپ د زده کوونکو
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,تازه
+DocType: Email Digest,New Quotations,نوي Quotations
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,په لست کې د اجازه لومړی Approver به د تلواله اجازه Approver په توګه جوړ شي
 DocType: Tax Rule,Shipping County,انتقال County
 apps/erpnext/erpnext/config/desktop.py +158,Learn,وکړئ
 DocType: Asset,Next Depreciation Date,بل د استهالک نېټه
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,فعالیت لګښت په سلو کې د کارګر
 DocType: Accounts Settings,Settings for Accounts,لپاره حسابونه امستنې
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +626,Supplier Invoice No exists in Purchase Invoice {0},په رانيول صورتحساب عرضه صورتحساب شتون نه لري {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +629,Supplier Invoice No exists in Purchase Invoice {0},په رانيول صورتحساب عرضه صورتحساب شتون نه لري {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Manage خرڅلاو شخص د ونو.
 DocType: Job Applicant,Cover Letter,د خط کور
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,بيالنس Cheques او سپما او پاکول
 DocType: Item,Synced With Hub,دفارسی د مرکزي
 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 +348,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 +86,Circular Reference Error,متحدالمال ماخذ کې تېروتنه
@@ -334,15 +339,16 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,د اتومات د موادو غوښتنه رامنځته کېدو له امله دبرېښنا ليک خبر
 DocType: Journal Entry,Multi Currency,څو د اسعارو
 DocType: Payment Reconciliation Invoice,Invoice Type,صورتحساب ډول
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +806,Delivery Note,د سپارنې پرمهال یادونه
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +800,Delivery Note,د سپارنې پرمهال یادونه
 apps/erpnext/erpnext/config/learn.py +87,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 +233,Payment Entry has been modified after you pulled it. Please pull it again.,د پیسو د داخلولو بدل شوی دی وروسته کش تاسو دا. دا بیا لطفا وباسي.
+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/setup/doctype/email_digest/email_digest.py +104,Summary for this week and pending activities,لنډيز دې اوونۍ او په تمه د فعالیتونو لپاره
+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، صورتحساب به د ځانګړې نېټې په اتوماتيک ډول ولیږدول شي
 DocType: Employee,Company Email,شرکت دبرېښنا ليک
@@ -354,27 +360,28 @@
 apps/erpnext/erpnext/config/hr.py +186,"Employee designation (e.g. CEO, Director etc.).",د کارګر ونومول شي (لکه د اجرايي، رييس او داسې نور).
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,لطفا ډګر ارزښت &#39;د مياشتې په ورځ تکرار&#39;
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,په ميزان کي پيرودونکو د اسعارو له دی چې د مشتريانو د اډې اسعارو بدل
-apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},د کتارونو تر # {0}: رانيول صورتحساب د شته شتمنیو په وړاندې نه شي کولای شي د {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +554,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 +54,{0} already allocated for Employee {1} for period {2} to {3},{0} لپاره د کارګر لا ځانګړې {1} لپاره موده {2} د {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +812,Select Item,انتخاب د قالب
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +791,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/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,پیري صورتحساب {0} لا وسپارل
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},د کتارونو تر # {0}: دسته نه باید ورته وي {1} {2}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +143,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.,دسته (ډېر) د یو قالب.
 DocType: C-Form Invoice Detail,Invoice Date,صورتحساب نېټه
 DocType: GL Entry,Debit Amount,ډیبیټ مقدار
 apps/erpnext/erpnext/accounts/party.py +242,There can only be 1 Account per Company in {0} {1},هلته يوازې کولای شي په هر شرکت 1 حساب وي {0} د {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +4,Your email address,ستا بریښنالیک
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +342,Please see attachment,مهرباني مل وګورئ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,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 +19,Setup Already Complete!!,Setup د مخه بشپړ !!
 ,Finished Goods,پای ته سامانونه
 DocType: Delivery Note,Instructions,لارښوونه:
 DocType: Quality Inspection,Inspected By,تفتیش By
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,عرضه&gt; عرضه ډول
 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,سامان ورزیات کړئ
@@ -388,29 +395,29 @@
 DocType: Currency Exchange,Currency Exchange,د پیسو د بدلولو
 DocType: Purchase Invoice Item,Item Name,د قالب نوم
 DocType: Authorization Rule,Approving User  (above authorized value),تصویب کارن (اجازه ارزښت پورته)
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,پورونو د بیلانس
+DocType: Email Digest,Credit Balance,پورونو د بیلانس
 DocType: Employee,Widowed,کونډې
 DocType: Request for Quotation,Request for Quotation,لپاره د داوطلبۍ غوښتنه
 DocType: Salary Slip Timesheet,Working Hours,کار ساعتونه
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,د پیل / اوسني تسلسل کې د شته لړ شمېر کې بدلون راولي.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.",که څو د بیو د اصولو دوام پراخیدل، د کاروونکو څخه پوښتنه کيږي چي د لومړیتوب ټاکل لاسي د شخړې حل کړي.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +736,Purchase Return,رانيول Return
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +715,Purchase Return,رانيول Return
 ,Purchase Register,رانيول د نوم ثبتول
 DocType: Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,د تطبيق په تور
 DocType: Workstation,Consumable Cost,د مصرف لګښت
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +202,{0} ({1}) must have role 'Leave Approver',{0} ({1}) باید رول لري &#39;اجازه Approver&#39;
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,{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 +143,Reason for losing,د له لاسه ورکولو لامل
-apps/erpnext/erpnext/accounts/utils.py +239,Allocated amount can not greater than unadjusted amount,ځانګړې اندازه کولای بوختوکارګرانو مقدار څخه زياته نه
+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,ځانګړې اندازه کولای بوختوکارګرانو مقدار څخه زياته نه
 DocType: Announcement,Receiver,د اخيستونکي
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation په لاندې نېټو بند دی هر رخصتي بشپړفهرست په توګه: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,فرصتونه
 DocType: Employee,Single,مجرد
 DocType: Account,Cost of Goods Sold,د اجناسو د لګښت پلورل
 DocType: Purchase Invoice,Yearly,کلنی
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +225,Please enter Cost Center,لطفا لګښت مرکز ته ننوځي
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,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 نوم
@@ -423,26 +430,26 @@
 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,چيک عرضه صورتحساب شمېر لوړوالی
 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 +102,Non Profit,غیر ګټه
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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: Stock Reconciliation Item,Do not include symbols (ex. $),مه سمبولونه شامل نه دي (پخواني $.)
 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 +638,Attribute {0} selected multiple times in Attributes Table,ځانتیا د {0} په صفات جدول څو ځلې غوره
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,ځانتیا د {0} په صفات جدول څو ځلې غوره
 DocType: HR Settings,Employee record is created using selected field. ,د کارګر ریکارډ انتخاب ډګر په کارولو سره جوړ.
 DocType: Sales Order,Not Applicable,کاروړی نه دی
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,د رخصتۍ د بادار.
 DocType: Request for Quotation Item,Required Date,د اړتیا نېټه
 DocType: Delivery Note,Billing Address,دبیل پته
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +862,Please enter Item Code.,لطفا د قالب کود داخل کړي.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +847,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 / چاپ مقدار شامل
@@ -456,12 +463,12 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,امنيت او د سپما
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Total پاڼي تخصيص الزامی دی
 DocType: Job Opening,Description of a Job Opening,د دنده تفصيل پرانیستل
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Pending activities for today,د نن په تمه فعالیتونو
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,د نن په تمه فعالیتونو
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,د حاضرۍ ریکارډ.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,د timesheet پر بنسټ د معاشونو د معاش برخه.
 DocType: Sales Order Item,Used for Production Plan,د تولید پلان لپاره کارول کيږي
 DocType: Manufacturing Settings,Time Between Operations (in mins),د وخت عملیاتو تر منځ (په دقیقه)
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +92,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} لپاره د لګښت د مرکز په وړاندې حساب {1} د بودجې د {2} دی {3}. دا به د زیات {4}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +95,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} لپاره د لګښت د مرکز په وړاندې حساب {1} د بودجې د {2} دی {3}. دا به د زیات {4}
 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 د همدغه توکي نه دي
@@ -469,16 +476,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +238,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 +86,Administrative Officer,اداري مامور
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,اداري مامور
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +23,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 +319,Please select Company,مهرباني وکړئ د شرکت وټاکئ
-DocType: Stock Entry,Difference Account,توپير اکانټ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +309,Please select Company,مهرباني وکړئ د شرکت وټاکئ
+DocType: Stock Entry Detail,Difference Account,توپير اکانټ
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,نږدې دنده په توګه خپل دنده پورې تړلې {0} تړلي نه ده نه شي کولای.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Please enter Warehouse for which Material Request will be raised,لطفا د ګدام د کوم لپاره چې د موادو غوښتنه به راپورته شي ننوځي
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +399,Please enter Warehouse for which Material Request will be raised,لطفا د ګدام د کوم لپاره چې د موادو غوښتنه به راپورته شي ننوځي
 DocType: Production Order,Additional Operating Cost,اضافي عملياتي لګښت
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,د سينګار
-apps/erpnext/erpnext/stock/doctype/item/item.py +530,"To merge, following properties must be same for both items",ته لېږدونه، لاندې شتمنۍ باید د دواړو توکي ورته وي
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,"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 +28,Buy,کشاورزی
@@ -486,7 +493,7 @@
 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 +1563,Serial no item cannot be a fraction,سریال نه توکی نه شي کولای یوه برخه وي
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1587,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,د اداره کولو په ټیکه
@@ -495,13 +502,14 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Account {0} does not belong to company: {1},ګڼون {0} نه پورې شرکت نه لري چې: {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation already used for another company,Abbreviation لا د بل شرکت لپاره کارول
 DocType: Selling Settings,Default Customer Group,Default پيرودونکو ګروپ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Supplier is required against Payable account {0},عرضه ده د راتلوونکې ګڼون په وړاندې د اړتيا {0}
 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 وي
 DocType: Production Planning Tool,Material Requirement,مادي غوښتنې
 DocType: Company,Delete Company Transactions,شرکت معاملې ړنګول
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +313,Reference No and Reference Date is mandatory for Bank transaction,ماخذ نه او ماخذ نېټه د بانک د راکړې ورکړې الزامی دی
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +316,Reference No and Reference Date is mandatory for Bank transaction,ماخذ نه او ماخذ نېټه د بانک د راکړې ورکړې الزامی دی
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Add / سمول مالیات او په تور
 DocType: Purchase Invoice,Supplier Invoice No,عرضه صورتحساب نه
 DocType: Territory,For reference,د ماخذ
@@ -512,7 +520,6 @@
 DocType: Installation Note Item,Installation Note Item,نصب او يادونه د قالب
 DocType: Production Plan Item,Pending Qty,تصویبه Qty
 DocType: Budget,Ignore,له پامه
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,د قالب کوډ&gt; د قالب ګروپ&gt; دتوليد
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,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
@@ -523,11 +530,11 @@
 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/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,هیڅ ډول ثبتونې په صورتحساب جدول کې وموندل
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +28,Please select Company and Party Type first,لطفا د شرکت او د ګوند ډول لومړی انتخاب
+apps/erpnext/erpnext/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/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 +707,Make Sales Order,د کمکیانو لپاره د خرڅلاو د ترتیب پر اساس
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +701,Make Sales Order,د کمکیانو لپاره د خرڅلاو د ترتیب پر اساس
 DocType: Project Task,Project Task,د پروژې د کاري
 ,Lead Id,سرب د Id
 DocType: C-Form Invoice Detail,Grand Total,ستره مجموعه
@@ -543,7 +550,8 @@
 DocType: Job Applicant,Resume Attachment,سوانح ضميمه
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,تکرار پېرودونکي
 DocType: Leave Control Panel,Allocate,تخصيص
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +734,Sales Return,خرڅلاو Return
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +728,Sales Return,خرڅلاو Return
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +91,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,نوټ: ټولې اختصاص پاڼي {0} بايد نه مخکې تصویب پاڼو څخه کم وي {1} د مودې لپاره
 DocType: Announcement,Posted By,خپرندوی
 DocType: Item,Delivered by Supplier (Drop Ship),تحویلوونکی له خوا عرضه (لاسرسئ کښتۍ)
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,د اخستونکو پوتانشيل په ډیټابیس.
@@ -552,14 +560,13 @@
 DocType: Quotation,Quotation To,د داوطلبۍ
 DocType: Lead,Middle Income,د منځني عايداتو
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +212,Opening (Cr),د پرانستلو په (آر)
-apps/erpnext/erpnext/stock/doctype/item/item.py +795,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,د قالب اندازه Default اداره {0} نه شي په مستقيمه شي ځکه بدل مو چې ځينې راکړې ورکړې (ص) سره د یو بل UOM لا کړې. تاسو به اړ یو نوی د قالب د بل Default UOM ګټه رامنځ ته کړي.
-apps/erpnext/erpnext/accounts/utils.py +237,Allocated amount can not be negative,ځانګړې اندازه نه کېدای شي منفي وي
+apps/erpnext/erpnext/stock/doctype/item/item.py +797,Default Unit of Measure for Item {0} cannot be changed directly because 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,ځانګړې اندازه نه کېدای شي منفي وي
 DocType: Purchase Order Item,Billed Amt,د بلونو د نننیو
 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 +91,Reference No & Reference Date is required for {0},ماخذ نه &amp; ماخذ نېټه لپاره اړتیا ده {0}
-DocType: Sales Invoice,Customer's Vendor,پيرودونکو د اوخرڅلاوو
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Proposal Writing,د پروپوزل ليکلو
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,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",که لپاره شیان دي چې فرعي قرارداد به په مادي غوښتنې شامل شي چک، خام مواد
@@ -568,13 +575,14 @@
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,د وخت د معلومولو
 DocType: Fiscal Year Company,Fiscal Year Company,مالي کال د شرکت
 DocType: Packing Slip Item,DN Detail,DN تفصیلي
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +257,Already supplier quotation has created,لا د عرضه کوونکي د مادیاتو په جوړ
 DocType: Timesheet,Billed,د بلونو د
 DocType: Batch,Batch Description,دسته Description
+apps/erpnext/erpnext/accounts/utils.py +685,"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 +733,View Offline Records,محتویات نالیکی سوابق
+apps/erpnext/erpnext/accounts/page/pos/pos.js +715,View Offline Records,محتویات نالیکی سوابق
+DocType: Student,Sibling Details,ورونړه نورولوله
 DocType: Employee,Reason for Resignation,د استعفا دليل
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,د نتائجو د کينډۍ.
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,صورتحساب / ژورنال انفاذ په بشپړه توګه کتل
@@ -588,7 +596,7 @@
 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,په موجودي خالص د بدلون
 DocType: Employee,Passport Number,د پاسپورټ ګڼه
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Manager,مدير
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,مدير
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,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; کولای شي په څېر نه وي
@@ -597,10 +605,11 @@
 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 +299,Timesheet created:,Timesheet جوړ:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +715,Please set default Cash or Bank account in Mode of Payment {0},لطفا د تادیاتو په اکر کې default د نغدي او يا بانک حساب جوړ {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +300,Timesheet created:,Timesheet جوړ:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +772,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,کې شامل کړي
 DocType: Selling Settings,Customer Naming By,پيرودونکو نوم By
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,لطفا د تشکیلاتو د کارګر د بشري منابعو د سیستم نوم&gt; د بشري حقونو څانګې امستنې
 DocType: Depreciation Schedule,Depreciation Amount,د استهالک مقدار
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,د ګروپ ته واړوئ
 DocType: Activity Cost,Activity Type,فعالیت ډول
@@ -625,6 +634,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,فنلند
 DocType: Pricing Rule,Sales Manager,خرڅلاو مدير
 DocType: Salary Structure Employee,Base,اډه
+DocType: Timesheet,Total Billed Hours,Total محاسبې ته ساعتونه
 DocType: Journal Entry,Write Off Amount,مقدار ولیکئ پړاو
 DocType: Journal Entry,Bill No,بیل نه
 DocType: Company,Gain/Loss Account on Asset Disposal,د شتمنيو د برطرف ګټې / زیان اکانټ
@@ -639,11 +649,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +9,Pre Sales,مخکې خرڅلاو
 DocType: Purchase Receipt,Other Details,نور جزئيات
 DocType: Account,Accounts,حسابونه
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Marketing,بازار موندنه
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +227,Payment Entry is already created,د پیسو د داخلولو د مخکې نه جوړ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,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 +538,Row #{0}: Asset {1} does not linked to Item {2},د کتارونو تر # {0}: د شتمنیو د {1} نه د قالب تړاو نه {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +21,Preview Salary Slip,د مخکتنې معاش ټوټه
+apps/erpnext/erpnext/controllers/accounts_controller.py +541,Row #{0}: Asset {1} does not linked to Item {2},د کتارونو تر # {0}: د شتمنیو د {1} نه د قالب تړاو نه {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +38,Preview Salary Slip,د مخکتنې معاش ټوټه
 DocType: Company,Deafult Cost Center,Deafult لګښت مرکز
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +48,Account {0} has been entered multiple times,ګڼون {0} په څو ځله داخل شوي دي
 DocType: Account,Expenses Included In Valuation,لګښتونه شامل په ارزښت
@@ -652,7 +662,7 @@
 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 +617,Item has variants.,د قالب د بېرغونو لري.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,د قالب د بېرغونو لري.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,د قالب {0} ونه موندل شو
 DocType: Bin,Stock Value,دحمل ارزښت
 apps/erpnext/erpnext/accounts/doctype/account/account.py +25,Company {0} does not exist,شرکت {0} نه شته
@@ -672,7 +682,7 @@
 DocType: Purchase Order,Supply Raw Materials,رسولو لپاره خام مواد
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,د نېټې په اړه چې د راتلونکو صورتحساب به تولید شي. دا کار په وړاندې تولید دی.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,اوسني شتمني
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,{0} is not a stock Item,{0} يو سټاک د قالب نه دی
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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 +169,Lead must be set if Opportunity is made from Lead,اداره کوونکۍ باید جوړ شي که فرصت څخه په غاړه کړې
@@ -739,26 +749,25 @@
 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 +709,No Permission,نه د اجازې د
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +710,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}
 apps/erpnext/erpnext/public/js/setup_wizard.js +298,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 +542,Row #{0}: Asset {1} must be submitted,د کتارونو تر # {0}: د شتمنیو د {1} بايد وسپارل شي
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,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 له لارې د توازن.
 DocType: Warehouse,Tree Details,د ونو په بشپړه توګه کتل
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,وليږئ اوس
 ,Support Analytics,د ملاتړ Analytics
 DocType: Item,Website Warehouse,وېب پاڼه ګدام
 DocType: Payment Reconciliation,Minimum Invoice Amount,لږ تر لږه صورتحساب مقدار
 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/sales_invoice/sales_invoice.py +227,Timesheet {0} is already completed or cancelled,Timesheet {0} لا د مخه د بشپړې او يا لغوه
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +259,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 يا ور سره برابر وي
@@ -774,13 +783,13 @@
 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 +229,Target Warehouse,هدف ګدام
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +230,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-,STE-
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Sales Order Date,د تمی د سپارلو نېټه مخکې خرڅلاو نظم نېټه نه شي
 DocType: Upload Attendance,Import Attendance,د وارداتو د حاضرۍ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,ټول د قالب ډلې
+apps/erpnext/erpnext/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/config/setup.py +89,Automatically compose message on submission of transactions.,په اتوماتيک ډول د معاملو د سپارلو پېغام کمپوز.
@@ -792,13 +801,15 @@
 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/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,د سپارنې پرمهال يادونه پيغام
 DocType: Expense Claim,Expenses,لګښتونه
 DocType: Item Variant Attribute,Item Variant Attribute,د قالب variant ځانتیا
 ,Purchase Receipt Trends,رانيول رسيد رجحانات
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Research & Development,د څیړنې او پراختیا
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,د څیړنې او پراختیا
 ,Amount to Bill,ته بیل اندازه
 DocType: Company,Registration Details,د نوم ليکنې په بشپړه توګه کتل
+DocType: Timesheet,Total Billed Amount,Total محاسبې ته مقدار
 DocType: Item Reorder,Re-Order Qty,Re-نظم Qty
 DocType: Leave Block List Date,Leave Block List Date,پريږدئ بالک بشپړفهرست نېټه
 DocType: Pricing Rule,Price or Discount,د بیې او يا کمښت
@@ -807,7 +818,7 @@
 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/controllers/accounts_controller.py +340,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",د پیسو د داخلولو {0} دی تړاو نظم {1}، وګورئ که دا بايد په توګه په دې صورتحساب مخکې کش شي په وړاندې.
+apps/erpnext/erpnext/controllers/accounts_controller.py +343,"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-خرڅول
@@ -829,12 +840,12 @@
 DocType: Supplier Quotation,Is Subcontracted,د دې لپاره قرارداد
 DocType: Item Attribute,Item Attribute Values,د قالب ځانتیا ارزښتونه
 DocType: Examination Result,Examination Result,د ازموینې د پایلو د
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +756,Purchase Receipt,رانيول رسيد
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +735,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 +167,Reference Doctype must be one of {0},ماخذ Doctype بايد د يو شي {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +282,Unable to find Time Slot in the next {0} days for Operation {1},ته د وخت د عملياتو په راتلونکو {0} ورځو کې د څوکۍ د موندلو توان نلري {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +170,Reference Doctype must be one of {0},ماخذ Doctype بايد د يو شي {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Unable to find Time Slot in the next {0} days for Operation {1},ته د وخت د عملياتو په راتلونکو {0} ورځو کې د څوکۍ د موندلو توان نلري {1}
 DocType: Production Order,Plan material for sub-assemblies,فرعي شوراګانو لپاره پلان مواد
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,خرڅلاو همکارانو او خاوره
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be active,هیښ {0} بايد فعال وي
@@ -845,7 +856,7 @@
 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 +214,Warehouses with existing transaction can not be converted to ledger.,د موجوده معامله ګودامونو ته د پنډو بدل نه شي.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +217,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,تولید امر
@@ -859,9 +870,9 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,د کارګر {0} فعاله نه وي او یا موجود ندی
 DocType: Fee Structure,Components,د اجزاو
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,Please enter Asset Category in Item {0},لطفا په قالب د شتمنیو کټه ګورۍ ته ننوځي {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +612,Item Variants {0} updated,د قالب تانبه {0} تازه
+apps/erpnext/erpnext/stock/doctype/item/item.py +614,Item Variants {0} updated,د قالب تانبه {0} تازه
 DocType: Quality Inspection Reading,Reading 6,لوستلو 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +843,Cannot {0} {1} {2} without any negative outstanding invoice,نه شی کولای د {0} د {1} {2} کومه منفي بيالنس صورتحساب پرته
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +854,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,پرانیځئ اوس
@@ -876,69 +887,72 @@
 DocType: Item,Is Purchase Item,آیا د رانيول د قالب
 DocType: Asset,Purchase Invoice,رانيول صورتحساب
 DocType: Stock Ledger Entry,Voucher Detail No,ګټمنو تفصیلي نه
-apps/erpnext/erpnext/accounts/page/pos/pos.js +728,New Sales Invoice,نوي خرڅلاو صورتحساب
+apps/erpnext/erpnext/accounts/page/pos/pos.js +710,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 +728,Sync Offline Invoices,پرانیځئ نالیکی صورتحساب
 DocType: Payment Request,Paid,ورکړل
 DocType: Program Fee,Program Fee,پروګرام فیس
 DocType: Salary Slip,Total in words,په لفظ Total
 DocType: Material Request Item,Lead Time Date,سرب د وخت نېټه
 DocType: Guardian,Guardian Name,ګارډین نوم
 DocType: Cheque Print Template,Has Print Format,لري چاپ شکل
-apps/erpnext/erpnext/accounts/page/pos/pos.js +86, is mandatory. Maybe Currency Exchange record is not created for ,الزامی دی. ښايي د پیسو د بدلولو ریکارډ نه ده لپاره جوړ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +109,Row #{0}: Please specify Serial No for Item {1},د کتارونو تر # {0}: مهرباني وکړئ سریال لپاره د قالب نه مشخص {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +619,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.",لپاره &#39;د محصول د بنډل په&#39; توکي، ګدام، شعبه او دسته نه به د &#39;پروپیلن لیست جدول کې له پام کې ونیول شي. که ګدام او دسته هيڅ لپاره د هر &#39;د محصول د بنډل په&#39; توکی د ټولو بسته بنديو توکو يو شان دي، د هغو ارزښتونو په اصلي شمیره جدول داخل شي، ارزښتونو به کاپي شي چې د &#39;پروپیلن لیست جدول.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +75, 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 +613,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing 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 +606,Supplier Invoice Date cannot be greater than Posting Date,عرضه صورتحساب نېټه نه شي کولای پست کوي نېټه څخه ډيره وي
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +609,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: Cheque Print Template,Date Settings,نېټه امستنې
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,متفرقه
 ,Company Name,دکمپنی نوم
 DocType: SMS Center,Total Message(s),Total پيغام (s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +810,Select Item for Transfer,د انتقال انتخاب د قالب
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +789,Select Item for Transfer,د انتقال انتخاب د قالب
 DocType: Purchase Invoice,Additional Discount Percentage,اضافي کمښت سلنه
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,ښکاره د په مرسته د ټولو ویډیوګانو يو لست
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,د بانک انتخاب حساب مشر هلته پوستې شو امانت.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,اجازه د کارونکي چې په معاملو د بیې په لېست Rate د سمولو
 DocType: Pricing Rule,Max Qty,Max Qty
-DocType: Student Applicant,Father's Name,د پلار نوم
 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 +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,د کتارونو تر {0}: خرڅلاو / د اخستلو د امر په وړاندې د پیسو باید د تل لپاره له مخکې په نښه شي
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,کيمياوي
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +686,All items have already been transferred for this Production Order.,ټول توکي لا له وړاندې د دې تولید نظم ته انتقال شوي دي.
+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} او بیا کوښښ وکړه
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +694,All items have already been transferred for this Production Order.,ټول توکي لا له وړاندې د دې تولید نظم ته انتقال شوي دي.
 DocType: Process Payroll,Select Payroll Year and Month,د معاشاتو په کال او مياشت وټاکئ
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,Meter,متره
 DocType: Workstation,Electricity Cost,د بريښنا د لګښت
 DocType: HR Settings,Don't send Employee Birthday Reminders,آيا د کارګر کالیزې په دوراني ډول نه استوي
-DocType: Opportunity,Walk In,ګرځیدل
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,دحمل توکي
 DocType: Item,Inspection Criteria,تفتیش معیارونه
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,وليږدول
 apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,پورته ستاسو لیک مشر او لوګو. (کولی شئ چې وروسته د سمولو لپاره).
 DocType: Timesheet Detail,Bill,بیل
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,White,سپین
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date is entered as past date,بل د استهالک نېټه ده ته ننوتل په توګه په تېرو نیټه
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +167,White,سپین
 DocType: SMS Center,All Lead (Open),ټول کوونکۍ (خلاص)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +228,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),د کتارونو تر {0}: Qty لپاره نه {4} په ګودام {1} د ننوتلو وخت امخ د ({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}),د کتارونو تر {0}: Qty لپاره نه {4} په ګودام {1} د ننوتلو وخت امخ د ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,ترلاسه کړئ پرمختګونه ورکړل
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +731,Make ,د کمکیانو لپاره د
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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 که ستونزه دوام ولري.
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,زما په ګاډۍ
-apps/erpnext/erpnext/controllers/selling_controller.py +154,Order Type must be one of {0},نظم ډول باید د یو وي {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},نظم ډول باید د یو وي {0}
 DocType: Lead,Next Contact Date,بل د تماس نېټه
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,پرانيستل Qty
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +393,Please enter Account for Change Amount,مهرباني وکړئ د بدلون لپاره د مقدار حساب ته ننوځي
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,Please enter Account for Change Amount,مهرباني وکړئ د بدلون لپاره د مقدار حساب ته ننوځي
 DocType: Student Batch,Student Batch Name,د زده کونکو د دسته نوم
 DocType: Holiday List,Holiday List Name,رخصتي بشپړفهرست نوم
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js +8,Schedule Course,مهال ويش کورس
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Stock Options,دحمل غوراوي
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,دحمل غوراوي
 DocType: Journal Entry Account,Expense Claim,اخراجاتو ادعا
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +211,Do you really want to restore this scrapped asset?,آيا تاسو په رښتيا غواړئ چې د دې پرزه د شتمنیو بيازېرمل؟
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +237,Qty for {0},د Qty {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +212,Do you really want to restore this scrapped asset?,آيا تاسو په رښتيا غواړئ چې د دې پرزه د شتمنیو بيازېرمل؟
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,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,بالک بشپړفهرست نیټی څخه ووځي
@@ -947,9 +961,9 @@
 DocType: Company,Default Terms,default اصطلاح
 DocType: Packing Slip Item,Packing Slip Item,بسته بنديو ټوټه د قالب
 DocType: Purchase Invoice,Cash/Bank Account,د نغدو پيسو / بانک حساب
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,په اندازه او ارزښت نه بدلون لرې توکي.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,په اندازه او ارزښت نه بدلون لرې توکي.
 DocType: Delivery Note,Delivery To,ته د وړاندې کولو
-apps/erpnext/erpnext/stock/doctype/item/item.py +635,Attribute table is mandatory,ځانتیا جدول الزامی دی
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,ځانتیا جدول الزامی دی
 DocType: Production Planning Tool,Get Sales Orders,خرڅلاو امر ترلاسه کړئ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} کېدای شي منفي نه وي
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,لطفا د زده کوونکو د ټاکلو لپاره
@@ -974,7 +988,7 @@
 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,WIP ګدام
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},شعبه {0} ترمړوندونو مراقبت د قرارداد په اساس دی {1}
+apps/erpnext/erpnext/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,د ادارې نوم
@@ -986,7 +1000,7 @@
 DocType: GL Entry,Against,په وړاندې
 DocType: Item,Default Selling Cost Center,Default پلورل لګښت مرکز
 DocType: Sales Partner,Implementation Partner,د تطبیق همکار
-apps/erpnext/erpnext/controllers/selling_controller.py +231,Sales Order {0} is {1},خرڅلاو نظم {0} دی {1}
+apps/erpnext/erpnext/controllers/selling_controller.py +232,Sales Order {0} is {1},خرڅلاو نظم {0} دی {1}
 DocType: Opportunity,Contact Info,تماس پيژندنه
 apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,جوړول دحمل توکي
 DocType: Packing Slip,Net Weight UOM,خالص وزن UOM
@@ -996,25 +1010,24 @@
 DocType: Holiday List,Get Weekly Off Dates,د اونۍ پړاو نیټی ترلاسه کړئ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,د پای نیټه نه شي کولای په پرتله د پیل نیټه کمه وي
 DocType: Sales Person,Select company name first.,انتخاب شرکت نوم د لومړي.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Dr,ډاکټر
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Dr,ډاکټر
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,د داوطلبۍ څخه عرضه ترلاسه کړ.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},د {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,منځنی عمر
 DocType: 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/templates/pages/home.html +32,View All Products,ښکاره ټول محصولات د
+apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,ښکاره ټول محصولات د
 DocType: Company,Default Currency,default د اسعارو
 DocType: Contact,Enter designation of this Contact,د دې تماس نومول وليکئ
 DocType: Expense Claim,From Employee,له کارګر
-apps/erpnext/erpnext/controllers/accounts_controller.py +400,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,خبرداری: د سیستم به راهیسې لپاره د قالب اندازه overbilling وګورئ نه {0} د {1} صفر ده
+apps/erpnext/erpnext/controllers/accounts_controller.py +403,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/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,او کال:
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +191,{0} {1} must be submitted,{0} د {1} بايد وسپارل شي
-DocType: Email Digest,Annual Expense,کلنی اخراجاتو
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,{0} {1} must be submitted,{0} د {1} بايد وسپارل شي
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +145,Quantity must be less than or equal to {0},مقدار باید د لږ-تر یا مساوي وي {0}
 DocType: SMS Center,Total Characters,Total خویونه
 apps/erpnext/erpnext/controllers/buying_controller.py +156,Please select BOM in BOM field for Item {0},لطفا هیښ لپاره د قالب په هیښ برخه کې غوره {0}
@@ -1025,30 +1038,31 @@
 DocType: Sales Partner,Distributor,ویشونکی-
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,خرید په ګاډۍ نقل حاکمیت
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +211,Production Order {0} must be cancelled before cancelling this Sales Order,تولید نظم {0} بايد بندول د دې خرڅلاو نظم مخکې لغوه شي
-apps/erpnext/erpnext/public/js/controllers/transaction.js +62,Please set 'Apply Additional Discount On',مهرباني وکړئ ټاکل &#39;د اضافي کمښت Apply&#39;
+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
 DocType: Global Defaults,Global Defaults,Global افتراضیو
 apps/erpnext/erpnext/projects/doctype/project/project.py +153,Project Collaboration Invitation,د پروژې د مرستې په جلب
 DocType: Salary Slip,Deductions,د مجرايي
+DocType: Leave Allocation,LAL/,لعل /
 apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,بیا کال
 DocType: Purchase Invoice,Start date of current invoice's period,بیا د روان صورتحساب د مودې نېټه
 DocType: Salary Slip,Leave Without Pay,پرته له معاشونو څخه ووځي
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +327,Capacity Planning Error,د ظرفیت د پلان کې تېروتنه
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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 +362,Finished Item {0} must be entered for Manufacture type entry,{0} پای ته قالب بايد د جوړون ډول د ننوتلو لپاره د داخل شي
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +367,Finished Item {0} must be entered for Manufacture type entry,{0} پای ته قالب بايد د جوړون ډول د ننوتلو لپاره د داخل شي
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,پرانيستل محاسبې بیلانس
 DocType: Sales Invoice Advance,Sales Invoice Advance,خرڅلاو صورتحساب پرمختللی
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +499,Nothing to request,هېڅ غوښتنه
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +500,Nothing to request,هېڅ غوښتنه
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','واقعي د پیل نیټه ' نه شي پورته له 'واقعي د پای نیټه' څخه
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Management,مدیریت
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},یا ډیبیټ یا د پور اندازه د اړتيا {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,مدیریت
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +55,Either debit or credit amount is required for {0},یا ډیبیټ یا د پور اندازه د اړتيا {0}
 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 +161,Blue,آبي
+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
@@ -1058,12 +1072,12 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +23,POS Profile {0} already created for user: {1} and company {2},POS پيژند {0} لا کارن لپاره جوړ: {1} او د شرکت {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM د تغیر فکتور
 DocType: Stock Settings,Default Item Group,Default د قالب ګروپ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1374,Do you really want to submit the invoice?,آيا تاسو په رښتيا غواړئ چې د صورتحساب وسپاري؟
+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 +685,Cost Center For Item with Item Code ',لګښت لپاره مرکز سره د قالب کوډ &#39;د قالب
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1526,"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 +679,Cost Center For Item with Item Code ',لګښت لپاره مرکز سره د قالب کوډ &#39;د قالب
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1550,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",د پیسو په اکر کې نده شکل بندي شوې ده. مهرباني وکړئ وګورئ، چې آيا حساب په د تادياتو د اکر یا د POS پېژندنه ټاکل شوي دي.
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,ستاسې د پلورنې کس به د پند په دې نېټې ته د مشتريانو د تماس ترلاسه
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,"Further accounts can be made under Groups, but entries can be made against non-Groups",لا حسابونو شي ډلو لاندې کړې، خو د زياتونې شي غیر ډلو په وړاندې د
 DocType: Lead,Lead,سرب د
@@ -1083,104 +1097,106 @@
 DocType: Payment Reconciliation,Unreconciled Payment Details,تطبیق د پیسو په بشپړه توګه کتل
 DocType: Global Defaults,Current Fiscal Year,روان مالي کال
 DocType: Global Defaults,Disable Rounded Total,نافعال مونډ Total
-DocType: Lead,Call,غوښتنه
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +417,'Entries' cannot be empty,'توکي' نه شي کولای تش وي
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +418,'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 +214,Fiscal Year {0} not found,مالي کال د {0} ونه موندل شو
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +221,Fiscal Year {0} not found,مالي کال د {0} ونه موندل شو
 apps/erpnext/erpnext/config/hr.py +238,Setting up Employees,مامورین ترتیبول
 DocType: Sales Order,SO-,اصطالح
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,مهرباني وکړئ لومړی مختاړی وټاکئ
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Please select prefix first,مهرباني وکړئ لومړی مختاړی وټاکئ
 DocType: Employee,O-,فرنګ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Research,د څیړنې
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,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 +43,Item {0} must be a non-stock item,{0} د قالب باید یو غیر سټاک وي
 DocType: Contact,User ID,کارن نوم
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +57,View Ledger,محتویات پنډو
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,ژر
-apps/erpnext/erpnext/stock/doctype/item/item.py +504,"An Item Group exists with same name, please change the item name or rename the item group",د قالب ګروپ سره په همدې نوم شتون لري، لطفا توکی نوم بدل کړي او يا د توکي ډلې نوم
+apps/erpnext/erpnext/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 +437,Rest Of The World,د نړۍ پاتې
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,د قالب {0} نه شي کولای دسته لري
 ,Budget Variance Report,د بودجې د توپیر راپور
 DocType: Salary Slip,Gross Pay,Gross د معاشونو
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +90,Row {0}: Activity Type is mandatory.,د کتارونو تر {0}: فعالیت ډول فرض ده.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +114,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/public/js/controllers/stock_controller.js +40,Accounting Ledger,د محاسبې د پنډو
+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,ساتل شوې ګټه
 DocType: BOM Item,Item Description,د قالب Description
+DocType: Student Sibling,Student Sibling,د زده کونکو د ورونړه
 DocType: Purchase Invoice,Is Recurring,آیا بیا راګرځېدل
 DocType: Purchase Invoice,Supplied Items,تهيه سامان
 DocType: Student,STUD.,خپلو پټيو کې.
 DocType: Production Order,Qty To Manufacture,Qty تولید
+DocType: Email Digest,New Income,نوي عايداتو
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,ټول د اخیستلو دوران عين اندازه وساتي
 DocType: Opportunity Item,Opportunity Item,فرصت د قالب
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,لنډمهاله پرانیستل
 ,Employee Leave Balance,د کارګر اجازه بیلانس
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +131,Balance for Account {0} must always be {1},د حساب انډول {0} بايد تل وي {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +175,Valuation Rate required for Item in row {0},سنجي Rate په قطار لپاره د قالب اړتیا {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,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,مثال په توګه: په کمپیوټر ساینس د ماسټرۍ
 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 +87, to ,ته
+apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,ته
 DocType: Item,Lead Time in days,په ورځو په غاړه وخت
 ,Accounts Payable Summary,حسابونه د راتلوونکې لنډيز
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Not authorized to edit frozen Account {0},نه اجازه کنګل حساب د سمولو {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},نه اجازه کنګل حساب د سمولو {0}
 DocType: Journal Entry,Get Outstanding Invoices,يو وتلي صورتحساب ترلاسه کړئ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +62,Sales Order {0} is not valid,خرڅلاو نظم {0} د اعتبار وړ نه دی
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,خرڅلاو نظم {0} د اعتبار وړ نه دی
 apps/erpnext/erpnext/setup/doctype/company/company.py +185,"Sorry, companies cannot be merged",بښنه غواړو، شرکتونو نه مدغم شي
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +139,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",په مادي غوښتنه د Issue / انتقال مجموعي مقدار {0} د {1} \ نه غوښتنه کمیت لپاره د قالب {2} څخه ډيره وي {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Small,د کوچنیو
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,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}
 ,Invoiced Amount (Exculsive Tax),د رسیدونو مقدار (Exculsive د مالياتو)
-DocType: Student Applicant,Mother's / Guardian 1 Email ID,د مور / ګارډین 1 دبرېښنا ليک ID
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,د قالب 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,ګڼون مشر {0} جوړ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +160,Green,شین
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,شین
 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,Total السته
 DocType: Employee,Place of Issue,د صادریدو ځای
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Contract,د قرارداد د
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,د قرارداد د
 DocType: Email Digest,Add Quote,Add بیه
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +498,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 +503,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 +80,Row {0}: Qty is mandatory,د کتارونو تر {0}: Qty الزامی دی
+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 +737,Sync Master Data,پرانیځئ ماسټر معلوماتو
+apps/erpnext/erpnext/accounts/page/pos/pos.js +719,Sync Master Data,پرانیځئ ماسټر معلوماتو
 apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,ستاسو د تولیداتو يا خدمتونو
 DocType: Mode of Payment,Mode of Payment,د تادیاتو اکر
 apps/erpnext/erpnext/stock/doctype/item/item.py +178,Website Image should be a public file or website URL,وېب پاڼه د انځور بايد د عامه دوتنه يا ويب URL وي
+DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,هیښ
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,دا یو د ريښي توکی ډلې او نه تصحيح شي.
+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 +345,"{0}: Employee email not found, hence email not sent",{0}: د کارګر ایمیل ونه موندل، نو برېښناليک نه استول
+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,آیا ستاسو شرکت پته
 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 +118,"For {0}, only credit accounts can be linked against another debit entry",د {0}، يوازې د پور حسابونو بل ډیبیټ د ننوتلو په وړاندې سره وتړل شي
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Delivery Note {0} is not submitted,د سپارنې پرمهال يادونه {0} نه سپارل
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Delivery Note {0} is not submitted,د سپارنې پرمهال يادونه {0} نه سپارل
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Sub-contracted Item,د قالب {0} باید یو فرعي قرارداد د قالب وي
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,پلازمیینه تجهیزاتو
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",د بیې د حاکمیت لومړی پر بنسټ ټاکل &#39;Apply د&#39; ډګر، چې کولای شي د قالب، د قالب ګروپ یا نښې وي.
 DocType: Hub Settings,Seller Website,پلورونکی وېب پاڼه
 DocType: Item,ITEM-,ITEM-
-apps/erpnext/erpnext/controllers/selling_controller.py +147,Total allocated percentage for sales team should be 100,د خرڅلاو ټيم ټولې سلنه بايد 100 وي
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +110,Production Order status is {0},تولید نظم حالت دی {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,د خرڅلاو ټيم ټولې سلنه بايد 100 وي
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},تولید نظم حالت دی {0}
 DocType: Appraisal Goal,Goal,موخه
 DocType: Sales Invoice Item,Edit Description,سمول Description
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +757,For Supplier,د عرضه
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +723,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,چاپ شکل جوړول
@@ -1196,10 +1212,11 @@
 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,ټولګي کوډ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ولېږئ Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +445,BOM {0} does not belong to Item {1},هیښ {0} نه د قالب سره تړاو نه لري {1}
 DocType: Sales Partner,Target Distribution,د هدف د ویش
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1667,Deafault warehouse is required for selected item,Deafault ګودام لپاره غوره توکی اړتیا
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Deafault warehouse is required for selected item,Deafault ګودام لپاره غوره توکی اړتیا
 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
@@ -1208,23 +1225,23 @@
 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 +110,Hardware,هډوتري
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,هډوتري
 DocType: Sales Order,Recurring Upto,راګرځېدل ترمړوندونو پورې
 DocType: Attendance,HR Manager,د بشري حقونو څانګې د مدير
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,لطفا یو شرکت غوره
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Privilege Leave,امتیاز څخه ځي
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,امتیاز څخه ځي
 DocType: Purchase Invoice,Supplier Invoice Date,عرضه صورتحساب نېټه
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,تاسو باید د خرید په ګاډۍ وتوانوي
 DocType: Payment Entry,Writeoff,Writeoff
 DocType: Appraisal Template Goal,Appraisal Template Goal,ارزونې کينډۍ موخه
-DocType: Salary Slip,Earning,وټې
+DocType: Salary Component,Earning,وټې
 DocType: Purchase Invoice,Party Account Currency,ګوند حساب د اسعارو
 ,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 +171,Against Journal Entry {0} is already adjusted against some other voucher,ژورنال په وړاندې د انفاذ {0} لا د مخه د يو شمېر نورو کوپون په وړاندې د تعدیل
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,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_data.py +358,Food,د خوړو د
+apps/erpnext/erpnext/demo/setup/setup_data.py +301,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/course_schedule/course_schedule.js +103,Mark Attendence,مارک Attendence
@@ -1258,12 +1275,12 @@
 DocType: Sales Order Item,Planned Quantity,پلان شوي مقدار
 DocType: Purchase Invoice Item,Item Tax Amount,د قالب د مالیې د مقدار
 DocType: Item,Maintain Stock,دحمل ساتل
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +209,Stock Entries already created for Production Order ,دحمل توکي لا د تولید لپاره د نظم رامنځته
+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,په ثابته شتمني خالص د بدلون
 DocType: Leave Control Panel,Leave blank if considered for all designations,خالي پريږدئ که د ټولو هغو کارونو په پام کې
-apps/erpnext/erpnext/controllers/accounts_controller.py +620,Charge of type 'Actual' in row {0} cannot be included in Item Rate,د ډول &#39;واقعي په قطار چارج په قالب Rate نه {0} شامل شي
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,Max: {0},اعظمي: {0}
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +15,From Datetime,له Datetime
+apps/erpnext/erpnext/controllers/accounts_controller.py +623,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 +239,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 +153,"Request for Quotation is disabled to access from portal, for more check portal settings.",لپاره د داوطلبۍ د غوښتنې له تانبه ته لاسرسی ناچارن شوی، د زياتو چک تانبه امستنې.
@@ -1271,8 +1288,8 @@
 DocType: Sales Invoice,Shipping Address Name,استونې پته نوم
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,د حسابونو چارټ
 DocType: Material Request,Terms and Conditions Content,د قرارداد شرايط منځپانګه
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +552,cannot be greater than 100,نه شي کولای په پرتله 100 وي
-apps/erpnext/erpnext/stock/doctype/item/item.py +680,Item {0} is not a stock Item,{0} د قالب يو سټاک د قالب نه دی
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +546,cannot be greater than 100,نه شي کولای په پرتله 100 وي
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is not a stock Item,{0} د قالب يو سټاک د قالب نه دی
 DocType: Maintenance Visit,Unscheduled,ناپلان شوې
 DocType: Employee,Owned,د دولتي
 DocType: Salary Detail,Depends on Leave Without Pay,په پرته د معاشونو اذن سره تړلی دی
@@ -1286,10 +1303,9 @@
 DocType: GL Entry,GL Entry,GL انفاذ
 DocType: HR Settings,Employee Settings,د کارګر امستنې
 ,Batch-Wise Balance History,دسته تدبيراومصلحت سره انډول تاریخ
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,د کړنو لړ
 apps/erpnext/erpnext/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 +61,Apprentice,شاګرد
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +102,Negative Quantity is not allowed,منفي مقدار اجازه نه وي
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,شاګرد
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +103,Negative Quantity is not allowed,منفي مقدار اجازه نه وي
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",د مالياتو د تفصیل جدول توکی په توګه یو تار د بادار څخه راوړل شوی او په دې برخه کې ساتل کيږي. د مالیات او په تور لپاره کارول کيږي
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +152,Employee cannot report to himself.,کارکوونکی کولای شي چې د ځان راپور نه ورکوي.
@@ -1310,15 +1326,14 @@
 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 +141,Source warehouse is mandatory for row {0},سرچینه ګودام لپاره چي په کتارونو الزامی دی {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +719,Packing Slip,بسته بنديو ټوټه
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Source warehouse is mandatory for row {0},سرچینه ګودام لپاره چي په کتارونو الزامی دی {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +713,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/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,لپاره د مادیاتو په غوښتنه کولای شي لاندې لینک کلیک کولوسره لاس رسی وي
 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 +81,Analyst,شنونکي
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,شنونکي
 DocType: Item,Inventory,موجودي
 DocType: Item,Sales Details,د پلورنې په بشپړه توګه کتل
 DocType: Quality Inspection,QI-,QI-
@@ -1326,7 +1341,7 @@
 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 +103,Government,د دولت
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,د دولت
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,د انستیتوت نوم
 apps/erpnext/erpnext/config/stock.py +289,Item Variants,د قالب تانبه
 DocType: Company,Services,خدمتونه
@@ -1342,6 +1357,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,Financial Year Start Date,د مالي کال د پیل نیټه
 DocType: POS Profile,Apply Discount,Apply کمښت
 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,له پانګه اچونه نقدو پیسو د جریان
 DocType: Program Course,Program Course,د پروګرام د کورس
@@ -1382,12 +1398,12 @@
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,د اخيستونکي بشپړفهرست تش دی. لطفا رامنځته اخيستونکي بشپړفهرست
 DocType: Production Plan Sales Order,Production Plan Sales Order,تولید پلان خرڅلاو نظم
 DocType: Sales Partner,Sales Partner Target,خرڅلاو همکار هدف
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +110,Accounting Entry for {0} can only be made in currency: {1},د {0} د محاسبې د داخلولو په اسعارو يوازې شي: {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},د {0} د محاسبې د داخلولو په اسعارو يوازې شي: {1}
 DocType: Pricing Rule,Pricing Rule,د بیې د حاکمیت
 DocType: Budget,Action if Annual Budget Exceeded,که کړنه کلنۍ بودیجه زیات شو
 apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,د نظم پیري موادو غوښتنه
 DocType: Shopping Cart Settings,Payment Success URL,د پیسو د برياليتوب په حافظی
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +78,Row # {0}: Returned Item {1} does not exists in {2} {3},د کتارونو تر # {0}: راستون قالب {1} په نه شتون {2} {3}
+apps/erpnext/erpnext/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,بانک پخلاينې اعلامیه
@@ -1396,40 +1412,39 @@
 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/stock/doctype/stock_entry/stock_entry.py +339,Not allowed to tranfer more {0} than {1} against Purchase Order {2},نه ډیر اجازه tranfer {0} په پرتله {1} د اخستلو د امر په وړاندې د {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +344,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 +545,Manufacturing Quantity is mandatory,دفابريکي مقدار الزامی دی
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,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 +71,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 +162,Row {0}: From Time and To Time of {1} is overlapping with {2},د کتارونو تر {0}: د وخت او د وخت د {1} له ده سره د تداخل {2}
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +186,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,دحمل مسؤلیتونه
 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 +130,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 +137,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,نور راپورونه
 DocType: Dependent Task,Dependent Task,اتکا کاري
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,لطفا د تشکیلاتو د کارګر د بشري منابعو د سیستم نوم&gt; د بشري حقونو څانګې امستنې
 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 +190,Leave of type {0} cannot be longer than {1},د ډول رخصت {0} په پرتله نور نه شي {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +197,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 +921,Search Item,د لټون د قالب
+apps/erpnext/erpnext/accounts/page/pos/pos.js +910,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 +546,Already completed,لا د بشپړ
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +22,Payment Request already exists {0},د پیسو غوښتنه د مخکې نه شتون {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +550,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 +241,Quantity must not be more than {0},اندازه بايد زيات نه وي {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Quantity must not be more than {0},اندازه بايد زيات نه وي {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +76,Previous Financial Year is not closed,مخکینی مالي کال تړل نه دی
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +44,Age (Days),عمر (ورځې)
 DocType: Quotation Item,Quotation Item,د داوطلبۍ د قالب
@@ -1446,7 +1461,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +221,Purchase Receipt {0} is not submitted,رانيول رسيد {0} نه سپارل
 DocType: Company,Default Payable Account,Default د راتلوونکې اکانټ
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.",د انلاین سودا کراچۍ امستنې لکه د لېږد د اصولو، د نرخونو لست نور
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +83,{0}% Billed,{0}٪ محاسبې ته
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}٪ محاسبې ته
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,خوندي دي Qty
 DocType: Party Account,Party Account,ګوند حساب
 apps/erpnext/erpnext/config/setup.py +116,Human Resources,بشري منابع
@@ -1458,12 +1473,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Row {0}: Advance against Supplier must be debit,د کتارونو تر {0}: عرضه په وړاندې پرمختللی باید ډیبیټ شي
 DocType: Company,Default Values,تلواله ارزښتونو ته
 DocType: Expense Claim,Total Amount Reimbursed,Total مقدار بیرته
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +22,Collect,راټول
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,راټول
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,Against Supplier Invoice {0} dated {1},په وړاندې د عرضه صورتحساب {0} د میاشتې په {1}
 DocType: Customer,Default Price List,Default د بیې په لېست
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +225,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 ټاکل
-DocType: Payment Reconciliation,Payments,د پیسو ورکړه
 DocType: Journal Entry,Entry Type,د ننوتلو ډول
 ,Customer Credit Balance,پيرودونکو پور بیلانس
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Payable,په حسابونه د راتلوونکې خالص د بدلون
@@ -1475,7 +1489,7 @@
 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 +9,Procurement,د تدارکاتو
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,د توکو نه لري او په اندازه او ارزښت کوم بدلون.
+apps/erpnext/erpnext/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,ګرنټی ادعا
 ,Lead Details,سرب د نورولوله
 DocType: Purchase Invoice,End date of current invoice's period,د روان صورتحساب د دورې د پای نیټه
@@ -1500,7 +1514,7 @@
 DocType: Purchase Invoice,Additional Discount,اضافي کمښت
 DocType: Selling Settings,Selling Settings,خرڅول امستنې
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,په آنلاین توګه لیلام
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +97,Please specify either Quantity or Valuation Rate or both,لطفا يا مقدار يا ارزښت Rate یا دواړه مشخص
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,لطفا يا مقدار يا ارزښت Rate یا دواړه مشخص
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +13,Fulfillment,تحقق
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory",شرکت، مياشتې او د مالي کال الزامی دی
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,بازار موندنه داخراجاتو
@@ -1521,14 +1535,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,ERPNext Setup بشپړ!
 DocType: Item,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +93,A Customer Group exists with same name please change the Customer name or rename the Customer Group,A پيرودونکو ګروپ سره په همدې نوم موجود دی لطفا د پيرودونکو نوم بدل کړي او يا د مراجعينو د ګروپ نوم بدلولی شی
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +126,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
 DocType: Stock Entry,Material Receipt,د موادو د رسيد
 DocType: Homepage,Products,محصولات
 DocType: Announcement,Instructor,د لارښوونکي
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},ګوند ډول او د ګوند د ترلاسه / د راتلوونکې حساب ته اړتیا لیدل کیږي {0}
 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
@@ -1539,7 +1552,7 @@
 ,Item-wise Sales Register,د قالب-هوښيار خرڅلاو د نوم ثبتول
 DocType: Asset,Gross Purchase Amount,Gross رانيول مقدار
 DocType: Asset,Depreciation Method,د استهالک Method
-apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Offline,د نالیکي
+apps/erpnext/erpnext/accounts/page/pos/pos.js +686,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,د غوښتل شوي
@@ -1557,25 +1570,27 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +425,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 +858,Make Purchase Order,د کمکیانو لپاره د اخستلو امر
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +852,Make Purchase Order,د کمکیانو لپاره د اخستلو امر
 DocType: SMS Center,Send To,لېږل
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,There is not enough leave balance for Leave Type {0},لپاره اجازه او ډول په کافي اندازه رخصت توازن نه شته {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,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 +172,Work-in-Progress Warehouse is required before Submit,کار-in-پرمختګ ګدام مخکې اړتیا سپارل
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,Work-in-Progress Warehouse is required before Submit,کار-in-پرمختګ ګدام مخکې اړتیا سپارل
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,د دنده متقاضي.
 DocType: Purchase Order Item,Warehouse and Reference,ګدام او ماخذ
 DocType: Supplier,Statutory info and other general information about your Supplier,قانوني معلومات او ستاسو د عرضه په هکله د نورو عمومي معلومات
-apps/erpnext/erpnext/hooks.py +88,Addresses,Addresses
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,عرضه&gt; عرضه ډول
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +212,Against Journal Entry {0} does not have any unmatched {1} entry,ژورنال په وړاندې د انفاذ {0} نه کوم السوري {1} د ننوتلو لري
+apps/erpnext/erpnext/hooks.py +95,Addresses,Addresses
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +215,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,لطفا چاڼګر جوړ پر بنسټ د قالب یا ګدام
 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,ته کول او د بیل
@@ -1583,11 +1598,10 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,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 +731,Payment,د پیسو
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,Payment,د پیسو
 DocType: Production Order Operation,Actual Time and Cost,واقعي وخت او لګښت
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},د اعظمي {0} د موادو غوښتنه کولای {1} په وړاندې د خرڅلاو نظم شي لپاره د قالب جوړ {2}
 DocType: Employee,Salutation,سلام
-DocType: Pricing Rule,Brand,دتوليد
 DocType: Course,Course Abbreviation,کورس Abbreviation
 DocType: Item,Will also apply for variants,به هم د بېرغونو درخواست
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +142,"Asset cannot be cancelled, as it is already {0}",د شتمنیو د نه لغوه شي، لکه څنګه چې د مخه دی {0}
@@ -1599,7 +1613,7 @@
 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.",ستاسو د تولیداتو يا خدمتونو چې تاسو واخلي او يا خرڅ لست کړئ. د کمکیانو لپاره د ډاډ تر لاسه کله چې تاسو د پيل د قالب ګروپ، د اندازه کولو او نورو ملکیتونو واحد وګورئ.
 DocType: Hub Settings,Hub Node,مرکزي غوټه
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,تا د دوه ګونو توکو ته ننوتل. لطفا د سمولو او بیا کوښښ وکړه.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Associate,ملګري
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,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,جوړول د اخيستونکي بشپړفهرست
@@ -1607,7 +1621,7 @@
 DocType: Production Planning Tool,Material Requests,مادي غوښتنې
 DocType: Warranty Claim,Issue Date,صادرونې نېټه
 DocType: Activity Cost,Activity Cost,فعالیت لګښت
-DocType: Timesheet Detail,Timesheet Detail,Timesheet تفصیلي
+DocType: Sales Invoice Timesheet,Timesheet Detail,Timesheet تفصیلي
 DocType: Purchase Receipt Item Supplied,Consumed Qty,په مصرف Qty
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,د مخابراتو
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),ښيي چې د کڅوړه ده د دې د وړاندې کولو (یوازې مسوده) یوه برخه
@@ -1630,6 +1644,7 @@
 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,لري تانبه
 DocType: Monthly Distribution,Name of the Monthly Distribution,د میاشتنی ویش نوم
 DocType: Sales Person,Parent Sales Person,Parent خرڅلاو شخص
@@ -1642,30 +1657,31 @@
 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 +44,"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/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.,په کلیمو کې به د ليدو وړ وي. هر کله چې تاسو د خرڅلاو صورتحساب وژغوري.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +502,Error: {0} &gt; {1},تېروتنه: {0}&gt; {1}
 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.,د دورې د پیل نیټه نه شي کولای د کال د پیل د تعليمي کال د نېټه چې د اصطلاح ده سره تړاو لري په پرتله مخکې وي (تعليمي کال د {}). لطفا د خرما د اصلاح او بیا کوښښ وکړه.
 DocType: Naming Series,Current Value,اوسنی ارزښت
-apps/erpnext/erpnext/controllers/accounts_controller.py +235,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,لپاره د نېټې {0} څو مالي کلونو کې شتون لري. لطفا د مالي کال په شرکت جوړ
+apps/erpnext/erpnext/controllers/accounts_controller.py +238,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 +458,Item table can not be blank,د قالب شمیره جدول کې نه شي کولای خالي وي
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +443,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 +5,This is based on stock movement. See {0} for details,دا په دحمل پر بنسټ. وګورئ: {0} تفصيل لپاره د
 DocType: Pricing Rule,Selling,پلورل
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +341,Amount {0} {1} deducted against {2},مقدار د {0} د {1} مجرايي په وړاندې د {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +344,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,له امله نېټه پست کوي نېټه مخکې نه شي
@@ -1680,8 +1696,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +144,Cannot refer row number greater than or equal to current row number for this Charge type,نه قطار شمېر په پرتله لویه یا مساوي دې مسؤوليت په ډول د اوسني قطار شمېر ته راجع
 DocType: Asset,Sold,پلورل
 ,Item-wise Purchase History,د قالب-هوښيار رانيول تاریخ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Red,سور
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},لطفا شعبه لپاره د قالب زياته کړه راوړلو په &#39;تولید مهال ویش&#39; کلیک {0}
+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,د پرانیستې تولید امر
 DocType: Sales Invoice Payment,Base Amount (Company Currency),داساسی مبلغ (شرکت د اسعارو)
@@ -1689,7 +1705,7 @@
 DocType: Installation Note,Installation Time,نصب او د وخت
 DocType: Sales Invoice,Accounting Details,د محاسبې په بشپړه توګه کتل
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,دا د شرکت د ټولو معاملې ړنګول
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +187,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,د کتارونو تر # {0}: عملیات {1} نه د {2} په تولید د پای ته د مالونو qty بشپړ نظم # {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,د کتارونو تر # {0}: عملیات {1} نه د {2} په تولید د پای ته د مالونو qty بشپړ نظم # {3}. لطفا د وخت کندي له لارې د عملیاتو د حالت د اوسمهالولو
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,پانګه اچونه
 DocType: Issue,Resolution Details,د حل په بشپړه توګه کتل
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,تخصیصونه
@@ -1725,16 +1741,17 @@
 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}
 DocType: Delivery Note,Excise Page Number,وسیله Page شمېر
 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}
 ,Maintenance Schedules,د ساتنې او ویش
 DocType: Task,Actual End Date (via Time Sheet),واقعي د پای نیټه (د وخت پاڼه له لارې)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Amount {0} {1} against {2} {3},مقدار د {0} د {1} په وړاندې د {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +339,Amount {0} {1} against {2} {3},مقدار د {0} د {1} په وړاندې د {2} {3}
 ,Quotation Trends,د داوطلبۍ رجحانات
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},د قالب ګروپ نه د توکی په توکی بادار ذکر {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +295,Debit To account must be a Receivable account,د حساب ډیبیټ باید یو ترلاسه حساب وي
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Receivable account,د حساب ډیبیټ باید یو ترلاسه حساب وي
 DocType: Shipping Rule Condition,Shipping Amount,انتقال مقدار
 ,Pending Amount,انتظار مقدار
 DocType: Purchase Invoice Item,Conversion Factor,د تغیر فکتور
@@ -1742,10 +1759,10 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +137,Expected value after useful life must be greater than or equal to {0},ګټور ژوند وروسته د ارزښت د تمې باید په پرتله لویه یا د مساوي وي {0}
 DocType: Purchase Receipt,Vehicle Number,موټر شمېر
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,د نېټې په اړه چې د تکراري صورتحساب به بند شي
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +90,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,ټولې پاڼي {0} نه لږ وي لا تصویب پاڼي {1} مودې لپاره په پرتله
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +93,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 +22,Enter Paid Amount,ورکړل مقدار وليکئ
+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,څو د ليول هیښ استفاده
@@ -1755,13 +1772,15 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,دحاضري
 DocType: HR Settings,HR Settings,د بشري حقونو څانګې امستنې
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Expense Claim is pending approval. Only the Expense Approver can update status.,اخراجاتو ادعا ده د تصویب په تمه ده. يوازې د اخراجاتو Approver کولای حالت د اوسمهالولو.
+DocType: Email Digest,New Expenses,نوي داخراجاتو
 DocType: Purchase Invoice,Additional Discount Amount,اضافي کمښت مقدار
-apps/erpnext/erpnext/controllers/accounts_controller.py +524,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",د کتارونو تر # {0}: Qty باید 1، لکه توکی يوه ثابته شتمني ده. لورينه وکړئ د څو qty جلا قطار وکاروي.
+apps/erpnext/erpnext/controllers/accounts_controller.py +527,"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 +249,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/stock/get_item_details.py +123,Please specify Company,مهرباني وکړئ د شرکت مشخص
 ,Customer Acquisition and Loyalty,پيرودونکو د استملاک او داری
@@ -1772,17 +1791,19 @@
 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 +183,Closing (Opening + Totals),تړل د (+ تول پرانيستل)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),تړل د (+ تول پرانيستل)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,لطفا په شرکت اسعارو مشخص
 DocType: Workstation,Wages per hour,په هر ساعت کې د معاشونو
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +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/controllers/accounts_controller.py +272,Account {0} is invalid. Account Currency must be {1},ګڼون {0} ناباوره دی. حساب د اسعارو باید د {1}
+DocType: Email Digest,Pending Sales Orders,انتظار خرڅلاو امر
+apps/erpnext/erpnext/controllers/accounts_controller.py +275,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 +956,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",د کتارونو تر # {0}: ماخذ لاسوند ډول باید د خرڅلاو نظم یو، خرڅلاو صورتحساب یا ژورنال انفاذ وي
-DocType: Salary Slip,Deduction,مجرايي
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +87,Row {0}: From Time and To Time is mandatory.,د کتارونو تر {0}: له وخت او د وخت فرض ده.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +969,"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 +111,Row {0}: From Time and To Time is mandatory.,د کتارونو تر {0}: له وخت او د وخت فرض ده.
+DocType: Stock Reconciliation Item,Amount Difference,اندازه بدلون
 apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},د قالب بیه لپاره زياته کړه {0} په بیې په لېست کې د {1}
 DocType: Address Template,Address Template,پته کينډۍ
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +7,Please enter Employee Id of this sales person,مهرباني وکړئ او دې د پلورنې کس ته ننوځي د کارګر Id
@@ -1790,7 +1811,7 @@
 DocType: Project,% Tasks Completed,٪ دندې بشپړې شوې
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,توپیر رقم بايد صفر وي
 DocType: Project,Gross Margin,Gross څنډی
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +194,Please enter Production Item first,مهرباني وکړئ لومړی تولید د قالب ته ننوځي
+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,معيوبينو د کارونکي عکس
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,د داوطلبۍ
@@ -1799,53 +1820,54 @@
 DocType: Maintenance Visit,Maintenance User,د ساتنې د کارن
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +149,Cost Updated,لګښت Updated
 DocType: Employee,Date of Birth,د زیږون نیټه
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +86,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},خبرداری: په ضمیمه کی ناسم ایس ایس د سند د {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 +177,Job Description,Job Description
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,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 +126,"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 +127,"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. د ياه، قیمت د روان وساتئ، خرڅلاو نظم او نور له مبارزو ته ورستون د پانګونې کچه معلومه کړي.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +24,Welcome to POS: Create your POS Profile,ته ښه راغلاست POS: ستاسو د POS پيژند جوړول
 DocType: Expense Claim,Approver,Approver
 ,SO Qty,SO Qty
+DocType: Guardian,Work Address,د کار پته
 DocType: Appraisal,Calculate Total Score,ټولې نمرې محاسبه
 DocType: Request for Quotation,Manufacturing Manager,دفابريکي مدير
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},شعبه {0} لاندې ترمړوندونو تضمین دی {1}
+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 +74,Shipments,مالونو
+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 +153,Row # ,د کتارونو تر #
+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 +156,Get From,ترلاسه له
+apps/erpnext/erpnext/public/js/utils.js +167,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 +167,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,اخراجاتو او يا بدلون حساب لپاره د قالب {0} په توګه دا اغیزې په ټولیزه توګه د ونډې ارزښت الزامی دی
-apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings",په قطار د {0} د قالب overbill نه شي کولای {1} څخه زيات {2}. ته overbilling، لطفا په سټاک امستنې جوړ اجازه
+apps/erpnext/erpnext/controllers/accounts_controller.py +419,"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
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} is disabled,کارن {0} معلول دی
 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...,وټاکئ شرکت ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,خالي پريږدئ که د ټولو څانګو په پام کې
 apps/erpnext/erpnext/config/hr.py +171,"Types of employment (permanent, contract, intern etc.).",د کار ډولونه (د دایمي، قرارداد، intern او داسې نور).
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +346,{0} is mandatory for Item {1},{0} لپاره د قالب الزامی دی {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,{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",لطفا په تيروخت کي يو قطار تخصيص مقدار، صورتحساب ډول او صورتحساب شمېر غوره
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,د نوي رانيول لګښت
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},خرڅلاو نظم لپاره د قالب اړتیا {0}
 DocType: Purchase Invoice Item,Rate (Company Currency),کچه (د شرکت د اسعارو)
-apps/erpnext/erpnext/demo/setup_data.py +360,Others,نور
+DocType: Student Guardian,Others,نور
 DocType: Payment Entry,Unallocated Amount,Unallocated مقدار
 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,مالیه او په تور
@@ -1865,17 +1887,16 @@
 apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,Serialized موجودي
 DocType: Activity Type,Default Billing Rate,Default اولګښت Rate
 DocType: Sales Invoice,Total Billing Amount,Total اولګښت مقدار
-apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +54,Receivable Account,ترلاسه اکانټ
-apps/erpnext/erpnext/controllers/accounts_controller.py +546,Row #{0}: Asset {1} is already {2},د کتارونو تر # {0}: د شتمنیو د {1} ده لا د {2}
+apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,ترلاسه اکانټ
+apps/erpnext/erpnext/controllers/accounts_controller.py +549,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 +79,CEO,اجرايوي ريس
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,اجرايوي ريس
 DocType: Expense Claim Detail,Expense Claim Detail,اخراجاتو ادعا تفصیلي
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +808,Please select correct account,لطفا صحيح حساب وټاکئ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +809,Please select correct account,لطفا صحيح حساب وټاکئ
 DocType: Item,Weight UOM,وزن UOM
 DocType: Salary Structure Employee,Salary Structure Employee,معاش جوړښت د کارګر
 DocType: Employee,Blood Group,د وينې ګروپ
-DocType: Purchase Invoice Item,Page Break,Page وقفه
 DocType: Production Order Operation,Pending,په تمه
 DocType: Course,Course Name,کورس نوم
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,هغه کارنان چې کولای شي یو ځانګړي کارکوونکي د رخصتۍ غوښتنلیکونه تصویب
@@ -1884,14 +1905,15 @@
 DocType: Fiscal Year,Companies,د شرکتونو
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,برقی سامانونه
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,د موادو غوښتنه راپورته کړي کله سټاک بیا نظم درجی ته ورسیږي
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Full-time,پوره وخت
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,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: 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,Total راتلونکي ارزښت
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Debit To is required,ډیبیټ ته اړتيا ده
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +321,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,د کیفیت د مدير
@@ -1899,6 +1921,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/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 رسیدونو د نننیو
@@ -1909,18 +1932,17 @@
 DocType: Production Order Operation,Completed Qty,بشپړ Qty
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"For {0}, only debit accounts can be linked against another credit entry",د {0}، يوازې ډیبیټ حسابونو کولای شي د پور بل د ننوتلو په وړاندې سره وتړل شي
 apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,د بیې په لېست {0} معلول دی
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +99,Row {0}: Completed Qty cannot be more than {1} for operation {2},د کتارونو تر {0}: بشپړ Qty نه زيات وي د {1} لپاره عمليات {2}
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +123,Row {0}: Completed Qty cannot be more than {1} for operation {2},د کتارونو تر {0}: بشپړ Qty نه زيات وي د {1} لپاره عمليات {2}
 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,اوسنی ارزښت Rate
 DocType: Item,Customer Item Codes,پيرودونکو د قالب کودونه
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,په بدل کې لاسته راغلې ګټه / له لاسه ورکول
 DocType: Opportunity,Lost Reason,له لاسه دلیل
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,لطفا تشکیلاتو Setup له لارې د حاضرۍ لړ شمېر&gt; شمیرې لړۍ
 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/purchase_receipt/purchase_receipt.py +378,All items have already been invoiced,ټول توکي لا له وړاندې د رسیدونو شوي
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +379,All items have already been invoiced,ټول توکي لا له وړاندې د رسیدونو شوي
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',لطفا &#39;له Case شمیره&#39; مشخص معتبر
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,لا لګښت مرکزونه کولای شي ډلو لاندې کړې خو زياتونې شي غیر ډلو په وړاندې د
 DocType: Project,External,د بهرنيو
@@ -1936,18 +1958,19 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,ستاسو پېرودونکي
 apps/erpnext/erpnext/projects/doctype/project/project.py +141,You have been invited to collaborate on the project: {0},تاسو ته په دغه پروژه کې همکاري بلل شوي دي: {0}
 DocType: Leave Block List Date,Block Date,د بنديز نېټه
-apps/erpnext/erpnext/templates/generators/job_opening.html +19,Apply Now,اوس غوښتنه وکړه
+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 اداره کړي.
 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,ودانۍ
-apps/erpnext/erpnext/utilities/doctype/address/address.py +164,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,نه default پته کينډۍ وموندل. لطفآ د Setup&gt; د چاپونې او د عالمه&gt; پته کينډۍ يو نوی جوړ کړي.
 DocType: Fee Structure,Fee Structure,د فیس جوړښت
 DocType: Timesheet Detail,Costing Amount,لګښت مقدار
+DocType: Student Admission,Application Fee,د غوښتنلیک فیس
 DocType: Process Payroll,Submit Salary Slip,سپارل معاش ټوټه
-apps/erpnext/erpnext/controllers/selling_controller.py +161,Maxiumm discount for Item {0} is {1}%,لپاره د قالب {0} د {1}٪ ده Maxiumm تخفیف
+apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,لپاره د قالب {0} د {1}٪ ده Maxiumm تخفیف
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,په حجم د وارداتو
 DocType: Sales Partner,Address & Contacts,پته او د اړيکې
 DocType: SMS Log,Sender Name,استوونکی نوم
@@ -1972,21 +1995,21 @@
 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_data.py +361,Travel,travel
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +155,No active or default Salary Structure found for employee {0} for the given dates,نه د فعال یا default معاش جوړښت وموندل لپاره کارمند {0} د ورکړل شوې خرما
+apps/erpnext/erpnext/demo/setup/setup_data.py +304,Travel,travel
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +167,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 +23,Update Cost,تازه لګښت
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,تازه لګښت
 DocType: Item Reorder,Item Reorder,د قالب ترمیمي
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +36,Show Salary Slip,انکړپټه ښودل معاش ټوټه
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +748,Transfer Material,د انتقال د موادو
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +53,Show Salary Slip,انکړپټه ښودل معاش ټوټه
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +166,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 +923,Please set recurring after saving,لطفا جوړ ژغورلو وروسته تکراري
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +646,Select change amount account,انتخاب بدلون اندازه حساب
+apps/erpnext/erpnext/public/js/controllers/transaction.js +914,Please set recurring after saving,لطفا جوړ ژغورلو وروسته تکراري
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +703,Select change amount account,انتخاب بدلون اندازه حساب
 DocType: Purchase Invoice,Price List Currency,د اسعارو بیې لېست
 DocType: Naming Series,User must always select,کارن بايد تل انتخاب
 DocType: Stock Settings,Allow Negative Stock,د منفی دحمل اجازه
@@ -1998,31 +2021,32 @@
 DocType: Quality Inspection,Verified By,تایید شوي By
 DocType: Address,Subsidiary,د متمم
 apps/erpnext/erpnext/setup/doctype/company/company.py +64,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.",شرکت د تلواله اسعارو بدل نشي کولای، ځکه هلته موجوده معاملو دي. انتقال باید لغوه شي چې د تلواله د اسعارو بدلون.
+DocType: Grade Interval,Grade Description,ټولګي Description
 DocType: Quality Inspection,Purchase Receipt No,رانيول رسيد نه
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,ارنست د پیسو
 DocType: Process Payroll,Create Salary Slip,معاش ټوټه جوړول
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +33,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 +352,Quantity in row {0} ({1}) must be same as manufactured quantity {2},په قطار مقدار {0} ({1}) بايد په توګه جوړيږي اندازه ورته وي {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Quantity in row {0} ({1}) must be same as manufactured quantity {2},په قطار مقدار {0} ({1}) بايد په توګه جوړيږي اندازه ورته وي {2}
 DocType: Appraisal,Employee,د کارګر
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,په توګه د کارن بلنه
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} د {1} په بشپړه توګه بیل
 DocType: Workstation Working Hour,End Time,د پاي وخت
 DocType: Payment Entry,Payment Deductions or Loss,د پیسو وضع او يا له لاسه ورکول
-apps/erpnext/erpnext/config/schools.py +100,LMS,وزارتونو ته
+apps/erpnext/erpnext/config/schools.py +104,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,خرڅلاو نل
 DocType: Student Batch Student,Student Batch Student,د زده کوونکو د زده کوونکو دسته
-DocType: Sales Invoice,Mass Mailing,د ټوليزو استونې
+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 +199,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/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 +297,Salary Slip of employee {0} already created for this period,د کارکوونکي معاش ټوټه {0} لا په دې موده کې جوړ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Pharmaceutical,Pharmaceutical
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +309,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/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,د اعتبار
@@ -2037,27 +2061,28 @@
 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 +814,Please specify Company to proceed,مهرباني وکړئ د شرکت مشخص چې مخکې لاړ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +793,Please specify Company to proceed,مهرباني وکړئ د شرکت مشخص چې مخکې لاړ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Receivable,په حسابونه ترلاسه خالص د بدلون
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Compensatory Off,د معاوضې پړاو
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,د معاوضې پړاو
 DocType: Quality Inspection Reading,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.,لطفا باوري تاسو په رښتيا غواړئ چې د دې شرکت د ټولو معاملو کې د ړنګولو. ستاسو بادار ارقام به پاتې شي دا. دا عمل ناکړل نه شي.
 DocType: Room,Room Number,کوټه شمېر
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},باطلې مرجع {0} د {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +161,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) د نه په پام کې quanitity څخه ډيره وي ({2}) په تولید نظم {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +162,{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 +217,Raw Materials cannot be blank.,خام مواد نه شي خالي وي.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,"Could not update stock, invoice contains drop shipping item.",کیدای شي سټاک د اوسمهالولو لپاره نه، صورتحساب لرونکی د څاڅکی انتقال توکی.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +460,Quick Journal Entry,د چټک ژورنال انفاذ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +111,You can not change rate if BOM mentioned agianst any item,تاسو نه شي کولای کچه بدلون که هیښ agianst مواد یاد
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +441,"Could not update stock, invoice contains drop shipping item.",کیدای شي سټاک د اوسمهالولو لپاره نه، صورتحساب لرونکی د څاڅکی انتقال توکی.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Quick Journal Entry,د چټک ژورنال انفاذ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +103,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 +214,{0} {1} is not submitted,{0} د {1} نه سپارل
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,لپاره شیان غوښتنې.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,جلا د توليد په موخه به د هر بشپړ ښه توکی جوړ شي.
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +121,{0} must be negative in return document,{0} بايد په بدل کې سند منفي وي
 ,Minutes to First Response for Issues,د مسایل لومړی غبرګون دقيقو
 DocType: Purchase Invoice,Terms and Conditions1,اصطلاحات او Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,د انستیتوت نوم د کوم لپاره چې تاسو دا سيستم د جوړولو.
@@ -2066,16 +2091,17 @@
 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 +398,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 +739,Item or Warehouse for row {0} does not match Material Request,د قالب یا ګدام لپاره چي په کتارونو {0} سمون نه خوري د موادو غوښتنه
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +747,Item or Warehouse for row {0} does not match Material Request,د قالب یا ګدام لپاره چي په کتارونو {0} سمون نه خوري د موادو غوښتنه
 apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,د اندازه کولو واحد
 DocType: Fiscal Year,Year End Date,کال د پای نیټه
 DocType: Task Depends On,Task Depends On,کاري پورې تړلی دی د
-DocType: Lead,Opportunity,فرصت
+DocType: Supplier Quotation,Opportunity,فرصت
 ,Completed Production Orders,بشپړ تولید امر
 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
@@ -2088,7 +2114,7 @@
 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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},د ساتنې د پيل نيټه د شعبه د سپارلو نېټې مخکې نه شي {0}
+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,واقعي د پای نیټه
 DocType: Purchase Invoice,PINV-,PINV-
 DocType: Authorization Rule,Applicable To (Role),د تطبیق وړ د (رول)
@@ -2103,7 +2129,7 @@
 DocType: SMS Log,No of Requested SMS,نه د غوښتل پیغامونه
 DocType: Campaign,Campaign-.####,کمپاين - ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,نور ګامونه
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,Please supply the specified items at the best possible rates,لطفا په ښه کچه د مشخص توکو د رسولو
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +695,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 +117,Contract End Date must be greater than Date of Joining,د قرارداد د پای نیټه باید په پرتله د داخلیدل نېټه ډيره وي
 DocType: Delivery Note,DN-,DN-
@@ -2112,7 +2138,7 @@
 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 +14,This is an example website auto-generated from ERPNext,دا يو مثال ویب پاڼه د Auto-تولید څخه ERPNext
+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
 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.
 
@@ -2139,13 +2165,14 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd مقدار
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +54,Fee Records Created - {0},فیس سوابق ايجاد - {0}
 DocType: Asset Category Account,Asset Category Account,د شتمنیو د حساب کټه ګورۍ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +103,Cannot produce more Item {0} than Sales Order quantity {1},آیا د پلورنې نظم کمیت څخه زیات د قالب {0} د توليد نه {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Stock Entry {0} is not submitted,دحمل {0} د ننوتلو نه سپارل
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},آیا د پلورنې نظم کمیت څخه زیات د قالب {0} د توليد نه {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +505,Stock Entry {0} is not submitted,دحمل {0} د ننوتلو نه سپارل
 DocType: Payment Reconciliation,Bank / Cash Account,بانک / د نقدو پیسو حساب
 DocType: Tax Rule,Billing City,د بیلونو په ښار
 DocType: Salary Component Account,Salary Component Account,معاش برخه اکانټ
 DocType: Global Defaults,Hide Currency Symbol,پټول د اسعارو سمبول
 apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card",د بيلګې په توګه بانک، د نقدو پیسو، کریډیټ کارټ
+DocType: Lead Source,Source Name,سرچینه نوم
 DocType: Journal Entry,Credit Note,اعتبار يادونه
 DocType: Warranty Claim,Service Address,خدمتونو پته
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furnitures and Fixtures,Furnitures او لامپ
@@ -2157,6 +2184,7 @@
 DocType: Opportunity,Customer / Lead Name,پيرودونکو / سوق نوم
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +89,Clearance Date not mentioned,بېلوګډو چاڼېزو نېټه نه ذکر
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,تولید
+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/controllers/trends.py +19,Total(Qty),Total (Qty)
 DocType: Sales Invoice,This Document,دا لاسوند
@@ -2168,15 +2196,15 @@
 DocType: Purchase Receipt,Time at which materials were received,د وخت په کوم توکي ترلاسه کړ
 DocType: Stock Ledger Entry,Outgoing Rate,د تېرې Rate
 apps/erpnext/erpnext/config/hr.py +176,Organization branch master.,سازمان د څانګې د بادار.
-apps/erpnext/erpnext/controllers/accounts_controller.py +273, or ,او یا
+apps/erpnext/erpnext/controllers/accounts_controller.py +276, or ,او یا
 DocType: Sales Order,Billing Status,د بیلونو په حالت
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,یو Issue راپور
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,ټولګټې داخراجاتو
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-پورته
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +203,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,د کتارونو تر # {0}: ژورنال انفاذ {1} نه ګڼون لری {2} يا لا نه خوری بل کوپون پر وړاندې د
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +206,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 +90,No employee for the above selected criteria OR salary slip already created,د پورته انتخاب معیارونه یا معاش ټوټه هیڅ یو کارمند د مخه جوړ
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +93,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,د پیسو ډول
@@ -2204,8 +2232,8 @@
 DocType: Product Bundle,Parent Item,د موروپلار د قالب
 DocType: Account,Account Type,د حساب ډول
 DocType: Delivery Note,DN-RET-,DN-RET-
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +115,Leave Type {0} cannot be carry-forwarded,ډول ووځي {0} شي ترسره-استولې نه
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',د ساتنې او ویش لپاره د ټول سامان د تولید نه. مهرباني وکړی د &#39;تولید مهال ویش&#39; کیکاږۍ
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +118,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 +163,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",لپاره چي په کتارونو {0} د {1}. په قالب کچه {2} شامل دي، د قطارونو په {3} هم باید شامل شي
@@ -2217,13 +2245,13 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +32,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 +748,Delivery,د سپارنې پرمهال
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +742,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,مهم مسوولیت په سیمه
 DocType: Payment Entry,Total Allocated Amount,ټولې پیسې د
 DocType: Item Reorder,Material Request Type,د موادو غوښتنه ډول
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +82,Row {0}: UOM Conversion Factor is mandatory,د کتارونو تر {0}: UOM د تغیر فکتور الزامی دی
+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,لګښت مرکز
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,ګټمنو #
@@ -2234,13 +2262,13 @@
 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 +90,Head of Marketing and Sales,د بازار موندنې او خرڅلاو مشر
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,عايداتو باندې د مالياتو
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,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 له خوا د صنعت ډول ځای شوی.
 DocType: Item Supplier,Item Supplier,د قالب عرضه
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +403,Please enter Item Code to get batch no,لطفا د قالب کوډ داخل ته داځکه تر لاسه نه
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +770,Please select a value for {0} quotation_to {1},لورينه وکړئ د {0} quotation_to د ارزښت ټاکلو {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +397,Please enter Item Code to get batch no,لطفا د قالب کوډ داخل ته داځکه تر لاسه نه
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +764,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",آژانسونو هغه مهال ممکنه ده که لاندې شتمنۍ په دواړو اسنادو يو شان دي. دی ګروپ، د ریښی ډول، د شرکت
@@ -2252,28 +2280,29 @@
 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 +100,Issues,مسایل
+apps/erpnext/erpnext/hooks.py +109,Issues,مسایل
 apps/erpnext/erpnext/controllers/status_updater.py +13,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} معلول دی
 DocType: Supplier,Billing Currency,د بیلونو د اسعارو
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Large,ډېر لوی
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,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 +507,Warning: Another {0} # {1} exists against stock entry {2},خبرداری: بل {0} # {1} سټاک د ننوتلو پر وړاندې د شته {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Local,د محلي
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +508,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),پورونو او پرمختګ (شتمني)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,پوروړو
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Large,لوی
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,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 +225,Total {0} ({1}),Total {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +224,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
@@ -2319,9 +2348,9 @@
 DocType: Attendance,Leave Type,رخصت ډول
 apps/erpnext/erpnext/controllers/stock_controller.py +173,Expense / Difference account ({0}) must be a 'Profit or Loss' account,اخراجاتو / بدلون حساب ({0}) باید یو &#39;ګټه یا زیان&#39; حساب وي
 DocType: Account,Accounts User,جوړوي کارن
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Name error: {0},نوم تېروتنه: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +90,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 +178,{0} {1} does not associated with {2} {3},{0} د {1} سره تړاو نه {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +181,{0} {1} does not associated with {2} {3},{0} د {1} سره تړاو نه {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,د {0} کارمند په ګډون لا د مخه په نښه
 DocType: Packing Slip,If more than one package of the same type (for print),که د همدې ډول له يوه څخه زيات بسته (د چاپي)
 DocType: Warehouse,Parent Warehouse,Parent ګدام
@@ -2340,7 +2369,7 @@
 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,په موخه
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,تيروخت د یوه جنس بايد په بدل کې سند سره منفي کمیت ته داخل شي
+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 +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations",د عملياتو {0} په پرتله په workstation هر موجود کار ساعتونو نور {1}، په څو عملیاتو کې د عملياتو تجزيه
 ,Requested,غوښتنه
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +83,No Remarks,نه څرګندونې
@@ -2352,46 +2381,46 @@
 DocType: Item,Total Projected Qty,ټول پيشبيني Qty
 DocType: Monthly Distribution,Distribution Name,ویش نوم
 DocType: Course,Course Code,کورس کوډ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Quality Inspection required for Item {0},د کیفیت د تفتیش لپاره د قالب اړتیا {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Quality Inspection required for Item {0},د کیفیت د تفتیش لپاره د قالب اړتیا {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,په کوم مشتري د پيسو کچه چې د شرکت د اډې اسعارو بدل
 DocType: Purchase Invoice Item,Net Rate (Company Currency),خالص کچه (د شرکت د اسعارو)
 DocType: Salary Detail,Condition and Formula Help,حالت او فورمول مرسته
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Manage خاوره د ونو.
 DocType: Journal Entry Account,Sales Invoice,خرڅلاو صورتحساب
 DocType: Journal Entry Account,Party Balance,ګوند بیلانس
-apps/erpnext/erpnext/accounts/page/pos/pos.js +475,Please select Apply Discount On,مهرباني غوره Apply کمښت د
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +92,Salary Slip Created,معاش ټوټه ايجاد
+apps/erpnext/erpnext/accounts/page/pos/pos.js +464,Please select Apply Discount On,مهرباني غوره Apply کمښت د
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +95,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,د جوړون د توکو لېږدونه د
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,تخفیف سلنه يا په وړاندې د بیې په لېست کې او یا د ټولو د بیې په لېست کارول کيداي شي.
 DocType: Purchase Invoice,Half-yearly,Half-کلنی
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +384,Accounting Entry for Stock,لپاره دحمل محاسبې انفاذ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +387,Accounting Entry for Stock,لپاره دحمل محاسبې انفاذ
 DocType: Sales Invoice,Sales Team1,خرڅلاو Team1
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,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 +96,Row {0}: Completed Qty must be greater than zero.,د کتارونو تر {0}: بشپړ Qty باید له صفر څخه زیات وي.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +120,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 +88,Row # {0}: Cannot return more than {1} for Item {2},د کتارونو تر # {0}: بېرته نشي څخه زيات {1} لپاره د قالب {2}
+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,ايښودنې په
 DocType: Item Group,Show this slideshow at the top of the page,د پاڼې په سر کې د دې سلاید وښایاست
 DocType: BOM,Item UOM,د قالب UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),د مالیې د مقدار کمښت مقدار وروسته (شرکت د اسعارو)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +147,Target warehouse is mandatory for row {0},هدف ګودام لپاره چي په کتارونو الزامی دی {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,انتخاب عرضه پته
 DocType: Quality Inspection,Quality Inspection,د کیفیت د تفتیش
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Extra Small,اضافي واړه
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,Warning: Material Requested Qty is less than Minimum Order Qty,خبرداری: مادي غوښتل Qty دی لږ تر لږه نظم Qty څخه کم
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +194,Account {0} is frozen,ګڼون {0} ده کنګل
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,اضافي واړه
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +690,Warning: Material Requested Qty is less than Minimum Order Qty,خبرداری: مادي غوښتل Qty دی لږ تر لږه نظم Qty څخه کم
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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 +606,Can only make payment against unbilled {0},يوازې په وړاندې پیسې unbilled {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +126,Commission rate cannot be greater than 100,کمیسیون کچه نه شي کولای په پرتله 100 وي
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +609,Can only make payment against unbilled {0},يوازې په وړاندې پیسې unbilled {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,کمیسیون کچه نه شي کولای په پرتله 100 وي
 DocType: Stock Entry,Subcontract,فرعي
 apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,لطفا {0} په لومړي
 DocType: Production Order Operation,Actual End Time,واقعي د پاي وخت
@@ -2402,30 +2431,30 @@
 DocType: SMS Log,No of Sent SMS,نه د ته وليږدول شوه پیغامونه
 DocType: Account,Expense Account,اخراجاتو اکانټ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,ساوتري
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Colour,رنګ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,رنګ
 DocType: Maintenance Visit,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; او نورو د محصول د بنډل نه شته
 DocType: Student Log,Academic,علمي
-apps/erpnext/erpnext/controllers/accounts_controller.py +469,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Total دمخه ({0}) د ترتیب پر وړاندې د {1} نه شي کولای د Grand ټولو څخه ډيره وي ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +472,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Total دمخه ({0}) د ترتیب پر وړاندې د {1} نه شي کولای د Grand ټولو څخه ډيره وي ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,میاشتنی ویش وټاکئ نا متوازنه توګه په ټول مياشتو هدفونو وویشي.
 DocType: Purchase Invoice Item,Valuation Rate,سنجي Rate
+DocType: Stock Reconciliation,SR/,SR /
 apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,د اسعارو بیې په لېست کې نه ټاکل
 DocType: Assessment,Results,پایلې
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +168,Employee {0} has already applied for {1} between {2} and {3},د کارګر {0} لا د پلي {1} تر منځ د {2} او {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +175,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: Student Applicant,Father's/ Guardian 2 Email ID,د پلار / ګارډین 2 دبرېښنا ليک ID
 DocType: Maintenance Visit Purpose,Against Document No,لاسوند نه وړاندې د
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Manage خرڅلاو همکاران.
 DocType: Quality Inspection,Inspection Type,تفتیش ډول
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +228,Warehouses with existing transaction can not be converted to group.,د موجوده د راکړې ورکړې د ګدامونو د ډلې بدل نه شي.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +231,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 +93,Researcher,څیړونکې
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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.,راتلونکي کیفیت د تفتیش.
@@ -2437,25 +2466,25 @@
 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: Sales Invoice,Advertisement,اعلانونو
 DocType: Asset Category Account,Depreciation Expense Account,د استهالک اخراجاتو اکانټ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Probationary Period,امتحاني دوره
-apps/erpnext/erpnext/hooks.py +102,Announcements,اعلانونه
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,امتحاني دوره
+apps/erpnext/erpnext/hooks.py +111,Announcements,اعلانونه
 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 +109,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 +16,To Datetime,ته Datetime
+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/scheduling_tool/scheduling_tool.py +51,Course Schedules deleted:,کورس ویش ړنګ:
 apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,د SMS د وړاندې کولو او مقام د ساتلو يادښتونه
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,انتظار فعالیتونه
+DocType: Accounts Settings,Make Payment via Journal Entry,ژورنال انفاذ له لارې د پیسو د کمکیانو لپاره
+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 +127,Please enter relieving date.,لطفا کرارولو نیټه.
-apps/erpnext/erpnext/controllers/trends.py +145,Amt,نننیو
+apps/erpnext/erpnext/controllers/trends.py +149,Amt,نننیو
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,Only Leave Applications with status 'Approved' can be submitted,يوازې د حالت &#39;تصویب&#39; کولای وسپارل شي غوښتنلیکونه پريږدئ
 apps/erpnext/erpnext/utilities/doctype/address/address.py +26,Address Title is mandatory.,پته عنوان الزامی دی.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,د کمپاین د نوم ورکړه که د معلوماتو سرچينه ده کمپاین
@@ -2473,14 +2502,15 @@
 apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1},ته د {0} چې د تبادلې نرخ د موندلو توان نلري {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,مارک نيمه ورځ
 DocType: Sales Invoice,Sales Team,خرڅلاو ټيم
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Duplicate entry,دوه ګونو ننوتلو
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,دوه ګونو ننوتلو
 DocType: Program Enrollment Tool,Get Students,زده کوونکي ترلاسه کړئ
 DocType: Serial No,Under Warranty,لاندې ګرنټی
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +490,[Error],[تېروتنه]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +484,[Error],[تېروتنه]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,په کلیمو کې به د ليدو وړ وي. هر کله چې تاسو د خرڅلاو نظم وژغوري.
 ,Employee Birthday,د کارګر کالیزې
 apps/erpnext/erpnext/controllers/status_updater.py +175,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} مخکې نه شتون لري. لطفا د دې زياتونې کې بدلون او بیا کوښښ وکړه.
 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} نه شته
@@ -2496,22 +2526,22 @@
 ,Issued Items Against Production Order,پر وړاندې د تولید نظم خپور شوی توکی
 DocType: Pricing Rule,Purchase Manager,رانيول مدير
 DocType: Target Detail,Target Detail,هدف تفصیلي
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +25,All Jobs,ټول
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,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 +323,Amount {0} {1} {2} {3},مقدار د {0} د {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Amount {0} {1} {2} {3},مقدار د {0} د {1} {2} {3}
 DocType: Account,Depreciation,د استهالک
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),عرضه (s)
 DocType: Employee Attendance Tool,Employee Attendance Tool,د کارګر د حاضرۍ اوزار
 DocType: Supplier,Credit Limit,پورونو د حد
 DocType: Production Plan Sales Order,Salse Order Date,Salse نظم نېټه
 DocType: Salary Component,Salary Component,معاش برخه
-apps/erpnext/erpnext/accounts/utils.py +372,Payment Entries {0} are un-linked,د پیسو توکي {0} دي un-سره تړاو لري
+apps/erpnext/erpnext/accounts/utils.py +449,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,دترلاسه کوونکي پيغام او د پیسو په بشپړه توګه کتل
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +497,Material Requests {0} created,مادي غوښتنې {0} جوړ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +498,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.,د شرایطو یا د قرارداد په کينډۍ.
 DocType: Purchase Invoice,Address and Contact,پته او تماس
@@ -2550,7 +2580,7 @@
 DocType: Serial No,Warranty / AMC Details,ګرنټی / AMC نورولوله
 DocType: Journal Entry,User Remark,کارن تبصره
 DocType: Lead,Market Segment,بازار برخه
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +848,Paid Amount cannot be greater than total negative outstanding amount {0},ورکړل مقدار نه شي کولای ټولو منفي بيالنس مقدار څخه ډيره وي {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +859,Paid Amount cannot be greater than total negative outstanding amount {0},ورکړل مقدار نه شي کولای ټولو منفي بيالنس مقدار څخه ډيره وي {0}
 DocType: Employee Internal Work History,Employee Internal Work History,د کارګر کورني کار تاریخ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +233,Closing (Dr),تړل د (ډاکټر)
 DocType: Cheque Print Template,Cheque Size,آرډر اندازه
@@ -2571,7 +2601,8 @@
 ,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 لغوه.
-apps/erpnext/erpnext/controllers/accounts_controller.py +555,'Update Stock' cannot be checked for fixed asset sale,&#39;تازه سټاک لپاره ثابته شتمني خرڅلاو نه وکتل شي
+DocType: Student Guardian,Father,پلار
+apps/erpnext/erpnext/controllers/accounts_controller.py +558,'Update Stock' cannot be checked for fixed asset sale,&#39;تازه سټاک لپاره ثابته شتمني خرڅلاو نه وکتل شي
 DocType: Bank Reconciliation,Bank Reconciliation,بانک پخلاينې
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,ترلاسه تازه خبرونه
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +132,Material Request {0} is cancelled or stopped,د موادو غوښتنه {0} دی لغوه یا ودرول
@@ -2581,15 +2612,15 @@
 DocType: Sales Order,Fully Delivered,په بشپړه توګه وسپارل شول
 DocType: Lead,Lower Income,ولسي عايداتو
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked",د حساب Liability لاندې مشر، په کوم کې ګټه / له لاسه ورکول به بک شي
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +166,Source and target warehouse cannot be same for row {0},سرچینه او هدف ګودام نه شي لپاره چي په کتارونو ورته وي {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",توپير حساب باید یو د شتمنیو / Liability ډول په پام کې وي، ځکه په دې کې دحمل پخلاينې يو پرانیستل انفاذ دی
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +81,Purchase Order number required for Item {0},نظم لپاره د قالب اړتیا پیري {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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/purchase_receipt/purchase_receipt.py +82,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 +17,Cannot change status as student {0} is linked with student application {1},آیا په توګه د زده کوونکو حالت بدل نه {0} کې د زده کوونکو د غوښتنلیک سره تړاو دی {1}
+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: Timesheet,"List of employee which has ""Salary Slip Based on Timesheet"" is enabled in salary structure.",د معاش د جوړښت د کارمند بشپړفهرست چې &quot;معاش ټوټه پر بنسټ Timesheet&quot; دی فعال شوی.
 DocType: Asset,Fully Depreciated,په بشپړه توګه راکم شو
 ,Stock Projected Qty,دحمل وړاندوینی Qty
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Customer {0} does not belong to project {1},پيرودونکو {0} نه تړاو نه لري د پروژې د {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,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,شعبه او دسته
@@ -2601,7 +2632,7 @@
 DocType: Purchase Invoice,Purchase Taxes and Charges,مالیات او په تور پیري
 ,Qty to Receive,Qty له لاسه
 DocType: Leave Block List,Leave Block List Allowed,پريږدئ بالک بشپړفهرست اجازه
-apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +55,All Warehouses,ټول Warehouses
+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 +105,Credit To account must be a Balance Sheet account,د حساب د پور باید د موازنې د پاڼه په پام کې وي
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,ټول عرضه ډولونه
@@ -2613,10 +2644,10 @@
 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/manufacturing/doctype/bom/bom.js +26,Browse BOM,کتنه د هیښ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,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/asset/depreciation.py +94,Please set Depreciation related Accounts in Asset Category {0} or Company {1},لطفا په شتمنیو کټه ګورۍ {0} یا د شرکت د استهالک اړوند حسابونه جوړ {1}
-DocType: Academic Year,Academic Year,تعلیمي کال
+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,دمراسمو
 DocType: Appraisal,Appraisal,قيمت
@@ -2624,12 +2655,12 @@
 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 +197,Leave approver must be one of {0},approver ووځي باید د یو وي {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,Leave approver must be one of {0},approver ووځي باید د یو وي {0}
 DocType: Hub Settings,Seller Email,پلورونکی دبرېښنا ليک
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Total رانيول لګښت (له لارې رانيول صورتحساب)
 DocType: Workstation Working Hour,Start Time,د پيل وخت
 DocType: Item Price,Bulk Import Help,د حجم د وارداتو مرسته
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +256,Select Quantity,انتخاب مقدار
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +257,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,پيغام ته وليږدول شوه
@@ -2646,6 +2677,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,يا هدف qty يا هدف اندازه فرض ده.
 apps/erpnext/erpnext/config/projects.py +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}
+DocType: Timesheet,Billing Details,د بیلونو په بشپړه توګه کتل
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +149,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}
 DocType: Item,Inspection Required,تفتیش مطلوب
@@ -2665,7 +2697,7 @@
 DocType: Expense Claim,Approval Status,تصویب حالت
 DocType: Hub Settings,Publish Items to Hub,تر مرکزي توکی د خپرېدو
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},له ارزښت باید په پرتله د ارزښت په قطار کمه وي {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Wire Transfer,تار بدلول
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,تار بدلول
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,ټول وګوره
 DocType: Sales Order,Recurring Order,راګرځېدل نظم
 DocType: Company,Default Income Account,Default د عوايدو د حساب
@@ -2677,21 +2709,19 @@
 ,Welcome to ERPNext,ته ERPNext ته ښه راغلاست
 apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,ته د داوطلبۍ سوق
 DocType: Lead,From Customer,له پيرودونکو
-apps/erpnext/erpnext/demo/setup_data.py +357,Calls,غږ
+apps/erpnext/erpnext/demo/setup/setup_data.py +300,Calls,غږ
 DocType: Project,Total Costing Amount (via Time Logs),Total لګښت مقدار (له لارې د وخت کندي)
 DocType: Purchase Order Item Supplied,Stock UOM,دحمل UOM
-apps/erpnext/erpnext/stock/doctype/item/item.py +466,"As there are existing transactions for this item, \
-							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'",ځکه چې د دې توکي، \ تاسو د ارزښتونو بدل نه شي موجوده معاملو دي &#39;لري شعبه&#39;، &#39;لري دسته نشته&#39;، &#39;آيا دحمل د قالب&#39; او &#39;ارزښت Method&#39;
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,Purchase Order {0} is not submitted,پیري نظم {0} نه سپارل
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,وړاندوینی
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},شعبه {0} نه ګدام سره تړاو نه لري {1}
 apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,يادونه: د سیستم به وګورئ نه د رسولو او د-پرواز لپاره د قالب {0} په توګه مقدار يا اندازه ده 0
 DocType: Notification Control,Quotation Message,د داوطلبۍ پيغام
 DocType: Issue,Opening Date,د پرانستلو نېټه
-apps/erpnext/erpnext/schools/api.py +58,Attendance has been marked successfully.,د حاضرۍ په بریالیتوب سره په نښه شوي دي.
+apps/erpnext/erpnext/schools/api.py +57,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 +136,Account Type for {0} must be {1},ګڼون په ډول د {0} بايد د {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +139,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,دواړه ګدام بايد د همدې شرکت پورې اړه لري
@@ -2706,12 +2736,13 @@
 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/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 +20,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 +1190,Please select customer,لطفا د مشتريانو د ټاکلو
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1193,Please select customer,لطفا د مشتريانو د ټاکلو
 DocType: C-Form,I,زه
 DocType: Company,Asset Depreciation Cost Center,د شتمنيو د استهالک لګښت مرکز
 DocType: Sales Order Item,Sales Order Date,خرڅلاو نظم نېټه
@@ -2721,6 +2752,7 @@
 ,Payment Period Based On Invoice Date,د پیسو د دورې پر بنسټ د صورتحساب نېټه
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},د ورکو پیسو د بدلولو د نرخونو او {0}
 DocType: Assessment,Examiner,Examiner
+DocType: Student,Siblings,ورور
 DocType: Journal Entry,Stock Entry,دحمل انفاذ
 DocType: Payment Entry,Payment References,د پیسو ماخذونه
 DocType: C-Form,C-FORM-,C-جوړښت
@@ -2738,11 +2770,12 @@
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,موضوع نوم
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,تيروخت د خرڅالو او يا د خريداري يو باید وټاکل شي
+DocType: Grading Structure,Grade Intervals,ټولګي انټروال
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,د خپلې سوداګرۍ د ماهیت وټاکئ.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,هلته عملیاتو په جوړولو سره کيږي.
 DocType: Asset Movement,Source Warehouse,سرچینه ګدام
 DocType: Installation Note,Installation Date,نصب او نېټه
-apps/erpnext/erpnext/controllers/accounts_controller.py +534,Row #{0}: Asset {1} does not belong to company {2},د کتارونو تر # {0}: د شتمنیو د {1} نه شرکت سره تړاو نه لري {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +537,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,خرڅلاو کارن
@@ -2756,28 +2789,31 @@
 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 +111,Date Of Retirement must be greater than Date of Joining,نېټه د تقاعد باید په پرتله د داخلیدل نېټه ډيره وي
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +49,There were errors while scheduling course on :,غلطيو پر پلانونه جوړوي په داسې حال کې د کورس موجود وو:
 DocType: Sales Invoice,Against Income Account,په وړاندې پر عايداتو باندې حساب
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +87,{0}% Delivered,{0}٪ تحویلوونکی
+apps/erpnext/erpnext/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}: د سپارښتنې qty {1} نه نظم لږ تر لږه qty {2} (په قالب تعریف) په پرتله کمه وي.
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,میاشتنی ویش سلنه
 DocType: Territory,Territory Targets,خاوره موخې
 DocType: Delivery Note,Transporter Info,لېږدول پيژندنه
-apps/erpnext/erpnext/accounts/utils.py +379,Please set default {0} in Company {1},لطفا په شرکت default {0} جوړ {1}
+apps/erpnext/erpnext/accounts/utils.py +456,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,د ناخالصه ګټه / له لاسه ورکول
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,پیري نظم قالب برابر شوي
 apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,د شرکت نوم نه شي کولای د شرکت وي
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,د چاپي کينډۍ لیک مشرانو.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,د چاپي کينډۍ عنوانونه لکه فورمه صورتحساب.
+DocType: Student Guardian,Student Guardian,د زده کونکو د ګارډین
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +184,Valuation type charges can not marked as Inclusive,سنجي ډول تورونه نه په توګه د ټوليزې په نښه کولای شي
 DocType: POS Profile,Update Stock,تازه دحمل
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,لپاره شیان ډول UOM به د ناسم (Total) خالص وزن ارزښت لامل شي. ډاډه کړئ چې د هر توکی خالص وزن په همدې UOM ده.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,هیښ Rate
 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 +349,Journal Entries {0} are un-linked,ژورنال توکي {0} دي un-سره تړاو لري
+apps/erpnext/erpnext/accounts/utils.py +426,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,لطفا په شرکت پړاو پړاو لګښت مرکز یادونه
@@ -2801,6 +2837,7 @@
 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,د ټولنې د بحث فورم
+DocType: Homepage,"URL for ""All Products""",په حافظی د &quot;ټول محصولات د&quot;
 DocType: Leave Application,Leave Balance Before Application,کاریال مخکې له بیلانس څخه ووځي
 DocType: SMS Center,Send SMS,وليږئ پیغامونه
 DocType: Cheque Print Template,Width of amount in word,په کلمه د اندازه پلنوالی
@@ -2809,7 +2846,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 +29,Current Job Openings,اوسنۍ دنده په پرانیستولو
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,Current Job Openings,اوسنۍ دنده په پرانیستولو
 DocType: Company,Stock Adjustment Account,دحمل اصلاحاتو اکانټ
 DocType: Journal Entry,Write Off,ولیکئ پړاو
 DocType: Timesheet Detail,Operation ID,تذکرو د عملياتو
@@ -2822,7 +2859,7 @@
 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 +850,Show tax break-up,خپرونه د ماليې راپرځيدو
+apps/erpnext/erpnext/public/js/controllers/transaction.js +841,Show tax break-up,خپرونه د ماليې راپرځيدو
 apps/erpnext/erpnext/accounts/party.py +308,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} په وړاندې شتون لري، نو تاسو نشی کولای د بيا ورکړی او یا د بدلون لپاره دا
@@ -2832,10 +2869,11 @@
 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 +534,Please select Posting Date before selecting Party,لطفا د ګوند په ټاکلو مخکې نوکرې نېټه وټاکئ
 DocType: Serial No,Out of AMC,د AMC له جملې څخه
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +80,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 +162,Please contact to the user who have Sales Master Manager {0} role,لطفا د کارونکي چې د خرڅلاو ماسټر مدير {0} رول سره اړیکه
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +195,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 +5,This is based on the attendance of this Student,دا د دې د زده کوونکو د ګډون پر بنسټ
@@ -2844,12 +2882,11 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,د سپارنې پرمهال یاداښتونه {0} بايد بندول د دې خرڅلاو نظم مخکې لغوه شي
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +75,Paid amount + Write Off Amount can not be greater than Grand Total,ورکړل اندازه + ولیکئ پړاو مقدار نه شي کولای په پرتله Grand Total ډيره وي
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,{0} is not a valid Batch Number for Item {1},{0} لپاره د قالب یو باوري دسته شمېر نه دی {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +138,Note: There is not enough leave balance for Leave Type {0},نوټ: د اجازه ډول کافي رخصت توازن نه شته {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,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,فرصت ډول
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,نوی شرکت
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,Cost Center is required for 'Profit and Loss' account {0},لګښت د مرکز لپاره د &#39;ګټه او زیان&#39; اړتیا حساب {0}
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,معاملو يوازې د دې شرکت د خالق له خوا ړنګ شي
 apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,د بلونو سره ننوتنې ناسم وموندل شوه. کېدی شي چې تاسو په راکړې ورکړې یو غلط حساب غوره کړي.
 DocType: Cheque Print Template,Cheque Width,آرډر پلنوالي
@@ -2858,16 +2895,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,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 +228,{0} '{1}' is disabled,{0} &#39;{1}&#39; معلول دی
+apps/erpnext/erpnext/controllers/accounts_controller.py +231,{0} '{1}' is disabled,{0} &#39;{1}&#39; معلول دی
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,د ټاکل شويو Open
 DocType: Cheque Print Template,Scanned Cheque,سکن آرډر
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,اتومات بریښنالیکونو ته سپارل معاملو د اړيکې وليږئ.
+DocType: Timesheet,Total Billable Amount,Total Billable مقدار
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,د قالب 3
 DocType: Purchase Order,Customer Contact Email,پيرودونکو سره اړيکي دبرېښنا ليک
 DocType: Warranty Claim,Item and Warranty Details,د قالب او ګرنټی نورولوله
 DocType: Sales Team,Contribution (%),بسپنه)٪ (
-apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,يادونه: د پیسو د داخلولو به راهیسې جوړ نه شي &#39;د نغدي او يا بانک حساب ته&#39; نه مشخص
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Responsibilities,مسؤليتونه
+apps/erpnext/erpnext/controllers/accounts_controller.py +78,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,مسؤليتونه
 DocType: Expense Claim Account,Expense Claim Account,اخراجاتو ادعا اکانټ
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,کينډۍ
 DocType: Sales Person,Sales Person Name,خرڅلاو شخص نوم
@@ -2875,6 +2913,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,کارنان ورزیات کړئ
 DocType: Pricing Rule,Item Group,د قالب ګروپ
 DocType: Item,Safety Stock,د خونديتوب دحمل
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,د قالب کوډ&gt; د قالب ګروپ&gt; دتوليد
 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),مالیه او په تور د ورزیاتولو (شرکت د اسعارو)
@@ -2884,7 +2923,6 @@
 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: Timesheet,Total Hours,Total ساعتونه
 DocType: Journal Entry,Printing Settings,د چاپونې امستنې
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Total Debit must be equal to Total Credit. The difference is {0},Total ګزارې بايد مساوي Total پور وي. د توپير دی {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,مشين
@@ -2897,13 +2935,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,د پانګونې د بانکداري
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +71,Cash or Bank Account is mandatory for making payment entry,د نغدي او يا بانک حساب د تادیاتو لپاره د ننوتلو کولو الزامی دی
 DocType: Purchase Invoice,Price List Exchange Rate,د بیې په لېست د بدلولو نرخ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,پيرودونکو&gt; پيرودونکو ګروپ&gt; خاوره
 DocType: Purchase Invoice Item,Rate,Rate
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Intern,intern
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,intern
 DocType: Stock Entry,From BOM,له هیښ
 DocType: Assessment,Assessment Code,ارزونه کوډ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +32,Basic,د اساسي
+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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',مهرباني وکړی د &#39;تولید مهال ویش&#39; کیکاږۍ
+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 +95,Reference No is mandatory if you entered Reference Date,ماخذ نه فرض ده که تاسو ماخذ نېټه ته ننوتل
@@ -2912,11 +2951,11 @@
 DocType: Salary Slip,Salary Structure,معاش جوړښت
 DocType: Account,Bank,بانک د
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,هوايي شرکت
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +752,Issue Material,Issue مواد
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +723,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 +683,You are in offline mode. You will not be able to reload until you have network.,تاسو په نالیکي اکر کې دي. تاسو به ونه کړای شي تر هغه وخته چې د شبکې لري بيا راولېښئ.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +665,You are in offline mode. You will not be able to reload until you have network.,تاسو په نالیکي اکر کې دي. تاسو به ونه کړای شي تر هغه وخته چې د شبکې لري بيا راولېښئ.
 DocType: Hub Settings,Access Token,د لاسرسي د نښې
 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,پر له پسې ګڼه
@@ -2924,33 +2963,35 @@
 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 +1122,Enter value must be positive,وليکئ ارزښت باید مثبتې وي
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,All Territories,ټول سیمې
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1125,Enter value must be positive,وليکئ ارزښت باید مثبتې وي
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,ټول سیمې
 DocType: Purchase Invoice,Items,توکي
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +23,Student is already enrolled.,د زده کوونکو د مخکې شامل.
 DocType: Fiscal Year,Year Name,کال نوم
 DocType: Process Payroll,Process Payroll,د بهیر د معاشاتو
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,په دې مياشت کاري ورځو څخه زيات د رخصتيو په شتون لري.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +233,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 +96,Request for Quotations,د داوطلبۍ غوښتنه
+apps/erpnext/erpnext/hooks.py +104,Request for Quotations,د داوطلبۍ غوښتنه
 DocType: Payment Reconciliation,Maximum Invoice Amount,اعظمي صورتحساب مقدار
 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; Commodity exchanges
-apps/erpnext/erpnext/stock/doctype/item/item.py +628,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',د variant اندازه Default واحد &#39;{0}&#39; باید په کينډۍ ورته وي &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',د variant اندازه Default واحد &#39;{0}&#39; باید په کينډۍ ورته وي &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,محاسبه په اساس
 DocType: Delivery Note Item,From Warehouse,له ګدام
 DocType: Assessment,Supervisor Name,څارونکي نوم
+DocType: Assessment,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,کارن رانيول
 DocType: Notification Control,Customize the Notification,د خبرتیا دتنظيمولو
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Cash Flow from Operations,له عملیاتو په نقدو پیسو د جریان
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,Default پته کينډۍ نه ړنګ شي
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,Default پته کينډۍ نه ړنګ شي
 DocType: Sales Invoice,Shipping Rule,انتقال حاکمیت
 DocType: Manufacturer,Limited to 12 characters,محدود تر 12 تورو
 DocType: Journal Entry,Print Heading,چاپ Heading
@@ -2965,8 +3006,8 @@
 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/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,يا هدف qty يا هدف اندازه فرض ده
-apps/erpnext/erpnext/stock/get_item_details.py +485,No default BOM exists for Item {0},نه default هیښ لپاره د قالب موجود {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +336,Please select Posting Date first,مهرباني وکړئ لومړی انتخاب نوکرې نېټه
+apps/erpnext/erpnext/stock/get_item_details.py +486,No default BOM exists for Item {0},نه default هیښ لپاره د قالب موجود {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +326,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,د موجوده معاملو لګښت مرکز بدل نه شي چې د پنډو
@@ -2982,6 +3023,7 @@
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,سره صورتحساب لوبه د پیسو ورکړه
 DocType: Journal Entry,Bank Entry,بانک د داخلولو
 DocType: Authorization Rule,Applicable To (Designation),د تطبیق وړ د (دنده)
+,Profitability Analysis,دګټي تحلیل
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,کارټ ته یی اضافه کړه
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,ډله په
 DocType: Guardian,Interests,د ګټو
@@ -2994,21 +3036,21 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,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 +141,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Serialized د قالب {0} \ دحمل پخلاينې په کارولو سره تازه نه شي
 DocType: Scheduling Tool,Day,ورځ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,نوی شعبه نه شي ګدام لري. ګدام باید د سټاک انفاذ يا رانيول رسيد جوړ شي
 DocType: Lead,Lead Type,سرب د ډول
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,You are not authorized to approve leaves on Block Dates,تاسو اختيار نه لري چې پر بالک نیټی پاڼو تصویب
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,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 د موادو غوښتنه ډول
-DocType: Student Applicant,AP.,AP.
 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 +639,Point of Sale,د دخرسون ټکی
+apps/erpnext/erpnext/accounts/page/pos/pos.js +634,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,د مالياتو
 DocType: Production Planning Tool,Production Planning Tool,تولید پلان جوړونې وسيله:
@@ -3017,74 +3059,77 @@
 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 +373,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 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 Profile,Customer Group,پيرودونکو ګروپ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,Expense account is mandatory for item {0},اخراجاتو حساب لپاره توکی الزامی دی {0}
 DocType: Item,Website Description,وېب پاڼه Description
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date must be on or after today,بل د استهالک نېټه باید یا نن وروسته وي
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,په مساوات خالص د بدلون
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +145,Please cancel Purchase Invoice {0} first,لطفا لغوه رانيول صورتحساب {0} په لومړي
 DocType: Serial No,AMC Expiry Date,AMC د پای نېټه
 ,Sales Register,خرڅلاو د نوم ثبتول
 DocType: Quotation,Quotation Lost Reason,د داوطلبۍ ورک دلیل
+apps/erpnext/erpnext/utilities/doctype/address/address.py +164,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,نه default پته کينډۍ وموندل. لطفآ د Setup&gt; د چاپونې او د عالمه&gt; پته کينډۍ يو نوی جوړ کړي.
 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 +330,Transaction reference no {0} dated {1},د راکړې ورکړې اشاره نه {0} د میاشتې په {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Transaction reference no {0} dated {1},د راکړې ورکړې اشاره نه {0} د میاشتې په {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,هيڅ د سمولو لپاره شتون لري.
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,Summary for this month and pending activities,لنډيز لپاره د دې مياشتې او په تمه فعالیتونو
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,لنډيز لپاره د دې مياشتې او په تمه فعالیتونو
 DocType: Customer Group,Customer Group Name,پيرودونکو ډلې نوم
 apps/erpnext/erpnext/public/js/financial_statements.js +54,Cash Flow Statement,نقدو پیسو د جریان اعلامیه
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Please remove this Invoice {0} from C-Form {1},لطفا لرې دې صورتحساب {0} څخه C-فورمه {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Please remove this Invoice {0} from C-Form {1},لطفا لرې دې صورتحساب {0} څخه C-فورمه {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,مهرباني غوره مخ په وړاندې ترسره کړي که تاسو هم غواړي چې عبارت دي د تېر مالي کال د توازن د دې مالي کال ته روان شو
 DocType: GL Entry,Against Voucher Type,په وړاندې د ګټمنو ډول
 DocType: Item,Attributes,صفات
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +644,Get Items,توکي ترلاسه کړئ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +623,Get Items,توکي ترلاسه کړئ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +210,Please enter Write Off Account,لطفا حساب ولیکئ پړاو
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,تېره نظم نېټه
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +41,Account {0} does not belongs to company {1},ګڼون {0} کوي شرکت ته نه پورې {1}
+DocType: Student,Guardian Details,د ګارډین په بشپړه توګه کتل
 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,پلان د پیل نیټه
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,Customer is required against Receivable account {0},پيرودونکو ده ترلاسه ګڼون په وړاندې د اړتيا {0}
 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 +265,Project-wise data is not available for Quotation,د پروژې-هوښيار معلوماتو لپاره د داوطلبۍ شتون نه لري
+apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,د پروژې-هوښيار معلوماتو لپاره د داوطلبۍ شتون نه لري
 DocType: Project,Expected End Date,د تمی د پای نیټه
 DocType: Budget Account,Budget Amount,د بودجې د مقدار
 DocType: Appraisal Template,Appraisal Template Title,ارزونې کينډۍ عنوان
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,Commercial,سوداګریز
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,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 +648,Row {0}# Account must be of type 'Fixed Asset',د کتارونو تر {0} # حساب بايد د ډول وي شتمن &#39;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,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 +30,Series is mandatory,لړۍ الزامی دی
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +50,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}
 DocType: Leave Allocation,Unused leaves,ناکارېدلې پاڼي
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Cr,CR
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Cr,CR
 DocType: Tax Rule,Billing State,د بیلونو د بهرنیو چارو
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +250,Transfer,د انتقال د
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +187,{0} {1} does not associated with Party Account {2},{0} د {1} سره ګوند حساب تړاو نه {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,Fetch exploded BOM (including sub-assemblies),چاودنه هیښ (فرعي شوراګانو په ګډون) د راوړلو
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +254,Transfer,د انتقال د
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +190,{0} {1} does not associated with Party Account {2},{0} د {1} سره ګوند حساب تړاو نه {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +796,Fetch exploded BOM (including sub-assemblies),چاودنه هیښ (فرعي شوراګانو په ګډون) د راوړلو
 DocType: Authorization Rule,Applicable To (Employee),د تطبیق وړ د (کارکوونکی)
-apps/erpnext/erpnext/controllers/accounts_controller.py +115,Due Date is mandatory,له امله نېټه الزامی دی
+apps/erpnext/erpnext/controllers/accounts_controller.py +118,Due Date is mandatory,له امله نېټه الزامی دی
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,د خاصې لپاره بهرمن {0} 0 نه شي
 DocType: Journal Entry,Pay To / Recd From,د / Recd له ورکړي
 DocType: Naming Series,Setup Series,Setup لړۍ
 DocType: Payment Reconciliation,To Invoice Date,ته صورتحساب نېټه
 DocType: Supplier,Contact HTML,د تماس د HTML
 ,Inactive Customers,ناچارنده پېرودونکي
+DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,معاملو رانيول
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,څنګه د بیې د حاکمیت د اجرا وړ ده؟
 DocType: Quality Inspection,Delivery Note No,د سپارنې پرمهال يادونه نه
@@ -3093,7 +3138,7 @@
 DocType: Company,Retail,پرچون
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +120,Customer {0} does not exist,پيرودونکو {0} نه شته
 DocType: Attendance,Absent,غیرحاضر
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +587,Product Bundle,د محصول د بنډل
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Product Bundle,د محصول د بنډل
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Invalid reference {1},د کتارونو تر {0}: ناسم مرجع {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,پیري مالیات او په تور کينډۍ
 DocType: Upload Attendance,Download Template,دانلود کينډۍ
@@ -3103,8 +3148,8 @@
 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 +742,Send Supplier Emails,عرضه برېښناليک وليږئ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +104,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",معاش لا د تر منځ د {0} او {1}، پريږدئ درخواست موده دې نېټې لړ تر منځ نه وي موده پروسس.
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +708,Send Supplier Emails,عرضه برېښناليک وليږئ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,"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,د ګارډین په زړه پوري
 DocType: Timesheet,Employee Detail,د کارګر تفصیلي
@@ -3115,9 +3160,9 @@
 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,وټې &amp; Deduction
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +77,Account {0} cannot be a Group,ګڼون {0} نه شي کولای د يو ګروپ وي
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} cannot be a Group,ګڼون {0} نه شي کولای د يو ګروپ وي
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +31,Optional. This setting will be used to filter in various transactions.,اختیاري. دا امستنې به په بېلا بېلو معاملو چاڼ وکارول شي.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +107,Negative Valuation Rate is not allowed,منفي ارزښت Rate اجازه نه وي
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,منفي ارزښت Rate اجازه نه وي
 DocType: Holiday List,Weekly Off,د اونۍ پړاو
 DocType: Fiscal Year,"For e.g. 2012, 2012-13",د بيلګې په توګه د 2012 کال، 2012-13
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +39,Provisional Profit / Loss (Credit),مؤقت ګټه / زیان (اعتبار)
@@ -3131,16 +3176,16 @@
 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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} د {1}: لګښت لپاره مرکز د قالب الزامی دی {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +626,Get Items from Product Bundle,څخه د محصول د بنډل توکي ترلاسه کړئ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +605,Get Items from Product Bundle,څخه د محصول د بنډل توکي ترلاسه کړئ
 DocType: Asset,Straight Line,سیده کرښه
 DocType: Project User,Project User,د پروژې د کارن
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} is inactive,ګڼون {0} ده ناچارنده
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} is inactive,ګڼون {0} ده ناچارنده
 DocType: GL Entry,Is Advance,ده پرمختللی
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,د حاضرۍ له تاريخ او د حاضرۍ ته د نېټه الزامی دی
 apps/erpnext/erpnext/controllers/buying_controller.py +148,Please enter 'Is Subcontracted' as Yes or No,لطفا &#39;د دې لپاره قرارداد&#39; په توګه هو یا نه
 DocType: Sales Team,Contact No.,د تماس شمیره
 DocType: Bank Reconciliation,Payment Entries,د پیسو توکي
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,'Profit and Loss' type account {0} not allowed in Opening Entry,&#39;ګټه او زیان&#39; ډول حساب {0} په انفاذ پرانيستل اجازه نه
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +71,'Profit and Loss' type account {0} not allowed in Opening Entry,&#39;ګټه او زیان&#39; ډول حساب {0} په انفاذ پرانيستل اجازه نه
 DocType: Program Enrollment Tool,Get Students From,زده کونکي له ترلاسه کړئ
 DocType: Hub Settings,Seller Country,پلورونکی هېواد
 apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,په وېب پاڼه د خپرېدو لپاره توکي
@@ -3159,7 +3204,7 @@
 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,د ارزښت / Description
-apps/erpnext/erpnext/controllers/accounts_controller.py +558,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",د کتارونو تر # {0}: د شتمنیو د {1} نه شي وړاندې شي، دا لا دی {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +561,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",د کتارونو تر # {0}: د شتمنیو د {1} نه شي وړاندې شي، دا لا دی {2}
 DocType: Tax Rule,Billing Country,د بیلونو د هېواد
 DocType: Production Order,Expected Delivery Date,د تمی د سپارلو نېټه
 apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,ډیبیټ او اعتبار د {0} # مساوي نه {1}. توپير دی {2}.
@@ -3172,13 +3217,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +202,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: Sales Order,% Amount Billed,٪ بیل د
+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 وي که چېرې تاسو د دې وګورئ.
 apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},سره سریال نه نه د قالب {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,د پرانستې د خبرتیا
+DocType: Email Digest,Open Notifications,د پرانستې د خبرتیا
 DocType: Payment Entry,Difference Amount (Company Currency),توپیر رقم (شرکت د اسعارو)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,مستقیم لګښتونه
 apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
@@ -3186,7 +3231,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,نوي پېرېدونکي د عوایدو
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,د سفر لګښت
 DocType: Maintenance Visit,Breakdown,د ماشین یا د ګاډي ناڅاپه خرابېدل
-apps/erpnext/erpnext/controllers/accounts_controller.py +634,Account: {0} with currency: {1} can not be selected,ګڼون: {0} سره اسعارو: {1} غوره نه شي
+apps/erpnext/erpnext/controllers/accounts_controller.py +637,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}
 DocType: Program Enrollment Tool,Student Applicants,د زده کونکو د درخواست
@@ -3194,15 +3239,15 @@
 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 +56,Probation,تعليقي
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Probation,تعليقي
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,معاش د اجزاو
 DocType: Program Enrollment Tool,New Academic Year,د نوي تعليمي کال د
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Payment of salary for the month {0} and year {1},په دې مياشت کې د معاش د ورکړې {0} او کال {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Payment of salary for the month {0} and year {1},په دې مياشت کې د معاش د ورکړې {0} او کال {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,کړکېو کې درج د بیې په لېست کچه که ورک
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,ټولې ورکړل شوې پیسې د
 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 +144,Planning,د پلان
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,د پلان
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,صادر شوی
 DocType: Project,Total Billing Amount (via Time Logs),Total اولګښت مقدار (له لارې د وخت کندي)
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,We sell this Item,موږ د دې توکي وپلوري
@@ -3215,11 +3260,10 @@
 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/accounts/page/pos/pos.js +1376,Sales invoice submitted sucessfully.,خرڅلاو صورتحساب وړاندې sucessfully.
 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}
 DocType: Assessment Result,Student Name,د زده کوونکو نوم
-apps/erpnext/erpnext/hooks.py +104,Assessment Schedule,ارزونه ويش
+apps/erpnext/erpnext/hooks.py +113,Assessment Schedule,ارزونه ويش
 DocType: Brand,Item Manager,د قالب مدير
 DocType: Buying Settings,Default Supplier Type,Default عرضه ډول
 DocType: Production Order,Total Operating Cost,Total عملياتي لګښت
@@ -3229,6 +3273,7 @@
 DocType: GL Entry,Party Type,ګوند ډول
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +78,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,Max ورځې د وتلو اجازه ورکړي
@@ -3240,18 +3285,19 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,ته د ياه یا پېرېدونکي له قوله.
 DocType: Stock Settings,Role Allowed to edit frozen stock,رول اجازه کنګل سټاک د سمولو
 ,Territory Target Variance Item Group-Wise,خاوره د هدف وړ توپیر د قالب ګروپ تدبيراومصلحت
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Customer Groups,ټول پيرودونکو ډلې
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +78,Accumulated Monthly,جمع میاشتنی
-apps/erpnext/erpnext/controllers/accounts_controller.py +595,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} الزامی دی. ښايي د پیسو د بدلولو ریکارډ نه د {1} د {2} جوړ.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,ټول پيرودونکو ډلې
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +81,Accumulated Monthly,جمع میاشتنی
+apps/erpnext/erpnext/controllers/accounts_controller.py +598,{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} نه شته
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),د بیې په لېست کچه (د شرکت د اسعارو)
 DocType: Products Settings,Products Settings,محصوالت امستنې
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +188,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,لطفا د جوړولو لپاره {0} Setup&gt; امستنې له لارې&gt; نومول لړۍ لړۍ نوم
 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 +84,Secretary,منشي
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,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,د خريداري
@@ -3260,24 +3306,22 @@
 ,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,ارزونه نوم
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,د کتارونو تر # {0}: شعبه الزامی دی
+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 +859,Supplier Quotation,عرضه کوونکي د داوطلبۍ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +838,Supplier Quotation,عرضه کوونکي د داوطلبۍ
 DocType: Quotation,In Words will be visible once you save the Quotation.,په کلیمو کې به د ليدو وړ وي. هر کله چې تاسو د داوطلبۍ وژغوري.
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +7,Collect Fees,فیس راټول
+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}
 DocType: Lead,Add to calendar on this date,په دې نېټې جنتري ورزیات کړئ
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,د زياته کړه لېږد لګښتونه اصول.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,راتلونکې پېښې
 DocType: Item,Opening Stock,پرانيستل دحمل
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,پيرودونکو ته اړتيا ده
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} د بیرته ستنیدلو لپاره جبري دی
 DocType: Purchase Order,To Receive,تر لاسه
 apps/erpnext/erpnext/public/js/setup_wizard.js +195,user@example.com,user@example.com
-DocType: Email Digest,Income / Expense,پر عايداتو / اخراجاتو
 DocType: Employee,Personal Email,د شخصي ليک
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Total توپیر
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.",که چېرې توانول شوی، دا سيستم به د محاسبې زياتونې لپاره د انبار په اتوماتيک ډول وروسته.
@@ -3288,13 +3332,14 @@
 DocType: Customer,From Lead,له کوونکۍ
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,امر د تولید لپاره د خوشې شول.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,مالي کال لپاره وټاکه ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,POS Profile required to make POS Entry,POS د پېژندنې اړتيا ته POS انفاذ لپاره
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +509,POS Profile required to make POS Entry,POS د پېژندنې اړتيا ته POS انفاذ لپاره
 DocType: Program Enrollment Tool,Enroll Students,زده کوونکي شامل کړي
 DocType: Hub Settings,Name Token,نوم د نښې
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,معياري پلورل
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Atleast one warehouse is mandatory,تيروخت يو ګودام الزامی دی
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +129,Atleast one warehouse is mandatory,تيروخت يو ګودام الزامی دی
 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 +330,{0} against Sales Invoice {1},{0} خرڅلاو صورتحساب په وړاندې د {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,د پروژې نوم
@@ -3315,10 +3360,11 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,پاڼي باید د 0.5 ګونی ځانګړي شي
 DocType: Production Order,Operation Cost,د عملياتو لګښت
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,له .csv د دوتنې پورته کول د حاضرۍ
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,بيالنس نننیو
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,ټولګې اهدافو د قالب ګروپ-هوښيار د دې خرڅلاو شخص.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],د يخبندان په ډیپو کې د زړو څخه [ورځې]
-apps/erpnext/erpnext/controllers/accounts_controller.py +528,Row #{0}: Asset is mandatory for fixed asset purchase/sale,د کتارونو تر # {0}: د شتمنیو لپاره ثابته شتمني د اخیستلو / خرڅلاو الزامی دی
+apps/erpnext/erpnext/controllers/accounts_controller.py +531,Row #{0}: Asset is mandatory for fixed asset purchase/sale,د کتارونو تر # {0}: د شتمنیو لپاره ثابته شتمني د اخیستلو / خرڅلاو الزامی دی
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.",که دوه يا زيات د بیې اصول دي د پورته شرايطو پر بنسټ وموندل شول، د لومړيتوب په توګه استعماليږي. د لومړیتوب دا دی چې 20 0 تر منځ د یو شمیر داسې حال کې تلواله ارزښت صفر ده (تش). د لوړو شمېر معنی چې که له هماغه حالت ته څو د بیو اصول شته دي دا به د لمړيتوب حق واخلي.
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,مالي کال: {0} نه شتون
 DocType: Currency Exchange,To Currency,د پیسو د
@@ -3335,15 +3381,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,د خصوصي مساوات
 DocType: Maintenance Visit,Customer Feedback,پيرودونکو Feedback
 DocType: Account,Expense,اخراجاتو
-DocType: Sales Invoice,Exhibition,نندارتون
 apps/erpnext/erpnext/utilities/doctype/address/address.py +77,"Company is mandatory, as it is your company address",د شرکت د اجباری دی، ځکه چې دا له خپل شرکت پته
 DocType: Item Attribute,From Range,له Range
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +81,Syntax error in formula or condition: {0},په فورمول يا حالت العروض تېروتنه: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +92,Syntax error in formula or condition: {0},په فورمول يا حالت العروض تېروتنه: {0}
 apps/erpnext/erpnext/stock/utils.py +99,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 +28,Jobs,دندې
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,دندې
 ,Sales Order Trends,خرڅلاو نظم رجحانات
 DocType: Employee,Held On,جوړه
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,د توليد د قالب
@@ -3352,16 +3398,16 @@
 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 +763,Make Supplier Quotation,عرضه د داوطلبۍ د کمکیانو لپاره
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,Make Supplier Quotation,عرضه د داوطلبۍ د کمکیانو لپاره
 DocType: Quality Inspection,Incoming,راتلونکي
 DocType: BOM,Materials Required (Exploded),د توکو ته اړتیا ده (چاودنه)
 apps/erpnext/erpnext/public/js/setup_wizard.js +185,"Add users to your organization, other than yourself",کارنان ستاسو د سازمان په پرتله خپل ځان د نورو ورزیات کړئ،
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,Row # {0}: Serial No {1} does not match with {2} {3},د کتارونو تر # {0}: شعبه {1} سره سمون نه خوري {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +42,Casual Leave,واله ته لاړل
+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,واله ته لاړل
 DocType: Batch,Batch ID,دسته ID
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,Note: {0},یادونه: {0}
 ,Delivery Note Trends,د سپارنې پرمهال يادونه رجحانات
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +103,This Week's Summary,دا اونۍ د لنډيز
+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} يوازې دحمل معاملې له لارې تازه شي
 DocType: Student Group Creation Tool,Get Courses,کورسونه ترلاسه کړئ
 DocType: GL Entry,Party,ګوند
@@ -3371,7 +3417,7 @@
 DocType: Request for Quotation Item,Request for Quotation Item,لپاره د داوطلبۍ د قالب غوښتنه
 DocType: Purchase Order,To Bill,ته بیل
 DocType: Material Request,% Ordered,٪ د سپارښتنې
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Piecework,Piecework
+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
 DocType: Task,Actual Time (in Hours),واقعي وخت (په ساعتونه)
 DocType: Employee,History In Company,تاریخ په شرکت
@@ -3388,7 +3434,7 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +350,{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 +162,Black,تور
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,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} توکو توليد
@@ -3399,13 +3445,13 @@
 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),Total اخراجاتو ادعا (اخراجاتو ادعا له لارې)
-apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +69,Customer Id,پيرودونکو Id
+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,مارک حاضر
 DocType: Journal Entry Account,Exchange Rate,د بدلولو نرخ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Sales Order {0} is not submitted,خرڅلاو نظم {0} نه سپارل
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +527,Sales Order {0} is not submitted,خرڅلاو نظم {0} نه سپارل
 DocType: Homepage,Tag Line,Tag کرښې
 DocType: Fee Component,Fee Component,فیس برخه
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +857,Add items from,Add له توکي
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +836,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}
 DocType: Cheque Print Template,Regular,منظم
 DocType: BOM,Last Purchase Rate,تېره رانيول Rate
@@ -3413,6 +3459,7 @@
 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} راهیسې د بېرغونو لري
 ,Sales Person-wise Transaction Summary,خرڅلاو شخص-هوښيار معامالتو لنډيز
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +60,Cost Center is required for 'Profit and Loss' account {0}. Please set up a default Cost Center for the Company.,لګښت د مرکز لپاره د &#39;ګټه او زیان&#39; ګڼون {0} ته اړتيا لري. لطفا يو default لپاره د دې شرکت د لګښت مرکز جوړ.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,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,میاشتنی ویش فيصدۍ
@@ -3423,12 +3470,12 @@
 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 +710,Online,په آنلاین توګه
+apps/erpnext/erpnext/accounts/page/pos/pos.js +692,Online,په آنلاین توګه
 ,Available Stock for Packing Items,د ت توکي موجود دحمل
 DocType: Item Variant,Item Variant,د قالب variant
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,د خوښو دې پته په توګه default کينډۍ ځکه هلته د ده د نورو default نه
+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 نه
 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 +74,Quality Management,د کیفیت د مدیریت
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,د کیفیت د مدیریت
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,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,د کارګر د بهرنيو کار تاریخ
@@ -3450,11 +3497,12 @@
 DocType: Student,Student Email ID,د زده کونکو د ليک ID
 DocType: Employee,Notice (days),خبرتیا (ورځې)
 DocType: Tax Rule,Sales Tax Template,خرڅلاو د مالياتو د کينډۍ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1520,Select items to save the invoice,توکي چې د صورتحساب د ژغورلو وټاکئ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1544,Select items to save the invoice,توکي چې د صورتحساب د ژغورلو وټاکئ
 DocType: Employee,Encashment Date,د ورکړې نېټه
 DocType: Account,Stock Adjustment,دحمل اصلاحاتو
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Default فعالیت لګښت لپاره د فعالیت ډول شتون لري - {0}
 DocType: Production Order,Planned Operating Cost,پلان عملياتي لګښت
+DocType: Academic Term,Term Start Date,اصطلاح د پیل نیټه
 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,متقاضي نوم
@@ -3484,17 +3532,17 @@
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,د ګودام (دايمي موجودي) حساب به د دې حساب له مخې جوړ شي.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +119,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,ګدام په توګه د دې ګودام سټاک د پنډو ننوتلو شتون نه ړنګ شي.
 DocType: Company,Distribution,ویش
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +8,Amount Paid,پيسې ورکړل شوې
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Project Manager,پروژې سمبالګر
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,پيسې ورکړل شوې
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,پروژې سمبالګر
 ,Quoted Item Comparison,له خولې د قالب پرتله
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Dispatch,چلاونه د
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,چلاونه د
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,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.,رول چې اجازه راکړه ورکړه چې د پور د حدودو ټاکل تجاوز ته وړاندې کړي.
-DocType: Sales Invoice,Supplier Reference,عرضه ماخذ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +844,"Master data syncing, it might take some time",د بادار د معلوماتو syncing، دا به يو څه وخت ونيسي
+apps/erpnext/erpnext/accounts/page/pos/pos.js +832,"Master data syncing, it might take some time",د بادار د معلوماتو syncing، دا به يو څه وخت ونيسي
 DocType: Item,Material Issue,مادي Issue
 DocType: Hub Settings,Seller Description,پلورونکی Description
 DocType: Employee Education,Qualification,وړتوب
@@ -3508,7 +3556,7 @@
 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 +83,Error in formula or condition,په فورمول یا حالت کې تېروتنه
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,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,څلورڅنډی په ټولو
@@ -3517,7 +3565,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},ته نېټه بايد د مالي کال په چوکاټ کې وي. د نېټه فرض = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc",دلته تاسو د قد، وزن، الرجی، طبي اندېښنې او نور وساتي
 DocType: Leave Block List,Applies to Company,د دې شرکت د تطبيق وړ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +197,Cannot cancel because submitted Stock Entry {0} exists,لغوه نه شي کولای، ځکه وړاندې دحمل انفاذ {0} شتون لري
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +198,Cannot cancel because submitted Stock Entry {0} exists,لغوه نه شي کولای، ځکه وړاندې دحمل انفاذ {0} شتون لري
 DocType: Purchase Invoice,In Words,په وييکي
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,Today is {0}'s birthday!,نن د {0} د زوکړې ورځ!
 DocType: Production Planning Tool,Material Request For Warehouse,د موادو غوښتنه د ګدام
@@ -3527,14 +3575,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,ستاسو د مالي کال د پیل په
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,د شتمنیو Depreciations او انډول.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +319,Amount {0} {1} transferred from {2} to {3},مقدار د {0} د {1} څخه انتقال {2} د {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +322,Amount {0} {1} transferred from {2} to {3},مقدار د {0} د {1} څخه انتقال {2} د {3}
 DocType: Sales Invoice,Get Advances Received,ترلاسه کړئ پرمختګونه تر لاسه کړي
 DocType: Email Digest,Add/Remove Recipients,Add / اخیستونکو کړئ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +432,Transaction not allowed against stopped Production Order {0},د راکړې ورکړې ودرول تولید په وړاندې د نه اجازه نظم {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +437,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 +143,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 +652,Item variant {0} exists with same attributes,د قالب variant {0} سره ورته صفاتو شتون
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,د قالب variant {0} سره ورته صفاتو شتون
+DocType: Leave Application,LAP/,دورو /
 DocType: Salary Slip,Salary Slip,معاش ټوټه
 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; ته اړتيا ده
@@ -3542,12 +3591,12 @@
 DocType: Sales Invoice Item,Sales Order Item,خرڅلاو نظم قالب
 DocType: Salary Slip,Payment Days,د پیسو ورځې
 DocType: Customer,Dormant,د استراحت په
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +212,Warehouses with child nodes cannot be converted to ledger,سره د ماشومانو د غوټو ګودامونه بدل نه شي چې د پنډو
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +215,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/public/js/controllers/transaction.js +866,It is needed to fetch Item Details.,دا ته اړتيا ده، د قالب نورولوله راوړي.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +857,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} لا ترلاسه شوي دي
@@ -3557,14 +3606,14 @@
 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 +178,Invalid {0},باطلې {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Sick Leave,ناروغ ته لاړل
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,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,مغازو
 DocType: Warehouse,PIN,PIN
 DocType: Sales Invoice,Base Change Amount (Company Currency),اډه د بدلون مقدار (شرکت د اسعارو)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +313,No accounting entries for the following warehouses,د لاندې زېرمتونونه د محاسبې نه زياتونې
-apps/erpnext/erpnext/projects/doctype/project/project.js +102,Save the document first.,لومړی سند وژغورۍ.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +314,No accounting entries for the following warehouses,د لاندې زېرمتونونه د محاسبې نه زياتونې
+apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,لومړی سند وژغورۍ.
 DocType: Account,Chargeable,Chargeable
 DocType: Company,Change Abbreviation,د بدلون Abbreviation
 DocType: Expense Claim Detail,Expense Date,اخراجاتو نېټه
@@ -3577,10 +3626,9 @@
 DocType: Purchase Invoice,Recurring Print Format,راګرځېدل چاپ شکل
 DocType: C-Form,Series,لړۍ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,Expected Delivery Date cannot be before Purchase Order Date,د تمی د سپارلو نېټه مخکې د اخستلو امر نېټه نه شي
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,لطفا د جوړولو لپاره {0} Setup&gt; امستنې له لارې&gt; نومول لړۍ لړۍ نوم
 DocType: Appraisal,Appraisal Template,ارزونې کينډۍ
 DocType: Item Group,Item Classification,د قالب طبقه
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Business Development Manager,کاروبار انکشاف مدير
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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,له بلونو
@@ -3590,8 +3638,8 @@
 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 +940,Please select {0} first,مهرباني غوره {0} په لومړي
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +749,Batch {0} of Item {1} has expired.,دسته {0} د قالب {1} تېر شوی دی.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +953,Please select {0} first,مهرباني غوره {0} په لومړي
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +757,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,پاسنۍ
@@ -3608,8 +3656,8 @@
 {% 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 +92,Warehouse not found in the system,ګدام په سيستم کې ونه موندل شو
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +106,This Month's Summary,دا مياشت د لنډيز
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,ګدام په سيستم کې ونه موندل شو
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,دا مياشت د لنډيز
 DocType: Quality Inspection Reading,Quality Inspection Reading,د کیفیت د تفتیش د لوستلو
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`د يخبندان په ډیپو کې د زړو Than` بايد٪ d ورځو په پرتله کوچنی وي.
 DocType: Tax Rule,Purchase Tax Template,پیري د مالياتو د کينډۍ
@@ -3619,21 +3667,22 @@
 DocType: Item Customer Detail,Ref Code,دسرچینی یادونه کوډ
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,د کارګر اسناد.
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Please set Next Depreciation Date,مهرباني وکړئ ټاکل بل د استهالک نېټه
-DocType: Payment Gateway,Payment Gateway,د پیسو ليدونکی
 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 +378,Operation Time must be greater than 0 for Operation {0},د وخت عمليات بايد د عملياتو 0 څخه ډيره وي {0}
+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/accounts/doctype/account/account.py +170,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)
 DocType: Program,Program Abbreviation,پروګرام Abbreviation
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,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: Appraisal,Start Date,پیل نېټه
@@ -3649,21 +3698,22 @@
 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,توکی لرې که په تور د تطبیق وړ نه دی چې توکی
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,د بيلګې په توګه. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +27,Transaction currency must be same as Payment Gateway currency,د راکړې ورکړې د اسعارو په توګه باید د پیسو ليدونکی اسعارو ورته وي
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Transaction currency must be same as Payment Gateway currency,د راکړې ورکړې د اسعارو په توګه باید د پیسو ليدونکی اسعارو ورته وي
 DocType: Payment Entry,Receive,تر لاسه
+apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,Quotations:
 DocType: Maintenance Visit,Fully Completed,په بشپړه توګه بشپړ شوي
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}٪ بشپړ
 DocType: Employee,Educational Qualification,د زده کړې شرایط
 DocType: Workstation,Operating Costs,د عملیاتي لګښتونو
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,که کړنه جمع میاشتنی بودجې زیات شو
 DocType: Purchase Invoice,Submit on creation,پر رامنځته سپارل
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +432,Currency for {0} must be {1},د اسعارو د {0} بايد د {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +435,Currency for {0} must be {1},د اسعارو د {0} بايد د {1}
 DocType: Asset,Disposal Date,برطرف نېټه
 DocType: Employee Leave Approver,Employee Leave Approver,د کارګر اجازه Approver
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row {0}: An Reorder entry already exists for this warehouse {1},د کتارونو تر {0}: د نورو ترمیمي د ننوتلو مخکې د دې ګودام شتون {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +495,Row {0}: An Reorder entry already exists for this warehouse {1},د کتارونو تر {0}: د نورو ترمیمي د ننوتلو مخکې د دې ګودام شتون {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +79,"Cannot declare as lost, because Quotation has been made.",په توګه له لاسه نه اعلان کولای، ځکه د داوطلبۍ شوی دی.
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,رانيول ماسټر مدير
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +429,Production Order {0} must be submitted,تولید نظم {0} بايد وسپارل شي
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +434,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,تر اوسه پورې ونه شي کولای له نېټې څخه مخکې وي
@@ -3673,25 +3723,27 @@
 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 +181,Totals,مجموعه
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,مجموعه
 DocType: BOM,Manufacturing,دفابريکي
 ,Ordered Items To Be Delivered,امر سامان ته تحویلیږي
 DocType: Account,Income,پر عايداتو
 DocType: Industry Type,Industry Type,صنعت ډول
 apps/erpnext/erpnext/templates/includes/cart.js +141,Something went wrong!,کومه تیروتنه وشوه!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,Warning: Leave application contains following block dates,خبرداری: د وتو درخواست لاندې د بنديز خرما لرونکی د
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +120,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} د دې معاملې د بشپړولو لپاره واحدونو.
+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 +181,Organization unit (department) master.,اداره واحد (رياست) بادار.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,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 +793,All records are synced.,ټول سوابق د دفارسی.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +781,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,لګښت مرکز نوم
@@ -3710,21 +3762,20 @@
 DocType: Address,Name of person or organization that this address belongs to.,د شخص يا موسسې په نوم چې دا پته پورې.
 apps/erpnext/erpnext/public/js/setup_wizard.js +260,Your Suppliers,ستاسو د عرضه کوونکي
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +49,Cannot set as Lost as Sales Order is made.,نه شي په توګه له السه په توګه خرڅلاو نظم جوړ شوی دی.
-DocType: Student Applicant,Mother's Name,د مور نوم
 DocType: Request for Quotation Item,Supplier Part No,عرضه برخه نه
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +348,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',وضع نه شي کله چې وېشنيزه کې د &#39;ارزښت&#39; یا د &#39;Vaulation او Total&#39; دی
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Received From,ترلاسه له
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Received From,ترلاسه له
 DocType: Lead,Converted,بدلوی
 DocType: Item,Has Serial No,لري شعبه
 DocType: Employee,Date of Issue,د صدور نېټه
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: د {0} د {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +153,Row #{0}: Set Supplier for item {1},د کتارونو تر # {0}: د جنس د ټاکلو په عرضه {1}
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +93,Row {0}: Hours value must be greater than zero.,د کتارونو تر {0}: ساعتونه ارزښت باید له صفر څخه زیات وي.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +117,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} وصل ونه موندل شي
 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 +172,{0} {1} does not exist,{0} د {1} نه شته
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +175,{0} {1} does not exist,{0} د {1} نه شته
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,Please check Multi Currency option to allow accounts with other currency,لطفا د اسعارو انتخاب څو له نورو اسعارو حسابونو اجازه وګورئ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +72,Item: {0} does not exist in the system,شمیره: {0} په سيستم کې نه شته
 apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,تاسو د ګنګل ارزښت جوړ واک نه دي
@@ -3733,13 +3784,14 @@
 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/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,د حاضرۍ د راتلونکي لپاره د خرما نه په نښه شي
 DocType: Pricing Rule,Pricing Rule Help,د بیې د حاکمیت مرسته
 DocType: Purchase Taxes and Charges,Account Head,ګڼون مشر
 apps/erpnext/erpnext/config/stock.py +163,Update additional costs to calculate landed cost of items,اضافي لګښتونه د اوسمهالولو لپاره د توکو لګیدلي لګښت محاسبه
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Electrical,برق
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Electrical,برق
 DocType: Stock Entry,Total Value Difference (Out - In),Total ارزښت بدلون (له جملې څخه - په)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,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}
@@ -3747,7 +3799,7 @@
 DocType: Item,Customer Code,پيرودونکو کوډ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +210,Birthday Reminder for {0},د کالیزې په ياد راولي {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,ورځو راهیسې تېر نظم
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +292,Debit To account must be a Balance Sheet account,د حساب ډیبیټ باید د موازنې د پاڼه په پام کې وي
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To account must be a Balance Sheet account,د حساب ډیبیټ باید د موازنې د پاڼه په پام کې وي
 DocType: Buying Settings,Naming Series,نوم لړۍ
 DocType: Leave Block List,Leave Block List Name,پريږدئ بالک بشپړفهرست نوم
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,دحمل شتمني
@@ -3759,11 +3811,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} بايد د ډول Liability / مساوات وي
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +301,Salary Slip of employee {0} already created for time sheet {1},د کارکوونکي معاش ټوټه {0} د مخه د وخت په پاڼه کې جوړ {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +313,Salary Slip of employee {0} already created for time sheet {1},د کارکوونکي معاش ټوټه {0} د مخه د وخت په پاڼه کې جوړ {1}
 DocType: Sales Order Item,Ordered Qty,امر Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +673,Item {0} is disabled,د قالب {0} معلول دی
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} is disabled,د قالب {0} معلول دی
 DocType: Stock Settings,Stock Frozen Upto,دحمل ګنګل ترمړوندونو پورې
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +838,BOM does not contain any stock item,هیښ کوم سټاک توکی نه لري
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +809,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.,د پروژې د فعاليت / دنده.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,معاش ټوټه تولید
@@ -3771,23 +3823,24 @@
 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 +485,Row #{0}: Please set reorder quantity,د کتارونو تر # {0}: مهرباني وکړئ ټاکل ترمیمي کمیت
+DocType: Sales Invoice Timesheet,Billing Hours,بلونو ساعتونه
+apps/erpnext/erpnext/stock/doctype/item/item.py +487,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 +62,Please set {0},لطفا جوړ {0}
 DocType: Purchase Invoice,Repeat on Day of Month,د مياشتې په ورځ تکرار
 DocType: Employee,Health Details,د روغتیا په بشپړه توګه کتل
 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,د پورته انتخاب معیارونه ټول معاش ټوټه سپارل
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} سامان دفارسی
 DocType: Sales Order,Partly Delivered,خفيف د تحویلوونکی
-DocType: Sales Invoice,Existing Customer,موجوده پيرودونکو
 DocType: Email Digest,Receivables,پورونه
+DocType: Lead Source,Lead Source,سرب د سرچینه
 DocType: Customer,Additional information regarding the customer.,د مشتريانو په اړه اضافي معلومات.
 DocType: Quality Inspection Reading,Reading 5,لوستلو 5
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +38,Campaign Name is required,د کمپاین نوم ته اړتيا ده
 DocType: Maintenance Visit,Maintenance Date,د ساتنې او نېټه
 DocType: Purchase Invoice Item,Rejected Serial No,رد شعبه
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +80,Year start date or end date is overlapping with {0}. To avoid please set company,کال د پيل نيټه او يا پای نیټه سره {0} تداخل. د مخنيوي لطفا شرکت جوړ
@@ -3795,10 +3848,9 @@
 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 +129,BOM and Manufacturing Quantity are required,هیښ او توليد مقدار ته اړتیا ده
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,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 پياوړتيا
-DocType: Bank Reconciliation Detail,Amount,اندازه
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,هیښ بدل
 ,Sales Analytics,خرڅلاو Analytics
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +113,Available {0},موجود {0}
@@ -3806,14 +3858,14 @@
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Email ترتیبول
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +96,Please enter default currency in Company Master,لطفا په شرکت ماسټر default اسعارو ته ننوځي
 DocType: Stock Entry Detail,Stock Entry Detail,دحمل انفاذ تفصیلي
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +100,Daily Reminders,هره ورځ په دوراني ډول
+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/account/account_tree.js +23,New Account Name,نوی ګڼون نوم
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,خام مواد لګښت
 DocType: Selling Settings,Settings for Selling Module,لپاره خرڅول ماډل امستنې
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Customer Service,د پیرودونکو خدمت
+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/config/hr.py +50,Offer candidate a Job.,وړاندیز کانديد په دنده.
@@ -3822,8 +3874,9 @@
 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} باید یو سټاک د قالب وي
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Default د کار په پرمختګ ګدام
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1570,Total nos of serial no is not equal to quantity.,د شجاعي د نه Total ترانسفارمرونو د مساوي اندازه نه ده.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1594,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,تازه لړۍ شمېر
@@ -3831,9 +3884,10 @@
 DocType: Sales Order,Printing Details,د چاپونې نورولوله
 DocType: Task,Closing Date,بنديدو نېټه
 DocType: Sales Order Item,Produced Quantity,توليد مقدار
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Engineer,انجنير
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,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 +370,Item Code required at Row No {0},د قالب کوډ په کتارونو هیڅ اړتیا {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +398,Item Code required at Row No {0},د قالب کوډ په کتارونو هیڅ اړتیا {0}
 DocType: Sales Partner,Partner Type,همکار ډول
 DocType: Purchase Taxes and Charges,Actual,واقعي
 DocType: Authorization Rule,Customerwise Discount,Customerwise کمښت
@@ -3849,16 +3903,18 @@
 DocType: BOM,Raw Material Cost,لومړنیو توکو لګښت
 DocType: Item Reorder,Re-Order Level,Re-نظم د ليول
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,توکي او پالن qty د کوم لپاره چې تاسو غواړئ چې د توليد امر کړي او يا يې د تحليل او د خامو موادو د نیولو لپاره وليکئ.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +55,Part-time,بعد له وخته
+apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,Gantt چارت
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,بعد له وخته
 DocType: Employee,Applicable Holiday List,د تطبيق وړ رخصتي بشپړفهرست
 DocType: Employee,Cheque,آرډر
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,لړۍ Updated
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +57,Series Updated,لړۍ Updated
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,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 +87,Clearance Date updated,تازه چاڼېزو نېټه
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,په بریالیتوب سره راوړې
@@ -3872,7 +3928,7 @@
 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 +513,Posting date and posting time is mandatory,پست کوي وخت او نېټه امخ د الزامی دی
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,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.,په کلیمو کې به د ليدو وړ وي. هر کله چې تاسو د اخستلو امر وژغوري.
@@ -3882,7 +3938,7 @@
 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/stock/doctype/stock_entry/stock_entry.py +158,Target warehouse in row {0} must be same as Production Order,په قطار {0} د هدف ګدام بايد په توګه تولید نظم ورته وي
+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,د اسعارو نه شي د ارقامو د يو شمېر نورو اسعارو په کارولو وروسته بدل شي
 DocType: Company,Round Off Account,حساب پړاو
@@ -3891,23 +3947,22 @@
 DocType: Customer Group,Parent Customer Group,Parent پيرودونکو ګروپ
 DocType: Purchase Invoice,Contact Email,تماس دبرېښنا ليک
 DocType: Appraisal Goal,Score Earned,نمره لاسته راول
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Notice Period,دمهلت دوره
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,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 +4,New Sales Person Name,نوي خرڅلاو شخص نوم
 DocType: Packing Slip,Gross Weight UOM,Gross وزن UOM
-DocType: Email Digest,Receivables / Payables,پورونه / Payables
 DocType: Delivery Note Item,Against Sales Invoice,په وړاندې د خرڅلاو صورتحساب
 DocType: Bin,Reserved Qty for Production,د تولید خوندي دي Qty
 DocType: Asset,Frequency of Depreciation (Months),د استهالک د فريکوينسي (مياشتې)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +469,Credit Account,اعتبار اکانټ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Credit Account,اعتبار اکانټ
 DocType: Landed Cost Item,Landed Cost Item,تيرماښام لګښت د قالب
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +55,Show zero values,صفر ارزښتونو وښایاست
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,صفر ارزښتونو وښایاست
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,د توکي مقدار توليدي وروسته ترلاسه / څخه د خامو موادو ورکول اندازه ګیلاسو
 apps/erpnext/erpnext/public/js/setup_wizard.js +315,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 +647,Please specify Attribute Value for attribute {0},مهرباني وکړئ مشخص د خاصې لپاره ارزښت ځانتیا {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},مهرباني وکړئ مشخص د خاصې لپاره ارزښت ځانتیا {0}
 DocType: Item,Default Warehouse,default ګدام
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +39,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,لطفا مورنی لګښت مرکز ته ننوځي
@@ -3929,19 +3984,22 @@
 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,خرڅلاو شخص
-DocType: Sales Invoice,Cold Calling,سړې ته اړیکه
 DocType: SMS Parameter,SMS Parameter,پیغامونه د پاراميټر
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,د بودجې او لګښتونو مرکز
 DocType: Maintenance Schedule Item,Half Yearly,نيمايي د اکتوبر
 DocType: Lead,Blog Subscriber,Blog د ګډون
+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,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.,د دورې د پای نیټه نه شي کولای د دورې د پیل نیټه د وخت نه مخکې وي. لطفا د خرما د اصلاح او بیا کوښښ وکړه.
+DocType: Stock Reconciliation Item,Quantity Difference,مقدار بدلون
 apps/erpnext/erpnext/config/hr.py +253,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 +141,Set as Lost,د ټاکل شويو Lost
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,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 +5,This is based on transactions against this Customer. See timeline below for details,دا په دې پيرودونکو پر وړاندې د معاملو پر بنسټ. د تفصیلاتو لپاره په لاندی مهال ویش وګورئ
 DocType: Supplier,Credit Days Based On,پورونو د ورځې پر بنسټ
@@ -3953,11 +4011,10 @@
 ,Items To Be Requested,د ليکنو ته غوښتنه وشي
 DocType: Purchase Order,Get Last Purchase Rate,ترلاسه تېره رانيول Rate
 DocType: Company,Company Info,پيژندنه
-apps/erpnext/erpnext/accounts/page/pos/pos.js +941,Select or add new customer,وټاکئ او يا د نوي مشتريانو د اضافه
+apps/erpnext/erpnext/accounts/page/pos/pos.js +930,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 +5,This is based on the attendance of this Employee,دا د دې د کارکونکو د راتګ پر بنسټ
-DocType: Sales Invoice,Frequency,د فریکونسۍ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +463,Debit Account,ډیبیټ اکانټ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Debit Account,ډیبیټ اکانټ
 DocType: Fiscal Year,Year Start Date,کال د پیل نیټه
 DocType: Attendance,Employee Name,د کارګر نوم
 DocType: Sales Invoice,Rounded Total (Company Currency),غونډ مونډ Total (شرکت د اسعارو)
@@ -3966,27 +4023,27 @@
 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 +210,Supplier Quotation {0} created,عرضه کوونکي د داوطلبۍ {0} جوړ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +208,Supplier Quotation {0} created,عرضه کوونکي د داوطلبۍ {0} جوړ
 apps/erpnext/erpnext/accounts/report/financial_statements.py +90,End Year cannot be before Start Year,د پای کال د پیل کال مخکې نه شي
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Employee Benefits,د کارګر ګټې
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,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 +228,Please set a default Holiday List for Employee {0} or Company {1},لطفا یو default رخصتي بشپړفهرست لپاره د کارګر جوړ {0} یا د شرکت د {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +232,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 +499,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},د قطار نه {0}: مقدار نه شي اخراجاتو ادعا {1} په وړاندې د مقدار د انتظار څخه ډيره وي. انتظار مقدار دی {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +500,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 +1007,Price List not found or disabled,بیې په لېست کې ونه موندل او يا معيوب
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1008,Price List not found or disabled,بیې په لېست کې ونه موندل او يا معيوب
 DocType: Expense Claim,Approved,تصویب شوې
 DocType: Pricing Rule,Price,د بیې
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +244,Employee relieved on {0} must be set as 'Left',د کارګر د کرارۍ د {0} بايد جوړ شي د &quot;کيڼ &#39;
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +256,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} لپاره د کارګر جوړ
@@ -3997,12 +4054,12 @@
 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 +259,Please select Employee Record first.,مهرباني وکړئ لومړی غوره کارکوونکی دثبت.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +266,Please select Employee Record first.,مهرباني وکړئ لومړی غوره کارکوونکی دثبت.
 DocType: POS Profile,Account for Change Amount,د بدلون لپاره د مقدار حساب
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +190,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},د کتارونو تر {0}: ګوند / حساب سره سمون نه خوري {1} / {2} د {3} {4}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +235,Please enter Expense Account,لطفا اخراجاتو حساب ته ننوځي
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,Please enter Expense Account,لطفا اخراجاتو حساب ته ننوځي
 DocType: Account,Stock,سټاک
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,"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 +976,"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,رانيول / جوړون نورولوله
@@ -4017,9 +4074,10 @@
 DocType: Asset Movement,Transaction Date,د راکړې ورکړې نېټه
 DocType: Production Plan Item,Planned Qty,پلان Qty
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,Total د مالياتو
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,For Quantity (Manufactured Qty) is mandatory,د مقدار (تولید Qty) فرض ده
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,For Quantity (Manufactured Qty) is mandatory,د مقدار (تولید Qty) فرض ده
 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 +78,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,واقعي د پیل نیټه
@@ -4034,9 +4092,11 @@
 DocType: Warranty Claim,If different than customer address,که د پېرېدونکو پته په پرتله بیلو
 DocType: BOM Operation,BOM Operation,هیښ عمليات
 DocType: Purchase Taxes and Charges,On Previous Row Amount,په تیره د کتارونو تر مقدار
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +226,Transfer Asset,د انتقال د شتمنیو
+DocType: Student,Home Address,کور پته
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +227,Transfer Asset,د انتقال د شتمنیو
 DocType: POS Profile,POS Profile,POS پېژندنه
 apps/erpnext/erpnext/config/schools.py +33,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 +129,"Item {0} is a template, please select one of its variants",{0} د قالب دی کېنډۍ، لطفا د خپلو بېرغونو وټاکئ
 DocType: Asset,Asset Category,د شتمنیو کټه ګورۍ
@@ -4046,8 +4106,8 @@
 DocType: Assessment,Room,کوټه
 DocType: Purchase Order,Advance Paid,پرمختللی ورکړل
 DocType: Item,Item Tax,د قالب د مالياتو
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +765,Material to Supplier,ته عرضه مواد
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +189,Excise Invoice,وسیله صورتحساب
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,Material to Supplier,ته عرضه مواد
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,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,اوسني مسؤلیتونه
@@ -4057,7 +4117,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,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 +136,Credit Card,باور كارت
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,باور كارت
 DocType: BOM,Item to be manufactured or repacked,د قالب توليد شي او يا repacked
 apps/erpnext/erpnext/config/stock.py +174,Default settings for stock transactions.,د سټاک معاملو تلواله امستنو.
 DocType: Purchase Invoice,Next Date,بل نېټه
@@ -4065,6 +4125,7 @@
 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: Academic Term,Term End Date,اصطلاح د پای نیټه
 DocType: Hub Settings,Seller Name,پلورونکی نوم
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),مالیه او په تور مجرايي (شرکت د اسعارو)
 DocType: Item Group,General Settings,جنرال امستنې
@@ -4076,7 +4137,7 @@
 DocType: Customer,Commission Rate,کمیسیون Rate
 apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,د کمکیانو لپاره د variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,له خوا د رياست د بنديز رخصت غوښتنلیکونه.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +115,"Payment Type must be one of Receive, Pay and Internal Transfer",د پیسو ډول بايد د تر لاسه شي، د تنخاوو او کورني انتقال
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +118,"Payment Type must be one of Receive, Pay and Internal Transfer",د پیسو ډول بايد د تر لاسه شي، د تنخاوو او کورني انتقال
 apps/erpnext/erpnext/config/selling.py +169,Analytics,Analytics
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,کراچۍ ده خالي
 DocType: Production Order,Actual Operating Cost,واقعي عملياتي لګښت
@@ -4091,10 +4152,10 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,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 +92,Designer,په سکښتګر کې
+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/accounts/doctype/purchase_invoice/purchase_invoice.py +469,Cost Center is required in row {0} in Taxes table for type {1},لګښت په مرکز کې قطار ته اړتیا لیدل کیږي {0} په مالیات لپاره ډول جدول {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +472,Cost Center is required in row {0} in Taxes table for type {1},لګښت په مرکز کې قطار ته اړتیا لیدل کیږي {0} په مالیات لپاره ډول جدول {1}
 DocType: Program,Program Code,پروګرام کوډ
 ,Item-wise Purchase Register,د قالب-هوښيار رانيول د نوم ثبتول
 DocType: Batch,Expiry Date,د ختم نیټه
@@ -4104,12 +4165,12 @@
 apps/erpnext/erpnext/config/projects.py +13,Project master.,د پروژې د بادار.
 apps/erpnext/erpnext/controllers/status_updater.py +174,"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 +417, (Half Day),(نیمه ورځ)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425, (Half Day),(نیمه ورځ)
 DocType: Supplier,Credit Days,اعتبار ورځې
 DocType: Leave Type,Is Carry Forward,مخ په وړاندې د دې لپاره ترسره کړي
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +740,Get Items from BOM,له هیښ توکي ترلاسه کړئ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +711,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 +549,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},د کتارونو تر # {0}: پست کوي نېټه بايد په توګه د اخیستلو نېټې ورته وي {1} د شتمنیو د {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +552,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,له يوه ګودام څخه بل د شتمنیو ته سپاري
diff --git a/erpnext/translations/pt-BR.csv b/erpnext/translations/pt-BR.csv
index 6305cfd..7a0dd11 100644
--- a/erpnext/translations/pt-BR.csv
+++ b/erpnext/translations/pt-BR.csv
@@ -1,240 +1,288 @@
 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: Project,Costing and Billing,Custos e Faturamento
+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
+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: Item,Default Unit of Measure,Unidade de Medida Padrão
 DocType: SMS Center,All Sales Partner Contact,Todos os Contatos de Parceiros de Vendas
 DocType: Employee,Leave Approvers,Aprovadores de Licença
-DocType: Purchase Order,PO-,OC-
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +197,Do you really want to scrap this asset?,Você realmente quer se desfazer deste ativo?
+DocType: Sales Partner,Dealer,Revendedor
+DocType: POS Profile,Applicable for User,Aplicável para o usuário
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +198,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 +36,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
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +5,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 +158,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
 DocType: Purchase Order,% Billed,Faturado %
-DocType: Sales Invoice,Customer Name,Nome do Cliente
+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 +126,Bank account cannot be named as {0},A conta bancária não pode ser nomeado 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 +183,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 +148,Series Updated Successfully,Série Atualizada com Sucesso
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +149,Series Updated Successfully,Série Atualizada com Sucesso
 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 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 +54,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/setup/setup_wizard/install_fixtures.py +140,Bank Draft,Cheque Administrativo
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +511,Accounts table cannot be blank.,Tabela de Contas não pode estar vazia.
+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 +246,New Leave Application,Aplicação deixar Nova
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,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 +512,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)
 DocType: Employee Education,Year of Passing,Ano de passagem
+apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Em Estoque
 DocType: Production Plan Item,Production Plan Item,Item do Planejamento de Produção
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +142,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/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Ano Fiscal {0} é necessário
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Defesa
 DocType: Salary Component,Abbr,Abrev
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +198,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 +127,Please select Price List,"Por favor, selecione Lista de Preço"
 DocType: Production Order Operation,Work In Progress,Trabalho em Andamento
 apps/erpnext/erpnext/public/js/setup_wizard.js +205,Accountant,Contador
 DocType: Cost Center,Stock User,Usuário de Estoque
-DocType: Company,Phone No,Nº de Telefone
+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 +22,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 +7,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.
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Vaga de emprego.
-apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,Selecione Armazén...
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Publicidade
-DocType: Payment Reconciliation,Reconcile,Conciliar
+DocType: Item Attribute,Increment,Incremento
+apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,Selecione Armazém...
 DocType: Process Payroll,Make Bank Entry,Realizar Lançamento Bancário
-DocType: SMS Center,All Sales Person,Todos os Vendedores
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +156,Salary Structure Missing,Estrutura de Salário Ausente
-DocType: Lead,Person Name,Nome da Pessoa
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Salary Structure Missing,Estrutura de Salário Ausente
 DocType: Sales Invoice Item,Sales Invoice Item,Item da Nota Fiscal de Venda
 DocType: POS Profile,Write Off Cost Center,Centro de Custo do Abatimento
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Relatórios de Estoque
 DocType: Warehouse,Warehouse Detail,Detalhes do Armazén
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,Credit limit has been crossed for customer {0} {1}/{2},O limite de crédito foi analisado para o cliente {0} {1} / {2}
-apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""É Ativo Fixo"" não pode ser desmarcado se já existe um registro de Ativo relacionado ao item"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +189,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/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: 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: 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/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.
 DocType: Lead,Product Enquiry,Consulta de Produto
 DocType: Academic Term,Schools,Acadêmico
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Por favor insira primeira empresa
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,Please select Company first,"Por favor, selecione Empresa primeiro"
 DocType: Employee Education,Under Graduate,Em Graduação
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Meta em
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Log de Atividade:
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Imóveis
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Farmacêuticos
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Item {0} does not exist in the system or has expired,Item {0} não existe no sistema ou expirou
 DocType: Purchase Invoice Item,Is Fixed Asset,É Ativo Imobilizado
 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 Pedido de Materiais do tipo Fabricação com base nos critérios acima
 DocType: Sales Invoice Item,Delivered By Supplier,Proferido por Fornecedor
 DocType: SMS Center,All Contact,Todo o Contato
 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/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: 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."
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +456,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 +166,Settings for HR Module,Configurações para o Módulo de RH
 DocType: SMS Center,SMS Center,Centro de SMS
 DocType: Sales Invoice,Change Amount,Troco
-DocType: BOM Replace Tool,New BOM,Nova LDM
+DocType: Timesheet,Batch Time Logs for billing.,Batch Logs Tempo para o faturamento.
 DocType: Depreciation Schedule,Make Depreciation Entry,Fazer Lançamento de Depreciação
-DocType: Leave Application,Reason,Motivo
 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/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
+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}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +100,Cost Center {0} does not belong to Company {1},Centro de Custo {0} não pertence a Empresa {1}
 DocType: Customer,Individual,Pessoa Física
 DocType: Interest,Academics User,Usuário Acadêmico
-DocType: Cheque Print Template,Amount In Figure,Qeuantia em Espécie
+DocType: Cheque Print Template,Amount In Figure,Total em Espécie
 DocType: SMS Settings,Enter url parameter for message,Digite o parâmetro da url para mensagem
 DocType: Program Enrollment Tool,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}
 DocType: Pricing Rule,Discount on Price List Rate (%),% de Desconto sobre o Preço da Lista de Preços
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,Valor Saída
 ,Purchase Order Trends,Tendência de Ordens de Compra
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,Alocar licenças para o ano.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,Insufficient Stock,Estoque Insuficiente
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227,Insufficient Stock,Estoque Insuficiente
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Desativar Controle de Tempo e Planejamento de Capacidade
-DocType: Bank Reconciliation,Bank Account,Conta Bancária
+DocType: Email Digest,New Sales Orders,Novos Pedidos de Venda
+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
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} does not belong to Company {1},A Conta {0} não pertence à Empresa {1}
-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: Sales Invoice,Is Opening Entry,Está abrindo Entry
 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
-DocType: Course Schedule,Instructor Name,Nome do Instrutor
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,For Warehouse is required before Submit,Armazén de destino necessário antes de enviar
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,For Warehouse is required before Submit,Armazén de destino necessário antes de enviar
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Recebeu em
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,"Por favor, indique Empresa"
+DocType: Delivery Note Item,Against Sales Invoice Item,Contra Vendas Nota Fiscal do Item
 ,Production Orders in Progress,Ordens em Produção
 DocType: Lead,Address & Contact,Endereço e Contato
 DocType: Leave Allocation,Add unused leaves from previous allocations,Acrescente as licenças não utilizadas de atribuições anteriores
+apps/erpnext/erpnext/controllers/recurring_document.py +227,Next Recurring {0} will be created on {1},Próximo Recorrente {0} será criado em {1}
 ,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.
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Solicitação de Compra.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +5,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 +213,Only the selected Leave Approver can submit this Leave Application,Somente o Leave aprovador selecionado pode enviar este pedido de férias
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Aliviar A data deve ser maior que Data de Juntando
+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 +103,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.
 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 +435,Leave Blocked,Licenças Bloqueadas
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +443,Leave Blocked,Licenças Bloqueadas
+apps/erpnext/erpnext/stock/doctype/item/item.py +671,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
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +83,Annual,Anual
 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: Lead,Do Not Contact,Não entre em contato
 DocType: Item,Minimum Order Qty,Pedido Mínimo
 DocType: Pricing Rule,Supplier Type,Tipo de Fornecedor
-DocType: Item,Publish in Hub,Publicar no Hub
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Material Request,Pedido de Material
+apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} is cancelled,Item {0} é cancelada
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +823,Material Request,Pedido 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 +333,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Item {0} não encontrado em &#39;matérias-primas fornecidas &quot;na tabela Ordem de Compra {1}
 DocType: Shipping Rule,Worldwide Shipping,Envio Internacional
 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,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 +249,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Pagamento contra {0} {1} não pode ser maior do que Outstanding Montante {2}
 DocType: 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 +130,Please select Charge Type first,Por favor seleccione Carga Tipo primeiro
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Mais recentes
+DocType: Email Digest,New Quotations,Novas Cotações
 DocType: Tax Rule,Shipping County,Condado de Entrega
-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 da Atividade por Colaborador
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +626,Supplier Invoice No exists in Purchase Invoice {0},Nº da Nota Fiscal de Compra existe na Nota Fiscal de Compra {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +629,Supplier Invoice No exists in Purchase Invoice {0},Nº da Nota Fiscal de Compra 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 +348,Completed Qty can not be greater than 'Qty to Manufacture',"Qtde concluida não pode ser maior do que ""Qtde de Fabricação"""
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +349,Completed Qty can not be greater than 'Qty to Manufacture',"Qtde concluida 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
+apps/erpnext/erpnext/projects/doctype/task/task.py +86,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 (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: 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 Solicitação de Materiais automática
 DocType: Journal Entry,Multi Currency,Multi moeda
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +806,Delivery Note,Guia de Remessa
-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/doctype/sales_invoice/sales_invoice.js +800,Delivery Note,Guia de Remessa
+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: 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 e-mail separados por vírgulas, a fatura será enviada automaticamente na data determinada"
+DocType: Employee,Company Email,E-mail da Empresa
+DocType: GL Entry,Debit Amount in Account Currency,Montante Débito em Conta de moeda
 apps/erpnext/erpnext/config/hr.py +186,"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: Item Tax,Tax Rate,Alíquota do Imposto
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} já está alocado para o Colaborador {1} para o período de {2} até {3}
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Linha # {0}: Nº do Lote deve ser o mesmo que {1} {2}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +147,"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 +143,Purchase Invoice {0} is already submitted,Compra Invoice {0} já é submetido
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},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.
 DocType: C-Form Invoice Detail,Invoice Date,Data do Faturamento
 DocType: GL Entry,Debit Amount,Total do Débito
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +342,Please see attachment,"Por favor, veja o anexo"
 DocType: Purchase Order,% Received,Recebido %
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,Instalação já está completa !
-,Finished Goods,Produtos Acabados
-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: Quality Inspection,Inspected By,Inspecionado por
+DocType: Maintenance Visit,Maintenance Type,Tipo de manutenção
 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}
-DocType: Purchase Invoice Item,Item Name,Nome do Item
+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: 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/doctype/purchase_invoice/purchase_invoice.js +736,Purchase Return,Devolução de Compra
+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."
 ,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 +202,{0} ({1}) must have role 'Leave Approver',{0} ({1}) deve ter a função 'Aprovador de Licenças'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,{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 +143,Reason for losing,Motivo para perder
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +163,Reason for losing,Motivo para perder
 DocType: Employee,Single,Solteiro
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +225,Please enter Cost Center,"Por favor, indique Centro de Custo"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,Please enter Cost Center,"Por favor, indique Centro de Custo"
 DocType: Journal Entry Account,Sales Order,Ordem de Venda
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,Valor Médio de Venda
-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 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"
-DocType: BOM,Item Desription,Descrição do Item
-DocType: Account,Is Group,É Grupo
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Leia o manual de ERPNext
 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
 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'
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Non Profit,sem Fins Lucrativos
 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 e-mail. 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 +640,Attribute {0} selected multiple times in Attributes Table,Atributo {0} selecionada várias vezes na tabela de atributos
 DocType: HR Settings,Employee record is created using selected field. ,O registro do colaborador é criado usando o campo selecionado.
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Mestre férias .
 DocType: Request for Quotation Item,Required Date,Para o Dia
-DocType: Delivery Note,Billing Address,Endereço de Faturamento
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +862,Please enter Item Code.,"Por favor, insira o Código Item."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +847,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"
+DocType: Employee,Health Concerns,Preocupações com a Saúde
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +15,Unpaid,Não Pago
-apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +38,Reserved for sale,Reservado para venda
+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
+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: Manufacturing Settings,Time Between Operations (in mins),Tempo entre operações (em minutos)
@@ -243,117 +291,145 @@
 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/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 +86,Administrative Officer,Escritório Administrativo
-DocType: Stock Entry,Difference Account,Conta Diferença
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Please enter Warehouse for which Material Request will be raised,"Por favor, indique Armazén para as quais as Requisições de Materiais serão levantadas"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,Escritório Administrativo
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +309,Please select Company,"Por favor, selecione Empresa"
+DocType: Stock Entry Detail,Difference Account,Conta Diferença
+apps/erpnext/erpnext/projects/doctype/task/task.py +44,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 +399,Please enter Warehouse for which Material Request will be raised,"Por favor, indique Armazén para as quais as Requisições de Materiais serão levantadas"
 DocType: Production Order,Additional Operating Cost,Custo Operacional Adicional
-apps/erpnext/erpnext/stock/doctype/item/item.py +530,"To merge, following properties must be same for both items","Para mesclar , seguintes propriedades devem ser os mesmos para ambos os itens"
-DocType: Employee,Emergency Phone,Telefone de Emergência
+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"
 ,Serial No Warranty Expiry,Vencimento da Garantia com Nº de Série
 DocType: Sales Order,To Deliver,Para Entregar
-DocType: Purchase Invoice Item,Item,Item
-DocType: Account,Profit and Loss,Lucros e Perdas
+DocType: Journal Entry,Difference (Dr - Cr),Diferença ( Dr - Cr)
+apps/erpnext/erpnext/config/stock.py +314,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 +56,Account {0} does not belong to company: {1},A Conta {0} não pertence à Empresa: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +47,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: Sales Order Item,Gross Profit,Lucro Bruto
+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
 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
 DocType: Purchase Invoice,Supplier Invoice No,Nº da Nota Fiscal de Compra
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +104,Move Item,Mover Item
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Não é possível excluir Serial No {0}, como ele é usado em transações de ações"
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +240,Closing (Cr),Fechamento (Cr)
 DocType: Installation Note Item,Installation Note Item,Item da Nota de Instalação
+DocType: Production Plan Item,Pending Qty,Pendente Qtde
 apps/erpnext/erpnext/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
 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.js +28,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.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/config/accounts.py +257,Financial / accounting year.,Ano Financeiro / Exercício.
-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, os números de ordem não podem ser mescladas"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +707,Make Sales Order,Criar ordem de vendas
-DocType: Project Task,Project Task,Tarefa do Projeto
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +701,Make Sales Order,Criar ordem de vendas
 ,Lead Id,Cliente em Potencial ID
-DocType: C-Form Invoice Detail,Grand Total,Total Geral
 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 +728,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/stock/doctype/item/item.py +795,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,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 +237,Allocated amount can not be negative,Montante alocado não pode ser negativo
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +212,Opening (Cr),Abertura (Cr)
+apps/erpnext/erpnext/stock/doctype/item/item.py +797,Default Unit of Measure for Item {0} cannot be changed directly because 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
 DocType: Purchase Order Item,Billed Amt,Valor Faturado
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Um Depósito lógico contra o qual as entradas de estoque são feitas.
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Registro de Tempo da Nota Fiscal de Venda
-DocType: Sales Invoice,Customer's Vendor,Revenda
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,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/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
 apps/erpnext/erpnext/config/accounts.py +80,Masters,Cadastros
 apps/erpnext/erpnext/config/accounts.py +140,Update Bank Transaction Dates,Conciliação Bancária
 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 +733,View Offline Records,Ver Registros Offline
+apps/erpnext/erpnext/accounts/page/pos/pos.js +715,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: 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: Activity Type,Default Costing Rate,Preço de Custo Padrão
 DocType: Maintenance Schedule,Maintenance Schedule,Programação da Manutenção
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Inventory,Variação Líquida no Inventário
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Manager,Gerente
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,Gerente
 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 +299,Timesheet created:,Registro de Tempo criado:
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +300,Timesheet created:,Registro de Tempo criado:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +772,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: Activity Cost,Activity Type,Tipo da Atividade
+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.,Ordens de Compra dadas a fornecedores.
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Publishing
 DocType: Activity Cost,Projects User,Usuário de Projetos
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +157,{0}: {1} not found in Invoice Details table,{0}: {1} não foi encontrado na tabela Detalhes da Nota Fiscal
 DocType: Company,Round Off Cost Center,Centro de Custo de Arredondamento
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +205,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Visita de manutenção {0} deve ser cancelado antes de cancelar esta ordem de venda
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +205,Opening (Dr),Abertura (Dr)
+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
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,Finalizar
+DocType: Pricing Rule,Sales Manager,Gerente de Vendas
 DocType: Journal Entry,Write Off Amount,Abater Valor
 DocType: Journal Entry,Bill No,Fatura 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: Sales Order Item,Basic Rate (Company Currency),Taxa Básica (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 baseado em
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,Please enter item details,Por favor insira os detalhes do item
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +9,Pre Sales,Pré Venda
+DocType: Purchase Receipt,Other Details,Outros detalhes
+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,Entrada de pagamento já está criado
 DocType: Purchase Receipt Item Supplied,Current Stock,Estoque Atual
-DocType: Company,Deafult Cost Center,Centro de Custo Padrão
+apps/erpnext/erpnext/controllers/accounts_controller.py +541,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 E-mail registrado na empresa
 DocType: Hub Settings,Seller City,Cidade do Vendedor
 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 +619,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
 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
 DocType: Sales Invoice,Commission Rate (%),Percentual de Comissão (%)
+DocType: Project,Estimated Cost,Custo estimado
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Aeroespacial
 DocType: Journal Entry,Credit Card Entry,Lançamento de Cartão de Crédito
 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: Lead,Campaign Name,Nome da Campanha
-,Reserved,Reservado
 DocType: Purchase Order,Supply Raw Materials,Abastecimento de Matérias-primas
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,{0} is not a stock Item,{0} não é um item de estoque
+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 +169,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: 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
@@ -362,33 +438,40 @@
 apps/erpnext/erpnext/stock/reorder_item.py +177,Auto Material Requests Generated,Requisições de Materiais Geradas Automaticamente
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,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 +39,Reserved for manufacturing,Reservado para fabricação
-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 Site
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{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 +274,"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 +369,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 +206,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/manufacturing/doctype/production_order/production_order.js +42,Make Timesheet,Fazer Registro de Tempo
 DocType: Employee,Bank A/C No.,Nº Cta. Bancária
-DocType: Quality Inspection Reading,Reading 7,Leitura 7
 DocType: Expense Claim Detail,Expense Claim Type,Tipo de Pedido de Reembolso de Despesas
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biotecnologia
+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
 DocType: Company,Default Cost of Goods Sold Account,Conta de Custo Padrão de Mercadorias Vendidas
+apps/erpnext/erpnext/stock/get_item_details.py +275,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 +710,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}"
+apps/erpnext/erpnext/public/js/setup_wizard.js +298,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 +545,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.
 DocType: Warehouse,Tree Details,Detalhes da Árvore
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Enviar agora
 ,Support Analytics,Análise de Pós-Vendas
 DocType: Item,Website Warehouse,Armazém do Site
 DocType: Payment Reconciliation,Minimum Invoice Amount,Valor Mínimo da Fatura
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +227,Timesheet {0} is already completed or cancelled,O Registro de Tempo {0} está finalizado ou cancelado
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +259,Timesheet {0} is already completed or cancelled,O Registro de Tempo {0} está finalizado ou cancelado
 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: Email Digest,Email Digest Settings,Configurações do Resumo por Email
@@ -399,157 +482,188 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,{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
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +229,Target Warehouse,Armazén de Destino
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +230,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,Previsão de Entrega A data não pode ser antes de Ordem de Vendas Data
+DocType: Upload Attendance,Import Attendance,Importação de Atendimento
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Todos os grupos de itens
 DocType: 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}
+DocType: Shopping Cart Settings,Enable Checkout,Ativar Caixa
+apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Ordem de Compra para pagamento
+apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +37,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/report/stock_ledger/stock_ledger.py +95,'Opening','Abrindo'
 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: 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
-apps/erpnext/erpnext/controllers/accounts_controller.py +340,"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: SMS Log,Requested Numbers,Números solicitadas
+apps/erpnext/erpnext/controllers/accounts_controller.py +343,"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/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 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'"
 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
-DocType: Purchase Taxes and Charges,On Previous Row Total,No Total da Linha Anterior
-DocType: Purchase Invoice Item,Rejected Qty,Qtd Rejeitada
+,Available Qty,Qtde Disponível
 DocType: Salary Slip,Working Days,Dias úteis
 DocType: Serial No,Incoming Rate,Valor 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 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: Supplier Quotation,Is Subcontracted,É subcontratada
 DocType: Item Attribute,Item Attribute Values,Valores dos Atributos
-DocType: Examination Result,Examination Result,Resultado do Exame
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +756,Purchase Receipt,Recibo de Compra
 ,Received Items To Be Billed,"Itens Recebidos, mas não Faturados"
-DocType: Employee,Ms,Sra.
 apps/erpnext/erpnext/config/accounts.py +267,Currency exchange rate master.,Taxa de Câmbio Mestre
+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 +439,BOM {0} must be active,LDM {0} deve ser ativa
-DocType: Journal Entry,Depreciation Entry,Lançamento de depreciação
+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/templates/generators/item.html +68,Goto Cart,Ir para o carrinho
+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/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
-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 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 +612,Item Variants {0} updated,Variante(s) do Item {0} atualizada(s)
-DocType: Purchase Invoice Advance,Purchase Invoice Advance,Antecipação da Nota Fiscal de Compra
+apps/erpnext/erpnext/stock/doctype/item/item.py +614,Item Variants {0} updated,Variante(s) do Item {0} atualizada(s)
+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 +172,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/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: Item,Is Purchase Item,É item de compra
 DocType: Asset,Purchase Invoice,Nota Fiscal de Compra
 DocType: Stock Ledger Entry,Voucher Detail No,Nº do Detalhe do Comprovante
-apps/erpnext/erpnext/accounts/page/pos/pos.js +728,New Sales Invoice,Nova Nota Fiscal de Venda
+apps/erpnext/erpnext/accounts/page/pos/pos.js +710,New Sales Invoice,Nova Nota Fiscal 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,Abertura Data e Data de Fechamento deve estar dentro mesmo ano fiscal
 DocType: Lead,Request for Information,Solicitação de Informação
 DocType: Salary Slip,Total in words,Total por extenso
-DocType: Material Request Item,Lead Time Date,Prazo de entrega
-apps/erpnext/erpnext/accounts/page/pos/pos.js +86, 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
+DocType: Material Request Item,Lead Time Date,Prazo de Entrega
+apps/erpnext/erpnext/accounts/page/pos/pos.js +75, 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 +613,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing 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.
 DocType: Purchase Invoice Item,Purchase Order Item,Item da Ordem de Compra
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +130,Indirect Income,Receita Indireta
 DocType: Cheque Print Template,Date Settings,Configurações de Data
 ,Company Name,Nome da Empresa
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +810,Select Item for Transfer,Selecionar Item para Transferência
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +789,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: Student Applicant,Father's Name,Nome do Pai
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Meter,Metro
+DocType: Pricing Rule,Max Qty,Max Qtde
+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 +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: O pagamento contra Vendas / Ordem de Compra deve ser sempre marcado como antecedência
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,químico
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +694,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
-DocType: Opportunity,Walk In,Vitrine
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,Lançamentos no Estoque
-DocType: Item,Inspection Criteria,Critérios de Inspeção
 DocType: SMS Center,All Lead (Open),Todos os Clientes em Potencial em Aberto
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +228,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}: Qtd 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 +710,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 +155,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: Holiday List,Holiday List Name,Nome da Lista de Feriados
 DocType: Journal Entry Account,Expense Claim,Pedido de Reembolso de Despesas
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +212,Do you really want to restore this scrapped asset?,Você realmente deseja restaurar este ativo desfeito?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,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 +635,Attribute table is mandatory,A tabela de atributos é obrigatório
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,A tabela de atributos é obrigatório
 DocType: Production Planning Tool,Get Sales Orders,Obter Ordens de Venda
 DocType: Asset,Total Number of Depreciations,Número Total de Depreciações
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +141,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 Vendas / 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
 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/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +27,Returns,Devoluções
+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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Nº de Série {0} está sob contrato de manutenção até {1}
+apps/erpnext/erpnext/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/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
 DocType: Opportunity,Contact Info,Informações para Contato
 apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,Fazendo Lançamentos no Estoque
 DocType: Packing Slip,Net Weight UOM,Unidade de Medida do Peso Líquido
-DocType: Item,Default Supplier,Fornecedor Padrão
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Percentual Permitido de Produção Excedente
 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
 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.
-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,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 +32,View All Products,Ver Todos os Produtos
-DocType: Company,Default Currency,Moeda Padrão
+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
 DocType: Expense Claim,From Employee,Do Colaborador
 DocType: Journal Entry,Make Difference Entry,Criar diferença de lançamento
 DocType: Upload Attendance,Attendance From Date,Data Inicial de Comparecimento
 DocType: Appraisal Template Goal,Key Performance Area,Área Chave de Performance
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Transporte
-apps/erpnext/erpnext/controllers/item_variant.py +63,Invalid Attribute,Atributo Inválido
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +191,{0} {1} must be submitted,{0} {1} deve ser enviado
-DocType: Email Digest,Annual Expense,Despesa Anual
-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,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%
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,"Números de registro da empresa para sua referência. Exemplo: CNPJ, IE, etc"
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Regra de Envio do Carrinho de Compras
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +211,Production Order {0} must be cancelled before cancelling this Sales Order,Ordem de produção {0} deve ser cancelado antes de cancelar esta ordem de venda
+apps/erpnext/erpnext/public/js/controllers/transaction.js +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"
-DocType: Global Defaults,Global Defaults,Padrões Globais
+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 +153,Project Collaboration Invitation,Convite para Colaboração em Projeto
-DocType: Salary Slip,Deductions,Deduções
 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 +327,Capacity Planning Error,Erro de Planejamento de Capacidade
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,Erro de Planejamento de Capacidade
 ,Trial Balance for Party,Balancete para o Sujeito
+DocType: Salary Slip,Earnings,Ganhos
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +367,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
-DocType: Sales Invoice Advance,Sales Invoice Advance,Antecipação da Nota Fiscal de Venda
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +499,Nothing to request,Nada para pedir
+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 +500,Nothing to request,Nada para pedir
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',A 'Data de Início Real' não pode ser maior que a 'Data Final Real'
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Management,Gestão
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},De qualquer débito ou valor do crédito é necessário para {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +55,Either debit or credit amount is required for {0},De qualquer débito ou valor do crédito é necessário para {0}
 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/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.
@@ -557,75 +671,89 @@
 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
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Banco de dados do Fornecedor.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +685,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 +679,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 +26,"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
 ,Purchase Order Items To Be Billed,"Itens Comprados, mas não Faturados"
-DocType: Purchase Invoice Item,Net Rate,Taxa Líquida
 DocType: Purchase Invoice Item,Purchase Invoice Item,Item da Nota Fiscal de Compra
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Número 1
 DocType: Holiday,Holiday,Feriado
-DocType: Global Defaults,Current Fiscal Year,Ano Fiscal Atual
-DocType: Global Defaults,Disable Rounded Total,Desativar Total Arredondado
-DocType: Lead,Call,Chamada Telefônica
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +417,'Entries' cannot be empty,'Entradas' não pode estar vazio
+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 +418,'Entries' cannot be empty,'Entradas' não pode estar vazio
 apps/erpnext/erpnext/config/hr.py +238,Setting up Employees,Configurando Colaboradores
 DocType: Sales Order,SO-,OV-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Research,Pesquisa
-DocType: Announcement,All Students,Todos os Alunos
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Please select prefix first,Por favor seleccione prefixo primeiro
+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 +43,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 +57,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 +504,"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/setup/setup_wizard/setup_wizard.py +437,Rest Of The World,Resto do Mundo
+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"
 ,Budget Variance Report,Relatório de Variação de Orçamento
-DocType: Salary Slip,Gross Pay,Salário Bruto
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Dividends Paid,Dividendos Pagos
-apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Registro Contábil
-DocType: BOM Item,Item Description,Descrição do Item
-DocType: Purchase Invoice,Is Recurring,É Recorrente
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,Accounting Ledger,Registro Contábil
+DocType: Stock Reconciliation,Difference Amount,Diferença Montante
 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 +131,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 +175,Valuation Rate required for Item in row {0},Taxa de avaliação exigida para o Item na linha {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,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
 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 +76, to ,para
 DocType: Item,Lead Time in days,Prazo de entrega em dias
 ,Accounts Payable Summary,Resumo do Contas a Pagar
-DocType: Journal Entry,Get Outstanding Invoices,Obter Faturas Pendentes
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},Não autorizado para editar conta congelada {0}
 apps/erpnext/erpnext/setup/doctype/company/company.py +185,"Sorry, companies cannot be merged","Desculpe , as empresas não podem ser mescladas"
 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
 DocType: Item,Auto re-order,Reposição Automática
 DocType: Employee,Place of Issue,Local de Envio
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Contract,Contrato
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +498,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/accounts/page/pos/pos.js +737,Sync Master Data,Sincronizar com o Servidor
+DocType: Email Digest,Add Quote,Adicionar Citar
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +503,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 +719,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
 DocType: Mode of Payment,Mode of Payment,Forma de Pagamento
-DocType: Purchase Invoice Item,BOM,LDM
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Este é um grupo de itens de raiz e não pode ser editada.
+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,Ordem de Compra
 DocType: Warehouse,Warehouse Contact Info,Informações de Contato do Armazén
 DocType: Purchase Invoice,Recurring Type,Tipo de recorrência
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +345,"{0}: Employee email not found, hence email not sent","{0}: Email do colaborador não encontrado, portanto o email não foi enviado"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +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
 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/sales_invoice/sales_invoice.py +474,Delivery Note {0} is not submitted,Guia de Remessa {0} não foi submetida
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,"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 +530,Delivery Note {0} is not submitted,Guia de Remessa {0} não foi submetida
+apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Sub-contracted Item,Item {0} deve ser um item do sub- contratados
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Equipamentos Capitais
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Regra de Preços é o primeiro selecionado com base em ""Aplicar On 'campo, que pode ser Item, item de grupo ou Marca."
 DocType: Hub Settings,Seller Website,Site do Vendedor
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,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 +723,For Supplier,Para Fornecedor
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Definir o Tipo de Conta ajuda na seleção desta Conta nas transações.
 DocType: Purchase Invoice,Grand Total (Company Currency),Total Geral (moeda da empresa)
+apps/erpnext/erpnext/utilities/bot.py +39,Did not find any item called {0},Não havia nenhuma item chamado {0}
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Total Saindo
+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)
 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
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Resumo por Email:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +445,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
@@ -634,58 +762,74 @@
 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 +110,Hardware,Ferramentas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,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
 DocType: Purchase Invoice,Supplier Invoice Date,Data da Emissão da Nota Fiscal
 DocType: Appraisal Template Goal,Appraisal Template Goal,Meta do Modelo de Avaliação
-DocType: Salary Slip,Earning,Ganho
+DocType: Salary Component,Earning,Ganho
 DocType: Purchase Invoice,Party Account Currency,Moeda do Sujeito
 ,BOM Browser,Navegador de LDM
 DocType: Purchase Taxes and Charges,Add or Deduct,Adicionar ou Reduzir
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +171,Against Journal Entry {0} is already adjusted against some other voucher,Contra Journal Entry {0} já é ajustado contra algum outro comprovante
+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 +174,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_data.py +358,Food,Alimentos
-DocType: Maintenance Schedule Item,No of Visits,Nº de Visitas
+apps/erpnext/erpnext/demo/setup/setup_data.py +301,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}
 ,Delivered Items To Be Billed,"Itens Entregues, mas não Faturados"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Armazém não pode ser alterado para nº serial.
-DocType: Authorization Rule,Average Discount,Desconto Médio
 DocType: Purchase Invoice Item,UOM,UDM
 DocType: Address,Utilities,Serviços Públicos
 DocType: Asset,Depreciation Schedules,Tabelas de Depreciação
-DocType: Production Order Operation,Operation Description,Descrição da Operação
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,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/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"""
 DocType: Purchase Invoice,Contact Person,Pessoa de Contato
 apps/erpnext/erpnext/projects/doctype/task/task.py +35,'Expected Start Date' can not be greater than 'Expected End Date','Data de Início Esperada' não pode ser maior que 'Data Final Esperada'
 DocType: Holiday List,Holidays,Feriados
+DocType: Sales Order Item,Planned Quantity,Quantidade Planejada
 DocType: Purchase Invoice Item,Item Tax Amount,Valor do Imposto do Item
 DocType: Item,Maintain Stock,Manter Estoque
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +209,Stock Entries already created for Production Order ,Lançamentos no Estoque já criados para Ordem de Produção
+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/manufacturing/doctype/production_order/production_order.js +238,Max: {0},Max: {0}
+DocType: Leave Control Panel,Leave blank if considered for all designations,Deixe em branco se considerado para todas as designações
+apps/erpnext/erpnext/controllers/accounts_controller.py +623,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 +239,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/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
 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 +682,Item {0} is not a stock Item,Item {0} não é um item de estoque
 DocType: Maintenance Visit,Unscheduled,Sem agendamento
-DocType: Employee,Owned,Pertencente
+DocType: Salary Detail,Depends on Leave Without Pay,Depende de licença sem vencimento
 ,Purchase Invoice Trends,Tendência de Faturamento de Compras
+DocType: Employee,Better Prospects,Melhores perspectivas
+DocType: Appraisal,Goals,Metas
 DocType: Warranty Claim,Warranty / AMC Status,Garantia / Estado 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/setup/doctype/email_digest/templates/default.html +72,To Do List,Lista de Atribuições
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Apprentice,Aprendiz
+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 +152,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}
 DocType: Job Opening,"Job profile, qualifications required etc.","Perfil da Vaga, qualificações exigidas, etc."
 DocType: Journal Entry Account,Account Balance,Saldo da conta
-DocType: Asset,Asset Name,Nome do Ativo
 DocType: Shipping Rule Condition,To Value,Para o Valor
 DocType: Asset Movement,Stock Manager,Gerente de Estoque
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +719,Packing Slip,Guia de Remessa
+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 +713,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/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
 DocType: Item,Sales Details,Detalhes de Vendas
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,Qtde Entrada
@@ -693,90 +837,118 @@
 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
+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/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Nenhum registro encontrado na tabela de pagamento
 DocType: Course Schedule,Students HTML,Alunos HTML
-DocType: POS Profile,Apply Discount,Aplicar Desconto
+apps/erpnext/erpnext/public/js/setup_wizard.js +60,Financial Year Start Date,Exercício Data de Início
 DocType: Employee External Work History,Total Experience,Experiência Total
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Deslizamento (s) de embalagem cancelado
 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)
 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: Maintenance Visit,Maintenance Visit,Visita de Manutenção
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Quantidade 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 +185,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: Purchase Invoice,Shipping Address,Endereço para Entrega
 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/public/js/setup_wizard.js +298,Box,Caixa
+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,Ordem de Venda do Plano de Produção
 DocType: Sales Partner,Sales Partner Target,Metas do Parceiro de Vendas
-DocType: Budget,Action if Annual Budget Exceeded,Ação se o Orçamento Anual for Excedido
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Entrada Contabilidade para {0} só pode ser feito em moeda: {1}
+DocType: Pricing Rule,Pricing Rule,Regra de Preços
 apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Pedido de Material para Ordem de Compra
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +78,Row # {0}: Returned Item {1} does not exists in {2} {3},Linha # {0}: Item devolvido {1} não existe em {2} {3}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Contas Bancárias
+DocType: Shopping Cart Settings,Payment Success URL,Pagamento URL Sucesso
+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 Bancário Conciliado
 DocType: Address,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/stock_entry/stock_entry.py +545,Manufacturing Quantity is mandatory,Manufacturing Quantidade é obrigatório
-DocType: Quality Inspection Reading,Reading 4,Leitura 4
+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/stock/doctype/stock_entry/stock_entry.py +344,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Não é permitido o tranfer mais do que {0} {1} contra Pedido de Compra {2}
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +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 +550,Manufacturing Quantity is mandatory,Manufacturing Quantidade é obrigatório
 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
 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 Solicitados, mas não Cotados"
+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 +197,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,Parar Aniversário Lembretes
 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 +550,Already completed,Já completado
+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 +242,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 +76,Previous Financial Year is not closed,O Ano Financeiro Anterior não está fechado
 DocType: Quotation Item,Quotation Item,Item do Orçamento
-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 partir de data não pode ser maior que a Data
 DocType: Purchase Order Item,Supplier Part Number,Número da peça do Fornecedor
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +185,{0} {1} is cancelled or stopped,{0} {1} é cancelado ou interrompido
+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} é 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 +221,Purchase Receipt {0} is not submitted,Recibo de compra {0} não é submetido
 DocType: Company,Default Payable Account,Contas a Pagar Padrão
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +83,{0}% Billed,{0}% Cobrada
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}% Cobrada
 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: BOM Item,BOM Item,Item da LDM
 DocType: Appraisal,For Employee,Para o Colaborador
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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 +80,Against Supplier Invoice {0} dated {1},Contra Fornecedor Invoice {0} {1} datada
-DocType: Customer,Default Price List,Lista de Preços Padrão
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +225,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/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 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/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 +9,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: 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
+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: 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: Shopping Cart Settings,Enable Shopping Cart,Ativar Carrinho de Compras
+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"
+DocType: Employee,Permanent Address,Endereço permanente
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,"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
 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)
-DocType: Purchase Invoice,Additional Discount,Desconto Adicional
 DocType: Selling Settings,Selling Settings,Configurações de Vendas
+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 ou Taxa de Valorização ou ambos"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +13,Fulfillment,Realização
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Empresa , Mês e Ano Fiscal é obrigatória"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Despesas com Marketing
@@ -788,60 +960,77 @@
 DocType: Leave Allocation,Total Leaves Allocated,Total de licenças alocadas
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +154,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: Upload Attendance,Get Template,Obter Modelo
+DocType: Employee,Date Of Retirement,Data da aposentadoria
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,Setup ERPNext Complete!
 DocType: Item,Weightage,Peso
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +93,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Existe um grupo de clientes com o mesmo nome, por favor modifique o nome do cliente ou renomeie o grupo de clientes"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +126,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: Homepage,Products,Produtos
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},Tipo de Sujeito e Sujeito são necessários para receber / pagar contas {0}
+DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Se este item tem variantes, então ele não pode ser selecionado em ordens de venda etc."
 DocType: Lead,Next Contact By,Próximo Contato Por
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +223,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
+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
-DocType: Asset,Depreciation Method,Método de Depreciação
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Este Imposto Está Incluído na Base de Cálculo?
 DocType: Program Course,Required,Necessário
 DocType: Job Applicant,Applicant for a Job,Candidato à uma Vaga
 DocType: Production Plan Material Request,Production Plan Material Request,Pedido de Materiais do Planejamento de Produção
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,Não há ordens de produção criadas
+DocType: Stock Reconciliation,Reconciliation JSON,Reconciliação JSON
 DocType: Purchase Invoice Item,Batch No,Nº do Lote
-apps/erpnext/erpnext/setup/doctype/company/company.py +164,Main,Principal
+DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Permitir várias ordens de venda contra a Ordem de Compra do Cliente
 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
 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 +858,Make Purchase Order,Criar ordem de compra
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +852,Make Purchase Order,Criar ordem de compra
 DocType: Payment Reconciliation Payment,Allocated amount,Quantidade atribuída
-DocType: Sales Invoice Item,Customer's Item Code,Código do Item do Cliente
 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 +172,Work-in-Progress Warehouse is required before Submit,Armazén de Trabalho em Andamento é necessário antes de Enviar
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,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: Purchase Order Item,Warehouse and Reference,Armazém e referências
 DocType: Supplier,Statutory info and other general information about your Supplier,Informações estatutárias e outras informações gerais sobre o seu Fornecedor
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +212,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/config/hr.py +137,Appraisals,Avaliações
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +215,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: 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 +442,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}
 DocType: Production Order Operation,Actual Time and Cost,Tempo e Custo Real
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Solicitação de materiais de máxima {0} pode ser feita para item {1} contra ordem de venda {2}
 DocType: Course,Course Abbreviation,Abreviação do Curso
 DocType: Item,Will also apply for variants,Também se aplica às variantes
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +142,"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 .
+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
 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
 DocType: Packing Slip,To Package No.,Para Pacote Nº.
 DocType: Production Planning Tool,Material Requests,Pedidos de Materiais
 DocType: Warranty Claim,Issue Date,Data do Incidente
-DocType: Activity Cost,Activity Cost,Custo da Atividade
-DocType: Timesheet Detail,Timesheet Detail,Detalhes do Registro de Tempo
+DocType: Sales Invoice Timesheet,Timesheet Detail,Detalhes do Registro de Tempo
+DocType: Purchase Receipt Item Supplied,Consumed Qty,Qtde consumida
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indica que o pacote é uma parte desta entrega (Só Rascunho)
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Criar entrada de pagamento
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},Quantidade de item {0} deve ser inferior a {1}
 ,Sales Invoice Trends,Tendência de Faturamento de Vendas
 DocType: Leave Application,Apply / Approve Leaves,Aplicar / Aprovar Leaves
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +134,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
@@ -849,65 +1038,94 @@
 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}
-DocType: Production Plan Material Request,Material Request Date,Data do Pedido de Materiais
+DocType: Production Plan Material Request,Material Request Date,Data do Pedido 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: 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 +14,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
 DocType: Budget,Fiscal Year,Exercício Fiscal
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +44,"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/public/js/setup_wizard.js +227,e.g. 5,ex: 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},Row {0}: quantidade atribuídos {1} deve ser menor ou igual a facturar saldo {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,Por extenso será visível quando você salvar a Nota Fiscal de Venda.
 DocType: Item,Is Sales Item,É item de venda
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Á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
 DocType: Maintenance Visit,Maintenance Time,Tempo da manutenção
-,Amount to Deliver,Valor a Entregar
+,Amount to Deliver,Total à Entregar
+apps/erpnext/erpnext/public/js/setup_wizard.js +292,A Product or Service,Um produto ou serviço
+apps/erpnext/erpnext/controllers/accounts_controller.py +238,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,Contra a Ordem de Vendas
 ,Serial No Status,Status do Nº de Série
 ,Daily Timesheet Summary,Resumo Diário dos Registros de Tempo
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +458,Item table can not be blank,Tabela de Itens não pode estar em branco
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +443,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 +5,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
 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 +326,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: Purchase Order Item,Material Request Item,Item de Pedido de Material
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +144,Cannot refer row number greater than or equal to current row number for this Charge type,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 +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Por favor, clique em ""Gerar Cronograma"" para buscar Serial Sem adição de item {0}"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +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
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +187,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,"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: Sales Invoice,Accounting Details,Detalhes 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 os pedidos de materiais na tabela acima
+DocType: Item Attribute,Attribute Name,Nome do atributo
 DocType: Item Group,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
 apps/erpnext/erpnext/config/projects.py +25,Gantt chart of all tasks.,Gráfico de Gantt de todas as tarefas.
 DocType: Opportunity,Mins to First Response,Minutos para Primeira Resposta
 DocType: Pricing Rule,Margin Type,Tipo da Margem
 DocType: Appraisal,For Employee Name,Para Nome do Colaborador
-DocType: Holiday List,Clear Table,Limpar Tabela
 DocType: C-Form Invoice Detail,Invoice No,Fatura nº
-DocType: Room,Room Name,Nome da Sala
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","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
-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 da carta de demissão
+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/public/js/setup_wizard.js +298,Pair,Par
 DocType: Asset,Depreciation Schedule,Tabela de Depreciação
 DocType: Bank Reconciliation Detail,Against Account,Contra à Conta
-DocType: Maintenance Schedule Detail,Actual Date,Data Real
 DocType: Item,Has Batch No,Tem nº de Lote
 DocType: Delivery Note,Excise Page Number,Número de página do imposto
 DocType: Asset,Purchase Date,Data da Compra
+DocType: Employee,Personal Details,Detalhes pessoais
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +182,Please set 'Asset Depreciation Cost Center' in Company {0},"Por favor, defina &quot;de ativos Centro de Custo Depreciação &#39;in Company {0}"
+,Maintenance Schedules,Horários de Manutenção
 DocType: Task,Actual End Date (via Time Sheet),Data Final Real (via Registro de Tempo)
 ,Quotation Trends,Tendências de Orçamentos
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,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 +327,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
 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: 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,Digite o Valor Pago
 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
@@ -915,77 +1133,101 @@
 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.
 DocType: Purchase Invoice,Additional Discount Amount,Total do Desconto Adicional
 DocType: Leave Block List Allow,Leave Block List Allow,Deixe Lista de Bloqueios Permitir
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,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/public/js/setup_wizard.js +298,Unit,Unidade
+apps/erpnext/erpnext/stock/get_item_details.py +123,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/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 +183,Closing (Opening + Totals),Fechamento (Abertura + Totais)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),Fechamento (Abertura + Totais)
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,"Por favor, especifique moeda in Company"
 DocType: Workstation,Wages per hour,salário por hora
 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 Materiais foram criadas automaticamente com base no nível de reposição do item
+apps/erpnext/erpnext/controllers/accounts_controller.py +275,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: Salary Slip,Deduction,Dedução
+DocType: Production Plan Item,material_request_item,material_request_item
+apps/erpnext/erpnext/stock/get_item_details.py +262,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 +7,Please enter Employee Id of this sales person,Digite o ID de Colaborador deste Vendedor
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +194,Please enter Production Item first,"Por favor, indique item Produção primeiro"
+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
+apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,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
 DocType: Production Order Operation,Actual Operation Time,Tempo Real da Operação
 DocType: Authorization Rule,Applicable To (User),Aplicável Para (Usuário)
-DocType: Purchase Taxes and Charges,Deduct,Deduzir
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,Job Description,Descrição do trabalho
 DocType: Purchase Order Item,Qty as per Stock UOM,Qtde por UDM do Estoque
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Mantenha o controle de campanhas de vendas. Mantenha o controle de Clientes em Potencial, Orçamentos, Pedido de Vendas, de Campanhas e etc, para medir retorno sobre o investimento."
 ,SO Qty,SO Qtde
 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 +191,Serial No {0} is under warranty upto {1},Nº de Série {0} está na garantia até {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},Nº de Série {0} está na garantia até {1}
 apps/erpnext/erpnext/config/stock.py +153,Split Delivery Note into packages.,Dividir Guia de Remessa em pacotes.
-apps/erpnext/erpnext/hooks.py +74,Shipments,Entregas
+apps/erpnext/erpnext/hooks.py +81,Shipments,Entregas
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Total Alocado (moeda da empresa)
 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/controllers/accounts_controller.py +416,"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: Cheque Print Template,Bank Name,Nome do Banco
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} is disabled,Usuário {0} está desativado
+apps/erpnext/erpnext/public/js/utils.js +167,Get From,Obter do
+DocType: Global Defaults,Default Company,Empresa padrão
+apps/erpnext/erpnext/controllers/stock_controller.py +167,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 +419,"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: 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: e-mails 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/accounts/doctype/sales_invoice/sales_invoice.py +346,{0} is mandatory for Item {1},{0} é obrigatório para o item {1}
+DocType: Leave Control Panel,Leave blank if considered for all departments,Deixe em branco se considerado para todos os departamentos
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,{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
 DocType: Purchase Invoice Item,Rate (Company Currency),Preço (moeda da empresa)
-apps/erpnext/erpnext/demo/setup_data.py +360,Others,Outros
 DocType: Payment Entry,Unallocated Amount,Quantia não Alocada
+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 +138,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
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Por favor, clique em ""Gerar Agenda"" para obter cronograma"
 DocType: Bin,Ordered Quantity,Quantidade Encomendada
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,"e.g. ""Build tools for builders""","ex: ""Desenvolve ferramentas para construtores """
+DocType: Quality Inspection,In Process,Em Processo
 DocType: Authorization Rule,Itemwise Discount,Desconto relativo ao Item
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,{0} against Sales Order {1},{0} contra a Ordem 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
 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 +549,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 Vendas 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 +809,Please select correct account,"Por favor, selecione conta correta"
 DocType: Item,Weight UOM,UDM de Peso
-DocType: Purchase Invoice Item,Page Break,Quebra de Página
+DocType: Employee,Blood Group,Grupo sanguíneo
 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 Pedido de Materiais quando o estoque atingir o nível mínimo
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Full-time,Tempo integral
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Full-time,Tempo integral
 DocType: Employee,Contact Details,Detalhes do Contato
+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."
+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 +321,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: Quality Inspection,Quality Manager,Gerente de Qualidade
 DocType: Job Applicant,Job Opening,Vaga 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 do Incharge Pessoa"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Tecnologia
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Carta de Ofeta
@@ -995,96 +1237,117 @@
 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 +108,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 +241,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
+DocType: Production Order Operation,Completed Qty,Qtde Concluída
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"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 +273,Price List {0} is disabled,Preço de {0} está desativado
 DocType: Manufacturing Settings,Allow Overtime,Permitir Hora Extra
 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
-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 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
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,Nenhuma folha de pagamento encontrada para o mês:
 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: Sales Order,Not Delivered,Não Entregue
+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."
 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: Timesheet Detail,Costing Amount,Valor de Custo
 DocType: Process Payroll,Submit Salary Slip,Enviar Folha de Pagamento
-apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Importação em Massa
+apps/erpnext/erpnext/controllers/selling_controller.py +162,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,Criar fatura de vendas
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,Softwares
-DocType: Sales Invoice Advance,Advance Amount,Quantidade Antecipada
+DocType: Company,For Reference Only.,Apenas para referência.
+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'
-DocType: Employee,New Workplace,Novo Local de Trabalho
+DocType: Employee,Employment Details,Detalhes de emprego
+apps/erpnext/erpnext/stock/get_item_details.py +113,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/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_data.py +361,Travel,Viagem
+apps/erpnext/erpnext/demo/setup/setup_data.py +304,Travel,Viagem
 DocType: Leave Block List,Allow Users,Permitir que os usuários
 DocType: Purchase Order,Customer Mobile No,Celular do Cliente
 DocType: Rename Tool,Rename Tool,Ferramenta de Renomear
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +23,Update Cost,Atualize o custo
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Atualize o custo
 DocType: Item Reorder,Item Reorder,Reposição de Item
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +748,Transfer Material,Transferência de Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,Transfer Material,Transferência de Material
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Especificar as operações, custos operacionais e dar um número único de operação às suas operações."
 apps/erpnext/erpnext/controllers/status_updater.py +166,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 +914,Please set recurring after saving,"Por favor, defina recorrentes depois de salvar"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +703,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
-apps/erpnext/erpnext/public/js/setup_wizard.js +216,Add Taxes,Adicionar Impostos
 DocType: Topic,Topic,Tópico
-DocType: Budget Account,Budget Account,Conta do Orçamento
 DocType: Quality Inspection,Verified By,Verificado por
+apps/erpnext/erpnext/setup/doctype/company/company.py +64,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","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: Quality Inspection,Purchase Receipt No,Nº do Recibo de Compra
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Sinal/Garantia em Dinheiro
 DocType: Process Payroll,Create Salary Slip,Criar Folha de Pagamento
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +33,Traceability,Rastreabilidade
 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 +352,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}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,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: Appraisal,Employee,Colaborador
+apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Convidar como Usuário
 DocType: Workstation Working Hour,End Time,Horário de Término
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Agrupar por Comprovante
 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 +199,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/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 cancelado antes de cancelar esta ordem de venda
 DocType: Notification Control,Expense Claim Approved,Pedido de Reembolso de Despesas Aprovado
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +297,Salary Slip of employee {0} already created for this period,Folha de Pagamento do colaborador {0} já criada para este período
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Pharmaceutical,Farmacêutico
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +309,Salary Slip of employee {0} already created for this period,Folha de Pagamento do colaborador {0} já criada 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,Ordem de Venda Obrigatória
-DocType: Purchase Invoice,Credit To,Crédito Para
+DocType: Purchase Invoice,Credit To,Crédito para
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +31,Active Leads / Customers,Leads ativo / Clientes
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Detalhe da Programação da Manutenção
 DocType: Buying Settings,Buying Settings,Configurações de Compras
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,Nº da LDM para um Item Bom Acabado
 DocType: Upload Attendance,Attendance To Date,Data Final de Comparecimento
+DocType: Warranty Claim,Raised By,Levantadas por
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +793,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
 DocType: Quality Inspection Reading,Accepted,Aceito
-DocType: Room,Room Number,Número da Sala
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +161,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) não pode ser maior do que a quantidade planejada ({2}) na ordem de produção {3}
+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."
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +162,{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/accounts/doctype/journal_entry/journal_entry.js +460,Quick Journal Entry,Lançamento no Livro Diário Rápido
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +111,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
+apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Fórum de Usuários
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +217,Raw Materials cannot be blank.,Matérias-primas não pode ficar em branco.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +441,"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 +450,Quick Journal Entry,Lançamento no Livro Diário Rápido
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +103,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/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is not submitted,{0} {1} não foi enviado
+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/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 +398,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
 ,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 +739,Item or Warehouse for row {0} does not match Material Request,Item ou Armazén na linha {0} não corresponde ao Pedido de Materiais
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +747,Item or Warehouse for row {0} does not match Material Request,Item ou Armazén na linha {0} não corresponde ao Pedido de Materiais
 DocType: Fiscal Year,Year End Date,Data final do ano
 ,Completed Production Orders,Ordens Produzidas
 DocType: Operation,Default Workstation,Estação de Trabalho Padrão
@@ -1094,51 +1357,56 @@
 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
 ,Employees working on a holiday,Colaboradores Trabalhando no Feriado
-apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Marcar Presença
+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: Authorization Rule,Applicable To (Role),Aplicável Para (Função)
 DocType: Stock Entry,Purpose,Finalidade
 DocType: Company,Fixed Asset Depreciation Settings,Configurações de Depreciação do Ativo Imobilizado
 DocType: Item,Will also apply for variants unless overrridden,Também se aplica a variantes a não ser que seja sobrescrito
-DocType: Production Order,Manufacture against Material Request,Fabricação Vinculada a Solicitação de Materiais
+DocType: Production Order,Manufacture against Material Request,Fabricação Vinculada a um Pedido de Material
 DocType: Item Reorder,Request for,Solicitado para
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Usuário Aprovador não pode ser o mesmo usuário da regra: é aplicável a
 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
-apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Próximos Passos
+DocType: Campaign,Campaign-.####,Campanha - . # # # #
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +695,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 +117,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 +346,{0} against Purchase Order {1},{0} contra a Ordem de Compra {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Digite os parâmetros da URL estática aqui (por exemplo remetente=ERPNext, usuario=ERPNext, senha=1234, etc)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} não consta em nenhum Ano Fiscal Ativo. Para mais detalhes consulte {2}.
 DocType: Task,Actual Start Date (via Time Sheet),Data de Início Real (via Registro de Tempo)
+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 Receipt Item,Recd Quantity,Quantidade Recebida
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +103,Cannot produce more Item {0} than Sales Order quantity {1},Não é possível produzir mais item {0} do que a quantidade Ordem de Vendas {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Stock Entry {0} is not submitted,Lançamento no Estoque {0} não é enviado
-DocType: Tax Rule,Billing City,Cidade de Faturamento
-apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card","ex: Banco, Dinheiro, Cartão de Crédito"
+DocType: Asset Category Account,Asset Category Account,Ativo Categoria Conta
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Não é possível produzir mais item {0} do que a quantidade Ordem de Vendas {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +505,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
-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,Fabricação
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Por favor de entrega Nota primeiro
 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/config/manufacturing.py +7,Production,Produção
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +89,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
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-DocType: Purchase Invoice,Is Paid,Está Pago
 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
-DocType: Stock Ledger Entry,Outgoing Rate,Taxa de Saída
 apps/erpnext/erpnext/config/hr.py +176,Organization branch master.,Branch master da Organização
 DocType: Sales Order,Billing Status,Status 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 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 +90,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 +93,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 da Ordem 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: Payment Entry,Payment Type,Tipo de Pagamento
 DocType: Process Payroll,Select Employees,Selecione Colaboradores
+DocType: Opportunity,Potential Sales Deal,Promoção de Vendas Potenciais
 DocType: Purchase Invoice,Total Taxes and Charges,Total de Impostos e Encargos
 DocType: Employee,Emergency Contact,Contato de emergência
 DocType: Bank Reconciliation Detail,Payment Entry,Pagamentos
@@ -1146,35 +1414,43 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +56,Ledger,Livro Razão
 DocType: Target Detail,Target  Amount,Valor da meta
 DocType: Shopping Cart Settings,Shopping Cart Settings,Configurações do Carrinho de Compras
+DocType: Journal Entry,Accounting Entries,Lançamentos contábeis
+apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},"Duplicar entrada . Por favor, verifique Regra de Autorização {0}"
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +26,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
 DocType: Purchase Invoice Item,Received Qty,Qtde Recebida
 DocType: Stock Entry Detail,Serial No / Batch,N º de Série / lote
-DocType: Account,Account Type,Tipo de Conta
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Programação de manutenção não é gerada para todos os itens. Por favor, clique em ""Gerar Agenda"""
-,To Produce,para Produzir
-apps/erpnext/erpnext/config/hr.py +93,Payroll,Folha de Pagamento
+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 Pai
+DocType: Delivery Note,DN-RET-,GDR-DEV
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +118,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 +163,"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"
 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,Itens do Recibo de Compra
-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,Total de Depreciação durante o período
 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: Appraisal Goal,Key Responsibility Area,Área Chave de Responsabilidade
 DocType: Payment Entry,Total Allocated Amount,Total Alocado
 DocType: Item Reorder,Material Request Type,Tipo de Pedido de Material
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +82,Row {0}: UOM Conversion Factor is mandatory,Linha {0}: Fator de Conversão da Unidade de Medida é obrigatório
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +79,Row {0}: UOM Conversion Factor is mandatory,Linha {0}: Fator de Conversão da Unidade de Medida é obrigatório
 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 da Ordem de Compra
 DocType: Tax Rule,Shipping Country,País de Envio
 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."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Armazém só pode ser alterado através de entrada / entrega  da nota / recibo de compra
+DocType: Employee Education,Class / Percentage,Classe / Percentual
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Income Tax,Imposto de Renda
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Se regra de preços selecionado é feita por 'preço', ele irá substituir Lista de Preços. Preço regra de preço é o preço final, de forma que nenhum desconto adicional deve ser aplicada. Assim, em operações como a Ordem de Vendas, Ordem de Compra etc, será buscado no campo ""taxa"", ao invés de campo ""Lista de Preços Rate '."
 apps/erpnext/erpnext/config/selling.py +164,Track Leads by Industry Type.,"Rastreia Clientes em Potencial, por Segmento."
-DocType: Item Supplier,Item Supplier,Fornecedor do Item
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +403,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 +770,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 +46,All Addresses.,Todos os Endereços.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +397,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 +764,Please select a value for {0} quotation_to {1},Por favor seleccione 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/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Gain/Loss on Asset Disposal,Ganho/Perda no Descarte de Ativo
@@ -1183,18 +1459,19 @@
 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 +100,Issues,Incidentes
-DocType: Sales Invoice,Debit To,Débito Para
+apps/erpnext/erpnext/hooks.py +109,Issues,Incidentes
 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
-DocType: Supplier,Billing Currency,Moeda de Faturamento
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Large,Extra Grande
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,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
-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/setup/setup_wizard/install_fixtures.py +110,Local,local
 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: 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 .
@@ -1204,81 +1481,113 @@
 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 +150,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
 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: Attendance,Leave Type,Tipo de Licenças
+apps/erpnext/erpnext/controllers/stock_controller.py +173,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
 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: C-Form Invoice Detail,Net Total,Total Líquido
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Quantia em Aberto
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Fila do estoque (PEPS)
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +38,{0} does not belong to Company {1},{0} não pertence à empresa {1}
 DocType: Account,Round Off,Arredondamento
 ,Requested Qty,Qtde Solicitada
 DocType: BOM Item,Scrap %,Sucata %
-,Requested,Solicitado
+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: 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 +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operação {0} mais do que as horas de trabalho disponíveis na estação de trabalho {1}, quebrar a operação em várias operações"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +83,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: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Salário bruto + Valor em atraso + Valor de cobrança - Dedução Total
 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/stock/doctype/purchase_receipt/purchase_receipt.py +99,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/hr/doctype/process_payroll/process_payroll.py +92,Salary Slip Created,Folha de Pagamento Criada
+apps/erpnext/erpnext/accounts/page/pos/pos.js +464,Please select Apply Discount On,"Por favor, selecione Aplicar Discount On"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +95,Salary Slip Created,Folha de Pagamento Criada
 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/purchase_invoice/purchase_invoice.py +384,Accounting Entry for Stock,Lançamento Contábil de Estoque
+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 +387,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 +37,Item {0} does not exist,Item {0} não existe
 DocType: Sales Invoice,Customer Address,Endereço do Cliente
 DocType: Purchase Invoice,Apply Additional Discount On,Aplicar Desconto Adicional em
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +88,Row # {0}: Cannot return more than {1} for Item {2},Linha # {0}: Não é possível retornar mais de {1} para o item {2}
+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
 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)
 DocType: Purchase Invoice,Select Supplier Address,Selecione um Endereço do Fornecedor
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,Warning: Material Requested Qty is less than Minimum Order Qty,Aviso: Quantidade de material solicitado é menor do que a ordem mínima
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +194,Account {0} is frozen,A Conta {0} está congelada
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Muito Pequeno
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +690,Warning: Material Requested Qty is less than Minimum Order Qty,Aviso: Quantidade de material solicitado é menor do que a ordem mínima
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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/controllers/selling_controller.py +126,Commission rate cannot be greater than 100,Percentual de comissão não pode ser maior do que 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +609,Can only make payment against unbilled {0},Só pode fazer o pagamento contra a faturar {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,Percentual de comissão não pode ser maior do que 100
+apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,"Por favor, indique {0} primeiro"
 DocType: Production Order Operation,Actual End Time,Tempo Final Real
 DocType: Production Planning Tool,Download Materials Required,Baixar Materiais Necessários
 DocType: Item,Manufacturer Part Number,Número de Peça do Fabricante
+DocType: Production Order Operation,Estimated Time and Cost,Tempo estimado e Custo
 DocType: SMS Log,No of Sent SMS,Nº de SMS enviados
-DocType: Account,Expense Account,Conta de Despesas
 DocType: Maintenance Visit,Scheduled,Agendado
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Solicitação de orçamento.
+apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Por favor, selecione o item em que &quot;é o estoque item&quot; é &quot;Não&quot; e &quot;é o item Vendas&quot; é &quot;Sim&quot; e não há nenhum outro pacote de produtos"
 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 +294,Price List Currency not selected,Lista de Preço Moeda não selecionado
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +168,Employee {0} has already applied for {1} between {2} and {3},Colaborador {0} já solicitou {1} entre {2} e {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +175,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
 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}
 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 +93,Researcher,Pesquisador
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Researcher,Pesquisador
 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.
 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/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: Asset Category Account,Depreciation Expense Account,Conta de Depreciação
-apps/erpnext/erpnext/hooks.py +102,Announcements,Anúncios
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Período Probatório
+apps/erpnext/erpnext/hooks.py +111,Announcements,Anúncios
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Somente nós-folha são permitidos em transações
-DocType: Expense Claim,Expense Approver,Aprovador de Despesas
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +109,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 +16,To Datetime,Para Data e Hora
+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/controllers/trends.py +145,Amt,Amt
+apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,Logs para a manutenção de status de entrega sms
+DocType: Payment Gateway,Gateway,Porta de entrada
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,"Por favor, indique data da liberação."
+apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,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 +26,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/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Estoque Mínimo
@@ -1289,34 +1598,37 @@
 DocType: Purchase Invoice Item,Accepted Warehouse,Armazén Aceito
 DocType: Bank Reconciliation Detail,Posting Date,Data da Postagem
 apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1},Não é possívelencontrar a taxa de câmbio de {0} para {1}
-apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Marcar Meio Dia
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,Duplicar entrada
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,Por extenso será visível quando você salvar a Ordem de Venda.
 ,Employee Birthday,Aniversário dos Colaboradores
-apps/erpnext/erpnext/controllers/status_updater.py +175,Limit Crossed,Limite Ultrapassado
+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: 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: 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
 ,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 os trabalhos
 DocType: Sales Order,% of materials billed against this Sales Order,% do material faturado contra esta Ordem de Venda
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Lançamento de Encerramento do Período
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Amount {0} {1} {2} {3},Quantia {0} {1} {2} {3}
-DocType: Account,Depreciation,Depreciação
+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 +326,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
 DocType: GL Entry,Voucher No,Nº do Comprovante
-DocType: Leave Allocation,Leave Allocation,Alocação de Licenças
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +498,Material Requests {0} created,Pedidos de Materiais {0} criados
+DocType: Purchase Invoice,Address and Contact,Endereço e Contato
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +260,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 +66,"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
-DocType: Asset Category Account,Accumulated Depreciation Account,Conta de Depreciação Acumulada
 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
@@ -1324,19 +1636,21 @@
 ,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
-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)
 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
-DocType: Asset,Item Code,Código do Item
+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 +324,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
 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 +233,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
@@ -1345,78 +1659,98 @@
 DocType: Account,Accounts Manager,Gerente de Contas
 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 Pedidos de Materiais
+DocType: Payment Request,Reference Details,Detalhes Referência
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +57,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,Valor Faturado
-apps/erpnext/erpnext/controllers/accounts_controller.py +555,'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
+,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 +558,'Update Stock' cannot be checked for fixed asset sale,"""Atualizar Estoque"" não pode ser selecionado para venda de ativo fixo"
+apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Obter atualizações
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +132,Material Request {0} is cancelled or stopped,Pedido de Material {0} é cancelado ou interrompido
-apps/erpnext/erpnext/config/hr.py +243,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 Entregues
+apps/erpnext/erpnext/public/js/setup_wizard.js +313,Add a few sample records,Adicione alguns registros de exemplo
+DocType: Lead,Lower Income,Baixa Renda
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","O chefe conta com Responsabilidade , no qual Lucro / Prejuízo será reservado"
+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/purchase_receipt/purchase_receipt.py +82,Purchase Order number required for Item {0},Número do pedido requerido para item {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',A 'Data Final' deve ser posterior a 'Data Inicial'
 DocType: Timesheet,"List of employee which has ""Salary Slip Based on Timesheet"" is enabled in salary structure.","Lista de colaboradores que possuem ""Holerite Baseado em Registro de Tempo"" habilitado na estrutura salarial."
 DocType: Asset,Fully Depreciated,Depreciados Totalmente
 ,Stock Projected Qty,Projeção de Estoque
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,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,Ordem 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/stock/doctype/material_request/material_request.py +400,Productions Orders cannot be raised for:,Ordens de produção não puderam ser geradas para:
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Minute,Minuto
 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/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Todos os Tipos de Fornecedores
+DocType: Sales Partner,Retailer,Varejista
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Credit To account must be a Balance Sheet account,Para crédito de conta deve ser uma conta de Balanço
 DocType: Global Defaults,Disable In Words,Desativar Por Extenso
+apps/erpnext/erpnext/stock/doctype/item/item.py +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/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/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Criar Folha de Pagamento
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +26,Browse BOM,Navegar LDM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,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/buying/doctype/request_for_quotation/request_for_quotation.py +136,Email sent to supplier {0},Email enviado ao fornecedor {0}
 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 +204,Leave approver must be one of {0},Deixe aprovador deve ser um dos {0}
 DocType: Hub Settings,Seller Email,Email do Vendedor
 DocType: Workstation Working Hour,Start Time,Horário de Início
 DocType: Item Price,Bulk Import Help,Ajuda na Importação em Massa
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +256,Select Quantity,Select Quantidade
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +257,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
 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: Salary Slip,Hour Rate,Valor por Hora
+DocType: Stock Settings,Item Naming By,Item de nomeação
 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
-DocType: Project,Project Type,Tipo de Projeto
+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.
-DocType: Item,Inspection Required,Inspeção Obrigatória
-DocType: Sales Order,Fully Billed,Totalmente Anunciado
+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}
+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}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),O peso bruto do pacote. Normalmente peso líquido + peso do material de embalagem. (para impressão)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Os usuários com esta função são autorizados a estabelecer contas congeladas e criar / modificar lançamentos contábeis contra contas congeladas
+DocType: Serial No,Is Cancelled,É cancelado
 DocType: Journal Entry,Bill Date,Data de Faturamento
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Mesmo se houver várias regras de preços com maior prioridade, então seguintes prioridades internas são aplicadas:"
 DocType: Supplier,Supplier Details,Detalhes do Fornecedor
 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/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Verifique todos
-DocType: Company,Default Income Account,Conta de Recebimento Padrão
+DocType: Sales 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
 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 +300,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/stock/doctype/item/item.js +33,Projected,Projetado
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,Purchase Order {0} is not submitted,Ordem de Compra {0} não é submetido
+apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota : O sistema não irá verificar o excesso de entrega e sobre- reserva para item {0} como quantidade ou valor é 0
 DocType: Notification Control,Quotation Message,Mensagem do Orçamento
-DocType: Issue,Opening Date,Data de Abertura
 DocType: Purchase Receipt Item,Rate and Amount,Preço e Total
-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 a mesma empresa
+apps/erpnext/erpnext/public/js/templates/contact_list.html +31,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
@@ -1428,16 +1762,15 @@
 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 +1190,Please select customer,Selecione o cliente
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1193,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 da Ordem de Venda
 DocType: Sales Invoice Item,Delivered Qty,Qtde Entregue
 ,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 +50,Missing Currency Exchange Rates for {0},Faltando Taxas de câmbio para {0}
 DocType: Journal Entry,Stock Entry,Lançamento no Estoque
-DocType: Payment Entry,Payment References,Referências de Pagamento
 DocType: Account,Payable,A pagar
-DocType: Salary Slip,Arrear Amount,Quantia em atraso
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Gross Profit %,Lucro Bruto %
+DocType: Salary Slip,Arrear Amount,Total em atraso
 DocType: Appraisal Goal,Weightage (%),Peso (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Data de Liberação
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +60,Gross Purchase Amount is mandatory,Valor Bruto de Compra é obrigatório
@@ -1446,266 +1779,323 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Pelo menos um dos Vendedores ou Compradores deve ser selecionado
 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én de Origem
-DocType: Installation Note,Installation Date,Data de Instalação
-DocType: Employee,Confirmation Date,Data de Confirmação
+apps/erpnext/erpnext/controllers/accounts_controller.py +537,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 +46,Min Qty can not be greater than Max Qty,Quantidade mínima não pode ser maior do que quantidade máxima
-DocType: Account,Accumulated Depreciation,Depreciação Acumulada
+DocType: Stock Entry,Customer or Supplier Details,Cliente ou fornecedor detalhes
 DocType: Lead,Lead Owner,Proprietário do Cliente em Potencial
-DocType: Bin,Requested Quantity,Quantidade Solicitada
-DocType: Employee,Marital Status,Estado Civil
 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
 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/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Data da aposentadoria deve ser maior que Data de Efetivação
 DocType: Sales Invoice,Against Income Account,Contra a Conta de 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).
+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 +379,Please set default {0} in Company {1},Por favor configure um(a) {0} padrão na empresa {1}
+apps/erpnext/erpnext/accounts/utils.py +456,Please set default {0} in Company {1},Por favor configure um(a) {0} padrão na empresa {1}
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Item da Ordem de Compra fornecido
+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.
 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
-apps/erpnext/erpnext/accounts/utils.py +349,Journal Entries {0} are un-linked,Lançamentos no Livro Diário {0} são desvinculados
+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 +426,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 e-mail, telefone, chat, visita, etc."
+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"
 DocType: Purchase Invoice,Terms,Condições
 DocType: Buying Settings,Purchase Order Required,Ordem de Compra Obrigatória
 ,Item-wise Sales History,Histórico de Vendas por Item
 DocType: Expense Claim,Total Sanctioned Amount,Valor Total Sancionado
-,Purchase Analytics,Análise de Compras
+,Purchase Analytics,Analítico de Compras
 DocType: Sales Invoice Item,Delivery Note Item,Item da Guia de Remessa
 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/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 +79,"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: Company,Default Letter Head,Cabeçalho Padrão
 DocType: Purchase Order,Get Items from Open Material Requests,Obter Itens de Requisições de Materiais 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 +29,Current Job Openings,Vagas Disponíveis Atualmente
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,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: Task,depends_on,depende_de
-DocType: BOM Replace Tool,BOM Replace Tool,Ferramenta de Substituição da LDM
+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 +24,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
 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/public/js/controllers/transaction.js +850,Show tax break-up,Mostrar imposto detalhado
+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 +841,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/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: Sales Invoice,Rounded Total,Total Arredondado
+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%
 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 +162,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/selling/doctype/customer/customer.py +195,Please contact to the user who have Sales Master Manager {0} role,"Por favor, entre em contato com um usuário que tem a função {0} Gerente Superior de Vendas"
+DocType: Company,Default Cash Account,Conta Caixa padrão
 apps/erpnext/erpnext/config/accounts.py +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 +5,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,Notas de entrega {0} deve ser cancelado antes de cancelar esta ordem de venda
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +75,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 +145,Note: There is not enough leave balance for Leave Type {0},Nota: Não é suficiente equilíbrio pela licença Tipo {0}
 DocType: Item,Supplier Items,Itens do Fornecedor
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,Nova 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.,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 +105,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 +228,{0} '{1}' is disabled,{0} '{1}' é desativada
+apps/erpnext/erpnext/controllers/accounts_controller.py +231,{0} '{1}' is disabled,{0} '{1}' é desativada
 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: 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 +78,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
 DocType: Pricing Rule,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)
-DocType: Item,Default BOM,LDM Padrão
+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/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
+DocType: Journal Entry,Printing Settings,Configurações de impressão
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,automotivo
 DocType: Asset Category Account,Fixed Asset Account,Conta do Ativo Imobilizado
-DocType: POS Profile,Allow Partial Payment,Permitir Pagamento Parcial
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,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
-DocType: Purchase Invoice,Price List Exchange Rate,Taxa de Câmbio da Lista de Preços
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +71,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
-DocType: Stock Entry,From BOM,Da LDM
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +32,Basic,Básico
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Por favor, clique em ""Gerar Agenda"""
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,internar
+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"
-DocType: Bank Reconciliation Detail,Payment Document,Documento de Pagamento
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,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 +108,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/setup/setup_wizard/industry_type.py +9,Airline,Companhia Aérea
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +752,Issue Material,Saída de Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +723,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
+DocType: Hub Settings,Access Token,Token de Acesso
 DocType: Purchase Invoice Item,Serial No,Nº de Série
-DocType: Purchase Invoice,Print Language,Idioma de Impressão
+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
 DocType: Fiscal Year,Year Name,Nome do ano
 DocType: Process Payroll,Process Payroll,Processar a Folha de Pagamento
 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 +96,Request for Quotations,Solicitação de Orçamento
+apps/erpnext/erpnext/hooks.py +104,Request for Quotations,Solicitação de Orçamento
 DocType: Payment Reconciliation,Maximum Invoice Amount,Valor Máximo da Fatura
-apps/erpnext/erpnext/config/selling.py +23,Customers,Clientes
+DocType: Asset,Partially Depreciated,parcialmente depreciados
 DocType: Issue,Opening Time,Horário de Abertura
-apps/erpnext/erpnext/stock/doctype/item/item.py +628,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/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 +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',A unidade de medida padrão para a variante '{0}' deve ser o mesmo que no modelo '{1}'
+DocType: Shipping Rule,Calculate Based On,Calcule Baseado em
 DocType: Delivery Note Item,From Warehouse,Armazén de Origem
 DocType: 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
 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/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
 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/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 +485,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 +486,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 +326,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
-,Produced,produzido
-DocType: Item,Item Code for Suppliers,Código do Item para Fornecedores
-apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,Anexar Timbrado
+DocType: Department,Days for which Holidays are blocked for this department.,Dias para que feriados são bloqueados para este departamento.
+DocType: Issue,Raised By (Email),Levantadas por (e-mail)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +338,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/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: Authorization Rule,Applicable To (Designation),Aplicável Para (Designação)
-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
 apps/erpnext/erpnext/config/accounts.py +262,Enable / disable currencies.,Ativar / Desativar moedas.
-DocType: Production Planning Tool,Get Material Request,Obter Pedido de Materiais
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Postal Expenses,Despesas Postais
+DocType: Production Planning Tool,Get Material Request,Obter Pedidos de Materiais
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
+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/config/accounts.py +107,Accounting Statements,Demonstrativos Contábeis
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +141,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"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 +122,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 +129,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: BOM Replace Tool,The new BOM after replacement,A nova LDM após substituição
-apps/erpnext/erpnext/accounts/page/pos/pos.js +639,Point of Sale,Ponto de Vendas
+apps/erpnext/erpnext/accounts/page/pos/pos.js +634,Point of Sale,Ponto de Vendas
 DocType: Payment Entry,Received Amount,Quantia Recebida
 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: Student,Middle Name,Nome do Meio
+DocType: Job Opening,Job Title,Cargo
+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 +185,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 +145,Please cancel Purchase Invoice {0} first,Por favor cancelar a fatura de compra {0} primeiro
 DocType: Serial No,AMC Expiry Date,Data de Validade do CAM
 ,Sales Register,Registro de Vendas
 DocType: Quotation,Quotation Lost Reason,Motivo da perda do Orçamento
 DocType: Address,Plant,Fábrica
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Não há nada a ser editado.
-DocType: Customer Group,Customer Group Name,Nome do Grupo de Clientes
 apps/erpnext/erpnext/public/js/financial_statements.js +54,Cash Flow Statement,Demonstrativo de Fluxo de Caixa
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Please remove this Invoice {0} from C-Form {1},"Por favor, remova esta Invoice {0} a partir de C-Form {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,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.js +644,Get Items,Obter Itens
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +210,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 +41,Account {0} does not belongs to company {1},Conta {0} não pertence à empresa {1}
 DocType: C-Form,C-Form,Formulário-C
+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 +265,Project-wise data is not available for Quotation,Dados do baseados em projeto não estão disponíveis para Orçamentos
+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: Appraisal Template,Appraisal Template Title,Título do Modelo de Avaliação
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,Commercial,Comercial
 DocType: Payment Entry,Account Paid To,Recebido na Conta
-apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Todos os Produtos ou Serviços.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +648,Row {0}# Account must be of type 'Fixed Asset',"Linha {0} # A conta deve ser do tipo ""Ativo Imobilizado"""
+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
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,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/config/projects.py +40,Types of activities for Time Logs,Tipos de Atividades para Registros de Tempo
-DocType: Stock Entry Detail,Basic Amount,Montante base
+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}
-DocType: Tax Rule,Billing State,Estado de Faturamento
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,Fetch exploded BOM (including sub-assemblies),Buscar LDM explodida (incluindo sub-conjuntos )
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +796,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 +118,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
 DocType: Journal Entry,Pay To / Recd From,Pagar Para / Recebido De
 DocType: Naming Series,Setup Series,Configuração de Séries
-,Inactive Customers,Clientes Inativos
+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: Quality Inspection,Delivery Note No,Nº da Guia de Remessa
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +587,Product Bundle,Pacote de Produtos
+DocType: Company,Retail,Varejo
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +120,Customer {0} does not exist,Cliente {0} não existe
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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
 DocType: Payment Entry,Account Paid From,Pago na Conta
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Código de Item de Matérias-primas
 DocType: Journal Entry,Write Off Based On,Abater Baseado em
 DocType: Stock Settings,Show Barcode Field,Mostrar Campo Código de Barras
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +708,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
 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/gl_entry/gl_entry.py +77,Account {0} cannot be a Group,A Conta {0} não pode ser um Grupo
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +31,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
 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 +39,Provisional Profit / Loss (Credit),Lucro Provisória / Loss (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: 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/accounts/doctype/purchase_invoice/purchase_invoice.js +626,Get Items from Product Bundle,Obter Itens do Pacote de Produtos
+apps/erpnext/erpnext/controllers/stock_controller.py +176,{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 +605,Get Items from Product Bundle,Obter Itens do Pacote de Produtos
 DocType: Project User,Project User,Usuário do Projeto
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} is inactive,A Conta {0} está inativa
-DocType: GL Entry,Is Advance,É antecipado
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} is inactive,A Conta {0} está inativa
+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
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,'Profit and Loss' type account {0} not allowed in Opening Entry,A conta {0} tipo 'Lucros e Perdas' não é permitida na Abertura do Período
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +71,'Profit and Loss' type account {0} not allowed in Opening Entry,A conta {0} tipo 'Lucros e Perdas' não é permitida na Abertura do Período
 DocType: Hub Settings,Seller Country,País do Vendedor
-DocType: Authorization Rule,Authorization Rule,Regra de Autorização
+apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,Publicar Itens no site
 DocType: Sales Invoice,Terms and Conditions Details,Detalhes dos Termos e Condiçõ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
 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: 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
-DocType: Tax Rule,Billing Country,País de Faturamento
+apps/erpnext/erpnext/controllers/accounts_controller.py +561,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Linha # {0}: Ativo {1} não pode ser submetido, já é {2}"
 DocType: Production Order,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Despesas com Entretenimento
+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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Legal Expenses,Despesas Legais
 DocType: Purchase Invoice,Posting Time,Horário da Postagem
-DocType: Sales Order,% Amount Billed,Valor faturado %
+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 +117,No Item with Serial No {0},Nenhum Item com Nº de Série {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Notificações Abertas
 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
-apps/erpnext/erpnext/controllers/accounts_controller.py +634,Account: {0} with currency: {1} can not be selected,A Conta: {0} com moeda: {1} não pode ser selecionada
-DocType: Bank Reconciliation Detail,Cheque Date,Data do Cheque
+DocType: Maintenance Visit,Breakdown,Colapso
+apps/erpnext/erpnext/controllers/accounts_controller.py +637,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/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
-DocType: Appraisal,HR,RH
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Probation,Provação
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Probation,Provação
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Componentes Salariais
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Payment of salary for the month {0} and year {1},Pagamento de salário para o mês {0} e {1} ano
 DocType: Stock Settings,Auto insert Price List rate if missing,Inserir automaticamente o preço na lista de preço se não houver nenhum.
 DocType: Production Order Item,Transferred Qty,Qtde Transferida
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Planning,Planejamento
+apps/erpnext/erpnext/config/learn.py +11,Navigating,Navegação
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,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,Fornecedor ID
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +212,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."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Sales invoice submitted sucessfully.,Nota Fiscal de Venda enviada com sucesso.
 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}
 DocType: Assessment Result,Student Name,Nome do Aluno
 DocType: Brand,Item Manager,Gerente de Item
@@ -1715,34 +2105,43 @@
 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 +78,Raw material cannot be same as main Item,Matéria-prima não pode ser o mesmo como o principal item
+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 .
 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
 ,Sales Funnel,Funil de Vendas
+apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +25,Abbreviation is mandatory,Abreviatura é obrigatória
 ,Qty to Transfer,Qtde 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/controllers/accounts_controller.py +595,{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/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Todos os grupos de clientes
+apps/erpnext/erpnext/controllers/accounts_controller.py +598,{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
 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"
+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
+DocType: POS Profile,Apply Discount On,Aplicar Discount On
 ,Reqd By Date,Entrega Esperada em
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,Linha # {0}: O número de série é obrigatório
+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 +859,Supplier Quotation,Orçamento de Fornecedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +838,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/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Próximos Eventos
+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 Retorno
+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: Employee,Personal Email,Email pessoal
+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
 DocType: Production Order Operation,"in Minutes
@@ -1751,95 +2150,111 @@
 DocType: Customer,From Lead,Do Cliente em Potencial
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Ordens liberadas para produção.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Selecione o Ano Fiscal ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,POS Profile required to make POS Entry,Perfil do PDV necessário para fazer entrada no PDV
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +509,POS Profile required to make POS Entry,Perfil do PDV necessário para fazer entrada no PDV
+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 +135,Atleast one warehouse is mandatory,Pelo menos um armazén é obrigatório
+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
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Invoice {1},{0} contra Nota Fiscal de Vendas {1}
-DocType: Request for Quotation Item,Project Name,Nome do Projeto
 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: Payment Reconciliation Payment,Payment Reconciliation Payment,Pagamento da Conciliação de Pagamento
-DocType: BOM Item,BOM No,Nº da LDM
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +133,Journal Entry {0} does not have account {1} or already matched against other voucher,Lançamento no Livro Diário {0} não tem conta {1} ou já conciliado com outro comprovante
-DocType: Item,Moving Average,Média Móvel
 DocType: BOM Replace Tool,The BOM which will be replaced,A LDM que será substituída
 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 +44,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
 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/selling/doctype/sales_order/sales_order.py +301,Paid and Not Delivered,Pago e Não Entregue
 DocType: Purchase Invoice,End Date,Data Final
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Transações de Estoque
-DocType: Budget,Budget Accounts,Contas do Orçamento
+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
-DocType: Account,Expense,Despesa
+apps/erpnext/erpnext/utilities/doctype/address/address.py +77,"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
 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/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 +28,Jobs,Trabalhos
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,Trabalhos
 ,Sales Order Trends,Tendência de Ordens 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
 ,Employee Information,Informações do Colaborador
-DocType: Stock Entry Detail,Additional Cost,Custo Adicional
 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 +763,Make Supplier Quotation,Criar Orçamento do Fornecedor
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,Make Supplier Quotation,Criar Orçamento do Fornecedor
+DocType: Quality Inspection,Incoming,Entrada
+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"
-DocType: Batch,Batch ID,ID do Lote
+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 +350,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
 DocType: GL Entry,Party,Sujeito
-DocType: Sales Order,Delivery Date,Data de Entrega
 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
 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
 DocType: Department,Leave Block List,Lista de Bloqueio de Licença
 DocType: Customer,Tax ID,CPF/CNPJ
+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
 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/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Devolução
-DocType: Pricing Rule,Disable,Desativar
-apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +69,Customer Id,ID do Cliente
+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}"
+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/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: BOM,Last Purchase Rate,Valor da Última Compra
-DocType: Account,Asset,Ativo
 DocType: Project Task,Task ID,ID Tarefa
 ,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: Monthly Distribution,Monthly Distribution Percentages,Percentagens distribuição mensal
 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
 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/asset/asset.py +39,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
 DocType: Item Group,Parent Item Group,Grupo de item pai
-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 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}
+DocType: Opportunity,Next Contact,Próximo Contato
 DocType: Employee,Employment Type,Tipo de Emprego
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Ativos Imobilizados
 DocType: Payment Entry,Set Exchange Gain / Loss,Definir Perda/Ganho com Câmbio
-,Cash Flow,Fluxo de Caixa
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +88,Application period cannot be across two alocation records,Período de aplicação não pode ser através de dois registros de alocação
 DocType: Item Group,Default Expense Account,Conta Padrão de Despesa
 DocType: Employee,Notice (days),Aviso Prévio ( dias)
 DocType: Employee,Encashment Date,Data da cobrança
 DocType: Account,Stock Adjustment,Ajuste de 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
+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: Job Applicant,Applicant Name,Nome do Candidato
 DocType: Authorization Rule,Customer / Item Name,Nome do Cliente/Produto
 DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
 
@@ -1848,7 +2263,9 @@
 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"
 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.
 DocType: BOM Replace Tool,Current BOM,LDM atual
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Adicionar Serial No
@@ -1857,14 +2274,15 @@
 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/setup/setup_wizard/install_fixtures.py +70,Dispatch,Expedição
-DocType: Account,Receivable,A receber
+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/accounts/doctype/pricing_rule/pricing_rule.py +70,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 a ordem de compra já existe
-DocType: Sales Invoice,Supplier Reference,Referência do Fornecedor
-DocType: Item,Material Issue,Saída de Material
+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
 DocType: Item Price,Item Price,Preço do Item
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Pedido
+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"
@@ -1873,163 +2291,213 @@
 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"
+DocType: Leave Block List,Applies to Company,Aplica-se a Empresa
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +198,Cannot cancel because submitted Stock Entry {0} exists,Não pode cancelar por causa da entrada submetido {0} existe
 DocType: Purchase Invoice,In Words,Por Extenso
 DocType: Production Planning Tool,Material Request For Warehouse,Pedido 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 +437,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 +143,Join,Junte-se
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Variante item {0} existe com os mesmos atributos
 DocType: Salary Slip,Salary Slip,Folha de Pagamento
 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."
 DocType: Sales Invoice Item,Sales Order Item,Item da Ordem 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 &quot;Enviadas&quot;, um pop-up abre automaticamente para enviar um e-mail para o &quot;Contato&quot; associado a transação, com a transação como um anexo. O usuário pode ou não enviar o e-mail."
 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 +857,It is needed to fetch Item Details.,É preciso buscar Número detalhes.
 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: 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
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Sick Leave,Licença Médica
+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
 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 +314,No accounting entries for the following warehouses,Nenhuma entrada de contabilidade para os seguintes armazéns
 DocType: Account,Chargeable,Taxável
+DocType: Company,Change Abbreviation,Mudança 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,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: BOM,Manufacturing User,Usuário de Fabricação
-DocType: Purchase Invoice,Raw Materials Supplied,Matérias-primas Fornecidas
+DocType: Purchase Invoice,Recurring Print Format,Recorrente Formato de Impressão
 DocType: C-Form,Series,Série
-DocType: Appraisal,Appraisal Template,Modelo de Avaliação
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,Expected Delivery Date cannot be before Purchase Order Date,Previsão de Entrega A data não pode ser antes de Ordem de Compra Data
+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/accounts/report/budget_variance_report/budget_variance_report.js +16,Period,Período
 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: Program Enrollment Tool,New Program,Novo Programa
+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 Salariais
-DocType: Sales Invoice,Commission,Comissão
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +953,Please select {0} first,Por favor seleccione {0} primeiro
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +757,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
 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
 ,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 +87,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,Novas Ordens de Compra
+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...
 DocType: Sales Invoice,C-Form Applicable,Formulário-C Aplicável
+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/accounts/doctype/account/account.py +170,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),Mantenha amigável para web 900px (w) por 100px ( h )
+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 ela mesma como uma conta superior
 DocType: Purchase Invoice Item,Price List Rate,Preço na Lista de Preços
 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."
-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 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
+DocType: Maintenance Visit,Fully Completed,Totalmente concluída
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% concluída
+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: Employee Leave Approver,Employee Leave Approver,Licença do Colaborador Aprovada
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,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 +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/crm/doctype/opportunity/opportunity.py +79,"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 +434,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/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
 DocType: Cheque Print Template,Cheque Print Template,Template para Impressão de Cheques
 ,Requested Items To Be Ordered,"Itens Solicitados, mas não Comprados"
-DocType: Price List,Price List Name,Nome da Lista de Preços
 DocType: BOM,Manufacturing,Fabricação
-,Ordered Items To Be Delivered,"Itens Vendidos, mas não Despachados"
+,Ordered Items To Be Delivered,"Itens Vendidos, mas não Entregues"
 DocType: Account,Income,Receita
-DocType: Industry Type,Industry Type,Tipo de Indústria
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,Warning: Leave application contains following block dates,Aviso: pedido de férias contém as datas de intervalos
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +120,Warning: Leave application contains following block dates,Aviso: pedido de férias contém as datas de intervalos
+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: Announcement,Student,Aluno
 apps/erpnext/erpnext/config/hr.py +181,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/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Por favor introduza a mensagem antes de enviá-
 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
-DocType: Cost Center,Cost Center Name,Nome do Centro de Custo
 DocType: Maintenance Schedule Detail,Scheduled Date,Data Agendada
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Paid Amt,Total pago Amt
 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 +272,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.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +49,Cannot set as Lost as Sales Order is made.,Não é possível definir como perdida como ordem de venda é feita.
-DocType: Student Applicant,Mother's Name,Nome da Mãe
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Received From,Recebido de
 DocType: Item,Has Serial No,Tem nº de Série
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +93,Row {0}: Hours value must be greater than zero.,Linha {0}: Horas deve ser um valor maior que zero
-DocType: Issue,Content Type,Tipo de Conteúdo
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Computador
+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 +117,Row {0}: Hours value must be greater than zero.,Linha {0}: Horas deve ser um valor maior que zero
 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 +296,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 +72,Item: {0} does not exist in the system,Item: {0} não existe no sistema
 apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,Você não está autorizado para definir o valor congelado
 DocType: Payment Reconciliation,Get Unreconciled Entries,Obter Lançamentos não Conciliados
 DocType: Payment Reconciliation,From Invoice Date,A Partir da Data de Faturamento
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,O que isto faz ?
-DocType: Delivery Note,To Warehouse,Para Armazén
+DocType: Delivery Note,To Warehouse,Para o Armazén
 ,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
+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
 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 +318,Row {0}: Exchange Rate is mandatory,Row {0}: Taxa de Câmbio é obrigatória
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID 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 +210,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/accounts/doctype/sales_invoice/sales_invoice.py +324,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Ativos Estoque
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},Você realmente quer submeter todos os folha de salário do mês {0} e {1} ano
 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
-DocType: Attendance,Present,Presente
+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
 DocType: Sales Order Item,Ordered Qty,Qtde Encomendada
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} is disabled,Item {0} está desativada
 DocType: Stock Settings,Stock Frozen Upto,Estoque congelado até
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +838,BOM does not contain any stock item,LDM não contém nenhum item de estoque
-apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Atividade / tarefa do projeto.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +809,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
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Compra deve ser verificada, se for caso disso nos items selecionados como {0}"
+apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Desconto deve ser inferior a 100
 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 +485,Row #{0}: Please set reorder quantity,"Linha # {0}: Por favor, defina a quantidade de reposição"
+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: Landed Cost Voucher,Landed Cost Voucher,Comprovante de Custos de Desembarque
-DocType: Purchase Invoice,Repeat on Day of Month,Repetir no Dia do Mês
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +62,Please set {0},Defina {0}
 DocType: Employee,Health Details,Detalhes sobre a Saúde
 DocType: Offer Letter,Offer Letter Terms,Termos da Carta de Oferta
 DocType: Serial No,Delivery Document Type,Tipo do Documento de Entrega
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Enviar todas as folhas de pagamento para os critérios acima selecionados
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} Iten(s) sincronizado(s)
-DocType: Sales Order,Partly Delivered,Parcialmente entregue
-DocType: Sales Invoice,Existing Customer,Cliente Existente
-DocType: Purchase Invoice Item,Rejected Serial No,Nº de Série Rejeitado
+DocType: Email Digest,Receivables,Recebíveis
+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: 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 +129,BOM and Manufacturing Quantity are required,A LDM e a Quantidade para Fabricação são necessários
-DocType: Bank Reconciliation Detail,Amount,Quantia
-apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,LDM substituída
+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/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 +96,Please enter default currency in Company Master,"Por favor, indique moeda padrão in Company Mestre"
 DocType: Stock Entry Detail,Stock Entry Detail,Detalhe do Lançamento no Estoque
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +100,Daily Reminders,Lembretes Diários
 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/account/account_tree.js +23,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
 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 e-mail no envio da
@@ -2037,14 +2505,19 @@
 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 do Pedido de Materiais
+apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Erro: Não é um ID válido?
 DocType: Naming Series,Update Series Number,Atualizar Números de Séries
 DocType: Account,Equity,Patrimônio Líquido
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Engineer,Engenheiro
+DocType: Sales Order,Printing Details,Imprimir detalhes
 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 +370,Item Code required at Row No {0},Código do item exigido na Linha Nº {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +398,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
+DocType: Production Order,Production Order,Ordem de Produção
+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: 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)
@@ -2053,56 +2526,68 @@
 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 +55,Part-time,De meio expediente
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,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 +56,Series Updated,Série Atualizada
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +57,Series Updated,Série Atualizada
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,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/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: Production Order,Planned End Date,Data Planejada de Término
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Valor Faturado
 DocType: Attendance,Attendance,Comparecimento
-,Item Prices,Preços de Itens
+DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Se não for controlada, a lista deverá ser adicionado a cada departamento onde tem de ser aplicado."
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Data e 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 a Ordem 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.
 DocType: Task,Review Date,Data da Revisão
-DocType: Purchase Taxes and Charges,On Net Total,No Total Líquido
 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
 DocType: Company,Round Off Account,Conta de Arredondamento
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Consultoria
+DocType: Customer Group,Parent Customer Group,Grupo de Clientes pai
 DocType: Purchase Invoice,Contact Email,E-mail do Contato
 DocType: Appraisal Goal,Score Earned,Pontuação Obtida
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Notice Period,Período de Aviso Prévio
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,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.
 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
 DocType: Asset,Frequency of Depreciation (Months),Frequência das Depreciações (meses)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Credit Account,Conta de crédito
 DocType: Landed Cost Item,Landed Cost Item,Custo de Desembarque do Item
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +55,Show zero values,Mostrar valores zerados
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Mostrar valores zerados
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Quantidade do item obtido após a fabricação / reembalagem a partir de determinadas quantidades de matéria-prima
 DocType: Payment Reconciliation,Receivable / Payable Account,Conta de Recebimento/Pagamento
-DocType: Item,Default Warehouse,Armazém Padrão
+DocType: Delivery Note Item,Against Sales Order Item,Contra a Ordem de venda do item
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},"Por favor, especifique Atributo Valor para o atributo {0}"
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +39,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
 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)
-DocType: Batch,Batch,Lote
+apps/erpnext/erpnext/stock/doctype/item/item.js +21,Balance,Equilíbrio
 DocType: Room,Seating Capacity,Número de Assentos
 DocType: Issue,ISS-,INC-
 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: Sales Invoice,Cold Calling,Chamada Telefônica
 DocType: SMS Parameter,SMS Parameter,Parâmetro de SMS
 DocType: Maintenance Schedule Item,Half Yearly,Semestral
-DocType: Lead,Blog Subscriber,Assinante do Blog
+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: Purchase Invoice,Total Advance,Antecipação Total
+DocType: Purchase Invoice,Total Advance,Total Pago Adiantado
+apps/erpnext/erpnext/config/hr.py +253,Processing Payroll,Processamento de folha de pagamento
 DocType: GL Entry,Credit Amount,Total de crédito
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Definir como Perdido
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,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 +5,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: Tax Rule,Tax Rule,Regras de Aplicação de Impostos
@@ -2110,34 +2595,43 @@
 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
-DocType: Company,Company Info,Informações da Empresa
-apps/erpnext/erpnext/accounts/page/pos/pos.js +941,Select or add new customer,Selecione ou adicione um novo cliente
+apps/erpnext/erpnext/accounts/page/pos/pos.js +930,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 +5,This is based on the attendance of this Employee,Isto é baseado na frequência deste Colaborador
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +463,Debit Account,Conta de Débito
 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: 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."
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +210,Supplier Quotation {0} created,Cotação {0} do fornecedor criada
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Employee Benefits,Benefícios a Colaboradores
+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 +208,Supplier Quotation {0} created,Cotação {0} do fornecedor criada
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,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/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 +500,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}
 DocType: Maintenance Schedule,Schedule,Agendar
 DocType: Account,Parent Account,Conta Superior
+,Hub,Cubo
 DocType: GL Entry,Voucher Type,Tipo de Comprovante
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +244,Employee relieved on {0} must be set as 'Left',Colaborador dispensado em {0} deve ser definido como 'Desligamento'
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1008,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 +256,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: Employee,Education,Educação
+DocType: Selling Settings,Campaign Naming By,Campanha de nomeação
 DocType: Employee,Current Address Is,Endereço atual é
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,"Optional. Sets company's default currency, if not specified.","Opcional. Define moeda padrão da empresa, se não for especificado."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Lançamentos no livro Diário.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +259,Please select Employee Record first.,"Por favor, selecione o registro do Colaborador primeiro."
+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 +266,Please select Employee Record first.,"Por favor, selecione o registro do Colaborador primeiro."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +190,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
 DocType: Account,Stock,Estoque
+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
 DocType: Employee,Contract End Date,Data Final do Contrato
@@ -2147,65 +2641,75 @@
 DocType: Pricing Rule,Min Qty,Quantidade mínima
 DocType: Asset Movement,Transaction Date,Data da Transação
 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
 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)
+DocType: Purchase Invoice,Net Total (Company Currency),Total Líquido (moeda da empresa)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +78,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 contra esta Ordem de Venda
-DocType: Project,Gross Margin %,Margem Bruta %
+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}."
 DocType: Asset,Is Existing Asset,É Ativo Existente
 ,Monthly Salary Register,Folha de Pagamento Mensal
+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
 DocType: POS Profile,POS Profile,Perfil do PDV
+apps/erpnext/erpnext/stock/get_item_details.py +129,"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: Purchase Order,Advance Paid,Adiantamento Pago
 DocType: Item,Item Tax,Imposto do Item
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,Material to Supplier,Material a Fornecedor
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,Excise Invoice
 DocType: Expense Claim,Employees Email Id,Endereços de Email dos Colaboradores
-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 Circulante
-DocType: Program,Program Name,Nome do Programa
 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/setup/setup_wizard/install_fixtures.py +136,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 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: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Impostos e taxas deduzidos (moeda da empresa)
-DocType: Item Attribute,Numeric Values,Valores Numéricos
+DocType: Item Group,General Settings,Configurações Gerais
+apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +19,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
 DocType: Customer,Commission Rate,Percentual 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 licenças por departamento.
 apps/erpnext/erpnext/config/selling.py +169,Analytics,Análise
 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 .
 DocType: Manufacturing Settings,Allow Production on Holidays,Permitir a Produção em Feriados
 DocType: Sales Order,Customer's Purchase Order Date,Data da Ordem 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
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Produtos em Destaque
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Designer,Designer
 apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,Modelo de Termos e Condições
-DocType: Program,Program Code,Código do Programa
+DocType: Serial No,Delivery Details,Detalhes da entrega
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +472,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 +334,Please select Category first,Por favor seleccione Categoria primeira
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Cadastro de Projeto.
-DocType: Supplier,Credit Days,Dias de Crédito
+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: Leave Type,Is Carry Forward,É encaminhado
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +740,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,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 pedidos de vendas na tabela acima"
 ,Stock Summary,Resumo do Estoque
-apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,Lista de Materiais
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,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: GL Entry,Is Opening,É Abertura
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +169,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
 DocType: Account,Cash,Dinheiro
diff --git a/erpnext/translations/pt.csv b/erpnext/translations/pt.csv
index 1ed7484..b764801 100644
--- a/erpnext/translations/pt.csv
+++ b/erpnext/translations/pt.csv
@@ -1,520 +1,526 @@
 DocType: Employee,Salary Mode,Modo 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.,Atenção: O mesmo artigo 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 Partido Tipo primeiro"
-DocType: Item,Customer Items,Itens de clientes
-DocType: Project,Costing and Billing,Custos e faturamento
-apps/erpnext/erpnext/accounts/doctype/account/account.py +52,Account {0}: Parent account {1} can not be a ledger,Conta {0}: conta principal {1} não pode ser um livro
-DocType: Item,Publish Item to hub.erpnext.com,Publicar Item para hub.erpnext.com
-apps/erpnext/erpnext/config/setup.py +88,Email Notifications,Notificações de e-mail
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Itens já sincronizados
+DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Permitir que o Item seja adicionado várias vezes numa transação
+apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Anule a Visita Material {0} antes de cancelar esta Solicitação de Garantia
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Produtos do Consumidor
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,"Por favor, selecione primeiro o Tipo de Parte"
+DocType: Item,Customer Items,Itens de 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,A Conta {0}: Conta Principal {1} não pode ser um livro
+DocType: Item,Publish Item to hub.erpnext.com,Publicar Item em hub.erpnext.com
+apps/erpnext/erpnext/config/setup.py +88,Email Notifications,Notificações de Email
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +21,Evaluation,Avaliação
-DocType: Item,Default Unit of Measure,Unidade de medida padrão
-DocType: SMS Center,All Sales Partner Contact,Todos os Contactos dos parceiros de vendas
-DocType: Employee,Leave Approvers,Deixe aprovadores
-DocType: Sales Partner,Dealer,Revendedor
+DocType: Item,Default Unit of Measure,Unidade de Medida Padrão
+DocType: SMS Center,All Sales Partner Contact,Todos os Contactos de Parceiros de Vendas
+DocType: Employee,Leave Approvers,Aprovadores da Licença
+DocType: Sales Partner,Dealer,Intermediário
 DocType: Employee,Rented,Alugado
-DocType: Purchase Order,PO-,PO-
-apps/erpnext/erpnext/accounts/report/financial_statements.py +19,Start Year {0} not found.,Ano de início {0} não foi encontrado.
-DocType: POS Profile,Applicable for User,Aplicável para o usuário
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +191,"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 +197,Do you really want to scrap this asset?,Você realmente quer se desfazer desse ativo?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +17,Select Default Supplier,Escolha um fornecedor de substituição
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Moeda é necessário para Preço de {0}
+DocType: Purchase Order,PO-,OC-
+DocType: POS Profile,Applicable for User,Aplicável ao Utilizador
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +192,"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 +198,Do you really want to scrap this asset?,Deseja realmente desfazer-se deste ativo?
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Escolha um fornecedor de substituição
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},É necessário colocar a Moeda 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,feild obrigatória - Programa
-DocType: Job Applicant,Job Applicant,Candidato a emprego
+DocType: Address,County,Condado
+DocType: Purchase Order,Customer Contact,Contacto de 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 +5,This is based on transactions against this Supplier. See timeline below for details,Isto é baseado em operações contra esse fornecedor. Veja cronograma abaixo para 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,legal
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +158,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}
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Legal
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +158,Actual type tax cannot be included in Item rate in row {0},O tipo de imposto efetivo não pode ser incluído na Taxa de item na linha {0}
 DocType: C-Form,Customer,Cliente
-DocType: Purchase Receipt Item,Required By,Exigido por
-DocType: Delivery Note,Return Against Delivery Note,Regresso contra entrega Nota
+DocType: Purchase Receipt Item,Required By,Solicitado Por
+DocType: Delivery Note,Return Against Delivery Note,Devolver Contra Nota de Entrega
 DocType: Department,Department,Departamento
-DocType: Purchase Order,% Billed,Anunciado%
-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})
-DocType: Sales Invoice,Customer Name,Nome do cliente
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +126,Bank account cannot be named as {0},A conta bancária não pode ser nomeado 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 +180,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,Deixe Nome Tipo
+DocType: Purchase Order,% Billed,% Faturado
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),A Taxa de Câmbio deve ser a mesmo que {0} {1} ({2})
+DocType: Sales Invoice,Customer Name,Nome do Cliente
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +126,Bank account cannot be named as {0},A conta bancária não pode ser designada como {0}
+DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Os livros (ou grupos) sobre os quais são efetuados Registos Contabilísticos e são mantidos saldos.
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Outstanding for {0} cannot be less than zero ({1}),O Pendente para {0} não pode ser inferior a zero ({1})
+DocType: Manufacturing Settings,Default 10 mins,Padrão 10 min
+DocType: Leave Type,Leave Type Name,Nome de Tipo de Licença
 apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,Mostrar aberta
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Série atualizado com sucesso
-apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Confira
-DocType: Pricing Rule,Apply On,aplicar Em
-DocType: Item Price,Multiple Item prices.,Meerdere Artikelprijzen .
-,Purchase Order Items To Be Received,Comprar itens para ser recebido
-DocType: SMS Center,All Supplier Contact,Todos os contactos de fornecedores
-DocType: Quality Inspection Reading,Parameter,Parâmetro
-apps/erpnext/erpnext/projects/doctype/project/project.py +54,Expected End Date can not be less than Expected Start Date,Data prevista End não pode ser menor do que o esperado Data de Início
-apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Fila # {0}: Taxa deve ser o mesmo que {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +239,New Leave Application,Aplicação deixar Nova
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +20,Attendance Record {0} exists against Student {1} for Course Schedule {2},Comparecimento recorde {0} existe contra Student {1} para o Calendário de Cursos {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Bank Draft,cheque administrativo
-DocType: Mode of Payment Account,Mode of Payment Account,Modo de pagamento da conta
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +149,Series Updated Successfully,Série atualizado 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.,Múltiplos Preços do Item
+,Purchase Order Items To Be Received,Itens de Pedido de Compra a Serem Recebidos
+DocType: SMS Center,All Supplier Contact,Todos os Contactos de Fornecedores
+apps/erpnext/erpnext/projects/doctype/project/project.py +54,Expected End Date can not be less than Expected Start Date,A Data de Término Prevista não pode ser anterior à Data de Início Prevista
+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 +246,New Leave Application,Novo Pedido de Licença
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +20,Attendance Record {0} exists against Student {1} for Course Schedule {2},Existe um Registo de Assiduidade {0} para o Estudante {1} para o Cronograma do Curso {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,Cheque Bancário
+DocType: Mode of Payment Account,Mode of Payment Account,Modo de Pagamento da Conta
 apps/erpnext/erpnext/stock/doctype/item/item.js +52,Show Variants,Mostrar Variantes
-DocType: Academic Term,Academic Term,Termo acadêmico
+DocType: Academic Term,Academic Term,Período Letivo
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +13,Material,Material
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Quantity,Quantidade
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +511,Accounts table cannot be blank.,Contas tabela não pode estar em branco.
-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/purchase_invoice/purchase_invoice.js +616,Quantity,Quantidade
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +512,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 ( Passivos)
 DocType: Employee Education,Year of Passing,Ano de Passagem
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s","Referência:% s, Item Code:% s eo Cliente:% s"
-apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Em Estoque
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s","Referência: %s, Código de Item: %s e Cliente: %s"
+apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Em Stock
+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,Item do plano de produção
+DocType: Production Plan Item,Production Plan Item,Item do Plano de Produção
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +142,User {0} is already assigned to Employee {1},Utilizador {0} já está atribuído a Empregado {1}
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Cuidados de Saúde
-DocType: Purchase Invoice,Monthly,Mensal
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Serviços 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/buying/doctype/purchase_order/purchase_order.js +771,Invoice,Fatura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +750,Invoice,Fatura
 DocType: Maintenance Schedule Item,Periodicity,Periodicidade
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Ano Fiscal {0} é necessária
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,defesa
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,É necessária ter o Ano Fiscal de {0}
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Defesa
 DocType: Salary Component,Abbr,Abrv
 DocType: Appraisal Goal,Score (0-5),Pontuação (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +198,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} não corresponde com {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Linha # {0}:
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +198,Row {0}: {1} {2} does not match with {3},A linha {0}: {1} {2} não corresponde à {3}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Linha # {0}:
 DocType: Timesheet,Total Costing Amount,Valor Total Custeio
 DocType: Delivery Note,Vehicle No,No veículo
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +127,Please select Price List,"Por favor, selecione Lista de Preço"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +127,Please select Price List,"Por favor, selecione a Lista de Preços"
 DocType: Production Order Operation,Work In Progress,Trabalho em andamento
 DocType: Employee,Holiday List,Lista de Feriados
 apps/erpnext/erpnext/public/js/setup_wizard.js +205,Accountant,Contabilista
 DocType: Cost Center,Stock User,Estoque de Usuário
-DocType: Company,Phone No,N º de telefone
-apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +47,Course Schedules created:,Agenda de cursos criados:
-apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},Nova {0}: # {1}
+DocType: Company,Phone No,Nº de Telefone
+apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +47,Course Schedules created:,Cronogramas de Curso criados:
+apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},Novo {0}: #{1}
 ,Sales Partners Commission,Vendas Partners Comissão
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +22,Abbreviation cannot have more than 5 characters,Abreviatura não pode ter mais de 5 caracteres
-DocType: Payment Request,Payment Request,Pedido de Pagamento
+apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +22,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 Depois de Depreciação
-DocType: Employee,O+,O +
-apps/erpnext/erpnext/selling/doctype/quotation/quotation_dashboard.py +7,Related,relacionado
+DocType: Employee,O+,O+
+apps/erpnext/erpnext/selling/doctype/quotation/quotation_dashboard.py +7,Related,Relacionado
 apps/erpnext/erpnext/accounts/doctype/account/account.js +26,This is a root account and cannot be edited.,Este é uma conta de raíz e não pode ser editado
 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 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 Detalhe pai
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Kg,Kg.
-DocType: Student Log,Log,Registro
-apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,A abertura para um trabalho.
-DocType: Item Attribute,Increment,Incremento
+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 para {0}
+DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Anexa o ficheiro .csv com duas colunas, uma para o nome antigo e um 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...,Selecione Warehouse ...
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,publicidade
+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,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/purchase_invoice/purchase_invoice.js +589,Get items from,Obter itens de
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +382,Stock cannot be updated against Delivery Note {0},Banco não pode ser atualizado contra entrega Nota {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Obter itens de
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Stock cannot be updated against Delivery Note {0},Banco não pode ser atualizado contra entrega Nota {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produto {0}
-DocType: Payment Reconciliation,Reconcile,conciliar
+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,Faça Banco Entry
+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.,"** Distribuição Mensal ** ajuda a distribuir o Orçamento / alvo em meses, se você tem sazonalidade em seu negócio."
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +156,Salary Structure Missing,Falta estrutura salarial
-DocType: Lead,Person Name,Nome Pessoa
+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, se o seu negócio for sazonal."
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Salary Structure Missing,Falta estrutura salarial
+DocType: Lead,Person Name,Nome da Pessoa
 DocType: Sales Invoice Item,Sales Invoice Item,Vendas item Fatura
 DocType: Account,Credit,Crédito
 DocType: POS Profile,Write Off Cost Center,Escreva Off Centro de Custos
-apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""","por exemplo, &quot;Primary School&quot; ou &quot;Universidade&quot;"
+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 +156,Credit limit has been crossed for customer {0} {1}/{2},O limite de crédito foi cruzada para o cliente {0} {1} / {2}
-apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;É Imobilização&quot; não pode ser desmarcada, como existe registro de ativos contra o item"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +189,Credit limit has been crossed for customer {0} {1}/{2},O limite de crédito foi cruzado para o 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.,O Data Prazo Final não pode ser posterior à data de Fim de Ano do Ano Acadêmico ao qual o termo é ligada (Ano Lectivo {}). 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: Tax Rule,Tax Type,Tipo de imposto
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +144,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: Item,Item Image (if not slideshow),Imagem item (se não 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,(Hora Taxa / 60) * Tempo real de Operação
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,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: 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 de Execução
 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,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,Obtenha detalhes de Especificação
+DocType: Quality Inspection,Get Specification Details,Obter Dados de Especificação
 DocType: Lead,Interested,Interessado
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +165,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,Abertura Entry
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Grupo Cliente&gt; Território
-apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Só conta Pay
-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.,Conta com a transação existente não pode ser convertido em grupo.
-DocType: Lead,Product Enquiry,Produto Inquérito
+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 Item do Grupo
+DocType: Journal Entry,Opening Entry,Data de Abertura
+apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Só Contas Pagas
+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 com a 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,Gelieve eerst in bedrijf
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Company first,"Por favor, selecione Empresa primeiro"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,"Por favor, insira a Empresa primeiro"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,Please select Company first,"Por favor, selecione primeiro a Empresa"
 DocType: Employee Education,Under Graduate,Sob graduação
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Target On
 DocType: BOM,Total Cost,Custo Total
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Registro de Atividade:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Item {0} does not exist in the system or has expired,Item {0} não existe no sistema ou expirou
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,imóveis
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Registo de Atividade:
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Item {0} does not exist in the system or has expired,O Item {0} não existe no sistema ou 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,Pharmaceuticals
-DocType: Purchase Invoice Item,Is Fixed Asset,É Imobilização
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Available qty is {0}, you need {1}","Quant disponível é {0}, você precisa {1}"
-DocType: Expense Claim Detail,Claim Amount,Quantidade reivindicação
+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/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Leverancier Type / leverancier
 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 Log
-DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Puxar o material Pedido do tipo Fabricação com base nos critérios acima
-DocType: Sales Invoice Item,Delivered By Supplier,Entregue pelo Fornecedor
+DocType: Upload Attendance,Import Log,Importar Registo
+DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Tirar as Solicitações de Material do tipo de Fabrico com base nos critérios acima
+DocType: Assessment Result,Grade,Grau
+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 +171,Annual Salary,Salário Anual
-DocType: Period Closing Voucher,Closing Fiscal Year,Encerramento do exercício social
-apps/erpnext/erpnext/accounts/party.py +349,{0} {1} is frozen,{0} {1} Está congelado
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Annual Salary,Salário Anual
+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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,despesas Stock
-apps/erpnext/erpnext/accounts/report/financial_statements.py +22,End Year {0} not found.,Fim de Ano {0} não foi encontrado.
-DocType: Journal Entry,Contra Entry,Contra Entry
-DocType: Journal Entry Account,Credit in Company Currency,Crédito em Moeda Empresa
-DocType: Delivery Note,Installation Status,Status da instalação
-apps/erpnext/erpnext/controllers/buying_controller.py +316,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Aceite + Qty Rejeitada deve ser igual a quantidade recebida por item {0}
-DocType: Request for Quotation,RFQ-,RFQ-
+DocType: Journal Entry,Contra Entry,Contra-Valor
+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 a Compra
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +130,At least one mode of payment is required for POS invoice.,Pelo menos um modo de pagamento é necessário para POS fatura.
 DocType: Products Settings,Show Products as a List,Mostrar os 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 e empregado combinação no período selecionado virá no modelo, com registros de freqüência existentes"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +451,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/public/js/setup_wizard.js +341,Example: Basic Mathematics,Exemplo: Matemática Básica
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Para incluir impostos na linha {0} na taxa de Item, os impostos em linhas {1} também deve ser incluída"
+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 +456,Item {0} is not active or end of life has been reached,O Item {0} não está ativo ou chegou ao seu fim de vida
+apps/erpnext/erpnext/public/js/setup_wizard.js +341,Example: Basic Mathematics,Exemplo: Fundamentos de Matemática
+apps/erpnext/erpnext/controllers/accounts_controller.py +617,"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 +166,Settings for HR Module,Configurações para o Módulo HR
 DocType: SMS Center,SMS Center,SMS Center
-DocType: Sales Invoice,Change Amount,Montante de Variação
-DocType: BOM Replace Tool,New BOM,Novo BOM
-DocType: Timesheet,Batch Time Logs for billing.,Batch Logs Tempo para o faturamento.
-DocType: Depreciation Schedule,Make Depreciation Entry,Faça Entrada Depreciação
-DocType: Appraisal Template Goal,KRA,KRA
+DocType: Sales Invoice,Change Amount,Alterar Montante
+DocType: BOM Replace Tool,New BOM,Nova LDM
+DocType: Timesheet,Batch Time Logs for billing.,Registos de Tempo de Lote para a faturação.
+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,Razão
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Faça Employee
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,radiodifusão
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,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 de manutençã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/config/selling.py +52,Items and Pricing,Itens e Preços
 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}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,Cost Center {0} does not belong to Company {1},Centro de Custo {0} não pertence a Empresa {1}
+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}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +100,Cost Center {0} does not belong to Company {1},O Centro de Custo {0} não pertence à Empresa {1}
 DocType: Customer,Individual,Individual
-DocType: Interest,Academics User,Academics Usuário
+DocType: Interest,Academics User,Utilizador Académico
 DocType: Cheque Print Template,Amount In Figure,Montante Na Figura
 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,Digite o parâmetro url para mensagem
+DocType: SMS Settings,Enter url parameter for message,Insira o parâmetro url para a mensagem
 DocType: Program Enrollment Tool,Students,estudantes
-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}
-DocType: Pricing Rule,Discount on Price List Rate (%),Desconto no preço de lista Taxa (%)
+apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,As regras para aplicação de preços e de 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 fora
+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,Ordem de Compra Trends
-apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,Atribuír licença para o ano.
+,Purchase Order Trends,Tendências de Pedido 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,A solicitação de cotação pode ser acessada clicando no link a seguir
+apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,Atribuir licenças para o ano.
 DocType: SG Creation Tool Course,SG Creation Tool Course,SG Course ferramenta de criação
-DocType: Student Group Creation Tool,Leave blank if you wish to fetch all courses for selected academic term,Deixe em branco se você deseja buscar todos os cursos para o termo acadêmico selecionado
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,Insufficient Stock,insuficiente da
-DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Planejamento de Capacidade Desativar e controle de tempo
-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
+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 para o termo académico selecionado
+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 via 'Time Log'
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} does not belong to Company {1},Conta {0} não pertence à empresa {1}
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},montante do adiantamento não pode ser maior do que {0} {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +86,Account {0} does not belong to Company {1},A Conta {0} não pertence à Empresa {1}
+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,Está abrindo Entry
-DocType: Customer Group,Mention if non-standard receivable account applicable,Mencione se não padronizado conta a receber aplicável
-DocType: Course Schedule,Instructor Name,Nome instrutor
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,For Warehouse is required before Submit,Para Armazém é necessário antes Enviar
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,"Recebeu, em"
+DocType: Sales Invoice,Is Opening Entry,Está a Abrir a Entrada
+DocType: Customer Group,Mention if non-standard receivable account applicable,Mencione se é aplicável 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 +175,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,Recebeu Em
 DocType: Sales Partner,Reseller,Revendedor
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,Vul Company
-DocType: Delivery Note Item,Against Sales Invoice Item,Contra Vendas Nota Fiscal do Item
-,Production Orders in Progress,Productieorders in Progress
+apps/erpnext/erpnext/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 Fatura de Vendas 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 +1436,"LocalStorage is full , did not save","LocalStorage está cheio, não salvou"
-DocType: Lead,Address & Contact,Endereço e contacto
-DocType: Leave Allocation,Add unused leaves from previous allocations,Acrescente as folhas não utilizadas de atribuições anteriores
-apps/erpnext/erpnext/controllers/recurring_document.py +227,Next Recurring {0} will be created on {1},Próximo Recorrente {0} será criado em {1}
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +28,Another Budget record {0} already exists against {1} for fiscal year {2},Outro recorde Orçamento {0} já existe contra {1} para o ano fiscal {2}
-DocType: Sales Partner,Partner website,site parceiro
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1460,"LocalStorage is full , did not save","A LocalStorage está cheia, não guardou"
+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 das 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}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +28,Another Budget record {0} already exists against {1} for fiscal year {2},Já existe outro registo de Orçamento  {0} em {1} para o ano fiscal {2}
+DocType: Sales Partner,Partner website,Website parceiro
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +104,Add Item,Adicionar Item
-,Contact Name,Nome de Contato
-DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Cria Recibos de salário para os critérios acima mencionados.
-DocType: Cheque Print Template,Line spacing for amount in words,espaçamento entre linhas para o valor por extenso
+,Contact Name,Nome de Contacto
+DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Cria Folha de Vencimento para os critérios acima mencionados.
+DocType: Cheque Print Template,Line spacing for amount in words,Espaçamento entre linhas para o montante em palavras
 apps/erpnext/erpnext/templates/generators/item.html +78,No description given,Sem descrição dada
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Pedido de compra.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +5,This is based on the Time Sheets created against this project,Esta baseia-se nas folhas de tempo criou contra este projecto
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Only the selected Leave Approver can submit this Leave Application,Somente o Leave aprovador selecionado pode enviar este pedido de férias
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Aliviar A data deve ser maior que Data de Juntando
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Leaves per Year,Folhas por ano
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Row {0}: Verifique 'É Advance' contra Conta {1} se esta é uma entrada antecedência.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +213,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 +114,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 +103,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 este é um registo dum adiantamento."
 apps/erpnext/erpnext/stock/utils.py +188,Warehouse {0} does not belong to company {1},Armazém {0} não pertence à empresa {1}
+DocType: Email Digest,Profit & Loss,Perda de lucro
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,Litre,Litro
 DocType: Task,Total Costing Amount (via Time Sheet),Total de Custeio Montante (via Time Sheet)
-DocType: Item Website Specification,Item Website Specification,Especificação Site item
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +435,Leave Blocked,Deixe Bloqueados
-apps/erpnext/erpnext/stock/doctype/item/item.py +669,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,entradas do banco
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +83,Annual,anual
+DocType: Item Website Specification,Item Website Specification,Especificação de Website do Item
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +443,Leave Blocked,Licença Bloqueada
+apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item {0} has reached its end of life on {1},O Item {0} chegou ao fim da sua vida em {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +95,Bank Entries,Entradas Bancárias
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +86,Annual,Anual
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Da Reconciliação item
 DocType: Stock Entry,Sales Invoice No,Vendas factura n
-DocType: Material Request Item,Min Order Qty,Min Qty Ordem
+DocType: Material Request Item,Min Order Qty,Qtd de Pedido Mín.
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Curso Grupo Estudantil ferramenta de criação
-DocType: Lead,Do Not Contact,Neem geen contact op
-apps/erpnext/erpnext/public/js/setup_wizard.js +360,People who teach at your organisation,Pessoas que ensinam em sua organização
+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 instruem 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 facturas recorrentes. Ele é gerado em enviar.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Software Developer,Software Developer
-DocType: Item,Minimum Order Qty,Qtde mínima
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,Software Developer
+DocType: Item,Minimum Order Qty,Qtd de Pedido Mínima
 DocType: Pricing Rule,Supplier Type,Tipo de fornecedor
-DocType: Scheduling Tool,Course Start Date,Curso Data de início
-DocType: Item,Publish in Hub,Publicar em Hub
+DocType: Scheduling Tool,Course Start Date,Data de Início do Curso
+DocType: Item,Publish in Hub,Publicar no Hub
+DocType: Student Admission,Student Admission,A admissão Student
 ,Terretory,terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is cancelled,Item {0} é cancelada
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Material Request,Pedido de material
-DocType: Bank Reconciliation,Update Clearance Date,Atualize Data Liquidação
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +28,Abbreviation already used for another salary component,Abreviatura já utilizado para outro componente salarial
-DocType: Item,Purchase Details,Detalhes de compra
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +328,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Item {0} não encontrado em &#39;matérias-primas fornecidas &quot;na tabela Ordem de Compra {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} is cancelled,O Item {0} foi cancelado
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +823,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 +28,Abbreviation already used for another salary component,Esta abreviatura já foi utilizada para outro componente salarial
+DocType: Item,Purchase Details,Dados de Compra
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +333,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 para todo o planeta
-apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Confirmado encomendas de clientes.
-DocType: Purchase Receipt Item,Rejected Quantity,Quantidade rejeitado
+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 SMS
-DocType: Contact,Is Primary Contact,É Contato Principal
-DocType: Notification Control,Notification Control,Controle de Notificação
+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 item Group-wise orçamentos sobre este território. Você também pode incluir sazonalidade, definindo a distribuição."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,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 +249,Payment against {0} {1} cannot be greater than Outstanding Amount {2},O pagamento em {0} {1} não pode ser superior ao Montante em Dívida {2}
 DocType: Supplier,Address HTML,Endereço HTML
-DocType: Lead,Mobile No.,Mobile No.
-DocType: Maintenance Schedule,Generate Schedule,Gerar Agende
-DocType: Purchase Invoice Item,Expense Head,Chefe despesa
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +130,Please select Charge Type first,Por favor selecione primeiro o Tipo de Conta
+DocType: Lead,Mobile No.,N.º de Telemóvel
+DocType: Maintenance Schedule,Generate Schedule,Gerar Cronograma
+DocType: Purchase Invoice Item,Expense Head,Livro de Despesa
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +130,Please select Charge Type first,"Por favor, selecione primeiro o Tipo de Conta"
 DocType: Student Group Student,Student Group Student,Estudante Grupo Estudantil
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Último
+DocType: Email Digest,New Quotations,Novas cotações
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,O primeiro Deixe Approver na lista vai ser definido como o Leave Approver padrão
 DocType: Tax Rule,Shipping County,O envio County
 apps/erpnext/erpnext/config/desktop.py +158,Learn,Aprender
-DocType: Asset,Next Depreciation Date,Próximo depreciação Data
-apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Custo atividade por Funcionário
+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 Atividade por Funcionário
 DocType: Accounts Settings,Settings for Accounts,Definições para contas
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +626,Supplier Invoice No exists in Purchase Invoice {0},Fornecedor Nota Fiscal n existe na factura de compra {0}
-apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Gerenciar Vendas Pessoa Tree.
-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 limpar
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +629,Supplier Invoice No exists in Purchase Invoice {0},Fornecedor Nota Fiscal n existe na factura 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 o Hub
 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 +348,Completed Qty can not be greater than 'Qty to Manufacture',"Concluído Qtde não pode ser maior do que ""Qtde de Fabricação"""
-DocType: Period Closing Voucher,Closing Account Head,Fechando Chefe Conta
-DocType: Employee,External Work History,Histórico Profissional no Exterior
-apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Erro de referência circular
-DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Em Palavras (Exportação) será visível quando você salvar a Nota de Entrega.
-DocType: Cheque Print Template,Distance from left edge,Distância da borda esquerda
-apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} unidades de [{1}] (# Formulário / Item / {1}) encontrados em [{2}] (# Formulário / Armazém / {2})
+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 Livro de Conta
+DocType: Employee,External Work History,Histórico Profissional Externo
+apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Erro de Referência Circular
+DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Em Palavras (Exportar) será visível assim que guardar a Nota de Entrega.
+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}) found in [{2}](#Formulário/Armazém/{2})
 DocType: Lead,Industry,Indústria
-DocType: Employee,Job Profile,Perfil
-DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notificar por e-mail sobre a criação de Pedido de material automático
-DocType: Journal Entry,Multi Currency,Multi Moeda
+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,Multiplas Moedas
 DocType: Payment Reconciliation Invoice,Invoice Type,Tipo de Fatura
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +806,Delivery Note,Guia de remessa
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +800,Delivery Note,Nota de Entrega
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Configurando 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 +233,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 item Imposto
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,Summary for this week and pending activities,Resumo para esta semana e atividades pendentes
-DocType: Student Applicant,Admitted,admitido
-DocType: Workstation,Rent Cost,Kosten huur
+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 ter sido sacado. Por favor, saque-o novamente."
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,{0} entered twice in Item Tax,{0} entrou duas vezes no item Taxa
+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
+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/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 o ID de e-mail separados por vírgulas, a fatura será enviada automaticamente em determinada data"
-DocType: Employee,Company Email,E-mail da Empresa
-DocType: GL Entry,Debit Amount in Account Currency,Montante Débito em Conta de moeda
-apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,operações de banco / caixa contra partido ou para transferência interna
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +97,Upcoming Calendar Events,Próximos eventos de 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 id separated by commas, invoice will be mailed automatically on particular date",Digite o ID de email separado por vírgulas. A fatura será enviada automaticamente em 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 em terceiros ou em 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 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,Order Total Considerado
-apps/erpnext/erpnext/config/hr.py +186,"Employee designation (e.g. CEO, Director etc.).","Designação do empregado (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 em que moeda do cliente é convertido para a moeda base de cliente
-apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Linha # {0}: factura de compra não pode ser feita contra um ativo existente {1}
+apps/erpnext/erpnext/config/hr.py +186,"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 Moeda do Cliente é convertida para a moeda principal do cliente
+apps/erpnext/erpnext/controllers/accounts_controller.py +554,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Linha #{0}: Não pode ser efetuada uma Fatura de Compra para um ativo existente {1}
 DocType: Item Tax,Tax Rate,Taxa de Imposto
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} já alocado para Employee {1} para {2} período para {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +812,Select Item,Selecionar item
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Item: {0} managed batch-wise, can not be reconciled using \
-					Stock Reconciliation, instead use Stock Entry","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 +142,Purchase Invoice {0} is already submitted,Compra Invoice {0} já é submetido
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Linha # {0}: Lote numero 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.,Batch (lote) de um item.
-DocType: C-Form Invoice Detail,Invoice Date,Data da fatura
-DocType: GL Entry,Debit Amount,Débito Montante
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{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 +791,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 \
+					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 +143,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},Pode haver apenas uma 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 +342,Please see attachment,"Por favor, veja anexo"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,Please see attachment,"Por favor, veja o anexo"
 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 estudantes
+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 +19,Setup Already Complete!!,Setup al voltooid !
-,Finished Goods,afgewerkte producten
+,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
+DocType: Quality Inspection,Inspected By,Inspecionado Por
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Fornecedor&gt; tipo de fornecedor
+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/public/js/utils/item_selector.js +12,Add Items,Adicionar itens
-DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Item Parâmetro de Inspeção de Qualidade
-DocType: Leave Application,Leave Approver Name,Deixar Nome Approver
+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","Rendimentos, deduções e outros componentes salariais"
-DocType: Packed Item,Packed Item,Entrega do item embalagem Nota
-apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,As configurações padrão para transação de compras.
-apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Existe atividade Custo por Empregado {0} contra o tipo de atividade - {1}
-DocType: Currency Exchange,Currency Exchange,Câmbio
-DocType: Purchase Invoice Item,Item Name,Nome do item
-DocType: Authorization Rule,Approving User  (above authorized value),Aprovando Usuário (acima do valor autorizado)
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Saldo credor
+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 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úva
-DocType: Request for Quotation,Request for Quotation,Request for Quotation
+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.,Alterar o número de seqüência de partida / corrente de uma 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 preços continuam a prevalecer, os usuários são convidados a definir a prioridade manualmente para resolver o conflito."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +736,Purchase Return,Voltar comprar
-,Purchase Register,Compra Registre
-DocType: Scheduling Tool,Rechedule,Rechedule
-DocType: Landed Cost Item,Applicable Charges,Encargos aplicáveis
-DocType: Workstation,Consumable Cost,verbruiksartikelen Cost
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +202,{0} ({1}) must have role 'Leave Approver',{0} ({1}) deve ter regra 'Aprovar ausência'
+DocType: Naming Series,Change the starting / current sequence number of an existing series.,Alterar o número de sequência inicial / atual de numa 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, os utilizadores estão convidados a definir a Prioridade manualmente para resolver este conflito."
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +715,Purchase Return,Devolução de Compra
+,Purchase Register,Registo de Compra
+DocType: 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 +209,{0} ({1}) must have role 'Leave Approver',{0} ({1}) deve ter a função 'Aprovador de Licença'
 DocType: Purchase Receipt,Vehicle Date,Veículo Data
-DocType: Student Log,Medical,médico
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Reden voor het verliezen
-apps/erpnext/erpnext/accounts/utils.py +239,Allocated amount can not greater than unadjusted amount,montante atribuído não pode superior à quantia não ajustada
-DocType: Announcement,Receiver,recebedor
+DocType: Student Log,Medical,Clínico
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +163,Reason for losing,Motivo de Perda
+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 +79,Workstation is closed on the following dates as per Holiday List: {0},"Workstation é fechado nas seguintes datas, conforme lista do feriado: {0}"
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Oportunidades
 DocType: Employee,Single,Único
 DocType: Account,Cost of Goods Sold,Custo dos Produtos Vendidos
 DocType: Purchase Invoice,Yearly,Anual
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +225,Please enter Cost Center,Vul kostenplaats
+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,Ordem de Vendas
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,Méd. Taxa de venda
-DocType: Assessment,Examiner Name,Nome Examiner
-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 em linha {0}
+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,% Instalado
-apps/erpnext/erpnext/public/js/setup_wizard.js +378,Classrooms/ Laboratories etc where lectures can be scheduled.,"Salas de aula / Laboratórios etc, onde palestras podem ser agendadas."
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,Por favor digite primeiro o nome da empresa
-DocType: BOM,Item Desription,Desription item
+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 primeiro o nome da empresa
+DocType: BOM,Item Desription,Descrição do Item
 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,É o grupo
-DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Serial N ° s automaticamente definido com base na FIFO
-DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Verificar Fornecedor Nota Fiscal Número Unicidade
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',"""Para o número de Processo' não pode ser inferior a 'De número de Processo'"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,Non Profit,sem Fins Lucrativos
+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,Enquanto se aguarda ordens de compra
+DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Definir automaticamente os Nrs de Série com base no FIFO
+DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Verificar Singularidade de Número de Fatura de Fornecedor
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',O 'Nº de Processo A' não pode ser inferior ao 'Nº 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,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 e-mail. Cada transação tem um texto separado introdutório.
-DocType: Stock Reconciliation Item,Do not include symbols (ex. $),Não inclua símbolos (ex. $)
+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,Gerente de Vendas Mestre
-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 Upto
+apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,As definições globais 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 +638,Attribute {0} selected multiple times in Attributes Table,Atributo {0} selecionada várias vezes na tabela de atributos
-DocType: HR Settings,Employee record is created using selected field. ,Registro de empregado é criado usando o campo selecionado.
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,O atributo {0} foi selecionado várias vezes na tabela de atributos
+DocType: HR Settings,Employee record is created using selected field. ,O registo do funcionário é criado utilizando o campo selecionado.
 DocType: Sales Order,Not Applicable,Não Aplicável
-apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Férias Principais.
+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 Cobrança
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +862,Please enter Item Code.,Por favor digite o Codigo do Item.
-DocType: BOM,Costing,Custeio
-DocType: Tax Rule,Billing County,Condado de Billings
-DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Se selecionado, o valor do imposto será considerado como já incluído na tarifa Impressão / Quantidade de impressão"
+DocType: Delivery Note,Billing Address,Endereço de Faturamento
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +847,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, o valor do imposto será considerado como já 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,Qtde
-DocType: Employee,Health Concerns,Preocupações com a Saúde
+DocType: Employee,Health Concerns,Problemas Médicos
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +15,Unpaid,Não remunerado
-apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +38,Reserved for sale,Reservados para venda
-DocType: Packing Slip,From Package No.,De No. Package
+apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +38,Reserved for sale,Reservado para venda
+DocType: Packing Slip,From Package No.,Do Nº de Pacote
 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 +77,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/setup/doctype/email_digest/email_digest.py +101,Pending activities for today,Atividades pendentes para hoje
-apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Recorde de público.
+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 salário para a folha de pagamento com base quadro de horários.
 DocType: Sales Order Item,Used for Production Plan,Usado para o Plano de Produção
 DocType: Manufacturing Settings,Time Between Operations (in mins),Time Between Operações (em minutos)
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +92,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} orçamento para a conta {1} contra o Centro de Custo {2} é {3}. Ele irá exceder em {4}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +95,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},O Orçamento {0}  da Conta {1} do Centro de Custos {2} é de {3}. Ele será excedido por {4}
 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 selecionados não são para o mesmo item
 DocType: Pricing Rule,Valid Upto,Válido Upto
-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 individuais.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Direct Income,Resultado direto
+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 fazer o filtro pela Conta, se estiver agrupado por Conta"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Administrative Officer,Diretor Administrativo
-apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +23,Acutal Qty {0} / Waiting Qty {1},Acutal Qtde {0} / Espera Qtde {1}
-DocType: Timesheet Detail,Hrs,hrs
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +319,Please select Company,"Por favor, selecione Empresa"
-DocType: Stock Entry,Difference Account,verschil Account
-apps/erpnext/erpnext/projects/doctype/task/task.py +44,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 +398,Please enter Warehouse for which Material Request will be raised,Por favor digite o Armazem para o qual o Material requesitado sera levantando
-DocType: Production Order,Additional Operating Cost,Custo Operacional adicionais
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,Funcionário Administrativo
+apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +23,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 +309,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 +44,Cannot close task as its dependant task {0} is not closed.,Não pode fechar a tarefa pois é a sua tarefa dependente {0} não está encerrada.
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +399,Please enter Warehouse for which Material Request will be raised,"Por favor, insira o Armazém no qual 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 +530,"To merge, following properties must be same for both items","Para unir, as seguintes propriedade devem ser iguais para ambos items"
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,"To merge, following properties must be same for both items","Para unir, as seguintes propriedade devem ser iguais para ambos items"
 DocType: Shipping Rule,Net Weight,Peso Líquido
-DocType: Employee,Emergency Phone,Emergency Phone
+DocType: Employee,Emergency Phone,Telefone de Emergência
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +28,Buy,Comprar
 ,Serial No Warranty Expiry,Caducidade Não Serial Garantia
-DocType: Sales Invoice,Offline POS Name,Off-line Nome POS
+DocType: Sales Invoice,Offline POS Name,Nome POS Offline
 DocType: Sales Order,To Deliver,Entregar
-DocType: Purchase Invoice Item,Item,item
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1563,Serial no item cannot be a fraction,Serial nenhum item não pode ser uma fração
-DocType: Journal Entry,Difference (Dr - Cr),Diferença ( Dr - Cr)
-DocType: Account,Profit and Loss,Lucros e perdas
-apps/erpnext/erpnext/config/stock.py +314,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 em que moeda lista de preços é convertido para a moeda da empresa de base
-apps/erpnext/erpnext/setup/doctype/company/company.py +56,Account {0} does not belong to company: {1},Conta {0} não pertence à empresa: {1}
-apps/erpnext/erpnext/setup/doctype/company/company.py +47,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 &quot;campo não será visível em qualquer transação"
-DocType: BOM,Operating Cost,Custo de Operação
-DocType: Sales Order Item,Gross Profit,Lucro bruto
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +42,Increment cannot be 0,Incremento não pode ser 0
-DocType: Production Planning Tool,Material Requirement,Material Requirement
-DocType: Company,Delete Company Transactions,Excluir Transações Companhia
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +313,Reference No and Reference Date is mandatory for Bank transaction,Número de referência e data de referência é obrigatória para transação bancária
+DocType: Purchase Invoice Item,Item,Item
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1587,Serial no item cannot be a fraction,Serial nenhum 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 +56,Account {0} does not belong to company: {1},A conta {0} não pertence à empresa: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +47,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
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Supplier is required against Payable account {0},Fornecedor é necessária contra a Pagar conta {0}
+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 +316,Reference No and Reference Date is mandatory for Bank transaction,O Nº de referência e a Data de Referência são obrigatórios 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,Fornecedor factura n
 DocType: Territory,For reference,Para referência
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Não é possível excluir Serial No {0}, como ele é usado em transações de ações"
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +240,Closing (Cr),Fechamento (Cr)
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +104,Move Item,mover item
+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 ele é utilizado em transações de stock"
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +240,Closing (Cr),A Fechar (Cr)
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +104,Move Item,Mover Item
 DocType: Serial No,Warranty Period (Days),Período de Garantia (Dias)
-DocType: Installation Note Item,Installation Note Item,Item Nota de Instalação
-DocType: Production Plan Item,Pending Qty,Pendente Qtde
+DocType: Installation Note Item,Installation Note Item,Nota de Instalação de Item
+DocType: Production Plan Item,Pending Qty,Qtd Pendente
 DocType: Budget,Ignore,Ignorar
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Código do item&gt; Item Grupo&gt; Marca
 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,dimensões de verificação de configuração para impressão
 DocType: Salary Slip,Salary Slip Timesheet,Quadro de Horários salário deslizamento
@@ -522,188 +528,191 @@
 DocType: Pricing Rule,Valid From,Válido de
 DocType: Sales Invoice,Total Commission,Total Comissão
 DocType: Pricing Rule,Sales Partner,Parceiro de vendas
-DocType: Buying Settings,Purchase Receipt Required,Recibo de compra Obrigatório
+DocType: Buying Settings,Purchase Receipt Required,Recibo de Compra Obrigatório
 apps/erpnext/erpnext/stock/doctype/item/item.py +128,Valuation Rate is mandatory if Opening Stock entered,Avaliação Taxa é obrigatória se da abertura Stock entrou
-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 +28,Please select Company and Party Type first,"Por favor, selecione Companhia e Festa Tipo primeiro"
-apps/erpnext/erpnext/config/accounts.py +257,Financial / accounting year.,Exercício / contabilidade.
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,Os valores acumulados
+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 Tipo de Parte"
+apps/erpnext/erpnext/config/accounts.py +257,Financial / accounting year.,Ano fiscal / ficanceiro.
+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","Sorry , kan de serienummers niet worden samengevoegd"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +707,Make Sales Order,Maak klantorder
-DocType: Project Task,Project Task,Projeto Tarefa
-,Lead Id,lead Id
-DocType: C-Form Invoice Detail,Grand Total,Total
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +701,Make Sales Order,Efetuar Pedido de Compra
+DocType: Project Task,Project Task,Tarefa do Projeto
+,Lead Id,ID de Potencial Cliente
+DocType: C-Form Invoice Detail,Grand Total,Total Geral
 DocType: Assessment,Course,Curso
-DocType: Timesheet,Payslip,Recibo 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 maior do que a Data de Fecho do Ano Fiscal
+DocType: Timesheet,Payslip,Folha de Vencimento
+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 Entrega Estado
-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,Atribuír
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +734,Sales Return,Retorno de Vendas
-DocType: Announcement,Posted By,Postado por
-DocType: Item,Delivered by Supplier (Drop Ship),Entregue por Fornecedor (Drop Ship)
-apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Banco de dados de clientes potenciais.
+DocType: Sales Order,Billing and Delivery Status,Estado de Faturamento e 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 +728,Sales Return,Retorno de Vendas
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +91,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,"Nota: Total de folhas atribuídos {0} não deve ser menor do que as folhas já aprovados {1}, para o 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.,Banco de dados do cliente.
+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 +212,Opening (Cr),Abertura (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +795,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Unidade de medida padrão para item {0} não pode ser alterado diretamente porque você já fez alguma transação (s) com outro UOM. Você precisará criar um novo item para usar um UOM padrão diferente.
-apps/erpnext/erpnext/accounts/utils.py +237,Allocated amount can not be negative,Montante atribuído não pode ser negativo
-DocType: Purchase Order Item,Billed Amt,Montante Faturado
-DocType: Warehouse,A logical Warehouse against which stock entries are made.,Um armazém lógico contra o qual as entradas em existências são feitas.
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +212,Opening (Cr),Inicial (Cr)
+apps/erpnext/erpnext/stock/doctype/item/item.py +797,Default Unit of Measure for Item {0} cannot be changed directly because 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 para o item {0} não pode ser diretamente alterada porque já foi efetuada alguma(s) transação(õ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 alocado não pode ser negativo
+DocType: Purchase Order Item,Billed Amt,Qtd Faturada
+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,Vendas Fatura quadro de horários
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},Número de referência e Referência Data é necessário para {0}
-DocType: Sales Invoice,Customer's Vendor,Vendedor cliente
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Proposal Writing,Proposta Redação
-DocType: Payment Entry Deduction,Payment Entry Deduction,Dedução de entrada de pagamento
-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 Trabalhador
-DocType: Production Planning Tool,"If checked, raw materials for items that are sub-contracted will be included in the Material Requests","Se marcada, matérias-primas para os itens que são sub-contratados serão incluídos nos pedidos de materiais"
-apps/erpnext/erpnext/config/accounts.py +80,Masters,Mestres
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},O Nº de Referência e a Data de Referência são necessários para {0}
+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 sub-contratados 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,Datas das transações de atualização do banco
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,Time Tracking
-DocType: Fiscal Year Company,Fiscal Year Company,Ano Fiscal Empresa
-DocType: Packing Slip Item,DN Detail,Detalhe DN
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +257,Already supplier quotation has created,Já cotação fornecedor criou
+DocType: Fiscal Year Company,Fiscal Year Company,Ano Fiscal da Empresa
+DocType: Packing Slip Item,DN Detail,Dados de NE
 DocType: Timesheet,Billed,Faturado
-DocType: Batch,Batch Description,Batch Descrição
+DocType: Batch,Batch Description,Descrição do Lote
+apps/erpnext/erpnext/accounts/utils.py +685,"Payment Gateway Account not created, please create one manually.","Pagamento Conta Gateway não criado, crie um manualmente."
 DocType: Delivery Note,Time at which items were delivered from warehouse,Hora em que itens foram entregues a partir do armazém
 DocType: Sales Invoice,Sales Taxes and Charges,Vendas Impostos e Taxas
 DocType: Employee,Organization Profile,Perfil da Organização
-apps/erpnext/erpnext/accounts/page/pos/pos.js +733,View Offline Records,Visualização off-line Registros
+apps/erpnext/erpnext/accounts/page/pos/pos.js +715,View Offline Records,Visualização off-line Registros
+DocType: Student,Sibling Details,Detalhes do irmão
 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: Payment Reconciliation,Invoice/Journal Entry Details,Invoice / Journal Entry Detalhes
+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 de {2}
 DocType: Buying Settings,Settings for Buying Module,Definições para comprar Module
-apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},O ativo {0} não pertencem à empresa {1}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,Digite Recibo de compra primeiro
+apps/erpnext/erpnext/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,Fornecedor de nomeação
-DocType: Activity Type,Default Costing Rate,A taxa de custo padrão
-DocType: Maintenance Schedule,Maintenance Schedule,Programação de Manutenção
+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 Preços Regras são filtradas com base no Cliente, Grupo de Clientes, Território, fornecedor, fornecedor Tipo, Campanha, Parceiro de vendas etc"
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Inventory,Mudança na Net Inventory
+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 do Passaporte
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Manager,gerente
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,Gestor
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,Same item has been entered multiple times.,O mesmo artigo foi introduzido várias vezes.
-DocType: SMS Settings,Receiver Parameter,Parâmetro receptor
-apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Baseado em' e ' Agrupado por ' não pode ser o mesmo
+DocType: SMS Settings,Receiver Parameter,Parâmetro de 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 vendas Pessoa
 DocType: Installation Note,IN-,DENTRO-
-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 questão de minutos
-DocType: Issue,Resolution Date,Data resolução
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +299,Timesheet created:,Quadro de Horários criado:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +715,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/schools/doctype/student_applicant/student_applicant.js +17,Enroll,inscrever
-DocType: Selling Settings,Customer Naming By,Cliente de nomeação
-DocType: Depreciation Schedule,Depreciation Amount,depreciação Valor
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,Converteren naar Groep
+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
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +300,Timesheet created:,Quadro de Horários criado:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +772,Please set default Cash or Bank account in Mode of Payment {0},Por favor defina se o padrão é a Dinheiro ou por Conta Bancária no Modo de Pagamento {0}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +17,Enroll,Matricular
+DocType: Selling Settings,Customer Naming By,Designação de Cliente Por
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Por favor, configure Employee Naming System em Recursos Humanos&gt; Configurações de RH"
+DocType: Depreciation Schedule,Depreciation Amount,Montante de Depreciação
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,Converter para Grupo
 DocType: Activity Cost,Activity Type,Tipo de Atividade
 DocType: Request for Quotation,For individual supplier,Para cada fornecedor
 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 embalagem
-apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,As ordens de compra dadas a fornecedores.
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Publishing
-DocType: Activity Cost,Projects User,Projetos de Usuário
+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,{0}: {1} não foi encontrado na tabela detalhes da fatura.
-DocType: Company,Round Off Cost Center,Termine Centro de Custo
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +205,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Manutenção Visita {0} deve ser cancelado antes de cancelar esta ordem de venda
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +157,{0}: {1} not found in Invoice Details table,{0}: {1} não foi encontrado 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 venda
 DocType: Item,Material Transfer,Transferência de Material
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +205,Opening (Dr),Abertura (Dr)
-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 Custo desembarcados e Encargos
-DocType: Production Order Operation,Actual Start Time,Hora de início Atual
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +205,Opening (Dr),Inicial (Db)
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},A marca temporal de postagem 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,Gerente De Vendas
 DocType: Salary Structure Employee,Base,Base
+DocType: Timesheet,Total Billed Hours,Horas total cobrado
 DocType: Journal Entry,Write Off Amount,Escreva Off Quantidade
-DocType: Journal Entry,Bill No,Projeto de Lei n
-DocType: Company,Gain/Loss Account on Asset Disposal,Conta ganho / perda de Ativos Eliminação
+DocType: Journal Entry,Bill No,Nº 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,Nota de Entrega Obrigatório
-DocType: Sales Order Item,Basic Rate (Company Currency),Taxa Básica (Moeda Company)
+DocType: Selling Settings,Delivery Note Required,Necessário Nota de Entrega
+DocType: Sales Order Item,Basic Rate (Company Currency),Taxa Básica (Moeda da Empresa)
 DocType: Student Attendance,Student Attendance,Presença Student
 DocType: Sales Invoice Timesheet,Time Sheet,Planilha de horário
-DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush Matérias-Primas Based On
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,Please enter item details,Por favor insira os detalhes do item
+DocType: Manufacturing Settings,Backflush Raw Materials Based On,Confirmar Matérias-Primas com Base Em
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,Please enter item details,"Por favor, insira os dados do item"
 DocType: Interest,Interest,Interesse
-apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +9,Pre Sales,Pré vendas
-DocType: Purchase Receipt,Other Details,Outros detalhes
+apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +9,Pre Sales,Pré-vendas
+DocType: Purchase Receipt,Other Details,Outros Dados
 DocType: Account,Accounts,Contas
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Marketing,marketing
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +227,Payment Entry is already created,Entrada de pagamento já está criado
-DocType: Purchase Receipt Item Supplied,Current Stock,Stock atual
-apps/erpnext/erpnext/controllers/accounts_controller.py +538,Row #{0}: Asset {1} does not linked to Item {2},Linha # {0}: Ativo {1} não vinculado ao item {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +21,Preview Salary Slip,Pré-visualização folha de salário
-DocType: Company,Deafult Cost Center,Centro de Custo deafult
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +48,Account {0} has been entered multiple times,Conta {0} foi digitado várias vezes
-DocType: Account,Expenses Included In Valuation,Despesas incluídos na avaliação
-DocType: Employee,Provide email id registered in company,Fornecer ID e-mail registrado na empresa
+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 +541,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 +38,Preview Salary Slip,Pré-visualizar Folha de Vencimento
+DocType: Company,Deafult Cost Center,Centro de Custo Padrão
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +48,Account {0} has been entered multiple times,A conta {0} foi inserida várias vezes
+DocType: Account,Expenses Included In Valuation,Despesas Incluídos na Estimativa
+DocType: Employee,Provide email id registered in company,Forneça o ID do email registado na empresa
 DocType: Hub Settings,Seller City,Vendedor Cidade
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,"Por favor, selecione um grupo de estudantes"
-DocType: Email Digest,Next email will be sent on:,Próximo e-mail será enviado em:
-DocType: Offer Letter Term,Offer Letter Term,Oferecer Carta Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +617,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/schools/doctype/announcement/announcement.py +22,Please select a Student Group,"Por favor, selecione um Grupo de Estudantes"
+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 +619,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 da
-apps/erpnext/erpnext/accounts/doctype/account/account.py +25,Company {0} does not exist,Companhia {0} não existe
+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,boom Type
-DocType: BOM Explosion Item,Qty Consumed Per Unit,Qtde consumida por unidade
+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 (%),Comissão Taxa (%)
-DocType: Project,Estimated Cost,Custo estimado
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,aeroespaço
-DocType: Journal Entry,Credit Card Entry,Entrada de cartão de crédito
+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,Entrada 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.,Mercadorias recebidas de fornecedores.
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,Em valor
-DocType: Lead,Campaign Name,Nome da campanha
-,Reserved,gereserveerd
+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 próxima fatura será gerada. Ele é gerado em enviar.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Ativo Circulante
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,{0} is not a stock Item,{0} não é um item de stock
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Ativo Corrente
+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),Recebido Valor (Empresa de moeda)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +169,Lead must be set if Opportunity is made from Lead,Fila deve ser definido se Opportunity é feito de chumbo
-apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Por favor seleccione dia de folga semanal
-DocType: Production Order Operation,Planned End Time,Planned End Time
+DocType: Payment Entry,Received Amount (Company Currency),Montante Recebido (Moeda da Empresa)
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +169,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,Vendas Pessoa Alvo Variance item Group-wise
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,Account with existing transaction cannot be converted to ledger,Conta com a transação existente não pode ser convertido em livro
-DocType: Delivery Note,Customer's Purchase Order No,Ordem de Compra do Cliente Não
-DocType: Employee,Cell Number,Número de células
-apps/erpnext/erpnext/stock/reorder_item.py +177,Auto Material Requests Generated,Pedidos de Materiais Auto Gerado
+apps/erpnext/erpnext/accounts/doctype/account/account.py +96,Account with existing transaction cannot be converted to ledger,A conta com a transação existente não pode ser convertida num livro
+DocType: Delivery Note,Customer's Purchase Order No,Nº do Pedido de Compra do Cliente
+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 +125,You can not enter current voucher in 'Against Journal Entry' column,Você não pode entrar comprovante atual na coluna 'Contra Entrada de Jornal'
-apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +39,Reserved for manufacturing,Reservados para a fabricação
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,energia
+apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +39,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.
+apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Declaração salarial mensal.
 DocType: Item Group,Website Specifications,Especificações do site
 apps/erpnext/erpnext/utilities/doctype/address/address.py +104,There is an error in your Address Template {0},Há um erro no seu modelo de endereço {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{0}: From {0} of type {1},{0}: A partir de {0} do tipo {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{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,Row {0}: Fator de Conversão é obrigatório
-DocType: Employee,A+,A +
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +274,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","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 +369,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 +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 +274,"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 +369,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 +206,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/accounts/doctype/purchase_invoice/purchase_invoice.py +206,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,Faça Quadro de Horários
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +42,Make Timesheet,Criar Livro de Ponto
 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
@@ -743,582 +752,588 @@
  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.,Bank A / C N º
+DocType: Employee,Bank A/C No.,Nº de Conta Bancária
 DocType: GL Entry,Project,Projeto
-DocType: Quality Inspection Reading,Reading 7,Lendo 7
+DocType: Quality Inspection Reading,Reading 7,Leitura 7
 DocType: Address,Personal,Pessoal
-DocType: Expense Claim Detail,Expense Claim Type,Tipo 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/asset/depreciation.py +128,Asset scrapped via Journal Entry {0},Activo desfeito via Journal Entry {0}
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,biotecnologia
+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 eliminado 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,Gelieve eerst in Item
-DocType: Account,Liability,responsabilidade
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,"Por favor, insira primeiro o Item"
+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}.,Montante Sanctioned não pode ser maior do que na Reivindicação Montante Fila {0}.
-DocType: Company,Default Cost of Goods Sold Account,Custo padrão de Conta Produtos Vendidos
-apps/erpnext/erpnext/stock/get_item_details.py +275,Price List not selected,Lista de Preço não selecionado
+DocType: Company,Default Cost of Goods Sold Account,Custo padrão de Conta de Produtos Vendidos
+apps/erpnext/erpnext/stock/get_item_details.py +275,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 E-mail
 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 +709,No Permission,Nenhuma permissão
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +710,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 baseado em Festa, selecione Partido Escreva 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 Stock 'não pode ser verificado porque os itens não são entregues via {0}"
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,Nos
-DocType: Item,Items with higher weightage will be shown higher,Os itens com maior weightage será mostrado maior
-DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Banco Detalhe Reconciliação
-apps/erpnext/erpnext/controllers/accounts_controller.py +542,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 funcionário encontrado
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Para filtrar baseando em partes, selecione a entidade 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}"
+apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,Nºs
+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 +545,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 subcontratada a um fornecedor
-DocType: SMS Center,All Customer Contact,Todos os contactos de clientes
+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 estoque via csv.
 DocType: Warehouse,Tree Details,Detalhes árvore
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Nu verzenden
 ,Support Analytics,Analytics apoio
 DocType: Item,Website Warehouse,Armazém site
-DocType: Payment Reconciliation,Minimum Invoice Amount,Montante Mínimo de Fatura
-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ão existe em cima &#39;{doctype}&#39; mesa
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +227,Timesheet {0} is already completed or cancelled,Timesheet {0} já está concluída ou cancelada
+DocType: Payment Reconciliation,Minimum Invoice Amount,Montante Mínimo da Fatura
+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 +259,Timesheet {0} is already completed or cancelled,Timesheet {0} já está concluída ou 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 auto factura será gerado por exemplo, 05, 28, etc"
-DocType: Asset,Opening Accumulated Depreciation,Abrindo Depreciação Acumulada
+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,Score moet lager dan of gelijk aan 5 zijn
-DocType: Program Enrollment Tool,Program Enrollment Tool,Programa ferramenta de inscrição
-apps/erpnext/erpnext/config/accounts.py +294,C-Form records,C -Formulário de Registos
+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 C -Form
 apps/erpnext/erpnext/config/selling.py +297,Customer and Supplier,Clientes e Fornecedores
-DocType: Email Digest,Email Digest Settings,E-mail Digest Configurações
+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 de aposentadoria
-DocType: Bin,Moving Average Rate,Movendo Taxa Média
+DocType: HR Settings,Retirement Age,Idade da Reforma
+DocType: Bin,Moving Average Rate,Taxa de Média Móvel
 DocType: Production Planning Tool,Select Items,Selecione itens
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,{0} against Bill {1} dated {2},{0} contra conta {1} com a data de {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Horário do curso
-DocType: Maintenance Visit,Completion Status,Status de conclusão
-DocType: HR Settings,Enter retirement age in years,Digite a idade de aposentadoria em anos
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +229,Target Warehouse,Armazém alvo
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,{0} against Bill {1} dated {2},{0} na conta {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 +230,Target Warehouse,Armazém alvo
 DocType: Cheque Print Template,Starting location from left edge,Começando local a partir do lado esquerdo
-DocType: Item,Allow over delivery or receipt upto this percent,Permitir sobre a entrega ou recebimento até esta cento
+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,Data da Previsão de Entrega não pode ser antes da Data da Ordem de Vendas
-DocType: Upload Attendance,Import Attendance,Importação de Atendimento
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Todos os grupos de itens
-DocType: Process Payroll,Activity Log,Registro de Atividade
+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 de 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.,Compor automaticamente mensagem na apresentação de transações.
-DocType: Production Order,Item To Manufacture,Item Para Fabricação
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +82,{0} {1} status is {2},{0} {1} estatuto é {2}
-DocType: Shopping Cart Settings,Enable Checkout,Ativar Caixa
-apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Ordem de Compra para pagamento
-apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +37,Projected Qty,Qtde Projetada
-DocType: Sales Invoice,Payment Due Date,Data de Validade de Pagamento
-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/config/setup.py +89,Automatically compose message on submission of transactions.,Criar mensagem automaticamente 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 +37,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'
-DocType: Notification Control,Delivery Note Message,Mensagem Nota de Entrega
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Aberto para fazer
+DocType: Notification Control,Delivery Note Message,Mensagem de Nota de Entrega
 DocType: Expense Claim,Expenses,Despesas
-DocType: Item Variant Attribute,Item Variant Attribute,Variant item Atributo
-,Purchase Receipt Trends,Compra Trends Recibo
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Research & Development,Pesquisa e Desenvolvimento
-,Amount to Bill,Neerkomen op Bill
-DocType: Company,Registration Details,Detalhes registro
-DocType: Item Reorder,Re-Order Qty,Re-order Qtde
-DocType: Leave Block List Date,Leave Block List Date,Deixe Data Lista de Bloqueios
+DocType: Item Variant Attribute,Item Variant Attribute,Atributo de Variante do Item
+,Purchase Receipt Trends,Tendências de Recibo de Compra
+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 solicitadas
-DocType: Production Planning Tool,Only Obtain Raw Materials,Apenas obter matérias-primas
+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","Permitindo «Utilização para Carrinho de Compras&quot;, como Compras está habilitado e deve haver pelo menos uma regra de imposto para Compras"
-apps/erpnext/erpnext/controllers/accounts_controller.py +340,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Entrada de pagamento {0} está ligada contra a Ordem {1}, verificar se ele deve ser puxado como adiantamento da presente factura."
+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 está ativado e deve haver pelo menos uma Regra de Taxas para o Carrinho de Compras"
+apps/erpnext/erpnext/controllers/accounts_controller.py +343,"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,Detalhes da
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Valor do projeto
-apps/erpnext/erpnext/config/selling.py +307,Point-of-Sale,Ponto de venda
-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 já em crédito, você não tem permissão para definir 'saldo deve ser' como 'débito'"
-DocType: Account,Balance must be,Saldo deve ser
-DocType: Hub Settings,Publish Pricing,Publicar Pricing
-DocType: Notification Control,Expense Claim Rejected Message,Relatório de Despesas Rejeitado Mensagem
-,Available Qty,Qtde Disponível
-DocType: Purchase Taxes and Charges,On Previous Row Total,No total linha anterior
-DocType: Purchase Invoice Item,Rejected Qty,rejeitado Qtde
+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
+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á 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 de trabalho
-DocType: Serial No,Incoming Rate,Taxa de entrada
-DocType: Packing Slip,Gross Weight,Peso bruto
+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.,De naam van uw bedrijf waar u het opzetten van dit systeem .
-DocType: HR Settings,Include holidays in Total no. of Working Days,Incluir feriados em nenhuma total. de dias de trabalho
+DocType: HR Settings,Include holidays in Total no. of Working Days,Incluir férias no Nº Total de Dias Úteis
 DocType: Job Applicant,Hold,Segurar
-DocType: Employee,Date of Joining,Data da Unir
+DocType: Employee,Date of Joining,Data de Admissão
 DocType: Naming Series,Update Series,Atualização Series
-DocType: Supplier Quotation,Is Subcontracted,É subcontratada
-DocType: Item Attribute,Item Attribute Values,Valores de Atributo item
-DocType: Examination Result,Examination Result,Resultado de exame
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +756,Purchase Receipt,Compra recibo
-,Received Items To Be Billed,Itens recebidos a serem cobrados
-DocType: Employee,Ms,Ms
-apps/erpnext/erpnext/config/accounts.py +267,Currency exchange rate master.,Mestre taxa de câmbio .
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +167,Reference Doctype must be one of {0},Referência Doctype deve ser um dos {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +282,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
+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 +735,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 +170,Reference Doctype must be one of {0},O Doctype de Referência deve ser um de {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,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,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 +439,BOM {0} must be active,BOM {0} deve ser ativo
-DocType: Journal Entry,Depreciation Entry,Entrada 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/templates/generators/item.html +68,Goto Cart,Goto carrinho
-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,Deixe Quantidade cobrança
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,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/templates/generators/item.html +68,Goto Cart,Ir para Carrinho
+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},Serial Não {0} não pertence ao item {1}
-DocType: Purchase Receipt Item Supplied,Required Qty,Quantidade requerida
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +214,Warehouses with existing transaction can not be converted to ledger.,Armazéns com transação existente não pode ser convertido em contabilidade.
+DocType: Purchase Receipt Item Supplied,Required Qty,Qtd Necessária
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +217,Warehouses with existing transaction can not be converted to ledger.,Armazéns com transação existente não pode ser convertido em contabilidade.
 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,Balance Waarde
+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,Conta Moeda
-apps/erpnext/erpnext/accounts/general_ledger.py +137,Please mention Round Off Account in Company,"Por favor, mencione completam Conta in Company"
-DocType: Purchase Receipt,Range,Alcance
+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,Empregado {0} não está ativo ou não existe
-DocType: Fee Structure,Components,componentes
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,Please enter Asset Category in Item {0},"Por favor, indique categoria de ativo no item {0}"
-apps/erpnext/erpnext/stock/doctype/item/item.py +612,Item Variants {0} updated,Variantes item {0} atualizado
+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 +232,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 +614,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 +843,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,Compra Antecipada Fatura
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +854,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,Sync Now
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +172,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/config/accounts.py +210,Define budget for a financial year.,Definir orçamento para um exercício.
-DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Conta padrão Banco / Cash será atualizado automaticamente na fatura POS quando este modo for selecionado.
-DocType: Lead,LEAD-,CONDUZIR-
-DocType: Employee,Permanent Address Is,Vast adres
-DocType: Production Order Operation,Operation completed for how many finished goods?,Operação concluída por quantos produtos acabados?
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +172,Row {0}: Credit entry can not be linked with a {1},Linha {0}: Um 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á atualizado automaticamente na fatura POS quando este modo for selecionado.
+DocType: Lead,LEAD-,POTENCIAL CLIENTE-
+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 Detalhes Entrevista
-DocType: Item,Is Purchase Item,É item de compra
-DocType: Asset,Purchase Invoice,Compre Fatura
+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,Detalhe folha no
-apps/erpnext/erpnext/accounts/page/pos/pos.js +728,New Sales Invoice,Nova nota fiscal de venda
+apps/erpnext/erpnext/accounts/page/pos/pos.js +710,New Sales Invoice,Nova Fatura de Vendas
 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,Abertura Data e Data de Fechamento deve estar dentro mesmo ano fiscal
+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 Fecho devem estar dentro do mesmo Ano Fiscal
 DocType: Lead,Request for Information,Pedido de Informação
+apps/erpnext/erpnext/accounts/page/pos/pos.js +728,Sync Offline Invoices,Sincronização offline Facturas
 DocType: Payment Request,Paid,Pago
-DocType: Program Fee,Program Fee,Taxa de programa
+DocType: Program Fee,Program Fee,Proprina do Programa
 DocType: Salary Slip,Total in words,Total em palavras
-DocType: Material Request Item,Lead Time Date,Chumbo Data Hora
-DocType: Guardian,Guardian Name,Nome do guardião
+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 +86, is mandatory. Maybe Currency Exchange record is not created for ,é mandatório. Talvez recorde de câmbios não é criado para
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +109,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 +619,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","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/accounts/page/pos/pos.js +75, 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 Nº de Série para o Item {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +613,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing 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 Nº de Lote serão considerados a partir da tabela de 'Lista de Empacotamento'. Se o Armazém e o Nº 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 embarques para os clientes.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +606,Supplier Invoice Date cannot be greater than Posting Date,Fornecedor Data da fatura não pode ser maior que data de lançamento
-DocType: Purchase Invoice Item,Purchase Order Item,Comprar item Ordem
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +130,Indirect Income,Resultado indirecto
-DocType: Cheque Print Template,Date Settings,Configurações de data
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +609,Supplier Invoice Date cannot be greater than Posting Date,Fornecedor Data da fatura não pode ser maior que data de lançamento
+DocType: Purchase Invoice Item,Purchase Order Item,Item de Pedido de Compra
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +130,Indirect Income,Rendimento Indireto
+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),Mensagem total ( s )
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +810,Select Item for Transfer,Selecionar item para Transferência
-DocType: Purchase Invoice,Additional Discount Percentage,Percentagem de Desconto adicional
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +789,Select Item for Transfer,Selecionar item para Transferência
+DocType: Purchase Invoice,Additional Discount Percentage,Percentagem de Desconto Adicional
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Veja uma lista de todos os vídeos de ajuda
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Selecione cabeça conta do banco onde cheque foi depositado.
-DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Permitir ao utilizador editar Taxa de Lista de Preços em transações
-DocType: Pricing Rule,Max Qty,Max Qtde
-DocType: Student Applicant,Father's Name,Nome do pai
+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","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 +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: O pagamento contra Vendas / Ordem de Compra deve ser sempre marcado como antecedência
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,químico
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +686,All items have already been transferred for this Production Order.,Todos os itens já foram transferidos para esta ordem de produção.
+						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 +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Linha {0}: O pagamento no Pedido de Vendas/Compra deve ser sempre marcado como um adiantamento
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Químico
+apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
+                    Please check intervals {0} and {1} and try again",Os intervalos para Código Grade {0} se sobrepõe com os intervalos de qualidade para outros graus. Por favor verifique intervalos {0} e {1} e tente novamente
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +694,All items have already been transferred for this Production Order.,Todos os itens já foram transferidos para este Pedido de Produção.
 DocType: Process Payroll,Select Payroll Year and Month,Selecione Payroll ano e mês
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Meter,metro
-DocType: Workstation,Electricity Cost,elektriciteitskosten
-DocType: HR Settings,Don't send Employee Birthday Reminders,Stuur geen Werknemer verjaardagsherinneringen
-DocType: Opportunity,Walk In,Entrar
+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 envie Lembretes de Aniversário de Funcionários
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,Entradas de Stock
-DocType: Item,Inspection Criteria,Critérios de inspeção
+DocType: Item,Inspection Criteria,Critérios de Inspeção
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Transferido
 apps/erpnext/erpnext/public/js/setup_wizard.js +163,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: Timesheet Detail,Bill,Conta
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,White,Branco
-DocType: SMS Center,All Lead (Open),Todos chumbo (Aberto)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +228,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Row {0}: Quantidade não está disponível para {4} no armazém {1} na postando momento da entrada ({2} {3})
-DocType: Purchase Invoice,Get Advances Paid,Obter adiantamentos pagos
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +731,Make ,Fazer
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date is entered as past date,Próximo Depreciação A data é inserida como data passada
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +167,White,Branco
+DocType: SMS Center,All Lead (Open),Todos os Potenciais 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}),Row {0}: A qtd não está disponível para {4} no armazém {1} na 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 +710,Make ,Efetuar
+DocType: Student Admission,Admission Start Date,Admissão Data de Início
 DocType: Journal Entry,Total Amount in Words,Valor Total em Palavras
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Er is een fout opgetreden . Een mogelijke reden zou kunnen zijn dat je niet hebt opgeslagen het formulier . Neem dan contact support@erpnext.com als het probleem aanhoudt .
-apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Meu carrinho
-apps/erpnext/erpnext/controllers/selling_controller.py +154,Order Type must be one of {0},Tipo de Ordem deve ser uma das {0}
-DocType: Lead,Next Contact Date,Data Contato próximo
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Opening Aantal
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +393,Please enter Account for Change Amount,"Por favor, indique conta para a Mudança Montante"
+apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Meu Carrinho
+apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},O Tipo de Pedido deve pertencer a {0}
+DocType: Lead,Next Contact Date,Data do Próximo Contacto
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Qtd Inicial
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,Please enter Account for Change Amount,"Por favor, insira a Conta para o Montante de Alterações"
 DocType: Student Batch,Student Batch Name,Estudante Batch Nome
 DocType: Holiday List,Holiday List Name,Lista de Nomes de Feriados
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js +8,Schedule Course,Calendário de Cursos
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Stock Options,Opções de Compra
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Opções de Compra
 DocType: Journal Entry Account,Expense Claim,Relatório de Despesas
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +211,Do you really want to restore this scrapped asset?,Você realmente deseja restaurar este ativo desfeito?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +237,Qty for {0},Qtde para {0}
-DocType: Leave Application,Leave Application,Formulário de Férias
-apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Ferramenta de Alocação de Férias
-DocType: Leave Block List,Leave Block List Dates,Deixe as datas Lista de Bloqueios
-DocType: Workstation,Net Hour Rate,Net Hour Taxa
-DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Recibo de compra Landed Cost
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +212,Do you really want to restore this scrapped asset?,Deseja realmente restaurar este ativo eliminado?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,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 Alocaçã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,Embalagem item deslizamento
-DocType: Purchase Invoice,Cash/Bank Account,Caixa / Banco Conta
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Itens removidos sem nenhuma alteração na quantidade ou valor.
-DocType: Delivery Note,Delivery To,Entrega
-apps/erpnext/erpnext/stock/doctype/item/item.py +635,Attribute table is mandatory,Tabela de atributo é obrigatório
-DocType: Production Planning Tool,Get Sales Orders,Obter Ordem de Vendas
+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,Entrega A
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,É obrigatório colocar a tabela do atributos
+DocType: Production Planning Tool,Get Sales Orders,Obter Pedido de Vendas
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} não pode ser negativo
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,Por favor seleccione um Aluno
+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 Amortizações
 DocType: Workstation,Wages,Salário
 DocType: Project,Internal,Interno
 DocType: Task,Urgent,Urgente
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +141,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
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +141,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,Comprar item recepção
-DocType: Purchase Receipt,PREC-RET-,PREC-RET
+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,Nota fiscal de venda Pagamento
-DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Armazém reservada no Pedido de Vendas / armazém de produtos acabados
+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 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 Responsável de Gastos para este registo. Por favor atualize o 'Status' e Save.
-DocType: Serial No,Creation Document No,Creatie Document No
-DocType: Issue,Issue,Questão
+DocType: Serial No,Creation Document No,Nº  de Documento
+DocType: Issue,Issue,Problema
 DocType: Asset,Scrapped,desmantelada
-apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Conta não coincidir 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/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +27,Returns,retorna
+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,WIP Warehouse
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Serial Não {0} está sob contrato de manutenção até {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},Serial Não {0} está sob 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 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"
-DocType: Employee,A-,UMA-
+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-
 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,Contra
-DocType: Item,Default Selling Cost Center,Venda Padrão Centro de Custo
-DocType: Sales Partner,Implementation Partner,Parceiro de implementação
-apps/erpnext/erpnext/controllers/selling_controller.py +231,Sales Order {0} is {1},Pedido de Vendas {0} é {1}
-DocType: Opportunity,Contact Info,Informações para contato
-apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,Fazendo de Stock Entradas
-DocType: Packing Slip,Net Weight UOM,UOM Peso Líquido
-DocType: Item,Default Supplier,Fornecedor padrão
-DocType: Manufacturing Settings,Over Production Allowance Percentage,Ao longo de Produção Provisão Percentagem
+DocType: GL Entry,Against,Em
+DocType: Item,Default Selling Cost Center,Venda de Centro de Custo Padrão
+DocType: Sales Partner,Implementation Partner,Parceiro de Implementação
+apps/erpnext/erpnext/controllers/selling_controller.py +232,Sales Order {0} is {1},Pedido de Vendas {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
+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,Regra Condições de envio
-DocType: Holiday List,Get Weekly Off Dates,Obter Datas semanais de folga
-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
+DocType: Holiday List,Get Weekly Off Dates,Obter Datas de Folga 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 em primeiro lugar.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Dr,Dr
-apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Citações recebidas de fornecedores.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Dr,Dr
+apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Cotações recebidas de Fornecedores.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},Para {0} | {1} {2}
-apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Média de Idade
+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,Sua pessoa de vendas que 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.,Insira alguns dos seus fornecedores. Podem ser organizações ou individuais.
-apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,Exibir todos os produtos
-DocType: Company,Default Currency,Moeda padrão
-DocType: Contact,Enter designation of this Contact,Digite designação de este contato
-DocType: Expense Claim,From Employee,De Empregado
-apps/erpnext/erpnext/controllers/accounts_controller.py +400,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Aviso : O sistema não irá verificar superfaturamento desde montante para item {0} em {1} é zero
-DocType: Journal Entry,Make Difference Entry,Faça Entrada Diferença
-DocType: Upload Attendance,Attendance From Date,Presença de Data
-DocType: Appraisal Template Goal,Key Performance Area,Performance de Área Chave
+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,Exibir todos os produtos
+DocType: Company,Default Currency,Moeda Padrão
+DocType: Contact,Enter designation of this Contact,Insira a designação deste Contacto
+DocType: Expense Claim,From Employee,Do(a) Funcionário(a)
+apps/erpnext/erpnext/controllers/accounts_controller.py +403,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Aviso : O sistema não irá verificar superfaturamento desde montante para item {0} em {1} é zero
+DocType: Journal Entry,Make Difference Entry,Efetuar Registo de Diferença
+DocType: Upload Attendance,Attendance From Date,Presença da Data
+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/controllers/item_variant.py +63,Invalid Attribute,Atributo Inválido
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,e ano:
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +191,{0} {1} must be submitted,{0} {1} deve ser submetido
-DocType: Email Digest,Annual Expense,Despesa anual
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +145,Quantity must be less than or equal to {0},Quantidade deve ser inferior ou igual a {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,{0} {1} must be submitted,{0} {1} deve ser enviado
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +145,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 Personagens
-apps/erpnext/erpnext/controllers/buying_controller.py +156,Please select BOM in BOM field for Item {0},"Por favor, selecione no campo BOM BOM por item {0}"
-DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form Detalhe Fatura
-DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Reconciliação O pagamento da fatura
-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.,"Números da empresa de registro para sua referência. Números fiscais, etc"
+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 C-Form
+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,Carrinho Rule Envio
-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 esta ordem de venda
-apps/erpnext/erpnext/public/js/controllers/transaction.js +62,Please set 'Apply Additional Discount On',"Por favor, defina &quot;Aplicar desconto adicional em &#39;"
-,Ordered Items To Be Billed,Itens ordenados a serem cobrados
-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
-DocType: Global Defaults,Global Defaults,Padrões globais
-apps/erpnext/erpnext/projects/doctype/project/project.py +153,Project Collaboration Invitation,Convite Colaboração em Projectos
-DocType: Salary Slip,Deductions,Reduções
+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 Venda
+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 Globais
+apps/erpnext/erpnext/projects/doctype/project/project.py +153,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 +327,Capacity Planning Error,Capacidade de erro Planejamento
-,Trial Balance for Party,Balancete para o partido
+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,Ganhos
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +362,Finished Item {0} must be entered for Manufacture type entry,Acabou item {0} deve ser digitado para a entrada Tipo de Fabricação
-apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Saldo de Contabilidade
+DocType: Salary Slip,Earnings,Remunerações
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +367,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,Vendas antecipadas Fatura
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +499,Nothing to request,Nada para requesitar
-apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',' Data de início' não pode ser maior que 'Data Final '
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Management,gestão
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},É requerido um valor de débito ou crédito para {0}
-DocType: Cheque Print Template,Payer Settings,Configurações Payer
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +500,Nothing to request,Nada a requesitar
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',A 'Data de Início 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
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +55,Either debit or credit amount is required for {0},É necessário colocar um montante de débito ou crédito para {0}
+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""","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 (em palavras) será visível quando você salvar  o Recibo de salário.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,Blue,Azul
-DocType: Purchase Invoice,Is Return,É Retorno
-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: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,O Pagamento Líquido (em palavras) 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 ID,"Por favor, defina a ID do Email"
 DocType: Item,UOMs,UOMS
-apps/erpnext/erpnext/stock/utils.py +181,{0} valid serial nos for Item {1},{0} N º s de série válido para o item {1}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Codigo de Item não pode ser trocado por Num. de Serie.
-apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +23,POS Profile {0} already created for user: {1} and company {2},POS perfil {0} já criado para o usuário: {1} e {2} empresa
+apps/erpnext/erpnext/stock/utils.py +181,{0} valid serial nos for Item {1},Nº 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 Nº de Serie.
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +23,POS Profile {0} already created for user: {1} and company {2},O Perfil POS {0} já foi criado para o utilizador: {1} e empresa {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM Fator de Conversão
-DocType: Stock Settings,Default Item Group,Grupo Item padrão
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1374,Do you really want to submit the invoice?,Você realmente deseja enviar a factura?
+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 referencia
+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 +685,Cost Center For Item with Item Code ',Centro de custo para item com o Código do item '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1526,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Modo de pagamento não está configurado. Por favor verifique, se conta foi definida em Modo de Pagamentos ou POS perfil."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +679,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 +1550,"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,Seu vendedor receberá um lembrete sobre esta data para contato com o cliente
-apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,"Further accounts can be made under Groups, but entries can be made against non-Groups","Outras contas podem ser feitas em grupos, mas as entradas podem ser feitas contra os não-Groups"
-DocType: Lead,Lead,Conduzir
-DocType: Email Digest,Payables,Contas a pagar
-DocType: Course,Course Intro,curso de Introdução
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,"Further accounts can be made under Groups, but entries can be made against non-Groups","Podem ser realizadas outras contas nos Grupos, e os registos podem ser efetuados nos não Grupos"
+DocType: Lead,Lead,Potencial Cliente
+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 +156,Stock Entry {0} created,Da entrada {0} criado
-apps/erpnext/erpnext/controllers/buying_controller.py +289,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Rejeitado Qtde não pode ser inscrita no retorno de compra
-,Purchase Order Items To Be Billed,Ordem de Compra itens a serem faturados
-DocType: Purchase Invoice Item,Net Rate,Taxa Net
-DocType: Purchase Invoice Item,Purchase Invoice Item,Comprar item Fatura
+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 de 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,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
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Item 1
 DocType: Holiday,Holiday,Férias
-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: Leave Control Panel,Leave blank if considered for all branches,Deixe em branco se for para todos os ramos
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},C-Form não é aplicável para a Fatura: {0}
 DocType: Payment Reconciliation,Unreconciled Payment Details,Unreconciled Detalhes do pagamento
-DocType: Global Defaults,Current Fiscal Year,Atual Exercício
-DocType: Global Defaults,Disable Rounded Total,Desativar total arredondado
-DocType: Lead,Call,Chamar
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +417,'Entries' cannot be empty,' Entradas ' não pode estar vazio
+DocType: Global Defaults,Current Fiscal Year,Ano Fiscal Atual
+DocType: Global Defaults,Disable Rounded Total,Desativar Total Arredondado
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +418,'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 +214,Fiscal Year {0} not found,Ano Fiscal {0} não encontrado
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +221,Fiscal Year {0} not found,O Ano Fiscal de {0} não foi encontrado
 apps/erpnext/erpnext/config/hr.py +238,Setting up Employees,Configurando Empregados
 DocType: Sales Order,SO-,ASSIM-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Por favor seleccione prefixo primeiro
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Please select prefix first,"Por favor, seleccione o prefixo primeiro"
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Research,pesquisa
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Research,Pesquisa
 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
-DocType: Announcement,All Students,Todos os alunos
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a non-stock item,Item {0} deve ser um item não inventariado
+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 +43,Item {0} must be a non-stock item,O Item {0} deve ser um item não inventariado
 DocType: Contact,User ID,ID de utilizador
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +57,View Ledger,Ver Diário
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Mais Cedo
-apps/erpnext/erpnext/stock/doctype/item/item.py +504,"An Item Group exists with same name, please change the item name or rename the item group","Um grupo de itens existe com o mesmo nome, por favor, mude o nome do item ou mudar o nome do grupo de itens"
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +437,Rest Of The World,Resto do mundo
+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/setup/setup_wizard/setup_wizard.py +437,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 Batch
-,Budget Variance Report,Relatório Variance Orçamento
-DocType: Salary Slip,Gross Pay,Salário bruto
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +90,Row {0}: Activity Type is mandatory.,Row {0}: tipo de atividade é obrigatório.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Dividends Paid,Dividendos pagos
-apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Accounting Ledger
-DocType: Stock Reconciliation,Difference Amount,Diferença Montante
+,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 +114,Row {0}: Activity Type is mandatory.,É obrigatório colocar o Tipo de Atividade da linha {0}:.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Dividends Paid,Dividendos Pagos
+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: BOM Item,Item Description,Item Descrição
-DocType: Purchase Invoice,Is Recurring,É recorrente
+DocType: BOM Item,Item Description,Descrição do Item
+DocType: Student Sibling,Student Sibling,estudante Irmãos
+DocType: Purchase Invoice,Is Recurring,É Recorrente
 DocType: Purchase Invoice,Supplied Items,Itens fornecidos
 DocType: Student,STUD.,VIGA.
-DocType: Production Order,Qty To Manufacture,Qtde Para Fabricação
-DocType: Buying Settings,Maintain same rate throughout purchase cycle,Manter mesmo ritmo durante todo o ciclo de compra
-DocType: Opportunity Item,Opportunity Item,Item oportunidade
+DocType: Production Order,Qty To Manufacture,Qtd Para Fabrico
+DocType: Email Digest,New Income,New Renda
+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 Férias do Empregado
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +131,Balance for Account {0} must always be {1},Saldo Conta {0} deve ser sempre {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +175,Valuation Rate required for Item in row {0},Taxa de avaliação exigido para o Item na linha {0}
+,Employee Leave Balance,Balanço de Licenças do Funcionário
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,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},Taxa de avaliação exigido 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 da Computação
-DocType: Purchase Invoice,Rejected Warehouse,Armazém rejeitado
-DocType: GL Entry,Against Voucher,Contra Vale
-DocType: Item,Default Buying Cost Center,Compra Centro de Custo Padrã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 Comprovante
+DocType: Item,Default Buying Cost Center,Compra de Centro de Custo 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 tirar o melhor proveito de ERPNext, recomendamos que você levar algum tempo e assistir a esses vídeos de ajuda."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +87, to ,para
-DocType: Item,Lead Time in days,Tempo de entrega em dias
+apps/erpnext/erpnext/accounts/page/pos/pos.js +76, 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/accounts/doctype/gl_entry/gl_entry.py +196,Not authorized to edit frozen Account {0},Não autorizado para editar conta congelada {0}
-DocType: Journal Entry,Get Outstanding Invoices,Obter Facturas Pendentes
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +62,Sales Order {0} is not valid,Ordem de Vendas {0} não é válido
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,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 +63,Sales Order {0} is not valid,Ordem de Vendas {0} não é válido
 apps/erpnext/erpnext/setup/doctype/company/company.py +185,"Sorry, companies cannot be merged","Desculpe, 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 / Transferir {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 +152,Small,Pequeno
-DocType: Employee,Employee Number,Número de empregado
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Processo n º (s) já está em uso . Tente de Processo n {0}
-,Invoiced Amount (Exculsive Tax),Factuurbedrag ( Exculsive BTW )
-DocType: Student Applicant,Mother's / Guardian 1 Email ID,Mãe / Guardião ID 1 Email
-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 principal {0} criada
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +160,Green,Verde
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,Small,Pequeno
+DocType: Employee,Employee Number,Número de Funcionário
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Processo Nº (s) já está a ser utilizado . Tente a partir do Processo Nº {0}
+,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,Foi criado o livro de conta {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,Verde
 DocType: Supplier,SUPP-,SUPP-
-DocType: Item,Auto re-order,Auto re-fim
+DocType: Item,Auto re-order,Voltar a Pedir Automaticamente
 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 Emissão
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Contract,contrato
-DocType: Email Digest,Add Quote,Adicionar Citar
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +498,UOM coversion factor required for UOM: {0} in Item: {1},Fator coversion UOM necessário para UOM: {0} no Item: {1}
+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 +503,UOM coversion factor required for UOM: {0} in Item: {1},Fator coversion UOM necessário para UOM: {0} no Item: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,Despesas Indiretas
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +80,Row {0}: Qty is mandatory,Row {0}: Quantidade é obrigatório
+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 +737,Sync Master Data,Sincronização de Dados Mestre
+apps/erpnext/erpnext/accounts/page/pos/pos.js +719,Sync Master Data,Sincronização de Dados Mestre
 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,Site de imagem deve ser um arquivo público ou URL do site
-DocType: Purchase Invoice Item,BOM,BOM
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Este é um item de raíz e não pode ser editado
-DocType: Journal Entry Account,Purchase Order,Ordem de Compra
+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 de raíz e não pode ser editado
+DocType: Journal Entry Account,Purchase Order,Pedido de Compra
 DocType: Warehouse,Warehouse Contact Info,Armazém Informações de Contato
 DocType: Payment Entry,Write Off Difference Amount,Escrever Off Diferença Valor
-DocType: Purchase Invoice,Recurring Type,Tipo recorrente
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +345,"{0}: Employee email not found, hence email not sent","{0}: e-mail do empregado não foi encontrado, portanto, não e-mail enviado"
+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 / Município
-DocType: Address,Is Your Company Address,É o seu endereço Empresa
-DocType: Email Digest,Annual Income,Rendimento anual
+DocType: Address,Is Your Company Address,É o Seu Endereço Empresarial
+DocType: Email Digest,Annual Income,Rendimento Anual
 DocType: Serial No,Serial No Details,Serial Detalhes Nenhum
-DocType: Purchase Invoice Item,Item Tax Rate,Taxa de Imposto item
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,"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 +474,Delivery Note {0} is not submitted,Entrega Nota {0} não é submetido
-apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Sub-contracted Item,Item {0} deve ser um item do sub- contratados
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Equipamentos Capitais
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Regra de Preços é o primeiro selecionado com base em ""Aplicar On 'campo, que pode ser Item, item de grupo ou Marca."
+DocType: Purchase Invoice Item,Item Tax Rate,Taxa Fiscal do Item
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,"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/accounts/doctype/sales_invoice/sales_invoice.py +530,Delivery Note {0} is not submitted,A Nota de Entrega {0} não foi enviada
+apps/erpnext/erpnext/stock/get_item_details.py +133,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 é primeiro selecionada com base no campo 'Aplicar Em', que pode ser um Item, Grupo de Itens ou Marca."
 DocType: Hub Settings,Seller Website,Vendedor Site
 DocType: Item,ITEM-,ITEM-
-apps/erpnext/erpnext/controllers/selling_controller.py +147,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 +110,Production Order status is {0},Status de ordem de produção é {0}
-DocType: Appraisal Goal,Goal,Meta
+apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Porcentagem total alocado para a equipe de vendas deve ser de 100
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Estado do Pedido de Produção: {0}
+DocType: Appraisal Goal,Goal,Objetivo
 DocType: Sales Invoice Item,Edit Description,Editar Descrição
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +757,For Supplier,Para Fornecedor
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +723,For Supplier,Para o Fornecedor
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Tipo de conta Definir ajuda na seleção desta conta em transações.
-DocType: Purchase Invoice,Grand Total (Company Currency),Grande Total (moeda da empresa)
+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 havia nenhuma item chamado {0}
+apps/erpnext/erpnext/utilities/bot.py +39,Did not find any item called {0},Não havia nenhum item denominado {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Sainte total
 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 """
 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 fazer lançamentos contábeis contra grupos .
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +122,Child warehouse exists for this warehouse. You can not delete this warehouse.,armazém criança existe para este armazém. Você não pode excluir este armazém.
+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,Item Grupos site
 DocType: Purchase Invoice,Total (Company Currency),Total (Companhia de moeda)
 apps/erpnext/erpnext/stock/utils.py +176,Serial number {0} entered more than once,Número de série {0} entrou mais de uma vez
-DocType: Depreciation Schedule,Journal Entry,Diário de entradas
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,{0} items in progress,{0} itens em andamento
+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 da Estação de Trabalho
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +445,BOM {0} does not belong to Item {1},O BOM {0} não pertencem ao Item {1}
+DocType: Grade Interval,Grade Code,Código Grade
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email de Resumo:
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +445,BOM {0} does not belong to Item {1},A LDM {0} não pertence ao Item {1}
 DocType: Sales Partner,Target Distribution,Distribuição alvo
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1667,Deafault warehouse is required for selected item,armazém Deafault é necessário para o item selecionado
-DocType: Salary Slip,Bank Account No.,Banco Conta N º
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Deafault warehouse is required for selected item,É necessário colocar o armazém padrão  para o item selecionado
+DocType: Salary Slip,Bank Account No.,Conta Bancária Nº
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Este é o número da última transacção criados com este prefixo
 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'","Total de {0} para todos os itens é zero, pode você deve mudar &quot;Distribuir taxas sobre &#39;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Impostos e Encargos de Cálculo
 DocType: BOM Operation,Workstation,Estação de trabalho
-DocType: Request for Quotation Supplier,Request for Quotation Supplier,Request for Quotation Fornecedor
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Hardware,Hardware
-DocType: Sales Order,Recurring Upto,recorrente Upto
+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,Até Recorrente
 DocType: Attendance,HR Manager,Gestor 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 +48,Privilege Leave,Privilege Deixar
+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,Fornecedor Data Fatura
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,É preciso ativar o Carrinho de Compras
 DocType: Payment Entry,Writeoff,Eliminar
-DocType: Appraisal Template Goal,Appraisal Template Goal,Meta Modelo de avaliação
-DocType: Salary Slip,Earning,Ganhando
-DocType: Purchase Invoice,Party Account Currency,Partido Conta Moeda
-,BOM Browser,BOM Navegador
-DocType: Purchase Taxes and Charges,Add or Deduct,Adicionar ou Deduzir
-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 +171,Against Journal Entry {0} is already adjusted against some other voucher,Contra Diário {0} já é ajustado contra algum outro comprovante
+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 +174,Against Journal Entry {0} is already adjusted against some other voucher,No Lançamento Contabilístico {0} já está ajustado para algum outro comprovante
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Valor total da ordem
-apps/erpnext/erpnext/demo/setup_data.py +358,Food,Comida
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Faixa de Envelhecimento 3
-DocType: Maintenance Schedule Item,No of Visits,N º de Visitas
-apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.js +103,Mark Attendence,Mark comparecimento
-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/demo/setup/setup_data.py +301,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/course_schedule/course_schedule.js +103,Mark Attendence,Marcar Presença
+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},Soma de pontos para todos os objetivos devem ser 100. É {0}
 DocType: Project,Start and End Dates,Iniciar e terminar datas
-,Delivered Items To Be Billed,Itens entregues a serem cobrados
+,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.,Armazem não pode ser trocado por Num. de Serie
-DocType: Authorization Rule,Average Discount,Desconto médio
+DocType: Authorization Rule,Average Discount,Desconto Médio
 DocType: Purchase Invoice Item,UOM,UOM
 DocType: Address,Utilities,Utilitários
 DocType: Purchase Invoice Item,Accounting,Contabilidade
-DocType: Employee,EMP/,EMP /
-DocType: Asset,Depreciation Schedules,agendamentos de depreciação
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,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: Employee,EMP/,EMP/
+DocType: Asset,Depreciation Schedules,Cronogramas de Depreciação
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,Application period cannot be outside leave allocation period,O período do pedido não pode ser fora do período de atribuição da 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},A partir de {0} | {1} {2}
-DocType: Production Order Operation,Operation Description,Descrição da operaçã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 o Ano Fiscal Data de Início e Data de Fim Ano Fiscal uma vez que o Ano Fiscal é salvo.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +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,Média diária de saída
+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',"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 +35,'Expected Start Date' can not be greater than 'Expected End Date',""" Data de Início Esperado ' não pode ser maior que' Data Final Esperado '"
-DocType: Scheduling Tool,Course End Date,Data de término do curso
+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,Pessoa de Contacto
+apps/erpnext/erpnext/projects/doctype/task/task.py +35,'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: Scheduling Tool,Course End Date,Data de Término do Curso
 DocType: Holiday List,Holidays,Férias
-DocType: Sales Order Item,Planned Quantity,Quantidade planejada
-DocType: Purchase Invoice Item,Item Tax Amount,Valor do imposto item
-DocType: Item,Maintain Stock,Manter da
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +209,Stock Entries already created for Production Order ,Banco de entradas já criadas para ordem de produção
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,Alteração Líquida da Imobilização
-DocType: Leave Control Panel,Leave blank if considered for all designations,Deixe em branco se considerado para todas as designações
-apps/erpnext/erpnext/controllers/accounts_controller.py +620,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 +238,Max: {0},Maximo: {0}
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +15,From Datetime,A partir de data e hora
+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 ,Banco de entradas já criadas 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 em 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 +623,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 +239,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.,Log de comunicação.
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +153,"Request for Quotation is disabled to access from portal, for more check portal settings.","Solicitação de Cotação é desativado para acesso a partir de portal, para mais configurações do portal de seleção."
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Buying Amount,Comprar Valor
+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 +153,"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 de 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,Endereço para envio Nome
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,Plano de Contas
 DocType: Material Request,Terms and Conditions Content,Termos e Condições conteúdo
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +552,cannot be greater than 100,não pode ser maior do que 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +680,Item {0} is not a stock Item,Item {0} não é um item de estoque
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +546,cannot be greater than 100,não pode ser maior do que 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,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,Possuído
-DocType: Salary Detail,Depends on Leave Without Pay,Depende de licença sem vencimento
+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,Compra Tendências fatura
-DocType: Employee,Better Prospects,Melhores perspectivas
-DocType: Appraisal,Goals,Metas
+,Purchase Invoice Trends,Tendências de Fatura de Compra
+DocType: Employee,Better Prospects,Melhores Perspetivas
+DocType: Appraisal,Goals,Objetivos
 DocType: Warranty Claim,Warranty / AMC Status,Garantia / AMC Estado
 ,Accounts Browser,Navegador de Contas
-DocType: Payment Entry Reference,Payment Entry Reference,Referência Entrada de pagamento
-DocType: GL Entry,GL Entry,Entrada GL
-DocType: HR Settings,Employee Settings,werknemer Instellingen
-,Batch-Wise Balance History,Por lotes História Balance
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Para fazer a lista
-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 atualizado no respectivo formato de impressão
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Apprentice,aprendiz
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +102,Negative Quantity is not allowed,Negativo Quantidade não é permitido
+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 de 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.
 Used for Taxes and Charges","Detalhe da tabela de imposto obtido a partir mestre como uma string e armazenado neste campo.
  Usado para Tributos e Encargos"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +152,Employee cannot report to himself.,Empregado não pode denunciar a si mesmo.
-DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Se a conta está congelada, entradas são permitidas 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}
-DocType: Job Opening,"Job profile, qualifications required etc.","Perfil, qualificações exigidas , etc"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +152,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ão permitidas entradas aos 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 Registo Contabilístico para {0}: {1} só pode ser efetuado na moeda: {2}
+DocType: Job Opening,"Job profile, qualifications required etc.","Perfil, 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.
@@ -1329,814 +1344,825 @@
 DocType: Quality Inspection,Readings,Leituras
 DocType: Stock Entry,Total Additional Costs,Total de Custos Adicionais
 apps/erpnext/erpnext/public/js/setup_wizard.js +295,Sub Assemblies,Sub Assembléias
-DocType: Asset,Asset Name,Nome de ativos
+DocType: Asset,Asset Name,Nome do Ativo
 DocType: Shipping Rule Condition,To Value,Ao Valor
 DocType: Asset Movement,Stock Manager,Da Gerente
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +141,Source warehouse is mandatory for row {0},Origem do Warehouse é obrigatória para a linha {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +719,Packing Slip,Embalagem deslizamento
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,alugar escritório
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Source warehouse is mandatory for row {0},Origem do Warehouse é obrigatória para a linha {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +713,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,Configurações de gateway SMS Setup
-apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,Solicitação de cotação pode ser acessado clicando link abaixo
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import mislukt!
-apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Nenhum endereço adicionado ainda.
+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,Hora de Trabalho Workstation
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Analyst,Analista
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,Analista
 DocType: Item,Inventory,Inventário
 DocType: Item,Sales Details,Detalhes 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,in Aantal
-DocType: Notification Control,Expense Claim Rejected,Relatório de Despesas Rejeitado
-DocType: Item Attribute,Item Attribute,Atributo item
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +103,Government,Governo
+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/public/js/setup_wizard.js +41,Institute Name,Nome do Instituto
-apps/erpnext/erpnext/config/stock.py +289,Item Variants,As variantes de item
+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,Email Salário deslizamento em Employee
-DocType: Cost Center,Parent Cost Center,Centro de Custo pai
+DocType: HR Settings,Email Salary Slip to Employee,Enviar Email de Folha de Vencimento a 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 fechada
-DocType: Leave Type,Is Leave Without Pay,É licença sem vencimento
-apps/erpnext/erpnext/stock/doctype/item/item.py +236,Asset Category is mandatory for Fixed Asset item,Ativo Categoria é obrigatória para item do imobilizado
-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: 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 do Pagamento
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Este {0} conflitos com {1} por {2} {3}
 DocType: Course Schedule,Students HTML,estudantes HTML
-apps/erpnext/erpnext/public/js/setup_wizard.js +60,Financial Year Start Date,Exercício Data de Início
-DocType: POS Profile,Apply Discount,aplicar desconto
+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/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Deslizamento (s) de embalagem cancelado
+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 de programa
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +97,Freight and Forwarding Charges,Freight Forwarding e Encargos
-DocType: Homepage,Company Tagline for website homepage,Empresa Tagline para página inicial do site
-DocType: Item Group,Item Group Name,Nome do Grupo item
+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 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: 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 para o item: {0} não foi encontrada, e a mesma é 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,BOM nenhum detalhe
-DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Montante 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 apartir do Plano de Contas ."
-DocType: Maintenance Visit,Maintenance Visit,Visita de manutenção
-DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Lote disponível Qtde no Warehouse
+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 Formato de Impressão
-DocType: Landed Cost Voucher,Landed Cost Help,Landed Cost Ajuda
+DocType: Landed Cost Voucher,Landed Cost Help,Ajuda do Custo de Entrega
 DocType: Purchase Invoice,Select Shipping Address,Escolha um endereço de entrega
-DocType: Leave Block List,Block Holidays on important days.,Bloco Feriados em dias importantes.
+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 +185,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 a regra de Funcionário"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +185,Please set User ID field in an Employee record to set Employee Role,"Por favor, defina o campo da ID do Utilizador no registo dum Funcionário para definir a Função de Funcionário"
 DocType: UOM,UOM Name,Nome UOM
-apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +43,Contribution Amount,Contribuição Montante
+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 para 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 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.,Em Palavras será visível quando você salvar a Nota de Entrega.
+DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,Em Palavras será visível assim que guardar a Nota de Entrega.
 DocType: Expense Claim,EXP,EXP
-apps/erpnext/erpnext/config/stock.py +195,Brand master.,Mestre marca.
+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 várias vezes na linha {2} e {3}
-DocType: Program Enrollment Tool,Program Enrollments,As inscrições do programa
-DocType: Sales Invoice Item,Brand Name,Marca
+DocType: Program Enrollment Tool,Program Enrollments,Inscrições no Programa
+DocType: Sales Invoice Item,Brand Name,Nome de Marca
 DocType: Purchase Receipt,Transporter Details,Detalhes Transporter
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Box,caixa
+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,"Lista Receiver está vazio. Por favor, crie Lista Receiver"
-DocType: Production Plan Sales Order,Production Plan Sales Order,Produção Plano de Ordem de Vendas
+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 Vendas de Plano de Produção
 DocType: Sales Partner,Sales Partner Target,Vendas Alvo Parceiro
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +110,Accounting Entry for {0} can only be made in currency: {1},Entrada Contabilidade para {0} só pode ser feito em moeda: {1}
-DocType: Pricing Rule,Pricing Rule,Regra de Preços
-DocType: Budget,Action if Annual Budget Exceeded,Ação se Orçamentária Anual excedido
-apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Pedido de material a Ordem de Compra
-DocType: Shopping Cart Settings,Payment Success URL,Pagamento URL Sucesso
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +78,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: Item devolvido {1} não existe em {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,Declaração de reconciliação bancária
-DocType: Address,Lead Name,Nome levar
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},O Registo Contabilístico para {0} só pode ser efetuado na moeda: {1}
+DocType: Pricing Rule,Pricing Rule,Regra de Fixação de Preços
+DocType: Budget,Action if Annual Budget Exceeded,Ação se o Orçamento Anual for Excedido
+apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Solicitação de Material no 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 Potencial Cliente
 ,POS,POS
 DocType: C-Form,III,III
-apps/erpnext/erpnext/config/stock.py +294,Opening Stock Balance,Abertura da Balance
-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/stock/doctype/stock_entry/stock_entry.py +339,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Não é permitido o tranfer mais do que {0} {1} contra Pedido de Compra {2}
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +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 +545,Manufacturing Quantity is mandatory,Manufacturing Kwantiteit is verplicht
-DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Se marcada, a página inicial será o padrão Grupo de itens para o site"
-DocType: Quality Inspection Reading,Reading 4,Reading 4
+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} deve aparecer só uma vez
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +344,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 Alocadas Com Sucesso para {0}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Não existe nenhum Item para embalar
+DocType: Shipping Rule Condition,From Value,Valor De
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,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 pedidos de despesa da empresa.
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +71,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Linha # {0}: Data de Liquidação {1} não pode ser antes Cheque Data {2}
-DocType: Company,Default Holiday List,Padrão Lista de férias
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +162,Row {0}: From Time and To Time of {1} is overlapping with {2},Row {0}: From Time e com o tempo de {1} é a sobreposição com {2}
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +71,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Linha #{0}: A Data de Liquidação {1} não pode ser antes da Data do Cheque {2}
+DocType: Company,Default Holiday List,Lista de Feriados Padrão
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +186,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,Passivo stock
 DocType: Purchase Invoice,Supplier Warehouse,Armazém fornecedor
-DocType: Opportunity,Contact Mobile No,Contato móveis não
-,Material Requests for which Supplier Quotations are not created,Requesição de Material cujo Proformas para Fornecedor não foram criadas
+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 +130,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,outros Relatórios
-DocType: Dependent Task,Dependent Task,Tarefa dependente
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Por favor, configure Employee Naming System em Recursos Humanos&gt; Configurações de RH"
-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 +190,Leave of type {0} cannot be longer than {1},Deixar do tipo {0} não pode ser maior que {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +137,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,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 +197,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,Stop verjaardagsherinneringen
-DocType: SMS Center,Receiver List,Lista de receptor
-apps/erpnext/erpnext/accounts/page/pos/pos.js +921,Search Item,Pesquisa item
-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,Mudança líquida em dinheiro
+DocType: SMS Center,Receiver List,Lista de Recetores
+apps/erpnext/erpnext/accounts/page/pos/pos.js +910,Search Item,Pesquisa 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,Unidade de Medida {0} foi inserido mais de uma vez na Tabela de Conversão de Fator
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +546,Already completed,Já completado
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +22,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 de itens emitidos
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +241,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 +76,Previous Financial Year is not closed,Anterior Exercício não está fechada
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +550,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 +242,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 +76,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 Orçamento
-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 partir de data não pode ser maior que a Data
+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,Serial Não {0} {1} quantidade não pode ser uma fração
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Fornecedor Tipo de mestre.
 DocType: Purchase Order Item,Supplier Part Number,Número da peça de fornecedor
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +98,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} Está cancelado ou interrompido
-DocType: Accounts Settings,Credit Controller,Controlador de crédito
+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,Veículo Despacho Data
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +221,Purchase Receipt {0} is not submitted,Recibo de compra {0} não é submetido
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +221,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.","Definições para carrinho de compras on-line, tais como regras de navegação, lista de preços etc."
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +83,{0}% Billed,{0}% Cobrado
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Quantidade Reservada
-DocType: Party Account,Party Account,Conta Party
+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,Renda 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 Empresa de moeda
-DocType: BOM Item,BOM Item,Item BOM
-DocType: Appraisal,For Employee,Para Empregado
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Row {0}: Advance against Supplier must be debit,Row {0}: Avanço contra o Fornecedor deve ser debitar
+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 Funcionário
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Row {0}: Advance against Supplier must be debit,O Avanço da linha {0}: do Fornecedor deve ser um dédito
 DocType: Company,Default Values,Valores Padrão
 DocType: Expense Claim,Total Amount Reimbursed,Montante total reembolsado
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +22,Collect,coletar
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,Against Supplier Invoice {0} dated {1},Contra Fatura de Fornecedor {0} {1} datada
-DocType: Customer,Default Price List,Lista de Preços padrão
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +225,Asset Movement record {0} created,registro do ativo Movimento {0} criado
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Cobrar
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,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 +225,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,Você não pode excluir o Ano Fiscal de {0}. Ano Fiscal {0} é definida como padrão em Configurações globais
-DocType: Payment Reconciliation,Payments,Pagamentos
-DocType: Journal Entry,Entry Type,Tipo de entrada
-,Customer Credit Balance,Saldo de crédito do cliente
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +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 para ' Customerwise Discount ' Cliente
+DocType: Journal Entry,Entry Type,Inserir Tipo
+,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 +20,Pricing,Preços
+apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +20,Pricing,Atribuição de Preços
 DocType: Quotation,Term Details,Detalhes prazo
-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 para este grupo de alunos.
+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),Planejamento de capacidade para (Dias)
-apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +9,Procurement,aquisição
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,Nenhum dos itens tiver qualquer mudança na quantidade ou valor.
+DocType: Manufacturing Settings,Capacity Planning For (Days),Planeamento de Capacidade Para (Dias)
+apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +9,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,Chumbo Detalhes
-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 para
-DocType: Bank Reconciliation,From Date,A partir da data
+,Lead Details,Dados de Potencial Cliente
+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: Bank Reconciliation,From Date,Data De
 DocType: Shipping Rule Country,Shipping Rule Country,Regra envio País
-apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +9,Leave and Attendance,Deixe e Presença
-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: Sales Invoice,Packed Items,Pacotes de Itens
+apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +9,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 contra No. Serial
-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"
+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 é utilizada. Irá substituir o antigo link da LDM, atualizar o custo e regerar a tabela de ""Itens Expandidos da LDM"" como nova LDM"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total',&#39;Total&#39;
-DocType: Shopping Cart Settings,Enable Shopping Cart,Ativar Carrinho
-DocType: Employee,Permanent Address,Endereço permanente
+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 +233,"Advance paid against {0} {1} cannot be greater \
-						than Grand Total {2}",Adiantamento pago contra {0} {1} não pode ser maior \ do total geral {2}
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Por favor seleccione código do item
+						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,Territory Manager
 DocType: Packed Item,To Warehouse (Optional),Para Warehouse (Opcional)
-DocType: Payment Entry,Paid Amount (Company Currency),Valor pago (Empresa de moeda)
-DocType: Purchase Invoice,Additional Discount,Desconto adicional
+DocType: Payment Entry,Paid Amount (Company Currency),Montante Pago (Moeda da Empresa)
+DocType: Purchase Invoice,Additional Discount,Desconto Adicional
 DocType: Selling Settings,Selling Settings,Configurações de Venda
 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 +97,Please specify either Quantity or Valuation Rate or both,"Por favor, especifique a quantidade ou Taxa de Valorização ou ambos"
+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 ou Taxa de Valorização ou ambas"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +13,Fulfillment,Cumprimento
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Empresa, Mês e Ano Fiscal são obrigatórios"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","É obrigatório colocar a Empresa, Mês e Ano Fiscal"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Despesas de Marketing
-,Item Shortage Report,Punt Tekort Report
+,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","Peso é mencionado, \n Mencione ""Peso UOM"" também"
-DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Pedido de material usado para fazer isto Stock Entry
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +66,Next Depreciation Date is mandatory for new asset,Próximo depreciação Data é obrigatória para novos activos
+DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Solicitação de Material utilizada para efetuar este Registo de Stock
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +66,Next Depreciation Date is mandatory for new asset,É obrigatório colocar a Próxima Data de Depreciação para 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 Fee
+DocType: Fee Category,Fee Category,Categoria de Propina
 ,Student Fee Collection,Coleção Taxa Estudante
-DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Maak boekhoudkundige afschrijving voor elke Stock Movement
+DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Efetuar um Registo Contabilístico Por Cada Movimento de Stock
 DocType: Leave Allocation,Total Leaves Allocated,Folhas total atribuído
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +154,Warehouse required at Row No {0},Armazém necessária no Row Nenhuma {0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +78,Please enter valid Financial Year Start and End Dates,"Por favor, indique Ano válido Financial datas inicial e final"
-DocType: Employee,Date Of Retirement,Data da aposentadoria
-DocType: Upload Attendance,Get Template,Obter modelo
+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: Address,Postal,Postal
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,Setup ERPNext Complete!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,Instalação de ERPNext Concluída!
 DocType: Item,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +93,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Um grupo de clientes existente com o mesmo nome, por favor altere o nome do cliente ou renomear o grupo de clientes"
-apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Novo contato
-DocType: Territory,Parent Territory,Território pai
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +126,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,Recebimento de materiais
-DocType: Homepage,Products,produtos
+DocType: Stock Entry,Material Receipt,Receção de Material
+DocType: Homepage,Products,Produtos
 DocType: Announcement,Instructor,Instrutor
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},Festa Tipo and Party é necessário para receber / pagar contas {0}
-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 em ordens de venda etc."
-DocType: Lead,Next Contact By,Contato Próxima Por
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +223,Quantity required for Item {0} in row {1},Quantidade necessária para item {0} na linha {1}
+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óxima Contacto Por
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +223,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 Ordem
-DocType: Purchase Invoice,Notification Email Address,Endereço de email de notificação
-,Item-wise Sales Register,Vendas de item sábios Registrar
-DocType: Asset,Gross Purchase Amount,Valor Comprar Gross
-DocType: Asset,Depreciation Method,Método de depreciação
-apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Offline,off-line
-DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,É este imposto incluído na Taxa Básica?
+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 +686,Offline,Offline
+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,Requeridos
-DocType: Job Applicant,Applicant for a Job,Candidato a um emprego
-DocType: Production Plan Material Request,Production Plan Material Request,Produção Request Plano de materiais
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,Não há ordens de produção criadas
-DocType: Stock Reconciliation,Reconciliation JSON,Reconciliação JSON
+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,No lote
-DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Permitir várias ordens de venda contra a Ordem de Compra do Cliente
-apps/erpnext/erpnext/setup/doctype/company/company.py +164,Main,principal
+DocType: Purchase Invoice Item,Batch No,Nº de Lote
+DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Permitir várias Pedidos de Venda no Pedido de Compra do Cliente
+apps/erpnext/erpnext/setup/doctype/company/company.py +164,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,Funcionários HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +425,Default BOM ({0}) must be active for this item or its template,BOM padrão ({0}) deve estar ativo para este item ou o seu modelo
-DocType: Employee,Leave Encashed?,Deixe cobradas?
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Oportunidade De O campo é obrigatório
+DocType: 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 +858,Make Purchase Order,Faça o Pedido de Encomenda
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +852,Make Purchase Order,Efetuar Pedido de Compra
 DocType: SMS Center,Send To,Enviar para
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,There is not enough leave balance for Leave Type {0},Não há o suficiente equilíbrio pela licença Tipo {0}
-DocType: Payment Reconciliation Payment,Allocated amount,Montante atribuído
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,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 Cliente item
+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 +172,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.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,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 +88,Addresses,Endereços
-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/payment_entry/payment_entry.py +212,Against Journal Entry {0} does not have any unmatched {1} entry,Contra Diário {0} não tem qualquer {1} entrada incomparável
-apps/erpnext/erpnext/config/hr.py +137,Appraisals,apreciações
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Duplicar Serial Não entrou para item {0}
-DocType: Shipping Rule Condition,A condition for a Shipping Rule,A condição para uma regra de envio
-apps/erpnext/erpnext/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"
+apps/erpnext/erpnext/hooks.py +95,Addresses,Endereços
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +215,Against Journal Entry {0} does not have any unmatched {1} entry,No Lançamento Contabilístico {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 Bill
-DocType: GL Entry,Credit Amount in Account Currency,Montante de crédito em conta de moeda
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} must be submitted,BOM {0} deve ser apresentado
-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},Row # {0}: Rejeitado Warehouse é obrigatória contra rejeitado item {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +731,Payment,Pagamento
-DocType: Production Order Operation,Actual Time and Cost,Tempo atual e custo
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Solicitação de materiais de máxima {0} pode ser feita para item {1} contra ordem de venda {2}
+DocType: GL Entry,Credit Amount in Account Currency,Montante de Crédito na Moeda da Conta
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} must be submitted,Deve ser enviada a LDM {0}
+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 +710,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 efetuada uma Solicitação de Materiais dum máximo de {0} para o Item {1} no Pedido de Venda {2}
 DocType: Employee,Salutation,Saudação
-DocType: Pricing Rule,Brand,Marca
-DocType: Course,Course Abbreviation,Sigla Course
+DocType: Course,Course Abbreviation,Abreviação de Curso
 DocType: Item,Will also apply for variants,Será que também se aplicam para as variantes
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +142,"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 +142,"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 +42,Total working hours should not be greater than max working hours {0},Total de horas de trabalho não deve ser maior que max horas de trabalho {0}
-apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Bundle itens no momento da venda.
-DocType: Quotation Item,Actual Qty,Qtde Atual
+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.",Liste seus produtos ou serviços que você comprar ou vender .
-DocType: Hub Settings,Hub Node,Hub Node
+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.","Listar os produtos ou serviços que compra ou vende.
+Quando começar certifique-se que verifica o Grupo de 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.,U heeft dubbele items ingevoerd. Aub verwijderen en probeer het opnieuw .
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Associate,Associado
-DocType: Asset Movement,Asset Movement,Movimento ativo
-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
+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 Recetores
 DocType: Packing Slip,To Package No.,Para empacotar Não.
-DocType: Production Planning Tool,Material Requests,Os pedidos de material
+DocType: Production Planning Tool,Material Requests,Solicitações de Material
 DocType: Warranty Claim,Issue Date,Data de Emissão
-DocType: Activity Cost,Activity Cost,Atividade Custo
-DocType: Timesheet Detail,Timesheet Detail,Detalhe do quadro de horários
-DocType: Purchase Receipt Item Supplied,Consumed Qty,Qtde consumida
+DocType: Activity Cost,Activity Cost,Custo da Atividade
+DocType: Sales Invoice Timesheet,Timesheet Detail,Detalhe do quadro de horários
+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ó Projecto)
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Betalen Entry
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},Quantidade de item {0} deve ser inferior a {1}
+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,Vendas Tendências fatura
-DocType: Leave Application,Apply / Approve Leaves,Aplicar / Aprovar Licenças
+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 +134,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ém de entrega
-DocType: Stock Settings,Allowance Percent,Subsídio Percentual
-DocType: SMS Settings,Message Parameter,Parâmetro mensagem
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +134,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Pode referir a linha somente 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.,Árvore de Centros de custo financeiro.
-DocType: Serial No,Delivery Document No,Documento de Entrega Não
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +180,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},"Por favor, defina &#39;Conta Perda / Ganho na Ativos Eliminação&#39; in Company {0}"
-DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Obter itens De recibos de compra
-DocType: Serial No,Creation Date,aanmaakdatum
-apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},Item {0} aparece várias vezes na lista Preço {1}
+DocType: Serial No,Delivery Document No,Nº 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 '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 +37,"Selling must be checked, if Applicable For is selected as {0}","Venda deve ser verificada, se for caso disso for selecionado como {0}"
-DocType: Production Plan Material Request,Material Request Date,Material Data de Solicitação
+DocType: Production Plan Material Request,Material Request Date,Data da Solicitação de Material
 DocType: Purchase Order Item,Supplier Quotation Item,Cotação do item fornecedor
-DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Desabilita a criação de logs de tempo contra ordens de produção. As operações não devem ser rastreados contra a ordem de produção
+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,Estudante número de celular
 DocType: Item,Has Variants,Tem Variantes
-DocType: Monthly Distribution,Name of the Monthly Distribution,Nome da distribuição mensal
-DocType: Sales Person,Parent Sales Person,Vendas Pessoa pai
-apps/erpnext/erpnext/setup/utils.py +14,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,Fatura recorrente
-apps/erpnext/erpnext/config/learn.py +268,Managing Projects,Gerenciamento de Projetos
+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 +14,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 Globais"
+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: Budget,Budget,Orçamento
-apps/erpnext/erpnext/stock/doctype/item/item.py +233,Fixed Asset Item must be a non-stock item.,Imobilização O artigo deve ser um item não inventariado.
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +44,"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/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 +44,"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,Rota Formulário de Candidatura
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Grondgebied / Klantenservice
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,e.g. 5,por exemplo 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},Row {0}: quantidade atribuídos {1} deve ser menor ou igual a facturar saldo {2}
-DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,Em Palavras será visível quando você salvar a nota fiscal de venda.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +502,Error: {0} &gt; {1},Erro: {0}&gt; {1}
+apps/erpnext/erpnext/public/js/setup_wizard.js +227,e.g. 5,ex: 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},O montante alocado {1} da linha {0}: 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.,Em Palavras será visível assim que guardar oa Fatura de Vendas.
 DocType: Item,Is Sales Item,É item de vendas
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Punt Groepsstructuur
-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/setup/doctype/item_group/item_group.js +21,Item Group Tree,Organograma de Agrupamento do 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 Nºs de série. Verifique o Item principal
 DocType: Maintenance Visit,Maintenance Time,Tempo de Manutenção
-,Amount to Deliver,Valor a entregar
-apps/erpnext/erpnext/public/js/setup_wizard.js +292,A Product or Service,Um produto ou serviç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 Data Prazo de início não pode ser anterior ao Ano Data de Início do Ano Acadêmico ao qual o termo é ligada (Ano Lectivo {}). Corrija as datas e tente novamente.
 DocType: Naming Series,Current Value,Valor Atual
-apps/erpnext/erpnext/controllers/accounts_controller.py +235,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/controllers/accounts_controller.py +238,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,Contra Ordem de Venda
+DocType: Delivery Note Item,Against Sales Order,No Pedido de Venda
 ,Serial No Status,No Estado de série
 DocType: Payment Entry Reference,Outstanding,Excepcional
-,Daily Timesheet Summary,Resumo do quadro de horários diária
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +458,Item table can not be blank,Item de Tabela não pode ficar em branco
+,Daily Timesheet Summary,Resumo do Livro de Ponto Diário
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +443,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 \
-						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}"
+						must be greater than or equal to {2}","Fila {0}: Para definir a periodicidade {1}, a diferença entre a data de
+ e para deve superior ou igual a {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +5,This is based on stock movement. See {0} for details,Esta baseia-se no movimento de estoque. Veja {0} para obter detalhes
 DocType: Pricing Rule,Selling,Vendas
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +341,Amount {0} {1} deducted against {2},Montante {0} {1} deduzido contra a {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +344,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 identificação do funcionário
-apps/erpnext/erpnext/accounts/party.py +296,Due Date cannot be before Posting Date,Due Date não pode ser antes de Postar Data
+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 antes da Data de Lançamento
 DocType: Website Item Group,Website Item Group,Grupo Item site
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +147,Duties and Taxes,Impostos e Contribuições
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,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}
+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 +326,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},{0} registos de pagamento não podem ser filtrados por {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tabela para o item que será mostrado no Web Site
 DocType: Purchase Order Item Supplied,Supplied Qty,Fornecido Qtde
-DocType: Purchase Order Item,Material Request Item,Item de solicitação de material
+DocType: Purchase Order Item,Material Request Item,Item da Solicitaçã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 +144,Cannot refer row number greater than or equal to current row number for this Charge type,Não é possível consultar número da linha superior ou igual ao número da linha atual para este tipo de carga
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +144,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 superior ou igual ao número da linha atual para este tipo de Cobrança
 DocType: Asset,Sold,Vendido
-,Item-wise Purchase History,Item-wise Histórico de compras
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Red,Vermelho
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +228,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,Open productieorders
-DocType: Sales Invoice Payment,Base Amount (Company Currency),Valor Base (Empresa de moeda)
-DocType: Payment Reconciliation Payment,Reference Row,Row referência
-DocType: Installation Note,Installation Time,O tempo de instalação
-DocType: Sales Invoice,Accounting Details,Detalhes Contabilidade
-apps/erpnext/erpnext/setup/doctype/company/company.js +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 +187,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,"Row # {0}: Operation {1} não for completado por {2} qty de produtos acabados na ordem de produção # {3}. Por favor, atualize o status da operação via Tempo Logs"
+,Item-wise Purchase History,Histórico de Compras de Item Inteligente
+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 Nº 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 acabados no Pedido de Produção # {3}. Por favor, atualize o estado operacional 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,Detalhes de Resolução
-apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,alocações
+DocType: Issue,Resolution Details,Dados de Resolução
+apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,Atribuições
 DocType: Quality Inspection Reading,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 os pedidos de materiais na tabela acima
-DocType: Item Attribute,Attribute Name,Nome do atributo
+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 Site
 apps/erpnext/erpnext/public/js/setup_wizard.js +293,Group,Grupo
-DocType: Task,Expected Time (in hours),Tempo esperado (em horas)
-DocType: Item Reorder,Check in (group),O check-in (grupo)
-,Qty to Order,Aantal te bestellen
+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
 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 First Response
-DocType: Pricing Rule,Margin Type,Tipo margem
+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 Nome do Funcionário
-DocType: Holiday List,Clear Table,Tabela clara
-DocType: C-Form Invoice Detail,Invoice No,A factura n º
-DocType: Room,Room Name,Nome da sala
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Deixe não pode ser aplicada / cancelada antes {0}, como saldo licença já tenha sido no futuro recorde alocação licença encaminhadas-carry {1}"
-DocType: Activity Cost,Costing Rate,Custando Classificação
-,Customer Addresses And Contacts,Endereços e contatos de clientes
+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 Nº
+DocType: Room,Room Name,Nome da Sala
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","A licença não pode ser aplicada/cancelada antes de {0}, pois o saldo licença já foi efetuado no registo de alocação de licenças {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,feild obrigatória - Ano Lectivo
-DocType: Employee,Resignation Letter Date,Data carta de demissão
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,As regras de tarifação são ainda filtrados com base na quantidade.
+apps/erpnext/erpnext/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 ainda são mais filtradas com base na quantidade.
 DocType: Task,Total Billing Amount (via Time Sheet),Total de Billing Montante (via Time Sheet)
-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 a regra de 'Aprovador de Despesas'
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Pair,par
-DocType: Asset,Depreciation Schedule,Tabela de depreciação
-DocType: Bank Reconciliation Detail,Against Account,Contra Conta
-DocType: Maintenance Schedule Detail,Actual Date,Data atual
-DocType: Item,Has Batch No,Não tem Batch
-DocType: Delivery Note,Excise Page Number,Número de página especial sobre o consumo
-DocType: Asset,Purchase Date,data de compra
-DocType: Employee,Personal Details,Detalhes pessoais
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +182,Please set 'Asset Depreciation Cost Center' in Company {0},"Por favor, defina &quot;de ativos Centro de Custo Depreciação &#39;in Company {0}"
-,Maintenance Schedules,Horários de Manutenção
-DocType: Task,Actual End Date (via Time Sheet),Data de Término real (via Time Sheet)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Amount {0} {1} against {2} {3},Quantidade {0} {1} contra {2} {3}
-,Quotation Trends,Tendências cotação
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,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 +295,Debit To account must be a Receivable account,De débito em conta deve ser uma conta a receber
+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 Nº 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
+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 do Livro de Ponto)
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +339,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 +138,Item Group not mentioned in item master for item {0},O Grupo do Item não foi mencionado no item principal para o item {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Receivable account,A conta de Débito Para deve ser uma conta para Receber
 DocType: Shipping Rule Condition,Shipping Amount,Valor do transporte
-,Pending Amount,In afwachting van Bedrag
+,Pending Amount,Montante Pendente
 DocType: Purchase Invoice Item,Conversion Factor,Fator de Conversão
 DocType: Purchase Order,Delivered,Entregue
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +137,Expected value after useful life must be greater than or equal to {0},Valor esperado depois da vida útil deve ser maior do que ou igual a {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +137,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 será parar
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +90,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Total de folhas alocados {0} não pode ser menos do que as folhas já aprovados {1} para o período
-DocType: Journal Entry,Accounts Receivable,Contas a receber
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +93,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Total de folhas alocados {0} não pode ser menos do que as folhas já aprovados {1} para o período
+DocType: Journal Entry,Accounts Receivable,Contas a Receber
 ,Supplier-Wise Sales Analytics,Leveranciers Wise Sales Analytics
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +22,Enter Paid Amount,Digite pago Valor
+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 é usado se o formato específico país não é encontrado
 DocType: Salary Structure,Select employees for current Salary Structure,Selecionar empregados para Estrutura salário atual
 DocType: Production Order,Use Multi-Level BOM,Utilize Multi-Level BOM
-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 for considerado para todos os tipos de empregado
-DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuir taxas sobre
+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,timesheets
-DocType: HR Settings,HR Settings,Configurações RH
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Expense Claim is pending approval. Only the Expense Approver can update status.,Declaratie is in afwachting van goedkeuring . Alleen de Expense Approver kan status bijwerken .
-DocType: Purchase Invoice,Additional Discount Amount,Montante desconto adicional
-apps/erpnext/erpnext/controllers/accounts_controller.py +524,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Linha # {0}: Quantidade deve ser 1, como item é um ativo fixo. Por favor, use linha separada para múltiplos Quant."
-DocType: Leave Block List Allow,Leave Block List Allow,Lista de Bloqueios para Férias
-apps/erpnext/erpnext/setup/doctype/company/company.py +249,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 de Não-Grupo
+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 +527,"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 múltiplas 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 +249,Abbr can not be blank or space,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,esportes
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Total real
+DocType: Student Siblings,Student Siblings,Irmãos estudante
 apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,unidade
-apps/erpnext/erpnext/stock/get_item_details.py +123,Please specify Company,"Por favor, especifique Empresa"
-,Customer Acquisition and Loyalty,Klantenwerving en Loyalty
+apps/erpnext/erpnext/stock/get_item_details.py +123,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 você está mantendo estoque de itens rejeitados
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,Seu exercício 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 padrão Ano Fiscal. Por favor, atualize seu navegador para que a alteração tenha efeito."
-apps/erpnext/erpnext/projects/doctype/task/task.js +26,Expense Claims,Os relatórios de despesas
+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 padrão do Ano Fiscal. 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,BOM Pesquisa
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Closing (Opening + Totals),Fechando (abertura + Totais)
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,"Por favor, especifique moeda in Company"
+,BOM Search,Pesquisa da LDM
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),A Fechar (Abertura + Totais)
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,"Por favor, especifique a moeda na Empresa"
 DocType: Workstation,Wages per hour,Os 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},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,Na sequência de pedidos de materiais têm sido levantadas automaticamente com base no nível de re-ordem do item
-apps/erpnext/erpnext/controllers/accounts_controller.py +272,Account {0} is invalid. Account Currency must be {1},Conta {0} é inválido. Conta de moeda deve ser {1}
+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,Enquanto se aguarda ordens de venda
+apps/erpnext/erpnext/controllers/accounts_controller.py +275,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},UOM fator de conversão é necessária na linha {0}
-DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +956,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Linha # {0}: Referência Tipo de Documento deve ser um dos Pedidos de Vendas, Vendas fatura ou do Diário"
-DocType: Salary Slip,Deduction,Redução
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +87,Row {0}: From Time and To Time is mandatory.,Row {0}: From Time To Time e é obrigatória.
-apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},Item Preço adicionada para {0} na lista de preços {1}
+DocType: Production Plan Item,material_request_item,item_de_solicitação_de_material
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +969,"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 Fatura de Venda ou um Lançamento Contabilístico"
+DocType: Salary Component,Deduction,Dedução
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +111,Row {0}: From Time and To Time is mandatory.,Linha {0}: É obrigatório colocar a Periodicidade.
+DocType: Stock Reconciliation Item,Amount Difference,Diferença montante
+apps/erpnext/erpnext/stock/get_item_details.py +262,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 +7,Please enter Employee Id of this sales person,Digite Employee Id desta pessoa de vendas
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +7,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
 DocType: Project,% Tasks Completed,% Tarefas Concluídas
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,Diferença Valor deve ser zero
+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 +194,Please enter Production Item first,Por favor digite primeiro o Item de Produção
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Calculado equilíbrio extrato bancário
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,usuário desativado
-apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Orçamento
-DocType: Quotation,QTN-,QTN-
+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 calculadao
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,utilizador desativado
+apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Cotação
+DocType: Quotation,QTN-,QUEST-
 DocType: Salary Slip,Total Deduction,Total de Reduções
-DocType: Maintenance Visit,Maintenance User,Manutenção do usuário
+DocType: Maintenance Visit,Maintenance User,Utilizador da Manutenção
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +149,Cost Updated,Custo Atualizado
 DocType: Employee,Date of Birth,Data de Nascimento
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +86,Item {0} has already been returned,Item {0} já foi devolvido
-DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Ano Fiscal ** representa um exercício financeiro. Todos os lançamentos contábeis e outras transações principais são rastreadas contra ** Ano Fiscal **.
-DocType: Opportunity,Customer / Lead Address,Klant / Lead Adres
+apps/erpnext/erpnext/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 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: Production Order Operation,Actual Operation Time,Actual Tempo Operação
-DocType: Authorization Rule,Applicable To (User),Para aplicável (Utilizador)
-DocType: Purchase Taxes and Charges,Deduct,Subtrair
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,Job Description,Descrição do trabalho
-DocType: Student Applicant,Applied,aplicado
-DocType: Purchase Order Item,Qty as per Stock UOM,Qtde como por Ação UOM
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Caracteres especiais, exceto ""-"" ""."", ""#"", e ""/"" não é permitido em série nomeando"
-DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Mantenha o controle de campanhas de vendas. Mantenha o controle de Leads, cotações, Pedido de Vendas etc de Campanhas para medir retorno sobre o investimento."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +24,Welcome to POS: Create your POS Profile,Bem-vindo ao POS: criar o seu perfil POS
+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)
+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 +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Caracteres especiais, exceto ""-"" ""."", ""#"", e ""/"" não é permitido em série nomeando"
+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, Cotações, Pedido de Vendas, etc. nas Campanhas para medir o Retorno do Investimento."
 DocType: Expense Claim,Approver,Aprovador
 ,SO Qty,SO Aantal
-DocType: Appraisal,Calculate Total Score,Calcular a pontuação total
-DocType: Request for Quotation,Manufacturing Manager,Gerente de Manufatura
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serial Não {0} está na garantia até {1}
+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},Serial Não {0} está na garantia até {1}
 apps/erpnext/erpnext/config/stock.py +153,Split Delivery Note into packages.,Nota de Entrega dividir em pacotes.
-apps/erpnext/erpnext/hooks.py +74,Shipments,Os embarques
+apps/erpnext/erpnext/hooks.py +81,Shipments,Os embarques
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Valor total alocado (Empresa de moeda)
 DocType: Purchase Order Item,To be delivered to customer,Para ser entregue ao cliente
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,O Serial No {0} não pertence a nenhum Warehouse
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,Row # ,Linha #
-DocType: Purchase Invoice,In Words (Company Currency),In Words (Moeda Company)
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +154,Row # ,Linha #
+DocType: Purchase Invoice,In Words (Company Currency),Em Palavras (Moeda da Empresa)
 DocType: Asset,Supplier,Fornecedor
-apps/erpnext/erpnext/public/js/utils.js +156,Get From,Obter do
+apps/erpnext/erpnext/public/js/utils.js +167,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 +167,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 +416,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Não é possível subfacturar o item {0} na linha {1} mais que {2}. Para permitir superfaturamento, por favor, defina nas Configurações de estoque"
-DocType: Cheque Print Template,Bank Name,Nome do banco
+DocType: Global Defaults,Default Company,Empresa Padrão
+apps/erpnext/erpnext/controllers/stock_controller.py +167,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 das ações em geral
+apps/erpnext/erpnext/controllers/accounts_controller.py +419,"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 isso 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
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} is disabled,Utilizador {0} está desativado
 DocType: Leave Application,Total Leave Days,Total de dias de férias
-DocType: Email Digest,Note: Email will not be sent to disabled users,Nota: e-mail não será enviado para utilizadores com deficiência
+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...,Selecione Empresa ...
-DocType: Leave Control Panel,Leave blank if considered for all departments,Deixe em branco se considerado para todos os departamentos
+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 +171,"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 +346,{0} is mandatory for Item {1},{0} é obrigatório para item {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,{0} is mandatory for Item {1},{0} é obrigatório para o Item {1}
 DocType: Currency Exchange,From Currency,De Moeda
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +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/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, Tipo de Fatura e 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},Ordem de venda necessário para item {0}
-DocType: Purchase Invoice Item,Rate (Company Currency),Rate (moeda da empresa)
-apps/erpnext/erpnext/demo/setup_data.py +360,Others,outros
+DocType: Purchase Invoice Item,Rate (Company Currency),Taxa (Moeda da Empresa)
+DocType: Student Guardian,Others,Outros
 DocType: Payment Entry,Unallocated Amount,Não alocado Montante
-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}."
+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 essa 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 +138,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
-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: 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 +138,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 cobrnaça como "" Valor da Linha Anterior' ou '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,Atividade Bancária
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Por favor, clique em 'Gerar Cronograma' para obter o cronograma"
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +53,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 """
-DocType: Quality Inspection,In Process,Em Processo
-DocType: Authorization Rule,Itemwise Discount,Desconto Itemwise
+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"""
+DocType: Quality Inspection,In Process,A Decorrer
+DocType: Authorization Rule,Itemwise Discount,Desconto de Item Inteligente
 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 +334,{0} against Sales Order {1},{0} contra a Ordem de Vendas {1}
-DocType: Account,Fixed Asset,Activos Fixos
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,{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 Serialized
-DocType: Activity Type,Default Billing Rate,Taxa de Faturação por defeito
+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/accounts/report/item_wise_sales_register/item_wise_sales_register.py +54,Receivable Account,Contas a Receber
-apps/erpnext/erpnext/controllers/accounts_controller.py +546,Row #{0}: Asset {1} is already {2},Linha # {0}: Ativo {1} já é {2}
+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 +549,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 Vendas para pagamento
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +79,CEO,Chefe executivo
-DocType: Expense Claim Detail,Expense Claim Detail,Detalhe de Despesas
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +808,Please select correct account,"Por favor, selecione conta correta"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,Diretor Executivo
+DocType: Expense Claim Detail,Expense Claim Detail,Dados de Reembolso de Despesas
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +809,Please select correct account,"Por favor, selecione a conta correta"
 DocType: Item,Weight UOM,Peso UOM
 DocType: Salary Structure Employee,Salary Structure Employee,Empregado Estrutura salário
-DocType: Employee,Blood Group,Grupo sanguíneo
-DocType: Purchase Invoice Item,Page Break,Quebra de página
+DocType: Employee,Blood Group,Grupo Sanguíneo
 DocType: Production Order Operation,Pending,Pendente
-DocType: Course,Course Name,Nome do curso
+DocType: Course,Course Name,Nome do Curso
 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 funcionário 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,Qty
 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,Levante solicitar material quando o estoque atinge novo pedido de nível
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Full-time,De tempo integral
-DocType: Salary Structure,Employees,funcionários
-DocType: Employee,Contact Details,Contacto
-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."
-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"
+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  e Taxas de Vendas Modelo de Cobranças, selecione um e clique no botão abaixo."
+DocType: Student,Guardians,Guardians
+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 entrante
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,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: Quality Inspection,Quality Manager,Gerente da Qualidade
-DocType: Job Applicant,Job Opening,Oferta de emprego
-DocType: Payment Reconciliation,Payment Reconciliation,Reconciliação 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 encarregue"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +321,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 Pedidos de Materiais (MRP) e Ordens de Produção.
+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 facturada
 DocType: Timesheet Detail,To Time,Para Tempo
-DocType: Authorization Rule,Approving Role (above authorized value),Aprovando Papel (acima do valor autorizado)
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Credit To account must be a Payable account,Crédito em conta deve ser uma conta a pagar
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +241,BOM recursion: {0} cannot be parent or child of {2},BOM recursão: {0} não pode ser pai ou filho de {2}
-DocType: Production Order Operation,Completed Qty,Concluído Qtde
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"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 +273,Price List {0} is disabled,Preço de {0} está desativado
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +99,Row {0}: Completed Qty cannot be more than {1} for operation {2},Row {0}: Concluído Qtde não pode ser mais do que {1} para a operação {2}
-DocType: Manufacturing Settings,Allow Overtime,Permitir Overtime
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} números de série necessários para item {1}. Forneceu {2}.
-DocType: Stock Reconciliation Item,Current Valuation Rate,Avaliação actual Taxa
-DocType: Item,Customer Item Codes,Item de cliente Códigos
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,Troca Perda / Ganho
-DocType: Opportunity,Lost Reason,Razão perdido
-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 séries de numeração para Participação em Configurar&gt; Numeração Series"
-apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Novo endereço
+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 +108,Credit To account must be a Payable account,A conte de Crédito Para deve ser uma conta A Pagar
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +241,BOM recursion: {0} cannot be parent or child of {2},Recursividade da LDM: {0} não pode ser o grupo de origem ou subgrupo de {2}
+DocType: Production Order Operation,Completed Qty,Qtd Concluída
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"For {0}, only debit accounts can be linked against another credit entry","Para {0}, só podem ser ligadas contas de dédito noutro registo de crébito"
+apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,A Lista de Preços {0} está desativada
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +123,Row {0}: Completed Qty cannot be more than {1} for operation {2},Linha {0}: A Qtd concluída não pode ser superior a {1} para a operação {2}
+DocType: Manufacturing Settings,Allow Overtime,Permitir Horas Extra
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,São necessários {0} Nºs 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,Razão Perdida
+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, indique Recibo Documento"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +378,All items have already been invoiced,Todos os itens já foram faturados
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Por favor, especifique um válido &#39;De Caso No.&#39;"
-apps/erpnext/erpnext/accounts/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 feitas em grupos, mas as entradas podem ser feitas contra os não-Groups"
+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 +379,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 Processo N.º' 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 realizados outros centros de custo nos Grupos, e os registos podem ser efetuados nos não Grupos"
 DocType: Project,External,Externo
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Gebruikers en machtigingen
-DocType: Branch,Branch,Ramo
-DocType: Guardian,Mobile Number,Número de celular
+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
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,No recibo de vencimento encontrado para o mês:
-DocType: Bin,Actual Quantity,Quantidade Atual
-DocType: Shipping Rule,example: Next Day Shipping,exemplo: Next Day envio
+apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,Não foi encontrada nenhuma folha de vencimento para o mês:
+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,Serial No {0} não foi encontrado
 DocType: Student Batch,Student Batch,Lote Student
 apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Os seus Clientes
 apps/erpnext/erpnext/projects/doctype/project/project.py +141,You have been invited to collaborate on the project: {0},Você foi convidado para colaborar com o projeto: {0}
 DocType: Leave Block List Date,Block Date,Bloquear Data
-apps/erpnext/erpnext/templates/generators/job_opening.html +19,Apply Now,Aplique agora
-DocType: Sales Order,Not Delivered,Não entregue
-DocType: Assessment Group,Assessment Group Code,Código Grupo de Avaliação
-,Bank Clearance Summary,Banco Resumo Clearance
-apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Criar e gerenciar diários, semanais e mensais digere e-mail."
-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,prédios
-apps/erpnext/erpnext/utilities/doctype/address/address.py +164,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 Setup&gt; Printing and Branding&gt; modelo de endereço."
-DocType: Fee Structure,Fee Structure,Estrutura de taxas
-DocType: Timesheet Detail,Costing Amount,Custando Montante
+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 Recibo de salário
-apps/erpnext/erpnext/controllers/selling_controller.py +161,Maxiumm discount for Item {0} is {1}%,Maxiumm desconto para item {0} {1} %
-apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Importação em massa
+apps/erpnext/erpnext/controllers/selling_controller.py +162,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 contatos
 DocType: SMS Log,Sender Name,Nome do remetente
-DocType: POS Profile,[Select],[ Selecionar]
+DocType: POS Profile,[Select],[Selecionar]
 DocType: SMS Log,Sent To,Enviado Para
-DocType: Payment Request,Make Sales Invoice,Maak verkoopfactuur
+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
-DocType: Company,For Reference Only.,Apenas para referência.
+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-,Pinv-RET
-DocType: Sales Invoice Advance,Advance Amount,Quantidade Adiantada
-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,'Data de' é necessário
+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,Detalhes de emprego
-DocType: Employee,New Workplace,Novo local de trabalho
+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 +113,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,Zaak nr. mag geen 0
+apps/erpnext/erpnext/stock/get_item_details.py +113,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 Nº 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,Antiguidade Baseado em
-DocType: Item,End of Life,Fim da Vida
-apps/erpnext/erpnext/demo/setup_data.py +361,Travel,viagem
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +155,No active or default Salary Structure found for employee {0} for the given dates,Nenhuma estrutura ativa ou Salário padrão encontrado para empregado {0} para as datas indicadas
-DocType: Leave Block List,Allow Users,Permitir utilizadores
-DocType: Purchase Order,Customer Mobile No,Cliente Móvel Nenhum
+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,Fim de Vida
+apps/erpnext/erpnext/demo/setup/setup_data.py +304,Travel,viagem
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +167,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,Nº de Telemóvel de Cliente
 DocType: Sales Invoice,Recurring,Recorrente
 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,Renomear Ferramenta
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +23,Update Cost,Kosten bijwerken
-DocType: Item Reorder,Item Reorder,Item Reordenar
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +36,Show Salary Slip,Deslizamento Mostrar Salário
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +748,Transfer Material,Transfer Materiaal
+DocType: Rename Tool,Rename Tool,Ferramenta Alteração de Nome
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Kosten bijwerken
+DocType: Item Reorder,Item Reorder,Reencomenda do Item
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +53,Show Salary Slip,Deslizamento Mostrar Salário
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,Transfer Material,Transfer Materiaal
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Geef de operaties , operationele kosten en geven een unieke operatie niet aan uw activiteiten ."
 apps/erpnext/erpnext/controllers/status_updater.py +166,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}. Você está fazendo outra {3} contra o mesmo {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +923,Please set recurring after saving,"Por favor, defina recorrentes depois de salvar"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +646,Select change amount account,conta quantidade escolha Troca
+apps/erpnext/erpnext/public/js/controllers/transaction.js +914,Please set recurring after saving,"Por favor, defina os recorrentes depois de guardar"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +703,Select change amount account,conta quantidade escolha Troca
 DocType: Purchase Invoice,Price List Currency,Moeda da Lista de Preços
 DocType: Naming Series,User must always select,O usuário deve sempre escolher
-DocType: Stock Settings,Allow Negative Stock,Permitir stock negativo
+DocType: 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
+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 orçamento
+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 +64,"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: Quality Inspection,Purchase Receipt No,Compra recibo Não
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Dinheiro Earnest
-DocType: Process Payroll,Create Salary Slip,Criar Recibo de salário
+apps/erpnext/erpnext/setup/doctype/company/company.py +64,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","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,grau Descrição
+DocType: Quality Inspection,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 +33,Traceability,rastreabilidade
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Source of Funds (Liabilities),Fonte de Recursos ( Passivo)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +352,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Quantidade em linha {0} ( {1} ) deve ser a mesma quantidade fabricada {2}
-DocType: Appraisal,Employee,Empregado
-apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Convidar como Usuário
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Quantity in row {0} ({1}) must be same as manufactured quantity {2},A quantidade na linha {0} ( {1} ) deve ser igual à quantidade fabricada {2}
+DocType: Appraisal,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 +217,{0} {1} is fully billed,{0} {1} está totalmente faturado
-DocType: Workstation Working Hour,End Time,End Time
-DocType: Payment Entry,Payment Deductions or Loss,Deduções de pagamento ou perda
-apps/erpnext/erpnext/config/schools.py +100,LMS,LMS
+DocType: Workstation Working Hour,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 +104,LMS,Plataforma de E-Learning
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Termos do contrato padrão para vendas ou compra.
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Grupo pela Vale
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,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,Estudante Estudante Batch
-DocType: Sales Invoice,Mass Mailing,Divulgação em massa
-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 BOM para o Item na linha {0}"
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchse Order number required for Item {0},Número de pedido purchse necessário para item {0}
+apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Obrigatório On
+DocType: Rename Tool,File to Rename,Ficheiro para Mudar 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 +199,Purchse Order number required for Item {0},É necessário o número de Pedido de Compra para o Item {0}
 apps/erpnext/erpnext/controllers/buying_controller.py +262,Specified BOM {0} does not exist for Item {1},Especificada BOM {0} não existe para item {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +199,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programação de manutenção {0} deve ser cancelado antes de cancelar esta ordem de venda
-DocType: Notification Control,Expense Claim Approved,Relatório de Despesas Aprovado
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +297,Salary Slip of employee {0} already created for this period,Deslizamento salário de empregado {0} já criado para este período
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Pharmaceutical,farmacêutico
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Custo de itens comprados
+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 +309,Salary Slip of employee {0} already created for this period,Deslizamento salário de empregado {0} já criado 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,Ordem vendas Obrigatório
-DocType: Purchase Invoice,Credit To,Para crédito
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +31,Active Leads / Customers,Leads ativo / Clientes
+DocType: Purchase Invoice,Credit To,Crédito Para
+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,Detalhe Programa de Manutençã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,armazém nó de grupo não é permitido selecionar para transações
-DocType: Buying Settings,Buying Settings,Configurações para Compras
-DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM Não. para um item acabado
-DocType: Upload Attendance,Attendance To Date,Atendimento para a data
-DocType: Warranty Claim,Raised By,Levantadas por
+apps/erpnext/erpnext/stock/utils.py +193,Group node warehouse is not allowed to select for transactions,Não é permitido selecionar o subgrupo armazém em 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,Presença À 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 +814,Please specify Company to proceed,"Por favor, especifique Empresa proceder"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +793,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 +44,Compensatory Off,compensatória Off
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,Descanso de Compensação
 DocType: Quality Inspection Reading,Accepted,Aceite
 DocType: SG Creation Tool Course,Student Group Name,Nome do Grupo de estudante
-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 do quarto
+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 da 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 +161,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) não pode ser maior do que a quantidade  pré estabelecida ({2}) na ordem de produção {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +162,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) não pode ser maior do que a quantidade  pré estabelecida ({2}) na ordem de produção {3}
 DocType: Shipping Rule,Shipping Rule Label,Regra envio Rótulo
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Fórum de usuários
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +217,Raw Materials cannot be blank.,Matérias-primas não pode ficar em branco.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,"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 +460,Quick Journal Entry,Breve Journal Entry
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +111,You can not change rate if BOM mentioned agianst any item,Você não pode mudar a taxa se o BOM mencionado contra 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 Planned Qt para item {0} na linha {1}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is not submitted,{0} {1} não foi submetido
-apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Os pedidos de itens.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +217,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 +441,"Could not update stock, invoice contains drop shipping item.","Não foi possível atualizar o stock, a fatura contémitem de envio direto."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Quick Journal Entry,Lançamento Contabilístico Rápido
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +103,You can not change rate if BOM mentioned agianst any item,Você não pode mudar a taxa se o BOM mencionado contra algum 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 Qt Planeada para o Item {0} na linha {1}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{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.,Ordem de produção separado será criado para cada item acabado.
-,Minutes to First Response for Issues,Minutos para First Response for Issues
+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 criação deste sistema.
-DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Registo contábil congelado até à presente data, ninguém pode fazer / modificar entrada exceto para as funções especificadas abaixo."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Bewaar het document voordat het genereren van onderhoudsschema
-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)
+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 excepto 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 Nº)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +398,The following Production Orders were created:,As seguintes ordens de produção foram criadas:
+DocType: Student Admission,Naming Series (for Student Applicant),Naming Series (para estudante Requerente)
 DocType: Delivery Note,Transporter Name,Nome Transporter
 DocType: Authorization Rule,Authorized Value,Valor Autorizado
-DocType: Contact,Enter department to which this Contact belongs,Entre com o departamento a que pertence este contato
-,Minutes to First Response for Opportunity,Minutos para First Response para Opportunity
+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 de Oportunidade
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Absent,Total de Absent
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +739,Item or Warehouse for row {0} does not match Material Request,Item ou Armazém para linha {0} não corresponde Pedido de materiais
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +747,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,Tarefa depende de
-DocType: Lead,Opportunity,Oportunidade
-,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,Row {0}: Para fornecedor {0} e-mail id é necessário para enviar e-mail
-DocType: Operation,Default Workstation,Workstation Padrão
-DocType: Notification Control,Expense Claim Approved Message,Relatório de Despesas Aprovado Mensagem
-DocType: Payment Entry,Deductions or Loss,Deduções ou perda
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is closed,{0} {1} Está fechado
+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 id is required to send email,Linha Row {0}:  É necessárioo ID de email de 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 Aprovado
+DocType: Payment Entry,Deductions or Loss,Deduções ou Perdas
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{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
+DocType: Purchase Receipt,Get Current Stock,Obter Stock Atual
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Árvore da Bill of Materials
-DocType: Student,Joining Date,Data de ingresso
-,Employees working on a holiday,Os empregados que trabalham em um feriado
-apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Mark Present
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},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 Atual
-DocType: Purchase Invoice,PINV-,PINV-
-DocType: Authorization Rule,Applicable To (Role),Aplicável a (Função)
-DocType: Stock Entry,Purpose,Propósito
-DocType: Company,Fixed Asset Depreciation Settings,Configurações de depreciação do ativo imobilizado
+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
+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 Nº de Série {0}
+DocType: Production Order,Actual End Date,Data de Término Efetiva
+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,Será que também se aplicam para as variantes menos que overrridden
 DocType: Purchase Invoice,Advances,Avanços
-DocType: Production Order,Manufacture against Material Request,Fabricação de encontro Pedido de Material
+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,Aprovando usuário não pode ser o mesmo que usuário a regra é aplicável a
-DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Taxa básica (de acordo da UOM)
-DocType: SMS Log,No of Requested SMS,No pedido de SMS
-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 +729,Please supply the specified items at the best possible rates,"Por favor, informe os itens especificados com as melhores tarifas possíveis"
-apps/erpnext/erpnext/public/js/financial_statements.js +81,End Year,fim de Ano
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Data Contrato Final deve ser maior que Data de Participar
-DocType: Delivery Note,DN-,DN-
-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 +346,{0} against Purchase Order {1},{0} contra a Ordem de Compra {1}
-DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Digite os parâmetros URL estática aqui (por exemplo remetente = ERPNext, username = ERPNext, password = 1234, etc)"
-apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} não está ativo em qualquer ano fiscal. Para mais detalhes consulte {2}.
-DocType: Task,Actual Start Date (via Time Sheet),Actual Start Date (via Time Sheet)
-apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +14,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
+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 de Aprovar Utilizador não pode igual à 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,Nº de SMS Solicitados
+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 +695,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 +117,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 +346,{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 do Livro de Ponto)
+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 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
@@ -2178,173 +2204,176 @@
  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: Homepage,Homepage,Homepage
-DocType: Purchase Receipt Item,Recd Quantity,Quantidade RECD
-apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +54,Fee Records Created - {0},Registros Taxa Criado - {0}
-DocType: Asset Category Account,Asset Category Account,Ativo Categoria Conta
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +103,Cannot produce more Item {0} than Sales Order quantity {1},Não é possível produzir mais itens {0} do que a quantia da Ordem de Vendas {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Stock Entry {0} is not submitted,Da entrada {0} não é apresentado
-DocType: Payment Reconciliation,Bank / Cash Account,Banco / Conta Caixa
-DocType: Tax Rule,Billing City,Faturamento Cidade
+DocType: Homepage,Homepage,Página inicial
+DocType: Purchase Receipt Item,Recd Quantity,Qtd Recebida
+apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +54,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 +104,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 +505,Stock Entry {0} is not submitted,Da entrada {0} não é apresentado
+DocType: Payment Reconciliation,Bank / Cash Account,Conta Bancária / Dinheiro
+DocType: Tax Rule,Billing City,Cidade de Faturamento
 DocType: Salary Component Account,Salary Component Account,Conta Salário Component
 DocType: Global Defaults,Hide Currency Symbol,Ocultar Símbolo de Moeda
-apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card","por exemplo Banco, Dinheiro, cartão de crédito"
+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 fonte
 DocType: Journal Entry,Credit Note,Nota de Crédito
 DocType: Warranty Claim,Service Address,Serviço Endereç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,Fabricação
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Por favor de entrega Nota primeiro
-DocType: Student Applicant,Application Date,Data de aplicação
-DocType: Salary Detail,Amount based on formula,Montante baseado em fórmula
+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, coloque a  Nota de Entrega 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,Cliente / Nome de chumbo
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +89,Clearance Date not mentioned,Apuramento data não mencionada
-apps/erpnext/erpnext/config/manufacturing.py +7,Production,produção
-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: Opportunity,Customer / Lead Name,Nome de Cliente / Potencial Cliente
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +89,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 (Qtde)
 DocType: Sales Invoice,This Document,Esse documento
-DocType: Installation Note Item,Installed Qty,Quantidade instalada
+DocType: Installation Note Item,Installed Qty,Qtd Instalada
 DocType: Lead,Fax,Fax
-DocType: Purchase Taxes and Charges,Parenttype,ParentType
-DocType: Purchase Invoice,Is Paid,É pago
+DocType: Purchase Taxes and Charges,Parenttype,Tipoprincipal
+DocType: Purchase Invoice,Is Paid,Está Pago
 DocType: Salary Structure,Total Earning,Ganhar total
 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 +176,Organization branch master.,Mestre Organização ramo .
-apps/erpnext/erpnext/controllers/accounts_controller.py +273, or ,ou
-DocType: Sales Order,Billing Status,Estado de faturamento
-apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Relatar um incidente
+DocType: Stock Ledger Entry,Outgoing Rate,Taxa de Saída
+apps/erpnext/erpnext/config/hr.py +176,Organization branch master.,Definidor da filial da organização.
+apps/erpnext/erpnext/controllers/accounts_controller.py +276, or ,ou
+DocType: Sales Order,Billing Status,Estado de 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 Utilidade
-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 +203,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Linha # {0}: Journal Entry {1} não tem conta {2} ou já comparado com outro voucher
-DocType: Buying Settings,Default Buying Price List,Standaard Buying Prijslijst
+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 +206,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 já está noutro comprovante
+DocType: Buying Settings,Default Buying Price List,Compra de Lista de Preço Padrão
 DocType: Process Payroll,Salary Slip Based on Timesheet,Folha de salário Baseado no quadro de horários
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +90,No employee for the above selected criteria OR salary slip already created,Nenhum funcionário para os critérios acima selecionado ou recibo de salário já criado
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +93,No employee for the above selected criteria OR salary slip already created,Não existe nenhum funcionário para os critérios acima selecionados OU já foi criada a folha de vencimento
 DocType: Notification Control,Sales Order Message,Vendas Mensagem Ordem
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Definir valores padrão , como Company, de moeda, Atual Exercício , etc"
-DocType: Payment Entry,Payment Type,betaling Type
+DocType: Payment Entry,Payment Type,Tipo de Pagamento
 DocType: Process Payroll,Select Employees,Selecione funcionários
 DocType: Bank Reconciliation,To Date,Até a Data
-DocType: Opportunity,Potential Sales Deal,Promoção de Vendas Potenciais
-DocType: Payment Entry,Cheque/Reference Date,Cheque / Data Reference
+DocType: Opportunity,Potential Sales Deal,Negócio de Vendas Potencial
+DocType: Payment Entry,Cheque/Reference Date,Data do Cheque/Reference
 DocType: Purchase Invoice,Total Taxes and Charges,Total Impostos e Encargos
-DocType: Employee,Emergency Contact,Emergency Contact
-DocType: Bank Reconciliation Detail,Payment Entry,Entrada de pagamento
+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,vendas-browser
-apps/erpnext/erpnext/accounts/doctype/account/account.js +56,Ledger,Livro-razão
+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,Carrinho Configurações
-DocType: Journal Entry,Accounting Entries,Lançamentos contábeis
-apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},"Duplicar entrada . Por favor, verifique Regra de Autorização {0}"
-apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +26,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 ²
-apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Substituir item / BOM em todas as BOMs
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +56,Receipt document must be submitted,documento de recepção deve ser apresentado
-DocType: Purchase Invoice Item,Received Qty,Qtde recebeu
+DocType: Journal Entry,Accounting Entries,Lançamentos Contabilísticos
+apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},"Duplicar Registo. Por favor, verifique a Regra de Autorização {0}"
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +26,Global POS Profile {0} already created for company {1},O Perfil Global de POS {0} já foi criado 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,O documento de recepção deve ser enviado
+DocType: Purchase Invoice Item,Received Qty,Qtd Recebida
 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,Não pago e não entregue
-DocType: Product Bundle,Parent Item,Item Pai
-DocType: Account,Account Type,Tipo de conta
-DocType: Delivery Note,DN-RET-,DN-RET
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +115,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 +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Programação de manutenção não é gerado para todos os itens. Por favor, clique em "" Gerar Agenda '"
+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 +118,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',"O Cronograma de Manutenção não foi gerado para todos os itens. Por favor, clique em 'Gerar Programa'"
 ,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 +163,"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"
-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 reservados
-DocType: Landed Cost Voucher,Purchase Receipt Items,Comprar Itens Recibo
-apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Formas de personalização
-apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155,Depreciation Amount during the period,Depreciação Valor durante o período
-apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +32,Disabled template must not be default template,template com deficiência não deve ser modelo padrão
-DocType: Account,Income Account,Conta Renda
-DocType: Payment Request,Amount in customer's currency,Montante em moeda do cliente
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +748,Delivery,Entrega
-DocType: Stock Reconciliation Item,Current Qty,Qtde atual
+apps/erpnext/erpnext/config/hr.py +93,Payroll,Folha de Pagamento
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +163,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","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),A identificação do pacote para a entrega (para impressão)
+DocType: Bin,Reserved Quantity,Quantidade Reservada
+DocType: Landed Cost Voucher,Purchase Receipt Items,Itens de Recibo de Compra
+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 +32,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 +742,Delivery,Entrega
+DocType: Stock Reconciliation Item,Current Qty,Qtd 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,Responsabilidade de Área chave
+DocType: Appraisal Goal,Key Responsibility Area,Área de Responsabilidade Fundamental
 DocType: Payment Entry,Total Allocated Amount,Valor Total atribuídos
-DocType: Item Reorder,Material Request Type,Tipo de solicitação de material
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +82,Row {0}: UOM Conversion Factor is mandatory,Row {0}: Fator de Conversão UOM é obrigatória
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
+DocType: 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 comprar Ordem
+DocType: Notification Control,Purchase Order Message,Mensagem de Pedido de Compra
 DocType: Tax Rule,Shipping Country,O envio País
 DocType: Upload Attendance,Upload HTML,Carregar HTML
-DocType: Employee,Relieving Date,Aliviar Data
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Regra de preços é feita para substituir Lista de Preços / define percentual de desconto, com base em alguns critérios."
+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,Magazijn kan alleen via Stock Entry / Delivery Note / Kwitantie worden veranderd
-DocType: Employee Education,Class / Percentage,Classe / Percentual
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Head of Marketing and Sales,Diretor de Marketing e Vendas
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,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 a Ordem de Vendas, Ordem de Compra etc, será buscado no campo ""taxa"", ao invés de campo ""Lista de Preços Rate '."
+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 a 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.,Trilha leva por setor Type.
-DocType: Item Supplier,Item Supplier,Fornecedor item
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +403,Please enter Item Code to get batch no,Vul de artikelcode voor batch niet krijgen
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +770,Please select a value for {0} quotation_to {1},Por favor seleccione um valor para {0} {1} quotation_to
-apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Todos os endereços.
+DocType: Item Supplier,Item Supplier,Fornecedor do Item
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +397,Please enter Item Code to get batch no,"Por favor, insira o Código do Item para obter o nº de lote"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +764,Please select a value for {0} quotation_to {1},"Por favor, selecione um valor para a cotação_para {0} {1}"
+apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Todos os Endereços.
 DocType: Company,Stock Settings,Configuraçõ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 fusão só é possível caso as seguintes propriedades sejam as mesmas em ambos os registos. É Grupo, tipo de raiz, Empresa"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Gain/Loss on Asset Disposal,Ganho / Perda na Ativos Eliminação
-apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Gerenciar a Arvore de Grupo de Cliente .
+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 Grupo, Tipo de Raiz, Empresa"
+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
+apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Gerir a Organograma 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,Nome de NOvo Centro de Custo
-DocType: Leave Control Panel,Leave Control Panel,Deixe Painel de Controle
-apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,Não está em estoque
-DocType: Appraisal,HR User,HR Utilizador
+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
+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 +100,Issues,Problemas
+apps/erpnext/erpnext/hooks.py +109,Issues,Problemas
 apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},Estado deve ser um dos {0}
-DocType: Sales Invoice,Debit To,Para débito
-DocType: Delivery Note,Required only for sample item.,Necessário apenas para o item amostra.
-DocType: Stock Ledger Entry,Actual Qty After Transaction,Qtde atual após a transação
-,Pending SO Items For Purchase Request,"Itens Pendentes Assim, por solicitação de compra"
+DocType: Sales Invoice,Debit To,Débito Para
+DocType: Delivery Note,Required only for sample item.,Necessário só 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,Faturamento Moeda
+DocType: Supplier,Billing Currency,Moeda de Faturamento
 DocType: Sales Invoice,SINV-RET-,SINV-RET
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Large,Extra-grande
-,Profit and Loss Statement,Demonstração dos Resultados
-DocType: Bank Reconciliation Detail,Cheque Number,Número de cheques
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Extra Large,Extragrande
+,Profit and Loss Statement,Cálculo de Lucros e Perdas
+DocType: Bank Reconciliation Detail,Cheque Number,Número de Cheque
 ,Sales Browser,Navegador Vendas
 DocType: Journal Entry,Total Credit,Crédito Total
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +507,Warning: Another {0} # {1} exists against stock entry {2},Aviso: Outra {0} # {1} existe contra entrada de material {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Local,local
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Empréstimos e Adiantamentos (Ativo )
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +508,Warning: Another {0} # {1} exists against stock entry {2},Aviso: Outra {0} # {1} existe contra entrada de material {2}
+apps/erpnext/erpnext/setup/setup_wizard/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 +154,Large,Grande
-DocType: Homepage Featured Product,Homepage Featured Product,Homepage Produto Apresentado
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Novo Nome Warehouse
-apps/erpnext/erpnext/accounts/report/financial_statements.py +225,Total {0} ({1}),Total {0} ({1})
+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 +224,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, não mencione de visitas necessárias"
-DocType: Stock Settings,Default Valuation Method,Método de Avaliação padrão
-DocType: Production Order Operation,Planned Start Time,Planned Start Time
-DocType: Assessment,Assessment,avaliação
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Por favor, mencione o nº visitas necessárias"
+DocType: Stock Settings,Default Valuation Method,Método de Estimativa Padrão
+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 a Folha de Balançete e adicione Lucro ou Perda
-DocType: Student Applicant,Application Status,Consulta Estado
-DocType: Fees,Fees,Honorários
+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 do Pedido
+DocType: Fees,Fees,Propinas
 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,Cotação {0} é cancelada
+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.,Empregado {0} estava de licença em {1} . Não pode marcar presença.
+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,Lista de Preços Principal
-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 para várias **pessoas das vendas** para que você possa definir e monitorar as 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.,S.O. Nee.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +150,Please create Customer from Lead {0},"Por favor, crie Cliente de chumbo {0}"
-DocType: Price List,Applicable for Countries,Aplicável para os Países
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +150,Please create Customer from Lead {0},"Por favor, crie um Cliente do 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},Estudante Nome do grupo é obrigatória na linha {0}
-DocType: Homepage,Products to be shown on website homepage,Produtos para ser mostrado na página inicial do site
+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 de raíz e não pode ser editado
 DocType: Employee,AB-,AB-
-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,Dias bloco
-DocType: Journal Entry,Excise Entry,Excise Entry
+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: Pedidos de Vendas {0} já existe contra a ordem de compra do cliente {1}
 DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
 
@@ -2371,1286 +2400,1303 @@
  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."
-DocType: Attendance,Leave Type,Tipo de Férias
-apps/erpnext/erpnext/controllers/stock_controller.py +173,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Despesa conta / Diferença ({0}) deve ser um 'resultados' conta
+DocType: Attendance,Leave Type,Tipo de Licença
+apps/erpnext/erpnext/controllers/stock_controller.py +173,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,Contas de Utilizador
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Name error: {0},erro Nome: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +90,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 +178,{0} {1} does not associated with {2} {3},{0} {1} não associada a {2} {3}
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Atendimento para empregado {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 (por impressão)
-DocType: Warehouse,Parent Warehouse,Armazém pai
-DocType: C-Form Invoice Detail,Net Total,Líquida Total
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +181,{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,Saldo em aberto
+DocType: Payment Reconciliation Invoice,Outstanding Amount,Montante em Dívida
 DocType: Project Task,Working,Trabalhando
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Da fila (FIFO)
-apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +38,{0} does not belong to Company {1},{0} não pertence à empresa {1}
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +38,{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,Termine
-,Requested Qty,verzocht Aantal
+DocType: Account,Round Off,Arredondar
+,Requested Qty,Qtd Solicitada
 DocType: Tax Rule,Use for Shopping Cart,Use para 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},Valor {0} para o atributo {1} não existe na lista de item válido valores de atributos para item {2}
-apps/erpnext/erpnext/schools/doctype/discussion/discussion.py +33,Discussions,discussões
+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","Encargos serão distribuídos proporcionalmente com base no qty item ou quantidade, como por sua seleção"
-DocType: Maintenance Visit,Purposes,Fins
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,Pelo menos um item deve ser inserido com quantidade negativa no documento de devolução
-apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operação {0} mais do que as horas de trabalho disponíveis na estação de trabalho {1}, quebrar a operação em várias operações"
-,Requested,gevraagd
+apps/erpnext/erpnext/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 +67,"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 +83,No Remarks,Sem Observações
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Vencido
 DocType: Account,Stock Received But Not Billed,"Banco recebido, mas não faturados"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +87,Root Account must be a group,Conta raiz deve ser um grupo
-DocType: Fees,FEE.,TAXA.
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Salário bruto + Valores em Atraso + Valor vencido cobrança - Redução Total
+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,Qtde projetada
-DocType: Monthly Distribution,Distribution Name,Nome de distribuição
-DocType: Course,Course Code,Código do curso
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,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 é convertido para a moeda da empresa de base
-DocType: Purchase Invoice Item,Net Rate (Company Currency),Taxa Líquida (Companhia de moeda)
-DocType: Salary Detail,Condition and Formula Help,Condição e Fórmula Ajuda
-apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Gerenciar Árvore Território.
+DocType: Monthly Distribution,Distribution Name,Nome de Distribuição
+DocType: Course,Course Code,Código de Curso
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,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 Organograma de Território.
 DocType: Journal Entry Account,Sales Invoice,Fatura de vendas
-DocType: Journal Entry Account,Party Balance,Balance Partido
-apps/erpnext/erpnext/accounts/page/pos/pos.js +475,Please select Apply Discount On,"Por favor, selecione Aplicar Discount On"
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +92,Salary Slip Created,Recibo de Salário Criado
+DocType: Journal Entry Account,Party Balance,Saldo da Parte
+apps/erpnext/erpnext/accounts/page/pos/pos.js +464,Please select Apply Discount On,"Por favor, selecione Aplicar Desconto Em"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +95,Salary Slip Created,Recibo de Salário Criado
 DocType: Company,Default Receivable Account,Contas a Receber Padrão
-DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,"Criar Entrada de Banco para o salário total pago, para os critérios acima selecionados"
-DocType: Stock Entry,Material Transfer for Manufacture,Transferência de Material de 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.
+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 +384,Accounting Entry for Stock,Entrada de Contabilidade da
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +387,Accounting Entry for Stock,Registo Contabilístico do Stock
 DocType: Sales Invoice,Sales Team1,Vendas team1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,Item {0} does not exist,Item {0} não existe
-DocType: Attendance Tool Student,Attendance Tool Student,Presença Student Ferramenta
-DocType: Sales Invoice,Customer Address,Endereço do cliente
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +96,Row {0}: Completed Qty must be greater than zero.,Fila {0}: Completado Qtd deve ser maior que zero.
-DocType: Purchase Invoice,Apply Additional Discount On,Aplicar desconto adicional em
-DocType: Account,Root Type,Tipo de Raiz
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,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 +120,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 +88,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Não é possível retornar mais de {1} para {2} item
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +76,Plot,plot
+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 slideshow no topo da página
-DocType: BOM,Item UOM,Item UOM
+DocType: BOM,Item UOM,UNID de Item
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Valor do imposto Valor Depois de desconto (Companhia de moeda)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +147,Target warehouse is mandatory for row {0},Destino do Warehouse é obrigatória para a linha {0}
-DocType: Cheque Print Template,Primary Settings,Configurações primárias
+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: Cheque Print Template,Primary Settings,Definições Principais
 DocType: Purchase Invoice,Select Supplier Address,Escolha um Fornecedor Endereço
 DocType: Quality Inspection,Quality Inspection,Inspeção de Qualidade
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Extra Small,Muito Pequeno
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,Warning: Material Requested Qty is less than Minimum Order Qty,Aviso: A quantidade do Material requesitado é menor que a quantidade minima de Compra
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +194,Account {0} is frozen,Conta {0} está congelada
-DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entidade Legal / Subsidiária com um gráfico separado de Contas pertencente à Organização.
-DocType: Payment Request,Mute Email,Mudo Email
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Alimentos, Bebidas e Tabaco"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +606,Can only make payment against unbilled {0},Só pode fazer o pagamento contra a faturar {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +126,Commission rate cannot be greater than 100,Taxa de comissão não pode ser maior do que 100
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Extrapequeno
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +690,Warning: Material Requested Qty is less than Minimum Order Qty,Aviso: A quantidade do Material requesitado é menor que a quantidade minima de Compra
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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 +609,Can only make payment against unbilled {0},Só pode efetuar o pagamento no {0} não faturado
+apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,A taxa de comissão não pode ser superior a 100
 DocType: Stock Entry,Subcontract,Subcontratar
-apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,"Por favor, indique {0} primeiro"
-DocType: Production Order Operation,Actual End Time,Tempo Final Atual
-DocType: Production Planning Tool,Download Materials Required,Baixe Materiais Necessários
-DocType: Item,Manufacturer Part Number,Número da peça de fabricante
-DocType: Production Order Operation,Estimated Time and Cost,Tempo estimado e Custo
+apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,"Por favor, insira {0} primeiro"
+DocType: Production Order Operation,Actual End Time,Tempo Final Efetiva
+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 Despesa
+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 +158,Colour,Cor
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,Cor
 DocType: Maintenance Visit,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 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 +469,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})
+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 +472,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 alvos através meses.
 DocType: Purchase Invoice Item,Valuation Rate,Taxa de valorização
-apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,Não foi indicada uma Moeda para a Lista de Preços
+DocType: Stock Reconciliation,SR/,SR /
+apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,Não foi selecionada uma Moeda para a Lista de Preços
 DocType: Assessment,Results,Resultados
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +168,Employee {0} has already applied for {1} between {2} and {3},Empregado {0} já solicitou {1} {2} entre 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/hr/doctype/leave_application/leave_application.py +175,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,Renomeie Entrar
-DocType: Student Applicant,Father's/ Guardian 2 Email ID,Pai / Guardião ID 2 Email
-DocType: Maintenance Visit Purpose,Against Document No,Contra documento No
-apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Gerenciar parceiros de vendas.
+DocType: Rename Tool,Rename Log,Registo de Alteração de Nome
+DocType: Maintenance Visit Purpose,Against Document No,No Nº de Documento
+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 +228,Warehouses with existing transaction can not be converted to group.,Armazéns com transação existente não pode ser convertido em grupo.
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},Por favor seleccione {0}
-DocType: C-Form,C-Form No,C-Forma Não
-DocType: BOM,Exploded_items,Exploded_items
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +231,Warehouses with existing transaction can not be converted to group.,Armazéns com transação existente não pode ser convertido em grupo.
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},"Por favor, selecione {0}"
+DocType: C-Form,C-Form No,Nº C-Form
+DocType: BOM,Exploded_items,Vista_expandida_de_items
 DocType: Employee Attendance Tool,Unmarked Attendance,Presença Unmarked
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Researcher,investigador
-DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Inscrição no Programa Student Ferramenta
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Nome ou E-mail é obrigatório
-apps/erpnext/erpnext/config/stock.py +158,Incoming quality inspection.,Inspeção de qualidade de entrada.
-DocType: Purchase Order Item,Returned Qty,Devolvido Qtde
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Researcher,Investigador
+DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Estudante da Ferramenta 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,Tipo de Raiz é obrigatório
+apps/erpnext/erpnext/accounts/doctype/account/account.py +159,Root Type is mandatory,É obrigatório colocar o Tipo de Fonte
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Serial Não {0} criado
-DocType: Homepage,Company Description for website homepage,Descrição da Empresa para a página inicial do site
-DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Para a comodidade dos clientes, estes códigos podem ser usados em formatos de impressão, como facturas e guias de entrega"
+DocType: Homepage,Company Description for website homepage,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 Notas de Entrega"
 DocType: Sales Invoice,Time Sheet List,Lista de folhas de tempo
 DocType: Employee,You can enter any date manually,Você pode entrar em qualquer data manualmente
-DocType: Sales Invoice,Advertisement,Anúncio
-DocType: Asset Category Account,Depreciation Expense Account,Conta depreciação Despesa
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Probationary Period,Período Probatório
-apps/erpnext/erpnext/hooks.py +102,Announcements,Avisos
-DocType: Customer Group,Only leaf nodes are allowed in transaction,Nós folha apenas são permitidos em operação
-DocType: Expense Claim,Expense Approver,Despesa Approver
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +109,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,Recibo de compra do item em actualização
+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 +111,Announcements,Avisos
+DocType: Customer Group,Only leaf nodes are allowed in transaction,Só são permitidos grupos principais numa transação
+DocType: Expense Claim,Expense Approver,Aprovador de Despesas
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +109,Row {0}: Advance against Customer must be credit,O Avanço da linha {0}: do Cliente deve ser um crédito
+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 +16,To Datetime,Para Datetime
+apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Para Datetime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway de URL
-apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +51,Course Schedules deleted:,Programações do curso excluído:
-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/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Atividades pendentes
-DocType: Payment Gateway,Gateway,Porta de entrada
-DocType: Fee Component,Fees Category,taxas Categoria
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,"Por favor, indique data alívio ."
-apps/erpnext/erpnext/controllers/trends.py +145,Amt,Qtd
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,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 +26,Address Title is mandatory.,O título do Endereço é obrigatório.
-DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Digite o nome da campanha se fonte de pesquisa é a campanha
+apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +51,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 sms
+DocType: Accounts Settings,Make Payment via Journal Entry,Fazer o pagamento via Journal Entry
+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 +127,Please enter relieving date.,"Por favor, insira a data de ajuda."
+apps/erpnext/erpnext/controllers/trends.py +149,Amt,Mtt
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,Only Leave Applications with status 'Approved' can be submitted,"Só as Solicitações de Licenças com estado ""Aprovado"" é que podem ser enviadas"
+apps/erpnext/erpnext/utilities/doctype/address/address.py +26,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,Selecione Ano Fiscal
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Reordenar Nível
-DocType: Attendance,Attendance Date,Data de atendimento
-apps/erpnext/erpnext/stock/get_item_details.py +258,Item Price updated for {0} in Price List {1},Item Preço actualizado para {0} na lista de preços {1}
+DocType: Attendance,Attendance Date,Data de Presença
+apps/erpnext/erpnext/stock/get_item_details.py +258,Item Price updated for {0} in Price List {1},O Preço de 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,Conta com nós filhos não pode ser convertido em livro
-DocType: Address,Preferred Shipping Address,Endereço para envio preferido
+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 da Publicação
+DocType: Bank Reconciliation Detail,Posting Date,Data de Postagem
 DocType: Item,Valuation Method,Método de Avaliação
 apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1},Incapaz de encontrar a taxa de câmbio para {0} para {1}
-apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Mark Meio Dia
+apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Marcar Meio Dia
 DocType: Sales Invoice,Sales Team,Equipe de Vendas
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Duplicate entry,duplicar entrada
-DocType: Program Enrollment Tool,Get Students,obter Estudantes
+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 +490,[Error],[Erro]
-DocType: Sales Order,In Words will be visible once you save the Sales Order.,Em Palavras será visível quando você salvar a Ordem de Vendas.
-,Employee Birthday,Aniversário empregado
-apps/erpnext/erpnext/controllers/status_updater.py +175,Limit Crossed,limite cruzadas
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +484,[Error],[Erro]
+DocType: Sales Order,In Words will be visible once you save the Sales Order.,Em Palavras será visível quando guardar o Pedido de Vendas.
+,Employee Birthday,Aniversário do Funcionário
+apps/erpnext/erpnext/controllers/status_updater.py +175,Limit Crossed,Limite Ultrapassado
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Capital de Risco
-DocType: UOM,Must be Whole Number,Deve ser Número inteiro
-DocType: Leave Control Panel,New Leaves Allocated (In Days),Folhas novas atribuído (em dias)
+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.,"Um termo escolar com este &quot;Ano Lectivo &#39;{0} e&#39; Nome Prazo &#39;{1} já existe. Por favor, modificar essas entradas 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,Serial Não {0} não existe
-DocType: Sales Invoice Item,Customer Warehouse (Optional),Armazém Cliente (Opcional)
+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,Encomendas
-DocType: Employee Leave Approver,Leave Approver,Deixe Aprovador
+DocType: Payment Reconciliation Invoice,Invoice Number,Número da Fatura
+DocType: Shopping Cart Settings,Orders,Pedidos
+DocType: Employee Leave Approver,Leave Approver,Aprovador da Licença
 DocType: Assessment Group,Assessment Group Name,Nome do Grupo de Avaliação
-DocType: Manufacturing Settings,Material Transferred for Manufacture,Material transferido para Fabricação
-DocType: Expense Claim,"A user with ""Expense Approver"" role","Um utilizador com responsabilidade de ""Aprovar Despesas"""
-DocType: Landed Cost Item,Receipt Document Type,Receipt Tipo de Documento
-,Issued Items Against Production Order,Itens emitida contra Ordem de Produção
-DocType: Pricing Rule,Purchase Manager,Gerente de Compras
+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
+,Issued Items Against Production Order,Itens Emitidos 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 +25,All Jobs,Todos os trabalhos
-DocType: Sales Order,% of materials billed against this Sales Order,% de materiais faturado contra esta Ordem de Vendas
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Entrada 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 +323,Amount {0} {1} {2} {3},Montante {0} {1} {2} {3}
-DocType: Account,Depreciation,depreciação
+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 Vendas
+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 +326,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 (s)
-DocType: Employee Attendance Tool,Employee Attendance Tool,Ferramenta de Lista de Presença do Trabalhador
+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,Salse Order Date
 DocType: Salary Component,Salary Component,Componente salário
-apps/erpnext/erpnext/accounts/utils.py +372,Payment Entries {0} are un-linked,As entradas de pagamento {0} são un-linked
+apps/erpnext/erpnext/accounts/utils.py +449,Payment Entries {0} are un-linked,Os Registos de Pagamento {0} não estão ligados
 DocType: GL Entry,Voucher No,Vale No.
-DocType: Leave Allocation,Leave Allocation,Alocação de Férias
-DocType: Payment Request,Recipient Message And Payment Details,Mensagem Destinatário E Detalhes do pagamento
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +497,Material Requests {0} created,Pedidos de Materiais {0} criado
-DocType: Production Planning Tool,Include sub-contracted raw materials,Incluem matérias-primas sub-contratados
+DocType: Leave Allocation,Leave Allocation,Alocação de Licenças
+DocType: Payment Request,Recipient Message And Payment Details,Mensagem E Dados de Pagamento para Destinatário
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +498,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 Contato
-DocType: Cheque Print Template,Is Account Payable,É Contas a Pagar
+DocType: Purchase Invoice,Address and Contact,Endereço e Contacto
+DocType: Cheque Print Template,Is Account Payable,A Conta é A Pagar
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +260,Stock cannot be updated against Purchase Receipt {0},Stock não pode ser atualizada contra Recibo de compra {0}
-DocType: Supplier,Last Day of the Next Month,Último dia do mês seguinte
+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 +66,"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),Nota: Devido / Reference Data excede dias de crédito de clientes permitidos por {0} dia (s)
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","A licença não pode ser alocada antes de {0}, pos o saldo de licenças já foi efetuado no registo de alocaçã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 de permitidos por cliente em {0} dia(s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +9,Student Applicant,estudante Requerente
-DocType: Asset Category Account,Accumulated Depreciation Account,Conta de depreciação acumulada
-DocType: Stock Settings,Freeze Stock Entries,Congelar da Entries
-DocType: Asset,Expected Value After Useful Life,Valor Esperado após sua vida útil
-DocType: Item,Reorder level based on Warehouse,Nível de reabastecimento baseado em Armazém
-DocType: Activity Cost,Billing Rate,Faturamento Taxa
-,Qty to Deliver,Aantal te leveren
+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 a 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
 DocType: Monthly Distribution Percentage,Month,Mês
 ,Stock Analytics,Stock analíticos
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +373,Operations cannot be left blank,As operações não pode ser deixado em branco
-DocType: Maintenance Visit Purpose,Against Document Detail No,Contra Detalhe documento No
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +72,Party Type is mandatory,Tipo partido é obrigatória
-DocType: Quality Inspection,Outgoing,Cessante
-DocType: Material Request,Requested For,gevraagd voor
-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 ou fechado
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +373,Operations cannot be left blank,As operações não podem ser deixadas em branco
+DocType: Maintenance Visit Purpose,Against Document Detail No,No Nº de Dados de Documento
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +72,Party Type is mandatory,É obrigatório colocar o Tipo de Parte
+DocType: Quality Inspection,Outgoing,De Saída
+DocType: Material Request,Requested For,Solicitado Para
+DocType: Quotation Item,Against Doctype,No Doctype
+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 este Nota de Entrega contra 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,É primário Endereço
+,Is Primary Address,É o Endereço Principal
 DocType: Production Order,Work-in-Progress Warehouse,Armazém Work-in-Progress
-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 +324,Reference #{0} dated {1},Referência # {0} {1} datado
-apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,Depreciação Eliminado devido à alienação de activos
-apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Gerenciar endereços
-DocType: Asset,Item Code,Código do artigo
-DocType: Production Planning Tool,Create Production Orders,Criar ordens de produção
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104,Asset {0} must be submitted,O ativo {0} deve ser enviado
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +324,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 eliminado 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 / AMC Detalhes
 DocType: Journal Entry,User Remark,Observação de usuário
-DocType: Lead,Market Segment,Segmento de mercado
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +848,Paid Amount cannot be greater than total negative outstanding amount {0},Montante pago não pode ser maior do que o montante em dívida total negativa {0}
-DocType: Employee Internal Work History,Employee Internal Work History,Empregado História Trabalho Interno
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +233,Closing (Dr),Fechamento (Dr)
-DocType: Cheque Print Template,Cheque Size,Cheque Tamanho
-DocType: Contact,Passive,Passiva
+DocType: Lead,Market Segment,Segmento de Mercado
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +859,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 +233,Closing (Dr),A Fechar (Db)
+DocType: Cheque Print Template,Cheque Size,Tamanho do Cheque
+DocType: Contact,Passive,Passivo
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.js +49,View attendance,Ver atendimento
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serial Não {0} não em estoque
 apps/erpnext/erpnext/config/selling.py +159,Tax template for selling transactions.,Modelo imposto pela venda de transações.
 DocType: Sales Invoice,Write Off Outstanding Amount,Escreva Off montante em dívida
 DocType: Account,Accounts Manager,Gestor de Contas
-DocType: Stock Settings,Default Stock UOM,Padrão da UOM
-DocType: Asset,Number of Depreciations Booked,Número de amortizações Reservado
-DocType: Landed Cost Item,Receipt Document,recibo Documento
-DocType: Production Planning Tool,Create Material Requests,Criar Pedidos de Materiais
+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,Detalhes Referência
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +57,Expected Value After Useful Life must be less than Gross Purchase Amount,Valor Esperado após sua vida útil deve ser inferior a Gross Compra Valor
-DocType: Sales Invoice Item,Available Qty at Warehouse,Qtde Disponível em Armazém
-,Billed Amount,Montante Cobrado
-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 +555,'Update Stock' cannot be checked for fixed asset sale,&quot;Atualização da &#39;não pode ser verificado para a venda de ativo fixo
-DocType: Bank Reconciliation,Bank Reconciliation,Banco Reconciliação
-apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Obter atualizações
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +132,Material Request {0} is cancelled or stopped,Pedido de material {0} é cancelado ou interrompido
-apps/erpnext/erpnext/public/js/setup_wizard.js +313,Add a few sample records,Adicione alguns registros de exemplo
-apps/erpnext/erpnext/config/hr.py +243,Leave Management,Deixar de Gestão
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Grupo por Conta
-DocType: Sales Order,Fully Delivered,Totalmente entregue
-DocType: Lead,Lower Income,Baixa Renda
+DocType: Payment Request,Reference Details,Dados de Referência
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +57,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 a cancelar.
+DocType: Student Guardian,Father,Pai
+apps/erpnext/erpnext/controllers/accounts_controller.py +558,'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/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 +243,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
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","De rekening hoofd onder Aansprakelijkheid , waarin Winst / verlies zal worden geboekt"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +166,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 +238,"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 +81,Purchase Order number required for Item {0},Número do pedido requerido para item {0}
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','A Data de ' deve ser depois de ' Para Data '
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +17,Cannot change status as student {0} is linked with student application {1},Não é possível alterar o status como estudante {0} está relacionada com a candidatura do estudante {1}
-DocType: Timesheet,"List of employee which has ""Salary Slip Based on Timesheet"" is enabled in salary structure.",Lista de empregado que tem &quot;folha de salário Baseado no quadro de horários&quot; é habilitado na estrutura salarial.
-DocType: Asset,Fully Depreciated,totalmente depreciados
+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 +82,Purchase Order number required for Item {0},Número do Pedido de Compra requerido 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 {0} estudante está ligado à candidatura de estudante {1}
+DocType: Timesheet,"List of employee which has ""Salary Slip Based on Timesheet"" is enabled in salary structure.","A lista de funcionários que tem as ""Folhas de Vencimento Baseadas no Livro de Ponto"" está ativada na estrutura salarial."
+DocType: Asset,Fully Depreciated,Totalmente Depreciados
 ,Stock Projected Qty,Verwachte voorraad Aantal
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,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,Ordem de Compra do Cliente
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,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 número de série e de lote
 DocType: Warranty Claim,From Company,Da Empresa
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +75,Please set Number of Depreciations Booked,"Por favor, defina Número de amortizações Reservado"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +75,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 Quantidade
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +400,Productions Orders cannot be raised for:,Encomendas produções não podem ser levantadas para:
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Minute,minuto
-DocType: Purchase Invoice,Purchase Taxes and Charges,Impostos e Encargos de compra
-,Qty to Receive,Aantal te ontvangen
-DocType: Leave Block List,Leave Block List Allowed,Lista de Bloqueios para Férias Permitidos
-apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +55,All Warehouses,Todos os Armazéns
-DocType: Sales Partner,Retailer,Varejista
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Credit To account must be a Balance Sheet account,Para crédito de conta deve ser uma conta de Balanço
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Todos os tipos de fornecedores
-DocType: Global Defaults,Disable In Words,Desativar In Words
-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/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Cotação {0} não é do tipo {1}
-DocType: Maintenance Schedule Item,Maintenance Schedule Item,Item Programa de Manutenção
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +400,Productions Orders cannot be raised for:,Não podem ser efetuados 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/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 +105,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 Em Palavras
+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-,PRÓ-
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Bank Overdraft Account,Conta Garantida Banco
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Maak loonstrook
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +26,Browse BOM,Navegar BOM
+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 +18,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 depreciação de ativos em Categoria {0} ou Empresa {1}"
-DocType: Academic Year,Academic Year,Ano acadêmico
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Opening Balance Equity,Abertura Patrimônio Balance
+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 +136,Email sent to supplier {0},E-mail enviado ao fornecedor {0}
-DocType: Opportunity,OPTY-,OPTY-
-apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Data é repetido
-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 +197,Leave approver must be one of {0},Deixe aprovador deve ser um dos {0}
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +136,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 +204,Leave approver must be one of {0},O aprovador de licença deve ser um {0}
 DocType: Hub Settings,Seller Email,Vendedor Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Custo total de compra (Purchase via da fatura)
 DocType: Workstation Working Hour,Start Time,Start Time
-DocType: Item Price,Bulk Import Help,A importação em massa de Ajuda
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +256,Select Quantity,Digite a Quantidade
-apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Aprovando Responsabilidade não pode ser o mesmo que a regra em aplicável a
+DocType: Item Price,Bulk Import Help,Ajuda de Importação em Massa
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +257,Select Quantity,Digite a 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 de Aprovar Função não pode 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 nesse Email Digest
-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,Conta com nós filho não pode ser definido como contabilidade
+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 em que moeda lista de preços é convertido para a moeda base de cliente
-DocType: Purchase Invoice Item,Net Amount (Company Currency),Valor Líquido (Companhia de moeda)
-DocType: Salary Slip,Hour Rate,Taxa à hora
-DocType: Stock Settings,Item Naming By,Item de nomeação
-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 Período de Encerramento {0} foi feita após {1}
-DocType: Production Order,Material Transferred for Manufacturing,Material transferido para Manufatura
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,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.,Valores de Qtd Alvo ou montante alvo são obrigatórios
-apps/erpnext/erpnext/config/projects.py +45,Cost of various activities,Custo das diferentes actividades
+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 Período de Encerramento {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 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}","Configurando eventos para {0}, uma vez que o funcionário ligado ao abaixo vendas pessoas não tem um ID do usuário {1}"
+DocType: Timesheet,Billing Details,Detalhes de faturamento
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +149,Source and target warehouse must be different,Fonte e warehouse de destino deve ser diferente
-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}
-DocType: Item,Inspection Required,Inspeção Obrigatório
-DocType: Purchase Invoice Item,PR Detail,Detalhe PR
-DocType: Sales Order,Fully Billed,Cobrado na Totalmente
-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ém de entrega necessário para estoque item {0}
+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: Item,Inspection Required,Inspeção Obrigatória
+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,Gebruikers met deze rol mogen bevroren accounts en maak / boekingen tegen bevroren rekeningen wijzigen
-DocType: Serial No,Is Cancelled,É cancelado
-DocType: Journal Entry,Bill Date,Data Bill
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Mesmo se houver várias regras de preços com maior prioridade, então seguintes prioridades internas são aplicadas:"
-DocType: Cheque Print Template,Cheque Height,Cheque Altura
+DocType: Serial No,Is Cancelled,É Cancelada
+DocType: Journal Entry,Bill Date,Data de Conta
+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 haja várias Regras de Fixação de Preços com alta prioridade, então as seguintes prioridades internas são aplicadas:"
+DocType: Cheque Print Template,Cheque Height,Altura do Cheque
 DocType: Sales Invoice Item,Total Margin,Margem total
 DocType: Supplier,Supplier Details,Detalhes fornecedor
-DocType: Expense Claim,Approval Status,Status de 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 +138,Wire Transfer,por transferência bancária
-apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Confira tudo
-DocType: Sales Order,Recurring Order,Ordem Recorrente
-DocType: Company,Default Income Account,Conta Rendimento padrão
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Customer Group / Klantenservice
+DocType: Expense Claim,Approval Status,Estado de Aprovação
+DocType: Hub Settings,Publish Items to Hub,Publicar Itens no Hub
+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,por transferência bancária
+apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Verificar tudo
+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
 DocType: Sales Invoice,Time Sheets,folhas de tempo
-DocType: Payment Gateway Account,Default Payment Request Message,Padrão Pedido de Pagamento Mensagem
-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,Bancária e de Pagamentos
+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,Levar a cotação
+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_data.py +357,Calls,chamadas
+apps/erpnext/erpnext/demo/setup/setup_data.py +300,Calls,Chamadas
 DocType: Project,Total Costing Amount (via Time Logs),Montante Custeio Total (via Time Logs)
 DocType: Purchase Order Item Supplied,Stock UOM,Estoque UOM
-apps/erpnext/erpnext/stock/doctype/item/item.py +466,"As there are existing transactions for this item, \
-							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Como existem transações existentes para este item, \ não é possível alterar os valores de &#39;não tem Serial&#39;, &#39;Tem Lote n&#39;, &#39;é Stock Item&#39; e &#39;Metodologia de Avaliação &quot;"
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,Purchase Order {0} is not submitted,Ordem de Compra {0} não é submetido
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,verwachte
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,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},Serial Não {0} não pertence ao Armazém {1}
-apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota : O sistema não irá verificar o excesso de entrega e sobre- reserva para item {0} como quantidade ou valor é 0
-DocType: Notification Control,Quotation Message,Mensagem de Orçamento
-DocType: Issue,Opening Date,Data de abertura
-apps/erpnext/erpnext/schools/api.py +58,Attendance has been marked successfully.,Atendimento foi marcado com sucesso.
+apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota : O sistema não irá verificar o excesso de entrega e 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 +57,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 +136,Account Type for {0} must be {1},Tipo de conta para {0} deve ser {1}
-apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Folhas 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 Armazens devem pertencer a mesma Empresa
-apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Nenhum contato adicionado ainda.
-DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Custo Landed Comprovante Montante
-apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Contas levantada por Fornecedores.
+DocType: Purchase Receipt Item,Rate and Amount,Taxa e Montante
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +139,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 os Armazens 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 Comprovante de Custo de Entrega
+apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Contas levantadas por Fornecedores.
 DocType: POS Profile,Write Off Account,Escreva Off Conta
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Montante do Desconto
-DocType: Purchase Invoice,Return Against Purchase Invoice,Regresso contra factura de compra
+DocType: Purchase Invoice,Return Against Purchase Invoice,Devolver Contra 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 +40,Acutal qty in stock,Quant acutal em estoque
+apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +40,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,por exemplo IVA
+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 Admissão
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +20,Sub-contracting,Sub-contratação
-DocType: Journal Entry Account,Journal Entry Account,Conta Diário de entrada
+DocType: Journal Entry Account,Journal Entry Account,Conta de 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,Cotação 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","Um item existe com o mesmo nome ( {0}) , por favor, altere o nome do grupo de itens ou renomear o item"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1190,Please select customer,"Por favor, selecione cliente"
-DocType: C-Form,I,Eu
-DocType: Company,Asset Depreciation Cost Center,Activo Centro de Custo Depreciação
+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 modifique o nome desse item"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1193,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,Vendas Data Ordem
-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 marcada, todos os filhos de cada item de produção serão incluídas nos pedidos de material."
+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}: Empresa é obrigatório
-,Payment Period Based On Invoice Date,Betaling Periode Based On Factuurdatum
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Faltando Taxas de câmbio para {0}
+,Payment Period Based On Invoice Date,Período de Pagamento Baseado na Data de Fatura
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Taxas de Câmbio de {0} em falta
 DocType: Assessment,Examiner,Examinador
+DocType: Student,Siblings,Irmãos
 DocType: Journal Entry,Stock Entry,Entrada stock
-DocType: Payment Entry,Payment References,Referências de pagamento
-DocType: C-Form,C-FORM-,C-Form
-DocType: Account,Payable,a pagar
+DocType: Payment Entry,Payment References,Referências de Pagamento
+DocType: C-Form,C-FORM-,C-FORM-
+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,Quantidade atraso
+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 %,Lucro Bruto%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Gross Profit %,Lucro Bruto %
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Data de Liquidação
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +60,Gross Purchase Amount is mandatory,Valor Comprar Gross é obrigatória
-DocType: Lead,Address Desc,Endereço Descr
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +75,Party is mandatory,Partido é obrigatória
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +60,Gross Purchase Amount is mandatory,É obrigatório colocar o Montante de Compra Bruto
+DocType: Lead,Address Desc,Descr de Endereço
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +75,Party is mandatory,É obrigatório colocar a parte
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Nome tópico
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Pelo menos um dos que vendem ou compram deve ser selecionado
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,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 grau
 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 as operações de fabricação são realizadas.
 DocType: Asset Movement,Source Warehouse,Armazém fonte
-DocType: Installation Note,Installation Date,Data de instalação
-apps/erpnext/erpnext/controllers/accounts_controller.py +534,Row #{0}: Asset {1} does not belong to company {2},Linha # {0}: Ativo {1} não pertence à empresa {2}
-DocType: Employee,Confirmation Date,bevestiging Datum
+DocType: Installation Note,Installation Date,Data de Instalação
+apps/erpnext/erpnext/controllers/accounts_controller.py +537,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,Vendas de Usuário
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,Qty mínimo não pode ser maior do que Max Qtde
-DocType: Account,Accumulated Depreciation,Depreciação acumulada
-DocType: Stock Entry,Customer or Supplier Details,Cliente ou fornecedor detalhes
-DocType: Lead,Lead Owner,Levar Proprietário
-DocType: Bin,Requested Quantity,solicitada Quantidade
-DocType: Employee,Marital Status,Estado civil
-DocType: Stock Settings,Auto Material Request,Pedido de material Auto
-DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Disponível Qtd Batch a partir do Armazém
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,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,Atual BOM e Nova BOM não pode ser o mesmo
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Data da aposentadoria deve ser maior que Data de Juntando
+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 BOM não podem ser iguais
+apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +39,Salary Slip ID,Salário deslizamento ID
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Data de Admissão deve ser depois da Data de Admissão
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +49,There were errors while scheduling course on :,Houve erros durante a programação de cursos em:
-DocType: Sales Invoice,Against Income Account,Contra Conta a Receber
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +87,{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}: Quant Pedi {1} não pode ser inferior a qty mínimo de pedido {2} (definido no Item).
-DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Distribuição percentual mensal
+DocType: Sales Invoice,Against Income Account,Na Conta de Receitas
+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 território
 DocType: Delivery Note,Transporter Info,Informações do Transportador
-apps/erpnext/erpnext/accounts/utils.py +379,Please set default {0} in Company {1},"Por favor, defina padrão {0} in Company {1}"
+apps/erpnext/erpnext/accounts/utils.py +456,Please set default {0} in Company {1},"Por favor, defina o {0} padrão na Empresa {1}"
 DocType: Cheque Print Template,Starting position from top edge,posição a partir da borda superior Começando
 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
-DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Item da ordem de compra em actualização
-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.,Chefes de letras para modelos de impressão .
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +146,Gross Profit / Loss,Lucro Bruto / Loss
+DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Item de Pedido de Compra Fornecido
+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.,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, Proforma Invoice ."
+DocType: Student Guardian,Student Guardian,estudante Guardião
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +184,Valuation type charges can not marked as Inclusive,Encargos tipo de avaliação não pode marcado como Inclusive
 DocType: POS Profile,Update Stock,Actualização de stock
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM diferente para itens levará a incorreta valor Peso Líquido (Total ) . Certifique-se de que o peso líquido de cada item está na mesma UOM .
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Taxa
-DocType: Asset,Journal Entry for Scrap,Entrada de 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 +349,Journal Entries {0} are un-linked,Lançamentos {0} são un-linked
-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 e-mail, telefone, chat, visita, etc."
-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/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, tire os itens da Nota de Entrega"
+apps/erpnext/erpnext/accounts/utils.py +426,Journal Entries {0} are un-linked,Os Lançamentos Contabilísticos {0} não estão ligados
+apps/erpnext/erpnext/config/crm.py +74,"Record of all communications of type email, phone, chat, visit, etc.","Registar 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,Voorwaarden
 DocType: Academic Term,Term Name,Nome prazo
-DocType: Buying Settings,Purchase Order Required,Ordem de Compra Obrigatório
-,Item-wise Sales History,Item-wise Histórico de Vendas
+DocType: Buying Settings,Purchase Order Required,Pedido de Compra Obrigatório
+,Item-wise Sales History,Histórico de Vendas de Item Inteligente
 DocType: Expense Claim,Total Sanctioned Amount,Valor total Sancionada
-,Purchase Analytics,Analytics compra
-DocType: Sales Invoice Item,Delivery Note Item,Item Nota de Entrega
+,Purchase Analytics,Análise de Compra
+DocType: Sales Invoice Item,Delivery Note Item,Item de Nota de Entrega
 DocType: Expense Claim,Task,Tarefa
-DocType: Purchase Taxes and Charges,Reference Row #,Referência Row #
-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}
+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},O número do lote é obrigatório 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 de raíz e não pode ser editado
 ,Stock Ledger,Stock Ledger
-apps/erpnext/erpnext/templates/includes/cart/cart_items.html +29,Rate: {0},Classificação: {0}
-DocType: Company,Exchange Gain / Loss Account,Troca Gain Conta / Loss
-apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Empregado e Presença
-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 +79,"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/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 +79,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Remover 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,Baixe um relatório contendo todas as matérias-primas com o seu estado mais recente inventário
-apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Community Forum
-DocType: Leave Application,Leave Balance Before Application,Deixe Equilíbrio Antes da aplicaçã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 de 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 de &quot;Todos os produtos&quot;
+DocType: Leave Application,Leave Balance Before Application,Saldo de Licenças Antes do Pedido
 DocType: SMS Center,Send SMS,Envie SMS
 DocType: Cheque Print Template,Width of amount in word,Largura do montante em palavras
-DocType: Company,Default Letter Head,Cabeça Padrão Letter
-DocType: Purchase Order,Get Items from Open Material Requests,Obter itens de solicitações de abertura de Materiais
+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,Padrão taxa de venda
-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,Reordenar Qtde
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +29,Current Job Openings,Aberturas de trabalho atual
+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,Banco de Acerto de Contas
 DocType: Journal Entry,Write Off,Eliminar
-DocType: Timesheet Detail,Operation ID,Operação ID
+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 identificação do usuário (login). Se for definido, ele vai se tornar padrão para todas as formas de RH."
-apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: A partir de {1}
-DocType: Task,depends_on,depende de
-apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +24,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"
-DocType: BOM Replace Tool,BOM Replace Tool,BOM Ferramenta Substituir
-apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Modelos País default sábio endereço
+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 +24,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,Padrão de País de Modelos de Endereço
 DocType: Sales Order Item,Supplier delivers to Customer,Fornecedor entrega ao Cliente
-apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form / Item / {0}) está fora de stock
-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 +850,Show tax break-up,Mostrar imposto break-up
-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/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 +841,Show tax break-up,Mostrar imposto break-up
+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 entradas de Stock contra Armazém {0}, portanto, você não pode voltar a atribuir ou modificá-lo"
-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,Fatura Data de lançamento
+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 +24,Sell,Vender
-DocType: Sales Invoice,Rounded Total,Total arredondado
-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%
-DocType: Serial No,Out of AMC,Fora da AMC
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +80,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Número de amortizações Reservas não pode ser maior do que o total número de Amortizações
-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 +162,Please contact to the user who have Sales Master Manager {0} role,"Por favor, entre em contato com o usuário que tem Vendas Mestre Gerente {0} papel"
-DocType: Company,Default Cash Account,Conta Caixa padrão
-apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Company ( não cliente ou fornecedor ) mestre.
+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 Alocação deve ser igual a 100%
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +534,Please select Posting Date before selecting Party,"Por favor, selecione Data de lançamento antes de selecionar partido"
+DocType: Serial No,Out of AMC,Fora do CMA
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +80,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 +195,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.,Dono da Empresa (não Cliente ou Fornecedor)
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +5,This is based on the attendance of this Student,Esta baseia-se no atendimento deste Student
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +165,Add more items or open full form,Adicionar mais itens ou plena forma aberta
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +104,Please enter 'Expected Delivery Date',"Por favor, digite ' 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,Notas de entrega {0} devem ser canceladas antes de cancelar esta ordem de venda
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +75,Paid amount + Write Off Amount can not be greater than Grand Total,Valor pago + Write Off Valor não pode ser maior do que o total geral
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,{0} is not a valid Batch Number for Item {1},{0} não é um número de lote válido por item {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +138,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,Programa de taxa de inscrição
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +165,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 Notas de Entrega {0} antes de cancelar este Pedido de Venda
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +75,Paid amount + Write Off Amount can not be greater than Grand Total,O Montante Pago + Montante de Depreciação 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 +145,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: Program Enrollment Fee,Program Enrollment Fee,Propina de Inscrição no Programa
 DocType: Item,Supplier Items,Fornecedor Itens
 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/accounts/doctype/gl_entry/gl_entry.py +57,Cost Center is required for 'Profit and Loss' account {0},"Centro de custo é necessário para "" Lucros e Perdas "" conta {0}"
+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,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.
-DocType: Cheque Print Template,Cheque Width,Largura Cheque
-DocType: Program,Fee Schedule,Tabela de taxas
+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: Cheque Print Template,Cheque Width,Largura do Cheque
+DocType: Program,Fee Schedule,Cronograma de Propinas
 DocType: Hub Settings,Publish Availability,Publicar Disponibilidade
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Data de nascimento não pode ser maior do que hoje.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,A Data de Nascimento não pode ser depois da data atual.
 ,Stock Ageing,Envelhecimento estoque
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,Planilha de horário
-apps/erpnext/erpnext/controllers/accounts_controller.py +228,{0} '{1}' is disabled,{0} '{1}' está desativada
+apps/erpnext/erpnext/controllers/accounts_controller.py +231,{0} '{1}' is disabled,{0} '{1}' está desativada
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Definir como Open
 DocType: Cheque Print Template,Scanned Cheque,digitalizada Cheque
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Enviar e-mails automáticos para Contatos sobre transações de enviar.
+DocType: Timesheet,Total Billable Amount,Valor Total Billable
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Item 3
-DocType: Purchase Order,Customer Contact Email,Cliente Fale Email
-DocType: Warranty Claim,Item and Warranty Details,Itens e Garantia Detalhes
+DocType: Purchase Order,Customer Contact Email,Email de contacto de Cliente
+DocType: Warranty Claim,Item and Warranty Details,Itens e Dados de Garantia
 DocType: Sales Team,Contribution (%),Contribuição (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Nota: Entrada pagamento não será criado desde 'Cash ou conta bancária ' não foi especificado
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Responsibilities,Responsabilidades
-DocType: Expense Claim Account,Expense Claim Account,Conta de Despesas
+apps/erpnext/erpnext/controllers/accounts_controller.py +78,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Nota: O Registo de Pagamento não será criado 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,Vendas Nome Pessoa
-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
-DocType: Pricing Rule,Item Group,Grupo Item
+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: Pricing Rule,Item Group,Grupo do Item
 DocType: Item,Safety Stock,Segurança da
-DocType: Stock Reconciliation Item,Before reconciliation,Antes de reconciliação
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Código do item&gt; Item Grupo&gt; Marca
+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 Adicionado (Moeda 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,Item Imposto Row {0} deve ter em conta tipo de imposto ou de renda ou de despesa ou carregável
-DocType: Sales Order,Partly Billed,Parcialmente faturado
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} must be a Fixed Asset Item,Item {0} deve ser um trunfo item fixo
-DocType: Item,Default BOM,BOM padrão
-apps/erpnext/erpnext/setup/doctype/company/company.js +44,Please re-type company name to confirm,"Por favor, re-tipo o nome da empresa para confirmar"
+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 +41,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,Total de Qtd em falta
-DocType: Timesheet,Total Hours,Total de Horas
-DocType: Journal Entry,Printing Settings,Configurações de impressão
+DocType: Journal Entry,Printing Settings,Definições de Impressão
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,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 de Imobilização
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automóvel
+DocType: Asset Category Account,Fixed Asset Account,Conta de Ativos Imobilizados
 DocType: Salary Structure Employee,Variable,Variável
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,From Delivery Note,De Nota de Entrega
-DocType: POS Profile,Allow Partial Payment,Permitir o pagamento parcial
-DocType: Timesheet Detail,From Time,From Time
-DocType: Notification Control,Custom Message,Mensagem personalizada
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Banca de Investimento
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +71,Cash or Bank Account is mandatory for making payment entry,Dinheiro ou conta bancária é obrigatória para a tomada de entrada de pagamento
-DocType: Purchase Invoice,Price List Exchange Rate,Preço Lista de Taxa de Câmbio
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,From Delivery Note,Da Nota de Entrega
+DocType: POS Profile,Allow Partial Payment,Permitir Pagamento Parcial
+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 +71,Cash or Bank Account is mandatory for making payment entry,É obrigatório colocar Dinheiro ou 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
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Grupo Cliente&gt; Território
 DocType: Purchase Invoice Item,Rate,Taxa
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Intern,internar
-DocType: Stock Entry,From BOM,De BOM
-DocType: Assessment,Assessment Code,Código avaliação
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +32,Basic,básico
+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,Transações com ações antes {0} são congelados
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Por favor, clique em "" Gerar Agenda '"
+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,Om datum moet dezelfde zijn als Van Datum voor halve dag verlof zijn
-apps/erpnext/erpnext/config/stock.py +185,"e.g. Kg, Unit, Nos, m","kg por exemplo, Unidade, n, m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,Referência Não é obrigatório se você entrou Data de Referência
-DocType: Bank Reconciliation Detail,Payment Document,Documento de pagamento
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Data de Juntando deve ser maior do que o Data de Nascimento
+apps/erpnext/erpnext/config/stock.py +185,"e.g. Kg, Unit, Nos, m","ex: Kg, Unidades, Nº, m"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,O Nº de Referência é obrigatório 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 +108,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 +752,Issue Material,Pedido de Material
-DocType: Material Request Item,For Warehouse,Para Armazém
-DocType: Employee,Offer Date,aanbieding Datum
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Companhia Aérea
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +723,Issue Material,Material Pedido
+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 +683,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 rede.
-DocType: Hub Settings,Access Token,Token de Acesso
-apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +31,No Student Groups created.,Não há grupos de estudantes criado.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +665,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 rede.
+DocType: Hub Settings,Access Token,Símbolo de Acesso
+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,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: Purchase Invoice,Print Language,Imprimir Idioma
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,"Por favor, insira primeiro os Dados de Manutenção"
+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,Incluindo itens para subconjuntos
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1122,Enter value must be positive,Introduzir o valor deve ser positivo
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,All Territories,Todos os Territórios
+DocType: Stock Entry,Including items for sub assemblies,A incluir itens para subconjuntos
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1125,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 +23,Student is already enrolled.,Student 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 do mês.
-DocType: Product Bundle Item,Product Bundle Item,Produto Bundle item
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +233,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 de Pacote de Produtos
 DocType: Sales Partner,Sales Partner Name,Vendas Nome do parceiro
-apps/erpnext/erpnext/hooks.py +96,Request for Quotations,Solicitação de Cotações
-DocType: Payment Reconciliation,Maximum Invoice Amount,Montante Máximo Invoice
-apps/erpnext/erpnext/config/selling.py +23,Customers,clientes
-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,De e datas necessárias
+apps/erpnext/erpnext/hooks.py +104,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 +628,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unidade de medida padrão para a variante &#39;{0}&#39; deve ser o mesmo que no modelo &#39;{1}&#39;
-DocType: Shipping Rule,Calculate Based On,Calcule Baseado em
-DocType: Delivery Note Item,From Warehouse,Do Armazém
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',A Unidade de Medida Padrão para a Variante '{0}' deve ser igual à do modelo '{1}'
+DocType: Shipping Rule,Calculate Based On,Calcular com Base Em
+DocType: Delivery Note Item,From Warehouse,Armazém De
 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,O envio da Cidade
 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 artigo é um Variant de {0} (modelo). Atributos serão copiados a partir do modelo, a menos que 'No Copy' é definido"
-DocType: Account,Purchase User,Compra de Usuário
-DocType: Notification Control,Customize the Notification,Personalize a Notificação
+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 +27,Default Address Template cannot be deleted,Template endereço padrão não pode ser excluído
+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,Limitados a 12 caracteres
-DocType: Journal Entry,Print Heading,Imprimir título
-DocType: Maintenance Schedule,Maintenance Manager,Gerente de Manutenção
+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,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 encomenda deve ser maior ou igual a zero
+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 Última Pedido' devem ser superiores ou igual a zero
 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,Enviar por e-mail
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plants and Machineries,Plantas e maquinarias
+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 Montante do Desconto
-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.,Conta Criança existe para esta conta. Você não pode excluir esta conta.
-apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Valores de Qtd Alvo ou montante alvo são obrigatórios
-apps/erpnext/erpnext/stock/get_item_details.py +485,No default BOM exists for Item {0},No BOM padrão existe para item {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +336,Please select Posting Date first,"Por favor, selecione Data de lançamento primeiro"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Abrindo data deve ser antes da Data de Fechamento
+DocType: 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 montante previsto
+apps/erpnext/erpnext/stock/get_item_details.py +486,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 +326,Please select Posting Date first,"Por favor, selecione primeiro a Data de Postagem"
+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 Fecho
 DocType: Leave Control Panel,Carry Forward,Transportar
-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 livro
-DocType: Department,Days for which Holidays are blocked for this department.,Dias para que feriados são bloqueados para este departamento.
-,Produced,geproduceerd
-DocType: Item,Item Code for Suppliers,Código do item para fornecedores
-DocType: Issue,Raised By (Email),Levantadas por (e-mail)
+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: Mode of Payment,General,Geral
-apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,anexar timbrado
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +338,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 +166,Attach Letterhead,Anexar Timbrado
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +338,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Não pode deduzir quando a categoria é para '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 livros 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},Serial Nos Obrigatório para Serialized item {0}
-apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Pagamentos combinar com Facturas
-DocType: Journal Entry,Bank Entry,Banco Entry
-DocType: Authorization Rule,Applicable To (Designation),Para aplicável (Designação)
-apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,Adicionar ao carrinho de compras
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Agrupar por
-DocType: Guardian,Interests,interesses
+apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Combinar Pagamentos om Faturas
+DocType: Journal Entry,Bank Entry,Entrada Bancária
+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,Interesses
 apps/erpnext/erpnext/config/accounts.py +262,Enable / disable currencies.,Ativar / desativar moedas.
-DocType: Production Planning Tool,Get Material Request,Get Material Pedido
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Postal Expenses,despesas postais
+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 & Lazer
-DocType: Quality Inspection,Item Serial No,No item de série
+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,Presente total
-apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,demonstrações contábeis
+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 +141,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Item Serialized {0} não pode ser atualizado utilizando \
  da Reconciliação"
 DocType: Scheduling Tool,Day,Dia
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,"New Serial Não, não pode ter Warehouse. Warehouse deve ser definida pelo Banco de entrada ou Recibo de compra"
-DocType: Lead,Lead Type,Chumbo Tipo
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,You are not authorized to approve leaves on Block Dates,Você não está autorizado a aprovar Férias em Datas de 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/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 Nº de Série não pode conter o Armazém. O Armazém deve ser definido no Registo de Compra ou no Recibo de Compra
+DocType: Lead,Lead Type,Tipo de Potencial Cliente
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,You are not authorized to approve leaves on Block Dates,Você não está autorizado a aprovar Férias em Datas de Bloco
+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,Padrão de Material Tipo de Solicitação
-DocType: Student Applicant,AP.,AP.
+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,Regra Condições de envio
 DocType: BOM Replace Tool,The new BOM after replacement,O BOM novo após substituição
-apps/erpnext/erpnext/accounts/page/pos/pos.js +639,Point of Sale,Ponto de Venda
-DocType: Payment Entry,Received Amount,recebido Valor
-DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Criar para a quantidade cheia, ignorando quantidade já no fim"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +634,Point of Sale,Ponto de Venda
+DocType: Payment Entry,Received Amount,Montante Recebido
+DocType: Payment Entry,Party Name,Nome partido
+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
-DocType: Production Planning Tool,Production Planning Tool,Ferramenta de Planejamento da Produção
-DocType: Quality Inspection,Report Date,Relatório Data
-DocType: Student,Middle Name,Nome do meio
+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,Cargo
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Gram,Grama
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +373,Quantity to Manufacture must be greater than 0.,Quantidade de Fabricação deve ser maior que 0.
+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 +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 manutenção.
 DocType: Stock Entry,Update Rate and Availability,Taxa de atualização e disponibilidade
-DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Percentagem que estão autorizados a receber ou entregar mais contra a quantidade encomendada. Por exemplo: Se você encomendou 100 unidades. e seu subsídio é de 10%, então você está autorizada a receber 110 unidades."
+DocType: 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 Profile,Customer Group,Grupo de Clientes
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,Expense account is mandatory for item {0},Conta de despesa é obrigatória para item {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,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 site
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date must be on or after today,Próximo depreciação Data deve ser em ou depois de hoje
-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 +145,Please cancel Purchase Invoice {0} first,Por favor cancelar factura de compra {0} primeiro
-DocType: Serial No,AMC Expiry Date,AMC Data de Validade
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,Variação Líquida de Equidade
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +145,Please cancel Purchase Invoice {0} first,Por favor cancele primeiro a Fatura de Compra {0}
+DocType: Serial No,AMC Expiry Date,Data de Validade do CMA
 ,Sales Register,Vendas Registrar
-DocType: Quotation,Quotation Lost Reason,Cotação Perdeu Razão
+DocType: Quotation,Quotation Lost Reason,Motivo de Perda de Cotação
+apps/erpnext/erpnext/utilities/doctype/address/address.py +164,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 Setup&gt; Printing and Branding&gt; modelo de endereç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 +330,Transaction reference no {0} dated {1},de referência da transação não {0} em {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Transaction reference no {0} dated {1},de referência da transação não {0} em {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 +107,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 do Fluxo de Caixa
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Please remove this Invoice {0} from C-Form {1},"Por favor, remova esta Fatura {0} a partir de C-Form {1}"
-DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Por favor seleccione Carry Forward se você também quer incluir equilíbrio ano fiscal anterior deixa para este ano fiscal
-DocType: GL Entry,Against Voucher Type,Tipo contra Vale
+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/accounts/doctype/sales_invoice/sales_invoice.py +434,Please remove this Invoice {0} from C-Form {1},"Por favor, remova esta Fatura {0} do 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 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 Comprovante
 DocType: Item,Attributes,Atributos
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +644,Get Items,Obter itens
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +210,Please enter Write Off Account,"Por favor, indique Escrever Off Conta"
-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 +41,Account {0} does not belongs to company {1},Conta {0} não pertence à empresa {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +623,Get Items,Obter Itens
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +210,Please enter Write Off Account,"Por favor, insira a Conta de Depreciaçã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 +41,Account {0} does not belongs to company {1},A conta {0} não pertence à empresa {1}
+DocType: Student,Guardian Details,guardião Detalhes
 DocType: C-Form,C-Form,C-Form
-apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark Presença de vários funcionários
-DocType: Payment Request,Initiated,Iniciada
-DocType: Production Order,Planned Start Date,Planejado Start Date
-DocType: Serial No,Creation Document Type,Type het maken van documenten
-DocType: Leave Type,Is Encash,É cobrar
-DocType: Purchase Invoice,Mobile No,No móvel
-DocType: Leave Allocation,New Leaves Allocated,Nova Folhas alocado
-apps/erpnext/erpnext/controllers/trends.py +265,Project-wise data is not available for Quotation,Dados do projecto -wise não está disponível para Cotação
-DocType: Project,Expected End Date,Data final esperado
-DocType: Budget Account,Budget Amount,Valor 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 +101,Commercial,comercial
-DocType: Payment Entry,Account Paid To,Conta pago
-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
-apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Todos os produtos ou serviços.
+apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Marcar Presença de vários funcionários
+DocType: Payment Request,Initiated,Iniciado
+DocType: Production Order,Planned Start Date,Data de Início Planeada
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,Customer is required against Receivable account {0},Cliente é necessária contra contas a receber {0}
+DocType: Serial No,Creation Document Type,Tipo de Criação de Documento
+DocType: Leave Type,Is Encash,É Pagamento
+DocType: Purchase Invoice,Mobile No,Nº de Telemóvel
+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,Os dados inteligentes do projecto não estão disponíveis para Cotação
+DocType: Project,Expected End Date,Data de Término Prevista
+DocType: Budget Account,Budget Amount,Valor 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/purchase_invoice/purchase_invoice.py +648,Row {0}# Account must be of type 'Fixed Asset',Row {0} # A conta deve ser do tipo &quot;Ativo Fixo &#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,Regras para calcular valor de frete para uma venda
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +30,Series is mandatory,Série é obrigatório
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,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 +50,Series is mandatory,Série é obrigatório
 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 actividades para o período de Logs
 DocType: Tax Rule,Sales,Vendas
-DocType: Stock Entry Detail,Basic Amount,Montante de base
+DocType: Stock Entry Detail,Basic Amount,Montante de Base
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +165,Warehouse required for stock Item {0},Armazém necessário para stock o item {0}
 DocType: Leave Allocation,Unused leaves,Folhas não utilizadas
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Cr,Cr
-DocType: Tax Rule,Billing State,Estado de faturamento
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +250,Transfer,Transferir
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +187,{0} {1} does not associated with Party Account {2},{0} {1} não associados à conta do partido {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,Fetch exploded BOM (including sub-assemblies),Procure BOM explodidos (incluindo sub-itens)
-DocType: Authorization Rule,Applicable To (Employee),Aplicável a (Empregado)
-apps/erpnext/erpnext/controllers/accounts_controller.py +115,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
-DocType: Journal Entry,Pay To / Recd From,Para pagar / RECD De
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Cr,Cr
+DocType: Tax Rule,Billing State,Estado de Faturamento
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +254,Transfer,Transferir
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +190,{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 +796,Fetch exploded BOM (including sub-assemblies),Trazer LDM expandida (incluindo os subconjuntos)
+DocType: Authorization Rule,Applicable To (Employee),Aplicável Ao/À (Funcionário)
+apps/erpnext/erpnext/controllers/accounts_controller.py +118,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 configuração
 DocType: Payment Reconciliation,To Invoice Date,Para Data da fatura
-DocType: Supplier,Contact HTML,Contato HTML
-,Inactive Customers,Os clientes inativos
-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 é aplicado a regra de preços?
-DocType: Quality Inspection,Delivery Note No,Nota de Entrega Não
-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 marcada, só compra os pedidos de material para matérias-primas finais serão incluídos nos pedidos de material. Caso contrário, pedidos de material para itens pai serão criadas"
+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 é aplicada a Regra de Fixação de Preços?
+DocType: Quality Inspection,Delivery Note No,Nº de Nota de Entrega
+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 para mostrar
-DocType: Company,Retail,Varejo
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +120,Customer {0} does not exist,Cliente {0} não existe
+DocType: Company,Retail,Retalho
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +120,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 +587,Product Bundle,Bundle produto
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Invalid reference {1},Row {0}: Referência inválida {1}
-DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Comprar Impostos e Taxas Template
-DocType: Upload Attendance,Download Template,Baixe Template
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Product Bundle,Pacote de Produtos
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Invalid reference {1},Fila {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-
 DocType: GL Entry,Remarks,Observações
-DocType: Payment Entry,Account Paid From,Conta pago a partir de
-DocType: Purchase Order Item Supplied,Raw Material Item Code,Item Código de matérias-primas
+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,Escreva Off Baseado em
 DocType: Stock Settings,Show Barcode Field,Mostrar código de barras campo
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +742,Send Supplier Emails,Enviar e-mails de fornecedores
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +104,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Salário já processados para período entre {0} e {1}, Deixe período de aplicação não pode estar entre este intervalo de datas."
-apps/erpnext/erpnext/config/stock.py +122,Installation record for a Serial No.,Registro de instalação de um n º de série
-DocType: Guardian Interest,Guardian Interest,guardião Interest
-DocType: Timesheet,Employee Detail,Detalhe empregado
-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
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +708,Send Supplier Emails,Enviar e-mails de fornecedores
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Salário já processados para período entre {0} e {1}, Deixe período de aplicação 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 Nº de Série
+DocType: Guardian Interest,Guardian Interest,Interesse do Responsável
+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"
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Definições para página inicial do site
-DocType: Offer Letter,Awaiting Response,Aguardando resposta
+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 & Reduções
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +77,Account {0} cannot be a Group,Conta {0} não pode ser um grupo
-apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +31,Optional. This setting will be used to filter in various transactions.,Opcional. Está configuração sera usada para filtrar em varias transações.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +107,Negative Valuation Rate is not allowed,Negativa Avaliação Taxa não é permitido
+apps/erpnext/erpnext/controllers/item_variant.py +172,Invalid attribute {0} {1},Atributo inválido {0} {1}
+DocType: Salary Slip,Earning & Deduction,Remunerações & Deduções
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} cannot be a Group,A Conta {0} não pode ser um Grupo
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +31,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 exemplo 2012, 2012-13"
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +39,Provisional Profit / Loss (Credit),Lucro Provisória / Perda (Crédito)
-DocType: Sales Invoice,Return Against Sales Invoice,Retorno Contra Vendas Fatura
-apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,O item 5
-DocType: Serial No,Creation Time,Aanmaaktijd
+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 +39,Provisional Profit / Loss (Credit),Lucro  / Perdas Provisórias (Crédito)
+DocType: Sales Invoice,Return Against Sales Invoice,Devolver Contra Fatura de Vendas
+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,Receita Total
-DocType: Sales Invoice,Product Bundle Help,Produto Bundle Ajuda
-,Monthly Attendance Sheet,Folha de Presença Mensal
-DocType: Production Order Item,Production Order Item,Ordem de produção do item
-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 desfeito
-apps/erpnext/erpnext/controllers/stock_controller.py +176,{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 +626,Get Items from Product Bundle,Obter Itens de Bundle Produto
+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 de 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 Desfeito
+apps/erpnext/erpnext/controllers/stock_controller.py +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: O Centro de Custo é obrigatório para o Item {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +605,Get Items from Product Bundle,Obter Itens de Pacote de Produtos
 DocType: Asset,Straight Line,Linha reta
-DocType: Project User,Project User,Usuário projecto
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} is inactive,Conta {0} está inativa
-DocType: GL Entry,Is Advance,É o avanço
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Aanwezigheid Van Datum en tot op heden opkomst is verplicht
-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.,Fale Não.
-DocType: Bank Reconciliation,Payment Entries,As entradas de pagamento
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,'Profit and Loss' type account {0} not allowed in Opening Entry,"""Lucros e Perdas "" tipo de conta {0} não é permitido na abertura de entrada"
-DocType: Program Enrollment Tool,Get Students From,Obter estudantes de
+DocType: Project User,Project User,Utilizador do Projecto
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} is inactive,A conta {0} está inativa
+DocType: GL Entry,Is Advance,É o Avanço
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,É 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.,Nº de Contacto
+DocType: Bank Reconciliation,Payment Entries,Registos de Pagamento
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +71,'Profit and Loss' type account {0} not allowed in Opening Entry,"O tipo de conta ""Lucros e Perdas"" {0} não é permitido no Registo de Abertura"
+DocType: Program Enrollment Tool,Get Students From,Obter Estudantes De
 DocType: Hub Settings,Seller Country,Vendedor País
-apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,Publicar Itens no site
-DocType: Authorization Rule,Authorization Rule,Regra autorização
+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,Termos e Condições Detalhes
 apps/erpnext/erpnext/templates/generators/item.html +86,Specifications,especificações
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Impostos de vendas e de modelo Encargos
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Vestuário e Acessórios
-apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Número de Ordem
-DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML bandeira / que vai mostrar no topo da lista de produtos.
+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 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
+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 #,Serial #
 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 +558,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Linha # {0}: Ativo {1} não pode ser submetido, já é {2}"
-DocType: Tax Rule,Billing Country,País de faturamento
-DocType: Production Order,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}.,Débito e Crédito é igual para {0} # {1}. A diferença é {2}.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,despesas de representação
+apps/erpnext/erpnext/controllers/accounts_controller.py +561,"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: Production Order,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 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,Fatura de vendas {0} deve ser cancelado antes de cancelar esta ordem de venda
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +60,Age,Idade
-DocType: Sales Invoice Timesheet,Billing Amount,Faturamento Montante
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Quantidade inválido especificado para o item {0} . Quantidade deve ser maior do que 0 .
-apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Os pedidos de licença.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +202,Account with existing transaction can not be deleted,Conta com a transação existente não pode ser excluído
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Legal Expenses,despesas legais
-DocType: Purchase Invoice,Posting Time,Postagem Tempo
-DocType: Sales Order,% Amount Billed,% Valor faturado
-DocType: Production Order,Warehouse for reserving items,Armazém para reservando itens
+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.,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.
+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 de 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 para selecionar uma série antes de salvar. Não haverá nenhum padrão, se você verificar isso."
-apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},Nenhum artigo com Serial Não {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Abertas Notificações
-DocType: Payment Entry,Difference Amount (Company Currency),Diferença Valor (Empresa de moeda)
+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 a guardar. Se selecionar isto não ficará com nenhum padrão.
+apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},Não existe Nenhum Item com o Nº 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 e-mail inválido em &#39;Notificação \ Email Address&#39;
-apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Nova Receita Cliente
+						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,Nova 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,Colapso
-apps/erpnext/erpnext/controllers/accounts_controller.py +634,Account: {0} with currency: {1} can not be selected,Conta: {0} com moeda: {1} não pode ser seleccionado
-DocType: Bank Reconciliation Detail,Cheque Date,Data Cheque
-apps/erpnext/erpnext/accounts/doctype/account/account.py +54,Account {0}: Parent account {1} does not belong to company: {2},Conta {0}: conta principal {1} não pertence à empresa: {2}
+DocType: Maintenance Visit,Breakdown,Decomposição
+apps/erpnext/erpnext/controllers/accounts_controller.py +637,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}: Conta Principal {1} não pertence à empresa: {2}
 DocType: Program Enrollment Tool,Student Applicants,Os candidatos estudante
 apps/erpnext/erpnext/setup/doctype/company/company.js +60,Successfully deleted all transactions related to this company!,Excluído com sucesso todas as transacções relacionadas com esta empresa!
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Como em Data
-DocType: Appraisal,HR,HR
-DocType: Program Enrollment,Enrollment Date,Data de inscrição
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Probation,provação
+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 lectivo
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Payment of salary for the month {0} and year {1},Pagamento de salário para o mês {0} e {1} ano
-DocType: Stock Settings,Auto insert Price List rate if missing,Inserção automática taxa de lista de preços se ausente
+DocType: Program Enrollment Tool,New Academic Year,Novo Ano Letivo
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Payment of salary for the month {0} and year {1},O pagamento de salário para o mês {0} e ano {1}
+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,overgedragen hoeveelheid
-apps/erpnext/erpnext/config/learn.py +11,Navigating,Navegação
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Planning,planejamento
+apps/erpnext/erpnext/config/learn.py +11,Navigating,A Navegar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,Planeamento
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Emitido
 DocType: Project,Total Billing Amount (via Time Logs),Valor Total do faturamento (via Time Logs)
 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,Fornecedor Id
-DocType: Payment Request,Payment Gateway Details,Detalhes do pagamento gateway
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +212,Quantity should be greater than 0,Quantidade deve ser maior do que 0
-DocType: Journal Entry,Cash Entry,Entrada de Caixa
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,nós filho só pode ser criado sob os nós do tipo &#39;Grupo&#39;
-DocType: Academic Year,Academic Year Name,Nome Ano Lectivo
-DocType: Sales Partner,Contact Desc,Contato Descr
+DocType: Payment Request,Payment Gateway Details,Dados de Portal de Pagamento
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +212,Quantity should be greater than 0,Aq uantidade 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 criado 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 folhas como etc, casual doente"
 DocType: Email Digest,Send regular summary reports via Email.,Enviar relatórios periódicos de síntese via e-mail.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Sales invoice submitted sucessfully.,nota fiscal de venda submetido com sucesso.
-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},"Por favor, defina conta padrão em Tipo de Despesas {0}"
+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 +104,Assessment Schedule,Horário avaliação
-DocType: Brand,Item Manager,Item Manager
-DocType: Buying Settings,Default Supplier Type,Tipo de fornecedor padrão
+apps/erpnext/erpnext/hooks.py +113,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 : Item {0} entrou várias vezes
-apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Todos os contactos.
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Note: Item {0} entered multiple times,Nota : O item {0} entrou várias 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 Festa
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +78,Raw material cannot be same as main Item,Matéria-prima não pode ser o mesmo como o principal item
+DocType: GL Entry,Party Type,Tipo de Parte
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +78,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/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/accounts/doctype/payment_request/payment_request.py +166,Payment Entry already exists,Entrada 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.,Modelo de Salário principal .
-DocType: Leave Type,Max Days Leave Allowed,Maxímo de Dias permitidos
+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 +55,Set Tax Rule for shopping cart,Conjunto de regras de imposto por carrinho de compras
 DocType: Purchase Invoice,Taxes and Charges Added,Impostos e Encargos Adicionado
 ,Sales Funnel,Sales Funnel
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +25,Abbreviation is mandatory,Abreviatura é obrigatória
-,Qty to Transfer,Aantal Transfer
-apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Cotações para Leads ou Clientes.
-DocType: Stock Settings,Role Allowed to edit frozen stock,Papel permissão para editar estoque congelado
+apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +25,Abbreviation is mandatory,É obrigatório colocar uma abreviatura
+,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,Item Variante para Alvo Territorial Group-wise
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Customer Groups,Todos os grupos de clientes
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +78,Accumulated Monthly,acumulada mensalmente
-apps/erpnext/erpnext/controllers/accounts_controller.py +595,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} é obrigatório. Talvez recorde Câmbios não é criado para {1} de {2}.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Todos os Grupos de Clientes
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +81,Accumulated Monthly,Acumulada Mensalmente
+apps/erpnext/erpnext/controllers/accounts_controller.py +598,{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.,Template imposto é obrigatório.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Conta {0}: conta principal {1} não existe
-DocType: Purchase Invoice Item,Price List Rate (Company Currency),Preço Taxa List (moeda da empresa)
-DocType: Products Settings,Products Settings,Configurações de produtos
+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
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +188,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Por favor, defina Naming Series para {0} em Configurar&gt; Configurações&gt; Série Naming"
 DocType: Account,Temporary,Temporário
-DocType: Address,Preferred Billing Address,Preferred Endereço de Cobrança
+DocType: Address,Preferred Billing Address,Endereço de Faturamento Preferido
 DocType: Program,Courses,Cursos
-DocType: Monthly Distribution Percentage,Percentage Allocation,Alocação percentual
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Secretary,secretário
-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"
-DocType: Serial No,Distinct unit of an Item,Unidade distinta de um item
+DocType: Monthly Distribution Percentage,Percentage Allocation,Percentagem de Alocaçã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 'Em Palavras', 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,Registros de funcionário devem ser criados por
-DocType: POS Profile,Apply Discount On,Aplicar Discount On
+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,Reqd 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 avaliação
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,Row # {0}: O número de série é obrigatória
-DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Detalhe Imposto item Sábio
-apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,Sigla Institute
-,Item-wise Price List Rate,Item-Lista inteligente de Taxa de Preço
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +859,Supplier Quotation,Cotação fornecedor
-DocType: Quotation,In Words will be visible once you save the Quotation.,Em Palavras será visível quando você salvar a cotação.
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +7,Collect Fees,cobrar taxas
+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 Nº de Série
+DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Dados de Taxa Inteligente
+apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,Abreviação do Instituto
+,Item-wise Price List Rate,Lista Inteligente de Taxa de Preço de Item
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +838,Supplier Quotation,Cotação fornecedor
+DocType: Quotation,In Words will be visible once you save the Quotation.,Em Palavras será visível assim que guardar a Cotação.
+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},Barcode {0} já utilizado em item {1}
+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.,Regras para adicionar os custos de envio .
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,próximos eventos
-DocType: Item,Opening Stock,Estoque de abertura
-apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,É necessário ao cliente
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} é obrigatório para retorno
+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,Receber
 apps/erpnext/erpnext/public/js/setup_wizard.js +195,user@example.com,user@example.com
-DocType: Email Digest,Income / Expense,Receitas / Despesas
-DocType: Employee,Personal Email,E-mail pessoal
+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 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,Código postal
+DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Se for ativado, o sistema irá postar registos contabilísticos automaticamente para o inventário ."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Corretora
+DocType: Address,Postal Code,Código Postal
 DocType: Production Order Operation,"in Minutes
-Updated via 'Time Log'","em Minutos 
- Atualizado via 'Time Log'"
-DocType: Customer,From Lead,De Chumbo
-apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Ordens liberado para produção.
+Updated via 'Time Log'",em Minutos Atualizado através do 'Registo de Tempo'
+DocType: Customer,From Lead,Do Potencial Cliente
+apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Pedidos dispensados 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 +453,POS Profile required to make POS Entry,POS perfil necessário para fazer POS Entry
-DocType: Program Enrollment Tool,Enroll Students,matricular estudantes
-DocType: Hub Settings,Name Token,Nome do token
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +509,POS Profile required to make POS Entry,É necessário colocar o Perfil POS para efetuar um Regito 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 +135,Atleast one warehouse is mandatory,Pelo menos um armazém é obrigatório
-DocType: Serial No,Out of Warranty,Fora de Garantia
+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
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Invoice {1},{0} contra Faturas {1}
+DocType: Production Order,Unstopped,desimpedirão
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Invoice {1},{0} nas Faturas {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 não padronizado conta a receber
-DocType: Journal Entry Account,If Income or Expense,Se a renda ou Despesa
-DocType: Production Order,Required Items,Itens exigidos
+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 os Rendimentos ou Despesas
+DocType: Production Order,Required Items,Itens Obrigatórios
 DocType: Stock Ledger Entry,Stock Value Difference,Banco de Valor Diferença
 apps/erpnext/erpnext/config/learn.py +239,Human Resource,Recursos Humanos
-DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Reconciliação Pagamento
+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,BOM Não
-DocType: Instructor,INS/,INS /
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +133,Journal Entry {0} does not have account {1} or already matched against other voucher,Diário de entrada {0} não tem conta {1} ou já comparado com outro comprovante
-DocType: Item,Moving Average,Média móvel
+DocType: BOM Item,BOM No,Nº da LDM
+DocType: Instructor,INS/,INS/
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +133,Journal Entry {0} does not have account {1} or already matched against other voucher,O Lançamento Contabilístico {0} não tem conta {1} ou já pertence a outro comprovante
+DocType: Item,Moving Average,Média Móvel
 DocType: BOM Replace Tool,The BOM which will be replaced,O BOM que será substituído
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,Equipamentos eletrônicos
+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 +44,Leaves must be allocated in multiples of 0.5,"Folhas devem ser alocados em múltiplos de 0,5"
-DocType: Production Order,Operation Cost,Operação Custo
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"As licenças devem ser alocadas 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 atendimento de um arquivo CSV.
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Qtd em Falta
+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 séries de numeração para Participação em Configurar&gt; Numeração Series"
+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 metas item Group-wise para este Vendas Pessoa.
-DocType: Stock Settings,Freeze Stocks Older Than [Days],Congeladores Stocks mais velhos do que [ dias ]
-apps/erpnext/erpnext/controllers/accounts_controller.py +528,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Linha # {0}: Ativo é obrigatória para ativo fixo compra / venda
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","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: Stock Settings,Freeze Stocks Older Than [Days],Suspender Stocks Mais Antigos Que [Dias]
+apps/erpnext/erpnext/controllers/accounts_controller.py +531,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Linha #{0}: O Ativo é obrigatória 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 o valor padrão é zero (em branco). Um número maior significa que ele 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 ""Licenças"" para os dias de bloco."
+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
+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 final
+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 de orçamento
-DocType: Employee,Internal Work History,História Trabalho Interno
-DocType: Depreciation Schedule,Accumulated Depreciation Amount,Acumulado montante de depreciação
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
-DocType: Maintenance Visit,Customer Feedback,Comentário do cliente
-DocType: Account,Expense,despesa
-DocType: Sales Invoice,Exhibition,Exposição
-apps/erpnext/erpnext/utilities/doctype/address/address.py +77,"Company is mandatory, as it is your company address","Empresa é obrigatório, como é o seu endereço de empresa"
-DocType: Item Attribute,From Range,De Faixa
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +81,Syntax error in formula or condition: {0},Erro de sintaxe na fórmula ou condição: {0}
-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 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 +77,"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 +92,Syntax error in formula or condition: {0},Erro de sintaxe na fórmula ou condição: {0}
+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 Ordem para pós processamento.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Para não aplicar regra de preços em uma transação particular, todas as regras de preços aplicáveis devem ser desativados."
 DocType: Company,Domain,Domínio
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Jobs,Jobs
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,Empregos
 ,Sales Order Trends,Pedido de Vendas Trends
-DocType: Employee,Held On,Realizada em
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Bem de Produção
+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,Encerramento do Exercício Social Data
-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 numero de Ficha, se agrupado por Ficha"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +763,Make Supplier Quotation,Maak Leverancier Offerte
-DocType: Quality Inspection,Incoming,Entrada
-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","Adicionar usuários à sua organização, além de si mesmo"
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,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 +42,Casual Leave,Casual Deixar
-DocType: Batch,Batch ID,Lote ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,Note: {0},Nota : {0}
-,Delivery Note Trends,Nota de entrega Trends
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +103,This Week's Summary,Resumo da Semana
-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
-DocType: Student Group Creation Tool,Get Courses,obter Cursos
-DocType: GL Entry,Party,Festa
-DocType: Sales Order,Delivery Date,Data de entrega
-DocType: Opportunity,Opportunity Date,Data oportunidade
-DocType: Purchase Receipt,Return Against Purchase Receipt,Retorno Contra Recibo de compra
-DocType: Request for Quotation Item,Request for Quotation Item,Solicitação de Cotação do Item
+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 Nº de Comprovante, se estiver agrupado por Comprovante"
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,Make Supplier Quotation,Efetuar Cotação de Fornecedor
+DocType: Quality Inspection,Incoming,Recebido
+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/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No {1} does not match with {2} {3},Linha # {0}: O Nº 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 +350,Note: {0},Nota: {0}
+,Delivery Note Trends,Evolução da Nota de Entrega
+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 Contra 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 Bill
-DocType: Material Request,% Ordered,% Requesitado
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Piecework,trabalho por peça
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,Méd. Taxa de Compra
-DocType: Task,Actual Time (in Hours),Tempo real (em horas)
+DocType: Material Request,% Ordered,% Pedido
+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),Horas Efetivas
 DocType: Employee,History In Company,Historial na Empresa
 apps/erpnext/erpnext/config/learn.py +112,Newsletters,Newsletters
 DocType: Address,Shipping,Expedição
 DocType: Stock Ledger Entry,Stock Ledger Entry,Entrada da Razão
-DocType: Department,Leave Block List,Lista de Bloqueios para Férias
+DocType: Department,Leave Block List,Lista de Bloqueio de Licenças
 DocType: Customer,Tax ID,CPF
-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
+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 Nºs 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
 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.,{0} unidades de {1} necessários em {2} para concluir esta transação.
+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 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 +162,Black,Preto
-DocType: BOM Explosion Item,BOM Explosion Item,BOM item explosão
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Black,Preto
+DocType: BOM Explosion Item,BOM Explosion Item,Explosã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 borda superior
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Retorna
-DocType: Production Order Operation,Production Order Operation,Ordem de produção Operation
-DocType: Pricing Rule,Disable,incapacitar
-DocType: Project Task,Pending Review,Revisão pendente
-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: Cheque Print Template,Distance from top edge,Distância da margem superior
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,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á é {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 +69,Customer Id,Id Cliente
-apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Mark Ausente
+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
 DocType: Journal Entry Account,Exchange Rate,Taxa de Câmbio
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Sales Order {0} is not submitted,Ordem de Vendas {0} não é submetido
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +527,Sales Order {0} is not submitted,Ordem de Vendas {0} não é submetido
 DocType: Homepage,Tag Line,Linha de tag
-DocType: Fee Component,Fee Component,Componente Fee
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +857,Add items from,Adicionar itens de
+DocType: Fee Component,Fee Component,Componente de Propina
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +836,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}: conta Parent {1} não pertençe à empresa {2}
 DocType: Cheque Print Template,Regular,Regular
-DocType: BOM,Last Purchase Rate,Compra de última
-DocType: Account,Asset,ativos
+DocType: BOM,Last Purchase Rate,Taxa de Última Compra
+DocType: Account,Asset,Ativo
 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 não pode existir por item {0} já que tem variantes
 ,Sales Person-wise Transaction Summary,Resumo da transação Pessoa-wise vendas
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +60,Cost Center is required for 'Profit and Loss' account {0}. Please set up a default Cost Center for the Company.,"Centro de custo é necessário para conta de &quot;Lucros e Perdas&quot; {0}. Por favor, criar um centro de custo padrão para a Companhia."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,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 ERPNext Hub
-DocType: Monthly Distribution,Monthly Distribution Percentages,Percentagens distribuição mensal
+apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Inscreva-se em ERPNext Hub
+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 Batch
-DocType: Delivery Note,% of materials delivered against this Delivery Note,% dos materiais entregues contra esta Nota de Entrega
-DocType: Project,Customer Details,Detalhes do cliente
+DocType: Delivery Note,% of materials delivered against this Delivery Note,% de materiais entregues nesta Nota de Entrega
+DocType: Project,Customer Details,Dados do Cliente
 DocType: Employee,Reports to,Relatórios para
-DocType: SMS Settings,Enter url parameter for receiver nos,Digite o parâmetro url para nn receptor
-DocType: Payment Entry,Paid Amount,Valor pago
+DocType: SMS Settings,Enter url parameter for receiver nos,Insira o parâmetro 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 +710,Online,Conectados
-,Available Stock for Packing Items,Stock disponível para items embalados
-DocType: Item Variant,Item Variant,Item Variant
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,"A definição desse modelo de endereço como padrão, pois não há outro padrão"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +692,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,"A definição desse modelo de endereço como padrão, pois não há outro padrão"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Saldo já em débito, não tem permissão para definir 'saldo deve ser' como 'crédito'"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Quality Management,Gestão da Qualidade
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,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,Empregado história de trabalho externo
-DocType: Tax Rule,Purchase,Comprar
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Balance Aantal
-DocType: Item Group,Parent Item Group,Grupo item pai
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,Gestão da Qualidade
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,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 na qual a moeda que fornecedor é convertido para a moeda da empresa de base
-apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: conflitos Timings com linha {1}
-DocType: Opportunity,Next Contact,Próximo Contato
+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 de timing na linha {1}
+DocType: Opportunity,Next Contact,Próximo Contacto
 apps/erpnext/erpnext/config/accounts.py +272,Setup Gateway accounts.,Configuração contas Gateway.
-DocType: Employee,Employment Type,Tipo de emprego
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Imobilizado
+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 Exchange Perda / Ganho
-,Cash Flow,Fluxo de caixa
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +88,Application period cannot be across two alocation records,Período de aplicação não pode ser através de dois registros de alocação
-DocType: Item Group,Default Expense Account,Conta Despesa padrão
+,Cash Flow,Fluxo de Caixa
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +88,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 Despesa Padrão
 DocType: Student,Student Email ID,Student E-mail ID
-DocType: Employee,Notice (days),Notice ( dagen )
+DocType: Employee,Notice (days),Aviso (dias)
 DocType: Tax Rule,Sales Tax Template,Template Imposto sobre Vendas
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1520,Select items to save the invoice,Selecione os itens para salvar a fatura
-DocType: Employee,Encashment Date,Data cobrança
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1544,Select items to save the invoice,Selecione os itens para salvar a fatura
+DocType: Employee,Encashment Date,Data de Pagamento
 DocType: Account,Stock Adjustment,Banco de Ajuste
-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,Planejado Custo Operacional
-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,Balanço banco Declaração de acordo com General Ledger
-DocType: Job Applicant,Applicant Name,Nome do requerente
-DocType: Authorization Rule,Customer / Item Name,Cliente / Nome do item
+apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Existe 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, está em 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"".
 
 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","Agregue o grupo de **itens** em outro **item**. Isto é útil se você está empacotando um certo numero de **itens** em um unico pacote e voce mantem o stock dos **itens* do pacote e não o **item** agregado. O **item** do pacote terá ""é o item Stocks"" como ""Não"" e ""é o item Vendas"" como ""Sim"". Por exemplo: Se estiver a vender Laptops e Mochilas separadas e um preço especial se o cliente comprar os dois, então o Laptop + Mochila serão um novo item de Conjunto de Produtos.
-Nota: BOM = Faturação de Materiais"
+Note: BOM = Bill of Materials","Agrega um grupo de **Itens** noutro **Item**. Isto é útil se estiver a agrupar certos **Itens** num pacote e manter o stock dos **Itens ** embalados e não o **Item** agregado. O artigo. O pacote **Item** terá ""Item em Stock"" como ""Não"" e ""É Item de Vendas"" como ""Sim"". 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},Não Serial é obrigatória para 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 de / para variar"
+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,Sob AMC
-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.,As configurações padrão para transação de vendas.
-DocType: BOM Replace Tool,Current BOM,BOM atual
-apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Adicionar número de série
+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 comprovante 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: Production Order,Warehouses,Armazéns
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationary,Imprimir e estacionária
-apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} activo não pode ser transferida
+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,aquisitivo
+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.,Uma conta para o armazém ( Perpetual Inventory ) será criada tendo como base esta conta.
+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.,Warehouse não pode ser excluído como existe entrada de material de contabilidade para este armazém.
 DocType: Company,Distribution,Distribuição
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +8,Amount Paid,Valor pago
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Project Manager,Gerente de Projetos
-,Quoted Item Comparison,Citado item de comparação
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Dispatch,expedição
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max desconto permitido para o item: {0} é {1}%
-apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,valor patrimonial líquido 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,Row # {0}: Não é permitido mudar de fornecedor como ordem 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: Sales Invoice,Supplier Reference,Referência fornecedor
-apps/erpnext/erpnext/accounts/page/pos/pos.js +844,"Master data syncing, it might take some time","Os dados mestre de sincronização, pode demorar algum tempo"
-DocType: Item,Material Issue,Emissão de material
+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,Gestor de Projetos
+,Quoted Item Comparison,Comparação de Cotação de Item
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,Envio
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,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,De Pontuaçã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 o pedido de compra já existe
+DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,A função para a qual é permitido enviar transações que excedam os limites de crédito estabelecidos.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +832,"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,Vendedor Descrição
 DocType: Employee Education,Qualification,Qualificação
-DocType: Item Price,Item Price,Item Preço
+DocType: Item Price,Item Price,Preço de 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
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,bestelde
+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 +70,Opening Accumulated Depreciation must be less than equal to {0},Abrindo depreciação acumulada deve ser menor ou igual a {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +70,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 Armazém
 DocType: Naming Series,Select Transaction,Selecione Transação
-apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,"Por favor, indique Aprovando Papel ou aprovar Usuário"
+apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,"Por favor, insira a Função Aprovadora ou o Utilizador Aprovador"
 DocType: Journal Entry,Write Off Entry,Escrever Off Entry
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +83,Error in formula or condition,Erro na fórmula ou condição
-DocType: BOM,Rate Of Materials Based On,Taxa de materiais com base
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,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,ondersteuning Analtyics
 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},Empresa está em falta nos armazéns {0}
+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},Para data deve ser dentro do exercício social. Assumindo Para Date = {0}
-DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Aqui você pode manter a altura, peso, alergias, etc preocupações médica"
-DocType: Leave Block List,Applies to Company,Aplica-se a Empresa
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +197,Cannot cancel because submitted Stock Entry {0} exists,Não pode cancelar por causa da entrada submetido {0} existe
+DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Aqui pode manter 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 +198,Cannot cancel because submitted Stock Entry {0} exists,Não pode cancelar porque o Registo de Stock {0} existe
 DocType: Purchase Invoice,In Words,Em Palavras
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,Today is {0}'s birthday!,Hoje é {0} 's aniversário!
-DocType: Production Planning Tool,Material Request For Warehouse,Pedido de material para Armazém
-DocType: Sales Order Item,For Production,Para Produção
-DocType: Payment Request,payment_url,payment_url
+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 Task
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,O ano financeiro tem início a
-DocType: Material Request,MREQ-,MREQ-
-,Asset Depreciations and Balances,Ativos Depreciações e Saldos
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +319,Amount {0} {1} transferred from {2} to {3},Quantidade {0} {1} transferido de {2} a {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 +432,Transaction not allowed against stopped Production Order {0},Transação não é permitido contra parou Ordem de produção {0}
+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 +322,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 +437,Transaction not allowed against stopped Production Order {0},Transação não é permitido contra parou Ordem de produção {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Om dit fiscale jaar ingesteld als standaard , klik op ' Als standaard instellen '"
-apps/erpnext/erpnext/projects/doctype/project/project.py +143,Join,Junte-se
+apps/erpnext/erpnext/projects/doctype/project/project.py +143,Join,Inscrição
 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 +652,Item variant {0} exists with same attributes,Variante item {0} existe com os mesmos atributos
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,A Variante do Item {0} já existe com mesmos atributos
+DocType: Leave Application,LAP/,COLO/
 DocType: Salary Slip,Salary Slip,Folha de salário
-DocType: Pricing Rule,Margin Rate or Amount,Margem de velocidade ou quantidade
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,' O campo Para Data ' é necessária
-DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Gerar deslizamentos de embalagem para os pacotes a serem entregues. Usado para notificar número do pacote, o conteúdo do pacote e seu peso."
+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 embalagem para os 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,Vendas item Ordem
-DocType: Salary Slip,Payment Days,Datas de Pagamento
-DocType: Customer,Dormant,Dormente
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +212,Warehouses with child nodes cannot be converted to ledger,Armazéns com nós filho não pode ser convertido para ledger
-DocType: BOM,Manage cost of operations,Gerenciar custo das operações
+DocType: Salary Slip,Payment Days,Dias de Pagamento
+DocType: Customer,Dormant,Inativo
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +215,Warehouses with child nodes cannot be converted to ledger,Armazéns com nós filho não pode ser convertido para ledger
+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 estão &quot;Enviado&quot;, um e-mail pop-up aberta automaticamente para enviar um e-mail para o associado &quot;Contato&quot;, em que a transação, com a transação como um anexo. O usuário pode ou não enviar o e-mail."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Definições Globais
-DocType: Employee Education,Employee Education,Educação empregado
-apps/erpnext/erpnext/public/js/controllers/transaction.js +866,It is needed to fetch Item Details.,É preciso buscar Número detalhes.
+DocType: Employee Education,Employee Education,Educação do Funcionário
+apps/erpnext/erpnext/public/js/controllers/transaction.js +857,It is needed to fetch Item Details.,É preciso trazer os Dados do Item.
 DocType: Salary Slip,Net Pay,Pagamento Líquido
 DocType: Account,Account,Conta
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serial Não {0} já foi recebido
-,Requested Items To Be Transferred,Itens solicitados para ser transferido
-DocType: Purchase Invoice,Recurring Id,Id recorrente
+,Requested Items To Be Transferred,Itens Solicitados A Serem Transferidos
+DocType: Purchase Invoice,Recurring Id,ID Recorrente
 DocType: Customer,Sales Team Details,Vendas Team Detalhes
 DocType: Expense Claim,Total Claimed Amount,Montante reclamado total
-apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Oportunidades potenciais para a venda.
+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 +178,Invalid {0},Inválido {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Sick Leave,doente Deixar
-DocType: Email Digest,Email Digest,E-mail Digest
-DocType: Delivery Note,Billing Address Name,Faturamento Nome Endereço
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Lojas de Departamento
-DocType: Warehouse,PIN,PINO
-DocType: Sales Invoice,Base Change Amount (Company Currency),Base de dados de Mudança Montante (Empresa de moeda)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +313,No accounting entries for the following warehouses,Nenhuma entrada de contabilidade para os seguintes armazéns
-apps/erpnext/erpnext/projects/doctype/project/project.js +102,Save the document first.,Salve o documento pela primeira vez.
-DocType: Account,Chargeable,Imputável
-DocType: Company,Change Abbreviation,Mudança abreviação
-DocType: Expense Claim Detail,Expense Date,Data despesa
-DocType: Item,Max Discount (%),Max Desconto (%)
-apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Last Order Montante
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,Sick Leave,doente Deixar
+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 +314,No accounting entries for the following warehouses,Não foi encontrado nenhum registo contabilístico 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,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: 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 ir nos registros."
-DocType: BOM,Manufacturing User,Manufacturing Usuário
-DocType: Purchase Invoice,Raw Materials Supplied,Matérias-primas em actualização
-DocType: Purchase Invoice,Recurring Print Format,Recorrente Formato de Impressão
+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,serie
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,Expected Delivery Date cannot be before Purchase Order Date,Previsão de Entrega A data não pode ser antes de Ordem de Compra Data
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Por favor, defina Naming Series para {0} em Configurar&gt; Configurações&gt; Série Naming"
-DocType: Appraisal,Appraisal Template,Modelo de avaliação
+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 +87,Business Development Manager,Gerente de Desenvolvimento de Negócios
-DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Finalidade visita de manutenção
-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,Razão
+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,Veja Leads
-DocType: Program Enrollment Tool,New Program,novo Programa
-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 e-mail deve ser único, já existe para {0}"
-,Itemwise Recommended Reorder Level,Itemwise Recomendado nível de reposição
+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 id 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 de Item Recomendado Inteligente
 DocType: Salary Detail,Salary Detail,Detalhe salário
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +940,Please select {0} first,Por favor seleccione {0} primeiro
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +749,Batch {0} of Item {1} has expired.,Lote {0} de {1} item expirou.
-DocType: Sales Invoice,Commission,comissão
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +953,Please select {0} first,"Por favor, seleccione primeiro {0}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +757,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 tempo para fabricação.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,Subtotal
 DocType: Address Template,"<h4>Default Template</h4>
@@ -3676,520 +3722,532 @@
  {% 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,Quantidade padrão
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +92,Warehouse not found in the system,Warehouse não foi encontrado no sistema
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +106,This Month's Summary,Resumo deste mês
+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,Warehouse 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 antigo do que ` deve ser menor que %d dias .
-DocType: Tax Rule,Purchase Tax Template,Comprar Template Tax
-,Project wise Stock Tracking,Projeto sábios Stock Rastreamento
-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 Atual (na origem / destino)
-DocType: Item Customer Detail,Ref Code,Ref Código
-apps/erpnext/erpnext/config/hr.py +12,Employee records.,Registros de funcionários.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Please set Next Depreciation Date,"Por favor, defina Próximo depreciação Data"
-DocType: Payment Gateway,Payment Gateway,Gateway de pagamento
-DocType: HR Settings,Payroll Settings,payroll -instellingen
-apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Combinar não vinculados faturas e pagamentos.
-apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Faça a encomenda
-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/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 Inteligente de 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 +87,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 Ligados.
+apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Efetuar Pedido
+DocType: Email Digest,New Purchase Orders,Novas ordens de compra
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,A fonte não pode ter um centro de custos principal
+apps/erpnext/erpnext/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, você não pode alterar o valor de {0}"
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Brand...,Selecione o cadastro ...
-apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,A depreciação acumulada como na
-DocType: Sales Invoice,C-Form Applicable,C-Form Aplicável
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,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/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 a C-Form
+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/accounts/doctype/account/account.py +170,Warehouse is mandatory,Armazém é obrigatória
-DocType: Supplier,Address and Contacts,Endereços e contatos
+DocType: Supplier,Address and Contacts,Endereços e Contactos
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM Detalhe Conversão
-apps/erpnext/erpnext/public/js/setup_wizard.js +167,Keep it web friendly 900px (w) by 100px (h),Mantenha- web 900px amigável (w) por 100px ( h )
-DocType: Program,Program Abbreviation,Sigla do programa
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,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/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 +368,Production Order cannot be raised against a Item Template,O Pedido de Produção não pode ser efetudo 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.,Atribuír 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 apagada 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 atribuir-se como conta principal
+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.","Show &quot;Em Stock&quot; ou &quot;não em estoque&quot;, baseado em stock disponível neste armazém."
-apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),Lista de Materiais (BOM)
-DocType: Item,Average time taken by the supplier to deliver,Tempo médio necessário por parte do fornecedor para entregar
-DocType: Assessment Result,Assessment Result,Resultado de avaliação
+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 do esperado
-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,Ex:. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +27,Transaction currency must be same as Payment Gateway currency,Moeda de transação deve ser o mesmo da moeda gateway de pagamento
+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: 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
 DocType: Payment Entry,Receive,Receber
-DocType: Maintenance Visit,Fully Completed,Totalmente concluída
-apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% concluído
+apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,citaçõ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 Operacionais
-DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Ação se Acumulada orçamento mensal excedido
+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 +432,Currency for {0} must be {1},Moeda para {0} deve ser {1}
-DocType: Asset,Disposal Date,eliminação Data
-DocType: Employee Leave Approver,Employee Leave Approver,Empregado Leave Approver
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Uma entrada de reabastecimento já existe para este armazém {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +79,"Cannot declare as lost, because Quotation has been made.","Não pode declarer um perda, porque uma Quotação foi feita."
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Compra Mestre Gerente
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +429,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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +35,Course is mandatory in row {0},Curso é obrigatório na linha {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +435,Currency for {0} must be {1},A moeda para {0} deve ser {1}
+DocType: Asset,Disposal Date,Data de Eliminação
+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 +79,"Cannot declare as lost, because Quotation has been made.","Não pode declarar como perdido, porque foi efetuada uma Cotação."
+DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Gestor definidor de Compra
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +434,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 Data de Início e 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,Até a data não pode ser antes da data inicial
 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 Cheque
+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,Plano de Centros de Custo
-,Requested Items To Be Ordered,Itens solicitados devem ser pedidos
-DocType: Price List,Price List Name,Nome da lista de preços
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +181,Totals,Totais
+,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/accounts/report/general_ledger/general_ledger.py +183,Totals,Totais
 DocType: BOM,Manufacturing,Fabrico
-,Ordered Items To Be Delivered,Itens ordenados a serem entregues
-DocType: Account,Income,renda
-DocType: Industry Type,Industry Type,Tipo indústria
+,Ordered Items To Be Delivered,Itens Pedidos a Serem Entregues
+DocType: Account,Income,Rendimento
+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 +113,Warning: Leave application contains following block dates,Atenção: Deixe o aplicativo contém seguintes datas bloco
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +120,Warning: Leave application contains following block dates,Atenção: Deixe o aplicativo contém seguintes datas bloco
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Sales Invoice {0} has already been submitted,Fatura de vendas {0} já foi apresentado
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Ano Fiscal {0} não existe
+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),Quantidade (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.,{0} unidades de {1} necessários em {2} de {3} {4} para {5} para concluir esta transação.
-apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,feild obrigatória - Obter estudantes de
+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 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,Aluna
-apps/erpnext/erpnext/config/hr.py +181,Organization unit (department) master.,Organização unidade (departamento) mestre.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,"Por favor, indique nn móveis 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á-
-apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,Point-of-Sale Perfil
-apps/erpnext/erpnext/accounts/page/pos/pos.js +793,All records are synced.,Todos os registros são sincronizados.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Atualize as Configurações relacionadas com o SMS
+apps/erpnext/erpnext/config/hr.py +181,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 nºs 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,Enquanto se aguarda Quotations
+apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,Perfil de Ponto-de-Venda
+apps/erpnext/erpnext/accounts/page/pos/pos.js +781,All records are synced.,Estão sincronizados todos os registos .
+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,Custo Nome Centro
-DocType: Employee,B+,B +
-DocType: HR Settings,Max working hours against Timesheet,Max horas trabalhando contra Quadro de Horários
+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,Mensagem maior do que 160 caracteres vai ser dividido em mesage múltipla
-DocType: Purchase Receipt Item,Received and Accepted,Recebeu e aceitou
+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,N º de Série Vencimento Contrato de Serviço
 DocType: Item,Unit of Measure Conversion,Unidade de Conversão de Medida
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +272,You cannot credit and debit same account at the same time,Você não pode creditar e debitar na mesma conta ao mesmo tempo
-DocType: Naming Series,Help HTML,Ajuda HTML
+DocType: Naming Series,Help HTML,Ajuda de HTML
 DocType: Student Group Creation Tool,Student Group Creation Tool,Estudante do grupo ferramenta de criação
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Peso 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 que este endereço pertence.
+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 +49,Cannot set as Lost as Sales Order is made.,Não pode ser Perdidas pois a Ordem de Venda está feita.
-DocType: Student Applicant,Mother's Name,Nome da mãe
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +49,Cannot set as Lost as Sales Order is made.,Não pode definir como Perdido pois o Pedido já foi efetuado.
 DocType: Request for Quotation Item,Supplier Part No,Fornecedor da peça
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +348,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',não pode deduzir quando categoria é para &#39;Avaliação&#39; ou &#39;Vaulation e Total&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Received From,Recebido de
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +348,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 +329,Received From,Recebido De
 DocType: Lead,Converted,Convertido
-DocType: Item,Has Serial No,Não tem número de série
+DocType: Item,Has Serial No,Tem Nº 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}: 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 +93,Row {0}: Hours value must be greater than zero.,Fila {0}: Horas valor deve ser maior que zero.
+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 +117,Row {0}: Hours value must be greater than zero.,Fila {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,Site Imagem {0} anexada ao Item {1} não pode ser encontrado
-DocType: Issue,Content Type,Tipo de conteúdo
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,computador
-DocType: Item,List this Item in multiple groups on the website.,Lista este item em vários grupos no site.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +172,{0} {1} does not exist,{0} {1} não existe
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,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 +72,Item: {0} does not exist in the system,Item: {0} não existe no sistema
+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 +175,{0} {1} does not exist,{0} {1} não existe
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,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 +72,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,Você não está autorizado a por o valor suspenso.
-DocType: Payment Reconciliation,Get Unreconciled Entries,Obter Entradas não reconciliadas
-DocType: Payment Reconciliation,From Invoice Date,A partir de Data de Fatura
-apps/erpnext/erpnext/accounts/party.py +257,Billing currency must be equal to either default comapany's currency or party account currency,moeda de faturamento deve ser igual a moeda ou a conta de moedas quer padrão do comapany
+DocType: Payment Reconciliation,Get Unreconciled Entries,Obter Entradas Não Conciliadas
+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 padra da conta da outra parte
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,O que faz a Empresa?
 DocType: Delivery Note,To Warehouse,Para Armazém
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Todos 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 número de série ' não pode ser 'Sim' para o item sem stock
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Atendimento não pode ser marcado para datas futuras
-DocType: Pricing Rule,Pricing Rule Help,Regra Preços Ajuda
-DocType: Purchase Taxes and Charges,Account Head,Conta principal
+apps/erpnext/erpnext/stock/doctype/item/item.py +415,'Has Serial No' can not be 'Yes' for non-stock item,'Tem Nº de Série' não pode ser 'Sim' para o item sem stock
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,A presença não pode ser registada em datas futuras
+DocType: Pricing Rule,Pricing Rule Help,Ajuda de Regra Fixação de Preços
+DocType: Purchase Taxes and Charges,Account Head,Livro de Conta
 apps/erpnext/erpnext/config/stock.py +163,Update additional costs to calculate landed cost of items,Atualize custos adicionais para calcular o custo desembarcado de itens
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Electrical,elétrico
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Electrical,Elétrico
 DocType: Stock Entry,Total Value Difference (Out - In),Diferença Valor Total (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,Row {0}: Exchange Rate is mandatory,Row {0}: Taxa de Câmbio é obrigatória
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,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},ID do usuário não definido para Employee {0}
-DocType: Stock Entry,Default Source Warehouse,Armazém da fonte padrão
-DocType: Item,Customer Code,Código Cliente
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +210,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,Dagen sinds vorige Bestel
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +292,Debit To account must be a Balance Sheet account,Débito em conta deve ser uma conta de Balanço
-DocType: Buying Settings,Naming Series,Nomeando Series
-DocType: Leave Block List,Leave Block List Name,Deixe o nome Lista de Bloqueios
+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 +210,Birthday Reminder for {0},Lembrete de Aniversário: {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 +324,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 Atribuição de Nome
+DocType: Leave Block List,Leave Block List Name,Nome de Lista de Bloqueio de Licenças
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Stock activo
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},Você realmente quer submeter todos os Recibos de Salário do mês {0} e ano {1}
-DocType: Timesheet,Production Detail,Detalhe de produção
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},Deseja realmente Enviar todas as Folhas de Vencimento do mês {0} e ano {1}
+DocType: Timesheet,Production Detail,Dados de Produção
 DocType: Target Detail,Target Qty,Qtde alvo
 DocType: Shopping Cart Settings,Checkout Settings,Configurações de Saída
-DocType: Attendance,Present,Apresentar
-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: Attendance,Present,Presente
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,A Nota de Entrega {0} não deve ser enviada
 DocType: Notification Control,Sales Invoice Message,Vendas Mensagem Fatura
-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 +301,Salary Slip of employee {0} already created for time sheet {1},Salário Slip of empregado {0} já criado para folha de tempo {1}
-DocType: Sales Order Item,Ordered Qty,bestelde Aantal
-apps/erpnext/erpnext/stock/doctype/item/item.py +673,Item {0} is disabled,Item {0} está desativada
+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 +313,Salary Slip of employee {0} already created for time sheet {1},Salário Slip of empregado {0} já criado para folha de tempo {1}
+DocType: Sales Order Item,Ordered Qty,Qtd Pedida
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} is disabled,O Item {0} está desativado
 DocType: Stock Settings,Stock Frozen Upto,Fotografia congelada Upto
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +838,BOM does not contain any stock item,O BOM não contém qualquer item 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/projects.py +18,Project activity / task.,Atividade de projeto / tarefa.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +809,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.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Gerar Folhas de Vencimento
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Compra deve ser verificada, se for caso disso for selecionado como {0}"
-apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Desconto deve ser inferior a 100
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Last purchase rate not found,Última taxa de compra não foi encontrado
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","A compra deve ser verificada, se for Aplicável Para é selecionada 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,A Taxa de Última Compra não foi encontrada
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Escrever Off Montante (Companhia de moeda)
-apps/erpnext/erpnext/stock/doctype/item/item.py +485,Row #{0}: Please set reorder quantity,"Row # {0}: Por favor, defina a quantidade de reabastecimento"
-DocType: Fees,Program Enrollment,inscrição no programa
-DocType: Landed Cost Voucher,Landed Cost Voucher,Landed Comprovante Custo
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +62,Please set {0},Defina {0}
-DocType: Purchase Invoice,Repeat on Day of Month,Repita no Dia do Mês
-DocType: Employee,Health Details,Detalhes de saúde
-DocType: Offer Letter,Offer Letter Terms,Oferecer Termos letra
+DocType: Sales Invoice Timesheet,Billing Hours,faturamento Horas
+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,Comprovante de Custo de Entrega
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +62,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,Alocar 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 os recibos de salário para os critérios acima selecionados
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} Itens sincronizados
-DocType: Sales Order,Partly Delivered,Entregue em parte
-DocType: Sales Invoice,Existing Customer,Cliente existente
-DocType: Email Digest,Receivables,Recebíveis
-DocType: Customer,Additional information regarding the customer.,Informações adicionais sobre o cliente.
+DocType: Sales Order,Partly Delivered,Parcialmente Entregue
+DocType: Email Digest,Receivables,A Receber
+DocType: Lead Source,Lead Source,Chumbo Fonte
+DocType: Customer,Additional information regarding the customer.,Informações adicionais acerca do cliente.
 DocType: Quality Inspection Reading,Reading 5,Leitura 5
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +38,Campaign Name is required,Nome da campanha é necessária
-DocType: Maintenance Visit,Maintenance Date,Data de manutenção
-DocType: Purchase Invoice Item,Rejected Serial No,Rejeitado Não Serial
+DocType: Maintenance Visit,Maintenance Date,Data de Manutenção
+DocType: Purchase Invoice Item,Rejected Serial No,Nº 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,Data de início do Ano ou data de término está em 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."
+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 Nº 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 Lista de Presença
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +129,BOM and Manufacturing Quantity are required,BOM e Manufatura Quantidade são obrigatórios
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Faixa Envelhecimento 2
-DocType: SG Creation Tool Course,Max Strength,força Max
-DocType: Bank Reconciliation Detail,Amount,Quantidade
-apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM substituído
+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 de Idade 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,Sales Analytics
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +113,Available {0},Disponível {0}
-DocType: Manufacturing Settings,Manufacturing Settings,Configurações de Fabricação
+DocType: Manufacturing Settings,Manufacturing Settings,Definições de Fabrico
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Configurando Email
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +96,Please enter default currency in Company Master,"Por favor, indique moeda padrão in Company Mestre"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +96,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,Detalhe Entrada stock
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +100,Daily Reminders,Lembretes diários
-DocType: Products Settings,Home Page is Products,Página Principal é produtos
-,Asset Depreciation Ledger,Activo Ledger Depreciação
+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},Conflitos regra fiscal com {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +23,New Account Name,Novo Nome de Conta
-DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Matérias-primas fornecidas Custo
+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 Module
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Customer Service,atendimento ao cliente
+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,Detalhe Cliente item
-apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Oferta candidato a Job.
-DocType: Notification Control,Prompt for Email on Submission of,Solicitar-mail mediante a apresentação da
+DocType: Item Customer Detail,Item Customer Detail,Dados de Cliente do Item
+apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Oferta a candidato a Emprego.
+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 +83,Total allocated leaves are more than days in the period,Total de folhas alocados são mais do que dias no 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,Item {0} deve ser um item de stock
-DocType: Manufacturing Settings,Default Work In Progress Warehouse,Padrão trabalho no armazém Progresso
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1570,Total nos of serial no is not equal to quantity.,Total de Nºs de número de série não é igual à quantidade.
-apps/erpnext/erpnext/config/accounts.py +252,Default settings for accounting transactions.,As configurações padrão para as transações de contabilidade.
-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?,Erro: Não é um ID válido?
+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 +1594,Total nos of serial no is not equal to quantity.,Total de Nºs de número 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
-DocType: Sales Order,Printing Details,Imprimir detalhes
+DocType: Account,Equity,Equidade
+DocType: Sales Order,Printing Details,Imprimir Dados
 DocType: Task,Closing Date,Data de Encerramento
-DocType: Sales Order Item,Produced Quantity,Quantidade produzida
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Engineer,engenheiro
+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,Moeda Valor Total
 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 +370,Item Code required at Row No {0},Código do item exigido no Row Não {0}
-DocType: Sales Partner,Partner Type,Tipo de parceiro
-DocType: Purchase Taxes and Charges,Actual,Atual
-DocType: Authorization Rule,Customerwise Discount,Desconto Customerwise
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +398,Item Code required at Row No {0},É necessário o Código do Item na Linha Nº {0}
+DocType: Sales Partner,Partner Type,Tipo de Parceiro
+DocType: Purchase Taxes and Charges,Actual,Real
+DocType: Authorization Rule,Customerwise Discount,Desconto de Cliente
 apps/erpnext/erpnext/config/projects.py +35,Timesheet for tasks.,Quadro de horários para as tarefas.
-DocType: Purchase Invoice,Against Expense Account,Contra a conta de despesas
-DocType: Production Order,Production Order,Ordem de Produção
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Installation Note {0} has already been submitted,Instalação Nota {0} já foi apresentado
-DocType: Bank Reconciliation,Get Payment Entries,Obter Entradas de pagamento
-DocType: Quotation Item,Against Docname,Contra Docname
-DocType: SMS Center,All Employee (Active),Todos os Empregados (Ativo)
+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 Docname
+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á gerado automaticamente
 DocType: BOM,Raw Material Cost,Custo de Matéria-Prima
-DocType: Item Reorder,Re-Order Level,Re-order Nível
-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 qty 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 +55,Part-time,Part-time
-DocType: Employee,Applicable Holiday List,Lista de férias aplicável
+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 +56,Series Updated,Série Atualizado
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Tipo de relatório é obrigatória
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +57,Series Updated,Série Atualizado
+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,Serienummer Series
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Armazém é obrigatória para stock o item {0} na linha {1}
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Varejo e Atacado
-DocType: Issue,First Responded On,Primeiro respondeu em
-DocType: Website Item Group,Cross Listing of Item in multiple groups,Cruz de Listagem do item em vários grupos
-apps/erpnext/erpnext/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}
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +87,Clearance Date updated,Apuramento data de atualização
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Retalho e Grosso
+DocType: Issue,First Responded On,Primeiro 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,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},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 +87,Clearance Date updated,Apuramento Data de Liquidação
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Reconciliados com sucesso
-DocType: Request for Quotation Supplier,Download PDF,Download PDF
-DocType: Production Order,Planned End Date,Planejado Data de Término
+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: Tax Rule,Validity,Validade
 DocType: Request for Quotation,Supplier Detail,Detalhe fornecedor
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Valor faturado
-DocType: Attendance,Attendance,Lista de Presença
+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 controlada, a lista deverá ser adicionado a cada departamento onde tem de ser aplicado."
+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,Origem e Destino Warehouse não pode ser igual
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +513,Posting date and posting time is mandatory,Data e postagem Posting tempo é obrigatório
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,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.,Em Palavras será visível quando você salvar a Ordem de Compra.
-DocType: Period Closing Voucher,Period Closing Voucher,Comprovante de Encerramento período
-apps/erpnext/erpnext/config/selling.py +67,Price List master.,Lista de Preços Principal.
-DocType: Task,Review Date,Comente Data
+,Item Prices,Preços de Itens
+DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,Em Palavras será visível assim que guardar o Pedido de Compra.
+DocType: Period Closing Voucher,Period Closing Voucher,Comprovante 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,Em Líquida Total
+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},Valor para o atributo {0} deve estar dentro do intervalo de {1} a {2} nos incrementos de {3} para o Item {4}
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +158,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,"'Notificação Endereços de e-mail"" não especificado 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,Moeda não pode ser alterada depois de fazer entradas usando alguma outra moeda
-DocType: Company,Round Off Account,Termine Conta
+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,A 'Notificação de Endereços de Email' não foi especificada 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: 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,consultor
-DocType: Customer Group,Parent Customer Group,Grupo de Clientes pai
-DocType: Purchase Invoice,Contact Email,Contato E-mail
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Consultoria
+DocType: Customer Group,Parent Customer Group,Grupo de Clientes Principal
+DocType: Purchase Invoice,Contact Email,Email de Contacto
 DocType: Appraisal Goal,Score Earned,Pontuação Agregado
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Notice Period,Período de aviso prévio
-DocType: Asset Category,Asset Category Name,Ativo Categoria Nome
+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 territorio de raíz e não pode ser editado
-apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +4,New Sales Person Name,Nome New Vendas Pessoa
-DocType: Packing Slip,Gross Weight UOM,UOM Peso Bruto
-DocType: Email Digest,Receivables / Payables,Contas a receber / contas a pagar
-DocType: Delivery Note Item,Against Sales Invoice,Contra a nota fiscal de venda
-DocType: Bin,Reserved Qty for Production,Reservados Qtde de Produção
-DocType: Asset,Frequency of Depreciation (Months),Frequência de depreciação (Meses)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +469,Credit Account,Conta de crédito
-DocType: Landed Cost Item,Landed Cost Item,Item de custo Landed
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +55,Show zero values,Mostrar valores de zero
-DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Quantidade do item obtido após a fabricação / reembalagem de determinadas quantidades de matérias-primas
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +4,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 +459,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,Setup um site simples para a minha organização
-DocType: Payment Reconciliation,Receivable / Payable Account,Receber Conta / Payable
-DocType: Delivery Note Item,Against Sales Order Item,Contra a Ordem de venda do item
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Please specify Attribute Value for attribute {0},"Por favor, especifique Atributo Valor para o atributo {0}"
-DocType: Item,Default Warehouse,Armazém padrão
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +39,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
-apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,A depreciação Data
+DocType: Payment Reconciliation,Receivable / Payable Account,Conta A Receber / A Pagar
+DocType: Delivery Note Item,Against Sales Order Item,No Item de Pedido de Venda
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},"Por favor, especifique um Valor de Atributo para o atributo {0}"
+DocType: Item,Default Warehouse,Armazém Padrão
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +39,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,Fiscale categorie kan ' Valuation ' of ' Valuation en Total ' als alle items zijn niet-voorraadartikelen niet
 DocType: Issue,Support Team,Equipe de Apoio
 DocType: Appraisal,Total Score (Out of 5),Pontuação total (em 5)
-DocType: Fee Structure,FS.,FS.
-DocType: Batch,Batch,Fornada
-apps/erpnext/erpnext/stock/doctype/item/item.js +21,Balance,Equilíbrio
+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 estar
-DocType: Issue,ISS-,ISS
+DocType: Issue,ISS-,PROB-
 DocType: Project,Total Expense Claim (via Expense Claims),Reivindicação de Despesa Total (via relatórios de despesas)
 DocType: Journal Entry,Debit Note,Nota de Débito
-DocType: Stock Entry,As per Stock UOM,Como por Banco UOM
-apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Não expirado
+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,Padrão Acabou Mercadorias Armazém
+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,Vendas Pessoa
-DocType: Sales Invoice,Cold Calling,Cold Calling
 DocType: SMS Parameter,SMS Parameter,Parâmetro SMS
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,Orçamento e Centro de Custo
 DocType: Maintenance Schedule Item,Half Yearly,Semestrais
-DocType: Lead,Blog Subscriber,Assinante Blog
-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, numero total de dias de trabalho as férias serão incluídas, e isso vai reduzir o valor de salário por dia"
+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 Nº Total de Dias de Úteis incluirá as férias, e isto vai reduzir o valor do Salário Por Dia"
 DocType: Purchase Invoice,Total Advance,Antecipação total
-apps/erpnext/erpnext/config/hr.py +253,Processing Payroll,Processamento de folha de pagamento
+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 Data Prazo Final não pode ser anterior à data Term Iniciar. Corrija as datas e tente novamente.
+DocType: Stock Reconciliation Item,Quantity Difference,Diferença Quantidade
+apps/erpnext/erpnext/config/hr.py +253,Processing Payroll,A Processar Salários
 DocType: Opportunity Item,Basic Rate,Taxa Básica
-DocType: GL Entry,Credit Amount,Quantidade de crédito
+DocType: GL Entry,Credit Amount,Montante de Crédito
 DocType: Cheque Print Template,Signatory Position,Posição signatário
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Instellen als Lost
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,O pagamento Recibo Nota
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,Set as Lost,Instellen als Lost
+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 +5,This is based on transactions against this Customer. See timeline below for details,Isto é baseado em operações contra este cliente. Veja cronograma abaixo para detalhes
-DocType: Supplier,Credit Days Based On,Dias 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},Row {0}: Montante afectado {1} deve ser menor ou igual a quantidade de entrada de pagamento {2}
+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},O montante alocado {1} da linha {0}: deve ser menor ou igual ao montante de Entrada de Pagamento {2}
 DocType: Tax Rule,Tax Rule,Regra imposto
-DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Manter o mesmo ritmo durante todo o ciclo de vendas
-DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planejar logs de tempo fora do horário de trabalho estação de trabalho.
+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 registo de tempo fora do Horário de Trabalho do Posto de Trabalho.
 DocType: Student,Nationality,Nacionalidade
-,Items To Be Requested,Items worden aangevraagd
-DocType: Purchase Order,Get Last Purchase Rate,Obter Última Tarifa de Compra
-DocType: Company,Company Info,Informações da empresa
-apps/erpnext/erpnext/accounts/page/pos/pos.js +941,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ções de Recursos ( Ativos )
+,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 +930,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 +5,This is based on the attendance of this Employee,Esta baseia-se no atendimento deste Employee
-DocType: Sales Invoice,Frequency,Freqüência
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +463,Debit Account,Conta de debito
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,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 Company)
-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: Purchase Common,Purchase Common,Compre 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: 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, atualize."
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Pare de usuários de fazer aplicações deixam nos dias seguintes.
-apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,compra Valor
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +210,Supplier Quotation {0} created,Cotação fornecedor {0} criado
-apps/erpnext/erpnext/accounts/report/financial_statements.py +90,End Year cannot be before Start Year,End ano não pode ser antes do início do ano
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Employee Benefits,Benefícios a Empregados
-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},Embalado quantidade deve ser igual a quantidade de item {0} na linha {1}
-DocType: Production Order,Manufactured Qty,Qtde fabricados
+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 +208,Supplier Quotation {0} created,Cotação fornecedor {0} criado
+apps/erpnext/erpnext/accounts/report/financial_statements.py +90,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 embalado 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 +228,Please set a default Holiday List for Employee {0} or Company {1},"Por favor, defina um padrão Lista férias para Employee {0} ou Empresa {1}"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +232,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) 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 levantou a Clientes.
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id Projeto
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +499,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/config/accounts.py +12,Bills raised to Customers.,Contas levantada 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 +500,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Linha Nº {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: Account,Parent Account,Conta Principal
 DocType: Quality Inspection Reading,Reading 3,Leitura 3
-,Hub,Cubo
+,Hub,Plataforma
 DocType: GL Entry,Voucher Type,Tipo de Vale
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1007,Price List not found or disabled,Preço de tabela não encontrado ou deficientes
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1008,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 +244,Employee relieved on {0} must be set as 'Left',Empregado aliviada em {0} deve ser definido como 'Saído'
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +256,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.",Selecionando &quot;Sim&quot; vai dar uma identidade única para cada entidade deste item que pode ser visto no mestre Número de ordem.
-DocType: Guardian,Guardian,Guardião
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Appraisal {0} criado para Employee {1} no intervalo de datas
-DocType: Employee,Education,educação
-DocType: Selling Settings,Campaign Naming By,Campanha de nomeação
-DocType: Employee,Current Address Is,Huidige adres wordt
-apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,"Optional. Sets company's default currency, if not specified.","Opcional. Define moeda padrão da empresa, se não for especificado."
+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,A Avaliação {0} foi criada 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 +38,"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.,Lançamentos contábeis em diários
-DocType: Delivery Note Item,Available Qty at From Warehouse,Quantidade disponível no Armazém A partir de
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +259,Please select Employee Record first.,"Por favor, selecione Employee primeiro registro."
-DocType: POS Profile,Account for Change Amount,Conta para a Mudança Montante
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +190,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Party / conta não coincide com {1} / {2} em {3} {4}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +235,Please enter Expense Account,Por favor insira Conta Despesa
+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 +266,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 +190,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 +963,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Linha # {0}: Referência Tipo de Documento deve ser um dos Purchase Order, factura de compra ou do Diário"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +976,"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 é 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,Aankoop / Productie Details
-DocType: Assessment,Assessment Group,Grupo de avaliação
-apps/erpnext/erpnext/config/stock.py +309,Batch Inventory,Inventário Batch
-DocType: Employee,Contract End Date,Data final do contrato
+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,Datade Término do Contrato
 DocType: Sales Order,Track this Sales Order against any Project,Acompanhar este Ordem de vendas contra 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,Puxe pedidos de vendas pendentes (de entregar) com base nos critérios acima
+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: Attendance,Half Day,Meio Dia
-DocType: Pricing Rule,Min Qty,min Qty
+DocType: Pricing Rule,Min Qty,Qtd Mín.
 DocType: Asset Movement,Transaction Date,Data Transação
-DocType: Production Plan Item,Planned Qty,Qtde planejada
+DocType: Production Plan Item,Planned Qty,Qtd Planeada
 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 +174,For Quantity (Manufactured Qty) is mandatory,Para Quantidade (fabricado Qtde) é obrigatório
-DocType: Stock Entry,Default Target Warehouse,Armazém alvo padrão
-DocType: Purchase Invoice,Net Total (Company Currency),Total Líquido (Moeda Company)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Party Tipo e partido só é aplicável contra a receber / a pagar contas
-DocType: Notification Control,Purchase Receipt Message,Mensagem comprar Recebimento
-DocType: Production Order,Actual Start Date,Atual Data de início
-DocType: Sales Order,% of materials delivered against this Sales Order,% dos materiais entregues contra esta Ordem de Vendas
-apps/erpnext/erpnext/config/stock.py +12,Record item movement.,Gravar o movimento item.
-DocType: Hub Settings,Hub Settings,Configurações Hub
-DocType: Project,Gross Margin %,Margem Bruta%
+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 final do ano não pode ser anterior à Data Ano Iniciar. Corrija as datas e tente novamente.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +78,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: 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 Vendas
+apps/erpnext/erpnext/config/stock.py +12,Record item movement.,Registar o movimento de item.
+DocType: Hub Settings,Hub Settings,Definições de Hub
+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}.,"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,É existente de ativos
-,Monthly Salary Register,Folha Salarial Mensal
-DocType: Warranty Claim,If different than customer address,Se diferente do endereço do cliente
-DocType: BOM Operation,BOM Operation,Operação BOM
-DocType: Purchase Taxes and Charges,On Previous Row Amount,Quantidade em linha anterior
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +226,Transfer Asset,transferência de ativos
-DocType: POS Profile,POS Profile,POS Perfil
+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 registos 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 Vencimento 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 +227,Transfer Asset,transferência de ativos
+DocType: POS Profile,POS Profile,Perfil POS
 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 +129,"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/stock/get_item_details.py +129,"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,Salário líquido não pode ser negativo
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,O pagamento líquido não pode ser negativo
 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 item
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +765,Material to Supplier,Material a Fornecedor
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +189,Excise Invoice,Excise Invoice
-DocType: Expense Claim,Employees Email Id,Funcionários ID e-mail
-DocType: Employee Attendance Tool,Marked Attendance,Presença marcante
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +136,Current Liabilities,passivo circulante
+DocType: Purchase Order,Advance Paid,Adiantamento Pago
+DocType: Item,Item Tax,Taxa do Item
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,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 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 +278,Send mass SMS to your contacts,Enviar SMS em massa para seus contatos
-DocType: Program,Program Name,Nome do programa
-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,Qtde real é obrigatória
+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 criado.
 DocType: Scheduling Tool,Scheduling Tool,Scheduling Ferramenta
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +136,Credit Card,cartão de crédito
-DocType: BOM,Item to be manufactured or repacked,Item a ser fabricados ou reembalados
-apps/erpnext/erpnext/config/stock.py +174,Default settings for stock transactions.,As configurações padrão para transações com ações .
-DocType: Purchase Invoice,Next Date,Data próxima
-DocType: Employee Education,Major/Optional Subjects,Assuntos Principais / Opcional
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Digite 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 como o nome da família e ocupação do cônjuge, pai e filhos"
+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 com 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: 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,Data de termo End
 DocType: Hub Settings,Seller Name,Vendedor Nome
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Impostos e taxas Deduzido (Moeda Company)
-DocType: Item Group,General Settings,Configurações Gerais
-apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +19,From Currency and To Currency cannot be same,De Moeda e Para Moeda não pode ser o mesmo
+DocType: Item Group,General Settings,Definições Gerais
+apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +19,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,Você deve salvar o formulário antes de continuar
-DocType: Item Attribute,Numeric Values,Os valores numéricos
-apps/erpnext/erpnext/public/js/setup_wizard.js +172,Attach Logo,anexar Logo
+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,Crie Variante
-apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Bloquear deixar aplicações por departamento.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +115,"Payment Type must be one of Receive, Pay and Internal Transfer","Tipo de pagamento deve ser um dos Receber, Pay e Transferência Interna"
-apps/erpnext/erpnext/config/selling.py +169,Analytics,analítica
-apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Carrinho está vazio
-DocType: Production Order,Actual Operating Cost,Custo operacional real
-DocType: Payment Entry,Cheque/Reference No,Cheque / Nº de referência
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,Root não pode ser editado .
-DocType: Manufacturing Settings,Allow Production on Holidays,Permitir a produção aos feriados
-DocType: Sales Order,Customer's Purchase Order Date,Do Cliente Ordem de Compra Data
+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 licenças por departamento.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +118,"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álises
+apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,O Carrinho está Vazio
+DocType: Production Order,Actual Operating Cost,Custo Operacional Efetivo
+DocType: Payment Entry,Cheque/Reference No,Nº 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 do 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,Peso Detalhes do pacote
-DocType: Payment Gateway Account,Payment Gateway Account,Pagamento conta de gateway
-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: 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, redirecionar o utilizador 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 ficheiro csv"
 DocType: Purchase Order,To Receive and Bill,Para receber e Bill
-apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,produtos em destaque
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Designer,estilista
+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,Detalhes da entrega
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +469,Cost Center is required in row {0} in Taxes table for type {1},Centro de Custo é necessária na linha {0} no Imposto de mesa para o tipo {1}
-DocType: Program,Program Code,Código do programa
-,Item-wise Purchase Register,Item-wise Compra Register
-DocType: Batch,Expiry Date,Data de validade
+DocType: Serial No,Delivery Details,Dados da Entrega
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +472,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
+,Item-wise Purchase Register,Registo de Compra de Item Inteligente
+DocType: Batch,Expiry Date,Data de Validade
 ,Supplier Addresses and Contacts,Contactos e Endereços de Fornecedores
-,accounts-browser,contas-browser
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +334,Please select Category first,Selecteer Categorie eerst
-apps/erpnext/erpnext/config/projects.py +13,Project master.,Projeto mestre.
+,accounts-browser,navegador-de-contas
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +334,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 +174,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Para permitir que o excesso de faturamento ou sobre-ordenação, atualizar &quot;Provisão&quot; em estoque Configurações ou o item."
-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.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +417, (Half Day),(Meio Dia)
-DocType: Supplier,Credit Days,Dias de crédito
-DocType: Leave Type,Is Carry Forward,É Carry Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +740,Get Items from BOM,Obter itens da Lista de Material
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Levar dias Tempo
-apps/erpnext/erpnext/controllers/accounts_controller.py +549,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Linha # {0}: Data de lançamento deve ser o mesmo da data de compra {1} de 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, indique pedidos de vendas na tabela acima"
+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 +425, (Half Day),(Meio Dia)
+DocType: Supplier,Credit Days,Dias de Crédito
+DocType: Leave Type,Is Carry Forward,É para Continuar
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +711,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 +552,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 da
 apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,Transferir um ativo de um entreposto para outro
-apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,Bill of Materials
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Party Tipo e partido é necessário para receber / pagar conta {1}
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Ref Data
-DocType: Employee,Reason for Leaving,Motivo da saída
+apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,Lista de Materiais
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Linha {0}: O Tipo de Parte e a Parte são necessários 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: Expense Claim Detail,Sanctioned Amount,Quantidade sancionada
-DocType: GL Entry,Is Opening,Está abrindo
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +169,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,Conta {0} não existe
+DocType: GL Entry,Is Opening,Está a Abrir
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +169,Row {0}: Debit entry can not be linked with a {1},Linha {0}: Um registo de dédito não pode ser ligado 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 site e outras publicações.
diff --git a/erpnext/translations/ro.csv b/erpnext/translations/ro.csv
index ac349ab..d5cb7b1 100644
--- a/erpnext/translations/ro.csv
+++ b/erpnext/translations/ro.csv
@@ -18,11 +18,10 @@
 DocType: Sales Partner,Dealer,Comerciant
 DocType: Employee,Rented,Închiriate
 DocType: Purchase Order,PO-,po-
-apps/erpnext/erpnext/accounts/report/financial_statements.py +19,Start Year {0} not found.,Anul de început {0} nu a fost găsit.
 DocType: POS Profile,Applicable for User,Aplicabil pentru utilizator
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +191,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Oprit comandă de producție nu poate fi anulat, acesta unstop întâi pentru a anula"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +197,Do you really want to scrap this asset?,Chiar vrei să resturi acest activ?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +17,Select Default Supplier,Selectați Furnizor implicit
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +192,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Oprit comandă de producție nu poate fi anulat, acesta unstop întâi pentru a anula"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +198,Do you really want to scrap this asset?,Chiar vrei să resturi acest activ?
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Selectați Furnizor implicit
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Moneda este necesară pentru lista de prețuri {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Va fi calculat în cadrul tranzacției.
 DocType: Address,County,județ
@@ -42,45 +41,44 @@
 DocType: Sales Invoice,Customer Name,Nume client
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +126,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 +180,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 +183,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 +148,Series Updated Successfully,Seria Actualizat cu succes
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +149,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
-DocType: Quality Inspection Reading,Parameter,Parametru
 apps/erpnext/erpnext/projects/doctype/project/project.py +54,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 +239,New Leave Application,Noua cerere de concediu
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Bank Draft,Ciorna bancară
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,New Leave Application,Noua cerere de concediu
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,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
 DocType: Academic Term,Academic Term,termen academic
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +13,Material,Material
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Quantity,Cantitate
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +511,Accounts table cannot be blank.,Conturile de masă nu poate fi necompletat.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +616,Quantity,Cantitate
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +512,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)
 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/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 +142,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
-DocType: Purchase Invoice,Monthly,Lunar
 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/buying/doctype/purchase_order/purchase_order.js +771,Invoice,Factură
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +750,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 +198,Row {0}: {1} {2} does not match with {3},Rând {0}: {1} {2} nu se potrivește cu {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,
+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 +127,Please select Price List,Vă rugăm să selectați lista de prețuri
@@ -111,8 +109,8 @@
 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 +589,Get items from,Obține elemente din
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +382,Stock cannot be updated against Delivery Note {0},Stock nu poate fi actualizat împotriva livrare Nota {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Obține elemente din
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,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
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Băcănie
@@ -121,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 +156,Salary Structure Missing,Structura de salarizare lipsă
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,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
@@ -129,10 +127,11 @@
 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 +156,Credit limit has been crossed for customer {0} {1}/{2},Limita de credit a fost trecut de client {0} {1} / {2}
-apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Este activ fix&quot; nu poate fi debifată, așa cum există înregistrare activ împotriva elementului"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +189,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"
 DocType: Tax Rule,Tax Type,Tipul de impozitare
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +144,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}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,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/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
@@ -142,18 +141,17 @@
 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 +165,Opening,Deschidere
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,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/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Clienți&gt; Clienți Grup&gt; Teritoriul
 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.
 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
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Company first,Vă rugăm să selectați Company primul
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,Please select Company first,Vă rugăm să selectați Company primul
 DocType: Employee Education,Under Graduate,Sub Absolvent
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Țintă pe
 DocType: BOM,Total Cost,Cost total
@@ -163,7 +161,7 @@
 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
 DocType: Purchase Invoice Item,Is Fixed Asset,Este activ fix
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Available qty is {0}, you need {1}","Numele tau este {0}, ai nevoie de {1}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +225,"Available qty is {0}, you need {1}","Numele tau este {0}, ai nevoie de {1}"
 DocType: Expense Claim Detail,Claim Amount,Suma Cerere
 DocType: Employee,Mr,Mr
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Furnizor Tip / Furnizor
@@ -172,26 +170,27 @@
 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: Assessment Result,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 +171,Annual Salary,Salariu anual
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Annual Salary,Salariu anual
 DocType: Period Closing Voucher,Closing Fiscal Year,Închiderea Anului Fiscal
-apps/erpnext/erpnext/accounts/party.py +349,{0} {1} is frozen,{0} {1} este congelat
+apps/erpnext/erpnext/accounts/party.py +349,{0} {1} is frozen,{0} {1} este blocat
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Cheltuieli stoc
-apps/erpnext/erpnext/accounts/report/financial_statements.py +22,End Year {0} not found.,End An {0} nu a fost găsit.
 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}
 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 +130,At least one mode of payment is required for POS invoice.,Cel puțin un mod de plată este necesară pentru POS factură.
 DocType: Products Settings,Show Products as a List,Afișare produse ca o listă
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Descărcați șablonul, umple de date corespunzătoare și atașați fișierul modificat.
  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 +451,Item {0} is not active or end of life has been reached,Articolul {0} nu este activ sau sfarsitul ciclului sau de viata a fost atins
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +456,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/controllers/accounts_controller.py +614,"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/controllers/accounts_controller.py +617,"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 +166,Settings for HR Module,Setările pentru modul HR
 DocType: SMS Center,SMS Center,SMS Center
 DocType: Sales Invoice,Change Amount,Sumă schimbare
@@ -203,13 +202,13 @@
 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 +147,Execution,Executie
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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/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}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,Cost Center {0} does not belong to Company {1},Centrul de Cost {0} nu aparține Companiei {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +100,Cost Center {0} does not belong to Company {1},Centrul de Cost {0} nu aparține Companiei {1}
 DocType: Customer,Individual,Individual
 DocType: Interest,Academics User,cadre universitare utilizator
 DocType: Cheque Print Template,Amount In Figure,Suma în Figura
@@ -225,30 +224,32 @@
 DocType: Production Planning Tool,Sales Orders,Comenzi de vânzări
 DocType: Purchase Taxes and Charges,Valuation,Evaluare
 ,Purchase Order Trends,Comandă de aprovizionare Tendințe
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,The request for quotation can be accessed by clicking on the following link,Cererea de ofertă poate fi accesată făcând clic pe link-ul de mai jos
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,Alocaţi concedii anuale.
 DocType: SG Creation Tool Course,SG Creation Tool Course,SG Creare curs Unealtă
 DocType: Student Group Creation Tool,Leave blank if you wish to fetch all courses for selected academic term,Lasă un gol dacă doriți să preluați toate cursurile pentru termen academice selectate
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,Insufficient Stock,stoc insuficient
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227,Insufficient Stock,stoc insuficient
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Planificarea Capacitatii Dezactivați și Time Tracking
+DocType: Email Digest,New Sales Orders,Noi comenzi de vânzări
 DocType: Bank Reconciliation,Bank Account,Cont bancar
 DocType: Leave Type,Allow Negative Balance,Permiteţi sold negativ
 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/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} does not belong to Company {1},Contul {0} nu aparține Companiei {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +86,Account {0} does not belong to Company {1},Contul {0} nu aparține Companiei {1}
 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}
 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
 DocType: Course Schedule,Instructor Name,Nume instructor
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,For Warehouse is required before Submit,Pentru Depozit este necesar înainte de Inregistrare
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,For Warehouse is required before Submit,Pentru Depozit este necesar înainte de Inregistrare
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Primit la
 DocType: Sales Partner,Reseller,Reseller
 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 +1436,"LocalStorage is full , did not save","LocalStorage este plin, nu a salvat"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1460,"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}
@@ -261,18 +262,19 @@
 apps/erpnext/erpnext/templates/generators/item.html +78,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 +5,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/leave_application/leave_application.py +206,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/leave_application/leave_application.py +213,Only the selected Leave Approver can submit this Leave Application,Numai selectat concediu aprobator poate înainta această aplicație Leave
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Alinarea Data trebuie să fie mai mare decât Data aderării
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Leaves per Year,Frunze pe an
+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 +103,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}
+DocType: Email Digest,Profit & Loss,Pierderea profitului
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,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 +435,Leave Blocked,Concediu Blocat
-apps/erpnext/erpnext/stock/doctype/item/item.py +669,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 +443,Leave Blocked,Concediu Blocat
+apps/erpnext/erpnext/stock/doctype/item/item.py +671,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 +83,Annual,Anual
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +86,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
@@ -280,20 +282,22 @@
 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ă
 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 +91,Software Developer,Software Developer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Comanda minima Cantitate
 DocType: Pricing Rule,Supplier Type,Furnizor Tip
 DocType: Scheduling Tool,Course Start Date,Data începerii cursului
 DocType: Item,Publish in Hub,Publica in Hub
+DocType: Student Admission,Student Admission,Admiterea studenților
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is cancelled,Articolul {0} este anulat
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Material Request,Cerere de material
+apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} is cancelled,Articolul {0} este anulat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +823,Material Request,Cerere de material
 DocType: Bank Reconciliation,Update Clearance Date,Actualizare Clearance Data
 apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +28,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 +328,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Postul {0} nu a fost găsit în &quot;Materii prime furnizate&quot; masă în Comandă {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +333,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Postul {0} nu a fost găsit în &quot;Materii prime furnizate&quot; masă în Comandă {1}
 DocType: Employee,Relation,Relație
 DocType: Shipping Rule,Worldwide Shipping,Expediere
+DocType: Student Guardian,Mother,Mamă
 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
@@ -309,20 +313,21 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +130,Please select Charge Type first,Vă rugăm să selectați tipul de taxă în primul rând
 DocType: Student Group Student,Student Group Student,Student Group Student
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Ultimul
+DocType: Email Digest,New Quotations,Noi Citatele
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Primul Aprobatorul Lăsați în lista va fi setat ca implicit concediu aprobator
 DocType: Tax Rule,Shipping County,County transport maritim
 apps/erpnext/erpnext/config/desktop.py +158,Learn,A invata
 DocType: Asset,Next Depreciation Date,Amortizarea următor Data
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Activitatea de Cost per angajat
 DocType: Accounts Settings,Settings for Accounts,Setări pentru conturi
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +626,Supplier Invoice No exists in Purchase Invoice {0},Furnizor Factura nr există în factură Purchase {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +629,Supplier Invoice No exists in Purchase Invoice {0},Furnizor Factura nr există în factură Purchase {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Gestioneaza Ramificatiile Persoanei responsabila cu Vanzarile
 DocType: Job Applicant,Cover Letter,Scrisoare de intenție
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Cecuri restante și pentru a șterge Depozite
 DocType: Item,Synced With Hub,Sincronizat cu Hub
 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 +348,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 +86,Circular Reference Error,Eroare de referință Circular
@@ -334,15 +339,16 @@
 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 +806,Delivery Note,Nota de Livrare
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +800,Delivery Note,Nota de Livrare
 apps/erpnext/erpnext/config/learn.py +87,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 +233,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/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/setup/doctype/email_digest/email_digest.py +104,Summary for this week and pending activities,Rezumat pentru această săptămână și a activităților în curs
+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ă"
 DocType: Employee,Company Email,E-mail Companie
@@ -354,28 +360,29 @@
 apps/erpnext/erpnext/config/hr.py +186,"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
-apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Rând # {0}: Achiziția Factura nu poate fi făcută împotriva unui activ existent {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +554,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 +54,{0} already allocated for Employee {1} for period {2} to {3},{0} deja alocate pentru Angajat {1} pentru perioada {2} {3} pentru a
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +812,Select Item,Selectați articol
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +791,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 \
 					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 +142,Purchase Invoice {0} is already submitted,Factura de cumpărare {0} este deja depusă
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Lot nr trebuie să fie aceeași ca și {1} {2}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +143,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.
 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 +342,Please see attachment,Vă rugăm să consultați atașament
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,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 +19,Setup Already Complete!!,Setup deja complet!
 ,Finished Goods,Produse Finite
 DocType: Delivery Note,Instructions,Instrucţiuni
 DocType: Quality Inspection,Inspected By,Inspectat de
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Furnizor&gt; Tip Furnizor
 DocType: Maintenance Visit,Maintenance Type,Tip Mentenanta
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serial No {0} nu aparține de livrare Nota {1}
 apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Adăugarea de elemente
@@ -389,29 +396,29 @@
 DocType: Currency Exchange,Currency Exchange,Schimb valutar
 DocType: Purchase Invoice Item,Item Name,Denumire Articol
 DocType: Authorization Rule,Approving User  (above authorized value),Aprobarea utilizator (mai mare decât valoarea autorizată)
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Balanța de credit
+DocType: Email Digest,Credit Balance,Balanța de credit
 DocType: Employee,Widowed,Văduvit
 DocType: Request for Quotation,Request for Quotation,Cerere de ofertă
 DocType: Salary Slip Timesheet,Working Hours,Ore de lucru
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Schimbați secventa de numar de inceput / curent a unei serii existente.
 apps/erpnext/erpnext/accounts/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 +736,Purchase Return,Înapoi cumpărare
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +715,Purchase Return,Înapoi cumpărare
 ,Purchase Register,Cumpărare Inregistrare
 DocType: 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 +202,{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 +209,{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 +143,Reason for losing,Motiv pentru a pierde
-apps/erpnext/erpnext/accounts/utils.py +239,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 +163,Reason for losing,Motiv pentru a pierde
+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ă
 DocType: Announcement,Receiver,Receptor
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation este închis la următoarele date ca pe lista de vacanta: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Oportunitati
 DocType: Employee,Single,Celibatar
 DocType: Account,Cost of Goods Sold,Cost Bunuri Vândute
 DocType: Purchase Invoice,Yearly,Anual
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +225,Please enter Cost Center,Va rugam sa introduceti Cost Center
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,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
@@ -424,26 +431,26 @@
 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
 DocType: Account,Is Group,Is Group
+DocType: Email Digest,Pending Purchase Orders,În așteptare comenzi de aprovizionare
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Setat automat Serial nr bazat pe FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Cec Furnizor Numărul facturii Unicitatea
 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 +102,Non Profit,Non-Profit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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: Stock Reconciliation Item,Do not include symbols (ex. $),Nu include simboluri (ex. $)
 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 +638,Attribute {0} selected multiple times in Attributes Table,Atribut {0} selectat de mai multe ori în tabelul Atribute
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Atribut {0} selectat de mai multe ori în tabelul Atribute
 DocType: HR Settings,Employee record is created using selected field. ,Inregistrarea angajatului este realizata prin utilizarea campului selectat.
 DocType: Sales Order,Not Applicable,Nu se aplică
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Maestru de vacanta.
 DocType: Request for Quotation Item,Required Date,Date necesare
 DocType: Delivery Note,Billing Address,Adresa de facturare
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +862,Please enter Item Code.,Vă rugăm să introduceți Cod produs.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +847,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"
@@ -457,12 +464,12 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Titluri de valoare și depozite
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Total frunze alocate este obligatorie
 DocType: Job Opening,Description of a Job Opening,Descrierea unei slujbe
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Pending activities for today,Activități în așteptare pentru ziua de azi
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Activități în așteptare pentru ziua de azi
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Record de prezenţă.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Componenta de salarizare pentru salarizare bazate pe timesheet.
 DocType: Sales Order Item,Used for Production Plan,Folosit pentru Planul de producție
 DocType: Manufacturing Settings,Time Between Operations (in mins),Timp între operațiuni (în minute)
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +92,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} buget pentru contul {1} împotriva centru de cost {2} este {3}. Acesta va depăși de {4}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +95,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} buget pentru contul {1} împotriva centru de cost {2} este {3}. Acesta va depăși de {4}
 DocType: Customer,Buyer of Goods and Services.,Cumpărător de produse și servicii.
 DocType: Journal Entry,Accounts Payable,Conturi de plată
 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
@@ -470,15 +477,15 @@
 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/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 +86,Administrative Officer,Ofițer administrativ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,Ofițer administrativ
 DocType: Timesheet Detail,Hrs,ore
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +319,Please select Company,Vă rugăm să selectați Company
-DocType: Stock Entry,Difference Account,Diferența de Cont
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +309,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 +44,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 +398,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 +399,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 +530,"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 +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"
 DocType: Shipping Rule,Net Weight,Greutate netă
 DocType: Employee,Emergency Phone,Telefon de Urgență
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +28,Buy,A cumpara
@@ -486,7 +493,7 @@
 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 +1563,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 +1587,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
@@ -495,13 +502,14 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Account {0} does not belong to company: {1},Contul {0} nu apartine companiei: {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation already used for another company,Abreviere deja folosit pentru o altă companie
 DocType: Selling Settings,Default Customer Group,Group Client Implicit
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Supplier is required against Payable account {0},Furnizor este necesar pe baza contului de plati {0}
 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
 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 +313,Reference No and Reference Date is mandatory for Bank transaction,De referință nr și de referință Data este obligatorie pentru tranzacție bancară
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +316,Reference No and Reference Date is mandatory for Bank transaction,De referință nr și de referință Data este obligatorie pentru tranzacție bancară
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Adaugaţi / editaţi taxe și cheltuieli
 DocType: Purchase Invoice,Supplier Invoice No,Furnizor Factura Nu
 DocType: Territory,For reference,Pentru referință
@@ -512,7 +520,6 @@
 DocType: Installation Note Item,Installation Note Item,Instalare Notă Postul
 DocType: Production Plan Item,Pending Qty,Așteptare Cantitate
 DocType: Budget,Ignore,Ignora
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Articol Cod&gt; Postul Grup&gt; Marca
 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/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
@@ -523,11 +530,11 @@
 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/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 +28,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 +19,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 +707,Make Sales Order,Realizeaza Comandă de Vânzări
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +701,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
@@ -543,7 +550,8 @@
 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 +734,Sales Return,Vânzări de returnare
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +728,Sales Return,Vânzări de returnare
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +91,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)
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Baza de date cu clienți potențiali.
@@ -552,14 +560,13 @@
 DocType: Quotation,Quotation To,Citat Pentru a
 DocType: Lead,Middle Income,Venituri medii
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +212,Opening (Cr),Deschidere (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +795,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"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 +237,Allocated amount can not be negative,Suma alocată nu poate fi negativă
+apps/erpnext/erpnext/stock/doctype/item/item.py +797,Default Unit of Measure for Item {0} cannot be changed directly because 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ă
 DocType: Purchase Order Item,Billed Amt,Suma facturată
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Un depozit logic față de care se efectuează înregistrări de stoc.
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Vânzări factură Pontaj
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},Nu referință și de referință Data este necesar pentru {0}
-DocType: Sales Invoice,Customer's Vendor,Vanzator Client
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Proposal Writing,Propunere de scriere
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,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"
@@ -568,13 +575,14 @@
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,Urmărirea timpului
 DocType: Fiscal Year Company,Fiscal Year Company,Anul fiscal companie
 DocType: Packing Slip Item,DN Detail,Detaliu DN
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +257,Already supplier quotation has created,Deja un furnizor de cotare a creat
 DocType: Timesheet,Billed,Facturat
 DocType: Batch,Batch Description,Descriere lot
+apps/erpnext/erpnext/accounts/utils.py +685,"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 +733,View Offline Records,Vezi offline Records
+apps/erpnext/erpnext/accounts/page/pos/pos.js +715,View Offline Records,Vezi offline Records
+DocType: Student,Sibling Details,Detalii sibling
 DocType: Employee,Reason for Resignation,Motiv pentru demisie
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,Șablon pentru evaluările de performanță.
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,Factura / Jurnalul Detalii intrare
@@ -588,7 +596,7 @@
 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
 DocType: Employee,Passport Number,Numărul de pașaport
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Manager,Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,Manager
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,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
@@ -597,10 +605,11 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter email address,Introduceți adresa de e-mail
 DocType: Production Order Operation,In minutes,In cateva minute
 DocType: Issue,Resolution Date,Data rezoluție
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +299,Timesheet created:,Pontajul creat:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +715,Please set default Cash or Bank account in Mode of Payment {0},Vă rugăm să setați Cash implicit sau cont bancar în modul de plată {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +300,Timesheet created:,Pontajul creat:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +772,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
 DocType: Selling Settings,Customer Naming By,Numire Client de catre
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,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
 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
 DocType: Activity Cost,Activity Type,Tip Activitate
@@ -625,6 +634,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,finalizarea
 DocType: Pricing Rule,Sales Manager,Director De Vânzări
 DocType: Salary Structure Employee,Base,Baza
+DocType: Timesheet,Total Billed Hours,Numărul total de ore facturate
 DocType: Journal Entry,Write Off Amount,Scrie Off Suma
 DocType: Journal Entry,Bill No,Factură nr.
 DocType: Company,Gain/Loss Account on Asset Disposal,Cont câștig / Pierdere de eliminare a activelor
@@ -639,11 +649,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +9,Pre Sales,Vânzări pre
 DocType: Purchase Receipt,Other Details,Alte detalii
 DocType: Account,Accounts,Conturi
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Marketing,Marketing
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +227,Payment Entry is already created,Plata Intrarea este deja creat
+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,Plata Intrarea este deja creat
 DocType: Purchase Receipt Item Supplied,Current Stock,Stoc curent
-apps/erpnext/erpnext/controllers/accounts_controller.py +538,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 +21,Preview Salary Slip,Previzualizare Salariu alunecare
+apps/erpnext/erpnext/controllers/accounts_controller.py +541,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 +38,Preview Salary Slip,Previzualizare Salariu alunecare
 DocType: Company,Deafult Cost Center,Deafult Centru de cost
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +48,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
@@ -652,7 +662,7 @@
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,Vă rugăm să selectați un grup Student
 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 +617,Item has variants.,Element are variante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Element are variante.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,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ă
@@ -672,7 +682,7 @@
 DocType: Purchase Order,Supply Raw Materials,Aprovizionarea cu materii prime
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,Data la care va fi generat următoarea factură. Acesta este generată pe prezinte.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Active Curente
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,{0} is not a stock Item,{0} nu este un articol de stoc
+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 +169,Lead must be set if Opportunity is made from Lead,Conducerea trebuie să fie setata dacă Oportunitatea este creata din Conducere
@@ -742,7 +752,7 @@
  8. Introduceți Row: Dacă bazat pe ""Înapoi Row Total"", puteți selecta numărul rând care vor fi luate ca bază pentru acest calcul (implicit este rândul precedent).
  9. Este Brut inclus în rata de bază ?: Dacă verifica acest lucru, înseamnă că acest impozit nu va fi arătată tabelul de mai jos articol, dar vor fi incluse în rata de bază din tabelul punctul principal. Acest lucru este util în cazul în care doriți dau un preț plat (cu toate taxele incluse) preț pentru clienți."
 DocType: Employee,Bank A/C No.,Bancă A/C nr.
-DocType: GL Entry,Project,Proiectarea
+DocType: GL Entry,Project,Proiecte
 DocType: Quality Inspection Reading,Reading 7,Lectură 7
 DocType: Address,Personal,Trader
 DocType: Expense Claim Detail,Expense Claim Type,Tip Revendicare Cheltuieli
@@ -758,26 +768,25 @@
 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 +709,No Permission,Nici o permisiune
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +710,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}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +298,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 +542,Row #{0}: Asset {1} must be submitted,Rând # {0}: {1} activ trebuie să fie depuse
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset {1} must be submitted,Rând # {0}: {1} activ trebuie să fie depuse
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Nu a fost gasit angajat
 DocType: Supplier Quotation,Stopped,Oprita
 DocType: Item,If subcontracted to a vendor,Dacă subcontractat la un furnizor
 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.
 DocType: Warehouse,Tree Details,copac Detalii
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Trimite Acum
 ,Support Analytics,Suport Analytics
 DocType: Item,Website Warehouse,Site-ul Warehouse
 DocType: Payment Reconciliation,Minimum Invoice Amount,Factură cantitate minimă
 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/sales_invoice/sales_invoice.py +227,Timesheet {0} is already completed or cancelled,Pontajul {0} este deja finalizată sau anulată
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +259,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
@@ -793,31 +802,33 @@
 apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Program de curs de
 DocType: Maintenance Visit,Completion Status,Stare Finalizare
 DocType: HR Settings,Enter retirement age in years,Introdu o vârsta de pensionare în anii
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +229,Target Warehouse,Țintă Warehouse
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +230,Target Warehouse,Țintă Warehouse
 DocType: Cheque Print Template,Starting location from left edge,Punctul de plecare de la marginea din stânga
 DocType: Item,Allow over delivery or receipt upto this percent,Permiteți peste livrare sau primire pana la acest procent
 DocType: Stock Entry,STE-,sterilizabile
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Sales Order Date,Data de Livrare Preconizata nu poate fi anterioara Datei Ordinului de Vanzare
 DocType: Upload Attendance,Import Attendance,Import Spectatori
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Toate grupurile articolului
+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/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} 상태 {2}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +82,{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/stock/page/stock_balance/stock_balance.js +37,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/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
 DocType: Expense Claim,Expenses,Cheltuieli
 DocType: Item Variant Attribute,Item Variant Attribute,Varianta element Atribut
 ,Purchase Receipt Trends,Tendințe Primirea de cumpărare
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Research & Development,Cercetare & Dezvoltare
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Cercetare & Dezvoltare
 ,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
 DocType: Leave Block List Date,Leave Block List Date,Data Lista Concedii Blocate
 DocType: Pricing Rule,Price or Discount,Preț sau Reducere
@@ -826,7 +837,7 @@
 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/controllers/accounts_controller.py +340,"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ă."
+apps/erpnext/erpnext/controllers/accounts_controller.py +343,"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
@@ -848,12 +859,12 @@
 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 +756,Purchase Receipt,Primirea de cumpărare
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +735,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 +167,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 +282,Unable to find Time Slot in the next {0} days for Operation {1},Imposibilitatea de a găsi timp Slot în următorii {0} zile pentru Operațiunea {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +170,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 +283,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 +439,BOM {0} must be active,BOM {0} trebuie să fie activ
@@ -864,7 +875,7 @@
 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 +214,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 +217,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
@@ -878,9 +889,9 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Angajatul {0} nu este activ sau nu există
 DocType: Fee Structure,Components,Componente
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,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 +612,Item Variants {0} updated,Postul variante {0} actualizat
+apps/erpnext/erpnext/stock/doctype/item/item.py +614,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 +843,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 +854,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
@@ -895,69 +906,72 @@
 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 +728,New Sales Invoice,Noua factură de vânzări
+apps/erpnext/erpnext/accounts/page/pos/pos.js +710,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 +728,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
 DocType: Material Request Item,Lead Time Date,Data Timp Conducere
 DocType: Guardian,Guardian Name,Nume tutore
 DocType: Cheque Print Template,Has Print Format,Are Format imprimare
-apps/erpnext/erpnext/accounts/page/pos/pos.js +86, 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 +109,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 +619,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","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/page/pos/pos.js +75, 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 +613,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing 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 +606,Supplier Invoice Date cannot be greater than Posting Date,Furnizor Data facturii nu poate fi mai mare decât postare Data
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +609,Supplier Invoice Date cannot be greater than Posting Date,Furnizor Data facturii nu poate fi mai mare decât postare Data
 DocType: Purchase Invoice Item,Purchase Order Item,Comandă de aprovizionare Articol
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +130,Indirect Income,Venituri indirecte
 DocType: Cheque Print Template,Date Settings,dată Setări
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Variație
 ,Company Name,Denumire Furnizor
 DocType: SMS Center,Total Message(s),Total mesaj(e)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +810,Select Item for Transfer,Selectați Element de Transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +789,Select Item for Transfer,Selectați Element de Transfer
 DocType: Purchase Invoice,Additional Discount Percentage,Procentul discount suplimentar
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Vizualizați o listă cu toate filmele de ajutor
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Selectați contul șef al băncii, unde de verificare a fost depus."
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Permiteţi utilizatorului să editeze lista ratelor preturilor din tranzacții
 DocType: Pricing Rule,Max Qty,Max Cantitate
-DocType: Student Applicant,Father's Name,Numele tatălui
 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 +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Rând {0}: Plata împotriva Vânzări / Ordinului de Procurare ar trebui să fie întotdeauna marcate ca avans
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Chimic
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +686,All items have already been transferred for this Production Order.,Toate articolele acestei comenzi de producție au fost deja transferate.
+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
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +694,All items have already been transferred for this Production Order.,Toate articolele acestei comenzi de producție au fost deja transferate.
 DocType: Process Payroll,Select Payroll Year and Month,Selectați Salarizare anul și luna
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,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
-DocType: Opportunity,Walk In,Walk In
 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 +12,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).
 DocType: Timesheet Detail,Bill,Factură
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,White,Alb
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,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
 DocType: SMS Center,All Lead (Open),Toate articolele de top (deschise)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +228,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})
+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 +731,Make ,Realizare
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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.,Nu a fost o eroare. Un motiv probabil ar putea fi că nu ați salvat formularul. Vă rugăm să contactați support@erpnext.com dacă problema persistă.
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,A aparut o eroare. Un motiv probabil ar putea fi că nu ați salvat formularul. Vă rugăm să contactați iulianolaru@ollala.ro dacă problema persistă.
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Cosul meu
-apps/erpnext/erpnext/controllers/selling_controller.py +154,Order Type must be one of {0},Pentru Tipul trebuie să fie una dintre {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Pentru Tipul trebuie să fie una dintre {0}
 DocType: Lead,Next Contact Date,Următor Contact Data
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Deschiderea Cantitate
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +393,Please enter Account for Change Amount,Vă rugăm să introduceți cont pentru Schimbare Sumă
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,Please enter Account for Change Amount,Vă rugăm să introduceți cont pentru Schimbare Sumă
 DocType: Student Batch,Student Batch Name,Nume elev Lot
 DocType: Holiday List,Holiday List Name,Denumire Lista de Vacanță
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js +8,Schedule Course,Curs orar
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Stock Options,Opțiuni pe acțiuni
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Opțiuni pe acțiuni
 DocType: Journal Entry Account,Expense Claim,Revendicare Cheltuieli
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +211,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 +237,Qty for {0},Cantitate pentru {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +212,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 +238,Qty for {0},Cantitate pentru {0}
 DocType: Leave Application,Leave Application,Aplicatie pentru Concediu
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Mijloc pentru Alocare Concediu
 DocType: Leave Block List,Leave Block List Dates,Date Lista Concedii Blocate
@@ -966,9 +980,9 @@
 DocType: Company,Default Terms,Termeni implicite
 DocType: Packing Slip Item,Packing Slip Item,Bonul Articol
 DocType: Purchase Invoice,Cash/Bank Account,Numerar/Cont Bancar
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Articole eliminate cu nici o schimbare în cantitate sau de valoare.
+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 +635,Attribute table is mandatory,Tabelul atribut este obligatoriu
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Tabelul atribut este obligatoriu
 DocType: Production Planning Tool,Get Sales Orders,Obține comenzile de vânzări
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{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
@@ -987,13 +1001,13 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,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,Problem
+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/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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Serial Nu {0} este sub contract de întreținere pana {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +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
@@ -1005,7 +1019,7 @@
 DocType: GL Entry,Against,Comparativ
 DocType: Item,Default Selling Cost Center,Centru de Cost Vanzare Implicit
 DocType: Sales Partner,Implementation Partner,Partener de punere în aplicare
-apps/erpnext/erpnext/controllers/selling_controller.py +231,Sales Order {0} is {1},Comandă de vânzări {0} este {1}
+apps/erpnext/erpnext/controllers/selling_controller.py +232,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
 DocType: Packing Slip,Net Weight UOM,Greutate neta UOM
@@ -1015,25 +1029,24 @@
 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
 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 +155,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Cotatiilor primite de la furnizori.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},Pentru a {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Vârstă medie
 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/templates/pages/home.html +32,View All Products,Vezi toate produsele
+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
 DocType: Expense Claim,From Employee,Din Angajat
-apps/erpnext/erpnext/controllers/accounts_controller.py +400,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
+apps/erpnext/erpnext/controllers/accounts_controller.py +403,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/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,și anul:
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +191,{0} {1} must be submitted,{0} {1} trebuie să fie introdus
-DocType: Email Digest,Annual Expense,Cheltuieli anuale
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,{0} {1} must be submitted,{0} {1} trebuie să fie introdus
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +145,Quantity must be less than or equal to {0},Cantitatea trebuie sa fie mai mic sau egal cu {0}
 DocType: SMS Center,Total Characters,Total de caractere
 apps/erpnext/erpnext/controllers/buying_controller.py +156,Please select BOM in BOM field for Item {0},Vă rugăm să selectați BOM BOM în domeniu pentru postul {0}
@@ -1044,30 +1057,31 @@
 DocType: Sales Partner,Distributor,Distribuitor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Cosul de cumparaturi Articolul Transport
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +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 +62,Please set 'Apply Additional Discount On',Vă rugăm să setați &quot;Aplicați discount suplimentar pe&quot;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +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
 DocType: Global Defaults,Global Defaults,Valori Implicite Globale
 apps/erpnext/erpnext/projects/doctype/project/project.py +153,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
 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 +327,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 +362,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/stock/doctype/stock_entry/stock_entry.py +367,Finished Item {0} must be entered for Manufacture type entry,Postul terminat {0} trebuie să fie introdusă de intrare de tip fabricarea
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Sold Contabilitate
 DocType: Sales Invoice Advance,Sales Invoice Advance,Factura Vanzare Advance
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +499,Nothing to request,Nimic de a solicita
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +500,Nothing to request,Nimic de a solicita
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','Data efectivă de începere' nu poate fi după  'Data efectivă de sfârșit'
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Management,Management
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},Suma de Debit sau de Credit este necesar pentru {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,Management
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +55,Either debit or credit amount is required for {0},Suma de Debit sau de Credit este necesar pentru {0}
 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 +161,Blue,Albastru
+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
@@ -1077,12 +1091,12 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +23,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
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1374,Do you really want to submit the invoice?,Nu doriți cu adevărat să prezinte factura?
+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 +685,Cost Center For Item with Item Code ',Centrul de cost pentru postul cu codul Postul '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1526,"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 +679,Cost Center For Item with Item Code ',Centrul de cost pentru postul cu codul Postul '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1550,"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 +26,"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
@@ -1102,102 +1116,104 @@
 DocType: Payment Reconciliation,Unreconciled Payment Details,Nereconciliate Detalii de plată
 DocType: Global Defaults,Current Fiscal Year,An Fiscal Curent
 DocType: Global Defaults,Disable Rounded Total,Dezactivati Totalul Rotunjit
-DocType: Lead,Call,Apelaţi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +417,'Entries' cannot be empty,'Intrările' nu pot fi vide
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +418,'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 +214,Fiscal Year {0} not found,Anul fiscal {0} nu a fost găsit
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +221,Fiscal Year {0} not found,Anul fiscal {0} nu a fost găsit
 apps/erpnext/erpnext/config/hr.py +238,Setting up Employees,Configurarea angajati
 DocType: Sales Order,SO-,ASA DE-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Vă rugăm să selectați prefix întâi
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,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 +145,Research,Cercetarea
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,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 +43,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 +57,View Ledger,Vezi Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Cel mai devreme
-apps/erpnext/erpnext/stock/doctype/item/item.py +504,"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 +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/setup/setup_wizard/setup_wizard.py +437,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
 ,Budget Variance Report,Raport de variaţie buget
 DocType: Salary Slip,Gross Pay,Plata Bruta
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +90,Row {0}: Activity Type is mandatory.,Rândul {0}: Activitatea de tip este obligatorie.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +114,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/public/js/controllers/stock_controller.js +40,Accounting Ledger,Contabilitate Ledger
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,Accounting Ledger,Contabilitate Ledger
 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
 DocType: BOM Item,Item Description,Descriere Articol
+DocType: Student Sibling,Student Sibling,elev Sibling
 DocType: Purchase Invoice,Is Recurring,Este recurent
 DocType: Purchase Invoice,Supplied Items,Articole furnizate
 DocType: Student,STUD.,STUD.
 DocType: Production Order,Qty To Manufacture,Cantitate pentru fabricare
+DocType: Email Digest,New Income,noul venit
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Menține aceeași cată in cursul ciclului de cumpărare
 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 +131,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 +175,Valuation Rate required for Item in row {0},Rata de evaluare cerute pentru postul în rândul {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,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ă
 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 +87, to ,la
+apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,la
 DocType: Item,Lead Time in days,Timp de plumb în zile
 ,Accounts Payable Summary,Rezumat conturi pentru plăți
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Not authorized to edit frozen Account {0},Nu este autorizat pentru a edita contul congelate {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,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 +62,Sales Order {0} is not valid,Comandă de vânzări {0} nu este valid
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Comandă de vânzări {0} nu este valid
 apps/erpnext/erpnext/setup/doctype/company/company.py +185,"Sorry, companies cannot be merged","Ne pare rău, companiile nu se pot uni"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Small,Mic
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,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}
 ,Invoiced Amount (Exculsive Tax),Facturate Suma (Exculsive Tax)
-DocType: Student Applicant,Mother's / Guardian 1 Email ID,/ Guardian ID-ul 1 E-mail mama lui
 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 +160,Green,Verde
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,Verde
 DocType: Supplier,SUPP-,SUPP-
 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 +57,Contract,Contract
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,Contract
 DocType: Email Digest,Add Quote,Adaugă Citat
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +498,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 +503,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 +80,Row {0}: Qty is mandatory,Rând {0}: Cant este obligatorie
+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 +737,Sync Master Data,Sincronizare Date
+apps/erpnext/erpnext/accounts/page/pos/pos.js +719,Sync Master Data,Sincronizare Date
 apps/erpnext/erpnext/public/js/setup_wizard.js +283,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
+DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Acesta este un grup element rădăcină și nu pot fi editate.
+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.
 DocType: Journal Entry Account,Purchase Order,Comandă de aprovizionare
 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 +345,"{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ă"
+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
 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 +118,"For {0}, only credit accounts can be linked against another debit entry","Pentru {0}, numai conturi de credit poate fi legat de o altă intrare în debit"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Delivery Note {0} is not submitted,Nota de Livrare {0} nu este introdusa
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Delivery Note {0} is not submitted,Nota de Livrare {0} nu este introdusa
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Sub-contracted Item,Articolul {0} trebuie să fie un Articol Sub-contractat
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Echipamente de Capital
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Regula de stabilire a prețurilor este selectat în primul rând bazat pe ""Aplicați pe"" teren, care poate fi produs, Grupa de articole sau de brand."
 DocType: Hub Settings,Seller Website,Vânzător Site-ul
 DocType: Item,ITEM-,ARTICOL-
-apps/erpnext/erpnext/controllers/selling_controller.py +147,Total allocated percentage for sales team should be 100,Procentul total alocat pentru echipa de vânzări ar trebui să fie de 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +110,Production Order status is {0},Statutul de producție Ordinul este {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Procentul total alocat pentru echipa de vânzări ar trebui să fie de 100
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Statutul de producție Ordinul este {0}
 DocType: Appraisal Goal,Goal,Obiectiv
 DocType: Sales Invoice Item,Edit Description,Edit Descriere
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +757,For Supplier,Pentru furnizor
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +723,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
@@ -1213,10 +1229,11 @@
 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
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +445,BOM {0} does not belong to Item {1},BOM {0} nu aparţine articolului {1}
 DocType: Sales Partner,Target Distribution,Țintă Distribuție
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1667,Deafault warehouse is required for selected item,depozitul Deafault este necesar pentru elementul selectat
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Deafault warehouse is required for selected item,depozitul Deafault este necesar pentru elementul selectat
 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
@@ -1225,23 +1242,23 @@
 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 +110,Hardware,Hardware
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,Hardware
 DocType: Sales Order,Recurring Upto,recurente upto
 DocType: Attendance,HR Manager,Manager Resurse Umane
 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 +48,Privilege Leave,Privilege concediu
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,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 +79,You need to enable Shopping Cart,Trebuie să activați Cosul de cumparaturi
 DocType: Payment Entry,Writeoff,Achita
 DocType: Appraisal Template Goal,Appraisal Template Goal,Obiectiv model expertivă
-DocType: Salary Slip,Earning,Câștig Salarial
+DocType: Salary Component,Earning,Câștig Salarial
 DocType: Purchase Invoice,Party Account Currency,Partidul cont valutar
 ,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 +171,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 +174,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_data.py +358,Food,Produse Alimentare
+apps/erpnext/erpnext/demo/setup/setup_data.py +301,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/course_schedule/course_schedule.js +103,Mark Attendence,marcă de prezență
@@ -1275,12 +1292,12 @@
 DocType: Sales Order Item,Planned Quantity,Planificate Cantitate
 DocType: Purchase Invoice Item,Item Tax Amount,Suma Taxa Articol
 DocType: Item,Maintain Stock,Menținere de Stock
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +209,Stock Entries already created for Production Order ,
+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,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 +620,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 +238,Max: {0},Max: {0}
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +15,From Datetime,De la Datetime
+apps/erpnext/erpnext/controllers/accounts_controller.py +623,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 +239,Max: {0},Max: {0}
+apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,De la Datetime
 DocType: Email Digest,For Company,Pentru Companie
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Log comunicare.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +153,"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."
@@ -1288,8 +1305,8 @@
 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 +552,cannot be greater than 100,nu poate fi mai mare de 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +680,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 +546,cannot be greater than 100,nu poate fi mai mare de 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,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ă
@@ -1303,10 +1320,9 @@
 DocType: GL Entry,GL Entry,Intrari GL
 DocType: HR Settings,Employee Settings,Setări Angajat
 ,Batch-Wise Balance History,Istoricul balanţei principale aferente lotului
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,To do list
 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 +61,Apprentice,Începător
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +102,Negative Quantity is not allowed,Nu este permisă cantitate negativă
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,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"
@@ -1328,15 +1344,14 @@
 DocType: Asset,Asset Name,Denumire activ
 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 +141,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 +719,Packing Slip,Slip de ambalare
+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 +713,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/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,Cerere de ofertă poate fi de acces făcând clic pe următorul link
 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 +81,Analyst,Analist
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,Analist
 DocType: Item,Inventory,Inventarierea
 DocType: Item,Sales Details,Detalii vânzări
 DocType: Quality Inspection,QI-,QI-
@@ -1344,7 +1359,7 @@
 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 +103,Government,Guvern
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,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
 DocType: Company,Services,Servicii
@@ -1360,6 +1375,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,Financial Year Start Date,Data de Inceput An Financiar
 DocType: POS Profile,Apply Discount,Aplicați o reducere
 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
 DocType: Program Course,Program Course,Curs Program
@@ -1400,7 +1416,7 @@
 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
 DocType: Production Plan Sales Order,Production Plan Sales Order,Planul de producție comandă de vânzări
 DocType: Sales Partner,Sales Partner Target,Vânzări Partner țintă
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +110,Accounting Entry for {0} can only be made in currency: {1},Intrarea contabilitate pentru {0} se poate face numai în valută: {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Intrarea contabilitate pentru {0} se poate face numai în valută: {1}
 DocType: Pricing Rule,Pricing Rule,Regula de stabilire a prețurilor
 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
@@ -1413,40 +1429,39 @@
 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/stock/doctype/stock_entry/stock_entry.py +339,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Nu este permis să transferam mai {0} {1} decât împotriva Comandă {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +344,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 +545,Manufacturing Quantity is mandatory,Cantitatea de fabricație este obligatorie
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,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 +71,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 +162,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/projects/doctype/timesheet/timesheet.py +186,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
 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 +130,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 +137,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
 DocType: Dependent Task,Dependent Task,Sarcina dependent
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,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/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 +190,Leave of type {0} cannot be longer than {1},Concediul de tip {0} nu poate dura mai mare de {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +197,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 +921,Search Item,căutare articol
+apps/erpnext/erpnext/accounts/page/pos/pos.js +910,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 +546,Already completed,deja finalizat
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +22,Payment Request already exists {0},Cerere de plată există deja {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +550,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 +241,Quantity must not be more than {0},Cantitatea nu trebuie să fie mai mare de {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Quantity must not be more than {0},Cantitatea nu trebuie să fie mai mare de {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +76,Previous Financial Year is not closed,Exercițiul financiar precedent nu este închis
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +44,Age (Days),Vârstă (zile)
 DocType: Quotation Item,Quotation Item,Citat Articol
@@ -1463,7 +1478,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +221,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 +83,{0}% Billed,{0}% Taxat
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}% Taxat
 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
@@ -1475,12 +1490,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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/schools/doctype/fees/fees.js +22,Collect,Colectarea
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Colectarea
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,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 +225,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
-DocType: Payment Reconciliation,Payments,Plăți
 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
@@ -1492,7 +1506,7 @@
 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 +9,Procurement,achiziții publice
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,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/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
 ,Lead Details,Detalii Conducere
 DocType: Purchase Invoice,End date of current invoice's period,Data de încheiere a perioadei facturii curente
@@ -1517,7 +1531,7 @@
 DocType: Purchase Invoice,Additional Discount,Discount suplimentar
 DocType: Selling Settings,Selling Settings,Vanzarea Setări
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Licitatii Online
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +97,Please specify either Quantity or Valuation Rate or both,Vă rugăm să specificați fie Cantitate sau Evaluează evaluare sau ambele
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,Vă rugăm să specificați fie Cantitate sau Evaluează evaluare sau ambele
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +13,Fulfillment,Împlinire
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Compania, Luna și Anul fiscal sunt obligatorii"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Cheltuieli de marketing
@@ -1538,14 +1552,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,ERPNext Setup Complete!
 DocType: Item,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +93,A Customer Group exists with same name please change the Customer name or rename the Customer Group,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/selling/doctype/customer/customer.py +126,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
 DocType: Stock Entry,Material Receipt,Primirea de material
 DocType: Homepage,Products,Instrumente
 DocType: Announcement,Instructor,Instructor
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},Partidul Tipul și Partidul este necesar pentru creanțe / cont plateste {0}
 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
@@ -1556,7 +1569,7 @@
 ,Item-wise Sales Register,Registru Vanzari Articol-Avizat
 DocType: Asset,Gross Purchase Amount,Sumă brută Cumpărare
 DocType: Asset,Depreciation Method,Metoda de amortizare
-apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Offline,Deconectat
+apps/erpnext/erpnext/accounts/page/pos/pos.js +686,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
@@ -1574,25 +1587,27 @@
 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
 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 +858,Make Purchase Order,Realizeaza Comanda de Cumparare
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +852,Make Purchase Order,Realizeaza Comanda de Cumparare
 DocType: SMS Center,Send To,Trimite la
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,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 +148,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
 DocType: Stock Reconciliation,Stock Reconciliation,Stoc Reconciliere
 DocType: Territory,Territory Name,Teritoriului Denumire
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +172,Work-in-Progress Warehouse is required before Submit,De lucru-in-Progress Warehouse este necesară înainte Trimite
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,Work-in-Progress Warehouse is required before Submit,De lucru-in-Progress Warehouse este necesară înainte Trimite
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Solicitant pentru un loc de muncă.
 DocType: Purchase Order Item,Warehouse and Reference,Depozit și referință
 DocType: Supplier,Statutory info and other general information about your Supplier,Info statutar și alte informații generale despre dvs. de Furnizor
-apps/erpnext/erpnext/hooks.py +88,Addresses,Adrese
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Furnizor&gt; Tip Furnizor
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +212,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/hooks.py +95,Addresses,Adrese
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +215,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
 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
@@ -1600,11 +1615,10 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,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 +731,Payment,Plată
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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: Pricing Rule,Brand,Marca
 DocType: Course,Course Abbreviation,Abreviere curs de
 DocType: Item,Will also apply for variants,"Va aplică, de asemenea pentru variante"
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +142,"Asset cannot be cancelled, as it is already {0}","Activ nu poate fi anulat, deoarece este deja {0}"
@@ -1616,7 +1630,7 @@
 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."
 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 +85,Associate,Asociaţi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,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
@@ -1624,7 +1638,7 @@
 DocType: Production Planning Tool,Material Requests,Cereri de materiale
 DocType: Warranty Claim,Issue Date,Data emiterii
 DocType: Activity Cost,Activity Cost,Cost activitate
-DocType: Timesheet Detail,Timesheet Detail,Detalii pontajul
+DocType: Sales Invoice Timesheet,Timesheet Detail,Detalii pontajul
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Cantitate Consumata
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telecomunicații
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indică faptul că pachetul este o parte din această livrare (Proiect de numai)
@@ -1647,6 +1661,7 @@
 DocType: Production Plan Material Request,Material Request Date,Cerere de material Data
 DocType: Purchase Order Item,Supplier Quotation Item,Furnizor ofertă Articol
 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
 DocType: Monthly Distribution,Name of the Monthly Distribution,Numele de Distributie lunar
 DocType: Sales Person,Parent Sales Person,Mamă Sales Person
@@ -1659,30 +1674,31 @@
 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 +44,"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/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ă.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +502,Error: {0} &gt; {1},Eroare: {0}&gt; {1}
 DocType: Item,Is Sales Item,Este produs de vânzări
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Ramificatie Grup Articole
 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.
 DocType: Naming Series,Current Value,Valoare curenta
-apps/erpnext/erpnext/controllers/accounts_controller.py +235,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/controllers/accounts_controller.py +238,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
 DocType: Delivery Note Item,Against Sales Order,Comparativ comenzii de vânzări
 ,Serial No Status,Serial Nu Statut
 DocType: Payment Entry Reference,Outstanding,remarcabil
 ,Daily Timesheet Summary,Rezumat Pontaj zilnic
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +458,Item table can not be blank,Tabelul Articolului nu poate fi vid
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +443,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 +5,This is based on stock movement. See {0} for details,Aceasta se bazează pe mișcare stoc. A se vedea {0} pentru detalii
 DocType: Pricing Rule,Selling,De vânzare
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +341,Amount {0} {1} deducted against {2},Suma {0} {1} dedusă împotriva {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +344,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
@@ -1697,8 +1713,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +144,Cannot refer row number greater than or equal to current row number for this Charge type,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 +159,Red,Roșu
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Vă rugăm să faceți clic pe ""Generate Program"", pentru a aduce ordine adăugat pentru postul {0}"
+apps/erpnext/erpnext/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
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Suma de bază (Companie Moneda)
@@ -1706,7 +1722,7 @@
 DocType: Installation Note,Installation Time,Timp de instalare
 DocType: Sales Invoice,Accounting Details,Contabilitate Detalii
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,Ștergeți toate tranzacțiile de acest companie
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +187,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Rând # {0}: {1} Funcționare nu este finalizată pentru {2} cantitate de produse finite în Producție Comanda # {3}. Vă rugăm să actualizați starea de funcționare prin timp Busteni
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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,Rând # {0}: {1} Funcționare nu este finalizată pentru {2} cantitate de produse finite în Producție Comanda # {3}. Vă rugăm să actualizați starea de funcționare prin timp Busteni
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,Investiții
 DocType: Issue,Resolution Details,Rezoluția Detalii
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,alocări
@@ -1742,16 +1758,17 @@
 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}
 DocType: Delivery Note,Excise Page Number,Numărul paginii accize
 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}
 ,Maintenance Schedules,Program de Mentenanta
 DocType: Task,Actual End Date (via Time Sheet),Data de încheiere efectivă (prin Ora Sheet)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Amount {0} {1} against {2} {3},Suma {0} {1} împotriva {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +339,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 +138,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 +295,Debit To account must be a Receivable account,Debit cont trebuie să fie un cont de creanțe
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Receivable account,Debit cont trebuie să fie un cont de creanțe
 DocType: Shipping Rule Condition,Shipping Amount,Suma de transport maritim
 ,Pending Amount,În așteptarea Suma
 DocType: Purchase Invoice Item,Conversion Factor,Factor de conversie
@@ -1759,10 +1776,10 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +137,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 +90,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
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +93,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 +22,Enter Paid Amount,Introdu o sumă plătită
+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
@@ -1772,34 +1789,38 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,pontaje
 DocType: HR Settings,HR Settings,Setări Resurse Umane
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Expense Claim is pending approval. Only the Expense Approver can update status.,Revendicarea Cheltuielilor este în curs de aprobare. Doar Aprobatorul de Cheltuieli poate actualiza statusul.
+DocType: Email Digest,New Expenses,Cheltuieli noi
 DocType: Purchase Invoice,Additional Discount Amount,Reducere suplimentară Suma
-apps/erpnext/erpnext/controllers/accounts_controller.py +524,"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."
+apps/erpnext/erpnext/controllers/accounts_controller.py +527,"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 +249,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/stock/get_item_details.py +123,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
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,Anul dvs. financiar se încheie pe
 DocType: POS Profile,Price List,Lista de prețuri
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} este acum implicit anul fiscal. Vă rugăm să reîmprospătați browser-ul dvs. pentru ca modificarea să aibă efect.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} este acum anul fiscal implicit. Vă rugăm să reîmprospătați browser-ul dvs. pentru ca modificarea să aibă efect.
 apps/erpnext/erpnext/projects/doctype/task/task.js +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 +183,Closing (Opening + Totals),Închiderea (deschidere + Totaluri)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),Închiderea (deschidere + Totaluri)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Vă rugăm să specificați în valută companie
 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/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
-apps/erpnext/erpnext/controllers/accounts_controller.py +272,Account {0} is invalid. Account Currency must be {1},Contul {0} nu este valid. Contul valutar trebuie să fie {1}
+DocType: Email Digest,Pending Sales Orders,Comenzile de vânzări în așteptare
+apps/erpnext/erpnext/controllers/accounts_controller.py +275,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 +956,"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 Slip,Deduction,Deducere
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +87,Row {0}: From Time and To Time is mandatory.,Rândul {0}: De la timp și de Ora este obligatorie.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +969,"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 +111,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 +262,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 +7,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
@@ -1807,7 +1828,7 @@
 DocType: Project,% Tasks Completed,% 태스크 완료
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,Diferența Suma trebuie să fie zero
 DocType: Project,Gross Margin,Marja Brută
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +194,Please enter Production Item first,Va rugam sa introduceti de producție Articol întâi
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +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
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Citat
@@ -1816,53 +1837,54 @@
 DocType: Maintenance Visit,Maintenance User,Întreținere utilizator
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +149,Cost Updated,Cost actualizat
 DocType: Employee,Date of Birth,Data Nașterii
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +86,Item {0} has already been returned,Articolul {0} a fost deja returnat
+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}
+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 +177,Job Description,Descrierea postului
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,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 +126,"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 +127,"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."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +24,Welcome to POS: Create your POS Profile,Bine ati venit la POS: Creează POS Profil
 DocType: Expense Claim,Approver,Aprobator
 ,SO Qty,SO Cantitate
+DocType: Guardian,Work Address,Adresa de
 DocType: Appraisal,Calculate Total Score,Calculaţi scor total
 DocType: Request for Quotation,Manufacturing Manager,Manufacturing Manager de
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serial Nu {0} este în garanție pana {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +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 +74,Shipments,Transporturile
+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
 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 +153,Row # ,
+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 +156,Get From,Ia de la
+apps/erpnext/erpnext/public/js/utils.js +167,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 +167,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 +416,"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"
+apps/erpnext/erpnext/controllers/accounts_controller.py +419,"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
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} is disabled,Utilizatorul {0} este dezactivat
 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 ...
 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 +171,"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 +346,{0} is mandatory for Item {1},{0} este obligatoriu pentru articolul {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,{0} is mandatory for Item {1},{0} este obligatoriu pentru articolul {1}
 DocType: Currency Exchange,From Currency,Din moneda
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Vă rugăm să selectați suma alocată, de tip Factură și factură Numărul din atleast rând una"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,Costul de achiziție nouă
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},Ordinul de vânzări necesar pentru postul {0}
 DocType: Purchase Invoice Item,Rate (Company Currency),Rata de (Compania de valuta)
-apps/erpnext/erpnext/demo/setup_data.py +360,Others,Altel
+DocType: Student Guardian,Others,Altel
 DocType: Payment Entry,Unallocated Amount,Suma nealocată
 apps/erpnext/erpnext/templates/includes/product_page.js +65,Cannot find a matching Item. Please select some other value for {0}.,Nu pot găsi o potrivire articol. Vă rugăm să selectați o altă valoare pentru {0}.
 DocType: POS Profile,Taxes and Charges,Impozite și Taxe
@@ -1882,17 +1904,16 @@
 apps/erpnext/erpnext/config/stock.py +304,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/accounts/report/item_wise_sales_register/item_wise_sales_register.py +54,Receivable Account,Contul de încasat
-apps/erpnext/erpnext/controllers/accounts_controller.py +546,Row #{0}: Asset {1} is already {2},Rând # {0}: {1} activ este deja {2}
+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 +549,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 +79,CEO,CEO
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,CEO
 DocType: Expense Claim Detail,Expense Claim Detail,Detaliu Revendicare Cheltuieli
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +808,Please select correct account,Vă rugăm să selectați contul corect
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +809,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
-DocType: Purchase Invoice Item,Page Break,Page Break
 DocType: Production Order Operation,Pending,În așteptarea
 DocType: Course,Course Name,Numele cursului
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Utilizatorii care poate aproba cererile de concediu o anumită angajatilor
@@ -1901,21 +1922,23 @@
 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 +54,Full-time,Permanent
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,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
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Dacă ați creat un model standard la taxele de vânzare și taxe Format, selectați una și faceți clic pe butonul de mai jos."
+DocType: Student,Guardians,tutorii
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +29,Please specify a country for this Shipping Rule or check Worldwide Shipping,Vă rugăm să specificați o țară pentru această regulă Transport sau verificați Expediere
 DocType: Stock Entry,Total Incoming Value,Valoarea totală a sosi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Debit To is required,Pentru debit este necesar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +321,Debit To is required,Pentru debit este necesar
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Cumparare Lista de preturi
 DocType: Offer Letter Term,Offer Term,Termen oferta
 DocType: Quality Inspection,Quality Manager,Manager de calitate
-DocType: Job Applicant,Job Opening,Deschidere Loc de Muncă
+DocType: Job Applicant,Job Opening,Loc de munca disponibil
 DocType: Payment Reconciliation,Payment Reconciliation,Reconcilierea plată
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Vă rugăm să selectați numele Incharge Persoana
 apps/erpnext/erpnext/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/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
@@ -1926,18 +1949,17 @@
 DocType: Production Order Operation,Completed Qty,Cantitate Finalizata
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"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 +273,Price List {0} is disabled,Lista de prețuri {0} este dezactivat
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +99,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/projects/doctype/timesheet/timesheet.py +123,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
 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}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Rata de evaluare curentă
 DocType: Item,Customer Item Codes,Coduri client Postul
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,Schimb de câștig / Pierdere
 DocType: Opportunity,Lost Reason,Motiv Pierdere
-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/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/purchase_receipt/purchase_receipt.py +378,All items have already been invoiced,Toate articolele au fost deja facturate
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +379,All items have already been invoiced,Toate articolele au fost deja facturate
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Vă rugăm să specificați un valabil ""Din cauza nr"""
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Centre de costuri pot fi realizate în grupuri, dar intrările pot fi făcute împotriva non-Grupuri"
 DocType: Project,External,Extern
@@ -1953,19 +1975,20 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Clienții dvs.
 apps/erpnext/erpnext/projects/doctype/project/project.py +141,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/job_opening.html +19,Apply Now,Aplica acum
+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."
 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
-apps/erpnext/erpnext/utilities/doctype/address/address.py +164,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: Fee Structure,Fee Structure,Structura Taxa de
 DocType: Timesheet Detail,Costing Amount,Costing Suma
+DocType: Student Admission,Application Fee,Taxă de aplicare
 DocType: Process Payroll,Submit Salary Slip,Prezenta Salariul Slip
-apps/erpnext/erpnext/controllers/selling_controller.py +161,Maxiumm discount for Item {0} is {1}%,Reducere Maxiumm pentru postul {0} este {1}%
-apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Import în vrac
+apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,Reducere Maxiumm pentru postul {0} este {1}%
+apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Importare în masă
 DocType: Sales Partner,Address & Contacts,Adresă şi contacte
 DocType: SMS Log,Sender Name,Sender Name
 DocType: POS Profile,[Select],[Selectati]
@@ -1989,21 +2012,21 @@
 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_data.py +361,Travel,Călători
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +155,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 +304,Travel,Călători
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +167,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 +23,Update Cost,Actualizare Cost
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Actualizare Cost
 DocType: Item Reorder,Item Reorder,Reordonare Articol
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +36,Show Salary Slip,Afișează Salariu alunecare
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +748,Transfer Material,Material de transfer
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +53,Show Salary Slip,Afișează Salariu alunecare
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +166,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 +923,Please set recurring after saving,Vă rugăm să setați recurente după salvare
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +646,Select change amount account,cont Selectați suma schimbare
+apps/erpnext/erpnext/public/js/controllers/transaction.js +914,Please set recurring after saving,Vă rugăm să setați recurente după salvare
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +703,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
@@ -2015,31 +2038,32 @@
 DocType: Quality Inspection,Verified By,Verificate de
 DocType: Address,Subsidiary,Filială
 apps/erpnext/erpnext/setup/doctype/company/company.py +64,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","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: Quality Inspection,Purchase Receipt No,Primirea de cumpărare Nu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Banii cei mai castigati
 DocType: Process Payroll,Create Salary Slip,Crea Fluturasul de Salariul
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +33,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 +352,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Cantitatea în rândul {0} ({1}), trebuie să fie aceeași ca și cantitatea produsă {2}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Cantitatea în rândul {0} ({1}), trebuie să fie aceeași ca și cantitatea produsă {2}"
 DocType: Appraisal,Employee,Angajat
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Invitați ca utilizator
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} este complet facturat
 DocType: Workstation Working Hour,End Time,End Time
 DocType: Payment Entry,Payment Deductions or Loss,Deducerile de plată sau pierdere
-apps/erpnext/erpnext/config/schools.py +100,LMS,LMS
+apps/erpnext/erpnext/config/schools.py +104,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/config/crm.py +6,Sales Pipeline,conducte de vânzări
 DocType: Student Batch Student,Student Batch Student,Student Student Lot
-DocType: Sales Invoice,Mass Mailing,Corespondență în masă
+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 +199,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/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 +297,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 +111,Pharmaceutical,Farmaceutic
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +309,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/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
@@ -2054,45 +2078,47 @@
 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 +814,Please specify Company to proceed,Vă rugăm să specificați companiei pentru a continua
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +793,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 +44,Compensatory Off,Fara Masuri Compensatorii
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,Fara Masuri Compensatorii
 DocType: Quality Inspection Reading,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ă.
 DocType: Room,Room Number,Numărul de cameră
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Referință invalid {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +161,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) nu poate fi mai mare decât cantitatea planificată ({2}) aferent comenzii de producție {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +162,{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 +217,Raw Materials cannot be blank.,Materii prime nu poate fi gol.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,"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 +460,Quick Journal Entry,Quick Jurnal de intrare
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +111,You can not change rate if BOM mentioned agianst any item,Nu puteți schimba rata dacă BOM menționat agianst orice element
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +441,"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 +450,Quick Journal Entry,Quick Jurnal de intrare
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +103,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 +214,{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
 ,Minutes to First Response for Issues,Minute la First Response pentru Probleme
 DocType: Purchase Invoice,Terms and Conditions1,Termeni și Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +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/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Stare de proiect
+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 +398,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 +739,Item or Warehouse for row {0} does not match Material Request,Articolul sau Depozitul aferent inregistrariii {0} nu se potrivește cu Cererea de Material
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +747,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ă
 DocType: Fiscal Year,Year End Date,Anul Data de încheiere
 DocType: Task Depends On,Task Depends On,Sarcina Depinde
-DocType: Lead,Opportunity,Oportunitate
+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
@@ -2105,7 +2131,7 @@
 DocType: Student,Joining Date,Daca va aflati Data
 ,Employees working on a holiday,Numar de angajati care lucreaza in vacanta
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Mark Prezent
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},Data de Incepere a Mentenantei nu poate fi anterioara datei de livrare aferent de Nr. de Serie {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},Data de Incepere a Mentenantei nu poate fi anterioara datei de livrare aferent de Nr. de Serie {0}
 DocType: Production Order,Actual End Date,Data efectiva de finalizare
 DocType: Purchase Invoice,PINV-,PINV-
 DocType: Authorization Rule,Applicable To (Role),Aplicabil pentru (rol)
@@ -2120,7 +2146,7 @@
 DocType: SMS Log,No of Requested SMS,Nu de SMS solicitat
 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 +729,Please supply the specified items at the best possible rates,Vă rugăm să furnizeze elementele specificate la cele mai bune tarife posibile
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +695,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 +117,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-
@@ -2129,7 +2155,7 @@
 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 +14,This is an example website auto-generated from ERPNext,Acesta este un site web exemplu auto-generat de ERPNext
+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
 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.
 
@@ -2176,13 +2202,14 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd Cantitate
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +54,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 +103,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 +504,Stock Entry {0} is not submitted,Stock intrare {0} nu este prezentat
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Nu se pot produce mai multe Articole {0} decât cantitatea din Ordinul de Vânzări {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +505,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: Salary Component Account,Salary Component Account,Contul de salariu Componentă
 DocType: Global Defaults,Hide Currency Symbol,Ascunde simbol moneda
 apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card","de exemplu, bancar, Cash, Card de credit"
+DocType: Lead Source,Source Name,sursa Nume
 DocType: Journal Entry,Credit Note,Nota de Credit
 DocType: Warranty Claim,Service Address,Adresa serviciu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furnitures and Fixtures,Furnitures și Programe
@@ -2194,6 +2221,7 @@
 DocType: Opportunity,Customer / Lead Name,Client / Nume Principal
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +89,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/controllers/trends.py +19,Total(Qty),Total (Cantitate)
 DocType: Sales Invoice,This Document,Acest document de
@@ -2205,15 +2233,15 @@
 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 +176,Organization branch master.,Ramură organizație maestru.
-apps/erpnext/erpnext/controllers/accounts_controller.py +273, or ,sau
+apps/erpnext/erpnext/controllers/accounts_controller.py +276, 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/doctype/payment_entry/payment_entry.py +203,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Rând # {0}: Jurnal de intrare {1} nu are cont {2} sau deja compensată împotriva unui alt voucher
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +206,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 +90,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 +93,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ă
@@ -2241,8 +2269,8 @@
 DocType: Product Bundle,Parent Item,Părinte Articol
 DocType: Account,Account Type,Tipul Contului
 DocType: Delivery Note,DN-RET-,DN-RET-
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +115,Leave Type {0} cannot be carry-forwarded,Lasă Tipul {0} nu poate fi transporta-transmise
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Programul de Mentenanta nu este generat pentru toate articolele. Vă rugăm să faceți clic pe 'Generare Program'
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +118,Leave Type {0} cannot be carry-forwarded,Lasă Tipul {0} nu poate fi transporta-transmise
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Programul de Mentenanta nu este generat pentru toate articolele. Vă rugăm să faceți clic pe 'Generare Program'
 ,To Produce,Pentru a produce
 apps/erpnext/erpnext/config/hr.py +93,Payroll,stat de plată
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +163,"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"
@@ -2254,13 +2282,13 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +32,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 +748,Delivery,Livrare
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +742,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
 DocType: Payment Entry,Total Allocated Amount,Suma totală alocată
 DocType: Item Reorder,Material Request Type,Material Cerere tip
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +82,Row {0}: UOM Conversion Factor is mandatory,Row {0}: Factorul de conversie UOM este obligatorie
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +79,Row {0}: UOM Conversion Factor is mandatory,Row {0}: Factorul de conversie UOM este obligatorie
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Re
 DocType: Budget,Cost Center,Centrul de cost
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Voucher #
@@ -2271,13 +2299,13 @@
 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 +90,Head of Marketing and Sales,Director de Marketing și Vânzări
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Impozit pe venit
+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 +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.
 DocType: Item Supplier,Item Supplier,Furnizor Articol
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +403,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 +770,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 +397,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 +764,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"
@@ -2289,28 +2317,29 @@
 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 +100,Issues,Probleme
-apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},Starea trebuie să fie una din {0}
+apps/erpnext/erpnext/hooks.py +109,Issues,Probleme
+apps/erpnext/erpnext/controllers/status_updater.py +13,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
 DocType: Supplier,Billing Currency,Moneda de facturare
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Large,Extra mare
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,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 +507,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 +107,Local,Local
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +508,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/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 +154,Large,Mare
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,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 +225,Total {0} ({1}),Total {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +224,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ă
@@ -2368,9 +2397,9 @@
 DocType: Attendance,Leave Type,Tip Concediu
 apps/erpnext/erpnext/controllers/stock_controller.py +173,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/hr/doctype/salary_slip/salary_slip.py +79,Name error: {0},Numele de eroare: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +90,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 +178,{0} {1} does not associated with {2} {3},{0} {1} nu asociat cu {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +181,{0} {1} does not associated with {2} {3},{0} {1} nu asociat cu {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Prezenţa pentru angajatul {0} este deja consemnată
 DocType: Packing Slip,If more than one package of the same type (for print),În cazul în care mai mult de un pachet de același tip (pentru imprimare)
 DocType: Warehouse,Parent Warehouse,Depozit-mamă
@@ -2388,7 +2417,7 @@
 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
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,Cel puțin un element ar trebui să fie introduse cu cantitate negativa în documentul de returnare
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Atleast one item should be entered with negative quantity in return document,Cel puțin un element ar trebui să fie introduse cu cantitate negativa în documentul de returnare
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operațiunea {0} mai mult decât orice ore de lucru disponibile în stație de lucru {1}, descompun operațiunea în mai multe operațiuni"
 ,Requested,Solicitată
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +83,No Remarks,Nu Observații
@@ -2400,46 +2429,46 @@
 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/stock/doctype/purchase_receipt/purchase_receipt.py +98,Quality Inspection required for Item {0},Inspecție de calitate necesare pentru postul {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,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
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Gestioneaza Ramificatiile Teritoriule.
 DocType: Journal Entry Account,Sales Invoice,Factură de vânzări
 DocType: Journal Entry Account,Party Balance,Balanța Party
-apps/erpnext/erpnext/accounts/page/pos/pos.js +475,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 +92,Salary Slip Created,Salariu Slip Creat
+apps/erpnext/erpnext/accounts/page/pos/pos.js +464,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 +95,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
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,Procentul de reducere se poate aplica fie pe o listă de prețuri sau pentru toate lista de prețuri.
 DocType: Purchase Invoice,Half-yearly,Semestrial
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +384,Accounting Entry for Stock,Intrare contabilitate pentru stoc
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +387,Accounting Entry for Stock,Intrare contabilitate pentru stoc
 DocType: Sales Invoice,Sales Team1,Vânzări TEAM1
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,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 +96,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 +120,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 +88,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/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
 DocType: Item Group,Show this slideshow at the top of the page,Arată această prezentare în partea de sus a paginii
 DocType: BOM,Item UOM,Articol FDM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Suma impozitului pe urma Discount Suma (companie de valuta)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +147,Target warehouse is mandatory for row {0},Depozit țintă este obligatorie pentru rând {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +141,Target warehouse is mandatory for row {0},Depozit țintă este obligatorie pentru rând {0}
 DocType: Cheque Print Template,Primary Settings,Setări primare
 DocType: Purchase Invoice,Select Supplier Address,Selectați Furnizor Adresă
 DocType: Quality Inspection,Quality Inspection,Inspecție de calitate
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Extra Small,Extra Small
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +194,Account {0} is frozen,Contul {0} este Blocat
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Extra Small
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +690,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 +197,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 +606,Can only make payment against unbilled {0},Poate face doar plata împotriva facturată {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +126,Commission rate cannot be greater than 100,Rata de comision nu poate fi mai mare decat 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +609,Can only make payment against unbilled {0},Poate face doar plata împotriva facturată {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,Rata de comision nu poate fi mai mare decat 100
 DocType: Stock Entry,Subcontract,Subcontract
 apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,Va rugam sa introduceti {0} primul
 DocType: Production Order Operation,Actual End Time,Timp efectiv de sfârşit
@@ -2450,30 +2479,30 @@
 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 +158,Colour,Culoare
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,Culoare
 DocType: Maintenance Visit,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
 DocType: Student Log,Academic,Academic
-apps/erpnext/erpnext/controllers/accounts_controller.py +469,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),avans total ({0}) împotriva Comanda {1} nu poate fi mai mare decât totalul ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +472,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),avans total ({0}) împotriva Comanda {1} nu poate fi mai mare decât totalul ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Selectați Distributie lunar pentru a distribui neuniform obiective pe luni.
 DocType: Purchase Invoice Item,Valuation Rate,Rata de evaluare
+DocType: Stock Reconciliation,SR/,SR /
 apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,Lista de pret Valuta nu selectat
 DocType: Assessment,Results,rezultate obținute
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +168,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 +175,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
-DocType: Student Applicant,Father's/ Guardian 2 Email ID,/ Guardian ID-ul 2 E-mail tatălui
 DocType: Maintenance Visit Purpose,Against Document No,Împotriva documentul nr
 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 +228,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 +231,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 +93,Researcher,Cercetător
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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.
@@ -2485,25 +2514,25 @@
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Pentru comoditatea clienților, aceste coduri pot fi utilizate în formate de imprimare cum ar fi Facturi și Note de Livrare"
 DocType: Sales Invoice,Time Sheet List,Listă de timp Sheet
 DocType: Employee,You can enter any date manually,Puteți introduce manual orice dată
-DocType: Sales Invoice,Advertisement,Reclamă
 DocType: Asset Category Account,Depreciation Expense Account,Contul de amortizare de cheltuieli
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Probationary Period,Perioadă De Probă
-apps/erpnext/erpnext/hooks.py +102,Announcements,anunţuri
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Perioadă De Probă
+apps/erpnext/erpnext/hooks.py +111,Announcements,anunţuri
 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 +109,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 +16,To Datetime,Pentru a Datetime
+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/scheduling_tool/scheduling_tool.py +51,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/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Activități în curs
+DocType: Accounts Settings,Make Payment via Journal Entry,Efectuați o plată prin Jurnalul de intrare
+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 +127,Please enter relieving date.,Vă rugăm să introduceți data alinarea.
-apps/erpnext/erpnext/controllers/trends.py +145,Amt,Amt
+apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,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 +26,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
@@ -2521,14 +2550,15 @@
 apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1},Imposibilitatea de a găsi rata de schimb pentru {0} {1} la
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Mark jumatate de zi
 DocType: Sales Invoice,Sales Team,Echipa de vânzări
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Duplicate entry,Inregistrare duplicat
+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 +490,[Error],[Eroare]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +484,[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
 apps/erpnext/erpnext/controllers/status_updater.py +175,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.
 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)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Serial Nu {0} nu există
@@ -2544,22 +2574,22 @@
 ,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 +25,All Jobs,toate locurile de muncă
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,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
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Amount {0} {1} {2} {3},Suma {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Amount {0} {1} {2} {3},Suma {0} {1} {2} {3}
 DocType: Account,Depreciation,Depreciere
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Furnizor (e)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Instrumentul Participarea angajat
 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 +372,Payment Entries {0} are un-linked,Intrările de plată {0} sunt nesemnalate legate
+apps/erpnext/erpnext/accounts/utils.py +449,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ă
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +497,Material Requests {0} created,Cererile de materiale {0} a creat
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +498,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.
 DocType: Purchase Invoice,Address and Contact,Adresa si Contact
@@ -2598,7 +2628,7 @@
 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 +848,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 +859,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 +233,Closing (Dr),De închidere (Dr)
 DocType: Cheque Print Template,Cheque Size,Dimensiune cecului
@@ -2619,7 +2649,8 @@
 ,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.
-apps/erpnext/erpnext/controllers/accounts_controller.py +555,'Update Stock' cannot be checked for fixed asset sale,&quot;Actualizare stoc&quot; nu poate fi verificată de vânzare de active fixe
+DocType: Student Guardian,Father,tată
+apps/erpnext/erpnext/controllers/accounts_controller.py +558,'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/buying/doctype/purchase_order/purchase_order.py +132,Material Request {0} is cancelled or stopped,Cerere de material {0} este anulată sau oprită
@@ -2629,15 +2660,15 @@
 DocType: Sales Order,Fully Delivered,Livrat complet
 DocType: Lead,Lower Income,Micsoreaza Venit
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","Contul capul sub răspunderii, în care Profit / pierdere va fi rezervat"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +166,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 +238,"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 +81,Purchase Order number required for Item {0},Număr de comandă de aprovizionare necesare pentru postul {0}
+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/purchase_receipt/purchase_receipt.py +82,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 +17,Cannot change status as student {0} is linked with student application {1},Nu se poate schimba statutul de student ca {0} este legat cu aplicația de student {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Nu se poate schimba statutul de student ca {0} este legat cu aplicația de student {1}
 DocType: Timesheet,"List of employee which has ""Salary Slip Based on Timesheet"" is enabled in salary structure.",Listă de angajat care are &quot;alunecare Salariu Bazat pe Pontaj&quot; este activată în structura salarială.
 DocType: Asset,Fully Depreciated,Depreciata pe deplin
 ,Stock Projected Qty,Stoc proiectată Cantitate
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Customer {0} does not belong to project {1},Clientul {0} nu apartine proiectului {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,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
@@ -2649,7 +2680,7 @@
 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/patches/v7_0/create_warehouse_nestedset.py +55,All Warehouses,toate Depozite
+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 +105,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
@@ -2661,10 +2692,10 @@
 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/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Realizeaza Fluturas de Salar
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +26,Browse BOM,Navigare BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,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/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 Year,Academic Year,An academic
+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
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,Expertiză
@@ -2672,12 +2703,12 @@
 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 +197,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 +204,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: Workstation Working Hour,Start Time,Ora de începere
 DocType: Item Price,Bulk Import Help,Bulk Import Ajutor
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +256,Select Quantity,Selectați Cantitate
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +257,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
@@ -2694,6 +2725,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Cantitatea țintă sau valoarea țintă este obligatorie.
 apps/erpnext/erpnext/config/projects.py +45,Cost of various activities,Costul diverse activități
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Setarea Evenimente la {0}, deoarece angajatul atașat la mai jos de vânzare Persoanele care nu are un ID de utilizator {1}"
+DocType: Timesheet,Billing Details,detalii de facturare
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +149,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}
 DocType: Item,Inspection Required,Inspecție obligatorii
@@ -2713,7 +2745,7 @@
 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 +138,Wire Transfer,Transfer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,Transfer
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Selectați toate
 DocType: Sales Order,Recurring Order,Comanda recurent
 DocType: Company,Default Income Account,Contul Venituri Implicit
@@ -2725,21 +2757,19 @@
 ,Welcome to ERPNext,Bine ati venit la ERPNext
 apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,Duce la ofertă
 DocType: Lead,From Customer,De la Client
-apps/erpnext/erpnext/demo/setup_data.py +357,Calls,Apeluri
+apps/erpnext/erpnext/demo/setup/setup_data.py +300,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/stock/doctype/item/item.py +466,"As there are existing transactions for this item, \
-							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Având în vedere că sunt tranzacții existente pentru acest post, \ nu se poate schimba valorile &quot;nu are nici un serial&quot;, &quot;Are Lot nr&quot;, &quot;Este de stoc Articol&quot; și &quot;Metoda de evaluare&quot;"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,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/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 +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,"Notă: Sistemul nu va verifica peste, livrare și supra-rezervări pentru postul {0} ca și cantitatea sau valoarea este 0"
 DocType: Notification Control,Quotation Message,Citat Mesaj
 DocType: Issue,Opening Date,Data deschiderii
-apps/erpnext/erpnext/schools/api.py +58,Attendance has been marked successfully.,Prezență a fost marcată cu succes.
+apps/erpnext/erpnext/schools/api.py +57,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 +136,Account Type for {0} must be {1},Tipul de cont pentru {0} trebuie să fie {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +139,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
@@ -2754,12 +2784,13 @@
 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/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 +20,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 +1190,Please select customer,Vă rugăm să selectați Clienți
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1193,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
@@ -2769,6 +2800,7 @@
 ,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 +50,Missing Currency Exchange Rates for {0},Lipsește Schimb valutar prețul pentru {0}
 DocType: Assessment,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-
@@ -2786,11 +2818,12 @@
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Nume subiect
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Cel puţin una din opţiunile de vânzare sau cumpărare trebuie să fie selectată
+DocType: Grading Structure,Grade Intervals,Intervale de grad
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Selectați natura afacerii dumneavoastră.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,În cazul în care operațiunile de fabricație sunt efectuate.
 DocType: Asset Movement,Source Warehouse,Depozit sursă
 DocType: Installation Note,Installation Date,Data de instalare
-apps/erpnext/erpnext/controllers/accounts_controller.py +534,Row #{0}: Asset {1} does not belong to company {2},Rând # {0}: {1} activ nu aparține companiei {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +537,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
@@ -2804,28 +2837,31 @@
 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 +111,Date Of Retirement must be greater than Date of Joining,Data Pensionare trebuie să fie ulterioara Datei Aderării
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +49,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 +87,{0}% Delivered,{0}% Livrat
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% Livrat
 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).,Postul {0}: Cantitate comandat {1} nu poate fi mai mică de cantitate minimă de comandă {2} (definită la punctul).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Lunar Procentaj Distribuție
 DocType: Territory,Territory Targets,Obiective Territory
 DocType: Delivery Note,Transporter Info,Info Transporter
-apps/erpnext/erpnext/accounts/utils.py +379,Please set default {0} in Company {1},Vă rugăm să setați implicit {0} în {1} companie
+apps/erpnext/erpnext/accounts/utils.py +456,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
 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.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Titluri de șabloane de imprimare, de exemplu proforma Factura."
+DocType: Student Guardian,Student Guardian,student la Guardian
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +184,Valuation type charges can not marked as Inclusive,Taxele de tip evaluare nu poate marcate ca Inclusive
 DocType: POS Profile,Update Stock,Actualizare stock
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Un UOM diferit pentru articole va conduce la o valoare incorecta pentru Greutate Neta (Total). Asigurați-vă că Greutatea Netă a fiecărui articol este în același UOM.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Rată BOM
 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 +349,Journal Entries {0} are un-linked,Jurnalul Intrările {0} sunt ne-legate
+apps/erpnext/erpnext/accounts/utils.py +426,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
@@ -2849,6 +2885,7 @@
 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
+DocType: Homepage,"URL for ""All Products""",URL-ul pentru &quot;Toate produsele&quot;
 DocType: Leave Application,Leave Balance Before Application,Balanta Concediu Inainte de Aplicare
 DocType: SMS Center,Send SMS,Trimite SMS
 DocType: Cheque Print Template,Width of amount in word,Lățimea de cuvânt în sumă
@@ -2857,7 +2894,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 +29,Current Job Openings,Deschideri Job curent
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,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
@@ -2870,7 +2907,7 @@
 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 +850,Show tax break-up,Arată impozit break-up
+apps/erpnext/erpnext/public/js/controllers/transaction.js +841,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/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"
@@ -2880,10 +2917,11 @@
 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 +534,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 +80,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 +162,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/selling/doctype/customer/customer.py +195,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 +5,This is based on the attendance of this Student,Aceasta se bazează pe prezența acestui student
@@ -2892,12 +2930,11 @@
 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 +75,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 +138,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/hr/doctype/leave_application/leave_application.py +145,Note: There is not enough leave balance for Leave Type {0},Notă: Nu este echilibrul concediu suficient pentru concediul de tip {0}
 DocType: Program Enrollment Fee,Program Enrollment Fee,Programul de înscriere Taxa
 DocType: Item,Supplier Items,Furnizor Articole
 DocType: Opportunity,Opportunity Type,Tip de oportunitate
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,Companie nouă
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,Cost Center is required for 'Profit and Loss' account {0},"Centrul de Cost este necesar pentru contul 'Profit și pierdere' {0}"""
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Tranzacții pot fi șterse doar de către creatorul Companiei
 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.,Număr incorect de contabilitate intrările găsit. Este posibil să fi selectat un cont greșit în tranzacție.
 DocType: Cheque Print Template,Cheque Width,Lățime cecului
@@ -2906,16 +2943,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,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 +228,{0} '{1}' is disabled,{0} '{1}' este dezactivat
+apps/erpnext/erpnext/controllers/accounts_controller.py +231,{0} '{1}' is disabled,{0} '{1}' este dezactivat
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Setați ca Deschis
 DocType: Cheque Print Template,Scanned Cheque,scanate cecului
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Trimite prin email automate de contact pe tranzacțiile Depunerea.
+DocType: Timesheet,Total Billable Amount,Suma totală Taxabil
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Punctul 3
 DocType: Purchase Order,Customer Contact Email,Contact Email client
 DocType: Warranty Claim,Item and Warranty Details,Postul și garanție Detalii
 DocType: Sales Team,Contribution (%),Contribuție (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Notă: Plata de intrare nu va fi creat deoarece ""Cash sau cont bancar"" nu a fost specificat"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Responsibilities,Responsabilitati
+apps/erpnext/erpnext/controllers/accounts_controller.py +78,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
 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
@@ -2923,6 +2961,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Adauga utilizatori
 DocType: Pricing Rule,Item Group,Grup Articol
 DocType: Item,Safety Stock,Stoc de siguranta
+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: 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)
@@ -2932,7 +2971,6 @@
 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: Timesheet,Total Hours,Total ore
 DocType: Journal Entry,Printing Settings,Setări de imprimare
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,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
@@ -2945,13 +2983,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investment Banking
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +71,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
+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
 DocType: Purchase Invoice Item,Rate,
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Intern,Interna
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,Interna
 DocType: Stock Entry,From BOM,De la BOM
 DocType: Assessment,Assessment Code,Codul de evaluare
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +32,Basic,Elementar
+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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Vă rugăm să faceți clic pe ""Generate Program"""
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +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 +95,Reference No is mandatory if you entered Reference Date,De referință nu este obligatorie în cazul în care ați introdus Reference Data
@@ -2960,11 +2999,11 @@
 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 +752,Issue Material,Eliberarea Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +723,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 +683,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 +665,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.
 DocType: Hub Settings,Access Token,Acces Token
 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
@@ -2972,33 +3011,35 @@
 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 +1122,Enter value must be positive,Introduceți valoarea trebuie să fie pozitiv
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,All Territories,Toate teritoriile
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1125,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
 DocType: Purchase Invoice,Items,Articole
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +23,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 +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ă.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +233,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 +96,Request for Quotations,Cerere de Cotațiile
+apps/erpnext/erpnext/hooks.py +104,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
 DocType: Asset,Partially Depreciated,parțial Depreciata
 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 +628,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unitatea implicit de măsură pentru Variant &#39;{0} &quot;trebuie să fie la fel ca în Template&quot; {1} &quot;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unitatea implicit de măsură pentru Variant &#39;{0} &quot;trebuie să fie la fel ca în Template&quot; {1} &quot;
 DocType: Shipping Rule,Calculate Based On,Calculaţi pe baza
 DocType: Delivery Note Item,From Warehouse,Din depozitul
 DocType: Assessment,Supervisor Name,Nume supervizor
+DocType: Assessment,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
 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 +27,Default Address Template cannot be deleted,Format implicit Adresa nu poate fi șters
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,Format implicit Adresa nu poate fi șters
 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
@@ -3013,8 +3054,8 @@
 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/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 +485,No default BOM exists for Item {0},Nu există implicit BOM pentru postul {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +336,Please select Posting Date first,Vă rugăm să selectați postarea Data primei
+apps/erpnext/erpnext/stock/get_item_details.py +486,No default BOM exists for Item {0},Nu există implicit BOM pentru postul {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +326,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
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Centrul de Cost cu tranzacții existente nu poate fi transformat în registru contabil
@@ -3030,6 +3071,7 @@
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Plățile se potrivesc cu facturi
 DocType: Journal Entry,Bank Entry,Intrare bancară
 DocType: Authorization Rule,Applicable To (Designation),Aplicabil pentru (destinaţie)
+,Profitability Analysis,Analiza profitabilității
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,Adăugaţi în Coş
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Grupul De
 DocType: Guardian,Interests,interese
@@ -3042,22 +3084,22 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,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 +141,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Postul serializate {0} nu poate fi actualizat \
  folosind stoc Reconciliere"
 DocType: Scheduling Tool,Day,Zi
 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 +122,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 +129,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
-DocType: Student Applicant,AP.,AP.
 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 +639,Point of Sale,Point of Sale
+apps/erpnext/erpnext/accounts/page/pos/pos.js +634,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
 DocType: Production Planning Tool,Production Planning Tool,Producție instrument de planificare
@@ -3066,74 +3108,77 @@
 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 +373,Quantity to Manufacture must be greater than 0.,Cantitatea să Fabricare trebuie sa fie mai mare decât 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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 Profile,Customer Group,Grup Client
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,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/doctype/asset/asset.py +83,Next Depreciation Date must be on or after today,În continuare Amortizarea Data trebuie să fie la sau după ziua de azi
 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 +145,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: Quotation,Quotation Lost Reason,Citat pierdut rațiunea
+apps/erpnext/erpnext/utilities/doctype/address/address.py +164,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.
 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 +330,Transaction reference no {0} dated {1},de referință al tranzacției nu {0} {1} din
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,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 +107,Summary for this month and pending activities,Rezumat pentru această lună și activități în așteptarea
+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/accounts/doctype/sales_invoice/sales_invoice.py +406,Please remove this Invoice {0} from C-Form {1},Vă rugăm să eliminați acest factură {0} de la C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,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 +644,Get Items,Obtine Articole
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +623,Get Items,Obtine Articole
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +210,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 +41,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
 DocType: Payment Request,Initiated,Iniţiat
 DocType: Production Order,Planned Start Date,Start data planificată
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,Customer is required against Receivable account {0},Clientul trebuie împotriva contului Receivable {0}
 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
-apps/erpnext/erpnext/controllers/trends.py +265,Project-wise data is not available for Quotation,Date proiect-înțelept nu este disponibilă pentru ofertă
+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 +101,Commercial,Comercial
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,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: Supplier Quotation,Supplier Address,Furnizor Adresa
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +648,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/accounts/doctype/purchase_invoice/purchase_invoice.py +651,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 +30,Series is mandatory,Seria este obligatorie
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +50,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ă
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +165,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 +155,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Cr,Cr
 DocType: Tax Rule,Billing State,Stat de facturare
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +250,Transfer,Transfer
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +187,{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 +825,Fetch exploded BOM (including sub-assemblies),Obtine FDM expandat (inclusiv subansamblurile)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +254,Transfer,Transfer
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +190,{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 +796,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 +115,Due Date is mandatory,Due Date este obligatorie
+apps/erpnext/erpnext/controllers/accounts_controller.py +118,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
 DocType: Journal Entry,Pay To / Recd From,Pentru a plăti / Recd de la
 DocType: Naming Series,Setup Series,Seria de configurare
 DocType: Payment Reconciliation,To Invoice Date,Pentru a facturii Data
 DocType: Supplier,Contact HTML,HTML Persoana de Contact
 ,Inactive Customers,Clienții inactive
+DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Încasări de cumparare
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Cum se aplică regula pret?
 DocType: Quality Inspection,Delivery Note No,Nr. Nota de Livrare
@@ -3142,7 +3187,7 @@
 DocType: Company,Retail,Cu amănuntul
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +120,Customer {0} does not exist,Clientul {0} nu există
 DocType: Attendance,Absent,Absent
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +587,Product Bundle,Bundle produs
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,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-
@@ -3151,8 +3196,8 @@
 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 +742,Send Supplier Emails,Trimite email-uri Furnizor
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +104,"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/buying/doctype/request_for_quotation/request_for_quotation.js +708,Send Supplier Emails,Trimite email-uri Furnizor
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,"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
 DocType: Guardian Interest,Guardian Interest,Interes tutore
 DocType: Timesheet,Employee Detail,Detaliu angajat
@@ -3163,9 +3208,9 @@
 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}
 DocType: Salary Slip,Earning & Deduction,Câștig Salarial si Deducere
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +77,Account {0} cannot be a Group,Contul {0} nu poate fi un Grup
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} cannot be a Group,Contul {0} nu poate fi un Grup
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +31,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 +107,Negative Valuation Rate is not allowed,Negativ Rata de evaluare nu este permis
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Negativ Rata de evaluare nu este permis
 DocType: Holiday List,Weekly Off,Săptămânal Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","De exemplu, 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +39,Provisional Profit / Loss (Credit),Profit provizorie / Pierdere (Credit)
@@ -3179,16 +3224,16 @@
 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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: 아이템 {2} 는 Cost Center가  필수임
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +626,Get Items from Product Bundle,Obține elemente din Bundle produse
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +605,Get Items from Product Bundle,Obține elemente din Bundle produse
 DocType: Asset,Straight Line,Linie dreapta
 DocType: Project User,Project User,utilizator proiect
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} is inactive,Contul {0} este inactiv
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} is inactive,Contul {0} este inactiv
 DocType: GL Entry,Is Advance,Este Advance
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Prezenţa de la data și prezența până la data sunt obligatorii
 apps/erpnext/erpnext/controllers/buying_controller.py +148,Please enter 'Is Subcontracted' as Yes or No,"Va rugam sa introduceti ""este subcontractată"" ca Da sau Nu"
 DocType: Sales Team,Contact No.,Nr. Persoana de Contact
 DocType: Bank Reconciliation,Payment Entries,Intrările de plată
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,'Profit and Loss' type account {0} not allowed in Opening Entry,"'Tipul de cont 'Profit și pierdere' {0} nu este permis în intrarea de deschidere"""
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +71,'Profit and Loss' type account {0} not allowed in Opening Entry,"'Tipul de cont 'Profit și pierdere' {0} nu este permis în intrarea de deschidere"""
 DocType: 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
@@ -3207,7 +3252,7 @@
 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,Comision pentru Vânzări
 DocType: Offer Letter Term,Value / Description,Valoare / Descriere
-apps/erpnext/erpnext/controllers/accounts_controller.py +558,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Rând # {0}: {1} activ nu poate fi prezentat, este deja {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +561,"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: Production Order,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}.
@@ -3220,13 +3265,13 @@
 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/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Legal Expenses,Cheltuieli Juridice
 DocType: Purchase Invoice,Posting Time,Postarea de timp
-DocType: Sales Order,% Amount Billed,% 청구됨
+DocType: Timesheet,% Amount Billed,% 청구됨
 DocType: Production Order,Warehouse for reserving items,Depozit pentru rezervarea de articole
 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."""
 apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},Nici un articol cu ordine {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Notificări deschise
+DocType: Email Digest,Open Notifications,Notificări deschise
 DocType: Payment Entry,Difference Amount (Company Currency),Diferența Sumă (Companie Moneda)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,Cheltuieli Directe
 apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
@@ -3234,7 +3279,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Noi surse de venit pentru clienți
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,Cheltuieli de călătorie
 DocType: Maintenance Visit,Breakdown,Avarie
-apps/erpnext/erpnext/controllers/accounts_controller.py +634,Account: {0} with currency: {1} can not be selected,Contul: {0} cu moneda: {1} nu poate fi selectat
+apps/erpnext/erpnext/controllers/accounts_controller.py +637,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}
 DocType: Program Enrollment Tool,Student Applicants,Student Solicitanții
@@ -3242,15 +3287,15 @@
 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 +56,Probation,Probă
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Probation,Probă
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Componente salariale
 DocType: Program Enrollment Tool,New Academic Year,Anul universitar nou
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Payment of salary for the month {0} and year {1},Plata salariului pentru luna {0} și {1 an}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Payment of salary for the month {0} and year {1},Plata salariului pentru luna {0} și {1 an}
 DocType: Stock Settings,Auto insert Price List rate if missing,"Inserați Auto rata Lista de prețuri, dacă lipsește"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Total Suma plătită
 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 +144,Planning,Planificare
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,Planificare
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,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
@@ -3263,11 +3308,10 @@
 DocType: Sales Partner,Contact Desc,Persoana de Contact Desc
 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.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Sales invoice submitted sucessfully.,Factura de vânzare a prezentat cu succes.
 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}
 DocType: Assessment Result,Student Name,Numele studentului
-apps/erpnext/erpnext/hooks.py +104,Assessment Schedule,Program de evaluare
+apps/erpnext/erpnext/hooks.py +113,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
@@ -3277,6 +3321,7 @@
 DocType: GL Entry,Party Type,Tip de partid
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +78,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
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Maestru șablon salariu.
 DocType: Leave Type,Max Days Leave Allowed,Max zile de concediu de companie
@@ -3288,18 +3333,19 @@
 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 +99,All Customer Groups,Toate grupurile de clienți
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +78,Accumulated Monthly,lunar acumulat
-apps/erpnext/erpnext/controllers/accounts_controller.py +595,{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/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Toate grupurile de clienți
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +81,Accumulated Monthly,lunar acumulat
+apps/erpnext/erpnext/controllers/accounts_controller.py +598,{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ă
 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
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +188,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
 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 +84,Secretary,Secretar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,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
@@ -3308,24 +3354,22 @@
 ,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
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,Row # {0}: Nu serial este obligatorie
+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 +859,Supplier Quotation,Furnizor ofertă
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +838,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 +7,Collect Fees,Colectarea taxelor
+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}
 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.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,evenimente viitoare
 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
-DocType: Email Digest,Income / Expense,Venituri / cheltuieli
 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."
@@ -3337,13 +3381,14 @@
 DocType: Customer,From Lead,Din Conducere
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Comenzi lansat pentru producție.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Selectați anul fiscal ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,POS Profile required to make POS Entry,POS Profil necesare pentru a face POS intrare
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +509,POS Profile required to make POS Entry,POS Profil necesare pentru a face POS intrare
 DocType: Program Enrollment Tool,Enroll Students,Studenți Enroll
 DocType: Hub Settings,Name Token,Numele Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Vanzarea Standard
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Atleast one warehouse is mandatory,Cel puţin un depozit este obligatoriu
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +129,Atleast one warehouse is mandatory,Cel puţin un depozit este obligatoriu
 DocType: Serial No,Out of Warranty,Ieșit din garanție
 DocType: BOM Replace Tool,Replace,Înlocuirea
+DocType: Production Order,Unstopped,destupate
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{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
@@ -3364,10 +3409,11 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Concediile trebuie să fie alocate în multipli de 0.5"""
 DocType: Production Order,Operation Cost,Funcționare cost
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,Încărcați de participare dintr-un fișier csv.
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Impresionant Amt
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Stabilească obiective Articol Grupa-înțelept pentru această persoană de vânzări.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Blocheaza Stocurile Mai Vechi De [zile]
-apps/erpnext/erpnext/controllers/accounts_controller.py +528,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Rând # {0}: Activ este obligatorie pentru active fixe cumpărare / vânzare
+apps/erpnext/erpnext/controllers/accounts_controller.py +531,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Rând # {0}: Activ este obligatorie pentru active fixe cumpărare / vânzare
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","În cazul în care două sau mai multe reguli de stabilire a prețurilor sunt găsite bazează pe condițiile de mai sus, se aplică prioritate. Prioritatea este un număr între 0 și 20 în timp ce valoarea implicită este zero (gol). Numărul mai mare înseamnă că va avea prioritate în cazul în care există mai multe norme de stabilire a prețurilor, cu aceleași condiții."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Anul fiscal: {0} nu există
 DocType: Currency Exchange,To Currency,Pentru a valutar
@@ -3384,15 +3430,15 @@
 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ă
-DocType: Sales Invoice,Exhibition,Expoziție
 apps/erpnext/erpnext/utilities/doctype/address/address.py +77,"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 +81,Syntax error in formula or condition: {0},Eroare de sintaxă în formulă sau stare: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +92,Syntax error in formula or condition: {0},Eroare de sintaxă în formulă sau stare: {0}
 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"
+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 +28,Jobs,Locuri de munca
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,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
@@ -3401,15 +3447,15 @@
 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 +763,Make Supplier Quotation,Realizeaza Ofertă Furnizor
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,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/setup/setup_wizard/install_fixtures.py +42,Casual Leave,Concediu Aleator
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +45,Casual Leave,Concediu Aleator
 DocType: Batch,Batch ID,ID-ul lotului
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,Note: {0},Notă: {0}
 ,Delivery Note Trends,Tendințe Nota de Livrare
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +103,This Week's Summary,Rezumat această săptămână
+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
 DocType: Student Group Creation Tool,Get Courses,Cursuri de a lua
 DocType: GL Entry,Party,Grup
@@ -3419,7 +3465,7 @@
 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 +59,Piecework,Muncă în acord
+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: Task,Actual Time (in Hours),Timpul efectiv (în ore)
 DocType: Employee,History In Company,Istoric In Companie
@@ -3436,10 +3482,10 @@
 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.
 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 +162,Black,Negru
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,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} produse articole
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +56,{0} items produced,{0} articole produse
 DocType: Cheque Print Template,Distance from top edge,Distanța de la marginea de sus
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Întoarcere
 DocType: Production Order Operation,Production Order Operation,Producția Comanda Funcționare
@@ -3447,13 +3493,13 @@
 DocType: Project Task,Pending Review,Revizuirea în curs
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +106,"Asset {0} cannot be scrapped, as it is already {1}","Activ {0} nu poate fi scoase din uz, deoarece este deja {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Revendicarea Total cheltuieli (prin cheltuieli revendicarea)
-apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +69,Customer Id,Clienți Id
+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
 DocType: Journal Entry Account,Exchange Rate,Rata de schimb
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Sales Order {0} is not submitted,Comandă de vânzări {0} nu este prezentat
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +527,Sales Order {0} is not submitted,Comandă de vânzări {0} nu este prezentat
 DocType: Homepage,Tag Line,Eticheta linie
 DocType: Fee Component,Fee Component,Taxa de Component
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +857,Add items from,Adauga articole din
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +836,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}
 DocType: Cheque Print Template,Regular,Regulat
 DocType: BOM,Last Purchase Rate,Ultima Rate de Cumparare
@@ -3461,6 +3507,7 @@
 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
 ,Sales Person-wise Transaction Summary,Persoana de vânzări-înțelept Rezumat Transaction
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +60,Cost Center is required for 'Profit and Loss' account {0}. Please set up a default Cost Center for the Company.,Centrul de cost este necesară pentru contul &quot;profit și pierdere&quot; {0}. Vă rugăm să configurați un centru de cost implicit pentru companie.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,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
@@ -3471,12 +3518,12 @@
 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 +710,Online,Pe net
+apps/erpnext/erpnext/accounts/page/pos/pos.js +692,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 +16,Setting this Address Template as default as there is no other default,Setarea acestei Format Adresa implicit ca nu exista nici un alt implicit
+apps/erpnext/erpnext/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
 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 +74,Quality Management,Managementul calității
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,Managementul calității
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,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
@@ -3498,11 +3545,12 @@
 DocType: Student,Student Email ID,ID-ul de student e-mail
 DocType: Employee,Notice (days),Preaviz (zile)
 DocType: Tax Rule,Sales Tax Template,Format impozitul pe vânzări
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1520,Select items to save the invoice,Selectați elemente pentru a salva factura
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1544,Select items to save the invoice,Selectați elemente pentru a salva factura
 DocType: Employee,Encashment Date,Data plata in Numerar
 DocType: Account,Stock Adjustment,Ajustarea stoc
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Există implicit Activitate Cost de activitate de tip - {0}
 DocType: Production Order,Planned Operating Cost,Planificate cost de operare
+DocType: Academic Term,Term Start Date,Termenul Data de începere
 apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},Vă rugăm să găsiți atașat {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Banca echilibru Declarație pe General Ledger
 DocType: Job Applicant,Applicant Name,Nume solicitant
@@ -3525,24 +3573,24 @@
 apps/erpnext/erpnext/config/support.py +22,Warranty,garanţie
 DocType: Production Order,Warehouses,Depozite
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationary,Imprimare și staționare
-apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} activ nu pot fi transferate
+apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} activul nu poate fi transferat
 DocType: Workstation,per hour,pe oră
 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.
 DocType: Company,Distribution,Distribuire
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +8,Amount Paid,Sumă plătită
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Project Manager,Manager de Proiect
+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
 ,Quoted Item Comparison,Compararea Articol citat
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Dispatch,Expediere
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,Expediere
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Discount maxim permis pentru articol: {0} este {1}%
 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.
-DocType: Sales Invoice,Supplier Reference,Furnizor de referință
-apps/erpnext/erpnext/accounts/page/pos/pos.js +844,"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 +832,"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
@@ -3556,7 +3604,7 @@
 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 +83,Error in formula or condition,Eroare în formulă sau stare
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,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
@@ -3565,7 +3613,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},Pentru a Data ar trebui să fie în anul fiscal. Presupunând Pentru a Data = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Aici puteți stoca informatii despre inaltime, greutate, alergii, probleme medicale etc"
 DocType: Leave Block List,Applies to Company,Se aplică companiei
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +197,Cannot cancel because submitted Stock Entry {0} exists,"Nu pot anula, deoarece a prezentat Bursa de intrare {0} există"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +198,Cannot cancel because submitted Stock Entry {0} exists,"Nu pot anula, deoarece a prezentat Bursa de intrare {0} există"
 DocType: Purchase Invoice,In Words,În cuvinte
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,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
@@ -3575,14 +3623,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,Anul dvs. financiar începe la data de
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Deprecieri active și echilibrări
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +319,Amount {0} {1} transferred from {2} to {3},Suma {0} {1} transferat de la {2} la {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +322,Amount {0} {1} transferred from {2} to {3},Suma {0} {1} transferat de la {2} la {3}
 DocType: Sales Invoice,Get Advances Received,Obtine Avansurile Primite
 DocType: Email Digest,Add/Remove Recipients,Adăugaţi/Stergeţi Destinatari
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +432,Transaction not allowed against stopped Production Order {0},Tranzacție nu este permis împotriva oprit comandă de producție {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +437,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 +143,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 +652,Item variant {0} exists with same attributes,Postul varianta {0} există cu aceleași atribute
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Postul varianta {0} există cu aceleași atribute
+DocType: Leave Application,LAP/,LAP /
 DocType: Salary Slip,Salary Slip,Salariul Slip
 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ă
@@ -3590,12 +3639,12 @@
 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 +212,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 +215,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/public/js/controllers/transaction.js +866,It is needed to fetch Item Details.,Este nevoie să-i aducă Detalii despre articol.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +857,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
@@ -3605,14 +3654,14 @@
 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 +178,Invalid {0},Invalid {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Sick Leave,A concediului medical
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,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
 DocType: Warehouse,PIN,PIN
 DocType: Sales Invoice,Base Change Amount (Company Currency),De schimbare a bazei Suma (Companie Moneda)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +313,No accounting entries for the following warehouses,Nici o intrare contabile pentru următoarele depozite
-apps/erpnext/erpnext/projects/doctype/project/project.js +102,Save the document first.,Salvați documentul primul.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +314,No accounting entries for the following warehouses,Nici o intrare contabile pentru următoarele depozite
+apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Salvați documentul primul.
 DocType: Account,Chargeable,Taxabil/a
 DocType: Company,Change Abbreviation,Schimbarea abreviere
 DocType: Expense Claim Detail,Expense Date,Data cheltuieli
@@ -3625,10 +3674,9 @@
 DocType: Purchase Invoice,Recurring Print Format,Recurente Print Format
 DocType: C-Form,Series,Serii
 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
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,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
 DocType: Appraisal,Appraisal Template,Model expertiză
 DocType: Item Group,Item Classification,Postul Clasificare
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Business Development Manager,Manager pentru Dezvoltarea Afacerilor
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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
@@ -3638,8 +3686,8 @@
 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 +940,Please select {0} first,Vă rugăm selectați 0} {întâi
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +749,Batch {0} of Item {1} has expired.,Lot {0} din {1} Postul a expirat.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +953,Please select {0} first,Vă rugăm selectați 0} {întâi
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +757,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ă
@@ -3667,8 +3715,8 @@
  {% 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 +92,Warehouse not found in the system,Depozit nu a fost găsit în sistemul
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +106,This Month's Summary,Rezumat această lună
+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ă
 DocType: Quality Inspection Reading,Quality Inspection Reading,Inspecție de calitate Reading
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,'Blochează stocuri mai vechi decât' ar trebui să fie mai mic de %d zile.
 DocType: Tax Rule,Purchase Tax Template,Achiziționa Format fiscală
@@ -3678,21 +3726,22 @@
 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 +87,Please set Next Depreciation Date,Vă rugăm să setați Următoarea amortizare Data
-DocType: Payment Gateway,Payment Gateway,Gateway de plată
 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 +378,Operation Time must be greater than 0 for Operation {0},Funcționarea timp trebuie să fie mai mare decât 0 pentru funcționare {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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/accounts/doctype/account/account.py +170,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)
 DocType: Program,Program Abbreviation,Abreviere de program
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,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: Appraisal,Start Date,Data începerii
@@ -3708,21 +3757,22 @@
 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
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,De exemplu. smsgateway.com / API / send_sms.cgi
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +27,Transaction currency must be same as Payment Gateway currency,Moneda de tranzacție trebuie să fie aceeași ca și de plată Gateway monedă
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Transaction currency must be same as Payment Gateway currency,Moneda de tranzacție trebuie să fie aceeași ca și de plată Gateway monedă
 DocType: Payment Entry,Receive,Primi
+apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,Cotațiile:
 DocType: Maintenance Visit,Fully Completed,Completat in Intregime
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% complet
 DocType: Employee,Educational Qualification,Detalii Calificare de Învățământ
 DocType: Workstation,Operating Costs,Costuri de operare
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Acțiune în cazul în care Acumulate Buget lunar depășit
 DocType: Purchase Invoice,Submit on creation,Publica cu privire la crearea
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +432,Currency for {0} must be {1},Moneda pentru {0} trebuie să fie {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +435,Currency for {0} must be {1},Moneda pentru {0} trebuie să fie {1}
 DocType: Asset,Disposal Date,eliminare Data
 DocType: Employee Leave Approver,Employee Leave Approver,Aprobator Concediu Angajat
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,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 +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/crm/doctype/opportunity/opportunity.py +79,"Cannot declare as lost, because Quotation has been made.","Nu se poate declara pierdut, pentru că Oferta a fost realizata."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Cumpărare Maestru de Management
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +429,Production Order {0} must be submitted,Producția de Ordine {0} trebuie să fie prezentate
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +434,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
@@ -3732,25 +3782,27 @@
 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/accounts/report/general_ledger/general_ledger.py +181,Totals,Totaluri
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,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 +113,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 +120,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.
+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 +181,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/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 +793,All records are synced.,Toate înregistrările sunt sincronizate.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +781,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
 DocType: Cost Center,Cost Center Name,Nume Centrul de Cost
@@ -3769,21 +3821,20 @@
 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/selling/doctype/quotation/quotation.py +49,Cannot set as Lost as Sales Order is made.,Nu se poate seta pierdut deoarece se intocmeste comandă de vânzări.
-DocType: Student Applicant,Mother's Name,Numele mamei
 DocType: Request for Quotation Item,Supplier Part No,Furnizor de piesa
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +348,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Nu se poate deduce atunci când este categoria de &quot;evaluare&quot; sau &quot;Vaulation și Total&quot;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Received From,Primit de la
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Received From,Primit de la
 DocType: Lead,Converted,Transformat
 DocType: Item,Has Serial No,Are nr. de serie
 DocType: Employee,Date of Issue,Data Problemei
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{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 +93,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/projects/doctype/timesheet/timesheet.py +117,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
 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 +172,{0} {1} does not exist,{0} {1} nu există
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +175,{0} {1} does not exist,{0} {1} nu există
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,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 +72,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
@@ -3792,13 +3843,14 @@
 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/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
 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 +109,Electrical,Electric
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,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 +318,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}
@@ -3806,7 +3858,7 @@
 DocType: Item,Customer Code,Cod client
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +210,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 +292,Debit To account must be a Balance Sheet account,Debit la contul trebuie să fie un cont de bilanț
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To account must be a Balance Sheet account,Debit la contul trebuie să fie un cont de bilanț
 DocType: Buying Settings,Naming Series,Naming Series
 DocType: Leave Block List,Leave Block List Name,Denumire Lista Concedii Blocate
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Active stoc
@@ -3818,11 +3870,11 @@
 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 +301,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 +313,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: Sales Order Item,Ordered Qty,Ordonat Cantitate
-apps/erpnext/erpnext/stock/doctype/item/item.py +673,Item {0} is disabled,Postul {0} este dezactivat
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,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 +838,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 +809,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ă.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generează fluturașe de salariu
@@ -3830,23 +3882,24 @@
 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)
-apps/erpnext/erpnext/stock/doctype/item/item.py +485,Row #{0}: Please set reorder quantity,Row # {0}: Va rugam sa seta cantitatea reordona
+DocType: Sales Invoice Timesheet,Billing Hours,Ore de facturare
+apps/erpnext/erpnext/stock/doctype/item/item.py +487,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 +62,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
+DocType: Payment Entry,Allocate Payment Amount,Alocați Suma de plată
 DocType: Employee External Work History,Salary,Salariu
 DocType: Serial No,Delivery Document Type,Tipul documentului de Livrare
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Să prezinte toate fișele de salariu pentru criteriile selectate de mai sus
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} articole sincronizate
 DocType: Sales Order,Partly Delivered,Parțial livrate
-DocType: Sales Invoice,Existing Customer,Client Existent
 DocType: Email Digest,Receivables,Creanțe
+DocType: Lead Source,Lead Source,Sursa de plumb
 DocType: Customer,Additional information regarding the customer.,Informații suplimentare cu privire la client.
 DocType: Quality Inspection Reading,Reading 5,Lectură 5
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +38,Campaign Name is required,Denumirea campaniei este necesară
 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
@@ -3855,10 +3908,9 @@
 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 +129,BOM and Manufacturing Quantity are required,BOM și cantitatea de producție sunt necesare
+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/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Clasă de uzură 2
 DocType: SG Creation Tool Course,Max Strength,Putere max
-DocType: Bank Reconciliation Detail,Amount,Sumă
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM înlocuit
 ,Sales Analytics,Analitice de vânzare
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +113,Available {0},Disponibile {0}
@@ -3866,14 +3918,14 @@
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Configurarea e-mail
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +96,Please enter default currency in Company Master,Va rugam sa introduceti moneda implicit în Compania de Master
 DocType: Stock Entry Detail,Stock Entry Detail,Stoc de intrare Detaliu
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +100,Daily Reminders,Memento de zi cu zi
+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/account/account_tree.js +23,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 +71,Customer Service,Service Client
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Customer Service,Service Client
 DocType: Homepage Featured Product,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ă.
@@ -3882,8 +3934,9 @@
 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
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Implicit Lucrări în depozit Progress
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1570,Total nos of serial no is not equal to quantity.,Nr total de nici un serial nu este egală cu cantitatea.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1594,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
@@ -3891,9 +3944,10 @@
 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 +82,Engineer,Inginer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,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 +370,Item Code required at Row No {0},Cod Articol necesar la inregistrarea Nr. {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +398,Item Code required at Row No {0},Cod Articol necesar la inregistrarea Nr. {0}
 DocType: Sales Partner,Partner Type,Tip partener
 DocType: Purchase Taxes and Charges,Actual,Efectiv
 DocType: Authorization Rule,Customerwise Discount,Reducere Client
@@ -3909,16 +3963,18 @@
 DocType: BOM,Raw Material Cost,Materie primă Cost
 DocType: Item Reorder,Re-Order Level,Nivelul de re-comandă
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Introduceti articole și cant planificată pentru care doriți să intocmiti ordine de producție sau sa descărcati materii prime pentru analiză.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +55,Part-time,Part-time
+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
 DocType: Employee,Applicable Holiday List,Listă de concedii aplicabile
 DocType: Employee,Cheque,Cheque
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Seria Actualizat
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +57,Series Updated,Seria Actualizat
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Tip de raport este obligatorie
 DocType: Item,Serial Number Series,Serial Number Series
 apps/erpnext/erpnext/buying/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 +87,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
@@ -3932,7 +3988,7 @@
 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 +513,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 +518,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.
@@ -3942,7 +3998,7 @@
 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/stock/doctype/stock_entry/stock_entry.py +158,Target warehouse in row {0} must be same as Production Order,Depozit țintă în rândul {0} trebuie să fie același ca și de producție de comandă
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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ă
 DocType: Company,Round Off Account,Rotunji cont
@@ -3951,23 +4007,22 @@
 DocType: Customer Group,Parent Customer Group,Părinte Client Group
 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 +180,Notice Period,Perioada De Preaviz
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,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 +4,New Sales Person Name,Nume nou Agent de vânzări
 DocType: Packing Slip,Gross Weight UOM,Greutate Brută UOM
-DocType: Email Digest,Receivables / Payables,Creanțe / Datorii
 DocType: Delivery Note Item,Against Sales Invoice,Comparativ facturii de vânzări
 DocType: Bin,Reserved Qty for Production,Rezervat Cantitate pentru producție
 DocType: Asset,Frequency of Depreciation (Months),Frecventa de amortizare (Luni)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +469,Credit Account,Cont de credit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Credit Account,Cont de credit
 DocType: Landed Cost Item,Landed Cost Item,Cost Final Articol
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +55,Show zero values,Afiseaza valorile nule
+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
 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 +647,Please specify Attribute Value for attribute {0},Vă rugăm să specificați Atribut Valoare pentru atribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Vă rugăm să specificați Atribut Valoare pentru atribut {0}
 DocType: Item,Default Warehouse,Depozit Implicit
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +39,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
@@ -3989,19 +4044,22 @@
 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
-DocType: Sales Invoice,Cold Calling,Apelare Rece
 DocType: SMS Parameter,SMS Parameter,SMS Parametru
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,Buget și centru de cost
 DocType: Maintenance Schedule Item,Half Yearly,Semestrial
 DocType: Lead,Blog Subscriber,Abonat blog
+DocType: Guardian,Alternate Number,Număr alternativ
 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.
+DocType: Stock Reconciliation Item,Quantity Difference,cantitate diferenţă
 apps/erpnext/erpnext/config/hr.py +253,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 +141,Set as Lost,Setați ca Lost
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,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 +5,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
 DocType: Supplier,Credit Days Based On,Zile de credit pe baza
@@ -4013,11 +4071,10 @@
 ,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 +941,Select or add new customer,Selectați sau adăugați client nou
+apps/erpnext/erpnext/accounts/page/pos/pos.js +930,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 +5,This is based on the attendance of this Employee,Aceasta se bazează pe prezența a acestui angajat
-DocType: Sales Invoice,Frequency,Frecvență
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +463,Debit Account,Contul debit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,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)
@@ -4026,27 +4083,27 @@
 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 +210,Supplier Quotation {0} created,Furnizor de oferta {0} creat
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +208,Supplier Quotation {0} created,Furnizor de oferta {0} creat
 apps/erpnext/erpnext/accounts/report/financial_statements.py +90,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 +173,Employee Benefits,Beneficiile angajatului
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,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 +228,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 +232,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 +499,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 +500,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 +1007,Price List not found or disabled,Lista de preturi nu a fost găsit sau cu handicap
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1008,Price List not found or disabled,Lista de preturi nu a fost găsit sau cu handicap
 DocType: Expense Claim,Approved,Aprobat
 DocType: Pricing Rule,Price,Preț
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +244,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 +256,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
@@ -4057,12 +4114,12 @@
 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 +259,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 +266,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 +190,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 +235,Please enter Expense Account,Va rugam sa introduceti cont de cheltuieli
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,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 +963,"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 +976,"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
@@ -4077,9 +4134,10 @@
 DocType: Asset Movement,Transaction Date,Data tranzacției
 DocType: Production Plan Item,Planned Qty,Planificate Cantitate
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,Taxa totală
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,For Quantity (Manufactured Qty) is mandatory,Pentru Cantitate (fabricat Cant) este obligatorie
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,For Quantity (Manufactured Qty) is mandatory,Pentru Cantitate (fabricat Cant) este obligatorie
 DocType: Stock Entry,Default Target Warehouse,Depozit Tinta Implicit
 DocType: Purchase Invoice,Net Total (Company Currency),Net total (Compania de valuta)
+apps/erpnext/erpnext/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 +78,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: Production Order,Actual Start Date,Dată Efectivă de Început
@@ -4094,9 +4152,11 @@
 DocType: Warranty Claim,If different than customer address,In cazul in care difera de adresa clientului
 DocType: BOM Operation,BOM Operation,Operațiune BOM
 DocType: Purchase Taxes and Charges,On Previous Row Amount,La rândul precedent Suma
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +226,Transfer Asset,activ de transfer
+DocType: Student,Home Address,Adresa de acasa
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +227,Transfer Asset,activ de transfer
 DocType: POS Profile,POS Profile,POS Profil
 apps/erpnext/erpnext/config/schools.py +33,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 +129,"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
@@ -4106,8 +4166,8 @@
 DocType: Assessment,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 +765,Material to Supplier,Material de Furnizor
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +189,Excise Invoice,Accize factură
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,Material to Supplier,Material de Furnizor
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,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
@@ -4117,7 +4177,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,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 +136,Credit Card,Card de Credit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,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.
 DocType: Purchase Invoice,Next Date,Data viitoare
@@ -4125,6 +4185,7 @@
 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: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Aici puteți stoca detalii despre familie, cum ar fi numele și ocupația parintelui, sotului/sotiei și copiilor"
+DocType: Academic Term,Term End Date,Termenul Data de încheiere
 DocType: Hub Settings,Seller Name,Nume vânzător
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Impozite și taxe deduse (Compania de valuta)
 DocType: Item Group,General Settings,Setări generale
@@ -4136,7 +4197,7 @@
 DocType: Customer,Commission Rate,Rata de Comision
 apps/erpnext/erpnext/stock/doctype/item/item.js +261,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 +115,"Payment Type must be one of Receive, Pay and Internal Transfer","Tipul de plată trebuie să fie unul dintre Primire, Pay și de transfer intern"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +118,"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/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Coșul este gol
 DocType: Production Order,Actual Operating Cost,Cost efectiv de operare
@@ -4151,10 +4212,10 @@
 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
 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 +92,Designer,Proiectant
+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
 DocType: Serial No,Delivery Details,Detalii Livrare
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +469,Cost Center is required in row {0} in Taxes table for type {1},Centrul de Cost este necesar pentru inregistrarea {0} din tabelul Taxe pentru tipul {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +472,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
 ,Item-wise Purchase Register,Registru Achizitii Articol-Avizat
 DocType: Batch,Expiry Date,Data expirării
@@ -4164,12 +4225,12 @@
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Maestru proiect.
 apps/erpnext/erpnext/controllers/status_updater.py +174,"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 +417, (Half Day),(Jumatate de zi)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425, (Half Day),(Jumatate de zi)
 DocType: Supplier,Credit Days,Zile de Credit
 DocType: Leave Type,Is Carry Forward,Este Carry Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +740,Get Items from BOM,Obține articole din FDM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +711,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 +549,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/controllers/accounts_controller.py +552,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
diff --git a/erpnext/translations/ru.csv b/erpnext/translations/ru.csv
index 73998ed..052edbe 100644
--- a/erpnext/translations/ru.csv
+++ b/erpnext/translations/ru.csv
@@ -18,11 +18,10 @@
 DocType: Sales Partner,Dealer,Дилер
 DocType: Employee,Rented,Арендованный
 DocType: Purchase Order,PO-,PO-
-apps/erpnext/erpnext/accounts/report/financial_statements.py +19,Start Year {0} not found.,Год начала {0} не найден.
 DocType: POS Profile,Applicable for User,Применимо для пользователя
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +191,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Остановился производственного заказа не может быть отменено, откупоривать сначала отменить"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +197,Do you really want to scrap this asset?,Вы действительно хотите отказаться от этого актива?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +17,Select Default Supplier,Выберите По умолчанию Поставщик
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +192,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Остановился производственного заказа не может быть отменено, откупоривать сначала отменить"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +198,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 +36,Currency is required for Price List {0},Валюта необходима для Прейскурантом {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Будет рассчитана в сделке.
 DocType: Address,County,округ
@@ -42,46 +41,45 @@
 DocType: Sales Invoice,Customer Name,Наименование заказчика
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +126,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 +180,Outstanding for {0} cannot be less than zero ({1}),Выдающийся для {0} не может быть меньше нуля ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,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 +148,Series Updated Successfully,Серия Обновлено Успешно
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +149,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,Все поставщиком Связаться
-DocType: Quality Inspection Reading,Parameter,Параметр
 apps/erpnext/erpnext/projects/doctype/project/project.py +54,Expected End Date can not be less than Expected Start Date,"Ожидаемая Дата окончания не может быть меньше, чем ожидалось Дата начала"
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,"Ряд # {0}: цена должна быть такой же, как {1}: {2} ({3} / {4})"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +239,New Leave Application,Новый Оставить заявку
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,New Leave Application,Новый Оставить заявку
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +20,Attendance Record {0} exists against Student {1} for Course Schedule {2},Рекордное {0} существует против Student {1} для Расписание курсов {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Bank Draft,Банковский счет
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,Банковский счет
 DocType: Mode of Payment Account,Mode of Payment Account,Форма оплаты счета
 apps/erpnext/erpnext/stock/doctype/item/item.js +52,Show Variants,Показать варианты
 DocType: Academic Term,Academic Term,академический срок
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +13,Material,материал
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Quantity,Количество
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +511,Accounts table cannot be blank.,Учетные записи таблицы не может быть пустым.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +616,Quantity,Количество
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +512,Accounts table cannot be blank.,Учетные записи таблицы не может быть пустым.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,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,Назначение
 DocType: Production Plan Item,Production Plan Item,Производственный план Пункт
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +142,User {0} is already assigned to Employee {1},Пользователь {0} уже назначен сотрудником {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Здравоохранение
-DocType: Purchase Invoice,Monthly,Ежемесячно
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Задержка в оплате (дни)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +771,Invoice,Счет
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +750,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 +198,Row {0}: {1} {2} does not match with {3},Ряд {0}: {1} {2} не соответствует {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Ряд # {0}:
+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 +127,Please select Price List,"Пожалуйста, выберите прайс-лист"
@@ -112,8 +110,8 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,То же компания вошла более чем один раз
 DocType: Employee,Married,Замужем
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Не допускается для {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +589,Get items from,Получить товары от
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +382,Stock cannot be updated against Delivery Note {0},Фото не могут быть обновлены против накладной {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Получить товары от
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,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,Продуктовый
@@ -122,7 +120,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 +156,Salary Structure Missing,Структура заработной платы Отсутствующий
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Salary Structure Missing,Структура заработной платы Отсутствующий
 DocType: Lead,Person Name,Имя лица
 DocType: Sales Invoice Item,Sales Invoice Item,Счет продаж товара
 DocType: Account,Credit,Кредит
@@ -130,10 +128,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 +156,Credit limit has been crossed for customer {0} {1}/{2},Кредитный лимит был перейден для клиента {0} {1} / {2}
-apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Фиксирована активов&quot; не может быть снят, поскольку запись активов существует в отношении пункта"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +189,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; не может быть снят, поскольку запись активов существует в отношении пункта"
 DocType: Tax Rule,Tax Type,Налоги Тип
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +144,You are not authorized to add or update entries before {0},"Вы не авторизованы, чтобы добавить или обновить записи до {0}"
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},"Вы не авторизованы, чтобы добавить или обновить записи до {0}"
 DocType: Item,Item Image (if not slideshow),Пункт изображения (если не слайд-шоу)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Существует клиентов с одноименным названием
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Почасовая Ставка / 60) * Фактическая время работы
@@ -143,18 +142,17 @@
 DocType: Student Log,Student Log,Студент Вход
 DocType: Quality Inspection,Get Specification Details,Получить спецификации подробно
 DocType: Lead,Interested,Заинтересованный
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +165,Opening,Открытие
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,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/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Клиент&gt; Группа клиентов&gt; Территория
 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.,Счет существующей проводки не может быть преобразован в группу.
 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,"Пожалуйста, введите название первой Компании"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Company first,"Пожалуйста, выберите КОМПАНИЯ Первый"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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,Общая стоимость
@@ -164,7 +162,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Выписка по счету
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Фармацевтика
 DocType: Purchase Invoice Item,Is Fixed Asset,Фиксирована Asset
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Available qty is {0}, you need {1}","Доступный кол-во: {0}, необходимо {1}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +225,"Available qty is {0}, you need {1}","Доступный кол-во: {0}, необходимо {1}"
 DocType: Expense Claim Detail,Claim Amount,Сумма претензии
 DocType: Employee,Mr,Г-н
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Тип Поставщик / Поставщик
@@ -173,26 +171,27 @@
 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: Assessment Result,Grade,класс
 DocType: Sales Invoice Item,Delivered By Supplier,Поставленные Поставщиком
 DocType: SMS Center,All Contact,Все Связаться
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Annual Salary,Годовой оклад
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Расходы по Запасам
-apps/erpnext/erpnext/accounts/report/financial_statements.py +22,End Year {0} not found.,Год окончания {0} не найден.
 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}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Поставка сырья для покупки
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +130,At least one mode of payment is required for POS invoice.,По крайней мере один способ оплаты требуется для POS счета.
 DocType: Products Settings,Show Products as a List,Показать продукты списком
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Скачать шаблон, заполнить соответствующие данные и приложить измененный файл.
  Все даты и сотрудник сочетание в выбранный период придет в шаблоне, с существующими посещаемости"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +451,Item {0} is not active or end of life has been reached,Пункт {0} не является активным или конец жизни был достигнут
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +456,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/controllers/accounts_controller.py +614,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Для учета налога в строке {0} в размере Item, налоги в строках должны быть также включены {1}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +617,"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 +166,Settings for HR Module,Настройки для модуля HR
 DocType: SMS Center,SMS Center,SMS центр
 DocType: Sales Invoice,Change Amount,Изменение Сумма
@@ -204,13 +203,13 @@
 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 +147,Execution,Реализация
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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,Предметы и Цены
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Общее количество часов: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},С даты должно быть в пределах финансового года. Предполагая С даты = {0}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,Cost Center {0} does not belong to Company {1},МВЗ {0} не принадлежит компании {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +100,Cost Center {0} does not belong to Company {1},МВЗ {0} не принадлежит компании {1}
 DocType: Customer,Individual,Индивидуальная
 DocType: Interest,Academics User,Академики Пользователь
 DocType: Cheque Print Template,Amount In Figure,Сумма На рисунке
@@ -226,30 +225,32 @@
 DocType: Production Planning Tool,Sales Orders,Заказы клиентов
 DocType: Purchase Taxes and Charges,Valuation,Оценка
 ,Purchase Order Trends,Заказ на покупку Тенденции
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,The request for quotation can be accessed by clicking on the following link,"Запрос котировок можно получить, перейдя по следующей ссылке"
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,Выделите листья в течение года.
 DocType: SG Creation Tool Course,SG Creation Tool Course,SG Создание курса инструмента
 DocType: Student Group Creation Tool,Leave blank if you wish to fetch all courses for selected academic term,"Оставьте пустым, если вы хотите, чтобы извлечь все курсы для выбранного учебного семестра"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,Insufficient Stock,Недостаточный Stock
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227,Insufficient Stock,Недостаточный Stock
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Отключить планирование емкости и отслеживание времени
+DocType: Email Digest,New Sales Orders,Новые заказы на продажу
 DocType: Bank Reconciliation,Bank Account,Банковский счет
 DocType: Leave Type,Allow Negative Balance,Разрешить отрицательное сальдо
 DocType: Selling Settings,Default Territory,По умолчанию Территория
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Телевидение
 DocType: Production Order Operation,Updated via 'Time Log',"Обновлено помощью ""Time Вход"""
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} does not belong to Company {1},Аккаунт {0} не принадлежит компании {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +86,Account {0} does not belong to Company {1},Аккаунт {0} не принадлежит компании {1}
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},"Предварительная сумма не может быть больше, чем {0} {1}"
 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 +174,For Warehouse is required before Submit,Для требуется Склад перед Отправить
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,For Warehouse is required before Submit,Для требуется Склад перед Отправить
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Поступило На
 DocType: Sales Partner,Reseller,Торговый посредник
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,"Пожалуйста, введите название Компании"
 DocType: Delivery Note Item,Against Sales Invoice Item,На накладная Пункт
 ,Production Orders in Progress,Производственные заказы в Прогресс
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Cash from Financing,Чистые денежные средства от финансовой
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1436,"LocalStorage is full , did not save","LocalStorage полон, не спасло"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1460,"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}
@@ -262,18 +263,19 @@
 apps/erpnext/erpnext/templates/generators/item.html +78,No description given,Не введено описание
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Запрос на покупку.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +5,This is based on the Time Sheets created against this project,"Это основано на табелей учета рабочего времени, созданных против этого проекта"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Only the selected Leave Approver can submit this Leave Application,Только выбранный Оставить утверждающий мог представить этот Оставить заявку
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +213,Only the selected Leave Approver can submit this Leave Application,Только выбранный Оставить утверждающий мог представить этот Оставить заявку
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Освобождение Дата должна быть больше даты присоединения
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Leaves per Year,Листья в год
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,Листья в год
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Ряд {0}: Пожалуйста, проверьте 'Как Advance ""против счета {1}, если это заранее запись."
 apps/erpnext/erpnext/stock/utils.py +188,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,Литр
 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 +435,Leave Blocked,Оставьте Заблокированные
-apps/erpnext/erpnext/stock/doctype/item/item.py +669,Item {0} has reached its end of life on {1},Пункт {0} достигла своей жизни на {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +443,Leave Blocked,Оставьте Заблокированные
+apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item {0} has reached its end of life on {1},Пункт {0} достигла своей жизни на {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +95,Bank Entries,Банковские записи
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +83,Annual,За год
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +86,Annual,За год
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Товар с Сверки Запасов
 DocType: Stock Entry,Sales Invoice No,Номер Счета Продажи
 DocType: Material Request Item,Min Order Qty,Минимальный заказ Кол-во
@@ -281,20 +283,22 @@
 DocType: Lead,Do Not Contact,Не обращайтесь
 apps/erpnext/erpnext/public/js/setup_wizard.js +360,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 +91,Software Developer,Разработчик Программного обеспечения
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,Разработчик Программного обеспечения
 DocType: Item,Minimum Order Qty,Минимальное количество заказа
 DocType: Pricing Rule,Supplier Type,Тип поставщика
 DocType: Scheduling Tool,Course Start Date,Дата начала курса
 DocType: Item,Publish in Hub,Опубликовать в Hub
+DocType: Student Admission,Student Admission,приёму студентов
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is cancelled,Пункт {0} отменяется
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Material Request,Заказ материалов
+apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} is cancelled,Пункт {0} отменяется
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +823,Material Request,Заказ материалов
 DocType: Bank Reconciliation,Update Clearance Date,Обновление просвет Дата
 apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +28,Abbreviation already used for another salary component,Аббревиатура уже используется для другого компонента заработной платы
 DocType: Item,Purchase Details,Покупка Подробности
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +328,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Пункт {0} не найден в &quot;давальческое сырье&quot; таблицы в Заказе {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +333,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/config/selling.py +18,Confirmed orders from Customers.,Подтвержденные заказы от клиентов.
 DocType: Purchase Receipt Item,Rejected Quantity,Отклонен Количество
 DocType: SMS Settings,SMS Sender Name,Имя отправителя SMS
@@ -310,20 +314,21 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +130,Please select Charge Type first,"Пожалуйста, выберите Charge Тип первый"
 DocType: Student Group Student,Student Group Student,Студенческая группа Student
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Последние
+DocType: Email Digest,New Quotations,Новые Котировки
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Оставить утверждающий в списке будет установлен по умолчанию Оставить утверждающего
 DocType: Tax Rule,Shipping County,графство Доставка
 apps/erpnext/erpnext/config/desktop.py +158,Learn,Обучение
 DocType: Asset,Next Depreciation Date,Следующий Износ Дата
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Деятельность Стоимость одного работника
 DocType: Accounts Settings,Settings for Accounts,Настройки для счетов
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +626,Supplier Invoice No exists in Purchase Invoice {0},Поставщик Счет-фактура не существует в счете-фактуре {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +629,Supplier Invoice No exists in Purchase Invoice {0},Поставщик Счет-фактура не существует в счете-фактуре {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Управление менеджера по продажам дерево.
 DocType: Job Applicant,Cover Letter,Сопроводительное письмо
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,"Выдающиеся чеки и депозиты, чтобы очистить"
 DocType: Item,Synced With Hub,Синхронизированные со ступицей
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Неправильный Пароль
 DocType: Item,Variant Of,Вариант
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,Completed Qty can not be greater than 'Qty to Manufacture',"Завершен Кол-во не может быть больше, чем ""Кол-во для изготовления"""
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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 +86,Circular Reference Error,Циклическая ссылка Ошибка
@@ -335,15 +340,16 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Сообщите по электронной почте по созданию автоматической запрос материалов
 DocType: Journal Entry,Multi Currency,Мульти валюта
 DocType: Payment Reconciliation Invoice,Invoice Type,Тип счета
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +806,Delivery Note,Документы  Отгрузки
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +800,Delivery Note,Документы  Отгрузки
 apps/erpnext/erpnext/config/learn.py +87,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 +233,Payment Entry has been modified after you pulled it. Please pull it again.,"Оплата запись была изменена после того, как вытащил его. Пожалуйста, вытащить его снова."
+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/setup/doctype/email_digest/email_digest.py +104,Summary for this week and pending activities,Резюме на этой неделе и в ожидании деятельности
+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","Введите электронный идентификатор разделенных запятыми, счет будет автоматически отправлен на определенную дату"
 DocType: Employee,Company Email,Email предприятия
@@ -355,28 +361,29 @@
 apps/erpnext/erpnext/config/hr.py +186,"Employee designation (e.g. CEO, Director etc.).","Сотрудник обозначение (например, генеральный директор, директор и т.д.)."
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,"Пожалуйста, введите 'Repeat на день месяца' значения поля"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Курс по которому валюта Покупателя конвертируется в базовую валюту покупателя
-apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Строка # {0}: Покупка Счет-фактура не может быть сделано в отношении существующего актива {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +554,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Строка # {0}: Покупка Счет-фактура не может быть сделано в отношении существующего актива {1}
 DocType: Item Tax,Tax Rate,Размер налога
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} уже выделено сотруднику  {1} на период с {2} по {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +812,Select Item,Выбрать пункт
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +791,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/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Покупка Счет {0} уже подано
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},"Ряд # {0}: Пакетное Нет должно быть таким же, как {1} {2}"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +143,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.,Партия позиций.
 DocType: C-Form Invoice Detail,Invoice Date,Дата Счета
 DocType: GL Entry,Debit Amount,Дебет Сумма
 apps/erpnext/erpnext/accounts/party.py +242,There can only be 1 Account per Company in {0} {1},Там может быть только 1 аккаунт на компанию в {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +4,Your email address,Ваш адрес электронной почты
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +342,Please see attachment,"Пожалуйста, см. приложение"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,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 +19,Setup Already Complete!!,Настройка Уже завершена!!
 ,Finished Goods,Готовая продукция
 DocType: Delivery Note,Instructions,Инструкции
 DocType: Quality Inspection,Inspected By,Проверено
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Поставщик&gt; Поставщик Тип
 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,Добавить товары
@@ -390,29 +397,29 @@
 DocType: Currency Exchange,Currency Exchange,Курс обмена валюты
 DocType: Purchase Invoice Item,Item Name,Название элемента
 DocType: Authorization Rule,Approving User  (above authorized value),Утверждении пользователь (выше уставного стоимости)
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Остаток кредита
+DocType: Email Digest,Credit Balance,Остаток кредита
 DocType: Employee,Widowed,Овдовевший
 DocType: Request for Quotation,Request for Quotation,Запрос предложения
 DocType: Salary Slip Timesheet,Working Hours,Часы работы
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Изменение начального / текущий порядковый номер существующей серии.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Если несколько правил ценообразования продолжают преобладать, пользователям предлагается установить приоритет вручную разрешить конфликт."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +736,Purchase Return,Покупка Вернуться
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +715,Purchase Return,Покупка Вернуться
 ,Purchase Register,Покупка Становиться на учет
 DocType: Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Взимаемых платежах
 DocType: Workstation,Consumable Cost,Расходные Стоимость
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +202,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) должен иметь роль ""Leave Approver"""
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) должен иметь роль ""Leave Approver"""
 DocType: Purchase Receipt,Vehicle Date,Дата
 DocType: Student Log,Medical,Медицинский
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Причина потери
-apps/erpnext/erpnext/accounts/utils.py +239,Allocated amount can not greater than unadjusted amount,Выделенная сумма не может превышать суммы нерегулируемого
+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,Выделенная сумма не может превышать суммы нерегулируемого
 DocType: Announcement,Receiver,Получатель
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Рабочая станция закрыта в следующие сроки согласно Список праздников: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Возможности
 DocType: Employee,Single,Единственный
 DocType: Account,Cost of Goods Sold,Себестоимость проданного товара
 DocType: Purchase Invoice,Yearly,Ежегодно
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +225,Please enter Cost Center,"Пожалуйста, введите МВЗ"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,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
@@ -425,26 +432,26 @@
 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,Проверять Уникальность Номера Счетов получаемых от Поставщика
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',"""До Дела №"" не может быть меньше, чем ""От Дела №"""
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,Non Profit,Некоммерческое предприятие
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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: Stock Reconciliation Item,Do not include symbols (ex. $),Не включать символы (напр. $)
 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 +638,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} выбран несколько раз в Таблице Атрибутов
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} выбран несколько раз в Таблице Атрибутов
 DocType: HR Settings,Employee record is created using selected field. ,
 DocType: Sales Order,Not Applicable,Не применяется
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Мастер отдыха.
 DocType: Request for Quotation Item,Required Date,Требуется Дата
 DocType: Delivery Note,Billing Address,Адрес для выставления счетов
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +862,Please enter Item Code.,"Пожалуйста, введите Код товара."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +847,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","Если флажок установлен, сумма налога будет считаться уже включены в Печать Оценить / Количество печати"
@@ -458,12 +465,12 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Ценные бумаги и депозиты
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,"Всего листья, выделенные является обязательным"
 DocType: Job Opening,Description of a Job Opening,Описание работу Открытие
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Pending activities for today,В ожидании деятельность на сегодняшний день
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,В ожидании деятельность на сегодняшний день
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Информация о посещаемости.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Заработная плата Компонент для расчета заработной платы на основе расписания.
 DocType: Sales Order Item,Used for Production Plan,Используется для производственного плана
 DocType: Manufacturing Settings,Time Between Operations (in mins),Время между операциями (в мин)
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +92,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} Бюджет на Счет {1} против МВЗ {2} {3}. Он будет превышать {4}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +95,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} Бюджет на Счет {1} против МВЗ {2} {3}. Он будет превышать {4}
 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,Отобранные ВОМ не для того же пункта
@@ -471,16 +478,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +238,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 +86,Administrative Officer,Администратор
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,Администратор
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +23,Acutal Qty {0} / Waiting Qty {1},Acutal Кол-во {0} / Ожидание Кол-во {1}
 DocType: Timesheet Detail,Hrs,часов
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +319,Please select Company,"Пожалуйста, выберите компанию"
-DocType: Stock Entry,Difference Account,Счет разницы
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +309,Please select Company,"Пожалуйста, выберите компанию"
+DocType: Stock Entry Detail,Difference Account,Счет разницы
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,"Невозможно закрыть задача, как ее зависит задача {0} не закрыт."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Please enter Warehouse for which Material Request will be raised,"Пожалуйста, введите Склад для которых Материал Запрос будет поднят"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +399,Please enter Warehouse for which Material Request will be raised,"Пожалуйста, введите Склад для которых Материал Запрос будет поднят"
 DocType: Production Order,Additional Operating Cost,Дополнительные Эксплуатационные расходы
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Косметика
-apps/erpnext/erpnext/stock/doctype/item/item.py +530,"To merge, following properties must be same for both items","Чтобы объединить, следующие свойства должны быть одинаковыми для обоих пунктов"
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,"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 +28,Buy,купить
@@ -488,7 +495,7 @@
 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 +1563,Serial no item cannot be a fraction,Серийный ни один элемент не может быть дробным
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1587,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,Управление субподряда
@@ -497,13 +504,14 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Account {0} does not belong to company: {1},Аккаунт {0} не принадлежит компании: {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation already used for another company,Аббревиатура уже используется для другой компании
 DocType: Selling Settings,Default Customer Group,По умолчанию Группа клиентов
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Supplier is required against Payable account {0},Поставщик требуется от расчётном счету {0}
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Если отключить, 'закругленными Всего' поле не будет виден в любой сделке"
 DocType: BOM,Operating Cost,Эксплуатационные затраты
 DocType: Sales Order Item,Gross Profit,Валовая прибыль
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +42,Increment cannot be 0,Прирост не может быть 0
 DocType: Production Planning Tool,Material Requirement,Потребности в материалах
 DocType: Company,Delete Company Transactions,Удалить Сделки Компания
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +313,Reference No and Reference Date is mandatory for Bank transaction,Ссылка № и дата Reference является обязательным для операции банка
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +316,Reference No and Reference Date is mandatory for Bank transaction,Ссылка № и дата Reference является обязательным для операции банка
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Добавить / Изменить Налоги и сборы
 DocType: Purchase Invoice,Supplier Invoice No,Поставщик Счет Нет
 DocType: Territory,For reference,Для справки
@@ -514,7 +522,6 @@
 DocType: Installation Note Item,Installation Note Item,Установка Примечание Пункт
 DocType: Production Plan Item,Pending Qty,В ожидании Кол-во
 DocType: Budget,Ignore,Игнорировать
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Код товара&gt; Группа товара&gt; Марка
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,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
@@ -525,11 +532,11 @@
 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/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Не записи не найдено в таблице счетов
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +28,Please select Company and Party Type first,"Пожалуйста, выберите компании и партийных первого типа"
+apps/erpnext/erpnext/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/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 +707,Make Sales Order,Сделать заказ клиента
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +701,Make Sales Order,Сделать заказ клиента
 DocType: Project Task,Project Task,Проект Задача
 ,Lead Id,ID лида
 DocType: C-Form Invoice Detail,Grand Total,Общий итог
@@ -545,7 +552,8 @@
 DocType: Job Applicant,Resume Attachment,резюме Приложение
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Постоянных клиентов
 DocType: Leave Control Panel,Allocate,Выделить
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +734,Sales Return,Возвраты с продаж
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +728,Sales Return,Возвраты с продаж
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +91,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 кораблей)
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,База данных потенциальных клиентов.
@@ -554,14 +562,13 @@
 DocType: Quotation,Quotation To,Цитата Для
 DocType: Lead,Middle Income,Средний доход
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +212,Opening (Cr),Открытие (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +795,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"По умолчанию Единица измерения для п {0} не может быть изменен непосредственно, потому что вы уже сделали некоторые сделки (сделок) с другим UOM. Вам нужно будет создать новый пункт для использования другого умолчанию единица измерения."
-apps/erpnext/erpnext/accounts/utils.py +237,Allocated amount can not be negative,Выделенные сумма не может быть отрицательным
+apps/erpnext/erpnext/stock/doctype/item/item.py +797,Default Unit of Measure for Item {0} cannot be changed directly because 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,Выделенные сумма не может быть отрицательным
 DocType: Purchase Order Item,Billed Amt,Счетов выдано кол-во
 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 +91,Reference No & Reference Date is required for {0},Ссылка № & Ссылка Дата необходим для {0}
-DocType: Sales Invoice,Customer's Vendor,Производитель Клиентам
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Proposal Writing,Предложение Написание
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,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","Если этот флажок установлен, сырье для элементов, которые являются субподрядчиками будут включены в материале запросов"
@@ -570,13 +577,14 @@
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,Отслеживание времени
 DocType: Fiscal Year Company,Fiscal Year Company,Финансовый год компании
 DocType: Packing Slip Item,DN Detail,DN Деталь
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +257,Already supplier quotation has created,Уже поставщиком цитата создал
 DocType: Timesheet,Billed,Выдавать счета
 DocType: Batch,Batch Description,Описание партии
+apps/erpnext/erpnext/accounts/utils.py +685,"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 +733,View Offline Records,Offline Просмотр записей
+apps/erpnext/erpnext/accounts/page/pos/pos.js +715,View Offline Records,Offline Просмотр записей
+DocType: Student,Sibling Details,подробности Родственные
 DocType: Employee,Reason for Resignation,Причиной отставки
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,Шаблон для аттестации.
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,Счет / Журнал вступления подробнее
@@ -590,7 +598,7 @@
 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,Чистое изменение в инвентаризации
 DocType: Employee,Passport Number,Номер паспорта
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Manager,Менеджер
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,Менеджер
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,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,"""На основании"" и ""Группировка по"" не могут быть одинаковыми"
@@ -599,10 +607,11 @@
 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 +299,Timesheet created:,Timesheet создано:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +715,Please set default Cash or Bank account in Mode of Payment {0},"Пожалуйста, установите Cash умолчанию или банковский счет в режим оплаты {0}"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +300,Timesheet created:,Timesheet создано:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +772,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,зачислять
 DocType: Selling Settings,Customer Naming By,Именование клиентов По
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Пожалуйста, установите сотрудников система имен в людских ресурсов&gt; HR Настройки"
 DocType: Depreciation Schedule,Depreciation Amount,Амортизация основных средств Сумма
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,Преобразовать в группе
 DocType: Activity Cost,Activity Type,Тип активности
@@ -627,6 +636,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,Конец
 DocType: Pricing Rule,Sales Manager,Менеджер по продажам
 DocType: Salary Structure Employee,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,Прибыль / убытках по утилизации активов
@@ -641,11 +651,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +9,Pre Sales,Предпродажа
 DocType: Purchase Receipt,Other Details,Другие детали
 DocType: Account,Accounts,Учётные записи
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Marketing,Маркетинг
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +227,Payment Entry is already created,Оплата запись уже создан
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,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 +538,Row #{0}: Asset {1} does not linked to Item {2},Строка # {0}: Asset {1} не связан с п {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +21,Preview Salary Slip,Просмотр Зарплата скольжению
+apps/erpnext/erpnext/controllers/accounts_controller.py +541,Row #{0}: Asset {1} does not linked to Item {2},Строка # {0}: Asset {1} не связан с п {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +38,Preview Salary Slip,Просмотр Зарплата скольжению
 DocType: Company,Deafult Cost Center,Центр Стоимость умолчанию используется
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +48,Account {0} has been entered multiple times,Счет {0} был введен несколько раз
 DocType: Account,Expenses Included In Valuation,"Затрат, включаемых в оценке"
@@ -654,7 +664,7 @@
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,"Пожалуйста, выберите группу 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 +617,Item has variants.,Пункт имеет варианты.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Пункт имеет варианты.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,Пункт {0} не найден
 DocType: Bin,Stock Value,Стоимость акций
 apps/erpnext/erpnext/accounts/doctype/account/account.py +25,Company {0} does not exist,Компания {0} не существует
@@ -674,7 +684,7 @@
 DocType: Purchase Order,Supply Raw Materials,Поставка сырья
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Дата, на которую будет генерироваться следующий счет-фактура. Он создается на форму."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Оборотные активы
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,{0} is not a stock Item,{0} не является складской позицией
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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 +169,Lead must be set if Opportunity is made from Lead,"Ведущий должен быть установлен, если Возможность сделан из свинца"
@@ -760,26 +770,25 @@
 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 +709,No Permission,Нет разрешения
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +710,No Permission,Нет разрешения
 DocType: Company,Default Bank Account,По умолчанию Банковский счет
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Чтобы отфильтровать на основе партии, выберите партия первого типа"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"""Обновления Склада"" не могут быть проверены, так как позиция не поставляется через {0}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,кол-во
 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 +542,Row #{0}: Asset {1} must be submitted,Строка # {0}: Asset {1} должен быть представлен
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,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,Все клиентов Связаться
 apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,Загрузить складские остатки с помощью CSV.
 DocType: Warehouse,Tree Details,Детали Дерево
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Отправить Сейчас
 ,Support Analytics,Поддержка Аналитика
 DocType: Item,Website Warehouse,Сайт Склад
 DocType: Payment Reconciliation,Minimum Invoice Amount,Минимальная Сумма счета
 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 +227,Timesheet {0} is already completed or cancelled,Timesheet {0} уже завершен или отменен
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +259,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
@@ -795,13 +804,13 @@
 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 +229,Target Warehouse,Целевая Склад
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +230,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-,стереотипами
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Sales Order Date,Ожидаемая дата поставки не может быть до даты заказа на продажу
 DocType: Upload Attendance,Import Attendance,Импорт Посещаемость
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Все группы товаров
+apps/erpnext/erpnext/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/config/setup.py +89,Automatically compose message on submission of transactions.,Автоматически создавать сообщение о подаче сделок.
@@ -813,13 +822,15 @@
 DocType: Sales Invoice,Payment Due Date,Дата платежа
 apps/erpnext/erpnext/stock/doctype/item/item.js +278,Item Variant {0} already exists with same attributes,Пункт Вариант {0} уже существует же атрибутами
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&quot;Открытие&quot;
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Open To Do
 DocType: Notification Control,Delivery Note Message,Доставка Примечание сообщение
 DocType: Expense Claim,Expenses,Расходы
 DocType: Item Variant Attribute,Item Variant Attribute,Вариант Пункт Атрибут
 ,Purchase Receipt Trends,Покупка чеков тенденции
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Research & Development,Научно-исследовательские и опытно-конструкторские работы
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Научно-исследовательские и опытно-конструкторские работы
 ,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,Цена или Скидка
@@ -828,7 +839,7 @@
 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/controllers/accounts_controller.py +340,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Оплата запись {0} связан с Орденом {1}, проверить, если он должен быть подтянут, как шаг вперед в этом счете-фактуре."
+apps/erpnext/erpnext/controllers/accounts_controller.py +343,"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,Торговая точка
@@ -850,12 +861,12 @@
 DocType: Supplier Quotation,Is Subcontracted,Является субподряду
 DocType: Item Attribute,Item Attribute Values,Пункт значений атрибутов
 DocType: Examination Result,Examination Result,Экспертиза Результат
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +756,Purchase Receipt,Покупка Получение
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +735,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 +167,Reference Doctype must be one of {0},Справочник Doctype должен быть одним из {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +282,Unable to find Time Slot in the next {0} days for Operation {1},Не удается найти временной интервал в ближайшие {0} дней для работы {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +170,Reference Doctype must be one of {0},Справочник Doctype должен быть одним из {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Unable to find Time Slot in the next {0} days for Operation {1},Не удается найти временной интервал в ближайшие {0} дней для работы {1}
 DocType: Production Order,Plan material for sub-assemblies,План материал для Субсборки
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Партнеры по сбыту и территории
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be active,BOM {0} должен быть активным
@@ -866,7 +877,7 @@
 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 +214,Warehouses with existing transaction can not be converted to ledger.,Склады с существующей транзакции не могут быть преобразованы в бухгалтерской книге.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +217,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,Производственные заказы
@@ -880,9 +891,9 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Сотрудник {0} не активен или не существует
 DocType: Fee Structure,Components,Компоненты
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,Please enter Asset Category in Item {0},"Пожалуйста, введите Asset Категория в пункте {0}"
-apps/erpnext/erpnext/stock/doctype/item/item.py +612,Item Variants {0} updated,Пункт Варианты {0} обновляются
+apps/erpnext/erpnext/stock/doctype/item/item.py +614,Item Variants {0} updated,Пункт Варианты {0} обновляются
 DocType: Quality Inspection Reading,Reading 6,Чтение 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +843,Cannot {0} {1} {2} without any negative outstanding invoice,Может не {0} {1} {2} без какого-либо отрицательного выдающийся счет-фактура
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +854,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,Синхронизировать сейчас
@@ -897,69 +908,72 @@
 DocType: Item,Is Purchase Item,Является Покупка товара
 DocType: Asset,Purchase Invoice,Покупка Счет
 DocType: Stock Ledger Entry,Voucher Detail No,Подробности ваучера №
-apps/erpnext/erpnext/accounts/page/pos/pos.js +728,New Sales Invoice,Новый счет-фактуру
+apps/erpnext/erpnext/accounts/page/pos/pos.js +710,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 +728,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: Guardian,Guardian Name,Имя опекуна
 DocType: Cheque Print Template,Has Print Format,Имеет формат печати
-apps/erpnext/erpnext/accounts/page/pos/pos.js +86, is mandatory. Maybe Currency Exchange record is not created for ,"является обязательным. Может быть, Обмен валюты запись не создана для"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +109,Row #{0}: Please specify Serial No for Item {1},"Ряд # {0}: Пожалуйста, сформулируйте Серийный номер для Пункт {1}"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +619,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Для элементов &quot;продукта&quot; Bundle, склад, серийный номер и серия № будет рассматриваться с &quot;упаковочный лист &#39;таблицы. Если Склад и пакетная Нет являются одинаковыми для всех упаковочных деталей для любой &quot;продукта&quot; Bundle пункта, эти значения могут быть введены в основной таблице Item, значения будут скопированы в &quot;список упаковки&quot; таблицу."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +75, 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 +613,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing 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; таблицу."
 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 +606,Supplier Invoice Date cannot be greater than Posting Date,"Дата Поставщик Счет не может быть больше, чем Дата публикации"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +609,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: 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 +810,Select Item for Transfer,Выбрать пункт трансфера
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +789,Select Item for Transfer,Выбрать пункт трансфера
 DocType: Purchase Invoice,Additional Discount Percentage,Дополнительная скидка в процентах
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Просмотреть список всех справочных видео
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Выберите учетную запись глава банка, в котором проверка была размещена."
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Разрешить пользователю редактировать Прайс-лист Оценить в сделках
 DocType: Pricing Rule,Max Qty,Макс Кол-во
-DocType: Student Applicant,Father's Name,Имя Отца
 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 +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Ряд {0}: Платеж по покупке / продаже порядок должен всегда быть помечены как заранее
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Химический
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +686,All items have already been transferred for this Production Order.,Все детали уже были переданы для этого производственного заказа.
+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} и попробуйте еще раз"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +694,All items have already been transferred for this Production Order.,Все детали уже были переданы для этого производственного заказа.
 DocType: Process Payroll,Select Payroll Year and Month,Выберите Payroll год и месяц
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,Meter,метр
 DocType: Workstation,Electricity Cost,Стоимость электроэнергии
 DocType: HR Settings,Don't send Employee Birthday Reminders,Не отправляйте Employee рождения Напоминания
-DocType: Opportunity,Walk In,Прогулка в
 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 +12,Transfered,Все передаваемые
 apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,Загрузить письмо голову и логотип. (Вы можете редактировать их позже).
 DocType: Timesheet Detail,Bill,Билл
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,White,Белый
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date is entered as past date,Следующий Износ Дата вводится как дату в прошлом
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +167,White,Белый
 DocType: SMS Center,All Lead (Open),Все лиды (Открыть)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +228,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Строка {0}: Кол-во не доступен для {4} на складе {1} при проводки время вступления ({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}),Строка {0}: Кол-во не доступен для {4} на складе {1} при проводки время вступления ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,Получить авансы выданные
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +731,Make ,Сделать
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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 +154,Order Type must be one of {0},Тип заказа должен быть одним из {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Тип заказа должен быть одним из {0}
 DocType: Lead,Next Contact Date,Следующая контакты
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Открытие Кол-во
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +393,Please enter Account for Change Amount,"Пожалуйста, введите счет для изменения высоты"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,Please enter Account for Change Amount,"Пожалуйста, введите счет для изменения высоты"
 DocType: Student Batch,Student Batch Name,Student Пакетное Имя
 DocType: Holiday List,Holiday List Name,Имя Список праздников
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js +8,Schedule Course,Расписание курса
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Stock Options,Опционы
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Опционы
 DocType: Journal Entry Account,Expense Claim,Расходов претензии
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +211,Do you really want to restore this scrapped asset?,Вы действительно хотите восстановить этот актив на слом?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +237,Qty for {0},Кол-во для {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +212,Do you really want to restore this scrapped asset?,Вы действительно хотите восстановить этот актив на слом?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,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,Оставьте черных списков Даты
@@ -968,9 +982,9 @@
 DocType: Company,Default Terms,По умолчанию Условия
 DocType: Packing Slip Item,Packing Slip Item,Упаковочный лист Пункт
 DocType: Purchase Invoice,Cash/Bank Account,Наличные / Банковский счет
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Удалены пункты без изменения в количестве или стоимости.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Удалены пункты без изменения в количестве или стоимости.
 DocType: Delivery Note,Delivery To,Доставка Для
-apps/erpnext/erpnext/stock/doctype/item/item.py +635,Attribute table is mandatory,Таблица атрибутов является обязательной
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Таблица атрибутов является обязательной
 DocType: Production Planning Tool,Get Sales Orders,Получить заказ клиента
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} не может быть отрицательным
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,"Пожалуйста, выберите Student"
@@ -995,7 +1009,7 @@
 apps/erpnext/erpnext/config/stock.py +190,"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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Серийный номер {0} находится под контрактом на техническое обслуживание ДО {1}
+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,Название организации
@@ -1007,7 +1021,7 @@
 DocType: GL Entry,Against,Против
 DocType: Item,Default Selling Cost Center,По умолчанию Продажа Стоимость центр
 DocType: Sales Partner,Implementation Partner,Реализация Партнер
-apps/erpnext/erpnext/controllers/selling_controller.py +231,Sales Order {0} is {1},Заказ клиента {0} {1}
+apps/erpnext/erpnext/controllers/selling_controller.py +232,Sales Order {0} is {1},Заказ клиента {0} {1}
 DocType: Opportunity,Contact Info,Контактная информация
 apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,Создание изображения в дневнике
 DocType: Packing Slip,Net Weight UOM,Вес нетто единица измерения
@@ -1017,25 +1031,24 @@
 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,"Дата окончания не может быть меньше, чем Дата начала"
 DocType: Sales Person,Select company name first.,Выберите название компании в первую очередь.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Dr,Доктор
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Dr,Доктор
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Котировки полученных от поставщиков.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},Для {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Средний возраст
 DocType: 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/templates/pages/home.html +32,View All Products,Показать все товары
+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 +400,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Внимание: Система не будет проверять overbilling с суммы по пункту {0} в {1} равна нулю
+apps/erpnext/erpnext/controllers/accounts_controller.py +403,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/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,конец года
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +191,{0} {1} must be submitted,{0} {1} должны быть отправлены
-DocType: Email Digest,Annual Expense,Годовые расходы
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,{0} {1} must be submitted,{0} {1} должны быть отправлены
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +145,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}"
@@ -1046,30 +1059,31 @@
 DocType: Sales Partner,Distributor,Дистрибьютор
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Корзина Правило Доставка
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +211,Production Order {0} must be cancelled before cancelling this Sales Order,Производственный заказ {0} должно быть отменено до отмены этого заказ клиента
-apps/erpnext/erpnext/public/js/controllers/transaction.js +62,Please set 'Apply Additional Discount On',"Пожалуйста, установите &quot;Применить Дополнительная Скидка On &#39;"
+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 +153,Project Collaboration Invitation,Сотрудничество Приглашение проекта
 DocType: Salary Slip,Deductions,Отчисления
+DocType: Leave Allocation,LAL/,LAL /
 apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,Год начала
 DocType: Purchase Invoice,Start date of current invoice's period,Дату периода текущего счета-фактуры начнем
 DocType: Salary Slip,Leave Without Pay,Отпуск без сохранения содержания
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +327,Capacity Planning Error,Ошибка Планирования Мощностей
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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 +362,Finished Item {0} must be entered for Manufacture type entry,Готовые товара {0} должен быть введен для вступления типа Производство
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +367,Finished Item {0} must be entered for Manufacture type entry,Готовые товара {0} должен быть введен для вступления типа Производство
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Открытие бухгалтерский баланс
 DocType: Sales Invoice Advance,Sales Invoice Advance,Счет Продажи предварительный
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +499,Nothing to request,Ничего просить
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +500,Nothing to request,Ничего просить
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',"""Фактическая Дата начала"" не может быть больше, чем ""Фактическая Дата завершения"""
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Management,Управление
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},Либо дебетовая или кредитная сумма необходима для {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,Управление
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +55,Either debit or credit amount is required for {0},Либо дебетовая или кредитная сумма необходима для {0}
 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 +161,Blue,Синий
+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"
@@ -1079,12 +1093,12 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +23,POS Profile {0} already created for user: {1} and company {2},POS-профиля {0} уже создана для пользователя: {1} и компания {2}
 DocType: Purchase Order Item,UOM Conversion Factor,Коэффициент пересчета единицы измерения
 DocType: Stock Settings,Default Item Group,По умолчанию Пункт Группа
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1374,Do you really want to submit the invoice?,"Вы действительно хотите, чтобы отправить счет-фактуру?"
+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 +685,Cost Center For Item with Item Code ',Центр Стоимость для элемента данных с Код товара '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1526,"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 +679,Cost Center For Item with Item Code ',Центр Стоимость для элемента данных с Код товара '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1550,"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 +26,"Further accounts can be made under Groups, but entries can be made against non-Groups","Дальнейшие счета могут быть сделаны в соответствии с группами, но Вы можете быть против не-групп"
 DocType: Lead,Lead,Лид
@@ -1104,104 +1118,106 @@
 DocType: Payment Reconciliation,Unreconciled Payment Details,Несогласованные Детали компенсации
 DocType: Global Defaults,Current Fiscal Year,Текущий финансовый год
 DocType: Global Defaults,Disable Rounded Total,Отключение закругленными Итого
-DocType: Lead,Call,Звонок
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +417,'Entries' cannot be empty,"""Записи"" не могут быть пустыми"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +418,'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 +214,Fiscal Year {0} not found,Финансовый год {0} не найден
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +221,Fiscal Year {0} not found,Финансовый год {0} не найден
 apps/erpnext/erpnext/config/hr.py +238,Setting up Employees,Настройка сотрудников
 DocType: Sales Order,SO-,ТАК-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,"Пожалуйста, выберите префикс первым"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Please select prefix first,"Пожалуйста, выберите префикс первым"
 DocType: Employee,O-,О-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Research,Исследования
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,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 +43,Item {0} must be a non-stock item,Пункт {0} должен быть не складской товар
 DocType: Contact,User ID,ID пользователя
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +57,View Ledger,Посмотреть Леджер
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Старейшие
-apps/erpnext/erpnext/stock/doctype/item/item.py +504,"An Item Group exists with same name, please change the item name or rename the item group","Пункт Группа существует с тем же именем, пожалуйста, измените имя элемента или переименовать группу товаров"
+apps/erpnext/erpnext/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 +437,Rest Of The World,Остальной мир
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,Пункт {0} не может иметь Batch
 ,Budget Variance Report,Бюджет Разница Сообщить
 DocType: Salary Slip,Gross Pay,Зарплата до вычетов
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +90,Row {0}: Activity Type is mandatory.,Строка {0}: Вид деятельности является обязательным.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +114,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/public/js/controllers/stock_controller.js +40,Accounting Ledger,Главная книга
+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,Нераспределенная Прибыль
 DocType: BOM Item,Item Description,Описание позиции
+DocType: Student Sibling,Student Sibling,Студент Sibling
 DocType: Purchase Invoice,Is Recurring,Повторяется
 DocType: Purchase Invoice,Supplied Items,Поставляемые товары
 DocType: Student,STUD.,Винтовое.
 DocType: Production Order,Qty To Manufacture,Кол-во для производства
+DocType: Email Digest,New Income,Новые поступления
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Поддержание же скоростью в течение покупке цикла
 DocType: Opportunity Item,Opportunity Item,Возможность Пункт
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,Временное открытие
 ,Employee Leave Balance,Сотрудник Оставить Баланс
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +131,Balance for Account {0} must always be {1},Весы для счета {0} должен быть всегда {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +175,Valuation Rate required for Item in row {0},Оценка Оцените необходимый для пункта в строке {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,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,Пример: Мастера в области компьютерных наук
 DocType: Purchase Invoice,Rejected Warehouse,Отклонен Склад
 DocType: GL Entry,Against Voucher,Против ваучером
 DocType: Item,Default Buying Cost Center,По умолчанию Покупка МВЗ
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","Чтобы получить лучшее из ERPNext, мы рекомендуем вам потребуется некоторое время и смотреть эти справки видео."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +87, to ,для
+apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,для
 DocType: Item,Lead Time in days,Время в днях
 ,Accounts Payable Summary,Сводка кредиторской задолженности
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Not authorized to edit frozen Account {0},Не разрешается редактировать замороженный счет {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},Не разрешается редактировать замороженный счет {0}
 DocType: Journal Entry,Get Outstanding Invoices,Получить неоплаченных счетов-фактур
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +62,Sales Order {0} is not valid,Заказ на продажу {0} не является допустимым
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Заказ на продажу {0} не является допустимым
 apps/erpnext/erpnext/setup/doctype/company/company.py +185,"Sorry, companies cannot be merged","К сожалению, компании не могут быть объединены"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +139,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							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 +152,Small,Небольшой
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,Small,Небольшой
 DocType: Employee,Employee Number,Общее число сотрудников
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Случай Нет (ы) уже используется. Попробуйте из дела № {0}
 ,Invoiced Amount (Exculsive Tax),Сумма по счетам (Exculsive стоимость)
-DocType: Student Applicant,Mother's / Guardian 1 Email ID,Матери / опекуна 1 Email ID
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Пункт 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,Основной счет {0} создан
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +160,Green,Зеленый
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,Зеленый
 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 +57,Contract,Контракт
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,Контракт
 DocType: Email Digest,Add Quote,Добавить Цитата
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +498,UOM coversion factor required for UOM: {0} in Item: {1},Единица измерения фактором Конверсия требуется для UOM: {0} в пункте: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +503,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 +80,Row {0}: Qty is mandatory,Ряд {0}: Кол-во является обязательным
+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 +737,Sync Master Data,Синхронизация Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +719,Sync Master Data,Синхронизация Master Data
 apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,Ваши продукты или услуги
 DocType: Mode of Payment,Mode of Payment,Способ оплаты
 apps/erpnext/erpnext/stock/doctype/item/item.py +178,Website Image should be a public file or website URL,Сайт изображение должно быть общественное файл или адрес веб-сайта
+DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Это корень группу товаров и не могут быть изменены.
+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 +345,"{0}: Employee email not found, hence email not sent","{0}: Контактный eMail сотрудника не найден, поэтому письмо не было оправлено"
+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,Является ли Ваша компания Адрес
 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 +118,"For {0}, only credit accounts can be linked against another debit entry","Для {0}, только кредитные счета могут быть связаны с другой дебету"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Delivery Note {0} is not submitted,Доставка Примечание {0} не представлено
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Delivery Note {0} is not submitted,Доставка Примечание {0} не представлено
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Sub-contracted Item,Пункт {0} должен быть Субдоговорная Пункт
 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,Этого продавца
 DocType: Item,ITEM-,ПУНКТ-
-apps/erpnext/erpnext/controllers/selling_controller.py +147,Total allocated percentage for sales team should be 100,Всего выделено процент для отдела продаж должен быть 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +110,Production Order status is {0},Статус производственного заказа {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Всего выделено процент для отдела продаж должен быть 100
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Статус производственного заказа {0}
 DocType: Appraisal Goal,Goal,Цель
 DocType: Sales Invoice Item,Edit Description,Редактировать описание
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +757,For Supplier,Для поставщиков
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +723,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,Создание Формат печати
@@ -1217,10 +1233,11 @@
 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,Код Оценка
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Электронная почта Дайджест:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +445,BOM {0} does not belong to Item {1},BOM {0} не принадлежит к пункту {1}
 DocType: Sales Partner,Target Distribution,Целевая Распределение
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1667,Deafault warehouse is required for selected item,Deafault склад требуется для выбранного элемента
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Deafault warehouse is required for selected item,Deafault склад требуется для выбранного элемента
 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
@@ -1229,23 +1246,23 @@
 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 +110,Hardware,Оборудование
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,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 +48,Privilege Leave,Привилегированный Оставить
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,Привилегированный Оставить
 DocType: Purchase Invoice,Supplier Invoice Date,Поставщик Дата выставления счета
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Вам необходимо включить Корзину
 DocType: Payment Entry,Writeoff,Списать
 DocType: Appraisal Template Goal,Appraisal Template Goal,Оценка шаблона Гол
-DocType: Salary Slip,Earning,Зарабатывание
+DocType: Salary Component,Earning,Зарабатывание
 DocType: Purchase Invoice,Party Account Currency,Партия Валюта счета
 ,BOM Browser,Спецификация Браузер
 DocType: Purchase Taxes and Charges,Add or Deduct,Добавить или вычесть
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Перекрытие условия найдено между:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +171,Against Journal Entry {0} is already adjusted against some other voucher,Против Запись в журнале {0} уже настроен против какой-либо другой ваучер
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,Против Запись в журнале {0} уже настроен против какой-либо другой ваучер
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Общая стоимость заказа
-apps/erpnext/erpnext/demo/setup_data.py +358,Food,Еда
+apps/erpnext/erpnext/demo/setup/setup_data.py +301,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/course_schedule/course_schedule.js +103,Mark Attendence,Марк Attendence
@@ -1279,12 +1296,12 @@
 DocType: Sales Order Item,Planned Quantity,Планируемый Количество
 DocType: Purchase Invoice Item,Item Tax Amount,Пункт Сумма налога
 DocType: Item,Maintain Stock,Поддержание складе
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +209,Stock Entries already created for Production Order ,Сток записи уже созданные для производственного заказа
+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,Чистое изменение в основных фондов
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Оставьте пустым, если рассматривать для всех обозначений"
-apps/erpnext/erpnext/controllers/accounts_controller.py +620,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Начисление типа «Актуальные 'в строке {0} не могут быть включены в пункт Оценить
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,Max: {0},Max: {0}
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +15,From Datetime,С DateTime
+apps/erpnext/erpnext/controllers/accounts_controller.py +623,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Начисление типа «Актуальные 'в строке {0} не могут быть включены в пункт Оценить
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +239,Max: {0},Max: {0}
+apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,С DateTime
 DocType: Email Digest,For Company,За компанию
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Журнал соединений.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +153,"Request for Quotation is disabled to access from portal, for more check portal settings.","Запрос предложения отключен доступ из портала, для большего количества настроек портала проверки."
@@ -1292,8 +1309,8 @@
 DocType: Sales Invoice,Shipping Address Name,Адрес доставки Имя
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,План счетов
 DocType: Material Request,Terms and Conditions Content,Условия Содержимое
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +552,cannot be greater than 100,"не может быть больше, чем 100"
-apps/erpnext/erpnext/stock/doctype/item/item.py +680,Item {0} is not a stock Item,Пункт {0} не является акционерным Пункт
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +546,cannot be greater than 100,"не может быть больше, чем 100"
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is not a stock Item,Пункт {0} не является акционерным Пункт
 DocType: Maintenance Visit,Unscheduled,Незапланированный
 DocType: Employee,Owned,Присвоено
 DocType: Salary Detail,Depends on Leave Without Pay,Зависит от отпуска без сохранения заработной платы
@@ -1307,10 +1324,9 @@
 DocType: GL Entry,GL Entry,GL Вступление
 DocType: HR Settings,Employee Settings,Работники Настройки
 ,Batch-Wise Balance History,Партиями Баланс История
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Список задач
 apps/erpnext/erpnext/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 +61,Apprentice,Ученик
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +102,Negative Quantity is not allowed,Отрицательный Количество не допускается
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,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","Налоговый Подробная таблица выбирается из мастера элемента в виде строки и хранится в этой области.
  Используется по налогам и сборам"
@@ -1332,15 +1348,14 @@
 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 +141,Source warehouse is mandatory for row {0},Источник склад является обязательным для ряда {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +719,Packing Slip,Упаковочный лист
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Source warehouse is mandatory for row {0},Источник склад является обязательным для ряда {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +713,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/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,"Запрос котировок может быть доступ, нажав ссылку"
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Ошибка при импортировании!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Адрес не добавлено ни.
 DocType: Workstation Working Hour,Workstation Working Hour,Рабочая станция Рабочие часы
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Analyst,Аналитик
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,Аналитик
 DocType: Item,Inventory,Инвентаризация
 DocType: Item,Sales Details,Продажи Подробности
 DocType: Quality Inspection,QI-,Qi-
@@ -1348,7 +1363,7 @@
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,В Кол-во
 DocType: Notification Control,Expense Claim Rejected,Расходов претензии Отклонен
 DocType: Item Attribute,Item Attribute,Пункт Атрибут
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +103,Government,Правительство
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,Правительство
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,Название института
 apps/erpnext/erpnext/config/stock.py +289,Item Variants,Предмет Варианты
 DocType: Company,Services,Услуги
@@ -1364,6 +1379,7 @@
 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/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,Поток денежных средств от инвестиционной
 DocType: Program Course,Program Course,Программа курса
@@ -1404,12 +1420,12 @@
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"Список приемщика пуст. Пожалуйста, создайте Список приемщика"
 DocType: Production Plan Sales Order,Production Plan Sales Order,Производственный план по продажам Заказать
 DocType: Sales Partner,Sales Partner Target,Цели Партнера по продажам
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +110,Accounting Entry for {0} can only be made in currency: {1},Бухгалтерская Проводка для {0} может быть сделана только в валюте: {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Бухгалтерская Проводка для {0} может быть сделана только в валюте: {1}
 DocType: Pricing Rule,Pricing Rule,Цены Правило
 DocType: Budget,Action if Annual Budget Exceeded,"Действие, если годовой бюджет превышено"
 apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Материал Заказать орденом
 DocType: Shopping Cart Settings,Payment Success URL,Успех Оплата URL
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +78,Row # {0}: Returned Item {1} does not exists in {2} {3},Ряд # {0}: возвращенный деталь {1} не существует в {2} {3}
+apps/erpnext/erpnext/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,Банковская сверка состояние
@@ -1418,40 +1434,39 @@
 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/stock/doctype/stock_entry/stock_entry.py +339,Not allowed to tranfer more {0} than {1} against Purchase Order {2},"Не разрешается Tranfer более {0}, чем {1} против Заказа {2}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +344,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 +545,Manufacturing Quantity is mandatory,Производство Количество является обязательным
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,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 +71,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 +162,Row {0}: From Time and To Time of {1} is overlapping with {2},Строка {0}: От времени и времени {1} перекрывается с {2}
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +186,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,Обязательства по запасам
 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 +130,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 +137,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,Другие отчеты
 DocType: Dependent Task,Dependent Task,Зависит Задача
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Пожалуйста, установите сотрудников система имен в людских ресурсов&gt; HR Настройки"
 apps/erpnext/erpnext/stock/doctype/item/item.py +411,Conversion factor for default Unit of Measure must be 1 in row {0},Коэффициент пересчета для дефолтного Единица измерения должна быть 1 в строке {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,Leave of type {0} cannot be longer than {1},"Оставить типа {0} не может быть больше, чем {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +197,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 +921,Search Item,Поиск товара
+apps/erpnext/erpnext/accounts/page/pos/pos.js +910,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 +546,Already completed,Уже закончено
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +22,Payment Request already exists {0},Оплата Запрос уже существует {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +550,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 +241,Quantity must not be more than {0},Количество должно быть не более {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Quantity must not be more than {0},Количество должно быть не более {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +76,Previous Financial Year is not closed,Предыдущий финансовый год не закрыт
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +44,Age (Days),Возраст (дней)
 DocType: Quotation Item,Quotation Item,Цитата Пункт
@@ -1468,7 +1483,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +221,Purchase Receipt {0} is not submitted,Покупка Получение {0} не представлено
 DocType: Company,Default Payable Account,По умолчанию оплачивается аккаунт
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Настройки для онлайн корзины, такие как правилами перевозок, прайс-лист и т.д."
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +83,{0}% Billed,{0}% оплачено
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}% оплачено
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Зарезервированное кол-во
 DocType: Party Account,Party Account,Партия аккаунт
 apps/erpnext/erpnext/config/setup.py +116,Human Resources,Кадры
@@ -1480,12 +1495,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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 +22,Collect,собирать
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,собирать
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,Against Supplier Invoice {0} dated {1},Против поставщика счет-фактура {0} от {1}
 DocType: Customer,Default Price List,По умолчанию Прайс-лист
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +225,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: Payment Reconciliation,Payments,Оплата
 DocType: Journal Entry,Entry Type,Тип записи
 ,Customer Credit Balance,Заказчик Кредитный Баланс
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Payable,Чистое изменение кредиторской задолженности
@@ -1497,7 +1511,7 @@
 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 +9,Procurement,Закупка
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,Ни один из пунктов не имеют каких-либо изменений в количестве или стоимости.
+apps/erpnext/erpnext/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,Претензия по гарантии
 ,Lead Details,Лид Подробности
 DocType: Purchase Invoice,End date of current invoice's period,Дата и время окончания периода текущего счета-фактуры в
@@ -1522,7 +1536,7 @@
 DocType: Purchase Invoice,Additional Discount,Дополнительная скидка
 DocType: Selling Settings,Selling Settings,Продажа Настройки
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Аукционы в Интернете
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +97,Please specify either Quantity or Valuation Rate or both,"Пожалуйста, сформулируйте либо Количество или оценка Оценить или оба"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,"Пожалуйста, сформулируйте либо Количество или оценка Оценить или оба"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +13,Fulfillment,свершение
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Компания, месяц и финансовый год является обязательным"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Маркетинговые расходы
@@ -1543,14 +1557,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,Настройка ERPNext завершена!
 DocType: Item,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +93,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Группа клиентов с таким именем уже существует. Пожалуйста, измените имя клиента или имя группы клиентов"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +126,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Группа клиентов с таким именем уже существует. Пожалуйста, измените имя клиента или имя группы клиентов"
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Новый контакт
 DocType: Territory,Parent Territory,Родитель Территория
 DocType: Quality Inspection Reading,Reading 2,Чтение 2
 DocType: Stock Entry,Material Receipt,Материал Поступление
 DocType: Homepage,Products,Продукты
 DocType: Announcement,Instructor,инструктор
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},Партия Тип и Сторона обязана в течение / дебиторская задолженность внимание {0}
 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,Следующая Контактные По
@@ -1561,7 +1574,7 @@
 ,Item-wise Sales Register,Пункт мудрый Продажи Зарегистрироваться
 DocType: Asset,Gross Purchase Amount,Валовая сумма покупки
 DocType: Asset,Depreciation Method,метод начисления износа
-apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Offline,Не в сети
+apps/erpnext/erpnext/accounts/page/pos/pos.js +686,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,необходимые
@@ -1579,25 +1592,27 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +425,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 +858,Make Purchase Order,Сделать Заказ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +852,Make Purchase Order,Сделать Заказ
 DocType: SMS Center,Send To,Отправить
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,There is not enough leave balance for Leave Type {0},Существует не хватает отпуск баланс для отпуске Тип {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,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,Клиентам Код товара
 DocType: Stock Reconciliation,Stock Reconciliation,Сверка Запасов
 DocType: Territory,Territory Name,Территория Имя
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +172,Work-in-Progress Warehouse is required before Submit,Работа-в-Прогресс Склад требуется перед Отправить
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,Work-in-Progress Warehouse is required before Submit,Работа-в-Прогресс Склад требуется перед Отправить
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Заявитель на работу.
 DocType: Purchase Order Item,Warehouse and Reference,Склад и справочники
 DocType: Supplier,Statutory info and other general information about your Supplier,Уставный информации и другие общие сведения о вашем Поставщик
-apps/erpnext/erpnext/hooks.py +88,Addresses,Адреса
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Поставщик&gt; Поставщик Тип
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +212,Against Journal Entry {0} does not have any unmatched {1} entry,Против Запись в журнале {0} не имеет никакого непревзойденную {1} запись
+apps/erpnext/erpnext/hooks.py +95,Addresses,Адреса
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +215,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,"Пожалуйста, установите фильтр, основанный на пункте или на складе"
 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,Для доставки и оплаты
@@ -1605,11 +1620,10 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} must be submitted,BOM {0} должны быть представлены
 DocType: Authorization Control,Authorization Control,Авторизация управления
 apps/erpnext/erpnext/controllers/buying_controller.py +300,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Ряд # {0}: Отклонено Склад является обязательным в отношении отклонил Пункт {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +731,Payment,Оплата
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,Payment,Оплата
 DocType: Production Order Operation,Actual Time and Cost,Фактическое время и стоимость
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Материал Запрос максимума {0} могут быть сделаны для Пункт {1} против Заказ на продажу {2}
 DocType: Employee,Salutation,Обращение
-DocType: Pricing Rule,Brand,Бренд
 DocType: Course,Course Abbreviation,Аббревиатура для гольфа
 DocType: Item,Will also apply for variants,Будет также применяться для вариантов
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +142,"Asset cannot be cancelled, as it is already {0}","Asset не может быть отменена, так как она уже {0}"
@@ -1621,7 +1635,7 @@
 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, единицу измерения и других свойств при запуске."
 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 +85,Associate,Помощник
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,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,Создание приемника Список
@@ -1629,7 +1643,7 @@
 DocType: Production Planning Tool,Material Requests,Материал просит
 DocType: Warranty Claim,Issue Date,Дата выдачи
 DocType: Activity Cost,Activity Cost,Стоимость активность
-DocType: Timesheet Detail,Timesheet Detail,Timesheet Деталь
+DocType: Sales Invoice Timesheet,Timesheet Detail,Timesheet Деталь
 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),"Указывает, что пакет является частью этой поставки (только проект)"
@@ -1652,6 +1666,7 @@
 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,Имеет Варианты
 DocType: Monthly Distribution,Name of the Monthly Distribution,Название ежемесячное распределение
 DocType: Sales Person,Parent Sales Person,Лицо Родительские продаж
@@ -1664,31 +1679,32 @@
 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 +44,"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/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.,По словам будет виден только вы сохраните Расходная накладная.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +502,Error: {0} &gt; {1},Ошибка: {0}&gt; {1}
 DocType: Item,Is Sales Item,Является продаж товара
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Пункт 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.,"Срок Дата начала не может быть раньше, чем год Дата начала учебного года, к которому этот термин связан (учебный год {}). Пожалуйста, исправьте дату и попробуйте еще раз."
 DocType: Naming Series,Current Value,Текущее значение
-apps/erpnext/erpnext/controllers/accounts_controller.py +235,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"Несколько финансовых лет существуют на дату {0}. Пожалуйста, установите компанию в финансовый год"
+apps/erpnext/erpnext/controllers/accounts_controller.py +238,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 +458,Item table can not be blank,Пункт таблице не может быть пустым
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +443,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 +5,This is based on stock movement. See {0} for details,Это основано на фондовом движении. См {0} для получения более подробной
 DocType: Pricing Rule,Selling,Продажа
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +341,Amount {0} {1} deducted against {2},Сумма {0} {1} вычтены {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +344,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,"Впритык не может быть, прежде чем отправлять Дата"
@@ -1703,8 +1719,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +144,Cannot refer row number greater than or equal to current row number for this Charge type,"Не можете обратиться номер строки, превышающую или равную текущему номеру строки для этого типа зарядки"
 DocType: Asset,Sold,Продан
 ,Item-wise Purchase History,Пункт мудрый История покупок
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Red,Красный
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Пожалуйста, нажмите на кнопку ""Generate Расписание"", чтобы принести Серийный номер добавлен для Пункт {0}"
+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,Открыть Производственные заказы
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Базовая сумма (Компания Валюта)
@@ -1712,7 +1728,7 @@
 DocType: Installation Note,Installation Time,Время установки
 DocType: Sales Invoice,Accounting Details,Подробности ведения учета
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,Удалить все транзакции этой компании
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +187,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,"Ряд # {0}: Режим {1} не завершены {2} Кол-во готовой продукции в производстве Приказ № {3}. Пожалуйста, обновите статус работы через журнал времени"
+apps/erpnext/erpnext/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}. Пожалуйста, обновите статус работы через журнал времени"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,Инвестиции
 DocType: Issue,Resolution Details,Разрешение Подробнее
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,ассигнования
@@ -1748,6 +1764,7 @@
 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}
 DocType: Delivery Note,Excise Page Number,Количество Акцизный Страница
 DocType: Asset,Purchase Date,Дата покупки
 DocType: Employee,Personal Details,Личные Данные
@@ -1756,7 +1773,7 @@
 DocType: Task,Actual End Date (via Time Sheet),Фактическая дата окончания (с помощью табеля рабочего времени)
 ,Quotation Trends,Котировочные тенденции
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},Пункт Группа не упоминается в мастера пункт по пункту {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +295,Debit To account must be a Receivable account,Дебету счета должны быть задолженность счет
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Receivable account,Дебету счета должны быть задолженность счет
 DocType: Shipping Rule Condition,Shipping Amount,Доставка Количество
 ,Pending Amount,В ожидании Сумма
 DocType: Purchase Invoice Item,Conversion Factor,Коэффициент преобразования
@@ -1764,10 +1781,10 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +137,Expected value after useful life must be greater than or equal to {0},"Ожидаемое значение после того, как срок полезного использования должно быть больше или равно {0}"
 DocType: Purchase Receipt,Vehicle Number,Количество транспортных средств
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Дата, на которую повторяющихся счет будет остановить"
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +90,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,"Всего выделенные листья {0} не может быть меньше, чем уже утвержденных листьев {1} за период"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +93,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 +22,Enter Paid Amount,Введите уплаченной суммы
+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
@@ -1777,13 +1794,15 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,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 +524,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Строка # {0}: Кол-во должно быть 1, а элемент является фиксированным активом. Пожалуйста, используйте отдельную строку для нескольких Упак."
+apps/erpnext/erpnext/controllers/accounts_controller.py +527,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Строка # {0}: Кол-во должно быть 1, а элемент является фиксированным активом. Пожалуйста, используйте отдельную строку для нескольких Упак."
 DocType: Leave Block List Allow,Leave Block List Allow,Оставьте Черный список Разрешить
 apps/erpnext/erpnext/setup/doctype/company/company.py +249,Abbr can not be blank or space,Аббревиатура не может быть пустой или пробелом
 apps/erpnext/erpnext/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/stock/get_item_details.py +123,Please specify Company,"Пожалуйста, сформулируйте Компания"
 ,Customer Acquisition and Loyalty,Приобретение и лояльности клиентов
@@ -1794,17 +1813,19 @@
 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 +183,Closing (Opening + Totals),Закрытие (открытие + Итоги)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),Закрытие (открытие + Итоги)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,"Пожалуйста, сформулируйте валюту в обществе"
 DocType: Workstation,Wages per hour,Заработная плата в час
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +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/controllers/accounts_controller.py +272,Account {0} is invalid. Account Currency must be {1},Счет {0} является недопустимым. Валюта счета должна быть {1}
+DocType: Email Digest,Pending Sales Orders,В ожидании заказов на продажу
+apps/erpnext/erpnext/controllers/accounts_controller.py +275,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 +956,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Строка # {0}: Ссылка Тип документа должен быть одним из заказа клиента, счет-фактура или продаже журнал Вход"
-DocType: Salary Slip,Deduction,Вычет
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +87,Row {0}: From Time and To Time is mandatory.,Строка {0}: От времени и времени является обязательным.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +969,"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 +111,Row {0}: From Time and To Time is mandatory.,Строка {0}: От времени и времени является обязательным.
+DocType: Stock Reconciliation Item,Amount Difference,Сумма разница
 apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},Цена товара добавляется для {0} в Прейскуранте {1}
 DocType: Address Template,Address Template,Шаблон адреса
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +7,Please enter Employee Id of this sales person,"Пожалуйста, введите Employee Id этого менеджера по продажам"
@@ -1812,7 +1833,7 @@
 DocType: Project,% Tasks Completed,% Задач выполнено
 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 +194,Please enter Production Item first,"Пожалуйста, введите выпуска изделия сначала"
+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,отключенный пользователь
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Расценки
@@ -1821,53 +1842,54 @@
 DocType: Maintenance Visit,Maintenance User,Уход за инструментом
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +149,Cost Updated,Стоимость Обновлено
 DocType: Employee,Date of Birth,Дата рождения
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +86,Item {0} has already been returned,Пункт {0} уже вернулся
+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: 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 +177,Job Description,Описание Работы
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,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 +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Специальные символы, кроме ""-"" ""."", ""#"", и ""/"" не пускают в серию имен"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Специальные символы, кроме ""-"" ""."", ""#"", и ""/"" не пускают в серию имен"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Следите продаж кампаний. Следите за проводами, цитаты, заказа на закупку и т.д. из кампаний, чтобы оценить отдачу от инвестиций."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +24,Welcome to POS: Create your POS Profile,Добро пожаловать на POS: Создать свой POS профиля
 DocType: Expense Claim,Approver,Утверждаю
 ,SO Qty,ТАК Кол-во
+DocType: Guardian,Work Address,Рабочий адрес
 DocType: Appraisal,Calculate Total Score,Рассчитать общую сумму
 DocType: Request for Quotation,Manufacturing Manager,Производство менеджер
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Серийный номер {0} находится на гарантии ДО {1}
+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 +74,Shipments,Поставки
+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 +153,Row # ,Ряд #
+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 +156,Get From,Получить от
+apps/erpnext/erpnext/public/js/utils.js +167,Get From,Получить от
 DocType: C-Form,Quarter,Квартал
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Miscellaneous Expenses,Прочие расходы
 DocType: Global Defaults,Default Company,Компания по умолчанию
 apps/erpnext/erpnext/controllers/stock_controller.py +167,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Расходов или Разница счета является обязательным для п. {0}, поскольку это влияет общая стоимость акции"
-apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Не можете overbill для пункта {0} в строке {1} более {2}. Чтобы overbilling, пожалуйста, установите в акционерных Настройки"
+apps/erpnext/erpnext/controllers/accounts_controller.py +419,"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,-Выше
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} is disabled,Пользователь {0} отключен
 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...,Выберите компанию ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,"Оставьте пустым, если рассматривать для всех отделов"
 apps/erpnext/erpnext/config/hr.py +171,"Types of employment (permanent, contract, intern etc.).","Виды занятости (постоянная, контракт, стажер и т.д.)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +346,{0} is mandatory for Item {1},{0} является обязательным для п. {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,{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","Пожалуйста, выберите выделенной суммы, счет-фактура Тип и номер счета-фактуры в по крайней мере одном ряду"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,Стоимость новой покупки
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},Заказ клиента требуется для позиции {0}
 DocType: Purchase Invoice Item,Rate (Company Currency),Тариф (Компания Валюта)
-apps/erpnext/erpnext/demo/setup_data.py +360,Others,Другое
+DocType: Student Guardian,Others,Другое
 DocType: Payment Entry,Unallocated Amount,Нераспределенные Сумма
 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,Налоги и сборы
@@ -1887,17 +1909,16 @@
 apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,Серийный Инвентарь
 DocType: Activity Type,Default Billing Rate,По умолчанию Платежная Оценить
 DocType: Sales Invoice,Total Billing Amount,Всего счетов Сумма
-apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +54,Receivable Account,Счет Дебиторской задолженности
-apps/erpnext/erpnext/controllers/accounts_controller.py +546,Row #{0}: Asset {1} is already {2},Строка # {0}: Asset {1} уже {2}
+apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,Счет Дебиторской задолженности
+apps/erpnext/erpnext/controllers/accounts_controller.py +549,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 +79,CEO,Исполнительный директор
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,Исполнительный директор
 DocType: Expense Claim Detail,Expense Claim Detail,Расходов претензии Подробно
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +808,Please select correct account,"Пожалуйста, выберите правильный счет"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +809,Please select correct account,"Пожалуйста, выберите правильный счет"
 DocType: Item,Weight UOM,Вес Единица измерения
 DocType: Salary Structure Employee,Salary Structure Employee,Зарплата Структура сотрудников
 DocType: Employee,Blood Group,Группа крови
-DocType: Purchase Invoice Item,Page Break,Разрыв страницы
 DocType: Production Order Operation,Pending,В ожидании
 DocType: Course,Course Name,Название курса
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Пользователи, которые могут утвердить отпуска приложения конкретного работника"
@@ -1906,14 +1927,15 @@
 DocType: Fiscal Year,Companies,Компании
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Электроника
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Поднимите Материал запрос когда шток достигает уровня переупорядочиваем
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Full-time,Полный рабочий день
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,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: 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,Всего входное значение
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Debit To is required,Дебет требуется
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +321,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,Менеджер по качеству
@@ -1921,6 +1943,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/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
@@ -1931,18 +1954,17 @@
 DocType: Production Order Operation,Completed Qty,Завершено Кол-во
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"For {0}, only debit accounts can be linked against another credit entry","Для {0}, только дебетовые счета могут быть связаны с другой кредитной вступления"
 apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,Прайс-лист {0} отключена
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +99,Row {0}: Completed Qty cannot be more than {1} for operation {2},"Строка {0}: Завершена Кол-во не может быть больше, чем {1} для операции {2}"
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +123,Row {0}: Completed Qty cannot be more than {1} for operation {2},"Строка {0}: Завершена Кол-во не может быть больше, чем {1} для операции {2}"
 DocType: Manufacturing Settings,Allow Overtime,Разрешить Овертайм
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Серийные номера необходимые для позиции {1}. Вы предоставили {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Текущая оценка Оценить
 DocType: Item,Customer Item Codes,Заказчик Предмет коды
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,Обмен Прибыль / убыток
 DocType: Opportunity,Lost Reason,Забыли Причина
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Пожалуйста, настройка нумерации серии для посещения с помощью Setup&gt; Нумерация серии"
 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/purchase_receipt/purchase_receipt.py +378,All items have already been invoiced,На все товары уже выписаны счета
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +379,All items have already been invoiced,На все товары уже выписаны счета
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Пожалуйста, сформулируйте действительный 'От делу №'"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Дальнейшие МВЗ можно сделать под групп, но записи могут быть сделаны в отношении не-групп"
 DocType: Project,External,Внешний  GPS с RS232
@@ -1958,18 +1980,19 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Ваши клиенты
 apps/erpnext/erpnext/projects/doctype/project/project.py +141,You have been invited to collaborate on the project: {0},Вы были приглашены для совместной работы над проектом: {0}
 DocType: Leave Block List Date,Block Date,Блок Дата
-apps/erpnext/erpnext/templates/generators/job_opening.html +19,Apply Now,Применить сейчас
+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.","Создание и управление ежедневные, еженедельные и ежемесячные дайджесты новостей."
 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,здания
-apps/erpnext/erpnext/utilities/doctype/address/address.py +164,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,"Нет адреса по умолчанию шаблона не найдено. Пожалуйста, создайте новый из Setup&gt; Печать и Брендинг&gt; Адрес шаблона."
 DocType: Fee Structure,Fee Structure,Структура оплаты
 DocType: Timesheet Detail,Costing Amount,Калькуляция Сумма
+DocType: Student Admission,Application Fee,Регистрационный взнос
 DocType: Process Payroll,Submit Salary Slip,Представьте Зарплата Слип
-apps/erpnext/erpnext/controllers/selling_controller.py +161,Maxiumm discount for Item {0} is {1}%,Maxiumm скидка на Пункт {0} {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,Maxiumm скидка на Пункт {0} {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Импорт наливом
 DocType: Sales Partner,Address & Contacts,Адрес и контакты
 DocType: SMS Log,Sender Name,Имя отправителя
@@ -1994,21 +2017,21 @@
 DocType: Serial No,Delivery Time,Время доставки
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,"Проблемам старения, на основе"
 DocType: Item,End of Life,Конец срока службы
-apps/erpnext/erpnext/demo/setup_data.py +361,Travel,Путешествия
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +155,No active or default Salary Structure found for employee {0} for the given dates,Нет активной или по умолчанию Зарплата Структура найдено для сотрудника {0} для указанных дат
+apps/erpnext/erpnext/demo/setup/setup_data.py +304,Travel,Путешествия
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +167,No active or default Salary Structure found for employee {0} for the given dates,Нет активной или по умолчанию Зарплата Структура найдено для сотрудника {0} для указанных дат
 DocType: Leave Block List,Allow Users,Разрешить пользователям
 DocType: Purchase Order,Customer Mobile No,Заказчик Мобильная Нет
 DocType: Sales Invoice,Recurring,Периодическая
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Подписка отдельный доходы и расходы за вертикалей продукции или подразделений.
 DocType: Rename Tool,Rename Tool,Переименование файлов
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +23,Update Cost,Обновление Стоимость
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Обновление Стоимость
 DocType: Item Reorder,Item Reorder,Пункт Переупоряд
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +36,Show Salary Slip,Показать Зарплата скольжению
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +748,Transfer Material,О передаче материала
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +53,Show Salary Slip,Показать Зарплата скольжению
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +166,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 +923,Please set recurring after saving,"Пожалуйста, установите повторяющиеся после сохранения"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +646,Select change amount account,Сумма счета Выберите изменения
+apps/erpnext/erpnext/public/js/controllers/transaction.js +914,Please set recurring after saving,"Пожалуйста, установите повторяющиеся после сохранения"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +703,Select change amount account,Сумма счета Выберите изменения
 DocType: Purchase Invoice,Price List Currency,Прайс-лист валют
 DocType: Naming Series,User must always select,Пользователь всегда должен выбирать
 DocType: Stock Settings,Allow Negative Stock,Разрешить негативных складе
@@ -2020,31 +2043,32 @@
 DocType: Quality Inspection,Verified By,Verified By
 DocType: Address,Subsidiary,Филиал
 apps/erpnext/erpnext/setup/doctype/company/company.py +64,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Невозможно изменить Базовая валюта компании, потому что есть существующие операции. Сделки должны быть отменены, чтобы поменять валюту."
+DocType: Grade Interval,Grade Description,Оценка Описание
 DocType: Quality Inspection,Purchase Receipt No,Покупка Получение Нет
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Задаток
 DocType: Process Payroll,Create Salary Slip,Создание Зарплата Слип
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +33,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 +352,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Количество в строке {0} ({1}) должна быть такой же, как изготавливается количество {2}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Количество в строке {0} ({1}) должна быть такой же, как изготавливается количество {2}"
 DocType: Appraisal,Employee,Сотрудник
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Пригласить в пользователя
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} полностью выставлен
 DocType: Workstation Working Hour,End Time,Время окончания
 DocType: Payment Entry,Payment Deductions or Loss,Отчисления оплаты или убыток
-apps/erpnext/erpnext/config/schools.py +100,LMS,LMS
+apps/erpnext/erpnext/config/schools.py +104,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,Трубопроводный Менеджер по продажам
 DocType: Student Batch Student,Student Batch Student,Student Пакетное Student
-DocType: Sales Invoice,Mass Mailing,Массовая рассылка
+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 +199,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/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 +297,Salary Slip of employee {0} already created for this period,Зарплата Скольжение работника {0} уже создано за этот период
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Pharmaceutical,Фармацевтический
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +309,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/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,Кредитная Для
@@ -2059,27 +2083,28 @@
 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 +814,Please specify Company to proceed,"Пожалуйста, сформулируйте Компания приступить"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +793,Please specify Company to proceed,"Пожалуйста, сформулируйте Компания приступить"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Receivable,Чистое изменение дебиторской задолженности
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Compensatory Off,Компенсационные Выкл
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,Компенсационные Выкл
 DocType: Quality Inspection Reading,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.,"Пожалуйста, убедитесь, что вы действительно хотите удалить все транзакции для компании. Ваши основные данные останется, как есть. Это действие не может быть отменено."
 DocType: Room,Room Number,Номер комнаты
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Недопустимая ссылка {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +161,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},"{0} ({1}) не может быть больше, чем запланированное количество ({2}) в Производственном Заказе {3}"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +162,{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 +217,Raw Materials cannot be blank.,Сырье не может быть пустым.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,"Could not update stock, invoice contains drop shipping item.","Не удалось обновить запас, счет-фактура содержит падение пункт доставки."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +460,Quick Journal Entry,Быстрый журнал запись
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +111,You can not change rate if BOM mentioned agianst any item,"Вы не можете изменить скорость, если спецификации упоминается agianst любого элемента"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +441,"Could not update stock, invoice contains drop shipping item.","Не удалось обновить запас, счет-фактура содержит падение пункт доставки."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Quick Journal Entry,Быстрый журнал запись
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +103,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 +214,{0} {1} is not submitted,{0} {1} не проведен
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Запросы на предметы.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Отдельный производственный заказ будет создан для каждого готового хорошего пункта.
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +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.,"Название института, для которого вы устанавливаете эту систему."
@@ -2088,16 +2113,17 @@
 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 +398,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 +739,Item or Warehouse for row {0} does not match Material Request,Пункт или Склад для строки {0} не соответствует запросу материал
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +747,Item or Warehouse for row {0} does not match Material Request,Пункт или Склад для строки {0} не соответствует запросу материал
 apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,Единица Измерения
 DocType: Fiscal Year,Year End Date,Дата окончания года
 DocType: Task Depends On,Task Depends On,Задачи зависит от
-DocType: Lead,Opportunity,Возможность
+DocType: Supplier Quotation,Opportunity,Возможность
 ,Completed Production Orders,Завершенные Производственные заказы
 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
@@ -2110,7 +2136,7 @@
 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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},Техническое обслуживание дата не может быть до даты доставки для Serial No {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},Техническое обслуживание дата не может быть до даты доставки для Serial No {0}
 DocType: Production Order,Actual End Date,Фактический Дата окончания
 DocType: Purchase Invoice,PINV-,PINV-
 DocType: Authorization Rule,Applicable To (Role),Применимо к (Роль)
@@ -2125,7 +2151,7 @@
 DocType: SMS Log,No of Requested SMS,Нет запрашиваемых SMS
 DocType: Campaign,Campaign-.####,Кампания-.# # # #
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Следующие шаги
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,Please supply the specified items at the best possible rates,"Пожалуйста, предоставьте указанные пункты в наилучших возможных ставок"
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +695,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 +117,Contract End Date must be greater than Date of Joining,"Конец контракта Дата должна быть больше, чем дата вступления"
 DocType: Delivery Note,DN-,DN-
@@ -2134,7 +2160,7 @@
 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 +14,This is an example website auto-generated from ERPNext,Это пример сайт автоматически сгенерированный из ERPNext
+apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Это пример сайт автоматически сгенерированный из ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Старение Диапазон 1
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
@@ -2181,13 +2207,14 @@
 DocType: Purchase Receipt Item,Recd Quantity,RECD Количество
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +54,Fee Records Created - {0},Плата записи Создано - {0}
 DocType: Asset Category Account,Asset Category Account,Категория активов Счет
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +103,Cannot produce more Item {0} than Sales Order quantity {1},"Не можете производить больше элемент {0}, чем количество продаж Заказать {1}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Stock Entry {0} is not submitted,Складской акт {0} не проведен
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},"Не можете производить больше элемент {0}, чем количество продаж Заказать {1}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +505,Stock Entry {0} is not submitted,Складской акт {0} не проведен
 DocType: Payment Reconciliation,Bank / Cash Account,Банк / Расчетный счет
 DocType: Tax Rule,Billing City,Город платильщика
 DocType: Salary Component Account,Salary Component Account,Зарплатный Компонент
 DocType: Global Defaults,Hide Currency Symbol,Скрыть Символ Валюты
 apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card","например банк, наличные, кредитная карта"
+DocType: Lead Source,Source Name,Имя источника
 DocType: Journal Entry,Credit Note,Кредит-нота
 DocType: Warranty Claim,Service Address,Адрес сервисного центра
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furnitures and Fixtures,Мебель и Светильники
@@ -2199,6 +2226,7 @@
 DocType: Opportunity,Customer / Lead Name,Заказчик / Ведущий Имя
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +89,Clearance Date not mentioned,Клиренс Дата не упоминается
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Производство
+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/controllers/trends.py +19,Total(Qty),Всего (кол-во)
 DocType: Sales Invoice,This Document,Этот документ
@@ -2210,15 +2238,15 @@
 DocType: Purchase Receipt,Time at which materials were received,"Момент, в который были получены материалы"
 DocType: Stock Ledger Entry,Outgoing Rate,Исходящие Оценить
 apps/erpnext/erpnext/config/hr.py +176,Organization branch master.,Организация филиал мастер.
-apps/erpnext/erpnext/controllers/accounts_controller.py +273, or ,или
+apps/erpnext/erpnext/controllers/accounts_controller.py +276, 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 +203,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Строка # {0}: Запись в журнале {1} не имеет учетной записи {2} или уже сопоставляется с другой купон
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +206,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 +90,No employee for the above selected criteria OR salary slip already created,Ни один сотрудник для выбранных критериев выше или скольжения заработной платы уже не создано
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +93,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,Вид оплаты
@@ -2246,8 +2274,8 @@
 DocType: Product Bundle,Parent Item,Родитель Пункт
 DocType: Account,Account Type,Тип учетной записи
 DocType: Delivery Note,DN-RET-,DN-RET-
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +115,Leave Type {0} cannot be carry-forwarded,Оставьте Тип {0} не может быть перенос направлен
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"График обслуживания не генерируется для всех элементов. Пожалуйста, нажмите на кнопку ""Generate Расписание"""
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +118,Leave Type {0} cannot be carry-forwarded,Оставьте Тип {0} не может быть перенос направлен
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"График обслуживания не генерируется для всех элементов. Пожалуйста, нажмите на кнопку ""Generate Расписание"""
 ,To Produce,Чтобы продукты
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Начисление заработной платы
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +163,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",Для ряда {0} {1}. Чтобы включить {2} в размере Item ряды также должны быть включены {3}
@@ -2259,13 +2287,13 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +32,Disabled template must not be default template,Шаблон для инвалидов не должно быть по умолчанию шаблон
 DocType: Account,Income Account,Счет Доходов
 DocType: Payment Request,Amount in customer's currency,Сумма в валюте клиента
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +748,Delivery,Доставка
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +742,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,Ключ Ответственность Площадь
 DocType: Payment Entry,Total Allocated Amount,Общая сумма Обозначенная
 DocType: Item Reorder,Material Request Type,Материал Тип запроса
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +82,Row {0}: UOM Conversion Factor is mandatory,Ряд {0}: Коэффициент преобразования Единица измерения является обязательным
+apps/erpnext/erpnext/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,N
 DocType: Budget,Cost Center,Центр учета затрат
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Ваучер #
@@ -2276,13 +2304,13 @@
 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 +90,Head of Marketing and Sales,Начальник отдела маркетинга и продаж
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Подоходный налог
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,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.,Трек Ведет по Отрасль Тип.
 DocType: Item Supplier,Item Supplier,Пункт Поставщик
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +403,Please enter Item Code to get batch no,"Пожалуйста, введите Код товара, чтобы получить партию не"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +770,Please select a value for {0} quotation_to {1},"Пожалуйста, выберите значение для {0} quotation_to {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +397,Please enter Item Code to get batch no,"Пожалуйста, введите Код товара, чтобы получить партию не"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +764,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","Объединение возможно только, если следующие свойства такие же, как в отчетах. Есть группа, корневого типа, компания"
@@ -2294,28 +2322,29 @@
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,Нет в наличии
 DocType: Appraisal,HR User,HR Пользователь
 DocType: Purchase Invoice,Taxes and Charges Deducted,"Налоги, которые вычитаются"
-apps/erpnext/erpnext/hooks.py +100,Issues,Вопросов
+apps/erpnext/erpnext/hooks.py +109,Issues,Вопросов
 apps/erpnext/erpnext/controllers/status_updater.py +13,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} отключен
 DocType: Supplier,Billing Currency,Платежная валюта
 DocType: Sales Invoice,SINV-RET-,СИНВ-RET-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Large,Очень Большой
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,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 +507,Warning: Another {0} # {1} exists against stock entry {2},Внимание: Еще {0} # {1} существует против вступления фондовой {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Local,Локальные
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +508,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Кредиты и авансы (активы)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Должники
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Large,Большой
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,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 +225,Total {0} ({1}),Общая {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +224,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,Метод по умолчанию Оценка
@@ -2373,9 +2402,9 @@
 DocType: Attendance,Leave Type,Оставьте Тип
 apps/erpnext/erpnext/controllers/stock_controller.py +173,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"Расходов / Разница счет ({0}) должен быть ""прибыль или убыток» счета"
 DocType: Account,Accounts User,Учетные записи пользователей
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Name error: {0},Ошибка Имя: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +90,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 +178,{0} {1} does not associated with {2} {3},{0} {1} не связан с {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +181,{0} {1} does not associated with {2} {3},{0} {1} не связан с {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Посещаемость за работника {0} уже отмечен
 DocType: Packing Slip,If more than one package of the same type (for print),Если более чем один пакет того же типа (для печати)
 DocType: Warehouse,Parent Warehouse,родитель Склад
@@ -2394,7 +2423,7 @@
 DocType: BOM Item,Scrap %,Лом%
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Расходы будут распределены пропорционально на основе Поз или суммы, по Вашему выбору"
 DocType: Maintenance Visit,Purposes,Цели
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,Как минимум один товар должен быть введен с отрицательным количеством в возвратном документе
+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 +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Операция {0} больше, чем каких-либо имеющихся рабочих часов в рабочей станции {1}, сломать операции в несколько операций"
 ,Requested,Запрошено
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +83,No Remarks,Нет Замечания
@@ -2406,46 +2435,46 @@
 DocType: Item,Total Projected Qty,Общая запланированная Кол-во
 DocType: Monthly Distribution,Distribution Name,Распределение Имя
 DocType: Course,Course Code,Код курса
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Quality Inspection required for Item {0},"Контроль качества, необходимые для Пункт {0}"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Quality Inspection required for Item {0},"Контроль качества, необходимые для Пункт {0}"
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Курс по которому валюта Покупателя конвертируется в базовую валюту компании
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Чистая скорость (Компания валют)
 DocType: Salary Detail,Condition and Formula Help,Состояние и формула Помощь
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Управление Территория дерево.
 DocType: Journal Entry Account,Sales Invoice,Счет Продажи
 DocType: Journal Entry Account,Party Balance,Баланс партия
-apps/erpnext/erpnext/accounts/page/pos/pos.js +475,Please select Apply Discount On,"Пожалуйста, выберите Применить скидки на"
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +92,Salary Slip Created,Зарплата скольжения Создано
+apps/erpnext/erpnext/accounts/page/pos/pos.js +464,Please select Apply Discount On,"Пожалуйста, выберите Применить скидки на"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +95,Salary Slip Created,Зарплата скольжения Создано
 DocType: Company,Default Receivable Account,По умолчанию задолженность аккаунт
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,"Создать банк запись на общую заработной платы, выплачиваемой за над выбранными критериями"
 DocType: Stock Entry,Material Transfer for Manufacture,Материал Передача для производства
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,Скидка в процентах можно применять либо против прайс-листа или для всех прайс-листа.
 DocType: Purchase Invoice,Half-yearly,Раз в полгода
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +384,Accounting Entry for Stock,Бухгалтерская Проводка по Запасам
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +387,Accounting Entry for Stock,Бухгалтерская Проводка по Запасам
 DocType: Sales Invoice,Sales Team1,Продажи Команда1
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,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 +96,Row {0}: Completed Qty must be greater than zero.,Строка {0}: Завершенный Кол-во должно быть больше нуля.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +120,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 +88,Row # {0}: Cannot return more than {1} for Item {2},Ряд # {0}: Невозможно вернуть более {1} для п {2}
+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,Сюжет
 DocType: Item Group,Show this slideshow at the top of the page,Показать этот слайд-шоу в верхней части страницы
 DocType: BOM,Item UOM,Пункт Единица измерения
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Сумма налога после скидки Сумма (Компания валют)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +147,Target warehouse is mandatory for row {0},Целевая склад является обязательным для ряда {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +141,Target warehouse is mandatory for row {0},Целевая склад является обязательным для ряда {0}
 DocType: Cheque Print Template,Primary Settings,Основные настройки
 DocType: Purchase Invoice,Select Supplier Address,Выборите Адрес Поставщика
 DocType: Quality Inspection,Quality Inspection,Контроль качества
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Extra Small,Очень Маленький
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,Warning: Material Requested Qty is less than Minimum Order Qty,Внимание: Материал просил Кол меньше Минимальное количество заказа
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +194,Account {0} is frozen,Счет {0} заморожен
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Очень Маленький
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +690,Warning: Material Requested Qty is less than Minimum Order Qty,Внимание: Материал просил Кол меньше Минимальное количество заказа
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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 +606,Can only make payment against unbilled {0},Могу только осуществить платеж против нефактурированных {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +126,Commission rate cannot be greater than 100,"Скорость Комиссия не может быть больше, чем 100"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +609,Can only make payment against unbilled {0},Могу только осуществить платеж против нефактурированных {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,"Скорость Комиссия не может быть больше, чем 100"
 DocType: Stock Entry,Subcontract,Субподряд
 apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,"Пожалуйста, введите {0} в первую очередь"
 DocType: Production Order Operation,Actual End Time,Фактическое Время окончания
@@ -2456,30 +2485,30 @@
 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 +158,Colour,Цвет
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,Цвет
 DocType: Maintenance Visit,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;, и нет никакой другой Связка товаров"
 DocType: Student Log,Academic,академический
-apps/erpnext/erpnext/controllers/accounts_controller.py +469,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),"Всего аванс ({0}) против ордена {1} не может быть больше, чем общая сумма ({2})"
+apps/erpnext/erpnext/controllers/accounts_controller.py +472,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),"Всего аванс ({0}) против ордена {1} не может быть больше, чем общая сумма ({2})"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Выберите ежемесячное распределение к неравномерно распределять цели по различным месяцам.
 DocType: Purchase Invoice Item,Valuation Rate,Оценка Оцените
+DocType: Stock Reconciliation,SR/,SR /
 apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,Прайс-лист Обмен не выбран
 DocType: Assessment,Results,Результаты
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +168,Employee {0} has already applied for {1} between {2} and {3},Сотрудник {0} уже подало заявку на {1} между {2} и {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +175,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: Student Applicant,Father's/ Guardian 2 Email ID,Отца / опекуна 2 Email ID
 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 +228,Warehouses with existing transaction can not be converted to group.,Склады с существующей транзакции не может быть преобразована в группу.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +231,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 +93,Researcher,Исследователь
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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.,Входной контроль качества.
@@ -2491,25 +2520,25 @@
 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: Sales Invoice,Advertisement,Реклама
 DocType: Asset Category Account,Depreciation Expense Account,Износ счет расходов
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Probationary Period,Испытательный Срок
-apps/erpnext/erpnext/hooks.py +102,Announcements,Объявления
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Испытательный Срок
+apps/erpnext/erpnext/hooks.py +111,Announcements,Объявления
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Только листовые узлы допускаются в сделке
 DocType: Expense Claim,Expense Approver,Расходы утверждающим
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +109,Row {0}: Advance against Customer must be credit,Ряд {0}: Предварительная отношении Клиента должен быть кредит
 apps/erpnext/erpnext/accounts/doctype/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 +16,To Datetime,Для DateTime
+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/scheduling_tool/scheduling_tool.py +51,Course Schedules deleted:,Расписание курсов удалены:
 apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,Журналы для просмотра статуса доставки смс
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,В ожидании Деятельность
+DocType: Accounts Settings,Make Payment via Journal Entry,Платежи через журнал Вход
+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 +127,Please enter relieving date.,"Пожалуйста, введите даты снятия."
-apps/erpnext/erpnext/controllers/trends.py +145,Amt,Amt
+apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,Only Leave Applications with status 'Approved' can be submitted,"Только Оставьте приложений с статуса ""Одобрено"" могут быть представлены"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +26,Address Title is mandatory.,Название адреса является обязательным.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Введите имя кампании, если источником исследования является кампания"
@@ -2527,14 +2556,15 @@
 apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1},Невозможно найти обменный курс {0} до {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Отметить Полдня
 DocType: Sales Invoice,Sales Team,Отдел продаж
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Duplicate entry,Дублировать запись
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,Дублировать запись
 DocType: Program Enrollment Tool,Get Students,Получить Студенты
 DocType: Serial No,Under Warranty,Под гарантии
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +490,[Error],[Ошибка]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +484,[Error],[Ошибка]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,По словам будет виден только вы сохраните заказ клиента.
 ,Employee Birthday,Сотрудник День рождения
 apps/erpnext/erpnext/controllers/status_updater.py +175,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} уже существует. Пожалуйста, измените эти записи и повторите попытку."
 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} не существует
@@ -2550,22 +2580,22 @@
 ,Issued Items Against Production Order,Выпущенные товары против производственного заказа
 DocType: Pricing Rule,Purchase Manager,Менеджер по закупкам
 DocType: Target Detail,Target Detail,Цель Подробности
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +25,All Jobs,Все Вакансии
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,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 +323,Amount {0} {1} {2} {3},Сумма {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,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: 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 +372,Payment Entries {0} are un-linked,Записи оплаты {0} ип-сшитый
+apps/erpnext/erpnext/accounts/utils.py +449,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 +497,Material Requests {0} created,Запросы Материал {0} создан
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +498,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.,Шаблон терминов или договором.
 DocType: Purchase Invoice,Address and Contact,Адрес и контактная
@@ -2604,7 +2634,7 @@
 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 +848,Paid Amount cannot be greater than total negative outstanding amount {0},Уплаченная сумма не может быть больше суммарного отрицательного непогашенной {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +859,Paid Amount cannot be greater than total negative outstanding amount {0},Уплаченная сумма не может быть больше суммарного отрицательного непогашенной {0}
 DocType: Employee Internal Work History,Employee Internal Work History,Сотрудник внутреннего Работа История
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +233,Closing (Dr),Закрытие (д-р)
 DocType: Cheque Print Template,Cheque Size,Cheque Размер
@@ -2625,7 +2655,8 @@
 ,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 +555,'Update Stock' cannot be checked for fixed asset sale,&#39;Update Stock&#39; не могут быть проверены на фиксированной продажи активов
+DocType: Student Guardian,Father,Отец
+apps/erpnext/erpnext/controllers/accounts_controller.py +558,'Update Stock' cannot be checked for fixed asset sale,&#39;Update Stock&#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} отменяется или остановлен
@@ -2635,15 +2666,15 @@
 DocType: Sales Order,Fully Delivered,Полностью Поставляются
 DocType: Lead,Lower Income,Нижняя Доход
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","Счет голову под ответственности, в котором Прибыль / убыток будут забронированы"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +166,Source and target warehouse cannot be same for row {0},Источник и цель склад не может быть одинаковым для ряда {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Разница аккаунт должен быть тип счета активов / пассивов, так как это со Примирение запись Открытие"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +81,Purchase Order number required for Item {0},Число Заказ требуется для Пункт {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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/purchase_receipt/purchase_receipt.py +82,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 +17,Cannot change status as student {0} is linked with student application {1},Невозможно изменить статус студента {0} связан с приложением студента {1}
+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: Timesheet,"List of employee which has ""Salary Slip Based on Timesheet"" is enabled in salary structure.","Список работника, который имеет &quot;Зарплатный Слип На основе Timesheet&quot; включена в структуре заработной платы."
 DocType: Asset,Fully Depreciated,Полностью Амортизируется
 ,Stock Projected Qty,Прогнозируемое Кол-во Запасов
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Customer {0} does not belong to project {1},Клиент {0} не принадлежит к проекту {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,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,Серийный номер и пакетная
@@ -2655,7 +2686,7 @@
 DocType: Purchase Invoice,Purchase Taxes and Charges,Покупка Налоги и сборы
 ,Qty to Receive,Кол-во на получение
 DocType: Leave Block List,Leave Block List Allowed,Оставьте Черный список животных
-apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +55,All Warehouses,Все склады
+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 +105,Credit To account must be a Balance Sheet account,Кредит на счету должен быть баланс счета
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Все типы поставщиков
@@ -2667,10 +2698,10 @@
 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/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Сделать Зарплата Слип
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +26,Browse BOM,Просмотр спецификации
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,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/asset/depreciation.py +94,Please set Depreciation related Accounts in Asset Category {0} or Company {1},"Пожалуйста, установите Амортизация соответствующих счетов в Asset Категория {0} или компании {1}"
-DocType: Academic Year,Academic Year,Академический год
+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
 DocType: Appraisal,Appraisal,Оценка
@@ -2678,12 +2709,12 @@
 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 +197,Leave approver must be one of {0},Оставьте утверждающий должен быть одним из {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,Leave approver must be one of {0},Оставьте утверждающий должен быть одним из {0}
 DocType: Hub Settings,Seller Email,Продавец Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Общая стоимость покупки (через счет покупки)
 DocType: Workstation Working Hour,Start Time,Время
 DocType: Item Price,Bulk Import Help,Помощь по массовому импорту
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +256,Select Quantity,Выберите Количество
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +257,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,Сообщение отправлено
@@ -2700,6 +2731,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Либо целевой Количество или целевое количество является обязательным.
 apps/erpnext/erpnext/config/projects.py +45,Cost of various activities,Стоимость различных видов деятельности
 apps/erpnext/erpnext/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 +149,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}"
 DocType: Item,Inspection Required,Инспекция Обязательные
@@ -2719,7 +2751,7 @@
 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 +138,Wire Transfer,Банковский перевод
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,Банковский перевод
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Отметить все
 DocType: Sales Order,Recurring Order,Периодический Заказ
 DocType: Company,Default Income Account,По умолчанию Счет Доходы
@@ -2731,21 +2763,19 @@
 ,Welcome to ERPNext,Добро пожаловать в ERPNext
 apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,Привести к поставщику
 DocType: Lead,From Customer,От клиента
-apps/erpnext/erpnext/demo/setup_data.py +357,Calls,Звонки
+apps/erpnext/erpnext/demo/setup/setup_data.py +300,Calls,Звонки
 DocType: Project,Total Costing Amount (via Time Logs),Всего Калькуляция Сумма (с помощью журналов Time)
 DocType: Purchase Order Item Supplied,Stock UOM,Ед. изм.  Запасов
-apps/erpnext/erpnext/stock/doctype/item/item.py +466,"As there are existing transactions for this item, \
-							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Поскольку существуют существующие транзакции для данного элемента, \ вы не можете изменить значения &#39;Имеет серийный номер&#39;, &#39;Имеет Batch No&#39;, &#39;Is Stock Пункт &quot;и&quot; Оценка Метод &quot;"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,Purchase Order {0} is not submitted,Заказ на {0} не представлено
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,Проектированный
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Серийный номер {0} не принадлежит Склад {1}
 apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Примечание: Система не будет проверять по-доставки и избыточного бронирования по пункту {0} как количестве 0
 DocType: Notification Control,Quotation Message,Цитата Сообщение
 DocType: Issue,Opening Date,Открытие Дата
-apps/erpnext/erpnext/schools/api.py +58,Attendance has been marked successfully.,Зрители были успешно отмечены.
+apps/erpnext/erpnext/schools/api.py +57,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 +136,Account Type for {0} must be {1},Тип счета для {0} должен быть {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +139,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,Оба Склад должены принадлежать одной Компании
@@ -2760,12 +2790,13 @@
 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/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 +20,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 +1190,Please select customer,"Пожалуйста, выберите клиента"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1193,Please select customer,"Пожалуйста, выберите клиента"
 DocType: C-Form,I,я
 DocType: Company,Asset Depreciation Cost Center,Центр Амортизация Стоимость активов
 DocType: Sales Order Item,Sales Order Date,Дата Заказа клиента
@@ -2775,6 +2806,7 @@
 ,Payment Period Based On Invoice Date,Оплата период на основе Накладная Дата
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Пропавших без вести Курсы валют на {0}
 DocType: Assessment,Examiner,экзаменатор
+DocType: Student,Siblings,Братья и сестры
 DocType: Journal Entry,Stock Entry,Складские акты
 DocType: Payment Entry,Payment References,Ссылки оплаты
 DocType: C-Form,C-FORM-,C-form-
@@ -2792,11 +2824,12 @@
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Название темы
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,По крайней мере один из продажи или покупки должен быть выбран
+DocType: Grading Structure,Grade Intervals,Интервалы Оценка
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Выберите характер вашего бизнеса.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Где производственные операции проводятся.
 DocType: Asset Movement,Source Warehouse,Источник Склад
 DocType: Installation Note,Installation Date,Дата установки
-apps/erpnext/erpnext/controllers/accounts_controller.py +534,Row #{0}: Asset {1} does not belong to company {2},Строка # {0}: Asset {1} не принадлежит компании {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +537,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,Пользователь Продажи
@@ -2810,28 +2843,31 @@
 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 +111,Date Of Retirement must be greater than Date of Joining,Дата выхода на пенсию должен быть больше даты присоединения
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +49,There were errors while scheduling course on :,Были ошибки При планировании курса по:
 DocType: Sales Invoice,Against Income Account,Против ДОХОДОВ
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +87,{0}% Delivered,{0}% доставлено
+apps/erpnext/erpnext/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,Transporter информация
-apps/erpnext/erpnext/accounts/utils.py +379,Please set default {0} in Company {1},"Пожалуйста, установите значение по умолчанию {0} в компании {1}"
+apps/erpnext/erpnext/accounts/utils.py +456,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,Валовая прибыль / убыток
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Заказ товара Поставляется
 apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,Название компании не может быть компания
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Письмо главы для шаблонов печати.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Титулы для шаблонов печати, например, счет-проформа."
+DocType: Student Guardian,Student Guardian,Студент-хранитель
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +184,Valuation type charges can not marked as Inclusive,Обвинения типа Оценка не может отмечен как включено
 DocType: POS Profile,Update Stock,Обновление стока
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Различные Единица измерения для элементов приведет к некорректному (Всего) значение массы нетто. Убедитесь, что вес нетто каждого элемента находится в том же UOM."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Оценить
 DocType: Asset,Journal Entry for Scrap,Запись в журнале для лома
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Пожалуйста вытяните элементов из накладной
-apps/erpnext/erpnext/accounts/utils.py +349,Journal Entries {0} are un-linked,Записи в журнале {0} не-связаны
+apps/erpnext/erpnext/accounts/utils.py +426,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,"Пожалуйста, укажите округлить МВЗ в компании"
@@ -2855,6 +2891,7 @@
 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,Форум
+DocType: Homepage,"URL for ""All Products""",URL для &quot;Все продукты&quot;
 DocType: Leave Application,Leave Balance Before Application,Оставьте баланс перед нанесением
 DocType: SMS Center,Send SMS,Отправить SMS
 DocType: Cheque Print Template,Width of amount in word,Ширина суммы в слове
@@ -2863,7 +2900,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 +29,Current Job Openings,Текущие вакансии Вакансии
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,Current Job Openings,Текущие вакансии Вакансии
 DocType: Company,Stock Adjustment Account,Регулирование счета запасов
 DocType: Journal Entry,Write Off,Списать
 DocType: Timesheet Detail,Operation ID,Код операции
@@ -2876,7 +2913,7 @@
 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 +850,Show tax break-up,Показать налог распад
+apps/erpnext/erpnext/public/js/controllers/transaction.js +841,Show tax break-up,Показать налог распад
 apps/erpnext/erpnext/accounts/party.py +308,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}, следовательно, вы не можете повторно назначить или изменить его"
@@ -2886,10 +2923,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 +534,Please select Posting Date before selecting Party,"Пожалуйста, выберите Дата публикации, прежде чем выбрать партию"
 DocType: Serial No,Out of AMC,Из КУА
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +80,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 +162,Please contact to the user who have Sales Master Manager {0} role,"Свяжитесь с нами для пользователя, который имеет в продаже Master Менеджер {0} роль"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +195,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 +5,This is based on the attendance of this Student,Это основано на посещаемости этого студента
@@ -2898,12 +2936,11 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Примечания Доставка {0} должно быть отменено до отмены этого заказ клиента
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +75,Paid amount + Write Off Amount can not be greater than Grand Total,"Платные сумма + списания сумма не может быть больше, чем общий итог"
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,{0} is not a valid Batch Number for Item {1},{0} не является допустимым Номером Партии для позиции {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +138,Note: There is not enough leave balance for Leave Type {0},Примечание: Существует не хватает отпуск баланс для отпуске Тип {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,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,Возможность Тип
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,Новая компания
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,Cost Center is required for 'Profit and Loss' account {0},Стоимость Центр необходим для 'о прибылях и убытках »счета {0}
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Сделки могут быть удалены только создателем компании
 apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,"Неверное количество Главная книга найдено. Вы, возможно, выбран неправильный счет в сделке."
 DocType: Cheque Print Template,Cheque Width,Cheque Ширина
@@ -2912,16 +2949,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,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 +228,{0} '{1}' is disabled,{0} '{1}' отключен
+apps/erpnext/erpnext/controllers/accounts_controller.py +231,{0} '{1}' is disabled,{0} '{1}' отключен
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Установить как Open
 DocType: Cheque Print Template,Scanned Cheque,Сканированные чеками
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Отправить автоматические письма на Контакты О представлении операций.
+DocType: Timesheet,Total Billable Amount,Общая сумма Выплачиваемый
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Пункт 3
 DocType: Purchase Order,Customer Contact Email,Контакты с клиентами E-mail
 DocType: Warranty Claim,Item and Warranty Details,Предмет и сведения о гарантии
 DocType: Sales Team,Contribution (%),Вклад (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Примечание: Оплата Вступление не будет создана, так как ""Наличные или Банковский счет"" не был указан"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Responsibilities,Обязанности
+apps/erpnext/erpnext/controllers/accounts_controller.py +78,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,Обязанности
 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,Имя продавца
@@ -2929,6 +2967,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Добавить пользователей
 DocType: Pricing Rule,Item Group,Пункт Группа
 DocType: Item,Safety Stock,Страховой запас
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Код товара&gt; Группа товара&gt; Марка
 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),Налоги и сборы Добавил (Компания Валюта)
@@ -2938,7 +2977,6 @@
 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: Timesheet,Total Hours,Общее количество часов
 DocType: Journal Entry,Printing Settings,Настройки печати
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Total Debit must be equal to Total Credit. The difference is {0},"Всего Дебет должна быть равна общей выработке. Разница в том, {0}"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Автомобилестроение
@@ -2951,13 +2989,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Инвестиционно-банковская деятельность
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +71,Cash or Bank Account is mandatory for making payment entry,Наличными или банковский счет является обязательным для внесения записи платежей
 DocType: Purchase Invoice,Price List Exchange Rate,Прайс-лист валютный курс
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Клиент&gt; Группа клиентов&gt; Территория
 DocType: Purchase Invoice Item,Rate,Оценить
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Intern,Стажер
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,Стажер
 DocType: Stock Entry,From BOM,Из спецификации
 DocType: Assessment,Assessment Code,Код оценки
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +32,Basic,Основной
+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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Пожалуйста, нажмите на кнопку ""Generate Расписание"""
+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 +95,Reference No is mandatory if you entered Reference Date,"Ссылка № является обязательным, если вы ввели Исходной дате"
@@ -2966,11 +3005,11 @@
 DocType: Salary Slip,Salary Structure,Зарплата Структура
 DocType: Account,Bank,Банк:
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Авиалиния
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +752,Issue Material,Материал Выпуск
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +723,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 +683,You are in offline mode. You will not be able to reload until you have network.,Вы находитесь в автономном режиме. Вы не сможете перезагрузить пока у вас есть сеть.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +665,You are in offline mode. You will not be able to reload until you have network.,Вы находитесь в автономном режиме. Вы не сможете перезагрузить пока у вас есть сеть.
 DocType: Hub Settings,Access Token,Маркер доступа
 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,Серийный номер
@@ -2978,33 +3017,35 @@
 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 +1122,Enter value must be positive,Введите значение должно быть положительным
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,All Territories,Все Территории
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1125,Enter value must be positive,Введите значение должно быть положительным
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,Все Территории
 DocType: Purchase Invoice,Items,Элементы
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +23,Student is already enrolled.,Студент уже поступил.
 DocType: Fiscal Year,Year Name,Имя года
 DocType: Process Payroll,Process Payroll,Процесс расчета заработной платы
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,"Есть больше праздников, чем рабочих дней в этом месяце."
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +233,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 +96,Request for Quotations,Запрос на предоставление предложений
+apps/erpnext/erpnext/hooks.py +104,Request for Quotations,Запрос на предоставление предложений
 DocType: Payment Reconciliation,Maximum Invoice Amount,Максимальная Сумма счета
 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 +628,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"По умолчанию Единица измерения для варианта &#39;{0}&#39; должно быть такой же, как в шаблоне &#39;{1}&#39;"
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"По умолчанию Единица измерения для варианта &#39;{0}&#39; должно быть такой же, как в шаблоне &#39;{1}&#39;"
 DocType: Shipping Rule,Calculate Based On,Рассчитать на основе
 DocType: Delivery Note Item,From Warehouse,От Склад
 DocType: Assessment,Supervisor Name,Имя супервизора
+DocType: Assessment,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,Покупка пользователя
 DocType: Notification Control,Customize the Notification,Настроить уведомления
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Cash Flow from Operations,Поток денежных средств от операций
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,Адрес по умолчанию шаблона не может быть удален
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,Адрес по умолчанию шаблона не может быть удален
 DocType: Sales Invoice,Shipping Rule,Правило Доставка
 DocType: Manufacturer,Limited to 12 characters,Ограничено до 12 символов
 DocType: Journal Entry,Print Heading,Распечатать Заголовок
@@ -3019,8 +3060,8 @@
 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/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Либо целевой Количество или целевое количество является обязательным
-apps/erpnext/erpnext/stock/get_item_details.py +485,No default BOM exists for Item {0},Нет умолчанию спецификации не существует Пункт {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +336,Please select Posting Date first,"Пожалуйста, выберите проводки Дата первого"
+apps/erpnext/erpnext/stock/get_item_details.py +486,No default BOM exists for Item {0},Нет умолчанию спецификации не существует Пункт {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +326,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,МВЗ с существующими сделок не могут быть преобразованы в книге
@@ -3036,6 +3077,7 @@
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Соответствие Платежи с счетов-фактур
 DocType: Journal Entry,Bank Entry,Банк Стажер
 DocType: Authorization Rule,Applicable To (Designation),Применимо к (Обозначение)
+,Profitability Analysis,Анализ рентабельности
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,Добавить в корзину
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Group By
 DocType: Guardian,Interests,интересы
@@ -3048,22 +3090,22 @@
 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 +141,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Серийный товара {0} не может быть обновлен \
  использованием Stock примирения"
 DocType: Scheduling Tool,Day,День
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Новый Серийный номер не может быть Склад. Склад должен быть установлен на фондовой Вступил или приобрести получении
 DocType: Lead,Lead Type,Ведущий Тип
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,You are not authorized to approve leaves on Block Dates,Вы не уполномочен утверждать листья на Блок Сроки
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,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: Student Applicant,AP.,AP.
 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 +639,Point of Sale,Точки продаж
+apps/erpnext/erpnext/accounts/page/pos/pos.js +634,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,Налог
 DocType: Production Planning Tool,Production Planning Tool,Планирование производства инструмента
@@ -3072,74 +3114,77 @@
 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 +373,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 Entry,Update Rate and Availability,Частота обновления и доступность
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Процент вы имеете право принимать или сдавать более против заказанного количества. Например: Если Вы заказали 100 единиц. и ваш Пособие 10%, то вы имеете право на получение 110 единиц."
 DocType: POS Profile,Customer Group,Группа клиентов
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,Expense account is mandatory for item {0},Расходов счета является обязательным для пункта {0}
 DocType: Item,Website Description,Описание
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date must be on or after today,"Следующий Износ Дата должна быть на или после того, как сегодня"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,Чистое изменение в капитале
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +145,Please cancel Purchase Invoice {0} first,"Пожалуйста, отменить счета покупки {0} первым"
 DocType: Serial No,AMC Expiry Date,КУА срок действия
 ,Sales Register,Книга продаж
 DocType: Quotation,Quotation Lost Reason,Цитата Забыли Причина
+apps/erpnext/erpnext/utilities/doctype/address/address.py +164,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,"Нет адреса по умолчанию шаблона не найдено. Пожалуйста, создайте новый из Setup&gt; Печать и Брендинг&gt; Адрес шаблона."
 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 +330,Transaction reference no {0} dated {1},Референция сделка не {0} от {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Transaction reference no {0} dated {1},Референция сделка не {0} от {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,"Там нет ничего, чтобы изменить."
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,Summary for this month and pending activities,Резюме для этого месяца и в ожидании деятельности
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Резюме для этого месяца и в ожидании деятельности
 DocType: Customer Group,Customer Group Name,Группа Имя клиента
 apps/erpnext/erpnext/public/js/financial_statements.js +54,Cash Flow Statement,О движении денежных средств
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Please remove this Invoice {0} from C-Form {1},"Пожалуйста, удалите этот счет {0} из C-Form {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,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 +644,Get Items,Получить товары
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +623,Get Items,Получить товары
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +210,Please enter Write Off Account,"Пожалуйста, введите списать счет"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Последняя дата заказа
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +41,Account {0} does not belongs to company {1},Счет {0} не принадлежит компании {1}
+DocType: Student,Guardian Details,Подробнее Гардиан
 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,Планируемая дата начала
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,Customer is required against Receivable account {0},Клиент обязан в отношении дебиторов счета {0}
 DocType: Serial No,Creation Document Type,Создание типа документа
 DocType: Leave Type,Is Encash,Является Обналичивание
 DocType: Purchase Invoice,Mobile No,Мобильный номер
 DocType: Leave Allocation,New Leaves Allocated,Новые листья Выделенные
-apps/erpnext/erpnext/controllers/trends.py +265,Project-wise data is not available for Quotation,Проект мудрый данные не доступны для коммерческого предложения
+apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Проект мудрый данные не доступны для коммерческого предложения
 DocType: Project,Expected End Date,Ожидаемая дата завершения
 DocType: Budget Account,Budget Amount,Сумма бюджета
 DocType: Appraisal Template,Appraisal Template Title,Оценка шаблона Название
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,Commercial,Коммерческий сектор
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,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 +648,Row {0}# Account must be of type 'Fixed Asset',Строка {0} # Счет должен быть типа &quot;Fixed Asset&quot;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,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 +30,Series is mandatory,Серия является обязательным
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +50,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}
 DocType: Leave Allocation,Unused leaves,Неиспользованные листья
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Cr,Cr
 DocType: Tax Rule,Billing State,Государственный счетов
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +250,Transfer,Переложить
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +187,{0} {1} does not associated with Party Account {2},{0} {1} не связан с Party Account {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,Fetch exploded BOM (including sub-assemblies),Fetch разобранном BOM (в том числе узлов)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +254,Transfer,Переложить
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +190,{0} {1} does not associated with Party Account {2},{0} {1} не связан с Party Account {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +796,Fetch exploded BOM (including sub-assemblies),Fetch разобранном BOM (в том числе узлов)
 DocType: Authorization Rule,Applicable To (Employee),Применимо к (Сотрудник)
-apps/erpnext/erpnext/controllers/accounts_controller.py +115,Due Date is mandatory,Благодаря Дата является обязательным
+apps/erpnext/erpnext/controllers/accounts_controller.py +118,Due Date is mandatory,Благодаря Дата является обязательным
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Прирост за атрибут {0} не может быть 0
 DocType: Journal Entry,Pay To / Recd From,Pay To / RECD С
 DocType: Naming Series,Setup Series,Серия установки
 DocType: Payment Reconciliation,To Invoice Date,Счета-фактуры Дата
 DocType: Supplier,Contact HTML,Связаться с HTML
 ,Inactive Customers,Неактивные Клиенты
+DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Покупка Поступления
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Как Ценообразование Правило применяется?
 DocType: Quality Inspection,Delivery Note No,Документ  Отгрузки №
@@ -3148,7 +3193,7 @@
 DocType: Company,Retail,Розничная торговля
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +120,Customer {0} does not exist,Клиент {0} не существует
 DocType: Attendance,Absent,Отсутствует
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +587,Product Bundle,Связка товаров
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Product Bundle,Связка товаров
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Invalid reference {1},Ряд {0}: Недопустимая ссылка {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Купить налоги и сборы шаблон
 DocType: Upload Attendance,Download Template,Скачать шаблон
@@ -3158,8 +3203,8 @@
 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 +742,Send Supplier Emails,Отправить Поставщик электронных писем
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +104,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Зарплата уже обработали за период между {0} и {1}, Оставьте период применения не может быть в пределах этого диапазона дат."
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +708,Send Supplier Emails,Отправить Поставщик электронных писем
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,"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,Опекун Проценты
 DocType: Timesheet,Employee Detail,Сотрудник Деталь
@@ -3170,9 +3215,9 @@
 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/accounts/doctype/gl_entry/gl_entry.py +77,Account {0} cannot be a Group,Счет {0} не может быть группой
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} cannot be a Group,Счет {0} не может быть группой
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +31,Optional. This setting will be used to filter in various transactions.,Факультативно. Эта установка будет использоваться для фильтрации в различных сделок.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +107,Negative Valuation Rate is not allowed,Отрицательный Оценка курс не допускается
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Отрицательный Оценка курс не допускается
 DocType: Holiday List,Weekly Off,Еженедельный Выкл
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Для, например 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +39,Provisional Profit / Loss (Credit),Предварительная прибыль / убыток (Кредит)
@@ -3186,16 +3231,16 @@
 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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: МВЗ является обязательным для позиции {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +626,Get Items from Product Bundle,Получить элементов из комплекта продукта
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +605,Get Items from Product Bundle,Получить элементов из комплекта продукта
 DocType: Asset,Straight Line,Прямая линия
 DocType: Project User,Project User,Проект Пользователь
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} is inactive,Счет {0} неактивен
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} is inactive,Счет {0} неактивен
 DocType: GL Entry,Is Advance,Является Advance
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Посещаемость С Дата и посещаемости на сегодняшний день является обязательным
 apps/erpnext/erpnext/controllers/buying_controller.py +148,Please enter 'Is Subcontracted' as Yes or No,"Пожалуйста, введите 'Является субподряду "", как Да или Нет"
 DocType: Sales Team,Contact No.,Контактный номер
 DocType: Bank Reconciliation,Payment Entries,Записи оплаты
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,'Profit and Loss' type account {0} not allowed in Opening Entry,"Учетной записи типа {0} не позволено открытие ""Прибыль и Убытки"""
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +71,'Profit and Loss' type account {0} not allowed in Opening Entry,"Учетной записи типа {0} не позволено открытие ""Прибыль и Убытки"""
 DocType: Program Enrollment Tool,Get Students From,Получить студентов из
 DocType: Hub Settings,Seller Country,Продавец Страна
 apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,Опубликовать товары на сайте
@@ -3214,7 +3259,7 @@
 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 +558,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Строка # {0}: Asset {1} не может быть представлено, уже {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +561,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Строка # {0}: Asset {1} не может быть представлено, уже {2}"
 DocType: Tax Rule,Billing Country,Страна плательщика
 DocType: Production Order,Expected Delivery Date,Ожидаемая дата поставки
 apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Дебет и Кредит не равны для {0} # {1}. Разница {2}.
@@ -3227,13 +3272,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +202,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: Sales Order,% Amount Billed,% Сумма счета
+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 +117,No Item with Serial No {0},Нет товара с серийным № {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Открытые Уведомления
+DocType: Email Digest,Open Notifications,Открытые Уведомления
 DocType: Payment Entry,Difference Amount (Company Currency),Разница Сумма (Компания Валюта)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,Прямые расходы
 apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
@@ -3241,7 +3286,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Новый Выручка клиентов
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,Командировочные Pасходы
 DocType: Maintenance Visit,Breakdown,Разбивка
-apps/erpnext/erpnext/controllers/accounts_controller.py +634,Account: {0} with currency: {1} can not be selected,Счет: {0} с валютой: {1} не может быть выбран
+apps/erpnext/erpnext/controllers/accounts_controller.py +637,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}
 DocType: Program Enrollment Tool,Student Applicants,Студенческие Кандидаты
@@ -3249,15 +3294,15 @@
 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 +56,Probation,Испытательный срок
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Probation,Испытательный срок
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Зарплатные Компоненты
 DocType: Program Enrollment Tool,New Academic Year,Новый учебный год
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Payment of salary for the month {0} and year {1},Выплата заработной платы за месяц {0} и год {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Payment of salary for the month {0} and year {1},Выплата заработной платы за месяц {0} и год {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,"Авто вставка Скорость Цены, если не хватает"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Всего уплаченной суммы
 DocType: Production Order Item,Transferred Qty,Переведен Кол-во
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Навигационный
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Planning,Планирование
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,Планирование
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Выпущен
 DocType: Project,Total Billing Amount (via Time Logs),Всего счетов Сумма (с помощью журналов Time)
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,We sell this Item,Мы продаем эту позицию
@@ -3270,11 +3315,10 @@
 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/accounts/page/pos/pos.js +1376,Sales invoice submitted sucessfully.,"счета-фактуры по продажам, представленный успешно."
 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}"
 DocType: Assessment Result,Student Name,Имя ученика
-apps/erpnext/erpnext/hooks.py +104,Assessment Schedule,График проведения оценки
+apps/erpnext/erpnext/hooks.py +113,Assessment Schedule,График проведения оценки
 DocType: Brand,Item Manager,Состояние менеджер
 DocType: Buying Settings,Default Supplier Type,По умолчанию Тип Поставщик
 DocType: Production Order,Total Operating Cost,Общие эксплуатационные расходы
@@ -3284,6 +3328,7 @@
 DocType: GL Entry,Party Type,Партия Тип
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +78,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,Максимальное количество дней отпуска разрешены
@@ -3295,18 +3340,19 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Котировки в снабжении или клиентов.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Роль разрешено редактировать Замороженный исходный
 ,Territory Target Variance Item Group-Wise,Территория Целевая Разница Пункт Группа Мудрого
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Customer Groups,Все Группы клиентов
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +78,Accumulated Monthly,Накопленный в месяц
-apps/erpnext/erpnext/controllers/accounts_controller.py +595,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,"{0} является обязательным. Может быть, запись Обмен валюты не создана для {1} по {2}."
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Все Группы клиентов
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +81,Accumulated Monthly,Накопленный в месяц
+apps/erpnext/erpnext/controllers/accounts_controller.py +598,{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} не существует
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Прайс-лист Тариф (Компания Валюта)
 DocType: Products Settings,Products Settings,Настройки Продукты
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +188,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Пожалуйста, установите Нейминг Series для {0} через Setup&gt; Настройки&gt; Naming Series"
 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 +84,Secretary,Секретарь
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,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,Покупка
@@ -3315,24 +3361,22 @@
 ,Reqd By Date,Логика включения по дате
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Creditors,Кредиторы
 DocType: Assessment,Assessment Name,Оценка Имя
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,Ряд # {0}: Серийный номер является обязательным
+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 +859,Supplier Quotation,Поставщик цитаты
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +838,Supplier Quotation,Поставщик цитаты
 DocType: Quotation,In Words will be visible once you save the Quotation.,По словам будет виден только вы сохраните цитаты.
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +7,Collect Fees,взимать сборы
+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}
 DocType: Lead,Add to calendar on this date,Добавить в календарь в этот день
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Правила для добавления стоимости доставки.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Предстоящие События
 DocType: Item,Opening Stock,Открытие изображения
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Требуется клиентов
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} является обязательным для возврата
 DocType: Purchase Order,To Receive,Получить
 apps/erpnext/erpnext/public/js/setup_wizard.js +195,user@example.com,user@example.com
-DocType: Email Digest,Income / Expense,Доходы / расходы
 DocType: Employee,Personal Email,Личная 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.","Если включен, то система будет отправлять бухгалтерских проводок для инвентаризации автоматически."
@@ -3344,13 +3388,14 @@
 DocType: Customer,From Lead,От Ведущий
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,"Заказы, выпущенные для производства."
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Выберите финансовый год ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,POS Profile required to make POS Entry,"POS-профиля требуется, чтобы сделать запись POS"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +509,POS Profile required to make POS Entry,"POS-профиля требуется, чтобы сделать запись POS"
 DocType: Program Enrollment Tool,Enroll Students,зачислить студентов
 DocType: Hub Settings,Name Token,Имя маркера
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Стандартный Продажа
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Atleast one warehouse is mandatory,"По крайней мере, один склад является обязательным"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +129,Atleast one warehouse is mandatory,"По крайней мере, один склад является обязательным"
 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 +330,{0} against Sales Invoice {1},{0} против чека {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Название проекта
@@ -3371,10 +3416,11 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Листья должны быть выделены несколько 0,5"
 DocType: Production Order,Operation Cost,Стоимость эксплуатации
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,Добавить посещаемость от. Файл CSV
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Выдающийся Amt
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Установить целевые Пункт Группа стрелке для этого менеджера по продажам.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],"Морозильники Акции старше, чем [дней]"
-apps/erpnext/erpnext/controllers/accounts_controller.py +528,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Строка # {0}: Актив является обязательным для фиксированного актива покупки / продажи
+apps/erpnext/erpnext/controllers/accounts_controller.py +531,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Строка # {0}: Актив является обязательным для фиксированного актива покупки / продажи
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Если два или более Ценообразование правила содержатся на основании указанных выше условиях, приоритет применяется. Приоритет номер от 0 до 20, а значение по умолчанию равно нулю (пустой). Большее число означает, что он будет иметь приоритет, если есть несколько правил ценообразования с одинаковыми условиями."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Финансовый год: {0} не существует
 DocType: Currency Exchange,To Currency,В валюту
@@ -3391,15 +3437,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Обратная связь с клиентами
 DocType: Account,Expense,Расходы
-DocType: Sales Invoice,Exhibition,Показательный
 apps/erpnext/erpnext/utilities/doctype/address/address.py +77,"Company is mandatory, as it is your company address","Компания является обязательным, так как это ваша компания адрес"
 DocType: Item Attribute,From Range,От хребта
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +81,Syntax error in formula or condition: {0},Синтаксическая ошибка в формуле или условие: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +92,Syntax error in formula or condition: {0},Синтаксическая ошибка в формуле или условие: {0}
 apps/erpnext/erpnext/stock/utils.py +99,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 +28,Jobs,работы
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,работы
 ,Sales Order Trends,Продажи Заказать Тенденции
 DocType: Employee,Held On,Состоявшемся
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Производство товара
@@ -3408,16 +3454,16 @@
 DocType: Stock Entry Detail,Additional Cost,Дополнительная стоимость
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,Окончание финансового периода
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","Не можете фильтровать на основе ваучером Нет, если сгруппированы по ваучером"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +763,Make Supplier Quotation,Сделать Поставщик цитаты
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,Make Supplier Quotation,Сделать Поставщик цитаты
 DocType: Quality Inspection,Incoming,Входящий
 DocType: BOM,Materials Required (Exploded),Необходимые материалы (в разобранном)
 apps/erpnext/erpnext/public/js/setup_wizard.js +185,"Add users to your organization, other than yourself","Добавить других пользователей в Вашу организация, не считая Вас."
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,Row # {0}: Serial No {1} does not match with {2} {3},"Ряд # {0}: Серийный номер {1}, не соответствует {2} {3}"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +42,Casual Leave,Повседневная Оставить
+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,Повседневная Оставить
 DocType: Batch,Batch ID,ID партии
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,Note: {0},Примечание: {0}
 ,Delivery Note Trends,Доставка Примечание тенденции
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +103,This Week's Summary,Резюме этой недели
+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} можно обновить только через  перемещение по складу
 DocType: Student Group Creation Tool,Get Courses,Получить курсы
 DocType: GL Entry,Party,Сторона
@@ -3427,7 +3473,7 @@
 DocType: Request for Quotation Item,Request for Quotation Item,Запрос на коммерческое предложение Пункт
 DocType: Purchase Order,To Bill,Для Билла
 DocType: Material Request,% Ordered,% заказано
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Piecework,Сдельная работа
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Piecework,Сдельная работа
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,Средняя Цена Покупки
 DocType: Task,Actual Time (in Hours),Фактическое время (в часах)
 DocType: Employee,History In Company,История В компании
@@ -3444,7 +3490,7 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +350,{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 +162,Black,Черный
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,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} элементов произведено
@@ -3455,13 +3501,13 @@
 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 +69,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,Марк Отсутствует
 DocType: Journal Entry Account,Exchange Rate,Курс обмена
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Sales Order {0} is not submitted,Заказ на продажу {0} не представлено
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +527,Sales Order {0} is not submitted,Заказ на продажу {0} не представлено
 DocType: Homepage,Tag Line,Tag Line
 DocType: Fee Component,Fee Component,Плата компонентов
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +857,Add items from,Добавить элементы из
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +836,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: Cheque Print Template,Regular,регулярное
 DocType: BOM,Last Purchase Rate,Последняя цена покупки
@@ -3469,6 +3515,7 @@
 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}, так как имеет варианты"
 ,Sales Person-wise Transaction Summary,Человек мудрый продаж Общая информация по сделкам
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +60,Cost Center is required for 'Profit and Loss' account {0}. Please set up a default Cost Center for the Company.,МВЗ требуется для «Отчет о прибылях и убытках» счета {0}. Настройте МВЗ по умолчанию для Компании.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,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,Ежемесячные Проценты распределения
@@ -3479,12 +3526,12 @@
 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 +710,Online,В сети
+apps/erpnext/erpnext/accounts/page/pos/pos.js +692,Online,В сети
 ,Available Stock for Packing Items,Доступные Stock для упаковки товаров
 DocType: Item Variant,Item Variant,Пункт Вариант
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,"Установка этого Адрес шаблон по умолчанию, поскольку нет никакого другого умолчанию"
+apps/erpnext/erpnext/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 +74,Quality Management,Управление качеством
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,Управление качеством
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,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,Сотрудник Внешний Работа История
@@ -3506,11 +3553,12 @@
 DocType: Student,Student Email ID,Student Email ID
 DocType: Employee,Notice (days),Уведомление (дней)
 DocType: Tax Rule,Sales Tax Template,Шаблон Налога с продаж
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1520,Select items to save the invoice,Выберите элементы для сохранения счета-фактуры
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1544,Select items to save the invoice,Выберите элементы для сохранения счета-фактуры
 DocType: Employee,Encashment Date,Инкассация Дата
 DocType: Account,Stock Adjustment,Регулирование запасов
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},По умолчанию активность Стоимость существует для вида деятельности - {0}
 DocType: Production Order,Planned Operating Cost,Планируемые Эксплуатационные расходы
+DocType: Academic Term,Term Start Date,Срок дата начала
 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,Имя заявителя
@@ -3540,17 +3588,17 @@
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Счет для склада (непрерывной инвентаризации) будет создан для этого счета.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +119,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Склад не может быть удален как существует запись складе книга для этого склада.
 DocType: Company,Distribution,Распределение
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +8,Amount Paid,Выплачиваемая сумма
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Project Manager,Руководитель проекта
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,Выплачиваемая сумма
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,Руководитель проекта
 ,Quoted Item Comparison,Цитируется Сравнение товара
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Dispatch,Отправка
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,Отправка
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Макс скидка позволило пункта: {0} {1}%
 apps/erpnext/erpnext/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.,"Роль, которая имеет право на представление операции, превышающие лимиты кредитования, установленные."
-DocType: Sales Invoice,Supplier Reference,Поставщик Ссылка
-apps/erpnext/erpnext/accounts/page/pos/pos.js +844,"Master data syncing, it might take some time","Мастер синхронизации данных, это может занять некоторое время"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +832,"Master data syncing, it might take some time","Мастер синхронизации данных, это может занять некоторое время"
 DocType: Item,Material Issue,Материал выпуск
 DocType: Hub Settings,Seller Description,Продавец Описание
 DocType: Employee Education,Qualification,Квалификаци
@@ -3564,7 +3612,7 @@
 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 +83,Error in formula or condition,Ошибка в формуле или состоянии
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,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,Снять все
@@ -3573,7 +3621,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},Чтобы Дата должна быть в пределах финансового года. Предполагая To Date = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Здесь вы можете поддерживать рост, вес, аллергии, медицинские проблемы и т.д."
 DocType: Leave Block List,Applies to Company,Относится к компании
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +197,Cannot cancel because submitted Stock Entry {0} exists,"Нельзя отменить, потому что представляется со Вступление {0} существует"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +198,Cannot cancel because submitted Stock Entry {0} exists,"Нельзя отменить, потому что представляется со Вступление {0} существует"
 DocType: Purchase Invoice,In Words,Прописью
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,Today is {0}'s birthday!,Сегодня у {0} день рождения!
 DocType: Production Planning Tool,Material Request For Warehouse,Материал Запрос для Склад
@@ -3583,14 +3631,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,Ваш финансовый год начинается
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Активов Амортизация и противовесов
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +319,Amount {0} {1} transferred from {2} to {3},Сумма {0} {1} переведен из {2} до {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +322,Amount {0} {1} transferred from {2} to {3},Сумма {0} {1} переведен из {2} до {3}
 DocType: Sales Invoice,Get Advances Received,Получить авансы полученные
 DocType: Email Digest,Add/Remove Recipients,Добавить / Удалить получателей
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +432,Transaction not allowed against stopped Production Order {0},Сделка не допускается в отношении остановил производство ордена {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +437,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 +143,Join,Присоединиться
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Нехватка Кол-во
-apps/erpnext/erpnext/stock/doctype/item/item.py +652,Item variant {0} exists with same attributes,Состояние вариант {0} существует с теми же атрибутами
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Состояние вариант {0} существует с теми же атрибутами
+DocType: Leave Application,LAP/,LAP /
 DocType: Salary Slip,Salary 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,"Поле ""До Даты"" является обязательным для заполнения"
@@ -3598,12 +3647,12 @@
 DocType: Sales Invoice Item,Sales Order Item,Позиция в Заказе клиента
 DocType: Salary Slip,Payment Days,Платежные дней
 DocType: Customer,Dormant,бездействующий
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +212,Warehouses with child nodes cannot be converted to ledger,Склады с дочерними узлами не могут быть преобразованы в бухгалтерской книге
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +215,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/public/js/controllers/transaction.js +866,It is needed to fetch Item Details.,Он необходим для извлечения Подробности Элемента.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +857,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} уже существует
@@ -3613,14 +3662,14 @@
 DocType: Expense Claim,Total Claimed Amount,Всего заявленной суммы
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Потенциальные возможности для продажи.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,Invalid {0},Неверный {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Sick Leave,Отпуск по болезни
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,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,Универмаги
 DocType: Warehouse,PIN,ШТЫРЬ
 DocType: Sales Invoice,Base Change Amount (Company Currency),Базовая Изменение Сумма (Компания Валюта)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +313,No accounting entries for the following warehouses,Нет учетной записи для следующих складов
-apps/erpnext/erpnext/projects/doctype/project/project.js +102,Save the document first.,Сохранить документ в первую очередь.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +314,No accounting entries for the following warehouses,Нет учетной записи для следующих складов
+apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Сохранить документ в первую очередь.
 DocType: Account,Chargeable,Ответственный
 DocType: Company,Change Abbreviation,Изменить Аббревиатура
 DocType: Expense Claim Detail,Expense Date,Дата расхода
@@ -3633,10 +3682,9 @@
 DocType: Purchase Invoice,Recurring Print Format,Периодическая Формат печати
 DocType: C-Form,Series,Серии значений
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,Expected Delivery Date cannot be before Purchase Order Date,Ожидаемая дата поставки не может быть до заказа на Дата
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Пожалуйста, установите Нейминг Series для {0} через Setup&gt; Настройки&gt; Naming Series"
 DocType: Appraisal,Appraisal Template,Оценка шаблона
 DocType: Item Group,Item Classification,Пункт Классификация
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Business Development Manager,Менеджер по развитию бизнеса
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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,Бухгалтерская книга
@@ -3646,8 +3694,8 @@
 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 +940,Please select {0} first,"Пожалуйста, выберите {0} первый"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +749,Batch {0} of Item {1} has expired.,Партия {0} позиций {1} просрочена
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +953,Please select {0} first,"Пожалуйста, выберите {0} первый"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +757,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,Промежуточный итог
@@ -3675,8 +3723,8 @@
  {%, если 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 +92,Warehouse not found in the system,Склад не найден в системе
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +106,This Month's Summary,Резюме этого месяца
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Склад не найден в системе
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Резюме этого месяца
 DocType: Quality Inspection Reading,Quality Inspection Reading,Контроль качества Чтение
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,"""Заморозить остатки старше чем"" должны быть меньше %d дней."
 DocType: Tax Rule,Purchase Tax Template,Налог на покупку шаблон
@@ -3686,21 +3734,22 @@
 DocType: Item Customer Detail,Ref Code,Код
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Сотрудник записей.
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Please set Next Depreciation Date,"Пожалуйста, следующий набор амортизации Дата"
-DocType: Payment Gateway,Payment Gateway,Платежный шлюз
 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 +378,Operation Time must be greater than 0 for Operation {0},"Время работы должно быть больше, чем 0 для операции {0}"
+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/accounts/doctype/account/account.py +170,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 (ч)
 DocType: Program,Program Abbreviation,Программа Аббревиатура
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,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: Appraisal,Start Date,Дата Начала
@@ -3716,21 +3765,22 @@
 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,"Удалить элемент, если обвинения не относится к этому пункту"
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Например. smsgateway.com / API / send_sms.cgi
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +27,Transaction currency must be same as Payment Gateway currency,"Валюта сделки должна быть такой же, как платежный шлюз валюты"
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Transaction currency must be same as Payment Gateway currency,"Валюта сделки должна быть такой же, как платежный шлюз валюты"
 DocType: Payment Entry,Receive,Получать
+apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,котировки:
 DocType: Maintenance Visit,Fully Completed,Полностью завершен
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% завершено
 DocType: Employee,Educational Qualification,Образовательный ценз
 DocType: Workstation,Operating Costs,Операционные расходы
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,"Действие, если накопилось Превышен Ежемесячный бюджет"
 DocType: Purchase Invoice,Submit on creation,Отправить по созданию
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +432,Currency for {0} must be {1},Валюта для {0} должно быть {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +435,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 +493,Row {0}: An Reorder entry already exists for this warehouse {1},Ряд {0}: запись Изменить порядок уже существует для этого склада {1}
+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/crm/doctype/opportunity/opportunity.py +79,"Cannot declare as lost, because Quotation has been made.","Не можете объявить как потерял, потому что цитаты было сделано."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Покупка Мастер-менеджер
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +429,Production Order {0} must be submitted,Производственный заказ {0} должны быть представлены
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +434,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,На сегодняшний день не может быть раньше от даты
@@ -3740,25 +3790,27 @@
 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 +181,Totals,Всего:
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,Всего:
 DocType: BOM,Manufacturing,Производство
 ,Ordered Items To Be Delivered,Заказал детали быть поставленным
 DocType: Account,Income,Доход
 DocType: Industry Type,Industry Type,Промышленность Тип
 apps/erpnext/erpnext/templates/includes/cart.js +141,Something went wrong!,Что-то пошло не так!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,Warning: Leave application contains following block dates,Предупреждение: Оставьте приложение содержит следующие даты блок
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +120,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} чтобы завершить эту транзакцию.
+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 +181,Organization unit (department) master.,Название подразделения (департамент) хозяин.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,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 +793,All records are synced.,Все записи синхронизируются.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +781,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,Название учетного отдела
@@ -3777,21 +3829,20 @@
 DocType: Address,Name of person or organization that this address belongs to.,"Имя лица или наименование организации, которому принадлежит этот адрес."
 apps/erpnext/erpnext/public/js/setup_wizard.js +260,Your Suppliers,Ваши Поставщики
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +49,Cannot set as Lost as Sales Order is made.,"Невозможно установить, как Остаться в живых, как заказ клиента производится."
-DocType: Student Applicant,Mother's Name,Имя матери
 DocType: Request for Quotation Item,Supplier Part No,Поставщик Part No
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +348,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 +326,Received From,Получено от
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Received From,Получено от
 DocType: Lead,Converted,Переделанный
 DocType: Item,Has Serial No,Имеет Серийный номер
 DocType: Employee,Date of Issue,Дата выдачи
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: От {0} для {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +153,Row #{0}: Set Supplier for item {1},Ряд # {0}: Установить Поставщик по пункту {1}
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +93,Row {0}: Hours value must be greater than zero.,Строка {0}: значение часов должно быть больше нуля.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +117,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} не может быть найден
 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 +172,{0} {1} does not exist,{0} {1} не существует
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +175,{0} {1} does not exist,{0} {1} не существует
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,Please check Multi Currency option to allow accounts with other currency,"Пожалуйста, проверьте мультивалютный вариант, позволяющий счета другой валюте"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +72,Item: {0} does not exist in the system,Состояние: {0} не существует в системе
 apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,Ваши настройки доступа не позволяют замораживать значения
@@ -3800,13 +3851,14 @@
 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/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 +109,Electrical,Электрический
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Electrical,Электрический
 DocType: Stock Entry,Total Value Difference (Out - In),Общая стоимость Разница (Out - In)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,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}
@@ -3814,7 +3866,7 @@
 DocType: Item,Customer Code,Код клиента
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +210,Birthday Reminder for {0},Напоминание о дне рождения для {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Дни с последнего Заказать
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +292,Debit To account must be a Balance Sheet account,Дебету счета должны быть баланс счета
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To account must be a Balance Sheet account,Дебету счета должны быть баланс счета
 DocType: Buying Settings,Naming Series,Наименование серии
 DocType: Leave Block List,Leave Block List Name,Оставьте Имя Блок-лист
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Капитал запасов
@@ -3826,11 +3878,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 +301,Salary Slip of employee {0} already created for time sheet {1},Зарплата Скольжение работника {0} уже создан для табеля {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +313,Salary Slip of employee {0} already created for time sheet {1},Зарплата Скольжение работника {0} уже создан для табеля {1}
 DocType: Sales Order Item,Ordered Qty,Заказал Кол-во
-apps/erpnext/erpnext/stock/doctype/item/item.py +673,Item {0} is disabled,Пункт {0} отключена
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} is disabled,Пункт {0} отключена
 DocType: Stock Settings,Stock Frozen Upto,Фото Замороженные До
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +838,BOM does not contain any stock item,BOM не содержит какой-либо элемент запаса
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +809,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,Создать зарплат Slips
@@ -3838,23 +3890,24 @@
 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 +485,Row #{0}: Please set reorder quantity,"Ряд # {0}: Пожалуйста, установите количество тональный"
+DocType: Sales Invoice Timesheet,Billing Hours,Платежная часы
+apps/erpnext/erpnext/stock/doctype/item/item.py +487,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 +62,Please set {0},"Пожалуйста, установите {0}"
 DocType: Purchase Invoice,Repeat on Day of Month,Повторите с Днем Ежемесячно
 DocType: Employee,Health Details,Подробности Здоровье
 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,Представьте все промахи зарплаты для указанных выше выбранным критериям
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} объектов синхронизировано
 DocType: Sales Order,Partly Delivered,Небольшая Поставляются
-DocType: Sales Invoice,Existing Customer,Существующий клиент
 DocType: Email Digest,Receivables,Дебиторская задолженность
+DocType: Lead Source,Lead Source,Ведущий Источник
 DocType: Customer,Additional information regarding the customer.,Дополнительная информация относительно клиента.
 DocType: Quality Inspection Reading,Reading 5,Чтение 5
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +38,Campaign Name is required,Необходимо указать название маркетинговой кампании
 DocType: Maintenance Visit,Maintenance Date,Техническое обслуживание Дата
 DocType: Purchase Invoice Item,Rejected Serial No,Отклонен Серийный номер
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +80,Year start date or end date is overlapping with {0}. To avoid please set company,"Год дата начала или дата окончания перекрывается с {0}. Чтобы избежать пожалуйста, установите компанию"
@@ -3863,10 +3916,9 @@
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","Пример:. ABCD ##### 
  Если серия установлен и Серийный номер не упоминается в сделках, то автоматическая серийный номер будет создан на основе этой серии. Если вы хотите всегда явно упомянуть заводским номером для этого элемента. оставить это поле пустым,."
 DocType: Upload Attendance,Upload Attendance,Добавить посещаемости
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +129,BOM and Manufacturing Quantity are required,Спецификация и производство Количество требуется
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,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,Максимальная прочность
-DocType: Bank Reconciliation Detail,Amount,Сумма
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM заменить
 ,Sales Analytics,Аналитика продаж
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +113,Available {0},Доступно {0}
@@ -3874,14 +3926,14 @@
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Настройка e-mail
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +96,Please enter default currency in Company Master,"Пожалуйста, введите валюту по умолчанию в компании Master"
 DocType: Stock Entry Detail,Stock Entry Detail,Подробности Складского Акта
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +100,Daily Reminders,Ежедневные напоминания
+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/account/account_tree.js +23,New Account Name,Новый Имя счета
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Сырье Поставляется Стоимость
 DocType: Selling Settings,Settings for Selling Module,Настройки по продаже модуля
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Customer Service,Обслуживание Клиентов
+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/config/hr.py +50,Offer candidate a Job.,Предложение кандидата Работа.
@@ -3890,8 +3942,9 @@
 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} должен быть запас товара
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,По умолчанию работы на складе Прогресс
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1570,Total nos of serial no is not equal to quantity.,Всего н.у.к серийного NO не равно количеству.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1594,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,Обновление Номер серии
@@ -3899,9 +3952,10 @@
 DocType: Sales Order,Printing Details,Печатать Подробности
 DocType: Task,Closing Date,Дата закрытия
 DocType: Sales Order Item,Produced Quantity,Добытое количество
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Engineer,Инженер
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,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 +370,Item Code required at Row No {0},Код товара требуется на Row Нет {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +398,Item Code required at Row No {0},Код товара требуется на Row Нет {0}
 DocType: Sales Partner,Partner Type,Тип Партнер
 DocType: Purchase Taxes and Charges,Actual,Фактически
 DocType: Authorization Rule,Customerwise Discount,Customerwise Скидка
@@ -3917,16 +3971,18 @@
 DocType: BOM,Raw Material Cost,Затраты на сырье
 DocType: Item Reorder,Re-Order Level,Уровень перезаказа
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Введите предметы и плановый Количество, для которых необходимо повысить производственные заказы или скачать сырье для анализа."
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +55,Part-time,Неполная занятость
+apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,Диаграмма Ганта
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,Неполная занятость
 DocType: Employee,Applicable Holiday List,Применимо Список праздников
 DocType: Employee,Cheque,Чек
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Серия Обновлено
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +57,Series Updated,Серия Обновлено
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,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 +87,Clearance Date updated,Зазор Дата обновления
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Успешно Примирение
@@ -3940,7 +3996,7 @@
 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 +513,Posting date and posting time is mandatory,Дата публикации и размещения время является обязательным
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,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.,По словам будет виден только вы сохраните заказ на поставку.
@@ -3950,7 +4006,7 @@
 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/stock/doctype/stock_entry/stock_entry.py +158,Target warehouse in row {0} must be same as Production Order,"Целевая склад в строке {0} должно быть таким же, как производственного заказа"
+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,"Валюта не может быть изменена после внесения записи, используя другой валюты"
 DocType: Company,Round Off Account,Округление аккаунт
@@ -3959,23 +4015,22 @@
 DocType: Customer Group,Parent Customer Group,Родительский клиент Группа
 DocType: Purchase Invoice,Contact Email,Эл. адрес
 DocType: Appraisal Goal,Score Earned,Оценка Заработано
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Notice Period,Срок Уведомления
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,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 +4,New Sales Person Name,Имя нового менеджера по продажам
 DocType: Packing Slip,Gross Weight UOM,Вес брутто Единица измерения
-DocType: Email Digest,Receivables / Payables,Кредиторская / Дебиторская задолженность
 DocType: Delivery Note Item,Against Sales Invoice,Против продаж счета-фактуры
 DocType: Bin,Reserved Qty for Production,Reserved Кол-во для производства
 DocType: Asset,Frequency of Depreciation (Months),Частота амортизации (месяцев)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +469,Credit Account,Кредитный счет
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Credit Account,Кредитный счет
 DocType: Landed Cost Item,Landed Cost Item,Посадка Статьи затрат
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +55,Show zero values,Показать нулевые значения
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Показать нулевые значения
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Количество пункта получены после изготовления / переупаковка от заданных величин сырья
 apps/erpnext/erpnext/public/js/setup_wizard.js +315,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 +647,Please specify Attribute Value for attribute {0},"Пожалуйста, сформулируйте Значение атрибута для атрибута {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},"Пожалуйста, сформулируйте Значение атрибута для атрибута {0}"
 DocType: Item,Default Warehouse,По умолчанию Склад
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +39,Budget cannot be assigned against Group Account {0},Бюджет не может быть назначен на учетную запись группы {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,"Пожалуйста, введите МВЗ родительский"
@@ -3997,19 +4052,22 @@
 DocType: Journal Entry,Total Debit,Всего Дебет
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,По умолчанию склад готовой продукции
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,Продавец
-DocType: Sales Invoice,Cold Calling,Холодная Вызов
 DocType: SMS Parameter,SMS Parameter,SMS Параметр
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,Бюджет и МВЗ
 DocType: Maintenance Schedule Item,Half Yearly,Половина года
 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,Всего 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 +253,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 +141,Set as Lost,Установить как Остаться в живых
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,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 +5,This is based on transactions against this Customer. See timeline below for details,Это основано на операциях против этого клиента. См график ниже для получения подробной информации
 DocType: Supplier,Credit Days Based On,Кредитные дней основанных на
@@ -4021,11 +4079,10 @@
 ,Items To Be Requested,"Предметы, будет предложено"
 DocType: Purchase Order,Get Last Purchase Rate,Получить последнюю покупку Оценить
 DocType: Company,Company Info,Информация о компании
-apps/erpnext/erpnext/accounts/page/pos/pos.js +941,Select or add new customer,Выберите или добавить новый клиент
+apps/erpnext/erpnext/accounts/page/pos/pos.js +930,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 +5,This is based on the attendance of this Employee,Это основано на посещаемости этого сотрудника
-DocType: Sales Invoice,Frequency,частота
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +463,Debit Account,Дебетовый счет
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Debit Account,Дебетовый счет
 DocType: Fiscal Year,Year Start Date,Дата начала года
 DocType: Attendance,Employee Name,Имя Сотрудника
 DocType: Sales Invoice,Rounded Total (Company Currency),Округлые Всего (Компания Валюта)
@@ -4034,27 +4091,27 @@
 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 +210,Supplier Quotation {0} created,Поставщик Котировка {0} создано
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +208,Supplier Quotation {0} created,Поставщик Котировка {0} создано
 apps/erpnext/erpnext/accounts/report/financial_statements.py +90,End Year cannot be before Start Year,Год окончания не может быть раньше начала года
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Employee Benefits,Вознаграждения работникам
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,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 +228,Please set a default Holiday List for Employee {0} or Company {1},"Пожалуйста, установите по умолчанию список праздников для Employee {0} или Компания {1}"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +232,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 +499,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Ряд Нет {0}: Сумма не может быть больше, чем ожидании Сумма против Расход претензии {1}. В ожидании сумма {2}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +500,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Ряд Нет {0}: Сумма не может быть больше, чем ожидании Сумма против Расход претензии {1}. В ожидании сумма {2}"
 DocType: Maintenance Schedule,Schedule,Расписание
 DocType: Account,Parent Account,Родитель счета
 DocType: Quality Inspection Reading,Reading 3,Чтение 3
 ,Hub,Концентратор
 DocType: GL Entry,Voucher Type,Ваучер Тип
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1007,Price List not found or disabled,Прайс-лист не найден или отключен
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1008,Price List not found or disabled,Прайс-лист не найден или отключен
 DocType: Expense Claim,Approved,Утверждено
 DocType: Pricing Rule,Price,Цена
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +244,Employee relieved on {0} must be set as 'Left',"Сотрудник освобожден от {0} должен быть установлен как ""левые"""
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +256,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} в указанный диапазон дат
@@ -4065,12 +4122,12 @@
 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 +259,Please select Employee Record first.,"Пожалуйста, выберите Employee Record первым."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +266,Please select Employee Record first.,"Пожалуйста, выберите Employee Record первым."
 DocType: POS Profile,Account for Change Amount,Счет для изменения высоты
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +190,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Ряд {0}: Партия / счета не соответствует {1} / {2} в {3} {4}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +235,Please enter Expense Account,"Пожалуйста, введите Expense счет"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,Please enter Expense Account,"Пожалуйста, введите Expense счет"
 DocType: Account,Stock,Склад
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,"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 +976,"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,Покупка / Производство Подробнее
@@ -4085,9 +4142,10 @@
 DocType: Asset Movement,Transaction Date,Сделка Дата
 DocType: Production Plan Item,Planned Qty,Планируемые Кол-во
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,Совокупная налоговая
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,For Quantity (Manufactured Qty) is mandatory,Для Количество (Изготовитель Количество) является обязательным
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,For Quantity (Manufactured Qty) is mandatory,Для Количество (Изготовитель Количество) является обязательным
 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 +78,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,Фактическая Дата начала
@@ -4102,9 +4160,11 @@
 DocType: Warranty Claim,If different than customer address,Если отличается от адреса клиента
 DocType: BOM Operation,BOM Operation,BOM Операция
 DocType: Purchase Taxes and Charges,On Previous Row Amount,На предыдущей балансовой Row
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +226,Transfer Asset,Передача активов
+DocType: Student,Home Address,Домашний адрес
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +227,Transfer Asset,Передача активов
 DocType: POS Profile,POS Profile,POS-профиля
 apps/erpnext/erpnext/config/schools.py +33,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 +129,"Item {0} is a template, please select one of its variants","Пункт {0} шаблона, выберите один из его вариантов"
 DocType: Asset,Asset Category,Категория активов
@@ -4114,8 +4174,8 @@
 DocType: Assessment,Room,Комната
 DocType: Purchase Order,Advance Paid,Авансовая выплата
 DocType: Item,Item Tax,Пункт Налоговый
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +765,Material to Supplier,Материал Поставщику
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +189,Excise Invoice,Акцизный Счет
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,Material to Supplier,Материал Поставщику
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,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,Текущие обязательства
@@ -4125,7 +4185,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,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 +136,Credit Card,Кредитная карта
+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.,Настройки по умолчанию для операций перемещения по складу
 DocType: Purchase Invoice,Next Date,Следующая дата
@@ -4133,6 +4193,7 @@
 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: Academic Term,Term End Date,Срок Дата окончания
 DocType: Hub Settings,Seller Name,Продавец Имя
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),"Налоги, которые вычитаются (Компания Валюта)"
 DocType: Item Group,General Settings,Основные настройки
@@ -4144,7 +4205,7 @@
 DocType: Customer,Commission Rate,Комиссия
 apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,Сделать Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Блок отпуска приложений отделом.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +115,"Payment Type must be one of Receive, Pay and Internal Transfer","Тип оплаты должен быть одним из Присылать, Pay и внутренний перевод"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +118,"Payment Type must be one of Receive, Pay and Internal Transfer","Тип оплаты должен быть одним из Присылать, Pay и внутренний перевод"
 apps/erpnext/erpnext/config/selling.py +169,Analytics,аналитика
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Корзина Пусто
 DocType: Production Order,Actual Operating Cost,Фактическая Эксплуатационные расходы
@@ -4159,10 +4220,10 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,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 +92,Designer,Дизайнер
+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/accounts/doctype/purchase_invoice/purchase_invoice.py +469,Cost Center is required in row {0} in Taxes table for type {1},МВЗ требуется в строке {0} в виде налогов таблицы для типа {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +472,Cost Center is required in row {0} in Taxes table for type {1},МВЗ требуется в строке {0} в виде налогов таблицы для типа {1}
 DocType: Program,Program Code,Программный код
 ,Item-wise Purchase Register,Пункт мудрый Покупка Зарегистрироваться
 DocType: Batch,Expiry Date,Срок годности:
@@ -4172,12 +4233,12 @@
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Мастер проекта.
 apps/erpnext/erpnext/controllers/status_updater.py +174,"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 +417, (Half Day),(Полдня)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425, (Half Day),(Полдня)
 DocType: Supplier,Credit Days,Кредитные дней
 DocType: Leave Type,Is Carry Forward,Является ли переносить
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +740,Get Items from BOM,Получить элементов из спецификации
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +711,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 +549,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},"Строка # {0}: Дата размещения должна быть такой же, как даты покупки {1} актива {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +552,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,Передача актива с одного склада на другой
diff --git a/erpnext/translations/si.csv b/erpnext/translations/si.csv
index 62716df..f689840 100644
--- a/erpnext/translations/si.csv
+++ b/erpnext/translations/si.csv
@@ -18,11 +18,10 @@
 DocType: Sales Partner,Dealer,අලෙවි නියෝජිත
 DocType: Employee,Rented,කුලියට ගත්
 DocType: Purchase Order,PO-,PO-
-apps/erpnext/erpnext/accounts/report/financial_statements.py +19,Start Year {0} not found.,ආරම්භක වර්ෂය {0} සොයාගත නොහැකි විය.
 DocType: POS Profile,Applicable for User,සඳහා පරිශීලක අදාළ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +191,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","නතර අවලංගු කිරීමට ප්රථම එය Unstop නිෂ්පාදන සාමය, අවලංගු කල නොහැක"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +197,Do you really want to scrap this asset?,ඔබට නිසැකවම මෙම වත්කම් ඡන්ද දායකයා කිරීමට අවශ්යද?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +17,Select Default Supplier,පෙරනිමි සැපයුම්කරු තෝරන්න
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +192,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","නතර අවලංගු කිරීමට ප්රථම එය Unstop නිෂ්පාදන සාමය, අවලංගු කල නොහැක"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +198,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 +36,Currency is required for Price List {0},ව්යවහාර මුදල් මිල ලැයිස්තුව {0} සඳහා අවශ්ය
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* ගනුදෙනුව ගණනය කරනු ඇත.
 DocType: Address,County,කවුන්ටි
@@ -42,46 +41,45 @@
 DocType: Sales Invoice,Customer Name,පාරිභෝගිකයාගේ නම
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +126,Bank account cannot be named as {0},බැංකු ගිණුමක් {0} ලෙස නම් කළ නොහැකි
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,ප්රධානීන් (හෝ කණ්ඩායම්) ගිණුම්කරණය අයැදුම්පත් ඉදිරිපත් කර ඇති අතර තුලනය නඩත්තු කරගෙන යනු ලබන එරෙහිව.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +180,Outstanding for {0} cannot be less than zero ({1}),{0} ශුන්ය ({1}) ට වඩා අඩු විය නොහැක විශිෂ්ට සඳහා
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,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 +148,Series Updated Successfully,මාලාවක් සාර්ථකව යාවත්කාලීන කිරීම
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +149,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,සියලු සැපයුම්කරු අමතන්න
-DocType: Quality Inspection Reading,Parameter,පරාමිතිය
 apps/erpnext/erpnext/projects/doctype/project/project.py +54,Expected End Date can not be less than Expected Start Date,අපේක්ෂිත අවසානය දිනය අපේක්ෂා ඇරඹුම් දිනය ඊට වඩා අඩු විය නොහැක
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,ෙරෝ # {0}: {2} ({3} / {4}): අනුපාත {1} ලෙස සමාන විය යුතුයි
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +239,New Leave Application,නව නිවාඩු ඉල්ලුම්
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,New Leave Application,නව නිවාඩු ඉල්ලුම්
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +20,Attendance Record {0} exists against Student {1} for Course Schedule {2},පැමිණීම වාර්තා {0} ශිෂ්ය {1} පාඨමාලා සඳහා වැඩසටහන {2} එරෙහිව පවතී
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Bank Draft,බැංකු අණකරයකින් ෙගවිය
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,බැංකු අණකරයකින් ෙගවිය
 DocType: Mode of Payment Account,Mode of Payment Account,ගෙවීම් ගිණුම වන ආකාරය
 apps/erpnext/erpnext/stock/doctype/item/item.js +52,Show Variants,ප්රභේද පෙන්වන්න
 DocType: Academic Term,Academic Term,අධ්යයන කාලීන
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +13,Material,ද්රව්ය
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Quantity,ප්රමාණය
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +511,Accounts table cannot be blank.,මේසය හිස් විය නොහැක ගිණුම්.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +616,Quantity,ප්රමාණය
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +512,Accounts table cannot be blank.,මේසය හිස් විය නොහැක ගිණුම්.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,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/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 +142,User {0} is already assigned to Employee {1},පරිශීලක {0} සේවක {1} කිරීමට දැනටමත් අනුයුක්ත කර ඇත
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,සෞඛ්ය සත්කාර
-DocType: Purchase Invoice,Monthly,මාසික
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),ෙගවීම පමාද (දින)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +771,Invoice,ඉන්වොයිසිය
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +750,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 +198,Row {0}: {1} {2} does not match with {3},ෙරෝ {0}: {1} {2} {3} සමග නොගැලපේ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,ෙරෝ # {0}:
+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 +127,Please select Price List,කරුණාකර මිල ලැයිස්තුව තෝරා
@@ -112,8 +110,8 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,එම සමාගම එක් වරකට වඩා ඇතුලත් කර
 DocType: Employee,Married,විවාහක
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},{0} සඳහා අවසර නැත
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +589,Get items from,සිට භාණ්ඩ ලබා ගන්න
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +382,Stock cannot be updated against Delivery Note {0},කොටස් බෙදීම සටහන {0} එරෙහිව යාවත්කාලීන කල නොහැක
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,සිට භාණ්ඩ ලබා ගන්න
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,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,සිල්ලර බඩු
@@ -122,7 +120,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 +156,Salary Structure Missing,වැටුප් ව්යුහය අතුරුදන්
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Salary Structure Missing,වැටුප් ව්යුහය අතුරුදන්
 DocType: Lead,Person Name,පුද්ගලයා නම
 DocType: Sales Invoice Item,Sales Invoice Item,විකුණුම් ඉන්වොයිසිය අයිතමය
 DocType: Account,Credit,ණය
@@ -130,10 +128,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 +156,Credit limit has been crossed for customer {0} {1}/{2},ණය සීමාව {0} සඳහා ගනුදෙනුකරුවන්ගේ එතෙර කර ඇත {1} / {2}
-apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;ස්ථාවර වත්කම් ද&quot; වත්කම් වාර්තාවක් අයිතමය එරෙහිව පවතී ලෙස, අපරීක්ෂා විය නොහැකි"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +189,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; වත්කම් වාර්තාවක් අයිතමය එරෙහිව පවතී ලෙස, අපරීක්ෂා විය නොහැකි"
 DocType: Tax Rule,Tax Type,බදු වර්ගය
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +144,You are not authorized to add or update entries before {0},ඔබ {0} පෙර සටහන් ඇතුළත් කිරීම් එකතු කිරීම හෝ යාවත්කාලීන කිරීම කිරීමට තමන්ට අවසර නොමැති
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},ඔබ {0} පෙර සටහන් ඇතුළත් කිරීම් එකතු කිරීම හෝ යාවත්කාලීන කිරීම කිරීමට තමන්ට අවසර නොමැති
 DocType: Item,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) * සත මෙහෙයුම කාල
@@ -143,18 +142,17 @@
 DocType: Student Log,Student Log,ශිෂ්ය ලොග්
 DocType: Quality Inspection,Get Specification Details,පිරිවිතර විස්තර ලබා ගන්න
 DocType: Lead,Interested,උනන්දුවක් දක්වන
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +165,Opening,විවෘත
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,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/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,පාරිභෝගික&gt; කස්ටමර් සමූහයේ&gt; දේශසීමාවේ
 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.,පවත්නා ගනුදෙනුව ගිණුමක් පිරිසක් බවට පරිවර්තනය කළ නොහැක.
 DocType: Lead,Product Enquiry,නිෂ්පාදන විමසීම්
 DocType: Academic Term,Schools,පාසල්
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,පළමු සමාගම ඇතුලත් කරන්න
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Company first,කරුණාකර සමාගම පළමු තෝරා
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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,මුළු වියදම
@@ -164,7 +162,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,ගිණුම් ප්රකාශයක්
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,ඖෂධ
 DocType: Purchase Invoice Item,Is Fixed Asset,ස්ථාවර වත්කම් ද
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Available qty is {0}, you need {1}","ලබා ගත හැකි යවන ලද {0}, ඔබ {1} අවශ්ය වේ"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +225,"Available qty is {0}, you need {1}","ලබා ගත හැකි යවන ලද {0}, ඔබ {1} අවශ්ය වේ"
 DocType: Expense Claim Detail,Claim Amount,හිමිකම් ප්රමාණය
 DocType: Employee,Mr,මහතා
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,සැපයුම්කරු වර්ගය / සැපයුම්කරු
@@ -173,25 +171,26 @@
 DocType: Employee,B-,බී-
 DocType: Upload Attendance,Import Log,ආනයන ලොග්
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,එම නිර්ණායක මත පදනම් වර්ගය නිෂ්පාදනය ද්රව්ය ඉල්ලීම් අදින්න
+DocType: Assessment Result,Grade,ශ්රේණියේ
 DocType: Sales Invoice Item,Delivered By Supplier,සැපයුම්කරු විසින් ඉදිරිපත්
 DocType: SMS Center,All Contact,සියලු විමසීම්
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Annual Salary,වාර්ෂික වැටුප
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,කොටස් වෙළඳ වියදම්
-apps/erpnext/erpnext/accounts/report/financial_statements.py +22,End Year {0} not found.,අවසන් වසර {0} සොයාගත නොහැකි විය.
 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} සඳහා ලැබී ප්රමාණය සමාන විය යුතුය ප්රතික්ෂේප
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,"මිලදී ගැනීම සඳහා සම්පාදන, අමු ද්රව්ය"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +130,At least one mode of payment is required for POS invoice.,ගෙවීම් අවම වශයෙන් එක් මාදිලිය POS ඉන්වොයිසිය සඳහා අවශ්ය වේ.
 DocType: Products Settings,Show Products as a List,ලැයිස්තුවක් ලෙස නිෂ්පාදන පෙන්වන්න
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","මෙම සැකිල්ල බාගත නිසි දත්ත පුරවා විකරිත ගොනුව අමුණන්න. තෝරාගත් කාලය තුළ සියලු දිනයන් හා සේවක එකතුවක් පවත්නා පැමිණීම වාර්තා සමග, සැකිල්ල පැමිණ ඇත"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +451,Item {0} is not active or end of life has been reached,අයිතමය {0} සකිය ෙහෝ ජීවිතයේ අවසානය නොවේ ළඟා වී
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +456,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/controllers/accounts_controller.py +614,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","බදු ඇතුළත් කිරීමට පේළියේ {0} අයිතමය අනුපාතය, පේළි {1} බදු ද ඇතුළත් විය යුතු අතර"
+apps/erpnext/erpnext/controllers/accounts_controller.py +617,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","බදු ඇතුළත් කිරීමට පේළියේ {0} අයිතමය අනුපාතය, පේළි {1} බදු ද ඇතුළත් විය යුතු අතර"
 apps/erpnext/erpnext/config/hr.py +166,Settings for HR Module,මානව සම්පත් මොඩියුලය සඳහා සැකසුම්
 DocType: SMS Center,SMS Center,කෙටි පණිවුඩ මධ්යස්ථානය
 DocType: Sales Invoice,Change Amount,මුදල වෙනස්
@@ -203,13 +202,13 @@
 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 +147,Execution,ක්රියාකරවීම
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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,ද්රව්ය හා මිල ගණන්
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},මුළු පැය: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},දිනය සිට මුදල් වර්ෂය තුළ විය යුතුය. දිනය සිට උපකල්පනය = {0}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,Cost Center {0} does not belong to Company {1},මධ්යස්ථානය {0} කි සමාගම {1} අයත් නොවේ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +100,Cost Center {0} does not belong to Company {1},මධ්යස්ථානය {0} කි සමාගම {1} අයත් නොවේ
 DocType: Customer,Individual,තනි
 DocType: Interest,Academics User,විද්වතුන් පරිශීලක
 DocType: Cheque Print Template,Amount In Figure,රූපය දී මුදල
@@ -225,30 +224,32 @@
 DocType: Production Planning Tool,Sales Orders,විකුණුම් නියෝග
 DocType: Purchase Taxes and Charges,Valuation,තක්සේරු
 ,Purchase Order Trends,මිලදී ගැනීමේ නියෝගයක් ප්රවණතා
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,The request for quotation can be accessed by clicking on the following link,උද්ධෘත සඳහා කල ඉල්ලීම පහත සබැඳිය ක්ලික් කිරීම මගින් ප්රවේශ විය හැකි
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,වසර සඳහා කොළ වෙන් කරමි.
 DocType: SG Creation Tool Course,SG Creation Tool Course,SG නිර්මාණය මෙවලම පාඨමාලා
 DocType: Student Group Creation Tool,Leave blank if you wish to fetch all courses for selected academic term,"ඔබ තෝරා අධ්යයන වාරය සඳහා සියලුම පාඨමාලා බෝගයන්ගේ සිදු කිරීමට ඇවැසි නම්, හිස්ව තබන්න"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,Insufficient Stock,ප්රමාණවත් කොටස්
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227,Insufficient Stock,ප්රමාණවත් කොටස්
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,ධාරිතා සැලසුම් හා වේලාව ට්රැකින් අක්රීය
+DocType: Email Digest,New Sales Orders,නව විකුණුම් නියෝග
 DocType: Bank Reconciliation,Bank Account,බැංකු ගිණුම
 DocType: Leave Type,Allow Negative Balance,ඍණ ශේෂය ඉඩ දෙන්න
 DocType: Selling Settings,Default Territory,පෙරනිමි දේශසීමාවේ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,රූපවාහිනී
 DocType: Production Order Operation,Updated via 'Time Log',&#39;කාලය පිළිබඳ ලඝු-සටහන&#39; හරහා යාවත්කාලීන කිරීම
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} does not belong to Company {1},ගිණුම {0} සමාගම {1} අයත් නොවේ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +86,Account {0} does not belong to Company {1},ගිණුම {0} සමාගම {1} අයත් නොවේ
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},{0} {1} වඩා වැඩි උසස් ප්රමාණය විය නොහැකි
 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 +174,For Warehouse is required before Submit,ගබඩාව අවශ්ය වේ සඳහා පෙර ඉදිරිපත්
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,For Warehouse is required before Submit,ගබඩාව අවශ්ය වේ සඳහා පෙර ඉදිරිපත්
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,දා ලැබී
 DocType: Sales Partner,Reseller,දේශීය වෙළඳ සහකරුවන්
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,සමාගම ඇතුලත් කරන්න
 DocType: Delivery Note Item,Against Sales Invoice Item,විකුණුම් ඉන්වොයිසිය අයිතමය එරෙහිව
 ,Production Orders in Progress,ප්රගති නිෂ්පාදනය නියෝග
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Cash from Financing,මූල්ය පහසුකම් ශුද්ධ මුදල්
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1436,"LocalStorage is full , did not save","LocalStorage පිරී ඇත, ඉතිරි වුණේ නැහැ"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1460,"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} මත නිර්මාණය කරනු ඇත
@@ -261,18 +262,19 @@
 apps/erpnext/erpnext/templates/generators/item.html +78,No description given,විස්තර ලබා නැත
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,මිලදී ගැනීම සඳහා ඉල්ලීම.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +5,This is based on the Time Sheets created against this project,මෙම මෙම ව්යාපෘතිය එරෙහිව නිර්මාණය කරන ලද කාලය පත්ර මත පදනම් වේ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Only the selected Leave Approver can submit this Leave Application,පමණක් තෝරා නිවාඩු Approver මෙම නිවාඩු ඉල්ලුම් ඉදිරිපත් කළ හැකි
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +213,Only the selected Leave Approver can submit this Leave Application,පමණක් තෝරා නිවාඩු Approver මෙම නිවාඩු ඉල්ලුම් ඉදිරිපත් කළ හැකි
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,දිනය ලිහිල් සමඟ සම්බන්ධවීම දිනය වඩා වැඩි විය යුතුය
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Leaves per Year,වසරකට කොළ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,වසරකට කොළ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,ෙරෝ {0}: මෙම අත්තිකාරම් ප්රවේශය නම් අත්තිකාරම් ලෙසයි &#39;ගිණුම එරෙහිව පරීක්ෂා කරන්න {1}.
 apps/erpnext/erpnext/stock/utils.py +188,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,ලීටරයකට
 DocType: Task,Total Costing Amount (via Time Sheet),(කාල පත්රය හරහා) මුළු සැඳුම්ලත් මුදල
 DocType: Item Website Specification,Item Website Specification,අයිතමය වෙබ් අඩවිය පිරිවිතර
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +435,Leave Blocked,අවසරය ඇහිරීම
-apps/erpnext/erpnext/stock/doctype/item/item.py +669,Item {0} has reached its end of life on {1},අයිතමය {0} {1} මත ජීවය එහි අවසානය කරා එළඹ ඇති
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +443,Leave Blocked,අවසරය ඇහිරීම
+apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item {0} has reached its end of life on {1},අයිතමය {0} {1} මත ජීවය එහි අවසානය කරා එළඹ ඇති
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +95,Bank Entries,බැංකු අයැදුම්පත්
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +83,Annual,වාර්ෂික
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +86,Annual,වාර්ෂික
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,කොටස් ප්රතිසන්ධාන අයිතමය
 DocType: Stock Entry,Sales Invoice No,විකුණුම් ඉන්වොයිසිය නොමැත
 DocType: Material Request Item,Min Order Qty,අවම සාමය යවන ලද
@@ -280,20 +282,22 @@
 DocType: Lead,Do Not Contact,අමතන්න එපා
 apps/erpnext/erpnext/public/js/setup_wizard.js +360,People who teach at your organisation,ඔබගේ සංවිධානය ට උගන්වන්න අය
 DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,සියලු නැවත නැවත ඉන්වොයිස් පත්ර සොයා ගැනීම සඳහා අනුපම ID. මෙය ඉදිරිපත් කළ මත ජනනය කරනු ලැබේ.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Software Developer,මෘදුකාංග සංවර්ධකයා
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,මෘදුකාංග සංවර්ධකයා
 DocType: Item,Minimum Order Qty,අවම සාමය යවන ලද
 DocType: Pricing Rule,Supplier Type,සැපයුම්කරු වර්ගය
 DocType: Scheduling Tool,Course Start Date,පාඨමාලා ආරම්භය දිනය
 DocType: Item,Publish in Hub,Hub දී ප්රකාශයට පත් කරනු ලබයි
+DocType: Student Admission,Student Admission,ශිෂ්ය ඇතුළත් කිරීම
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is cancelled,අයිතමය {0} අවලංගුයි
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Material Request,"ද්රව්ය, ඉල්ලීම්"
+apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} is cancelled,අයිතමය {0} අවලංගුයි
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +823,Material Request,"ද්රව්ය, ඉල්ලීම්"
 DocType: Bank Reconciliation,Update Clearance Date,යාවත්කාලීන නිශ්කාශනෙය් දිනය
 apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +28,Abbreviation already used for another salary component,තවත් වැටුප් සංරචකය සඳහා දැනටමත් භාවිතා කෙටි යෙදුම්
 DocType: Item,Purchase Details,මිලදී විස්තර
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +328,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},"අයිතමය {0} මිලදී ගැනීමේ නියෝගයක් {1} තුළ &#39;, අමු ද්රව්ය සැපයූ&#39; වගුව තුල සොයාගත නොහැකි"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +333,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},"අයිතමය {0} මිලදී ගැනීමේ නියෝගයක් {1} තුළ &#39;, අමු ද්රව්ය සැපයූ&#39; වගුව තුල සොයාගත නොහැකි"
 DocType: Employee,Relation,සම්බන්ධතා
 DocType: Shipping Rule,Worldwide Shipping,ලොව පුරා නැව්
+DocType: Student Guardian,Mother,මව
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,ගනුදෙනුකරුවන් තහවුරු නියෝග.
 DocType: Purchase Receipt Item,Rejected Quantity,ප්රතික්ෂේප ප්රමාණ
 DocType: SMS Settings,SMS Sender Name,කෙටි පණිවුඩ යවන්නාගේ නම
@@ -309,20 +313,21 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +130,Please select Charge Type first,කරුණාකර භාර වර්ගය පළමු තෝරා
 DocType: Student Group Student,Student Group Student,ශිෂ්ය කණ්ඩායම් ශිෂ්ය
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,නවතම
+DocType: Email Digest,New Quotations,නව මිල ගණන්
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,ලැයිස්තුවේ ඇති පළමු නිවාඩු Approver පෙරනිමි නිවාඩු Approver ලෙස ස්ථාපනය කරනු ලබන
 DocType: Tax Rule,Shipping County,නැව් කවුන්ටි
 apps/erpnext/erpnext/config/desktop.py +158,Learn,ඉගෙන ගන්න
 DocType: Asset,Next Depreciation Date,ඊළඟ ක්ෂය දිනය
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,සේවක අනුව ලද වියදම
 DocType: Accounts Settings,Settings for Accounts,ගිණුම් සඳහා සැකසුම්
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +626,Supplier Invoice No exists in Purchase Invoice {0},සැපයුම්කරු ගෙවීම් නොමැත ගැනුම් {0} පවතින
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +629,Supplier Invoice No exists in Purchase Invoice {0},සැපයුම්කරු ගෙවීම් නොමැත ගැනුම් {0} පවතින
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,විකුණුම් පුද්ගලයෙක් රුක් කළමනාකරණය කරන්න.
 DocType: Job Applicant,Cover Letter,ආවරණ ලිපිය
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,පැහැදිලි කිරීමට කැපී පෙනෙන චෙක්පත් සහ තැන්පතු
 DocType: Item,Synced With Hub,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 +348,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 +86,Circular Reference Error,වටරවුම් විමර්ශන දෝෂ
@@ -334,15 +339,16 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,ස්වයංක්රීය ද්රව්ය ඉල්ලීම් නිර්මානය කිරීම මත ඊ-මේල් මගින් දැනුම් දෙන්න
 DocType: Journal Entry,Multi Currency,බහු ව්යවහාර මුදල්
 DocType: Payment Reconciliation Invoice,Invoice Type,ඉන්වොයිසිය වර්ගය
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +806,Delivery Note,සැපයුම් සටහන
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +800,Delivery Note,සැපයුම් සටහන
 apps/erpnext/erpnext/config/learn.py +87,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 +233,Payment Entry has been modified after you pulled it. Please pull it again.,ඔබ එය ඇද පසු ගෙවීම් සටහන් වෙනස් කර ඇත. කරුණාකර එය නැවත නැවත අදින්න.
+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/setup/doctype/email_digest/email_digest.py +104,Summary for this week and pending activities,මේ සතියේ හා ෙ කටයුතු සඳහා සාරාංශය
+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 ඇතුලත් කරන්න, ඉන්වොයිසි විශේෂයෙන් දිනය ස්වයංක්රීයව තැපැල් කරනු"
 DocType: Employee,Company Email,සමාගම විද්යුත්
@@ -354,27 +360,28 @@
 apps/erpnext/erpnext/config/hr.py +186,"Employee designation (e.g. CEO, Director etc.).","සේවක තනතුර (උදා: ප්රධාන විධායක නිලධාරී, අධ්යක්ෂ ආදිය)."
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,ක්ෂේත්රයේ අගය දිනය මාසික මත නැවත නැවත &#39;ඇතුලත් කරන්න
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,පාරිභෝගික ව්යවහාර මුදල් පාරිභෝගික පදනම මුදල් බවට පරිවර්තනය වන අවස්ථාවේ අනුපාතය
-apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},ෙරෝ # {0}: ගැනුම් දැනට පවතින වත්කම් {1} එරෙහිව කළ නොහැකි
+apps/erpnext/erpnext/controllers/accounts_controller.py +554,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},ෙරෝ # {0}: ගැනුම් දැනට පවතින වත්කම් {1} එරෙහිව කළ නොහැකි
 DocType: Item Tax,Tax Rate,බදු අනුපාතය
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} කාලයක් සඳහා සේවක {1} සඳහා වන විටත් වෙන් {2} {3} වෙත
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +812,Select Item,විෂය තෝරා
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +791,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/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,මිලදී ගැනීම ඉන්වොයිසිය {0} දැනටමත් ඉදිරිපත්
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},ෙරෝ # {0}: කණ්ඩායම කිසිදු {1} {2} ලෙස සමාන විය යුතුයි
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +143,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.,කණ්ඩායම (ගොඩක්) යනු විෂය ය.
 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 +342,Please see attachment,කරුණාකර ඇමුණුම බලන්න
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,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 +19,Setup Already Complete!!,මේ වන විටත් සම්පූර්ණ setup !!
 ,Finished Goods,නිමි භාණ්ඩ
 DocType: Delivery Note,Instructions,උපදෙස්
 DocType: Quality Inspection,Inspected By,පරීක්ෂා කරන ලද්දේ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,සැපයුම්කරු&gt; සැපයුම්කරු වර්ගය
 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,අයිතම එකතු කරන්න
@@ -388,29 +395,29 @@
 DocType: Currency Exchange,Currency Exchange,මුදල් හුවමාරුව
 DocType: Purchase Invoice Item,Item Name,අයිතමය නම
 DocType: Authorization Rule,Approving User  (above authorized value),අනුමත පරිශීලක (බලය ලත් අගය ඉහළ)
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,ක්රෙඩිට් ශේෂ
+DocType: Email Digest,Credit Balance,ක්රෙඩිට් ශේෂ
 DocType: Employee,Widowed,වැන්දඹු
 DocType: Request for Quotation,Request for Quotation,උද්ධෘත සඳහා ඉල්ලුම්
 DocType: Salary Slip Timesheet,Working Hours,වැඩ කරන පැය
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,දැනට පවතින මාලාවේ ආරම්භක / වත්මන් අනුක්රමය අංකය වෙනස් කරන්න.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","බහු මිල නියම රීති පවතින දිගටම සිදු වන්නේ නම්, පරිශීලකයන් ගැටුම විසඳීමට අතින් ප්රමුඛ සකස් කරන ලෙස ඉල්ලා ඇත."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +736,Purchase Return,මිලදී ගැනීම ප්රතිලාභ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +715,Purchase Return,මිලදී ගැනීම ප්රතිලාභ
 ,Purchase Register,මිලදී රෙජිස්ටර්
 DocType: Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,අදාළ ගාස්තු
 DocType: Workstation,Consumable Cost,පාරිෙභෝජන වියදම
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +202,{0} ({1}) must have role 'Leave Approver',{0} ({1}) භූමිකාව &#39;නිවාඩු Approver&#39; තිබිය යුතුය
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,{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 +143,Reason for losing,අහිමි හේතුව
-apps/erpnext/erpnext/accounts/utils.py +239,Allocated amount can not greater than unadjusted amount,unadjusted ප්රමාණය ට වඩා වැඩි මුදලක් වෙන් කර ගත යුතු නොවේ
+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,unadjusted ප්රමාණය ට වඩා වැඩි මුදලක් වෙන් කර ගත යුතු නොවේ
 DocType: Announcement,Receiver,ලබන්නා
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},සේවා පරිගණකයක් නිවාඩු ලැයිස්තුව අනුව පහත සඳහන් දිනවලදී වසා ඇත: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,අවස්ථාවන්
 DocType: Employee,Single,තනි
 DocType: Account,Cost of Goods Sold,විකුණුම් පිරිවැය
 DocType: Purchase Invoice,Yearly,වාර්ෂිකව
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +225,Please enter Cost Center,පිරිවැය මධ්යස්ථානය ඇතුලත් කරන්න
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,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,පරීක්ෂක නම
@@ -423,26 +430,26 @@
 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,පරීක්ෂා කරන්න සැපයුම්කරු ඉන්වොයිසිය අංකය අනන්යතාව
 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 +102,Non Profit,ලාභය නොවන
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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: Stock Reconciliation Item,Do not include symbols (ex. $),සංකේත (උදා. $) අඩංගු නොකරන්න
 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 +638,Attribute {0} selected multiple times in Attributes Table,ගති ලක්ෂණය {0} දන්ත ධාතුන් වගුව කිහිපවතාවක් තෝරාගත්
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,ගති ලක්ෂණය {0} දන්ත ධාතුන් වගුව කිහිපවතාවක් තෝරාගත්
 DocType: HR Settings,Employee record is created using selected field. ,සේවක වාර්තාවක් තෝරාගත් ක්ෂේත්ර භාවිතා කිරීමෙන්ය.
 DocType: Sales Order,Not Applicable,අදාළ නොවේ
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,නිවාඩු ස්වාමියා.
 DocType: Request for Quotation Item,Required Date,අවශ්ය දිනය
 DocType: Delivery Note,Billing Address,බිල්පත් ලිපිනය
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +862,Please enter Item Code.,විෂය සංග්රහයේ ඇතුලත් කරන්න.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +847,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","පරීක්ෂා නම්, මේ වන විටත් මුද්රණය අනුපාතිකය / මුද්රණය මුදල ඇතුළත් ලෙස බදු මුදල සලකා බලනු ලැබේ"
@@ -456,12 +463,12 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,සුරැකුම්පත් හා තැන්පතු
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,වෙන් මුළු කොළ අනිවාර්ය වේ
 DocType: Job Opening,Description of a Job Opening,රැකියාවක් ආරම්භ කිරීම පිළිබඳ විස්තරය
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Pending activities for today,අද විභාග කටයුතු
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,අද විභාග කටයුතු
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,පැමිනීමේ වාර්තාව.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,timesheet පදනම් වැටුප් වැටුප් සංරචක.
 DocType: Sales Order Item,Used for Production Plan,නිශ්පාදන සැළැස්ම සඳහා භාවිතා
 DocType: Manufacturing Settings,Time Between Operations (in mins),මෙහෙයුම් අතර කාලය (මිනිත්තු දී)
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +92,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} ගිණුම සඳහා වූ අයවැය {1} පිරිවැය මධ්යස්ථානය එරෙහිව {2} {3} වේ. එය {4} විසින් ඉක්මවා ඇත
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +95,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} ගිණුම සඳහා වූ අයවැය {1} පිරිවැය මධ්යස්ථානය එරෙහිව {2} {3} වේ. එය {4} විසින් ඉක්මවා ඇත
 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 එම අයිතමය සඳහා නොවේ
@@ -469,16 +476,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +238,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 +86,Administrative Officer,පරිපාලන නිලධාරී
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,පරිපාලන නිලධාරී
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +23,Acutal Qty {0} / Waiting Qty {1},Acutal යවන ලද {0} / ට්ර ොට්රරොත්තු යවන ලද {1}
 DocType: Timesheet Detail,Hrs,ට
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +319,Please select Company,කරුණාකර සමාගම තෝරා
-DocType: Stock Entry,Difference Account,වෙනස ගිණුම
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +309,Please select Company,කරුණාකර සමාගම තෝරා
+DocType: Stock Entry Detail,Difference Account,වෙනස ගිණුම
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,එහි රඳා කාර්ය {0} වසා නොවේ ලෙස සමීප කාර්ය කළ නොහැකි ය.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Please enter Warehouse for which Material Request will be raised,ද්රව්ය ඉල්ලීම් උත්ථාන කරනු ලබන සඳහා ගබඩා ඇතුලත් කරන්න
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +399,Please enter Warehouse for which Material Request will be raised,ද්රව්ය ඉල්ලීම් උත්ථාන කරනු ලබන සඳහා ගබඩා ඇතුලත් කරන්න
 DocType: Production Order,Additional Operating Cost,අතිරේක මෙහෙයුම් පිරිවැය
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,අලංකාර ආලේපන
-apps/erpnext/erpnext/stock/doctype/item/item.py +530,"To merge, following properties must be same for both items","ඒකාබද්ධ කිරීමට, පහත සඳහන් ලක්ෂණ භාණ්ඩ යන දෙකම සඳහා එකම විය යුතු"
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,"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 +28,Buy,මිලට ගන්න
@@ -486,7 +493,7 @@
 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 +1563,Serial no item cannot be a fraction,අනු කිසිදු අයිතමය අල්පයක් විය නොහැකි
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1587,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,කළමනාකාර උප කොන්ත්රාත්
@@ -495,13 +502,14 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Account {0} does not belong to company: {1},ගිණුම {0} සමාගම අයිති නැත: {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation already used for another company,තවත් සමාගමක් දැනටමත් යොදා කෙටි යෙදුම්
 DocType: Selling Settings,Default Customer Group,පෙරනිමි කස්ටමර් සමූහයේ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Supplier is required against Payable account {0},සැපයුම්කරු ගෙවිය යුතු ගිණුම් {0} එරෙහිව අවශ්ය වේ
 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 වෙන්න බෑ
 DocType: Production Planning Tool,Material Requirement,ද්රව්ය අවශ්යතාවලින් බැහැර වන
 DocType: Company,Delete Company Transactions,සමාගම ගනුදෙනු Delete
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +313,Reference No and Reference Date is mandatory for Bank transaction,ෙයොමු අංකය හා විමර්ශන දිනය බැංකුවේ ගනුදෙනුව සඳහා අනිවාර්ය වේ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +316,Reference No and Reference Date is mandatory for Bank transaction,ෙයොමු අංකය හා විමර්ශන දිනය බැංකුවේ ගනුදෙනුව සඳහා අනිවාර්ය වේ
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,/ සංස්කරණය කරන්න බදු හා ගාස්තු එකතු කරන්න
 DocType: Purchase Invoice,Supplier Invoice No,සැපයුම්කරු ගෙවීම් නොමැත
 DocType: Territory,For reference,පරිශීලනය සඳහා
@@ -512,7 +520,6 @@
 DocType: Installation Note Item,Installation Note Item,ස්ථාපන සටහන අයිතමය
 DocType: Production Plan Item,Pending Qty,විභාග යවන ලද
 DocType: Budget,Ignore,නොසලකා හරිනවා
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,අයිතමය සංග්රහයේ&gt; අයිතමය සමූහ&gt; වෙළඳ නාමය
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,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
@@ -523,11 +530,11 @@
 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/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,වාර්තා ඉන්ෙවොයිසිය වගුව සොයාගැනීමට නොමැත
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +28,Please select Company and Party Type first,කරුණාකර ප්රථම සමාගම හා පක්ෂ වර්ගය තෝරා
+apps/erpnext/erpnext/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/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 +707,Make Sales Order,විකුණුම් සාමය කරන්න
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +701,Make Sales Order,විකුණුම් සාමය කරන්න
 DocType: Project Task,Project Task,ව්යාපෘති කාර්ය සාධක
 ,Lead Id,ඊයම් අංකය
 DocType: C-Form Invoice Detail,Grand Total,මුලු එකතුව
@@ -543,7 +550,8 @@
 DocType: Job Applicant,Resume Attachment,නැවත ආරම්භ ඇමුණුම්
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,නැවත ගනුදෙනුකරුවන්
 DocType: Leave Control Panel,Allocate,වෙන්
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +734,Sales Return,විකුණුම් ප්රතිලාභ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +728,Sales Return,විකුණුම් ප්රතිලාභ
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +91,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 නෞකාව) විසින් පවත්වන
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,අනාගත ගනුදෙනුකරුවන් දත්ත සමුදාය.
@@ -552,14 +560,13 @@
 DocType: Quotation,Quotation To,උද්ධෘත කිරීම
 DocType: Lead,Middle Income,මැදි ආදායම්
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +212,Opening (Cr),විවෘත කිරීමේ (බැර)
-apps/erpnext/erpnext/stock/doctype/item/item.py +795,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,ඔබ මේ වන විටත් තවත් UOM සමග සමහර ගනුදෙනු (ව) කර ඇති නිසා අයිතමය සඳහා නු පෙරනිමි ඒකකය {0} සෘජුවම වෙනස් කළ නොහැක. ඔබ වෙනස් පෙරනිමි UOM භාවිතා කිරීම සඳහා නව විෂය නිර්මාණය කිරීමට අවශ්ය වනු ඇත.
-apps/erpnext/erpnext/accounts/utils.py +237,Allocated amount can not be negative,වෙන් කල මුදල සෘණ විය නොහැකි
+apps/erpnext/erpnext/stock/doctype/item/item.py +797,Default Unit of Measure for Item {0} cannot be changed directly because 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,වෙන් කල මුදල සෘණ විය නොහැකි
 DocType: Purchase Order Item,Billed Amt,අසූහත ඒඑම්ටී
 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 +91,Reference No & Reference Date is required for {0},ෙයොමු අංකය සහ විමර්ශන දිනය {0} සඳහා අවශ්ය
-DocType: Sales Invoice,Customer's Vendor,පාරිභෝගික විකුණුම්කරුගේ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Proposal Writing,යෝජනාව ලේඛන
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,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","පරීක්ෂා නම්, උප කොන්ත්රාත් බව අයිතම සඳහා අමු ද්රව්ය ද්රව්ය ඉල්ලීම් ඇතුළත් වනු ඇත"
@@ -568,13 +575,14 @@
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,කාලය ට්රැකින්
 DocType: Fiscal Year Company,Fiscal Year Company,මුදල් වර්ෂය සමාගම
 DocType: Packing Slip Item,DN Detail,ඩී.එන් විස්තර
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +257,Already supplier quotation has created,දැනටමත් සැපයුම්කරු උද්ධෘත නිර්මාණය කර ඇත
 DocType: Timesheet,Billed,අසූහත
 DocType: Batch,Batch Description,කණ්ඩායම විස්තරය
+apps/erpnext/erpnext/accounts/utils.py +685,"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 +733,View Offline Records,දැක්ම Offline දින වාර්තා
+apps/erpnext/erpnext/accounts/page/pos/pos.js +715,View Offline Records,දැක්ම Offline දින වාර්තා
+DocType: Student,Sibling Details,සහෝදර විස්තර
 DocType: Employee,Reason for Resignation,ඉ ලා අස් හේතුව
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,"කාර්ය සාධන ඇගයීම් සඳහා, සැකිල්ල."
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,ඉන්වොයිසිය / ජර්නල් සටහන් විස්තර
@@ -588,7 +596,7 @@
 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,බඩු තොග ශුද්ධ වෙනස්
 DocType: Employee,Passport Number,විදේශ ගමන් බලපත්ර අංකය
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Manager,කළමනාකරු
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,කළමනාකරු
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,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; සමාන විය නොහැකි
@@ -597,10 +605,11 @@
 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 +299,Timesheet created:,Timesheet නිර්මාණය:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +715,Please set default Cash or Bank account in Mode of Payment {0},ගෙවීම් ප්රකාරය {0} පැහැර මුදල් හෝ බැංකු ගිණුම් සකස් කරන්න
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +300,Timesheet created:,Timesheet නිර්මාණය:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +772,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,ලියාපදිංචි
 DocType: Selling Settings,Customer Naming By,පාරිභෝගික නම් කිරීම මගින්
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,මානව සම්පත් පද්ධතිය අනුප්රාප්තිකයා නම් කිරීම කරුණාකර පිහිටුවීම් සේවක&gt; මානව සම්පත් සැකසුම්
 DocType: Depreciation Schedule,Depreciation Amount,ක්ෂය ප්රමාණය
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,සමූහ පරිවර්තනය
 DocType: Activity Cost,Activity Type,ක්රියාකාරකම් වර්ගය
@@ -625,6 +634,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,අවසානයි
 DocType: Pricing Rule,Sales Manager,අලෙවි කළමනාකරු
 DocType: Salary Structure Employee,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,වත්කම් බැහැර මත ලාභ / අලාභ ගිණුම්
@@ -639,11 +649,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +9,Pre Sales,පෙර විකුණුම්
 DocType: Purchase Receipt,Other Details,වෙනත් විස්තර
 DocType: Account,Accounts,ගිණුම්
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Marketing,අලෙවි
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +227,Payment Entry is already created,ගෙවීම් සටහන් දැනටමත් නිර්මාණය
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,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 +538,Row #{0}: Asset {1} does not linked to Item {2},ෙරෝ # {0}: වත්කම් {1} අයිතමය {2} සම්බන්ධ නැහැ
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +21,Preview Salary Slip,පෙරදසුන වැටුප කුවිතාන්සියක්
+apps/erpnext/erpnext/controllers/accounts_controller.py +541,Row #{0}: Asset {1} does not linked to Item {2},ෙරෝ # {0}: වත්කම් {1} අයිතමය {2} සම්බන්ධ නැහැ
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +38,Preview Salary Slip,පෙරදසුන වැටුප කුවිතාන්සියක්
 DocType: Company,Deafult Cost Center,Deafult පිරිවැය මධ්යස්ථානය
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +48,Account {0} has been entered multiple times,ගිණුම {0} වාර කිහිපයක් ඇතුලත් කර ඇත
 DocType: Account,Expenses Included In Valuation,ඇතුලත් තක්සේරු දී වියදම්
@@ -652,7 +662,7 @@
 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 +617,Item has variants.,අයිතමය ප්රභේද ඇත.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,අයිතමය ප්රභේද ඇත.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,අයිතමය {0} සොයාගත නොහැකි
 DocType: Bin,Stock Value,කොටස් අගය
 apps/erpnext/erpnext/accounts/doctype/account/account.py +25,Company {0} does not exist,සමාගම {0} නොපවතියි
@@ -672,7 +682,7 @@
 DocType: Purchase Order,Supply Raw Materials,"සම්පාදන, අමු ද්රව්ය"
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,ඊළඟ ඉන්වොයිස් ජනනය කරනු ලබන දිනය. මෙය ඉදිරිපත් කළ මත ජනනය කරනු ලැබේ.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,ජංගම වත්කම්
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,{0} is not a stock Item,{0} කොටස් අයිතමය නොවේ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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 +169,Lead must be set if Opportunity is made from Lead,"අවස්ථා පෙරමුණ සිදු කෙරේ නම්, ඊයම් තබා ගත යුතුය"
@@ -739,26 +749,25 @@
 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 +709,No Permission,කිසිදු අවසරය
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +710,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; පරීක්ෂා කළ නොහැකි
 apps/erpnext/erpnext/public/js/setup_wizard.js +298,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 +542,Row #{0}: Asset {1} must be submitted,ෙරෝ # {0}: වත්කම් {1} ඉදිරිපත් කළ යුතුය
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,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 හරහා කොටස් ඉතිරි උඩුගත කරන්න.
 DocType: Warehouse,Tree Details,රුක් විස්තර
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,දැන් යවන්න
 ,Support Analytics,සහයෝගය විශ්ලේෂණ
 DocType: Item,Website Warehouse,වෙබ් අඩවිය ගබඩා
 DocType: Payment Reconciliation,Minimum Invoice Amount,අවම ඉන්වොයිසි මුදල
 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/sales_invoice/sales_invoice.py +227,Timesheet {0} is already completed or cancelled,Timesheet {0} වන විට අවසන් කර හෝ අවලංගු වේ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +259,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 දක්වා සමාන විය යුතුයි
@@ -774,13 +783,13 @@
 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 +229,Target Warehouse,ඉලක්ක ගබඩාව
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +230,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-,STE-
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Sales Order Date,අපේක්ෂිත භාර දීම දිනය විකුණුම් සාමය දිනය පෙර විය නොහැකි
 DocType: Upload Attendance,Import Attendance,ආනයන පැමිණීම
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,සියලු විෂයාංක කණ්ඩායම්
+apps/erpnext/erpnext/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/config/setup.py +89,Automatically compose message on submission of transactions.,ස්වයංක්රීයව ගනුදෙනු ඉදිරිපත් කරන පණිවිඩය රචනා.
@@ -792,13 +801,15 @@
 DocType: Sales Invoice,Payment Due Date,ගෙවීම් නියමිත දිනය
 apps/erpnext/erpnext/stock/doctype/item/item.js +278,Item Variant {0} already exists with same attributes,අයිතමය ප්රභේද්යයක් {0} දැනටමත් එම ලක්ෂණ සහිත පවතී
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;විවෘත&#39;
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,විවෘත එක්කෙනාගේ
 DocType: Notification Control,Delivery Note Message,සැපයුම් සටහන පණිවුඩය
 DocType: Expense Claim,Expenses,වියදම්
 DocType: Item Variant Attribute,Item Variant Attribute,අයිතමය ප්රභේද්යයක් Attribute
 ,Purchase Receipt Trends,මිලදී ගැනීම රිසිට්පත ප්රවණතා
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Research & Development,පර්යේෂණ හා සංවර්ධන
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,පර්යේෂණ හා සංවර්ධන
 ,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,මිල හෝ වට්ටම්
@@ -807,7 +818,7 @@
 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/controllers/accounts_controller.py +340,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","එය මේ කුවිතාන්සියේ අත්තිකාරම් වශයෙන් ඇද ගත යුතු නම්, ගෙවීම් සටහන් {0} සාමය {1} හා සම්බන්ධ කර තිබේ, පරීක්ෂා කරන්න."
+apps/erpnext/erpnext/controllers/accounts_controller.py +343,"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 විකිණීමට
@@ -829,12 +840,12 @@
 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 +756,Purchase Receipt,මිලදී ගැනීම කුවිතාන්සිය
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +735,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 +167,Reference Doctype must be one of {0},විමර්ශන Doctype {0} එකක් විය යුතුය
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +282,Unable to find Time Slot in the next {0} days for Operation {1},මෙහෙයුම {1} සඳහා ඉදිරි {0} දින තුළ කාල Slot සොයා ගැනීමට නොහැකි
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +170,Reference Doctype must be one of {0},විමර්ශන Doctype {0} එකක් විය යුතුය
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,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 +439,BOM {0} must be active,ද්රව්ය ලේඛණය {0} ක්රියාකාරී විය යුතුය
@@ -845,7 +856,7 @@
 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 +214,Warehouses with existing transaction can not be converted to ledger.,පවත්නා ගනුදෙනුව සමග බඞු ගබඞාව ලෙජර් පරිවර්තනය කළ නොහැක.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +217,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,නිෂ්පාදන නියෝග
@@ -859,9 +870,9 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,සේවක {0} සක්රීය නොවන නැත්නම් ස්ථානීකව නොපවතියි
 DocType: Fee Structure,Components,සංරචක
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,Please enter Asset Category in Item {0},විෂය {0} තුළ වත්කම් ප්රවර්ගය ඇතුලත් කරන්න
-apps/erpnext/erpnext/stock/doctype/item/item.py +612,Item Variants {0} updated,අයිතමය ප්රභේද {0} යාවත්කාලීන
+apps/erpnext/erpnext/stock/doctype/item/item.py +614,Item Variants {0} updated,අයිතමය ප්රභේද {0} යාවත්කාලීන
 DocType: Quality Inspection Reading,Reading 6,කියවීම 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +843,Cannot {0} {1} {2} without any negative outstanding invoice,{0} නොහැකි {1} {2} සෘණාත්මක කැපී පෙනෙන ඉන්වොයිස් තොරව
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +854,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,දැන් සමමුහුර්ත කරන්න
@@ -876,69 +887,72 @@
 DocType: Item,Is Purchase Item,මිලදී ගැනීම අයිතමය වේ
 DocType: Asset,Purchase Invoice,මිලදී ගැනීම ඉන්වොයිසිය
 DocType: Stock Ledger Entry,Voucher Detail No,වවුචරය විස්තර නොමැත
-apps/erpnext/erpnext/accounts/page/pos/pos.js +728,New Sales Invoice,නව විකුණුම් ඉන්වොයිසිය
+apps/erpnext/erpnext/accounts/page/pos/pos.js +710,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 +728,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: Guardian,Guardian Name,ගාඩියන් නම
 DocType: Cheque Print Template,Has Print Format,ඇත මුද්රණය ආකෘතිය
-apps/erpnext/erpnext/accounts/page/pos/pos.js +86, is mandatory. Maybe Currency Exchange record is not created for ,අනිවාර්ය වේ. සමහර විට විනිමය හුවමාරු වාර්තාවක් සඳහා නිර්මාණය කර නැත
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +109,Row #{0}: Please specify Serial No for Item {1},ෙරෝ # {0}: අයිතමය {1} සඳහා අනු අංකය සඳහන් කරන්න
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +619,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","&#39;නිෂ්පාදන පැකේජය&#39; භාණ්ඩ, ගබඩා, අනු අංකය හා කණ්ඩායම සඳහා කිසිඳු මෙම &#39;ඇසුරුම් ලැයිස්තු මේසයෙන් සලකා බලනු ඇත. ගබඩාව සහ කණ්ඩායම මෙයට කිසිම &#39;නිෂ්පාදන පැකේජය&#39; අයිතමයේ සඳහා සියලු ඇසුරුම් භාණ්ඩ සඳහා සමාන වේ නම්, එම අගයන් ප්රධාන විෂය වගුවේ ඇතුළත් කළ හැකි, සාරධර්ම &#39;ඇසුරුම් ලැයිස්තු&#39; වගුව වෙත පිටපත් කිරීමට නියමිතය."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +75, 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 +613,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing 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 +606,Supplier Invoice Date cannot be greater than Posting Date,"සැපයුම්කරු ගෙවීම් දිනය දිනය ගිය තැන, ශ්රී ලංකා තැපෑල වඩා වැඩි විය නොහැකි"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +609,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: 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 +810,Select Item for Transfer,හුවමාරුව සඳහා විෂය තෝරා
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +789,Select Item for Transfer,හුවමාරුව සඳහා විෂය තෝරා
 DocType: Purchase Invoice,Additional Discount Percentage,අතිරේක වට්ටම් ප්රතිශතය
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,සියළු උපකාර වීඩියෝ ලැයිස්තුවක් බලන්න
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,චෙක්පත තැන්පත් කර එහිදී බැංකුවේ ගිණුමක් හිස තෝරන්න.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,පරිශීලක ගනුදෙනු මිල ලැයිස්තුව අනුපාතිකය සංස්කරණය කිරීමට ඉඩ දෙන්න
 DocType: Pricing Rule,Max Qty,මැක්ස් යවන ලද
-DocType: Student Applicant,Father's Name,පියාගේ නම
 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 +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,ෙරෝ {0}: විකුණුම් / මිලදී ගැනීමේ නියෝගයක් සෑම විටම අත්තිකාරම් වශයෙන් සටහන් කළ යුතුය එරෙහිව ගෙවීම්
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,රසායනික
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +686,All items have already been transferred for this Production Order.,සියලු අයිතම දැනටමත් මෙම නිෂ්පාදන නියෝග සඳහා ස්ථාන මාරුවීම් ලබාදී තිබේ.
+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} පරීක්ෂා කර නැවත උත්සාහ කරන්න"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +694,All items have already been transferred for this Production Order.,සියලු අයිතම දැනටමත් මෙම නිෂ්පාදන නියෝග සඳහා ස්ථාන මාරුවීම් ලබාදී තිබේ.
 DocType: Process Payroll,Select Payroll Year and Month,වැටුප් වසර සහ මාසය තෝරන්න
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,Meter,මීටර්
 DocType: Workstation,Electricity Cost,විදුලිබල වියදම
 DocType: HR Settings,Don't send Employee Birthday Reminders,සේවක උපන්දින මතක් යවන්න එපා
-DocType: Opportunity,Walk In,දී ගමන්
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,කොටස් අයැදුම්පත්
 DocType: Item,Inspection Criteria,පරීක්ෂණ නිර්ණායක
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,යැවීමට
 apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,ඔබේ ලිපිය හිස සහ ලාංඡනය උඩුගත කරන්න. (ඔබ ඔවුන්ට පසුව සංස්කරණය කළ හැකි).
 DocType: Timesheet Detail,Bill,පනත් කෙටුම්පත
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,White,සුදු
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date is entered as past date,ඊළඟ ක්ෂය දිනය පසුගිය දිනය ලෙස ඇතුලත් කර
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +167,White,සුදු
 DocType: SMS Center,All Lead (Open),සියලු ඊයම් (විවෘත)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +228,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),ෙරෝ {0}: පිවිසුම් කාලය පළකිරීම ගුදම් තුළ යවන ලද {4} සඳහා ලබා ගත හැකි {1} ({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}),ෙරෝ {0}: පිවිසුම් කාලය පළකිරීම ගුදම් තුළ යවන ලද {4} සඳහා ලබා ගත හැකි {1} ({2} {3}) නොවේ
 DocType: Purchase Invoice,Get Advances Paid,අත්තිකාරම් ගෙවීම්
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +731,Make ,කරන්න
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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 +154,Order Type must be one of {0},සාමය වර්ගය {0} එකක් විය යුතුය
+apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},සාමය වර්ගය {0} එකක් විය යුතුය
 DocType: Lead,Next Contact Date,ඊළඟට අප අමතන්න දිනය
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,විවෘත යවන ලද
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +393,Please enter Account for Change Amount,වෙනස් මුදල සඳහා ගිණුම් ඇතුලත් කරන්න
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,Please enter Account for Change Amount,වෙනස් මුදල සඳහා ගිණුම් ඇතුලත් කරන්න
 DocType: Student Batch,Student Batch Name,ශිෂ්ය කණ්ඩායම නම
 DocType: Holiday List,Holiday List Name,නිවාඩු ලැයිස්තු නම
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js +8,Schedule Course,උපෙල්ඛනෙය් පාඨමාලා
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Stock Options,කොටස් විකල්ප
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,කොටස් විකල්ප
 DocType: Journal Entry Account,Expense Claim,වියදම් හිමිකම්
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +211,Do you really want to restore this scrapped asset?,ඔබ ඇත්තටම කටුගා දමා වත්කම් නැවත කිරීමට අවශ්යද?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +237,Qty for {0},{0} සඳහා යවන ලද
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +212,Do you really want to restore this scrapped asset?,ඔබ ඇත්තටම කටුගා දමා වත්කම් නැවත කිරීමට අවශ්යද?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,Qty for {0},{0} සඳහා යවන ලද
 DocType: Leave Application,Leave Application,අයදුම් තබන්න
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,වෙන් කිරීම මෙවලම Leave
 DocType: Leave Block List,Leave Block List Dates,වාරණ ලැයිස්තුව දිනයන් නිවාඩු
@@ -947,9 +961,9 @@
 DocType: Company,Default Terms,පෙරනිමි කොන්දේසි
 DocType: Packing Slip Item,Packing Slip Item,ඇසුරුම් පුරවා අයිතමය
 DocType: Purchase Invoice,Cash/Bank Account,මුදල් / බැංකු ගිණුම්
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,ප්රමාණය සහ වටිනාකම කිසිදු වෙනසක් සමග භාණ්ඩ ඉවත් කර ඇත.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,ප්රමාණය සහ වටිනාකම කිසිදු වෙනසක් සමග භාණ්ඩ ඉවත් කර ඇත.
 DocType: Delivery Note,Delivery To,වෙත බෙදා හැරීමේ
-apps/erpnext/erpnext/stock/doctype/item/item.py +635,Attribute table is mandatory,ගති ලක්ෂණය වගුව අනිවාර්ය වේ
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,ගති ලක්ෂණය වගුව අනිවාර්ය වේ
 DocType: Production Planning Tool,Get Sales Orders,විකුණුම් නියෝග ලබා ගන්න
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} සෘණ විය නොහැකි
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,කරුණාකර ශිෂ්ය තෝරා
@@ -974,7 +988,7 @@
 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,WIP ගබඩාව
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},අනු අංකය {0} {1} දක්වා නඩත්තු ගිවිසුම් යටතේ ය
+apps/erpnext/erpnext/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,සංවිධානයේ නම
@@ -986,7 +1000,7 @@
 DocType: GL Entry,Against,එරෙහි
 DocType: Item,Default Selling Cost Center,පෙරනිමි විකිණීම පිරිවැය මධ්යස්ථානය
 DocType: Sales Partner,Implementation Partner,ක්රියාත්මක කිරීම සහකරු
-apps/erpnext/erpnext/controllers/selling_controller.py +231,Sales Order {0} is {1},විකුණුම් සාමය {0} වේ {1}
+apps/erpnext/erpnext/controllers/selling_controller.py +232,Sales Order {0} is {1},විකුණුම් සාමය {0} වේ {1}
 DocType: Opportunity,Contact Info,සම්බන්ධ වීම
 apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,කොටස් අයැදුම්පත් කිරීම
 DocType: Packing Slip,Net Weight UOM,ශුද්ධ බර UOM
@@ -996,25 +1010,24 @@
 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,අවසන් දිනය ඇරඹුම් දිනය ඊට වඩා අඩු විය නොහැක
 DocType: Sales Person,Select company name first.,පළමු සමාගම නම තෝරන්න.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Dr,ආචාර්ය
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Dr,ආචාර්ය
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,සැපයුම්කරුවන් ලැබෙන මිල ගණන්.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},{0} වෙත | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,සාමාන්ය වයස අවුරුදු
 DocType: 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/templates/pages/home.html +32,View All Products,සියලු නිෂ්පාදන බලන්න
+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 +400,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,අවවාදයයි: පද්ධතිය අයිතමය {0} සඳහා මුදල සිට overbilling පරීක්ෂා නැහැ {1} ශුන්ය වේ දී
+apps/erpnext/erpnext/controllers/accounts_controller.py +403,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/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,හා වර්ෂය:
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +191,{0} {1} must be submitted,{0} {1} ඉදිරිපත් කළ යුතුය
-DocType: Email Digest,Annual Expense,වාර්ෂික වියදම්
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,{0} {1} must be submitted,{0} {1} ඉදිරිපත් කළ යුතුය
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +145,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}
@@ -1025,30 +1038,31 @@
 DocType: Sales Partner,Distributor,බෙදාහැරීමේ
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,සාප්පු සවාරි කරත්ත නැව් පාලනය
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +211,Production Order {0} must be cancelled before cancelling this Sales Order,නිෂ්පාදන න්යාය {0} මෙම වෙළෙඳ න්යාය අවලංගු කිරීම පෙර අවලංගු කළ යුතුය
-apps/erpnext/erpnext/public/js/controllers/transaction.js +62,Please set 'Apply Additional Discount On',&#39;යොමු කරන්න අතිරේක වට්ටම් මත&#39; සකස් කරන්න
+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,රංගේ සිට රංගේ කිරීම වඩා අඩු විය යුතුය
 DocType: Global Defaults,Global Defaults,ගෝලීය Defaults
 apps/erpnext/erpnext/projects/doctype/project/project.py +153,Project Collaboration Invitation,ව්යාපෘති ඒකාබද්ධතාවයක් ආරාධනයයි
 DocType: Salary Slip,Deductions,අඩු කිරීම්
+DocType: Leave Allocation,LAL/,ලාල් /
 apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,ආරම්භක වර්ෂය
 DocType: Purchase Invoice,Start date of current invoice's period,ආරම්භ කරන්න වත්මන් ඉන්වොයිස් කාලයේ දිනය
 DocType: Salary Slip,Leave Without Pay,වැටුප් නැතිව තබන්න
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +327,Capacity Planning Error,ධාරිතාව සැලසුම් දෝෂ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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 +362,Finished Item {0} must be entered for Manufacture type entry,අවසන් විෂය {0} නිෂ්පාදනය වර්ගය ප්රවේශය සඳහා ඇතුලත් කල යුතුය
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +367,Finished Item {0} must be entered for Manufacture type entry,අවසන් විෂය {0} නිෂ්පාදනය වර්ගය ප්රවේශය සඳහා ඇතුලත් කල යුතුය
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,විවෘත මුල්ය ශේෂය
 DocType: Sales Invoice Advance,Sales Invoice Advance,විකුණුම් ඉන්වොයිසිය අත්තිකාරම්
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +499,Nothing to request,ඉල්ලා කිසිවක්
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +500,Nothing to request,ඉල්ලා කිසිවක්
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',&#39;සත ඇරඹුම් දිනය&#39; &#39;සත අවසානය දිනය&#39; ට වඩා වැඩි විය නොහැක
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Management,කළමනාකරණ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},හර හෝ බැර ප්රමාණය {0} සඳහා අවශ්ය හෝ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,කළමනාකරණ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +55,Either debit or credit amount is required for {0},හර හෝ බැර ප්රමාණය {0} සඳහා අවශ්ය හෝ
 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 +161,Blue,නිල්
+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,විද්යුත් හැඳුනුම්පත සකස් කරන්න
@@ -1058,12 +1072,12 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +23,POS Profile {0} already created for user: {1} and company {2},POS නරඹන්න {0} දැනටමත් පරිශීලක සඳහා නිර්මාණය: {1} සහ සමාගම {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM පරිවර්තන සාධකය
 DocType: Stock Settings,Default Item Group,පෙරනිමි අයිතමය සමූහ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1374,Do you really want to submit the invoice?,ඔබ ඇත්තටම ඉන්වොයිස් ඉදිරිපත් කිරීමට ඔබට අවශ්යද?
+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 +685,Cost Center For Item with Item Code ',විෂය සංග්රහයේ සමග අයිතමය සඳහා පිරිවැය මධ්යස්ථානය
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1526,"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 +679,Cost Center For Item with Item Code ',විෂය සංග්රහයේ සමග අයිතමය සඳහා පිරිවැය මධ්යස්ථානය
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1550,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","ගෙවීම් ක්රමය වින්යාස කර නොමැත. ගිණුමක් ගෙවීම් වන ආකාරය මත හෝ POS නරඹන්න තබා තිබේද, කරුණාකර පරීක්ෂා කරන්න."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,ඔබේ විකිණුම් පුද්ගලයා පාරිභෝගික සම්බන්ධ කර ගැනීමට මෙම දිනට මතක් ලැබෙනු ඇත
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,"Further accounts can be made under Groups, but entries can be made against non-Groups","කණ්ඩායම් යටතේ තව දුරටත් ගිණුම් කළ හැකි නමුත්, ඇතුළත් කිරීම්-කණ්ඩායම් නොවන එරෙහිව කළ හැකි"
 DocType: Lead,Lead,ඊයම්
@@ -1083,104 +1097,106 @@
 DocType: Payment Reconciliation,Unreconciled Payment Details,Unreconciled ගෙවීම් විස්තර
 DocType: Global Defaults,Current Fiscal Year,වත්මන් මුදල් වර්ෂය
 DocType: Global Defaults,Disable Rounded Total,වුනාට මුළු අක්රීය
-DocType: Lead,Call,ඇමතුම්
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +417,'Entries' cannot be empty,&#39;අයැදුම්පත්&#39; හිස් විය නොහැක
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +418,'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 +214,Fiscal Year {0} not found,මුදල් වර්ෂය {0} සොයාගත නොහැකි
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +221,Fiscal Year {0} not found,මුදල් වර්ෂය {0} සොයාගත නොහැකි
 apps/erpnext/erpnext/config/hr.py +238,Setting up Employees,සේවක සකස් කිරීම
 DocType: Sales Order,SO-,ඒ නිසා-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,කරුණාකර පළමු උපසර්ගය තෝරා
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Please select prefix first,කරුණාකර පළමු උපසර්ගය තෝරා
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Research,පර්යේෂණ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,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 +43,Item {0} must be a non-stock item,{0} අයිතමය නොවන කොටස් අයිතමය විය යුතුය
 DocType: Contact,User ID,පරිශීලක ID
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +57,View Ledger,දැක්ම ලේජර
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,ආදිතම
-apps/erpnext/erpnext/stock/doctype/item/item.py +504,"An Item Group exists with same name, please change the item name or rename the item group","ක අයිතමය සමූහ එකම නමින් පවතී, අයිතමය නම වෙනස් කිරීම හෝ අයිතමය පිරිසක් නැවත නම් කරුණාකර"
+apps/erpnext/erpnext/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 +437,Rest Of The World,ලෝකයේ සෙසු
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,අයිතමය {0} කණ්ඩායම ලබා ගත නොහැකි
 ,Budget Variance Report,අයවැය විචලතාව වාර්තාව
 DocType: Salary Slip,Gross Pay,දළ වැටුප්
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +90,Row {0}: Activity Type is mandatory.,ෙරෝ {0}: ක්රියාකාරකම් වර්ගය අනිවාර්ය වේ.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +114,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/public/js/controllers/stock_controller.js +40,Accounting Ledger,ගිණුම් කරණය ලේජර
+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,රඳවාගත් ඉපැයුම්
 DocType: BOM Item,Item Description,අයිතම විවහතරය
+DocType: Student Sibling,Student Sibling,ශිෂ්ය සහෝදර
 DocType: Purchase Invoice,Is Recurring,නැවත නැවත කරනු
 DocType: Purchase Invoice,Supplied Items,සැපයූ අයිතම
 DocType: Student,STUD.,ඇණ.
 DocType: Production Order,Qty To Manufacture,යවන ලද නිෂ්පාදනය කිරීම සඳහා
+DocType: Email Digest,New Income,නව ආදායම්
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,මිලදී ගැනීම චක්රය පුරා එම අනුපාතය පවත්වා
 DocType: Opportunity Item,Opportunity Item,අවස්ථාව අයිතමය
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,තාවකාලික විවෘත
 ,Employee Leave Balance,සේවක නිවාඩු ශේෂ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +131,Balance for Account {0} must always be {1},ගිණුම සඳහා ශේෂ {0} සැමවිටම විය යුතුය {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +175,Valuation Rate required for Item in row {0},පේළියේ {0} තුළ අයිතමය සඳහා අවශ්ය තක්සේරු අනුපාත
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,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,උදාහරණය: පරිගණක විද්යාව පිළිබඳ ශාස්ත්රපති
 DocType: Purchase Invoice,Rejected Warehouse,ප්රතික්ෂේප ගබඩාව
 DocType: GL Entry,Against Voucher,වවුචරයක් එරෙහිව
 DocType: Item,Default Buying Cost Center,පෙරනිමි මිලට ගැනීම පිරිවැය මධ්යස්ථානය
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","ERPNext ක් අතර විශිෂ්ටතම ලබා ගැනීමට, අපි ඔබට යම් කාලයක් ගත සහ මෙම උදව් වීඩියෝ දර්ශන නරඹා බව නිර්දේශ කරමු."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +87, to ,දක්වා
+apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,දක්වා
 DocType: Item,Lead Time in days,දින තුළ කාල Lead
 ,Accounts Payable Summary,ගෙවිය යුතු ගිණුම් සාරාංශය
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Not authorized to edit frozen Account {0},ශීත කළ ගිණුම් {0} සංස්කරණය කිරීමට අවසර නැත
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},ශීත කළ ගිණුම් {0} සංස්කරණය කිරීමට අවසර නැත
 DocType: Journal Entry,Get Outstanding Invoices,විශිෂ්ට ඉන්වොයිසි ලබා ගන්න
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +62,Sales Order {0} is not valid,විකුණුම් සාමය {0} වලංගු නොවේ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,විකුණුම් සාමය {0} වලංගු නොවේ
 apps/erpnext/erpnext/setup/doctype/company/company.py +185,"Sorry, companies cannot be merged","සමාවන්න, සමාගම් ඒකාබද්ධ කළ නොහැකි"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +139,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",මුළු නිකුත් / ස්ථාන මාරු ප්රමාණය {0} ද්රව්ය ඉල්ලීම ගැන {1} \ ඉල්ලා ප්රමාණය {2} අයිතමය {3} සඳහා වඩා වැඩි විය නොහැකි
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Small,කුඩා
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,Small,කුඩා
 DocType: Employee,Employee Number,සේවක සංඛ්යාව
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},නඩු අංක (ය) දැනටමත් භාවිත වේ. නඩු අංක {0} සිට උත්සාහ කරන්න
 ,Invoiced Amount (Exculsive Tax),ඉන්වොයිස් ප්රමාණය (Exculsive බදු)
-DocType: Student Applicant,Mother's / Guardian 1 Email ID,මවගේ / භාරකරු 1 විද්යුත් හැඳුනුම්පත
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,අංක 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,ගිණුම හිස {0} නිර්මාණය
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +160,Green,හරිත
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,හරිත
 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 +57,Contract,කොන්ත්රාත්තුව
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,කොන්ත්රාත්තුව
 DocType: Email Digest,Add Quote,Quote එකතු කරන්න
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +498,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 +503,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 +80,Row {0}: Qty is mandatory,ෙරෝ {0}: යවන ලද අනිවාර්ය වේ
+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 +737,Sync Master Data,සමමුහුර්ත කරන්න මාස්ටර් දත්ත
+apps/erpnext/erpnext/accounts/page/pos/pos.js +719,Sync Master Data,සමමුහුර්ත කරන්න මාස්ටර් දත්ත
 apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,ඔබගේ නිෂ්පාදන හෝ සේවා
 DocType: Mode of Payment,Mode of Payment,ගෙවීම් ක්රමය
 apps/erpnext/erpnext/stock/doctype/item/item.py +178,Website Image should be a public file or website URL,වෙබ් අඩවිය රූප ප්රසිද්ධ ගොනුව හෝ වෙබ් අඩවි URL විය යුතුය
+DocType: Student Applicant,AP,පුද්ගල නාශක
 DocType: Purchase Invoice Item,BOM,ද්රව්ය ලේඛණය
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,"මෙය මූල අයිතමය පිරිසක් වන අතර, සංස්කරණය කළ නොහැක."
+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 +345,"{0}: Employee email not found, hence email not sent","{0}: සේවක ඊ-තැපැල් සොයාගත නොහැකි, ඒ නිසා ඊ-තැපැල් යවා නැත"
+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,ඔබේ සමාගම ලිපිනය වේ
 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 +118,"For {0}, only credit accounts can be linked against another debit entry",{0} සඳහා පමණක් ණය ගිණුම් තවත් හර සටහන හා සම්බන්ධ කර ගත හැකි
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Delivery Note {0} is not submitted,සැපයුම් සටහන {0} ඉදිරිපත් කර නැත
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Delivery Note {0} is not submitted,සැපයුම් සටහන {0} ඉදිරිපත් කර නැත
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Sub-contracted Item,අයිතමය {0} උප කොන්ත්රාත් අයිතමය විය යුතුය
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,ප්රාග්ධන උපකරණ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","මිල ගණන් පාලනය පළමු අයිතමය, විෂය සමූහය හෝ වෙළඳ නාමය විය හැකි ක්ෂේත්ර, &#39;මත යොමු කරන්න&#39; මත පදනම් වූ තෝරා ගනු ලැබේ."
 DocType: Hub Settings,Seller Website,විකුණන්නා වෙබ් අඩවිය
 DocType: Item,ITEM-,ITEM-
-apps/erpnext/erpnext/controllers/selling_controller.py +147,Total allocated percentage for sales team should be 100,විකුණුම් කණ්ඩායමේ මුළු වෙන් ප්රතිශතය 100 විය යුතුයි
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +110,Production Order status is {0},නිෂ්පාදන න්යාය තත්ත්වය {0} වේ
+apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,විකුණුම් කණ්ඩායමේ මුළු වෙන් ප්රතිශතය 100 විය යුතුයි
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},නිෂ්පාදන න්යාය තත්ත්වය {0} වේ
 DocType: Appraisal Goal,Goal,ඉලක්කය
 DocType: Sales Invoice Item,Edit Description,සංස්කරණය කරන්න විස්තරය
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +757,For Supplier,සැපයුම්කරු සඳහා
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +723,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,මුද්රණය ආකෘතිය නිර්මාණය
@@ -1196,10 +1212,11 @@
 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,ශ්රේණියේ සංග්රහයේ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,විද්යුත් Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +445,BOM {0} does not belong to Item {1},ද්රව්ය ලේඛණය {0} අයිතමය අයිති නැත {1}
 DocType: Sales Partner,Target Distribution,ඉලක්ක බෙදාහැරීම්
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1667,Deafault warehouse is required for selected item,Deafault ගබඩා සංකීර්ණය තෝරාගත් අයිතමය සඳහා අවශ්ය වේ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Deafault warehouse is required for selected item,Deafault ගබඩා සංකීර්ණය තෝරාගත් අයිතමය සඳහා අවශ්ය වේ
 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
@@ -1208,23 +1225,23 @@
 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 +110,Hardware,දෘඩාංග
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,දෘඩාංග
 DocType: Sales Order,Recurring Upto,තුරුත් නැවත නැවත
 DocType: Attendance,HR Manager,මානව සම්පත් කළමනාකාර
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,කරුණාකර සමාගම තෝරා
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Privilege Leave,වරප්රසාද සහිත
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,වරප්රසාද සහිත
 DocType: Purchase Invoice,Supplier Invoice Date,සැපයුම්කරු ගෙවීම් දිනය
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,ඔබ සාප්පු සවාරි කරත්ත සක්රිය කර ගැනීමට අවශ්ය
 DocType: Payment Entry,Writeoff,ලියා හරින්න
 DocType: Appraisal Template Goal,Appraisal Template Goal,ඇගයීෙම් සැකිල්ල ඉලක්කය
-DocType: Salary Slip,Earning,උපයන
+DocType: Salary Component,Earning,උපයන
 DocType: Purchase Invoice,Party Account Currency,පක්ෂය ගිණුම ව්යවහාර මුදල්
 ,BOM Browser,ද්රව්ය ලේඛණය බ්රව්සරය
 DocType: Purchase Taxes and Charges,Add or Deduct,එක් කරන්න හෝ අඩු
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,අතර සොයා අතිච්ඡාදනය කොන්දේසි යටතේ:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +171,Against Journal Entry {0} is already adjusted against some other voucher,ජර්නල් සටහන් {0} එරෙහිව මේ වන විටත් තවත් වවුචරය එරෙහිව ගැලපූ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,ජර්නල් සටහන් {0} එරෙහිව මේ වන විටත් තවත් වවුචරය එරෙහිව ගැලපූ
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,මුළු සාමය අගය
-apps/erpnext/erpnext/demo/setup_data.py +358,Food,ආහාර
+apps/erpnext/erpnext/demo/setup/setup_data.py +301,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/course_schedule/course_schedule.js +103,Mark Attendence,මාක් පැමිණීම්
@@ -1258,12 +1275,12 @@
 DocType: Sales Order Item,Planned Quantity,සැලසුම් ප්රමාණ
 DocType: Purchase Invoice Item,Item Tax Amount,අයිතමය බදු මුදල
 DocType: Item,Maintain Stock,කොටස් වෙළඳ පවත්වා
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +209,Stock Entries already created for Production Order ,නිෂ්පාදන සාමය සඳහා දැනටමත් නිර්මාණය කොටස් අයැදුම්පත්
+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,ස්ථාවර වත්කම් ශුද්ධ වෙනස්
 DocType: Leave Control Panel,Leave blank if considered for all designations,සියලු තනතුරු සඳහා සලකා නම් හිස්ව තබන්න
-apps/erpnext/erpnext/controllers/accounts_controller.py +620,Charge of type 'Actual' in row {0} cannot be included in Item Rate,වර්ගය භාර &#39;සත&#39; පේළිය {0} අයිතමය ශ්රේණිගත ඇතුළත් කළ නොහැකි
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,Max: {0},මැක්ස්: {0}
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +15,From Datetime,දිනයවේලාව සිට
+apps/erpnext/erpnext/controllers/accounts_controller.py +623,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 +239,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 +153,"Request for Quotation is disabled to access from portal, for more check portal settings.","උද්ධෘත සඳහා ඉල්ලුම් තවත් කිව බිහිදොර සැකසුම් සඳහා, බිහිදොර සිට ප්රවේශ අක්රීය කර ඇත."
@@ -1271,8 +1288,8 @@
 DocType: Sales Invoice,Shipping Address Name,නැව් ලිපිනය නම
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,ගිණුම් සටහන
 DocType: Material Request,Terms and Conditions Content,නියමයන් හා කොන්දේසි අන්තර්ගත
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +552,cannot be greater than 100,100 ට වඩා වැඩි විය නොහැක
-apps/erpnext/erpnext/stock/doctype/item/item.py +680,Item {0} is not a stock Item,අයිතමය {0} කොටස් අයිතමය නොවේ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +546,cannot be greater than 100,100 ට වඩා වැඩි විය නොහැක
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is not a stock Item,අයිතමය {0} කොටස් අයිතමය නොවේ
 DocType: Maintenance Visit,Unscheduled,කලින් නොදන්වා
 DocType: Employee,Owned,අයත්
 DocType: Salary Detail,Depends on Leave Without Pay,වැටුප් නැතිව නිවාඩු මත රඳා පවතී
@@ -1286,10 +1303,9 @@
 DocType: GL Entry,GL Entry,ජී.එල් සටහන්
 DocType: HR Settings,Employee Settings,සේවක සැකසුම්
 ,Batch-Wise Balance History,කණ්ඩායම ප්රාඥ ශේෂ ඉතිහාසය
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,ලැයිස්තුව කරන්න
 apps/erpnext/erpnext/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 +61,Apprentice,ආධුනිකත්ව
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +102,Negative Quantity is not allowed,ඍණ ප්රමාණ කිරීමට අවසර නැත
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,ආධුනිකත්ව
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +103,Negative Quantity is not allowed,ඍණ ප්රමාණ කිරීමට අවසර නැත
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",බදු විස්තර වගුව වැලක් ලෙස අයිතමය ස්වාමියා සිට ඉහළම අගය හා මෙම ක්ෂේත්රය තුළ ගබඩා. බදු හා ගාස්තු සඳහා භාවිතා
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +152,Employee cannot report to himself.,සේවක තමා වෙත වාර්තා කළ නොහැක.
@@ -1310,15 +1326,14 @@
 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 +141,Source warehouse is mandatory for row {0},මූලාශ්රය ගබඩා සංකීර්ණය පේළිය {0} සඳහා අනිවාර්ය වේ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +719,Packing Slip,ඇසුරුම් කුවිතාන්සියක්
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Source warehouse is mandatory for row {0},මූලාශ්රය ගබඩා සංකීර්ණය පේළිය {0} සඳහා අනිවාර්ය වේ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +713,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/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,උද්ධෘත සඳහා ඉල්ලුම් පහත සබැඳිය ක්ලික් කිරීම මගින් ප්රවේශ විය හැකි
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,ආනයන අසාර්ථක විය!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,කිසිදු ලිපිනය තවමත් වැඩිදුරටත් සඳහන් කළේය.
 DocType: Workstation Working Hour,Workstation Working Hour,සේවා පරිගණකයක් කෘත්යාධිකාරී හෝරාව
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Analyst,රස පරීක්ෂක
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,රස පරීක්ෂක
 DocType: Item,Inventory,බඩු තොග
 DocType: Item,Sales Details,විකුණුම් විස්තර
 DocType: Quality Inspection,QI-,QI-
@@ -1326,7 +1341,7 @@
 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 +103,Government,ආණ්ඩුව
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,ආණ්ඩුව
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,සංවිධානයේ නම
 apps/erpnext/erpnext/config/stock.py +289,Item Variants,අයිතමය ප්රභේද
 DocType: Company,Services,සේවා
@@ -1342,6 +1357,7 @@
 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/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,ආයෝජනය සිට මුදල් ප්රවාහ
 DocType: Program Course,Program Course,වැඩසටහන පාඨමාලා
@@ -1382,12 +1398,12 @@
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,ලබන්නා ලැයිස්තුව හිස්ය. Receiver ලැයිස්තුව නිර්මාණය කරන්න
 DocType: Production Plan Sales Order,Production Plan Sales Order,නිශ්පාදන සැළැස්ම විකුණුම් න්යාය
 DocType: Sales Partner,Sales Partner Target,විකුණුම් සහකරු ඉලක්ක
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +110,Accounting Entry for {0} can only be made in currency: {1},{1}: {0} පමණක් මුදල් කළ හැකි සඳහා මුල්ය සටහන්
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},{1}: {0} පමණක් මුදල් කළ හැකි සඳහා මුල්ය සටහන්
 DocType: Pricing Rule,Pricing Rule,මිල ගණන් පාලනය
 DocType: Budget,Action if Annual Budget Exceeded,ක්රියාකාරී වාර්ෂික අයවැය ඉක්මවා නම්
 apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,සාමය ලබා දීමට ද්රව්ය ඉල්ලීම්
 DocType: Shopping Cart Settings,Payment Success URL,ගෙවීම් සාර්ථකත්වය URL එක
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +78,Row # {0}: Returned Item {1} does not exists in {2} {3},ෙරෝ # {0}: හැරී ආපසු පැමිණි අයිතමය {1} {2} {3} පවතින නැත
+apps/erpnext/erpnext/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,බැංකු සැසඳුම් ප්රකාශය
@@ -1396,40 +1412,39 @@
 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/stock/doctype/stock_entry/stock_entry.py +339,Not allowed to tranfer more {0} than {1} against Purchase Order {2},මිලදී ගැනීමේ නියෝගයක් {2} එරෙහිව {1} වඩා වැඩි {0} පැවරීමේ කිරීමට ඉඩ දෙනු නොලැබේ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +344,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 +545,Manufacturing Quantity is mandatory,නිෂ්පාදන ප්රමාණය අනිවාර්ය වේ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,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 +71,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 +162,Row {0}: From Time and To Time of {1} is overlapping with {2},ෙරෝ {0}: කාලය හා සිට දක්වා {1} ගතවන කාලය {2} සමග අතිච්ඡාදනය වේ
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +186,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,කොටස් වගකීම්
 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 +130,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 +137,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,වෙනත් වාර්තා
 DocType: Dependent Task,Dependent Task,රඳා කාර්ය සාධක
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,මානව සම්පත් පද්ධතිය අනුප්රාප්තිකයා නම් කිරීම කරුණාකර පිහිටුවීම් සේවක&gt; මානව සම්පත් සැකසුම්
 apps/erpnext/erpnext/stock/doctype/item/item.py +411,Conversion factor for default Unit of Measure must be 1 in row {0},නු පෙරනිමි ඒකකය සඳහා පරිවර්තන සාධකය පේළිය 1 {0} විය යුතුය
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,Leave of type {0} cannot be longer than {1},"වර්ගයේ අවසරය, {0} තවදුරටත් {1} වඩා කෙටි විය හැකි"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +197,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 +921,Search Item,සොයන්න අයිතමය
+apps/erpnext/erpnext/accounts/page/pos/pos.js +910,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 +546,Already completed,මේ වන විටත් අවසන්
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +22,Payment Request already exists {0},ගෙවීම් ඉල්ලීම් මේ වන විටත් {0} පවතී
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +550,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 +241,Quantity must not be more than {0},ප්රමාණ {0} වඩා වැඩි නොවිය යුතුය
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Quantity must not be more than {0},ප්රමාණ {0} වඩා වැඩි නොවිය යුතුය
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +76,Previous Financial Year is not closed,පසුගිය මුල්ය වර්ෂය වසා නැත
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +44,Age (Days),වයස (දින)
 DocType: Quotation Item,Quotation Item,උද්ධෘත අයිතමය
@@ -1446,7 +1461,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +221,Purchase Receipt {0} is not submitted,මිලදී ගැනීම රිසිට්පත {0} ඉදිරිපත් කර නැත
 DocType: Company,Default Payable Account,පෙරනිමි ගෙවිය යුතු ගිණුම්
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","එවැනි නාවික නීතිය, මිල ලැයිස්තුව ආදිය සමඟ අමුත්තන් කරත්තයක් සඳහා සැකසුම්"
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +83,{0}% Billed,{0}% අසූහත
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}% අසූහත
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,ඇවිරිනි යවන ලද
 DocType: Party Account,Party Account,පක්ෂය ගිණුම
 apps/erpnext/erpnext/config/setup.py +116,Human Resources,මානව සම්පත්
@@ -1458,12 +1473,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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 +22,Collect,එකතු
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,එකතු
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,Against Supplier Invoice {0} dated {1},සැපයුම්කරු ඉන්වොයිසිය {0} එරෙහිව දිනැති {1}
 DocType: Customer,Default Price List,පෙරනිමි මිල ලැයිස්තුව
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +225,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: Payment Reconciliation,Payments,ගෙවීම
 DocType: Journal Entry,Entry Type,ප්රවේශය වර්ගය
 ,Customer Credit Balance,පාරිභෝගික ණය ශේෂ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Payable,ගෙවිය යුතු ගිණුම් ශුද්ධ වෙනස්
@@ -1475,7 +1489,7 @@
 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 +9,Procurement,ප්රසම්පාදන
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,භාණ්ඩ කිසිවක් ප්රමාණය සහ වටිනාකම යම් වෙනසක් තිබෙනවා.
+apps/erpnext/erpnext/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,වගකීම් ප්රකාශය
 ,Lead Details,ඊයම් විස්තර
 DocType: Purchase Invoice,End date of current invoice's period,වත්මන් ඉන්වොයිස් ගේ කාලය අවසන් දිනය
@@ -1500,7 +1514,7 @@
 DocType: Purchase Invoice,Additional Discount,අතිරේක වට්ටම්
 DocType: Selling Settings,Selling Settings,සැකසුම් විකිණීම
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,ඔන්ලයින් තේ වෙන්දේසියේදී
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +97,Please specify either Quantity or Valuation Rate or both,ප්රමාණ හෝ තක්සේරු අනුපාත හෝ දෙකම සඳහන් කරන්න
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,ප්රමාණ හෝ තක්සේරු අනුපාත හෝ දෙකම සඳහන් කරන්න
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +13,Fulfillment,ඉටු වීම
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","සමාගම, මාසික හා මුදල් වර්ෂය අනිවාර්ය වේ"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,අලෙවි වියදම්
@@ -1521,14 +1535,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,සම්පූර්ණ ERPNext Setup!
 DocType: Item,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +93,A Customer Group exists with same name please change the Customer name or rename the Customer Group,ඒ කස්ටමර් සමූහයේ එකම නමින් පවතී පාරිභෝගික නම වෙනස් හෝ කස්ටමර් සමූහයේ නම වෙනස් කරන්න
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +126,A Customer Group exists with same name please change the Customer name or rename the Customer Group,ඒ කස්ටමර් සමූහයේ එකම නමින් පවතී පාරිභෝගික නම වෙනස් හෝ කස්ටමර් සමූහයේ නම වෙනස් කරන්න
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,නව අමතන්න
 DocType: Territory,Parent Territory,මව් දේශසීමාවේ
 DocType: Quality Inspection Reading,Reading 2,කියවීම 2
 DocType: Stock Entry,Material Receipt,ද්රව්ය කුවිතාන්සිය
 DocType: Homepage,Products,නිෂ්පාදන
 DocType: Announcement,Instructor,උපදේශක
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},ලැබිය යුතු / ගෙවිය යුතු ගිණුම සඳහා පක්ෂය වර්ගය හා පක්ෂ අවශ්ය වේ {0}
 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,ඊළඟට අප අමතන්න කිරීම
@@ -1539,7 +1552,7 @@
 ,Item-wise Sales Register,අයිතමය ප්රඥාවන්ත විකුණුම් රෙජිස්ටර්
 DocType: Asset,Gross Purchase Amount,දළ මිලදී ගැනීම මුදල
 DocType: Asset,Depreciation Method,ක්ෂය ක්රමය
-apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Offline,නොබැඳි
+apps/erpnext/erpnext/accounts/page/pos/pos.js +686,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,අවශ්ය
@@ -1557,25 +1570,27 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +425,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 +858,Make Purchase Order,මිලදී ගැනීමේ නියෝගයක් කරන්න
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +852,Make Purchase Order,මිලදී ගැනීමේ නියෝගයක් කරන්න
 DocType: SMS Center,Send To,කිරීම යවන්න
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,There is not enough leave balance for Leave Type {0},නිවාඩු වර්ගය {0} සඳහා ප්රමාණවත් නිවාඩු ශේෂ එහි නොවන
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,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 +172,Work-in-Progress Warehouse is required before Submit,සිදු වෙමින් පවතින වැඩ ගබඩාව පෙර ඉදිරිපත් අවශ්ය වේ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,Work-in-Progress Warehouse is required before Submit,සිදු වෙමින් පවතින වැඩ ගබඩාව පෙර ඉදිරිපත් අවශ්ය වේ
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,රැකියාවක් සඳහා අයදුම්කරු.
 DocType: Purchase Order Item,Warehouse and Reference,ගබඩාවක් සහ විමර්ශන
 DocType: Supplier,Statutory info and other general information about your Supplier,ව්යවස්ථාපිත තොරතුරු හා ඔබගේ සැපයුම්කරු ගැන අනෙක් සාමාන්ය තොරතුරු
-apps/erpnext/erpnext/hooks.py +88,Addresses,ලිපින
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,සැපයුම්කරු&gt; සැපයුම්කරු වර්ගය
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +212,Against Journal Entry {0} does not have any unmatched {1} entry,ජර්නල් සටහන් {0} එරෙහිව කිසිදු අසමසම {1} ප්රවේශය නොමැති
+apps/erpnext/erpnext/hooks.py +95,Addresses,ලිපින
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +215,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,විෂය හෝ ගබඩා මත පදනම් පෙරහන සකස් කරන්න
 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,බේරාගන්න සහ පනත් කෙටුම්පත
@@ -1583,11 +1598,10 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,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 +731,Payment,ගෙවීම
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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: Pricing Rule,Brand,වෙළඳ නාමය
 DocType: Course,Course Abbreviation,පාඨමාලා කෙටි යෙදුම්
 DocType: Item,Will also apply for variants,ද ප්රභේද සඳහා අයදුම් කරනු ඇත
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +142,"Asset cannot be cancelled, as it is already {0}","එය {0} දැනටමත් ලෙස වත්කම්, අවලංගු කල නොහැක"
@@ -1599,7 +1613,7 @@
 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.","ඔබ මිලදී ගැනීමට හෝ විකිණීමට ඇති ඔබේ නිෂ්පාදන හෝ සේවා ලැයිස්තුගත කරන්න. ඔබ ආරම්භ කරන විට විෂය සමූහය, නු සහ අනෙකුත් ගුණාංග ඒකකය පරීක්ෂා කිරීමට වග බලා ගන්න."
 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 +85,Associate,ආශ්රිත
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,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 ලැයිස්තුව නිර්මාණය
@@ -1607,7 +1621,7 @@
 DocType: Production Planning Tool,Material Requests,ද්රව්ය ඉල්ලීම්
 DocType: Warranty Claim,Issue Date,නිකුත් කල දිනය
 DocType: Activity Cost,Activity Cost,ලද වියදම
-DocType: Timesheet Detail,Timesheet Detail,Timesheet විස්තර
+DocType: Sales Invoice Timesheet,Timesheet Detail,Timesheet විස්තර
 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),"මෙම පැකේජය මෙම බෙදාහැරීමේ කොටසක් බව පෙන්නුම් කරයි (පමණක් කෙටුම්පත),"
@@ -1630,6 +1644,7 @@
 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,ප්රභේද ඇත
 DocType: Monthly Distribution,Name of the Monthly Distribution,මාසික බෙදාහැරීම් නම
 DocType: Sales Person,Parent Sales Person,මව් විකුණුම් පුද්ගලයෙක්
@@ -1642,30 +1657,31 @@
 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 +44,"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/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.,ඔබ විකුණුම් ඉන්වොයිසිය බේරා වරක් වචන දෘශ්යමාන වනු ඇත.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +502,Error: {0} &gt; {1},දෝෂය: {0}&gt; {1}
 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.,හදුන්වන අරඹන්න දිනය කාලීන සම්බන්ධකම් කිරීමට (අධ්යයන වර්ෂය {}) අධ්යයන වසරේ වසරේ ආරම්භය දිනය වඩා කලින් විය නොහැක. දින වකවානු නිවැරදි කර නැවත උත්සාහ කරන්න.
 DocType: Naming Series,Current Value,වත්මන් වටිනාකම
-apps/erpnext/erpnext/controllers/accounts_controller.py +235,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,දිනය {0} සඳහා බහු පිස්කල් අවුරුදු පවතී. රාජ්ය මූල්ය වර්ෂය තුළ දී සමාගමේ සකස් කරන්න
+apps/erpnext/erpnext/controllers/accounts_controller.py +238,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 +458,Item table can not be blank,අයිතමය වගුව හිස් විය නොහැක
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +443,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 +5,This is based on stock movement. See {0} for details,මෙම කොටස් ව්යාපාරය මත පදනම් වේ. බලන්න {0} විස්තර සඳහා
 DocType: Pricing Rule,Selling,විකිණීම
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +341,Amount {0} {1} deducted against {2},මුදල {0} {1} {2} එරෙහිව අඩු
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +344,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,"නියමිත දිනය දිනය ගිය තැන, ශ්රී ලංකා තැපෑල පෙර විය නොහැකි"
@@ -1680,8 +1696,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +144,Cannot refer row number greater than or equal to current row number for this Charge type,මෙම ගාස්තු වර්ගය සඳහා විශාල හෝ වත්මන් පේළිය සංඛ්යාවට සමාන පේළිය අංකය යොමු නො හැකි
 DocType: Asset,Sold,අලෙවි
 ,Item-wise Purchase History,අයිතමය ප්රඥාවන්ත මිලදී ගැනීම ඉතිහාසය
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Red,රතු
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},අනු අංකය බැරිතැන &#39;උත්පාදනය උපෙල්ඛනෙය්&#39; මත ක්ලික් කරන්න අයිතමය {0} වෙනුවෙන් එකතු
+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,විවෘත නිෂ්පාදන නියෝග
 DocType: Sales Invoice Payment,Base Amount (Company Currency),මූලික මුදල (සමාගම ව්යවහාර මුදල්)
@@ -1689,7 +1705,7 @@
 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,මෙම සමාගම වෙනුවෙන් සියලු ගනුදෙනු Delete
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +187,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,ෙරෝ # {0}: මෙහෙයුම {1} {2} නිෂ්පාදන න්යාය # {3} තුළ නිමි භාණ්ඩ යවන ලද සඳහා අවසන් නැත. වේලාව ලඝු-සටහන් හරහා ක්රියාත්මක තත්වය යාවත් කාලීන කරන්න
+apps/erpnext/erpnext/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} තුළ නිමි භාණ්ඩ යවන ලද සඳහා අවසන් නැත. වේලාව ලඝු-සටහන් හරහා ක්රියාත්මක තත්වය යාවත් කාලීන කරන්න
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,ආයෝජන
 DocType: Issue,Resolution Details,යෝජනාව විස්තර
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,ප්රතිපාදන
@@ -1725,16 +1741,17 @@
 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}
 DocType: Delivery Note,Excise Page Number,සුරාබදු පිටු අංකය
 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;වත්කම් ක්ෂය පිරිවැය මධ්යස්ථානය පිහිටුවා කරුණාකර
 ,Maintenance Schedules,නඩත්තු කාලසටහන
 DocType: Task,Actual End Date (via Time Sheet),(කාල පත්රය හරහා) සැබෑ අවසානය දිනය
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Amount {0} {1} against {2} {3},මුදල {0} {1} {2} {3} එරෙහිව
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +339,Amount {0} {1} against {2} {3},මුදල {0} {1} {2} {3} එරෙහිව
 ,Quotation Trends,උද්ධෘත ප්රවණතා
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},අයිතමය {0} සඳහා අයිතමය ස්වාමියා සඳහන් කර නැත අයිතමය සමූහ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +295,Debit To account must be a Receivable account,ගිණුමක් සඳහා ඩෙබිට් වූ ලැබිය යුතු ගිණුම් විය යුතුය
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Receivable account,ගිණුමක් සඳහා ඩෙබිට් වූ ලැබිය යුතු ගිණුම් විය යුතුය
 DocType: Shipping Rule Condition,Shipping Amount,නැව් ප්රමාණය
 ,Pending Amount,විභාග මුදල
 DocType: Purchase Invoice Item,Conversion Factor,පරිවර්තන සාධකය
@@ -1742,10 +1759,10 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +137,Expected value after useful life must be greater than or equal to {0},ප්රයෝජනවත් ආයු පසු අපේක්ෂිත අගයට වඩා විශාල හෝ {0} වෙත සමාන විය යුතුයි
 DocType: Purchase Receipt,Vehicle Number,වාහන අංක
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,පුනරාවර්තනය ඉන්වොයිස් මත නැවතුම් වනු ඇත දිනය
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +90,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,මුළු වෙන් කොළ {0} කාලය සඳහා දැනටමත් අනුමැතිය කොළ {1} ට වඩා අඩු විය නොහැක
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +93,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 +22,Enter Paid Amount,ු ර් ඇතුලත් කරන්න
+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,බහු-පෙළ ලේඛණය භාවිතා කරන්න
@@ -1755,13 +1772,15 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,Timesheets
 DocType: HR Settings,HR Settings,මානව සම්පත් සැකසුම්
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Expense Claim is pending approval. Only the Expense Approver can update status.,වියදම් හිමිකම් අනුමැතිය විභාග වෙමින් පවතී. මෙම වියදම් Approver පමණක් තත්ත්වය යාවත්කාලීන කළ හැකිය.
+DocType: Email Digest,New Expenses,නව වියදම්
 DocType: Purchase Invoice,Additional Discount Amount,අතිරේක වට්ටම් මුදල
-apps/erpnext/erpnext/controllers/accounts_controller.py +524,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","ෙරෝ # {0}: යවන ලද 1, අයිතමය ස්ථාවර වත්කම්වල පරිදි විය යුතුය. බහු යවන ලද සඳහා වෙනම පේළි භාවිතා කරන්න."
+apps/erpnext/erpnext/controllers/accounts_controller.py +527,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","ෙරෝ # {0}: යවන ලද 1, අයිතමය ස්ථාවර වත්කම්වල පරිදි විය යුතුය. බහු යවන ලද සඳහා වෙනම පේළි භාවිතා කරන්න."
 DocType: Leave Block List Allow,Leave Block List Allow,වාරණ ලැයිස්තුව තබන්න ඉඩ දෙන්න
 apps/erpnext/erpnext/setup/doctype/company/company.py +249,Abbr can not be blank or space,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/stock/get_item_details.py +123,Please specify Company,සමාගම සඳහන් කරන්න
 ,Customer Acquisition and Loyalty,පාරිභෝගික අත්කරගැනීම සහ සහෘද
@@ -1772,17 +1791,19 @@
 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 +183,Closing (Opening + Totals),වැසීම (+ එකතූන් විවෘත)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),වැසීම (+ එකතූන් විවෘත)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,සමාගම මුදල් නියම කරන්න
 DocType: Workstation,Wages per hour,පැයට වැටුප්
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +50,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,පහත සඳහන් ද්රව්ය ඉල්ලීම් අයිතමය යලි සඳහා මට්ටම මත පදනම්ව ස්වයංක්රීයව ඉහළ නංවා තිබෙනවා
-apps/erpnext/erpnext/controllers/accounts_controller.py +272,Account {0} is invalid. Account Currency must be {1},ගිණුම {0} වලංගු නැත. ගිණුම ව්යවහාර මුදල් විය යුතුය {1}
+DocType: Email Digest,Pending Sales Orders,විභාග විකුණුම් නියෝග
+apps/erpnext/erpnext/controllers/accounts_controller.py +275,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 +956,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","ෙරෝ # {0}: විමර්ශන ලේඛන වර්ගය විකුණුම් සාමය, විකුණුම් ඉන්වොයිසිය හෝ ජර්නල් Entry එකක් විය යුතුය"
-DocType: Salary Slip,Deduction,අඩු කිරීම්
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +87,Row {0}: From Time and To Time is mandatory.,ෙරෝ {0}: කාලය හා කලට අනිවාර්ය වේ.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +969,"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 +111,Row {0}: From Time and To Time is mandatory.,ෙරෝ {0}: කාලය හා කලට අනිවාර්ය වේ.
+DocType: Stock Reconciliation Item,Amount Difference,මුදල වෙනස
 apps/erpnext/erpnext/stock/get_item_details.py +262,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 +7,Please enter Employee Id of this sales person,මෙම අලෙවි පුද්ගලයා සේවක අංකය ඇතුල් කරන්න
@@ -1790,7 +1811,7 @@
 DocType: Project,% Tasks Completed,% කර්තව්යයෝ සම්පූර්ණ
 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 +194,Please enter Production Item first,නිෂ්පාදන අයිතමය පළමු ඇතුලත් කරන්න
+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,ආබාධිත පරිශීලක
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,උද්ධෘත
@@ -1799,53 +1820,54 @@
 DocType: Maintenance Visit,Maintenance User,නඩත්තු පරිශීලක
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +149,Cost Updated,පිරිවැය යාවත්කාලීන කිරීම
 DocType: Employee,Date of Birth,උපන්දිනය
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +86,Item {0} has already been returned,අයිතමය {0} දැනටමත් ආපසු යවා ඇත
+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 සහතිකය
+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 +177,Job Description,රැකියා විස්තරය
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,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 +126,"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 +127,"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.","විකුණුම් ප්රචාරණ ව්යාපාර පිළිබඳ වර්තාවක් තබා ගන්න. ආදර්ශ පිළිබඳ වාර්තා, මිල ගණන්, විකුණුම් සාමය ආදිය ප්රචාරණ ව්යාපාර සිට ආයෝජන මත ප්රතිලාභ තක්සේරු කිරීමට තබා ගන්න."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +24,Welcome to POS: Create your POS Profile,POS වෙත ඔබව සාදරයෙන් පිළිගනිමු: ඔබේ POS නරඹන්න නිර්මාණය
 DocType: Expense Claim,Approver,Approver
 ,SO Qty,SO යවන ලද
+DocType: Guardian,Work Address,වැඩ ලිපිනය
 DocType: Appraisal,Calculate Total Score,මුළු ලකුණු ගණනය
 DocType: Request for Quotation,Manufacturing Manager,නිෂ්පාදන කළමනාකරු
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},අනු අංකය {0} {1} දක්වා වගකීමක් යටතේ
+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 +74,Shipments,භාණ්ඩ නිකුත් කිරීම්
+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 +153,Row # ,ෙරෝ #
+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 +156,Get From,සිට ලබා ගන්න
+apps/erpnext/erpnext/public/js/utils.js +167,Get From,සිට ලබා ගන්න
 DocType: C-Form,Quarter,කාර්තුවේ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Miscellaneous Expenses,විවිධ වියදම්
 DocType: Global Defaults,Default Company,පෙරනිමි සමාගම
 apps/erpnext/erpnext/controllers/stock_controller.py +167,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,වියදම් හෝ වෙනසක් ගිණුමක් අයිතමය {0} එය බලපෑම් ලෙස සමස්ත කොටස් අගය සඳහා අනිවාර්ය වේ
-apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","{0} පේළියේ {1} {2} වඩා වැඩි අයිතමය සඳහා overbill නොහැක. overbilling ඉඩ, කරුණාකර කොටස් සැකසුම් සකස්"
+apps/erpnext/erpnext/controllers/accounts_controller.py +419,"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,-ඉහත
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} is disabled,පරිශීලක {0} අක්රීය
 DocType: Leave Application,Total Leave Days,මුළු නිවාඩු දින
 DocType: Email Digest,Note: Email will not be sent to disabled users,සටහන: විද්යුත් තැපෑල ආබාධිත පරිශීලකයන් වෙත යවනු නොලැබේ
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,සමාගම තෝරන්න ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,සියළුම දෙපාර්තමේන්තු සඳහා සලකා නම් හිස්ව තබන්න
 apps/erpnext/erpnext/config/hr.py +171,"Types of employment (permanent, contract, intern etc.).","රැකියා ආකාර (ස්ථිර, කොන්ත්රාත්, සීමාවාසික ආදිය)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +346,{0} is mandatory for Item {1},{0} අයිතමය {1} සඳහා අනිවාර්ය වේ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,{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",කරුණාකර බෙ එක් පේළිය වෙන් කළ මුදල ඉන්වොයිසිය වර්ගය හා ඉන්වොයිසිය අංකය තෝරා
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,නව මිලදී ගැනීමේ පිරිවැය
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},විෂය {0} සඳහා අවශ්ය විකුණුම් න්යාය
 DocType: Purchase Invoice Item,Rate (Company Currency),අනුපාතිකය (සමාගම ව්යවහාර මුදල්)
-apps/erpnext/erpnext/demo/setup_data.py +360,Others,අන් අය
+DocType: Student Guardian,Others,අන් අය
 DocType: Payment Entry,Unallocated Amount,වෙළුමේ ප්රමාණය
 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,බදු හා බදු ගාස්තු
@@ -1865,17 +1887,16 @@
 apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,Serialized බඩු තොග
 DocType: Activity Type,Default Billing Rate,පෙරනිමි බිල් අනුපාත
 DocType: Sales Invoice,Total Billing Amount,මුළු බිල්පත් ප්රමාණය
-apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +54,Receivable Account,ලැබිය යුතු ගිණුම්
-apps/erpnext/erpnext/controllers/accounts_controller.py +546,Row #{0}: Asset {1} is already {2},ෙරෝ # {0}: වත්කම් {1} දැනටමත් {2}
+apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,ලැබිය යුතු ගිණුම්
+apps/erpnext/erpnext/controllers/accounts_controller.py +549,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 +79,CEO,විධායක නිලධාරී
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,විධායක නිලධාරී
 DocType: Expense Claim Detail,Expense Claim Detail,වියදම් හිමිකම් විස්තර
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +808,Please select correct account,කරුණාකර නිවැරදි ගිණුම තෝරා
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +809,Please select correct account,කරුණාකර නිවැරදි ගිණුම තෝරා
 DocType: Item,Weight UOM,සිරුරේ බර UOM
 DocType: Salary Structure Employee,Salary Structure Employee,වැටුප් ව්යුහය සේවක
 DocType: Employee,Blood Group,ලේ වර්ගය
-DocType: Purchase Invoice Item,Page Break,පිටු කඩනය
 DocType: Production Order Operation,Pending,විභාග
 DocType: Course,Course Name,පාඨමාලා නම
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"නිශ්චිත සේවක නිවාඩු අයදුම්පත් අනුමත කළ හැකි ද කරන භාවිතා කරන්නන්,"
@@ -1884,14 +1905,15 @@
 DocType: Fiscal Year,Companies,සමාගම්
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,ඉලෙක්ට්රොනික උපකරණ
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,කොටස් නැවත පිණිස මට්ටමේ වූ විට ද්රව්ය ඉල්ලීම් මතු
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Full-time,පූර්ණ කාලීන
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,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: 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,මුළු එන අගය
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Debit To is required,ඩෙබිට් කිරීම අවශ්ය වේ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +321,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,තත්ත්ව කළමනාකාර
@@ -1899,6 +1921,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/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,මුළු ඉන්වොයිස් ඒඑම්ටී
@@ -1909,18 +1932,17 @@
 DocType: Production Order Operation,Completed Qty,අවසන් යවන ලද
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"For {0}, only debit accounts can be linked against another credit entry","{0} සඳහා, ඩෙබිට් ගිණුම් වලට පමණක් තවත් ණය ප්රවේශය හා සම්බන්ධ කර ගත හැකි"
 apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,මිල ලැයිස්තුව {0} අක්රීය කර ඇත
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +99,Row {0}: Completed Qty cannot be more than {1} for operation {2},ෙරෝ {0}: සම්පූර්ණ කරන යවන ලද මෙහෙයුම් සඳහා {1} වඩා වැඩි {2} විය නොහැකි
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +123,Row {0}: Completed Qty cannot be more than {1} for operation {2},ෙරෝ {0}: සම්පූර්ණ කරන යවන ලද මෙහෙයුම් සඳහා {1} වඩා වැඩි {2} විය නොහැකි
 DocType: Manufacturing Settings,Allow Overtime,අතිකාල ඉඩ දෙන්න
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} අයිතමය {1} සඳහා අවශ්ය අනු ගණන්. ඔබ {2} විසින් ජනතාවට ලබා දී ඇත.
 DocType: Stock Reconciliation Item,Current Valuation Rate,වත්මන් තක්සේරු අනුපාත
 DocType: Item,Customer Item Codes,පාරිභෝගික අයිතමය කේත
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,විනිමය ලාභ / අඞු කිරීමට
 DocType: Opportunity,Lost Reason,අහිමි හේතුව
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,කරුණාකර Setup&gt; අංක ශ්රේණි හරහා පැමිණීම සඳහා පිහිටුවීම් අංක මාලාවක්
 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/purchase_receipt/purchase_receipt.py +378,All items have already been invoiced,සියලු අයිතම දැනටමත් ඉන්වොයිස් කර ඇත
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +379,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,බාහිර
@@ -1936,18 +1958,19 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,ඔබගේ ගනුදෙනුකරුවන්
 apps/erpnext/erpnext/projects/doctype/project/project.py +141,You have been invited to collaborate on the project: {0},ඔබ මෙම ව්යාපෘතිය පිළිබඳව සහයෝගයෙන් කටයුතු කිරීමට ආරාධනා කර ඇත: {0}
 DocType: Leave Block List Date,Block Date,වාරණ දිනය
-apps/erpnext/erpnext/templates/generators/job_opening.html +19,Apply Now,දැන් ඉල්ලුම් කරන්න
+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."
 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,ගොඩනැගිලි
-apps/erpnext/erpnext/utilities/doctype/address/address.py +164,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,පෙරනිමි ලිපිනය සැකිල්ල සොයා ගත නොහැකි විය. Setup&gt; මුද්රණ හා ෙවළඳ නාමකරණ&gt; ලිපිනය සැකිල්ල අලුත් එකක් නිර්මාණය කරන්න.
 DocType: Fee Structure,Fee Structure,ගාස්තු ව්යුහය
 DocType: Timesheet Detail,Costing Amount,මුදල ක වියදමින්
+DocType: Student Admission,Application Fee,අයදුම් කිරීමේ ගාස්තුව
 DocType: Process Payroll,Submit Salary Slip,වැටුප පුරවා ඉදිරිපත්
-apps/erpnext/erpnext/controllers/selling_controller.py +161,Maxiumm discount for Item {0} is {1}%,විෂය {0} සඳහා Maxiumm වට්ටමක් {1}% ක්
+apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,විෂය {0} සඳහා Maxiumm වට්ටමක් {1}% ක්
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,තොග ආනයන
 DocType: Sales Partner,Address & Contacts,ලිපිනය සහ අප අමතන්න
 DocType: SMS Log,Sender Name,යවන්නාගේ නම
@@ -1972,21 +1995,21 @@
 DocType: Serial No,Delivery Time,භාරදීමේ වේලාව
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,වයස්ගතවීම ආශ්රිත දා
 DocType: Item,End of Life,ජීවිතයේ අවසානය
-apps/erpnext/erpnext/demo/setup_data.py +361,Travel,ගමන්
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +155,No active or default Salary Structure found for employee {0} for the given dates,ලබා දී දින සඳහා සේවක {0} සඳහා සොයා ගත නොහැකි විය සකිය ෙහෝ පෙරනිමි වැටුප් ව්යුහය
+apps/erpnext/erpnext/demo/setup/setup_data.py +304,Travel,ගමන්
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +167,No active or default Salary Structure found for employee {0} for the given dates,ලබා දී දින සඳහා සේවක {0} සඳහා සොයා ගත නොහැකි විය සකිය ෙහෝ පෙරනිමි වැටුප් ව්යුහය
 DocType: Leave Block List,Allow Users,පරිශීලකයන් ඉඩ දෙන්න
 DocType: Purchase Order,Customer Mobile No,පාරිභෝගික ජංගම නොමැත
 DocType: Sales Invoice,Recurring,පුනරාවර්තනය
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,නිෂ්පාදන ක්ෂේත්රය තුළට හෝ කොට්ඨාශ සඳහා වෙන වෙනම ආදායම් සහ වියදම් නිරීක්ෂණය කරන්න.
 DocType: Rename Tool,Rename Tool,මෙවලම නැවත නම් කරන්න
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +23,Update Cost,යාවත්කාලීන වියදම
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,යාවත්කාලීන වියදම
 DocType: Item Reorder,Item Reorder,අයිතමය සීරුමාරු කිරීමේ
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +36,Show Salary Slip,වැටුප පුරවා පෙන්වන්න
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +748,Transfer Material,ද්රව්ය මාරු
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +53,Show Salary Slip,වැටුප පුරවා පෙන්වන්න
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +166,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 +923,Please set recurring after saving,ඉතිරි පසු නැවත නැවත සකස් කරන්න
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +646,Select change amount account,වෙනස් මුදල ගිණුම තෝරන්න
+apps/erpnext/erpnext/public/js/controllers/transaction.js +914,Please set recurring after saving,ඉතිරි පසු නැවත නැවත සකස් කරන්න
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +703,Select change amount account,වෙනස් මුදල ගිණුම තෝරන්න
 DocType: Purchase Invoice,Price List Currency,මිල ලැයිස්තුව ව්යවහාර මුදල්
 DocType: Naming Series,User must always select,පරිශීලක සෑම විටම තෝරාගත යුතුය
 DocType: Stock Settings,Allow Negative Stock,ඍණ කොටස් ඉඩ දෙන්න
@@ -1998,31 +2021,32 @@
 DocType: Quality Inspection,Verified By,වන විට තහවුරු කර
 DocType: Address,Subsidiary,අනුබද්ධිත සමාගමක්
 apps/erpnext/erpnext/setup/doctype/company/company.py +64,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","දැනට පවතින ගනුදෙනු නැති නිසා, සමාගම පෙරනිමි මුදල් වෙනස් කළ නොහැක. ගනුදෙනු පෙරනිමි මුදල් වෙනස් කිරීමට අවලංගු කළ යුතුය."
+DocType: Grade Interval,Grade Description,ශ්රේණියේ විස්තරය
 DocType: Quality Inspection,Purchase Receipt No,මිලදී ගැනීම රිසිට්පත නොමැත
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,අර්නස්ට් මුදල්
 DocType: Process Payroll,Create Salary Slip,වැටුප පුරවා නිර්මාණය
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +33,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 +352,Quantity in row {0} ({1}) must be same as manufactured quantity {2},පේළියේ ප්රමාණය {0} ({1}) නිෂ්පාදනය ප්රමාණය {2} ලෙස සමාන විය යුතුයි
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Quantity in row {0} ({1}) must be same as manufactured quantity {2},පේළියේ ප්රමාණය {0} ({1}) නිෂ්පාදනය ප්රමාණය {2} ලෙස සමාන විය යුතුයි
 DocType: Appraisal,Employee,සේවක
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,පරිශීලක ලෙස ආරාධනා
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} සම්පූර්ණයෙන්ම ගෙවිය යුතුය
 DocType: Workstation Working Hour,End Time,අවසන් කාල
 DocType: Payment Entry,Payment Deductions or Loss,ගෙවීම් අඩු කිරීම් හෝ අඞු කිරීමට
-apps/erpnext/erpnext/config/schools.py +100,LMS,LMS
+apps/erpnext/erpnext/config/schools.py +104,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,විකුණුම් නල
 DocType: Student Batch Student,Student Batch Student,ශිෂ්ය කණ්ඩායම ශිෂ්ය
-DocType: Sales Invoice,Mass Mailing,ජනමාධ්ය තැපැල්
+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 +199,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/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 +297,Salary Slip of employee {0} already created for this period,සේවක වැටුප් පුරවා {0} දැනටමත් මෙම කාල සීමාව සඳහා නිර්මාණය
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Pharmaceutical,ඖෂධ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +309,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/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,ක්රෙඩිට් කිරීම
@@ -2037,27 +2061,28 @@
 DocType: Upload Attendance,Attendance To Date,දිනය සඳහා සහභාගී
 DocType: Warranty Claim,Raised By,විසින් මතු
 DocType: Payment Gateway Account,Payment Account,ගෙවීම් ගිණුම
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +814,Please specify Company to proceed,ඉදිරියට සමාගම සඳහන් කරන්න
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +793,Please specify Company to proceed,ඉදිරියට සමාගම සඳහන් කරන්න
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Receivable,ලැබිය යුතු ගිණුම් ශුද්ධ වෙනස්
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Compensatory Off,Off වන්දි
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,Off වන්දි
 DocType: Quality Inspection Reading,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.,ඔබට නිසැකවම මෙම සමාගම සඳහා වන සියළුම ගනුදෙනු මැකීමට අවශ්ය බවට තහවුරු කරගන්න. එය ඔබගේ ස්වාමියා දත්ත පවතිනු ඇත. මෙම ක්රියාව නැති කළ නොහැක.
 DocType: Room,Room Number,කාමර අංකය
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},වලංගු නොවන සමුද්දේශ {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +161,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) නිෂ්පාදන න්යාය {3} සැලසුම් quanitity ({2}) ට වඩා වැඩි විය නොහැක
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +162,{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 +217,Raw Materials cannot be blank.,", අමු ද්රව්ය, හිස් විය නොහැක."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,"Could not update stock, invoice contains drop shipping item.",", කොටස් යාවත්කාලීන නොවන ඉන්වොයිස් පහත නාවික අයිතමය අඩංගු විය."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +460,Quick Journal Entry,ඉක්මන් ජර්නල් සටහන්
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +111,You can not change rate if BOM mentioned agianst any item,ඔබ අනුපාතය වෙනස් කළ නොහැක ද්රව්ය ලේඛණය යම් භාණ්ඩයක agianst සඳහන් නම්
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +441,"Could not update stock, invoice contains drop shipping item.",", කොටස් යාවත්කාලීන නොවන ඉන්වොයිස් පහත නාවික අයිතමය අඩංගු විය."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Quick Journal Entry,ඉක්මන් ජර්නල් සටහන්
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +103,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 +214,{0} {1} is not submitted,{0} {1} ඉදිරිපත් කර නැත
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,භාණ්ඩ සඳහා වන ඉල්ලීම්.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,එක් එක් හොඳ අයිතමය අවසන් සඳහා වෙනම නිෂ්පාදනය සඳහා නිර්මාණය කරනු ඇත.
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +121,{0} must be negative in return document,{0} ආපසු ලියවිල්ල තුල සෘණාත්මක විය යුතුය
 ,Minutes to First Response for Issues,ගැටළු සඳහා පළමු ප්රතිචාර සඳහා විනාඩි
 DocType: Purchase Invoice,Terms and Conditions1,නියමයන් හා Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,ඔබ මෙම පද්ධතිය සකස්කර සඳහා ආයතනයේ නම.
@@ -2066,16 +2091,17 @@
 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 +398,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 +739,Item or Warehouse for row {0} does not match Material Request,විරසකයන් අයිතමය හෝ ගබඩා {0} ද්රව්ය ඉල්ලීම් නොගැලපේ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +747,Item or Warehouse for row {0} does not match Material Request,විරසකයන් අයිතමය හෝ ගබඩා {0} ද්රව්ය ඉල්ලීම් නොගැලපේ
 apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,නු ඒකකය
 DocType: Fiscal Year,Year End Date,වසර අවසාන දිනය
 DocType: Task Depends On,Task Depends On,කාර්ය සාධක මත රඳා පවතී
-DocType: Lead,Opportunity,අවස්ථාවක්
+DocType: Supplier Quotation,Opportunity,අවස්ථාවක්
 ,Completed Production Orders,සම්පූර්ණ කරන ලද නිෂ්පාදන නියෝග
 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,පෙරනිමි වර්ක්ස්ටේෂන්
@@ -2088,7 +2114,7 @@
 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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},නඩත්තු ආරම්භක දිනය අනු අංකය {0} සඳහා බෙදාහැරීමේ දිනට පෙර විය නොහැකි
+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,සැබෑ අවසානය දිනය
 DocType: Purchase Invoice,PINV-,PINV-
 DocType: Authorization Rule,Applicable To (Role),(අයුරු) කිරීම සඳහා අදාළ
@@ -2103,7 +2129,7 @@
 DocType: SMS Log,No of Requested SMS,ඉල්ලන කෙටි පණිවුඩ අංක
 DocType: Campaign,Campaign-.####,ව්යාපාරය -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,ඊළඟ පියවර
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,Please supply the specified items at the best possible rates,හැකි හොඳම මිලකට නිශ්චිතව දක්වා ඇති අයිතම සැපයීමට කරුණාකර
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +695,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 +117,Contract End Date must be greater than Date of Joining,කොන්ත්රාත්තුව අවසානය දිනය සමඟ සම්බන්ධවීම දිනය වඩා වැඩි විය යුතුය
 DocType: Delivery Note,DN-,DN-
@@ -2112,7 +2138,7 @@
 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 +14,This is an example website auto-generated from ERPNext,මෙම ERPNext සිට ස්වයංක්රීය-ජනනය උදාහරණයක් වෙබ් අඩවිය
+apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,මෙම ERPNext සිට ස්වයංක්රීය-ජනනය උදාහරණයක් වෙබ් අඩවිය
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,වයස්ගතවීම රංගේ 1
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
@@ -2139,13 +2165,14 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd ප්රමාණ
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +54,Fee Records Created - {0},නිර්මාණය කරන ලද්දේ ගාස්තු වාර්තා - {0}
 DocType: Asset Category Account,Asset Category Account,වත්කම් ප්රවර්ගය ගිණුම්
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +103,Cannot produce more Item {0} than Sales Order quantity {1},විකුණුම් සාමය ප්රමාණය {1} වඩා වැඩි අයිතමය {0} බිහි කිරීමට නොහැක
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Stock Entry {0} is not submitted,කොටස් Entry {0} ඉදිරිපත් කර නැත
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},විකුණුම් සාමය ප්රමාණය {1} වඩා වැඩි අයිතමය {0} බිහි කිරීමට නොහැක
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +505,Stock Entry {0} is not submitted,කොටස් Entry {0} ඉදිරිපත් කර නැත
 DocType: Payment Reconciliation,Bank / Cash Account,බැංකුව / මුදල් ගිණුම්
 DocType: Tax Rule,Billing City,බිල්පත් නගරය
 DocType: Salary Component Account,Salary Component Account,වැටුප් සංරචක ගිණුම
 DocType: Global Defaults,Hide Currency Symbol,ව්යවහාර මුදල් සංකේතය සඟවන්න
 apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card","උදා: බැංකුව, මුදල්, ක්රෙඩිට් කාඩ්"
+DocType: Lead Source,Source Name,මූලාශ්රය නම
 DocType: Journal Entry,Credit Note,ක්රෙඩිට් සටහන
 DocType: Warranty Claim,Service Address,සේවා ලිපිනය
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furnitures and Fixtures,ගෘහ භාණ්ඞ සහ සවිකිරීම්
@@ -2157,6 +2184,7 @@
 DocType: Opportunity,Customer / Lead Name,ගණුදෙනුකරු / ඊයම් නම
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +89,Clearance Date not mentioned,නිශ්කාශනෙය් දිනය සඳහන් නොවීම
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,නිෂ්පාදනය
+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/controllers/trends.py +19,Total(Qty),එකතුව (යවන ලද)
 DocType: Sales Invoice,This Document,මෙම ලේඛන
@@ -2168,15 +2196,15 @@
 DocType: Purchase Receipt,Time at which materials were received,කවෙර්ද ද්රව්ය ලැබුණු කාලය
 DocType: Stock Ledger Entry,Outgoing Rate,පිටතට යන අනුපාතය
 apps/erpnext/erpnext/config/hr.py +176,Organization branch master.,සංවිධානය ශාඛා ස්වාමියා.
-apps/erpnext/erpnext/controllers/accounts_controller.py +273, or ,හෝ
+apps/erpnext/erpnext/controllers/accounts_controller.py +276, 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 +203,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,ෙරෝ # {0}: ජර්නල් සටහන් {1} ගිණුම {2} හෝ දැනටමත් වෙනත් වවුචරය ගැලපීම නැත
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +206,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 +90,No employee for the above selected criteria OR salary slip already created,ඉහත තෝරාගත් නිර්ණායක හෝ වැටුප් ස්ලිප් සඳහා කිසිදු සේවකයෙකුට දැනටමත් නිර්මාණය
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +93,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,ගෙවීම් වර්ගය
@@ -2204,8 +2232,8 @@
 DocType: Product Bundle,Parent Item,මව් අයිතමය
 DocType: Account,Account Type,ගිණුම් වර්ගය
 DocType: Delivery Note,DN-RET-,ඩී.එන්-RET-
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +115,Leave Type {0} cannot be carry-forwarded,"වර්ගය අවසරය, {0} ගෙන-ඉදිරිපත් කළ නොහැකි"
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',නඩත්තු උපෙල්ඛනෙය් සියලු භාණ්ඩ සඳහා ජනනය කර නැත. &#39;උත්පාදනය උපෙල්ඛනෙය්&#39; මත ක්ලික් කරන්න
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +118,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 +163,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","{0} පේළියේ සඳහා {1} දී. {2} අයිතමය අනුපාතය, පේළි {3} ද ඇතුළත් විය යුතු අතර ඇතුළත් කිරීමට"
@@ -2217,13 +2245,13 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +32,Disabled template must not be default template,ආබාධිත සැකිල්ල පෙරනිමි සැකිලි නොවිය යුතුයි
 DocType: Account,Income Account,ආදායම් ගිණුම
 DocType: Payment Request,Amount in customer's currency,පාරිභෝගික මුදල් ප්රමාණය
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +748,Delivery,සැපයුම්
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +742,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,ප්රධාන වගකීම් ප්රදේශය
 DocType: Payment Entry,Total Allocated Amount,මුළු වෙන් කළ මුදල
 DocType: Item Reorder,Material Request Type,ද්රව්ය ඉල්ලීම් වර්ගය
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +82,Row {0}: UOM Conversion Factor is mandatory,ෙරෝ {0}: UOM පරිවර්තන සාධකය අනිවාර්ය වේ
+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,පිරිවැය මධ්යස්ථානය
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,වවුචරය #
@@ -2234,13 +2262,13 @@
 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 +90,Head of Marketing and Sales,අලෙවි සහ විකුණුම් අංශ ප්රධානී
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,ආදායම් බදු
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,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.,ධාවන කර්මාන්ත ස්වභාවය අනුව මඟ පෙන්වන.
 DocType: Item Supplier,Item Supplier,අයිතමය සැපයුම්කරු
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +403,Please enter Item Code to get batch no,කිසිදු කණ්ඩායම ලබා ගැනීමට අයිතමය සංග්රහයේ ඇතුලත් කරන්න
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +770,Please select a value for {0} quotation_to {1},කරුණාකර {0} සඳහා අගය තෝරා quotation_to {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +397,Please enter Item Code to get batch no,කිසිදු කණ්ඩායම ලබා ගැනීමට අයිතමය සංග්රහයේ ඇතුලත් කරන්න
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +764,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","පහත සඳහන් ලක්ෂණ වාර්තා දෙකම එකම නම් යනවාත් පමණි. සමූහය, රූට් වර්ගය, සමාගම,"
@@ -2252,28 +2280,29 @@
 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 +100,Issues,ගැටලු
+apps/erpnext/erpnext/hooks.py +109,Issues,ගැටලු
 apps/erpnext/erpnext/controllers/status_updater.py +13,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} අක්රීය
 DocType: Supplier,Billing Currency,බිල්පත් ව්යවහාර මුදල්
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Large,මහා පරිමාණ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,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 +507,Warning: Another {0} # {1} exists against stock entry {2},අවවාදයයි: තවත් {0} # {1} කොටස් ඇතුලත් {2} එරෙහිව පවතී
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Local,දේශීය
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +508,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),"ණය හා අත්තිකාරම්, (වත්කම්)"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,ණය ගැතියන්
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Large,මහා
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,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 +225,Total {0} ({1}),මුළු {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +224,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,පෙරනිමි තක්සේරු ක්රමය
@@ -2319,9 +2348,9 @@
 DocType: Attendance,Leave Type,වර්ගය තබන්න
 apps/erpnext/erpnext/controllers/stock_controller.py +173,Expense / Difference account ({0}) must be a 'Profit or Loss' account,වියදම් / වෙනස ගිණුම ({0}) වන &#39;ලාභය හෝ අලාභය&#39; ගිණුම් විය යුතුය
 DocType: Account,Accounts User,ගිණුම් පරිශීලක
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Name error: {0},නම දෝෂය: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +90,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 +178,{0} {1} does not associated with {2} {3},{0} {1} {2} {3} සමග සම්බන්ධ නැති
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +181,{0} {1} does not associated with {2} {3},{0} {1} {2} {3} සමග සම්බන්ධ නැති
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,සේවක {0} සඳහා සහභාගි වන විටත් ලකුණු කර ඇත
 DocType: Packing Slip,If more than one package of the same type (for print),එකම වර්ගයේ (මුද්රිත) එකකට වඩා වැඩි පැකේජය නම්
 DocType: Warehouse,Parent Warehouse,මව් ගබඩාව
@@ -2340,7 +2369,7 @@
 DocType: BOM Item,Scrap %,පරණ%
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection","ගාස්තු ඔබේ තෝරාගැනීම අනුව, අයිතමය යවන ලද හෝ මුදල මත පදනම් වන අතර සමානුපාතික බෙදා දීමට නියමිතය"
 DocType: Maintenance Visit,Purposes,අරමුණු
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,හිතුව එක් භාණ්ඩයක් ආපසු ලියවිල්ල තුල සෘණාත්මක ප්රමාණය සමඟ ඇතුළත් කළ යුතුය
+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 +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","මෙහෙයුම {0} තවදුරටත් පරිගණකය තුල {1} ඕනෑම ලබා ගත හැකි වැඩ කරන පැය වඩා, බහු මෙහෙයුම් බවට මෙහෙයුම බිඳ"
 ,Requested,ඉල්ලා
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +83,No Remarks,කිසිදු සටහන්
@@ -2352,46 +2381,46 @@
 DocType: Item,Total Projected Qty,මුලූ ව්යාපෘතිමය යවන ලද
 DocType: Monthly Distribution,Distribution Name,බෙදා හැරීම නම
 DocType: Course,Course Code,පාඨමාලා කේතය
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Quality Inspection required for Item {0},විෂය {0} සඳහා අවශ්ය තත්ත්ව පරීක්ෂක
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Quality Inspection required for Item {0},විෂය {0} සඳහා අවශ්ය තත්ත්ව පරීක්ෂක
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,පාරිභෝගික මුදල් සමාගමේ පදනම මුදල් බවට පරිවර්තනය වන අවස්ථාවේ අනුපාතය
 DocType: Purchase Invoice Item,Net Rate (Company Currency),ශුද්ධ අනුපාතිකය (සමාගම ව්යවහාර මුදල්)
 DocType: Salary Detail,Condition and Formula Help,තත්වය සහ ෆෝමියුලා උදවු
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,දේශසීමාවේ රුක් කළමනාකරණය කරන්න.
 DocType: Journal Entry Account,Sales Invoice,විකුණුම් ඉන්වොයිසිය
 DocType: Journal Entry Account,Party Balance,පක්ෂය ශේෂ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +475,Please select Apply Discount On,වට්ටම් මත ඉල්ලුම් කරන්න තෝරා
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +92,Salary Slip Created,වැටුප් පුරවා Created
+apps/erpnext/erpnext/accounts/page/pos/pos.js +464,Please select Apply Discount On,වට්ටම් මත ඉල්ලුම් කරන්න තෝරා
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +95,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,නිෂ්පාදනය සඳහා ද්රව්ය හුවමාරු
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,වට්ටමක් ප්රතිශතය ඉතා මිල ලැයිස්තුව එරෙහිව හෝ සියලුම මිල ලැයිස්තුව සඳහා එක්කෝ ඉල්ලුම් කළ හැක.
 DocType: Purchase Invoice,Half-yearly,අර්ධ වාර්ෂික
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +384,Accounting Entry for Stock,කොටස් සඳහා මුල්ය සටහන්
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +387,Accounting Entry for Stock,කොටස් සඳහා මුල්ය සටහන්
 DocType: Sales Invoice,Sales Team1,විකුණුම් Team1
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,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 +96,Row {0}: Completed Qty must be greater than zero.,ෙරෝ {0}: සම්පූර්ණ කරන යවන ලද බිංදුවට වඩා වැඩි විය යුතුය.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +120,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 +88,Row # {0}: Cannot return more than {1} for Item {2},ෙරෝ # {0}: {1} අයිතමය සඳහා {2} වඩා වැඩි ආපසු නොහැක
+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,ෙෂඩ්
 DocType: Item Group,Show this slideshow at the top of the page,පිටුවේ ඉහළ ඇති මෙම අතිබහුතරයකගේ පෙන්වන්න
 DocType: BOM,Item UOM,අයිතමය UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),වට්ටම් මුදල (සමාගම ව්යවහාර මුදල්) පසු බදු මුදල
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +147,Target warehouse is mandatory for row {0},ඉලක්ක ගබඩා සංකීර්ණය පේළිය {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,සැපයුම්කරු ලිපිනය තෝරන්න
 DocType: Quality Inspection,Quality Inspection,තත්ත්ව පරීක්ෂක
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Extra Small,අමතර කුඩා
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,Warning: Material Requested Qty is less than Minimum Order Qty,අවවාදයයි: යවන ලද ඉල්ලන ද්රව්ය අවම සාමය යවන ලද වඩා අඩු වේ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +194,Account {0} is frozen,ගිණුම {0} කැටි වේ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,අමතර කුඩා
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +690,Warning: Material Requested Qty is less than Minimum Order Qty,අවවාදයයි: යවන ලද ඉල්ලන ද්රව්ය අවම සාමය යවන ලද වඩා අඩු වේ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,ගිණුම {0} කැටි වේ
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,සංවිධානය සතු ගිණුම් වෙනම සටහන සමග නීතිමය ආයතනයක් / පාලිත.
 DocType: Payment Request,Mute Email,ගොළු විද්යුත්
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","ආහාර, බීම වර්ග සහ දුම්කොළ"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +606,Can only make payment against unbilled {0},එකම unbilled {0} එරෙහිව ගෙවීම් කරන්න පුළුවන්
-apps/erpnext/erpnext/controllers/selling_controller.py +126,Commission rate cannot be greater than 100,කොමිසම අනුපාතය 100 ට වඩා වැඩි විය නොහැක
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +609,Can only make payment against unbilled {0},එකම unbilled {0} එරෙහිව ගෙවීම් කරන්න පුළුවන්
+apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,කොමිසම අනුපාතය 100 ට වඩා වැඩි විය නොහැක
 DocType: Stock Entry,Subcontract,උප කොන්ත්රාත්තුව
 apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,{0} ඇතුලත් කරන්න පළමු
 DocType: Production Order Operation,Actual End Time,සැබෑ අවසානය කාල
@@ -2402,30 +2431,30 @@
 DocType: SMS Log,No of Sent SMS,යැවූ කෙටි පණිවුඩ අංක
 DocType: Account,Expense Account,වියදම් ගිණුම
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,මෘදුකාංග
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Colour,වර්ණ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,වර්ණ
 DocType: Maintenance Visit,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; වන අතර වෙනත් කිසිදු නිෂ්පාදන පැකේජය පවතී
 DocType: Student Log,Academic,අධ්යයන
-apps/erpnext/erpnext/controllers/accounts_controller.py +469,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),සාමය එරෙහිව මුළු අත්තිකාරම් ({0}) {1} ග්රෑන්ඩ් මුළු වඩා වැඩි ({2}) විය නොහැකි
+apps/erpnext/erpnext/controllers/accounts_controller.py +472,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),සාමය එරෙහිව මුළු අත්තිකාරම් ({0}) {1} ග්රෑන්ඩ් මුළු වඩා වැඩි ({2}) විය නොහැකි
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,අසාමාන ෙලස මාස හරහා ඉලක්ක බෙදා හැරීමට මාසික බෙදාහැරීම් තෝරන්න.
 DocType: Purchase Invoice Item,Valuation Rate,තක්සේරු අනුපාත
+DocType: Stock Reconciliation,SR/,සස /
 apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,මිල ලැයිස්තුව ව්යවහාර මුදල් තෝරා ගෙන නොමැති
 DocType: Assessment,Results,ප්රතිපල
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +168,Employee {0} has already applied for {1} between {2} and {3},සේවක {0} දැනටමත් {1} {2} සහ {3} අතර සඳහා ඉල්ලුම් කර තිබේ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +175,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: Student Applicant,Father's/ Guardian 2 Email ID,පියාගේ / භාරකරු 2 විද්යුත් හැඳුනුම්පත
 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 +228,Warehouses with existing transaction can not be converted to group.,පවත්නා ගනුදෙනුව සමග බඞු ගබඞාව පිරිසක් බවට පරිවර්තනය කළ නොහැක.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +231,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 +93,Researcher,පර්යේෂක
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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.,ලැබෙන තත්ත්ව පරීක්ෂණ.
@@ -2437,25 +2466,25 @@
 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: Sales Invoice,Advertisement,දැන්වීමක්
 DocType: Asset Category Account,Depreciation Expense Account,ක්ෂය ගෙවීමේ ගිණුම්
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Probationary Period,පරිවාස කාලය
-apps/erpnext/erpnext/hooks.py +102,Announcements,නිවේදන
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,පරිවාස කාලය
+apps/erpnext/erpnext/hooks.py +111,Announcements,නිවේදන
 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 +109,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 +16,To Datetime,දිනයවේලාව කිරීමට
+apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,දිනයවේලාව කිරීමට
 DocType: SMS Settings,SMS Gateway URL,කෙටි පණිවුඩ ගේට්වේ URL එක
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +51,Course Schedules deleted:,පාඨමාලා කාලසටහන මකා:
 apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,කෙටි පණිවිඩ බෙදා හැරීමේ තත්වය පවත්වා ගෙන යාම සඳහා ලඝු-සටහන්
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,විභාග කටයුතු
+DocType: Accounts Settings,Make Payment via Journal Entry,ජර්නල් සටහන් හරහා ගෙවීම් කරන්න
+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 +127,Please enter relieving date.,ලිහිල් දිනය ඇතුලත් කරන්න.
-apps/erpnext/erpnext/controllers/trends.py +145,Amt,ඒඑම්ටී
+apps/erpnext/erpnext/controllers/trends.py +149,Amt,ඒඑම්ටී
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,Only Leave Applications with status 'Approved' can be submitted,&#39;අනුමත&#39; පමණක් තත්ත්වය සහිත යෙදුම් තබන්න ඉදිරිපත් කළ හැක
 apps/erpnext/erpnext/utilities/doctype/address/address.py +26,Address Title is mandatory.,ලිපිනය හිමිකම් අනිවාර්ය වේ.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,පරීක්ෂණ ප්රභවය ව්යාපාරය නම් ව්යාපාරය නම ඇතුලත් කරන්න
@@ -2473,14 +2502,15 @@
 apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1},{0} {1} සඳහා විනිමය අනුපාතය සොයා ගැනීමට නොහැකි
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,මාක් අඩක් දිනය
 DocType: Sales Invoice,Sales Team,අලෙවි කණ්ඩායම
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Duplicate entry,ප්රවේශය අනුපිටපත්
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,ප්රවේශය අනුපිටපත්
 DocType: Program Enrollment Tool,Get Students,ශිෂ්ය ලබා ගන්න
 DocType: Serial No,Under Warranty,වගකීම් යටතේ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +490,[Error],[දෝෂය]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +484,[Error],[දෝෂය]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,ඔබ විකුණුම් සාමය සුරැකීමට වරක් වචන දෘශ්යමාන වනු ඇත.
 ,Employee Birthday,සේවක ජන්ම දිනය
 apps/erpnext/erpnext/controllers/status_updater.py +175,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; සමග ශාස්ත්රීය පදය. මෙම ඇතුළත් කිරීම් වෙනස් කර නැවත උත්සාහ කරන්න.
 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} නොපවතියි
@@ -2496,22 +2526,22 @@
 ,Issued Items Against Production Order,නිෂ්පාදන න්යාය එරෙහි නිකුත් කර ඇත්තේ අයිතම
 DocType: Pricing Rule,Purchase Manager,මිලදී ගැනීම කළමනාකරු
 DocType: Target Detail,Target Detail,ඉලක්ක විස්තර
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +25,All Jobs,සියලු රැකියා
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,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 +323,Amount {0} {1} {2} {3},මුදල {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,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: Supplier,Credit Limit,ණය සීමාව
 DocType: Production Plan Sales Order,Salse Order Date,Salse සාමය දිනය
 DocType: Salary Component,Salary Component,වැටුප් සංරචක
-apps/erpnext/erpnext/accounts/utils.py +372,Payment Entries {0} are un-linked,ගෙවීම් අයැදුම්පත් {0} එක්සත් ජාතීන්ගේ-බැඳී ඇත
+apps/erpnext/erpnext/accounts/utils.py +449,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,පලමු වරට පිරිනැමු පණිවුඩය හා ගෙවීම් විස්තර
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +497,Material Requests {0} created,ද්රව්ය ඉල්ලීම් {0} නිර්මාණය
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +498,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.,කොන්දේසි හෝ කොන්ත්රාත්තුව සැකිල්ල.
 DocType: Purchase Invoice,Address and Contact,ලිපිනය සහ ඇමතුම්
@@ -2550,7 +2580,7 @@
 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 +848,Paid Amount cannot be greater than total negative outstanding amount {0},ු ර් මුළු සෘණ හිඟ මුදල {0} වඩා වැඩි විය නොහැකි
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +859,Paid Amount cannot be greater than total negative outstanding amount {0},ු ර් මුළු සෘණ හිඟ මුදල {0} වඩා වැඩි විය නොහැකි
 DocType: Employee Internal Work History,Employee Internal Work History,සේවක අභ්යන්තර රැකියා ඉතිහාසය
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +233,Closing (Dr),වැසීම (ආචාර්ය)
 DocType: Cheque Print Template,Cheque Size,"එම ගාස්තුව මුදලින්, ෙචක්පතකින් තරම"
@@ -2571,7 +2601,8 @@
 ,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.
-apps/erpnext/erpnext/controllers/accounts_controller.py +555,'Update Stock' cannot be checked for fixed asset sale,&#39;යාවත්කාලීන කොටස්&#39; ස්ථාවර වත්කම් විකිණීමට සඳහා දැන්වීම් පරීක්ෂා කළ නොහැකි
+DocType: Student Guardian,Father,පියා
+apps/erpnext/erpnext/controllers/accounts_controller.py +558,'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} අවලංගු කර හෝ නතර
@@ -2581,15 +2612,15 @@
 DocType: Sales Order,Fully Delivered,සම්පූර්ණයෙන්ම භාර
 DocType: Lead,Lower Income,අඩු ආදායම්
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","ලාභය / අලාභය වෙන් කරනු ලබන වගකීම් යටතේ ගිණුම, හිස,"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +166,Source and target warehouse cannot be same for row {0},මූලාශ්රය සහ ඉලක්කය ගබඩා සංකීර්ණය පේළිය {0} සඳහා සමාන විය නොහැකි
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","මෙම කොටස් ප්රතිසන්ධාන ක විවෘත කිරීම සටහන් වන බැවින්, වෙනසක් ගිණුම, එය වත්කම් / වගකීම් වර්ගය ගිණුමක් විය යුතුය"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +81,Purchase Order number required for Item {0},විෂය {0} සඳහා අවශ්ය මිලදී ගැනීමේ නියෝගයක් අංකය
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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/purchase_receipt/purchase_receipt.py +82,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 +17,Cannot change status as student {0} is linked with student application {1},ශිෂ්ය {0} ශිෂ්ය අයදුම් {1} සම්බන්ධ වන ලෙස තත්ත්වය වෙනස් කළ නොහැක
+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: Timesheet,"List of employee which has ""Salary Slip Based on Timesheet"" is enabled in salary structure.",&quot;Timesheet මත පදනම්ව වැටුප් පුරවා&quot; වැටුප් ව්යුහය තුළ සක්රීය වේ ඇති සේවක ලැයිස්තුව.
 DocType: Asset,Fully Depreciated,සම්පූර්ණෙයන් ක්ෂය
 ,Stock Projected Qty,කොටස් යවන ලද ප්රක්ෂේපිත
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Customer {0} does not belong to project {1},පාරිභෝගික {0} ව්යාපෘති {1} අයිති නැති
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,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,අනු අංකය හා කණ්ඩායම
@@ -2601,7 +2632,7 @@
 DocType: Purchase Invoice,Purchase Taxes and Charges,මිලදී බදු හා ගාස්තු
 ,Qty to Receive,ලබා ගැනීමට යවන ලද
 DocType: Leave Block List,Leave Block List Allowed,වාරණ ලැයිස්තුව අනුමත නිවාඩු
-apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +55,All Warehouses,සියලු බඞු ගබඞාව
+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 +105,Credit To account must be a Balance Sheet account,ගිණුමක් සඳහා ක්රෙඩිට් ශේෂ පත්රය ගිණුමක් විය යුතුය
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,සියලු සැපයුම්කරු වර්ග
@@ -2613,10 +2644,10 @@
 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/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,වැටුප පුරවා ගන්න
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +26,Browse BOM,ගවේශක ද්රව්ය ලේඛණය
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,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/asset/depreciation.py +94,Please set Depreciation related Accounts in Asset Category {0} or Company {1},වත්කම් ප්රවර්ගය {0} හෝ සමාගම {1} තුළ ක්ෂය සම්බන්ධ ගිණුම් සකස් කරන්න
-DocType: Academic Year,Academic Year,අධ්යන වර්ෂය
+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,සී.ආර්.එම්
 DocType: Appraisal,Appraisal,ඇගයීෙම්
@@ -2624,12 +2655,12 @@
 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 +197,Leave approver must be one of {0},"approver අවසරය, {0} එකක් විය යුතුය"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,Leave approver must be one of {0},"approver අවසරය, {0} එකක් විය යුතුය"
 DocType: Hub Settings,Seller Email,විකුණන්නා විද්යුත්
 DocType: Project,Total Purchase Cost (via Purchase Invoice),(මිලදී ගැනීමේ ඉන්වොයිසිය හරහා) මුළු මිලදී ගැනීම පිරිවැය
 DocType: Workstation Working Hour,Start Time,ආරම්භක වේලාව
 DocType: Item Price,Bulk Import Help,තොග ආනයනය උදවු
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +256,Select Quantity,ප්රමාණ තෝරා
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +257,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,පණිවිඩය යැව්වා
@@ -2646,6 +2677,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,ඉලක්කය යවන ලද හෝ ඉලක්කය ප්රමාණය එක්කෝ අනිවාර්ය වේ.
 apps/erpnext/erpnext/config/projects.py +45,Cost of various activities,විවිධ ක්රියාකාරකම් පිරිවැය
 apps/erpnext/erpnext/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 +149,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} කට වඩා පැරණි කොටස් ගනුදෙනු යාවත්කාලීන කිරීමට අවසර නැත
 DocType: Item,Inspection Required,පරීක්ෂණ අවශ්ය
@@ -2665,7 +2697,7 @@
 DocType: Expense Claim,Approval Status,පතේ තත්වය
 DocType: Hub Settings,Publish Items to Hub,හබ් අයිතම ප්රකාශයට පත් කරනු ලබයි
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},වටිනාකම පේළිය {0} අගය කිරීමට වඩා අඩු විය යුතුය
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Wire Transfer,වයර් ට්රාන්ෆර්
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,වයර් ට්රාන්ෆර්
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,සියල්ල පරීක්ෂා කරන්න
 DocType: Sales Order,Recurring Order,පුනරාවර්තනය න්යාය
 DocType: Company,Default Income Account,පෙරනිමි ආදායම් ගිණුම
@@ -2677,21 +2709,19 @@
 ,Welcome to ERPNext,ERPNext වෙත ඔබව සාදරයෙන් පිළිගනිමු
 apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,උද්ධෘත තුඩු
 DocType: Lead,From Customer,පාරිභෝගික සිට
-apps/erpnext/erpnext/demo/setup_data.py +357,Calls,ඇමතුම්
+apps/erpnext/erpnext/demo/setup/setup_data.py +300,Calls,ඇමතුම්
 DocType: Project,Total Costing Amount (via Time Logs),(කාල ලඝු-සටහන් හරහා) මුළු සැඳුම්ලත් මුදල
 DocType: Purchase Order Item Supplied,Stock UOM,කොටස් UOM
-apps/erpnext/erpnext/stock/doctype/item/item.py +466,"As there are existing transactions for this item, \
-							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","මෙම අයිතමය සඳහා දැනට පවතින ගනුදෙනු තියෙනවා ලෙස, \ ඔබ &#39;අනු අංකය තිබෙනවාද&#39; වටිනාකම් වෙනස් කළ නොහැක &#39;කණ්ඩායම මෙයට වෙලා&#39;, සහ &#39;තක්සේරු ක්රමය&#39; &#39;කොටස් අයිතමය ලෙසයි&#39;"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,Purchase Order {0} is not submitted,මිලදී ගැනීමේ නියෝගයක් {0} ඉදිරිපත් කර නැත
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,ප්රක්ෂේපිත
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},අනු අංකය {0} ගබඩා {1} අයත් නොවේ
 apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,සටහන: පද්ධතිය අයිතමය සඳහා අධික ලෙස බෙදාහැරීම හා අධික ලෙස වෙන්කර ගැනීම පරීක්ෂා නැහැ {0} ප්රමාණය හෝ ප්රමාණය 0 ලෙස
 DocType: Notification Control,Quotation Message,උද්ධෘත පණිවුඩය
 DocType: Issue,Opening Date,විවෘත දිනය
-apps/erpnext/erpnext/schools/api.py +58,Attendance has been marked successfully.,පැමිණීම සාර්ථකව සලකුණු කර ඇත.
+apps/erpnext/erpnext/schools/api.py +57,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 +136,Account Type for {0} must be {1},{0} සඳහා ගිණුම වර්ගය විය යුතුය {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +139,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,දෙකම ගබඩාව එම සමාගමට අයිති විය යුතුය
@@ -2706,12 +2736,13 @@
 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/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 +20,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 +1190,Please select customer,කරුණාකර පාරිභෝගික තෝරා
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1193,Please select customer,කරුණාකර පාරිභෝගික තෝරා
 DocType: C-Form,I,මම
 DocType: Company,Asset Depreciation Cost Center,වත්කම් ක්ෂය පිරිවැය මධ්යස්ථානය
 DocType: Sales Order Item,Sales Order Date,විකුණුම් සාමය දිනය
@@ -2721,6 +2752,7 @@
 ,Payment Period Based On Invoice Date,ගෙවීම් කාලය ඉන්වොයිසිය දිනය පදනම්
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},{0} සඳහා ව්යවහාර මුදල් විනිමය අනුපාත අතුරුදහන්
 DocType: Assessment,Examiner,පරීක්ෂක
+DocType: Student,Siblings,සහෝදර සහෝදරියන්
 DocType: Journal Entry,Stock Entry,කොටස් සටහන්
 DocType: Payment Entry,Payment References,ගෙවීම් ආශ්රිත
 DocType: C-Form,C-FORM-,C-FORM-
@@ -2738,11 +2770,12 @@
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,මාතෘකාව නම
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,මෙම විකිණීම හෝ මිලදී ගැනීමේ ආයෝජිත තෝරාගත් කළ යුතුය
+DocType: Grading Structure,Grade Intervals,ශ්රේණියේ ප්රාන්තර
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,ඔබේ ව්යාපාරයේ ස්වභාවය තෝරන්න.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,නිෂ්පාදන මෙහෙයුම් සිදු කරනු ලැබේ කොහෙද.
 DocType: Asset Movement,Source Warehouse,මූලාශ්රය ගබඩාව
 DocType: Installation Note,Installation Date,ස්ථාපනය දිනය
-apps/erpnext/erpnext/controllers/accounts_controller.py +534,Row #{0}: Asset {1} does not belong to company {2},ෙරෝ # {0}: වත්කම් {1} සමාගම අයිති නැත {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +537,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,විකුණුම් පරිශීලක
@@ -2756,28 +2789,31 @@
 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 +111,Date Of Retirement must be greater than Date of Joining,විශ්රාම ගිය දිනය සමඟ සම්බන්ධවීම දිනය වඩා වැඩි විය යුතුය
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +49,There were errors while scheduling course on :,පාඨමාලාව අවස අතර දෝෂ ඇතිවිය:
 DocType: Sales Invoice,Against Income Account,ආදායම් ගිණුම එරෙහිව
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +87,{0}% Delivered,{0}% භාර
+apps/erpnext/erpnext/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 +379,Please set default {0} in Company {1},සමාගම {1} පැහැර {0} සකස් කරන්න
+apps/erpnext/erpnext/accounts/utils.py +456,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,දළ ලාභය / අලාභය
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,මිලදී ගැනීමේ නියෝගයක් අයිතමය සපයා
 apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,සමාගම් නම සමාගම විය නොහැකි
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,මුද්රණය සැකිලි සඳහා ලිපිය ධා.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,මුද්රණය සැකිලි සඳහා මාතෘකා Proforma ඉන්වොයිසිය වර්ග උදා.
+DocType: Student Guardian,Student Guardian,ශිෂ්ය ගාඩියන්
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +184,Valuation type charges can not marked as Inclusive,තක්සේරු වර්ගය චෝදනා සියල්ල ඇතුළත් ලෙස සලකුණු නොහැකි
 DocType: POS Profile,Update Stock,කොටස් යාවත්කාලීන
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,භාණ්ඩ සඳහා විවිධ UOM වැරදි (මුළු) ශුද්ධ බර අගය කිරීමට හේතු වනු ඇත. එක් එක් භාණ්ඩය ශුද්ධ බර එම UOM ඇති බව තහවුරු කර ගන්න.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,ද්රව්ය ලේඛණය අනුපාතිකය
 DocType: Asset,Journal Entry for Scrap,ලාංකික සඳහා ජර්නල් සටහන්
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,සැපයුම් සටහන භාණ්ඩ අදින්න කරුණාකර
-apps/erpnext/erpnext/accounts/utils.py +349,Journal Entries {0} are un-linked,ජර්නල් අයැදුම්පත් {0} එක්සත් ජාතීන්ගේ-බැඳී ඇත
+apps/erpnext/erpnext/accounts/utils.py +426,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 සඳහන් කරන්න පිරිවැය මධ්යස්ථානය
@@ -2801,6 +2837,7 @@
 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,ප්රජා සංසදය
+DocType: Homepage,"URL for ""All Products""",&quot;සියලු නිෂ්පාදන&quot; සඳහා URL එක
 DocType: Leave Application,Leave Balance Before Application,අයදුම් කිරීමට පෙර ශේෂ තබන්න
 DocType: SMS Center,Send SMS,කෙටි පණිවුඩ යවන්න
 DocType: Cheque Print Template,Width of amount in word,වචනය මුදල පළල
@@ -2809,7 +2846,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 +29,Current Job Openings,වත්මන් රැකියා අවස්ථා
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,Current Job Openings,වත්මන් රැකියා අවස්ථා
 DocType: Company,Stock Adjustment Account,කොටස් ගැලපුම් ගිණුම
 DocType: Journal Entry,Write Off,ලියා හරින්න
 DocType: Timesheet Detail,Operation ID,මෙහෙයුම හැඳුනුම්පත
@@ -2822,7 +2859,7 @@
 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 +850,Show tax break-up,බදු බිඳී පෙන්වන්න
+apps/erpnext/erpnext/public/js/controllers/transaction.js +841,Show tax break-up,බදු බිඳී පෙන්වන්න
 apps/erpnext/erpnext/accounts/party.py +308,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} එරෙහිව පවතින නිසා ඔබ නැවත භාර කිරීමට හෝ වෙනස් කිරීම කළ හැක"
@@ -2832,10 +2869,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 +534,Please select Posting Date before selecting Party,"කරුණාකර පක්ෂය තෝරා ගැනීමට පෙර ගිය තැන, දිනය තෝරා"
 DocType: Serial No,Out of AMC,විදේශ මුදල් හුවමාරු කරන්නන් අතරින්
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +80,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 +162,Please contact to the user who have Sales Master Manager {0} role,විකුණුම් මාස්ටර් කළමනාකරු {0} කාර්යභාරයක් ඇති කරන පරිශීලකයා වෙත සම්බන්ධ වන්න
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +195,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 +5,This is based on the attendance of this Student,මෙය මේ ශිෂ්ය ඊට සහභාගී මත පදනම් වේ
@@ -2844,12 +2882,11 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,සැපයුම් සටහන් {0} මෙම වෙළෙඳ න්යාය අවලංගු කිරීම පෙර අවලංගු කළ යුතුය
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +75,Paid amount + Write Off Amount can not be greater than Grand Total,ගෙවනු ලබන මුදල + ප්රමාණය මුළු එකතුව වඩා වැඩි විය නොහැකි 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 +138,Note: There is not enough leave balance for Leave Type {0},සටහන: මෙහි නිවාඩු වර්ගය {0} සඳහා ප්රමාණවත් නිවාඩු ඉතිරි නොවේ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,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,අවස්ථාව වර්ගය
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,නව සමාගම
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,Cost Center is required for 'Profit and Loss' account {0},පිරිවැය මධ්යස්ථානය ලාභ සහ අලාභ ගිණුම {0} සඳහා අවශ්ය
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,සමාගම නිර්මාතෘ විසින් පමණක් ගනුදෙනු මකාදැමිය නොහැක
 apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,පොදු ලෙජරය අයැදුම්පත් වැරදි ලෙස සංඛ්යාව සොයාගෙන ඇත. ඔබ මෙම ගණුදෙනුවේ ඇති වැරදි ගිණුම තෝරා ඇති.
 DocType: Cheque Print Template,Cheque Width,"එම ගාස්තුව මුදලින්, ෙචක්පතකින් පළල"
@@ -2858,16 +2895,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,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 +228,{0} '{1}' is disabled,{0} &#39;{1}&#39; අක්රීය
+apps/erpnext/erpnext/controllers/accounts_controller.py +231,{0} '{1}' is disabled,{0} &#39;{1}&#39; අක්රීය
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,විවෘත ලෙස සකසන්න
 DocType: Cheque Print Template,Scanned Cheque,ස්කෑන් චෙක්පත්
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,ගනුදෙනු ඉදිරිපත් මත සම්බන්ධතා වෙත ස්වයංක්රීය ඊමේල් යවන්න.
+DocType: Timesheet,Total Billable Amount,මුළු බිල්ගත කළ හැකි මුදල
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,අයිතමය 3
 DocType: Purchase Order,Customer Contact Email,පාරිභෝගික ඇමතුම් විද්යුත්
 DocType: Warranty Claim,Item and Warranty Details,භාණ්ඩය හා Warranty විස්තර
 DocType: Sales Team,Contribution (%),දායකත්වය (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,සටහන: &#39;මුදල් හෝ බැංකු ගිණුම්&#39; දක්වන නොවීම නිසා ගෙවීම් සටහන් නිර්මාණය කළ නොහැකි වනු ඇත
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Responsibilities,වගකීම්
+apps/erpnext/erpnext/controllers/accounts_controller.py +78,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,වගකීම්
 DocType: Expense Claim Account,Expense Claim Account,වියදම් හිමිකම් ගිණුම
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,සැකිල්ල
 DocType: Sales Person,Sales Person Name,විකුණුම් පුද්ගලයා නම
@@ -2875,6 +2913,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,පරිශීලකයන් එකතු කරන්න
 DocType: Pricing Rule,Item Group,අයිතමය සමූහ
 DocType: Item,Safety Stock,ආරක්ෂාව කොටස්
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,අයිතමය සංග්රහයේ&gt; අයිතමය සමූහ&gt; වෙළඳ නාමය
 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),එකතු කරන බදු හා ගාස්තු (සමාගම ව්යවහාර මුදල්)
@@ -2884,7 +2923,6 @@
 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: Timesheet,Total Hours,මුළු පැය
 DocType: Journal Entry,Printing Settings,මුද්රණ සැකසුම්
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Total Debit must be equal to Total Credit. The difference is {0},මුළු ඩෙබිට් මුළු ණය සමාන විය යුතු ය. වෙනස {0} වේ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,රථ
@@ -2897,13 +2935,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,ආයෝජන බැංකු කටයුතු
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +71,Cash or Bank Account is mandatory for making payment entry,මුදල් හෝ බැංකු ගිණුම් ගෙවීම් ප්රවේශය ගැනීම සඳහා අනිවාර්ය වේ
 DocType: Purchase Invoice,Price List Exchange Rate,මිල ලැයිස්තුව විනිමය අනුපාත
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,පාරිභෝගික&gt; කස්ටමර් සමූහයේ&gt; දේශසීමාවේ
 DocType: Purchase Invoice Item,Rate,අනුපාතය
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Intern,ආධුනිකයා
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,ආධුනිකයා
 DocType: Stock Entry,From BOM,ද්රව්ය ලේඛණය සිට
 DocType: Assessment,Assessment Code,තක්සේරු සංග්රහයේ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +32,Basic,මූලික
+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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',&#39;උත්පාදනය උපෙල්ඛනෙය්&#39; මත ක්ලික් කරන්න
+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 +95,Reference No is mandatory if you entered Reference Date,ධව ඔබ විමර්ශන දිනය ඇතුළු නම් කිසිම අනිවාර්ය වේ
@@ -2912,11 +2951,11 @@
 DocType: Salary Slip,Salary Structure,වැටුප් ව්යුහය
 DocType: Account,Bank,බැංකුව
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,ගුවන්
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +752,Issue Material,නිකුත් ද්රව්ය
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +723,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 +683,You are in offline mode. You will not be able to reload until you have network.,ඔබ නොබැඳිව වේ. ඔබ ජාලයක් තියෙනවා තෙක් ඔබට රීලෝඩ් කිරීමට නොහැකි වනු ඇත.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +665,You are in offline mode. You will not be able to reload until you have network.,ඔබ නොබැඳිව වේ. ඔබ ජාලයක් තියෙනවා තෙක් ඔබට රීලෝඩ් කිරීමට නොහැකි වනු ඇත.
 DocType: Hub Settings,Access Token,ටෝකනය
 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,අනුක්රමික අංකය
@@ -2924,33 +2963,35 @@
 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 +1122,Enter value must be positive,අගය ධනාත්මක විය යුතුය ඇතුලත් කරන්න
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,All Territories,සියලු ප්රදේශ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1125,Enter value must be positive,අගය ධනාත්මක විය යුතුය ඇතුලත් කරන්න
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,සියලු ප්රදේශ
 DocType: Purchase Invoice,Items,අයිතම
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +23,Student is already enrolled.,ශිෂ්ය දැනටමත් ලියාපදිංචි කර ඇත.
 DocType: Fiscal Year,Year Name,වසරේ නම
 DocType: Process Payroll,Process Payroll,ක්රියාවලිය වැටුප්
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,වැඩ කරන දින වැඩි නිවාඩු දින මෙම මාසය ඇත.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +233,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 +96,Request for Quotations,මිල කැඳවීම ඉල්ලීම
+apps/erpnext/erpnext/hooks.py +104,Request for Quotations,මිල කැඳවීම ඉල්ලීම
 DocType: Payment Reconciliation,Maximum Invoice Amount,උපරිම ඉන්වොයිසි මුදල
 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 +628,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',ප්රභේද්යයක් සඳහා නු පෙරනිමි ඒකකය &#39;{0}&#39; සැකිල්ල මෙන් ම විය යුතුයි &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',ප්රභේද්යයක් සඳහා නු පෙරනිමි ඒකකය &#39;{0}&#39; සැකිල්ල මෙන් ම විය යුතුයි &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,පදනම් කරගත් දින ගණනය
 DocType: Delivery Note Item,From Warehouse,ගබඩාව සිට
 DocType: Assessment,Supervisor Name,සුපරීක්ෂක නම
+DocType: Assessment,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,පරිශීලක මිලදී ගැනීම
 DocType: Notification Control,Customize the Notification,මෙම නිවේදනය රිසිකරණය
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Cash Flow from Operations,මෙහෙයුම් වලින් මුදල් ප්රවාහ
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,පෙරනිමි ලිපිනය සැකිල්ල මකා දැමිය නොහැක
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,පෙරනිමි ලිපිනය සැකිල්ල මකා දැමිය නොහැක
 DocType: Sales Invoice,Shipping Rule,නැව් පාලනය
 DocType: Manufacturer,Limited to 12 characters,අක්ෂර 12 කට සීමා
 DocType: Journal Entry,Print Heading,මුද්රණය ශීර්ෂය
@@ -2965,8 +3006,8 @@
 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/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,ඉලක්කය යවන ලද හෝ ඉලක්කය ප්රමාණය එක්කෝ අනිවාර්ය වේ
-apps/erpnext/erpnext/stock/get_item_details.py +485,No default BOM exists for Item {0},ද්රව්ය ලේඛණය අයිතමය {0} සඳහා පවතී පෙරනිමි කිසිදු
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +336,Please select Posting Date first,"කරුණාකර ගිය තැන, දිනය පළමු තෝරා"
+apps/erpnext/erpnext/stock/get_item_details.py +486,No default BOM exists for Item {0},ද්රව්ය ලේඛණය අයිතමය {0} සඳහා පවතී පෙරනිමි කිසිදු
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +326,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,පවත්නා ගනුදෙනු වියදම මධ්යස්ථානය ලෙජර් බවට පරිවර්තනය කළ නොහැකි
@@ -2982,6 +3023,7 @@
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,ඉන්වොයිසි සමග සසදන්න ගෙවීම්
 DocType: Journal Entry,Bank Entry,බැංකු පිවිසුම්
 DocType: Authorization Rule,Applicable To (Designation),(තනතුර) කිරීම සඳහා අදාළ
+,Profitability Analysis,ලාභදායීතාවය විශ්ලේෂණය
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,ගැලට එක් කරන්න
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,පිරිසක් විසින්
 DocType: Guardian,Interests,උනන්දුව දක්වන ක්ෂෙත්ර:
@@ -2994,21 +3036,21 @@
 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 +141,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Serialized අයිතමය {0} කොටස් වෙළඳ ප්රතිසන්ධාන භාවිතා \ යාවත්කාලීන කල නොහැක
 DocType: Scheduling Tool,Day,දවස
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,නව අනු අංකය ගබඩා තිබිය නොහැකිය. පොත් ගබඩාව කොටස් සටහන් හෝ මිළදී රිසිට්පත විසින් තබා ගත යුතු
 DocType: Lead,Lead Type,ඊයම් වර්ගය
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,You are not authorized to approve leaves on Block Dates,ඔබ කලාප දිනයන් මත කොළ අනුමත කිරීමට අවසර නැත
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,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: Student Applicant,AP.,ඒපී.
 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 +639,Point of Sale,", විකුණුම් පේදුරු"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +634,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,බද්ද
 DocType: Production Planning Tool,Production Planning Tool,නිෂ්පාදන සැලසුම්කරණය මෙවලම
@@ -3017,74 +3059,77 @@
 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 +373,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 Entry,Update Rate and Availability,වේගය හා උපකාර ලැබිය හැකි යාවත්කාලීන
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,ප්රතිශතයක් ඔබට අණ ප්රමාණය වැඩි වැඩියෙන් ලබා හෝ ඉදිරිපත් කිරීමට අවසර ඇත. උදාහරණයක් ලෙස: ඔබට ඒකක 100 නියෝග කර තිබේ නම්. ඔබේ දීමනාව 10% ක් නම් ඔබ ඒකක 110 ලබා ගැනීමට අවසර ලැබේ වේ.
 DocType: POS Profile,Customer Group,කස්ටමර් සමූහයේ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,Expense account is mandatory for item {0},වියදම් ගිණුම අයිතමය {0} සඳහා අනිවාර්ය වේ
 DocType: Item,Website Description,වෙබ් අඩවිය විස්තරය
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date must be on or after today,ඊළඟ ක්ෂය දිනය අද දින හෝ පසු විය යුතු ය
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,කොටස් ශුද්ධ වෙනස්
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +145,Please cancel Purchase Invoice {0} first,මිලදී ගැනීම ඉන්වොයිසිය {0} පළමු අවලංගු කරන්න
 DocType: Serial No,AMC Expiry Date,"විදේශ මුදල් හුවමාරු කරන්නන්, කල් ඉකුත්වන දිනය,"
 ,Sales Register,විකුණුම් රෙජිස්ටර්
 DocType: Quotation,Quotation Lost Reason,උද්ධෘත ලොස්ට් හේතුව
+apps/erpnext/erpnext/utilities/doctype/address/address.py +164,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,පෙරනිමි ලිපිනය සැකිල්ල සොයා ගත නොහැකි විය. Setup&gt; මුද්රණ හා ෙවළඳ නාමකරණ&gt; ලිපිනය සැකිල්ල අලුත් එකක් නිර්මාණය කරන්න.
 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 +330,Transaction reference no {0} dated {1},ගනුදෙනු සඳහනක් වත් {0} දිනැති {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Transaction reference no {0} dated {1},ගනුදෙනු සඳහනක් වත් {0} දිනැති {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,සංස්කරණය කරන්න කිසිම දෙයක් නැහැ.
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,Summary for this month and pending activities,මේ මාසය සඳහා සාරාංශය හා ෙ කටයුතු
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,මේ මාසය සඳහා සාරාංශය හා ෙ කටයුතු
 DocType: Customer Group,Customer Group Name,කස්ටමර් සමූහයේ නම
 apps/erpnext/erpnext/public/js/financial_statements.js +54,Cash Flow Statement,මුදල් ප්රවාහ ප්රකාශය
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Please remove this Invoice {0} from C-Form {1},C-ආකෘතිය {1} සිට මෙම ඉන්වොයිසිය {0} ඉවත් කරන්න
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,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 +644,Get Items,අයිතම ලබා ගන්න
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +623,Get Items,අයිතම ලබා ගන්න
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +210,Please enter Write Off Account,ගිණුම අක්රිය ලියන්න ඇතුලත් කරන්න
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,පසුගිය සාමය දිනය
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +41,Account {0} does not belongs to company {1},ගිණුම {0} සමාගම {1} අයත් නොවේ
+DocType: Student,Guardian Details,ගාඩියන් විස්තර
 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,සැලසුම් ඇරඹුම් දිනය
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,Customer is required against Receivable account {0},පාරිභෝගික ලැබිය ගිණුමක් {0} එරෙහිව අවශ්ය වේ
 DocType: Serial No,Creation Document Type,නිර්මාණය ලේඛන වර්ගය
 DocType: Leave Type,Is Encash,මාරු වේ
 DocType: Purchase Invoice,Mobile No,ජංගම නොමැත
 DocType: Leave Allocation,New Leaves Allocated,වෙන් අලුත් කොළ
-apps/erpnext/erpnext/controllers/trends.py +265,Project-wise data is not available for Quotation,ව්යාපෘති ප්රඥාවන්ත දත්ත උපුටා දක්වමිනි සඳහා ගත නොහැකි ය
+apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,ව්යාපෘති ප්රඥාවන්ත දත්ත උපුටා දක්වමිනි සඳහා ගත නොහැකි ය
 DocType: Project,Expected End Date,අපේක්ෂිත අවසානය දිනය
 DocType: Budget Account,Budget Amount,අයවැය මුදල
 DocType: Appraisal Template,Appraisal Template Title,ඇගයීෙම් සැකිල්ල හිමිකම්
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,Commercial,වාණිජ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,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 +648,Row {0}# Account must be of type 'Fixed Asset',ෙරෝ {0} # ගිණුම් වර්ගය විය යුතුයි &#39;ස්ථාවර වත්කම්&#39;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Row {0}# Account must be of type 'Fixed Asset',ෙරෝ {0} # ගිණුම් වර්ගය විය යුතුයි &#39;ස්ථාවර වත්කම්&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,යවන ලද අතරින්
 apps/erpnext/erpnext/config/accounts.py +278,Rules to calculate shipping amount for a sale,විකිණීම සඳහා නාවික මුදල ගණනය කිරීමට නීති රීති
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +30,Series is mandatory,මාලාවක් අනිවාර්ය වේ
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +50,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} සඳහා අවශ්ය පොත් ගබඩාව
 DocType: Leave Allocation,Unused leaves,භාවිතයට නොගත් කොළ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Cr,Cr
 DocType: Tax Rule,Billing State,බිල්පත් රාජ්ය
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +250,Transfer,මාරු
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +187,{0} {1} does not associated with Party Account {2},{0} {1} පක්ෂය ගිණුම {2} සමග සම්බන්ධ නැති
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,Fetch exploded BOM (including sub-assemblies),(උප-එකලස්කිරීම් ඇතුළුව) පුපුරා ද්රව්ය ලේඛණය බෝගයන්ගේ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +254,Transfer,මාරු
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +190,{0} {1} does not associated with Party Account {2},{0} {1} පක්ෂය ගිණුම {2} සමග සම්බන්ධ නැති
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +796,Fetch exploded BOM (including sub-assemblies),(උප-එකලස්කිරීම් ඇතුළුව) පුපුරා ද්රව්ය ලේඛණය බෝගයන්ගේ
 DocType: Authorization Rule,Applicable To (Employee),(සේවක) කිරීම සඳහා අදාළ
-apps/erpnext/erpnext/controllers/accounts_controller.py +115,Due Date is mandatory,නියමිත දිනය අනිවාර්ය වේ
+apps/erpnext/erpnext/controllers/accounts_controller.py +118,Due Date is mandatory,නියමිත දිනය අනිවාර්ය වේ
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Attribute {0} 0 වෙන්න බෑ සඳහා වර්ධකය
 DocType: Journal Entry,Pay To / Recd From,සිට / Recd වැටුප්
 DocType: Naming Series,Setup Series,setup ශ්රේණි
 DocType: Payment Reconciliation,To Invoice Date,ඉන්වොයිසිය දිනය කිරීමට
 DocType: Supplier,Contact HTML,අප අමතන්න HTML
 ,Inactive Customers,අක්රීය ගනුදෙනුකරුවන්
+DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,මිලදී ගැනීම ලැබීම්
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,කොහොමද මිල නියම පාලනය ආලේප කරයි?
 DocType: Quality Inspection,Delivery Note No,සැපයුම් සටහන නොමැත
@@ -3093,7 +3138,7 @@
 DocType: Company,Retail,සිල්ලර
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +120,Customer {0} does not exist,පාරිභෝගික {0} නොපවතියි
 DocType: Attendance,Absent,නැති කල
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +587,Product Bundle,නිෂ්පාදන පැකේජය
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Product Bundle,නිෂ්පාදන පැකේජය
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Invalid reference {1},ෙරෝ {0}: වලංගු නොවන සමුද්දේශ {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,බදු හා ගාස්තු මිලදී සැකිල්ල
 DocType: Upload Attendance,Download Template,බාගත සැකිල්ල
@@ -3103,8 +3148,8 @@
 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 +742,Send Supplier Emails,සැපයුම්කරු විද්යුත් තැපැල් පණිවුඩ යවන්න
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +104,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","වැටුප් දැනටමත් {0} අතර කාල සීමාව සඳහා සකස් සහ {1}, අයදුම්පත් කාලය Leave මෙම දින පරාසයක් අතර විය නොහැක."
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +708,Send Supplier Emails,සැපයුම්කරු විද්යුත් තැපැල් පණිවුඩ යවන්න
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,"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.,එය අනු අංකය සඳහා ස්ථාපන සටහන්
 DocType: Guardian Interest,Guardian Interest,ගාඩියන් පොලී
 DocType: Timesheet,Employee Detail,සේවක විස්තර
@@ -3115,9 +3160,9 @@
 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/accounts/doctype/gl_entry/gl_entry.py +77,Account {0} cannot be a Group,ගිණුම {0} සහිත සමූහය විය නොහැකි
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} cannot be a Group,ගිණුම {0} සහිත සමූහය විය නොහැකි
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +31,Optional. This setting will be used to filter in various transactions.,විකල්ප. මෙම සිටුවම විවිධ ගනුදෙනු පෙරහන් කිරීමට භාවිතා කරනු ඇත.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +107,Negative Valuation Rate is not allowed,ඍණ තක්සේරු අනුපාත ඉඩ නැත
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,ඍණ තක්සේරු අනුපාත ඉඩ නැත
 DocType: Holiday List,Weekly Off,සතිපතා Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","උදා: 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +39,Provisional Profit / Loss (Credit),තාවකාලික ලාභය / අලාභය (ක්රෙඩිට්)
@@ -3131,16 +3176,16 @@
 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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: පිරිවැය මධ්යස්ථානය අයිතමය {2} සඳහා අනිවාර්ය වේ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +626,Get Items from Product Bundle,නිෂ්පාදන පැකේජය සිට අයිතම ලබා ගන්න
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +605,Get Items from Product Bundle,නිෂ්පාදන පැකේජය සිට අයිතම ලබා ගන්න
 DocType: Asset,Straight Line,සරල රේඛාව
 DocType: Project User,Project User,ව්යාපෘති පරිශීලක
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} is inactive,ගිණුම {0} අක්රීය
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} is inactive,ගිණුම {0} අක්රීය
 DocType: GL Entry,Is Advance,උසස් වේ
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,දිනය සඳහා දිනය හා පැමිණීමේ සිට පැමිණීම අනිවාර්ය වේ
 apps/erpnext/erpnext/controllers/buying_controller.py +148,Please enter 'Is Subcontracted' as Yes or No,ඇතුලත් කරන්න ඔව් හෝ නැත ලෙස &#39;උප කොන්ත්රාත්තු වෙයි&#39;
 DocType: Sales Team,Contact No.,අප අමතන්න අංක
 DocType: Bank Reconciliation,Payment Entries,ගෙවීම් සඳහා අයැදුම්පත්
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,'Profit and Loss' type account {0} not allowed in Opening Entry,&#39;ලාභ සහ අලාභ &quot;ආකාරයක ගිණුමක් {0} සටහන් විවෘත කිරීමට ඉඩ නොදෙන
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +71,'Profit and Loss' type account {0} not allowed in Opening Entry,&#39;ලාභ සහ අලාභ &quot;ආකාරයක ගිණුමක් {0} සටහන් විවෘත කිරීමට ඉඩ නොදෙන
 DocType: Program Enrollment Tool,Get Students From,සිට ශිෂ්ය ලබා ගන්න
 DocType: Hub Settings,Seller Country,විකුණන්නා රට
 apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,වෙබ් අඩවිය මත අයිතම ප්රකාශයට පත් කරනු ලබයි
@@ -3159,7 +3204,7 @@
 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 +558,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","ෙරෝ # {0}: වත්කම් {1} ඉදිරිපත් කළ නොහැකි, එය දැනටමත් {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +561,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","ෙරෝ # {0}: වත්කම් {1} ඉදිරිපත් කළ නොහැකි, එය දැනටමත් {2}"
 DocType: Tax Rule,Billing Country,බිල්පත් රට
 DocType: Production Order,Expected Delivery Date,අපේක්ෂිත භාර දීම දිනය
 apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,හර සහ බැර {0} # {1} සඳහා සමාන නැත. වෙනස {2} වේ.
@@ -3172,13 +3217,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +202,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: Sales Order,% Amount Billed,% මුදල අසූහත
+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;සුරැකුමට පෙර, මාලාවක් තෝරාගැනීමට පරිශීලක බල කිරීම සඳහා අවශ්ය නම් මෙම පරීක්ෂා කරන්න. ඔබ මෙම පරීක්ෂා නම් කිසිඳු පෙරනිමි වනු ඇත."
 apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},අනු අංකය {0} සමග කිසිදු විෂය
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,විවෘත නිවේදන
+DocType: Email Digest,Open Notifications,විවෘත නිවේදන
 DocType: Payment Entry,Difference Amount (Company Currency),වෙනස ප්රමාණය (සමාගම ව්යවහාර මුදල්)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,සෘජු වියදම්
 apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
@@ -3186,7 +3231,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,නව පාරිභෝගික ආදායම්
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,ගමන් වියදම්
 DocType: Maintenance Visit,Breakdown,බිඳ වැටීම
-apps/erpnext/erpnext/controllers/accounts_controller.py +634,Account: {0} with currency: {1} can not be selected,ගිණුම: {0} මුදල් සමග: {1} තෝරා ගත නොහැකි
+apps/erpnext/erpnext/controllers/accounts_controller.py +637,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}
 DocType: Program Enrollment Tool,Student Applicants,ශිෂ්ය අයදුම්කරුවන්
@@ -3194,15 +3239,15 @@
 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 +56,Probation,පරිවාස
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Probation,පරිවාස
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,වැටුප් සංරචක
 DocType: Program Enrollment Tool,New Academic Year,නව අධ්යයන වර්ෂය
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Payment of salary for the month {0} and year {1},මාසය {0} සඳහා වැටුප් ගෙවීම සහ වසර {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Payment of salary for the month {0} and year {1},මාසය {0} සඳහා වැටුප් ගෙවීම සහ වසර {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,වාහන ළ මිල ලැයිස්තුව අනුපාතය අතුරුදහන් නම්
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,මුළු ු ර්
 DocType: Production Order Item,Transferred Qty,මාරු යවන ලද
 apps/erpnext/erpnext/config/learn.py +11,Navigating,යාත්රා
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Planning,සැලසුම්
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,සැලසුම්
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,නිකුත් කල
 DocType: Project,Total Billing Amount (via Time Logs),(කාල ලඝු-සටහන් හරහා) මුළු බිල්පත් ප්රමාණය
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,We sell this Item,අපි මේ විෂය විකිණීම්
@@ -3215,11 +3260,10 @@
 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.,විද්යුත් හරහා නිතිපතා සාරාංශයක් වාර්තා යවන්න.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Sales invoice submitted sucessfully.,විකුණුම් ඉන්වොයිසිය sucessfully ඉදිරිපත් කරන ලදී.
 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} පැහැර ගිණුමක් සකස් කරන්න
 DocType: Assessment Result,Student Name,ශිෂ්ය නම
-apps/erpnext/erpnext/hooks.py +104,Assessment Schedule,තක්සේරු උපෙල්ඛනෙය්
+apps/erpnext/erpnext/hooks.py +113,Assessment Schedule,තක්සේරු උපෙල්ඛනෙය්
 DocType: Brand,Item Manager,අයිතමය කළමනාකරු
 DocType: Buying Settings,Default Supplier Type,පෙරනිමි සැපයුම්කරු වර්ගය
 DocType: Production Order,Total Operating Cost,මුළු මෙහෙයුම් පිරිවැය
@@ -3229,6 +3273,7 @@
 DocType: GL Entry,Party Type,පක්ෂය වර්ගය
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +78,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,මැක්ස් දින නිවාඩු අනුමත
@@ -3240,18 +3285,19 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,ආදර්ශ හෝ ගනුදෙනුකරුවන් වෙත උපුටා දක්වයි.
 DocType: Stock Settings,Role Allowed to edit frozen stock,ශීත කළ කොටස් සංස්කරණය කිරීමට අවසර කාර්යභාරය
 ,Territory Target Variance Item Group-Wise,භූමි ප්රදේශය ඉලක්ක විචලතාව අයිතමය සමූහ ප්රාඥ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Customer Groups,සියලු පාරිභෝගික කණ්ඩායම්
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +78,Accumulated Monthly,මාසික සමුච්චිත
-apps/erpnext/erpnext/controllers/accounts_controller.py +595,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} අනිවාර්ය වේ. සමහර විට විනිමය හුවමාරු වාර්තා {1} {2} සඳහා නිර්මාණය කර නැත.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,සියලු පාරිභෝගික කණ්ඩායම්
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +81,Accumulated Monthly,මාසික සමුච්චිත
+apps/erpnext/erpnext/controllers/accounts_controller.py +598,{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} නොපවතියි
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),මිල ලැයිස්තුව අනුපාතිකය (සමාගම ව්යවහාර මුදල්)
 DocType: Products Settings,Products Settings,නිෂ්පාදන සැකසුම්
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +188,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Setup&gt; සැකසීම්&gt; අනුප්රාප්තිකයා නම් කිරීම ශ්රේණි හරහා {0} සඳහා ශ්රේණි අනුප්රාප්තිකයා නම් කිරීම තබා කරුණාකර
 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 +84,Secretary,ලේකම්
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,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,මිලදී ගැනීමේ
@@ -3260,24 +3306,22 @@
 ,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,තක්සේරු නම
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,ෙරෝ # {0}: අනු අංකය අනිවාර්ය වේ
+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 +859,Supplier Quotation,සැපයුම්කරු උද්ධෘත
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +838,Supplier Quotation,සැපයුම්කරු උද්ධෘත
 DocType: Quotation,In Words will be visible once you save the Quotation.,ඔබ උද්ධෘත බේරා වරක් වචන දෘශ්යමාන වනු ඇත.
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +7,Collect Fees,ගාස්තු එකතු
+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} භාවිතා
 DocType: Lead,Add to calendar on this date,මෙම දිනට දින දර්ශනය එක් කරන්න
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,නාවික වියදම් එකතු කිරීම සඳහා වන නීති.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,ඉදිරියට එන සිද්ධීන්
 DocType: Item,Opening Stock,ආරම්භක තොගය
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,පාරිභෝගික අවශ්ය වේ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} ප්රතිලාභ සඳහා අනිවාර්ය වේ
 DocType: Purchase Order,To Receive,ලබා ගැනීමට
 apps/erpnext/erpnext/public/js/setup_wizard.js +195,user@example.com,user@example.com
-DocType: Email Digest,Income / Expense,ආදායම් / වියදම්
 DocType: Employee,Personal Email,පුද්ගලික විද්යුත්
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,සමස්ත විචලතාව
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","මෙම පහසුකම සක්රීය කළ විට, පද්ධතිය ස්වයංක්රීයව බඩු තොග සඳහා ගිණුම් සටහන් ඇතුළත් කිරීම් පල කරන්නෙමු."
@@ -3288,13 +3332,14 @@
 DocType: Customer,From Lead,ඊයම් සිට
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,නිෂ්පාදනය සඳහා නිකුත් නියෝග.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,රාජ්ය මූල්ය වර්ෂය තෝරන්න ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,POS Profile required to make POS Entry,POS සටහන් කිරීමට අවශ්ය POS නරඹන්න
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +509,POS Profile required to make POS Entry,POS සටහන් කිරීමට අවශ්ය POS නරඹන්න
 DocType: Program Enrollment Tool,Enroll Students,ශිෂ්ය ලියාපදිංචි
 DocType: Hub Settings,Name Token,නම ටෝකනය
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,සම්මත විකිණීම
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Atleast one warehouse is mandatory,හිතුව එක තේ ගබඩාවක් අනිවාර්ය වේ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +129,Atleast one warehouse is mandatory,හිතුව එක තේ ගබඩාවක් අනිවාර්ය වේ
 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 +330,{0} against Sales Invoice {1},{0} විකුණුම් ඉන්වොයිසිය {1} එරෙහිව
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,ව්යාපෘතියේ නම
@@ -3315,10 +3360,11 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,කොළ 0.5 ගුණාකාරවලින් වෙන් කල යුතු
 DocType: Production Order,Operation Cost,මෙහෙයුම වියදම
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,එය .csv ගොනුව පැමිණීම උඩුගත
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,විශිෂ්ට ඒඑම්ටී
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,මෙම වෙළෙඳ පුද්ගලයෙක් සඳහා ඉලක්ක අයිතමය සමූහ ප්රඥාවන්ත Set.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],[දින] වඩා පැරණි කොටස් කැටි
-apps/erpnext/erpnext/controllers/accounts_controller.py +528,Row #{0}: Asset is mandatory for fixed asset purchase/sale,ෙරෝ # {0}: වත්කම් ස්ථාවර වත්කම් මිලදී ගැනීම / විකිණීම සඳහා අනිවාර්ය වේ
+apps/erpnext/erpnext/controllers/accounts_controller.py +531,Row #{0}: Asset is mandatory for fixed asset purchase/sale,ෙරෝ # {0}: වත්කම් ස්ථාවර වත්කම් මිලදී ගැනීම / විකිණීම සඳහා අනිවාර්ය වේ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","මිල නියම කිරීම නීති දෙකක් හෝ ඊට වැඩි ඉහත තත්වයන් මත පදනම්ව දක්නට ලැබේ නම්, ප්රමුඛ ආලේප කරයි. අතර පෙරනිමි අගය ශුන්ය (හිස්ව තබන්න) වේ ප්රමුඛ 0 සිට 20 දක්වා අතර සංඛ්යාවක්. සංඛ්යාව ඉහල එම කොන්දේසි සමග බහු මිල නියම රීති පවතී නම් එය මුල් තැන ඇත යන්නයි."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,රාජ්ය මූල්ය වර්ෂය: {0} පවතී නැත
 DocType: Currency Exchange,To Currency,ව්යවහාර මුදල් සඳහා
@@ -3335,15 +3381,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,පෞද්ගලික කොටස්
 DocType: Maintenance Visit,Customer Feedback,පාරිභෝගික සේවාව ඇගයීම
 DocType: Account,Expense,වියදම්
-DocType: Sales Invoice,Exhibition,ප්රදර්ශනය
 apps/erpnext/erpnext/utilities/doctype/address/address.py +77,"Company is mandatory, as it is your company address","ඔබේ සමාගම ලිපිනය ලෙස සමාගම, අනිවාර්ය වේ"
 DocType: Item Attribute,From Range,රංගේ සිට
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +81,Syntax error in formula or condition: {0},සූත්රයක් හෝ තත්ත්වය කාරක රීති දෝෂය: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +92,Syntax error in formula or condition: {0},සූත්රයක් හෝ තත්ත්වය කාරක රීති දෝෂය: {0}
 apps/erpnext/erpnext/stock/utils.py +99,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 +28,Jobs,රැකියා
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,රැකියා
 ,Sales Order Trends,විකුණුම් සාමය ප්රවණතා
 DocType: Employee,Held On,දා පැවති
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,නිෂ්පාදන විෂය
@@ -3352,16 +3398,16 @@
 DocType: Stock Entry Detail,Additional Cost,අමතර පිරිවැය
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,මූල්ය වසර අවසාන දිනය
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","වවුචරයක් වර්ගීකරණය නම්, වවුචරයක් නොමැත මත පදනම් පෙරීමට නොහැකි"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +763,Make Supplier Quotation,සැපයුම්කරු උද්ධෘත කරන්න
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,Make Supplier Quotation,සැපයුම්කරු උද්ධෘත කරන්න
 DocType: Quality Inspection,Incoming,ලැබෙන
 DocType: BOM,Materials Required (Exploded),අවශ්ය ද්රව්ය (පුපුරා)
 apps/erpnext/erpnext/public/js/setup_wizard.js +185,"Add users to your organization, other than yourself","ඔබ හැර, ඔබේ ආයතනය සඳහා භාවිතා කරන්නන් එකතු කරන්න"
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,Row # {0}: Serial No {1} does not match with {2} {3},ෙරෝ # {0}: අනු අංකය {1} {2} {3} සමග නොගැලපේ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +42,Casual Leave,අනියම් නිවාඩු
+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,අනියම් නිවාඩු
 DocType: Batch,Batch ID,කණ්ඩායම හැඳුනුම්පත
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,Note: {0},සටහන: {0}
 ,Delivery Note Trends,සැපයුම් සටහන ප්රවණතා
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +103,This Week's Summary,මෙම සතියේ සාරාංශය
+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} පමණක් කොටස් ගනුදෙනු හරහා යාවත්කාලීන කළ හැකි
 DocType: Student Group Creation Tool,Get Courses,පාඨමාලා ලබා ගන්න
 DocType: GL Entry,Party,පක්ෂය
@@ -3371,7 +3417,7 @@
 DocType: Request for Quotation Item,Request for Quotation Item,උද්ධෘත අයිතමය සඳහා ඉල්ලුම්
 DocType: Purchase Order,To Bill,පනත් කෙටුම්පත
 DocType: Material Request,% Ordered,% අනුපිළිවලින්
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Piecework,Piecework
+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: Task,Actual Time (in Hours),සැබෑ කාලය (පැය දී)
 DocType: Employee,History In Company,සමාගම දී ඉතිහාසය
@@ -3388,7 +3434,7 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +350,{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 +162,Black,කලු
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,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} ඉදිරිපත් භාණ්ඩ
@@ -3399,13 +3445,13 @@
 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 +69,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,මාක් නැති කල
 DocType: Journal Entry Account,Exchange Rate,විනිමය අනුපාතය
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Sales Order {0} is not submitted,විකුණුම් සාමය {0} ඉදිරිපත් කර නැත
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +527,Sales Order {0} is not submitted,විකුණුම් සාමය {0} ඉදිරිපත් කර නැත
 DocType: Homepage,Tag Line,ටැග ලයින්
 DocType: Fee Component,Fee Component,ගාස්තු සංරචක
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +857,Add items from,සිට අයිතම එකතු කරන්න
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +836,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 නැත
 DocType: Cheque Print Template,Regular,සාමාන්ය
 DocType: BOM,Last Purchase Rate,පසුගිය මිලදී ගැනීම අනුපාත
@@ -3413,6 +3459,7 @@
 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} සඳහා පැවතිය නොහැකි ප්රභේද පවතින බැවින්
 ,Sales Person-wise Transaction Summary,විකුණුම් පුද්ගලයා ප්රඥාවෙන් ගනුදෙනු සාරාංශය
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +60,Cost Center is required for 'Profit and Loss' account {0}. Please set up a default Cost Center for the Company.,පිරිවැය මධ්යස්ථානය ලාභ සහ අලාභ ගිණුම {0} සඳහා අවශ්ය වේ. එම සමාගමේ පෙරනිමි වියදම මධ්යස්ථානයක් පිහිටුවා කරන්න.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,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,මාසික බෙදාහැරීම් ප්රතිශත
@@ -3423,12 +3470,12 @@
 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 +710,Online,සමඟ අමුත්තන්
+apps/erpnext/erpnext/accounts/page/pos/pos.js +692,Online,සමඟ අමුත්තන්
 ,Available Stock for Packing Items,ඇසුරුම් අයිතම සඳහා ලබා ගත හැකි කොටස්
 DocType: Item Variant,Item Variant,අයිතමය ප්රභේද්යයක්
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,පෙරනිමි ලෙස මෙම ලිපිනය සැකිල්ල කිරීම වෙනත් කිසිම පෙරනිමි පවතින බැවින්
+apps/erpnext/erpnext/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'","ඩෙබිට් දැනටමත් ගිණුම් ශේෂය, ඔබ &#39;ක්රෙඩිට්&#39; ලෙස &#39;ශේෂ විය යුතුයි&#39; නියම කිරීමට අවසර නැත"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Quality Management,තත්ත්ව කළමනාකරණ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,තත්ත්ව කළමනාකරණ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,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,සේවක විදේශ රැකියා ඉතිහාසය
@@ -3450,11 +3497,12 @@
 DocType: Student,Student Email ID,ශිෂ්ය විද්යුත් හැඳුනුම්පත
 DocType: Employee,Notice (days),නිවේදනය (දින)
 DocType: Tax Rule,Sales Tax Template,විකුණුම් බදු සැකිල්ල
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1520,Select items to save the invoice,ඉන්වොයිස් බේරා ගැනීමට භාණ්ඩ තෝරන්න
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1544,Select items to save the invoice,ඉන්වොයිස් බේරා ගැනීමට භාණ්ඩ තෝරන්න
 DocType: Employee,Encashment Date,හැකි ඥාතීන් නොවන දිනය
 DocType: Account,Stock Adjustment,කොටස් ගැලපුම්
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},{0} - පෙරනිමි ලද වියදම ක්රියාකාරකම් වර්ගය සඳහා පවතී
 DocType: Production Order,Planned Operating Cost,සැලසුම් මෙහෙයුම් පිරිවැය
+DocType: Academic Term,Term Start Date,කාලීන ඇරඹුම් දිනය
 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,අයදුම්කරු නම
@@ -3484,17 +3532,17 @@
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,ගබඩාව (භාණ්ඩ තොගය) සඳහා ගිණුම මෙම ගිණුම යටතේ ඇති කරනු ඇත.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +119,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,කොටස් ලෙජර් ප්රවේශය මෙම ගබඩා සංකීර්ණය සඳහා පවතින අයුරිනි ගබඩා සංකීර්ණය ඉවත් කල නොහැක.
 DocType: Company,Distribution,බෙදා හැරීම
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +8,Amount Paid,ු ර්
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Project Manager,ව්යාපෘති කළමනාකරු
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,ු ර්
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,ව්යාපෘති කළමනාකරු
 ,Quoted Item Comparison,උපුටා අයිතමය සංසන්දනය
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Dispatch,සරයක
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,සරයක
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,අයිතමය සඳහා අවසර මැක්ස් වට්ටමක්: {0} වේ {1}%
 apps/erpnext/erpnext/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.,සකස් ණය සීමා ඉක්මවා යන ගනුදෙනු ඉදිරිපත් කිරීමට අවසර තිබේ එම භූමිකාව.
-DocType: Sales Invoice,Supplier Reference,සැපයුම්කරු විමර්ශන
-apps/erpnext/erpnext/accounts/page/pos/pos.js +844,"Master data syncing, it might take some time","මාස්ටර් දත්ත සමමුහුර්ත, එය යම් කාලයක් ගත විය හැකියි"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +832,"Master data syncing, it might take some time","මාස්ටර් දත්ත සමමුහුර්ත, එය යම් කාලයක් ගත විය හැකියි"
 DocType: Item,Material Issue,ද්රව්ය නිකුත්
 DocType: Hub Settings,Seller Description,විකුණන්නා විස්තරය
 DocType: Employee Education,Qualification,සුදුසුකම්
@@ -3508,7 +3556,7 @@
 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 +83,Error in formula or condition,සූත්රය හෝ තත්ත්වය දෝශයක්
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,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,සියලු නොතේරූ නිසාවෙන්
@@ -3517,7 +3565,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},දිනය සඳහා මුදල් වර්ෂය තුළ විය යුතුය. දිනය = {0} සඳහා උපකල්පනය
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","මෙහිදී ඔබට උස, බර, අසාත්මිකතා, වෛද්ය කනස්සල්ල ආදිය පවත්වා ගැනීමට නොහැකි"
 DocType: Leave Block List,Applies to Company,සමාගම සඳහා අදාළ ෙව්
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +197,Cannot cancel because submitted Stock Entry {0} exists,අවලංගු කළ නොහැකි ඉදිරිපත් කොටස් Entry {0} පවතින බැවිනි
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +198,Cannot cancel because submitted Stock Entry {0} exists,අවලංගු කළ නොහැකි ඉදිරිපත් කොටස් Entry {0} පවතින බැවිනි
 DocType: Purchase Invoice,In Words,වචන ගැන
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,Today is {0}'s birthday!,අද {0} &#39;උපන් දිනය වේ!
 DocType: Production Planning Tool,Material Request For Warehouse,ගබඩා සඳහා ද්රව්ය ඉල්ලීම්
@@ -3527,14 +3575,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,ඔබේ මූල්ය වසර ආරම්භ
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,වත්කම් අගය පහත හා තුලනය
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +319,Amount {0} {1} transferred from {2} to {3},"මුදල {0} {1} {3} කර ගැනීම සඳහා, {2} මාරු"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +322,Amount {0} {1} transferred from {2} to {3},"මුදල {0} {1} {3} කර ගැනීම සඳහා, {2} මාරු"
 DocType: Sales Invoice,Get Advances Received,අත්තිකාරම් ලද කරන්න
 DocType: Email Digest,Add/Remove Recipients,එකතු කරන්න / ලබන්නන් ඉවත් කරන්න
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +432,Transaction not allowed against stopped Production Order {0},නතර නිෂ්පාදන න්යාය {0} එරෙහිව ගනුදෙනු අවසර නැත
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +437,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 +143,Join,එක්වන්න
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,හිඟය යවන ලද
-apps/erpnext/erpnext/stock/doctype/item/item.py +652,Item variant {0} exists with same attributes,අයිතමය ප්රභේද්යයක් {0} එම ලක්ෂණ සහිත පවතී
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,අයිතමය ප්රභේද්යයක් {0} එම ලක්ෂණ සහිත පවතී
+DocType: Leave Application,LAP/,LAP /
 DocType: Salary Slip,Salary 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,&#39;මේ දක්වා&#39; &#39;අවශ්ය වේ
@@ -3542,12 +3591,12 @@
 DocType: Sales Invoice Item,Sales Order Item,විකුණුම් සාමය අයිතමය
 DocType: Salary Slip,Payment Days,ගෙවීම් දින
 DocType: Customer,Dormant,උදාසීනව
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +212,Warehouses with child nodes cannot be converted to ledger,ළමා ශීර්ෂයන් සමඟ බඞු ගබඞාව ලෙජර් බවට පරිවර්තනය කළ නොහැකි
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +215,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/public/js/controllers/transaction.js +866,It is needed to fetch Item Details.,එය අයිතමය විස්තර බැරිතැන අවශ්ය වේ.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +857,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} දැනටමත් ලැබී ඇත
@@ -3557,14 +3606,14 @@
 DocType: Expense Claim,Total Claimed Amount,මුළු හිමිකම් කියන අය මුදල
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,විකිණීම සඳහා ලබාදිය හැකි අවස්ථා.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,Invalid {0},වලංගු නොවන {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Sick Leave,ලෙඩ නිවාඩු
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,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,වෙළෙඳ දෙපාර්තමේන්තු අටකින්
 DocType: Warehouse,PIN,PIN අංකය
 DocType: Sales Invoice,Base Change Amount (Company Currency),මූලික වෙනස් ප්රමාණය (සමාගම ව්යවහාර මුදල්)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +313,No accounting entries for the following warehouses,පහත සඳහන් ගබඩා වෙනුවෙන් කිසිදු වගකීමක් සටහන් ඇතුළත් කිරීම්
-apps/erpnext/erpnext/projects/doctype/project/project.js +102,Save the document first.,පළමු ලිපිය සුරැකීම.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +314,No accounting entries for the following warehouses,පහත සඳහන් ගබඩා වෙනුවෙන් කිසිදු වගකීමක් සටහන් ඇතුළත් කිරීම්
+apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,පළමු ලිපිය සුරැකීම.
 DocType: Account,Chargeable,"අයකරනු ලබන ගාස්තු,"
 DocType: Company,Change Abbreviation,කෙටි යෙදුම් වෙනස්
 DocType: Expense Claim Detail,Expense Date,වියදම් දිනය
@@ -3577,10 +3626,9 @@
 DocType: Purchase Invoice,Recurring Print Format,පුනරාවර්තනය මුද්රණය ආකෘතිය
 DocType: C-Form,Series,මාලාවක්
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,Expected Delivery Date cannot be before Purchase Order Date,අපේක්ෂිත භාර දීම දිනය මිලදී ගැනීමේ නියෝගයක් දිනය පෙර විය නොහැකි
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Setup&gt; සැකසීම්&gt; අනුප්රාප්තිකයා නම් කිරීම ශ්රේණි හරහා {0} සඳහා ශ්රේණි අනුප්රාප්තිකයා නම් කිරීම තබා කරුණාකර
 DocType: Appraisal,Appraisal Template,ඇගයීෙම් සැකිල්ල
 DocType: Item Group,Item Classification,අයිතමය වර්ගීකරණය
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Business Development Manager,ව්යාපාර සංවර්ධන කළමණාකරු
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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,පොදු ලෙජරය
@@ -3590,8 +3638,8 @@
 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 +940,Please select {0} first,කරුණාකර පළමු {0} තෝරා
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +749,Batch {0} of Item {1} has expired.,කණ්ඩායම {0} අයිතමය ක {1} කල් ඉකුත් වී ඇත.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +953,Please select {0} first,කරුණාකර පළමු {0} තෝරා
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +757,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,උප ශීර්ෂයට
@@ -3608,8 +3656,8 @@
 {% 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 +92,Warehouse not found in the system,පද්ධතිය තුළ ගබඩා සංකීර්ණය සොයාගත නොහැකි
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +106,This Month's Summary,මෙම මාසික ගේ සාරාංශය
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,පද්ධතිය තුළ ගබඩා සංකීර්ණය සොයාගත නොහැකි
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,මෙම මාසික ගේ සාරාංශය
 DocType: Quality Inspection Reading,Quality Inspection Reading,තත්ත්ව පරීක්ෂක වර කියවීම
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,&#39;&#39; කණ්ඩරාව කොටස් පැරණි Than` දින% d ට වඩා කුඩා විය යුතුය.
 DocType: Tax Rule,Purchase Tax Template,මිලදී ගැනීම බදු සැකිල්ල
@@ -3619,21 +3667,22 @@
 DocType: Item Customer Detail,Ref Code,ref සංග්රහයේ
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,සේවක වාර්තා.
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Please set Next Depreciation Date,ඊළඟට ක්ෂය දිනය සකස් කරන්න
-DocType: Payment Gateway,Payment Gateway,ගෙවීම් ගේට්වේ
 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 +378,Operation Time must be greater than 0 for Operation {0},"වේලාව මෙහෙයුම මෙහෙයුම {0} සඳහා, 0 ට වඩා වැඩි විය යුතුය"
+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/accounts/doctype/account/account.py +170,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) එය තබා ගන්න
 DocType: Program,Program Abbreviation,වැඩසටහන කෙටි යෙදුම්
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,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: Appraisal,Start Date,ආරම්භක දිනය
@@ -3649,21 +3698,22 @@
 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,චෝදනා අයිතමය අදාළ නොවේ නම් අයිතමය ඉවත් කරන්න
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,උදා. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +27,Transaction currency must be same as Payment Gateway currency,ගනුදෙනු මුදල් ගෙවීම් ගේට්වේ මුදල් ලෙස සමාන විය යුතුයි
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Transaction currency must be same as Payment Gateway currency,ගනුදෙනු මුදල් ගෙවීම් ගේට්වේ මුදල් ලෙස සමාන විය යුතුයි
 DocType: Payment Entry,Receive,ලබා
+apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,උපුටා දැක්වීම්:
 DocType: Maintenance Visit,Fully Completed,සම්පූර්ණයෙන්ම සම්පූර්ණ
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% සම්පූර්ණ
 DocType: Employee,Educational Qualification,අධ්යාපන සුදුසුකම්
 DocType: Workstation,Operating Costs,මෙහෙයුම් පිරිවැය
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,සමුච්චිත මාසික අයවැය කටයුතු කර ඉක්මවා
 DocType: Purchase Invoice,Submit on creation,නිර්මානය කිරීම මත ඉදිරිපත්
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +432,Currency for {0} must be {1},{0} {1} විය යුතුය සඳහා ව්යවහාර මුදල්
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +435,Currency for {0} must be {1},{0} {1} විය යුතුය සඳහා ව්යවහාර මුදල්
 DocType: Asset,Disposal Date,බැහැර කිරීමේ දිනය
 DocType: Employee Leave Approver,Employee Leave Approver,සේවක නිවාඩු Approver
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row {0}: An Reorder entry already exists for this warehouse {1},ෙරෝ {0}: ඇන් සීරුමාරු කිරීමේ ප්රවේශය දැනටමත් මෙම ගබඩා සංකීර්ණය {1} සඳහා පවතී
+apps/erpnext/erpnext/stock/doctype/item/item.py +495,Row {0}: An Reorder entry already exists for this warehouse {1},ෙරෝ {0}: ඇන් සීරුමාරු කිරීමේ ප්රවේශය දැනටමත් මෙම ගබඩා සංකීර්ණය {1} සඳහා පවතී
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +79,"Cannot declare as lost, because Quotation has been made.","උද්ධෘත කර ඇති නිසා, අහිමි ලෙස ප්රකාශයට පත් කළ නොහැක."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,මිලදී ගැනීම මාස්ටර් කළමනාකරු
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +429,Production Order {0} must be submitted,නිෂ්පාදන න්යාය {0} ඉදිරිපත් කළ යුතුය
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +434,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,මේ දක්වා දින සිට පෙර විය නොහැකි
@@ -3673,25 +3723,27 @@
 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 +181,Totals,එකතූන්
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,එකතූන්
 DocType: BOM,Manufacturing,නිෂ්පාදනය
 ,Ordered Items To Be Delivered,නියෝග අයිතම බාර දීමට
 DocType: Account,Income,ආදායම්
 DocType: Industry Type,Industry Type,කර්මාන්ත වර්ගය
 apps/erpnext/erpnext/templates/includes/cart.js +141,Something went wrong!,මොකක්හරි වැරද්දක් වෙලා!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,Warning: Leave application contains following block dates,"අවවාදයයි: අවසරය, අයදුම් පහත වාරණ දින අඩංගු"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +120,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} ඒකක.
+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 +181,Organization unit (department) master.,සංවිධානය ඒකකය (අංශය) ස්වාමියා.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,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 +793,All records are synced.,සියලු වාර්තා සමමුහුර්ත කර ඇත.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +781,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,අනාරක්ෂිත ණය
 DocType: Cost Center,Cost Center Name,වියදම මධ්යස්ථානය නම
@@ -3710,21 +3762,20 @@
 DocType: Address,Name of person or organization that this address belongs to.,පුද්ගලයෙක් හෝ සංවිධානයක් නම මෙම ලිපිනය අයිති.
 apps/erpnext/erpnext/public/js/setup_wizard.js +260,Your Suppliers,ඔබේ සැපයුම්කරුවන්
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +49,Cannot set as Lost as Sales Order is made.,විකුණුම් සාමය සෑදී ලෙස ලොස්ට් ලෙස සිටුවම් කල නොහැක.
-DocType: Student Applicant,Mother's Name,මවගේ නම
 DocType: Request for Quotation Item,Supplier Part No,සැපයුම්කරු අඩ නොමැත
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +348,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',කාණ්ඩය තක්සේරු &#39;හෝ&#39; Vaulation හා පූර්ණ &#39;සඳහා වන විට අඩු කර නොහැකි
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Received From,සිට ලැබුණු
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Received From,සිට ලැබුණු
 DocType: Lead,Converted,පරිවර්තනය කරන
 DocType: Item,Has Serial No,අනු අංකය ඇත
 DocType: Employee,Date of Issue,නිකුත් කරන දිනය
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: {0} {1} සඳහා සිට
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +153,Row #{0}: Set Supplier for item {1},ෙරෝ # {0}: අයිතමය සඳහා සැපයුම්කරු සකසන්න {1}
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +93,Row {0}: Hours value must be greater than zero.,ෙරෝ {0}: පැය අගය බිංදුවට වඩා වැඩි විය යුතුය.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +117,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} සොයාගත නොහැකි
 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 +172,{0} {1} does not exist,{0} {1} නොපවතියි
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +175,{0} {1} does not exist,{0} {1} නොපවතියි
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,Please check Multi Currency option to allow accounts with other currency,වෙනත් ව්යවහාර මුදල් ගිණුම් ඉඩ බහු ව්යවහාර මුදල් විකල්පය කරුණාකර පරීක්ෂා කරන්න
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +72,Item: {0} does not exist in the system,අයිතමය: {0} පද්ධතිය තුළ නොපවතියි
 apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,ඔබ ශීත කළ අගය නියම කිරීමට අවසර නැත
@@ -3733,13 +3784,14 @@
 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/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,පැමිණීම අනාගත දිනයන් සඳහා සලකුණු කල නොහැක
 DocType: Pricing Rule,Pricing Rule Help,මිල ගණන් පාලනය උදවු
 DocType: Purchase Taxes and Charges,Account Head,ගිණුම් අංශයේ ප්රධානී
 apps/erpnext/erpnext/config/stock.py +163,Update additional costs to calculate landed cost of items,භාණ්ඩ ගොඩ බස්වන ලදී පිරිවැය ගණනය කිරීමට අතිරේක වියදම් යාවත්කාලීන
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Electrical,විදුලි
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Electrical,විදුලි
 DocType: Stock Entry,Total Value Difference (Out - In),(- දී අතරින්) මුළු අගය වෙනස
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,Row {0}: Exchange Rate is mandatory,ෙරෝ {0}: විනිමය අනුපාතය අනිවාර්ය වේ
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},සේවක {0} සඳහා පරිශීලක අනන්යාංකය පිහිටුවා නැත
@@ -3747,7 +3799,7 @@
 DocType: Item,Customer Code,පාරිභෝගික සංග්රහයේ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +210,Birthday Reminder for {0},{0} සඳහා උපන් දිනය මතක්
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,පසුගිය සාමය නිසා දින
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +292,Debit To account must be a Balance Sheet account,ගිණුමක් සඳහා ඩෙබිට් වූ ශේෂ පත්රය ගිණුමක් විය යුතුය
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To account must be a Balance Sheet account,ගිණුමක් සඳහා ඩෙබිට් වූ ශේෂ පත්රය ගිණුමක් විය යුතුය
 DocType: Buying Settings,Naming Series,ශ්රේණි අනුප්රාප්තිකයා නම් කිරීම
 DocType: Leave Block List,Leave Block List Name,"අවසරය, වාරණ ලැයිස්තුව නම"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,කොටස් වත්කම්
@@ -3759,11 +3811,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 +301,Salary Slip of employee {0} already created for time sheet {1},සේවක වැටුප් පුරවා {0} දැනටමත් කාල පත්රය {1} සඳහා නිර්මාණය
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +313,Salary Slip of employee {0} already created for time sheet {1},සේවක වැටුප් පුරවා {0} දැනටමත් කාල පත්රය {1} සඳහා නිර්මාණය
 DocType: Sales Order Item,Ordered Qty,නියෝග යවන ලද
-apps/erpnext/erpnext/stock/doctype/item/item.py +673,Item {0} is disabled,අයිතමය {0} අක්රීය කර ඇත
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} is disabled,අයිතමය {0} අක්රීය කර ඇත
 DocType: Stock Settings,Stock Frozen Upto,කොටස් ශීත කළ තුරුත්
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +838,BOM does not contain any stock item,ද්රව්ය ලේඛණය ඕනෑම කොටස් අයිතමය අඩංගු නොවේ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +809,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.,ව්යාපෘති ක්රියාකාරකම් / කටයුත්තක්.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,වැටුප ලංකා අන්තර් බැංකු ගෙවීම් පද්ධතිය උත්පාදනය
@@ -3771,23 +3823,24 @@
 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 ලියන්න ප්රමාණය (සමාගම ව්යවහාර මුදල්)
-apps/erpnext/erpnext/stock/doctype/item/item.py +485,Row #{0}: Please set reorder quantity,ෙරෝ # {0}: කරුණාකර සකස් මොහොත ප්රමාණය
+DocType: Sales Invoice Timesheet,Billing Hours,බිල්පත් පැය
+apps/erpnext/erpnext/stock/doctype/item/item.py +487,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 +62,Please set {0},කරුණාකර {0} සකස්
 DocType: Purchase Invoice,Repeat on Day of Month,මාසික දිනය දා නැවත නැවත
 DocType: Employee,Health Details,සෞඛ්ය තොරතුරු
 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,ඉහත තෝරාගත් නිර්ණායක සඳහා සියලු වැටුප් ස්ලිප් ඉදිරිපත්
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} අයිතම සමමුහුර්ත
 DocType: Sales Order,Partly Delivered,අර්ධ වශයෙන් භාර
-DocType: Sales Invoice,Existing Customer,දැනට පවතින පාරිභෝගික
 DocType: Email Digest,Receivables,මුදල් ලැබිය
+DocType: Lead Source,Lead Source,ඊයම් ප්රභවය
 DocType: Customer,Additional information regarding the customer.,පාරිභෝගික සම්බන්ධ අතිරේක තොරතුරු.
 DocType: Quality Inspection Reading,Reading 5,5 කියවීම
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +38,Campaign Name is required,ව්යාපාරය නම අවශ්ය වේ
 DocType: Maintenance Visit,Maintenance Date,නඩත්තු දිනය
 DocType: Purchase Invoice Item,Rejected Serial No,ප්රතික්ෂේප අනු අංකය
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +80,Year start date or end date is overlapping with {0}. To avoid please set company,වසරේ ආරම්භක දිනය හෝ අවසන් දිනය {0} සමග අතිච්ඡාදනය වේ. වැළකී සමාගම පිහිටුවා කරුණාකර
@@ -3795,10 +3848,9 @@
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","උදාහරණය:. ABCD ##### මාලාවක් සකස් කරන අතර අනු අංකය ගනුදෙනු සඳහන් කර නැත, එසේ නම් ස්වයංක්රීය අනුක්රමික අංකය මෙම ලිපි මාලාවේ පාදක කරගෙන නිර්මාණය කරනු ලැබේ නම්. ඔබ හැම විටම සඳහන් පැහැදිලිවම අනු අංක මෙම අයිතමය සඳහා කිරීමට අවශ්ය නම්. මෙය හිස්ව තබන්න."
 DocType: Upload Attendance,Upload Attendance,පැමිණීම උඩුගත
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +129,BOM and Manufacturing Quantity are required,ද්රව්ය ලේඛණය හා නිෂ්පාදන ප්රමාණය අවශ්ය වේ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,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,මැක්ස් ශක්තිය
-DocType: Bank Reconciliation Detail,Amount,ප්රමාණය
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,ද්රව්ය ලේඛණය වෙනුවට
 ,Sales Analytics,විකුණුම් විශ්ලේෂණ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +113,Available {0},ලබා ගත හැකි {0}
@@ -3806,14 +3858,14 @@
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,විද්යුත් සකස් කිරීම
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +96,Please enter default currency in Company Master,සමාගම මාස්ටර් පෙරනිමි මුදල් ඇතුලත් කරන්න
 DocType: Stock Entry Detail,Stock Entry Detail,කොටස් Entry විස්තර
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +100,Daily Reminders,ඩේලි සිහිගැන්වීම්
+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/account/account_tree.js +23,New Account Name,නව ගිණුම නම
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,", අමු ද්රව්ය පිරිවැය සපයා"
 DocType: Selling Settings,Settings for Selling Module,විකිණීම මොඩියුලය සඳහා සැකසුම්
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Customer Service,පාරිභෝගික සේවය
+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/config/hr.py +50,Offer candidate a Job.,අපේක්ෂකයා රැකියා ඉදිරිපත් කිරීම.
@@ -3822,8 +3874,9 @@
 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} කොටස් අයිතමය විය යුතුය
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,ප්රගති ගබඩා දී පෙරනිමි වැඩ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1570,Total nos of serial no is not equal to quantity.,අනුක්රමික අංක මුළු අංක ප්රමාණය සමාන නොවේ.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1594,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,යාවත්කාලීන ශ්රේණි අංකය
@@ -3831,9 +3884,10 @@
 DocType: Sales Order,Printing Details,මුද්රණ විස්තර
 DocType: Task,Closing Date,අවසන් දිනය
 DocType: Sales Order Item,Produced Quantity,ඉදිරිපත් ප්රමාණ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Engineer,ඉංජිනේරු
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Engineer,ඉංජිනේරු
+DocType: Journal Entry,Total Amount Currency,මුළු මුදල ව්යවහාර මුදල්
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,සොයන්න උප එක්රැස්වීම්
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Item Code required at Row No {0},ෙරෝ නැත {0} හි අවශ්ය අයිතමය සංග්රහයේ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +398,Item Code required at Row No {0},ෙරෝ නැත {0} හි අවශ්ය අයිතමය සංග්රහයේ
 DocType: Sales Partner,Partner Type,සහකරු වර්ගය
 DocType: Purchase Taxes and Charges,Actual,සැබෑ
 DocType: Authorization Rule,Customerwise Discount,Customerwise වට්ටම්
@@ -3849,16 +3903,18 @@
 DocType: BOM,Raw Material Cost,අමු ද්රව්ය පිරිවැය
 DocType: Item Reorder,Re-Order Level,නැවත සාමය පෙළ
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,භාණ්ඩ ඇතුලත් කරන්න සහ ඔබ නිෂ්පාදන ඇනවුම් මතු හෝ විශ්ලේෂණ සඳහා අමුද්රව්ය බාගත කිරීම සඳහා අවශ්ය සඳහා යවන ලද සැලසුම් කළා.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +55,Part-time,අර්ධ කාලීන
+apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,Gantt සටහන
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,අර්ධ කාලීන
 DocType: Employee,Applicable Holiday List,අදාළ නිවාඩු ලැයිස්තුව
 DocType: Employee,Cheque,චෙක් පත
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,මාලාවක් යාවත්කාලීන කිරීම
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +57,Series Updated,මාලාවක් යාවත්කාලීන කිරීම
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,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 +87,Clearance Date updated,යාවත්කාලීන නිශ්කාශනෙය් දිනය
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,සාර්ථකව සමගි
@@ -3872,7 +3928,7 @@
 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 +513,Posting date and posting time is mandatory,"දිනය සහ වෙබ් අඩවියේ කාලය ගිය තැන, ශ්රී ලංකා තැපෑල අනිවාර්ය වේ"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,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.,ඔබ මිලදී ගැනීමේ නියෝගය බේරා වරක් වචන දෘශ්යමාන වනු ඇත.
@@ -3882,7 +3938,7 @@
 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/stock/doctype/stock_entry/stock_entry.py +158,Target warehouse in row {0} must be same as Production Order,පේළියේ ඉලක්ක ගබඩා සංකීර්ණය {0} නිෂ්පාදන න්යාය ලෙස සමාන විය යුතුයි
+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,ව්යවහාර මුදල් ෙවනත් මුදල් භාවිතා සටහන් කිරීමෙන් පසුව එය වෙනස් කළ නොහැක
 DocType: Company,Round Off Account,වටයේ ගිණුම අක්රිය
@@ -3891,23 +3947,22 @@
 DocType: Customer Group,Parent Customer Group,මව් කස්ටමර් සමූහයේ
 DocType: Purchase Invoice,Contact Email,අප අමතන්න විද්යුත්
 DocType: Appraisal Goal,Score Earned,ලකුණු උපයා
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Notice Period,දැනුම්දීමේ කාල පරිච්ඡේදය
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,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 +4,New Sales Person Name,නව විකුණුම් පුද්ගලයා නම
 DocType: Packing Slip,Gross Weight UOM,දළ බර UOM
-DocType: Email Digest,Receivables / Payables,මුදල් ලැබිය / ගෙවීම්
 DocType: Delivery Note Item,Against Sales Invoice,විකුණුම් ඉන්වොයිසිය එරෙහිව
 DocType: Bin,Reserved Qty for Production,නිෂ්පාදන සඳහා ඇවිරිනි යවන ලද
 DocType: Asset,Frequency of Depreciation (Months),ක්ෂය වාර ගණන (මාස)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +469,Credit Account,ක්රෙඩිට් ගිණුම්
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Credit Account,ක්රෙඩිට් ගිණුම්
 DocType: Landed Cost Item,Landed Cost Item,ඉඩම් හිමි වියදම අයිතමය
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +55,Show zero values,ශුන්ය අගයන් පෙන්වන්න
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,ශුන්ය අගයන් පෙන්වන්න
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,නිෂ්පාදන / අමු ද්රව්ය ලබා රාශි වෙතින් නැවත ඇසුරුම්කර පසු ලබා අයිතමය ප්රමාණය
 apps/erpnext/erpnext/public/js/setup_wizard.js +315,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 +647,Please specify Attribute Value for attribute {0},විශේෂණය {0} සඳහා අගය ආරෝපණය සඳහන් කරන්න
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},විශේෂණය {0} සඳහා අගය ආරෝපණය සඳහන් කරන්න
 DocType: Item,Default Warehouse,පෙරනිමි ගබඩාව
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +39,Budget cannot be assigned against Group Account {0},අයවැය සමූහ ගිණුම {0} එරෙහිව පවරා ගත නොහැකි
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,මව් වියදම් මධ්යස්ථානය ඇතුලත් කරන්න
@@ -3929,19 +3984,22 @@
 DocType: Journal Entry,Total Debit,මුළු ඩෙබිට්
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,පෙරනිමි භාණ්ඩ ගබඩා නිමි
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,විකුණුම් පුද්ගලයෙක්
-DocType: Sales Invoice,Cold Calling,සීතල ඇමතුම්
 DocType: SMS Parameter,SMS Parameter,කෙටි පණිවුඩ පරාමිති
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,අයවැය සහ වියදම මධ්යස්ථානය
 DocType: Maintenance Schedule Item,Half Yearly,අර්ධ වාර්ෂිකව
 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 +253,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 +141,Set as Lost,ලොස්ට් ලෙස සකසන්න
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,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 +5,This is based on transactions against this Customer. See timeline below for details,මෙය මේ පාරිභෝගික එරෙහිව ගනුදෙනු මත පදනම් වේ. විස්තර සඳහා පහත කාල සටහනකට බලන්න
 DocType: Supplier,Credit Days Based On,ක්රෙඩිට් දිනවලදී පදනම්
@@ -3953,11 +4011,10 @@
 ,Items To Be Requested,අයිතම ඉල්ලන කිරීමට
 DocType: Purchase Order,Get Last Purchase Rate,ලබා ගන්න අවසන් මිලදී ගැනීම අනුපාත
 DocType: Company,Company Info,සමාගම තොරතුරු
-apps/erpnext/erpnext/accounts/page/pos/pos.js +941,Select or add new customer,නව පාරිභෝගික තෝරා ගැනීමට හෝ එකතු
+apps/erpnext/erpnext/accounts/page/pos/pos.js +930,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 +5,This is based on the attendance of this Employee,මෙය මේ සේවක පැමිණීම මත පදනම් වේ
-DocType: Sales Invoice,Frequency,සංඛ්යාත
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +463,Debit Account,ඩෙබිට් ගිණුම
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Debit Account,ඩෙබිට් ගිණුම
 DocType: Fiscal Year,Year Start Date,වසරේ ආරම්භක දිනය
 DocType: Attendance,Employee Name,සේවක නම
 DocType: Sales Invoice,Rounded Total (Company Currency),වටකුරු එකතුව (සමාගම ව්යවහාර මුදල්)
@@ -3966,27 +4023,27 @@
 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 +210,Supplier Quotation {0} created,සැපයුම්කරු උද්ධෘත {0} නිර්මාණය
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +208,Supplier Quotation {0} created,සැපයුම්කරු උද්ධෘත {0} නිර්මාණය
 apps/erpnext/erpnext/accounts/report/financial_statements.py +90,End Year cannot be before Start Year,අවසන් වසර ආරම්භය අවුරුද්දට පෙර විය නොහැකි
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Employee Benefits,සේවක ප්රතිලාභ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,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 +228,Please set a default Holiday List for Employee {0} or Company {1},සේවක {0} හෝ සමාගම සඳහා පෙරනිමි නිවාඩු ලැයිස්තු සකස් කරුණාකර {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +232,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 +499,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ෙරෝ නැත {0}: ප්රමාණය වියදම් හිමිකම් {1} එරෙහිව මුදල තෙක් ට වඩා වැඩි විය නොහැක. විභාග මුදල වේ {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +500,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ෙරෝ නැත {0}: ප්රමාණය වියදම් හිමිකම් {1} එරෙහිව මුදල තෙක් ට වඩා වැඩි විය නොහැක. විභාග මුදල වේ {2}
 DocType: Maintenance Schedule,Schedule,උපෙල්ඛනෙය්
 DocType: Account,Parent Account,මව් ගිණුම
 DocType: Quality Inspection Reading,Reading 3,කියවීම 3
 ,Hub,මධ්යස්ථානයක්
 DocType: GL Entry,Voucher Type,වවුචරය වර්ගය
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1007,Price List not found or disabled,මිල ලැයිස්තුව සොයා හෝ ආබාධිත නොවන
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1008,Price List not found or disabled,මිල ලැයිස්තුව සොයා හෝ ආබාධිත නොවන
 DocType: Expense Claim,Approved,අනුමත
 DocType: Pricing Rule,Price,මිල
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +244,Employee relieved on {0} must be set as 'Left',{0} &#39;වමේ&#39; ලෙස සකස් කළ යුතු ය මත මුදා සේවක
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +256,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} සඳහා නිර්මාණය
@@ -3997,12 +4054,12 @@
 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 +259,Please select Employee Record first.,කරුණාකර සේවක වාර්තා පළමු තෝරන්න.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +266,Please select Employee Record first.,කරුණාකර සේවක වාර්තා පළමු තෝරන්න.
 DocType: POS Profile,Account for Change Amount,වෙනස් මුදල ගිණුම්
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +190,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},ෙරෝ {0}: පක්ෂය / ගිණුම් {3} {4} තුළ {1} / {2} සමග නොගැලපේ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +235,Please enter Expense Account,ගෙවීමේ ගිණුම් ඇතුලත් කරන්න
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,Please enter Expense Account,ගෙවීමේ ගිණුම් ඇතුලත් කරන්න
 DocType: Account,Stock,කොටස්
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,"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 +976,"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,මිලදී ගැනීම / නිෂ්පාදනය විස්තර
@@ -4017,9 +4074,10 @@
 DocType: Asset Movement,Transaction Date,ගනුදෙනු දිනය
 DocType: Production Plan Item,Planned Qty,සැලසුම්ගත යවන ලද
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,මුළු බදු
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,For Quantity (Manufactured Qty) is mandatory,ප්රමාණ සඳහා (නිශ්පාදිත යවන ලද) අනිවාර්ය වේ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,For Quantity (Manufactured Qty) is mandatory,ප්රමාණ සඳහා (නිශ්පාදිත යවන ලද) අනිවාර්ය වේ
 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 +78,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,සැබෑ ඇරඹුම් දිනය
@@ -4034,9 +4092,11 @@
 DocType: Warranty Claim,If different than customer address,පාරිභෝගික ලිපිනය වඩා වෙනස් නම්
 DocType: BOM Operation,BOM Operation,ද්රව්ය ලේඛණය මෙහෙයුම
 DocType: Purchase Taxes and Charges,On Previous Row Amount,පසුගිය ෙරෝ මුදල මත
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +226,Transfer Asset,වත්කම් මාරු
+DocType: Student,Home Address,නිවසේ ලිපිනය
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +227,Transfer Asset,වත්කම් මාරු
 DocType: POS Profile,POS Profile,POS නරඹන්න
 apps/erpnext/erpnext/config/schools.py +33,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 +129,"Item {0} is a template, please select one of its variants","අයිතමය {0} සැකිලි වේ, කරුණාකර එහි විවිධ එකක් තෝරන්න"
 DocType: Asset,Asset Category,වත්කම් ප්රවර්ගය
@@ -4046,8 +4106,8 @@
 DocType: Assessment,Room,කාමරය
 DocType: Purchase Order,Advance Paid,උසස් ගෙවුම්
 DocType: Item,Item Tax,අයිතමය බදු
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +765,Material to Supplier,සැපයුම්කරු ද්රව්යමය
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +189,Excise Invoice,සුරාබදු ඉන්වොයිසිය
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,Material to Supplier,සැපයුම්කරු ද්රව්යමය
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,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,ජංගම වගකීම්
@@ -4057,7 +4117,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,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 +136,Credit Card,ණයවර පත
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,ණයවර පත
 DocType: BOM,Item to be manufactured or repacked,අයිතමය නිෂ්පාදිත හෝ repacked කිරීමට
 apps/erpnext/erpnext/config/stock.py +174,Default settings for stock transactions.,කොටස් ගනුදෙනු සඳහා පෙරනිමි සැකසුම්.
 DocType: Purchase Invoice,Next Date,ඊළඟ දිනය
@@ -4065,6 +4125,7 @@
 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: Academic Term,Term End Date,කාලීන අවසානය දිනය
 DocType: Hub Settings,Seller Name,විකුණන්නා නම
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),අඩු කිරීමේ බදු හා ගාස්තු (සමාගම ව්යවහාර මුදල්)
 DocType: Item Group,General Settings,සාමාන්ය සැකසුම්
@@ -4076,7 +4137,7 @@
 DocType: Customer,Commission Rate,කොමිසම අනුපාතිකය
 apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,ප්රභේද්යයක් කරන්න
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,දෙපාර්තමේන්තුව විසින් නිවාඩු අයදුම්පත් අවහිර කරයි.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +115,"Payment Type must be one of Receive, Pay and Internal Transfer","ගෙවීම් වර්ගය පිළිගන්න එකක් විය යුතුය, වැටුප් හා අභ තර ස්ථ"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +118,"Payment Type must be one of Receive, Pay and Internal Transfer","ගෙවීම් වර්ගය පිළිගන්න එකක් විය යුතුය, වැටුප් හා අභ තර ස්ථ"
 apps/erpnext/erpnext/config/selling.py +169,Analytics,විශ්ලේෂණ
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,කරත්ත හිස් වේ
 DocType: Production Order,Actual Operating Cost,සැබෑ මෙහෙයුම් පිරිවැය
@@ -4091,10 +4152,10 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,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 +92,Designer,නිර්මාණකරුවා
+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/accounts/doctype/purchase_invoice/purchase_invoice.py +469,Cost Center is required in row {0} in Taxes table for type {1},වර්ගය {1} සඳහා බදු පේළියක {0} පිරිවැය මධ්යස්ථානය අවශ්ය වේ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +472,Cost Center is required in row {0} in Taxes table for type {1},වර්ගය {1} සඳහා බදු පේළියක {0} පිරිවැය මධ්යස්ථානය අවශ්ය වේ
 DocType: Program,Program Code,වැඩසටහන සංග්රහයේ
 ,Item-wise Purchase Register,අයිතමය ප්රඥාවන්ත මිලදී ගැනීම රෙජිස්ටර්
 DocType: Batch,Expiry Date,කල්පිරෙන දිනය
@@ -4104,12 +4165,12 @@
 apps/erpnext/erpnext/config/projects.py +13,Project master.,ව්යාපෘති ස්වාමියා.
 apps/erpnext/erpnext/controllers/status_updater.py +174,"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 +417, (Half Day),(අඩක් දිනය)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425, (Half Day),(අඩක් දිනය)
 DocType: Supplier,Credit Days,ක්රෙඩිට් දින
 DocType: Leave Type,Is Carry Forward,ඉදිරියට ගෙන ඇත
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +740,Get Items from BOM,ද්රව්ය ලේඛණය සිට අයිතම ලබා ගන්න
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +711,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 +549,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},"ෙරෝ # {0}: ගිය තැන, ශ්රී ලංකා තැපෑල දිනය මිලදී දිනය ලෙස සමාන විය යුතුය {1} වත්කම් {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +552,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,එක් ගබඩාවක් තවත් සම්පතක් මාරු
diff --git a/erpnext/translations/sk.csv b/erpnext/translations/sk.csv
index 95fc900..d8c5aa1 100644
--- a/erpnext/translations/sk.csv
+++ b/erpnext/translations/sk.csv
@@ -18,11 +18,10 @@
 DocType: Sales Partner,Dealer,Dealer
 DocType: Employee,Rented,Pronajato
 DocType: Purchase Order,PO-,po-
-apps/erpnext/erpnext/accounts/report/financial_statements.py +19,Start Year {0} not found.,Začať rok {0} nebol nájdený.
 DocType: POS Profile,Applicable for User,Použiteľné pre Užívateľa
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +191,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Zastavil výrobu Objednať nemožno zrušiť, uvoľniť ho najprv zrušiť"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +197,Do you really want to scrap this asset?,Naozaj chcete zrušiť túto pohľadávku?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +17,Select Default Supplier,Vybrať Predvolené Dodávateľ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +192,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Zastavil výrobu Objednať nemožno zrušiť, uvoľniť ho najprv zrušiť"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +198,Do you really want to scrap this asset?,Naozaj chcete zrušiť túto pohľadávku?
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Vybrať Predvolené Dodávateľ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Měna je vyžadováno pro Ceníku {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Bude vypočítané v transakcii.
 DocType: Address,County,grófstva
@@ -42,46 +41,45 @@
 DocType: Sales Invoice,Customer Name,Meno zákazníka
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +126,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 +180,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 +183,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 +148,Series Updated Successfully,Řada Aktualizováno Úspěšně
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +149,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
-DocType: Quality Inspection Reading,Parameter,Parametr
 apps/erpnext/erpnext/projects/doctype/project/project.py +54,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 +239,New Leave Application,New Leave Application
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,New Leave Application,New Leave Application
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +20,Attendance Record {0} exists against Student {1} for Course Schedule {2},Účasť Record {0} existuje proti Študent {1} pre rozvrh {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Bank Draft,Bank Návrh
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,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
 DocType: Academic Term,Academic Term,akademický Term
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +13,Material,Materiál
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Quantity,Množství
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +511,Accounts table cannot be blank.,Účty tabuľka nemôže byť prázdne.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +616,Quantity,Množství
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +512,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)
 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/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 +142,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í
-DocType: Purchase Invoice,Monthly,Měsíčně
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Oneskorenie s platbou (dni)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +771,Invoice,Faktúra
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +750,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 +198,Row {0}: {1} {2} does not match with {3},Řádek {0}: {1} {2} se neshoduje s {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Řádek # {0}:
+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 +127,Please select Price List,"Prosím, vyberte Ceník"
@@ -112,8 +110,8 @@
 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 +589,Get items from,Získať predmety z
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +382,Stock cannot be updated against Delivery Note {0},Sklad nelze aktualizovat na dodací list {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Získať predmety z
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,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
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Potraviny
@@ -122,7 +120,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 +156,Salary Structure Missing,Plat Štruktúra Chýbajúce
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,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
@@ -130,10 +128,11 @@
 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 +156,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/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Je Fixed Asset&quot; nemôže byť bez povšimnutia, pretože existuje Asset záznam proti položke"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +189,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"
 DocType: Tax Rule,Tax Type,Typ dane
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +144,You are not authorized to add or update entries before {0},Nejste oprávněni přidávat nebo aktualizovat údaje před {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,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/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
@@ -143,18 +142,17 @@
 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 +165,Opening,Otvor
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,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/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Customer&gt; Customer Group&gt; Územie
 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.
 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"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Company first,"Prosím, vyberte první firma"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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
@@ -164,7 +162,7 @@
 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é
 DocType: Purchase Invoice Item,Is Fixed Asset,Je dlhodobého majetku
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Available qty is {0}, you need {1}","K dispozícii je množstvo {0}, musíte {1}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +225,"Available qty is {0}, you need {1}","K dispozícii je množstvo {0}, musíte {1}"
 DocType: Expense Claim Detail,Claim Amount,Nárok Částka
 DocType: Employee,Mr,Pan
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Dodavatel Typ / dovozce
@@ -173,26 +171,27 @@
 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: Assessment Result,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 +171,Annual Salary,Ročné Plat
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Annual Salary,Ročné Plat
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Stock Náklady
-apps/erpnext/erpnext/accounts/report/financial_statements.py +22,End Year {0} not found.,Koniec roka {0} nebol nájdený.
 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}
 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 +130,At least one mode of payment is required for POS invoice.,pre POS faktúru je nutná aspoň jeden spôsob platby.
 DocType: Products Settings,Show Products as a List,Zobraziť produkty ako zoznam
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Stáhněte si šablony, vyplňte potřebné údaje a přiložte upravený soubor.
  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 +451,Item {0} is not active or end of life has been reached,"Bod {0} není aktivní, nebo byl dosažen konec života"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +456,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/controllers/accounts_controller.py +614,"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/controllers/accounts_controller.py +617,"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 +166,Settings for HR Module,Nastavenie modulu HR
 DocType: SMS Center,SMS Center,SMS centrum
 DocType: Sales Invoice,Change Amount,zmena Suma
@@ -204,13 +203,13 @@
 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 +147,Execution,Provedení
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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/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}"
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,Cost Center {0} does not belong to Company {1},Náklady Center {0} nepatří do společnosti {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +100,Cost Center {0} does not belong to Company {1},Náklady Center {0} nepatří do společnosti {1}
 DocType: Customer,Individual,Individuální
 DocType: Interest,Academics User,akademici Užívateľ
 DocType: Cheque Print Template,Amount In Figure,Na obrázku vyššie
@@ -226,30 +225,32 @@
 DocType: Production Planning Tool,Sales Orders,Prodejní objednávky
 DocType: Purchase Taxes and Charges,Valuation,Ocenění
 ,Purchase Order Trends,Nákupní objednávka trendy
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,The request for quotation can be accessed by clicking on the following link,Žiadosť o cenovú ponuku je možné pristupovať kliknutím na nasledujúci odkaz
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,Přidělit listy za rok.
 DocType: SG Creation Tool Course,SG Creation Tool Course,SG nástroj pre tvorbu ihriská
 DocType: Student Group Creation Tool,Leave blank if you wish to fetch all courses for selected academic term,"Ponechajte prázdne, na prevzatie všetkých kurzy pre vybrané semestra"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,Insufficient Stock,nedostatočná Sklad
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227,Insufficient Stock,nedostatočná Sklad
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Zakázať Plánovanie kapacít a Time Tracking
+DocType: Email Digest,New Sales Orders,Nové Prodejní objednávky
 DocType: Bank Reconciliation,Bank Account,Bankový účet
 DocType: Leave Type,Allow Negative Balance,Povolit záporný zůstatek
 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/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} does not belong to Company {1},Účet {0} nepatří do společnosti {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +86,Account {0} does not belong to Company {1},Účet {0} nepatří do společnosti {1}
 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}
 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á
 DocType: Course Schedule,Instructor Name,inštruktor Name
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,For Warehouse is required before Submit,Pro Sklad je povinné před Odesláním
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,For Warehouse is required before Submit,Pro Sklad je povinné před Odesláním
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Prijaté On
 DocType: Sales Partner,Reseller,Reseller
 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 +1436,"LocalStorage is full , did not save","Miestne úložisko je plná, nezachránil"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1460,"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}
@@ -262,18 +263,19 @@
 apps/erpnext/erpnext/templates/generators/item.html +78,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 +5,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/leave_application/leave_application.py +206,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/leave_application/leave_application.py +213,Only the selected Leave Approver can submit this Leave Application,Pouze vybraný Leave schvalovač může podat této dovolené aplikaci
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Uvolnění Datum musí být větší než Datum spojování
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Leaves per Year,Listy za rok
+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 +103,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}
+DocType: Email Digest,Profit & Loss,Profit &amp; Loss
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,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 +435,Leave Blocked,Nechte Blokováno
-apps/erpnext/erpnext/stock/doctype/item/item.py +669,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 +443,Leave Blocked,Nechte Blokováno
+apps/erpnext/erpnext/stock/doctype/item/item.py +671,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 +83,Annual,Roční
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +86,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í
@@ -281,20 +283,22 @@
 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"
 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 +91,Software Developer,Software Developer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Minimální objednávka Množství
 DocType: Pricing Rule,Supplier Type,Dodavatel Type
 DocType: Scheduling Tool,Course Start Date,Začiatok Samozrejme Dátum
 DocType: Item,Publish in Hub,Publikovat v Hub
+DocType: Student Admission,Student Admission,študent Vstupné
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is cancelled,Položka {0} je zrušená
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Material Request,Požadavek na materiál
+apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} is cancelled,Položka {0} je zrušená
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +823,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 +28,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 +328,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Položka {0} nebol nájdený v &quot;suroviny dodanej&quot; tabuľky v objednávke {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +333,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Položka {0} nebol nájdený v &quot;suroviny dodanej&quot; tabuľky v objednávke {1}
 DocType: Employee,Relation,Vztah
 DocType: Shipping Rule,Worldwide Shipping,Celosvetovo doprava
+DocType: Student Guardian,Mother,matka
 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
@@ -310,20 +314,21 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +130,Please select Charge Type first,"Prosím, vyberte druh tarifu první"
 DocType: Student Group Student,Student Group Student,Študent Skupina Student
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Najnovšie
+DocType: Email Digest,New Quotations,Nové Citace
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,První Leave schvalovač v seznamu bude nastaven jako výchozí Leave schvalujícího
 DocType: Tax Rule,Shipping County,vodná doprava County
 apps/erpnext/erpnext/config/desktop.py +158,Learn,Učiť sa
 DocType: Asset,Next Depreciation Date,Vedľa Odpisy Dátum
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Náklady na činnosť na jedného zamestnanca
 DocType: Accounts Settings,Settings for Accounts,Nastavenie Účtovníctva
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +626,Supplier Invoice No exists in Purchase Invoice {0},Dodávateľské faktúry No existuje vo faktúre {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +629,Supplier Invoice No exists in Purchase Invoice {0},Dodávateľské faktúry No existuje vo faktúre {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Správa obchodník strom.
 DocType: Job Applicant,Cover Letter,Sprievodný list
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Vynikajúci Šeky a vklady s jasnými
 DocType: Item,Synced With Hub,Synchronizovány Hub
 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 +348,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 +86,Circular Reference Error,Kruhové Referenčné Chyba
@@ -335,15 +340,16 @@
 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 +806,Delivery Note,Dodací list
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +800,Delivery Note,Dodací list
 apps/erpnext/erpnext/config/learn.py +87,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 +233,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/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/setup/doctype/email_digest/email_digest.py +104,Summary for this week and pending activities,Zhrnutie pre tento týždeň a prebiehajúcim činnostiam
+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"
 DocType: Employee,Company Email,E-mail spoločnosti
@@ -355,28 +361,29 @@
 apps/erpnext/erpnext/config/hr.py +186,"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"
-apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Riadok # {0}: faktúry nemožno vykonať voči existujúcemu aktívu {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +554,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 +54,{0} already allocated for Employee {1} for period {2} to {3},{0} už pridelené pre zamestnancov {1} na dobu {2} až {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +812,Select Item,Select Položka
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +791,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 \
 					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 +142,Purchase Invoice {0} is already submitted,Přijatá faktura {0} je již odeslána
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},"Row # {0}: Batch No musí byť rovnaké, ako {1} {2}"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +143,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.
 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 +342,Please see attachment,"Prosím, viz příloha"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,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 +19,Setup Already Complete!!,Setup již dokončen !!
 ,Finished Goods,Hotové zboží
 DocType: Delivery Note,Instructions,Instrukce
 DocType: Quality Inspection,Inspected By,Zkontrolován
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Dodávateľ&gt; Dodávateľ Type
 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/public/js/utils/item_selector.js +12,Add Items,Pridať položky
@@ -390,29 +397,29 @@
 DocType: Currency Exchange,Currency Exchange,Směnárna
 DocType: Purchase Invoice Item,Item Name,Název položky
 DocType: Authorization Rule,Approving User  (above authorized value),Schválenie užívateľa (nad oprávnenej hodnoty)
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Credit Balance
+DocType: Email Digest,Credit Balance,Credit Balance
 DocType: Employee,Widowed,Ovdovělý
 DocType: Request for Quotation,Request for Quotation,Žiadosť o cenovú ponuku
 DocType: Salary Slip Timesheet,Working Hours,Pracovní doba
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Změnit výchozí / aktuální pořadové číslo existujícího série.
 apps/erpnext/erpnext/accounts/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 +736,Purchase Return,Nákup Return
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +715,Purchase Return,Nákup Return
 ,Purchase Register,Nákup Register
 DocType: 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 +202,{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 +209,{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 +143,Reason for losing,Důvod ztráty
-apps/erpnext/erpnext/accounts/utils.py +239,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 +163,Reason for losing,Důvod ztráty
+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é
 DocType: Announcement,Receiver,prijímač
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation je uzavřena v následujících dnech podle Prázdninový Seznam: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Príležitosti
 DocType: Employee,Single,Jednolůžkový
 DocType: 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 +225,Please enter Cost Center,"Prosím, zadejte nákladové středisko"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,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
@@ -425,26 +432,26 @@
 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
 DocType: Account,Is Group,Is Group
+DocType: Email Digest,Pending Purchase Orders,čaká objednávok
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Automaticky nastaviť sériových čísel na základe FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,"Skontrolujte, či dodávateľské faktúry Počet Jedinečnosť"
 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 +102,Non Profit,Non Profit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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: Stock Reconciliation Item,Do not include symbols (ex. $),Nezahŕňajú symboly (napr. $)
 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 +638,Attribute {0} selected multiple times in Attributes Table,Atribút {0} vybraný niekoľkokrát v atribútoch tabuľke
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Atribút {0} vybraný niekoľkokrát v atribútoch tabuľke
 DocType: HR Settings,Employee record is created using selected field. ,Záznam Zaměstnanec je vytvořena pomocí vybrané pole.
 DocType: Sales Order,Not Applicable,Nehodí se
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Holiday master.
 DocType: Request for Quotation Item,Required Date,Požadovaná data
 DocType: Delivery Note,Billing Address,Fakturační adresa
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +862,Please enter Item Code.,"Prosím, zadejte kód položky."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +847,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"
@@ -458,12 +465,12 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Cenné papíry a vklady
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Celkom listy pridelené je povinné
 DocType: Job Opening,Description of a Job Opening,Popis jednoho volných pozic
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Pending activities for today,Nevybavené aktivity pre dnešok
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Nevybavené aktivity pre dnešok
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Účast rekord.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Plat komponentov pre mzdy časového rozvrhu.
 DocType: Sales Order Item,Used for Production Plan,Používá se pro výrobní plán
 DocType: Manufacturing Settings,Time Between Operations (in mins),Doba medzi operáciou (v min)
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +92,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} Rozpočet na účet {1} proti nákladového strediska {2} je {3}. To bude presahovať o {4}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +95,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} Rozpočet na účet {1} proti nákladového strediska {2} je {3}. To bude presahovať o {4}
 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 nie sú rovnaké položky
@@ -471,16 +478,16 @@
 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/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 +86,Administrative Officer,Správní ředitel
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,Správní ředitel
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +23,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 +319,Please select Company,"Prosím, vyberte Company"
-DocType: Stock Entry,Difference Account,Rozdíl účtu
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +309,Please select Company,"Prosím, vyberte Company"
+DocType: Stock Entry Detail,Difference Account,Rozdíl účtu
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,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 +398,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 +399,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 +530,"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 +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"
 DocType: Shipping Rule,Net Weight,Hmotnost
 DocType: Employee,Emergency Phone,Nouzový telefon
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +28,Buy,kúpiť
@@ -488,7 +495,7 @@
 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 +1563,Serial no item cannot be a fraction,Sériovej žiadna položka nemôže byť zlomkom
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1587,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
@@ -497,13 +504,14 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Account {0} does not belong to company: {1},Účet {0} nepatří k firmě: {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation already used for another company,Skratka už použitý pre inú spoločnosť
 DocType: Selling Settings,Default Customer Group,Výchozí Customer Group
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Supplier is required against Payable account {0},Dodávateľ je potrebná proti zaplateniu účtu {0}
 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
 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 +313,Reference No and Reference Date is mandatory for Bank transaction,Referenčné číslo a referenčný dátum je povinný pre bankové transakcie
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +316,Reference No and Reference Date is mandatory for Bank transaction,Referenčné číslo a referenčný dátum je povinný pre bankové transakcie
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Přidat / Upravit daní a poplatků
 DocType: Purchase Invoice,Supplier Invoice No,Dodávateľská faktúra č
 DocType: Territory,For reference,Pro srovnání
@@ -514,7 +522,6 @@
 DocType: Installation Note Item,Installation Note Item,Poznámka k instalaci bod
 DocType: Production Plan Item,Pending Qty,Čakajúci Množstvo
 DocType: Budget,Ignore,Ignorovat
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Kód položky&gt; položka Group&gt; Brand
 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/config/accounts.py +241,Setup cheque dimensions for printing,Skontrolujte nastavenie rozmery pre tlač
 DocType: Salary Slip,Salary Slip Timesheet,Plat Slip časový rozvrh
@@ -525,11 +532,11 @@
 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/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 +28,Please select Company and Party Type first,Vyberte první společnost a Party Typ
+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/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 +707,Make Sales Order,Ujistěte se prodejní objednávky
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +701,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
@@ -545,7 +552,8 @@
 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 +734,Sales Return,Sales Return
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +728,Sales Return,Sales Return
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +91,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)
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Databáze potenciálních zákazníků.
@@ -554,14 +562,13 @@
 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 +212,Opening (Cr),Otvor (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +795,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"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 +237,Allocated amount can not be negative,Přidělená částka nemůže být záporná
+apps/erpnext/erpnext/stock/doctype/item/item.py +797,Default Unit of Measure for Item {0} cannot be changed directly because 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á
 DocType: Purchase Order Item,Billed Amt,Účtovaného Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,"Logická Warehouse na položky, které mohou být vyrobeny."
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Predajná faktúry časový rozvrh
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},Referenční číslo a referenční datum je nutné pro {0}
-DocType: Sales Invoice,Customer's Vendor,Prodejce zákazníka
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Proposal Writing,Návrh Psaní
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,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"
@@ -570,13 +577,14 @@
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,Time Tracking
 DocType: Fiscal Year Company,Fiscal Year Company,Fiskální rok Společnosti
 DocType: Packing Slip Item,DN Detail,DN Detail
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +257,Already supplier quotation has created,Už dodávateľ citát vytvoril
 DocType: Timesheet,Billed,Fakturováno
 DocType: Batch,Batch Description,Popis Šarže
+apps/erpnext/erpnext/accounts/utils.py +685,"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 +733,View Offline Records,Zobrazenie Offline Records
+apps/erpnext/erpnext/accounts/page/pos/pos.js +715,View Offline Records,Zobrazenie Offline Records
+DocType: Student,Sibling Details,súrodenec Podrobnosti
 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: Payment Reconciliation,Invoice/Journal Entry Details,Faktura / Zápis do deníku Podrobnosti
@@ -590,7 +598,7 @@
 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
 DocType: Employee,Passport Number,Číslo pasu
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Manager,Manažér
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,Manažér
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,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é"
@@ -599,10 +607,11 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter email address,Zadejte e-mailovou adresu
 DocType: Production Order Operation,In minutes,V minútach
 DocType: Issue,Resolution Date,Rozlišení Datum
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +299,Timesheet created:,Harmonogramu vytvorenia:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +715,Please set default Cash or Bank account in Mode of Payment {0},Prosím nastavte výchozí v hotovosti nebo bankovním účtu v způsob platby {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +300,Timesheet created:,Harmonogramu vytvorenia:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +772,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ť
 DocType: Selling Settings,Customer Naming By,Zákazník Pojmenování By
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,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
 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
 DocType: Activity Cost,Activity Type,Druh činnosti
@@ -627,6 +636,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,Skončiť
 DocType: Pricing Rule,Sales Manager,Manažer prodeje
 DocType: Salary Structure Employee,Base,základňa
+DocType: Timesheet,Total Billed Hours,Celkom Predpísané Hodiny
 DocType: Journal Entry,Write Off Amount,Odepsat Částka
 DocType: Journal Entry,Bill No,Bill No
 DocType: Company,Gain/Loss Account on Asset Disposal,Zisk / straty na majetku likvidáciu
@@ -641,11 +651,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +9,Pre Sales,Predpredaj
 DocType: Purchase Receipt,Other Details,Ďalšie podrobnosti
 DocType: Account,Accounts,Účty
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Marketing,Marketing
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +227,Payment Entry is already created,Vstup Platba je už vytvorili
+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,Vstup Platba je už vytvorili
 DocType: Purchase Receipt Item Supplied,Current Stock,Current skladem
-apps/erpnext/erpnext/controllers/accounts_controller.py +538,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 +21,Preview Salary Slip,Preview výplatnej páske
+apps/erpnext/erpnext/controllers/accounts_controller.py +541,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 +38,Preview Salary Slip,Preview výplatnej páske
 DocType: Company,Deafult Cost Center,Deafult nákladového strediska
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +48,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í
@@ -654,7 +664,7 @@
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,"Prosím, vyberte si študentská skupina"
 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 +617,Item has variants.,Položka má varianty.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Položka má varianty.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,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
@@ -674,7 +684,7 @@
 DocType: Purchase Order,Supply Raw Materials,Dodávok surovín
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Datum, kdy bude vygenerován příští faktury. To je generován na odeslat."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Oběžná aktiva
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,{0} is not a stock Item,{0} nie je skladová položka
+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 +169,Lead must be set if Opportunity is made from Lead,Vedoucí musí být nastavena pokud Opportunity je vyrobena z olova
@@ -760,26 +770,25 @@
 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 +709,No Permission,Nemáte oprávnenie
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +710,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}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +298,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 +542,Row #{0}: Asset {1} must be submitted,Riadok # {0}: {1} Asset musia byť predložené
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset {1} must be submitted,Riadok # {0}: {1} Asset musia byť predložené
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Nenájdený žiadny zamestnanec
 DocType: Supplier Quotation,Stopped,Zastaveno
 DocType: Item,If subcontracted to a vendor,Ak sa subdodávky na dodávateľa
 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.
 DocType: Warehouse,Tree Details,Tree Podrobnosti
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Odeslat nyní
 ,Support Analytics,Podpora Analytics
 DocType: Item,Website Warehouse,Sklad pro web
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimálna suma faktúry
 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/sales_invoice/sales_invoice.py +227,Timesheet {0} is already completed or cancelled,Harmonogramu {0} je už dokončená alebo zrušená
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +259,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
@@ -795,13 +804,13 @@
 apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,rozvrh
 DocType: Maintenance Visit,Completion Status,Dokončení Status
 DocType: HR Settings,Enter retirement age in years,Zadajte vek odchodu do dôchodku v rokoch
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +229,Target Warehouse,Target Warehouse
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +230,Target Warehouse,Target Warehouse
 DocType: Cheque Print Template,Starting location from left edge,Počnúc umiestnenie od ľavého okraja
 DocType: Item,Allow over delivery or receipt upto this percent,Nechajte cez dodávku alebo príjem aľ tohto percenta
 DocType: Stock Entry,STE-,ste-
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Sales Order Date,"Očekávané datum dodání, nemůže být před Sales pořadí Datum"
 DocType: Upload Attendance,Import Attendance,Importovat Docházku
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Všechny skupiny položek
+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/config/setup.py +89,Automatically compose message on submission of transactions.,Automaticky napsat vzkaz na předkládání transakcí.
@@ -813,13 +822,15 @@
 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/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
 DocType: Expense Claim,Expenses,Výdaje
 DocType: Item Variant Attribute,Item Variant Attribute,Vlastnosť Variantu Položky
 ,Purchase Receipt Trends,Doklad o koupi Trendy
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Research & Development,Výzkum a vývoj
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Výzkum a vývoj
 ,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í
 DocType: Leave Block List Date,Leave Block List Date,Nechte Block List Datum
 DocType: Pricing Rule,Price or Discount,Cena nebo Sleva
@@ -828,7 +839,7 @@
 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/controllers/accounts_controller.py +340,"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."
+apps/erpnext/erpnext/controllers/accounts_controller.py +343,"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
@@ -850,12 +861,12 @@
 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 +756,Purchase Receipt,Příjemka
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +735,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 +167,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 +282,Unable to find Time Slot in the next {0} days for Operation {1},Nemožno nájsť časový úsek v najbližších {0} dní na prevádzku {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +170,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 +283,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 +439,BOM {0} must be active,BOM {0} musí být aktivní
@@ -866,7 +877,7 @@
 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 +214,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 +217,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
@@ -880,9 +891,9 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Zaměstnanec {0} není aktivní nebo neexistuje
 DocType: Fee Structure,Components,komponenty
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,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 +612,Item Variants {0} updated,Varianty Položky {0} aktualizované
+apps/erpnext/erpnext/stock/doctype/item/item.py +614,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 +843,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 +854,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ď
@@ -897,69 +908,72 @@
 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 +728,New Sales Invoice,Nová predajná faktúra
+apps/erpnext/erpnext/accounts/page/pos/pos.js +710,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 +728,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
 DocType: Material Request Item,Lead Time Date,Čas a Dátum Obchodnej iniciatívy
 DocType: Guardian,Guardian Name,Meno Guardian
 DocType: Cheque Print Template,Has Print Format,Má formát tlače
-apps/erpnext/erpnext/accounts/page/pos/pos.js +86, 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 +109,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 +619,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","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/page/pos/pos.js +75, 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 +613,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing 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 +606,Supplier Invoice Date cannot be greater than Posting Date,Dodávateľ Dátum faktúry nemôže byť väčšia ako Dátum zverejnenia
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +609,Supplier Invoice Date cannot be greater than Posting Date,Dodávateľ Dátum faktúry nemôže byť väčšia ako Dátum zverejnenia
 DocType: Purchase Invoice Item,Purchase Order Item,Položka vydané objednávky
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +130,Indirect Income,Nepřímé příjmy
 DocType: Cheque Print Template,Date Settings,dátum Nastavenie
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Odchylka
 ,Company Name,Názov spoločnosti
 DocType: SMS Center,Total Message(s),Celkem zpráv (y)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +810,Select Item for Transfer,Vybrať položku pre prevod
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +789,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."
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Povolit uživateli upravovat Ceník Cena při transakcích
 DocType: Pricing Rule,Max Qty,Max Množství
-DocType: Student Applicant,Father's Name,Meno otca
 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 +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: Platba na prodejní / nákupní objednávce by měly být vždy označeny jako předem
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Chemický
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +686,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/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
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +694,All items have already been transferred for this Production Order.,Všechny položky již byly převedeny na výrobu tohoto řádu.
 DocType: Process Payroll,Select Payroll Year and Month,Vyberte Payroll rok a mesiac
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,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
-DocType: Opportunity,Walk In,Vejít
 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 +12,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.)
 DocType: Timesheet Detail,Bill,účet
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,White,Biela
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,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
 DocType: SMS Center,All Lead (Open),Všetky Iniciatívy (Otvorené)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +228,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})
+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 +731,Make ,Urobiť
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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á."
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Môj košík
-apps/erpnext/erpnext/controllers/selling_controller.py +154,Order Type must be one of {0},Typ objednávky musí být jedním z {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Typ objednávky musí být jedním z {0}
 DocType: Lead,Next Contact Date,Další Kontakt Datum
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Otevření POČET
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +393,Please enter Account for Change Amount,"Prosím, zadajte účet pre zmenu Suma"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,Please enter Account for Change Amount,"Prosím, zadajte účet pre zmenu Suma"
 DocType: Student Batch,Student Batch Name,Študent Batch Name
 DocType: Holiday List,Holiday List Name,Názov zoznamu sviatkov
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js +8,Schedule Course,rozvrh
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Stock Options,Akciové opcie
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Akciové opcie
 DocType: Journal Entry Account,Expense Claim,Hrazení nákladů
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +211,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 +237,Qty for {0},Množství pro {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +212,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 +238,Qty for {0},Množství pro {0}
 DocType: Leave Application,Leave Application,Leave Application
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Nechte přidělení nástroj
 DocType: Leave Block List,Leave Block List Dates,Nechte Block List termíny
@@ -968,9 +982,9 @@
 DocType: Company,Default Terms,Východiskové podmienky
 DocType: Packing Slip Item,Packing Slip Item,Balení Slip Item
 DocType: Purchase Invoice,Cash/Bank Account,Hotovostný / Bankový účet
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Odstránené položky bez zmeny množstva alebo hodnoty.
+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 +635,Attribute table is mandatory,Atribút tabuľka je povinné
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Atribút tabuľka je povinné
 DocType: Production Planning Tool,Get Sales Orders,Získat Prodejní objednávky
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{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"
@@ -995,7 +1009,7 @@
 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/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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Pořadové číslo {0} je na základě smlouvy o údržbě aľ {1}
+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
@@ -1007,7 +1021,7 @@
 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/controllers/selling_controller.py +231,Sales Order {0} is {1},Predajné objednávky {0} {1}
+apps/erpnext/erpnext/controllers/selling_controller.py +232,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
 DocType: Packing Slip,Net Weight UOM,Čistá hmotnosť MJ
@@ -1017,25 +1031,24 @@
 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í
 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 +155,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Ponuky od Dodávateľov.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},Chcete-li {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Průměrný věk
 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/templates/pages/home.html +32,View All Products,Zobraziť všetky produkty
+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
 DocType: Expense Claim,From Employee,Od Zaměstnance
-apps/erpnext/erpnext/controllers/accounts_controller.py +400,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}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +403,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/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,a rok:
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +191,{0} {1} must be submitted,{0} {1} musí být odeslaný
-DocType: Email Digest,Annual Expense,Ročná Expense
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,{0} {1} must be submitted,{0} {1} musí být odeslaný
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +145,Quantity must be less than or equal to {0},Množstvo musí byť menší ako alebo rovný {0}
 DocType: SMS Center,Total Characters,Celkový počet znaků
 apps/erpnext/erpnext/controllers/buying_controller.py +156,Please select BOM in BOM field for Item {0},Vyberte kusovník Bom oblasti k bodu {0}
@@ -1046,30 +1059,31 @@
 DocType: Sales Partner,Distributor,Distributor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Nákupní košík Shipping Rule
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +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 +62,Please set 'Apply Additional Discount On',Prosím nastavte na &quot;Použiť dodatočnú zľavu On&quot;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +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"
 DocType: Global Defaults,Global Defaults,Globální Výchozí
 apps/erpnext/erpnext/projects/doctype/project/project.py +153,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
 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 +327,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 +362,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/stock/doctype/stock_entry/stock_entry.py +367,Finished Item {0} must be entered for Manufacture type entry,Dokončené Položka {0} musí byť zadaný pre vstup typu Výroba
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Otvorenie účtovníctva Balance
 DocType: Sales Invoice Advance,Sales Invoice Advance,Prodejní faktury Advance
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +499,Nothing to request,Nic požadovat
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +500,Nothing to request,Nic požadovat
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',"""Aktuálny datum začiatku"" nemôže byť väčší ako ""Aktuálny dátum ukončenia"""
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Management,Manažment
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},Buď debetní nebo kreditní částka je vyžadována pro {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,Manažment
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +55,Either debit or credit amount is required for {0},Buď debetní nebo kreditní částka je vyžadována pro {0}
 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 +161,Blue,Modrý
+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
@@ -1079,12 +1093,12 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +23,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
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1374,Do you really want to submit the invoice?,Naozaj chcete predložiť faktúru?
+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 +685,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 +1526,"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 +679,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 +1550,"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 +26,"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
@@ -1104,104 +1118,106 @@
 DocType: Payment Reconciliation,Unreconciled Payment Details,Smířit platbě
 DocType: Global Defaults,Current Fiscal Year,Aktuální fiskální rok
 DocType: Global Defaults,Disable Rounded Total,Zakázat Zaoblený Celkem
-DocType: Lead,Call,Volání
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +417,'Entries' cannot be empty,"""Položky"" nemôžu býť prázdne"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +418,'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 +214,Fiscal Year {0} not found,Fiškálny rok {0} nebol nájdený
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +221,Fiscal Year {0} not found,Fiškálny rok {0} nebol nájdený
 apps/erpnext/erpnext/config/hr.py +238,Setting up Employees,Nastavenia pre modul Zamestnanci
 DocType: Sales Order,SO-,so-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,"Prosím, vyberte první prefix"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Please select prefix first,"Prosím, vyberte první prefix"
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Research,Výzkum
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,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 +43,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 +57,View Ledger,View Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Nejstarší
-apps/erpnext/erpnext/stock/doctype/item/item.py +504,"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 +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/setup/setup_wizard/setup_wizard.py +437,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
 ,Budget Variance Report,Rozpočet Odchylka Report
 DocType: Salary Slip,Gross Pay,Hrubé mzdy
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +90,Row {0}: Activity Type is mandatory.,Riadok {0}: typ činnosti je povinná.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +114,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/public/js/controllers/stock_controller.js +40,Accounting Ledger,Účtovné Ledger
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,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
 DocType: BOM Item,Item Description,Položka Popis
+DocType: Student Sibling,Student Sibling,študent Súrodenec
 DocType: Purchase Invoice,Is Recurring,Je Opakující
 DocType: Purchase Invoice,Supplied Items,Dodávané položky
 DocType: Student,STUD.,STUD.
 DocType: Production Order,Qty To Manufacture,Množství K výrobě
+DocType: Email Digest,New Income,new príjmov
 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/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 +131,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 +175,Valuation Rate required for Item in row {0},Ocenenie Miera potrebná pre položku v riadku {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,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
 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 +87, to ,k
+apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,k
 DocType: Item,Lead Time in days,Vek Obchodnej iniciatívy v dňoch
 ,Accounts Payable Summary,Splatné účty Shrnutí
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Not authorized to edit frozen Account {0},Není povoleno upravovat zmrazený účet {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,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 +62,Sales Order {0} is not valid,Prodejní objednávky {0} není platný
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Prodejní objednávky {0} není platný
 apps/erpnext/erpnext/setup/doctype/company/company.py +185,"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 +152,Small,Malý
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,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}
 ,Invoiced Amount (Exculsive Tax),Fakturovaná částka (bez daně)
-DocType: Student Applicant,Mother's / Guardian 1 Email ID,Matiek / Guardian 1 ID e-mailu
 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 +160,Green,Zelená
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,Zelená
 DocType: Supplier,SUPP-,SUPP-
 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 +57,Contract,Smlouva
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,Smlouva
 DocType: Email Digest,Add Quote,Pridať ponuku
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +498,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 +503,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 +80,Row {0}: Qty is mandatory,Row {0}: Množství je povinný
+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 +737,Sync Master Data,Sync Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +719,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
 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
+DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Jedná se o skupinu kořen položky a nelze upravovat.
+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.
 DocType: Journal Entry Account,Purchase Order,Vydaná objednávka
 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 +345,"{0}: Employee email not found, hence email not sent","{0}: e-mail zamestnanec nebol nájdený, a preto je pošta neposlal"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +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
 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 +118,"For {0}, only credit accounts can be linked against another debit entry","Pro {0}, tak úvěrové účty mohou být propojeny na jinou položku debetní"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Delivery Note {0} is not submitted,Delivery Note {0} není předložena
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Delivery Note {0} is not submitted,Delivery Note {0} není předložena
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Sub-contracted Item,Položka {0} musí být Subdodavatelské Item
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Kapitálové Vybavení
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Ceny Pravidlo je nejprve vybrána na základě ""Použít na"" oblasti, které mohou být položky, položky skupiny nebo značky."
 DocType: Hub Settings,Seller Website,Prodejce Website
 DocType: Item,ITEM-,ITEM-
-apps/erpnext/erpnext/controllers/selling_controller.py +147,Total allocated percentage for sales team should be 100,Celkové přidělené procento prodejní tým by měl být 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +110,Production Order status is {0},Stav výrobní zakázka je {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Celkové přidělené procento prodejní tým by měl být 100
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Stav výrobní zakázka je {0}
 DocType: Appraisal Goal,Goal,Cieľ
 DocType: Sales Invoice Item,Edit Description,Upraviť popis
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +757,For Supplier,Pro Dodavatele
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +723,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
@@ -1217,10 +1233,11 @@
 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
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-mail Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +445,BOM {0} does not belong to Item {1},BOM {0} nepatří k bodu {1}
 DocType: Sales Partner,Target Distribution,Target Distribution
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1667,Deafault warehouse is required for selected item,Nesplnením sklad je vyžadované pre vybratú položku
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Deafault warehouse is required for selected item,Nesplnením sklad je vyžadované pre vybratú položku
 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
@@ -1229,23 +1246,23 @@
 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 +110,Hardware,Technické vybavení
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,Technické vybavení
 DocType: Sales Order,Recurring Upto,opakujúce Až
 DocType: Attendance,HR Manager,HR Manager
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Vyberte spoločnosť
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Privilege Leave,Privilege Leave
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,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 +79,You need to enable Shopping Cart,Musíte povolit Nákupní košík
 DocType: Payment Entry,Writeoff,odpísanie
 DocType: Appraisal Template Goal,Appraisal Template Goal,Posouzení Template Goal
-DocType: Salary Slip,Earning,Získávání
+DocType: Salary Component,Earning,Získávání
 DocType: Purchase Invoice,Party Account Currency,Party Mena účtu
 ,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 +171,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 +174,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_data.py +358,Food,Jídlo
+apps/erpnext/erpnext/demo/setup/setup_data.py +301,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/course_schedule/course_schedule.js +103,Mark Attendence,mark Attendence
@@ -1279,12 +1296,12 @@
 DocType: Sales Order Item,Planned Quantity,Plánované Množství
 DocType: Purchase Invoice Item,Item Tax Amount,Částka Daně Položky
 DocType: Item,Maintain Stock,Udržiavať Zásoby
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +209,Stock Entries already created for Production Order ,Fotky Položky již vytvořené pro výrobní zakázku
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,Fotky Položky již vytvořené pro výrobní zakázku
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,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 +620,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 +238,Max: {0},Max: {0}
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +15,From Datetime,Od datetime
+apps/erpnext/erpnext/controllers/accounts_controller.py +623,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 +239,Max: {0},Max: {0}
+apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Od datetime
 DocType: Email Digest,For Company,Pre spoločnosť
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Komunikační protokol.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +153,"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.
@@ -1292,8 +1309,8 @@
 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 +552,cannot be greater than 100,nemôže byť väčšie ako 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +680,Item {0} is not a stock Item,Položka {0} není skladem
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +546,cannot be greater than 100,nemôže byť väčšie ako 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,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
@@ -1307,10 +1324,9 @@
 DocType: GL Entry,GL Entry,Vstup GL
 DocType: HR Settings,Employee Settings,Nastavení zaměstnanců
 ,Batch-Wise Balance History,Batch-Wise Balance History
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Do List
 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 +61,Apprentice,Učeň
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +102,Negative Quantity is not allowed,Záporné množstvo nie je dovolené
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,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ů"
@@ -1332,15 +1348,14 @@
 DocType: Asset,Asset Name,asset Name
 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 +141,Source warehouse is mandatory for row {0},Source sklad je povinná pro řadu {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +719,Packing Slip,Balení Slip
+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 +713,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/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,Žiadosť o cenovú ponuku môže byť prístup kliknutím na nasledujúci odkaz
 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 +81,Analyst,Analytik
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,Analytik
 DocType: Item,Inventory,Inventář
 DocType: Item,Sales Details,Prodejní Podrobnosti
 DocType: Quality Inspection,QI-,QI-
@@ -1348,7 +1363,7 @@
 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 +103,Government,Vláda
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,Vláda
 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
 DocType: Company,Services,Služby
@@ -1364,6 +1379,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,Financial Year Start Date,Dátum začiatku finančného roku
 DocType: POS Profile,Apply Discount,použiť zľavu
 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
 DocType: Program Course,Program Course,program kurzu
@@ -1404,12 +1420,12 @@
 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
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +110,Accounting Entry for {0} can only be made in currency: {1},Účtovný záznam pre {0} možno vykonávať iba v mene: {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Účtovný záznam pre {0} možno vykonávať iba v mene: {1}
 DocType: Pricing Rule,Pricing Rule,Ceny Pravidlo
 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
 DocType: Shopping Cart Settings,Payment Success URL,Platba Úspech URL
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +78,Row # {0}: Returned Item {1} does not exists in {2} {3},Riadok # {0}: vrátenej položky {1} neexistuje v {2} {3}
+apps/erpnext/erpnext/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í
@@ -1418,40 +1434,39 @@
 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/stock/doctype/stock_entry/stock_entry.py +339,Not allowed to tranfer more {0} than {1} against Purchase Order {2},"Nie je povolené, aby transfer viac {0} ako {1} proti objednanie {2}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +344,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 +545,Manufacturing Quantity is mandatory,Výrobní množství je povinné
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Výrobní množství 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 +71,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 +162,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/projects/doctype/timesheet/timesheet.py +186,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
 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 +130,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 +137,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
 DocType: Dependent Task,Dependent Task,Závislý Task
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,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/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 +190,Leave of type {0} cannot be longer than {1},Leave typu {0} nemůže být delší než {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +197,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 +921,Search Item,hľadanie položky
+apps/erpnext/erpnext/accounts/page/pos/pos.js +910,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 +546,Already completed,už boli dokončené
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +22,Payment Request already exists {0},Platba Dopyt už existuje {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +550,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 +241,Quantity must not be more than {0},Množství nesmí být větší než {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Quantity must not be more than {0},Množství nesmí být větší než {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +76,Previous Financial Year is not closed,Predchádzajúci finančný rok nie je uzavretý
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +44,Age (Days),Staroba (dni)
 DocType: Quotation Item,Quotation Item,Položka ponuky
@@ -1468,7 +1483,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +221,Purchase Receipt {0} is not submitted,Doklad o koupi {0} není předložena
 DocType: Company,Default Payable Account,Výchozí Splatnost účtu
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Nastavení pro on-line nákupního košíku, jako jsou pravidla dopravu, ceník atd"
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +83,{0}% Billed,{0}% fakturované
+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
@@ -1480,12 +1495,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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/schools/doctype/fees/fees.js +22,Collect,Zbierať
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Zbierať
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,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 +225,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í
-DocType: Payment Reconciliation,Payments,Platby
 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
@@ -1497,7 +1511,7 @@
 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 +9,Procurement,Obstarávanie
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,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/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
 ,Lead Details,Podrobnosti Obchodnej iniciatívy
 DocType: Purchase Invoice,End date of current invoice's period,Datum ukončení doby aktuální faktury je
@@ -1522,7 +1536,7 @@
 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 +97,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žství nebo ocenění Cena, nebo obojí"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +13,Fulfillment,splnenie
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Společnost, měsíc a fiskální rok je povinný"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Marketingové náklady
@@ -1543,14 +1557,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,Nastavenie ERPNext dokončené!
 DocType: Item,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +93,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Zákaznická Skupina existuje se stejným názvem, prosím změnit název zákazníka nebo přejmenujte skupinu zákazníků"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +126,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,inštruktor
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},Zadejte Party Party a je nutné pro pohledávky / závazky na účtu {0}
 DocType: 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
@@ -1561,7 +1574,7 @@
 ,Item-wise Sales Register,Item-moudrý Sales Register
 DocType: Asset,Gross Purchase Amount,Gross Suma nákupu
 DocType: Asset,Depreciation Method,odpisy Metóda
-apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Offline,offline
+apps/erpnext/erpnext/accounts/page/pos/pos.js +686,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ý
@@ -1579,25 +1592,27 @@
 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
 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 +858,Make Purchase Order,Proveďte objednávky
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +852,Make Purchase Order,Proveďte objednávky
 DocType: SMS Center,Send To,Odeslat
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,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 +148,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
 DocType: Stock Reconciliation,Stock Reconciliation,Reklamní Odsouhlasení
 DocType: Territory,Territory Name,Území Name
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +172,Work-in-Progress Warehouse is required before Submit,Work-in-Progress sklad je zapotřebí před Odeslat
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,Work-in-Progress Warehouse is required before Submit,Work-in-Progress sklad je zapotřebí před Odeslat
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Žadatel o zaměstnání.
 DocType: Purchase Order Item,Warehouse and Reference,Sklad a reference
 DocType: Supplier,Statutory info and other general information about your Supplier,Statutární info a další obecné informace o váš dodavatel
-apps/erpnext/erpnext/hooks.py +88,Addresses,Adresy
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Dodávateľ&gt; Dodávateľ Type
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +212,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/hooks.py +95,Addresses,Adresy
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +215,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
 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
@@ -1605,11 +1620,10 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,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 +731,Payment,Splátka
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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: Pricing Rule,Brand,Značka
 DocType: Course,Course Abbreviation,skratka ihrisko
 DocType: Item,Will also apply for variants,Bude platiť aj pre varianty
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +142,"Asset cannot be cancelled, as it is already {0}","Asset nemožno zrušiť, pretože je už {0}"
@@ -1621,7 +1635,7 @@
 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."
 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 +85,Associate,Spolupracovník
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,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
@@ -1629,7 +1643,7 @@
 DocType: Production Planning Tool,Material Requests,materiál Žiadosti
 DocType: Warranty Claim,Issue Date,Datum vydání
 DocType: Activity Cost,Activity Cost,Náklady Aktivita
-DocType: Timesheet Detail,Timesheet Detail,časového rozvrhu Detail
+DocType: Sales Invoice Timesheet,Timesheet Detail,časového rozvrhu Detail
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Spotřeba Množství
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekomunikace
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Označuje, že balíček je součástí této dodávky (Pouze návrhu)"
@@ -1652,6 +1666,7 @@
 DocType: Production Plan Material Request,Material Request Date,Materiál Request Date
 DocType: Purchase Order Item,Supplier Quotation Item,Položka dodávateľskej ponuky
 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
 DocType: Monthly Distribution,Name of the Monthly Distribution,Název měsíční výplatou
 DocType: Sales Person,Parent Sales Person,Parent obchodník
@@ -1664,31 +1679,32 @@
 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 +44,"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/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."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +502,Error: {0} &gt; {1},Chyba: {0}&gt; {1}
 DocType: Item,Is Sales Item,Je Sales Item
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Položka Group Tree
 apps/erpnext/erpnext/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."
 DocType: Naming Series,Current Value,Current Value
-apps/erpnext/erpnext/controllers/accounts_controller.py +235,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/controllers/accounts_controller.py +238,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
 DocType: Delivery Note Item,Against Sales Order,Proti přijaté objednávce
 ,Serial No Status,Serial No Status
 DocType: Payment Entry Reference,Outstanding,vynikajúci
 ,Daily Timesheet Summary,Denný časový rozvrh Súhrn
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +458,Item table can not be blank,Tabulka Položka nemůže být prázdný
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +443,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}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +5,This is based on stock movement. See {0} for details,To je založené na akciovom pohybu. Pozri {0} Podrobnosti
 DocType: Pricing Rule,Selling,Predaj
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +341,Amount {0} {1} deducted against {2},Množstvo {0} {1} odpočítať proti {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +344,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
@@ -1703,8 +1719,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +144,Cannot refer row number greater than or equal to current row number for this Charge type,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 +159,Red,Červená
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Prosím, klikněte na ""Generovat Schedule"", aby přinesla Pořadové číslo přidán k bodu {0}"
+apps/erpnext/erpnext/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
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Základňa Suma (Company mena)
@@ -1712,7 +1728,7 @@
 DocType: Installation Note,Installation Time,Instalace Time
 DocType: Sales Invoice,Accounting Details,Účtovné Podrobnosti
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,Odstráňte všetky transakcie pre túto spoločnosť
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +187,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Row # {0}: Operation {1} není dokončen {2} Množství hotových výrobků ve výrobním procesu objednávky # {3}. Prosím aktualizujte provozní stav přes čas protokoly
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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,Row # {0}: Operation {1} není dokončen {2} Množství hotových výrobků ve výrobním procesu objednávky # {3}. Prosím aktualizujte provozní stav přes čas protokoly
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,Investice
 DocType: Issue,Resolution Details,Rozlišení Podrobnosti
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,alokácie
@@ -1748,16 +1764,17 @@
 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}
 DocType: Delivery Note,Excise Page Number,Spotřební Číslo stránky
 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}
 ,Maintenance Schedules,Plány údržby
 DocType: Task,Actual End Date (via Time Sheet),Skutočný dátum ukončenia (cez Time Sheet)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Amount {0} {1} against {2} {3},Množstvo {0} {1} na {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +339,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 +138,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 +295,Debit To account must be a Receivable account,"Debetní Chcete-li v úvahu, musí být pohledávka účet"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Receivable account,"Debetní Chcete-li v úvahu, musí být pohledávka účet"
 DocType: Shipping Rule Condition,Shipping Amount,Přepravní Částka
 ,Pending Amount,Čeká Částka
 DocType: Purchase Invoice Item,Conversion Factor,Konverzní faktor
@@ -1765,10 +1782,10 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +137,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 +90,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
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +93,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 +22,Enter Paid Amount,Vstup do zaplatená suma
+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
@@ -1778,13 +1795,15 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,Timesheets
 DocType: HR Settings,HR Settings,Nastavení HR
 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ýdavky
 DocType: Purchase Invoice,Additional Discount Amount,Dodatočná zľava Suma
-apps/erpnext/erpnext/controllers/accounts_controller.py +524,"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."
+apps/erpnext/erpnext/controllers/accounts_controller.py +527,"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 +249,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/stock/get_item_details.py +123,Please specify Company,"Uveďte prosím, firmu"
 ,Customer Acquisition and Loyalty,Zákazník Akvizice a loajality
@@ -1795,17 +1814,19 @@
 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 +183,Closing (Opening + Totals),Uzavretie (Otvorenie + súčty)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),Uzavretie (Otvorenie + súčty)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,"Uveďte prosím měnu, ve společnosti"
 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/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
-apps/erpnext/erpnext/controllers/accounts_controller.py +272,Account {0} is invalid. Account Currency must be {1},Účet {0} je neplatná. Mena účtu musí byť {1}
+DocType: Email Digest,Pending Sales Orders,Čaká Predajné objednávky
+apps/erpnext/erpnext/controllers/accounts_controller.py +275,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 +956,"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 Slip,Deduction,Dedukce
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +87,Row {0}: From Time and To Time is mandatory.,Riadok {0}: From Time a na čas je povinná.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +969,"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 +111,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 +262,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 +7,Please enter Employee Id of this sales person,"Prosím, zadajte ID zamestnanca z tohto predaja osoby"
@@ -1813,7 +1834,7 @@
 DocType: Project,% Tasks Completed,% splnených úloh
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,Rozdiel Suma musí byť nula
 DocType: Project,Gross Margin,Hrubá marža
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +194,Please enter Production Item first,"Prosím, zadejte první výrobní položku"
+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é
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Ponuka
@@ -1822,53 +1843,54 @@
 DocType: Maintenance Visit,Maintenance User,Údržba uživatele
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +149,Cost Updated,Náklady Aktualizované
 DocType: Employee,Date of Birth,Datum narození
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +86,Item {0} has already been returned,Bod {0} již byla vrácena
+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}
+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 +177,Job Description,Popis Práca
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,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 +126,"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 +127,"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."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +24,Welcome to POS: Create your POS Profile,Vitajte na POS: Vytvorte si svoj profil POS
 DocType: Expense Claim,Approver,Schvalovatel
 ,SO Qty,SO Množství
+DocType: Guardian,Work Address,pracovná adresa
 DocType: Appraisal,Calculate Total Score,Vypočítať celkové skóre
 DocType: Request for Quotation,Manufacturing Manager,Výrobný riaditeľ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Pořadové číslo {0} je v záruce aľ {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +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 +74,Shipments,Zásielky
+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
 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 +153,Row # ,Row #
+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 +156,Get From,Získat Z
+apps/erpnext/erpnext/public/js/utils.js +167,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 +167,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 +416,"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í"
+apps/erpnext/erpnext/controllers/accounts_controller.py +419,"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
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} is disabled,Uživatel {0} je zakázána
 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 ...
 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 +171,"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 +346,{0} is mandatory for Item {1},{0} je povinná k položke {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,{0} is mandatory for Item {1},{0} je povinná k položke {1}
 DocType: Currency Exchange,From Currency,Od Měny
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Prosím, vyberte alokovaná částka, typ faktury a číslo faktury v aspoň jedné řadě"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,Náklady na nový nákup
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},Prodejní objednávky potřebný k bodu {0}
 DocType: Purchase Invoice Item,Rate (Company Currency),Cena (Měna Společnosti)
-apps/erpnext/erpnext/demo/setup_data.py +360,Others,Ostatní
+DocType: Student Guardian,Others,Ostatní
 DocType: Payment Entry,Unallocated Amount,nepridelené Suma
 apps/erpnext/erpnext/templates/includes/product_page.js +65,Cannot find a matching Item. Please select some other value for {0}.,Nemožno nájsť zodpovedajúce položku. Vyberte nejakú inú hodnotu pre {0}.
 DocType: POS Profile,Taxes and Charges,Daně a poplatky
@@ -1888,17 +1910,16 @@
 apps/erpnext/erpnext/config/stock.py +304,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/accounts/report/item_wise_sales_register/item_wise_sales_register.py +54,Receivable Account,Pohledávky účtu
-apps/erpnext/erpnext/controllers/accounts_controller.py +546,Row #{0}: Asset {1} is already {2},Riadok # {0}: Asset {1} je už {2}
+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 +549,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 +79,CEO,CEO
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,CEO
 DocType: Expense Claim Detail,Expense Claim Detail,Detail úhrady výdajů
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +808,Please select correct account,"Prosím, vyberte správny účet"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +809,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
-DocType: Purchase Invoice Item,Page Break,Zalomení stránky
 DocType: Production Order Operation,Pending,Až do
 DocType: Course,Course Name,Názov kurzu
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Uživatelé, kteří si vyhoví žádosti konkrétního zaměstnance volno"
@@ -1907,14 +1928,15 @@
 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 +54,Full-time,Na plný úvazek
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Full-time,Na plný úvazek
 DocType: Salary Structure,Employees,zamestnanci
 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.","Ak ste vytvorili štandardné šablónu v predaji daní a poplatkov šablóny, vyberte jednu a kliknite na tlačidlo nižšie."
+DocType: Student,Guardians,Guardians
 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 krajinu, k tomuto Shipping pravidlá alebo skontrolovať Celosvetová doprava"
 DocType: Stock Entry,Total Incoming Value,Celková hodnota Příchozí
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Debit To is required,Debetné K je vyžadované
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +321,Debit To is required,Debetné K je vyžadované
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Nákupní Ceník
 DocType: Offer Letter Term,Offer Term,Ponuka Term
 DocType: Quality Inspection,Quality Manager,Manažér kvality
@@ -1922,6 +1944,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/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
@@ -1932,18 +1955,17 @@
 DocType: Production Order Operation,Completed Qty,Dokončené Množství
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"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 +273,Price List {0} is disabled,Ceník {0} je zakázána
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +99,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/projects/doctype/timesheet/timesheet.py +123,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
 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}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Aktuálne ocenenie Rate
 DocType: Item,Customer Item Codes,Zákazník Položka Kódy
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,Exchange zisk / strata
 DocType: Opportunity,Lost Reason,Ztracené Důvod
-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/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/purchase_receipt/purchase_receipt.py +378,All items have already been invoiced,Všechny položky již byly fakturovány
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +379,All items have already been invoiced,Všechny položky již byly fakturovány
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Uveďte prosím platný ""Od věci č '"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Ďalšie nákladové strediská môžu byť vyrobené v rámci skupiny, ale položky môžu byť vykonané proti non-skupín"
 DocType: Project,External,Externí
@@ -1959,18 +1981,19 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Vaši Zákazníci
 apps/erpnext/erpnext/projects/doctype/project/project.py +141,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/job_opening.html +19,Apply Now,Nainštalovať teraz
+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."
 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
-apps/erpnext/erpnext/utilities/doctype/address/address.py +164,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: Fee Structure,Fee Structure,štruktúra poplatkov
 DocType: Timesheet Detail,Costing Amount,Kalkulácie Čiastka
+DocType: Student Admission,Application Fee,Poplatok za prihlášku
 DocType: Process Payroll,Submit Salary Slip,Odeslat výplatní pásce
-apps/erpnext/erpnext/controllers/selling_controller.py +161,Maxiumm discount for Item {0} is {1}%,Maxiumm sleva na položky {0} {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,Maxiumm sleva na položky {0} {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Dovoz hromadnú
 DocType: Sales Partner,Address & Contacts,Adresa a kontakty
 DocType: SMS Log,Sender Name,Meno odosielateľa
@@ -1995,21 +2018,21 @@
 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_data.py +361,Travel,Cestování
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +155,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 +304,Travel,Cestování
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +167,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 +23,Update Cost,Aktualizace Cost
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Aktualizace Cost
 DocType: Item Reorder,Item Reorder,Položka Reorder
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +36,Show Salary Slip,Show výplatnej páske
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +748,Transfer Material,Přenos materiálu
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +53,Show Salary Slip,Show výplatnej páske
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +166,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 +923,Please set recurring after saving,Prosím nastavte opakujúce sa po uložení
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +646,Select change amount account,Vybrať zmena výšky účet
+apps/erpnext/erpnext/public/js/controllers/transaction.js +914,Please set recurring after saving,Prosím nastavte opakujúce sa po uložení
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +703,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
@@ -2021,31 +2044,32 @@
 DocType: Quality Inspection,Verified By,Verified By
 DocType: Address,Subsidiary,Dceřiný
 apps/erpnext/erpnext/setup/doctype/company/company.py +64,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","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: Quality Inspection,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 +33,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 +352,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Množství v řadě {0} ({1}), musí být stejné jako množství vyrobené {2}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Množství v řadě {0} ({1}), musí být stejné jako množství vyrobené {2}"
 DocType: Appraisal,Employee,Zaměstnanec
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Pozvať ako Užívateľ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} je úplne fakturované
 DocType: Workstation Working Hour,End Time,End Time
 DocType: Payment Entry,Payment Deductions or Loss,Platobné zrážky alebo strata
-apps/erpnext/erpnext/config/schools.py +100,LMS,LMS
+apps/erpnext/erpnext/config/schools.py +104,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/config/crm.py +6,Sales Pipeline,predajné Pipeline
 DocType: Student Batch Student,Student Batch Student,Študent Batch Študent
-DocType: Sales Invoice,Mass Mailing,Hromadné emaily
+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 +199,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/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 +297,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 +111,Pharmaceutical,Farmaceutické
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +309,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/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:
@@ -2060,27 +2084,28 @@
 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 +814,Please specify Company to proceed,Uveďte prosím společnost pokračovat
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +793,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 +44,Compensatory Off,Vyrovnávací Off
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,Vyrovnávací Off
 DocType: Quality Inspection Reading,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äť."
 DocType: Room,Room Number,Číslo izby
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Neplatná referencie {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +161,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},"{0} ({1}) nemôže byť väčšie, ako plánované množstvo ({2}), vo Výrobnej Objednávke {3}"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +162,{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 +217,Raw Materials cannot be blank.,Suroviny nemůže být prázdný.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,"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 +460,Quick Journal Entry,Rýchly vstup Journal
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +111,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/accounts/doctype/sales_invoice/sales_invoice.py +441,"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 +450,Quick Journal Entry,Rýchly vstup Journal
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +103,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 +214,{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
 ,Minutes to First Response for Issues,Zápisy do prvej reakcie na otázky
 DocType: Purchase Invoice,Terms and Conditions1,Podmínky a podmínek1
 apps/erpnext/erpnext/public/js/setup_wizard.js +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.
@@ -2089,16 +2114,17 @@
 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 +398,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 +739,Item or Warehouse for row {0} does not match Material Request,Položka nebo Warehouse na řádku {0} neodpovídá Materiál Poptávka
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +747,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
 DocType: Fiscal Year,Year End Date,Dátum konca roka
 DocType: Task Depends On,Task Depends On,Úloha je závislá na
-DocType: Lead,Opportunity,Příležitost
+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
@@ -2111,7 +2137,7 @@
 DocType: Student,Joining Date,spájanie Dátum
 ,Employees working on a holiday,Zamestnanci pracujúci na dovolenku
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,mark Present
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},Datum zahájení údržby nemůže být před datem dodání pro pořadové číslo {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},Datum zahájení údržby nemůže být před datem dodání pro pořadové číslo {0}
 DocType: Production Order,Actual End Date,Skutečné datum ukončení
 DocType: Purchase Invoice,PINV-,PINV-
 DocType: Authorization Rule,Applicable To (Role),Vztahující se na (Role)
@@ -2126,7 +2152,7 @@
 DocType: SMS Log,No of Requested SMS,Počet žádaným SMS
 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 +729,Please supply the specified items at the best possible rates,Prosím dodávať uvedené položky na najlepšie možné ceny
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +695,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 +117,Contract End Date must be greater than Date of Joining,Smlouva Datum ukončení musí být větší než Datum spojování
 DocType: Delivery Note,DN-,DN-
@@ -2135,7 +2161,7 @@
 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 +14,This is an example website auto-generated from ERPNext,Toto je príklad webovej stránky automaticky generovanej z ERPNext
+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
 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.
 
@@ -2182,13 +2208,14 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd Množství
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +54,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 +103,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 +504,Stock Entry {0} is not submitted,Sklad Entry {0} nie je predložená
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Nelze produkují více položku {0} než prodejní objednávky množství {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +505,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: Salary Component Account,Salary Component Account,Účet plat Component
 DocType: Global Defaults,Hide Currency Symbol,Skrýt symbol měny
 apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card","napríkklad banka, hotovosť, kreditné karty"
+DocType: Lead Source,Source Name,Názov zdroja
 DocType: Journal Entry,Credit Note,Dobropis
 DocType: Warranty Claim,Service Address,Servisní adresy
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furnitures and Fixtures,Nábytok a svietidlá
@@ -2200,6 +2227,7 @@
 DocType: Opportunity,Customer / Lead Name,Zákazník / Iniciatíva Meno
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +89,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/controllers/trends.py +19,Total(Qty),Total (ks)
 DocType: Sales Invoice,This Document,tento dokument
@@ -2211,15 +2239,15 @@
 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 +176,Organization branch master.,Organizace větev master.
-apps/erpnext/erpnext/controllers/accounts_controller.py +273, or ,alebo
+apps/erpnext/erpnext/controllers/accounts_controller.py +276, or ,alebo
 DocType: Sales Order,Billing Status,Status Fakturace
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Nahlásiť problém
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,Utility Náklady
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90 Nad
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +203,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Riadok # {0}: Journal Entry {1} nemá účet {2} alebo už uzavreté proti inému poukazu
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +206,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 +90,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 +93,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
@@ -2247,8 +2275,8 @@
 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/hr/doctype/leave_allocation/leave_allocation.py +115,Leave Type {0} cannot be carry-forwarded,Nechajte typ {0} nemožno vykonávať odovzdávané
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Plán údržby není generován pro všechny položky. Prosím, klikněte na ""Generovat Schedule"""
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +118,Leave Type {0} cannot be carry-forwarded,Nechajte typ {0} nemožno vykonávať odovzdávané
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Plán údržby není generován pro všechny položky. Prosím, klikněte na ""Generovat Schedule"""
 ,To Produce,K výrobě
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Mzda
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +163,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Pre riadok {0} v {1}. Ak chcete v rýchlosti položku sú {2}, riadky {3} musí byť tiež zahrnuté"
@@ -2260,13 +2288,13 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +32,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 +748,Delivery,Dodávka
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +742,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
 DocType: Payment Entry,Total Allocated Amount,Celková alokovaná suma
 DocType: Item Reorder,Material Request Type,Materiál Typ požadavku
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +82,Row {0}: UOM Conversion Factor is mandatory,Riadok {0}: Konverzný faktor MJ je povinný
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +79,Row {0}: UOM Conversion Factor is mandatory,Riadok {0}: Konverzný faktor MJ je povinný
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Budget,Cost Center,Nákladové středisko
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Voucher #
@@ -2277,13 +2305,13 @@
 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 +90,Head of Marketing and Sales,Vedoucí marketingu a prodeje
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Daň z příjmů
+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 +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.
 DocType: Item Supplier,Item Supplier,Položka Dodavatel
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +403,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 +770,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 +397,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 +764,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"
@@ -2295,28 +2323,29 @@
 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 +100,Issues,Problémy
+apps/erpnext/erpnext/hooks.py +109,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}
 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ý
 DocType: Supplier,Billing Currency,Mena fakturácie
 DocType: Sales Invoice,SINV-RET-,Sinv-RET-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Large,Extra Veľké
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,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 +507,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 +107,Local,Místní
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +508,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/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 +154,Large,Veľký
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,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 +225,Total {0} ({1}),Celkom {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +224,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í
@@ -2374,9 +2403,9 @@
 DocType: Attendance,Leave Type,Leave Type
 apps/erpnext/erpnext/controllers/stock_controller.py +173,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/hr/doctype/salary_slip/salary_slip.py +79,Name error: {0},Názov chyba: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +90,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 +178,{0} {1} does not associated with {2} {3},{0} {1} nie je spojené s {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +181,{0} {1} does not associated with {2} {3},{0} {1} nie je spojené s {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Účast na zaměstnance {0} je již označen
 DocType: Packing Slip,If more than one package of the same type (for print),Pokud je více než jeden balík stejného typu (pro tisk)
 DocType: Warehouse,Parent Warehouse,Parent Warehouse
@@ -2395,7 +2424,7 @@
 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 +109,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,Aspon jedna položka by mala byť zadaná s negatívnym množstvo vo vratnom dokumente
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Prevádzka {0} dlhšie, než všetkých dostupných pracovných hodín v pracovnej stanici {1}, rozložiť prevádzku do niekoľkých operácií"
 ,Requested,Požadované
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +83,No Remarks,Žiadne poznámky
@@ -2407,46 +2436,46 @@
 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/stock/doctype/purchase_receipt/purchase_receipt.py +98,Quality Inspection required for Item {0},Kontrola kvality potřebný k bodu {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,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
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Správa Territory strom.
 DocType: Journal Entry Account,Sales Invoice,Prodejní faktury
 DocType: Journal Entry Account,Party Balance,Balance Party
-apps/erpnext/erpnext/accounts/page/pos/pos.js +475,Please select Apply Discount On,"Prosím, vyberte Použiť Zľava na"
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +92,Salary Slip Created,Plat Slip Vytvorené
+apps/erpnext/erpnext/accounts/page/pos/pos.js +464,Please select Apply Discount On,"Prosím, vyberte Použiť Zľava na"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +95,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
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,Sleva v procentech lze použít buď proti Ceníku nebo pro všechny Ceníku.
 DocType: Purchase Invoice,Half-yearly,Pololetní
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +384,Accounting Entry for Stock,Účetní položka na skladě
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +387,Accounting Entry for Stock,Účetní položka na skladě
 DocType: Sales Invoice,Sales Team1,Sales Team1
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,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 +96,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 +120,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 +88,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/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í
 DocType: Item Group,Show this slideshow at the top of the page,Zobrazit tuto prezentaci v horní části stránky
 DocType: BOM,Item UOM,MJ položky
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Suma dane po zľave Suma (Company meny)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +147,Target warehouse is mandatory for row {0},Target sklad je povinná pro řadu {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +141,Target warehouse is mandatory for row {0},Target sklad je povinná pro řadu {0}
 DocType: Cheque Print Template,Primary Settings,primárnej Nastavenie
 DocType: Purchase Invoice,Select Supplier Address,Vybrať Dodávateľ Address
 DocType: Quality Inspection,Quality Inspection,Kontrola kvality
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Extra Small,Extra Malé
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +194,Account {0} is frozen,Účet {0} je zmrazen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Extra Malé
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +690,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 +197,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 +606,Can only make payment against unbilled {0},Možno vykonať len platbu proti nevyfakturované {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +126,Commission rate cannot be greater than 100,Rychlost Komise nemůže být větší než 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +609,Can only make payment against unbilled {0},Možno vykonať len platbu proti nevyfakturované {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,Rychlost Komise nemůže být větší než 100
 DocType: Stock Entry,Subcontract,Subdodávka
 apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,"Prosím, zadajte {0} ako prvý"
 DocType: Production Order Operation,Actual End Time,Aktuální End Time
@@ -2457,30 +2486,30 @@
 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 +158,Colour,Farebné
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,Farebné
 DocType: Maintenance Visit,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"
 DocType: Student Log,Academic,akademický
-apps/erpnext/erpnext/controllers/accounts_controller.py +469,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Celkové zálohy ({0}) na objednávku {1} nemôže byť väčšia ako Celkom ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +472,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Celkové zálohy ({0}) na objednávku {1} nemôže byť väčšia ako Celkom ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Vyberte měsíční výplatou na nerovnoměrně distribuovat cílů napříč měsíců.
 DocType: Purchase Invoice Item,Valuation Rate,Ocenění Rate
+DocType: Stock Reconciliation,SR/,SR /
 apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,Ceníková Měna není zvolena
 DocType: Assessment,Results,výsledky
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +168,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 +175,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
-DocType: Student Applicant,Father's/ Guardian 2 Email ID,Otcov / Guardian 2 ID e-mailu
 DocType: Maintenance Visit Purpose,Against Document No,Proti dokumentu č
 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 +228,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 +231,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 +93,Researcher,Výzkumník
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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.
@@ -2492,25 +2521,25 @@
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Pro pohodlí zákazníků, tyto kódy mohou být použity v tiskových formátech, jako na fakturách a dodacích listech"
 DocType: Sales Invoice,Time Sheet List,Doba Zoznam Sheet
 DocType: Employee,You can enter any date manually,Můžete zadat datum ručně
-DocType: Sales Invoice,Advertisement,Reklama
 DocType: Asset Category Account,Depreciation Expense Account,Odpisy Náklady účtu
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Probationary Period,Skúšobná doba
-apps/erpnext/erpnext/hooks.py +102,Announcements,oznámenia
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Skúšobná doba
+apps/erpnext/erpnext/hooks.py +111,Announcements,oznámenia
 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 +109,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 +16,To Datetime,Chcete-li datetime
+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/scheduling_tool/scheduling_tool.py +51,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/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Nevybavené Aktivity
+DocType: Accounts Settings,Make Payment via Journal Entry,Vykonať platbu cez Journal Entry
+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 +127,Please enter relieving date.,Zadejte zmírnění datum.
-apps/erpnext/erpnext/controllers/trends.py +145,Amt,Amt
+apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,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 +26,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ň"
@@ -2528,14 +2557,15 @@
 apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1},Nepodarilo sa nájsť kurz pre {0} do {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Mark Poldenné
 DocType: Sales Invoice,Sales Team,Prodejní tým
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Duplicate entry,Duplicitní záznam
+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 +490,[Error],[Chyba]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +484,[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
 apps/erpnext/erpnext/controllers/status_updater.py +175,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.
 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
@@ -2551,22 +2581,22 @@
 ,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 +25,All Jobs,všetky Jobs
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,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
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Amount {0} {1} {2} {3},Množstvo {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Amount {0} {1} {2} {3},Množstvo {0} {1} {2} {3}
 DocType: Account,Depreciation,Znehodnocení
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Dodavatel (é)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Účasť zamestnancov Tool
 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 +372,Payment Entries {0} are un-linked,Platobné Príspevky {0} sú un-spojený
+apps/erpnext/erpnext/accounts/utils.py +449,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í
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +497,Material Requests {0} created,Materiál Žádosti {0} vytvořené
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +498,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.
 DocType: Purchase Invoice,Address and Contact,Adresa a Kontakt
@@ -2605,7 +2635,7 @@
 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 +848,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 +859,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 +233,Closing (Dr),Uzavření (Dr)
 DocType: Cheque Print Template,Cheque Size,šek Veľkosť
@@ -2626,7 +2656,8 @@
 ,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ť.
-apps/erpnext/erpnext/controllers/accounts_controller.py +555,'Update Stock' cannot be checked for fixed asset sale,&quot;Aktualizácia Sklad&quot; nemôžu byť kontrolované na pevnú predaji majetku
+DocType: Student Guardian,Father,otec
+apps/erpnext/erpnext/controllers/accounts_controller.py +558,'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/buying/doctype/purchase_order/purchase_order.py +132,Material Request {0} is cancelled or stopped,Materiál Request {0} je zrušena nebo zastavena
@@ -2636,15 +2667,15 @@
 DocType: Sales Order,Fully Delivered,Plně Dodáno
 DocType: Lead,Lower Income,S nižšími příjmy
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","Účet hlavu pod odpovědnosti, ve kterém se bude Zisk / ztráta rezervovali"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +166,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 +238,"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 +81,Purchase Order number required for Item {0},Číslo vydané objednávky je potřebné k položce {0}
+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/purchase_receipt/purchase_receipt.py +82,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 +17,Cannot change status as student {0} is linked with student application {1},Nemôže zmeniť štatút študenta {0} je prepojený s aplikáciou študentské {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Nemôže zmeniť štatút študenta {0} je prepojený s aplikáciou študentské {1}
 DocType: Timesheet,"List of employee which has ""Salary Slip Based on Timesheet"" is enabled in salary structure.","Zoznam zamestnancov, ktorý má &quot;výplatnej páske na časový rozvrh based&quot; je povolené v platovej štruktúre."
 DocType: Asset,Fully Depreciated,plne odpísaný
 ,Stock Projected Qty,Reklamní Plánovaná POČET
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Customer {0} does not belong to project {1},Zákazník {0} nepatří k projektu {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,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
@@ -2656,7 +2687,7 @@
 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/patches/v7_0/create_warehouse_nestedset.py +55,All Warehouses,všetky Sklady
+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 +105,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
@@ -2668,10 +2699,10 @@
 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/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Proveďte výplatní pásce
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +26,Browse BOM,Prechádzať BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,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/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 Year,Academic Year,Akademický rok
+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
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,Ocenění
@@ -2679,12 +2710,12 @@
 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 +197,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 +204,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: Workstation Working Hour,Start Time,Start Time
 DocType: Item Price,Bulk Import Help,Bulk import Help
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +256,Select Quantity,Zvolte množství
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +257,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á
@@ -2701,6 +2732,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Buď cílové množství nebo cílová částka je povinná.
 apps/erpnext/erpnext/config/projects.py +45,Cost of various activities,Náklady na rôznych aktivít
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Nastavenie udalostí do {0}, pretože zamestnanec pripojená k nižšie predajcom nemá ID užívateľa {1}"
+DocType: Timesheet,Billing Details,fakturačné údaje
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +149,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}
 DocType: Item,Inspection Required,Kontrola je povinná
@@ -2720,7 +2752,7 @@
 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 +138,Wire Transfer,Bankovní převod
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,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: Sales Order,Recurring Order,Opakující se objednávky
 DocType: Company,Default Income Account,Účet Default příjmů
@@ -2732,21 +2764,19 @@
 ,Welcome to ERPNext,Vitajte v ERPNext
 apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,Obchodná iniciatíva na Ponuku
 DocType: Lead,From Customer,Od Zákazníka
-apps/erpnext/erpnext/demo/setup_data.py +357,Calls,Volá
+apps/erpnext/erpnext/demo/setup/setup_data.py +300,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/stock/doctype/item/item.py +466,"As there are existing transactions for this item, \
-							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Rovnako ako existujú nejaké transakcie pre túto položku, \ nemožno zmeniť hodnoty &quot;Má poradové číslo&quot;, &quot;má Batch Nie &#39;,&#39; Je skladom&quot; a &quot;ocenenie Method&quot;"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,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/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 +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Poznámka: Systém nebude kontrolovat přes dobírku a over-rezervace pro item {0} jako množství nebo částka je 0
 DocType: Notification Control,Quotation Message,Správa k ponuke
 DocType: Issue,Opening Date,Datum otevření
-apps/erpnext/erpnext/schools/api.py +58,Attendance has been marked successfully.,Účasť bola úspešne označená.
+apps/erpnext/erpnext/schools/api.py +57,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 +136,Account Type for {0} must be {1},Typ účtu pre {0} musí byť {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +139,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
@@ -2761,12 +2791,13 @@
 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/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 +20,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 +1190,Please select customer,vyberte zákazníka
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1193,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
@@ -2776,6 +2807,7 @@
 ,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 +50,Missing Currency Exchange Rates for {0},Chybí Směnárna Kurzy pro {0}
 DocType: Assessment,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-
@@ -2793,11 +2825,12 @@
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Názov témy
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Aspoň jeden z prodeje nebo koupě musí být zvolena
+DocType: Grading Structure,Grade Intervals,grade Intervaly
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Vyberte podstatu svojho podnikania.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,"Tam, kde jsou výrobní operace prováděny."
 DocType: Asset Movement,Source Warehouse,Zdroj Warehouse
 DocType: Installation Note,Installation Date,Datum instalace
-apps/erpnext/erpnext/controllers/accounts_controller.py +534,Row #{0}: Asset {1} does not belong to company {2},Riadok # {0}: {1} Asset nepatrí do spoločnosti {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +537,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
@@ -2811,28 +2844,31 @@
 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 +111,Date Of Retirement must be greater than Date of Joining,"Datum odchodu do důchodu, musí být větší než Datum spojování"
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +49,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 +87,{0}% Delivered,{0}% dodané
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% dodané
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Položka {0}: Objednané množstvo {1} nemôže byť nižšia ako minimálna Objednané množstvo {2} (definovanej v bode).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Měsíční Distribution Procento
 DocType: Territory,Territory Targets,Území Cíle
 DocType: Delivery Note,Transporter Info,Transporter Info
-apps/erpnext/erpnext/accounts/utils.py +379,Please set default {0} in Company {1},Prosím nastaviť predvolený {0} vo firme {1}
+apps/erpnext/erpnext/accounts/utils.py +456,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
 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.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Tituly na tiskových šablon, např zálohové faktury."
+DocType: Student Guardian,Student Guardian,študent Guardian
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +184,Valuation type charges can not marked as Inclusive,Poplatky typu ocenenie môže nie je označený ako Inclusive
 DocType: POS Profile,Update Stock,Aktualizace skladem
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Různé UOM položky povede k nesprávné (celkem) Čistá hmotnost hodnoty. Ujistěte se, že čistá hmotnost každé položky je ve stejném nerozpuštěných."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
 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 +349,Journal Entries {0} are un-linked,Zápisů {0} jsou un-spojený
+apps/erpnext/erpnext/accounts/utils.py +426,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"
@@ -2856,6 +2892,7 @@
 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
+DocType: Homepage,"URL for ""All Products""",URL pre &quot;všetky produkty&quot;
 DocType: Leave Application,Leave Balance Before Application,Nechte zůstatek před aplikací
 DocType: SMS Center,Send SMS,Pošlete SMS
 DocType: Cheque Print Template,Width of amount in word,Šírka sumy v slove
@@ -2864,7 +2901,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 +29,Current Job Openings,Aktuálne pracovné príležitosti
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,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
@@ -2877,7 +2914,7 @@
 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 +850,Show tax break-up,Show daň break-up
+apps/erpnext/erpnext/public/js/controllers/transaction.js +841,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/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ť"
@@ -2887,10 +2924,11 @@
 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 +534,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 +80,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 +162,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/selling/doctype/customer/customer.py +195,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 +5,This is based on the attendance of this Student,To je založené na účasti tohto študenta
@@ -2899,12 +2937,11 @@
 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 +75,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 +138,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/hr/doctype/leave_application/leave_application.py +145,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: Program Enrollment Fee,Program Enrollment Fee,program zápisné
 DocType: Item,Supplier Items,Dodavatele položky
 DocType: Opportunity,Opportunity Type,Typ Příležitosti
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,Nová spoločnost
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,Cost Center is required for 'Profit and Loss' account {0},"Nákladové středisko je vyžadováno pro účet ""výkaz zisku a ztrát"" {0}"
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Transakcie môžu byť vymazané len tvorca Spoločnosti
 apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,Nesprávný počet hlavní knihy záznamů nalezen. Pravděpodobně jste zvolili nesprávný účet v transakci.
 DocType: Cheque Print Template,Cheque Width,šek Šírka
@@ -2913,16 +2950,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,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 +228,{0} '{1}' is disabled,{0} '{1}' je vypnuté
+apps/erpnext/erpnext/controllers/accounts_controller.py +231,{0} '{1}' is disabled,{0} '{1}' je vypnuté
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Nastaviť ako Otvorené
 DocType: Cheque Print Template,Scanned Cheque,skenovaných Šek
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Posílat automatické e-maily na Kontakty na předložení transakcí.
+DocType: Timesheet,Total Billable Amount,Celková suma Fakturovateľná
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Položka 3
 DocType: Purchase Order,Customer Contact Email,Zákazník Kontaktný e-mail
 DocType: Warranty Claim,Item and Warranty Details,Položka a Záruka Podrobnosti
 DocType: Sales Team,Contribution (%),Příspěvek (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Poznámka: Položka Platba nebude vytvořili, protože ""v hotovosti nebo bankovním účtu"" nebyl zadán"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Responsibilities,Zodpovednosť
+apps/erpnext/erpnext/controllers/accounts_controller.py +78,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ť
 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
@@ -2930,6 +2968,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Pridať používateľa
 DocType: Pricing Rule,Item Group,Položka Group
 DocType: Item,Safety Stock,bezpečnostné Sklad
+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: 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)
@@ -2939,7 +2978,6 @@
 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: Timesheet,Total Hours,Celkem hodin
 DocType: Journal Entry,Printing Settings,Nastavenie tlače
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,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ý
@@ -2952,13 +2990,14 @@
 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 +71,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
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Customer&gt; Customer Group&gt; Územie
 DocType: Purchase Invoice Item,Rate,Sadzba
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Intern,Internovat
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,Internovat
 DocType: Stock Entry,From BOM,Od BOM
 DocType: Assessment,Assessment Code,kód Assessment
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +32,Basic,Základní
+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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Prosím, klikněte na ""Generovat Schedule"""
+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 +95,Reference No is mandatory if you entered Reference Date,"Referenční číslo je povinné, pokud jste zadali k rozhodnému dni"
@@ -2967,11 +3006,11 @@
 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 +752,Issue Material,Vydání Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +723,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 +683,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 +665,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ť."
 DocType: Hub Settings,Access Token,Přístupový Token
 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
@@ -2979,33 +3018,35 @@
 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 +1122,Enter value must be positive,Zadajte hodnota musí byť kladná
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,All Territories,Všetky územia
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1125,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
 DocType: Purchase Invoice,Items,Položky
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +23,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 +221,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 +233,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 +96,Request for Quotations,Žiadosť o citátov
+apps/erpnext/erpnext/hooks.py +104,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
 DocType: Asset,Partially Depreciated,čiastočne odpíše
 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 +628,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Východzí merná jednotka varianty &#39;{0}&#39; musí byť rovnaký ako v Template &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Východzí merná jednotka varianty &#39;{0}&#39; musí byť rovnaký ako v Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Vypočítať na základe
 DocType: Delivery Note Item,From Warehouse,Zo skladu
 DocType: Assessment,Supervisor Name,Meno Supervisor
+DocType: Assessment,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
 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 +27,Default Address Template cannot be deleted,Výchozí šablony adresy nemůže být smazán
+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
 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í
@@ -3020,8 +3061,8 @@
 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/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 +485,No default BOM exists for Item {0},No default BOM existuje pro bod {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +336,Please select Posting Date first,"Prosím, vyberte najprv Dátum zverejnenia"
+apps/erpnext/erpnext/stock/get_item_details.py +486,No default BOM exists for Item {0},No default BOM existuje pro bod {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +326,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
 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
@@ -3037,6 +3078,7 @@
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Zápas platby faktúrami
 DocType: Journal Entry,Bank Entry,Bank Entry
 DocType: Authorization Rule,Applicable To (Designation),Vztahující se na (označení)
+,Profitability Analysis,analýza ziskovosť
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,Přidat do košíku
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Seskupit podle
 DocType: Guardian,Interests,záujmy
@@ -3049,22 +3091,22 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,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 +141,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Serialized Položka {0} nelze aktualizovat \
  pomocí Reklamní Odsouhlasení"
 DocType: Scheduling Tool,Day,deň
 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 +122,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 +129,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
-DocType: Student Applicant,AP.,AP.
 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 +639,Point of Sale,Místo Prodeje
+apps/erpnext/erpnext/accounts/page/pos/pos.js +634,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: Account,Tax,Daň
 DocType: Production Planning Tool,Production Planning Tool,Plánování výroby Tool
@@ -3073,74 +3115,77 @@
 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 +373,Quantity to Manufacture must be greater than 0.,"Množstvo, ktoré má výroba musí byť väčšia ako 0 ° C."
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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: POS Profile,Customer Group,Zákazník Group
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,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/doctype/asset/asset.py +83,Next Depreciation Date must be on or after today,Vedľa Odpisy Dátum musí byť na alebo po dnešku
 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 +145,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: Quotation,Quotation Lost Reason,Dôvod neúspešnej ponuky
+apps/erpnext/erpnext/utilities/doctype/address/address.py +164,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.
 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 +330,Transaction reference no {0} dated {1},Referenčné transakcie no {0} z {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,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 +107,Summary for this month and pending activities,Zhrnutie pre tento mesiac a prebiehajúcim činnostiam
+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/accounts/doctype/sales_invoice/sales_invoice.py +406,Please remove this Invoice {0} from C-Form {1},Odeberte Tato faktura {0} z C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,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 +644,Get Items,Získat položky
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +623,Get Items,Získat položky
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +210,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 +41,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
 DocType: Payment Request,Initiated,Zahájil
 DocType: Production Order,Planned Start Date,Plánované datum zahájení
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,Customer is required against Receivable account {0},Zákazník je potrebná proti pohľadávok účtu {0}
 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 +265,Project-wise data is not available for Quotation,Data dle projektu nejsou k dispozici pro nabídku
+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 +101,Commercial,Obchodní
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,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: Supplier Quotation,Supplier Address,Dodavatel Address
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +648,Row {0}# Account must be of type 'Fixed Asset',Riadok {0} # účet musí byť typu &quot;Fixed Asset&quot;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,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 +30,Series is mandatory,Série je povinné
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +50,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
 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}
 DocType: Leave Allocation,Unused leaves,Nepoužité listy
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Cr,Cr
 DocType: Tax Rule,Billing State,Fakturácia State
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +250,Transfer,Převod
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +187,{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 +825,Fetch exploded BOM (including sub-assemblies),Fetch explodovala kusovníku (včetně montážních podskupin)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +254,Transfer,Převod
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +190,{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 +796,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 +115,Due Date is mandatory,Dátum splatnosti je povinný
+apps/erpnext/erpnext/controllers/accounts_controller.py +118,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
 DocType: Journal Entry,Pay To / Recd From,Platit K / Recd Z
 DocType: Naming Series,Setup Series,Řada Setup
 DocType: Payment Reconciliation,To Invoice Date,Ak chcete dátumu vystavenia faktúry
 DocType: Supplier,Contact HTML,Kontakt HTML
 ,Inactive Customers,Neaktívni zákazníci
+DocType: 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í?
 DocType: Quality Inspection,Delivery Note No,Dodacího listu
@@ -3149,7 +3194,7 @@
 DocType: Company,Retail,Maloobchod
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +120,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 +587,Product Bundle,Bundle Product
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Product Bundle,Bundle Product
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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
@@ -3159,8 +3204,8 @@
 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 +742,Send Supplier Emails,Poslať Dodávateľ e-maily
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +104,"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/buying/doctype/request_for_quotation/request_for_quotation.js +708,Send Supplier Emails,Poslať Dodávateľ e-maily
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,"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
 DocType: Guardian Interest,Guardian Interest,Guardian Záujem
 DocType: Timesheet,Employee Detail,Detail zamestnanec
@@ -3171,9 +3216,9 @@
 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}
 DocType: Salary Slip,Earning & Deduction,Výdělek a dedukce
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +77,Account {0} cannot be a Group,Účet {0} nemůže být skupina
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} cannot be a Group,Účet {0} nemůže být skupina
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +31,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 +107,Negative Valuation Rate is not allowed,Negativní ocenění Rate není povoleno
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Negativní ocenění Rate není povoleno
 DocType: Holiday List,Weekly Off,Týdenní Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Pro např 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +39,Provisional Profit / Loss (Credit),Prozatímní Zisk / ztráta (Credit)
@@ -3187,16 +3232,16 @@
 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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Nákladové stredisko je povinné pre položku {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +626,Get Items from Product Bundle,Získať predmety z Bundle Product
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +605,Get Items from Product Bundle,Získať predmety z Bundle Product
 DocType: Asset,Straight Line,Priamka
 DocType: Project User,Project User,projekt Užívateľ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} is inactive,Účet {0} je neaktivní
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} is inactive,Účet {0} je neaktivní
 DocType: GL Entry,Is Advance,Je Zálohová
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Účast Datum od a docházky do dnešního dne je povinná
 apps/erpnext/erpnext/controllers/buying_controller.py +148,Please enter 'Is Subcontracted' as Yes or No,"Prosím, zadejte ""subdodavatelům"" jako Ano nebo Ne"
 DocType: Sales Team,Contact No.,Kontakt Číslo
 DocType: Bank Reconciliation,Payment Entries,platobné Príspevky
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,'Profit and Loss' type account {0} not allowed in Opening Entry,"""Výkaz zisku a straty"" typ účtu {0} nie je privilegovaný pre Sprístupnenie Údajov"
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +71,'Profit and Loss' type account {0} not allowed in Opening Entry,"""Výkaz zisku a straty"" typ účtu {0} nie je privilegovaný pre Sprístupnenie Údajov"
 DocType: 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
@@ -3215,7 +3260,7 @@
 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,Provize z prodeje
 DocType: Offer Letter Term,Value / Description,Hodnota / Popis
-apps/erpnext/erpnext/controllers/accounts_controller.py +558,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Riadok # {0}: Asset {1} nemôže byť predložený, je už {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +561,"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: Production Order,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}.
@@ -3228,13 +3273,13 @@
 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/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: Sales Order,% Amount Billed,% Fakturovanej čiastky
+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."
 apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},No Položka s Serial č {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Otvorené Oznámenie
+DocType: Email Digest,Open Notifications,Otvorené Oznámenie
 DocType: Payment Entry,Difference Amount (Company Currency),Rozdiel Suma (Company mena)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,Přímé náklady
 apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
@@ -3242,7 +3287,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Nový zákazník Příjmy
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,Cestovní výdaje
 DocType: Maintenance Visit,Breakdown,Rozbor
-apps/erpnext/erpnext/controllers/accounts_controller.py +634,Account: {0} with currency: {1} can not be selected,Účet: {0} s menou: {1} nemožno vybrať
+apps/erpnext/erpnext/controllers/accounts_controller.py +637,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}
 DocType: Program Enrollment Tool,Student Applicants,študent Žiadatelia
@@ -3250,15 +3295,15 @@
 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 +56,Probation,Zkouška
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Probation,Zkouška
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,mzdové Components
 DocType: Program Enrollment Tool,New Academic Year,Nový akademický rok
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Payment of salary for the month {0} and year {1},Platba platu za měsíc {0} a rok {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Payment of salary for the month {0} and year {1},Platba platu za měsíc {0} a rok {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,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 +144,Planning,Plánování
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,Plánování
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,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
@@ -3271,11 +3316,10 @@
 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.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Sales invoice submitted sucessfully.,Predajná faktúra predložená úspešne.
 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}
 DocType: Assessment Result,Student Name,Meno študenta
-apps/erpnext/erpnext/hooks.py +104,Assessment Schedule,plán Assessment
+apps/erpnext/erpnext/hooks.py +113,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
@@ -3285,6 +3329,7 @@
 DocType: GL Entry,Party Type,Typ Party
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +78,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
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Plat master šablona.
 DocType: Leave Type,Max Days Leave Allowed,Max Days Leave povolena
@@ -3296,18 +3341,19 @@
 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 +99,All Customer Groups,Všechny skupiny zákazníků
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +78,Accumulated Monthly,nahromadené za mesiac
-apps/erpnext/erpnext/controllers/accounts_controller.py +595,{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/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Všechny skupiny zákazníků
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +81,Accumulated Monthly,nahromadené za mesiac
+apps/erpnext/erpnext/controllers/accounts_controller.py +598,{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
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Ceník Rate (Company měny)
 DocType: Products Settings,Products Settings,nastavenie Produkty
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +188,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
 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 +84,Secretary,Sekretářka
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,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
@@ -3316,24 +3362,22 @@
 ,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
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,Riadok # {0}: Výrobné číslo je povinné
+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 +859,Supplier Quotation,Dodávateľská ponuka
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +838,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 +7,Collect Fees,vyberať poplatky
+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}
 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.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Pripravované akcie
 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
-DocType: Email Digest,Income / Expense,Výnosy / náklady
 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."
@@ -3345,13 +3389,14 @@
 DocType: Customer,From Lead,Od Obchodnej iniciatívy
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Objednávky uvolněna pro výrobu.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Vyberte fiskálního roku ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,POS Profile required to make POS Entry,"POS Profile požadované, aby POS Vstup"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +509,POS Profile required to make POS Entry,"POS Profile požadované, aby POS Vstup"
 DocType: Program Enrollment Tool,Enroll Students,zapísať študenti
 DocType: Hub Settings,Name Token,Názov Tokenu
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standardní prodejní
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Atleast one warehouse is mandatory,Alespoň jeden sklad je povinný
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +129,Atleast one warehouse is mandatory,Alespoň jeden sklad je povinný
 DocType: Serial No,Out of Warranty,Out of záruky
 DocType: BOM Replace Tool,Replace,Vyměnit
+DocType: Production Order,Unstopped,nezastavanou
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{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
@@ -3372,10 +3417,11 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Listy musí být přiděleny v násobcích 0,5"
 DocType: Production Order,Operation Cost,Provozní náklady
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,Nahrajte účast ze souboru CSV
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Vynikající Amt
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Nastavit cíle Item Group-moudrý pro tento prodeje osobě.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Freeze Zásoby Starší než [dny]
-apps/erpnext/erpnext/controllers/accounts_controller.py +528,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Riadok # {0}: Prostriedok je povinné pre dlhodobého majetku nákup / predaj
+apps/erpnext/erpnext/controllers/accounts_controller.py +531,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Riadok # {0}: Prostriedok je povinné pre dlhodobého majetku nákup / predaj
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Pokud dva nebo více pravidla pro tvorbu cen se nacházejí na základě výše uvedených podmínek, priorita je aplikována. Priorita je číslo od 0 do 20, zatímco výchozí hodnota je nula (prázdný). Vyšší číslo znamená, že bude mít přednost, pokud existuje více pravidla pro tvorbu cen se za stejných podmínek."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Fiškálny rok: {0} neexistuje
 DocType: Currency Exchange,To Currency,Chcete-li měny
@@ -3392,15 +3438,15 @@
 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
-DocType: Sales Invoice,Exhibition,Výstava
 apps/erpnext/erpnext/utilities/doctype/address/address.py +77,"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 +81,Syntax error in formula or condition: {0},syntaktická chyba vo vzorci alebo stave: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +92,Syntax error in formula or condition: {0},syntaktická chyba vo vzorci alebo stave: {0}
 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"
+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 +28,Jobs,jobs
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,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
@@ -3409,16 +3455,16 @@
 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 +763,Make Supplier Quotation,Vytvoriť ponuku od dodávateľa
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,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/controllers/sales_and_purchase_return.py +100,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 +42,Casual Leave,Casual Leave
+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
 DocType: Batch,Batch ID,Šarže ID
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,Note: {0},Poznámka: {0}
 ,Delivery Note Trends,Dodací list Trendy
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +103,This Week's Summary,Tento týždeň Zhrnutie
+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í
 DocType: Student Group Creation Tool,Get Courses,získať kurzy
 DocType: GL Entry,Party,Strana
@@ -3428,7 +3474,7 @@
 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 +59,Piecework,Úkolová práce
+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: Task,Actual Time (in Hours),Skutočná doba (v hodinách)
 DocType: Employee,History In Company,Historie ve Společnosti
@@ -3445,7 +3491,7 @@
 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.
 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 +162,Black,Čierna
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,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é
@@ -3456,13 +3502,13 @@
 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}","Aktíva {0} nemôže byť vyhodený, ako je to už {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Total Expense Claim (via Expense nároku)
-apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +69,Customer Id,Zákazník Id
+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
 DocType: Journal Entry Account,Exchange Rate,Výmenný kurz
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Sales Order {0} is not submitted,Prodejní objednávky {0} není předložena
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +527,Sales Order {0} is not submitted,Prodejní objednávky {0} není předložena
 DocType: Homepage,Tag Line,tag linka
 DocType: Fee Component,Fee Component,poplatok Component
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +857,Add items from,Pridať položky z
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +836,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}
 DocType: Cheque Print Template,Regular,pravidelný
 DocType: BOM,Last Purchase Rate,Last Cena při platbě
@@ -3470,6 +3516,7 @@
 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"
 ,Sales Person-wise Transaction Summary,Prodej Person-moudrý Shrnutí transakce
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +60,Cost Center is required for 'Profit and Loss' account {0}. Please set up a default Cost Center for the Company.,na účet ziskov a strát &quot; &#39;{0} je potrebné nákladové stredisko. Prosím nastaviť predvolené nákladového strediska pre spoločnosť.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,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
@@ -3480,12 +3527,12 @@
 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 +710,Online,online
+apps/erpnext/erpnext/accounts/page/pos/pos.js +692,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 +16,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á"
+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á"
 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 +74,Quality Management,Řízení kvality
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,Řízení kvality
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,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}"
 DocType: Employee External Work History,Employee External Work History,Zaměstnanec vnější práce History
@@ -3507,11 +3554,12 @@
 DocType: Student,Student Email ID,Študent ID e-mailu
 DocType: Employee,Notice (days),Oznámenie (dni)
 DocType: Tax Rule,Sales Tax Template,Daň z predaja Template
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1520,Select items to save the invoice,"Vyberte položky, ktoré chcete uložiť faktúru"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1544,Select items to save the invoice,"Vyberte položky, ktoré chcete uložiť faktúru"
 DocType: Employee,Encashment Date,Inkaso Datum
 DocType: Account,Stock Adjustment,Úprava skladových zásob
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Existuje Náklady Predvolené aktivity pre Typ aktivity - {0}
 DocType: Production Order,Planned Operating Cost,Plánované provozní náklady
+DocType: Academic Term,Term Start Date,Termín Dátum začatia
 apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},V příloze naleznete {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Výpis z bankového účtu zostatok podľa hlavnej knihy
 DocType: Job Applicant,Applicant Name,Žadatel Název
@@ -3541,17 +3589,17 @@
 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."
 DocType: Company,Distribution,Distribúcia
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +8,Amount Paid,Zaplacené částky
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Project Manager,Project Manager
+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
 ,Quoted Item Comparison,Citoval Položka Porovnanie
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Dispatch,Odeslání
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,Odeslání
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max sleva povoleno položku: {0} {1}%
 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."
-DocType: Sales Invoice,Supplier Reference,Dodavatel Označení
-apps/erpnext/erpnext/accounts/page/pos/pos.js +844,"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 +832,"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
@@ -3565,7 +3613,7 @@
 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 +83,Error in formula or condition,Chyba vo vzorci alebo stave
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,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
@@ -3574,7 +3622,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},"Chcete-li data by měla být v rámci fiskálního roku. Za předpokladu, že To Date = {0}"
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Zde si můžete udržet výšku, váhu, alergie, zdravotní problémy atd"
 DocType: Leave Block List,Applies to Company,Platí pre firmu
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +197,Cannot cancel because submitted Stock Entry {0} exists,"Nelze zrušit, protože předložena Reklamní Entry {0} existuje"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +198,Cannot cancel because submitted Stock Entry {0} exists,"Nelze zrušit, protože předložena Reklamní Entry {0} existuje"
 DocType: Purchase Invoice,In Words,Slovy
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,Today is {0}'s birthday!,Dnes je {0} 's narozeniny!
 DocType: Production Planning Tool,Material Request For Warehouse,Materiál Request For Warehouse
@@ -3584,14 +3632,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,Váš finančný rok začína
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Asset Odpisy a zostatkov
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +319,Amount {0} {1} transferred from {2} to {3},Množstvo {0} {1} prevedená z {2} na {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +322,Amount {0} {1} transferred from {2} to {3},Množstvo {0} {1} prevedená z {2} na {3}
 DocType: Sales Invoice,Get Advances Received,Získat přijaté zálohy
 DocType: Email Digest,Add/Remove Recipients,Přidat / Odebrat příjemce
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +432,Transaction not allowed against stopped Production Order {0},Transakce není povoleno proti zastavila výrobu Objednat {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +437,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 +143,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 +652,Item variant {0} exists with same attributes,Variant Položky {0} existuje s rovnakými vlastnosťami
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Variant Položky {0} existuje s rovnakými vlastnosťami
+DocType: Leave Application,LAP/,LAP /
 DocType: Salary Slip,Salary Slip,Plat Slip
 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ý"
@@ -3599,12 +3648,12 @@
 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 +212,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 +215,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ů
-apps/erpnext/erpnext/public/js/controllers/transaction.js +866,It is needed to fetch Item Details.,"Je potrebné, aby priniesla Detaily položky."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +857,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
@@ -3614,14 +3663,14 @@
 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 +178,Invalid {0},Neplatný {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Sick Leave,Zdravotní dovolená
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,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
 DocType: Warehouse,PIN,PIN
 DocType: Sales Invoice,Base Change Amount (Company Currency),Základňa Zmena Suma (Company mena)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +313,No accounting entries for the following warehouses,Žádné účetní záznamy pro následující sklady
-apps/erpnext/erpnext/projects/doctype/project/project.js +102,Save the document first.,Uložte dokument ako prvý.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +314,No accounting entries for the following warehouses,Žádné účetní záznamy pro následující sklady
+apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Uložte dokument ako prvý.
 DocType: Account,Chargeable,Vyměřovací
 DocType: Company,Change Abbreviation,Zmeniť skratku
 DocType: Expense Claim Detail,Expense Date,Datum výdaje
@@ -3634,10 +3683,9 @@
 DocType: Purchase Invoice,Recurring Print Format,Opakujúce 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"
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,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
 DocType: Appraisal,Appraisal Template,Posouzení Template
 DocType: Item Group,Item Classification,Položka Klasifikace
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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
@@ -3647,8 +3695,8 @@
 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 +940,Please select {0} first,"Prosím, nejprve vyberte {0}"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +749,Batch {0} of Item {1} has expired.,Batch {0} z {1} bodu vypršala.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +953,Please select {0} first,"Prosím, nejprve vyberte {0}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +757,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
@@ -3676,8 +3724,8 @@
  {%, 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 +92,Warehouse not found in the system,Sklad nebyl nalezen v systému
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +106,This Month's Summary,Tento mesiac je zhrnutie
+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
 DocType: Quality Inspection Reading,Quality Inspection Reading,Kvalita Kontrola Reading
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Zmraziť zásoby staršie ako` malo by byť menšie než %d dní.
 DocType: Tax Rule,Purchase Tax Template,Spotrebná daň šablóny
@@ -3687,21 +3735,22 @@
 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 +87,Please set Next Depreciation Date,"Prosím, stojí vedľa odpisov Dátum"
-DocType: Payment Gateway,Payment Gateway,Platobná brána
 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 +378,Operation Time must be greater than 0 for Operation {0},Prevádzková doba musí byť väčšia ako 0 pre prevádzku {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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/accounts/doctype/account/account.py +170,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
 DocType: Program,Program Abbreviation,program Skratka
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,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: Appraisal,Start Date,Datum zahájení
@@ -3717,21 +3766,22 @@
 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
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Např. smsgateway.com/api/send-sms.cgi
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +27,Transaction currency must be same as Payment Gateway currency,Mena transakcie musí byť rovnaká ako platobná brána menu
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Transaction currency must be same as Payment Gateway currency,Mena transakcie musí byť rovnaká ako platobná brána menu
 DocType: Payment Entry,Receive,Príjem
+apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,citácie:
 DocType: Maintenance Visit,Fully Completed,Plně Dokončeno
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Hotovo
 DocType: Employee,Educational Qualification,Vzdělávací Kvalifikace
 DocType: Workstation,Operating Costs,Provozní náklady
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Akčný ak súhrnné mesačný rozpočet prekročený
 DocType: Purchase Invoice,Submit on creation,Predloženie návrhu na vytvorenie
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +432,Currency for {0} must be {1},Mena pre {0} musí byť {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +435,Currency for {0} must be {1},Mena pre {0} musí byť {1}
 DocType: Asset,Disposal Date,Likvidácia Dátum
 DocType: Employee Leave Approver,Employee Leave Approver,Zaměstnanec Leave schvalovač
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,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 +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/crm/doctype/opportunity/opportunity.py +79,"Cannot declare as lost, because Quotation has been made.","Nelze prohlásit za ztracený, protože citace byla provedena."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Nákup Hlavní manažer
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +429,Production Order {0} must be submitted,Výrobní zakázka {0} musí být předloženy
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +434,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
@@ -3741,25 +3791,27 @@
 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/accounts/report/general_ledger/general_ledger.py +181,Totals,Súčty
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,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 +113,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 +120,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.
+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 +181,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/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 +793,All records are synced.,Všetky záznamy sú synchronizované.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +781,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ů
 DocType: Cost Center,Cost Center Name,Meno nákladového strediska
@@ -3778,21 +3830,20 @@
 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/selling/doctype/quotation/quotation.py +49,Cannot set as Lost as Sales Order is made.,"Nelze nastavit jako Ztraceno, protože je přijata objednávka."
-DocType: Student Applicant,Mother's Name,Meno matky
 DocType: Request for Quotation Item,Supplier Part No,Žiadny dodávateľ Part
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +348,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Nemôže odpočítať, ak kategória je pre &quot;ocenenie&quot; alebo &quot;Vaulation a Total&quot;"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Received From,Prijaté Od
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Received From,Prijaté Od
 DocType: Lead,Converted,Převedené
 DocType: Item,Has Serial No,Má Sériové číslo
 DocType: Employee,Date of Issue,Datum vydání
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{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 +93,Row {0}: Hours value must be greater than zero.,Riadok {0}: doba hodnota musí byť väčšia ako nula.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +117,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ť
 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 +172,{0} {1} does not exist,{0} {1} neexistuje
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +175,{0} {1} does not exist,{0} {1} neexistuje
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,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 +72,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í
@@ -3801,13 +3852,14 @@
 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/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
 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 +109,Electrical,Elektrický
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,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 +318,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}
@@ -3815,7 +3867,7 @@
 DocType: Item,Customer Code,Code zákazníků
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +210,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 +292,Debit To account must be a Balance Sheet account,Debetné Na účet musí byť účtu Súvaha
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Stock Aktiva
@@ -3827,11 +3879,11 @@
 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 +301,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 +313,Salary Slip of employee {0} already created for time sheet {1},Výplatnej páske zamestnanca {0} už vytvorili pre časové list {1}
 DocType: Sales Order Item,Ordered Qty,Objednáno Množství
-apps/erpnext/erpnext/stock/doctype/item/item.py +673,Item {0} is disabled,Položka {0} je zakázaná
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,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 +838,BOM does not contain any stock item,BOM neobsahuje žiadnu skladovú položku
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +809,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.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generování výplatních páskách
@@ -3839,23 +3891,24 @@
 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)
-apps/erpnext/erpnext/stock/doctype/item/item.py +485,Row #{0}: Please set reorder quantity,Riadok # {0}: Prosím nastavte množstvo objednávacie
+DocType: Sales Invoice Timesheet,Billing Hours,billing Hodiny
+apps/erpnext/erpnext/stock/doctype/item/item.py +487,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 +62,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
+DocType: Payment Entry,Allocate Payment Amount,Vyčleniť sumu platby
 DocType: Employee External Work History,Salary,Plat
 DocType: Serial No,Delivery Document Type,Dodávka Typ dokumentu
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Odeslat všechny výplatní pásky pro výše zvolených kritérií
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} položky synchronizované
 DocType: Sales Order,Partly Delivered,Částečně vyhlášeno
-DocType: Sales Invoice,Existing Customer,Stávající zákazník
 DocType: Email Digest,Receivables,Pohledávky
+DocType: Lead Source,Lead Source,Olovo Source
 DocType: Customer,Additional information regarding the customer.,Ďalšie informácie týkajúce sa zákazníka.
 DocType: Quality Inspection Reading,Reading 5,Čtení 5
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +38,Campaign Name is required,Je zapotřebí Název kampaně
 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
@@ -3864,10 +3917,9 @@
 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 +129,BOM and Manufacturing Quantity are required,BOM a výroba množstva sú povinné
+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/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Stárnutí rozsah 2
 DocType: SG Creation Tool Course,Max Strength,Max Sila
-DocType: Bank Reconciliation Detail,Amount,Částka
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM nahradil
 ,Sales Analytics,Prodejní Analytics
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +113,Available {0},K dispozícii {0}
@@ -3875,14 +3927,14 @@
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Nastavenia pre e-mail
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +96,Please enter default currency in Company Master,Zadejte prosím výchozí měnu v podniku Mistr
 DocType: Stock Entry Detail,Stock Entry Detail,Reklamní Entry Detail
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +100,Daily Reminders,Denná Upomienky
+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/account/account_tree.js +23,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 +71,Customer Service,Služby zákazníkům
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Customer Service,Služby zákazníkům
 DocType: Homepage Featured Product,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.
@@ -3891,8 +3943,9 @@
 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
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Východiskové prácu v sklade Progress
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1570,Total nos of serial no is not equal to quantity.,Celkom nos z sériovým číslom nerovná množstvo.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1594,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
@@ -3900,9 +3953,10 @@
 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 +82,Engineer,Inženýr
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,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 +370,Item Code required at Row No {0},Kód položky třeba na řádku č {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +398,Item Code required at Row No {0},Kód položky třeba na řádku č {0}
 DocType: Sales Partner,Partner Type,Partner Type
 DocType: Purchase Taxes and Charges,Actual,Aktuální
 DocType: Authorization Rule,Customerwise Discount,Sleva podle zákazníka
@@ -3918,16 +3972,18 @@
 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."
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +55,Part-time,Part-time
+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
 DocType: Employee,Applicable Holiday List,Použitelný Seznam Svátků
 DocType: Employee,Cheque,Šek
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Řada Aktualizováno
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +57,Series Updated,Řada Aktualizováno
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Report Type je povinné
 DocType: Item,Serial Number Series,Sériové číslo Series
 apps/erpnext/erpnext/buying/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 +87,Clearance Date updated,Svetlá Dátum aktualizované
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Úspěšně smířeni
@@ -3941,7 +3997,7 @@
 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 +513,Posting date and posting time is mandatory,Datum a čas zadání je povinný
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Datum a čas zadání je povinný
 apps/erpnext/erpnext/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."
@@ -3951,7 +4007,7 @@
 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/stock/doctype/stock_entry/stock_entry.py +158,Target warehouse in row {0} must be same as Production Order,Target sklad v řádku {0} musí být stejná jako výrobní zakázky
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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
 DocType: Company,Round Off Account,Zaokrúhliť účet
@@ -3960,23 +4016,22 @@
 DocType: Customer Group,Parent Customer Group,Parent Customer Group
 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 +180,Notice Period,Výpovedná Lehota
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,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 +4,New Sales Person Name,Meno Nová Sales Osoba
 DocType: Packing Slip,Gross Weight UOM,Hrubá Hmotnosť MJ
-DocType: Email Digest,Receivables / Payables,Pohledávky / Závazky
 DocType: Delivery Note Item,Against Sales Invoice,Proti prodejní faktuře
 DocType: Bin,Reserved Qty for Production,Vyhradené Množstvo pre výrobu
 DocType: Asset,Frequency of Depreciation (Months),Frekvencia odpisy (mesiace)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +469,Credit Account,Úverový účet
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Credit Account,Úverový účet
 DocType: Landed Cost Item,Landed Cost Item,Přistálo nákladovou položkou
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +55,Show zero values,Ukázat nulové hodnoty
+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
 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 +647,Please specify Attribute Value for attribute {0},Uveďte atribútu Hodnota atribútu {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Uveďte atribútu Hodnota atribútu {0}
 DocType: Item,Default Warehouse,Výchozí Warehouse
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +39,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ý"
@@ -3998,19 +4053,22 @@
 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
-DocType: Sales Invoice,Cold Calling,Cold Calling
 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: Maintenance Schedule Item,Half Yearly,Polročne
 DocType: Lead,Blog Subscriber,Blog Subscriber
+DocType: Guardian,Alternate Number,Alternatívne Number
 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 +253,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 +141,Set as Lost,Nastaviť ako Nezískané
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,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 +5,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
 DocType: Supplier,Credit Days Based On,Úverové Dni Based On
@@ -4022,11 +4080,10 @@
 ,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 +941,Select or add new customer,Vyberte alebo pridanie nového zákazníka
+apps/erpnext/erpnext/accounts/page/pos/pos.js +930,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 +5,This is based on the attendance of this Employee,To je založené na účasti základu tohto zamestnanca
-DocType: Sales Invoice,Frequency,kmitočet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +463,Debit Account,Debetné účet
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,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)
@@ -4035,27 +4092,27 @@
 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 +210,Supplier Quotation {0} created,Dodávateľ Cien {0} vytvoril
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +208,Supplier Quotation {0} created,Dodávateľ Cien {0} vytvoril
 apps/erpnext/erpnext/accounts/report/financial_statements.py +90,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 +173,Employee Benefits,Zamestnanecké benefity
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,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}
 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 +228,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/hr/doctype/employee/employee.py +232,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 +499,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 +500,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 +1007,Price List not found or disabled,Ceník nebyl nalezen nebo zakázán
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1008,Price List not found or disabled,Ceník nebyl nalezen nebo zakázán
 DocType: Expense Claim,Approved,Schválený
 DocType: Pricing Rule,Price,Cena
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +244,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 +256,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í
@@ -4066,12 +4123,12 @@
 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 +259,Please select Employee Record first.,"Prosím, vyberte zamestnanca záznam prvý."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +266,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 +190,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 +235,Please enter Expense Account,"Prosím, zadejte výdajového účtu"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,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 +963,"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 +976,"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
@@ -4086,9 +4143,10 @@
 DocType: Asset Movement,Transaction Date,Transakce Datum
 DocType: Production Plan Item,Planned Qty,Plánované Množství
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,Total Tax
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,For Quantity (Manufactured Qty) is mandatory,Pre Množstvo (Vyrobené ks) je povinné
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,For Quantity (Manufactured Qty) is mandatory,Pre Množstvo (Vyrobené ks) je povinné
 DocType: Stock Entry,Default Target Warehouse,Výchozí Target Warehouse
 DocType: Purchase Invoice,Net Total (Company Currency),Net Total (Company Měna)
+apps/erpnext/erpnext/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 +78,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: Production Order,Actual Start Date,Skutečné datum zahájení
@@ -4103,9 +4161,11 @@
 DocType: Warranty Claim,If different than customer address,Pokud se liší od adresy zákazníka
 DocType: BOM Operation,BOM Operation,BOM Operation
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Na předchozí řady Částka
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +226,Transfer Asset,prevod majetku
+DocType: Student,Home Address,Adresa bydliska
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +227,Transfer Asset,prevod majetku
 DocType: POS Profile,POS Profile,POS Profile
 apps/erpnext/erpnext/config/schools.py +33,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 +129,"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
@@ -4115,8 +4175,8 @@
 DocType: Assessment,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 +765,Material to Supplier,Materiál Dodávateľovi
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +189,Excise Invoice,Spotrebný Faktúra
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,Material to Supplier,Materiál Dodávateľovi
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,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
@@ -4126,7 +4186,7 @@
 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/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 +136,Credit Card,Kreditní karta
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,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í.
 DocType: Purchase Invoice,Next Date,Ďalší Dátum
@@ -4134,6 +4194,7 @@
 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: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Zde si můžete udržovat rodinné detailů, jako jsou jméno a povolání rodičem, manželem a dětmi"
+DocType: Academic Term,Term End Date,Termín Dátum ukončenia
 DocType: Hub Settings,Seller Name,Prodejce Name
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Daně a poplatky odečteny (Company měna)
 DocType: Item Group,General Settings,Všeobecné nastavenia
@@ -4145,7 +4206,7 @@
 DocType: Customer,Commission Rate,Výška provízie
 apps/erpnext/erpnext/stock/doctype/item/item.js +261,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 +115,"Payment Type must be one of Receive, Pay and Internal Transfer",Typ platby musí byť jedným z príjem Pay a interný prevod
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +118,"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/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Košík je prázdny
 DocType: Production Order,Actual Operating Cost,Skutečné provozní náklady
@@ -4160,10 +4221,10 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,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 +92,Designer,Návrhář
+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
 DocType: Serial No,Delivery Details,Zasílání
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +469,Cost Center is required in row {0} in Taxes table for type {1},Nákladové středisko je nutné v řadě {0} na daních tabulka typu {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +472,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
 ,Item-wise Purchase Register,Item-moudrý Nákup Register
 DocType: Batch,Expiry Date,Datum vypršení platnosti
@@ -4173,12 +4234,12 @@
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Master Project.
 apps/erpnext/erpnext/controllers/status_updater.py +174,"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 +417, (Half Day),(Pol dňa)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425, (Half Day),(Pól dňa)
 DocType: Supplier,Credit Days,Úvěrové dny
 DocType: Leave Type,Is Carry Forward,Je převádět
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +740,Get Items from BOM,Získat předměty z BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +711,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 +549,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/controllers/accounts_controller.py +552,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
diff --git a/erpnext/translations/sl.csv b/erpnext/translations/sl.csv
index 93836d2..64330ee 100644
--- a/erpnext/translations/sl.csv
+++ b/erpnext/translations/sl.csv
@@ -18,11 +18,10 @@
 DocType: Sales Partner,Dealer,Trgovec
 DocType: Employee,Rented,Najemu
 DocType: Purchase Order,PO-,po-
-apps/erpnext/erpnext/accounts/report/financial_statements.py +19,Start Year {0} not found.,Začetek leta {0} ni mogoče najti.
 DocType: POS Profile,Applicable for User,Velja za člane
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +191,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Ustavljen Proizvodnja naročite ni mogoče preklicati, ga najprej Odčepiti preklicati"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +197,Do you really want to scrap this asset?,"Ali res želite, da ostanki ta sredstva?"
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +17,Select Default Supplier,Izberite Privzeta Dobavitelj
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +192,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Ustavljen Proizvodnja naročite ni mogoče preklicati, ga najprej Odčepiti preklicati"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +198,Do you really want to scrap this asset?,"Ali res želite, da ostanki ta sredstva?"
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Izberite Privzeta Dobavitelj
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Valuta je potrebna za tečajnico {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Bo izračunana v transakciji.
 DocType: Address,County,County
@@ -42,46 +41,45 @@
 DocType: Sales Invoice,Customer Name,Ime stranke
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +126,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 +180,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 +183,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 +148,Series Updated Successfully,Serija Posodobljeno Uspešno
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +149,Series Updated Successfully,Serija Posodobljeno Uspešno
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Preveri
 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
-DocType: Quality Inspection Reading,Parameter,Parameter
 apps/erpnext/erpnext/projects/doctype/project/project.py +54,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 +239,New Leave Application,New Leave Application
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,New Leave Application,New Leave Application
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +20,Attendance Record {0} exists against Student {1} for Course Schedule {2},Šivih {0} obstaja proti Študent {1} za Nosilec liste {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Bank Draft,Bank Osnutek
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,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
 DocType: Academic Term,Academic Term,Academic Term
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +13,Material,Material
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Quantity,Količina
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +511,Accounts table cannot be blank.,Predstavlja tabela ne more biti prazno.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +616,Quantity,Količina
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +512,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)
 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/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 +142,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
-DocType: Purchase Invoice,Monthly,Mesečni
 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/buying/doctype/purchase_order/purchase_order.js +771,Invoice,Račun
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +750,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 +198,Row {0}: {1} {2} does not match with {3},Vrstica {0}: {1} {2} ne ujema s {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Vrstica # {0}:
+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 +127,Please select Price List,Izberite Cenik
@@ -112,8 +110,8 @@
 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 +589,Get items from,Pridobi Artikle iz
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +382,Stock cannot be updated against Delivery Note {0},Stock ni mogoče posodobiti proti dobavnica {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Pridobi Artikle iz
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,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
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Trgovina z živili
@@ -122,7 +120,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 +156,Salary Structure Missing,Plača Struktura Missing
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,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
@@ -130,10 +128,11 @@
 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,Zaloga Poročila
 DocType: Warehouse,Warehouse Detail,Skladišče Detail
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,Credit limit has been crossed for customer {0} {1}/{2},Kreditni limit je prečkal za stranko {0} {1} / {2}
-apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Ali je osnovno sredstvo&quot; ne more biti brez nadzora, saj obstaja evidenca sredstev proti postavki"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +189,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"
 DocType: Tax Rule,Tax Type,Davčna Type
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +144,You are not authorized to add or update entries before {0},Nimate dovoljenja za dodajanje ali posodobitev vnose pred {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,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/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
@@ -143,18 +142,17 @@
 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 +165,Opening,Otvoritev
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,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/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Stranka&gt; Skupina kupcev&gt; Territory
 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.
 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"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Company first,"Prosimo, izberite Company najprej"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,Please select Company first,"Prosimo, izberite Company najprej"
 DocType: Employee Education,Under Graduate,Pod Graduate
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Ciljna Na
 DocType: BOM,Total Cost,Skupni stroški
@@ -164,7 +162,7 @@
 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
 DocType: Purchase Invoice Item,Is Fixed Asset,Je osnovno sredstvo
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Available qty is {0}, you need {1}","Preberi je {0}, morate {1}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +225,"Available qty is {0}, you need {1}","Preberi je {0}, morate {1}"
 DocType: Expense Claim Detail,Claim Amount,Trditev Znesek
 DocType: Employee,Mr,gospod
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Dobavitelj Vrsta / dobavitelj
@@ -173,25 +171,26 @@
 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: Assessment Result,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 +171,Annual Salary,Letne plače
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Annual Salary,Letne plače
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Zaloga Stroški
-apps/erpnext/erpnext/accounts/report/financial_statements.py +22,End Year {0} not found.,Konec leta {0} ni mogoče najti.
 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}
 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 +130,At least one mode of payment is required for POS invoice.,za POS računa je potreben vsaj en način plačila.
 DocType: Products Settings,Show Products as a List,Prikaži izdelke na seznamu
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Prenesite predloge, izpolnite ustrezne podatke in priložite spremenjeno datoteko. Vsi datumi in zaposleni kombinacija v izbranem obdobju, bo prišel v predlogo, z obstoječimi zapisi postrežbo"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +451,Item {0} is not active or end of life has been reached,Postavka {0} ni aktiven ali je bil dosežen konec življenja
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +456,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/controllers/accounts_controller.py +614,"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/controllers/accounts_controller.py +617,"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 +166,Settings for HR Module,Nastavitve za HR modula
 DocType: SMS Center,SMS Center,SMS center
 DocType: Sales Invoice,Change Amount,sprememba Znesek
@@ -203,13 +202,13 @@
 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 +147,Execution,Izvedba
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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/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}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,Cost Center {0} does not belong to Company {1},Stalo Center {0} ne pripada družbi {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +100,Cost Center {0} does not belong to Company {1},Stalo Center {0} ne pripada družbi {1}
 DocType: Customer,Individual,Individualno
 DocType: Interest,Academics User,akademiki Uporabnik
 DocType: Cheque Print Template,Amount In Figure,Znesek v sliki
@@ -225,30 +224,32 @@
 DocType: Production Planning Tool,Sales Orders,Naročila Kupcev
 DocType: Purchase Taxes and Charges,Valuation,Vrednotenje
 ,Purchase Order Trends,Naročilnica Trendi
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,The request for quotation can be accessed by clicking on the following link,Zahteva za ponudbo lahko dostopate s klikom na spodnjo povezavo
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,Dodeli liste za leto.
 DocType: SG Creation Tool Course,SG Creation Tool Course,SG ustvarjanja orodje za golf
 DocType: Student Group Creation Tool,Leave blank if you wish to fetch all courses for selected academic term,"Pustite prazno, če želite pridobiti vse tečaje za družboslovni izraz"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,Insufficient Stock,nezadostna Stock
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227,Insufficient Stock,nezadostna Stock
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Onemogoči Capacity Planning and Time Tracking
+DocType: Email Digest,New Sales Orders,Nove Prodajni nalogi
 DocType: Bank Reconciliation,Bank Account,Bančni račun
 DocType: Leave Type,Allow Negative Balance,Dovoli negativni saldo
 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/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} does not belong to Company {1},Račun {0} ne pripada družbi {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +86,Account {0} does not belong to Company {1},Račun {0} ne pripada družbi {1}
 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}
 DocType: Naming Series,Series List for this Transaction,Serija Seznam 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"
 DocType: Course Schedule,Instructor Name,inštruktor Ime
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,For Warehouse is required before Submit,Za skladišče je pred potreben Submit
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,For Warehouse is required before Submit,Za skladišče je pred potreben Submit
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Prejetih Na
 DocType: Sales Partner,Reseller,Reseller
 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 +1436,"LocalStorage is full , did not save","Lokalno shrambo je polna, ni shranil"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1460,"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}
@@ -261,18 +262,19 @@
 apps/erpnext/erpnext/templates/generators/item.html +78,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 +5,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/leave_application/leave_application.py +206,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/leave_application/leave_application.py +213,Only the selected Leave Approver can submit this Leave Application,Le izbrani Leave odobritelj lahko predloži pustite to Application
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Lajšanje Datum mora biti večja od Datum pridružitve
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Leaves per Year,Listi na leto
+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 +103,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}
+DocType: Email Digest,Profit & Loss,Profit &amp; Loss
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,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 +435,Leave Blocked,Pustite blokiranih
-apps/erpnext/erpnext/stock/doctype/item/item.py +669,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 +443,Leave Blocked,Pustite blokiranih
+apps/erpnext/erpnext/stock/doctype/item/item.py +671,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 +83,Annual,Letno
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +86,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
@@ -280,20 +282,22 @@
 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"
 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 +91,Software Developer,Razvijalec programske opreme
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,Razvijalec programske opreme
 DocType: Item,Minimum Order Qty,Najmanjše naročilo Kol
 DocType: Pricing Rule,Supplier Type,Dobavitelj Type
 DocType: Scheduling Tool,Course Start Date,Datum začetka predmeta
 DocType: Item,Publish in Hub,Objavite v Hub
+DocType: Student Admission,Student Admission,študent Sprejem
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is cancelled,Postavka {0} je odpovedan
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Material Request,Material Zahteva
+apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} is cancelled,Postavka {0} je odpovedan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +823,Material Request,Material Zahteva
 DocType: Bank Reconciliation,Update Clearance Date,Posodobitev Potrditev Datum
 apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +28,Abbreviation already used for another salary component,Kratica že uporablja za druge sestavine plače
 DocType: Item,Purchase Details,Nakup Podrobnosti
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +328,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},"Postavka {0} ni bilo mogoče najti v &quot;surovin, dobavljenih&quot; mizo v narocilo {1}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +333,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},"Postavka {0} ni bilo mogoče najti v &quot;surovin, dobavljenih&quot; mizo v narocilo {1}"
 DocType: Employee,Relation,Razmerje
 DocType: Shipping Rule,Worldwide Shipping,Dostava po celem svetu
+DocType: Student Guardian,Mother,mati
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Potrjeni naročila od strank.
 DocType: Purchase Receipt Item,Rejected Quantity,Zavrnjeno Količina
 DocType: SMS Settings,SMS Sender Name,SMS Sender Name
@@ -309,20 +313,21 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +130,Please select Charge Type first,"Prosimo, izberite Charge Vrsta najprej"
 DocType: Student Group Student,Student Group Student,Študentska skupina Študent
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Zadnje
+DocType: Email Digest,New Quotations,nove Ponudbe
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,"Prvi Leave odobritelj na seznamu, bo nastavljen kot privzeti Leave odobritelja"
 DocType: Tax Rule,Shipping County,Dostava County
 apps/erpnext/erpnext/config/desktop.py +158,Learn,Naučite
 DocType: Asset,Next Depreciation Date,Naslednja Amortizacija Datum
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Stroški dejavnost na zaposlenega
 DocType: Accounts Settings,Settings for Accounts,Nastavitve za račune
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +626,Supplier Invoice No exists in Purchase Invoice {0},Dobavitelj računa ni v računu o nakupu obstaja {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +629,Supplier Invoice No exists in Purchase Invoice {0},Dobavitelj računa ni v računu o nakupu obstaja {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Upravljanje prodaje oseba drevo.
 DocType: Job Applicant,Cover Letter,Cover Letter
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Neporavnani čeki in depoziti želite počistiti
 DocType: Item,Synced With Hub,Sinhronizirano Z Hub
 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 +348,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 +86,Circular Reference Error,Krožna Reference Error
@@ -334,15 +339,16 @@
 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 +806,Delivery Note,Poročilo o dostavi
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +800,Delivery Note,Poročilo o dostavi
 apps/erpnext/erpnext/config/learn.py +87,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 +233,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/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/setup/doctype/email_digest/email_digest.py +104,Summary for this week and pending activities,Povzetek za ta teden in ki potekajo dejavnosti
+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"
 DocType: Employee,Company Email,Družba E-pošta
@@ -354,27 +360,28 @@
 apps/erpnext/erpnext/config/hr.py +186,"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"
-apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Nakup računa ni mogoče sklepati na podlagi obstoječega sredstva {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +554,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 +54,{0} already allocated for Employee {1} for period {2} to {3},{0} že dodeljenih za Employee {1} za obdobje {2} do {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +812,Select Item,Izberite Item
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +791,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 \
 					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 +142,Purchase Invoice {0} is already submitted,Nakup Račun {0} je že predložila
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Vrstica # {0}: mora Serija Ne biti enaka kot {1} {2}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +143,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.
 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 +342,Please see attachment,Glej prilogo
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,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 +19,Setup Already Complete!!,Setup Že Complete !!
 ,Finished Goods,"Končnih izdelkov,"
 DocType: Delivery Note,Instructions,Navodila
 DocType: Quality Inspection,Inspected By,Pregledajo
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Dobavitelj&gt; Vrsta dobavitelj
 DocType: Maintenance Visit,Maintenance Type,Vzdrževanje Type
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serijska št {0} ne pripada dobavnica {1}
 apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Dodaj artikel
@@ -383,34 +390,34 @@
 DocType: Depreciation Schedule,Schedule Date,Urnik Datum
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components","Plače, Odbitki in druge komponente plač"
 DocType: Packed Item,Packed Item,Pakirani Postavka
-apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,Privzete nastavitve za nakup poslov.
+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: Authorization Rule,Approving User  (above authorized value),Odobritvi uporabnik (zgoraj pooblaščeni vrednosti)
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Credit Balance
+DocType: Email Digest,Credit Balance,Credit Balance
 DocType: Employee,Widowed,Ovdovela
 DocType: Request for Quotation,Request for Quotation,Zahteva za ponudbo
 DocType: Salary Slip Timesheet,Working Hours,Delovni čas
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Spremenite izhodiščni / trenutno število zaporedno obstoječe serije.
 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 +736,Purchase Return,nakup Return
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +715,Purchase Return,nakup Return
 ,Purchase Register,Nakup Register
 DocType: 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 +202,{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 +209,{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 +143,Reason for losing,Razlog za izgubo
-apps/erpnext/erpnext/accounts/utils.py +239,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 +163,Reason for losing,Razlog za izgubo
+apps/erpnext/erpnext/accounts/utils.py +316,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 +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation je zaprt na naslednje datume kot na Holiday Seznam: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Priložnosti
 DocType: Employee,Single,Samski
 DocType: Account,Cost of Goods Sold,Nabavna vrednost prodanega blaga
 DocType: Purchase Invoice,Yearly,Letni
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +225,Please enter Cost Center,Vnesite stroškovni center
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,Please enter Cost Center,Vnesite stroškovni center
 DocType: Journal Entry Account,Sales Order,Naročilo Kupca
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,Avg. Prodajni tečaj
 DocType: Assessment,Examiner Name,Ime Examiner
@@ -423,26 +430,26 @@
 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
 DocType: Account,Is Group,Is Group
+DocType: Email Digest,Pending Purchase Orders,Dokler naročilnice
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Samodejno nastavi Serijska št temelji na FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Preverite Dobavitelj Številka računa Edinstvenost
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',&quot;Da Case No.&quot; ne more biti nižja od &quot;Od zadevi št &#39;
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,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.','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
 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: Stock Reconciliation Item,Do not include symbols (ex. $),Ne vsebuje simbole (npr. $)
 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 +638,Attribute {0} selected multiple times in Attributes Table,Lastnost {0} izbrana večkrat v atributih tabeli
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Lastnost {0} izbrana večkrat v atributih tabeli
 DocType: HR Settings,Employee record is created using selected field. ,Evidenco o zaposlenih delavcih je ustvarjena s pomočjo izbrano polje.
 DocType: Sales Order,Not Applicable,Se ne uporablja
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Holiday gospodar.
 DocType: Request for Quotation Item,Required Date,Zahtevani Datum
 DocType: Delivery Note,Billing Address,Naslov za pošiljanje računa
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +862,Please enter Item Code.,Vnesite Koda.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +847,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"
@@ -456,12 +463,12 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Vrednostne papirje in depozite
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Skupaj listi dodeljena je obvezna
 DocType: Job Opening,Description of a Job Opening,Opis službo Otvoritev
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Pending activities for today,V čakanju na aktivnosti za danes
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,V čakanju na aktivnosti za danes
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Šivih.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,"Plača Komponenta za Timesheet na izplačane plače, ki temelji."
 DocType: Sales Order Item,Used for Production Plan,Uporablja se za proizvodnjo načrta
 DocType: Manufacturing Settings,Time Between Operations (in mins),Čas med dejavnostmi (v minutah)
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +92,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} proračuna za račun {1} proti centru stroškov {2} je {3}. To bo presegel s {4}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +95,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} proračuna za račun {1} proti centru stroškov {2} je {3}. To bo presegel s {4}
 DocType: Customer,Buyer of Goods and Services.,Kupec blaga in storitev.
 DocType: Journal Entry,Accounts Payable,Računi se plačuje
 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
@@ -469,16 +476,16 @@
 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/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 +86,Administrative Officer,Upravni uradnik
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,Upravni uradnik
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +23,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 +319,Please select Company,"Prosimo, izberite Company"
-DocType: Stock Entry,Difference Account,Razlika račun
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +309,Please select Company,"Prosimo, izberite Company"
+DocType: Stock Entry Detail,Difference Account,Razlika račun
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,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 +398,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 +399,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 +530,"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 +532,"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 +28,Buy,Nakup
@@ -486,7 +493,7 @@
 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 +1563,Serial no item cannot be a fraction,Serijska št postavka ne more biti del
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1587,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
@@ -495,13 +502,14 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Account {0} does not belong to company: {1},Račun {0} ne pripada podjetju: {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation already used for another company,Kratica že uporabljajo za druge družbe
 DocType: Selling Settings,Default Customer Group,Privzeta skupina kupcev
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Supplier is required against Payable account {0},Dobavitelj je potrebno pred plačljivo račun {0}
 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
 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 +313,Reference No and Reference Date is mandatory for Bank transaction,Referenčna številka in referenčni datum je obvezna za banke transakcijo
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +316,Reference No and Reference Date is mandatory for Bank transaction,Referenčna številka in referenčni datum je obvezna za banke transakcijo
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Dodaj / Uredi davkov in dajatev
 DocType: Purchase Invoice,Supplier Invoice No,Dobavitelj Račun Ne
 DocType: Territory,For reference,Za sklic
@@ -512,7 +520,6 @@
 DocType: Installation Note Item,Installation Note Item,Namestitev Opomba Postavka
 DocType: Production Plan Item,Pending Qty,Pending Kol
 DocType: Budget,Ignore,Ignoriraj
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Oznaka&gt; Element Group&gt; Znamka
 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/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
@@ -523,11 +530,11 @@
 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/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 +28,Please select Company and Party Type first,Izberite podjetja in Zabava Vrsta najprej
+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/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 +707,Make Sales Order,Naredite Sales Order
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +701,Make Sales Order,Naredite Sales Order
 DocType: Project Task,Project Task,Project Task
 ,Lead Id,Svinec Id
 DocType: C-Form Invoice Detail,Grand Total,Skupna vsota
@@ -543,7 +550,8 @@
 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 +734,Sales Return,Prodaja Return
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +728,Sales Return,Prodaja Return
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +91,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.
@@ -552,14 +560,13 @@
 DocType: Quotation,Quotation To,Kotacija Da
 DocType: Lead,Middle Income,Bližnji Prihodki
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +212,Opening (Cr),Odprtino (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +795,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"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 +237,Allocated amount can not be negative,Dodeljen znesek ne more biti negativna
+apps/erpnext/erpnext/stock/doctype/item/item.py +797,Default Unit of Measure for Item {0} cannot be changed directly because 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
 DocType: Purchase Order Item,Billed Amt,Bremenjenega Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,"Logično Warehouse, zoper katerega so narejeni vnosov zalog."
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Prodaja Račun Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},Referenčna št &amp; Referenčni datum je potrebna za {0}
-DocType: Sales Invoice,Customer's Vendor,Prodajalec stranke
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Proposal Writing,Predlog Pisanje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,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"
@@ -568,18 +575,19 @@
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,sledenje čas
 DocType: Fiscal Year Company,Fiscal Year Company,Fiskalna Leto Company
 DocType: Packing Slip Item,DN Detail,DN Detail
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +257,Already supplier quotation has created,Že je dobavitelj citat ustvaril
 DocType: Timesheet,Billed,Zaračunavajo
 DocType: Batch,Batch Description,Serija Opis
+apps/erpnext/erpnext/accounts/utils.py +685,"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 +733,View Offline Records,Poglej Offline Records
+apps/erpnext/erpnext/accounts/page/pos/pos.js +715,View Offline Records,Poglej Offline Records
+DocType: Student,Sibling Details,sorodstvena Podrobnosti
 DocType: Employee,Reason for Resignation,Razlog za odstop
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,Predloga za izvajanje cenitve.
 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}
-DocType: Buying Settings,Settings for Buying Module,Nastavitve za nakup modula
+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"
 DocType: Buying Settings,Supplier Naming By,Dobavitelj Imenovanje Z
@@ -588,19 +596,20 @@
 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
 DocType: Employee,Passport Number,Številka potnega lista
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Manager,Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,Manager
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,Same item has been entered multiple times.,Enako postavka je bila vpisana večkrat.
 DocType: SMS Settings,Receiver Parameter,Sprejemnik Parameter
-apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"&quot;Na podlagi&quot; in &quot;skupina, ki jo&quot; ne more biti enaka"
+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
 DocType: Installation Note,IN-,TEKMOVANJU
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter email address,Vnesite e-poštni naslov
 DocType: Production Order Operation,In minutes,V minutah
 DocType: Issue,Resolution Date,Resolucija Datum
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +299,Timesheet created:,Timesheet ustvaril:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +715,Please set default Cash or Bank account in Mode of Payment {0},"Prosim, nastavite privzeto gotovinski ali bančni račun v načinu plačevanja {0}"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +300,Timesheet created:,Timesheet ustvaril:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +772,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
 DocType: Selling Settings,Customer Naming By,Stranka Imenovanje Z
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Prosimo nastavitev zaposlenih Poimenovanje sistema v kadrovsko&gt; HR Nastavitve
 DocType: Depreciation Schedule,Depreciation Amount,Amortizacija Znesek
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,Pretvarjanje skupini
 DocType: Activity Cost,Activity Type,Vrsta dejavnosti
@@ -625,6 +634,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,Finish
 DocType: Pricing Rule,Sales Manager,Vodja prodaje
 DocType: Salary Structure Employee,Base,Osnovna
+DocType: Timesheet,Total Billed Hours,Skupaj Obračunane ure
 DocType: Journal Entry,Write Off Amount,Napišite enkratnem znesku
 DocType: Journal Entry,Bill No,Bill Ne
 DocType: Company,Gain/Loss Account on Asset Disposal,Dobiček / izguba račun o odlaganju sredstev
@@ -639,11 +649,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +9,Pre Sales,pre Sales
 DocType: Purchase Receipt,Other Details,Drugi podatki
 DocType: Account,Accounts,Računi
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Marketing,Trženje
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +227,Payment Entry is already created,Začetek Plačilo je že ustvarjena
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,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 +538,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 +21,Preview Salary Slip,Predogled Plača listek
+apps/erpnext/erpnext/controllers/accounts_controller.py +541,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 +38,Preview Salary Slip,Predogled Plača listek
 DocType: Company,Deafult Cost Center,Deafult Center Stroški
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +48,Account {0} has been entered multiple times,Račun {0} je bila vpisana večkrat
 DocType: Account,Expenses Included In Valuation,Stroški Vključeno v vrednotenju
@@ -652,7 +662,7 @@
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,Izberite skupino študentsko
 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 +617,Item has variants.,Element ima variante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Element ima variante.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,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
@@ -672,7 +682,7 @@
 DocType: Purchase Order,Supply Raw Materials,Oskrba z Surovine
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Datum, na katerega se bo ustvarila naslednji račun. To je ustvarila na oddajte."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Kratkoročna sredstva
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,{0} is not a stock Item,{0} ni zaloge artikla
+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 +169,Lead must be set if Opportunity is made from Lead,"Svinec je treba določiti, če je priložnost narejen iz svinca"
@@ -739,26 +749,25 @@
 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 +709,No Permission,Ne Dovoljenje
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +710,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, artikli, niso dostavljena 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' ni mogoče preveriti, saj artikli niso dostavljeni prek {0}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +298,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 +542,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} je treba predložiti
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} je treba predložiti
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Najdenih ni delavec
 DocType: Supplier Quotation,Stopped,Ustavljen
 DocType: Item,If subcontracted to a vendor,Če podizvajanje prodajalca
 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.
 DocType: Warehouse,Tree Details,drevo Podrobnosti
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Pošlji Zdaj
 ,Support Analytics,Podpora Analytics
 DocType: Item,Website Warehouse,Spletna stran Skladišče
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimalna Znesek računa
 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/sales_invoice/sales_invoice.py +227,Timesheet {0} is already completed or cancelled,"Timesheet {0}, je že končana ali preklicana"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +259,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
@@ -774,13 +783,13 @@
 apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Razpored za golf
 DocType: Maintenance Visit,Completion Status,Zaključek Status
 DocType: HR Settings,Enter retirement age in years,Vnesite upokojitveno starost v letih
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +229,Target Warehouse,Ciljna Skladišče
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +230,Target Warehouse,Ciljna Skladišče
 DocType: Cheque Print Template,Starting location from left edge,Izhajajoč lokacijo od levega roba
 DocType: Item,Allow over delivery or receipt upto this percent,Dovoli nad dostavo ali prejem upto tem odstotkov
 DocType: Stock Entry,STE-,STE-
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Sales Order Date,Pričakuje Dostava datum ne more biti pred Sales Order Datum
 DocType: Upload Attendance,Import Attendance,Uvoz Udeležba
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Vse Postavka Skupine
+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/config/setup.py +89,Automatically compose message on submission of transactions.,Samodejno sestavite sporočilo o predložitvi transakcij.
@@ -792,13 +801,15 @@
 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/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
 DocType: Expense Claim,Expenses,Stroški
 DocType: Item Variant Attribute,Item Variant Attribute,Postavka Variant Lastnost
 ,Purchase Receipt Trends,Nakup Prejem Trendi
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Research & Development,Raziskave in razvoj
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Raziskave in razvoj
 ,Amount to Bill,Znesek za Bill
 DocType: Company,Registration Details,Registracija Podrobnosti
+DocType: Timesheet,Total Billed Amount,Skupaj zaračunano Znesek
 DocType: Item Reorder,Re-Order Qty,Ponovno naročila Kol
 DocType: Leave Block List Date,Leave Block List Date,Pustite Block List Datum
 DocType: Pricing Rule,Price or Discount,Cena ali Popust
@@ -807,7 +818,7 @@
 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/controllers/accounts_controller.py +340,"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."
+apps/erpnext/erpnext/controllers/accounts_controller.py +343,"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
@@ -829,12 +840,12 @@
 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 +756,Purchase Receipt,Potrdilo o nakupu
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +735,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 +167,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 +282,Unable to find Time Slot in the next {0} days for Operation {1},Ni mogoče najti terminu v naslednjih {0} dni za delovanje {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +170,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 +283,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 +439,BOM {0} must be active,BOM {0} mora biti aktiven
@@ -845,7 +856,7 @@
 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 +214,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 +217,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
@@ -859,9 +870,9 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Employee {0} ni aktiven ali pa ne obstaja
 DocType: Fee Structure,Components,komponente
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,Please enter Asset Category in Item {0},Vnesite Asset Kategorija točke {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +612,Item Variants {0} updated,Postavka Variante {0} posodobljen
+apps/erpnext/erpnext/stock/doctype/item/item.py +614,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 +843,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 +854,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
@@ -876,69 +887,72 @@
 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 +728,New Sales Invoice,New Sales Račun
+apps/erpnext/erpnext/accounts/page/pos/pos.js +710,New Sales Invoice,New Sales 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 +728,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
 DocType: Material Request Item,Lead Time Date,Lead Time Datum
 DocType: Guardian,Guardian Name,Ime Guardian
 DocType: Cheque Print Template,Has Print Format,Ima Print Format
-apps/erpnext/erpnext/accounts/page/pos/pos.js +86, 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 +109,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 +619,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","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/page/pos/pos.js +75, 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 +613,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing 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 +606,Supplier Invoice Date cannot be greater than Posting Date,Datum dobavitelj na računu ne sme biti večja od Napotitev Datum
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +609,Supplier Invoice Date cannot be greater than Posting Date,Datum dobavitelj na računu ne sme biti večja od Napotitev Datum
 DocType: Purchase Invoice Item,Purchase Order Item,Naročilnica item
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +130,Indirect Income,Posredna Prihodki
 DocType: Cheque Print Template,Date Settings,Datum Nastavitve
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Variance
 ,Company Name,ime podjetja
 DocType: SMS Center,Total Message(s),Skupaj sporočil (-i)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +810,Select Item for Transfer,Izberite Postavka za prenos
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +789,Select Item for Transfer,Izberite Postavka za prenos
 DocType: Purchase Invoice,Additional Discount Percentage,Dodatni popust Odstotek
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Oglejte si seznam vseh videoposnetkov pomočjo
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Izberite račun vodja banke, kjer je bila deponirana pregled."
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,"Dovoli uporabniku, da uredite Cenik Ocenite v transakcijah"
 DocType: Pricing Rule,Max Qty,Max Kol
-DocType: Student Applicant,Father's Name,Očetovo ime
 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 +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Vrstica {0}: morala Plačilo proti prodaja / narocilo vedno označen kot vnaprej
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Chemical
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +686,All items have already been transferred for this Production Order.,Vsi artikli so se že prenesli na to Proizvodno naročilo.
+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"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +694,All items have already been transferred for this Production Order.,Vsi artikli so se že prenesli na to Proizvodno naročilo.
 DocType: Process Payroll,Select Payroll Year and Month,Izberite Payroll leto in mesec
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,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
-DocType: Opportunity,Walk In,Vstopiti
 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 +12,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).
 DocType: Timesheet Detail,Bill,Bill
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,White,Bela
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,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
 DocType: SMS Center,All Lead (Open),Vse Lead (Open)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +228,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})
+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 +731,Make ,Poskrbite
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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."
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Košarica
-apps/erpnext/erpnext/controllers/selling_controller.py +154,Order Type must be one of {0},Sklep Tip mora biti eden od {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Sklep Tip mora biti eden od {0}
 DocType: Lead,Next Contact Date,Naslednja Stik Datum
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Odpiranje Količina
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +393,Please enter Account for Change Amount,Vnesite račun za spremembe Znesek
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,Please enter Account for Change Amount,Vnesite račun za spremembe Znesek
 DocType: Student Batch,Student Batch Name,Student Serija Ime
 DocType: Holiday List,Holiday List Name,Ime Holiday Seznam
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js +8,Schedule Course,urnik predmeta
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Stock Options,Delniških opcij
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Delniških opcij
 DocType: Journal Entry Account,Expense Claim,Expense zahtevek
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +211,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 +237,Qty for {0},Količina za {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +212,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 +238,Qty for {0},Količina za {0}
 DocType: Leave Application,Leave Application,Zapusti Application
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Pustite Orodje razdelitve emisijskih
 DocType: Leave Block List,Leave Block List Dates,Pustite Block List termini
@@ -947,9 +961,9 @@
 DocType: Company,Default Terms,Privzete Pogoji
 DocType: Packing Slip Item,Packing Slip Item,Pakiranje Slip Postavka
 DocType: Purchase Invoice,Cash/Bank Account,Gotovina / bančni račun
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Odstranjeni deli brez spremembe količine ali vrednosti.
+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 +635,Attribute table is mandatory,Lastnost miza je obvezna
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Lastnost miza je obvezna
 DocType: Production Planning Tool,Get Sales Orders,Pridobite prodajnih nalogov
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{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
@@ -974,7 +988,7 @@
 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/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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Serijska št {0} je pod vzdrževalne pogodbe stanuje {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +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
@@ -982,11 +996,11 @@
 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
 DocType: Employee,A-,A-
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Prodajna Stroški
-apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Standardna Nakup
+apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Standardna nabavna
 DocType: GL Entry,Against,Proti
-DocType: Item,Default Selling Cost Center,Privzeto Center Prodajni Stroški
+DocType: Item,Default Selling Cost Center,Privzet stroškovni center prodaje
 DocType: Sales Partner,Implementation Partner,Izvajanje Partner
-apps/erpnext/erpnext/controllers/selling_controller.py +231,Sales Order {0} is {1},Naročilo Kupca {0} je {1}
+apps/erpnext/erpnext/controllers/selling_controller.py +232,Sales Order {0} is {1},Naročilo Kupca {0} je {1}
 DocType: Opportunity,Contact Info,Contact Info
 apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,Izdelava Zaloga Entries
 DocType: Packing Slip,Net Weight UOM,Neto teža UOM
@@ -996,25 +1010,24 @@
 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
 DocType: Sales Person,Select company name first.,Izberite ime podjetja prvič.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,"Citati, prejetih od dobaviteljev."
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},Za {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Povprečna starost
 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/templates/pages/home.html +32,View All Products,Oglejte si vse izdelke
+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
 DocType: Expense Claim,From Employee,Od zaposlenega
-apps/erpnext/erpnext/controllers/accounts_controller.py +400,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č
+apps/erpnext/erpnext/controllers/accounts_controller.py +403,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/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,in leto:
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +191,{0} {1} must be submitted,{0} {1} je treba predložiti
-DocType: Email Digest,Annual Expense,Letno Expense
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,{0} {1} must be submitted,{0} {1} je treba predložiti
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +145,Quantity must be less than or equal to {0},Količina mora biti manjša ali enaka {0}
 DocType: SMS Center,Total Characters,Skupaj Znaki
 apps/erpnext/erpnext/controllers/buying_controller.py +156,Please select BOM in BOM field for Item {0},"Prosimo, izberite BOM BOM v polju za postavko {0}"
@@ -1025,30 +1038,31 @@
 DocType: Sales Partner,Distributor,Distributer
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Košarica Dostava Pravilo
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +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 +62,Please set 'Apply Additional Discount On',Prosim nastavite &quot;Uporabi dodatni popust na &#39;
+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
 DocType: Global Defaults,Global Defaults,Globalni Privzeto
 apps/erpnext/erpnext/projects/doctype/project/project.py +153,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
 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 +327,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 +362,Finished Item {0} must be entered for Manufacture type entry,Končano Postavka {0} je treba vpisati za vpis tipa Proizvodnja
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +367,Finished Item {0} must be entered for Manufacture type entry,Končano Postavka {0} je treba vpisati za vpis tipa Proizvodnja
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Odpiranje Računovodstvo Bilanca
-DocType: Sales Invoice Advance,Sales Invoice Advance,Avansni račun
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +499,Nothing to request,Nič zahtevati
+DocType: Sales Invoice Advance,Sales Invoice Advance,Predplačila
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +500,Nothing to request,Nič zahtevati
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',"""Dejanski datum začetka"" ne more biti novejši od ""dejanskega končnega datuma"""
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Management,Vodstvo
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},Bodisi debetna ali kreditna znesek je potreben za {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,Vodstvo
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +55,Either debit or credit amount is required for {0},Bodisi debetna ali kreditna znesek je potreben za {0}
 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 +161,Blue,Modra
+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"
@@ -1058,12 +1072,12 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +23,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
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1374,Do you really want to submit the invoice?,"Ali res želite, da predloži račun?"
+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 +685,Cost Center For Item with Item Code ',Stalo Center za postavko s točko zakonika &quot;
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1526,"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 +679,Cost Center For Item with Item Code ',Stalo Center za postavko s točko zakonika &quot;
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1550,"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 +26,"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,Svinec
@@ -1083,104 +1097,106 @@
 DocType: Payment Reconciliation,Unreconciled Payment Details,Unreconciled Plačilni Podrobnosti
 DocType: Global Defaults,Current Fiscal Year,Tekočem proračunskem letu
 DocType: Global Defaults,Disable Rounded Total,Onemogoči Zaobljeni Skupaj
-DocType: Lead,Call,Call
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +417,'Entries' cannot be empty,"""Vnos"" ne more biti prazen"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +418,'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 +214,Fiscal Year {0} not found,Poslovno leto {0} ni bilo mogoče najti
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +221,Fiscal Year {0} not found,Poslovno leto {0} ni bilo mogoče najti
 apps/erpnext/erpnext/config/hr.py +238,Setting up Employees,Postavitev Zaposleni
 DocType: Sales Order,SO-,SO-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,"Prosimo, izberite predpono najprej"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Please select prefix first,"Prosimo, izberite predpono najprej"
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Research,Raziskave
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,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 +43,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 +57,View Ledger,Ogled Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Najzgodnejša
-apps/erpnext/erpnext/stock/doctype/item/item.py +504,"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 +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/setup/setup_wizard/setup_wizard.py +437,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
 ,Budget Variance Report,Proračun Varianca Poročilo
 DocType: Salary Slip,Gross Pay,Bruto Pay
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +90,Row {0}: Activity Type is mandatory.,Vrstica {0}: Vrsta dejavnosti je obvezna.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +114,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/public/js/controllers/stock_controller.js +40,Accounting Ledger,Računovodstvo Ledger
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,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
 DocType: BOM Item,Item Description,Postavka Opis
+DocType: Student Sibling,Student Sibling,študent Sorodstvena
 DocType: Purchase Invoice,Is Recurring,Je Ponavljajoči
 DocType: Purchase Invoice,Supplied Items,Priložena Items
 DocType: Student,STUD.,STUD.
 DocType: Production Order,Qty To Manufacture,Količina za izdelavo
+DocType: Email Digest,New Income,New Prihodki
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Ohraniti enako stopnjo celotni nabavni cikel
 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 +131,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 +175,Valuation Rate required for Item in row {0},Oceni Vrednotenje potreben za postavko v vrstici {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,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
 DocType: Purchase Invoice,Rejected Warehouse,Zavrnjeno Skladišče
 DocType: GL Entry,Against Voucher,Proti Voucher
-DocType: Item,Default Buying Cost Center,Privzeto Center nakupovanje Stroški
+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 +87, to ,do
+apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,do
 DocType: Item,Lead Time in days,Svinec čas v dnevih
 ,Accounts Payable Summary,Računi plačljivo Povzetek
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Not authorized to edit frozen Account {0},Ne smejo urejati zamrznjeni račun {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,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 +62,Sales Order {0} is not valid,Naročilo Kupca {0} ni veljavno
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Naročilo Kupca {0} ni veljavno
 apps/erpnext/erpnext/setup/doctype/company/company.py +185,"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 +152,Small,Majhno
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,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}
 ,Invoiced Amount (Exculsive Tax),Obračunani znesek (Exculsive Tax)
-DocType: Student Applicant,Mother's / Guardian 1 Email ID,Materinski / Guardian 1 E-pošta ID
 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 +160,Green,Green
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,Green
 DocType: Supplier,SUPP-,SUPP-
 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 +57,Contract,Naročilo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,Naročilo
 DocType: Email Digest,Add Quote,Dodaj Citiraj
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +498,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 +503,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 +80,Row {0}: Qty is mandatory,Vrstica {0}: Kol je obvezna
+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 +737,Sync Master Data,Sync Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +719,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/public/js/setup_wizard.js +283,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
+DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,"To je skupina, root element in ga ni mogoče urejati."
+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."
 DocType: Journal Entry Account,Purchase Order,Naročilnica
 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 +345,"{0}: Employee email not found, hence email not sent","{0}: email zaposlenih ni mogoče najti, zato je e-poštno sporočilo ni bilo poslano"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +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
 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 +118,"For {0}, only credit accounts can be linked against another debit entry","Za {0}, lahko le kreditne račune povezati proti drugemu vstop trajnika"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Delivery Note {0} is not submitted,Dobavnica {0} ni predložila
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Delivery Note {0} is not submitted,Dobavnica {0} ni predložila
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Sub-contracted Item,Postavka {0} mora biti podizvajalcev item
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Kapitalski Oprema
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Cen Pravilo je najprej treba izbrati glede na &quot;Uporabi On &#39;polju, ki je lahko točka, točka Group ali Brand."
 DocType: Hub Settings,Seller Website,Prodajalec Spletna stran
 DocType: Item,ITEM-,ITEM-
-apps/erpnext/erpnext/controllers/selling_controller.py +147,Total allocated percentage for sales team should be 100,Skupna dodeljena odstotek za prodajne ekipe mora biti 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +110,Production Order status is {0},Status proizvodnja Sklep je {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Skupna dodeljena odstotek za prodajne ekipe mora biti 100
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Status proizvodnja Sklep je {0}
 DocType: Appraisal Goal,Goal,Cilj
 DocType: Sales Invoice Item,Edit Description,Uredi Opis
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +757,For Supplier,Za dobavitelja
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +723,For Supplier,Za dobavitelja
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Nastavitev Vrsta računa pomaga pri izbiri ta račun v transakcijah.
 DocType: Purchase Invoice,Grand Total (Company Currency),Grand Total (družba Valuta)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Ustvari Print Format
@@ -1196,10 +1212,11 @@
 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
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +445,BOM {0} does not belong to Item {1},BOM {0} ne pripada postavki {1}
 DocType: Sales Partner,Target Distribution,Target Distribution
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1667,Deafault warehouse is required for selected item,Deafault skladišče je potrebno za izbrani element
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Deafault warehouse is required for selected item,Deafault skladišče je potrebno za izbrani element
 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
@@ -1208,23 +1225,23 @@
 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 +110,Hardware,Strojna oprema
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,Strojna oprema
 DocType: Sales Order,Recurring Upto,Ponavljajoči Upto
 DocType: Attendance,HR Manager,HR Manager
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Prosimo izberite Company
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Privilege Leave,Privilege Zapusti
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,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 +79,You need to enable Shopping Cart,Morate omogočiti Košarica
 DocType: Payment Entry,Writeoff,Odpisati
 DocType: Appraisal Template Goal,Appraisal Template Goal,Cenitev Predloga cilj
-DocType: Salary Slip,Earning,Služenje
+DocType: Salary Component,Earning,Služenje
 DocType: Purchase Invoice,Party Account Currency,Party Valuta računa
 ,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 +171,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 +174,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_data.py +358,Food,Hrana
+apps/erpnext/erpnext/demo/setup/setup_data.py +301,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/course_schedule/course_schedule.js +103,Mark Attendence,Mark Attendence
@@ -1252,27 +1269,27 @@
 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;
 DocType: Purchase Invoice,Contact Person,Kontaktna oseba
-apps/erpnext/erpnext/projects/doctype/task/task.py +35,'Expected Start Date' can not be greater than 'Expected End Date',&quot;Pričakovani datum začetka&quot; ne more biti večja od &quot;Pričakovan End Date&quot;
+apps/erpnext/erpnext/projects/doctype/task/task.py +35,'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: Scheduling Tool,Course End Date,Seveda Končni datum
 DocType: Holiday List,Holidays,Počitnice
 DocType: Sales Order Item,Planned Quantity,Načrtovana Količina
 DocType: Purchase Invoice Item,Item Tax Amount,Postavka Znesek davka
 DocType: Item,Maintain Stock,Ohraniti park
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +209,Stock Entries already created for Production Order ,Zaloga Vpisi že ustvarjene za proizvodnjo red
+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
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,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 +620,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 +238,Max: {0},Max: {0}
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +15,From Datetime,Od datetime
+apps/erpnext/erpnext/controllers/accounts_controller.py +623,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 +239,Max: {0},Max: {0}
+apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Od datetime
 DocType: Email Digest,For Company,Za podjetje
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Sporočilo dnevnik.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +153,"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,Odkup Znesek
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,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,Kontnem
 DocType: Material Request,Terms and Conditions Content,Pogoji in vsebina
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +552,cannot be greater than 100,ne more biti večja kot 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +680,Item {0} is not a stock Item,Postavka {0} ni zaloge Item
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +546,cannot be greater than 100,ne more biti večja kot 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,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
@@ -1286,10 +1303,9 @@
 DocType: GL Entry,GL Entry,GL Začetek
 DocType: HR Settings,Employee Settings,Nastavitve zaposlenih
 ,Batch-Wise Balance History,Serija-Wise Balance Zgodovina
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Seznam opravil
 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 +61,Apprentice,Vajenec
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +102,Negative Quantity is not allowed,Negativno Količina ni dovoljeno
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,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 +152,Employee cannot report to himself.,Delavec ne more poročati zase.
@@ -1310,15 +1326,14 @@
 DocType: Asset,Asset Name,Ime sredstvo
 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 +141,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 +719,Packing Slip,Pakiranje listek
+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 +713,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/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,Zahteva za ponudbo lahko dostopa s klikom na spodnjo povezavo
 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 +81,Analyst,Analitik
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,Analitik
 DocType: Item,Inventory,Popis
 DocType: Item,Sales Details,Prodajna Podrobnosti
 DocType: Quality Inspection,QI-,QI-
@@ -1326,7 +1341,7 @@
 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 +103,Government,Vlada
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,Vlada
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,Ime Institute
 apps/erpnext/erpnext/config/stock.py +289,Item Variants,Artikel Variante
 DocType: Company,Services,Storitve
@@ -1342,6 +1357,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,Financial Year Start Date,Proračunsko leto Start Date
 DocType: POS Profile,Apply Discount,Uporabi popust
 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
 DocType: Program Course,Program Course,Tečaj programa
@@ -1382,12 +1398,12 @@
 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"
 DocType: Production Plan Sales Order,Production Plan Sales Order,Proizvodni načrt Sales Order
 DocType: Sales Partner,Sales Partner Target,Prodaja Partner Target
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +110,Accounting Entry for {0} can only be made in currency: {1},Računovodstvo Vstop za {0} se lahko izvede samo v valuti: {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Računovodstvo Vstop za {0} se lahko izvede samo v valuti: {1}
 DocType: Pricing Rule,Pricing Rule,Cen Pravilo
 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
 DocType: Shopping Cart Settings,Payment Success URL,Plačilo Uspeh URL
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +78,Row # {0}: Returned Item {1} does not exists in {2} {3},Vrstica # {0}: Vrnjeno Postavka {1} ne obstaja v {2} {3}
+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
@@ -1396,40 +1412,39 @@
 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/stock/doctype/stock_entry/stock_entry.py +339,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Ne sme odtujiti bolj {0} od {1} proti narocilo {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +344,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 +545,Manufacturing Quantity is mandatory,Proizvodnja Količina je obvezna
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,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 +71,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,Privzeto Holiday seznam
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +162,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/projects/doctype/timesheet/timesheet.py +186,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
 DocType: Purchase Invoice,Supplier Warehouse,Dobavitelj Skladišče
 DocType: Opportunity,Contact Mobile No,Kontakt Mobile No
 ,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 +130,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 +137,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
 DocType: Dependent Task,Dependent Task,Odvisna Task
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Prosimo nastavitev zaposlenih Poimenovanje sistema v kadrovsko&gt; HR Nastavitve
 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 +190,Leave of type {0} cannot be longer than {1},Dopust tipa {0} ne more biti daljši od {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +197,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 +921,Search Item,Iskanje Item
+apps/erpnext/erpnext/accounts/page/pos/pos.js +910,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 +546,Already completed,že končana
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +22,Payment Request already exists {0},Plačilo Zahteva že obstaja {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +550,Already completed,že končana
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,Payment Request already exists {0},Plačilo Zahteva ž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 +241,Quantity must not be more than {0},Količina ne sme biti več kot {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,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 +76,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
@@ -1446,7 +1461,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +221,Purchase Receipt {0} is not submitted,Potrdilo o nakupu {0} ni predložila
 DocType: Company,Default Payable Account,Privzeto plačljivo račun
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Nastavitve za spletni košarici, kot so predpisi v pomorskem prometu, cenik itd"
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +83,{0}% Billed,{0}% zaračunano
+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
@@ -1458,12 +1473,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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/schools/doctype/fees/fees.js +22,Collect,Zberite
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Zberite
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,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 +225,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"
-DocType: Payment Reconciliation,Payments,Plačila
 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
@@ -1472,10 +1486,10 @@
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +20,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/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} mora biti večja od 0
+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 +9,Procurement,Javna naročila
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,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/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
 ,Lead Details,Svinec Podrobnosti
 DocType: Purchase Invoice,End date of current invoice's period,Končni datum obdobja tekočega faktura je
@@ -1500,7 +1514,7 @@
 DocType: Purchase Invoice,Additional Discount,Dodatni popust
 DocType: Selling Settings,Selling Settings,Prodaja Nastavitve
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Online Dražbe
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +97,Please specify either Quantity or Valuation Rate or both,"Prosimo, navedite bodisi količina ali Ocenite vrednotenja ali oboje"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,"Prosimo, navedite bodisi količina ali Ocenite vrednotenja ali oboje"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +13,Fulfillment,izpolnitev
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Podjetje, Mesec in poslovno leto je obvezna"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Marketing Stroški
@@ -1521,14 +1535,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,ERPNext Setup Complete!
 DocType: Item,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +93,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"A Skupina kupcev obstaja z istim imenom, prosimo spremenite ime stranke ali preimenovati skupino odjemalcev"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +126,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,New Kontakt
 DocType: Territory,Parent Territory,Parent Territory
 DocType: Quality Inspection Reading,Reading 2,Branje 2
 DocType: Stock Entry,Material Receipt,Material Prejem
 DocType: Homepage,Products,Izdelki
 DocType: Announcement,Instructor,inštruktor
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},"Vrsta stranka in stranka, ki je potrebna za terjatve / obveznosti račun {0}"
 DocType: 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
@@ -1539,7 +1552,7 @@
 ,Item-wise Sales Register,Element-pametno Sales Registriraj se
 DocType: Asset,Gross Purchase Amount,Bruto znesek nakupa
 DocType: Asset,Depreciation Method,Metoda amortiziranja
-apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Offline,Offline
+apps/erpnext/erpnext/accounts/page/pos/pos.js +686,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
@@ -1557,25 +1570,27 @@
 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
 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 +858,Make Purchase Order,Naredite narocilo
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +852,Make Purchase Order,Naredite narocilo
 DocType: SMS Center,Send To,Pošlji
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,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 +148,There is not enough leave balance for Leave Type {0},Ni dovolj bilanca dopust za dopust tipa {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Dodeljen znesek
 DocType: Sales Team,Contribution to Net Total,Prispevek k Net Total
 DocType: Sales Invoice Item,Customer's Item Code,Koda artikla stranke
 DocType: Stock Reconciliation,Stock Reconciliation,Uskladitev zalog
 DocType: Territory,Territory Name,Territory Name
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +172,Work-in-Progress Warehouse is required before Submit,Work-in-Progress Warehouse je pred potreben Submit
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,Work-in-Progress Warehouse is required before Submit,Work-in-Progress Warehouse je pred potreben Submit
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Kandidat za službo.
 DocType: Purchase Order Item,Warehouse and Reference,Skladišče in Reference
 DocType: Supplier,Statutory info and other general information about your Supplier,Statutarna info in druge splošne informacije o vašem dobavitelju
-apps/erpnext/erpnext/hooks.py +88,Addresses,Naslovi
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Dobavitelj&gt; Vrsta dobavitelj
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +212,Against Journal Entry {0} does not have any unmatched {1} entry,Proti listu Začetek {0} nima neprimerljivo {1} vnos
+apps/erpnext/erpnext/hooks.py +95,Addresses,Naslovi
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +215,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"
 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
@@ -1583,11 +1598,10 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,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 +731,Payment,Plačilo
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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: Pricing Rule,Brand,Brand
 DocType: Course,Course Abbreviation,Kratica za golf
 DocType: Item,Will also apply for variants,Bo veljalo tudi za variante
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +142,"Asset cannot be cancelled, as it is already {0}","Sredstvo ni mogoče preklicati, saj je že {0}"
@@ -1599,7 +1613,7 @@
 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."
 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 +85,Associate,Sodelavec
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,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
@@ -1607,7 +1621,7 @@
 DocType: Production Planning Tool,Material Requests,Material Zahteve
 DocType: Warranty Claim,Issue Date,Datum izdaje
 DocType: Activity Cost,Activity Cost,Stroški dejavnost
-DocType: Timesheet Detail,Timesheet Detail,timesheet Podrobnosti
+DocType: Sales Invoice Timesheet,Timesheet Detail,timesheet Podrobnosti
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Porabljeno Kol
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekomunikacije
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Kaže, da je paket del tega dostave (samo osnutka)"
@@ -1630,6 +1644,7 @@
 DocType: Production Plan Material Request,Material Request Date,Material Zahteva Datum
 DocType: Purchase Order Item,Supplier Quotation Item,Dobavitelj Kotacija Postavka
 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
 DocType: Monthly Distribution,Name of the Monthly Distribution,Ime mesečnim izplačilom
 DocType: Sales Person,Parent Sales Person,Nadrejena Sales oseba
@@ -1642,30 +1657,31 @@
 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 +44,"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/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."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +502,Error: {0} &gt; {1},Napaka: {0}&gt; {1}
 DocType: Item,Is Sales Item,Je Sales Postavka
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Element Group Tree
 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."
 DocType: Naming Series,Current Value,Trenutna vrednost
-apps/erpnext/erpnext/controllers/accounts_controller.py +235,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/controllers/accounts_controller.py +238,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
 DocType: Delivery Note Item,Against Sales Order,Za Naročilo Kupca
 ,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 +458,Item table can not be blank,Postavka miza ne more biti prazno
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +443,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 +5,This is based on stock movement. See {0} for details,Ta temelji na gibanju zalog. Glej {0} za podrobnosti
-DocType: Pricing Rule,Selling,Prodajanje
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +341,Amount {0} {1} deducted against {2},Znesek {0} {1} odšteti pred {2}
+DocType: Pricing Rule,Selling,Prodaja
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +344,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
@@ -1680,8 +1696,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +144,Cannot refer row number greater than or equal to current row number for this Charge type,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 +159,Red,Red
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Prosimo, kliknite na &quot;ustvarjajo Seznamu&quot; puščati Serijska št dodal za postavko {0}"
+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
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Osnovna Znesek (družba Valuta)
@@ -1689,7 +1705,7 @@
 DocType: Installation Note,Installation Time,Namestitev čas
 DocType: Sales Invoice,Accounting Details,Računovodstvo Podrobnosti
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,Izbriši vse transakcije za to družbo
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +187,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,"Vrstica # {0}: Operacija {1} ni končana, za {2} Kol končnih izdelkov v proizvodnji naročite # {3}. Prosimo, posodobite statusa delovanja preko Čas Dnevniki"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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,"Vrstica # {0}: Operacija {1} ni končana, za {2} Kol končnih izdelkov v proizvodnji naročite # {3}. Prosimo, posodobite statusa delovanja preko Čas Dnevniki"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,Naložbe
 DocType: Issue,Resolution Details,Resolucija Podrobnosti
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,dodelitve
@@ -1725,16 +1741,17 @@
 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}
 DocType: Delivery Note,Excise Page Number,Trošarinska Številka strani
 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 +336,Amount {0} {1} against {2} {3},Znesek {0} {1} proti {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +339,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 +138,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 +295,Debit To account must be a Receivable account,Bremenitev računa mora biti Terjatve račun
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,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
 DocType: Purchase Invoice Item,Conversion Factor,Faktor pretvorbe
@@ -1742,10 +1759,10 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +137,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 +90,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
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +93,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 +22,Enter Paid Amount,Vnesite plačanega zneska
+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
@@ -1755,13 +1772,15 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,Timesheets
 DocType: HR Settings,HR Settings,Nastavitve HR
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Expense Claim is pending approval. Only the Expense Approver can update status.,Expense Terjatev čaka na odobritev. Samo Expense odobritelj lahko posodobite stanje.
+DocType: Email Digest,New Expenses,nove Stroški
 DocType: Purchase Invoice,Additional Discount Amount,Dodatni popust Količina
-apps/erpnext/erpnext/controllers/accounts_controller.py +524,"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."
+apps/erpnext/erpnext/controllers/accounts_controller.py +527,"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 +249,Abbr can not be blank or space,Abbr ne more biti prazen ali prostor
 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/stock/get_item_details.py +123,Please specify Company,"Prosimo, navedite Company"
 ,Customer Acquisition and Loyalty,Stranka Pridobivanje in zvestobe
@@ -1772,17 +1791,19 @@
 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 +183,Closing (Opening + Totals),Zapiranje (Odpiranje + vsote)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),Zapiranje (Odpiranje + vsote)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,"Prosimo, navedite valuto v družbi"
 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/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
-apps/erpnext/erpnext/controllers/accounts_controller.py +272,Account {0} is invalid. Account Currency must be {1},Račun {0} ni veljavna. Valuta računa mora biti {1}
+DocType: Email Digest,Pending Sales Orders,Dokler prodajnih naročil
+apps/erpnext/erpnext/controllers/accounts_controller.py +275,Account {0} is invalid. Account Currency must be {1},Račun {0} ni veljavna. 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 +956,"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 Slip,Deduction,Odbitek
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +87,Row {0}: From Time and To Time is mandatory.,Vrstica {0}: Od časa in do časa je obvezna.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +969,"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 +111,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 +262,Item Price added for {0} in Price List {1},Postavka Cena dodana za {0} v Ceniku {1}
 DocType: Address Template,Address Template,Naslov Predloga
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +7,Please enter Employee Id of this sales person,Vnesite ID Employee te prodaje oseba
@@ -1790,7 +1811,7 @@
 DocType: Project,% Tasks Completed,% dokončane naloge
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,Razlika Znesek mora biti nič
 DocType: Project,Gross Margin,Gross Margin
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +194,Please enter Production Item first,"Prosimo, da najprej vnesete Production artikel"
+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
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Kotacija
@@ -1799,53 +1820,54 @@
 DocType: Maintenance Visit,Maintenance User,Vzdrževanje Uporabnik
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +149,Cost Updated,Stroškovno Posodobljeno
 DocType: Employee,Date of Birth,Datum rojstva
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +86,Item {0} has already been returned,Postavka {0} je bil že vrnjen
+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 / Lead Naslov
 apps/erpnext/erpnext/stock/doctype/item/item.py +208,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 +177,Job Description,Opis dela
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,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 +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Posebni znaki razen &quot;-&quot; &quot;.&quot;, &quot;#&quot;, in &quot;/&quot; ni dovoljena v poimenovanju serijo"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Posebni znaki razen &quot;-&quot; &quot;.&quot;, &quot;#&quot;, in &quot;/&quot; ni dovoljena v poimenovanju serijo"
 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."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +24,Welcome to POS: Create your POS Profile,Dobrodošli na POS: Ustvarite POS profil
 DocType: Expense Claim,Approver,Odobritelj
 ,SO Qty,SO Kol
+DocType: Guardian,Work Address,Delovni naslov
 DocType: Appraisal,Calculate Total Score,Izračunaj skupni rezultat
 DocType: Request for Quotation,Manufacturing Manager,Proizvodnja Manager
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serijska št {0} je pod garancijo stanuje {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +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 +74,Shipments,Pošiljke
+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
 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 +153,Row # ,Vrstica #
+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 +156,Get From,Get From
+apps/erpnext/erpnext/public/js/utils.js +167,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 +167,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 +416,"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"
+apps/erpnext/erpnext/controllers/accounts_controller.py +419,"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
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} is disabled,Uporabnik {0} je onemogočena
 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 ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,"Pustite prazno, če velja za vse oddelke"
 apps/erpnext/erpnext/config/hr.py +171,"Types of employment (permanent, contract, intern etc.).","Vrste zaposlitve (trajna, pogodbeni, intern itd)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +346,{0} is mandatory for Item {1},{0} je obvezna za postavko {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,{0} is mandatory for Item {1},{0} je obvezna za postavko {1}
 DocType: Currency Exchange,From Currency,Iz valute
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Prosimo, izberite Dodeljeni znesek, fakture Vrsta in številka računa v atleast eno vrstico"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,Stroški New Nakup
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},Sales Order potreben za postavko {0}
 DocType: Purchase Invoice Item,Rate (Company Currency),Oceni (družba Valuta)
-apps/erpnext/erpnext/demo/setup_data.py +360,Others,Drugi
+DocType: Student Guardian,Others,Drugi
 DocType: Payment Entry,Unallocated Amount,nerazporejena Znesek
 apps/erpnext/erpnext/templates/includes/product_page.js +65,Cannot find a matching Item. Please select some other value for {0}.,"Ne morete najti ujemanja artikel. Prosimo, izberite kakšno drugo vrednost za {0}."
 DocType: POS Profile,Taxes and Charges,Davki in dajatve
@@ -1865,17 +1887,16 @@
 apps/erpnext/erpnext/config/stock.py +304,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/accounts/report/item_wise_sales_register/item_wise_sales_register.py +54,Receivable Account,Terjatev račun
-apps/erpnext/erpnext/controllers/accounts_controller.py +546,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} je že {2}
+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 +549,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 +79,CEO,direktor
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,direktor
 DocType: Expense Claim Detail,Expense Claim Detail,Expense Zahtevek Detail
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +808,Please select correct account,"Prosimo, izberite ustrezen račun"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +809,Please select correct account,"Prosimo, izberite ustrezen račun"
 DocType: Item,Weight UOM,Teža UOM
-DocType: Salary Structure Employee,Salary Structure Employee,Plača Struktura zaposlenih
+DocType: Salary Structure Employee,Salary Structure Employee,Struktura Plač zaposlenih
 DocType: Employee,Blood Group,Blood Group
-DocType: Purchase Invoice Item,Page Break,Page Break
 DocType: Production Order Operation,Pending,V teku
 DocType: Course,Course Name,Ime predmeta
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Uporabniki, ki lahko potrdijo zahtevke zapustiti določenega zaposlenega"
@@ -1884,14 +1905,15 @@
 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 +54,Full-time,Polni delovni čas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Full-time,Polni delovni čas
 DocType: Salary Structure,Employees,zaposleni
 DocType: Employee,Contact Details,Kontaktni podatki
 DocType: C-Form,Received Date,Prejela Datum
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Če ste ustvarili standardno predlogo v prodaji davkov in dajatev predlogo, izberite eno in kliknite na gumb spodaj."
+DocType: Student,Guardians,skrbniki
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +29,Please specify a country for this Shipping Rule or check Worldwide Shipping,"Prosimo, navedite državo ta prevoz pravilu ali preverite Dostava po celem svetu"
 DocType: Stock Entry,Total Incoming Value,Skupaj Dohodni Vrednost
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Debit To is required,Bremenitev je potrebno
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +321,Debit To is required,Bremenitev je potrebno
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Nakup Cenik
 DocType: Offer Letter Term,Offer Term,Ponudba Term
 DocType: Quality Inspection,Quality Manager,Quality Manager
@@ -1899,6 +1921,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/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
@@ -1909,18 +1932,17 @@
 DocType: Production Order Operation,Completed Qty,Dopolnil Kol
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"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 +273,Price List {0} is disabled,Seznam Cena {0} je onemogočena
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +99,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/projects/doctype/timesheet/timesheet.py +123,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
 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}."
 DocType: Stock Reconciliation Item,Current Valuation Rate,Trenutni tečaj Vrednotenje
 DocType: Item,Customer Item Codes,Stranka Postavka Kode
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,Exchange dobiček / izguba
 DocType: Opportunity,Lost Reason,Lost Razlog
-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/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/purchase_receipt/purchase_receipt.py +378,All items have already been invoiced,Vsi predmeti so bili že obračunano
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +379,All items have already been invoiced,Vsi predmeti so bili že obračunano
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Prosimo, navedite veljaven &quot;Od zadevi št &#39;"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Nadaljnje stroškovna mesta se lahko izvede v skupinah, vendar vnosi lahko zoper niso skupin"
 DocType: Project,External,Zunanji
@@ -1936,18 +1958,19 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Vaše stranke
 apps/erpnext/erpnext/projects/doctype/project/project.py +141,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/job_opening.html +19,Apply Now,Prijavi se zdaj
+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."
 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
-apps/erpnext/erpnext/utilities/doctype/address/address.py +164,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: Fee Structure,Fee Structure,Fee Struktura
 DocType: Timesheet Detail,Costing Amount,Stanejo Znesek
+DocType: Student Admission,Application Fee,Fee uporaba
 DocType: Process Payroll,Submit Salary Slip,Predloži plačilni list
-apps/erpnext/erpnext/controllers/selling_controller.py +161,Maxiumm discount for Item {0} is {1}%,Maxiumm popust za Element {0} je {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,Maxiumm popust za Element {0} je {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Uvoz v razsutem stanju
 DocType: Sales Partner,Address & Contacts,Naslov &amp; Kontakti
 DocType: SMS Log,Sender Name,Sender Name
@@ -1972,21 +1995,21 @@
 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_data.py +361,Travel,Potovanja
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +155,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 +304,Travel,Potovanja
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +167,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 +23,Update Cost,Posodobitev Stroški
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Posodobitev Stroški
 DocType: Item Reorder,Item Reorder,Postavka Preureditev
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +36,Show Salary Slip,Prikaži Plača listek
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +748,Transfer Material,Prenos Material
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +53,Show Salary Slip,Prikaži Plača listek
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +166,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 +923,Please set recurring after saving,"Prosim, nastavite ponavljajočih se po shranjevanju"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +646,Select change amount account,znesek računa Izberite sprememba
+apps/erpnext/erpnext/public/js/controllers/transaction.js +914,Please set recurring after saving,"Prosim, nastavite ponavljajočih se po shranjevanju"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +703,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
@@ -1998,31 +2021,32 @@
 DocType: Quality Inspection,Verified By,Verified by
 DocType: Address,Subsidiary,Hčerinska družba
 apps/erpnext/erpnext/setup/doctype/company/company.py +64,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","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: Quality Inspection,Purchase Receipt No,Potrdilo o nakupu Ne
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Kapara
 DocType: Process Payroll,Create Salary Slip,Ustvarite plačilnega lista
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +33,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 +352,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Količina v vrstici {0} ({1}) mora biti enaka kot je bila proizvedena količina {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Količina v vrstici {0} ({1}) mora biti enaka kot je bila proizvedena količina {2}
 DocType: Appraisal,Employee,Zaposleni
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Povabi kot uporabnik
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} je v celoti zaračunano
 DocType: Workstation Working Hour,End Time,Končni čas
 DocType: Payment Entry,Payment Deductions or Loss,Plačilni Odbitki ali izguba
-apps/erpnext/erpnext/config/schools.py +100,LMS,LMS
+apps/erpnext/erpnext/config/schools.py +104,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/config/crm.py +6,Sales Pipeline,prodaja Pipeline
 DocType: Student Batch Student,Student Batch Student,Student Serija Student
-DocType: Sales Invoice,Mass Mailing,Mass Mailing
+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 +199,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/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 +297,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 +111,Pharmaceutical,Pharmaceutical
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +309,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/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 Kupca
 DocType: Purchase Invoice,Credit To,Kredit
@@ -2032,32 +2056,33 @@
 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
-DocType: Buying Settings,Buying Settings,Nastavitve odkup
+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 +814,Please specify Company to proceed,"Prosimo, navedite Company nadaljevati"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +793,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 +44,Compensatory Off,Kompenzacijske Off
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,Kompenzacijske Off
 DocType: Quality Inspection Reading,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."
 DocType: Room,Room Number,Številka sobe
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Neveljavna referenčna {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +161,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ne more biti večji od načrtovanih quanitity ({2}) v proizvodnji naročite {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +162,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ne more biti večji od načrtovanih quanitity ({2}) v proizvodnji naročite {3}
 DocType: Shipping Rule,Shipping Rule Label,Dostava Pravilo Label
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,uporabnik foruma
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +217,Raw Materials cannot be blank.,Surovine ne more biti prazno.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,"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 +460,Quick Journal Entry,Hitro Journal Entry
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +111,You can not change rate if BOM mentioned agianst any item,"Vi stopnje ni mogoče spremeniti, če BOM omenjeno agianst vsako postavko"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +441,"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 +450,Quick Journal Entry,Hitro Journal Entry
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +103,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 +214,{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
 ,Minutes to First Response for Issues,Minut do prvega odziva na vprašanja
 DocType: Purchase Invoice,Terms and Conditions1,Pogoji in razmer1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,"Ime zavoda, za katerega vzpostavitev tega sistema."
@@ -2066,16 +2091,17 @@
 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 +398,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 +739,Item or Warehouse for row {0} does not match Material Request,Postavka ali skladišča za vrstico {0} ne ujema Material dogovoru
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +747,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
 DocType: Fiscal Year,Year End Date,Leto End Date
 DocType: Task Depends On,Task Depends On,Naloga je odvisna od
-DocType: Lead,Opportunity,Priložnost
+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
@@ -2088,7 +2114,7 @@
 DocType: Student,Joining Date,Vstop Datum
 ,Employees working on a holiday,Zaposleni na počitnice
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Mark Present
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},Datum začetka vzdrževanje ne more biti pred datumom dostave za serijsko št {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},Datum začetka vzdrževanje ne more biti pred datumom dostave za serijsko št {0}
 DocType: Production Order,Actual End Date,Dejanski končni datum
 DocType: Purchase Invoice,PINV-,PINV-
 DocType: Authorization Rule,Applicable To (Role),Ki se uporabljajo za (vloga)
@@ -2103,7 +2129,7 @@
 DocType: SMS Log,No of Requested SMS,Št zaprošene SMS
 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 +729,Please supply the specified items at the best possible rates,"Prosimo, da določene elemente na najboljših možnih cenah"
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +695,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 +117,Contract End Date must be greater than Date of Joining,Naročilo Končni datum mora biti večja od Datum pridružitve
 DocType: Delivery Note,DN-,DN-
@@ -2112,7 +2138,7 @@
 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 +14,This is an example website auto-generated from ERPNext,To je primer spletne strani samodejno ustvari iz ERPNext
+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
 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.
 
@@ -2139,13 +2165,14 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd Količina
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +54,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 +103,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 +504,Stock Entry {0} is not submitted,Stock Začetek {0} ni predložila
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Ne more proizvajati več item {0} od prodaje kol {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +505,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: Salary Component Account,Salary Component Account,Plača Komponenta račun
 DocType: Global Defaults,Hide Currency Symbol,Skrij valutni simbol
 apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card","npr Bank, gotovini, Kreditna kartica"
+DocType: Lead Source,Source Name,Source Name
 DocType: Journal Entry,Credit Note,Dobropis
 DocType: Warranty Claim,Service Address,Storitev Naslov
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furnitures and Fixtures,Pohištvo in Fixtures
@@ -2157,6 +2184,7 @@
 DocType: Opportunity,Customer / Lead Name,Stranka / Lead Name
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +89,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/controllers/trends.py +19,Total(Qty),Skupaj (Kol)
 DocType: Sales Invoice,This Document,Ta dokument
@@ -2168,15 +2196,15 @@
 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 +176,Organization branch master.,Organizacija podružnica gospodar.
-apps/erpnext/erpnext/controllers/accounts_controller.py +273, or ,ali
+apps/erpnext/erpnext/controllers/accounts_controller.py +276, or ,ali
 DocType: Sales Order,Billing Status,Status zaračunavanje
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Prijavi težavo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,Pomožni Stroški
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-Nad
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +203,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,Privzeto Seznam odkupna cena
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +206,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 +90,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 +93,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
@@ -2204,8 +2232,8 @@
 DocType: Product Bundle,Parent Item,Parent Item
 DocType: Account,Account Type,Vrsta računa
 DocType: Delivery Note,DN-RET-,DN-RET-
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +115,Leave Type {0} cannot be carry-forwarded,"Pustite Type {0} ni mogoče izvajati, posredovati"
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Vzdrževanje Urnik se ne ustvari za vse postavke. Prosimo, kliknite na &quot;ustvarjajo Seznamu&quot;"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +118,Leave Type {0} cannot be carry-forwarded,"Pustite Type {0} ni mogoče izvajati, posredovati"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Vzdrževanje Urnik se ne ustvari za vse postavke. Prosimo, kliknite na &quot;ustvarjajo Seznamu&quot;"
 ,To Produce,Za izdelavo
 apps/erpnext/erpnext/config/hr.py +93,Payroll,izplačane plače
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +163,"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"
@@ -2217,13 +2245,13 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +32,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 +748,Delivery,Dostava
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +742,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
 DocType: Payment Entry,Total Allocated Amount,Skupaj Dodeljena Znesek
 DocType: Item Reorder,Material Request Type,Material Zahteva Type
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +82,Row {0}: UOM Conversion Factor is mandatory,Vrstica {0}: UOM Conversion Factor je obvezna
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +79,Row {0}: UOM Conversion Factor is mandatory,Vrstica {0}: UOM Conversion Factor je obvezna
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Budget,Cost Center,Stroškovno Center
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Voucher #
@@ -2234,13 +2262,13 @@
 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 +90,Head of Marketing and Sales,Vodja marketinga in prodaje
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Davek na prihodek
+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 +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.
 DocType: Item Supplier,Item Supplier,Postavka Dobavitelj
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +403,Please enter Item Code to get batch no,Vnesite Koda dobiti serijo no
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +770,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 +397,Please enter Item Code to get batch no,Vnesite Koda dobiti serijo no
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +764,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"
@@ -2252,28 +2280,29 @@
 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 +100,Issues,Vprašanja
+apps/erpnext/erpnext/hooks.py +109,Issues,Vprašanja
 apps/erpnext/erpnext/controllers/status_updater.py +13,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
 DocType: Supplier,Billing Currency,Zaračunavanje Valuta
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Large,Extra Large
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,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 +507,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 +107,Local,Lokalno
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +508,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/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 +154,Large,Velika
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,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 +225,Total {0} ({1}),Skupno {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +224,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
@@ -2319,9 +2348,9 @@
 DocType: Attendance,Leave Type,Zapusti Type
 apps/erpnext/erpnext/controllers/stock_controller.py +173,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/hr/doctype/salary_slip/salary_slip.py +79,Name error: {0},Ime napaka: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +90,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 +178,{0} {1} does not associated with {2} {3},{0} {1} ni povezan z {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +181,{0} {1} does not associated with {2} {3},{0} {1} ni povezan z {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Udeležba na zaposlenega {0} je že označeno
 DocType: Packing Slip,If more than one package of the same type (for print),Če več paketov istega tipa (v tisku)
 DocType: Warehouse,Parent Warehouse,Parent Skladišče
@@ -2340,7 +2369,7 @@
 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
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,"Atleast en element, se vpiše z negativnim količino v povratni dokument"
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Atleast one item should be entered with negative quantity in return document,"Atleast en element, se vpiše z negativnim količino v povratni dokument"
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operacija {0} dlje od vseh razpoložljivih delovnih ur v delovni postaji {1}, razčleniti operacijo na več operacij"
 ,Requested,Zahteval
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +83,No Remarks,Ni Opombe
@@ -2352,46 +2381,46 @@
 DocType: Item,Total Projected Qty,Skupne projekcije Kol
 DocType: Monthly Distribution,Distribution Name,Porazdelitev Name
 DocType: Course,Course Code,Koda predmeta
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Quality Inspection required for Item {0},Inšpekcija kakovosti potrebna za postavko {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,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č
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Upravljanje Territory drevo.
 DocType: Journal Entry Account,Sales Invoice,Račun
 DocType: Journal Entry Account,Party Balance,Balance Party
-apps/erpnext/erpnext/accounts/page/pos/pos.js +475,Please select Apply Discount On,"Prosimo, izberite Uporabi popust na"
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +92,Salary Slip Created,Plača Slip Ustvarjeno
+apps/erpnext/erpnext/accounts/page/pos/pos.js +464,Please select Apply Discount On,"Prosimo, izberite Uporabi popust na"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +95,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
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,Popust Odstotek se lahko uporablja bodisi proti ceniku ali za vse cenik.
 DocType: Purchase Invoice,Half-yearly,Polletna
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +384,Accounting Entry for Stock,Računovodstvo Vstop za zalogi
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +387,Accounting Entry for Stock,Računovodstvo Vstop za zalogi
 DocType: Sales Invoice,Sales Team1,Prodaja TEAM1
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,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 +96,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 +120,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 +88,Row # {0}: Cannot return more than {1} for Item {2},Vrstica # {0}: ne more vrniti več kot {1} za postavko {2}
+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
 DocType: Item Group,Show this slideshow at the top of the page,Pokažite ta diaprojekcije na vrhu strani
 DocType: BOM,Item UOM,Postavka UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Davčna Znesek Po Popust Znesek (družba Valuta)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +147,Target warehouse is mandatory for row {0},Ciljna skladišče je obvezna za vrstico {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +141,Target warehouse is mandatory for row {0},Ciljna skladišče je obvezna za vrstico {0}
 DocType: Cheque Print Template,Primary Settings,primarni Nastavitve
 DocType: Purchase Invoice,Select Supplier Address,Izberite Dobavitelj naslov
 DocType: Quality Inspection,Quality Inspection,Quality Inspection
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Extra Small,Extra Small
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +194,Account {0} is frozen,Račun {0} je zamrznjen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Extra Small
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +690,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 +197,Account {0} is frozen,Račun {0} je zamrznjen
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Pravna oseba / Hčerinska družba z ločenim kontnem pripada organizaciji.
 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 +606,Can only make payment against unbilled {0},Lahko le plačilo proti neobračunano {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +126,Commission rate cannot be greater than 100,Stopnja Komisija ne more biti večja od 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +609,Can only make payment against unbilled {0},Lahko le plačilo proti neobračunano {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,Stopnja Komisija ne more biti večja od 100
 DocType: Stock Entry,Subcontract,Podizvajalska pogodba
 apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,Vnesite {0} najprej
 DocType: Production Order Operation,Actual End Time,Dejanski Končni čas
@@ -2402,30 +2431,30 @@
 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 +158,Colour,Barva
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,Barva
 DocType: Maintenance Visit,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"
 DocType: Student Log,Academic,akademski
-apps/erpnext/erpnext/controllers/accounts_controller.py +469,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Skupaj predplačilo ({0}) proti odredbi {1} ne more biti večja od Grand Total ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +472,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Skupaj predplačilo ({0}) proti odredbi {1} ne more biti večja od Grand Total ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Izberite mesečnim izplačilom neenakomerno distribucijo ciljev po mesecih.
 DocType: Purchase Invoice Item,Valuation Rate,Oceni Vrednotenje
+DocType: Stock Reconciliation,SR/,SR /
 apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,Cenik Valuta ni izbran
 DocType: Assessment,Results,Rezultati
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +168,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 +175,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
-DocType: Student Applicant,Father's/ Guardian 2 Email ID,Očetovski / Guardian 2 Email ID
 DocType: Maintenance Visit Purpose,Against Document No,Proti dokument št
 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 +228,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 +231,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 +93,Researcher,Raziskovalec
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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.
@@ -2437,25 +2466,25 @@
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Za udobje kupcev lahko te kode se uporabljajo v tiskanih oblikah, kot so na računih in dobavnicah"
 DocType: Sales Invoice,Time Sheet List,Čas Seznam Sheet
 DocType: Employee,You can enter any date manually,Lahko jih vnesete nobenega datuma
-DocType: Sales Invoice,Advertisement,Oglaševanje
 DocType: Asset Category Account,Depreciation Expense Account,Amortizacija račun
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Probationary Period,Poskusna doba
-apps/erpnext/erpnext/hooks.py +102,Announcements,Obvestila
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Poskusna doba
+apps/erpnext/erpnext/hooks.py +111,Announcements,Obvestila
 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 +109,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 +16,To Datetime,Da datetime
+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/scheduling_tool/scheduling_tool.py +51,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/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Čakanju Dejavnosti
+DocType: Accounts Settings,Make Payment via Journal Entry,Naredite plačilo preko Journal Entry
+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 +127,Please enter relieving date.,Vnesite lajšanje datum.
-apps/erpnext/erpnext/controllers/trends.py +145,Amt,Amt
+apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,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 +26,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"
@@ -2473,14 +2502,15 @@
 apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1},Ne morejo najti menjalni tečaj za {0} do {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Mark Day Half
 DocType: Sales Invoice,Sales Team,Sales Team
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Duplicate entry,Dvojnik vnos
+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 +490,[Error],[Error]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +484,[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
 apps/erpnext/erpnext/controllers/status_updater.py +175,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."
 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
@@ -2496,22 +2526,22 @@
 ,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 +25,All Jobs,Vsa delovna mesta
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,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
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Amount {0} {1} {2} {3},Znesek {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Amount {0} {1} {2} {3},Znesek {0} {1} {2} {3}
 DocType: Account,Depreciation,Amortizacija
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Dobavitelj (-i)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Zaposleni Udeležba Tool
 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 +372,Payment Entries {0} are un-linked,Plačilni Navedbe {0} un povezane
+apps/erpnext/erpnext/accounts/utils.py +449,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
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +497,Material Requests {0} created,Material Zahteve {0} ustvarjene
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +498,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.
 DocType: Purchase Invoice,Address and Contact,Naslov in Stik
@@ -2550,14 +2580,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 +848,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 +859,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 +233,Closing (Dr),Zapiranje (Dr)
 DocType: Cheque Print Template,Cheque Size,Ček Velikost
 DocType: Contact,Passive,Pasivna
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.js +49,View attendance,Poglej udeležba
 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 prodajo transakcije.
+apps/erpnext/erpnext/config/selling.py +159,Tax template for selling transactions.,Davčna predlogo za prodajne transakcije.
 DocType: Sales Invoice,Write Off Outstanding Amount,Napišite Off neporavnanega zneska
 DocType: Account,Accounts Manager,Accounts Manager
 DocType: Stock Settings,Default Stock UOM,Privzeto Stock UOM
@@ -2571,7 +2601,8 @@
 ,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.
-apps/erpnext/erpnext/controllers/accounts_controller.py +555,'Update Stock' cannot be checked for fixed asset sale,"&quot;Update Stock&quot;, ni mogoče preveriti za prodajo osnovnih sredstev"
+DocType: Student Guardian,Father,oče
+apps/erpnext/erpnext/controllers/accounts_controller.py +558,'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/buying/doctype/purchase_order/purchase_order.py +132,Material Request {0} is cancelled or stopped,Material Zahteva {0} je odpovedan ali ustavi
@@ -2581,15 +2612,15 @@
 DocType: Sales Order,Fully Delivered,Popolnoma Delivered
 DocType: Lead,Lower Income,Nižji od dobička
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","Glava računa na podlagi odgovornosti, v katerem se bodo rezervirana dobiček / izguba"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +166,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 +238,"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 +81,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 slediti 'Do Datum '"
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +17,Cannot change status as student {0} is linked with student application {1},"status študenta, ne more spremeniti {0} je povezana z uporabo študentskega {1}"
+apps/erpnext/erpnext/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/purchase_receipt/purchase_receipt.py +82,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}"
 DocType: Timesheet,"List of employee which has ""Salary Slip Based on Timesheet"" is enabled in salary structure.","Seznam zaposlenega, ki ima &quot;plačilni list Na podlagi Timesheet&quot; je omogočena v strukturi plač."
 DocType: Asset,Fully Depreciated,celoti amortizirana
 ,Stock Projected Qty,Stock Predvidena Količina
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Customer {0} does not belong to project {1},"Stranka {0} ne pripada, da projekt {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,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
@@ -2601,7 +2632,7 @@
 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/patches/v7_0/create_warehouse_nestedset.py +55,All Warehouses,Vse Skladišča
+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 +105,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
@@ -2613,10 +2644,10 @@
 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/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Naredite plačilnega lista
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +26,Browse BOM,Prebrskaj BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,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/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 Year,Academic Year,Študijsko leto
+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
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,Cenitev
@@ -2624,12 +2655,12 @@
 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 +197,Leave approver must be one of {0},Pustite odobritelj mora biti eden od {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,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: Workstation Working Hour,Start Time,Začetni čas
 DocType: Item Price,Bulk Import Help,Bulk Import Pomoč
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +256,Select Quantity,Izberite Količina
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +257,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
@@ -2646,6 +2677,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Bodisi ciljna kol ali ciljna vrednost je obvezna.
 apps/erpnext/erpnext/config/projects.py +45,Cost of various activities,Stroške različnih dejavnosti
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Nastavitev dogodkov na {0}, saj je zaposlenih pritrjen na spodnji prodaje oseb nima uporabniško {1}"
+DocType: Timesheet,Billing Details,Podrobnosti o obračunavanju
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +149,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}"
 DocType: Item,Inspection Required,Inšpekcijski Zahtevano
@@ -2665,7 +2697,7 @@
 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 +138,Wire Transfer,Wire Transfer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,Wire Transfer
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Preveri vse
 DocType: Sales Order,Recurring Order,Ponavljajoči naročilo
 DocType: Company,Default Income Account,Privzeto Prihodki račun
@@ -2677,21 +2709,19 @@
 ,Welcome to ERPNext,Dobrodošli na ERPNext
 apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,Privede do Kotacija
 DocType: Lead,From Customer,Od kupca
-apps/erpnext/erpnext/demo/setup_data.py +357,Calls,Poziva
+apps/erpnext/erpnext/demo/setup/setup_data.py +300,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/stock/doctype/item/item.py +466,"As there are existing transactions for this item, \
-							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Kot že obstajajo transakcije za to postavko, \ ga ni mogoče spremeniti vrednote &quot;ima serijsko številko&quot;, &quot;Ima serija ni &#39;,&quot; je Stock Element &quot;in&quot; metoda vrednotenja &quot;"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,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/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 +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Opomba: Sistem ne bo preveril čez povzetju in over-rezervacije za postavko {0} kot količina ali znesek je 0
 DocType: Notification Control,Quotation Message,Kotacija Sporočilo
 DocType: Issue,Opening Date,Otvoritev Datum
-apps/erpnext/erpnext/schools/api.py +58,Attendance has been marked successfully.,Udeležba je bila uspešno označena.
+apps/erpnext/erpnext/schools/api.py +57,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 +136,Account Type for {0} must be {1},Vrsta računa za {0} mora biti {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +139,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
@@ -2706,12 +2736,13 @@
 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/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 +20,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,Kotacija 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","Element obstaja z istim imenom ({0}), prosimo, spremenite ime postavka skupine ali preimenovanje postavke"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1190,Please select customer,Izberite stranko
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1193,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
@@ -2721,6 +2752,7 @@
 ,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 +50,Missing Currency Exchange Rates for {0},Manjka Menjalni tečaji za {0}
 DocType: Assessment,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-
@@ -2738,11 +2770,12 @@
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Ime temo
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Mora biti izbran Atleast eden prodaji ali nakupu
+DocType: Grading Structure,Grade Intervals,grade intervali
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Izberite naravo vašega podjetja.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Kjer so proizvodni postopki.
 DocType: Asset Movement,Source Warehouse,Vir Skladišče
 DocType: Installation Note,Installation Date,Datum vgradnje
-apps/erpnext/erpnext/controllers/accounts_controller.py +534,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} ne pripada družbi {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +537,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} ne pripada družbi {2}
 DocType: Employee,Confirmation Date,Potrditev Datum
 DocType: C-Form,Total Invoiced Amount,Skupaj Obračunani znesek
 DocType: Account,Sales User,Prodaja Uporabnik
@@ -2756,28 +2789,31 @@
 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 +111,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/scheduling_tool/scheduling_tool.py +49,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 +87,{0}% Delivered,{0}% Dostavljeno
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% Dostavljeno
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Postavka {0}: Ž Kol {1} ne more biti nižja od minimalne naročila Kol {2} (opredeljeno v točki).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Mesečni Distribution Odstotek
 DocType: Territory,Territory Targets,Territory cilji
 DocType: Delivery Note,Transporter Info,Transporter Info
-apps/erpnext/erpnext/accounts/utils.py +379,Please set default {0} in Company {1},"Prosim, nastavite privzeto {0} v družbi {1}"
+apps/erpnext/erpnext/accounts/utils.py +456,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
 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.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Naslovi za tiskane predloge, npr predračunu."
+DocType: Student Guardian,Student Guardian,študent Guardian
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +184,Valuation type charges can not marked as Inclusive,Stroški Tip vrednotenje ni mogoče označiti kot Inclusive
 DocType: POS Profile,Update Stock,Posodobitev 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.,"Drugačna UOM za artikle bo privedlo do napačne (skupno) Neto teža vrednosti. Prepričajte se, da je neto teža vsake postavke v istem UOM."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
 DocType: Asset,Journal Entry for Scrap,Journal Entry za pretep
 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 +349,Journal Entries {0} are un-linked,Revija Vnosi {0} so un-povezani
+apps/erpnext/erpnext/accounts/utils.py +426,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
@@ -2801,15 +2837,16 @@
 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
+DocType: Homepage,"URL for ""All Products""",URL za »Vsi izdelki«
 DocType: Leave Application,Leave Balance Before Application,Pustite Stanje pred uporabo
 DocType: SMS Center,Send SMS,Pošlji SMS
 DocType: Cheque Print Template,Width of amount in word,Širina zneska z besedo
 DocType: Company,Default Letter Head,Privzeto glavi pisma
 DocType: Purchase Order,Get Items from Open Material Requests,Dobili predmetov iz Odpri Material Prošnje
-DocType: Item,Standard Selling Rate,Standardna Prodajni tečaj
+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 +29,Current Job Openings,Razpisana delovna
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,Current Job Openings,Razpisana delovna
 DocType: Company,Stock Adjustment Account,Račun Prilagoditev Stock
 DocType: Journal Entry,Write Off,Odpisati
 DocType: Timesheet Detail,Operation ID,Operacija ID
@@ -2822,7 +2859,7 @@
 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 +850,Show tax break-up,Prikaži davek break-up
+apps/erpnext/erpnext/public/js/controllers/transaction.js +841,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/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"
@@ -2832,10 +2869,11 @@
 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 +534,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 +80,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 +162,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/selling/doctype/customer/customer.py +195,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,Privzeto Cash 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 +5,This is based on the attendance of this Student,Ta temelji na prisotnosti tega Študent
@@ -2844,12 +2882,11 @@
 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 +75,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 +138,Note: There is not enough leave balance for Leave Type {0},Opomba: Ni dovolj bilanca dopust za dopust tipa {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Note: There is not enough leave balance for Leave Type {0},Opomba: Ni dovolj bilanca dopust za dopust tipa {0}
 DocType: Program Enrollment Fee,Program Enrollment Fee,Program Vpis Fee
 DocType: Item,Supplier Items,Dobavitelj Items
 DocType: Opportunity,Opportunity Type,Priložnost Type
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,Nova podjetja
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,Cost Center is required for 'Profit and Loss' account {0},Stroškov Center je potrebno za &quot;izkaz poslovnega izida&quot; račun {0}
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Transakcije se lahko izbriše le s ustvarjalca družbe
 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.,Nepravilno število General Ledger Entries našel. Morda ste izbrali napačen račun v transakciji.
 DocType: Cheque Print Template,Cheque Width,Ček Širina
@@ -2858,16 +2895,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,"Datum rojstva ne more biti večji, od današnjega."
 ,Stock Ageing,Stock Staranje
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,timesheet
-apps/erpnext/erpnext/controllers/accounts_controller.py +228,{0} '{1}' is disabled,{0} {1} &quot;je onemogočena
+apps/erpnext/erpnext/controllers/accounts_controller.py +231,{0} '{1}' is disabled,{0} {1} &quot;je onemogočena
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Nastavi kot Odpri
 DocType: Cheque Print Template,Scanned Cheque,skeniranih Ček
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Pošlji samodejne elektronske pošte v Contacts o posredovanju transakcij.
+DocType: Timesheet,Total Billable Amount,Skupaj Odgovorni Znesek
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Postavka 3
 DocType: Purchase Order,Customer Contact Email,Customer Contact Email
 DocType: Warranty Claim,Item and Warranty Details,Točka in Garancija Podrobnosti
 DocType: Sales Team,Contribution (%),Prispevek (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Opomba: Začetek Plačilo se ne bodo ustvarili, saj &quot;gotovinski ali bančni račun&quot; ni bil podan"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Responsibilities,Odgovornosti
+apps/erpnext/erpnext/controllers/accounts_controller.py +78,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
 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
@@ -2875,6 +2913,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Dodaj uporabnike
 DocType: Pricing Rule,Item Group,Element Group
 DocType: Item,Safety Stock,varnost Stock
+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: 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)
@@ -2884,7 +2923,6 @@
 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: Timesheet,Total Hours,Skupaj ure
 DocType: Journal Entry,Printing Settings,Printing Settings
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Total Debit must be equal to Total Credit. The difference is {0},Skupaj obremenitve mora biti enaka celotnemu kreditnemu. Razlika je {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Avtomobilizem
@@ -2897,26 +2935,27 @@
 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 +71,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
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Stranka&gt; Skupina kupcev&gt; Territory
 DocType: Purchase Invoice Item,Rate,Vrednost
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Intern,Intern
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,Intern
 DocType: Stock Entry,From BOM,Od BOM
 DocType: Assessment,Assessment Code,Koda ocena
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +32,Basic,Osnovni
+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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Prosimo, kliknite na &quot;ustvarjajo Seznamu&quot;"
+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 +95,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 +108,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,Plača Struktura
+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 +752,Issue Material,Vprašanje Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +723,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 +683,You are in offline mode. You will not be able to reload until you have network.,"Ste v načinu brez povezave. Ne boste mogli naložiti, dokler imate omrežje."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +665,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."
 DocType: Hub Settings,Access Token,Dostopni žeton
 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
@@ -2924,33 +2963,35 @@
 DocType: Purchase Invoice,Print Language,Tiskanje jezik
 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 +1122,Enter value must be positive,Vnesite vrednost mora biti pozitivna
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,All Territories,Vse Territories
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1125,Enter value must be positive,Vnesite vrednost mora biti pozitivna
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,Vse Territories
 DocType: Purchase Invoice,Items,Predmeti
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +23,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 +221,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 +233,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 +96,Request for Quotations,Zahteva za Citati
+apps/erpnext/erpnext/hooks.py +104,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
 DocType: Asset,Partially Depreciated,delno amortiziranih
 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 +628,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Privzeto mersko enoto za Variant &#39;{0}&#39; mora biti enaka kot v predlogo &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Privzeto mersko enoto za Variant &#39;{0}&#39; mora biti enaka kot v predlogo &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Izračun temelji na
 DocType: Delivery Note Item,From Warehouse,Iz skladišča
 DocType: Assessment,Supervisor Name,Ime nadzornik
+DocType: Assessment,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
 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 +27,Default Address Template cannot be deleted,Privzete predloge naslova ni mogoče brisati
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,Privzete predloge naslova ni mogoče brisati
 DocType: Sales Invoice,Shipping Rule,Dostava Pravilo
 DocType: Manufacturer,Limited to 12 characters,Omejena na 12 znakov
 DocType: Journal Entry,Print Heading,Print Postavka
@@ -2965,8 +3006,8 @@
 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/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 +485,No default BOM exists for Item {0},Ne obstaja privzeta BOM za postavko {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +336,Please select Posting Date first,"Prosimo, izberite datumom knjiženja najprej"
+apps/erpnext/erpnext/stock/get_item_details.py +486,No default BOM exists for Item {0},Ne obstaja privzeta BOM za postavko {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +326,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
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Stroškovno Center z obstoječimi transakcij ni mogoče pretvoriti v knjigo terjatev
@@ -2982,6 +3023,7 @@
 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
 DocType: Authorization Rule,Applicable To (Designation),Ki se uporabljajo za (Oznaka)
+,Profitability Analysis,Analiza dobičkonosnosti
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,Dodaj v voziček
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Skupina S
 DocType: Guardian,Interests,Zanima
@@ -2994,21 +3036,21 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,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 +141,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Zaporednimi Postavka {0} ni mogoče posodobiti \ uporabo zaloge sprave
 DocType: Scheduling Tool,Day,dan
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Nova serijska številka ne more imeti skladišče. Skladišče mora nastaviti borze vstopu ali Potrdilo o nakupu
 DocType: Lead,Lead Type,Svinec Type
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,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 +129,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
-DocType: Student Applicant,AP.,AP.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,Neznan
 DocType: Shipping Rule,Shipping Rule Conditions,Dostava Pravilo Pogoji
 DocType: BOM Replace Tool,The new BOM after replacement,Novi BOM po zamenjavi
-apps/erpnext/erpnext/accounts/page/pos/pos.js +639,Point of Sale,Prodajno mesto
+apps/erpnext/erpnext/accounts/page/pos/pos.js +634,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
 DocType: Production Planning Tool,Production Planning Tool,Production Planning Tool
@@ -3017,74 +3059,77 @@
 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 +373,Quantity to Manufacture must be greater than 0.,Količina na Izdelava mora biti večja od 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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 Profile,Customer Group,Skupina za stranke
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,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/doctype/asset/asset.py +83,Next Depreciation Date must be on or after today,Naslednja Amortizacija Datum mora biti na ali po danes
 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 +145,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: Quotation,Quotation Lost Reason,Kotacija Lost Razlog
+apps/erpnext/erpnext/utilities/doctype/address/address.py +164,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.
 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 +330,Transaction reference no {0} dated {1},Referenčna transakcija ni {0} dne {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,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 +107,Summary for this month and pending activities,Povzetek za ta mesec in v teku dejavnosti
+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/accounts/doctype/sales_invoice/sales_invoice.py +406,Please remove this Invoice {0} from C-Form {1},"Prosimo, odstranite tej fakturi {0} od C-Form {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,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 +644,Get Items,Pridobi Artikle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +623,Get Items,Pridobi Artikle
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +210,Please enter Write Off Account,Vnesite Napišite Off račun
 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 +41,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
 DocType: Payment Request,Initiated,Začela
 DocType: Production Order,Planned Start Date,Načrtovani datum začetka
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,Customer is required against Receivable account {0},zahteva stranka zoper terjatve iz račun {0}
 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 +265,Project-wise data is not available for Quotation,Podatki projekt pametno ni na voljo za ponudbo
+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 +101,Commercial,Commercial
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,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/purchase_invoice/purchase_invoice.py +648,Row {0}# Account must be of type 'Fixed Asset',Vrstica {0} # računa mora biti tipa &quot;osnovno sredstvo&quot;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,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 +30,Series is mandatory,Serija je obvezna
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +50,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
 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}
 DocType: Leave Allocation,Unused leaves,Neizkoriščene listi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Cr,Cr
 DocType: Tax Rule,Billing State,Država za zaračunavanje
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +250,Transfer,Prenos
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +187,{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 +825,Fetch exploded BOM (including sub-assemblies),Fetch eksplodiral BOM (vključno podsklopov)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +254,Transfer,Prenos
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +190,{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 +796,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 +115,Due Date is mandatory,Datum zapadlosti je obvezno
+apps/erpnext/erpnext/controllers/accounts_controller.py +118,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
 DocType: Journal Entry,Pay To / Recd From,Pay / Recd Od
 DocType: Naming Series,Setup Series,Setup Series
 DocType: Payment Reconciliation,To Invoice Date,Če želite Datum računa
 DocType: Supplier,Contact HTML,Kontakt HTML
 ,Inactive Customers,neaktivne stranke
+DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Odkupne Prejemki
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Kako Pricing pravilo se uporablja?
 DocType: Quality Inspection,Delivery Note No,Dostava Opomba Ne
@@ -3093,7 +3138,7 @@
 DocType: Company,Retail,Maloprodaja
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +120,Customer {0} does not exist,Stranka {0} ne obstaja
 DocType: Attendance,Absent,Odsoten
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +587,Product Bundle,Bundle izdelek
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Product Bundle,Bundle izdelek
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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
@@ -3103,8 +3148,8 @@
 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 +742,Send Supplier Emails,Pošlji Dobavitelj e-pošte
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +104,"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/buying/doctype/request_for_quotation/request_for_quotation.js +708,Send Supplier Emails,Pošlji Dobavitelj e-pošte
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,"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.
 DocType: Guardian Interest,Guardian Interest,Guardian Obresti
 DocType: Timesheet,Employee Detail,Podrobnosti zaposleni
@@ -3115,9 +3160,9 @@
 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}
 DocType: Salary Slip,Earning & Deduction,Zaslužek &amp; Odbitek
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +77,Account {0} cannot be a Group,Upoštevati {0} ne more biti skupina
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} cannot be a Group,Upoštevati {0} ne more biti skupina
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +31,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 +107,Negative Valuation Rate is not allowed,Negativno Oceni Vrednotenje ni dovoljeno
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Negativno Oceni Vrednotenje ni dovoljeno
 DocType: Holiday List,Weekly Off,Tedenski Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Za primer leta 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +39,Provisional Profit / Loss (Credit),Začasna dobiček / izguba (Credit)
@@ -3131,16 +3176,16 @@
 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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Stroški Center je obvezen za postavko {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +626,Get Items from Product Bundle,Dobili predmetov iz Bundle izdelkov
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +605,Get Items from Product Bundle,Dobili predmetov iz Bundle izdelkov
 DocType: Asset,Straight Line,Ravna črta
 DocType: Project User,Project User,projekt Uporabnik
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} is inactive,Račun {0} je neaktiven
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} is inactive,Račun {0} je neaktiven
 DocType: GL Entry,Is Advance,Je Advance
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Udeležba Od datuma in udeležba na Datum je obvezna
 apps/erpnext/erpnext/controllers/buying_controller.py +148,Please enter 'Is Subcontracted' as Yes or No,"Prosimo, vpišite &quot;Je v podizvajanje&quot;, kot DA ali NE"
 DocType: Sales Team,Contact No.,Kontakt No.
 DocType: Bank Reconciliation,Payment Entries,Plačilni vnosi
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,'Profit and Loss' type account {0} not allowed in Opening Entry,&quot;Izkaz poslovnega izida&quot; tip račun {0} ni dovoljen v vstopna odprtina
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +71,'Profit and Loss' type account {0} not allowed in Opening Entry,&quot;Izkaz poslovnega izida&quot; tip račun {0} ni dovoljen v vstopna odprtina
 DocType: 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
@@ -3159,7 +3204,7 @@
 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,Komisija za prodajo
 DocType: Offer Letter Term,Value / Description,Vrednost / Opis
-apps/erpnext/erpnext/controllers/accounts_controller.py +558,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} ni mogoče predložiti, je že {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +561,"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: Production Order,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}.
@@ -3172,13 +3217,13 @@
 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/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Legal Expenses,Pravni stroški
 DocType: Purchase Invoice,Posting Time,Napotitev čas
-DocType: Sales Order,% Amount Billed,% Zaračunani znesek
+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."
 apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},Ne Postavka s serijsko št {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Odprte Obvestila
+DocType: Email Digest,Open Notifications,Odprte Obvestila
 DocType: Payment Entry,Difference Amount (Company Currency),Razlika Znesek (družba Valuta)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,Neposredni stroški
 apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
@@ -3186,7 +3231,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,New Customer Prihodki
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,Potni stroški
 DocType: Maintenance Visit,Breakdown,Zlomiti se
-apps/erpnext/erpnext/controllers/accounts_controller.py +634,Account: {0} with currency: {1} can not be selected,Račun: {0} z valuti: ne more biti izbran {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +637,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čno račun {1} ne pripada podjetju: {2}
 DocType: Program Enrollment Tool,Student Applicants,Študentski Vlagatelji
@@ -3194,15 +3239,15 @@
 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 +56,Probation,Poskusno delo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Probation,Poskusno delo
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,komponente plače
 DocType: Program Enrollment Tool,New Academic Year,Novo študijsko leto
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Payment of salary for the month {0} and year {1},Izplačilo plače za mesec {0} in leto {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Payment of salary for the month {0} and year {1},Izplačilo plače za mesec {0} in leto {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Auto insert stopnja Cenik če manjka
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Skupaj Plačan znesek
 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 +144,Planning,Načrtovanje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,Načrtovanje
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,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
@@ -3215,11 +3260,10 @@
 DocType: Sales Partner,Contact Desc,Kontakt opis izdelka
 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.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Sales invoice submitted sucessfully.,Prodaja predložen račun uspešno.
 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}"
 DocType: Assessment Result,Student Name,Student Ime
-apps/erpnext/erpnext/hooks.py +104,Assessment Schedule,Razpored ocena
+apps/erpnext/erpnext/hooks.py +113,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
@@ -3229,6 +3273,7 @@
 DocType: GL Entry,Party Type,Vrsta Party
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +78,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"
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Plača predlogo gospodar.
 DocType: Leave Type,Max Days Leave Allowed,Max dni dopusta Dovoljeno
@@ -3240,44 +3285,43 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Citati za Interesenti 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 +99,All Customer Groups,Vse skupine strank
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +78,Accumulated Monthly,Bilančni Mesečni
-apps/erpnext/erpnext/controllers/accounts_controller.py +595,{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/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Vse skupine strank
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +81,Accumulated Monthly,Bilančni Mesečni
+apps/erpnext/erpnext/controllers/accounts_controller.py +598,{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čno 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
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +188,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"
 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 +84,Secretary,Sekretar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,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,Odkup
+DocType: Pricing Rule,Buying,Nabava
 DocType: HR Settings,Employee Records to be created by,"Zapisi zaposlenih, ki ga povzročajo"
 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
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,Vrstica # {0}: Zaporedna številka je obvezna
+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,Inštitut Kratica
 ,Item-wise Price List Rate,Element-pametno Cenik Rate
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +859,Supplier Quotation,Dobavitelj za predračun
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +838,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 +7,Collect Fees,zbiranje pristojbine
+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}
 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.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Prihajajoči dogodki
 DocType: Item,Opening Stock,Odpiranje Stock
 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
-DocType: Email Digest,Income / Expense,Prihodki / odhodki
 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."
@@ -3288,13 +3332,14 @@
 DocType: Customer,From Lead,Iz svinca
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Naročila sprosti za proizvodnjo.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Izberite poslovno leto ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,POS Profile required to make POS Entry,"POS Profil zahteva, da POS Entry"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +509,POS Profile required to make POS Entry,"POS Profil zahteva, da POS Entry"
 DocType: Program Enrollment Tool,Enroll Students,včlanite Študenti
 DocType: Hub Settings,Name Token,Ime Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standardna Prodaja
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Atleast one warehouse is mandatory,Atleast eno skladišče je obvezna
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +129,Atleast one warehouse is mandatory,Atleast eno skladišče je obvezna
 DocType: Serial No,Out of Warranty,Iz garancije
 DocType: BOM Replace Tool,Replace,Zamenjaj
+DocType: Production Order,Unstopped,Unstopped
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Invoice {1},{0} za račun {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Ime projekta
@@ -3315,10 +3360,11 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,Listi morajo biti dodeljen v večkratnikih 0.5
 DocType: Production Order,Operation Cost,Delovanje Stroški
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,Naloži udeležbo iz .csv datoteke
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Izjemna Amt
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Določiti cilje Postavka Group-pametno za te prodaje oseba.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Freeze Zaloge Older Than [dni]
-apps/erpnext/erpnext/controllers/accounts_controller.py +528,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: Sredstvo je obvezna za osnovno sredstvo nakupu / prodaji
+apps/erpnext/erpnext/controllers/accounts_controller.py +531,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: Sredstvo je obvezna za osnovno sredstvo nakupu / prodaji
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Če dva ali več Cenik Pravilnik ugotovila na podlagi zgoraj navedenih pogojev, se uporablja Prioriteta. Prednostno je število med 0 do 20, medtem ko privzeta vrednost nič (prazno). Višja številka pomeni, da bo prednost, če obstaja več cenovnih Pravila z enakimi pogoji."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Poslovno leto: {0} ne obstaja
 DocType: Currency Exchange,To Currency,Valutnemu
@@ -3335,15 +3381,15 @@
 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
-DocType: Sales Invoice,Exhibition,Razstava
 apps/erpnext/erpnext/utilities/doctype/address/address.py +77,"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 +81,Syntax error in formula or condition: {0},Skladenjska napaka v formuli ali stanje: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +92,Syntax error in formula or condition: {0},Skladenjska napaka v formuli ali stanje: {0}
 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"
+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 +28,Jobs,Jobs
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,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
@@ -3352,16 +3398,16 @@
 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 +763,Make Supplier Quotation,Naredite Dobavitelj predračun
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,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/controllers/sales_and_purchase_return.py +100,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 +42,Casual Leave,Casual Zapusti
+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
 DocType: Batch,Batch ID,Serija ID
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,Note: {0},Opomba: {0}
 ,Delivery Note Trends,Dobavnica Trendi
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +103,This Week's Summary,Povzetek Ta teden je
+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
 DocType: Student Group Creation Tool,Get Courses,Get Tečaji
 DocType: GL Entry,Party,Zabava
@@ -3371,7 +3417,7 @@
 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 +59,Piecework,Akord
+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
 DocType: Task,Actual Time (in Hours),Dejanski čas (v urah)
 DocType: Employee,History In Company,Zgodovina V družbi
@@ -3388,7 +3434,7 @@
 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.
 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 +162,Black,Črna
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,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
@@ -3399,13 +3445,13 @@
 DocType: Project Task,Pending Review,Dokler Pregled
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +106,"Asset {0} cannot be scrapped, as it is already {1}","Sredstvo {0} ne more biti izločeni, saj je že {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Total Expense zahtevek (preko Expense zahtevka)
-apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +69,Customer Id,ID stranke
+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
 DocType: Journal Entry Account,Exchange Rate,Menjalni tečaj
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Sales Order {0} is not submitted,Naročilo Kupca {0} ni predloženo
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +527,Sales Order {0} is not submitted,Naročilo Kupca {0} ni predloženo
 DocType: Homepage,Tag Line,tag Line
 DocType: Fee Component,Fee Component,Fee Component
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +857,Add items from,Dodaj artikle iz
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +836,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}
 DocType: Cheque Print Template,Regular,redno
 DocType: BOM,Last Purchase Rate,Zadnja Purchase Rate
@@ -3413,6 +3459,7 @@
 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"
 ,Sales Person-wise Transaction Summary,Prodaja Oseba pametno Transakcijski Povzetek
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +60,Cost Center is required for 'Profit and Loss' account {0}. Please set up a default Cost Center for the Company.,Center Stroškov za račun &quot;poslovnega izida&quot; {0} potrebna. Nastavite privzeto stroškovno Center za družbo.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,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
@@ -3423,12 +3470,12 @@
 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 +710,Online,Na zalogi
+apps/erpnext/erpnext/accounts/page/pos/pos.js +692,Online,Na zalogi
 ,Available Stock for Packing Items,Zaloga za Embalaža Items
 DocType: Item Variant,Item Variant,Postavka Variant
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,Nastavitev ta naslov predlogo kot privzeto saj ni druge privzeto
+apps/erpnext/erpnext/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
 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 že v obremenitve, se vam ni dovoljeno, da nastavite &quot;Stanje mora biti&quot; kot &quot;kredit&quot;"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Quality Management,Upravljanje kakovosti
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,Upravljanje kakovosti
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,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
@@ -3450,11 +3497,12 @@
 DocType: Student,Student Email ID,Študent Email ID
 DocType: Employee,Notice (days),Obvestilo (dni)
 DocType: Tax Rule,Sales Tax Template,Sales Tax Predloga
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1520,Select items to save the invoice,"Izberite predmete, da shranite račun"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1544,Select items to save the invoice,"Izberite predmete, da shranite račun"
 DocType: Employee,Encashment Date,Vnovčevanje Datum
 DocType: Account,Stock Adjustment,Prilagoditev Stock
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Obstaja Stroški Privzeta aktivnost za vrsto dejavnosti - {0}
 DocType: Production Order,Planned Operating Cost,Načrtovana operacijski stroškov
+DocType: Academic Term,Term Start Date,Izraz Datum začetka
 apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},V prilogi vam pošiljamo {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Banka Izjava ravnotežje kot na glavno knjigo
 DocType: Job Applicant,Applicant Name,Predlagatelj Ime
@@ -3484,17 +3532,17 @@
 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."
 DocType: Company,Distribution,Porazdelitev
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +8,Amount Paid,Plačani znesek
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Project Manager,Project Manager
+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
 ,Quoted Item Comparison,Citirano Točka Primerjava
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Dispatch,Dispatch
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,Dispatch
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max popust dovoljena za postavko: {0} je {1}%
 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."
-DocType: Sales Invoice,Supplier Reference,Dobavitelj Reference
-apps/erpnext/erpnext/accounts/page/pos/pos.js +844,"Master data syncing, it might take some time","Master podatkov sinhronizacijo, lahko traja nekaj časa"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +832,"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
@@ -3508,7 +3556,7 @@
 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 +83,Error in formula or condition,Napaka v formuli ali stanja
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,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
@@ -3517,7 +3565,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},"Do datuma mora biti v poslovnem letu. Ob predpostavki, da želite Datum = {0}"
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Tukaj lahko ohranijo višino, težo, alergije, zdravstvene pomisleke itd"
 DocType: Leave Block List,Applies to Company,Velja za podjetja
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +197,Cannot cancel because submitted Stock Entry {0} exists,"Ni mogoče preklicati, ker je predložila Stock Začetek {0} obstaja"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +198,Cannot cancel because submitted Stock Entry {0} exists,"Ni mogoče preklicati, ker je predložila Stock Začetek {0} obstaja"
 DocType: Purchase Invoice,In Words,V besedi
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,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
@@ -3527,27 +3575,28 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,Vaš proračunsko leto se začne na
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Premoženjem amortizacije in Stanja
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +319,Amount {0} {1} transferred from {2} to {3},Znesek {0} {1} je preselil iz {2} na {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +322,Amount {0} {1} transferred from {2} to {3},Znesek {0} {1} je preselil iz {2} na {3}
 DocType: Sales Invoice,Get Advances Received,Get prejeti predujmi
 DocType: Email Digest,Add/Remove Recipients,Dodaj / Odstrani prejemnike
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +432,Transaction not allowed against stopped Production Order {0},Transakcija ni dovoljena zoper ustavili proizvodnjo naročite {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +437,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 +143,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 +652,Item variant {0} exists with same attributes,Obstaja postavka varianta {0} z enakimi atributi
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Obstaja postavka varianta {0} z enakimi atributi
+DocType: Leave Application,LAP/,LAP /
 DocType: Salary Slip,Salary Slip,Plača listek
 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,"Zahtevano je ""Do datuma"""
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.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,Naročilo Kupca Artikel
 DocType: Salary Slip,Payment Days,Plačilni dnevi
 DocType: Customer,Dormant,mirujočih
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +212,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 +215,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/public/js/controllers/transaction.js +866,It is needed to fetch Item Details.,"To je potrebno, da prinese Element Podrobnosti."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +857,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
@@ -3557,14 +3606,14 @@
 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 +178,Invalid {0},Neveljavna {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Sick Leave,Bolniški dopust
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,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
 DocType: Warehouse,PIN,PIN
 DocType: Sales Invoice,Base Change Amount (Company Currency),Osnovna Sprememba Znesek (družba Valuta)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +313,No accounting entries for the following warehouses,Ni vknjižbe za naslednjih skladiščih
-apps/erpnext/erpnext/projects/doctype/project/project.js +102,Save the document first.,Shranite dokument na prvem mestu.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +314,No accounting entries for the following warehouses,Ni vknjižbe za naslednjih skladiščih
+apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Shranite dokument na prvem mestu.
 DocType: Account,Chargeable,Obračuna
 DocType: Company,Change Abbreviation,Spremeni Kratica
 DocType: Expense Claim Detail,Expense Date,Expense Datum
@@ -3577,10 +3626,9 @@
 DocType: Purchase Invoice,Recurring Print Format,Ponavljajoči 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,Pričakuje Dostava datum ne more biti pred narocilo Datum
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,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"
 DocType: Appraisal,Appraisal Template,Cenitev Predloga
 DocType: Item Group,Item Classification,Postavka Razvrstitev
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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
@@ -3590,8 +3638,8 @@
 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 +940,Please select {0} first,"Prosimo, izberite {0} najprej"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +749,Batch {0} of Item {1} has expired.,Serija {0} od Postavka {1} je potekla.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +953,Please select {0} first,"Prosimo, izberite {0} najprej"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +757,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
@@ -3608,10 +3656,10 @@
 {% 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 +92,Warehouse not found in the system,Skladišče ni mogoče najti v sistemu
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +106,This Month's Summary,Povzetek tega meseca je
+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
 DocType: Quality Inspection Reading,Quality Inspection Reading,Kakovost Inšpekcijski Reading
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Freeze Zaloge Starejši Than` mora biti manjša od% d dni.
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Zamrzni zaloge starejše od` mora biti manjša od %d dni.
 DocType: Tax Rule,Purchase Tax Template,Nakup Davčna Template
 ,Project wise Stock Tracking,Projekt pametno Stock Tracking
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Obstaja vzdrževanje Urnik {0} proti {0}
@@ -3619,21 +3667,22 @@
 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 +87,Please set Next Depreciation Date,"Prosim, nastavite Naslednja Amortizacija Datum"
-DocType: Payment Gateway,Payment Gateway,Plačilo Gateway
 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,Nove 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 +378,Operation Time must be greater than 0 for Operation {0},"Delovanje Čas mora biti večja od 0, za obratovanje {0}"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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/accounts/doctype/account/account.py +170,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)"
 DocType: Program,Program Abbreviation,Kratica programa
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,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: Appraisal,Start Date,Datum začetka
@@ -3649,21 +3698,22 @@
 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 +27,Transaction currency must be same as Payment Gateway currency,Transakcijski valuta mora biti enaka kot vplačilo valuto
+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:
 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
 DocType: Workstation,Operating Costs,Obratovalni stroški
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,"Ukrep, če skupna mesečna Proračun Prekoračitev"
 DocType: Purchase Invoice,Submit on creation,Predloži na ustvarjanje
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +432,Currency for {0} must be {1},Valuta za {0} mora biti {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +435,Currency for {0} must be {1},Valuta za {0} mora biti {1}
 DocType: Asset,Disposal Date,odstranjevanje Datum
 DocType: Employee Leave Approver,Employee Leave Approver,Zaposleni Leave odobritelj
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,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 +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/crm/doctype/opportunity/opportunity.py +79,"Cannot declare as lost, because Quotation has been made.","Ne more razglasiti kot izgubljena, ker je bil predračun postavil."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Nakup Master Manager
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +429,Production Order {0} must be submitted,Proizvodnja naročite {0} je treba predložiti
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +434,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
@@ -3673,25 +3723,27 @@
 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/accounts/report/general_ledger/general_ledger.py +181,Totals,Pri zaokrožanju
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,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 +113,Warning: Leave application contains following block dates,Opozorilo: Pustite prijava vsebuje naslednje datume blok
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +120,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.
+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 +181,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/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 +793,All records are synced.,Vse evidence se sinhronizirajo.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +781,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
 DocType: Cost Center,Cost Center Name,Stalo Ime Center
@@ -3710,21 +3762,20 @@
 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/selling/doctype/quotation/quotation.py +49,Cannot set as Lost as Sales Order is made.,"Ni mogoče nastaviti kot izgubili, kot je narejena Sales Order."
-DocType: Student Applicant,Mother's Name,Materinski Ime
 DocType: Request for Quotation Item,Supplier Part No,Šifra dela dobavitelj
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +348,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"ne more odbiti, če je kategorija za &quot;vrednotenje&quot; ali &quot;Vaulation in Total&quot;"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Received From,Prejela od
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Received From,Prejela od
 DocType: Lead,Converted,Pretvorjena
 DocType: Item,Has Serial No,Ima Serijska št
 DocType: Employee,Date of Issue,Datum izdaje
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{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 +93,Row {0}: Hours value must be greater than zero.,Vrstica {0}: Ure vrednost mora biti večja od nič.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +117,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
 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 +172,{0} {1} does not exist,{0} {1} ne obstaja
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +175,{0} {1} does not exist,{0} {1} ne obstaja
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,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 +72,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
@@ -3733,13 +3784,14 @@
 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/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
 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 +109,Electrical,Električno
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,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 +318,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}
@@ -3747,7 +3799,7 @@
 DocType: Item,Customer Code,Koda za stranke
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +210,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 +292,Debit To account must be a Balance Sheet account,Bremenitev računa mora biti bilanca računa
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To account must be a Balance Sheet account,Bremenitev računa mora biti bilanca računa
 DocType: Buying Settings,Naming Series,Poimenovanje serije
 DocType: Leave Block List,Leave Block List Name,Pustite Ime Block List
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Zaloga Sredstva
@@ -3759,11 +3811,11 @@
 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 +301,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 +313,Salary Slip of employee {0} already created for time sheet {1},Plača Slip delavca {0} že ustvarili za časa stanja {1}
 DocType: Sales Order Item,Ordered Qty,Naročeno Kol
-apps/erpnext/erpnext/stock/doctype/item/item.py +673,Item {0} is disabled,Postavka {0} je onemogočena
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,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 +838,BOM does not contain any stock item,BOM ne vsebuje nobenega elementa zaloge
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +809,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.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Ustvarjajo plače kombineže
@@ -3771,23 +3823,24 @@
 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)
-apps/erpnext/erpnext/stock/doctype/item/item.py +485,Row #{0}: Please set reorder quantity,Vrstica # {0}: Prosim nastavite naročniško količino
+DocType: Sales Invoice Timesheet,Billing Hours,zaračunavanje storitev ure
+apps/erpnext/erpnext/stock/doctype/item/item.py +487,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 +62,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
+DocType: Payment Entry,Allocate Payment Amount,Dodeli znesek plačila
 DocType: Employee External Work History,Salary,Plača
 DocType: Serial No,Delivery Document Type,Dostava Document Type
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Predložiti vse plačilne liste za zgoraj izbranih kriterijih
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} Sinhronizirane postavke
 DocType: Sales Order,Partly Delivered,Delno Delivered
-DocType: Sales Invoice,Existing Customer,Obstoječi kupec
 DocType: Email Digest,Receivables,Terjatve
+DocType: Lead Source,Lead Source,Vodilni Vir
 DocType: Customer,Additional information regarding the customer.,Dodatne informacije o kupcu.
 DocType: Quality Inspection Reading,Reading 5,Branje 5
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +38,Campaign Name is required,Je potrebno Ime akcija
 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"
@@ -3795,25 +3848,24 @@
 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 +129,BOM and Manufacturing Quantity are required,BOM and Manufacturing Količina so obvezna
+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/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Staranje Razpon 2
 DocType: SG Creation Tool Course,Max Strength,Max moč
-DocType: Bank Reconciliation Detail,Amount,Znesek
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM nadomesti
-,Sales Analytics,Prodajna Analytics
+,Sales Analytics,Prodajna analitika
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +113,Available {0},Na voljo {0}
 DocType: Manufacturing Settings,Manufacturing Settings,Proizvodne Nastavitve
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Postavitev Email
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +96,Please enter default currency in Company Master,Vnesite privzeto valuto v podjetju Master
 DocType: Stock Entry Detail,Stock Entry Detail,Stock Začetek Detail
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +100,Daily Reminders,Dnevni opomniki
+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/account/account_tree.js +23,New Account Name,New Ime računa
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,"Surovin, dobavljenih Stroški"
-DocType: Selling Settings,Settings for Selling Module,Nastavitve za prodajo Module
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Customer Service,Storitev za stranke
+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
 DocType: Item Customer Detail,Item Customer Detail,Postavka Detail Stranka
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Ponudba kandidat Job.
@@ -3822,8 +3874,9 @@
 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
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Privzeto Delo v skladišču napredku
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1570,Total nos of serial no is not equal to quantity.,Skupaj nos z zaporednimi številkami ni enaka količini.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1594,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,Posodobitev Series Število
@@ -3831,9 +3884,10 @@
 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 +82,Engineer,Inženir
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,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 +370,Item Code required at Row No {0},Oznaka zahteva pri Row št {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +398,Item Code required at Row No {0},Oznaka zahteva pri Row št {0}
 DocType: Sales Partner,Partner Type,Partner Type
 DocType: Purchase Taxes and Charges,Actual,Actual
 DocType: Authorization Rule,Customerwise Discount,Customerwise Popust
@@ -3849,16 +3903,18 @@
 DocType: BOM,Raw Material Cost,Raw Material Stroški
 DocType: Item Reorder,Re-Order Level,Ponovno naročila ravni
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Vnesite predmete in načrtovano kol, za katere želite, da dvig proizvodnih nalogov ali prenos surovin za analizo."
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +55,Part-time,Krajši delovni čas
+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
 DocType: Employee,Applicable Holiday List,Velja Holiday Seznam
 DocType: Employee,Cheque,Ček
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Serija Posodobljeno
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +57,Series Updated,Serija Posodobljeno
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Vrsta poročila je obvezna
 DocType: Item,Serial Number Series,Serijska številka serije
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Skladišče je obvezna za borzo postavki {0} v vrstici {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Trgovina na drobno in na debelo
 DocType: Issue,First Responded On,Najprej odgovorila
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross Uvrstitev točke v več skupinah
+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 +87,Clearance Date updated,Potrditev Datum posodobljeni
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Uspešno usklajeno
@@ -3872,8 +3928,8 @@
 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 +513,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 predlogo za nakup transakcij.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,"Napotitev datum in čas objavljate, je obvezna"
+apps/erpnext/erpnext/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."
 DocType: Period Closing Voucher,Period Closing Voucher,Obdobje Closing bon
@@ -3882,8 +3938,8 @@
 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/stock/doctype/stock_entry/stock_entry.py +158,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,&quot;Obvestilo o e-poštni naslovi&quot; niso določeni za ponavljajoče% s
+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"
 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
@@ -3891,23 +3947,22 @@
 DocType: Customer Group,Parent Customer Group,Parent Customer Group
 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 +180,Notice Period,Odpovedni rok
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,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 +4,New Sales Person Name,Ime New Sales oseba
 DocType: Packing Slip,Gross Weight UOM,Bruto Teža UOM
-DocType: Email Digest,Receivables / Payables,Terjatve / obveznosti
 DocType: Delivery Note Item,Against Sales Invoice,Za račun
 DocType: Bin,Reserved Qty for Production,Rezervirano Količina za proizvodnjo
 DocType: Asset,Frequency of Depreciation (Months),Pogostost amortizacijo (meseci)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +469,Credit Account,Credit račun
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Credit Account,Credit račun
 DocType: Landed Cost Item,Landed Cost Item,Pristali Stroški Postavka
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +55,Show zero values,Prikaži ničelnimi vrednostmi
+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
 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 +647,Please specify Attribute Value for attribute {0},"Prosimo, navedite Lastnost vrednost za atribut {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},"Prosimo, navedite Lastnost vrednost za atribut {0}"
 DocType: Item,Default Warehouse,Privzeto Skladišče
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +39,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
@@ -3929,19 +3984,22 @@
 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
-DocType: Sales Invoice,Cold Calling,Cold Calling
 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: Maintenance Schedule Item,Half Yearly,Polletne
 DocType: Lead,Blog Subscriber,Blog Subscriber
+DocType: Guardian,Alternate Number,namestnik Število
 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.
+DocType: Stock Reconciliation Item,Quantity Difference,količina Razlika
 apps/erpnext/erpnext/config/hr.py +253,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 +141,Set as Lost,Nastavi kot Lost
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,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 +5,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
 DocType: Supplier,Credit Days Based On,Kreditne dni na podlagi
@@ -3953,11 +4011,10 @@
 ,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 +941,Select or add new customer,Izberite ali dodati novo stranko
+apps/erpnext/erpnext/accounts/page/pos/pos.js +930,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 +5,This is based on the attendance of this Employee,Ta temelji na prisotnosti tega zaposlenega
-DocType: Sales Invoice,Frequency,frekvenca
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +463,Debit Account,Debetni račun
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,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)
@@ -3966,27 +4023,27 @@
 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 +210,Supplier Quotation {0} created,Dobavitelj za predračun {0} ustvaril
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +208,Supplier Quotation {0} created,Dobavitelj za predračun {0} ustvaril
 apps/erpnext/erpnext/accounts/report/financial_statements.py +90,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 +173,Employee Benefits,Zaslužki zaposlencev
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,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 +228,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 +232,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 +499,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 +500,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čno 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 +1007,Price List not found or disabled,Cenik ni mogoče najti ali onemogočena
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1008,Price List not found or disabled,Cenik ni mogoče najti ali onemogočena
 DocType: Expense Claim,Approved,Odobreno
 DocType: Pricing Rule,Price,Cena
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +244,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 +256,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
@@ -3997,12 +4054,12 @@
 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 +259,Please select Employee Record first.,"Prosimo, izberite Employee Snemaj prvi."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +266,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 +190,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 +235,Please enter Expense Account,Vnesite Expense račun
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,Please enter Expense Account,Vnesite Expense račun
 DocType: Account,Stock,Stock
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,"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 +976,"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
@@ -4017,9 +4074,10 @@
 DocType: Asset Movement,Transaction Date,Transakcijski Datum
 DocType: Production Plan Item,Planned Qty,Načrtovano Kol
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,Skupna davčna
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,For Quantity (Manufactured Qty) is mandatory,Za Količina (Izdelano Kol) obvezna
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,For Quantity (Manufactured Qty) is mandatory,Za Količina (Izdelano Kol) obvezna
 DocType: Stock Entry,Default Target Warehouse,Privzeto Target Skladišče
 DocType: Purchase Invoice,Net Total (Company Currency),Net Total (družba Valuta)
+apps/erpnext/erpnext/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 +78,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: Production Order,Actual Start Date,Dejanski datum začetka
@@ -4034,9 +4092,11 @@
 DocType: Warranty Claim,If different than customer address,Če je drugačen od naslova kupca
 DocType: BOM Operation,BOM Operation,BOM Delovanje
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Na prejšnje vrstice Znesek
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +226,Transfer Asset,prenos sredstev
+DocType: Student,Home Address,Domači naslov
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +227,Transfer Asset,prenos sredstev
 DocType: POS Profile,POS Profile,POS profila
 apps/erpnext/erpnext/config/schools.py +33,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 +129,"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
@@ -4046,8 +4106,8 @@
 DocType: Assessment,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 +765,Material to Supplier,Material za dobavitelja
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +189,Excise Invoice,Trošarina Račun
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,Material to Supplier,Material za dobavitelja
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,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
@@ -4057,7 +4117,7 @@
 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/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 +136,Credit Card,Credit Card
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,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.
 DocType: Purchase Invoice,Next Date,Naslednja Datum
@@ -4065,6 +4125,7 @@
 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: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Tukaj lahko vzdržujejo družinske podrobnosti, kot so ime in poklic staršev, zakonca in otrok"
+DocType: Academic Term,Term End Date,Izraz Končni datum
 DocType: Hub Settings,Seller Name,Prodajalec Name
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Davki in dajatve Odbitek (družba Valuta)
 DocType: Item Group,General Settings,Splošne nastavitve
@@ -4076,7 +4137,7 @@
 DocType: Customer,Commission Rate,Komisija Rate
 apps/erpnext/erpnext/stock/doctype/item/item.js +261,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 +115,"Payment Type must be one of Receive, Pay and Internal Transfer","Plačilo Tip mora biti eden od Prejemanje, plačati in notranji prenos"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +118,"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/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Košarica je Prazna
 DocType: Production Order,Actual Operating Cost,Dejanski operacijski stroškov
@@ -4091,10 +4152,10 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,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 +92,Designer,Oblikovalec
+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
 DocType: Serial No,Delivery Details,Dostava Podrobnosti
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +469,Cost Center is required in row {0} in Taxes table for type {1},"Stroškov Center, je potrebno v vrstici {0} v Davki miza za tip {1}"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +472,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
 ,Item-wise Purchase Register,Element-pametno Nakup Registriraj se
 DocType: Batch,Expiry Date,Rok uporabnosti
@@ -4104,12 +4165,12 @@
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Master projekt.
 apps/erpnext/erpnext/controllers/status_updater.py +174,"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 +417, (Half Day),(Poldnevni)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425, (Half Day),(Poldnevni)
 DocType: Supplier,Credit Days,Kreditne dnevi
 DocType: Leave Type,Is Carry Forward,Se Carry Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +740,Get Items from BOM,Pridobi Artikle iz BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +711,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 +549,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/controllers/accounts_controller.py +552,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
diff --git a/erpnext/translations/sq.csv b/erpnext/translations/sq.csv
index 2549921..7950f71 100644
--- a/erpnext/translations/sq.csv
+++ b/erpnext/translations/sq.csv
@@ -18,11 +18,10 @@
 DocType: Sales Partner,Dealer,Tregtar
 DocType: Employee,Rented,Me qira
 DocType: Purchase Order,PO-,poli-
-apps/erpnext/erpnext/accounts/report/financial_statements.py +19,Start Year {0} not found.,Filloni Vitin {0} nuk u gjet.
 DocType: POS Profile,Applicable for User,E aplikueshme për anëtarët
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +191,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Ndaloi Rendit prodhimit nuk mund të anulohet, tapën atë më parë për të anulluar"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +197,Do you really want to scrap this asset?,A jeni të vërtetë doni për të hequr këtë pasuri?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +17,Select Default Supplier,Zgjidh Default Furnizuesi
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +192,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Ndaloi Rendit prodhimit nuk mund të anulohet, tapën atë më parë për të anulluar"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +198,Do you really want to scrap this asset?,A jeni të vërtetë doni për të hequr këtë pasuri?
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Zgjidh Default Furnizuesi
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Valuta është e nevojshme për Lista Çmimi {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Do të llogaritet në transaksion.
 DocType: Address,County,qark
@@ -42,46 +41,45 @@
 DocType: Sales Invoice,Customer Name,Emri i Klientit
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +126,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 +180,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 +183,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 +148,Series Updated Successfully,Seria Përditësuar sukses
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +149,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
-DocType: Quality Inspection Reading,Parameter,Parametër
 apps/erpnext/erpnext/projects/doctype/project/project.py +54,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 +239,New Leave Application,New Pushimi Aplikimi
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,New Leave Application,New Pushimi Aplikimi
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +20,Attendance Record {0} exists against Student {1} for Course Schedule {2},Pjesëmarrja Record {0} ekziston kundër Student {1} për kursit Listën {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Bank Draft,Draft Bank
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,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
 DocType: Academic Term,Academic Term,Term akademik
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +13,Material,material
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Quantity,Sasi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +511,Accounts table cannot be blank.,Llogaritë tabelë nuk mund të jetë bosh.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +616,Quantity,Sasi
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +512,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)
 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/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 +142,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
-DocType: Purchase Invoice,Monthly,Mujor
 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/buying/doctype/purchase_order/purchase_order.js +771,Invoice,Faturë
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +750,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 +198,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} nuk përputhet me {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Row # {0}:
+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 +127,Please select Price List,"Ju lutem, përzgjidhni Lista e Çmimeve"
@@ -112,8 +110,8 @@
 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 +589,Get items from,Të marrë sendet nga
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +382,Stock cannot be updated against Delivery Note {0},Stock nuk mund të rifreskohet kundër dorëzimit Shënim {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Të marrë sendet nga
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,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ë
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Ushqimore
@@ -122,7 +120,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 +156,Salary Structure Missing,Struktura Paga Missing
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,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
@@ -130,10 +128,11 @@
 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 +156,Credit limit has been crossed for customer {0} {1}/{2},Kufiri i kreditit ka kaluar për konsumator {0} {1} / {2}
-apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;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 +189,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"
 DocType: Tax Rule,Tax Type,Lloji Tatimore
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +144,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}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,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/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
@@ -143,18 +142,17 @@
 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 +165,Opening,Hapje
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,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/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Customer&gt; Group Customer&gt; Territory
 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.
 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ë
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Company first,Ju lutemi zgjidhni kompania e parë
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,Please select Company first,Ju lutemi zgjidhni kompania e parë
 DocType: Employee Education,Under Graduate,Nën diplomuar
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Target Në
 DocType: BOM,Total Cost,Kostoja Totale
@@ -164,7 +162,7 @@
 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
 DocType: Purchase Invoice Item,Is Fixed Asset,Është i aseteve fikse
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Available qty is {0}, you need {1}","Qty në dispozicion është {0}, ju duhet {1}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +225,"Available qty is {0}, you need {1}","Qty në dispozicion është {0}, ju duhet {1}"
 DocType: Expense Claim Detail,Claim Amount,Shuma Claim
 DocType: Employee,Mr,Mr
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Furnizuesi Lloji / Furnizuesi
@@ -173,25 +171,26 @@
 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: Assessment Result,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 +171,Annual Salary,Paga vjetore
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Annual Salary,Paga vjetore
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Stock Shpenzimet
-apps/erpnext/erpnext/accounts/report/financial_statements.py +22,End Year {0} not found.,Fundi Viti {0} nuk u gjet.
 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}
 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 +130,At least one mode of payment is required for POS invoice.,Të paktën një mënyra e pagesës është e nevojshme për POS faturë.
 DocType: Products Settings,Show Products as a List,Shfaq Produkte si një Lista
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Shkarko template, plotësoni të dhënat e duhura dhe të bashkëngjitni e tanishëm. Të gjitha datat dhe punonjës kombinim në periudhën e zgjedhur do të vijë në template, me të dhënat ekzistuese frekuentimit"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +451,Item {0} is not active or end of life has been reached,Item {0} nuk është aktiv apo fundi i jetës është arritur
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +456,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/controllers/accounts_controller.py +614,"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/controllers/accounts_controller.py +617,"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 +166,Settings for HR Module,Cilësimet për HR Module
 DocType: SMS Center,SMS Center,SMS Center
 DocType: Sales Invoice,Change Amount,Ndryshimi Shuma
@@ -203,13 +202,13 @@
 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 +147,Execution,Ekzekutim
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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/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}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,Cost Center {0} does not belong to Company {1},Kosto Qendra {0} nuk i përket kompanisë {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +100,Cost Center {0} does not belong to Company {1},Kosto Qendra {0} nuk i përket kompanisë {1}
 DocType: Customer,Individual,Individ
 DocType: Interest,Academics User,akademikët User
 DocType: Cheque Print Template,Amount In Figure,Shuma Në Figurën
@@ -225,30 +224,32 @@
 DocType: Production Planning Tool,Sales Orders,Sales Urdhërat
 DocType: Purchase Taxes and Charges,Valuation,Vlerësim
 ,Purchase Order Trends,Rendit Blerje Trendet
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,The request for quotation can be accessed by clicking on the following link,Kërkesa për kuotim mund të arrihen duke klikuar në linkun e mëposhtëm
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,Alokimi i lë për vitin.
 DocType: SG Creation Tool Course,SG Creation Tool Course,SG Kursi Krijimi Tool
 DocType: Student Group Creation Tool,Leave blank if you wish to fetch all courses for selected academic term,Lini bosh qoftë se ju dëshironi për të shkoj të marr të gjitha kurset për termin akademik të zgjedhur
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,Insufficient Stock,Stock pamjaftueshme
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227,Insufficient Stock,Stock pamjaftueshme
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Planifikimi Disable kapaciteteve dhe Ndjekja Koha
+DocType: Email Digest,New Sales Orders,Shitjet e reja Urdhërat
 DocType: Bank Reconciliation,Bank Account,Llogarisë Bankare
 DocType: Leave Type,Allow Negative Balance,Lejo bilancit negativ
 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/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} does not belong to Company {1},Llogaria {0} nuk i përket kompanisë {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +86,Account {0} does not belong to Company {1},Llogaria {0} nuk i përket kompanisë {1}
 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}
 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
 DocType: Course Schedule,Instructor Name,instruktor Emri
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,For Warehouse is required before Submit,Për Magazina është e nevojshme para se të Submit
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,For Warehouse is required before Submit,Për Magazina është e nevojshme para se të Submit
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Marrë më
 DocType: Sales Partner,Reseller,Reseller
 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 +1436,"LocalStorage is full , did not save","LocalStorage është e plotë, nuk ka shpëtuar"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1460,"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}
@@ -261,18 +262,19 @@
 apps/erpnext/erpnext/templates/generators/item.html +78,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 +5,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/leave_application/leave_application.py +206,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/leave_application/leave_application.py +213,Only the selected Leave Approver can submit this Leave Application,Vetëm aprovuesi zgjedhur Pushimi mund ta paraqesë këtë kërkesë lini
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Lehtësimin Data duhet të jetë më i madh se data e bashkimit
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Leaves per Year,Lë në vit
+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 +103,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}
+DocType: Email Digest,Profit & Loss,Fitimi dhe Humbja
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,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 +435,Leave Blocked,Lini Blocked
-apps/erpnext/erpnext/stock/doctype/item/item.py +669,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 +443,Leave Blocked,Lini Blocked
+apps/erpnext/erpnext/stock/doctype/item/item.py +671,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 +83,Annual,Vjetor
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +86,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
@@ -280,20 +282,22 @@
 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
 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 +91,Software Developer,Software Developer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Minimale Rendit Qty
 DocType: Pricing Rule,Supplier Type,Furnizuesi Type
 DocType: Scheduling Tool,Course Start Date,Sigurisht Data e fillimit
 DocType: Item,Publish in Hub,Publikojë në Hub
+DocType: Student Admission,Student Admission,Pranimi Student
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is cancelled,Item {0} është anuluar
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Material Request,Kërkesë materiale
+apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} is cancelled,Item {0} është anuluar
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +823,Material Request,Kërkesë materiale
 DocType: Bank Reconciliation,Update Clearance Date,Update Pastrimi Data
 apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +28,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 +328,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Item {0} nuk u gjet në &#39;e para materiale të furnizuara &quot;tryezë në Rendit Blerje {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +333,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Item {0} nuk u gjet në &#39;e para materiale të furnizuara &quot;tryezë në Rendit Blerje {1}
 DocType: Employee,Relation,Lidhje
 DocType: Shipping Rule,Worldwide Shipping,Shipping në mbarë botën
+DocType: Student Guardian,Mother,nënë
 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
@@ -309,20 +313,21 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +130,Please select Charge Type first,"Ju lutem, përzgjidhni Ngarkesa Lloji i parë"
 DocType: Student Group Student,Student Group Student,Student Group Student
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Fundit
+DocType: Email Digest,New Quotations,Citate të reja
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Aprovuesi i parë Leave në listë do të jetë vendosur si default Leave aprovuesi
 DocType: Tax Rule,Shipping County,Shipping County
 apps/erpnext/erpnext/config/desktop.py +158,Learn,Mëso
 DocType: Asset,Next Depreciation Date,Zhvlerësimi Data Next
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Aktiviteti Kosto për punonjës
 DocType: Accounts Settings,Settings for Accounts,Cilësimet për Llogaritë
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +626,Supplier Invoice No exists in Purchase Invoice {0},Furnizuesi Fatura Nuk ekziston në Blerje Faturë {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +629,Supplier Invoice No exists in Purchase Invoice {0},Furnizuesi Fatura Nuk ekziston në Blerje Faturë {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Manage shitjes person Tree.
 DocType: Job Applicant,Cover Letter,Cover Letter
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Çeqet e papaguara dhe Depozitat për të pastruar
 DocType: Item,Synced With Hub,Synced Me Hub
 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 +348,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 +86,Circular Reference Error,Qarkorja Referenca Gabim
@@ -334,15 +339,16 @@
 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 +806,Delivery Note,Ofrimit Shënim
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +800,Delivery Note,Ofrimit Shënim
 apps/erpnext/erpnext/config/learn.py +87,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 +233,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/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/setup/doctype/email_digest/email_digest.py +104,Summary for this week and pending activities,Përmbledhje për këtë javë dhe aktivitete në pritje
+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"
 DocType: Employee,Company Email,Kompania Email
@@ -354,27 +360,28 @@
 apps/erpnext/erpnext/config/hr.py +186,"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
-apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Blerje Fatura nuk mund të bëhet kundër një aktiv ekzistues {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +554,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 +54,{0} already allocated for Employee {1} for period {2} to {3},{0} ndarë tashmë për punonjësit {1} për periudhën {2} në {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +812,Select Item,Zgjidh Item
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +791,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 \
 					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 +142,Purchase Invoice {0} is already submitted,Blerje Fatura {0} është dorëzuar tashmë
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch Nuk duhet të jetë i njëjtë si {1} {2}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +143,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.
 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 +342,Please see attachment,Ju lutem shikoni shtojcën
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,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 +19,Setup Already Complete!!,Setup Tashmë komplet !!
 ,Finished Goods,Mallrat përfunduar
 DocType: Delivery Note,Instructions,Udhëzime
 DocType: Quality Inspection,Inspected By,Inspektohen nga
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Furnizuesi&gt; Furnizuesi lloji
 DocType: Maintenance Visit,Maintenance Type,Mirëmbajtja Type
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serial Asnjë {0} nuk i përket dorëzimit Shënim {1}
 apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Shto Items
@@ -388,29 +395,29 @@
 DocType: Currency Exchange,Currency Exchange,Currency Exchange
 DocType: Purchase Invoice Item,Item Name,Item Emri
 DocType: Authorization Rule,Approving User  (above authorized value),Miratimi përdoruesin (mbi vlerën e autorizuar)
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Bilanci krediti
+DocType: Email Digest,Credit Balance,Bilanci krediti
 DocType: Employee,Widowed,Ve
 DocType: Request for Quotation,Request for Quotation,Kërkesa për kuotim
 DocType: Salary Slip Timesheet,Working Hours,Orari i punës
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Ndryshimi filluar / numrin e tanishëm sekuencë e një serie ekzistuese.
 apps/erpnext/erpnext/accounts/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 +736,Purchase Return,Kthimi Blerje
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +715,Purchase Return,Kthimi Blerje
 ,Purchase Register,Blerje Regjistrohu
 DocType: 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 +202,{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 +209,{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 +143,Reason for losing,Arsyeja për humbjen
-apps/erpnext/erpnext/accounts/utils.py +239,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 +163,Reason for losing,Arsyeja për humbjen
+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
 DocType: Announcement,Receiver,marrës
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation është i mbyllur në datat e mëposhtme sipas Holiday Lista: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Mundësitë
 DocType: Employee,Single,I vetëm
 DocType: 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 +225,Please enter Cost Center,Ju lutemi shkruani Qendra Kosto
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,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
@@ -423,26 +430,26 @@
 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
 DocType: Account,Is Group,Është grup
+DocType: Email Digest,Pending Purchase Orders,Në pritje urdhëron Blerje
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Automatikisht Set Serial Nos bazuar në FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Kontrolloni Furnizuesi faturës Numri Unike
 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 +102,Non Profit,Non Profit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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: Stock Reconciliation Item,Do not include symbols (ex. $),A nuk përfshin simbole (ex. $)
 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 +638,Attribute {0} selected multiple times in Attributes Table,Atribut {0} zgjedhur disa herë në atributet Tabelën
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Atribut {0} zgjedhur disa herë në atributet Tabelën
 DocType: HR Settings,Employee record is created using selected field. ,Rekord punonjës është krijuar duke përdorur fushën e zgjedhur.
 DocType: Sales Order,Not Applicable,Nuk aplikohet
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Mjeshtër pushime.
 DocType: Request for Quotation Item,Required Date,Data e nevojshme
 DocType: Delivery Note,Billing Address,Faturimi Adresa
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +862,Please enter Item Code.,Ju lutemi shkruani kodin artikull.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +847,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"
@@ -456,12 +463,12 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Të letrave me vlerë dhe depozita
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Gjithsej lë alokuara është i detyrueshëm
 DocType: Job Opening,Description of a Job Opening,Përshkrimi i një Hapja Job
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Pending activities for today,Aktivitetet në pritje për sot
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Aktivitetet në pritje për sot
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Pjesëmarrja rekord.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Komponenti Paga për pasqyrë e mungesave pagave bazë.
 DocType: Sales Order Item,Used for Production Plan,Përdoret për Planin e prodhimit
 DocType: Manufacturing Settings,Time Between Operations (in mins),Koha Midis Operacioneve (në minuta)
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +92,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} Buxheti për Llogarinë {1} kundër Qendra Kosto {2} është {3}. Ajo do të kalojë nga {4}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +95,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} Buxheti për Llogarinë {1} kundër Qendra Kosto {2} është {3}. Ajo do të kalojë nga {4}
 DocType: Customer,Buyer of Goods and Services.,Blerësi i mallrave dhe shërbimeve.
 DocType: Journal Entry,Accounts Payable,Llogaritë e pagueshme
 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
@@ -469,16 +476,16 @@
 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/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 +86,Administrative Officer,Zyrtar Administrativ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,Zyrtar Administrativ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +23,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 +319,Please select Company,"Ju lutem, përzgjidhni Company"
-DocType: Stock Entry,Difference Account,Llogaria Diferenca
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +309,Please select Company,"Ju lutem, përzgjidhni Company"
+DocType: Stock Entry Detail,Difference Account,Llogaria Diferenca
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,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 +398,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 +399,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 +530,"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 +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"
 DocType: Shipping Rule,Net Weight,Net Weight
 DocType: Employee,Emergency Phone,Urgjencës Telefon
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +28,Buy,blej
@@ -486,7 +493,7 @@
 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 +1563,Serial no item cannot be a fraction,Serial asnjë artikull nuk mund të jetë një pjesë
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1587,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
@@ -495,13 +502,14 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Account {0} does not belong to company: {1},Llogaria {0} nuk i përkasin kompanisë: {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation already used for another company,Shkurtesa e përdorur tashmë për një kompani tjetër
 DocType: Selling Settings,Default Customer Group,Gabim Grupi Klientit
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Supplier is required against Payable account {0},Furnizuesi është i detyruar kundrejt llogarisë pagueshme {0}
 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
 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 +313,Reference No and Reference Date is mandatory for Bank transaction,I Referencës dhe Referenca Date është e detyrueshme për transaksion Bank
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +316,Reference No and Reference Date is mandatory for Bank transaction,I Referencës dhe Referenca Date është e detyrueshme për transaksion Bank
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Add / Edit taksat dhe tatimet
 DocType: Purchase Invoice,Supplier Invoice No,Furnizuesi Fatura Asnjë
 DocType: Territory,For reference,Për referencë
@@ -512,7 +520,6 @@
 DocType: Installation Note Item,Installation Note Item,Instalimi Shënim Item
 DocType: Production Plan Item,Pending Qty,Në pritje Qty
 DocType: Budget,Ignore,Injoroj
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Item Code&gt; Item Group&gt; Markë
 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/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
@@ -523,11 +530,11 @@
 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/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 +28,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 +19,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 +707,Make Sales Order,Bëni Sales Order
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +701,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
@@ -543,7 +550,8 @@
 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 +734,Sales Return,Shitjet Kthehu
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +728,Sales Return,Shitjet Kthehu
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +91,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)
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Baza e të dhënave të konsumatorëve potencial.
@@ -552,14 +560,13 @@
 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 +212,Opening (Cr),Hapja (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +795,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,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 +237,Allocated amount can not be negative,Shuma e ndarë nuk mund të jetë negative
+apps/erpnext/erpnext/stock/doctype/item/item.py +797,Default Unit of Measure for Item {0} cannot be changed directly because 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
 DocType: Purchase Order Item,Billed Amt,Faturuar Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Një Magazina logjik kundër të cilit janë bërë të hyra të aksioneve.
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Sales Fatura pasqyrë e mungesave
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},Referenca Nuk &amp; Referenca Data është e nevojshme për {0}
-DocType: Sales Invoice,Customer's Vendor,Vendor konsumatorit
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Proposal Writing,Propozimi Shkrimi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,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"
@@ -568,13 +575,14 @@
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,Koha Tracking
 DocType: Fiscal Year Company,Fiscal Year Company,Fiskale Viti i kompanisë
 DocType: Packing Slip Item,DN Detail,DN Detail
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +257,Already supplier quotation has created,Tashmë citat furnizuesi ka krijuar
 DocType: Timesheet,Billed,Faturuar
 DocType: Batch,Batch Description,Batch Përshkrim
+apps/erpnext/erpnext/accounts/utils.py +685,"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 +733,View Offline Records,Shiko Offline Records
+apps/erpnext/erpnext/accounts/page/pos/pos.js +715,View Offline Records,Shiko Offline Records
+DocType: Student,Sibling Details,Details vëlla
 DocType: Employee,Reason for Resignation,Arsyeja për dorëheqjen
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,Template për vlerësimit të punës.
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,Fatura / Journal Hyrja Detajet
@@ -588,7 +596,7 @@
 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
 DocType: Employee,Passport Number,Pasaporta Numri
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Manager,Menaxher
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,Menaxher
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,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ë
@@ -597,10 +605,11 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter email address,Ju lutemi shkruani adresën e-mail
 DocType: Production Order Operation,In minutes,Në minuta
 DocType: Issue,Resolution Date,Rezoluta Data
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +299,Timesheet created:,Pasqyrë e mungesave krijuar:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +715,Please set default Cash or Bank account in Mode of Payment {0},Ju lutemi të vendosur Cash parazgjedhur apo llogari bankare në mënyra e pagesës {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +300,Timesheet created:,Pasqyrë e mungesave krijuar:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +772,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
 DocType: Selling Settings,Customer Naming By,Emërtimi Customer Nga
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,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
 DocType: Depreciation Schedule,Depreciation Amount,Amortizimi Shuma
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,Convert të Grupit
 DocType: Activity Cost,Activity Type,Aktiviteti Type
@@ -625,6 +634,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,fund
 DocType: Pricing Rule,Sales Manager,Sales Manager
 DocType: Salary Structure Employee,Base,bazë
+DocType: Timesheet,Total Billed Hours,Orët totale faturuara
 DocType: Journal Entry,Write Off Amount,Shkruani Off Shuma
 DocType: Journal Entry,Bill No,Bill Asnjë
 DocType: Company,Gain/Loss Account on Asset Disposal,Llogaria Gain / Humbja në hedhjen e Aseteve
@@ -639,11 +649,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +9,Pre Sales,Sales para
 DocType: Purchase Receipt,Other Details,Detaje të tjera
 DocType: Account,Accounts,Llogaritë
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Marketing,Marketing
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +227,Payment Entry is already created,Pagesa Hyrja është krijuar tashmë
+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,Pagesa Hyrja është krijuar tashmë
 DocType: Purchase Receipt Item Supplied,Current Stock,Stock tanishme
-apps/erpnext/erpnext/controllers/accounts_controller.py +538,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 +21,Preview Salary Slip,Preview Paga Shqip
+apps/erpnext/erpnext/controllers/accounts_controller.py +541,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 +38,Preview Salary Slip,Preview Paga Shqip
 DocType: Company,Deafult Cost Center,Qendra Kosto Deafult
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +48,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
@@ -652,7 +662,7 @@
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,"Ju lutem, përzgjidhni një Grup 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 +617,Item has variants.,Item ka variante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Item ka variante.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,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
@@ -672,7 +682,7 @@
 DocType: Purchase Order,Supply Raw Materials,Furnizimit të lëndëve të para
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,Data në të cilën fatura e ardhshme do të gjenerohet. Ajo është krijuar për të paraqitur.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Pasuritë e tanishme
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,{0} is not a stock Item,{0} nuk është një gjendje Item
+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 +169,Lead must be set if Opportunity is made from Lead,"Lead duhet të vendosen, nëse Opportunity është bërë nga Lead"
@@ -739,26 +749,25 @@
 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 +709,No Permission,Nuk ka leje
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +710,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}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +298,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 +542,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} duhet të dorëzohet
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} duhet të dorëzohet
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Asnjë punonjës gjetur
 DocType: Supplier Quotation,Stopped,U ndal
 DocType: Item,If subcontracted to a vendor,Në qoftë se nënkontraktuar për një shitës
 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.
 DocType: Warehouse,Tree Details,Tree Details
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Dërgo Tani
 ,Support Analytics,Analytics Mbështetje
 DocType: Item,Website Warehouse,Website Magazina
 DocType: Payment Reconciliation,Minimum Invoice Amount,Shuma minimale Faturë
 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/sales_invoice/sales_invoice.py +227,Timesheet {0} is already completed or cancelled,Pasqyrë e mungesave {0} është përfunduar tashmë ose anuluar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +259,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
@@ -774,13 +783,13 @@
 apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Orari i kursit
 DocType: Maintenance Visit,Completion Status,Përfundimi Statusi
 DocType: HR Settings,Enter retirement age in years,Shkruani moshën e pensionit në vitet
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +229,Target Warehouse,Target Magazina
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +230,Target Warehouse,Target Magazina
 DocType: Cheque Print Template,Starting location from left edge,Duke filluar vend nga buzë e majtë
 DocType: Item,Allow over delivery or receipt upto this percent,Lejo mbi ofrimin ose pranimin upto këtë qind
 DocType: Stock Entry,STE-,STE-
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Sales Order Date,Pritet Data e dorëzimit nuk mund të jetë e para Sales Rendit Data
 DocType: Upload Attendance,Import Attendance,Pjesëmarrja e importit
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Të gjitha Item Grupet
+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/config/setup.py +89,Automatically compose message on submission of transactions.,Automatikisht shkruaj mesazh për dorëzimin e transaksioneve.
@@ -792,13 +801,15 @@
 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/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
 DocType: Expense Claim,Expenses,Shpenzim
 DocType: Item Variant Attribute,Item Variant Attribute,Item Varianti Atributi
 ,Purchase Receipt Trends,Trendet Receipt Blerje
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Research & Development,Hulumtim dhe Zhvillim
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Hulumtim dhe Zhvillim
 ,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
 DocType: Leave Block List Date,Leave Block List Date,Dërgo Block Lista Data
 DocType: Pricing Rule,Price or Discount,Çmimi ose Discount
@@ -807,7 +818,7 @@
 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/controllers/accounts_controller.py +340,"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ë."
+apps/erpnext/erpnext/controllers/accounts_controller.py +343,"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
@@ -829,12 +840,12 @@
 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 +756,Purchase Receipt,Pranimi Blerje
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +735,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 +167,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 +282,Unable to find Time Slot in the next {0} days for Operation {1},Në pamundësi për të gjetur vend i caktuar kohë në {0} ditëve të ardhshme për funksionimin {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +170,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 +283,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 +439,BOM {0} must be active,BOM {0} duhet të jetë aktiv
@@ -845,7 +856,7 @@
 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 +214,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 +217,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
@@ -859,9 +870,9 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Punonjës {0} nuk është aktiv apo nuk ekziston
 DocType: Fee Structure,Components,komponentet
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,Please enter Asset Category in Item {0},Ju lutem shkruani Pasurive Kategoria në pikën {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +612,Item Variants {0} updated,Item Variantet {0} përditësuar
+apps/erpnext/erpnext/stock/doctype/item/item.py +614,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 +843,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 +854,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
@@ -876,69 +887,72 @@
 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 +728,New Sales Invoice,Sales New Fatura
+apps/erpnext/erpnext/accounts/page/pos/pos.js +710,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 +728,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ë
 DocType: Material Request Item,Lead Time Date,Lead Data Koha
 DocType: Guardian,Guardian Name,Emri Guardian
 DocType: Cheque Print Template,Has Print Format,Ka Print Format
-apps/erpnext/erpnext/accounts/page/pos/pos.js +86, 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 +109,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 +619,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","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/page/pos/pos.js +75, 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 +613,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing 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 +606,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
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +609,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
 DocType: Purchase Invoice Item,Purchase Order Item,Rendit Blerje Item
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +130,Indirect Income,Të ardhurat indirekte
 DocType: Cheque Print Template,Date Settings,Data Settings
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Grindje
 ,Company Name,Emri i kompanisë
 DocType: SMS Center,Total Message(s),Përgjithshme mesazh (s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +810,Select Item for Transfer,Përzgjidh Item për transferimin
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +789,Select Item for Transfer,Përzgjidh Item për transferimin
 DocType: Purchase Invoice,Additional Discount Percentage,Përqindja shtesë Discount
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Shiko një listë të të gjitha ndihmë videot
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Zgjidh llogaria kreu i bankës ku kontrolli ishte depozituar.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Lejo përdoruesit të redaktoni listën e çmimeve Vlerësoni në transaksionet
 DocType: Pricing Rule,Max Qty,Max Qty
-DocType: Student Applicant,Father's Name,Emri i babait
 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 +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: Pagesa kundër Sales / Rendit Blerje gjithmonë duhet të shënohet si më parë
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Kimik
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +686,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/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
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +694,All items have already been transferred for this Production Order.,Të gjitha sendet janë tashmë të transferuar për këtë Rendit Production.
 DocType: Process Payroll,Select Payroll Year and Month,Zgjidh pagave vit dhe Muaji
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,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
-DocType: Opportunity,Walk In,Ecni Në
 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 +12,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ë).
 DocType: Timesheet Detail,Bill,Fature
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,White,E bardhë
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,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ë
 DocType: SMS Center,All Lead (Open),Të gjitha Lead (Open)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +228,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})
+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 +731,Make ,Bëj
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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.
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Shporta ime
-apps/erpnext/erpnext/controllers/selling_controller.py +154,Order Type must be one of {0},Rendit Lloji duhet të jetë një nga {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Rendit Lloji duhet të jetë një nga {0}
 DocType: Lead,Next Contact Date,Tjetër Kontakt Data
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Hapja Qty
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +393,Please enter Account for Change Amount,"Ju lutem, jepni llogari për Ndryshim Shuma"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,Please enter Account for Change Amount,"Ju lutem, jepni llogari për Ndryshim Shuma"
 DocType: Student Batch,Student Batch Name,Student Batch Emri
 DocType: Holiday List,Holiday List Name,Festa Lista Emri
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js +8,Schedule Course,Orari i kursit
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Stock Options,Stock Options
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Stock Options
 DocType: Journal Entry Account,Expense Claim,Shpenzim Claim
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +211,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 +237,Qty for {0},Qty për {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +212,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 +238,Qty for {0},Qty për {0}
 DocType: Leave Application,Leave Application,Lini Aplikimi
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Lini Alokimi Tool
 DocType: Leave Block List,Leave Block List Dates,Dërgo Block Lista Datat
@@ -947,9 +961,9 @@
 DocType: Company,Default Terms,Kushtet Default
 DocType: Packing Slip Item,Packing Slip Item,Paketimi Shqip Item
 DocType: Purchase Invoice,Cash/Bank Account,Cash / Llogarisë Bankare
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Artikuj hequr me asnjë ndryshim në sasi ose në vlerë.
+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 +635,Attribute table is mandatory,Tabela atribut është i detyrueshëm
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Tabela atribut është i detyrueshëm
 DocType: Production Planning Tool,Get Sales Orders,Get Sales urdhëron
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{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"
@@ -974,7 +988,7 @@
 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/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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Serial Asnjë {0} është nën kontratë të mirëmbajtjes upto {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +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
@@ -986,7 +1000,7 @@
 DocType: GL Entry,Against,Kundër
 DocType: Item,Default Selling Cost Center,Gabim Qendra Shitja Kosto
 DocType: Sales Partner,Implementation Partner,Partner Zbatimi
-apps/erpnext/erpnext/controllers/selling_controller.py +231,Sales Order {0} is {1},Sales Order {0} është {1}
+apps/erpnext/erpnext/controllers/selling_controller.py +232,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
 DocType: Packing Slip,Net Weight UOM,Net Weight UOM
@@ -996,25 +1010,24 @@
 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
 DocType: Sales Person,Select company name first.,Përzgjidh kompani emri i parë.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Kuotimet e marra nga furnizuesit.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},Për {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Mesatare Moshë
 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/templates/pages/home.html +32,View All Products,Shiko të gjitha Produktet
+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
 DocType: Expense Claim,From Employee,Nga punonjësi
-apps/erpnext/erpnext/controllers/accounts_controller.py +400,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
+apps/erpnext/erpnext/controllers/accounts_controller.py +403,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/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,dhe vit:
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +191,{0} {1} must be submitted,{0} {1} duhet të dorëzohet
-DocType: Email Digest,Annual Expense,Shpenzimet vjetore
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,{0} {1} must be submitted,{0} {1} duhet të dorëzohet
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +145,Quantity must be less than or equal to {0},Sasia duhet të jetë më e vogël se ose e barabartë me {0}
 DocType: SMS Center,Total Characters,Totali Figurë
 apps/erpnext/erpnext/controllers/buying_controller.py +156,Please select BOM in BOM field for Item {0},"Ju lutem, përzgjidhni bom në fushën BOM për Item {0}"
@@ -1025,30 +1038,31 @@
 DocType: Sales Partner,Distributor,Shpërndarës
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Shporta Transporti Rregulla
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +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 +62,Please set 'Apply Additional Discount On',Ju lutemi të vendosur &#39;Aplikoni Discount shtesë në&#39;
+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
 DocType: Global Defaults,Global Defaults,Defaults Global
 apps/erpnext/erpnext/projects/doctype/project/project.py +153,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
 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 +327,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 +362,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/stock/doctype/stock_entry/stock_entry.py +367,Finished Item {0} must be entered for Manufacture type entry,Mbaroi Item {0} duhet të jetë hyrë në për hyrje të tipit Prodhimi
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Hapja Bilanci Kontabilitet
 DocType: Sales Invoice Advance,Sales Invoice Advance,Shitjet Faturë Advance
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +499,Nothing to request,Asgjë për të kërkuar
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +500,Nothing to request,Asgjë për të kërkuar
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',&#39;Aktual Data e Fillimit&#39; nuk mund të jetë më i madh se &#39;Lajme End Date&#39;
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Management,Drejtuesit
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},Ose debiti ose krediti shuma është e nevojshme për {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,Drejtuesit
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +55,Either debit or credit amount is required for {0},Ose debiti ose krediti shuma është e nevojshme për {0}
 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 +161,Blue,Blu
+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
@@ -1058,12 +1072,12 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +23,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
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1374,Do you really want to submit the invoice?,A jeni të vërtetë dëshironi të paraqesë faturën?
+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 +685,Cost Center For Item with Item Code ',Qendra Kosto Per Item me Kodin Item &quot;
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1526,"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 +679,Cost Center For Item with Item Code ',Qendra Kosto Per Item me Kodin Item &quot;
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1550,"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 +26,"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
@@ -1083,104 +1097,106 @@
 DocType: Payment Reconciliation,Unreconciled Payment Details,Detajet e pagesës Unreconciled
 DocType: Global Defaults,Current Fiscal Year,Vitin aktual fiskal
 DocType: Global Defaults,Disable Rounded Total,Disable rrumbullakosura Total
-DocType: Lead,Call,Thirrje
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +417,'Entries' cannot be empty,&quot;Hyrjet&quot; nuk mund të jetë bosh
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +418,'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 +214,Fiscal Year {0} not found,Viti Fiskal {0} nuk u gjet
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +221,Fiscal Year {0} not found,Viti Fiskal {0} nuk u gjet
 apps/erpnext/erpnext/config/hr.py +238,Setting up Employees,Ngritja Punonjësit
 DocType: Sales Order,SO-,KËSHTU QË-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,"Ju lutem, përzgjidhni prefiks parë"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Please select prefix first,"Ju lutem, përzgjidhni prefiks parë"
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Research,Hulumtim
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,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 +43,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 +57,View Ledger,Shiko Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Hershme
-apps/erpnext/erpnext/stock/doctype/item/item.py +504,"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 +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/setup/setup_wizard/setup_wizard.py +437,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ë
 ,Budget Variance Report,Buxheti Varianca Raport
 DocType: Salary Slip,Gross Pay,Pay Bruto
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +90,Row {0}: Activity Type is mandatory.,Row {0}: Aktiviteti lloji është i detyrueshëm.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +114,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/public/js/controllers/stock_controller.js +40,Accounting Ledger,Ledger Kontabilitet
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,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
 DocType: BOM Item,Item Description,Përshkrimi i artikullit
+DocType: Student Sibling,Student Sibling,Student vëlla
 DocType: Purchase Invoice,Is Recurring,Është i vazhdueshëm
 DocType: Purchase Invoice,Supplied Items,Artikujve të furnizuara
 DocType: Student,STUD.,Kurvar.
 DocType: Production Order,Qty To Manufacture,Qty Për Prodhimi
+DocType: Email Digest,New Income,Të ardhurat e re
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Ruajtja njëjtin ritëm gjatë gjithë ciklit të blerjes
 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 +131,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 +175,Valuation Rate required for Item in row {0},Vlerësoni Vlerësimi nevojshme për Item në rresht {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,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
 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 +87, to ,në
+apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,në
 DocType: Item,Lead Time in days,Lead Koha në ditë
 ,Accounts Payable Summary,Llogaritë e pagueshme Përmbledhje
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Not authorized to edit frozen Account {0},Nuk është i autorizuar për të redaktuar Llogari ngrirë {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,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 +62,Sales Order {0} is not valid,Sales Order {0} nuk është e vlefshme
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Sales Order {0} nuk është e vlefshme
 apps/erpnext/erpnext/setup/doctype/company/company.py +185,"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 +152,Small,I vogël
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,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}
 ,Invoiced Amount (Exculsive Tax),Shuma e faturuar (Tax Exculsive)
-DocType: Student Applicant,Mother's / Guardian 1 Email ID,/ Guardian 1 Email ID nënës
 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 +160,Green,E gjelbër
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,E gjelbër
 DocType: Supplier,SUPP-,SUPP-
 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 +57,Contract,Kontratë
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,Kontratë
 DocType: Email Digest,Add Quote,Shto Citim
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +498,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 +503,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 +80,Row {0}: Qty is mandatory,Row {0}: Qty është e detyrueshme
+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 +737,Sync Master Data,Sync Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +719,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/public/js/setup_wizard.js +283,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
+DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Ky është një grup artikull rrënjë dhe nuk mund të redaktohen.
+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.
 DocType: Journal Entry Account,Purchase Order,Rendit Blerje
 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 +345,"{0}: Employee email not found, hence email not sent","{0}: email Punonjësi nuk gjendet, kështu nuk email dërguar"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +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
 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 +118,"For {0}, only credit accounts can be linked against another debit entry","Për {0}, vetëm llogaritë e kreditit mund të jetë i lidhur kundër një tjetër hyrje debiti"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Delivery Note {0} is not submitted,Ofrimit Shënim {0} nuk është dorëzuar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Delivery Note {0} is not submitted,Ofrimit Shënim {0} nuk është dorëzuar
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Sub-contracted Item,Item {0} duhet të jetë një nënkontraktohet Item
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Pajisje kapitale
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Rregulla e Çmimeve është zgjedhur për herë të parë në bazë të &quot;Apliko në &#39;fushë, të cilat mund të jenë të artikullit, Grupi i artikullit ose markë."
 DocType: Hub Settings,Seller Website,Shitës Faqja
 DocType: Item,ITEM-,ITEM-
-apps/erpnext/erpnext/controllers/selling_controller.py +147,Total allocated percentage for sales team should be 100,Gjithsej përqindje ndarë për shitjet e ekipit duhet të jetë 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +110,Production Order status is {0},Statusi Rendit Prodhimi është {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Gjithsej përqindje ndarë për shitjet e ekipit duhet të jetë 100
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Statusi Rendit Prodhimi është {0}
 DocType: Appraisal Goal,Goal,Qëllim
 DocType: Sales Invoice Item,Edit Description,Ndrysho Përshkrimi
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +757,For Supplier,Për Furnizuesin
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +723,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
@@ -1196,10 +1212,11 @@
 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
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +445,BOM {0} does not belong to Item {1},BOM {0} nuk i përket Item {1}
 DocType: Sales Partner,Target Distribution,Shpërndarja Target
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1667,Deafault warehouse is required for selected item,depo Deafault është e nevojshme për pika të zgjedhura
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Deafault warehouse is required for selected item,depo Deafault është e nevojshme për pika të zgjedhura
 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
@@ -1208,23 +1225,23 @@
 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 +110,Hardware,Hardware
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,Hardware
 DocType: Sales Order,Recurring Upto,përsëritur upto
 DocType: Attendance,HR Manager,Menaxher HR
 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 +48,Privilege Leave,Privilegj Leave
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,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 +79,You need to enable Shopping Cart,Ju duhet të mundësojnë Shporta
 DocType: Payment Entry,Writeoff,Writeoff
 DocType: Appraisal Template Goal,Appraisal Template Goal,Vlerësimi Template Qëllimi
-DocType: Salary Slip,Earning,Fituar
+DocType: Salary Component,Earning,Fituar
 DocType: Purchase Invoice,Party Account Currency,Llogaria parti Valuta
 ,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 +171,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 +174,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_data.py +358,Food,Ushqim
+apps/erpnext/erpnext/demo/setup/setup_data.py +301,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/course_schedule/course_schedule.js +103,Mark Attendence,Mark FREKUENTIMI
@@ -1258,12 +1275,12 @@
 DocType: Sales Order Item,Planned Quantity,Sasia e planifikuar
 DocType: Purchase Invoice Item,Item Tax Amount,Shuma Tatimore Item
 DocType: Item,Maintain Stock,Ruajtja Stock
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +209,Stock Entries already created for Production Order ,Stock Entries krijuar tashmë për Rendin Production
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,Stock Entries krijuar tashmë për Rendin Production
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,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 +620,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 +238,Max: {0},Max: {0}
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +15,From Datetime,Nga datetime
+apps/erpnext/erpnext/controllers/accounts_controller.py +623,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 +239,Max: {0},Max: {0}
+apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Nga datetime
 DocType: Email Digest,For Company,Për Kompaninë
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Log komunikimi.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +153,"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."
@@ -1271,8 +1288,8 @@
 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 +552,cannot be greater than 100,nuk mund të jetë më i madh se 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +680,Item {0} is not a stock Item,Item {0} nuk është një gjendje Item
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +546,cannot be greater than 100,nuk mund të jetë më i madh se 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,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ë
@@ -1286,10 +1303,9 @@
 DocType: GL Entry,GL Entry,GL Hyrja
 DocType: HR Settings,Employee Settings,Cilësimet e punonjësve
 ,Batch-Wise Balance History,Batch-urti Historia Bilanci
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Për të bërë lista
 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 +61,Apprentice,Nxënës
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +102,Negative Quantity is not allowed,Sasi negativ nuk është e lejuar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,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 +152,Employee cannot report to himself.,Punonjësi nuk mund të raportojnë për veten e tij.
@@ -1310,15 +1326,14 @@
 DocType: Asset,Asset Name,Emri i Aseteve
 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 +141,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 +719,Packing Slip,Shqip Paketimi
+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 +713,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/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,Kërkesa për kuotim mund të jetë qasje duke klikuar linkun e mëposhtëm
 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 +81,Analyst,Analist
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,Analist
 DocType: Item,Inventory,Inventar
 DocType: Item,Sales Details,Shitjet Detajet
 DocType: Quality Inspection,QI-,QI-
@@ -1326,7 +1341,7 @@
 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 +103,Government,Qeveri
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,Qeveri
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,Emri Institute
 apps/erpnext/erpnext/config/stock.py +289,Item Variants,Variantet pika
 DocType: Company,Services,Sherbime
@@ -1342,6 +1357,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,Financial Year Start Date,Viti Financiar Data e Fillimit
 DocType: POS Profile,Apply Discount,aplikoni Discount
 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
 DocType: Program Course,Program Course,Kursi program
@@ -1382,12 +1398,12 @@
 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
 DocType: Production Plan Sales Order,Production Plan Sales Order,Prodhimit Plani Rendit Sales
 DocType: Sales Partner,Sales Partner Target,Sales Partner Target
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +110,Accounting Entry for {0} can only be made in currency: {1},Hyrja Kontabiliteti për {0} mund të bëhen vetëm në monedhën: {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Hyrja Kontabiliteti për {0} mund të bëhen vetëm në monedhën: {1}
 DocType: Pricing Rule,Pricing Rule,Rregulla e Çmimeve
 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
 DocType: Shopping Cart Settings,Payment Success URL,Pagesa Suksesi URL
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +78,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: kthye Item {1} nuk ekziston në {2} {3}
+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
@@ -1396,40 +1412,39 @@
 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/stock/doctype/stock_entry/stock_entry.py +339,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Nuk lejohet të tranfer më {0} se {1} kundër Rendit Blerje {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +344,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 +545,Manufacturing Quantity is mandatory,Prodhim Sasia është e detyrueshme
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,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 +71,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 +162,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/projects/doctype/timesheet/timesheet.py +186,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
 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 +130,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 +137,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
 DocType: Dependent Task,Dependent Task,Detyra e varur
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,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/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 +190,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/hr/doctype/leave_application/leave_application.py +197,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 +921,Search Item,Kërko Item
+apps/erpnext/erpnext/accounts/page/pos/pos.js +910,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 +546,Already completed,përfunduar tashmë
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +22,Payment Request already exists {0},Kërkesa pagesa tashmë ekziston {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +550,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 +241,Quantity must not be more than {0},Sasia nuk duhet të jetë më shumë se {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Quantity must not be more than {0},Sasia nuk duhet të jetë më shumë se {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +76,Previous Financial Year is not closed,Previous Viti financiar nuk është e mbyllur
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +44,Age (Days),Mosha (ditë)
 DocType: Quotation Item,Quotation Item,Citat Item
@@ -1446,7 +1461,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +221,Purchase Receipt {0} is not submitted,Blerje Pranimi {0} nuk është dorëzuar
 DocType: Company,Default Payable Account,Gabim Llogaria pagueshme
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Cilësimet për internet shopping cart tilla si rregullat e transportit detar, lista e çmimeve etj"
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +83,{0}% Billed,{0}% faturuar
+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
@@ -1458,12 +1473,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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/schools/doctype/fees/fees.js +22,Collect,mbledh
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,mbledh
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,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 +225,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
-DocType: Payment Reconciliation,Payments,Pagesat
 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
@@ -1475,7 +1489,7 @@
 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 +9,Procurement,Prokurimit
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,Asnjë nga pikat ketë ndonjë ndryshim në sasi ose vlerë.
+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
 ,Lead Details,Detajet Lead
 DocType: Purchase Invoice,End date of current invoice's period,Data e fundit e periudhës së fatura aktual
@@ -1500,7 +1514,7 @@
 DocType: Purchase Invoice,Additional Discount,Discount shtesë
 DocType: Selling Settings,Selling Settings,Shitja Settings
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Auctions Online
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +97,Please specify either Quantity or Valuation Rate or both,Ju lutem specifikoni ose Sasia apo vlerësimin Vlerësoni apo të dyja
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,Ju lutem specifikoni ose Sasia apo vlerësimin Vlerësoni apo të dyja
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +13,Fulfillment,përmbushje
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Kompani, muaji dhe viti fiskal është i detyrueshëm"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Shpenzimet e marketingut
@@ -1521,14 +1535,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,ERPNext Setup Complete!
 DocType: Item,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +93,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"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/selling/doctype/customer/customer.py +126,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
 DocType: Stock Entry,Material Receipt,Pranimi materiale
 DocType: Homepage,Products,Produkte
 DocType: Announcement,Instructor,instruktor
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},Partia Lloji dhe Partia është e nevojshme për arkëtueshme / pagueshme llogarisë {0}
 DocType: 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
@@ -1539,7 +1552,7 @@
 ,Item-wise Sales Register,Pika-mençur Sales Regjistrohu
 DocType: Asset,Gross Purchase Amount,Shuma Blerje Gross
 DocType: Asset,Depreciation Method,Metoda e amortizimit
-apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Offline,në linjë
+apps/erpnext/erpnext/accounts/page/pos/pos.js +686,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
@@ -1557,25 +1570,27 @@
 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
 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 +858,Make Purchase Order,Bëni Rendit Blerje
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +852,Make Purchase Order,Bëni Rendit Blerje
 DocType: SMS Center,Send To,Send To
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,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 +148,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
 DocType: Stock Reconciliation,Stock Reconciliation,Stock Pajtimit
 DocType: Territory,Territory Name,Territori Emri
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +172,Work-in-Progress Warehouse is required before Submit,Puna në progres Magazina është e nevojshme para se të Submit
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,Work-in-Progress Warehouse is required before Submit,Puna në progres Magazina është e nevojshme para se të Submit
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Aplikuesi për një punë.
 DocType: Purchase Order Item,Warehouse and Reference,Magazina dhe Referenca
 DocType: Supplier,Statutory info and other general information about your Supplier,Info Statutore dhe informacione të tjera të përgjithshme në lidhje me furnizuesit tuaj
-apps/erpnext/erpnext/hooks.py +88,Addresses,Adresat
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Furnizuesi&gt; Furnizuesi lloji
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +212,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/hooks.py +95,Addresses,Adresat
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +215,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
 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
@@ -1583,11 +1598,10 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,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 +731,Payment,Pagesa
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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: Pricing Rule,Brand,Markë
 DocType: Course,Course Abbreviation,Shkurtesa Course
 DocType: Item,Will also apply for variants,Gjithashtu do të aplikojë për variantet
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +142,"Asset cannot be cancelled, as it is already {0}","Asset nuk mund të anulohet, pasi ajo tashmë është {0}"
@@ -1599,7 +1613,7 @@
 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."
 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 +85,Associate,Koleg
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,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
@@ -1607,7 +1621,7 @@
 DocType: Production Planning Tool,Material Requests,Kërkesat materiale
 DocType: Warranty Claim,Issue Date,Çështja Data
 DocType: Activity Cost,Activity Cost,Kosto Aktiviteti
-DocType: Timesheet Detail,Timesheet Detail,Detail pasqyrë e mungesave
+DocType: Sales Invoice Timesheet,Timesheet Detail,Detail pasqyrë e mungesave
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Konsumuar Qty
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekomunikacionit
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Tregon se paketa është pjesë e këtij ofrimit (Vetëm draft)
@@ -1630,6 +1644,7 @@
 DocType: Production Plan Material Request,Material Request Date,Material Kërkesa Date
 DocType: Purchase Order Item,Supplier Quotation Item,Citat Furnizuesi Item
 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
 DocType: Monthly Distribution,Name of the Monthly Distribution,Emri i Shpërndarjes Mujore
 DocType: Sales Person,Parent Sales Person,Shitjet prind Person
@@ -1642,30 +1657,31 @@
 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 +44,"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/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ë.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +502,Error: {0} &gt; {1},Gabim: {0}&gt; {1}
 DocType: Item,Is Sales Item,Është Item Sales
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Item Group Tree
 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."
 DocType: Naming Series,Current Value,Vlera e tanishme
-apps/erpnext/erpnext/controllers/accounts_controller.py +235,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/controllers/accounts_controller.py +238,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
 DocType: Delivery Note Item,Against Sales Order,Kundër Sales Rendit
 ,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 +458,Item table can not be blank,Tabela artikull nuk mund të jetë bosh
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +443,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 +5,This is based on stock movement. See {0} for details,Kjo është e bazuar në lëvizjen e aksioneve. Shih {0} për detaje
 DocType: Pricing Rule,Selling,Shitja
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +341,Amount {0} {1} deducted against {2},Shuma {0} {1} zbritur kundër {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +344,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
@@ -1680,8 +1696,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +144,Cannot refer row number greater than or equal to current row number for this Charge type,"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 +159,Red,I kuq
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Ju lutem klikoni në &quot;Generate&quot; Listën për të shkoj të marr Serial Asnjë shtuar për Item {0}
+apps/erpnext/erpnext/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
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Base Shuma (Company Valuta)
@@ -1689,7 +1705,7 @@
 DocType: Installation Note,Installation Time,Instalimi Koha
 DocType: Sales Invoice,Accounting Details,Detajet Kontabilitet
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,Fshij gjitha transaksionet për këtë kompani
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +187,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Row # {0}: Operacioni {1} nuk është përfunduar për {2} Qty e mallrave të kryer në prodhimin Order # {3}. Ju lutem Përditëso statusin operacion anë Koha Shkrime
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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,Row # {0}: Operacioni {1} nuk është përfunduar për {2} Qty e mallrave të kryer në prodhimin Order # {3}. Ju lutem Përditëso statusin operacion anë Koha Shkrime
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,Investimet
 DocType: Issue,Resolution Details,Rezoluta Detajet
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,alokimet
@@ -1725,16 +1741,17 @@
 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}
 DocType: Delivery Note,Excise Page Number,Akciza Faqja Numër
 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}
 ,Maintenance Schedules,Mirëmbajtja Oraret
 DocType: Task,Actual End Date (via Time Sheet),Aktuale End Date (via Koha Sheet)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Amount {0} {1} against {2} {3},Shuma {0} {1} kundër {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +339,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 +138,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 +295,Debit To account must be a Receivable account,Debiti te llogaria duhet të jetë një llogari të arkëtueshme
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Receivable account,Debiti te llogaria duhet të jetë një llogari të arkëtueshme
 DocType: Shipping Rule Condition,Shipping Amount,Shuma e anijeve
 ,Pending Amount,Në pritje Shuma
 DocType: Purchase Invoice Item,Conversion Factor,Konvertimi Faktori
@@ -1742,10 +1759,10 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +137,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 +90,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
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +93,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 +22,Enter Paid Amount,Shkruani shumën e paguar
+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
@@ -1755,13 +1772,15 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,timesheets
 DocType: HR Settings,HR Settings,HR Cilësimet
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Expense Claim is pending approval. Only the Expense Approver can update status.,Shpenzim Kërkesa është në pritje të miratimit. Vetëm aprovuesi shpenzimeve mund update statusin.
+DocType: Email Digest,New Expenses,Shpenzimet e reja
 DocType: Purchase Invoice,Additional Discount Amount,Shtesë Shuma Discount
-apps/erpnext/erpnext/controllers/accounts_controller.py +524,"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ë."
+apps/erpnext/erpnext/controllers/accounts_controller.py +527,"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 +249,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/stock/get_item_details.py +123,Please specify Company,Ju lutem specifikoni Company
 ,Customer Acquisition and Loyalty,Customer Blerja dhe Besnik
@@ -1772,17 +1791,19 @@
 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 +183,Closing (Opening + Totals),Mbyllja (Hapja + arrin)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),Mbyllja (Hapja + arrin)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Ju lutem specifikoni monedhës në Kompaninë
 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/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
-apps/erpnext/erpnext/controllers/accounts_controller.py +272,Account {0} is invalid. Account Currency must be {1},Llogari {0} është i pavlefshëm. Llogaria Valuta duhet të jetë {1}
+DocType: Email Digest,Pending Sales Orders,Në pritje Sales urdhëron
+apps/erpnext/erpnext/controllers/accounts_controller.py +275,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 +956,"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 Slip,Deduction,Zbritje
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +87,Row {0}: From Time and To Time is mandatory.,Row {0}: Nga koha dhe në kohë është i detyrueshëm.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +969,"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 +111,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 +262,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 +7,Please enter Employee Id of this sales person,Ju lutemi shkruani punonjës Id i këtij personi të shitjes
@@ -1790,7 +1811,7 @@
 DocType: Project,% Tasks Completed,Detyrat% Kompletuar
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,Dallimi Shuma duhet të jetë zero
 DocType: Project,Gross Margin,Marzhi bruto
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +194,Please enter Production Item first,Ju lutemi shkruani Prodhimi pikën e parë
+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
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Citat
@@ -1799,53 +1820,54 @@
 DocType: Maintenance Visit,Maintenance User,Mirëmbajtja User
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +149,Cost Updated,Kosto Përditësuar
 DocType: Employee,Date of Birth,Data e lindjes
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +86,Item {0} has already been returned,Item {0} tashmë është kthyer
+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}
+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 +177,Job Description,Përshkrimi i punës
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,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 +126,"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 +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Karaktere speciale përveç &quot;-&quot; &quot;.&quot;, &quot;#&quot;, dhe &quot;/&quot; nuk lejohet në emërtimin seri"
 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."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +24,Welcome to POS: Create your POS Profile,Mirë se vini në POS: Krijo POS Profilin tuaj
 DocType: Expense Claim,Approver,Aprovuesi
 ,SO Qty,SO Qty
+DocType: Guardian,Work Address,puna Adresa
 DocType: Appraisal,Calculate Total Score,Llogaritur Gjithsej Vota
 DocType: Request for Quotation,Manufacturing Manager,Prodhim Menaxher
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serial Asnjë {0} është nën garanci upto {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +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 +74,Shipments,Dërgesat
+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
 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 +153,Row # ,Row #
+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 +156,Get From,Get Nga
+apps/erpnext/erpnext/public/js/utils.js +167,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 +167,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 +416,"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"
+apps/erpnext/erpnext/controllers/accounts_controller.py +419,"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
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} is disabled,Përdoruesi {0} është me aftësi të kufizuara
 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ë ...
 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 +171,"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 +346,{0} is mandatory for Item {1},{0} është e detyrueshme për Item {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,{0} is mandatory for Item {1},{0} është e detyrueshme për Item {1}
 DocType: Currency Exchange,From Currency,Nga Valuta
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Ju lutem, përzgjidhni Shuma e ndarë, tip fature, si dhe numrin e faturës në atleast një rresht"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,Kostoja e blerjes së Re
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},Rendit Shitjet e nevojshme për Item {0}
 DocType: Purchase Invoice Item,Rate (Company Currency),Shkalla (Kompania Valuta)
-apps/erpnext/erpnext/demo/setup_data.py +360,Others,Të tjerët
+DocType: Student Guardian,Others,Të tjerët
 DocType: Payment Entry,Unallocated Amount,Shuma pashpërndarë
 apps/erpnext/erpnext/templates/includes/product_page.js +65,Cannot find a matching Item. Please select some other value for {0}.,Nuk mund të gjeni një përputhen Item. Ju lutem zgjidhni një vlerë tjetër {0} për.
 DocType: POS Profile,Taxes and Charges,Taksat dhe Tarifat
@@ -1865,17 +1887,16 @@
 apps/erpnext/erpnext/config/stock.py +304,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/accounts/report/item_wise_sales_register/item_wise_sales_register.py +54,Receivable Account,Llogaria e arkëtueshme
-apps/erpnext/erpnext/controllers/accounts_controller.py +546,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} është tashmë {2}
+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 +549,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 +79,CEO,CEO
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,CEO
 DocType: Expense Claim Detail,Expense Claim Detail,Shpenzim Kërkesa Detail
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +808,Please select correct account,"Ju lutem, përzgjidhni llogarinë e saktë"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +809,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
-DocType: Purchase Invoice Item,Page Break,Faqe Pushim
 DocType: Production Order Operation,Pending,Në pritje të
 DocType: Course,Course Name,Emri i kursit
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Përdoruesit të cilët mund të miratojë aplikacione të lënë një punonjës të veçantë për
@@ -1884,14 +1905,15 @@
 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 +54,Full-time,Me kohë të plotë
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,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
 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ëse keni krijuar një template standarde në shitje taksave dhe detyrimeve Stampa, përzgjidh njërin dhe klikoni mbi butonin më poshtë."
+DocType: Student,Guardians,Guardians
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +29,Please specify a country for this Shipping Rule or check Worldwide Shipping,Ju lutem specifikoni një vend për këtë Rregull Shipping ose kontrolloni anijeve në botë
 DocType: Stock Entry,Total Incoming Value,Vlera Totale hyrëse
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Debit To is required,Debi Për të është e nevojshme
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +321,Debit To is required,Debi Për të është e nevojshme
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Blerje Lista e Çmimeve
 DocType: Offer Letter Term,Offer Term,Term Oferta
 DocType: Quality Inspection,Quality Manager,Menaxheri Cilësia
@@ -1899,6 +1921,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/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
@@ -1909,18 +1932,17 @@
 DocType: Production Order Operation,Completed Qty,Kompletuar Qty
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"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 +273,Price List {0} is disabled,Lista e Çmimeve {0} është me aftësi të kufizuara
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +99,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/projects/doctype/timesheet/timesheet.py +123,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
 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}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Shkalla aktuale Vlerësimi
 DocType: Item,Customer Item Codes,Kodet Customer Item
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,Exchange Gain / Humbje
 DocType: Opportunity,Lost Reason,Humbur Arsyeja
-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/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/purchase_receipt/purchase_receipt.py +378,All items have already been invoiced,Të gjitha sendet janë tashmë faturohen
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +379,All items have already been invoiced,Të gjitha sendet janë tashmë faturohen
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Ju lutem specifikoni një të vlefshme &#39;nga rasti Jo&#39;
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,Qendrat e mëtejshme e kostos mund të bëhet në bazë të Grupeve por hyra mund të bëhet kundër jo-grupeve
 DocType: Project,External,I jashtëm
@@ -1936,18 +1958,19 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Konsumatorët tuaj
 apps/erpnext/erpnext/projects/doctype/project/project.py +141,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/job_opening.html +19,Apply Now,Apliko tani
+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."
 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
-apps/erpnext/erpnext/utilities/doctype/address/address.py +164,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: Fee Structure,Fee Structure,Struktura Fee
 DocType: Timesheet Detail,Costing Amount,Kushton Shuma
+DocType: Student Admission,Application Fee,Tarifë aplikimi
 DocType: Process Payroll,Submit Salary Slip,Submit Kuponi pagave
-apps/erpnext/erpnext/controllers/selling_controller.py +161,Maxiumm discount for Item {0} is {1}%,Zbritje Maxiumm për Item {0} është {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,Zbritje Maxiumm për Item {0} është {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Importi në Bulk
 DocType: Sales Partner,Address & Contacts,Adresa dhe Kontaktet
 DocType: SMS Log,Sender Name,Sender Emri
@@ -1972,21 +1995,21 @@
 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_data.py +361,Travel,Udhëtim
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +155,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 +304,Travel,Udhëtim
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +167,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 +23,Update Cost,Update Kosto
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Update Kosto
 DocType: Item Reorder,Item Reorder,Item reorder
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +36,Show Salary Slip,Trego Paga Shqip
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +748,Transfer Material,Material Transferimi
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +53,Show Salary Slip,Trego Paga Shqip
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +166,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 +923,Please set recurring after saving,Ju lutemi të vendosur përsëritur pas kursimit
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +646,Select change amount account,Llogaria Shuma Zgjidh ndryshim
+apps/erpnext/erpnext/public/js/controllers/transaction.js +914,Please set recurring after saving,Ju lutemi të vendosur përsëritur pas kursimit
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +703,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
@@ -1998,31 +2021,32 @@
 DocType: Quality Inspection,Verified By,Verifikuar nga
 DocType: Address,Subsidiary,Ndihmës
 apps/erpnext/erpnext/setup/doctype/company/company.py +64,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","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: Quality Inspection,Purchase Receipt No,Pranimi Blerje Asnjë
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Kaparosje
 DocType: Process Payroll,Create Salary Slip,Krijo Kuponi pagave
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +33,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 +352,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Sasia në rresht {0} ({1}) duhet të jetë e njëjtë me sasinë e prodhuar {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Sasia në rresht {0} ({1}) duhet të jetë e njëjtë me sasinë e prodhuar {2}
 DocType: Appraisal,Employee,Punonjës
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Fto si Përdorues
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} është faturuar plotësisht
 DocType: Workstation Working Hour,End Time,Fundi Koha
 DocType: Payment Entry,Payment Deductions or Loss,Zbritjet e pagesës ose Loss
-apps/erpnext/erpnext/config/schools.py +100,LMS,LMS
+apps/erpnext/erpnext/config/schools.py +104,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/config/crm.py +6,Sales Pipeline,Sales tubacionit
 DocType: Student Batch Student,Student Batch Student,Student Batch Student
-DocType: Sales Invoice,Mass Mailing,Mailing Mass
+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 +199,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/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 +297,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 +111,Pharmaceutical,Farmaceutike
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +309,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/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
@@ -2037,27 +2061,28 @@
 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 +814,Please specify Company to proceed,Ju lutemi specifikoni kompanisë për të vazhduar
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +793,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 +44,Compensatory Off,Kompensues Off
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,Kompensues Off
 DocType: Quality Inspection Reading,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.
 DocType: Room,Room Number,Numri Room
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Referenca e pavlefshme {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +161,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) nuk mund të jetë më i madh se quanitity planifikuar ({2}) në Prodhimi i rendit {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +162,{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 +217,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 +413,"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 +460,Quick Journal Entry,Quick Journal Hyrja
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +111,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
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +441,"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 +450,Quick Journal Entry,Quick Journal Hyrja
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +103,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 +214,{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
 ,Minutes to First Response for Issues,Minuta për Përgjigje e parë për Çështje
 DocType: Purchase Invoice,Terms and Conditions1,Termat dhe Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +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.
@@ -2066,16 +2091,17 @@
 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 +398,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 +739,Item or Warehouse for row {0} does not match Material Request,Item ose Magazina për rresht {0} nuk përputhet Materiale Kërkesë
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +747,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
 DocType: Fiscal Year,Year End Date,Viti End Date
 DocType: Task Depends On,Task Depends On,Detyra varet
-DocType: Lead,Opportunity,Mundësi
+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
@@ -2088,7 +2114,7 @@
 DocType: Student,Joining Date,Bashkimi me Date
 ,Employees working on a holiday,Punonjës që punojnë në një festë
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Mark pranishëm
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},Data e fillimit të mirëmbajtjes nuk mund të jetë para datës së dorëzimit për Serial Nr {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},Data e fillimit të mirëmbajtjes nuk mund të jetë para datës së dorëzimit për Serial Nr {0}
 DocType: Production Order,Actual End Date,Aktuale End Date
 DocType: Purchase Invoice,PINV-,PINV-
 DocType: Authorization Rule,Applicable To (Role),Për të zbatueshme (Roli)
@@ -2103,7 +2129,7 @@
 DocType: SMS Log,No of Requested SMS,Nr i SMS kërkuar
 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 +729,Please supply the specified items at the best possible rates,Ju lutemi të furnizimit me artikuj të specifikuara në normat më të mirë të mundshme
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +695,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 +117,Contract End Date must be greater than Date of Joining,Kontrata Data e përfundimit duhet të jetë më i madh se data e bashkimit
 DocType: Delivery Note,DN-,DN-
@@ -2112,7 +2138,7 @@
 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 +14,This is an example website auto-generated from ERPNext,Kjo është një website shembull auto-generated nga ERPNext
+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
 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.
 
@@ -2139,13 +2165,14 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd Sasia
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +54,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 +103,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 +504,Stock Entry {0} is not submitted,Stock Hyrja {0} nuk është dorëzuar
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Nuk mund të prodhojë më shumë Item {0} se sasia Sales Rendit {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +505,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: Salary Component Account,Salary Component Account,Llogaria Paga Komponenti
 DocType: Global Defaults,Hide Currency Symbol,Fshih Valuta size
 apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card","psh Banka, Cash, Credit Card"
+DocType: Lead Source,Source Name,burimi Emri
 DocType: Journal Entry,Credit Note,Credit Shënim
 DocType: Warranty Claim,Service Address,Shërbimi Adresa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furnitures and Fixtures,Furnitures dhe Regjistrimet
@@ -2157,6 +2184,7 @@
 DocType: Opportunity,Customer / Lead Name,Customer / Emri Lead
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +89,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/controllers/trends.py +19,Total(Qty),Gjithsej (Qty)
 DocType: Sales Invoice,This Document,Ky dokument
@@ -2168,15 +2196,15 @@
 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 +176,Organization branch master.,Mjeshtër degë organizatë.
-apps/erpnext/erpnext/controllers/accounts_controller.py +273, or ,ose
+apps/erpnext/erpnext/controllers/accounts_controller.py +276, or ,ose
 DocType: Sales Order,Billing Status,Faturimi Statusi
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Raportoni një çështje
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,Shpenzimet komunale
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-Mbi
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +203,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: Ditari Hyrja {1} nuk ka llogari {2} ose tashmë krahasohen kundër një kupon
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +206,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 +90,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 +93,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
@@ -2204,8 +2232,8 @@
 DocType: Product Bundle,Parent Item,Item prind
 DocType: Account,Account Type,Lloji i Llogarisë
 DocType: Delivery Note,DN-RET-,DN-RET-
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +115,Leave Type {0} cannot be carry-forwarded,"Dërgo Type {0} nuk mund të kryejë, përcillet"
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Mirëmbajtja Orari nuk është krijuar për të gjitha sendet. Ju lutem klikoni në &quot;Generate Listën &#39;
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +118,Leave Type {0} cannot be carry-forwarded,"Dërgo Type {0} nuk mund të kryejë, përcillet"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Mirëmbajtja Orari nuk është krijuar për të gjitha sendet. Ju lutem klikoni në &quot;Generate Listën &#39;
 ,To Produce,Për të prodhuar
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Payroll
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +163,"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"
@@ -2217,13 +2245,13 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +32,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 +748,Delivery,Ofrimit të
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +742,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
 DocType: Payment Entry,Total Allocated Amount,Shuma totale e alokuar
 DocType: Item Reorder,Material Request Type,Material Type Kërkesë
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +82,Row {0}: UOM Conversion Factor is mandatory,Row {0}: UOM Konvertimi Faktori është i detyrueshëm
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +79,Row {0}: UOM Conversion Factor is mandatory,Row {0}: UOM Konvertimi Faktori është i detyrueshëm
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Budget,Cost Center,Qendra Kosto
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Kupon #
@@ -2234,13 +2262,13 @@
 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 +90,Head of Marketing and Sales,Shef i Marketingut dhe Shitjes
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Tatimi mbi të ardhurat
+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 +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.
 DocType: Item Supplier,Item Supplier,Item Furnizuesi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +403,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 +770,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 +397,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 +764,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"
@@ -2252,28 +2280,29 @@
 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 +100,Issues,Çështjet
+apps/erpnext/erpnext/hooks.py +109,Issues,Çështjet
 apps/erpnext/erpnext/controllers/status_updater.py +13,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
 DocType: Supplier,Billing Currency,Faturimi Valuta
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Large,Shumë i madh
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,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 +507,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 +107,Local,Lokal
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +508,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/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 +154,Large,I madh
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,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 +225,Total {0} ({1}),Total {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +224,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
@@ -2319,9 +2348,9 @@
 DocType: Attendance,Leave Type,Lini Type
 apps/erpnext/erpnext/controllers/stock_controller.py +173,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/hr/doctype/salary_slip/salary_slip.py +79,Name error: {0},Emri error: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +90,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 +178,{0} {1} does not associated with {2} {3},{0} {1} nuk lidhet me {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +181,{0} {1} does not associated with {2} {3},{0} {1} nuk lidhet me {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Pjesëmarrja për punonjës {0} është shënuar tashmë
 DocType: Packing Slip,If more than one package of the same type (for print),Nëse më shumë se një paketë të të njëjtit lloj (për shtyp)
 DocType: Warehouse,Parent Warehouse,Magazina Parent
@@ -2340,7 +2369,7 @@
 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
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,Atleast një artikull duhet të lidhet me sasinë negativ në dokumentin e kthimit
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Atleast one item should be entered with negative quantity in return document,Atleast një artikull duhet të lidhet me sasinë negativ në dokumentin e kthimit
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operacioni {0} gjatë se çdo orë në dispozicion të punës në workstation {1}, prishen operacionin në operacione të shumta"
 ,Requested,Kërkuar
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +83,No Remarks,Asnjë Vërejtje
@@ -2352,46 +2381,46 @@
 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/stock/doctype/purchase_receipt/purchase_receipt.py +98,Quality Inspection required for Item {0},Inspektimi Cilësia e nevojshme për Item {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,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ë
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Manage Territorit Tree.
 DocType: Journal Entry Account,Sales Invoice,Shitjet Faturë
 DocType: Journal Entry Account,Party Balance,Bilanci i Partisë
-apps/erpnext/erpnext/accounts/page/pos/pos.js +475,Please select Apply Discount On,"Ju lutem, përzgjidhni Aplikoni zbritje në"
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +92,Salary Slip Created,Shqip Paga Krijuar
+apps/erpnext/erpnext/accounts/page/pos/pos.js +464,Please select Apply Discount On,"Ju lutem, përzgjidhni Aplikoni zbritje në"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +95,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
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,Përqindja zbritje mund të aplikohet ose ndaj një listë të çmimeve apo për të gjithë listën e çmimeve.
 DocType: Purchase Invoice,Half-yearly,Gjashtëmujor
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +384,Accounting Entry for Stock,Hyrja kontabilitetit për magazinë
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +387,Accounting Entry for Stock,Hyrja kontabilitetit për magazinë
 DocType: Sales Invoice,Sales Team1,Shitjet Team1
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,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 +96,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 +120,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 +88,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/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
 DocType: Item Group,Show this slideshow at the top of the page,Trego këtë slideshow në krye të faqes
 DocType: BOM,Item UOM,Item UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Shuma e taksave Pas Shuma ulje (Kompania Valuta)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +147,Target warehouse is mandatory for row {0},Depo objektiv është i detyrueshëm për rresht {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +141,Target warehouse is mandatory for row {0},Depo objektiv është i detyrueshëm për rresht {0}
 DocType: Cheque Print Template,Primary Settings,Parametrat kryesore
 DocType: Purchase Invoice,Select Supplier Address,Zgjidh Furnizuesi Adresa
 DocType: Quality Inspection,Quality Inspection,Cilësia Inspektimi
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Extra Small,Extra Vogla
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +194,Account {0} is frozen,Llogaria {0} është ngrirë
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Extra Vogla
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +690,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 +197,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 +606,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 +126,Commission rate cannot be greater than 100,Shkalla e Komisionit nuk mund të jetë më e madhe se 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +609,Can only make payment against unbilled {0},Vetëm mund të bëni pagesën kundër pafaturuar {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,Shkalla e Komisionit nuk mund të jetë më e madhe se 100
 DocType: Stock Entry,Subcontract,Nënkontratë
 apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,Ju lutem shkruani {0} parë
 DocType: Production Order Operation,Actual End Time,Aktuale Fundi Koha
@@ -2402,30 +2431,30 @@
 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 +158,Colour,Ngjyra
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,Ngjyra
 DocType: Maintenance Visit,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"
 DocType: Student Log,Academic,Akademik
-apps/erpnext/erpnext/controllers/accounts_controller.py +469,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Gjithsej paraprakisht ({0}) kundër Rendit {1} nuk mund të jetë më e madhe se Grand Total ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +472,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Gjithsej paraprakisht ({0}) kundër Rendit {1} nuk mund të jetë më e madhe se Grand Total ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Zgjidh Shpërndarja mujore të pabarabartë shpërndarë objektiva të gjithë muajve.
 DocType: Purchase Invoice Item,Valuation Rate,Vlerësimi Rate
+DocType: Stock Reconciliation,SR/,SR /
 apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,Lista e Çmimeve Valuta nuk zgjidhet
 DocType: Assessment,Results,Rezultate
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +168,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 +175,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
-DocType: Student Applicant,Father's/ Guardian 2 Email ID,Babait / Guardian 2 Email ID
 DocType: Maintenance Visit Purpose,Against Document No,Kundër Dokumentin Nr
 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 +228,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 +231,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 +93,Researcher,Studiues
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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.
@@ -2437,25 +2466,25 @@
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Për komoditetin e klientëve, këto kode mund të përdoren në formate të shtypura si faturat dhe ofrimit të shënimeve"
 DocType: 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: Sales Invoice,Advertisement,Reklamë
 DocType: Asset Category Account,Depreciation Expense Account,Llogaria Zhvlerësimi Shpenzimet
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Probationary Period,Periudha provuese
-apps/erpnext/erpnext/hooks.py +102,Announcements,Lajmërime
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Periudha provuese
+apps/erpnext/erpnext/hooks.py +111,Announcements,Lajmërime
 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 +109,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 +16,To Datetime,Për datetime
+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/scheduling_tool/scheduling_tool.py +51,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/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Aktivitetet në pritje
+DocType: Accounts Settings,Make Payment via Journal Entry,Të bëjë pagesën përmes Journal Hyrja
+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 +127,Please enter relieving date.,Ju lutemi të hyrë në lehtësimin datën.
-apps/erpnext/erpnext/controllers/trends.py +145,Amt,Sasia
+apps/erpnext/erpnext/controllers/trends.py +149,Amt,Sasia
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,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 +26,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ë
@@ -2473,14 +2502,15 @@
 apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1},Në pamundësi për të gjetur kursin e këmbimit për {0} në {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Mark Gjysma Dita
 DocType: Sales Invoice,Sales Team,Sales Ekipi
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Duplicate entry,Hyrja Duplicate
+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 +490,[Error],[Gabim]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +484,[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
 apps/erpnext/erpnext/controllers/status_updater.py +175,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.
 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
@@ -2496,22 +2526,22 @@
 ,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 +25,All Jobs,Të gjitha Jobs
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,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
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Amount {0} {1} {2} {3},Shuma {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Amount {0} {1} {2} {3},Shuma {0} {1} {2} {3}
 DocType: Account,Depreciation,Amortizim
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Furnizuesi (s)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Punonjës Pjesëmarrja Tool
 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 +372,Payment Entries {0} are un-linked,Entries pagesës {0} janë të pa-lidhur
+apps/erpnext/erpnext/accounts/utils.py +449,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
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +497,Material Requests {0} created,Kërkesat Materiale {0} krijuar
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +498,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.
 DocType: Purchase Invoice,Address and Contact,Adresa dhe Kontakt
@@ -2550,7 +2580,7 @@
 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 +848,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 +859,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 +233,Closing (Dr),Mbyllja (Dr)
 DocType: Cheque Print Template,Cheque Size,Çek Size
@@ -2571,7 +2601,8 @@
 ,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.
-apps/erpnext/erpnext/controllers/accounts_controller.py +555,'Update Stock' cannot be checked for fixed asset sale,&#39;Update Stock&#39; nuk mund të kontrollohet për shitjen e aseteve fikse
+DocType: Student Guardian,Father,Atë
+apps/erpnext/erpnext/controllers/accounts_controller.py +558,'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/buying/doctype/purchase_order/purchase_order.py +132,Material Request {0} is cancelled or stopped,Materiali Kërkesë {0} është anuluar ose ndërprerë
@@ -2581,15 +2612,15 @@
 DocType: Sales Order,Fully Delivered,Dorëzuar plotësisht
 DocType: Lead,Lower Income,Të ardhurat më të ulëta
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","Kreu llogari nën përgjegjësisë, në të cilën Fitimi / Humbja do të rezervuar"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +166,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 +238,"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 +81,Purchase Order number required for Item {0},Blerje numrin urdhër që nevojitet për artikullit {0}
+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/purchase_receipt/purchase_receipt.py +82,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 +17,Cannot change status as student {0} is linked with student application {1},Nuk mund të ndryshojë statusin si nxënës {0} është e lidhur me aplikimin e studentëve {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Nuk mund të ndryshojë statusin si nxënës {0} është e lidhur me aplikimin e studentëve {1}
 DocType: Timesheet,"List of employee which has ""Salary Slip Based on Timesheet"" is enabled in salary structure.",Lista e punonjës i cili ka &quot;gabim Rroga Bazuar në pasqyrë e mungesave&quot; është aktivizuar në strukturën e pagave.
 DocType: Asset,Fully Depreciated,amortizuar plotësisht
 ,Stock Projected Qty,Stock Projektuar Qty
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Customer {0} does not belong to project {1},Customer {0} nuk i përket projektit {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,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
@@ -2601,7 +2632,7 @@
 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/patches/v7_0/create_warehouse_nestedset.py +55,All Warehouses,Të gjitha Depot
+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 +105,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
@@ -2613,10 +2644,10 @@
 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/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Bëni Kuponi pagave
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +26,Browse BOM,Shfleto bom
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,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/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 Year,Academic Year,Vit akademik
+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
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,Vlerësim
@@ -2624,12 +2655,12 @@
 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 +197,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 +204,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: Workstation Working Hour,Start Time,Koha e fillimit
 DocType: Item Price,Bulk Import Help,Bulk Import Ndihmë
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +256,Select Quantity,Zgjidh Sasia
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +257,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
@@ -2646,6 +2677,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Ose Qty objektiv ose objektiv shuma është e detyrueshme.
 apps/erpnext/erpnext/config/projects.py +45,Cost of various activities,Kosto e aktiviteteve të ndryshme
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Vendosja Ngjarje për {0}, pasi që punonjësit e bashkangjitur më poshtë Personave Sales nuk ka një ID User {1}"
+DocType: Timesheet,Billing Details,detajet e faturimit
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +149,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}
 DocType: Item,Inspection Required,Kerkohet Inspektimi
@@ -2665,7 +2697,7 @@
 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 +138,Wire Transfer,Wire Transfer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,Wire Transfer
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,kontrollo të gjitha
 DocType: Sales Order,Recurring Order,Rendit përsëritur
 DocType: Company,Default Income Account,Llogaria e albumit ardhurat
@@ -2677,21 +2709,19 @@
 ,Welcome to ERPNext,Mirë se vini në ERPNext
 apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,Lead për Kuotim
 DocType: Lead,From Customer,Nga Klientit
-apps/erpnext/erpnext/demo/setup_data.py +357,Calls,Telefonatat
+apps/erpnext/erpnext/demo/setup/setup_data.py +300,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/stock/doctype/item/item.py +466,"As there are existing transactions for this item, \
-							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Si ka transaksione ekzistuese për këtë artikull, \ ju nuk mund të ndryshojë vlerat e &#39;nuk ka Serial&#39;, &#39;Has Serisë Jo&#39;, &#39;A Stock Item &quot;dhe&quot; Metoda Vlerësimi&#39;"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,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/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 +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Shënim: Sistemi nuk do të kontrollojë mbi-ofrimit dhe mbi-prenotim për Item {0} si sasi apo shumë është 0
 DocType: Notification Control,Quotation Message,Citat Mesazh
 DocType: Issue,Opening Date,Hapja Data
-apps/erpnext/erpnext/schools/api.py +58,Attendance has been marked successfully.,Pjesëmarrja është shënuar sukses.
+apps/erpnext/erpnext/schools/api.py +57,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 +136,Account Type for {0} must be {1},Lloji i llogarisë për {0} duhet të jetë {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +139,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
@@ -2706,12 +2736,13 @@
 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/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 +20,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 +1190,Please select customer,Ju lutemi zgjidhni klientit
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1193,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
@@ -2721,6 +2752,7 @@
 ,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 +50,Missing Currency Exchange Rates for {0},Missing Currency Exchange Rates për {0}
 DocType: Assessment,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
@@ -2738,11 +2770,12 @@
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Topic Emri
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Atleast një nga shitjen apo blerjen duhet të zgjidhen
+DocType: Grading Structure,Grade Intervals,Intervalet klasës
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Zgjidhni natyrën e biznesit tuaj.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Ku operacionet prodhuese janë kryer.
 DocType: Asset Movement,Source Warehouse,Burimi Magazina
 DocType: Installation Note,Installation Date,Instalimi Data
-apps/erpnext/erpnext/controllers/accounts_controller.py +534,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} nuk i përkasin kompanisë {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +537,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
@@ -2756,28 +2789,31 @@
 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 +111,Date Of Retirement must be greater than Date of Joining,Data e daljes në pension duhet të jetë më i madh se data e bashkimit
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +49,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 +87,{0}% Delivered,{0}% Dorëzuar
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% Dorëzuar
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Item {0}: Qty Urdhërohet {1} nuk mund të jetë më pak se Qty mënyrë minimale {2} (përcaktuar në pikën).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Mujor Përqindja e shpërndarjes
 DocType: Territory,Territory Targets,Synimet Territory
 DocType: Delivery Note,Transporter Info,Transporter Informacion
-apps/erpnext/erpnext/accounts/utils.py +379,Please set default {0} in Company {1},Ju lutemi të vendosur parazgjedhur {0} në Kompaninë {1}
+apps/erpnext/erpnext/accounts/utils.py +456,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
 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.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Titujt për shtypura templates p.sh. ProFORMA faturë.
+DocType: Student Guardian,Student Guardian,Guardian Student
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +184,Valuation type charges can not marked as Inclusive,Akuzat lloj vlerësimi nuk mund të shënuar si gjithëpërfshirës
 DocType: POS Profile,Update Stock,Update Stock
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM ndryshme për sendet do të çojë në të gabuar (Total) vlerën neto Pesha. Sigurohuni që pesha neto e çdo send është në të njëjtën UOM.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Bom Rate
 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 +349,Journal Entries {0} are un-linked,Journal Entries {0} janë të pa-lidhura
+apps/erpnext/erpnext/accounts/utils.py +426,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ë
@@ -2801,6 +2837,7 @@
 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
+DocType: Homepage,"URL for ""All Products""",URL për &quot;Të gjitha Produktet&quot;
 DocType: Leave Application,Leave Balance Before Application,Dërgo Bilanci para aplikimit
 DocType: SMS Center,Send SMS,Dërgo SMS
 DocType: Cheque Print Template,Width of amount in word,Gjerësia e shumës në fjalë
@@ -2809,7 +2846,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 +29,Current Job Openings,Hapje e tanishme e punës
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,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
@@ -2822,7 +2859,7 @@
 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 +850,Show tax break-up,Trego taksave break-up
+apps/erpnext/erpnext/public/js/controllers/transaction.js +841,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/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ë"
@@ -2832,10 +2869,11 @@
 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 +534,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 +80,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 +162,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/selling/doctype/customer/customer.py +195,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 +5,This is based on the attendance of this Student,Kjo është e bazuar në pjesëmarrjen e këtij Student
@@ -2844,12 +2882,11 @@
 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 +75,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 +138,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/hr/doctype/leave_application/leave_application.py +145,Note: There is not enough leave balance for Leave Type {0},Shënim: Nuk ka bilanc mjaft leje për pushim Lloji {0}
 DocType: Program Enrollment Fee,Program Enrollment Fee,Program Tarifa Regjistrimi
 DocType: Item,Supplier Items,Items Furnizuesi
 DocType: Opportunity,Opportunity Type,Mundësi Type
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,Kompania e re
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,Cost Center is required for 'Profit and Loss' account {0},Qendra Kosto është e nevojshme për &quot;Fitimi dhe Humbja e &#39;llogarisë {0}
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Transaksionet mund të fshihet vetëm nga krijuesi i kompanisë
 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.,Numri i pasaktë i Librit Kryesor Entries gjetur. Ju mund të keni zgjedhur një Llogari gabuar në transaksion.
 DocType: Cheque Print Template,Cheque Width,Gjerësia çek
@@ -2858,16 +2895,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,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 +228,{0} '{1}' is disabled,{0} &#39;{1}&#39; është me aftësi të kufizuara
+apps/erpnext/erpnext/controllers/accounts_controller.py +231,{0} '{1}' is disabled,{0} &#39;{1}&#39; është me aftësi të kufizuara
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Bëje si Open
 DocType: Cheque Print Template,Scanned Cheque,skanuar çek
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Dërgo email automatike në Kontaktet për transaksionet Dorëzimi.
+DocType: Timesheet,Total Billable Amount,Shuma totale billable
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Pika 3
 DocType: Purchase Order,Customer Contact Email,Customer Contact Email
 DocType: Warranty Claim,Item and Warranty Details,Pika dhe Garanci Details
 DocType: Sales Team,Contribution (%),Kontributi (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Shënim: Pagesa Hyrja nuk do të jetë krijuar që nga &#39;Cash ose Llogarisë Bankare &quot;nuk ishte specifikuar
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Responsibilities,Përgjegjësitë
+apps/erpnext/erpnext/controllers/accounts_controller.py +78,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ë
 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
@@ -2875,6 +2913,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Shto Përdoruesit
 DocType: Pricing Rule,Item Group,Grupi i artikullit
 DocType: Item,Safety Stock,Siguria Stock
+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: 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)
@@ -2884,7 +2923,6 @@
 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: Timesheet,Total Hours,Totali Orë
 DocType: Journal Entry,Printing Settings,Printime Cilësimet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,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
@@ -2897,13 +2935,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investimeve Bankare
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +71,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
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Customer&gt; Group Customer&gt; Territory
 DocType: Purchase Invoice Item,Rate,Normë
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Intern,Mjek praktikant
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,Mjek praktikant
 DocType: Stock Entry,From BOM,Nga bom
 DocType: Assessment,Assessment Code,Kodi i vlerësimit
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +32,Basic,Themelor
+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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',Ju lutem klikoni në &quot;Generate Listën &#39;
+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 +95,Reference No is mandatory if you entered Reference Date,"Referenca Nuk është e detyrueshme, nëse keni hyrë Reference Data"
@@ -2912,11 +2951,11 @@
 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 +752,Issue Material,Materiali çështje
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +723,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 +683,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 +665,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.
 DocType: Hub Settings,Access Token,Qasja Token
 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ë
@@ -2924,33 +2963,35 @@
 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 +1122,Enter value must be positive,Shkruani Vlera duhet të jetë pozitiv
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,All Territories,Të gjitha Territoret
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1125,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
 DocType: Purchase Invoice,Items,Artikuj
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +23,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 +221,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 +233,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 +96,Request for Quotations,Kërkesën për kuotimin
+apps/erpnext/erpnext/hooks.py +104,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
 DocType: Asset,Partially Depreciated,amortizuar pjesërisht
 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 +628,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Default njësinë e matjes për Varianti &#39;{0}&#39; duhet të jetë i njëjtë si në Template &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Default njësinë e matjes për Varianti &#39;{0}&#39; duhet të jetë i njëjtë si në Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Llogaritur bazuar në
 DocType: Delivery Note Item,From Warehouse,Nga Magazina
 DocType: Assessment,Supervisor Name,Emri Supervisor
+DocType: Assessment,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
 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 +27,Default Address Template cannot be deleted,Default Adresa Template nuk mund të fshihet
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,Default Adresa Template nuk mund të fshihet
 DocType: Sales Invoice,Shipping Rule,Rregulla anijeve
 DocType: Manufacturer,Limited to 12 characters,Kufizuar në 12 karaktere
 DocType: Journal Entry,Print Heading,Printo Kreu
@@ -2965,8 +3006,8 @@
 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/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 +485,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 +336,Please select Posting Date first,"Ju lutem, përzgjidhni datën e postimit parë"
+apps/erpnext/erpnext/stock/get_item_details.py +486,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 +326,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
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Qendra Kosto me transaksionet ekzistuese nuk mund të konvertohet në Ledger
@@ -2982,6 +3023,7 @@
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Pagesat ndeshje me faturat
 DocType: Journal Entry,Bank Entry,Banka Hyrja
 DocType: Authorization Rule,Applicable To (Designation),Për të zbatueshme (Përcaktimi)
+,Profitability Analysis,Analiza e profitabilitetit
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,Futeni në kosh
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Grupi Nga
 DocType: Guardian,Interests,interesat
@@ -2994,21 +3036,21 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,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 +141,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Item serialized {0} nuk mund të rifreskohet \ përdorur Stock Pajtimin
 DocType: Scheduling Tool,Day,ditë
 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 +122,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 +129,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
-DocType: Student Applicant,AP.,AP.
 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 +639,Point of Sale,Pika e Shitjes
+apps/erpnext/erpnext/accounts/page/pos/pos.js +634,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
 DocType: Production Planning Tool,Production Planning Tool,Planifikimi Tool prodhimit
@@ -3017,74 +3059,77 @@
 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 +373,Quantity to Manufacture must be greater than 0.,Sasi të Prodhimi duhet të jetë më e madhe se 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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 Profile,Customer Group,Grupi Klientit
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,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/doctype/asset/asset.py +83,Next Depreciation Date must be on or after today,Zhvlerësimi Data Next duhet të jetë në ose pas sot
 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 +145,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: Quotation,Quotation Lost Reason,Citat Humbur Arsyeja
+apps/erpnext/erpnext/utilities/doctype/address/address.py +164,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.
 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 +330,Transaction reference no {0} dated {1},reference Transaction asnjë {0} datë {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,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 +107,Summary for this month and pending activities,Përmbledhje për këtë muaj dhe aktivitetet në pritje
+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/accounts/doctype/sales_invoice/sales_invoice.py +406,Please remove this Invoice {0} from C-Form {1},Ju lutem hiqni këtë Faturë {0} nga C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,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 +644,Get Items,Get Items
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +623,Get Items,Get Items
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +210,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 +41,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
 DocType: Payment Request,Initiated,Iniciuar
 DocType: Production Order,Planned Start Date,Planifikuar Data e Fillimit
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,Customer is required against Receivable account {0},Customer është i detyruar kundrejt llogarisë arkëtueshme {0}
 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 +265,Project-wise data is not available for Quotation,Të dhënat Project-i mençur nuk është në dispozicion për Kuotim
+apps/erpnext/erpnext/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 +101,Commercial,Komercial
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,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/purchase_invoice/purchase_invoice.py +648,Row {0}# Account must be of type 'Fixed Asset',Row {0} # Llogaria duhet të jenë të tipit &quot;Asset fikse &#39;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,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 +30,Series is mandatory,Seria është i detyrueshëm
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +50,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ë
 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}
 DocType: Leave Allocation,Unused leaves,Gjethet e papërdorura
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Cr,Cr
 DocType: Tax Rule,Billing State,Shteti Faturimi
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +250,Transfer,Transferim
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +187,{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 +825,Fetch exploded BOM (including sub-assemblies),Fetch bom shpërtheu (përfshirë nën-kuvendet)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +254,Transfer,Transferim
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +190,{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 +796,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 +115,Due Date is mandatory,Për shkak Data është e detyrueshme
+apps/erpnext/erpnext/controllers/accounts_controller.py +118,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
 DocType: Journal Entry,Pay To / Recd From,Për të paguar / Recd Nga
 DocType: Naming Series,Setup Series,Setup Series
 DocType: Payment Reconciliation,To Invoice Date,Në faturën Date
 DocType: Supplier,Contact HTML,Kontakt HTML
 ,Inactive Customers,Konsumatorët jo aktive
+DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Pranimet Blerje
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Si Rregulla e Çmimeve aplikohet?
 DocType: Quality Inspection,Delivery Note No,Ofrimit Shënim Asnjë
@@ -3093,7 +3138,7 @@
 DocType: Company,Retail,Me pakicë
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +120,Customer {0} does not exist,Customer {0} nuk ekziston
 DocType: Attendance,Absent,Që mungon
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +587,Product Bundle,Bundle produkt
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Product Bundle,Bundle produkt
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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
@@ -3103,8 +3148,8 @@
 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 +742,Send Supplier Emails,Dërgo email furnizuesi
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +104,"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/buying/doctype/request_for_quotation/request_for_quotation.js +708,Send Supplier Emails,Dërgo email furnizuesi
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,"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
 DocType: Guardian Interest,Guardian Interest,Guardian Interesi
 DocType: Timesheet,Employee Detail,Detail punonjës
@@ -3115,9 +3160,9 @@
 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}
 DocType: Salary Slip,Earning & Deduction,Fituar dhe Zbritje
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +77,Account {0} cannot be a Group,Llogaria {0} nuk mund të jetë një grup
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} cannot be a Group,Llogaria {0} nuk mund të jetë një grup
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +31,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 +107,Negative Valuation Rate is not allowed,Negativ Rate Vlerësimi nuk është e lejuar
+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
 DocType: Holiday List,Weekly Off,Weekly Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Për shembull 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +39,Provisional Profit / Loss (Credit),Fitimi / Humbja e Përkohshme (Credit)
@@ -3131,16 +3176,16 @@
 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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Qendra Kosto është e detyrueshme për Item {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +626,Get Items from Product Bundle,Të marrë sendet nga Bundle produktit
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +605,Get Items from Product Bundle,Të marrë sendet nga Bundle produktit
 DocType: Asset,Straight Line,Vijë e drejtë
 DocType: Project User,Project User,User Project
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} is inactive,Llogaria {0} është joaktiv
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} is inactive,Llogaria {0} është joaktiv
 DocType: GL Entry,Is Advance,Është Advance
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Pjesëmarrja Nga Data dhe Pjesëmarrja deri më sot është e detyrueshme
 apps/erpnext/erpnext/controllers/buying_controller.py +148,Please enter 'Is Subcontracted' as Yes or No,Ju lutemi shkruani &#39;është nënkontraktuar&#39; si Po apo Jo
 DocType: Sales Team,Contact No.,Kontakt Nr
 DocType: Bank Reconciliation,Payment Entries,Entries pagesës
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,'Profit and Loss' type account {0} not allowed in Opening Entry,&quot;Fitimi dhe Humbja &#39;llogaria lloj {0} nuk lejohen në Hapja Hyrja
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +71,'Profit and Loss' type account {0} not allowed in Opening Entry,&quot;Fitimi dhe Humbja &#39;llogaria lloj {0} nuk lejohen në Hapja Hyrja
 DocType: 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
@@ -3159,7 +3204,7 @@
 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,Komisioni për Shitje
 DocType: Offer Letter Term,Value / Description,Vlera / Përshkrim
-apps/erpnext/erpnext/controllers/accounts_controller.py +558,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} nuk mund të paraqitet, ajo është tashmë {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +561,"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: Production Order,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}.
@@ -3172,13 +3217,13 @@
 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/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Legal Expenses,Shpenzimet ligjore
 DocType: Purchase Invoice,Posting Time,Posting Koha
-DocType: Sales Order,% Amount Billed,% Shuma faturuar
+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ë.
 apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},Nuk ka artikull me Serial Nr {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Njoftimet Hapur
+DocType: Email Digest,Open Notifications,Njoftimet Hapur
 DocType: Payment Entry,Difference Amount (Company Currency),Dallimi Shuma (Company Valuta)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,Shpenzimet direkte
 apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
@@ -3186,7 +3231,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Të ardhurat New Customer
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,Shpenzimet e udhëtimit
 DocType: Maintenance Visit,Breakdown,Avari
-apps/erpnext/erpnext/controllers/accounts_controller.py +634,Account: {0} with currency: {1} can not be selected,Llogaria: {0} me monedhën: {1} nuk mund të zgjidhen
+apps/erpnext/erpnext/controllers/accounts_controller.py +637,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}
 DocType: Program Enrollment Tool,Student Applicants,Aplikantët Student
@@ -3194,15 +3239,15 @@
 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 +56,Probation,Provë
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Probation,Provë
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Komponentet e pagave
 DocType: Program Enrollment Tool,New Academic Year,New Year akademik
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Payment of salary for the month {0} and year {1},Pagesa e pagës për muajin {0} dhe vitin {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Payment of salary for the month {0} and year {1},Pagesa e pagës për muajin {0} dhe vitin {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Auto insert Shkalla Lista e Çmimeve nëse mungon
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Gjithsej shuma e paguar
 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 +144,Planning,Planifikim
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,Planifikim
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,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
@@ -3215,11 +3260,10 @@
 DocType: Sales Partner,Contact Desc,Kontakt Përshkrimi
 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.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Sales invoice submitted sucessfully.,Sales fatura dorëzuar me sukses.
 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}
 DocType: Assessment Result,Student Name,Emri i studentit
-apps/erpnext/erpnext/hooks.py +104,Assessment Schedule,Orari i vlerësimit
+apps/erpnext/erpnext/hooks.py +113,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
@@ -3229,6 +3273,7 @@
 DocType: GL Entry,Party Type,Lloji Partia
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +78,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ë
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Mjeshtër paga template.
 DocType: Leave Type,Max Days Leave Allowed,Max Ditët Pushimi Lejohet
@@ -3240,18 +3285,19 @@
 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 +99,All Customer Groups,Të gjitha grupet e konsumatorëve
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +78,Accumulated Monthly,akumuluar mujore
-apps/erpnext/erpnext/controllers/accounts_controller.py +595,{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/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Të gjitha grupet e konsumatorëve
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +81,Accumulated Monthly,akumuluar mujore
+apps/erpnext/erpnext/controllers/accounts_controller.py +598,{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
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Lista e Çmimeve Rate (Kompania Valuta)
 DocType: Products Settings,Products Settings,Produkte Settings
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +188,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
 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 +84,Secretary,Sekretar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,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
@@ -3260,24 +3306,22 @@
 ,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
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,Row # {0}: Asnjë Serial është i detyrueshëm
+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 +859,Supplier Quotation,Furnizuesi Citat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +838,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 +7,Collect Fees,Mblidhni Taksat
+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}
 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.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Ngjarje të ardhshme
 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
-DocType: Email Digest,Income / Expense,Të ardhurat / shpenzimeve
 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."
@@ -3288,13 +3332,14 @@
 DocType: Customer,From Lead,Nga Lead
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Urdhërat lëshuar për prodhim.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Zgjidh Vitin Fiskal ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,POS Profile required to make POS Entry,POS Profilin nevojshme për të bërë POS Hyrja
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +509,POS Profile required to make POS Entry,POS Profilin nevojshme për të bërë POS Hyrja
 DocType: Program Enrollment Tool,Enroll Students,regjistrohen Studentët
 DocType: Hub Settings,Name Token,Emri Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Shitja Standard
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Atleast one warehouse is mandatory,Atleast një depo është e detyrueshme
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +129,Atleast one warehouse is mandatory,Atleast një depo është e detyrueshme
 DocType: Serial No,Out of Warranty,Nga Garanci
 DocType: BOM Replace Tool,Replace,Zëvendësoj
+DocType: Production Order,Unstopped,hapen
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{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
@@ -3315,10 +3360,11 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,Lë duhet të ndahen në shumëfisha e 0.5
 DocType: Production Order,Operation Cost,Operacioni Kosto
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,Ngarko pjesëmarrjen nga një skedar CSV
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Amt Outstanding
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Caqet e përcaktuara Item Grupi-mençur për këtë person të shitjes.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Stoqet Freeze vjetër se [Ditët]
-apps/erpnext/erpnext/controllers/accounts_controller.py +528,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: Asset është e detyrueshme për të aseteve fikse blerje / shitje
+apps/erpnext/erpnext/controllers/accounts_controller.py +531,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: Asset është e detyrueshme për të aseteve fikse blerje / shitje
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Nëse dy ose më shumë Rregullat e Çmimeve janë gjetur në bazë të kushteve të mësipërme, Prioritet është aplikuar. Prioritet është një numër mes 0 deri ne 20, ndërsa vlera e parazgjedhur është zero (bosh). Numri më i lartë do të thotë se do të marrë përparësi nëse ka rregulla të shumta çmimeve me kushte të njëjta."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Viti Fiskal: {0} nuk ekziston
 DocType: Currency Exchange,To Currency,Për të Valuta
@@ -3335,15 +3381,15 @@
 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
-DocType: Sales Invoice,Exhibition,Ekspozitë
 apps/erpnext/erpnext/utilities/doctype/address/address.py +77,"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 +81,Syntax error in formula or condition: {0},gabim sintakse në formulën ose kushte: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +92,Syntax error in formula or condition: {0},gabim sintakse në formulën ose kushte: {0}
 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
+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 +28,Jobs,Jobs
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,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
@@ -3352,16 +3398,16 @@
 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 +763,Make Supplier Quotation,Bëjnë Furnizuesi Kuotim
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,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/controllers/sales_and_purchase_return.py +100,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 +42,Casual Leave,Lini Rastesishme
+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
 DocType: Batch,Batch ID,ID Batch
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,Note: {0},Shënim: {0}
 ,Delivery Note Trends,Trendet ofrimit Shënim
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +103,This Week's Summary,Përmbledhja e kësaj jave
+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
 DocType: Student Group Creation Tool,Get Courses,Get Kurse
 DocType: GL Entry,Party,Parti
@@ -3371,7 +3417,7 @@
 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 +59,Piecework,Punë me copë
+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
 DocType: Task,Actual Time (in Hours),Koha aktuale (në orë)
 DocType: Employee,History In Company,Historia Në kompanisë
@@ -3388,7 +3434,7 @@
 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.
 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 +162,Black,E zezë
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,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
@@ -3399,13 +3445,13 @@
 DocType: Project Task,Pending Review,Në pritje Rishikimi
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +106,"Asset {0} cannot be scrapped, as it is already {1}","Asset {0} nuk mund të braktiset, pasi ajo është tashmë {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Gjithsej Kërkesa shpenzimeve (nëpërmjet shpenzimeve Kërkesës)
-apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +69,Customer Id,Customer Id
+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
 DocType: Journal Entry Account,Exchange Rate,Exchange Rate
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Sales Order {0} is not submitted,Sales Order {0} nuk është dorëzuar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +527,Sales Order {0} is not submitted,Sales Order {0} nuk është dorëzuar
 DocType: Homepage,Tag Line,tag Line
 DocType: Fee Component,Fee Component,Komponenti Fee
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +857,Add items from,Shto artikuj nga
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +836,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}
 DocType: Cheque Print Template,Regular,i rregullt
 DocType: BOM,Last Purchase Rate,Rate fundit Blerje
@@ -3413,6 +3459,7 @@
 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
 ,Sales Person-wise Transaction Summary,Sales Person-i mençur Përmbledhje Transaction
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +60,Cost Center is required for 'Profit and Loss' account {0}. Please set up a default Cost Center for the Company.,Qendra Kosto është e nevojshme për llogarinë &quot;Fitimi dhe Humbja &#39;{0}. Ju lutemi të ngritur një qendër me kosto të paracaktuar për kompaninë.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,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
@@ -3423,12 +3470,12 @@
 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 +710,Online,online
+apps/erpnext/erpnext/accounts/page/pos/pos.js +692,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 +16,Setting this Address Template as default as there is no other default,Vendosja këtë adresë Template si default pasi nuk ka asnjë mungesë tjetër
+apps/erpnext/erpnext/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
 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 +74,Quality Management,Menaxhimit të Cilësisë
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,Menaxhimit të Cilësisë
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,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
@@ -3450,11 +3497,12 @@
 DocType: Student,Student Email ID,Student Email ID
 DocType: Employee,Notice (days),Njoftim (ditë)
 DocType: Tax Rule,Sales Tax Template,Template Sales Tax
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1520,Select items to save the invoice,Zgjidhni artikuj për të shpëtuar faturën
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1544,Select items to save the invoice,Zgjidhni artikuj për të shpëtuar faturën
 DocType: Employee,Encashment Date,Arkëtim Data
 DocType: Account,Stock Adjustment,Stock Rregullimit
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Kosto e albumit Aktiviteti ekziston për Aktivizimi Tipi - {0}
 DocType: Production Order,Planned Operating Cost,Planifikuar Kosto Operative
+DocType: Academic Term,Term Start Date,Term Data e fillimit
 apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},Ju lutem gjeni bashkangjitur {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Balanca Deklarata Banka sipas Librit Kryesor
 DocType: Job Applicant,Applicant Name,Emri i aplikantit
@@ -3484,17 +3532,17 @@
 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.
 DocType: Company,Distribution,Shpërndarje
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +8,Amount Paid,Shuma e paguar
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Project Manager,Menaxher i Projektit
+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
 ,Quoted Item Comparison,Cituar Item Krahasimi
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Dispatch,Dërgim
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,Dërgim
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max zbritje lejohet për artikull: {0} është {1}%
 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.
-DocType: Sales Invoice,Supplier Reference,Furnizuesi Referenca
-apps/erpnext/erpnext/accounts/page/pos/pos.js +844,"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 +832,"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
@@ -3508,7 +3556,7 @@
 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 +83,Error in formula or condition,Gabim në formulën ose gjendje
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,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
@@ -3517,7 +3565,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},Deri më sot duhet të jetë brenda vitit fiskal. Duke supozuar në datën = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Këtu ju mund të mbajë lartësia, pesha, alergji, shqetësimet mjekësore etj"
 DocType: Leave Block List,Applies to Company,Zbatohet për Kompaninë
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +197,Cannot cancel because submitted Stock Entry {0} exists,"Nuk mund të anulojë, sepse paraqitet Stock Hyrja {0} ekziston"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +198,Cannot cancel because submitted Stock Entry {0} exists,"Nuk mund të anulojë, sepse paraqitet Stock Hyrja {0} ekziston"
 DocType: Purchase Invoice,In Words,Me fjalë të
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,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
@@ -3527,14 +3575,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,Vitin e juaj financiare fillon më
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Nënçmime aseteve dhe Bilancet
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +319,Amount {0} {1} transferred from {2} to {3},Shuma {0} {1} transferuar nga {2} të {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +322,Amount {0} {1} transferred from {2} to {3},Shuma {0} {1} transferuar nga {2} të {3}
 DocType: Sales Invoice,Get Advances Received,Get Përparimet marra
 DocType: Email Digest,Add/Remove Recipients,Add / Remove Recipients
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +432,Transaction not allowed against stopped Production Order {0},Transaksioni nuk lejohet kundër Prodhimit ndalur Rendit {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +437,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 +143,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 +652,Item variant {0} exists with same attributes,Item variant {0} ekziston me atributet e njëjta
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Item variant {0} ekziston me atributet e njëjta
+DocType: Leave Application,LAP/,LAP /
 DocType: Salary Slip,Salary Slip,Shqip paga
 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
@@ -3542,12 +3591,12 @@
 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 +212,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 +215,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/public/js/controllers/transaction.js +866,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 +857,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ë
@@ -3557,14 +3606,14 @@
 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 +178,Invalid {0},Invalid {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Sick Leave,Pushimi mjekësor
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,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
 DocType: Warehouse,PIN,GJILPËRË
 DocType: Sales Invoice,Base Change Amount (Company Currency),Base Ndryshimi Shuma (Company Valuta)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +313,No accounting entries for the following warehouses,Nuk ka hyrje të kontabilitetit për magazinat e mëposhtme
-apps/erpnext/erpnext/projects/doctype/project/project.js +102,Save the document first.,Ruaj dokumentin e parë.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +314,No accounting entries for the following warehouses,Nuk ka hyrje të kontabilitetit për magazinat e mëposhtme
+apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Ruaj dokumentin e parë.
 DocType: Account,Chargeable,I dënueshëm
 DocType: Company,Change Abbreviation,Ndryshimi Shkurtesa
 DocType: Expense Claim Detail,Expense Date,Shpenzim Data
@@ -3577,10 +3626,9 @@
 DocType: Purchase Invoice,Recurring Print Format,Format përsëritur Print
 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,Pritet Data e dorëzimit nuk mund të jetë para se të Rendit Blerje Data
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,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
 DocType: Appraisal,Appraisal Template,Vlerësimi Template
 DocType: Item Group,Item Classification,Klasifikimi i artikullit
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Business Development Manager,Zhvillimin e Biznesit Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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
@@ -3590,8 +3638,8 @@
 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 +940,Please select {0} first,"Ju lutem, përzgjidhni {0} parë"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +749,Batch {0} of Item {1} has expired.,Batch {0} i artikullit {1} ka skaduar.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +953,Please select {0} first,"Ju lutem, përzgjidhni {0} parë"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +757,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
@@ -3608,8 +3656,8 @@
 {% 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 +92,Warehouse not found in the system,Magazina nuk gjendet ne sistem
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +106,This Month's Summary,Përmbledhje këtij muaji
+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
 DocType: Quality Inspection Reading,Quality Inspection Reading,Inspektimi Leximi Cilësia
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Ngrij Stoqet me te vjetra se` duhet të jetë më e vogël se% d ditë.
 DocType: Tax Rule,Purchase Tax Template,Blerje Template Tatimore
@@ -3619,21 +3667,22 @@
 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 +87,Please set Next Depreciation Date,Ju lutemi të vendosur Date Amortizimi tjetër
-DocType: Payment Gateway,Payment Gateway,Gateway Pagesa
 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 +378,Operation Time must be greater than 0 for Operation {0},Operacioni Koha duhet të jetë më e madhe se 0 për Operacionin {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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/accounts/doctype/account/account.py +170,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)
 DocType: Program,Program Abbreviation,Shkurtesa program
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,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: Appraisal,Start Date,Data e Fillimit
@@ -3649,21 +3698,22 @@
 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
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,P.sh.. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +27,Transaction currency must be same as Payment Gateway currency,Monedha transaksion duhet të jetë i njëjtë si pagesë Gateway valutë
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Transaction currency must be same as Payment Gateway currency,Monedha transaksion duhet të jetë i njëjtë si pagesë Gateway valutë
 DocType: Payment Entry,Receive,Merre
+apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,Citate:
 DocType: Maintenance Visit,Fully Completed,Përfunduar Plotësisht
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Complete
 DocType: Employee,Educational Qualification,Kualifikimi arsimor
 DocType: Workstation,Operating Costs,Shpenzimet Operative
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Veprimi në qoftë akumuluar tejkaluar buxhetin mujor
 DocType: Purchase Invoice,Submit on creation,Submit në krijimin
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +432,Currency for {0} must be {1},Monedhë për {0} duhet të jetë {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +435,Currency for {0} must be {1},Monedhë për {0} duhet të jetë {1}
 DocType: Asset,Disposal Date,Shkatërrimi Date
 DocType: Employee Leave Approver,Employee Leave Approver,Punonjës Pushimi aprovuesi
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,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 +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/crm/doctype/opportunity/opportunity.py +79,"Cannot declare as lost, because Quotation has been made.","Nuk mund të deklarojë si të humbur, sepse Kuotim i është bërë."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Blerje Master Menaxher
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +429,Production Order {0} must be submitted,Prodhimi Rendit {0} duhet të dorëzohet
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +434,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
@@ -3673,25 +3723,27 @@
 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/accounts/report/general_ledger/general_ledger.py +181,Totals,Totalet
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,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 +113,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 +120,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.
+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 +181,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/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 +793,All records are synced.,Të gjitha të dhënat janë synced.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +781,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
 DocType: Cost Center,Cost Center Name,Kosto Emri Qendra
@@ -3710,21 +3762,20 @@
 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/selling/doctype/quotation/quotation.py +49,Cannot set as Lost as Sales Order is made.,Nuk mund të vendosur si Humbur si Sales Order është bërë.
-DocType: Student Applicant,Mother's Name,Emri i nënës
 DocType: Request for Quotation Item,Supplier Part No,Furnizuesi Part No
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +348,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Nuk mund të zbres kur kategori është për &#39;vlerësimin&#39; ose &#39;Vaulation dhe Total &quot;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Received From,Marrë nga
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Received From,Marrë nga
 DocType: Lead,Converted,Konvertuar
 DocType: Item,Has Serial No,Nuk ka Serial
 DocType: Employee,Date of Issue,Data e lëshimit
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{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 +93,Row {0}: Hours value must be greater than zero.,Row {0}: Hours Vlera duhet të jetë më e madhe se zero.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +117,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
 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 +172,{0} {1} does not exist,{0} {1} nuk ekziston
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +175,{0} {1} does not exist,{0} {1} nuk ekziston
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,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 +72,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
@@ -3733,13 +3784,14 @@
 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/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
 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 +109,Electrical,Elektrik
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,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 +318,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}
@@ -3747,7 +3799,7 @@
 DocType: Item,Customer Code,Kodi Klientit
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +210,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 +292,Debit To account must be a Balance Sheet account,Debi Për shkak duhet të jetë një llogari Bilanci i Gjendjes
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To account must be a Balance Sheet account,Debi Për shkak duhet të jetë një llogari Bilanci i Gjendjes
 DocType: Buying Settings,Naming Series,Emërtimi Series
 DocType: Leave Block List,Leave Block List Name,Dërgo Block Lista Emri
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Pasuritë e aksioneve
@@ -3759,11 +3811,11 @@
 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 +301,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 +313,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: Sales Order Item,Ordered Qty,Urdhërohet Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +673,Item {0} is disabled,Item {0} është me aftësi të kufizuara
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,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 +838,BOM does not contain any stock item,BOM nuk përmban ndonjë artikull aksioneve
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +809,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.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generate paga rrëshqet
@@ -3771,23 +3823,24 @@
 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)
-apps/erpnext/erpnext/stock/doctype/item/item.py +485,Row #{0}: Please set reorder quantity,Row # {0}: Ju lutemi të vendosur sasinë Reorder
+DocType: Sales Invoice Timesheet,Billing Hours,faturimit Hours
+apps/erpnext/erpnext/stock/doctype/item/item.py +487,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 +62,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
+DocType: Payment Entry,Allocate Payment Amount,Alokimi Shuma e pagesës
 DocType: Employee External Work History,Salary,Rrogë
 DocType: Serial No,Delivery Document Type,Ofrimit Dokumenti Type
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Paraqit të gjitha rrëshqet pagave për kriteret e përzgjedhura më sipër
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} Items synced
 DocType: Sales Order,Partly Delivered,Dorëzuar Pjesërisht
-DocType: Sales Invoice,Existing Customer,Konsumator ekzistuese
 DocType: Email Digest,Receivables,Arkëtueshme
+DocType: Lead Source,Lead Source,Burimi Lead
 DocType: Customer,Additional information regarding the customer.,Informacion shtesë në lidhje me konsumatorin.
 DocType: Quality Inspection Reading,Reading 5,Leximi 5
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +38,Campaign Name is required,Emri Fushata është e nevojshme
 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
@@ -3795,10 +3848,9 @@
 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 +129,BOM and Manufacturing Quantity are required,BOM dhe Prodhim Sasi janë të nevojshme
+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/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Gama plakjen 2
 DocType: SG Creation Tool Course,Max Strength,Max Forca
-DocType: Bank Reconciliation Detail,Amount,Sasi
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Bom zëvendësohet
 ,Sales Analytics,Sales Analytics
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +113,Available {0},Në dispozicion {0}
@@ -3806,14 +3858,14 @@
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Ngritja me e-mail
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +96,Please enter default currency in Company Master,Ju lutem shkruani monedhën parazgjedhje në kompaninë Master
 DocType: Stock Entry Detail,Stock Entry Detail,Stock Hyrja Detail
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +100,Daily Reminders,Harroni të Përditshëm
+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/account/account_tree.js +23,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 +71,Customer Service,Shërbimi ndaj klientit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Customer Service,Shërbimi ndaj klientit
 DocType: Homepage Featured Product,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.
@@ -3822,8 +3874,9 @@
 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
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Default Puna Në Magazina Progresit
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1570,Total nos of serial no is not equal to quantity.,nos totale e nr serial nuk është e barabartë me sasinë.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1594,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
@@ -3831,9 +3884,10 @@
 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 +82,Engineer,Inxhinier
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,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 +370,Item Code required at Row No {0},Kodi i artikullit kërkohet në radhë nr {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +398,Item Code required at Row No {0},Kodi i artikullit kërkohet në radhë nr {0}
 DocType: Sales Partner,Partner Type,Lloji Partner
 DocType: Purchase Taxes and Charges,Actual,Aktual
 DocType: Authorization Rule,Customerwise Discount,Customerwise Discount
@@ -3849,16 +3903,18 @@
 DocType: BOM,Raw Material Cost,Raw Material Kosto
 DocType: Item Reorder,Re-Order Level,Re-Rendit nivel
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Shkruani artikuj dhe Qty planifikuar për të cilën ju doni të rritur urdhërat e prodhimit ose shkarkoni materiale të papërpunuara për analizë.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +55,Part-time,Me kohë të pjesshme
+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
 DocType: Employee,Applicable Holiday List,Zbatueshme Lista Holiday
 DocType: Employee,Cheque,Çek
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Seria Përditësuar
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +57,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
 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 +87,Clearance Date updated,Pastrimi Date updated
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Harmonizuar me sukses
@@ -3872,7 +3928,7 @@
 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 +513,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 +518,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.
@@ -3882,7 +3938,7 @@
 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/stock/doctype/stock_entry/stock_entry.py +158,Target warehouse in row {0} must be same as Production Order,Magazinë synuar në radhë {0} duhet të jetë i njëjtë si Rendit Prodhimi
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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"
 DocType: Company,Round Off Account,Rrumbullakët Off Llogari
@@ -3891,23 +3947,22 @@
 DocType: Customer Group,Parent Customer Group,Grupi prind Klientit
 DocType: Purchase Invoice,Contact Email,Kontakti Email
 DocType: Appraisal Goal,Score Earned,Vota fituara
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Notice Period,Periudha Njoftim
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,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 +4,New Sales Person Name,Emri i ri Sales Person
 DocType: Packing Slip,Gross Weight UOM,Bruto Pesha UOM
-DocType: Email Digest,Receivables / Payables,Arketueshme / Te Pagueshme
 DocType: Delivery Note Item,Against Sales Invoice,Kundër Sales Faturës
 DocType: Bin,Reserved Qty for Production,Rezervuar Qty për Prodhimin
 DocType: Asset,Frequency of Depreciation (Months),Frekuenca e Zhvlerësimit (Muaj)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +469,Credit Account,Llogaria e Kredisë
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Credit Account,Llogaria e Kredisë
 DocType: Landed Cost Item,Landed Cost Item,Kosto zbarkoi Item
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +55,Show zero values,Trego zero vlerat
+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
 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 +647,Please specify Attribute Value for attribute {0},Ju lutem specifikoni atribut Vlera për atribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Ju lutem specifikoni atribut Vlera për atribut {0}
 DocType: Item,Default Warehouse,Gabim Magazina
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +39,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
@@ -3929,19 +3984,22 @@
 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
-DocType: Sales Invoice,Cold Calling,Thirrje të ftohtë
 DocType: SMS Parameter,SMS Parameter,SMS Parametri
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,Buxheti dhe Qendra Kosto
 DocType: Maintenance Schedule Item,Half Yearly,Gjysma vjetore
 DocType: Lead,Blog Subscriber,Blog Subscriber
+DocType: Guardian,Alternate Number,Numri Alternate
 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."
+DocType: Stock Reconciliation Item,Quantity Difference,sasia Diferenca
 apps/erpnext/erpnext/config/hr.py +253,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 +141,Set as Lost,Bëje si Lost
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,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 +5,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
 DocType: Supplier,Credit Days Based On,Ditët e kredisë së bazuar në
@@ -3953,11 +4011,10 @@
 ,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 +941,Select or add new customer,Zgjidhni ose shtoni klient të ri
+apps/erpnext/erpnext/accounts/page/pos/pos.js +930,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 +5,This is based on the attendance of this Employee,Kjo është e bazuar në pjesëmarrjen e këtij punonjësi
-DocType: Sales Invoice,Frequency,frekuencë
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +463,Debit Account,Llogaria Debiti
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,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)
@@ -3966,27 +4023,27 @@
 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 +210,Supplier Quotation {0} created,Furnizuesi Citat {0} krijuar
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +208,Supplier Quotation {0} created,Furnizuesi Citat {0} krijuar
 apps/erpnext/erpnext/accounts/report/financial_statements.py +90,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 +173,Employee Benefits,Përfitimet e Punonjësve
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,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 +228,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 +232,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 +499,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 +500,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 +1007,Price List not found or disabled,Lista e Çmimeve nuk u gjet ose me aftësi të kufizuara
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1008,Price List not found or disabled,Lista e Çmimeve nuk u gjet ose me aftësi të kufizuara
 DocType: Expense Claim,Approved,I miratuar
 DocType: Pricing Rule,Price,Çmim
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +244,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 +256,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
@@ -3997,12 +4054,12 @@
 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 +259,Please select Employee Record first.,"Ju lutem, përzgjidhni Record punonjës parë."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +266,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 +190,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 +235,Please enter Expense Account,Ju lutemi shkruani Llogari kurriz
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,Please enter Expense Account,Ju lutemi shkruani Llogari kurriz
 DocType: Account,Stock,Stock
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,"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 +976,"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
@@ -4017,9 +4074,10 @@
 DocType: Asset Movement,Transaction Date,Transaksioni Data
 DocType: Production Plan Item,Planned Qty,Planifikuar Qty
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,Tatimi Total
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,For Quantity (Manufactured Qty) is mandatory,Për sasinë (Prodhuar Qty) është i detyrueshëm
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,For Quantity (Manufactured Qty) is mandatory,Për sasinë (Prodhuar Qty) është i detyrueshëm
 DocType: Stock Entry,Default Target Warehouse,Gabim Magazina Target
 DocType: Purchase Invoice,Net Total (Company Currency),Net Total (Kompania Valuta)
+apps/erpnext/erpnext/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 +78,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: Production Order,Actual Start Date,Aktuale Data e Fillimit
@@ -4034,9 +4092,11 @@
 DocType: Warranty Claim,If different than customer address,Nëse është e ndryshme se sa adresën e konsumatorëve
 DocType: BOM Operation,BOM Operation,Bom Operacioni
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Në Shuma Previous Row
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +226,Transfer Asset,Asset Transfer
+DocType: Student,Home Address,Adresa e shtepise
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +227,Transfer Asset,Asset Transfer
 DocType: POS Profile,POS Profile,POS Profilin
 apps/erpnext/erpnext/config/schools.py +33,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 +129,"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
@@ -4046,8 +4106,8 @@
 DocType: Assessment,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 +765,Material to Supplier,Materiale për Furnizuesin
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +189,Excise Invoice,Akciza Faturë
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,Material to Supplier,Materiale për Furnizuesin
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,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
@@ -4057,7 +4117,7 @@
 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/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 +136,Credit Card,Credit Card
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,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.
 DocType: Purchase Invoice,Next Date,Next Data
@@ -4065,6 +4125,7 @@
 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: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Këtu ju mund të mbajë të dhënat e familjes si emrin dhe profesionin e prindërve, bashkëshortit dhe fëmijëve"
+DocType: Academic Term,Term End Date,Term End Date
 DocType: Hub Settings,Seller Name,Shitës Emri
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Taksat dhe Tarifat zbritet (Kompania Valuta)
 DocType: Item Group,General Settings,Cilësimet përgjithshme
@@ -4076,7 +4137,7 @@
 DocType: Customer,Commission Rate,Rate Komisioni
 apps/erpnext/erpnext/stock/doctype/item/item.js +261,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 +115,"Payment Type must be one of Receive, Pay and Internal Transfer","Pagesa Lloji duhet të jetë një nga Merre, të paguajë dhe Transfer të Brendshme"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +118,"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/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Shporta është bosh
 DocType: Production Order,Actual Operating Cost,Aktuale Kosto Operative
@@ -4091,10 +4152,10 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,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 +92,Designer,Projektues
+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
 DocType: Serial No,Delivery Details,Detajet e ofrimit të
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +469,Cost Center is required in row {0} in Taxes table for type {1},Qendra Kosto është e nevojshme në rresht {0} në Tatimet tryezë për llojin {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +472,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
 ,Item-wise Purchase Register,Pika-mençur Blerje Regjistrohu
 DocType: Batch,Expiry Date,Data e Mbarimit
@@ -4104,12 +4165,12 @@
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Mjeshtër projekt.
 apps/erpnext/erpnext/controllers/status_updater.py +174,"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 +417, (Half Day),(Gjysme Dite)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425, (Half Day),(Gjysme Dite)
 DocType: Supplier,Credit Days,Ditët e kreditit
 DocType: Leave Type,Is Carry Forward,Është Mbaj Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +740,Get Items from BOM,Të marrë sendet nga bom
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +711,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 +549,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/controllers/accounts_controller.py +552,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
diff --git a/erpnext/translations/sr-SP.csv b/erpnext/translations/sr-SP.csv
index e69de29..60cd8ed 100644
--- a/erpnext/translations/sr-SP.csv
+++ b/erpnext/translations/sr-SP.csv
@@ -0,0 +1,16 @@
+DocType: Request for Quotation Item,Project Name,Naziv Projekta
+DocType: GL Entry,Project,Projekat
+DocType: Journal Entry Account,Sales Invoice,Fakture
+apps/erpnext/erpnext/config/learn.py +268,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
+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
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Vrijednost Projekta
+apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Projektna aktivnost / zadatak
+DocType: Journal Entry Account,Sales Order,Narudžbine kupaca
diff --git a/erpnext/translations/sr.csv b/erpnext/translations/sr.csv
index 17f9e68..98181bd 100644
--- a/erpnext/translations/sr.csv
+++ b/erpnext/translations/sr.csv
@@ -18,11 +18,10 @@
 DocType: Sales Partner,Dealer,Трговац
 DocType: Employee,Rented,Изнајмљени
 DocType: Purchase Order,PO-,po-
-apps/erpnext/erpnext/accounts/report/financial_statements.py +19,Start Year {0} not found.,Поцетна година {0} није пронађен.
 DocType: POS Profile,Applicable for User,Важи за кориснике
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +191,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Стоппед Производња поредак не може бити поништен, то Унстоп прво да откажете"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +197,Do you really want to scrap this asset?,Да ли заиста желите да укине ову имовину?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +17,Select Default Supplier,Изаберите Примарни добављач
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +192,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Стоппед Производња поредак не може бити поништен, то Унстоп прво да откажете"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +198,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 +36,Currency is required for Price List {0},Валута је потребан за ценовнику {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Биће обрачунато у овој трансакцији.
 DocType: Address,County,округ
@@ -42,46 +41,45 @@
 DocType: Sales Invoice,Customer Name,Име клијента
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +126,Bank account cannot be named as {0},Жиро рачун не може бити именован као {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Хеадс (или групе) против које рачуноводствене уноси се праве и биланси се одржавају.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +180,Outstanding for {0} cannot be less than zero ({1}),Выдающийся для {0} не может быть меньше нуля ( {1} )
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,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 +148,Series Updated Successfully,Серия Обновлено Успешно
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +149,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,Све Снабдевач Контакт
-DocType: Quality Inspection Reading,Parameter,Параметар
 apps/erpnext/erpnext/projects/doctype/project/project.py +54,Expected End Date can not be less than Expected Start Date,Очекивани Датум завршетка не може бити мањи од очекиваног почетка Датум
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Ред # {0}: курс мора да буде исти као {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +239,New Leave Application,Нова апликација одсуство
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,New Leave Application,Нова апликација одсуство
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +20,Attendance Record {0} exists against Student {1} for Course Schedule {2},Присуство Рекорд {0} постоји против Студента {1} за Цоурсе Сцхедуле {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Bank Draft,Банка Нацрт
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,Банка Нацрт
 DocType: Mode of Payment Account,Mode of Payment Account,Начин плаћања налог
 apps/erpnext/erpnext/stock/doctype/item/item.js +52,Show Variants,Схов Варијанте
 DocType: Academic Term,Academic Term,akademski Рок
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +13,Material,Материјал
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Quantity,Количина
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +511,Accounts table cannot be blank.,Рачуни сто не мозе бити празна.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +616,Quantity,Количина
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +512,Accounts table cannot be blank.,Рачуни сто не мозе бити празна.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,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/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 +142,User {0} is already assigned to Employee {1},Пользователь {0} уже назначен Employee {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,здравство
-DocType: Purchase Invoice,Monthly,Месечно
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Кашњење у плаћању (Дани)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +771,Invoice,Фактура
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +750,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 +198,Row {0}: {1} {2} does not match with {3},Ров {0}: {1} {2} не поклапа са {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Ров # {0}:
+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 +127,Please select Price List,Изаберите Ценовник
@@ -112,8 +110,8 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Иста компанија је ушла у више наврата
 DocType: Employee,Married,Ожењен
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Није дозвољено за {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +589,Get items from,Гет ставке из
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +382,Stock cannot be updated against Delivery Note {0},Фото не могут быть обновлены против накладной {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Гет ставке из
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,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,бакалница
@@ -122,7 +120,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 +156,Salary Structure Missing,Плата Структура Недостаје
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Salary Structure Missing,Плата Структура Недостаје
 DocType: Lead,Person Name,Особа Име
 DocType: Sales Invoice Item,Sales Invoice Item,Продаја Рачун шифра
 DocType: Account,Credit,Кредит
@@ -130,10 +128,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,stock Извештаји
 DocType: Warehouse,Warehouse Detail,Магацин Детаљ
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,Credit limit has been crossed for customer {0} {1}/{2},Пређена кредитни лимит за купца {0} {1} / {2}
-apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Да ли је основних средстава&quot; не може бити неконтролисано, као средствима запис постоји у односу на ставке"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +189,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; не може бити неконтролисано, као средствима запис постоји у односу на ставке"
 DocType: Tax Rule,Tax Type,Пореска Тип
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +144,You are not authorized to add or update entries before {0},"Вы не авторизованы , чтобы добавить или обновить записи до {0}"
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},"Вы не авторизованы , чтобы добавить или обновить записи до {0}"
 DocType: Item,Item Image (if not slideshow),Артикал слика (ако не слидесхов)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Существуетклиентов с одноименным названием
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Час курс / 60) * Пуна Операција време
@@ -143,18 +142,17 @@
 DocType: Student Log,Student Log,студент се
 DocType: Quality Inspection,Get Specification Details,Гет Детаљи Спецификација
 DocType: Lead,Interested,Заинтересован
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +165,Opening,Отварање
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,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/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Цустомер&gt; купац Група&gt; Територија
 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.,Счет с существующей сделки не могут быть преобразованы в группы .
 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,Молимо унесите прва компанија
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Company first,Одредите прво Компанија
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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,Укупни трошкови
@@ -164,7 +162,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Изјава рачуна
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Фармација
 DocType: Purchase Invoice Item,Is Fixed Asset,Је основних средстава
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Available qty is {0}, you need {1}","Доступно ком је {0}, потребно је {1}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +225,"Available qty is {0}, you need {1}","Доступно ком је {0}, потребно је {1}"
 DocType: Expense Claim Detail,Claim Amount,Захтев Износ
 DocType: Employee,Mr,Господин
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Добављач Тип / Добављач
@@ -173,26 +171,27 @@
 DocType: Employee,B-,Б-
 DocType: Upload Attendance,Import Log,Увоз се
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Повуците Материал захтев типа производње на основу горе наведених критеријума
+DocType: Assessment Result,Grade,разред
 DocType: Sales Invoice Item,Delivered By Supplier,Деливеред добављач
 DocType: SMS Center,All Contact,Све Контакт
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Annual Salary,Годишња плата
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Акции Расходы
-apps/erpnext/erpnext/accounts/report/financial_statements.py +22,End Year {0} not found.,До краја године {0} није пронађен.
 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}
 DocType: Request for Quotation,RFQ-,РФК-
 DocType: Item,Supply Raw Materials for Purchase,Набавка сировина за куповину
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +130,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 +451,Item {0} is not active or end of life has been reached,Пункт {0} не является активным или конец жизни был достигнут
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +456,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/controllers/accounts_controller.py +614,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Для учета налога в строке {0} в размере Item , налоги в строках должны быть также включены {1}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +617,"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 +166,Settings for HR Module,Настройки для модуля HR
 DocType: SMS Center,SMS Center,СМС центар
 DocType: Sales Invoice,Change Amount,Промена Износ
@@ -204,13 +203,13 @@
 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 +147,Execution,извршење
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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,Предмети и цене
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Укупно часова: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},Од датума треба да буде у оквиру фискалне године. Под претпоставком Од датума = {0}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,Cost Center {0} does not belong to Company {1},МВЗ {0} не принадлежит компании {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +100,Cost Center {0} does not belong to Company {1},МВЗ {0} не принадлежит компании {1}
 DocType: Customer,Individual,Појединац
 DocType: Interest,Academics User,akademici Корисник
 DocType: Cheque Print Template,Amount In Figure,Износ На слици
@@ -226,30 +225,32 @@
 DocType: Production Planning Tool,Sales Orders,Салес Ордерс
 DocType: Purchase Taxes and Charges,Valuation,Вредновање
 ,Purchase Order Trends,Куповина Трендови Ордер
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,The request for quotation can be accessed by clicking on the following link,Захтев за котацију се може приступити кликом на следећи линк
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,Додела лишће за годину.
 DocType: SG Creation Tool Course,SG Creation Tool Course,СГ Стварање Алат курс
 DocType: Student Group Creation Tool,Leave blank if you wish to fetch all courses for selected academic term,Оставите празно ако желите да донесе све курсеве за изабрану академску рок
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,Insufficient Stock,nedovoljno Сток
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227,Insufficient Stock,nedovoljno Сток
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Искључи Планирање капацитета и Тиме Трацкинг
+DocType: Email Digest,New Sales Orders,Нове продајних налога
 DocType: Bank Reconciliation,Bank Account,Банковни рачун
 DocType: Leave Type,Allow Negative Balance,Дозволи негативан салдо
 DocType: Selling Settings,Default Territory,Уобичајено Територија
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,телевизија
 DocType: Production Order Operation,Updated via 'Time Log',Упдатед преко 'Време Приступи'
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} does not belong to Company {1},Счет {0} не принадлежит компании {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +86,Account {0} does not belong to Company {1},Счет {0} не принадлежит компании {1}
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},Унапред износ не може бити већи од {0} {1}
 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 +174,For Warehouse is required before Submit,Для требуется Склад перед Отправить
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,For Warehouse is required before Submit,Для требуется Склад перед Отправить
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,На примљене
 DocType: Sales Partner,Reseller,Продавац
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,Унесите фирму
 DocType: Delivery Note Item,Against Sales Invoice Item,Против продаје Фактура тачком
 ,Production Orders in Progress,Производни Поруџбине у напретку
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Cash from Financing,Нето готовина из финансирања
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1436,"LocalStorage is full , did not save","Локалну меморију је пуна, није сачувао"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1460,"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}
@@ -262,18 +263,19 @@
 apps/erpnext/erpnext/templates/generators/item.html +78,No description given,Не введено описание
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Захтев за куповину.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +5,This is based on the Time Sheets created against this project,Ово се заснива на временској Схеетс насталих против овог пројекта
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Only the selected Leave Approver can submit this Leave Application,Только выбранный Оставить утверждающий мог представить этот Оставить заявку
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +213,Only the selected Leave Approver can submit this Leave Application,Только выбранный Оставить утверждающий мог представить этот Оставить заявку
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Освобождение Дата должна быть больше даты присоединения
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Leaves per Year,Леавес по години
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,Леавес по години
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Ров {0}: Проверите 'Да ли је напредно ""против налог {1} ако је ово унапред унос."
 apps/erpnext/erpnext/stock/utils.py +188,Warehouse {0} does not belong to company {1},Магацин {0} не припада фирми {1}
+DocType: Email Digest,Profit & Loss,Губитак профита
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,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 +435,Leave Blocked,Оставите Блокирани
-apps/erpnext/erpnext/stock/doctype/item/item.py +669,Item {0} has reached its end of life on {1},Пункт {0} достигла своей жизни на {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +443,Leave Blocked,Оставите Блокирани
+apps/erpnext/erpnext/stock/doctype/item/item.py +671,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 +83,Annual,годовой
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +86,Annual,годовой
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Стоцк Помирење артикла
 DocType: Stock Entry,Sales Invoice No,Продаја Рачун Нема
 DocType: Material Request Item,Min Order Qty,Минимална количина за поручивање
@@ -281,20 +283,22 @@
 DocType: Lead,Do Not Contact,Немојте Контакт
 apps/erpnext/erpnext/public/js/setup_wizard.js +360,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 +91,Software Developer,Софтваре Девелопер
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,Софтваре Девелопер
 DocType: Item,Minimum Order Qty,Минимална количина за поручивање
 DocType: Pricing Rule,Supplier Type,Снабдевач Тип
 DocType: Scheduling Tool,Course Start Date,Наравно Почетак
 DocType: Item,Publish in Hub,Објављивање у Хуб
+DocType: Student Admission,Student Admission,студент Улаз
 ,Terretory,Терретори
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is cancelled,Пункт {0} отменяется
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Material Request,Материјал Захтев
+apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} is cancelled,Пункт {0} отменяется
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +823,Material Request,Материјал Захтев
 DocType: Bank Reconciliation,Update Clearance Date,Упдате Дате клиренс
 apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +28,Abbreviation already used for another salary component,Скраћеница већ користи за другу компоненту плата
 DocType: Item,Purchase Details,Куповина Детаљи
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +328,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Ставка {0} није пронађен у &quot;сировине Испоручује се &#39;сто у нарудзбенице {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +333,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Ставка {0} није пронађен у &quot;сировине Испоручује се &#39;сто у нарудзбенице {1}
 DocType: Employee,Relation,Однос
 DocType: Shipping Rule,Worldwide Shipping,Широм света Достава
+DocType: Student Guardian,Mother,мајка
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Потврђена наређења од купаца.
 DocType: Purchase Receipt Item,Rejected Quantity,Одбијен Количина
 DocType: SMS Settings,SMS Sender Name,СМС Сендер Наме
@@ -310,20 +314,21 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +130,Please select Charge Type first,Изаберите Тип пуњења први
 DocType: Student Group Student,Student Group Student,Студент Група студент
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,најновији
+DocType: Email Digest,New Quotations,Нове понуде
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Први одсуство одобраватељ на листи ће бити постављен као подразумевани Аппровер Леаве
 DocType: Tax Rule,Shipping County,Достава жупанија
 apps/erpnext/erpnext/config/desktop.py +158,Learn,Научити
 DocType: Asset,Next Depreciation Date,Следећа Амортизација Датум
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Активност Трошкови по запосленом
 DocType: Accounts Settings,Settings for Accounts,Подешавања за рачуне
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +626,Supplier Invoice No exists in Purchase Invoice {0},Добављач Фактура Не постоји у фактури {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +629,Supplier Invoice No exists in Purchase Invoice {0},Добављач Фактура Не постоји у фактури {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Управление менеджера по продажам дерево .
 DocType: Job Applicant,Cover Letter,Пропратно писмо
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Изузетне чекова и депозити до знања
 DocType: Item,Synced With Hub,Синхронизују са Хуб
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Погрешна Лозинка
 DocType: Item,Variant Of,Варијанта
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,Completed Qty can not be greater than 'Qty to Manufacture',Завршен ком не може бити већи од 'Количина за производњу'
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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 +86,Circular Reference Error,Циркуларне референце Грешка
@@ -335,15 +340,16 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Обавестити путем емаила на стварању аутоматског материјала захтеву
 DocType: Journal Entry,Multi Currency,Тема Валута
 DocType: Payment Reconciliation Invoice,Invoice Type,Фактура Тип
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +806,Delivery Note,Обавештење о пријему пошиљке
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +800,Delivery Note,Обавештење о пријему пошиљке
 apps/erpnext/erpnext/config/learn.py +87,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 +233,Payment Entry has been modified after you pulled it. Please pull it again.,Плаћање Ступање је модификована након што га извукао. Молимо вас да га опет повуците.
+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/setup/doctype/email_digest/email_digest.py +104,Summary for this week and pending activities,Преглед за ову недељу и чекају активности
+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","Унесите ид е раздвојених зарезима, фактура ће аутоматски бити послат на одређени датум"
 DocType: Employee,Company Email,Компанија Е-маил
@@ -355,28 +361,29 @@
 apps/erpnext/erpnext/config/hr.py +186,"Employee designation (e.g. CEO, Director etc.).","Сотрудник обозначение (например генеральный директор , директор и т.д.) ."
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,"Пожалуйста, введите ' Repeat на день месяца ' значения поля"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Стопа по којој Купац Валута се претварају у основне валуте купца
-apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Ред # {0}: фактури не може се против постојеће имовине {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +554,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Ред # {0}: фактури не може се против постојеће имовине {1}
 DocType: Item Tax,Tax Rate,Пореска стопа
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} већ издвојила за запосленог {1} за период {2} {3} у
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +812,Select Item,Избор артикла
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +791,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/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Покупка Счет {0} уже подано
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Ред # {0}: Серијски бр морају бити исти као {1} {2}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +143,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.,Групно (много) од стране јединице.
 DocType: C-Form Invoice Detail,Invoice Date,Фактуре
 DocType: GL Entry,Debit Amount,Износ задужења
 apps/erpnext/erpnext/accounts/party.py +242,There can only be 1 Account per Company in {0} {1},Може постојати само 1 налог за предузеће у {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +4,Your email address,Ваша имејл адреса
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +342,Please see attachment,Молимо погледајте прилог
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,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 +19,Setup Already Complete!!,Подешавање Већ Комплетна !
 ,Finished Goods,готове робе
 DocType: Delivery Note,Instructions,Инструкције
 DocType: Quality Inspection,Inspected By,Контролисано Би
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Добављач&gt; добављач Тип
 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,Додај артикле
@@ -390,29 +397,29 @@
 DocType: Currency Exchange,Currency Exchange,Мењачница
 DocType: Purchase Invoice Item,Item Name,Назив
 DocType: Authorization Rule,Approving User  (above authorized value),Одобравање Корисник (изнад овлашћеног вредности)
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Кредитни биланс
+DocType: Email Digest,Credit Balance,Кредитни биланс
 DocType: Employee,Widowed,Удовички
 DocType: Request for Quotation,Request for Quotation,Захтев за понуду
 DocType: Salary Slip Timesheet,Working Hours,Радно време
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Промена стартовања / струја број редни постојеће серије.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Ако више Цене Правила наставити да превлада, корисници су упитани да подесите приоритет ручно да реши конфликт."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +736,Purchase Return,Куповина Ретурн
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +715,Purchase Return,Куповина Ретурн
 ,Purchase Register,Куповина Регистрација
 DocType: Scheduling Tool,Rechedule,Рецхедуле
 DocType: Landed Cost Item,Applicable Charges,Накнаде применљиво
 DocType: Workstation,Consumable Cost,Потрошни трошкова
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +202,{0} ({1}) must have role 'Leave Approver',{0} ({1}) мора имати улогу 'Напусти Аппровер
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,{0} ({1}) must have role 'Leave Approver',{0} ({1}) мора имати улогу 'Напусти Аппровер
 DocType: Purchase Receipt,Vehicle Date,Датум возила
 DocType: Student Log,Medical,медицинский
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Разлог за губљење
-apps/erpnext/erpnext/accounts/utils.py +239,Allocated amount can not greater than unadjusted amount,Издвојила износ не може већи од износа неприлагонене
+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,Издвојила износ не може већи од износа неприлагонене
 DocType: Announcement,Receiver,пријемник
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Радна станица је затворена на следеће датуме по Холидаи Лист: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Могућности
 DocType: Employee,Single,Самац
 DocType: Account,Cost of Goods Sold,Себестоимость реализованных товаров
 DocType: Purchase Invoice,Yearly,Годишње
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +225,Please enter Cost Center,Унесите трошка
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,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,испитивач Име
@@ -425,26 +432,26 @@
 DocType: Purchase Invoice,Supplier Name,Снабдевач Име
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Прочитајте ЕРПНект Мануал
 DocType: Account,Is Group,Је група
+DocType: Email Digest,Pending Purchase Orders,Куповина на чекању Ордерс
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Аутоматски подешава серијски бр на основу ФИФО
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Одлазак добављача Фактура број јединственост
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',&#39;Да Предмет бр&#39; не може бити мањи од &#39;Од Предмет бр&#39;
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,Non Profit,Некоммерческое
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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: Stock Reconciliation Item,Do not include symbols (ex. $),Не укључују симболе (нпр. $)
 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 +638,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} изабран више пута у атрибутима табели
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} изабран више пута у атрибутима табели
 DocType: HR Settings,Employee record is created using selected field. ,Запослени Запис се креира коришћењем изабрано поље.
 DocType: Sales Order,Not Applicable,Није применљиво
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Мастер отдыха .
 DocType: Request for Quotation Item,Required Date,Потребан датум
 DocType: Delivery Note,Billing Address,Адреса за наплату
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +862,Please enter Item Code.,Унесите Шифра .
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +847,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","Ако је проверен, порески износ ће се сматрати као што је већ укључена у Принт Рате / Штампа Износ"
@@ -458,12 +465,12 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Ценные бумаги и депозиты
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Укупно лишће издвојена обавезна
 DocType: Job Opening,Description of a Job Opening,Опис посао Отварање
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Pending activities for today,Пендинг активности за данас
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Пендинг активности за данас
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Гледалаца рекорд.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Плата Компонента за плате на основу ТимеСхеет.
 DocType: Sales Order Item,Used for Production Plan,Користи се за производни план
 DocType: Manufacturing Settings,Time Between Operations (in mins),Време између операција (у минута)
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +92,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} буџета за налог {1} против трошка {2} је {3}. То ће премашити по {4}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +95,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} буџета за налог {1} против трошка {2} је {3}. То ће премашити по {4}
 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,Одабрани БОМ нису за исту робу
@@ -471,16 +478,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +238,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 +86,Administrative Officer,Административни службеник
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,Административни службеник
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +23,Acutal Qty {0} / Waiting Qty {1},Ацутал ком {0} / чекања ком {1}
 DocType: Timesheet Detail,Hrs,хрс
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +319,Please select Company,Молимо изаберите Цомпани
-DocType: Stock Entry,Difference Account,Разлика налог
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +309,Please select Company,Молимо изаберите Цомпани
+DocType: Stock Entry Detail,Difference Account,Разлика налог
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Не можете да затворите задатак као њен задатак зависи {0} није затворен.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Please enter Warehouse for which Material Request will be raised,Унесите складиште за које Материјал Захтев ће бити подигнута
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +399,Please enter Warehouse for which Material Request will be raised,Унесите складиште за које Материјал Захтев ће бити подигнута
 DocType: Production Order,Additional Operating Cost,Додатни Оперативни трошкови
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,козметика
-apps/erpnext/erpnext/stock/doctype/item/item.py +530,"To merge, following properties must be same for both items","Да бисте објединили , следеће особине морају бити исти за обе ставке"
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,"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 +28,Buy,купити
@@ -488,7 +495,7 @@
 DocType: Sales Invoice,Offline POS Name,Оффлине Поз Име
 DocType: Sales Order,To Deliver,Да Испоручи
 DocType: Purchase Invoice Item,Item,ставка
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1563,Serial no item cannot be a fraction,Серијски број Ставка не може да буде део
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1587,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,Управљање Подуговарање
@@ -497,13 +504,14 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Account {0} does not belong to company: {1},Рачун {0} не припада компанији: {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation already used for another company,Скраћеница већ користи за другу компанију
 DocType: Selling Settings,Default Customer Group,Уобичајено групу потрошача
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Supplier is required against Payable account {0},Добављач је обавезан против плативог рачуна {0}
 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
 DocType: Production Planning Tool,Material Requirement,Материјал Захтев
 DocType: Company,Delete Company Transactions,Делете Цомпани трансакције
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +313,Reference No and Reference Date is mandatory for Bank transaction,Референца број и референце Датум је обавезна за банке трансакције
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +316,Reference No and Reference Date is mandatory for Bank transaction,Референца број и референце Датум је обавезна за банке трансакције
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Адд / Едит порези и таксе
 DocType: Purchase Invoice,Supplier Invoice No,Снабдевач фактура бр
 DocType: Territory,For reference,За референце
@@ -514,7 +522,6 @@
 DocType: Installation Note Item,Installation Note Item,Инсталација Напомена Ставка
 DocType: Production Plan Item,Pending Qty,Кол чекању
 DocType: Budget,Ignore,Игнорисати
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Код итем&gt; итем Група&gt; Бренд
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,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,Плата Слип Тимесхеет
@@ -525,11 +532,11 @@
 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/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Нема резултата у фактури табели записи
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +28,Please select Company and Party Type first,Молимо Вас да изаберете Цомпани и Партије Типе прво
+apps/erpnext/erpnext/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/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 +707,Make Sales Order,Маке Продаја Наручите
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +701,Make Sales Order,Маке Продаја Наручите
 DocType: Project Task,Project Task,Пројектни задатак
 ,Lead Id,Олово Ид
 DocType: C-Form Invoice Detail,Grand Total,Свеукупно
@@ -545,7 +552,8 @@
 DocType: Job Applicant,Resume Attachment,ресуме Прилог
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Репеат Купци
 DocType: Leave Control Panel,Allocate,Доделити
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +734,Sales Return,Продаја Ретурн
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +728,Sales Return,Продаја Ретурн
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +91,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Напомена: Укупно издвојена лишће {0} не сме бити мањи од већ одобрених лишћа {1} за период
 DocType: Announcement,Posted By,Поставио
 DocType: Item,Delivered by Supplier (Drop Ship),Деливеред би добављача (Дроп Схип)
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,База потенцијалних купаца.
@@ -554,14 +562,13 @@
 DocType: Quotation,Quotation To,Цитат
 DocType: Lead,Middle Income,Средњи приход
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +212,Opening (Cr),Открытие (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +795,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Уобичајено јединица мере за тачке {0} не може директно мењати, јер сте већ направили неке трансакције (с) са другим УЦГ. Мораћете да креирате нову ставку да користи другачији Дефаулт УЦГ."
-apps/erpnext/erpnext/accounts/utils.py +237,Allocated amount can not be negative,Додељена сума не може бити негативан
+apps/erpnext/erpnext/stock/doctype/item/item.py +797,Default Unit of Measure for Item {0} cannot be changed directly because 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,Додељена сума не може бити негативан
 DocType: Purchase Order Item,Billed 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 +91,Reference No & Reference Date is required for {0},Ссылка № & Ссылка Дата необходим для {0}
-DocType: Sales Invoice,Customer's Vendor,Купца Продавац
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Proposal Writing,Писање предлога
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,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","Ако је означено, сировине за ставке које су под уговором ће бити укључени у материјалу захтевима"
@@ -570,13 +577,14 @@
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,time Трацкинг
 DocType: Fiscal Year Company,Fiscal Year Company,Фискална година Компанија
 DocType: Packing Slip Item,DN Detail,ДН Детаљ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +257,Already supplier quotation has created,Већ добављач цитат је створио
 DocType: Timesheet,Billed,Изграђена
 DocType: Batch,Batch Description,Батцх Опис
+apps/erpnext/erpnext/accounts/utils.py +685,"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 +733,View Offline Records,Погледај Ван Записи
+apps/erpnext/erpnext/accounts/page/pos/pos.js +715,View Offline Records,Погледај Ван Записи
+DocType: Student,Sibling Details,Сиблинг Детаљи
 DocType: Employee,Reason for Resignation,Разлог за оставку
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,Шаблон для аттестации .
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,Фактура / Јоурнал Ентри Детаљи
@@ -590,7 +598,7 @@
 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,Нето промена у инвентару
 DocType: Employee,Passport Number,Пасош Број
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Manager,менаџер
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,менаџер
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,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,"""На основу"" и ""Групиши по"" не могу бити идентични"
@@ -599,10 +607,11 @@
 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 +299,Timesheet created:,Тимесхеет цреатед:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +715,Please set default Cash or Bank account in Mode of Payment {0},"Пожалуйста, установите Cash умолчанию или банковский счет в режим оплаты {0}"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +300,Timesheet created:,Тимесхеет цреатед:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +772,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,уписати
 DocType: Selling Settings,Customer Naming By,Кориснички назив под
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Молим вас запослених подешавање Именовање систем у људских ресурса&gt; људских ресурса Сеттингс
 DocType: Depreciation Schedule,Depreciation Amount,Амортизација Износ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,Претвори у групи
 DocType: Activity Cost,Activity Type,Активност Тип
@@ -627,6 +636,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,завршити
 DocType: Pricing Rule,Sales Manager,Менаџер продаје
 DocType: Salary Structure Employee,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,Добитак / губитак налог на средства одлагању
@@ -641,11 +651,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +9,Pre Sales,Пре продаје
 DocType: Purchase Receipt,Other Details,Остали детаљи
 DocType: Account,Accounts,Рачуни
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Marketing,маркетинг
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +227,Payment Entry is already created,Плаћање Ступање је већ направљена
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,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 +538,Row #{0}: Asset {1} does not linked to Item {2},Ред # {0}: имовине {1} не повезано са тачком {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +21,Preview Salary Slip,Преглед плата Слип
+apps/erpnext/erpnext/controllers/accounts_controller.py +541,Row #{0}: Asset {1} does not linked to Item {2},Ред # {0}: имовине {1} не повезано са тачком {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +38,Preview Salary Slip,Преглед плата Слип
 DocType: Company,Deafult Cost Center,Деафулт трошкова центар
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +48,Account {0} has been entered multiple times,Рачун {0} је ушла више пута
 DocType: Account,Expenses Included In Valuation,Трошкови укључени у процене
@@ -654,7 +664,7 @@
 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 +617,Item has variants.,Тачка има варијанте.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Тачка има варијанте.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,Пункт {0} не найден
 DocType: Bin,Stock Value,Вредност акције
 apps/erpnext/erpnext/accounts/doctype/account/account.py +25,Company {0} does not exist,Фирма {0} не постоји
@@ -674,7 +684,7 @@
 DocType: Purchase Order,Supply Raw Materials,Суппли Сировине
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,Датум који ће бити генерисан следећи рачун. То се генерише на достави.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,оборотные активы
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,{0} is not a stock Item,{0} не является акционерным Пункт
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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 +169,Lead must be set if Opportunity is made from Lead,"Ведущий должен быть установлен , если Возможность сделан из свинца"
@@ -760,26 +770,25 @@
 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 +709,No Permission,Без дозвола
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +710,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}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +298,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 +542,Row #{0}: Asset {1} must be submitted,Ред # {0}: имовине {1} мора да се поднесе
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,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.,Уплоад равнотежу берзе преко ЦСВ.
 DocType: Warehouse,Tree Details,трее Детаљи
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Пошаљи сада
 ,Support Analytics,Подршка Аналитика
 DocType: Item,Website Warehouse,Сајт Магацин
 DocType: Payment Reconciliation,Minimum Invoice Amount,Минимални износ фактуре
 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/sales_invoice/sales_invoice.py +227,Timesheet {0} is already completed or cancelled,Тимесхеет {0} је већ завршен или отказан
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +259,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
@@ -795,13 +804,13 @@
 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 +229,Target Warehouse,Циљна Магацин
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +230,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-,аортна
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Sales Order Date,Ожидаемая дата поставки не может быть до даты заказа на продажу
 DocType: Upload Attendance,Import Attendance,Увоз Гледалаца
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Все Группы товаров
+apps/erpnext/erpnext/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/config/setup.py +89,Automatically compose message on submission of transactions.,Автоматически создавать сообщение о подаче сделок .
@@ -813,13 +822,15 @@
 DocType: Sales Invoice,Payment Due Date,Плаћање Дуе Дате
 apps/erpnext/erpnext/stock/doctype/item/item.js +278,Item Variant {0} already exists with same attributes,Тачка Варијанта {0} већ постоји са истим атрибутима
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;Отварање&#39;
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Опен То До
 DocType: Notification Control,Delivery Note Message,Испорука Напомена порука
 DocType: Expense Claim,Expenses,расходы
 DocType: Item Variant Attribute,Item Variant Attribute,Тачка Варијанта Атрибут
 ,Purchase Receipt Trends,Куповина Трендови Пријем
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Research & Development,Истраживање и развој
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Истраживање и развој
 ,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,Цена или Скидка
@@ -828,7 +839,7 @@
 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/controllers/accounts_controller.py +340,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Ступање плаћање {0} је повезан против налога {1}, провери да ли треба да се повуче као напредак у овој фактури."
+apps/erpnext/erpnext/controllers/accounts_controller.py +343,"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,Место продаје
@@ -850,12 +861,12 @@
 DocType: Supplier Quotation,Is Subcontracted,Да ли подизвођење
 DocType: Item Attribute,Item Attribute Values,Итем Особина Вредности
 DocType: Examination Result,Examination Result,преглед резултата
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +756,Purchase Receipt,Куповина Пријем
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +735,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 +167,Reference Doctype must be one of {0},Референце Тип документа мора бити један од {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +282,Unable to find Time Slot in the next {0} days for Operation {1},Није могуће пронаћи време за наредних {0} дана за рад {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +170,Reference Doctype must be one of {0},Референце Тип документа мора бити један од {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Unable to find Time Slot in the next {0} days for Operation {1},Није могуће пронаћи време за наредних {0} дана за рад {1}
 DocType: Production Order,Plan material for sub-assemblies,План материјал за подсклопови
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Продајних партнера и Регија
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be active,БОМ {0} мора бити активна
@@ -866,7 +877,7 @@
 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 +214,Warehouses with existing transaction can not be converted to ledger.,Складишта са постојећим трансакције не могу се претворити у књизи.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +217,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,Налога за производњу
@@ -880,9 +891,9 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Сотрудник {0} не активен или не существует
 DocType: Fee Structure,Components,komponente
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,Please enter Asset Category in Item {0},Молимо унесите Ассет Категорија тачке {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +612,Item Variants {0} updated,Ставка Варијанте {0} ажурирани
+apps/erpnext/erpnext/stock/doctype/item/item.py +614,Item Variants {0} updated,Ставка Варијанте {0} ажурирани
 DocType: Quality Inspection Reading,Reading 6,Читање 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +843,Cannot {0} {1} {2} without any negative outstanding invoice,Цан нот {0} {1} {2} без негативних изузетан фактура
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +854,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,Синц Сада
@@ -897,69 +908,72 @@
 DocType: Item,Is Purchase Item,Да ли је куповина артикла
 DocType: Asset,Purchase Invoice,Фактури
 DocType: Stock Ledger Entry,Voucher Detail No,Ваучер Детаљ Бр.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +728,New Sales Invoice,Нови продаје Фактура
+apps/erpnext/erpnext/accounts/page/pos/pos.js +710,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 +728,Sync Offline Invoices,Синц Оффлине Рачуни
 DocType: Payment Request,Paid,Плаћен
 DocType: Program Fee,Program Fee,naknada програм
 DocType: Salary Slip,Total in words,Укупно у речима
 DocType: Material Request Item,Lead Time Date,Олово Датум Време
 DocType: Guardian,Guardian Name,гуардиан Име
 DocType: Cheque Print Template,Has Print Format,Има Принт Формат
-apps/erpnext/erpnext/accounts/page/pos/pos.js +86, is mandatory. Maybe Currency Exchange record is not created for ,је обавезно. Можда Мењачница запис није створен за
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +109,Row #{0}: Please specify Serial No for Item {1},Ред # {0}: Наведите Сериал но за пункт {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +619,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","За &#39;производ&#39; Бундле предмета, Магацин, редни број и серијски бр ће се сматрати из &quot;листе паковања &#39;табели. Ако Складиште и серијски бр су исти за све ставке паковање за било коју &#39;производ&#39; Бундле ставке, те вредности се могу уносити у главном табели тачка, вредности ће бити копирана у &#39;Паковање лист&#39; сто."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +75, 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 +613,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing 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 +606,Supplier Invoice Date cannot be greater than Posting Date,Добављач Фактура Датум не може бити већи од датума када је послата
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +609,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: 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 +810,Select Item for Transfer,Избор тачка за трансфер
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +789,Select Item for Transfer,Избор тачка за трансфер
 DocType: Purchase Invoice,Additional Discount Percentage,Додатни попуст Проценат
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Погледајте листу сву помоћ видео
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Изаберите главу рачуна банке у којој је депонован чек.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Дозволите кориснику да измените Рате Ценовник у трансакцијама
 DocType: Pricing Rule,Max Qty,Макс Кол-во
-DocType: Student Applicant,Father's Name,Име оца
 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 +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Ров {0}: Плаћање по куповном / продајном Реда треба увек бити означен као унапред
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,хемијски
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +686,All items have already been transferred for this Production Order.,Сви артикли су већ пребачени за ову производњу Реда.
+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} и покушајте поново
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +694,All items have already been transferred for this Production Order.,Сви артикли су већ пребачени за ову производњу Реда.
 DocType: Process Payroll,Select Payroll Year and Month,Изабери Паиролл година и месец
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,Meter,Метар
 DocType: Workstation,Electricity Cost,Струја Трошкови
 DocType: HR Settings,Don't send Employee Birthday Reminders,Немојте слати запослених подсетник за рођендан
-DocType: Opportunity,Walk In,Шетња у
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,Сток Записи
 DocType: Item,Inspection Criteria,Инспекцијски Критеријуми
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Преносе
 apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,Уплоад главу писмо и лого. (Можете их уредити касније).
 DocType: Timesheet Detail,Bill,рачун
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,White,Бео
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date is entered as past date,Следећа Амортизација Датум је ушао као прошле дана
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +167,White,Бео
 DocType: SMS Center,All Lead (Open),Све Олово (Опен)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +228,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Ред {0}: Количина није доступан за {4} у складишту {1} на објављивање време ступања ({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}),Ред {0}: Количина није доступан за {4} у складишту {1} на објављивање време ступања ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,Гет аванси
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +731,Make ,Правити
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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.,Дошло је до грешке . Један могући разлог би могао бити да нисте сачували форму . Молимо контактирајте суппорт@ерпнект.цом акопроблем и даље постоји .
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Моја Корпа
-apps/erpnext/erpnext/controllers/selling_controller.py +154,Order Type must be one of {0},Наручи Тип мора бити један од {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Наручи Тип мора бити један од {0}
 DocType: Lead,Next Contact Date,Следеће Контакт Датум
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Отварање Кол
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +393,Please enter Account for Change Amount,Молимо Вас да унесете налог за промене Износ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,Please enter Account for Change Amount,Молимо Вас да унесете налог за промене Износ
 DocType: Student Batch,Student Batch Name,Студент Серија Име
 DocType: Holiday List,Holiday List Name,Холидаи Листа Име
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js +8,Schedule Course,Распоред курса
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Stock Options,Сток Опције
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Сток Опције
 DocType: Journal Entry Account,Expense Claim,Расходи потраживање
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +211,Do you really want to restore this scrapped asset?,Да ли заиста желите да вратите овај укинута средства?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +237,Qty for {0},Количина за {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +212,Do you really want to restore this scrapped asset?,Да ли заиста желите да вратите овај укинута средства?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,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,Оставите Датуми листу блокираних
@@ -968,9 +982,9 @@
 DocType: Company,Default Terms,Уобичајено Правила
 DocType: Packing Slip Item,Packing Slip Item,Паковање Слип Итем
 DocType: Purchase Invoice,Cash/Bank Account,Готовина / банковног рачуна
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Уклоњене ствари без промене у количини или вриједности.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Уклоњене ствари без промене у количини или вриједности.
 DocType: Delivery Note,Delivery To,Достава Да
-apps/erpnext/erpnext/stock/doctype/item/item.py +635,Attribute table is mandatory,Атрибут сто је обавезно
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Атрибут сто је обавезно
 DocType: Production Planning Tool,Get Sales Orders,Гет продајних налога
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} не може бити негативан
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,Изаберите Студент
@@ -995,7 +1009,7 @@
 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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Серийный номер {0} находится под контрактом на техническое обслуживание ДО {1}
+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,Име организације
@@ -1007,7 +1021,7 @@
 DocType: GL Entry,Against,Против
 DocType: Item,Default Selling Cost Center,По умолчанию Продажа Стоимость центр
 DocType: Sales Partner,Implementation Partner,Имплементација Партнер
-apps/erpnext/erpnext/controllers/selling_controller.py +231,Sales Order {0} is {1},Салес Ордер {0} је {1}
+apps/erpnext/erpnext/controllers/selling_controller.py +232,Sales Order {0} is {1},Салес Ордер {0} је {1}
 DocType: Opportunity,Contact Info,Контакт Инфо
 apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,Макинг Стоцк записи
 DocType: Packing Slip,Net Weight UOM,Тежина УОМ
@@ -1017,25 +1031,24 @@
 DocType: Holiday List,Get Weekly Off Dates,Гет Офф Недељно Датуми
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,"Дата окончания не может быть меньше , чем Дата начала"
 DocType: Sales Person,Select company name first.,Изаберите прво име компаније.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Dr,Др
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Dr,Др
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Цитати од добављача.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},Да {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Просек година
 DocType: 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/templates/pages/home.html +32,View All Products,Погледајте остале производе
+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 +400,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Внимание: Система не будет проверять overbilling с суммы по пункту {0} в {1} равна нулю
+apps/erpnext/erpnext/controllers/accounts_controller.py +403,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/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,и година:
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +191,{0} {1} must be submitted,{0} {1} должны быть представлены
-DocType: Email Digest,Annual Expense,Годишњи трошак
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,{0} {1} must be submitted,{0} {1} должны быть представлены
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +145,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}
@@ -1046,30 +1059,31 @@
 DocType: Sales Partner,Distributor,Дистрибутер
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Корпа Достава Правило
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +211,Production Order {0} must be cancelled before cancelling this Sales Order,Производственный заказ {0} должно быть отменено до отмены этого заказ клиента
-apps/erpnext/erpnext/public/js/controllers/transaction.js +62,Please set 'Apply Additional Discount On',Молимо поставите &#39;Аппли додатни попуст на&#39;
+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,Од Опсег мора да буде мањи од у распону
 DocType: Global Defaults,Global Defaults,Глобални Дефаултс
 apps/erpnext/erpnext/projects/doctype/project/project.py +153,Project Collaboration Invitation,Пројекат Сарадња Позив
 DocType: Salary Slip,Deductions,Одбици
+DocType: Leave Allocation,LAL/,ЛАЛ /
 apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,старт Година
 DocType: Purchase Invoice,Start date of current invoice's period,Почетак датум периода текуће фактуре за
 DocType: Salary Slip,Leave Without Pay,Оставите Без плате
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +327,Capacity Planning Error,Капацитет Планирање Грешка
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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 +362,Finished Item {0} must be entered for Manufacture type entry,Завршио артикла {0} мора бити унета за тип Производња улазак
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +367,Finished Item {0} must be entered for Manufacture type entry,Завршио артикла {0} мора бити унета за тип Производња улазак
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Отварање рачуноводства Стање
 DocType: Sales Invoice Advance,Sales Invoice Advance,Продаја Рачун Адванце
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +499,Nothing to request,Ништа се захтевати
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +500,Nothing to request,Ништа се захтевати
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',"""Стварни датум почетка"" не може бити већи од ""Стварни датум завршетка"""
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Management,управљање
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},Либо дебетовая или кредитная сумма необходима для {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,управљање
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +55,Either debit or credit amount is required for {0},Либо дебетовая или кредитная сумма необходима для {0}
 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 +161,Blue,Плава
+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,Молимо поставите Емаил ИД
@@ -1079,12 +1093,12 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +23,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/accounts/page/pos/pos.js +1374,Do you really want to submit the invoice?,Да ли заиста желите да достави фактуру?
+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 +685,Cost Center For Item with Item Code ',Цост Центер За ставку са Код товара '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1526,"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 +679,Cost Center For Item with Item Code ',Цост Центер За ставку са Код товара '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1550,"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 +26,"Further accounts can be made under Groups, but entries can be made against non-Groups","Даље рачуни могу бити у групама, али уноса можете извршити над несрпским групама"
 DocType: Lead,Lead,Довести
@@ -1104,104 +1118,106 @@
 DocType: Payment Reconciliation,Unreconciled Payment Details,Неусаглашена Детаљи плаћања
 DocType: Global Defaults,Current Fiscal Year,Текуће фискалне године
 DocType: Global Defaults,Disable Rounded Total,Онемогући Роундед Укупно
-DocType: Lead,Call,Позив
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +417,'Entries' cannot be empty,"""Уноси"" не могу бити празни"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +418,'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 +214,Fiscal Year {0} not found,Фискална година {0} није пронађен
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +221,Fiscal Year {0} not found,Фискална година {0} није пронађен
 apps/erpnext/erpnext/config/hr.py +238,Setting up Employees,Подешавање Запослени
 DocType: Sales Order,SO-,ТАКО-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,"Пожалуйста, выберите префикс первым"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Please select prefix first,"Пожалуйста, выберите префикс первым"
 DocType: Employee,O-,О-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Research,истраживање
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,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 +43,Item {0} must be a non-stock item,Итем {0} мора бити нон-лагеру предмета
 DocType: Contact,User ID,Кориснички ИД
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +57,View Ledger,Погледај Леџер
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Најраније
-apps/erpnext/erpnext/stock/doctype/item/item.py +504,"An Item Group exists with same name, please change the item name or rename the item group","Пункт Группа существует с тем же именем , пожалуйста, измените имя элемента или переименовать группу товаров"
+apps/erpnext/erpnext/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 +437,Rest Of The World,Остальной мир
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,Ставка {0} не може имати Батцх
 ,Budget Variance Report,Буџет Разлика извештај
 DocType: Salary Slip,Gross Pay,Бруто Паи
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +90,Row {0}: Activity Type is mandatory.,Ред {0}: Тип активност је обавезна.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +114,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/public/js/controllers/stock_controller.js +40,Accounting Ledger,Књиговодство Леџер
+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,Нераспоређене добити
 DocType: BOM Item,Item Description,Ставка Опис
+DocType: Student Sibling,Student Sibling,студент Сиблинг
 DocType: Purchase Invoice,Is Recurring,Је се понавља
 DocType: Purchase Invoice,Supplied Items,Додатна артикала
 DocType: Student,STUD.,ПАСТУВ.
 DocType: Production Order,Qty To Manufacture,Кол Да Производња
+DocType: Email Digest,New Income,Нова приход
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Одржавајте исту стопу током куповине циклуса
 DocType: Opportunity Item,Opportunity Item,Прилика шифра
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,Привремени Отварање
 ,Employee Leave Balance,Запослени одсуство Биланс
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +131,Balance for Account {0} must always be {1},Весы для счета {0} должен быть всегда {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +175,Valuation Rate required for Item in row {0},Процена курс потребно за предмета на ред {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,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,Пример: Мастерс ин Цомпутер Сциенце
 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 +87, to ,у
+apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,у
 DocType: Item,Lead Time in days,Олово Време у данима
 ,Accounts Payable Summary,Обавезе према добављачима Преглед
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Not authorized to edit frozen Account {0},Не разрешается редактировать замороженный счет {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},Не разрешается редактировать замороженный счет {0}
 DocType: Journal Entry,Get Outstanding Invoices,Гет неплаћене рачуне
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +62,Sales Order {0} is not valid,Заказ на продажу {0} не является допустимым
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Заказ на продажу {0} не является допустимым
 apps/erpnext/erpnext/setup/doctype/company/company.py +185,"Sorry, companies cannot be merged","Жао нам је , компаније не могу да се споје"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +139,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Укупна количина Издање / трансфер {0} у Индустријска Захтев {1} \ не може бити већа од тражене количине {2} за тачка {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Small,Мали
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,Small,Мали
 DocType: Employee,Employee Number,Запослени Број
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Случай Нет (ы) уже используется. Попробуйте из дела № {0}
 ,Invoiced Amount (Exculsive Tax),Износ фактуре ( Екцулсиве Пореска )
-DocType: Student Applicant,Mother's / Guardian 1 Email ID,Мајке / старатеља 1-маил ИД
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Тачка 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,Глава счета {0} создан
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +160,Green,Зелен
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,Зелен
 DocType: Supplier,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 +57,Contract,уговор
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,уговор
 DocType: Email Digest,Add Quote,Додај Куоте
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +498,UOM coversion factor required for UOM: {0} in Item: {1},УОМ цоверсион фактор потребан за УЦГ: {0} тачке: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +503,UOM coversion factor required for UOM: {0} in Item: {1},УОМ цоверсион фактор потребан за УЦГ: {0} тачке: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,косвенные расходы
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +80,Row {0}: Qty is mandatory,Ред {0}: Кол је обавезно
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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 +737,Sync Master Data,Синц мастер података
+apps/erpnext/erpnext/accounts/page/pos/pos.js +719,Sync Master Data,Синц мастер података
 apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,Ваши производи или услуге
 DocType: Mode of Payment,Mode of Payment,Начин плаћања
 apps/erpnext/erpnext/stock/doctype/item/item.py +178,Website Image should be a public file or website URL,Сајт Слика треба да буде јавни фајл или УРЛ веб-сајта
+DocType: Student Applicant,AP,АП
 DocType: Purchase Invoice Item,BOM,БОМ
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,То јекорен ставка група и не може се мењати .
+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 +345,"{0}: Employee email not found, hence email not sent","{0}: е запослених није пронађен, стога емаил није послата"
+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,Ис Иоур Адреса фирме
 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 +118,"For {0}, only credit accounts can be linked against another debit entry","За {0}, само кредитне рачуни могу бити повезани против неке друге ставке дебитне"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Delivery Note {0} is not submitted,Доставка Примечание {0} не представлено
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Delivery Note {0} is not submitted,Доставка Примечание {0} не представлено
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Sub-contracted Item,Пункт {0} должен быть Субдоговорная Пункт
 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,Продавац Сајт
 DocType: Item,ITEM-,Артикл-
-apps/erpnext/erpnext/controllers/selling_controller.py +147,Total allocated percentage for sales team should be 100,Всего выделено процент для отдела продаж должен быть 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +110,Production Order status is {0},Статус производственного заказа {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Всего выделено процент для отдела продаж должен быть 100
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Статус производственного заказа {0}
 DocType: Appraisal Goal,Goal,Циљ
 DocType: Sales Invoice Item,Edit Description,Измени опис
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +757,For Supplier,За добављача
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +723,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,Створити Принт Формат
@@ -1217,10 +1233,11 @@
 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,граде код
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Емаил Дигест:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +445,BOM {0} does not belong to Item {1},БОМ {0} не припада тачком {1}
 DocType: Sales Partner,Target Distribution,Циљна Дистрибуција
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1667,Deafault warehouse is required for selected item,Оперативног система као подразумевана складиште је потребан за изабрану ставку
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Deafault warehouse is required for selected item,Оперативног система као подразумевана складиште је потребан за изабрану ставку
 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
@@ -1229,23 +1246,23 @@
 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 +110,Hardware,аппаратные средства
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,аппаратные средства
 DocType: Sales Order,Recurring Upto,понављајући Упто
 DocType: Attendance,HR Manager,ХР Менаџер
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Изаберите Цомпани
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Privilege Leave,Привилегированный Оставить
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,Привилегированный Оставить
 DocType: Purchase Invoice,Supplier Invoice Date,Датум фактуре добављача
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Потребно је да омогућите Корпа
 DocType: Payment Entry,Writeoff,Отписати
 DocType: Appraisal Template Goal,Appraisal Template Goal,Процена Шаблон Гол
-DocType: Salary Slip,Earning,Стицање
+DocType: Salary Component,Earning,Стицање
 DocType: Purchase Invoice,Party Account Currency,Странка Рачун Валута
 ,BOM Browser,БОМ Бровсер
 DocType: Purchase Taxes and Charges,Add or Deduct,Додавање или Одузмите
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Перекрытие условия найдено между :
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +171,Against Journal Entry {0} is already adjusted against some other voucher,Против часопису Ступање {0} је већ прилагођен против неког другог ваучера
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,Против часопису Ступање {0} је већ прилагођен против неког другог ваучера
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Укупна вредност поруџбине
-apps/erpnext/erpnext/demo/setup_data.py +358,Food,еда
+apps/erpnext/erpnext/demo/setup/setup_data.py +301,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/course_schedule/course_schedule.js +103,Mark Attendence,марк Похађани
@@ -1279,12 +1296,12 @@
 DocType: Sales Order Item,Planned Quantity,Планирана количина
 DocType: Purchase Invoice Item,Item Tax Amount,Ставка Износ пореза
 DocType: Item,Maintain Stock,Одржавајте Стоцк
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +209,Stock Entries already created for Production Order ,Сток уноси већ створене за производно Реда
+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,Нето промена у основном средству
 DocType: Leave Control Panel,Leave blank if considered for all designations,Оставите празно ако се сматра за све ознакама
-apps/erpnext/erpnext/controllers/accounts_controller.py +620,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Начисление типа «Актуальные ' в строке {0} не могут быть включены в пункт Оценить
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,Max: {0},Мак: {0}
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +15,From Datetime,Од датетиме
+apps/erpnext/erpnext/controllers/accounts_controller.py +623,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Начисление типа «Актуальные ' в строке {0} не могут быть включены в пункт Оценить
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +239,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 +153,"Request for Quotation is disabled to access from portal, for more check portal settings.","Захтев за понуду је онемогућен да приступа из портала, за више подешавања провере портала."
@@ -1292,8 +1309,8 @@
 DocType: Sales Invoice,Shipping Address Name,Достава Адреса Име
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,Контни
 DocType: Material Request,Terms and Conditions Content,Услови коришћења садржаја
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +552,cannot be greater than 100,не може бити већи од 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +680,Item {0} is not a stock Item,Пункт {0} не является акционерным Пункт
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +546,cannot be greater than 100,не може бити већи од 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is not a stock Item,Пункт {0} не является акционерным Пункт
 DocType: Maintenance Visit,Unscheduled,Неплански
 DocType: Employee,Owned,Овнед
 DocType: Salary Detail,Depends on Leave Without Pay,Зависи оставити без Паи
@@ -1307,10 +1324,9 @@
 DocType: GL Entry,GL Entry,ГЛ Ентри
 DocType: HR Settings,Employee Settings,Подешавања запослених
 ,Batch-Wise Balance History,Групно-Висе Стање Историја
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,То до лист
 apps/erpnext/erpnext/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 +61,Apprentice,шегрт
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +102,Negative Quantity is not allowed,Негативна Количина није дозвољено
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,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","Пореска детаљ сто учитани из тачка мајстора у виду стринг и складиште у овој области.
  Користи се за таксама и накнадама"
@@ -1332,15 +1348,14 @@
 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 +141,Source warehouse is mandatory for row {0},Источник склад является обязательным для ряда {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +719,Packing Slip,Паковање Слип
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Source warehouse is mandatory for row {0},Источник склад является обязательным для ряда {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +713,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/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,Захтев за понуду може бити приступ кликом на следећи линк
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Увоз није успело !
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Адреса додао.
 DocType: Workstation Working Hour,Workstation Working Hour,Воркстатион радни сат
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Analyst,аналитичар
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,аналитичар
 DocType: Item,Inventory,Инвентар
 DocType: Item,Sales Details,Детаљи продаје
 DocType: Quality Inspection,QI-,КИ-
@@ -1348,7 +1363,7 @@
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,У Кол
 DocType: Notification Control,Expense Claim Rejected,Расходи потраживање Одбијен
 DocType: Item Attribute,Item Attribute,Итем Атрибут
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +103,Government,правительство
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,правительство
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,Институт Име
 apps/erpnext/erpnext/config/stock.py +289,Item Variants,Ставка Варијанте
 DocType: Company,Services,Услуге
@@ -1364,6 +1379,7 @@
 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/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,Новчани ток од Инвестирање
 DocType: Program Course,Program Course,програм предмета
@@ -1404,12 +1420,12 @@
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"Приемник Список пуст . Пожалуйста, создайте приемник Список"
 DocType: Production Plan Sales Order,Production Plan Sales Order,Производња Продаја план Наручи
 DocType: Sales Partner,Sales Partner Target,Продаја Партнер Циљна
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +110,Accounting Entry for {0} can only be made in currency: {1},Књиговодство Ступање на {0} може се вршити само у валути: {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Књиговодство Ступање на {0} може се вршити само у валути: {1}
 DocType: Pricing Rule,Pricing Rule,Цены Правило
 DocType: Budget,Action if Annual Budget Exceeded,Акција ако Годишњи буџет Екцеедед
 apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Материјал захтјев за откуп Ордер
 DocType: Shopping Cart Settings,Payment Success URL,Плаћање Успех УРЛ адреса
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +78,Row # {0}: Returned Item {1} does not exists in {2} {3},Ред # {0}: враћено артикла {1} не постоји у {2} {3}
+apps/erpnext/erpnext/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,Банка помирење Изјава
@@ -1418,40 +1434,39 @@
 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/stock/doctype/stock_entry/stock_entry.py +339,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Није дозвољено да транфер више {0} од {1} против нарудзбенице {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +344,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Није дозвољено да транфер више {0} од {1} против нарудзбенице {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Листья Выделенные Успешно для {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Нет объектов для вьючных
 DocType: Shipping Rule Condition,From Value,Од вредности
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +545,Manufacturing Quantity is mandatory,Производња Количина је обавезно
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,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 +71,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 +162,Row {0}: From Time and To Time of {1} is overlapping with {2},Ред {0}: Од времена и доба {1} преклапа са {2}
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +186,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,Акции Обязательства
 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 +130,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 +137,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,Остали извештаји
 DocType: Dependent Task,Dependent Task,Зависна Задатак
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Молим вас запослених подешавање Именовање систем у људских ресурса&gt; људских ресурса Сеттингс
 apps/erpnext/erpnext/stock/doctype/item/item.py +411,Conversion factor for default Unit of Measure must be 1 in row {0},Коэффициент пересчета для дефолтного Единица измерения должна быть 1 в строке {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,Leave of type {0} cannot be longer than {1},"Оставить типа {0} не может быть больше, чем {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +197,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 +921,Search Item,Тражи артикла
+apps/erpnext/erpnext/accounts/page/pos/pos.js +910,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 +546,Already completed,већ завршено
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +22,Payment Request already exists {0},Плаћање Захтјев већ постоји {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +550,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 +241,Quantity must not be more than {0},Количина не сме бити више од {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Quantity must not be more than {0},Количина не сме бити више од {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +76,Previous Financial Year is not closed,Претходној финансијској години није затворена
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +44,Age (Days),Старост (Дани)
 DocType: Quotation Item,Quotation Item,Понуда шифра
@@ -1468,7 +1483,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +221,Purchase Receipt {0} is not submitted,Покупка Получение {0} не представлено
 DocType: Company,Default Payable Account,Уобичајено оплате рачуна
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Подешавања за онлине куповину као што су испоруке правила, ценовник итд"
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +83,{0}% Billed,{0}% Приходована
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}% Приходована
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Резервисано Кол
 DocType: Party Account,Party Account,Странка налог
 apps/erpnext/erpnext/config/setup.py +116,Human Resources,Человеческие ресурсы
@@ -1480,12 +1495,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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 +22,Collect,прикупити
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,прикупити
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,Against Supplier Invoice {0} dated {1},Против добављача Фактура {0} {1} од
 DocType: Customer,Default Price List,Уобичајено Ценовник
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +225,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: Payment Reconciliation,Payments,Исплате
 DocType: Journal Entry,Entry Type,Ступање Тип
 ,Customer Credit Balance,Кориснички кредитни биланс
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Payable,Нето промена у потрашивањима
@@ -1497,7 +1511,7 @@
 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 +9,Procurement,набавка
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,Ниједан од ставки имају било какву промену у количини или вриједности.
+apps/erpnext/erpnext/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,Гаранција Цлаим
 ,Lead Details,Олово Детаљи
 DocType: Purchase Invoice,End date of current invoice's period,Крајњи датум периода актуелне фактуре за
@@ -1522,7 +1536,7 @@
 DocType: Purchase Invoice,Additional Discount,Додатни попуст
 DocType: Selling Settings,Selling Settings,Продаја Сеттингс
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Онлине Аукције
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +97,Please specify either Quantity or Valuation Rate or both,Наведите било Количина или вредновања оцену или обоје
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,Наведите било Количина или вредновања оцену или обоје
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +13,Fulfillment,испуњење
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Компанија , месец и Фискална година је обавезно"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Маркетинговые расходы
@@ -1543,14 +1557,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,ЕРПНект Подешавање Комплетна!
 DocType: Item,Weightage,Веигхтаге
 DocType: Packing Slip,PS-,ПС-
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +93,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Группа клиентов существует с тем же именем , пожалуйста изменить имя клиентов или переименовать группу клиентов"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +126,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Группа клиентов существует с тем же именем , пожалуйста изменить имя клиентов или переименовать группу клиентов"
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Нови контакт
 DocType: Territory,Parent Territory,Родитељ Територија
 DocType: Quality Inspection Reading,Reading 2,Читање 2
 DocType: Stock Entry,Material Receipt,Материјал Пријем
 DocType: Homepage,Products,Продукты
 DocType: Announcement,Instructor,инструктор
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},Странка Тип и Странка је потребан за примања / обавезе обзир {0}
 DocType: Employee,AB+,АБ +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Ако ова ставка има варијанте, онда не може бити изабран у налозима продаје итд"
 DocType: Lead,Next Contact By,Следеће Контакт По
@@ -1561,7 +1574,7 @@
 ,Item-wise Sales Register,Предмет продаје-мудре Регистрација
 DocType: Asset,Gross Purchase Amount,Бруто Куповина Количина
 DocType: Asset,Depreciation Method,Амортизација Метод
-apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Offline,оффлине
+apps/erpnext/erpnext/accounts/page/pos/pos.js +686,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,потребан
@@ -1579,25 +1592,27 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +425,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 +858,Make Purchase Order,Маке наруџбенице
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +852,Make Purchase Order,Маке наруџбенице
 DocType: SMS Center,Send To,Пошаљи
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,There is not enough leave balance for Leave Type {0},Существует не хватает отпуск баланс для отпуске Тип {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,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 +172,Work-in-Progress Warehouse is required before Submit,Работа -в- Прогресс Склад требуется перед Отправить
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,Work-in-Progress Warehouse is required before Submit,Работа -в- Прогресс Склад требуется перед Отправить
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Подносилац захтева за посао.
 DocType: Purchase Order Item,Warehouse and Reference,Магацини и Референца
 DocType: Supplier,Statutory info and other general information about your Supplier,Статутарна инфо и друге опште информације о вашем добављачу
-apps/erpnext/erpnext/hooks.py +88,Addresses,Адресе
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Добављач&gt; добављач Тип
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +212,Against Journal Entry {0} does not have any unmatched {1} entry,Против часопису Ступање {0} нема никакву премца {1} улазак
+apps/erpnext/erpnext/hooks.py +95,Addresses,Адресе
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +215,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,Молимо поставите филтер на основу тачке или Варехоусе
 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,Да достави и Билл
@@ -1605,11 +1620,10 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,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 +731,Payment,Плаћање
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,Payment,Плаћање
 DocType: Production Order Operation,Actual Time and Cost,Тренутно време и трошак
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Материал Запрос максимума {0} могут быть сделаны для Пункт {1} против Заказ на продажу {2}
 DocType: Employee,Salutation,Поздрав
-DocType: Pricing Rule,Brand,Марка
 DocType: Course,Course Abbreviation,Наравно држава
 DocType: Item,Will also apply for variants,Ће конкурисати и за варијанте
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +142,"Asset cannot be cancelled, as it is already {0}","Средство не може бити поништена, као што је већ {0}"
@@ -1621,7 +1635,7 @@
 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.",Наведите своје производе или услуге које купују или продају .
 DocType: Hub Settings,Hub Node,Хуб Ноде
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Унели дупликате . Молимо исправи и покушајте поново .
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Associate,помоћник
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,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,Направите листу пријемника
@@ -1629,7 +1643,7 @@
 DocType: Production Planning Tool,Material Requests,materijal Захтеви
 DocType: Warranty Claim,Issue Date,Датум емитовања
 DocType: Activity Cost,Activity Cost,Активност Трошкови
-DocType: Timesheet Detail,Timesheet Detail,тимесхеет Детаљ
+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),Указује на то да пакет је део ове испоруке (само нацрт)
@@ -1652,6 +1666,7 @@
 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,Хас Варијанте
 DocType: Monthly Distribution,Name of the Monthly Distribution,Назив мјесечни
 DocType: Sales Person,Parent Sales Person,Продаја Родитељ Особа
@@ -1664,30 +1679,31 @@
 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 +44,"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/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.,У речи ће бити видљив када сачувате продаје фактуру.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +502,Error: {0} &gt; {1},Грешка: {0}&gt; {1}
 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.,Рок Датум почетка не може бити раније него годину дана датум почетка академске године на коју се израз је везан (академска година {}). Молимо исправите датуме и покушајте поново.
 DocType: Naming Series,Current Value,Тренутна вредност
-apps/erpnext/erpnext/controllers/accounts_controller.py +235,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Више фискалне године постоје за датум {0}. Молимо поставите компаније у фискалној години
+apps/erpnext/erpnext/controllers/accounts_controller.py +238,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 +458,Item table can not be blank,Ставка сто не сме да буде празно
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +443,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 +5,This is based on stock movement. See {0} for details,Ово је засновано на складе кретању. Погледајте {0} за детаље
 DocType: Pricing Rule,Selling,Продаја
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +341,Amount {0} {1} deducted against {2},Износ {0} {1} одузима од {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +344,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,"Впритык не может быть , прежде чем отправлять Дата"
@@ -1702,8 +1718,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +144,Cannot refer row number greater than or equal to current row number for this Charge type,"Не можете обратиться номер строки , превышающую или равную текущему номеру строки для этого типа зарядки"
 DocType: Asset,Sold,Продат
 ,Item-wise Purchase History,Тачка-мудар Историја куповине
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Red,Црвен
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Пожалуйста, нажмите на кнопку "" Generate Расписание "" , чтобы принести Серийный номер добавлен для Пункт {0}"
+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,Отворена Продуцтион Поруџбине
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Основица (Фирма валута)
@@ -1711,7 +1727,7 @@
 DocType: Installation Note,Installation Time,Инсталација време
 DocType: Sales Invoice,Accounting Details,Књиговодство Детаљи
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,Обриши све трансакције за ову компанију
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +187,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Ров # {0}: Операција {1} није завршен за {2} кти готових производа у производњи заказа # {3}. Плеасе упдате статус операције преко временском дневнику
+apps/erpnext/erpnext/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}. Плеасе упдате статус операције преко временском дневнику
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,инвестиции
 DocType: Issue,Resolution Details,Резолуција Детаљи
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,издвајања
@@ -1747,16 +1763,17 @@
 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}
 DocType: Delivery Note,Excise Page Number,Акцизе Број странице
 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}
 ,Maintenance Schedules,Планове одржавања
 DocType: Task,Actual End Date (via Time Sheet),Стварна Датум завршетка (преко Тиме Схеет)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Amount {0} {1} against {2} {3},Износ {0} {1} против {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +339,Amount {0} {1} against {2} {3},Износ {0} {1} против {2} {3}
 ,Quotation Trends,Котировочные тенденции
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},Ставка група не помиње у тачки мајстор за ставку {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +295,Debit To account must be a Receivable account,Дебитна Да рачуну мора бити потраживања рачун
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Receivable account,Дебитна Да рачуну мора бити потраживања рачун
 DocType: Shipping Rule Condition,Shipping Amount,Достава Износ
 ,Pending Amount,Чека Износ
 DocType: Purchase Invoice Item,Conversion Factor,Конверзија Фактор
@@ -1764,10 +1781,10 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +137,Expected value after useful life must be greater than or equal to {0},Очекивана вредност после корисног века трајања мора бити већи или једнак {0}
 DocType: Purchase Receipt,Vehicle Number,Број возила
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Датум на који се понавља фактура ће бити зауставити
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +90,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Укупно издвојена лишће {0} не може бити мањи од већ одобрених лишћа {1} за период
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +93,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 +22,Enter Paid Amount,Унесите плаћени износ
+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,Користите Мулти-Левел бом
@@ -1777,13 +1794,15 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,тимесхеетс
 DocType: HR Settings,HR Settings,ХР Подешавања
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Expense Claim is pending approval. Only the Expense Approver can update status.,Расходи Тужба се чека на одобрење . СамоРасходи одобраватељ да ажурирате статус .
+DocType: Email Digest,New Expenses,Нове Трошкови
 DocType: Purchase Invoice,Additional Discount Amount,Додатне Износ попуста
-apps/erpnext/erpnext/controllers/accounts_controller.py +524,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Ред # {0}: Кол-во мора бити 1, као тачка је основна средства. Молимо вас да користите посебан ред за вишеструко Кол."
+apps/erpnext/erpnext/controllers/accounts_controller.py +527,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Ред # {0}: Кол-во мора бити 1, као тачка је основна средства. Молимо вас да користите посебан ред за вишеструко Кол."
 DocType: Leave Block List Allow,Leave Block List Allow,Оставите листу блокираних Аллов
 apps/erpnext/erpnext/setup/doctype/company/company.py +249,Abbr can not be blank or space,Аббр не може бити празно или простор
 apps/erpnext/erpnext/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/stock/get_item_details.py +123,Please specify Company,Молимо наведите фирму
 ,Customer Acquisition and Loyalty,Кориснички Стицање и лојалности
@@ -1794,17 +1813,19 @@
 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 +183,Closing (Opening + Totals),Затварање (Опенинг + износи)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),Затварање (Опенинг + износи)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Молимо наведите валуту у Друштву
 DocType: Workstation,Wages per hour,Сатнице
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +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/controllers/accounts_controller.py +272,Account {0} is invalid. Account Currency must be {1},Рачун {0} је неважећа. Рачун валута мора да буде {1}
+DocType: Email Digest,Pending Sales Orders,У току продајних налога
+apps/erpnext/erpnext/controllers/accounts_controller.py +275,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 +956,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Ред # {0}: Референца Тип документа мора бити један од продаје реда, продаје Фактура или Јоурнал Ентри"
-DocType: Salary Slip,Deduction,Одузимање
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +87,Row {0}: From Time and To Time is mandatory.,Ред {0}: Од времена и времена је обавезно.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +969,"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 +111,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 +262,Item Price added for {0} in Price List {1},Ставка Цена додат за {0} у ценовнику {1}
 DocType: Address Template,Address Template,Адреса шаблона
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +7,Please enter Employee Id of this sales person,Молимо Вас да унесете Ид радник ове продаје особе
@@ -1812,7 +1833,7 @@
 DocType: Project,% Tasks Completed,% Завршених послова
 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 +194,Please enter Production Item first,Молимо унесите прво Производња пункт
+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,искључени корисник
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Понуда
@@ -1821,53 +1842,54 @@
 DocType: Maintenance Visit,Maintenance User,Одржавање Корисник
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +149,Cost Updated,Трошкови ажурирано
 DocType: Employee,Date of Birth,Датум рођења
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +86,Item {0} has already been returned,Пункт {0} уже вернулся
+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}
+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 +177,Job Description,Опис посла
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,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 +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Специјални знакови осим ""-"" ""."", ""#"", и ""/"" није дозвољено у именовању серије"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Специјални знакови осим ""-"" ""."", ""#"", и ""/"" није дозвољено у именовању серије"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Пратите продајне акције. Пратите води, Куотатионс, продаја Ордер итд из кампање да измери повраћај инвестиције."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +24,Welcome to POS: Create your POS Profile,Добродошли у ПОС: Направите ПОС профил
 DocType: Expense Claim,Approver,Одобраватељ
 ,SO Qty,ТАКО Кол
+DocType: Guardian,Work Address,rad Адреса
 DocType: Appraisal,Calculate Total Score,Израчунајте Укупна оцена
 DocType: Request for Quotation,Manufacturing Manager,Производња директор
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Серийный номер {0} находится на гарантии ДО {1}
+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 +74,Shipments,Пошиљке
+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 +153,Row # ,Ров #
+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 +156,Get From,Гет Од
+apps/erpnext/erpnext/public/js/utils.js +167,Get From,Гет Од
 DocType: C-Form,Quarter,Четврт
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Miscellaneous Expenses,Прочие расходы
 DocType: Global Defaults,Default Company,Уобичајено Компанија
 apps/erpnext/erpnext/controllers/stock_controller.py +167,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Расходи или Разлика рачун је обавезно за пункт {0} , јер утиче укупна вредност залиха"
-apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Не могу да овербилл за тачком {0} у реду {1} више од {2}. Да би се омогућило прекомјерних, поставите на лагеру Сеттингс"
+apps/erpnext/erpnext/controllers/accounts_controller.py +419,"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,-Изнад
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} is disabled,Пользователь {0} отключена
 DocType: Leave Application,Total Leave Days,Укупно ЛЕАВЕ Дана
 DocType: Email Digest,Note: Email will not be sent to disabled users,Напомена: Е-маил неће бити послат са инвалидитетом корисницима
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,Изаберите фирму ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Оставите празно ако се сматра за сва одељења
 apps/erpnext/erpnext/config/hr.py +171,"Types of employment (permanent, contract, intern etc.).","Виды занятости (постоянная , контракт, стажер и т.д. ) ."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +346,{0} is mandatory for Item {1},{0} является обязательным для п. {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,{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","Молимо Вас да изаберете издвајају, Тип фактуре и број фактуре у атлеаст једном реду"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,Трошкови куповини
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},Заказать продаж требуется для Пункт {0}
 DocType: Purchase Invoice Item,Rate (Company Currency),Стопа (Друштво валута)
-apps/erpnext/erpnext/demo/setup_data.py +360,Others,другие
+DocType: Student Guardian,Others,другие
 DocType: Payment Entry,Unallocated Amount,Неалоцирано Износ
 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,Порези и накнаде
@@ -1887,17 +1909,16 @@
 apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,Серијализоване Инвентар
 DocType: Activity Type,Default Billing Rate,Уобичајено обрачуна курс
 DocType: Sales Invoice,Total Billing Amount,Укупно обрачуна Износ
-apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +54,Receivable Account,Потраживања рачуна
-apps/erpnext/erpnext/controllers/accounts_controller.py +546,Row #{0}: Asset {1} is already {2},Ред # {0}: имовине {1} је већ {2}
+apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,Потраживања рачуна
+apps/erpnext/erpnext/controllers/accounts_controller.py +549,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 +79,CEO,Директор
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,Директор
 DocType: Expense Claim Detail,Expense Claim Detail,Расходи потраживање Детаљ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +808,Please select correct account,Молимо изаберите исправан рачун
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +809,Please select correct account,Молимо изаберите исправан рачун
 DocType: Item,Weight UOM,Тежина УОМ
 DocType: Salary Structure Employee,Salary Structure Employee,Плата Структура запослених
 DocType: Employee,Blood Group,Крв Група
-DocType: Purchase Invoice Item,Page Break,Страна Пауза
 DocType: Production Order Operation,Pending,Нерешен
 DocType: Course,Course Name,Назив курса
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Корисници који могу одобри одсуство апликације у конкретној запосленог
@@ -1906,14 +1927,15 @@
 DocType: Fiscal Year,Companies,Компаније
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,електроника
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Подигните захтев залиха материјала када достигне ниво поновно наручивање
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Full-time,Пуно радно време
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Full-time,Пуно радно време
 DocType: Salary Structure,Employees,zaposleni
 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: 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,Укупна вредност Долазни
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Debit To is required,Дебитна Да је потребно
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +321,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,Руководилац квалитета
@@ -1921,6 +1943,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/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,Укупно фактурисано Амт
@@ -1931,18 +1954,17 @@
 DocType: Production Order Operation,Completed Qty,Завршен Кол
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"For {0}, only debit accounts can be linked against another credit entry","За {0}, само дебитне рачуни могу бити повезани против другог кредитног уласка"
 apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,Прайс-лист {0} отключена
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +99,Row {0}: Completed Qty cannot be more than {1} for operation {2},Ред {0}: Завршен количина не може бити више од {1} за операцију {2}
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +123,Row {0}: Completed Qty cannot be more than {1} for operation {2},Ред {0}: Завршен количина не може бити више од {1} за операцију {2}
 DocType: Manufacturing Settings,Allow Overtime,Дозволи Овертиме
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} серијски бројеви који су потребни за тачком {1}. Ви сте под условом {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Тренутни Процена курс
 DocType: Item,Customer Item Codes,Кориснички кодова
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,Курсне / Губитак
 DocType: Opportunity,Lost Reason,Лост Разлог
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Молимо Вас да подешавање броји серију за учешће преко Сетуп&gt; нумерације серија
 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/purchase_receipt/purchase_receipt.py +378,All items have already been invoiced,Све ставке су већ фактурисано
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +379,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,Спољни
@@ -1958,18 +1980,19 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Ваши Купци
 apps/erpnext/erpnext/projects/doctype/project/project.py +141,You have been invited to collaborate on the project: {0},Позвани сте да сарађују на пројекту: {0}
 DocType: Leave Block List Date,Block Date,Блоцк Дате
-apps/erpnext/erpnext/templates/generators/job_opening.html +19,Apply Now,Пријавите се
+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.","Создание и управление ежедневные , еженедельные и ежемесячные дайджесты новостей."
 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
-apps/erpnext/erpnext/utilities/doctype/address/address.py +164,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Подразумевани Адреса Шаблон фоунд. Креирајте нови из Подешавања&gt; Штампа и брендирање&gt; Адреса Темплате.
 DocType: Fee Structure,Fee Structure,naknada Структура
 DocType: Timesheet Detail,Costing Amount,Кошта Износ
+DocType: Student Admission,Application Fee,Накнада за апликацију
 DocType: Process Payroll,Submit Salary Slip,Пошаљи Слип платама
-apps/erpnext/erpnext/controllers/selling_controller.py +161,Maxiumm discount for Item {0} is {1}%,Maxiumm скидка на Пункт {0} {1} %
+apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,Maxiumm скидка на Пункт {0} {1} %
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Увоз у расутом стању
 DocType: Sales Partner,Address & Contacts,Адреса и контакти
 DocType: SMS Log,Sender Name,Сендер Наме
@@ -1994,21 +2017,21 @@
 DocType: Serial No,Delivery Time,Време испоруке
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Старење Басед Он
 DocType: Item,End of Life,Крај живота
-apps/erpnext/erpnext/demo/setup_data.py +361,Travel,путешествие
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +155,No active or default Salary Structure found for employee {0} for the given dates,Нема активног или стандардна плата структура наћи за запосленог {0} за одређени датум
+apps/erpnext/erpnext/demo/setup/setup_data.py +304,Travel,путешествие
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +167,No active or default Salary Structure found for employee {0} for the given dates,Нема активног или стандардна плата структура наћи за запосленог {0} за одређени датум
 DocType: Leave Block List,Allow Users,Дозволи корисницима
 DocType: Purchase Order,Customer Mobile No,Кориснички Мобилни број
 DocType: Sales Invoice,Recurring,Који се враћа
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Пратите посебан Приходи и расходи за вертикала производа или подела.
 DocType: Rename Tool,Rename Tool,Преименовање Тоол
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +23,Update Cost,Ажурирање Трошкови
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Ажурирање Трошкови
 DocType: Item Reorder,Item Reorder,Предмет Реордер
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +36,Show Salary Slip,Схов плата Слип
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +748,Transfer Material,Пренос материјала
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +53,Show Salary Slip,Схов плата Слип
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +166,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 +923,Please set recurring after saving,Молимо поставите понављају након снимања
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +646,Select change amount account,Избор промена износ рачуна
+apps/erpnext/erpnext/public/js/controllers/transaction.js +914,Please set recurring after saving,Молимо поставите понављају након снимања
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +703,Select change amount account,Избор промена износ рачуна
 DocType: Purchase Invoice,Price List Currency,Ценовник валута
 DocType: Naming Series,User must always select,Корисник мора увек изабрати
 DocType: Stock Settings,Allow Negative Stock,Дозволи Негативно Стоцк
@@ -2020,31 +2043,32 @@
 DocType: Quality Inspection,Verified By,Верифиед би
 DocType: Address,Subsidiary,Подружница
 apps/erpnext/erpnext/setup/doctype/company/company.py +64,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Невозможно изменить Базовая валюта компании , потому что есть существующие операции . Сделки должны быть отменены , чтобы поменять валюту ."
+DocType: Grade Interval,Grade Description,граде Опис
 DocType: Quality Inspection,Purchase Receipt No,Куповина Пријем Нема
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,задаток
 DocType: Process Payroll,Create Salary Slip,Направи Слип платама
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +33,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 +352,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Количество в строке {0} ( {1} ) должна быть такой же, как изготавливается количество {2}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Количество в строке {0} ( {1} ) должна быть такой же, как изготавливается количество {2}"
 DocType: Appraisal,Employee,Запосленик
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Позови као корисник
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} је у потпуности наплаћује
 DocType: Workstation Working Hour,End Time,Крајње време
 DocType: Payment Entry,Payment Deductions or Loss,Плаћања Одбици или губитак
-apps/erpnext/erpnext/config/schools.py +100,LMS,ЛМС
+apps/erpnext/erpnext/config/schools.py +104,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,Продаја Цевовод
 DocType: Student Batch Student,Student Batch Student,Студент партије студент
-DocType: Sales Invoice,Mass Mailing,Масовна Маилинг
+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 +199,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/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 +297,Salary Slip of employee {0} already created for this period,Плата Слип запосленог {0} већ створен за овај период
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Pharmaceutical,фармацевтический
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +309,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/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,Кредит би
@@ -2059,27 +2083,28 @@
 DocType: Upload Attendance,Attendance To Date,Присуство Дате
 DocType: Warranty Claim,Raised By,Подигао
 DocType: Payment Gateway Account,Payment Account,Плаћање рачуна
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +814,Please specify Company to proceed,Наведите компанија наставити
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +793,Please specify Company to proceed,Наведите компанија наставити
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Receivable,Нето Промена Потраживања
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Compensatory Off,Компенсационные Выкл
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,Компенсационные Выкл
 DocType: Quality Inspection Reading,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.,Молимо проверите да ли сте заиста желите да избришете све трансакције за ову компанију. Ваши основни подаци ће остати како јесте. Ова акција се не може поништити.
 DocType: Room,Room Number,Број собе
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Неважећи референца {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +161,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) не може бити већи од планираног куанитити ({2}) у производњи Низ {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +162,{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 +217,Raw Materials cannot be blank.,Сировине не може бити празан.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,"Could not update stock, invoice contains drop shipping item.","Није могуће ажурирати залихе, фактура садржи испоруку ставку дроп."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +460,Quick Journal Entry,Брзо Јоурнал Ентри
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +111,You can not change rate if BOM mentioned agianst any item,Не можете променити стопу ако бом помиње агианст било које ставке
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +441,"Could not update stock, invoice contains drop shipping item.","Није могуће ажурирати залихе, фактура садржи испоруку ставку дроп."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Quick Journal Entry,Брзо Јоурнал Ентри
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +103,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 +214,{0} {1} is not submitted,{0} {1} не представлено
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Захтеви за ставке.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Одвојена производња поруџбина ће бити направљен за сваку готовог добар ставке.
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +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.,Име института за коју се постављање овог система.
@@ -2088,16 +2113,17 @@
 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 +398,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 +739,Item or Warehouse for row {0} does not match Material Request,Пункт или Склад для строки {0} не соответствует запросу материал
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +747,Item or Warehouse for row {0} does not match Material Request,Пункт или Склад для строки {0} не соответствует запросу материал
 apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,Јединица мере
 DocType: Fiscal Year,Year End Date,Датум завршетка године
 DocType: Task Depends On,Task Depends On,Задатак Дубоко У
-DocType: Lead,Opportunity,Прилика
+DocType: Supplier Quotation,Opportunity,Прилика
 ,Completed Production Orders,Завршени Продуцтион Поруџбине
 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,Уобичајено Воркстатион
@@ -2110,7 +2136,7 @@
 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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},Техническое обслуживание дата не может быть до даты доставки для Serial No {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},Техническое обслуживание дата не может быть до даты доставки для Serial No {0}
 DocType: Production Order,Actual End Date,Сунце Датум завршетка
 DocType: Purchase Invoice,PINV-,ПИНВ-
 DocType: Authorization Rule,Applicable To (Role),Важећи Да (улога)
@@ -2125,7 +2151,7 @@
 DocType: SMS Log,No of Requested SMS,Нема тражених СМС
 DocType: Campaign,Campaign-.####,Кампания - . # # # #
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Следећи кораци
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,Please supply the specified items at the best possible rates,Молимо вас да доставите одређене ставке на најбољи могући стопама
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +695,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 +117,Contract End Date must be greater than Date of Joining,"Конец контракта Дата должна быть больше, чем дата вступления"
 DocType: Delivery Note,DN-,ДН-
@@ -2134,7 +2160,7 @@
 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 +14,This is an example website auto-generated from ERPNext,Это пример сайт автоматически сгенерированный из ERPNext
+apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Это пример сайт автоматически сгенерированный из ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Старење Опсег 1
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
@@ -2181,13 +2207,14 @@
 DocType: Purchase Receipt Item,Recd Quantity,Рецд Количина
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +54,Fee Records Created - {0},Накнада Записи Цреатед - {0}
 DocType: Asset Category Account,Asset Category Account,Средство Категорија налог
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +103,Cannot produce more Item {0} than Sales Order quantity {1},"Не можете производить больше элемент {0} , чем количество продаж Заказать {1}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Stock Entry {0} is not submitted,Сток Ступање {0} не поднесе
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},"Не можете производить больше элемент {0} , чем количество продаж Заказать {1}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +505,Stock Entry {0} is not submitted,Сток Ступање {0} не поднесе
 DocType: Payment Reconciliation,Bank / Cash Account,Банка / готовински рачун
 DocType: Tax Rule,Billing City,Биллинг Цити
 DocType: Salary Component Account,Salary Component Account,Плата Компонента налог
 DocType: Global Defaults,Hide Currency Symbol,Сакриј симбол валуте
 apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card","нпр банка, Готовина, кредитна картица"
+DocType: Lead Source,Source Name,извор Име
 DocType: Journal Entry,Credit Note,Кредитни Напомена
 DocType: Warranty Claim,Service Address,Услуга Адреса
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furnitures and Fixtures,Намештај и инвентар
@@ -2199,6 +2226,7 @@
 DocType: Opportunity,Customer / Lead Name,Заказчик / Ведущий Имя
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +89,Clearance Date not mentioned,Клиренс Дата не упоминается
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,производња
+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/controllers/trends.py +19,Total(Qty),Укупно (ком)
 DocType: Sales Invoice,This Document,Овај документ
@@ -2210,15 +2238,15 @@
 DocType: Purchase Receipt,Time at which materials were received,Време у коме су примљене материјали
 DocType: Stock Ledger Entry,Outgoing Rate,Одлазећи курс
 apps/erpnext/erpnext/config/hr.py +176,Organization branch master.,Организация филиал мастер .
-apps/erpnext/erpnext/controllers/accounts_controller.py +273, or ,или
+apps/erpnext/erpnext/controllers/accounts_controller.py +276, 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 +203,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Ред # {0}: Јоурнал Ентри {1} нема налог {2} или већ упарен против другог ваучера
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +206,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 +90,No employee for the above selected criteria OR salary slip already created,Ни један запослени за горе одабране критеријуме или листић плата већ креирана
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +93,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,Плаћање Тип
@@ -2246,8 +2274,8 @@
 DocType: Product Bundle,Parent Item,Родитељ шифра
 DocType: Account,Account Type,Тип налога
 DocType: Delivery Note,DN-RET-,ДН-РЕТ-
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +115,Leave Type {0} cannot be carry-forwarded,Оставите Типе {0} не може носити-прослеђен
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"График обслуживания не генерируется для всех элементов . Пожалуйста, нажмите на кнопку "" Generate Расписание """
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +118,Leave Type {0} cannot be carry-forwarded,Оставите Типе {0} не може носити-прослеђен
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"График обслуживания не генерируется для всех элементов . Пожалуйста, нажмите на кнопку "" Generate Расписание """
 ,To Produce,за производњу
 apps/erpnext/erpnext/config/hr.py +93,Payroll,платни списак
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +163,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","За редом {0} у {1}. Да бисте укључили {2} У тачки стопе, редови {3} морају бити укључени"
@@ -2259,13 +2287,13 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +32,Disabled template must not be default template,Онемогућен шаблон не мора да буде подразумевани шаблон
 DocType: Account,Income Account,Приходи рачуна
 DocType: Payment Request,Amount in customer's currency,Износ у валути купца
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +748,Delivery,Испорука
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +742,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,Кључна Одговорност Површина
 DocType: Payment Entry,Total Allocated Amount,Укупно издвајају
 DocType: Item Reorder,Material Request Type,Материјал Врста Захтева
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +82,Row {0}: UOM Conversion Factor is mandatory,Ред {0}: УОМ фактор конверзије је обавезна
+apps/erpnext/erpnext/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,Трошкови центар
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Ваучер #
@@ -2276,13 +2304,13 @@
 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 +90,Head of Marketing and Sales,Шеф маркетинга и продаје
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,подоходный налог
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,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 +403,Please enter Item Code to get batch no,Унесите Шифра добити пакет не
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +770,Please select a value for {0} quotation_to {1},"Пожалуйста, выберите значение для {0} quotation_to {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +397,Please enter Item Code to get batch no,Унесите Шифра добити пакет не
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +764,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","Спајање је могуће само ако следеће особине су исти у оба записа. Да ли је група, корен тип, Компанија"
@@ -2294,28 +2322,29 @@
 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 +100,Issues,Питања
+apps/erpnext/erpnext/hooks.py +109,Issues,Питања
 apps/erpnext/erpnext/controllers/status_updater.py +13,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,Обрачун Валута
 DocType: Sales Invoice,SINV-RET-,СИНВ-РЕТ-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Large,Екстра велики
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,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 +507,Warning: Another {0} # {1} exists against stock entry {2},Упозорење: Још једна {0} # {1} постоји против уласка залиха {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Local,местный
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +508,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Кредиты и авансы ( активы )
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Дужници
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Large,Велики
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,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 +225,Total {0} ({1}),Укупно {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +224,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,Уобичајено Процена Метод
@@ -2373,9 +2402,9 @@
 DocType: Attendance,Leave Type,Оставите Вид
 apps/erpnext/erpnext/controllers/stock_controller.py +173,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"Расходи / Разлика налог ({0}) мора бити ""Добитак или губитак 'налога"
 DocType: Account,Accounts User,Корисничке налоге
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Name error: {0},Име грешка: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +90,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 +178,{0} {1} does not associated with {2} {3},{0} {1} није повезана са {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +181,{0} {1} does not associated with {2} {3},{0} {1} није повезана са {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Посещаемость за работника {0} уже отмечен
 DocType: Packing Slip,If more than one package of the same type (for print),Ако више од једног пакета истог типа (за штампу)
 DocType: Warehouse,Parent Warehouse,родитељ Магацин
@@ -2394,7 +2423,7 @@
 DocType: BOM Item,Scrap %,Отпад%
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Оптужбе ће бити дистрибуиран пропорционално на основу тачка Количина или износа, по вашем избору"
 DocType: Maintenance Visit,Purposes,Сврхе
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,Барем једна ставка треба унети у негативном количином у повратном документа
+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 +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Операција {0} дуже него што је било на располагању радног времена у станици {1}, разбити операцију у више операција"
 ,Requested,Тражени
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +83,No Remarks,Но Примедбе
@@ -2406,46 +2435,46 @@
 DocType: Item,Total Projected Qty,Укупна пројектована количина
 DocType: Monthly Distribution,Distribution Name,Дистрибуција Име
 DocType: Course,Course Code,Наравно код
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Quality Inspection required for Item {0},"Контроль качества , необходимые для Пункт {0}"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Quality Inspection required for Item {0},"Контроль качества , необходимые для Пункт {0}"
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Стопа по којој купца валута претвара у основну валуту компаније
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Нето курс (Фирма валута)
 DocType: Salary Detail,Condition and Formula Help,Стање и формула Помоћ
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Управление Территория дерево .
 DocType: Journal Entry Account,Sales Invoice,Продаја Рачун
 DocType: Journal Entry Account,Party Balance,Парти Стање
-apps/erpnext/erpnext/accounts/page/pos/pos.js +475,Please select Apply Discount On,Молимо одаберите Аппли попуста на
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +92,Salary Slip Created,Плаћа Слип Креирано
+apps/erpnext/erpnext/accounts/page/pos/pos.js +464,Please select Apply Discount On,Молимо одаберите Аппли попуста на
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +95,Salary Slip Created,Плаћа Слип Креирано
 DocType: Company,Default Receivable Account,Уобичајено потраживања рачуна
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,"Направи Банк, улаз за укупне плате исплаћене за горе изабране критеријуме"
 DocType: Stock Entry,Material Transfer for Manufacture,Пренос материјала за Производња
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,Попуст Проценат може да се примени било против ценовнику или за све Ценовником.
 DocType: Purchase Invoice,Half-yearly,Полугодишње
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +384,Accounting Entry for Stock,Рачуноводство Ентри за Деонице
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +387,Accounting Entry for Stock,Рачуноводство Ентри за Деонице
 DocType: Sales Invoice,Sales Team1,Продаја Теам1
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,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 +96,Row {0}: Completed Qty must be greater than zero.,Ред {0}: Завршен количина мора бити већа од нуле.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +120,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 +88,Row # {0}: Cannot return more than {1} for Item {2},Ред # {0}: Не могу да се врате више од {1} за тачком {2}
+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,заплет
 DocType: Item Group,Show this slideshow at the top of the page,Покажи ову пројекцију слајдова на врху странице
 DocType: BOM,Item UOM,Ставка УОМ
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Износ пореза Након Износ попуста (Фирма валута)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +147,Target warehouse is mandatory for row {0},Целевая склад является обязательным для ряда {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +141,Target warehouse is mandatory for row {0},Целевая склад является обязательным для ряда {0}
 DocType: Cheque Print Template,Primary Settings,primarni Подешавања
 DocType: Purchase Invoice,Select Supplier Address,Избор добављача Адреса
 DocType: Quality Inspection,Quality Inspection,Провера квалитета
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Extra Small,Ектра Смалл
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,Warning: Material Requested Qty is less than Minimum Order Qty,Упозорење : Материјал Тражени Кол је мање од Минимална количина за поручивање
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +194,Account {0} is frozen,Счет {0} заморожен
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Ектра Смалл
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +690,Warning: Material Requested Qty is less than Minimum Order Qty,Упозорење : Материјал Тражени Кол је мање од Минимална количина за поручивање
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,Счет {0} заморожен
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Правно лице / Подружница са посебном контном припада организацији.
 DocType: Payment Request,Mute Email,Муте-маил
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Храна , пиће и дуван"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +606,Can only make payment against unbilled {0},Може само извршити уплату против ненаплаћене {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +126,Commission rate cannot be greater than 100,"Скорость Комиссия не может быть больше, чем 100"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +609,Can only make payment against unbilled {0},Може само извршити уплату против ненаплаћене {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,"Скорость Комиссия не может быть больше, чем 100"
 DocType: Stock Entry,Subcontract,Подуговор
 apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,Молимо Вас да унесете {0} прво
 DocType: Production Order Operation,Actual End Time,Стварна Крајње време
@@ -2456,30 +2485,30 @@
 DocType: SMS Log,No of Sent SMS,Број послатих СМС
 DocType: Account,Expense Account,Трошкови налога
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,софтвер
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Colour,Боја
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,Боја
 DocType: Maintenance Visit,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; и нема другог производа Бундле
 DocType: Student Log,Academic,академски
-apps/erpnext/erpnext/controllers/accounts_controller.py +469,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Укупно Адванце ({0}) против Реда {1} не може бити већи од Великог Укупно ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +472,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Укупно Адванце ({0}) против Реда {1} не може бити већи од Великог Укупно ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Изаберите мјесечни неравномерно дистрибуира широм мете месеци.
 DocType: Purchase Invoice Item,Valuation Rate,Процена Стопа
+DocType: Stock Reconciliation,SR/,СР /
 apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,Прайс-лист Обмен не выбран
 DocType: Assessment,Results,Резултати
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +168,Employee {0} has already applied for {1} between {2} and {3},Сотрудник {0} уже подало заявку на {1} между {2} и {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +175,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: Student Applicant,Father's/ Guardian 2 Email ID,Оца / старатеља 2 Е-маил ИД
 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 +228,Warehouses with existing transaction can not be converted to group.,Складишта са постојећим трансакцији не може бити конвертована у групу.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +231,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 +93,Researcher,истраживач
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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.,Долазни контрола квалитета.
@@ -2491,25 +2520,25 @@
 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: Sales Invoice,Advertisement,Реклама
 DocType: Asset Category Account,Depreciation Expense Account,Амортизација Трошкови рачуна
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Probationary Period,Пробни период
-apps/erpnext/erpnext/hooks.py +102,Announcements,Најаве
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Пробни период
+apps/erpnext/erpnext/hooks.py +111,Announcements,Најаве
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Само листа чворови су дозвољени у трансакцији
 DocType: Expense Claim,Expense Approver,Расходи одобраватељ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +109,Row {0}: Advance against Customer must be credit,Ред {0}: Унапред против Купца мора бити кредит
 apps/erpnext/erpnext/accounts/doctype/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 +16,To Datetime,Да датетиме
+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/scheduling_tool/scheduling_tool.py +51,Course Schedules deleted:,Распоред курса избрисан:
 apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,Протоколи за одржавање смс статус испоруке
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Пендинг Активности
+DocType: Accounts Settings,Make Payment via Journal Entry,Извршити уплату преко Јоурнал Ентри
+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 +127,Please enter relieving date.,"Пожалуйста, введите даты снятия ."
-apps/erpnext/erpnext/controllers/trends.py +145,Amt,Амт
+apps/erpnext/erpnext/controllers/trends.py +149,Amt,Амт
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,Only Leave Applications with status 'Approved' can be submitted,"Только Оставьте приложений с статуса ""Одобрено"" могут быть представлены"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +26,Address Title is mandatory.,Адрес Название является обязательным.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Унесите назив кампање, ако извор истраге је кампања"
@@ -2527,14 +2556,15 @@
 apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1},Није могуће пронаћи курс за {0} до {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Марка Пола дан
 DocType: Sales Invoice,Sales Team,Продаја Тим
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Duplicate entry,Дупликат унос
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,Дупликат унос
 DocType: Program Enrollment Tool,Get Students,Гет Студенти
 DocType: Serial No,Under Warranty,Под гаранцијом
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +490,[Error],[Грешка]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +484,[Error],[Грешка]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,У речи ће бити видљив када сачувате продајних налога.
 ,Employee Birthday,Запослени Рођендан
 apps/erpnext/erpnext/controllers/status_updater.py +175,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} већ постоји. Молимо Вас да измените ове ставке и покушајте поново.
 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} не существует
@@ -2550,22 +2580,22 @@
 ,Issued Items Against Production Order,Издате Артикли против редоследа израде
 DocType: Pricing Rule,Purchase Manager,Куповина директор
 DocType: Target Detail,Target Detail,Циљна Детаљ
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +25,All Jobs,Сви послови
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,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 +323,Amount {0} {1} {2} {3},Износ {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,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: Supplier,Credit Limit,Кредитни лимит
 DocType: Production Plan Sales Order,Salse Order Date,Салсе Датум наруџбе
 DocType: Salary Component,Salary Component,плата Компонента
-apps/erpnext/erpnext/accounts/utils.py +372,Payment Entries {0} are un-linked,Плаћања прилога {0} аре ун-линкед
+apps/erpnext/erpnext/accounts/utils.py +449,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 +497,Material Requests {0} created,Запросы Материал {0} создан
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +498,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.,Предложак термина или уговору.
 DocType: Purchase Invoice,Address and Contact,Адреса и контакт
@@ -2604,7 +2634,7 @@
 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 +848,Paid Amount cannot be greater than total negative outstanding amount {0},Плаћени износ не може бити већи од укупног негативног преостали износ {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +859,Paid Amount cannot be greater than total negative outstanding amount {0},Плаћени износ не може бити већи од укупног негативног преостали износ {0}
 DocType: Employee Internal Work History,Employee Internal Work History,Запослени Интерна Рад Историја
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +233,Closing (Dr),Затварање (др)
 DocType: Cheque Print Template,Cheque Size,Чек величина
@@ -2625,7 +2655,8 @@
 ,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 +555,'Update Stock' cannot be checked for fixed asset sale,&#39;Ажурирање Сток &quot;не може да се провери за фиксну продаје имовине
+DocType: Student Guardian,Father,отац
+apps/erpnext/erpnext/controllers/accounts_controller.py +558,'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/buying/doctype/purchase_order/purchase_order.py +132,Material Request {0} is cancelled or stopped,Материал Запрос {0} отменяется или остановлен
@@ -2635,15 +2666,15 @@
 DocType: Sales Order,Fully Delivered,Потпуно Испоручено
 DocType: Lead,Lower Income,Доња прихода
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","Глава рачун под одговорности , у којој ће Добитак / Губитак се резервисати"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +166,Source and target warehouse cannot be same for row {0},Источник и цель склад не может быть одинаковым для ряда {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Разлика Рачун мора бити тип активом / одговорношћу рачуна, јер Сток Помирење је отварање Ступање"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +81,Purchase Order number required for Item {0},Число Заказ требуется для Пункт {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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/purchase_receipt/purchase_receipt.py +82,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 +17,Cannot change status as student {0} is linked with student application {1},Не могу да променим статус студента {0} је повезан са применом студентског {1}
+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: Timesheet,"List of employee which has ""Salary Slip Based on Timesheet"" is enabled in salary structure.",Списак запосленог који има &quot;понуди Слип На основу тимесхеет&quot; омогућена у структури плата.
 DocType: Asset,Fully Depreciated,потпуно отписаних
 ,Stock Projected Qty,Пројектовани Стоцк Кти
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Customer {0} does not belong to project {1},Клиент {0} не принадлежит к проекту {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,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,Серијски број и партије
@@ -2655,7 +2686,7 @@
 DocType: Purchase Invoice,Purchase Taxes and Charges,Куповина Порези и накнаде
 ,Qty to Receive,Количина за примање
 DocType: Leave Block List,Leave Block List Allowed,Оставите Блоцк Лист Дозвољени
-apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +55,All Warehouses,sve складишта
+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 +105,Credit To account must be a Balance Sheet account,Кредит на рачун мора да буде биланса стања
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Сви Типови добављача
@@ -2667,10 +2698,10 @@
 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/manufacturing/doctype/bom/bom.js +26,Browse BOM,Бровсе БОМ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,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/asset/depreciation.py +94,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Молимо поставите рачуна везаним амортизације средстава категорије {0} или компаније {1}
-DocType: Academic Year,Academic Year,Академска година
+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,ЦРМ
 DocType: Appraisal,Appraisal,Процена
@@ -2678,12 +2709,12 @@
 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 +197,Leave approver must be one of {0},Оставьте утверждающий должен быть одним из {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,Leave approver must be one of {0},Оставьте утверждающий должен быть одним из {0}
 DocType: Hub Settings,Seller Email,Продавац маил
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Укупно набавној вредности (преко фактури)
 DocType: Workstation Working Hour,Start Time,Почетак Време
 DocType: Item Price,Bulk Import Help,Групно Увоз Помоћ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +256,Select Quantity,Изаберите Количина
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +257,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,Порука је послата
@@ -2700,6 +2731,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Либо целевой Количество или целевое количество является обязательным.
 apps/erpnext/erpnext/config/projects.py +45,Cost of various activities,Трошкови различитих активности
 apps/erpnext/erpnext/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 +149,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}
 DocType: Item,Inspection Required,Инспекција Обавезно
@@ -2719,7 +2751,7 @@
 DocType: Expense Claim,Approval Status,Статус одобравања
 DocType: Hub Settings,Publish Items to Hub,Објављивање артикле у Хуб
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},"От значение должно быть меньше , чем значение в строке {0}"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Wire Transfer,Вире Трансфер
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,Вире Трансфер
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Štiklirati sve
 DocType: Sales Order,Recurring Order,Понављало Ордер
 DocType: Company,Default Income Account,Уобичајено прихода Рачун
@@ -2731,21 +2763,19 @@
 ,Welcome to ERPNext,Добродошли у ЕРПНект
 apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,Олово и цитата
 DocType: Lead,From Customer,Од купца
-apps/erpnext/erpnext/demo/setup_data.py +357,Calls,Звонки
+apps/erpnext/erpnext/demo/setup/setup_data.py +300,Calls,Звонки
 DocType: Project,Total Costing Amount (via Time Logs),Укупно Кошта Износ (преко Тиме Протоколи)
 DocType: Purchase Order Item Supplied,Stock UOM,Берза УОМ
-apps/erpnext/erpnext/stock/doctype/item/item.py +466,"As there are existing transactions for this item, \
-							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Као што постоје постоје трансакције за ову ставку, \ не може променити вредности &#39;има серијски Но&#39;, &#39;Има серијски бр&#39;, &#39;Да ли лагеру предмета&#39; и &#39;Процена метод&#39;"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,Purchase Order {0} is not submitted,Заказ на {0} не представлено
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,пројектован
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Серийный номер {0} не принадлежит Склад {1}
 apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Примечание: Система не будет проверять по - доставки и избыточного бронирования по пункту {0} как количестве 0
 DocType: Notification Control,Quotation Message,Цитат Порука
 DocType: Issue,Opening Date,Датум отварања
-apps/erpnext/erpnext/schools/api.py +58,Attendance has been marked successfully.,Присуство је успешно обележен.
+apps/erpnext/erpnext/schools/api.py +57,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 +136,Account Type for {0} must be {1},Тип рачун за {0} мора бити {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +139,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,Оба Магацин мора припадати истој компанији
@@ -2760,12 +2790,13 @@
 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/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 +20,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 +1190,Please select customer,Молимо одаберите клијента
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1193,Please select customer,Молимо одаберите клијента
 DocType: C-Form,I,ја
 DocType: Company,Asset Depreciation Cost Center,Средство Амортизација Трошкови центар
 DocType: Sales Order Item,Sales Order Date,Продаја Датум поруџбине
@@ -2775,6 +2806,7 @@
 ,Payment Period Based On Invoice Date,Период отплате Басед Он Фактура Дате
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Миссинг валутниј курс за {0}
 DocType: Assessment,Examiner,испитивач
+DocType: Student,Siblings,браћа и сестре
 DocType: Journal Entry,Stock Entry,Берза Ступање
 DocType: Payment Entry,Payment References,плаћања Референце
 DocType: C-Form,C-FORM-,"С-путем,"
@@ -2792,11 +2824,12 @@
 DocType: Journal Entry,JV-,ЈВ-
 DocType: Topic,Topic Name,Назив теме
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Барем један од продајете или купујете морају бити изабрани
+DocType: Grading Structure,Grade Intervals,Граде Интервали
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Изаберите природу вашег посла.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Где се обавља производњу операције.
 DocType: Asset Movement,Source Warehouse,Извор Магацин
 DocType: Installation Note,Installation Date,Инсталација Датум
-apps/erpnext/erpnext/controllers/accounts_controller.py +534,Row #{0}: Asset {1} does not belong to company {2},Ред # {0}: имовине {1} не припада компанији {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +537,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,Продаја Корисник
@@ -2810,28 +2843,31 @@
 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 +111,Date Of Retirement must be greater than Date of Joining,Дата выхода на пенсию должен быть больше даты присоединения
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +49,There were errors while scheduling course on :,"Било је грешака, док заказују курс на:"
 DocType: Sales Invoice,Against Income Account,Против приход
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +87,{0}% Delivered,{0}% Испоручено
+apps/erpnext/erpnext/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 +379,Please set default {0} in Company {1},Молимо поставите подразумевани {0} у компанији {1}
+apps/erpnext/erpnext/accounts/utils.py +456,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,Бруто добит / губитак
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Наруџбенице артикла у комплету
 apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,Назив компаније не може бити Фирма
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Письмо главы для шаблонов печати .
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Титулы для шаблонов печатных например Фактуры Proforma .
+DocType: Student Guardian,Student Guardian,студент Гардијан
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +184,Valuation type charges can not marked as Inclusive,Тип Процена трошкови не могу означити као инцлусиве
 DocType: POS Profile,Update Stock,Упдате Стоцк
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Различные Единица измерения для элементов приведет к некорректному (Всего) значение массы нетто . Убедитесь, что вес нетто каждого элемента находится в том же UOM ."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,БОМ курс
 DocType: Asset,Journal Entry for Scrap,Јоурнал Ентри за отпад
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Пожалуйста вытяните элементов из накладной
-apps/erpnext/erpnext/accounts/utils.py +349,Journal Entries {0} are un-linked,Јоурнал Ентриес {0} су УН-линкед
+apps/erpnext/erpnext/accounts/utils.py +426,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,Молимо да наведете заокружују трошка у компанији
@@ -2855,6 +2891,7 @@
 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,Форум
+DocType: Homepage,"URL for ""All Products""",УРЛ за &quot;Сви производи&quot;
 DocType: Leave Application,Leave Balance Before Application,Оставите биланс Пре пријаве
 DocType: SMS Center,Send SMS,Пошаљи СМС
 DocType: Cheque Print Template,Width of amount in word,Ширина од износа у речи
@@ -2863,7 +2900,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 +29,Current Job Openings,Цуррент Јоб Опенингс
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,Current Job Openings,Цуррент Јоб Опенингс
 DocType: Company,Stock Adjustment Account,Стоцк Подешавање налога
 DocType: Journal Entry,Write Off,Отписати
 DocType: Timesheet Detail,Operation ID,Операција ИД
@@ -2876,7 +2913,7 @@
 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 +850,Show tax break-up,Покажи пореза распада
+apps/erpnext/erpnext/public/js/controllers/transaction.js +841,Show tax break-up,Покажи пореза распада
 apps/erpnext/erpnext/accounts/party.py +308,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}, стога не можете поново доделити или модификовати"
@@ -2886,10 +2923,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 +534,Please select Posting Date before selecting Party,Молимо одаберите датум постања пре избора Парти
 DocType: Serial No,Out of AMC,Од АМЦ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +80,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 +162,Please contact to the user who have Sales Master Manager {0} role,Молимо контактирајте кориснику који је продаја Мастер менаџер {0} улогу
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +195,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 +5,This is based on the attendance of this Student,Ово је засновано на похађања овог Студент
@@ -2898,12 +2936,11 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Примечания Доставка {0} должно быть отменено до отмены этого заказ клиента
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +75,Paid amount + Write Off Amount can not be greater than Grand Total,"Платные сумма + списания сумма не может быть больше, чем общий итог"
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,{0} is not a valid Batch Number for Item {1},{0} не является допустимым номер партии по пункту {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +138,Note: There is not enough leave balance for Leave Type {0},Примечание: Существует не хватает отпуск баланс для отпуске Тип {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,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,Прилика Тип
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,Нова Компанија
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,Cost Center is required for 'Profit and Loss' account {0},Стоимость Центр необходим для ' о прибылях и убытках » счета {0}
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Трансакције могу само бити обрисан од стране креатора Друштва
 apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,Погрешан број уноса Главне књиге нашао. Можда сте изабрали погрешну налог у трансакцији.
 DocType: Cheque Print Template,Cheque Width,Чек Ширина
@@ -2912,16 +2949,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,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 +228,{0} '{1}' is disabled,{0} '{1}' је онемогућен
+apps/erpnext/erpnext/controllers/accounts_controller.py +231,{0} '{1}' is disabled,{0} '{1}' је онемогућен
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Постави као Опен
 DocType: Cheque Print Template,Scanned Cheque,скенирана Чек
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Пошаљи аутоматске поруке е-поште у Контакте о достављању трансакцијама.
+DocType: Timesheet,Total Billable Amount,Укупно Наплативи Износ
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Тачка 3
 DocType: Purchase Order,Customer Contact Email,Кориснички Контакт Е-маил
 DocType: Warranty Claim,Item and Warranty Details,Ставка и гаранције Детаљи
 DocType: Sales Team,Contribution (%),Учешће (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Примечание: Оплата Вступление не будет создана , так как "" Наличные или Банковский счет "" не был указан"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Responsibilities,Одговорности
+apps/erpnext/erpnext/controllers/accounts_controller.py +78,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,Одговорности
 DocType: Expense Claim Account,Expense Claim Account,Расходи Захтев налог
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,Шаблон
 DocType: Sales Person,Sales Person Name,Продаја Особа Име
@@ -2929,6 +2967,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Додај корисника
 DocType: Pricing Rule,Item Group,Ставка Група
 DocType: Item,Safety Stock,Безбедност Сток
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Код итем&gt; итем Група&gt; Бренд
 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),Порези и накнаде додавања (Друштво валута)
@@ -2938,7 +2977,6 @@
 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: Timesheet,Total Hours,Укупно време
 DocType: Journal Entry,Printing Settings,Принтинг Подешавања
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Total Debit must be equal to Total Credit. The difference is {0},Укупно задуживање мора бити једнак укупном кредитном .
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,аутомобилски
@@ -2951,13 +2989,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Инвестиционо банкарство
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +71,Cash or Bank Account is mandatory for making payment entry,Наличными или банковский счет является обязательным для внесения записи платежей
 DocType: Purchase Invoice,Price List Exchange Rate,Цена курсној листи
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Цустомер&gt; купац Група&gt; Територија
 DocType: Purchase Invoice Item,Rate,Стопа
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Intern,стажиста
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,стажиста
 DocType: Stock Entry,From BOM,Од БОМ
 DocType: Assessment,Assessment Code,Процена код
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +32,Basic,основной
+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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Пожалуйста, нажмите на кнопку "" Generate Расписание """
+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 +95,Reference No is mandatory if you entered Reference Date,"Ссылка № является обязательным, если вы ввели Исходной дате"
@@ -2966,11 +3005,11 @@
 DocType: Salary Slip,Salary Structure,Плата Структура
 DocType: Account,Bank,Банка
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,ваздушна линија
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +752,Issue Material,Питање Материјал
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +723,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 +683,You are in offline mode. You will not be able to reload until you have network.,Ви сте у оффлине моду. Нећете моћи да поново све док имате мрежу.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +665,You are in offline mode. You will not be able to reload until you have network.,Ви сте у оффлине моду. Нећете моћи да поново све док имате мрежу.
 DocType: Hub Settings,Access Token,Приступ токен
 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,Серијски број
@@ -2978,33 +3017,35 @@
 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 +1122,Enter value must be positive,Унесите вредност мора бити позитивна
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,All Territories,Все территории
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1125,Enter value must be positive,Унесите вредност мора бити позитивна
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,Все территории
 DocType: Purchase Invoice,Items,Артикли
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +23,Student is already enrolled.,Студент је већ уписано.
 DocType: Fiscal Year,Year Name,Име године
 DocType: Process Payroll,Process Payroll,Процес Паиролл
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,"Есть больше праздников , чем рабочих дней в этом месяце."
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +233,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 +96,Request for Quotations,Захтев за Куотатионс
+apps/erpnext/erpnext/hooks.py +104,Request for Quotations,Захтев за Куотатионс
 DocType: Payment Reconciliation,Maximum Invoice Amount,Максимални износ фактуре
 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 +628,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Уобичајено Јединица мере за варијанту &#39;{0}&#39; мора бити исти као у темплате &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Уобичајено Јединица мере за варијанту &#39;{0}&#39; мора бити исти као у темплате &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Израчунајте Басед Он
 DocType: Delivery Note Item,From Warehouse,Од Варехоусе
 DocType: Assessment,Supervisor Name,Супервизор Име
+DocType: Assessment,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,Куповина Корисник
 DocType: Notification Control,Customize the Notification,Прилагођавање обавештења
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Cash Flow from Operations,Новчани ток из пословања
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,Уобичајено Адреса Шаблон не може бити обрисан
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,Уобичајено Адреса Шаблон не може бити обрисан
 DocType: Sales Invoice,Shipping Rule,Достава Правило
 DocType: Manufacturer,Limited to 12 characters,Ограничена до 12 карактера
 DocType: Journal Entry,Print Heading,Штампање наслова
@@ -3019,8 +3060,8 @@
 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/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Либо целевой Количество или целевое количество является обязательным
-apps/erpnext/erpnext/stock/get_item_details.py +485,No default BOM exists for Item {0},Нет умолчанию спецификации не существует Пункт {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +336,Please select Posting Date first,Молимо Вас да изаберете датум постања први
+apps/erpnext/erpnext/stock/get_item_details.py +486,No default BOM exists for Item {0},Нет умолчанию спецификации не существует Пункт {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +326,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,МВЗ с существующими сделок не могут быть преобразованы в книге
@@ -3036,6 +3077,7 @@
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Утакмица плаћања са фактурама
 DocType: Journal Entry,Bank Entry,Банка Унос
 DocType: Authorization Rule,Applicable To (Designation),Важећи Да (Именовање)
+,Profitability Analysis,Анализа профитабилности
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,Добавить в корзину
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Група По
 DocType: Guardian,Interests,Интереси
@@ -3048,22 +3090,22 @@
 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 +141,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Серијализованом артикла {0} не може да се ажурира \
  користећи Сток помирење"
 DocType: Scheduling Tool,Day,дан
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Новый Серийный номер не может быть Склад . Склад должен быть установлен на фондовой Вступил или приобрести получении
 DocType: Lead,Lead Type,Олово Тип
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,You are not authorized to approve leaves on Block Dates,Нисте ауторизовани да одобри лишће на блок Датуми
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,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: Student Applicant,AP.,АП.
 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 +639,Point of Sale,Поинт оф Сале
+apps/erpnext/erpnext/accounts/page/pos/pos.js +634,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,Порез
 DocType: Production Planning Tool,Production Planning Tool,Планирање производње алата
@@ -3072,74 +3114,77 @@
 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 +373,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 Entry,Update Rate and Availability,Ажурирање курс и доступност
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,Проценат вам је дозвољено да примају или испоручи више од количине наредио. На пример: Ако сте наредили 100 јединица. и ваш додатак је 10% онда вам је дозвољено да примају 110 јединица.
 DocType: POS Profile,Customer Group,Кориснички Група
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,Expense account is mandatory for item {0},Расходов счета является обязательным для пункта {0}
 DocType: Item,Website Description,Вебсајт Опис
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date must be on or after today,Следећа Амортизација Датум мора бити на дан или након данас
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,Нето промена у капиталу
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +145,Please cancel Purchase Invoice {0} first,Откажите фактури {0} први
 DocType: Serial No,AMC Expiry Date,АМЦ Датум истека
 ,Sales Register,Продаја Регистрација
 DocType: Quotation,Quotation Lost Reason,Понуда Лост разлог
+apps/erpnext/erpnext/utilities/doctype/address/address.py +164,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Подразумевани Адреса Шаблон фоунд. Креирајте нови из Подешавања&gt; Штампа и брендирање&gt; Адреса Темплате.
 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 +330,Transaction reference no {0} dated {1},Трансакција референца не {0} од {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Transaction reference no {0} dated {1},Трансакција референца не {0} од {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Не постоји ништа да измените .
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,Summary for this month and pending activities,Преглед за овај месец и чекају активности
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Преглед за овај месец и чекају активности
 DocType: Customer Group,Customer Group Name,Кориснички Назив групе
 apps/erpnext/erpnext/public/js/financial_statements.js +54,Cash Flow Statement,Извештај о токовима готовине
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Please remove this Invoice {0} from C-Form {1},Молимо вас да уклоните ову фактуру {0} од Ц-Форм {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,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 +644,Get Items,Гет ставке
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +623,Get Items,Гет ставке
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +210,Please enter Write Off Account,"Пожалуйста, введите списать счет"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Последњи Низ Датум
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +41,Account {0} does not belongs to company {1},Рачун {0} не припада компанији {1}
+DocType: Student,Guardian Details,гуардиан Детаљи
 DocType: C-Form,C-Form,Ц-Форм
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Марк Присуство за више радника
 DocType: Payment Request,Initiated,Покренут
 DocType: Production Order,Planned Start Date,Планирани датум почетка
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,Customer is required against Receivable account {0},Купац је обавезан против Потраживања рачуна {0}
 DocType: Serial No,Creation Document Type,Документ регистрације Тип
 DocType: Leave Type,Is Encash,Да ли уновчити
 DocType: Purchase Invoice,Mobile No,Мобилни Нема
 DocType: Leave Allocation,New Leaves Allocated,Нови Леавес Издвојена
-apps/erpnext/erpnext/controllers/trends.py +265,Project-wise data is not available for Quotation,Проект мудрый данные не доступны для коммерческого предложения
+apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Проект мудрый данные не доступны для коммерческого предложения
 DocType: Project,Expected End Date,Очекивани датум завршетка
 DocType: Budget Account,Budget Amount,Износ буџета
 DocType: Appraisal Template,Appraisal Template Title,Процена Шаблон Наслов
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,Commercial,коммерческий
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,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 +648,Row {0}# Account must be of type 'Fixed Asset',Ред {0} # Рачун мора бити типа &#39;основним средствима&#39;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Row {0}# Account must be of type 'Fixed Asset',Ред {0} # Рачун мора бити типа &#39;основним средствима&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Од Кол
 apps/erpnext/erpnext/config/accounts.py +278,Rules to calculate shipping amount for a sale,Правила за израчунавање износа испоруке за продају
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +30,Series is mandatory,Серия является обязательным
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +50,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}
 DocType: Leave Allocation,Unused leaves,Неискоришћени листови
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Cr,Кр
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Cr,Кр
 DocType: Tax Rule,Billing State,Тецх Стате
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +250,Transfer,Пренос
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +187,{0} {1} does not associated with Party Account {2},{0} {1} није повезана са Парти налог {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,Fetch exploded BOM (including sub-assemblies),Фетцх експлодирала бом ( укључујући подсклопова )
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +254,Transfer,Пренос
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +190,{0} {1} does not associated with Party Account {2},{0} {1} није повезана са Парти налог {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +796,Fetch exploded BOM (including sub-assemblies),Фетцх експлодирала бом ( укључујући подсклопова )
 DocType: Authorization Rule,Applicable To (Employee),Важећи Да (запослених)
-apps/erpnext/erpnext/controllers/accounts_controller.py +115,Due Date is mandatory,Дуе Дате обавезна
+apps/erpnext/erpnext/controllers/accounts_controller.py +118,Due Date is mandatory,Дуе Дате обавезна
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Повећање за Аттрибуте {0} не може бити 0
 DocType: Journal Entry,Pay To / Recd From,Плати Да / Рецд Од
 DocType: Naming Series,Setup Series,Подешавање Серија
 DocType: Payment Reconciliation,To Invoice Date,За датум фактуре
 DocType: Supplier,Contact HTML,Контакт ХТМЛ
 ,Inactive Customers,неактивни Купци
+DocType: Landed Cost Voucher,LCV,ЛЦВ
 DocType: Landed Cost Voucher,Purchase Receipts,Куповина Примици
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Како се примењује Правилник о ценама?
 DocType: Quality Inspection,Delivery Note No,Испорука Напомена Не
@@ -3148,7 +3193,7 @@
 DocType: Company,Retail,Малопродаја
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +120,Customer {0} does not exist,Клиент {0} не существует
 DocType: Attendance,Absent,Одсутан
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +587,Product Bundle,Производ Бундле
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Product Bundle,Производ Бундле
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Invalid reference {1},Ред {0}: Погрешна референца {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Купите порези и таксе Темплате
 DocType: Upload Attendance,Download Template,Преузмите шаблон
@@ -3158,8 +3203,8 @@
 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 +742,Send Supplier Emails,Пошаљи Супплиер Емаилс
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +104,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Плата већ обрађени за период од {0} и {1}, Оставите период апликација не може бити између овај период."
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +708,Send Supplier Emails,Пошаљи Супплиер Емаилс
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,"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,гуардиан камата
 DocType: Timesheet,Employee Detail,zaposleni Детаљи
@@ -3170,9 +3215,9 @@
 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/accounts/doctype/gl_entry/gl_entry.py +77,Account {0} cannot be a Group,Счет {0} не может быть группа
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} cannot be a Group,Счет {0} не может быть группа
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +31,Optional. This setting will be used to filter in various transactions.,Опционо . Ова поставка ће се користити за филтрирање у различитим трансакцијама .
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +107,Negative Valuation Rate is not allowed,Негативно Вредновање курс није дозвољен
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Негативно Вредновање курс није дозвољен
 DocType: Holiday List,Weekly Off,Недељни Искључено
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","За нпр 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +39,Provisional Profit / Loss (Credit),Привремени Добитак / Губитак (кредит)
@@ -3186,16 +3231,16 @@
 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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Трошкови Центар је обавезан за пункт {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +626,Get Items from Product Bundle,Гет ставки из производа Бундле
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +605,Get Items from Product Bundle,Гет ставки из производа Бундле
 DocType: Asset,Straight Line,Права линија
 DocType: Project User,Project User,projekat Корисник
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} is inactive,Счет {0} неактивен
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} is inactive,Счет {0} неактивен
 DocType: GL Entry,Is Advance,Да ли Адванце
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Гледалаца Од Датум и радног То Дате је обавезна
 apps/erpnext/erpnext/controllers/buying_controller.py +148,Please enter 'Is Subcontracted' as Yes or No,"Пожалуйста, введите ' Является субподряду "", как Да или Нет"
 DocType: Sales Team,Contact No.,Контакт број
 DocType: Bank Reconciliation,Payment Entries,плаћања прилога
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,'Profit and Loss' type account {0} not allowed in Opening Entry,""" Прибыль и убытки "" тип счета {0} не допускаются в Открытие запись"
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +71,'Profit and Loss' type account {0} not allowed in Opening Entry,""" Прибыль и убытки "" тип счета {0} не допускаются в Открытие запись"
 DocType: Program Enrollment Tool,Get Students From,Гет студенти из
 DocType: Hub Settings,Seller Country,Продавац Земља
 apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,Објављивање ставке на сајту
@@ -3214,7 +3259,7 @@
 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 +558,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Ред # {0}: имовине {1} не може се поднети, већ је {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +561,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Ред # {0}: имовине {1} не може се поднети, већ је {2}"
 DocType: Tax Rule,Billing Country,Zemlja naplate
 DocType: Production Order,Expected Delivery Date,Очекивани Датум испоруке
 apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Дебитне и кредитне није једнака за {0} # {1}. Разлика је {2}.
@@ -3227,13 +3272,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +202,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: Sales Order,% Amount Billed,% Фактурисаних износа
+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 +117,No Item with Serial No {0},Нет товара с серийным № {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Отворене Обавештења
+DocType: Email Digest,Open Notifications,Отворене Обавештења
 DocType: Payment Entry,Difference Amount (Company Currency),Разлика Износ (Фирма валута)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,прямые расходы
 apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
@@ -3241,7 +3286,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Нови Кориснички Приход
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,Командировочные расходы
 DocType: Maintenance Visit,Breakdown,Слом
-apps/erpnext/erpnext/controllers/accounts_controller.py +634,Account: {0} with currency: {1} can not be selected,Рачун: {0} са валутом: {1} не може бити изабран
+apps/erpnext/erpnext/controllers/accounts_controller.py +637,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}
 DocType: Program Enrollment Tool,Student Applicants,Студент Кандидати
@@ -3249,15 +3294,15 @@
 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 +56,Probation,пробни рад
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Probation,пробни рад
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,плата компоненте
 DocType: Program Enrollment Tool,New Academic Year,Нова школска година
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Payment of salary for the month {0} and year {1},Выплата заработной платы за месяц {0} и год {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Payment of salary for the month {0} and year {1},Выплата заработной платы за месяц {0} и год {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Аутоматско уметак Ценовник стопа ако недостаје
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Укупно Плаћени износ
 DocType: Production Order Item,Transferred Qty,Пренето Кти
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Навигација
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Planning,планирање
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,планирање
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Издато
 DocType: Project,Total Billing Amount (via Time Logs),Укупно цард Износ (преко Тиме Протоколи)
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,We sell this Item,Ми продајемо ову ставку
@@ -3270,11 +3315,10 @@
 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/accounts/page/pos/pos.js +1376,Sales invoice submitted sucessfully.,Продаја фактура подноси успешно.
 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}
 DocType: Assessment Result,Student Name,Име студента
-apps/erpnext/erpnext/hooks.py +104,Assessment Schedule,Процена Распоред
+apps/erpnext/erpnext/hooks.py +113,Assessment Schedule,Процена Распоред
 DocType: Brand,Item Manager,Тачка директор
 DocType: Buying Settings,Default Supplier Type,Уобичајено Снабдевач Тип
 DocType: Production Order,Total Operating Cost,Укупни оперативни трошкови
@@ -3284,6 +3328,7 @@
 DocType: GL Entry,Party Type,партия Тип
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +78,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,Мак Дани Оставите животиње
@@ -3295,18 +3340,19 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Цитати на води или клијената.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Улога дозвољено да мењате замрзнуте залихе
 ,Territory Target Variance Item Group-Wise,Территория Целевая Разница Пункт Группа Мудрого
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Customer Groups,Все Группы клиентов
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +78,Accumulated Monthly,картон Месечно
-apps/erpnext/erpnext/controllers/accounts_controller.py +595,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} је обавезно. Можда Мењачница запис није створен за {1} на {2}.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Все Группы клиентов
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +81,Accumulated Monthly,картон Месечно
+apps/erpnext/erpnext/controllers/accounts_controller.py +598,{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 Родитељ рачун} не постоји
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Ценовник Цена (Друштво валута)
 DocType: Products Settings,Products Settings,производи подешавања
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +188,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Молимо поставите Именовање серију за {0} подешавањем&gt; Сеттингс&gt; Именовање Сериес
 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 +84,Secretary,секретар
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,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,Куповина
@@ -3315,24 +3361,22 @@
 ,Reqd By Date,Рекд по датуму
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Creditors,Повериоци
 DocType: Assessment,Assessment Name,Процена Име
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,Ред # {0}: Серијски број је обавезан
+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 +859,Supplier Quotation,Снабдевач Понуда
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +838,Supplier Quotation,Снабдевач Понуда
 DocType: Quotation,In Words will be visible once you save the Quotation.,У речи ће бити видљив када сачувате цитат.
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +7,Collect Fees,таксе
+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}
 DocType: Lead,Add to calendar on this date,Додај у календар овог датума
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Правила для добавления стоимости доставки .
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Предстојећи догађаји
 DocType: Item,Opening Stock,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,усер@екампле.цом
-DocType: Email Digest,Income / Expense,Приходи / расходи
 DocType: Employee,Personal Email,Лични Е-маил
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Укупна разлика
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Ако је укључен, систем ће писати уносе рачуноводствене инвентар аутоматски."
@@ -3344,13 +3388,14 @@
 DocType: Customer,From Lead,Од Леад
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Поруџбине пуштен за производњу.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Изаберите Фискална година ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,POS Profile required to make POS Entry,ПОС Профил потребно да ПОС Ентри
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +509,POS Profile required to make POS Entry,ПОС Профил потребно да ПОС Ентри
 DocType: Program Enrollment Tool,Enroll Students,упис студената
 DocType: Hub Settings,Name Token,Име токен
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Стандардна Продаја
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Atleast one warehouse is mandatory,Атлеаст једно складиште је обавезно
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +129,Atleast one warehouse is mandatory,Атлеаст једно складиште је обавезно
 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 +330,{0} against Sales Invoice {1},{0} против продаје фактуре {1}
 DocType: Sales Invoice,SINV-,СИНВ-
 DocType: Request for Quotation Item,Project Name,Назив пројекта
@@ -3371,10 +3416,11 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Листья должны быть выделены несколько 0,5"
 DocType: Production Order,Operation Cost,Операција кошта
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,Постави присуство из ЦСВ датотеке.
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Изузетан Амт
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Поставите циљеве ставку Групе мудро ову особу продаје.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],"Морозильники Акции старше, чем [ дней ]"
-apps/erpnext/erpnext/controllers/accounts_controller.py +528,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Ред # {0}: имовине је обавезан за фиксни средстава куповине / продаје
+apps/erpnext/erpnext/controllers/accounts_controller.py +531,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Ред # {0}: имовине је обавезан за фиксни средстава куповине / продаје
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Ако два или више Цене Правила су пронадјени на основу горе наведеним условима, Приоритет се примењује. Приоритет је број између 0 до 20, док стандардна вредност нула (празно). Већи број значи да ће имати предност ако постоји више Цене Правила са истим условима."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Фискална година: {0} не постоји
 DocType: Currency Exchange,To Currency,Валутном
@@ -3391,15 +3437,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Приватни капитал
 DocType: Maintenance Visit,Customer Feedback,Кориснички Феедбацк
 DocType: Account,Expense,расход
-DocType: Sales Invoice,Exhibition,Изложба
 apps/erpnext/erpnext/utilities/doctype/address/address.py +77,"Company is mandatory, as it is your company address","Компанија је обавезна, као што је ваша адреса компаније"
 DocType: Item Attribute,From Range,Од Ранге
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +81,Syntax error in formula or condition: {0},Синтакса грешка у формули или стања: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +92,Syntax error in formula or condition: {0},Синтакса грешка у формули или стања: {0}
 apps/erpnext/erpnext/stock/utils.py +99,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 +28,Jobs,Послови
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,Послови
 ,Sales Order Trends,Продажи Заказать Тенденции
 DocType: Employee,Held On,Одржана
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Производња артикла
@@ -3408,16 +3454,16 @@
 DocType: Stock Entry Detail,Additional Cost,Додатни трошак
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,Финансовый год Дата окончания
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","Не можете да филтрирате на основу ваучер Не , ако груписани по ваучер"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +763,Make Supplier Quotation,Направи понуду добављача
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,Make Supplier Quotation,Направи понуду добављача
 DocType: Quality Inspection,Incoming,Долазни
 DocType: BOM,Materials Required (Exploded),Материјали Обавезно (Екплодед)
 apps/erpnext/erpnext/public/js/setup_wizard.js +185,"Add users to your organization, other than yourself","Додај корисника у вашој организацији, осим себе"
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,Row # {0}: Serial No {1} does not match with {2} {3},Ред # {0}: Серијски број {1} не одговара {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +42,Casual Leave,Повседневная Оставить
+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,Повседневная Оставить
 DocType: Batch,Batch ID,Батцх ИД
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,Note: {0},Примечание: {0}
 ,Delivery Note Trends,Достава Напомена трендови
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +103,This Week's Summary,Овонедељном Преглед
+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} може да се ажурира само преко Стоцк промету
 DocType: Student Group Creation Tool,Get Courses,Гет Курсеви
 DocType: GL Entry,Party,Странка
@@ -3427,7 +3473,7 @@
 DocType: Request for Quotation Item,Request for Quotation Item,Захтев за понуду тачком
 DocType: Purchase Order,To Bill,Билу
 DocType: Material Request,% Ordered,% Од А до Ж
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Piecework,рад плаћен на акорд
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Piecework,рад плаћен на акорд
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,Про. Куповни
 DocType: Task,Actual Time (in Hours),Тренутно време (у сатима)
 DocType: Employee,History In Company,Историја У друштву
@@ -3443,7 +3489,7 @@
 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 +162,Black,Црн
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,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} ставки производе
@@ -3454,13 +3500,13 @@
 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 +69,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,марк Одсутан
 DocType: Journal Entry Account,Exchange Rate,Курс
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Sales Order {0} is not submitted,Заказ на продажу {0} не представлено
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +527,Sales Order {0} is not submitted,Заказ на продажу {0} не представлено
 DocType: Homepage,Tag Line,таг линија
 DocType: Fee Component,Fee Component,naknada Компонента
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +857,Add items from,Адд ставке из
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +836,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}
 DocType: Cheque Print Template,Regular,редован
 DocType: BOM,Last Purchase Rate,Последња куповина Стопа
@@ -3468,6 +3514,7 @@
 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} од има варијанте
 ,Sales Person-wise Transaction Summary,Продавац у питању трансакција Преглед
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +60,Cost Center is required for 'Profit and Loss' account {0}. Please set up a default Cost Center for the Company.,Трошкови Центар је потребно за &quot;Биланс успеха&quot; рачуна {0}. Молимо Вас да оснује центар трошкова подразумевани за компаније.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,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,Месечни Дистрибуција Проценти
@@ -3478,12 +3525,12 @@
 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 +710,Online,мрежи
+apps/erpnext/erpnext/accounts/page/pos/pos.js +692,Online,мрежи
 ,Available Stock for Packing Items,На располагању лагер за паковање ставке
 DocType: Item Variant,Item Variant,Итем Варијанта
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,"Постављање Ова адреса шаблон као подразумевани, јер не постоји други подразумевани"
+apps/erpnext/erpnext/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 +74,Quality Management,Управљање квалитетом
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,Управљање квалитетом
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,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,Запослени Спољни Рад Историја
@@ -3505,11 +3552,12 @@
 DocType: Student,Student Email ID,Студент-маил ИД
 DocType: Employee,Notice (days),Обавештење ( дана )
 DocType: Tax Rule,Sales Tax Template,Порез на промет Шаблон
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1520,Select items to save the invoice,Изабрали ставке да спасе фактуру
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1544,Select items to save the invoice,Изабрали ставке да спасе фактуру
 DocType: Employee,Encashment Date,Датум Енцасхмент
 DocType: Account,Stock Adjustment,Фото со Регулировка
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Уобичајено активност Трошкови постоји за тип активности - {0}
 DocType: Production Order,Planned Operating Cost,Планирани Оперативни трошкови
+DocType: Academic Term,Term Start Date,Термин Датум почетка
 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,Подносилац захтева Име
@@ -3539,17 +3587,17 @@
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Рачун за складишта ( сталне инвентуре ) ће бити направљен у оквиру овог рачуна .
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +119,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Склад не может быть удален как существует запись складе книга для этого склада .
 DocType: Company,Distribution,Дистрибуција
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +8,Amount Paid,Износ Плаћени
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Project Manager,Пројецт Манагер
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,Износ Плаћени
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,Пројецт Манагер
 ,Quoted Item Comparison,Цитирано артикла Поређење
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Dispatch,депеша
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,депеша
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Максимална дозвољена попуст за ставку: {0} је {1}%
 apps/erpnext/erpnext/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.,Улога која је дозвољено да поднесе трансакције које превазилазе кредитне лимите.
-DocType: Sales Invoice,Supplier Reference,Снабдевач Референтна
-apps/erpnext/erpnext/accounts/page/pos/pos.js +844,"Master data syncing, it might take some time","Основни подаци синхронизације, то би могло да потраје"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +832,"Master data syncing, it might take some time","Основни подаци синхронизације, то би могло да потраје"
 DocType: Item,Material Issue,Материјал Издање
 DocType: Hub Settings,Seller Description,Продавац Опис
 DocType: Employee Education,Qualification,Квалификација
@@ -3563,7 +3611,7 @@
 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 +83,Error in formula or condition,Грешка у формули или стања
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,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,Искључи све
@@ -3572,7 +3620,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},Да би требало да буде дата у фискалну годину. Под претпоставком То Дате = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Овде можете одржавати висина, тежина, алергија, медицинску забринутост сл"
 DocType: Leave Block List,Applies to Company,Примењује се на предузећа
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +197,Cannot cancel because submitted Stock Entry {0} exists,"Нельзя отменить , потому что представляется со Вступление {0} существует"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +198,Cannot cancel because submitted Stock Entry {0} exists,"Нельзя отменить , потому что представляется со Вступление {0} существует"
 DocType: Purchase Invoice,In Words,У Вордс
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,Today is {0}'s birthday!,Данас је {0} 'с рођендан!
 DocType: Production Planning Tool,Material Request For Warehouse,Материјал Захтев за магацине
@@ -3582,14 +3630,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,Ваша финансијска година почиње
 DocType: Material Request,MREQ-,МРЕК-
 ,Asset Depreciations and Balances,Средстава Амортизација и ваге
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +319,Amount {0} {1} transferred from {2} to {3},Износ {0} {1} је прешао из {2} у {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +322,Amount {0} {1} transferred from {2} to {3},Износ {0} {1} је прешао из {2} у {3}
 DocType: Sales Invoice,Get Advances Received,Гет аванси
 DocType: Email Digest,Add/Remove Recipients,Адд / Ремове прималаца
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +432,Transaction not allowed against stopped Production Order {0},Сделка не допускается в отношении остановил производство ордена {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +437,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 +143,Join,Придружити
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Мањак Количина
-apps/erpnext/erpnext/stock/doctype/item/item.py +652,Item variant {0} exists with same attributes,Тачка варијанта {0} постоји са истим атрибутима
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Тачка варијанта {0} постоји са истим атрибутима
+DocType: Leave Application,LAP/,ЛАП /
 DocType: Salary Slip,Salary 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,' To Date ' требуется
@@ -3597,12 +3646,12 @@
 DocType: Sales Invoice Item,Sales Order Item,Продаја Наручите артикла
 DocType: Salary Slip,Payment Days,Дана исплате
 DocType: Customer,Dormant,скривен
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +212,Warehouses with child nodes cannot be converted to ledger,Складишта са дететом чворова не могу се претворити у ЛЕДГЕР
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +215,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/public/js/controllers/transaction.js +866,It is needed to fetch Item Details.,Потребно је да се донесе Сведениа.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +857,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} уже получил
@@ -3612,14 +3661,14 @@
 DocType: Expense Claim,Total Claimed Amount,Укупан износ полаже
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Потенцијалне могућности за продају.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,Invalid {0},Неважећи {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Sick Leave,Отпуск по болезни
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,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,Робне куце
 DocType: Warehouse,PIN,ПИН-
 DocType: Sales Invoice,Base Change Amount (Company Currency),База Промена Износ (Фирма валута)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +313,No accounting entries for the following warehouses,Нет учетной записи для следующих складов
-apps/erpnext/erpnext/projects/doctype/project/project.js +102,Save the document first.,Први Сачувајте документ.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +314,No accounting entries for the following warehouses,Нет учетной записи для следующих складов
+apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Први Сачувајте документ.
 DocType: Account,Chargeable,Наплатив
 DocType: Company,Change Abbreviation,Промена скраћеница
 DocType: Expense Claim Detail,Expense Date,Расходи Датум
@@ -3632,10 +3681,9 @@
 DocType: Purchase Invoice,Recurring Print Format,Поновни Принт Формат
 DocType: C-Form,Series,серија
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,Expected Delivery Date cannot be before Purchase Order Date,Ожидаемая дата поставки не может быть до заказа на Дата
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Молимо поставите Именовање серију за {0} подешавањем&gt; Сеттингс&gt; Именовање Сериес
 DocType: Appraisal,Appraisal Template,Процена Шаблон
 DocType: Item Group,Item Classification,Итем Класификација
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Business Development Manager,Менаџер за пословни развој
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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,Главна књига
@@ -3645,8 +3693,8 @@
 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 +940,Please select {0} first,Изаберите {0} први
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +749,Batch {0} of Item {1} has expired.,Батцх {0} од тачке {1} је истекао.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +953,Please select {0} first,Изаберите {0} први
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +757,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,сума ставке
@@ -3674,8 +3722,8 @@
  {% ако емаил_ид%} е-маил: {{емаил_ид}} & лт; бр & гт ; {% ЕНДИФ -%} 
  </ цоде> </ пре>"
 DocType: Salary Detail,Default Amount,Уобичајено Износ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +92,Warehouse not found in the system,Складиште није пронађен у систему
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +106,This Month's Summary,Овај месец је Преглед
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Складиште није пронађен у систему
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Овај месец је Преглед
 DocType: Quality Inspection Reading,Quality Inspection Reading,Провера квалитета Рединг
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,"""Замрзни акције старије од"" треба да буде мање од %d дана."
 DocType: Tax Rule,Purchase Tax Template,Порез на промет Темплате
@@ -3685,21 +3733,22 @@
 DocType: Item Customer Detail,Ref Code,Реф Код
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Запослених евиденција.
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Please set Next Depreciation Date,Молимо поставите Нект амортизације од
-DocType: Payment Gateway,Payment Gateway,Паимент Гатеваи
 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 +378,Operation Time must be greater than 0 for Operation {0},Операција време мора бити већи од 0 за операцију {0}
+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/accounts/doctype/account/account.py +170,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пк ( х )
 DocType: Program,Program Abbreviation,програм држава
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,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: Appraisal,Start Date,Датум почетка
@@ -3715,21 +3764,22 @@
 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,Уклоните ставку ако оптужбе се не примењује на ту ставку
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Нпр. смсгатеваи.цом / апи / сенд_смс.цги
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +27,Transaction currency must be same as Payment Gateway currency,Трансакција валуте мора бити исти као паимент гатеваи валуте
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Transaction currency must be same as Payment Gateway currency,Трансакција валуте мора бити исти као паимент гатеваи валуте
 DocType: Payment Entry,Receive,Пријем
+apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,цитати:
 DocType: Maintenance Visit,Fully Completed,Потпуно Завршено
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Комплетна
 DocType: Employee,Educational Qualification,Образовни Квалификације
 DocType: Workstation,Operating Costs,Оперативни трошкови
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Акција ако целокупна месечна буџет Екцеедед
 DocType: Purchase Invoice,Submit on creation,Пошаљи на стварању
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +432,Currency for {0} must be {1},Валута за {0} мора бити {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +435,Currency for {0} must be {1},Валута за {0} мора бити {1}
 DocType: Asset,Disposal Date,odlaganje Датум
 DocType: Employee Leave Approver,Employee Leave Approver,Запослени одсуство одобраватељ
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row {0}: An Reorder entry already exists for this warehouse {1},Ров {0}: Унос Прераспоређивање већ постоји у овој магацин {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +495,Row {0}: An Reorder entry already exists for this warehouse {1},Ров {0}: Унос Прераспоређивање већ постоји у овој магацин {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +79,"Cannot declare as lost, because Quotation has been made.","Не могу прогласити као изгубљен , јер Понуда је учињен ."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Куповина Мастер менаџер
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +429,Production Order {0} must be submitted,Производственный заказ {0} должны быть представлены
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +434,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,До данас не може бити раније од датума
@@ -3739,24 +3789,26 @@
 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 +181,Totals,Укупно
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,Укупно
 DocType: BOM,Manufacturing,Производња
 ,Ordered Items To Be Delivered,Ж Ставке да буде испоручена
 DocType: Account,Income,доход
 DocType: Industry Type,Industry Type,Индустрија Тип
 apps/erpnext/erpnext/templates/includes/cart.js +141,Something went wrong!,Нешто није у реду!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,Warning: Leave application contains following block dates,Упозорење: Оставите пријава садржи следеће датуме блок
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +120,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),Износ (Друштво валута)
+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 +181,Organization unit (department) master.,Название подразделения (департамент) хозяин.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,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 +793,All records are synced.,Сви записи су синхронизовани.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +781,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,необеспеченных кредитов
 DocType: Cost Center,Cost Center Name,Трошкови Име центар
@@ -3775,21 +3827,20 @@
 DocType: Address,Name of person or organization that this address belongs to.,Име особе или организације која је ова адреса припада.
 apps/erpnext/erpnext/public/js/setup_wizard.js +260,Your Suppliers,Ваши Добављачи
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +49,Cannot set as Lost as Sales Order is made.,Не можете поставити као Лост као Продаја Наручите је направљен .
-DocType: Student Applicant,Mother's Name,Име мајке
 DocType: Request for Quotation Item,Supplier Part No,Добављач Део Бр
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +348,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',не могу одбити када категорија је за &quot;процену вредности&quot; или &quot;Ваулатион и Тотал &#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Received From,Primio od
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Received From,Primio od
 DocType: Lead,Converted,Претворено
 DocType: Item,Has Serial No,Има Серијски број
 DocType: Employee,Date of Issue,Датум издавања
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: Од {0} {1} за
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +153,Row #{0}: Set Supplier for item {1},Ред # {0}: Сет добављача за ставку {1}
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +93,Row {0}: Hours value must be greater than zero.,Ред {0}: Сати вредност мора бити већа од нуле.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +117,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} не могу наћи
 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 +172,{0} {1} does not exist,{0} {1} не постоји
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +175,{0} {1} does not exist,{0} {1} не постоји
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,Please check Multi Currency option to allow accounts with other currency,Молимо вас да проверите Мулти валута опцију да дозволи рачуне са другој валути
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +72,Item: {0} does not exist in the system,Итем: {0} не постоји у систему
 apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,Нисте овлашћени да подесите вредност Фрозен
@@ -3798,13 +3849,14 @@
 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/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,Гледалаца не може бити означен за будуће датуме
 DocType: Pricing Rule,Pricing Rule Help,Правилник о ценама Помоћ
 DocType: Purchase Taxes and Charges,Account Head,Рачун шеф
 apps/erpnext/erpnext/config/stock.py +163,Update additional costs to calculate landed cost of items,Упдате додатне трошкове да израчуна слетео трошак ставке
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Electrical,электрический
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Electrical,электрический
 DocType: Stock Entry,Total Value Difference (Out - In),Укупна вредност Разлика (Оут - Ин)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,Row {0}: Exchange Rate is mandatory,Ред {0}: курс је обавезна
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID пользователя не установлен Требуются {0}
@@ -3812,7 +3864,7 @@
 DocType: Item,Customer Code,Кориснички Код
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +210,Birthday Reminder for {0},Подсетник за рођендан за {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Дана Од Последња Наручи
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +292,Debit To account must be a Balance Sheet account,Дебитна на рачун мора да буде биланса стања
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To account must be a Balance Sheet account,Дебитна на рачун мора да буде биланса стања
 DocType: Buying Settings,Naming Series,Именовање Сериес
 DocType: Leave Block List,Leave Block List Name,Оставите Име листу блокираних
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,фондовые активы
@@ -3824,11 +3876,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 +301,Salary Slip of employee {0} already created for time sheet {1},Плата Слип запосленог {0} већ креиран за време стања {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +313,Salary Slip of employee {0} already created for time sheet {1},Плата Слип запосленог {0} већ креиран за време стања {1}
 DocType: Sales Order Item,Ordered Qty,Ж Кол
-apps/erpnext/erpnext/stock/doctype/item/item.py +673,Item {0} is disabled,Ставка {0} је онемогућен
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} is disabled,Ставка {0} је онемогућен
 DocType: Stock Settings,Stock Frozen Upto,Берза Фрозен Упто
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +838,BOM does not contain any stock item,БОМ не садржи никакву стоцк итем
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +809,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.,Пројекат активност / задатак.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Генериши стаје ПЛАТА
@@ -3836,23 +3888,24 @@
 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 +485,Row #{0}: Please set reorder quantity,Ред # {0}: Молим вас сет количину преусмеравање
+DocType: Sales Invoice Timesheet,Billing Hours,обрачун сат
+apps/erpnext/erpnext/stock/doctype/item/item.py +487,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 +62,Please set {0},"Пожалуйста, установите {0}"
 DocType: Purchase Invoice,Repeat on Day of Month,Поновите на дан у месецу
 DocType: Employee,Health Details,Здравље Детаљи
 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,Доставе све рачуне плата за горе наведене изабраним критеријумима
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} артикала синхронизовано
 DocType: Sales Order,Partly Delivered,Делимично Испоручено
-DocType: Sales Invoice,Existing Customer,Постојећи Кориснички
 DocType: Email Digest,Receivables,Потраживања
+DocType: Lead Source,Lead Source,Олово Соурце
 DocType: Customer,Additional information regarding the customer.,Додатне информације у вези купца.
 DocType: Quality Inspection Reading,Reading 5,Читање 5
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +38,Campaign Name is required,Название кампании требуется
 DocType: Maintenance Visit,Maintenance Date,Одржавање Датум
 DocType: Purchase Invoice Item,Rejected Serial No,Одбијен Серијски број
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +80,Year start date or end date is overlapping with {0}. To avoid please set company,Године датум почетка или датум завршетка се преклапа са {0}. Да бисте избегли молим поставили компанију
@@ -3861,10 +3914,9 @@
 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 +129,BOM and Manufacturing Quantity are required,БОМ и Производња Количина се тражи
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,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,мак Снага
-DocType: Bank Reconciliation Detail,Amount,Износ
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,БОМ заменио
 ,Sales Analytics,Продаја Аналитика
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +113,Available {0},Доступно {0}
@@ -3872,14 +3924,14 @@
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Подешавање Е-маил
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +96,Please enter default currency in Company Master,"Пожалуйста, введите валюту по умолчанию в компании Master"
 DocType: Stock Entry Detail,Stock Entry Detail,Берза Унос Детаљ
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +100,Daily Reminders,Дневни Подсетник
+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/account/account_tree.js +23,New Account Name,Нови налог Име
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Сировине комплету Цост
 DocType: Selling Settings,Settings for Selling Module,Подешавања за Селлинг Модуле
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Customer Service,Кориснички сервис
+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/config/hr.py +50,Offer candidate a Job.,Понуда кандидат посла.
@@ -3888,8 +3940,9 @@
 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} должен быть запас товара
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Уобичајено Ворк Ин Прогресс Варехоусе
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1570,Total nos of serial no is not equal to quantity.,Укупан бр оф редним бројем није једнака количини.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1594,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,Упдате Број
@@ -3897,9 +3950,10 @@
 DocType: Sales Order,Printing Details,Штампање Детаљи
 DocType: Task,Closing Date,Датум затварања
 DocType: Sales Order Item,Produced Quantity,Произведена количина
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Engineer,инжењер
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Engineer,инжењер
+DocType: Journal Entry,Total Amount Currency,Укупан износ Валута
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Тражи Суб скупштине
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Item Code required at Row No {0},Код товара требуется на Row Нет {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +398,Item Code required at Row No {0},Код товара требуется на Row Нет {0}
 DocType: Sales Partner,Partner Type,Партнер Тип
 DocType: Purchase Taxes and Charges,Actual,Стваран
 DocType: Authorization Rule,Customerwise Discount,Цустомервисе Попуст
@@ -3915,16 +3969,18 @@
 DocType: BOM,Raw Material Cost,Сировина Трошак
 DocType: Item Reorder,Re-Order Level,Поново би Левел
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Унесите ставке и планирани Кол за које желите да подигне наређења производне или преузети сировине за анализу.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +55,Part-time,Скраћено
+apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,Гантт Цхарт
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,Скраћено
 DocType: Employee,Applicable Holiday List,Важећи Холидаи Листа
 DocType: Employee,Cheque,Чек
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Серия Обновлено
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +57,Series Updated,Серия Обновлено
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,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 +87,Clearance Date updated,Цлеаранце Датум ажуриран
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Успешно помирили
@@ -3938,7 +3994,7 @@
 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 +513,Posting date and posting time is mandatory,Дата публикации и постављање време је обавезна
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,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.,У речи ће бити видљив када сачувате поруџбеницу.
@@ -3948,7 +4004,7 @@
 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/stock/doctype/stock_entry/stock_entry.py +158,Target warehouse in row {0} must be same as Production Order,"Целевая склад в строке {0} должно быть таким же , как производственного заказа"
+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,Валута не може да се промени након што уносе користите неки други валуте
 DocType: Company,Round Off Account,Заокружити рачун
@@ -3957,23 +4013,22 @@
 DocType: Customer Group,Parent Customer Group,Родитељ групу потрошача
 DocType: Purchase Invoice,Contact Email,Контакт Емаил
 DocType: Appraisal Goal,Score Earned,Оцена Еарнед
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Notice Period,Отказни рок
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,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 +4,New Sales Person Name,Продаја нових особа Име
 DocType: Packing Slip,Gross Weight UOM,Бруто тежина УОМ
-DocType: Email Digest,Receivables / Payables,Потраживања / Обавезе
 DocType: Delivery Note Item,Against Sales Invoice,Против продаје фактура
 DocType: Bin,Reserved Qty for Production,Резервисан Кти за производњу
 DocType: Asset,Frequency of Depreciation (Months),Учесталост амортизације (месеци)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +469,Credit Account,Кредитни рачун
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Credit Account,Кредитни рачун
 DocType: Landed Cost Item,Landed Cost Item,Слетео Цена артикла
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +55,Show zero values,Схов нула вредности
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Схов нула вредности
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Количина тачке добија након производњи / препакивање од датих количине сировина
 apps/erpnext/erpnext/public/js/setup_wizard.js +315,Setup a simple website for my organization,Подешавање једноставан сајт за своју организацију
 DocType: Payment Reconciliation,Receivable / Payable Account,Примања / обавезе налог
 DocType: Delivery Note Item,Against Sales Order Item,Против продаје Ордер тачком
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Please specify Attribute Value for attribute {0},Наведите Вредност атрибута за атрибут {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Наведите Вредност атрибута за атрибут {0}
 DocType: Item,Default Warehouse,Уобичајено Магацин
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +39,Budget cannot be assigned against Group Account {0},Буџет не може бити додељен против групе рачуна {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,"Пожалуйста, введите МВЗ родительский"
@@ -3995,19 +4050,22 @@
 DocType: Journal Entry,Total Debit,Укупно задуживање
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Уобичајено готове робе Складиште
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,Продаја Особа
-DocType: Sales Invoice,Cold Calling,Хладна Позивање
 DocType: SMS Parameter,SMS Parameter,СМС Параметар
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,Буџет и трошкова центар
 DocType: Maintenance Schedule Item,Half Yearly,Пола Годишњи
 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 +253,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 +141,Set as Lost,Постави као Лост
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,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 +5,This is based on transactions against this Customer. See timeline below for details,Ово је засновано на трансакције против овог клијента. Погледајте рок доле за детаље
 DocType: Supplier,Credit Days Based On,Кредитни дана по основу
@@ -4019,11 +4077,10 @@
 ,Items To Be Requested,Артикли бити затражено
 DocType: Purchase Order,Get Last Purchase Rate,Гет Ласт Рате Куповина
 DocType: Company,Company Info,Подаци фирме
-apps/erpnext/erpnext/accounts/page/pos/pos.js +941,Select or add new customer,Изабрати или додати новог купца
+apps/erpnext/erpnext/accounts/page/pos/pos.js +930,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 +5,This is based on the attendance of this Employee,Ово је засновано на похађања овог запосленог
-DocType: Sales Invoice,Frequency,Фреквенција
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +463,Debit Account,Текући рачуни
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Debit Account,Текући рачуни
 DocType: Fiscal Year,Year Start Date,Датум почетка године
 DocType: Attendance,Employee Name,Запослени Име
 DocType: Sales Invoice,Rounded Total (Company Currency),Заобљени Укупно (Друштво валута)
@@ -4032,27 +4089,27 @@
 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 +210,Supplier Quotation {0} created,Добављач Понуда {0} је направљена
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +208,Supplier Quotation {0} created,Добављач Понуда {0} је направљена
 apps/erpnext/erpnext/accounts/report/financial_statements.py +90,End Year cannot be before Start Year,До краја године не може бити пре почетка године
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Employee Benefits,Примања запослених
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,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 +228,Please set a default Holiday List for Employee {0} or Company {1},Молимо подесите подразумевани Хамптон Лист за запосленог {0} или Фирма {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +232,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 +499,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Ред Не {0}: Износ не може бити већи од очекивању износ од трошковником потраживања {1}. У очекивању Износ је {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +500,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Ред Не {0}: Износ не може бити већи од очекивању износ од трошковником потраживања {1}. У очекивању Износ је {2}
 DocType: Maintenance Schedule,Schedule,Распоред
 DocType: Account,Parent Account,Родитељ рачуна
 DocType: Quality Inspection Reading,Reading 3,Читање 3
 ,Hub,Средиште
 DocType: GL Entry,Voucher Type,Тип ваучера
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1007,Price List not found or disabled,Ценовник није пронађен или онемогућен
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1008,Price List not found or disabled,Ценовник није пронађен или онемогућен
 DocType: Expense Claim,Approved,Одобрено
 DocType: Pricing Rule,Price,цена
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +244,Employee relieved on {0} must be set as 'Left',"Сотрудник освобожден от {0} должен быть установлен как "" левые"""
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +256,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} в указанный диапазон дат
@@ -4063,12 +4120,12 @@
 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 +259,Please select Employee Record first.,Молимо изаберите Емплоиее Рецорд први.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +266,Please select Employee Record first.,Молимо изаберите Емплоиее Рецорд први.
 DocType: POS Profile,Account for Change Amount,Рачун за промене Износ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +190,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Ред {0}: Партија / налог не подудара са {1} / {2} {3} у {4}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +235,Please enter Expense Account,Унесите налог Екпенсе
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,Please enter Expense Account,Унесите налог Екпенсе
 DocType: Account,Stock,Залиха
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,"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 +976,"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,Куповина / Производња Детаљи
@@ -4083,9 +4140,10 @@
 DocType: Asset Movement,Transaction Date,Трансакција Датум
 DocType: Production Plan Item,Planned Qty,Планирани Кол
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,Укупно Пореска
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,For Quantity (Manufactured Qty) is mandatory,За Количина (Мануфацтуред Кти) је обавезан
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,For Quantity (Manufactured Qty) is mandatory,За Количина (Мануфацтуред Кти) је обавезан
 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 +78,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,Сунце Датум почетка
@@ -4100,9 +4158,11 @@
 DocType: Warranty Claim,If different than customer address,Если отличается от адреса клиента
 DocType: BOM Operation,BOM Operation,БОМ Операција
 DocType: Purchase Taxes and Charges,On Previous Row Amount,На претходни ред Износ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +226,Transfer Asset,трансфер имовине
+DocType: Student,Home Address,Кућна адреса
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +227,Transfer Asset,трансфер имовине
 DocType: POS Profile,POS Profile,ПОС Профил
 apps/erpnext/erpnext/config/schools.py +33,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 +129,"Item {0} is a template, please select one of its variants","Ставка {0} је шаблон, изаберите једну од својих варијанти"
 DocType: Asset,Asset Category,средство Категорија
@@ -4112,8 +4172,8 @@
 DocType: Assessment,Room,соба
 DocType: Purchase Order,Advance Paid,Адванце Паид
 DocType: Item,Item Tax,Ставка Пореска
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +765,Material to Supplier,Материјал за добављача
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +189,Excise Invoice,Акцизе фактура
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,Material to Supplier,Материјал за добављача
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,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,Текущие обязательства
@@ -4123,7 +4183,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,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 +136,Credit Card,кредитна картица
+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.,Настройки по умолчанию для биржевых операций .
 DocType: Purchase Invoice,Next Date,Следећи датум
@@ -4131,6 +4191,7 @@
 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: Academic Term,Term End Date,Термин Датум завршетка
 DocType: Hub Settings,Seller Name,Продавац Име
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Порези и накнаде одузима (Друштво валута)
 DocType: Item Group,General Settings,Генерал Сеттингс
@@ -4142,7 +4203,7 @@
 DocType: Customer,Commission Rate,Комисија Оцени
 apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,Маке Вариант
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Блок оставите апликације по одељењу.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +115,"Payment Type must be one of Receive, Pay and Internal Transfer","Тип уплата мора бити један од Примите, Паи и интерни трансфер"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +118,"Payment Type must be one of Receive, Pay and Internal Transfer","Тип уплата мора бити један од Примите, Паи и интерни трансфер"
 apps/erpnext/erpnext/config/selling.py +169,Analytics,аналитика
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Корпа је празна
 DocType: Production Order,Actual Operating Cost,Стварни Оперативни трошкови
@@ -4157,10 +4218,10 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,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 +92,Designer,дизајнер
+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/accounts/doctype/purchase_invoice/purchase_invoice.py +469,Cost Center is required in row {0} in Taxes table for type {1},МВЗ требуется в строке {0} в виде налогов таблицы для типа {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +472,Cost Center is required in row {0} in Taxes table for type {1},МВЗ требуется в строке {0} в виде налогов таблицы для типа {1}
 DocType: Program,Program Code,programski код
 ,Item-wise Purchase Register,Тачка-мудар Куповина Регистрација
 DocType: Batch,Expiry Date,Датум истека
@@ -4170,12 +4231,12 @@
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Пројекат господар.
 apps/erpnext/erpnext/controllers/status_updater.py +174,"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 +417, (Half Day),(Пола дана)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425, (Half Day),(Пола дана)
 DocType: Supplier,Credit Days,Кредитни Дана
 DocType: Leave Type,Is Carry Forward,Је напред Царри
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +740,Get Items from BOM,Се ставке из БОМ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +711,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 +549,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Ред # {0}: Постављање Дате мора бити исти као и датуму куповине {1} из средстава {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +552,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,Пребаци средство из једног складишта у друго
diff --git a/erpnext/translations/sv.csv b/erpnext/translations/sv.csv
index d087276..95c0710 100644
--- a/erpnext/translations/sv.csv
+++ b/erpnext/translations/sv.csv
@@ -18,11 +18,10 @@
 DocType: Sales Partner,Dealer,Återförsäljare
 DocType: Employee,Rented,Hyrda
 DocType: Purchase Order,PO-,PO-
-apps/erpnext/erpnext/accounts/report/financial_statements.py +19,Start Year {0} not found.,Startår {0} hittades inte.
 DocType: POS Profile,Applicable for User,Tillämplig för Användare
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +191,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Stoppad produktionsorder kan inte återkallas, unstop det första att avbryta"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +197,Do you really want to scrap this asset?,Vill du verkligen att skrota denna tillgång?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +17,Select Default Supplier,Välj Standard Leverantör
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +192,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Stoppad produktionsorder kan inte återkallas, unstop det första att avbryta"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +198,Do you really want to scrap this asset?,Vill du verkligen att skrota denna tillgång?
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Välj Standard Leverantör
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Valuta krävs för prislista {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Kommer att beräknas i transaktionen.
 DocType: Address,County,Grevskap
@@ -42,46 +41,45 @@
 DocType: Sales Invoice,Customer Name,Kundnamn
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +126,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 +180,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 +183,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 +148,Series Updated Successfully,Serie uppdaterats
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +149,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
-DocType: Quality Inspection Reading,Parameter,Parameter
 apps/erpnext/erpnext/projects/doctype/project/project.py +54,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 +239,New Leave Application,Ny Ledighets ansökningan
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,New Leave Application,Ny Ledighets ansökningan
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +20,Attendance Record {0} exists against Student {1} for Course Schedule {2},Publikrekord {0} finns mot Student {1} för Kursschema {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Bank Draft,Bankväxel
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,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
 DocType: Academic Term,Academic Term,termin
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +13,Material,Material
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Quantity,Kvantitet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +511,Accounts table cannot be blank.,Konton tabell kan inte vara tomt.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +616,Quantity,Kvantitet
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +512,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)
 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/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 +142,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
-DocType: Purchase Invoice,Monthly,Månadsvis
 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/buying/doctype/purchase_order/purchase_order.js +771,Invoice,Faktura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +750,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 +198,Row {0}: {1} {2} does not match with {3},Rad {0}: {1} {2} matchar inte med {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Rad # {0}:
+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 +127,Please select Price List,Välj Prislista
@@ -112,8 +110,8 @@
 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 +589,Get items from,Få objekt från
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +382,Stock cannot be updated against Delivery Note {0},Stock kan inte uppdateras mot följesedel {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Få objekt från
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,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
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Matvaror
@@ -122,7 +120,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 +156,Salary Structure Missing,Lönestruktur saknas
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Salary Structure Missing,Lönestruktur saknas
 DocType: Lead,Person Name,Namn
 DocType: Sales Invoice Item,Sales Invoice Item,Fakturan Punkt
 DocType: Account,Credit,Kredit
@@ -130,10 +128,11 @@
 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 +156,Credit limit has been crossed for customer {0} {1}/{2},Kreditgräns har överskridits för kund {0} {1} / {2}
-apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Är Fast Asset&quot; kan inte vara okontrollerat, som Asset rekord existerar mot objektet"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +189,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"
 DocType: Tax Rule,Tax Type,Skatte Typ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +144,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}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,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/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
@@ -143,18 +142,17 @@
 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 +165,Opening,Öppning
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,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/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Kund&gt; Customer Group&gt; Territory
 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.
 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
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Company first,Välj Företaget först
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,Please select Company first,Välj Företaget först
 DocType: Employee Education,Under Graduate,Enligt Graduate
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Mål på
 DocType: BOM,Total Cost,Total Kostnad
@@ -164,7 +162,7 @@
 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
 DocType: Purchase Invoice Item,Is Fixed Asset,Är anläggningstillgång
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Available qty is {0}, you need {1}","Tillgång Antal är {0}, behöver du {1}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +225,"Available qty is {0}, you need {1}","Tillgång Antal är {0}, behöver du {1}"
 DocType: Expense Claim Detail,Claim Amount,Fordringsbelopp
 DocType: Employee,Mr,Herr
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Leverantör Typ / leverantör
@@ -173,25 +171,26 @@
 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: Assessment Result,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 +171,Annual Salary,Årslön
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Annual Salary,Årslön
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Stock Kostnader
-apps/erpnext/erpnext/accounts/report/financial_statements.py +22,End Year {0} not found.,Slut År {0} hittades inte.
 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}
 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 +130,At least one mode of payment is required for POS invoice.,Minst ett läge av betalning krävs för POS faktura.
 DocType: Products Settings,Show Products as a List,Visa produkter som en lista
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Hämta mallen, fyll lämpliga uppgifter och bifoga den modifierade filen. Alla datum och anställdas kombinationer i den valda perioden kommer i mallen, med befintliga närvaroutdrag"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +451,Item {0} is not active or end of life has been reached,Produkt {0} är inte aktiv eller uttjänta har nåtts
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +456,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/controllers/accounts_controller.py +614,"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/controllers/accounts_controller.py +617,"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 +166,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
@@ -203,13 +202,13 @@
 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 +147,Execution,Exekvering
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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/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}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,Cost Center {0} does not belong to Company {1},Kostnadsställe {0} tillhör inte bolaget {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +100,Cost Center {0} does not belong to Company {1},Kostnadsställe {0} tillhör inte bolaget {1}
 DocType: Customer,Individual,Individuell
 DocType: Interest,Academics User,akademiker Användar
 DocType: Cheque Print Template,Amount In Figure,Belopp I figur
@@ -225,30 +224,32 @@
 DocType: Production Planning Tool,Sales Orders,Kundorder
 DocType: Purchase Taxes and Charges,Valuation,Värdering
 ,Purchase Order Trends,Inköpsorder Trender
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,The request for quotation can be accessed by clicking on the following link,Offertbegäran kan nås genom att klicka på följande länk
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,Fördela avgångar för året.
 DocType: SG Creation Tool Course,SG Creation Tool Course,SG Creation Tool Course
 DocType: Student Group Creation Tool,Leave blank if you wish to fetch all courses for selected academic term,Lämna tomt om du vill hämta alla kurser för vald termin
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,Insufficient Stock,otillräcklig Stock
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227,Insufficient Stock,otillräcklig Stock
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Inaktivera kapacitetsplanering och tidsuppföljning
+DocType: Email Digest,New Sales Orders,Ny kundorder
 DocType: Bank Reconciliation,Bank Account,Bankkonto
 DocType: Leave Type,Allow Negative Balance,Tillåt negativt saldo
 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/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} does not belong to Company {1},Kontot {0} tillhör inte ett företag {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +86,Account {0} does not belong to Company {1},Kontot {0} tillhör inte ett företag {1}
 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}
 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
 DocType: Course Schedule,Instructor Name,instruktör Namn
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,For Warehouse is required before Submit,För Lagerkrävs innan du kan skicka
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,For Warehouse is required before Submit,För Lagerkrävs innan du kan skicka
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Mottog den
 DocType: Sales Partner,Reseller,Återförsäljare
 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 +1436,"LocalStorage is full , did not save","Localstorage är full, inte spara"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1460,"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}
@@ -261,18 +262,19 @@
 apps/erpnext/erpnext/templates/generators/item.html +78,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 +5,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/leave_application/leave_application.py +206,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/leave_application/leave_application.py +213,Only the selected Leave Approver can submit this Leave Application,Endast den valda Ledighets ansvarig kan lämna denna ledighets applikationen
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Avgångs Datum måste vara större än Datum för anställningsdatum
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Leaves per Year,Avgångar per år
+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 +103,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}
+DocType: Email Digest,Profit & Loss,Vinst förlust
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,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 +435,Leave Blocked,Lämna Blockerad
-apps/erpnext/erpnext/stock/doctype/item/item.py +669,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 +443,Leave Blocked,Lämna Blockerad
+apps/erpnext/erpnext/stock/doctype/item/item.py +671,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 +83,Annual,Årlig
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +86,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
@@ -280,20 +282,22 @@
 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
 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 +91,Software Developer,Mjukvaruutvecklare
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,Mjukvaruutvecklare
 DocType: Item,Minimum Order Qty,Minimum Antal
 DocType: Pricing Rule,Supplier Type,Leverantör Typ
 DocType: Scheduling Tool,Course Start Date,Kursstart
 DocType: Item,Publish in Hub,Publicera i Hub
+DocType: Student Admission,Student Admission,Student Antagning
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is cancelled,Punkt {0} avbryts
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Material Request,Materialförfrågan
+apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} is cancelled,Punkt {0} avbryts
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +823,Material Request,Materialförfrågan
 DocType: Bank Reconciliation,Update Clearance Date,Uppdatera Clearance Datum
 apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +28,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 +328,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},"Produkt  {0} hittades inte i ""råvaror som levereras""  i beställning {1}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +333,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},"Produkt  {0} hittades inte i ""råvaror som levereras""  i beställning {1}"
 DocType: Employee,Relation,Förhållande
 DocType: Shipping Rule,Worldwide Shipping,Världsomspännande sändnings
+DocType: Student Guardian,Mother,Mor
 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
@@ -309,20 +313,21 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +130,Please select Charge Type first,Välj Avgiftstyp först
 DocType: Student Group Student,Student Group Student,Student Group Student
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Senaste
+DocType: Email Digest,New Quotations,Nya Citat
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Den första Lämna godkännare i listan kommer att anges som standard Lämna godkännare
 DocType: Tax Rule,Shipping County,Frakt County
 apps/erpnext/erpnext/config/desktop.py +158,Learn,Lär dig
 DocType: Asset,Next Depreciation Date,Nästa Av- Datum
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Aktivitet Kostnad per anställd
 DocType: Accounts Settings,Settings for Accounts,Inställningar för konton
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +626,Supplier Invoice No exists in Purchase Invoice {0},Leverantör faktura nr existerar i inköpsfaktura {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +629,Supplier Invoice No exists in Purchase Invoice {0},Leverantör faktura nr existerar i inköpsfaktura {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Hantera Säljare.
 DocType: Job Applicant,Cover Letter,Personligt brev
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Utestående checkar och insättningar för att rensa
 DocType: Item,Synced With Hub,Synkroniserad med Hub
 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 +348,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 +86,Circular Reference Error,Cirkelreferens fel
@@ -334,15 +339,16 @@
 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 +806,Delivery Note,Följesedel
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +800,Delivery Note,Följesedel
 apps/erpnext/erpnext/config/learn.py +87,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 +233,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/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/setup/doctype/email_digest/email_digest.py +104,Summary for this week and pending activities,Sammanfattning för denna vecka och pågående aktiviteter
+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"
 DocType: Employee,Company Email,Företagets e-post
@@ -354,27 +360,28 @@
 apps/erpnext/erpnext/config/hr.py +186,"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
-apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Rad # {0}: Inköp Faktura kan inte göras mot en befintlig tillgång {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +554,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 +54,{0} already allocated for Employee {1} for period {2} to {3},{0} som redan tilldelats för anställd {1} för perioden {2} till {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +812,Select Item,Välj Punkt
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +791,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 \
 					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 +142,Purchase Invoice {0} is already submitted,Inköpsfakturan {0} är redan lämnad
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Rad # {0}: Batch nr måste vara samma som {1} {2}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +143,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.
 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 +342,Please see attachment,Se bifogad fil
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,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 +19,Setup Already Complete!!,Inställning Redan Komplett !!
 ,Finished Goods,Färdiga Varor
 DocType: Delivery Note,Instructions,Instruktioner
 DocType: Quality Inspection,Inspected By,Inspekteras av
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Leverantör&gt; leverantör Type
 DocType: Maintenance Visit,Maintenance Type,Servicetyp
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serienummer {0} tillhör inte följesedel {1}
 apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Lägg produkter
@@ -388,29 +395,29 @@
 DocType: Currency Exchange,Currency Exchange,Valutaväxling
 DocType: Purchase Invoice Item,Item Name,Produktnamn
 DocType: Authorization Rule,Approving User  (above authorized value),Godkännande Användare (ovan auktoriserad värde)
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Tillgodohavande
+DocType: Email Digest,Credit Balance,Tillgodohavande
 DocType: Employee,Widowed,Änka
 DocType: Request for Quotation,Request for Quotation,Offertförfrågan
 DocType: Salary Slip Timesheet,Working Hours,Arbetstimmar
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Ändra start / aktuella sekvensnumret av en befintlig serie.
 apps/erpnext/erpnext/accounts/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 +736,Purchase Return,bara Return
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +715,Purchase Return,bara Return
 ,Purchase Register,Inköpsregistret
 DocType: 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 +202,{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 +209,{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 +143,Reason for losing,Anledning till att förlora
-apps/erpnext/erpnext/accounts/utils.py +239,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 +163,Reason for losing,Anledning till att förlora
+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
 DocType: Announcement,Receiver,Mottagare
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Arbetsstation är stängd på följande datum enligt kalender: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Möjligheter
 DocType: Employee,Single,Singel
 DocType: 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 +225,Please enter Cost Center,Ange kostnadsställe
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,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
@@ -423,26 +430,26 @@
 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
 DocType: Account,Is Group,Är grupperad
+DocType: Email Digest,Pending Purchase Orders,I avvaktan på beställningar
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Automatiskt Serial Nos baserat på FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Kontrollera Leverantörens unika Fakturanummer
 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 +102,Non Profit,Välgörenhets
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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: Stock Reconciliation Item,Do not include symbols (ex. $),Ta inte med symboler (ex. $)
 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 +638,Attribute {0} selected multiple times in Attributes Table,Attribut {0} valda flera gånger i attribut Tabell
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Attribut {0} valda flera gånger i attribut Tabell
 DocType: HR Settings,Employee record is created using selected field. ,Personal register skapas med hjälp av valda fältet.
 DocType: Sales Order,Not Applicable,Inte Tillämpbar
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Semester topp.
 DocType: Request for Quotation Item,Required Date,Obligatorisk Datum
 DocType: Delivery Note,Billing Address,Fakturaadress
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +862,Please enter Item Code.,Ange Artikelkod.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +847,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"
@@ -456,12 +463,12 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Värdepapper och inlåning
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Totalt blad tilldelats är obligatorisk
 DocType: Job Opening,Description of a Job Opening,Beskrivning av ett jobb
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Pending activities for today,I avvaktan på aktiviteter för dag
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,I avvaktan på aktiviteter för dag
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Närvaro lista
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Lönedel för tidrapport baserad lönelistan.
 DocType: Sales Order Item,Used for Production Plan,Används för produktionsplan
 DocType: Manufacturing Settings,Time Between Operations (in mins),Time Between Operations (i minuter)
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +92,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} budget för kontot {1} mot kostnadsställe {2} är {3}. Det kommer att överstiga av {4}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +95,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} budget för kontot {1} mot kostnadsställe {2} är {3}. Det kommer att överstiga av {4}
 DocType: Customer,Buyer of Goods and Services.,Köpare av varor och tjänster.
 DocType: Journal Entry,Accounts Payable,Leverantörsreskontra
 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
@@ -469,16 +476,16 @@
 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/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 +86,Administrative Officer,Handläggare
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,Handläggare
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +23,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 +319,Please select Company,Välj Företag
-DocType: Stock Entry,Difference Account,Differenskonto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +309,Please select Company,Välj Företag
+DocType: Stock Entry Detail,Difference Account,Differenskonto
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,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 +398,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 +399,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 +530,"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 +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"
 DocType: Shipping Rule,Net Weight,Nettovikt
 DocType: Employee,Emergency Phone,Nödtelefon
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +28,Buy,Köpa
@@ -486,7 +493,7 @@
 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 +1563,Serial no item cannot be a fraction,Serienummer objekt kan inte vara en bråkdel
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1587,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
@@ -495,13 +502,14 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Account {0} does not belong to company: {1},Kontot {0} tillhör inte företaget: {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation already used for another company,Förkortning redan används för ett annat företag
 DocType: Selling Settings,Default Customer Group,Standard Kundgrupp
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Supplier is required against Payable account {0},Leverantör krävs mot Betal konto {0}
 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
 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 +313,Reference No and Reference Date is mandatory for Bank transaction,Referensnummer och referens Datum är obligatorisk för Bank transaktion
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +316,Reference No and Reference Date is mandatory for Bank transaction,Referensnummer och referens Datum är obligatorisk för Bank transaktion
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Lägg till / redigera skatter och avgifter
 DocType: Purchase Invoice,Supplier Invoice No,Leverantörsfaktura Nej
 DocType: Territory,For reference,Som referens
@@ -512,7 +520,6 @@
 DocType: Installation Note Item,Installation Note Item,Installeringsnotis objekt
 DocType: Production Plan Item,Pending Qty,Väntar Antal
 DocType: Budget,Ignore,Ignorera
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Artnr&gt; Post Group&gt; Brand
 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/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
@@ -523,11 +530,11 @@
 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/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 +28,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 +19,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 +707,Make Sales Order,Skapa kundorder
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +701,Make Sales Order,Skapa kundorder
 DocType: Project Task,Project Task,Projektuppgift
 ,Lead Id,Prospekt Id
 DocType: C-Form Invoice Detail,Grand Total,Totalsumma
@@ -543,7 +550,8 @@
 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 +734,Sales Return,Sales Return
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +728,Sales Return,Sales Return
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +91,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)
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Databas för potentiella kunder.
@@ -552,14 +560,13 @@
 DocType: Quotation,Quotation To,Offert Till
 DocType: Lead,Middle Income,Medelinkomst
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +212,Opening (Cr),Öppning (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +795,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,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 +237,Allocated amount can not be negative,Avsatt belopp kan inte vara negativ
+apps/erpnext/erpnext/stock/doctype/item/item.py +797,Default Unit of Measure for Item {0} cannot be changed directly because 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
 DocType: Purchase Order Item,Billed Amt,Fakturerat ant.
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Ett aktuell lagerlokal mot vilken lager noteringar görs.
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Fakturan Tidrapport
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},Referensnummer och referens Datum krävs för {0}
-DocType: Sales Invoice,Customer's Vendor,Kundens Säljare
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Proposal Writing,Förslagsskrivning
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,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"
@@ -568,13 +575,14 @@
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,Time Tracking
 DocType: Fiscal Year Company,Fiscal Year Company,Räkenskapsårets Företag
 DocType: Packing Slip Item,DN Detail,DN Detalj
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +257,Already supplier quotation has created,Redan leverantör citat har skapat
 DocType: Timesheet,Billed,Fakturerad
 DocType: Batch,Batch Description,Batch Beskrivning
+apps/erpnext/erpnext/accounts/utils.py +685,"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 +733,View Offline Records,Se Offline Records
+apps/erpnext/erpnext/accounts/page/pos/pos.js +715,View Offline Records,Se Offline Records
+DocType: Student,Sibling Details,syskon Detaljer
 DocType: Employee,Reason for Resignation,Anledning till Avgång
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,Mall för utvecklingssamtal.
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,Faktura / Journalanteckning Detaljer
@@ -588,7 +596,7 @@
 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
 DocType: Employee,Passport Number,Passnummer
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Manager,Chef
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,Chef
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,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"
@@ -597,10 +605,11 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter email address,Ange e-postadress
 DocType: Production Order Operation,In minutes,På några minuter
 DocType: Issue,Resolution Date,Åtgärds Datum
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +299,Timesheet created:,Tidrapport skapat:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +715,Please set default Cash or Bank account in Mode of Payment {0},Ställ in standard Kontant eller bankkonto i betalningssätt {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +300,Timesheet created:,Tidrapport skapat:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +772,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
 DocType: Selling Settings,Customer Naming By,Kundnamn på
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vänligen installations anställd namngivningssystem i Human Resource&gt; HR Inställningar
 DocType: Depreciation Schedule,Depreciation Amount,avskrivningsbelopp
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,Konvertera till gruppen
 DocType: Activity Cost,Activity Type,Aktivitetstyp
@@ -625,6 +634,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,Yta
 DocType: Pricing Rule,Sales Manager,FÖRSÄLJNINGSCHEF
 DocType: Salary Structure Employee,Base,Bas
+DocType: Timesheet,Total Billed Hours,Totalt Fakturerade Timmar
 DocType: Journal Entry,Write Off Amount,Avskrivningsbelopp
 DocType: Journal Entry,Bill No,Fakturanr
 DocType: Company,Gain/Loss Account on Asset Disposal,Vinst / Förlust konto på Asset Avfallshantering
@@ -639,11 +649,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +9,Pre Sales,pre Sales
 DocType: Purchase Receipt,Other Details,Övriga detaljer
 DocType: Account,Accounts,Konton
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Marketing,Marknadsföring
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +227,Payment Entry is already created,Betalning Entry redan har skapats
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,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 +538,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 +21,Preview Salary Slip,Förhandsvisning lönebesked
+apps/erpnext/erpnext/controllers/accounts_controller.py +541,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 +38,Preview Salary Slip,Förhandsvisning lönebesked
 DocType: Company,Deafult Cost Center,Deafult kostnadsställe
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +48,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
@@ -652,7 +662,7 @@
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,Välj en studentgrupp
 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 +617,Item has variants.,Produkten har varianter.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Produkten har varianter.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,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}
@@ -672,7 +682,7 @@
 DocType: Purchase Order,Supply Raw Materials,Supply Råvaror
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,Det datum då nästa faktura kommer att genereras. Det genereras på skicka.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Nuvarande Tillgångar
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,{0} is not a stock Item,{0} är inte en lagervara
+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 +169,Lead must be set if Opportunity is made from Lead,Prospekt måste ställas in om Möjligheten är skapad av Prospekt
@@ -739,26 +749,25 @@
 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 +709,No Permission,Inget Tillstånd
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +710,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}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +298,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 +542,Row #{0}: Asset {1} must be submitted,Rad # {0}: Asset {1} måste lämnas in
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset {1} must be submitted,Rad # {0}: Asset {1} måste lämnas in
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Ingen anställd hittades
 DocType: Supplier Quotation,Stopped,Stoppad
 DocType: Item,If subcontracted to a vendor,Om underleverantörer till en leverantör
 DocType: SMS Center,All Customer Contact,Alla Kundkontakt
 apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,Ladda lagersaldo via csv.
 DocType: Warehouse,Tree Details,Tree Detaljerad information
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Skicka Nu
 ,Support Analytics,Stöd Analytics
 DocType: Item,Website Warehouse,Webbplatslager
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimifakturabelopp
 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/sales_invoice/sales_invoice.py +227,Timesheet {0} is already completed or cancelled,Tidrapport {0} är redan slutförts eller avbrutits
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +259,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
@@ -774,13 +783,13 @@
 apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Kursschema
 DocType: Maintenance Visit,Completion Status,Slutförande Status
 DocType: HR Settings,Enter retirement age in years,Ange pensionsåldern i år
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +229,Target Warehouse,Target Lager
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +230,Target Warehouse,Target Lager
 DocType: Cheque Print Template,Starting location from left edge,Startplats från vänstra kanten
 DocType: Item,Allow over delivery or receipt upto this percent,Tillåt överleverans eller mottagande upp till denna procent
 DocType: Stock Entry,STE-,Stefan
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Sales Order Date,Förväntad leveransdatum kan inte vara före säljorders datum
 DocType: Upload Attendance,Import Attendance,Import Närvaro
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Alla artikelgrupper
+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/config/setup.py +89,Automatically compose message on submission of transactions.,Komponera meddelandet automatiskt mot uppvisande av transaktioner.
@@ -792,13 +801,15 @@
 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/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
 DocType: Expense Claim,Expenses,Kostnader
 DocType: Item Variant Attribute,Item Variant Attribute,Punkt Variant Attribut
 ,Purchase Receipt Trends,Kvitto Trender
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Research & Development,Forskning &amp; Utveckling
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Forskning &amp; Utveckling
 ,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
 DocType: Leave Block List Date,Leave Block List Date,Lämna Blockeringslista Datum
 DocType: Pricing Rule,Price or Discount,Pris eller rabatt
@@ -807,7 +818,7 @@
 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/controllers/accounts_controller.py +340,"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."
+apps/erpnext/erpnext/controllers/accounts_controller.py +343,"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
@@ -829,12 +840,12 @@
 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 +756,Purchase Receipt,Inköpskvitto
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +735,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 +167,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 +282,Unable to find Time Slot in the next {0} days for Operation {1},Det går inte att hitta tidslucka i de närmaste {0} dagar för Operation {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +170,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 +283,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 +439,BOM {0} must be active,BOM {0} måste vara aktiv
@@ -845,7 +856,7 @@
 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 +214,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 +217,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
@@ -859,9 +870,9 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Medarbetare {0} är inte aktiv eller existerar inte
 DocType: Fee Structure,Components,Komponenter
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,Please enter Asset Category in Item {0},Ange tillgångsslag i punkt {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +612,Item Variants {0} updated,Produkt Varianter {0} uppdaterad
+apps/erpnext/erpnext/stock/doctype/item/item.py +614,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 +843,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 +854,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
@@ -876,69 +887,72 @@
 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 +728,New Sales Invoice,Ny försäljningsfaktura
+apps/erpnext/erpnext/accounts/page/pos/pos.js +710,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 +728,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
 DocType: Material Request Item,Lead Time Date,Ledtid datum
 DocType: Guardian,Guardian Name,Guardian Namn
 DocType: Cheque Print Template,Has Print Format,Har Utskriftsformat
-apps/erpnext/erpnext/accounts/page/pos/pos.js +86, 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 +109,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 +619,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","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/page/pos/pos.js +75, 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 +613,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing 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 +606,Supplier Invoice Date cannot be greater than Posting Date,Leverantörsfakturor Datum kan inte vara större än Publiceringsdatum
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +609,Supplier Invoice Date cannot be greater than Posting Date,Leverantörsfakturor Datum kan inte vara större än Publiceringsdatum
 DocType: Purchase Invoice Item,Purchase Order Item,Inköpsorder Artikeln
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +130,Indirect Income,Indirekt inkomst
 DocType: Cheque Print Template,Date Settings,Datum Inställningar
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Varians
 ,Company Name,Företagsnamn
 DocType: SMS Center,Total Message(s),Totalt Meddelande (er)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +810,Select Item for Transfer,Välj föremål för Transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +789,Select Item for Transfer,Välj föremål för Transfer
 DocType: Purchase Invoice,Additional Discount Percentage,Ytterligare rabatt Procent
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Visa en lista över alla hjälp videos
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Välj konto chefen för banken, där kontrollen avsattes."
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Tillåt användare att redigera prislista i transaktioner
 DocType: Pricing Rule,Max Qty,Max Antal
-DocType: Student Applicant,Father's Name,Fars namn
 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 +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Rad {0}: Betalning mot Försäljning / inköpsorder bör alltid märkas i förskott
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Kemisk
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +686,All items have already been transferred for this Production Order.,Alla objekt har redan överförts till denna produktionsorder.
+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
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +694,All items have already been transferred for this Production Order.,Alla objekt har redan överförts till denna produktionsorder.
 DocType: Process Payroll,Select Payroll Year and Month,Välj Lön År och Månad
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,Meter,Meter
 DocType: Workstation,Electricity Cost,Elkostnad
 DocType: HR Settings,Don't send Employee Birthday Reminders,Skicka inte anställdas födelsedagspåminnelser
-DocType: Opportunity,Walk In,Gå In
 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 +12,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).
 DocType: Timesheet Detail,Bill,Räkningen
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,White,Vit
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,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
 DocType: SMS Center,All Lead (Open),Alla Ledare (Öppna)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +228,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})
+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 +731,Make ,Göra
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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.
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Min kundvagn
-apps/erpnext/erpnext/controllers/selling_controller.py +154,Order Type must be one of {0},Beställd Typ måste vara en av {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Beställd Typ måste vara en av {0}
 DocType: Lead,Next Contact Date,Nästa Kontakt Datum
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Öppning Antal
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +393,Please enter Account for Change Amount,Ange konto för förändring Belopp
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,Please enter Account for Change Amount,Ange konto för förändring Belopp
 DocType: Student Batch,Student Batch Name,Elev batchnamn
 DocType: Holiday List,Holiday List Name,Semester Listnamn
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js +8,Schedule Course,schema Course
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Stock Options,Optioner
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Optioner
 DocType: Journal Entry Account,Expense Claim,Utgiftsräkning
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +211,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 +237,Qty for {0},Antal för {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +212,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 +238,Qty for {0},Antal för {0}
 DocType: Leave Application,Leave Application,Ledighetsansöknan
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Ledighet Tilldelningsverktyget
 DocType: Leave Block List,Leave Block List Dates,Lämna Block Lista Datum
@@ -947,9 +961,9 @@
 DocType: Company,Default Terms,Standardvillkor
 DocType: Packing Slip Item,Packing Slip Item,Följesedels artikel
 DocType: Purchase Invoice,Cash/Bank Account,Kontant / Bankkonto
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Borttagna objekt med någon förändring i kvantitet eller värde.
+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 +635,Attribute table is mandatory,Attributtabell är obligatoriskt
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Attributtabell är obligatoriskt
 DocType: Production Planning Tool,Get Sales Orders,Hämta kundorder
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{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
@@ -974,7 +988,7 @@
 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/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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Löpnummer {0} är under underhållsavtal upp {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +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
@@ -986,7 +1000,7 @@
 DocType: GL Entry,Against,Mot
 DocType: Item,Default Selling Cost Center,Standard Kostnadsställe Försäljning
 DocType: Sales Partner,Implementation Partner,Genomförande Partner
-apps/erpnext/erpnext/controllers/selling_controller.py +231,Sales Order {0} is {1},Kundorder {0} är {1}
+apps/erpnext/erpnext/controllers/selling_controller.py +232,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
 DocType: Packing Slip,Net Weight UOM,Nettovikt UOM
@@ -996,25 +1010,24 @@
 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
 DocType: Sales Person,Select company name first.,Välj företagsnamn först.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Offerter mottaget från leverantörer.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},Till {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Medelålder
 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/templates/pages/home.html +32,View All Products,Visa alla produkter
+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
 DocType: Expense Claim,From Employee,Från anställd
-apps/erpnext/erpnext/controllers/accounts_controller.py +400,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"
+apps/erpnext/erpnext/controllers/accounts_controller.py +403,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/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,och år:
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +191,{0} {1} must be submitted,{0} {1} måste lämnas in
-DocType: Email Digest,Annual Expense,Årlig Expense
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,{0} {1} must be submitted,{0} {1} måste lämnas in
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +145,Quantity must be less than or equal to {0},Kvantitet måste vara mindre än eller lika med {0}
 DocType: SMS Center,Total Characters,Totalt Tecken
 apps/erpnext/erpnext/controllers/buying_controller.py +156,Please select BOM in BOM field for Item {0},Välj BOM i BOM fältet för produkt{0}
@@ -1025,30 +1038,31 @@
 DocType: Sales Partner,Distributor,Distributör
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Varukorgen frakt Regel
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +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 +62,Please set 'Apply Additional Discount On',Ställ in &quot;tillämpa ytterligare rabatt på&quot;
+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
 DocType: Global Defaults,Global Defaults,Globala standardinställningar
 apps/erpnext/erpnext/projects/doctype/project/project.py +153,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
 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 +327,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 +362,Finished Item {0} must be entered for Manufacture type entry,Färdiga artiklar {0} måste anges för Tillverkningstypen
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +367,Finished Item {0} must be entered for Manufacture type entry,Färdiga artiklar {0} måste anges för Tillverkningstypen
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Ingående redovisning Balans
 DocType: Sales Invoice Advance,Sales Invoice Advance,Försäljning Faktura Advance
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +499,Nothing to request,Ingenting att begära
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +500,Nothing to request,Ingenting att begära
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',&quot;Faktiskt startdatum&quot; inte kan vara större än &quot;Faktiskt slutdatum&quot;
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Management,Ledning
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},Antingen betal- eller kreditbeloppet krävs för {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,Ledning
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +55,Either debit or credit amount is required for {0},Antingen betal- eller kreditbeloppet krävs för {0}
 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 +161,Blue,Blå
+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
@@ -1058,12 +1072,12 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +23,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
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1374,Do you really want to submit the invoice?,Vill du verkligen vill skicka fakturan?
+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 +685,Cost Center For Item with Item Code ',"Kostnadcenter för artikel med artikelkod """
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1526,"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 +679,Cost Center For Item with Item Code ',"Kostnadcenter för artikel med artikelkod """
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1550,"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 +26,"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
@@ -1083,104 +1097,106 @@
 DocType: Payment Reconciliation,Unreconciled Payment Details,Sonade Betalningsinformation
 DocType: Global Defaults,Current Fiscal Year,Innevarande räkenskapsår
 DocType: Global Defaults,Disable Rounded Total,Inaktivera avrundat Totalbelopp
-DocType: Lead,Call,Ring
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +417,'Entries' cannot be empty,&#39;poster&#39; kan inte vara tomt
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +418,'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 +214,Fiscal Year {0} not found,Räkenskapsårets {0} hittades inte
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +221,Fiscal Year {0} not found,Räkenskapsårets {0} hittades inte
 apps/erpnext/erpnext/config/hr.py +238,Setting up Employees,Ställa in Anställda
 DocType: Sales Order,SO-,SÅ-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Välj prefix först
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Please select prefix first,Välj prefix först
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Research,Forskning
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,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 +43,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 +57,View Ledger,Se journal
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Tidigast
-apps/erpnext/erpnext/stock/doctype/item/item.py +504,"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 +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/setup/setup_wizard/setup_wizard.py +437,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
 ,Budget Variance Report,Budget Variationsrapport
 DocType: Salary Slip,Gross Pay,Bruttolön
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +90,Row {0}: Activity Type is mandatory.,Rad {0}: Aktivitetstyp är obligatorisk.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +114,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/public/js/controllers/stock_controller.js +40,Accounting Ledger,Redovisning Ledger
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,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
 DocType: BOM Item,Item Description,Produktbeskrivning
+DocType: Student Sibling,Student Sibling,Student Syskon
 DocType: Purchase Invoice,Is Recurring,Är återkommande
 DocType: Purchase Invoice,Supplied Items,Medföljande tillbehör
 DocType: Student,STUD.,HINGST.
 DocType: Production Order,Qty To Manufacture,Antal att tillverka
+DocType: Email Digest,New Income,ny inkomst
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Behåll samma takt hela inköpscykeln
 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 +131,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 +175,Valuation Rate required for Item in row {0},Värderings takt som krävs för punkt i rad {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,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
 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 +87, to ,till
+apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,till
 DocType: Item,Lead Time in days,Ledtid i dagar
 ,Accounts Payable Summary,Leverantörsreskontra Sammanfattning
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Not authorized to edit frozen Account {0},Ej tillåtet att redigera fryst konto {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,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 +62,Sales Order {0} is not valid,Kundorder {0} är inte giltig
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Kundorder {0} är inte giltig
 apps/erpnext/erpnext/setup/doctype/company/company.py +185,"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 +152,Small,Liten
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,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}
 ,Invoiced Amount (Exculsive Tax),Fakturerat belopp (Exklusive skatt)
-DocType: Student Applicant,Mother's / Guardian 1 Email ID,Mors / Guardian en e-ID
 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 +160,Green,Grön
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,Grön
 DocType: Supplier,SUPP-,leve-
 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 +57,Contract,Kontrakt
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,Kontrakt
 DocType: Email Digest,Add Quote,Lägg Citat
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +498,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 +503,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 +80,Row {0}: Qty is mandatory,Rad {0}: Antal är obligatoriskt
+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 +737,Sync Master Data,Sync basdata
+apps/erpnext/erpnext/accounts/page/pos/pos.js +719,Sync Master Data,Sync basdata
 apps/erpnext/erpnext/public/js/setup_wizard.js +283,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
+DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Detta är en rot varugrupp och kan inte ändras.
+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.
 DocType: Journal Entry Account,Purchase Order,Inköpsorder
 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 +345,"{0}: Employee email not found, hence email not sent","{0}: Anställd e-post hittades inte, därför e-post skickas inte"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +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
 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 +118,"For {0}, only credit accounts can be linked against another debit entry",För {0} kan endast kreditkonton länkas mot en annan debitering
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Delivery Note {0} is not submitted,Följesedel {0} är inte lämnad
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Delivery Note {0} is not submitted,Följesedel {0} är inte lämnad
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Sub-contracted Item,Produkt  {0} måste vara ett underleverantörs produkt
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Kapital Utrustning
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Prissättning regel baseras först på ""Lägg till på' fälten, som kan vara artikel, artikelgrupp eller Märke."
 DocType: Hub Settings,Seller Website,Säljare Webbplatsen
 DocType: Item,ITEM-,PUNKT-
-apps/erpnext/erpnext/controllers/selling_controller.py +147,Total allocated percentage for sales team should be 100,Totala fördelade procentsats för säljteam bör vara 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +110,Production Order status is {0},Produktionsorderstatus är {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Totala fördelade procentsats för säljteam bör vara 100
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Produktionsorderstatus är {0}
 DocType: Appraisal Goal,Goal,Mål
 DocType: Sales Invoice Item,Edit Description,Redigera Beskrivning
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +757,For Supplier,För Leverantör
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +723,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
@@ -1196,10 +1212,11 @@
 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
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-postutskick:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +445,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
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1667,Deafault warehouse is required for selected item,Deafault lager krävs för markerade objektet
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Deafault warehouse is required for selected item,Deafault lager krävs för markerade objektet
 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
@@ -1208,23 +1225,23 @@
 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 +110,Hardware,Hårdvara
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,Hårdvara
 DocType: Sales Order,Recurring Upto,Återkommande kommande~~POS=HEADCOMP Upp
 DocType: Attendance,HR Manager,HR-chef
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Välj ett företag
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Privilege Leave,Enskild ledighet
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,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 +79,You need to enable Shopping Cart,Du måste aktivera Varukorgen
 DocType: Payment Entry,Writeoff,nedskrivning
 DocType: Appraisal Template Goal,Appraisal Template Goal,Bedömning Mall Mål
-DocType: Salary Slip,Earning,Tjänar
+DocType: Salary Component,Earning,Tjänar
 DocType: Purchase Invoice,Party Account Currency,Party konto Valuta
 ,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 +171,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 +174,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_data.py +358,Food,Mat
+apps/erpnext/erpnext/demo/setup/setup_data.py +301,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/course_schedule/course_schedule.js +103,Mark Attendence,Mark Närvaro
@@ -1258,12 +1275,12 @@
 DocType: Sales Order Item,Planned Quantity,Planerad Kvantitet
 DocType: Purchase Invoice Item,Item Tax Amount,Produkt skattebeloppet
 DocType: Item,Maintain Stock,Behåll Lager
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +209,Stock Entries already created for Production Order ,Aktie Inlägg redan skapats för produktionsorder
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,Aktie Inlägg redan skapats för produktionsorder
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,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 +620,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 +238,Max: {0},Max: {0}
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +15,From Datetime,Från Daterad tid
+apps/erpnext/erpnext/controllers/accounts_controller.py +623,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 +239,Max: {0},Max: {0}
+apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Från Daterad tid
 DocType: Email Digest,For Company,För Företag
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Kommunikationslog.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +153,"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."
@@ -1271,8 +1288,8 @@
 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 +552,cannot be greater than 100,kan inte vara större än 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +680,Item {0} is not a stock Item,Produkt  {0} är inte en lagervara
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +546,cannot be greater than 100,kan inte vara större än 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,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
@@ -1286,10 +1303,9 @@
 DocType: GL Entry,GL Entry,GL Entry
 DocType: HR Settings,Employee Settings,Personal Inställningar
 ,Batch-Wise Balance History,Batchvis Balans Historik
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Att Göra Lista
 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 +61,Apprentice,Lärling
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +102,Negative Quantity is not allowed,Negativ Antal är inte tillåtet
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,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 +152,Employee cannot report to himself.,Anställd kan inte anmäla sig själv.
@@ -1310,15 +1326,14 @@
 DocType: Asset,Asset Name,tillgångs Namn
 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 +141,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 +719,Packing Slip,Följesedel
+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 +713,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/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,Begäran om offert kan finnas tillgång genom att klicka följande länk
 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 +81,Analyst,Analytiker
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,Analytiker
 DocType: Item,Inventory,Inventering
 DocType: Item,Sales Details,Försäljnings Detaljer
 DocType: Quality Inspection,QI-,QI-
@@ -1326,7 +1341,7 @@
 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 +103,Government,Regeringen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,Regeringen
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,Institute Namn
 apps/erpnext/erpnext/config/stock.py +289,Item Variants,Produkt Varianter
 DocType: Company,Services,Tjänster
@@ -1342,6 +1357,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,Financial Year Start Date,Budgetåret Startdatum
 DocType: POS Profile,Apply Discount,Applicera rabatt
 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
 DocType: Program Course,Program Course,program Kurs
@@ -1382,12 +1398,12 @@
 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
 DocType: Production Plan Sales Order,Production Plan Sales Order,Produktionsplan för kundorder
 DocType: Sales Partner,Sales Partner Target,Sales Partner Target
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +110,Accounting Entry for {0} can only be made in currency: {1},Kontering för {0} kan endast göras i valuta: {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Kontering för {0} kan endast göras i valuta: {1}
 DocType: Pricing Rule,Pricing Rule,Prissättning Regel
 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
 DocType: Shopping Cart Settings,Payment Success URL,Betalning Framgång URL
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +78,Row # {0}: Returned Item {1} does not exists in {2} {3},Rad # {0}: Returnerad artikel {1} existerar inte i {2} {3}
+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
@@ -1396,40 +1412,39 @@
 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/stock/doctype/stock_entry/stock_entry.py +339,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Ej tillåtet att flytta mer {0} än {1} mot beställning {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +344,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 +545,Manufacturing Quantity is mandatory,Tillverknings Kvantitet är obligatorisk
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,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 +71,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 +162,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/projects/doctype/timesheet/timesheet.py +186,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
 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 +130,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 +137,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
 DocType: Dependent Task,Dependent Task,Beroende Uppgift
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,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/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 +190,Leave of type {0} cannot be longer than {1},Ledighet av typen {0} inte kan vara längre än {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +197,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 +921,Search Item,Sök Produkt
+apps/erpnext/erpnext/accounts/page/pos/pos.js +910,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 +546,Already completed,redan avslutat
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +22,Payment Request already exists {0},Betalning förfrågan finns redan {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +550,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 +241,Quantity must not be more than {0},Antal får inte vara mer än {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Quantity must not be more than {0},Antal får inte vara mer än {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +76,Previous Financial Year is not closed,Föregående räkenskapsperiod inte stängd
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +44,Age (Days),Ålder (dagar)
 DocType: Quotation Item,Quotation Item,Offert Artikel
@@ -1446,7 +1461,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +221,Purchase Receipt {0} is not submitted,Inköpskvitto {0} är inte lämnat
 DocType: Company,Default Payable Account,Standard betalkonto
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Inställningar för webbutik som fraktregler, prislista mm"
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +83,{0}% Billed,{0}% Fakturerad
+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
@@ -1458,12 +1473,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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/schools/doctype/fees/fees.js +22,Collect,Samla
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Samla
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,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 +225,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
-DocType: Payment Reconciliation,Payments,Betalningar
 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
@@ -1475,7 +1489,7 @@
 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 +9,Procurement,Anskaffning
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,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/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
 ,Lead Details,Prospekt Detaljer
 DocType: Purchase Invoice,End date of current invoice's period,Slutdatum för aktuell faktura period
@@ -1500,7 +1514,7 @@
 DocType: Purchase Invoice,Additional Discount,Ytterligare rabatt
 DocType: Selling Settings,Selling Settings,Försälja Inställningar
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Online Auktioner
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +97,Please specify either Quantity or Valuation Rate or both,Ange antingen Kvantitet eller Värderingsomsättning eller båda
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,Ange antingen Kvantitet eller Värderingsomsättning eller båda
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +13,Fulfillment,Uppfyllelse
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Företag, månad och räkenskapsår är obligatorisk"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Marknadsföringskostnader
@@ -1521,14 +1535,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,ERPNext Setup Complete!
 DocType: Item,Weightage,Vikt
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +93,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"En kundgrupp finns med samma namn, ändra Kundens namn eller döp om kundgruppen"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +126,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
 DocType: Stock Entry,Material Receipt,Material Kvitto
 DocType: Homepage,Products,Produkter
 DocType: Announcement,Instructor,Instruktör
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},Partityp och Parti krävs för mottagare / Betalnings konto {0}
 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
@@ -1539,7 +1552,7 @@
 ,Item-wise Sales Register,Produktvis säljregister
 DocType: Asset,Gross Purchase Amount,Bruttoköpesumma
 DocType: Asset,Depreciation Method,avskrivnings Metod
-apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Offline,Off-line
+apps/erpnext/erpnext/accounts/page/pos/pos.js +686,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
@@ -1557,25 +1570,27 @@
 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
 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 +858,Make Purchase Order,Skapa beställning
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +852,Make Purchase Order,Skapa beställning
 DocType: SMS Center,Send To,Skicka Till
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,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 +148,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
 DocType: Stock Reconciliation,Stock Reconciliation,Lager Avstämning
 DocType: Territory,Territory Name,Territorium Namn
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +172,Work-in-Progress Warehouse is required before Submit,Pågående Arbete - Lager krävs innan du kan Skicka
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,Work-in-Progress Warehouse is required before Submit,Pågående Arbete - Lager krävs innan du kan Skicka
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Sökande av ett jobb.
 DocType: Purchase Order Item,Warehouse and Reference,Lager och referens
 DocType: Supplier,Statutory info and other general information about your Supplier,Lagstadgad information och annan allmän information om din leverantör
-apps/erpnext/erpnext/hooks.py +88,Addresses,Adresser
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Leverantör&gt; leverantör Type
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +212,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/hooks.py +95,Addresses,Adresser
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +215,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
 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
@@ -1583,11 +1598,10 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,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 +731,Payment,Betalning
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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: Pricing Rule,Brand,Märke
 DocType: Course,Course Abbreviation,Naturligtvis Förkortning
 DocType: Item,Will also apply for variants,Kommer också att ansöka om varianter
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +142,"Asset cannot be cancelled, as it is already {0}","Asset kan inte avbrytas, eftersom det redan är {0}"
@@ -1599,7 +1613,7 @@
 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."
 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 +85,Associate,Associate
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,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
@@ -1607,7 +1621,7 @@
 DocType: Production Planning Tool,Material Requests,material Framställningar
 DocType: Warranty Claim,Issue Date,Utgivningsdatum
 DocType: Activity Cost,Activity Cost,Aktivitetskostnad
-DocType: Timesheet Detail,Timesheet Detail,tidrapport Detalj
+DocType: Sales Invoice Timesheet,Timesheet Detail,tidrapport Detalj
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Förbrukad 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),Anger att paketet är en del av denna leverans (endast utkast)
@@ -1630,6 +1644,7 @@
 DocType: Production Plan Material Request,Material Request Date,Material Request Datum
 DocType: Purchase Order Item,Supplier Quotation Item,Leverantör offert Punkt
 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
 DocType: Monthly Distribution,Name of the Monthly Distribution,Namn på månadens distribution
 DocType: Sales Person,Parent Sales Person,Överordnad Försäljningsperson
@@ -1642,30 +1657,31 @@
 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 +44,"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/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.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +502,Error: {0} &gt; {1},Fel: {0}&gt; {1}
 DocType: Item,Is Sales Item,Är Försäljningsobjekt
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Produktgruppträdet
 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.
 DocType: Naming Series,Current Value,Nuvarande Värde
-apps/erpnext/erpnext/controllers/accounts_controller.py +235,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/controllers/accounts_controller.py +238,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
 DocType: Delivery Note Item,Against Sales Order,Mot kundorder
 ,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 +458,Item table can not be blank,Produkt tabellen kan inte vara tomt
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +443,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 +5,This is based on stock movement. See {0} for details,Detta är baserat på aktie rörelse. Se {0} för mer information
 DocType: Pricing Rule,Selling,Försäljnings
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +341,Amount {0} {1} deducted against {2},Belopp {0} {1} avräknas mot {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +344,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
@@ -1680,8 +1696,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +144,Cannot refer row number greater than or equal to current row number for this Charge type,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 +159,Red,Röd
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Klicka på ""Skapa schema"" för att hämta Löpnummer inlagt för artikel {0}"
+apps/erpnext/erpnext/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
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Basbelopp (Company valuta)
@@ -1689,7 +1705,7 @@
 DocType: Installation Note,Installation Time,Installationstid
 DocType: Sales Invoice,Accounting Details,Redovisning Detaljer
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,Ta bort alla transaktioner för detta företag
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +187,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Rad # {0}: Operation {1} är inte klar för {2} st av färdiga varor i produktionsorder # {3}. Uppdatera driftstatus via Tidsloggar
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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,Rad # {0}: Operation {1} är inte klar för {2} st av färdiga varor i produktionsorder # {3}. Uppdatera driftstatus via Tidsloggar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,Investeringarna
 DocType: Issue,Resolution Details,Åtgärds Detaljer
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,anslag
@@ -1725,16 +1741,17 @@
 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}
 DocType: Delivery Note,Excise Page Number,Punktnotering sidnummer
 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}
 ,Maintenance Schedules,Underhålls scheman
 DocType: Task,Actual End Date (via Time Sheet),Faktisk Slutdatum (via Tidrapportering)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Amount {0} {1} against {2} {3},Belopp {0} {1} mot {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +339,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 +138,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 +295,Debit To account must be a Receivable account,Debitering av konto måste vara ett mottagarkonto
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Receivable account,Debitering av konto måste vara ett mottagarkonto
 DocType: Shipping Rule Condition,Shipping Amount,Fraktbelopp
 ,Pending Amount,Väntande antal
 DocType: Purchase Invoice Item,Conversion Factor,Omvandlingsfaktor
@@ -1742,10 +1759,10 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +137,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 +90,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
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +93,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 +22,Enter Paid Amount,Ange utbetalda beloppet
+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
@@ -1755,13 +1772,15 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,tidrapporter
 DocType: HR Settings,HR Settings,HR Inställningar
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Expense Claim is pending approval. Only the Expense Approver can update status.,Räkning väntar på godkännande. Endast Utgiftsgodkännare kan uppdatera status.
+DocType: Email Digest,New Expenses,nya kostnader
 DocType: Purchase Invoice,Additional Discount Amount,Ytterligare rabatt Belopp
-apps/erpnext/erpnext/controllers/accounts_controller.py +524,"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."
+apps/erpnext/erpnext/controllers/accounts_controller.py +527,"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 +249,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/stock/get_item_details.py +123,Please specify Company,Ange Företag
 ,Customer Acquisition and Loyalty,Kundförvärv och Lojalitet
@@ -1772,17 +1791,19 @@
 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 +183,Closing (Opening + Totals),Stänger (Öppna + Totals)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),Stänger (Öppna + Totals)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Ange valuta i bolaget
 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/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å
-apps/erpnext/erpnext/controllers/accounts_controller.py +272,Account {0} is invalid. Account Currency must be {1},Konto {0} är ogiltig. Konto Valuta måste vara {1}
+DocType: Email Digest,Pending Sales Orders,I väntan på kundorder
+apps/erpnext/erpnext/controllers/accounts_controller.py +275,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 +956,"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 Slip,Deduction,Avdrag
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +87,Row {0}: From Time and To Time is mandatory.,Rad {0}: Från tid och till tid är obligatorisk.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +969,"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 +111,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 +262,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 +7,Please enter Employee Id of this sales person,Ange anställnings Id för denna säljare
@@ -1790,7 +1811,7 @@
 DocType: Project,% Tasks Completed,% Uppgifter Avslutade
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,Skillnad Belopp måste vara noll
 DocType: Project,Gross Margin,Bruttomarginal
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +194,Please enter Production Item first,Ange Produktionsartikel först
+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
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Offert
@@ -1799,53 +1820,54 @@
 DocType: Maintenance Visit,Maintenance User,Serviceanvändare
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +149,Cost Updated,Kostnad Uppdaterad
 DocType: Employee,Date of Birth,Födelsedatum
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +86,Item {0} has already been returned,Punkt {0} redan har returnerat
+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}
+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 +177,Job Description,Arbetsbeskrivning
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,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 +126,"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 +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Specialtecken utom &quot;-&quot; &quot;.&quot;, &quot;#&quot;, och &quot;/&quot; inte tillåtet att namnge serie"
 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."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +24,Welcome to POS: Create your POS Profile,Välkommen till POS: Skapa din POS Profil
 DocType: Expense Claim,Approver,Godkännare
 ,SO Qty,SO Antal
+DocType: Guardian,Work Address,arbete Adress
 DocType: Appraisal,Calculate Total Score,Beräkna Totalsumma
 DocType: Request for Quotation,Manufacturing Manager,Tillverkningsansvarig
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Löpnummer {0} är under garanti upp till {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +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 +74,Shipments,Transporter
+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
 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 +153,Row # ,Rad #
+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 +156,Get From,Hämta Från
+apps/erpnext/erpnext/public/js/utils.js +167,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 +167,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 +416,"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"
+apps/erpnext/erpnext/controllers/accounts_controller.py +419,"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
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} is disabled,Användare {0} är inaktiverad
 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 ...
 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 +171,"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 +346,{0} is mandatory for Item {1},{0} är obligatoriskt för punkt {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,{0} is mandatory for Item {1},{0} är obligatoriskt för punkt {1}
 DocType: Currency Exchange,From Currency,Från Valuta
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Välj tilldelade beloppet, Faktura Typ och fakturanumret i minst en rad"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,Kostnader för nya inköp
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},Kundorder krävs för punkt {0}
 DocType: Purchase Invoice Item,Rate (Company Currency),Andel (Företagsvaluta)
-apps/erpnext/erpnext/demo/setup_data.py +360,Others,Annat
+DocType: Student Guardian,Others,Annat
 DocType: Payment Entry,Unallocated Amount,oallokerad Mängd
 apps/erpnext/erpnext/templates/includes/product_page.js +65,Cannot find a matching Item. Please select some other value for {0}.,Det går inte att hitta en matchande objekt. Välj något annat värde för {0}.
 DocType: POS Profile,Taxes and Charges,Skatter och avgifter
@@ -1865,17 +1887,16 @@
 apps/erpnext/erpnext/config/stock.py +304,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/accounts/report/item_wise_sales_register/item_wise_sales_register.py +54,Receivable Account,Fordran Konto
-apps/erpnext/erpnext/controllers/accounts_controller.py +546,Row #{0}: Asset {1} is already {2},Rad # {0}: Asset {1} är redan {2}
+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 +549,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 +79,CEO,vd
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,vd
 DocType: Expense Claim Detail,Expense Claim Detail,Räkningen Detalj
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +808,Please select correct account,Välj rätt konto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +809,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
-DocType: Purchase Invoice Item,Page Break,Sidbrytning
 DocType: Production Order Operation,Pending,Väntar
 DocType: Course,Course Name,KURSNAMN
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Användare som kan godkänna en specifik arbetstagarens ledighet applikationer
@@ -1884,14 +1905,15 @@
 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 +54,Full-time,Heltid
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Full-time,Heltid
 DocType: Salary Structure,Employees,Anställda
 DocType: Employee,Contact Details,Kontaktuppgifter
 DocType: C-Form,Received Date,Mottaget Datum
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Om du har skapat en standardmall i skatter och avgifter Mall, välj en och klicka på knappen nedan."
+DocType: Student,Guardians,Guardians
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +29,Please specify a country for this Shipping Rule or check Worldwide Shipping,Ange ett land för frakt regel eller kontrollera Världsomspännande sändnings
 DocType: Stock Entry,Total Incoming Value,Totalt Inkommande Värde
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Debit To is required,Debitering krävs
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +321,Debit To is required,Debitering krävs
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Inköps Prislista
 DocType: Offer Letter Term,Offer Term,Erbjudandet Villkor
 DocType: Quality Inspection,Quality Manager,Kvalitetsansvarig
@@ -1899,6 +1921,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/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
@@ -1909,18 +1932,17 @@
 DocType: Production Order Operation,Completed Qty,Avslutat Antal
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"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 +273,Price List {0} is disabled,Prislista {0} är inaktiverad
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +99,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/projects/doctype/timesheet/timesheet.py +123,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
 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}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Nuvarande värderingensomsättning
 DocType: Item,Customer Item Codes,Kund artikelnummer
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,Exchange vinst / förlust
 DocType: Opportunity,Lost Reason,Förlorad Anledning
-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/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/purchase_receipt/purchase_receipt.py +378,All items have already been invoiced,Alla objekt har redan fakturerats
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +379,All items have already been invoiced,Alla objekt har redan fakturerats
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Ange ett giltigt Från ärende nr &quot;
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,Ytterligare kostnadsställen kan göras i grupperna men poster kan göras mot icke-grupper
 DocType: Project,External,Extern
@@ -1936,18 +1958,19 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Dina kunder
 apps/erpnext/erpnext/projects/doctype/project/project.py +141,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/job_opening.html +19,Apply Now,Ansök nu
+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."
 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
-apps/erpnext/erpnext/utilities/doctype/address/address.py +164,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: Fee Structure,Fee Structure,avgift struktur
 DocType: Timesheet Detail,Costing Amount,Kalkyl Mängd
+DocType: Student Admission,Application Fee,Anmälningsavgift
 DocType: Process Payroll,Submit Salary Slip,Skicka lönebeskedet
-apps/erpnext/erpnext/controllers/selling_controller.py +161,Maxiumm discount for Item {0} is {1}%,Maximum rabatt för punkt {0} är {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,Maximum rabatt för punkt {0} är {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Import av Bulk
 DocType: Sales Partner,Address & Contacts,Adress och kontakter
 DocType: SMS Log,Sender Name,Avsändarnamn
@@ -1972,21 +1995,21 @@
 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_data.py +361,Travel,Resa
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +155,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 +304,Travel,Resa
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +167,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 +23,Update Cost,Uppdatera Kostnad
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Uppdatera Kostnad
 DocType: Item Reorder,Item Reorder,Produkt Ändra ordning
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +36,Show Salary Slip,Visa lönebesked
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +748,Transfer Material,Transfermaterial
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +53,Show Salary Slip,Visa lönebesked
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +166,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 +923,Please set recurring after saving,Ställ återkommande efter att ha sparat
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +646,Select change amount account,Välj förändringsbelopp konto
+apps/erpnext/erpnext/public/js/controllers/transaction.js +914,Please set recurring after saving,Ställ återkommande efter att ha sparat
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +703,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
@@ -1998,31 +2021,32 @@
 DocType: Quality Inspection,Verified By,Verifierad Av
 DocType: Address,Subsidiary,Dotterbolag
 apps/erpnext/erpnext/setup/doctype/company/company.py +64,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","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: Quality Inspection,Purchase Receipt No,Inköpskvitto Nr
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Handpenning
 DocType: Process Payroll,Create Salary Slip,Skapa lönebeskedet
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +33,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 +352,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Kvantitet i rad {0} ({1}) måste vara samma som tillverkad mängd {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Kvantitet i rad {0} ({1}) måste vara samma som tillverkad mängd {2}
 DocType: Appraisal,Employee,Anställd
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Bjud in som Användare
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} är fullt fakturerad
 DocType: Workstation Working Hour,End Time,Sluttid
 DocType: Payment Entry,Payment Deductions or Loss,Betalnings Avdrag eller förlust
-apps/erpnext/erpnext/config/schools.py +100,LMS,LMS
+apps/erpnext/erpnext/config/schools.py +104,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/config/crm.py +6,Sales Pipeline,Sales Pipeline
 DocType: Student Batch Student,Student Batch Student,Student Batch elev
-DocType: Sales Invoice,Mass Mailing,Massutskick
+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 +199,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/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 +297,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 +111,Pharmaceutical,Farmaceutiska
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +309,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/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
@@ -2037,27 +2061,28 @@
 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 +814,Please specify Company to proceed,Ange vilket bolag för att fortsätta
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +793,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 +44,Compensatory Off,Kompensations Av
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,Kompensations Av
 DocType: Quality Inspection Reading,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.
 DocType: Room,Room Number,Rumsnummer
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Ogiltig referens {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +161,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) kan inte vara större än planerad kvantitet ({2}) i produktionsorder {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +162,{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 +217,Raw Materials cannot be blank.,Råvaror kan inte vara tomt.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,"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 +460,Quick Journal Entry,Quick Journal Entry
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +111,You can not change rate if BOM mentioned agianst any item,Du kan inte ändra kurs om BOM nämnts mot någon artikel
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +441,"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 +450,Quick Journal Entry,Quick Journal Entry
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +103,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 +214,{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
 ,Minutes to First Response for Issues,Minuter till First Response för frågor
 DocType: Purchase Invoice,Terms and Conditions1,Villkor och Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,Namnet på institutet som du installerar systemet.
@@ -2066,16 +2091,17 @@
 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 +398,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 +739,Item or Warehouse for row {0} does not match Material Request,Produkt eller Lager för rad {0} matchar inte Materialförfrågan
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +747,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
 DocType: Fiscal Year,Year End Date,År Slutdatum
 DocType: Task Depends On,Task Depends On,Uppgift Beror på
-DocType: Lead,Opportunity,Möjlighet
+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
@@ -2088,7 +2114,7 @@
 DocType: Student,Joining Date,Inträdesdatum
 ,Employees working on a holiday,Anställda som arbetar på en semester
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Mark Närvarande
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},Underhåll startdatum kan inte vara före leveransdatum för Löpnummer {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},Underhåll startdatum kan inte vara före leveransdatum för Löpnummer {0}
 DocType: Production Order,Actual End Date,Faktiskt Slutdatum
 DocType: Purchase Invoice,PINV-,PINV-
 DocType: Authorization Rule,Applicable To (Role),Är tillämpligt för (Roll)
@@ -2103,7 +2129,7 @@
 DocType: SMS Log,No of Requested SMS,Antal Begärd SMS
 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 +729,Please supply the specified items at the best possible rates,Ange de specificerade poster till bästa möjliga pris
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +695,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 +117,Contract End Date must be greater than Date of Joining,Kontraktets Slutdatum måste vara större än Datum för inträde
 DocType: Delivery Note,DN-,DN
@@ -2112,7 +2138,7 @@
 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 +14,This is an example website auto-generated from ERPNext,Detta är ett exempel webbplats automatiskt genererade från ERPNext
+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
 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.
 
@@ -2139,13 +2165,14 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd Kvantitet
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +54,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 +103,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 +504,Stock Entry {0} is not submitted,Stock Entry {0} är inte lämnat
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Det går inte att producera mer artiklar {0} än kundorderns mängd {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +505,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: Salary Component Account,Salary Component Account,Lönedel konto
 DocType: Global Defaults,Hide Currency Symbol,Dölj Valutasymbol
 apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card","t.ex. bank, kontanter, kreditkort"
+DocType: Lead Source,Source Name,käll~~POS=TRUNC
 DocType: Journal Entry,Credit Note,Kreditnota
 DocType: Warranty Claim,Service Address,Serviceadress
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furnitures and Fixtures,Möbler och inventarier
@@ -2157,6 +2184,7 @@
 DocType: Opportunity,Customer / Lead Name,Kund / Huvudnamn
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +89,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/controllers/trends.py +19,Total(Qty),Totalt (Antal)
 DocType: Sales Invoice,This Document,Det här dokumentet
@@ -2168,15 +2196,15 @@
 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 +176,Organization branch master.,Organisation gren ledare.
-apps/erpnext/erpnext/controllers/accounts_controller.py +273, or ,eller
+apps/erpnext/erpnext/controllers/accounts_controller.py +276, or ,eller
 DocType: Sales Order,Billing Status,Faktureringsstatus
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Rapportera ett problem
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,Utility Kostnader
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-Ovan
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +203,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Rad # {0}: Journal Entry {1} har inte hänsyn {2} eller redan matchas mot en annan kupong
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +206,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 +90,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 +93,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
@@ -2204,8 +2232,8 @@
 DocType: Product Bundle,Parent Item,Överordnad produkt
 DocType: Account,Account Type,Användartyp
 DocType: Delivery Note,DN-RET-,DN-retro
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +115,Leave Type {0} cannot be carry-forwarded,Lämna typ {0} kan inte bära vidarebefordrade
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Underhållsschema genereras inte för alla objekt. Klicka på ""Generera Schema '"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +118,Leave Type {0} cannot be carry-forwarded,Lämna typ {0} kan inte bära vidarebefordrade
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Underhållsschema genereras inte för alla objekt. Klicka på ""Generera Schema '"
 ,To Produce,Att Producera
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Löner
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +163,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","För rad {0} i {1}. Om du vill inkludera {2} i punkt hastighet, rader {3} måste också inkluderas"
@@ -2217,13 +2245,13 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +32,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 +748,Delivery,Leverans
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +742,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
 DocType: Payment Entry,Total Allocated Amount,Sammanlagda anslaget
 DocType: Item Reorder,Material Request Type,Typ av Materialbegäran
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +82,Row {0}: UOM Conversion Factor is mandatory,Rad {0}: UOM Omvandlingsfaktor är obligatorisk
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +79,Row {0}: UOM Conversion Factor is mandatory,Rad {0}: UOM Omvandlingsfaktor är obligatorisk
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Budget,Cost Center,Kostnadscenter
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Rabatt #
@@ -2234,13 +2262,13 @@
 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 +90,Head of Marketing and Sales,Chef för Marknad och Försäljning
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Inkomstskatt
+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 +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.
 DocType: Item Supplier,Item Supplier,Produkt Leverantör
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +403,Please enter Item Code to get batch no,Ange Artikelkod att få batchnr
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +770,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 +397,Please enter Item Code to get batch no,Ange Artikelkod att få batchnr
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +764,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"
@@ -2252,28 +2280,29 @@
 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 +100,Issues,Frågor
+apps/erpnext/erpnext/hooks.py +109,Issues,Frågor
 apps/erpnext/erpnext/controllers/status_updater.py +13,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
 DocType: Supplier,Billing Currency,Faktureringsvaluta
 DocType: Sales Invoice,SINV-RET-,SINV-retro
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Large,Extra Stor
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,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 +507,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 +107,Local,Lokal
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +508,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/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 +154,Large,Stor
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,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 +225,Total {0} ({1}),Totalt {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +224,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
@@ -2319,9 +2348,9 @@
 DocType: Attendance,Leave Type,Ledighetstyp
 apps/erpnext/erpnext/controllers/stock_controller.py +173,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/hr/doctype/salary_slip/salary_slip.py +79,Name error: {0},Namn fel: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +90,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 +178,{0} {1} does not associated with {2} {3},{0} {1} inte förknippas med {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +181,{0} {1} does not associated with {2} {3},{0} {1} inte förknippas med {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Närvaro för anställd {0} är redan märkt
 DocType: Packing Slip,If more than one package of the same type (for print),Om mer än ett paket av samma typ (för utskrift)
 DocType: Warehouse,Parent Warehouse,moderLager
@@ -2340,7 +2369,7 @@
 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
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,Minst ett objekt ska anges med negativt kvantitet i returdokument
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Atleast one item should be entered with negative quantity in return document,Minst ett objekt ska anges med negativt kvantitet i returdokument
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operation {0} längre än alla tillgängliga arbetstiden i arbetsstation {1}, bryta ner verksamheten i flera operationer"
 ,Requested,Begärd
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +83,No Remarks,Anmärkningar
@@ -2352,46 +2381,46 @@
 DocType: Item,Total Projected Qty,Totala projicerade Antal
 DocType: Monthly Distribution,Distribution Name,Distributions Namn
 DocType: Course,Course Code,Kurskod
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Quality Inspection required for Item {0},Kvalitetskontroll krävs för punkt {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,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
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Hantera Områden.
 DocType: Journal Entry Account,Sales Invoice,Försäljning Faktura
 DocType: Journal Entry Account,Party Balance,Parti Balans
-apps/erpnext/erpnext/accounts/page/pos/pos.js +475,Please select Apply Discount On,Välj Verkställ rabatt på
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +92,Salary Slip Created,Lön Slip Skapad
+apps/erpnext/erpnext/accounts/page/pos/pos.js +464,Please select Apply Discount On,Välj Verkställ rabatt på
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +95,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
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,Rabatt Procent kan appliceras antingen mot en prislista eller för alla prislistor.
 DocType: Purchase Invoice,Half-yearly,Halvårs
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +384,Accounting Entry for Stock,Kontering för lager
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +387,Accounting Entry for Stock,Kontering för lager
 DocType: Sales Invoice,Sales Team1,Försäljnings Team1
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,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 +96,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 +120,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 +88,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/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
 DocType: Item Group,Show this slideshow at the top of the page,Visa denna bildspel längst upp på sidan
 DocType: BOM,Item UOM,Produkt UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Skattebelopp efter rabatt Belopp (Company valuta)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +147,Target warehouse is mandatory for row {0},Target lager är obligatoriskt för rad {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +141,Target warehouse is mandatory for row {0},Target lager är obligatoriskt för rad {0}
 DocType: Cheque Print Template,Primary Settings,primära inställningar
 DocType: Purchase Invoice,Select Supplier Address,Välj Leverantör Adress
 DocType: Quality Inspection,Quality Inspection,Kvalitetskontroll
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Extra Small,Extra Liten
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +194,Account {0} is frozen,Kontot {0} är fruset
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Extra Liten
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +690,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 +197,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 +606,Can only make payment against unbilled {0},Kan bara göra betalning mot ofakturerade {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +126,Commission rate cannot be greater than 100,Provisionshastighet kan inte vara större än 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +609,Can only make payment against unbilled {0},Kan bara göra betalning mot ofakturerade {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,Provisionshastighet kan inte vara större än 100
 DocType: Stock Entry,Subcontract,Subkontrakt
 apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,Ange {0} först
 DocType: Production Order Operation,Actual End Time,Faktiskt Sluttid
@@ -2402,30 +2431,30 @@
 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 +158,Colour,Färg
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,Färg
 DocType: Maintenance Visit,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"
 DocType: Student Log,Academic,Akademisk
-apps/erpnext/erpnext/controllers/accounts_controller.py +469,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Totalt förskott ({0}) mot Order {1} kan inte vara större än totalsumman ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +472,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Totalt förskott ({0}) mot Order {1} kan inte vara större än totalsumman ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Välj Månads Distribution till ojämnt fördela målen mellan månader.
 DocType: Purchase Invoice Item,Valuation Rate,Värderings betyg
+DocType: Stock Reconciliation,SR/,SR /
 apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,Prislista Valuta inte valt
 DocType: Assessment,Results,Resultat
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +168,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 +175,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
-DocType: Student Applicant,Father's/ Guardian 2 Email ID,Faderns / Guardian 2 Email ID
 DocType: Maintenance Visit Purpose,Against Document No,Mot Dokument nr
 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 +228,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 +231,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 +93,Researcher,Forskare
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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.
@@ -2437,25 +2466,25 @@
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","För att underlätta för kunderna, kan dessa koder användas i utskriftsformat som fakturor och följesedlar"
 DocType: Sales Invoice,Time Sheet List,Tidrapportering Lista
 DocType: Employee,You can enter any date manually,Du kan ange något datum manuellt
-DocType: Sales Invoice,Advertisement,Annons
 DocType: Asset Category Account,Depreciation Expense Account,Avskrivningar konto
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Probationary Period,Provanställning
-apps/erpnext/erpnext/hooks.py +102,Announcements,Meddelanden
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Provanställning
+apps/erpnext/erpnext/hooks.py +111,Announcements,Meddelanden
 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 +109,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 +16,To Datetime,Till Datetime
+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/scheduling_tool/scheduling_tool.py +51,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/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Väntande Verksamhet
+DocType: Accounts Settings,Make Payment via Journal Entry,Gör betalning via Journal Entry
+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 +127,Please enter relieving date.,Ange avlösningsdatum.
-apps/erpnext/erpnext/controllers/trends.py +145,Amt,Ant
+apps/erpnext/erpnext/controllers/trends.py +149,Amt,Ant
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,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 +26,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
@@ -2473,14 +2502,15 @@
 apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1},Det går inte att hitta växelkursen för {0} till {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Mark Halvdag
 DocType: Sales Invoice,Sales Team,Sales Team
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Duplicate entry,Duplicera post
+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 +490,[Error],[Fel]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +484,[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
 apps/erpnext/erpnext/controllers/status_updater.py +175,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.
 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
@@ -2496,22 +2526,22 @@
 ,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 +25,All Jobs,alla jobb
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,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
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Amount {0} {1} {2} {3},Mängden {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Amount {0} {1} {2} {3},Mängden {0} {1} {2} {3}
 DocType: Account,Depreciation,Avskrivningar
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Leverantör (s)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Anställd närvaro Tool
 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 +372,Payment Entries {0} are un-linked,Betalnings Inlägg {0} är un bundna
+apps/erpnext/erpnext/accounts/utils.py +449,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
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +497,Material Requests {0} created,Material Begäran {0} skapades
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +498,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.
 DocType: Purchase Invoice,Address and Contact,Adress och Kontakt
@@ -2550,7 +2580,7 @@
 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 +848,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 +859,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 +233,Closing (Dr),Closing (Dr)
 DocType: Cheque Print Template,Cheque Size,Check Storlek
@@ -2571,7 +2601,8 @@
 ,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.
-apps/erpnext/erpnext/controllers/accounts_controller.py +555,'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: Student Guardian,Father,Far
+apps/erpnext/erpnext/controllers/accounts_controller.py +558,'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/buying/doctype/purchase_order/purchase_order.py +132,Material Request {0} is cancelled or stopped,Material Begäran {0} avbryts eller stoppas
@@ -2581,15 +2612,15 @@
 DocType: Sales Order,Fully Delivered,Fullt Levererad
 DocType: Lead,Lower Income,Lägre intäkter
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","Kontot huvudet under ansvar, där Vinst / Förlust bokas"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +166,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 +238,"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 +81,Purchase Order number required for Item {0},Inköpsordernr som krävs för punkt {0}
+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/purchase_receipt/purchase_receipt.py +82,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 +17,Cannot change status as student {0} is linked with student application {1},Det går inte att ändra status som studerande {0} är kopplad med student ansökan {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Det går inte att ändra status som studerande {0} är kopplad med student ansökan {1}
 DocType: Timesheet,"List of employee which has ""Salary Slip Based on Timesheet"" is enabled in salary structure.",Lista över anställd som har &quot;lönebeskedet Baserat på tidrapport&quot; är aktiverat i lönestrukturen.
 DocType: Asset,Fully Depreciated,helt avskriven
 ,Stock Projected Qty,Lager Projicerad Antal
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Customer {0} does not belong to project {1},Kund {0} tillhör inte projektet {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,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
@@ -2601,7 +2632,7 @@
 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/patches/v7_0/create_warehouse_nestedset.py +55,All Warehouses,alla Lager
+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 +105,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
@@ -2613,10 +2644,10 @@
 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/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Skapa lönebeskedet
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +26,Browse BOM,Bläddra BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,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/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 Year,Academic Year,Akademiskt år
+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
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,Värdering
@@ -2624,12 +2655,12 @@
 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 +197,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 +204,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: Workstation Working Hour,Start Time,Starttid
 DocType: Item Price,Bulk Import Help,Bulk Import Hjälp
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +256,Select Quantity,Välj antal
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +257,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
@@ -2646,6 +2677,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Antingen mål antal eller målbeloppet är obligatorisk.
 apps/erpnext/erpnext/config/projects.py +45,Cost of various activities,Kostnader för olika aktiviteter
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Inställning Händelser till {0}, eftersom personal bifogas nedan försäljare inte har en användar-ID {1}"
+DocType: Timesheet,Billing Details,Faktureringsuppgifter
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +149,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}
 DocType: Item,Inspection Required,Inspektion krävs
@@ -2665,7 +2697,7 @@
 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 +138,Wire Transfer,Elektronisk Överföring
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,Elektronisk Överföring
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Kontrollera alla
 DocType: Sales Order,Recurring Order,Återkommande Order
 DocType: Company,Default Income Account,Standard Inkomstkonto
@@ -2677,21 +2709,19 @@
 ,Welcome to ERPNext,Välkommen till oss
 apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,Prospekt till offert
 DocType: Lead,From Customer,Från Kunden
-apps/erpnext/erpnext/demo/setup_data.py +357,Calls,Samtal
+apps/erpnext/erpnext/demo/setup/setup_data.py +300,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/stock/doctype/item/item.py +466,"As there are existing transactions for this item, \
-							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Eftersom det redan finns transaktioner för denna post, \ du inte kan ändra värdena för &quot;Har Serienummer&quot;, &quot;Har Batch Nej&quot;, &quot;Är lagervara&quot; och &quot;Värderingsmetod&quot;"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,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/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 +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Obs: Systemet kommer inte att kontrollera över leverans och överbokning till punkt {0} då kvantitet eller belopp är 0
 DocType: Notification Control,Quotation Message,Offert Meddelande
 DocType: Issue,Opening Date,Öppningsdatum
-apps/erpnext/erpnext/schools/api.py +58,Attendance has been marked successfully.,Närvaro har markerats med framgång.
+apps/erpnext/erpnext/schools/api.py +57,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 +136,Account Type for {0} must be {1},Kontotyp för {0} måste vara {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +139,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
@@ -2706,12 +2736,13 @@
 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/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 +20,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 +1190,Please select customer,Välj kund
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1193,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
@@ -2721,6 +2752,7 @@
 ,Payment Period Based On Invoice Date,Betalningstiden Baserad på Fakturadatum
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Saknas valutakurser för {0}
 DocType: Assessment,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-
@@ -2738,11 +2770,12 @@
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,ämnet Namn
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Minst en av de sålda eller köpta måste väljas
+DocType: Grading Structure,Grade Intervals,grade Intervaller
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Välj typ av ditt företag.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Där tillverkningsprocesser genomförs.
 DocType: Asset Movement,Source Warehouse,Källa Lager
 DocType: Installation Note,Installation Date,Installations Datum
-apps/erpnext/erpnext/controllers/accounts_controller.py +534,Row #{0}: Asset {1} does not belong to company {2},Rad # {0}: Asset {1} tillhör inte företag {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +537,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
@@ -2756,28 +2789,31 @@
 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 +111,Date Of Retirement must be greater than Date of Joining,Datum för pensionering måste vara större än Datum för att delta
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +49,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 +87,{0}% Delivered,{0}% Levererad
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% Levererad
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Produkt  {0}: Beställd st {1} kan inte vara mindre än minimiorder st {2} (definierat i punkt).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Månadsdistributions Procent
 DocType: Territory,Territory Targets,Territorium Mål
 DocType: Delivery Note,Transporter Info,Transporter info
-apps/erpnext/erpnext/accounts/utils.py +379,Please set default {0} in Company {1},Ställ in default {0} i bolaget {1}
+apps/erpnext/erpnext/accounts/utils.py +456,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
 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.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Titlar för utskriftsmallar t.ex. Proforma faktura.
+DocType: Student Guardian,Student Guardian,Student Guardian
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +184,Valuation type charges can not marked as Inclusive,Värderingsavgifter kan inte markerats som inklusive
 DocType: POS Profile,Update Stock,Uppdatera lager
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Olika UOM för produkter kommer att leda till felaktiga (Total) Nettovikts värden. Se till att Nettovikt för varje post är i samma UOM.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM betyg
 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 +349,Journal Entries {0} are un-linked,Journalanteckningar {0} är ej länkade
+apps/erpnext/erpnext/accounts/utils.py +426,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
@@ -2801,6 +2837,7 @@
 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
+DocType: Homepage,"URL for ""All Products""",URL för &quot;Alla produkter&quot;
 DocType: Leave Application,Leave Balance Before Application,Ledighets balans innan Ansökan
 DocType: SMS Center,Send SMS,Skicka SMS
 DocType: Cheque Print Template,Width of amount in word,Bredd av beloppet i ord
@@ -2809,7 +2846,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 +29,Current Job Openings,Nuvarande jobb Öppningar
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,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
@@ -2822,7 +2859,7 @@
 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 +850,Show tax break-up,Visa skatte uppbrott
+apps/erpnext/erpnext/public/js/controllers/transaction.js +841,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/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"
@@ -2832,10 +2869,11 @@
 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 +534,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 +80,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 +162,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/selling/doctype/customer/customer.py +195,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 +5,This is based on the attendance of this Student,Detta grundar sig på närvaron av denna Student
@@ -2844,12 +2882,11 @@
 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 +75,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 +138,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/hr/doctype/leave_application/leave_application.py +145,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: Program Enrollment Fee,Program Enrollment Fee,Program inskrivningsavgift
 DocType: Item,Supplier Items,Leverantör artiklar
 DocType: Opportunity,Opportunity Type,Möjlighet Typ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,Nytt företag
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,Cost Center is required for 'Profit and Loss' account {0},Kostnadsställe krävs för &quot;Resultaträkning&quot; konto {0}
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Transaktioner kan bara tas bort av skaparen av bolaget
 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.,Felaktigt antal Huvudböcker funna. Du kan ha valt fel konto i transaktionen.
 DocType: Cheque Print Template,Cheque Width,Check Bredd
@@ -2858,16 +2895,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,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 +228,{0} '{1}' is disabled,{0} {1} &quot;är inaktiverad
+apps/erpnext/erpnext/controllers/accounts_controller.py +231,{0} '{1}' is disabled,{0} {1} &quot;är inaktiverad
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Ange som Open
 DocType: Cheque Print Template,Scanned Cheque,skannad Check
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Skicka automatiska meddelanden till kontakter på Skickar transaktioner.
+DocType: Timesheet,Total Billable Amount,Totala Fakturerbar Mängd
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Produkt 3
 DocType: Purchase Order,Customer Contact Email,Kundkontakt Email
 DocType: Warranty Claim,Item and Warranty Details,Punkt och garantiinformation
 DocType: Sales Team,Contribution (%),Bidrag (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Obs: Betalningpost kommer inte skapas eftersom ""Kontanter eller bankkonto"" angavs inte"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Responsibilities,Ansvarsområden
+apps/erpnext/erpnext/controllers/accounts_controller.py +78,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
 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
@@ -2875,6 +2913,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Lägg till användare
 DocType: Pricing Rule,Item Group,Produkt Grupp
 DocType: Item,Safety Stock,Säkerhetslager
+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: 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)
@@ -2884,7 +2923,6 @@
 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: Timesheet,Total Hours,Totalt antal timmar
 DocType: Journal Entry,Printing Settings,Utskriftsinställningar
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,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
@@ -2897,13 +2935,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investment Banking
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +71,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
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Kund&gt; Customer Group&gt; Territory
 DocType: Purchase Invoice Item,Rate,Betygsätt
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Intern,Intern
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,Intern
 DocType: Stock Entry,From BOM,Från BOM
 DocType: Assessment,Assessment Code,bedömning kod
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +32,Basic,Grundläggande
+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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Klicka på ""Skapa schema '"
+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 +95,Reference No is mandatory if you entered Reference Date,Referensnummer är obligatoriskt om du har angett referens Datum
@@ -2912,11 +2951,11 @@
 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 +752,Issue Material,Problem Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +723,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 +683,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 +665,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.
 DocType: Hub Settings,Access Token,Tillträde token
 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
@@ -2924,33 +2963,35 @@
 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 +1122,Enter value must be positive,Ange värde måste vara positiv
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,All Territories,Alla territorierna
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1125,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
 DocType: Purchase Invoice,Items,Produkter
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +23,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 +221,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 +233,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 +96,Request for Quotations,Begäran om Citat
+apps/erpnext/erpnext/hooks.py +104,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
 DocType: Asset,Partially Depreciated,delvis avskrivna
 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 +628,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standard mätenhet för Variant &quot;{0}&quot; måste vara samma som i Mall &quot;{1}&quot;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standard mätenhet för Variant &quot;{0}&quot; måste vara samma som i Mall &quot;{1}&quot;
 DocType: Shipping Rule,Calculate Based On,Beräkna baserad på
 DocType: Delivery Note Item,From Warehouse,Från Warehouse
 DocType: Assessment,Supervisor Name,Supervisor Namn
+DocType: Assessment,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
 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 +27,Default Address Template cannot be deleted,Standard Adress mall kan inte tas bort
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,Standard Adress mall kan inte tas bort
 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
@@ -2965,8 +3006,8 @@
 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/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 +485,No default BOM exists for Item {0},Ingen standard BOM finns till punkt {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +336,Please select Posting Date first,Välj Publiceringsdatum först
+apps/erpnext/erpnext/stock/get_item_details.py +486,No default BOM exists for Item {0},Ingen standard BOM finns till punkt {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +326,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
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Kostnadsställe med befintliga transaktioner kan inte omvandlas till liggaren
@@ -2982,6 +3023,7 @@
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Match Betalningar med fakturor
 DocType: Journal Entry,Bank Entry,Bank anteckning
 DocType: Authorization Rule,Applicable To (Designation),Är tillämpligt för (Destination)
+,Profitability Analysis,lönsamhets~~POS=TRUNC
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,Lägg till i kundvagn
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Gruppera efter
 DocType: Guardian,Interests,Intressen
@@ -2994,21 +3036,21 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,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 +141,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Serie Punkt {0} kan inte uppdateras \ använder Stock Avstämning
 DocType: Scheduling Tool,Day,Dag
 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 +122,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 +129,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
-DocType: Student Applicant,AP.,AP.
 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 +639,Point of Sale,Butiksförsäljning
+apps/erpnext/erpnext/accounts/page/pos/pos.js +634,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
 DocType: Production Planning Tool,Production Planning Tool,Produktionsplaneringsverktyg
@@ -3017,74 +3059,77 @@
 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 +373,Quantity to Manufacture must be greater than 0.,Kvantitet som Tillverkning måste vara större än 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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 Profile,Customer Group,Kundgrupp
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,Expense account is mandatory for item {0},Utgiftskonto är obligatorisk för produkten {0}
 DocType: Item,Website Description,Webbplats Beskrivning
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date must be on or after today,Nästa Avskrivningar Datum måste vara på eller efter dag
 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 +145,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: Quotation,Quotation Lost Reason,Anledning förlorad Offert
+apps/erpnext/erpnext/utilities/doctype/address/address.py +164,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.
 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 +330,Transaction reference no {0} dated {1},Transaktions referensnummer {0} daterad {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,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 +107,Summary for this month and pending activities,Sammanfattning för denna månad och pågående aktiviteter
+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/accounts/doctype/sales_invoice/sales_invoice.py +406,Please remove this Invoice {0} from C-Form {1},Ta bort denna faktura {0} från C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,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 +644,Get Items,Hämta artiklar
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +623,Get Items,Hämta artiklar
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +210,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 +41,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
 DocType: Payment Request,Initiated,Initierad
 DocType: Production Order,Planned Start Date,Planerat startdatum
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,Customer is required against Receivable account {0},Kunden är skyldig mot Fordran konto {0}
 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 +265,Project-wise data is not available for Quotation,Projektvis uppgifter finns inte tillgängligt för Offert
+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 +101,Commercial,Kommersiell
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,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/purchase_invoice/purchase_invoice.py +648,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/accounts/doctype/purchase_invoice/purchase_invoice.py +651,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 +30,Series is mandatory,Serien är obligatorisk
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +50,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
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +165,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 +155,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Cr,Cr
 DocType: Tax Rule,Billing State,Faktureringsstaten
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +250,Transfer,Överföring
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +187,{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 +825,Fetch exploded BOM (including sub-assemblies),Fetch expanderande BOM (inklusive underenheter)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +254,Transfer,Överföring
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +190,{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 +796,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 +115,Due Date is mandatory,Förfallodatum är obligatorisk
+apps/erpnext/erpnext/controllers/accounts_controller.py +118,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
 DocType: Journal Entry,Pay To / Recd From,Betala Till / RECD Från
 DocType: Naming Series,Setup Series,Inställnings Serie
 DocType: Payment Reconciliation,To Invoice Date,Att fakturadatum
 DocType: Supplier,Contact HTML,Kontakta HTML
 ,Inactive Customers,inaktiva kunder
+DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Kvitton
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Hur prissättning tillämpas?
 DocType: Quality Inspection,Delivery Note No,Följesedel nr
@@ -3093,7 +3138,7 @@
 DocType: Company,Retail,Detaljhandeln
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +120,Customer {0} does not exist,Kund {0} existerar inte
 DocType: Attendance,Absent,Frånvarande
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +587,Product Bundle,Produktpaket
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Product Bundle,Produktpaket
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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
@@ -3103,8 +3148,8 @@
 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 +742,Send Supplier Emails,Skicka e-post Leverantörs
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +104,"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/buying/doctype/request_for_quotation/request_for_quotation.js +708,Send Supplier Emails,Skicka e-post Leverantörs
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,"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
 DocType: Guardian Interest,Guardian Interest,Guardian intresse
 DocType: Timesheet,Employee Detail,anställd Detalj
@@ -3115,9 +3160,9 @@
 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}
 DocType: Salary Slip,Earning & Deduction,Vinst &amp; Avdrag
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +77,Account {0} cannot be a Group,Kontot {0} kan inte vara en grupp
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} cannot be a Group,Kontot {0} kan inte vara en grupp
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +31,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 +107,Negative Valuation Rate is not allowed,Negativt Värderingsvärde är inte tillåtet
+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
 DocType: Holiday List,Weekly Off,Veckovis Av
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","För t.ex. 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +39,Provisional Profit / Loss (Credit),Preliminär vinst / förlust (Kredit)
@@ -3131,16 +3176,16 @@
 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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Kostnadsställe är obligatorisk för punkt {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +626,Get Items from Product Bundle,Få artiklar från produkt Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +605,Get Items from Product Bundle,Få artiklar från produkt Bundle
 DocType: Asset,Straight Line,Rak linje
 DocType: Project User,Project User,projektAnvändar
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} is inactive,Konto {0} är inaktivt
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} is inactive,Konto {0} är inaktivt
 DocType: GL Entry,Is Advance,Är Advancerad
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Närvaro Från Datum och närvaro hittills är obligatorisk
 apps/erpnext/erpnext/controllers/buying_controller.py +148,Please enter 'Is Subcontracted' as Yes or No,"Ange ""Är underleverantör"" som Ja eller Nej"
 DocType: Sales Team,Contact No.,Kontakt nr
 DocType: Bank Reconciliation,Payment Entries,betalningsAnteckningar
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,'Profit and Loss' type account {0} not allowed in Opening Entry,"""Resultaträkning"" kontotyp {0} inte tillåtna i öppna poster"
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +71,'Profit and Loss' type account {0} not allowed in Opening Entry,"""Resultaträkning"" kontotyp {0} inte tillåtna i öppna poster"
 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
@@ -3159,7 +3204,7 @@
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Seriell #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Commission on Sales,Försäljningsprovision
 DocType: Offer Letter Term,Value / Description,Värde / Beskrivning
-apps/erpnext/erpnext/controllers/accounts_controller.py +558,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Rad # {0}: Asset {1} kan inte lämnas, är det redan {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +561,"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: Production Order,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}.
@@ -3172,13 +3217,13 @@
 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/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Legal Expenses,Rättsskydds
 DocType: Purchase Invoice,Posting Time,Boknings Tid
-DocType: Sales Order,% Amount Billed,% Belopp fakturerat
+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.
 apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},Ingen produkt med Löpnummer {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Öppna Meddelanden
+DocType: Email Digest,Open Notifications,Öppna Meddelanden
 DocType: Payment Entry,Difference Amount (Company Currency),Skillnad Belopp (Company valuta)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,Direkta kostnader
 apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
@@ -3186,7 +3231,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Nya kund Intäkter
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,Resekostnader
 DocType: Maintenance Visit,Breakdown,Nedbrytning
-apps/erpnext/erpnext/controllers/accounts_controller.py +634,Account: {0} with currency: {1} can not be selected,Konto: {0} med valuta: kan inte väljas {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +637,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}
 DocType: Program Enrollment Tool,Student Applicants,elev Sökande
@@ -3194,15 +3239,15 @@
 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 +56,Probation,Skyddstillsyn
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Probation,Skyddstillsyn
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,lönedelar
 DocType: Program Enrollment Tool,New Academic Year,Nytt läsår
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Payment of salary for the month {0} and year {1},Utbetalning av lön för månaden {0} och år {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Payment of salary for the month {0} and year {1},Utbetalning av lön för månaden {0} och år {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Diskinmatning Prislista ränta om saknas
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Sammanlagda belopp som betalats
 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 +144,Planning,Planering
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,Planering
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,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
@@ -3215,11 +3260,10 @@
 DocType: Sales Partner,Contact Desc,Kontakt Desc
 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.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Sales invoice submitted sucessfully.,Fakturan lämnas framgångsrikt.
 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}
 DocType: Assessment Result,Student Name,Elevs namn
-apps/erpnext/erpnext/hooks.py +104,Assessment Schedule,bedömning Schema
+apps/erpnext/erpnext/hooks.py +113,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
@@ -3229,6 +3273,7 @@
 DocType: GL Entry,Party Type,Parti Typ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +78,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
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Lön mall mästare.
 DocType: Leave Type,Max Days Leave Allowed,Max dagars ledighet tillåtna
@@ -3240,18 +3285,19 @@
 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 +99,All Customer Groups,Alla kundgrupper
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +78,Accumulated Monthly,ackumulerade månads
-apps/erpnext/erpnext/controllers/accounts_controller.py +595,{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/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Alla kundgrupper
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +81,Accumulated Monthly,ackumulerade månads
+apps/erpnext/erpnext/controllers/accounts_controller.py +598,{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
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Prislista värde (Företagsvaluta)
 DocType: Products Settings,Products Settings,produkter Inställningar
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +188,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
 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 +84,Secretary,Sekreterare
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,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
@@ -3260,24 +3306,22 @@
 ,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
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,Rad # {0}: Löpnummer är obligatorisk
+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 +859,Supplier Quotation,Leverantör Offert
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +838,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 +7,Collect Fees,ta ut avgifter
+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}
 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.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,uppkommande händelser
 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
-DocType: Email Digest,Income / Expense,Intäkt / kostnad
 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."
@@ -3288,13 +3332,14 @@
 DocType: Customer,From Lead,Från Prospekt
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Order släppts för produktion.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Välj räkenskapsår ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,POS Profile required to make POS Entry,POS profil som krävs för att göra POS inlägg
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +509,POS Profile required to make POS Entry,POS profil som krävs för att göra POS inlägg
 DocType: Program Enrollment Tool,Enroll Students,registrera studenter
 DocType: Hub Settings,Name Token,Namn token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standardförsäljnings
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Atleast one warehouse is mandatory,Minst ett lager är obligatorisk
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +129,Atleast one warehouse is mandatory,Minst ett lager är obligatorisk
 DocType: Serial No,Out of Warranty,Ingen garanti
 DocType: BOM Replace Tool,Replace,Ersätt
+DocType: Production Order,Unstopped,icke stoppad
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Invoice {1},{0} mot faktura {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Projektnamn
@@ -3315,10 +3360,11 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Ledigheter ska fördelas i multiplar av 0,5"
 DocType: Production Order,Operation Cost,Driftkostnad
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,Ladda upp närvaro från en CSV-fil
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Utestående Amt
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Uppsatta mål Punkt Gruppvis för säljare.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Freeze Lager Äldre än [dagar]
-apps/erpnext/erpnext/controllers/accounts_controller.py +528,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Rad # {0}: Asset är obligatoriskt för anläggningstillgång köp / försäljning
+apps/erpnext/erpnext/controllers/accounts_controller.py +531,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Rad # {0}: Asset är obligatoriskt för anläggningstillgång köp / försäljning
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Om två eller flera Prissättningsregler hittas baserat på ovanstående villkor, tillämpas prioritet . Prioritet är ett tal mellan 0 till 20, medan standardvärdet är noll (tom). Högre siffra innebär det kommer att ha företräde om det finns flera prissättningsregler med samma villkor."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Räkenskapsårets: {0} inte existerar
 DocType: Currency Exchange,To Currency,Till Valuta
@@ -3335,15 +3381,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Privatkapital
 DocType: Maintenance Visit,Customer Feedback,Kund Feedback
 DocType: Account,Expense,Utgift
-DocType: Sales Invoice,Exhibition,Utställning
 apps/erpnext/erpnext/utilities/doctype/address/address.py +77,"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 +81,Syntax error in formula or condition: {0},Syntax error i formel eller tillstånd: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +92,Syntax error in formula or condition: {0},Syntax error i formel eller tillstånd: {0}
 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
+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 +28,Jobs,jobb
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,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
@@ -3352,16 +3398,16 @@
 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 +763,Make Supplier Quotation,Skapa Leverantörsoffert
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,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/controllers/sales_and_purchase_return.py +100,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 +42,Casual Leave,Tillfällig ledighet
+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
 DocType: Batch,Batch ID,Batch-ID
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,Note: {0},Obs: {0}
 ,Delivery Note Trends,Följesedel Trender
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +103,This Week's Summary,Veckans Sammanfattning
+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
 DocType: Student Group Creation Tool,Get Courses,få Banor
 DocType: GL Entry,Party,Parti
@@ -3371,7 +3417,7 @@
 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 +59,Piecework,Ackord
+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
 DocType: Task,Actual Time (in Hours),Faktisk tid (i timmar)
 DocType: Employee,History In Company,Historia Företaget
@@ -3388,7 +3434,7 @@
 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.
 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 +162,Black,Svart
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,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
@@ -3399,13 +3445,13 @@
 DocType: Project Task,Pending Review,Väntar På Granskning
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +106,"Asset {0} cannot be scrapped, as it is already {1}","Tillgångs {0} kan inte skrotas, eftersom det redan är {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Totalkostnadskrav (via utgiftsräkning)
-apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +69,Customer Id,Kundnummer
+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
 DocType: Journal Entry Account,Exchange Rate,Växelkurs
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Sales Order {0} is not submitted,Kundorder {0} är inte lämnat
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +527,Sales Order {0} is not submitted,Kundorder {0} är inte lämnat
 DocType: Homepage,Tag Line,Tag Linje
 DocType: Fee Component,Fee Component,avgift Komponent
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +857,Add items from,Lägga till objekt från
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +836,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}
 DocType: Cheque Print Template,Regular,Regelbunden
 DocType: BOM,Last Purchase Rate,Senaste Beställningsvärde
@@ -3413,6 +3459,7 @@
 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
 ,Sales Person-wise Transaction Summary,Försäljningen person visa transaktion Sammanfattning
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +60,Cost Center is required for 'Profit and Loss' account {0}. Please set up a default Cost Center for the Company.,Kostnadsställe krävs för &quot;Resultaträkning&quot; konto {0}. Ställ upp en standardkostnadsställe för bolaget.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,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
@@ -3423,12 +3470,12 @@
 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 +710,Online,Uppkopplad
+apps/erpnext/erpnext/accounts/page/pos/pos.js +692,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 +16,Setting this Address Template as default as there is no other default,Ställa den här adressen mall som standard eftersom det inte finns någon annan standard
+apps/erpnext/erpnext/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
 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 +74,Quality Management,Kvalitetshantering
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,Kvalitetshantering
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,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
@@ -3450,11 +3497,12 @@
 DocType: Student,Student Email ID,Student E ID
 DocType: Employee,Notice (days),Observera (dagar)
 DocType: Tax Rule,Sales Tax Template,Moms Mall
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1520,Select items to save the invoice,Välj objekt för att spara fakturan
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1544,Select items to save the invoice,Välj objekt för att spara fakturan
 DocType: Employee,Encashment Date,Inlösnings Datum
 DocType: Account,Stock Adjustment,Lager för justering
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Standard Aktivitetskostnad existerar för Aktivitetstyp - {0}
 DocType: Production Order,Planned Operating Cost,Planerade driftkostnader
+DocType: Academic Term,Term Start Date,Term Startdatum
 apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},Härmed bifogas {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Kontoutdrag balans per huvudbok
 DocType: Job Applicant,Applicant Name,Sökandes Namn
@@ -3484,17 +3532,17 @@
 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.
 DocType: Company,Distribution,Fördelning
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +8,Amount Paid,Betald Summa
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Project Manager,Projektledare
+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
 ,Quoted Item Comparison,Citerade föremål Jämförelse
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Dispatch,Skicka
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,Skicka
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max rabatt tillåtet för objektet: {0} är {1}%
 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.
-DocType: Sales Invoice,Supplier Reference,Leverantör Referens
-apps/erpnext/erpnext/accounts/page/pos/pos.js +844,"Master data syncing, it might take some time","Basdata synkronisering, kan det ta lite tid"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +832,"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
@@ -3508,7 +3556,7 @@
 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 +83,Error in formula or condition,Fel i formel eller ett tillstånd
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,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
@@ -3517,7 +3565,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},Till Datum bör ligga inom räkenskapsåret. Förutsatt att Dag = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Här kan du behålla längd, vikt, allergier, medicinska problem etc"
 DocType: Leave Block List,Applies to Company,Gäller Företag
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +197,Cannot cancel because submitted Stock Entry {0} exists,Det går inte att avbryta eftersom lämnad Lagernotering {0} existerar
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +198,Cannot cancel because submitted Stock Entry {0} exists,Det går inte att avbryta eftersom lämnad Lagernotering {0} existerar
 DocType: Purchase Invoice,In Words,I Ord
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,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
@@ -3527,14 +3575,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,Din räkenskapsår som börjar på
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Asset Avskrivningar och saldon
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +319,Amount {0} {1} transferred from {2} to {3},Belopp {0} {1} överförs från {2} till {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +322,Amount {0} {1} transferred from {2} to {3},Belopp {0} {1} överförs från {2} till {3}
 DocType: Sales Invoice,Get Advances Received,Få erhållna förskott
 DocType: Email Digest,Add/Remove Recipients,Lägg till / ta bort mottagare
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +432,Transaction not allowed against stopped Production Order {0},Transaktion inte tillåtet mot stoppad produktionsorder {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +437,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 +143,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 +652,Item variant {0} exists with same attributes,Punkt variant {0} finns med samma attribut
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Punkt variant {0} finns med samma attribut
+DocType: Leave Application,LAP/,KNÄ/
 DocType: Salary Slip,Salary Slip,Lön Slip
 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
@@ -3542,12 +3591,12 @@
 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 +212,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 +215,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/public/js/controllers/transaction.js +866,It is needed to fetch Item Details.,Det behövs för att hämta produktdetaljer.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +857,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
@@ -3557,14 +3606,14 @@
 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 +178,Invalid {0},Ogiltigt {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Sick Leave,Sjukskriven
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,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
 DocType: Warehouse,PIN,STIFT
 DocType: Sales Invoice,Base Change Amount (Company Currency),Basförändring Belopp (Company valuta)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +313,No accounting entries for the following warehouses,Inga bokföringsposter för följande lager
-apps/erpnext/erpnext/projects/doctype/project/project.js +102,Save the document first.,Spara dokumentet först.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +314,No accounting entries for the following warehouses,Inga bokföringsposter för följande lager
+apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Spara dokumentet först.
 DocType: Account,Chargeable,Avgift
 DocType: Company,Change Abbreviation,Ändra Förkortning
 DocType: Expense Claim Detail,Expense Date,Utgiftsdatum
@@ -3577,10 +3626,9 @@
 DocType: Purchase Invoice,Recurring Print Format,Återkommande Utskriftsformat
 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,Förväntad leveransdatum kan inte vara före beställningsdatum
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,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
 DocType: Appraisal,Appraisal Template,Bedömning mall
 DocType: Item Group,Item Classification,Produkt Klassificering
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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
@@ -3590,8 +3638,8 @@
 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 +940,Please select {0} first,Välj {0} först
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +749,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 +953,Please select {0} first,Välj {0} först
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +757,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
@@ -3608,8 +3656,8 @@
 {% 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 +92,Warehouse not found in the system,Lagret hittades inte i systemet
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +106,This Month's Summary,Månadens Sammanfattning
+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
 DocType: Quality Inspection Reading,Quality Inspection Reading,Kvalitetskontroll Läsning
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Frys lager äldre än` bör vara mindre än% d dagar.
 DocType: Tax Rule,Purchase Tax Template,Köp Tax Mall
@@ -3619,21 +3667,22 @@
 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 +87,Please set Next Depreciation Date,Ställ Nästa Avskrivningar Datum
-DocType: Payment Gateway,Payment Gateway,Payment Gateway
 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 +378,Operation Time must be greater than 0 for Operation {0},Operation Time måste vara större än 0 för drift {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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/accounts/doctype/account/account.py +170,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)
 DocType: Program,Program Abbreviation,program Förkortning
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,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: Appraisal,Start Date,Start Datum
@@ -3649,21 +3698,22 @@
 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
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,T.ex. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +27,Transaction currency must be same as Payment Gateway currency,Transaktions valutan måste vara samma som Payment Gateway valuta
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Transaction currency must be same as Payment Gateway currency,Transaktions valutan måste vara samma som Payment Gateway valuta
 DocType: Payment Entry,Receive,Receive
+apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,citat:
 DocType: Maintenance Visit,Fully Completed,Helt Avslutad
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Färdig
 DocType: Employee,Educational Qualification,Utbildnings Kvalificering
 DocType: Workstation,Operating Costs,Operations Kostnader
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Åtgärder om sammanlagda månadsbudgeten överskrids
 DocType: Purchase Invoice,Submit on creation,Lämna in en skapelse
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +432,Currency for {0} must be {1},Valuta för {0} måste vara {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +435,Currency for {0} must be {1},Valuta för {0} måste vara {1}
 DocType: Asset,Disposal Date,bortskaffande Datum
 DocType: Employee Leave Approver,Employee Leave Approver,Anställd Lämna godkännare
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,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 +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/crm/doctype/opportunity/opportunity.py +79,"Cannot declare as lost, because Quotation has been made.","Det går inte att ange som förlorad, eftersom Offert har gjorts."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Inköpschef
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +429,Production Order {0} must be submitted,Produktionsorder {0} måste lämnas in
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +434,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
@@ -3673,25 +3723,27 @@
 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/accounts/report/general_ledger/general_ledger.py +181,Totals,Totals
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,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 +113,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 +120,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.
+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 +181,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/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 +793,All records are synced.,Alla poster synkroniseras.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +781,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
 DocType: Cost Center,Cost Center Name,Kostnadcenter Namn
@@ -3710,21 +3762,20 @@
 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/selling/doctype/quotation/quotation.py +49,Cannot set as Lost as Sales Order is made.,Kan inte ställa in då Förlorad kundorder är gjord.
-DocType: Student Applicant,Mother's Name,Moders namn
 DocType: Request for Quotation Item,Supplier Part No,Leverantör varunummer
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +348,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Det går inte att dra när kategori är för &quot;Värdering&quot; eller &quot;Vaulation och Total&quot;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Received From,Mottagen från
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Received From,Mottagen från
 DocType: Lead,Converted,Konverterad
 DocType: Item,Has Serial No,Har Löpnummer
 DocType: Employee,Date of Issue,Utgivningsdatum
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{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 +93,Row {0}: Hours value must be greater than zero.,V {0}: Timmar Värdet måste vara större än noll.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +117,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
 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 +172,{0} {1} does not exist,{0} {1} existerar inte
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +175,{0} {1} does not exist,{0} {1} existerar inte
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,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 +72,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
@@ -3733,13 +3784,14 @@
 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/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
 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 +109,Electrical,Elektrisk
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,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 +318,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}
@@ -3747,7 +3799,7 @@
 DocType: Item,Customer Code,Kund kod
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +210,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 +292,Debit To account must be a Balance Sheet account,Debitering av kontot måste vara ett balanskonto
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To account must be a Balance Sheet account,Debitering av kontot måste vara ett balanskonto
 DocType: Buying Settings,Naming Series,Namge Serien
 DocType: Leave Block List,Leave Block List Name,Lämna Blocklistnamn
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Stock Tillgångar
@@ -3759,11 +3811,11 @@
 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 +301,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 +313,Salary Slip of employee {0} already created for time sheet {1},Lönebesked av personal {0} redan skapats för tidrapporten {1}
 DocType: Sales Order Item,Ordered Qty,Beställde Antal
-apps/erpnext/erpnext/stock/doctype/item/item.py +673,Item {0} is disabled,Punkt {0} är inaktiverad
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,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 +838,BOM does not contain any stock item,BOM inte innehåller någon lagervara
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +809,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.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generera lönebesked
@@ -3771,23 +3823,24 @@
 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)
-apps/erpnext/erpnext/stock/doctype/item/item.py +485,Row #{0}: Please set reorder quantity,Rad # {0}: Ställ in beställningsmängd
+DocType: Sales Invoice Timesheet,Billing Hours,fakturerings Timmar
+apps/erpnext/erpnext/stock/doctype/item/item.py +487,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 +62,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
+DocType: Payment Entry,Allocate Payment Amount,Tilldela Betalningsbelopp
 DocType: Employee External Work History,Salary,Lön
 DocType: Serial No,Delivery Document Type,Leverans Dokumenttyp
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Skicka alla lönebesked för de ovan valda kriterier
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} artiklar synkroniseras
 DocType: Sales Order,Partly Delivered,Delvis Levererad
-DocType: Sales Invoice,Existing Customer,Befintlig kund
 DocType: Email Digest,Receivables,Fordringar
+DocType: Lead Source,Lead Source,bly Källa
 DocType: Customer,Additional information regarding the customer.,Ytterligare information om kunden.
 DocType: Quality Inspection Reading,Reading 5,Avläsning 5
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +38,Campaign Name is required,Kampanjens namn krävs
 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
@@ -3795,10 +3848,9 @@
 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 +129,BOM and Manufacturing Quantity are required,BOM och tillverkningskvantitet krävs
+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/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Åldringsräckvidd 2
 DocType: SG Creation Tool Course,Max Strength,max Styrka
-DocType: Bank Reconciliation Detail,Amount,Mängd
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM ersatte
 ,Sales Analytics,Försäljnings Analytics
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +113,Available {0},Tillgängliga {0}
@@ -3806,14 +3858,14 @@
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Ställa in e-post
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +96,Please enter default currency in Company Master,Ange standardvaluta i Bolaget
 DocType: Stock Entry Detail,Stock Entry Detail,Stock Entry Detalj
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +100,Daily Reminders,Dagliga påminnelser
+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/account/account_tree.js +23,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 +71,Customer Service,Kundtjänst
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Customer Service,Kundtjänst
 DocType: Homepage Featured Product,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.
@@ -3822,8 +3874,9 @@
 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
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Standard Work In Progress Warehouse
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1570,Total nos of serial no is not equal to quantity.,Totalt nos av serienummer är inte lika med kvantitet.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1594,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
@@ -3831,9 +3884,10 @@
 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 +82,Engineer,Ingenjör
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,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 +370,Item Code required at Row No {0},Produkt kod krävs vid Radnr {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +398,Item Code required at Row No {0},Produkt kod krävs vid Radnr {0}
 DocType: Sales Partner,Partner Type,Partner Typ
 DocType: Purchase Taxes and Charges,Actual,Faktisk
 DocType: Authorization Rule,Customerwise Discount,Kundrabatt
@@ -3849,16 +3903,18 @@
 DocType: BOM,Raw Material Cost,Råvarukostnad
 DocType: Item Reorder,Re-Order Level,Återuppta nivå
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Ange produkter och planerad ant. som du vill höja produktionsorder eller hämta råvaror för analys.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +55,Part-time,Deltid
+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
 DocType: Employee,Applicable Holiday List,Tillämplig kalender
 DocType: Employee,Cheque,Check
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Serie Uppdaterad
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +57,Series Updated,Serie Uppdaterad
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Rapporttyp är obligatorisk
 DocType: Item,Serial Number Series,Serial Number Series
 apps/erpnext/erpnext/buying/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 +87,Clearance Date updated,Clearance Datum uppdateras
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Framgångsrikt Avstämt
@@ -3872,7 +3928,7 @@
 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 +513,Posting date and posting time is mandatory,Bokningsdatum och bokningstid är obligatorisk
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Bokningsdatum och bokningstid är obligatorisk
 apps/erpnext/erpnext/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.
@@ -3882,7 +3938,7 @@
 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/stock/doctype/stock_entry/stock_entry.py +158,Target warehouse in row {0} must be same as Production Order,Target lager i rad {0} måste vara densamma som produktionsorder
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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
 DocType: Company,Round Off Account,Avrunda konto
@@ -3891,23 +3947,22 @@
 DocType: Customer Group,Parent Customer Group,Överordnad kundgrupp
 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 +180,Notice Period,Uppsägningstid
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,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 +4,New Sales Person Name,Ny försäljnings Person Namn
 DocType: Packing Slip,Gross Weight UOM,Bruttovikt UOM
-DocType: Email Digest,Receivables / Payables,Fordringar / skulder
 DocType: Delivery Note Item,Against Sales Invoice,Mot fakturan
 DocType: Bin,Reserved Qty for Production,Reserverad Kvantitet för produktion
 DocType: Asset,Frequency of Depreciation (Months),Frekvens av avskrivningar (månader)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +469,Credit Account,KUNDKONTO
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Credit Account,KUNDKONTO
 DocType: Landed Cost Item,Landed Cost Item,Landad kostnadspost
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +55,Show zero values,Visa nollvärden
+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
 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 +647,Please specify Attribute Value for attribute {0},Ange Attribut Värde för attribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Ange Attribut Värde för attribut {0}
 DocType: Item,Default Warehouse,Standard Lager
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +39,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
@@ -3929,19 +3984,22 @@
 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
-DocType: Sales Invoice,Cold Calling,Kall produkt
 DocType: SMS Parameter,SMS Parameter,SMS-Parameter
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,Budget och kostnadsställe
 DocType: Maintenance Schedule Item,Half Yearly,Halvår
 DocType: Lead,Blog Subscriber,Blogg Abonnent
+DocType: Guardian,Alternate Number,alternativt nummer
 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.
+DocType: Stock Reconciliation Item,Quantity Difference,kvantitet Skillnad
 apps/erpnext/erpnext/config/hr.py +253,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 +141,Set as Lost,Ange som förlorade
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,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 +5,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
 DocType: Supplier,Credit Days Based On,Kredit dagar baserat på
@@ -3953,11 +4011,10 @@
 ,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 +941,Select or add new customer,Välj eller lägga till en ny kund
+apps/erpnext/erpnext/accounts/page/pos/pos.js +930,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 +5,This is based on the attendance of this Employee,Detta är baserat på närvaron av detta till anställda
-DocType: Sales Invoice,Frequency,Frekvens
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +463,Debit Account,Bankkortkonto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,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)
@@ -3966,27 +4023,27 @@
 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 +210,Supplier Quotation {0} created,Leverantör Offert {0} skapades
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +208,Supplier Quotation {0} created,Leverantör Offert {0} skapades
 apps/erpnext/erpnext/accounts/report/financial_statements.py +90,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 +173,Employee Benefits,Ersättningar till anställda
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,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 +228,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 +232,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 +499,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 +500,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 +1007,Price List not found or disabled,Prislista hittades inte eller avaktiverad
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1008,Price List not found or disabled,Prislista hittades inte eller avaktiverad
 DocType: Expense Claim,Approved,Godkänd
 DocType: Pricing Rule,Price,Pris
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +244,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 +256,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
@@ -3997,12 +4054,12 @@
 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 +259,Please select Employee Record first.,Välj Anställningsregister först.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +266,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 +190,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 +235,Please enter Expense Account,Ange utgiftskonto
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,Please enter Expense Account,Ange utgiftskonto
 DocType: Account,Stock,Lager
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,"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 +976,"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
@@ -4017,9 +4074,10 @@
 DocType: Asset Movement,Transaction Date,Transaktionsdatum
 DocType: Production Plan Item,Planned Qty,Planerade Antal
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,Totalt Skatt
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,For Quantity (Manufactured Qty) is mandatory,För Kvantitet (Tillverkad Antal) är obligatorisk
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,For Quantity (Manufactured Qty) is mandatory,För Kvantitet (Tillverkad Antal) är obligatorisk
 DocType: Stock Entry,Default Target Warehouse,Standard Valt Lager
 DocType: Purchase Invoice,Net Total (Company Currency),Netto Totalt (Företagsvaluta)
+apps/erpnext/erpnext/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 +78,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: Production Order,Actual Start Date,Faktiskt startdatum
@@ -4034,9 +4092,11 @@
 DocType: Warranty Claim,If different than customer address,Om annan än kundens adress
 DocType: BOM Operation,BOM Operation,BOM Drift
 DocType: Purchase Taxes and Charges,On Previous Row Amount,På föregående v Belopp
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +226,Transfer Asset,överföring av tillgångar
+DocType: Student,Home Address,Hemadress
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +227,Transfer Asset,överföring av tillgångar
 DocType: POS Profile,POS Profile,POS-Profil
 apps/erpnext/erpnext/config/schools.py +33,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 +129,"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
@@ -4046,8 +4106,8 @@
 DocType: Assessment,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 +765,Material to Supplier,Material till leverantören
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +189,Excise Invoice,Punkt Faktura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,Material to Supplier,Material till leverantören
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,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
@@ -4057,7 +4117,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,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 +136,Credit Card,Kreditkort
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,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.
 DocType: Purchase Invoice,Next Date,Nästa Datum
@@ -4065,6 +4125,7 @@
 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: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Här kan du behålla familje detaljer som namn och ockupationen av förälder, make och barn"
+DocType: Academic Term,Term End Date,Term Slutdatum
 DocType: Hub Settings,Seller Name,Säljaren Namn
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Skatter och avgifter Avgår (Company valuta)
 DocType: Item Group,General Settings,Allmänna Inställningar
@@ -4076,7 +4137,7 @@
 DocType: Customer,Commission Rate,Provisionbetyg
 apps/erpnext/erpnext/stock/doctype/item/item.js +261,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 +115,"Payment Type must be one of Receive, Pay and Internal Transfer",Betalning Type måste vara en av mottagning Betala och intern överföring
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +118,"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/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Kundvagnen är tom
 DocType: Production Order,Actual Operating Cost,Faktisk driftkostnad
@@ -4091,10 +4152,10 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,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 +92,Designer,Designer
+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
 DocType: Serial No,Delivery Details,Leveransdetaljer
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +469,Cost Center is required in row {0} in Taxes table for type {1},Kostnadsställe krävs rad {0} i skatte tabellen för typ {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +472,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
 ,Item-wise Purchase Register,Produktvis Inköpsregister
 DocType: Batch,Expiry Date,Utgångsdatum
@@ -4104,12 +4165,12 @@
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Projektchef.
 apps/erpnext/erpnext/controllers/status_updater.py +174,"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 +417, (Half Day),(Halv Dag)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425, (Half Day),(Halv Dag)
 DocType: Supplier,Credit Days,Kreditdagar
 DocType: Leave Type,Is Carry Forward,Är Överförd
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +740,Get Items from BOM,Hämta artiklar från BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +711,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 +549,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/controllers/accounts_controller.py +552,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
diff --git a/erpnext/translations/ta.csv b/erpnext/translations/ta.csv
index 512f0f6..ced6d69 100644
--- a/erpnext/translations/ta.csv
+++ b/erpnext/translations/ta.csv
@@ -18,11 +18,10 @@
 DocType: Sales Partner,Dealer,வாணிகம் செய்பவர்
 DocType: Employee,Rented,வாடகைக்கு
 DocType: Purchase Order,PO-,இம்
-apps/erpnext/erpnext/accounts/report/financial_statements.py +19,Start Year {0} not found.,தொடக்க ஆண்டு {0} இல்லை.
 DocType: POS Profile,Applicable for User,பயனர் பொருந்தும்
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +191,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","நிறுத்தி உற்பத்தி ஆணை ரத்து செய்ய முடியாது, ரத்து செய்ய முதலில் அதை தடை இல்லாத"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +197,Do you really want to scrap this asset?,நீங்கள் உண்மையில் இந்த சொத்து கைவிட்டால் செய்ய விரும்புகிறீர்களா?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +17,Select Default Supplier,இயல்புநிலை சப்ளையர் தேர்வு
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +192,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","நிறுத்தி உற்பத்தி ஆணை ரத்து செய்ய முடியாது, ரத்து செய்ய முதலில் அதை தடை இல்லாத"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +198,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 +36,Currency is required for Price List {0},நாணய விலை பட்டியல் தேவையான {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* பரிமாற்றத்தில் கணக்கிடப்படுகிறது.
 DocType: Address,County,உள்ளூரில்
@@ -42,46 +41,45 @@
 DocType: Sales Invoice,Customer Name,வாடிக்கையாளர் பெயர்
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +126,Bank account cannot be named as {0},வங்கி கணக்கு என பெயரிடப்பட்டது {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"தலைவர்கள் (குழுக்களின்) எதிராக, பைனான்ஸ் பதிவுகள் செய்யப்படுகின்றன மற்றும் சமநிலைகள் பராமரிக்கப்படுகிறது."
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +180,Outstanding for {0} cannot be less than zero ({1}),சிறந்த {0} பூஜ்யம் விட குறைவாக இருக்க முடியாது ( {1} )
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,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 +148,Series Updated Successfully,தொடர் வெற்றிகரமாக புதுப்பிக்கப்பட்டது
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +149,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,அனைத்து சப்ளையர் தொடர்பு
-DocType: Quality Inspection Reading,Parameter,அளவுரு
 apps/erpnext/erpnext/projects/doctype/project/project.py +54,Expected End Date can not be less than Expected Start Date,எதிர்பார்த்த முடிவு தேதி எதிர்பார்க்கப்படுகிறது தொடக்க தேதி விட குறைவாக இருக்க முடியாது
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,ரோ # {0}: விகிதம் அதே இருக்க வேண்டும் {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +239,New Leave Application,புதிய விடுப்பு விண்ணப்பம்
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,New Leave Application,புதிய விடுப்பு விண்ணப்பம்
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +20,Attendance Record {0} exists against Student {1} for Course Schedule {2},வருகை பதிவு {0} கோர்ஸ் அட்டவணை மாணவர் {1} எதிராக உள்ளது {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Bank Draft,வங்கி உண்டியல்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,வங்கி உண்டியல்
 DocType: Mode of Payment Account,Mode of Payment Account,கொடுப்பனவு கணக்கு முறை
 apps/erpnext/erpnext/stock/doctype/item/item.js +52,Show Variants,காட்டு மாறிகள்
 DocType: Academic Term,Academic Term,கல்வி கால
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +13,Material,பொருள்
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Quantity,அளவு
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +511,Accounts table cannot be blank.,கணக்குகள் அட்டவணை காலியாக இருக்க முடியாது.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +616,Quantity,அளவு
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +512,Accounts table cannot be blank.,கணக்குகள் அட்டவணை காலியாக இருக்க முடியாது.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,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/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 +142,User {0} is already assigned to Employee {1},பயனர் {0} ஏற்கனவே பணியாளர் ஒதுக்கப்படும் {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,உடல்நலம்
-DocType: Purchase Invoice,Monthly,மாதாந்தர
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),கட்டணம் தாமதம் (நாட்கள்)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +771,Invoice,விலைப்பட்டியல்
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +750,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 +198,Row {0}: {1} {2} does not match with {3},ரோ {0} {1} {2} பொருந்தவில்லை {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,ரோ # {0}:
+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 +127,Please select Price List,விலை பட்டியல் தேர்ந்தெடுக்கவும்
@@ -112,8 +110,8 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,அதே நிறுவனம் ஒன்றுக்கு மேற்பட்ட முறை உள்ளிட்ட
 DocType: Employee,Married,திருமணம்
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},அனுமதிக்கப்பட்ட {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +589,Get items from,இருந்து பொருட்களை பெற
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +382,Stock cannot be updated against Delivery Note {0},பங்கு விநியோக குறிப்பு எதிராக மேம்படுத்தப்பட்டது முடியாது {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,இருந்து பொருட்களை பெற
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,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,மளிகை
@@ -122,7 +120,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 +156,Salary Structure Missing,சம்பளத் திட்டத்தை காணாமல்
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Salary Structure Missing,சம்பளத் திட்டத்தை காணாமல்
 DocType: Lead,Person Name,நபர் பெயர்
 DocType: Sales Invoice Item,Sales Invoice Item,விற்பனை விலைப்பட்டியல் பொருள்
 DocType: Account,Credit,கடன்
@@ -130,10 +128,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 +156,Credit limit has been crossed for customer {0} {1}/{2},கடன் எல்லை வாடிக்கையாளர் கடந்து {0} {1} / {2}
-apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;நிலையான சொத்து உள்ளது&quot; சொத்து சாதனை உருப்படியை எதிராக உள்ளது என, நீக்கம் செய்ய முடியாது"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +189,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; சொத்து சாதனை உருப்படியை எதிராக உள்ளது என, நீக்கம் செய்ய முடியாது"
 DocType: Tax Rule,Tax Type,வரி வகை
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +144,You are not authorized to add or update entries before {0},நீங்கள் முன் உள்ளீடுகளை சேர்க்க அல்லது மேம்படுத்தல் அங்கீகாரம் இல்லை {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},நீங்கள் முன் உள்ளீடுகளை சேர்க்க அல்லது மேம்படுத்தல் அங்கீகாரம் இல்லை {0}
 DocType: Item,Item Image (if not slideshow),உருப்படி படம் (இருந்தால் ஸ்லைடுஷோ)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,"ஒரு வாடிக்கையாளர் , அதே பெயரில்"
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(அவ்வேளை விகிதம் / 60) * உண்மையான நடவடிக்கையை நேரம்
@@ -143,18 +142,17 @@
 DocType: Student Log,Student Log,மாணவர் உள்நுழைய
 DocType: Quality Inspection,Get Specification Details,குறிப்பு விவரம் கிடைக்கும்
 DocType: Lead,Interested,அக்கறை உள்ள
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +165,Opening,திறப்பு
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,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/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,வாடிக்கையாளர்&gt; வாடிக்கையாளர் குழு&gt; பிரதேசம்
 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.,ஏற்கனவே பரிவர்த்தனை கணக்கு குழு மாற்றப்பட முடியாது .
 DocType: Lead,Product Enquiry,தயாரிப்பு விசாரணை
 DocType: Academic Term,Schools,பள்ளிகள்
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,முதல் நிறுவனம் உள்ளிடவும்
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Company first,முதல் நிறுவனம் தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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,மொத்த செலவு
@@ -164,7 +162,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,கணக்கு அறிக்கை
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,மருந்துப்பொருள்கள்
 DocType: Purchase Invoice Item,Is Fixed Asset,நிலையான சொத்து உள்ளது
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Available qty is {0}, you need {1}","கிடைக்கும் கொத்தமல்லி {0}, உங்களுக்கு தேவையான {1}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +225,"Available qty is {0}, you need {1}","கிடைக்கும் கொத்தமல்லி {0}, உங்களுக்கு தேவையான {1}"
 DocType: Expense Claim Detail,Claim Amount,உரிமை தொகை
 DocType: Employee,Mr,திரு
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,வழங்குபவர் வகை / வழங்குபவர்
@@ -173,26 +171,27 @@
 DocType: Employee,B-,பி-
 DocType: Upload Attendance,Import Log,புகுபதிகை இறக்குமதி
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,மேலே அளவுகோல்களை அடிப்படையாக வகை உற்பத்தி பொருள் வேண்டுகோள் இழுக்க
+DocType: Assessment Result,Grade,தரம்
 DocType: Sales Invoice Item,Delivered By Supplier,சப்ளையர் மூலம் வழங்கப்படுகிறது
 DocType: SMS Center,All Contact,அனைத்து தொடர்பு
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Annual Salary,ஆண்டு சம்பளம்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,பங்கு செலவுகள்
-apps/erpnext/erpnext/accounts/report/financial_statements.py +22,End Year {0} not found.,இறுதி ஆண்டு {0} இல்லை.
 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}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,வழங்கல் மூலப்பொருட்கள் வாங்க
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +130,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 +451,Item {0} is not active or end of life has been reached,பொருள் {0} செயலில் இல்லை அல்லது வாழ்க்கை முடிவுக்கு வந்து விட்டது
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +456,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/controllers/accounts_controller.py +614,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","வரிசையில் வரி ஆகியவை அடங்கும் {0} பொருள் விகிதம் , வரிசைகளில் வரிகளை {1} சேர்க்கப்பட்டுள்ளது"
+apps/erpnext/erpnext/controllers/accounts_controller.py +617,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","வரிசையில் வரி ஆகியவை அடங்கும் {0} பொருள் விகிதம் , வரிசைகளில் வரிகளை {1} சேர்க்கப்பட்டுள்ளது"
 apps/erpnext/erpnext/config/hr.py +166,Settings for HR Module,அலுவலக தொகுதி அமைப்புகள்
 DocType: SMS Center,SMS Center,எஸ்எம்எஸ் மையம்
 DocType: Sales Invoice,Change Amount,அளவு மாற்ற
@@ -204,13 +203,13 @@
 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 +147,Execution,நிர்வாகத்தினருக்கு
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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,பொருட்கள் மற்றும் விலை
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},மொத்த மணிநேரம் {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},வரம்பு தேதி நிதியாண்டு க்குள் இருக்க வேண்டும். தேதி அனுமானம் = {0}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,Cost Center {0} does not belong to Company {1},செலவு மையம் {0} அல்ல நிறுவனத்தின் {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +100,Cost Center {0} does not belong to Company {1},செலவு மையம் {0} அல்ல நிறுவனத்தின் {1}
 DocType: Customer,Individual,தனிப்பட்ட
 DocType: Interest,Academics User,கல்வியாளர்கள் பயனர்
 DocType: Cheque Print Template,Amount In Figure,படம் தொகை
@@ -226,30 +225,32 @@
 DocType: Production Planning Tool,Sales Orders,விற்பனை ஆணைகள்
 DocType: Purchase Taxes and Charges,Valuation,மதிப்பு மிக்க
 ,Purchase Order Trends,ஆர்டர் போக்குகள் வாங்குவதற்கு
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,The request for quotation can be accessed by clicking on the following link,மேற்கோள் கோரிக்கை பின்வரும் இணைப்பை கிளிக் செய்வதன் மூலம் அணுக முடியும்
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,ஆண்டு இலைகள் ஒதுக்க.
 DocType: SG Creation Tool Course,SG Creation Tool Course,எஸ்.ஜி. உருவாக்கக் கருவி பாடநெறி
 DocType: Student Group Creation Tool,Leave blank if you wish to fetch all courses for selected academic term,நீங்கள் தேர்ந்தெடுத்த கல்வி கால அனைத்து படிப்புகள் எடுக்க விரும்பினால் விடுக
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,Insufficient Stock,போதிய பங்கு
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227,Insufficient Stock,போதிய பங்கு
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,முடக்கு கொள்ளளவு திட்டமிடுதல் நேரம் டிராக்கிங்
+DocType: Email Digest,New Sales Orders,புதிய விற்பனை ஆணைகள்
 DocType: Bank Reconciliation,Bank Account,வங்கி கணக்கு
 DocType: Leave Type,Allow Negative Balance,எதிர்மறை இருப்பு அனுமதி
 DocType: Selling Settings,Default Territory,முன்னிருப்பு மண்டலம்
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,தொலை காட்சி
 DocType: Production Order Operation,Updated via 'Time Log','டைம் பரிசீலனை' வழியாக புதுப்பிக்கப்பட்டது
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} does not belong to Company {1},கணக்கு {0} நிறுவனத்திற்கு சொந்தமானது இல்லை {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +86,Account {0} does not belong to Company {1},கணக்கு {0} நிறுவனத்திற்கு சொந்தமானது இல்லை {1}
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},அட்வான்ஸ் தொகை விட அதிகமாக இருக்க முடியாது {0} {1}
 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 +174,For Warehouse is required before Submit,கிடங்கு தேவையாக முன் சமர்ப்பிக்க
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,For Warehouse is required before Submit,கிடங்கு தேவையாக முன் சமர்ப்பிக்க
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,அன்று பெறப்பட்டது
 DocType: Sales Partner,Reseller,மறுவிற்பனையாளர்
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,நிறுவனத்தின் உள்ளிடவும்
 DocType: Delivery Note Item,Against Sales Invoice Item,விற்பனை விலைப்பட்டியல் பொருள் எதிராக
 ,Production Orders in Progress,முன்னேற்றம் உற்பத்தி ஆணைகள்
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Cash from Financing,கடன் இருந்து நிகர பண
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1436,"LocalStorage is full , did not save","LocalStorage முழு உள்ளது, காப்பாற்ற முடியவில்லை"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1460,"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}
@@ -262,18 +263,19 @@
 apps/erpnext/erpnext/templates/generators/item.html +78,No description given,கொடுக்கப்பட்ட விளக்கம் இல்லை
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,வாங்குவதற்கு கோரிக்கை.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +5,This is based on the Time Sheets created against this project,இந்த திட்டத்திற்கு எதிராக உருவாக்கப்பட்ட நேரம் தாள்கள் அடிப்படையாக கொண்டது
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Only the selected Leave Approver can submit this Leave Application,"தேர்வு விடுமுறை வீடு, இந்த விடுமுறை விண்ணப்பத்தை"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +213,Only the selected Leave Approver can submit this Leave Application,"தேர்வு விடுமுறை வீடு, இந்த விடுமுறை விண்ணப்பத்தை"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,தேதி நிவாரணத்தில் சேர தேதி விட அதிகமாக இருக்க வேண்டும்
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Leaves per Year,வருடத்திற்கு இலைகள்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,வருடத்திற்கு இலைகள்
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,ரோ {0}: சரிபார்க்கவும் கணக்கு எதிராக 'அட்வான்ஸ்' என்ற {1} இந்த ஒரு முன்கூட்டியே நுழைவு என்றால்.
 apps/erpnext/erpnext/stock/utils.py +188,Warehouse {0} does not belong to company {1},கிடங்கு {0} அல்ல நிறுவனம் {1}
+DocType: Email Digest,Profit & Loss,லாபம் மற்றும் நஷ்டம்
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,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 +435,Leave Blocked,தடுக்கப்பட்ட விட்டு
-apps/erpnext/erpnext/stock/doctype/item/item.py +669,Item {0} has reached its end of life on {1},பொருள் {0} வாழ்க்கை அதன் இறுதியில் அடைந்துவிட்டது {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +443,Leave Blocked,தடுக்கப்பட்ட விட்டு
+apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item {0} has reached its end of life on {1},பொருள் {0} வாழ்க்கை அதன் இறுதியில் அடைந்துவிட்டது {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +95,Bank Entries,வங்கி பதிவுகள்
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +83,Annual,வருடாந்திர
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +86,Annual,வருடாந்திர
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,பங்கு நல்லிணக்க பொருள்
 DocType: Stock Entry,Sales Invoice No,விற்பனை விலைப்பட்டியல் இல்லை
 DocType: Material Request Item,Min Order Qty,Min ஆர்டர் அளவு
@@ -281,20 +283,22 @@
 DocType: Lead,Do Not Contact,தொடர்பு இல்லை
 apps/erpnext/erpnext/public/js/setup_wizard.js +360,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 +91,Software Developer,மென்பொருள் டெவலப்பர்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,மென்பொருள் டெவலப்பர்
 DocType: Item,Minimum Order Qty,குறைந்தபட்ச ஆணை அளவு
 DocType: Pricing Rule,Supplier Type,வழங்குபவர் வகை
 DocType: Scheduling Tool,Course Start Date,பாடநெறி தொடக்க தேதி
 DocType: Item,Publish in Hub,மையம் உள்ள வெளியிடு
+DocType: Student Admission,Student Admission,மாணவர் சேர்க்கை
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is cancelled,பொருள் {0} ரத்து
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Material Request,பொருள் கோரிக்கை
+apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} is cancelled,பொருள் {0} ரத்து
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +823,Material Request,பொருள் கோரிக்கை
 DocType: Bank Reconciliation,Update Clearance Date,இசைவு தேதி புதுப்பிக்க
 apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +28,Abbreviation already used for another salary component,சுருக்கமான ஏற்கனவே மற்றொரு சம்பளம் கூறு பயன்படுத்தப்படும்
 DocType: Item,Purchase Details,கொள்முதல் விவரம்
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +328,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},கொள்முதல் ஆணை உள்ள &#39;மூலப்பொருட்கள் சப்ளை&#39; அட்டவணை காணப்படவில்லை பொருள் {0} {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +333,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/config/selling.py +18,Confirmed orders from Customers.,வாடிக்கையாளர்கள் இருந்து உத்தரவுகளை உறுதி.
 DocType: Purchase Receipt Item,Rejected Quantity,நிராகரிக்கப்பட்டது அளவு
 DocType: SMS Settings,SMS Sender Name,எஸ்எம்எஸ் அனுப்பியவர் பெயர்
@@ -310,20 +314,21 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +130,Please select Charge Type first,பொறுப்பு வகை முதல் தேர்வு செய்க
 DocType: Student Group Student,Student Group Student,மாணவர் குழு மாணவர்
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,சமீபத்திய
+DocType: Email Digest,New Quotations,புதிய மேற்கோள்கள்
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,பட்டியலில் முதல் விடுப்பு சர்க்கார் தரப்பில் சாட்சி இயல்புநிலை விடுப்பு சர்க்கார் தரப்பில் சாட்சி என அமைக்க வேண்டும்
 DocType: Tax Rule,Shipping County,கப்பல் உள்ளூரில்
 apps/erpnext/erpnext/config/desktop.py +158,Learn,அறிய
 DocType: Asset,Next Depreciation Date,அடுத்த தேய்மானம் தேதி
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,பணியாளர் ஒன்றுக்கு நடவடிக்கை செலவு
 DocType: Accounts Settings,Settings for Accounts,கணக்குகளைத் அமைப்புகள்
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +626,Supplier Invoice No exists in Purchase Invoice {0},சப்ளையர் விலைப்பட்டியல் இல்லை கொள்முதல் விலைப்பட்டியல் உள்ளது {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +629,Supplier Invoice No exists in Purchase Invoice {0},சப்ளையர் விலைப்பட்டியல் இல்லை கொள்முதல் விலைப்பட்டியல் உள்ளது {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,விற்பனை நபர் மரம் நிர்வகி .
 DocType: Job Applicant,Cover Letter,முகப்பு கடிதம்
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,மிகச்சிறந்த காசோலைகள் மற்றும் அழிக்க வைப்பு
 DocType: Item,Synced With Hub,ஹப் ஒத்திசைய
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,தவறான கடவுச்சொல்
 DocType: Item,Variant Of,மாறுபாடு
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,Completed Qty can not be greater than 'Qty to Manufacture',அது 'அளவு உற்பத்தி செய்ய' நிறைவு அளவு அதிகமாக இருக்க முடியாது
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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 +86,Circular Reference Error,வட்ட குறிப்பு பிழை
@@ -335,15 +340,16 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,தானியங்கி பொருள் கோரிக்கை உருவாக்கம் மின்னஞ்சல் மூலம் தெரிவிக்க
 DocType: Journal Entry,Multi Currency,பல நாணய
 DocType: Payment Reconciliation Invoice,Invoice Type,விலைப்பட்டியல் வகை
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +806,Delivery Note,டெலிவரி குறிப்பு
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +800,Delivery Note,டெலிவரி குறிப்பு
 apps/erpnext/erpnext/config/learn.py +87,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 +233,Payment Entry has been modified after you pulled it. Please pull it again.,நீங்கள் அதை இழுத்து பின்னர் கொடுப்பனவு நுழைவு மாற்றப்பட்டுள்ளது. மீண்டும் அதை இழுக்க கொள்ளவும்.
+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/setup/doctype/email_digest/email_digest.py +104,Summary for this week and pending activities,இந்த வாரம் மற்றும் நிலுவையில் நடவடிக்கைகள் சுருக்கம்
+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","பிரிக்கப்பட்ட மின்னஞ்சல் ஐடியை உள்ளிடுக, விலைப்பட்டியல் குறிப்பிட்ட தேதியில் தானாக அஞ்சலிடப்படும்"
 DocType: Employee,Company Email,நிறுவனத்தின் மின்னஞ்சல்
@@ -355,28 +361,29 @@
 apps/erpnext/erpnext/config/hr.py +186,"Employee designation (e.g. CEO, Director etc.).","பணியாளர் பதவி ( எ.கா., தலைமை நிர்வாக அதிகாரி , இயக்குனர் முதலியன) ."
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,துறையில் மதிப்பு ' மாதம் நாளில் பூசை ' உள்ளிடவும்
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,விகிதம் இது வாடிக்கையாளர் நாணயத்தின் வாடிக்கையாளர் அடிப்படை நாணய மாற்றப்படும்
-apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},ரோ # {0}: கொள்முதல் விலைப்பட்டியல் இருக்கும் சொத்துடன் எதிராகவும் முடியாது {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +554,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},ரோ # {0}: கொள்முதல் விலைப்பட்டியல் இருக்கும் சொத்துடன் எதிராகவும் முடியாது {1}
 DocType: Item Tax,Tax Rate,வரி விகிதம்
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} ஏற்கனவே பணியாளர் ஒதுக்கப்பட்ட {1} காலம் {2} க்கான {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +812,Select Item,உருப்படி தேர்வுசெய்க
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +791,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/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,கொள்முதல் விலைப்பட்டியல் {0} ஏற்கனவே சமர்ப்பிக்கப்பட்ட
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},ரோ # {0}: கூறு எண் அதே இருக்க வேண்டும் {1} {2}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +143,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.,ஒரு பொருள் ஒரு தொகுதி (நிறைய).
 DocType: C-Form Invoice Detail,Invoice Date,விலைப்பட்டியல் தேதி
 DocType: GL Entry,Debit Amount,பற்று தொகை
 apps/erpnext/erpnext/accounts/party.py +242,There can only be 1 Account per Company in {0} {1},மட்டுமே கம்பெனி ஒன்றுக்கு 1 கணக்கு இருக்க முடியாது {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +4,Your email address,உங்கள் மின்னஞ்சல் முகவரியை
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +342,Please see attachment,இணைப்பு பார்க்கவும்
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,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 +19,Setup Already Complete!!,அமைப்பு ஏற்கனவே முடிந்து !
 ,Finished Goods,முடிக்கப்பட்ட பொருட்கள்
 DocType: Delivery Note,Instructions,அறிவுறுத்தல்கள்
 DocType: Quality Inspection,Inspected By,மூலம் ஆய்வு
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,சப்ளையர்&gt; சப்ளையர் வகை
 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,பொருட்களை சேர்க்க
@@ -390,29 +397,29 @@
 DocType: Currency Exchange,Currency Exchange,நாணய பரிவர்த்தனை
 DocType: Purchase Invoice Item,Item Name,உருப்படி பெயர்
 DocType: Authorization Rule,Approving User  (above authorized value),(அங்கீகாரம் மதிப்பை மேலே) பயனர் அனுமதி
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,கடன் நிலுவை
+DocType: Email Digest,Credit Balance,கடன் நிலுவை
 DocType: Employee,Widowed,விதவை
 DocType: Request for Quotation,Request for Quotation,விலைப்பட்டியலுக்கான கோரிக்கை
 DocType: Salary Slip Timesheet,Working Hours,வேலை நேரங்கள்
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,ஏற்கனவே தொடரில் தற்போதைய / தொடக்க வரிசை எண் மாற்ற.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","பல விலை விதிகள் நிலவும் தொடர்ந்து இருந்தால், பயனர்கள் முரண்பாட்டை தீர்க்க கைமுறையாக முன்னுரிமை அமைக்க கேட்கப்பட்டது."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +736,Purchase Return,திரும்ப வாங்க
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +715,Purchase Return,திரும்ப வாங்க
 ,Purchase Register,பதிவு வாங்குவதற்கு
 DocType: Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,பிரயோகிக்கப்படும் கட்டணங்கள்
 DocType: Workstation,Consumable Cost,நுகர்வோர் விலை
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +202,{0} ({1}) must have role 'Leave Approver',{0} ({1}) பங்கு வேண்டும் 'விடுப்பு தரப்பில் சாட்சி'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,{0} ({1}) must have role 'Leave Approver',{0} ({1}) பங்கு வேண்டும் 'விடுப்பு தரப்பில் சாட்சி'
 DocType: Purchase Receipt,Vehicle Date,வாகன தேதி
 DocType: Student Log,Medical,மருத்துவம்
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,இழந்து காரணம்
-apps/erpnext/erpnext/accounts/utils.py +239,Allocated amount can not greater than unadjusted amount,ஒதுக்கப்பட்ட தொகை unadjusted அளவு பெரியவனல்லவென்று முடியும்
+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,ஒதுக்கப்பட்ட தொகை unadjusted அளவு பெரியவனல்லவென்று முடியும்
 DocType: Announcement,Receiver,பெறுநர்
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},பணிநிலையம் விடுமுறை பட்டியல் படி பின்வரும் தேதிகளில் மூடப்பட்டுள்ளது {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,வாய்ப்புகள்
 DocType: Employee,Single,ஒற்றை
 DocType: Account,Cost of Goods Sold,விற்கப்படும் பொருட்களின் விலை
 DocType: Purchase Invoice,Yearly,வருடாந்திர
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +225,Please enter Cost Center,செலவு மையம் உள்ளிடவும்
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,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,பரிசோதகர் பெயர்
@@ -425,26 +432,26 @@
 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,காசோலை சப்ளையர் விலைப்பட்டியல் எண் தனித்துவம்
 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 +102,Non Profit,லாபம்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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: Stock Reconciliation Item,Do not include symbols (ex. $),சின்னங்கள் சேர்க்க வேண்டாம் (முன்னாள். $)
 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 +638,Attribute {0} selected multiple times in Attributes Table,கற்பிதம் {0} காரணிகள் அட்டவணை பல முறை தேர்வு
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,கற்பிதம் {0} காரணிகள் அட்டவணை பல முறை தேர்வு
 DocType: HR Settings,Employee record is created using selected field. ,பணியாளர் பதிவு தேர்ந்தெடுக்கப்பட்ட துறையில் பயன்படுத்தி உருவாக்கப்பட்டது.
 DocType: Sales Order,Not Applicable,பொருந்தாது
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,விடுமுறை மாஸ்டர் .
 DocType: Request for Quotation Item,Required Date,தேவையான தேதி
 DocType: Delivery Note,Billing Address,பில்லிங் முகவரி
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +862,Please enter Item Code.,பொருள் கோட் உள்ளிடவும்.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +847,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","தேர்ந்தெடுக்கப்பட்டால், ஏற்கனவே அச்சிடுக விகிதம் / அச்சிடுக தொகை சேர்க்கப்பட்டுள்ளது என, வரி தொகை"
@@ -458,12 +465,12 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,பத்திரங்கள் மற்றும் வைப்பு
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,ஒதுக்கப்பட்ட மொத்த இலைகள் கட்டாயமாகும்
 DocType: Job Opening,Description of a Job Opening,ஒரு வேலை ஆரம்பிப்பு விளக்கம்
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Pending activities for today,இன்று நிலுவையில் நடவடிக்கைகள்
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,இன்று நிலுவையில் நடவடிக்கைகள்
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,வருகை பதிவு.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,டைம் ஷீட் சார்ந்த சம்பளம் சம்பளம் உபகரண.
 DocType: Sales Order Item,Used for Production Plan,உற்பத்தி திட்டத்தை பயன்படுத்திய
 DocType: Manufacturing Settings,Time Between Operations (in mins),(நிமிடங்கள்) செயல்களுக்கு இடையே நேரம்
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +92,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} செலவு மையம் எதிராக கணக்கு {1} பட்ஜெட் {2} ஆகும் {3}. இது தாண்டிவிட {4}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +95,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} செலவு மையம் எதிராக கணக்கு {1} பட்ஜெட் {2} ஆகும் {3}. இது தாண்டிவிட {4}
 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 கள் அதே உருப்படியை இல்லை
@@ -471,16 +478,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +238,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 +86,Administrative Officer,நிர்வாக அதிகாரி
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,நிர்வாக அதிகாரி
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +23,Acutal Qty {0} / Waiting Qty {1},நடைமுறைத்திறன் அளவு {0} / காத்திருக்கிறது அளவு {1}
 DocType: Timesheet Detail,Hrs,மணி
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +319,Please select Company,நிறுவனத்தின் தேர்ந்தெடுக்கவும்
-DocType: Stock Entry,Difference Account,வித்தியாசம் கணக்கு
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +309,Please select Company,நிறுவனத்தின் தேர்ந்தெடுக்கவும்
+DocType: Stock Entry Detail,Difference Account,வித்தியாசம் கணக்கு
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,அதன் சார்ந்து பணி {0} மூடவில்லை நெருக்கமாக பணி அல்ல முடியும்.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Please enter Warehouse for which Material Request will be raised,பொருள் கோரிக்கை எழுப்பப்படும் எந்த கிடங்கு உள்ளிடவும்
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +399,Please enter Warehouse for which Material Request will be raised,பொருள் கோரிக்கை எழுப்பப்படும் எந்த கிடங்கு உள்ளிடவும்
 DocType: Production Order,Additional Operating Cost,கூடுதல் இயக்க செலவு
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,ஒப்பனை
-apps/erpnext/erpnext/stock/doctype/item/item.py +530,"To merge, following properties must be same for both items","ஒன்றாக்க , பின்வரும் பண்புகளை இரு பொருட்களை சமமாக இருக்க வேண்டும்"
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,"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 +28,Buy,வாங்க
@@ -488,7 +495,7 @@
 DocType: Sales Invoice,Offline POS Name,ஆஃப்லைன் பிஓஎஸ் பெயர்
 DocType: Sales Order,To Deliver,வழங்க
 DocType: Purchase Invoice Item,Item,உருப்படி
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1563,Serial no item cannot be a fraction,சீரியல் எந்த உருப்படியை ஒரு பகுதியை இருக்க முடியாது
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1587,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,நிர்வாக உப ஒப்பந்தமிடல்
@@ -497,13 +504,14 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Account {0} does not belong to company: {1},கணக்கு {0} நிறுவனத்திற்கு சொந்தமானது இல்லை: {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation already used for another company,சுருக்கமான ஏற்கனவே மற்றொரு நிறுவனம் பயன்படுத்தப்படும்
 DocType: Selling Settings,Default Customer Group,முன்னிருப்பு வாடிக்கையாளர் பிரிவு
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Supplier is required against Payable account {0},சப்ளையர் செலுத்த வேண்டிய கணக்கு எதிராக தேவைப்படுகிறது {0}
 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 இருக்க முடியாது
 DocType: Production Planning Tool,Material Requirement,பொருள் தேவை
 DocType: Company,Delete Company Transactions,நிறுவனத்தின் பரிவர்த்தனைகள் நீக்கு
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +313,Reference No and Reference Date is mandatory for Bank transaction,குறிப்பு இல்லை மற்றும் பரிந்துரை தேதி வங்கி பரிவர்த்தனை அத்தியாவசியமானதாகும்
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +316,Reference No and Reference Date is mandatory for Bank transaction,குறிப்பு இல்லை மற்றும் பரிந்துரை தேதி வங்கி பரிவர்த்தனை அத்தியாவசியமானதாகும்
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,வரிகள் மற்றும் கட்டணங்கள் சேர்க்க / திருத்தவும்
 DocType: Purchase Invoice,Supplier Invoice No,வழங்குபவர் விலைப்பட்டியல் இல்லை
 DocType: Territory,For reference,குறிப்பிற்கு
@@ -514,7 +522,6 @@
 DocType: Installation Note Item,Installation Note Item,நிறுவல் குறிப்பு பொருள்
 DocType: Production Plan Item,Pending Qty,நிலுவையில் அளவு
 DocType: Budget,Ignore,புறக்கணி
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,பொருள் குறியீடு&gt; பொருள் குழு&gt; பிராண்ட்
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,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,சம்பளம் ஸ்லிப் டைம் ஷீட்
@@ -525,11 +532,11 @@
 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/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,விலைப்பட்டியல் அட்டவணை காணப்படவில்லை பதிவுகள்
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +28,Please select Company and Party Type first,முதல் நிறுவனம் மற்றும் கட்சி வகை தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/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/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 +707,Make Sales Order,செய்ய விற்பனை ஆணை
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +701,Make Sales Order,செய்ய விற்பனை ஆணை
 DocType: Project Task,Project Task,திட்ட பணி
 ,Lead Id,முன்னணி ஐடி
 DocType: C-Form Invoice Detail,Grand Total,ஆக மொத்தம்
@@ -545,7 +552,8 @@
 DocType: Job Applicant,Resume Attachment,துவைக்கும் இயந்திரம் இணைப்பு
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,மீண்டும் வாடிக்கையாளர்கள்
 DocType: Leave Control Panel,Allocate,நிர்ணயி
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +734,Sales Return,விற்பனை Return
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +728,Sales Return,விற்பனை Return
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +91,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,குறிப்பு: மொத்த ஒதுக்கீடு இலைகள் {0} ஏற்கனவே ஒப்புதல் இலைகள் குறைவாக இருக்க கூடாது {1} காலம்
 DocType: Announcement,Posted By,பதிவிட்டவர்
 DocType: Item,Delivered by Supplier (Drop Ship),சப்ளையர் மூலம் வழங்கப்படுகிறது (டிராப் கப்பல்)
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,வாடிக்கையாளர்கள் பற்றிய தகவல்.
@@ -554,14 +562,13 @@
 DocType: Quotation,Quotation To,என்று மேற்கோள்
 DocType: Lead,Middle Income,நடுத்தர வருமானம்
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +212,Opening (Cr),துவாரம் ( CR)
-apps/erpnext/erpnext/stock/doctype/item/item.py +795,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"நீங்கள் ஏற்கனவே மற்றொரு UOM சில பரிவர்த்தனை (ங்கள்) செய்துவிட்டேன் ஏனெனில் பொருள் நடவடிக்கையாக, இயல்புநிலை பிரிவு {0} நேரடியாக மாற்ற முடியாது. நீங்கள் வேறு ஒரு இயல்புநிலை UOM பயன்படுத்த ஒரு புதிய பொருள் உருவாக்க வேண்டும்."
-apps/erpnext/erpnext/accounts/utils.py +237,Allocated amount can not be negative,ஒதுக்கப்பட்ட தொகை எதிர்மறை இருக்க முடியாது
+apps/erpnext/erpnext/stock/doctype/item/item.py +797,Default Unit of Measure for Item {0} cannot be changed directly because 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,ஒதுக்கப்பட்ட தொகை எதிர்மறை இருக்க முடியாது
 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 +91,Reference No & Reference Date is required for {0},குறிப்பு இல்லை & பரிந்துரை தேதி தேவைப்படுகிறது {0}
-DocType: Sales Invoice,Customer's Vendor,வாடிக்கையாளர் விற்பனையாளர்
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Proposal Writing,மானசாவுடன்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,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","துணை ஒப்பந்த பொருள் கோரிக்கைகள் சேர்க்கப்படும் என்று பொருட்களை தேர்ந்தெடுக்கப்பட்டால், மூலப்பொருட்கள்"
@@ -570,13 +577,14 @@
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,நேரம் கண்காணிப்பு
 DocType: Fiscal Year Company,Fiscal Year Company,நிதியாண்டு நிறுவனத்தின்
 DocType: Packing Slip Item,DN Detail,DN விரிவாக
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +257,Already supplier quotation has created,ஏற்கனவே சப்ளையர் மேற்கோள் ஏற்படுத்தியுள்ளது
 DocType: Timesheet,Billed,கட்டணம்
 DocType: Batch,Batch Description,தொகுதி விளக்கம்
+apps/erpnext/erpnext/accounts/utils.py +685,"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 +733,View Offline Records,ஆஃப்லைன் ரெக்கார்ட்ஸ்
+apps/erpnext/erpnext/accounts/page/pos/pos.js +715,View Offline Records,ஆஃப்லைன் ரெக்கார்ட்ஸ்
+DocType: Student,Sibling Details,உடன்பிறந்தோர் விபரங்கள்
 DocType: Employee,Reason for Resignation,ராஜினாமாவுக்கான காரணம்
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,செயல்பாடு மதிப்பீடு டெம்ப்ளேட் .
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,விலைப்பட்டியல் / பத்திரிகை நுழைவு விவரம்
@@ -590,7 +598,7 @@
 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,சரக்கு நிகர மாற்றம்
 DocType: Employee,Passport Number,பாஸ்போர்ட் எண்
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Manager,மேலாளர்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,மேலாளர்
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,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,'அடிப்படையாக கொண்டு ' மற்றும் ' குழு மூலம் ' அதே இருக்க முடியாது
@@ -599,10 +607,11 @@
 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 +299,Timesheet created:,டைம் ஷீட் உருவாக்கப்பட்ட:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +715,Please set default Cash or Bank account in Mode of Payment {0},கொடுப்பனவு முறையில் இயல்புநிலை பண அல்லது வங்கி கணக்கு அமைக்கவும் {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +300,Timesheet created:,டைம் ஷீட் உருவாக்கப்பட்ட:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +772,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,பதிவுசெய்யவும்
 DocType: Selling Settings,Customer Naming By,மூலம் பெயரிடுதல் வாடிக்கையாளர்
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,அமைவு பணியாளர் மனித வள கணினி பெயரிடும்&gt; மனிதவள அமைப்புகள்
 DocType: Depreciation Schedule,Depreciation Amount,தேய்மானம் தொகை
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,குழு மாற்ற
 DocType: Activity Cost,Activity Type,நடவடிக்கை வகை
@@ -627,6 +636,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,பினிஷ்
 DocType: Pricing Rule,Sales Manager,விற்பனை மேலாளர்
 DocType: Salary Structure Employee,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,சொத்துக்களை மீது லாபம் / நஷ்டம் கணக்கு
@@ -641,11 +651,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +9,Pre Sales,முன் விற்பனை
 DocType: Purchase Receipt,Other Details,மற்ற விவரங்கள்
 DocType: Account,Accounts,கணக்குகள்
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Marketing,மார்கெட்டிங்
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +227,Payment Entry is already created,கொடுப்பனவு நுழைவு ஏற்கனவே உருவாக்கப்பட்ட
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,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 +538,Row #{0}: Asset {1} does not linked to Item {2},ரோ # {0}: சொத்து {1} பொருள் இணைக்கப்பட்ட இல்லை {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +21,Preview Salary Slip,முன்னோட்டம் சம்பளம் ஸ்லிப்
+apps/erpnext/erpnext/controllers/accounts_controller.py +541,Row #{0}: Asset {1} does not linked to Item {2},ரோ # {0}: சொத்து {1} பொருள் இணைக்கப்பட்ட இல்லை {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +38,Preview Salary Slip,முன்னோட்டம் சம்பளம் ஸ்லிப்
 DocType: Company,Deafult Cost Center,Deafult செலவு மையம்
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +48,Account {0} has been entered multiple times,கணக்கு {0} பல முறை உள்ளிட்ட வருகிறது
 DocType: Account,Expenses Included In Valuation,செலவுகள் மதிப்பீட்டு சேர்க்கப்பட்டுள்ளது
@@ -654,7 +664,7 @@
 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 +617,Item has variants.,பொருள் வகைகள் உண்டு.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,பொருள் வகைகள் உண்டு.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,பொருள் {0} இல்லை
 DocType: Bin,Stock Value,பங்கு மதிப்பு
 apps/erpnext/erpnext/accounts/doctype/account/account.py +25,Company {0} does not exist,நிறுவனத்தின் {0} இல்லை
@@ -674,7 +684,7 @@
 DocType: Purchase Order,Supply Raw Materials,வழங்கல் மூலப்பொருட்கள்
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,அடுத்து விலைப்பட்டியல் உருவாக்கப்படும் எந்த தேதி. அதை சமர்ப்பிக்க உருவாக்கப்படும்.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,நடப்பு சொத்துக்கள்
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,{0} is not a stock Item,{0} ஒரு பங்கு பொருள் அல்ல
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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 +169,Lead must be set if Opportunity is made from Lead,வாய்ப்பு முன்னணி தயாரிக்கப்படுகிறது என்றால் முன்னணி அமைக்க வேண்டும்
@@ -760,26 +770,25 @@
 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 +709,No Permission,இல்லை அனுமதி
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +710,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}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +298,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 +542,Row #{0}: Asset {1} must be submitted,ரோ # {0}: சொத்து {1} சமர்ப்பிக்க வேண்டும்
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,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 வழியாக பங்கு சமநிலை பதிவேற்றலாம்.
 DocType: Warehouse,Tree Details,மரம் விபரங்கள்
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,இப்போது அனுப்பவும்
 ,Support Analytics,ஆதரவு ஆய்வு
 DocType: Item,Website Warehouse,இணைய கிடங்கு
 DocType: Payment Reconciliation,Minimum Invoice Amount,குறைந்தபட்ச விலைப்பட்டியல் அளவு
 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/sales_invoice/sales_invoice.py +227,Timesheet {0} is already completed or cancelled,டைம் ஷீட் {0} ஏற்கனவே நிறைவு அல்லது ரத்து செய்யப்பட்டது
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +259,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 சமமாக இருக்க வேண்டும்
@@ -795,13 +804,13 @@
 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 +229,Target Warehouse,இலக்கு கிடங்கு
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +230,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-,STE-
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Sales Order Date,எதிர்பார்க்கப்படுகிறது பிரசவ தேதி முன் விற்பனை ஆணை தேதி இருக்க முடியாது
 DocType: Upload Attendance,Import Attendance,இறக்குமதி பங்கேற்கும்
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,அனைத்து பொருள் குழுக்கள்
+apps/erpnext/erpnext/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/config/setup.py +89,Automatically compose message on submission of transactions.,தானாக நடவடிக்கைகள் சமர்ப்பிப்பு செய்தி உருவாக்கும் .
@@ -813,13 +822,15 @@
 DocType: Sales Invoice,Payment Due Date,கொடுப்பனவு காரணமாக தேதி
 apps/erpnext/erpnext/stock/doctype/item/item.js +278,Item Variant {0} already exists with same attributes,பொருள் மாற்று {0} ஏற்கனவே அதே பண்புகளை கொண்ட உள்ளது
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;திறந்து&#39;
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,செய்ய திறந்த
 DocType: Notification Control,Delivery Note Message,டெலிவரி குறிப்பு செய்தி
 DocType: Expense Claim,Expenses,செலவுகள்
 DocType: Item Variant Attribute,Item Variant Attribute,பொருள் மாற்று கற்பிதம்
 ,Purchase Receipt Trends,ரிசிப்ட் போக்குகள் வாங்குவதற்கு
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Research & Development,ஆராய்ச்சி மற்றும் அபிவிருத்தி
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,ஆராய்ச்சி மற்றும் அபிவிருத்தி
 ,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,விலை அல்லது தள்ளுபடி
@@ -828,7 +839,7 @@
 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/controllers/accounts_controller.py +340,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","கொடுப்பனவு நுழைவு {0} ஆணை {1}, அது இந்த விலைப்பட்டியல் முன்பணமாக இழுத்து வேண்டும் என்றால் சரிபார்க்க இணைக்கப்பட்டுள்ளது."
+apps/erpnext/erpnext/controllers/accounts_controller.py +343,"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,புள்ளி விற்பனை
@@ -850,12 +861,12 @@
 DocType: Supplier Quotation,Is Subcontracted,உள்குத்தகை
 DocType: Item Attribute,Item Attribute Values,பொருள் பண்புக்கூறு கலாச்சாரம்
 DocType: Examination Result,Examination Result,தேர்வு முடிவு
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +756,Purchase Receipt,ரசீது வாங்க
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +735,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 +167,Reference Doctype must be one of {0},குறிப்பு டாக்டைப் ஒன்றாக இருக்க வேண்டும் {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +282,Unable to find Time Slot in the next {0} days for Operation {1},ஆபரேஷன் அடுத்த {0} நாட்கள் நேரத்தில் கண்டுபிடிக்க முடியவில்லை {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +170,Reference Doctype must be one of {0},குறிப்பு டாக்டைப் ஒன்றாக இருக்க வேண்டும் {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Unable to find Time Slot in the next {0} days for Operation {1},ஆபரேஷன் அடுத்த {0} நாட்கள் நேரத்தில் கண்டுபிடிக்க முடியவில்லை {1}
 DocType: Production Order,Plan material for sub-assemblies,துணை கூட்டங்கள் திட்டம் பொருள்
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,விற்பனை பங்குதாரர்கள் மற்றும் பிரதேச
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be active,BOM {0} செயலில் இருக்க வேண்டும்
@@ -866,7 +877,7 @@
 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 +214,Warehouses with existing transaction can not be converted to ledger.,தற்போதுள்ள பரிவர்த்தனை கிடங்குகள் பேரேடு மாற்றப்பட முடியாது.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +217,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,தயாரிப்பு ஆணைகள்
@@ -880,9 +891,9 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,பணியாளர் {0} செயலில் இல்லை அல்லது இல்லை
 DocType: Fee Structure,Components,கூறுகள்
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,Please enter Asset Category in Item {0},தயவு செய்து பொருள் உள்ள சொத்து வகை நுழைய {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +612,Item Variants {0} updated,பொருள் மாறிகள் {0} மேம்படுத்தப்பட்டது
+apps/erpnext/erpnext/stock/doctype/item/item.py +614,Item Variants {0} updated,பொருள் மாறிகள் {0} மேம்படுத்தப்பட்டது
 DocType: Quality Inspection Reading,Reading 6,6 படித்தல்
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +843,Cannot {0} {1} {2} without any negative outstanding invoice,இல்லை {0} {1} {2} இல்லாமல் எந்த எதிர்மறை நிலுவையில் விலைப்பட்டியல் Can
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +854,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,இப்போது ஒத்திசை
@@ -897,69 +908,72 @@
 DocType: Item,Is Purchase Item,கொள்முதல் உருப்படி உள்ளது
 DocType: Asset,Purchase Invoice,விலைப்பட்டியல் கொள்வனவு
 DocType: Stock Ledger Entry,Voucher Detail No,ரசீது விரிவாக இல்லை
-apps/erpnext/erpnext/accounts/page/pos/pos.js +728,New Sales Invoice,புதிய விற்பனை விலைப்பட்டியல்
+apps/erpnext/erpnext/accounts/page/pos/pos.js +710,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 +728,Sync Offline Invoices,ஒத்திசைவு ஆஃப்லைன் பொருள்
 DocType: Payment Request,Paid,Paid
 DocType: Program Fee,Program Fee,திட்டம் கட்டணம்
 DocType: Salary Slip,Total in words,வார்த்தைகளில் மொத்த
 DocType: Material Request Item,Lead Time Date,நேரம் தேதி இட்டு
 DocType: Guardian,Guardian Name,பாதுகாவலர் பெயர்
 DocType: Cheque Print Template,Has Print Format,அச்சு வடிவம்
-apps/erpnext/erpnext/accounts/page/pos/pos.js +86, is mandatory. Maybe Currency Exchange record is not created for ,இது கட்டாயமாகும். ஒருவேளை இதற்கான பணப்பரிமாற்றப் பதிவு உருவாக்கபடவில்லை
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +109,Row #{0}: Please specify Serial No for Item {1},ரோ # {0}: பொருள் சீரியல் இல்லை குறிப்பிடவும் {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +619,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","&#39;தயாரிப்பு மூட்டை&#39; பொருட்களை, சேமிப்புக் கிடங்கு, தொ.எ. மற்றும் தொகுதி இல்லை &#39;பேக்கிங்கை பட்டியலில் மேஜையிலிருந்து கருதப்படுகிறது. கிடங்கு மற்றும் தொகுதி இல்லை எந்த &#39;தயாரிப்பு மூட்டை&#39; உருப்படியை அனைத்து பொதி பொருட்களை அதே இருந்தால், அந்த மதிப்புகள் முக்கிய பொருள் அட்டவணை உள்ளிட்ட முடியும், மதிப்புகள் மேஜை &#39;&#39; பட்டியல் பொதி &#39;நகலெடுக்கப்படும்."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +75, 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 +613,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing 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 +606,Supplier Invoice Date cannot be greater than Posting Date,சப்ளையர் விவரப்பட்டியல் தேதி பதிவுசெய்ய தேதி விட அதிகமாக இருக்க முடியாது
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +609,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: 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 +810,Select Item for Transfer,மாற்றம் உருப்படி தேர்வுசெய்க
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +789,Select Item for Transfer,மாற்றம் உருப்படி தேர்வுசெய்க
 DocType: Purchase Invoice,Additional Discount Percentage,கூடுதல் தள்ளுபடி சதவீதம்
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,அனைத்து உதவி வீடியோக்களை பட்டியலை காண்க
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,காசோலை டெபாசிட் அங்கு வங்கி கணக்கு தலைவர் தேர்வு.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,பயனர் நடவடிக்கைகளில் விலை பட்டியல் விகிதம் திருத்த அனுமதி
 DocType: Pricing Rule,Max Qty,மேக்ஸ் அளவு
-DocType: Student Applicant,Father's Name,தந்தையின் பெயர்
 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 +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,ரோ {0}: விற்பனை / கொள்முதல் ஆணை எதிரான கொடுப்பனவு எப்போதும் முன்கூட்டியே குறித்தது வேண்டும்
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,இரசாயன
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +686,All items have already been transferred for this Production Order.,அனைத்து பொருட்களும் ஏற்கனவே இந்த உத்தரவு க்கு மாற்றப்பட்டது.
+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} மீண்டும் முயற்சி
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +694,All items have already been transferred for this Production Order.,அனைத்து பொருட்களும் ஏற்கனவே இந்த உத்தரவு க்கு மாற்றப்பட்டது.
 DocType: Process Payroll,Select Payroll Year and Month,சம்பளப்பட்டியல் ஆண்டு மற்றும் மாத தேர்ந்தெடுக்கவும்
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,Meter,மீட்டர்
 DocType: Workstation,Electricity Cost,மின்சார செலவு
 DocType: HR Settings,Don't send Employee Birthday Reminders,பணியாளர் நினைவூட்டல்கள் அனுப்ப வேண்டாம்
-DocType: Opportunity,Walk In,ல் நடக்க
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,பங்கு பதிவுகள்
 DocType: Item,Inspection Criteria,ஆய்வு வரையறைகள்
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,மாற்றப்பட்டால்
 apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,உங்கள் கடிதம் தலை மற்றும் சின்னம் பதிவேற்ற. (நீங்கள் பின்னர் அவர்களை திருத்த முடியும்).
 DocType: Timesheet Detail,Bill,ரசீது
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,White,வெள்ளை
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date is entered as past date,அடுத்த தேய்மானம் தேதி கடந்த தேதி உள்ளிட்ட வருகிறது
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +167,White,வெள்ளை
 DocType: SMS Center,All Lead (Open),அனைத்து முன்னணி (திறந்த)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +228,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),ரோ {0}: அளவு கிடைக்கவில்லை {4} கிடங்கில் {1} நுழைவு நேரம் வெளியிடும் ({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}),ரோ {0}: அளவு கிடைக்கவில்லை {4} கிடங்கில் {1} நுழைவு நேரம் வெளியிடும் ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,கட்டண முன்னேற்றங்கள் கிடைக்கும்
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +731,Make ,செய்ய
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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 +154,Order Type must be one of {0},ஒழுங்கு வகை ஒன்றாக இருக்க வேண்டும் {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},ஒழுங்கு வகை ஒன்றாக இருக்க வேண்டும் {0}
 DocType: Lead,Next Contact Date,அடுத்த தொடர்பு தேதி
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,திறந்து அளவு
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +393,Please enter Account for Change Amount,தயவு செய்து தொகை மாற்றத்தைக் கணக்கில் நுழைய
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,Please enter Account for Change Amount,தயவு செய்து தொகை மாற்றத்தைக் கணக்கில் நுழைய
 DocType: Student Batch,Student Batch Name,மாணவர் தொகுதி பெயர்
 DocType: Holiday List,Holiday List Name,விடுமுறை பட்டியல் பெயர்
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js +8,Schedule Course,அட்டவணை பாடநெறி
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Stock Options,ஸ்டாக் ஆப்ஷன்ஸ்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,ஸ்டாக் ஆப்ஷன்ஸ்
 DocType: Journal Entry Account,Expense Claim,இழப்பில் கோரிக்கை
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +211,Do you really want to restore this scrapped asset?,நீங்கள் உண்மையில் இந்த முறித்துள்ளது சொத்து மீட்க வேண்டும் என்று விரும்புகிறீர்களா?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +237,Qty for {0},ஐந்து அளவு {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +212,Do you really want to restore this scrapped asset?,நீங்கள் உண்மையில் இந்த முறித்துள்ளது சொத்து மீட்க வேண்டும் என்று விரும்புகிறீர்களா?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,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,பிளாக் பட்டியல் தினங்கள் விட்டு
@@ -968,9 +982,9 @@
 DocType: Company,Default Terms,இயல்புநிலை நெறிமுறைகள்
 DocType: Packing Slip Item,Packing Slip Item,ஸ்லிப் பொருள் பொதி
 DocType: Purchase Invoice,Cash/Bank Account,பண / வங்கி கணக்கு
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,அளவு அல்லது மதிப்பு எந்த மாற்றமும் நீக்கப்பட்ட விடயங்கள்.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,அளவு அல்லது மதிப்பு எந்த மாற்றமும் நீக்கப்பட்ட விடயங்கள்.
 DocType: Delivery Note,Delivery To,வழங்கும்
-apps/erpnext/erpnext/stock/doctype/item/item.py +635,Attribute table is mandatory,கற்பிதம் அட்டவணையின் கட்டாயமாகும்
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,கற்பிதம் அட்டவணையின் கட்டாயமாகும்
 DocType: Production Planning Tool,Get Sales Orders,விற்பனை ஆணைகள் கிடைக்கும்
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} எதிர்மறை இருக்க முடியாது
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,ஒரு மாணவர் தேர்ந்தெடுக்கவும்
@@ -995,7 +1009,7 @@
 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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},தொடர் இல {0} வரை பராமரிப்பு ஒப்பந்தத்தின் கீழ் உள்ளது {1}
+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,நிறுவன பெயர்
@@ -1007,7 +1021,7 @@
 DocType: GL Entry,Against,எதிராக
 DocType: Item,Default Selling Cost Center,இயல்புநிலை விற்பனை செலவு மையம்
 DocType: Sales Partner,Implementation Partner,செயல்படுத்தல் வரன்வாழ்க்கை துணை
-apps/erpnext/erpnext/controllers/selling_controller.py +231,Sales Order {0} is {1},விற்பனை ஆணை {0} {1}
+apps/erpnext/erpnext/controllers/selling_controller.py +232,Sales Order {0} is {1},விற்பனை ஆணை {0} {1}
 DocType: Opportunity,Contact Info,தகவல் தொடர்பு
 apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,பங்கு பதிவுகள் செய்தல்
 DocType: Packing Slip,Net Weight UOM,நிகர எடை மொறட்டுவ பல்கலைகழகம்
@@ -1017,25 +1031,24 @@
 DocType: Holiday List,Get Weekly Off Dates,வாராந்திர இனிய தினங்கள் கிடைக்கும்
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,முடிவு தேதி தொடங்கும் நாள் விட குறைவாக இருக்க முடியாது
 DocType: Sales Person,Select company name first.,முதல் நிறுவனத்தின் பெயரை தேர்ந்தெடுக்கவும்.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Dr,டாக்டர்
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Dr,டாக்டர்
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,மேற்கோள்கள் சப்ளையர்கள் இருந்து பெற்றார்.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},எப்படி {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,சராசரி வயது
 DocType: 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/templates/pages/home.html +32,View All Products,அனைத்து பொருட்கள் காண்க
+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 +400,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,எச்சரிக்கை: முறைமை {0} {1} பூஜ்யம் பொருள் தொகை என்பதால் overbilling பார்க்க மாட்டேன்
+apps/erpnext/erpnext/controllers/accounts_controller.py +403,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/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,ஆண்டு:
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +191,{0} {1} must be submitted,{0} {1} சமர்ப்பிக்க வேண்டும்
-DocType: Email Digest,Annual Expense,வருடாந்த செலவு
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,{0} {1} must be submitted,{0} {1} சமர்ப்பிக்க வேண்டும்
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +145,Quantity must be less than or equal to {0},அளவு குறைவாக அல்லது சமமாக இருக்க வேண்டும் {0}
 DocType: SMS Center,Total Characters,மொத்த எழுத்துகள்
 apps/erpnext/erpnext/controllers/buying_controller.py +156,Please select BOM in BOM field for Item {0},பொருள் BOM துறையில் BOM தேர்ந்தெடுக்கவும் {0}
@@ -1046,30 +1059,31 @@
 DocType: Sales Partner,Distributor,பகிர்கருவி
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,வண்டியில் கப்பல் விதி
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +211,Production Order {0} must be cancelled before cancelling this Sales Order,உத்தரவு {0} இந்த விற்பனை ஆணை ரத்து முன் ரத்து செய்யப்பட வேண்டும்
-apps/erpnext/erpnext/public/js/controllers/transaction.js +62,Please set 'Apply Additional Discount On',அமைக்க மேலும் கூடுதல் தள்ளுபடி விண்ணப்பிக்கவும் &#39;தயவு செய்து
+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,ரேஞ்ச் குறைவாக இருக்க வேண்டும் இருந்து விட வரையறைக்கு
 DocType: Global Defaults,Global Defaults,உலக இயல்புநிலைகளுக்கு
 apps/erpnext/erpnext/projects/doctype/project/project.py +153,Project Collaboration Invitation,திட்ட கூட்டு அழைப்பிதழ்
 DocType: Salary Slip,Deductions,கழிவுகளுக்கு
+DocType: Leave Allocation,LAL/,லால் /
 apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,தொடக்க ஆண்டு
 DocType: Purchase Invoice,Start date of current invoice's period,தற்போதைய விலைப்பட்டியல் நேரத்தில் தேதி தொடங்கும்
 DocType: Salary Slip,Leave Without Pay,சம்பளமில்லா விடுப்பு
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +327,Capacity Planning Error,கொள்ளளவு திட்டமிடுதல் பிழை
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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 +362,Finished Item {0} must be entered for Manufacture type entry,முடிந்தது பொருள் {0} உற்பத்தி வகை நுழைவு உள்ளிட்ட
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +367,Finished Item {0} must be entered for Manufacture type entry,முடிந்தது பொருள் {0} உற்பத்தி வகை நுழைவு உள்ளிட்ட
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,திறந்து கணக்கு இருப்பு
 DocType: Sales Invoice Advance,Sales Invoice Advance,விற்பனை விலைப்பட்டியல் முன்பணம்
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +499,Nothing to request,கேட்டு எதுவும்
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +500,Nothing to request,கேட்டு எதுவும்
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',' உண்மையான தொடக்க தேதி ' உண்மையான முடிவு தேதி' யை விட அதிகமாக இருக்க முடியாது
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Management,மேலாண்மை
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},பற்று அல்லது கடன் அளவு ஒன்று தேவை {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,மேலாண்மை
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +55,Either debit or credit amount is required for {0},பற்று அல்லது கடன் அளவு ஒன்று தேவை {0}
 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 +161,Blue,ப்ளூ
+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,மின்னஞ்சல் ஐடி அமைக்கவும்
@@ -1079,12 +1093,12 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +23,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/accounts/page/pos/pos.js +1374,Do you really want to submit the invoice?,நீங்கள் உண்மையில் விலைப்பட்டியல் சமர்ப்பிக்க வேண்டும் என்று விரும்புகிறீர்களா?
+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 +685,Cost Center For Item with Item Code ','பொருள் கோட் பொருள் சென்டர் செலவாகும்
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1526,"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 +679,Cost Center For Item with Item Code ','பொருள் கோட் பொருள் சென்டர் செலவாகும்
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1550,"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 +26,"Further accounts can be made under Groups, but entries can be made against non-Groups","மேலும் கணக்குகளை குழுக்கள் கீழ் செய்யப்பட்ட, ஆனால் உள்ளீடுகளை அல்லாத குழுக்கள் எதிராகவும் முடியும்"
 DocType: Lead,Lead,தலைமை
@@ -1104,104 +1118,106 @@
 DocType: Payment Reconciliation,Unreconciled Payment Details,ஒப்புரவாகவேயில்லை கொடுப்பனவு விபரங்கள்
 DocType: Global Defaults,Current Fiscal Year,தற்போதைய நிதியாண்டு
 DocType: Global Defaults,Disable Rounded Total,வட்டமான மொத்த முடக்கு
-DocType: Lead,Call,அழைப்பு
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +417,'Entries' cannot be empty,' பதிவுகள் ' காலியாக இருக்க முடியாது
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +418,'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 +214,Fiscal Year {0} not found,நிதியாண்டு {0} காணவில்லை
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +221,Fiscal Year {0} not found,நிதியாண்டு {0} காணவில்லை
 apps/erpnext/erpnext/config/hr.py +238,Setting up Employees,ஊழியர் அமைத்தல்
 DocType: Sales Order,SO-,அதனால்-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,முதல் முன்னொட்டு தேர்வு செய்க
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Please select prefix first,முதல் முன்னொட்டு தேர்வு செய்க
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Research,ஆராய்ச்சி
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,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 +43,Item {0} must be a non-stock item,பொருள் {0} ஒரு பங்கற்ற பொருளாக இருக்க வேண்டும்
 DocType: Contact,User ID,பயனர் ஐடி
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +57,View Ledger,காட்சி லெட்ஜர்
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,மிகமுந்திய
-apps/erpnext/erpnext/stock/doctype/item/item.py +504,"An Item Group exists with same name, please change the item name or rename the item group","ஒரு உருப்படி குழு அதே பெயரில் , உருப்படி பெயர் மாற்ற அல்லது உருப்படியை குழு பெயர்மாற்றம் செய்க"
+apps/erpnext/erpnext/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 +437,Rest Of The World,உலகம் முழுவதும்
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,பொருள் {0} பணி முடியாது
 ,Budget Variance Report,வரவு செலவு வேறுபாடு அறிக்கை
 DocType: Salary Slip,Gross Pay,ஒட்டு மொத்த ஊதியம் / சம்பளம்
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +90,Row {0}: Activity Type is mandatory.,ரோ {0}: நடவடிக்கை வகை கட்டாயமாகும்.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +114,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/public/js/controllers/stock_controller.js +40,Accounting Ledger,பைனான்ஸ் லெட்ஜர்
+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,தக்க வருவாய்
 DocType: BOM Item,Item Description,உருப்படி விளக்கம்
+DocType: Student Sibling,Student Sibling,மாணவர் உடன்பிறந்தோர்
 DocType: Purchase Invoice,Is Recurring,மீண்டும் மீண்டும்
 DocType: Purchase Invoice,Supplied Items,வழங்கப்பட்ட பொருட்கள்
 DocType: Student,STUD.,மூளைச்சாவு.
 DocType: Production Order,Qty To Manufacture,உற்பத்தி அளவு
+DocType: Email Digest,New Income,புதிய வரவு
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,கொள்முதல் சுழற்சி முழுவதும் ஒரே விகிதத்தை பராமரிக்க
 DocType: Opportunity Item,Opportunity Item,வாய்ப்பு தகவல்கள்
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,தற்காலிக திறப்பு
 ,Employee Leave Balance,பணியாளர் விடுப்பு இருப்பு
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +131,Balance for Account {0} must always be {1},{0} எப்போதும் இருக்க வேண்டும் கணக்கு இருப்பு {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +175,Valuation Rate required for Item in row {0},மதிப்பீட்டு மதிப்பீடு வரிசையில் பொருள் தேவையான {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,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,உதாரணம்: கணினி அறிவியல் முதுநிலை
 DocType: Purchase Invoice,Rejected Warehouse,நிராகரிக்கப்பட்டது கிடங்கு
 DocType: GL Entry,Against Voucher,வவுச்சர் எதிராக
 DocType: Item,Default Buying Cost Center,இயல்புநிலை வாங்குதல் செலவு மையம்
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","ERPNext சிறந்த வெளியே, நாங்கள் உங்களுக்கு சில நேரம் இந்த உதவி வீடியோக்களை பார்க்க வேண்டும் என்று பரிந்துரைக்கிறோம்."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +87, to ,அனுப்பு
+apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,அனுப்பு
 DocType: Item,Lead Time in days,நாட்கள் முன்னணி நேரம்
 ,Accounts Payable Summary,செலுத்தத்தக்க கணக்குகள் சுருக்கம்
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Not authorized to edit frozen Account {0},உறைந்த கணக்கு திருத்த அதிகாரம் இல்லை {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},உறைந்த கணக்கு திருத்த அதிகாரம் இல்லை {0}
 DocType: Journal Entry,Get Outstanding Invoices,சிறந்த பற்றுச்சீட்டுகள் கிடைக்கும்
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +62,Sales Order {0} is not valid,விற்பனை ஆணை {0} தவறானது
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,விற்பனை ஆணை {0} தவறானது
 apps/erpnext/erpnext/setup/doctype/company/company.py +185,"Sorry, companies cannot be merged","மன்னிக்கவும், நிறுவனங்கள் ஒன்றாக்க முடியாது"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +139,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",மொத்த வெளியீடு மாற்றம் / அளவு {0} பொருள் கோரிக்கை {1} \ பொருள் {2} கோரிய அளவு அதிகமாக இருக்கக் கூடாது முடியும் {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Small,சிறிய
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,Small,சிறிய
 DocType: Employee,Employee Number,பணியாளர் எண்
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},வழக்கு எண் (கள்) ஏற்கனவே பயன்பாட்டில் உள்ளது. வழக்கு எண் இருந்து முயற்சி {0}
 ,Invoiced Amount (Exculsive Tax),விலை விவரம் தொகை ( ஒதுக்கி தள்ளும் பண்புடைய வரி )
-DocType: Student Applicant,Mother's / Guardian 1 Email ID,அன்னையர் / கார்டியன் 1 மின்னஞ்சல் ஐடி
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,பொருள் 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,கணக்கு தலையில் {0} உருவாக்கப்பட்டது
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +160,Green,பச்சை
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,பச்சை
 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,மொத்த Achieved
 DocType: Employee,Place of Issue,இந்த இடத்தில்
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Contract,ஒப்பந்த
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,ஒப்பந்த
 DocType: Email Digest,Add Quote,ஆனால் சேர்க்கவும்
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +498,UOM coversion factor required for UOM: {0} in Item: {1},மொறட்டுவ பல்கலைகழகம் தேவையான மொறட்டுவ பல்கலைகழகம் Coversion காரணி: {0} உருப்படியை: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +503,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 +80,Row {0}: Qty is mandatory,ரோ {0}: அளவு கட்டாய ஆகிறது
+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 +737,Sync Master Data,ஒத்திசைவு முதன்மை தரவு
+apps/erpnext/erpnext/accounts/page/pos/pos.js +719,Sync Master Data,ஒத்திசைவு முதன்மை தரவு
 apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,உங்கள் தயாரிப்புகள் அல்லது சேவைகள்
 DocType: Mode of Payment,Mode of Payment,கட்டணம் செலுத்தும் முறை
 apps/erpnext/erpnext/stock/doctype/item/item.py +178,Website Image should be a public file or website URL,இணைய பட ஒரு பொது கோப்பு அல்லது வலைத்தளத்தின் URL இருக்க வேண்டும்
+DocType: Student Applicant,AP,ஆந்திர
 DocType: Purchase Invoice Item,BOM,டெலி
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,இந்த ஒரு ரூட் உருப்படியை குழு மற்றும் திருத்த முடியாது .
+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 +345,"{0}: Employee email not found, hence email not sent","{0}: ஊழியர் மின்னஞ்சல் கிடைக்கவில்லை, எனவே அனுப்பப்படவில்லை மின்னஞ்சலை"
+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,உங்கள் நிறுவனத்தின் முகவரி
 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 +118,"For {0}, only credit accounts can be linked against another debit entry",{0} மட்டுமே கடன் கணக்குகள் மற்றொரு பற்று நுழைவு எதிராக இணைக்கப்பட்ட ஐந்து
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Delivery Note {0} is not submitted,டெலிவரி குறிப்பு {0} சமர்ப்பிக்க
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Delivery Note {0} is not submitted,டெலிவரி குறிப்பு {0} சமர்ப்பிக்க
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Sub-contracted Item,பொருள் {0} ஒரு துணை ஒப்பந்தம் பொருள் இருக்க வேண்டும்
 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,விற்பனையாளர் வலைத்தளம்
 DocType: Item,ITEM-,ITEM-
-apps/erpnext/erpnext/controllers/selling_controller.py +147,Total allocated percentage for sales team should be 100,விற்பனை குழு மொத்த ஒதுக்கீடு சதவீதம் 100 இருக்க வேண்டும்
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +110,Production Order status is {0},உற்பத்தி ஒழுங்கு நிலை ஆகிறது {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,விற்பனை குழு மொத்த ஒதுக்கீடு சதவீதம் 100 இருக்க வேண்டும்
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},உற்பத்தி ஒழுங்கு நிலை ஆகிறது {0}
 DocType: Appraisal Goal,Goal,இலக்கு
 DocType: Sales Invoice Item,Edit Description,திருத்த விளக்கம்
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +757,For Supplier,சப்ளையர்
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +723,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,அச்சு வடிவம் உருவாக்கு
@@ -1217,10 +1233,11 @@
 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,தர குறியீடு
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,மின்னஞ்சல் தொகுப்பு:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +445,BOM {0} does not belong to Item {1},BOM {0} பொருள் சேர்ந்தவர்கள் இல்லை {1}
 DocType: Sales Partner,Target Distribution,இலக்கு விநியோகம்
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1667,Deafault warehouse is required for selected item,Deafault கிடங்கில் தேர்ந்தெடுக்கப்பட்ட உருப்படியை தேவை
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Deafault warehouse is required for selected item,Deafault கிடங்கில் தேர்ந்தெடுக்கப்பட்ட உருப்படியை தேவை
 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 படித்தல்
@@ -1229,23 +1246,23 @@
 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 +110,Hardware,வன்பொருள்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,வன்பொருள்
 DocType: Sales Order,Recurring Upto,தொடர் வரை
 DocType: Attendance,HR Manager,அலுவலக மேலாளர்
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,ஒரு நிறுவனத்தின் தேர்ந்தெடுக்கவும்
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Privilege Leave,தனிச்சலுகை விடுப்பு
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,தனிச்சலுகை விடுப்பு
 DocType: Purchase Invoice,Supplier Invoice Date,வழங்குபவர் விலைப்பட்டியல் தேதி
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,வண்டியில் செயல்படுத்த வேண்டும்
 DocType: Payment Entry,Writeoff,Writeoff
 DocType: Appraisal Template Goal,Appraisal Template Goal,மதிப்பீட்டு வார்ப்புரு கோல்
-DocType: Salary Slip,Earning,சம்பாதித்து
+DocType: Salary Component,Earning,சம்பாதித்து
 DocType: Purchase Invoice,Party Account Currency,கட்சி கணக்கு நாணய
 ,BOM Browser,"BOM, உலாவி"
 DocType: Purchase Taxes and Charges,Add or Deduct,சேர்க்க அல்லது கழித்து
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,இடையே காணப்படும் ஒன்றுடன் ஒன்று நிலைமைகள் :
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +171,Against Journal Entry {0} is already adjusted against some other voucher,ஜர்னல் எதிராக நுழைவு {0} ஏற்கனவே வேறு சில ரசீது எதிரான சரிசெய்யப்பட்டது
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,ஜர்னல் எதிராக நுழைவு {0} ஏற்கனவே வேறு சில ரசீது எதிரான சரிசெய்யப்பட்டது
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,மொத்த ஒழுங்கு மதிப்பு
-apps/erpnext/erpnext/demo/setup_data.py +358,Food,உணவு
+apps/erpnext/erpnext/demo/setup/setup_data.py +301,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/course_schedule/course_schedule.js +103,Mark Attendence,மார்க் Attendence
@@ -1279,12 +1296,12 @@
 DocType: Sales Order Item,Planned Quantity,திட்டமிட்ட அளவு
 DocType: Purchase Invoice Item,Item Tax Amount,உருப்படியை வரி தொகை
 DocType: Item,Maintain Stock,பங்கு பராமரிக்கவும்
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +209,Stock Entries already created for Production Order ,ஏற்கனவே உற்பத்தி ஆணை உருவாக்கப்பட்ட பங்கு பதிவுகள்
+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,நிலையான சொத்து நிகர மாற்றம்
 DocType: Leave Control Panel,Leave blank if considered for all designations,அனைத்து வடிவ கருத்தில் இருந்தால் வெறுமையாக
-apps/erpnext/erpnext/controllers/accounts_controller.py +620,Charge of type 'Actual' in row {0} cannot be included in Item Rate,வகை வரிசையில் {0} ல் ' உண்மையான ' பொறுப்பு மதிப்பிட சேர்க்கப்பட்டுள்ளது முடியாது
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,Max: {0},அதிகபட்சம்: {0}
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +15,From Datetime,நாள்நேரம் இருந்து
+apps/erpnext/erpnext/controllers/accounts_controller.py +623,Charge of type 'Actual' in row {0} cannot be included in Item Rate,வகை வரிசையில் {0} ல் ' உண்மையான ' பொறுப்பு மதிப்பிட சேர்க்கப்பட்டுள்ளது முடியாது
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +239,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 +153,"Request for Quotation is disabled to access from portal, for more check portal settings.","விலைப்பட்டியலுக்கான கோரிக்கை மேலும் காசோலை போர்டல் அமைப்புகளை, போர்டல் இருந்து அணுக முடக்கப்பட்டுள்ளது."
@@ -1292,8 +1309,8 @@
 DocType: Sales Invoice,Shipping Address Name,ஷிப்பிங் முகவரி பெயர்
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,கணக்கு விளக்கப்படம்
 DocType: Material Request,Terms and Conditions Content,நிபந்தனைகள் உள்ளடக்கம்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +552,cannot be greater than 100,100 க்கும் அதிகமாக இருக்க முடியாது
-apps/erpnext/erpnext/stock/doctype/item/item.py +680,Item {0} is not a stock Item,பொருள் {0} ஒரு பங்கு பொருள் அல்ல
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +546,cannot be greater than 100,100 க்கும் அதிகமாக இருக்க முடியாது
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is not a stock Item,பொருள் {0} ஒரு பங்கு பொருள் அல்ல
 DocType: Maintenance Visit,Unscheduled,திட்டமிடப்படாத
 DocType: Employee,Owned,சொந்தமானது
 DocType: Salary Detail,Depends on Leave Without Pay,சம்பளமில்லா விடுப்பு பொறுத்தது
@@ -1307,10 +1324,9 @@
 DocType: GL Entry,GL Entry,ஜீ நுழைவு
 DocType: HR Settings,Employee Settings,பணியாளர் அமைப்புகள்
 ,Batch-Wise Balance History,தொகுதி-வைஸ் இருப்பு வரலாறு
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,பட்டியல் செய்ய வேண்டும்
 apps/erpnext/erpnext/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 +61,Apprentice,வேலை கற்க நியமி
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +102,Negative Quantity is not allowed,எதிர்மறை அளவு அனுமதி இல்லை
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,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","ஒரு சரம் போன்ற உருப்படியை மாஸ்டர் இருந்து எடுத்தது இந்த துறையில் சேமிக்கப்படும் வரி விவரம் அட்டவணை.
  வரிகள் மற்றும் கட்டணங்கள் பயன்படுத்திய"
@@ -1332,15 +1348,14 @@
 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 +141,Source warehouse is mandatory for row {0},மூல கிடங்கில் வரிசையில் கட்டாய {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +719,Packing Slip,ஸ்லிப் பொதி
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Source warehouse is mandatory for row {0},மூல கிடங்கில் வரிசையில் கட்டாய {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +713,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/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,மேற்கோள் கோரிக்கை பின்வரும் இணைப்பை கிளிக் செய்வதன் மூலம் அணுக முடியும்
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,இறக்குமதி தோல்வி!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,இல்லை முகவரி இன்னும் கூறினார்.
 DocType: Workstation Working Hour,Workstation Working Hour,பணிநிலையம் வேலை செய்யும் நேரம்
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Analyst,ஆய்வாளர்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,ஆய்வாளர்
 DocType: Item,Inventory,சரக்கு
 DocType: Item,Sales Details,விற்பனை விவரம்
 DocType: Quality Inspection,QI-,QI-
@@ -1348,7 +1363,7 @@
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,அளவு உள்ள
 DocType: Notification Control,Expense Claim Rejected,இழப்பில் கோரிக்கை நிராகரிக்கப்பட்டது
 DocType: Item Attribute,Item Attribute,பொருள் கற்பிதம்
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +103,Government,அரசாங்கம்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,அரசாங்கம்
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,நிறுவனம் பெயர்
 apps/erpnext/erpnext/config/stock.py +289,Item Variants,பொருள் மாறிகள்
 DocType: Company,Services,சேவைகள்
@@ -1364,6 +1379,7 @@
 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/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,முதலீடு இருந்து பண பரிமாற்ற
 DocType: Program Course,Program Course,திட்டம் பாடநெறி
@@ -1404,12 +1420,12 @@
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"ரிசீவர் பட்டியல் காலியாக உள்ளது . பெறுநர் பட்டியலை உருவாக்க , தயவு செய்து"
 DocType: Production Plan Sales Order,Production Plan Sales Order,உற்பத்தி திட்டம் விற்பனை ஆணை
 DocType: Sales Partner,Sales Partner Target,விற்பனை வரன்வாழ்க்கை துணை இலக்கு
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +110,Accounting Entry for {0} can only be made in currency: {1},{0} பைனான்ஸ் உள்நுழைய மட்டும் நாணய முடியும்: {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},{0} பைனான்ஸ் உள்நுழைய மட்டும் நாணய முடியும்: {1}
 DocType: Pricing Rule,Pricing Rule,விலை விதி
 DocType: Budget,Action if Annual Budget Exceeded,அதிரடி ஆண்டு வரவு-செலவுத் மீறிவிட்டது
 apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,ஆணை வாங்க பொருள் வேண்டுதல்
 DocType: Shopping Cart Settings,Payment Success URL,கட்டணம் வெற்றி URL ஐ
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +78,Row # {0}: Returned Item {1} does not exists in {2} {3},ரோ # {0}: திரும்பினார் பொருள் {1} இல்லை நிலவும் {2} {3}
+apps/erpnext/erpnext/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,வங்கி நல்லிணக்க அறிக்கை
@@ -1418,40 +1434,39 @@
 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/stock/doctype/stock_entry/stock_entry.py +339,Not allowed to tranfer more {0} than {1} against Purchase Order {2},மேலும் tranfer அனுமதி இல்லை {0} விட {1} கொள்முதல் ஆணை எதிராக {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +344,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 +545,Manufacturing Quantity is mandatory,உற்பத்தி அளவு கட்டாய ஆகிறது
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,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 +71,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 +162,Row {0}: From Time and To Time of {1} is overlapping with {2},ரோ {0}: நேரம் மற்றும் நேரம் {1} கொண்டு மேலெழும் {2}
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +186,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,பங்கு பொறுப்புகள்
 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 +130,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 +137,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,பிற அறிக்கைகள்
 DocType: Dependent Task,Dependent Task,தங்கிவாழும் பணி
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,அமைவு பணியாளர் மனித வள கணினி பெயரிடும்&gt; மனிதவள அமைப்புகள்
 apps/erpnext/erpnext/stock/doctype/item/item.py +411,Conversion factor for default Unit of Measure must be 1 in row {0},நடவடிக்கை இயல்புநிலை பிரிவு மாற்ற காரணி வரிசையில் 1 வேண்டும் {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,Leave of type {0} cannot be longer than {1},வகை விடுப்பு {0} மேலாக இருக்க முடியாது {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +197,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 +921,Search Item,தேடல் பொருள்
+apps/erpnext/erpnext/accounts/page/pos/pos.js +910,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 +546,Already completed,ஏற்கனவே நிறைவு
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +22,Payment Request already exists {0},பணம் கோரிக்கை ஏற்கனவே உள்ளது {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +550,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 +241,Quantity must not be more than {0},அளவு அதிகமாக இருக்க கூடாது {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Quantity must not be more than {0},அளவு அதிகமாக இருக்க கூடாது {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +76,Previous Financial Year is not closed,முந்தைய நிதி ஆண்டில் மூடவில்லை
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +44,Age (Days),வயது (நாட்கள்)
 DocType: Quotation Item,Quotation Item,மேற்கோள் பொருள்
@@ -1468,7 +1483,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +221,Purchase Receipt {0} is not submitted,கொள்முதல் ரசீது {0} சமர்ப்பிக்க
 DocType: Company,Default Payable Account,இயல்புநிலை செலுத்த வேண்டிய கணக்கு
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","அத்தகைய கப்பல் விதிகள், விலை பட்டியல் முதலியன போன்ற ஆன்லைன் வணிக வண்டி அமைப்புகள்"
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +83,{0}% Billed,{0}% கூறப்பட்டு
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}% கூறப்பட்டு
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,பாதுகாக்கப்பட்டவை அளவு
 DocType: Party Account,Party Account,கட்சி கணக்கு
 apps/erpnext/erpnext/config/setup.py +116,Human Resources,மனித வளங்கள்
@@ -1480,12 +1495,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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 +22,Collect,சேகரிக்க
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,சேகரிக்க
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,Against Supplier Invoice {0} dated {1},வழங்குபவர் எதிராக விலைப்பட்டியல் {0} தேதியிட்ட {1}
 DocType: Customer,Default Price List,முன்னிருப்பு விலை பட்டியல்
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +225,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: Payment Reconciliation,Payments,பணம்
 DocType: Journal Entry,Entry Type,நுழைவு வகை
 ,Customer Credit Balance,வாடிக்கையாளர் கடன் இருப்பு
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Payable,செலுத்தத்தக்க கணக்குகள் நிகர மாற்றம்
@@ -1497,7 +1511,7 @@
 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 +9,Procurement,கொள்முதல்
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,பொருட்களை எதுவும் அளவு அல்லது பெறுமதியில் எந்த மாற்று வேண்டும்.
+apps/erpnext/erpnext/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,உத்தரவாதத்தை கூறுகின்றனர்
 ,Lead Details,விவரம் இட்டு
 DocType: Purchase Invoice,End date of current invoice's period,தற்போதைய விலைப்பட்டியல் நேரத்தில் முடிவு தேதி
@@ -1522,7 +1536,7 @@
 DocType: Purchase Invoice,Additional Discount,கூடுதல் தள்ளுபடி
 DocType: Selling Settings,Selling Settings,அமைப்புகள் விற்பனை
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,ஆன்லைன் ஏலங்களில்
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +97,Please specify either Quantity or Valuation Rate or both,அளவு அல்லது மதிப்பீட்டு விகிதம் அல்லது இரண்டு அல்லது குறிப்பிடவும்
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,அளவு அல்லது மதிப்பீட்டு விகிதம் அல்லது இரண்டு அல்லது குறிப்பிடவும்
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +13,Fulfillment,நிறைவேற்றுதல்
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","நிறுவனத்தின் , மாதம் மற்றும் நிதியாண்டு கட்டாயமாகும்"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,மார்க்கெட்டிங் செலவுகள்
@@ -1543,14 +1557,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,ERPNext அமைவு முடிந்தது!
 DocType: Item,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +93,A Customer Group exists with same name please change the Customer name or rename the Customer Group,ஒரு வாடிக்கையாளர் குழு அதே பெயரில் வாடிக்கையாளர் பெயர் மாற்ற அல்லது வாடிக்கையாளர் குழு பெயர்மாற்றம் செய்க
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +126,A Customer Group exists with same name please change the Customer name or rename the Customer Group,ஒரு வாடிக்கையாளர் குழு அதே பெயரில் வாடிக்கையாளர் பெயர் மாற்ற அல்லது வாடிக்கையாளர் குழு பெயர்மாற்றம் செய்க
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,புதிய தொடர்பு
 DocType: Territory,Parent Territory,பெற்றோர் மண்டலம்
 DocType: Quality Inspection Reading,Reading 2,2 படித்தல்
 DocType: Stock Entry,Material Receipt,பொருள் ரசீது
 DocType: Homepage,Products,தயாரிப்புகள்
 DocType: Announcement,Instructor,பயிற்றுவிப்பாளர்
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},கட்சி டைப் கட்சி பெறத்தக்க / செலுத்த வேண்டிய கணக்கு தேவையான {0}
 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,அடுத்த தொடர்பு
@@ -1561,7 +1574,7 @@
 ,Item-wise Sales Register,உருப்படியை வாரியான விற்பனை பதிவு
 DocType: Asset,Gross Purchase Amount,மொத்த கொள்முதல் அளவு
 DocType: Asset,Depreciation Method,தேய்மானம் முறை
-apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Offline,ஆஃப்லைன்
+apps/erpnext/erpnext/accounts/page/pos/pos.js +686,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,தேவையான
@@ -1579,25 +1592,27 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +425,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 +858,Make Purchase Order,செய்ய கொள்முதல் ஆணை
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +852,Make Purchase Order,செய்ய கொள்முதல் ஆணை
 DocType: SMS Center,Send To,அனுப்பு
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,There is not enough leave balance for Leave Type {0},விடுப்பு வகை போதுமான விடுப்பு சமநிலை இல்லை {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,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 +172,Work-in-Progress Warehouse is required before Submit,"வேலை, முன்னேற்றம் கிடங்கு சமர்ப்பிக்க முன் தேவை"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,Work-in-Progress Warehouse is required before Submit,"வேலை, முன்னேற்றம் கிடங்கு சமர்ப்பிக்க முன் தேவை"
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,ஒரு வேலை விண்ணப்பதாரர்.
 DocType: Purchase Order Item,Warehouse and Reference,கிடங்கு மற்றும் குறிப்பு
 DocType: Supplier,Statutory info and other general information about your Supplier,சட்டப்பூர்வ தகவல் மற்றும் உங்கள் சப்ளையர் பற்றி மற்ற பொது தகவல்
-apps/erpnext/erpnext/hooks.py +88,Addresses,முகவரிகள்
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,சப்ளையர்&gt; சப்ளையர் வகை
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +212,Against Journal Entry {0} does not have any unmatched {1} entry,ஜர்னல் எதிராக நுழைவு {0} எந்த வேறொன்றும் {1} நுழைவு இல்லை
+apps/erpnext/erpnext/hooks.py +95,Addresses,முகவரிகள்
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +215,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,பொருள் அல்லது கிடங்கில் அடிப்படையில் வடிகட்டி அமைக்கவும்
 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,வழங்க மசோதா
@@ -1605,11 +1620,10 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} must be submitted,BOM {0} சமர்ப்பிக்க வேண்டும்
 DocType: Authorization Control,Authorization Control,அங்கீகாரம் கட்டுப்பாடு
 apps/erpnext/erpnext/controllers/buying_controller.py +300,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},ரோ # {0}: கிடங்கு நிராகரிக்கப்பட்டது நிராகரித்தது பொருள் எதிராக கட்டாயமாகும் {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +731,Payment,கொடுப்பனவு
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,Payment,கொடுப்பனவு
 DocType: Production Order Operation,Actual Time and Cost,உண்மையான நேரம் மற்றும் செலவு
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},அதிகபட்ச பொருள் கோரிக்கை {0} உருப்படி {1} எதிராகவிற்பனை ஆணை {2}
 DocType: Employee,Salutation,வணக்கம் தெரிவித்தல்
-DocType: Pricing Rule,Brand,பிராண்ட்
 DocType: Course,Course Abbreviation,பாடநெறி சுருக்கமான
 DocType: Item,Will also apply for variants,கூட வகைகளில் விண்ணப்பிக்க
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +142,"Asset cannot be cancelled, as it is already {0}","அது ஏற்கனவே உள்ளது என, சொத்து இரத்து செய்ய முடியாது {0}"
@@ -1621,7 +1635,7 @@
 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.",உங்கள் தயாரிப்புகள் அல்லது நீங்கள் வாங்க அல்லது விற்க என்று சேவைகள் பட்டியலில் .
 DocType: Hub Settings,Hub Node,ஹப் கணு
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,நீங்கள் போலி பொருட்களை நுழைந்தது. சரிசெய்து மீண்டும் முயற்சிக்கவும்.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Associate,இணை
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,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,பெறுநர் பட்டியல் உருவாக்க
@@ -1629,7 +1643,7 @@
 DocType: Production Planning Tool,Material Requests,பொருள் கோரிக்கைகள்
 DocType: Warranty Claim,Issue Date,பிரச்சினை தேதி
 DocType: Activity Cost,Activity Cost,நடவடிக்கை செலவு
-DocType: Timesheet Detail,Timesheet Detail,டைம் ஷீட் விபரம்
+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),தொகுப்பு இந்த விநியோக ஒரு பகுதியாக உள்ளது என்று குறிக்கிறது (மட்டும் வரைவு)
@@ -1652,6 +1666,7 @@
 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,இல்லை வகைகள் உள்ளன
 DocType: Monthly Distribution,Name of the Monthly Distribution,மாதாந்திர விநியோகம் பெயர்
 DocType: Sales Person,Parent Sales Person,பெற்றோர் விற்பனை நபர்
@@ -1664,31 +1679,32 @@
 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 +44,"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/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.,நீங்கள் விற்பனை விலைப்பட்டியல் சேமிக்க முறை சொற்கள் காணக்கூடியதாக இருக்கும்.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +502,Error: {0} &gt; {1},பிழை: {0}&gt; {1}
 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.,கால தொடக்க தேதி கால இணைக்கப்பட்ட செய்ய கல்வியாண்டின் ஆண்டு தொடக்க தேதி முன்னதாக இருக்க முடியாது (கல்வி ஆண்டு {}). தேதிகள் சரிசெய்து மீண்டும் முயற்சிக்கவும்.
 DocType: Naming Series,Current Value,தற்போதைய மதிப்பு
-apps/erpnext/erpnext/controllers/accounts_controller.py +235,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,பல நிதியாண்டு தேதி {0} உள்ளன. இந்த நிதி ஆண்டில் நிறுவனம் அமைக்கவும்
+apps/erpnext/erpnext/controllers/accounts_controller.py +238,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 +458,Item table can not be blank,பொருள் அட்டவணை காலியாக இருக்க முடியாது
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +443,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 +5,This is based on stock movement. See {0} for details,இந்த பங்கு இயக்கத்தை அடிப்படையாக கொண்டது. பார்க்க {0} விவரங்களுக்கு
 DocType: Pricing Rule,Selling,விற்பனை
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +341,Amount {0} {1} deducted against {2},அளவு {0} {1} எதிராக கழிக்கப்படும் {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +344,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,காரணம் தேதி தேதி தகவல்களுக்கு முன் இருக்க முடியாது
@@ -1703,8 +1719,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +144,Cannot refer row number greater than or equal to current row number for this Charge type,இந்த குற்றச்சாட்டை வகை விட அல்லது தற்போதைய வரிசையில் எண்ணிக்கை சமமாக வரிசை எண் பார்க்கவும் முடியாது
 DocType: Asset,Sold,விற்கப்பட்டது
 ,Item-wise Purchase History,உருப்படியை வாரியான கொள்முதல் வரலாறு
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Red,ரெட்
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"சீரியல் இல்லை பொருள் சேர்க்க எடுக்க ' உருவாக்குதல் அட்டவணை ' கிளிக் செய்து, {0}"
+apps/erpnext/erpnext/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,திறந்த உற்பத்தி ஆணைகள்
 DocType: Sales Invoice Payment,Base Amount (Company Currency),அடிப்படை அளவு (நிறுவனத்தின் நாணய)
@@ -1712,7 +1728,7 @@
 DocType: Installation Note,Installation Time,நிறுவல் நேரம்
 DocType: Sales Invoice,Accounting Details,கணக்கு விவரங்கள்
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,இந்த நிறுவனத்தின் அனைத்து பரிமாற்றங்கள் நீக்கு
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +187,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,ரோ # {0}: ஆபரேஷன் {1} உற்பத்தி முடிந்ததும் பொருட்களின் {2} கொத்தமல்லி நிறைவு இல்லை ஒழுங்கு # {3}. நேரம் பதிவுகள் வழியாக அறுவை சிகிச்சை நிலையை மேம்படுத்த தயவு செய்து
+apps/erpnext/erpnext/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}. நேரம் பதிவுகள் வழியாக அறுவை சிகிச்சை நிலையை மேம்படுத்த தயவு செய்து
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,முதலீடுகள்
 DocType: Issue,Resolution Details,தீர்மானம் விவரம்
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,ஒதுக்கீடுகள்
@@ -1748,16 +1764,17 @@
 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}
 DocType: Delivery Note,Excise Page Number,கலால் பக்கம் எண்
 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}
 ,Maintenance Schedules,பராமரிப்பு அட்டவணை
 DocType: Task,Actual End Date (via Time Sheet),உண்மையான தேதி (நேரம் தாள் வழியாக)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Amount {0} {1} against {2} {3},அளவு {0} {1} எதிராக {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +339,Amount {0} {1} against {2} {3},அளவு {0} {1} எதிராக {2} {3}
 ,Quotation Trends,மேற்கோள் போக்குகள்
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},உருப்படி உருப்படியை மாஸ்டர் குறிப்பிடப்பட்டுள்ளது பொருள் பிரிவு {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +295,Debit To account must be a Receivable account,கணக்கில் பற்று ஒரு பெறத்தக்க கணக்கு இருக்க வேண்டும்
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Receivable account,கணக்கில் பற்று ஒரு பெறத்தக்க கணக்கு இருக்க வேண்டும்
 DocType: Shipping Rule Condition,Shipping Amount,கப்பல் தொகை
 ,Pending Amount,நிலுவையில் தொகை
 DocType: Purchase Invoice Item,Conversion Factor,மாற்ற காரணி
@@ -1765,10 +1782,10 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +137,Expected value after useful life must be greater than or equal to {0},பயனுள்ள வாழ்க்கை பிறகு எதிர்பார்க்கப்பட்ட மதிப்பு அதிகமாக அல்லது சமமாக இருக்க வேண்டும் {0}
 DocType: Purchase Receipt,Vehicle Number,வாகன எண்
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,மீண்டும் விலைப்பட்டியல் நிறுத்த வேண்டும் எந்த தேதி
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +90,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,மொத்த ஒதுக்கீடு இலைகள் {0} குறைவாக இருக்க முடியாது காலம் ஏற்கனவே ஒப்புதல் இலைகள் {1} விட
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +93,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 +22,Enter Paid Amount,செலுத்திய தொகை உள்ளிடவும்
+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 பயன்படுத்த
@@ -1778,13 +1795,15 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,timesheets
 DocType: HR Settings,HR Settings,அலுவலக அமைப்புகள்
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Expense Claim is pending approval. Only the Expense Approver can update status.,செலவு கோரும் அனுமதிக்காக நிலுவையில் உள்ளது . மட்டுமே செலவு அப்ரூவரான நிலையை மேம்படுத்த முடியும் .
+DocType: Email Digest,New Expenses,புதிய செலவுகள்
 DocType: Purchase Invoice,Additional Discount Amount,கூடுதல் தள்ளுபடி தொகை
-apps/erpnext/erpnext/controllers/accounts_controller.py +524,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","ரோ # {0}: அளவு 1, உருப்படி ஒரு நிலையான சொத்தாக இருக்கிறது இருக்க வேண்டும். பல கொத்தமல்லி தனி வரிசையில் பயன்படுத்தவும்."
+apps/erpnext/erpnext/controllers/accounts_controller.py +527,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","ரோ # {0}: அளவு 1, உருப்படி ஒரு நிலையான சொத்தாக இருக்கிறது இருக்க வேண்டும். பல கொத்தமல்லி தனி வரிசையில் பயன்படுத்தவும்."
 DocType: Leave Block List Allow,Leave Block List Allow,பிளாக் பட்டியல் அனுமதி விட்டு
 apps/erpnext/erpnext/setup/doctype/company/company.py +249,Abbr can not be blank or space,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/stock/get_item_details.py +123,Please specify Company,நிறுவனத்தின் குறிப்பிடவும்
 ,Customer Acquisition and Loyalty,வாடிக்கையாளர் கையகப்படுத்துதல் மற்றும் லாயல்டி
@@ -1795,17 +1814,19 @@
 apps/erpnext/erpnext/projects/doctype/task/task.js +26,Expense Claims,செலவு சட்டக்கோரல்கள்
 DocType: Issue,Support,ஆதரவு
 ,BOM Search,"BOM, தேடல்"
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Closing (Opening + Totals),நிறைவு (+ கூட்டுத்தொகை திறக்கப்படவுள்ளது)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),நிறைவு (+ கூட்டுத்தொகை திறக்கப்படவுள்ளது)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,நிறுவனத்தின் நாணய குறிப்பிடவும்
 DocType: Workstation,Wages per hour,ஒரு மணி நேரத்திற்கு ஊதியங்கள்
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +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/controllers/accounts_controller.py +272,Account {0} is invalid. Account Currency must be {1},கணக்கு {0} தவறானது. கணக்கு நாணய இருக்க வேண்டும் {1}
+DocType: Email Digest,Pending Sales Orders,விற்பனை ஆணைகள் நிலுவையில்
+apps/erpnext/erpnext/controllers/accounts_controller.py +275,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 +956,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","ரோ # {0}: குறிப்பு ஆவண வகை விற்பனை ஆணை ஒன்று, விற்பனை விலைப்பட்டியல் அல்லது பத்திரிகை நுழைவு இருக்க வேண்டும்"
-DocType: Salary Slip,Deduction,கழித்தல்
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +87,Row {0}: From Time and To Time is mandatory.,ரோ {0}: நேரம் இருந்து மற்றும் நேரம் கட்டாயமாகும்.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +969,"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 +111,Row {0}: From Time and To Time is mandatory.,ரோ {0}: நேரம் இருந்து மற்றும் நேரம் கட்டாயமாகும்.
+DocType: Stock Reconciliation Item,Amount Difference,அளவு வேறுபாடு
 apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},பொருள் விலை சேர்க்கப்பட்டது {0} விலை பட்டியல் உள்ள {1}
 DocType: Address Template,Address Template,முகவரி டெம்ப்ளேட்
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +7,Please enter Employee Id of this sales person,இந்த வியாபாரி பணியாளர் Id உள்ளிடவும்
@@ -1813,7 +1834,7 @@
 DocType: Project,% Tasks Completed,% முடிக்கப்பட்ட பணிகள்
 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 +194,Please enter Production Item first,முதல் உற்பத்தி பொருள் உள்ளிடவும்
+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,ஊனமுற்ற பயனர்
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,மேற்கோள்
@@ -1822,53 +1843,54 @@
 DocType: Maintenance Visit,Maintenance User,பராமரிப்பு பயனர்
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +149,Cost Updated,செலவு புதுப்பிக்கப்பட்ட
 DocType: Employee,Date of Birth,பிறந்த நாள்
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +86,Item {0} has already been returned,பொருள் {0} ஏற்கனவே திரும்பினார்
+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: 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 +177,Job Description,வேலை விபரம்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,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 +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","தவிர, சிறப்பு எழுத்துக்கள் ""-"" ""."", ""#"", மற்றும் ""/"" தொடர் பெயரிடும் அனுமதி இல்லை"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","தவிர, சிறப்பு எழுத்துக்கள் ""-"" ""."", ""#"", மற்றும் ""/"" தொடர் பெயரிடும் அனுமதி இல்லை"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","விற்பனை பிரச்சாரங்கள் கண்காணிக்க. லீட்ஸ், மேற்கோள்கள் கண்காணிக்கவும், விற்பனை போன்றவை பிரச்சாரங்கள் இருந்து முதலீட்டு மீது மீண்டும் அளவிடுவதற்கு."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +24,Welcome to POS: Create your POS Profile,பிஓஎஸ் வரவேற்கிறோம்: உங்கள் பிஓஎஸ் செய்தது உருவாக்கவும்
 DocType: Expense Claim,Approver,சர்க்கார் தரப்பில் சாட்சி சொல்லும் குற்றவாளி
 ,SO Qty,எனவே அளவு
+DocType: Guardian,Work Address,பணியிட முகவரி
 DocType: Appraisal,Calculate Total Score,மொத்த மதிப்பெண் கணக்கிட
 DocType: Request for Quotation,Manufacturing Manager,தயாரிப்பு மேலாளர்
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},தொடர் இல {0} வரை உத்தரவாதத்தை கீழ் உள்ளது {1}
+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 +74,Shipments,படுவதற்கு
+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 +153,Row # ,ரோ #
+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 +156,Get From,இருந்து பெற
+apps/erpnext/erpnext/public/js/utils.js +167,Get From,இருந்து பெற
 DocType: C-Form,Quarter,காலாண்டு
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Miscellaneous Expenses,இதர செலவுகள்
 DocType: Global Defaults,Default Company,முன்னிருப்பு நிறுவனத்தின்
 apps/erpnext/erpnext/controllers/stock_controller.py +167,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,செலவு வேறுபாடு கணக்கு கட்டாய உருப்படி {0} பாதிப்பை ஒட்டுமொத்த பங்கு மதிப்பு
-apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings",வரிசையில் பொருள் {0} ஐந்து overbill முடியாது {1} விட {2}. Overbilling பங்கு அமைப்புகள் அமைக்க தயவு செய்து அனுமதிக்க
+apps/erpnext/erpnext/controllers/accounts_controller.py +419,"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,மேலே
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} is disabled,பயனர் {0} முடக்கப்பட்டுள்ளது
 DocType: Leave Application,Total Leave Days,மொத்த விடுப்பு நாட்கள்
 DocType: Email Digest,Note: Email will not be sent to disabled users,குறிப்பு: மின்னஞ்சல் ஊனமுற்ற செய்த அனுப்ப முடியாது
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,நிறுவனத்தின் தேர்ந்தெடுக்கவும் ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,அனைத்து துறைகளில் கருதப்படுகிறது என்றால் வெறுமையாக
 apps/erpnext/erpnext/config/hr.py +171,"Types of employment (permanent, contract, intern etc.).","வேலைவாய்ப்பு ( நிரந்தர , ஒப்பந்த , பயிற்சி முதலியன) வகைகள் ."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +346,{0} is mandatory for Item {1},{0} பொருள் கட்டாய {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,{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","குறைந்தது ஒரு வரிசையில் ஒதுக்கப்பட்டுள்ள தொகை, விலைப்பட்டியல் வகை மற்றும் விலைப்பட்டியல் எண் தேர்ந்தெடுக்கவும்"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,புதிய கொள்முதல் செலவு
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},பொருள் தேவை விற்பனை ஆணை {0}
 DocType: Purchase Invoice Item,Rate (Company Currency),விகிதம் (நிறுவனத்தின் கரன்சி)
-apps/erpnext/erpnext/demo/setup_data.py +360,Others,மற்றவை
+DocType: Student Guardian,Others,மற்றவை
 DocType: Payment Entry,Unallocated Amount,ஒதுக்கப்படாத தொகை
 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,வரிகள் மற்றும் கட்டணங்கள்
@@ -1888,17 +1910,16 @@
 apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,தொடர் சரக்கு
 DocType: Activity Type,Default Billing Rate,இயல்புநிலை பில்லிங் மதிப்பீடு
 DocType: Sales Invoice,Total Billing Amount,மொத்த பில்லிங் அளவு
-apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +54,Receivable Account,பெறத்தக்க கணக்கு
-apps/erpnext/erpnext/controllers/accounts_controller.py +546,Row #{0}: Asset {1} is already {2},ரோ # {0}: சொத்து {1} ஏற்கனவே {2}
+apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,பெறத்தக்க கணக்கு
+apps/erpnext/erpnext/controllers/accounts_controller.py +549,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 +79,CEO,தலைமை நிர்வாக அதிகாரி
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,தலைமை நிர்வாக அதிகாரி
 DocType: Expense Claim Detail,Expense Claim Detail,இழப்பில் உரிமைகோரல் விவரம்
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +808,Please select correct account,சரியான கணக்கில் தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +809,Please select correct account,சரியான கணக்கில் தேர்ந்தெடுக்கவும்
 DocType: Item,Weight UOM,எடை மொறட்டுவ பல்கலைகழகம்
 DocType: Salary Structure Employee,Salary Structure Employee,சம்பளம் அமைப்பு பணியாளர்
 DocType: Employee,Blood Group,குருதி பகுப்பினம்
-DocType: Purchase Invoice Item,Page Break,பக்கம் பிரேக்
 DocType: Production Order Operation,Pending,முடிவுபெறாத
 DocType: Course,Course Name,படிப்பின் பெயர்
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,ஒரு குறிப்பிட்ட ஊழியர் விடுப்பு விண்ணப்பங்கள் ஒப்புதல் முடியும் பயனர்கள்
@@ -1907,14 +1928,15 @@
 DocType: Fiscal Year,Companies,நிறுவனங்கள்
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,மின்னணுவியல்
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,பங்கு மறு ஒழுங்கு நிலை அடையும் போது பொருள் கோரிக்கை எழுப்ப
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Full-time,முழு நேர
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,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: 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,மொத்த உள்வரும் மதிப்பு
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Debit To is required,பற்று தேவைப்படுகிறது
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +321,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,தர மேலாளர்
@@ -1922,6 +1944,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/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,மொத்த விலை விவரம் விவரங்கள்
@@ -1932,18 +1955,17 @@
 DocType: Production Order Operation,Completed Qty,நிறைவு அளவு
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"For {0}, only debit accounts can be linked against another credit entry",{0} மட்டுமே டெபிட் கணக்குகள் மற்றொரு கடன் நுழைவு எதிராக இணைக்கப்பட்ட ஐந்து
 apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,விலை பட்டியல் {0} முடக்கப்பட்டுள்ளது
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +99,Row {0}: Completed Qty cannot be more than {1} for operation {2},ரோ {0}: பூர்த்தி அளவு விட முடியாது {1} அறுவை சிகிச்சை {2}
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +123,Row {0}: Completed Qty cannot be more than {1} for operation {2},ரோ {0}: பூர்த்தி அளவு விட முடியாது {1} அறுவை சிகிச்சை {2}
 DocType: Manufacturing Settings,Allow Overtime,மேலதிக அனுமதிக்கவும்
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} பொருள் தேவையான சீரியல் எண்கள் {1}. நீங்கள் வழங்கிய {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,தற்போதைய மதிப்பீட்டு விகிதம்
 DocType: Item,Customer Item Codes,வாடிக்கையாளர் பொருள் குறியீடுகள்
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,செலாவணி லாபம் / நஷ்டம்
 DocType: Opportunity,Lost Reason,இழந்த காரணம்
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,அமைவு அமைப்பு வழியாக வருகை தொடர் எண்ணிக்கையில்&gt; எண் தொடர்
 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/purchase_receipt/purchase_receipt.py +378,All items have already been invoiced,அனைத்து பொருட்களும் ஏற்கனவே விலை விவரம்
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +379,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,வெளி
@@ -1959,18 +1981,19 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,உங்கள் வாடிக்கையாளர்கள்
 apps/erpnext/erpnext/projects/doctype/project/project.py +141,You have been invited to collaborate on the project: {0},நீங்கள் திட்டம் இணைந்து அழைக்கப்பட்டுள்ளனர்: {0}
 DocType: Leave Block List Date,Block Date,தேதி தடை
-apps/erpnext/erpnext/templates/generators/job_opening.html +19,Apply Now,இப்பொழுது விண்ணப்பியுங்கள்
+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 நிர்வகிக்க ."
 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,கட்டிடங்கள்
-apps/erpnext/erpnext/utilities/doctype/address/address.py +164,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,இயல்புநிலை முகவரி டெம்ப்ளேட் காணப்படும். அமைப்பு&gt; அச்சிடுதல் மற்றும் பிராண்டிங்&gt; முகவரி டெம்ப்ளேட் இருந்து ஒரு புதிய ஒன்றை உருவாக்க கொள்ளவும்.
 DocType: Fee Structure,Fee Structure,கட்டணம்
 DocType: Timesheet Detail,Costing Amount,இதற்கான செலவு தொகை
+DocType: Student Admission,Application Fee,விண்ணப்பக் கட்டணம்
 DocType: Process Payroll,Submit Salary Slip,சம்பளம் ஸ்லிப் &#39;to
-apps/erpnext/erpnext/controllers/selling_controller.py +161,Maxiumm discount for Item {0} is {1}%,உருப்படி Maxiumm தள்ளுபடி {0} {1} % ஆகிறது
+apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,உருப்படி Maxiumm தள்ளுபடி {0} {1} % ஆகிறது
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,மொத்த உள்ள இறக்குமதி
 DocType: Sales Partner,Address & Contacts,முகவரி மற்றும் தொடர்புகள்
 DocType: SMS Log,Sender Name,அனுப்புநர் பெயர்
@@ -1995,21 +2018,21 @@
 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_data.py +361,Travel,சுற்றுலா
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +155,No active or default Salary Structure found for employee {0} for the given dates,கொடுக்கப்பட்டுள்ள தேதிகளில் ஊழியர் {0} க்கு எந்த செயலில் அல்லது இயல்புநிலை சம்பளம் அமைப்பு
+apps/erpnext/erpnext/demo/setup/setup_data.py +304,Travel,சுற்றுலா
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +167,No active or default Salary Structure found for employee {0} for the given dates,கொடுக்கப்பட்டுள்ள தேதிகளில் ஊழியர் {0} க்கு எந்த செயலில் அல்லது இயல்புநிலை சம்பளம் அமைப்பு
 DocType: Leave Block List,Allow Users,பயனர்கள் அனுமதி
 DocType: Purchase Order,Customer Mobile No,வாடிக்கையாளர் கைப்பேசி
 DocType: Sales Invoice,Recurring,ரெக்கியூரிங்
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,தனி வருமான கண்காணிக்க மற்றும் தயாரிப்பு மேம்பாடுகளையும் அல்லது பிளவுகள் செலவுக்.
 DocType: Rename Tool,Rename Tool,கருவி மறுபெயரிடு
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +23,Update Cost,மேம்படுத்தல்
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,மேம்படுத்தல்
 DocType: Item Reorder,Item Reorder,உருப்படியை மறுவரிசைப்படுத்துக
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +36,Show Salary Slip,சம்பளம் ஷோ ஸ்லிப்
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +748,Transfer Material,மாற்றம் பொருள்
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +53,Show Salary Slip,சம்பளம் ஷோ ஸ்லிப்
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +166,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 +923,Please set recurring after saving,சேமிப்பு பிறகு மீண்டும் அமைக்கவும்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +646,Select change amount account,மாற்றம் தேர்வு அளவு கணக்கு
+apps/erpnext/erpnext/public/js/controllers/transaction.js +914,Please set recurring after saving,சேமிப்பு பிறகு மீண்டும் அமைக்கவும்
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +703,Select change amount account,மாற்றம் தேர்வு அளவு கணக்கு
 DocType: Purchase Invoice,Price List Currency,விலை பட்டியல் நாணயத்தின்
 DocType: Naming Series,User must always select,பயனர் எப்போதும் தேர்ந்தெடுக்க வேண்டும்
 DocType: Stock Settings,Allow Negative Stock,எதிர்மறை பங்கு அனுமதிக்கும்
@@ -2021,31 +2044,32 @@
 DocType: Quality Inspection,Verified By,மூலம் சரிபார்க்கப்பட்ட
 DocType: Address,Subsidiary,உப
 apps/erpnext/erpnext/setup/doctype/company/company.py +64,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","ஏற்கனவே நடவடிக்கைகள் உள்ளன, ஏனெனில் , நிறுவனத்தின் இயல்புநிலை நாணய மாற்ற முடியாது. நடவடிக்கைகள் இயல்புநிலை நாணய மாற்ற இரத்து செய்யப்பட வேண்டும்."
+DocType: Grade Interval,Grade Description,தரம் விளக்கம்
 DocType: Quality Inspection,Purchase Receipt No,இல்லை சீட்டு வாங்க
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,பிணை உறுதி பணம்
 DocType: Process Payroll,Create Salary Slip,சம்பளம் ஸ்லிப் உருவாக்க
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +33,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 +352,Quantity in row {0} ({1}) must be same as manufactured quantity {2},அளவு வரிசையில் {0} ( {1} ) அதே இருக்க வேண்டும் உற்பத்தி அளவு {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Quantity in row {0} ({1}) must be same as manufactured quantity {2},அளவு வரிசையில் {0} ( {1} ) அதே இருக்க வேண்டும் உற்பத்தி அளவு {2}
 DocType: Appraisal,Employee,ஊழியர்
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,பயனர் அழை
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} முழுமையாக வசூலிக்கப்படும்
 DocType: Workstation Working Hour,End Time,முடிவு நேரம்
 DocType: Payment Entry,Payment Deductions or Loss,கொடுப்பனவு விலக்கிற்கு அல்லது இழப்பு
-apps/erpnext/erpnext/config/schools.py +100,LMS,எல்எம்எஸ்
+apps/erpnext/erpnext/config/schools.py +104,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,விற்பனை பைப்லைன்
 DocType: Student Batch Student,Student Batch Student,மாணவர் தொகுதி மாணவர்
-DocType: Sales Invoice,Mass Mailing,வெகுஜன அஞ்சல்
+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 +199,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/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 +297,Salary Slip of employee {0} already created for this period,ஊழியர் சம்பளம் ஸ்லிப் {0} ஏற்கனவே இந்த காலத்தில் உருவாக்கப்பட்ட
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Pharmaceutical,மருந்து
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +309,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/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,கடன்
@@ -2060,27 +2084,28 @@
 DocType: Upload Attendance,Attendance To Date,தேதி வருகை
 DocType: Warranty Claim,Raised By,எழுப்பப்பட்ட
 DocType: Payment Gateway Account,Payment Account,கொடுப்பனவு கணக்கு
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +814,Please specify Company to proceed,நிறுவனத்தின் தொடர குறிப்பிடவும்
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +793,Please specify Company to proceed,நிறுவனத்தின் தொடர குறிப்பிடவும்
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Receivable,கணக்குகள் நிகர மாற்றம்
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Compensatory Off,இழப்பீட்டு இனிய
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,இழப்பீட்டு இனிய
 DocType: Quality Inspection Reading,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.,நீங்கள் உண்மையில் இந்த நிறுவனத்தின் அனைத்து பரிமாற்றங்கள் நீக்க வேண்டும் என்பதை உறுதி செய்யுங்கள். இது போன்ற உங்கள் மாஸ்டர் தரவு இருக்கும். இந்தச் செயலைச் செயல்.
 DocType: Room,Room Number,அறை எண்
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},தவறான குறிப்பு {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +161,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) திட்டமிட்ட quanitity விட அதிகமாக இருக்க முடியாது ({2}) உற்பத்தி ஆணை {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +162,{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 +217,Raw Materials cannot be blank.,மூலப்பொருட்கள் காலியாக இருக்க முடியாது.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,"Could not update stock, invoice contains drop shipping item.","பங்கு புதுப்பிக்க முடியவில்லை, விலைப்பட்டியல் துளி கப்பல் உருப்படி உள்ளது."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +460,Quick Journal Entry,விரைவு ஜர்னல் நுழைவு
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +111,You can not change rate if BOM mentioned agianst any item,BOM எந்த பொருளை agianst குறிப்பிட்டுள்ள நீங்கள் வீதம் மாற்ற முடியாது
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +441,"Could not update stock, invoice contains drop shipping item.","பங்கு புதுப்பிக்க முடியவில்லை, விலைப்பட்டியல் துளி கப்பல் உருப்படி உள்ளது."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Quick Journal Entry,விரைவு ஜர்னல் நுழைவு
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +103,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 +214,{0} {1} is not submitted,{0} {1} சமர்ப்பிக்க
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,பொருட்கள் கோரிக்கைகள்.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,தனி உற்பத்தி வரிசையில் ஒவ்வொரு முடிக்கப்பட்ட நல்ல உருப்படியை செய்தது.
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +121,{0} must be negative in return document,{0} திரும்ப ஆவணத்தில் எதிர்மறை இருக்க வேண்டும்
 ,Minutes to First Response for Issues,சிக்கல்கள் முதல் பதில் நிமிடங்கள்
 DocType: Purchase Invoice,Terms and Conditions1,விதிமுறைகள் மற்றும் Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,சபையின் பெயரால் இது நீங்கள் இந்த அமைப்பை அமைக்க வேண்டும்.
@@ -2089,16 +2114,17 @@
 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 +398,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 +739,Item or Warehouse for row {0} does not match Material Request,வரிசையில் பொருள் அல்லது கிடங்கு {0} பொருள் கோரிக்கை பொருந்தவில்லை
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +747,Item or Warehouse for row {0} does not match Material Request,வரிசையில் பொருள் அல்லது கிடங்கு {0} பொருள் கோரிக்கை பொருந்தவில்லை
 apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,அளவிடத்தக்க அலகு
 DocType: Fiscal Year,Year End Date,ஆண்டு முடிவு தேதி
 DocType: Task Depends On,Task Depends On,பணி பொறுத்தது
-DocType: Lead,Opportunity,சந்தர்ப்பம்
+DocType: Supplier Quotation,Opportunity,சந்தர்ப்பம்
 ,Completed Production Orders,இதன் தயாரிப்பு நிறைவடைந்தது ஆணைகள்
 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,இயல்புநிலை வேலைநிலையங்களின்
@@ -2111,7 +2137,7 @@
 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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},"பராமரிப்பு தொடக்க தேதி சீரியல் இல்லை , விநியோகம் தேதி முன் இருக்க முடியாது {0}"
+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,உண்மையான முடிவு தேதி
 DocType: Purchase Invoice,PINV-,PINV-
 DocType: Authorization Rule,Applicable To (Role),பொருந்தும் (பாத்திரம்)
@@ -2126,7 +2152,7 @@
 DocType: SMS Log,No of Requested SMS,கோரப்பட்ட எஸ்எம்எஸ் இல்லை
 DocType: Campaign,Campaign-.####,பிரச்சாரத்தின் . # # # #
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,அடுத்த படிகள்
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,Please supply the specified items at the best possible rates,சிறந்த சாத்தியமுள்ள விகிதங்களில் குறிப்பிட்ட பொருட்களை வழங்கவும்
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +695,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 +117,Contract End Date must be greater than Date of Joining,இந்த ஒப்பந்தம் முடிவுக்கு தேதி சேர தேதி விட அதிகமாக இருக்க வேண்டும்
 DocType: Delivery Note,DN-,DN-
@@ -2135,7 +2161,7 @@
 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 +14,This is an example website auto-generated from ERPNext,இந்த ERPNext இருந்து தானாக உருவாக்கப்பட்ட ஒரு உதாரணம் இணையதளம் உள்ளது
+apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,இந்த ERPNext இருந்து தானாக உருவாக்கப்பட்ட ஒரு உதாரணம் இணையதளம் உள்ளது
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,வயதான ரேஞ்ச் 1
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
@@ -2182,13 +2208,14 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd அளவு
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +54,Fee Records Created - {0},கட்டணம் ரெக்கார்ட்ஸ் உருவாக்கப்பட்டது - {0}
 DocType: Asset Category Account,Asset Category Account,சொத்து வகை கணக்கு
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +103,Cannot produce more Item {0} than Sales Order quantity {1},மேலும் பொருள் தயாரிக்க முடியாது {0} விட விற்பனை ஆணை அளவு {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Stock Entry {0} is not submitted,பங்கு நுழைவு {0} சமர்ப்பிக்க
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},மேலும் பொருள் தயாரிக்க முடியாது {0} விட விற்பனை ஆணை அளவு {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +505,Stock Entry {0} is not submitted,பங்கு நுழைவு {0} சமர்ப்பிக்க
 DocType: Payment Reconciliation,Bank / Cash Account,வங்கி / பண கணக்கு
 DocType: Tax Rule,Billing City,பில்லிங் நகரம்
 DocType: Salary Component Account,Salary Component Account,சம்பளம் உபகரண கணக்கு
 DocType: Global Defaults,Hide Currency Symbol,நாணய சின்னம் மறைக்க
 apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card","உதாரணமாக வங்கி, பண, கடன் அட்டை"
+DocType: Lead Source,Source Name,மூல பெயர்
 DocType: Journal Entry,Credit Note,வரவுக்குறிப்பு
 DocType: Warranty Claim,Service Address,சேவை முகவரி
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furnitures and Fixtures,மரச்சாமான்கள் மற்றும் சாதனங்கள்
@@ -2200,6 +2227,7 @@
 DocType: Opportunity,Customer / Lead Name,வாடிக்கையாளர் / முன்னணி பெயர்
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +89,Clearance Date not mentioned,இசைவு தேதி குறிப்பிடப்படவில்லை
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,உற்பத்தி
+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/controllers/trends.py +19,Total(Qty),மொத்தம் (அளவு)
 DocType: Sales Invoice,This Document,இந்த ஆவண
@@ -2211,15 +2239,15 @@
 DocType: Purchase Receipt,Time at which materials were received,பொருட்கள் பெற்றனர் எந்த நேரத்தில்
 DocType: Stock Ledger Entry,Outgoing Rate,வெளிச்செல்லும் விகிதம்
 apps/erpnext/erpnext/config/hr.py +176,Organization branch master.,அமைப்பு கிளை மாஸ்டர் .
-apps/erpnext/erpnext/controllers/accounts_controller.py +273, or ,அல்லது
+apps/erpnext/erpnext/controllers/accounts_controller.py +276, 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 +203,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,ரோ # {0}: மற்றொரு ரசீது எதிராக பத்திரிகை நுழைவு {1} கணக்கு இல்லை {2} அல்லது ஏற்கனவே பொருந்தியது
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +206,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 +90,No employee for the above selected criteria OR salary slip already created,மேலே தேர்ந்தெடுக்கப்பட்ட வரையறையில் அல்லது சம்பளம் சீட்டு இல்லை ஊழியர் ஏற்கனவே உருவாக்கப்பட்ட
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +93,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,கொடுப்பனவு வகை
@@ -2247,8 +2275,8 @@
 DocType: Product Bundle,Parent Item,பெற்றோர் பொருள்
 DocType: Account,Account Type,கணக்கு வகை
 DocType: Delivery Note,DN-RET-,டி.என்-RET-
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +115,Leave Type {0} cannot be carry-forwarded,{0} செயல்படுத்த-முன்னோக்கி இருக்க முடியாது வகை விடவும்
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"பராமரிப்பு அட்டவணை அனைத்து பொருட்களின் உருவாக்கப்பட்ட உள்ளது . ' உருவாக்குதல் அட்டவணை ' கிளிக் செய்து,"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +118,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 +163,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","வரிசையில் {0} உள்ள {1}. பொருள் விகிதம் {2} சேர்க்க, வரிசைகள் {3} சேர்த்துக்கொள்ள வேண்டும்"
@@ -2260,13 +2288,13 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +32,Disabled template must not be default template,முடக்கப்பட்டது டெம்ப்ளேட் இயல்புநிலை டெம்ப்ளேட் இருக்க கூடாது
 DocType: Account,Income Account,வருமான கணக்கு
 DocType: Payment Request,Amount in customer's currency,வாடிக்கையாளர் நாட்டின் நாணய தொகை
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +748,Delivery,டெலிவரி
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +742,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,முக்கிய பொறுப்பு பகுதி
 DocType: Payment Entry,Total Allocated Amount,மொத்த ஒதுக்கப்பட்ட தொகை
 DocType: Item Reorder,Material Request Type,பொருள் கோரிக்கை வகை
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +82,Row {0}: UOM Conversion Factor is mandatory,ரோ {0}: UOM மாற்றக் காரணி கட்டாயமாகும்
+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,செலவு மையம்
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,வவுச்சர் #
@@ -2277,13 +2305,13 @@
 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 +90,Head of Marketing and Sales,சந்தைப்படுத்தல் மற்றும் விற்பனை தலைவர்
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,வருமான வரி
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,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 +403,Please enter Item Code to get batch no,எந்த தொகுதி கிடைக்கும் பொருள் கோட் உள்ளிடவும்
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +770,Please select a value for {0} quotation_to {1},ஒரு மதிப்பை தேர்ந்தெடுக்கவும் {0} quotation_to {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +397,Please enter Item Code to get batch no,எந்த தொகுதி கிடைக்கும் பொருள் கோட் உள்ளிடவும்
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +764,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","பின்வரும் பண்புகளைக் சாதனைகளை அதே இருந்தால் அதை இணைத்தல் மட்டுமே சாத்தியம். குழு, ரூட் வகை, நிறுவனம்"
@@ -2295,28 +2323,29 @@
 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 +100,Issues,சிக்கல்கள்
+apps/erpnext/erpnext/hooks.py +109,Issues,சிக்கல்கள்
 apps/erpnext/erpnext/controllers/status_updater.py +13,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,பில்லிங் நாணய
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Large,மிகப் பெரியவை
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,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 +507,Warning: Another {0} # {1} exists against stock entry {2},எச்சரிக்கை: மற்றொரு {0} # {1} பங்கு நுழைவதற்கு எதிராக உள்ளது {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Local,உள்ளூர்
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +508,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),கடன்கள் ( சொத்துக்கள் )
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,"இருப்பினும், கடனாளிகள்"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Large,பெரிய
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,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 +225,Total {0} ({1}),மொத்த {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +224,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,முன்னிருப்பு மதிப்பீட்டு முறை
@@ -2374,9 +2403,9 @@
 DocType: Attendance,Leave Type,வகை விட்டு
 apps/erpnext/erpnext/controllers/stock_controller.py +173,Expense / Difference account ({0}) must be a 'Profit or Loss' account,செலவு / வித்தியாசம் கணக்கு ({0}) ஒரு 'லாபம் அல்லது நஷ்டம்' கணக்கு இருக்க வேண்டும்
 DocType: Account,Accounts User,பயனர் கணக்குகள்
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Name error: {0},பெயர் பிழை: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +90,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 +178,{0} {1} does not associated with {2} {3},{0} {1} தொடர்புடைய இல்லை {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +181,{0} {1} does not associated with {2} {3},{0} {1} தொடர்புடைய இல்லை {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,ஊழியர் வருகை {0} ஏற்கனவே குறிக்கப்பட்டுள்ளது
 DocType: Packing Slip,If more than one package of the same type (for print),அதே வகை மேற்பட்ட தொகுப்பு (அச்சுக்கு)
 DocType: Warehouse,Parent Warehouse,பெற்றோர் கிடங்கு
@@ -2395,7 +2424,7 @@
 DocType: BOM Item,Scrap %,% கைவிட்டால்
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection","கட்டணங்கள் விகிதாசாரத்தில் தேர்வு படி, உருப்படி கொத்தமல்லி அல்லது அளவு அடிப்படையில்"
 DocType: Maintenance Visit,Purposes,நோக்கங்கள்
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,குறைந்தபட்சம் ஒரு பொருளை திருப்பி ஆவணம் எதிர்மறை அளவு உள்ளிட்ட
+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 +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","ஆபரேஷன் {0} பணிநிலையம் உள்ள எந்த கிடைக்க வேலை மணி நேரத்திற்கு {1}, பல நடவடிக்கைகளில் அறுவை சிகிச்சை உடைந்து"
 ,Requested,கோரப்பட்ட
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +83,No Remarks,எந்த கருத்துக்கள்
@@ -2407,46 +2436,46 @@
 DocType: Item,Total Projected Qty,மொத்த உத்தேச அளவு
 DocType: Monthly Distribution,Distribution Name,விநியோக பெயர்
 DocType: Course,Course Code,பாடநெறி குறியீடு
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Quality Inspection required for Item {0},பொருள் தேவை தரமான ஆய்வு {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Quality Inspection required for Item {0},பொருள் தேவை தரமான ஆய்வு {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,விகிதம் இது வாடிக்கையாளர் நாணய நிறுவனத்தின் அடிப்படை நாணய மாற்றப்படும்
 DocType: Purchase Invoice Item,Net Rate (Company Currency),நிகர விகிதம் (நிறுவனத்தின் நாணயம்)
 DocType: Salary Detail,Condition and Formula Help,நிபந்தனைகள் மற்றும் ஃபார்முலா உதவி
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,மண்டலம் மரம் நிர்வகி .
 DocType: Journal Entry Account,Sales Invoice,விற்பனை விலை விவரம்
 DocType: Journal Entry Account,Party Balance,கட்சி இருப்பு
-apps/erpnext/erpnext/accounts/page/pos/pos.js +475,Please select Apply Discount On,தள்ளுபடி விண்ணப்பிக்க தேர்ந்தெடுக்கவும்
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +92,Salary Slip Created,சம்பளம் ஸ்லிப் உருவாக்கப்பட்டது
+apps/erpnext/erpnext/accounts/page/pos/pos.js +464,Please select Apply Discount On,தள்ளுபடி விண்ணப்பிக்க தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +95,Salary Slip Created,சம்பளம் ஸ்லிப் உருவாக்கப்பட்டது
 DocType: Company,Default Receivable Account,இயல்புநிலை பெறத்தக்க கணக்கு
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,மேலே தேர்ந்தெடுக்கப்பட்ட தகுதி சம்பளம் மொத்த சம்பளம் வங்கி நுழைவு உருவாக்கவும்
 DocType: Stock Entry,Material Transfer for Manufacture,உற்பத்தி பொருள் மாற்றம்
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,தள்ளுபடி சதவீதம் விலை பட்டியலை எதிராக அல்லது அனைத்து விலை பட்டியல் ஒன்று பயன்படுத்த முடியும்.
 DocType: Purchase Invoice,Half-yearly,அரை ஆண்டு
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +384,Accounting Entry for Stock,பங்கு பைனான்ஸ் நுழைவு
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +387,Accounting Entry for Stock,பங்கு பைனான்ஸ் நுழைவு
 DocType: Sales Invoice,Sales Team1,விற்பனை Team1
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,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 +96,Row {0}: Completed Qty must be greater than zero.,ரோ {0}: பூர்த்தி அளவு சுழியை விட பெரியதாக இருக்க வேண்டும்.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +120,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 +88,Row # {0}: Cannot return more than {1} for Item {2},ரோ # {0}: விட திரும்ப முடியாது {1} பொருள் {2}
+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,சதி
 DocType: Item Group,Show this slideshow at the top of the page,பக்கத்தின் மேல் இந்த காட்சியை காட்ட
 DocType: BOM,Item UOM,உருப்படியை மொறட்டுவ பல்கலைகழகம்
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),தள்ளுபடி தொகை பின்னர் வரி அளவு (நிறுவனத்தின் நாணயம்)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +147,Target warehouse is mandatory for row {0},இலக்கு கிடங்கில் வரிசையில் கட்டாய {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +141,Target warehouse is mandatory for row {0},இலக்கு கிடங்கில் வரிசையில் கட்டாய {0}
 DocType: Cheque Print Template,Primary Settings,முதன்மை அமைப்புகள்
 DocType: Purchase Invoice,Select Supplier Address,சப்ளையர் முகவரி தேர்வு
 DocType: Quality Inspection,Quality Inspection,தரமான ஆய்வு
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Extra Small,கூடுதல் சிறிய
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,Warning: Material Requested Qty is less than Minimum Order Qty,எச்சரிக்கை : அளவு கோரப்பட்ட பொருள் குறைந்தபட்ச ஆணை அளவு குறைவாக உள்ளது
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +194,Account {0} is frozen,கணக்கு {0} உறைந்திருக்கும்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,கூடுதல் சிறிய
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +690,Warning: Material Requested Qty is less than Minimum Order Qty,எச்சரிக்கை : அளவு கோரப்பட்ட பொருள் குறைந்தபட்ச ஆணை அளவு குறைவாக உள்ளது
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,கணக்கு {0} உறைந்திருக்கும்
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,நிறுவனத்திற்கு சொந்தமான கணக்குகள் ஒரு தனி விளக்கப்படம் சட்ட நிறுவனம் / துணைநிறுவனத்திற்கு.
 DocType: Payment Request,Mute Email,முடக்கு மின்னஞ்சல்
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","உணவு , குளிர்பானங்கள் & புகையிலை"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +606,Can only make payment against unbilled {0},மட்டுமே எதிரான கட்டணம் செய்யலாம் unbilled {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +126,Commission rate cannot be greater than 100,கமிஷன் விகிதம் அதிகமாக 100 இருக்க முடியாது
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +609,Can only make payment against unbilled {0},மட்டுமே எதிரான கட்டணம் செய்யலாம் unbilled {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,கமிஷன் விகிதம் அதிகமாக 100 இருக்க முடியாது
 DocType: Stock Entry,Subcontract,உள் ஒப்பந்தம்
 apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,முதல் {0} உள்ளிடவும்
 DocType: Production Order Operation,Actual End Time,உண்மையான இறுதியில் நேரம்
@@ -2457,30 +2486,30 @@
 DocType: SMS Log,No of Sent SMS,அனுப்பிய எஸ்எம்எஸ் இல்லை
 DocType: Account,Expense Account,செலவு கணக்கு
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,மென்பொருள்
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Colour,வர்ண
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,வர்ண
 DocType: Maintenance Visit,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; என்று பொருள் தேர்ந்தெடுக்க மற்றும் வேறு எந்த தயாரிப்பு மூட்டை உள்ளது செய்க"
 DocType: Student Log,Academic,கல்வி
-apps/erpnext/erpnext/controllers/accounts_controller.py +469,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),மொத்த முன்கூட்டியே ({0}) ஒழுங்குக்கு எதிரான {1} மொத்தம் விட அதிகமாக இருக்க முடியாது ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +472,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),மொத்த முன்கூட்டியே ({0}) ஒழுங்குக்கு எதிரான {1} மொத்தம் விட அதிகமாக இருக்க முடியாது ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,ஒரே சீராக பரவி மாதங்கள் முழுவதும் இலக்குகளை விநியோகிக்க மாதாந்திர விநியோகம் தேர்ந்தெடுக்கவும்.
 DocType: Purchase Invoice Item,Valuation Rate,மதிப்பீட்டு விகிதம்
+DocType: Stock Reconciliation,SR/,எஸ்ஆர் /
 apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,விலை பட்டியல் நாணய தேர்வு
 DocType: Assessment,Results,முடிவுகள்
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +168,Employee {0} has already applied for {1} between {2} and {3},பணியாளர் {0} ஏற்கனவே இடையே {1} விண்ணப்பித்துள்ளனர் {2} {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +175,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: Student Applicant,Father's/ Guardian 2 Email ID,தந்தையின் / கார்டியன் 2 மின்னஞ்சல் ஐடி
 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 +228,Warehouses with existing transaction can not be converted to group.,தற்போதுள்ள பரிவர்த்தனை கிடங்குகள் குழு மாற்றப்பட முடியாது.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +231,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 +93,Researcher,ஆராய்ச்சியாளர்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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.,உள்வரும் தரத்தை ஆய்வு.
@@ -2492,25 +2521,25 @@
 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: Sales Invoice,Advertisement,விளம்பரம்
 DocType: Asset Category Account,Depreciation Expense Account,தேய்மானம் செலவில் கணக்கு
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Probationary Period,ப்ரொபேஷ்னரி காலம்
-apps/erpnext/erpnext/hooks.py +102,Announcements,அறிவிப்புகள்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,ப்ரொபேஷ்னரி காலம்
+apps/erpnext/erpnext/hooks.py +111,Announcements,அறிவிப்புகள்
 DocType: Customer Group,Only leaf nodes are allowed in transaction,ஒரே இலை முனைகள் பரிமாற்றத்தில் அனுமதிக்கப்படுகிறது
 DocType: Expense Claim,Expense Approver,செலவின தரப்பில் சாட்சி
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +109,Row {0}: Advance against Customer must be credit,ரோ {0}: வாடிக்கையாளர் எதிராக அட்வான்ஸ் கடன் இருக்க வேண்டும்
 apps/erpnext/erpnext/accounts/doctype/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 +16,To Datetime,நாள்நேரம் செய்ய
+apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,நாள்நேரம் செய்ய
 DocType: SMS Settings,SMS Gateway URL,எஸ்எம்எஸ் வாயில் URL
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +51,Course Schedules deleted:,நிச்சயமாக அட்டவணை நீக்கப்பட்டது:
 apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,எஸ்எம்எஸ் விநியோகம் அந்தஸ்து தக்கவைப்பதற்கு பதிவுகள்
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,நிலுவையில் நடவடிக்கைகள்
+DocType: Accounts Settings,Make Payment via Journal Entry,பத்திரிகை நுழைவு வழியாக பணம் செலுத்து
+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 +127,Please enter relieving date.,தேதி நிவாரணத்தில் உள்ளிடவும்.
-apps/erpnext/erpnext/controllers/trends.py +145,Amt,விவரங்கள்
+apps/erpnext/erpnext/controllers/trends.py +149,Amt,விவரங்கள்
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,Only Leave Applications with status 'Approved' can be submitted,மட்டுமே சமர்ப்பிக்க முடியும் ' அங்கீகரிக்கப்பட்ட ' நிலை பயன்பாடுகள் விட்டு
 apps/erpnext/erpnext/utilities/doctype/address/address.py +26,Address Title is mandatory.,முகவரி தலைப்பு கட்டாயமாகும்.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,விசாரணை மூலம் பிரச்சாரம் என்று பிரச்சாரம் பெயரை உள்ளிடவும்
@@ -2528,14 +2557,15 @@
 apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1},{0} க்கான மாற்று விகிதம் கண்டுபிடிக்க முடியவில்லை {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,மார்க் அரை நாள்
 DocType: Sales Invoice,Sales Team,விற்பனை குழு
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Duplicate entry,நுழைவு நகல்
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,நுழைவு நகல்
 DocType: Program Enrollment Tool,Get Students,மாணவர்கள் பெற
 DocType: Serial No,Under Warranty,உத்தரவாதத்தின் கீழ்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +490,[Error],[பிழை]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +484,[Error],[பிழை]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,நீங்கள் விற்பனை ஆணை சேமிக்க முறை சொற்கள் காணக்கூடியதாக இருக்கும்.
 ,Employee Birthday,பணியாளர் பிறந்தநாள்
 apps/erpnext/erpnext/controllers/status_updater.py +175,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} ஏற்கனவே உள்ளது. இந்த உள்ளீடுகளை மாற்ற, மீண்டும் முயற்சிக்கவும்."
 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} இல்லை
@@ -2551,22 +2581,22 @@
 ,Issued Items Against Production Order,உற்பத்தி ஆர்டர் எதிராக வழங்கப்படும் பொருட்கள்
 DocType: Pricing Rule,Purchase Manager,கொள்முதல் மேலாளர்
 DocType: Target Detail,Target Detail,இலக்கு விரிவாக
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +25,All Jobs,அனைத்து வேலைகள்
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,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 +323,Amount {0} {1} {2} {3},அளவு {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,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: Supplier,Credit Limit,கடன் எல்லை
 DocType: Production Plan Sales Order,Salse Order Date,Salse ஆர்டர் தேதி
 DocType: Salary Component,Salary Component,சம்பளம் உபகரண
-apps/erpnext/erpnext/accounts/utils.py +372,Payment Entries {0} are un-linked,கொடுப்பனவு பதிவுகள் {0} ஐ.நா. இணைக்கப்பட்ட
+apps/erpnext/erpnext/accounts/utils.py +449,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 +497,Material Requests {0} created,பொருள் கோரிக்கைகள் {0} உருவாக்கப்பட்டது
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +498,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.,சொற்கள் அல்லது ஒப்பந்த வார்ப்புரு.
 DocType: Purchase Invoice,Address and Contact,முகவரி மற்றும் தொடர்பு
@@ -2605,7 +2635,7 @@
 DocType: Serial No,Warranty / AMC Details,உத்தரவாதத்தை / AMC விவரம்
 DocType: Journal Entry,User Remark,பயனர் குறிப்பு
 DocType: Lead,Market Segment,சந்தை பிரிவு
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +848,Paid Amount cannot be greater than total negative outstanding amount {0},செலுத்திய தொகை மொத்த எதிர்மறை கடன் தொகையை விட அதிகமாக இருக்க முடியாது {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +859,Paid Amount cannot be greater than total negative outstanding amount {0},செலுத்திய தொகை மொத்த எதிர்மறை கடன் தொகையை விட அதிகமாக இருக்க முடியாது {0}
 DocType: Employee Internal Work History,Employee Internal Work History,ஊழியர் உள்நாட்டு வேலை வரலாறு
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +233,Closing (Dr),நிறைவு (டாக்டர்)
 DocType: Cheque Print Template,Cheque Size,காசோலை அளவு
@@ -2626,7 +2656,8 @@
 ,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.
-apps/erpnext/erpnext/controllers/accounts_controller.py +555,'Update Stock' cannot be checked for fixed asset sale,&#39;மேம்படுத்தல் பங்கு&#39; நிலையான சொத்து விற்பனை சோதிக்க முடியவில்லை
+DocType: Student Guardian,Father,அப்பா
+apps/erpnext/erpnext/controllers/accounts_controller.py +558,'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} ரத்து அல்லது நிறுத்தி
@@ -2636,15 +2667,15 @@
 DocType: Sales Order,Fully Delivered,முழுமையாக வழங்கப்படுகிறது
 DocType: Lead,Lower Income,குறைந்த வருமானம்
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","லாபம் / நஷ்டம் பதிவு வேண்டிய பொறுப்பு கீழ் கணக்கு தலைவர் ,"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +166,Source and target warehouse cannot be same for row {0},மூல மற்றும் அடைவு கிடங்கில் வரிசையில் அதே இருக்க முடியாது {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",இந்த பங்கு நல்லிணக்க ஒரு தொடக்க நுழைவு என்பதால் வேறுபாடு அக்கவுண்ட் சொத்து / பொறுப்பு வகை கணக்கு இருக்க வேண்டும்
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +81,Purchase Order number required for Item {0},கொள்முதல் ஆணை எண் பொருள் தேவை {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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/purchase_receipt/purchase_receipt.py +82,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 +17,Cannot change status as student {0} is linked with student application {1},மாணவர் என நிலையை மாற்ற முடியாது {0} மாணவர் பயன்பாடு இணைந்தவர் {1}
+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: Timesheet,"List of employee which has ""Salary Slip Based on Timesheet"" is enabled in salary structure.",&quot;டைம் ஷீட் அடிப்படையில் சம்பளம் ஸ்லிப்&quot; கொண்ட ஊழியர் பட்டியல் சம்பளத் திட்டத்தை செயல்படுத்தப்படும்.
 DocType: Asset,Fully Depreciated,முழுமையாக Depreciated
 ,Stock Projected Qty,பங்கு அளவு திட்டமிடப்பட்ட
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Customer {0} does not belong to project {1},வாடிக்கையாளர் {0} திட்டம் அல்ல {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,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,தொ.எ. மற்றும் தொகுதி
@@ -2656,7 +2687,7 @@
 DocType: Purchase Invoice,Purchase Taxes and Charges,கொள்முதல் வரி மற்றும் கட்டணங்கள்
 ,Qty to Receive,மதுரையில் அளவு
 DocType: Leave Block List,Leave Block List Allowed,அனுமதிக்கப்பட்ட பிளாக் பட்டியல் விட்டு
-apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +55,All Warehouses,அனைத்து கிடங்குகள்
+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 +105,Credit To account must be a Balance Sheet account,கணக்கில் பணம் வரவு ஒரு ஐந்தொகை கணக்கில் இருக்க வேண்டும்
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,அனைத்து வழங்குபவர் வகைகள்
@@ -2668,10 +2699,10 @@
 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/manufacturing/doctype/bom/bom.js +26,Browse BOM,"உலவ BOM,"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,"உலவ BOM,"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,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 Year,Academic Year,கல்வி ஆண்டில்
+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,"
 DocType: Appraisal,Appraisal,மதிப்பிடுதல்
@@ -2679,12 +2710,12 @@
 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 +197,Leave approver must be one of {0},"விட்டு வீடு, ஒன்றாக இருக்க வேண்டும் {0}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,Leave approver must be one of {0},"விட்டு வீடு, ஒன்றாக இருக்க வேண்டும் {0}"
 DocType: Hub Settings,Seller Email,விற்பனையாளர் மின்னஞ்சல்
 DocType: Project,Total Purchase Cost (via Purchase Invoice),மொத்த கொள்முதல் விலை (கொள்முதல் விலைப்பட்டியல் வழியாக)
 DocType: Workstation Working Hour,Start Time,தொடக்க நேரம்
 DocType: Item Price,Bulk Import Help,மொத்த இறக்குமதி உதவி
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +256,Select Quantity,தேர்வு அளவு
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +257,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,செய்தி அனுப்பப்பட்டது
@@ -2701,6 +2732,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,இலக்கு அளவு அல்லது இலக்கு அளவு அல்லது கட்டாயமாகும்.
 apps/erpnext/erpnext/config/projects.py +45,Cost of various activities,பல்வேறு நடவடிக்கைகள் செலவு
 apps/erpnext/erpnext/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 +149,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}
 DocType: Item,Inspection Required,ஆய்வு தேவை
@@ -2720,7 +2752,7 @@
 DocType: Expense Claim,Approval Status,ஒப்புதல் நிலைமை
 DocType: Hub Settings,Publish Items to Hub,மையம் வெளியிடு
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},மதிப்பு வரிசையில் மதிப்பு குறைவாக இருக்க வேண்டும் {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Wire Transfer,வயர் மாற்றம்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,வயர் மாற்றம்
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,அனைத்து பாருங்கள்
 DocType: Sales Order,Recurring Order,வழக்கமாகத் தோன்றும் ஆணை
 DocType: Company,Default Income Account,முன்னிருப்பு வருமானம் கணக்கு
@@ -2732,21 +2764,19 @@
 ,Welcome to ERPNext,ERPNext வரவேற்கிறோம்
 apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,மேற்கோள் லீட்
 DocType: Lead,From Customer,வாடிக்கையாளர் இருந்து
-apps/erpnext/erpnext/demo/setup_data.py +357,Calls,கால்ஸ்
+apps/erpnext/erpnext/demo/setup/setup_data.py +300,Calls,கால்ஸ்
 DocType: Project,Total Costing Amount (via Time Logs),மொத்த செலவு தொகை (நேரத்தில் பதிவுகள் வழியாக)
 DocType: Purchase Order Item Supplied,Stock UOM,பங்கு மொறட்டுவ பல்கலைகழகம்
-apps/erpnext/erpnext/stock/doctype/item/item.py +466,"As there are existing transactions for this item, \
-							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","இந்த உருப்படி, நீங்கள் மதிப்புகள் மாற்ற முடியாது \ அங்கு இருக்கும் பரிவர்த்தனைகள் என &#39;சீரியல் இல்லை&#39;, &#39;தொகுதி உள்ளது, எந்த&#39;, மற்றும் &#39;மதிப்பீட்டு முறை&#39; &#39;பங்கு பொருளாக உள்ளது&#39;"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,Purchase Order {0} is not submitted,கொள்முதல் ஆணை {0} சமர்ப்பிக்க
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,திட்டமிடப்பட்ட
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},தொடர் இல {0} கிடங்கு அல்ல {1}
 apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,"குறிப்பு: இந்த அமைப்பு பொருள் விநியோகம் , மேல் முன்பதிவு பார்க்க மாட்டேன் {0} அளவு அல்லது அளவு 0 ஆகிறது"
 DocType: Notification Control,Quotation Message,மேற்கோள் செய்தி
 DocType: Issue,Opening Date,தேதி திறப்பு
-apps/erpnext/erpnext/schools/api.py +58,Attendance has been marked successfully.,வருகை வெற்றிகரமாக குறிக்கப்பட்டுள்ளது.
+apps/erpnext/erpnext/schools/api.py +57,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 +136,Account Type for {0} must be {1},கணக்கு வகை {0} இருக்க வேண்டும் {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +139,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,இரண்டு கிடங்கு அதே நிறுவனத்திற்கு சொந்தமானது வேண்டும்
@@ -2761,12 +2791,13 @@
 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/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 +20,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 +1190,Please select customer,வாடிக்கையாளர் தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1193,Please select customer,வாடிக்கையாளர் தேர்ந்தெடுக்கவும்
 DocType: C-Form,I,நான்
 DocType: Company,Asset Depreciation Cost Center,சொத்து தேய்மானம் செலவு மையம்
 DocType: Sales Order Item,Sales Order Date,விற்பனை ஆர்டர் தேதி
@@ -2776,6 +2807,7 @@
 ,Payment Period Based On Invoice Date,விலைப்பட்டியல் தேதியின் அடிப்படையில் கொடுப்பனவு காலம்
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},காணாமல் செலாவணி விகிதங்கள் {0}
 DocType: Assessment,Examiner,பரிசோதகர்
+DocType: Student,Siblings,உடன்பிறப்புகளின்
 DocType: Journal Entry,Stock Entry,பங்கு நுழைவு
 DocType: Payment Entry,Payment References,கொடுப்பனவு குறிப்புகள்
 DocType: C-Form,C-FORM-,சி படிவம்-
@@ -2793,11 +2825,12 @@
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,தலைப்பு பெயர்
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,விற்பனை அல்லது வாங்கும் குறைந்தபட்சம் ஒரு தேர்வு வேண்டும்
+DocType: Grading Structure,Grade Intervals,தரம் இடைவெளிகள்
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,உங்கள் வணிக தன்மை தேர்ந்தெடுக்கவும்.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,உற்பத்தி இயக்கங்களை எங்கே கொண்டுவரப்படுகின்றன.
 DocType: Asset Movement,Source Warehouse,மூல கிடங்கு
 DocType: Installation Note,Installation Date,நிறுவல் தேதி
-apps/erpnext/erpnext/controllers/accounts_controller.py +534,Row #{0}: Asset {1} does not belong to company {2},ரோ # {0}: சொத்து {1} நிறுவனம் சொந்தமானது இல்லை {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +537,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,விற்பனை பயனர்
@@ -2811,28 +2844,31 @@
 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 +111,Date Of Retirement must be greater than Date of Joining,ஓய்வு நாள் சேர தேதி விட அதிகமாக இருக்க வேண்டும்
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +49,There were errors while scheduling course on :,நிச்சயமாக திட்டமிடும் போது தவறுகள் இருந்தன:
 DocType: Sales Invoice,Against Income Account,வருமான கணக்கு எதிராக
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +87,{0}% Delivered,{0}% வழங்கப்படுகிறது
+apps/erpnext/erpnext/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 +379,Please set default {0} in Company {1},இயல்புநிலை {0} நிறுவனத்தின் அமைக்கவும் {1}
+apps/erpnext/erpnext/accounts/utils.py +456,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,மொத்த லாபம் / இழப்பு
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,கொள்முதல் ஆணை பொருள் வழங்கியது
 apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,நிறுவனத்தின் பெயர் நிறுவனத்தின் இருக்க முடியாது
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,அச்சு வார்ப்புருக்கள் லெடர்ஹெட்ஸ் .
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"அச்சு வார்ப்புருக்கள் தலைப்புகள் , எ.கா. செய்யறதுன்னு ."
+DocType: Student Guardian,Student Guardian,மாணவர் கார்டியன்
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +184,Valuation type charges can not marked as Inclusive,மதிப்பீட்டு வகை குற்றச்சாட்டுக்கள் உள்ளீடான என குறிக்கப்பட்டுள்ளன
 DocType: POS Profile,Update Stock,பங்கு புதுப்பிக்க
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,பொருட்களை பல்வேறு மொறட்டுவ பல்கலைகழகம் தவறான ( மொத்த ) நிகர எடை மதிப்பு வழிவகுக்கும். ஒவ்வொரு பொருளின் நிகர எடை அதே மொறட்டுவ பல்கலைகழகம் உள்ளது என்று உறுதி.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM விகிதம்
 DocType: Asset,Journal Entry for Scrap,ஸ்கிராப் பத்திரிகை நுழைவு
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,"டெலிவரி குறிப்பு இருந்து உருப்படிகள் இழுக்க , தயவு செய்து"
-apps/erpnext/erpnext/accounts/utils.py +349,Journal Entries {0} are un-linked,ஜர்னல் பதிவுகள் {0} ஐ.நா. இணைக்கப்பட்ட
+apps/erpnext/erpnext/accounts/utils.py +426,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,நிறுவனத்தின் வட்ட இனிய விலை மையம் குறிப்பிடவும்
@@ -2856,6 +2892,7 @@
 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,கருத்துக்களம்
+DocType: Homepage,"URL for ""All Products""",&quot;அனைத்து தயாரிப்புகள்&quot; URL ஐ
 DocType: Leave Application,Leave Balance Before Application,விண்ணப்ப முன் இருப்பு விட்டு
 DocType: SMS Center,Send SMS,எஸ்எம்எஸ் அனுப்ப
 DocType: Cheque Print Template,Width of amount in word,வார்த்தையில் அளவு அகலம்
@@ -2864,7 +2901,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 +29,Current Job Openings,தற்போதைய வேலை வாய்ப்புகள்
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,Current Job Openings,தற்போதைய வேலை வாய்ப்புகள்
 DocType: Company,Stock Adjustment Account,பங்கு சரிசெய்தல் கணக்கு
 DocType: Journal Entry,Write Off,இனிய எழுதவும்
 DocType: Timesheet Detail,Operation ID,ஆபரேஷன் ஐடி
@@ -2877,7 +2914,7 @@
 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 +850,Show tax break-up,காட்டு வரி இடைவெளிக்கு அப்
+apps/erpnext/erpnext/public/js/controllers/transaction.js +841,Show tax break-up,காட்டு வரி இடைவெளிக்கு அப்
 apps/erpnext/erpnext/accounts/party.py +308,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} எதிராக உள்ளன எனவே நீங்கள் மீண்டும் ஒதுக்க அல்லது அதை மாற்ற முடியாது"
@@ -2887,10 +2924,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 +534,Please select Posting Date before selecting Party,"கட்சி தேர்வு செய்யும் முன், பதிவுசெய்ய தேதி தேர்ந்தெடுக்கவும்"
 DocType: Serial No,Out of AMC,AMC வெளியே
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +80,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 +162,Please contact to the user who have Sales Master Manager {0} role,விற்பனை மாஸ்டர் மேலாளர் {0} பங்கு கொண்ட பயனர் தொடர்பு கொள்ளவும்
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +195,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 +5,This is based on the attendance of this Student,இந்த மாணவர் வருகை அடிப்படையாக கொண்டது
@@ -2899,12 +2937,11 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,டெலிவரி குறிப்புகள் {0} இந்த விற்பனை ஆணை ரத்து முன் ரத்து செய்யப்பட வேண்டும்
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +75,Paid amount + Write Off Amount can not be greater than Grand Total,பணம் அளவு + அளவு தள்ளுபடி கிராண்ட் மொத்த விட முடியாது
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,{0} is not a valid Batch Number for Item {1},{0} உருப்படி ஒரு செல்லுபடியாகும் தொகுதி எண் அல்ல {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +138,Note: There is not enough leave balance for Leave Type {0},குறிப்பு: விடுப்பு வகை போதுமான விடுப்பு சமநிலை இல்லை {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,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,வாய்ப்பு வகை
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,புதிய நிறுவனம்
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,Cost Center is required for 'Profit and Loss' account {0},செலவு மையம் ' இலாப நட்ட ' கணக்கு தேவைப்படுகிறது {0}
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,மட்டுமே பரிவர்த்தனைகள் நிறுவனத்தின் உருவாக்கியவர் நீக்கப்படலாம்
 apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,பொது லெட்ஜர் பதிவுகள் தவறான அறிந்தனர். நீங்கள் பரிவர்த்தனை ஒரு தவறான கணக்கு தேர்வு.
 DocType: Cheque Print Template,Cheque Width,காசோலை அகலம்
@@ -2913,16 +2950,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,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 +228,{0} '{1}' is disabled,{0} {1} 'முடக்கப்பட்டுள்ளது
+apps/erpnext/erpnext/controllers/accounts_controller.py +231,{0} '{1}' is disabled,{0} {1} 'முடக்கப்பட்டுள்ளது
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,திறந்த அமை
 DocType: Cheque Print Template,Scanned Cheque,ஸ்கேன் காசோலை
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,சமர்ப்பிக்கும் பரிமாற்றங்கள் மீது தொடர்புகள் தானியங்கி மின்னஞ்சல்களை அனுப்ப.
+DocType: Timesheet,Total Billable Amount,மொத்த பில்லிடக்கூடியது தொகை
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,பொருள் 3
 DocType: Purchase Order,Customer Contact Email,வாடிக்கையாளர் தொடர்பு மின்னஞ்சல்
 DocType: Warranty Claim,Item and Warranty Details,பொருள் மற்றும் உத்தரவாதத்தை விபரங்கள்
 DocType: Sales Team,Contribution (%),பங்களிப்பு (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,குறிப்பு: கொடுப்பனவு நுழைவு ' பண அல்லது வங்கி கணக்கு ' குறிப்பிடப்படவில்லை என்பதால் உருவாக்கப்பட்டது முடியாது
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Responsibilities,பொறுப்புகள்
+apps/erpnext/erpnext/controllers/accounts_controller.py +78,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,பொறுப்புகள்
 DocType: Expense Claim Account,Expense Claim Account,செலவு கூறுகின்றனர் கணக்கு
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,டெம்ப்ளேட்
 DocType: Sales Person,Sales Person Name,விற்பனை நபர் பெயர்
@@ -2930,6 +2968,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,பயனர்கள் சேர்க்கவும்
 DocType: Pricing Rule,Item Group,உருப்படியை குழு
 DocType: Item,Safety Stock,பாதுகாப்பு பங்கு
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,பொருள் குறியீடு&gt; பொருள் குழு&gt; பிராண்ட்
 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),வரிகள் மற்றும் கட்டணங்கள் சேர்க்கப்பட்டது (நிறுவனத்தின் கரன்சி)
@@ -2939,7 +2978,6 @@
 DocType: Item,Default BOM,முன்னிருப்பு BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Please re-type company name to confirm,மீண்டும் தட்டச்சு நிறுவனத்தின் பெயர் உறுதிப்படுத்த தயவு செய்து
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +67,Total Outstanding Amt,மொத்த மிகச்சிறந்த விவரங்கள்
-DocType: Timesheet,Total Hours,மொத்த நேரம்
 DocType: Journal Entry,Printing Settings,அச்சிடுதல் அமைப்புகள்
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Total Debit must be equal to Total Credit. The difference is {0},மொத்த பற்று மொத்த கடன் சமமாக இருக்க வேண்டும் .
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,வாகன
@@ -2952,13 +2990,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,முதலீட்டு வங்கி
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +71,Cash or Bank Account is mandatory for making payment entry,பண அல்லது வங்கி கணக்கு கொடுப்பனவு நுழைவு செய்யும் கட்டாய
 DocType: Purchase Invoice,Price List Exchange Rate,விலை பட்டியல் செலாவணி விகிதம்
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,வாடிக்கையாளர்&gt; வாடிக்கையாளர் குழு&gt; பிரதேசம்
 DocType: Purchase Invoice Item,Rate,விலை
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Intern,நடமாட்டத்தை கட்டுபடுத்து
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,நடமாட்டத்தை கட்டுபடுத்து
 DocType: Stock Entry,From BOM,"BOM, இருந்து"
 DocType: Assessment,Assessment Code,மதிப்பீடு குறியீடு
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +32,Basic,அடிப்படையான
+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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"' உருவாக்குதல் அட்டவணை ' கிளிக் செய்து,"
+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 +95,Reference No is mandatory if you entered Reference Date,நீங்கள் பரிந்துரை தேதி உள்ளிட்ட குறிப்பு இல்லை கட்டாயமாகும்
@@ -2967,11 +3006,11 @@
 DocType: Salary Slip,Salary Structure,சம்பளம் அமைப்பு
 DocType: Account,Bank,வங்கி
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,விமானத்துறை
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +752,Issue Material,பிரச்சினை பொருள்
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +723,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 +683,You are in offline mode. You will not be able to reload until you have network.,நீங்கள் ஆஃப்லைனில் உள்ளன. நீங்கள் பிணைய வேண்டும் வரை ஏற்றவும் முடியாது.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +665,You are in offline mode. You will not be able to reload until you have network.,நீங்கள் ஆஃப்லைனில் உள்ளன. நீங்கள் பிணைய வேண்டும் வரை ஏற்றவும் முடியாது.
 DocType: Hub Settings,Access Token,அணுகல் டோக்கன்
 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,இல்லை தொடர்
@@ -2979,33 +3018,35 @@
 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 +1122,Enter value must be positive,உள்ளிடவும் மதிப்பு நேர்மறையாக இருக்க வேண்டும்
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,All Territories,அனைத்து பிரதேசங்களையும்
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1125,Enter value must be positive,உள்ளிடவும் மதிப்பு நேர்மறையாக இருக்க வேண்டும்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,அனைத்து பிரதேசங்களையும்
 DocType: Purchase Invoice,Items,உருப்படிகள்
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +23,Student is already enrolled.,மாணவர் ஏற்கனவே பதிவு செய்யப்பட்டது.
 DocType: Fiscal Year,Year Name,ஆண்டு பெயர்
 DocType: Process Payroll,Process Payroll,செயல்முறை சம்பளப்பட்டியல்
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,இந்த மாதம் வேலை நாட்களுக்கு மேல் விடுமுறை உள்ளன .
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +233,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 +96,Request for Quotations,விலைக்குறிப்புகளுக்கான வேண்டுகோள்
+apps/erpnext/erpnext/hooks.py +104,Request for Quotations,விலைக்குறிப்புகளுக்கான வேண்டுகோள்
 DocType: Payment Reconciliation,Maximum Invoice Amount,அதிகபட்ச விலைப்பட்டியல் அளவு
 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 +628,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',மாற்று அளவீடு இயல்புநிலை யூனிட் &#39;{0}&#39; டெம்ப்ளேட் அதே இருக்க வேண்டும் &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',மாற்று அளவீடு இயல்புநிலை யூனிட் &#39;{0}&#39; டெம்ப்ளேட் அதே இருக்க வேண்டும் &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,ஆனால் அடிப்படையில் கணக்கிட
 DocType: Delivery Note Item,From Warehouse,கிடங்கில் இருந்து
 DocType: Assessment,Supervisor Name,மேற்பார்வையாளர் பெயர்
+DocType: Assessment,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,கொள்முதல் பயனர்
 DocType: Notification Control,Customize the Notification,அறிவிப்பு தனிப்பயனாக்கு
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Cash Flow from Operations,செயல்பாடுகள் இருந்து பண பரிமாற்ற
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,இயல்புநிலை முகவரி டெம்ப்ளேட் நீக்க முடியாது
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,இயல்புநிலை முகவரி டெம்ப்ளேட் நீக்க முடியாது
 DocType: Sales Invoice,Shipping Rule,கப்பல் விதி
 DocType: Manufacturer,Limited to 12 characters,12 எழுத்துக்கள் மட்டுமே
 DocType: Journal Entry,Print Heading,தலைப்பு அச்சிட
@@ -3020,8 +3061,8 @@
 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/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,இலக்கு அளவு அல்லது இலக்கு அளவு அல்லது கட்டாய
-apps/erpnext/erpnext/stock/get_item_details.py +485,No default BOM exists for Item {0},இயல்புநிலை BOM உள்ளது உருப்படி {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +336,Please select Posting Date first,முதல் பதிவுசெய்ய தேதி தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/stock/get_item_details.py +486,No default BOM exists for Item {0},இயல்புநிலை BOM உள்ளது உருப்படி {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +326,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,ஏற்கனவே பரிவர்த்தனைகள் செலவு மையம் லெட்ஜரிடம் மாற்ற முடியாது
@@ -3037,6 +3078,7 @@
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,பொருள் கொண்ட போட்டி கொடுப்பனவு
 DocType: Journal Entry,Bank Entry,வங்கி நுழைவு
 DocType: Authorization Rule,Applicable To (Designation),பொருந்தும் (பதவி)
+,Profitability Analysis,இலாபத்தன்மைப் பகுப்பாய்வு
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,வணிக வண்டியில் சேர்
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,குழு மூலம்
 DocType: Guardian,Interests,ஆர்வம்
@@ -3049,22 +3091,22 @@
 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 +141,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","தொடராக பொருள் {0} பங்கு நல்லிணக்க பயன்படுத்தி \
  மேம்படுத்தப்பட்டது"
 DocType: Scheduling Tool,Day,தினம்
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,புதிய சீரியல் இல்லை கிடங்கு முடியாது . கிடங்கு பங்கு நுழைவு அல்லது கொள்முதல் ரசீது மூலம் அமைக்க வேண்டும்
 DocType: Lead,Lead Type,வகை இட்டு
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,You are not authorized to approve leaves on Block Dates,நீங்கள் பிளாக் தேதிகள் இலைகள் ஒப்புதல் அங்கீகாரம் இல்லை
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,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: Student Applicant,AP.,ஆந்திர.
 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 +639,Point of Sale,விற்பனை செய்யுமிடம்
+apps/erpnext/erpnext/accounts/page/pos/pos.js +634,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,வரி
 DocType: Production Planning Tool,Production Planning Tool,உற்பத்தி திட்டமிடல் கருவி
@@ -3073,74 +3115,77 @@
 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 +373,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 Entry,Update Rate and Availability,மேம்படுத்தல் விகிதம் மற்றும் கிடைக்கும்
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,நீங்கள் அளவு எதிராக இன்னும் பெற அல்லது வழங்க அனுமதிக்கப்படுகிறது சதவீதம் உத்தரவிட்டது. எடுத்துக்காட்டாக: நீங்கள் 100 அலகுகள் உத்தரவிட்டார் என்றால். உங்கள் அலவன்ஸ் 10% நீங்கள் 110 அலகுகள் பெற அனுமதிக்கப்படும்.
 DocType: POS Profile,Customer Group,வாடிக்கையாளர் பிரிவு
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,Expense account is mandatory for item {0},செலவு கணக்கு உருப்படியை கட்டாய {0}
 DocType: Item,Website Description,இணையதளத்தில் விளக்கம்
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date must be on or after today,அடுத்த தேய்மானம் தேதி அல்லது இன்று பின் இருக்க வேண்டும்
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,ஈக்விட்டி நிகர மாற்றம்
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +145,Please cancel Purchase Invoice {0} first,கொள்முதல் விலைப்பட்டியல் {0} ரத்து செய்க முதல்
 DocType: Serial No,AMC Expiry Date,AMC காலாவதியாகும் தேதி
 ,Sales Register,விற்பனை பதிவு
 DocType: Quotation,Quotation Lost Reason,மேற்கோள் காரணம் லாஸ்ட்
+apps/erpnext/erpnext/utilities/doctype/address/address.py +164,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,இயல்புநிலை முகவரி டெம்ப்ளேட் காணப்படும். அமைப்பு&gt; அச்சிடுதல் மற்றும் பிராண்டிங்&gt; முகவரி டெம்ப்ளேட் இருந்து ஒரு புதிய ஒன்றை உருவாக்க கொள்ளவும்.
 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 +330,Transaction reference no {0} dated {1},பரிவர்த்தனை குறிப்பு இல்லை {0} தேதியிட்ட {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Transaction reference no {0} dated {1},பரிவர்த்தனை குறிப்பு இல்லை {0} தேதியிட்ட {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,திருத்த எதுவும் இல்லை .
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,Summary for this month and pending activities,இந்த மாதம் மற்றும் நிலுவையில் நடவடிக்கைகள் சுருக்கம்
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,இந்த மாதம் மற்றும் நிலுவையில் நடவடிக்கைகள் சுருக்கம்
 DocType: Customer Group,Customer Group Name,வாடிக்கையாளர் குழு பெயர்
 apps/erpnext/erpnext/public/js/financial_statements.js +54,Cash Flow Statement,பணப்பாய்வு அறிக்கை
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Please remove this Invoice {0} from C-Form {1},சி-படிவம் இந்த விலைப்பட்டியல் {0} நீக்கவும் {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,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 +644,Get Items,பொருட்கள் கிடைக்கும்
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +623,Get Items,பொருட்கள் கிடைக்கும்
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +210,Please enter Write Off Account,கணக்கு எழுத உள்ளிடவும்
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,கடைசி ஆர்டர் தேதி
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +41,Account {0} does not belongs to company {1},கணக்கு {0} செய்கிறது நிறுவனம் சொந்தமானது {1}
+DocType: Student,Guardian Details,கார்டியன் விபரங்கள்
 DocType: C-Form,C-Form,சி படிவம்
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,பல ஊழியர்கள் மார்க் வருகை
 DocType: Payment Request,Initiated,தொடங்கப்பட்ட
 DocType: Production Order,Planned Start Date,திட்டமிட்ட தொடக்க தேதி
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,Customer is required against Receivable account {0},வாடிக்கையாளர் பெறத்தக்க கணக்கு எதிராக தேவைப்படுகிறது {0}
 DocType: Serial No,Creation Document Type,உருவாக்கம் ஆவண வகை
 DocType: Leave Type,Is Encash,ரொக்கமான மாற்று இல்லை
 DocType: Purchase Invoice,Mobile No,இல்லை மொபைல்
 DocType: Leave Allocation,New Leaves Allocated,புதிய ஒதுக்கப்பட்ட இலைகள்
-apps/erpnext/erpnext/controllers/trends.py +265,Project-wise data is not available for Quotation,திட்ட வாரியான தரவு மேற்கோள் கிடைக்கவில்லை
+apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,திட்ட வாரியான தரவு மேற்கோள் கிடைக்கவில்லை
 DocType: Project,Expected End Date,எதிர்பார்க்கப்படுகிறது முடிவு தேதி
 DocType: Budget Account,Budget Amount,பட்ஜெட் தொகை
 DocType: Appraisal Template,Appraisal Template Title,மதிப்பீட்டு வார்ப்புரு தலைப்பு
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,Commercial,வர்த்தகம்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,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 +648,Row {0}# Account must be of type 'Fixed Asset',ரோ {0} # கணக்கு வகை இருக்க வேண்டும் &#39;நிலையான சொத்து&#39;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Row {0}# Account must be of type 'Fixed Asset',ரோ {0} # கணக்கு வகை இருக்க வேண்டும் &#39;நிலையான சொத்து&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,அளவு அவுட்
 apps/erpnext/erpnext/config/accounts.py +278,Rules to calculate shipping amount for a sale,ஒரு விற்பனை கப்பல் அளவு கணக்கிட விதிகள்
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +30,Series is mandatory,தொடர் கட்டாயமாகும்
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +50,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}
 DocType: Leave Allocation,Unused leaves,பயன்படுத்தப்படாத இலைகள்
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Cr,Cr
 DocType: Tax Rule,Billing State,பில்லிங் மாநிலம்
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +250,Transfer,பரிமாற்றம்
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +187,{0} {1} does not associated with Party Account {2},{0} {1} கட்சி கணக்குடன் தொடர்புடைய இல்லை {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,Fetch exploded BOM (including sub-assemblies),( துணை கூட்டங்கள் உட்பட ) வெடித்தது BOM எடு
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +254,Transfer,பரிமாற்றம்
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +190,{0} {1} does not associated with Party Account {2},{0} {1} கட்சி கணக்குடன் தொடர்புடைய இல்லை {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +796,Fetch exploded BOM (including sub-assemblies),( துணை கூட்டங்கள் உட்பட ) வெடித்தது BOM எடு
 DocType: Authorization Rule,Applicable To (Employee),பொருந்தும் (பணியாளர்)
-apps/erpnext/erpnext/controllers/accounts_controller.py +115,Due Date is mandatory,தேதி அத்தியாவசியமானதாகும்
+apps/erpnext/erpnext/controllers/accounts_controller.py +118,Due Date is mandatory,தேதி அத்தியாவசியமானதாகும்
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,பண்பு உயர்வு {0} 0 இருக்க முடியாது
 DocType: Journal Entry,Pay To / Recd From,வரம்பு / Recd செய்ய பணம்
 DocType: Naming Series,Setup Series,அமைப்பு தொடர்
 DocType: Payment Reconciliation,To Invoice Date,தேதி விலைப்பட்டியல்
 DocType: Supplier,Contact HTML,தொடர்பு HTML
 ,Inactive Customers,செயல்பாடற்ற வாடிக்கையாளர்கள்
+DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,கொள்முதல் ரசீதுகள்
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,எப்படி விலை பயன்படுத்தப்படும் விதி என்ன?
 DocType: Quality Inspection,Delivery Note No,டெலிவரி குறிப்பு இல்லை
@@ -3149,7 +3194,7 @@
 DocType: Company,Retail,சில்லறை
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +120,Customer {0} does not exist,வாடிக்கையாளர் {0} இல்லை
 DocType: Attendance,Absent,வராதிரு
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +587,Product Bundle,தயாரிப்பு மூட்டை
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Product Bundle,தயாரிப்பு மூட்டை
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Invalid reference {1},ரோ {0}: தவறான குறிப்பு {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,வரி மற்றும் கட்டணங்கள் வார்ப்புரு வாங்க
 DocType: Upload Attendance,Download Template,வார்ப்புரு பதிவிறக்க
@@ -3159,8 +3204,8 @@
 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 +742,Send Supplier Emails,சப்ளையர் மின்னஞ்சல்கள் அனுப்ப
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +104,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","சம்பளம் ஏற்கனவே இடையே {0} மற்றும் {1}, விட்டு பயன்பாடு காலத்தில் இந்த தேதி வரம்பில் இடையே இருக்க முடியாது காலத்தில் பதப்படுத்தப்பட்ட."
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +708,Send Supplier Emails,சப்ளையர் மின்னஞ்சல்கள் அனுப்ப
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,"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,கார்டியன் வட்டி
 DocType: Timesheet,Employee Detail,பணியாளர் விபரம்
@@ -3171,9 +3216,9 @@
 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/accounts/doctype/gl_entry/gl_entry.py +77,Account {0} cannot be a Group,கணக்கு {0} ஒரு குழுவாக  இருக்க முடியாது
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} cannot be a Group,கணக்கு {0} ஒரு குழுவாக  இருக்க முடியாது
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +31,Optional. This setting will be used to filter in various transactions.,விருப்ப . இந்த அமைப்பு பல்வேறு நடவடிக்கைகளில் வடிகட்ட பயன்படும்.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +107,Negative Valuation Rate is not allowed,எதிர்மறை மதிப்பீட்டு விகிதம் அனுமதி இல்லை
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,எதிர்மறை மதிப்பீட்டு விகிதம் அனுமதி இல்லை
 DocType: Holiday List,Weekly Off,இனிய வாராந்திர
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","உதாரணமாக 2012, 2012-13 க்கான"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +39,Provisional Profit / Loss (Credit),இடைக்கால லாபம் / நஷ்டம் (கடன்)
@@ -3187,16 +3232,16 @@
 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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: செலவு மையம் பொருள் கட்டாய {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +626,Get Items from Product Bundle,தயாரிப்பு மூட்டை இருந்து பொருட்களை பெற
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +605,Get Items from Product Bundle,தயாரிப்பு மூட்டை இருந்து பொருட்களை பெற
 DocType: Asset,Straight Line,நேர் கோடு
 DocType: Project User,Project User,திட்ட பயனர்
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} is inactive,கணக்கு {0} செயலற்று
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} is inactive,கணக்கு {0} செயலற்று
 DocType: GL Entry,Is Advance,முன்பணம்
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,தேதி தேதி மற்றும் வருகை வருகை கட்டாய ஆகிறது
 apps/erpnext/erpnext/controllers/buying_controller.py +148,Please enter 'Is Subcontracted' as Yes or No,உள்ளிடவும் ஆம் அல்லது இல்லை என ' துணை ஒப்பந்தம்'
 DocType: Sales Team,Contact No.,இல்லை தொடர்பு
 DocType: Bank Reconciliation,Payment Entries,கொடுப்பனவு பதிவுகள்
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,'Profit and Loss' type account {0} not allowed in Opening Entry,' இலாப நட்ட ' வகை கணக்கு {0} நுழைவு திறந்து அனுமதி இல்லை
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +71,'Profit and Loss' type account {0} not allowed in Opening Entry,' இலாப நட்ட ' வகை கணக்கு {0} நுழைவு திறந்து அனுமதி இல்லை
 DocType: Program Enrollment Tool,Get Students From,இருந்து மாணவர்கள் பெற
 DocType: Hub Settings,Seller Country,விற்பனையாளர் நாடு
 apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,இணையத்தளம் வெளியிடு
@@ -3215,7 +3260,7 @@
 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 +558,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","ரோ # {0}: சொத்து {1} சமர்ப்பிக்க முடியாது, அது ஏற்கனவே {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +561,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","ரோ # {0}: சொத்து {1} சமர்ப்பிக்க முடியாது, அது ஏற்கனவே {2}"
 DocType: Tax Rule,Billing Country,பில்லிங் நாடு
 DocType: Production Order,Expected Delivery Date,எதிர்பார்க்கப்படுகிறது டெலிவரி தேதி
 apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,கடன் மற்றும் பற்று {0} # சம அல்ல {1}. வித்தியாசம் இருக்கிறது {2}.
@@ -3228,13 +3273,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +202,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: Sales Order,% Amount Billed,கணக்கில்% தொகை
+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 +117,No Item with Serial No {0},சீரியல் இல்லை இல்லை பொருள் {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,திறந்த அறிவிப்புகள்
+DocType: Email Digest,Open Notifications,திறந்த அறிவிப்புகள்
 DocType: Payment Entry,Difference Amount (Company Currency),வேறுபாடு தொகை (நிறுவனத்தின் நாணய)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,நேரடி செலவுகள்
 apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
@@ -3242,7 +3287,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,புதிய வாடிக்கையாளர் வருவாய்
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,போக்குவரத்து செலவுகள்
 DocType: Maintenance Visit,Breakdown,முறிவு
-apps/erpnext/erpnext/controllers/accounts_controller.py +634,Account: {0} with currency: {1} can not be selected,கணக்கு: {0} நாணயத்துடன்: {1} தேர்வு செய்ய முடியாது
+apps/erpnext/erpnext/controllers/accounts_controller.py +637,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}
 DocType: Program Enrollment Tool,Student Applicants,மாணவர் விண்ணப்பதாரர்கள்
@@ -3250,15 +3295,15 @@
 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 +56,Probation,சோதனை காலம்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Probation,சோதனை காலம்
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,சம்பளம் கூறுகள்
 DocType: Program Enrollment Tool,New Academic Year,புதிய கல்வி ஆண்டு
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Payment of salary for the month {0} and year {1},மாதம் சம்பளம் கொடுப்பனவு {0} மற்றும் ஆண்டு {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Payment of salary for the month {0} and year {1},மாதம் சம்பளம் கொடுப்பனவு {0} மற்றும் ஆண்டு {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,வாகன நுழைவு விலை பட்டியல் விகிதம் காணாமல் என்றால்
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,மொத்த கட்டண தொகை
 DocType: Production Order Item,Transferred Qty,அளவு மாற்றம்
 apps/erpnext/erpnext/config/learn.py +11,Navigating,வழிநடத்தல்
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Planning,திட்டமிடல்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,திட்டமிடல்
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,வெளியிடப்படுகிறது
 DocType: Project,Total Billing Amount (via Time Logs),மொத்த பில்லிங் அளவு (நேரத்தில் பதிவுகள் வழியாக)
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,We sell this Item,நாம் இந்த பொருளை விற்க
@@ -3271,11 +3316,10 @@
 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.,மின்னஞ்சல் வழியாக வழக்கமான சுருக்கம் அறிக்கைகள் அனுப்பவும்.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Sales invoice submitted sucessfully.,விற்பனை விலைப்பட்டியல் வெற்றிகரமாக சமர்ப்பித்த.
 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}
 DocType: Assessment Result,Student Name,மாணவன் பெயர்
-apps/erpnext/erpnext/hooks.py +104,Assessment Schedule,மதிப்பீட்டு அட்டவணை
+apps/erpnext/erpnext/hooks.py +113,Assessment Schedule,மதிப்பீட்டு அட்டவணை
 DocType: Brand,Item Manager,பொருள் மேலாளர்
 DocType: Buying Settings,Default Supplier Type,முன்னிருப்பு சப்ளையர் வகை
 DocType: Production Order,Total Operating Cost,மொத்த இயக்க செலவு
@@ -3285,6 +3329,7 @@
 DocType: GL Entry,Party Type,கட்சி வகை
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +78,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
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,சம்பளம் வார்ப்புரு மாஸ்டர் .
 DocType: Leave Type,Max Days Leave Allowed,மேக்ஸ் நாட்கள் அனுமதிக்கப்பட்ட விடவும்
@@ -3296,18 +3341,19 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,தாங்கியவர்கள் விளைவாக அல்லது வாடிக்கையாளர்களுக்கு மேற்கோள்.
 DocType: Stock Settings,Role Allowed to edit frozen stock,உறைந்த பங்கு திருத்த அனுமதி பங்கு
 ,Territory Target Variance Item Group-Wise,மண்டலம் இலக்கு வேறுபாடு பொருள் குழு வாரியாக
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Customer Groups,அனைத்து வாடிக்கையாளர் குழுக்கள்
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +78,Accumulated Monthly,திரட்டப்பட்ட மாதாந்திர
-apps/erpnext/erpnext/controllers/accounts_controller.py +595,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} கட்டாயமாகும். ஒருவேளை செலாவணி சாதனை {2} செய்ய {1} உருவாக்கப்பட்டது அல்ல.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,அனைத்து வாடிக்கையாளர் குழுக்கள்
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +81,Accumulated Monthly,திரட்டப்பட்ட மாதாந்திர
+apps/erpnext/erpnext/controllers/accounts_controller.py +598,{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} இல்லை
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),விலை பட்டியல் விகிதம் (நிறுவனத்தின் கரன்சி)
 DocType: Products Settings,Products Settings,தயாரிப்புகள் அமைப்புகள்
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +188,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} அமைப்பு&gt; அமைப்புகள் வழியாக&gt; பெயரிடும் தொடர் தொடர் பெயரிடும் அமைக்கவும்
 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 +84,Secretary,காரியதரிசி
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,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,வாங்குதல்
@@ -3316,24 +3362,22 @@
 ,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,மதிப்பீடு பெயர்
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,ரோ # {0}: தொடர் எந்த கட்டாய ஆகிறது
+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 +859,Supplier Quotation,வழங்குபவர் விலைப்பட்டியல்
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +838,Supplier Quotation,வழங்குபவர் விலைப்பட்டியல்
 DocType: Quotation,In Words will be visible once you save the Quotation.,நீங்கள் மேற்கோள் சேமிக்க முறை சொற்கள் காணக்கூடியதாக இருக்கும்.
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +7,Collect Fees,கட்டணம் சேகரிக்க
+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}
 DocType: Lead,Add to calendar on this date,இந்த தேதி நாள்காட்டியில் சேர்க்கவும்
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,கப்பல் செலவுகள் சேர்த்து விதிகள் .
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,எதிர்வரும் நிகழ்வுகள்
 DocType: Item,Opening Stock,ஆரம்ப இருப்பு
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,வாடிக்கையாளர் தேவை
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} திரும்ப அத்தியாவசியமானதாகும்
 DocType: Purchase Order,To Receive,பெற
 apps/erpnext/erpnext/public/js/setup_wizard.js +195,user@example.com,user@example.com
-DocType: Email Digest,Income / Expense,வருமான / செலவின
 DocType: Employee,Personal Email,தனிப்பட்ட மின்னஞ்சல்
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,மொத்த மாற்றத்துடன்
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","இயலுமைப்படுத்த என்றால், கணினி தானாக சரக்கு கணக்கியல் உள்ளீடுகள் பதிவு."
@@ -3345,13 +3389,14 @@
 DocType: Customer,From Lead,முன்னணி இருந்து
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,ஆணைகள் உற்பத்தி வெளியிடப்பட்டது.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,நிதியாண்டு தேர்ந்தெடுக்கவும் ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,POS Profile required to make POS Entry,பிஓஎஸ் செய்தது பிஓஎஸ் நுழைவு செய்ய வேண்டும்
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +509,POS Profile required to make POS Entry,பிஓஎஸ் செய்தது பிஓஎஸ் நுழைவு செய்ய வேண்டும்
 DocType: Program Enrollment Tool,Enroll Students,மாணவர்கள் பதிவுசெய்யவும்
 DocType: Hub Settings,Name Token,பெயர் டோக்கன்
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,ஸ்டாண்டர்ட் விற்பனை
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Atleast one warehouse is mandatory,குறைந்தது ஒரு கிடங்கில் அவசியமானதாகும்
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +129,Atleast one warehouse is mandatory,குறைந்தது ஒரு கிடங்கில் அவசியமானதாகும்
 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 +330,{0} against Sales Invoice {1},{0} விற்பனை விலைப்பட்டியல் எதிரான {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,திட்டம் பெயர்
@@ -3372,10 +3417,11 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,இலைகள் 0.5 மடங்குகள் ஒதுக்கீடு
 DocType: Production Order,Operation Cost,அறுவை சிகிச்சை செலவு
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,ஒரு. Csv கோப்பு இருந்து வருகை பதிவேற்று
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,மிகச்சிறந்த விவரங்கள்
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,தொகுப்பு இந்த விற்பனை நபர் குழு வாரியான பொருள் குறிவைக்கிறது.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],உறைதல் பங்குகள் பழைய [days]
-apps/erpnext/erpnext/controllers/accounts_controller.py +528,Row #{0}: Asset is mandatory for fixed asset purchase/sale,ரோ # {0}: சொத்துக்கான நிலையான சொத்து வாங்க / விற்க அத்தியாவசியமானதாகும்
+apps/erpnext/erpnext/controllers/accounts_controller.py +531,Row #{0}: Asset is mandatory for fixed asset purchase/sale,ரோ # {0}: சொத்துக்கான நிலையான சொத்து வாங்க / விற்க அத்தியாவசியமானதாகும்
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","இரண்டு அல்லது அதற்கு மேற்பட்ட விலை விதிகள் மேலே நிபந்தனைகளை அடிப்படையாகக் காணப்படுகின்றன என்றால், முன்னுரிமை பயன்படுத்தப்படுகிறது. இயல்புநிலை மதிப்பு பூஜ்யம் (வெற்று) இருக்கும் போது முன்னுரிமை 20 0 இடையில் ஒரு எண். உயர் எண்ணிக்கை அதே நிலையில் பல விலை விதிகள் உள்ளன என்றால் அதை முன்னுரிமை எடுக்கும்."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,நிதியாண்டு {0} இல்லை உள்ளது
 DocType: Currency Exchange,To Currency,நாணய செய்ய
@@ -3392,15 +3438,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,தனியார் சமபங்கு
 DocType: Maintenance Visit,Customer Feedback,வாடிக்கையாளர் கருத்து
 DocType: Account,Expense,செலவு
-DocType: Sales Invoice,Exhibition,கண்காட்சி
 apps/erpnext/erpnext/utilities/doctype/address/address.py +77,"Company is mandatory, as it is your company address","அது உங்கள் நிறுவனத்தின் முகவரி போன்ற நிறுவனம், கட்டாயமாகும்"
 DocType: Item Attribute,From Range,வரம்பில் இருந்து
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +81,Syntax error in formula or condition: {0},சூத்திரம் அல்லது நிலையில் தொடரியல் பிழை: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +92,Syntax error in formula or condition: {0},சூத்திரம் அல்லது நிலையில் தொடரியல் பிழை: {0}
 apps/erpnext/erpnext/stock/utils.py +99,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 +28,Jobs,வேலைகள்
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,வேலைகள்
 ,Sales Order Trends,விற்பனை ஆணை போக்குகள்
 DocType: Employee,Held On,இல் நடைபெற்றது
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,உற்பத்தி பொருள்
@@ -3409,16 +3455,16 @@
 DocType: Stock Entry Detail,Additional Cost,கூடுதல் செலவு
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,நிதி ஆண்டு முடிவு தேதி
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","வவுச்சர் அடிப்படையில் வடிகட்ட முடியாது இல்லை , ரசீது மூலம் தொகுக்கப்பட்டுள்ளது என்றால்"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +763,Make Supplier Quotation,வழங்குபவர் மேற்கோள் செய்ய
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,Make Supplier Quotation,வழங்குபவர் மேற்கோள் செய்ய
 DocType: Quality Inspection,Incoming,அடுத்து வருகிற
 DocType: BOM,Materials Required (Exploded),பொருட்கள் தேவை (விரிவான)
 apps/erpnext/erpnext/public/js/setup_wizard.js +185,"Add users to your organization, other than yourself","உன்னை தவிர, உங்கள் நிறுவனத்தின் பயனர் சேர்க்க"
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,Row # {0}: Serial No {1} does not match with {2} {3},ரோ # {0}: தொ.எ. {1} பொருந்தவில்லை {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +42,Casual Leave,தற்செயல் விடுப்பு
+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,தற்செயல் விடுப்பு
 DocType: Batch,Batch ID,தொகுதி அடையாள
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,Note: {0},குறிப்பு: {0}
 ,Delivery Note Trends,பந்து குறிப்பு போக்குகள்
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +103,This Week's Summary,இந்த வார சுருக்கம்
+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} மட்டுமே பங்கு பரிவர்த்தனைகள் வழியாக புதுப்பிக்க முடியும்
 DocType: Student Group Creation Tool,Get Courses,மைதானங்கள் பெற
 DocType: GL Entry,Party,கட்சி
@@ -3428,7 +3474,7 @@
 DocType: Request for Quotation Item,Request for Quotation Item,மேற்கோள் பொருள் கோரிக்கை
 DocType: Purchase Order,To Bill,மசோதாவுக்கு
 DocType: Material Request,% Ordered,% உத்தரவிட்டார்
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Piecework,சிறுதுண்டு வேலைக்கு
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Piecework,சிறுதுண்டு வேலைக்கு
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,சராசரி. வாங்குதல் விகிதம்
 DocType: Task,Actual Time (in Hours),(மணிகளில்) உண்மையான நேரம்
 DocType: Employee,History In Company,நிறுவனத்தின் ஆண்டு வரலாறு
@@ -3445,7 +3491,7 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +350,{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 +162,Black,கருப்பு
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,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} உற்பத்தி பொருட்களை
@@ -3456,13 +3502,13 @@
 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 +69,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,மார்க் இருக்காது
 DocType: Journal Entry Account,Exchange Rate,அயல்நாட்டு நாணய பரிமாற்ற விகிதம் வீதம்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Sales Order {0} is not submitted,விற்பனை ஆணை {0} சமர்ப்பிக்க
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +527,Sales Order {0} is not submitted,விற்பனை ஆணை {0} சமர்ப்பிக்க
 DocType: Homepage,Tag Line,டேக் லைன்
 DocType: Fee Component,Fee Component,கட்டண பகுதியிலேயே
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +857,Add items from,இருந்து பொருட்களை சேர்க்கவும்
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +836,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: Cheque Print Template,Regular,வழக்கமான
 DocType: BOM,Last Purchase Rate,கடந்த கொள்முதல் விலை
@@ -3470,6 +3516,7 @@
 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} என்பதால் வகைகள் உண்டு
 ,Sales Person-wise Transaction Summary,விற்பனை நபர் வாரியான பரிவர்த்தனை சுருக்கம்
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +60,Cost Center is required for 'Profit and Loss' account {0}. Please set up a default Cost Center for the Company.,செலவு மையம் &#39;இலாப நட்ட கணக்கு {0} தேவைப்படுகிறது. நிறுவனத்தின் ஒரு இயல்பான செலவு மையம் அமைக்க கொள்ளவும்.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,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,மாதாந்திர விநியோகம் சதவீதங்கள்
@@ -3480,12 +3527,12 @@
 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 +710,Online,ஆன்லைன்
+apps/erpnext/erpnext/accounts/page/pos/pos.js +692,Online,ஆன்லைன்
 ,Available Stock for Packing Items,பொருட்கள் பொதி கிடைக்கும் பங்கு
 DocType: Item Variant,Item Variant,பொருள் மாற்று
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,வேறு எந்த இயல்புநிலை உள்ளது என இயல்புநிலை முகவரி டெம்ப்ளேட் அமைக்க
+apps/erpnext/erpnext/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 +74,Quality Management,தர மேலாண்மை
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,தர மேலாண்மை
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,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,ஊழியர் புற வேலை வரலாறு
@@ -3507,11 +3554,12 @@
 DocType: Student,Student Email ID,மாணவர் மின்னஞ்சல் ஐடி
 DocType: Employee,Notice (days),அறிவிப்பு ( நாட்கள்)
 DocType: Tax Rule,Sales Tax Template,விற்பனை வரி டெம்ப்ளேட்
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1520,Select items to save the invoice,விலைப்பட்டியல் காப்பாற்ற பொருட்களை தேர்வு
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1544,Select items to save the invoice,விலைப்பட்டியல் காப்பாற்ற பொருட்களை தேர்வு
 DocType: Employee,Encashment Date,பணமாக்கல் தேதி
 DocType: Account,Stock Adjustment,பங்கு சீரமைப்பு
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},இயல்புநிலை நடவடிக்கை செலவு நடவடிக்கை வகை உள்ளது - {0}
 DocType: Production Order,Planned Operating Cost,திட்டமிட்ட இயக்க செலவு
+DocType: Academic Term,Term Start Date,கால தொடக்க தேதி
 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,விண்ணப்பதாரர் பெயர்
@@ -3541,17 +3589,17 @@
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,கிடங்கு ( நிரந்தர இருப்பு ) கணக்கு இந்த கணக்கு கீழ் உருவாக்கப்பட்டது.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +119,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,பங்கு லெட்ஜர் நுழைவு கிடங்கு உள்ளது என கிடங்கு நீக்க முடியாது .
 DocType: Company,Distribution,பகிர்ந்தளித்தல்
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +8,Amount Paid,கட்டண தொகை
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Project Manager,திட்ட மேலாளர்
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,கட்டண தொகை
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,திட்ட மேலாளர்
 ,Quoted Item Comparison,மேற்கோள் காட்டப்பட்டது பொருள் ஒப்பீட்டு
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Dispatch,கொல்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,கொல்
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,மேக்ஸ் தள்ளுபடி உருப்படியை அனுமதி: {0} {1}% ஆகும்
 apps/erpnext/erpnext/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.,அமைக்க கடன் எல்லை மீறிய நடவடிக்கைகளை சமர்ப்பிக்க அனுமதி என்று பாத்திரம்.
-DocType: Sales Invoice,Supplier Reference,வழங்குபவர் குறிப்பு
-apps/erpnext/erpnext/accounts/page/pos/pos.js +844,"Master data syncing, it might take some time","மாஸ்டர் தரவு ஒத்திசைவை, அது சில நேரம் ஆகலாம்"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +832,"Master data syncing, it might take some time","மாஸ்டர் தரவு ஒத்திசைவை, அது சில நேரம் ஆகலாம்"
 DocType: Item,Material Issue,பொருள் வழங்கல்
 DocType: Hub Settings,Seller Description,விற்பனையாளர் விளக்கம்
 DocType: Employee Education,Qualification,தகுதி
@@ -3565,7 +3613,7 @@
 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 +83,Error in formula or condition,சூத்திரம் அல்லது நிலையில் பிழை
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,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,அனைத்தையும் தேர்வுநீக்கு
@@ -3574,7 +3622,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},தேதி நிதி ஆண்டின் க்குள் இருக்க வேண்டும். தேதி நிலையினை = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","இங்கே நீங்கள் உயரம், எடை, ஒவ்வாமை, மருத்துவ கவலைகள் ஹிப்ரு பராமரிக்க முடியும்"
 DocType: Leave Block List,Applies to Company,நிறுவனத்தின் பொருந்தும்
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +197,Cannot cancel because submitted Stock Entry {0} exists,"சமர்ப்பிக்கப்பட்ட பங்கு நுழைவு {0} ஏனெனில், ரத்து செய்ய முடியாது"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +198,Cannot cancel because submitted Stock Entry {0} exists,"சமர்ப்பிக்கப்பட்ட பங்கு நுழைவு {0} ஏனெனில், ரத்து செய்ய முடியாது"
 DocType: Purchase Invoice,In Words,வேர்ட்ஸ்
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,Today is {0}'s birthday!,இன்று {0} 'கள் பிறந்தநாள்!
 DocType: Production Planning Tool,Material Request For Warehouse,கிடங்கு பொருள் கோரிக்கை
@@ -3584,14 +3632,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,உங்கள் நிதி ஆண்டு தொடங்கும்
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,சொத்து Depreciations மற்றும் சமநிலைகள்
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +319,Amount {0} {1} transferred from {2} to {3},அளவு {0} {1} இருந்து இடமாற்றம் {2} க்கு {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +322,Amount {0} {1} transferred from {2} to {3},அளவு {0} {1} இருந்து இடமாற்றம் {2} க்கு {3}
 DocType: Sales Invoice,Get Advances Received,முன்னேற்றம் பெற்ற கிடைக்கும்
 DocType: Email Digest,Add/Remove Recipients,சேர்க்க / பெற்றவர்கள் அகற்று
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +432,Transaction not allowed against stopped Production Order {0},பரிவர்த்தனை நிறுத்தி உத்தரவு எதிரான அனுமதி இல்லை {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +437,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 +143,Join,சேர
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,பற்றாக்குறைவே அளவு
-apps/erpnext/erpnext/stock/doctype/item/item.py +652,Item variant {0} exists with same attributes,பொருள் மாறுபாடு {0} அதே பண்புகளை கொண்ட உள்ளது
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,பொருள் மாறுபாடு {0} அதே பண்புகளை கொண்ட உள்ளது
+DocType: Leave Application,LAP/,மடியில் /
 DocType: Salary Slip,Salary 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,' தேதி ' தேவைப்படுகிறது
@@ -3599,12 +3648,12 @@
 DocType: Sales Invoice Item,Sales Order Item,விற்பனை ஆணை உருப்படி
 DocType: Salary Slip,Payment Days,கட்டணம் நாட்கள்
 DocType: Customer,Dormant,உழைக்காத
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +212,Warehouses with child nodes cannot be converted to ledger,குழந்தை முனைகள் கொண்ட கிடங்குகள் லெட்ஜர் மாற்றப்பட முடியாது
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +215,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/public/js/controllers/transaction.js +866,It is needed to fetch Item Details.,அது பொருள் விவரம் எடுக்க தேவை.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +857,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} ஏற்கனவே பெற்றுள்ளது
@@ -3614,14 +3663,14 @@
 DocType: Expense Claim,Total Claimed Amount,மொத்த கோரப்பட்ட தொகை
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,விற்பனை திறன் வாய்ப்புகள்.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,Invalid {0},தவறான {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Sick Leave,விடுப்பு
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,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,டிபார்ட்மெண்ட் ஸ்டோர்கள்
 DocType: Warehouse,PIN,PIN ஐ
 DocType: Sales Invoice,Base Change Amount (Company Currency),மாற்றம் அடிப்படை தொகை (நிறுவனத்தின் நாணய)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +313,No accounting entries for the following warehouses,பின்வரும் கிடங்குகள் இல்லை கணக்கியல் உள்ளீடுகள்
-apps/erpnext/erpnext/projects/doctype/project/project.js +102,Save the document first.,முதல் ஆவணம் சேமிக்கவும்.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +314,No accounting entries for the following warehouses,பின்வரும் கிடங்குகள் இல்லை கணக்கியல் உள்ளீடுகள்
+apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,முதல் ஆவணம் சேமிக்கவும்.
 DocType: Account,Chargeable,குற்றம் சாட்டப்பட தக்க
 DocType: Company,Change Abbreviation,மாற்றம் சுருக்கமான
 DocType: Expense Claim Detail,Expense Date,இழப்பில் தேதி
@@ -3634,10 +3683,9 @@
 DocType: Purchase Invoice,Recurring Print Format,பெரும்பாலும் உடன் அச்சு வடிவம்
 DocType: C-Form,Series,தொடர்
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,Expected Delivery Date cannot be before Purchase Order Date,எதிர்பார்க்கப்படுகிறது டெலிவரி தேதி கொள்முதல் ஆணை தேதி முன் இருக்க முடியாது
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} அமைப்பு&gt; அமைப்புகள் வழியாக&gt; பெயரிடும் தொடர் தொடர் பெயரிடும் அமைக்கவும்
 DocType: Appraisal,Appraisal Template,மதிப்பீட்டு வார்ப்புரு
 DocType: Item Group,Item Classification,பொருள் பிரிவுகள்
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Business Development Manager,வணிக மேம்பாட்டு மேலாளர்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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,பொது லெட்ஜர்
@@ -3647,8 +3695,8 @@
 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 +940,Please select {0} first,முதல் {0} தேர்வு செய்க
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +749,Batch {0} of Item {1} has expired.,பொருள் ஒரு தொகுதி {0} {1} காலாவதியாகிவிட்டது.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +953,Please select {0} first,முதல் {0} தேர்வு செய்க
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +757,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,கூட்டுத்தொகை
@@ -3676,8 +3724,8 @@
  {% என்றால் email_id%} மின்னஞ்சல்: {{email_id}}; & lt; br & gt {% Endif -%} 
  </ குறியீடு> </ pre>"
 DocType: Salary Detail,Default Amount,இயல்புநிலை தொகை
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +92,Warehouse not found in the system,அமைப்பு இல்லை கிடங்கு
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +106,This Month's Summary,இந்த மாதம் சுருக்கம்
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,அமைப்பு இல்லை கிடங்கு
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,இந்த மாதம் சுருக்கம்
 DocType: Quality Inspection Reading,Quality Inspection Reading,தரமான ஆய்வு படித்தல்
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,` விட பழைய உறைந்து பங்குகள் ` % d நாட்கள் குறைவாக இருக்க வேண்டும் .
 DocType: Tax Rule,Purchase Tax Template,வரி வார்ப்புரு வாங்க
@@ -3687,21 +3735,22 @@
 DocType: Item Customer Detail,Ref Code,Ref கோட்
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,ஊழியர் பதிவுகள்.
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Please set Next Depreciation Date,அடுத்த தேய்மானம் தேதி அமைக்கவும்
-DocType: Payment Gateway,Payment Gateway,பணம் நுழைவாயில்
 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 +378,Operation Time must be greater than 0 for Operation {0},ஆபரேஷன் நேரம் ஆபரேஷன் 0 விட இருக்க வேண்டும் {0}
+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/accounts/doctype/account/account.py +170,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 )
 DocType: Program,Program Abbreviation,திட்டம் சுருக்கமான
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,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: Appraisal,Start Date,தொடக்க தேதி
@@ -3717,21 +3766,22 @@
 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,குற்றச்சாட்டுக்கள் அந்த பொருளை பொருந்தாது என்றால் உருப்படியை அகற்று
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,உதாரணம். smsgateway.com / API / send_sms.cgi
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +27,Transaction currency must be same as Payment Gateway currency,பரிவர்த்தனை நாணய பணம் நுழைவாயில் நாணய அதே இருக்க வேண்டும்
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Transaction currency must be same as Payment Gateway currency,பரிவர்த்தனை நாணய பணம் நுழைவாயில் நாணய அதே இருக்க வேண்டும்
 DocType: Payment Entry,Receive,பெறவும்
+apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,மேற்கோள்கள்:
 DocType: Maintenance Visit,Fully Completed,முழுமையாக பூர்த்தி
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% முழுமையான
 DocType: Employee,Educational Qualification,கல்வி தகுதி
 DocType: Workstation,Operating Costs,செலவுகள்
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,அதிரடி என்றால் திரட்டப்பட்ட மாதாந்திர பட்ஜெட்டை மீறய
 DocType: Purchase Invoice,Submit on creation,உருவாக்கம் சமர்ப்பிக்க
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +432,Currency for {0} must be {1},நாணய {0} இருக்க வேண்டும் {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +435,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 +493,Row {0}: An Reorder entry already exists for this warehouse {1},ரோ {0}: ஒரு மறுவரிசைப்படுத்துக நுழைவு ஏற்கனவே இந்த கிடங்கு உள்ளது {1}
+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/crm/doctype/opportunity/opportunity.py +79,"Cannot declare as lost, because Quotation has been made.","இழந்தது மேற்கோள் செய்யப்பட்டது ஏனெனில் , அறிவிக்க முடியாது ."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,கொள்முதல் மாஸ்டர் மேலாளர்
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +429,Production Order {0} must be submitted,உத்தரவு {0} சமர்ப்பிக்க வேண்டும்
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +434,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,தேதி தேதி முதல் முன் இருக்க முடியாது
@@ -3741,25 +3791,27 @@
 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 +181,Totals,மொத்த
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,மொத்த
 DocType: BOM,Manufacturing,உருவாக்கம்
 ,Ordered Items To Be Delivered,விநியோகிப்பதற்காக உத்தரவிட்டார் உருப்படிகள்
 DocType: Account,Income,வருமானம்
 DocType: Industry Type,Industry Type,தொழில் அமைப்பு
 apps/erpnext/erpnext/templates/includes/cart.js +141,Something went wrong!,ஏதோ தவறு நடந்து!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,Warning: Leave application contains following block dates,எச்சரிக்கை: விடுப்பு பயன்பாடு பின்வரும் தொகுதி தேதிகள் உள்ளன
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +120,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} இந்த பரிவர்த்தனையை நிறைவு செய்ய அலகுகள்.
+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 +181,Organization unit (department) master.,அமைப்பு அலகு ( துறை ) மாஸ்டர் .
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,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 +793,All records are synced.,அனைத்து பதிவுகள் ஒத்திசைக்கப்ப்பட்டவை.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +781,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,மையம் பெயர் செலவு
@@ -3778,21 +3830,20 @@
 DocType: Address,Name of person or organization that this address belongs to.,நபர் அல்லது இந்த முகவரியை சொந்தமானது என்று நிறுவனத்தின் பெயர்.
 apps/erpnext/erpnext/public/js/setup_wizard.js +260,Your Suppliers,உங்கள் சப்ளையர்கள்
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +49,Cannot set as Lost as Sales Order is made.,விற்பனை ஆணை உள்ளது என இழந்தது அமைக்க முடியாது.
-DocType: Student Applicant,Mother's Name,அம்மாவின் பெயர்
 DocType: Request for Quotation Item,Supplier Part No,சப்ளையர் பகுதி இல்லை
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +348,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 +326,Received From,பெறப்படும்
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Received From,பெறப்படும்
 DocType: Lead,Converted,மாற்றப்படுகிறது
 DocType: Item,Has Serial No,இல்லை வரிசை உள்ளது
 DocType: Employee,Date of Issue,இந்த தேதி
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0} இருந்து: {0} ஐந்து {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +153,Row #{0}: Set Supplier for item {1},ரோ # {0}: உருப்படியை அமைக்க சப்ளையர் {1}
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +93,Row {0}: Hours value must be greater than zero.,ரோ {0}: மணி மதிப்பு பூஜ்யம் விட அதிகமாக இருக்க வேண்டும்.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +117,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} காணலாம்
 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 +172,{0} {1} does not exist,{0} {1} இல்லை
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +175,{0} {1} does not exist,{0} {1} இல்லை
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,Please check Multi Currency option to allow accounts with other currency,மற்ற நாணய கணக்குகளை அனுமதிக்க பல நாணய விருப்பத்தை சரிபார்க்கவும்
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +72,Item: {0} does not exist in the system,பொருள்: {0} அமைப்பின் இல்லை
 apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,நீங்கள் உறைந்த மதிப்பை அமைக்க அதிகாரம் இல்லை
@@ -3801,13 +3852,14 @@
 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/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,வருகை எதிர்கால நாட்களுக்கு குறித்தது முடியாது
 DocType: Pricing Rule,Pricing Rule Help,விலை விதி உதவி
 DocType: Purchase Taxes and Charges,Account Head,கணக்கு ஒதுக்கும் தலைப்பு - பிரிவு
 apps/erpnext/erpnext/config/stock.py +163,Update additional costs to calculate landed cost of items,பொருட்களை தரையிறங்கியது செலவு கணக்கிட கூடுதல் செலவுகள் புதுப்பிக்கவும்
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Electrical,மின்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Electrical,மின்
 DocType: Stock Entry,Total Value Difference (Out - In),மொத்த மதிப்பு வேறுபாடு (அவுட் - ல்)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,Row {0}: Exchange Rate is mandatory,ரோ {0}: மாற்று வீதம் கட்டாயமாகும்
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},பயனர் ஐடி பணியாளர் அமைக்க{0}
@@ -3815,7 +3867,7 @@
 DocType: Item,Customer Code,வாடிக்கையாளர் கோட்
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +210,Birthday Reminder for {0},பிறந்த நாள் நினைவூட்டல் {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,கடந்த சில நாட்களாக கடைசி ஆர்டர்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +292,Debit To account must be a Balance Sheet account,கணக்கில் பற்று ஒரு ஐந்தொகை கணக்கில் இருக்க வேண்டும்
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To account must be a Balance Sheet account,கணக்கில் பற்று ஒரு ஐந்தொகை கணக்கில் இருக்க வேண்டும்
 DocType: Buying Settings,Naming Series,தொடர் பெயரிடும்
 DocType: Leave Block List,Leave Block List Name,பிளாக் பட்டியல் பெயர் விட்டு
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,பங்கு சொத்துக்கள்
@@ -3827,11 +3879,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 +301,Salary Slip of employee {0} already created for time sheet {1},ஊழியர் சம்பளம் ஸ்லிப் {0} ஏற்கனவே நேரம் தாள் உருவாக்கப்பட்ட {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +313,Salary Slip of employee {0} already created for time sheet {1},ஊழியர் சம்பளம் ஸ்லிப் {0} ஏற்கனவே நேரம் தாள் உருவாக்கப்பட்ட {1}
 DocType: Sales Order Item,Ordered Qty,அளவு உத்தரவிட்டார்
-apps/erpnext/erpnext/stock/doctype/item/item.py +673,Item {0} is disabled,பொருள் {0} முடக்கப்பட்டுள்ளது
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} is disabled,பொருள் {0} முடக்கப்பட்டுள்ளது
 DocType: Stock Settings,Stock Frozen Upto,பங்கு வரை உறை
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +838,BOM does not contain any stock item,டெலி எந்த பங்கு உருப்படியை கொண்டிருக்கும் இல்லை
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +809,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.,திட்ட செயல்பாடு / பணி.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,சம்பளம் தவறிவிடும் உருவாக்க
@@ -3839,23 +3891,24 @@
 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 +485,Row #{0}: Please set reorder quantity,ரோ # {0}: மீள் கட்டளை அளவு அமைக்க கொள்ளவும்
+DocType: Sales Invoice Timesheet,Billing Hours,பில்லிங் மணி
+apps/erpnext/erpnext/stock/doctype/item/item.py +487,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 +62,Please set {0},அமைக்கவும் {0}
 DocType: Purchase Invoice,Repeat on Day of Month,மாதம் ஒரு நாள் மீண்டும்
 DocType: Employee,Health Details,சுகாதார விவரம்
 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,மேலே தேர்ந்தெடுக்கப்பட்ட அடிப்படை அனைத்து சம்பளம் பின்னடைவு &#39;to
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} பொருட்கள் ஒத்திசைக்கப்படாது
 DocType: Sales Order,Partly Delivered,இதற்கு அனுப்பப்பட்டது
-DocType: Sales Invoice,Existing Customer,ஏற்கனவே வாடிக்கையாளர்
 DocType: Email Digest,Receivables,வரவுகள்
+DocType: Lead Source,Lead Source,மூல இட்டு
 DocType: Customer,Additional information regarding the customer.,வாடிக்கையாளர் பற்றிய கூடுதல் தகவல்.
 DocType: Quality Inspection Reading,Reading 5,5 படித்தல்
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +38,Campaign Name is required,பிரச்சாரம் பெயர் தேவைப்படுகிறது
 DocType: Maintenance Visit,Maintenance Date,பராமரிப்பு தேதி
 DocType: Purchase Invoice Item,Rejected Serial No,நிராகரிக்கப்பட்டது சீரியல் இல்லை
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +80,Year start date or end date is overlapping with {0}. To avoid please set company,"ஆண்டு தொடக்க தேதி அல்லது முடிவு தேதி {0} கொண்டு மேலெழும். நிறுவனம் அமைக்கவும், தயவு செய்து தவிர்க்க"
@@ -3864,10 +3917,9 @@
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","உதாரணம்:. தொடர் அமைக்க மற்றும் சீரியல் பரிமாற்றங்கள் குறிப்பிடப்பட்டுள்ளது இல்லை என்றால் ABCD, ##### 
 , பின்னர் தானாக வரிசை எண் இந்த தொடரை அடிப்படையாக கொண்டு உருவாக்கப்பட்டது. நீங்கள் எப்போதும் வெளிப்படையாக இந்த உருப்படியை தொடர் இல குறிப்பிட வேண்டும் என்றால். இதை நிரப்புவதில்லை."
 DocType: Upload Attendance,Upload Attendance,பங்கேற்கும் பதிவேற்ற
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +129,BOM and Manufacturing Quantity are required,"BOM, மற்றும் தயாரிப்பு தேவையான அளவு"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,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,மேக்ஸ் வலிமை
-DocType: Bank Reconciliation Detail,Amount,அளவு
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM பதிலாக
 ,Sales Analytics,விற்பனை அனலிட்டிக்ஸ்
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +113,Available {0},கிடைக்கும் {0}
@@ -3875,14 +3927,14 @@
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,மின்னஞ்சல் அமைத்தல்
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +96,Please enter default currency in Company Master,நிறுவனத்தின் முதன்மை இயல்புநிலை நாணய உள்ளிடவும்
 DocType: Stock Entry Detail,Stock Entry Detail,பங்கு நுழைவு விரிவாக
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +100,Daily Reminders,டெய்லி நினைவூட்டல்கள்
+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/account/account_tree.js +23,New Account Name,புதிய கணக்கு பெயர்
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,மூலப்பொருட்கள் விலை வழங்கியது
 DocType: Selling Settings,Settings for Selling Module,தொகுதி விற்பனையான அமைப்புகள்
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Customer Service,வாடிக்கையாளர் சேவை
+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/config/hr.py +50,Offer candidate a Job.,ஆஃபர் வேட்பாளர் ஒரு வேலை.
@@ -3891,8 +3943,9 @@
 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} ஒரு பங்கு பொருளாக இருக்க வேண்டும்
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,முன்னேற்றம் கிடங்கில் இயல்புநிலை வேலை
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1570,Total nos of serial no is not equal to quantity.,தொடர் எந்த மொத்த இலக்கங்கள் அளவு சமமாக இல்லை.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1594,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,மேம்படுத்தல் தொடர் எண்
@@ -3900,9 +3953,10 @@
 DocType: Sales Order,Printing Details,அச்சிடுதல் விபரங்கள்
 DocType: Task,Closing Date,தேதி மூடுவது
 DocType: Sales Order Item,Produced Quantity,உற்பத்தி அளவு
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Engineer,பொறியாளர்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Engineer,பொறியாளர்
+DocType: Journal Entry,Total Amount Currency,மொத்த தொகை நாணய
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,தேடல் துணை கூட்டங்கள்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Item Code required at Row No {0},வரிசை எண் தேவையான பொருள் கோட் {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +398,Item Code required at Row No {0},வரிசை எண் தேவையான பொருள் கோட் {0}
 DocType: Sales Partner,Partner Type,வரன்வாழ்க்கை துணை வகை
 DocType: Purchase Taxes and Charges,Actual,உண்மையான
 DocType: Authorization Rule,Customerwise Discount,Customerwise தள்ளுபடி
@@ -3918,16 +3972,18 @@
 DocType: BOM,Raw Material Cost,மூலப்பொருட்களின் செலவு
 DocType: Item Reorder,Re-Order Level,மீண்டும் ஒழுங்கு நிலை
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,நீங்கள் உற்பத்தி ஆர்டர்கள் உயர்த்த அல்லது ஆய்வில் மூலப்பொருட்கள் பதிவிறக்க வேண்டிய உருப்படிகளை மற்றும் திட்டமிட்ட அளவு உள்ளிடவும்.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +55,Part-time,பகுதி நேர
+apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,காண்ட் விளக்கப்படம்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,பகுதி நேர
 DocType: Employee,Applicable Holiday List,பொருந்தும் விடுமுறை பட்டியல்
 DocType: Employee,Cheque,காசோலை
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,தொடர் இற்றை
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +57,Series Updated,தொடர் இற்றை
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,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 +87,Clearance Date updated,மேம்படுத்தப்பட்டது இசைவு தேதி
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,வெற்றிகரமாக ஒருமைப்படுத்திய
@@ -3941,7 +3997,7 @@
 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 +513,Posting date and posting time is mandatory,தகவல்களுக்கு தேதி மற்றும் தகவல்களுக்கு நேரம் கட்டாய ஆகிறது
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,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.,நீங்கள் கொள்முதல் ஆணை சேமிக்க முறை சொற்கள் காணக்கூடியதாக இருக்கும்.
@@ -3951,7 +4007,7 @@
 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/stock/doctype/stock_entry/stock_entry.py +158,Target warehouse in row {0} must be same as Production Order,வரிசையில் இலக்கு கிடங்கில் {0} அதே இருக்க வேண்டும் உத்தரவு
+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,நாணய வேறு நாணயங்களுக்கு பயன்படுத்தி உள்ளீடுகள் செய்வதில் பிறகு மாற்றிக்கொள்ள
 DocType: Company,Round Off Account,கணக்கு ஆஃப் சுற்றுக்கு
@@ -3960,23 +4016,22 @@
 DocType: Customer Group,Parent Customer Group,பெற்றோர் வாடிக்கையாளர் பிரிவு
 DocType: Purchase Invoice,Contact Email,மின்னஞ்சல் தொடர்பு
 DocType: Appraisal Goal,Score Earned,ஜூலை ஈட்டிய
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Notice Period,அறிவிப்பு காலம்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,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 +4,New Sales Person Name,புதிய விற்பனைப் பெயர்
 DocType: Packing Slip,Gross Weight UOM,மொத்த எடை மொறட்டுவ பல்கலைகழகம்
-DocType: Email Digest,Receivables / Payables,வரவுகள் / Payables
 DocType: Delivery Note Item,Against Sales Invoice,விற்பனை விலைப்பட்டியல் எதிராக
 DocType: Bin,Reserved Qty for Production,உற்பத்திக்கான அளவு ஒதுக்கப்பட்ட
 DocType: Asset,Frequency of Depreciation (Months),தேய்மானம் அதிர்வெண் (மாதங்கள்)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +469,Credit Account,கடன் கணக்கு
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Credit Account,கடன் கணக்கு
 DocType: Landed Cost Item,Landed Cost Item,இறங்கினார் செலவு உருப்படி
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +55,Show zero values,பூஜ்ய மதிப்புகள் காட்டு
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,பூஜ்ய மதிப்புகள் காட்டு
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,உருப்படி அளவு மூலப்பொருட்களை கொடுக்கப்பட்ட அளவு இருந்து உற்பத்தி / repacking பின்னர் பெறப்படும்
 apps/erpnext/erpnext/public/js/setup_wizard.js +315,Setup a simple website for my organization,அமைப்பு என் அமைப்பு ஒரு எளிய வலைத்தளம்
 DocType: Payment Reconciliation,Receivable / Payable Account,பெறத்தக்க / செலுத்த வேண்டிய கணக்கு
 DocType: Delivery Note Item,Against Sales Order Item,விற்பனை ஆணை பொருள் எதிராக
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Please specify Attribute Value for attribute {0},பண்பு மதிப்பு பண்பு குறிப்பிடவும் {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},பண்பு மதிப்பு பண்பு குறிப்பிடவும் {0}
 DocType: Item,Default Warehouse,இயல்புநிலை சேமிப்பு கிடங்கு
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +39,Budget cannot be assigned against Group Account {0},பட்ஜெட் குழு கணக்கை எதிராக ஒதுக்கப்படும் முடியாது {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,பெற்றோர் செலவு சென்டர் உள்ளிடவும்
@@ -3998,19 +4053,22 @@
 DocType: Journal Entry,Total Debit,மொத்த பற்று
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,இயல்புநிலை முடிக்கப்பட்ட பொருட்கள் கிடங்கு
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,விற்பனை நபர்
-DocType: Sales Invoice,Cold Calling,குளிர் காலிங்
 DocType: SMS Parameter,SMS Parameter,எஸ்எம்எஸ் அளவுரு
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,பட்ஜெட் மற்றும் செலவு மையம்
 DocType: Maintenance Schedule Item,Half Yearly,அரையாண்டு
 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 +253,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 +141,Set as Lost,லாஸ்ட் அமை
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,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 +5,This is based on transactions against this Customer. See timeline below for details,இந்த வாடிக்கையாளர் எதிராக பரிமாற்றங்கள் அடிப்படையாக கொண்டது. விவரங்கள் கீழே காலவரிசை பார்க்க
 DocType: Supplier,Credit Days Based On,கடன் நாட்கள் அடிப்படையில்
@@ -4022,11 +4080,10 @@
 ,Items To Be Requested,கோரிய பொருட்களை
 DocType: Purchase Order,Get Last Purchase Rate,கடைசியாக கொள்முதல் விலை கிடைக்கும்
 DocType: Company,Company Info,நிறுவன தகவல்
-apps/erpnext/erpnext/accounts/page/pos/pos.js +941,Select or add new customer,தேர்ந்தெடுக்கவும் அல்லது புதிய வாடிக்கையாளர் சேர்க்க
+apps/erpnext/erpnext/accounts/page/pos/pos.js +930,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 +5,This is based on the attendance of this Employee,இந்த பணியாளர் வருகை அடிப்படையாக கொண்டது
-DocType: Sales Invoice,Frequency,அதிர்வெண்
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +463,Debit Account,பற்று கணக்கு
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Debit Account,பற்று கணக்கு
 DocType: Fiscal Year,Year Start Date,ஆண்டு தொடக்க தேதி
 DocType: Attendance,Employee Name,பணியாளர் பெயர்
 DocType: Sales Invoice,Rounded Total (Company Currency),வட்டமான மொத்த (நிறுவனத்தின் கரன்சி)
@@ -4035,27 +4092,27 @@
 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 +210,Supplier Quotation {0} created,சப்ளையர் மேற்கோள் {0} உருவாக்கப்பட்ட
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +208,Supplier Quotation {0} created,சப்ளையர் மேற்கோள் {0} உருவாக்கப்பட்ட
 apps/erpnext/erpnext/accounts/report/financial_statements.py +90,End Year cannot be before Start Year,இறுதி ஆண்டு தொடக்க ஆண்டு முன் இருக்க முடியாது
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Employee Benefits,பணியாளர் நன்மைகள்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,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 +228,Please set a default Holiday List for Employee {0} or Company {1},ஒரு இயல்பான விடுமுறை பட்டியல் பணியாளர் அமைக்க தயவு செய்து {0} அல்லது நிறுவனத்தின் {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +232,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 +499,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ரோ இல்லை {0}: தொகை செலவு கூறுகின்றனர் {1} எதிராக தொகை நிலுவையில் விட அதிகமாக இருக்க முடியாது. நிலுவையில் அளவு {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +500,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ரோ இல்லை {0}: தொகை செலவு கூறுகின்றனர் {1} எதிராக தொகை நிலுவையில் விட அதிகமாக இருக்க முடியாது. நிலுவையில் அளவு {2}
 DocType: Maintenance Schedule,Schedule,அனுபந்தம்
 DocType: Account,Parent Account,பெற்றோர் கணக்கு
 DocType: Quality Inspection Reading,Reading 3,3 படித்தல்
 ,Hub,மையம்
 DocType: GL Entry,Voucher Type,ரசீது வகை
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1007,Price List not found or disabled,விலை பட்டியல் காணப்படும் அல்லது ஊனமுற்ற
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1008,Price List not found or disabled,விலை பட்டியல் காணப்படும் அல்லது ஊனமுற்ற
 DocType: Expense Claim,Approved,ஏற்பளிக்கப்பட்ட
 DocType: Pricing Rule,Price,விலை
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +244,Employee relieved on {0} must be set as 'Left',{0} ம் நிம்மதியாக பணியாளர் 'இடது' அமைக்க வேண்டும்
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +256,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} தேதியில் வரம்பில் பணியாளர் உருவாக்கப்பட்டது
@@ -4066,12 +4123,12 @@
 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 +259,Please select Employee Record first.,முதல் பணியாளர் பதிவு தேர்ந்தெடுத்து கொள்ளவும்.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +266,Please select Employee Record first.,முதல் பணியாளர் பதிவு தேர்ந்தெடுத்து கொள்ளவும்.
 DocType: POS Profile,Account for Change Amount,தொகை மாற்றம் கணக்கு
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +190,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},ரோ {0}: கட்சி / கணக்கு பொருந்தவில்லை {1} / {2} உள்ள {3} {4}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +235,Please enter Expense Account,செலவு கணக்கு உள்ளிடவும்
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,Please enter Expense Account,செலவு கணக்கு உள்ளிடவும்
 DocType: Account,Stock,பங்கு
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,"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 +976,"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,கொள்முதல் / உற்பத்தி விவரம்
@@ -4086,9 +4143,10 @@
 DocType: Asset Movement,Transaction Date,பரிவர்த்தனை தேதி
 DocType: Production Plan Item,Planned Qty,திட்டமிட்ட அளவு
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,மொத்த வரி
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,For Quantity (Manufactured Qty) is mandatory,அளவு (அளவு உற்பத்தி) என்பது கட்டாயம்
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,For Quantity (Manufactured Qty) is mandatory,அளவு (அளவு உற்பத்தி) என்பது கட்டாயம்
 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 +78,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,உண்மையான தொடக்க தேதி
@@ -4103,9 +4161,11 @@
 DocType: Warranty Claim,If different than customer address,என்றால் வாடிக்கையாளர் தான் முகவரி விட வேறு
 DocType: BOM Operation,BOM Operation,BOM ஆபரேஷன்
 DocType: Purchase Taxes and Charges,On Previous Row Amount,முந்தைய வரிசை தொகை
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +226,Transfer Asset,மாற்றம் சொத்து
+DocType: Student,Home Address,வீட்டு முகவரி
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +227,Transfer Asset,மாற்றம் சொத்து
 DocType: POS Profile,POS Profile,பிஓஎஸ் செய்தது
 apps/erpnext/erpnext/config/schools.py +33,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 +129,"Item {0} is a template, please select one of its variants","{0} பொருள் ஒரு டெம்ப்ளேட் உள்ளது, அதன் வகைகள் ஒன்றைத் தேர்ந்தெடுக்கவும்"
 DocType: Asset,Asset Category,சொத்து வகை
@@ -4115,8 +4175,8 @@
 DocType: Assessment,Room,அறை
 DocType: Purchase Order,Advance Paid,முன்பணம்
 DocType: Item,Item Tax,உருப்படியை வரி
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +765,Material to Supplier,சப்ளையர் பொருள்
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +189,Excise Invoice,கலால் விலைப்பட்டியல்
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,Material to Supplier,சப்ளையர் பொருள்
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,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,நடப்பு பொறுப்புகள்
@@ -4126,7 +4186,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,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 +136,Credit Card,கடன் அட்டை
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,கடன் அட்டை
 DocType: BOM,Item to be manufactured or repacked,உருப்படியை உற்பத்தி அல்லது repacked வேண்டும்
 apps/erpnext/erpnext/config/stock.py +174,Default settings for stock transactions.,பங்கு பரிவர்த்தனை இயல்புநிலை அமைப்புகளை .
 DocType: Purchase Invoice,Next Date,அடுத்த நாள்
@@ -4134,6 +4194,7 @@
 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: Academic Term,Term End Date,கால முடிவு தேதி
 DocType: Hub Settings,Seller Name,விற்பனையாளர் பெயர்
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),வரிகள் மற்றும் கட்டணங்கள் கழிக்கப்படும் (நிறுவனத்தின் கரன்சி)
 DocType: Item Group,General Settings,பொது அமைப்புகள்
@@ -4145,7 +4206,7 @@
 DocType: Customer,Commission Rate,தரகு விகிதம்
 apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,மாற்று செய்ய
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,துறை மூலம் பயன்பாடுகள் விட்டு தடுக்கும்.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +115,"Payment Type must be one of Receive, Pay and Internal Transfer","கொடுப்பனவு வகை ஏற்றுக்கொண்டு ஒன்று இருக்க செலுத்த, உள்நாட் மாற்றம் வேண்டும்"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +118,"Payment Type must be one of Receive, Pay and Internal Transfer","கொடுப்பனவு வகை ஏற்றுக்கொண்டு ஒன்று இருக்க செலுத்த, உள்நாட் மாற்றம் வேண்டும்"
 apps/erpnext/erpnext/config/selling.py +169,Analytics,அனலிட்டிக்ஸ்
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,கார்ட் காலியாக உள்ளது
 DocType: Production Order,Actual Operating Cost,உண்மையான இயக்க செலவு
@@ -4160,10 +4221,10 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,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 +92,Designer,வடிவமைப்புகள்
+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/accounts/doctype/purchase_invoice/purchase_invoice.py +469,Cost Center is required in row {0} in Taxes table for type {1},செலவு மையம் வரிசையில் தேவைப்படுகிறது {0} வரி அட்டவணையில் வகை {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +472,Cost Center is required in row {0} in Taxes table for type {1},செலவு மையம் வரிசையில் தேவைப்படுகிறது {0} வரி அட்டவணையில் வகை {1}
 DocType: Program,Program Code,திட்டம் குறியீடு
 ,Item-wise Purchase Register,உருப்படியை வாரியான வாங்குதல் பதிவு
 DocType: Batch,Expiry Date,காலாவதியாகும் தேதி
@@ -4173,12 +4234,12 @@
 apps/erpnext/erpnext/config/projects.py +13,Project master.,திட்டம் மாஸ்டர்.
 apps/erpnext/erpnext/controllers/status_updater.py +174,"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 +417, (Half Day),(அரை நாள்)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425, (Half Day),(அரை நாள்)
 DocType: Supplier,Credit Days,கடன் நாட்கள்
 DocType: Leave Type,Is Carry Forward,அடுத்த Carry
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +740,Get Items from BOM,BOM இருந்து பொருட்களை பெற
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +711,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 +549,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},ரோ # {0}: தேதி பதிவுசெய்ய கொள்முதல் தேதி அதே இருக்க வேண்டும் {1} சொத்தின் {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +552,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,ஒருவரையொருவர் நோக்கி கிடங்கில் இருந்து ஒரு சொத்து பரிமாற்றம்
diff --git a/erpnext/translations/te.csv b/erpnext/translations/te.csv
index a191c39..1e0b4e1 100644
--- a/erpnext/translations/te.csv
+++ b/erpnext/translations/te.csv
@@ -18,11 +18,10 @@
 DocType: Sales Partner,Dealer,డీలర్
 DocType: Employee,Rented,అద్దెకు
 DocType: Purchase Order,PO-,PO-
-apps/erpnext/erpnext/accounts/report/financial_statements.py +19,Start Year {0} not found.,ఇయర్ ప్రారంభం {0} దొరకలేదు.
 DocType: POS Profile,Applicable for User,వాడుకరి వర్తించే
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +191,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",ఆగిపోయింది ఉత్పత్తి ఆర్డర్ రద్దు చేయలేము రద్దు మొదటి అది Unstop
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +197,Do you really want to scrap this asset?,మీరు నిజంగా ఈ ఆస్తి ను అనుకుంటున్నారు?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +17,Select Default Supplier,డిఫాల్ట్ సరఫరాదారు ఎంచుకోండి
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +192,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",ఆగిపోయింది ఉత్పత్తి ఆర్డర్ రద్దు చేయలేము రద్దు మొదటి అది Unstop
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +198,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 +36,Currency is required for Price List {0},కరెన్సీ ధర జాబితా కోసం అవసరం {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* లావాదేవీ లెక్కించబడతాయి.
 DocType: Address,County,కౌంటీ
@@ -42,46 +41,45 @@
 DocType: Sales Invoice,Customer Name,వినియోగదారుని పేరు
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +126,Bank account cannot be named as {0},బ్యాంక్ ఖాతా పేరుతో సాధ్యం కాదు {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,తలలు (లేదా సమూహాలు) ఇది వ్యతిరేకంగా అకౌంటింగ్ ఎంట్రీలు తయారు చేస్తారు మరియు నిల్వలను నిర్వహించబడుతున్నాయి.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +180,Outstanding for {0} cannot be less than zero ({1}),అత్యుత్తమ {0} ఉండకూడదు కంటే తక్కువ సున్నా ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,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 +148,Series Updated Successfully,సిరీస్ విజయవంతంగా నవీకరించబడింది
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +149,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,అన్ని సరఫరాదారు సంప్రదించండి
-DocType: Quality Inspection Reading,Parameter,పరామితి
 apps/erpnext/erpnext/projects/doctype/project/project.py +54,Expected End Date can not be less than Expected Start Date,ఊహించినది ముగింపు తేదీ ఊహించిన ప్రారంభం తేదీ కంటే తక్కువ ఉండకూడదు
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,రో # {0}: రేటు అదే ఉండాలి {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +239,New Leave Application,న్యూ లీవ్ అప్లికేషన్
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,New Leave Application,న్యూ లీవ్ అప్లికేషన్
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +20,Attendance Record {0} exists against Student {1} for Course Schedule {2},హాజరు రికార్డ్ {0} కోర్సు షెడ్యూల్ కోసం విద్యార్థి {1} వ్యతిరేకంగా ఉంది {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Bank Draft,బ్యాంక్ డ్రాఫ్ట్
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,బ్యాంక్ డ్రాఫ్ట్
 DocType: Mode of Payment Account,Mode of Payment Account,చెల్లింపు ఖాతా మోడ్
 apps/erpnext/erpnext/stock/doctype/item/item.js +52,Show Variants,షో రకరకాలు
 DocType: Academic Term,Academic Term,అకడమిక్ టర్మ్
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +13,Material,మెటీరియల్
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Quantity,పరిమాణం
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +511,Accounts table cannot be blank.,అకౌంట్స్ పట్టిక ఖాళీగా ఉండరాదు.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +616,Quantity,పరిమాణం
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +512,Accounts table cannot be blank.,అకౌంట్స్ పట్టిక ఖాళీగా ఉండరాదు.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,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/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 +142,User {0} is already assigned to Employee {1},వాడుకరి {0} ఇప్పటికే ఉద్యోగి కేటాయించిన {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,ఆరోగ్య సంరక్షణ
-DocType: Purchase Invoice,Monthly,మంత్లీ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),చెల్లింపు లో ఆలస్యం (రోజులు)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +771,Invoice,వాయిస్
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +750,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 +198,Row {0}: {1} {2} does not match with {3},రో {0}: {1} {2} సరిపోలడం లేదు {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,రో # {0}:
+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 +127,Please select Price List,ధర జాబితా దయచేసి ఎంచుకోండి
@@ -112,8 +110,8 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,అదే కంపెనీ ఒకసారి కంటే ఎక్కువ ఎంటర్ ఉంది
 DocType: Employee,Married,వివాహితులు
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},కోసం అనుమతి లేదు {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +589,Get items from,నుండి అంశాలను పొందండి
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +382,Stock cannot be updated against Delivery Note {0},స్టాక్ డెలివరీ గమనిక వ్యతిరేకంగా నవీకరించబడింది సాధ్యం కాదు {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,నుండి అంశాలను పొందండి
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,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,కిరాణా
@@ -122,7 +120,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 +156,Salary Structure Missing,జీతం నిర్మాణం మిస్సింగ్
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Salary Structure Missing,జీతం నిర్మాణం మిస్సింగ్
 DocType: Lead,Person Name,వ్యక్తి పేరు
 DocType: Sales Invoice Item,Sales Invoice Item,సేల్స్ వాయిస్ అంశం
 DocType: Account,Credit,క్రెడిట్
@@ -130,10 +128,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 +156,Credit limit has been crossed for customer {0} {1}/{2},క్రెడిట్ పరిమితి కస్టమర్ కోసం దాటింది చేయబడింది {0} {1} / {2}
-apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;స్థిర ఆస్తిగా&quot;, అనియంత్రిత ఉండకూడదు అసెట్ రికార్డు అంశం వ్యతిరేకంగా కాలమే"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +189,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;, అనియంత్రిత ఉండకూడదు అసెట్ రికార్డు అంశం వ్యతిరేకంగా కాలమే"
 DocType: Tax Rule,Tax Type,పన్ను టైప్
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +144,You are not authorized to add or update entries before {0},మీరు ముందు ఎంట్రీలు జోడించడానికి లేదా నవీకరణ అధికారం లేదు {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},మీరు ముందు ఎంట్రీలు జోడించడానికి లేదా నవీకరణ అధికారం లేదు {0}
 DocType: Item,Item Image (if not slideshow),అంశం చిత్రం (స్లైడ్ లేకపోతే)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,ఒక కస్టమర్ అదే పేరుతో
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(గంట రేట్ / 60) * అసలు ఆపరేషన్ సమయం
@@ -143,18 +142,17 @@
 DocType: Student Log,Student Log,స్టూడెంట్ లోనికి ప్రవేశించండి
 DocType: Quality Inspection,Get Specification Details,స్పెసిఫికేషన్ వివరాలు పొందండి
 DocType: Lead,Interested,ఆసక్తి
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +165,Opening,ప్రారంభోత్సవం
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,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/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,కస్టమర్&gt; కస్టమర్ గ్రూప్&gt; భూభాగం
 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.,ఉన్న లావాదేవీతో ఖాతా సమూహం మార్చబడుతుంది సాధ్యం కాదు.
 DocType: Lead,Product Enquiry,ఉత్పత్తి ఎంక్వయిరీ
 DocType: Academic Term,Schools,పాఠశాలలు
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,మొదటి కంపెనీ నమోదు చేయండి
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Company first,మొదటి కంపెనీ దయచేసి ఎంచుకోండి
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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,మొత్తం వ్యయం
@@ -164,7 +162,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,ఖాతా ప్రకటన
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,ఫార్మాస్యూటికల్స్
 DocType: Purchase Invoice Item,Is Fixed Asset,స్థిర ఆస్తి ఉంది
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Available qty is {0}, you need {1}","అందుబాటులో అంశాల {0}, మీరు అవసరం {1}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +225,"Available qty is {0}, you need {1}","అందుబాటులో అంశాల {0}, మీరు అవసరం {1}"
 DocType: Expense Claim Detail,Claim Amount,క్లెయిమ్ సొమ్ము
 DocType: Employee,Mr,శ్రీ
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,సరఫరాదారు పద్ధతి / సరఫరాదారు
@@ -173,25 +171,26 @@
 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: Assessment Result,Grade,గ్రేడ్
 DocType: Sales Invoice Item,Delivered By Supplier,సరఫరాదారు ద్వారా పంపిణీ
 DocType: SMS Center,All Contact,అన్ని సంప్రదించండి
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Annual Salary,వార్షిక జీతం
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,స్టాక్ ఖర్చులు
-apps/erpnext/erpnext/accounts/report/financial_statements.py +22,End Year {0} not found.,ముగింపు సంవత్సరం {0} దొరకలేదు.
 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}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,సప్లై రా మెటీరియల్స్ కొనుగోలు కోసం
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +130,At least one mode of payment is required for POS invoice.,చెల్లింపు మోడ్ అయినా POS వాయిస్ అవసరం.
 DocType: Products Settings,Show Products as a List,షో ఉత్పత్తులు జాబితా
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records",", మూస తగిన డేటా నింపి ఆ మారిన ఫైలులో అటాచ్. ఎంపిక కాలంలో అన్ని తేదీలు మరియు ఉద్యోగి కలయిక ఉన్న హాజరు రికార్డుల తో, టెంప్లేట్ వస్తాయి"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +451,Item {0} is not active or end of life has been reached,{0} ఐటెమ్ చురుకుగా కాదు లేదా జీవితాంతం చేరుకుంది చెయ్యబడింది
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +456,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/controllers/accounts_controller.py +614,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","అంశం రేటు వరుసగా {0} లో పన్ను చేర్చడానికి, వరుసలలో పన్నులు {1} కూడా చేర్చారు తప్పక"
+apps/erpnext/erpnext/controllers/accounts_controller.py +617,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","అంశం రేటు వరుసగా {0} లో పన్ను చేర్చడానికి, వరుసలలో పన్నులు {1} కూడా చేర్చారు తప్పక"
 apps/erpnext/erpnext/config/hr.py +166,Settings for HR Module,ఆర్ మాడ్యూల్ కోసం సెట్టింగులు
 DocType: SMS Center,SMS Center,SMS సెంటర్
 DocType: Sales Invoice,Change Amount,మొత్తం మారుతుంది
@@ -203,13 +202,13 @@
 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 +147,Execution,ఎగ్జిక్యూషన్
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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,అంశాలు మరియు ధర
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},మొత్తం గంటలు: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},తేదీ నుండి ఫిస్కల్ ఇయర్ లోపల ఉండాలి. తేదీ నుండి ఊహిస్తే = {0}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,Cost Center {0} does not belong to Company {1},కేంద్రం {0} కంపెనీకి చెందినది కాదు ఖర్చు {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +100,Cost Center {0} does not belong to Company {1},కేంద్రం {0} కంపెనీకి చెందినది కాదు ఖర్చు {1}
 DocType: Customer,Individual,వ్యక్తిగత
 DocType: Interest,Academics User,విద్యావేత్తలు వాడుకరి
 DocType: Cheque Print Template,Amount In Figure,మూర్తి లో మొత్తం
@@ -225,30 +224,32 @@
 DocType: Production Planning Tool,Sales Orders,సేల్స్ ఆర్డర్స్
 DocType: Purchase Taxes and Charges,Valuation,వాల్యువేషన్
 ,Purchase Order Trends,ఆర్డర్ ట్రెండ్లులో కొనుగోలు
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,The request for quotation can be accessed by clicking on the following link,క్రింది లింక్ పై క్లిక్ చేసి కొటేషన్ కోసం అభ్యర్థన ప్రాప్తి చేయవచ్చు
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,సంవత్సరం ఆకులు కేటాయించుటకు.
 DocType: SG Creation Tool Course,SG Creation Tool Course,ఎస్జి సృష్టి సాధనం కోర్సు
 DocType: Student Group Creation Tool,Leave blank if you wish to fetch all courses for selected academic term,మీరు ఎంచుకున్న విద్యా పదం కోసం అన్ని కోర్సులు పొందడంలో అనుకుంటే ఖాళీగా వదిలేయండి
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,Insufficient Stock,సరిపోని స్టాక్
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227,Insufficient Stock,సరిపోని స్టాక్
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,ఆపివేయి సామర్థ్యం ప్రణాళిక మరియు సమయం ట్రాకింగ్
+DocType: Email Digest,New Sales Orders,న్యూ సేల్స్ ఆర్డర్స్
 DocType: Bank Reconciliation,Bank Account,బ్యాంకు ఖాతా
 DocType: Leave Type,Allow Negative Balance,ప్రతికూల సంతులనం అనుమతించు
 DocType: Selling Settings,Default Territory,డిఫాల్ట్ భూభాగం
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,టెలివిజన్
 DocType: Production Order Operation,Updated via 'Time Log',&#39;టైం లోగ్&#39; ద్వారా నవీకరించబడింది
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} does not belong to Company {1},ఖాతా {0} కంపెనీకి చెందినది కాదు {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +86,Account {0} does not belong to Company {1},ఖాతా {0} కంపెనీకి చెందినది కాదు {1}
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},అడ్వాన్స్ మొత్తాన్ని కంటే ఎక్కువ ఉండకూడదు {0} {1}
 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 +174,For Warehouse is required before Submit,వేర్హౌస్ కోసం సమర్పించు ముందు అవసరం
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,For Warehouse is required before Submit,వేర్హౌస్ కోసం సమర్పించు ముందు అవసరం
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,అందుకున్న
 DocType: Sales Partner,Reseller,పునఃవిక్రేత
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,కంపెనీ నమోదు చేయండి
 DocType: Delivery Note Item,Against Sales Invoice Item,సేల్స్ వాయిస్ అంశం వ్యతిరేకంగా
 ,Production Orders in Progress,ప్రోగ్రెస్ లో ఉత్పత్తి ఆర్డర్స్
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Cash from Financing,ఫైనాన్సింగ్ నుండి నికర నగదు
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1436,"LocalStorage is full , did not save","LocalStorage పూర్తి, సేవ్ లేదు"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1460,"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}
@@ -261,18 +262,19 @@
 apps/erpnext/erpnext/templates/generators/item.html +78,No description given,ఇచ్చిన వివరణను
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,కొనుగోలు కోసం అభ్యర్థన.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +5,This is based on the Time Sheets created against this project,ఈ ఈ ప్రాజెక్టుకు వ్యతిరేకంగా రూపొందించినవారు షీట్లుగా ఆధారంగా
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Only the selected Leave Approver can submit this Leave Application,మాత్రమే ఎంచుకున్న లీవ్ అప్రూవర్గా ఈ లీవ్ అప్లికేషన్ సమర్పించవచ్చు
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +213,Only the selected Leave Approver can submit this Leave Application,మాత్రమే ఎంచుకున్న లీవ్ అప్రూవర్గా ఈ లీవ్ అప్లికేషన్ సమర్పించవచ్చు
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,తేదీ ఉపశమనం చేరడం తేదీ కంటే ఎక్కువ ఉండాలి
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Leaves per Year,సంవత్సరానికి ఆకులు
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,సంవత్సరానికి ఆకులు
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,రో {0}: తనిఖీ చేయండి ఖాతా వ్యతిరేకంగా &#39;అడ్వాన్స్ ఈజ్&#39; {1} ఈ అడ్వాన్సుగా ఎంట్రీ ఉంటే.
 apps/erpnext/erpnext/stock/utils.py +188,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,లీటరు
 DocType: Task,Total Costing Amount (via Time Sheet),మొత్తం ఖర్చు మొత్తం (సమయం షీట్ ద్వారా)
 DocType: Item Website Specification,Item Website Specification,అంశం వెబ్సైట్ స్పెసిఫికేషన్
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +435,Leave Blocked,Leave నిరోధిత
-apps/erpnext/erpnext/stock/doctype/item/item.py +669,Item {0} has reached its end of life on {1},అంశం {0} జీవితం యొక్క దాని ముగింపు చేరుకుంది {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +443,Leave Blocked,Leave నిరోధిత
+apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item {0} has reached its end of life on {1},అంశం {0} జీవితం యొక్క దాని ముగింపు చేరుకుంది {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +95,Bank Entries,బ్యాంక్ ఎంట్రీలు
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +83,Annual,వార్షిక
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +86,Annual,వార్షిక
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,స్టాక్ సయోధ్య అంశం
 DocType: Stock Entry,Sales Invoice No,సేల్స్ వాయిస్ లేవు
 DocType: Material Request Item,Min Order Qty,Min ఆర్డర్ ప్యాక్ చేసిన అంశాల
@@ -280,20 +282,22 @@
 DocType: Lead,Do Not Contact,సంప్రదించండి చేయవద్దు
 apps/erpnext/erpnext/public/js/setup_wizard.js +360,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 +91,Software Developer,సాఫ్ట్వేర్ డెవలపర్
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,సాఫ్ట్వేర్ డెవలపర్
 DocType: Item,Minimum Order Qty,కనీస ఆర్డర్ ప్యాక్ చేసిన అంశాల
 DocType: Pricing Rule,Supplier Type,సరఫరాదారు టైప్
 DocType: Scheduling Tool,Course Start Date,కోర్సు ప్రారంభ తేదీ
 DocType: Item,Publish in Hub,హబ్ లో ప్రచురించండి
+DocType: Student Admission,Student Admission,విద్యార్థి అడ్మిషన్
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is cancelled,{0} అంశం రద్దు
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Material Request,మెటీరియల్ అభ్యర్థన
+apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} is cancelled,{0} అంశం రద్దు
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +823,Material Request,మెటీరియల్ అభ్యర్థన
 DocType: Bank Reconciliation,Update Clearance Date,నవీకరణ క్లియరెన్స్ తేదీ
 apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +28,Abbreviation already used for another salary component,సంక్షిప్త ఇప్పటికే మరొక జీతం భాగం కోసం ఉపయోగిస్తారు
 DocType: Item,Purchase Details,కొనుగోలు వివరాలు
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +328,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},కొనుగోలు ఆర్డర్ లో &#39;రా మెటీరియల్స్ పంపినవి&#39; పట్టికలో దొరకలేదు అంశం {0} {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +333,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/config/selling.py +18,Confirmed orders from Customers.,వినియోగదారుడు నుండి ధృవీకరించబడిన ఆదేశాలు.
 DocType: Purchase Receipt Item,Rejected Quantity,తిరస్కరించబడిన పరిమాణం
 DocType: SMS Settings,SMS Sender Name,SMS పంపినవారు పేరు
@@ -309,20 +313,21 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +130,Please select Charge Type first,మొదటి ఛార్జ్ రకాన్ని ఎంచుకోండి
 DocType: Student Group Student,Student Group Student,స్టూడెంట్ గ్రూప్ విద్యార్థి
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,తాజా
+DocType: Email Digest,New Quotations,న్యూ కొటేషన్స్
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,జాబితాలో మొదటి లీవ్ అప్రూవర్గా డిఫాల్ట్ లీవ్ అప్రూవర్గా సెట్ చేయబడుతుంది
 DocType: Tax Rule,Shipping County,షిప్పింగ్ కౌంటీ
 apps/erpnext/erpnext/config/desktop.py +158,Learn,తెలుసుకోండి
 DocType: Asset,Next Depreciation Date,తదుపరి అరుగుదల తేదీ
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,ఉద్యోగి ప్రతి కార్యాచరణ ఖర్చు
 DocType: Accounts Settings,Settings for Accounts,అకౌంట్స్ కోసం సెట్టింగులు
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +626,Supplier Invoice No exists in Purchase Invoice {0},సరఫరాదారు వాయిస్ లేవు కొనుగోలు వాయిస్ లో ఉంది {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +629,Supplier Invoice No exists in Purchase Invoice {0},సరఫరాదారు వాయిస్ లేవు కొనుగోలు వాయిస్ లో ఉంది {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,సేల్స్ పర్సన్ ట్రీ నిర్వహించండి.
 DocType: Job Applicant,Cover Letter,కవర్ లెటర్
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,అత్యుత్తమ చెక్కుల మరియు క్లియర్ డిపాజిట్లు
 DocType: Item,Synced With Hub,హబ్ సమకాలీకరించబడింది
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,సరియినది కాని రహస్య పదము
 DocType: Item,Variant Of,వేరియంట్
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,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 +86,Circular Reference Error,సర్క్యులర్ సూచన లోపం
@@ -334,15 +339,16 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,ఆటోమేటిక్ మెటీరియల్ అభ్యర్థన సృష్టి పై ఇమెయిల్ ద్వారా తెలియజేయి
 DocType: Journal Entry,Multi Currency,మల్టీ కరెన్సీ
 DocType: Payment Reconciliation Invoice,Invoice Type,వాయిస్ పద్ధతి
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +806,Delivery Note,డెలివరీ గమనిక
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +800,Delivery Note,డెలివరీ గమనిక
 apps/erpnext/erpnext/config/learn.py +87,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 +233,Payment Entry has been modified after you pulled it. Please pull it again.,మీరు వైదొలగిన తర్వాత చెల్లింపు ఎంట్రీ మారిస్తే. మళ్ళీ తీసి దయచేసి.
+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/setup/doctype/email_digest/email_digest.py +104,Summary for this week and pending activities,ఈ వారం పెండింగ్ కార్యకలాపాలకు సారాంశం
+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","కామాలతో వేరు ఎంటర్ ఇమెయిల్ ఐడి, ఇన్వాయిస్ ప్రత్యేక తేదీ స్వయంచాలకంగా కఠోర ఉంటుంది"
 DocType: Employee,Company Email,కంపెనీ ఇమెయిల్
@@ -354,27 +360,28 @@
 apps/erpnext/erpnext/config/hr.py +186,"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,కస్టమర్ కరెన్సీ కస్టమర్ బేస్ కరెన్సీ మార్చబడుతుంది రేటుపై
-apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},రో # {0}: కొనుగోలు వాయిస్ ఇప్పటికే ఉన్న ఆస్తి వ్యతిరేకంగా చేయలేము {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +554,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},రో # {0}: కొనుగోలు వాయిస్ ఇప్పటికే ఉన్న ఆస్తి వ్యతిరేకంగా చేయలేము {1}
 DocType: Item Tax,Tax Rate,పన్ను శాతమ్
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} ఇప్పటికే ఉద్యోగి కోసం కేటాయించిన {1} కాలానికి {2} కోసం {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +812,Select Item,అంశాన్ని ఎంచుకోండి
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +791,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/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,వాయిస్ {0} ఇప్పటికే సమర్పించిన కొనుగోలు
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},రో # {0}: బ్యాచ్ లేవు అదే ఉండాలి {1} {2}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +143,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.,ఒక అంశం యొక్క బ్యాచ్ (చాలా).
 DocType: C-Form Invoice Detail,Invoice Date,వాయిస్ తేదీ
 DocType: GL Entry,Debit Amount,డెబిట్ మొత్తం
 apps/erpnext/erpnext/accounts/party.py +242,There can only be 1 Account per Company in {0} {1},మాత్రమే కంపెనీవారి ప్రతి 1 ఖాతా ఉండగలడు {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +4,Your email address,మీ ఇమెయిల్ చిరునామా
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +342,Please see attachment,అటాచ్మెంట్ చూడండి
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,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 +19,Setup Already Complete!!,సెటప్ ఇప్పటికే సంపూర్ణ !!
 ,Finished Goods,తయారైన వస్తువులు
 DocType: Delivery Note,Instructions,సూచనలు
 DocType: Quality Inspection,Inspected By,తనిఖీలు
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,సరఫరాదారు&gt; సరఫరాదారు టైప్
 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,అంశాలు జోడించండి
@@ -388,29 +395,29 @@
 DocType: Currency Exchange,Currency Exchange,కరెన్సీ ఎక్స్ఛేంజ్
 DocType: Purchase Invoice Item,Item Name,అంశం పేరు
 DocType: Authorization Rule,Approving User  (above authorized value),(అధికారం విలువ పైన) వాడుకరి ఆమోదిస్తోంది
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,క్రెడిట్ సంతులనం
+DocType: Email Digest,Credit Balance,క్రెడిట్ సంతులనం
 DocType: Employee,Widowed,వైధవ్యం
 DocType: Request for Quotation,Request for Quotation,కొటేషన్ కోసం అభ్యర్థన
 DocType: Salary Slip Timesheet,Working Hours,పని గంటలు
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,అప్పటికే ఉన్న సిరీస్ ప్రారంభం / ప్రస్తుత క్రమ సంఖ్య మార్చండి.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","బహుళ ధర రూల్స్ వ్యాప్తి చెందడం కొనసాగుతుంది, వినియోగదారులు పరిష్కరించవచ్చు మానవీయంగా ప్రాధాన్యత సెట్ కోరతారు."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +736,Purchase Return,కొనుగోలు చూపించు
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +715,Purchase Return,కొనుగోలు చూపించు
 ,Purchase Register,కొనుగోలు నమోదు
 DocType: Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,వర్తించే ఛార్జీలు
 DocType: Workstation,Consumable Cost,వినిమయ వ్యయం
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +202,{0} ({1}) must have role 'Leave Approver',{0} ({1}) పాత్ర కలిగి ఉండాలి &#39;లీవ్ అప్రూవర్గా&#39;
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,{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 +143,Reason for losing,కోల్పోయినందుకు కారణము
-apps/erpnext/erpnext/accounts/utils.py +239,Allocated amount can not greater than unadjusted amount,కేటాయించిన మొత్తాన్ని అన్ఏడ్జస్టెడ్ మొత్తానికన్నా ఎక్కువ కాదు
+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,కేటాయించిన మొత్తాన్ని అన్ఏడ్జస్టెడ్ మొత్తానికన్నా ఎక్కువ కాదు
 DocType: Announcement,Receiver,స్వీకర్త
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},కార్యక్షేత్ర హాలిడే జాబితా ప్రకారం క్రింది తేదీలు మూసివేయబడింది: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,అవకాశాలు
 DocType: Employee,Single,సింగిల్
 DocType: Account,Cost of Goods Sold,వస్తువుల ఖర్చు సోల్డ్
 DocType: Purchase Invoice,Yearly,వార్షిక
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +225,Please enter Cost Center,ఖర్చు సెంటర్ నమోదు చేయండి
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,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,ఎగ్జామినర్ పేరు
@@ -423,26 +430,26 @@
 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,పరిశీలించడం సరఫరాదారు వాయిస్ సంఖ్య ప్రత్యేకత
 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 +102,Non Profit,నాన్ ప్రాఫిట్
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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: Stock Reconciliation Item,Do not include symbols (ex. $),కాదు చిహ్నాలు క్రింది వాటిని కలిగి లేదు (ఉదా. $)
 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 +638,Attribute {0} selected multiple times in Attributes Table,లక్షణం {0} గుణాలు పట్టిక పలుమార్లు ఎంపిక
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,లక్షణం {0} గుణాలు పట్టిక పలుమార్లు ఎంపిక
 DocType: HR Settings,Employee record is created using selected field. ,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 +862,Please enter Item Code.,అంశం కోడ్ను నమోదు చేయండి.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +847,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","తనిఖీ ఉంటే ఇప్పటికే ప్రింట్ రేటు / ప్రింట్ మొత్తం చేర్చబడుతుంది వంటి, పన్ను మొత్తాన్ని పరిగణించబడుతుంది"
@@ -456,12 +463,12 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,సెక్యూరిటీస్ అండ్ డిపాజిట్లు
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,కేటాయించింది మొత్తం ఆకులు తప్పనిసరి
 DocType: Job Opening,Description of a Job Opening,ఒక ఉద్యోగ అవకాశాల వివరణ
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Pending activities for today,నేడు పెండింగ్లో కార్యకలాపాలు
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,నేడు పెండింగ్లో కార్యకలాపాలు
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,హాజరు రికార్డు.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,timesheet ఆధారంగా పేరోల్ కోసం జీతం భాగం.
 DocType: Sales Order Item,Used for Production Plan,ఉత్పత్తి ప్లాన్ వుపయోగించే
 DocType: Manufacturing Settings,Time Between Operations (in mins),(నిమిషాలు) ఆపరేషన్స్ మధ్య సమయం
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +92,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} ఖాతా {1} వ్యయ కేంద్రం వ్యతిరేకంగా బడ్జెట్ {2} ఒక {3}. ఇది ద్వారా అధిగమిస్తుందని {4}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +95,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} ఖాతా {1} వ్యయ కేంద్రం వ్యతిరేకంగా బడ్జెట్ {2} ఒక {3}. ఇది ద్వారా అధిగమిస్తుందని {4}
 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 అదే అంశం కోసం కాదు
@@ -469,16 +476,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +238,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 +86,Administrative Officer,అడ్మినిస్ట్రేటివ్ ఆఫీసర్
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,అడ్మినిస్ట్రేటివ్ ఆఫీసర్
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +23,Acutal Qty {0} / Waiting Qty {1},Acutal ప్యాక్ చేసిన అంశాల {0} / వేచి ప్యాక్ చేసిన అంశాల {1}
 DocType: Timesheet Detail,Hrs,గంటలు
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +319,Please select Company,కంపెనీ దయచేసి ఎంచుకోండి
-DocType: Stock Entry,Difference Account,తేడా ఖాతా
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +309,Please select Company,కంపెనీ దయచేసి ఎంచుకోండి
+DocType: Stock Entry Detail,Difference Account,తేడా ఖాతా
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,దాని ఆధారపడి పని {0} సంవృతం కాదు దగ్గరగా పని కాదు.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Please enter Warehouse for which Material Request will be raised,మెటీరియల్ అభ్యర్థన పెంచింది చేయబడే గిడ్డంగి నమోదు చేయండి
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +399,Please enter Warehouse for which Material Request will be raised,మెటీరియల్ అభ్యర్థన పెంచింది చేయబడే గిడ్డంగి నమోదు చేయండి
 DocType: Production Order,Additional Operating Cost,అదనపు నిర్వహణ ఖర్చు
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,కాస్మటిక్స్
-apps/erpnext/erpnext/stock/doctype/item/item.py +530,"To merge, following properties must be same for both items","విలీనం, క్రింది రెండు లక్షణాలతో అంశాలను అదే ఉండాలి"
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,"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 +28,Buy,కొనుగోలు
@@ -486,7 +493,7 @@
 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 +1563,Serial no item cannot be a fraction,సీరియల్ ఏ అంశం ఒక భిన్నం ఉండకూడదు
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1587,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,మేనేజింగ్ ఉప
@@ -495,13 +502,14 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Account {0} does not belong to company: {1},{0} ఖాతా కంపెనీకి చెందదు: {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation already used for another company,సంక్షిప్త ఇప్పటికే మరొక సంస్థ కోసం ఉపయోగిస్తారు
 DocType: Selling Settings,Default Customer Group,డిఫాల్ట్ కస్టమర్ గ్రూప్
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Supplier is required against Payable account {0},సరఫరాదారు చెల్లించవలసిన ఖాతాఫై అవసరం {0}
 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 ఉండకూడదు
 DocType: Production Planning Tool,Material Requirement,వస్తు అవసరాల
 DocType: Company,Delete Company Transactions,కంపెనీ లావాదేవీలు తొలగించు
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +313,Reference No and Reference Date is mandatory for Bank transaction,రిఫరెన్స్ ఇక లేవు ప్రస్తావన తేదీ బ్యాంక్ లావాదేవీల తప్పనిసరి
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +316,Reference No and Reference Date is mandatory for Bank transaction,రిఫరెన్స్ ఇక లేవు ప్రస్తావన తేదీ బ్యాంక్ లావాదేవీల తప్పనిసరి
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,/ మార్చు పన్నులు మరియు ఆరోపణలు జోడించండి
 DocType: Purchase Invoice,Supplier Invoice No,సరఫరాదారు వాయిస్ లేవు
 DocType: Territory,For reference,సూచన కోసం
@@ -512,7 +520,6 @@
 DocType: Installation Note Item,Installation Note Item,సంస్థాపన సూచన అంశం
 DocType: Production Plan Item,Pending Qty,పెండింగ్ ప్యాక్ చేసిన అంశాల
 DocType: Budget,Ignore,విస్మరించు
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Item కోడ్&gt; అంశాన్ని గ్రూప్&gt; బ్రాండ్
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,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
@@ -523,11 +530,11 @@
 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/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,వాయిస్ పట్టిక కనుగొనబడలేదు రికార్డులు
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +28,Please select Company and Party Type first,మొదటి కంపెనీ మరియు పార్టీ రకాన్ని ఎంచుకోండి
+apps/erpnext/erpnext/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/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 +707,Make Sales Order,సేల్స్ ఆర్డర్ చేయండి
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +701,Make Sales Order,సేల్స్ ఆర్డర్ చేయండి
 DocType: Project Task,Project Task,ప్రాజెక్ట్ టాస్క్
 ,Lead Id,లీడ్ ID
 DocType: C-Form Invoice Detail,Grand Total,సంపూర్ణ మొత్తము
@@ -543,7 +550,8 @@
 DocType: Job Applicant,Resume Attachment,పునఃప్రారంభం జోడింపు
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,పునరావృత
 DocType: Leave Control Panel,Allocate,కేటాయించాల్సిన
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +734,Sales Return,సేల్స్ చూపించు
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +728,Sales Return,సేల్స్ చూపించు
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +91,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,గమనిక: మొత్తం కేటాయించింది ఆకులు {0} ఇప్పటికే ఆమోదం ఆకులు కంటే తక్కువ ఉండకూడదు {1} కాలానికి
 DocType: Announcement,Posted By,ద్వారా పోస్ట్
 DocType: Item,Delivered by Supplier (Drop Ship),సరఫరాదారు ద్వారా పంపిణీ (డ్రాప్ షిప్)
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,సంభావ్య వినియోగదారులు డేటాబేస్.
@@ -552,14 +560,13 @@
 DocType: Quotation,Quotation To,.కొటేషన్
 DocType: Lead,Middle Income,మధ్య ఆదాయ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +212,Opening (Cr),ప్రారంభ (CR)
-apps/erpnext/erpnext/stock/doctype/item/item.py +795,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,మీరు ఇప్పటికే మరొక UoM కొన్ని ట్రాన్సాక్షన్ (లు) చేసిన ఎందుకంటే అంశం కోసం మెజర్ అప్రమేయ యూనిట్ {0} నేరుగా మారలేదు. మీరు వేరే డిఫాల్ట్ UoM ఉపయోగించడానికి ఒక కొత్త అంశాన్ని సృష్టించడానికి అవసరం.
-apps/erpnext/erpnext/accounts/utils.py +237,Allocated amount can not be negative,కేటాయించింది మొత్తం ప్రతికూల ఉండకూడదు
+apps/erpnext/erpnext/stock/doctype/item/item.py +797,Default Unit of Measure for Item {0} cannot be changed directly because 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,కేటాయించింది మొత్తం ప్రతికూల ఉండకూడదు
 DocType: Purchase Order Item,Billed Amt,బిల్ ఆంట్
 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 +91,Reference No & Reference Date is required for {0},ప్రస్తావన &amp; సూచన తేదీ అవసరం {0}
-DocType: Sales Invoice,Customer's Vendor,కస్టమర్ యొక్క Vendor
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Proposal Writing,ప్రతిపాదన రాయడం
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,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",ఉప-ఒప్పంద మెటీరియల్ రిక్వెస్ట్ చేర్చబడుతుంది అని అంశాలను ఎంచుకుని ఉంటే ముడి పదార్థాలు
@@ -568,13 +575,14 @@
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,సమయం ట్రాకింగ్
 DocType: Fiscal Year Company,Fiscal Year Company,ఫిస్కల్ ఇయర్ కంపెనీ
 DocType: Packing Slip Item,DN Detail,DN వివరాలు
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +257,Already supplier quotation has created,ఇప్పటికే సరఫరాదారు కొటేషన్ సృష్టించింది
 DocType: Timesheet,Billed,బిల్
 DocType: Batch,Batch Description,బ్యాచ్ వివరణ
+apps/erpnext/erpnext/accounts/utils.py +685,"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 +733,View Offline Records,ఆఫ్లైన్ రికార్డ్స్ చూడండి
+apps/erpnext/erpnext/accounts/page/pos/pos.js +715,View Offline Records,ఆఫ్లైన్ రికార్డ్స్ చూడండి
+DocType: Student,Sibling Details,తోబుట్టువులు వివరాలు
 DocType: Employee,Reason for Resignation,రాజీనామా కారణం
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,పనితీరు అంచనాలు కోసం టెంప్లేట్.
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,వాయిస్ / జర్నల్ ఎంట్రీ వివరాలు
@@ -588,7 +596,7 @@
 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,ఇన్వెంటరీ నికర మార్పును
 DocType: Employee,Passport Number,పాస్పోర్ట్ సంఖ్య
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Manager,మేనేజర్
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,మేనేజర్
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,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; అదే ఉండకూడదు
@@ -597,10 +605,11 @@
 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 +299,Timesheet created:,Timesheet రూపొందించినవారు:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +715,Please set default Cash or Bank account in Mode of Payment {0},చెల్లింపు విధానం లో డిఫాల్ట్ నగదు లేదా బ్యాంక్ ఖాతా సెట్ దయచేసి {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +300,Timesheet created:,Timesheet రూపొందించినవారు:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +772,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,నమోదు
 DocType: Selling Settings,Customer Naming By,ద్వారా కస్టమర్ నేమింగ్
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,దయచేసి సెటప్ను ఉద్యోగి మానవ వనరుల వ్యవస్థ నామకరణ&gt; ఆర్ సెట్టింగులు
 DocType: Depreciation Schedule,Depreciation Amount,అరుగుదల మొత్తం
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,గ్రూప్ మార్చు
 DocType: Activity Cost,Activity Type,కార్యాచరణ టైప్
@@ -625,6 +634,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,ముగించు
 DocType: Pricing Rule,Sales Manager,అమ్మకాల నిర్వాహకుడు
 DocType: Salary Structure Employee,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,ఆస్తి తొలగింపు లాభపడిన / నష్టం ఖాతా
@@ -639,11 +649,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +9,Pre Sales,ప్రీ సేల్స్
 DocType: Purchase Receipt,Other Details,ఇతర వివరాలు
 DocType: Account,Accounts,అకౌంట్స్
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Marketing,మార్కెటింగ్
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +227,Payment Entry is already created,చెల్లింపు ఎంట్రీ ఇప్పటికే రూపొందించినవారు ఉంటుంది
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,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 +538,Row #{0}: Asset {1} does not linked to Item {2},రో # {0}: ఆస్తి {1} అంశం ముడిపడి లేదు {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +21,Preview Salary Slip,ప్రివ్యూ వేతనం స్లిప్
+apps/erpnext/erpnext/controllers/accounts_controller.py +541,Row #{0}: Asset {1} does not linked to Item {2},రో # {0}: ఆస్తి {1} అంశం ముడిపడి లేదు {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +38,Preview Salary Slip,ప్రివ్యూ వేతనం స్లిప్
 DocType: Company,Deafult Cost Center,Deafult వ్యయ కేంద్రం
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +48,Account {0} has been entered multiple times,ఖాతా {0} అనేకసార్లు నమోదు చేసిన
 DocType: Account,Expenses Included In Valuation,ఖర్చులు విలువలో
@@ -652,7 +662,7 @@
 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 +617,Item has variants.,అంశం రకాల్లో.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,అంశం రకాల్లో.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,అంశం {0} దొరకలేదు
 DocType: Bin,Stock Value,స్టాక్ విలువ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +25,Company {0} does not exist,కంపెనీ {0} ఉనికిలో లేదు
@@ -672,7 +682,7 @@
 DocType: Purchase Order,Supply Raw Materials,సప్లై రా మెటీరియల్స్
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,తదుపరి ఇన్వాయిస్ ఉత్పత్తి అవుతుంది తేదీ. ఇది submit న రవాణా జరుగుతుంది.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,ప్రస్తుత ఆస్తులు
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,{0} is not a stock Item,{0} స్టాక్ అంశం కాదు
+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 +169,Lead must be set if Opportunity is made from Lead,అవకాశం లీడ్ నుండి తయారు చేస్తారు ఉంటే లీడ్ ఏర్పాటు చేయాలి
@@ -739,26 +749,25 @@
 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 +709,No Permission,అనుమతి లేదు
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +710,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}
 apps/erpnext/erpnext/public/js/setup_wizard.js +298,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 +542,Row #{0}: Asset {1} must be submitted,రో # {0}: ఆస్తి {1} సమర్పించాలి
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,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 ద్వారా స్టాక్ సంతులనం అప్లోడ్.
 DocType: Warehouse,Tree Details,ట్రీ వివరాలు
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,ప్రస్తుతం పంపండి
 ,Support Analytics,మద్దతు Analytics
 DocType: Item,Website Warehouse,వెబ్సైట్ వేర్హౌస్
 DocType: Payment Reconciliation,Minimum Invoice Amount,కనీస ఇన్వాయిస్ మొత్తం
 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/sales_invoice/sales_invoice.py +227,Timesheet {0} is already completed or cancelled,Timesheet {0} ఇప్పటికే పూర్తి లేదా రద్దు
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +259,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 కంటే తక్కువ లేదా సమానంగా ఉండాలి
@@ -774,13 +783,13 @@
 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 +229,Target Warehouse,టార్గెట్ వేర్హౌస్
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +230,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-,STE-
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Sales Order Date,ఊహించినది డెలివరీ తేదీ సేల్స్ ఆర్డర్ తేదీ ముందు ఉండరాదు
 DocType: Upload Attendance,Import Attendance,దిగుమతి హాజరు
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,అన్ని అంశం గుంపులు
+apps/erpnext/erpnext/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/config/setup.py +89,Automatically compose message on submission of transactions.,స్వయంచాలకంగా లావాదేవీల సమర్పణ సందేశాన్ని కంపోజ్.
@@ -792,13 +801,15 @@
 DocType: Sales Invoice,Payment Due Date,చెల్లింపు గడువు తేదీ
 apps/erpnext/erpnext/stock/doctype/item/item.js +278,Item Variant {0} already exists with same attributes,అంశం వేరియంట్ {0} ఇప్పటికే అదే గుణ ఉంది
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;ప్రారంభిస్తున్నాడు&#39;
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,డు ఓపెన్
 DocType: Notification Control,Delivery Note Message,డెలివరీ గమనిక సందేశం
 DocType: Expense Claim,Expenses,ఖర్చులు
 DocType: Item Variant Attribute,Item Variant Attribute,అంశం వేరియంట్ లక్షణం
 ,Purchase Receipt Trends,కొనుగోలు రసీదులు ట్రెండ్లులో
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Research & Development,రీసెర్చ్ &amp; డెవలప్మెంట్
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,రీసెర్చ్ &amp; డెవలప్మెంట్
 ,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,ధర లేదా డిస్కౌంట్
@@ -807,7 +818,7 @@
 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/controllers/accounts_controller.py +340,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","చెల్లింపు ఎంట్రీ {0} ఆర్డర్ {1}, ఈ వాయిస్ లో అడ్వాన్సుగా తీసుకున్నాడు తప్పకుండా తనిఖీ వ్యతిరేకంగా ముడిపడి ఉంది."
+apps/erpnext/erpnext/controllers/accounts_controller.py +343,"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,పాయింట్ ఆఫ్ అమ్మకానికి
@@ -829,12 +840,12 @@
 DocType: Supplier Quotation,Is Subcontracted,"బహుకరించింది, మరలా ఉంది"
 DocType: Item Attribute,Item Attribute Values,అంశం లక్షణం విలువలు
 DocType: Examination Result,Examination Result,పరీక్ష ఫలితం
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +756,Purchase Receipt,కొనుగోలు రసీదులు
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +735,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 +167,Reference Doctype must be one of {0},రిఫరెన్స్ doctype యొక్క ఒక ఉండాలి {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +282,Unable to find Time Slot in the next {0} days for Operation {1},ఆపరేషన్ కోసం తదుపరి {0} రోజుల్లో టైమ్ స్లాట్ దొరక్కపోతే {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +170,Reference Doctype must be one of {0},రిఫరెన్స్ doctype యొక్క ఒక ఉండాలి {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Unable to find Time Slot in the next {0} days for Operation {1},ఆపరేషన్ కోసం తదుపరి {0} రోజుల్లో టైమ్ స్లాట్ దొరక్కపోతే {1}
 DocType: Production Order,Plan material for sub-assemblies,ఉప శాసనసభలకు ప్రణాళిక పదార్థం
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,సేల్స్ భాగస్వాములు అండ్ టెరిటరీ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be active,బిఒఎం {0} సక్రియ ఉండాలి
@@ -845,7 +856,7 @@
 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 +214,Warehouses with existing transaction can not be converted to ledger.,ఉన్న లావాదేవీతో గిడ్డంగులు లెడ్జర్ మార్చబడతాయి కాదు.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +217,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,ఉత్పత్తి ఆర్డర్స్
@@ -859,9 +870,9 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,{0} ఉద్యోగి చురుకుగా కాదు లేదా ఉనికిలో లేదు
 DocType: Fee Structure,Components,భాగాలు
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,Please enter Asset Category in Item {0},Item లో అసెట్ వర్గం నమోదు చేయండి {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +612,Item Variants {0} updated,అంశం రకరకాలు {0} నవీకరించబడింది
+apps/erpnext/erpnext/stock/doctype/item/item.py +614,Item Variants {0} updated,అంశం రకరకాలు {0} నవీకరించబడింది
 DocType: Quality Inspection Reading,Reading 6,6 పఠనం
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +843,Cannot {0} {1} {2} without any negative outstanding invoice,కాదు {0} {1} {2} లేకుండా ఏ ప్రతికూల అత్యుత్తమ వాయిస్ కెన్
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +854,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,ఇప్పుడు సమకాలీకరించు
@@ -876,69 +887,72 @@
 DocType: Item,Is Purchase Item,కొనుగోలు అంశం
 DocType: Asset,Purchase Invoice,కొనుగోలు వాయిస్
 DocType: Stock Ledger Entry,Voucher Detail No,ఓచర్ వివరాలు లేవు
-apps/erpnext/erpnext/accounts/page/pos/pos.js +728,New Sales Invoice,న్యూ సేల్స్ వాయిస్
+apps/erpnext/erpnext/accounts/page/pos/pos.js +710,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 +728,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: Cheque Print Template,Has Print Format,ప్రింట్ ఫార్మాట్ ఉంది
-apps/erpnext/erpnext/accounts/page/pos/pos.js +86, is mandatory. Maybe Currency Exchange record is not created for ,తప్పనిసరి. బహుశా కరెన్సీ ఎక్స్ఛేంజ్ రికార్డు కోసం సృష్టించబడలేదు
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +109,Row #{0}: Please specify Serial No for Item {1},రో # {0}: అంశం కోసం ఏ సీరియల్ రాయండి {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +619,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","&#39;ఉత్పత్తి కట్ట అంశాలు, గిడ్డంగి, సీరియల్ లేవు మరియు బ్యాచ్ కోసం కాదు&#39; ప్యాకింగ్ జాబితా &#39;పట్టిక నుండి పరిగణించబడుతుంది. వేర్హౌస్ మరియు బ్యాచ్ ఏ &#39;ఉత్పత్తి కట్ట&#39; అంశం కోసం అన్ని ప్యాకింగ్ అంశాలను ఒకటే ఉంటే, ఆ విలువలు ప్రధాన అంశం పట్టిక ఎంటర్ చెయ్యబడతాయి, విలువలు పట్టిక &#39;జాబితా ప్యాకింగ్&#39; కాపీ అవుతుంది."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +75, 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 +613,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing 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 +606,Supplier Invoice Date cannot be greater than Posting Date,సరఫరాదారు ఇన్వాయిస్ తేదీ వ్యాఖ్యలు తేదీ కన్నా ఎక్కువ ఉండకూడదు
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +609,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: 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 +810,Select Item for Transfer,బదిలీ కోసం అంశాన్ని ఎంచుకోండి
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +789,Select Item for Transfer,బదిలీ కోసం అంశాన్ని ఎంచుకోండి
 DocType: Purchase Invoice,Additional Discount Percentage,అదనపు డిస్కౌంట్ శాతం
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,అన్ని సహాయ వీడియోలను జాబితాను వీక్షించండి
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,చెక్ జమ జరిగినది ఎక్కడ బ్యాంకు ఖాతాను ఎంచుకోండి తల.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,యూజర్ లావాదేవీలలో ధర జాబితా రేటు సవరించడానికి అనుమతిస్తుంది
 DocType: Pricing Rule,Max Qty,మాక్స్ ప్యాక్ చేసిన అంశాల
-DocType: Student Applicant,Father's Name,తండ్రి పేరు
 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 +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,రో {0}: సేల్స్ / కొనుగోలు ఆర్డర్ వ్యతిరేకంగా చెల్లింపు ఎల్లప్పుడూ అడ్వాన్సుగా మార్క్ చేయాలి
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,కెమికల్
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +686,All items have already been transferred for this Production Order.,అన్ని అంశాలను ఇప్పటికే ఈ ఉత్పత్తి ఆర్డర్ కోసం బదిలీ చేశారు.
+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}, మళ్ళీ ప్రయత్నించండి"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +694,All items have already been transferred for this Production Order.,అన్ని అంశాలను ఇప్పటికే ఈ ఉత్పత్తి ఆర్డర్ కోసం బదిలీ చేశారు.
 DocType: Process Payroll,Select Payroll Year and Month,పేరోల్ సంవత్సరం మరియు నెల ఎంచుకోండి
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,Meter,మీటర్
 DocType: Workstation,Electricity Cost,విద్యుత్ ఖర్చు
 DocType: HR Settings,Don't send Employee Birthday Reminders,Employee జన్మదిన రిమైండర్లు పంపవద్దు
-DocType: Opportunity,Walk In,లో వల్క్
 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 +12,Transfered,బదిలీ
 apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,మీ లేఖ తల మరియు లోగో అప్లోడ్. (మీరు తర్వాత వాటిని సవరించవచ్చు).
 DocType: Timesheet Detail,Bill,బిల్
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,White,వైట్
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date is entered as past date,తదుపరి అరుగుదల తేదీ గత తేదీగా ఎంటర్ ఉంది
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +167,White,వైట్
 DocType: SMS Center,All Lead (Open),అన్ని లీడ్ (ఓపెన్)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +228,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),రో {0}: కోసం ప్యాక్ చేసిన అంశాల అందుబాటులో లేదు {4} గిడ్డంగిలో {1} ప్రవేశం సమయం పోస్ట్ చేయడంలో ({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}),రో {0}: కోసం ప్యాక్ చేసిన అంశాల అందుబాటులో లేదు {4} గిడ్డంగిలో {1} ప్రవేశం సమయం పోస్ట్ చేయడంలో ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,అడ్వాన్సెస్ పొందుతారు
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +731,Make ,చేయండి
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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 +154,Order Type must be one of {0},ఆర్డర్ రకం ఒకటి ఉండాలి {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},ఆర్డర్ రకం ఒకటి ఉండాలి {0}
 DocType: Lead,Next Contact Date,తదుపరి సంప్రదించండి తేదీ
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,ప్యాక్ చేసిన అంశాల తెరవడం
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +393,Please enter Account for Change Amount,మొత్తం చేంజ్ ఖాతాను నమోదు చేయండి
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,Please enter Account for Change Amount,మొత్తం చేంజ్ ఖాతాను నమోదు చేయండి
 DocType: Student Batch,Student Batch Name,స్టూడెంట్ బ్యాచ్ పేరు
 DocType: Holiday List,Holiday List Name,హాలిడే జాబితా పేరు
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js +8,Schedule Course,షెడ్యూల్ కోర్సు
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Stock Options,స్టాక్ ఆప్షన్స్
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,స్టాక్ ఆప్షన్స్
 DocType: Journal Entry Account,Expense Claim,ఖర్చు చెప్పడం
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +211,Do you really want to restore this scrapped asset?,మీరు నిజంగా ఈ చిత్తు ఆస్తి పునరుద్ధరించేందుకు పెట్టమంటారా?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +237,Qty for {0},కోసం చేసిన అంశాల {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +212,Do you really want to restore this scrapped asset?,మీరు నిజంగా ఈ చిత్తు ఆస్తి పునరుద్ధరించేందుకు పెట్టమంటారా?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,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,బ్లాక్ జాబితా తేదీలు వదిలి
@@ -947,9 +961,9 @@
 DocType: Company,Default Terms,డిఫాల్ట్ నిబంధనలు
 DocType: Packing Slip Item,Packing Slip Item,ప్యాకింగ్ స్లిప్ అంశం
 DocType: Purchase Invoice,Cash/Bank Account,క్యాష్ / బ్యాంక్ ఖాతా
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,పరిమాణం లేదా విలువ ఎటువంటి మార్పు తొలగించబడిన అంశాలు.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,పరిమాణం లేదా విలువ ఎటువంటి మార్పు తొలగించబడిన అంశాలు.
 DocType: Delivery Note,Delivery To,డెలివరీ
-apps/erpnext/erpnext/stock/doctype/item/item.py +635,Attribute table is mandatory,లక్షణం పట్టిక తప్పనిసరి
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,లక్షణం పట్టిక తప్పనిసరి
 DocType: Production Planning Tool,Get Sales Orders,సేల్స్ ఆర్డర్స్ పొందండి
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} ప్రతికూల ఉండకూడదు
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,దయచేసి ఒక స్టూడెంట్ ఎంచుకోండి
@@ -974,7 +988,7 @@
 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,WIP వేర్హౌస్
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},సీరియల్ లేవు {0} వరకు నిర్వహణ ఒప్పందం కింద {1}
+apps/erpnext/erpnext/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,సంస్థ పేరు
@@ -986,7 +1000,7 @@
 DocType: GL Entry,Against,ఎగైనెస్ట్
 DocType: Item,Default Selling Cost Center,డిఫాల్ట్ సెల్లింగ్ ఖర్చు సెంటర్
 DocType: Sales Partner,Implementation Partner,అమలు భాగస్వామి
-apps/erpnext/erpnext/controllers/selling_controller.py +231,Sales Order {0} is {1},అమ్మకాల ఆర్డర్ {0} ఉంది {1}
+apps/erpnext/erpnext/controllers/selling_controller.py +232,Sales Order {0} is {1},అమ్మకాల ఆర్డర్ {0} ఉంది {1}
 DocType: Opportunity,Contact Info,సంప్రదింపు సమాచారం
 apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,స్టాక్ ఎంట్రీలు మేకింగ్
 DocType: Packing Slip,Net Weight UOM,నికర బరువు UoM
@@ -996,25 +1010,24 @@
 DocType: Holiday List,Get Weekly Off Dates,వీక్లీ ఆఫ్ తేదీలు పొందండి
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,ముగింపు తేదీ ప్రారంభ తేదీ కంటే తక్కువ ఉండకూడదు
 DocType: Sales Person,Select company name first.,మొదటిది ఎంచుకోండి కంపెనీ పేరు.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Dr,డాక్టర్
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Dr,డాక్టర్
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,కొటేషన్స్ పంపిణీదారుల నుండి పొందింది.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},కు {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,సగటు వయసు
 DocType: 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/templates/pages/home.html +32,View All Products,అన్ని ఉత్పత్తులను చూడండి
+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,Employee నుండి
-apps/erpnext/erpnext/controllers/accounts_controller.py +400,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,హెచ్చరిక: సిస్టమ్ అంశం కోసం మొత్తం నుండి overbilling తనిఖీ చెయ్యదు {0} లో {1} సున్నా
+apps/erpnext/erpnext/controllers/accounts_controller.py +403,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/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,మరియు సంవత్సరం:
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +191,{0} {1} must be submitted,{0} {1} సమర్పించాలి
-DocType: Email Digest,Annual Expense,వార్షిక ఖర్చుల
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,{0} {1} must be submitted,{0} {1} సమర్పించాలి
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +145,Quantity must be less than or equal to {0},పరిమాణం కంటే తక్కువ లేదా సమానంగా ఉండాలి {0}
 DocType: SMS Center,Total Characters,మొత్తం అక్షరాలు
 apps/erpnext/erpnext/controllers/buying_controller.py +156,Please select BOM in BOM field for Item {0},అంశం కోసం BOM రంగంలో BOM దయచేసి ఎంచుకోండి {0}
@@ -1025,30 +1038,31 @@
 DocType: Sales Partner,Distributor,పంపిణీదారు
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,షాపింగ్ కార్ట్ షిప్పింగ్ రూల్
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +211,Production Order {0} must be cancelled before cancelling this Sales Order,ఉత్పత్తి ఆర్డర్ {0} ఈ అమ్మకాల ఆర్డర్ రద్దు ముందే రద్దు చేయాలి
-apps/erpnext/erpnext/public/js/controllers/transaction.js +62,Please set 'Apply Additional Discount On',సెట్ &#39;న అదనపు డిస్కౌంట్ వర్తించు&#39; దయచేసి
+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,రేంజ్ తక్కువ ఉండాలి కంటే పరిధి
 DocType: Global Defaults,Global Defaults,గ్లోబల్ డిఫాల్ట్
 apps/erpnext/erpnext/projects/doctype/project/project.py +153,Project Collaboration Invitation,ప్రాజెక్టు కొలాబరేషన్ ఆహ్వానం
 DocType: Salary Slip,Deductions,తగ్గింపులకు
+DocType: Leave Allocation,LAL/,లాల్ /
 apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,ప్రారంభ సంవత్సరం
 DocType: Purchase Invoice,Start date of current invoice's period,ప్రస్తుత వాయిస్ యొక్క కాలం తేదీ ప్రారంభించండి
 DocType: Salary Slip,Leave Without Pay,పే లేకుండా వదిలి
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +327,Capacity Planning Error,పరిమాణ ప్రణాళికా లోపం
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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 +362,Finished Item {0} must be entered for Manufacture type entry,పూర్తయ్యింది అంశం {0} తయారీ రకం ప్రవేశానికి ఎంటర్ చెయ్యాలి
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +367,Finished Item {0} must be entered for Manufacture type entry,పూర్తయ్యింది అంశం {0} తయారీ రకం ప్రవేశానికి ఎంటర్ చెయ్యాలి
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,తెరవడం అకౌంటింగ్ సంతులనం
 DocType: Sales Invoice Advance,Sales Invoice Advance,సేల్స్ వాయిస్ అడ్వాన్స్
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +499,Nothing to request,నథింగ్ అభ్యర్థించవచ్చు
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +500,Nothing to request,నథింగ్ అభ్యర్థించవచ్చు
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',&#39;అసలు ప్రారంభ తేదీ&#39; &#39;వాస్తవిక ముగింపు తేదీ&#39; కంటే ఎక్కువ ఉండకూడదు
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Management,మేనేజ్మెంట్
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},గాని డెబిట్ లేదా క్రెడిట్ మొత్తం అవసరమైన {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,మేనేజ్మెంట్
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +55,Either debit or credit amount is required for {0},గాని డెబిట్ లేదా క్రెడిట్ మొత్తం అవసరమైన {0}
 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 +161,Blue,బ్లూ
+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 సెట్ చెయ్యండి
@@ -1058,12 +1072,12 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +23,POS Profile {0} already created for user: {1} and company {2},POS ప్రొఫైల్ {0} ఇప్పటికే వినియోగదారుకు రూపొందించినవారు: {1} మరియు సంస్థ {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UoM మార్పిడి ఫాక్టర్
 DocType: Stock Settings,Default Item Group,డిఫాల్ట్ అంశం గ్రూప్
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1374,Do you really want to submit the invoice?,మీరు నిజంగా వాయిస్ submit అనుకుంటున్నారా?
+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 +685,Cost Center For Item with Item Code ',&#39;అంశం కోడ్ అంశం సెంటర్ ఖర్చు
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1526,"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 +679,Cost Center For Item with Item Code ',&#39;అంశం కోడ్ అంశం సెంటర్ ఖర్చు
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1550,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",చెల్లింపు రకం కన్ఫిగర్ చేయబడలేదు. ఖాతా చెల్లింపులు మోడ్ మీద లేదా POS ప్రొఫైల్ సెట్ చేయబడ్డాయి వచ్చారో లేదో తనిఖీ చేయండి.
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,మీ అమ్మకాలు వ్యక్తి కస్టమర్ సంప్రదించండి తేదీన ఒక రిమైండర్ పొందుతారు
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,"Further accounts can be made under Groups, but entries can be made against non-Groups","మరింత ఖాతాల గుంపులు కింద తయారు చేయవచ్చు, కానీ ఎంట్రీలు కాని గుంపులు వ్యతిరేకంగా తయారు చేయవచ్చు"
 DocType: Lead,Lead,లీడ్
@@ -1083,104 +1097,106 @@
 DocType: Payment Reconciliation,Unreconciled Payment Details,Unreconciled చెల్లింపు వివరాలు
 DocType: Global Defaults,Current Fiscal Year,ప్రస్తుత ఆర్థిక సంవత్సరం
 DocType: Global Defaults,Disable Rounded Total,నున్నటి మొత్తం ఆపివేయి
-DocType: Lead,Call,కాల్
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +417,'Entries' cannot be empty,&#39;ఎంట్రీలు&#39; ఖాళీగా ఉండకూడదు
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +418,'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 +214,Fiscal Year {0} not found,ఫిస్కల్ ఇయర్ {0} దొరకలేదు
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +221,Fiscal Year {0} not found,ఫిస్కల్ ఇయర్ {0} దొరకలేదు
 apps/erpnext/erpnext/config/hr.py +238,Setting up Employees,ఉద్యోగులు ఏర్పాటు
 DocType: Sales Order,SO-,SO-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,మొదటి ఉపసర్గ దయచేసి ఎంచుకోండి
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Please select prefix first,మొదటి ఉపసర్గ దయచేసి ఎంచుకోండి
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Research,రీసెర్చ్
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,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 +43,Item {0} must be a non-stock item,అంశం {0} ఒక కాని స్టాక్ అంశం ఉండాలి
 DocType: Contact,User ID,వినియోగదారుని గుర్తింపు
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +57,View Ledger,చూడండి లెడ్జర్
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,తొట్టతొలి
-apps/erpnext/erpnext/stock/doctype/item/item.py +504,"An Item Group exists with same name, please change the item name or rename the item group","ఒక అంశం గ్రూప్ అదే పేరుతో, అంశం పేరు మార్చడానికి లేదా అంశం సమూహం పేరు దయచేసి"
+apps/erpnext/erpnext/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 +437,Rest Of The World,ప్రపంచంలోని మిగిలిన
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,అంశం {0} బ్యాచ్ ఉండకూడదు
 ,Budget Variance Report,బడ్జెట్ విస్తృతి నివేదిక
 DocType: Salary Slip,Gross Pay,స్థూల పే
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +90,Row {0}: Activity Type is mandatory.,రో {0}: కార్యాచరణ టైప్ తప్పనిసరి.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +114,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/public/js/controllers/stock_controller.js +40,Accounting Ledger,అకౌంటింగ్ లెడ్జర్
+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,అలాగే సంపాదన
 DocType: BOM Item,Item Description,వస్తువు వివరణ
+DocType: Student Sibling,Student Sibling,స్టూడెంట్ తోబుట్టువులు
 DocType: Purchase Invoice,Is Recurring,పునరావృత ఉంది
 DocType: Purchase Invoice,Supplied Items,సరఫరా అంశాలు
 DocType: Student,STUD.,స్టడ్.
 DocType: Production Order,Qty To Manufacture,తయారీకి అంశాల
+DocType: Email Digest,New Income,న్యూ ఆదాయం
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,కొనుగోలు చక్రం పొడవునా అదే రేటు నిర్వహించడానికి
 DocType: Opportunity Item,Opportunity Item,అవకాశం అంశం
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,తాత్కాలిక ప్రారంభోత్సవం
 ,Employee Leave Balance,ఉద్యోగి సెలవు సంతులనం
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +131,Balance for Account {0} must always be {1},ఖాతా సంతులనం {0} ఎల్లప్పుడూ ఉండాలి {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +175,Valuation Rate required for Item in row {0},వరుసగా అంశం అవసరం వాల్యువేషన్ రేటు {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,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,ఉదాహరణ: కంప్యూటర్ సైన్స్ మాస్టర్స్
 DocType: Purchase Invoice,Rejected Warehouse,తిరస్కరించబడిన వేర్హౌస్
 DocType: GL Entry,Against Voucher,ఓచర్ వ్యతిరేకంగా
 DocType: Item,Default Buying Cost Center,డిఫాల్ట్ కొనుగోలు ఖర్చు సెంటర్
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","ERPNext యొక్క ఉత్తమ పొందడానికి, మేము మీరు కొంత సమయం తీసుకొని ఈ సహాయ వీడియోలను చూడటానికి సిఫార్సు చేస్తున్నాము."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +87, to ,కు
+apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,కు
 DocType: Item,Lead Time in days,రోజుల్లో ప్రధాన సమయం
 ,Accounts Payable Summary,చెల్లించవలసిన ఖాతాలు సారాంశం
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Not authorized to edit frozen Account {0},ఘనీభవించిన ఖాతా సవరించడానికి మీకు అధికారం లేదు {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},ఘనీభవించిన ఖాతా సవరించడానికి మీకు అధికారం లేదు {0}
 DocType: Journal Entry,Get Outstanding Invoices,అసాధారణ ఇన్వాయిస్లు పొందండి
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +62,Sales Order {0} is not valid,అమ్మకాల ఆర్డర్ {0} చెల్లదు
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,అమ్మకాల ఆర్డర్ {0} చెల్లదు
 apps/erpnext/erpnext/setup/doctype/company/company.py +185,"Sorry, companies cannot be merged","క్షమించండి, కంపెనీలు విలీనం సాధ్యం కాదు"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +139,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",మొత్తం ఇష్యూ / ట్రాన్స్ఫర్ పరిమాణం {0} మెటీరియల్ అభ్యర్థన {1} \ అంశం కోసం అభ్యర్థించిన పరిమాణం {2} కంటే ఎక్కువ ఉండకూడదు {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Small,చిన్న
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,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}
 ,Invoiced Amount (Exculsive Tax),ఇన్వాయిస్ మొత్తం (Exculsive పన్ను)
-DocType: Student Applicant,Mother's / Guardian 1 Email ID,తల్లి / గార్డియన్ 1 అడ్రెస్
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,అంశం 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,ఖాతా తల {0} రూపొందించినవారు
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +160,Green,గ్రీన్
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,గ్రీన్
 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 +57,Contract,కాంట్రాక్ట్
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,కాంట్రాక్ట్
 DocType: Email Digest,Add Quote,కోట్ జోడించండి
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +498,UOM coversion factor required for UOM: {0} in Item: {1},UoM అవసరం UoM coversion ఫ్యాక్టర్: {0} Item లో: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +503,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 +80,Row {0}: Qty is mandatory,రో {0}: Qty తప్పనిసరి
+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 +737,Sync Master Data,సమకాలీకరణ మాస్టర్ డేటా
+apps/erpnext/erpnext/accounts/page/pos/pos.js +719,Sync Master Data,సమకాలీకరణ మాస్టర్ డేటా
 apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,మీ ఉత్పత్తులు లేదా సేవల
 DocType: Mode of Payment,Mode of Payment,చెల్లింపు విధానం
 apps/erpnext/erpnext/stock/doctype/item/item.py +178,Website Image should be a public file or website URL,వెబ్సైట్ చిత్రం పబ్లిక్ ఫైలు లేదా వెబ్సైట్ URL అయి ఉండాలి
+DocType: Student Applicant,AP,ఏపీ
 DocType: Purchase Invoice Item,BOM,బిఒఎం
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,ఈ రూట్ అంశం సమూహం ఉంది మరియు సవరించడం సాధ్యం కాదు.
+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 +345,"{0}: Employee email not found, hence email not sent","{0}: ఉద్యోగి ఇమెయిల్ దొరకలేదు, అందుకే పంపలేదు ఇమెయిల్"
+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,మీ కంపెనీ అడ్రస్ ఇస్
 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 +118,"For {0}, only credit accounts can be linked against another debit entry","{0}, కేవలం క్రెడిట్ ఖాతాల మరొక డెబిట్ ప్రవేశం వ్యతిరేకంగా లింక్ చేయవచ్చు కోసం"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Delivery Note {0} is not submitted,డెలివరీ గమనిక {0} సమర్పించిన లేదు
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Delivery Note {0} is not submitted,డెలివరీ గమనిక {0} సమర్పించిన లేదు
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Sub-contracted Item,అంశం {0} ఒక ఉప-ఒప్పంద అంశం ఉండాలి
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,రాజధాని పరికరాలు
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","ధర రూల్ మొదటి ఆధారంగా ఎంపిక ఉంటుంది అంశం, అంశం గ్రూప్ లేదా బ్రాండ్ కావచ్చు, ఫీల్డ్ &#39;న వర్తించు&#39;."
 DocType: Hub Settings,Seller Website,అమ్మకాల వెబ్సైట్
 DocType: Item,ITEM-,ITEM-
-apps/erpnext/erpnext/controllers/selling_controller.py +147,Total allocated percentage for sales team should be 100,అమ్మకాలు జట్టు మొత్తం కేటాయించింది శాతం 100 ఉండాలి
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +110,Production Order status is {0},ఉత్పత్తి ఆర్డర్ స్థితి {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,అమ్మకాలు జట్టు మొత్తం కేటాయించింది శాతం 100 ఉండాలి
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},ఉత్పత్తి ఆర్డర్ స్థితి {0}
 DocType: Appraisal Goal,Goal,గోల్
 DocType: Sales Invoice Item,Edit Description,ఎడిట్ వివరణ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +757,For Supplier,సరఫరాదారు కోసం
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +723,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,ప్రింట్ ఫార్మాట్ సృష్టించు
@@ -1196,10 +1212,11 @@
 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,గ్రేడ్ కోడ్
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,సారాంశ ఇమెయిల్:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +445,BOM {0} does not belong to Item {1},బిఒఎం {0} అంశం చెందినది కాదు {1}
 DocType: Sales Partner,Target Distribution,టార్గెట్ పంపిణీ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1667,Deafault warehouse is required for selected item,Deafault గిడ్డంగిలో ఎంచుకున్న అంశానికి అవసరం
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Deafault warehouse is required for selected item,Deafault గిడ్డంగిలో ఎంచుకున్న అంశానికి అవసరం
 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 పఠనం
@@ -1208,23 +1225,23 @@
 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 +110,Hardware,హార్డ్వేర్
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,హార్డ్వేర్
 DocType: Sales Order,Recurring Upto,పునరావృత వరకు
 DocType: Attendance,HR Manager,HR మేనేజర్
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,ఒక కంపెనీ దయచేసి ఎంచుకోండి
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Privilege Leave,ప్రివిలేజ్ లీవ్
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,ప్రివిలేజ్ లీవ్
 DocType: Purchase Invoice,Supplier Invoice Date,సరఫరాదారు వాయిస్ తేదీ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,మీరు షాపింగ్ కార్ట్ ఎనేబుల్ చెయ్యాలి
 DocType: Payment Entry,Writeoff,Writeoff
 DocType: Appraisal Template Goal,Appraisal Template Goal,అప్రైసల్ మూస గోల్
-DocType: Salary Slip,Earning,ఆదాయ
+DocType: Salary Component,Earning,ఆదాయ
 DocType: Purchase Invoice,Party Account Currency,పార్టీ ఖాతా కరెన్సీ
 ,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 +171,Against Journal Entry {0} is already adjusted against some other voucher,జర్నల్ వ్యతిరేకంగా ఎంట్రీ {0} ఇప్పటికే కొన్ని ఇతర రసీదును వ్యతిరేకంగా సర్దుబాటు
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,జర్నల్ వ్యతిరేకంగా ఎంట్రీ {0} ఇప్పటికే కొన్ని ఇతర రసీదును వ్యతిరేకంగా సర్దుబాటు
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,మొత్తం ఆర్డర్ విలువ
-apps/erpnext/erpnext/demo/setup_data.py +358,Food,ఆహార
+apps/erpnext/erpnext/demo/setup/setup_data.py +301,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/course_schedule/course_schedule.js +103,Mark Attendence,మార్క్ Attendence
@@ -1258,12 +1275,12 @@
 DocType: Sales Order Item,Planned Quantity,ప్రణాళిక పరిమాణం
 DocType: Purchase Invoice Item,Item Tax Amount,అంశం పన్ను సొమ్ము
 DocType: Item,Maintain Stock,స్టాక్ నిర్వహించడానికి
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +209,Stock Entries already created for Production Order ,ఇప్పటికే ఉత్పత్తి ఆర్డర్ రూపొందించినవారు స్టాక్ ఎంట్రీలు
+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,స్థిర ఆస్తి నికర మార్పును
 DocType: Leave Control Panel,Leave blank if considered for all designations,అన్ని వివరణలకు భావిస్తారు ఉంటే ఖాళీ వదిలి
-apps/erpnext/erpnext/controllers/accounts_controller.py +620,Charge of type 'Actual' in row {0} cannot be included in Item Rate,రకం &#39;యదార్థ&#39; వరుసగా బాధ్యతలు {0} అంశాన్ని రేటు చేర్చారు సాధ్యం కాదు
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,Max: {0},మాక్స్: {0}
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +15,From Datetime,తేదీసమయం నుండి
+apps/erpnext/erpnext/controllers/accounts_controller.py +623,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 +239,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 +153,"Request for Quotation is disabled to access from portal, for more check portal settings.","కొటేషన్ కోసం అభ్యర్థన చెక్ పోర్టల్ అమర్పులను కోసం, పోర్టల్ నుండి యాక్సెస్ నిలిపివేయబడింది."
@@ -1271,8 +1288,8 @@
 DocType: Sales Invoice,Shipping Address Name,షిప్పింగ్ చిరునామా పేరు
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,ఖాతాల చార్ట్
 DocType: Material Request,Terms and Conditions Content,నియమాలు మరియు నిబంధనలు కంటెంట్
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +552,cannot be greater than 100,100 కంటే ఎక్కువ ఉండకూడదు
-apps/erpnext/erpnext/stock/doctype/item/item.py +680,Item {0} is not a stock Item,{0} అంశం స్టాక్ అంశం కాదు
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +546,cannot be greater than 100,100 కంటే ఎక్కువ ఉండకూడదు
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is not a stock Item,{0} అంశం స్టాక్ అంశం కాదు
 DocType: Maintenance Visit,Unscheduled,అనుకోని
 DocType: Employee,Owned,ఆధ్వర్యంలోని
 DocType: Salary Detail,Depends on Leave Without Pay,పే లేకుండా వదిలి ఆధారపడి
@@ -1286,10 +1303,9 @@
 DocType: GL Entry,GL Entry,GL ఎంట్రీ
 DocType: HR Settings,Employee Settings,Employee సెట్టింగ్స్
 ,Batch-Wise Balance History,బ్యాచ్-వైజ్ సంతులనం చరిత్ర
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,చేయవలసిన పనుల జాబితా
 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 +61,Apprentice,అప్రెంటిస్
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +102,Negative Quantity is not allowed,ప్రతికూల పరిమాణం అనుమతి లేదు
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,అప్రెంటిస్
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +103,Negative Quantity is not allowed,ప్రతికూల పరిమాణం అనుమతి లేదు
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",ఒక స్ట్రింగ్ వంటి అంశం మాస్టర్ నుండి తెచ్చిన మరియు ఈ రంగంలో నిల్వ పన్ను వివరాలు పట్టిక. పన్నులు మరియు ఆరోపణలు వాడిన
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +152,Employee cannot report to himself.,Employee తనను రిపోర్ట్ చేయలేరు.
@@ -1310,15 +1326,14 @@
 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 +141,Source warehouse is mandatory for row {0},మూల గిడ్డంగి వరుసగా తప్పనిసరి {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +719,Packing Slip,ప్యాకింగ్ స్లిప్
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Source warehouse is mandatory for row {0},మూల గిడ్డంగి వరుసగా తప్పనిసరి {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +713,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/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,కొటేషన్ కోసం అభ్యర్థన క్రింది లింక్ క్లిక్ చేయడం ద్వారా యాక్సెస్ చేయవచ్చు
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,దిగుమతి విఫలమైంది!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,ఏ చిరునామా ఇంకా జోడించారు.
 DocType: Workstation Working Hour,Workstation Working Hour,కార్యక్షేత్ర పని గంట
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Analyst,అనలిస్ట్
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,అనలిస్ట్
 DocType: Item,Inventory,ఇన్వెంటరీ
 DocType: Item,Sales Details,సేల్స్ వివరాలు
 DocType: Quality Inspection,QI-,QI-
@@ -1326,7 +1341,7 @@
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,ప్యాక్ చేసిన అంశాల లో
 DocType: Notification Control,Expense Claim Rejected,ఖర్చుల వాదనను త్రోసిపుచ్చాడు
 DocType: Item Attribute,Item Attribute,అంశం లక్షణం
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +103,Government,ప్రభుత్వం
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,ప్రభుత్వం
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,ఇన్స్టిట్యూట్ పేరు
 apps/erpnext/erpnext/config/stock.py +289,Item Variants,అంశం రకరకాలు
 DocType: Company,Services,సర్వీసులు
@@ -1342,6 +1357,7 @@
 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/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,ఇన్వెస్టింగ్ నుండి నగదు ప్రవాహ
 DocType: Program Course,Program Course,ప్రోగ్రామ్ కోర్సు
@@ -1382,12 +1398,12 @@
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,స్వీకర్త జాబితా ఖాళీగా ఉంది. స్వీకర్త జాబితా సృష్టించడానికి దయచేసి
 DocType: Production Plan Sales Order,Production Plan Sales Order,ఉత్పత్తి ప్రణాళిక అమ్మకాల ఆర్డర్
 DocType: Sales Partner,Sales Partner Target,సేల్స్ భాగస్వామిలో టార్గెట్
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +110,Accounting Entry for {0} can only be made in currency: {1},{0} కోసం అకౌంటింగ్ ప్రవేశం మాత్రమే కరెన్సీ తయారు చేయవచ్చు: {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},{0} కోసం అకౌంటింగ్ ప్రవేశం మాత్రమే కరెన్సీ తయారు చేయవచ్చు: {1}
 DocType: Pricing Rule,Pricing Rule,ధర రూల్
 DocType: Budget,Action if Annual Budget Exceeded,యాక్షన్ వార్షిక బడ్జెట్ మించింది ఉంటే
 apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,ఆర్డర్ కొనుగోలు మెటీరియల్ అభ్యర్థన
 DocType: Shopping Cart Settings,Payment Success URL,చెల్లింపు విజయవంతం URL
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +78,Row # {0}: Returned Item {1} does not exists in {2} {3},రో # {0}: రిటర్న్డ్ అంశం {1} కాదు లో ఉండదు {2} {3}
+apps/erpnext/erpnext/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,బ్యాంక్ సయోధ్య ప్రకటన
@@ -1396,40 +1412,39 @@
 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/stock/doctype/stock_entry/stock_entry.py +339,Not allowed to tranfer more {0} than {1} against Purchase Order {2},మరింత బదిలీ చేయాలా అనుమతి లేదు {0} కంటే {1} కొనుగోలు ఆర్డర్ వ్యతిరేకంగా {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +344,Not allowed to tranfer more {0} than {1} against Purchase Order {2},మరింత బదిలీ చేయాలా అనుమతి లేదు {0} కంటే {1} కొనుగోలు ఆర్డర్ వ్యతిరేకంగా {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},విజయవంతంగా కేటాయించిన లీవ్స్ {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,ఏ అంశాలు సర్దుకుని
 DocType: Shipping Rule Condition,From Value,విలువ నుంచి
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +545,Manufacturing Quantity is mandatory,తయారీ పరిమాణం తప్పనిసరి
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,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 +71,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 +162,Row {0}: From Time and To Time of {1} is overlapping with {2},రో {0}: నుండి సమయం మరియు సమయం {1} తో కలిసిపోయే ఉంది {2}
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +186,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,స్టాక్ బాధ్యతలు
 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 +130,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 +137,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,ఇతర నివేదికలు
 DocType: Dependent Task,Dependent Task,అస్వతంత్ర టాస్క్
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,దయచేసి సెటప్ను ఉద్యోగి మానవ వనరుల వ్యవస్థ నామకరణ&gt; ఆర్ సెట్టింగులు
 apps/erpnext/erpnext/stock/doctype/item/item.py +411,Conversion factor for default Unit of Measure must be 1 in row {0},మెజర్ యొక్క డిఫాల్ట్ యూనిట్ మార్పిడి అంశం వరుసగా 1 ఉండాలి {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,Leave of type {0} cannot be longer than {1},రకం లీవ్ {0} కంటే ఎక్కువ ఉండరాదు {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +197,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 +921,Search Item,శోధన అంశం
+apps/erpnext/erpnext/accounts/page/pos/pos.js +910,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 +546,Already completed,ఇప్పటికే పూర్తి
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +22,Payment Request already exists {0},చెల్లింపు అభ్యర్థన ఇప్పటికే ఉంది {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +550,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 +241,Quantity must not be more than {0},పరిమాణం కంటే ఎక్కువ ఉండకూడదు {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Quantity must not be more than {0},పరిమాణం కంటే ఎక్కువ ఉండకూడదు {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +76,Previous Financial Year is not closed,మునుపటి ఆర్థిక సంవత్సరం మూసివేయబడింది లేదు
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +44,Age (Days),వయసు (రోజులు)
 DocType: Quotation Item,Quotation Item,కొటేషన్ అంశం
@@ -1446,7 +1461,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +221,Purchase Receipt {0} is not submitted,కొనుగోలు రసీదులు {0} సమర్పించిన లేదు
 DocType: Company,Default Payable Account,డిఫాల్ట్ చెల్లించవలసిన ఖాతా
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","ఇటువంటి షిప్పింగ్ నియమాలు, ధర జాబితా మొదలైనవి ఆన్లైన్ షాపింగ్ కార్ట్ కోసం సెట్టింగులు"
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +83,{0}% Billed,{0}% కస్టమర్లకు
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}% కస్టమర్లకు
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,ప్రత్యేకించుకోవడమైనది ప్యాక్ చేసిన అంశాల
 DocType: Party Account,Party Account,పార్టీ ఖాతా
 apps/erpnext/erpnext/config/setup.py +116,Human Resources,మానవ వనరులు
@@ -1458,12 +1473,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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 +22,Collect,సేకరించండి
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,సేకరించండి
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,Against Supplier Invoice {0} dated {1},సరఫరాదారు వ్యతిరేకంగా వాయిస్ {0} నాటి {1}
 DocType: Customer,Default Price List,డిఫాల్ట్ ధర జాబితా
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +225,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: Payment Reconciliation,Payments,చెల్లింపులు
 DocType: Journal Entry,Entry Type,ఎంట్రీ రకం
 ,Customer Credit Balance,కస్టమర్ క్రెడిట్ సంతులనం
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Payable,చెల్లించవలసిన అకౌంట్స్ నికర మార్పును
@@ -1475,7 +1489,7 @@
 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 +9,Procurement,ప్రొక్యూర్మెంట్
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,అంశాలను ఎవరూ పరిమాణం లేదా విలువ ఏ మార్పు ఉండదు.
+apps/erpnext/erpnext/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,వారంటీ దావా
 ,Lead Details,లీడ్ వివరాలు
 DocType: Purchase Invoice,End date of current invoice's period,ప్రస్తుత ఇన్వాయిస్ పిరియడ్ ముగింపు తేదీ
@@ -1500,7 +1514,7 @@
 DocType: Purchase Invoice,Additional Discount,అదనపు డిస్కౌంట్
 DocType: Selling Settings,Selling Settings,సెట్టింగులు సెల్లింగ్
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,ఆన్లైన్ వేలంపాటలు
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +97,Please specify either Quantity or Valuation Rate or both,పరిమాణం లేదా మదింపు రేటు లేదా రెండు గాని రాయండి
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,పరిమాణం లేదా మదింపు రేటు లేదా రెండు గాని రాయండి
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +13,Fulfillment,నిర్వాహ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","కంపెనీ, నెల మరియు ఫిస్కల్ ఇయర్ తప్పనిసరి"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,మార్కెటింగ్ ఖర్చులు
@@ -1521,14 +1535,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,ERPNext సెటప్ పూర్తి!
 DocType: Item,Weightage,వెయిటేజీ
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +93,A Customer Group exists with same name please change the Customer name or rename the Customer Group,ఒక కస్టమర్ గ్రూప్ అదే పేరుతో కస్టమర్ పేరును లేదా కస్టమర్ గ్రూప్ పేరు దయచేసి
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +126,A Customer Group exists with same name please change the Customer name or rename the Customer Group,ఒక కస్టమర్ గ్రూప్ అదే పేరుతో కస్టమర్ పేరును లేదా కస్టమర్ గ్రూప్ పేరు దయచేసి
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,న్యూ సంప్రదించండి
 DocType: Territory,Parent Territory,మాతృ భూభాగం
 DocType: Quality Inspection Reading,Reading 2,2 చదివే
 DocType: Stock Entry,Material Receipt,మెటీరియల్ స్వీకరణపై
 DocType: Homepage,Products,ఉత్పత్తులు
 DocType: Announcement,Instructor,బోధకుడు
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},పార్టీ పద్ధతి మరియు పార్టీ స్వీకరించదగిన / చెల్లించవలసిన ఖాతా కోసం అవసరం {0}
 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,నెక్స్ట్ సంప్రదించండి
@@ -1539,7 +1552,7 @@
 ,Item-wise Sales Register,అంశం వారీగా సేల్స్ నమోదు
 DocType: Asset,Gross Purchase Amount,స్థూల కొనుగోలు మొత్తాన్ని
 DocType: Asset,Depreciation Method,అరుగుదల విధానం
-apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Offline,ఆఫ్లైన్
+apps/erpnext/erpnext/accounts/page/pos/pos.js +686,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,లు గుర్తించబడతాయి
@@ -1557,25 +1570,27 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +425,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 +858,Make Purchase Order,కొనుగోలు ఆర్డర్ చేయండి
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +852,Make Purchase Order,కొనుగోలు ఆర్డర్ చేయండి
 DocType: SMS Center,Send To,పంపే
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,There is not enough leave balance for Leave Type {0},లీవ్ పద్ధతి కోసం తగినంత సెలవు సంతులనం లేదు {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,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 కోడ్
 DocType: Stock Reconciliation,Stock Reconciliation,స్టాక్ సయోధ్య
 DocType: Territory,Territory Name,భూభాగం పేరు
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +172,Work-in-Progress Warehouse is required before Submit,పని లో ప్రోగ్రెస్ వేర్హౌస్ సమర్పించండి ముందు అవసరం
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,Work-in-Progress Warehouse is required before Submit,పని లో ప్రోగ్రెస్ వేర్హౌస్ సమర్పించండి ముందు అవసరం
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,ఒక Job కొరకు అభ్యర్ధించే.
 DocType: Purchase Order Item,Warehouse and Reference,వేర్హౌస్ మరియు సూచన
 DocType: Supplier,Statutory info and other general information about your Supplier,మీ సరఫరాదారు గురించి స్టాట్యుటరీ సమాచారం మరియు ఇతర సాధారణ సమాచారం
-apps/erpnext/erpnext/hooks.py +88,Addresses,చిరునామాలు
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,సరఫరాదారు&gt; సరఫరాదారు టైప్
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +212,Against Journal Entry {0} does not have any unmatched {1} entry,జర్నల్ వ్యతిరేకంగా ఎంట్రీ {0} ఏదైనా సరిపోలని {1} ఎంట్రీ లేదు
+apps/erpnext/erpnext/hooks.py +95,Addresses,చిరునామాలు
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +215,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,అంశం లేదా వేర్హౌస్ ఆధారంగా వడపోత సెట్ చెయ్యండి
 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,బట్వాడా మరియు బిల్
@@ -1583,11 +1598,10 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,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 +731,Payment,చెల్లింపు
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,Payment,చెల్లింపు
 DocType: Production Order Operation,Actual Time and Cost,అసలు సమయం మరియు ఖర్చు
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},గరిష్ట {0} యొక్క పదార్థం అభ్యర్థన {1} అమ్మకాల ఆర్డర్ వ్యతిరేకంగా అంశం కోసం తయారు చేయవచ్చు {2}
 DocType: Employee,Salutation,సెల్యుటేషన్
-DocType: Pricing Rule,Brand,బ్రాండ్
 DocType: Course,Course Abbreviation,కోర్సు సంక్షిప్తీకరణ
 DocType: Item,Will also apply for variants,కూడా రూపాంతరాలు వర్తిస్తాయని
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +142,"Asset cannot be cancelled, as it is already {0}","అది ఇప్పటికే ఉంది గా ఆస్తి, రద్దు చేయబడదు {0}"
@@ -1599,7 +1613,7 @@
 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.","మీరు కొనుగోలు లేదా విక్రయించడం మీ ఉత్పత్తులు లేదా సేవల జాబితా. మీరు మొదలుపెడితే మెజర్ మరియు ఇతర లక్షణాలు అంశం గ్రూప్, యూనిట్ తనిఖీ నిర్ధారించుకోండి."
 DocType: Hub Settings,Hub Node,హబ్ నోడ్
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,మీరు నకిలీ అంశాలను నమోదు చేసారు. సరిదిద్ది మళ్లీ ప్రయత్నించండి.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Associate,అసోసియేట్
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,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,స్వీకర్త జాబితా సృష్టించు
@@ -1607,7 +1621,7 @@
 DocType: Production Planning Tool,Material Requests,మెటీరియల్ అభ్యర్థనలు
 DocType: Warranty Claim,Issue Date,జారి చేయు తేది
 DocType: Activity Cost,Activity Cost,కార్యాచరణ వ్యయం
-DocType: Timesheet Detail,Timesheet Detail,timesheet వివరాలు
+DocType: Sales Invoice Timesheet,Timesheet Detail,timesheet వివరాలు
 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),ప్యాకేజీ దూస్రా (మాత్రమే డ్రాఫ్ట్) లో ఒక భాగంగా ఉంది అని సూచిస్తుంది
@@ -1630,6 +1644,7 @@
 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,రకాల్లో
 DocType: Monthly Distribution,Name of the Monthly Distribution,మంత్లీ పంపిణీ పేరు
 DocType: Sales Person,Parent Sales Person,మాతృ సేల్స్ పర్సన్
@@ -1642,30 +1657,31 @@
 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 +44,"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/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.,మీరు సేల్స్ వాయిస్ సేవ్ ఒకసారి వర్డ్స్ కనిపిస్తుంది.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +502,Error: {0} &gt; {1},లోపం: {0}&gt; {1}
 DocType: Item,Is Sales Item,సేల్స్ 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.,టర్మ్ ప్రారంభ తేదీ పదం సంబంధమున్న విద్యా సంవత్సరం ఇయర్ ప్రారంభ తేదీ కంటే ముందు ఉండకూడదు (అకాడమిక్ ఇయర్ {}). దయచేసి తేదీలు సరిచేసి మళ్ళీ ప్రయత్నించండి.
 DocType: Naming Series,Current Value,కరెంట్ వేల్యూ
-apps/erpnext/erpnext/controllers/accounts_controller.py +235,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,బహుళ ఆర్థిక సంవత్సరాలలో తేదీ {0} ఉన్నాయి. ఫిస్కల్ ఇయర్ లో కంపెనీని స్థాపించారు దయచేసి
+apps/erpnext/erpnext/controllers/accounts_controller.py +238,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 +458,Item table can not be blank,అంశం పట్టిక ఖాళీగా ఉండరాదు
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +443,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 +5,This is based on stock movement. See {0} for details,ఈ స్టాక్ ఉద్యమం ఆధారంగా. చూడండి {0} వివరాలకు
 DocType: Pricing Rule,Selling,సెల్లింగ్
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +341,Amount {0} {1} deducted against {2},మొత్తం {0} {1} వ్యతిరేకంగా తీసివేయబడుతుంది {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +344,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,గడువు తేదీ తేదీ చేసినది ముందు ఉండరాదు
@@ -1680,8 +1696,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +144,Cannot refer row number greater than or equal to current row number for this Charge type,ఈ ఛార్జ్ రకం కోసం ప్రస్తుత వరుస సంఖ్య కంటే ఎక్కువ లేదా సమాన వరుస సంఖ్య చూడండి కాదు
 DocType: Asset,Sold,సోల్డ్
 ,Item-wise Purchase History,అంశం వారీగా కొనుగోలు చరిత్ర
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Red,రెడ్
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},సీరియల్ లేవు అంశం కోసం జోడించిన పొందడంలో &#39;రూపొందించండి షెడ్యూల్&#39; పై క్లిక్ చేయండి {0}
+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,ఓపెన్ ఉత్పత్తి ఆర్డర్స్
 DocType: Sales Invoice Payment,Base Amount (Company Currency),బేస్ మొత్తం (కంపెనీ కరెన్సీ)
@@ -1689,7 +1705,7 @@
 DocType: Installation Note,Installation Time,సంస్థాపన సమయం
 DocType: Sales Invoice,Accounting Details,అకౌంటింగ్ వివరాలు
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,ఈ కంపెనీ కోసం అన్ని లావాదేవీలు తొలగించు
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +187,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,రో # {0}: ఆపరేషన్ {1} ఉత్పత్తి లో పూర్తి వస్తువుల {2} అంశాల పూర్తిచేయాలని కాదు ఆజ్ఞాపించాలని # {3}. సమయం దినచర్య ద్వారా ఆపరేషన్ డేట్ దయచేసి
+apps/erpnext/erpnext/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}. సమయం దినచర్య ద్వారా ఆపరేషన్ డేట్ దయచేసి
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,ఇన్వెస్ట్మెంట్స్
 DocType: Issue,Resolution Details,రిజల్యూషన్ వివరాలు
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,కేటాయింపులు
@@ -1725,16 +1741,17 @@
 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}
 DocType: Delivery Note,Excise Page Number,ఎక్సైజ్ పేజీ సంఖ్య
 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}
 ,Maintenance Schedules,నిర్వహణ షెడ్యూల్స్
 DocType: Task,Actual End Date (via Time Sheet),ముగింపు తేదీ (సమయం షీట్ ద్వారా)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Amount {0} {1} against {2} {3},మొత్తం {0} {1} వ్యతిరేకంగా {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +339,Amount {0} {1} against {2} {3},మొత్తం {0} {1} వ్యతిరేకంగా {2} {3}
 ,Quotation Trends,కొటేషన్ ట్రెండ్లులో
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},అంశం గ్రూప్ అంశం కోసం అంశాన్ని మాస్టర్ ప్రస్తావించలేదు {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +295,Debit To account must be a Receivable account,ఖాతాకు డెబిట్ ఒక స్వీకరించదగిన ఖాతా ఉండాలి
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Receivable account,ఖాతాకు డెబిట్ ఒక స్వీకరించదగిన ఖాతా ఉండాలి
 DocType: Shipping Rule Condition,Shipping Amount,షిప్పింగ్ మొత్తం
 ,Pending Amount,పెండింగ్ మొత్తం
 DocType: Purchase Invoice Item,Conversion Factor,మార్పిడి ఫాక్టర్
@@ -1742,10 +1759,10 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +137,Expected value after useful life must be greater than or equal to {0},వినియోగ జీవితం అయిపోయిన తరువాత ఊహించిన విలువ కంటే ఎక్కువ లేదా సమానంగా ఉండాలి {0}
 DocType: Purchase Receipt,Vehicle Number,వాహనం సంఖ్య
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,పునరావృత ఇన్వాయిస్ ఆపడానికి చేయబడే తేదీ
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +90,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,మొత్తం కేటాయించింది ఆకులు {0} తక్కువ ఉండకూడదు కాలం కోసం ఇప్పటికే ఆమోదం ఆకులు {1} కంటే
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +93,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 +22,Enter Paid Amount,చెల్లింపు మొత్తం ఎంటర్
+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 ఉపయోగించండి
@@ -1755,13 +1772,15 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,timesheets
 DocType: HR Settings,HR Settings,ఆర్ సెట్టింగ్స్
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Expense Claim is pending approval. Only the Expense Approver can update status.,ఖర్చు చెప్పడం ఆమోదం లభించవలసి ఉంది. మాత్రమే ఖర్చుల అప్రూవర్గా డేట్ చేయవచ్చు.
+DocType: Email Digest,New Expenses,న్యూ ఖర్చులు
 DocType: Purchase Invoice,Additional Discount Amount,అదనపు డిస్కౌంట్ మొత్తం
-apps/erpnext/erpnext/controllers/accounts_controller.py +524,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","రో # {0}: ప్యాక్ చేసిన అంశాల 1, అంశం ఒక స్థిర ఆస్తి ఉంది ఉండాలి. దయచేసి బహుళ అంశాల కోసం ప్రత్యేక వరుస ఉపయోగించడానికి."
+apps/erpnext/erpnext/controllers/accounts_controller.py +527,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","రో # {0}: ప్యాక్ చేసిన అంశాల 1, అంశం ఒక స్థిర ఆస్తి ఉంది ఉండాలి. దయచేసి బహుళ అంశాల కోసం ప్రత్యేక వరుస ఉపయోగించడానికి."
 DocType: Leave Block List Allow,Leave Block List Allow,బ్లాక్ జాబితా అనుమతించు వదిలి
 apps/erpnext/erpnext/setup/doctype/company/company.py +249,Abbr can not be blank or space,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/stock/get_item_details.py +123,Please specify Company,కంపెనీ రాయండి
 ,Customer Acquisition and Loyalty,కస్టమర్ అక్విజిషన్ అండ్ లాయల్టీ
@@ -1772,17 +1791,19 @@
 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 +183,Closing (Opening + Totals),మూసివేయడం (+ మొత్తాలు తెరవడం)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),మూసివేయడం (+ మొత్తాలు తెరవడం)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,కంపెనీ లో కరెన్సీ రాయండి
 DocType: Workstation,Wages per hour,గంటకు వేతనాలు
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +50,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,మెటీరియల్ అభ్యర్థనలను తరువాత అంశం యొక్క క్రమాన్ని స్థాయి ఆధారంగా స్వయంచాలకంగా బడ్డాయి
-apps/erpnext/erpnext/controllers/accounts_controller.py +272,Account {0} is invalid. Account Currency must be {1},ఖాతా {0} చెల్లదు. ఖాతా కరెన్సీ ఉండాలి {1}
+DocType: Email Digest,Pending Sales Orders,సేల్స్ ఆర్డర్స్ పెండింగ్లో
+apps/erpnext/erpnext/controllers/accounts_controller.py +275,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 +956,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","రో # {0}: రిఫరెన్స్ డాక్యుమెంట్ టైప్ అమ్మకాల ఉత్తర్వు ఒకటి, సేల్స్ వాయిస్ లేదా జర్నల్ ఎంట్రీ ఉండాలి"
-DocType: Salary Slip,Deduction,తీసివేత
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +87,Row {0}: From Time and To Time is mandatory.,రో {0}: టైమ్ నుండి మరియు సమయం తప్పనిసరి.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +969,"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 +111,Row {0}: From Time and To Time is mandatory.,రో {0}: టైమ్ నుండి మరియు సమయం తప్పనిసరి.
+DocType: Stock Reconciliation Item,Amount Difference,మొత్తం తక్షణ
 apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},అంశం ధర కోసం జోడించిన {0} ధర జాబితా లో {1}
 DocType: Address Template,Address Template,చిరునామా మూస
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +7,Please enter Employee Id of this sales person,ఈ విక్రయాల వ్యక్తి యొక్క ఉద్యోగి ID నమోదు చేయండి
@@ -1790,7 +1811,7 @@
 DocType: Project,% Tasks Completed,% పనులు పూర్తి
 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 +194,Please enter Production Item first,మొదటి ఉత్పత్తి అంశం నమోదు చేయండి
+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,వికలాంగ యూజర్
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,కొటేషన్
@@ -1799,53 +1820,54 @@
 DocType: Maintenance Visit,Maintenance User,నిర్వహణ వాడుకరి
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +149,Cost Updated,ధర నవీకరించబడింది
 DocType: Employee,Date of Birth,పుట్టిన తేది
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +86,Item {0} has already been returned,అంశం {0} ఇప్పటికే తిరిగి చెయ్యబడింది
+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: 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 +177,Job Description,ఉద్యోగ వివరణ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,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 +126,"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 +127,"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 ప్రచారాలు నుండి పెట్టుబడి పై రాబడి కొలవడానికి."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +24,Welcome to POS: Create your POS Profile,POS కు స్వాగతం: మీ POS ప్రొఫైల్ సృష్టించండి
 DocType: Expense Claim,Approver,అప్రూవర్గా
 ,SO Qty,SO ప్యాక్ చేసిన అంశాల
+DocType: Guardian,Work Address,కార్య చిరునామా
 DocType: Appraisal,Calculate Total Score,మొత్తం స్కోరు లెక్కించు
 DocType: Request for Quotation,Manufacturing Manager,తయారీ మేనేజర్
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},సీరియల్ లేవు {0} వరకు వారంటీ కింద {1}
+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 +74,Shipments,ప్యాకేజీల
+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 +153,Row # ,రో #
+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 +156,Get From,నుండి పొందండి
+apps/erpnext/erpnext/public/js/utils.js +167,Get From,నుండి పొందండి
 DocType: C-Form,Quarter,క్వార్టర్
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Miscellaneous Expenses,ఇతరాలు ఖర్చులు
 DocType: Global Defaults,Default Company,డిఫాల్ట్ కంపెనీ
 apps/erpnext/erpnext/controllers/stock_controller.py +167,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,ఖర్చుల లేదా తక్షణ ఖాతా అంశం {0} వంటి ప్రభావితం మొత్తం మీద స్టాక్ విలువ తప్పనిసరి
-apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","వరుసగా అంశం {0} కోసం overbill కాదు {1} కంటే ఎక్కువ {2}. Overbilling, స్టాక్ సెట్టింగ్స్ లో సెట్ చెయ్యండి అనుమతించేందుకు"
+apps/erpnext/erpnext/controllers/accounts_controller.py +419,"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
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} is disabled,వాడుకరి {0} నిలిపివేయబడింది
 DocType: Leave Application,Total Leave Days,మొత్తం లీవ్ డేస్
 DocType: Email Digest,Note: Email will not be sent to disabled users,గమనిక: ఇమెయిల్ వికలాంగ వినియోగదారులకు పంపబడదు
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,కంపెనీ ఎంచుకోండి ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,అన్ని శాఖల కోసం భావిస్తారు ఉంటే ఖాళీ వదిలి
 apps/erpnext/erpnext/config/hr.py +171,"Types of employment (permanent, contract, intern etc.).","ఉపాధి రకాలు (శాశ్వత, కాంట్రాక్టు ఇంటర్న్ మొదలైనవి)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +346,{0} is mandatory for Item {1},{0} అంశం తప్పనిసరి {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,{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","కనీసం ఒక వరుసలో కేటాయించిన మొత్తం, వాయిస్ పద్ధతి మరియు వాయిస్ సంఖ్య దయచేసి ఎంచుకోండి"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,న్యూ కొనుగోలులో ఖర్చు
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},అంశం అవసరం అమ్మకాల ఉత్తర్వు {0}
 DocType: Purchase Invoice Item,Rate (Company Currency),రేటు (కంపెనీ కరెన్సీ)
-apps/erpnext/erpnext/demo/setup_data.py +360,Others,ఇతరత్రా
+DocType: Student Guardian,Others,ఇతరత్రా
 DocType: Payment Entry,Unallocated Amount,unallocated మొత్తం
 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,పన్నులు మరియు ఆరోపణలు
@@ -1865,17 +1887,16 @@
 apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,సీరియల్ ఇన్వెంటరీ
 DocType: Activity Type,Default Billing Rate,డిఫాల్ట్ బిల్లింగ్ రేటు
 DocType: Sales Invoice,Total Billing Amount,మొత్తం బిల్లింగ్ మొత్తం
-apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +54,Receivable Account,స్వీకరించదగిన ఖాతా
-apps/erpnext/erpnext/controllers/accounts_controller.py +546,Row #{0}: Asset {1} is already {2},రో # {0}: ఆస్తి {1} ఇప్పటికే ఉంది {2}
+apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,స్వీకరించదగిన ఖాతా
+apps/erpnext/erpnext/controllers/accounts_controller.py +549,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 +79,CEO,సియిఒ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,సియిఒ
 DocType: Expense Claim Detail,Expense Claim Detail,ఖర్చు చెప్పడం వివరాలు
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +808,Please select correct account,సరైన ఖాతాను ఎంచుకోండి
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +809,Please select correct account,సరైన ఖాతాను ఎంచుకోండి
 DocType: Item,Weight UOM,బరువు UoM
 DocType: Salary Structure Employee,Salary Structure Employee,జీతం నిర్మాణం ఉద్యోగి
 DocType: Employee,Blood Group,రక్తం గ్రూపు
-DocType: Purchase Invoice Item,Page Break,పుట విరుపు
 DocType: Production Order Operation,Pending,పెండింగ్
 DocType: Course,Course Name,కోర్సు పేరు
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,ఒక నిర్దిష్ట ఉద్యోగి సెలవు అప్లికేషన్లు ఆమోదించవచ్చు చేసిన వాడుకరులు
@@ -1884,14 +1905,15 @@
 DocType: Fiscal Year,Companies,కంపెనీలు
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,ఎలక్ట్రానిక్స్
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,స్టాక్ క్రమాన్ని స్థాయి చేరుకున్నప్పుడు మెటీరియల్ అభ్యర్థన రైజ్
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Full-time,పూర్తి సమయం
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,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: 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,మొత్తం ఇన్కమింగ్ విలువ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Debit To is required,డెబిట్ అవసరం ఉంది
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +321,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,క్వాలిటీ మేనేజర్
@@ -1899,6 +1921,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/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,మొత్తం ఇన్వాయిస్ ఆంట్
@@ -1909,18 +1932,17 @@
 DocType: Production Order Operation,Completed Qty,పూర్తైన ప్యాక్ చేసిన అంశాల
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"For {0}, only debit accounts can be linked against another credit entry","{0}, మాత్రమే డెబిట్ ఖాతాల మరో క్రెడిట్ ప్రవేశానికి వ్యతిరేకంగా లింక్ చేయవచ్చు కోసం"
 apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,ధర జాబితా {0} నిలిపివేయబడింది
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +99,Row {0}: Completed Qty cannot be more than {1} for operation {2},రో {0}: పూర్తి ప్యాక్ చేసిన అంశాల కంటే ఎక్కువగా ఉండకూడదు {1} ఆపరేషన్ కోసం {2}
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +123,Row {0}: Completed Qty cannot be more than {1} for operation {2},రో {0}: పూర్తి ప్యాక్ చేసిన అంశాల కంటే ఎక్కువగా ఉండకూడదు {1} ఆపరేషన్ కోసం {2}
 DocType: Manufacturing Settings,Allow Overtime,అదనపు అనుమతించు
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} అంశం అవసరం సీరియల్ సంఖ్యలు {1}. మీరు అందించిన {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,ప్రస్తుత లెక్కింపు రేటు
 DocType: Item,Customer Item Codes,కస్టమర్ Item కోడులు
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,ఎక్స్చేంజ్ పెరుగుట / నష్టం
 DocType: Opportunity,Lost Reason,లాస్ట్ కారణము
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,దయచేసి సెటప్ను&gt; సెటప్ ద్వారా హాజరు ధారావాహిక సంఖ్యలో నంబరింగ్ సిరీస్
 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/purchase_receipt/purchase_receipt.py +378,All items have already been invoiced,అన్ని అంశాలను ఇప్పటికే ఇన్వాయిస్ చేశారు
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +379,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,బాహ్య
@@ -1936,18 +1958,19 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,మీ కస్టమర్స్
 apps/erpnext/erpnext/projects/doctype/project/project.py +141,You have been invited to collaborate on the project: {0},మీరు ప్రాజెక్ట్ సహకరించడానికి ఆహ్వానించబడ్డారు: {0}
 DocType: Leave Block List Date,Block Date,బ్లాక్ తేదీ
-apps/erpnext/erpnext/templates/generators/job_opening.html +19,Apply Now,ఇప్పుడు వర్తించు
+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 నిర్వహించండి.
 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,భవనాలు
-apps/erpnext/erpnext/utilities/doctype/address/address.py +164,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,డిఫాల్ట్ చిరునామా మూస దొరకలేదు. దయచేసి సెటప్&gt; ముద్రణ మరియు బ్రాండింగ్&gt; చిరునామా మూస నుండి ఒక కొత్త సృష్టించడానికి.
 DocType: Fee Structure,Fee Structure,ఫీజు స్ట్రక్చర్
 DocType: Timesheet Detail,Costing Amount,ఖరీదు మొత్తం
+DocType: Student Admission,Application Fee,అప్లికేషన్ రుసుము
 DocType: Process Payroll,Submit Salary Slip,వేతనం స్లిప్ సమర్పించండి
-apps/erpnext/erpnext/controllers/selling_controller.py +161,Maxiumm discount for Item {0} is {1}%,అంశం {0} ఉంది {1}% కోసం Maxiumm డిస్కౌంట్
+apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,అంశం {0} ఉంది {1}% కోసం Maxiumm డిస్కౌంట్
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,పెద్దమొత్తంలో దిగుమతి
 DocType: Sales Partner,Address & Contacts,చిరునామా &amp; కాంటాక్ట్స్
 DocType: SMS Log,Sender Name,పంపినవారు పేరు
@@ -1972,21 +1995,21 @@
 DocType: Serial No,Delivery Time,డెలివరీ సమయం
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,ఆధారంగా ఏజింగ్
 DocType: Item,End of Life,లైఫ్ ఎండ్
-apps/erpnext/erpnext/demo/setup_data.py +361,Travel,ప్రయాణం
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +155,No active or default Salary Structure found for employee {0} for the given dates,సక్రియ లేదా డిఫాల్ట్ జీతం నిర్మాణం ఇచ్చిన తేదీలు ఉద్యోగుల {0} కనుగొనబడలేదు
+apps/erpnext/erpnext/demo/setup/setup_data.py +304,Travel,ప్రయాణం
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +167,No active or default Salary Structure found for employee {0} for the given dates,సక్రియ లేదా డిఫాల్ట్ జీతం నిర్మాణం ఇచ్చిన తేదీలు ఉద్యోగుల {0} కనుగొనబడలేదు
 DocType: Leave Block List,Allow Users,వినియోగదారులు అనుమతించు
 DocType: Purchase Order,Customer Mobile No,కస్టమర్ మొబైల్ లేవు
 DocType: Sales Invoice,Recurring,పునరావృత
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,ప్రత్యేక ఆదాయం ట్రాక్ మరియు ఉత్పత్తి అంశాలతో లేదా విభాగాలు వ్యయం.
 DocType: Rename Tool,Rename Tool,టూల్ పేరుమార్చు
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +23,Update Cost,నవీకరణ ఖర్చు
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,నవీకరణ ఖర్చు
 DocType: Item Reorder,Item Reorder,అంశం క్రమాన్ని మార్చు
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +36,Show Salary Slip,జీతం షో స్లిప్
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +748,Transfer Material,ట్రాన్స్ఫర్ మెటీరియల్
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +53,Show Salary Slip,జీతం షో స్లిప్
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +166,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 +923,Please set recurring after saving,గండం పునరావృత సెట్ చెయ్యండి
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +646,Select change amount account,మార్పు ఎంచుకోండి మొత్తం ఖాతా
+apps/erpnext/erpnext/public/js/controllers/transaction.js +914,Please set recurring after saving,గండం పునరావృత సెట్ చెయ్యండి
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +703,Select change amount account,మార్పు ఎంచుకోండి మొత్తం ఖాతా
 DocType: Purchase Invoice,Price List Currency,ధర జాబితా కరెన్సీ
 DocType: Naming Series,User must always select,వినియోగదారు ఎల్లప్పుడూ ఎంచుకోవాలి
 DocType: Stock Settings,Allow Negative Stock,ప్రతికూల స్టాక్ అనుమతించు
@@ -1998,31 +2021,32 @@
 DocType: Quality Inspection,Verified By,ద్వారా ధృవీకరించబడిన
 DocType: Address,Subsidiary,అనుబంధ
 apps/erpnext/erpnext/setup/doctype/company/company.py +64,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","ఇప్పటికే లావాదేవీలు ఉన్నాయి ఎందుకంటే, కంపెనీ యొక్క డిఫాల్ట్ కరెన్సీ మార్చలేరు. ట్రాన్సాక్షన్స్ డిఫాల్ట్ కరెన్సీ మార్చడానికి రద్దు చేయాలి."
+DocType: Grade Interval,Grade Description,గ్రేడ్ వివరణ
 DocType: Quality Inspection,Purchase Receipt No,కొనుగోలు రసీదులు లేవు
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,ఎర్నెస్ట్ మనీ
 DocType: Process Payroll,Create Salary Slip,వేతనం స్లిప్ సృష్టించు
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +33,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 +352,Quantity in row {0} ({1}) must be same as manufactured quantity {2},వరుసగా పరిమాణం {0} ({1}) మాత్రమే తయారు పరిమాణం సమానంగా ఉండాలి {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Quantity in row {0} ({1}) must be same as manufactured quantity {2},వరుసగా పరిమాణం {0} ({1}) మాత్రమే తయారు పరిమాణం సమానంగా ఉండాలి {2}
 DocType: Appraisal,Employee,Employee
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,వాడుకరి ఆహ్వానించండి
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} పూర్తిగా బిల్
 DocType: Workstation Working Hour,End Time,ముగింపు సమయం
 DocType: Payment Entry,Payment Deductions or Loss,చెల్లింపు తగ్గింపు లేదా నష్టం
-apps/erpnext/erpnext/config/schools.py +100,LMS,LMS
+apps/erpnext/erpnext/config/schools.py +104,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,సేల్స్ పైప్లైన్
 DocType: Student Batch Student,Student Batch Student,స్టూడెంట్ బ్యాచ్ విద్యార్థి
-DocType: Sales Invoice,Mass Mailing,మాస్ మెయిలింగ్
+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 +199,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/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 +297,Salary Slip of employee {0} already created for this period,ఉద్యోగి వేతనం స్లిప్ {0} ఇప్పటికే ఈ కాలానికి రూపొందించినవారు
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Pharmaceutical,ఫార్మాస్యూటికల్
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +309,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/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,క్రెడిట్
@@ -2037,27 +2061,28 @@
 DocType: Upload Attendance,Attendance To Date,తేదీ హాజరు
 DocType: Warranty Claim,Raised By,లేవనెత్తారు
 DocType: Payment Gateway Account,Payment Account,చెల్లింపు ఖాతా
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +814,Please specify Company to proceed,కొనసాగాలని కంపెనీ రాయండి
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +793,Please specify Company to proceed,కొనసాగాలని కంపెనీ రాయండి
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Receivable,స్వీకరించదగిన ఖాతాలు నికర మార్పును
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Compensatory Off,పరిహార ఆఫ్
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,పరిహార ఆఫ్
 DocType: Quality Inspection Reading,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.,మీరు నిజంగా ఈ సంస్థ కోసం అన్ని లావాదేవీలు తొలగించాలనుకుంటున్నారా నిర్ధారించుకోండి. ఇది వంటి మీ మాస్టర్ డేటా అలాగే ఉంటుంది. ఈ చర్య రద్దు సాధ్యం కాదు.
 DocType: Room,Room Number,గది సంఖ్య
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},చెల్లని సూచన {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +161,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ప్రణాళిక quanitity కంటే ఎక్కువ ఉండకూడదు ({2}) ఉత్పత్తి ఆర్డర్ {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +162,{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 +217,Raw Materials cannot be blank.,రా మెటీరియల్స్ ఖాళీ ఉండకూడదు.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,"Could not update stock, invoice contains drop shipping item.","స్టాక్ అప్డేట్ కాలేదు, ఇన్వాయిస్ డ్రాప్ షిప్పింగ్ అంశం కలిగి."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +460,Quick Journal Entry,త్వరిత జర్నల్ ఎంట్రీ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +111,You can not change rate if BOM mentioned agianst any item,బిఒఎం ఏ అంశం agianst పేర్కొన్నారు ఉంటే మీరు రేటు మార్చలేరు
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +441,"Could not update stock, invoice contains drop shipping item.","స్టాక్ అప్డేట్ కాలేదు, ఇన్వాయిస్ డ్రాప్ షిప్పింగ్ అంశం కలిగి."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Quick Journal Entry,త్వరిత జర్నల్ ఎంట్రీ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +103,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 +214,{0} {1} is not submitted,{0} {1} సమర్పించిన లేదు
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,అంశాలను అభ్యర్థనలు.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,ప్రత్యేక నిర్మాణ ఆర్డర్ ప్రతి పూర్తయిన మంచి అంశం రూపొందించినవారు ఉంటుంది.
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +121,{0} must be negative in return document,{0} తిరిగి పత్రంలో ప్రతికూల ఉండాలి
 ,Minutes to First Response for Issues,సమస్యలకు మొదటి రెస్పాన్స్ మినిట్స్
 DocType: Purchase Invoice,Terms and Conditions1,నిబంధనలు మరియు Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,ఇన్స్టిట్యూట్ యొక్క పేరు ఇది కోసం మీరు ఈ వ్యవస్థ ఏర్పాటు చేస్తారు.
@@ -2066,16 +2091,17 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,ప్రాజెక్టు హోదా
 DocType: UOM,Check this to disallow fractions. (for Nos),భిన్నాలు నిరాకరించేందుకు ఈ తనిఖీ. (NOS కోసం)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +398,The following Production Orders were created:,క్రింది ఉత్పత్తి ఆర్డర్స్ ఏర్పరచారు:
+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 +739,Item or Warehouse for row {0} does not match Material Request,వరుసగా {0} సరిపోలడం లేదు మెటీరియల్ అభ్యర్థన కోసం WorldWideThemes.net అంశం లేదా వేర్హౌస్
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +747,Item or Warehouse for row {0} does not match Material Request,వరుసగా {0} సరిపోలడం లేదు మెటీరియల్ అభ్యర్థన కోసం WorldWideThemes.net అంశం లేదా వేర్హౌస్
 apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,కొలమానం
 DocType: Fiscal Year,Year End Date,ఇయర్ ముగింపు తేదీ
 DocType: Task Depends On,Task Depends On,టాస్క్ ఆధారపడి
-DocType: Lead,Opportunity,అవకాశం
+DocType: Supplier Quotation,Opportunity,అవకాశం
 ,Completed Production Orders,పూర్తి అయ్యింది ఆర్డర్స్
 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,డిఫాల్ట్ కార్యక్షేత్ర
@@ -2088,7 +2114,7 @@
 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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},నిర్వహణ ప్రారంభ తేదీ సీరియల్ నో డెలివరీ తేదీ ముందు ఉండరాదు {0}
+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,వాస్తవిక ముగింపు తేదీ
 DocType: Purchase Invoice,PINV-,PINV-
 DocType: Authorization Rule,Applicable To (Role),వర్తించదగిన (పాత్ర)
@@ -2103,7 +2129,7 @@
 DocType: SMS Log,No of Requested SMS,అభ్యర్థించిన SMS సంఖ్య
 DocType: Campaign,Campaign-.####,ప్రచారం -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,తదుపరి దశలు
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,Please supply the specified items at the best possible rates,ఉత్తమమైన రేట్లు వద్ద పేర్కొన్న అంశాలను అందించండి
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +695,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 +117,Contract End Date must be greater than Date of Joining,కాంట్రాక్ట్ ముగింపు తేదీ చేరడం తేదీ కంటే ఎక్కువ ఉండాలి
 DocType: Delivery Note,DN-,DN-
@@ -2112,7 +2138,7 @@
 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 +14,This is an example website auto-generated from ERPNext,ఈ ఒక ఉదాహరణ వెబ్సైట్ ERPNext నుండి ఆటో ఉత్పత్తి ఉంది
+apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,ఈ ఒక ఉదాహరణ వెబ్సైట్ ERPNext నుండి ఆటో ఉత్పత్తి ఉంది
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,ఏజింగ్ రేంజ్ 1
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
@@ -2139,13 +2165,14 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd పరిమాణం
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +54,Fee Records Created - {0},ఫీజు రికార్డ్స్ రూపొందించబడింది - {0}
 DocType: Asset Category Account,Asset Category Account,ఆస్తి వర్గం ఖాతా
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +103,Cannot produce more Item {0} than Sales Order quantity {1},అమ్మకాల ఆర్డర్ పరిమాణం కంటే ఎక్కువ అంశం {0} ఉత్పత్తి కాదు {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Stock Entry {0} is not submitted,స్టాక్ ఎంట్రీ {0} సమర్పించిన లేదు
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},అమ్మకాల ఆర్డర్ పరిమాణం కంటే ఎక్కువ అంశం {0} ఉత్పత్తి కాదు {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +505,Stock Entry {0} is not submitted,స్టాక్ ఎంట్రీ {0} సమర్పించిన లేదు
 DocType: Payment Reconciliation,Bank / Cash Account,బ్యాంకు / క్యాష్ ఖాతా
 DocType: Tax Rule,Billing City,బిల్లింగ్ సిటీ
 DocType: Salary Component Account,Salary Component Account,జీతం భాగం ఖాతా
 DocType: Global Defaults,Hide Currency Symbol,కరెన్సీ మానవ చిత్ర దాచు
 apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card","ఉదా బ్యాంక్, నగదు, క్రెడిట్ కార్డ్"
+DocType: Lead Source,Source Name,మూలం పేరు
 DocType: Journal Entry,Credit Note,క్రెడిట్ గమనిక
 DocType: Warranty Claim,Service Address,సర్వీస్ చిరునామా
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furnitures and Fixtures,సామాగ్రీ మరియు ఫిక్స్చర్స్
@@ -2157,6 +2184,7 @@
 DocType: Opportunity,Customer / Lead Name,కస్టమర్ / లీడ్ పేరు
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +89,Clearance Date not mentioned,క్లియరెన్స్ తేదీ ప్రస్తావించలేదు
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,ఉత్పత్తి
+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/controllers/trends.py +19,Total(Qty),మొత్తం () ప్యాక్ చేసిన అంశాల
 DocType: Sales Invoice,This Document,ఈ డాక్యుమెంట్
@@ -2168,15 +2196,15 @@
 DocType: Purchase Receipt,Time at which materials were received,పదార్థాలు అందుకున్న సమయంలో
 DocType: Stock Ledger Entry,Outgoing Rate,అవుట్గోయింగ్ రేటు
 apps/erpnext/erpnext/config/hr.py +176,Organization branch master.,ఆర్గనైజేషన్ శాఖ మాస్టర్.
-apps/erpnext/erpnext/controllers/accounts_controller.py +273, or ,లేదా
+apps/erpnext/erpnext/controllers/accounts_controller.py +276, 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 +203,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,రో # {0}: జర్నల్ ఎంట్రీ {1} లేదు ఖాతా లేదు {2} లేదా ఇప్పటికే మరొక రసీదును జతచేసేందుకు
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +206,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 +90,No employee for the above selected criteria OR salary slip already created,పైన ఎంచుకున్న విధానం లేదా జీతం స్లిప్ కోసం ఏ ఉద్యోగి ఇప్పటికే రూపొందించినవారు
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +93,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,చెల్లింపు పద్ధతి
@@ -2204,8 +2232,8 @@
 DocType: Product Bundle,Parent Item,మాతృ అంశం
 DocType: Account,Account Type,ఖాతా రకం
 DocType: Delivery Note,DN-RET-,డిఎన్-RET-
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +115,Leave Type {0} cannot be carry-forwarded,{0} క్యారీ-ఫార్వార్డ్ కాదు టైప్ వదిలి
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',నిర్వహణ షెడ్యూల్ అన్ని అంశాలను ఉత్పత్తి లేదు. &#39;రూపొందించండి షెడ్యూల్&#39; క్లిక్ చేయండి
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +118,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 +163,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","వరుస కోసం {0} లో {1}. అంశం రేటు {2} చేర్చడానికి, వరుసలు {3} కూడా చేర్చారు తప్పక"
@@ -2217,13 +2245,13 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +32,Disabled template must not be default template,వికలాంగుల టెంప్లేట్ డిఫాల్ట్ టెంప్లేట్ ఉండకూడదు
 DocType: Account,Income Account,ఆదాయపు ఖాతా
 DocType: Payment Request,Amount in customer's currency,కస్టమర్ యొక్క కరెన్సీ లో మొత్తం
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +748,Delivery,డెలివరీ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +742,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,కీ బాధ్యత ఏరియా
 DocType: Payment Entry,Total Allocated Amount,మొత్తం కేటాయించిన సొమ్ము
 DocType: Item Reorder,Material Request Type,మెటీరియల్ అభ్యర్థన పద్ధతి
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +82,Row {0}: UOM Conversion Factor is mandatory,రో {0}: UoM మార్పిడి ఫాక్టర్ తప్పనిసరి
+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,వ్యయ కేంద్రం
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,ఓచర్ #
@@ -2234,13 +2262,13 @@
 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 +90,Head of Marketing and Sales,మార్కెటింగ్ మరియు సేల్స్ హెడ్
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,ఆదాయ పన్ను
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,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.,ట్రాక్ పరిశ్రమ రకం ద్వారా నడిపించును.
 DocType: Item Supplier,Item Supplier,అంశం సరఫరాదారు
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +403,Please enter Item Code to get batch no,బ్యాచ్ ఏ పొందడానికి అంశం కోడ్ను నమోదు చేయండి
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +770,Please select a value for {0} quotation_to {1},{0} quotation_to కోసం ఒక విలువను ఎంచుకోండి దయచేసి {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +397,Please enter Item Code to get batch no,బ్యాచ్ ఏ పొందడానికి అంశం కోడ్ను నమోదు చేయండి
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +764,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","క్రింది రెండు లక్షణాలతో రికార్డులలో అదే ఉంటే విలీనం మాత్రమే సాధ్యమవుతుంది. గ్రూప్ రూట్ రకం, కంపెనీ"
@@ -2252,28 +2280,29 @@
 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 +100,Issues,ఇష్యూస్
+apps/erpnext/erpnext/hooks.py +109,Issues,ఇష్యూస్
 apps/erpnext/erpnext/controllers/status_updater.py +13,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} నిలిపివేయబడింది
 DocType: Supplier,Billing Currency,బిల్లింగ్ కరెన్సీ
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Large,ఎక్స్ ట్రా లార్జ్
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,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 +507,Warning: Another {0} # {1} exists against stock entry {2},హెచ్చరిక: మరో {0} # {1} స్టాక్ ప్రవేశానికి వ్యతిరేకంగా ఉంది {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Local,స్థానిక
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +508,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),రుణాలు మరియు అడ్వాన్సెస్ (ఆస్తులు)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,రుణగ్రస్తులు
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Large,పెద్ద
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,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 +225,Total {0} ({1}),మొత్తం {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +224,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,డిఫాల్ట్ లెక్కింపు విధానం
@@ -2319,9 +2348,9 @@
 DocType: Attendance,Leave Type,లీవ్ టైప్
 apps/erpnext/erpnext/controllers/stock_controller.py +173,Expense / Difference account ({0}) must be a 'Profit or Loss' account,ఖర్చుల / తేడా ఖాతా ({0}) ఒక &#39;లాభం లేదా నష్టం ఖాతా ఉండాలి
 DocType: Account,Accounts User,యూజర్ ఖాతాలను
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Name error: {0},దోషం: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +90,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 +178,{0} {1} does not associated with {2} {3},{0} {1} సంబంధం లేదు {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +181,{0} {1} does not associated with {2} {3},{0} {1} సంబంధం లేదు {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,ఉద్యోగి {0} కోసం హాజరు ఇప్పటికే గుర్తించబడింది
 DocType: Packing Slip,If more than one package of the same type (for print),ఉంటే ఒకే రకమైన ఒకటి కంటే ఎక్కువ ప్యాకేజీ (ముద్రణ కోసం)
 DocType: Warehouse,Parent Warehouse,మాతృ వేర్హౌస్
@@ -2340,7 +2369,7 @@
 DocType: BOM Item,Scrap %,స్క్రాప్%
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection","ఆరోపణలు ఎంత మీ ఎంపిక ప్రకారం, అంశం అంశాల లేదా మొత్తం ఆధారంగా పంపిణీ చేయబడుతుంది"
 DocType: Maintenance Visit,Purposes,ప్రయోజనాల
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,కనీసం ఒక అంశం తిరిగి పత్రంలో ప్రతికూల పరిమాణం తో నమోదు చేయాలి
+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 +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","ఆపరేషన్ {0} వర్క్స్టేషన్ ఏ అందుబాటులో పని గంటల కంటే ఎక్కువ {1}, బహుళ కార్యకలాపాలు లోకి ఆపరేషన్ విచ్ఛిన్నం"
 ,Requested,అభ్యర్థించిన
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +83,No Remarks,సంఖ్య వ్యాఖ్యలు
@@ -2352,46 +2381,46 @@
 DocType: Item,Total Projected Qty,మొత్తం అంచనా ప్యాక్ చేసిన అంశాల
 DocType: Monthly Distribution,Distribution Name,పంపిణీ పేరు
 DocType: Course,Course Code,కోర్సు కోడ్
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Quality Inspection required for Item {0},అంశం కోసం అవసరం నాణ్యత తనిఖీ {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Quality Inspection required for Item {0},అంశం కోసం అవసరం నాణ్యత తనిఖీ {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,ఇది కస్టమర్ యొక్క కరెన్సీ రేటుపై కంపెనీ బేస్ కరెన్సీ మార్చబడుతుంది
 DocType: Purchase Invoice Item,Net Rate (Company Currency),నికర రేటు (కంపెనీ కరెన్సీ)
 DocType: Salary Detail,Condition and Formula Help,కండిషన్ మరియు ఫార్ములా సహాయం
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,భూభాగం ట్రీ నిర్వహించండి.
 DocType: Journal Entry Account,Sales Invoice,సేల్స్ వాయిస్
 DocType: Journal Entry Account,Party Balance,పార్టీ సంతులనం
-apps/erpnext/erpnext/accounts/page/pos/pos.js +475,Please select Apply Discount On,డిస్కౌంట్ న వర్తించు దయచేసి ఎంచుకోండి
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +92,Salary Slip Created,వేతనం స్లిప్ రూపొందించబడింది
+apps/erpnext/erpnext/accounts/page/pos/pos.js +464,Please select Apply Discount On,డిస్కౌంట్ న వర్తించు దయచేసి ఎంచుకోండి
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +95,Salary Slip Created,వేతనం స్లిప్ రూపొందించబడింది
 DocType: Company,Default Receivable Account,డిఫాల్ట్ స్వీకరించదగిన ఖాతా
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,పైన ఎంచుకున్న ప్రమాణం కోసం చెల్లించే మొత్తం జీతం కోసం బ్యాంక్ ఎంట్రీ సృష్టించు
 DocType: Stock Entry,Material Transfer for Manufacture,తయారీ కోసం మెటీరియల్ ట్రాన్స్ఫర్
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,డిస్కౌంట్ శాతం ఒక ధర జాబితా వ్యతిరేకంగా లేదా అన్ని ధర జాబితా కోసం గాని అన్వయించవచ్చు.
 DocType: Purchase Invoice,Half-yearly,సగం వార్షిక
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +384,Accounting Entry for Stock,స్టాక్ కోసం అకౌంటింగ్ ఎంట్రీ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +387,Accounting Entry for Stock,స్టాక్ కోసం అకౌంటింగ్ ఎంట్రీ
 DocType: Sales Invoice,Sales Team1,సేల్స్ team1
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,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 +96,Row {0}: Completed Qty must be greater than zero.,రో {0}: పూర్తి ప్యాక్ చేసిన అంశాల సున్నా కంటే ఎక్కువ ఉండాలి.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +120,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 +88,Row # {0}: Cannot return more than {1} for Item {2},రో # {0}: కంటే తిరిగి కాంట్ {1} అంశం కోసం {2}
+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,ప్లాట్
 DocType: Item Group,Show this slideshow at the top of the page,పేజీ ఎగువన ఈ స్లైడ్ చూపించు
 DocType: BOM,Item UOM,అంశం UoM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),డిస్కౌంట్ మొత్తాన్ని తర్వాత పన్ను మొత్తం (కంపెనీ కరెన్సీ)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +147,Target warehouse is mandatory for row {0},టార్గెట్ గిడ్డంగి వరుసగా తప్పనిసరి {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,సరఫరాదారు అడ్రస్ ఎంచుకోండి
 DocType: Quality Inspection,Quality Inspection,నాణ్యత తనిఖీ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Extra Small,అదనపు చిన్న
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,Warning: Material Requested Qty is less than Minimum Order Qty,హెచ్చరిక: Qty అభ్యర్థించిన మెటీరియల్ కనీస ఆర్డర్ ప్యాక్ చేసిన అంశాల కంటే తక్కువ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +194,Account {0} is frozen,ఖాతా {0} ఘనీభవించిన
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,అదనపు చిన్న
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +690,Warning: Material Requested Qty is less than Minimum Order Qty,హెచ్చరిక: Qty అభ్యర్థించిన మెటీరియల్ కనీస ఆర్డర్ ప్యాక్ చేసిన అంశాల కంటే తక్కువ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,ఖాతా {0} ఘనీభవించిన
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,సంస్థ చెందిన ఖాతాల ప్రత్యేక చార్ట్ తో లీగల్ సంస్థ / అనుబంధ.
 DocType: Payment Request,Mute Email,మ్యూట్ ఇమెయిల్
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","ఫుడ్, బేవరేజ్ పొగాకు"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +606,Can only make payment against unbilled {0},మాత్రమే వ్యతిరేకంగా చెల్లింపు చేయవచ్చు unbilled {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +126,Commission rate cannot be greater than 100,కమిషన్ రేటు కంటే ఎక్కువ 100 ఉండకూడదు
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +609,Can only make payment against unbilled {0},మాత్రమే వ్యతిరేకంగా చెల్లింపు చేయవచ్చు unbilled {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,కమిషన్ రేటు కంటే ఎక్కువ 100 ఉండకూడదు
 DocType: Stock Entry,Subcontract,Subcontract
 apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,ముందుగా {0} నమోదు చేయండి
 DocType: Production Order Operation,Actual End Time,వాస్తవ ముగింపు సమయం
@@ -2402,30 +2431,30 @@
 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 +158,Colour,కలర్
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,కలర్
 DocType: Maintenance Visit,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; ఉంది అంశాన్ని ఎంచుకుని, ఏ ఇతర ఉత్పత్తి కట్ట ఉంది దయచేసి"
 DocType: Student Log,Academic,అకడమిక్
-apps/erpnext/erpnext/controllers/accounts_controller.py +469,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),మొత్తం ముందుగానే ({0}) ఉత్తర్వు మీద {1} గ్రాండ్ మొత్తం కన్నా ఎక్కువ ఉండకూడదు ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +472,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),మొత్తం ముందుగానే ({0}) ఉత్తర్వు మీద {1} గ్రాండ్ మొత్తం కన్నా ఎక్కువ ఉండకూడదు ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,అసమానంగా నెలల అంతటా లక్ష్యాలను పంపిణీ మంత్లీ పంపిణీ ఎంచుకోండి.
 DocType: Purchase Invoice Item,Valuation Rate,వాల్యువేషన్ రేటు
+DocType: Stock Reconciliation,SR/,SR /
 apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,ధర జాబితా కరెన్సీ ఎంపిక లేదు
 DocType: Assessment,Results,ఫలితాలు
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +168,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 +175,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: Student Applicant,Father's/ Guardian 2 Email ID,తండ్రి / సంరక్షకుడు 2 అడ్రెస్
 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 +228,Warehouses with existing transaction can not be converted to group.,ఉన్న లావాదేవీతో గిడ్డంగులు సమూహం మార్చబడతాయి కాదు.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +231,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 +93,Researcher,పరిశోధకులు
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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.,ఇన్కమింగ్ నాణ్యత తనిఖీ.
@@ -2437,25 +2466,25 @@
 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: Sales Invoice,Advertisement,ప్రకటన
 DocType: Asset Category Account,Depreciation Expense Account,అరుగుదల వ్యయం ఖాతా
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Probationary Period,ప్రొబేషనరీ
-apps/erpnext/erpnext/hooks.py +102,Announcements,ప్రకటనలు
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,ప్రొబేషనరీ
+apps/erpnext/erpnext/hooks.py +111,Announcements,ప్రకటనలు
 DocType: Customer Group,Only leaf nodes are allowed in transaction,కేవలం ఆకు నోడ్స్ లావాదేవీ అనుమతించబడతాయి
 DocType: Expense Claim,Expense Approver,ఖర్చుల అప్రూవర్గా
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +109,Row {0}: Advance against Customer must be credit,రో {0}: కస్టమర్ వ్యతిరేకంగా అడ్వాన్స్ క్రెడిట్ ఉండాలి
 apps/erpnext/erpnext/accounts/doctype/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 +16,To Datetime,తేదీసమయం కు
+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/scheduling_tool/scheduling_tool.py +51,Course Schedules deleted:,కోర్సు షెడ్యూల్స్ తొలగించారు:
 apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,SMS పంపిణీ స్థితి నిర్వహించాల్సిన దినచర్య
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,పెండింగ్ చర్యలు
+DocType: Accounts Settings,Make Payment via Journal Entry,జర్నల్ ఎంట్రీ ద్వారా చెల్లింపు చేయండి
+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 +127,Please enter relieving date.,తేదీ ఉపశమనం ఎంటర్ చెయ్యండి.
-apps/erpnext/erpnext/controllers/trends.py +145,Amt,ఆంట్
+apps/erpnext/erpnext/controllers/trends.py +149,Amt,ఆంట్
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,Only Leave Applications with status 'Approved' can be submitted,కేవలం హోదా &#39;అప్రూవ్డ్ సమర్పించిన చేయవచ్చు దరఖాస్తులను వదిలి
 apps/erpnext/erpnext/utilities/doctype/address/address.py +26,Address Title is mandatory.,చిరునామా శీర్షిక తప్పనిసరి.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,విచారణ సోర్స్ ప్రచారం ఉంటే ప్రచారం పేరు ఎంటర్
@@ -2473,14 +2502,15 @@
 apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1},{0} కు మారక రేటు దొరక్కపోతే {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,మార్క్ హాఫ్ డే
 DocType: Sales Invoice,Sales Team,సేల్స్ టీం
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Duplicate entry,నకిలీ ఎంట్రీ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,నకిలీ ఎంట్రీ
 DocType: Program Enrollment Tool,Get Students,స్టూడెంట్స్ పొందండి
 DocType: Serial No,Under Warranty,వారంటీ కింద
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +490,[Error],[లోపం]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +484,[Error],[లోపం]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,మీరు అమ్మకాల ఉత్తర్వు సేవ్ ఒకసారి వర్డ్స్ కనిపిస్తుంది.
 ,Employee Birthday,Employee పుట్టినరోజు
 apps/erpnext/erpnext/controllers/status_updater.py +175,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} ఇప్పటికే ఉంది. ఈ ప్రవేశాలు మార్చి మళ్ళీ ప్రయత్నించండి.
 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} ఉనికిలో లేదు
@@ -2496,22 +2526,22 @@
 ,Issued Items Against Production Order,ఉత్పత్తి ఆర్డర్ జారీ అంశాలు
 DocType: Pricing Rule,Purchase Manager,కొనుగోలు మేనేజర్
 DocType: Target Detail,Target Detail,టార్గెట్ వివరాలు
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +25,All Jobs,అన్ని ఉద్యోగాలు
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,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 +323,Amount {0} {1} {2} {3},మొత్తం {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,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: Supplier,Credit Limit,క్రెడిట్ పరిమితి
 DocType: Production Plan Sales Order,Salse Order Date,Salse ఆర్డర్ తేదీ
 DocType: Salary Component,Salary Component,జీతం భాగం
-apps/erpnext/erpnext/accounts/utils.py +372,Payment Entries {0} are un-linked,చెల్లింపు ఎంట్రీలు {0} అన్ చేయబడినాయి
+apps/erpnext/erpnext/accounts/utils.py +449,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 +497,Material Requests {0} created,రూపొందించినవారు మెటీరియల్ అభ్యర్థనలు {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +498,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.,నిబంధనలు ఒప్పందం మూస.
 DocType: Purchase Invoice,Address and Contact,చిరునామా మరియు సంప్రదించు
@@ -2550,7 +2580,7 @@
 DocType: Serial No,Warranty / AMC Details,వారంటీ / AMC వివరాలు
 DocType: Journal Entry,User Remark,వాడుకరి వ్యాఖ్య
 DocType: Lead,Market Segment,మార్కెట్ విభాగానికీ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +848,Paid Amount cannot be greater than total negative outstanding amount {0},మొత్తం చెల్లించారు మొత్తం ప్రతికూల అసాధారణ మొత్తం కంటే ఎక్కువ ఉండకూడదు {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +859,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 +233,Closing (Dr),మూసివేయడం (డాక్టర్)
 DocType: Cheque Print Template,Cheque Size,ప్రిపే సైజు
@@ -2571,7 +2601,8 @@
 ,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.
-apps/erpnext/erpnext/controllers/accounts_controller.py +555,'Update Stock' cannot be checked for fixed asset sale,&#39;సరిచేయబడిన స్టాక్&#39; స్థిర ఆస్తి అమ్మకం కోసం తనిఖీ చెయ్యబడదు
+DocType: Student Guardian,Father,తండ్రి
+apps/erpnext/erpnext/controllers/accounts_controller.py +558,'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} రద్దు లేదా ఆగిపోయిన
@@ -2581,15 +2612,15 @@
 DocType: Sales Order,Fully Delivered,పూర్తిగా పంపిణీ
 DocType: Lead,Lower Income,తక్కువ ఆదాయ
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","లాభం / నష్టం బుక్ చేయబడుతుంది దీనిలో బాధ్యత క్రింద ఖాతా తల,"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +166,Source and target warehouse cannot be same for row {0},మూల మరియు లక్ష్య గిడ్డంగి వరుసగా ఒకే ఉండకూడదు {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","ఈ స్టాక్ సయోధ్య ఒక ప్రారంభ ఎంట్రీ నుండి తేడా ఖాతా, ఒక ఆస్తి / బాధ్యత రకం ఖాతా ఉండాలి"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +81,Purchase Order number required for Item {0},అంశం అవసరం ఆర్డర్ సంఖ్య కొనుగోలు {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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/purchase_receipt/purchase_receipt.py +82,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 +17,Cannot change status as student {0} is linked with student application {1},విద్యార్థిగా స్థితిని మార్చలేరు {0} విద్యార్ధి అప్లికేషన్ ముడిపడి ఉంటుంది {1}
+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: Timesheet,"List of employee which has ""Salary Slip Based on Timesheet"" is enabled in salary structure.",&quot;జీతం స్లిప్ TIMESHEET ఆధారంగా&quot; ఉంది ఎంప్లాయీ జాబితా జీతం నిర్మాణం లో ప్రారంభించబడింది.
 DocType: Asset,Fully Depreciated,పూర్తిగా విలువ తగ్గుతున్న
 ,Stock Projected Qty,స్టాక్ ప్యాక్ చేసిన అంశాల ప్రొజెక్టెడ్
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Customer {0} does not belong to project {1},చెందదు {0} కస్టమర్ ప్రొజెక్ట్ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,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,సీరియల్ లేవు మరియు బ్యాచ్
@@ -2601,7 +2632,7 @@
 DocType: Purchase Invoice,Purchase Taxes and Charges,పన్నులు మరియు ఆరోపణలు కొనుగోలు
 ,Qty to Receive,స్వీకరించడానికి అంశాల
 DocType: Leave Block List,Leave Block List Allowed,బ్లాక్ జాబితా అనుమతించబడినవి వదిలి
-apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +55,All Warehouses,అన్ని గిడ్డంగులు
+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 +105,Credit To account must be a Balance Sheet account,ఖాతాకు క్రెడిట్ బాలన్స్ షీట్ ఖాతా ఉండాలి
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,అన్ని సరఫరాదారు రకాలు
@@ -2613,10 +2644,10 @@
 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/manufacturing/doctype/bom/bom.js +26,Browse BOM,బ్రౌజ్ BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,బ్రౌజ్ BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,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 Year,Academic Year,విద్యా సంవత్సరం
+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
 DocType: Appraisal,Appraisal,అప్రైసల్
@@ -2624,12 +2655,12 @@
 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 +197,Leave approver must be one of {0},ఒకటి ఉండాలి అప్రూవర్గా వదిలి {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,Leave approver must be one of {0},ఒకటి ఉండాలి అప్రూవర్గా వదిలి {0}
 DocType: Hub Settings,Seller Email,అమ్మకాల ఇమెయిల్
 DocType: Project,Total Purchase Cost (via Purchase Invoice),మొత్తం కొనుగోలు ఖర్చు (కొనుగోలు వాయిస్ ద్వారా)
 DocType: Workstation Working Hour,Start Time,ప్రారంభ సమయం
 DocType: Item Price,Bulk Import Help,బల్క్ దిగుమతి సహాయం
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +256,Select Quantity,Select పరిమాణం
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +257,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,సందేశం పంపబడింది
@@ -2646,6 +2677,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,గాని లక్ష్యాన్ని అంశాల లేదా లక్ష్యం మొత్తం తప్పనిసరి.
 apps/erpnext/erpnext/config/projects.py +45,Cost of various activities,వివిధ కార్యకలాపాలు ఖర్చు
 apps/erpnext/erpnext/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 +149,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}
 DocType: Item,Inspection Required,ఇన్స్పెక్షన్ అవసరం
@@ -2665,7 +2697,7 @@
 DocType: Expense Claim,Approval Status,ఆమోద స్థితి
 DocType: Hub Settings,Publish Items to Hub,హబ్ కు అంశాలను ప్రచురించడానికి
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},విలువ వరుసగా విలువ కంటే తక్కువ ఉండాలి నుండి {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Wire Transfer,వైర్ ట్రాన్స్ఫర్
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,వైర్ ట్రాన్స్ఫర్
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,అన్ని తనిఖీ
 DocType: Sales Order,Recurring Order,పునరావృత ఆర్డర్
 DocType: Company,Default Income Account,డిఫాల్ట్ ఆదాయం ఖాతా
@@ -2677,21 +2709,19 @@
 ,Welcome to ERPNext,ERPNext కు స్వాగతం
 apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,కొటేషన్ దారి
 DocType: Lead,From Customer,కస్టమర్ నుండి
-apps/erpnext/erpnext/demo/setup_data.py +357,Calls,కాల్స్
+apps/erpnext/erpnext/demo/setup/setup_data.py +300,Calls,కాల్స్
 DocType: Project,Total Costing Amount (via Time Logs),మొత్తం వ్యయంతో మొత్తం (టైమ్ దినచర్య ద్వారా)
 DocType: Purchase Order Item Supplied,Stock UOM,స్టాక్ UoM
-apps/erpnext/erpnext/stock/doctype/item/item.py +466,"As there are existing transactions for this item, \
-							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","&#39;సీరియల్ లేవు మీలో విలువలు మార్చలేరు \ ఈ అంశాన్ని కోసం ఇప్పటికే లావాదేవీలు ఉన్నాయి,&#39; బ్యాచ్ హాస్ నో &#39;,&#39; స్టాక్ అంశం &#39;మరియు లెక్కింపు విధానం&#39;"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,Purchase Order {0} is not submitted,ఆర్డర్ {0} సమర్పించిన లేదు కొనుగోలు
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,ప్రొజెక్టెడ్
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},సీరియల్ లేవు {0} వేర్హౌస్ చెందినది కాదు {1}
 apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,గమనిక: {0} పరిమాణం లేదా మొత్తం 0 డెలివరీ ఓవర్ మరియు ఓవర్ బుకింగ్ అంశం కోసం సిస్టమ్ తనిఖీ చెయ్యదు
 DocType: Notification Control,Quotation Message,కొటేషన్ సందేశం
 DocType: Issue,Opening Date,ప్రారంభ తేదీ
-apps/erpnext/erpnext/schools/api.py +58,Attendance has been marked successfully.,హాజరు విజయవంతంగా మార్క్ చెయ్యబడింది.
+apps/erpnext/erpnext/schools/api.py +57,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 +136,Account Type for {0} must be {1},ఖాతా రకం కోసం {0} ఉండాలి {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +139,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,రెండు వేర్హౌస్ అదే కంపెనీకి చెందిన ఉండాలి
@@ -2706,12 +2736,13 @@
 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/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 +20,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 +1190,Please select customer,దయచేసి కస్టమర్ ఎంచుకోండి
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1193,Please select customer,దయచేసి కస్టమర్ ఎంచుకోండి
 DocType: C-Form,I,నేను
 DocType: Company,Asset Depreciation Cost Center,ఆస్తి అరుగుదల వ్యయ కేంద్రం
 DocType: Sales Order Item,Sales Order Date,సేల్స్ ఆర్డర్ తేదీ
@@ -2721,6 +2752,7 @@
 ,Payment Period Based On Invoice Date,వాయిస్ తేదీ ఆధారంగా చెల్లింపు కాలం
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},తప్పిపోయిన కరెన్సీ మారక {0}
 DocType: Assessment,Examiner,ఎగ్జామినర్
+DocType: Student,Siblings,తోబుట్టువుల
 DocType: Journal Entry,Stock Entry,స్టాక్ ఎంట్రీ
 DocType: Payment Entry,Payment References,చెల్లింపు సూచనలు
 DocType: C-Form,C-FORM-,సి ఫారం-
@@ -2738,11 +2770,12 @@
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,టాపిక్ పేరు
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,సెల్లింగ్ లేదా కొనుగోలు కనీసం ఒక ఎంపిక చేయాలి
+DocType: Grading Structure,Grade Intervals,గ్రేడ్ విరామాలు
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,మీ వ్యాపార స్వభావం ఎంచుకోండి.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,ఉత్పాదక కార్యకలాపాల ఎక్కడ నిర్వహిస్తున్నారు.
 DocType: Asset Movement,Source Warehouse,మూల వేర్హౌస్
 DocType: Installation Note,Installation Date,సంస్థాపన తేదీ
-apps/erpnext/erpnext/controllers/accounts_controller.py +534,Row #{0}: Asset {1} does not belong to company {2},రో # {0}: ఆస్తి {1} లేదు కంపెనీకి చెందిన లేదు {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +537,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,సేల్స్ వాడుకరి
@@ -2756,28 +2789,31 @@
 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 +111,Date Of Retirement must be greater than Date of Joining,రిటైర్మెంట్ డేట్ అఫ్ చేరడం తేదీ కంటే ఎక్కువ ఉండాలి
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +49,There were errors while scheduling course on :,కోర్సు షెడ్యూల్ అయితే లోపాలున్నాయి:
 DocType: Sales Invoice,Against Income Account,ఆదాయపు ఖాతా వ్యతిరేకంగా
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +87,{0}% Delivered,{0}% పంపిణీ
+apps/erpnext/erpnext/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 +379,Please set default {0} in Company {1},డిఫాల్ట్ {0} లో కంపెనీ సెట్ దయచేసి {1}
+apps/erpnext/erpnext/accounts/utils.py +456,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,స్థూల లాభం / నష్టం
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,ఆర్డర్ అంశం పంపినవి కొనుగోలు
 apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,కంపెనీ పేరు కంపెనీ ఉండకూడదు
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,ముద్రణ టెంప్లేట్లు లెటర్ హెడ్స్.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,ముద్రణ టెంప్లేట్లు కోసం శీర్షికలు ప్రొఫార్మా ఇన్వాయిస్ ఉదా.
+DocType: Student Guardian,Student Guardian,స్టూడెంట్ గార్డియన్
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +184,Valuation type charges can not marked as Inclusive,వాల్యువేషన్ రకం ఆరోపణలు ఇన్క్లుసివ్ వంటి గుర్తించబడిన చేయవచ్చు
 DocType: POS Profile,Update Stock,నవీకరణ స్టాక్
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"అంశాలు, వివిధ UoM తప్పు (మొత్తం) నికర బరువు విలువ దారి తీస్తుంది. ప్రతి అంశం యొక్క నికర బరువు అదే UoM లో ఉంది నిర్ధారించుకోండి."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,బిఒఎం రేటు
 DocType: Asset,Journal Entry for Scrap,స్క్రాప్ జర్నల్ ఎంట్రీ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,డెలివరీ గమనిక అంశాలను తీసి దయచేసి
-apps/erpnext/erpnext/accounts/utils.py +349,Journal Entries {0} are un-linked,జర్నల్ ఎంట్రీలు {0}-అన్ జత చేయబడినాయి
+apps/erpnext/erpnext/accounts/utils.py +426,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,కంపెనీ లో రౌండ్ ఆఫ్ కాస్ట్ సెంటర్ చెప్పలేదు దయచేసి
@@ -2801,6 +2837,7 @@
 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,కమ్యూనిటీ ఫోరమ్
+DocType: Homepage,"URL for ""All Products""",&quot;అన్ని ఉత్పత్తులు&quot; కోసం URL
 DocType: Leave Application,Leave Balance Before Application,అప్లికేషన్ ముందు సంతులనం వదిలి
 DocType: SMS Center,Send SMS,SMS పంపండి
 DocType: Cheque Print Template,Width of amount in word,పదం లో మొత్తంలో వెడల్పు
@@ -2809,7 +2846,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 +29,Current Job Openings,ప్రస్తుత Job ఖాళీలు
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,Current Job Openings,ప్రస్తుత Job ఖాళీలు
 DocType: Company,Stock Adjustment Account,స్టాక్ అడ్జస్ట్మెంట్ ఖాతా
 DocType: Journal Entry,Write Off,ఆఫ్ వ్రాయండి
 DocType: Timesheet Detail,Operation ID,ఆపరేషన్ ID
@@ -2822,7 +2859,7 @@
 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 +850,Show tax break-up,షో పన్ను విడిపోవడానికి
+apps/erpnext/erpnext/public/js/controllers/transaction.js +841,Show tax break-up,షో పన్ను విడిపోవడానికి
 apps/erpnext/erpnext/accounts/party.py +308,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} వ్యతిరేకంగా ఉనికిలో"
@@ -2832,10 +2869,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 +534,Please select Posting Date before selecting Party,దయచేసి పార్టీ ఎంచుకోవడం ముందు పోస్టింగ్ తేదిని ఎంచుకోండి
 DocType: Serial No,Out of AMC,AMC యొక్క అవుట్
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +80,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 +162,Please contact to the user who have Sales Master Manager {0} role,సేల్స్ మాస్టర్ మేనేజర్ {0} పాత్ర కలిగిన వినియోగదారుకు సంప్రదించండి
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +195,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 +5,This is based on the attendance of this Student,ఈ ఈ విద్యార్థి హాజరు ఆధారంగా
@@ -2844,12 +2882,11 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,డెలివరీ గమనికలు {0} ఈ అమ్మకాల ఆర్డర్ రద్దు ముందే రద్దు చేయాలి
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +75,Paid amount + Write Off Amount can not be greater than Grand Total,చెల్లించిన మొత్తం పరిమాణం గ్రాండ్ మొత్తం కంటే ఎక్కువ ఉండకూడదు ఆఫ్ వ్రాయండి +
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,{0} is not a valid Batch Number for Item {1},{0} అంశం కోసం ఒక చెల్లుబాటులో బ్యాచ్ సంఖ్య కాదు {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +138,Note: There is not enough leave balance for Leave Type {0},గమనిక: లీవ్ పద్ధతి కోసం తగినంత సెలవు సంతులనం లేదు {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,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,అవకాశం టైప్
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,న్యూ కంపెనీ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,Cost Center is required for 'Profit and Loss' account {0},ఖర్చు సెంటర్ &#39;లాభం మరియు నష్టం&#39; కోసం అవసరం ఖాతా {0}
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,ట్రాన్సాక్షన్స్ మాత్రమే కంపెనీ సృష్టికర్త ద్వారా తొలగించబడవచ్చు
 apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,జనరల్ లెడ్జర్ ఎంట్రీలు తప్పు సంఖ్య దొరకలేదు. మీరు లావాదేవీ ఒక తప్పు ఖాతా ఎంపిక ఉండవచ్చు.
 DocType: Cheque Print Template,Cheque Width,ప్రిపే వెడల్పు
@@ -2858,16 +2895,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,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 +228,{0} '{1}' is disabled,{0} &#39;{1}&#39; నిలిపివేయబడింది
+apps/erpnext/erpnext/controllers/accounts_controller.py +231,{0} '{1}' is disabled,{0} &#39;{1}&#39; నిలిపివేయబడింది
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ఓపెన్ గా సెట్
 DocType: Cheque Print Template,Scanned Cheque,స్కాన్ చేసిన ప్రిపే
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,సమర్పిస్తోంది లావాదేవీలపై కాంటాక్ట్స్ ఆటోమేటిక్ ఇమెయిల్స్ పంపడం.
+DocType: Timesheet,Total Billable Amount,మొత్తం Billable మొత్తం
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,ఐటమ్ 3
 DocType: Purchase Order,Customer Contact Email,కస్టమర్ సంప్రదించండి ఇమెయిల్
 DocType: Warranty Claim,Item and Warranty Details,అంశం మరియు వారంటీ వివరాలు
 DocType: Sales Team,Contribution (%),కాంట్రిబ్యూషన్ (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,గమనిక: చెల్లింపు ఎంట్రీ నుండి రూపొందించినవారు కాదు &#39;నగదు లేదా బ్యాంక్ ఖాతా&#39; పేర్కొనబడలేదు
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Responsibilities,బాధ్యతలు
+apps/erpnext/erpnext/controllers/accounts_controller.py +78,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,బాధ్యతలు
 DocType: Expense Claim Account,Expense Claim Account,ఖర్చు చెప్పడం ఖాతా
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,మూస
 DocType: Sales Person,Sales Person Name,సేల్స్ పర్సన్ పేరు
@@ -2875,6 +2913,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,వినియోగదారులను జోడించండి
 DocType: Pricing Rule,Item Group,అంశం గ్రూప్
 DocType: Item,Safety Stock,భద్రత స్టాక్
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Item కోడ్&gt; అంశాన్ని గ్రూప్&gt; బ్రాండ్
 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),పన్నులు మరియు ఆరోపణలు చేర్చబడింది (కంపెనీ కరెన్సీ)
@@ -2884,7 +2923,6 @@
 DocType: Item,Default BOM,డిఫాల్ట్ BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Please re-type company name to confirm,తిరిగి రకం కంపెనీ పేరు నిర్ధారించడానికి దయచేసి
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +67,Total Outstanding Amt,మొత్తం అద్భుతమైన ఆంట్
-DocType: Timesheet,Total Hours,మొత్తం గంటలు
 DocType: Journal Entry,Printing Settings,ప్రింటింగ్ సెట్టింగ్స్
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Total Debit must be equal to Total Credit. The difference is {0},మొత్తం డెబిట్ మొత్తం క్రెడిట్ సమానంగా ఉండాలి. తేడా {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,ఆటోమోటివ్
@@ -2897,13 +2935,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,ఇన్వెస్ట్మెంట్ బ్యాంకింగ్
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +71,Cash or Bank Account is mandatory for making payment entry,నగదు లేదా బ్యాంక్ ఖాతా చెల్లింపు ప్రవేశం చేయడానికి తప్పనిసరి
 DocType: Purchase Invoice,Price List Exchange Rate,ధర జాబితా ఎక్స్చేంజ్ రేట్
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,కస్టమర్&gt; కస్టమర్ గ్రూప్&gt; భూభాగం
 DocType: Purchase Invoice Item,Rate,రేటు
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Intern,ఇంటర్న్
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,ఇంటర్న్
 DocType: Stock Entry,From BOM,బిఒఎం నుండి
 DocType: Assessment,Assessment Code,అసెస్మెంట్ కోడ్
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +32,Basic,ప్రాథమిక
+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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',&#39;రూపొందించండి షెడ్యూల్&#39; క్లిక్ చేయండి
+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 +95,Reference No is mandatory if you entered Reference Date,మీరు ప్రస్తావన తేదీ ఎంటర్ చేస్తే ప్రస్తావన తప్పనిసరి
@@ -2912,11 +2951,11 @@
 DocType: Salary Slip,Salary Structure,జీతం నిర్మాణం
 DocType: Account,Bank,బ్యాంక్
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,వైనానిక
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +752,Issue Material,ఇష్యూ మెటీరియల్
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +723,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 +683,You are in offline mode. You will not be able to reload until you have network.,మీరు ఆఫ్లైన్ మోడ్లో ఉన్నాయి. మీరు నెట్వర్కు వరకు రీలోడ్ చేయలేరు.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +665,You are in offline mode. You will not be able to reload until you have network.,మీరు ఆఫ్లైన్ మోడ్లో ఉన్నాయి. మీరు నెట్వర్కు వరకు రీలోడ్ చేయలేరు.
 DocType: Hub Settings,Access Token,ప్రాప్తి టోకెన్
 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,సీరియల్ లేవు
@@ -2924,33 +2963,35 @@
 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 +1122,Enter value must be positive,ఎంటర్ విలువ సానుకూల ఉండాలి
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,All Territories,అన్ని ప్రాంతాలు
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1125,Enter value must be positive,ఎంటర్ విలువ సానుకూల ఉండాలి
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,అన్ని ప్రాంతాలు
 DocType: Purchase Invoice,Items,అంశాలు
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +23,Student is already enrolled.,విద్యార్థిని అప్పటికే చేరతాడు.
 DocType: Fiscal Year,Year Name,ఇయర్ పేరు
 DocType: Process Payroll,Process Payroll,ప్రాసెస్ పేరోల్
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,పని రోజుల కంటే ఎక్కువ సెలవులు ఈ నెల ఉన్నాయి.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +233,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 +96,Request for Quotations,కొటేషన్స్ కోసం అభ్యర్థన
+apps/erpnext/erpnext/hooks.py +104,Request for Quotations,కొటేషన్స్ కోసం అభ్యర్థన
 DocType: Payment Reconciliation,Maximum Invoice Amount,గరిష్టంగా ఇన్వాయిస్ మొత్తం
 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 +628,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',వేరియంట్ కోసం మెజర్ అప్రమేయ యూనిట్ &#39;{0}&#39; మూస లో అదే ఉండాలి &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',వేరియంట్ కోసం మెజర్ అప్రమేయ యూనిట్ &#39;{0}&#39; మూస లో అదే ఉండాలి &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,బేస్డ్ న లెక్కించు
 DocType: Delivery Note Item,From Warehouse,గిడ్డంగి నుండి
 DocType: Assessment,Supervisor Name,సూపర్వైజర్ పేరు
+DocType: Assessment,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,కొనుగోలు వాడుకరి
 DocType: Notification Control,Customize the Notification,నోటిఫికేషన్ అనుకూలీకరించండి
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Cash Flow from Operations,ఆపరేషన్స్ నుండి నగదు ప్రవాహ
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,డిఫాల్ట్ చిరునామా మూస తొలగించడం సాధ్యం కాదు
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,డిఫాల్ట్ చిరునామా మూస తొలగించడం సాధ్యం కాదు
 DocType: Sales Invoice,Shipping Rule,షిప్పింగ్ రూల్
 DocType: Manufacturer,Limited to 12 characters,12 అక్షరాలకు పరిమితం
 DocType: Journal Entry,Print Heading,ప్రింట్ శీర్షిక
@@ -2965,8 +3006,8 @@
 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/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,గాని లక్ష్యాన్ని అంశాల లేదా లక్ష్యం మొత్తం తప్పనిసరి
-apps/erpnext/erpnext/stock/get_item_details.py +485,No default BOM exists for Item {0},డిఫాల్ట్ BOM అంశం కోసం ఉంది {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +336,Please select Posting Date first,మొదటి పోస్టింగ్ తేదీ దయచేసి ఎంచుకోండి
+apps/erpnext/erpnext/stock/get_item_details.py +486,No default BOM exists for Item {0},డిఫాల్ట్ BOM అంశం కోసం ఉంది {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +326,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,ఉన్న లావాదేవీలతో ఖర్చు సెంటర్ లెడ్జర్ మార్చబడతాయి కాదు
@@ -2982,6 +3023,7 @@
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,రసీదులు చెల్లింపుల మ్యాచ్
 DocType: Journal Entry,Bank Entry,బ్యాంక్ ఎంట్రీ
 DocType: Authorization Rule,Applicable To (Designation),వర్తించదగిన (హోదా)
+,Profitability Analysis,లాభాల విశ్లేషణ
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,కార్ట్ జోడించు
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,గ్రూప్ ద్వారా
 DocType: Guardian,Interests,అభిరుచులు
@@ -2994,21 +3036,21 @@
 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 +141,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",సీరియల్ అంశం {0} స్టాక్ సయోధ్య ఉపయోగించి \ నవీకరించబడింది సాధ్యం కాదు
 DocType: Scheduling Tool,Day,డే
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,కొత్త సీరియల్ లేవు వేర్హౌస్ కలిగి చేయవచ్చు. వేర్హౌస్ స్టాక్ ఎంట్రీ లేదా కొనుగోలు రసీదులు ద్వారా ఏర్పాటు చేయాలి
 DocType: Lead,Lead Type,లీడ్ టైప్
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,You are not authorized to approve leaves on Block Dates,మీరు బ్లాక్ తేదీలు ఆకులు ఆమోదించడానికి అధికారం లేదు
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,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: Student Applicant,AP.,AP.
 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 +639,Point of Sale,అమ్మకానికి పాయింట్
+apps/erpnext/erpnext/accounts/page/pos/pos.js +634,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,పన్ను
 DocType: Production Planning Tool,Production Planning Tool,ఉత్పత్తి ప్రణాళిక టూల్
@@ -3017,74 +3059,77 @@
 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 +373,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 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 Profile,Customer Group,కస్టమర్ గ్రూప్
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,Expense account is mandatory for item {0},ఖర్చు ఖాతా అంశం తప్పనిసరి {0}
 DocType: Item,Website Description,వెబ్సైట్ వివరణ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date must be on or after today,తదుపరి అరుగుదల తేదీన లేదా నేటి తరువాత ఉండాలి
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,ఈక్విటీ నికర మార్పు
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +145,Please cancel Purchase Invoice {0} first,మొదటి కొనుగోలు వాయిస్ {0} రద్దు చేయండి
 DocType: Serial No,AMC Expiry Date,ఎఎంసి గడువు తేదీ
 ,Sales Register,సేల్స్ నమోదు
 DocType: Quotation,Quotation Lost Reason,కొటేషన్ లాస్ట్ కారణము
+apps/erpnext/erpnext/utilities/doctype/address/address.py +164,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,డిఫాల్ట్ చిరునామా మూస దొరకలేదు. దయచేసి సెటప్&gt; ముద్రణ మరియు బ్రాండింగ్&gt; చిరునామా మూస నుండి ఒక కొత్త సృష్టించడానికి.
 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 +330,Transaction reference no {0} dated {1},లావాదేవీ ప్రస్తావన {0} నాటి {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Transaction reference no {0} dated {1},లావాదేవీ ప్రస్తావన {0} నాటి {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,సవరించడానికి ఉంది ఏమీ.
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,Summary for this month and pending activities,ఈ నెల పెండింగ్ కార్యకలాపాలకు సారాంశం
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,ఈ నెల పెండింగ్ కార్యకలాపాలకు సారాంశం
 DocType: Customer Group,Customer Group Name,కస్టమర్ గ్రూప్ పేరు
 apps/erpnext/erpnext/public/js/financial_statements.js +54,Cash Flow Statement,లావాదేవి నివేదిక
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Please remove this Invoice {0} from C-Form {1},సి ఫారం నుండి ఈ వాయిస్ {0} తొలగించడానికి దయచేసి {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,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 +644,Get Items,అంశాలు పొందండి
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +623,Get Items,అంశాలు పొందండి
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +210,Please enter Write Off Account,ఖాతా ఆఫ్ వ్రాయండి నమోదు చేయండి
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,చివరి ఆర్డర్ తేదీ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +41,Account {0} does not belongs to company {1},ఖాతా {0} చేస్తుంది కంపెనీ చెందినవి కాదు {1}
+DocType: Student,Guardian Details,గార్డియన్ వివరాలు
 DocType: C-Form,C-Form,సి ఫారం
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,బహుళ ఉద్యోగులకు మార్క్ హాజరు
 DocType: Payment Request,Initiated,ప్రారంభించిన
 DocType: Production Order,Planned Start Date,ప్రణాళిక ప్రారంభ తేదీ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,Customer is required against Receivable account {0},కస్టమర్ స్వీకరించదగిన ఖాతాఫై అవసరం {0}
 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 +265,Project-wise data is not available for Quotation,ప్రాజెక్టు వారీగా డేటా కొటేషన్ అందుబాటులో లేదు
+apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,ప్రాజెక్టు వారీగా డేటా కొటేషన్ అందుబాటులో లేదు
 DocType: Project,Expected End Date,ఊహించినది ముగింపు తేదీ
 DocType: Budget Account,Budget Amount,బడ్జెట్ మొత్తం
 DocType: Appraisal Template,Appraisal Template Title,అప్రైసల్ మూస శీర్షిక
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,Commercial,కమర్షియల్స్
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,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 +648,Row {0}# Account must be of type 'Fixed Asset',రో {0} # ఖాతా రకం ఉండాలి &#39;స్థిర ఆస్తి&#39;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Row {0}# Account must be of type 'Fixed Asset',రో {0} # ఖాతా రకం ఉండాలి &#39;స్థిర ఆస్తి&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,ప్యాక్ చేసిన అంశాల అవుట్
 apps/erpnext/erpnext/config/accounts.py +278,Rules to calculate shipping amount for a sale,నిబంధనలు అమ్మకానికి షిప్పింగ్ మొత్తం లెక్కించేందుకు
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +30,Series is mandatory,సిరీస్ తప్పనిసరి
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +50,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}
 DocType: Leave Allocation,Unused leaves,ఉపయోగించని ఆకులు
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Cr,Cr
 DocType: Tax Rule,Billing State,బిల్లింగ్ రాష్ట్రం
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +250,Transfer,ట్రాన్స్ఫర్
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +187,{0} {1} does not associated with Party Account {2},{0} {1} పార్టీ ఖాతాతో అనుబంధితమైన లేదు {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,Fetch exploded BOM (including sub-assemblies),(ఉప అసెంబ్లీలను సహా) పేలింది BOM పొందు
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +254,Transfer,ట్రాన్స్ఫర్
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +190,{0} {1} does not associated with Party Account {2},{0} {1} పార్టీ ఖాతాతో అనుబంధితమైన లేదు {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +796,Fetch exploded BOM (including sub-assemblies),(ఉప అసెంబ్లీలను సహా) పేలింది BOM పొందు
 DocType: Authorization Rule,Applicable To (Employee),వర్తించదగిన (ఉద్యోగి)
-apps/erpnext/erpnext/controllers/accounts_controller.py +115,Due Date is mandatory,గడువు తేదీ తప్పనిసరి
+apps/erpnext/erpnext/controllers/accounts_controller.py +118,Due Date is mandatory,గడువు తేదీ తప్పనిసరి
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,గుణానికి పెంపు {0} 0 ఉండకూడదు
 DocType: Journal Entry,Pay To / Recd From,నుండి / Recd పే
 DocType: Naming Series,Setup Series,సెటప్ సిరీస్
 DocType: Payment Reconciliation,To Invoice Date,తేదీ వాయిస్
 DocType: Supplier,Contact HTML,సంప్రదించండి HTML
 ,Inactive Customers,క్రియారహిత వినియోగదారుడు
+DocType: Landed Cost Voucher,LCV,ఎల్సీవీ
 DocType: Landed Cost Voucher,Purchase Receipts,కొనుగోలు రసీదులు
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,ఎలా ధర రూల్ వర్తించబడుతుంది?
 DocType: Quality Inspection,Delivery Note No,డెలివరీ గమనిక లేవు
@@ -3093,7 +3138,7 @@
 DocType: Company,Retail,రిటైల్
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +120,Customer {0} does not exist,కస్టమర్ {0} ఉనికిలో లేదు
 DocType: Attendance,Absent,ఆబ్సెంట్
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +587,Product Bundle,ఉత్పత్తి కట్ట
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Product Bundle,ఉత్పత్తి కట్ట
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Invalid reference {1},రో {0}: చెల్లని సూచన {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,పన్నులు మరియు ఆరోపణలు మూస కొనుగోలు
 DocType: Upload Attendance,Download Template,డౌన్లోడ్ మూస
@@ -3103,8 +3148,8 @@
 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 +742,Send Supplier Emails,సరఫరాదారు ఇమెయిల్స్ పంపడం
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +104,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","జీతం ఇప్పటికే మధ్య {0} మరియు {1}, అప్లికేషన్ కాలం వదిలి ఈ తేదీ పరిధి మధ్య ఉండకూడదు కాలానికి ప్రాసెస్."
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +708,Send Supplier Emails,సరఫరాదారు ఇమెయిల్స్ పంపడం
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,"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,గార్డియన్ వడ్డీ
 DocType: Timesheet,Employee Detail,ఉద్యోగి వివరాలు
@@ -3115,9 +3160,9 @@
 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,ఎర్నింగ్ &amp; తీసివేత
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +77,Account {0} cannot be a Group,ఖాతా {0} గ్రూప్ ఉండకూడదు
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} cannot be a Group,ఖాతా {0} గ్రూప్ ఉండకూడదు
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +31,Optional. This setting will be used to filter in various transactions.,ఐచ్ఛికము. ఈ సెట్టింగ్ వివిధ లావాదేవీలలో ఫిల్టర్ ఉపయోగించబడుతుంది.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +107,Negative Valuation Rate is not allowed,ప్రతికూల వాల్యువేషన్ రేటు అనుమతి లేదు
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,ప్రతికూల వాల్యువేషన్ రేటు అనుమతి లేదు
 DocType: Holiday List,Weekly Off,వీక్లీ ఆఫ్
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","ఉదా 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +39,Provisional Profit / Loss (Credit),ప్రొవిజనల్ లాభం / నష్టం (క్రెడిట్)
@@ -3131,16 +3176,16 @@
 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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: కాస్ట్ సెంటర్ అంశం తప్పనిసరి {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +626,Get Items from Product Bundle,ఉత్పత్తి కట్ట నుండి అంశాలు పొందండి
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +605,Get Items from Product Bundle,ఉత్పత్తి కట్ట నుండి అంశాలు పొందండి
 DocType: Asset,Straight Line,సరళ రేఖ
 DocType: Project User,Project User,ప్రాజెక్ట్ యూజర్
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} is inactive,ఖాతా {0} నిష్క్రియంగా
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} is inactive,ఖాతా {0} నిష్క్రియంగా
 DocType: GL Entry,Is Advance,అడ్వాన్స్ ఉంది
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,తేదీ తేదీ మరియు హాజరును హాజరు తప్పనిసరి
 apps/erpnext/erpnext/controllers/buying_controller.py +148,Please enter 'Is Subcontracted' as Yes or No,"అవును లేదా సంఖ్య వంటి &#39;బహుకరించింది, మరలా ఉంది&#39; నమోదు చేయండి"
 DocType: Sales Team,Contact No.,సంప్రదించండి నం
 DocType: Bank Reconciliation,Payment Entries,చెల్లింపు ఎంట్రీలు
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,'Profit and Loss' type account {0} not allowed in Opening Entry,ఎంట్రీ తెరవడం లో అనుమతించబడవు &#39;లాభం మరియు నష్టం&#39; రకం ఖాతా {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +71,'Profit and Loss' type account {0} not allowed in Opening Entry,ఎంట్రీ తెరవడం లో అనుమతించబడవు &#39;లాభం మరియు నష్టం&#39; రకం ఖాతా {0}
 DocType: Program Enrollment Tool,Get Students From,నుండి స్టూడెంట్స్ పొందండి
 DocType: Hub Settings,Seller Country,అమ్మకాల దేశం
 apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,వెబ్ సైట్ లో అంశాలను ప్రచురించు
@@ -3159,7 +3204,7 @@
 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 +558,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","రో # {0}: ఆస్తి {1} సమర్పించిన కాదు, అది ఇప్పటికే ఉంది {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +561,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","రో # {0}: ఆస్తి {1} సమర్పించిన కాదు, అది ఇప్పటికే ఉంది {2}"
 DocType: Tax Rule,Billing Country,బిల్లింగ్ దేశం
 DocType: Production Order,Expected Delivery Date,ఊహించినది డెలివరీ తేదీ
 apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,డెబిట్ మరియు క్రెడిట్ {0} # సమాన కాదు {1}. తేడా ఉంది {2}.
@@ -3172,13 +3217,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +202,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: Sales Order,% Amount Billed,% మొత్తం కస్టమర్లకు
+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 +117,No Item with Serial No {0},సీరియల్ లేవు ఐటెమ్ను {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,ఓపెన్ ప్రకటనలు
+DocType: Email Digest,Open Notifications,ఓపెన్ ప్రకటనలు
 DocType: Payment Entry,Difference Amount (Company Currency),తేడా మొత్తం (కంపెనీ కరెన్సీ)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,ప్రత్యక్ష ఖర్చులు
 apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
@@ -3186,7 +3231,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,కొత్త కస్టమర్ రెవెన్యూ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,ప్రయాణ ఖర్చులు
 DocType: Maintenance Visit,Breakdown,విభజన
-apps/erpnext/erpnext/controllers/accounts_controller.py +634,Account: {0} with currency: {1} can not be selected,ఖాతా: {0} కరెన్సీతో: {1} ఎంపిక సాధ్యం కాదు
+apps/erpnext/erpnext/controllers/accounts_controller.py +637,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}
 DocType: Program Enrollment Tool,Student Applicants,స్టూడెంట్ దరఖాస్తుదారులు
@@ -3194,15 +3239,15 @@
 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 +56,Probation,పరిశీలన
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Probation,పరిశీలన
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,జీతం భాగాలు
 DocType: Program Enrollment Tool,New Academic Year,కొత్త విద్యా సంవత్సరం
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Payment of salary for the month {0} and year {1},నెల జీతం చెల్లింపు {0} మరియు సంవత్సరం {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Payment of salary for the month {0} and year {1},నెల జీతం చెల్లింపు {0} మరియు సంవత్సరం {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,ఆటో చొప్పించు ధర జాబితా రేటు లేదు ఉంటే
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,మొత్తం చెల్లించిన మొత్తాన్ని
 DocType: Production Order Item,Transferred Qty,బదిలీ ప్యాక్ చేసిన అంశాల
 apps/erpnext/erpnext/config/learn.py +11,Navigating,నావిగేట్
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Planning,ప్లానింగ్
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,ప్లానింగ్
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,జారి చేయబడిన
 DocType: Project,Total Billing Amount (via Time Logs),మొత్తం బిల్లింగ్ మొత్తం (టైమ్ దినచర్య ద్వారా)
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,We sell this Item,మేము ఈ అంశం అమ్మే
@@ -3215,11 +3260,10 @@
 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.,ఇమెయిల్ ద్వారా సాధారణ సారాంశం నివేదికలు పంపండి.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Sales invoice submitted sucessfully.,సేల్స్ వాయిస్ విజయవంతంగా సమర్పించారు.
 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}
 DocType: Assessment Result,Student Name,విద్యార్థి పేరు
-apps/erpnext/erpnext/hooks.py +104,Assessment Schedule,అసెస్మెంట్ షెడ్యూల్
+apps/erpnext/erpnext/hooks.py +113,Assessment Schedule,అసెస్మెంట్ షెడ్యూల్
 DocType: Brand,Item Manager,అంశం మేనేజర్
 DocType: Buying Settings,Default Supplier Type,డిఫాల్ట్ సరఫరాదారు టైప్
 DocType: Production Order,Total Operating Cost,మొత్తం నిర్వహణ వ్యయంలో
@@ -3229,6 +3273,7 @@
 DocType: GL Entry,Party Type,పార్టీ రకం
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +78,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 లేదు
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,జీతం టెంప్లేట్ మాస్టర్.
 DocType: Leave Type,Max Days Leave Allowed,మాక్స్ డేస్ లీవ్ అనుమతించబడినవి
@@ -3240,18 +3285,19 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,లీడ్స్ లేదా వినియోగదారుడు కోట్స్.
 DocType: Stock Settings,Role Allowed to edit frozen stock,పాత్ర ఘనీభవించిన స్టాక్ సవరించడానికి అనుమతించబడినవి
 ,Territory Target Variance Item Group-Wise,భూభాగం టార్గెట్ విస్తృతి అంశం గ్రూప్-వైజ్
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Customer Groups,అన్ని కస్టమర్ సమూహాలు
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +78,Accumulated Monthly,పోగుచేసిన మంత్లీ
-apps/erpnext/erpnext/controllers/accounts_controller.py +595,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} తప్పనిసరి. బహుశా కరెన్సీ ఎక్స్ఛేంజ్ రికార్డు {1} {2} కోసం సృష్టించబడలేదు.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,అన్ని కస్టమర్ సమూహాలు
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +81,Accumulated Monthly,పోగుచేసిన మంత్లీ
+apps/erpnext/erpnext/controllers/accounts_controller.py +598,{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} ఉనికిలో లేదు
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),ధర జాబితా రేటు (కంపెనీ కరెన్సీ)
 DocType: Products Settings,Products Settings,ఉత్పత్తులు సెట్టింగులు
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +188,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} సెటప్&gt; సెట్టింగ్స్ ద్వారా&gt; నామకరణ సిరీస్ నామకరణ సెట్ చెయ్యండి
 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 +84,Secretary,కార్యదర్శి
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,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,కొనుగోలు
@@ -3260,24 +3306,22 @@
 ,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,అసెస్మెంట్ పేరు
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,రో # {0}: సీరియల్ సంఖ్య తప్పనిసరి ఉంది
+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 +859,Supplier Quotation,సరఫరాదారు కొటేషన్
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +838,Supplier Quotation,సరఫరాదారు కొటేషన్
 DocType: Quotation,In Words will be visible once you save the Quotation.,మీరు కొటేషన్ సేవ్ ఒకసారి వర్డ్స్ కనిపిస్తుంది.
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +7,Collect Fees,ఫీజు సేకరించండి
+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}
 DocType: Lead,Add to calendar on this date,ఈ తేదీ క్యాలెండర్ జోడించండి
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,షిప్పింగ్ ఖర్చులు జోడించడం కోసం రూల్స్.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,రాబోయే ఈవెంట్స్
 DocType: Item,Opening Stock,తెరవడం స్టాక్
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,కస్టమర్ అవసరం
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} రిటర్న్ తప్పనిసరి
 DocType: Purchase Order,To Receive,అందుకోవడం
 apps/erpnext/erpnext/public/js/setup_wizard.js +195,user@example.com,user@example.com
-DocType: Email Digest,Income / Expense,ఆదాయం / ఖర్చుల
 DocType: Employee,Personal Email,వ్యక్తిగత ఇమెయిల్
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,మొత్తం మార్పులలో
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","ప్రారంభించబడితే, సిస్టమ్ స్వయంచాలకంగా జాబితా కోసం అకౌంటింగ్ ఎంట్రీలు పోస్ట్ ఉంటుంది."
@@ -3288,13 +3332,14 @@
 DocType: Customer,From Lead,లీడ్ నుండి
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,ఆర్డర్స్ ఉత్పత్తి కోసం విడుదల చేసింది.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,ఫిస్కల్ ఇయర్ ఎంచుకోండి ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,POS Profile required to make POS Entry,POS ప్రొఫైల్ POS ఎంట్రీ చేయడానికి అవసరం
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +509,POS Profile required to make POS Entry,POS ప్రొఫైల్ POS ఎంట్రీ చేయడానికి అవసరం
 DocType: Program Enrollment Tool,Enroll Students,విద్యార్ధులను నమోదు
 DocType: Hub Settings,Name Token,పేరు టోకెన్
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,ప్రామాణిక సెల్లింగ్
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Atleast one warehouse is mandatory,కనీసం ఒక గిడ్డంగి తప్పనిసరి
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +129,Atleast one warehouse is mandatory,కనీసం ఒక గిడ్డంగి తప్పనిసరి
 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 +330,{0} against Sales Invoice {1},{0} సేల్స్ వాయిస్ వ్యతిరేకంగా {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,ప్రాజెక్ట్ పేరు
@@ -3315,10 +3360,11 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,ఆకులు 0.5 యొక్క గుణిజాలుగా లో కేటాయించింది తప్పక
 DocType: Production Order,Operation Cost,ఆపరేషన్ ఖర్చు
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,ఒక csv ఫైల్ నుండి హాజరు అప్లోడ్
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,అత్యుత్తమ ఆంట్
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,సెట్ లక్ష్యాలను అంశం గ్రూప్ వారీగా ఈ సేల్స్ పర్సన్ కోసం.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],ఫ్రీజ్ స్టాక్స్ కంటే పాత [డేస్]
-apps/erpnext/erpnext/controllers/accounts_controller.py +528,Row #{0}: Asset is mandatory for fixed asset purchase/sale,రో # {0}: ఆస్తి స్థిర ఆస్తి కొనుగోలు / అమ్మకాలు తప్పనిసరి
+apps/erpnext/erpnext/controllers/accounts_controller.py +531,Row #{0}: Asset is mandatory for fixed asset purchase/sale,రో # {0}: ఆస్తి స్థిర ఆస్తి కొనుగోలు / అమ్మకాలు తప్పనిసరి
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","రెండు లేదా అంతకంటే ఎక్కువ ధర రూల్స్ పై నిబంధనలకు ఆధారంగా కనబడక పోతే, ప్రాధాన్య వర్తించబడుతుంది. డిఫాల్ట్ విలువ సున్నా (ఖాళీ) కు చేరుకుంది ప్రాధాన్యత 20 కు మధ్య 0 ఒక సంఖ్య. హయ్యర్ సంఖ్య అదే పరిస్థితులు బహుళ ధర రూల్స్ ఉన్నాయి ఉంటే అది ప్రాధాన్యత పడుతుంది అంటే."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,ఫిస్కల్ ఇయర్: {0} చేస్తుంది ఉందో
 DocType: Currency Exchange,To Currency,కరెన్సీ
@@ -3335,15 +3381,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,వ్యక్తిగాతమయిన సమభాగము
 DocType: Maintenance Visit,Customer Feedback,కస్టమర్ అభిప్రాయం
 DocType: Account,Expense,ఖర్చుల
-DocType: Sales Invoice,Exhibition,ఎగ్జిబిషన్
 apps/erpnext/erpnext/utilities/doctype/address/address.py +77,"Company is mandatory, as it is your company address","మీ కంపెనీ చిరునామా వంటి కంపెనీ, తప్పనిసరి"
 DocType: Item Attribute,From Range,రేంజ్ నుండి
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +81,Syntax error in formula or condition: {0},ఫార్ములా లేదా స్థితిలో వాక్యనిర్మాణ దోషం: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +92,Syntax error in formula or condition: {0},ఫార్ములా లేదా స్థితిలో వాక్యనిర్మాణ దోషం: {0}
 apps/erpnext/erpnext/stock/utils.py +99,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 +28,Jobs,ఉద్యోగాలు
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,ఉద్యోగాలు
 ,Sales Order Trends,అమ్మకాల ఆర్డర్ ట్రెండ్లులో
 DocType: Employee,Held On,హెల్డ్ న
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,ఉత్పత్తి అంశం
@@ -3352,16 +3398,16 @@
 DocType: Stock Entry Detail,Additional Cost,అదనపు ఖర్చు
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,ఆర్థిక సంవత్సరం ముగింపు తేదీ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","ఓచర్ లేవు ఆధారంగా వడపోత కాదు, ఓచర్ ద్వారా సమూహం ఉంటే"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +763,Make Supplier Quotation,సరఫరాదారు కొటేషన్ చేయండి
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,Make Supplier Quotation,సరఫరాదారు కొటేషన్ చేయండి
 DocType: Quality Inspection,Incoming,ఇన్కమింగ్
 DocType: BOM,Materials Required (Exploded),మెటీరియల్స్ (పేలుతున్న) అవసరం
 apps/erpnext/erpnext/public/js/setup_wizard.js +185,"Add users to your organization, other than yourself","మీరే కంటే ఇతర, మీ సంస్థకు వినియోగదారులను జోడించు"
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,Row # {0}: Serial No {1} does not match with {2} {3},రో # {0}: సీరియల్ లేవు {1} తో సరిపోలడం లేదు {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +42,Casual Leave,సాధారణం లీవ్
+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,సాధారణం లీవ్
 DocType: Batch,Batch ID,బ్యాచ్ ID
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,Note: {0},గమనిక: {0}
 ,Delivery Note Trends,డెలివరీ గమనిక ట్రెండ్లులో
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +103,This Week's Summary,ఈ వారపు సారాంశం
+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} మాత్రమే స్టాక్ లావాదేవీలు ద్వారా నవీకరించబడింది చేయవచ్చు
 DocType: Student Group Creation Tool,Get Courses,కోర్సులు పొందండి
 DocType: GL Entry,Party,పార్టీ
@@ -3371,7 +3417,7 @@
 DocType: Request for Quotation Item,Request for Quotation Item,కొటేషన్ అంశం కోసం అభ్యర్థన
 DocType: Purchase Order,To Bill,బిల్
 DocType: Material Request,% Ordered,% క్రమ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Piecework,Piecework
+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: Task,Actual Time (in Hours),(గంటల్లో) వాస్తవ సమయం
 DocType: Employee,History In Company,కంపెనీ చరిత్ర
@@ -3388,7 +3434,7 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +350,{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 +162,Black,బ్లాక్
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,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} అంశాలు ఉత్పత్తి
@@ -3399,13 +3445,13 @@
 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 +69,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,మార్క్ కరువవడంతో
 DocType: Journal Entry Account,Exchange Rate,ఎక్స్చేంజ్ రేట్
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Sales Order {0} is not submitted,అమ్మకాల ఆర్డర్ {0} సమర్పించిన లేదు
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +527,Sales Order {0} is not submitted,అమ్మకాల ఆర్డర్ {0} సమర్పించిన లేదు
 DocType: Homepage,Tag Line,ట్యాగ్ లైన్
 DocType: Fee Component,Fee Component,ఫీజు భాగం
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +857,Add items from,నుండి అంశాలను జోడించండి
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +836,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: Cheque Print Template,Regular,రెగ్యులర్
 DocType: BOM,Last Purchase Rate,చివరి కొనుగోలు రేటు
@@ -3413,6 +3459,7 @@
 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} నుండి రకాల్లో
 ,Sales Person-wise Transaction Summary,సేల్స్ పర్సన్ వారీగా లావాదేవీ సారాంశం
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +60,Cost Center is required for 'Profit and Loss' account {0}. Please set up a default Cost Center for the Company.,వ్యయ కేంద్రం &#39;లాభం మరియు నష్టం&#39; ఖాతా {0} అవసరం. కంపెనీ కోసం ఒక డిఫాల్ట్ వ్యయ కేంద్రం ఏర్పాటు చేయండి.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,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,మంత్లీ పంపిణీ శాతములు
@@ -3423,12 +3470,12 @@
 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 +710,Online,ఆన్లైన్
+apps/erpnext/erpnext/accounts/page/pos/pos.js +692,Online,ఆన్లైన్
 ,Available Stock for Packing Items,ప్యాకింగ్ అంశాలను అందుబాటులో స్టాక్
 DocType: Item Variant,Item Variant,అంశం వేరియంట్
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,ఏ ఇతర డిఫాల్ట్ ఉంది డిఫాల్ట్ ఈ చిరునామాను మూస చేస్తోంది
+apps/erpnext/erpnext/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'","ఇప్పటికే డెబిట్ ఖాతా సంతులనం, మీరు &#39;క్రెడిట్&#39; గా &#39;సంతులనం ఉండాలి&#39; సెట్ అనుమతి లేదు"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Quality Management,క్వాలిటీ మేనేజ్మెంట్
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,క్వాలిటీ మేనేజ్మెంట్
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,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 బాహ్య వర్క్ చరిత్ర
@@ -3450,11 +3497,12 @@
 DocType: Student,Student Email ID,స్టూడెంట్ అడ్రెస్
 DocType: Employee,Notice (days),నోటీసు (రోజులు)
 DocType: Tax Rule,Sales Tax Template,సేల్స్ టాక్స్ మూస
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1520,Select items to save the invoice,ఇన్వాయిస్ సేవ్ చెయ్యడానికి ఐటమ్లను ఎంచుకోండి
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1544,Select items to save the invoice,ఇన్వాయిస్ సేవ్ చెయ్యడానికి ఐటమ్లను ఎంచుకోండి
 DocType: Employee,Encashment Date,ఎన్క్యాష్మెంట్ తేదీ
 DocType: Account,Stock Adjustment,స్టాక్ అడ్జస్ట్మెంట్
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},డిఫాల్ట్ కార్యాచరణ ఖర్చు కార్యాచరణ పద్ధతి ఉంది - {0}
 DocType: Production Order,Planned Operating Cost,ప్రణాళిక నిర్వహణ ఖర్చు
+DocType: Academic Term,Term Start Date,టర్మ్ ప్రారంభ తేదీ
 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,దరఖాస్తుదారు పేరు
@@ -3484,17 +3532,17 @@
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,గిడ్డంగి (శాశ్వత ఇన్వెంటరీ) కోసం ఖాతాకు ఈ ఖాతా కింద సృష్టించబడుతుంది.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +119,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,స్టాక్ లెడ్జర్ ఎంట్రీ ఈ గిడ్డంగి కోసం ఉనికిలో గిడ్డంగి తొలగించడం సాధ్యం కాదు.
 DocType: Company,Distribution,పంపిణీ
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +8,Amount Paid,కట్టిన డబ్బు
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Project Manager,ప్రాజెక్ట్ మేనేజర్
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,కట్టిన డబ్బు
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,ప్రాజెక్ట్ మేనేజర్
 ,Quoted Item Comparison,ఉల్లేఖించిన అంశం పోలిక
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Dispatch,డిస్పాచ్
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,డిస్పాచ్
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,అంశం కోసం మాక్స్ డిస్కౌంట్: {0} {1}% ఉంది
 apps/erpnext/erpnext/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 అనుమతి పాత్ర.
-DocType: Sales Invoice,Supplier Reference,సరఫరాదారు సూచన
-apps/erpnext/erpnext/accounts/page/pos/pos.js +844,"Master data syncing, it might take some time","మాస్టర్ డేటా సమకాలీకరించడాన్ని, కొంత సమయం పడుతుంది"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +832,"Master data syncing, it might take some time","మాస్టర్ డేటా సమకాలీకరించడాన్ని, కొంత సమయం పడుతుంది"
 DocType: Item,Material Issue,మెటీరియల్ ఇష్యూ
 DocType: Hub Settings,Seller Description,అమ్మకాల వివరణ
 DocType: Employee Education,Qualification,అర్హతలు
@@ -3508,7 +3556,7 @@
 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 +83,Error in formula or condition,ఫార్ములా లేదా స్థితిలో లోపం
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,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,అన్నింటినీ
@@ -3517,7 +3565,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},తేదీ ఫిస్కల్ ఇయర్ లోపల ఉండాలి. = తేదీ ఊహిస్తే {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","ఇక్కడ మీరు etc ఎత్తు, బరువు, అలెర్జీలు, వైద్య ఆందోళనలు అందుకోగలదు"
 DocType: Leave Block List,Applies to Company,కంపెనీకి వర్తిస్తుంది
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +197,Cannot cancel because submitted Stock Entry {0} exists,సమర్పించిన స్టాక్ ఎంట్రీ {0} ఉంది ఎందుకంటే రద్దు కాదు
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +198,Cannot cancel because submitted Stock Entry {0} exists,సమర్పించిన స్టాక్ ఎంట్రీ {0} ఉంది ఎందుకంటే రద్దు కాదు
 DocType: Purchase Invoice,In Words,వర్డ్స్
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,Today is {0}'s birthday!,నేడు {0} యొక్క పుట్టినరోజు!
 DocType: Production Planning Tool,Material Request For Warehouse,వేర్హౌస్ కోసం మెటీరియల్ అభ్యర్థన
@@ -3527,14 +3575,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,మీ ఆర్థిక సంవత్సరం ప్రారంభమవుతుంది
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,ఆస్తి Depreciations మరియు నిల్వలను
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +319,Amount {0} {1} transferred from {2} to {3},మొత్తం {0} {1} నుంచి బదిలీ {2} నుండి {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +322,Amount {0} {1} transferred from {2} to {3},మొత్తం {0} {1} నుంచి బదిలీ {2} నుండి {3}
 DocType: Sales Invoice,Get Advances Received,అడ్వాన్సెస్ స్వీకరించిన గెట్
 DocType: Email Digest,Add/Remove Recipients,గ్రహీతలు జోడించు / తొలగించు
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +432,Transaction not allowed against stopped Production Order {0},లావాదేవీ ఆగిపోయింది ఉత్పత్తి వ్యతిరేకంగా అనుమతి లేదు ఆర్డర్ {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +437,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 +143,Join,చేరండి
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,కొరత ప్యాక్ చేసిన అంశాల
-apps/erpnext/erpnext/stock/doctype/item/item.py +652,Item variant {0} exists with same attributes,అంశం వేరియంట్ {0} అదే లక్షణాలు తో ఉంది
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,అంశం వేరియంట్ {0} అదే లక్షణాలు తో ఉంది
+DocType: Leave Application,LAP/,LAP /
 DocType: Salary Slip,Salary 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,తేదీ &#39;అవసరం
@@ -3542,12 +3591,12 @@
 DocType: Sales Invoice Item,Sales Order Item,అమ్మకాల ఆర్డర్ అంశం
 DocType: Salary Slip,Payment Days,చెల్లింపు డేస్
 DocType: Customer,Dormant,నిద్రాణమైన
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +212,Warehouses with child nodes cannot be converted to ledger,పిల్లల నోడ్స్ తో గిడ్డంగులు లెడ్జర్ మార్చబడతాయి కాదు
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +215,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/public/js/controllers/transaction.js +866,It is needed to fetch Item Details.,ఇది అంశం వివరాలు పొందడం అవసరమవుతుంది.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +857,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} ఇప్పటికే అందింది
@@ -3557,14 +3606,14 @@
 DocType: Expense Claim,Total Claimed Amount,మొత్తం క్లెయిమ్ చేసిన మొత్తం
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,అమ్మకం కోసం సమర్థవంతమైన అవకాశాలు.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,Invalid {0},చెల్లని {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Sick Leave,అనారొగ్యపు సెలవు
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,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,డిపార్ట్మెంట్ స్టోర్స్
 DocType: Warehouse,PIN,పిన్
 DocType: Sales Invoice,Base Change Amount (Company Currency),బేస్ మార్చు మొత్తం (కంపెనీ కరెన్సీ)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +313,No accounting entries for the following warehouses,క్రింది గిడ్డంగులు కోసం అకౌంటింగ్ ఎంట్రీలు
-apps/erpnext/erpnext/projects/doctype/project/project.js +102,Save the document first.,మొదటి డాక్యుమెంట్ సేవ్.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +314,No accounting entries for the following warehouses,క్రింది గిడ్డంగులు కోసం అకౌంటింగ్ ఎంట్రీలు
+apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,మొదటి డాక్యుమెంట్ సేవ్.
 DocType: Account,Chargeable,విధింపదగిన
 DocType: Company,Change Abbreviation,మార్పు సంక్షిప్తీకరణ
 DocType: Expense Claim Detail,Expense Date,ఖర్చుల తేదీ
@@ -3577,10 +3626,9 @@
 DocType: Purchase Invoice,Recurring Print Format,పునరావృత ప్రింట్ ఫార్మాట్
 DocType: C-Form,Series,సిరీస్
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,Expected Delivery Date cannot be before Purchase Order Date,ఊహించినది డెలివరీ తేదీ కొనుగోలు ఆర్డర్ తేదీ ముందు ఉండరాదు
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} సెటప్&gt; సెట్టింగ్స్ ద్వారా&gt; నామకరణ సిరీస్ నామకరణ సెట్ చెయ్యండి
 DocType: Appraisal,Appraisal Template,అప్రైసల్ మూస
 DocType: Item Group,Item Classification,అంశం వర్గీకరణ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Business Development Manager,వ్యాపారం అభివృద్ధి మేనేజర్
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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,సాధారణ లెడ్జర్
@@ -3590,8 +3638,8 @@
 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 +940,Please select {0} first,ముందుగా {0} దయచేసి ఎంచుకోండి
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +749,Batch {0} of Item {1} has expired.,అంశం బ్యాచ్ {0} {1} గడువు ముగిసింది.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +953,Please select {0} first,ముందుగా {0} దయచేసి ఎంచుకోండి
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +757,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,పూర్తికాని
@@ -3608,8 +3656,8 @@
 {% 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 +92,Warehouse not found in the system,వేర్హౌస్ వ్యవస్థలో దొరకలేదు
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +106,This Month's Summary,ఈ నెల సారాంశం
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,వేర్హౌస్ వ్యవస్థలో దొరకలేదు
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,ఈ నెల సారాంశం
 DocType: Quality Inspection Reading,Quality Inspection Reading,నాణ్యత తనిఖీ పఠనం
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`ఫ్రీజ్ స్టాక్స్ పాత Than`% d రోజుల కంటే తక్కువగా ఉండాలి.
 DocType: Tax Rule,Purchase Tax Template,పన్ను మూస కొనుగోలు
@@ -3619,21 +3667,22 @@
 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 +87,Please set Next Depreciation Date,తదుపరి అరుగుదల తేదీ సెట్ చెయ్యండి
-DocType: Payment Gateway,Payment Gateway,చెల్లింపు గేట్వే
 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 +378,Operation Time must be greater than 0 for Operation {0},ఆపరేషన్ సమయం ఆపరేషన్ కోసం 0 కంటే ఎక్కువ ఉండాలి {0}
+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/accounts/doctype/account/account.py +170,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)
 DocType: Program,Program Abbreviation,ప్రోగ్రామ్ సంక్షిప్తీకరణ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,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: Appraisal,Start Date,ప్రారంబపు తేది
@@ -3649,21 +3698,22 @@
 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,ఆరోపణలు ఆ అంశం వర్తించదు ఉంటే అంశాన్ని తొలగించు
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,ఉదా. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +27,Transaction currency must be same as Payment Gateway currency,లావాదేవీ కరెన్సీ చెల్లింపు గేట్వే కరెన్సీ అదే ఉండాలి
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Transaction currency must be same as Payment Gateway currency,లావాదేవీ కరెన్సీ చెల్లింపు గేట్వే కరెన్సీ అదే ఉండాలి
 DocType: Payment Entry,Receive,స్వీకరించండి
+apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,ఉల్లేఖనాలు:
 DocType: Maintenance Visit,Fully Completed,పూర్తిగా పూర్తయింది
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% పూర్తి
 DocType: Employee,Educational Qualification,అర్హతలు
 DocType: Workstation,Operating Costs,నిర్వహణ వ్యయాలు
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,యాక్షన్ సేకరించారు మంత్లీ బడ్జెట్ మించింది ఉంటే
 DocType: Purchase Invoice,Submit on creation,సృష్టి సమర్పించండి
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +432,Currency for {0} must be {1},కరెన్సీ కోసం {0} ఉండాలి {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +435,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 +493,Row {0}: An Reorder entry already exists for this warehouse {1},రో {0}: ఒక క్రమాన్ని ఎంట్రీ ఇప్పటికే ఈ గిడ్డంగి కోసం ఉంది {1}
+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/crm/doctype/opportunity/opportunity.py +79,"Cannot declare as lost, because Quotation has been made.","కొటేషన్ చేయబడింది ఎందుకంటే, కోల్పోయిన డిక్లేర్ కాదు."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,కొనుగోలు మాస్టర్ మేనేజర్
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +429,Production Order {0} must be submitted,ఆర్డర్ {0} సమర్పించాలి ఉత్పత్తి
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +434,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,తేదీ తేదీ నుండి ముందు ఉండరాదు
@@ -3673,25 +3723,27 @@
 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 +181,Totals,మొత్తాలు
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,మొత్తాలు
 DocType: BOM,Manufacturing,తయారీ
 ,Ordered Items To Be Delivered,క్రమ అంశాలు పంపిణీ చేయాలి
 DocType: Account,Income,ఆదాయపు
 DocType: Industry Type,Industry Type,పరిశ్రమ రకం
 apps/erpnext/erpnext/templates/includes/cart.js +141,Something went wrong!,ఎక్కడో తేడ జరిగింది!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,Warning: Leave application contains following block dates,హెచ్చరిక: వదిలి అప్లికేషన్ క్రింది బ్లాక్ తేదీలను
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +120,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} ఈ లావాదేవీని పూర్తి చేయడానికి యూనిట్లు.
+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 +181,Organization unit (department) master.,సంస్థ యూనిట్ (విభాగం) మాస్టర్.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,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 +793,All records are synced.,అన్ని రికార్డులు సమకాలీకరించబడ్డాయి.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +781,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,ఖర్చు సెంటర్ పేరు
@@ -3710,21 +3762,20 @@
 DocType: Address,Name of person or organization that this address belongs to.,ఈ చిరునామాకు చెందిన వ్యక్తి లేదా సంస్థ యొక్క పేరు.
 apps/erpnext/erpnext/public/js/setup_wizard.js +260,Your Suppliers,మీ సరఫరాదారులు
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +49,Cannot set as Lost as Sales Order is made.,అమ్మకాల ఆర్డర్ చేసిన ఓడిపోయింది సెట్ చెయ్యబడదు.
-DocType: Student Applicant,Mother's Name,తల్లి పేరు
 DocType: Request for Quotation Item,Supplier Part No,సరఫరాదారు పార్ట్ లేవు
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +348,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 +326,Received From,నుండి అందుకున్న
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Received From,నుండి అందుకున్న
 DocType: Lead,Converted,కన్వర్టెడ్
 DocType: Item,Has Serial No,సీరియల్ లేవు ఉంది
 DocType: Employee,Date of Issue,జారీ చేసిన తేది
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: నుండి {0} కోసం {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +153,Row #{0}: Set Supplier for item {1},రో # {0}: అంశాన్ని సెట్ సరఫరాదారు {1}
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +93,Row {0}: Hours value must be greater than zero.,రో {0}: గంటలు విలువ సున్నా కంటే ఎక్కువ ఉండాలి.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +117,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} కనుగొనబడలేదు
 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 +172,{0} {1} does not exist,{0} {1} ఉనికిలో లేని
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +175,{0} {1} does not exist,{0} {1} ఉనికిలో లేని
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,Please check Multi Currency option to allow accounts with other currency,ఇతర కరెన్సీ ఖాతాల అనుమతించటానికి మల్టీ కరెన్సీ ఎంపికను తనిఖీ చేయండి
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +72,Item: {0} does not exist in the system,అంశం: {0} వ్యవస్థ ఉనికిలో లేదు
 apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,మీరు స్తంభింపచేసిన విలువ సెట్ అధికారం లేదు
@@ -3733,13 +3784,14 @@
 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/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,హాజరు భవిష్యత్తులో తేదీలు కోసం గుర్తించబడవు
 DocType: Pricing Rule,Pricing Rule Help,ధర రూల్ సహాయం
 DocType: Purchase Taxes and Charges,Account Head,ఖాతా హెడ్
 apps/erpnext/erpnext/config/stock.py +163,Update additional costs to calculate landed cost of items,అంశాల దిగిన ఖర్చు లెక్కించేందుకు అదనపు ఖర్చులు అప్డేట్
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Electrical,ఎలక్ట్రికల్
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Electrical,ఎలక్ట్రికల్
 DocType: Stock Entry,Total Value Difference (Out - In),మొత్తం విలువ తేడా (అవుట్ - ఇన్)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,Row {0}: Exchange Rate is mandatory,రో {0}: ఎక్స్చేంజ్ రేట్ తప్పనిసరి
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},వాడుకరి ID ఉద్యోగి సెట్ {0}
@@ -3747,7 +3799,7 @@
 DocType: Item,Customer Code,కస్టమర్ కోడ్
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +210,Birthday Reminder for {0},పుట్టినరోజు రిమైండర్ {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,చివరి ఆర్డర్ నుండి రోజుల్లో
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +292,Debit To account must be a Balance Sheet account,ఖాతాకు డెబిట్ బాలన్స్ షీట్ ఖాతా ఉండాలి
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To account must be a Balance Sheet account,ఖాతాకు డెబిట్ బాలన్స్ షీట్ ఖాతా ఉండాలి
 DocType: Buying Settings,Naming Series,నామకరణ సిరీస్
 DocType: Leave Block List,Leave Block List Name,బ్లాక్ జాబితా వదిలి పేరు
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,స్టాక్ ఆస్తులు
@@ -3759,11 +3811,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 +301,Salary Slip of employee {0} already created for time sheet {1},ఉద్యోగి వేతనం స్లిప్ {0} ఇప్పటికే సమయం షీట్ కోసం సృష్టించబడింది {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +313,Salary Slip of employee {0} already created for time sheet {1},ఉద్యోగి వేతనం స్లిప్ {0} ఇప్పటికే సమయం షీట్ కోసం సృష్టించబడింది {1}
 DocType: Sales Order Item,Ordered Qty,క్రమ ప్యాక్ చేసిన అంశాల
-apps/erpnext/erpnext/stock/doctype/item/item.py +673,Item {0} is disabled,అంశం {0} నిలిపివేయబడింది
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} is disabled,అంశం {0} నిలిపివేయబడింది
 DocType: Stock Settings,Stock Frozen Upto,స్టాక్ ఘనీభవించిన వరకు
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +838,BOM does not contain any stock item,బిఒఎం ఏ స్టాక్ అంశం కలిగి లేదు
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +809,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.,ప్రాజెక్టు చర్య / పని.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,జీతం స్లిప్స్ రూపొందించండి
@@ -3771,23 +3823,24 @@
 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 +485,Row #{0}: Please set reorder quantity,రో # {0}: క్రమాన్ని పరిమాణం సెట్ చెయ్యండి
+DocType: Sales Invoice Timesheet,Billing Hours,బిల్లింగ్ గంటలు
+apps/erpnext/erpnext/stock/doctype/item/item.py +487,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 +62,Please set {0},సెట్ దయచేసి {0}
 DocType: Purchase Invoice,Repeat on Day of Month,నెల రోజు రిపీట్
 DocType: Employee,Health Details,ఆరోగ్యం వివరాలు
 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,పైన ఎంచుకున్న ప్రమాణం కోసం వేతన స్లిప్స్ సమర్పించండి
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} అంశాలు సమకాలీకరించిన
 DocType: Sales Order,Partly Delivered,పాక్షికంగా పంపిణీ
-DocType: Sales Invoice,Existing Customer,ఇప్పటికే కస్టమర్
 DocType: Email Digest,Receivables,పొందింది
+DocType: Lead Source,Lead Source,లీడ్ మూల
 DocType: Customer,Additional information regarding the customer.,కస్టమర్ గురించి అదనపు సమాచారం.
 DocType: Quality Inspection Reading,Reading 5,5 పఠనం
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +38,Campaign Name is required,ప్రచారం పేరు అవసరం
 DocType: Maintenance Visit,Maintenance Date,నిర్వహణ తేదీ
 DocType: Purchase Invoice Item,Rejected Serial No,తిరస్కరించబడిన సీరియల్ లేవు
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +80,Year start date or end date is overlapping with {0}. To avoid please set company,ఇయర్ ప్రారంభ తేదీ లేదా ముగింపు తేదీ {0} ఓవర్ల్యాప్ ఉంది. నివారించేందుకు కంపెనీని స్థాపించారు దయచేసి
@@ -3795,10 +3848,9 @@
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","ఉదాహరణ:. వరుస సెట్ మరియు సీరియల్ లేవు లావాదేవీలు పేర్కొన్నారు చేయకపోతే ABCD #####, అప్పుడు ఆటోమేటిక్ క్రమ సంఖ్య ఈ సిరీస్ ఆధారంగా రూపొందించినవారు ఉంటుంది. మీరు ఎల్లప్పుడు స్పస్టముగా ఈ అంశం కోసం సీరియల్ మేము చెప్పలేదు అనుకొంటే. ఈ ఖాళీ వదిలి."
 DocType: Upload Attendance,Upload Attendance,అప్లోడ్ హాజరు
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +129,BOM and Manufacturing Quantity are required,బిఒఎం అండ్ మానుఫ్యాక్చరింగ్ పరిమాణం అవసరం
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,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,మాక్స్ శక్తి
-DocType: Bank Reconciliation Detail,Amount,మొత్తం
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,బిఒఎం భర్తీ
 ,Sales Analytics,సేల్స్ Analytics
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +113,Available {0},అందుబాటులో {0}
@@ -3806,14 +3858,14 @@
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,ఇమెయిల్ ఏర్పాటు
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +96,Please enter default currency in Company Master,కంపెనీ మాస్టర్ డిఫాల్ట్ కరెన్సీ నమోదు చేయండి
 DocType: Stock Entry Detail,Stock Entry Detail,స్టాక్ ఎంట్రీ వివరాలు
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +100,Daily Reminders,రోజువారీ రిమైండర్లు
+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/account/account_tree.js +23,New Account Name,కొత్త ఖాతా పేరు
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,రా మెటీరియల్స్ పంపినవి ఖర్చు
 DocType: Selling Settings,Settings for Selling Module,మాడ్యూల్ సెల్లింగ్ కోసం సెట్టింగులు
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Customer Service,వినియోగదారుల సేవ
+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/config/hr.py +50,Offer candidate a Job.,ఆఫర్ అభ్యర్థి ఒక జాబ్.
@@ -3822,8 +3874,9 @@
 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} స్టాక్ అంశం ఉండాలి
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,ప్రోగ్రెస్ వేర్హౌస్ డిఫాల్ట్ వర్క్
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1570,Total nos of serial no is not equal to quantity.,సీరియల్ సంఖ్య మొత్తం nos పరిమాణం సమానం కాదు.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1594,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,నవీకరణ సిరీస్ సంఖ్య
@@ -3831,9 +3884,10 @@
 DocType: Sales Order,Printing Details,ప్రింటింగ్ వివరాలు
 DocType: Task,Closing Date,ముగింపు తేదీ
 DocType: Sales Order Item,Produced Quantity,ఉత్పత్తి చేసే పరిమాణం
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Engineer,ఇంజినీర్
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Engineer,ఇంజినీర్
+DocType: Journal Entry,Total Amount Currency,మొత్తం పరిమాణం కరెన్సీ
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,శోధన సబ్ అసెంబ్లీలకు
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Item Code required at Row No {0},Item కోడ్ రో లేవు అవసరం {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +398,Item Code required at Row No {0},Item కోడ్ రో లేవు అవసరం {0}
 DocType: Sales Partner,Partner Type,భాగస్వామి రకం
 DocType: Purchase Taxes and Charges,Actual,వాస్తవ
 DocType: Authorization Rule,Customerwise Discount,Customerwise డిస్కౌంట్
@@ -3849,16 +3903,18 @@
 DocType: BOM,Raw Material Cost,రా మెటీరియల్ ఖర్చు
 DocType: Item Reorder,Re-Order Level,రీ-ఆర్డర్ స్థాయి
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,మీరు ఉత్పత్తి ఆర్డర్లు పెంచడానికి లేదా విశ్లేషణకు ముడి పదార్థాలు డౌన్లోడ్ కోరుకుంటున్న అంశాలు మరియు ప్రణాళిక చేసిన అంశాల ఎంటర్.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +55,Part-time,పార్ట్ టైమ్
+apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,గాంట్ చార్ట్
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,పార్ట్ టైమ్
 DocType: Employee,Applicable Holiday List,వర్తించే హాలిడే జాబితా
 DocType: Employee,Cheque,ప్రిపే
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,సిరీస్ నవీకరించబడింది
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +57,Series Updated,సిరీస్ నవీకరించబడింది
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,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 +87,Clearance Date updated,క్లియరెన్స్ తేదీ నవీకరించబడింది
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,విజయవంతంగా అనుకూలీకరించబడిన
@@ -3872,7 +3928,7 @@
 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 +513,Posting date and posting time is mandatory,తేదీ పోస్ట్ మరియు సమయం పోస్ట్ తప్పనిసరి
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,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.,మీరు కొనుగోలు ఆర్డర్ సేవ్ ఒకసారి వర్డ్స్ కనిపిస్తుంది.
@@ -3882,7 +3938,7 @@
 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/stock/doctype/stock_entry/stock_entry.py +158,Target warehouse in row {0} must be same as Production Order,{0} వరుసగా టార్గెట్ గిడ్డంగి ఉత్పత్తి ఆర్డర్ అదే ఉండాలి
+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,కరెన్సీ కొన్ని ఇతర కరెన్సీ ఉపయోగించి ఎంట్రీలు తరువాత మారలేదు
 DocType: Company,Round Off Account,ఖాతా ఆఫ్ రౌండ్
@@ -3891,23 +3947,22 @@
 DocType: Customer Group,Parent Customer Group,మాతృ కస్టమర్ గ్రూప్
 DocType: Purchase Invoice,Contact Email,సంప్రదించండి ఇమెయిల్
 DocType: Appraisal Goal,Score Earned,స్కోరు సాధించాడు
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Notice Period,నోటీసు కాలం
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,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 +4,New Sales Person Name,న్యూ సేల్స్ పర్సన్ పేరు
 DocType: Packing Slip,Gross Weight UOM,స్థూల బరువు UoM
-DocType: Email Digest,Receivables / Payables,పొందింది / Payables
 DocType: Delivery Note Item,Against Sales Invoice,సేల్స్ వాయిస్ వ్యతిరేకంగా
 DocType: Bin,Reserved Qty for Production,ప్రొడక్షన్ ప్యాక్ చేసిన అంశాల రిసర్వ్డ్
 DocType: Asset,Frequency of Depreciation (Months),అరుగుదల పౌనఃపున్యం (నెలలు)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +469,Credit Account,క్రెడిట్ ఖాతా
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Credit Account,క్రెడిట్ ఖాతా
 DocType: Landed Cost Item,Landed Cost Item,అడుగుపెట్టాయి ఖర్చు అంశం
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +55,Show zero values,సున్నా విలువలు చూపించు
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,సున్నా విలువలు చూపించు
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,అంశం యొక్క మొత్తము ముడి పదార్థాల ఇచ్చిన పరిమాణంలో నుండి repacking / తయారీ తర్వాత పొందిన
 apps/erpnext/erpnext/public/js/setup_wizard.js +315,Setup a simple website for my organization,సెటప్ నా సంస్థ కోసం ఒక సాధారణ వెబ్సైట్
 DocType: Payment Reconciliation,Receivable / Payable Account,స్వీకరించదగిన / చెల్లించవలసిన ఖాతా
 DocType: Delivery Note Item,Against Sales Order Item,అమ్మకాల ఆర్డర్ అంశం వ్యతిరేకంగా
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Please specify Attribute Value for attribute {0},గుణానికి విలువ లక్షణం రాయండి {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},గుణానికి విలువ లక్షణం రాయండి {0}
 DocType: Item,Default Warehouse,డిఫాల్ట్ వేర్హౌస్
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +39,Budget cannot be assigned against Group Account {0},బడ్జెట్ గ్రూప్ ఖాతా వ్యతిరేకంగా కేటాయించిన సాధ్యం కాదు {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,మాతృ ఖర్చు సెంటర్ నమోదు చేయండి
@@ -3929,19 +3984,22 @@
 DocType: Journal Entry,Total Debit,మొత్తం డెబిట్
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,డిఫాల్ట్ తయారైన వస్తువులు వేర్హౌస్
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,సేల్స్ పర్సన్
-DocType: Sales Invoice,Cold Calling,కోల్డ్ కాలింగ్
 DocType: SMS Parameter,SMS Parameter,SMS పారామిత
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,బడ్జెట్ మరియు వ్యయ కేంద్రం
 DocType: Maintenance Schedule Item,Half Yearly,అర్ధవార్షిక
 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","ఎంచుకుంటే, మొత్తం 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.,టర్మ్ ముగింపు తేదీ టర్మ్ ప్రారంభ తేదీ కంటే ముందు ఉండకూడదు. దయచేసి తేదీలు సరిచేసి మళ్ళీ ప్రయత్నించండి.
+DocType: Stock Reconciliation Item,Quantity Difference,పరిమాణం తేడా
 apps/erpnext/erpnext/config/hr.py +253,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 +141,Set as Lost,లాస్ట్ గా సెట్
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,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 +5,This is based on transactions against this Customer. See timeline below for details,ఈ ఈ కస్టమర్ వ్యతిరేకంగా లావాదేవీలు ఆధారంగా. వివరాల కోసం ఈ క్రింది కాలక్రమం చూడండి
 DocType: Supplier,Credit Days Based On,క్రెడిట్ డేస్ ఆధారంగా
@@ -3953,11 +4011,10 @@
 ,Items To Be Requested,అంశాలు అభ్యర్థించిన టు
 DocType: Purchase Order,Get Last Purchase Rate,గత కొనుగోలు రేటు పొందండి
 DocType: Company,Company Info,కంపెనీ సమాచారం
-apps/erpnext/erpnext/accounts/page/pos/pos.js +941,Select or add new customer,ఎంచుకోండి లేదా కొత్త కస్టమర్ జోడించడానికి
+apps/erpnext/erpnext/accounts/page/pos/pos.js +930,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 +5,This is based on the attendance of this Employee,ఈ ఈ ఉద్యోగి హాజరు ఆధారంగా
-DocType: Sales Invoice,Frequency,ఫ్రీక్వెన్సీ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +463,Debit Account,డెబిట్ ఖాతా
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Debit Account,డెబిట్ ఖాతా
 DocType: Fiscal Year,Year Start Date,సంవత్సరం ప్రారంభం తేదీ
 DocType: Attendance,Employee Name,ఉద్యోగి పేరు
 DocType: Sales Invoice,Rounded Total (Company Currency),నున్నటి మొత్తం (కంపెనీ కరెన్సీ)
@@ -3966,27 +4023,27 @@
 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 +210,Supplier Quotation {0} created,సరఫరాదారు కొటేషన్ {0} రూపొందించారు
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +208,Supplier Quotation {0} created,సరఫరాదారు కొటేషన్ {0} రూపొందించారు
 apps/erpnext/erpnext/accounts/report/financial_statements.py +90,End Year cannot be before Start Year,ముగింపు సంవత్సరం ప్రారంభ సంవత్సరం కంటే ముందు ఉండకూడదు
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Employee Benefits,ఉద్యోగుల లాభాల
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,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 +228,Please set a default Holiday List for Employee {0} or Company {1},ఒక డిఫాల్ట్ ఉద్యోగి కోసం హాలిడే జాబితా సెట్ దయచేసి {0} లేదా కంపెనీ {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +232,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 +499,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},రో లేవు {0}: మొత్తం ఖర్చు చెప్పడం {1} వ్యతిరేకంగా మొత్తం పెండింగ్ కంటే ఎక్కువ ఉండకూడదు. పెండింగ్ మొత్తంలో {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +500,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},రో లేవు {0}: మొత్తం ఖర్చు చెప్పడం {1} వ్యతిరేకంగా మొత్తం పెండింగ్ కంటే ఎక్కువ ఉండకూడదు. పెండింగ్ మొత్తంలో {2}
 DocType: Maintenance Schedule,Schedule,షెడ్యూల్
 DocType: Account,Parent Account,మాతృ ఖాతా
 DocType: Quality Inspection Reading,Reading 3,3 పఠనం
 ,Hub,హబ్
 DocType: GL Entry,Voucher Type,ఓచర్ టైప్
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1007,Price List not found or disabled,ధర జాబితా దొరకలేదు లేదా డిసేబుల్ లేదు
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1008,Price List not found or disabled,ధర జాబితా దొరకలేదు లేదా డిసేబుల్ లేదు
 DocType: Expense Claim,Approved,ఆమోదించబడింది
 DocType: Pricing Rule,Price,ధర
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +244,Employee relieved on {0} must be set as 'Left',{0} ఏర్పాటు చేయాలి మీద ఉపశమనం ఉద్యోగి &#39;Left&#39; గా
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +256,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} ఇవ్వబడిన తేదీ పరిధిలో ఉద్యోగి కోసం సృష్టించబడింది
@@ -3997,12 +4054,12 @@
 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 +259,Please select Employee Record first.,మొదటి ఉద్యోగి రికార్డ్ ఎంచుకోండి.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +266,Please select Employee Record first.,మొదటి ఉద్యోగి రికార్డ్ ఎంచుకోండి.
 DocType: POS Profile,Account for Change Amount,మొత్తం చేంజ్ ఖాతా
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +190,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},రో {0}: పార్టీ / ఖాతాతో సరిపోలడం లేదు {1} / {2} లో {3} {4}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +235,Please enter Expense Account,ఖర్చుల ఖాతాను నమోదు చేయండి
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,Please enter Expense Account,ఖర్చుల ఖాతాను నమోదు చేయండి
 DocType: Account,Stock,స్టాక్
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,"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 +976,"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,కొనుగోలు / తయారీ వివరాలు
@@ -4017,9 +4074,10 @@
 DocType: Asset Movement,Transaction Date,లావాదేవీ తేదీ
 DocType: Production Plan Item,Planned Qty,అనుకున్న ప్యాక్ చేసిన అంశాల
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,మొత్తం పన్ను
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,For Quantity (Manufactured Qty) is mandatory,పరిమాణం (ప్యాక్ చేసిన అంశాల తయారు) తప్పనిసరి
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,For Quantity (Manufactured Qty) is mandatory,పరిమాణం (ప్యాక్ చేసిన అంశాల తయారు) తప్పనిసరి
 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 +78,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,వాస్తవ ప్రారంభ తేదీ
@@ -4034,9 +4092,11 @@
 DocType: Warranty Claim,If different than customer address,కస్టమర్ చిరునామా కంటే వివిధ ఉంటే
 DocType: BOM Operation,BOM Operation,బిఒఎం ఆపరేషన్
 DocType: Purchase Taxes and Charges,On Previous Row Amount,మునుపటి రో మొత్తం మీద
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +226,Transfer Asset,ట్రాన్స్ఫర్ ఆస్తి
+DocType: Student,Home Address,హోం చిరునామా
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +227,Transfer Asset,ట్రాన్స్ఫర్ ఆస్తి
 DocType: POS Profile,POS Profile,POS ప్రొఫైల్
 apps/erpnext/erpnext/config/schools.py +33,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 +129,"Item {0} is a template, please select one of its variants","{0} అంశం ఒక టెంప్లేట్, దాని వైవిధ్యాలు ఒకటి ఎంచుకోండి దయచేసి"
 DocType: Asset,Asset Category,ఆస్తి వర్గం
@@ -4046,8 +4106,8 @@
 DocType: Assessment,Room,గది
 DocType: Purchase Order,Advance Paid,అడ్వాన్స్ చెల్లింపు
 DocType: Item,Item Tax,అంశం పన్ను
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +765,Material to Supplier,సరఫరాదారు మెటీరియల్
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +189,Excise Invoice,ఎక్సైజ్ వాయిస్
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,Material to Supplier,సరఫరాదారు మెటీరియల్
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,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,ప్రస్తుత బాధ్యతలు
@@ -4057,7 +4117,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,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 +136,Credit Card,క్రెడిట్ కార్డ్
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,క్రెడిట్ కార్డ్
 DocType: BOM,Item to be manufactured or repacked,అంశం తయారు లేదా repacked వుంటుంది
 apps/erpnext/erpnext/config/stock.py +174,Default settings for stock transactions.,స్టాక్ లావాదేవీలకు డిఫాల్ట్ సెట్టింగులను.
 DocType: Purchase Invoice,Next Date,తదుపరి తేదీ
@@ -4065,6 +4125,7 @@
 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: Academic Term,Term End Date,టర్మ్ ముగింపు తేదీ
 DocType: Hub Settings,Seller Name,విక్రేత పేరు
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),పన్నులు మరియు ఆరోపణలు తగ్గించబడుతూ (కంపెనీ కరెన్సీ)
 DocType: Item Group,General Settings,సాధారణ సెట్టింగులు
@@ -4076,7 +4137,7 @@
 DocType: Customer,Commission Rate,కమిషన్ రేటు
 apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,వేరియంట్ చేయండి
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,శాఖ బ్లాక్ సెలవు అప్లికేషన్లు.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +115,"Payment Type must be one of Receive, Pay and Internal Transfer","చెల్లింపు పద్ధతి, స్వీకరించండి ఒకటి ఉండాలి చెల్లించండి మరియు అంతర్గత బదిలీ"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +118,"Payment Type must be one of Receive, Pay and Internal Transfer","చెల్లింపు పద్ధతి, స్వీకరించండి ఒకటి ఉండాలి చెల్లించండి మరియు అంతర్గత బదిలీ"
 apps/erpnext/erpnext/config/selling.py +169,Analytics,విశ్లేషణలు
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,కార్ట్ ఖాళీగా ఉంది
 DocType: Production Order,Actual Operating Cost,వాస్తవ ఆపరేటింగ్ వ్యయం
@@ -4091,10 +4152,10 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,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 +92,Designer,డిజైనర్
+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/accounts/doctype/purchase_invoice/purchase_invoice.py +469,Cost Center is required in row {0} in Taxes table for type {1},రకం కోసం ఖర్చు సెంటర్ వరుసగా అవసరం {0} పన్నులు పట్టిక {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +472,Cost Center is required in row {0} in Taxes table for type {1},రకం కోసం ఖర్చు సెంటర్ వరుసగా అవసరం {0} పన్నులు పట్టిక {1}
 DocType: Program,Program Code,ప్రోగ్రామ్ కోడ్
 ,Item-wise Purchase Register,అంశం వారీగా కొనుగోలు నమోదు
 DocType: Batch,Expiry Date,గడువు తీరు తేదీ
@@ -4104,12 +4165,12 @@
 apps/erpnext/erpnext/config/projects.py +13,Project master.,ప్రాజెక్టు మాస్టర్.
 apps/erpnext/erpnext/controllers/status_updater.py +174,"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 +417, (Half Day),(హాఫ్ డే)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425, (Half Day),(హాఫ్ డే)
 DocType: Supplier,Credit Days,క్రెడిట్ డేస్
 DocType: Leave Type,Is Carry Forward,ఫార్వర్డ్ కారి ఉంటుంది
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +740,Get Items from BOM,బిఒఎం నుండి అంశాలు పొందండి
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +711,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 +549,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},రో # {0}: తేదీ పోస్టింగ్ కొనుగోలు తేదీని అదే ఉండాలి {1} ఆస్తి యొక్క {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +552,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,మరొక గిడ్డంగి నుండి ఒక ఆస్తి బదిలీ
diff --git a/erpnext/translations/th.csv b/erpnext/translations/th.csv
index a5872a1..5b50def 100644
--- a/erpnext/translations/th.csv
+++ b/erpnext/translations/th.csv
@@ -18,11 +18,10 @@
 DocType: Sales Partner,Dealer,เจ้ามือ
 DocType: Employee,Rented,เช่า
 DocType: Purchase Order,PO-,PO-
-apps/erpnext/erpnext/accounts/report/financial_statements.py +19,Start Year {0} not found.,เริ่มต้นปี {0} ไม่พบ
 DocType: POS Profile,Applicable for User,ใช้งานได้สำหรับผู้ใช้
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +191,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",หยุดใบสั่งผลิตไม่สามารถยกเลิกจุกมันเป็นครั้งแรกที่จะยกเลิก
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +197,Do you really want to scrap this asset?,คุณไม่อยากที่จะทิ้งสินทรัพย์นี้?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +17,Select Default Supplier,เลือกผู้ผลิตเริ่มต้น
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +192,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",หยุดใบสั่งผลิตไม่สามารถยกเลิกจุกมันเป็นครั้งแรกที่จะยกเลิก
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +198,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 +36,Currency is required for Price List {0},สกุลเงินเป็นสิ่งจำเป็นสำหรับราคา {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* จะได้รับการคำนวณขณะการทำธุรกรรม
 DocType: Address,County,เขต
@@ -42,46 +41,45 @@
 DocType: Sales Invoice,Customer Name,ชื่อลูกค้า
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +126,Bank account cannot be named as {0},บัญชีธนาคารไม่สามารถตั้งชื่อเป็น {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,หัว (หรือกลุ่ม) กับบัญชีรายการที่จะทำและจะรักษายอด
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +180,Outstanding for {0} cannot be less than zero ({1}),ที่โดดเด่นสำหรับ {0} ไม่ สามารถน้อยกว่า ศูนย์ ( {1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,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 +148,Series Updated Successfully,ชุด ล่าสุด ที่ประสบความสำเร็จ
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +149,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,ติดต่อผู้ผลิตทั้งหมด
-DocType: Quality Inspection Reading,Parameter,พารามิเตอร์
 apps/erpnext/erpnext/projects/doctype/project/project.py +54,Expected End Date can not be less than Expected Start Date,คาดว่าวันที่สิ้นสุดไม่สามารถจะน้อยกว่าที่คาดว่าจะเริ่มวันที่
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,แถว # {0}: ให้คะแนนจะต้องเป็นเช่นเดียวกับ {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +239,New Leave Application,แอพลิเคชันออกใหม่
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,New Leave Application,แอพลิเคชันออกใหม่
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +20,Attendance Record {0} exists against Student {1} for Course Schedule {2},ผู้เข้าร่วมบันทึก {0} อยู่กับนักศึกษา {1} สำหรับตารางเรียน {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Bank Draft,ตั๋วแลกเงิน
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,ตั๋วแลกเงิน
 DocType: Mode of Payment Account,Mode of Payment Account,โหมดของการบัญชีการชำระเงิน
 apps/erpnext/erpnext/stock/doctype/item/item.js +52,Show Variants,แสดงหลากหลายรูปแบบ
 DocType: Academic Term,Academic Term,ระยะทางวิชาการ
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +13,Material,วัสดุ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Quantity,จำนวน
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +511,Accounts table cannot be blank.,ตารางบัญชีต้องไม่ว่างเปล่า
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +616,Quantity,จำนวน
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +512,Accounts table cannot be blank.,ตารางบัญชีต้องไม่ว่างเปล่า
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,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/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 +142,User {0} is already assigned to Employee {1},ผู้ใช้ {0} จะถูก กำหนดให้กับ พนักงาน {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,การดูแลสุขภาพ
-DocType: Purchase Invoice,Monthly,รายเดือน
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),ความล่าช้าในการชำระเงิน (วัน)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +771,Invoice,ใบกำกับสินค้า
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +750,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 +198,Row {0}: {1} {2} does not match with {3},แถว {0}: {1} {2} ไม่ตรงกับ {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,แถว # {0}:
+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 +127,Please select Price List,เลือกรายชื่อราคา
@@ -112,8 +110,8 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,บริษัท เดียวกันจะเข้ามามากกว่าหนึ่งครั้ง
 DocType: Employee,Married,แต่งงาน
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},ไม่อนุญาตสำหรับ {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +589,Get items from,รับรายการจาก
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +382,Stock cannot be updated against Delivery Note {0},หุ้น ไม่สามารถปรับปรุง กับ การจัดส่งสินค้า หมายเหตุ {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,รับรายการจาก
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,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,ร้านขายของชำ
@@ -122,7 +120,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 +156,Salary Structure Missing,โครงสร้างเงินเดือนที่ขาดหายไป
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Salary Structure Missing,โครงสร้างเงินเดือนที่ขาดหายไป
 DocType: Lead,Person Name,คนที่ชื่อ
 DocType: Sales Invoice Item,Sales Invoice Item,รายการใบแจ้งหนี้การขาย
 DocType: Account,Credit,เครดิต
@@ -130,31 +128,31 @@
 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 +156,Credit limit has been crossed for customer {0} {1}/{2},วงเงินสินเชื่อที่ได้รับการข้ามสำหรับลูกค้า {0} {1} / {2}
-apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",&quot;คือสินทรัพย์ถาวร&quot; ไม่สามารถถูกตรวจสอบเป็นบันทึกสินทรัพย์ที่มีอยู่กับรายการ
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +189,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; ไม่สามารถถูกตรวจสอบเป็นบันทึกสินทรัพย์ที่มีอยู่กับรายการ
 DocType: Tax Rule,Tax Type,ประเภทภาษี
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +144,You are not authorized to add or update entries before {0},คุณยังไม่ได้ รับอนุญาตให้ เพิ่มหรือปรับปรุง รายการ ก่อนที่ {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},คุณยังไม่ได้ รับอนุญาตให้ เพิ่มหรือปรับปรุง รายการ ก่อนที่ {0}
 DocType: Item,Item Image (if not slideshow),รูปภาพสินค้า (ถ้าไม่สไลด์โชว์)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,ลูกค้าที่มีอยู่ ที่มีชื่อเดียวกัน
-DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(ชั่วโมงอัตราค่าโทร / 60) * เวลาการดำเนินงานที่เกิดขึ้นจริง
+DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(อัตราค่าแรง / 60) * เวลาการดำเนินงานที่เกิดขึ้นจริง
 DocType: SMS Log,SMS Log,เข้าสู่ระบบ SMS
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,ค่าใช้จ่ายในการจัดส่งสินค้า
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,วันหยุดในวันที่ {0} ไม่ได้ระหว่างนับจากวันและวันที่
 DocType: Student Log,Student Log,เข้าสู่ระบบนักศึกษา
 DocType: Quality Inspection,Get Specification Details,ดูรายละเอียดสเปค
 DocType: Lead,Interested,สนใจ
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +165,Opening,การเปิด
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,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/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ลูกค้า&gt; กลุ่มลูกค้า&gt; ดินแดน
 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.,บัญชี กับการทำธุรกรรม ที่มีอยู่ ไม่สามารถ แปลงเป็น กลุ่ม
 DocType: Lead,Product Enquiry,สอบถามสินค้า
 DocType: Academic Term,Schools,โรงเรียน
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,กรุณากรอก บริษัท แรก
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Company first,กรุณาเลือก บริษัท แรก
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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,ค่าใช้จ่ายรวม
@@ -164,7 +162,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,งบบัญชี
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,ยา
 DocType: Purchase Invoice Item,Is Fixed Asset,เป็นสินทรัพย์ถาวร
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Available qty is {0}, you need {1}",จำนวนที่มีอยู่ {0} คุณต้อง {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +225,"Available qty is {0}, you need {1}",จำนวนที่มีอยู่ {0} คุณต้อง {1}
 DocType: Expense Claim Detail,Claim Amount,จำนวนการเรียกร้อง
 DocType: Employee,Mr,นาย
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,ประเภท ผู้ผลิต / ผู้จัดจำหน่าย
@@ -173,26 +171,27 @@
 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: Assessment Result,Grade,เกรด
 DocType: Sales Invoice Item,Delivered By Supplier,จัดส่งโดยผู้ผลิต
 DocType: SMS Center,All Contact,ติดต่อทั้งหมด
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Annual Salary,เงินเดือนประจำปี
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,ค่าใช้จ่ายใน สต็อก
-apps/erpnext/erpnext/accounts/report/financial_statements.py +22,End Year {0} not found.,สิ้นปี {0} ไม่พบ
 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}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,วัตถุดิบสำหรับการซื้อวัสดุสิ้นเปลือง
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +130,At least one mode of payment is required for POS invoice.,อย่างน้อยหนึ่งโหมดการชำระเงินเป็นสิ่งจำเป็นสำหรับใบแจ้งหนี้ POS
 DocType: Products Settings,Show Products as a List,แสดงผลิตภัณฑ์ที่เป็นรายการ
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","ดาวน์โหลดแม่แบบกรอกข้อมูลที่เหมาะสมและแนบไฟล์ที่ถูกแก้ไข
  ทุกวันและการรวมกันของพนักงานในระยะเวลาที่เลือกจะมาในแม่แบบที่มีการบันทึกการเข้าร่วมที่มีอยู่"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +451,Item {0} is not active or end of life has been reached,รายการที่ {0} ไม่ได้ใช้งาน หรือจุดสิ้นสุดของ ชีวิต ได้ถึง
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +456,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/controllers/accounts_controller.py +614,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",จะรวมถึง ภาษี ในแถว {0} ใน อัตรา รายการ ภาษี ใน แถว {1} จะต้องรวม
+apps/erpnext/erpnext/controllers/accounts_controller.py +617,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",จะรวมถึง ภาษี ในแถว {0} ใน อัตรา รายการ ภาษี ใน แถว {1} จะต้องรวม
 apps/erpnext/erpnext/config/hr.py +166,Settings for HR Module,การตั้งค่าสำหรับ โมดูล ทรัพยากรบุคคล
 DocType: SMS Center,SMS Center,ศูนย์ SMS
 DocType: Sales Invoice,Change Amount,เปลี่ยนจำนวน
@@ -204,13 +203,13 @@
 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 +147,Execution,การปฏิบัติ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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,รายการและราคา
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},ชั่วโมงรวม: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},จากวันที่ควรจะเป็นภายในปีงบประมาณ สมมติว่าตั้งแต่วันที่ = {0}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,Cost Center {0} does not belong to Company {1},ศูนย์ต้นทุน {0} ไม่ได้เป็นของ บริษัท {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +100,Cost Center {0} does not belong to Company {1},ศูนย์ต้นทุน {0} ไม่ได้เป็นของ บริษัท {1}
 DocType: Customer,Individual,บุคคล
 DocType: Interest,Academics User,นักวิชาการผู้ใช้
 DocType: Cheque Print Template,Amount In Figure,จำนวนเงินในรูปที่
@@ -226,30 +225,32 @@
 DocType: Production Planning Tool,Sales Orders,ใบสั่งขาย
 DocType: Purchase Taxes and Charges,Valuation,การประเมินค่า
 ,Purchase Order Trends,แนวโน้มการสั่งซื้อ
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,The request for quotation can be accessed by clicking on the following link,การขอใบเสนอราคาสามารถเข้าถึงได้โดยการคลิกที่ลิงค์ต่อไปนี้
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,จัดสรรใบสำหรับปี
 DocType: SG Creation Tool Course,SG Creation Tool Course,SG หลักสูตรการสร้างเครื่องมือ
 DocType: Student Group Creation Tool,Leave blank if you wish to fetch all courses for selected academic term,เว้นว่างไว้ถ้าคุณต้องการที่จะดึงข้อมูลทุกหลักสูตรระยะทางวิชาการที่เลือก
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,Insufficient Stock,ไม่เพียงพอที่แจ้ง
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227,Insufficient Stock,ไม่เพียงพอที่แจ้ง
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,การวางแผนความจุปิดการใช้งานและการติดตามเวลา
+DocType: Email Digest,New Sales Orders,คำสั่งขายใหม่
 DocType: Bank Reconciliation,Bank Account,บัญชีเงินฝาก
 DocType: Leave Type,Allow Negative Balance,อนุญาตให้ยอดคงเหลือติดลบ
 DocType: Selling Settings,Default Territory,ดินแดนเริ่มต้น
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,โทรทัศน์
 DocType: Production Order Operation,Updated via 'Time Log',ปรับปรุงแล้วทาง 'บันทึกเวลา'
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} does not belong to Company {1},บัญชี {0} ไม่ได้เป็นของ บริษัท {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +86,Account {0} does not belong to Company {1},บัญชี {0} ไม่ได้เป็นของ บริษัท {1}
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},จำนวนเงินล่วงหน้าไม่สามารถจะสูงกว่า {0} {1}
 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 +174,For Warehouse is required before Submit,สำหรับ คลังสินค้า จะต้อง ก่อนที่จะ ส่ง
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,For Warehouse is required before Submit,สำหรับ คลังสินค้า จะต้อง ก่อนที่จะ ส่ง
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,ที่ได้รับใน
 DocType: Sales Partner,Reseller,ผู้ค้าปลีก
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,กรุณาใส่ บริษัท
 DocType: Delivery Note Item,Against Sales Invoice Item,กับใบแจ้งหนี้การขายสินค้า
 ,Production Orders in Progress,สั่งซื้อ การผลิตใน ความคืบหน้า
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Cash from Financing,เงินสดสุทธิจากการจัดหาเงินทุน
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1436,"LocalStorage is full , did not save",LocalStorage เต็มไม่ได้บันทึก
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1460,"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}
@@ -262,18 +263,19 @@
 apps/erpnext/erpnext/templates/generators/item.html +78,No description given,ให้ คำอธิบาย
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,ขอซื้อ
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +5,This is based on the Time Sheets created against this project,นี้จะขึ้นอยู่กับแผ่น Time ที่สร้างขึ้นกับโครงการนี้
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Only the selected Leave Approver can submit this Leave Application,เพียง เลือก ผู้อนุมัติ ออกสามารถส่ง ออกจาก โปรแกรมนี้
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +213,Only the selected Leave Approver can submit this Leave Application,เพียง เลือก ผู้อนุมัติ ออกสามารถส่ง ออกจาก โปรแกรมนี้
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,บรรเทา วันที่ ต้องมากกว่า วันที่ เข้าร่วม
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Leaves per Year,ใบต่อปี
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,ใบต่อปี
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,แถว {0}: โปรดตรวจสอบ 'เป็นล่วงหน้า' กับบัญชี {1} ถ้านี้เป็นรายการล่วงหน้า
 apps/erpnext/erpnext/stock/utils.py +188,Warehouse {0} does not belong to company {1},คลังสินค้า {0} ไม่ได้เป็นของ บริษัท {1}
+DocType: Email Digest,Profit & Loss,กำไรขาดทุน
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,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 +435,Leave Blocked,ฝากที่ถูกบล็อก
-apps/erpnext/erpnext/stock/doctype/item/item.py +669,Item {0} has reached its end of life on {1},รายการ {0} ได้ ถึงจุดสิ้นสุด ของ ชีวิตบน {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +443,Leave Blocked,ฝากที่ถูกบล็อก
+apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item {0} has reached its end of life on {1},รายการ {0} ได้ ถึงจุดสิ้นสุด ของ ชีวิตบน {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +95,Bank Entries,รายการธนาคาร
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +83,Annual,ประจำปี
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +86,Annual,ประจำปี
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,สต็อกสินค้าสมานฉันท์
 DocType: Stock Entry,Sales Invoice No,ขายใบแจ้งหนี้ไม่มี
 DocType: Material Request Item,Min Order Qty,จำนวนสั่งซื้อขั้นต่ำ
@@ -281,20 +283,22 @@
 DocType: Lead,Do Not Contact,ไม่ ติดต่อ
 apps/erpnext/erpnext/public/js/setup_wizard.js +360,People who teach at your organisation,คนที่สอนในองค์กรของคุณ
 DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,ID ไม่ซ้ำกันสำหรับการติดตามใบแจ้งหนี้ที่เกิดขึ้นทั้งหมด มันถูกสร้างขึ้นเมื่อส่ง
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Software Developer,นักพัฒนาซอฟต์แวร์
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,นักพัฒนาซอฟต์แวร์
 DocType: Item,Minimum Order Qty,จำนวนสั่งซื้อขั้นต่ำ
 DocType: Pricing Rule,Supplier Type,ประเภทผู้ผลิต
 DocType: Scheduling Tool,Course Start Date,แน่นอนวันที่เริ่มต้น
 DocType: Item,Publish in Hub,เผยแพร่ใน Hub
+DocType: Student Admission,Student Admission,การรับสมัครนักศึกษา
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is cancelled,รายการ {0} จะถูกยกเลิก
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Material Request,ขอวัสดุ
+apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} is cancelled,รายการ {0} จะถูกยกเลิก
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +823,Material Request,ขอวัสดุ
 DocType: Bank Reconciliation,Update Clearance Date,อัพเดทวันที่ Clearance
 apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +28,Abbreviation already used for another salary component,ชื่อย่อใช้แล้วสำหรับองค์ประกอบเงินเดือนอีก
 DocType: Item,Purchase Details,รายละเอียดการซื้อ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +328,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},รายการ {0} ไม่พบใน &#39;วัตถุดิบมา&#39; ตารางในการสั่งซื้อ {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +333,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},รายการ {0} ไม่พบใน &#39;วัตถุดิบมา&#39; ตารางในการสั่งซื้อ {1}
 DocType: Employee,Relation,ความสัมพันธ์
 DocType: Shipping Rule,Worldwide Shipping,การจัดส่งสินค้าทั่วโลก
+DocType: Student Guardian,Mother,แม่
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,คำสั่งซื้อได้รับการยืนยันจากลูกค้า
 DocType: Purchase Receipt Item,Rejected Quantity,จำนวนปฏิเสธ
 DocType: SMS Settings,SMS Sender Name,ส่ง SMS ชื่อ
@@ -310,20 +314,21 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +130,Please select Charge Type first,กรุณาเลือก ประเภท ค่าใช้จ่าย ครั้งแรก
 DocType: Student Group Student,Student Group Student,นักศึกษากลุ่ม
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,ล่าสุด
+DocType: Email Digest,New Quotations,ใบเสนอราคาใหม่
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,อนุมัติไว้ครั้งแรกในรายการจะถูกกำหนดเป็นค่าเริ่มต้นอนุมัติไว้
 DocType: Tax Rule,Shipping County,การจัดส่งสินค้าเคาน์ตี้
 apps/erpnext/erpnext/config/desktop.py +158,Learn,เรียนรู้
 DocType: Asset,Next Depreciation Date,ถัดไปวันที่ค่าเสื่อมราคา
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,ค่าใช้จ่ายในกิจกรรมต่อพนักงาน
 DocType: Accounts Settings,Settings for Accounts,การตั้งค่าสำหรับบัญชี
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +626,Supplier Invoice No exists in Purchase Invoice {0},ผู้ผลิตใบแจ้งหนี้ไม่มีอยู่ในการซื้อใบแจ้งหนี้ {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +629,Supplier Invoice No exists in Purchase Invoice {0},ผู้ผลิตใบแจ้งหนี้ไม่มีอยู่ในการซื้อใบแจ้งหนี้ {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,จัดการ คนขาย ต้นไม้
 DocType: Job Applicant,Cover Letter,จดหมาย
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,เช็คที่โดดเด่นและเงินฝากที่จะล้าง
 DocType: Item,Synced With Hub,ซิงค์กับฮับ
-apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,รหัสผ่านผิด
+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 +348,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 +86,Circular Reference Error,ข้อผิดพลาดในการอ้างอิงแบบวงกลม
@@ -335,15 +340,16 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,แจ้งทางอีเมล์เมื่อการสร้างการร้องขอวัสดุโดยอัตโนมัติ
 DocType: Journal Entry,Multi Currency,หลายสกุลเงิน
 DocType: Payment Reconciliation Invoice,Invoice Type,ประเภทใบแจ้งหนี้
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +806,Delivery Note,หมายเหตุจัดส่งสินค้า
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +800,Delivery Note,หมายเหตุจัดส่งสินค้า
 apps/erpnext/erpnext/config/learn.py +87,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 +233,Payment Entry has been modified after you pulled it. Please pull it again.,เข้าชำระเงินได้รับการแก้ไขหลังจากที่คุณดึงมัน กรุณาดึงมันอีกครั้ง
+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/setup/doctype/email_digest/email_digest.py +104,Summary for this week and pending activities,สรุปในสัปดาห์นี้และกิจกรรมที่ค้างอยู่
+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",ใส่หมายเลขอีเมลคั่นด้วยเครื่องหมายจุลภาคใบแจ้งหนี้จะถูกส่งโดยอัตโนมัติในวันที่เจาะจง
 DocType: Employee,Company Email,อีเมล์ บริษัท
@@ -355,28 +361,29 @@
 apps/erpnext/erpnext/config/hr.py +186,"Employee designation (e.g. CEO, Director etc.).",การแต่งตั้ง พนักงาน ของคุณ (เช่น ซีอีโอ ผู้อำนวยการ ฯลฯ )
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,กรุณากรอก ' ทำซ้ำ ในวัน เดือน ' ค่าของฟิลด์
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,อัตราที่สกุลเงินลูกค้าจะแปลงเป็นสกุลเงินหลักของลูกค้า
-apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},แถว # {0}: ซื้อใบแจ้งหนี้ไม่สามารถทำกับเนื้อหาที่มีอยู่ {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +554,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},แถว # {0}: ซื้อใบแจ้งหนี้ไม่สามารถทำกับเนื้อหาที่มีอยู่ {1}
 DocType: Item Tax,Tax Rate,อัตราภาษี
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} จัดสรรแล้วสำหรับพนักงาน {1} สำหรับรอบระยะเวลา {2} เป็น {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +812,Select Item,เลือกรายการ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +791,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/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,ซื้อ ใบแจ้งหนี้ {0} มีการส่ง แล้ว
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},แถว # {0}: รุ่นที่ไม่มีจะต้องเป็นเช่นเดียวกับ {1} {2}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +143,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.,แบทช์ (มาก) ของรายการ
 DocType: C-Form Invoice Detail,Invoice Date,วันที่ออกใบแจ้งหนี้
 DocType: GL Entry,Debit Amount,จำนวนเงินเดบิต
 apps/erpnext/erpnext/accounts/party.py +242,There can only be 1 Account per Company in {0} {1},มีเพียงสามารถเป็น 1 บัญชีต่อ บริษัท {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +4,Your email address,ที่อยู่ อีเมลของคุณ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +342,Please see attachment,โปรดดูสิ่งที่แนบมา
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,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 +19,Setup Already Complete!!,การติดตั้ง เสร็จสมบูรณ์ แล้ว !
 ,Finished Goods,สินค้า สำเร็จรูป
 DocType: Delivery Note,Instructions,คำแนะนำ
 DocType: Quality Inspection,Inspected By,การตรวจสอบโดย
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,ผู้ผลิต&gt; ประเภทผู้ผลิต
 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,เพิ่มรายการ
@@ -390,29 +397,29 @@
 DocType: Currency Exchange,Currency Exchange,แลกเปลี่ยนเงินตรา
 DocType: Purchase Invoice Item,Item Name,ชื่อรายการ
 DocType: Authorization Rule,Approving User  (above authorized value),อนุมัติผู้ใช้ (สูงกว่าค่าที่ได้รับอนุญาต)
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,เครดิตบาลานซ์
+DocType: Email Digest,Credit Balance,เครดิตบาลานซ์
 DocType: Employee,Widowed,เป็นม่าย
 DocType: Request for Quotation,Request for Quotation,ขอใบเสนอราคา
 DocType: Salary Slip Timesheet,Working Hours,เวลาทำงาน
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,เปลี่ยนหมายเลขลำดับเริ่มต้น / ปัจจุบันของชุดที่มีอยู่
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.",ถ้ากฎการกำหนดราคาหลายยังคงเหนือกว่าผู้ใช้จะขอให้ตั้งลำดับความสำคัญด้วยตนเองเพื่อแก้ไขความขัดแย้ง
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +736,Purchase Return,ซื้อกลับ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +715,Purchase Return,ซื้อกลับ
 ,Purchase Register,สั่งซื้อสมัครสมาชิก
 DocType: Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,ค่าใช้จ่าย
 DocType: Workstation,Consumable Cost,ค่าใช้จ่ายที่ สิ้นเปลือง
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +202,{0} ({1}) must have role 'Leave Approver',{0} ({1}) จะต้องมีบทบาท 'ออกอนุมัติ'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,{0} ({1}) must have role 'Leave Approver',{0} ({1}) จะต้องมีบทบาท 'ออกอนุมัติ'
 DocType: Purchase Receipt,Vehicle Date,วันที่ยานพาหนะ
 DocType: Student Log,Medical,การแพทย์
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,เหตุผล สำหรับการสูญเสีย
-apps/erpnext/erpnext/accounts/utils.py +239,Allocated amount can not greater than unadjusted amount,จำนวนเงินที่จัดสรรไม่สามารถมากกว่าจำนวนเท็มเพลต
+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,จำนวนเงินที่จัดสรรไม่สามารถมากกว่าจำนวนเท็มเพลต
 DocType: Announcement,Receiver,ผู้รับ
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},เวิร์คสเตชั่จะปิดทำการในวันที่ต่อไปนี้เป็นรายชื่อต่อวันหยุด: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,โอกาส
 DocType: Employee,Single,เดียว
 DocType: Account,Cost of Goods Sold,ค่าใช้จ่ายของ สินค้าที่ขาย
 DocType: Purchase Invoice,Yearly,ประจำปี
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +225,Please enter Cost Center,กรุณาใส่ ศูนย์ต้นทุน
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,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,ชื่อผู้ตรวจสอบ
@@ -425,26 +432,26 @@
 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,ผู้ตรวจสอบใบแจ้งหนี้จำนวนเอกลักษณ์
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',&#39;to คดีหมายเลข&#39; ไม่สามารถจะน้อยกว่า &#39;จากคดีหมายเลข&#39;
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,Non Profit,องค์กรไม่แสวงหากำไร
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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: Stock Reconciliation Item,Do not include symbols (ex. $),ไม่รวมถึงสัญลักษณ์ (อดีต. $)
 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 +638,Attribute {0} selected multiple times in Attributes Table,แอตทริบิวต์ {0} เลือกหลายครั้งในคุณสมบัติตาราง
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,แอตทริบิวต์ {0} เลือกหลายครั้งในคุณสมบัติตาราง
 DocType: HR Settings,Employee record is created using selected field. ,ระเบียนของพนักงานจะถูกสร้างขึ้นโดยใช้เขตข้อมูลที่เลือก
 DocType: Sales Order,Not Applicable,ไม่สามารถใช้งาน
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,นาย ฮอลิเดย์
 DocType: Request for Quotation Item,Required Date,วันที่ที่ต้องการ
 DocType: Delivery Note,Billing Address,ที่อยู่การเรียกเก็บเงิน
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +862,Please enter Item Code.,กรุณากรอก รหัสสินค้า
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +847,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",หากการตรวจสอบจำนวนเงินภาษีจะถือว่าเป็นรวมอยู่ในอัตราพิมพ์ / จำนวนพิมพ์
@@ -458,12 +465,12 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,หลักทรัพย์และ เงินฝาก
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,ใบรวมจัดสรรมีผลบังคับใช้
 DocType: Job Opening,Description of a Job Opening,คำอธิบายของการเปิดงาน
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Pending activities for today,ที่รอดำเนินการกิจกรรมสำหรับวันนี้
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,ที่รอดำเนินการกิจกรรมสำหรับวันนี้
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,บันทึกการเข้าร่วมประชุม
 DocType: Salary Structure,Salary Component for timesheet based payroll.,ตัวแทนเงินเดือนสำหรับ timesheet ตามบัญชีเงินเดือน
 DocType: Sales Order Item,Used for Production Plan,ที่ใช้ในการวางแผนการผลิต
 DocType: Manufacturing Settings,Time Between Operations (in mins),เวลาระหว่างการดำเนินงาน (ในนาที)
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +92,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} งบประมาณสำหรับบัญชี {1} กับศูนย์ต้นทุน {2} คือ {3} มันจะเกินโดย {4}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +95,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} งบประมาณสำหรับบัญชี {1} กับศูนย์ต้นทุน {2} คือ {3} มันจะเกินโดย {4}
 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 ที่เลือกไม่ได้สำหรับรายการเดียวกัน
@@ -471,16 +478,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +238,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 +86,Administrative Officer,พนักงานธุรการ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,พนักงานธุรการ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +23,Acutal Qty {0} / Waiting Qty {1},acutal จำนวน {0} / รอจำนวน {1}
 DocType: Timesheet Detail,Hrs,ชั่วโมง
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +319,Please select Company,กรุณาเลือก บริษัท
-DocType: Stock Entry,Difference Account,บัญชี ที่แตกต่างกัน
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +309,Please select Company,กรุณาเลือก บริษัท
+DocType: Stock Entry Detail,Difference Account,บัญชี ที่แตกต่างกัน
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,ไม่สามารถปิดงานเป็นงานขึ้นอยู่กับ {0} ไม่ได้ปิด
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Please enter Warehouse for which Material Request will be raised,กรุณากรอก คลังสินค้า ที่ ขอ วัสดุ จะ ได้รับการเลี้ยงดู
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +399,Please enter Warehouse for which Material Request will be raised,กรุณากรอก คลังสินค้า ที่ ขอ วัสดุ จะ ได้รับการเลี้ยงดู
 DocType: Production Order,Additional Operating Cost,เพิ่มเติมต้นทุนการดำเนินงาน
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,เครื่องสำอาง
-apps/erpnext/erpnext/stock/doctype/item/item.py +530,"To merge, following properties must be same for both items",ที่จะ ผสาน คุณสมบัติต่อไปนี้ จะต้อง เหมือนกันสำหรับ ทั้งสองรายการ
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,"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 +28,Buy,ซื้อ
@@ -488,7 +495,7 @@
 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 +1563,Serial no item cannot be a fraction,อนุกรมไม่มีรายการไม่สามารถเป็นเศษส่วน
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1587,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,รับเหมาช่วงการจัดการ
@@ -497,13 +504,14 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Account {0} does not belong to company: {1},บัญชี {0} ไม่ได้เป็นของ บริษัท : {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation already used for another company,ชื่อย่อที่ใช้แล้วสำหรับ บริษัท อื่น
 DocType: Selling Settings,Default Customer Group,กลุ่มลูกค้าเริ่มต้น
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Supplier is required against Payable account {0},ผู้ผลิตจะต้องต่อบัญชีเจ้าหนี้ {0}
 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
 DocType: Production Planning Tool,Material Requirement,ความต้องการวัสดุ
 DocType: Company,Delete Company Transactions,ลบรายการที่ บริษัท
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +313,Reference No and Reference Date is mandatory for Bank transaction,อ้างอิงและการอ้างอิงวันที่มีผลบังคับใช้สำหรับการทำธุรกรรมธนาคาร
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +316,Reference No and Reference Date is mandatory for Bank transaction,อ้างอิงและการอ้างอิงวันที่มีผลบังคับใช้สำหรับการทำธุรกรรมธนาคาร
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,เพิ่ม / แก้ไข ภาษีและค่าธรรมเนียม
 DocType: Purchase Invoice,Supplier Invoice No,ใบแจ้งหนี้ที่ผู้ผลิตไม่มี
 DocType: Territory,For reference,สำหรับการอ้างอิง
@@ -514,7 +522,6 @@
 DocType: Installation Note Item,Installation Note Item,รายการหมายเหตุการติดตั้ง
 DocType: Production Plan Item,Pending Qty,รอดำเนินการจำนวน
 DocType: Budget,Ignore,ไม่สนใจ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,รหัสสินค้า&gt; กลุ่มสินค้า&gt; ยี่ห้อ
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,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 สลิปเงินเดือน
@@ -525,11 +532,11 @@
 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/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,ไม่พบใบแจ้งหนี้ในตารางบันทึก
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +28,Please select Company and Party Type first,กรุณาเลือก บริษัท และประเภทพรรคแรก
+apps/erpnext/erpnext/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/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 +707,Make Sales Order,ทำให้ การขายสินค้า
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +701,Make Sales Order,ทำให้ การขายสินค้า
 DocType: Project Task,Project Task,โครงการงาน
 ,Lead Id,รหัสช่องทาง
 DocType: C-Form Invoice Detail,Grand Total,รวมทั้งสิ้น
@@ -545,7 +552,8 @@
 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 +734,Sales Return,ขายกลับ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +728,Sales Return,ขายกลับ
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +91,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)
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,ฐานข้อมูลของลูกค้าที่มีศักยภาพ
@@ -554,14 +562,13 @@
 DocType: Quotation,Quotation To,ใบเสนอราคาเพื่อ
 DocType: Lead,Middle Income,มีรายได้ปานกลาง
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +212,Opening (Cr),เปิด ( Cr )
-apps/erpnext/erpnext/stock/doctype/item/item.py +795,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,เริ่มต้นหน่วยวัดสำหรับรายการ {0} ไม่สามารถเปลี่ยนแปลงได้โดยตรงเพราะคุณได้ทำแล้วการทำธุรกรรมบาง (s) กับ UOM อื่น คุณจะต้องสร้างรายการใหม่ที่จะใช้ที่แตกต่างกันเริ่มต้น UOM
-apps/erpnext/erpnext/accounts/utils.py +237,Allocated amount can not be negative,จำนวนเงินที่จัดสรร ไม่สามารถ ลบ
+apps/erpnext/erpnext/stock/doctype/item/item.py +797,Default Unit of Measure for Item {0} cannot be changed directly because 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,จำนวนเงินที่จัดสรร ไม่สามารถ ลบ
 DocType: Purchase Order Item,Billed Amt,จำนวนจำนวนมากที่สุด
 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 +91,Reference No & Reference Date is required for {0},ไม่มี การอ้างอิง และการอ้างอิง วันที่ เป็นสิ่งจำเป็นสำหรับ {0}
-DocType: Sales Invoice,Customer's Vendor,ผู้ขายของลูกค้า
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Proposal Writing,การเขียน ข้อเสนอ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,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",หากตรวจสอบวัตถุดิบสำหรับรายการที่ย่อยได้ทำสัญญาจะรวมอยู่ในคำขอวัสดุ
@@ -570,13 +577,14 @@
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,การติดตามเวลา
 DocType: Fiscal Year Company,Fiscal Year Company,ปีงบประมาณ บริษัท
 DocType: Packing Slip Item,DN Detail,รายละเอียด DN
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +257,Already supplier quotation has created,แล้วคำพูดซัพพลายเออร์ที่ได้สร้าง
 DocType: Timesheet,Billed,ได้เรียกเก็บเงินแล้ว
 DocType: Batch,Batch Description,คำอธิบาย Batch
+apps/erpnext/erpnext/accounts/utils.py +685,"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 +733,View Offline Records,ดูแบบออฟไลน์ประวัติ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +715,View Offline Records,ดูแบบออฟไลน์ประวัติ
+DocType: Student,Sibling Details,รายละเอียดพี่น้อง
 DocType: Employee,Reason for Resignation,เหตุผลในการลาออก
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,แม่แบบสำหรับ การประเมิน ผลการปฏิบัติงาน
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,ใบแจ้งหนี้ / วารสารรายละเอียดการเข้า
@@ -590,7 +598,7 @@
 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,เปลี่ยนสุทธิในสินค้าคงคลัง
 DocType: Employee,Passport Number,หมายเลขหนังสือเดินทาง
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Manager,ผู้จัดการ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,ผู้จัดการ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,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,' อยู่ ใน ' และ ' จัดกลุ่มตาม ' ต้องไม่เหมือนกัน
@@ -599,10 +607,11 @@
 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 +299,Timesheet created:,Timesheet สร้าง:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +715,Please set default Cash or Bank account in Mode of Payment {0},กรุณาตั้ง ค่าเริ่มต้น เงินสด หรือ บัญชีเงินฝากธนาคาร ใน โหมด ของ การชำระเงิน {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +300,Timesheet created:,Timesheet สร้าง:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +772,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,ลงทะเบียน
 DocType: Selling Settings,Customer Naming By,การตั้งชื่อตามลูกค้า
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,กรุณาตั้งค่าระบบการตั้งชื่อของพนักงานในทรัพยากรมนุษย์&gt; การตั้งค่าการบริหารทรัพยากรบุคคล
 DocType: Depreciation Schedule,Depreciation Amount,จำนวนเงินค่าเสื่อมราคา
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,แปลงเป็น กลุ่ม
 DocType: Activity Cost,Activity Type,ประเภทกิจกรรม
@@ -627,6 +636,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,เสร็จสิ้น
 DocType: Pricing Rule,Sales Manager,ผู้จัดการฝ่ายขาย
 DocType: Salary Structure Employee,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,บัญชีกำไร / ขาดทุนจากการขายสินทรัพย์
@@ -641,11 +651,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +9,Pre Sales,ขายก่อน
 DocType: Purchase Receipt,Other Details,รายละเอียดอื่น ๆ
 DocType: Account,Accounts,บัญชี
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Marketing,การตลาด
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +227,Payment Entry is already created,รายการชำระเงินที่สร้างไว้แล้ว
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,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 +538,Row #{0}: Asset {1} does not linked to Item {2},แถว # {0}: สินทรัพย์ {1} ไม่เชื่อมโยงกับรายการ {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +21,Preview Salary Slip,ดูตัวอย่างสลิปเงินเดือน
+apps/erpnext/erpnext/controllers/accounts_controller.py +541,Row #{0}: Asset {1} does not linked to Item {2},แถว # {0}: สินทรัพย์ {1} ไม่เชื่อมโยงกับรายการ {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +38,Preview Salary Slip,ดูตัวอย่างสลิปเงินเดือน
 DocType: Company,Deafult Cost Center,ศูนย์ต้นทุน Deafult
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +48,Account {0} has been entered multiple times,บัญชี {0} ได้รับการป้อนหลายครั้ง
 DocType: Account,Expenses Included In Valuation,ค่าใช้จ่ายรวมอยู่ในการประเมินมูลค่า
@@ -654,7 +664,7 @@
 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 +617,Item has variants.,รายการที่มีสายพันธุ์
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,รายการที่มีสายพันธุ์
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,รายการที่ {0} ไม่พบ
 DocType: Bin,Stock Value,มูลค่าหุ้น
 apps/erpnext/erpnext/accounts/doctype/account/account.py +25,Company {0} does not exist,บริษัท {0} ไม่อยู่
@@ -674,7 +684,7 @@
 DocType: Purchase Order,Supply Raw Materials,ซัพพลายวัตถุดิบ
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,วันที่ใบแจ้งหนี้ต่อไปจะถูกสร้างขึ้น มันถูกสร้างขึ้นบนส่ง
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,สินทรัพย์หมุนเวียน
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,{0} is not a stock Item,{0} ไม่ได้เป็น รายการ สต็อก
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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 +169,Lead must be set if Opportunity is made from Lead,ต้องตั้งช่องทาง ถ้า โอกาสถูกสร้างมาจากช่องทาง
@@ -760,26 +770,25 @@
 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 +709,No Permission,ไม่ได้รับอนุญาต
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +710,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}
 apps/erpnext/erpnext/public/js/setup_wizard.js +298,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 +542,Row #{0}: Asset {1} must be submitted,แถว # {0}: สินทรัพย์ {1} จะต้องส่ง
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,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
 DocType: Warehouse,Tree Details,รายละเอียดต้นไม้
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,ส่งเดี๋ยวนี้
 ,Support Analytics,Analytics สนับสนุน
 DocType: Item,Website Warehouse,คลังสินค้าเว็บไซต์
 DocType: Payment Reconciliation,Minimum Invoice Amount,จำนวนใบแจ้งหนี้ขั้นต่ำ
 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/sales_invoice/sales_invoice.py +227,Timesheet {0} is already completed or cancelled,Timesheet {0} เสร็จสมบูรณ์แล้วหรือยกเลิก
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +259,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
@@ -795,13 +804,13 @@
 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 +229,Target Warehouse,คลังสินค้าเป้าหมาย
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +230,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-,STE-
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Sales Order Date,วันที่ส่ง ที่คาดว่าจะ ไม่สามารถเป็น วัน ก่อนที่จะ ขายสินค้า
 DocType: Upload Attendance,Import Attendance,การเข้าร่วมประชุมและนำเข้า
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,ทั้งหมด รายการ กลุ่ม
+apps/erpnext/erpnext/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/config/setup.py +89,Automatically compose message on submission of transactions.,เขียนข้อความ โดยอัตโนมัติใน การส่ง ของ การทำธุรกรรม
@@ -813,13 +822,15 @@
 DocType: Sales Invoice,Payment Due Date,วันที่ครบกำหนด ชำระเงิน
 apps/erpnext/erpnext/stock/doctype/item/item.js +278,Item Variant {0} already exists with same attributes,รายการตัวแปร {0} อยู่แล้วที่มีลักษณะเดียวกัน
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening','กำลังเปิด'
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,เปิดให้ทำ
 DocType: Notification Control,Delivery Note Message,ข้อความหมายเหตุจัดส่งสินค้า
 DocType: Expense Claim,Expenses,รายจ่าย
 DocType: Item Variant Attribute,Item Variant Attribute,รายการตัวแปรคุณสมบัติ
 ,Purchase Receipt Trends,ซื้อแนวโน้มใบเสร็จรับเงิน
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Research & Development,การวิจัยและพัฒนา
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,การวิจัยและพัฒนา
 ,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,ฝากวันที่รายการบล็อก
 DocType: Pricing Rule,Price or Discount,ราคา หรือ ส่วนลด
@@ -828,7 +839,7 @@
 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/controllers/accounts_controller.py +340,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",รายการชำระเงิน {0} มีการเชื่อมโยงกับการสั่งซื้อ {1} ตรวจสอบว่ามันควรจะดึงล่วงหน้าในใบแจ้งหนี้นี้
+apps/erpnext/erpnext/controllers/accounts_controller.py +343,"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,จุดขาย
@@ -850,12 +861,12 @@
 DocType: Supplier Quotation,Is Subcontracted,เหมา
 DocType: Item Attribute,Item Attribute Values,รายการค่าแอตทริบิวต์
 DocType: Examination Result,Examination Result,ผลการตรวจสอบ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +756,Purchase Receipt,ใบเสร็จรับเงินการสั่งซื้อ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +735,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 +167,Reference Doctype must be one of {0},อ้างอิง Doctype ต้องเป็นหนึ่งใน {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +282,Unable to find Time Slot in the next {0} days for Operation {1},ไม่สามารถหาช่วงเวลาใน {0} วันถัดไปสำหรับการปฏิบัติงาน {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +170,Reference Doctype must be one of {0},อ้างอิง Doctype ต้องเป็นหนึ่งใน {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Unable to find Time Slot in the next {0} days for Operation {1},ไม่สามารถหาช่วงเวลาใน {0} วันถัดไปสำหรับการปฏิบัติงาน {1}
 DocType: Production Order,Plan material for sub-assemblies,วัสดุแผนประกอบย่อย
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,พันธมิตรการขายและดินแดน
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be active,BOM {0} จะต้องใช้งาน
@@ -866,7 +877,7 @@
 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 +214,Warehouses with existing transaction can not be converted to ledger.,โกดังกับการทำธุรกรรมที่มีอยู่ไม่สามารถแปลงบัญชีแยกประเภท
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +217,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,คำสั่งซื้อการผลิต
@@ -880,9 +891,9 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,พนักงาน {0} ไม่ได้ ใช้งานอยู่หรือ ไม่อยู่
 DocType: Fee Structure,Components,ส่วนประกอบ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,Please enter Asset Category in Item {0},กรุณากรอกประเภทสินทรัพย์ในข้อ {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +612,Item Variants {0} updated,สินค้าหลากหลายรูปแบบ {0} ปรับปรุง
+apps/erpnext/erpnext/stock/doctype/item/item.py +614,Item Variants {0} updated,สินค้าหลากหลายรูปแบบ {0} ปรับปรุง
 DocType: Quality Inspection Reading,Reading 6,Reading 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +843,Cannot {0} {1} {2} without any negative outstanding invoice,ไม่สามารถ {0} {1} {2} โดยไม่ต้องมีใบแจ้งหนี้ที่โดดเด่นในเชิงลบ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +854,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,ซิงค์เดี๋ยวนี้
@@ -897,69 +908,72 @@
 DocType: Item,Is Purchase Item,รายการซื้อเป็น
 DocType: Asset,Purchase Invoice,ซื้อใบแจ้งหนี้
 DocType: Stock Ledger Entry,Voucher Detail No,รายละเอียดบัตรกำนัลไม่มี
-apps/erpnext/erpnext/accounts/page/pos/pos.js +728,New Sales Invoice,ใบแจ้งหนี้การขายใหม่
+apps/erpnext/erpnext/accounts/page/pos/pos.js +710,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 +728,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: Cheque Print Template,Has Print Format,มีรูปแบบการพิมพ์
-apps/erpnext/erpnext/accounts/page/pos/pos.js +86, is mandatory. Maybe Currency Exchange record is not created for ,มีผลบังคับใช้ บางทีบันทึกแลกเปลี่ยนเงินตราต่างประเทศที่ไม่ได้สร้างขึ้นสำหรับ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +109,Row #{0}: Please specify Serial No for Item {1},แถว # {0}: โปรดระบุหมายเลขเครื่องกับรายการ {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +619,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","สำหรับรายการ &#39;Bundle สินค้า, คลังสินค้า, ไม่มี Serial และรุ่นที่จะไม่ได้รับการพิจารณาจาก&#39; บรรจุรายชื่อ &#39;ตาราง ถ้าคลังสินค้าและรุ่นที่ไม่มีเหมือนกันสำหรับรายการที่บรรจุทั้งหมดรายการใด ๆ &#39;Bundle สินค้า&#39; ค่าเหล่านั้นสามารถป้อนในตารางรายการหลักค่าจะถูกคัดลอกไปบรรจุรายชื่อ &#39;ตาราง"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +75, 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 +613,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing 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 +606,Supplier Invoice Date cannot be greater than Posting Date,วันที่จัดจำหน่ายใบแจ้งหนี้ไม่สามารถมีค่ามากกว่าการโพสต์วันที่
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +609,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: Cheque Print Template,Date Settings,ตั้งวันที่
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,ความแปรปรวน
 ,Company Name,ชื่อ บริษัท
 DocType: SMS Center,Total Message(s),ข้อความ รวม (s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +810,Select Item for Transfer,เลือกรายการสำหรับการโอนเงิน
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +789,Select Item for Transfer,เลือกรายการสำหรับการโอนเงิน
 DocType: Purchase Invoice,Additional Discount Percentage,เพิ่มเติมร้อยละส่วนลด
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,ดูรายการทั้งหมดวิดีโอความช่วยเหลือที่
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,เลือกหัวที่บัญชีของธนาคารที่ตรวจสอบถูกวาง
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,ช่วยให้ผู้ใช้ในการแก้ไขอัตราราคาปกติในการทำธุรกรรม
 DocType: Pricing Rule,Max Qty,จำนวนสูงสุด
-DocType: Student Applicant,Father's Name,ชื่อของพ่อ
 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 +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,แถว {0}: การชำระเงินกับการขาย / การสั่งซื้อควรจะทำเครื่องหมายเป็นล่วงหน้า
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,สารเคมี
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +686,All items have already been transferred for this Production Order.,รายการทั้งหมดที่ได้รับการโอนใบสั่งผลิตนี้
+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} และลองอีกครั้ง
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +694,All items have already been transferred for this Production Order.,รายการทั้งหมดที่ได้รับการโอนใบสั่งผลิตนี้
 DocType: Process Payroll,Select Payroll Year and Month,เลือกเงินเดือนปีและเดือน
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,Meter,เมตร
 DocType: Workstation,Electricity Cost,ค่าใช้จ่าย ไฟฟ้า
 DocType: HR Settings,Don't send Employee Birthday Reminders,อย่าส่ง พนักงาน เตือนวันเกิด
-DocType: Opportunity,Walk In,Walk In
 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 +12,Transfered,โอน
 apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,อัปโหลดหัวจดหมายของคุณและโลโก้ (คุณสามารถแก้ไขได้ในภายหลัง)
 DocType: Timesheet Detail,Bill,บิล
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,White,ขาว
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date is entered as past date,ถัดไปวันที่มีการป้อนค่าเสื่อมราคาเป็นวันที่ผ่านมา
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +167,White,ขาว
 DocType: SMS Center,All Lead (Open),ช่องทางทั้งหมด (เปิด)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +228,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),แถว {0}: จำนวนไม่สามารถใช้ได้สำหรับ {4} ในคลังสินค้า {1} ที่โพสต์เวลาของรายการ ({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}),แถว {0}: จำนวนไม่สามารถใช้ได้สำหรับ {4} ในคลังสินค้า {1} ที่โพสต์เวลาของรายการ ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,รับเงินทดรองจ่าย
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +731,Make ,สร้าง
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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 +154,Order Type must be one of {0},ประเภทการสั่งซื้อต้องเป็นหนึ่งใน {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},ประเภทการสั่งซื้อต้องเป็นหนึ่งใน {0}
 DocType: Lead,Next Contact Date,วันที่ถัดไปติดต่อ
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,เปิด จำนวน
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +393,Please enter Account for Change Amount,กรุณากรอกบัญชีเพื่อการเปลี่ยนแปลงจำนวน
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,Please enter Account for Change Amount,กรุณากรอกบัญชีเพื่อการเปลี่ยนแปลงจำนวน
 DocType: Student Batch,Student Batch Name,นักศึกษาชื่อชุด
 DocType: Holiday List,Holiday List Name,ชื่อรายการวันหยุด
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js +8,Schedule Course,ตารางเรียน
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Stock Options,ตัวเลือกหุ้น
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,ตัวเลือกหุ้น
 DocType: Journal Entry Account,Expense Claim,เรียกร้องค่าใช้จ่าย
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +211,Do you really want to restore this scrapped asset?,จริงๆคุณต้องการเรียกคืนสินทรัพย์ไนต์นี้หรือไม่?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +237,Qty for {0},จำนวนสำหรับ {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +212,Do you really want to restore this scrapped asset?,จริงๆคุณต้องการเรียกคืนสินทรัพย์ไนต์นี้หรือไม่?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,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,ไม่ระบุวันที่รายการบล็อก
@@ -968,9 +982,9 @@
 DocType: Company,Default Terms,ข้อกำหนดในการเริ่มต้น
 DocType: Packing Slip Item,Packing Slip Item,บรรจุรายการสลิป
 DocType: Purchase Invoice,Cash/Bank Account,เงินสด / บัญชีธนาคาร
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,รายการที่ลบออกด้วยการเปลี่ยนแปลงในปริมาณหรือไม่มีค่า
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,รายการที่ลบออกด้วยการเปลี่ยนแปลงในปริมาณหรือไม่มีค่า
 DocType: Delivery Note,Delivery To,เพื่อจัดส่งสินค้า
-apps/erpnext/erpnext/stock/doctype/item/item.py +635,Attribute table is mandatory,ตาราง Attribute มีผลบังคับใช้
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,ตาราง Attribute มีผลบังคับใช้
 DocType: Production Planning Tool,Get Sales Orders,รับการสั่งซื้อการขาย
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} ไม่สามารถเป็นจำนวนลบได้
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,กรุณาเลือกนักศึกษา
@@ -995,7 +1009,7 @@
 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,WIP คลังสินค้า
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},อนุกรม ไม่มี {0} อยู่ภายใต้สัญญา การบำรุงรักษา ไม่เกิน {1}
+apps/erpnext/erpnext/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,ชื่อองค์กร
@@ -1007,7 +1021,7 @@
 DocType: GL Entry,Against,กับ
 DocType: Item,Default Selling Cost Center,ขาย เริ่มต้นที่ ศูนย์ต้นทุน
 DocType: Sales Partner,Implementation Partner,พันธมิตรการดำเนินงาน
-apps/erpnext/erpnext/controllers/selling_controller.py +231,Sales Order {0} is {1},ใบสั่งขาย {0} เป็น {1}
+apps/erpnext/erpnext/controllers/selling_controller.py +232,Sales Order {0} is {1},ใบสั่งขาย {0} เป็น {1}
 DocType: Opportunity,Contact Info,ข้อมูลการติดต่อ
 apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,ทำรายการสต็อก
 DocType: Packing Slip,Net Weight UOM,UOM น้ำหนักสุทธิ
@@ -1017,25 +1031,24 @@
 DocType: Holiday List,Get Weekly Off Dates,รับวันปิดสัปดาห์
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,วันที่สิ้นสุด ไม่สามารถ จะน้อยกว่า วันเริ่มต้น
 DocType: Sales Person,Select company name first.,เลือกชื่อ บริษัท แรก
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Dr,ดร
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Dr,ดร
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,ใบเสนอราคาที่ได้รับจากผู้จัดจำหน่าย
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},เพื่อ {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,อายุเฉลี่ย
 DocType: 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/templates/pages/home.html +32,View All Products,ดูผลิตภัณฑ์ทั้งหมด
+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 +400,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,คำเตือน: ระบบ จะไม่ตรวจสอบ overbilling ตั้งแต่ จำนวนเงิน รายการ {0} ใน {1} เป็นศูนย์
+apps/erpnext/erpnext/controllers/accounts_controller.py +403,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/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,และปี:
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +191,{0} {1} must be submitted,{0} {1} จะต้องส่ง
-DocType: Email Digest,Annual Expense,ค่าใช้จ่ายประจำปี
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,{0} {1} must be submitted,{0} {1} จะต้องส่ง
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +145,Quantity must be less than or equal to {0},ปริมาณต้องน้อยกว่าหรือเท่ากับ {0}
 DocType: SMS Center,Total Characters,ตัวอักษรรวม
 apps/erpnext/erpnext/controllers/buying_controller.py +156,Please select BOM in BOM field for Item {0},กรุณาเลือก BOM BOM ในด้านการพิจารณาวาระที่ {0}
@@ -1046,30 +1059,31 @@
 DocType: Sales Partner,Distributor,ผู้จัดจำหน่าย
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,รถเข็นกฎการจัดส่งสินค้า
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +211,Production Order {0} must be cancelled before cancelling this Sales Order,สั่งผลิต {0} ต้อง ถูกยกเลิก ก่อนที่จะ ยกเลิกการ สั่งซื้อการขาย นี้
-apps/erpnext/erpnext/public/js/controllers/transaction.js +62,Please set 'Apply Additional Discount On',โปรดตั้ง &#39;ใช้ส่วนลดเพิ่มเติมใน&#39;
+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,จากช่วงจะต้องมีน้อยกว่าในช่วง
 DocType: Global Defaults,Global Defaults,เริ่มต้นทั่วโลก
 apps/erpnext/erpnext/projects/doctype/project/project.py +153,Project Collaboration Invitation,ขอเชิญร่วมโครงการ
 DocType: Salary Slip,Deductions,การหักเงิน
+DocType: Leave Allocation,LAL/,LAL /
 apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,ปีวันเริ่มต้น
 DocType: Purchase Invoice,Start date of current invoice's period,วันที่เริ่มต้นของระยะเวลาการออกใบแจ้งหนี้ปัจจุบัน
 DocType: Salary Slip,Leave Without Pay,ฝากโดยไม่ต้องจ่าย
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +327,Capacity Planning Error,ข้อผิดพลาดการวางแผนกำลังการผลิต
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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 +362,Finished Item {0} must be entered for Manufacture type entry,เสร็จสิ้นรายการ {0} ต้องป้อนสำหรับรายการประเภทการผลิต
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +367,Finished Item {0} must be entered for Manufacture type entry,เสร็จสิ้นรายการ {0} ต้องป้อนสำหรับรายการประเภทการผลิต
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,เปิดยอดคงเหลือบัญชี
 DocType: Sales Invoice Advance,Sales Invoice Advance,ขายใบแจ้งหนี้ล่วงหน้า
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +499,Nothing to request,ไม่มีอะไรที่จะ ขอ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +500,Nothing to request,ไม่มีอะไรที่จะ ขอ
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',' วันเริ่มต้น จริง ' ไม่สามารถ จะมากกว่า ' วันสิ้นสุด จริง '
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Management,การจัดการ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},ทั้ง บัตรเดบิตหรือ เครดิต เงิน เป็นสิ่งจำเป็นสำหรับ {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,การจัดการ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +55,Either debit or credit amount is required for {0},ทั้ง บัตรเดบิตหรือ เครดิต เงิน เป็นสิ่งจำเป็นสำหรับ {0}
 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 +161,Blue,สีฟ้า
+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
@@ -1079,12 +1093,12 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +23,POS Profile {0} already created for user: {1} and company {2},รายละเอียด POS {0} สร้างไว้แล้วสำหรับผู้ใช้: {1} และ บริษัท {2}
 DocType: Purchase Order Item,UOM Conversion Factor,ปัจจัยการแปลง UOM
 DocType: Stock Settings,Default Item Group,กลุ่มสินค้าเริ่มต้น
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1374,Do you really want to submit the invoice?,จริงๆคุณต้องการที่จะส่งใบแจ้งหนี้หรือไม่
+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 +685,Cost Center For Item with Item Code ',ศูนย์ต้นทุนสำหรับสินค้าที่มีรหัสสินค้า '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1526,"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 +679,Cost Center For Item with Item Code ',ศูนย์ต้นทุนสำหรับสินค้าที่มีรหัสสินค้า '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1550,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",วิธีการชำระเงินไม่ได้กำหนดค่า กรุณาตรวจสอบไม่ว่าจะเป็นบัญชีที่ได้รับการตั้งค่าในโหมดของการชำระเงินหรือบนโปรไฟล์ POS
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,คนขายของคุณจะรับการแจ้งเตือนในวันนี้ที่จะติดต่อลูกค้า
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,"Further accounts can be made under Groups, but entries can be made against non-Groups",บัญชีเพิ่มเติมสามารถทำภายใต้กลุ่ม แต่รายการที่สามารถทำกับกลุ่มที่ไม่
 DocType: Lead,Lead,ช่องทาง
@@ -1104,104 +1118,106 @@
 DocType: Payment Reconciliation,Unreconciled Payment Details,รายละเอียดการชำระเงิน Unreconciled
 DocType: Global Defaults,Current Fiscal Year,ปีงบประมาณปัจจุบัน
 DocType: Global Defaults,Disable Rounded Total,ปิดการใช้งานรวมโค้ง
-DocType: Lead,Call,โทรศัพท์
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +417,'Entries' cannot be empty,' รายการ ' ต้องไม่ว่างเปล่า
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +418,'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 +214,Fiscal Year {0} not found,ปีงบประมาณ {0} ไม่พบ
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +221,Fiscal Year {0} not found,ปีงบประมาณ {0} ไม่พบ
 apps/erpnext/erpnext/config/hr.py +238,Setting up Employees,การตั้งค่าพนักงาน
 DocType: Sales Order,SO-,ดังนั้น-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,กรุณาเลือก คำนำหน้า เป็นครั้งแรก
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Please select prefix first,กรุณาเลือก คำนำหน้า เป็นครั้งแรก
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Research,การวิจัย
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,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 +43,Item {0} must be a non-stock item,รายการ {0} จะต้องเป็นรายการที่ไม่สต็อก
 DocType: Contact,User ID,รหัสผู้ใช้
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +57,View Ledger,ดู บัญชีแยกประเภท
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,ที่เก่าแก่ที่สุด
-apps/erpnext/erpnext/stock/doctype/item/item.py +504,"An Item Group exists with same name, please change the item name or rename the item group",รายการกลุ่ม ที่มีอยู่ ที่มีชื่อเดียวกัน กรุณาเปลี่ยน ชื่อรายการหรือเปลี่ยนชื่อ กลุ่ม รายการ
+apps/erpnext/erpnext/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 +437,Rest Of The World,ส่วนที่เหลือ ของโลก
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,รายการ {0} ไม่สามารถมีแบทช์
 ,Budget Variance Report,รายงานความแปรปรวนของงบประมาณ
 DocType: Salary Slip,Gross Pay,จ่ายขั้นต้น
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +90,Row {0}: Activity Type is mandatory.,แถว {0}: ประเภทกิจกรรมมีผลบังคับใช้
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +114,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/public/js/controllers/stock_controller.js +40,Accounting Ledger,บัญชีแยกประเภท
+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,กำไรสะสม
 DocType: BOM Item,Item Description,รายละเอียดสินค้า
+DocType: Student Sibling,Student Sibling,พี่น้องนักศึกษา
 DocType: Purchase Invoice,Is Recurring,เป็นที่เกิดขึ้น
 DocType: Purchase Invoice,Supplied Items,จัดรายการ
 DocType: Student,STUD.,สตั๊ด
 DocType: Production Order,Qty To Manufacture,จำนวนการผลิต
+DocType: Email Digest,New Income,รายได้ใหม่
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,รักษาอัตราเดียวกันตลอดวงจรการซื้อ
 DocType: Opportunity Item,Opportunity Item,รายการโอกาส
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,เปิดชั่วคราว
 ,Employee Leave Balance,ยอดคงเหลือพนักงานออก
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +131,Balance for Account {0} must always be {1},ยอดคงเหลือ บัญชี {0} จะต้อง {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +175,Valuation Rate required for Item in row {0},อัตราการประเมินที่จำเป็นสำหรับรายการในแถว {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,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,ตัวอย่าง: ปริญญาโทในสาขาวิทยาศาสตร์คอมพิวเตอร์
 DocType: Purchase Invoice,Rejected Warehouse,คลังสินค้าปฏิเสธ
 DocType: GL Entry,Against Voucher,กับบัตรกำนัล
 DocType: Item,Default Buying Cost Center,ศูนย์รายจ่ายการซื้อเริ่มต้น
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.",เพื่อให้ได้สิ่งที่ดีที่สุดของ ERPNext เราขอแนะนำให้คุณใช้เวลาในการดูวิดีโอเหล่านี้ช่วย
-apps/erpnext/erpnext/accounts/page/pos/pos.js +87, to ,ไปยัง
+apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,ไปยัง
 DocType: Item,Lead Time in days,ระยะเวลาในวันที่
 ,Accounts Payable Summary,สรุปบัญชีเจ้าหนี้
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Not authorized to edit frozen Account {0},ได้รับอนุญาตให้ แก้ไข บัญชี แช่แข็ง {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},ได้รับอนุญาตให้ แก้ไข บัญชี แช่แข็ง {0}
 DocType: Journal Entry,Get Outstanding Invoices,รับใบแจ้งหนี้ค้าง
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +62,Sales Order {0} is not valid,การขายสินค้า {0} ไม่ถูกต้อง
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,การขายสินค้า {0} ไม่ถูกต้อง
 apps/erpnext/erpnext/setup/doctype/company/company.py +185,"Sorry, companies cannot be merged",ขออภัย บริษัท ไม่สามารถ รวม
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +139,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",ปริมาณการเบิก / โอนทั้งหมด {0} วัสดุในการจอง {1} \ ไม่สามารถจะสูงกว่าปริมาณการร้องขอ {2} สำหรับรายการ {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Small,เล็ก
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,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}
 ,Invoiced Amount (Exculsive Tax),จำนวนเงินที่ ออกใบแจ้งหนี้ ( Exculsive ภาษี )
-DocType: Student Applicant,Mother's / Guardian 1 Email ID,/ การ์เดียนหมายเลข 1 อีเมล์แม่
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,รายการที่ 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,หัวบัญชีสำหรับ {0} ได้ถูกสร้างขึ้น
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +160,Green,สีเขียว
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,สีเขียว
 DocType: Supplier,SUPP-,SUPP-
 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 +57,Contract,สัญญา
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,สัญญา
 DocType: Email Digest,Add Quote,เพิ่มอ้าง
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +498,UOM coversion factor required for UOM: {0} in Item: {1},ปัจจัย Coversion UOM จำเป็นสำหรับ UOM: {0} ในรายการ: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +503,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 +80,Row {0}: Qty is mandatory,แถว {0}: จำนวนมีผลบังคับใช้
+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 +737,Sync Master Data,ซิงค์ข้อมูลหลัก
+apps/erpnext/erpnext/accounts/page/pos/pos.js +719,Sync Master Data,ซิงค์ข้อมูลหลัก
 apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,สินค้า หรือ บริการของคุณ
 DocType: Mode of Payment,Mode of Payment,โหมดของการชำระเงิน
 apps/erpnext/erpnext/stock/doctype/item/item.py +178,Website Image should be a public file or website URL,ภาพ Website ควรจะเป็นไฟล์สาธารณะหรือ URL ของเว็บไซต์
+DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,กลุ่มนี้เป็นกลุ่ม รายการที่ ราก และ ไม่สามารถแก้ไขได้
+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 +345,"{0}: Employee email not found, hence email not sent",{0}: ไม่พบอีเมลของพนักงานจึงไม่ได้ส่งอีเมลที่
+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,คือที่อยู่ บริษัท ของคุณ
 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 +118,"For {0}, only credit accounts can be linked against another debit entry",มีบัญชีประเภทเครดิตเท่านั้น ที่สามารถเชื่อมโยงกับรายการประเภทเดบิต สำหรับ {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Delivery Note {0} is not submitted,หมายเหตุ การจัดส่ง {0} ไม่ได้ ส่ง
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Delivery Note {0} is not submitted,หมายเหตุ การจัดส่ง {0} ไม่ได้ ส่ง
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Sub-contracted Item,รายการ {0} จะต้องเป็น รายการ ย่อย หด
 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,เว็บไซต์ขาย
 DocType: Item,ITEM-,ITEM-
-apps/erpnext/erpnext/controllers/selling_controller.py +147,Total allocated percentage for sales team should be 100,ร้อยละ จัดสรร รวม สำหรับทีม ขายควร เป็น 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +110,Production Order status is {0},สถานะการผลิต การสั่งซื้อ เป็น {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,ร้อยละ จัดสรร รวม สำหรับทีม ขายควร เป็น 100
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},สถานะการผลิต การสั่งซื้อ เป็น {0}
 DocType: Appraisal Goal,Goal,เป้าหมาย
 DocType: Sales Invoice Item,Edit Description,แก้ไขรายละเอียด
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +757,For Supplier,สำหรับ ผู้ผลิต
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +723,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,สร้างรูปแบบการพิมพ์
@@ -1217,10 +1233,11 @@
 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,รหัสเกรด
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ส่งอีเมล์หัวข้อสำคัญ:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +445,BOM {0} does not belong to Item {1},BOM {0} ไม่ได้อยู่ในรายการ {1}
 DocType: Sales Partner,Target Distribution,การกระจายเป้าหมาย
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1667,Deafault warehouse is required for selected item,คลังสินค้า Deafault เป็นสิ่งจำเป็นสำหรับรายการที่เลือก
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Deafault warehouse is required for selected item,คลังสินค้า Deafault เป็นสิ่งจำเป็นสำหรับรายการที่เลือก
 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
@@ -1229,23 +1246,23 @@
 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 +110,Hardware,ฮาร์ดแวร์
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,ฮาร์ดแวร์
 DocType: Sales Order,Recurring Upto,ที่เกิดขึ้นไม่เกิน
 DocType: Attendance,HR Manager,HR Manager
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,กรุณาเลือก บริษัท
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Privilege Leave,สิทธิ ออก
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,สิทธิ ออก
 DocType: Purchase Invoice,Supplier Invoice Date,วันที่ใบแจ้งหนี้ผู้จัดจำหน่าย
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,คุณจำเป็นต้องเปิดการใช้งานรถเข็น
 DocType: Payment Entry,Writeoff,ตัดค่าใช้จ่าย
 DocType: Appraisal Template Goal,Appraisal Template Goal,เป้าหมายเทมเพลทประเมิน
-DocType: Salary Slip,Earning,รายได้
+DocType: Salary Component,Earning,รายได้
 DocType: Purchase Invoice,Party Account Currency,พรรคบัญชีเงินฝากเงินตรา
 ,BOM Browser,BOM เบราว์เซอร์
 DocType: Purchase Taxes and Charges,Add or Deduct,เพิ่มหรือหัก
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,เงื่อนไข ที่ทับซ้อนกัน ระหว่าง พบ :
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +171,Against Journal Entry {0} is already adjusted against some other voucher,กับอนุทิน {0} จะถูกปรับแล้วกับบางบัตรกำนัลอื่น ๆ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,กับอนุทิน {0} จะถูกปรับแล้วกับบางบัตรกำนัลอื่น ๆ
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,มูลค่าการสั่งซื้อทั้งหมด
-apps/erpnext/erpnext/demo/setup_data.py +358,Food,อาหาร
+apps/erpnext/erpnext/demo/setup/setup_data.py +301,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/course_schedule/course_schedule.js +103,Mark Attendence,มาร์ค Attendence
@@ -1279,12 +1296,12 @@
 DocType: Sales Order Item,Planned Quantity,จำนวนวางแผน
 DocType: Purchase Invoice Item,Item Tax Amount,จำนวนภาษีรายการ
 DocType: Item,Maintain Stock,รักษาสต็อก
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +209,Stock Entries already created for Production Order ,รายการสต็อกที่สร้างไว้แล้วสำหรับการสั่งซื้อการผลิต
+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,เปลี่ยนสุทธิในสินทรัพย์ถาวร
 DocType: Leave Control Panel,Leave blank if considered for all designations,เว้นไว้หากพิจารณากำหนดทั้งหมด
-apps/erpnext/erpnext/controllers/accounts_controller.py +620,Charge of type 'Actual' in row {0} cannot be included in Item Rate,ค่าใช้จ่าย ประเภท ' จริง ' ในแถว {0} ไม่สามารถ รวมอยู่ใน อัตรา รายการ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,Max: {0},สูงสุด: {0}
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +15,From Datetime,จาก Datetime
+apps/erpnext/erpnext/controllers/accounts_controller.py +623,Charge of type 'Actual' in row {0} cannot be included in Item Rate,ค่าใช้จ่าย ประเภท ' จริง ' ในแถว {0} ไม่สามารถ รวมอยู่ใน อัตรา รายการ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +239,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 +153,"Request for Quotation is disabled to access from portal, for more check portal settings.",ขอให้เสนอราคาถูกปิดใช้งานในการเข้าถึงจากพอร์ทัลสำหรับการตั้งค่าพอร์ทัลการตรวจสอบมากขึ้น
@@ -1292,8 +1309,8 @@
 DocType: Sales Invoice,Shipping Address Name,การจัดส่งสินค้าที่อยู่ชื่อ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,ผังบัญชี
 DocType: Material Request,Terms and Conditions Content,ข้อตกลงและเงื่อนไขเนื้อหา
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +552,cannot be greater than 100,ไม่สามารถจะมากกว่า 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +680,Item {0} is not a stock Item,รายการที่ {0} ไม่ได้เป็น รายการ สต็อก
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +546,cannot be greater than 100,ไม่สามารถจะมากกว่า 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is not a stock Item,รายการที่ {0} ไม่ได้เป็น รายการ สต็อก
 DocType: Maintenance Visit,Unscheduled,ไม่ได้หมายกำหนดการ
 DocType: Employee,Owned,เจ้าของ
 DocType: Salary Detail,Depends on Leave Without Pay,ขึ้นอยู่กับการออกโดยไม่จ่ายเงิน
@@ -1307,10 +1324,9 @@
 DocType: GL Entry,GL Entry,รายการ GL
 DocType: HR Settings,Employee Settings,การตั้งค่า การทำงานของพนักงาน
 ,Batch-Wise Balance History,ชุดฉลาดประวัติยอดคงเหลือ
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,รายการสิ่งที่ต้องทำ
 apps/erpnext/erpnext/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 +61,Apprentice,เด็กฝึกงาน
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +102,Negative Quantity is not allowed,จำนวน เชิงลบ ไม่ได้รับอนุญาต
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,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","ตารางรายละเอียดภาษีเรียกจากต้นแบบรายการเป็นสตริงและเก็บไว้ในฟิลด์นี้
  ใช้สำหรับภาษีและค่าใช้จ่าย"
@@ -1332,15 +1348,14 @@
 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 +141,Source warehouse is mandatory for row {0},คลังสินค้า ที่มา มีผลบังคับใช้ แถว {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +719,Packing Slip,สลิป
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Source warehouse is mandatory for row {0},คลังสินค้า ที่มา มีผลบังคับใช้ แถว {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +713,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/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,ขอให้เสนอราคาสามารถเข้าถึงได้โดยการคลิกที่ลิงค์ดังต่อไปนี้
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,นำเข้า ล้มเหลว
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,ที่อยู่ไม่เพิ่มเลย
 DocType: Workstation Working Hour,Workstation Working Hour,เวิร์คสเตชั่ชั่วโมงการทำงาน
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Analyst,นักวิเคราะห์
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,นักวิเคราะห์
 DocType: Item,Inventory,รายการสินค้า
 DocType: Item,Sales Details,รายละเอียดการขาย
 DocType: Quality Inspection,QI-,QI-
@@ -1348,7 +1363,7 @@
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,ในจำนวน
 DocType: Notification Control,Expense Claim Rejected,เรียกร้องค่าใช้จ่ายที่ถูกปฏิเสธ
 DocType: Item Attribute,Item Attribute,รายการแอตทริบิวต์
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +103,Government,รัฐบาล
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,รัฐบาล
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,ชื่อสถาบัน
 apps/erpnext/erpnext/config/stock.py +289,Item Variants,รายการที่แตกต่าง
 DocType: Company,Services,การบริการ
@@ -1364,6 +1379,7 @@
 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/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,กระแสเงินสดจากการลงทุน
 DocType: Program Course,Program Course,หลักสูตรโปรแกรม
@@ -1404,12 +1420,12 @@
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,รายชื่อ ผู้รับ ว่างเปล่า กรุณาสร้าง รายชื่อ รับ
 DocType: Production Plan Sales Order,Production Plan Sales Order,แผนสั่งซื้อขาย
 DocType: Sales Partner,Sales Partner Target,เป้าหมายยอดขายพันธมิตร
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +110,Accounting Entry for {0} can only be made in currency: {1},รายการบัญชีสำหรับ {0} สามารถทำได้ในสกุลเงิน: {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},รายการบัญชีสำหรับ {0} สามารถทำได้ในสกุลเงิน: {1}
 DocType: Pricing Rule,Pricing Rule,กฎ การกำหนดราคา
 DocType: Budget,Action if Annual Budget Exceeded,ดำเนินการหากเกินงบประมาณรายจ่ายประจำปี
 apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,วัสดุขอใบสั่งซื้อ
 DocType: Shopping Cart Settings,Payment Success URL,URL ที่ประสบความสำเร็จการชำระเงิน
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +78,Row # {0}: Returned Item {1} does not exists in {2} {3},แถว # {0}: กลับรายการ {1} ไม่อยู่ใน {2} {3}
+apps/erpnext/erpnext/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,งบกระทบยอดธนาคาร
@@ -1418,40 +1434,39 @@
 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/stock/doctype/stock_entry/stock_entry.py +339,Not allowed to tranfer more {0} than {1} against Purchase Order {2},ไม่อนุญาตให้โอนมากขึ้น {0} กว่า {1} กับใบสั่งซื้อ {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +344,Not allowed to tranfer more {0} than {1} against Purchase Order {2},ไม่อนุญาตให้โอนมากขึ้น {0} กว่า {1} กับใบสั่งซื้อ {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},ใบ จัดสรร ประสบความสำเร็จ ในการ {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,ไม่มี รายการ ที่จะแพ็ค
 DocType: Shipping Rule Condition,From Value,จากมูลค่า
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +545,Manufacturing Quantity is mandatory,จำนวนการผลิต นี้มีความจำเป็น
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,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 +71,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 +162,Row {0}: From Time and To Time of {1} is overlapping with {2},แถว {0}: จากเวลาและเวลาของ {1} มีการทับซ้อนกันด้วย {2}
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +186,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,หนี้สิน หุ้น
 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 +130,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 +137,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,รายงานอื่น ๆ
 DocType: Dependent Task,Dependent Task,ขึ้นอยู่กับงาน
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,กรุณาตั้งค่าระบบการตั้งชื่อของพนักงานในทรัพยากรมนุษย์&gt; การตั้งค่าการบริหารทรัพยากรบุคคล
 apps/erpnext/erpnext/stock/doctype/item/item.py +411,Conversion factor for default Unit of Measure must be 1 in row {0},ปัจจัย การแปลง หน่วย เริ่มต้น ของการวัด จะต้อง อยู่ในแถว ที่ 1 {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,Leave of type {0} cannot be longer than {1},การลา ประเภท {0} ไม่สามารถ จะยาวกว่า {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +197,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 +921,Search Item,ค้นหาค้นหาสินค้า
+apps/erpnext/erpnext/accounts/page/pos/pos.js +910,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 +546,Already completed,เสร็จสิ้นแล้ว
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +22,Payment Request already exists {0},รวมเข้ากับการชำระเงินที่มีอยู่แล้ว {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +550,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 +241,Quantity must not be more than {0},จำนวนต้องไม่เกิน {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Quantity must not be more than {0},จำนวนต้องไม่เกิน {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +76,Previous Financial Year is not closed,ปีก่อนหน้านี้ทางการเงินไม่ได้ปิด
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +44,Age (Days),อายุ (วัน)
 DocType: Quotation Item,Quotation Item,รายการใบเสนอราคา
@@ -1468,7 +1483,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +221,Purchase Receipt {0} is not submitted,รับซื้อ {0} ไม่ได้ ส่ง
 DocType: Company,Default Payable Account,เริ่มต้นเจ้าหนี้การค้า
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.",การตั้งค่าสำหรับตะกร้าช้อปปิ้งออนไลน์เช่นกฎการจัดส่งรายการราคา ฯลฯ
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +83,{0}% Billed,{0}% เรียกเก็บเงินแล้ว
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}% เรียกเก็บเงินแล้ว
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,สงวนไว้ จำนวน
 DocType: Party Account,Party Account,บัญชีพรรค
 apps/erpnext/erpnext/config/setup.py +116,Human Resources,ทรัพยากรบุคคล
@@ -1480,12 +1495,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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 +22,Collect,เก็บ
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,เก็บ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,Against Supplier Invoice {0} dated {1},กับผู้ผลิตใบแจ้งหนี้ {0} วัน {1}
 DocType: Customer,Default Price List,รายการราคาเริ่มต้น
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +225,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: Payment Reconciliation,Payments,วิธีการชำระเงิน
 DocType: Journal Entry,Entry Type,ประเภทรายการ
 ,Customer Credit Balance,เครดิตบาลานซ์ลูกค้า
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Payable,เปลี่ยนสุทธิในบัญชีเจ้าหนี้
@@ -1497,7 +1511,7 @@
 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 +9,Procurement,จัดซื้อจัดจ้าง
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,ไม่มีรายการมีการเปลี่ยนแปลงใด ๆ ในปริมาณหรือมูลค่า
+apps/erpnext/erpnext/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,รับประกันเรียกร้อง
 ,Lead Details,รายละเอียดของช่องทาง
 DocType: Purchase Invoice,End date of current invoice's period,วันที่สิ้นสุดของรอบระยะเวลาใบแจ้งหนี้ปัจจุบัน
@@ -1522,7 +1536,7 @@
 DocType: Purchase Invoice,Additional Discount,ส่วนลดเพิ่มเติม
 DocType: Selling Settings,Selling Settings,ตั้งค่าระบบการขาย
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,การประมูล ออนไลน์
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +97,Please specify either Quantity or Valuation Rate or both,โปรดระบุ ทั้ง จำนวน หรือ อัตรา การประเมิน หรือทั้งสองอย่าง
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,โปรดระบุ ทั้ง จำนวน หรือ อัตรา การประเมิน หรือทั้งสองอย่าง
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +13,Fulfillment,การบรรลุเป้าหมาย
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory",บริษัท เดือน และ ปีงบประมาณ มีผลบังคับใช้
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,ค่าใช้จ่ายใน การตลาด
@@ -1540,17 +1554,16 @@
 DocType: Employee,Date Of Retirement,วันที่ของการเกษียณอายุ
 DocType: Upload Attendance,Get Template,รับแม่แบบ
 DocType: Address,Postal,ไปรษณีย์
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,ติดตั้ง ERPNext Complete!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,การติดตั้ง ERPNext เสร็จสิ้น
 DocType: Item,Weightage,weightage
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +93,A Customer Group exists with same name please change the Customer name or rename the Customer Group,กลุ่ม ลูกค้าที่มีอยู่ ที่มีชื่อเดียวกัน โปรด เปลี่ยนชื่อ ลูกค้าหรือเปลี่ยนชื่อ กลุ่ม ลูกค้า
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +126,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
 DocType: Stock Entry,Material Receipt,ใบเสร็จรับเงินวัสดุ
 DocType: Homepage,Products,ผลิตภัณฑ์
 DocType: Announcement,Instructor,อาจารย์ผู้สอน
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},ประเภทพรรคและพรรคเป็นสิ่งจำเป็นสำหรับลูกหนี้ / เจ้าหนี้ {0}
 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,ติดต่อถัดไป
@@ -1561,7 +1574,7 @@
 ,Item-wise Sales Register,การขายสินค้าที่ชาญฉลาดสมัครสมาชิก
 DocType: Asset,Gross Purchase Amount,จำนวนการสั่งซื้อขั้นต้น
 DocType: Asset,Depreciation Method,วิธีการคิดค่าเสื่อมราคา
-apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Offline,ออฟไลน์
+apps/erpnext/erpnext/accounts/page/pos/pos.js +686,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,จำเป็นต้องใช้
@@ -1579,25 +1592,27 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +425,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 +858,Make Purchase Order,ทำให้ การสั่งซื้อ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +852,Make Purchase Order,ทำให้ การสั่งซื้อ
 DocType: SMS Center,Send To,ส่งให้
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,There is not enough leave balance for Leave Type {0},ที่มีอยู่ไม่ สมดุล เพียงพอสำหรับ การลา ออกจาก ประเภท {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,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 +172,Work-in-Progress Warehouse is required before Submit,ทำงาน ความคืบหน้าใน คลังสินค้า จะต้อง ก่อนที่จะ ส่ง
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,Work-in-Progress Warehouse is required before Submit,ทำงาน ความคืบหน้าใน คลังสินค้า จะต้อง ก่อนที่จะ ส่ง
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,ผู้สมัครงาน
 DocType: Purchase Order Item,Warehouse and Reference,คลังสินค้าและการอ้างอิง
 DocType: Supplier,Statutory info and other general information about your Supplier,ข้อมูลตามกฎหมายและข้อมูลทั่วไปอื่น ๆ เกี่ยวกับผู้จำหน่ายของคุณ
-apps/erpnext/erpnext/hooks.py +88,Addresses,ที่อยู่
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,ผู้ผลิต&gt; ประเภทผู้ผลิต
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +212,Against Journal Entry {0} does not have any unmatched {1} entry,กับอนุทิน {0} ไม่ได้มีที่ไม่มีใครเทียบ {1} รายการ
+apps/erpnext/erpnext/hooks.py +95,Addresses,ที่อยู่
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +215,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,กรุณาตั้งค่าตัวกรองขึ้นอยู่กับสินค้าหรือคลังสินค้า
 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,การส่งและบิล
@@ -1605,11 +1620,10 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} must be submitted,BOM {0} จะต้องส่ง
 DocType: Authorization Control,Authorization Control,ควบคุมการอนุมัติ
 apps/erpnext/erpnext/controllers/buying_controller.py +300,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},แถว # {0}: ปฏิเสธคลังสินค้ามีผลบังคับใช้กับปฏิเสธรายการ {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +731,Payment,วิธีการชำระเงิน
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,Payment,วิธีการชำระเงิน
 DocType: Production Order Operation,Actual Time and Cost,เวลาที่เกิดขึ้นจริงและค่าใช้จ่าย
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},ขอ วัสดุ สูงสุด {0} สามารถทำ รายการ {1} กับ การขายสินค้า {2}
 DocType: Employee,Salutation,ประณม
-DocType: Pricing Rule,Brand,ยี่ห้อ
 DocType: Course,Course Abbreviation,ชื่อย่อแน่นอน
 DocType: Item,Will also apply for variants,นอกจากนี้ยังจะใช้สำหรับสายพันธุ์
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +142,"Asset cannot be cancelled, as it is already {0}",สินทรัพย์ที่ไม่สามารถยกเลิกขณะที่มันมีอยู่แล้ว {0}
@@ -1621,7 +1635,7 @@
 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.",รายการสินค้า หรือบริการที่คุณ ซื้อหรือขาย ของคุณ
 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 +85,Associate,ภาคี
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,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,สร้างรายการรับ
@@ -1629,7 +1643,7 @@
 DocType: Production Planning Tool,Material Requests,จองวัสดุ
 DocType: Warranty Claim,Issue Date,วันที่ออก
 DocType: Activity Cost,Activity Cost,ค่าใช้จ่ายในกิจกรรม
-DocType: Timesheet Detail,Timesheet Detail,รายละเอียด timesheet
+DocType: Sales Invoice Timesheet,Timesheet Detail,รายละเอียด timesheet
 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),แสดงให้เห็นว่าแพคเกจเป็นส่วนหนึ่งของการส่งมอบนี้ (เฉพาะร่าง)
@@ -1652,6 +1666,7 @@
 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,มีหลากหลายรูปแบบ
 DocType: Monthly Distribution,Name of the Monthly Distribution,ชื่อของการกระจายรายเดือน
 DocType: Sales Person,Parent Sales Person,ผู้ปกครองคนขาย
@@ -1664,31 +1679,32 @@
 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 +44,"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/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.,ในคำพูดของจะสามารถมองเห็นได้เมื่อคุณบันทึกใบแจ้งหนี้การขาย
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +502,Error: {0} &gt; {1},ข้อผิดพลาด: {0}&gt; {1}
 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,เวลาการบำรุงรักษา
 ,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.,วันที่เริ่มวาระจะต้องไม่เร็วกว่าปีวันเริ่มต้นของปีการศึกษาที่คำว่ามีการเชื่อมโยง (ปีการศึกษา {}) โปรดแก้ไขวันและลองอีกครั้ง
 DocType: Naming Series,Current Value,ค่าปัจจุบัน
-apps/erpnext/erpnext/controllers/accounts_controller.py +235,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,รอบระยะเวลาบัญชีที่มีอยู่หลายสำหรับวันที่ {0} โปรดตั้ง บริษัท ในปีงบประมาณ
+apps/erpnext/erpnext/controllers/accounts_controller.py +238,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 +458,Item table can not be blank,ตาราง รายการที่ ไม่ สามารถมีช่องว่าง
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +443,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 +5,This is based on stock movement. See {0} for details,นี้ขึ้นอยู่กับการเคลื่อนไหวของหุ้น ดู {0} สำหรับรายละเอียด
 DocType: Pricing Rule,Selling,การขาย
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +341,Amount {0} {1} deducted against {2},จำนวน {0} {1} หักกับ {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +344,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,วันที่ครบกำหนด ไม่สามารถ ก่อน วันที่ประกาศ
@@ -1703,8 +1719,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +144,Cannot refer row number greater than or equal to current row number for this Charge type,ไม่ สามารถดู จำนวน แถว มากกว่าหรือ เท่ากับจำนวน แถวปัจจุบัน ค่าใช้จ่าย สำหรับประเภท นี้
 DocType: Asset,Sold,ขาย
 ,Item-wise Purchase History,ประวัติการซื้อสินค้าที่ชาญฉลาด
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Red,สีแดง
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},กรุณา คลิกที่ 'สร้าง ตาราง ' เพื่อ เรียก หมายเลขเครื่อง เพิ่มสำหรับ รายการ {0}
+apps/erpnext/erpnext/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,สั่ง เปิด การผลิต
 DocType: Sales Invoice Payment,Base Amount (Company Currency),จํานวนพื้นฐาน ( บริษัท สกุล)
@@ -1712,7 +1728,7 @@
 DocType: Installation Note,Installation Time,เวลาติดตั้ง
 DocType: Sales Invoice,Accounting Details,รายละเอียดบัญชี
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,ลบการทำธุรกรรมทั้งหมดของ บริษัท นี้
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +187,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,แถว #{0}: การดำเนินการ {1} ยังไม่เสร็จสมบูรณ์สำหรับ {2} จำนวนของสินค้าที่เสร็จแล้วตามคำสั่งผลิต # {3} โปรดปรับปรุงสถานะการทำงานผ่านทางบันทึกเวลา
+apps/erpnext/erpnext/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} โปรดปรับปรุงสถานะการทำงานผ่านทางบันทึกเวลา
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,เงินลงทุน
 DocType: Issue,Resolution Details,รายละเอียดความละเอียด
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,การจัดสรร
@@ -1748,16 +1764,17 @@
 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}
 DocType: Delivery Note,Excise Page Number,หมายเลขหน้าสรรพสามิต
 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}
 ,Maintenance Schedules,กำหนดการบำรุงรักษา
 DocType: Task,Actual End Date (via Time Sheet),ที่เกิดขึ้นจริงวันที่สิ้นสุด (ผ่านใบบันทึกเวลา)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Amount {0} {1} against {2} {3},จำนวน {0} {1} กับ {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +339,Amount {0} {1} against {2} {3},จำนวน {0} {1} กับ {2} {3}
 ,Quotation Trends,ใบเสนอราคา แนวโน้ม
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},กลุ่มสินค้าไม่ได้กล่าวถึงในหลักรายการสำหรับรายการที่ {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +295,Debit To account must be a Receivable account,เดบิตในการบัญชีจะต้องเป็นบัญชีลูกหนี้
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Receivable account,เดบิตในการบัญชีจะต้องเป็นบัญชีลูกหนี้
 DocType: Shipping Rule Condition,Shipping Amount,จำนวนการจัดส่งสินค้า
 ,Pending Amount,จำนวนเงินที่ รอดำเนินการ
 DocType: Purchase Invoice Item,Conversion Factor,ปัจจัยการเปลี่ยนแปลง
@@ -1765,10 +1782,10 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +137,Expected value after useful life must be greater than or equal to {0},ค่าที่คาดหวังหลังจากที่อายุการใช้งานจะต้องมากกว่าหรือเท่ากับ {0}
 DocType: Purchase Receipt,Vehicle Number,จำนวนยานพาหนะ
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,วันที่ใบแจ้งหนี้ที่เกิดขึ้นจะถูกหยุด
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +90,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,ใบจัดสรรรวม {0} ไม่สามารถจะน้อยกว่าการอนุมัติแล้วใบ {1} สําหรับงวด
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +93,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 +22,Enter Paid Amount,ใส่จำนวนเงินที่ชำระ
+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 หลายระดับ
@@ -1778,13 +1795,15 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,Timesheets
 DocType: HR Settings,HR Settings,การตั้งค่าทรัพยากรบุคคล
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Expense Claim is pending approval. Only the Expense Approver can update status.,ค่าใช้จ่ายที่ เรียกร้อง คือการ รอการอนุมัติ เพียง แต่ผู้อนุมัติ ค่าใช้จ่าย สามารถอัปเดต สถานะ
+DocType: Email Digest,New Expenses,ค่าใช้จ่ายใหม่
 DocType: Purchase Invoice,Additional Discount Amount,จำนวนส่วนลดเพิ่มเติม
-apps/erpnext/erpnext/controllers/accounts_controller.py +524,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",แถว # {0}: จำนวนต้องเป็น 1 เป็นรายการที่เป็นสินทรัพย์ถาวร โปรดใช้แถวแยกต่างหากสำหรับจำนวนหลาย
+apps/erpnext/erpnext/controllers/accounts_controller.py +527,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",แถว # {0}: จำนวนต้องเป็น 1 เป็นรายการที่เป็นสินทรัพย์ถาวร โปรดใช้แถวแยกต่างหากสำหรับจำนวนหลาย
 DocType: Leave Block List Allow,Leave Block List Allow,ฝากรายการบล็อกอนุญาตให้
 apps/erpnext/erpnext/setup/doctype/company/company.py +249,Abbr can not be blank or space,เงื่อนไขที่ไม่สามารถเป็นที่ว่างเปล่าหรือพื้นที่
 apps/erpnext/erpnext/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/stock/get_item_details.py +123,Please specify Company,โปรดระบุ บริษัท
 ,Customer Acquisition and Loyalty,การซื้อ ของลูกค้าและ ความจงรักภักดี
@@ -1795,17 +1814,19 @@
 apps/erpnext/erpnext/projects/doctype/task/task.js +26,Expense Claims,ค่าใช้จ่ายในการเรียกร้อง
 DocType: Issue,Support,สนับสนุน
 ,BOM Search,BOM ค้นหา
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Closing (Opening + Totals),ปิด (เปิดผลรวม +)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),ปิด (เปิดผลรวม +)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,โปรดระบุสกุลเงินใน บริษัท
 DocType: Workstation,Wages per hour,ค่าจ้างต่อชั่วโมง
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +50,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,ต่อไปนี้ขอวัสดุได้รับการยกโดยอัตโนมัติตามระดับสั่งซื้อใหม่ของรายการ
-apps/erpnext/erpnext/controllers/accounts_controller.py +272,Account {0} is invalid. Account Currency must be {1},บัญชี {0} ไม่ถูกต้อง สกุลเงินในบัญชีจะต้องเป็น {1}
+DocType: Email Digest,Pending Sales Orders,รอดำเนินการคำสั่งขาย
+apps/erpnext/erpnext/controllers/accounts_controller.py +275,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 +956,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","แถว # {0}: การอ้างอิงเอกสารชนิดต้องเป็นหนึ่งในการสั่งซื้อสินค้าขาย, การขายใบแจ้งหนี้หรือวารสารรายการ"
-DocType: Salary Slip,Deduction,การหัก
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +87,Row {0}: From Time and To Time is mandatory.,แถว {0}: จากเวลาและต้องการเวลามีผลบังคับใช้
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +969,"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 +111,Row {0}: From Time and To Time is mandatory.,แถว {0}: จากเวลาและต้องการเวลามีผลบังคับใช้
+DocType: Stock Reconciliation Item,Amount Difference,จำนวนเงินที่แตกต่าง
 apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},รายการสินค้าเพิ่มสำหรับ {0} ในราคา {1}
 DocType: Address Template,Address Template,แม่แบบที่อยู่
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +7,Please enter Employee Id of this sales person,กรุณากรอกพนักงาน Id นี้คนขาย
@@ -1813,7 +1834,7 @@
 DocType: Project,% Tasks Completed,% งานที่เสร็จสมบูรณ์แล้ว
 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 +194,Please enter Production Item first,กรุณากรอก ผลิต รายการ แรก
+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,ผู้พิการ
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,ใบเสนอราคา
@@ -1822,53 +1843,54 @@
 DocType: Maintenance Visit,Maintenance User,ผู้บำรุงรักษา
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +149,Cost Updated,ค่าใช้จ่ายในการปรับปรุง
 DocType: Employee,Date of Birth,วันเกิด
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +86,Item {0} has already been returned,รายการ {0} ได้รับ กลับมา แล้ว
+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: 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 +177,Job Description,รายละเอียดตำแหน่งงาน
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,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 +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","อักขระพิเศษยกเว้น ""-"" ""."", ""#"" และ ""/"" ไม่ได้รับอนุญาตในการตั้งชื่อชุด"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","อักขระพิเศษยกเว้น ""-"" ""."", ""#"" และ ""/"" ไม่ได้รับอนุญาตในการตั้งชื่อชุด"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.",ติดตามงานส่งเสริมการขาย ติดตามช่องทาง ใบเสนอราคา ใบสั่งขายต่างๆ ฯลฯ จากงานส่งเสริมการตลาดเพื่อวัดอัตราผลตอบแทนจากการลงทุน
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +24,Welcome to POS: Create your POS Profile,ยินดีต้อนรับสู่ POS: สร้างโปรไฟล์ของคุณ POS
 DocType: Expense Claim,Approver,อนุมัติ
 ,SO Qty,ดังนั้น จำนวน
+DocType: Guardian,Work Address,ที่อยู่ที่ทำงาน
 DocType: Appraisal,Calculate Total Score,คำนวณคะแนนรวม
 DocType: Request for Quotation,Manufacturing Manager,ผู้จัดการฝ่ายผลิต
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},อนุกรม ไม่มี {0} อยู่ภายใต้การ รับประกัน ไม่เกิน {1}
+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 +74,Shipments,การจัดส่ง
+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,ไม่มี Serial {0} ไม่ได้อยู่ในโกดังสินค้าใด ๆ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,Row # ,แถว #
+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 +156,Get From,ได้รับจาก
+apps/erpnext/erpnext/public/js/utils.js +167,Get From,ได้รับจาก
 DocType: C-Form,Quarter,ไตรมาส
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Miscellaneous Expenses,ค่าใช้จ่าย เบ็ดเตล็ด
 DocType: Global Defaults,Default Company,บริษัท เริ่มต้น
 apps/erpnext/erpnext/controllers/stock_controller.py +167,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,ค่าใช้จ่าย หรือ ความแตกต่าง บัญชี มีผลบังคับใช้ กับ รายการ {0} ที่มัน มีผลกระทบต่อ มูลค่า หุ้น โดยรวม
-apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings",ไม่สามารถ overbill สำหรับรายการ {0} ในแถว {1} มากกว่า {2} ที่จะอนุญาตให้ overbilling โปรดตั้งในการตั้งค่าสต็อก
+apps/erpnext/erpnext/controllers/accounts_controller.py +419,"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,- ขึ้นไป
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} is disabled,ผู้ใช้ {0} ถูกปิดใช้งาน
 DocType: Leave Application,Total Leave Days,วันที่เดินทางทั้งหมด
 DocType: Email Digest,Note: Email will not be sent to disabled users,หมายเหตุ: อีเมล์ของคุณจะไม่ถูกส่งไปยังผู้ใช้คนพิการ
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,เลือก บริษัท ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,เว้นไว้หากพิจารณาให้หน่วยงานทั้งหมด
 apps/erpnext/erpnext/config/hr.py +171,"Types of employment (permanent, contract, intern etc.).",ประเภท ของการจ้างงาน ( ถาวร สัญญา ฝึกงาน ฯลฯ )
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +346,{0} is mandatory for Item {1},{0} จำเป็นสำหรับ รายการ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,{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",กรุณาเลือกจำนวนเงินที่จัดสรรประเภทใบแจ้งหนี้และจำนวนใบแจ้งหนี้ในอย่างน้อยหนึ่งแถว
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,ต้นทุนในการซื้อใหม่
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},การสั่งซื้อสินค้า ที่จำเป็นสำหรับการ ขาย สินค้า {0}
 DocType: Purchase Invoice Item,Rate (Company Currency),อัตรา (สกุลเงิน บริษัท )
-apps/erpnext/erpnext/demo/setup_data.py +360,Others,คนอื่น ๆ
+DocType: Student Guardian,Others,คนอื่น ๆ
 DocType: Payment Entry,Unallocated Amount,จํานวนเงินที่ไม่ได้ปันส่วน
 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,ภาษีและค่าบริการ
@@ -1879,7 +1901,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,กรุณา คลิกที่ 'สร้าง ตาราง ' ที่จะได้รับ ตารางเวลา
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +53,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/public/js/setup_wizard.js +52,"e.g. ""Build tools for builders""","เช่น ""เครื่องมือการสร้างสำหรับผู้ก่อสร้าง """
 DocType: Quality Inspection,In Process,ในกระบวนการ
 DocType: Authorization Rule,Itemwise Discount,ส่วนลด Itemwise
 apps/erpnext/erpnext/config/accounts.py +69,Tree of financial accounts.,ต้นไม้ของบัญชีการเงิน
@@ -1888,17 +1910,16 @@
 apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,เนื่องสินค้าคงคลัง
 DocType: Activity Type,Default Billing Rate,เริ่มต้นอัตราการเรียกเก็บเงิน
 DocType: Sales Invoice,Total Billing Amount,การเรียกเก็บเงินจำนวนเงินรวม
-apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +54,Receivable Account,ลูกหนี้การค้า
-apps/erpnext/erpnext/controllers/accounts_controller.py +546,Row #{0}: Asset {1} is already {2},แถว # {0}: สินทรัพย์ {1} อยู่แล้ว {2}
+apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,ลูกหนี้การค้า
+apps/erpnext/erpnext/controllers/accounts_controller.py +549,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 +79,CEO,ผู้บริหารสูงสุด
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,ผู้บริหารสูงสุด
 DocType: Expense Claim Detail,Expense Claim Detail,รายละเอียดค่าใช้จ่ายสินไหม
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +808,Please select correct account,กรุณาเลือกบัญชีที่ถูกต้อง
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +809,Please select correct account,กรุณาเลือกบัญชีที่ถูกต้อง
 DocType: Item,Weight UOM,UOM น้ำหนัก
 DocType: Salary Structure Employee,Salary Structure Employee,พนักงานโครงสร้างเงินเดือน
 DocType: Employee,Blood Group,กรุ๊ปเลือด
-DocType: Purchase Invoice Item,Page Break,แบ่งหน้า
 DocType: Production Order Operation,Pending,คาราคาซัง
 DocType: Course,Course Name,หลักสูตรการอบรม
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,ผู้ใช้ที่สามารถอนุมัติพนักงานเฉพาะแอพพลิเคลา
@@ -1907,14 +1928,15 @@
 DocType: Fiscal Year,Companies,บริษัท
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,อิเล็กทรอนิกส์
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,ยกคำขอวัสดุเมื่อหุ้นถึงระดับใหม่สั่ง
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Full-time,เต็มเวลา
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,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: 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,ค่าเข้ามาทั้งหมด
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Debit To is required,เดบิตในการที่จะต้อง
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +321,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,ผู้จัดการคุณภาพ
@@ -1922,6 +1944,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/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
@@ -1932,18 +1955,17 @@
 DocType: Production Order Operation,Completed Qty,จำนวนเสร็จ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"For {0}, only debit accounts can be linked against another credit entry",มีบัญชีประเภทเดบิตเท่านั้น ที่สามารถเชื่อมโยงกับรายการประเภทเครดิต สำหรับ {0}
 apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,ราคา {0} ถูกปิดใช้งาน
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +99,Row {0}: Completed Qty cannot be more than {1} for operation {2},แถว {0}: เสร็จสมบูรณ์จำนวนไม่ได้มากกว่า {1} สำหรับการดำเนินงาน {2}
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +123,Row {0}: Completed Qty cannot be more than {1} for operation {2},แถว {0}: เสร็จสมบูรณ์จำนวนไม่ได้มากกว่า {1} สำหรับการดำเนินงาน {2}
 DocType: Manufacturing Settings,Allow Overtime,อนุญาตให้ทำงานล่วงเวลา
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} หมายเลข Serial จำเป็นสำหรับรายการ {1} คุณได้ให้ {2}
 DocType: Stock Reconciliation Item,Current Valuation Rate,อัตราการประเมินมูลค่าปัจจุบัน
 DocType: Item,Customer Item Codes,ลูกค้ารหัสสินค้า
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,กำไรจากอัตราแลกเปลี่ยน / ขาดทุน
 DocType: Opportunity,Lost Reason,เหตุผลที่สูญหาย
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,กรุณาตั้งค่าหมายเลขชุดสำหรับการเข้าร่วมผ่านการตั้งค่า&gt; เลขซีรีส์
 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/purchase_receipt/purchase_receipt.py +378,All items have already been invoiced,รายการทั้งหมดที่ ได้รับการ ออกใบแจ้งหนี้ แล้ว
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +379,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,ภายนอก
@@ -1959,18 +1981,19 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,ลูกค้าของคุณ
 apps/erpnext/erpnext/projects/doctype/project/project.py +141,You have been invited to collaborate on the project: {0},คุณได้รับเชิญที่จะทำงานร่วมกันในโครงการ: {0}
 DocType: Leave Block List Date,Block Date,บล็อกวันที่
-apps/erpnext/erpnext/templates/generators/job_opening.html +19,Apply Now,ลงทะเบียนเลย
+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.",การสร้างและจัดการ รายวันรายสัปดาห์ และรายเดือน ย่อยสลาย ทางอีเมล์
 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,สิ่งปลูกสร้าง
-apps/erpnext/erpnext/utilities/doctype/address/address.py +164,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,ไม่มีแม่แบบที่อยู่เริ่มต้นพบว่า กรุณาสร้างขึ้นมาใหม่จากการตั้งค่า&gt; การพิมพ์และการสร้างแบรนด์&gt; แม่แบบที่อยู่
 DocType: Fee Structure,Fee Structure,โครงสร้างค่าธรรมเนียม
 DocType: Timesheet Detail,Costing Amount,ต้นทุนปริมาณ
+DocType: Student Admission,Application Fee,ค่าธรรมเนียมการสมัคร
 DocType: Process Payroll,Submit Salary Slip,ส่งสลิปเงินเดือน
-apps/erpnext/erpnext/controllers/selling_controller.py +161,Maxiumm discount for Item {0} is {1}%,ส่วนลด Maxiumm กับ รายการ {0} เป็น {1} %
+apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,ส่วนลด Maxiumm กับ รายการ {0} เป็น {1} %
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,การนำเข้าสินค้าในกลุ่ม
 DocType: Sales Partner,Address & Contacts,ที่อยู่ติดต่อ &amp;
 DocType: SMS Log,Sender Name,ชื่อผู้ส่ง
@@ -1995,21 +2018,21 @@
 DocType: Serial No,Delivery Time,เวลาจัดส่งสินค้า
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,เอจจิ้ง อยู่ ที่
 DocType: Item,End of Life,ในตอนท้ายของชีวิต
-apps/erpnext/erpnext/demo/setup_data.py +361,Travel,การเดินทาง
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +155,No active or default Salary Structure found for employee {0} for the given dates,ไม่มีการใช้งานหรือเริ่มต้นโครงสร้างเงินเดือนของพนักงานพบ {0} สำหรับวันที่กำหนด
+apps/erpnext/erpnext/demo/setup/setup_data.py +304,Travel,การเดินทาง
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +167,No active or default Salary Structure found for employee {0} for the given dates,ไม่มีการใช้งานหรือเริ่มต้นโครงสร้างเงินเดือนของพนักงานพบ {0} สำหรับวันที่กำหนด
 DocType: Leave Block List,Allow Users,อนุญาตให้ผู้ใช้งาน
 DocType: Purchase Order,Customer Mobile No,มือถือของลูกค้าไม่มี
 DocType: Sales Invoice,Recurring,การคืน
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,ติดตามรายได้และค่าใช้จ่ายแยกต่างหากสำหรับแนวดิ่งผลิตภัณฑ์หรือหน่วยงาน
 DocType: Rename Tool,Rename Tool,เปลี่ยนชื่อเครื่องมือ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +23,Update Cost,ปรับปรุง ค่าใช้จ่าย
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,ปรับปรุง ค่าใช้จ่าย
 DocType: Item Reorder,Item Reorder,รายการ Reorder
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +36,Show Salary Slip,สลิปเงินเดือนที่ต้องการแสดง
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +748,Transfer Material,โอน วัสดุ
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +53,Show Salary Slip,สลิปเงินเดือนที่ต้องการแสดง
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +166,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 +923,Please set recurring after saving,กรุณาตั้งค่าที่เกิดขึ้นหลังจากการบันทึก
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +646,Select change amount account,บัญชีจำนวนเงินที่เลือกเปลี่ยน
+apps/erpnext/erpnext/public/js/controllers/transaction.js +914,Please set recurring after saving,กรุณาตั้งค่าที่เกิดขึ้นหลังจากการบันทึก
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +703,Select change amount account,บัญชีจำนวนเงินที่เลือกเปลี่ยน
 DocType: Purchase Invoice,Price List Currency,สกุลเงินรายการราคา
 DocType: Naming Series,User must always select,ผู้ใช้จะต้องเลือก
 DocType: Stock Settings,Allow Negative Stock,อนุญาตให้สต็อกเชิงลบ
@@ -2021,31 +2044,32 @@
 DocType: Quality Inspection,Verified By,ตรวจสอบโดย
 DocType: Address,Subsidiary,บริษัท สาขา
 apps/erpnext/erpnext/setup/doctype/company/company.py +64,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.",ไม่สามารถเปลี่ยน สกุลเงินเริ่มต้น ของ บริษัท เนื่องจากมี การทำธุรกรรม ที่มีอยู่ รายการที่ จะต้อง ยกเลิก การเปลี่ยน สกุลเงินเริ่มต้น
+DocType: Grade Interval,Grade Description,ชั้นประถมศึกษาปีคำอธิบาย
 DocType: Quality Inspection,Purchase Receipt No,หมายเลขใบเสร็จรับเงิน (ซื้อ)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,เงินมัดจำ
 DocType: Process Payroll,Create Salary Slip,สร้างสลิปเงินเดือน
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +33,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 +352,Quantity in row {0} ({1}) must be same as manufactured quantity {2},จำนวน ในแถว {0} ({1} ) จะต้อง เป็นเช่นเดียวกับ ปริมาณ การผลิต {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Quantity in row {0} ({1}) must be same as manufactured quantity {2},จำนวน ในแถว {0} ({1} ) จะต้อง เป็นเช่นเดียวกับ ปริมาณ การผลิต {2}
 DocType: Appraisal,Employee,ลูกจ้าง
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,เชิญผู้ใช้
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} ได้ถูกเรียกเก็บเงินเต็มจำนวน
 DocType: Workstation Working Hour,End Time,เวลาสิ้นสุด
 DocType: Payment Entry,Payment Deductions or Loss,การหักเงินชำระเงินหรือการสูญเสีย
-apps/erpnext/erpnext/config/schools.py +100,LMS,LMS
+apps/erpnext/erpnext/config/schools.py +104,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,ท่อขาย
 DocType: Student Batch Student,Student Batch Student,นักศึกษาชุดนักศึกษา
-DocType: Sales Invoice,Mass Mailing,จดหมายมวล
+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 +199,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/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 +297,Salary Slip of employee {0} already created for this period,สลิปเงินเดือนของพนักงาน {0} สร้างไว้แล้วสำหรับช่วงเวลานี้
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Pharmaceutical,เภสัชกรรม
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +309,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/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,เครดิต
@@ -2060,27 +2084,28 @@
 DocType: Upload Attendance,Attendance To Date,วันที่เข้าร่วมประชุมเพื่อ
 DocType: Warranty Claim,Raised By,โดยยก
 DocType: Payment Gateway Account,Payment Account,บัญชีการชำระเงิน
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +814,Please specify Company to proceed,โปรดระบุ บริษัท ที่จะดำเนินการ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +793,Please specify Company to proceed,โปรดระบุ บริษัท ที่จะดำเนินการ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Receivable,เปลี่ยนสุทธิในบัญชีลูกหนี้
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Compensatory Off,ชดเชย ปิด
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,ชดเชย ปิด
 DocType: Quality Inspection Reading,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.,โปรดตรวจสอบว่าคุณต้องการที่จะลบการทำธุรกรรมทั้งหมดของ บริษัท นี้ ข้อมูลหลักของคุณจะยังคงอยู่อย่างที่มันเป็น การดำเนินการนี้ไม่สามารถยกเลิกได้
 DocType: Room,Room Number,หมายเลขห้อง
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},การอ้างอิงที่ไม่ถูกต้อง {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +161,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ไม่สามารถจะสูงกว่าที่วางแผนไว้ quanitity ({2}) ในการสั่งซื้อการผลิต {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +162,{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 +217,Raw Materials cannot be blank.,วัตถุดิบไม่สามารถมีช่องว่าง
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,"Could not update stock, invoice contains drop shipping item.","ไม่สามารถอัปเดสต็อก, ใบแจ้งหนี้ที่มีรายการการขนส่งลดลง"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +460,Quick Journal Entry,วารสารรายการด่วน
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +111,You can not change rate if BOM mentioned agianst any item,คุณไม่สามารถเปลี่ยน อัตรา ถ้า BOM กล่าว agianst รายการใด ๆ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +441,"Could not update stock, invoice contains drop shipping item.","ไม่สามารถอัปเดสต็อก, ใบแจ้งหนี้ที่มีรายการการขนส่งลดลง"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Quick Journal Entry,วารสารรายการด่วน
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +103,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 +214,{0} {1} is not submitted,{0} {1} ยังไม่ได้ส่ง
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,ขอรายการ
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,เพื่อผลิตแยกจะถูกสร้างขึ้นสำหรับรายการที่ดีในแต่ละสำเร็จรูป
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +121,{0} must be negative in return document,{0} &#39;จะต้องลบในเอกสารย้อนกลับ
 ,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.,ชื่อของสถาบันที่คุณมีการตั้งค่าระบบนี้
@@ -2089,16 +2114,17 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,สถานะโครงการ
 DocType: UOM,Check this to disallow fractions. (for Nos),ตรวจสอบนี้จะไม่อนุญาตให้เศษส่วน (สำหรับ Nos)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +398,The following Production Orders were created:,คำสั่งซื้อการผลิตต่อไปนี้ถูกสร้าง:
+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 +739,Item or Warehouse for row {0} does not match Material Request,สินค้าหรือ โกดัง แถว {0} ไม่ตรงกับที่ ขอ วัสดุ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +747,Item or Warehouse for row {0} does not match Material Request,สินค้าหรือ โกดัง แถว {0} ไม่ตรงกับที่ ขอ วัสดุ
 apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,หน่วยของการวัด
 DocType: Fiscal Year,Year End Date,ปีที่จบ วันที่
 DocType: Task Depends On,Task Depends On,ขึ้นอยู่กับงาน
-DocType: Lead,Opportunity,โอกาส
+DocType: Supplier Quotation,Opportunity,โอกาส
 ,Completed Production Orders,เสร็จสิ้นการ สั่งซื้อ การผลิต
 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,เวิร์คสเตชั่เริ่มต้น
@@ -2111,7 +2137,7 @@
 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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},วันที่เริ่มต้น การบำรุงรักษา ไม่สามารถ ก่อนวัน ส่งสำหรับ อนุกรม ไม่มี {0}
+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,วันที่สิ้นสุดจริง
 DocType: Purchase Invoice,PINV-,PINV-
 DocType: Authorization Rule,Applicable To (Role),ที่ใช้บังคับกับ (Role)
@@ -2126,7 +2152,7 @@
 DocType: SMS Log,No of Requested SMS,ไม่มีของ SMS ขอ
 DocType: Campaign,Campaign-.####,แคมเปญ . # # # #
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,ขั้นตอนถัดไป
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,Please supply the specified items at the best possible rates,กรุณาจัดหารายการที่ระบุในอัตราที่ดีที่สุด
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +695,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 +117,Contract End Date must be greater than Date of Joining,วันที่สิ้นสุด สัญญา จะต้องมากกว่า วันที่ เข้าร่วม
 DocType: Delivery Note,DN-,DN-
@@ -2135,7 +2161,7 @@
 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 +14,This is an example website auto-generated from ERPNext,เว็บไซต์ นี้เป็น ตัวอย่างที่สร้างขึ้นโดยอัตโนมัติ จาก ERPNext
+apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,เว็บไซต์ นี้เป็น ตัวอย่างที่สร้างขึ้นโดยอัตโนมัติ จาก ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,ช่วงสูงอายุ 1
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
@@ -2182,13 +2208,14 @@
 DocType: Purchase Receipt Item,Recd Quantity,จำนวน Recd
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +54,Fee Records Created - {0},ค่าธรรมเนียมระเบียนที่สร้าง - {0}
 DocType: Asset Category Account,Asset Category Account,บัญชีสินทรัพย์ประเภท
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +103,Cannot produce more Item {0} than Sales Order quantity {1},ไม่สามารถผลิต สินค้า ได้มากขึ้น {0} กว่าปริมาณ การขายสินค้า {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Stock Entry {0} is not submitted,หุ้นรายการ {0} ไม่ได้ส่ง
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},ไม่สามารถผลิต สินค้า ได้มากขึ้น {0} กว่าปริมาณ การขายสินค้า {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +505,Stock Entry {0} is not submitted,หุ้นรายการ {0} ไม่ได้ส่ง
 DocType: Payment Reconciliation,Bank / Cash Account,บัญชีเงินสด / ธนาคาร
 DocType: Tax Rule,Billing City,เมืองการเรียกเก็บเงิน
 DocType: Salary Component Account,Salary Component Account,บัญชีเงินเดือนตัวแทน
 DocType: Global Defaults,Hide Currency Symbol,ซ่อนสัญลักษณ์สกุลเงิน
 apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card","เช่นธนาคาร, เงินสด, บัตรเครดิต"
+DocType: Lead Source,Source Name,แหล่งที่มาของชื่อ
 DocType: Journal Entry,Credit Note,หมายเหตุเครดิต
 DocType: Warranty Claim,Service Address,ที่อยู่บริการ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furnitures and Fixtures,เฟอร์นิเจอร์และติดตั้ง
@@ -2200,6 +2227,7 @@
 DocType: Opportunity,Customer / Lead Name,ลูกค้า / ชื่อ
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +89,Clearance Date not mentioned,โปรโมชั่น วันที่ ไม่ได้กล่าวถึง
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,การผลิต
+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/controllers/trends.py +19,Total(Qty),รวม (จำนวน)
 DocType: Sales Invoice,This Document,เอกสารฉบับนี้
@@ -2211,15 +2239,15 @@
 DocType: Purchase Receipt,Time at which materials were received,เวลาที่ได้รับวัสดุ
 DocType: Stock Ledger Entry,Outgoing Rate,อัตราการส่งออก
 apps/erpnext/erpnext/config/hr.py +176,Organization branch master.,ปริญญาโท สาขา องค์กร
-apps/erpnext/erpnext/controllers/accounts_controller.py +273, or ,หรือ
+apps/erpnext/erpnext/controllers/accounts_controller.py +276, 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 +203,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,แถว # {0}: วารสารรายการ {1} ไม่มีบัญชี {2} หรือมีอยู่แล้วจับคู่กับบัตรกำนัลอื่น
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +206,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 +90,No employee for the above selected criteria OR salary slip already created,ไม่มีพนักงานสำหรับเกณฑ์ที่เลือกข้างต้นหรือสลิปเงินเดือนที่สร้างไว้แล้ว
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +93,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,ประเภท การชำระเงิน
@@ -2247,8 +2275,8 @@
 DocType: Product Bundle,Parent Item,รายการหลัก
 DocType: Account,Account Type,ประเภทบัญชี
 DocType: Delivery Note,DN-RET-,DN-RET-
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +115,Leave Type {0} cannot be carry-forwarded,ฝากประเภท {0} ไม่สามารถดำเนินการส่งต่อ-
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',ตาราง การบำรุงรักษา ที่ไม่ได้ สร้างขึ้นสำหรับ รายการทั้งหมด กรุณา คลิกที่ 'สร้าง ตาราง '
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +118,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 +163,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",แถว {0} ใน {1} ที่จะรวม {2} ในอัตรารายการแถว {3} จะต้องรวม
@@ -2260,13 +2288,13 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +32,Disabled template must not be default template,แม่แบบสำหรับผู้พิการจะต้องไม่เป็นแม่แบบเริ่มต้น
 DocType: Account,Income Account,บัญชีรายได้
 DocType: Payment Request,Amount in customer's currency,จำนวนเงินในสกุลเงินของลูกค้า
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +748,Delivery,การจัดส่งสินค้า
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +742,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,พื้นที่ความรับผิดชอบหลัก
 DocType: Payment Entry,Total Allocated Amount,จำนวนเงินที่ได้รับจัดสรร
 DocType: Item Reorder,Material Request Type,ประเภทของการขอวัสดุ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +82,Row {0}: UOM Conversion Factor is mandatory,แถว {0}: UOM ปัจจัยการแปลงมีผลบังคับใช้
+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,ศูนย์ต้นทุน
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,บัตรกำนัล #
@@ -2277,13 +2305,13 @@
 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 +90,Head of Marketing and Sales,หัวหน้าฝ่ายการตลาด และการขาย
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,ภาษีเงินได้
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,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 +403,Please enter Item Code to get batch no,กรุณากรอก รหัสสินค้า ที่จะได้รับ ชุด ไม่
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +770,Please select a value for {0} quotation_to {1},กรุณาเลือก ค่าสำหรับ {0} quotation_to {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +397,Please enter Item Code to get batch no,กรุณากรอก รหัสสินค้า ที่จะได้รับ ชุด ไม่
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +764,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",การควบรวมจะเป็นไปได้ถ้าคุณสมบัติต่อไปนี้จะเหมือนกันทั้งในบันทึก เป็นกลุ่มประเภทราก บริษัท
@@ -2295,28 +2323,29 @@
 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 +100,Issues,ปัญหา
+apps/erpnext/erpnext/hooks.py +109,Issues,ปัญหา
 apps/erpnext/erpnext/controllers/status_updater.py +13,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,การเรียกเก็บเงินสกุลเงิน
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Large,ขนาดใหญ่พิเศษ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,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 +507,Warning: Another {0} # {1} exists against stock entry {2},คำเตือน: อีก {0} # {1} อยู่กับรายการหุ้น {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Local,ในประเทศ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +508,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),เงินให้กู้ยืม และ เงินทดรอง ( สินทรัพย์ )
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,ลูกหนี้
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Large,ใหญ่
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,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 +225,Total {0} ({1}),รวม {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +224,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,วิธีการประเมินค่าเริ่มต้น
@@ -2374,9 +2403,9 @@
 DocType: Attendance,Leave Type,ฝากประเภท
 apps/erpnext/erpnext/controllers/stock_controller.py +173,Expense / Difference account ({0}) must be a 'Profit or Loss' account,ค่าใช้จ่ายบัญชี / แตกต่าง ({0}) จะต้องเป็นบัญชี 'กำไรหรือขาดทุน'
 DocType: Account,Accounts User,ผู้ใช้งานบัญชี
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Name error: {0},ข้อผิดพลาดชื่อ: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +90,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 +178,{0} {1} does not associated with {2} {3},{0} {1} ไม่เชื่อมโยงกับ {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +181,{0} {1} does not associated with {2} {3},{0} {1} ไม่เชื่อมโยงกับ {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,เข้าร่วม สำหรับพนักงาน {0} จะถูกทำเครื่องหมาย แล้ว
 DocType: Packing Slip,If more than one package of the same type (for print),หากมีมากกว่าหนึ่งแพคเกจประเภทเดียวกัน (พิมพ์)
 DocType: Warehouse,Parent Warehouse,คลังสินค้าผู้ปกครอง
@@ -2395,7 +2424,7 @@
 DocType: BOM Item,Scrap %,เศษ%
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection",ค่าใช้จ่ายจะถูกกระจายไปตามสัดส่วนในปริมาณรายการหรือจำนวนเงินตามที่คุณเลือก
 DocType: Maintenance Visit,Purposes,วัตถุประสงค์
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,อย่างน้อยหนึ่งรายการที่ควรจะใส่ที่มีปริมาณเชิงลบในเอกสารกลับมา
+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 +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations",การดำเนินงาน {0} นานกว่าชั่วโมงการทำงานใด ๆ ที่มีอยู่ในเวิร์กสเตชัน {1} ทำลายลงการดำเนินงานในการดำเนินงานหลาย
 ,Requested,ร้องขอ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +83,No Remarks,หมายเหตุไม่มี
@@ -2407,46 +2436,46 @@
 DocType: Item,Total Projected Qty,รวมประมาณการจำนวน
 DocType: Monthly Distribution,Distribution Name,ชื่อการแจกจ่าย
 DocType: Course,Course Code,รหัสรายวิชา
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Quality Inspection required for Item {0},การตรวจสอบคุณภาพ ที่จำเป็นสำหรับ รายการ {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Quality Inspection required for Item {0},การตรวจสอบคุณภาพ ที่จำเป็นสำหรับ รายการ {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,อัตราที่สกุลเงินของลูกค้าจะถูกแปลงเป็นสกุลเงินหลักของ บริษัท
 DocType: Purchase Invoice Item,Net Rate (Company Currency),อัตราการสุทธิ (บริษัท สกุลเงิน)
 DocType: Salary Detail,Condition and Formula Help,เงื่อนไขและสูตรช่วยเหลือ
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,จัดการ ต้นไม้ มณฑล
 DocType: Journal Entry Account,Sales Invoice,ขายใบแจ้งหนี้
 DocType: Journal Entry Account,Party Balance,ยอดคงเหลือพรรค
-apps/erpnext/erpnext/accounts/page/pos/pos.js +475,Please select Apply Discount On,กรุณาเลือกใช้ส่วนลด
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +92,Salary Slip Created,สลิปเงินเดือนที่ต้องการสร้าง
+apps/erpnext/erpnext/accounts/page/pos/pos.js +464,Please select Apply Discount On,กรุณาเลือกใช้ส่วนลด
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +95,Salary Slip Created,สลิปเงินเดือนที่ต้องการสร้าง
 DocType: Company,Default Receivable Account,บัญชีเริ่มต้นลูกหนี้
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,สร้างธนาคารรับสมัครสำหรับเงินเดือนทั้งหมดที่จ่ายสำหรับเกณฑ์ที่เลือกข้างต้น
 DocType: Stock Entry,Material Transfer for Manufacture,โอนวัสดุสำหรับการผลิต
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,ร้อยละส่วนลดสามารถนำไปใช้อย่างใดอย่างหนึ่งกับราคาหรือราคาตามรายการทั้งหมด
 DocType: Purchase Invoice,Half-yearly,รายหกเดือน
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +384,Accounting Entry for Stock,เข้าบัญชีสำหรับสต็อก
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +387,Accounting Entry for Stock,เข้าบัญชีสำหรับสต็อก
 DocType: Sales Invoice,Sales Team1,ขาย Team1
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,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 +96,Row {0}: Completed Qty must be greater than zero.,แถว {0}: เสร็จสมบูรณ์จำนวนจะต้องมากกว่าศูนย์
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +120,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 +88,Row # {0}: Cannot return more than {1} for Item {2},แถว # {0}: ไม่สามารถกลับมามากกว่า {1} สำหรับรายการ {2}
+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,พล็อต
 DocType: Item Group,Show this slideshow at the top of the page,แสดงภาพสไลด์นี้ที่ด้านบนของหน้า
 DocType: BOM,Item UOM,UOM รายการ
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),จํานวนเงินภาษีหลังจากที่จำนวนส่วนลด (บริษัท สกุลเงิน)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +147,Target warehouse is mandatory for row {0},คลังสินค้า เป้าหมาย จำเป็นสำหรับ แถว {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,เลือกที่อยู่ผู้ผลิต
 DocType: Quality Inspection,Quality Inspection,การตรวจสอบคุณภาพ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Extra Small,ขนาดเล็กเป็นพิเศษ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,Warning: Material Requested Qty is less than Minimum Order Qty,คำเตือน: ขอ วัสดุ จำนวน น้อยกว่า จำนวน สั่งซื้อขั้นต่ำ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +194,Account {0} is frozen,บัญชี {0} จะถูก แช่แข็ง
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,ขนาดเล็กเป็นพิเศษ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +690,Warning: Material Requested Qty is less than Minimum Order Qty,คำเตือน: ขอ วัสดุ จำนวน น้อยกว่า จำนวน สั่งซื้อขั้นต่ำ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,บัญชี {0} จะถูก แช่แข็ง
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,นิติบุคคล / สาขา ที่มีผังบัญชีแยกกัน ภายใต้องค์กร
 DocType: Payment Request,Mute Email,ปิดเสียงอีเมล์
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","อาหาร, เครื่องดื่ม และ ยาสูบ"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +606,Can only make payment against unbilled {0},สามารถชำระเงินยังไม่เรียกเก็บกับ {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +126,Commission rate cannot be greater than 100,อัตราค่านายหน้า ไม่สามารถ จะมากกว่า 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +609,Can only make payment against unbilled {0},สามารถชำระเงินยังไม่เรียกเก็บกับ {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,อัตราค่านายหน้า ไม่สามารถ จะมากกว่า 100
 DocType: Stock Entry,Subcontract,สัญญารับช่วง
 apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,กรุณากรอก {0} แรก
 DocType: Production Order Operation,Actual End Time,เวลาสิ้นสุดที่เกิดขึ้นจริง
@@ -2457,30 +2486,30 @@
 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 +158,Colour,สี
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,สี
 DocType: Maintenance Visit,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 สินค้าอื่น ๆ
 DocType: Student Log,Academic,วิชาการ
-apps/erpnext/erpnext/controllers/accounts_controller.py +469,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),ล่วงหน้ารวม ({0}) กับการสั่งซื้อ {1} ไม่สามารถจะสูงกว่าแกรนด์รวม ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +472,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),ล่วงหน้ารวม ({0}) กับการสั่งซื้อ {1} ไม่สามารถจะสูงกว่าแกรนด์รวม ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,เลือกการกระจายรายเดือนที่จะไม่สม่ำเสมอกระจายเป้าหมายข้ามเดือน
 DocType: Purchase Invoice Item,Valuation Rate,อัตราการประเมิน
+DocType: Stock Reconciliation,SR/,อาร์ /
 apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,สกุลเงิน ราคา ไม่ได้เลือก
 DocType: Assessment,Results,ผล
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +168,Employee {0} has already applied for {1} between {2} and {3},พนักงาน {0} ได้ใช้ แล้วสำหรับ {1} ระหว่าง {2} และ {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +175,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: Student Applicant,Father's/ Guardian 2 Email ID,/ การ์เดียนหมายเลข 2 อีเมล์ของพระบิดา
 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 +228,Warehouses with existing transaction can not be converted to group.,โกดังกับการทำธุรกรรมที่มีอยู่ไม่สามารถแปลงไปยังกลุ่ม
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +231,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 +93,Researcher,นักวิจัย
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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.,การตรวจสอบคุณภาพที่เข้ามา
@@ -2492,25 +2521,25 @@
 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: Sales Invoice,Advertisement,การโฆษณา
 DocType: Asset Category Account,Depreciation Expense Account,บัญชีค่าเสื่อมราคาค่าใช้จ่าย
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Probationary Period,ระยะเวลาการฝึกงาน
-apps/erpnext/erpnext/hooks.py +102,Announcements,ประกาศ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,ระยะเวลาการฝึกงาน
+apps/erpnext/erpnext/hooks.py +111,Announcements,ประกาศ
 DocType: Customer Group,Only leaf nodes are allowed in transaction,โหนดใบเท่านั้นที่จะเข้าในการทำธุรกรรม
 DocType: Expense Claim,Expense Approver,ค่าใช้จ่ายที่อนุมัติ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +109,Row {0}: Advance against Customer must be credit,แถว {0}: ล่วงหน้ากับลูกค้าจะต้องมีเครดิต
 apps/erpnext/erpnext/accounts/doctype/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 +16,To Datetime,เพื่อ Datetime
+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/scheduling_tool/scheduling_tool.py +51,Course Schedules deleted:,ตารางหลักสูตรการลบ:
 apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,บันทึกการรักษาสถานะการจัดส่งทาง SMS
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,ที่รอดำเนินการกิจกรรม
+DocType: Accounts Settings,Make Payment via Journal Entry,ชำระเงินผ่านวารสารรายการ
+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 +127,Please enter relieving date.,กรุณากรอก วันที่ บรรเทา
-apps/erpnext/erpnext/controllers/trends.py +145,Amt,amt
+apps/erpnext/erpnext/controllers/trends.py +149,Amt,amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,Only Leave Applications with status 'Approved' can be submitted,เพียง ปล่อยให้ การใช้งาน ที่มีสถานะ 'อนุมัติ ' สามารถ ส่ง
 apps/erpnext/erpnext/utilities/doctype/address/address.py +26,Address Title is mandatory.,ที่อยู่ ชื่อเรื่อง มีผลบังคับใช้
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,ป้อนชื่อของแคมเปญหากแหล่งที่มาของการรณรงค์สอบถามรายละเอียดเพิ่มเติม
@@ -2528,14 +2557,15 @@
 apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1},ไม่สามารถหาอัตราแลกเปลี่ยนสำหรับ {0} เป็น {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,มาร์คครึ่งวัน
 DocType: Sales Invoice,Sales Team,ทีมขาย
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Duplicate entry,รายการ ที่ซ้ำกัน
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,รายการ ที่ซ้ำกัน
 DocType: Program Enrollment Tool,Get Students,การรับนักเรียน
 DocType: Serial No,Under Warranty,ภายใต้การรับประกัน
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +490,[Error],[ข้อผิดพลาด]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +484,[Error],[ข้อผิดพลาด]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,ในคำพูดของจะสามารถมองเห็นได้เมื่อคุณบันทึกการสั่งซื้อการขาย
 ,Employee Birthday,วันเกิดของพนักงาน
 apps/erpnext/erpnext/controllers/status_updater.py +175,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} อยู่แล้ว โปรดแก้ไขรายการเหล่านี้และลองอีกครั้ง
 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} ไม่อยู่
@@ -2551,22 +2581,22 @@
 ,Issued Items Against Production Order,รายการที่ออกมาต่อต้านการสั่งซื้อการผลิต
 DocType: Pricing Rule,Purchase Manager,ผู้จัดการฝ่ายจัดซื้อ
 DocType: Target Detail,Target Detail,รายละเอียดเป้าหมาย
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +25,All Jobs,งานทั้งหมด
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,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 +323,Amount {0} {1} {2} {3},จำนวน {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Amount {0} {1} {2} {3},จำนวน {0} {1} {2} {3}
 DocType: Account,Depreciation,ค่าเสื่อมราคา
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),ผู้ผลิต (s)
 DocType: Employee Attendance Tool,Employee Attendance Tool,เครื่องมือเข้าร่วมประชุมพนักงาน
 DocType: Supplier,Credit Limit,วงเงินสินเชื่อ
 DocType: Production Plan Sales Order,Salse Order Date,Salse วันที่สั่งซื้อ
 DocType: Salary Component,Salary Component,เงินเดือนที่ต้องการตัวแทน
-apps/erpnext/erpnext/accounts/utils.py +372,Payment Entries {0} are un-linked,รายการชำระเงิน {0} ยกเลิกการเชื่อมโยง
+apps/erpnext/erpnext/accounts/utils.py +449,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 +497,Material Requests {0} created,ขอ วัสดุ {0} สร้าง
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +498,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.,แม่ของข้อตกลงหรือสัญญา
 DocType: Purchase Invoice,Address and Contact,ที่อยู่และการติดต่อ
@@ -2605,7 +2635,7 @@
 DocType: Serial No,Warranty / AMC Details,รายละเอียดการรับประกัน / AMC
 DocType: Journal Entry,User Remark,หมายเหตุผู้ใช้
 DocType: Lead,Market Segment,ส่วนตลาด
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +848,Paid Amount cannot be greater than total negative outstanding amount {0},ที่เรียกชำระแล้วจำนวนเงินที่ไม่สามารถจะสูงกว่ายอดรวมที่โดดเด่นในเชิงลบ {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +859,Paid Amount cannot be greater than total negative outstanding amount {0},ที่เรียกชำระแล้วจำนวนเงินที่ไม่สามารถจะสูงกว่ายอดรวมที่โดดเด่นในเชิงลบ {0}
 DocType: Employee Internal Work History,Employee Internal Work History,ประวัติการทำงานของพนักงานภายใน
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +233,Closing (Dr),ปิด (Dr)
 DocType: Cheque Print Template,Cheque Size,ขนาดเช็ค
@@ -2626,7 +2656,8 @@
 ,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 ที่จะยกเลิก
-apps/erpnext/erpnext/controllers/accounts_controller.py +555,'Update Stock' cannot be checked for fixed asset sale,&#39;การปรับปรุงการแจ้ง&#39; ไม่สามารถตรวจสอบการขายสินทรัพย์ถาวร
+DocType: Student Guardian,Father,พ่อ
+apps/erpnext/erpnext/controllers/accounts_controller.py +558,'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} จะถูกยกเลิก หรือ หยุด
@@ -2636,15 +2667,15 @@
 DocType: Sales Order,Fully Delivered,จัดส่งอย่างเต็มที่
 DocType: Lead,Lower Income,รายได้ต่ำ
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked",หัว บัญชีภายใต้ ความรับผิด ในการที่ กำไร / ขาดทุน จะได้รับการ จอง
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +166,Source and target warehouse cannot be same for row {0},แหล่งที่มาและ คลังสินค้า เป้าหมาย ไม่สามารถเป็น เหมือนกันสำหรับ แถว {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",บัญชีที่แตกต่างจะต้องเป็นสินทรัพย์ / รับผิดบัญชีประเภทตั้งแต่นี้กระทบยอดสต็อกเป็นรายการเปิด
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +81,Purchase Order number required for Item {0},จำนวน การสั่งซื้อ สินค้า ที่จำเป็นสำหรับ {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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/purchase_receipt/purchase_receipt.py +82,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 +17,Cannot change status as student {0} is linked with student application {1},ไม่สามารถเปลี่ยนสถานะเป็นนักเรียน {0} มีการเชื่อมโยงกับโปรแกรมนักเรียน {1}
+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: Timesheet,"List of employee which has ""Salary Slip Based on Timesheet"" is enabled in salary structure.",รายการของพนักงานซึ่งมี &quot;สลิปเงินเดือนจาก Timesheet&quot; เปิดใช้งานในโครงสร้างเงินเดือน
 DocType: Asset,Fully Depreciated,ค่าเสื่อมราคาหมด
 ,Stock Projected Qty,หุ้น ที่คาดการณ์ จำนวน
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Customer {0} does not belong to project {1},ลูกค้า {0} ไม่ได้อยู่ใน โครงการ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,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 และแบทช์
@@ -2656,7 +2687,7 @@
 DocType: Purchase Invoice,Purchase Taxes and Charges,ภาษีซื้อและค่าบริการ
 ,Qty to Receive,จำนวน การรับ
 DocType: Leave Block List,Leave Block List Allowed,ฝากรายการบล็อกอนุญาตให้นำ
-apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +55,All Warehouses,โกดังทั้งหมด
+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 +105,Credit To account must be a Balance Sheet account,เครดิตไปยังบัญชีจะต้องเป็นบัญชีงบดุล
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,ทุก ประเภท ของผู้ผลิต
@@ -2668,10 +2699,10 @@
 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/manufacturing/doctype/bom/bom.js +26,Browse BOM,ดู BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,ดู BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,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 Year,Academic Year,ปีการศึกษา
+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
 DocType: Appraisal,Appraisal,การตีราคา
@@ -2679,12 +2710,12 @@
 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 +197,Leave approver must be one of {0},ออกจาก ผู้อนุมัติ ต้องเป็นหนึ่งใน {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,Leave approver must be one of {0},ออกจาก ผู้อนุมัติ ต้องเป็นหนึ่งใน {0}
 DocType: Hub Settings,Seller Email,อีเมล์ผู้ขาย
 DocType: Project,Total Purchase Cost (via Purchase Invoice),ค่าใช้จ่ายในการจัดซื้อรวม (ผ่านการซื้อใบแจ้งหนี้)
 DocType: Workstation Working Hour,Start Time,เวลา
 DocType: Item Price,Bulk Import Help,ช่วยเหลือนำเข้าจำนวนมาก
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +256,Select Quantity,เลือกจำนวน
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +257,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,ข้อความส่งแล้ว
@@ -2701,6 +2732,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,ทั้ง จำนวน เป้าหมาย หรือจำนวน เป้าหมายที่ มีผลบังคับใช้
 apps/erpnext/erpnext/config/projects.py +45,Cost of various activities,ค่าใช้จ่ายของกิจกรรมต่างๆ
 apps/erpnext/erpnext/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 +149,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}
 DocType: Item,Inspection Required,การตรวจสอบที่จำเป็น
@@ -2720,7 +2752,7 @@
 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 +138,Wire Transfer,โอนเงิน
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,โอนเงิน
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,ตรวจสอบทั้งหมด
 DocType: Sales Order,Recurring Order,การสั่งซื้อที่เกิดขึ้น
 DocType: Company,Default Income Account,บัญชีรายได้เริ่มต้น
@@ -2732,21 +2764,19 @@
 ,Welcome to ERPNext,ขอต้อนรับสู่ ERPNext
 apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,นำไปสู่การเสนอราคา
 DocType: Lead,From Customer,จากลูกค้า
-apps/erpnext/erpnext/demo/setup_data.py +357,Calls,โทร
+apps/erpnext/erpnext/demo/setup/setup_data.py +300,Calls,โทร
 DocType: Project,Total Costing Amount (via Time Logs),จํานวนต้นทุนรวม (ผ่านบันทึกเวลา)
 DocType: Purchase Order Item Supplied,Stock UOM,UOM สต็อก
-apps/erpnext/erpnext/stock/doctype/item/item.py +466,"As there are existing transactions for this item, \
-							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","เนื่องจากมีการทำธุรกรรมที่มีอยู่สำหรับรายการนี้ \ คุณไม่สามารถเปลี่ยนค่าของ &#39;ได้ไม่มีอนุกรม&#39;, &#39;มีรุ่นที่ไม่มี&#39;, &#39;คือการแจ้งรายการ&#39; และ &#39;วิธีการประเมิน&#39;"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,Purchase Order {0} is not submitted,สั่งซื้อ {0} ไม่ได้ ส่ง
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,ที่คาดการณ์ไว้
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},อนุกรม ไม่มี {0} ไม่ได้อยู่ใน โกดัง {1}
 apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,หมายเหตุ : ระบบ จะไม่ตรวจสอบ มากกว่าการ ส่งมอบและ มากกว่าการ จอง รายการ {0} เป็น ปริมาณ หรือจำนวน เป็น 0
 DocType: Notification Control,Quotation Message,ข้อความใบเสนอราคา
 DocType: Issue,Opening Date,เปิดวันที่
-apps/erpnext/erpnext/schools/api.py +58,Attendance has been marked successfully.,ผู้เข้าร่วมได้รับการประสบความสำเร็จในการทำเครื่องหมาย
+apps/erpnext/erpnext/schools/api.py +57,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 +136,Account Type for {0} must be {1},ประเภทบัญชีสำหรับ {0} &#39;จะต้อง {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +139,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,ทั้ง คลังสินค้า ต้องอยู่ใน บริษัท เดียวกัน
@@ -2761,12 +2791,13 @@
 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/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 +20,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 +1190,Please select customer,กรุณาเลือกลูกค้า
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1193,Please select customer,กรุณาเลือกลูกค้า
 DocType: C-Form,I,ผม
 DocType: Company,Asset Depreciation Cost Center,สินทรัพย์ศูนย์ต้นทุนค่าเสื่อมราคา
 DocType: Sales Order Item,Sales Order Date,วันที่สั่งซื้อขาย
@@ -2776,6 +2807,7 @@
 ,Payment Period Based On Invoice Date,ระยะเวลา ในการชำระเงิน ตาม ใบแจ้งหนี้ ใน วันที่
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},สกุลเงินที่หายไปอัตราแลกเปลี่ยนสำหรับ {0}
 DocType: Assessment,Examiner,ผู้ตรวจสอบ
+DocType: Student,Siblings,พี่น้อง
 DocType: Journal Entry,Stock Entry,รายการสินค้า
 DocType: Payment Entry,Payment References,อ้างอิงการชำระเงิน
 DocType: C-Form,C-FORM-,C-FORM-
@@ -2793,11 +2825,12 @@
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,ชื่อกระทู้
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,อย่างน้อยต้องเลือกหนึ่งในการขาย หรือการซื้อ
+DocType: Grading Structure,Grade Intervals,ช่วงชั้นประถมศึกษา
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,เลือกลักษณะของธุรกิจของคุณ
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,สถานที่ที่ดำเนินการผลิต
 DocType: Asset Movement,Source Warehouse,คลังสินค้าที่มา
 DocType: Installation Note,Installation Date,วันที่ติดตั้ง
-apps/erpnext/erpnext/controllers/accounts_controller.py +534,Row #{0}: Asset {1} does not belong to company {2},แถว # {0}: สินทรัพย์ {1} ไม่ได้เป็นของ บริษัท {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +537,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,ผู้ขาย
@@ -2811,28 +2844,31 @@
 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 +111,Date Of Retirement must be greater than Date of Joining,วันที่ ของ การเกษียณอายุ ต้องมากกว่า วันที่ เข้าร่วม
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +49,There were errors while scheduling course on :,มีข้อผิดพลาดในขณะที่การจัดตารางการหลักสูตรคือ:
 DocType: Sales Invoice,Against Income Account,กับบัญชีรายได้
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +87,{0}% Delivered,{0}% ส่งแล้ว
+apps/erpnext/erpnext/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 +379,Please set default {0} in Company {1},กรุณาตั้งค่าเริ่มต้น {0} ใน บริษัท {1}
+apps/erpnext/erpnext/accounts/utils.py +456,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,กำไรขั้นต้น / ขาดทุน
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,รายการสั่งซื้อที่จำหน่าย
 apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,ชื่อ บริษัท ที่ไม่สามารถเป็น บริษัท
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,หัว จดหมาย สำหรับการพิมพ์ แม่แบบ
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,ชื่อ แม่แบบ สำหรับการพิมพ์ เช่นผู้ Proforma Invoice
+DocType: Student Guardian,Student Guardian,เดอะการ์เดียนักศึกษา
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +184,Valuation type charges can not marked as Inclusive,ค่าใช้จ่ายประเภทการประเมินไม่สามารถทำเครื่องหมายเป็น Inclusive
 DocType: POS Profile,Update Stock,อัพเดทสต็อก
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM ที่แตกต่างกัน สำหรับรายการที่ จะ นำไปสู่การ ที่ไม่ถูกต้อง ( รวม ) ค่า น้ำหนักสุทธิ ให้แน่ใจว่า น้ำหนักสุทธิ ของแต่ละรายการ ที่อยู่ในUOM เดียวกัน
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,อัตรา BOM
 DocType: Asset,Journal Entry for Scrap,วารสารรายการเศษ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,กรุณา ดึง รายการจาก การจัดส่งสินค้า หมายเหตุ
-apps/erpnext/erpnext/accounts/utils.py +349,Journal Entries {0} are un-linked,รายการบันทึก {0} จะยกเลิกการเชื่อมโยง
+apps/erpnext/erpnext/accounts/utils.py +426,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,กรุณาระบุรอบปิดศูนย์ต้นทุนของ บริษัท
@@ -2856,6 +2892,7 @@
 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,ฟอรั่มชุมชน
+DocType: Homepage,"URL for ""All Products""",URL สำหรับ &quot;สินค้าทั้งหมด&quot;
 DocType: Leave Application,Leave Balance Before Application,ฝากคงเหลือก่อนที่โปรแกรมประยุกต์
 DocType: SMS Center,Send SMS,ส่ง SMS
 DocType: Cheque Print Template,Width of amount in word,ความกว้างของจำนวนเงินใน Word
@@ -2864,7 +2901,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 +29,Current Job Openings,เปิดงานปัจจุบัน
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,Current Job Openings,เปิดงานปัจจุบัน
 DocType: Company,Stock Adjustment Account,การปรับบัญชีสินค้า
 DocType: Journal Entry,Write Off,เขียนปิด
 DocType: Timesheet Detail,Operation ID,รหัสการดำเนินงาน
@@ -2877,7 +2914,7 @@
 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 +850,Show tax break-up,แสดงภาษีผิดขึ้น
+apps/erpnext/erpnext/public/js/controllers/transaction.js +841,Show tax break-up,แสดงภาษีผิดขึ้น
 apps/erpnext/erpnext/accounts/party.py +308,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} ดังนั้นคุณจะไม่สามารถกำหนดหรือปรับเปลี่ยน
@@ -2887,10 +2924,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 +534,Please select Posting Date before selecting Party,กรุณาเลือกวันที่โพสต์ก่อนที่จะเลือกพรรค
 DocType: Serial No,Out of AMC,ออกของ AMC
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +80,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 +162,Please contact to the user who have Sales Master Manager {0} role,กรุณาติดต่อผู้ใช้ที่มีผู้จัดการฝ่ายขายโท {0} บทบาท
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +195,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 +5,This is based on the attendance of this Student,นี้ขึ้นอยู่กับการเข้าร่วมประชุมของนักศึกษานี้
@@ -2899,12 +2937,11 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,ใบนำส่งสินค้า {0} ต้องถูกยกเลิก ก่อนยกเลิกคำสั่งขายนี้
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +75,Paid amount + Write Off Amount can not be greater than Grand Total,ชำระ เงิน + เขียน ปิด จำนวน ไม่สามารถ จะสูงกว่า แกรนด์ รวม
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,{0} is not a valid Batch Number for Item {1},{0} ไม่ได้เป็น จำนวน ชุดที่ถูกต้องสำหรับ รายการ {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +138,Note: There is not enough leave balance for Leave Type {0},หมายเหตุ : มี ไม่ สมดุล เพียงพอสำหรับ การลา ออกจาก ประเภท {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,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,ประเภทโอกาส
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,บริษัท ใหม่
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,Cost Center is required for 'Profit and Loss' account {0},ศูนย์ต้นทุน เป็นสิ่งจำเป็นสำหรับ บัญชี ' กำไรขาดทุน ' {0}
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,การทำธุรกรรมสามารถถูกลบโดยผู้สร้างของ บริษัท ฯ
 apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,จำนวนที่ไม่ถูกต้องของรายการบัญชีแยกประเภททั่วไปที่พบ คุณอาจจะเลือกบัญชีที่ไม่ถูกต้องในการทำธุรกรรม
 DocType: Cheque Print Template,Cheque Width,ความกว้างเช็ค
@@ -2913,16 +2950,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,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 +228,{0} '{1}' is disabled,{0} ‘{1}' ถูกปิดใช้งาน
+apps/erpnext/erpnext/controllers/accounts_controller.py +231,{0} '{1}' is disabled,{0} ‘{1}' ถูกปิดใช้งาน
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ตั้งเป็นเปิด
 DocType: Cheque Print Template,Scanned Cheque,สแกนเช็ค
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,ส่งอีเมลโดยอัตโนมัติไปยังรายชื่อในการทำธุรกรรมการส่ง
+DocType: Timesheet,Total Billable Amount,รวมจำนวนเงินที่เรียกเก็บเงิน
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,วาระที่ 3
 DocType: Purchase Order,Customer Contact Email,อีเมล์ที่ใช้ติดต่อลูกค้า
 DocType: Warranty Claim,Item and Warranty Details,รายการและรายละเอียดการรับประกัน
 DocType: Sales Team,Contribution (%),สมทบ (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,หมายเหตุ : รายการ การชำระเงินจะ ไม่ได้รับการ สร้างขึ้นตั้งแต่ ' เงินสด หรือ บัญชี ธนาคาร ไม่ได้ระบุ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Responsibilities,ความรับผิดชอบ
+apps/erpnext/erpnext/controllers/accounts_controller.py +78,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,ความรับผิดชอบ
 DocType: Expense Claim Account,Expense Claim Account,บัญชีค่าใช้จ่ายเรียกร้อง
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,แบบ
 DocType: Sales Person,Sales Person Name,ชื่อคนขาย
@@ -2930,6 +2968,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,เพิ่มผู้ใช้
 DocType: Pricing Rule,Item Group,กลุ่มสินค้า
 DocType: Item,Safety Stock,หุ้นที่ปลอดภัย
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,รหัสสินค้า&gt; กลุ่มสินค้า&gt; ยี่ห้อ
 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),ภาษีและค่าใช้จ่ายเพิ่ม (สกุลเงิน บริษัท )
@@ -2939,7 +2978,6 @@
 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: Timesheet,Total Hours,รวมชั่วโมง
 DocType: Journal Entry,Printing Settings,การตั้งค่าการพิมพ์
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Total Debit must be equal to Total Credit. The difference is {0},เดบิต รวม ต้องเท่ากับ เครดิต รวม
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,ยานยนต์
@@ -2952,13 +2990,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,วาณิชธนกิจ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +71,Cash or Bank Account is mandatory for making payment entry,เงินสดหรือ บัญชีธนาคาร มีผลบังคับใช้ สำหรับการทำ รายการ ชำระเงิน
 DocType: Purchase Invoice,Price List Exchange Rate,ราคาอัตราแลกเปลี่ยนรายชื่อ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ลูกค้า&gt; กลุ่มลูกค้า&gt; ดินแดน
 DocType: Purchase Invoice Item,Rate,อัตรา
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Intern,แพทย์ฝึกหัด
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,แพทย์ฝึกหัด
 DocType: Stock Entry,From BOM,จาก BOM
 DocType: Assessment,Assessment Code,รหัสการประเมิน
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +32,Basic,ขั้นพื้นฐาน
+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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',กรุณา คลิกที่ 'สร้าง ตาราง '
+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, ม."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,ไม่มี การอ้างอิง มีผลบังคับใช้ ถ้า คุณป้อน วันที่ อ้างอิง
@@ -2967,11 +3006,11 @@
 DocType: Salary Slip,Salary Structure,โครงสร้างเงินเดือน
 DocType: Account,Bank,ธนาคาร
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,สายการบิน
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +752,Issue Material,ฉบับวัสดุ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +723,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 +683,You are in offline mode. You will not be able to reload until you have network.,คุณกำลังอยู่ในโหมดออฟไลน์ คุณจะไม่สามารถที่จะโหลดจนกว่าคุณจะมีเครือข่าย
+apps/erpnext/erpnext/accounts/page/pos/pos.js +665,You are in offline mode. You will not be able to reload until you have network.,คุณกำลังอยู่ในโหมดออฟไลน์ คุณจะไม่สามารถที่จะโหลดจนกว่าคุณจะมีเครือข่าย
 DocType: Hub Settings,Access Token,เข้าสู่ Token
 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,อนุกรมไม่มี
@@ -2979,33 +3018,35 @@
 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 +1122,Enter value must be positive,ค่าใส่ต้องเป็นบวก
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,All Territories,ดินแดน ทั้งหมด
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1125,Enter value must be positive,ค่าใส่ต้องเป็นบวก
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,ดินแดน ทั้งหมด
 DocType: Purchase Invoice,Items,รายการ
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +23,Student is already enrolled.,นักศึกษาลงทะเบียนเรียนแล้ว
 DocType: Fiscal Year,Year Name,ชื่อปี
 DocType: Process Payroll,Process Payroll,เงินเดือนกระบวนการ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,มี วันหยุด มากขึ้นกว่าที่ เป็น วันทำการ ในเดือนนี้
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +233,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 +96,Request for Quotations,การขอใบเสนอราคา
+apps/erpnext/erpnext/hooks.py +104,Request for Quotations,การขอใบเสนอราคา
 DocType: Payment Reconciliation,Maximum Invoice Amount,จำนวนใบแจ้งหนี้สูงสุด
 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 +628,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',เริ่มต้นหน่วยวัดสำหรับตัวแปร &#39;{0}&#39; จะต้องเป็นเช่นเดียวกับในแม่แบบ &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',เริ่มต้นหน่วยวัดสำหรับตัวแปร &#39;{0}&#39; จะต้องเป็นเช่นเดียวกับในแม่แบบ &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,การคำนวณพื้นฐานตาม
 DocType: Delivery Note Item,From Warehouse,จากคลังสินค้า
 DocType: Assessment,Supervisor Name,ชื่อผู้บังคับบัญชา
+DocType: Assessment,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,ผู้ซื้อ
 DocType: Notification Control,Customize the Notification,กำหนดประกาศ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Cash Flow from Operations,กระแสเงินสดจากการดำเนินงาน
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,แม่แบบเริ่มต้นที่อยู่ไม่สามารถลบได้
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,แม่แบบเริ่มต้นที่อยู่ไม่สามารถลบได้
 DocType: Sales Invoice,Shipping Rule,กฎการจัดส่งสินค้า
 DocType: Manufacturer,Limited to 12 characters,จำกัด 12 ตัวอักษร
 DocType: Journal Entry,Print Heading,พิมพ์หัวเรื่อง
@@ -3020,8 +3061,8 @@
 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/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,ทั้ง จำนวน เป้าหมาย หรือจำนวน เป้าหมายที่ มีผลบังคับใช้
-apps/erpnext/erpnext/stock/get_item_details.py +485,No default BOM exists for Item {0},ไม่มี BOM เริ่มต้น แล้วสำหรับ รายการ {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +336,Please select Posting Date first,กรุณาเลือกวันที่โพสต์แรก
+apps/erpnext/erpnext/stock/get_item_details.py +486,No default BOM exists for Item {0},ไม่มี BOM เริ่มต้น แล้วสำหรับ รายการ {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +326,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
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,ศูนย์ต้นทุน กับการทำธุรกรรม ที่มีอยู่ ไม่สามารถ แปลงเป็น บัญชีแยกประเภท
@@ -3037,6 +3078,7 @@
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,การชำระเงินการแข่งขันกับใบแจ้งหนี้
 DocType: Journal Entry,Bank Entry,ธนาคารเข้า
 DocType: Authorization Rule,Applicable To (Designation),ที่ใช้บังคับกับ (จุด)
+,Profitability Analysis,การวิเคราะห์ผลกำไร
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,ใส่ในรถเข็น
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,กลุ่มตาม
 DocType: Guardian,Interests,ความสนใจ
@@ -3049,22 +3091,22 @@
 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 +141,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","เนื่องรายการ {0} ไม่สามารถปรับปรุง \
  ใช้การกระทบยอดสต็อก"
 DocType: Scheduling Tool,Day,วัน
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,ใหม่ หมายเลขเครื่อง ไม่สามารถมี คลังสินค้า คลังสินค้า จะต้องตั้งค่า โดย สต็อก รายการ หรือ รับซื้อ
 DocType: Lead,Lead Type,ชนิดช่องทาง
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,You are not authorized to approve leaves on Block Dates,คุณไม่ได้รับอนุญาตในการอนุมัติใบในวันที่ถูกบล็อก
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,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: Student Applicant,AP.,AP
 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 +639,Point of Sale,จุดขาย
+apps/erpnext/erpnext/accounts/page/pos/pos.js +634,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,ภาษี
 DocType: Production Planning Tool,Production Planning Tool,เครื่องมือการวางแผนการผลิต
@@ -3073,74 +3115,77 @@
 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 +373,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 Entry,Update Rate and Availability,ปรับปรุงอัตราและความพร้อมใช้งาน
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,เปอร์เซ็นต์ที่คุณได้รับอนุญาตให้ได้รับหรือส่งมอบมากขึ้นกับปริมาณที่สั่งซื้อ ตัวอย่างเช่นหากคุณได้สั่งซื้อ 100 หน่วย และค่าเผื่อของคุณจะ 10% แล้วคุณจะได้รับอนุญาตจะได้รับ 110 หน่วย
 DocType: POS Profile,Customer Group,กลุ่มลูกค้า
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,Expense account is mandatory for item {0},บัญชีค่าใช้จ่าย ที่จำเป็น สำหรับรายการที่ {0}
 DocType: Item,Website Description,คำอธิบายเว็บไซต์
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date must be on or after today,ถัดไปวันที่ค่าเสื่อมราคาจะต้องอยู่ในหรือหลังวันนี้
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,เปลี่ยนสุทธิในส่วนของ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +145,Please cancel Purchase Invoice {0} first,กรุณายกเลิกการซื้อใบแจ้งหนี้ {0} แรก
 DocType: Serial No,AMC Expiry Date,วันที่หมดอายุ AMC
 ,Sales Register,ขายสมัครสมาชิก
 DocType: Quotation,Quotation Lost Reason,ใบเสนอราคา Lost เหตุผล
+apps/erpnext/erpnext/utilities/doctype/address/address.py +164,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,ไม่มีแม่แบบที่อยู่เริ่มต้นพบว่า กรุณาสร้างขึ้นมาใหม่จากการตั้งค่า&gt; การพิมพ์และการสร้างแบรนด์&gt; แม่แบบที่อยู่
 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 +330,Transaction reference no {0} dated {1},การอ้างอิงการทำธุรกรรมไม่มี {0} วันที่ {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Transaction reference no {0} dated {1},การอ้างอิงการทำธุรกรรมไม่มี {0} วันที่ {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,ไม่มีอะไรที่จะ แก้ไข คือ
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,Summary for this month and pending activities,สรุปในเดือนนี้และกิจกรรมที่อยู่ระหว่างดำเนินการ
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,สรุปในเดือนนี้และกิจกรรมที่อยู่ระหว่างดำเนินการ
 DocType: Customer Group,Customer Group Name,ชื่อกลุ่มลูกค้า
 apps/erpnext/erpnext/public/js/financial_statements.js +54,Cash Flow Statement,งบกระแสเงินสด
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Please remove this Invoice {0} from C-Form {1},กรุณาลบนี้ใบแจ้งหนี้ {0} จาก C-แบบฟอร์ม {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Please remove this Invoice {0} from C-Form {1},กรุณาลบนี้ใบแจ้งหนี้ {0} จาก C-แบบฟอร์ม {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,เลือกดำเนินการต่อถ้าคุณยังต้องการที่จะรวมถึงความสมดุลในปีงบประมาณก่อนหน้านี้ออกไปในปีงบการเงิน
 DocType: GL Entry,Against Voucher Type,กับประเภทบัตร
 DocType: Item,Attributes,คุณลักษณะ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +644,Get Items,รับสินค้า
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +623,Get Items,รับสินค้า
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +210,Please enter Write Off Account,กรุณากรอกตัวอักษร เขียน ปิด บัญชี
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,วันที่สั่งซื้อล่าสุด
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +41,Account {0} does not belongs to company {1},บัญชี {0} ไม่ได้เป็นของ บริษัท {1}
+DocType: Student,Guardian Details,รายละเอียดการ์เดียน
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,มาร์คเข้าร่วมสำหรับพนักงานหลาย
 DocType: Payment Request,Initiated,ริเริ่ม
 DocType: Production Order,Planned Start Date,เริ่มต้นการวางแผนวันที่สมัคร
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,Customer is required against Receivable account {0},ลูกค้าจะต้องออกจากบัญชีลูกหนี้ {0}
 DocType: Serial No,Creation Document Type,ประเภท การสร้าง เอกสาร
 DocType: Leave Type,Is Encash,เป็นได้เป็นเงินสด
 DocType: Purchase Invoice,Mobile No,เบอร์มือถือ
 DocType: Leave Allocation,New Leaves Allocated,ใหม่ใบจัดสรร
-apps/erpnext/erpnext/controllers/trends.py +265,Project-wise data is not available for Quotation,ข้อมูล โครงการ ฉลาด ไม่สามารถใช้ได้กับ ใบเสนอราคา
+apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,ข้อมูล โครงการ ฉลาด ไม่สามารถใช้ได้กับ ใบเสนอราคา
 DocType: Project,Expected End Date,คาดว่าวันที่สิ้นสุด
 DocType: Budget Account,Budget Amount,จำนวนงบประมาณ
 DocType: Appraisal Template,Appraisal Template Title,หัวข้อแม่แบบประเมิน
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,Commercial,เชิงพาณิชย์
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,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 +648,Row {0}# Account must be of type 'Fixed Asset',แถว {0} # บัญชีต้องเป็นชนิด &#39;สินทรัพย์ถาวร&#39;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Row {0}# Account must be of type 'Fixed Asset',แถว {0} # บัญชีต้องเป็นชนิด &#39;สินทรัพย์ถาวร&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,ออก จำนวน
 apps/erpnext/erpnext/config/accounts.py +278,Rules to calculate shipping amount for a sale,กฎระเบียบในการคำนวณปริมาณการขนส่งสินค้าสำหรับการขาย
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +30,Series is mandatory,ชุด มีผลบังคับใช้
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +50,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}
 DocType: Leave Allocation,Unused leaves,ใบที่ไม่ได้ใช้
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Cr,Cr
 DocType: Tax Rule,Billing State,รัฐเรียกเก็บเงิน
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +250,Transfer,โอน
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +187,{0} {1} does not associated with Party Account {2},{0} {1} ไม่ได้เชื่อมโยงกับบัญชีพรรค {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,Fetch exploded BOM (including sub-assemblies),เรียก BOM ระเบิด (รวมถึงการ ประกอบย่อย )
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +254,Transfer,โอน
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +190,{0} {1} does not associated with Party Account {2},{0} {1} ไม่ได้เชื่อมโยงกับบัญชีพรรค {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +796,Fetch exploded BOM (including sub-assemblies),เรียก BOM ระเบิด (รวมถึงการ ประกอบย่อย )
 DocType: Authorization Rule,Applicable To (Employee),ที่ใช้บังคับกับ (พนักงาน)
-apps/erpnext/erpnext/controllers/accounts_controller.py +115,Due Date is mandatory,วันที่ครบกำหนดมีผลบังคับใช้
+apps/erpnext/erpnext/controllers/accounts_controller.py +118,Due Date is mandatory,วันที่ครบกำหนดมีผลบังคับใช้
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,เพิ่มสำหรับแอตทริบิวต์ {0} ไม่สามารถเป็น 0
 DocType: Journal Entry,Pay To / Recd From,จ่ายให้ Recd / จาก
 DocType: Naming Series,Setup Series,ชุดติดตั้ง
 DocType: Payment Reconciliation,To Invoice Date,วันที่ออกใบแจ้งหนี้
 DocType: Supplier,Contact HTML,HTML ติดต่อ
 ,Inactive Customers,ลูกค้าที่ไม่ได้ใช้งาน
+DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,ซื้อรายรับ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,วิธีกฎการกำหนดราคาจะใช้?
 DocType: Quality Inspection,Delivery Note No,หมายเหตุจัดส่งสินค้าไม่มี
@@ -3149,7 +3194,7 @@
 DocType: Company,Retail,ค้าปลีก
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +120,Customer {0} does not exist,ลูกค้า {0} ไม่อยู่
 DocType: Attendance,Absent,ขาด
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +587,Product Bundle,Bundle สินค้า
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Product Bundle,Bundle สินค้า
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Invalid reference {1},แถว {0}: การอ้างอิงที่ไม่ถูกต้อง {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,ซื้อภาษีและค่าใช้จ่ายแม่แบบ
 DocType: Upload Attendance,Download Template,ดาวน์โหลดแม่แบบ
@@ -3159,8 +3204,8 @@
 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 +742,Send Supplier Emails,ส่งอีเมลผู้ผลิต
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +104,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",เงินเดือนที่ต้องการการประมวลผลแล้วสำหรับรอบระยะเวลาระหว่าง {0} และ {1} ฝากรับสมัครไม่สามารถอยู่ระหว่างช่วงวันที่นี้
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +708,Send Supplier Emails,ส่งอีเมลผู้ผลิต
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,"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,การ์เดียนที่น่าสนใจ
 DocType: Timesheet,Employee Detail,รายละเอียดการทำงานของพนักงาน
@@ -3171,9 +3216,9 @@
 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/accounts/doctype/gl_entry/gl_entry.py +77,Account {0} cannot be a Group,บัญชี {0} ไม่สามารถเป็น กลุ่ม
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} cannot be a Group,บัญชี {0} ไม่สามารถเป็น กลุ่ม
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +31,Optional. This setting will be used to filter in various transactions.,ไม่จำเป็น การตั้งค่านี้ จะถูก ใช้ในการกรอง ในการทำธุรกรรม ต่างๆ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +107,Negative Valuation Rate is not allowed,อัตรา การประเมิน เชิงลบ ไม่ได้รับอนุญาต
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,อัตรา การประเมิน เชิงลบ ไม่ได้รับอนุญาต
 DocType: Holiday List,Weekly Off,สัปดาห์ปิด
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","สำหรับเช่น 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +39,Provisional Profit / Loss (Credit),กำไรเฉพาะกาล / ขาดทุน (เครดิต)
@@ -3187,16 +3232,16 @@
 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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: ศูนย์ต้นทุนจำเป็นสำหรับรายการ {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +626,Get Items from Product Bundle,รับรายการจาก Bundle สินค้า
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +605,Get Items from Product Bundle,รับรายการจาก Bundle สินค้า
 DocType: Asset,Straight Line,เส้นตรง
 DocType: Project User,Project User,ผู้ใช้โครงการ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} is inactive,บัญชี {0} ไม่ได้ใช้งาน
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} is inactive,บัญชี {0} ไม่ได้ใช้งาน
 DocType: GL Entry,Is Advance,ล่วงหน้า
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,เข้าร่วมประชุม จาก วันที่และ การเข้าร่วมประชุม เพื่อให้ มีผลบังคับใช้ วันที่
 apps/erpnext/erpnext/controllers/buying_controller.py +148,Please enter 'Is Subcontracted' as Yes or No,กรุณากรอก ' คือ รับเหมา ' เป็น ใช่หรือไม่ใช่
 DocType: Sales Team,Contact No.,ติดต่อหมายเลข
 DocType: Bank Reconciliation,Payment Entries,รายการชำระเงิน
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,'Profit and Loss' type account {0} not allowed in Opening Entry,' กำไรขาดทุน ประเภท บัญชี {0} ไม่ได้รับอนุญาต ใน การเปิด รายการ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +71,'Profit and Loss' type account {0} not allowed in Opening Entry,' กำไรขาดทุน ประเภท บัญชี {0} ไม่ได้รับอนุญาต ใน การเปิด รายการ
 DocType: Program Enrollment Tool,Get Students From,รับนักเรียนจาก
 DocType: Hub Settings,Seller Country,ผู้ขายประเทศ
 apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,รายการเผยแพร่บนเว็บไซต์
@@ -3215,7 +3260,7 @@
 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 +558,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",แถว # {0}: สินทรัพย์ {1} ไม่สามารถส่งมันมีอยู่แล้ว {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +561,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",แถว # {0}: สินทรัพย์ {1} ไม่สามารถส่งมันมีอยู่แล้ว {2}
 DocType: Tax Rule,Billing Country,การเรียกเก็บเงินประเทศ
 DocType: Production Order,Expected Delivery Date,คาดว่าวันที่ส่ง
 apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,เดบิตและเครดิตไม่เท่ากันสำหรับ {0} # {1} ความแตกต่างคือ {2}
@@ -3228,13 +3273,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +202,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: Sales Order,% Amount Billed,% ของยอดเงินที่เรียกเก็บแล้ว
+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 +117,No Item with Serial No {0},ไม่มีรายการ ที่มี หมายเลขเครื่อง {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,เปิดการแจ้งเตือน
+DocType: Email Digest,Open Notifications,เปิดการแจ้งเตือน
 DocType: Payment Entry,Difference Amount (Company Currency),ความแตกต่างจำนวนเงิน ( บริษัท สกุล)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,ค่าใช้จ่าย โดยตรง
 apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
@@ -3242,7 +3287,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,รายได้ลูกค้าใหม่
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,ค่าใช้จ่ายใน การเดินทาง
 DocType: Maintenance Visit,Breakdown,การเสีย
-apps/erpnext/erpnext/controllers/accounts_controller.py +634,Account: {0} with currency: {1} can not be selected,บัญชี: {0} กับสกุลเงิน: {1} ไม่สามารถเลือกได้
+apps/erpnext/erpnext/controllers/accounts_controller.py +637,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}
 DocType: Program Enrollment Tool,Student Applicants,สมัครนักศึกษา
@@ -3250,15 +3295,15 @@
 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 +56,Probation,การทดลอง
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Probation,การทดลอง
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,ส่วนประกอบเงินเดือน
 DocType: Program Enrollment Tool,New Academic Year,ปีการศึกษาใหม่
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Payment of salary for the month {0} and year {1},การชำระเงิน ของเงินเดือน สำหรับเดือน{0} และปี {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Payment of salary for the month {0} and year {1},การชำระเงิน ของเงินเดือน สำหรับเดือน{0} และปี {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,แทรกอัตโนมัติราคาอัตรารายชื่อถ้าขาดหายไป
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,รวมจำนวนเงินที่จ่าย
 DocType: Production Order Item,Transferred Qty,โอน จำนวน
 apps/erpnext/erpnext/config/learn.py +11,Navigating,การนำ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Planning,การวางแผน
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,การวางแผน
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,ออก
 DocType: Project,Total Billing Amount (via Time Logs),จำนวนเงินที่เรียกเก็บเงินรวม (ผ่านบันทึกเวลา)
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,We sell this Item,เราขาย สินค้า นี้
@@ -3271,11 +3316,10 @@
 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.,ส่งรายงานสรุปปกติผ่านทางอีเมล์
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Sales invoice submitted sucessfully.,ใบแจ้งหนี้การขายส่งสำเร็จ
 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}
 DocType: Assessment Result,Student Name,ชื่อนักเรียน
-apps/erpnext/erpnext/hooks.py +104,Assessment Schedule,กำหนดการประเมิน
+apps/erpnext/erpnext/hooks.py +113,Assessment Schedule,กำหนดการประเมิน
 DocType: Brand,Item Manager,ผู้จัดการฝ่ายรายการ
 DocType: Buying Settings,Default Supplier Type,ซัพพลายเออร์ชนิดเริ่มต้น
 DocType: Production Order,Total Operating Cost,ค่าใช้จ่ายการดำเนินงานรวม
@@ -3285,6 +3329,7 @@
 DocType: GL Entry,Party Type,ประเภท บุคคล
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +78,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,วันแม็กซ์ฝากอนุญาตให้นำ
@@ -3296,18 +3341,19 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,ใบเสนอราคาไปยังช่องทาง หรือลูกค้า
 DocType: Stock Settings,Role Allowed to edit frozen stock,บทบาทอนุญาตให้แก้ไขหุ้นแช่แข็ง
 ,Territory Target Variance Item Group-Wise,มณฑล เป้าหมาย แปรปรวน กลุ่มสินค้า - ฉลาด
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Customer Groups,ทุกกลุ่ม ลูกค้า
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +78,Accumulated Monthly,สะสมรายเดือน
-apps/erpnext/erpnext/controllers/accounts_controller.py +595,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} มีผลบังคับใช้ อาจจะบันทึกแลกเปลี่ยนเงินตราไม่ได้สร้างขึ้นสำหรับ {1} เป็น {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,ทุกกลุ่ม ลูกค้า
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +81,Accumulated Monthly,สะสมรายเดือน
+apps/erpnext/erpnext/controllers/accounts_controller.py +598,{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} ไม่อยู่
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),อัตราราคาปกติ (สกุลเงิน บริษัท )
 DocType: Products Settings,Products Settings,การตั้งค่าผลิตภัณฑ์
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +188,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,กรุณาตั้งค่าการตั้งชื่อซีรีส์สำหรับ {0} ผ่านการตั้งค่า&gt; การตั้งค่า&gt; การตั้งชื่อชุด
 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 +84,Secretary,เลขา
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,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,การซื้อ
@@ -3316,24 +3362,22 @@
 ,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,ชื่อการประเมิน
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,แถว # {0}: ไม่มีอนุกรมมีผลบังคับใช้
+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 +859,Supplier Quotation,ใบเสนอราคาของผู้ผลิต
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +838,Supplier Quotation,ใบเสนอราคาของผู้ผลิต
 DocType: Quotation,In Words will be visible once you save the Quotation.,ในคำพูดของจะสามารถมองเห็นได้เมื่อคุณบันทึกใบเสนอราคา
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +7,Collect Fees,เก็บค่าธรรมเนียม
+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}
 DocType: Lead,Add to calendar on this date,เพิ่มไปยังปฏิทินของวันนี้
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,กฎระเบียบ สำหรับการเพิ่ม ค่าใช้จ่ายใน การจัดส่งสินค้า
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,เหตุการณ์ที่จะเกิดขึ้น
 DocType: Item,Opening Stock,เปิดการแจ้ง
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,ลูกค้า จะต้อง
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} เป็นข้อบังคับสำหรับการกลับมา
 DocType: Purchase Order,To Receive,ที่จะได้รับ
 apps/erpnext/erpnext/public/js/setup_wizard.js +195,user@example.com,user@example.com
-DocType: Email Digest,Income / Expense,รายได้ / ค่าใช้จ่าย
 DocType: Employee,Personal Email,อีเมลส่วนตัว
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,ความแปรปรวนทั้งหมด
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.",ถ้าเปิดใช้งานระบบจะโพสต์รายการบัญชีสำหรับสินค้าคงคลังโดยอัตโนมัติ
@@ -3344,13 +3388,14 @@
 DocType: Customer,From Lead,จากช่องทาง
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,คำสั่งปล่อยให้การผลิต
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,เลือกปีงบประมาณ ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,POS Profile required to make POS Entry,รายละเอียด POS ต้องทำให้ POS รายการ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +509,POS Profile required to make POS Entry,รายละเอียด POS ต้องทำให้ POS รายการ
 DocType: Program Enrollment Tool,Enroll Students,รับสมัครนักเรียน
 DocType: Hub Settings,Name Token,ชื่อ Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,ขาย มาตรฐาน
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Atleast one warehouse is mandatory,อย่างน้อยหนึ่งคลังสินค้ามีผลบังคับใช้
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +129,Atleast one warehouse is mandatory,อย่างน้อยหนึ่งคลังสินค้ามีผลบังคับใช้
 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 +330,{0} against Sales Invoice {1},{0} กับการขายใบแจ้งหนี้ {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,ชื่อโครงการ
@@ -3371,10 +3416,11 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,ใบ จะต้องมีการ จัดสรร หลายรายการ 0.5
 DocType: Production Order,Operation Cost,ค่าใช้จ่ายในการดำเนินงาน
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,อัพโหลดการดูแลรักษาจาก. csv ที่
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Amt ดีเด่น
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,ตั้งเป้ากลุ่มสินค้าที่ชาญฉลาดสำหรับการนี้คนขาย
 DocType: Stock Settings,Freeze Stocks Older Than [Days],ตรึง หุ้น เก่า กว่า [ วัน ]
-apps/erpnext/erpnext/controllers/accounts_controller.py +528,Row #{0}: Asset is mandatory for fixed asset purchase/sale,แถว # {0}: สินทรัพย์เป็นข้อบังคับสำหรับสินทรัพย์ถาวรซื้อ / ขาย
+apps/erpnext/erpnext/controllers/accounts_controller.py +531,Row #{0}: Asset is mandatory for fixed asset purchase/sale,แถว # {0}: สินทรัพย์เป็นข้อบังคับสำหรับสินทรัพย์ถาวรซื้อ / ขาย
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.",ถ้าสองคนหรือมากกว่ากฎการกำหนดราคาจะพบตามเงื่อนไขข้างต้นลำดับความสำคัญถูกนำไปใช้ ลำดับความสำคัญเป็นจำนวนระหว่าง 0-20 ในขณะที่ค่าเริ่มต้นเป็นศูนย์ (ว่าง) จำนวนที่สูงขึ้นหมายความว่ามันจะมีความสำคัญถ้ามีกฎกำหนดราคาหลายเงื่อนไขเดียวกัน
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,ปีงบประมาณ: {0} ไม่อยู่
 DocType: Currency Exchange,To Currency,กับสกุลเงิน
@@ -3391,15 +3437,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,ส่วนของภาคเอกชน
 DocType: Maintenance Visit,Customer Feedback,คำติชมของลูกค้า
 DocType: Account,Expense,ค่าใช้จ่าย
-DocType: Sales Invoice,Exhibition,งานมหกรรม
 apps/erpnext/erpnext/utilities/doctype/address/address.py +77,"Company is mandatory, as it is your company address",บริษัท มีผลบังคับใช้ตามที่มันเป็นอยู่ บริษัท ของคุณ
 DocType: Item Attribute,From Range,จากช่วง
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +81,Syntax error in formula or condition: {0},ไวยากรณ์ผิดพลาดในสูตรหรือเงื่อนไข: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +92,Syntax error in formula or condition: {0},ไวยากรณ์ผิดพลาดในสูตรหรือเงื่อนไข: {0}
 apps/erpnext/erpnext/stock/utils.py +99,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 +28,Jobs,งาน
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,งาน
 ,Sales Order Trends,แนวโน้ม การขายสินค้า
 DocType: Employee,Held On,จัดขึ้นเมื่อวันที่
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,การผลิตสินค้า
@@ -3408,16 +3454,16 @@
 DocType: Stock Entry Detail,Additional Cost,ค่าใช้จ่ายเพิ่มเติม
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,ปี การเงิน สิ้นสุด วันที่
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher",ไม่สามารถกรอง ตาม คูปอง ไม่ ถ้า จัดกลุ่มตาม คูปอง
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +763,Make Supplier Quotation,ทำ ใบเสนอราคา ของผู้ผลิต
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,Make Supplier Quotation,ทำ ใบเสนอราคา ของผู้ผลิต
 DocType: Quality Inspection,Incoming,ขาเข้า
 DocType: BOM,Materials Required (Exploded),วัสดุบังคับ (ระเบิด)
 apps/erpnext/erpnext/public/js/setup_wizard.js +185,"Add users to your organization, other than yourself",เพิ่มผู้ใช้องค์กรของคุณอื่นที่ไม่ใช่ตัวเอง
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,Row # {0}: Serial No {1} does not match with {2} {3},แถว # {0}: ไม่มี Serial {1} ไม่ตรงกับ {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +42,Casual Leave,สบาย ๆ ออก
+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,สบาย ๆ ออก
 DocType: Batch,Batch ID,ID ชุด
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,Note: {0},หมายเหตุ : {0}
 ,Delivery Note Trends,แนวโน้มหมายเหตุการจัดส่งสินค้า
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +103,This Week's Summary,ข้อมูลอย่างนี้สัปดาห์
+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} เท่านั้นที่สามารถได้รับการปรับปรุงผ่านการทำธุรกรรมสต็อก
 DocType: Student Group Creation Tool,Get Courses,รับหลักสูตร
 DocType: GL Entry,Party,งานเลี้ยง
@@ -3427,7 +3473,7 @@
 DocType: Request for Quotation Item,Request for Quotation Item,ขอใบเสนอราคารายการ
 DocType: Purchase Order,To Bill,บิล
 DocType: Material Request,% Ordered,% สั่งแล้ว
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Piecework,งานเหมา
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Piecework,งานเหมา
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,ราคาซื้อเฉลี่ย
 DocType: Task,Actual Time (in Hours),เวลาที่เกิดขึ้นจริง (ในชั่วโมง)
 DocType: Employee,History In Company,ประวัติใน บริษัท
@@ -3441,10 +3487,10 @@
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +4,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 +350,{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 +162,Black,สีดำ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,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} รายการที่ผลิต
@@ -3455,13 +3501,13 @@
 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 +69,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,มาร์คขาด
 DocType: Journal Entry Account,Exchange Rate,อัตราแลกเปลี่ยน
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Sales Order {0} is not submitted,การขายสินค้า {0} ไม่ได้ ส่ง
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +527,Sales Order {0} is not submitted,การขายสินค้า {0} ไม่ได้ ส่ง
 DocType: Homepage,Tag Line,สายแท็ก
 DocType: Fee Component,Fee Component,ค่าบริการตัวแทน
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +857,Add items from,เพิ่มรายการจาก
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +836,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: Cheque Print Template,Regular,ปกติ
 DocType: BOM,Last Purchase Rate,อัตราซื้อล่าสุด
@@ -3469,6 +3515,7 @@
 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} ตั้งแต่มีสายพันธุ์
 ,Sales Person-wise Transaction Summary,การขายอย่างย่อรายการคนฉลาด
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +60,Cost Center is required for 'Profit and Loss' account {0}. Please set up a default Cost Center for the Company.,ศูนย์ต้นทุนเป็นสิ่งจำเป็นสำหรับ &#39;กำไรขาดทุน&#39; บัญชี {0} โปรดตั้งค่าศูนย์ต้นทุนเริ่มต้นของ บริษัท ฯ
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,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,เปอร์เซ็นต์การกระจายรายเดือน
@@ -3479,12 +3526,12 @@
 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 +710,Online,ออนไลน์
+apps/erpnext/erpnext/accounts/page/pos/pos.js +692,Online,ออนไลน์
 ,Available Stock for Packing Items,สต็อกสำหรับการบรรจุรายการ
 DocType: Item Variant,Item Variant,รายการตัวแปร
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,การตั้งค่าแม่แบบที่อยู่นี้เป็นค่าเริ่มต้นที่ไม่มีค่าเริ่มต้นอื่น ๆ
+apps/erpnext/erpnext/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 +74,Quality Management,การบริหารจัดการคุณภาพ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,การบริหารจัดการคุณภาพ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,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,ประวัติการทำงานของพนักงานภายนอก
@@ -3506,11 +3553,12 @@
 DocType: Student,Student Email ID,อีเมล์ ID นักศึกษา
 DocType: Employee,Notice (days),แจ้งให้ทราบล่วงหน้า (วัน)
 DocType: Tax Rule,Sales Tax Template,แม่แบบภาษีการขาย
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1520,Select items to save the invoice,เลือกรายการที่จะบันทึกในใบแจ้งหนี้
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1544,Select items to save the invoice,เลือกรายการที่จะบันทึกในใบแจ้งหนี้
 DocType: Employee,Encashment Date,วันที่การได้เป็นเงินสด
 DocType: Account,Stock Adjustment,การปรับ สต็อก
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},ค่าใช้จ่ายเริ่มต้นกิจกรรมที่มีอยู่สำหรับประเภทกิจกรรม - {0}
 DocType: Production Order,Planned Operating Cost,ต้นทุนการดำเนินงานตามแผน
+DocType: Academic Term,Term Start Date,ในระยะวันที่เริ่มต้น
 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,ชื่อผู้ยื่นคำขอ
@@ -3530,7 +3578,7 @@
 apps/erpnext/erpnext/config/selling.py +143,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,การประกัน
+apps/erpnext/erpnext/config/support.py +22,Warranty,การรับประกัน
 DocType: Production Order,Warehouses,โกดัง
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationary,การพิมพ์และ เครื่องเขียน
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} สินทรัพย์ที่ไม่สามารถโอน
@@ -3540,17 +3588,17 @@
 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.,คลังสินค้า ไม่สามารถลบได้ เป็นรายการ บัญชีแยกประเภท หุ้น ที่มีอยู่สำหรับ คลังสินค้า นี้
 DocType: Company,Distribution,การกระจาย
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +8,Amount Paid,จำนวนเงินที่ชำระ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Project Manager,ผู้จัดการโครงการ
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,จำนวนเงินที่ชำระ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,ผู้จัดการโครงการ
 ,Quoted Item Comparison,เปรียบเทียบรายการที่ยกมา
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Dispatch,ส่งไป
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,ส่งไป
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,ส่วนลดสูงสุดที่ได้รับอนุญาตสำหรับรายการ: {0} เป็น {1}%
 apps/erpnext/erpnext/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.,บทบาทที่ได้รับอนุญาตให้ส่งการทำธุรกรรมที่เกินวงเงินที่กำหนด
-DocType: Sales Invoice,Supplier Reference,อ้างอิงจำหน่าย
-apps/erpnext/erpnext/accounts/page/pos/pos.js +844,"Master data syncing, it might take some time",ปริญญาโทการซิงค์ข้อมูลก็อาจใช้เวลา
+apps/erpnext/erpnext/accounts/page/pos/pos.js +832,"Master data syncing, it might take some time",ปริญญาโทการซิงค์ข้อมูลก็อาจใช้เวลา
 DocType: Item,Material Issue,ฉบับวัสดุ
 DocType: Hub Settings,Seller Description,รายละเอียดผู้ขาย
 DocType: Employee Education,Qualification,คุณสมบัติ
@@ -3564,7 +3612,7 @@
 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 +83,Error in formula or condition,ข้อผิดพลาดในสูตรหรือเงื่อนไข
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,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,ยกเลิกการเลือกทั้งหมด
@@ -3573,7 +3621,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},วันที่ควรจะเป็นภายในปีงบประมาณ สมมติว่านัด = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","ที่นี่คุณสามารถรักษาความสูงน้ำหนัก, ภูมิแพ้, ฯลฯ ปัญหาด้านการแพทย์"
 DocType: Leave Block List,Applies to Company,นำไปใช้กับ บริษัท
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +197,Cannot cancel because submitted Stock Entry {0} exists,ไม่สามารถยกเลิก ได้เพราะ ส่ง สินค้า เข้า {0} มีอยู่
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +198,Cannot cancel because submitted Stock Entry {0} exists,ไม่สามารถยกเลิก ได้เพราะ ส่ง สินค้า เข้า {0} มีอยู่
 DocType: Purchase Invoice,In Words,จำนวนเงิน (ตัวอักษร)
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,Today is {0}'s birthday!,วันนี้เป็นวัน {0} 'วันเกิด!
 DocType: Production Planning Tool,Material Request For Warehouse,ขอวัสดุสำหรับคลังสินค้า
@@ -3583,14 +3631,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,ปี การเงินของคุณ จะเริ่มต้นใน
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,ค่าเสื่อมราคาสินทรัพย์และยอดคงเหลือ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +319,Amount {0} {1} transferred from {2} to {3},จำนวน {0} {1} โอนจาก {2} เป็น {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +322,Amount {0} {1} transferred from {2} to {3},จำนวน {0} {1} โอนจาก {2} เป็น {3}
 DocType: Sales Invoice,Get Advances Received,รับเงินรับล่วงหน้า
 DocType: Email Digest,Add/Remove Recipients,เพิ่ม / ลบ ชื่อผู้รับ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +432,Transaction not allowed against stopped Production Order {0},การทำธุรกรรมที่ ไม่ได้รับอนุญาต กับ หยุด การผลิต สั่งซื้อ {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +437,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 +143,Join,ร่วม
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,ปัญหาการขาดแคลนจำนวน
-apps/erpnext/erpnext/stock/doctype/item/item.py +652,Item variant {0} exists with same attributes,ตัวแปรรายการ {0} อยู่ที่มีลักษณะเดียวกัน
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,ตัวแปรรายการ {0} อยู่ที่มีลักษณะเดียวกัน
+DocType: Leave Application,LAP/,ตัก/
 DocType: Salary Slip,Salary 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,"โปรดระบุ “วันที่สิ้นสุด"""
@@ -3598,12 +3647,12 @@
 DocType: Sales Invoice Item,Sales Order Item,รายการสั่งซื้อการขาย
 DocType: Salary Slip,Payment Days,วันชำระเงิน
 DocType: Customer,Dormant,อยู่เฉยๆ
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +212,Warehouses with child nodes cannot be converted to ledger,โกดังกับโหนดลูกไม่สามารถแปลงบัญชีแยกประเภท
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +215,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/public/js/controllers/transaction.js +866,It is needed to fetch Item Details.,มันเป็นสิ่งจำเป็นที่จะดึงรายละเอียดสินค้า
+apps/erpnext/erpnext/public/js/controllers/transaction.js +857,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} ได้รับ อยู่แล้ว
@@ -3613,14 +3662,14 @@
 DocType: Expense Claim,Total Claimed Amount,จำนวนรวมอ้าง
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,โอกาสที่มีศักยภาพสำหรับการขาย
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,Invalid {0},ไม่ถูกต้อง {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Sick Leave,ป่วย ออกจาก
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,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,ห้างสรรพสินค้า
 DocType: Warehouse,PIN,PIN
 DocType: Sales Invoice,Base Change Amount (Company Currency),ฐานเปลี่ยนจำนวนเงิน ( บริษัท สกุล)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +313,No accounting entries for the following warehouses,ไม่มี รายการบัญชี สำหรับคลังสินค้า ดังต่อไปนี้
-apps/erpnext/erpnext/projects/doctype/project/project.js +102,Save the document first.,บันทึกเอกสารครั้งแรก
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +314,No accounting entries for the following warehouses,ไม่มี รายการบัญชี สำหรับคลังสินค้า ดังต่อไปนี้
+apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,บันทึกเอกสารครั้งแรก
 DocType: Account,Chargeable,รับผิดชอบ
 DocType: Company,Change Abbreviation,เปลี่ยนชื่อย่อ
 DocType: Expense Claim Detail,Expense Date,วันที่ค่าใช้จ่าย
@@ -3633,10 +3682,9 @@
 DocType: Purchase Invoice,Recurring Print Format,รูปแบบที่เกิดขึ้นประจำพิมพ์
 DocType: C-Form,Series,ชุด
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,Expected Delivery Date cannot be before Purchase Order Date,วันที่ส่ง ที่คาดว่าจะ ไม่สามารถเป็น วัน ก่อนที่จะ สั่งซื้อ
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,กรุณาตั้งค่าการตั้งชื่อซีรีส์สำหรับ {0} ผ่านการตั้งค่า&gt; การตั้งค่า&gt; การตั้งชื่อชุด
 DocType: Appraisal,Appraisal Template,แม่แบบการประเมิน
 DocType: Item Group,Item Classification,การจัดประเภทรายการ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Business Development Manager,ผู้จัดการฝ่ายพัฒนาธุรกิจ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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,บัญชีแยกประเภททั่วไป
@@ -3646,8 +3694,8 @@
 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 +940,Please select {0} first,กรุณาเลือก {0} ครั้งแรก
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +749,Batch {0} of Item {1} has expired.,รุ่นที่ {0} ของรายการ {1} หมดอายุ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +953,Please select {0} first,กรุณาเลือก {0} ครั้งแรก
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +757,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,ไม่ทั้งหมด
@@ -3675,10 +3723,10 @@
  {% ถ้า 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 +92,Warehouse not found in the system,โกดัง ไม่พบใน ระบบ
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +106,This Month's Summary,ข้อมูลอย่างเดือนนี้
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,โกดัง ไม่พบใน ระบบ
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,ข้อมูลอย่างเดือนนี้
 DocType: Quality Inspection Reading,Quality Inspection Reading,การตรวจสอบคุณภาพการอ่าน
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,` ตรึง หุ้น เก่า กว่า ` ควรจะ มีขนาดเล็กกว่า % d วัน
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,ค่าของ `อายัด (freeze) Stock ที่เก่ากว่า ` ควรจะ มีขนาดเล็กกว่า % d วัน
 DocType: Tax Rule,Purchase Tax Template,ซื้อแม่แบบภาษี
 ,Project wise Stock Tracking,หุ้นติดตามโครงการที่ชาญฉลาด
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},ตาราง การบำรุงรักษา {0} อยู่ กับ {0}
@@ -3686,21 +3734,22 @@
 DocType: Item Customer Detail,Ref Code,รหัส Ref
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,ระเบียนพนักงาน
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Please set Next Depreciation Date,กรุณาตั้งค่าถัดไปวันที่ค่าเสื่อมราคา
-DocType: Payment Gateway,Payment Gateway,ช่องทางการชำระเงิน
 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 +378,Operation Time must be greater than 0 for Operation {0},เวลาการดำเนินงานจะต้องมากกว่า 0 สำหรับการปฏิบัติงาน {0}
+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/accounts/doctype/account/account.py +170,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 (ซ)
 DocType: Program,Program Abbreviation,ชื่อย่อโปรแกรม
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,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: Appraisal,Start Date,วันที่เริ่มต้น
@@ -3716,21 +3765,22 @@
 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,ลบรายการค่าใช้จ่ายถ้าไม่สามารถใช้ได้กับรายการที่
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,เช่น smsgateway.com / API / send_sms.cgi
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +27,Transaction currency must be same as Payment Gateway currency,สกุลเงินการทำธุรกรรมจะต้องเป็นเช่นเดียวกับการชำระเงินสกุลเงินเกตเวย์
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Transaction currency must be same as Payment Gateway currency,สกุลเงินการทำธุรกรรมจะต้องเป็นเช่นเดียวกับการชำระเงินสกุลเงินเกตเวย์
 DocType: Payment Entry,Receive,รับ
+apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,ใบเสนอราคา:
 DocType: Maintenance Visit,Fully Completed,เสร็จสมบูรณ์
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% เสร็จแล้ว
 DocType: Employee,Educational Qualification,วุฒิการศึกษา
 DocType: Workstation,Operating Costs,ค่าใช้จ่ายในการดำเนินงาน
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,ดำเนินการหากสะสมเกินงบประมาณรายเดือน
 DocType: Purchase Invoice,Submit on creation,ส่งในการสร้าง
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +432,Currency for {0} must be {1},สกุลเงินสำหรับ {0} &#39;จะต้อง {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +435,Currency for {0} must be {1},สกุลเงินสำหรับ {0} &#39;จะต้อง {1}
 DocType: Asset,Disposal Date,วันที่จำหน่าย
 DocType: Employee Leave Approver,Employee Leave Approver,อนุมัติพนักงานออก
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row {0}: An Reorder entry already exists for this warehouse {1},แถว {0}: รายการสั่งซื้อใหม่อยู่แล้วสำหรับคลังสินค้านี้ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +495,Row {0}: An Reorder entry already exists for this warehouse {1},แถว {0}: รายการสั่งซื้อใหม่อยู่แล้วสำหรับคลังสินค้านี้ {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +79,"Cannot declare as lost, because Quotation has been made.",ไม่ สามารถประกาศ เป็น หายไป เพราะ ใบเสนอราคา ได้รับการทำ
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,ซื้อผู้จัดการโท
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +429,Production Order {0} must be submitted,สั่งผลิต {0} จะต้องส่ง
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +434,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,วันที่ ไม่สามารถ ก่อนที่จะ นับจากวันที่
@@ -3740,25 +3790,27 @@
 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 +181,Totals,ผลรวม
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,ผลรวม
 DocType: BOM,Manufacturing,การผลิต
 ,Ordered Items To Be Delivered,รายการที่สั่งซื้อจะถูกส่ง
 DocType: Account,Income,เงินได้
 DocType: Industry Type,Industry Type,ประเภทอุตสาหกรรม
 apps/erpnext/erpnext/templates/includes/cart.js +141,Something went wrong!,สิ่งที่ผิดพลาด!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,Warning: Leave application contains following block dates,คำเตือน: โปรแกรมออกมีวันที่บล็อกต่อไปนี้
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +120,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} ในการทำธุรกรรมนี้
+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 +181,Organization unit (department) master.,หน่วย องค์กร (เขตปกครอง) ต้นแบบ
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,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 +793,All records are synced.,ระเบียนทั้งหมดจะถูกซิงค์
+apps/erpnext/erpnext/accounts/page/pos/pos.js +781,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,ค่าใช้จ่ายชื่อศูนย์
@@ -3777,21 +3829,20 @@
 DocType: Address,Name of person or organization that this address belongs to.,ชื่อบุคคลหรือองค์กรที่อยู่นี้เป็นของ
 apps/erpnext/erpnext/public/js/setup_wizard.js +260,Your Suppliers,ซัพพลายเออร์ ของคุณ
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +49,Cannot set as Lost as Sales Order is made.,ไม่สามารถตั้งค่า ที่ หายไป ในขณะที่ การขายสินค้า ที่ทำ
-DocType: Student Applicant,Mother's Name,แม่ชื่อ
 DocType: Request for Quotation Item,Supplier Part No,ผู้ผลิตชิ้นส่วน
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +348,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',ไม่สามารถหักค่าใช้จ่ายเมื่อเป็นหมวดหมู่สำหรับ &#39;การประเมินค่า&#39; หรือ &#39;Vaulation และรวม
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Received From,ที่ได้รับจาก
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Received From,ที่ได้รับจาก
 DocType: Lead,Converted,แปลง
 DocType: Item,Has Serial No,มีซีเรียลไม่มี
 DocType: Employee,Date of Issue,วันที่ออก
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: จาก {0} สำหรับ {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +153,Row #{0}: Set Supplier for item {1},แถว # {0}: ตั้งผู้ผลิตสำหรับรายการ {1}
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +93,Row {0}: Hours value must be greater than zero.,แถว {0}: ค่าเวลาทำการต้องมีค่ามากกว่าศูนย์
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +117,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} ไม่สามารถพบได้
 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 +172,{0} {1} does not exist,{0} {1} ไม่อยู่
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +175,{0} {1} does not exist,{0} {1} ไม่อยู่
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,Please check Multi Currency option to allow accounts with other currency,กรุณาตรวจสอบตัวเลือกสกุลเงินที่จะอนุญาตให้มีหลายบัญชีที่มีสกุลเงินอื่น ๆ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +72,Item: {0} does not exist in the system,รายการ: {0} ไม่อยู่ในระบบ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,คุณยังไม่ได้ รับอนุญาตให้ กำหนดค่า แช่แข็ง
@@ -3800,13 +3851,14 @@
 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/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,ผู้เข้าร่วมไม่สามารถทำเครื่องหมายสำหรับวันที่ในอนาคต
 DocType: Pricing Rule,Pricing Rule Help,กฎการกำหนดราคาช่วยเหลือ
 DocType: Purchase Taxes and Charges,Account Head,หัวบัญชี
 apps/erpnext/erpnext/config/stock.py +163,Update additional costs to calculate landed cost of items,ปรับปรุงค่าใช้จ่ายเพิ่มเติมในการคำนวณค่าใช้จ่ายในที่ดินของรายการ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Electrical,ไฟฟ้า
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Electrical,ไฟฟ้า
 DocType: Stock Entry,Total Value Difference (Out - In),ความแตกต่างมูลค่ารวม (Out - In)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,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}
@@ -3814,7 +3866,7 @@
 DocType: Item,Customer Code,รหัสลูกค้า
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +210,Birthday Reminder for {0},เตือนวันเกิดสำหรับ {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,ตั้งแต่ วันที่ สั่งซื้อ ล่าสุด
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +292,Debit To account must be a Balance Sheet account,เพื่อเดบิตบัญชีจะต้องเป็นบัญชีงบดุล
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To account must be a Balance Sheet account,เพื่อเดบิตบัญชีจะต้องเป็นบัญชีงบดุล
 DocType: Buying Settings,Naming Series,การตั้งชื่อซีรีส์
 DocType: Leave Block List,Leave Block List Name,ฝากชื่อรายการที่ถูกบล็อก
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,สินทรัพย์ หุ้น
@@ -3826,11 +3878,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 +301,Salary Slip of employee {0} already created for time sheet {1},สลิปเงินเดือนของพนักงาน {0} สร้างไว้แล้วสำหรับแผ่นเวลา {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +313,Salary Slip of employee {0} already created for time sheet {1},สลิปเงินเดือนของพนักงาน {0} สร้างไว้แล้วสำหรับแผ่นเวลา {1}
 DocType: Sales Order Item,Ordered Qty,สั่งซื้อ จำนวน
-apps/erpnext/erpnext/stock/doctype/item/item.py +673,Item {0} is disabled,รายการ {0} ถูกปิดใช้งาน
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} is disabled,รายการ {0} ถูกปิดใช้งาน
 DocType: Stock Settings,Stock Frozen Upto,สต็อกไม่เกิน Frozen
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +838,BOM does not contain any stock item,BOM ไม่ได้มีรายการสินค้าใด ๆ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +809,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,สร้าง Slips เงินเดือน
@@ -3838,23 +3890,24 @@
 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 +485,Row #{0}: Please set reorder quantity,แถว # {0}: กรุณาตั้งค่าปริมาณการสั่งซื้อ
+DocType: Sales Invoice Timesheet,Billing Hours,ชั่วโมงการเรียกเก็บเงิน
+apps/erpnext/erpnext/stock/doctype/item/item.py +487,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 +62,Please set {0},กรุณาตั้ง {0}
 DocType: Purchase Invoice,Repeat on Day of Month,ทำซ้ำในวันเดือน
 DocType: Employee,Health Details,รายละเอียดสุขภาพ
 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,ส่งบิลเงินเดือนทั้งหมดสำหรับเกณฑ์ที่เลือกข้างต้น
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} รายการที่ซิงค์แล้ว
 DocType: Sales Order,Partly Delivered,ส่งบางส่วน
-DocType: Sales Invoice,Existing Customer,ลูกค้าที่มีอยู่
 DocType: Email Digest,Receivables,ลูกหนี้
+DocType: Lead Source,Lead Source,ที่มาของช่องทาง
 DocType: Customer,Additional information regarding the customer.,ข้อมูลเพิ่มเติมเกี่ยวกับลูกค้า
 DocType: Quality Inspection Reading,Reading 5,Reading 5
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +38,Campaign Name is required,ชื่อแคมเปญ จะต้อง
 DocType: Maintenance Visit,Maintenance Date,วันที่ทำการบำรุงรักษา
 DocType: Purchase Invoice Item,Rejected Serial No,หมายเลขเครื่องปฏิเสธ
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +80,Year start date or end date is overlapping with {0}. To avoid please set company,ปีวันเริ่มต้นหรือวันที่สิ้นสุดอยู่ที่ทับซ้อนกันด้วย {0} เพื่อหลีกเลี่ยงการโปรดตั้ง บริษัท
@@ -3863,10 +3916,9 @@
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","ตัวอย่าง:. ABCD ##### 
  ถ้าชุดคือชุดและที่เก็บไม่ได้กล่าวถึงในการทำธุรกรรมแล้วหมายเลขประจำเครื่องอัตโนมัติจะถูกสร้างขึ้นบนพื้นฐานของซีรีส์นี้ หากคุณเคยต้องการที่จะพูดถึงอย่างชัดเจนเลขที่ผลิตภัณฑ์สำหรับรายการนี้ ปล่อยให้ว่างนี้"
 DocType: Upload Attendance,Upload Attendance,อัพโหลดผู้เข้าร่วม
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +129,BOM and Manufacturing Quantity are required,รายการวัสดุและปริมาณการผลิตจะต้อง
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,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,ความแรงของแม็กซ์
-DocType: Bank Reconciliation Detail,Amount,จำนวน
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM แทนที่
 ,Sales Analytics,Analytics ขาย
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +113,Available {0},ที่มีจำหน่าย {0}
@@ -3874,14 +3926,14 @@
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,การตั้งค่าอีเมล์
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +96,Please enter default currency in Company Master,กรุณาใส่ สกุลเงินเริ่มต้น ใน บริษัท มาสเตอร์
 DocType: Stock Entry Detail,Stock Entry Detail,รายละเอียดรายการสินค้า
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +100,Daily Reminders,การแจ้งเตือนทุกวัน
+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/account/account_tree.js +23,New Account Name,ชื่อ บัญชีผู้ใช้ใหม่
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,วัตถุดิบที่จำหน่ายค่าใช้จ่าย
 DocType: Selling Settings,Settings for Selling Module,การตั้งค่าสำหรับการขายโมดูล
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Customer Service,บริการลูกค้า
+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/config/hr.py +50,Offer candidate a Job.,ผู้สมัครเสนองาน
@@ -3890,8 +3942,9 @@
 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} จะต้องมี รายการ หุ้น
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,เริ่มต้นการทำงานในความคืบหน้าโกดัง
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1570,Total nos of serial no is not equal to quantity.,Nos ทั้งหมดไม่มีอนุกรมไม่เท่ากับปริมาณ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1594,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 ปรับปรุง
@@ -3899,9 +3952,10 @@
 DocType: Sales Order,Printing Details,รายละเอียดการพิมพ์
 DocType: Task,Closing Date,ปิดวันที่
 DocType: Sales Order Item,Produced Quantity,จำนวนที่ผลิต
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Engineer,วิศวกร
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Engineer,วิศวกร
+DocType: Journal Entry,Total Amount Currency,รวมสกุลเงินจำนวนเงิน
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,ค้นหาประกอบย่อย
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Item Code required at Row No {0},รหัสสินค้า ที่จำเป็น ที่ แถว ไม่มี {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +398,Item Code required at Row No {0},รหัสสินค้า ที่จำเป็น ที่ แถว ไม่มี {0}
 DocType: Sales Partner,Partner Type,ประเภทคู่
 DocType: Purchase Taxes and Charges,Actual,ตามความเป็นจริง
 DocType: Authorization Rule,Customerwise Discount,ส่วนลด Customerwise
@@ -3917,16 +3971,18 @@
 DocType: BOM,Raw Material Cost,วัตถุดิบต้นทุน
 DocType: Item Reorder,Re-Order Level,ระดับ Re-Order
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,ป้อนรายการและจำนวนที่วางแผนไว้สำหรับที่คุณต้องการที่จะยกระดับการสั่งผลิตหรือดาวน์โหลดวัตถุดิบสำหรับการวิเคราะห์
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +55,Part-time,Part-time
+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
 DocType: Employee,Applicable Holiday List,รายการวันหยุดที่ใช้บังคับ
 DocType: Employee,Cheque,เช็ค
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,ชุด ล่าสุด
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +57,Series Updated,ชุด ล่าสุด
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,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 +87,Clearance Date updated,โปรโมชั่นวันที่มีการปรับปรุง
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Reconciled ประสบความสำเร็จ
@@ -3940,7 +3996,7 @@
 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 +513,Posting date and posting time is mandatory,วันที่โพสต์และโพสต์เวลามีผลบังคับใช้
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,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.,ในคำพูดของจะสามารถมองเห็นได้เมื่อคุณบันทึกใบสั่งซื้อ
@@ -3950,7 +4006,7 @@
 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/stock/doctype/stock_entry/stock_entry.py +158,Target warehouse in row {0} must be same as Production Order,คลังสินค้า เป้าหมาย ในแถว {0} จะต้อง เป็นเช่นเดียวกับ การผลิต การสั่งซื้อ
+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,สกุลเงินไม่สามารถเปลี่ยนแปลงได้หลังจากการทำรายการโดยใช้เงินสกุลอื่น
 DocType: Company,Round Off Account,ปิดรอบบัญชี
@@ -3959,23 +4015,22 @@
 DocType: Customer Group,Parent Customer Group,กลุ่มลูกค้าผู้ปกครอง
 DocType: Purchase Invoice,Contact Email,ติดต่ออีเมล์
 DocType: Appraisal Goal,Score Earned,คะแนนที่ได้รับ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Notice Period,ระยะเวลาการแจ้งให้ทราบล่วงหน้า
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,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 +4,New Sales Person Name,ชื่อใหม่คนขาย
 DocType: Packing Slip,Gross Weight UOM,UOM น้ำหนักรวม
-DocType: Email Digest,Receivables / Payables,ลูกหนี้ / เจ้าหนี้
 DocType: Delivery Note Item,Against Sales Invoice,กับขายใบแจ้งหนี้
 DocType: Bin,Reserved Qty for Production,ลิขสิทธิ์จำนวนการผลิต
 DocType: Asset,Frequency of Depreciation (Months),ความถี่ของค่าเสื่อมราคา (เดือน)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +469,Credit Account,บัญชีเครดิต
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Credit Account,บัญชีเครดิต
 DocType: Landed Cost Item,Landed Cost Item,รายการค่าใช้จ่ายลง
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +55,Show zero values,แสดงค่าศูนย์
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,แสดงค่าศูนย์
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,จำนวนสินค้าที่ได้หลังการผลิต / บรรจุใหม่จากจำนวนวัตถุดิบที่มี
 apps/erpnext/erpnext/public/js/setup_wizard.js +315,Setup a simple website for my organization,การตั้งค่าเว็บไซต์ที่ง่ายสำหรับองค์กรของฉัน
 DocType: Payment Reconciliation,Receivable / Payable Account,ลูกหนี้ / เจ้าหนี้การค้า
 DocType: Delivery Note Item,Against Sales Order Item,กับการขายรายการสั่งซื้อ
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Please specify Attribute Value for attribute {0},โปรดระบุคุณสมบัติราคาแอตทริบิวต์ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},โปรดระบุคุณสมบัติราคาแอตทริบิวต์ {0}
 DocType: Item,Default Warehouse,คลังสินค้าเริ่มต้น
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +39,Budget cannot be assigned against Group Account {0},งบประมาณไม่สามารถกำหนดกลุ่มกับบัญชี {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,กรุณาใส่ ศูนย์ ค่าใช้จ่าย ของผู้ปกครอง
@@ -3997,19 +4052,22 @@
 DocType: Journal Entry,Total Debit,เดบิตรวม
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,เริ่มต้นโกดังสินค้าสำเร็จรูป
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,พนักงานขาย
-DocType: Sales Invoice,Cold Calling,โทรเย็น
 DocType: SMS Parameter,SMS Parameter,พารามิเตอร์ SMS
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,งบประมาณและศูนย์ต้นทุน
 DocType: Maintenance Schedule Item,Half Yearly,ประจำปีครึ่ง
 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 +253,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 +141,Set as Lost,ตั้งเป็น ที่หายไป
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,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 +5,This is based on transactions against this Customer. See timeline below for details,นี้ขึ้นอยู่กับการทำธุรกรรมกับลูกค้านี้ ดูระยะเวลารายละเอียดด้านล่าง
 DocType: Supplier,Credit Days Based On,วันขึ้นอยู่กับเครดิต
@@ -4021,11 +4079,10 @@
 ,Items To Be Requested,รายการที่จะ ได้รับการร้องขอ
 DocType: Purchase Order,Get Last Purchase Rate,รับซื้อให้ล่าสุด
 DocType: Company,Company Info,ข้อมูล บริษัท
-apps/erpnext/erpnext/accounts/page/pos/pos.js +941,Select or add new customer,เลือกหรือเพิ่มลูกค้าใหม่
+apps/erpnext/erpnext/accounts/page/pos/pos.js +930,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 +5,This is based on the attendance of this Employee,นี้ขึ้นอยู่กับการเข้าร่วมของพนักงานนี้
-DocType: Sales Invoice,Frequency,ความถี่
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +463,Debit Account,บัญชีเดบิต
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Debit Account,บัญชีเดบิต
 DocType: Fiscal Year,Year Start Date,วันที่เริ่มต้นปี
 DocType: Attendance,Employee Name,ชื่อของพนักงาน
 DocType: Sales Invoice,Rounded Total (Company Currency),รวมกลม (สกุลเงิน บริษัท )
@@ -4034,27 +4091,27 @@
 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 +210,Supplier Quotation {0} created,ใบเสนอราคาผู้ผลิต {0} สร้าง
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +208,Supplier Quotation {0} created,ใบเสนอราคาผู้ผลิต {0} สร้าง
 apps/erpnext/erpnext/accounts/report/financial_statements.py +90,End Year cannot be before Start Year,ปีที่จบการไม่สามารถก่อนที่จะเริ่มปี
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Employee Benefits,ผลประโยชน์ของพนักงาน
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,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 +228,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/hr/doctype/employee/employee.py +232,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 +499,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},แถวไม่มี {0}: จำนวนเงินไม่สามารถจะสูงกว่าจำนวนเงินที่ค้างอยู่กับค่าใช้จ่ายในการเรียกร้อง {1} ที่รอดำเนินการเป็นจำนวน {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +500,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 +1007,Price List not found or disabled,ราคาไม่พบหรือคนพิการ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1008,Price List not found or disabled,ราคาไม่พบหรือคนพิการ
 DocType: Expense Claim,Approved,ได้รับการอนุมัติ
 DocType: Pricing Rule,Price,ราคา
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +244,Employee relieved on {0} must be set as 'Left',พนักงาน โล่งใจ ที่ {0} จะต้องตั้งค่า เป็น ' ซ้าย '
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +256,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} ใน ช่วงวันที่ ที่กำหนด
@@ -4065,12 +4122,12 @@
 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 +259,Please select Employee Record first.,กรุณาเลือกพนักงานบันทึกครั้งแรก
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +266,Please select Employee Record first.,กรุณาเลือกพนักงานบันทึกครั้งแรก
 DocType: POS Profile,Account for Change Amount,บัญชีเพื่อการเปลี่ยนแปลงจำนวน
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +190,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},แถว {0}: ปาร์ตี้ / บัญชีไม่ตรงกับ {1} / {2} ใน {3} {4}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +235,Please enter Expense Account,กรุณากรอกบัญชีค่าใช้จ่าย
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,Please enter Expense Account,กรุณากรอกบัญชีค่าใช้จ่าย
 DocType: Account,Stock,คลังสินค้า
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,"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 +976,"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,รายละเอียด การซื้อ / การผลิต
@@ -4085,9 +4142,10 @@
 DocType: Asset Movement,Transaction Date,วันที่ทำรายการ
 DocType: Production Plan Item,Planned Qty,จำนวนวางแผน
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,ภาษีทั้งหมด
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,For Quantity (Manufactured Qty) is mandatory,สำหรับปริมาณ (ผลิตจำนวน) มีผลบังคับใช้
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,For Quantity (Manufactured Qty) is mandatory,สำหรับปริมาณ (ผลิตจำนวน) มีผลบังคับใช้
 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 +78,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,วันที่เริ่มต้นจริง
@@ -4102,9 +4160,11 @@
 DocType: Warranty Claim,If different than customer address,หาก แตกต่างจาก ที่อยู่ของลูกค้า
 DocType: BOM Operation,BOM Operation,การดำเนินงาน BOM
 DocType: Purchase Taxes and Charges,On Previous Row Amount,เกี่ยวกับจำนวนเงินแถวก่อนหน้า
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +226,Transfer Asset,การโอนสินทรัพย์
+DocType: Student,Home Address,ที่อยู่บ้าน
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +227,Transfer Asset,การโอนสินทรัพย์
 DocType: POS Profile,POS Profile,รายละเอียด POS
 apps/erpnext/erpnext/config/schools.py +33,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 +129,"Item {0} is a template, please select one of its variants",รายการ {0} เป็นแม่แบบโปรดเลือกหนึ่งในตัวแปรของมัน
 DocType: Asset,Asset Category,ประเภทสินทรัพย์
@@ -4114,8 +4174,8 @@
 DocType: Assessment,Room,ห้อง
 DocType: Purchase Order,Advance Paid,จ่ายล่วงหน้า
 DocType: Item,Item Tax,ภาษีสินค้า
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +765,Material to Supplier,วัสดุในการจัดจำหน่าย
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +189,Excise Invoice,สรรพสามิตใบแจ้งหนี้
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,Material to Supplier,วัสดุในการจัดจำหน่าย
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,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,หนี้สินหมุนเวียน
@@ -4125,7 +4185,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,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 +136,Credit Card,บัตรเครดิต
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,บัตรเครดิต
 DocType: BOM,Item to be manufactured or repacked,รายการที่จะผลิตหรือ repacked
 apps/erpnext/erpnext/config/stock.py +174,Default settings for stock transactions.,ตั้งค่าเริ่มต้น สำหรับการทำธุรกรรม หุ้น
 DocType: Purchase Invoice,Next Date,วันที่ถัดไป
@@ -4133,6 +4193,7 @@
 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: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children",ที่นี่คุณสามารถรักษารายละเอียดเช่นชื่อครอบครัวและอาชีพของผู้ปกครองคู่สมรสและเด็ก
+DocType: Academic Term,Term End Date,วันที่สิ้นสุดระยะ
 DocType: Hub Settings,Seller Name,ชื่อผู้ขาย
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),ภาษีและค่าใช้จ่ายหัก (สกุลเงิน บริษัท )
 DocType: Item Group,General Settings,การตั้งค่าทั่วไป
@@ -4144,7 +4205,7 @@
 DocType: Customer,Commission Rate,อัตราค่าคอมมิชชั่น
 apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,ทำให้ตัวแปร
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,ปิดกั้นการใช้งานออกโดยกรม
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +115,"Payment Type must be one of Receive, Pay and Internal Transfer",ประเภทการชำระเงินต้องเป็นหนึ่งในการรับชำระเงินและการโอนเงินภายใน
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +118,"Payment Type must be one of Receive, Pay and Internal Transfer",ประเภทการชำระเงินต้องเป็นหนึ่งในการรับชำระเงินและการโอนเงินภายใน
 apps/erpnext/erpnext/config/selling.py +169,Analytics,Analytics
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,รถเข็นที่ว่างเปล่า
 DocType: Production Order,Actual Operating Cost,ต้นทุนการดำเนินงานที่เกิดขึ้นจริง
@@ -4159,10 +4220,10 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,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 +92,Designer,นักออกแบบ
+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/accounts/doctype/purchase_invoice/purchase_invoice.py +469,Cost Center is required in row {0} in Taxes table for type {1},ศูนย์ต้นทุน ที่จะต้อง อยู่ในแถว {0} ในตาราง ภาษี สำหรับประเภท {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +472,Cost Center is required in row {0} in Taxes table for type {1},ศูนย์ต้นทุน ที่จะต้อง อยู่ในแถว {0} ในตาราง ภาษี สำหรับประเภท {1}
 DocType: Program,Program Code,รหัสโปรแกรม
 ,Item-wise Purchase Register,สมัครสมาชิกสั่งซื้อสินค้าที่ชาญฉลาด
 DocType: Batch,Expiry Date,วันหมดอายุ
@@ -4172,12 +4233,12 @@
 apps/erpnext/erpnext/config/projects.py +13,Project master.,ต้นแบบโครงการ
 apps/erpnext/erpnext/controllers/status_updater.py +174,"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 +417, (Half Day),(ครึ่งวัน)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425, (Half Day),(ครึ่งวัน)
 DocType: Supplier,Credit Days,วันเครดิต
 DocType: Leave Type,Is Carry Forward,เป็น Carry Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +740,Get Items from BOM,รับสินค้า จาก BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +711,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 +549,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},แถว # {0}: โพสต์วันที่ต้องเป็นเช่นเดียวกับวันที่ซื้อ {1} สินทรัพย์ {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +552,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,โอนสินทรัพย์จากที่หนึ่งไปยังอีกคลังสินค้า
diff --git a/erpnext/translations/tr.csv b/erpnext/translations/tr.csv
index d5d0866..cc3bd6a 100644
--- a/erpnext/translations/tr.csv
+++ b/erpnext/translations/tr.csv
@@ -23,11 +23,10 @@
 DocType: Employee,Rented,Kiralanmış
 DocType: Employee,Rented,Kiralanmış
 DocType: Purchase Order,PO-,PO-
-apps/erpnext/erpnext/accounts/report/financial_statements.py +19,Start Year {0} not found.,Yıl başlatmak {0} bulunamadı.
 DocType: POS Profile,Applicable for User,Kullanıcı için geçerlidir
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +191,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Durduruldu Üretim Sipariş iptal edilemez, iptal etmek için ilk önce unstop"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +197,Do you really want to scrap this asset?,Bu varlığı gerçekten hurda etmek istiyor musunuz?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +17,Select Default Supplier,Seç Varsayılan Tedarikçi
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +192,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Durduruldu Üretim Sipariş iptal edilemez, iptal etmek için ilk önce unstop"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +198,Do you really want to scrap this asset?,Bu varlığı gerçekten hurda etmek istiyor musunuz?
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Seç Varsayılan Tedarikçi
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Döviz Fiyat Listesi için gereklidir {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* İşlemde hesaplanacaktır.
 DocType: Address,County,Kontluk
@@ -51,47 +50,44 @@
 DocType: Sales Invoice,Customer Name,Müşteri Adı
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +126,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 +180,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 +183,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 +148,Series Updated Successfully,Seri Başarıyla güncellendi
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +149,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
-DocType: Quality Inspection Reading,Parameter,Parametre
-DocType: Quality Inspection Reading,Parameter,Parametre
 apps/erpnext/erpnext/projects/doctype/project/project.py +54,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 +239,New Leave Application,Yeni İzin Uygulaması
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,New Leave Application,Yeni İzin Uygulaması
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +20,Attendance Record {0} exists against Student {1} for Course Schedule {2},"Katılım Kaydı {0}, Öğrenci {1} adına Ders Takvimi {2} için bulunuyor."
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Bank Draft,Banka Havalesi
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Bank Draft,Banka poliçesi
+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
 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
-DocType: Academic Term,Academic Term,Akademik Yıl
+DocType: Academic Term,Academic Term,Akademik Dönem
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +13,Material,Malzeme
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Quantity,Miktar
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Quantity,Miktar
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +511,Accounts table cannot be blank.,Hesap Tablosu boş olamaz.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +616,Quantity,Miktar
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +616,Quantity,Miktar
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +512,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)
 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/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 +142,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
-DocType: Purchase Invoice,Monthly,Aylık
-DocType: Purchase Invoice,Monthly,Aylık
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Ödeme Gecikme (Gün)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +771,Invoice,Fatura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +750,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
@@ -102,7 +98,7 @@
 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 +198,Row {0}: {1} {2} does not match with {3},Satır {0}: {1} {2} ile eşleşmiyor {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Satır # {0}:
+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 +127,Please select Price List,Fiyat Listesi seçiniz
@@ -140,8 +136,8 @@
 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 +589,Get items from,Öğeleri alın
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +382,Stock cannot be updated against Delivery Note {0},Stok İrsaliye {0} karşısı güncellenmez
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Öğeleri alın
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,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
 DocType: Payment Reconciliation,Reconcile,Uzlaştırmak
@@ -153,7 +149,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 +156,Salary Structure Missing,Maaş Yapısı Eksik
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,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
@@ -161,10 +157,11 @@
 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 +156,Credit limit has been crossed for customer {0} {1}/{2},Kredi limiti müşteri için aşıldı {0} {1} / {2}
-apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","'Sabit Varlıktır' seçimi kaldırılamaz, çünkü Varlık kayıtları bulunuyor"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +189,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"
 DocType: Tax Rule,Tax Type,Vergi Türü
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +144,You are not authorized to add or update entries before {0},{0} dan önceki girdileri ekleme veya güncelleme yetkiniz yok
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,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/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
@@ -174,11 +171,10 @@
 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 +165,Opening,Açılış
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,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/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Müşteri&gt; Müşteri Grubu&gt; Bölge
 apps/erpnext/erpnext/accounts/doctype/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.
@@ -186,7 +182,7 @@
 DocType: Lead,Product Enquiry,Ürün Sorgulama
 DocType: Academic Term,Schools,Okullar
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Lütfen ilk önce şirketi girin
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Company first,İlk Şirket seçiniz
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,Please select Company first,İlk Şirket seçiniz
 DocType: Employee Education,Under Graduate,Lisans
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Hedefi
 DocType: BOM,Total Cost,Toplam Maliyet
@@ -199,7 +195,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Hesap Beyanı
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Ecza
 DocType: Purchase Invoice Item,Is Fixed Asset,Sabit Varlık
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Available qty is {0}, you need {1}","Uygun miktar {0}, ihtiyacınız {1}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +225,"Available qty is {0}, you need {1}","Uygun miktar {0}, ihtiyacınız {1}"
 DocType: Expense Claim Detail,Claim Amount,Hasar Tutarı
 DocType: Expense Claim Detail,Claim Amount,Hasar Tutarı
 DocType: Employee,Mr,Bay
@@ -212,27 +208,28 @@
 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: Assessment Result,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 +171,Annual Salary,Yıllık Gelir
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Annual Salary,Yıllık Gelir
 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/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
-apps/erpnext/erpnext/accounts/report/financial_statements.py +22,End Year {0} not found.,Bitiş Yılı {0} bulunamadı.
 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}
 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 +130,At least one mode of payment is required for POS invoice.,Ödeme en az bir mod POS fatura için gereklidir.
 DocType: Products Settings,Show Products as a List,Ürünlerine bir liste olarak
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records",", Şablon İndir uygun verileri doldurmak ve değiştirilmiş dosya ekleyin.
  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 +451,Item {0} is not active or end of life has been reached,Ürün {0} aktif değil veya kullanım ömrünün sonuna gelindi
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +456,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/controllers/accounts_controller.py +614,"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/controllers/accounts_controller.py +617,"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 +166,Settings for HR Module,İK Modülü Ayarları
 apps/erpnext/erpnext/config/hr.py +166,Settings for HR Module,İK Modülü Ayarları
 DocType: SMS Center,SMS Center,SMS Merkezi
@@ -248,15 +245,15 @@
 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 +147,Execution,Yerine Getirme
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,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 +150,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/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
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,Cost Center {0} does not belong to Company {1},Maliyet Merkezi {0} Şirket {1} e ait değildir.
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +100,Cost Center {0} does not belong to Company {1},Maliyet Merkezi {0} Şirket {1} e ait değildir.
 DocType: Customer,Individual,Bireysel
 DocType: Interest,Academics User,Akademik Kullanıcı
 DocType: Cheque Print Template,Amount In Figure,Miktar (Figür)
@@ -275,11 +272,13 @@
 DocType: Purchase Taxes and Charges,Valuation,Değerleme
 DocType: Purchase Taxes and Charges,Valuation,Değerleme
 ,Purchase Order Trends,Satın alma Siparişi Eğilimleri
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,The request for quotation can be accessed by clicking on the following link,tırnak talebi aşağıdaki linke tıklayarak ulaşabilirsiniz
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,Yıllık tahsis izni.
 DocType: SG Creation Tool Course,SG Creation Tool Course,SG Oluşturma Aracı Kursu
 DocType: Student Group Creation Tool,Leave blank if you wish to fetch all courses for selected academic term,Seçilen akademik dönem için tüm dersleri almak istiyorsanız boş bırakın
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,Insufficient Stock,Yetersiz Stok
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227,Insufficient Stock,Yetersiz Stok
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Devre Dışı Bırak Kapasite Planlama ve Zaman Takip
+DocType: Email Digest,New Sales Orders,Yeni Satış Emirleri
 DocType: Bank Reconciliation,Bank Account,Banka Hesabı
 DocType: Bank Reconciliation,Bank Account,Banka Hesabı
 DocType: Leave Type,Allow Negative Balance,Negatif Bakiye izni
@@ -287,14 +286,14 @@
 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/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} does not belong to Company {1},Hesap {0} Şirkete ait değil {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +86,Account {0} does not belong to Company {1},Hesap {0} Şirkete ait değil {1}
 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}
 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
 DocType: Customer Group,Mention if non-standard receivable account applicable,Mansiyon standart dışı alacak hesabı varsa
 DocType: Course Schedule,Instructor Name,Öğretim Elemanının Adı
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,For Warehouse is required before Submit,Sunulmadan önce gerekli depo için
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,For Warehouse is required before Submit,Sunulmadan önce gerekli depo için
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Açık Alınan
 DocType: Sales Partner,Reseller,Bayi
 DocType: Sales Partner,Reseller,Bayi
@@ -302,7 +301,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Satış Fatura Ürün Karşı
 ,Production Orders in Progress,Devam eden Üretim Siparişleri
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Cash from Financing,Finansman Sağlanan Net Nakit
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1436,"LocalStorage is full , did not save","YerelDepolama dolu, tasarruf etmedi"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1460,"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}
@@ -315,20 +314,21 @@
 apps/erpnext/erpnext/templates/generators/item.html +78,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 +5,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/leave_application/leave_application.py +206,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/leave_application/leave_application.py +213,Only the selected Leave Approver can submit this Leave Application,Yalnızca seçilen izin onaylayıcı bu İzin uygulamasını verebilir
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Ayrılma tarihi Katılma tarihinden sonra olmalıdır
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Leaves per Year,Yıl başına bırakı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 +103,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
+DocType: Email Digest,Profit & Loss,Kar kaybı
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,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 +435,Leave Blocked,İzin engellendi
-apps/erpnext/erpnext/stock/doctype/item/item.py +669,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 +443,Leave Blocked,İzin engellendi
+apps/erpnext/erpnext/stock/doctype/item/item.py +671,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 +83,Annual,Yıllık
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +83,Annual,Yıllık
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +86,Annual,Yıllık
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +86,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ı
@@ -336,23 +336,25 @@
 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
 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 +91,Software Developer,Yazılım Geliştirici
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,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 +94,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ü
 DocType: Scheduling Tool,Course Start Date,Kurs Başlangıç Tarihi
 DocType: Item,Publish in Hub,Hub Yayınla
+DocType: Student Admission,Student Admission,Öğrenci Kabulü
 ,Terretory,Bölge
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is cancelled,Ürün {0} iptal edildi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Material Request,Malzeme Talebi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Material Request,Malzeme Talebi
+apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} is cancelled,Ürün {0} iptal edildi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +823,Material Request,Malzeme Talebi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +823,Material Request,Malzeme Talebi
 DocType: Bank Reconciliation,Update Clearance Date,Güncelleme Alma Tarihi
 apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +28,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 +328,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Satın Alma Emri &#39;Hammadde Tedarik&#39; tablosunda bulunamadı Item {0} {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +333,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Satın Alma Emri &#39;Hammadde Tedarik&#39; tablosunda bulunamadı Item {0} {1}
 DocType: Employee,Relation,İlişki
 DocType: Shipping Rule,Worldwide Shipping,Dünya çapında Nakliye
+DocType: Student Guardian,Mother,anne
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Müşteriler Siparişi Onaylandı.
 DocType: Purchase Receipt Item,Rejected Quantity,Reddedilen Miktar
 DocType: Purchase Receipt Item,Rejected Quantity,Reddedilen Miktar
@@ -373,20 +375,21 @@
 DocType: Student Group Student,Student Group Student,Öğrenci Grubu Öğrenci
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Son
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Son
+DocType: Email Digest,New Quotations,Yeni Fiyat Teklifleri
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,İlk kullanıcı sistem yöneticisi olacaktır (daha sonra değiştirebilirsiniz)
 DocType: Tax Rule,Shipping County,Kargo İlçe
 apps/erpnext/erpnext/config/desktop.py +158,Learn,Öğrenin
 DocType: Asset,Next Depreciation Date,Bir sonraki değer kaybı tarihi
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Çalışan başına Etkinlik Maliyeti
 DocType: Accounts Settings,Settings for Accounts,Hesaplar için Ayarlar
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +626,Supplier Invoice No exists in Purchase Invoice {0},"Tedarikçi Fatura Numarası, {0} nolu Satınalma Faturasında bulunuyor."
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +629,Supplier Invoice No exists in Purchase Invoice {0},"Tedarikçi Fatura Numarası, {0} nolu Satınalma Faturasında bulunuyor."
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Satış Elemanı Ağacını Yönetin.
 DocType: Job Applicant,Cover Letter,Ön yazı
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Üstün Çekler ve temizlemek için Mevduat
 DocType: Item,Synced With Hub,Hub ile Senkronize
 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 +348,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 +86,Circular Reference Error,Dairesel Referans Hatası
@@ -400,16 +403,17 @@
 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 +806,Delivery Note,İrsaliye
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +800,Delivery Note,İrsaliye
 apps/erpnext/erpnext/config/learn.py +87,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 +233,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/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/setup/doctype/email_digest/email_digest.py +104,Summary for this week and pending activities,Bu hafta ve bekleyen aktiviteler için Özet
+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"
 DocType: Employee,Company Email,Şirket e-posta
@@ -421,15 +425,15 @@
 apps/erpnext/erpnext/config/hr.py +186,"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ı
-apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Satır # {0}: Alış Fatura varolan varlık karşı yapılamaz {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +554,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 +54,{0} already allocated for Employee {1} for period {2} to {3},{0} zaten Çalışan tahsis {1} dönem {2} için {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +812,Select Item,Öğe Seç
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +791,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 \
 					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 +142,Purchase Invoice {0} is already submitted,Satın alma Faturası {0} zaten teslim edildi
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Satır # {0}: Toplu Hayır aynı olmalıdır {1} {2}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +143,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).
 DocType: C-Form Invoice Detail,Invoice Date,Fatura Tarihi
@@ -438,7 +442,7 @@
 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 +342,Please see attachment,Eke bakın
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,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
@@ -448,6 +452,7 @@
 DocType: Delivery Note,Instructions,Talimatlar
 DocType: Delivery Note,Instructions,Talimatlar
 DocType: Quality Inspection,Inspected By,Denetleyen
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Tedarikçi&gt; Tedarikçi Tipi
 DocType: Maintenance Visit,Maintenance Type,Bakım Türü
 DocType: Maintenance Visit,Maintenance Type,Bakım Türü
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Seri No {0} İrsaliye  {1} e ait değil
@@ -464,26 +469,26 @@
 DocType: Currency Exchange,Currency Exchange,Döviz
 DocType: Purchase Invoice Item,Item Name,Ürün Adı
 DocType: Authorization Rule,Approving User  (above authorized value),(Yetkili değerin üstünde) Kullanıcı onaylanması
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Alacak bakiyesi
+DocType: Email Digest,Credit Balance,Alacak bakiyesi
 DocType: Employee,Widowed,Dul
 DocType: Employee,Widowed,Dul
 DocType: Request for Quotation,Request for Quotation,Fiyat Teklif Talebi
 DocType: Salary Slip Timesheet,Working Hours,Iş saatleri
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Varolan bir serinin başlangıç / geçerli sıra numarasını değiştirin.
 apps/erpnext/erpnext/accounts/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 +736,Purchase Return,Satın alma iadesi
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +715,Purchase Return,Satın alma iadesi
 ,Purchase Register,Satın alma kaydı
 DocType: 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 +202,{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 +209,{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 +143,Reason for losing,Kaybetme nedeni
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Kaybetme nedeni
-apps/erpnext/erpnext/accounts/utils.py +239,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 +163,Reason for losing,Kaybetme nedeni
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +163,Reason for losing,Kaybetme nedeni
+apps/erpnext/erpnext/accounts/utils.py +316,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 +79,Workstation is closed on the following dates as per Holiday List: {0},İş İstasyonu Tatil List göre aşağıdaki tarihlerde kapalı: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Fırsatlar
@@ -492,8 +497,8 @@
 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 +225,Please enter Cost Center,Maliyet Merkezi giriniz
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +225,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 +226,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ı
@@ -508,21 +513,21 @@
 DocType: Purchase Invoice,Supplier Name,Tedarikçi Adı
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,ERPNext kitapçığını okuyun
 DocType: Account,Is Group,Is Grubu
+DocType: Email Digest,Pending Purchase Orders,Satınalma Siparişleri Bekleyen
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Otomatik olarak FIFO göre Nos Seri Set
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Kontrol Tedarikçi Fatura Numarası Teklik
 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 +102,Non Profit,Kar Yok
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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: Stock Reconciliation Item,Do not include symbols (ex. $),semboller dahil etmeyin (örn. $)
 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 +638,Attribute {0} selected multiple times in Attributes Table,Özellik {0} Nitelikler Tablo birden çok kez seçilmiş
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Özellik {0} Nitelikler Tablo birden çok kez seçilmiş
 DocType: HR Settings,Employee record is created using selected field. ,Çalışan kaydı seçilen alan kullanılarak yapılmıştır
 DocType: Sales Order,Not Applicable,Uygulanamaz
 DocType: Sales Order,Not Applicable,Uygulanamaz
@@ -530,8 +535,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 +862,Please enter Item Code.,Ürün Kodu girin.
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +862,Please enter Item Code.,Ürün Kodu girin.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +847,Please enter Item Code.,Ürün Kodu girin.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +847,Please enter Item Code.,Ürün Kodu girin.
 DocType: BOM,Costing,Maliyetlendirme
 DocType: BOM,Costing,Maliyetlendirme
 DocType: Tax Rule,Billing County,fatura İlçe
@@ -547,13 +552,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Teminatlar ve Mevduatlar
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Tahsis edilen toplam yaprakları zorunludur
 DocType: Job Opening,Description of a Job Opening,İş Açılış Açıklaması
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Pending activities for today,Bugün için Bekleyen faaliyetler
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Bugün için Bekleyen faaliyetler
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Katılım kaydı.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,zaman çizelgesi tabanlı bordro için maaş Bileşeni.
 DocType: Sales Order Item,Used for Production Plan,Üretim Planı için kullanılan
 DocType: Sales Order Item,Used for Production Plan,Üretim Planı için kullanılan
 DocType: Manufacturing Settings,Time Between Operations (in mins),(Dakika içinde) Operasyonlar Arası Zaman
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +92,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} Gider Hesabı {2}'ye karşılık gelen Hesap {1}'in Bütçesi {3}'tür. {4} kadar aşıyor.
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +95,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} Gider Hesabı {2}'ye karşılık gelen Hesap {1}'in Bütçesi {3}'tür. {4} kadar aşıyor.
 DocType: Customer,Buyer of Goods and Services.,Mal ve Hizmet Alıcı.
 DocType: Journal Entry,Accounts Payable,Vadesi gelmiş hesaplar
 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
@@ -562,18 +567,18 @@
 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 +86,Administrative Officer,İdari Memur
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,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 +89,Administrative Officer,İdari Memur
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +23,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 +319,Please select Company,Firma seçiniz
-DocType: Stock Entry,Difference Account,Fark Hesabı
-DocType: Stock Entry,Difference Account,Fark Hesabı
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +309,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 +44,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 +398,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 +399,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 +530,"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 +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"
 DocType: Shipping Rule,Net Weight,Net Ağırlık
 DocType: Employee,Emergency Phone,Acil Telefon
 DocType: Employee,Emergency Phone,Acil Telefon
@@ -583,7 +588,7 @@
 DocType: Sales Order,To Deliver,Teslim edilecek
 DocType: Purchase Invoice Item,Item,Ürün
 DocType: Purchase Invoice Item,Item,Ürün
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1563,Serial no item cannot be a fraction,Seri hiçbir öğe bir kısmını olamaz
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1587,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
@@ -595,13 +600,14 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation already used for another company,Kısaltma zaten başka bir şirket için kullanılıyor
 DocType: Selling Settings,Default Customer Group,Varsayılan Müşteri Grubu
 DocType: Selling Settings,Default Customer Group,Varsayılan Müşteri Grubu
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Supplier is required against Payable account {0},Tedarikçi Ödenecek hesabına karşı gerekli {0}
 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
 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 +313,Reference No and Reference Date is mandatory for Bank transaction,Referans No ve Referans Tarih Banka işlem için zorunludur
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +316,Reference No and Reference Date is mandatory for Bank transaction,Referans No ve Referans Tarih Banka işlem için zorunludur
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Ekle / Düzenle Vergi ve Harçlar
 DocType: Purchase Invoice,Supplier Invoice No,Tedarikçi Fatura No
 DocType: Purchase Invoice,Supplier Invoice No,Tedarikçi Fatura No
@@ -616,7 +622,6 @@
 DocType: Production Plan Item,Pending Qty,Bekleyen Adet
 DocType: Budget,Ignore,Yoksay
 DocType: Budget,Ignore,Yoksay
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Ürün Kodu&gt; Ürün Grubu&gt; Marka
 apps/erpnext/erpnext/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/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
@@ -631,11 +636,11 @@
 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/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 +28,Please select Company and Party Type first,İlk Şirket ve Parti Tipi seçiniz
+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/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 +707,Make Sales Order,Satış Emri verin
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +701,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
@@ -653,7 +658,8 @@
 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 +734,Sales Return,Satış İade
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +728,Sales Return,Satış İade
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +91,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)
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Potansiyel müşterilerin Veritabanı.
@@ -665,15 +671,14 @@
 DocType: Lead,Middle Income,Orta Gelir
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +212,Opening (Cr),Açılış (Cr)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +212,Opening (Cr),Açılış (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +795,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,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 +237,Allocated amount can not be negative,Tahsis edilen miktar negatif olamaz
+apps/erpnext/erpnext/stock/doctype/item/item.py +797,Default Unit of Measure for Item {0} cannot be changed directly because 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
 DocType: Purchase Order Item,Billed Amt,Faturalı Tutarı
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Stok girişleri mantıksal Depoya karşı yapıldı
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Satış Faturası Çizelgesi
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},Referans No ve Referans Tarihi gereklidir {0}
-DocType: Sales Invoice,Customer's Vendor,Müşterinin Satıcısı
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Proposal Writing,Teklifi Yazma
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Proposal Writing,Teklifi Yazma
+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
 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"
@@ -683,14 +688,15 @@
 DocType: Fiscal Year Company,Fiscal Year Company,Mali Yıl Şirketi
 DocType: Packing Slip Item,DN Detail,DN Detay
 DocType: Packing Slip Item,DN Detail,DN Detay
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +257,Already supplier quotation has created,Tedarikçi fiyat teklifi zaten oluşturuldu
 DocType: Timesheet,Billed,Faturalanmış
 DocType: Timesheet,Billed,Faturalanmış
 DocType: Batch,Batch Description,Toplu Açıklama
+apps/erpnext/erpnext/accounts/utils.py +685,"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 +733,View Offline Records,Görünüm Çevrimdışı Kayıtları
+apps/erpnext/erpnext/accounts/page/pos/pos.js +715,View Offline Records,Görünüm Çevrimdışı Kayıtları
+DocType: Student,Sibling Details,kardeş Detaylar
 DocType: Employee,Reason for Resignation,İstifa Nedeni
 DocType: Employee,Reason for Resignation,İstifa Nedeni
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,Performans değerlendirmeleri için Şablon.
@@ -708,8 +714,8 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,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 +80,Manager,Yönetici
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Manager,Yönetici
+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/manufacturing/doctype/bom/bom.py +227,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
@@ -720,10 +726,11 @@
 DocType: Production Order Operation,In minutes,Dakika içinde
 DocType: Issue,Resolution Date,Karar Tarihi
 DocType: Issue,Resolution Date,Karar Tarihi
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +299,Timesheet created:,Zaman Çizelgesi oluşturuldu:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +715,Please set default Cash or Bank account in Mode of Payment {0},{0} Ödeme şeklinde varsayılan nakit veya banka hesabı ayarlayınız
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +300,Timesheet created:,Zaman Çizelgesi oluşturuldu:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +772,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
 DocType: Selling Settings,Customer Naming By,Müşterinin Bilinen Adı
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Lütfen&gt; İnsan Kaynakları İK Ayarları adlandırma sistemi kurulum Çalışan
 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
 DocType: Activity Cost,Activity Type,Faaliyet Türü
@@ -753,6 +760,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,Bitiş
 DocType: Pricing Rule,Sales Manager,Satış Müdürü
 DocType: Salary Structure Employee,Base,baz
+DocType: Timesheet,Total Billed Hours,Toplam Faturalı Saat
 DocType: Journal Entry,Write Off Amount,Borç Silme Miktarı
 DocType: Journal Entry,Bill No,Fatura No
 DocType: Journal Entry,Bill No,Fatura No
@@ -771,13 +779,13 @@
 DocType: Purchase Receipt,Other Details,Diğer Detaylar
 DocType: Account,Accounts,Hesaplar
 DocType: Account,Accounts,Hesaplar
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Marketing,Pazarlama
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Marketing,Pazarlama
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +227,Payment Entry is already created,Ödeme giriş zaten yaratılır
+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/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 +538,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 +21,Preview Salary Slip,Önizleme Maaş Kayma
+apps/erpnext/erpnext/controllers/accounts_controller.py +541,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 +38,Preview Salary Slip,Önizleme Maaş Kayma
 DocType: Company,Deafult Cost Center,Deafult Maliyet Merkezi
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +48,Account {0} has been entered multiple times,Hesap {0} birden çok kez girilmiş
 DocType: Account,Expenses Included In Valuation,Değerlemeye dahil giderler
@@ -786,7 +794,7 @@
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,Öğrenci Grubu seçiniz
 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 +617,Item has variants.,Öğe varyantları vardır.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Öğe varyantları vardır.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,Ürün {0} bulunamadı
 DocType: Bin,Stock Value,Stok Değeri
 DocType: Bin,Stock Value,Stok Değeri
@@ -812,7 +820,7 @@
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,Bir sonraki fatura oluşturulur tarih. Bu teslim oluşturulur.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Mevcut Varlıklar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Mevcut Varlıklar
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,{0} is not a stock Item,{0} bir stok ürünü değildir.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +87,{0} is not a stock Item,{0} bir stok ürünü değildir.
 DocType: Mode of Payment Account,Default Account,Varsayılan Hesap
 DocType: Mode of Payment Account,Default Account,Varsayılan Hesap
 DocType: Payment Entry,Received Amount (Company Currency),Alınan Tutar (Şirket Para Birimi)
@@ -908,16 +916,16 @@
 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 +709,No Permission,İzin yok
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +710,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ş.
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,Numaralar
+apps/erpnext/erpnext/public/js/setup_wizard.js +298,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
-apps/erpnext/erpnext/controllers/accounts_controller.py +542,Row #{0}: Asset {1} must be submitted,Satır {0}: Sabit Varlık {1} gönderilmelidir
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset {1} must be submitted,Satır {0}: Sabit Varlık {1} gönderilmelidir
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Çalışan bulunmadı
 DocType: Supplier Quotation,Stopped,Durduruldu
 DocType: Supplier Quotation,Stopped,Durduruldu
@@ -925,13 +933,11 @@
 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.
 DocType: Warehouse,Tree Details,ağaç Detayları
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Şimdi Gönder
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Şimdi Gönder
 ,Support Analytics,Destek Analizi
 DocType: Item,Website Warehouse,Web Sitesi Depo
 DocType: Payment Reconciliation,Minimum Invoice Amount,Asgari Fatura Tutarı
 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/sales_invoice/sales_invoice.py +227,Timesheet {0} is already completed or cancelled,Zaman Çizelgesi {0} tamamlanmış veya iptal edilir
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +259,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ış
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Skor 5'ten az veya eşit olmalıdır
@@ -949,13 +955,13 @@
 DocType: Maintenance Visit,Completion Status,Tamamlanma Durumu
 DocType: Maintenance Visit,Completion Status,Tamamlanma Durumu
 DocType: HR Settings,Enter retirement age in years,yıllarda emeklilik yaşı girin
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +229,Target Warehouse,Hedef Depo
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +230,Target Warehouse,Hedef Depo
 DocType: Cheque Print Template,Starting location from left edge,sol kenarından yerini başlayan
 DocType: Item,Allow over delivery or receipt upto this percent,Bu kadar yüzde teslimatı veya makbuz üzerinde izin ver
 DocType: Stock Entry,STE-,STE-
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Sales Order Date,Beklenen Teslim Tarihi satış siparişi tarihinden önce olamaz
 DocType: Upload Attendance,Import Attendance,İthalat Katılımı
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Bütün Ürün Grupları
+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
@@ -969,16 +975,18 @@
 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/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ı
 DocType: Expense Claim,Expenses,Giderler
 DocType: Expense Claim,Expenses,Giderler
 DocType: Item Variant Attribute,Item Variant Attribute,Öğe Varyant Özellik
 ,Purchase Receipt Trends,Satın alma makbuzu eğilimleri
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Research & Development,Araştırma ve Geliştirme
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,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
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Araştırma ve Geliştirme
 ,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
 DocType: Item Reorder,Re-Order Qty,Yeniden sipariş Adet
 DocType: Leave Block List Date,Leave Block List Date,İzin engel listesi tarihi
 DocType: Pricing Rule,Price or Discount,Fiyat veya İndirim
@@ -990,7 +998,7 @@
 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/controllers/accounts_controller.py +340,"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."
+apps/erpnext/erpnext/controllers/accounts_controller.py +343,"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ı
@@ -1015,13 +1023,13 @@
 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 +756,Purchase Receipt,Satın Alma makbuzu
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +735,Purchase Receipt,Satın Alma makbuzu
 ,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 +167,Reference Doctype must be one of {0},Referans Doctype biri olmalı {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +282,Unable to find Time Slot in the next {0} days for Operation {1},Çalışma için bir sonraki {0} günlerde Zaman Slot bulamayan {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +170,Reference Doctype must be one of {0},Referans Doctype biri olmalı {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,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 +439,BOM {0} must be active,BOM {0} aktif olmalıdır
@@ -1032,7 +1040,7 @@
 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 +214,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 +217,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ığı
@@ -1049,9 +1057,9 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Çalışan {0} aktif değil veya yok.
 DocType: Fee Structure,Components,Bileşenler
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,Please enter Asset Category in Item {0},Ürün Varlık Kategori giriniz {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +612,Item Variants {0} updated,Öğe Türevleri {0} güncellendi
+apps/erpnext/erpnext/stock/doctype/item/item.py +614,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 +843,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 +854,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
@@ -1068,24 +1076,25 @@
 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 +728,New Sales Invoice,Yeni Satış Faturası
+apps/erpnext/erpnext/accounts/page/pos/pos.js +710,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 +728,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
 DocType: Material Request Item,Lead Time Date,Teslim Zamanı Tarihi
 DocType: Guardian,Guardian Name,Muhafız adı
 DocType: Cheque Print Template,Has Print Format,Baskı Biçimi vardır
-apps/erpnext/erpnext/accounts/page/pos/pos.js +86, 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 +109,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 +619,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","&#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/page/pos/pos.js +75, 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 +613,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing 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.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +606,Supplier Invoice Date cannot be greater than Posting Date,"Tedarikçi Fatura Tarihi, postalama tarihinden büyük olamaz"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +609,Supplier Invoice Date cannot be greater than Posting Date,"Tedarikçi Fatura Tarihi, postalama tarihinden büyük olamaz"
 DocType: Purchase Invoice Item,Purchase Order Item,Satınalma Siparişi Ürünleri
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +130,Indirect Income,Dolaylı Gelir
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +130,Indirect Income,Dolaylı Gelir
@@ -1095,51 +1104,53 @@
 ,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 +810,Select Item for Transfer,Transferi için seçin Öğe
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +789,Select Item for Transfer,Transferi için seçin Öğe
 DocType: Purchase Invoice,Additional Discount Percentage,Ek iskonto yüzdesi
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Tüm yardım videoların bir listesini görüntüleyin
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Çekin yatırıldığı bankadaki hesap başlığını seçiniz
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Kullanıcıya işlemlerdeki Fiyat Listesi Oranını düzenlemek için izin ver
 DocType: Pricing Rule,Max Qty,En fazla miktar
-DocType: Student Applicant,Father's Name,Baba adı
 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 +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Satır {0}: Satış / Satınalma Siparişi karşı Ödeme hep avans olarak işaretlenmiş olmalıdır
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Kimyasal
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Kimyasal
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +686,All items have already been transferred for this Production Order.,Tüm öğeler zaten bu üretim Sipariş devredilmiştir.
+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
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +694,All items have already been transferred for this Production Order.,Tüm öğeler zaten bu üretim Sipariş devredilmiştir.
 DocType: Process Payroll,Select Payroll Year and Month,Bordro Yılı ve Ay Seçiniz
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,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
-DocType: Opportunity,Walk In,Rezervasyonsuz Müşteri
 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 +12,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).
 DocType: Timesheet Detail,Bill,fatura
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,White,Beyaz
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,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
 DocType: SMS Center,All Lead (Open),Bütün Başlıklar (Açık)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +228,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})
+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 +731,Make ,Oluştur
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Benim Sepeti
-apps/erpnext/erpnext/controllers/selling_controller.py +154,Order Type must be one of {0},Sipariş türü şunlardan biri olmalıdır {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Sipariş türü şunlardan biri olmalıdır {0}
 DocType: Lead,Next Contact Date,Sonraki İrtibat Tarihi
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Açılış Miktarı
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +393,Please enter Account for Change Amount,Değişim Miktarı Hesabı giriniz
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,Please enter Account for Change Amount,Değişim Miktarı Hesabı giriniz
 DocType: Student Batch,Student Batch Name,Öğrenci Toplu Adı
 DocType: Holiday List,Holiday List Name,Tatil Listesi Adı
 DocType: Holiday List,Holiday List Name,Tatil Listesi Adı
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js +8,Schedule Course,Program Ders
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Stock Options,Stok Seçenekleri
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,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 +211,Do you really want to restore this scrapped asset?,Eğer gerçekten bu hurdaya varlığın geri yüklemek istiyor musunuz?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +237,Qty for {0},Için Adet {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +212,Do you really want to restore this scrapped asset?,Eğer gerçekten bu hurdaya varlığın geri yüklemek istiyor musunuz?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,Qty for {0},Için Adet {0}
 DocType: Leave Application,Leave Application,İzin uygulaması
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,İzin Tahsis Aracı
 DocType: Leave Block List,Leave Block List Dates,İzin engel listesi tarihleri
@@ -1149,9 +1160,9 @@
 DocType: Packing Slip Item,Packing Slip Item,Ambalaj Makbuzu Ürünleri
 DocType: Purchase Invoice,Cash/Bank Account,Kasa / Banka Hesabı
 DocType: Purchase Invoice,Cash/Bank Account,Kasa / Banka Hesabı
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Miktar veya değer hiçbir değişiklik ile kaldırıldı öğeler.
+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 +635,Attribute table is mandatory,Özellik tablosu zorunludur
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Özellik tablosu zorunludur
 DocType: Production Planning Tool,Get Sales Orders,Satış Şiparişlerini alın
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} negatif olamaz
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} negatif olamaz
@@ -1178,7 +1189,7 @@
 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/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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Seri No {0} Bakım sözleşmesi {1} uyarınca bakımda
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +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ı
@@ -1195,7 +1206,7 @@
 DocType: Item,Default Selling Cost Center,Standart Satış Maliyet Merkezi
 DocType: Sales Partner,Implementation Partner,Uygulama Ortağı
 DocType: Sales Partner,Implementation Partner,Uygulama Ortağı
-apps/erpnext/erpnext/controllers/selling_controller.py +231,Sales Order {0} is {1},Satış Sipariş {0} {1}
+apps/erpnext/erpnext/controllers/selling_controller.py +232,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ı
 DocType: Packing Slip,Net Weight UOM,Net Ağırlık Ölçü Birimi
@@ -1206,18 +1217,18 @@
 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"
 DocType: Sales Person,Select company name first.,Önce şirket adı seçiniz
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Tedarikçilerden alınan teklifler.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},Şu kişi(lere) {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Ortalama Yaş
 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/templates/pages/home.html +32,View All Products,Tüm Ürünleri görüntüle
+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
 DocType: Expense Claim,From Employee,Çalışanlardan
-apps/erpnext/erpnext/controllers/accounts_controller.py +400,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
+apps/erpnext/erpnext/controllers/accounts_controller.py +403,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
 DocType: Upload Attendance,Attendance From Date,Tarihten itibaren katılım
 DocType: Appraisal Template Goal,Key Performance Area,Kilit Performans Alanı
@@ -1225,8 +1236,7 @@
 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/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,ve yıl
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +191,{0} {1} must be submitted,{0} {1} teslim edilmelidir
-DocType: Email Digest,Annual Expense,Yıllık Gider
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,{0} {1} must be submitted,{0} {1} teslim edilmelidir
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +145,Quantity must be less than or equal to {0},Miktara göre daha az veya ona eşit olmalıdır {0}
 DocType: SMS Center,Total Characters,Toplam Karakterler
 DocType: SMS Center,Total Characters,Toplam Karakterler
@@ -1238,34 +1248,35 @@
 DocType: Sales Partner,Distributor,Dağıtımcı
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Alışveriş Sepeti Nakliye Kural
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +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 +62,Please set 'Apply Additional Discount On',Set &#39;On İlave İndirim Uygula&#39; Lütfen
+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
 DocType: Global Defaults,Global Defaults,Küresel Varsayılanlar
 apps/erpnext/erpnext/projects/doctype/project/project.py +153,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ı
 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 +327,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 +362,Finished Item {0} must be entered for Manufacture type entry,Öğe bitirdi {0} imalatı tipi giriş için girilmelidir
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +367,Finished Item {0} must be entered for Manufacture type entry,Öğe bitirdi {0} imalatı tipi giriş için girilmelidir
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Açılış Muhasebe Dengesi
 DocType: Sales Invoice Advance,Sales Invoice Advance,Satış Fatura Avansı
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +499,Nothing to request,Talep edecek bir şey yok
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +500,Nothing to request,Talep edecek bir şey yok
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',"'Fiili Başlangıç Tarihi', 'Fiili Bitiş Tarihi' den büyük olamaz"
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',"'Fiili Başlangıç Tarihi', 'Fiili Bitiş Tarihi' den büyük olamaz"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Management,Yönetim
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Management,Yönetim
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},{0} için borç ya da kredi hesabı gereklidir
+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/accounts/doctype/gl_entry/gl_entry.py +55,Either debit or credit amount is required for {0},{0} için borç ya da kredi hesabı gereklidir
 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 +161,Blue,Mavi
+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
@@ -1276,13 +1287,13 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +23,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}
 DocType: Purchase Order Item,UOM Conversion Factor,Ölçü Birimi Dönüşüm Katsayısı
 DocType: Stock Settings,Default Item Group,Standart Ürün Grubu
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1374,Do you really want to submit the invoice?,Eğer gerçekten fatura göndermek istiyor musunuz?
+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 +685,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 +1526,"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 +679,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 +1550,"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 +26,"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
@@ -1307,46 +1318,48 @@
 DocType: Global Defaults,Current Fiscal Year,Cari Mali Yılı
 DocType: Global Defaults,Disable Rounded Total,Yuvarlak toplam devre dışı
 DocType: Global Defaults,Disable Rounded Total,Yuvarlak toplam devre dışı
-DocType: Lead,Call,Çağrı
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +417,'Entries' cannot be empty,'Girdiler' boş olamaz
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +418,'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 +214,Fiscal Year {0} not found,bulunamadı Mali Yılı {0}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +221,Fiscal Year {0} not found,bulunamadı Mali Yılı {0}
 apps/erpnext/erpnext/config/hr.py +238,Setting up Employees,Çalışanlar kurma
 DocType: Sales Order,SO-,YANİ-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Önce Ön ek seçiniz
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Please select prefix first,Önce Ön ek seçiniz
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Research,Araştırma
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,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 +148,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 +43,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 +57,View Ledger,Değerlendirme Defteri
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,En erken
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,En erken
-apps/erpnext/erpnext/stock/doctype/item/item.py +504,"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 +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/setup/setup_wizard/setup_wizard.py +437,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
 ,Budget Variance Report,Bütçe Fark Raporu
 DocType: Salary Slip,Gross Pay,Brüt Ödeme
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +90,Row {0}: Activity Type is mandatory.,Satır {0}: Etkinlik Türü zorunludur.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +114,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/public/js/controllers/stock_controller.js +40,Accounting Ledger,Muhasebe Defteri
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,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
 DocType: BOM Item,Item Description,Ürün Tanımı
+DocType: Student Sibling,Student Sibling,Öğrenci Kardeş
 DocType: Purchase Invoice,Is Recurring,Dönüşümlü mı
 DocType: Purchase Invoice,Supplied Items,Verilen Öğeler
 DocType: Student,STUD.,DAMIZLIK.
 DocType: Production Order,Qty To Manufacture,Üretilecek Miktar
+DocType: Email Digest,New Income,yeni Gelir
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Alım döngüsü boyunca aynı oranı koruyun
 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 +131,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 +175,Valuation Rate required for Item in row {0},Arka arkaya Ürün için gerekli değerleme Oranı {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,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
 DocType: Purchase Invoice,Rejected Warehouse,Reddedilen Depo
@@ -1355,50 +1368,50 @@
 DocType: Item,Default Buying Cost Center,Standart Alış Maliyet Merkezi
 DocType: Item,Default Buying Cost Center,Standart Alış Maliyet Merkezi
 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 +87, to ,için
+apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,için
 DocType: Item,Lead Time in days,Teslim Zamanı gün olarak
 ,Accounts Payable Summary,Ödeme Hesabı Özeti
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Not authorized to edit frozen Account {0},Dondurulmuş Hesabı {0} düzenleme yetkisi yok
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,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 +62,Sales Order {0} is not valid,Satış Sipariş {0} geçerli değildir
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Satış Sipariş {0} geçerli değildir
 apps/erpnext/erpnext/setup/doctype/company/company.py +185,"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 +152,Small,Küçük
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,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.
 ,Invoiced Amount (Exculsive Tax),Faturalanan Tutar (Vergi Hariç)
-DocType: Student Applicant,Mother's / Guardian 1 Email ID,Anneler / Guardian 1 E-posta Kimliği
 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 +160,Green,Yeşil
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,Yeşil
 DocType: Supplier,SUPP-,SUPP-
 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 +57,Contract,Sözleşme
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,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 +60,Contract,Sözleşme
 DocType: Email Digest,Add Quote,Alıntı ekle
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +498,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 +503,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 +80,Row {0}: Qty is mandatory,Satır {0}: Miktar zorunludur
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +80,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/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 +737,Sync Master Data,Senkronizasyon Ana Veri
+apps/erpnext/erpnext/accounts/page/pos/pos.js +719,Sync Master Data,Senkronizasyon Ana Veri
 apps/erpnext/erpnext/public/js/setup_wizard.js +283,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
+DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,Ürün Ağacı
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Bu bir kök Ürün grubudur ve düzenlenemez.
+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.
 DocType: Journal Entry Account,Purchase Order,Satın alma emri
 DocType: Warehouse,Warehouse Contact Info,Depo İletişim Bilgileri
 DocType: Warehouse,Warehouse Contact Info,Depo İletişim Bilgileri
 DocType: Payment Entry,Write Off Difference Amount,Fark Tutarı Kapalı yaz
 DocType: Purchase Invoice,Recurring Type,Tekrarlanma Türü
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +345,"{0}: Employee email not found, hence email not sent",{0}: Çalışanın e-posta adresi bulunamadığı için e-posta gönderilemedi
+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
 DocType: Email Digest,Annual Income,Yıllık gelir
@@ -1407,21 +1420,21 @@
 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 +118,"For {0}, only credit accounts can be linked against another debit entry","{0}, sadece kredi hesapları başka bir ödeme girişine karşı bağlantılı olabilir için"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Delivery Note {0} is not submitted,İrsaliye {0} teslim edilmedi
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Delivery Note {0} is not submitted,İrsaliye {0} teslim edilmedi
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Sub-contracted Item,Ürün {0} bir taşeron ürünü olmalıdır
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Sermaye Ekipmanları
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Sermaye Ekipmanları
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Fiyatlandırma Kuralı ilk olarak 'Uygula' alanı üzerinde seçilir, bu bir Ürün, Grup veya Marka olabilir."
 DocType: Hub Settings,Seller Website,Satıcı Sitesi
 DocType: Item,ITEM-,ITEM-
-apps/erpnext/erpnext/controllers/selling_controller.py +147,Total allocated percentage for sales team should be 100,Satış ekibi için ayrılan toplam yüzde 100 olmalıdır
-apps/erpnext/erpnext/controllers/selling_controller.py +147,Total allocated percentage for sales team should be 100,Satış ekibi için ayrılan toplam yüzde 100 olmalıdır
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +110,Production Order status is {0},Üretim Sipariş durumu {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +110,Production Order status is {0},Üretim Sipariş durumu {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Satış ekibi için ayrılan toplam yüzde 100 olmalıdır
+apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Satış ekibi için ayrılan toplam yüzde 100 olmalıdır
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Üretim Sipariş durumu {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Üretim Sipariş durumu {0}
 DocType: Appraisal Goal,Goal,Hedef
 DocType: Appraisal Goal,Goal,Hedef
 DocType: Sales Invoice Item,Edit Description,Edit Açıklama
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +757,For Supplier,Tedarikçi İçin
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +723,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
@@ -1440,10 +1453,11 @@
 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ı
 DocType: Workstation,Workstation Name,İş İstasyonu Adı
+DocType: Grade Interval,Grade Code,sınıf Kodu
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Digest e-posta:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +445,BOM {0} does not belong to Item {1},BOM {0} Öğe ait değil {1}
 DocType: Sales Partner,Target Distribution,Hedef Dağıtımı
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1667,Deafault warehouse is required for selected item,Deafault depo Seçili öğe için gereklidir
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Deafault warehouse is required for selected item,Deafault depo Seçili öğe için gereklidir
 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
@@ -1453,28 +1467,28 @@
 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 +110,Hardware,Donanım
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,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 +113,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/accounts/party.py +171,Please select a Company,Bir Şirket seçiniz
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Privilege Leave,Privilege bırak
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Privilege Leave,Privilege bırak
+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
 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 +79,You need to enable Shopping Cart,Alışveriş sepetini etkinleştirmeniz gereklidir
 DocType: Payment Entry,Writeoff,Hurdaya çıkarmak
 DocType: Appraisal Template Goal,Appraisal Template Goal,Değerlendirme Şablonu Hedefi
-DocType: Salary Slip,Earning,Kazanma
+DocType: Salary Component,Earning,Kazanma
 DocType: Purchase Invoice,Party Account Currency,Parti Hesap Döviz
 ,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 +171,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 +174,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_data.py +358,Food,Yiyecek Grupları
-apps/erpnext/erpnext/demo/setup_data.py +358,Food,Yiyecek Grupları
+apps/erpnext/erpnext/demo/setup/setup_data.py +301,Food,Yiyecek Grupları
+apps/erpnext/erpnext/demo/setup/setup_data.py +301,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/course_schedule/course_schedule.js +103,Mark Attendence,Mark Devam
@@ -1518,12 +1532,12 @@
 DocType: Purchase Invoice Item,Item Tax Amount,Ürün Vergi Tutarı
 DocType: Purchase Invoice Item,Item Tax Amount,Ürün Vergi Tutarı
 DocType: Item,Maintain Stock,Stok koruyun
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +209,Stock Entries already created for Production Order ,Zaten Üretim Siparişi için oluşturulan Stok Girişler
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,Zaten Üretim Siparişi için oluşturulan Stok Girişler
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,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 +620,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 +238,Max: {0},Max: {0}
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +15,From Datetime,DateTime Gönderen
+apps/erpnext/erpnext/controllers/accounts_controller.py +623,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 +239,Max: {0},Max: {0}
+apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,DateTime Gönderen
 DocType: Email Digest,For Company,Şirket için
 DocType: Email Digest,For Company,Şirket için
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Iletişim günlüğü.
@@ -1533,8 +1547,8 @@
 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 +552,cannot be greater than 100,100 'den daha büyük olamaz
-apps/erpnext/erpnext/stock/doctype/item/item.py +680,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 +546,cannot be greater than 100,100 'den daha büyük olamaz
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,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
@@ -1551,12 +1565,10 @@
 DocType: HR Settings,Employee Settings,Çalışan Ayarları
 DocType: HR Settings,Employee Settings,Çalışan Ayarları
 ,Batch-Wise Balance History,Parti-Bilgi Bakiye Geçmişi
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Yapılacaklar Listesi
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Yapılacaklar Listesi
 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 +61,Apprentice,Çırak
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Apprentice,Çırak
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +102,Negative Quantity is not allowed,Negatif Miktara izin verilmez
+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/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"
@@ -1583,18 +1595,17 @@
 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 +141,Source warehouse is mandatory for row {0},Satır {0} Kaynak depo zorunludur
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +719,Packing Slip,Ambalaj Makbuzu
+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 +713,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/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,Fiyat Teklif Talebine ulaşmak için linki tıklayın
 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 +81,Analyst,Analist
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Analyst,Analist
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,Analist
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,Analist
 DocType: Item,Inventory,Stok
 DocType: Item,Sales Details,Satış Ayrıntılar
 DocType: Quality Inspection,QI-,QI-
@@ -1602,8 +1613,8 @@
 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 +103,Government,Devlet
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +103,Government,Devlet
+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/public/js/setup_wizard.js +41,Institute Name,Kurum İsmi
 apps/erpnext/erpnext/config/stock.py +289,Item Variants,Öğe Türevleri
 DocType: Company,Services,Servisler
@@ -1623,6 +1634,7 @@
 DocType: POS Profile,Apply Discount,İndirim uygula
 DocType: Employee External Work History,Total Experience,Toplam Deneyim
 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ışı
 DocType: Program Course,Program Course,programı Ders
@@ -1669,12 +1681,12 @@
 DocType: Production Plan Sales Order,Production Plan Sales Order,Üretim Planı Satış Siparişi
 DocType: Production Plan Sales Order,Production Plan Sales Order,Üretim Planı Satış Siparişi
 DocType: Sales Partner,Sales Partner Target,Satış Ortağı Hedefi
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +110,Accounting Entry for {0} can only be made in currency: {1},"{0} için muhasebe kayıt, sadece para yapılabilir: {1}"
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},"{0} için muhasebe kayıt, sadece para yapılabilir: {1}"
 DocType: Pricing Rule,Pricing Rule,Fiyatlandırma Kuralı
 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
 DocType: Shopping Cart Settings,Payment Success URL,Ödeme Başarı URL
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +78,Row # {0}: Returned Item {1} does not exists in {2} {3},Satır # {0}: İade Item {1} değil var yok {2} {3}
+apps/erpnext/erpnext/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-
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Banka Hesapları
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Banka Hesapları
@@ -1685,43 +1697,42 @@
 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/stock/doctype/stock_entry/stock_entry.py +339,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Daha fazla tranfer izin yok {0} daha {1} Satınalma Siparişi karşı {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +344,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 +545,Manufacturing Quantity is mandatory,Üretim Miktarı zorunludur
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +545,Manufacturing Quantity is mandatory,Üretim Miktarı zorunludur
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Üretim Miktarı zorunludur
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,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 +71,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 +162,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/projects/doctype/timesheet/timesheet.py +186,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
 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 +130,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 +137,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
 DocType: Dependent Task,Dependent Task,Bağımlı Görev
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,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/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 +190,Leave of type {0} cannot be longer than {1},Tip{0} izin  {1}'den uzun olamaz
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +197,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 +921,Search Item,Arama Öğe
+apps/erpnext/erpnext/accounts/page/pos/pos.js +910,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 +546,Already completed,Zaten tamamlandı
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +22,Payment Request already exists {0},Ödeme Talebi zaten var {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +550,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 +241,Quantity must not be more than {0},Miktar fazla olmamalıdır {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Quantity must not be more than {0},Miktar fazla olmamalıdır {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +76,Previous Financial Year is not closed,Geçmiş Mali Yıl kapatılmamış
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +44,Age (Days),Yaş (Gün)
 DocType: Quotation Item,Quotation Item,Teklif Ürünü
@@ -1740,7 +1751,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +221,Purchase Receipt {0} is not submitted,Satın alma makbuzu {0} teslim edilmedi
 DocType: Company,Default Payable Account,Standart Ödenecek Hesap
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Böyle nakliye kuralları, fiyat listesi vb gibi online alışveriş sepeti için Ayarlar"
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +83,{0}% Billed,{0}% Faturalandırıldı
+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ı
@@ -1754,14 +1765,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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/schools/doctype/fees/fees.js +22,Collect,Toplamak
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Toplamak
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,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 +225,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
-DocType: Payment Reconciliation,Payments,Ödemeler
-DocType: Payment Reconciliation,Payments,Ödemeler
 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
@@ -1774,7 +1783,7 @@
 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 +9,Procurement,tedarik
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,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/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
 ,Lead Details,Talep Yaratma Detayları
 DocType: Purchase Invoice,End date of current invoice's period,Cari fatura döneminin bitiş tarihi
@@ -1803,7 +1812,7 @@
 DocType: Selling Settings,Selling Settings,Satış Ayarları
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Online Müzayede
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Online Müzayede
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +97,Please specify either Quantity or Valuation Rate or both,Miktar veya Değerleme Br.Fiyatı ya da her ikisini de belirtiniz
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,Miktar veya Değerleme Br.Fiyatı ya da her ikisini de belirtiniz
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +13,Fulfillment,yerine getirme
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Şirket, Ay ve Mali Yıl zorunludur"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Pazarlama Giderleri
@@ -1828,7 +1837,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,ERPNext Kurulumu Tamamlandı!
 DocType: Item,Weightage,Ağırlık
 DocType: Packing Slip,PS-,ps
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +93,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Aynı adda bir Müşteri Grubu bulunmaktadır. Lütfen Müşteri Grubu ismini değiştirin.
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +126,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
@@ -1836,7 +1845,6 @@
 DocType: Homepage,Products,Ürünler
 DocType: Homepage,Products,Ürünler
 DocType: Announcement,Instructor,Eğitmen
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},Parti Tipi ve Parti Alacak / Borç hesabı için gereklidir {0}
 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
@@ -1849,7 +1857,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 +704,Offline,Çevrimdışı
+apps/erpnext/erpnext/accounts/page/pos/pos.js +686,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
@@ -1870,10 +1878,11 @@
 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
 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 +858,Make Purchase Order,Satın Alma Emri verin
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +852,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 +141,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 +148,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
@@ -1881,18 +1890,19 @@
 DocType: Stock Reconciliation,Stock Reconciliation,Stok Uzlaşma
 DocType: Stock Reconciliation,Stock Reconciliation,Stok Uzlaşma
 DocType: Territory,Territory Name,Bölge Adı
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +172,Work-in-Progress Warehouse is required before Submit,Devam eden depo işi teslimden önce gereklidir
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,Work-in-Progress Warehouse is required before Submit,Devam eden depo işi teslimden önce gereklidir
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,İş için aday
 DocType: Purchase Order Item,Warehouse and Reference,Depo ve Referans
 DocType: Purchase Order Item,Warehouse and Reference,Depo ve Referans
 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 +88,Addresses,Adresleri
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Tedarikçi&gt; Tedarikçi Tipi
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +212,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/hooks.py +95,Addresses,Adresleri
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +215,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
 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
@@ -1901,13 +1911,11 @@
 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 +731,Payment,Tahsilat
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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
 DocType: Employee,Salutation,Hitap
-DocType: Pricing Rule,Brand,Marka
-DocType: Pricing Rule,Brand,Marka
 DocType: Course,Course Abbreviation,Ders Kısaltma
 DocType: Item,Will also apply for variants,Ayrıca varyantları için geçerli olacaktır
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +142,"Asset cannot be cancelled, as it is already {0}","Varlık iptal edilemez, hala  {0}"
@@ -1919,8 +1927,8 @@
 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"
 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 +85,Associate,Ortak
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Associate,Ortak
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Associate,Ortak
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,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
@@ -1928,7 +1936,7 @@
 DocType: Production Planning Tool,Material Requests,Malzeme İstekler
 DocType: Warranty Claim,Issue Date,Veriliş tarihi
 DocType: Activity Cost,Activity Cost,Etkinlik Maliyeti
-DocType: Timesheet Detail,Timesheet Detail,Zaman çizelgesi Detay
+DocType: Sales Invoice Timesheet,Timesheet Detail,Zaman çizelgesi Detay
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Tüketilen Adet
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekomünikasyon
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekomünikasyon
@@ -1954,6 +1962,7 @@
 DocType: Production Plan Material Request,Material Request Date,Malzeme Talep Tarihi
 DocType: Purchase Order Item,Supplier Quotation Item,Tedarikçi Teklif ürünü
 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
 DocType: Monthly Distribution,Name of the Monthly Distribution,Aylık Dağıtım Adı
 DocType: Sales Person,Parent Sales Person,Ana Satış Elemanı
@@ -1967,12 +1976,12 @@
 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 +44,"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/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.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +502,Error: {0} &gt; {1},Hata: {0}&gt; {1}
 DocType: Item,Is Sales Item,Satış Maddesi
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Ürün Grubu Ağacı
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Ürün Grubu Ağacı
@@ -1981,9 +1990,10 @@
 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.
 DocType: Naming Series,Current Value,Mevcut değer
 DocType: Naming Series,Current Value,Mevcut değer
-apps/erpnext/erpnext/controllers/accounts_controller.py +235,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.
+apps/erpnext/erpnext/controllers/accounts_controller.py +238,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.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} oluşturuldu
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} oluşturuldu
 DocType: Delivery Note Item,Against Sales Order,Satış Emri Karşılığı
@@ -1991,14 +2001,14 @@
 ,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 +458,Item table can not be blank,Ürün tablosu boş olamaz
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +443,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}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +5,This is based on stock movement. See {0} for details,Bu stok hareketi dayanmaktadır. Bkz {0} ayrıntılar için
 DocType: Pricing Rule,Selling,Satış
 DocType: Pricing Rule,Selling,Satış
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +341,Amount {0} {1} deducted against {2},"{0} {1} miktarı, {2}'ye karşılık düşürülecek"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +344,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
@@ -2014,8 +2024,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +144,Cannot refer row number greater than or equal to current row number for this Charge type,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 +159,Red,Kırmızı
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Ürün {0} seri numarası eklemek için 'Program Ekle' ye tıklayınız
+apps/erpnext/erpnext/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ç
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Esas Tutar (Şirket Para Birimi)
@@ -2024,7 +2034,7 @@
 DocType: Installation Note,Installation Time,Kurulum Zaman
 DocType: Sales Invoice,Accounting Details,Muhasebe Detayları
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,Bu şirket için bütün İşlemleri sil
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +187,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Satır # {0}: {1} Çalışma Üretimde mamul mal {2} qty tamamlanmış değil Sipariş # {3}. Zaman Kayıtlar üzerinden çalışma durumunu güncelleyin Lütfen
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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,Satır # {0}: {1} Çalışma Üretimde mamul mal {2} qty tamamlanmış değil Sipariş # {3}. Zaman Kayıtlar üzerinden çalışma durumunu güncelleyin Lütfen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,Yatırımlar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,Yatırımlar
 DocType: Issue,Resolution Details,Karar Detayları
@@ -2067,6 +2077,7 @@
 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}
 DocType: Delivery Note,Excise Page Number,Tüketim Sayfa Numarası
 DocType: Delivery Note,Excise Page Number,Tüketim Sayfa Numarası
 DocType: Asset,Purchase Date,Satınalma Tarihi
@@ -2074,10 +2085,10 @@
 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
 ,Maintenance Schedules,Bakım Programları
 DocType: Task,Actual End Date (via Time Sheet),Gerçek tamamlanma tarihi (Zaman Tablosu'ndan)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Amount {0} {1} against {2} {3},{0} {1} Miktarları {2} {3}'e karşılık
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +339,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 +138,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 +295,Debit To account must be a Receivable account,Hesaba için Bankamatik bir Alacak hesabı olması gerekir
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,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
@@ -2087,11 +2098,11 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +137,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 +90,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
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +93,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Toplam ayrılan yapraklar {0} az olamaz dönem için önceden onaylanmış yaprakları {1} den
 DocType: Journal Entry,Accounts Receivable,Alacak hesapları
 DocType: Journal Entry,Accounts Receivable,Alacak hesapları
 ,Supplier-Wise Sales Analytics,Tedarikçi Satış Analizi
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +22,Enter Paid Amount,Ücretli Miktar giriniz
+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
@@ -2102,14 +2113,16 @@
 DocType: HR Settings,HR Settings,İK Ayarları
 DocType: HR Settings,HR Settings,İK Ayarları
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Expense Claim is pending approval. Only the Expense Approver can update status.,Gider Talebi onay bekliyor. Yalnızca Gider yetkilisi durumu güncelleyebilir.
+DocType: Email Digest,New Expenses,yeni giderler
 DocType: Purchase Invoice,Additional Discount Amount,Ek İndirim Tutarı
-apps/erpnext/erpnext/controllers/accounts_controller.py +524,"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."
+apps/erpnext/erpnext/controllers/accounts_controller.py +527,"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 +249,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/stock/get_item_details.py +123,Please specify Company,Şirket belirtiniz
@@ -2125,18 +2138,20 @@
 DocType: Issue,Support,Destek
 DocType: Issue,Support,Destek
 ,BOM Search,BOM Arama
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Closing (Opening + Totals),Kapanış (+ toplamları Açılış)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),Kapanış (+ toplamları Açılış)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Şirket para belirtiniz
 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/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ş
-apps/erpnext/erpnext/controllers/accounts_controller.py +272,Account {0} is invalid. Account Currency must be {1},Hesap {0} geçersiz. Hesap Para olmalıdır {1}
+DocType: Email Digest,Pending Sales Orders,Satış Siparişleri Bekleyen
+apps/erpnext/erpnext/controllers/accounts_controller.py +275,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 +956,"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 Slip,Deduction,Kesinti
-DocType: Salary Slip,Deduction,Kesinti
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +87,Row {0}: From Time and To Time is mandatory.,Satır {0}: From Time ve Zaman için zorunludur.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +969,"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 +111,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 +262,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 +7,Please enter Employee Id of this sales person,Bu satış kişinin Çalışan Kimliği giriniz
@@ -2144,7 +2159,7 @@
 DocType: Project,% Tasks Completed,% Görev Tamamlandı
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,Fark Tutar sıfır olmalıdır
 DocType: Project,Gross Margin,Brüt Marj
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +194,Please enter Production Item first,Önce Üretim Ürününü giriniz
+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ı
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Fiyat Teklifi
@@ -2155,63 +2170,63 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +149,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 +86,Item {0} has already been returned,Ürün {0} zaten iade edilmiş
+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}
+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 +177,Job Description,İş Tanımı
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,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 +126,"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 +127,"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."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +24,Welcome to POS: Create your POS Profile,POS hoş geldiniz: POS Profili Oluştur
 DocType: Expense Claim,Approver,Onaylayan
 DocType: Expense Claim,Approver,Onaylayan
 ,SO Qty,SO Adet
 ,SO Qty,SO Adet
+DocType: Guardian,Work Address,İş adresi
 DocType: Appraisal,Calculate Total Score,Toplam Puan Hesapla
 DocType: Appraisal,Calculate Total Score,Toplam Puan Hesapla
 DocType: Request for Quotation,Manufacturing Manager,Üretim Müdürü
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Seri No {0} {1} uyarınca garantide
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +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 +74,Shipments,Gönderiler
+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
 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 +153,Row # ,Satır #
+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 +156,Get From,Gönderen alın
+apps/erpnext/erpnext/public/js/utils.js +167,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 +167,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 +416,"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"
+apps/erpnext/erpnext/controllers/accounts_controller.py +419,"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ı
 DocType: Cheque Print Template,Bank Name,Banka Adı
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Üstte
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} is disabled,Kullanıcı {0} devre dışı
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} is disabled,Kullanıcı {0} devre dışı
 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 ...
 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 +171,"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 +346,{0} is mandatory for Item {1},{0} Ürün {1} için zorunludur
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,{0} is mandatory for Item {1},{0} Ürün {1} için zorunludur
 DocType: Currency Exchange,From Currency,Para biriminden
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","En az bir satırda Tahsis Tutar, Fatura Türü ve Fatura Numarası seçiniz"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,Yeni Satın Alma Maliyeti
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},Ürün {0}için Satış Sipariş  gerekli
 DocType: Purchase Invoice Item,Rate (Company Currency),Oranı (Şirket para birimi)
 DocType: Purchase Invoice Item,Rate (Company Currency),Oranı (Şirket para birimi)
-apps/erpnext/erpnext/demo/setup_data.py +360,Others,Diğer
-apps/erpnext/erpnext/demo/setup_data.py +360,Others,Diğer
+DocType: Student Guardian,Others,Diğer
+DocType: Student Guardian,Others,Diğer
 DocType: Payment Entry,Unallocated Amount,ayrılmamış Tutar
 apps/erpnext/erpnext/templates/includes/product_page.js +65,Cannot find a matching Item. Please select some other value for {0}.,Eşleşen bir öğe bulunamıyor. Için {0} diğer bazı değer seçiniz.
 DocType: POS Profile,Taxes and Charges,Vergi ve Harçlar
@@ -2232,19 +2247,18 @@
 apps/erpnext/erpnext/config/stock.py +304,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/accounts/report/item_wise_sales_register/item_wise_sales_register.py +54,Receivable Account,Alacak Hesabı
-apps/erpnext/erpnext/controllers/accounts_controller.py +546,Row #{0}: Asset {1} is already {2},Satır {0}: Sabit Varlık {1} zaten {2}
+apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,Alacak Hesabı
+apps/erpnext/erpnext/controllers/accounts_controller.py +549,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 +79,CEO,CEO
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,CEO
 DocType: Expense Claim Detail,Expense Claim Detail,Gideri Talebi Detayı
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +808,Please select correct account,Doğru hesabı seçin
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +809,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
 DocType: Employee,Blood Group,Kan grubu
-DocType: Purchase Invoice Item,Page Break,Sayfa Sonu
 DocType: Production Order Operation,Pending,Bekliyor
 DocType: Course,Course Name,Ders Adı
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Belirli bir çalışanın izni uygulamalarını onaylayabilir Kullanıcılar
@@ -2255,14 +2269,15 @@
 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 +54,Full-time,Tam zamanlı
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,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
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Satış Vergi ve Harçlar Şablon standart bir şablon oluşturdu varsa, birini seçin ve aşağıdaki butona tıklayın."
+DocType: Student,Guardians,Veliler
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +29,Please specify a country for this Shipping Rule or check Worldwide Shipping,Bu Nakliye Kural için bir ülke belirtin ya da Dünya Denizcilik&#39;in kontrol edin
 DocType: Stock Entry,Total Incoming Value,Toplam Gelen Değeri
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Debit To is required,Bankamatik To gereklidir
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +321,Debit To is required,Bankamatik To gereklidir
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Satınalma Fiyat Listesi
 DocType: Offer Letter Term,Offer Term,Teklif Dönem
 DocType: Quality Inspection,Quality Manager,Kalite Müdürü
@@ -2271,6 +2286,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/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.
@@ -2284,7 +2300,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"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 +273,Price List {0} is disabled,Fiyat Listesi {0} devre dışı
 apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,Fiyat Listesi {0} devre dışı
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +99,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/projects/doctype/timesheet/timesheet.py +123,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
 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}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Güncel Değerleme Oranı
@@ -2292,11 +2308,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,Değişim Kâr / Zarar
 DocType: Opportunity,Lost Reason,Kayıp Nedeni
 DocType: Opportunity,Lost Reason,Kayıp Nedeni
-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/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/purchase_receipt/purchase_receipt.py +378,All items have already been invoiced,Bütün Ürünler zaten faturalandırılmıştır
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +379,All items have already been invoiced,Bütün Ürünler zaten faturalandırılmıştır
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Lütfen geçerlli bir 'durum nodan başlayarak' belirtiniz
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Daha fazla masraf Gruplar altında yapılabilir, ancak girişleri olmayan Gruplar karşı yapılabilir"
 DocType: Project,External,Harici
@@ -2314,19 +2329,20 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Müşterileriniz
 apps/erpnext/erpnext/projects/doctype/project/project.py +141,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/job_opening.html +19,Apply Now,Şimdi Başvur
+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."
 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
-apps/erpnext/erpnext/utilities/doctype/address/address.py +164,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: Fee Structure,Fee Structure,ücret Yapısı
 DocType: Timesheet Detail,Costing Amount,Maliyet Tutarı
+DocType: Student Admission,Application Fee,Başvuru ücreti
 DocType: Process Payroll,Submit Salary Slip,Bordro Gönder
-apps/erpnext/erpnext/controllers/selling_controller.py +161,Maxiumm discount for Item {0} is {1}%,Malzeme {0} için maksimum indirim {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,Malzeme {0} için maksimum indirim {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Toplu İthalat
 DocType: Sales Partner,Address & Contacts,Adresler ve Kontaklar
 DocType: SMS Log,Sender Name,Gönderenin Adı
@@ -2358,23 +2374,23 @@
 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_data.py +361,Travel,Gezi
-apps/erpnext/erpnext/demo/setup_data.py +361,Travel,Gezi
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +155,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 +304,Travel,Gezi
+apps/erpnext/erpnext/demo/setup/setup_data.py +304,Travel,Gezi
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +167,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 +23,Update Cost,Güncelleme Maliyeti
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +23,Update Cost,Güncelleme Maliyeti
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Güncelleme Maliyeti
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Güncelleme Maliyeti
 DocType: Item Reorder,Item Reorder,Ürün Yeniden Sipariş
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +36,Show Salary Slip,Göster Maaş Kayma
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +748,Transfer Material,Transfer Malzemesi
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +53,Show Salary Slip,Göster Maaş Kayma
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +166,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 +923,Please set recurring after saving,kaydettikten sonra yinelenen ayarlayın
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +646,Select change amount account,Seç değişim miktarı hesabı
+apps/erpnext/erpnext/public/js/controllers/transaction.js +914,Please set recurring after saving,kaydettikten sonra yinelenen ayarlayın
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +703,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
@@ -2390,34 +2406,35 @@
 DocType: Address,Subsidiary,Yardımcı
 DocType: Address,Subsidiary,Yardımcı
 apps/erpnext/erpnext/setup/doctype/company/company.py +64,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","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: Quality Inspection,Purchase Receipt No,Satın alma makbuzu numarası
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Kaparo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Kaparo
 DocType: Process Payroll,Create Salary Slip,Maaş Makbuzu Oluştur
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +33,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 +352,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Satır {0} ({1}) deki miktar üretilen miktar {2} ile aynı olmalıdır
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Satır {0} ({1}) deki miktar üretilen miktar {2} ile aynı olmalıdır
 DocType: Appraisal,Employee,Çalışan
 DocType: Appraisal,Employee,Çalışan
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Kullanıcı olarak davet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} tam fatura edilir
 DocType: Workstation Working Hour,End Time,Bitiş Zamanı
 DocType: Payment Entry,Payment Deductions or Loss,Ödeme Kesintiler veya Zararı
-apps/erpnext/erpnext/config/schools.py +100,LMS,LMS
+apps/erpnext/erpnext/config/schools.py +104,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/config/crm.py +6,Sales Pipeline,satış Hattı
 DocType: Student Batch Student,Student Batch Student,Öğrenci Toplu Öğrenci
-DocType: Sales Invoice,Mass Mailing,Toplu Posta
+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 +199,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/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 +297,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 +111,Pharmaceutical,Ecza
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +309,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/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
@@ -2434,22 +2451,22 @@
 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 +814,Please specify Company to proceed,Devam etmek için Firma belirtin
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +814,Please specify Company to proceed,Devam etmek için Firma belirtin
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +793,Please specify Company to proceed,Devam etmek için Firma belirtin
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +793,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 +44,Compensatory Off,Telafi İzni
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,Telafi İzni
 DocType: Quality Inspection Reading,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.
 DocType: Room,Room Number,Oda numarası
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Geçersiz referans {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +161,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) planlanan quanitity daha büyük olamaz ({2}) Üretim Sipariş {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +162,{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 +217,Raw Materials cannot be blank.,Hammaddeler boş olamaz.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,"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 +460,Quick Journal Entry,Hızlı Kayıt Girdisi
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +111,You can not change rate if BOM mentioned agianst any item,Herhangi bir Ürünye karşo BOM belirtildiyse oran değiştiremezsiniz.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +441,"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 +450,Quick Journal Entry,Hızlı Kayıt Girdisi
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +103,You can not change rate if BOM mentioned agianst any item,Herhangi bir Ürünye karşo BOM belirtildiyse oran değiştiremezsiniz.
 DocType: Employee,Previous Work Experience,Önceki İş Deneyimi
 DocType: Employee,Previous Work Experience,Önceki İş Deneyimi
 DocType: Stock Entry,For Quantity,Miktar
@@ -2457,6 +2474,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{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
 ,Minutes to First Response for Issues,Sorunları İlk Tepki Dakika
 DocType: Purchase Invoice,Terms and Conditions1,Şartlar ve Koşullar 1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,Enstitünün adı kendisi için bu sistemi kuruyoruz.
@@ -2465,19 +2483,20 @@
 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 +398,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 +739,Item or Warehouse for row {0} does not match Material Request,Satır {0} daki Ürün veya Depo Ürün isteğini karşılamıyor
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +747,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
 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
-DocType: Lead,Opportunity,Fırsat
-DocType: Lead,Opportunity,Fırsat
+DocType: Supplier Quotation,Opportunity,Fırsat
+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
@@ -2491,7 +2510,7 @@
 DocType: Student,Joining Date,birleştirme tarihi
 ,Employees working on a holiday,tatil çalışanlar
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Mevcut İşaretle
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},Seri No {0} için bakım başlangıç tarihi teslim tarihinden önce olamaz
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},Seri No {0} için bakım başlangıç tarihi teslim tarihinden önce olamaz
 DocType: Production Order,Actual End Date,Fiili Bitiş Tarihi
 DocType: Production Order,Actual End Date,Fiili Bitiş Tarihi
 DocType: Purchase Invoice,PINV-,PINV-
@@ -2510,7 +2529,7 @@
 DocType: Campaign,Campaign-.####,Kampanya-.####
 DocType: Campaign,Campaign-.####,Kampanya-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Sonraki adımlar
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,Please supply the specified items at the best possible rates,Lütfen belirtilen ürünleri mümkün olan en rekabetçi fiyatlarla sununuz
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +695,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 +117,Contract End Date must be greater than Date of Joining,Sözleşme Bitiş tarihi Katılma tarihinden büyük olmalıdır
 DocType: Delivery Note,DN-,DN-
@@ -2519,7 +2538,7 @@
 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 +14,This is an example website auto-generated from ERPNext,Bu ERPNextten otomatik olarak üretilmiş bir örnek web sitedir.
+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
 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.
 
@@ -2566,14 +2585,15 @@
 DocType: Purchase Receipt Item,Recd Quantity,Alınan Miktar
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +54,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 +103,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 +504,Stock Entry {0} is not submitted,Stok Giriş {0} teslim edilmez
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Satış Sipariş Miktarı {1} den fazla Ürün {0} üretilemez
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +505,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
 DocType: Salary Component Account,Salary Component Account,Maaş Bileşen Hesabı
 DocType: Global Defaults,Hide Currency Symbol,Para birimi simgesini gizle
 apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card","Örneğin: Banka, Nakit, Kredi Kartı"
+DocType: Lead Source,Source Name,kaynak Adı
 DocType: Journal Entry,Credit Note,Kredi mektubu
 DocType: Journal Entry,Credit Note,Kredi mektubu
 DocType: Warranty Claim,Service Address,Servis Adresi
@@ -2589,6 +2609,7 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +89,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/controllers/trends.py +19,Total(Qty),Toplam (Adet)
 DocType: Sales Invoice,This Document,Bu belge
@@ -2602,18 +2623,18 @@
 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 +176,Organization branch master.,Kuruluş Şube Alanı
-apps/erpnext/erpnext/controllers/accounts_controller.py +273, or ,veya
+apps/erpnext/erpnext/controllers/accounts_controller.py +276, or ,veya
 DocType: Sales Order,Billing Status,Fatura Durumu
 DocType: Sales Order,Billing Status,Fatura Durumu
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Hata Bildir
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,Yardımcı Giderleri
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,Yardımcı Giderleri
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90 üzerinde
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +203,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Satır # {0}: günlük girdisi {1} hesabı yok {2} ya da zaten başka bir çeki karşı eşleşti
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +206,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Satır # {0}: günlük girdisi {1} hesabı yok {2} ya da zaten başka bir çeki karşı eşleşti
 DocType: Buying Settings,Default Buying Price List,Standart Alış Fiyat Listesi
 DocType: Buying Settings,Default Buying Price List,Standart Alış Fiyat Listesi
 DocType: Process Payroll,Salary Slip Based on Timesheet,Çizelgesi dayanarak maaş Kayma
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +90,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 +93,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
@@ -2645,8 +2666,8 @@
 DocType: Product Bundle,Parent Item,Ana Ürün
 DocType: Account,Account Type,Hesap Tipi
 DocType: Delivery Note,DN-RET-,DN-ret
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +115,Leave Type {0} cannot be carry-forwarded,{0} carry-iletilmesine olamaz Type bırakın
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Bakım Programı bütün Ürünler için oluşturulmamıştır. Lütfen 'Program Oluştura' tıklayın
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +118,Leave Type {0} cannot be carry-forwarded,{0} carry-iletilmesine olamaz Type bırakın
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Bakım Programı bütün Ürünler için oluşturulmamıştır. Lütfen 'Program Oluştura' tıklayın
 ,To Produce,Üretilecek
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Bordro
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +163,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Satırdaki {0} içinde {1}. Ürün fiyatına {2} eklemek için, satır {3} de dahil edilmelidir"
@@ -2659,14 +2680,14 @@
 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 +748,Delivery,İrsaliye
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +742,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ı
 DocType: Payment Entry,Total Allocated Amount,Toplam Ayrılan Tutar
 DocType: Item Reorder,Material Request Type,Malzeme İstek Türü
 DocType: Item Reorder,Material Request Type,Malzeme İstek Türü
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +82,Row {0}: UOM Conversion Factor is mandatory,Satır {0}: Ölçü Birimi Dönüşüm Faktörü zorunludur
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +79,Row {0}: UOM Conversion Factor is mandatory,Satır {0}: Ölçü Birimi Dönüşüm Faktörü zorunludur
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Budget,Cost Center,Maliyet Merkezi
@@ -2680,15 +2701,15 @@
 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 +90,Head of Marketing and Sales,Satış ve Pazarlama Müdürü
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Gelir vergisi
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Gelir vergisi
+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 +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.
 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 +403,Please enter Item Code to get batch no,Toplu almak için Ürün Kodu girin
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +770,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 +397,Please enter Item Code to get batch no,Toplu almak için Ürün Kodu girin
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +764,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ı
@@ -2703,32 +2724,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 +100,Issues,Sorunlar
+apps/erpnext/erpnext/hooks.py +109,Issues,Sorunlar
 apps/erpnext/erpnext/controllers/status_updater.py +13,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ışı
 DocType: Supplier,Billing Currency,Fatura Döviz
 DocType: Sales Invoice,SINV-RET-,SINV-ret
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Large,Ekstra Büyük
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,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 +507,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 +107,Local,Yerel
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Local,Yerel
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +508,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/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 +154,Large,Büyük
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,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 +225,Total {0} ({1}),Toplam {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +224,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
@@ -2789,9 +2811,9 @@
 DocType: Attendance,Leave Type,İzin Tipi
 apps/erpnext/erpnext/controllers/stock_controller.py +173,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/hr/doctype/salary_slip/salary_slip.py +79,Name error: {0},Adı hatası: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +90,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 +178,{0} {1} does not associated with {2} {3},{0} {1} şunlarla ilintili değil: {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +181,{0} {1} does not associated with {2} {3},{0} {1} şunlarla ilintili değil: {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Çalışan {0} için devam zaten işaretlenmiştir
 DocType: Packing Slip,If more than one package of the same type (for print),(Baskı için) aynı ambalajdan birden fazla varsa
 DocType: Warehouse,Parent Warehouse,Ana Depo
@@ -2811,7 +2833,7 @@
 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ı
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,En az bir öğe dönüş belgesinde negatif miktar ile girilmelidir
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Atleast one item should be entered with negative quantity in return document,En az bir öğe dönüş belgesinde negatif miktar ile girilmelidir
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Çalışma {0} iş istasyonunda herhangi bir mevcut çalışma saatleri daha uzun {1}, birden operasyonlarına operasyon yıkmak"
 ,Requested,Talep
 ,Requested,Talep
@@ -2825,7 +2847,7 @@
 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/stock/doctype/purchase_receipt/purchase_receipt.py +98,Quality Inspection required for Item {0},Ürün  {0} için gerekli Kalite Kontrol
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,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
@@ -2833,46 +2855,46 @@
 DocType: Journal Entry Account,Sales Invoice,Satış Faturası
 DocType: Journal Entry Account,Sales Invoice,Satış Faturası
 DocType: Journal Entry Account,Party Balance,Parti Dengesi
-apps/erpnext/erpnext/accounts/page/pos/pos.js +475,Please select Apply Discount On,İndirim Açık Uygula seçiniz
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +92,Salary Slip Created,Maaş Kayma düzenlendi
+apps/erpnext/erpnext/accounts/page/pos/pos.js +464,Please select Apply Discount On,İndirim Açık Uygula seçiniz
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +95,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
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,İndirim Yüzdesi bir Fiyat listesine veya bütün fiyat listelerine karşı uygulanabilir.
 DocType: Purchase Invoice,Half-yearly,Yarı Yıllık
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +384,Accounting Entry for Stock,Stokta Muhasebe Giriş
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +387,Accounting Entry for Stock,Stokta Muhasebe Giriş
 DocType: Sales Invoice,Sales Team1,Satış Ekibi1
 DocType: Sales Invoice,Sales Team1,Satış Ekibi1
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,Item {0} does not exist,Ürün {0} yoktur
 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 +96,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 +120,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 +88,Row # {0}: Cannot return more than {1} for Item {2},Satır # {0}: daha geri olamaz {1} Öğe için {2}
+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
 DocType: Item Group,Show this slideshow at the top of the page,Sayfanın üstünde bu slayt gösterisini göster
 DocType: BOM,Item UOM,Ürün Ölçü Birimi
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),İndirim Tutarı sonra Vergi Tutarı (Şirket Para)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +147,Target warehouse is mandatory for row {0},Satır {0} için hedef depo zorunludur
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +141,Target warehouse is mandatory for row {0},Satır {0} için hedef depo zorunludur
 DocType: Cheque Print Template,Primary Settings,İlköğretim Ayarlar
 DocType: Purchase Invoice,Select Supplier Address,Seç Tedarikçi Adresi
 DocType: Quality Inspection,Quality Inspection,Kalite Kontrol
 DocType: Quality Inspection,Quality Inspection,Kalite Kontrol
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Extra Small,Extra Small
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +194,Account {0} is frozen,Hesap {0} dondurulmuş
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +194,Account {0} is frozen,Hesap {0} donduruldu
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Extra Small
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +690,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 +197,Account {0} is frozen,Hesap {0} dondurulmuş
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,Hesap {0} donduruldu
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Örgüte ait Hesap ayrı Planı Tüzel Kişilik / Yardımcı.
 DocType: Payment Request,Mute Email,Sessiz E-posta
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Gıda, İçecek ve Tütün"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Gıda, İçecek ve Tütün"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +606,Can only make payment against unbilled {0},Sadece karşı ödeme yapabilirsiniz faturalanmamış {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +126,Commission rate cannot be greater than 100,Komisyon oranı 100'den fazla olamaz
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +609,Can only make payment against unbilled {0},Sadece karşı ödeme yapabilirsiniz faturalanmamış {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,Komisyon oranı 100'den fazla olamaz
 DocType: Stock Entry,Subcontract,Alt sözleşme
 DocType: Stock Entry,Subcontract,Alt sözleşme
 apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,İlk {0} giriniz
@@ -2887,34 +2909,34 @@
 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 +158,Colour,Renk
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,Renk
 DocType: Maintenance Visit,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
 DocType: Student Log,Academic,Akademik
-apps/erpnext/erpnext/controllers/accounts_controller.py +469,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Toplam avans ({0}) Sipariş karşı {1} Genel Toplam den büyük olamaz ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +472,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Toplam avans ({0}) Sipariş karşı {1} Genel Toplam den büyük olamaz ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Dengesiz ay boyunca hedefleri dağıtmak için Aylık Dağıtım seçin.
 DocType: Purchase Invoice Item,Valuation Rate,Değerleme Oranı
 DocType: Purchase Invoice Item,Valuation Rate,Değerleme Oranı
+DocType: Stock Reconciliation,SR/,SR /
 apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,Fiyat Listesi para birimi seçilmemiş
 DocType: Assessment,Results,Sonuçlar
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +168,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 +175,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
-DocType: Student Applicant,Father's/ Guardian 2 Email ID,Babalar / Guardian 2 E-posta Kimliği
 DocType: Maintenance Visit Purpose,Against Document No,Belge No Karşılığı
 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 +228,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 +231,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 +93,Researcher,Araştırmacı
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,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 +96,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.
@@ -2930,26 +2952,26 @@
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Müşterilerinin rahatlığı için, bu kodlar faturalarda ve irsaliyelerde olduğu gibi basılı formatta kullanılabilir."
 DocType: Sales Invoice,Time Sheet List,Zaman Çizelgesi Listesi
 DocType: Employee,You can enter any date manually,Elle herhangi bir tarihi girebilirsiniz
-DocType: Sales Invoice,Advertisement,Reklâm
 DocType: Asset Category Account,Depreciation Expense Account,Amortisman Giderleri Hesabı
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Probationary Period,Deneme süresi
-apps/erpnext/erpnext/hooks.py +102,Announcements,Duyurular
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Deneme süresi
+apps/erpnext/erpnext/hooks.py +111,Announcements,Duyurular
 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 +109,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
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +16,To Datetime,DateTime için
+apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,DateTime için
 DocType: SMS Settings,SMS Gateway URL,SMS Anageçit Adresi
 DocType: SMS Settings,SMS Gateway URL,SMS Anageçit Adresi
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +51,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/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Bekleyen Etkinlikleri
+DocType: Accounts Settings,Make Payment via Journal Entry,Dergi Giriş aracılığıyla Ödeme Yap
+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 +127,Please enter relieving date.,Lütfen Boşaltma tarihi girin.
-apps/erpnext/erpnext/controllers/trends.py +145,Amt,Amt
+apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,Only Leave Applications with status 'Approved' can be submitted,Sadece durumu 'Onaylandı' olan İzin Uygulamaları verilebilir
 apps/erpnext/erpnext/utilities/doctype/address/address.py +26,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
@@ -2971,18 +2993,19 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Yarım Gün İşaretle
 DocType: Sales Invoice,Sales Team,Satış Ekibi
 DocType: Sales Invoice,Sales Team,Satış Ekibi
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Duplicate entry,Girdiyi Kopyala
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,Girdiyi Kopyala
 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 +490,[Error],[Hata]
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +490,[Error],[Hata]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +484,[Error],[Hata]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +484,[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ü
 apps/erpnext/erpnext/controllers/status_updater.py +175,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.
 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
@@ -3001,11 +3024,11 @@
 ,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 +25,All Jobs,Tüm İşler
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,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
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Amount {0} {1} {2} {3},Miktar {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Amount {0} {1} {2} {3},Miktar {0} {1} {2} {3}
 DocType: Account,Depreciation,Amortisman
 DocType: Account,Depreciation,Amortisman
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Tedarikçi (ler)
@@ -3014,11 +3037,11 @@
 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 +372,Payment Entries {0} are un-linked,Ödeme Girişler {0}-un bağlantılıdır
+apps/erpnext/erpnext/accounts/utils.py +449,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ı
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +497,Material Requests {0} created,Malzeme Talepleri {0} oluşturuldu
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +498,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.
 DocType: Purchase Invoice,Address and Contact,Adresler ve Kontaklar
@@ -3063,7 +3086,7 @@
 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 +848,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 +859,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 +233,Closing (Dr),Kapanış (Dr)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +233,Closing (Dr),Kapanış (Dr)
@@ -3086,7 +3109,8 @@
 ,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.
-apps/erpnext/erpnext/controllers/accounts_controller.py +555,'Update Stock' cannot be checked for fixed asset sale,'Stoğu Güncelle' sabit varlık satışları için kullanılamaz
+DocType: Student Guardian,Father,baba
+apps/erpnext/erpnext/controllers/accounts_controller.py +558,'Update Stock' cannot be checked for fixed asset sale,'Stoğu Güncelle' sabit varlık satışları için kullanılamaz
 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
@@ -3098,15 +3122,15 @@
 DocType: Lead,Lower Income,Alt Gelir
 DocType: Lead,Lower Income,Alt Gelir
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked",Kar/Zararın ayrılacağı hesap başlığı altındaki Yükümlülük
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +166,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 +238,"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 +81,Purchase Order number required for Item {0},Ürüni {0} için Satınalma Siparişi numarası gerekli
+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/purchase_receipt/purchase_receipt.py +82,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 +17,Cannot change status as student {0} is linked with student application {1},öğrenci olarak durumunu değiştirmek olamaz {0} öğrenci uygulaması ile bağlantılı {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},öğrenci olarak durumunu değiştirmek olamaz {0} öğrenci uygulaması ile bağlantılı {1}
 DocType: Timesheet,"List of employee which has ""Salary Slip Based on Timesheet"" is enabled in salary structure.",&quot;Çizelgesi Dayalı Maaş Kayma&quot; sahip çalışanın Listesi maaş yapısında etkindir.
 DocType: Asset,Fully Depreciated,Değer kaybı tamamlanmış
 ,Stock Projected Qty,Öngörülen Stok Miktarı
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Customer {0} does not belong to project {1},Müşteri {0} projeye ait değil {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,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
@@ -3119,7 +3143,7 @@
 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/patches/v7_0/create_warehouse_nestedset.py +55,All Warehouses,Tüm Depolar
+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 +105,Credit To account must be a Balance Sheet account,Hesabın için Kredi bir bilanço hesabı olmalıdır
@@ -3133,11 +3157,11 @@
 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/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Maaş Makbuzu Oluştur
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +26,Browse BOM,BOM Araştır
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,BOM Araştır
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +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/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 Year,Academic Year,Akademik Yıl
+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
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,Appraisal:Değerlendirme
@@ -3145,13 +3169,13 @@
 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 +197,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 +197,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 +204,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 +204,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: Workstation Working Hour,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 +256,Select Quantity,",Miktar Seç"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +257,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
@@ -3171,6 +3195,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Hedef miktarı veya hedef tutarı zorunludur.
 apps/erpnext/erpnext/config/projects.py +45,Cost of various activities,Çeşitli faaliyetler Maliyeti
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Olaylar ayarlanması {0}, Satış Kişilerin altına bağlı çalışan bir kullanıcı kimliğine sahip olmadığından {1}"
+DocType: Timesheet,Billing Details,Fatura Detayları
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +149,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
 DocType: Item,Inspection Required,Muayene Gerekli
@@ -3191,8 +3216,8 @@
 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 +138,Wire Transfer,Elektronik transfer
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,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 +141,Wire Transfer,Elektronik transfer
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Tümünü kontrol
 DocType: Sales Order,Recurring Order,Tekrarlayan Sipariş
 DocType: Company,Default Income Account,Standart Gelir Hesabı
@@ -3205,12 +3230,10 @@
 ,Welcome to ERPNext,Hoşgeldiniz
 apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,Teklif yol
 DocType: Lead,From Customer,Müşteriden
-apps/erpnext/erpnext/demo/setup_data.py +357,Calls,Aramalar
-apps/erpnext/erpnext/demo/setup_data.py +357,Calls,Aramalar
+apps/erpnext/erpnext/demo/setup/setup_data.py +300,Calls,Aramalar
+apps/erpnext/erpnext/demo/setup/setup_data.py +300,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/stock/doctype/item/item.py +466,"As there are existing transactions for this item, \
-							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Bu ürün için mevcut işlem ve kayıtlar bulunduğu için şunları değiştiremezsiniz: 'Seri numarası var', 'Lot numarası var', 'Stok koruyun' ve 'Değerleme Metodu'"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,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
@@ -3219,10 +3242,10 @@
 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 +58,Attendance has been marked successfully.,Mevcudiyet başarıyla işaretlendi
+apps/erpnext/erpnext/schools/api.py +57,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 +136,Account Type for {0} must be {1},{0} için hesap türü {1} olmalı
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +139,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
@@ -3238,12 +3261,13 @@
 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/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 +20,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 +1190,Please select customer,müşteri seçiniz
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1193,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
@@ -3255,6 +3279,7 @@
 ,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 +50,Missing Currency Exchange Rates for {0},Eksik Döviz Kurları {0}
 DocType: Assessment,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-
@@ -3272,13 +3297,14 @@
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Konu Adı
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Satış veya Alıştan en az biri seçilmelidir
+DocType: Grading Structure,Grade Intervals,sınıf aralıkları
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,işinizin doğası seçin.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Üretim operasyonları nerede yapılmaktadır.
 DocType: Asset Movement,Source Warehouse,Kaynak Depo
 DocType: Asset Movement,Source Warehouse,Kaynak Depo
 DocType: Installation Note,Installation Date,Kurulum Tarihi
 DocType: Installation Note,Installation Date,Kurulum Tarihi
-apps/erpnext/erpnext/controllers/accounts_controller.py +534,Row #{0}: Asset {1} does not belong to company {2},"Satır {0}: Sabit Varlık {1}, {2} firmasına ait değil"
+apps/erpnext/erpnext/controllers/accounts_controller.py +537,Row #{0}: Asset {1} does not belong to company {2},"Satır {0}: Sabit Varlık {1}, {2} firmasına ait değil"
 DocType: Employee,Confirmation Date,Onay Tarihi
 DocType: Employee,Confirmation Date,Onay Tarihi
 DocType: C-Form,Total Invoiced Amount,Toplam Faturalanmış Tutar
@@ -3295,29 +3321,32 @@
 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 +111,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/scheduling_tool/scheduling_tool.py +49,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 +87,{0}% Delivered,{0}% Teslim Edildi
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% Teslim Edildi
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Öğe {0}: Sıralı qty {1} minimum sipariş qty {2} (Öğe tanımlanan) daha az olamaz.
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Aylık Dağılımı Yüzde
 DocType: Territory,Territory Targets,Bölge Hedefleri
 DocType: Territory,Territory Targets,Bölge Hedefleri
 DocType: Delivery Note,Transporter Info,Taşıyıcı Bilgisi
-apps/erpnext/erpnext/accounts/utils.py +379,Please set default {0} in Company {1},Şirket varsayılan {0} set Lütfen {1}
+apps/erpnext/erpnext/accounts/utils.py +456,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
 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
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Baskı Şablonları için başlıklar, örneğin Proforma Fatura"
+DocType: Student Guardian,Student Guardian,Öğrenci Guardian
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +184,Valuation type charges can not marked as Inclusive,Değerleme tipi ücretleri dahil olarak işaretlenmiş olamaz
 DocType: POS Profile,Update Stock,Stok güncelle
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Ürünler için farklı Ölçü Birimi yanlış (Toplam) net ağırlıklı değere yol açacaktır. Net ağırlıklı değerin aynı olduğundan emin olun.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Oranı
 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 +349,Journal Entries {0} are un-linked,Dergi Girişler {0}-un bağlı olduğu
+apps/erpnext/erpnext/accounts/utils.py +426,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
@@ -3342,6 +3371,7 @@
 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
+DocType: Homepage,"URL for ""All Products""",&quot;Tüm Ürünler&quot; URL
 DocType: Leave Application,Leave Balance Before Application,Uygulamadan Önce Kalan İzin
 DocType: SMS Center,Send SMS,SMS Gönder
 DocType: Cheque Print Template,Width of amount in word,kelime miktarın Genişliği
@@ -3350,7 +3380,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 +29,Current Job Openings,Güncel İş Olanakları
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,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
@@ -3364,7 +3394,7 @@
 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 +850,Show tax break-up,Göster vergi break-up
+apps/erpnext/erpnext/public/js/controllers/transaction.js +841,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/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"
@@ -3374,10 +3404,11 @@
 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 +534,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 +80,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 +162,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/selling/doctype/customer/customer.py +195,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.
@@ -3388,14 +3419,13 @@
 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 +75,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 +138,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/hr/doctype/leave_application/leave_application.py +145,Note: There is not enough leave balance for Leave Type {0},Not: İzin tipi {0} için yeterli izin günü kalmamış
 DocType: Program Enrollment Fee,Program Enrollment Fee,Program Kayıt Ücreti
 DocType: Item,Supplier Items,Tedarikçi Öğeler
 DocType: Opportunity,Opportunity Type,Fırsat Türü
 DocType: Opportunity,Opportunity Type,Fırsat Türü
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,Yeni Şirket
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,Yeni Şirket
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,Cost Center is required for 'Profit and Loss' account {0},Maliyet Merkezi 'Kar ve Zarar hesabı için gerekli olan {0}
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,İşlemler sadece Şirket&#39;in yaratıcısı tarafından silinebilir
 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.,Yanlış Genel Defter Girdileri bulundu. İşlemde yanlış bir hesap seçmiş olabilirsiniz.
 DocType: Cheque Print Template,Cheque Width,Çek Genişliği
@@ -3404,17 +3434,18 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,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 +228,{0} '{1}' is disabled,{0} '{1}' devre dışı
+apps/erpnext/erpnext/controllers/accounts_controller.py +231,{0} '{1}' is disabled,{0} '{1}' devre dışı
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Açık olarak ayarlayın
 DocType: Cheque Print Template,Scanned Cheque,taranan Çek
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Gönderilmesi işlemlere Kişiler otomatik e-postalar gönderin.
+DocType: Timesheet,Total Billable Amount,Toplam Faturalandırılabilir Tutar
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Madde 3
 DocType: Purchase Order,Customer Contact Email,Müşteri İletişim E-mail
 DocType: Warranty Claim,Item and Warranty Details,Ürün ve Garanti Detayları
 DocType: Sales Team,Contribution (%),Katkı Payı (%)
 DocType: Sales Team,Contribution (%),Katkı Payı (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"'Nakit veya Banka Hesabı' belirtilmediğinden ötürü, Ödeme Girdisi oluşturulmayacaktır"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Responsibilities,Sorumluluklar
+apps/erpnext/erpnext/controllers/accounts_controller.py +78,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
 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
@@ -3423,7 +3454,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Kullanıcı Ekle
 DocType: Pricing Rule,Item Group,Ürün Grubu
 DocType: Pricing Rule,Item Group,Ürün Grubu
-DocType: Item,Safety Stock,Güvenlik kilidi
+DocType: Item,Safety Stock,Emniyet Stoğu
+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: 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)
@@ -3433,8 +3465,6 @@
 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: Timesheet,Total Hours,Toplam Saat
-DocType: Timesheet,Total Hours,Toplam Saat
 DocType: Journal Entry,Printing Settings,Baskı Ayarları
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,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
@@ -3450,15 +3480,16 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Yatırım Bankacılığı
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +71,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
+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
 DocType: Purchase Invoice Item,Rate,Birim Fiyat
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Intern,Stajyer
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Intern,Stajyer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,Stajyer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,Stajyer
 DocType: Stock Entry,From BOM,BOM Gönderen
 DocType: Assessment,Assessment Code,Değerlendirme Kodu
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +32,Basic,Temel
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +32,Basic,Temel
+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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule','Takvim Oluştura' tıklayınız
+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 +95,Reference No is mandatory if you entered Reference Date,Referans Tarihi girdiyseniz Referans No zorunludur
@@ -3470,13 +3501,13 @@
 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 +752,Issue Material,Sayı Malzeme
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +723,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 +683,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 +665,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.
 DocType: Hub Settings,Access Token,Erişim Anahtarı
 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
@@ -3485,29 +3516,31 @@
 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 +1122,Enter value must be positive,Enter değeri pozitif olmalıdır
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,All Territories,Bütün Bölgeler
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1125,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
 DocType: Purchase Invoice,Items,Ürünler
 DocType: Purchase Invoice,Items,Ürünler
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +23,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 +221,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 +233,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 +96,Request for Quotations,Fiyat Teklif Talepleri
+apps/erpnext/erpnext/hooks.py +104,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
 DocType: Asset,Partially Depreciated,Kısmen Değer Kaybına Uğramış
 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 +628,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Variant için Ölçü Varsayılan Birim &#39;{0}&#39; Şablon aynı olmalıdır &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Variant için Ölçü Varsayılan Birim &#39;{0}&#39; Şablon aynı olmalıdır &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Tabanlı hesaplayın
 DocType: Delivery Note Item,From Warehouse,Atölyesi&#39;nden
 DocType: Assessment,Supervisor Name,Süpervizör Adı
+DocType: Assessment,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
@@ -3515,7 +3548,7 @@
 DocType: Account,Purchase User,Satınalma Kullanıcı
 DocType: Notification Control,Customize the Notification,Bildirim özelleştirin
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Cash Flow from Operations,Faaliyetlerden Nakit Akışı
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,Varsayılan Adres Şablon silinemez
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,Varsayılan Adres Şablon silinemez
 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ığı
@@ -3533,8 +3566,8 @@
 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/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 +485,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 +336,Please select Posting Date first,İlk Gönderme Tarihi seçiniz
+apps/erpnext/erpnext/stock/get_item_details.py +486,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 +326,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
 DocType: Leave Control Panel,Carry Forward,Nakletmek
@@ -3553,6 +3586,7 @@
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Faturalar ile maç Ödemeleri
 DocType: Journal Entry,Bank Entry,Banka Girişi
 DocType: Authorization Rule,Applicable To (Designation),(Görev) için uygulanabilir
+,Profitability Analysis,karlılık Analizi
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,Sepete ekle
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,Sepete ekle
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Grup tarafından
@@ -3570,22 +3604,22 @@
 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 +141,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Serileştirilmiş Öğe {0} Stok Uzlaşma kullanarak \
  güncellenmiş olamaz"
 DocType: Scheduling Tool,Day,Gü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,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 +122,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 +129,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
-DocType: Student Applicant,AP.,AP.
 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 +639,Point of Sale,Satış Noktası
+apps/erpnext/erpnext/accounts/page/pos/pos.js +634,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
@@ -3597,7 +3631,7 @@
 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 +373,Quantity to Manufacture must be greater than 0.,Üretim Miktar 0&#39;dan büyük olmalıdır.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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."
@@ -3605,55 +3639,57 @@
 DocType: POS Profile,Customer Group,Müşteri Grubu
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,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/doctype/asset/asset.py +83,Next Depreciation Date must be on or after today,Sonraki Amortisman Tarihi veya bugünden sonra olmalıdır
 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 +145,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: Quotation,Quotation Lost Reason,Teklif Kayıp Nedeni
+apps/erpnext/erpnext/utilities/doctype/address/address.py +164,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.
 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 +330,Transaction reference no {0} dated {1},İşlem referans yok {0} tarihli {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,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 +107,Summary for this month and pending activities,Bu ay ve bekleyen aktiviteler için Özet
+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/accounts/doctype/sales_invoice/sales_invoice.py +406,Please remove this Invoice {0} from C-Form {1},C-Form bu Fatura {0} kaldırın lütfen {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,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 +644,Get Items,Ürünleri alın
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +623,Get Items,Ürünleri alın
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +210,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 +41,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
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Birden fazla çalışanlar için işaretle Seyirci
 DocType: Payment Request,Initiated,Başlatılan
 DocType: Production Order,Planned Start Date,Planlanan Başlangıç Tarihi
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,Customer is required against Receivable account {0},Müşteri Alacak hesabına karşı gerekli {0}
 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 +265,Project-wise data is not available for Quotation,Proje bilgisi verileri Teklifimiz için mevcut değildir
+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 +101,Commercial,Ticari
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,Commercial,Ticari
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Commercial,Ticari
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,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: Supplier Quotation,Supplier Address,Tedarikçi Adresi
 DocType: Supplier Quotation,Supplier Address,Tedarikçi Adresi
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +648,Row {0}# Account must be of type 'Fixed Asset',Satır {0}: Hesap türü 'Sabit Varlık' olmalıdır
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,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 +30,Series is mandatory,Seri zorunludur
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +50,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
@@ -3661,14 +3697,14 @@
 DocType: Stock Entry Detail,Basic Amount,Temel Tutar
 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
 DocType: Leave Allocation,Unused leaves,Kullanılmayan yapraklar
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Cr,Cr
 DocType: Tax Rule,Billing State,Fatura Kamu
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +250,Transfer,Transfer
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +250,Transfer,Transfer
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +187,{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 +825,Fetch exploded BOM (including sub-assemblies),(Alt-montajlar dahil) patlamış BOM'ları getir
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +254,Transfer,Transfer
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +254,Transfer,Transfer
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +190,{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 +796,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 +115,Due Date is mandatory,Due Date zorunludur
+apps/erpnext/erpnext/controllers/accounts_controller.py +118,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
 DocType: Journal Entry,Pay To / Recd From,Gönderen/Alınan
 DocType: Naming Series,Setup Series,Kurulum Serisi
@@ -3676,6 +3712,7 @@
 DocType: Payment Reconciliation,To Invoice Date,Tarihi Faturaya
 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
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Fiyatlandırma Kuralı Nasıl Uygulanır?
 DocType: Quality Inspection,Delivery Note No,İrsaliye No
@@ -3685,7 +3722,7 @@
 DocType: Company,Retail,Perakende
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +120,Customer {0} does not exist,Müşteri {0} yok
 DocType: Attendance,Absent,Eksik
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +587,Product Bundle,Ürün Paketi
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Product Bundle,Ürün Paketi
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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
@@ -3696,8 +3733,8 @@
 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 +742,Send Supplier Emails,Tedarikçi E-postalarını Gönder
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +104,"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/buying/doctype/request_for_quotation/request_for_quotation.js +708,Send Supplier Emails,Tedarikçi E-postalarını Gönder
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,"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ı.
 DocType: Guardian Interest,Guardian Interest,Guardian İlgi
 DocType: Timesheet,Employee Detail,Çalışan Detay
@@ -3709,9 +3746,9 @@
 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}
 DocType: Salary Slip,Earning & Deduction,Kazanma & Kesintisi
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +77,Account {0} cannot be a Group,Hesap {0} Grup olamaz
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} cannot be a Group,Hesap {0} Grup olamaz
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +31,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 +107,Negative Valuation Rate is not allowed,Negatif Değerleme Br.Fiyatına izin verilmez
+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
 DocType: Holiday List,Weekly Off,Haftalık İzin
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Örneğin 2012 için, 2012-13"
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Örneğin 2012 için, 2012-13"
@@ -3728,16 +3765,16 @@
 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 +176,{0} {1}: Cost Center is mandatory for Item {2},Ürün{2} için {0} {1}: Maliyert Merkezi zorunludur
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +626,Get Items from Product Bundle,Ürün Bundle Öğeleri alın
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +605,Get Items from Product Bundle,Ürün Bundle Öğeleri alın
 DocType: Asset,Straight Line,Düz Çizgi
 DocType: Project User,Project User,Proje Kullanıcısı
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} is inactive,Hesap {0} etkin değil
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} is inactive,Hesap {0} etkin değil
 DocType: GL Entry,Is Advance,Avans
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,tarihinden  Tarihine kadar katılım zorunludur
 apps/erpnext/erpnext/controllers/buying_controller.py +148,Please enter 'Is Subcontracted' as Yes or No,'Taşeron var mı' alanına Evet veya Hayır giriniz
 DocType: Sales Team,Contact No.,İletişim No
 DocType: Bank Reconciliation,Payment Entries,Ödeme Girişler
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,'Profit and Loss' type account {0} not allowed in Opening Entry,'Kar ve Zarar' tipi hesaba {0} izin verilmez
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +71,'Profit and Loss' type account {0} not allowed in Opening Entry,'Kar ve Zarar' tipi hesaba {0} izin verilmez
 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
@@ -3760,7 +3797,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Commission on Sales,Satış Komisyonu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Commission on Sales,Satış Komisyonu
 DocType: Offer Letter Term,Value / Description,Değer / Açıklama
-apps/erpnext/erpnext/controllers/accounts_controller.py +558,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Satır {0}: Sabit Varlık {1} gönderilemedi, zaten {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +561,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Satır {0}: Sabit Varlık {1} gönderilemedi, zaten {2}"
 DocType: Tax Rule,Billing Country,Fatura Ülke
 DocType: Production Order,Expected Delivery Date,Beklenen Teslim Tarihi
 DocType: Production Order,Expected Delivery Date,Beklenen Teslim Tarihi
@@ -3777,7 +3814,7 @@
 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: Sales Order,% Amount Billed,% Faturalanan Tutar
+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
@@ -3785,7 +3822,7 @@
 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.,Kullanıcıya kaydetmeden önce seri seçtirmek istiyorsanız işaretleyin. Eğer işaretlerseniz atanmış seri olmayacaktır.
 apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},Seri Numaralı Ürün Yok {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Açık Bildirimler
+DocType: Email Digest,Open Notifications,Açık Bildirimler
 DocType: Payment Entry,Difference Amount (Company Currency),Fark Tutarı (Şirket Para Birimi)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,Doğrudan Giderler
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,Doğrudan Giderler
@@ -3796,7 +3833,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,Seyahat Giderleri
 DocType: Maintenance Visit,Breakdown,Arıza
 DocType: Maintenance Visit,Breakdown,Arıza
-apps/erpnext/erpnext/controllers/accounts_controller.py +634,Account: {0} with currency: {1} can not be selected,Hesap: {0} para ile: {1} seçilemez
+apps/erpnext/erpnext/controllers/accounts_controller.py +637,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}
 DocType: Program Enrollment Tool,Student Applicants,Öğrenci Başvuru sahipleri
@@ -3804,17 +3841,17 @@
 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 +56,Probation,Deneme Süresi
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,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 +59,Probation,Deneme Süresi
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Maaş Bileşenleri
 DocType: Program Enrollment Tool,New Academic Year,Yeni Akademik Yıl
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Payment of salary for the month {0} and year {1},Ay {0} ve yıl {1} için maaş ödemesi
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Payment of salary for the month {0} and year {1},Ay {0} ve yıl {1} için maaş ödemesi
 DocType: Stock Settings,Auto insert Price List rate if missing,Otomatik ekleme Fiyat Listesi oranı eksik ise
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Toplam Ödenen Tutar
 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 +144,Planning,Planlama
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Planning,Planlama
+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/stock/doctype/material_request/material_request_list.js +14,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
@@ -3827,11 +3864,10 @@
 DocType: Sales Partner,Contact Desc,İrtibat Desc
 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.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Sales invoice submitted sucessfully.,Satış faturası başarıyla sundu.
 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}
 DocType: Assessment Result,Student Name,Öğrenci adı
-apps/erpnext/erpnext/hooks.py +104,Assessment Schedule,Değerlendirme Programı
+apps/erpnext/erpnext/hooks.py +113,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
@@ -3844,6 +3880,7 @@
 DocType: GL Entry,Party Type,Taraf Türü
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +78,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
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Maaş Şablon Alanı.
 DocType: Leave Type,Max Days Leave Allowed,En fazla izin günü
@@ -3855,21 +3892,22 @@
 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 +99,All Customer Groups,Bütün Müşteri Grupları
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +78,Accumulated Monthly,Aylık birikimli
-apps/erpnext/erpnext/controllers/accounts_controller.py +595,{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/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Bütün Müşteri Grupları
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +81,Accumulated Monthly,Birikmiş Aylık
+apps/erpnext/erpnext/controllers/accounts_controller.py +598,{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
 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ı
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +188,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
 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 +84,Secretary,Sekreter
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Secretary,Sekreter
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Secretary,Sekreter
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,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
@@ -3878,26 +3916,23 @@
 ,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ı
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,Satır # {0}: Seri No zorunludur
+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 +859,Supplier Quotation,Tedarikçi Teklifi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +838,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 +7,Collect Fees,Ücretleri toplayın
+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ış
 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ı.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Yaklaşan Etkinlikler
 DocType: Item,Opening Stock,Açılış Stok
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Müşteri gereklidir
 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
-DocType: Email Digest,Income / Expense,Gelir / Gider
-DocType: Email Digest,Income / Expense,Gelir / Gider
 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
@@ -3912,16 +3947,17 @@
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Üretim için verilen emirler.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Mali Yıl Seçin ...
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Mali Yıl Seçin ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,POS Profile required to make POS Entry,POS Profil POS Girişi yapmak için gerekli
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +509,POS Profile required to make POS Entry,POS Profil POS Girişi yapmak için gerekli
 DocType: Program Enrollment Tool,Enroll Students,Öğrenciler kayıt
 DocType: Hub Settings,Name Token,İsim Jetonu
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standart Satış
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standart Satış
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Atleast one warehouse is mandatory,En az bir depo zorunludur
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Atleast one warehouse is mandatory,En az bir depo zorunludur
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +129,Atleast one warehouse is mandatory,En az bir depo zorunludur
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +129,Atleast one warehouse is mandatory,En az bir depo zorunludur
 DocType: Serial No,Out of Warranty,Garanti Dışı
 DocType: Serial No,Out of Warranty,Garanti Dışı
 DocType: BOM Replace Tool,Replace,Değiştir
+DocType: Production Order,Unstopped,Altınçağ&#39;da
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{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ı
@@ -3946,10 +3982,11 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,İzinler 0.5 katlanarak tahsis edilmelidir
 DocType: Production Order,Operation Cost,Operasyon Maliyeti
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,Bir. Csv dosyasından devamlılığı yükle
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Alacak tutarı
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Bu Satış Kişisi için Ürün Grubu hedefleri ayarlayın
 DocType: Stock Settings,Freeze Stocks Older Than [Days],[Days] daha eski donmuş stoklar
-apps/erpnext/erpnext/controllers/accounts_controller.py +528,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Satır # {0}: Varlık sabit kıymet alım / satım için zorunludur
+apps/erpnext/erpnext/controllers/accounts_controller.py +531,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Satır # {0}: Varlık sabit kıymet alım / satım için zorunludur
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","İki ya da daha fazla Fiyatlandırma Kuralları yukarıdaki koşullara dayalı bulundu ise, Öncelik uygulanır. Varsayılan değer sıfır (boş) ise Öncelik 0 ile 20 arasında bir sayıdır. Yüksek numarası aynı koşullarda birden Fiyatlandırma Kuralları varsa o öncelik alacak demektir."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Mali Yılı: {0} does not var
 DocType: Currency Exchange,To Currency,Para Birimi
@@ -3971,17 +4008,16 @@
 DocType: Maintenance Visit,Customer Feedback,Müşteri Görüşleri
 DocType: Account,Expense,Gider
 DocType: Account,Expense,Gider
-DocType: Sales Invoice,Exhibition,Sergi
-DocType: Sales Invoice,Exhibition,Sergi
 apps/erpnext/erpnext/utilities/doctype/address/address.py +77,"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 +81,Syntax error in formula or condition: {0},Formül ya da durumun söz dizimi hatası: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +92,Syntax error in formula or condition: {0},Formül ya da durumun söz dizimi hatası: {0}
 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ı
+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 +28,Jobs,İşler
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,İşler
 ,Sales Order Trends,Satış Sipariş Trendler
 ,Sales Order Trends,Satış Sipariş Trendler
 DocType: Employee,Held On,Yapılan
@@ -3993,17 +4029,17 @@
 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 +763,Make Supplier Quotation,Tedarikçi Teklifi Oluştur
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,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/controllers/sales_and_purchase_return.py +100,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 +42,Casual Leave,Mazeret İzni
+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
 DocType: Batch,Batch ID,Seri Kimliği
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,Note: {0},Not: {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,Note: {0},Not: {0}
 ,Delivery Note Trends,İrsaliye Eğilimleri;
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +103,This Week's Summary,Bu Haftanın Özeti
+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
 DocType: Student Group Creation Tool,Get Courses,Kursları alın
 DocType: GL Entry,Party,Taraf
@@ -4013,8 +4049,8 @@
 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 +59,Piecework,Parça başı iş
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Piecework,Parça başı iş
+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ı
 DocType: Task,Actual Time (in Hours),Gerçek Zaman (Saat olarak)
 DocType: Employee,History In Company,Şirketteki Geçmişi
@@ -4033,7 +4069,7 @@
 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 +162,Black,Siyah
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,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
@@ -4044,13 +4080,13 @@
 DocType: Project Task,Pending Review,Bekleyen İnceleme
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +106,"Asset {0} cannot be scrapped, as it is already {1}","{0} varlığı hurda edilemez, {1} da var olarak gözüküyor"
 DocType: Task,Total Expense Claim (via Expense Claim),(Gider İstem aracılığıyla) Toplam Gider İddiası
-apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +69,Customer Id,Müşteri Kimliği
+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
 DocType: Journal Entry Account,Exchange Rate,Döviz Kuru
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Sales Order {0} is not submitted,Satış Sipariş {0} teslim edilmedi
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +527,Sales Order {0} is not submitted,Satış Sipariş {0} teslim edilmedi
 DocType: Homepage,Tag Line,Etiket Hattı
 DocType: Fee Component,Fee Component,ücret Bileşeni
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +857,Add items from,Öğe ekleme
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +836,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
 DocType: Cheque Print Template,Regular,Düzenli
 DocType: BOM,Last Purchase Rate,Son Satış Fiyatı
@@ -4059,6 +4095,7 @@
 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
 ,Sales Person-wise Transaction Summary,Satış Personeli bilgisi İşlem Özeti
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +60,Cost Center is required for 'Profit and Loss' account {0}. Please set up a default Cost Center for the Company.,Maliyet Merkezi &#39;Kar ve Zarar&#39; hesabına {0} için gereklidir. Şirket için bir varsayılan Maliyet Merkezi kurun.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,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
@@ -4072,13 +4109,13 @@
 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 +710,Online,İnternet üzerinden
+apps/erpnext/erpnext/accounts/page/pos/pos.js +692,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 +16,Setting this Address Template as default as there is no other default,"Bu adres şablonunu varsayılan olarak kaydedin, başka varsayılan bulunmamaktadır"
+apps/erpnext/erpnext/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"
 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 +74,Quality Management,Kalite Yönetimi
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Quality Management,Kalite Yönetimi
+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/asset/asset.py +39,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
@@ -4103,12 +4140,13 @@
 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 +1520,Select items to save the invoice,fatura kaydetmek için öğeleri seçin
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1544,Select items to save the invoice,fatura kaydetmek için öğeleri seçin
 DocType: Employee,Encashment Date,Nakit Çekim Tarihi
 DocType: Account,Stock Adjustment,Stok Ayarı
 DocType: Account,Stock Adjustment,Stok Ayarı
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Standart Etkinliği Maliyet Etkinlik Türü için var - {0}
 DocType: Production Order,Planned Operating Cost,Planlı İşletme Maliyeti
+DocType: Academic Term,Term Start Date,Dönem Başlangıç Tarihi
 apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},Bulmak Lütfen ekli {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Genel Muhasebe uyarınca Banka Hesap bakiyesi
 DocType: Job Applicant,Applicant Name,Başvuru sahibinin adı
@@ -4144,20 +4182,20 @@
 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.
 DocType: Company,Distribution,Dağıtım
 DocType: Company,Distribution,Dağıtım
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +8,Amount Paid,Ödenen Tutar;
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Project Manager,Proje Müdürü
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Project Manager,Proje Müdürü
+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ü
 ,Quoted Item Comparison,Kote Ürün Karşılaştırma
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Dispatch,Sevk
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Dispatch,Sevk
+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/accounts/doctype/pricing_rule/pricing_rule.py +70,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
-DocType: Sales Invoice,Supplier Reference,Tedarikçi Referansı
-apps/erpnext/erpnext/accounts/page/pos/pos.js +844,"Master data syncing, it might take some time","Ana veri senkronizasyonu, bu biraz zaman alabilir"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +832,"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}
@@ -4177,7 +4215,7 @@
 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 +83,Error in formula or condition,Formül ya da durumun hata
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,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
@@ -4187,7 +4225,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},Tarih Mali Yıl içinde olmalıdır. Tarih = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Burada boy, kilo, alerji, tıbbi endişeler vb  muhafaza edebilirsiniz"
 DocType: Leave Block List,Applies to Company,Şirket için geçerli
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +197,Cannot cancel because submitted Stock Entry {0} exists,Sunulan Stok Giriş {0} varolduğundan iptal edilemiyor
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +198,Cannot cancel because submitted Stock Entry {0} exists,Sunulan Stok Giriş {0} varolduğundan iptal edilemiyor
 DocType: Purchase Invoice,In Words,Kelimelerle
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,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
@@ -4199,15 +4237,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,Mali yılınız şu tarihte başlıyor:
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Varlık Değer Kayıpları ve Hesapları
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +319,Amount {0} {1} transferred from {2} to {3},{0} {1} miktarı {2}'den {3}'e transfer edilecek
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +322,Amount {0} {1} transferred from {2} to {3},{0} {1} miktarı {2}'den {3}'e transfer edilecek
 DocType: Sales Invoice,Get Advances Received,Avansların alınmasını sağla
 DocType: Email Digest,Add/Remove Recipients,Alıcı Ekle/Kaldır
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +432,Transaction not allowed against stopped Production Order {0},Durdurulmuş Üretim Emrine {0} karşı işleme izin verilmez
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +437,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 +143,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 +652,Item variant {0} exists with same attributes,Ürün çeşidi {0} aynı özelliklere sahip bulunmaktadır
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Ürün çeşidi {0} aynı özelliklere sahip bulunmaktadır
+DocType: Leave Application,LAP/,LAP /
 DocType: Salary Slip,Salary Slip,Bordro
 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
@@ -4215,13 +4254,13 @@
 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 +212,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 +215,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/public/js/controllers/transaction.js +866,It is needed to fetch Item Details.,Bu Ürün Detayları getirmesi için gereklidir.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +857,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
@@ -4233,16 +4272,16 @@
 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 +178,Invalid {0},Geçersiz {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Sick Leave,Hastalık izni
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Sick Leave,Hastalık izni
+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
 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ı
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Departman mağazaları
 DocType: Warehouse,PIN,TOPLU İĞNE
 DocType: Sales Invoice,Base Change Amount (Company Currency),Baz Değişim Miktarı (Şirket Para Birimi)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +313,No accounting entries for the following warehouses,Şu depolar için muhasebe girdisi yok
-apps/erpnext/erpnext/projects/doctype/project/project.js +102,Save the document first.,İlk belgeyi kaydedin.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +314,No accounting entries for the following warehouses,Şu depolar için muhasebe girdisi yok
+apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,İlk belgeyi kaydedin.
 DocType: Account,Chargeable,Ücretli
 DocType: Account,Chargeable,Ücretli
 DocType: Company,Change Abbreviation,Değişim Kısaltma
@@ -4257,10 +4296,9 @@
 DocType: C-Form,Series,Seriler
 DocType: C-Form,Series,Seriler
 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
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,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
 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 +87,Business Development Manager,İş Geliştirme Müdürü
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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
@@ -4272,8 +4310,8 @@
 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 +940,Please select {0} first,Önce {0} seçiniz
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +749,Batch {0} of Item {1} has expired.,Öğe Toplu {0} {1} süresi doldu.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +953,Please select {0} first,Önce {0} seçiniz
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +757,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ı.
@@ -4303,8 +4341,8 @@
  </ 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 +92,Warehouse not found in the system,Sistemde depo bulunmadı
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +106,This Month's Summary,Bu Ayın Özeti
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Sistemde depo bulunmadı
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Bu Ayın Özeti
 DocType: Quality Inspection Reading,Quality Inspection Reading,Kalite Kontrol Okuma
 DocType: Quality Inspection Reading,Quality Inspection Reading,Kalite Kontrol Okuma
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Freeze Stocks Older Than` %d günden daha kısa olmalıdır.
@@ -4318,23 +4356,24 @@
 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 +87,Please set Next Depreciation Date,Sonraki Amortisman tarihi ayarlayın
-DocType: Payment Gateway,Payment Gateway,Ödeme Gateway
 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 +378,Operation Time must be greater than 0 for Operation {0},Çalışma Süresi Çalışma için 0&#39;dan büyük olmalıdır {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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/accounts/doctype/account/account.py +170,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
 DocType: Program,Program Abbreviation,Program Kısaltma
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,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: Appraisal,Start Date,Başlangıç Tarihi
@@ -4353,21 +4392,22 @@
 DocType: Project,Expected Start Date,Beklenen BaşlangıçTarihi
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +48,Remove item if charges is not applicable to that item,Ücretleri bu öğeye geçerli değilse öğeyi çıkar
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Örn. msgateway.com / api / send_sms.cgi
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +27,Transaction currency must be same as Payment Gateway currency,İşlem birimi Ödeme Gateway para birimi olarak aynı olmalıdır
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Transaction currency must be same as Payment Gateway currency,İşlem birimi Ödeme Gateway para birimi olarak aynı olmalıdır
 DocType: Payment Entry,Receive,Alma
+apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,Özlü Sözler:
 DocType: Maintenance Visit,Fully Completed,Tamamen Tamamlanmış
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Tamamlandı
 DocType: Employee,Educational Qualification,Eğitim Yeterliliği
 DocType: Workstation,Operating Costs,İşletim Maliyetleri
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Birikimli Aylık Bütçe aşıldıysa yapılacak işlem
 DocType: Purchase Invoice,Submit on creation,oluşturma Gönder
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +432,Currency for {0} must be {1},Döviz {0} olmalıdır için {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +435,Currency for {0} must be {1},Döviz {0} olmalıdır için {1}
 DocType: Asset,Disposal Date,Bertaraf tarihi
 DocType: Employee Leave Approver,Employee Leave Approver,Çalışan izin Onayı
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,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 +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/crm/doctype/opportunity/opportunity.py +79,"Cannot declare as lost, because Quotation has been made.","Kayıp olarak Kotasyon yapılmış çünkü, ilan edemez."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Satınalma Usta Müdürü
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +429,Production Order {0} must be submitted,Üretim Siparişi {0} verilmelidir
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +434,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
@@ -4379,8 +4419,8 @@
 ,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/accounts/report/general_ledger/general_ledger.py +181,Totals,Toplamlar
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +181,Totals,Toplamlar
+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: BOM,Manufacturing,Üretim
 DocType: BOM,Manufacturing,Üretim
 ,Ordered Items To Be Delivered,Teslim edilecek Sipariş Edilen Ürünler
@@ -4388,7 +4428,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 +113,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 +120,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
@@ -4397,13 +4437,15 @@
 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.
+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 +181,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/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 +793,All records are synced.,Tüm kayıtlar eşitlendi
+apps/erpnext/erpnext/accounts/page/pos/pos.js +781,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
@@ -4425,24 +4467,23 @@
 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/selling/doctype/quotation/quotation.py +49,Cannot set as Lost as Sales Order is made.,Satış Emri yapıldığında Kayıp olarak ayarlanamaz.
-DocType: Student Applicant,Mother's Name,Anne Adı
 DocType: Request for Quotation Item,Supplier Part No,Tedarikçi Parça No
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +348,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',kategori &#39;Değerleme&#39; veya &#39;Vaulation ve Toplam&#39; için ne zaman tenzil edemez
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Received From,Dan alındı
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Received From,Dan alındı
 DocType: Lead,Converted,Dönüştürülmüş
 DocType: Item,Has Serial No,Seri no Var
 DocType: Employee,Date of Issue,Veriliş tarihi
 DocType: Employee,Date of Issue,Veriliş tarihi
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{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 +93,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/projects/doctype/timesheet/timesheet.py +117,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
 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 +172,{0} {1} does not exist,{0} {1} mevcut değil
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +175,{0} {1} does not exist,{0} {1} mevcut değil
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,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 +72,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
@@ -4452,6 +4493,7 @@
 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
@@ -4460,8 +4502,8 @@
 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 +109,Electrical,Elektrik
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Electrical,Elektrik
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Electrical,Elektrik
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,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 +318,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ış
@@ -4471,7 +4513,7 @@
 DocType: Item,Customer Code,Müşteri Kodu
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +210,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 +292,Debit To account must be a Balance Sheet account,Hesabın için Bankamatik bir bilanço hesabı olmalıdır
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To account must be a Balance Sheet account,Hesabın için Bankamatik bir bilanço hesabı olmalıdır
 DocType: Buying Settings,Naming Series,Seri Adlandırma
 DocType: Leave Block List,Leave Block List Name,İzin engel listesi adı
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Hazır Varlıklar
@@ -4485,12 +4527,12 @@
 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 +301,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 +313,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: Sales Order Item,Ordered Qty,Sipariş Miktarı
 DocType: Sales Order Item,Ordered Qty,Sipariş Miktarı
-apps/erpnext/erpnext/stock/doctype/item/item.py +673,Item {0} is disabled,Öğe {0} devre dışı
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,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 +838,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 +809,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.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Maaş Makbuzu Oluşturun
@@ -4498,7 +4540,8 @@
 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)
-apps/erpnext/erpnext/stock/doctype/item/item.py +485,Row #{0}: Please set reorder quantity,Satır # {0}: yeniden sipariş miktarını ayarlamak Lütfen
+DocType: Sales Invoice Timesheet,Billing Hours,fatura Saatleri
+apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Satır # {0}: yeniden sipariş miktarını ayarlamak Lütfen
 DocType: 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 +62,Please set {0},Lütfen {0} ayarlayınız
@@ -4506,6 +4549,7 @@
 DocType: Employee,Health Details,Sağlık Bilgileri
 DocType: Employee,Health Details,Sağlık Bilgileri
 DocType: Offer Letter,Offer Letter Terms,Harf Şartları Teklif
+DocType: Payment Entry,Allocate Payment Amount,Ödeme Tutarı ayır
 DocType: Employee External Work History,Salary,Maaş
 DocType: Employee External Work History,Salary,Maaş
 DocType: Serial No,Delivery Document Type,Teslim Belge Türü
@@ -4513,14 +4557,11 @@
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Yukarıda seçilen kriterler için maaş makbuzları gönder
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} Ürünler senkronize
 DocType: Sales Order,Partly Delivered,Kısmen Teslim Edildi
-DocType: Sales Invoice,Existing Customer,Mevcut Müşteri
-DocType: Sales Invoice,Existing Customer,Mevcut Müşteri
 DocType: Email Digest,Receivables,Alacaklar
 DocType: Email Digest,Receivables,Alacaklar
+DocType: Lead Source,Lead Source,Talep Yaratma Kaynağı
 DocType: Customer,Additional information regarding the customer.,Müşteri ile ilgili ek bilgi.
 DocType: Quality Inspection Reading,Reading 5,5 Okuma
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +38,Campaign Name is required,Kampanya Adı gereklidir
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +38,Campaign Name is required,Kampanya Adı gereklidir
 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.
@@ -4529,10 +4570,9 @@
 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 +129,BOM and Manufacturing Quantity are required,BOM ve İmalat Miktarı gereklidir
+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/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Yaşlanma Aralığı 2
 DocType: SG Creation Tool Course,Max Strength,Maksimum Güç
-DocType: Bank Reconciliation Detail,Amount,Tutar
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM yerine
 ,Sales Analytics,Satış Analizleri
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +113,Available {0},Uygun {0}
@@ -4540,7 +4580,7 @@
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,E-posta kurma
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +96,Please enter default currency in Company Master,Lütfen Şirket Alanına varsayılan para birimini girin
 DocType: Stock Entry Detail,Stock Entry Detail,Stok Girdisi Detayı
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +100,Daily Reminders,Günlük Hatırlatmalar
+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}
@@ -4548,8 +4588,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +23,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 +71,Customer Service,Müşteri Hizmetleri
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Customer Service,Müşteri Hizmetleri
+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ğı
 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 İş.
@@ -4558,8 +4598,9 @@
 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
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,İlerleme Ambarlar&#39;da Standart Çalışma
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1570,Total nos of serial no is not equal to quantity.,seri no toplam nos miktarına eşit değildir.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1594,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
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Hata: Geçerli bir kimliği?
 DocType: Naming Series,Update Series Number,Seri Numarasını Güncelle
@@ -4570,10 +4611,11 @@
 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 +82,Engineer,Mühendis
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,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 +85,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 +370,Item Code required at Row No {0},{0} Numaralı satırda Ürün Kodu gereklidir
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +398,Item Code required at Row No {0},{0} Numaralı satırda Ürün Kodu gereklidir
 DocType: Sales Partner,Partner Type,Ortak Türü
 DocType: Sales Partner,Partner Type,Ortak Türü
 DocType: Purchase Taxes and Charges,Actual,Gerçek
@@ -4595,12 +4637,14 @@
 DocType: Item Reorder,Re-Order Level,Yeniden sipariş seviyesi
 DocType: Item Reorder,Re-Order Level,Yeniden Sipariş Seviyesi
 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/setup/setup_wizard/install_fixtures.py +55,Part-time,Yarı Zamanlı
+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ı
 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 +56,Series Updated,Serisi Güncellendi
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +57,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
 DocType: Item,Serial Number Series,Seri Numarası Serisi
@@ -4610,6 +4654,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Toptan ve Perakende Satış
 DocType: Issue,First Responded On,İlk cevap verilen
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Çoklu gruplarda Ürün Cross İlanı
+DocType: Grade Interval,Grade Interval,sınıf Aralığı
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +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 +87,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ı
@@ -4624,7 +4669,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 +513,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 +518,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ı
@@ -4635,7 +4680,7 @@
 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/stock/doctype/stock_entry/stock_entry.py +158,Target warehouse in row {0} must be same as Production Order,Satır {0} daki hedef depo Üretim Emrindekiyle aynı olmalıdır
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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
 DocType: Company,Round Off Account,Hesap Off Yuvarlak
@@ -4646,24 +4691,22 @@
 DocType: Customer Group,Parent Customer Group,Ana Müşteri Grubu
 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 +180,Notice Period,İhbar Süresi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,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 +4,New Sales Person Name,Yeni Satış Kişi Adı
 DocType: Packing Slip,Gross Weight UOM,Brüt Ağırlık Ölçü Birimi
-DocType: Email Digest,Receivables / Payables,Alacaklar / Borçlar
-DocType: Email Digest,Receivables / Payables,Alacaklar / Borçlar
 DocType: Delivery Note Item,Against Sales Invoice,Satış Faturası Karşılığı
 DocType: Bin,Reserved Qty for Production,Üretim için Miktar saklıdır
 DocType: Asset,Frequency of Depreciation (Months),Amortisman Frekans (Ay)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +469,Credit Account,Kredi hesabı
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Credit Account,Kredi hesabı
 DocType: Landed Cost Item,Landed Cost Item,İnen Maliyet Kalemi
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +55,Show zero values,Sıfır değerleri göster
+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
 DocType: Payment Reconciliation,Receivable / Payable Account,Alacak / Borç Hesap
 DocType: Delivery Note Item,Against Sales Order Item,Satış Sipariş Ürün Karşı
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Please specify Attribute Value for attribute {0},Öznitelik için değeri Özellik belirtiniz {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Öznitelik için değeri Özellik belirtiniz {0}
 DocType: Item,Default Warehouse,Standart Depo
 DocType: Item,Default Warehouse,Standart Depo
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +39,Budget cannot be assigned against Group Account {0},Bütçe Grubu Hesabı karşı atanamayan {0}
@@ -4687,24 +4730,26 @@
 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
-DocType: Sales Invoice,Cold Calling,Soğuk Arama
-DocType: Sales Invoice,Cold Calling,Soğuk Arama
 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: Maintenance Schedule Item,Half Yearly,Yarım Yıllık
 DocType: Lead,Blog Subscriber,Blog Abone
 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.
+DocType: Stock Reconciliation Item,Quantity Difference,Miktar Farkı
 apps/erpnext/erpnext/config/hr.py +253,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 +141,Set as Lost,Kayıp olarak ayarla
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,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 +161,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 +5,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"
 DocType: Supplier,Credit Days Based On,Kredi Günleri Dayalı
@@ -4717,11 +4762,10 @@
 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 +941,Select or add new customer,Seçmek veya yeni müşteri eklemek
+apps/erpnext/erpnext/accounts/page/pos/pos.js +930,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 +5,This is based on the attendance of this Employee,"Bu, bu Çalışan katılımı esas alır"
-DocType: Sales Invoice,Frequency,frekans
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +463,Debit Account,Borç Hesabı
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Debit Account,Borç Hesabı
 DocType: Fiscal Year,Year Start Date,Yıl Başlangıç Tarihi
 DocType: Fiscal Year,Year Start Date,Yıl Başlangıç Tarihi
 DocType: Attendance,Employee Name,Çalışan Adı
@@ -4732,30 +4776,30 @@
 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 +210,Supplier Quotation {0} created,Tedarikçi Fiyat Teklifi {0} oluşturuldu
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +208,Supplier Quotation {0} created,Tedarikçi Fiyat Teklifi {0} oluşturuldu
 apps/erpnext/erpnext/accounts/report/financial_statements.py +90,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 +173,Employee Benefits,Çalışanlara Sağlanan Faydalar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,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 +228,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 +232,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 +499,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 +500,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 +1007,Price List not found or disabled,Fiyat Listesi bulunamadı veya devre dışı değil
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1008,Price List not found or disabled,Fiyat Listesi bulunamadı veya devre dışı değil
 DocType: Expense Claim,Approved,Onaylandı
 DocType: Pricing Rule,Price,Fiyat
 DocType: Pricing Rule,Price,Fiyat
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +244,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 +256,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}
@@ -4768,14 +4812,14 @@
 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 +259,Please select Employee Record first.,İlk Çalışan Kaydı seçiniz.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +266,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 +190,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 +235,Please enter Expense Account,Gider Hesabı girin
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +235,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/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,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 +963,"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 +976,"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ı
@@ -4794,9 +4838,10 @@
 DocType: Production Plan Item,Planned Qty,Planlanan Miktar
 DocType: Production Plan Item,Planned Qty,Planlanan Miktar
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,Toplam Vergi
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,For Quantity (Manufactured Qty) is mandatory,Miktar (Adet Üretilen) zorunludur
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,For Quantity (Manufactured Qty) is mandatory,Miktar (Adet Üretilen) zorunludur
 DocType: Stock Entry,Default Target Warehouse,Standart Hedef Depo
 DocType: Purchase Invoice,Net Total (Company Currency),Net Toplam (Şirket para birimi)
+apps/erpnext/erpnext/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 +78,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: Production Order,Actual Start Date,Fiili Başlangıç Tarihi
@@ -4815,9 +4860,11 @@
 DocType: Warranty Claim,If different than customer address,Müşteri adresinden farklı ise
 DocType: BOM Operation,BOM Operation,BOM Operasyonu
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Önceki satır toplamı
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +226,Transfer Asset,aktarım Varlık
+DocType: Student,Home Address,Ev adresi
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +227,Transfer Asset,aktarım Varlık
 DocType: POS Profile,POS Profile,POS Profili
 apps/erpnext/erpnext/config/schools.py +33,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 +129,"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
@@ -4829,8 +4876,8 @@
 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 +765,Material to Supplier,Tedarikçi Malzeme
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +189,Excise Invoice,Tüketim Fatura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,Material to Supplier,Tedarikçi Malzeme
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,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
@@ -4840,7 +4887,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,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 +136,Credit Card,Kredi kartı
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,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.
 DocType: Purchase Invoice,Next Date,Sonraki Tarihi
@@ -4848,6 +4895,7 @@
 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: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Burada ebeveyn, eş ve çocukların isim ve meslek gibi aile ayrıntıları  muhafaza edebilirsiniz"
+DocType: Academic Term,Term End Date,Dönem Bitiş Tarihi
 DocType: Hub Settings,Seller Name,Satıcı Adı
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Mahsup Vergi ve Harçlar (Şirket Para Birimi)
 DocType: Item Group,General Settings,Genel Ayarlar
@@ -4859,7 +4907,7 @@
 DocType: Customer,Commission Rate,Komisyon Oranı
 apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,Variant olun
 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 +115,"Payment Type must be one of Receive, Pay and Internal Transfer","Ödeme Şekli, Alma biri Öde ve İç Transferi gerekir"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +118,"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/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Sepet Boş
 DocType: Production Order,Actual Operating Cost,Gerçek İşletme Maliyeti
@@ -4876,11 +4924,11 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,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 +92,Designer,Tasarımcı
+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
 DocType: Serial No,Delivery Details,Teslim Bilgileri
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +469,Cost Center is required in row {0} in Taxes table for type {1},Satır {0} da Vergiler Tablosunda tip {1} için Maliyet Merkezi gereklidir
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +472,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
 ,Item-wise Purchase Register,Ürün bilgisi Alım Kaydı
 DocType: Batch,Expiry Date,Son kullanma tarihi
@@ -4892,12 +4940,12 @@
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Proje alanı.
 apps/erpnext/erpnext/controllers/status_updater.py +174,"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 +417, (Half Day),(Yarım Gün)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425, (Half Day),(Yarım Gün)
 DocType: Supplier,Credit Days,Kredi Günleri
 DocType: Leave Type,Is Carry Forward,İleri taşınmış
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +740,Get Items from BOM,BOM dan Ürünleri alın
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +711,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 +549,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/controllers/accounts_controller.py +552,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
diff --git a/erpnext/translations/uk.csv b/erpnext/translations/uk.csv
index 2a7e34c..27f37d1 100644
--- a/erpnext/translations/uk.csv
+++ b/erpnext/translations/uk.csv
@@ -1,6 +1,6 @@
 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/selling/doctype/sales_order/sales_order.py +84,Warning: Same item has been entered multiple times.,Увага: Одна позиція введена кілька разів.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Товари вже синхронізовані
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Дозволити пункт буде додано кілька разів в угоді
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Скасувати Матеріал Відвідати {0} до скасування Дана гарантія претензії
@@ -12,17 +12,16 @@
 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 +21,Evaluation,оцінка
-DocType: Item,Default Unit of Measure,За замовчуванням Одиниця виміру
+DocType: Item,Default Unit of Measure,Одиниця виміру за замовчуванням
 DocType: SMS Center,All Sales Partner Contact,Всі Продажі партнером Контакт
-DocType: Employee,Leave Approvers,Залишити Затверджую
+DocType: Employee,Leave Approvers,Погоджувачі відпусток
 DocType: Sales Partner,Dealer,Дилер
 DocType: Employee,Rented,Орендовані
 DocType: Purchase Order,PO-,PO-
-apps/erpnext/erpnext/accounts/report/financial_statements.py +19,Start Year {0} not found.,Рік початку {0} не найден.
 DocType: POS Profile,Applicable for User,Стосується для користувача
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +191,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Зупинився виробничого замовлення не може бути скасовано, відкорковувати спочатку скасувати"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +197,Do you really want to scrap this asset?,Ви дійсно хочете відмовитися від цього активу?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +17,Select Default Supplier,Виберіть Стандартні Постачальник
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +192,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Призупинене виробниче замовлення не може бути скасоване, зніміть призупинку спочатку"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +198,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 +36,Currency is required for Price List {0},Валюта необхідна для Прейскурантом {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Буде розраховуватись в угоді.
 DocType: Address,County,графство
@@ -37,58 +36,57 @@
 DocType: Purchase Receipt Item,Required By,Потрібно За
 DocType: Delivery Note,Return Against Delivery Note,Повернутися На накладної
 DocType: Department,Department,Відділ
-DocType: Purchase Order,% Billed,Оплачено%
+DocType: Purchase Order,% Billed,Виставлено рахунки %
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),"Обмінний курс повинен бути такий же, як {0} {1} ({2})"
 DocType: Sales Invoice,Customer Name,Ім&#39;я клієнта
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +126,Bank account cannot be named as {0},Банківський рахунок не може бути названий {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"Керівники (або групи), проти якого Бухгалтерські записи виробляються і залишки зберігаються."
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +180,Outstanding for {0} cannot be less than zero ({1}),Видатний {0} не може бути менше нуля ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,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 +148,Series Updated Successfully,Серія Оновлене Успішно
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +149,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,Всі постачальником Зв&#39;язатися
-DocType: Quality Inspection Reading,Parameter,Параметр
 apps/erpnext/erpnext/projects/doctype/project/project.py +54,Expected End Date can not be less than Expected Start Date,"Очікувана Дата закінчення не може бути менше, ніж очікувалося Дата початку"
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,"Ряд # {0}: ціна повинна бути такою ж, як {1}: {2} ({3} / {4})"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +239,New Leave Application,Новий Залишити заявку
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,New Leave Application,Нова заява на відпустку
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +20,Attendance Record {0} exists against Student {1} for Course Schedule {2},Рекордне {0} існує проти Student {1} для Розклад курсів {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Bank Draft,Банківський чек
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,Банківський чек
 DocType: Mode of Payment Account,Mode of Payment Account,Режим розрахунковий рахунок
 apps/erpnext/erpnext/stock/doctype/item/item.js +52,Show Variants,Показати варіанти
 DocType: Academic Term,Academic Term,академічний термін
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +13,Material,матеріал
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Quantity,Кількість
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +511,Accounts table cannot be blank.,Облікові записи таблиці не може бути порожнім.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +616,Quantity,Кількість
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +512,Accounts table cannot be blank.,Облікові записи таблиці не може бути порожнім.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,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/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 +142,User {0} is already assigned to Employee {1},Користувач {0} вже присвоєний працівникові {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Охорона здоров&#39;я
-DocType: Purchase Invoice,Monthly,Щомісяця
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Затримка в оплаті (дні)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +771,Invoice,Рахунок-фактура
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +750,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 +198,Row {0}: {1} {2} does not match with {3},Ряд {0}: {1} {2} не відповідає {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Ряд # {0}:
+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 +127,Please select Price List,"Будь ласка, виберіть Прайс-лист"
 DocType: Production Order Operation,Work In Progress,В роботі
-DocType: Employee,Holiday List,Список свят
+DocType: Employee,Holiday List,Список вихідних
 apps/erpnext/erpnext/public/js/setup_wizard.js +205,Accountant,Бухгалтер
-DocType: Cost Center,Stock User,Фото користувача
+DocType: Cost Center,Stock User,Складській користувач
 DocType: Company,Phone No,Телефон Немає
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +47,Course Schedules created:,Розклад курсів створено:
 apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},Новий {0}: # {1}
@@ -101,7 +99,7 @@
 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: 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,Кг
 DocType: Student Log,Log,Ввійти
@@ -112,8 +110,8 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Те ж компанія увійшла більш ніж один раз
 DocType: Employee,Married,Одружений
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Не допускається для {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +589,Get items from,Отримати елементи з
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +382,Stock cannot be updated against Delivery Note {0},Фото не можуть бути оновлені проти накладної {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Отримати елементи з
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,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,Продуктовий
@@ -121,40 +119,40 @@
 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 +156,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 +168,Salary Structure Missing,Структура заробітної плати Відсутній
 DocType: Lead,Person Name,Ім&#39;я особи
-DocType: Sales Invoice Item,Sales Invoice Item,Рахунок по продажах товару
+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""","наприклад, &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 +156,Credit limit has been crossed for customer {0} {1}/{2},Кредитний ліміт було перейдено для клієнта {0} {1} / {2}
-apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Фіксована активів&quot; не може бути знятий, оскільки запис активів існує відносно пункту"
+apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Складські звіти
+DocType: Warehouse,Warehouse Detail,Детальна інформація по складу
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +189,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","""Є основним засобом"" не може бути знято, оскільки існує запис засобу відносно об’єкту"
 DocType: Tax Rule,Tax Type,Податки Тип
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +144,You are not authorized to add or update entries before {0},"Ви не авторизовані, щоб додати або оновити записи до {0}"
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},"Ви не авторизовані, щоб додати або оновити записи до {0}"
 DocType: Item,Item Image (if not slideshow),Пункт зображення (якщо не слайд-шоу)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Уразливість існує клієнтів з тим же ім&#39;ям
-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 +165,Opening,Відкриття
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,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/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Клієнт&gt; Група клієнтів&gt; Територія
 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.,Рахунок з існуючою транзакції не можуть бути перетворені в групі.
 DocType: Lead,Product Enquiry,Запит про продукт
 DocType: Academic Term,Schools,школи
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,"Будь ласка, введіть компанія вперше"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Company first,"Будь ласка, виберіть компанія вперше"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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,Загальна вартість
@@ -164,38 +162,39 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Виписка
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Фармацевтика
 DocType: Purchase Invoice Item,Is Fixed Asset,фіксована Asset
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Available qty is {0}, you need {1}","Доступний кол-во: {0}, необхідно {1}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +225,"Available qty is {0}, you need {1}","Доступна к-сть: {0}, необхідно {1}"
 DocType: Expense Claim Detail,Claim Amount,Сума претензії
 DocType: Employee,Mr,Містер
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Постачальник Тип / Постачальник
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Тип постачальника / Постачальник
 DocType: Naming Series,Prefix,Префікс
 apps/erpnext/erpnext/public/js/setup_wizard.js +295,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: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,"Видати Замовлення матеріалу типу ""Виробництво"" на основі вищевказаних критеріїв"
+DocType: Assessment Result,Grade,клас
 DocType: Sales Invoice Item,Delivered By Supplier,Поставляється Постачальником
 DocType: SMS Center,All Contact,Всі контактні
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Annual Salary,Річна заробітна плата
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Сток Витрати
-apps/erpnext/erpnext/accounts/report/financial_statements.py +22,End Year {0} not found.,Рік закінчення {0} не найден.
+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 +316,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,Показати продукти списком
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +130,At least one mode of payment is required for POS invoice.,Принаймні один спосіб оплати потрібно для POS рахунку.
+DocType: Products Settings,Show Products as a List,Показувати продукцію списком
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
-All dates and employee combination in the selected period will come in the template, with existing attendance records","Завантажити шаблон, заповнити відповідні дані і прикласти змінений файл. Всі дати і співробітник поєднання в обраний період прийде в шаблоні, з існуючими відвідуваності"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +451,Item {0} is not active or end of life has been reached,Пункт {0} не є активним або кінець життя був досягнутий
+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 +456,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/controllers/accounts_controller.py +614,"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 +166,Settings for HR Module,Налаштування модуля HR для
+apps/erpnext/erpnext/controllers/accounts_controller.py +617,"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 +166,Settings for HR Module,Налаштування модуля HR
 DocType: SMS Center,SMS Center,SMS-центр
 DocType: Sales Invoice,Change Amount,зміна Сума
-DocType: BOM Replace Tool,New BOM,Новий специфікації
+DocType: BOM Replace Tool,New BOM,Новий НВ
 DocType: Timesheet,Batch Time Logs for billing.,Пакетна Журнали Час для виставлення рахунків.
 DocType: Depreciation Schedule,Make Depreciation Entry,Зробити запис амортизації
 DocType: Appraisal Template Goal,KRA,КРА
@@ -203,13 +202,13 @@
 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 +147,Execution,Виконання
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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,Товари та ціни
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Загальна кількість годин: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},З дати повинні бути протягом фінансового року. Припускаючи З дати = {0}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,Cost Center {0} does not belong to Company {1},МВЗ {0} не належать компанії {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +100,Cost Center {0} does not belong to Company {1},МВЗ {0} не належать компанії {1}
 DocType: Customer,Individual,Індивідуальний
 DocType: Interest,Academics User,академіки Користувач
 DocType: Cheque Print Template,Amount In Figure,Сума На малюнку
@@ -219,41 +218,43 @@
 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}
-DocType: Pricing Rule,Discount on Price List Rate (%),Знижка на Прайс-лист ставка (%)
-DocType: Offer Letter,Select Terms and Conditions,Виберіть Терміни та умови
+DocType: Pricing Rule,Discount on Price List Rate (%),Знижка на ціну з прайсу (%)
+DocType: Offer Letter,Select Terms and Conditions,Виберіть умови та положення
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,ауту
-DocType: Production Planning Tool,Sales Orders,Замовлення
+DocType: Production Planning Tool,Sales Orders,Замовлення клієнта
 DocType: Purchase Taxes and Charges,Valuation,Оцінка
 ,Purchase Order Trends,Замовити тенденції Купівля
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,The request for quotation can be accessed by clicking on the following link,"Запит котирувань можна отримати, перейшовши за наступним посиланням"
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,Виділіть листя протягом року.
 DocType: SG Creation Tool Course,SG Creation Tool Course,SG Створення курсу інструменту
 DocType: Student Group Creation Tool,Leave blank if you wish to fetch all courses for selected academic term,"Залиште порожнім, якщо ви хочете, щоб витягти всі курси для обраного навчального семестру"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,Insufficient Stock,недостатній Stock
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227,Insufficient Stock,недостатній запас
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Відключити планування ємності і відстеження часу
+DocType: Email Digest,New Sales Orders,Нові замовлення на продаж
 DocType: Bank Reconciliation,Bank Account,Банківський рахунок
 DocType: Leave Type,Allow Negative Balance,Дозволити негативний баланс
 DocType: Selling Settings,Default Territory,За замовчуванням Територія
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Телебачення
 DocType: Production Order Operation,Updated via 'Time Log',Оновлене допомогою &#39;Час Вхід &quot;
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} does not belong to Company {1},Рахунок {0} не належать компанії {1}
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},"Попередня сума не може бути більше, ніж {0} {1}"
-DocType: Naming Series,Series List for this Transaction,Список серії для даної транзакції
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +86,Account {0} does not belong to Company {1},Рахунок {0} не належать компанії {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},"Сума авансу не може бути більше, ніж {0} {1}"
+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,ім&#39;я інструктора
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,For Warehouse is required before Submit,Для складу потрібно перед Розмістити
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,For Warehouse is required before Submit,Для складу потрібно перед проведенням
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Надійшло На
 DocType: Sales Partner,Reseller,Торговий посередник
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,"Будь ласка, введіть компанія"
-DocType: Delivery Note Item,Against Sales Invoice Item,На накладна Пункт
+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 +1436,"LocalStorage is full , did not save","LocalStorage сповнений, не врятувало"
-DocType: Lead,Address & Contact,Адреса &amp; Контактна
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1460,"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}
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +28,Another Budget record {0} already exists against {1} for fiscal year {2},Ще один рекорд Бюджет {0} вже існує відносно {1} для фінансового року {2}
-DocType: Sales Partner,Partner website,сайт партнера
+DocType: Sales Partner,Partner website,Веб-сайт партнера
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +104,Add Item,Додати елемент
 ,Contact Name,Контактна особа
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Створює зарплати ковзання для згаданих вище критеріїв.
@@ -261,47 +262,50 @@
 apps/erpnext/erpnext/templates/generators/item.html +78,No description given,Не введене опис
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Запит на покупку.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +5,This is based on the Time Sheets created against this project,"Це засновано на табелів обліку робочого часу, створених проти цього проекту"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Only the selected Leave Approver can submit this Leave Application,Тільки вибраний Залишити затверджує може представити цей Залишити заявку
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +213,Only the selected Leave Approver can submit this Leave Application,Тільки вибраний погоджувач може провести цю Заяву на відпустку
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,"Звільнення Дата повинна бути більше, ніж дата вступу"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Leaves per Year,Листя на рік
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Ряд {0}: Будь ласка, перевірте &#39;Як Предварительная &quot;проти рахунки {1}, якщо це заздалегідь запис."
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,Листя на рік
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Ряд {0}: Будь ласка, поставте відмітку 'Аванс"" у рахунку {1}, якщо це авансовий запис."
 apps/erpnext/erpnext/stock/utils.py +188,Warehouse {0} does not belong to company {1},Склад {0} не належить компанії {1}
+DocType: Email Digest,Profit & Loss,Прибуток і збиток
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,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 +435,Leave Blocked,Залишити Заблоковані
-apps/erpnext/erpnext/stock/doctype/item/item.py +669,Item {0} has reached its end of life on {1},Пункт {0} досяг кінець життя на {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +443,Leave Blocked,Залишити Заблоковані
+apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item {0} has reached its end of life on {1},Пункт {0} досяг кінець життя на {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +95,Bank Entries,Банківські записи
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +83,Annual,Річний
-DocType: Stock Reconciliation Item,Stock Reconciliation Item,Фото Примирення товару
-DocType: Stock Entry,Sales Invoice No,Видаткова накладна Немає
-DocType: Material Request Item,Min Order Qty,Мінімальне замовлення Кількість
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +86,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,"Люди, які викладають у вашій організації"
-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 +91,Software Developer,Розробник програмного забезпечення
-DocType: Item,Minimum Order Qty,Мінімальне замовлення Кількість
-DocType: Pricing Rule,Supplier Type,Постачальник Тип
+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,Розробник програмного забезпечення
+DocType: Item,Minimum Order Qty,Мінімальна к-сть замовлень
+DocType: Pricing Rule,Supplier Type,Тип постачальника
 DocType: Scheduling Tool,Course Start Date,Дата початку курсу
 DocType: Item,Publish in Hub,Опублікувати в Hub
+DocType: Student Admission,Student Admission,прийому студентів
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is cancelled,Пункт {0} скасовується
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Material Request,Матеріал Запит
+apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} is cancelled,Пункт {0} скасовується
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +823,Material Request,Замовлення матеріалів
 DocType: Bank Reconciliation,Update Clearance Date,Оновлення оформлення Дата
 apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +28,Abbreviation already used for another salary component,Абревіатура вже використовується для іншого компонента заробітної плати
 DocType: Item,Purchase Details,Купівля Деталі
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +328,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Пункт {0} знайдений в &quot;давальницька сировина&quot; таблиці в Замовленні {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +333,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/config/selling.py +18,Confirmed orders from Customers.,Підтверджені замовлення від клієнтів.
 DocType: Purchase Receipt Item,Rejected Quantity,Відхилено Кількість
-DocType: SMS Settings,SMS Sender Name,SMS Sender Ім&#39;я
+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 +249,Payment against {0} {1} cannot be greater than Outstanding Amount {2},"Оплата з {0} {1} не може бути більше, ніж суми заборгованості {2}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Payment against {0} {1} cannot be greater than Outstanding Amount {2},"Оплата по {0} {1} не може бути більше, ніж сума до оплати {2}"
 DocType: Supplier,Address HTML,Адреса HTML
 DocType: Lead,Mobile No.,Номер мобільного.
 DocType: Maintenance Schedule,Generate Schedule,Створити розклад
@@ -309,20 +313,21 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +130,Please select Charge Type first,"Будь ласка, виберіть Charge першого типу"
 DocType: Student Group Student,Student Group Student,Студентська група Student
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Останній
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Залишити затверджує в списку буде встановлено стандартним Залишити який стверджує
-DocType: Tax Rule,Shipping County,графство Доставка
+DocType: Email Digest,New Quotations,нові цитати
+DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Перший погоджувач відпусток у списку буде погоджувачем за замовчуванням
+DocType: Tax Rule,Shipping County,Область доставки
 apps/erpnext/erpnext/config/desktop.py +158,Learn,Навчитися
-DocType: Asset,Next Depreciation Date,Наступний Знос Дата
+DocType: Asset,Next Depreciation Date,Наступна дата амортизації
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Діяльність Вартість одного працівника
 DocType: Accounts Settings,Settings for Accounts,Налаштування для рахунків
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +626,Supplier Invoice No exists in Purchase Invoice {0},Постачальник Рахунок-фактура не існує в рахунку-фактурі {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +629,Supplier Invoice No exists in Purchase Invoice {0},Номер рахунку постачальника існує у вхідному рахунку {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Управління менеджера з продажу дерево.
 DocType: Job Applicant,Cover Letter,супровідний лист
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,"Видатні чеки та депозити, щоб очистити"
 DocType: Item,Synced With Hub,Синхронізуються з Hub
-apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Неправильний пароль
+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 +348,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',"Завершена к-сть не може бути більше, ніж ""к-сть для виробництва"""
 DocType: Period Closing Voucher,Closing Account Head,Закриття рахунку Керівник
 DocType: Employee,External Work History,Зовнішній роботи Історія
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Циклічна посилання Помилка
@@ -331,55 +336,57 @@
 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: Stock Settings,Notify by Email on creation of automatic Material Request,Повідомляти електронною поштою про створення автоматичних Замовлень матеріалів
 DocType: Journal Entry,Multi Currency,Мульти валют
-DocType: Payment Reconciliation Invoice,Invoice Type,Рахунок Тип
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +806,Delivery Note,Накладна
+DocType: Payment Reconciliation Invoice,Invoice Type,Тип рахунку-фактури
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +800,Delivery Note,Накладна
 apps/erpnext/erpnext/config/learn.py +87,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 +233,Payment Entry has been modified after you pulled it. Please pull it again.,"Оплата запис була змінена після витягнув його. Ласка, витягнути його знову."
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,{0} entered twice in Item Tax,{0} введений двічі в податках товару
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,Summary for this week and pending activities,Резюме на цьому тижні і в очікуванні діяльності
+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/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","Введіть електронний ідентифікатор, розділених комами, рахунок-фактура буде автоматично відправлений на певну дату"
+DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","Введіть електронний ідентифікатор, розділені комами, рахунок-фактура буде автоматично відправлений на певну дату"
 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,"Цей пункт є шаблоном і не можуть бути використані в операціях. Атрибути товару буде копіюватися в варіантах, якщо &quot;Ні Копіювати&quot; не встановлений"
+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/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Всього Замовити вважається
 apps/erpnext/erpnext/config/hr.py +186,"Employee designation (e.g. CEO, Director etc.).","Співробітник позначення (наприклад, генеральний директор, директор і т.д.)."
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,"Будь ласка, введіть &quot;Повторіть День Місяць&quot; значення поля"
-DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Швидкість, з якою Клієнт валюта конвертується в базову валюту замовника"
-apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Рядок # {0}: Купівля Рахунок-фактура не може бути зроблено щодо існуючого активу {1}
+DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Курс, за яким валюта покупця конвертується у базову валюту покупця"
+apps/erpnext/erpnext/controllers/accounts_controller.py +554,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Рядок # {0}: Вхідний рахунок-фактура не може бути зроблений щодо існуючого активу {1}
 DocType: Item Tax,Tax Rate,Ставка податку
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} вже виділено Робітника {1} для періоду {2} в {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +812,Select Item,Вибрати пункт
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Item: {0} managed batch-wise, can not be reconciled using \
-					Stock Reconciliation, instead use Stock Entry","Стан: {0} вдалося порційно, не можуть бути узгоджені з допомогою \ зі примирення, а не використовувати зі запис"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Купівля Рахунок {0} вже представили
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},"Ряд # {0}: Пакетне Немає повинно бути таким же, як {1} {2}"
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +791,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/stock/doctype/purchase_receipt/purchase_receipt.py +143,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 +117,Batch (lot) of an Item.,Партія (багато) номенклатурних позицій.
 DocType: C-Form Invoice Detail,Invoice Date,Дата рахунку-фактури
 DocType: GL Entry,Debit Amount,Дебет Сума
 apps/erpnext/erpnext/accounts/party.py +242,There can only be 1 Account per Company in {0} {1},Там може бути тільки 1 аккаунт на компанію в {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +4,Your email address,Ваша електронна адреса
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +342,Please see attachment,"Будь ласка, див вкладення"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,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 +19,Setup Already Complete!!,Налаштування Вже Повний !!
 ,Finished Goods,Готові вироби
 DocType: Delivery Note,Instructions,Інструкції
 DocType: Quality Inspection,Inspected By,Перевірено
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Постачальник&gt; Постачальник Тип
 DocType: Maintenance Visit,Maintenance Type,Тип Обслуговування
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Серійний номер {0} не належить накладної {1}
 apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Додати товари
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Пункт Параметр Контроль якості
-DocType: Leave Application,Leave Approver Name,Залиште Ім&#39;я стверджує
+DocType: Leave Application,Leave Approver Name,Ім'я погоджувача відпустки
 DocType: Depreciation Schedule,Schedule Date,Розклад Дата
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components","Доходи, Відрахування та інші компоненти Зарплатні"
 DocType: Packed Item,Packed Item,Упакування товару
@@ -388,64 +395,64 @@
 DocType: Currency Exchange,Currency Exchange,Обмін валюти
 DocType: Purchase Invoice Item,Item Name,Назва виробу
 DocType: Authorization Rule,Approving User  (above authorized value),Затвердження користувач (вище статутного вартості)
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Залишок кредиту
+DocType: Email Digest,Credit Balance,Залишок кредиту
 DocType: Employee,Widowed,Овдовілий
-DocType: Request for Quotation,Request for Quotation,Запит цін
+DocType: Request for Quotation,Request for Quotation,Запит пропозиції
 DocType: Salary Slip Timesheet,Working Hours,Робочі години
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Змінити стартову / поточний порядковий номер існуючого ряду.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Якщо кілька правил ціноутворення продовжують переважати, користувачам пропонується встановити пріоритет вручну вирішити конфлікт."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +736,Purchase Return,Купівля Повернення
-,Purchase Register,Купівля Реєстрація
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +715,Purchase Return,Купівля Повернення
+,Purchase Register,Реєстр закупівель
 DocType: Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Застосовувані Збори
 DocType: Workstation,Consumable Cost,Вартість витратних
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +202,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) повинен мати роль ""Затверджувач залишків"""
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) повинен мати роль ""Погоджувач  відпусток"""
 DocType: Purchase Receipt,Vehicle Date,Дата
 DocType: Student Log,Medical,Медична
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Причина втрати
-apps/erpnext/erpnext/accounts/utils.py +239,Allocated amount can not greater than unadjusted amount,Виділена сума не може перевищувати суми нерегульованого
+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,Розподілена сума не може перевищувати неврегульовану
 DocType: Announcement,Receiver,приймач
-apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Робоча станція закрита в наступні терміни відповідно курортні Список: {0}
+apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Робоча станція закрита в наступні терміни відповідно до списку вихідних: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Можливості
 DocType: Employee,Single,Одиночний
 DocType: Account,Cost of Goods Sold,Вартість проданих товарів
 DocType: Purchase Invoice,Yearly,Річний
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +225,Please enter Cost Center,"Будь ласка, введіть Обліковий центр"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,Please enter Cost Center,"Будь ласка, введіть Обліковий центр"
 DocType: Journal Entry Account,Sales Order,Замовлення клієнта
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,СР Продаж Оцінити
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,Сер. ціна прод.
 DocType: Assessment,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: 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/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,"Будь ласка, введіть назву компанії в першу чергу"
 DocType: BOM,Item Desription,Пункт Desription
-DocType: Purchase Invoice,Supplier Name,Ім&#39;я постачальника
+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: Stock Settings,Automatically Set Serial Nos based on FIFO,Автоматично вказаний серійний пп на основі FIFO
-DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Перевірте Постачальник Номер рахунку Унікальність
+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,Перевірте унікальність номеру вхідного рахунку-фактури
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',"""До Випадку №"" не може бути менше, ніж ""З Випадку № '"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,Non Profit,Некомерційне
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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: Stock Reconciliation Item,Do not include symbols (ex. $),Чи не включати в себе символи (напр. $)
+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: SMS Log,Sent On,Відправлено На
-apps/erpnext/erpnext/stock/doctype/item/item.py +638,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} вибрано кілька разів в таблиці атрибутів
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} вибрано кілька разів в таблиці атрибутів
 DocType: HR Settings,Employee record is created using selected field. ,Співробітник запис створено за допомогою обраного поля.
 DocType: Sales Order,Not Applicable,Не застосовується
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Майстер відпочинку.
 DocType: Request for Quotation Item,Required Date,Потрібно Дата
-DocType: Delivery Note,Billing Address,Платіжний адреса
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +862,Please enter Item Code.,"Будь ласка, введіть код предмета."
+DocType: Delivery Note,Billing Address,Адреса для рахунків
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +847,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: 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: Employee,Health Concerns,Проблеми Здоров&#39;я
@@ -456,80 +463,80 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Цінні папери та депозити
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,"Всього листя, виділені є обов&#39;язковим"
 DocType: Job Opening,Description of a Job Opening,Опис роботу Відкриття
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Pending activities for today,В очікуванні діяльність на сьогоднішній день
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,В очікуванні діяльність на сьогоднішній день
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Відвідуваність запис.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Заробітна плата Компонент для розрахунку заробітної плати на основі розкладу.
 DocType: Sales Order Item,Used for Production Plan,Використовується для виробничого плану
 DocType: Manufacturing Settings,Time Between Operations (in mins),Час між операціями (в хв)
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +92,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} Бюджет на Рахунок {1} проти МВЗ {2} {3}. Він буде перевищувати {4}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +95,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} Бюджет на Рахунок {1} проти МВЗ {2} {3}. Він буде перевищувати {4}
 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: 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/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 +86,Administrative Officer,Адміністративний співробітник
-apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +23,Acutal Qty {0} / Waiting Qty {1},Acutal Кількість {0} / Очікування Кількість {1}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,Адміністративний співробітник
+apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +23,Acutal Qty {0} / Waiting Qty {1},Фактична к-сть {0} / Очікувана к-сть {1}
 DocType: Timesheet Detail,Hrs,годин
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +319,Please select Company,"Будь ласка, виберіть компанію"
-DocType: Stock Entry,Difference Account,Рахунок різниці
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +309,Please select Company,"Будь ласка, виберіть компанію"
+DocType: Stock Entry Detail,Difference Account,Рахунок різниці
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,"Неможливо закрити завдання, як її залежить завдання {0} не закрите."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Please enter Warehouse for which Material Request will be raised,"Будь ласка, введіть Склад для яких Матеріал Запит буде піднято"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +399,Please enter Warehouse for which Material Request will be raised,"Будь ласка, введіть Склад для якого буде створено Замовлення матеріалів"
 DocType: Production Order,Additional Operating Cost,Додаткова Експлуатаційні витрати
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Косметика
-apps/erpnext/erpnext/stock/doctype/item/item.py +530,"To merge, following properties must be same for both items","Щоб об&#39;єднати, наступні властивості повинні бути однаковими для обох пунктів"
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,"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 +28,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 +1563,Serial no item cannot be a fraction,Серійний жоден елемент не може бути дробовим
+DocType: Purchase Invoice Item,Item,Номенклатура
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1587,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 +314,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,"Швидкість, з якою Прайс-лист валюта конвертується в базову валюту компанії"
+DocType: Quotation,Rate at which Price list currency is converted to company's base currency,"Курс, за яким валюта прайс-листа конвертується у базову валюту компанії"
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Account {0} does not belong to company: {1},Рахунок {0} не належить компанії: {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation already used for another company,Скорочення вже використовується для іншої компанії
 DocType: Selling Settings,Default Customer Group,За замовчуванням Група клієнтів
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Supplier is required against Payable account {0},Постачальник потрібно від розрахунковому рахунку {0}
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Якщо відключити, &quot;округляється Всього &#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
 DocType: Production Planning Tool,Material Requirement,Вимога Матеріал
 DocType: Company,Delete Company Transactions,Видалити скоєнні Товариством угод
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +313,Reference No and Reference Date is mandatory for Bank transaction,Посилання № та дата Reference є обов&#39;язковим для операції банку
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +316,Reference No and Reference Date is mandatory for Bank transaction,Посилання № та дата Reference є обов&#39;язковим для операції банку
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Додати / редагувати податки і збори
-DocType: Purchase Invoice,Supplier Invoice No,Постачальник Рахунок Немає
+DocType: 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/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Не вдається видалити Серійний номер {0}, оскільки він використовується у складських операціях"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +240,Closing (Cr),Закриття (Cr)
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +104,Move Item,перемістити елемент
 DocType: Serial No,Warranty Period (Days),Гарантійний термін (днів)
 DocType: Installation Note Item,Installation Note Item,Установка Примітка Пункт
-DocType: Production Plan Item,Pending Qty,В очікуванні Кількість
+DocType: Production Plan Item,Pending Qty,К-сть в очікуванні
 DocType: Budget,Ignore,Ігнорувати
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Код товару&gt; Група товару&gt; Марка
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,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,Постачальник Склад обов&#39;язковим для суб-контракту купівлі отриманні
+apps/erpnext/erpnext/controllers/buying_controller.py +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Склад постачальника - обов'язковий для прихідних накладних субпідрядників
 DocType: Pricing Rule,Valid From,Діє з
 DocType: Sales Invoice,Total Commission,Всього комісія
 DocType: Pricing Rule,Sales Partner,Партнер по продажах
-DocType: Buying Settings,Purchase Receipt Required,Купівля Отримання Потрібно
-apps/erpnext/erpnext/stock/doctype/item/item.py +128,Valuation Rate is mandatory if Opening Stock entered,"Оцінка Оцініть є обов&#39;язковим, якщо введений Відкриття зображення"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Записи не знайдені в таблиці рахунків
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +28,Please select Company and Party Type first,"Будь ласка, виберіть компаній і партії першого типу"
+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/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/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","На жаль, послідовний пп не можуть бути об&#39;єднані"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +707,Make Sales Order,Зробити замовлення на продаж
+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 +701,Make Sales Order,Зробити замовлення на продаж
 DocType: Project Task,Project Task,Проект Завдання
-,Lead Id,Ведучий Id
+,Lead Id,Lead Id
 DocType: C-Form Invoice Detail,Grand Total,Загальний підсумок
 DocType: Assessment,Course,курс
 DocType: Timesheet,Payslip,листка
@@ -543,52 +550,53 @@
 DocType: Job Applicant,Resume Attachment,резюме Додаток
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Постійних клієнтів
 DocType: Leave Control Panel,Allocate,Виділяти
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +734,Sales Return,Продажі Повернутися
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +728,Sales Return,Продажі Повернутися
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +91,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: Quotation,Quotation To,Пропозиція для
 DocType: Lead,Middle Income,Середній дохід
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +212,Opening (Cr),Відкриття (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +795,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"За замовчуванням Одиниця виміру для п {0} не може бути змінений безпосередньо, тому що ви вже зробили деякі угоди (угод) з іншим UOM. Вам потрібно буде створити новий пункт для використання іншого замовчуванням одиниця виміру."
-apps/erpnext/erpnext/accounts/utils.py +237,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,накладна Timesheet
+apps/erpnext/erpnext/stock/doctype/item/item.py +797,Default Unit of Measure for Item {0} cannot be changed directly because 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,Розподілена сума не може бути негативною
+DocType: Purchase Order Item,Billed Amt,Сума виставлених рахунків
+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 +91,Reference No & Reference Date is required for {0},Посилання № &amp; Посилання Дата потрібно для {0}
-DocType: Sales Invoice,Customer's Vendor,Виробник Клієнтам
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Proposal Writing,Пропозиція Написання
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,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","Якщо цей прапорець встановлений, сировину для елементів, які є субпідрядниками будуть включені в матеріалі запитів"
+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 +140,Update Bank Transaction Dates,Оновлення банку транзакцій Дати
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,відстеження часу
 DocType: Fiscal Year Company,Fiscal Year Company,Фінансовий рік компанії
 DocType: Packing Slip Item,DN Detail,DN Деталь
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +257,Already supplier quotation has created,Уже постачальником цитата створив
-DocType: Timesheet,Billed,Оголошений
-DocType: Batch,Batch Description,Партія Опис
+DocType: Timesheet,Billed,Виставлено рахунки
+DocType: Batch,Batch Description,Опис партії
+apps/erpnext/erpnext/accounts/utils.py +685,"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: Sales Invoice,Sales Taxes and Charges,Податки та збори з продажу
 DocType: Employee,Organization Profile,Профіль організації
-apps/erpnext/erpnext/accounts/page/pos/pos.js +733,View Offline Records,Offline Перегляд записів
+apps/erpnext/erpnext/accounts/page/pos/pos.js +715,View Offline Records,Offline Перегляд записів
+DocType: Student,Sibling Details,подробиці Споріднені
 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}
-DocType: Buying Settings,Settings for Buying Module,Налаштування для покупки модуля
+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,"Будь ласка, введіть Придбати отримання спершу"
-DocType: Buying Settings,Supplier Naming By,Постачальник Неймінг За
-DocType: Activity Type,Default Costing Rate,За замовчуванням Калькуляція Оцінити
+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: Maintenance Schedule,Maintenance Schedule,Графік регламентних робіт
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Тоді ціноутворення Правила фільтруються на основі Замовника, Група покупців, краю, постачальник, Тип постачальник, кампанії, і т.д. Sales Partner"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Inventory,Чиста зміна в інвентаризації
 DocType: Employee,Passport Number,Номер паспорта
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Manager,Менеджер
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,Менеджер
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,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,"""Базується на"" і ""Згруповано за"" не можуть бути однаковими"
@@ -597,10 +605,11 @@
 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 +299,Timesheet created:,Timesheet створено:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +715,Please set default Cash or Bank account in Mode of Payment {0},"Будь ласка, встановіть Cash замовчуванням або банківського рахунку в режимі з оплати {0}"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +300,Timesheet created:,Timesheet створено:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +772,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,зараховувати
 DocType: Selling Settings,Customer Naming By,Неймінг клієнтів по
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Будь ласка, встановіть співробітників система імен в людських ресурсів&gt; HR Налаштування"
 DocType: Depreciation Schedule,Depreciation Amount,Амортизація основних засобів Сума
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,Перетворити в групі
 DocType: Activity Cost,Activity Type,Тип діяльності
@@ -608,12 +617,12 @@
 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,Список Упаковка
+DocType: Sales Invoice,Packing List,Комплектація
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,"Замовлення, видані постачальникам."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Видавнича
 DocType: Activity Cost,Projects User,Проекти Користувач
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Споживана
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +157,{0}: {1} not found in Invoice Details table,{0}: {1} не найден в рахунку-фактурі таблиці
+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,Матеріал Передача
@@ -625,12 +634,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,обробка
 DocType: Pricing Rule,Sales Manager,Менеджер з продажу
 DocType: Salary Structure Employee,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: Purchase Invoice,Quarterly,Щоквартальний
 DocType: Selling Settings,Delivery Note Required,Доставка Примітка Потрібно
-DocType: Sales Order Item,Basic Rate (Company Currency),Basic Rate (Компанія валют)
+DocType: Sales Order 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,З зворотним промиванням Сировина матеріали на основі
@@ -639,11 +649,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +9,Pre Sales,Pre Sales
 DocType: Purchase Receipt,Other Details,Інші подробиці
 DocType: Account,Accounts,Рахунки
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Marketing,Маркетинг
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +227,Payment Entry is already created,Оплата запис уже створений
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,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 +538,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 +21,Preview Salary Slip,Перегляд Зарплата ковзанню
+apps/erpnext/erpnext/controllers/accounts_controller.py +541,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 +38,Preview Salary Slip,Перегляд Зарплата ковзанню
 DocType: Company,Deafult Cost Center,Центр Вартість замовчуванням використовується
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +48,Account {0} has been entered multiple times,Рахунок {0} був введений кілька разів
 DocType: Account,Expenses Included In Valuation,"Витрат, що включаються в оцінці"
@@ -652,15 +662,15 @@
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,"Будь ласка, виберіть групу 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 +617,Item has variants.,Пункт має варіанти.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Номенклатурна позиція має варіанти.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,Пункт {0} знайдений
-DocType: Bin,Stock Value,Вартість акцій
+DocType: Bin,Stock Value,Значення запасів
 apps/erpnext/erpnext/accounts/doctype/account/account.py +25,Company {0} does not exist,Компанія {0} не існує
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Дерево Тип
+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,Термін дії гарантії
 DocType: Material Request Item,Quantity and Warehouse,Кількість і Склад
-DocType: Sales Invoice,Commission Rate (%),Комісія ставка (%)
+DocType: Sales Invoice,Commission Rate (%),Ставка комісії (%)
 DocType: Project,Estimated Cost,орієнтовна вартість
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Авіаційно-космічний
 DocType: Journal Entry,Credit Card Entry,Вступ Кредитна карта
@@ -670,35 +680,35 @@
 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.,"Дата, на яку буде генеруватися наступний рахунок-фактура. Він створюється на форму."
+DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Дата, на яку буде створений наступний рахунок-фактура. Генерується після проведення."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Оборотні активи
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,{0} is not a stock Item,{0} не є складським товаром
-DocType: Mode of Payment Account,Default Account,За замовчуванням обліковий запис
+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 +169,Lead must be set if Opportunity is made from Lead,"Ведучий повинен бути встановлений, якщо Можливість зроблений зі свинцю"
-apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,"Будь ласка, виберіть вихідний день на тиждень"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +169,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,Рахунок з існуючою транзакції не можуть бути перетворені в бухгалтерській книзі
-DocType: Delivery Note,Customer's Purchase Order No,Клієнтам Замовлення Немає
-DocType: Employee,Cell Number,Кількість стільникових
-apps/erpnext/erpnext/stock/reorder_item.py +177,Auto Material Requests Generated,"Запити Авто матеріал, отриманий"
+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 +125,You can not enter current voucher in 'Against Journal Entry' column,Ви не можете ввести поточний ваучер в «Проти Запис у журналі &#39;колонці
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +39,Reserved for manufacturing,Зарезервовано для виготовлення
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Енергія
-DocType: Opportunity,Opportunity From,Можливість Від
+DocType: Opportunity,Opportunity From,Нагода від
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Щомісячна виписка зарплата.
-DocType: Item Group,Website Specifications,Сайт характеристики
-apps/erpnext/erpnext/utilities/doctype/address/address.py +104,There is an error in your Address Template {0},Існує помилка в адресному Шаблон {0}
+DocType: Item Group,Website Specifications,Характеристики веб-сайту
+apps/erpnext/erpnext/utilities/doctype/address/address.py +104,There is an error in your Address Template {0},Існує помилка в адресному шаблоні {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{0}: From {0} of type {1},{0}: З {0} типу {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Ряд {0}: Коефіцієнт перетворення є обов&#39;язковим
 DocType: Employee,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +274,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Кілька Ціна Правила існує з тими ж критеріями, будь ласка вирішити конфлікт шляхом присвоєння пріоритету. Ціна Правила: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +369,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Не можете деактивувати або скасувати специфікації, як вона пов&#39;язана з іншими специфікаціями"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +369,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 +206,Purchase Receipt number required for Item {0},Купівля Надходження номер потрібно для пункту {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +206,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,зробити розкладів
@@ -722,7 +732,7 @@
 7. Total: Cumulative total to this point.
 8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row).
 9. Is this Tax included in Basic Rate?: If you check this, it means that this tax will not be shown below the item table, but will be included in the Basic Rate in your main item table. This is useful where you want give a flat price (inclusive of all taxes) price to customers.","Стандартний шаблон податок, який може бути застосований для всіх угод купівлі-продажу. Цей шаблон може містити перелік податкових керівників, а також інших глав витрати / доходи, як &quot;Доставка&quot;, &quot;Insurance&quot;, &quot;Звернення&quot; і т.д. #### Примітка податкової ставки ви визначаєте тут буде стандартна ставка податку на прибуток для всіх ** Предмети **. Якщо є ** ** товари, які мають різні ціни, вони повинні бути додані в ** Item податку ** стіл в ** ** Item майстра. #### Опис колонок 1. Розрахунок Тип: - Це може бути від ** ** Загальна Чистий (тобто сума основної суми). - ** На попередньому рядку Total / сума ** (за сукупністю податків або зборів). Якщо ви оберете цю опцію, податок буде застосовуватися, як у відсотках від попереднього ряду (у податковому таблиці) суми або загальної. - ** ** Фактичний (як уже згадувалося). 2. Рахунок Керівник: Рахунок книга, під яким цей податок будуть заброньовані 3. Вартість центр: Якщо податок / плата є доходом (як перевезення вантажу) або витрат це повинно бути заброньовано проти МВЗ. 4. Опис: Опис податку (які будуть надруковані в рахунках-фактурах / цитати). 5. Оцінити: Податкова ставка. 6. Сума: Сума податку. 7. Разом: Сумарне до цієї точки. 8. Введіть рядок: Якщо на базі &quot;Попередня рядок Усього&quot; ви можете вибрати номер рядка, який буде прийнято в якості основи для розрахунку цього (за замовчуванням це попереднє рядок). 9. Цей податок включений в основну ставку?: Якщо ви перевірити це, це означає, що цей податок не буде показано нижче таблиці елементів, але буде включений в основну ставку в основній таблиці елементів. Це корисно, якщо ви хочете дати плоску ціну (з урахуванням всіх податків) ціна для клієнтів."
-DocType: Employee,Bank A/C No.,Bank A / C Кількість
+DocType: Employee,Bank A/C No.,Номер банк. рахунку
 DocType: GL Entry,Project,Проект
 DocType: Quality Inspection Reading,Reading 7,Читання 7
 DocType: Address,Personal,Особистий
@@ -737,50 +747,49 @@
 DocType: Company,Default Cost of Goods Sold Account,За замовчуванням Собівартість проданих товарів рахунок
 apps/erpnext/erpnext/stock/get_item_details.py +275,Price List not selected,Ціни не обраний
 DocType: Employee,Family Background,Сімейні обставини
-DocType: Request for Quotation Supplier,Send Email,Відправити лист
-apps/erpnext/erpnext/stock/doctype/item/item.py +204,Warning: Invalid Attachment {0},Увага: Невірний Додаток {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +709,No Permission,Немає доступу
+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 +710,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}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +298,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 +542,Row #{0}: Asset {1} must be submitted,Рядок # {0}: Asset {1} повинен бути представлений
+DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Деталі банківської виписки
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,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: 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: Warehouse,Tree Details,деталі Дерево
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Відправити зараз
-,Support Analytics,Підтримка аналітика
-DocType: Item,Website Warehouse,Сайт Склад
+apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,Завантажити складські залишки з CSV.
+DocType: Warehouse,Tree Details,деталі Дерева
+,Support 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}: {доктайпів} {DOCNAME} не існує в вище &#39;{доктайпів}&#39; таблиця
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +227,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 і т.д."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +259,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,Програма Зарахування Tool
 apps/erpnext/erpnext/config/accounts.py +294,C-Form records,С-Form записи
 apps/erpnext/erpnext/config/selling.py +297,Customer and Supplier,Замовник і Постачальник
 DocType: Email Digest,Email Digest Settings,Відправити Дайджест Налаштування
-apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Підтримка запитів від клієнтів.
+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 +342,{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 +229,Target Warehouse,Цільова Склад
+DocType: HR Settings,Enter retirement age in years,Введіть вік виходу на пенсію в роках
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +230,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-,стереотипами
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Sales Order Date,"Очікувана дата поставки не може бути, перш ніж Sales Order Дата"
 DocType: Upload Attendance,Import Attendance,Імпорт Відвідуваність
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Всі Групи товарів
+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/config/setup.py +89,Automatically compose message on submission of transactions.,Автоматично написати повідомлення за поданням угод.
@@ -788,18 +797,20 @@
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +82,{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/stock/page/stock_balance/stock_balance.js +37,Projected Qty,Прогнозований Кількість
+apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +37,Projected Qty,Прогнозована к-сть
 DocType: Sales Invoice,Payment Due Date,Дата платежу
-apps/erpnext/erpnext/stock/doctype/item/item.js +278,Item Variant {0} already exists with same attributes,Пункт Варіант {0} вже існує ж атрибутами
+apps/erpnext/erpnext/stock/doctype/item/item.js +278,Item Variant {0} already exists with same attributes,Вже існує варіант позиції {0} з такими атрибутами
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',"""Відкривається"""
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Open To Do
 DocType: Notification Control,Delivery Note Message,Доставка Примітка Повідомлення
 DocType: Expense Claim,Expenses,Витрати
-DocType: Item Variant Attribute,Item Variant Attribute,Варіант Пункт Атрибут
-,Purchase Receipt Trends,Купівля розписок Тенденції
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Research & Development,Дослідження і розвиток
+DocType: Item Variant Attribute,Item Variant Attribute,Атрибут варіантів
+,Purchase Receipt Trends,Тренд прихідних накладних
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Дослідження і розвиток
 ,Amount to Bill,Сума Білла
 DocType: Company,Registration Details,Реєстраційні дані
-DocType: Item Reorder,Re-Order Qty,Re-Order Кіл
+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,Ціна зі знижкою або
 DocType: Sales Team,Incentives,Стимули
@@ -807,17 +818,17 @@
 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/controllers/accounts_controller.py +340,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Оплата запис {0} пов&#39;язаний з Орденом {1}, перевірити, якщо він повинен бути підтягнутий, як крок вперед в цьому рахунку-фактурі."
+apps/erpnext/erpnext/controllers/accounts_controller.py +343,"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'","Баланс рахунку вже в кредит, ви не можете встановити &quot;баланс повинен бути&quot;, як &quot;дебет&quot;"
-DocType: Account,Balance must be,Баланс повинен бути
+DocType: Account,Balance must be,Сальдо повинно бути
 DocType: Hub Settings,Publish Pricing,Опублікувати Ціни
 DocType: Notification Control,Expense Claim Rejected Message,Витрати Заявити Відхилено повідомлення
-,Available Qty,Доступно Кількість
+,Available Qty,Доступна к-сть
 DocType: Purchase Taxes and Charges,On Previous Row Total,На попередньому рядку Total
-DocType: Purchase Invoice Item,Rejected Qty,Відхилено Кількість
+DocType: Purchase Invoice Item,Rejected Qty,Відхилена к-сть
 DocType: Salary Slip,Working Days,Робочі дні
 DocType: Serial No,Incoming Rate,Вхідний Оцінити
 DocType: Packing Slip,Gross Weight,Вага брутто
@@ -826,130 +837,133 @@
 DocType: Job Applicant,Hold,Тримати
 DocType: Employee,Date of Joining,Дата вступу
 DocType: Naming Series,Update Series,Серія Оновлення
-DocType: Supplier Quotation,Is Subcontracted,Субпідряду
+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 +756,Purchase Receipt,Купівля Надходження
-,Received Items To Be Billed,"Надійшли пунктів, які будуть Оголошений"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +735,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 +167,Reference Doctype must be one of {0},Довідник Doctype повинен бути одним з {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +282,Unable to find Time Slot in the next {0} days for Operation {1},Неможливо знайти часовий інтервал в найближчі {0} днів для роботи {1}
+apps/erpnext/erpnext/config/accounts.py +267,Currency exchange rate master.,Майстер курсів валют.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +170,Reference Doctype must be one of {0},Довідник Doctype повинен бути одним з {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Unable to find Time Slot in the next {0} days for Operation {1},Неможливо знайти часовий інтервал в найближчі {0} днів для роботи {1}
 DocType: Production Order,Plan material for sub-assemblies,План матеріал для суб-вузлів
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Партнери по збуту і території
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be active,Специфікація {0} повинен бути активним
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,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/templates/generators/item.html +68,Goto Cart,Перейти Кошик
+apps/erpnext/erpnext/templates/generators/item.html +68,Goto Cart,Перейти до кошику
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Скасування матеріалів переглядів {0} до скасування цього обслуговування візит
 DocType: Salary Slip,Leave Encashment Amount,Залишити інкасації Кількість
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Серійний номер {0} не належить до пункту {1}
-DocType: Purchase Receipt Item Supplied,Required Qty,Обов&#39;язково Кількість
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +214,Warehouses with existing transaction can not be converted to ledger.,Склади з існуючої транзакції не можуть бути перетворені в бухгалтерській книзі.
+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 +217,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,Виробничі замовлення
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +53,Balance Value,Валюта балансу
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +53,Balance Value,Значення сальдо
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Продажі Прайс-лист
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Опублікувати синхронізувати елементи
 DocType: Bank Reconciliation,Account Currency,Валюта рахунку
 apps/erpnext/erpnext/accounts/general_ledger.py +137,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 +40,Employee {0} is not active or does not exist,Працівник {0} не є активним або не існує
 DocType: Fee Structure,Components,компоненти
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,Please enter Asset Category in Item {0},"Будь ласка, введіть Asset Категорія в пункті {0}"
-apps/erpnext/erpnext/stock/doctype/item/item.py +612,Item Variants {0} updated,Пункт Варіанти {0} оновлюються
+apps/erpnext/erpnext/stock/doctype/item/item.py +614,Item Variants {0} updated,Варіанти позиції {0} оновлено
 DocType: Quality Inspection Reading,Reading 6,Читання 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +843,Cannot {0} {1} {2} without any negative outstanding invoice,Може не {0} {1} {2} без будь-якого негативного видатний рахунок-фактура
-DocType: Purchase Invoice Advance,Purchase Invoice Advance,Рахунок покупки Advance
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +854,Cannot {0} {1} {2} without any negative outstanding invoice,Може не {0} {1} {2} без будь-якого негативного видатний рахунок-фактура
+DocType: Purchase Invoice Advance,Purchase Invoice Advance,Передоплата по вхідному рахунку
 DocType: Address,Shop,Магазин
 DocType: Hub Settings,Sync Now,Синхронізувати зараз
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +172,Row {0}: Credit entry can not be linked with a {1},Ряд {0}: Кредитна запис не може бути пов&#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-,ВЕСТИ-
-DocType: Employee,Permanent Address Is,Постійна адреса Є
+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,Бренд
 DocType: Employee,Exit Interview Details,Вихід Інтерв&#39;ю Подробиці
-DocType: Item,Is Purchase Item,Хіба Купівля товару
-DocType: Asset,Purchase Invoice,Купівля Рахунок
+DocType: Item,Is Purchase Item,Покупний товар
+DocType: Asset,Purchase Invoice,Вхідний рахунок-фактура
 DocType: Stock Ledger Entry,Voucher Detail No,Ваучер Подробиці Немає
-apps/erpnext/erpnext/accounts/page/pos/pos.js +728,New Sales Invoice,Новий рахунок-фактуру
+apps/erpnext/erpnext/accounts/page/pos/pos.js +710,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 +728,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: Guardian,Guardian Name,ім&#39;я опікуна
 DocType: Cheque Print Template,Has Print Format,Має формат друку
-apps/erpnext/erpnext/accounts/page/pos/pos.js +86, is mandatory. Maybe Currency Exchange record is not created for ,"є обов'язковим. Можливо, що запис ""Обмін валюти"" не створений"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +109,Row #{0}: Please specify Serial No for Item {1},"Ряд # {0}: Будь ласка, сформулюйте Серійний номер, вказаний в п {1}"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +619,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Для елементів &quot;продукту&quot; Bundle, склад, серійний номер і серія № буде розглядатися з &quot;пакувальний лист &#39;таблиці. Якщо Склад і пакетна Немає є однаковими для всіх пакувальних компонентів для будь &quot;продукту&quot; Bundle пункту, ці значення можуть бути введені в основній таблиці Item значення будуть скопійовані в &quot;список упаковки&quot; таблицю."
-DocType: Job Opening,Publish on website,Публікація на сайті
+apps/erpnext/erpnext/accounts/page/pos/pos.js +75, 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 +613,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing 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 +606,Supplier Invoice Date cannot be greater than Posting Date,"Дата Постачальник Рахунок не може бути більше, ніж Дата публікації"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +609,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: 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 +810,Select Item for Transfer,Вибрати пункт трансферу
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +789,Select Item for Transfer,Вибрати пункт трансферу
 DocType: Purchase Invoice,Additional Discount Percentage,Додаткова знижка у відсотках
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Переглянути перелік усіх довідкових відео
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Вибір рахунка керівник банку, в якому перевірка була зберігання."
-DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Дозволити користувачеві редагувати прайс-лист в угодах Оцінити
-DocType: Pricing Rule,Max Qty,Макс Кількість
-DocType: Student Applicant,Father's Name,Батькове ім&#39;я
+DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Дозволити користувачеві редагувати ціну в операціях
+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 +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Ряд {0}: Оплата проти продажів / Замовлення повинні бути завжди заздалегідь відзначений як
+						Please enter a valid Invoice","Рядок {0}: Рахунок {1} є недійсним, можливо  скасований / не існує. \ Введіть правильний рахунок-фактуру"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Ряд {0}: Оплати згідно Замовлення клієнта/на  поставку повинні бути завжди відмічені як аванси
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Хімічна
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +686,All items have already been transferred for this Production Order.,Всі деталі вже були передані для цього виробничого замовлення.
+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} і спробуйте ще раз"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +694,All items have already been transferred for this Production Order.,Всі деталі вже були передані для цього виробничого замовлення.
 DocType: Process Payroll,Select Payroll Year and Month,Виберіть Payroll рік і місяць
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,Meter,метр
 DocType: Workstation,Electricity Cost,Вартість електроенергії
 DocType: HR Settings,Don't send Employee Birthday Reminders,Не посилати Employee народження Нагадування
-DocType: Opportunity,Walk In,Заходити
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,Сток Записи
+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 +12,Transfered,Всі передані
-apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,Завантажити лист голову і логотип. (ви можете редагувати їх пізніше).
+apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,Відвантажити ваш фірмовий заголовок та логотип. (Ви зможете відредагувати їх пізніше).
 DocType: Timesheet Detail,Bill,Білл
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,White,Білий
-DocType: SMS Center,All Lead (Open),Всі Свинець (відкрито)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +228,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Рядок {0}: Кількість недоступний для {4} на складі {1} при проводки час вступу ({2} {3})
-DocType: Purchase Invoice,Get Advances Paid,"Отримати Аванси, видані"
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +731,Make ,Зробити
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date is entered as past date,Наступний Знос Дата вводиться як дату в минулому
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +167,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 +710,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 +154,Order Type must be one of {0},Тип замовлення повинна бути однією з {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Тип замовлення повинна бути однією з {0}
 DocType: Lead,Next Contact Date,Наступна Контактні Дата
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Відкриття Кількість
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +393,Please enter Account for Change Amount,"Будь ласка, введіть рахунок для зміни висоти"
+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 +421,Please enter Account for Change Amount,"Будь ласка, введіть рахунок для зміни висоти"
 DocType: Student Batch,Student Batch Name,Student Пакетне Ім&#39;я
-DocType: Holiday List,Holiday List Name,Ім&#39;я відпочинку Список
+DocType: Holiday List,Holiday List Name,Ім'я списку вихідних
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js +8,Schedule Course,Розклад курсу
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Stock Options,Опціони
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Опціони
 DocType: Journal Entry Account,Expense Claim,Витрати Заявити
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +211,Do you really want to restore this scrapped asset?,Ви дійсно хочете відновити цей актив на злам?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +237,Qty for {0},Кількість для {0}
-DocType: Leave Application,Leave Application,Залишити заявку
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +212,Do you really want to restore this scrapped asset?,Ви дійсно хочете відновити цей актив на злам?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,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: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Приземлився Вартість Купівля Надходження
+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 +70,Removed items with no change in quantity or value.,Вилучені пункти без зміни в кількості або вартості.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Вилучені пункти без зміни в кількості або вартості.
 DocType: Delivery Note,Delivery To,Доставка Для
-apps/erpnext/erpnext/stock/doctype/item/item.py +635,Attribute table is mandatory,Атрибут стіл є обов&#39;язковим
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Атрибут стіл є обов&#39;язковим
 DocType: Production Planning Tool,Get Sales Orders,Отримати замовлень клієнта
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} не може бути від’ємним
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,"Будь ласка, виберіть Student"
@@ -959,123 +973,123 @@
 DocType: Project,Internal,Внутрішній
 DocType: Task,Urgent,Терміновий
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +141,Please specify a valid Row ID for row {0} in table {1},"Будь ласка, вкажіть дійсний ідентифікатор рядка для рядка {0} в таблиці {1}"
-apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Перейдіть на робочий стіл і почати використовувати ERPNext
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Перейти до стільниці і почати користування ERPNext
 DocType: Item,Manufacturer,Виробник
-DocType: Landed Cost Item,Purchase Receipt Item,Купівля товару Надходження
+DocType: Landed Cost Item,Purchase Receipt Item,Позиція прихідної накладної
 DocType: Purchase Receipt,PREC-RET-,PREC-RET-
-DocType: POS Profile,Sales Invoice Payment,накладна Оплата
+DocType: POS Profile,Sales Invoice Payment,Оплата по вихідному рахунку
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Зарезервовано Склад в замовлення клієнта / Склад готової продукції
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Selling Amount,Продаж Сума
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +115,You are the Expense Approver for this record. Please Update the 'Status' and Save,Ви рахунок затверджує для цього запису. Оновіть &#39;Стан&#39; і збережіть
+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/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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Серійний номер {0} за контрактом Шифрування до обслуговування {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,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,Державний Доставка
-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; кнопки
+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,"Позиція повинна додаватися за допомогою кнопки ""Отримати позиції з прихідної накладної"""
 DocType: Employee,A-,A-
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Продажі Витрати
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Витрати на збут
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Стандартний Купівля
 DocType: GL Entry,Against,Проти
-DocType: Item,Default Selling Cost Center,За замовчуванням Продаж МВЗ
+DocType: Item,Default Selling Cost Center,Центр витрат продажу за замовчуванням
 DocType: Sales Partner,Implementation Partner,Реалізація Партнер
-apps/erpnext/erpnext/controllers/selling_controller.py +231,Sales Order {0} is {1},Продажі Замовити {0} {1}
+apps/erpnext/erpnext/controllers/selling_controller.py +232,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 +299,Making Stock Entries,Створення Руху ТМЦ
 DocType: Packing Slip,Net Weight UOM,Вага нетто Одиниця виміру
-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,Отримати Щотижневі граничні терміни
+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,"Дата закінчення не може бути менше, ніж Дата початку"
 DocType: Sales Person,Select company name first.,Виберіть назву компанії в першу чергу.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Dr,доктор
-apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Котирування отриманих від постачальників.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Dr,доктор
+apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Пропозиції отримані від постачальників
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},Для {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Середній вік
 DocType: Opportunity,Your sales person who will contact the customer in future,"Ваш менеджер з продажу, який зв&#39;яжеться з вами в майбутньому"
 apps/erpnext/erpnext/public/js/setup_wizard.js +261,List a few of your suppliers. They could be organizations or individuals.,Перерахуйте деякі з ваших постачальників. Вони можуть бути організації або окремі особи.
-apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,Показати всі товари
-DocType: Company,Default Currency,Базова валюта
+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 +400,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Увага: Система не перевірятиме overbilling так суми за Пункт {0} {1} дорівнює нулю
+apps/erpnext/erpnext/controllers/accounts_controller.py +403,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/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,і рік:
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +191,{0} {1} must be submitted,{0} {1} повинен бути представлений
-DocType: Email Digest,Annual Expense,Річні витрати
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,{0} {1} must be submitted,{0} {1} повинен бути проведений
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +145,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}"
+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,Оплата рахунку-фактури Примирення
+DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Рахунок-фактура на корегуючу оплату
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +42,Contribution %,Внесок%
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Реєстраційні номери компанії для вашої довідки. Податкові номери і т.д.
 DocType: Sales Partner,Distributor,Дистриб&#39;ютор
-DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Кошик Правило Доставка
+DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Правило доставки для кошику
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +211,Production Order {0} must be cancelled before cancelling this Sales Order,Виробничий замовлення {0} має бути скасований до скасування цього замовлення клієнта
-apps/erpnext/erpnext/public/js/controllers/transaction.js +62,Please set 'Apply Additional Discount On',"Будь ласка, встановіть &quot;Застосувати Додаткова Знижка On &#39;"
-,Ordered Items To Be Billed,Замовлені товари To Be Оголошений
+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 +153,Project Collaboration Invitation,Співпраця Запрошення проекту
 DocType: Salary Slip,Deductions,Відрахування
+DocType: Leave Allocation,LAL/,LAL /
 apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,рік початку
-DocType: Purchase Invoice,Start date of current invoice's period,Дату періоду поточного рахунку-фактури почнемо
+DocType: Purchase Invoice,Start date of current invoice's period,Початкова дата поточного періоду виставлення рахунків
 DocType: Salary Slip,Leave Without Pay,Відпустка без збереження заробітної
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +327,Capacity Planning Error,Планування потужностей Помилка
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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 +362,Finished Item {0} must be entered for Manufacture type entry,Готові товару {0} має бути введений для вступу типу Виробництво
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +367,Finished Item {0} must be entered for Manufacture type entry,Готові товару {0} має бути введений для вступу типу Виробництво
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Відкриття бухгалтерський баланс
-DocType: Sales Invoice Advance,Sales Invoice Advance,Видаткова накладна Попередня
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +499,Nothing to request,Нічого не просити
-apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',"""Дата фактичного початку"" не може бути пізніше, ніж «Дата фактичного завершення"""
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Management,Управління
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},Або дебетова або кредитна сума необхідна для {0}
+DocType: Sales Invoice Advance,Sales Invoice Advance,Передоплата по вихідному рахунку
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +500,Nothing to request,Нічого не просити
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',"""Дата фактичного початку"" не може бути пізніше, ніж ""Дата фактичного завершення"""
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,Управління
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +55,Either debit or credit amount is required for {0},Або дебетова або кредитна сума необхідна для {0}
 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», і код пункт &quot;Футболки&quot;, пункт код варіанта буде &quot;Футболки-СМ&quot;"
+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 +161,Blue,Синій
+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 +181,{0} valid serial nos for Item {1},{0} дійсні серійні номери для позиції {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Код товару не може бути змінена для серійним номером
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +23,POS Profile {0} already created for user: {1} and company {2},POS-профілю {0} вже створена для користувача: {1} і компанія {2}
 DocType: Purchase Order Item,UOM Conversion Factor,Коефіцієнт перетворення Одиниця виміру
 DocType: Stock Settings,Default Item Group,За замовчуванням Об&#39;єкт Група
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1374,Do you really want to submit the invoice?,"Ви дійсно хочете, щоб відправити рахунок-фактуру?"
-apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Постачальник баз даних.
+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 +685,Cost Center For Item with Item Code ',Вартість Center For Пункт із Код товару &quot;
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1526,"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 +679,Cost Center For Item with Item Code ',Вартість Center For Пункт із Код товару &quot;
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1550,"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,"Ваш менеджер з продажу отримаєте нагадування в цей день, щоб зв&#39;язатися з клієнтом"
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,"Further accounts can be made under Groups, but entries can be made against non-Groups","Подальші рахунки можуть бути зроблені відповідно до груп, але Ви можете бути проти НЕ-груп"
-DocType: Lead,Lead,Вести
+DocType: Lead,Lead,Lead
 DocType: Email Digest,Payables,Кредиторська заборгованість
 DocType: Course,Course Intro,курс Введення
 DocType: Account,Warehouse,Склад
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +156,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}: Відхилено Кількість не може бути введений в придбанні Повернутися
-,Purchase Order Items To Be Billed,"Купівля Замовити пунктів, які будуть Оголошений"
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +156,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}: Відхилену к-сть не можна вводити у Повернення постачальнику
+,Purchase Order Items To Be Billed,"Позиції Замовлення на поставку, на які не виставлені рахунки"
 DocType: Purchase Invoice Item,Net Rate,Нетто-ставка
-DocType: Purchase Invoice Item,Purchase Invoice Item,Рахунок покупки пункт
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +57,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Сток Ledger Записи та GL Записи повторно відправив для обраних Купівля розписок
+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: Leave Control Panel,Leave blank if considered for all branches,"Залиште порожнім, якщо розглядати для всіх галузей"
@@ -1083,106 +1097,108 @@
 DocType: Payment Reconciliation,Unreconciled Payment Details,Неузгоджені Деталі оплати
 DocType: Global Defaults,Current Fiscal Year,Поточний фінансовий рік
 DocType: Global Defaults,Disable Rounded Total,Відключити Rounded Всього
-DocType: Lead,Call,Виклик
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +417,'Entries' cannot be empty,&quot;Записи&quot; не може бути порожнім
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +418,'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 +214,Fiscal Year {0} not found,Фінансовий рік {0} не найден
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +221,Fiscal Year {0} not found,Фінансовий рік {0} не найден
 apps/erpnext/erpnext/config/hr.py +238,Setting up Employees,Налаштування Співробітники
-DocType: Sales Order,SO-,ТАК-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,"Будь ласка, виберіть префікс в першу чергу"
+DocType: Sales Order,SO-,ЗМ_ПК-
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Please select prefix first,"Будь ласка, виберіть префікс в першу чергу"
 DocType: Employee,O-,О
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Research,Дослідження
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,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 +43,Item {0} must be a non-stock item,Пункт {0} повинен бути не складської товар
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a non-stock item,Номенклатурна позиція {0} має бути неінвентарною
 DocType: Contact,User ID,ідентифікатор користувача
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +57,View Ledger,Подивитися Леджер
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Найперша
-apps/erpnext/erpnext/stock/doctype/item/item.py +504,"An Item Group exists with same name, please change the item name or rename the item group","Пункт Група існує з таким же ім&#39;ям, будь ласка, змініть ім&#39;я пункту або перейменувати групу товарів"
+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","Пункт Група існує з таким же ім&#39;ям, будь ласка, змініть ім&#39;я пункту або перейменувати групу товарів"
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +437,Rest Of The World,Решта світу
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,Деталь {0} не може мати Batch
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,Позиція {0} не може мати партій
 ,Budget Variance Report,Бюджет Різниця Повідомити
 DocType: Salary Slip,Gross Pay,Повна Платне
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +90,Row {0}: Activity Type is mandatory.,Рядок {0}: Вид діяльності є обов&#39;язковим.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +114,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/public/js/controllers/stock_controller.js +40,Accounting Ledger,Облік книга
+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,Нерозподілений чистий прибуток
 DocType: BOM Item,Item Description,Опис товару
+DocType: Student Sibling,Student Sibling,студент Sibling
 DocType: Purchase Invoice,Is Recurring,Повторюється
-DocType: Purchase Invoice,Supplied Items,"Товари, що поставляються"
+DocType: Purchase Invoice,Supplied Items,Поставлені номенклатурні позиції
 DocType: Student,STUD.,Гвинтове.
-DocType: Production Order,Qty To Manufacture,Кількість для виробництва
-DocType: Buying Settings,Maintain same rate throughout purchase cycle,Підтримувати ж швидкість протягом циклу покупки
-DocType: Opportunity Item,Opportunity Item,Можливість Пункт
+DocType: Production Order,Qty To Manufacture,К-сть для виробництва
+DocType: Email Digest,New Income,нові надходження
+DocType: Buying Settings,Maintain same rate throughout purchase cycle,Підтримувати ціну протягом циклу покупки
+DocType: Opportunity Item,Opportunity Item,Позиція Нагоди
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,Тимчасове відкриття
 ,Employee Leave Balance,Співробітник Залишити Баланс
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +131,Balance for Account {0} must always be {1},Ваги для рахунку {0} повинен бути завжди {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +175,Valuation Rate required for Item in row {0},Оцінка Оцініть необхідний для пункту в рядку {0}
-DocType: Address,Address Type,Адреса Тип
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,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,Відхилено Склад
 DocType: GL Entry,Against Voucher,На ваучері
-DocType: Item,Default Buying Cost Center,За замовчуванням Купівля Центр Вартість
-apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","Щоб отримати найкраще з ERPNext, ми рекомендуємо вам буде потрібно якийсь час і дивитися ці довідки відео."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +87, to ,для
-DocType: Item,Lead Time in days,Час в днях
+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 +76, to ,для
+DocType: Item,Lead Time in days,Час на поставку в днях
 ,Accounts Payable Summary,Кредиторська заборгованість Основна
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Not authorized to edit frozen Account {0},Чи не дозволено редагувати заморожений рахунок {0}
-DocType: Journal Entry,Get Outstanding Invoices,Отримати неоплачених рахунків
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +62,Sales Order {0} is not valid,Продажі Замовити {0} не є допустимим
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},Чи не дозволено редагувати заморожений рахунок {0}
+DocType: Journal Entry,Get Outstanding Invoices,Отримати неоплачені рахунки-фактури
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Замовлення клієнта {0} не є допустимим
 apps/erpnext/erpnext/setup/doctype/company/company.py +185,"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} в Material Request {1} \ не може бути більше необхідної кількості {2} для п {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Small,Невеликий
+							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,Невеликий
 DocType: Employee,Employee Number,Кількість працівників
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Справа Ні (и) вже використовується. Спробуйте зі справи № {0}
 ,Invoiced Amount (Exculsive Tax),Сума за рахунками (Exculsive вартість)
-DocType: Student Applicant,Mother's / Guardian 1 Email ID,Матері / опікуна 1 Email ID
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Пункт 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,Рахунок глава {0} створена
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +160,Green,Зелений
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,Зелений
 DocType: Supplier,SUPP-,SUPP-
-DocType: Item,Auto re-order,Авто повторного замовлення
+DocType: Item,Auto re-order,Авто-дозамовлення
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Всього Виконано
 DocType: Employee,Place of Issue,Місце видачі
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Contract,Контракт
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,Контракт
 DocType: Email Digest,Add Quote,Додати Цитата
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +498,UOM coversion factor required for UOM: {0} in Item: {1},Одиниця виміру фактором Coversion потрібно для UOM: {0} в пункті: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +503,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 +80,Row {0}: Qty is mandatory,Ряд {0}: Кількість обов&#39;язково
+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 +737,Sync Master Data,Синхронізація Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +719,Sync Master Data,Дані майстра синхронізації
 apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,Ваші продукти або послуги
 DocType: Mode of Payment,Mode of Payment,Спосіб платежу
-apps/erpnext/erpnext/stock/doctype/item/item.py +178,Website Image should be a public file or website URL,Сайт зображення повинно бути суспільне файл або адресу веб-сайту
-DocType: Purchase Invoice Item,BOM,BOM
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Це кореневий елемент групи і не можуть бути змінені.
+apps/erpnext/erpnext/stock/doctype/item/item.py +178,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.,Це кореневий елемент групи і не можуть бути змінені.
 DocType: Journal Entry Account,Purchase Order,Замовлення на придбання
-DocType: Warehouse,Warehouse Contact Info,Склад Контактна інформація
+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 +345,"{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 +358,"{0}: Employee email not found, hence email not sent","{0}: Не знайдено електронної пошти співробітника, тому e-mail не відправлено"
+DocType: Address,City/Town,Місто
+DocType: Address,Is Your Company Address,Є адресою Вашої компанії
 DocType: Email Digest,Annual Income,Річний дохід
 DocType: Serial No,Serial No Details,Серійний номер деталі
-DocType: Purchase Invoice Item,Item Tax Rate,Пункт Податкова ставка
+DocType: Purchase Invoice Item,Item Tax Rate,Податкова ставка
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,"For {0}, only credit accounts can be linked against another debit entry","Для {0}, тільки кредитні рахунки можуть бути пов&#39;язані з іншою дебету"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Delivery Note {0} is not submitted,Доставка Примітка {0} не представлено
-apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Sub-contracted Item,Пункт {0} повинен бути субпідрядником товару
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Delivery Note {0} is not submitted,Накладна {0} не проведена
+apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Sub-contracted Item,Позиція {0} має бути субпідрядною
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Капітальні обладнання
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Ціни Правило спочатку вибирається на основі &quot;Застосувати На&quot; поле, яке може бути Пункт, Пункт Група або Марка."
-DocType: Hub Settings,Seller Website,Продавець Сайт
+DocType: Hub Settings,Seller Website,Веб-сайт продавця
 DocType: Item,ITEM-,item-
-apps/erpnext/erpnext/controllers/selling_controller.py +147,Total allocated percentage for sales team should be 100,Всього виділено відсоток для відділу продажів повинна бути 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +110,Production Order status is {0},Статус виробничого замовлення {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Всього виділено відсоток для відділу продажів повинна бути 100
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Статус виробничого замовлення {0}
 DocType: Appraisal Goal,Goal,Мета
 DocType: Sales Invoice Item,Edit Description,Редагувати опис
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +757,For Supplier,Для Постачальника
-DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Установка Тип аккаунта допомагає у виборі цього рахунок в угодах.
-DocType: Purchase Invoice,Grand Total (Company Currency),Загальний підсумок (Компанія валют)
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +723,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,Всього Вихідні
@@ -1190,17 +1206,18 @@
 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.,Дитячий склад існує для цього складу. Ви не можете видалити цей склад.
-DocType: Item,Website Item Groups,Сайт Групи товарів
+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 +176,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,Ім&#39;я робочої станції
+DocType: Workstation,Workstation Name,Назва робочої станції
+DocType: Grade Interval,Grade Code,код Оцінка
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Електронна пошта Дайджест:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +445,BOM {0} does not belong to Item {1},Специфікація {0} не належить до пункту {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +445,BOM {0} does not belong to Item {1},НВ {0} не належить до позиції {1}
 DocType: Sales Partner,Target Distribution,Цільова поширення
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1667,Deafault warehouse is required for selected item,Deafault склад потрібно для обраного елемента
-DocType: Salary Slip,Bank Account No.,Банк № рахунку
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Deafault warehouse is required for selected item,Deafault склад потрібно для обраного елемента
+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,Агент
@@ -1208,35 +1225,35 @@
 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 +110,Hardware,Апаратний
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,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 +48,Privilege Leave,Привілейований Залишити
-DocType: Purchase Invoice,Supplier Invoice Date,Постачальник Рахунок Дата
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,Привілейований Залишити
+DocType: Purchase Invoice,Supplier Invoice Date,Дата рахунку постачальника
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Вам необхідно включити Кошик
 DocType: Payment Entry,Writeoff,списання
 DocType: Appraisal Template Goal,Appraisal Template Goal,Оцінка шаблону Мета
-DocType: Salary Slip,Earning,Заробіток
+DocType: Salary Component,Earning,Заробіток
 DocType: Purchase Invoice,Party Account Currency,Партія Валюта рахунку
-,BOM Browser,Специфікація браузер
+,BOM 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 +171,Against Journal Entry {0} is already adjusted against some other voucher,Проти журналі запис {0} вже налаштований щодо деяких інших ваучер
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,Проти журналі запис {0} вже налаштований щодо деяких інших ваучер
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Загальна вартість замовлення
-apps/erpnext/erpnext/demo/setup_data.py +358,Food,Їжа
+apps/erpnext/erpnext/demo/setup/setup_data.py +301,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/course_schedule/course_schedule.js +103,Mark Attendence,Марк Attendence
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Валюта закритті рахунку повинні бути {0}
-apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Сума балів за всі цілі повинні бути 100. Це {0}
+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,"Поставляється пунктів, які будуть Оголошений"
+,Delivered Items To Be Billed,"Поставлені товари, на які не виставлені рахунки"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Склад не може бути змінений для серійним номером
 DocType: Authorization Rule,Average Discount,Середня Знижка
 DocType: Purchase Invoice Item,UOM,UOM
 DocType: Address,Utilities,Комунальні послуги
-DocType: Purchase Invoice Item,Accounting,Облік
+DocType: Purchase Invoice Item,Accounting,Бухгалтерський облік
 DocType: Employee,EMP/,EMP /
 DocType: Asset,Depreciation Schedules,амортизаційні Розклади
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,Application period cannot be outside leave allocation period,Термін подачі заяв не може бути період розподілу межами відпустку
@@ -1246,7 +1263,7 @@
 DocType: Production Order Operation,Operation Description,Операція Опис
 DocType: Item,Will also apply to variants,Буде також застосовуватися до варіантів
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Неможливо змінити фінансовий рік Дата початку і фінансовий рік Дата закінчення колись фінансовий рік зберігається.
-DocType: Quotation,Shopping Cart,Магазинний візок
+DocType: Quotation,Shopping Cart,Магазинний кошик
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Середнє Щодня Вихідні
 DocType: POS Profile,Campaign,Кампанія
 DocType: Supplier,Name and Type,Найменування і тип
@@ -1256,40 +1273,39 @@
 DocType: Scheduling Tool,Course End Date,Курс Дата закінчення
 DocType: Holiday List,Holidays,Канікули
 DocType: Sales Order Item,Planned Quantity,Плановані Кількість
-DocType: Purchase Invoice Item,Item Tax Amount,Пункт Сума податку
-DocType: Item,Maintain Stock,Підтримання складі
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +209,Stock Entries already created for Production Order ,Сток Записи вже створені для виробничого замовлення
+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,Чиста зміна в основних фондів
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Залиште порожнім, якщо вважати всіх позначень"
-apps/erpnext/erpnext/controllers/accounts_controller.py +620,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Нарахування типу &quot;Актуальні &#39;в рядку {0} не можуть бути включені в п Оцінити
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,Max: {0},Макс: {0}
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +15,From Datetime,З DateTime
+apps/erpnext/erpnext/controllers/accounts_controller.py +623,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 +239,Max: {0},Макс: {0}
+apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,З DateTime
 DocType: Email Digest,For Company,За компанію
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Журнал з&#39;єднань.
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +153,"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,Купівля Сума
-DocType: Sales Invoice,Shipping Address Name,Адреса доставки Ім&#39;я
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +153,"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,Сума купівлі
+DocType: Sales Invoice,Shipping Address Name,Ім'я адреси доставки
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,План рахунків
-DocType: Material Request,Terms and Conditions Content,Умови Вміст
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +552,cannot be greater than 100,не може бути більше ніж 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +680,Item {0} is not a stock Item,Пункт {0} не є акціонерним товару
+DocType: Material Request,Terms and Conditions Content,Зміст положень та умов
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +546,cannot be greater than 100,не може бути більше ніж 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is not a stock Item,Номенклатурна позиція {0} не є інвентарною
 DocType: Maintenance Visit,Unscheduled,Позапланові
 DocType: Employee,Owned,Бувший
 DocType: Salary Detail,Depends on Leave Without Pay,Залежить у відпустці без
 DocType: Pricing Rule,"Higher the number, higher the priority","Чим вище число, тим вище пріоритет"
-,Purchase Invoice Trends,Рахунок покупки тенденції
-DocType: Employee,Better Prospects,Хороші перспективи
+,Purchase Invoice Trends,Тренди вхідних рахунків
+DocType: Employee,Better Prospects,Кращі перспективи
 DocType: Appraisal,Goals,Мети
-DocType: Warranty Claim,Warranty / AMC Status,Гарантія / КУА Статус
-,Accounts Browser,Дебіторська браузер
+DocType: Warranty Claim,Warranty / AMC Status,Гарантія / Статус річного обслуговування
+,Accounts Browser,Переглядач рахунків
 DocType: Payment Entry Reference,Payment Entry Reference,Оплата запис Посилання
 DocType: GL Entry,GL Entry,GL запис
 DocType: HR Settings,Employee Settings,Налаштування співробітників
-,Batch-Wise Balance History,Пакетна Мудрий Баланс Історія
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Список справ
+,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 +61,Apprentice,Учень
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +102,Negative Quantity is not allowed,Негативний Кількість не допускається
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,Учень
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +103,Negative Quantity is not allowed,Негативний Кількість не допускається
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",Податковий деталь стіл вуха від майстра пункт у вигляді рядка і зберігаються в цій галузі. Використовується з податків і зборів
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +152,Employee cannot report to himself.,Співробітник не може повідомити собі.
@@ -1300,35 +1316,34 @@
 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,Ми купуємо цей пункт
+apps/erpnext/erpnext/public/js/setup_wizard.js +302,We buy this Item,Ми купуємо цей товар
 DocType: Address,Billing,Біллінг
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Всього Податки і збори (Компанія) Валюта
-DocType: Shipping Rule,Shipping Account,Доставка рахунки
+DocType: Shipping Rule,Shipping Account,Рахунок доставки
 DocType: Quality Inspection,Readings,Показання
 DocType: Stock Entry,Total Additional Costs,Всього Додаткові витрати
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Sub Assemblies,Sub Асамблей
+apps/erpnext/erpnext/public/js/setup_wizard.js +295,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 +141,Source warehouse is mandatory for row {0},Джерело склад є обов&#39;язковим для ряду {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +719,Packing Slip,Пакувальний лист
+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 +713,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/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,"Запит котирувань може бути доступ, натиснувши посилання"
+apps/erpnext/erpnext/config/setup.py +105,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 +81,Analyst,Аналітик
+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,Аналітик
 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: Opportunity,With Items,З номенклатурними позиціями
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,у к-сті
 DocType: Notification Control,Expense Claim Rejected,Витрати Заявити Відхилено
 DocType: Item Attribute,Item Attribute,Пункт Атрибут
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +103,Government,Уряд
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,Уряд
 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 +289,Item Variants,Варіанти номенклатурної позиції
 DocType: Company,Services,Послуги
 DocType: HR Settings,Email Salary Slip to Employee,E-mail Зарплата ковзанню працівнику
 DocType: Cost Center,Parent Cost Center,Батько Центр Вартість
@@ -1342,39 +1357,40 @@
 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/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,Потік грошових коштів від інвестиційної
 DocType: Program Course,Program Course,програма курсу
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +97,Freight and Forwarding Charges,Вантажні та експедиторські Збори
-DocType: Homepage,Company Tagline for website homepage,Компанія Слоган на головну сторінку сайту
+DocType: Homepage,Company Tagline for website homepage,Гасло компанії для головної сторінки веб-сайту
 DocType: Item Group,Item Group Name,Назва товару Група
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Взятий
 DocType: 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/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,Специфікація Деталь Немає
+DocType: Purchase Order Item Supplied,BOM Detail No,Номер деталі у нормах
 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: Sales Invoice Item,Available Batch Qty at Warehouse,Доступні Пакетна Кількість на складі
+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,Дебіторська заборгованість Основна
+,Accounts Receivable Summary,Зведена дебіторська заборгованість
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +185,Please set User ID field in an Employee record to set Employee Role,"Будь ласка, встановіть ID користувача поле в записі 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,Внесок Сума
 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: 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 +195,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: 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 +36,The Organization,Організація
@@ -1382,88 +1398,86 @@
 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 Цільова
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +110,Accounting Entry for {0} can only be made in currency: {1},Облік Вхід для {0} можуть бути зроблені тільки у валюті: {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Облік Вхід для {0} можуть бути зроблені тільки у валюті: {1}
 DocType: Pricing Rule,Pricing Rule,Ціни Правило
 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 +202,Material Request to Purchase Order,Замовлення матеріалів у Замовлення на поставку
 DocType: Shopping Cart Settings,Payment Success URL,Успіх Оплата URL
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +78,Row # {0}: Returned Item {1} does not exists in {2} {3},Ряд # {0}: повернутий деталь {1} не існує в {2} {3}
+apps/erpnext/erpnext/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,Ведучий Ім&#39;я
+,Bank Reconciliation Statement,Банківска виписка
+DocType: Address,Lead Name,Назва Lead-а
 ,POS,POS-
 DocType: C-Form,III,III
-apps/erpnext/erpnext/config/stock.py +294,Opening Stock Balance,Відкриття акції Залишок
+apps/erpnext/erpnext/config/stock.py +294,Opening Stock Balance,Залишок на початок роботи
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +51,{0} must appear only once,{0} повинен з'явитися лише один раз
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +339,Not allowed to tranfer more {0} than {1} against Purchase Order {2},"Чи не дозволяється Tranfer більш {0}, ніж {1} проти Замовлення {2}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +344,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 +545,Manufacturing Quantity is mandatory,Виробництво Кількість є обов&#39;язковим
-DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Якщо цей прапорець встановлений, головна сторінка буде за замовчуванням Item Group для веб-сайті"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,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 +71,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 +162,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,Сток зобов&#39;язання
-DocType: Purchase Invoice,Supplier Warehouse,Постачальник Склад
+DocType: Company,Default Holiday List,Список вихідних за замовчуванням
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +186,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,Зобов'язання по запасах
+DocType: Purchase Invoice,Supplier Warehouse,Склад постачальника
 DocType: Opportunity,Contact Mobile No,Зв&#39;язатися з мобільних Немає
-,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 +130,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Наступного дня (с), на якій ви подаєте заяву на відпустку свята. Вам не потрібно звернутися за дозволом."
+,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 +137,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,інші звіти
 DocType: Dependent Task,Dependent Task,Залежить Завдання
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Будь ласка, встановіть співробітників система імен в людських ресурсів&gt; HR Налаштування"
 apps/erpnext/erpnext/stock/doctype/item/item.py +411,Conversion factor for default Unit of Measure must be 1 in row {0},Коефіцієнт для замовчуванням Одиниця виміру повинні бути 1 в рядку {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,Leave of type {0} cannot be longer than {1},"Залишити типу {0} не може бути більше, ніж {1}"
-DocType: Manufacturing Settings,Try planning operations for X days in advance.,Спробуйте плануванні операцій для X днів.
-DocType: HR Settings,Stop Birthday Reminders,Стоп народження Нагадування
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +197,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 +921,Search Item,Пошук товару
+apps/erpnext/erpnext/accounts/page/pos/pos.js +910,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 +546,Already completed,уже завершено
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +22,Payment Request already exists {0},Оплата Запит вже існує {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +550,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 +241,Quantity must not be more than {0},"Кількість не повинна бути більше, ніж {0}"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Quantity must not be more than {0},"Кількість не повинна бути більше, ніж {0}"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +76,Previous Financial Year is not closed,Попередній фінансовий рік не закрите
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +44,Age (Days),Вік (днів)
-DocType: Quotation Item,Quotation Item,Цитата товару
+DocType: Quotation Item,Quotation Item,Позиція у пропозиції
 DocType: Account,Account Name,Ім&#39;я рахунку
 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/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Серійний номер {0} кількість {1} не може бути дробною
+apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,головний Тип постачальника
+DocType: Purchase Order Item,Supplier Part Number,Номер деталі постачальника
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +98,Conversion rate cannot be 0 or 1,Коефіцієнт конверсії не може бути 0 або 1
 DocType: Sales Invoice,Reference Document,довідковий документ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +185,{0} {1} is cancelled or stopped,{0} {1} скасовано або припинено
 DocType: Accounts Settings,Credit Controller,Кредитна контролер
 DocType: Delivery Note,Vehicle Dispatch Date,Відправка транспортного засобу Дата
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +221,Purchase Receipt {0} is not submitted,Купівля Отримання {0} не представлено
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +221,Purchase Receipt {0} is not submitted,Прихідна накладна {0} не проведена
 DocType: Company,Default Payable Account,За замовчуванням оплачується аккаунт
-apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Налаштування для онлайн Корзину, такі як правилами перевезень, прайс-лист і т.д."
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +83,{0}% Billed,{0}% Оплачено
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Кількість захищені
+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 +116,Human Resources,Кадри
 DocType: Lead,Upper Income,Верхня прибуток
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +10,Reject,відхиляти
 DocType: Journal Entry Account,Debit in Company Currency,Дебет у валюті компанії
-DocType: BOM Item,BOM Item,Специфікація товару
+DocType: BOM Item,BOM Item,позиція НВ
 DocType: Appraisal,For Employee,Для працівника
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Row {0}: Advance against Supplier must be debit,Ряд {0}: Попередня проти Постачальника повинні бути дебет
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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 +22,Collect,збирати
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,Against Supplier Invoice {0} dated {1},На Постачальником рахунку-фактури {0} від {1}
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,збирати
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,Against Supplier Invoice {0} dated {1},Згідно вхідного рахунку-фактури {0} від {1}
 DocType: Customer,Default Price List,За замовчуванням Ціни
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +225,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: Payment Reconciliation,Payments,Платежі
+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: Journal Entry,Entry Type,Тип запису
 ,Customer Credit Balance,Замовник Кредитний Баланс
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Payable,Чиста зміна кредиторської заборгованості
@@ -1475,24 +1489,24 @@
 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 +9,Procurement,закупівель
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,Жоден з пунктів не мають яких-небудь змін в кількості або вартості.
+apps/erpnext/erpnext/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,Претензія по гарантії
-,Lead Details,Провідні Детальніше
-DocType: Purchase Invoice,End date of current invoice's period,Дата закінчення періоду поточного рахунку-фактури в
+,Lead Details,Деталі Lead-а
+DocType: Purchase Invoice,End date of current invoice's period,Кінцева дата періоду виставлення рахунків
 DocType: Pricing Rule,Applicable For,Стосується для
 DocType: Bank Reconciliation,From Date,З дати
-DocType: Shipping Rule Country,Shipping Rule Country,Правило Доставка Країна
+DocType: Shipping Rule Country,Shipping Rule Country,Країна правил доставки
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +9,Leave and Attendance,Залишити і відвідуваність
 DocType: Maintenance Visit,Partially Completed,Частково Завершено
 DocType: Leave Type,Include holidays within leaves as leaves,Включити свята в листках як листя
 DocType: Sales Invoice,Packed Items,Упаковані товари
 apps/erpnext/erpnext/config/support.py +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","Замініть особливе специфікації у всіх інших специфікацій, де він використовується. Він замінить стару посилання специфікації, оновити і відновити вартість &quot;специфікації Вибух Item&quot; таблицю на новій специфікації"
+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","Замінити певну НВ у всіх інших НВ, де вона використовується. Це замінить старе посиланняна НВ, оновить вартості і заново створить ""елемент розбірки"" таблицю як для нової НВ"
 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 +233,"Advance paid against {0} {1} cannot be greater \
-						than Grand Total {2}","Advance платний проти {0} {1} не може бути більше \, ніж загальний підсумок {2}"
+						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,Регіональний менеджер
 DocType: Packed Item,To Warehouse (Optional),На склад (Необов&#39;язково)
@@ -1500,20 +1514,20 @@
 DocType: Purchase Invoice,Additional Discount,Додаткова знижка
 DocType: Selling Settings,Selling Settings,Продаж Налаштування
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Інтернет Аукціони
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +97,Please specify either Quantity or Valuation Rate or both,"Будь ласка, сформулюйте або кількість чи оцінка, експертиза Оцінити або обидва"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,"Будь ласка, зазначте кількість або собівартість або разом"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +13,Fulfillment,звершення
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Компанія, місяць і фінансовий рік є обов&#39;язковим"
 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; занадто"
-DocType: Stock Entry Detail,Material Request used to make this Stock Entry,"Матеріал Запит використовується, щоб зробити цей запис зі"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +66,Next Depreciation Date is mandatory for new asset,Наступний Знос Дата є обов&#39;язковим для нового активу
+apps/erpnext/erpnext/stock/doctype/item/item.js +232,"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 +66,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 Fee Collection
-DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Зробіть обліку запис для кожного руху запасів
+DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Робити бух. проводку для кожного руху запасів
 DocType: Leave Allocation,Total Leaves Allocated,Всього Листя номером
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +154,Warehouse required at Row No {0},Склад требуется в рядку Немає {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +154,Warehouse required at Row No {0},Потрібно вказати склад у рядку № {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +78,Please enter valid Financial Year Start and End Dates,"Будь ласка, введіть дійсний фінансовий рік дати початку і закінчення"
 DocType: Employee,Date Of Retirement,Дата вибуття
 DocType: Upload Attendance,Get Template,Отримати шаблон
@@ -1521,99 +1535,99 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,Налаштування ERPNext завершена!
 DocType: Item,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +93,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Група клієнтів з таким ім'ям вже існує. Будь ласка, змініть Ім'я клієнта або перейменуйте Групу клієнтів"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +126,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Група клієнтів з таким ім'ям вже існує. Будь ласка, змініть Ім'я клієнта або перейменуйте Групу клієнтів"
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Новий контакт
 DocType: Territory,Parent Territory,Батько Територія
 DocType: Quality Inspection Reading,Reading 2,Читання 2
 DocType: Stock Entry,Material Receipt,Матеріал Надходження
-DocType: Homepage,Products,Продукти
+DocType: Homepage,Products,Продукція
 DocType: Announcement,Instructor,інструктор
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},Партія Тип і партія необхідна для / дебіторська заборгованість рахунок {0}
 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 +223,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/stock/doctype/warehouse/warehouse.py +110,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: 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 +704,Offline,Offline
+apps/erpnext/erpnext/accounts/page/pos/pos.js +686,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,вимагається
 DocType: Job Applicant,Applicant for a Job,Претендент на роботу
-DocType: Production Plan Material Request,Production Plan Material Request,Виробництво План Матеріал Запит
+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,Пакетна Немає
-DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Дозволити кілька замовлень на продаж від Замовлення Клієнта
+DocType: Purchase Invoice Item,Batch No,Партія №
+DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Дозволити кілька замовлень клієнта на один оригінал замовлення клієнта
 apps/erpnext/erpnext/setup/doctype/company/company.py +164,Main,Головна
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Variant,Варіант
 DocType: 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 +425,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,Можливість поле Від обов&#39;язкове
+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 +858,Make Purchase Order,Зробити замовлення на
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +852,Make Purchase Order,Зробити замовлення на
 DocType: SMS Center,Send To,Відправити
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,There is not enough leave balance for Leave Type {0},Існує не вистачає відпустку баланс Залиште Тип {0}
-DocType: Payment Reconciliation Payment,Allocated amount,Асигнувати сума
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,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,Клієнтам Код товара
-DocType: Stock Reconciliation,Stock Reconciliation,Фото Примирення
+DocType: Stock Reconciliation,Stock Reconciliation,Інвентаризація
 DocType: Territory,Territory Name,Територія Ім&#39;я
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +172,Work-in-Progress Warehouse is required before Submit,Робота-в-Прогрес Склад потрібно перед Розмістити
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,Work-in-Progress Warehouse is required before Submit,"Склад ""в роботі"" необхідний щоб провести"
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Претендент на роботу.
 DocType: Purchase Order Item,Warehouse and Reference,Склад і довідники
-DocType: Supplier,Statutory info and other general information about your Supplier,Статутний інформація і інша загальна інформація про вашу Постачальника
-apps/erpnext/erpnext/hooks.py +88,Addresses,Адреси
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Постачальник&gt; Постачальник Тип
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +212,Against Journal Entry {0} does not have any unmatched {1} entry,"Проти журналі запис {0} не має ніякого неперевершену {1}, запис"
+DocType: Supplier,Statutory info and other general information about your Supplier,Статутний інформація і інша загальна інформація про вашого постачальника
+apps/erpnext/erpnext/hooks.py +95,Addresses,Адреси
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +215,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,"Будь ласка, встановіть фільтр, заснований на пункті або на складі"
 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 +442,BOM {0} must be submitted,Специфікація {0} повинен бути представлений
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,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 +731,Payment,Оплата
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Замовлення матеріалів на максимум {0} можуть бути зроблено для позиції {1} за Замовленням клієнта {2}
 DocType: Employee,Salutation,Привітання
-DocType: Pricing Rule,Brand,Марка
 DocType: Course,Course Abbreviation,Абревіатура для гольфу
 DocType: Item,Will also apply for variants,Буде також застосовуватися для варіантів
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +142,"Asset cannot be cancelled, as it is already {0}","Asset не може бути скасована, так як вона вже {0}"
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},"Всього тривалість робочого часу не повинна бути більше, ніж максимальний робочий час {0}"
-apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Bundle пунктів на момент продажу.
-DocType: Quotation Item,Actual Qty,Фактична Кількість
+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, Одиниця виміру та інших властивостей, коли ви починаєте."
 DocType: Hub Settings,Hub Node,Вузол концентратор
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Ви ввели повторювані елементи. Ласка, виправити і спробувати ще раз."
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Associate,Асоціювати
+apps/erpnext/erpnext/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,Асоціювати
 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: Packing Slip,To Package No.,Для пакету №
-DocType: Production Planning Tool,Material Requests,матеріал просить
+DocType: Production Planning Tool,Material Requests,Замовлення матеріалів
 DocType: Warranty Claim,Issue Date,Дата випуску
 DocType: Activity Cost,Activity Cost,Вартість активність
-DocType: Timesheet Detail,Timesheet Detail,Timesheet Деталь
-DocType: Purchase Receipt Item Supplied,Consumed Qty,Споживана Кількість
+DocType: Sales Invoice Timesheet,Timesheet Detail,Timesheet Деталь
+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 +134,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Можете звернутися рядок, тільки якщо тип заряду &quot;На Попередня Сума Row» або «Попередня Row Усього&quot;"
@@ -1623,95 +1637,97 @@
 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}"
-DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Отримати товари від покупки розписок
+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} з&#39;являється кілька разів в Прейскуранті {1}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Продаж повинні бути перевірені, якщо вибраний Стосується для в {0}"
-DocType: Production Plan Material Request,Material Request Date,Матеріал Дата замовлення
-DocType: Purchase Order Item,Supplier Quotation Item,Постачальник цитати товару
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"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,Має Варіанти
 DocType: Monthly Distribution,Name of the Monthly Distribution,Назва щомісячний розподіл
 DocType: Sales Person,Parent Sales Person,Людина Батько продажів
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,"Будь ласка, сформулюйте замовчуванням Валюта в компанії Майстер і загальні налаштування за замовчуванням"
-DocType: Purchase Invoice,Recurring Invoice,Повторювані рахунки
+DocType: Purchase Invoice,Recurring Invoice,Періодичний рахунок
 apps/erpnext/erpnext/config/learn.py +268,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.,Fixed Asset Деталь повинен бути нескладіруемих елемент.
+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 +44,"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/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.,"За словами будуть видні, як тільки ви збережете рахунок-фактуру."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +502,Error: {0} &gt; {1},Помилка: {0}&gt; {1}
-DocType: Item,Is Sales Item,Є продаж товару
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Пункт Група Дерево
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Рядок {0}: Розподілена сума {1} повинна бути менше або дорівнювати сумі до оплати у рахунку {2}
+DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,"""Словами"" будє видно, коли ви збережете рахунок-фактуру."
+DocType: Item,Is Sales Item,Продаєм цей товар
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Дерево Групи Об’єктів
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Пункт {0} не налаштований на послідовний пп. Перевірити майстра предмета
 DocType: Maintenance Visit,Maintenance Time,Технічне обслуговування Час
 ,Amount to Deliver,Сума Поставте
 apps/erpnext/erpnext/public/js/setup_wizard.js +292,A Product or Service,Продукт або послуга
+apps/erpnext/erpnext/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;язаний (навчальний рік {}). Будь ласка, виправте дату і спробуйте ще раз."
 DocType: Naming Series,Current Value,Поточна вартість
-apps/erpnext/erpnext/controllers/accounts_controller.py +235,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"Кілька фінансових років існують на дату {0}. Будь ласка, встановіть компанію в фінансовий рік"
+apps/erpnext/erpnext/controllers/accounts_controller.py +238,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,Серійний номер Статус
+,Serial No Status,Статус Серійниого номеру
 DocType: Payment Entry Reference,Outstanding,видатний
 ,Daily Timesheet Summary,Щодня Timesheet Резюме
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +458,Item table can not be blank,Пункт таблиця не може бути порожнім
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +443,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 +5,This is based on stock movement. See {0} for details,Це засновано на фондовому русі. Див {0} для отримання більш докладної
+apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +5,This is based on stock movement. See {0} for details,Базується на складському русі. Див {0} для отримання більш докладної інформації
 DocType: Pricing Rule,Selling,Продаж
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +341,Amount {0} {1} deducted against {2},Сума {0} {1} відняті {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +344,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,"Завдяки Дата не може бути, перш ніж відправляти Реєстрація"
-DocType: Website Item Group,Website Item Group,Сайт групи товарів
+DocType: Website Item Group,Website Item Group,Група об’єктів веб-сайту
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +147,Duties and Taxes,Мита і податки
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,Please enter Reference date,"Будь ласка, введіть дату 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,Поставляється Кількість
-DocType: Purchase Order Item,Material Request Item,Матеріал Запит товару
+DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Таблиця для об’єкту, що буде показаний на веб-сайті"
+DocType: Purchase Order Item Supplied,Supplied Qty,Поставлена к-сть
+DocType: Purchase Order Item,Material Request Item,Позиція Замовлення матеріалів
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Дерево товарні групи.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +144,Cannot refer row number greater than or equal to current row number for this Charge type,"Не можете звернутися номер рядка, перевищує або рівну поточної номер рядка для цього типу заряду"
 DocType: Asset,Sold,проданий
 ,Item-wise Purchase History,Пункт мудрий Історія покупок
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Red,Червоний
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Будь ласка, натисніть на кнопку &quot;Generate&quot; Розклад принести Серійний номер доданий для Пункт {0}"
+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;Generate&quot; Розклад принести Серійний номер доданий для Пункт {0}"
 DocType: Account,Frozen,Заморожені
 ,Open Production Orders,Відкриті Виробничі замовлення
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Базова сума (Компанія Валюта)
 DocType: Payment Reconciliation Payment,Reference Row,посилання Row
 DocType: Installation Note,Installation Time,Установка часу
-DocType: Sales Invoice,Accounting Details,Облік Детальніше
+DocType: Sales Invoice,Accounting Details,Бухгалтеський облік. Детальніше
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,Видалити всі транзакції цієї компанії
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +187,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,"Ряд # {0}: Операція {1} не завершені {2} Кількість готової продукції у виробництві Наказ № {3}. Будь ласка, поновіть статус роботи за допомогою журналів Time"
+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"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,Інвестиції
 DocType: Issue,Resolution Details,Дозвіл Подробиці
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,асигнування
 DocType: Quality Inspection Reading,Acceptance Criteria,Критерії приймання
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,"Будь ласка, введіть Матеріал запитів в наведеній вище таблиці"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,"Будь ласка, введіть Замовлення матеріалів у наведену вище таблицю"
 DocType: Item Attribute,Attribute Name,Ім&#39;я атрибута
-DocType: Item Group,Show In Website,Показати на веб-сайті
+DocType: Item Group,Show In Website,Показувати на веб-сайті
 apps/erpnext/erpnext/public/js/setup_wizard.js +293,Group,Група
 DocType: Task,Expected Time (in hours),Очікуваний час (в годинах)
 DocType: Item Reorder,Check in (group),Заїзд (група)
-,Qty to Order,Кількість для замовлення
+,Qty to Order,К-сть для замовлення
 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,Тип маржа
 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: C-Form Invoice Detail,Invoice No,Номер рахунку-фактури
 DocType: Room,Room Name,номер Найменування
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Залиште не можуть бути застосовані / скасовані, перш ніж {0}, а відпустку баланс вже переносу направляються в майбутньому записи розподілу відпустки {1}"
-DocType: Activity Cost,Costing Rate,Калькуляція Оцінити
-,Customer Addresses And Contacts,Адреси та контакти з клієнтами
+DocType: Activity Cost,Costing Rate,Кошторисна вартість
+,Customer Addresses And Contacts,Адреси та контакти клієнта
 DocType: Discussion,Discussion,обговорення
 DocType: Payment Entry,Transaction ID,ID транзакції
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory feild - Academic Year,Обов&#39;язковий Фейлд - Академічний рік
@@ -1724,133 +1740,139 @@
 DocType: Asset,Depreciation Schedule,амортизація Розклад
 DocType: Bank Reconciliation Detail,Against Account,Проти Рахунок
 DocType: Maintenance Schedule Detail,Actual Date,Фактична дата
-DocType: Item,Has Batch No,Має Пакетне Немає
+DocType: Item,Has Batch No,Має номер партії
+apps/erpnext/erpnext/public/js/utils.js +114,Annual Billing: {0},Річний Billing: {0}
 DocType: Delivery Note,Excise Page Number,Акцизний Номер сторінки
 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,Котирування Тенденції
+,Quotation Trends,Тренд пропозицій
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},Пункт Група не згадується у майстри пункт за пунктом {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +295,Debit To account must be a Receivable account,Дебетом рахунка повинні бути заборгованість рахунок
-DocType: Shipping Rule Condition,Shipping Amount,Доставка Сума
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Receivable account,Дебетом рахунка повинні бути заборгованість рахунок
+DocType: Shipping Rule Condition,Shipping Amount,Сума доставки
 ,Pending Amount,До Сума
 DocType: Purchase Invoice Item,Conversion Factor,Коефіцієнт перетворення
 DocType: Purchase Order,Delivered,Поставляється
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +137,Expected value after useful life must be greater than or equal to {0},"Очікуване значення після того, як строк корисного використання повинно бути більше або дорівнює {0}"
 DocType: Purchase Receipt,Vehicle Number,Кількість транспортних засобів
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Дата, на яку повторюваних рахунок буде зупинити"
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +90,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,"Всього виділені листя {0} не може бути менше, ніж вже затверджених листя {1} за період"
+DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Дата, на яку періодичний рахунок перестане створюватись"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +93,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 +22,Enter Paid Amount,Введіть сплаченої суми
+,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: 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
 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 +524,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Рядок # {0}: Кількість повинно бути 1, а елемент є фіксованим активом. Будь ласка, використовуйте окремий рядок для декількох Упак."
+apps/erpnext/erpnext/controllers/accounts_controller.py +527,"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 +249,Abbr can not be blank or space,Абревіатура не може бути порожнім або простір
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,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/stock/get_item_details.py +123,Please specify Company,"Будь ласка, сформулюйте компанії"
 ,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/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 +183,Closing (Opening + Totals),Закриття (відкриття + Итоги)
+,BOM Search,Пошук норм
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),Закриття (відкриття + Итоги)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,"Будь ласка, сформулюйте валюту в Компанії"
 DocType: Workstation,Wages per hour,Заробітна плата на годину
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +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/controllers/accounts_controller.py +272,Account {0} is invalid. Account Currency must be {1},Рахунок {0} є неприпустимим. Валюта рахунку повинні бути {1}
+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,Наступне Замовлення матеріалів буде створено автоматично згідно рівня дозамовлення для даної позиції
+DocType: Email Digest,Pending Sales Orders,В очікуванні замовлень на продаж
+apps/erpnext/erpnext/controllers/accounts_controller.py +275,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 +956,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Рядок # {0}: Посилання Тип документа повинен бути одним із замовлення клієнта, рахунок-фактура або продажу журнал Вхід"
-DocType: Salary Slip,Deduction,Відрахування
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +87,Row {0}: From Time and To Time is mandatory.,Рядок {0}: Від часу і часу є обов&#39;язковим.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +969,"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 +111,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 +262,Item Price added for {0} in Price List {1},Ціна товару додається для {0} в Прейскуранті {1}
-DocType: Address Template,Address Template,Адреса шаблону
+DocType: Address Template,Address Template,Шаблон адреси
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +7,Please enter Employee Id of this sales person,"Будь ласка, введіть Employee Id цього менеджера з продажу"
 DocType: Territory,Classification of Customers by region,Класифікація клієнтів по регіонах
 DocType: Project,% Tasks Completed,"Завдання, які вирішуються%"
 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 +194,Please enter Production Item first,"Будь ласка, введіть Продукція перший пункт"
+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,відключений користувач
-apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Цитата
+apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Пропозиція
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Всього Відрахування
 DocType: Maintenance Visit,Maintenance User,Технічне обслуговування Користувач
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +149,Cost Updated,Вартість Оновлене
 DocType: Employee,Date of Birth,Дата народження
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +86,Item {0} has already been returned,Пункт {0} вже повернулися
+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,Замовник / Провідний Адреса
+DocType: Opportunity,Customer / Lead Address,Адреса Клієнта /  Lead-а
 apps/erpnext/erpnext/stock/doctype/item/item.py +208,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 +177,Job Description,Описання роботи
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,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 +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Спеціальні символи, крім &quot;-&quot; &quot;.&quot;, &quot;#&quot;, і &quot;/&quot; не допускається в серію імен"
-DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Слідкуйте продажів кампаній. Слідкуйте за проводами, цитати, Продажі замовлення і т.д. з кампаній, щоб оцінити повернення інвестицій."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +24,Welcome to POS: Create your POS Profile,Ласкаво просимо на POS: Створити свій POS профілю
+DocType: Purchase Order Item,Qty as per Stock UOM,Кількість у складській од.вим.
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Спеціальні символи, крім ""-"" ""."", ""#"", і ""/"" не допускаються у назві серій"
+DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Слідкуйте за кампаніями продаж. Слідкуйте за лідами, пропозиціями, замовленнями покупців і т.д. з кампаній, щоб оцінити повернення інвестицій."
 DocType: Expense Claim,Approver,Затверджуючий
-,SO Qty,ТАК Кількість
+,SO Qty,ЗМ_ПК к-сть
+DocType: Guardian,Work Address,Адреса місця роботи
 DocType: Appraisal,Calculate Total Score,Розрахувати загальну кількість балів
 DocType: Request for Quotation,Manufacturing Manager,Виробництво менеджер
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Серійний номер {0} знаходиться на гарантії Шифрування до {1}
-apps/erpnext/erpnext/config/stock.py +153,Split Delivery Note into packages.,Спліт накладної в пакети.
-apps/erpnext/erpnext/hooks.py +74,Shipments,Поставки
-DocType: Payment Entry,Total Allocated Amount (Company Currency),Загальна Виділена сума (Компанія Валюта)
+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 +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 +153,Row # ,Ряд #
+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 +156,Get From,Отримати від
+apps/erpnext/erpnext/public/js/utils.js +167,Get From,Отримати від
 DocType: C-Form,Quarter,Чверть
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Miscellaneous Expenses,Різні витрати
 DocType: Global Defaults,Default Company,За замовчуванням Компанія
-apps/erpnext/erpnext/controllers/stock_controller.py +167,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Витрати або рахунок різниці є обов&#39;язковим для п {0}, як це впливає на вартість акцій в цілому"
-apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Не можете overbill для Пункт {0} в рядку {1} більш {2}. Щоб overbilling, будь ласка, встановіть в налаштуваннях зображення"
+apps/erpnext/erpnext/controllers/stock_controller.py +167,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Рахунок витрат або рахунок різниці є обов'язковим для {0}, оскільки впливає на вартість запасів"
+apps/erpnext/erpnext/controllers/accounts_controller.py +419,"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,-вище
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} is disabled,Користувач {0} відключена
 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...,Виберіть компанію ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,"Залиште порожнім, якщо розглядати для всіх відділів"
 apps/erpnext/erpnext/config/hr.py +171,"Types of employment (permanent, contract, intern etc.).","Види зайнятості (постійна, за контрактом, стажист і т.д.)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +346,{0} is mandatory for Item {1},{0} є обов'язковим для товару {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,{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","Будь ласка, виберіть Виділена сума, рахунок-фактура Тип і номер рахунку-фактури в принаймні один ряд"
+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}
-DocType: Purchase Invoice Item,Rate (Company Currency),Оцінити (Компанія валют)
-apps/erpnext/erpnext/demo/setup_data.py +360,Others,Інші
-DocType: Payment Entry,Unallocated Amount,Нерозподілені Сума
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},Неохідно вказати Замовлення клієнта для позиції {0}
+DocType: Purchase Invoice Item,Rate (Company Currency),Ціна (у валюті компанії)
+DocType: Student Guardian,Others,Інші
+DocType: Payment Entry,Unallocated Amount,Нерозподілена сума
 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.","Продукт або послугу, яка купується, продається, або зберігається на складі."
+DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Продукт або послуга, що купується, продається, або зберігається на складі."
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +138,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Не можете обрати тип заряду, як «Про Попередня Сума Row» або «На попередньому рядку Total &#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,"Дитина Пункт не повинен бути Bundle продукту. Будь ласка, видаліть пункт `{0}` і зберегти"
+apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,"Підпорядкована позиція не повинна бути комплектом. Будь ласка, видаліть позицію `{0}` та збережіть"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Банківські
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Будь ласка, натисніть на кнопку &quot;Generate&quot; Розклад, щоб отримати розклад"
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +53,There were errors while deleting following schedules:,Були помилки під час видалення наступні графіки:
@@ -1862,35 +1884,35 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,{0} against Sales Order {1},{0} проти замовлення клієнта {1}
 DocType: Account,Fixed Asset,Основних засобів
 apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,Серійний Інвентар
-DocType: Activity Type,Default Billing Rate,За замовчуванням Платіжна Оцінити
+DocType: Activity Type,Default Billing Rate,Ціна для виставлення у рахунку за замовчуванням
 DocType: Sales Invoice,Total Billing Amount,Всього рахунків Сума
-apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +54,Receivable Account,Дебіторська заборгованість Рахунок
-apps/erpnext/erpnext/controllers/accounts_controller.py +546,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 +79,CEO,генеральний директор
+apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,Дебіторська заборгованість Рахунок
+apps/erpnext/erpnext/controllers/accounts_controller.py +549,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,генеральний директор
 DocType: Expense Claim Detail,Expense Claim Detail,Витрати Заявити Подробиці
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +808,Please select correct account,"Будь ласка, виберіть правильний рахунок"
-DocType: Item,Weight UOM,Вага Одиниця виміру
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +809,Please select correct account,"Будь ласка, виберіть правильний рахунок"
+DocType: Item,Weight UOM,Одиниця ваги
 DocType: Salary Structure Employee,Salary Structure Employee,Зарплата Структура співробітників
 DocType: Employee,Blood Group,Група крові
-DocType: Purchase Invoice Item,Page Break,Розрив сторінки
 DocType: Production Order Operation,Pending,До
 DocType: Course,Course Name,Назва курсу
-DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Користувачі, які можуть затвердити відпустки додатки конкретного працівника"
+DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Користувачі, які можуть погодити  заяви на відпустки певного працівника"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Устаткування офісу
-DocType: Purchase Invoice Item,Qty,Кількість
+DocType: Purchase Invoice Item,Qty,К-сть
 DocType: Fiscal Year,Companies,Компанії
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Електроніка
-DocType: Stock Settings,Raise Material Request when stock reaches re-order level,"Підняти Матеріальна запит коли шток досягає рівня повторного замовлення,"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Full-time,Повний день
+DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Створити Замовлення матеріалів коли залишки дійдуть до рівня дозамовлення
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,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: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Якщо ви створили стандартний шаблон в шаблонах податків та зборів з продажу, виберіть його та натисніть на кнопку нижче."
+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,Загальний входить Значення
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Debit To is required,Дебет вимагається
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +321,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,Менеджер з якості
@@ -1898,28 +1920,28 @@
 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/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Створення запитів матеріал (ППМ) і виробничі замовлення.
+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
 DocType: Timesheet Detail,To Time,Часу
 DocType: Authorization Rule,Approving Role (above authorized value),Затвердження роль (вище статутного вартості)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Credit To account must be a Payable account,Кредит на рахунку повинен бути оплачується рахунок
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +241,BOM recursion: {0} cannot be parent or child of {2},Специфікація рекурсії: {0} не може бути батько або дитина {2}
-DocType: Production Order Operation,Completed Qty,Завершений Кількість
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +241,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 +121,"For {0}, only debit accounts can be linked against another credit entry","Для {0}, тільки дебетові рахунки можуть бути пов&#39;язані з іншою кредитною вступу"
 apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,Ціни {0} відключена
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +99,Row {0}: Completed Qty cannot be more than {1} for operation {2},"Рядок {0}: Завершена Кількість не може бути більше, ніж {1} для операції {2}"
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +123,Row {0}: Completed Qty cannot be more than {1} for operation {2},"Рядок {0}: Завершена Кількість не може бути більше, ніж {1} для операції {2}"
 DocType: Manufacturing Settings,Allow Overtime,Дозволити Овертайм
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,"{0} Серійні номери, необхідні для Продукту {1}. Ви надали {2}."
-DocType: Stock Reconciliation Item,Current Valuation Rate,Поточна оцінка Оцінити
-DocType: Item,Customer Item Codes,Замовник Предмет коди
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,"{0} Серійні номери, необхідні для позиції {1}. Ви надали {2}."
+DocType: Stock Reconciliation Item,Current Valuation Rate,Поточна собівартість
+DocType: Item,Customer Item Codes,Коди клієнта на товар
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,Обмін Прибуток / збиток
 DocType: Opportunity,Lost Reason,Забули Причина
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Будь ласка, вибір початкового номера серії для відвідування за допомогою Setup&gt; Нумерація серії"
 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/purchase_receipt/purchase_receipt.py +378,All items have already been invoiced,Всі деталі вже виставлений
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +379,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,Зовнішній
@@ -1930,34 +1952,35 @@
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,Немає ковзання зарплата знайдено місяць:
 DocType: Bin,Actual Quantity,Фактична кількість
 DocType: Shipping Rule,example: Next Day Shipping,приклад: на наступний день відправка
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Серійний номер {0} знайдений
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Серійний номер {0} не знайдений
 DocType: Student Batch,Student Batch,Student Batch
 apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Ваші клієнти
 apps/erpnext/erpnext/projects/doctype/project/project.py +141,You have been invited to collaborate on the project: {0},Ви були запрошені для спільної роботи над проектом: {0}
 DocType: Leave Block List Date,Block Date,Блок Дата
-apps/erpnext/erpnext/templates/generators/job_opening.html +19,Apply Now,Застосувати зараз
+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,Банк оформлення Резюме
+,Bank Clearance Summary,Результат банківського клірінгу
 apps/erpnext/erpnext/config/setup.py +100,"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,будівлі
-apps/erpnext/erpnext/utilities/doctype/address/address.py +164,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,"Ні адреси за замовчуванням шаблону, не знайдено. Будь ласка, створіть новий з Setup&gt; Друк і Брендинг&gt; Адреса шаблону."
 DocType: Fee Structure,Fee Structure,структура оплати
 DocType: Timesheet Detail,Costing Amount,Калькуляція Сума
-DocType: Process Payroll,Submit Salary Slip,Відправити зарплата Сліп
-apps/erpnext/erpnext/controllers/selling_controller.py +161,Maxiumm discount for Item {0} is {1}%,Maxiumm знижка Item {0} {1}%
+DocType: Student Admission,Application Fee,реєстраційний внесок
+DocType: Process Payroll,Submit Salary Slip,Провести зарплатну відомість
+apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,Maxiumm знижка Item {0} {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Імпорт наливом
 DocType: Sales Partner,Address & Contacts,Адреса та контакти
 DocType: SMS Log,Sender Name,Ім&#39;я відправника
 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,Softwares
 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: Sales Invoice Advance,Advance Amount,Сума авансу
 DocType: Manufacturing Settings,Capacity Planning,Планування потужностей
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,"""Від дати"" є обов’язковим"
 DocType: Journal Entry,Reference Number,Номер для посилань
@@ -1971,24 +1994,24 @@
 DocType: Serial No,Delivery Time,Час доставки
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,На підставі проблем старіння
 DocType: Item,End of Life,Кінець життя
-apps/erpnext/erpnext/demo/setup_data.py +361,Travel,Подорож
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +155,No active or default Salary Structure found for employee {0} for the given dates,Ні активної або за замовчуванням Зарплата Структура знайдено для співробітника {0} для зазначених дат
+apps/erpnext/erpnext/demo/setup/setup_data.py +304,Travel,Подорож
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +167,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: Cost Center,Track separate Income and Expense for product verticals or divisions.,Відслідковувати окремо доходи та витрати для виробничої вертикалі або підрозділів.
 DocType: Rename Tool,Rename Tool,Перейменувати інструмент
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +23,Update Cost,Оновлення Вартість
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Оновлення Вартість
 DocType: Item Reorder,Item Reorder,Пункт Змінити порядок
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +36,Show Salary Slip,Показати Зарплата ковзанню
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +748,Transfer Material,Передача матеріалів
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +53,Show Salary Slip,Показати зарплатну відомість
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +166,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 +923,Please set recurring after saving,"Будь ласка, встановіть повторювані після збереження"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +646,Select change amount account,Сума рахунку Виберіть зміни
+apps/erpnext/erpnext/public/js/controllers/transaction.js +914,Please set recurring after saving,"Будь ласка, встановіть повторювані після збереження"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +703,Select change amount account,Сума рахунку Виберіть зміни
 DocType: Purchase Invoice,Price List Currency,Ціни валют
 DocType: Naming Series,User must always select,Користувач завжди повинен вибрати
-DocType: Stock Settings,Allow Negative Stock,Дозволити негативний складі
+DocType: Stock Settings,Allow Negative Stock,Дозволити від'ємні залишки
 DocType: Installation Note,Installation Note,Установка Примітка
 apps/erpnext/erpnext/public/js/setup_wizard.js +216,Add Taxes,Додати Податки
 DocType: Topic,Topic,тема
@@ -1997,84 +2020,87 @@
 DocType: Quality Inspection,Verified By,Перевірено
 DocType: Address,Subsidiary,Дочірня компанія
 apps/erpnext/erpnext/setup/doctype/company/company.py +64,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Неможливо змінити валюту за замовчуванням компанії, тому що є існуючі угоди. Угоди повинні бути скасовані, щоб поміняти валюту за замовчуванням."
-DocType: Quality Inspection,Purchase Receipt No,Купівля Отримання Немає
+DocType: Grade Interval,Grade Description,оцінка Опис
+DocType: Quality Inspection,Purchase Receipt No,Прихідна накладна номер
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Аванс-завдаток
 DocType: Process Payroll,Create Salary Slip,Створити зарплата Сліп
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +33,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 +352,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Кількість в рядку {0} ({1}) повинен бути такий же, як кількість виготовленої {2}"
-DocType: Appraisal,Employee,Співробітник
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Кількість в рядку {0} ({1}) повинен бути такий же, як кількість виготовленої {2}"
+DocType: Appraisal,Employee,Працівник
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Запросити у користувача
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} повністю оплачено
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} повністю виставлено рахунки
 DocType: Workstation Working Hour,End Time,Час закінчення
 DocType: Payment Entry,Payment Deductions or Loss,Відрахування оплати або збиток
-apps/erpnext/erpnext/config/schools.py +100,LMS,LMS
+apps/erpnext/erpnext/config/schools.py +104,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,Трубопровідний Менеджер з продажу
 DocType: Student Batch Student,Student Batch Student,Student Пакетне Student
-DocType: Sales Invoice,Mass Mailing,Розсилок
+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},"Будь ласка, виберіть BOM для пункту в рядку {0}"
+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 +199,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 +262,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 +297,Salary Slip of employee {0} already created for this period,Зарплата Ковзання працівника {0} вже створено за цей період
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Pharmaceutical,Фармацевтична
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +309,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/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Вартість куплених виробів
-DocType: Selling Settings,Sales Order Required,Продажі Замовити Обов&#39;язкові
+DocType: Selling Settings,Sales Order Required,Необхідне Замовлення клієнта
 DocType: Purchase Invoice,Credit To,Кредит на
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +31,Active Leads / Customers,Активні постачанні / Клієнти
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +31,Active Leads / Customers,Активні Lead-и / Клієнти
 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: Buying Settings,Buying Settings,Налаштування Купівля
-DocType: Stock Entry Detail,BOM No. for a Finished Good Item,Специфікація Номер для готового виробу Пункт
+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 +814,Please specify Company to proceed,"Будь ласка, сформулюйте компанії, щоб продовжити"
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Receivable,Чисте зміна дебіторської заборгованості
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Compensatory Off,Компенсаційні Викл
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +793,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: Quality Inspection Reading,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.,"Будь ласка, переконайтеся, що ви дійсно хочете видалити всі транзакції для компанії. Ваші основні дані залишиться, як є. Ця дія не може бути скасовано."
 DocType: Room,Room Number,Номер кімнати
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Неприпустима посилання {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +161,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},"{0} ({1}) не може бути більше, ніж запланована кількість ({2}) у Виробничому замовленні {3}"
-DocType: Shipping Rule,Shipping Rule Label,Правило ярлику
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +162,{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 +217,Raw Materials cannot be blank.,Сировина не може бути порожнім.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,"Could not update stock, invoice contains drop shipping item.","Не вдалося оновити запас, рахунок-фактура містить падіння пункт доставки."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +460,Quick Journal Entry,Швидкий журнал запис
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +111,You can not change rate if BOM mentioned agianst any item,"Ви не можете змінити ставку, якщо специфікації згадується agianst будь-якого елементу"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +441,"Could not update stock, invoice contains drop shipping item.","Не вдалося оновити запаси, рахунок-фактура містить позиції прямої доставки."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Quick Journal Entry,Швидкий журнал запис
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +103,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 +214,{0} {1} is not submitted,{0} {1} не було затверджено
+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 +214,{0} {1} is not submitted,{0} {1} не проведений
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Запити для елементів.
-DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Окрема виробничий замовлення буде створено для кожного готового виробу пункту.
+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
+DocType: Purchase Invoice,Terms and Conditions1,Умови та положення1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,"Назва інституту, для якого ви встановлюєте цю систему."
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Бухгалтерський запис заморожені до цієї дати, ніхто не може зробити / змінити запис крім ролі, зазначеної нижче."
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,"Будь ласка, збережіть документ, перш ніж генерувати графік технічного обслуговування"
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Статус проекту
 DocType: UOM,Check this to disallow fractions. (for Nos),"Перевірте це, щоб заборонити фракції. (для №)"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +398,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,Протокол до First Response для можливостей
+,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 +739,Item or Warehouse for row {0} does not match Material Request,Елемент або Склад ряду {0} не відповідає матеріалів Запит
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +747,Item or Warehouse for row {0} does not match Material Request,Номенклатурна позиція або Склад у рядку {0} не відповідає Замовленню матеріалів
 apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,Одиниця виміру
-DocType: Fiscal Year,Year End Date,Рік Дата закінчення
+DocType: Fiscal Year,Year End Date,Дата закінчення року
 DocType: Task Depends On,Task Depends On,Завдання залежить від
-DocType: Lead,Opportunity,Можливість
+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,За замовчуванням робоча станція
@@ -2087,7 +2113,7 @@
 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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},Дата початку обслуговування не може бути до дати доставки для Серійний номер {0}
+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,Фактична Дата закінчення
 DocType: Purchase Invoice,PINV-,PINV-
 DocType: Authorization Rule,Applicable To (Role),Застосовується до (Роль)
@@ -2095,14 +2121,14 @@
 DocType: Company,Fixed Asset Depreciation Settings,Параметри амортизації основних засобів
 DocType: Item,Will also apply for variants unless overrridden,"Буде також застосовуватися для варіантів, якщо не overrridden"
 DocType: Purchase Invoice,Advances,Аванси
-DocType: Production Order,Manufacture against Material Request,Виробництво проти матеріалів Запит
+DocType: Production Order,Manufacture against Material Request,Виробництво по Замовленнях матеріалів
 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
 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 +729,Please supply the specified items at the best possible rates,"Будь ласка, надайте зазначені пункти в найкращих можливих ставок"
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +695,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 +117,Contract End Date must be greater than Date of Joining,"Договір Кінцева дата повинна бути більше, ніж дата вступу"
 DocType: Delivery Note,DN-,DN-
@@ -2111,7 +2137,7 @@
 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}."
 DocType: Task,Actual Start Date (via Time Sheet),Фактична дата початку (за допомогою Time Sheet)
-apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +14,This is an example website auto-generated from ERPNext,Це приклад сайту генерується автоматично з ERPNext
+apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Цей зразок сайту згенерований автоматично з ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Старіння Діапазон 1
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
@@ -2133,20 +2159,21 @@
 7. Total: Cumulative total to this point.
 8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row).
 9. Consider Tax or Charge for: In this section you can specify if the tax / charge is only for valuation (not a part of total) or only for total (does not add value to the item) or for both.
-10. Add or Deduct: Whether you want to add or deduct the tax.","Стандартний шаблон податок, який може бути застосований до всіх операцій купівлі. Цей шаблон може містити перелік податкових керівників, а також інших витрат керівників як &quot;Доставка&quot;, &quot;Insurance&quot;, &quot;Звернення&quot; і т.д. #### Примітка податкової ставки ви визначаєте тут буде стандартна ставка податку на прибуток для всіх ** Елементи * *. Якщо є ** ** товари, які мають різні ціни, вони повинні бути додані в ** Item податку ** стіл в ** ** Item майстра. #### Опис колонок 1. Розрахунок Тип: - Це може бути від ** ** Загальна Чистий (тобто сума основної суми). - ** На попередньому рядку Total / сума ** (за сукупністю податків або зборів). Якщо ви оберете цю опцію, податок буде застосовуватися, як у відсотках від попереднього ряду (у податковому таблиці) суми або загальної. - ** ** Фактичний (як уже згадувалося). 2. Рахунок Керівник: Рахунок книга, під яким цей податок будуть заброньовані 3. Вартість центр: Якщо податок / плата є доходом (як перевезення вантажу) або витрат це повинно бути заброньовано проти МВЗ. 4. Опис: Опис податку (які будуть надруковані в рахунках-фактурах / цитати). 5. Оцінити: Податкова ставка. 6. Сума: Сума податку. 7. Разом: Сумарне до цієї точки. 8. Введіть рядок: Якщо на базі &quot;Попередня рядок Усього&quot; ви можете вибрати номер рядка, який буде прийнято в якості основи для розрахунку цього (за замовчуванням це попереднє рядок). 9. Розглянемо податку або збору для: У цьому розділі ви можете поставити, якщо податок / плата тільки за оцінки (не частина всього) або тільки для загальної (не додати цінність пункту) або для обох. 10. Додати або відняти: Якщо ви хочете, щоб додати або відняти податок."
+10. Add or Deduct: Whether you want to add or deduct the tax.","Стандартний шаблон податку, який може бути застосований до всіх операцій купівлі. Цей шаблон може містити перелік податкових заголовків, а також заголовків інших витрат, таких як ""Доставка"", ""Страхування"", ""Звернення"" і т.д. #### Примітка: податкова ставка, яку ви тут визначите, буде стандартною  для всіх **Об’єктів**. Якщо є **Об’єкти**, які мають різні ставки, вони повинні бути додані в таблицю **Податки**, що у **Item майстра**. #### Опис колонок 1. Розрахунок Тип: - Це може бути від ** ** Загальна Чистий (тобто сума основної суми). - ** На попередньому рядку Total / сума ** (за сукупністю податків або зборів). Якщо ви оберете цю опцію, податок буде застосовуватися, як у відсотках від попереднього ряду (у податковому таблиці) суми або загальної. - ** ** Фактичний (як уже згадувалося). 2. Рахунок Керівник: Рахунок книга, під яким цей податок будуть заброньовані 3. Вартість центр: Якщо податок / плата є доходом (як перевезення вантажу) або витрат це повинно бути заброньовано проти МВЗ. 4. Опис: Опис податку (які будуть надруковані в рахунках-фактурах / цитати). 5. Оцінити: Податкова ставка. 6. Сума: Сума податку. 7. Разом: Сумарне до цієї точки. 8. Введіть рядок: Якщо на базі ""Попередня рядок Усього"" ви можете вибрати номер рядка, який буде прийнято в якості основи для розрахунку цього (за замовчуванням це попереднє рядок). 9. Розглянемо податку або збору для: У цьому розділі ви можете поставити, якщо податок / плата тільки за оцінки (не частина всього) або тільки для загальної (не додати цінність пункту) або для обох. 10. Додати або відняти: Якщо ви хочете, щоб додати або відняти податок."
 DocType: Homepage,Homepage,домашня сторінка
 DocType: Purchase Receipt Item,Recd Quantity,Кількість RECD
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +54,Fee Records Created - {0},Плата записи Створено - {0}
 DocType: Asset Category Account,Asset Category Account,Категорія активів Рахунок
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +103,Cannot produce more Item {0} than Sales Order quantity {1},"Не можете виробляти більше Пункт {0}, ніж кількість продажів Замовити {1}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Stock Entry {0} is not submitted,Фото запис {0} не представлено
-DocType: Payment Reconciliation,Bank / Cash Account,Банк / грошовий рахунок
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},"Не можете виробляти більше Пункт {0}, ніж кількість продажів Замовити {1}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +505,Stock Entry {0} is not submitted,Рух ТМЦ {0} не проведено
+DocType: Payment Reconciliation,Bank / Cash Account,Банк / Готівковий рахунок
 DocType: Tax Rule,Billing City,Біллінг Місто
 DocType: Salary Component Account,Salary Component Account,Зарплатний Компонент
 DocType: Global Defaults,Hide Currency Symbol,Приховати символ валюти
 apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card","наприклад банк, готівка, кредитна карта"
+DocType: Lead Source,Source Name,ім&#39;я джерела
 DocType: Journal Entry,Credit Note,Кредитове авізо
-DocType: Warranty Claim,Service Address,Послуги Адреса
+DocType: Warranty Claim,Service Address,Адреса послуги
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furnitures and Fixtures,Меблі і Світильники
 DocType: Item,Manufacture,Виробництво
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,"Будь ласка, в першу чергу поставки Примітка"
@@ -2156,28 +2183,29 @@
 DocType: Opportunity,Customer / Lead Name,Замовник / Провідний Ім&#39;я
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +89,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/controllers/trends.py +19,Total(Qty),Всього (Кількість)
 DocType: Sales Invoice,This Document,цей документ
-DocType: Installation Note Item,Installed Qty,Встановлена Кількість
+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,Вихідні Оцінити
+DocType: Stock Ledger Entry,Outgoing Rate,Вихідна ставка
 apps/erpnext/erpnext/config/hr.py +176,Organization branch master.,Організація філії господар.
-apps/erpnext/erpnext/controllers/accounts_controller.py +273, or ,або
+apps/erpnext/erpnext/controllers/accounts_controller.py +276, 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 +203,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Рядок # {0}: Запис в журналі {1} не має облікового запису {2} або вже зіставляється з іншою купон
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +206,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 +90,No employee for the above selected criteria OR salary slip already created,Жоден співробітник для обраних критеріїв вище або ковзання заробітної плати вже не створено
-DocType: Notification Control,Sales Order Message,Продажі Замовити повідомлення
-apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Встановити значення за замовчуванням, як компанія, валюта, поточний фінансовий рік і т.д."
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +93,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,Для Дата
@@ -2187,61 +2215,61 @@
 DocType: Employee,Emergency Contact,Для екстреного зв&#39;язку
 DocType: Bank Reconciliation Detail,Payment Entry,оплата Вхід
 DocType: Item,Quality Parameters,Параметри якості
-,sales-browser,продажу-браузер
+,sales-browser,переглядач-продажів
 apps/erpnext/erpnext/accounts/doctype/account/account.js +56,Ledger,Бухгалтерська книга
 DocType: Target Detail,Target  Amount,Цільова сума
-DocType: Shopping Cart Settings,Shopping Cart Settings,Кошик Налаштування
-DocType: Journal Entry,Accounting Entries,Бухгалтерські записи
+DocType: Shopping Cart Settings,Shopping Cart Settings,Налаштування кошику
+DocType: Journal Entry,Accounting Entries,Бухгалтерські проводки
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},"Дублювати запис. Будь ласка, перевірте Авторизація Правило {0}"
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +26,Global POS Profile {0} already created for company {1},Глобальний профілю POS {0} вже створена для компанії {1}
 DocType: Purchase Order,Ref SQ,Посилання SQ
-apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Замінити пункт / специфікації у всіх специфікаціях
+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,Квитанція документ повинен бути представлений
-DocType: Purchase Invoice Item,Received Qty,Надійшло Кількість
+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/hr/doctype/leave_allocation/leave_allocation.py +115,Leave Type {0} cannot be carry-forwarded,Залиште Тип {0} не може бути перенесення спрямований
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Графік проведення технічного обслуговування не генерується для всіх елементів. Будь ласка, натисніть на кнопку &quot;Generate&quot; Розклад"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +118,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;Generate&quot; Розклад"
 ,To Produce,Виробляти
 apps/erpnext/erpnext/config/hr.py +93,Payroll,платіжна відомість
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +163,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",Для ряду {0} в {1}. Щоб включити {2} у розмірі Item ряди також повинні бути включені {3}
 DocType: Packing Slip,Identification of the package for the delivery (for print),Ідентифікація пакета для доставки (для друку)
 DocType: Bin,Reserved Quantity,Зарезервовано Кількість
-DocType: Landed Cost Voucher,Purchase Receipt Items,Купівля розписок товари
+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 +32,Disabled template must not be default template,Шаблон для інвалідів не повинно бути за замовчуванням шаблон
+apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +32,Disabled template must not be default template,Відключений шаблон не може бути шаблоном за замовчуванням
 DocType: Account,Income Account,Рахунок Доходи
 DocType: Payment Request,Amount in customer's currency,Сума в валюті клієнта
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +748,Delivery,Доставка
-DocType: Stock Reconciliation Item,Current Qty,Поточний Кількість
-DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Див &quot;Оцінити матеріалів на основі&quot; в розділі калькуляції
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +742,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,Ключ Відповідальність Площа
-DocType: Payment Entry,Total Allocated Amount,Загальна сума Зазначена
-DocType: Item Reorder,Material Request Type,Матеріал Тип запиту
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +82,Row {0}: UOM Conversion Factor is mandatory,Ряд {0}: Коефіцієнт перетворення Одиниця виміру є обов&#39;язковим
+DocType: Payment Entry,Total Allocated Amount,Загальна розподілена сума
+DocType: Item Reorder,Material Request Type,Тип Замовлення матеріалів
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +79,Row {0}: UOM Conversion Factor is mandatory,Ряд {0}: Коефіцієнт перетворення Одиниця виміру є обов&#39;язковим
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Посилання
 DocType: Budget,Cost Center,Центр витрат
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Ваучер #
 DocType: Notification Control,Purchase Order Message,Замовлення на повідомлення
-DocType: Tax Rule,Shipping Country,Доставка Країна
+DocType: 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.",Ціни правила робиться для перезапису Прайс-лист / визначити відсоток дисконтування на основі деяких критеріїв.
-DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Склад може бути змінений тільки через фондовій входу / накладної / Купівля Надходження
+DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Склад може бути змінений тільки через Рух ТМЦ / Накладну / Прихідну накладну
 DocType: Employee Education,Class / Percentage,Клас / у відсотках
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Head of Marketing and Sales,Начальник відділу маркетингу та продажів
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Податок на прибуток
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,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;Rate&#39;, а не &#39;поле прайс-лист Rate&#39;."
-apps/erpnext/erpnext/config/selling.py +164,Track Leads by Industry Type.,Трек веде по промисловості Type.
+apps/erpnext/erpnext/config/selling.py +164,Track Leads by Industry Type.,Відслідковувати Lead-и за галуззю.
 DocType: Item Supplier,Item Supplier,Пункт Постачальник
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +403,Please enter Item Code to get batch no,"Будь ласка, введіть код предмета, щоб отримати партії не"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +770,Please select a value for {0} quotation_to {1},"Будь ласка, виберіть значення для {0} quotation_to {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +397,Please enter Item Code to get batch no,"Будь ласка, введіть код позиції, щоб отримати номер партії"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +764,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,Сток Налаштування
+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/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.,Управління груповою клієнтів дерево.
@@ -2251,49 +2279,50 @@
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,Немає на складі
 DocType: Appraisal,HR User,HR Користувач
 DocType: Purchase Invoice,Taxes and Charges Deducted,"Податки та відрахування,"
-apps/erpnext/erpnext/hooks.py +100,Issues,Питань
-apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},Статус повинен бути одним з {0}
+apps/erpnext/erpnext/hooks.py +109,Issues,Питань
+apps/erpnext/erpnext/controllers/status_updater.py +13,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,Фактична Кількість Угоди Після
+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} відключений
 DocType: Supplier,Billing Currency,Платіжна валют
-DocType: Sales Invoice,SINV-RET-,Синв-RET-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Large,Дуже великий
+DocType: Sales Invoice,SINV-RET-,Вих_Рах-Пов-
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Extra Large,Дуже великий
 ,Profit and Loss Statement,Рахунок прибутків і збитків
 DocType: Bank Reconciliation Detail,Cheque Number,Чек Кількість
-,Sales Browser,Браузер з продажу
+,Sales Browser,Переглядач продажів
 DocType: Journal Entry,Total Credit,Всього Кредитна
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +507,Warning: Another {0} # {1} exists against stock entry {2},Увага: Ще {0} # {1} існує проти вступу фондовій {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Local,Місцевий
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Кредити та аванси (активів)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +508,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Кредити та аванси (активи)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Боржники
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Large,Великий
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,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 +225,Total {0} ({1}),Загальна {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +224,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: Production Order Operation,Planned Start Time,Плановані Час
 DocType: Assessment,Assessment,оцінка
-DocType: Payment Entry Reference,Allocated,Виділені
+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: 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/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 +150,Please create Customer from Lead {0},"Будь ласка, створіть клієнт зі свинцю {0}"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +150,Please create Customer from Lead {0},"Будь ласка, створіть клієнта з Lead {0}"
 DocType: Price List,Applicable for Countries,Стосується для країн
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +38,Student Group Name is mandatory in row {0},Студентська група Ім&#39;я є обов&#39;язковим в рядку {0}
-DocType: Homepage,Products to be shown on website homepage,Продукти будуть показані на головну сторінку сайту
+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,Ігнорувати Ціни правило
@@ -2301,7 +2330,7 @@
 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:
@@ -2314,149 +2343,149 @@
 1. Returns Policy.
 1. Terms of shipping, if applicable.
 1. Ways of addressing disputes, indemnity, liability, etc.
-1. Address and Contact of your Company.","Стандартні положення та умови, які можуть бути додані до продажу та закупівель. Приклади: 1. Термін дії пропозиції. 1. Умови оплати (заздалегідь, в кредит, частина заздалегідь і т.д.). 1. Що таке додаткове (або підлягає сплаті Замовником). 1. Безпека попередження / використання. 1. Гарантія якщо такі є. 1. повернення політики. 1. Умови доставки, якщо це доречно. 1. Способи адресації спорів, відшкодування, відповідальності і т.д. 1. Адреса та контактна Вашої компанії."
+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 +173,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Витрати / рахунок різниці ({0}) повинен бути &quot;прибуток або збиток» рахунок
 DocType: Account,Accounts User,Облікові записи користувачів
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,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 +178,{0} {1} does not associated with {2} {3},{0} {1} не пов&#39;язаний з {2} {3}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +90,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 +181,{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: 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)
+DocType: Stock Ledger Entry,Stock Queue (FIFO),Черга Інвентаря (4П)
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +38,{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,Запитувана Кількість
+,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,обговорення
 DocType: BOM Item,Scrap %,Лом%
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Збори будуть розподілені пропорційно на основі Поз або суми, за Вашим вибором"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Збори будуть розподілені пропорційно на основі к-сті або суми, за Вашим вибором"
 DocType: Maintenance Visit,Purposes,Мети
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,Принаймні один елемент повинен бути введений з негативним кількістю у зворотному документа
+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 +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Операція {0} більше, ніж будь-яких наявних робочих годин на робочої станції {1}, зламати операції в кілька операцій"
 ,Requested,Запитаний
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +83,No Remarks,Немає Зауваження
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Прострочені
-DocType: Account,Stock Received But Not Billed,"Фото отриманий, але не Оголошений"
+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,Повна Платне + недоїмки сума + Інкасація Сума - Загальна Відрахування
 DocType: Item,Total Projected Qty,Загальна запланована Кількість
 DocType: Monthly Distribution,Distribution Name,Розподіл Ім&#39;я
 DocType: Course,Course Code,код курсу
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,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/stock/doctype/purchase_receipt/purchase_receipt.py +99,Quality Inspection required for Item {0},Контроль якості потрібні для Пункт {0}
+DocType: Quotation,Rate at which customer's currency is converted to company's base currency,"Курс, за яким валюта покупця конвертується у базову валюту компанії"
+DocType: Purchase Invoice Item,Net Rate (Company Currency),Нетто-ставка (Валюта компанії)
 DocType: Salary Detail,Condition and Formula Help,Стан і формула Допомога
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Управління Територія дерево.
-DocType: Journal Entry Account,Sales Invoice,Рахунок по продажах
+DocType: Journal Entry Account,Sales Invoice,Вихідний рахунок-фактура
 DocType: Journal Entry Account,Party Balance,Баланс партія
-apps/erpnext/erpnext/accounts/page/pos/pos.js +475,Please select Apply Discount On,"Будь ласка, виберіть Застосувати знижки на"
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +92,Salary Slip Created,Зарплата ковзання Створено
+apps/erpnext/erpnext/accounts/page/pos/pos.js +464,Please select Apply Discount On,"Будь ласка, виберіть Застосувати знижки на"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +95,Salary Slip Created,Зарплата ковзання Створено
 DocType: Company,Default Receivable Account,За замовчуванням заборгованість аккаунт
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,"Створити банк запис на загальну заробітної плати, що виплачується за обраними критеріями вище"
 DocType: Stock Entry,Material Transfer for Manufacture,Матеріал для виробництва передачі
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,Знижка у відсотках можна застосовувати або стосовно прайс-листа або для всіх прайс-лист.
 DocType: Purchase Invoice,Half-yearly,Піврічний
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +384,Accounting Entry for Stock,Облік Вхід для запасі
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +387,Accounting Entry for Stock,Проводки по запасах
 DocType: Sales Invoice,Sales Team1,Команда1 продажів
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,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 +96,Row {0}: Completed Qty must be greater than zero.,Рядок {0}: Завершений Кількість повинно бути більше нуля.
+DocType: Sales Invoice,Customer Address,Адреса клієнта
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +120,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 +88,Row # {0}: Cannot return more than {1} for Item {2},Ряд # {0}: Чи не можете повернути понад {1} для п {2}
+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,Ділянка
-DocType: Item Group,Show this slideshow at the top of the page,Показати цю слайд-шоу на початок сторінки
+DocType: Item Group,Show this slideshow at the top of the page,Показати це слайд-шоу на верху сторінки
 DocType: BOM,Item UOM,Пункт Одиниця виміру
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Сума податку після скидки Сума (Компанія валют)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +147,Target warehouse is mandatory for row {0},Цільова склад є обов&#39;язковим для ряду {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +141,Target warehouse is mandatory for row {0},Цільова склад є обов&#39;язковим для ряду {0}
 DocType: Cheque Print Template,Primary Settings,Основні налаштування
-DocType: Purchase Invoice,Select Supplier Address,Вибір постачальника Адреса
+DocType: Purchase Invoice,Select Supplier Address,Виберіть адресу постачальника
 DocType: Quality Inspection,Quality Inspection,Контроль якості
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Extra Small,Дуже невеликий
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,Warning: Material Requested Qty is less than Minimum Order Qty,"Увага: Матеріал Запитувана Кількість менше, ніж мінімальне замовлення Кількість"
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +194,Account {0} is frozen,Рахунок {0} заморожені
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Дуже невеликий
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +690,Warning: Material Requested Qty is less than Minimum Order Qty,Увага: Кількість замовленого матеріалу менша за мінімально допустиму
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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 +606,Can only make payment against unbilled {0},Можу тільки здійснити платіж проти нефактурірованних {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +126,Commission rate cannot be greater than 100,"Швидкість Комісія не може бути більше, ніж 100"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Продукти харчування, напої і тютюнові вироби"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +609,Can only make payment against unbilled {0},Може здійснити платіж тільки по невиставлених {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,"Ставка комісії не може бути більше, ніж 100"
 DocType: Stock Entry,Subcontract,Субпідряд
 apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,"Будь ласка, введіть {0} в першу чергу"
 DocType: Production Order Operation,Actual End Time,Фактична Час закінчення
 DocType: Production Planning Tool,Download Materials Required,"Скачати матеріали, необхідні"
-DocType: Item,Manufacturer Part Number,Виробник Номер деталі
+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,Витрати аккаунт
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Програмне забезпечення
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Colour,Колір
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,Колір
 DocType: Maintenance Visit,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;, і немає ніякої іншої продукт Зв&#39;язка"
+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","Будь ласка, виберіть позицію, в якої ""Складський"" встановлено у ""Ні"" і Продаєм цей товар"" - ""Так"", і немає жодного комплекту"
 DocType: Student Log,Academic,академічний
-apps/erpnext/erpnext/controllers/accounts_controller.py +469,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),"Всього аванс ({0}) проти ордена {1} не може бути більше, ніж загальна сума ({2})"
+apps/erpnext/erpnext/controllers/accounts_controller.py +472,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),"Всього аванс ({0}) за замовленням {1} не може бути більше, ніж загальний підсумок ({2})"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Виберіть щомісячний розподіл до нерівномірно розподілити цілі по місяців.
-DocType: Purchase Invoice Item,Valuation Rate,Оцінка Оцініть
+DocType: Purchase Invoice Item,Valuation Rate,Собівартість
+DocType: Stock Reconciliation,SR/,SR /
 apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,Ціни валют не визначена
 DocType: Assessment,Results,результати
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +168,Employee {0} has already applied for {1} between {2} and {3},Співробітник {0} вже застосовується для {1} між {2} і {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +175,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: Student Applicant,Father's/ Guardian 2 Email ID,Батька / опікуна 2 Email ID
 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 +228,Warehouses with existing transaction can not be converted to group.,Склади з існуючої транзакції не може бути перетворена в групу.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +231,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 +93,Researcher,Дослідник
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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.,Вхідний контроль якості.
-DocType: Purchase Order Item,Returned Qty,Повернувся Кількість
+DocType: Purchase Order Item,Returned Qty,Повернута к-сть
 DocType: Employee,Exit,Вихід
 apps/erpnext/erpnext/accounts/doctype/account/account.py +159,Root Type is mandatory,Корінь Тип обов&#39;язково
-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/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: Sales Invoice,Advertisement,Реклама
+DocType: Employee,You can enter any date manually,Ви можете ввести будь-яку дату вручну
 DocType: Asset Category Account,Depreciation Expense Account,Знос рахунок витрат
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Probationary Period,Випробувальний термін
-apps/erpnext/erpnext/hooks.py +102,Announcements,оголошення
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Випробувальний термін
+apps/erpnext/erpnext/hooks.py +111,Announcements,оголошення
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Тільки вузли лист дозволені в угоді
 DocType: Expense Claim,Expense Approver,Витрати затверджує
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +109,Row {0}: Advance against Customer must be credit,Ряд {0}: Попередня відношенні Клієнта повинен бути кредит
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +109,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: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Позицію прихідної накладної поставлено
 DocType: Payment Entry,Pay,Платити
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +16,To Datetime,Для DateTime
+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/scheduling_tool/scheduling_tool.py +51,Course Schedules deleted:,Розклад курсів видалені:
 apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,Журнали для підтримки статус доставки смс
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,В очікуванні Діяльність
+DocType: Accounts Settings,Make Payment via Journal Entry,Платежі через журнал Вхід
+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 +127,Please enter relieving date.,"Будь ласка, введіть дату зняття."
-apps/erpnext/erpnext/controllers/trends.py +145,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,Only Leave Applications with status 'Approved' can be submitted,Тільки Залиште додатків зі статусом «Схвалено&quot; можуть бути представлені
-apps/erpnext/erpnext/utilities/doctype/address/address.py +26,Address Title is mandatory.,Адреса Назва є обов&#39;язковим.
+apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,Only Leave Applications with status 'Approved' can be submitted,"Заяву на відпустку можна провести тільки якщо вона має стан «Затверджено"""
+apps/erpnext/erpnext/utilities/doctype/address/address.py +26,Address Title is mandatory.,Назва адреси є обов'язковою.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Введіть ім&#39;я кампанії, якщо джерелом є кампанія запит"
 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,Виберіть фінансовий рік
@@ -2465,70 +2494,71 @@
 apps/erpnext/erpnext/stock/get_item_details.py +258,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,Перевага Адреса доставки
-DocType: Purchase Invoice Item,Accepted Warehouse,Прийнято Склад
+DocType: Address,Preferred Shipping Address,Основна адреса доставки
+DocType: Purchase Invoice Item,Accepted Warehouse,Прийнято на склад
 DocType: Bank Reconciliation Detail,Posting Date,Дата розміщення
 DocType: Item,Valuation Method,Метод Оцінка
 apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1},Неможливо знайти обмінний курс {0} до {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Відзначити Півдня
 DocType: Sales Invoice,Sales Team,Відділ продажів
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Duplicate entry,Дублікат запис
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,Дублікат запис
 DocType: Program Enrollment Tool,Get Students,отримати Студенти
 DocType: Serial No,Under Warranty,Під гарантії
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +490,[Error],[Помилка]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +484,[Error],[Помилка]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,"За словами будуть видні, як тільки ви збережете замовлення клієнта."
 ,Employee Birthday,Співробітник народження
 apps/erpnext/erpnext/controllers/status_updater.py +175,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} вже існує. Будь ласка, поміняйте ці записи і спробуйте ще раз."
 DocType: UOM,Must be Whole Number,Повинно бути ціле число
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Нові листя Виділені (у днях)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Серійний номер {0} не існує
 DocType: Sales Invoice Item,Customer Warehouse (Optional),Склад Клієнт (Необов&#39;язково)
 DocType: Pricing Rule,Discount Percentage,Знижка у відсотках
-DocType: Payment Reconciliation Invoice,Invoice Number,Номер накладної
+DocType: Payment Reconciliation Invoice,Invoice Number,Номер рахунку-фактури
 DocType: Shopping Cart Settings,Orders,Замовлення
-DocType: Employee Leave Approver,Leave Approver,Залишити який стверджує
+DocType: Employee Leave Approver,Leave Approver,Погоджувач відпустки
 DocType: Assessment Group,Assessment Group Name,Назва групи по оцінці
 DocType: Manufacturing Settings,Material Transferred for Manufacture,"Матеріал, переданий для виробництва"
 DocType: Expense Claim,"A user with ""Expense Approver"" role",Користувач з &quot;Витрати затверджує&quot; ролі
 DocType: Landed Cost Item,Receipt Document Type,Квитанція Тип документа
-,Issued Items Against Production Order,Випущені товари з виробництвом ордена
+,Issued Items Against Production Order,Замовлення на виробництво попозиційно
 DocType: Pricing Rule,Purchase Manager,Менеджер по закупкам
 DocType: Target Detail,Target Detail,Цільова Подробиці
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +25,All Jobs,все Вакансії
-DocType: Sales Order,% of materials billed against this Sales Order,% Матеріалів оплачено по цьому замовленню клієнта
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,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 +323,Amount {0} {1} {2} {3},Сума {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,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: Supplier,Credit Limit,Кредитний ліміт
 DocType: Production Plan Sales Order,Salse Order Date,Salse Дата замовлення
 DocType: Salary Component,Salary Component,Зарплата Компонент
-apps/erpnext/erpnext/accounts/utils.py +372,Payment Entries {0} are un-linked,Записи оплати {0} ип-зшитий
+apps/erpnext/erpnext/accounts/utils.py +449,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 +497,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.,Шаблон точки або договором.
-DocType: Purchase Invoice,Address and Contact,Адреса та контактна
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +498,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.,Шаблон умов договору
+DocType: Purchase Invoice,Address and Contact,Адреса та контакти
 DocType: Cheque Print Template,Is Account Payable,Чи є кредиторська заборгованість
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +260,Stock cannot be updated against Purchase Receipt {0},Фото не може бути оновлений з квитанцією про покупку {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +260,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 +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Залишити не можуть бути виділені, перш ніж {0}, а відпустку баланс вже переносу направляються в майбутньому записи розподілу відпустки {1}"
 apps/erpnext/erpnext/accounts/party.py +305,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Примітка: Через / Вихідна дата перевищує дозволений кредит клієнт дня {0} день (їй)
 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: Stock Settings,Freeze Stock Entries,Заморозити Рухи ТМЦ
 DocType: Asset,Expected Value After Useful Life,Очікуване значення після строку корисного використання
 DocType: Item,Reorder level based on Warehouse,Рівень Зміна порядку на основі Склад
-DocType: Activity Cost,Billing Rate,Платіжна Оцінити
-,Qty to Deliver,Кількість для доставки
+DocType: Activity Cost,Billing Rate,Ціна для виставлення у рахунку
+,Qty to Deliver,К-сть для доставки
 DocType: Monthly Distribution Percentage,Month,Місяць
-,Stock Analytics,Сток Аналітика
+,Stock Analytics,Аналіз інвентаря
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +373,Operations cannot be left blank,"Операції, що не може бути залишено порожнім"
 DocType: Maintenance Visit Purpose,Against Document Detail No,На деталях документа немає
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +72,Party Type is mandatory,Тип партії є обов&#39;язковим
@@ -2538,84 +2568,85 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +376,{0} {1} is cancelled or closed,{0} {1} скасовано або закрито
 DocType: Delivery Note,Track this Delivery Note against any Project,Підписка на накладну проти будь-якого проекту
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Cash from Investing,Чисті грошові кошти від інвестиційної
-,Is Primary Address,Є первинним Адреса
-DocType: Production Order,Work-in-Progress Warehouse,Робота-в-Прогрес Склад
+,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/accounts/doctype/journal_entry/journal_entry.py +324,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,Управління адрес
+apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Керування адресами
 DocType: Asset,Item Code,Код товару
 DocType: Production Planning Tool,Create Production Orders,Створити виробничі замовлення
-DocType: Serial No,Warranty / AMC Details,Гарантія / КУА Детальніше
+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 +848,Paid Amount cannot be greater than total negative outstanding amount {0},Сплачена сума не може бути більше сумарного негативного непогашеної {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +859,Paid Amount cannot be greater than total negative outstanding amount {0},Сплачена сума не може бути більше сумарного негативного непогашеної {0}
 DocType: Employee Internal Work History,Employee Internal Work History,Співробітник внутрішньої історії роботи
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +233,Closing (Dr),Закриття (д-р)
 DocType: Cheque Print Template,Cheque Size,Cheque Розмір
 DocType: Contact,Passive,Пасивний
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.js +49,View attendance,Перегляд відвідуваності
 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 +159,Tax template for selling transactions.,Податковий шаблон для операцій продажу.
 DocType: Sales Invoice,Write Off Outstanding Amount,Списання суми заборгованості
 DocType: Account,Accounts Manager,Диспетчер облікових записів
-DocType: Stock Settings,Default Stock UOM,За замовчуванням одиниця виміру зі
+DocType: Stock Settings,Default Stock UOM,Одиниця виміру за замовчуванням
 DocType: Asset,Number of Depreciations Booked,Кількість відрахувань на амортизацію бронювання
 DocType: Landed Cost Item,Receipt Document,прийом документів
-DocType: Production Planning Tool,Create Material Requests,Створити запити Матеріал
+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 +57,Expected Value After Useful Life must be less than Gross Purchase Amount,"Очікуване значення після строку корисного використання повинен бути менше, ніж сума валового Купівля"
-DocType: Sales Invoice Item,Available Qty at Warehouse,Доступно Кількість на складі
-,Billed Amount,Оголошений Сума
+DocType: Sales Invoice Item,Available Qty at Warehouse,Доступна к-сть на складі
+,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 +555,'Update Stock' cannot be checked for fixed asset sale,&#39;Update Stock&#39; не можуть бути перевірені на фіксованій продажу активів
-DocType: Bank Reconciliation,Bank Reconciliation,Банк примирення
+DocType: Student Guardian,Father,батько
+apps/erpnext/erpnext/controllers/accounts_controller.py +558,'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/buying/doctype/purchase_order/purchase_order.py +132,Material Request {0} is cancelled or stopped,Матеріал Запит {0} ануляції або зупинився
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +132,Material Request {0} is cancelled or stopped,Замовлення матеріалів {0} відмінено або призупинено
 apps/erpnext/erpnext/public/js/setup_wizard.js +313,Add a few sample records,Додати кілька пробних записів
 apps/erpnext/erpnext/config/hr.py +243,Leave Management,Залишити управління
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Група по рахунок
 DocType: Sales Order,Fully Delivered,Повністю Поставляється
 DocType: Lead,Lower Income,Нижня дохід
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","Рахунок глава під відповідальності, в якому прибуток / збиток будуть заброньовані"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +166,Source and target warehouse cannot be same for row {0},Джерело і мета склад не може бути таким же для рядка {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Різниця аккаунт повинен бути тип рахунки активів / пасивів, так як це зі Примирення є запис Відкриття"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +81,Purchase Order number required for Item {0},"Купівля Номер замовлення, необхідну для п {0}"
-apps/erpnext/erpnext/stock/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 +17,Cannot change status as student {0} is linked with student application {1},Неможливо змінити статус студента {0} пов&#39;язаний з додатком студента {1}
+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/purchase_receipt/purchase_receipt.py +82,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}
 DocType: Timesheet,"List of employee which has ""Salary Slip Based on Timesheet"" is enabled in salary structure.","Список працівника, який має &quot;Зарплатний Сліп На основі Timesheet&quot; включена в структурі заробітної плати."
 DocType: Asset,Fully Depreciated,повністю амортизується
-,Stock Projected Qty,Фото Прогнозований Кількість
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Customer {0} does not belong to project {1},Замовник {0} не належить до проекту {1}
+,Stock Projected Qty,Прогнозований складський залишок
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,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,Серійний номер і пакетна
+DocType: Sales Order,Customer's Purchase Order,Оригінал замовлення клієнта
+apps/erpnext/erpnext/config/stock.py +107,Serial No and Batch,Серійний номер та партія
 DocType: Warranty Claim,From Company,Від компанії
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +75,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 +400,Productions Orders cannot be raised for:,Продукції Замовлення не можуть бути підняті для:
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,Minute,Хвилин
 DocType: Purchase Invoice,Purchase Taxes and Charges,Купити податки і збори
-,Qty to Receive,Кількість на отримання
+,Qty to Receive,К-сть на отримання
 DocType: Leave Block List,Leave Block List Allowed,Залишити Чорний список тварин
-apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +55,All Warehouses,всі склади
+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 +105,Credit To account must be a Balance Sheet account,Кредит на рахунку повинен бути баланс рахунку
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Всі типи Постачальник
 DocType: Global Defaults,Disable In Words,Відключити в словах
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,Item Code is mandatory because Item is not automatically numbered,"Код товару є обов&#39;язковим, оскільки товар не автоматично нумеруються"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Цитата {0} типу {1}
+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 +154,Bank Overdraft Account,Овердрафт рахунок
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Зробити зарплата Сліп
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +26,Browse BOM,Відображення специфікації
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,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/asset/depreciation.py +94,Please set Depreciation related Accounts in Asset Category {0} or Company {1},"Будь ласка, встановіть Амортизація відповідних рахунків в Asset Категорія {0} або компанії {1}"
-DocType: Academic Year,Academic Year,Навчальний рік
+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
 DocType: Appraisal,Appraisal,Оцінка
@@ -2623,35 +2654,36 @@
 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 +197,Leave approver must be one of {0},Залишити затверджує повинен бути одним з {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,Leave approver must be one of {0},Погоджувачем відпустки повинен бути однин з {0}
 DocType: Hub Settings,Seller Email,Продавець E-mail
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Загальна вартість покупки (через рахунок покупки)
 DocType: Workstation Working Hour,Start Time,Час початку
-DocType: Item Price,Bulk Import Help,Масовий імпорт Допомога
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +256,Select Quantity,Виберіть Кількість
+DocType: Item Price,Bulk Import Help,Допомога по масовому імпорту
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +257,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,"Рахунок з дочірніх вузлів, не може бути встановлений як книгу"
 DocType: C-Form,II,II
-DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,"Швидкість, з якою Прайс-лист валюта конвертується в базову валюту замовника"
+DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,"Курс, за яким валюта прайс-листа конвертується у базову валюту покупця"
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Чиста сума (Компанія валют)
-DocType: Salary Slip,Hour Rate,Година Оцінити
+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,Матеріал для виготовлення Переведений
 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.,Або мета або ціль Кількість Сума є обов&#39;язковим.
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Кінцева к-сть або сума є обов'язковими
 apps/erpnext/erpnext/config/projects.py +45,Cost of various activities,Вартість різних видів діяльності
 apps/erpnext/erpnext/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 +149,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 +104,Not allowed to update stock transactions older than {0},Не допускається оновлення складських операцій старше {0}
 DocType: Item,Inspection Required,Інспекція Обов&#39;язково
 DocType: Purchase Invoice Item,PR Detail,PR-Деталь
-DocType: Sales Order,Fully Billed,Повністю Оголошений
+DocType: Sales Order,Fully Billed,Повністю включено у рахунки
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Готівка касова
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +123,Delivery warehouse required for stock item {0},Склад Доставка потрібно для фондового пункту {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +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,Користувачі з цією роллю можуть встановлювати заморожені рахунки і створювати / змінювати записи бухгалтерського обліку стосовно заморожених рахунків
@@ -2660,67 +2692,67 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Навіть якщо є кілька правил ціноутворення з найвищим пріоритетом, то наступні внутрішні пріоритети застосовуються:"
 DocType: Cheque Print Template,Cheque Height,Cheque Висота
 DocType: Sales Invoice Item,Total Margin,Загальна маржа
-DocType: Supplier,Supplier Details,Постачальник Подробиці
+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 +138,Wire Transfer,Банківський переказ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,Банківський переказ
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Перевірити все
-DocType: Sales Order,Recurring Order,Періодична Замовити
-DocType: Company,Default Income Account,За замовчуванням Рахунок Доходи
+DocType: Sales Order,Recurring Order,Періодичне замовлення
+DocType: Company,Default Income Account,Рахунок доходів за замовчуванням
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Група клієнтів / клієнтів
 DocType: Sales Invoice,Time Sheets,Time Sheets
 DocType: Payment Gateway Account,Default Payment Request Message,За замовчуванням Оплата Повідомлення запиту
-DocType: Item Group,Check this if you want to show in website,"Перевірте це, якщо ви хочете, щоб показати на веб-сайті"
+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,Свинець у Котирувальний
+,Welcome to ERPNext,Вітаємо у ERPNext
+apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,Lead у Пропозицію
 DocType: Lead,From Customer,Від Замовника
-apps/erpnext/erpnext/demo/setup_data.py +357,Calls,Дзвінки
+apps/erpnext/erpnext/demo/setup/setup_data.py +300,Calls,Дзвінки
 DocType: Project,Total Costing Amount (via Time Logs),Всього Калькуляція Сума (за допомогою журналів Time)
-DocType: Purchase Order Item Supplied,Stock UOM,Фото Одиниця виміру
-apps/erpnext/erpnext/stock/doctype/item/item.py +466,"As there are existing transactions for this item, \
-							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Оскільки існують існуючі транзакції для даного елемента, \ ви не можете змінити значення &#39;Має серійний номер&#39;, &#39;Має Batch No&#39;, &#39;Is Stock Пункт &quot;і&quot; Оцінка Метод &quot;"
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,Purchase Order {0} is not submitted,Замовлення на {0} не представлено
+DocType: Purchase Order Item Supplied,Stock UOM,Одиниця виміру запасів
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,Purchase Order {0} is not submitted,Замовлення на закупівлю{0} не проведено
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,Прогнозований
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Серійний номер {0} не належить Склад {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Серійний номер {0} не належить до складу {1}
 apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,"Примітка: Система не перевірятиме по-доставки і більш-бронювання для Пункт {0}, як кількість або сума 0"
-DocType: Notification Control,Quotation Message,Цитата Повідомлення
+DocType: Notification Control,Quotation Message,Повідомлення пропозиції
 DocType: Issue,Opening Date,Дата розкриття
-apps/erpnext/erpnext/schools/api.py +58,Attendance has been marked successfully.,Глядачі були успішно відзначені.
+apps/erpnext/erpnext/schools/api.py +57,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 +136,Account Type for {0} must be {1},Тип рахунку для {0} повинен бути {1}
+DocType: Purchase Receipt Item,Rate and Amount,Ціна та сума
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +139,Account Type for {0} must be {1},Тип рахунку для {0} повинен бути {1}
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Листя і відпустку
-DocType: Sales Order,Not Billed,Чи не Оголошений
+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.,Немає контактів ще не додавали.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Приземлився Вартість ваучера сума
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,"Законопроекти, підняті постачальників."
 DocType: POS Profile,Write Off Account,Списання аккаунт
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Сума знижки
-DocType: Purchase Invoice,Return Against Purchase Invoice,Повернутися в рахунку-фактурі проти
+DocType: Purchase Invoice,Return Against Purchase Invoice,Повернення згідно вхідного рахунку
 DocType: Item,Warranty Period (in days),Гарантійний термін (в днях)
-apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +40,Acutal qty in stock,Acutal кількість на складі
+apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +40,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/stock/report/bom_search/bom_search.js +26,Item 4,Пункт 4
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +20,Sub-contracting,Суб-стискання
+DocType: Student Admission,Admission End Date,Дата закінчення прийому
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +20,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,Цитата серії
+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 +1190,Please select customer,"Будь ласка, виберіть клієнта"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1193,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}: Компанія є обов&#39;язковим
-,Payment Period Based On Invoice Date,Оплата період на основі рахунку-фактури Дата
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Зниклих безвісти Курси валют на {0}
+DocType: 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}: Компанія є обов'язковою
+,Payment Period Based On Invoice Date,Період оплати базується на рахунку-фактурі
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Відсутні курси валют для {0}
 DocType: Assessment,Examiner,екзаменатор
-DocType: Journal Entry,Stock Entry,Фото запис
+DocType: Student,Siblings,Брати і сестри
+DocType: Journal Entry,Stock Entry,Рух ТМЦ
 DocType: Payment Entry,Payment References,посилання оплати
 DocType: C-Form,C-FORM-,C-form-
 DocType: Account,Payable,До оплати
@@ -2732,55 +2764,59 @@
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Зазор Дата
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +60,Gross Purchase Amount is mandatory,Валова сума покупки є обов&#39;язковим
-DocType: Lead,Address Desc,Адреса Опис вироби
+DocType: Lead,Address Desc,Опис адреси
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +75,Party is mandatory,Партія є обов&#39;язковим
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Назва теми
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Принаймні один з продажу або покупки повинен бути обраний
+DocType: Grading Structure,Grade Intervals,інтервали Оцінка
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Виберіть характер вашого бізнесу.
-apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Де виробничі операції проводяться.
-DocType: Asset Movement,Source Warehouse,Джерело Склад
+apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Де проводяться виробничі операції.
+DocType: Asset Movement,Source Warehouse,Вихідний склад
 DocType: Installation Note,Installation Date,Дата установки
-apps/erpnext/erpnext/controllers/accounts_controller.py +534,Row #{0}: Asset {1} does not belong to company {2},Рядок # {0}: Asset {1} не належить компанії {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +537,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 +46,Min Qty can not be greater than Max Qty,"Мінімальна Кількість не може бути більше, ніж Max Кількість"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,"Мін к-сть не може бути більше, ніж макс. к-сть"
 DocType: Account,Accumulated Depreciation,Накопиченої амортизації
 DocType: Stock Entry,Customer or Supplier Details,Замовник або Постачальник Подробиці
-DocType: Lead,Lead Owner,Ведучий Власник
+DocType: Lead,Lead Owner,Власник Lead-а
 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: Stock Settings,Auto Material Request,Авто-Замовлення матеріалів
+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/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 +111,Date Of Retirement must be greater than Date of Joining,"Дата виходу на пенсію повинен бути більше, ніж дата вступу"
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +49,There were errors while scheduling course on :,Були помилки При плануванні курсу по:
 DocType: Sales Invoice,Against Income Account,На рахунок доходів
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +87,{0}% Delivered,{0}% Доставлено
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Пункт {0}: Замовив Кількість {1} не може бути менше мінімального замовлення Кіл {2} (визначених у пункті).
+apps/erpnext/erpnext/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 +379,Please set default {0} in Company {1},"Будь ласка, встановіть значення за замовчуванням {0} в компанії {1}"
+apps/erpnext/erpnext/accounts/utils.py +456,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,Валовий прибуток / збиток
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Замовлення на поставлене продукт
 apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,Назва компанії не може бути компанія
-apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Лист глави для шаблонів друку.
+apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Фірмові заголовки для шаблонів друку.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Назви для шаблонів друку, наприклад рахунок-проформа."
+DocType: Student Guardian,Student Guardian,Студент-хранитель
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +184,Valuation type charges can not marked as Inclusive,Звинувачення типу Оцінка не може відзначений як включено
-DocType: POS Profile,Update Stock,Оновлення зі
+DocType: POS Profile,Update Stock,Оновити запас
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Різні Одиниця виміру для елементів призведе до неправильної (всього) значення маси нетто. Переконайтеся, що вага нетто кожного елемента знаходиться в тій же UOM."
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Специфікація Оцінити
+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 +349,Journal Entries {0} are un-linked,Журнал Записів {0}-пов&#39;язана
+apps/erpnext/erpnext/accounts/utils.py +426,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,Виробники використовували в пунктах
+DocType: Manufacturer,Manufacturers used in Items,"Виробники, що використовувалися у позиції"
 apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,"Будь ласка, вкажіть округлити МВЗ в Компанії"
-DocType: Purchase Invoice,Terms,Терміни
+DocType: Purchase Invoice,Terms,Положення
 DocType: Academic Term,Term Name,термін Ім&#39;я
 DocType: Buying Settings,Purchase Order Required,"Купівля порядку, передбаченому"
 ,Item-wise Sales History,Пункт мудрий Історія продажів
@@ -2789,101 +2825,104 @@
 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},Серійний номер є обов&#39;язковим для пп {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +79,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}
+,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 +79,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Видалити посилання на клієнта, постачальника, торгового партнера і свинцю, як це ваша компанія адреса"
+apps/erpnext/erpnext/utilities/doctype/address/address.py +79,"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,Форум
+DocType: Homepage,"URL for ""All Products""",URL для &quot;Все продукти&quot;
 DocType: Leave Application,Leave Balance Before Application,Залишити баланс перед нанесенням
 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: Cheque Print Template,Width of amount in word,"Ширина ""суми словами"""
+DocType: Company,Default Letter Head,Фірмовий заголовок за замовчуванням
+DocType: Purchase Order,Get Items from Open Material Requests,Отримати елементів із відкритого Замовлення матеріалів
 DocType: Item,Standard Selling Rate,Стандартний курс продажу
-DocType: Account,Rate at which this tax is applied,"Швидкість, з якою цей податок застосовується"
+DocType: Account,Rate at which this tax is applied,Вартість при якій застосовується цей податок
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Зміна порядку Кількість
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +29,Current Job Openings,Поточні вакансії Вакансії
-DocType: Company,Stock Adjustment Account,Фото коригування рахунку
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,Current Job Openings,Поточні вакансії Вакансії
+DocType: Company,Stock Adjustment Account,Рахунок підлаштування інвентаря
 DocType: Journal Entry,Write Off,Списувати
 DocType: Timesheet Detail,Operation ID,Код операції
-DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Система користувача (Логін) ID. Якщо встановлено, то це стане за замовчуванням для всіх форм HR."
+DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Ім’я Системного користувача. Якщо зазначене, то воно стане за замовчуванням для всіх форм відділу кадрів."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: З {1}
 DocType: Task,depends_on,залежить від
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +24,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,"Ім&#39;я нового Користувача. Примітка: Будь ласка, не створювати облікові записи для клієнтів і постачальників"
-DocType: BOM Replace Tool,BOM Replace Tool,Специфікація Замінити інструмент
-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}) немає в наявності
+DocType: BOM Replace Tool,BOM Replace Tool,Інструмент замінності норм
+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/controllers/recurring_document.py +174,Next Date must be greater than Posting Date,"Наступна дата повинна бути більше, ніж Дата публікації"
-apps/erpnext/erpnext/public/js/controllers/transaction.js +850,Show tax break-up,Показати податок розпад
+apps/erpnext/erpnext/public/js/controllers/transaction.js +841,Show tax break-up,Показати податок розпад
 apps/erpnext/erpnext/accounts/party.py +308,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 +188,"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/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 +24,Sell,продавати
 DocType: Sales Invoice,Rounded Total,Округлі Всього
 DocType: Product Bundle,List items that form the package.,"Список предметів, які утворюють пакет."
-apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Відсоток Розподіл має дорівнювати 100%
-DocType: Serial No,Out of AMC,З КУА
+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 +534,Please select Posting Date before selecting Party,"Будь ласка, виберіть Дата публікації, перш ніж вибрати партію"
+DocType: Serial No,Out of AMC,З Контракту на річне обслуговування
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +80,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 +162,Please contact to the user who have Sales Master Manager {0} role,"Будь ласка, зв&#39;яжіться з користувачем, які мають по продажах Майстер диспетчера {0} роль"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +195,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 +5,This is based on the attendance of this Student,Це засновано на відвідуваності цього студента
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +165,Add more items or open full form,Додайте більше деталей або відкриту повну форму
 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 +75,Paid amount + Write Off Amount can not be greater than Grand Total,"Платні сума + Списання Сума не може бути більше, ніж загальний підсумок"
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,{0} is not a valid Batch Number for Item {1},{0} не є допустимим Номер партії за Пункт {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +138,Note: There is not enough leave balance for Leave Type {0},Примітка: Існує не достатньо відпустку баланс Залиште Тип {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +75,Paid amount + Write Off Amount can not be greater than Grand Total,"Оплачена сума + Сума списання не може бути більше, ніж загальний підсумок"
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,{0} is not a valid Batch Number for Item {1},"{0} не є допустимим номером партії 
+для позиції {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,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,Можливість Тип
+DocType: Item,Supplier Items,Товарні позиції постачальника
+DocType: Opportunity,Opportunity Type,Тип Нагоди
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,Нова компанія
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,Cost Center is required for 'Profit and Loss' account {0},Центр Вартість необхідний для &#39;про прибутки і збитки &quot;рахунок {0}
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Угоди можуть бути видалені тільки творцем компанії
 apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,"Невірне кількість General Ledger записів знайдено. Ви, можливо, вибрано неправильний рахунок в угоді."
 DocType: Cheque Print Template,Cheque Width,Cheque Ширина
 DocType: Program,Fee Schedule,плата Розклад
 DocType: Hub Settings,Publish Availability,Опублікувати Наявність
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,"Дата народження не може бути більше, ніж сьогодні."
-,Stock Ageing,Фото Старіння
+,Stock Ageing,Застарівання інвентаря
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,Розклад
-apps/erpnext/erpnext/controllers/accounts_controller.py +228,{0} '{1}' is disabled,{0} {1} 'неактивований
+apps/erpnext/erpnext/controllers/accounts_controller.py +231,{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: Cheque Print Template,Scanned Cheque,Сканований чек
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Відправити автоматичні листи на Контакти Про подання операцій.
+DocType: Timesheet,Total Billable Amount,Загальна сума Виплачуваний
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Пункт 3
 DocType: Purchase Order,Customer Contact Email,Контакти з клієнтами E-mail
 DocType: Warranty Claim,Item and Warranty Details,Предмет і відомості про гарантії
 DocType: Sales Team,Contribution (%),Внесок (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Примітка: Оплата запис не буде створена, так як &quot;Готівкою або банківський рахунок&quot; не було зазначено"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Responsibilities,Обов&#39;язки
+apps/erpnext/erpnext/controllers/accounts_controller.py +78,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,Обов&#39;язки
 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,Продажі Особа Ім&#39;я
-apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,"Будь ласка, введіть принаймні 1-фактуру в таблиці"
+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,Додавання користувачів
 DocType: Pricing Rule,Item Group,Пункт Група
-DocType: Item,Safety Stock,запасу безпеки
+DocType: Item,Safety Stock,Безпечний запас
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Код товару&gt; Група товару&gt; Марка
 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} повинен мати обліковий запис типу податку або доходів або витрат або платно
-DocType: Sales Order,Partly Billed,Невелика Оголошений
+DocType: Sales Order,Partly Billed,Частково є у виставлених рахунках
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} must be a Fixed Asset Item,Пункт {0} повинен бути Fixed Asset Item
-DocType: Item,Default BOM,За замовчуванням BOM
+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,Загальна сума заборгованості з Amt
-DocType: Timesheet,Total Hours,Загальна кількість годин
 DocType: Journal Entry,Printing Settings,Налаштування друку
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Total Debit must be equal to Total Credit. The difference is {0},"Всього Дебет повинна дорівнювати загальній виробленні. Різниця в тому, {0}"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Автомобільний
@@ -2895,14 +2934,15 @@
 DocType: Notification Control,Custom Message,Текст повідомлення
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Інвестиційний банкінг
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +71,Cash or Bank Account is mandatory for making payment entry,Готівкою або банківський рахунок є обов&#39;язковим для внесення запису оплата
-DocType: Purchase Invoice,Price List Exchange Rate,Ціни обмінний курс
-DocType: Purchase Invoice Item,Rate,Ставка
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Intern,Інтерн
-DocType: Stock Entry,From BOM,З специфікації
+DocType: Purchase Invoice,Price List Exchange Rate,Обмінний курс прайс-листа
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Клієнт&gt; Група клієнтів&gt; Територія
+DocType: Purchase Invoice Item,Rate,Ціна
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,Інтерн
+DocType: Stock Entry,From BOM,З норм
 DocType: Assessment,Assessment Code,код оцінки
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +32,Basic,Основний
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +97,Stock transactions before {0} are frozen,Біржові операції до {0} заморожені
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Будь ласка, натисніть на кнопку &quot;Generate&quot; Розклад"
+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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule',"Будь ласка, натисніть на кнопку &quot;Generate&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","наприклад, кг, Розділ, Ніс, м"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,"Посилання № є обов&#39;язковим, якщо ви увійшли Reference Дата"
@@ -2911,11 +2951,11 @@
 DocType: Salary Slip,Salary Structure,Зарплата Структура
 DocType: Account,Bank,Банк
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Авіакомпанія
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +752,Issue Material,Матеріал Випуск
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +723,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 +683,You are in offline mode. You will not be able to reload until you have network.,Ви перебуваєте в автономному режимі. Ви не зможете перезавантажити поки у вас є мережа.
+DocType: Employee,Offer Date,Дата влаштування
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Пропозиції
+apps/erpnext/erpnext/accounts/page/pos/pos.js +665,You are in offline mode. You will not be able to reload until you have network.,Ви перебуваєте в автономному режимі. Ви не зможете оновити доки не відновите зв’язок.
 DocType: Hub Settings,Access Token,Маркер доступу
 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,Серійний номер
@@ -2923,49 +2963,51 @@
 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 +1122,Enter value must be positive,Введіть значення має бути позитивним
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,All Territories,Всі території
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1125,Enter value must be positive,Значення має бути позитивним
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,Всі території
 DocType: Purchase Invoice,Items,Предмети
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +23,Student is already enrolled.,Студент вже надійшов.
 DocType: Fiscal Year,Year Name,Рік Назва
 DocType: Process Payroll,Process Payroll,Процес розрахунку заробітної плати
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,"Є більше свят, ніж робочих днів у цьому місяці."
-DocType: Product Bundle Item,Product Bundle Item,Продукт Зв&#39;язка товару
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +233,There are more holidays than working days this month.,"Є більше свят, ніж робочих днів у цьому місяці."
+DocType: Product Bundle Item,Product Bundle Item,Комплект
 DocType: Sales Partner,Sales Partner Name,Партнер по продажах Ім&#39;я
-apps/erpnext/erpnext/hooks.py +96,Request for Quotations,Запит на надання пропозицій
+apps/erpnext/erpnext/hooks.py +104,Request for Quotations,Запит на надання пропозицій
 DocType: Payment Reconciliation,Maximum Invoice Amount,Максимальна Сума рахунку
 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 +628,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"За замовчуванням Одиниця виміру для варіанту &#39;{0}&#39; має бути такою ж, як в шаблоні &quot;{1} &#39;"
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"За од.вим. за замовчуванням для варіанту '{0}' має бути такою ж, як в шаблоні ""{1} '"
 DocType: Shipping Rule,Calculate Based On,"Розрахувати, засновані на"
 DocType: Delivery Note Item,From Warehouse,Від Склад
-DocType: Assessment,Supervisor Name,ім&#39;я супервізора
+DocType: Assessment,Supervisor Name,Ім'я супервайзера
+DocType: Assessment,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: Tax Rule,Shipping City,Місто доставки
+apps/erpnext/erpnext/stock/doctype/item/item.js +62,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Цей пункт є Варіантом {0} (шаблон). Атрибути будуть перезаписані з шаблону, хіба що встановлене ""Не копіювати"""
 DocType: Account,Purchase User,Купівля користувача
 DocType: Notification Control,Customize the Notification,Налаштувати повідомлення
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Cash Flow from Operations,Потік грошових коштів від операцій
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,За замовчуванням Адреса Шаблон не може бути видалений
-DocType: Sales Invoice,Shipping Rule,Правило Доставка
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,Шаблон адреси за замовчуванням не може бути видалений
+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/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,Сирий матеріал
+DocType: Asset,Amended From,Відновлено з
+apps/erpnext/erpnext/public/js/setup_wizard.js +295,Raw Material,Сировина
 DocType: Leave Application,Follow via Email,Дотримуйтесь по електронній пошті
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plants and Machineries,Рослини і Механізмів
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Сума податку після скидки Сума
 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/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Або мета або ціль Кількість Сума є обов&#39;язковим
-apps/erpnext/erpnext/stock/get_item_details.py +485,No default BOM exists for Item {0},Немає за замовчуванням специфікації не існує для п {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +336,Please select Posting Date first,"Будь ласка, виберіть проводки Дата першого"
+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 +486,No default BOM exists for Item {0},Немає НВ за замовчуванням для елемента {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +326,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,"Центр Вартість з існуючими операцій, не може бути перетворений в бухгалтерській книзі"
@@ -2974,18 +3016,19 @@
 DocType: Item,Item Code for Suppliers,Код товару для постачальників
 DocType: Issue,Raised By (Email),Raised By (E-mail)
 DocType: Mode of Payment,General,Генеральна
-apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,Прикріпіть бланка
+apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,Долучити фірмовий заголовок
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +338,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Не можете відняти, коли категорія для &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/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Серійний пп Обов&#39;язково для серіалізовані елемент {0}
-apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Відповідність Платежі з рахунків-фактур
+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/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Серійні номери обов'язкові для серіалізованої позиції номенклатури {0}
+apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Зв'язати платежі з рахунками-фактурами
 DocType: Journal Entry,Bank Entry,Банк Стажер
 DocType: Authorization Rule,Applicable To (Designation),Застосовується до (Позначення)
+,Profitability Analysis,аналіз рентабельності
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,Додати в кошик
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Група За
 DocType: Guardian,Interests,інтереси
 apps/erpnext/erpnext/config/accounts.py +262,Enable / disable currencies.,Включити / відключити валюти.
-DocType: Production Planning Tool,Get Material Request,Отримати матеріал Запит
+DocType: Production Planning Tool,Get Material Request,Отримати Замовлення матеріалів
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Postal Expenses,Поштові витрати
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Всього (АМТ)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Розваги і дозвілля
@@ -2993,162 +3036,165 @@
 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 +141,"Serialized Item {0} cannot be updated \
-					using Stock Reconciliation",Серійний товару {0} не може бути оновлена \ на примирення зі
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
+					using Stock Reconciliation",Серійну номенклатурну позицію {0} неможливо оновити \ з використанням інвентаризації
 DocType: Scheduling Tool,Day,день
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Новий Серійний номер не може бути склад. Склад повинен бути встановлений на Фондовій запис або придбати отриманні
-DocType: Lead,Lead Type,Ведучий Тип
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,You are not authorized to approve leaves on Block Dates,Ви не уповноважений стверджувати листя на Блок Терміни
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,All these items have already been invoiced,Всі ці предмети вже виставлений
+apps/erpnext/erpnext/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 +129,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: Student Applicant,AP.,AP.
+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 +639,Point of Sale,Касовий термінал
+DocType: Shipping Rule,Shipping Rule Conditions,Умови правил доставки
+DocType: BOM Replace Tool,The new BOM after replacement,Нові НВ після заміни
+apps/erpnext/erpnext/accounts/page/pos/pos.js +634,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,Податок
 DocType: Production Planning Tool,Production Planning Tool,Планування виробництва інструменту
 DocType: Quality Inspection,Report Date,Дата звіту
 DocType: Student,Middle Name,батькові
-DocType: C-Form,Invoices,Рахунки
+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 +373,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 Entry,Update Rate and Availability,Частота оновлення і доступність
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Відсоток вам дозволено отримати або доставити більше порівняно з замовленої кількості. Наприклад: Якщо ви замовили 100 одиниць. і ваше допомога становить 10%, то ви маєте право отримати 110 одиниць."
 DocType: POS Profile,Customer Group,Група клієнтів
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,Expense account is mandatory for item {0},Витрати рахунку є обов&#39;язковим для пункту {0}
-DocType: Item,Website Description,Сайт Опис
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date must be on or after today,"Наступний Знос Дата повинна бути на або після того, як сьогодні"
+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 +145,Please cancel Purchase Invoice {0} first,"Будь ласка, скасувати рахунки покупки {0} першим"
-DocType: Serial No,AMC Expiry Date,КУА Дата закінчення терміну дії
-,Sales Register,Продажі Реєстрація
-DocType: Quotation,Quotation Lost Reason,Цитата Втрати Причина
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +145,Please cancel Purchase Invoice {0} first,"Будь ласка, відмініть спочатку вхідний рахунок {0}"
+DocType: Serial No,AMC Expiry Date,Дата закінчення річного обслуговування
+,Sales Register,Реєстр продаж
+DocType: Quotation,Quotation Lost Reason,Причина втрати пропозиції
+apps/erpnext/erpnext/utilities/doctype/address/address.py +164,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,"Ні адреси за замовчуванням шаблону, не знайдено. Будь ласка, створіть новий з Setup&gt; Друк і Брендинг&gt; Адреса шаблону."
 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 +330,Transaction reference no {0} dated {1},Референція угода не {0} від {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Transaction reference no {0} dated {1},Референція угода не {0} від {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,"Там немає нічого, щоб змінити."
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,Summary for this month and pending activities,Резюме для цього місяця і в очікуванні діяльності
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Результати для цього місяця та незакінчена діяльність
 DocType: Customer Group,Customer Group Name,Група Ім&#39;я клієнта
 apps/erpnext/erpnext/public/js/financial_statements.js +54,Cash Flow Statement,Звіт про рух грошових
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Please remove this Invoice {0} from C-Form {1},"Будь ласка, видаліть цю фактуру {0} з C-Form {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,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 +644,Get Items,Отримати товари
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +623,Get Items,Отримати товари
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +210,Please enter Write Off Account,"Будь ласка, введіть Списання аккаунт"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Остання дата замовлення
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +41,Account {0} does not belongs to company {1},Рахунок {0} не належить компанії {1}
+DocType: Student,Guardian Details,Детальніше Гардіан
 DocType: C-Form,C-Form,С-форма
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Марк відвідуваності для декількох співробітників
 DocType: Payment Request,Initiated,З ініціативи
 DocType: Production Order,Planned Start Date,Планована дата початку
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,Customer is required against Receivable account {0},Клієнт зобов&#39;язаний щодо дебіторів рахунки {0}
 DocType: Serial No,Creation Document Type,Створення типу документа
 DocType: Leave Type,Is Encash,Є Обналічиваніє
 DocType: Purchase Invoice,Mobile No,Номер мобільного
 DocType: Leave Allocation,New Leaves Allocated,Нові листя номером
-apps/erpnext/erpnext/controllers/trends.py +265,Project-wise data is not available for Quotation,Дані проекту мудрий не доступні для цитати
+apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Проектні дані не доступні для пропозиції
 DocType: Project,Expected End Date,Очікувана Дата закінчення
 DocType: Budget Account,Budget Amount,сума бюджету
 DocType: Appraisal Template,Appraisal Template Title,Оцінка шаблону Назва
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,Commercial,Комерційна
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Commercial,Комерційна
 DocType: Payment Entry,Account Paid To,Рахунок оплачено до
-apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Батько товару {0} не повинні бути зі пункт
+apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Батьківській елемент {0} не повинен бути складським
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Всі продукти або послуги.
-DocType: Supplier Quotation,Supplier Address,Постачальник Адреса
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +648,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,З Кількість
+DocType: Supplier Quotation,Supplier Address,Адреса постачальника
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,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 +30,Series is mandatory,Серія є обов&#39;язковим
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +50,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/stock/doctype/delivery_note/delivery_note.py +165,Warehouse required for stock Item {0},Необхідно вказати склад для номенклатури {0}
 DocType: Leave Allocation,Unused leaves,Невикористані листя
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Cr,Cr
 DocType: Tax Rule,Billing State,Державний рахунків
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +250,Transfer,Переклад
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +187,{0} {1} does not associated with Party Account {2},{0} {1} не пов&#39;язаний з аккаунтом партії {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,Fetch exploded BOM (including sub-assemblies),Fetch розібраному специфікації (у тому числі вузлів)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +254,Transfer,Переклад
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +190,{0} {1} does not associated with Party Account {2},{0} {1} не пов&#39;язаний з аккаунтом партії {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +796,Fetch exploded BOM (including sub-assemblies),Зібрати розібрану НВ (у тому числі вузлів)
 DocType: Authorization Rule,Applicable To (Employee),Застосовується до (Співробітник)
-apps/erpnext/erpnext/controllers/accounts_controller.py +115,Due Date is mandatory,Завдяки Дата є обов&#39;язковим
+apps/erpnext/erpnext/controllers/accounts_controller.py +118,Due Date is mandatory,Завдяки Дата є обов&#39;язковим
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Приріст за атрибут {0} не може бути 0
 DocType: Journal Entry,Pay To / Recd From,Зверніть Для / RECD Від
-DocType: Naming Series,Setup Series,Серія установки
+DocType: Naming Series,Setup Series,Налаштування серій
 DocType: Payment Reconciliation,To Invoice Date,Рахунки-фактури Дата
 DocType: Supplier,Contact HTML,Зв&#39;язатися з HTML-
 ,Inactive Customers,неактивні Клієнти
-DocType: Landed Cost Voucher,Purchase Receipts,Купівля Надходження
+DocType: Landed Cost Voucher,LCV,LCV
+DocType: Landed Cost Voucher,Purchase Receipts,Прихідні накладні
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Як правило Ціни застосовується?
 DocType: Quality Inspection,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: 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 +120,Customer {0} does not exist,Замовник {0} не існує
 DocType: Attendance,Absent,Відсутнім
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +587,Product Bundle,Зв&#39;язка товарів
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Product Bundle,Комплект
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Invalid reference {1},Ряд {0}: Неприпустима посилання {1}
-DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Купити податки і збори шаблон
-DocType: Upload Attendance,Download Template,Завантажити Шаблон
+DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Шаблон податків та зборів на закупку
+DocType: Upload Attendance,Download Template,Звантажити шаблон
 DocType: Timesheet,TS-,TS-
 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 +742,Send Supplier Emails,Надіслати Постачальник електронних листів
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +104,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Зарплата вже обробили за період між {0} і {1}, Залиште період застосування не може бути в межах цього діапазону дат."
+DocType: Stock Settings,Show Barcode Field,Показати поле штрих-коду
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +708,Send Supplier Emails,Надіслати Постачальник електронних листів
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,"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,опікун Відсотки
 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,Налаштування для сайту домашню сторінку
+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/accounts/doctype/gl_entry/gl_entry.py +77,Account {0} cannot be a Group,Рахунок {0} не може бути група
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} cannot be a Group,Рахунок {0} не може бути група
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +31,Optional. This setting will be used to filter in various transactions.,Необов&#39;язково. Ця установка буде використовуватися для фільтрації в різних угод.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +107,Negative Valuation Rate is not allowed,Негативний Оцінка Оцініть не допускається
-DocType: Holiday List,Weekly Off,Щотижневий Викл
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Від'ємна собівартість не допускається
+DocType: Holiday List,Weekly Off,Щотижневий вихідний
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Для наприклад 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +39,Provisional Profit / Loss (Credit),Попередня прибуток / збиток (кредит)
-DocType: Sales Invoice,Return Against Sales Invoice,Повернутися проти накладна
+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,Продукт Зв&#39;язка Допомога
+DocType: Sales Invoice,Product Bundle Help,Допомога по комплектам
 ,Monthly Attendance Sheet,Щомісячна відвідуваність лист
 DocType: Production Order Item,Production Order Item,Виробничий замовлення товару
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,"Чи не запис, не знайдено"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,Вартість списаних активів
-apps/erpnext/erpnext/controllers/stock_controller.py +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Вартість Центр є обов'язковим для товару {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +626,Get Items from Product Bundle,Отримати елементів з комплекту продукту
+apps/erpnext/erpnext/controllers/stock_controller.py +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Вартість Центр є обов'язковим для об’єкту {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +605,Get Items from Product Bundle,Отримати елементи з комплекту
 DocType: Asset,Straight Line,Пряма лінія
 DocType: Project User,Project User,проект Користувач
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} is inactive,Рахунок {0} не діє
-DocType: GL Entry,Is Advance,Є Попередня
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} is inactive,Рахунок {0} неактивний
+DocType: GL Entry,Is Advance,Є попередня
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Відвідуваність З Дата і відвідуваність Дата є обов&#39;язковим
-apps/erpnext/erpnext/controllers/buying_controller.py +148,Please enter 'Is Subcontracted' as Yes or No,"Будь ласка, введіть &quot;субпідряду&quot;, як так чи ні"
+apps/erpnext/erpnext/controllers/buying_controller.py +148,Please enter 'Is Subcontracted' as Yes or No,"Будь ласка, введіть ""субпідряджено"", як так чи ні"
 DocType: Sales Team,Contact No.,Зв&#39;язатися No.
 DocType: Bank Reconciliation,Payment Entries,записи оплати
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,'Profit and Loss' type account {0} not allowed in Opening Entry,"""Прибуток і витрати"" тип рахунку {0} не допускаються в Відкритих Записах"
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +71,'Profit and Loss' type account {0} not allowed in Opening Entry,"Тип рахунку {0} ""Прибуток і витрати"" не допускаються у введенні початкових даних"
 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 +278,Publish Items on Website,Опублікувати об’єкти на веб-сайті
 DocType: Authorization Rule,Authorization Rule,Авторизація Правило
-DocType: Sales Invoice,Terms and Conditions Details,Правила та умови подробиці
+DocType: Sales Invoice,Terms and Conditions Details,Деталі положень та умов
 apps/erpnext/erpnext/templates/generators/item.html +86,Specifications,Специфікації
-DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Продажі Податки і збори шаблону
+DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Шаблон податків та зборів на продаж
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Одяг та аксесуари
-apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Кількість ордена
+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; Редагувати заморожені Записи
@@ -3158,12 +3204,12 @@
 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 +558,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Рядок # {0}: Asset {1} не може бути представлено, вже {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +561,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Рядок # {0}: Asset {1} не може бути представлено, вже {2}"
 DocType: Tax Rule,Billing Country,Платіжна Країна
 DocType: Production Order,Expected Delivery Date,Очікувана дата поставки
 apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Дебет і Кредит не рівні для {0} # {1}. Різниця {2}.
 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/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.
@@ -3171,13 +3217,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +202,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: Sales Order,% Amount Billed,Оплачена% Сума
-DocType: Production Order,Warehouse for reserving items,Склад для резервування предметів
+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 +117,No Item with Serial No {0},Немає товару з серійним № {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Відкриті Повідомлення
+DocType: Email Digest,Open Notifications,Відкриті Повідомлення
 DocType: Payment Entry,Difference Amount (Company Currency),Різниця Сума (Компанія Валюта)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,Прямі витрати
 apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
@@ -3185,42 +3231,41 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Новий Клієнт Виручка
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,Витрати на відрядження
 DocType: Maintenance Visit,Breakdown,Зламатися
-apps/erpnext/erpnext/controllers/accounts_controller.py +634,Account: {0} with currency: {1} can not be selected,Рахунок: {0} з валютою: {1} не може бути обраний
+apps/erpnext/erpnext/controllers/accounts_controller.py +637,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 +54,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!,"Успішно видалений всі угоди, пов&#39;язані з цією компанією!"
+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 +56,Probation,Випробувальний термін
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Probation,Випробувальний термін
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Зарплатні Компоненти
 DocType: Program Enrollment Tool,New Academic Year,Новий навчальний рік
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Payment of salary for the month {0} and year {1},Виплата заробітної плати за місяць {0} і рік {1}
-DocType: Stock Settings,Auto insert Price List rate if missing,"Авто вставка Швидкість Ціни, якщо не вистачає"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Payment of salary for the month {0} and year {1},Виплата заробітної плати за місяць {0} і рік {1}
+DocType: Stock Settings,Auto insert Price List rate if missing,Відсутня прайс-лист ціня для автовставки
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Всього сплачена сума
 DocType: Production Order Item,Transferred Qty,Переведений Кількість
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Навігаційний
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Planning,Планування
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,Планування
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,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/accounts/report/purchase_register/purchase_register.py +68,Supplier Id,Постачальник Id
+apps/erpnext/erpnext/public/js/setup_wizard.js +301,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 +212,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;язатися Опис вироби
-apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Тип листя, як випадкові, хворих і т.д."
+apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Тип відсутності, як-от випадкова, хвороба і т.д."
 DocType: Email Digest,Send regular summary reports via Email.,Відправити регулярні зведені звіти по електронній пошті.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Sales invoice submitted sucessfully.,"рахунки-фактури з продажу, представлений успішно."
 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}"
 DocType: Assessment Result,Student Name,Ім&#39;я студента
-apps/erpnext/erpnext/hooks.py +104,Assessment Schedule,Графік проведення оцінки
+apps/erpnext/erpnext/hooks.py +113,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.,Всі контакти.
@@ -3228,29 +3273,31 @@
 DocType: GL Entry,Party Type,Тип партія
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +78,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.,Зарплата шаблоном.
+apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Майстер зарплатних шаблонів
 DocType: Leave Type,Max Days Leave Allowed,Макс днів відпустки тварин
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Встановіть Податковий Правило кошику
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Встановіть податкове правило для кошику
 DocType: Purchase Invoice,Taxes and Charges Added,Податки і збори Додав
 ,Sales Funnel,Воронка продажів
 apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +25,Abbreviation is mandatory,Скорочення є обов'язковим
-,Qty to Transfer,Кількість для передачі
-apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Котирування на постачанні або клієнтів.
-DocType: Stock Settings,Role Allowed to edit frozen stock,Роль тварин редагувати заморожені акції
+,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,Роль з дозволом редагувати заморожені складські рухи
 ,Territory Target Variance Item Group-Wise,Територія Цільова Різниця Пункт Група Мудрий
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Customer Groups,Всі групи покупців
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +78,Accumulated Monthly,Накопичений в місяць
-apps/erpnext/erpnext/controllers/accounts_controller.py +595,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,"{0} є обов'язковим. Може бути, Обмін валюти запис не створена для {1} до {2}."
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +38,Tax Template is mandatory.,Податковий шаблону є обов&#39;язковим.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Рахунок {0}: Батько не існує обліковий запис {1}
-DocType: Purchase Invoice Item,Price List Rate (Company Currency),Ціни Оцінити (Компанія валют)
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Всі групи покупців
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +81,Accumulated Monthly,Накопичений в місяць
+apps/erpnext/erpnext/controllers/accounts_controller.py +598,{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}
+DocType: Purchase Invoice Item,Price List Rate (Company Currency),Ціна з прайс-листа (валюта компанії)
 DocType: Products Settings,Products Settings,налаштування Продукти
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +188,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Будь ласка, встановіть Неймінг Series для {0} через Setup&gt; Установки&gt; Naming Series"
 DocType: Account,Temporary,Тимчасовий
-DocType: Address,Preferred Billing Address,Перевага платіжний адреса
+DocType: Address,Preferred Billing Address,Основна платіжна адреса
 DocType: Program,Courses,курси
-DocType: Monthly Distribution Percentage,Percentage Allocation,Відсоток Розподіл
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Secretary,Секретар
+DocType: Monthly Distribution Percentage,Percentage Allocation,Розподіл відсотку
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,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,Купівля
@@ -3259,24 +3306,22 @@
 ,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;я
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,Ряд # {0}: Серійний номер є обов&#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 +859,Supplier Quotation,Постачальник цитати
-DocType: Quotation,In Words will be visible once you save the Quotation.,"За словами будуть видні, як тільки ви збережете цитати."
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +7,Collect Fees,стягувати збори
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +838,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 +454,Barcode {0} already used in Item {1},Штрихкод {0} вже використовується у номенклатурній позиції {1}
 DocType: Lead,Add to calendar on this date,Додати в календар в цей день
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Правила для додавання транспортні витрати.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Майбутні події
-DocType: Item,Opening Stock,відкриття зображення
+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
-DocType: Email Digest,Income / Expense,Доходи / витрати
 DocType: Employee,Personal Email,Особиста пошта
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Всього Різниця
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Якщо опція включена, то система буде відправляти бухгалтерських проводок з інвентаризації автоматично."
@@ -3284,66 +3329,68 @@
 DocType: Address,Postal Code,Поштовий індекс
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'",у хвилинах Оновлене допомогою &#39;Час Вхід &quot;
-DocType: Customer,From Lead,Зі свинцю
+DocType: Customer,From Lead,З Lead-а
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Замовлення випущений у виробництво.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Виберіть фінансовий рік ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,POS Profile required to make POS Entry,"POS-профілю потрібно, щоб зробити запис POS"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +509,POS Profile required to make POS Entry,"POS-профілю потрібно, щоб зробити запис POS"
 DocType: Program Enrollment Tool,Enroll Students,зарахувати студентів
 DocType: Hub Settings,Name Token,Ім&#39;я маркера
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Стандартний Продаж
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Atleast one warehouse is mandatory,Принаймні одне склад є обов&#39;язковим
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +129,Atleast one warehouse is mandatory,Принаймні одне склад є обов&#39;язковим
 DocType: Serial No,Out of Warranty,З гарантії
 DocType: BOM Replace Tool,Replace,Замінювати
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Invoice {1},{0} проти накладна {1}
-DocType: Sales Invoice,SINV-,SINV-
+DocType: Production Order,Unstopped,відкриються
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{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,Фото Значення Різниця
+DocType: Stock Ledger Entry,Stock Value Difference,Різниця значень запасів
 apps/erpnext/erpnext/config/learn.py +239,Human Resource,Людський ресурс
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Оплата Примирення Оплата
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Податкові активи
-DocType: BOM Item,BOM No,Специфікація Немає
+DocType: BOM Item,BOM No,Номер НВ
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +133,Journal Entry {0} does not have account {1} or already matched against other voucher,Запис у щоденнику {0} не має облікового запису {1} або вже порівнюється з іншою ваучер
 DocType: Item,Moving Average,Moving Average
-DocType: BOM Replace Tool,The BOM which will be replaced,"Специфікації, які будуть замінені"
+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,електронні прилади
 DocType: Account,Debit,Дебет
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Листя повинні бути виділені в упаковці 0,5"
 DocType: Production Order,Operation Cost,Операція Вартість
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,Завантажити відвідуваність з CSV-файлу
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Видатний Amt
 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 +528,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Рядок # {0}: Актив є обов&#39;язковим для фіксованого активу покупки / продажу
+DocType: Stock Settings,Freeze Stocks Older Than [Days],Заморожувати запаси старше ніж [днiв]
+apps/erpnext/erpnext/controllers/accounts_controller.py +531,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/controllers/trends.py +36,Fiscal Year: {0} does not exists,Фінансовий рік: {0} не існує робить
 DocType: Currency Exchange,To Currency,Для Валюта
-DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Дозволити наступні користувачі затвердити Залишити додатків для блокових днів.
+DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Дозволити наступним користувачам погоджувати відпустки на заблоковані дні.
 apps/erpnext/erpnext/config/hr.py +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: 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,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Зворотній зв&#39;язок з клієнтами
 DocType: Account,Expense,Витрати
-DocType: Sales Invoice,Exhibition,Виставка
 apps/erpnext/erpnext/utilities/doctype/address/address.py +77,"Company is mandatory, as it is your company address","Компанія є обов&#39;язковим, так як це ваша компанія адреса"
 DocType: Item Attribute,From Range,Від хребта
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +81,Syntax error in formula or condition: {0},Синтаксична помилка у формулі або умова: {0}
-apps/erpnext/erpnext/stock/utils.py +99,Item {0} ignored since it is not a stock item,"Пункт {0} ігноруються, так як це не стандартні вироби"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +34,Submit this Production Order for further processing.,Відправити цю виробничого замовлення для подальшої обробки.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +92,Syntax error in formula or condition: {0},Синтаксична помилка у формулі або умова: {0}
+apps/erpnext/erpnext/stock/utils.py +99,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 +28,Jobs,роботи
-,Sales Order Trends,Продажі Замовити Тенденції
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,роботи
+,Sales Order Trends,Тренди Замовлень клієнта
 DocType: Employee,Held On,Відбудеться
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Виробництво товару
 ,Employee Information,Співробітник Інформація
@@ -3351,32 +3398,32 @@
 DocType: Stock Entry Detail,Additional Cost,Додаткова вартість
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,Фінансовий рік Дата закінчення
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","Не можете фільтрувати на основі Сертифікати Ні, якщо згруповані по Ваучер"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +763,Make Supplier Quotation,Зробити постачальників цитати
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,Make Supplier Quotation,Зробити пропозицію постачальника
 DocType: Quality Inspection,Incoming,Вхідний
 DocType: BOM,Materials Required (Exploded),"Матеріалів, необхідних (в розібраному)"
 apps/erpnext/erpnext/public/js/setup_wizard.js +185,"Add users to your organization, other than yourself","Додайте користувачів у вашій організації, крім себе"
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,Row # {0}: Serial No {1} does not match with {2} {3},"Ряд # {0}: Серійний номер {1}, не відповідає {2} {3}"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +42,Casual Leave,Повсякденне Залишити
-DocType: Batch,Batch ID,Пакетна ID
+apps/erpnext/erpnext/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,Повсякденне Залишити
+DocType: Batch,Batch ID,Ідентифікатор партії
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,Note: {0},Примітка: {0}
 ,Delivery Note Trends,Накладний Тенденції
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +103,This Week's Summary,Резюме цього тижня
-apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Рахунок: {0} можуть бути оновлені тільки через біржових операцій
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Резюме цього тижня
+apps/erpnext/erpnext/accounts/general_ledger.py +106,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,Дата доставки
-DocType: Opportunity,Opportunity Date,Можливість Дата
-DocType: Purchase Receipt,Return Against Purchase Receipt,Повернутися Проти покупки отриманні
-DocType: Request for Quotation Item,Request for Quotation Item,Запит на комерційну пропозицію Пункт
+DocType: Opportunity,Opportunity Date,Дата Нагоди
+DocType: Purchase Receipt,Return Against Purchase Receipt,Повернути згідно прихідної накладної
+DocType: Request for Quotation Item,Request for Quotation Item,Запит на позицію у пропозиції
 DocType: Purchase Order,To Bill,Для Білла
 DocType: Material Request,% Ordered,% Замовлено
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Piecework,Відрядна робота
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,СР Купівля Оцінити
+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: Task,Actual Time (in Hours),Фактичний час (в годинах)
 DocType: Employee,History In Company,Історія У Компанії
 apps/erpnext/erpnext/config/learn.py +112,Newsletters,Розсилка
 DocType: Address,Shipping,Доставка
-DocType: Stock Ledger Entry,Stock Ledger Entry,Фото Ledger Entry
+DocType: Stock Ledger Entry,Stock Ledger Entry,Запис складської книги
 DocType: Department,Leave Block List,Залиште Заблокувати список
 DocType: Customer,Tax ID,ІПН
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Пункт {0} не налаштований на послідовний пп. Колонка повинна бути порожньою
@@ -3387,8 +3434,8 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +350,{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 +162,Black,Чорний
-DocType: BOM Explosion Item,BOM Explosion Item,Специфікація Вибух товару
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,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,Відстань від верхнього краю
@@ -3398,45 +3445,46 @@
 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),Всього Заявити витрат (за допомогою Expense претензії)
-apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +69,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,Марк Відсутня
 DocType: Journal Entry Account,Exchange Rate,Курс валюти
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Sales Order {0} is not submitted,Продажі Замовити {0} не представлено
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +527,Sales Order {0} is not submitted,Замовлення клієнта {0} не проведено
 DocType: Homepage,Tag Line,Tag Line
 DocType: Fee Component,Fee Component,плата компонентів
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +857,Add items from,Додати елементи з
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +97,Warehouse {0}: Parent account {1} does not bolong to the company {2},Склад {0}: Батьки рахунку {1} НЕ Bolong компанії {2}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +836,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}
 DocType: Cheque Print Template,Regular,регулярне
-DocType: BOM,Last Purchase Rate,Остання Купівля Оцінити
+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 +87,Stock cannot exist for Item {0} since has variants,"Не може бути залишків по позиції {0}, так як вона має варіанти"
 ,Sales Person-wise Transaction Summary,Продажі Людина-мудрий Резюме угода
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +60,Cost Center is required for 'Profit and Loss' account {0}. Please set up a default Cost Center for the Company.,МВЗ потрібно для «Звіт про фінансові результати» рахунки {0}. Налаштуйте МВЗ за замовчуванням для Компанії.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,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
+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: Payment Entry,Paid Amount,Виплачена сума
-DocType: Assessment,Supervisor,супервизор
-apps/erpnext/erpnext/accounts/page/pos/pos.js +710,Online,Інтернет
+DocType: Assessment,Supervisor,Супервайзер
+apps/erpnext/erpnext/accounts/page/pos/pos.js +692,Online,Інтернет
 ,Available Stock for Packing Items,Доступно для Упаковка зі Items
-DocType: Item Variant,Item Variant,Пункт Варіант
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,"Установка цього Адреса шаблон за замовчуванням, оскільки немає ніякого іншого замовчуванням"
+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,"Встановлення цього шаблону адреси за замовчуванням, оскільки немає ніякого іншого за замовчуванням"
 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 +74,Quality Management,Управління якістю
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,Управління якістю
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,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,Баланс Кількість
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Кількісне сальдо
 DocType: Item Group,Parent Item Group,Батько товару Група
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} для {1}
 apps/erpnext/erpnext/setup/doctype/company/company.js +20,Cost Centers,МВЗ
-DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,"Швидкість, з якою постачальника валюті, конвертується в базову валюту компанії"
+DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,"Курс, за яким валюта постачальника конвертується у базову валюту компанії"
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Ряд # {0}: таймінги конфлікти з низкою {1}
 DocType: Opportunity,Next Contact,Наступна Контактні
 apps/erpnext/erpnext/config/accounts.py +272,Setup Gateway accounts.,Налаштування шлюзу рахунку.
@@ -3445,15 +3493,16 @@
 DocType: Payment Entry,Set Exchange Gain / Loss,Встановити Курсова прибуток / збиток
 ,Cash Flow,Грошовий потік
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +88,Application period cannot be across two alocation records,Термін подачі заяв не може бути з двох alocation записів
-DocType: Item Group,Default Expense Account,За замовчуванням Витрати аккаунт
+DocType: Item Group,Default Expense Account,Витратний рахунок за замовчуванням
 DocType: Student,Student Email ID,Student Email ID
 DocType: Employee,Notice (days),Примітка (днів)
-DocType: Tax Rule,Sales Tax Template,Податок з продажу шаблону
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1520,Select items to save the invoice,Виберіть елементи для збереження рахунку-фактури
+DocType: Tax Rule,Sales Tax Template,Шаблон податків на продаж
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1544,Select items to save the invoice,Виберіть елементи для збереження рахунку-фактури
 DocType: Employee,Encashment Date,Інкасація Дата
-DocType: Account,Stock Adjustment,Фото Регулювання
+DocType: Account,Stock Adjustment,Підлаштування інвентаря
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},За замовчуванням активність Вартість існує для виду діяльності - {0}
 DocType: Production Order,Planned Operating Cost,Планована операційна Вартість
+DocType: Academic Term,Term Start Date,Термін дата початку
 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,Заявник Ім&#39;я
@@ -3464,14 +3513,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","Сукупний група ** ** Товари в іншу ** ** Пункт. Це корисно, якщо ви комплектації певні ** ** товари в упаковці, і ви підтримувати запас упакованих ** ** 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},Серійний номер є обов&#39;язковим для пп {0}
+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,"Будь ласка, сформулюйте з / в діапазоні"
-DocType: Serial No,Under AMC,Під КУА
+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.,Налаштування за замовчуванням для продажу угод.
-DocType: BOM Replace Tool,Current BOM,Поточна специфікація
+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,гарантія
 DocType: Production Order,Warehouses,Склади
@@ -3481,89 +3530,90 @@
 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.,Рахунок для складу (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 +119,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Склад не може бути видалений, поки для нього існує запис у складській книзі."
 DocType: Company,Distribution,Розподіл
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +8,Amount Paid,Виплачувана сума
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Project Manager,Керівник проекту
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,Виплачувана сума
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,Керівник проекту
 ,Quoted Item Comparison,Цитується Порівняння товару
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Dispatch,Відправка
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Макс знижка дозволило пункту: {0} {1}%
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,Відправка
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Макс дозволена знижка для позиції: {0} = {1}%
 apps/erpnext/erpnext/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.,"Роль, яка дозволила представити транзакції, які перевищують встановлені ліміти кредитування."
-DocType: Sales Invoice,Supplier Reference,Постачальник Посилання
-apps/erpnext/erpnext/accounts/page/pos/pos.js +844,"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 +832,"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,Мило і миючих засобів
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Мило та миючі засоби
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Кінофільм &amp; Відео
 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 +70,Opening Accumulated Depreciation must be less than equal to {0},Відкриття Накопичена амортизація повинна бути менше або дорівнює {0}
-DocType: Warehouse,Warehouse Name,Склад Ім&#39;я
+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 +83,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/salary_slip/salary_slip.py +94,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}
-DocType: POS Profile,Terms and Conditions,Правила та умови
+DocType: POS Profile,Terms and Conditions,Положення та умови
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},Для Дата повинна бути в межах фінансового року. Припускаючи Дата = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Тут ви можете зберегти зріст, вага, алергії, медичні проблеми і т.д."
 DocType: Leave Block List,Applies to Company,Відноситься до Компанії
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +197,Cannot cancel because submitted Stock Entry {0} exists,"Не можна скасувати, тому що представив зі входу {0} існує"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +198,Cannot cancel because submitted Stock Entry {0} exists,"Не можна скасувати, тому що проведений Рух ТМЦ {0} існує"
 DocType: Purchase Invoice,In Words,За словами
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,Today is {0}'s birthday!,Сьогодні {0} &#39;день народження!
-DocType: Production Planning Tool,Material Request For Warehouse,Матеріал Запит Склад
+DocType: Production Planning Tool,Material Request For Warehouse,Замовлення матеріалів для складу
 DocType: Sales Order Item,For Production,Для виробництва
 DocType: Payment Request,payment_url,payment_url
 DocType: Project Task,View Task,Подивитися Завдання
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,Ваш фінансовий рік починається
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Активів Амортизація і противаг
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +319,Amount {0} {1} transferred from {2} to {3},Сума {0} {1} переведений з {2} кілька разів {3}
-DocType: Sales Invoice,Get Advances Received,Отримати аванси отримані
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +322,Amount {0} {1} transferred from {2} to {3},Сума {0} {1} переведений з {2} кілька разів {3}
+DocType: Sales Invoice,Get Advances Received,Взяти отримані аванси
 DocType: Email Digest,Add/Remove Recipients,Додати / Видалити Одержувачів
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +432,Transaction not allowed against stopped Production Order {0},Угода не має проти зупинив виробництво Замовити {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +437,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 +143,Join,приєднатися
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Брак Кількість
-apps/erpnext/erpnext/stock/doctype/item/item.py +652,Item variant {0} exists with same attributes,Стан варіант {0} існує з тими ж атрибутами
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Брак к-сті
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Вже існує варіант позиції {0} з такими атрибутами
+DocType: Leave Application,LAP/,LAP /
 DocType: Salary Slip,Salary 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,"""До Дати"" обов’язково"
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Створення пакувальні листи для упаковки повинні бути доставлені. Використовується для повідомлення номер пакету, вміст пакету і його вага."
-DocType: Sales Invoice Item,Sales Order Item,Продажі замовлення Продукт
+DocType: Sales Invoice Item,Sales Order Item,Позиція замовлення клієнта
 DocType: Salary Slip,Payment Days,Дні оплати
 DocType: Customer,Dormant,бездіяльний
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +212,Warehouses with child nodes cannot be converted to ledger,Склади з дочірніми вузлами не можуть бути перетворені в бухгалтерській книзі
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +215,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; в цій транзакції, з угоди ролі вкладення. Користувач може або не може відправити по електронній пошті."
+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 +866,It is needed to fetch Item Details.,Він необхідний для вилучення Подробиці Елементу.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +857,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} вже отримав
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Серійний номер {0} вже отриманий
 ,Requested Items To Be Transferred,Необхідні товари повинні бути передані
 DocType: Purchase Invoice,Recurring Id,Періодична 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 +178,Invalid {0},Невірний {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Sick Leave,Лікарняний
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,Sick Leave,Лікарняний
 DocType: Email Digest,Email Digest,E-mail Дайджест
-DocType: Delivery Note,Billing Address Name,Платіжний адреса Ім&#39;я
+DocType: Delivery Note,Billing Address Name,Назва адреси для рахунків
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Універмаги
 DocType: Warehouse,PIN,PIN-код
 DocType: Sales Invoice,Base Change Amount (Company Currency),Базова Зміна Сума (Компанія Валюта)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +313,No accounting entries for the following warehouses,Немає бухгалтерських записів для наступних складів
-apps/erpnext/erpnext/projects/doctype/project/project.js +102,Save the document first.,Зберегти документ у першу чергу.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +314,No accounting entries for the following warehouses,Немає бухгалтерських записів для наступних складів
+apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Спочатку збережіть документ.
 DocType: Account,Chargeable,Оплаті
 DocType: Company,Change Abbreviation,Змінити Абревіатура
 DocType: Expense Claim Detail,Expense Date,Витрати Дата
@@ -3574,23 +3624,22 @@
 DocType: BOM,Manufacturing User,Виробництво користувача
 DocType: Purchase Invoice,Raw Materials Supplied,Сировина постачається
 DocType: Purchase Invoice,Recurring Print Format,Періодична друку Формат
-DocType: C-Form,Series,Серія
+DocType: C-Form,Series,Серії
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,Expected Delivery Date cannot be before Purchase Order Date,"Очікувана дата поставки не може бути, перш ніж Купівля Порядок Дата"
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Будь ласка, встановіть Неймінг Series для {0} через Setup&gt; Установки&gt; Naming Series"
 DocType: Appraisal,Appraisal Template,Оцінка шаблону
 DocType: Item Group,Item Classification,Пункт Класифікація
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Business Development Manager,менеджер з розвитку бізнесу
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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,Подивитися покупка
+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 Рекомендуємо Змінити порядок Рівень
 DocType: Salary Detail,Salary Detail,Заробітна плата: Подробиці
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +940,Please select {0} first,"Будь ласка, виберіть {0} в першу чергу"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +749,Batch {0} of Item {1} has expired.,Пакетна {0} пункту {1} закінчився.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +953,Please select {0} first,"Будь ласка, виберіть {0} в першу чергу"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +757,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,проміжний підсумок
@@ -3607,90 +3656,94 @@
 {% 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 +92,Warehouse not found in the system,Склад не найден в системі
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +106,This Month's Summary,Резюме цього місяця
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Склад не знайдений у системі
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Резюме цього місяця
 DocType: Quality Inspection Reading,Quality Inspection Reading,Контроль якості читання
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,"Значення `Заморозити активи старіші ніж` повинно бути менше, ніж %d днів."
-DocType: Tax Rule,Purchase Tax Template,Податок на покупку шаблон
-,Project wise Stock Tracking,Проект стеження мудрий зі
+DocType: Tax Rule,Purchase Tax Template,Шаблон податку на закупку
+,Project wise Stock Tracking,Стеження за запасами у рамках проекту
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Технічне обслуговування Розклад {0} існує проти {0}
-DocType: Stock Entry Detail,Actual Qty (at source/target),Фактична Кількість (в джерелі / цілі)
+DocType: 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 +87,Please set Next Depreciation Date,"Будь ласка, наступне набір амортизації Дата"
-DocType: Payment Gateway,Payment Gateway,Платіжний шлюз
 DocType: HR Settings,Payroll Settings,Налаштування заробітної плати
-apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Підходимо незв&#39;язані Рахунки та платежі.
+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 +378,Operation Time must be greater than 0 for Operation {0},"Час роботи повинно бути більше, ніж 0 для операції {0}"
+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/accounts/doctype/account/account.py +170,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),Тримайте це веб-дружній 900px (W) по 100px (ч)
 DocType: Program,Program Abbreviation,програма Абревіатура
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Production Order cannot be raised against a Item Template,Виробничий замовлення не може бути піднято проти Item Шаблон
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,Збори оновлюються в отриманні покупки від кожного елемента
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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: 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}: Ви не можете призначити себе як батька рахунок
-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,"Середній час прийняті постачальником, щоб доставити"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +50,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/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,"Видалити елемент, якщо звинувачення не застосовується до цього пункту"
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,"Напр., smsgateway.com/api/send_sms.cgi"
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +27,Transaction currency must be same as Payment Gateway currency,"Валюта угоди повинна бути такою ж, як платіжний шлюз валюти"
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Transaction currency must be same as Payment Gateway currency,"Валюта угоди повинна бути такою ж, як платіжний шлюз валюти"
 DocType: Payment Entry,Receive,Отримати
+apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,котирування:
 DocType: Maintenance Visit,Fully Completed,Повністю завершено
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Виконано
 DocType: Employee,Educational Qualification,Освітня кваліфікація
 DocType: Workstation,Operating Costs,Експлуатаційні витрати
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,"Дія, якщо накопичилося Перевищено Щомісячний бюджет"
-DocType: Purchase Invoice,Submit on creation,Відправити по створенню
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +432,Currency for {0} must be {1},Валюта для {0} має бути {1}
+DocType: Purchase Invoice,Submit on creation,Провести по створенню
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +435,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 +493,Row {0}: An Reorder entry already exists for this warehouse {1},Ряд {0}: Змінити порядок вступу вже існує для цього складу {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +79,"Cannot declare as lost, because Quotation has been made.","Не можете оголосити як втрачений, бо цитати був зроблений."
+DocType: 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/crm/doctype/opportunity/opportunity.py +79,"Cannot declare as lost, because Quotation has been made.","Не можете бути оголошений як втрачений, бо вже зроблена пропозиція."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Купівля Майстер-менеджер
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +429,Production Order {0} must be submitted,Виробничий замовлення {0} повинен бути представлений
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +434,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,Додати / Редагувати Ціни
-DocType: Cheque Print Template,Cheque Print Template,Чеками друку шаблону
+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,Ціна Ім&#39;я
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +181,Totals,Загальні дані
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,Загальні дані
 DocType: BOM,Manufacturing,Виробництво
 ,Ordered Items To Be Delivered,Замовлені товари повинні бути доставлені
 DocType: Account,Income,Дохід
 DocType: Industry Type,Industry Type,Промисловість Тип
 apps/erpnext/erpnext/templates/includes/cart.js +141,Something went wrong!,Щось пішло не так!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,Warning: Leave application contains following block dates,Увага: Залиште додаток містить наступні дати блок
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Sales Invoice {0} has already been submitted,Видаткова накладна {0} вже були представлені
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +120,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 +354,{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,Обов&#39;язковий Фейлд - Отримати Студенти з
 DocType: Announcement,Student,студент
 apps/erpnext/erpnext/config/hr.py +181,Organization unit (department) master.,Організація блок (департамент) господар.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,"Будь ласка, введіть дійсні мобільних 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 +793,All records are synced.,Всі записи синхронізуються.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +781,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;я центр
@@ -3700,45 +3753,45 @@
 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,Серійний номер Сервіс контракт Термін
+,Serial No Service Contract Expiry,Закінчення сервісної угоди на серійний номер
 DocType: Item,Unit of Measure Conversion,Одиниця виміру конверсії
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +272,You cannot credit and debit same account at the same time,Ви не можете кредитні та дебетові ж обліковий запис в той же час
-DocType: Naming Series,Help HTML,Допомога HTML
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +272,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/selling/doctype/quotation/quotation.py +49,Cannot set as Lost as Sales Order is made.,"Неможливо встановити, як втратив у продажу замовлення провадиться."
-DocType: Student Applicant,Mother's Name,ім&#39;я матері
-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 +348,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 +326,Received From,Отримано від
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Received From,Отримано від
 DocType: Lead,Converted,Перероблений
 DocType: Item,Has Serial No,Має серійний номер
 DocType: Employee,Date of Issue,Дата випуску
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: З {0} для {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +153,Row #{0}: Set Supplier for item {1},Ряд # {0}: Встановити Постачальник по пункту {1}
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +93,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 +117,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} не може бути знайдене"
 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 +172,{0} {1} does not exist,{0} {1} не існує
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +175,{0} {1} does not exist,{0} {1} не існує
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,Please check Multi Currency option to allow accounts with other currency,"Будь ласка, перевірте мультивалютний варіант, що дозволяє рахунки іншій валюті"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +72,Item: {0} does not exist in the system,Пункт: {0} не існує в системі
 apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,"Ви не авторизовані, щоб встановити значення Frozen"
 DocType: Payment Reconciliation,Get Unreconciled Entries,Отримати Неузгоджені Записи
-DocType: Payment Reconciliation,From Invoice Date,Від Накладна Дата
+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/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/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 +109,Electrical,Електричний
+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 +318,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}
@@ -3746,93 +3799,95 @@
 DocType: Item,Customer Code,Код клієнта
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +210,Birthday Reminder for {0},Нагадування про день народження для {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Дні з останнього ордена
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +292,Debit To account must be a Balance Sheet account,Дебетом рахунка повинні бути баланс рахунку
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To account must be a Balance Sheet account,Дебетом рахунка повинні бути баланс рахунку
 DocType: Buying Settings,Naming Series,Іменування серії
 DocType: Leave Block List,Leave Block List Name,Залиште Ім&#39;я Чорний список
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Активи фонду
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},"Ви дійсно хочете, щоб представити всю зарплату ковзають місяць {0} і рік {1}"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Складські запаси
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},"Ви дійсно хочете, провести усю зарплатну відомість за місяць {0} і рік {1}"
 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} не повинні бути представлені
-DocType: Notification Control,Sales Invoice Message,Рахунок по продажах повідомлення
+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 +301,Salary Slip of employee {0} already created for time sheet {1},Зарплата Ковзання працівника {0} вже створений для табеля {1}
-DocType: Sales Order Item,Ordered Qty,Замовив Кількість
-apps/erpnext/erpnext/stock/doctype/item/item.py +673,Item {0} is disabled,Пункт {0} відключена
-DocType: Stock Settings,Stock Frozen Upto,Фото Заморожені Upto
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +838,BOM does not contain any stock item,BOM не містить будь-якої елемент запасу
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +313,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 +675,Item {0} is disabled,Пункт {0} відключена
+DocType: Stock Settings,Stock Frozen Upto,Рухи ТМЦ заморожені по
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +809,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.,Проектна діяльність / завдання.
-apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Створення Зарплата ковзає
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Покупка повинна бути перевірена, якщо вибраний Стосується для в {0}"
+apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Створення зарплатної відомості
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","""Купівля"" повинно бути позначено, якщо ""Застосовне для"" обране як {0}"
 apps/erpnext/erpnext/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,Останній курс покупки не знайдено
+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 +485,Row #{0}: Please set reorder quantity,"Ряд # {0}: Будь ласка, встановіть кількість тональний"
+DocType: Sales Invoice Timesheet,Billing Hours,платіжна годинник
+apps/erpnext/erpnext/stock/doctype/item/item.py +487,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 +62,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: 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: Sales Invoice,Existing Customer,Існуючий клієнт
 DocType: Email Digest,Receivables,Дебіторська заборгованість
+DocType: Lead Source,Lead Source,свинець Джерело
 DocType: Customer,Additional information regarding the customer.,Додаткова інформація щодо клієнта.
 DocType: Quality Inspection Reading,Reading 5,Читання 5
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +38,Campaign Name is required,Назва кампанії потрібно
 DocType: Maintenance Visit,Maintenance Date,Технічне обслуговування Дата
 DocType: Purchase Invoice Item,Rejected Serial No,Відхилено Серійний номер
-apps/erpnext/erpnext/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 +80,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 +129,BOM and Manufacturing Quantity are required,Специфікація і виробництво Кількість потрібні
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,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,Максимальна міцність
-DocType: Bank Reconciliation Detail,Amount,Кількість
-apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Специфікація замінити
+apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,НВ замінено
 ,Sales Analytics,Продажі Аналітика
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +113,Available {0},Доступно {0}
 DocType: Manufacturing Settings,Manufacturing Settings,Налаштування Виробництво
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Налаштування e-mail
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +96,Please enter default currency in Company Master,"Будь ласка, введіть валюту за замовчуванням в компанії Master"
-DocType: Stock Entry Detail,Stock Entry Detail,Фото запис Деталь
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +100,Daily Reminders,Щоденні нагадування
+DocType: Stock Entry Detail,Stock Entry Detail,Деталі Руху ТМЦ
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Щоденні нагадування
 DocType: Products Settings,Home Page is Products,Головна сторінка є продукти
 ,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/account/account_tree.js +23,New Account Name,Новий акаунт Ім&#39;я
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Сировина постачається Вартість
-DocType: Selling Settings,Settings for Selling Module,Налаштування для модуля Продаж
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Customer Service,Обслуговування клієнтів
+DocType: 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/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 +83,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 +73,Item {0} must be a stock Item,Номенклатурна позиція {0} має бути інвентарною
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,За замовчуванням роботи на складі Прогрес
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1570,Total nos of serial no is not equal to quantity.,Всього н.з.к серійного NO не дорівнює кількості.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1594,Total nos of serial no is not equal to quantity.,Всього н.з.к серійного NO не дорівнює кількості.
 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,Очікувана дата не може бути перед матеріалу Запит Дата
+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,Капітал
 DocType: Sales Order,Printing Details,Друк Подробиці
 DocType: Task,Closing Date,Дата закриття
 DocType: Sales Order Item,Produced Quantity,Здобуте кількість
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Engineer,Інженер
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,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 +370,Item Code required at Row No {0},Код товара потрібно в рядку Немає {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +398,Item Code required at Row No {0},Код товара потрібно в рядку Немає {0}
 DocType: Sales Partner,Partner Type,Тип Партнер
 DocType: Purchase Taxes and Charges,Actual,Фактичний
 DocType: Authorization Rule,Customerwise Discount,Customerwise Знижка
@@ -3846,21 +3901,23 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Дивитися зараз
 DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,"Оберіть період, коли рахунок-фактура буде згенерований автоматично"
 DocType: BOM,Raw Material Cost,Сировина Вартість
-DocType: Item Reorder,Re-Order Level,Re-Order рівні
-DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Введіть предметів і плановий Кількість, для якого ви хочете, щоб підняти виробничі замовлення або завантажити сировини для аналізу."
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +55,Part-time,Неповний робочий день
-DocType: Employee,Applicable Holiday List,Стосується Список відпочинку
+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,Неповний робочий день
+DocType: Employee,Applicable Holiday List,"Список вихідних, який використовується"
 DocType: Employee,Cheque,Чек
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Серія Оновлене
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +57,Series Updated,Серії оновлено
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Тип звіту є обов&#39;язковим
-DocType: Item,Serial Number Series,Серійний номер серії
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Склад є обов&#39;язковим для фондового Пункт {0} в рядку {1}
+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 +87,Clearance Date updated,Зазор Дата поновлення
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Успішно Примирення
+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.,Де елементи зберігаються.
@@ -3869,10 +3926,10 @@
 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 +513,Posting date and posting time is mandatory,Дата публікації і розміщення час є обов&#39;язковим
-apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Податковий шаблон для покупки угод.
+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 +518,Posting date and posting time is mandatory,Дата публікації і розміщення час є обов&#39;язковим
+apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Податковий шаблон для операцій покупки.
 ,Item Prices,Предмет Ціни
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,"За словами будуть видні, як тільки ви збережете замовлення."
 DocType: Period Closing Voucher,Period Closing Voucher,Період закриття Ваучер
@@ -3881,8 +3938,8 @@
 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 +158,Target warehouse in row {0} must be same as Production Order,"Цільова склад у рядку {0} повинен бути такий же, як виробничого замовлення"
-apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,"""Повідомлення Адреси електронної пошти"", не зазначені для повторюваних %s"
+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,"Валюта не може бути змінена після внесення запису, використовуючи інший валюти"
 DocType: Company,Round Off Account,Округлення аккаунт
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +91,Administrative Expenses,Адміністративні витрати
@@ -3890,23 +3947,22 @@
 DocType: Customer Group,Parent Customer Group,Батько Група клієнтів
 DocType: Purchase Invoice,Contact Email,Контактний Email
 DocType: Appraisal Goal,Score Earned,Оцінка Зароблені
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Notice Period,Примітка Період
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,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 +4,New Sales Person Name,Ім&#39;я нового менеджера з продажу
 DocType: Packing Slip,Gross Weight UOM,Вага брутто Одиниця виміру
-DocType: Email Digest,Receivables / Payables,Дебіторська заборгованість Кредиторська заборгованість /
 DocType: Delivery Note Item,Against Sales Invoice,На рахунок продажу
-DocType: Bin,Reserved Qty for Production,Reserved Кількість для виробництва
+DocType: Bin,Reserved Qty for Production,К-сть зарезервована для виробництва
 DocType: Asset,Frequency of Depreciation (Months),Частота амортизації (місяців)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +469,Credit Account,Рахунок з кредитовим сальдо
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Credit Account,Рахунок з кредитовим сальдо
 DocType: Landed Cost Item,Landed Cost Item,Приземлився Вартість товару
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +55,Show zero values,Показати нульові значення
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Показати нульові значення
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Кількість пункту отримані після виготовлення / перепакування із заданих кількостях сировини
-apps/erpnext/erpnext/public/js/setup_wizard.js +315,Setup a simple website for my organization,Налаштування простий веб-сайт для моєї організації
+apps/erpnext/erpnext/public/js/setup_wizard.js +315,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 +647,Please specify Attribute Value for attribute {0},"Будь ласка, сформулюйте Значення атрибуту для атрибуту {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},"Будь ласка, сформулюйте Значення атрибуту для атрибуту {0}"
 DocType: Item,Default Warehouse,За замовчуванням Склад
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +39,Budget cannot be assigned against Group Account {0},Бюджет не може бути призначений на обліковий запис групи {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,"Будь ласка, введіть МВЗ батьківський"
@@ -3922,71 +3978,73 @@
 DocType: Issue,ISS-,ISS-
 DocType: Project,Total Expense Claim (via Expense Claims),Всього витрат претензії (за допомогою витратні Претензії)
 DocType: Journal Entry,Debit Note,Дебет-нота
-DocType: Stock Entry,As per Stock UOM,За стоку UOM
+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,Людина з продажу
-DocType: Sales Invoice,Cold Calling,Холодні дзвінки
 DocType: SMS Parameter,SMS Parameter,SMS Параметр
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,Бюджет і МВЗ
 DocType: Maintenance Schedule Item,Half Yearly,Півроку
 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,Всього Попередня
+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 +253,Processing Payroll,Розрахунку заробітної плати
-DocType: Opportunity Item,Basic Rate,Basic Rate
+DocType: Opportunity Item,Basic Rate,Базова ціна
 DocType: GL Entry,Credit Amount,Сума кредиту
 DocType: Cheque Print Template,Signatory Position,підписала Позиція
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Встановити як Втрачений
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,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 +5,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}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +161,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},Рядок {0}: Розподілена сума {1} повинна бути менше або дорівнювати сумі платежу {2}
 DocType: Tax Rule,Tax Rule,Податкове положення
-DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Підтримувати ж швидкістю Протягом всієї цикл продажів
+DocType: 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,Товари слід замовляти
-DocType: Purchase Order,Get Last Purchase Rate,Отримати останню покупку Оцінити
+DocType: Purchase Order,Get Last Purchase Rate,Отримати останню ціну закупівлі
 DocType: Company,Company Info,Інформація про компанію
-apps/erpnext/erpnext/accounts/page/pos/pos.js +941,Select or add new customer,Виберіть або додати новий клієнт
+apps/erpnext/erpnext/accounts/page/pos/pos.js +930,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 +5,This is based on the attendance of this Employee,Це засновано на відвідуваності цього співробітника
-DocType: Sales Invoice,Frequency,частота
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +463,Debit Account,Дебетовий рахунок
-DocType: Fiscal Year,Year Start Date,Рік Дата початку
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,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.,"Не можете приховані в групу, тому що обрано тип рахунку."
 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.,Стоп користувачам вносити Залишити додатків на наступні дні.
+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 +210,Supplier Quotation {0} created,Постачальник Котирування {0} створено
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +208,Supplier Quotation {0} created,Пропозицію постачальника {0} створено
 apps/erpnext/erpnext/accounts/report/financial_statements.py +90,End Year cannot be before Start Year,Рік закінчення не може бути раніше початку року
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Employee Benefits,Виплати працівникам
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,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 +228,Please set a default Holiday List for Employee {0} or Company {1},"Будь ласка, встановіть за замовчуванням список свят для Employee {0} або Компанія {1}"
+DocType: Production Order,Manufactured Qty,Вироблена к-сть
+DocType: Purchase Receipt Item,Accepted Quantity,Прийнята кількість
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +232,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 +499,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Ряд Немає {0}: Сума не може бути більше, ніж очікуванні Сума проти Витрата претензії {1}. В очікуванні сума {2}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +500,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Ряд Немає {0}: Сума не може бути більше, ніж очікуванні Сума проти Витрата претензії {1}. В очікуванні сума {2}"
 DocType: Maintenance Schedule,Schedule,Графік
 DocType: Account,Parent Account,Батьки рахунку
 DocType: Quality Inspection Reading,Reading 3,Читання 3
 ,Hub,Концентратор
 DocType: GL Entry,Voucher Type,Ваучер Тип
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1007,Price List not found or disabled,Ціни не знайдений або відключений
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1008,Price List not found or disabled,Ціни не знайдений або відключений
 DocType: Expense Claim,Approved,Затверджений
 DocType: Pricing Rule,Price,Ціна
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +244,Employee relieved on {0} must be set as 'Left',Співробітник звільняється від {0} повинен бути встановлений як &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; дасть унікальну ідентичність кожного суб&#39;єкта цього пункту, який можна переглянути в серійний номер майстра."
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +256,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} в зазначений діапазон дат
 DocType: Employee,Education,Освіта
@@ -3995,32 +4053,33 @@
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,"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 +259,Please select Employee Record first.,"Будь ласка, виберіть Employee Record перший."
+DocType: Delivery Note Item,Available Qty at From Warehouse,Доступна к-сть на вихідному складі
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +266,Please select Employee Record first.,"Будь ласка, виберіть Employee Record перший."
 DocType: POS Profile,Account for Change Amount,Рахунок для зміни висоти
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +190,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Ряд {0}: Партія / рахунку не відповідає {1} / {2} в {3} {4}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +235,Please enter Expense Account,"Будь ласка, введіть видатковий рахунок"
-DocType: Account,Stock,Фондовий
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Рядок # {0}: Посилання Тип документа повинен бути одним із замовлення на поставку, рахунки-фактури Купівля або журнал запис"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,Please enter Expense Account,"Будь ласка, введіть видатковий рахунок"
+DocType: Account,Stock,Інвентар
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +976,"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: 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,Пакетна Інвентар
+apps/erpnext/erpnext/config/stock.py +309,Batch Inventory,"Інвентар, що обліковується партіями"
 DocType: Employee,Contract End Date,Дата закінчення контракту
 DocType: Sales Order,Track this Sales Order against any Project,Підписка на замовлення клієнта проти будь-якого проекту
 DocType: Sales Invoice Item,Discount and Margin,Знижка і маржа
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Замовлення на продаж Витягніть (до пологів) на основі вищеперелічених критеріїв
 DocType: Attendance,Half Day,Половина дня
-DocType: Pricing Rule,Min Qty,Мінімальна Кількість
+DocType: Pricing Rule,Min Qty,Мін. к-сть
 DocType: Asset Movement,Transaction Date,Угода Дата
-DocType: Production Plan Item,Planned Qty,Плановані Кількість
+DocType: Production Plan Item,Planned Qty,Планована к-сть
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,Загальні податкові
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,For Quantity (Manufactured Qty) is mandatory,Для Кількість (Виробник Кількість) є обов&#39;язковим
+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),Чистий Всього (Компанія валют)
+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 +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Ряд {0}: Партія Тип і партія застосовується лише щодо / дебіторська заборгованість рахунок
-DocType: Notification Control,Purchase Receipt Message,Купівля Надходження повідомлення
+DocType: Notification Control,Purchase Receipt Message,Повідомлення прихідної накладної
 DocType: Production Order,Actual Start Date,Фактична дата початку
 DocType: Sales Order,% of materials delivered against this Sales Order,% Матеріалів доставляється по цьому замовленні клієнта
 apps/erpnext/erpnext/config/stock.py +12,Record item movement.,Запис руху пункт.
@@ -4030,40 +4089,43 @@
 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,Чи є існуючого активу
 ,Monthly Salary Register,Щомісячна зарплата Реєстрація
-DocType: Warranty Claim,If different than customer address,"Якщо відрізняється, ніж адресою замовника"
-DocType: BOM Operation,BOM Operation,Специфікація Операція
+DocType: Warranty Claim,If different than customer address,Якщо відрізняється від адреси клієнта
+DocType: BOM Operation,BOM Operation,Операція НВ
 DocType: Purchase Taxes and Charges,On Previous Row Amount,На Попередня Сума Row
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +226,Transfer Asset,передача активів
+DocType: Student,Home Address,Домашня адреса
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +227,Transfer Asset,передача активів
 DocType: POS Profile,POS Profile,POS-профілю
 apps/erpnext/erpnext/config/schools.py +33,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 +129,"Item {0} is a template, please select one of its variants","Пункт {0} шаблон, виберіть один з його варіантів"
+apps/erpnext/erpnext/stock/get_item_details.py +129,"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,Чистий зарплата не може бути негативною
 DocType: SMS Settings,Static Parameters,Статичні параметри
 DocType: Assessment,Room,кімната
-DocType: Purchase Order,Advance Paid,Попередня Платні
-DocType: Item,Item Tax,Стан податкової
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +765,Material to Supplier,Матеріал Постачальнику
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +189,Excise Invoice,Акцизний Рахунок
+DocType: Purchase Order,Advance Paid,Попередньо оплачено
+DocType: Item,Item Tax,Податки
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,Material to Supplier,Матеріал Постачальнику
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,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 масового вашим контактам
 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,Фактична Кількість обов&#39;язково
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,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 +136,Credit Card,Кредитна карта
+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/config/stock.py +174,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: Sales Invoice Item,Drop Ship,Пряма доставка
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Тут ви можете зберегти сімейні дані, як ім&#39;я та окупації батька, чоловіка і дітей"
+DocType: Academic Term,Term End Date,Термін Дата закінчення
 DocType: Hub Settings,Seller Name,Продавець Ім&#39;я
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Податки і збори віднімаються (Компанія валют)
 DocType: Item Group,General Settings,Загальні налаштування
@@ -4071,44 +4133,44 @@
 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 +172,Attach Logo,Долучити логотип
 DocType: Customer,Commission Rate,Ставка комісії
-apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,Зробити Variant
-apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Блок відпустки додатки по кафедрі.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +115,"Payment Type must be one of Receive, Pay and Internal Transfer","Тип оплати повинен бути одним з Надсилати, Pay і внутрішній переказ"
+apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,Зробити варіанти
+apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Блокувати заяви на відпустки по підрозділу.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +118,"Payment Type must be one of Receive, Pay and Internal Transfer","Тип оплати повинен бути одним з Надсилати, Pay і внутрішній переказ"
 apps/erpnext/erpnext/config/selling.py +169,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.,Корінь не може бути змінений.
 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 +160,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.,Після завершення оплати перенаправити користувача на обрану сторінку.
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,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 +92,Designer,Дизайнер
-apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,Умови шаблону
+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/accounts/doctype/purchase_invoice/purchase_invoice.py +469,Cost Center is required in row {0} in Taxes table for type {1},Вартість Центр потрібно в рядку {0} в таблиці податків для типу {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +472,Cost Center is required in row {0} in Taxes table for type {1},Вартість Центр потрібно в рядку {0} в таблиці податків для типу {1}
 DocType: Program,Program Code,програмний код
-,Item-wise Purchase Register,Пункт мудрий Купівля Реєстрація
+,Item-wise Purchase Register,Попозиційний реєстр закупівель
 DocType: Batch,Expiry Date,Термін придатності
-,Supplier Addresses and Contacts,Постачальник Адреси та контакти
-,accounts-browser,рахунки-браузер
+,Supplier Addresses and Contacts,Адреса та контактні дані постачальника
+,accounts-browser,переглядач рахунків
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +334,Please select Category first,"Ласка, виберіть категорію в першу чергу"
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Майстер проекту.
-apps/erpnext/erpnext/controllers/status_updater.py +174,"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 +417, (Half Day),(Половина дня)
+apps/erpnext/erpnext/controllers/status_updater.py +174,"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 +425, (Half Day),(Половина дня)
 DocType: Supplier,Credit Days,Кредитні Дні
 DocType: Leave Type,Is Carry Forward,Є переносити
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +740,Get Items from BOM,Отримати елементів із специфікації
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +711,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 +549,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},"Рядок # {0}: Дата розміщення повинна бути такою ж, як дати покупки {1} активу {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +552,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,Передача активу з одного складу на інший
@@ -4116,7 +4178,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Ряд {0}: Партія Тип і партія необхідна для / дебіторська заборгованість увагу {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Посилання Дата
 DocType: Employee,Reason for Leaving,Причина виїзду
-DocType: Expense Claim Detail,Sanctioned Amount,Санкціонований Сума
+DocType: Expense Claim Detail,Sanctioned Amount,Санкціонована сума
 DocType: GL Entry,Is Opening,Відкриває
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +169,Row {0}: Debit entry can not be linked with a {1},Ряд {0}: Дебет запис не може бути пов&#39;язаний з {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account {0} does not exist,Рахунок {0} не існує
diff --git a/erpnext/translations/ur.csv b/erpnext/translations/ur.csv
index 5bea519..617dd02 100644
--- a/erpnext/translations/ur.csv
+++ b/erpnext/translations/ur.csv
@@ -19,9 +19,9 @@
 DocType: Employee,Rented,کرایے
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,صارف کے لئے قابل اطلاق
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +191,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",روک پروڈکشن آرڈر منسوخ نہیں کیا جا سکتا، منسوخ کرنے کے لئے سب سے پہلے اس Unstop
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +197,Do you really want to scrap this asset?,اگر تم واقعی اس اثاثہ کو ختم کرنا چاہتے ہیں؟
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +17,Select Default Supplier,طے شدہ پردایک
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +192,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",روک پروڈکشن آرڈر منسوخ نہیں کیا جا سکتا، منسوخ کرنے کے لئے سب سے پہلے اس Unstop
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +198,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 +36,Currency is required for Price List {0},کرنسی قیمت کی فہرست کے لئے ضروری ہے {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* ٹرانزیکشن میں حساب کیا جائے گا.
 DocType: Address,County,کاؤنٹی
@@ -41,46 +41,45 @@
 DocType: Sales Invoice,Customer Name,گاہک کا نام
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +126,Bank account cannot be named as {0},بینک اکاؤنٹ کے طور پر نامزد نہیں کیا جا سکتا {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,سربراہان (یا گروپ) جس کے خلاف اکاؤنٹنگ اندراجات بنا رہے ہیں اور توازن برقرار رکھا جاتا ہے.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +180,Outstanding for {0} cannot be less than zero ({1}),بقایا {0} نہیں ہو سکتا کے لئے صفر سے بھی کم ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,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 +148,Series Updated Successfully,سیریز کو کامیابی سے حالیہ
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +149,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,تمام سپلائر سے رابطہ
-DocType: Quality Inspection Reading,Parameter,پیرامیٹر
 apps/erpnext/erpnext/projects/doctype/project/project.py +54,Expected End Date can not be less than Expected Start Date,متوقع تاریخ اختتام متوقع شروع کرنے کی تاریخ کے مقابلے میں کم نہیں ہو سکتا
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,صف # {0}: شرح کے طور پر ایک ہی ہونا چاہیے {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +239,New Leave Application,نیا رخصت کی درخواست
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,New Leave Application,نیا رخصت کی درخواست
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +20,Attendance Record {0} exists against Student {1} for Course Schedule {2},حاضری کا ریکارڈ {0} کورس شیڈول کے طالب علم {1} خلاف موجود {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Bank Draft,بینک ڈرافٹ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,بینک ڈرافٹ
 DocType: Mode of Payment Account,Mode of Payment Account,ادائیگی اکاؤنٹ کے موڈ
 apps/erpnext/erpnext/stock/doctype/item/item.js +52,Show Variants,دکھائیں متغیرات
 DocType: Academic Term,Academic Term,تعلیمی مدت
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +13,Material,مواد
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Quantity,مقدار
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +511,Accounts table cannot be blank.,میز اکاؤنٹس خالی نہیں رہ سکتی.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +616,Quantity,مقدار
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +512,Accounts table cannot be blank.,میز اکاؤنٹس خالی نہیں رہ سکتی.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,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/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 +142,User {0} is already assigned to Employee {1},صارف {0} پہلے ہی ملازم کو تفویض کیا جاتا ہے {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,صحت کی دیکھ بھال
-DocType: Purchase Invoice,Monthly,ماہانہ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),ادائیگی میں تاخیر (دن)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +771,Invoice,انوائس
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +750,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 +198,Row {0}: {1} {2} does not match with {3},صف {0}: {1} {2} کے ساتھ مطابقت نہیں ہے {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,صف # {0}:
+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 +127,Please select Price List,قیمت کی فہرست براہ مہربانی منتخب کریں
@@ -111,8 +110,8 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,ایک ہی کمپنی ایک سے زیادہ بار داخل کیا جاتا ہے
 DocType: Employee,Married,شادی
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},کی اجازت نہیں {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +589,Get items from,سے اشیاء حاصل
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +382,Stock cannot be updated against Delivery Note {0},اسٹاک ترسیل کے نوٹ کے خلاف اپ ڈیٹ نہیں کیا جا سکتا {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,سے اشیاء حاصل
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Stock cannot be updated against Delivery Note {0},اسٹاک ترسیل کے نوٹ کے خلاف اپ ڈیٹ نہیں کیا جا سکتا {0}
 DocType: Payment Reconciliation,Reconcile,مصالحت
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,گروسری
 DocType: Quality Inspection Reading,Reading 1,1 پڑھنا
@@ -120,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 +156,Salary Structure Missing,تنخواہ ساخت لاپتہ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Salary Structure Missing,تنخواہ ساخت لاپتہ
 DocType: Lead,Person Name,شخص کا نام
 DocType: Sales Invoice Item,Sales Invoice Item,فروخت انوائس آئٹم
 DocType: Account,Credit,کریڈٹ
@@ -128,10 +127,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 +156,Credit limit has been crossed for customer {0} {1}/{2},کریڈٹ کی حد گاہک کے لئے تجاوز کر گئی ہے {0} {1} / {2}
-apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",&quot;فکسڈ اثاثہ ہے&quot; اثاثہ ریکارڈ کی شے کے خلاف موجود نہیں کے طور پر، انینترت ہو سکتا ہے
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +189,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; اثاثہ ریکارڈ کی شے کے خلاف موجود نہیں کے طور پر، انینترت ہو سکتا ہے
 DocType: Tax Rule,Tax Type,ٹیکس کی قسم
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +144,You are not authorized to add or update entries before {0},تم سے پہلے اندراجات شامل کرنے یا اپ ڈیٹ کرنے کی اجازت نہیں ہے {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},تم سے پہلے اندراجات شامل کرنے یا اپ ڈیٹ کرنے کی اجازت نہیں ہے {0}
 DocType: Item,Item Image (if not slideshow),آئٹم تصویر (سلائڈ شو نہیں تو)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,ایک کسٹمر کو ایک ہی نام کے ساتھ موجود
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,ڰنٹےکی شرح / 60) * اصل آپریشن کے وقت)
@@ -141,18 +141,17 @@
 DocType: Student Log,Student Log,طالب علم دلے
 DocType: Quality Inspection,Get Specification Details,تفصیلات تفصیلات حاصل
 DocType: Lead,Interested,دلچسپی رکھنے والے
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +165,Opening,افتتاحی
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,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/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,کسٹمر&gt; کسٹمر گروپ&gt; ٹیرٹری
 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.,موجودہ لین دین کے ساتھ اکاؤنٹ گروپ میں تبدیل نہیں کیا جا سکتا.
 DocType: Lead,Product Enquiry,مصنوعات کی انکوائری
 DocType: Academic Term,Schools,اسکولوں
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,پہلی کمپنی داخل کریں
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Company first,پہلی کمپنی کا انتخاب کریں
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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,کل لاگت
@@ -170,9 +169,10 @@
 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: Assessment Result,Grade,گریڈ
 DocType: Sales Invoice Item,Delivered By Supplier,سپلائر کی طرف سے نجات بخشی
 DocType: SMS Center,All Contact,تمام رابطہ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Annual Salary,سالانہ تنخواہ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,اسٹاک اخراجات
@@ -182,12 +182,13 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +316,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 +130,At least one mode of payment is required for POS invoice.,ادائیگی کی کم از کم ایک موڈ POS انوائس کے لئے ضروری ہے.
 DocType: Products Settings,Show Products as a List,شو کی مصنوعات ایک فہرست کے طور
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records",، سانچہ ڈاؤن لوڈ مناسب اعداد و شمار کو بھرنے کے اور نظر ثانی شدہ فائل منسلک. منتخب مدت میں تمام تاریخوں اور ملازم مجموعہ موجودہ حاضری کے ریکارڈز کے ساتھ، سانچے میں آ جائے گا
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +451,Item {0} is not active or end of life has been reached,{0} آئٹم فعال نہیں ہے یا زندگی کے اختتام تک پہنچ گیا ہے
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +456,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/controllers/accounts_controller.py +614,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",شے کی درجہ بندی میں صف {0} میں ٹیکس شامل کرنے کے لئے، قطار میں ٹیکس {1} بھی شامل کیا جانا چاہئے
+apps/erpnext/erpnext/controllers/accounts_controller.py +617,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",شے کی درجہ بندی میں صف {0} میں ٹیکس شامل کرنے کے لئے، قطار میں ٹیکس {1} بھی شامل کیا جانا چاہئے
 apps/erpnext/erpnext/config/hr.py +166,Settings for HR Module,HR ماڈیول کے لئے ترتیبات
 DocType: SMS Center,SMS Center,ایس ایم ایس مرکز
 DocType: Sales Invoice,Change Amount,رقم تبدیل
@@ -199,12 +200,12 @@
 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 +147,Execution,پھانسی
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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,اشیا اور قیمتوں کا تعین
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},تاریخ سے مالیاتی سال کے اندر اندر ہونا چاہئے. تاریخ سے سنبھالنے = {0}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,Cost Center {0} does not belong to Company {1},سینٹر {0} کمپنی سے تعلق نہیں ہے لاگت {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +100,Cost Center {0} does not belong to Company {1},سینٹر {0} کمپنی سے تعلق نہیں ہے لاگت {1}
 DocType: Customer,Individual,انفرادی
 DocType: Interest,Academics User,ماہرین تعلیم یوزر
 DocType: Cheque Print Template,Amount In Figure,پیکر میں رقم
@@ -220,30 +221,32 @@
 DocType: Production Planning Tool,Sales Orders,فروخت کے احکامات
 DocType: Purchase Taxes and Charges,Valuation,تشخیص
 ,Purchase Order Trends,آرڈر رجحانات خریدیں
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,The request for quotation can be accessed by clicking on the following link,کوٹیشن کے لئے درخواست مندرجہ ذیل لنک پر کلک کر کے حاصل کیا جا سکتا
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,سال کے لئے پتے مختص.
 DocType: SG Creation Tool Course,SG Creation Tool Course,SG تخلیق کا آلہ کورس
 DocType: Student Group Creation Tool,Leave blank if you wish to fetch all courses for selected academic term,آپ کے منتخب کردہ تعلیمی مدت کے لئے تمام کورسز بازیافت کرنا چاہتے ہیں تو خالی چھوڑ دیں
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,Insufficient Stock,ناکافی اسٹاک
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227,Insufficient Stock,ناکافی اسٹاک
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,غیر فعال صلاحیت کی منصوبہ بندی اور وقت سے باخبر رہنا
+DocType: Email Digest,New Sales Orders,نئے فروخت کے احکامات
 DocType: Bank Reconciliation,Bank Account,بینک اکاؤنٹ
 DocType: Leave Type,Allow Negative Balance,منفی بیلنس کی اجازت دیں
 DocType: Selling Settings,Default Territory,پہلے سے طے شدہ علاقہ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,ٹیلی ویژن
 DocType: Production Order Operation,Updated via 'Time Log',&#39;وقت لاگ ان&#39; کے ذریعے اپ ڈیٹ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} does not belong to Company {1},اکاؤنٹ {0} کمپنی سے تعلق نہیں ہے {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +86,Account {0} does not belong to Company {1},اکاؤنٹ {0} کمپنی سے تعلق نہیں ہے {1}
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},ایڈوانس رقم سے زیادہ نہیں ہو سکتا {0} {1}
 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 +174,For Warehouse is required before Submit,گودام کے لئے جمع کرانے سے پہلے کی ضرورت ہے
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,For Warehouse is required before Submit,گودام کے لئے جمع کرانے سے پہلے کی ضرورت ہے
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,پر موصول
 DocType: Sales Partner,Reseller,ری سیلر
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,کمپنی داخل کریں
 DocType: Delivery Note Item,Against Sales Invoice Item,فروخت انوائس آئٹم خلاف
 ,Production Orders in Progress,پیش رفت میں پیداوار کے احکامات
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Cash from Financing,فنانسنگ کی طرف سے نیٹ کیش
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1436,"LocalStorage is full , did not save",لئے LocalStorage بھرا ہوا ہے، نہیں بچا تھا
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1460,"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}
@@ -255,18 +258,19 @@
 apps/erpnext/erpnext/templates/generators/item.html +78,No description given,دی کوئی وضاحت
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,خریداری کے لئے درخواست.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +5,This is based on the Time Sheets created against this project,یہ اس منصوبے کے خلاف پیدا وقت کی چادریں پر مبنی ہے
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Only the selected Leave Approver can submit this Leave Application,صرف منتخب شدہ رخصت کی منظوری دینے والا اس چھٹی کی درخواست پیش کر سکتے ہیں
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +213,Only the selected Leave Approver can submit this Leave Application,صرف منتخب شدہ رخصت کی منظوری دینے والا اس چھٹی کی درخواست پیش کر سکتے ہیں
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,تاریخ حاجت میں شمولیت کی تاریخ سے زیادہ ہونا چاہیے
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Leaves per Year,سال پتے فی
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,سال پتے فی
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,صف {0}: براہ مہربانی چیک کریں کے اکاؤنٹ کے خلاف &#39;ایڈوانس ہے&#39; {1} اس پیشگی اندراج ہے.
 apps/erpnext/erpnext/stock/utils.py +188,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
 DocType: Task,Total Costing Amount (via Time Sheet),کل لاگت کی رقم (وقت شیٹ کے ذریعے)
 DocType: Item Website Specification,Item Website Specification,شے کی ویب سائٹ کی تفصیلات
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +435,Leave Blocked,چھوڑ کریں
-apps/erpnext/erpnext/stock/doctype/item/item.py +669,Item {0} has reached its end of life on {1},آئٹم {0} پر زندگی کے اس کے آخر تک پہنچ گیا ہے {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +443,Leave Blocked,چھوڑ کریں
+apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item {0} has reached its end of life on {1},آئٹم {0} پر زندگی کے اس کے آخر تک پہنچ گیا ہے {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +95,Bank Entries,بینک لکھے
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +83,Annual,سالانہ
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +86,Annual,سالانہ
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,اسٹاک مصالحتی آئٹم
 DocType: Stock Entry,Sales Invoice No,فروخت انوائس کوئی
 DocType: Material Request Item,Min Order Qty,کم از کم آرڈر کی مقدار
@@ -274,20 +278,22 @@
 DocType: Lead,Do Not Contact,سے رابطہ نہیں کرتے
 apps/erpnext/erpnext/public/js/setup_wizard.js +360,People who teach at your organisation,آپ کی تنظیم میں پڑھانے والے لوگ
 DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,تمام بار بار چلنے والی رسیدیں باخبر رکھنے کے لئے منفرد ID. یہ جمع کرانے پر پیدا کیا جاتا ہے.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Software Developer,سافٹ ویئر ڈویلپر
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,سافٹ ویئر ڈویلپر
 DocType: Item,Minimum Order Qty,کم از کم آرڈر کی مقدار
 DocType: Pricing Rule,Supplier Type,پردایک قسم
 DocType: Scheduling Tool,Course Start Date,کورس شروع کرنے کی تاریخ
 DocType: Item,Publish in Hub,حب میں شائع
+DocType: Student Admission,Student Admission,طالب علم داخلہ
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is cancelled,{0} آئٹم منسوخ کر دیا ہے
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Material Request,مواد کی درخواست
+apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} is cancelled,{0} آئٹم منسوخ کر دیا ہے
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +823,Material Request,مواد کی درخواست
 DocType: Bank Reconciliation,Update Clearance Date,اپ ڈیٹ کی کلیئرنس تاریخ
 apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +28,Abbreviation already used for another salary component,مخفف پہلے ہی دوسرے تنخواہ کے اتحادیوں کے لئے استعمال کیا
 DocType: Item,Purchase Details,خریداری کی تفصیلات
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +328,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},خریداری کے آرڈر میں خام مال کی فراہمی &#39;کے ٹیبل میں شے نہیں مل سکا {0} {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +333,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/config/selling.py +18,Confirmed orders from Customers.,صارفین کی طرف سے اس بات کی تصدیق کے احکامات.
 DocType: Purchase Receipt Item,Rejected Quantity,مسترد مقدار
 DocType: SMS Settings,SMS Sender Name,SMS مرسل کا نام
@@ -303,6 +309,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +130,Please select Charge Type first,سب سے پہلے انچارج قسم منتخب کریں
 DocType: Student Group Student,Student Group Student,طالب علم گروپ طالب علم
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,تازہ ترین
+DocType: Email Digest,New Quotations,نئی کوٹیشن
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,فہرست میں پہلے رخصت کی منظوری دینے والا پہلے سے طے شدہ چھوڑ گواہ کے طور پر قائم کیا جائے گا
 DocType: Tax Rule,Shipping County,شپنگ کاؤنٹی
 apps/erpnext/erpnext/config/desktop.py +158,Learn,جانیے
@@ -315,7 +322,7 @@
 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 +348,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 +86,Circular Reference Error,سرکلر حوالہ خرابی
@@ -326,15 +333,16 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,خود کار طریقے سے مواد کی درخواست کی تخلیق پر ای میل کے ذریعے مطلع کریں
 DocType: Journal Entry,Multi Currency,ملٹی کرنسی
 DocType: Payment Reconciliation Invoice,Invoice Type,انوائس کی قسم
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +806,Delivery Note,ترسیل کے نوٹ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +800,Delivery Note,ترسیل کے نوٹ
 apps/erpnext/erpnext/config/learn.py +87,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 +233,Payment Entry has been modified after you pulled it. Please pull it again.,آپ اسے نکالا بعد ادائیگی انٹری پر نظر ثانی کر دیا گیا ہے. اسے دوبارہ ھیںچو براہ مہربانی.
+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/setup/doctype/email_digest/email_digest.py +104,Summary for this week and pending activities,اس ہفتے اور زیر التواء سرگرمیوں کا خلاصہ
+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",کوما سے علیحدہ کریں ای میل کی شناخت، انوائس خاص تاریخ پر خود کار طریقے سے بھیج دیا جائے گا
 DocType: Employee,Company Email,کمپنی ای میل
@@ -346,27 +354,28 @@
 apps/erpnext/erpnext/config/hr.py +186,"Employee designation (e.g. CEO, Director etc.).",ملازم عہدہ (مثلا سی ای او، ڈائریکٹر وغیرہ).
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,درج میدان قیمت &#39;دن ماہ پر دہرائیں براہ مہربانی
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,کسٹمر کرنسی کسٹمر کی بنیاد کرنسی تبدیل کیا جاتا ہے جس میں شرح
-apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},صف # {0}: خریداری کی رسید ایک موجودہ اثاثہ کے خلاف بنایا نہیں جا سکتا {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +554,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},صف # {0}: خریداری کی رسید ایک موجودہ اثاثہ کے خلاف بنایا نہیں جا سکتا {1}
 DocType: Item Tax,Tax Rate,ٹیکس کی شرح
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} پہلے ہی ملازم کے لئے مختص {1} کی مدت {2} کے لئے {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +812,Select Item,منتخب آئٹم
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +791,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/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,انوائس {0} پہلے ہی پیش کیا جاتا ہے کی خریداری
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},صف # {0}: بیچ کوئی طور پر ایک ہی ہونا ضروری ہے {1} {2}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +143,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.,ایک آئٹم کے بیچ (بہت).
 DocType: C-Form Invoice Detail,Invoice Date,انوائس کی تاریخ
 DocType: GL Entry,Debit Amount,ڈیبٹ رقم
 apps/erpnext/erpnext/accounts/party.py +242,There can only be 1 Account per Company in {0} {1},صرف فی کمپنی 1 اکاؤنٹ نہیں ہو سکتا {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +4,Your email address,آپ کا ای میل ایڈریس
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +342,Please see attachment,منسلکہ ملاحظہ کریں
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,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 +19,Setup Already Complete!!,سیٹ اپ پہلے مکمل !!
 ,Finished Goods,تیار اشیاء
 DocType: Delivery Note,Instructions,ہدایات
 DocType: Quality Inspection,Inspected By,کی طرف سے معائنہ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,پردایک&gt; پردایک قسم
 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,مادے کا اضافہ
@@ -380,29 +389,29 @@
 DocType: Currency Exchange,Currency Exchange,کرنسی کا تبادلہ
 DocType: Purchase Invoice Item,Item Name,نام شے
 DocType: Authorization Rule,Approving User  (above authorized value),(مجاز کی قیمت سے اوپر) صارف منظوری
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,کریڈٹ توازن
+DocType: Email Digest,Credit Balance,کریڈٹ توازن
 DocType: Employee,Widowed,بیوہ
 DocType: Request for Quotation,Request for Quotation,کوٹیشن کے لئے درخواست
 DocType: Salary Slip Timesheet,Working Hours,کام کے اوقات
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,ایک موجودہ سیریز کے شروع / موجودہ ترتیب تعداد کو تبدیل کریں.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.",ایک سے زیادہ قیمتوں کا تعین قواعد غالب کرنے کے لئے جاری ہے، صارفین تنازعہ کو حل کرنے دستی طور پر ترجیح مقرر کرنے کو کہا جاتا.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +736,Purchase Return,واپس خریداری
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +715,Purchase Return,واپس خریداری
 ,Purchase Register,خریداری رجسٹر
 DocType: Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,لاگو چارجز
 DocType: Workstation,Consumable Cost,فراہمی لاگت
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +202,{0} ({1}) must have role 'Leave Approver',"{0} ({1})  کردارکےلیے 'رخصت کی منظوری دینے والا"" کردار ہونا ضروری ہے'"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,{0} ({1}) must have role 'Leave Approver',"{0} ({1})  کردارکےلیے 'رخصت کی منظوری دینے والا"" کردار ہونا ضروری ہے'"
 DocType: Purchase Receipt,Vehicle Date,گاڑی تاریخ
 DocType: Student Log,Medical,میڈیکل
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,کھونے کے لئے کی وجہ سے
-apps/erpnext/erpnext/accounts/utils.py +239,Allocated amount can not greater than unadjusted amount,مختص رقم اسایڈجت رقم سے زیادہ نہیں کر سکتے ہیں
+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,مختص رقم اسایڈجت رقم سے زیادہ نہیں کر سکتے ہیں
 DocType: Announcement,Receiver,وصول
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},کارگاہ چھٹیوں فہرست کے مطابق مندرجہ ذیل تاریخوں پر بند کر دیا ہے: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,مواقع
 DocType: Employee,Single,سنگل
 DocType: Account,Cost of Goods Sold,فروخت سامان کی قیمت
 DocType: Purchase Invoice,Yearly,سالانہ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +225,Please enter Cost Center,لاگت مرکز درج کریں
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,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,آڈیٹر نام
@@ -415,26 +424,26 @@
 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,خود کار طریقے سے فیفو پر مبنی نمبر سیریل سیٹ
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,چیک سپلائر انوائس نمبر انفرادیت
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',&#39;کیس نہیں.&#39; &#39;کیس نمبر سے&#39; سے کم نہیں ہو سکتا
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,Non Profit,غیر منافع بخش
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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: Stock Reconciliation Item,Do not include symbols (ex. $),علامات شامل نہ کریں (سابق. $)
 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 +638,Attribute {0} selected multiple times in Attributes Table,خاصیت {0} صفات ٹیبل میں ایک سے زیادہ مرتبہ منتخب
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,خاصیت {0} صفات ٹیبل میں ایک سے زیادہ مرتبہ منتخب
 DocType: HR Settings,Employee record is created using selected field. ,ملازم ریکارڈ منتخب کردہ میدان کا استعمال کرتے ہوئے تخلیق کیا جاتا ہے.
 DocType: Sales Order,Not Applicable,قابل اطلاق نہیں
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,چھٹیوں ماسٹر.
 DocType: Request for Quotation Item,Required Date,مطلوبہ تاریخ
 DocType: Delivery Note,Billing Address,بل کا پتہ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +862,Please enter Item Code.,آئٹم کوڈ داخل کریں.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +847,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",جانچ پڑتال کی تو پہلے سے ہی پرنٹ ریٹ / پرنٹ رقم میں شامل ہیں، ٹیکس کی رقم غور کیا جائے گا
@@ -448,7 +457,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,سیکورٹیز اور جمع
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,مختص کل پتے لازمی ہے
 DocType: Job Opening,Description of a Job Opening,ایک کام افتتاحی تفصیل
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Pending activities for today,آج کے لئے زیر غور سرگرمیوں
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,آج کے لئے زیر غور سرگرمیوں
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,حاضری کا ریکارڈ.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,timesheet بنیاد پے رول کے لئے تنخواہ کے اجزاء.
 DocType: Sales Order Item,Used for Production Plan,پیداوار کی منصوبہ بندی کے لئے استعمال کیا جاتا ہے
@@ -460,15 +469,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +238,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 +86,Administrative Officer,ایڈمنسٹریٹو آفیسر
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,ایڈمنسٹریٹو آفیسر
 DocType: Timesheet Detail,Hrs,بجے
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +319,Please select Company,کمپنی کا انتخاب کریں
-DocType: Stock Entry,Difference Account,فرق اکاؤنٹ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +309,Please select Company,کمپنی کا انتخاب کریں
+DocType: Stock Entry Detail,Difference Account,فرق اکاؤنٹ
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,اس کا انحصار کام {0} بند نہیں ہے کے طور پر قریب کام نہیں کر سکتے ہیں.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Please enter Warehouse for which Material Request will be raised,مواد درخواست اٹھایا جائے گا جس کے لئے گودام میں داخل کریں
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +399,Please enter Warehouse for which Material Request will be raised,مواد درخواست اٹھایا جائے گا جس کے لئے گودام میں داخل کریں
 DocType: Production Order,Additional Operating Cost,اضافی آپریٹنگ لاگت
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,کاسمیٹک
-apps/erpnext/erpnext/stock/doctype/item/item.py +530,"To merge, following properties must be same for both items",ضم کرنے کے لئے، مندرجہ ذیل خصوصیات دونوں اشیاء کے لئے ایک ہی ہونا چاہیے
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,"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 +28,Buy,خریدنے
@@ -476,7 +485,7 @@
 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 +1563,Serial no item cannot be a fraction,سیریل کوئی شے ایک حصہ نہیں ہو سکتا
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1587,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,منیجنگ ذیلی سمجھوتے
@@ -491,7 +500,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +42,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 +313,Reference No and Reference Date is mandatory for Bank transaction,حوالہ نمبر اور ریفرنس تاریخ بینک ٹرانزیکشن کے لئے لازمی ہے
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +316,Reference No and Reference Date is mandatory for Bank transaction,حوالہ نمبر اور ریفرنس تاریخ بینک ٹرانزیکشن کے لئے لازمی ہے
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,/ ترمیم ٹیکس اور الزامات شامل
 DocType: Purchase Invoice,Supplier Invoice No,سپلائر انوائس کوئی
 DocType: Territory,For reference,حوالے کے لیے
@@ -502,7 +511,6 @@
 DocType: Installation Note Item,Installation Note Item,تنصیب نوٹ آئٹم
 DocType: Production Plan Item,Pending Qty,زیر مقدار
 DocType: Budget,Ignore,نظر انداز
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,آئٹم کوڈ&gt; آئٹم گروپ&gt; برانڈ
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,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
@@ -513,11 +521,11 @@
 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/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,انوائس ٹیبل میں پایا کوئی ریکارڈ
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +28,Please select Company and Party Type first,پہلی کمپنی اور پارٹی کی قسم منتخب کریں
+apps/erpnext/erpnext/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/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 +707,Make Sales Order,سیلز آرڈر بنائیں
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +701,Make Sales Order,سیلز آرڈر بنائیں
 DocType: Project Task,Project Task,پراجیکٹ ٹاسک
 ,Lead Id,لیڈ کی شناخت
 DocType: C-Form Invoice Detail,Grand Total,مجموعی عدد
@@ -533,7 +541,8 @@
 DocType: Job Applicant,Resume Attachment,پھر جاری منسلکہ
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,دوبارہ گاہکوں
 DocType: Leave Control Panel,Allocate,مختص
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +734,Sales Return,سیلز واپس
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +728,Sales Return,سیلز واپس
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +91,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,نوٹ: کل روانہ مختص {0} پہلے ہی منظور پتیوں سے کم نہیں ہونا چاہئے {1} مدت کے لئے
 DocType: Announcement,Posted By,کی طرف سے پوسٹ
 DocType: Item,Delivered by Supplier (Drop Ship),سپلائر کی طرف سے نجات بخشی (ڈراپ جہاز)
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,ممکنہ گاہکوں کے ڈیٹا بیس.
@@ -542,14 +551,13 @@
 DocType: Quotation,Quotation To,کے لئے کوٹیشن
 DocType: Lead,Middle Income,درمیانی آمدنی
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +212,Opening (Cr),افتتاحی (CR)
-apps/erpnext/erpnext/stock/doctype/item/item.py +795,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,آپ نے پہلے ہی ایک UOM ساتھ کچھ لین دین (ے) بنا دیا ہے کی وجہ سے اشیاء کے لئے پیمائش کی پہلے سے طے شدہ یونٹ {0} براہ راست تبدیل نہیں کیا جا سکتا. آپ کو ایک مختلف پہلے سے طے شدہ UOM استعمال کرنے کے لئے ایک نیا آئٹم تخلیق کرنے کے لئے کی ضرورت ہو گی.
-apps/erpnext/erpnext/accounts/utils.py +237,Allocated amount can not be negative,مختص رقم منفی نہیں ہو سکتا
+apps/erpnext/erpnext/stock/doctype/item/item.py +797,Default Unit of Measure for Item {0} cannot be changed directly because 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,مختص رقم منفی نہیں ہو سکتا
 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,فروخت انوائس Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},حوالہ کوئی اور حوالہ تاریخ کے لئے ضروری ہے {0}
-DocType: Sales Invoice,Customer's Vendor,گاہک کی وینڈر
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Proposal Writing,تجویز تحریری طور پر
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,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",ذیلی کنٹریکٹڈ مواد درخواستوں میں شامل کیا جائے گا رہے ہیں کہ اشیاء کے لئے کی جانچ پڑتال کی ہے تو، خام مال
@@ -558,13 +566,14 @@
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,وقت سے باخبر رکھنے
 DocType: Fiscal Year Company,Fiscal Year Company,مالی سال کمپنی
 DocType: Packing Slip Item,DN Detail,DN تفصیل
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +257,Already supplier quotation has created,پہلے سے سپلائر کوٹیشن پیدا کیا ہے
 DocType: Timesheet,Billed,بل
 DocType: Batch,Batch Description,بیچ تفصیل
+apps/erpnext/erpnext/accounts/utils.py +685,"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 +733,View Offline Records,لنک حاضر ریکارڈز
+apps/erpnext/erpnext/accounts/page/pos/pos.js +715,View Offline Records,لنک حاضر ریکارڈز
+DocType: Student,Sibling Details,بھائی کی تفصیلات دیکھیں
 DocType: Employee,Reason for Resignation,استعفی کی وجہ
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,کارکردگی تشخیص کے لئے سانچہ.
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,انوائس / جرنل اندراج کی تفصیلات
@@ -578,7 +587,7 @@
 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,انوینٹری میں خالص تبدیلی
 DocType: Employee,Passport Number,پاسپورٹ نمبر
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Manager,مینیجر
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,مینیجر
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,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;ہی نہیں ہو سکتا
@@ -587,10 +596,11 @@
 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 +299,Timesheet created:,Timesheet پیدا کیا:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +715,Please set default Cash or Bank account in Mode of Payment {0},ادائیگی کے موڈ میں پہلے سے طے شدہ نقد یا بینک اکاؤنٹ مقرر کریں {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +300,Timesheet created:,Timesheet پیدا کیا:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +772,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,اندراج کریں
 DocType: Selling Settings,Customer Naming By,کی طرف سے گاہک نام دینے
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,براہ مہربانی سیٹ اپ ملازم انسانی وسائل میں سسٹم کا نام دینے&gt; HR ترتیبات
 DocType: Depreciation Schedule,Depreciation Amount,ہراس کی رقم
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,گروپ میں تبدیل
 DocType: Activity Cost,Activity Type,سرگرمی کی قسم
@@ -615,6 +625,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,ختم
 DocType: Pricing Rule,Sales Manager,منتظم سامان فروخت
 DocType: Salary Structure Employee,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,ایسیٹ تلفی پر حاصل / نقصان کے اکاؤنٹ
@@ -629,11 +640,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +9,Pre Sales,پہلی فروخت
 DocType: Purchase Receipt,Other Details,دیگر تفصیلات
 DocType: Account,Accounts,اکاؤنٹس
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Marketing,مارکیٹنگ
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +227,Payment Entry is already created,ادائیگی انٹری پہلے ہی تخلیق کیا جاتا ہے
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,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 +538,Row #{0}: Asset {1} does not linked to Item {2},صف # {0}: {1} اثاثہ آئٹم سے منسلک نہیں کرتا {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +21,Preview Salary Slip,پیش نظارہ تنخواہ کی پرچی
+apps/erpnext/erpnext/controllers/accounts_controller.py +541,Row #{0}: Asset {1} does not linked to Item {2},صف # {0}: {1} اثاثہ آئٹم سے منسلک نہیں کرتا {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +38,Preview Salary Slip,پیش نظارہ تنخواہ کی پرچی
 DocType: Company,Deafult Cost Center,Deafult لاگت سینٹر
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +48,Account {0} has been entered multiple times,اکاؤنٹ {0} کئی بار داخل کیا گیا ہے
 DocType: Account,Expenses Included In Valuation,اخراجات تشخیص میں شامل
@@ -642,7 +653,7 @@
 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 +617,Item has variants.,آئٹم مختلف حالتوں ہے.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,آئٹم مختلف حالتوں ہے.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,آئٹم {0} نہیں ملا
 DocType: Bin,Stock Value,اسٹاک کی قیمت
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,درخت کی قسم
@@ -661,7 +672,7 @@
 DocType: Purchase Order,Supply Raw Materials,خام مال کی سپلائی
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,اگلے انوائس پیدا کیا جائے گا جس پر تاریخ. یہ جمع کرانے پر پیدا کیا جاتا ہے.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,موجودہ اثاثہ جات
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,{0} is not a stock Item,{0} اسٹاک شے نہیں ہے
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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 +169,Lead must be set if Opportunity is made from Lead,مواقع لیڈ سے بنایا گیا ہے تو قیادت مرتب کیا جانا چاہئے
@@ -725,21 +736,20 @@
 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 +709,No Permission,کوئی اجازت
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +710,No Permission,کوئی اجازت
 DocType: Company,Default Bank Account,پہلے سے طے شدہ بینک اکاؤنٹ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",پارٹی کی بنیاد پر فلٹر کرنے کے لئے، منتخب پارٹی پہلی قسم
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},اشیاء کے ذریعے فراہم نہیں کر رہے ہیں 'اپ ڈیٹ اسٹاک' کی چیک نہیں کیا جا سکتا{0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,نمبر
 DocType: Item,Items with higher weightage will be shown higher,اعلی اہمیت کے ساتھ اشیاء زیادہ دکھایا جائے گا
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,بینک مصالحتی تفصیل
-apps/erpnext/erpnext/controllers/accounts_controller.py +542,Row #{0}: Asset {1} must be submitted,صف # {0}: اثاثہ {1} پیش کرنا ضروری ہے
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,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 کے ذریعے اسٹاک توازن کو اپ لوڈ کریں.
 DocType: Warehouse,Tree Details,درخت کی تفصیلات دیکھیں
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,اب بھیجیں
 ,Support Analytics,سپورٹ کے تجزیات
 DocType: Item,Website Warehouse,ویب سائٹ گودام
 DocType: Payment Reconciliation,Minimum Invoice Amount,کم از کم انوائس کی رقم
@@ -759,13 +769,13 @@
 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 +229,Target Warehouse,ہدف گودام
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +230,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-,STE-
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Sales Order Date,متوقع تاریخ کی ترسیل سیلز آرڈر کی تاریخ سے پہلے نہیں ہو سکتا
 DocType: Upload Attendance,Import Attendance,درآمد حاضری
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,تمام آئٹم گروپس
+apps/erpnext/erpnext/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/config/setup.py +89,Automatically compose message on submission of transactions.,خود کار طریقے سے لین دین کی جمع کرانے پر پیغام لکھیں.
@@ -777,13 +787,15 @@
 DocType: Sales Invoice,Payment Due Date,ادائیگی کی وجہ سے تاریخ
 apps/erpnext/erpnext/stock/doctype/item/item.js +278,Item Variant {0} already exists with same attributes,آئٹم مختلف {0} پہلے ہی صفات کے ساتھ موجود
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',افتتاحی'
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,ایسا کرنے کے لئے کھلے
 DocType: Notification Control,Delivery Note Message,ترسیل کے نوٹ پیغام
 DocType: Expense Claim,Expenses,اخراجات
 DocType: Item Variant Attribute,Item Variant Attribute,آئٹم مختلف خاصیت
 ,Purchase Receipt Trends,خریداری کی رسید رجحانات
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Research & Development,ریسرچ اینڈ ڈیولپمنٹ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,ریسرچ اینڈ ڈیولپمنٹ
 ,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,قیمت یا ڈسکاؤنٹ
@@ -792,7 +804,7 @@
 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/controllers/accounts_controller.py +340,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",ادائیگی انٹری {0} آرڈر {1}، اسے اس انوائس میں پیشگی کے طور پر نکالا جانا چاہئے تو چیک خلاف منسلک ہے.
+apps/erpnext/erpnext/controllers/accounts_controller.py +343,"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,پوائنٹ کے فروخت
@@ -814,11 +826,11 @@
 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 +756,Purchase Receipt,خریداری کی رسید
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +735,Purchase Receipt,خریداری کی رسید
 ,Received Items To Be Billed,موصول ہونے والی اشیاء بل بھیجا جائے کرنے کے لئے
 DocType: Employee,Ms,محترمہ
 apps/erpnext/erpnext/config/accounts.py +267,Currency exchange rate master.,کرنسی کی شرح تبادلہ ماسٹر.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +282,Unable to find Time Slot in the next {0} days for Operation {1},آپریشن کے لئے اگلے {0} دنوں میں وقت سلاٹ تلاش کرنے سے قاصر {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Unable to find Time Slot in the next {0} days for Operation {1},آپریشن کے لئے اگلے {0} دنوں میں وقت سلاٹ تلاش کرنے سے قاصر {1}
 DocType: Production Order,Plan material for sub-assemblies,ذیلی اسمبلیوں کے لئے منصوبہ مواد
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,سیلز شراکت دار اور علاقہ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be active,BOM {0} فعال ہونا ضروری ہے
@@ -829,7 +841,7 @@
 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 +214,Warehouses with existing transaction can not be converted to ledger.,موجودہ منتقلی کے ساتھ گوداموں لیجر میں تبدیل نہیں کیا جا سکتا.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +217,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,پیداوار کے احکامات
@@ -842,9 +854,9 @@
 DocType: Supplier,Default Payable Accounts,پہلے سے طے شدہ قابل ادائیگی اکاؤنٹس
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,{0} ملازم فعال نہیں ہے یا موجود نہیں ہے
 DocType: Fee Structure,Components,اجزاء
-apps/erpnext/erpnext/stock/doctype/item/item.py +612,Item Variants {0} updated,آئٹم متغیرات {0} اپ ڈیٹ
+apps/erpnext/erpnext/stock/doctype/item/item.py +614,Item Variants {0} updated,آئٹم متغیرات {0} اپ ڈیٹ
 DocType: Quality Inspection Reading,Reading 6,6 پڑھنا
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +843,Cannot {0} {1} {2} without any negative outstanding invoice,نہ {0} {1} {2} بھی منفی بقایا انوائس کے بغیر کر سکتے ہیں
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +854,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,ہم آہنگی اب
@@ -859,69 +871,70 @@
 DocType: Item,Is Purchase Item,خریداری آئٹم
 DocType: Asset,Purchase Invoice,خریداری کی رسید
 DocType: Stock Ledger Entry,Voucher Detail No,واؤچر تفصیل کوئی
-apps/erpnext/erpnext/accounts/page/pos/pos.js +728,New Sales Invoice,نئے فروخت انوائس
+apps/erpnext/erpnext/accounts/page/pos/pos.js +710,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 +728,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: Cheque Print Template,Has Print Format,پرنٹ کی شکل ہے
-apps/erpnext/erpnext/accounts/page/pos/pos.js +86, is mandatory. Maybe Currency Exchange record is not created for ,لازمی ہے. ہو سکتا ہے کہ کرنسی ایکسچینج ریکارڈ موجودنھئں
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +109,Row #{0}: Please specify Serial No for Item {1},صف # {0}: شے کے لئے کوئی سیریل کی وضاحت کریں {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +619,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.",&#39;پروڈکٹ بنڈل&#39; اشیاء، گودام، سیریل نمبر اور بیچ کے لئے نہیں &#39;پیکنگ کی فہرست کی میز سے غور کیا جائے گا. گودام اور بیچ کسی بھی &#39;پروڈکٹ بنڈل&#39; شے کے لئے تمام پیکنگ اشیاء کے لئے ایک ہی ہیں، ان اقدار بنیادی شے کے ٹیبل میں داخل کیا جا سکتا، اقدار ٹیبل &#39;پیکنگ کی فہرست&#39; کے لئے کاپی کیا جائے گا.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +75, 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 +613,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing 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 +606,Supplier Invoice Date cannot be greater than Posting Date,سپلائر انوائس تاریخ پوسٹنگ کی تاریخ سے زیادہ نہیں ہو سکتا
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +609,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: 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 +810,Select Item for Transfer,منتقلی کے لئے منتخب آئٹم
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +789,Select Item for Transfer,منتقلی کے لئے منتخب آئٹم
 DocType: Purchase Invoice,Additional Discount Percentage,اضافی ڈسکاؤنٹ فی صد
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,تمام قسم کی مدد ویڈیوز کی ایک فہرست دیکھیں
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,چیک جمع کیا گیا تھا جہاں بینک کے اکاؤنٹ منتخب کریں سر.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,صارف لین دین میں قیمت کی فہرست کی شرح میں ترمیم کرنے دیں
 DocType: Pricing Rule,Max Qty,زیادہ سے زیادہ مقدار
-DocType: Student Applicant,Father's Name,باپ کا نام
 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 +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,صف {0}: سیلز / خریداری کے آرڈر کے خلاف ادائیگی ہمیشہ پیشگی کے طور پر نشان لگا دیا جائے چاہئے
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,کیمیکل
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +686,All items have already been transferred for this Production Order.,تمام اشیاء پہلے ہی اس پروڈکشن آرڈر کے لئے منتقل کر دیا گیا ہے.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +694,All items have already been transferred for this Production Order.,تمام اشیاء پہلے ہی اس پروڈکشن آرڈر کے لئے منتقل کر دیا گیا ہے.
 DocType: Process Payroll,Select Payroll Year and Month,پے رول سال اور مہینہ منتخب کریں
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,Meter,میٹر
 DocType: Workstation,Electricity Cost,بجلی کی لاگت
 DocType: HR Settings,Don't send Employee Birthday Reminders,ملازم سالگرہ کی یاددہانیاں نہ بھیجیں
-DocType: Opportunity,Walk In,میں چلنے
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,اسٹاک میں لکھے
 DocType: Item,Inspection Criteria,معائنہ کا کلیہ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,transfered کیا
 apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,اپنے خط سر اور علامت (لوگو). (آپ کو بعد ان میں ترمیم کر سکتے ہیں).
 DocType: Timesheet Detail,Bill,بل
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,White,وائٹ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date is entered as past date,اگلا ہراس کی تاریخ ماضی تاریخ کے طور پر درج کیا جاتا ہے
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +167,White,وائٹ
 DocType: SMS Center,All Lead (Open),تمام لیڈ (کھولیں) تیار
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +228,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),صف {0}: کے لئے مقدار دستیاب نہیں {4} گودام میں {1} اندراج کے وقت پوسٹنگ میں ({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}),صف {0}: کے لئے مقدار دستیاب نہیں {4} گودام میں {1} اندراج کے وقت پوسٹنگ میں ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,پیشگی ادا کرنے
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +731,Make ,بنائیں
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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 +154,Order Type must be one of {0},آرڈر کی قسم سے ایک ہونا ضروری {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},آرڈر کی قسم سے ایک ہونا ضروری {0}
 DocType: Lead,Next Contact Date,اگلی رابطہ تاریخ
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,مقدار کھولنے
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +393,Please enter Account for Change Amount,تبدیلی کی رقم کے اکاؤنٹ درج کریں
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,Please enter Account for Change Amount,تبدیلی کی رقم کے اکاؤنٹ درج کریں
 DocType: Student Batch,Student Batch Name,Student کی بیچ کا نام
 DocType: Holiday List,Holiday List Name,چھٹیوں فہرست کا نام
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js +8,Schedule Course,شیڈول کورس
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Stock Options,اسٹاک اختیارات
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,اسٹاک اختیارات
 DocType: Journal Entry Account,Expense Claim,اخراجات کا دعوی
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +211,Do you really want to restore this scrapped asset?,اگر تم واقعی اس کو ختم کر دیا اثاثہ بحال کرنا چاہتے ہیں؟
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +237,Qty for {0},کے لئے مقدار {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +212,Do you really want to restore this scrapped asset?,اگر تم واقعی اس کو ختم کر دیا اثاثہ بحال کرنا چاہتے ہیں؟
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,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,بلاک فہرست تاریخوں چھوڑ
@@ -930,9 +943,9 @@
 DocType: Company,Default Terms,پہلے سے طے شدہ شرائط
 DocType: Packing Slip Item,Packing Slip Item,پیکنگ پرچی آئٹم
 DocType: Purchase Invoice,Cash/Bank Account,کیش / بینک اکاؤنٹ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,مقدار یا قدر میں کوئی تبدیلی نہیں کے ساتھ ختم اشیاء.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,مقدار یا قدر میں کوئی تبدیلی نہیں کے ساتھ ختم اشیاء.
 DocType: Delivery Note,Delivery To,کی ترسیل کے
-apps/erpnext/erpnext/stock/doctype/item/item.py +635,Attribute table is mandatory,وصف میز لازمی ہے
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,وصف میز لازمی ہے
 DocType: Production Planning Tool,Get Sales Orders,سیلز احکامات حاصل
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} منفی نہیں ہو سکتا
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,ایک طالب علم براہ مہربانی منتخب کریں
@@ -957,7 +970,7 @@
 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,WIP گودام
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},سیریل نمبر {0} تک بحالی کے معاہدہ کے تحت ہے {1}
+apps/erpnext/erpnext/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,تنظیم کا نام
@@ -969,7 +982,7 @@
 DocType: GL Entry,Against,کے خلاف
 DocType: Item,Default Selling Cost Center,پہلے سے طے شدہ فروخت لاگت مرکز
 DocType: Sales Partner,Implementation Partner,نفاذ ساتھی
-apps/erpnext/erpnext/controllers/selling_controller.py +231,Sales Order {0} is {1},سیلز آرڈر {0} ہے {1}
+apps/erpnext/erpnext/controllers/selling_controller.py +232,Sales Order {0} is {1},سیلز آرڈر {0} ہے {1}
 DocType: Opportunity,Contact Info,رابطے کی معلومات
 apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,اسٹاک اندراجات کر رہے ہیں
 DocType: Packing Slip,Net Weight UOM,نیٹ وزن UOM
@@ -979,25 +992,24 @@
 DocType: Holiday List,Get Weekly Off Dates,ویکلی آف تاریخوں کو حاصل
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,ختم ہونے کی تاریخ شروع کرنے کی تاریخ کے مقابلے میں کم نہیں ہو سکتا
 DocType: Sales Person,Select company name first.,پہلے منتخب کمپنی کا نام.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Dr,ڈاکٹر
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Dr,ڈاکٹر
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,کوٹیشن سپلائر کی طرف سے موصول.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},کرنے کے لئے {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,اوسط عمر
 DocType: 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/templates/pages/home.html +32,View All Products,تمام مصنوعات دیکھیں
+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 +400,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,انتباہ: نظام آئٹم کے لئے رقم کے بعد overbilling چیک نہیں کریں گے {0} میں {1} صفر ہے
+apps/erpnext/erpnext/controllers/accounts_controller.py +403,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/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,اور سال
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +191,{0} {1} must be submitted,{0} {1} پیش کرنا ضروری ہے
-DocType: Email Digest,Annual Expense,سالانہ اخراجات
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,{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}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,سی فارم انوائس تفصیل
@@ -1007,30 +1019,31 @@
 DocType: Sales Partner,Distributor,ڈسٹریبیوٹر
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,خریداری کی ٹوکری شپنگ حکمرانی
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +211,Production Order {0} must be cancelled before cancelling this Sales Order,پروڈکشن آرڈر {0} اس سیلز آرڈر منسوخ کرنے سے پہلے منسوخ کر دیا جائے ضروری ہے
-apps/erpnext/erpnext/public/js/controllers/transaction.js +62,Please set 'Apply Additional Discount On',سیٹ &#39;پر اضافی رعایت کا اطلاق کریں براہ مہربانی
+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,رینج کم ہونا ضروری ہے کے مقابلے میں رینج کے لئے
 DocType: Global Defaults,Global Defaults,گلوبل ڈیفالٹس
 apps/erpnext/erpnext/projects/doctype/project/project.py +153,Project Collaboration Invitation,منصوبے کے تعاون کا دعوت نامہ
 DocType: Salary Slip,Deductions,کٹوتیوں
+DocType: Leave Allocation,LAL/,LAL /
 apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,شروع سال
 DocType: Purchase Invoice,Start date of current invoice's period,موجودہ انوائس کی مدت کے شروع کرنے کی تاریخ
 DocType: Salary Slip,Leave Without Pay,بغیر تنخواہ چھٹی
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +327,Capacity Planning Error,صلاحیت کی منصوبہ بندی کرنے میں خامی
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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 +362,Finished Item {0} must be entered for Manufacture type entry,ختم آئٹم {0} تیاری قسم اندراج کے لئے داخل ہونا ضروری ہے
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +367,Finished Item {0} must be entered for Manufacture type entry,ختم آئٹم {0} تیاری قسم اندراج کے لئے داخل ہونا ضروری ہے
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,کھولنے اکاؤنٹنگ بیلنس
 DocType: Sales Invoice Advance,Sales Invoice Advance,فروخت انوائس ایڈوانس
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +499,Nothing to request,کچھ درخواست کرنے کے لئے
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +500,Nothing to request,کچھ درخواست کرنے کے لئے
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',&#39;اصل تاریخ آغاز&#39; &#39;اصل تاریخ اختتام&#39; سے زیادہ نہیں ہو سکتا
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Management,مینجمنٹ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},بہر ڈیبٹ یا کریڈٹ رقم کے لئے کی ضرورت ہے {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,مینجمنٹ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +55,Either debit or credit amount is required for {0},بہر ڈیبٹ یا کریڈٹ رقم کے لئے کی ضرورت ہے {0}
 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 +161,Blue,بلیو
+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 مقرر کریں
@@ -1040,12 +1053,12 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +23,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,پہلے سے طے شدہ آئٹم گروپ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1374,Do you really want to submit the invoice?,تم واقعی میں انوائس جمع کرنے کے لئے چاہتے ہیں؟
+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 +685,Cost Center For Item with Item Code ',&#39;آئٹم کوڈ شے کے لئے مرکز لاگت
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1526,"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 +679,Cost Center For Item with Item Code ',&#39;آئٹم کوڈ شے کے لئے مرکز لاگت
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1550,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",ادائیگی موڈ تشکیل نہیں ہے. چاہے اکاؤنٹ ادائیگیاں کے موڈ پر یا POS پروفائل پر قائم کیا گیا ہے، براہ مہربانی چیک کریں.
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,آپ کی فروخت کے شخص گاہک سے رابطہ کرنے اس تاریخ پر ایک یاد دہانی حاصل کریں گے
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,"Further accounts can be made under Groups, but entries can be made against non-Groups",مزید اکاؤنٹس گروپوں کے تحت بنایا جا سکتا ہے، لیکن اندراجات غیر گروپوں کے خلاف بنایا جا سکتا ہے
 DocType: Lead,Lead,لیڈ
@@ -1064,99 +1077,101 @@
 DocType: Payment Reconciliation,Unreconciled Payment Details,Unreconciled ادائیگی کی تفصیلات
 DocType: Global Defaults,Current Fiscal Year,رواں مالی سال
 DocType: Global Defaults,Disable Rounded Total,مدور کل غیر فعال
-DocType: Lead,Call,کال
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +417,'Entries' cannot be empty,"""entries"" خالی نہیں ہو سکتا"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +418,'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 +238,Setting up Employees,ملازمین کو مقرر
 DocType: Sales Order,SO-,دینے واال
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,پہلے سابقہ براہ مہربانی منتخب کریں
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Please select prefix first,پہلے سابقہ براہ مہربانی منتخب کریں
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Research,ریسرچ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,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 +57,View Ledger,لنک لیجر
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,قدیم ترین
-apps/erpnext/erpnext/stock/doctype/item/item.py +504,"An Item Group exists with same name, please change the item name or rename the item group",ایک آئٹم گروپ ایک ہی نام کے ساتھ موجود ہے، شے کے نام کو تبدیل کرنے یا شے کے گروپ کو دوسرا نام کریں
+apps/erpnext/erpnext/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 +437,Rest Of The World,باقی دنیا کے
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,آئٹم {0} بیچ نہیں کر سکتے ہیں
 ,Budget Variance Report,بجٹ تغیر رپورٹ
 DocType: Salary Slip,Gross Pay,مجموعی ادائیگی
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +90,Row {0}: Activity Type is mandatory.,صف {0}: سرگرمی کی قسم لازمی ہے.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +114,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/public/js/controllers/stock_controller.js +40,Accounting Ledger,اکاؤنٹنگ لیجر
+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,برقرار رکھا آمدنی
 DocType: BOM Item,Item Description,آئٹم تفصیل
+DocType: Student Sibling,Student Sibling,طالب علم بھائی
 DocType: Purchase Invoice,Is Recurring,مکرر ہے
 DocType: Purchase Invoice,Supplied Items,فراہم کی اشیا
 DocType: Student,STUD.,STUD.
 DocType: Production Order,Qty To Manufacture,تیار کرنے کی مقدار
+DocType: Email Digest,New Income,نئی آمدنی
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,خریداری سائیکل بھر میں ایک ہی شرح کو برقرار رکھنے
 DocType: Opportunity Item,Opportunity Item,موقع آئٹم
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,عارضی افتتاحی
 ,Employee Leave Balance,ملازم کی رخصت بیلنس
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +131,Balance for Account {0} must always be {1},اکاؤنٹ کے لئے توازن {0} ہمیشہ ہونا ضروری {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,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,مثال: کمپیوٹر سائنس میں ماسٹرز
 DocType: Purchase Invoice,Rejected Warehouse,مسترد گودام
 DocType: GL Entry,Against Voucher,واؤچر کے خلاف
 DocType: Item,Default Buying Cost Center,پہلے سے طے شدہ خرید لاگت مرکز
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.",ERPNext باہر سب سے بہترین حاصل کرنے کے لئے، ہم نے آپ کو کچھ وقت لینے کے لئے اور ان کی مدد کی ویڈیوز دیکھنے کے لئے مشورہ ہے کہ.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +87, to ,کے لئے
+apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,کے لئے
 DocType: Item,Lead Time in days,دنوں میں وقت کی قیادت
 ,Accounts Payable Summary,قابل ادائیگی اکاؤنٹس کے خلاصے
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Not authorized to edit frozen Account {0},منجمد اکاؤنٹ میں ترمیم کرنے کی اجازت نہیں {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},منجمد اکاؤنٹ میں ترمیم کرنے کی اجازت نہیں {0}
 DocType: Journal Entry,Get Outstanding Invoices,بقایا انوائس حاصل
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +62,Sales Order {0} is not valid,سیلز آرڈر {0} درست نہیں ہے
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,سیلز آرڈر {0} درست نہیں ہے
 apps/erpnext/erpnext/setup/doctype/company/company.py +185,"Sorry, companies cannot be merged",معذرت، کمپنیوں ضم نہیں کیا جا سکتا
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Small,چھوٹے
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,Small,چھوٹے
 DocType: Employee,Employee Number,ملازم نمبر
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},کیس نہیں (ے) پہلے سے استعمال میں. کیس نہیں سے کوشش {0}
 ,Invoiced Amount (Exculsive Tax),انوائس کی رقم (Exculsive ٹیکس)
-DocType: Student Applicant,Mother's / Guardian 1 Email ID,ماں کا / سرپرست 1 ای میل ID
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,آئٹم 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,اکاؤنٹ سر {0} پیدا
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +160,Green,گرین
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,گرین
 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 +57,Contract,معاہدہ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,معاہدہ
 DocType: Email Digest,Add Quote,اقتباس میں شامل
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +498,UOM coversion factor required for UOM: {0} in Item: {1},UOM لئے ضروری UOM coversion عنصر: {0} آئٹم میں: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +503,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 +80,Row {0}: Qty is mandatory,صف {0}: مقدار لازمی ہے
+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 +737,Sync Master Data,مطابقت پذیری ماسٹر ڈیٹا
+apps/erpnext/erpnext/accounts/page/pos/pos.js +719,Sync Master Data,مطابقت پذیری ماسٹر ڈیٹا
 apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,اپنی مصنوعات یا خدمات
 DocType: Mode of Payment,Mode of Payment,ادائیگی کا طریقہ
 apps/erpnext/erpnext/stock/doctype/item/item.py +178,Website Image should be a public file or website URL,ویب سائٹ تصویری ایک عوامی فائل یا ویب سائٹ یو آر ایل ہونا چاہئے
+DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,یہ ایک جڑ شے گروپ ہے اور میں ترمیم نہیں کیا جا سکتا.
+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 +345,"{0}: Employee email not found, hence email not sent",{0}: ملازم کے ای میل نہیں ملا، اس وجہ سے نہیں بھیجے گئے ای میل
+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,آپ کی کمپنی ایڈریس ہے
 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 +118,"For {0}, only credit accounts can be linked against another debit entry",{0}، صرف کریڈٹ اکاؤنٹس ایک ڈیبٹ داخلے کے خلاف منسلک کیا جا سکتا ہے
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Delivery Note {0} is not submitted,ترسیل کے نوٹ {0} پیش نہیں ہے
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Delivery Note {0} is not submitted,ترسیل کے نوٹ {0} پیش نہیں ہے
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Sub-contracted Item,آئٹم {0} ایک ذیلی کنٹریکٹڈ آئٹم ہونا ضروری ہے
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,کیپٹل سازوسامان
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",قیمتوں کا تعین اصول سب سے پہلے کی بنیاد پر منتخب کیا جاتا ہے آئٹم آئٹم گروپ یا برانڈ ہو سکتا ہے، میدان &#39;پر لگائیں&#39;.
 DocType: Hub Settings,Seller Website,فروش ویب سائٹ
 DocType: Item,ITEM-,ITEM-
-apps/erpnext/erpnext/controllers/selling_controller.py +147,Total allocated percentage for sales team should be 100,فروخت کی ٹیم کے لئے مختص کل فی صد 100 ہونا چاہئے
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +110,Production Order status is {0},پروڈکشن آرڈر حیثیت ہے {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,فروخت کی ٹیم کے لئے مختص کل فی صد 100 ہونا چاہئے
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},پروڈکشن آرڈر حیثیت ہے {0}
 DocType: Appraisal Goal,Goal,گول
 DocType: Sales Invoice Item,Edit Description,ترمیم تفصیل
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +757,For Supplier,سپلائر کے لئے
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +723,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,پرنٹ کی شکل بنائیں
@@ -1171,10 +1186,11 @@
 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,گریڈ کوڈ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ڈائجسٹ ای میل کریں:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +445,BOM {0} does not belong to Item {1},BOM {0} آئٹم سے تعلق نہیں ہے {1}
 DocType: Sales Partner,Target Distribution,ہدف تقسیم
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1667,Deafault warehouse is required for selected item,Deafault گودام منتخب شے کے لئے ضروری ہے
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Deafault warehouse is required for selected item,Deafault گودام منتخب شے کے لئے ضروری ہے
 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 پڑھنا
@@ -1183,23 +1199,23 @@
 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 +110,Hardware,ہارڈ ویئر
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,ہارڈ ویئر
 DocType: Sales Order,Recurring Upto,مکرر تک
 DocType: Attendance,HR Manager,HR مینیجر
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,ایک کمپنی کا انتخاب کریں
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Privilege Leave,استحقاق رخصت
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,استحقاق رخصت
 DocType: Purchase Invoice,Supplier Invoice Date,سپلائر انوائس تاریخ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,آپ کی خریداری کی ٹوکری کو چالو کرنے کی ضرورت ہے
 DocType: Payment Entry,Writeoff,لکھ دینا
 DocType: Appraisal Template Goal,Appraisal Template Goal,تشخیص سانچہ گول
-DocType: Salary Slip,Earning,کمانے
+DocType: Salary Component,Earning,کمانے
 DocType: Purchase Invoice,Party Account Currency,پارٹی کے اکاؤنٹ کی کرنسی
 ,BOM Browser,BOM براؤزر
 DocType: Purchase Taxes and Charges,Add or Deduct,شامل کریں منہا
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,کے درمیان پایا اتیویاپی حالات:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +171,Against Journal Entry {0} is already adjusted against some other voucher,جرنل کے خلاف اندراج {0} پہلے سے ہی کچھ دیگر واؤچر کے خلاف ایڈجسٹ کیا جاتا ہے
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,جرنل کے خلاف اندراج {0} پہلے سے ہی کچھ دیگر واؤچر کے خلاف ایڈجسٹ کیا جاتا ہے
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,کل آرڈر ویلیو
-apps/erpnext/erpnext/demo/setup_data.py +358,Food,خوراک
+apps/erpnext/erpnext/demo/setup/setup_data.py +301,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/course_schedule/course_schedule.js +103,Mark Attendence,مارک Attendence
@@ -1233,12 +1249,12 @@
 DocType: Sales Order Item,Planned Quantity,منصوبہ بندی کی مقدار
 DocType: Purchase Invoice Item,Item Tax Amount,آئٹم ٹیکس کی رقم
 DocType: Item,Maintain Stock,اسٹاک کو برقرار رکھنے کے
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +209,Stock Entries already created for Production Order ,پہلے سے پروڈکشن آرڈر کے لئے پیدا اسٹاک میں لکھے
+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,فکسڈ اثاثہ میں خالص تبدیلی
 DocType: Leave Control Panel,Leave blank if considered for all designations,تمام مراتب کے لئے غور کیا تو خالی چھوڑ دیں
-apps/erpnext/erpnext/controllers/accounts_controller.py +620,Charge of type 'Actual' in row {0} cannot be included in Item Rate,قسم &#39;اصل&#39; قطار میں کے انچارج {0} شے کی درجہ بندی میں شامل نہیں کیا جا سکتا
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,Max: {0},زیادہ سے زیادہ: {0}
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +15,From Datetime,تریخ ویلہ سے
+apps/erpnext/erpnext/controllers/accounts_controller.py +623,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 +239,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 +153,"Request for Quotation is disabled to access from portal, for more check portal settings.",کوٹیشن کے لئے درخواست میں مزید چیک کے پورٹل کی ترتیبات کے لئے، پورٹل سے رسائی کے لئے غیر فعال ہے.
@@ -1246,8 +1262,8 @@
 DocType: Sales Invoice,Shipping Address Name,شپنگ ایڈریس کا نام
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,اکاؤنٹس کا چارٹ
 DocType: Material Request,Terms and Conditions Content,شرائط و ضوابط مواد
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +552,cannot be greater than 100,زیادہ سے زیادہ 100 سے زائد نہیں ہو سکتا
-apps/erpnext/erpnext/stock/doctype/item/item.py +680,Item {0} is not a stock Item,{0} آئٹم اسٹاک شے نہیں ہے
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +546,cannot be greater than 100,زیادہ سے زیادہ 100 سے زائد نہیں ہو سکتا
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is not a stock Item,{0} آئٹم اسٹاک شے نہیں ہے
 DocType: Maintenance Visit,Unscheduled,شیڈول کا اعلان
 DocType: Employee,Owned,ملکیت
 DocType: Salary Detail,Depends on Leave Without Pay,بغیر تنخواہ چھٹی پر منحصر ہے
@@ -1261,10 +1277,9 @@
 DocType: GL Entry,GL Entry,GL انٹری
 DocType: HR Settings,Employee Settings,ملازم کی ترتیبات
 ,Batch-Wise Balance History,بیچ حکمت بیلنس تاریخ
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,فہرست کرنے کے لئے
 apps/erpnext/erpnext/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 +61,Apprentice,شکشو
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +102,Negative Quantity is not allowed,منفی مقدار کی اجازت نہیں ہے
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,شکشو
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +103,Negative Quantity is not allowed,منفی مقدار کی اجازت نہیں ہے
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",ایک تار کے طور پر اشیاء کے مالک سے دلوایا اور اس میدان میں ذخیرہ ٹیکس تفصیل میز. ٹیکسز اور چارجز کے لئے استعمال کیا جاتا ہے
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +152,Employee cannot report to himself.,ملازم خود کو رپورٹ نہیں دے سکتے.
@@ -1285,15 +1300,14 @@
 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 +141,Source warehouse is mandatory for row {0},ماخذ گودام صف کے لئے لازمی ہے {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +719,Packing Slip,پیکنگ پرچی
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Source warehouse is mandatory for row {0},ماخذ گودام صف کے لئے لازمی ہے {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +713,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/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,کوٹیشن کے لئے درخواست مندرجہ ذیل لنک پر کلک کرکے رسائی ہو سکتی ہے
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,درآمد میں ناکام!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,کوئی ایڈریس کی ابھی تک شامل.
 DocType: Workstation Working Hour,Workstation Working Hour,کارگاہ قیامت کام کرنا
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Analyst,تجزیہ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,تجزیہ
 DocType: Item,Inventory,انوینٹری
 DocType: Item,Sales Details,سیلز کی تفصیلات
 DocType: Quality Inspection,QI-,QI-
@@ -1301,7 +1315,7 @@
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,مقدار میں
 DocType: Notification Control,Expense Claim Rejected,اخراجات دعوے کی تردید کی
 DocType: Item Attribute,Item Attribute,آئٹم خاصیت
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +103,Government,حکومت
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,حکومت
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,انسٹی ٹیوٹ نام
 apps/erpnext/erpnext/config/stock.py +289,Item Variants,آئٹم متغیرات
 DocType: Company,Services,خدمات
@@ -1316,6 +1330,7 @@
 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/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,سرمایہ کاری سے کیش فلو
 DocType: Program Course,Program Course,پروگرام کے کورس
@@ -1356,12 +1371,12 @@
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,وصول فہرست خالی ہے. وصول فہرست تشکیل دے براہ مہربانی
 DocType: Production Plan Sales Order,Production Plan Sales Order,پیداوار کی منصوبہ بندی سیلز آرڈر
 DocType: Sales Partner,Sales Partner Target,سیلز پارٹنر ہدف
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +110,Accounting Entry for {0} can only be made in currency: {1},{0} کے لئے اکاؤنٹنگ انٹری صرف کرنسی میں بنایا جا سکتا ہے: {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},{0} کے لئے اکاؤنٹنگ انٹری صرف کرنسی میں بنایا جا سکتا ہے: {1}
 DocType: Pricing Rule,Pricing Rule,قیمتوں کا تعین اصول
 DocType: Budget,Action if Annual Budget Exceeded,ایکشن سالانہ بجٹ سے تجاوز تو
 apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,آرڈر خریداری کے لئے مواد کی درخواست
 DocType: Shopping Cart Settings,Payment Success URL,ادائیگی کی کامیابی کے یو آر ایل
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +78,Row # {0}: Returned Item {1} does not exists in {2} {3},صف # {0}: واپس آ شے {1} نہیں میں موجود ہے {2} {3}
+apps/erpnext/erpnext/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,بینک مصالحتی بیان
@@ -1370,39 +1385,38 @@
 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/stock/doctype/stock_entry/stock_entry.py +339,Not allowed to tranfer more {0} than {1} against Purchase Order {2},زیادہ tranfer کرنے کی اجازت نہیں {0} سے {1} خریداری کے آرڈر کے خلاف {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +344,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 +545,Manufacturing Quantity is mandatory,مینوفیکچرنگ مقدار لازمی ہے
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,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 +162,Row {0}: From Time and To Time of {1} is overlapping with {2},صف {0}: وقت اور کرنے کے وقت سے {1} ساتھ اتیویاپی ہے {2}
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +186,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,اسٹاک واجبات
 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 +130,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 +137,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,دیگر رپورٹوں
 DocType: Dependent Task,Dependent Task,منحصر ٹاسک
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,براہ مہربانی سیٹ اپ ملازم انسانی وسائل میں سسٹم کا نام دینے&gt; HR ترتیبات
 apps/erpnext/erpnext/stock/doctype/item/item.py +411,Conversion factor for default Unit of Measure must be 1 in row {0},پیمائش کی یونٹ کے لئے پہلے سے طے شدہ تبادلوں عنصر قطار میں ہونا چاہیے 1 {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,Leave of type {0} cannot be longer than {1},قسم کے حکم {0} سے زیادہ نہیں ہو سکتا {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +197,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 +921,Search Item,تلاش آئٹم
+apps/erpnext/erpnext/accounts/page/pos/pos.js +910,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 +546,Already completed,پہلے ہی مکمل
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +22,Payment Request already exists {0},ادائیگی کی درخواست پہلے سے موجود ہے {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +550,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 +241,Quantity must not be more than {0},مقدار سے زیادہ نہیں ہونا چاہئے {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Quantity must not be more than {0},مقدار سے زیادہ نہیں ہونا چاہئے {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +76,Previous Financial Year is not closed,گزشتہ مالی سال بند نہیں ہے
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +44,Age (Days),عمر (دن)
 DocType: Quotation Item,Quotation Item,کوٹیشن آئٹم
@@ -1419,7 +1433,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +221,Purchase Receipt {0} is not submitted,خریداری کی رسید {0} پیش نہیں ہے
 DocType: Company,Default Payable Account,پہلے سے طے شدہ قابل ادائیگی اکاؤنٹ
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.",اس طرح کے شپنگ کے قوانین، قیمت کی فہرست وغیرہ کے طور پر آن لائن خریداری کی ٹوکری کے لئے ترتیبات
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +83,{0}% Billed,{0}٪ بل
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}٪ بل
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,محفوظ مقدار
 DocType: Party Account,Party Account,پارٹی کے اکاؤنٹ
 apps/erpnext/erpnext/config/setup.py +116,Human Resources,انسانی وسائل
@@ -1431,10 +1445,9 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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 +22,Collect,جمع کریں
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,جمع کریں
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,Against Supplier Invoice {0} dated {1},پردایک خلاف انوائس {0} ء {1}
 DocType: Customer,Default Price List,پہلے سے طے شدہ قیمت کی فہرست
-DocType: Payment Reconciliation,Payments,ادائیگی
 DocType: Journal Entry,Entry Type,اندراج کی قسم
 ,Customer Credit Balance,کسٹمر کے کریڈٹ بیلنس
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Payable,قابل ادائیگی اکاؤنٹس میں خالص تبدیلی
@@ -1446,7 +1459,7 @@
 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 +9,Procurement,حصولی کے
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,اشیاء میں سے کوئی بھی مقدار یا قدر میں کوئی تبدیلی ہے.
+apps/erpnext/erpnext/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,وارنٹی دعوی
 ,Lead Details,لیڈ تفصیلات
 DocType: Purchase Invoice,End date of current invoice's period,موجودہ انوائس کی مدت کے ختم ہونے کی تاریخ
@@ -1471,7 +1484,7 @@
 DocType: Purchase Invoice,Additional Discount,اضافی رعایت
 DocType: Selling Settings,Selling Settings,ترتیبات فروخت
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,آن لائن نیلامیوں
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +97,Please specify either Quantity or Valuation Rate or both,مقدار یا تشخیص کی شرح یا دونوں یا تو وضاحت کریں
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,مقدار یا تشخیص کی شرح یا دونوں یا تو وضاحت کریں
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +13,Fulfillment,تکمیل
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory",کمپنی، مہینہ اور مالی سال لازمی ہے
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,مارکیٹنگ کے اخراجات
@@ -1492,14 +1505,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,ERPNext سیٹ اپ مکمل!
 DocType: Item,Weightage,اہمیت
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +93,A Customer Group exists with same name please change the Customer name or rename the Customer Group,ایک گاہک گروپ ایک ہی نام کے ساتھ موجود ہے کسٹمر کا نام تبدیل کرنے یا گاہک گروپ کا نام تبدیل کریں
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +126,A Customer Group exists with same name please change the Customer name or rename the Customer Group,ایک گاہک گروپ ایک ہی نام کے ساتھ موجود ہے کسٹمر کا نام تبدیل کرنے یا گاہک گروپ کا نام تبدیل کریں
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,نیا رابطہ
 DocType: Territory,Parent Territory,والدین علاقہ
 DocType: Quality Inspection Reading,Reading 2,2 پڑھنا
 DocType: Stock Entry,Material Receipt,مواد رسید
 DocType: Homepage,Products,مصنوعات
 DocType: Announcement,Instructor,انسٹرکٹر
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},پارٹی قسم اور پارٹی وصولی / قابل ادائیگی اکاؤنٹ کے لئے ضروری ہے {0}
 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,کی طرف سے اگلے رابطہ
@@ -1510,7 +1522,7 @@
 ,Item-wise Sales Register,آئٹم وار سیلز رجسٹر
 DocType: Asset,Gross Purchase Amount,مجموعی خریداری کی رقم
 DocType: Asset,Depreciation Method,ہراس کا طریقہ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Offline,آف لائن
+apps/erpnext/erpnext/accounts/page/pos/pos.js +686,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,مطلوب
@@ -1528,25 +1540,27 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +425,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 +858,Make Purchase Order,خریداری کے آرڈر بنائیں
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +852,Make Purchase Order,خریداری کے آرڈر بنائیں
 DocType: SMS Center,Send To,کے لئے بھیج
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,There is not enough leave balance for Leave Type {0},رخصت قسم کافی چھوڑ توازن نہیں ہے {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,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 +172,Work-in-Progress Warehouse is required before Submit,کام میں پیش رفت گودام جمع کرانے سے پہلے کی ضرورت ہے
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,Work-in-Progress Warehouse is required before Submit,کام میں پیش رفت گودام جمع کرانے سے پہلے کی ضرورت ہے
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,ایک کام کے لئے درخواست.
 DocType: Purchase Order Item,Warehouse and Reference,گودام اور حوالہ
 DocType: Supplier,Statutory info and other general information about your Supplier,اپنے سپلائر کے بارے میں قانونی معلومات اور دیگر عمومی معلومات
-apps/erpnext/erpnext/hooks.py +88,Addresses,پتے
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,پردایک&gt; پردایک قسم
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +212,Against Journal Entry {0} does not have any unmatched {1} entry,جرنل کے خلاف اندراج {0} کسی بھی بے مثال {1} اندراج نہیں ہے
+apps/erpnext/erpnext/hooks.py +95,Addresses,پتے
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +215,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,شے یا گودام کی بنیاد پر فلٹر مقرر کریں
 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,نجات اور بل میں
@@ -1554,11 +1568,10 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} must be submitted,BOM {0} پیش کرنا ضروری ہے
 DocType: Authorization Control,Authorization Control,اجازت کنٹرول
 apps/erpnext/erpnext/controllers/buying_controller.py +300,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},صف # {0}: گودام مسترد مسترد آئٹم خلاف لازمی ہے {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +731,Payment,ادائیگی
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,Payment,ادائیگی
 DocType: Production Order Operation,Actual Time and Cost,اصل وقت اور لاگت
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},زیادہ سے زیادہ {0} کے مواد کی درخواست {1} سیلز آرڈر کے خلاف شے کے لئے بنایا جا سکتا ہے {2}
 DocType: Employee,Salutation,آداب
-DocType: Pricing Rule,Brand,برانڈ
 DocType: Course,Course Abbreviation,کورس مخفف
 DocType: Item,Will also apply for variants,بھی مختلف حالتوں کے لئے لاگو ہوں گے
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,فروخت کے وقت بنڈل اشیاء.
@@ -1568,7 +1581,7 @@
 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.",آپ کو خریدنے یا فروخت ہے کہ اپنی مصنوعات یا خدمات کی فہرست. آپ کو شروع کرنے جب پیمائش اور دیگر خصوصیات کے آئٹم گروپ، یونٹ چیک کرنے کے لیے بات کو یقینی بنائیں.
 DocType: Hub Settings,Hub Node,حب گھنڈی
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,آپ کو ڈپلیکیٹ اشیاء میں داخل ہے. کو بہتر بنانے اور دوبارہ کوشش کریں.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Associate,ایسوسی ایٹ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,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,وصول فہرست بنائیں
@@ -1576,7 +1589,7 @@
 DocType: Production Planning Tool,Material Requests,مواد درخواستیں
 DocType: Warranty Claim,Issue Date,تاریخ اجراء
 DocType: Activity Cost,Activity Cost,سرگرمی لاگت
-DocType: Timesheet Detail,Timesheet Detail,Timesheet تفصیل
+DocType: Sales Invoice Timesheet,Timesheet Detail,Timesheet تفصیل
 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),پیکیج اس کی ترسیل (صرف ڈرافٹ) کا ایک حصہ ہے کہ اشارہ کرتا ہے
@@ -1598,6 +1611,7 @@
 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,مختلف حالتوں ہے
 DocType: Monthly Distribution,Name of the Monthly Distribution,ماہانہ تقسیم کے نام
 DocType: Sales Person,Parent Sales Person,والدین فروخت شخص
@@ -1610,24 +1624,25 @@
 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 +44,"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/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.,آپ کی فروخت انوائس کو بچانے بار الفاظ میں نظر آئے گا.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +502,Error: {0} &gt; {1},خرابی: {0}&gt; {1}
 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.,ٹرم شروع کرنے کی تاریخ جس کی اصطلاح منسلک ہے کے تعلیمی سال سال شروع تاریخ سے پہلے نہیں ہو سکتا (تعلیمی سال {}). تاریخوں درست کریں اور دوبارہ کوشش کریں براہ مہربانی.
 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 +458,Item table can not be blank,آئٹم میز خالی نہیں ہو سکتا
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +443,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,فروخت
@@ -1645,8 +1660,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +144,Cannot refer row number greater than or equal to current row number for this Charge type,اس چارج کی قسم کے لئے موجودہ صفیں سے زیادہ یا برابر صفیں رجوع نہیں کر سکتے ہیں
 DocType: Asset,Sold,فروخت
 ,Item-wise Purchase History,آئٹم وار خریداری کی تاریخ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Red,ریڈ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},سیریل کوئی آئٹم کے لئے شامل کی بازیافت کرنے کے لئے &#39;پیدا شیڈول&#39; پر کلک کریں براہ مہربانی {0}
+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,کھولیں پیداوار کے احکامات
 DocType: Sales Invoice Payment,Base Amount (Company Currency),بنیادی مقدار (کمپنی کرنسی)
@@ -1654,7 +1669,7 @@
 DocType: Installation Note,Installation Time,کی تنصیب کا وقت
 DocType: Sales Invoice,Accounting Details,اکاؤنٹنگ تفصیلات
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,اس کمپنی کے لئے تمام معاملات حذف
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +187,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,صف # {0}: آپریشن {1} کی پیداوار میں تیار مال کی {2} مقدار کے لئے مکمل نہیں ہے آرڈر # {3}. وقت کیلیے نوشتہ جات دیکھیے ذریعے آپریشن کی حیثیت کو اپ ڈیٹ کریں
+apps/erpnext/erpnext/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}. وقت کیلیے نوشتہ جات دیکھیے ذریعے آپریشن کی حیثیت کو اپ ڈیٹ کریں
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,سرمایہ کاری
 DocType: Issue,Resolution Details,قرارداد کی تفصیلات
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,تین ہلاک
@@ -1695,20 +1710,20 @@
 DocType: Employee,Personal Details,ذاتی تفصیلات
 ,Maintenance Schedules,بحالی شیڈول
 DocType: Task,Actual End Date (via Time Sheet),اصل تاریخ اختتام (وقت شیٹ کے ذریعے)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Amount {0} {1} against {2} {3},رقم {0} {1} خلاف {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +339,Amount {0} {1} against {2} {3},رقم {0} {1} خلاف {2} {3}
 ,Quotation Trends,کوٹیشن رجحانات
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},آئٹم گروپ شے کے لئے شے ماسٹر میں ذکر نہیں {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +295,Debit To account must be a Receivable account,اکاؤنٹ ڈیبٹ ایک وصولی اکاؤنٹ ہونا ضروری ہے
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Receivable account,اکاؤنٹ ڈیبٹ ایک وصولی اکاؤنٹ ہونا ضروری ہے
 DocType: Shipping Rule Condition,Shipping Amount,شپنگ رقم
 ,Pending Amount,زیر التواء رقم
 DocType: Purchase Invoice Item,Conversion Factor,تبادلوں فیکٹر
 DocType: Purchase Order,Delivered,ہونے والا
 DocType: Purchase Receipt,Vehicle Number,گاڑی نمبر
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,بار بار چلنے والی انوائس بند کیا جائے گا جس کی تاریخ
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +90,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,کل مختص پتے {0} کم نہیں ہو سکتا مدت کے لئے پہلے سے ہی منظور پتے {1} سے
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +93,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 +22,Enter Paid Amount,ادا کی گئی رقم درج کریں
+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 استعمال
@@ -1718,13 +1733,15 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,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 +524,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",صف # {0}: قی، 1 ہونا ضروری شے ایک مقررہ اثاثہ ہے کے طور پر. ایک سے زیادہ مقدار کے لئے علیحدہ صف استعمال کریں.
+apps/erpnext/erpnext/controllers/accounts_controller.py +527,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",صف # {0}: قی، 1 ہونا ضروری شے ایک مقررہ اثاثہ ہے کے طور پر. ایک سے زیادہ مقدار کے لئے علیحدہ صف استعمال کریں.
 DocType: Leave Block List Allow,Leave Block List Allow,بلاک فہرست اجازت دیں چھوڑ دو
 apps/erpnext/erpnext/setup/doctype/company/company.py +249,Abbr can not be blank or space,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/stock/get_item_details.py +123,Please specify Company,کمپنی کی وضاحت کریں
 ,Customer Acquisition and Loyalty,گاہک حصول اور وفاداری
@@ -1735,17 +1752,19 @@
 apps/erpnext/erpnext/projects/doctype/task/task.js +26,Expense Claims,اخراجات کے دعووں
 DocType: Issue,Support,سپورٹ
 ,BOM Search,Bom تلاش
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Closing (Opening + Totals),بند (کل کھولنے)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),بند (کل کھولنے)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,کمپنی میں کرنسی کی وضاحت کریں
 DocType: Workstation,Wages per hour,فی گھنٹہ اجرت
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +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/controllers/accounts_controller.py +272,Account {0} is invalid. Account Currency must be {1},اکاؤنٹ {0} باطل ہے. اکاؤنٹ کی کرنسی ہونا ضروری ہے {1}
+DocType: Email Digest,Pending Sales Orders,سیلز احکامات زیر التواء
+apps/erpnext/erpnext/controllers/accounts_controller.py +275,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 +956,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",صف # {0}: حوالہ دستاویز کی قسم سیلز آرڈر میں سے ایک، فروخت انوائس یا جرنل اندراج ہونا ضروری ہے
-DocType: Salary Slip,Deduction,کٹوتی
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +87,Row {0}: From Time and To Time is mandatory.,صف {0}: وقت سے اور وقت کے لئے لازمی ہے.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +969,"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 +111,Row {0}: From Time and To Time is mandatory.,صف {0}: وقت سے اور وقت کے لئے لازمی ہے.
+DocType: Stock Reconciliation Item,Amount Difference,رقم فرق
 apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},شے کی قیمت کے لئے شامل {0} قیمت کی فہرست میں {1}
 DocType: Address Template,Address Template,ایڈریس سانچہ
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +7,Please enter Employee Id of this sales person,اس کی فروخت کے شخص کے ملازم کی شناخت درج کریں
@@ -1753,7 +1772,7 @@
 DocType: Project,% Tasks Completed,٪ کاموں کو مکمل کیا
 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 +194,Please enter Production Item first,پہلی پیداوار آئٹم کوڈ داخل کریں
+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,معذور صارف
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,کوٹیشن
@@ -1762,53 +1781,54 @@
 DocType: Maintenance Visit,Maintenance User,بحالی صارف
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +149,Cost Updated,لاگت اپ ڈیٹ
 DocType: Employee,Date of Birth,پیدائش کی تاریخ
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +86,Item {0} has already been returned,آئٹم {0} پہلے ہی واپس کر دیا گیا ہے
+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: 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 +177,Job Description,کام کی تفصیل
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,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 +126,"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 +127,"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.",سیلز مہمات کا ٹریک رکھنے. لیڈز، کوٹیشن کا ٹریک رکھنے، سیلز آرڈر وغیرہ مہمات میں سے سرمایہ کاری پر واپسی کا اندازہ لگانے کے.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +24,Welcome to POS: Create your POS Profile,POS میں خوش آمدید: آپ POS پروفائل تخلیق
 DocType: Expense Claim,Approver,گواہ
 ,SO Qty,تو مقدار
+DocType: Guardian,Work Address,دفتر کا پتہ
 DocType: Appraisal,Calculate Total Score,کل اسکور کا حساب لگائیں
 DocType: Request for Quotation,Manufacturing Manager,مینوفیکچرنگ کے مینیجر
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},سیریل نمبر {0} تک وارنٹی کے تحت ہے {1}
+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 +74,Shipments,ترسیل
+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 +153,Row # ,صف #
+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 +156,Get From,سے حاصل
+apps/erpnext/erpnext/public/js/utils.js +167,Get From,سے حاصل
 DocType: C-Form,Quarter,کوارٹر
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Miscellaneous Expenses,متفرق اخراجات
 DocType: Global Defaults,Default Company,پہلے سے طے شدہ کمپنی
 apps/erpnext/erpnext/controllers/stock_controller.py +167,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,اخراجات یا فرق اکاؤنٹ آئٹم {0} کے طور پر اس کے اثرات مجموعی اسٹاک قیمت کے لئے لازمی ہے
-apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings",قطار میں آئٹم {0} کے لئے overbill نہیں کر سکتے ہیں {1} سے زیادہ {2}. overbilling، اسٹاک کی ترتیبات میں مقرر کریں اجازت دینے کے لئے
+apps/erpnext/erpnext/controllers/accounts_controller.py +419,"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,اوپر
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} is disabled,صارف {0} غیر فعال ہے
 DocType: Leave Application,Total Leave Days,کل رخصت دنوں
 DocType: Email Digest,Note: Email will not be sent to disabled users,نوٹ: ای میل معذور صارفین کو نہیں بھیجی جائے گی
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,کمپنی کو منتخب کریں ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,تمام محکموں کے لئے تصور کیا جاتا ہے تو خالی چھوڑ دیں
 apps/erpnext/erpnext/config/hr.py +171,"Types of employment (permanent, contract, intern etc.).",ملازمت کی اقسام (مستقل، کنٹریکٹ، انٹرن وغیرہ).
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +346,{0} is mandatory for Item {1},{0} شے کے لئے لازمی ہے {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,{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",کم سے کم ایک قطار میں مختص رقم، انوائس کی قسم اور انوائس تعداد کو منتخب کریں
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,نئی خریداری کی لاگت
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},آئٹم کے لئے ضروری سیلز آرڈر {0}
 DocType: Purchase Invoice Item,Rate (Company Currency),شرح (کمپنی کرنسی)
-apps/erpnext/erpnext/demo/setup_data.py +360,Others,دیگر
+DocType: Student Guardian,Others,دیگر
 DocType: Payment Entry,Unallocated Amount,Unallocated رقم
 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,ٹیکسز اور چارجز
@@ -1827,16 +1847,15 @@
 apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,serialized کی انوینٹری
 DocType: Activity Type,Default Billing Rate,پہلے سے طے شدہ بلنگ کی شرح
 DocType: Sales Invoice,Total Billing Amount,کل بلنگ رقم
-apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +54,Receivable Account,وصولی اکاؤنٹ
+apps/erpnext/erpnext/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 +79,CEO,سی ای او
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,سی ای او
 DocType: Expense Claim Detail,Expense Claim Detail,اخراجات دعوی تفصیل
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +808,Please select correct account,درست اکاؤنٹ منتخب کریں
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +809,Please select correct account,درست اکاؤنٹ منتخب کریں
 DocType: Item,Weight UOM,وزن UOM
 DocType: Salary Structure Employee,Salary Structure Employee,تنخواہ ساخت ملازم
 DocType: Employee,Blood Group,خون کا گروپ
-DocType: Purchase Invoice Item,Page Break,صفحہ توڑ
 DocType: Production Order Operation,Pending,زیر غور
 DocType: Course,Course Name,کورس کا نام
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,ایک مخصوص ملازم کی چھٹی ایپلی کیشنز منظور کر سکتے ہیں جو صارفین
@@ -1845,14 +1864,15 @@
 DocType: Fiscal Year,Companies,کمپنی
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,الیکٹرانکس
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,اسٹاک دوبارہ آرڈر کی سطح تک پہنچ جاتا ہے مواد کی درخواست میں اضافہ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Full-time,پورا وقت
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,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: 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,کل موصولہ ویلیو
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Debit To is required,ڈیبٹ کرنے کی ضرورت ہے
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +321,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,کوالٹی منیجر
@@ -1876,11 +1896,10 @@
 DocType: Item,Customer Item Codes,کسٹمر شے کوڈز
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,ایکسچینج گین / نقصان
 DocType: Opportunity,Lost Reason,کھو وجہ
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,سیٹ اپ&gt; سیٹ اپ کے ذریعے حاضری کے لئے سیریز کی تعداد مہربانی نمبر سیریز
 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/purchase_receipt/purchase_receipt.py +378,All items have already been invoiced,تمام اشیاء پہلے ہی انوائس کیا گیا ہے
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +379,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,بیرونی
@@ -1895,18 +1914,19 @@
 DocType: Student Batch,Student Batch,Student کی بیچ
 apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,آپ کے گاہکوں کو
 DocType: Leave Block List Date,Block Date,بلاک تاریخ
-apps/erpnext/erpnext/templates/generators/job_opening.html +19,Apply Now,اب لگائیں
+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.",بنائیں اور، یومیہ، ہفتہ وار اور ماہانہ ای میل ڈائجسٹ کا انتظام.
 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,عمارات
-apps/erpnext/erpnext/utilities/doctype/address/address.py +164,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,کوئی طے شدہ ایڈریس سانچے پایا. سیٹ اپ&gt; طباعت اور برانڈنگ&gt; ایڈریس سانچے سے نئی تشکیل مہربانی.
 DocType: Fee Structure,Fee Structure,فیس ڈھانچہ
 DocType: Timesheet Detail,Costing Amount,لاگت رقم
+DocType: Student Admission,Application Fee,درخواست کی فیس
 DocType: Process Payroll,Submit Salary Slip,تنخواہ پرچی جمع کرائیں
-apps/erpnext/erpnext/controllers/selling_controller.py +161,Maxiumm discount for Item {0} is {1}%,آئٹم {0} ہے {1} فیصد Maxiumm ڈسکاؤنٹ
+apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,آئٹم {0} ہے {1} فیصد Maxiumm ڈسکاؤنٹ
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,بلک میں درآمد
 DocType: Sales Partner,Address & Contacts,ایڈریس اور رابطے
 DocType: SMS Log,Sender Name,مرسل کے نام
@@ -1931,20 +1951,20 @@
 DocType: Serial No,Delivery Time,ڈیلیوری کا وقت
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,کی بنیاد پر خستہ
 DocType: Item,End of Life,زندگی کے اختتام
-apps/erpnext/erpnext/demo/setup_data.py +361,Travel,سفر
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +155,No active or default Salary Structure found for employee {0} for the given dates,ملازم {0} کے لئے مل دی گئی تاریخوں کے لئے کوئی فعال یا ڈیفالٹ تنخواہ کی ساخت
+apps/erpnext/erpnext/demo/setup/setup_data.py +304,Travel,سفر
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +167,No active or default Salary Structure found for employee {0} for the given dates,ملازم {0} کے لئے مل دی گئی تاریخوں کے لئے کوئی فعال یا ڈیفالٹ تنخواہ کی ساخت
 DocType: Leave Block List,Allow Users,صارفین کو اجازت دے
 DocType: Purchase Order,Customer Mobile No,کسٹمر موبائل نہیں
 DocType: Sales Invoice,Recurring,مکرر
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,علیحدہ آمدنی ٹریک اور مصنوعات کاریکشیتر یا تقسیم کے لئے اخراجات.
 DocType: Rename Tool,Rename Tool,آلہ کا نام تبدیل کریں
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +23,Update Cost,اپ ڈیٹ لاگت
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,اپ ڈیٹ لاگت
 DocType: Item Reorder,Item Reorder,آئٹم ترتیب
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +36,Show Salary Slip,دکھائیں تنخواہ کی پرچی
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +748,Transfer Material,منتقلی مواد
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +53,Show Salary Slip,دکھائیں تنخواہ کی پرچی
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,Transfer Material,منتقلی مواد
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",آپریشن، آپریٹنگ لاگت کی وضاحت کریں اور اپنے آپریشن کی کوئی ایک منفرد آپریشن دے.
-apps/erpnext/erpnext/public/js/controllers/transaction.js +923,Please set recurring after saving,کو بچانے کے بعد بار بار چلنے والی مقرر کریں
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +646,Select change amount account,تبدیلی منتخب رقم اکاؤنٹ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +914,Please set recurring after saving,کو بچانے کے بعد بار بار چلنے والی مقرر کریں
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +703,Select change amount account,تبدیلی منتخب رقم اکاؤنٹ
 DocType: Purchase Invoice,Price List Currency,قیمت کی فہرست کرنسی
 DocType: Naming Series,User must always select,صارف نے ہمیشہ منتخب کرنا ضروری ہے
 DocType: Stock Settings,Allow Negative Stock,منفی اسٹاک کی اجازت دیں
@@ -1956,29 +1976,30 @@
 DocType: Quality Inspection,Verified By,کی طرف سے تصدیق
 DocType: Address,Subsidiary,ماتحت
 apps/erpnext/erpnext/setup/doctype/company/company.py +64,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.",موجودہ لین دین موجود ہیں کیونکہ، کمپنی کی پہلے سے طے شدہ کرنسی تبدیل نہیں کر سکتے. معاملات پہلے سے طے شدہ کرنسی تبدیل کرنے منسوخ کر دیا جائے ضروری ہے.
+DocType: Grade Interval,Grade Description,گریڈ تفصیل
 DocType: Quality Inspection,Purchase Receipt No,خریداری کی رسید نہیں
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,بیانا رقم
 DocType: Process Payroll,Create Salary Slip,تنخواہ پرچی بنائیں
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +33,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 +352,Quantity in row {0} ({1}) must be same as manufactured quantity {2},قطار میں مقدار {0} ({1}) تیار مقدار کے طور پر ایک ہی ہونا چاہیے {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Quantity in row {0} ({1}) must be same as manufactured quantity {2},قطار میں مقدار {0} ({1}) تیار مقدار کے طور پر ایک ہی ہونا چاہیے {2}
 DocType: Appraisal,Employee,ملازم
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,صارف کے طور پر مدعو کریں
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} کو مکمل طور پر بل کیا جاتا ہے
 DocType: Workstation Working Hour,End Time,آخر وقت
 DocType: Payment Entry,Payment Deductions or Loss,ادائیگی کٹوتیوں یا گمشدگی
-apps/erpnext/erpnext/config/schools.py +100,LMS,LMS
+apps/erpnext/erpnext/config/schools.py +104,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,فروخت کی پائپ لائن
 DocType: Student Batch Student,Student Batch Student,Student کی بیچ طالب علم
-DocType: Sales Invoice,Mass Mailing,بڑے پیمانے پر میلنگ
+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 +199,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/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 +111,Pharmaceutical,دواسازی
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,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,کریڈٹ
@@ -1993,27 +2014,28 @@
 DocType: Upload Attendance,Attendance To Date,تاریخ کرنے کے لئے حاضری
 DocType: Warranty Claim,Raised By,طرف سے اٹھائے گئے
 DocType: Payment Gateway Account,Payment Account,ادائیگی اکاؤنٹ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +814,Please specify Company to proceed,آگے بڑھنے کے لئے کمپنی کی وضاحت کریں
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +793,Please specify Company to proceed,آگے بڑھنے کے لئے کمپنی کی وضاحت کریں
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Receivable,اکاؤنٹس وصولی میں خالص تبدیلی
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Compensatory Off,مائکر آف
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,مائکر آف
 DocType: Quality Inspection Reading,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.,تم واقعی میں اس کمپنی کے لئے تمام لین دین کو حذف کرنا چاہتے براہ کرم یقینی بنائیں. یہ ہے کے طور پر آپ ماسٹر ڈیٹا رہیں گے. اس کارروائی کو رد نہیں کیا جا سکتا.
 DocType: Room,Room Number,کمرہ نمبر
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},غلط حوالہ {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +161,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) منصوبہ بندی quanitity سے زیادہ نہیں ہو سکتا ({2}) پیداوار میں آرڈر {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +162,{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 +217,Raw Materials cannot be blank.,خام مال خالی نہیں ہو سکتا.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,"Could not update stock, invoice contains drop shipping item.",اسٹاک کو اپ ڈیٹ نہیں کیا جا سکا، انوائس ڈراپ شپنگ آئٹم پر مشتمل ہے.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +460,Quick Journal Entry,فوری جرنل اندراج
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +111,You can not change rate if BOM mentioned agianst any item,BOM کسی بھی شے agianst ذکر اگر آپ کی شرح کو تبدیل نہیں کر سکتے ہیں
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +441,"Could not update stock, invoice contains drop shipping item.",اسٹاک کو اپ ڈیٹ نہیں کیا جا سکا، انوائس ڈراپ شپنگ آئٹم پر مشتمل ہے.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Quick Journal Entry,فوری جرنل اندراج
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +103,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 +214,{0} {1} is not submitted,{0} {1} جمع نہیں ہے
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,اشیاء کے لئے درخواست.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,علیحدہ پروڈکشن آرڈر ہر ایک کو ختم اچھی شے کے لئے پیدا کیا جائے گا.
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +121,{0} must be negative in return document,{0} واپسی دستاویز میں منفی ہونا ضروری ہے
 ,Minutes to First Response for Issues,مسائل کے لئے پہلا رسپانس منٹ
 DocType: Purchase Invoice,Terms and Conditions1,شرائط و Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,انسٹی ٹیوٹ کے نام جس کے لئے آپ کو اس نظام قائم کر رہے ہیں.
@@ -2022,16 +2044,17 @@
 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 +398,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 +739,Item or Warehouse for row {0} does not match Material Request,صف {0} سے مماثل نہیں ہے مواد کی درخواست کے لئے شے یا گودام
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +747,Item or Warehouse for row {0} does not match Material Request,صف {0} سے مماثل نہیں ہے مواد کی درخواست کے لئے شے یا گودام
 apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,پیمائش کی اکائی
 DocType: Fiscal Year,Year End Date,سال کے آخر تاریخ
 DocType: Task Depends On,Task Depends On,کام پر انحصار کرتا ہے
-DocType: Lead,Opportunity,موقع
+DocType: Supplier Quotation,Opportunity,موقع
 ,Completed Production Orders,مکمل پیداوار کے احکامات
 DocType: Operation,Default Workstation,پہلے سے طے شدہ کارگاہ
 DocType: Notification Control,Expense Claim Approved Message,اخراجات کلیم منظور پیغام
@@ -2043,7 +2066,7 @@
 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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},بحالی کے آغاز کی تاریخ سیریل نمبر کے لئے ترسیل کی تاریخ سے پہلے نہیں ہو سکتا {0}
+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,اصل تاریخ اختتام
 DocType: Purchase Invoice,PINV-,PINV-
 DocType: Authorization Rule,Applicable To (Role),لاگو (کردار)
@@ -2058,7 +2081,7 @@
 DocType: SMS Log,No of Requested SMS,درخواست ایس ایم ایس کی کوئی
 DocType: Campaign,Campaign-.####,مہم -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,اگلے مراحل
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,Please supply the specified items at the best possible rates,بہترین ممکنہ شرح پر بیان کردہ اشیاء فراہم مہربانی
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +695,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 +117,Contract End Date must be greater than Date of Joining,معاہدہ اختتام تاریخ شمولیت کی تاریخ سے زیادہ ہونا چاہیے
 DocType: Delivery Note,DN-,DN-
@@ -2067,7 +2090,7 @@
 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 +14,This is an example website auto-generated from ERPNext,یہ ایک مثال ویب سائٹ ERPNext سے آٹو پیدا کیا جاتا ہے
+apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,یہ ایک مثال ویب سائٹ ERPNext سے آٹو پیدا کیا جاتا ہے
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,خستہ رینج 1
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
@@ -2093,13 +2116,14 @@
 DocType: Homepage,Homepage,مرکزی صفحہ
 DocType: Purchase Receipt Item,Recd Quantity,Recd مقدار
 DocType: Asset Category Account,Asset Category Account,ایسیٹ زمرہ اکاؤنٹ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +103,Cannot produce more Item {0} than Sales Order quantity {1},سیلز آرڈر کی مقدار سے زیادہ آئٹم {0} پیدا نہیں کر سکتے ہیں {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Stock Entry {0} is not submitted,اسٹاک انٹری {0} پیش نہیں ہے
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},سیلز آرڈر کی مقدار سے زیادہ آئٹم {0} پیدا نہیں کر سکتے ہیں {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +505,Stock Entry {0} is not submitted,اسٹاک انٹری {0} پیش نہیں ہے
 DocType: Payment Reconciliation,Bank / Cash Account,بینک / کیش اکاؤنٹ
 DocType: Tax Rule,Billing City,بلنگ شہر
 DocType: Salary Component Account,Salary Component Account,تنخواہ اجزاء اکاؤنٹ
 DocType: Global Defaults,Hide Currency Symbol,کرنسی کی علامت چھپائیں
 apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card",مثال کے طور پر بینک، کیش، کریڈٹ کارڈ
+DocType: Lead Source,Source Name,ماخذ نام
 DocType: Journal Entry,Credit Note,کریڈٹ نوٹ
 DocType: Warranty Claim,Service Address,سروس ایڈریس
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furnitures and Fixtures,فرنیچر اور فکسچر
@@ -2111,6 +2135,7 @@
 DocType: Opportunity,Customer / Lead Name,کسٹمر / لیڈ نام
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +89,Clearance Date not mentioned,کلیئرنس تاریخ کا ذکر نہیں
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,پیداوار
+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/controllers/trends.py +19,Total(Qty),کل (مقدار)
 DocType: Sales Invoice,This Document,یہ دستاویز
@@ -2122,15 +2147,15 @@
 DocType: Purchase Receipt,Time at which materials were received,مواد موصول ہوئیں جس میں وقت
 DocType: Stock Ledger Entry,Outgoing Rate,سبکدوش ہونے والے کی شرح
 apps/erpnext/erpnext/config/hr.py +176,Organization branch master.,تنظیم شاخ ماسٹر.
-apps/erpnext/erpnext/controllers/accounts_controller.py +273, or ,یا
+apps/erpnext/erpnext/controllers/accounts_controller.py +276, 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,۹۰ سے بڑھ کر
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +203,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,صف # {0}: جرنل اندراج {1} اکاؤنٹ نہیں ہے {2} یا پہلے سے ہی ایک اور واؤچر کے خلاف میچ نہیں کرتے
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +206,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 +90,No employee for the above selected criteria OR salary slip already created,اوپر منتخب شدہ معیار یا تنخواہ پرچی کے لئے کوئی ملازم پہلے ہی پیدا
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +93,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,ادائیگی کی قسم
@@ -2158,8 +2183,8 @@
 DocType: Product Bundle,Parent Item,والدین آئٹم
 DocType: Account,Account Type,اکاؤنٹ کی اقسام
 DocType: Delivery Note,DN-RET-,DN-RET-
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +115,Leave Type {0} cannot be carry-forwarded,{0} لے بھیج دیا جائے نہیں کر سکتے ہیں کی قسم چھوڑ دو
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',بحالی کے شیڈول تمام اشیاء کے لئے پیدا نہیں کر رہا. &#39;پیدا شیڈول&#39; پر کلک کریں براہ مہربانی
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +118,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 +163,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",صف کے لئے {0} میں {1}. شے کی درجہ بندی میں {2} شامل کرنے کے لئے، قطار {3} بھی شامل کیا جانا چاہئے
@@ -2171,13 +2196,13 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +32,Disabled template must not be default template,معذور کے سانچے ڈیفالٹ ٹیمپلیٹ نہیں ہونا چاہئے
 DocType: Account,Income Account,انکم اکاؤنٹ
 DocType: Payment Request,Amount in customer's currency,کسٹمر کی کرنسی میں رقم
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +748,Delivery,ڈلیوری
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +742,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,کلیدی ذمہ داری کے علاقے
 DocType: Payment Entry,Total Allocated Amount,کل مختص رقم
 DocType: Item Reorder,Material Request Type,مواد درخواست کی قسم
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +82,Row {0}: UOM Conversion Factor is mandatory,صف {0}: UOM تبادلوں فیکٹر لازمی ہے
+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,لاگت مرکز
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,واؤچر #
@@ -2188,13 +2213,13 @@
 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 +90,Head of Marketing and Sales,مارکیٹنگ اور سیلز کے سربراہ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,انکم ٹیکس
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,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.,ٹریک صنعت کی قسم کی طرف جاتا ہے.
 DocType: Item Supplier,Item Supplier,آئٹم پردایک
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +403,Please enter Item Code to get batch no,بیچ کوئی حاصل کرنے کے لئے آئٹم کوڈ درج کریں
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +770,Please select a value for {0} quotation_to {1},{0} quotation_to کے لئے ایک قیمت منتخب کریں {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +397,Please enter Item Code to get batch no,بیچ کوئی حاصل کرنے کے لئے آئٹم کوڈ درج کریں
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +764,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",مندرجہ ذیل خصوصیات دونوں کے ریکارڈ میں ایک ہی ہیں تو ولی ہی ممکن ہے. گروپ، جڑ کی قسم، کمپنی ہے
@@ -2206,25 +2231,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 +100,Issues,مسائل
+apps/erpnext/erpnext/hooks.py +109,Issues,مسائل
 apps/erpnext/erpnext/controllers/status_updater.py +13,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,بلنگ کی کرنسی
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Large,اضافی بڑا
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,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 +507,Warning: Another {0} # {1} exists against stock entry {2},انتباہ: ایک {0} # {1} اسٹاک داخلے کے خلاف موجود {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Local,مقامی
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +508,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),قرضوں اور ایڈوانسز (اثاثے)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,دیندار
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Large,بڑے
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,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,علاقہ
@@ -2272,7 +2298,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +173,Expense / Difference account ({0}) must be a 'Profit or Loss' account,اخراجات / فرق اکاؤنٹ ({0}) ایک &#39;نفع یا نقصان کے اکاؤنٹ ہونا ضروری ہے
 DocType: Account,Accounts User,صارف اکاؤنٹس
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,قلت
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +178,{0} {1} does not associated with {2} {3},{0} {1} سے وابستہ نہیں کرتا {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +181,{0} {1} does not associated with {2} {3},{0} {1} سے وابستہ نہیں کرتا {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,ملازم {0} کے لئے حاضری پہلے سے نشان لگا دیا گیا
 DocType: Packing Slip,If more than one package of the same type (for print),تو اسی قسم کی ایک سے زیادہ پیکج (پرنٹ کے لئے)
 DocType: Warehouse,Parent Warehouse,والدین گودام
@@ -2290,7 +2316,7 @@
 DocType: BOM Item,Scrap %,سکریپ٪
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection",چارجز تناسب اپنے انتخاب کے مطابق، شے کی مقدار یا رقم کی بنیاد پر تقسیم کیا جائے گا
 DocType: Maintenance Visit,Purposes,مقاصد
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,کم سے کم ایک شے کی واپسی دستاویز میں منفی مقدار کے ساتھ درج کیا جانا چاہیے
+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 +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations",آپریشن {0} کارگاہ میں کسی بھی دستیاب کام کے گھنٹوں سے زیادہ وقت {1}، ایک سے زیادہ کی کارروائیوں میں آپریشن کو توڑنے
 ,Requested,درخواست
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +83,No Remarks,کوئی ریمارکس
@@ -2302,46 +2328,46 @@
 DocType: Item,Total Projected Qty,کل متوقع مقدار
 DocType: Monthly Distribution,Distribution Name,ڈسٹری بیوشن کا نام
 DocType: Course,Course Code,کورس کوڈ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Quality Inspection required for Item {0},آئٹم کے لئے ضروری معیار معائنہ {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Quality Inspection required for Item {0},آئٹم کے لئے ضروری معیار معائنہ {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,جو کسٹمر کی کرنسی کی شرح کمپنی کے اساسی کرنسی میں تبدیل کیا جاتا
 DocType: Purchase Invoice Item,Net Rate (Company Currency),نیٹ کی شرح (کمپنی کرنسی)
 DocType: Salary Detail,Condition and Formula Help,حالت اور فارمولہ مدد
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,علاقہ درخت کا انتظام کریں.
 DocType: Journal Entry Account,Sales Invoice,فروخت انوائس
 DocType: Journal Entry Account,Party Balance,پارٹی بیلنس
-apps/erpnext/erpnext/accounts/page/pos/pos.js +475,Please select Apply Discount On,ڈسکاؤنٹ پر لاگو براہ مہربانی منتخب کریں
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +92,Salary Slip Created,تنخواہ پرچی پیدا
+apps/erpnext/erpnext/accounts/page/pos/pos.js +464,Please select Apply Discount On,ڈسکاؤنٹ پر لاگو براہ مہربانی منتخب کریں
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +95,Salary Slip Created,تنخواہ پرچی پیدا
 DocType: Company,Default Receivable Account,پہلے سے طے شدہ وصولی اکاؤنٹ
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,اوپر منتخب شدہ معیار کے لئے ادا کی مجموعی تنخواہ کے لئے بینک اندراج تشکیل
 DocType: Stock Entry,Material Transfer for Manufacture,تیاری کے لئے مواد کی منتقلی
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,ڈسکاؤنٹ فی صد قیمت کی فہرست کے خلاف یا تمام قیمت کی فہرست کے لئے یا تو لاگو کیا جا سکتا.
 DocType: Purchase Invoice,Half-yearly,چھماہی
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +384,Accounting Entry for Stock,اسٹاک کے لئے اکاؤنٹنگ انٹری
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +387,Accounting Entry for Stock,اسٹاک کے لئے اکاؤنٹنگ انٹری
 DocType: Sales Invoice,Sales Team1,سیلز Team1
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,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 +96,Row {0}: Completed Qty must be greater than zero.,صف {0}: مکمل مقدار صفر سے زیادہ ہونا چاہیے.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +120,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 +88,Row # {0}: Cannot return more than {1} for Item {2},صف # {0}: سے زیادہ واپس نہیں کر سکتے ہیں {1} شے کے لئے {2}
+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,پلاٹ
 DocType: Item Group,Show this slideshow at the top of the page,صفحے کے سب سے اوپر اس سلائڈ شو دکھانے کے
 DocType: BOM,Item UOM,آئٹم UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),ڈسکاؤنٹ رقم کے بعد ٹیکس کی رقم (کمپنی کرنسی)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +147,Target warehouse is mandatory for row {0},ہدف گودام صف کے لئے لازمی ہے {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,منتخب سپلائر ایڈریس
 DocType: Quality Inspection,Quality Inspection,معیار معائنہ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Extra Small,اضافی چھوٹے
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,Warning: Material Requested Qty is less than Minimum Order Qty,انتباہ: مقدار درخواست مواد کم از کم آرڈر کی مقدار سے کم ہے
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +194,Account {0} is frozen,اکاؤنٹ {0} منجمد ہے
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,اضافی چھوٹے
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +690,Warning: Material Requested Qty is less than Minimum Order Qty,انتباہ: مقدار درخواست مواد کم از کم آرڈر کی مقدار سے کم ہے
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,اکاؤنٹ {0} منجمد ہے
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,تنظیم سے تعلق رکھنے والے اکاؤنٹس کی ایک علیحدہ چارٹ کے ساتھ قانونی / ماتحت.
 DocType: Payment Request,Mute Email,گونگا ای میل
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco",کھانا، مشروب اور تمباکو
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +606,Can only make payment against unbilled {0},صرف خلاف ادائیگی کر سکتے ہیں unbilled {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +126,Commission rate cannot be greater than 100,کمیشن کی شرح زیادہ سے زیادہ 100 نہیں ہو سکتا
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +609,Can only make payment against unbilled {0},صرف خلاف ادائیگی کر سکتے ہیں unbilled {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,کمیشن کی شرح زیادہ سے زیادہ 100 نہیں ہو سکتا
 DocType: Stock Entry,Subcontract,اپپٹا
 apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,پہلے {0} درج کریں
 DocType: Production Order Operation,Actual End Time,اصل وقت اختتام
@@ -2352,30 +2378,30 @@
 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 +158,Colour,رنگین
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,رنگین
 DocType: Maintenance Visit,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; ہے شے کو منتخب کریں اور کوئی دوسری مصنوعات بنڈل ہے براہ مہربانی
 DocType: Student Log,Academic,اکیڈمک
-apps/erpnext/erpnext/controllers/accounts_controller.py +469,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),کل ایڈوانس ({0}) کے خلاف {1} گرینڈ کل سے زیادہ نہیں ہو سکتا ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +472,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),کل ایڈوانس ({0}) کے خلاف {1} گرینڈ کل سے زیادہ نہیں ہو سکتا ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,اسمان ماہ میں اہداف تقسیم کرنے ماہانہ تقسیم کریں.
 DocType: Purchase Invoice Item,Valuation Rate,تشخیص کی شرح
+DocType: Stock Reconciliation,SR/,SR /
 apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,قیمت کی فہرست کرنسی منتخب نہیں
 DocType: Assessment,Results,نتائج
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +168,Employee {0} has already applied for {1} between {2} and {3},ملازم {0} پہلے ہی درخواست کی ہے {1} کے درمیان {2} اور {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +175,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: Student Applicant,Father's/ Guardian 2 Email ID,والد / 2 گارڈین ای میل آئی ڈی
 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 +228,Warehouses with existing transaction can not be converted to group.,موجودہ منتقلی کے ساتھ گوداموں گروپ کو تبدیل نہیں کیا جا سکتا.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +231,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 +93,Researcher,محقق
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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.,موصولہ معیار معائنہ.
@@ -2387,25 +2413,25 @@
 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: Sales Invoice,Advertisement,اشتہار
 DocType: Asset Category Account,Depreciation Expense Account,ہراس خرچ کے حساب
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Probationary Period,آزماءیشی عرصہ
-apps/erpnext/erpnext/hooks.py +102,Announcements,اعلانات
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,آزماءیشی عرصہ
+apps/erpnext/erpnext/hooks.py +111,Announcements,اعلانات
 DocType: Customer Group,Only leaf nodes are allowed in transaction,صرف پتی نوڈس ٹرانزیکشن میں اجازت دی جاتی ہے
 DocType: Expense Claim,Expense Approver,اخراجات کی منظوری دینے والا
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +109,Row {0}: Advance against Customer must be credit,صف {0}: کسٹمر کے خلاف کی کریڈٹ ہونا ضروری ہے
 apps/erpnext/erpnext/accounts/doctype/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 +16,To Datetime,تریخ ویلہ لئے
+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/scheduling_tool/scheduling_tool.py +51,Course Schedules deleted:,کورس شیڈول خارج کر دیا:
 apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,ایس ایم ایس کی ترسیل کی حیثیت برقرار رکھنے کے لئے نوشتہ جات
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,زیر سرگرمیاں
+DocType: Accounts Settings,Make Payment via Journal Entry,جرنل اندراج کے ذریعے ادائیگی
+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 +127,Please enter relieving date.,تاریخ حاجت کوڈ داخل کریں.
-apps/erpnext/erpnext/controllers/trends.py +145,Amt,AMT
+apps/erpnext/erpnext/controllers/trends.py +149,Amt,AMT
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,Only Leave Applications with status 'Approved' can be submitted,صرف حیثیت &#39;منظور&#39; پیش کیا جا سکتا کے ساتھ درخواستیں چھوڑ دو
 apps/erpnext/erpnext/utilities/doctype/address/address.py +26,Address Title is mandatory.,ایڈریس عنوان لازمی ہے.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,انکوائری کے ذریعہ مہم ہے تو مہم کا نام درج کریں
@@ -2423,14 +2449,15 @@
 apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1},{0} کے لئے زر مبادلہ کی شرح تلاش کرنے سے قاصر {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,مارک آدھے دن
 DocType: Sales Invoice,Sales Team,سیلز ٹیم
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Duplicate entry,ڈوپلیکیٹ اندراج
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,ڈوپلیکیٹ اندراج
 DocType: Program Enrollment Tool,Get Students,طلبا حاصل کریں
 DocType: Serial No,Under Warranty,وارنٹی کے تحت
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +490,[Error],[خرابی]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +484,[Error],[خرابی]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,آپ کی فروخت کے آرڈر کو بچانے کے ایک بار الفاظ میں نظر آئے گا.
 ,Employee Birthday,ملازم سالگرہ
 apps/erpnext/erpnext/controllers/status_updater.py +175,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} پہلے سے موجود ہے. ان اندراجات پر نظر ثانی کریں اور دوبارہ کوشش کریں براہ مہربانی.
 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} موجود نہیں ہے
@@ -2446,11 +2473,11 @@
 ,Issued Items Against Production Order,پروڈکشن آرڈر کے خلاف جاری اشیا
 DocType: Pricing Rule,Purchase Manager,خریداری مینیجر
 DocType: Target Detail,Target Detail,ہدف تفصیل
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +25,All Jobs,تمام ملازمتیں
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,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 +323,Amount {0} {1} {2} {3},رقم {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,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,ملازم حاضری کا آلہ
@@ -2460,7 +2487,7 @@
 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 +497,Material Requests {0} created,پیدا مواد درخواستوں {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +498,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.,شرائط یا معاہدے کے سانچے.
 DocType: Purchase Invoice,Address and Contact,ایڈریس اور رابطہ
@@ -2517,7 +2544,8 @@
 ,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.
-apps/erpnext/erpnext/controllers/accounts_controller.py +555,'Update Stock' cannot be checked for fixed asset sale,&#39;اپ ڈیٹ اسٹاک&#39; فکسڈ اثاثہ کی فروخت کے لئے نہیں کی جانچ پڑتال کی جا سکتی ہے
+DocType: Student Guardian,Father,فادر
+apps/erpnext/erpnext/controllers/accounts_controller.py +558,'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} منسوخ یا بند کر دیا ہے
@@ -2527,14 +2555,14 @@
 DocType: Sales Order,Fully Delivered,مکمل طور پر ہونے والا
 DocType: Lead,Lower Income,کم آمدنی
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked",منافع / خسارہ مقدمہ درج کیا جائے گا جس میں ذمہ داری کے تحت اکاؤنٹ کے سر،
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +166,Source and target warehouse cannot be same for row {0},ذریعہ اور ہدف گودام صف کے لئے ہی نہیں ہو سکتا {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",یہ اسٹاک مصالحتی ایک افتتاحی انٹری ہے کے بعد سے فرق اکاؤنٹ، ایک اثاثہ / ذمہ داری قسم اکاؤنٹ ہونا ضروری ہے
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +81,Purchase Order number required for Item {0},آئٹم کے لئے ضروری آرڈر نمبر خریداری {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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/purchase_receipt/purchase_receipt.py +82,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: Timesheet,"List of employee which has ""Salary Slip Based on Timesheet"" is enabled in salary structure.",&quot;Timesheet کی بنیاد پر تنخواہ کی پرچی&quot; ہے جس کے ملازم کی لسٹ تنخواہ ساخت میں چالو حالت میں ہے.
 DocType: Asset,Fully Depreciated,مکمل طور پر فرسودگی
 ,Stock Projected Qty,اسٹاک مقدار متوقع
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Customer {0} does not belong to project {1},تعلق نہیں ہے {0} کسٹمر منصوبے کی {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,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,سیریل نمبر اور بیچ
@@ -2546,7 +2574,7 @@
 DocType: Purchase Invoice,Purchase Taxes and Charges,ٹیکس اور الزامات کی خریداری
 ,Qty to Receive,وصول کرنے کی مقدار
 DocType: Leave Block List,Leave Block List Allowed,بلاک فہرست اجازت چھوڑ دو
-apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +55,All Warehouses,تمام گوداموں
+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 +105,Credit To account must be a Balance Sheet account,اکاؤنٹ کریڈٹ ایک بیلنس شیٹ اکاؤنٹ ہونا ضروری ہے
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,تمام پردایک اقسام
@@ -2558,22 +2586,22 @@
 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/manufacturing/doctype/bom/bom.js +26,Browse BOM,براؤز BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,براؤز BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,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 Year,Academic Year,تعلیمی سال
+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
 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 +197,Leave approver must be one of {0},سے ایک ہونا ضروری گواہ چھوڑ {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,Leave approver must be one of {0},سے ایک ہونا ضروری گواہ چھوڑ {0}
 DocType: Hub Settings,Seller Email,فروش ای میل
 DocType: Project,Total Purchase Cost (via Purchase Invoice),کل خریداری کی لاگت (انوائس خریداری کے ذریعے)
 DocType: Workstation Working Hour,Start Time,وقت آغاز
 DocType: Item Price,Bulk Import Help,بلک درآمد مدد
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +256,Select Quantity,منتخب مقدار
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +257,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,پیغام بھیجا
@@ -2590,6 +2618,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,بہر ہدف مقدار یا ہدف رقم لازمی ہے.
 apps/erpnext/erpnext/config/projects.py +45,Cost of various activities,مختلف سرگرمیوں کی لاگت
 apps/erpnext/erpnext/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 +149,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}
 DocType: Item,Inspection Required,معائنہ مطلوب
@@ -2609,7 +2638,7 @@
 DocType: Expense Claim,Approval Status,منظوری کی حیثیت
 DocType: Hub Settings,Publish Items to Hub,حب اشیا شائع
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},قیمت صف میں قدر سے کم ہونا ضروری ہے سے {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Wire Transfer,وائر ٹرانسفر
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,وائر ٹرانسفر
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,تمام چیک کریں
 DocType: Sales Order,Recurring Order,مکرر آرڈر
 DocType: Company,Default Income Account,پہلے سے طے شدہ آمدنی اکاؤنٹ
@@ -2621,18 +2650,16 @@
 ,Welcome to ERPNext,ERPNext میں خوش آمدید
 apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,کوٹیشن کی قیادت
 DocType: Lead,From Customer,کسٹمر سے
-apps/erpnext/erpnext/demo/setup_data.py +357,Calls,کالیں
+apps/erpnext/erpnext/demo/setup/setup_data.py +300,Calls,کالیں
 DocType: Project,Total Costing Amount (via Time Logs),کل لاگت رقم (وقت کیلیے نوشتہ جات دیکھیے کے ذریعے)
 DocType: Purchase Order Item Supplied,Stock UOM,اسٹاک UOM
-apps/erpnext/erpnext/stock/doctype/item/item.py +466,"As there are existing transactions for this item, \
-							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'",اس شے کی، \ آپ کی اقدار کو تبدیل نہیں کر سکتے ہیں کے لئے موجودہ ٹرانزیکشنز ہیں کے طور پر &#39;سیریل نہیں ہے&#39;، &#39;بیچ میں کوئی&#39;، اور &#39;سٹاک آئٹم ہے.&#39; &#39;تشخیص کا طریقہ&#39;
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,Purchase Order {0} is not submitted,آرڈر {0} پیش نہیں کی خریداری
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,متوقع
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},سیریل نمبر {0} گودام سے تعلق نہیں ہے {1}
 apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,نوٹ: {0} مقدار یا رقم 0 ہے کے طور پر کی ترسیل اور زیادہ بکنگ شے کے لئے نظام کی جانچ پڑتال نہیں کرے گا
 DocType: Notification Control,Quotation Message,کوٹیشن پیغام
 DocType: Issue,Opening Date,افتتاحی تاریخ
-apps/erpnext/erpnext/schools/api.py +58,Attendance has been marked successfully.,حاضری کامیابی سے نشان لگا دیا گیا ہے.
+apps/erpnext/erpnext/schools/api.py +57,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,پتے اور چھٹیوں
@@ -2649,12 +2676,13 @@
 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/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 +20,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 +1190,Please select customer,کسٹمر براہ مہربانی منتخب کریں
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1193,Please select customer,کسٹمر براہ مہربانی منتخب کریں
 DocType: C-Form,I,میں
 DocType: Company,Asset Depreciation Cost Center,اثاثہ ہراس لاگت سینٹر
 DocType: Sales Order Item,Sales Order Date,سیلز آرڈر کی تاریخ
@@ -2664,6 +2692,7 @@
 ,Payment Period Based On Invoice Date,انوائس کی تاریخ کی بنیاد پر ادائیگی کی مدت
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},کے لئے لاپتہ کرنسی ایکسچینج قیمتیں {0}
 DocType: Assessment,Examiner,آڈیٹر
+DocType: Student,Siblings,بھائی بہن
 DocType: Journal Entry,Stock Entry,اسٹاک انٹری
 DocType: Payment Entry,Payment References,ادائیگی حوالہ جات
 DocType: C-Form,C-FORM-,C-کریں-
@@ -2681,11 +2710,12 @@
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,موضوع کا نام
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,فروخت یا خرید کی کم سے کم ایک منتخب ہونا ضروری ہے
+DocType: Grading Structure,Grade Intervals,گریڈ وقفے
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,آپ کے کاروبار کی نوعیت کو منتخب کریں.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,مینوفیکچرنگ آپریشنز کہاں کئے جاتے ہیں.
 DocType: Asset Movement,Source Warehouse,ماخذ گودام
 DocType: Installation Note,Installation Date,تنصیب کی تاریخ
-apps/erpnext/erpnext/controllers/accounts_controller.py +534,Row #{0}: Asset {1} does not belong to company {2},صف # {0}: اثاثہ {1} کی کمپنی سے تعلق نہیں ہے {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +537,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,سیلز صارف
@@ -2699,27 +2729,30 @@
 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 +111,Date Of Retirement must be greater than Date of Joining,ریٹائرمنٹ کے تاریخ شمولیت کی تاریخ سے زیادہ ہونا چاہیے
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +49,There were errors while scheduling course on :,پر کورس شیڈول جبکہ غلطیاں تھے:
 DocType: Sales Invoice,Against Income Account,انکم اکاؤنٹ کے خلاف
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +87,{0}% Delivered,{0}٪ پھنچ گیا
+apps/erpnext/erpnext/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,ٹرانسپورٹر معلومات
 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,مجموعی منافع / نقصان
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,آرڈر آئٹم فراہم خریدیں
 apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,کمپنی کا نام نہیں ہو سکتا
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,پرنٹ کے سانچوں کے لئے خط سر.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,پرنٹ کے سانچوں کے لئے عنوانات پروفارما انوائس مثلا.
+DocType: Student Guardian,Student Guardian,طالب علم گارڈین
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +184,Valuation type charges can not marked as Inclusive,تشخیص قسم کے الزامات شامل کے طور پر نشان نہیں کر سکتے ہیں
 DocType: POS Profile,Update Stock,اپ ڈیٹ اسٹاک
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,اشیاء کے لئے مختلف UOM غلط (کل) نیٹ وزن کی قیمت کی قیادت کریں گے. ہر شے کے نیٹ وزن اسی UOM میں ہے اس بات کو یقینی بنائیں.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM کی شرح
 DocType: Asset,Journal Entry for Scrap,سکریپ کے لئے جرنل اندراج
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,ترسیل کے نوٹ سے اشیاء پر ھیںچو کریں
-apps/erpnext/erpnext/accounts/utils.py +349,Journal Entries {0} are un-linked,جرنل میں لکھے {0} غیر منسلک ہیں
+apps/erpnext/erpnext/accounts/utils.py +426,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,کمپنی میں گول آف لاگت مرکز کا ذکر کریں
@@ -2743,6 +2776,7 @@
 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,فورم
+DocType: Homepage,"URL for ""All Products""",کے لئے &quot;تمام مصنوعات&quot; URL
 DocType: Leave Application,Leave Balance Before Application,درخواست سے پہلے توازن چھوڑ دو
 DocType: SMS Center,Send SMS,ایس ایم ایس بھیجیں
 DocType: Cheque Print Template,Width of amount in word,لفظ میں رقم کی چوڑائی
@@ -2751,7 +2785,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 +29,Current Job Openings,موجودہ کام سوراخ
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,Current Job Openings,موجودہ کام سوراخ
 DocType: Company,Stock Adjustment Account,اسٹاک ایڈجسٹمنٹ بلنگ
 DocType: Journal Entry,Write Off,لکھ دینا
 DocType: Timesheet Detail,Operation ID,آپریشن ID
@@ -2764,7 +2798,7 @@
 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 +850,Show tax break-up,دکھائیں ٹیکس بریک اپ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +841,Show tax break-up,دکھائیں ٹیکس بریک اپ
 apps/erpnext/erpnext/accounts/party.py +308,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,کوئی طالب علم نہیں ملا
@@ -2773,10 +2807,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 +534,Please select Posting Date before selecting Party,پارٹی منتخب کرنے سے پہلے پوسٹنگ کی تاریخ براہ مہربانی منتخب کریں
 DocType: Serial No,Out of AMC,اے ایم سی کے باہر
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +80,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 +162,Please contact to the user who have Sales Master Manager {0} role,سیلز ماسٹر مینیجر {0} کردار ہے جو صارف سے رابطہ کریں
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +195,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 +5,This is based on the attendance of this Student,یہ اس طالب علم کی حاضری پر مبنی ہے
@@ -2785,12 +2820,11 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,ترسیل نوٹوں {0} اس سیلز آرڈر منسوخ کرنے سے پہلے منسوخ کر دیا جائے ضروری ہے
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +75,Paid amount + Write Off Amount can not be greater than Grand Total,ادائیگی کی رقم رقم گرینڈ کل سے زیادہ نہیں ہو سکتا لکھنے +
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,{0} is not a valid Batch Number for Item {1},{0} شے کے لئے ایک درست بیچ نمبر نہیں ہے {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +138,Note: There is not enough leave balance for Leave Type {0},نوٹ: حکم کی قسم کے لئے کافی چھٹی توازن نہیں ہے {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,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,موقع کی قسم
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,نئی کمپنی
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,Cost Center is required for 'Profit and Loss' account {0},لاگت سینٹر &#39;منافع اور نقصان کے لئے کی ضرورت ہے اکاؤنٹ {0}
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,سرگرمیاں صرف کمپنی کے خالق کی طرف سے خارج کر دیا جا سکتا ہے
 apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,جنرل لیجر لکھے کی غلط نمبر مل گیا. آپ کو لین دین میں ایک غلط اکاؤنٹ کو منتخب کیا ہے ہو سکتا ہے.
 DocType: Cheque Print Template,Cheque Width,چیک چوڑائی
@@ -2799,16 +2833,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,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 +228,{0} '{1}' is disabled,{0} {1} &#39;غیر فعال ہے
+apps/erpnext/erpnext/controllers/accounts_controller.py +231,{0} '{1}' is disabled,{0} {1} &#39;غیر فعال ہے
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,کھولنے کے طور پر مقرر کریں
 DocType: Cheque Print Template,Scanned Cheque,سکین شدہ چیک
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,جمع لین دین پر خود کار طریقے سے رابطے ای میلز بھیجیں.
+DocType: Timesheet,Total Billable Amount,کل قابل بل کی رقم
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,آئٹم کے 3
 DocType: Purchase Order,Customer Contact Email,کسٹمر رابطہ ای میل
 DocType: Warranty Claim,Item and Warranty Details,آئٹم اور وارنٹی تفصیلات دیکھیں
 DocType: Sales Team,Contribution (%),شراکت (٪)
-apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,نوٹ: ادائیگی کے اندراج کے بعد پیدا ہو گا &#39;نقد یا بینک اکاؤنٹ&#39; وضاحت نہیں کی گئی
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Responsibilities,ذمہ داریاں
+apps/erpnext/erpnext/controllers/accounts_controller.py +78,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,ذمہ داریاں
 DocType: Expense Claim Account,Expense Claim Account,اخراجات دعوی اکاؤنٹ
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,سانچہ
 DocType: Sales Person,Sales Person Name,فروخت کے شخص کا نام
@@ -2816,6 +2851,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,صارفین شامل کریں
 DocType: Pricing Rule,Item Group,آئٹم گروپ
 DocType: Item,Safety Stock,سیفٹی اسٹاک
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,آئٹم کوڈ&gt; آئٹم گروپ&gt; برانڈ
 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),ٹیکس اور الزامات شامل کر دیا گیا (کمپنی کرنسی)
@@ -2825,7 +2861,6 @@
 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: Timesheet,Total Hours,کل گھنٹے
 DocType: Journal Entry,Printing Settings,پرنٹنگ ترتیبات
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Total Debit must be equal to Total Credit. The difference is {0},کل ڈیبٹ کل کریڈٹ کے برابر ہونا چاہیے. فرق ہے {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,آٹوموٹو
@@ -2838,13 +2873,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,سرمایہ کاری بینکنگ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +71,Cash or Bank Account is mandatory for making payment entry,نقد یا بینک اکاؤنٹ کی ادائیگی کے اندراج بنانے کے لئے لازمی ہے
 DocType: Purchase Invoice,Price List Exchange Rate,قیمت کی فہرست زر مبادلہ کی شرح
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,کسٹمر&gt; کسٹمر گروپ&gt; ٹیرٹری
 DocType: Purchase Invoice Item,Rate,شرح
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Intern,انٹرن
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,انٹرن
 DocType: Stock Entry,From BOM,BOM سے
 DocType: Assessment,Assessment Code,تشخیص کے کوڈ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +32,Basic,بنیادی
+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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',&#39;پیدا شیڈول&#39; پر کلک کریں براہ مہربانی
+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 +95,Reference No is mandatory if you entered Reference Date,آپ کے ریفرنس کے تاریخ میں داخل ہوئے تو حوالہ کوئی لازمی ہے
@@ -2853,11 +2889,11 @@
 DocType: Salary Slip,Salary Structure,تنخواہ ساخت
 DocType: Account,Bank,بینک
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,ایئرلائن
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +752,Issue Material,مسئلہ مواد
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +723,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 +683,You are in offline mode. You will not be able to reload until you have network.,آپ آف لائن موڈ میں ہیں. آپ آپ کو نیٹ ورک ہے جب تک دوبارہ لوڈ کرنے کے قابل نہیں ہو گا.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +665,You are in offline mode. You will not be able to reload until you have network.,آپ آف لائن موڈ میں ہیں. آپ آپ کو نیٹ ورک ہے جب تک دوبارہ لوڈ کرنے کے قابل نہیں ہو گا.
 DocType: Hub Settings,Access Token,رسائی کا ٹوکن
 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,سیریل نمبر
@@ -2865,33 +2901,35 @@
 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 +1122,Enter value must be positive,درج قدر مثبت ہونا چاہئے
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,All Territories,تمام علاقوں
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1125,Enter value must be positive,درج قدر مثبت ہونا چاہئے
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,تمام علاقوں
 DocType: Purchase Invoice,Items,اشیا
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +23,Student is already enrolled.,طالب علم پہلے سے ہی مندرج ہے.
 DocType: Fiscal Year,Year Name,سال نام
 DocType: Process Payroll,Process Payroll,عمل کی تنخواہ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,کام کے دنوں کے مقابلے میں زیادہ کی تعطیلات اس ماہ ہیں.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +233,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 +96,Request for Quotations,کوٹیشن کے لئے درخواست
+apps/erpnext/erpnext/hooks.py +104,Request for Quotations,کوٹیشن کے لئے درخواست
 DocType: Payment Reconciliation,Maximum Invoice Amount,زیادہ سے زیادہ انوائس کی رقم
 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 +628,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',مختلف کے لئے پیمائش کی پہلے سے طے شدہ یونٹ &#39;{0}&#39; سانچے میں کے طور پر ایک ہی ہونا چاہیے &#39;{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',مختلف کے لئے پیمائش کی پہلے سے طے شدہ یونٹ &#39;{0}&#39; سانچے میں کے طور پر ایک ہی ہونا چاہیے &#39;{1}
 DocType: Shipping Rule,Calculate Based On,کی بنیاد پر حساب
 DocType: Delivery Note Item,From Warehouse,گودام سے
 DocType: Assessment,Supervisor Name,سپروائزر کا نام
+DocType: Assessment,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,خریداری صارف
 DocType: Notification Control,Customize the Notification,اطلاع کو حسب ضرورت
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Cash Flow from Operations,آپریشنز سے کیش فلو
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,پہلے سے طے شدہ ایڈریس سانچہ خارج نہیں کیا جا سکتا
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,پہلے سے طے شدہ ایڈریس سانچہ خارج نہیں کیا جا سکتا
 DocType: Sales Invoice,Shipping Rule,شپنگ حکمرانی
 DocType: Manufacturer,Limited to 12 characters,12 حروف تک محدود
 DocType: Journal Entry,Print Heading,پرنٹ سرخی
@@ -2906,8 +2944,8 @@
 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/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,بہر ہدف مقدار یا ہدف رقم لازمی ہے
-apps/erpnext/erpnext/stock/get_item_details.py +485,No default BOM exists for Item {0},کوئی پہلے سے طے شدہ BOM شے کے لئے موجود {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +336,Please select Posting Date first,پہلے پوسٹنگ کی تاریخ منتخب کریں
+apps/erpnext/erpnext/stock/get_item_details.py +486,No default BOM exists for Item {0},کوئی پہلے سے طے شدہ BOM شے کے لئے موجود {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +326,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,موجودہ لین دین کے ساتھ سرمایہ کاری سینٹر اکاؤنٹ میں تبدیل نہیں کیا جا سکتا
@@ -2923,6 +2961,7 @@
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,انوائس کے ساتھ ملائیں ادائیگیاں
 DocType: Journal Entry,Bank Entry,بینک انٹری
 DocType: Authorization Rule,Applicable To (Designation),لاگو (عہدہ)
+,Profitability Analysis,منافع تجزیہ
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,ٹوکری میں شامل کریں
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,گروپ سے
 DocType: Guardian,Interests,دلچسپیاں
@@ -2935,21 +2974,21 @@
 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 +141,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",serialized کی آئٹم {0} اسٹاک مصالحتی استعمال \ اپ ڈیٹ نہیں کیا جا سکتا
 DocType: Scheduling Tool,Day,ڈے
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,نیا سیریل کوئی گودام ہیں کر سکتے ہیں. گودام اسٹاک اندراج یا خریداری کی رسید کی طرف سے مقرر کیا جانا چاہیے
 DocType: Lead,Lead Type,لیڈ کی قسم
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,You are not authorized to approve leaves on Block Dates,آپ کو بلاک تاریخوں پر پتے کو منظور کرنے کی اجازت نہیں ہے
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,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: Student Applicant,AP.,AP.
 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 +639,Point of Sale,فروخت پوائنٹ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +634,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,ٹیکس
 DocType: Production Planning Tool,Production Planning Tool,پیداوار کی منصوبہ بندی کا آلہ
@@ -2958,33 +2997,34 @@
 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 +373,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 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 Profile,Customer Group,گاہک گروپ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,Expense account is mandatory for item {0},اخراجات کے اکاؤنٹ شے کے لئے لازمی ہے {0}
 DocType: Item,Website Description,ویب سائٹ تفصیل
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date must be on or after today,اگلا ہراس تاریخ پر یا آج کے بعد ہونا ضروری ہے
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,ایکوئٹی میں خالص تبدیلی
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +145,Please cancel Purchase Invoice {0} first,انوائس خریداری {0} منسوخ مہربانی سب سے پہلے
 DocType: Serial No,AMC Expiry Date,AMC ختم ہونے کی تاریخ
 ,Sales Register,سیلز رجسٹر
 DocType: Quotation,Quotation Lost Reason,کوٹیشن کھو وجہ
+apps/erpnext/erpnext/utilities/doctype/address/address.py +164,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,کوئی طے شدہ ایڈریس سانچے پایا. سیٹ اپ&gt; طباعت اور برانڈنگ&gt; ایڈریس سانچے سے نئی تشکیل مہربانی.
 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 +107,Summary for this month and pending activities,اس مہینے اور زیر التواء سرگرمیوں کا خلاصہ
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,اس مہینے اور زیر التواء سرگرمیوں کا خلاصہ
 DocType: Customer Group,Customer Group Name,گاہک گروپ کا نام
 apps/erpnext/erpnext/public/js/financial_statements.js +54,Cash Flow Statement,کیش فلو کا بیان
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Please remove this Invoice {0} from C-Form {1},سی فارم سے اس انوائس {0} کو دور کریں {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,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 +644,Get Items,اشیاء حاصل
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +623,Get Items,اشیاء حاصل
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +210,Please enter Write Off Account,اکاؤنٹ لکھنے داخل کریں
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,آخری آرڈر کی تاریخ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +41,Account {0} does not belongs to company {1},اکاؤنٹ {0} کرتا کمپنی سے تعلق رکھتا نہیں {1}
+DocType: Student,Guardian Details,گارڈین کی تفصیلات دیکھیں
 DocType: C-Form,C-Form,سی فارم
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,ایک سے زیادہ ملازمین کے لئے نشان حاضری
 DocType: Payment Request,Initiated,شروع
@@ -2993,37 +3033,38 @@
 DocType: Leave Type,Is Encash,بنانا ہے
 DocType: Purchase Invoice,Mobile No,موبائل نہیں
 DocType: Leave Allocation,New Leaves Allocated,نئے پتے مختص
-apps/erpnext/erpnext/controllers/trends.py +265,Project-wise data is not available for Quotation,پروجیکٹ وار اعداد و شمار کوٹیشن کے لئے دستیاب نہیں ہے
+apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,پروجیکٹ وار اعداد و شمار کوٹیشن کے لئے دستیاب نہیں ہے
 DocType: Project,Expected End Date,متوقع تاریخ اختتام
 DocType: Budget Account,Budget Amount,بجٹ کی رقم
 DocType: Appraisal Template,Appraisal Template Title,تشخیص سانچہ عنوان
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,Commercial,کمرشل
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,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/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,مقدار باہر
 apps/erpnext/erpnext/config/accounts.py +278,Rules to calculate shipping amount for a sale,قواعد فروخت کے لئے شپنگ رقم کا حساب کرنے
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +30,Series is mandatory,سیریز لازمی ہے
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +50,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}
 DocType: Leave Allocation,Unused leaves,غیر استعمال شدہ پتے
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Cr,کروڑ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Cr,کروڑ
 DocType: Tax Rule,Billing State,بلنگ ریاست
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +250,Transfer,منتقلی
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +187,{0} {1} does not associated with Party Account {2},{0} {1} پارٹی اکاؤنٹ کے ساتھ وابستہ نہیں کرتا {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,Fetch exploded BOM (including sub-assemblies),(ذیلی اسمبلیوں سمیت) پھٹا BOM آوردہ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +254,Transfer,منتقلی
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +190,{0} {1} does not associated with Party Account {2},{0} {1} پارٹی اکاؤنٹ کے ساتھ وابستہ نہیں کرتا {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +796,Fetch exploded BOM (including sub-assemblies),(ذیلی اسمبلیوں سمیت) پھٹا BOM آوردہ
 DocType: Authorization Rule,Applicable To (Employee),لاگو (ملازم)
-apps/erpnext/erpnext/controllers/accounts_controller.py +115,Due Date is mandatory,کی وجہ سے تاریخ لازمی ہے
+apps/erpnext/erpnext/controllers/accounts_controller.py +118,Due Date is mandatory,کی وجہ سے تاریخ لازمی ہے
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,وصف کے لئے اضافہ {0} 0 نہیں ہو سکتا
 DocType: Journal Entry,Pay To / Recd From,سے / Recd کرنے کے لئے ادا
 DocType: Naming Series,Setup Series,سیٹ اپ سیریز
 DocType: Payment Reconciliation,To Invoice Date,تاریخ انوائس کے لئے
 DocType: Supplier,Contact HTML,رابطہ کریں ایچ ٹی ایم ایل
 ,Inactive Customers,غیر فعال کسٹمرز
+DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,خریداری کی رسیدیں
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,کس طرح کی قیمتوں کا تعین اصول کا اطلاق ہوتا ہے؟
 DocType: Quality Inspection,Delivery Note No,ترسیل کے نوٹ نہیں
@@ -3032,7 +3073,7 @@
 DocType: Company,Retail,پرچون
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +120,Customer {0} does not exist,کسٹمر {0} موجود نہیں ہے
 DocType: Attendance,Absent,غائب
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +587,Product Bundle,پروڈکٹ بنڈل
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Product Bundle,پروڈکٹ بنڈل
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Invalid reference {1},صف {0}: غلط حوالہ {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,ٹیکسز اور الزامات سانچہ خریداری
 DocType: Upload Attendance,Download Template,لوڈ سانچہ
@@ -3042,8 +3083,8 @@
 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 +742,Send Supplier Emails,پردایک ای میلز بھیجیں
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +104,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",تنخواہ پہلے سے ہی درمیان {0} اور {1}، درخواست مدت چھوڑیں اس تاریخ کی حد کے درمیان نہیں ہو سکتا مدت کے لئے کارروائی کی.
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +708,Send Supplier Emails,پردایک ای میلز بھیجیں
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,"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,گارڈین دلچسپی
 DocType: Timesheet,Employee Detail,ملازم کی تفصیل
@@ -3054,9 +3095,9 @@
 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/accounts/doctype/gl_entry/gl_entry.py +77,Account {0} cannot be a Group,اکاؤنٹ {0} ایک گروپ نہیں ہو سکتا
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} cannot be a Group,اکاؤنٹ {0} ایک گروپ نہیں ہو سکتا
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +31,Optional. This setting will be used to filter in various transactions.,اختیاری. یہ ترتیب مختلف لین دین میں فلٹر کیا جائے گا.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +107,Negative Valuation Rate is not allowed,منفی تشخیص کی شرح کی اجازت نہیں ہے
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,منفی تشخیص کی شرح کی اجازت نہیں ہے
 DocType: Holiday List,Weekly Off,ویکلی آف
 DocType: Fiscal Year,"For e.g. 2012, 2012-13",مثال کے طور پر 2012، 2012-13 کے لئے
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +39,Provisional Profit / Loss (Credit),عبوری منافع / خسارہ (کریڈٹ)
@@ -3070,16 +3111,16 @@
 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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: لاگت سینٹر شے کے لئے لازمی ہے {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +626,Get Items from Product Bundle,پروڈکٹ بنڈل سے اشیاء حاصل
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +605,Get Items from Product Bundle,پروڈکٹ بنڈل سے اشیاء حاصل
 DocType: Asset,Straight Line,سیدھی لکیر
 DocType: Project User,Project User,پروجیکٹ صارف
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} is inactive,اکاؤنٹ {0} غیر فعال ہے
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} is inactive,اکاؤنٹ {0} غیر فعال ہے
 DocType: GL Entry,Is Advance,ایڈوانس ہے
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,تاریخ کے لئے تاریخ اور حاضری سے حاضری لازمی ہے
 apps/erpnext/erpnext/controllers/buying_controller.py +148,Please enter 'Is Subcontracted' as Yes or No,ہاں یا نہیں کے طور پر &#39;ٹھیکے ہے&#39; درج کریں
 DocType: Sales Team,Contact No.,رابطہ نمبر
 DocType: Bank Reconciliation,Payment Entries,ادائیگی لکھے
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,'Profit and Loss' type account {0} not allowed in Opening Entry,انٹری کھولنے میں کی اجازت نہیں &#39;منافع اور نقصان&#39; قسم اکاؤنٹ {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +71,'Profit and Loss' type account {0} not allowed in Opening Entry,انٹری کھولنے میں کی اجازت نہیں &#39;منافع اور نقصان&#39; قسم اکاؤنٹ {0}
 DocType: Program Enrollment Tool,Get Students From,سے طالب علموں کو حاصل کریں
 DocType: Hub Settings,Seller Country,فروش ملک
 apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,ویب سائٹ پر اشیاء شائع
@@ -3110,13 +3151,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +202,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: Sales Order,% Amount Billed,٪ رقم بل
+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 +117,No Item with Serial No {0},سیریل نمبر کے ساتھ کوئی آئٹم {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,کھولیں نوٹیفیکیشن
+DocType: Email Digest,Open Notifications,کھولیں نوٹیفیکیشن
 DocType: Payment Entry,Difference Amount (Company Currency),فرق رقم (کمپنی کرنسی)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,براہ راست اخراجات
 apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
@@ -3124,7 +3165,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,نئے گاہک ریونیو
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,سفر کے اخراجات
 DocType: Maintenance Visit,Breakdown,خرابی
-apps/erpnext/erpnext/controllers/accounts_controller.py +634,Account: {0} with currency: {1} can not be selected,اکاؤنٹ: {0} کرنسی: {1} منتخب نہیں کیا جا سکتا
+apps/erpnext/erpnext/controllers/accounts_controller.py +637,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}
 DocType: Program Enrollment Tool,Student Applicants,Student کی درخواست گزار
@@ -3132,15 +3173,15 @@
 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 +56,Probation,پروبیشن
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Probation,پروبیشن
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,تنخواہ کے اجزاء
 DocType: Program Enrollment Tool,New Academic Year,نئے تعلیمی سال
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Payment of salary for the month {0} and year {1},ماہ کے لئے تنخواہ کی ادائیگی {0} اور سال {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Payment of salary for the month {0} and year {1},ماہ کے لئے تنخواہ کی ادائیگی {0} اور سال {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,آٹو ڈالیں قیمت کی فہرست شرح لاپتہ ہے
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,کل ادا کی گئی رقم
 DocType: Production Order Item,Transferred Qty,منتقل مقدار
 apps/erpnext/erpnext/config/learn.py +11,Navigating,گشت
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Planning,منصوبہ بندی
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,منصوبہ بندی
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,جاری کردیا گیا
 DocType: Project,Total Billing Amount (via Time Logs),کل بلنگ رقم (وقت کیلیے نوشتہ جات دیکھیے کے ذریعے)
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,We sell this Item,ہم اس شے کے فروخت
@@ -3153,11 +3194,10 @@
 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.,ای میل کے ذریعے باقاعدہ سمری رپورٹ بھیجنے.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Sales invoice submitted sucessfully.,فروخت انوائس کامیابی جمع کرائی.
 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}
 DocType: Assessment Result,Student Name,طالب علم کا نام
-apps/erpnext/erpnext/hooks.py +104,Assessment Schedule,تشخیص شیڈول
+apps/erpnext/erpnext/hooks.py +113,Assessment Schedule,تشخیص شیڈول
 DocType: Brand,Item Manager,آئٹم مینیجر
 DocType: Buying Settings,Default Supplier Type,پہلے سے طے شدہ پردایک قسم
 DocType: Production Order,Total Operating Cost,کل آپریٹنگ لاگت
@@ -3167,6 +3207,7 @@
 DocType: GL Entry,Party Type,پارٹی قسم
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +78,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 نہیں
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,تنخواہ سانچے ماسٹر.
 DocType: Leave Type,Max Days Leave Allowed,زیادہ سے زیادہ دنوں کی رخصت کی اجازت
@@ -3178,18 +3219,19 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,لیڈز یا گاہکوں کو قیمت.
 DocType: Stock Settings,Role Allowed to edit frozen stock,کردار منجمد اسٹاک ترمیم کرنے کی اجازت
 ,Territory Target Variance Item Group-Wise,علاقہ ھدف تغیر آئٹم گروپ حکیم
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Customer Groups,تمام کسٹمر گروپوں
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +78,Accumulated Monthly,جمع ماہانہ
-apps/erpnext/erpnext/controllers/accounts_controller.py +595,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} لازمی ہے. ہو سکتا ہے کہ کرنسی ایکسچینج ریکارڈ {1} {2} کرنے کے لئے پیدا نہیں کر رہا ہے.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,تمام کسٹمر گروپوں
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +81,Accumulated Monthly,جمع ماہانہ
+apps/erpnext/erpnext/controllers/accounts_controller.py +598,{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} موجود نہیں ہے
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),قیمت کی فہرست شرح (کمپنی کرنسی)
 DocType: Products Settings,Products Settings,مصنوعات ترتیبات
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +188,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} سیٹ اپ&gt; ترتیبات کے ذریعے&gt; نام دینے سیریز کے لئے نام دینے سیریز مقرر کریں
 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 +84,Secretary,سیکرٹری
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,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,خرید
@@ -3198,24 +3240,22 @@
 ,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,تشخیص نام
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,صف # {0}: سیریل کوئی لازمی ہے
+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 +859,Supplier Quotation,پردایک کوٹیشن
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +838,Supplier Quotation,پردایک کوٹیشن
 DocType: Quotation,In Words will be visible once you save the Quotation.,آپ کوٹیشن بچانے بار الفاظ میں نظر آئے گا.
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +7,Collect Fees,فیس جمع
+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}
 DocType: Lead,Add to calendar on this date,اس تاریخ پر کیلنڈر میں شامل کریں
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,شپنگ کے اخراجات شامل کرنے کے لئے رولز.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,انے والی تقریبات
 DocType: Item,Opening Stock,اسٹاک کھولنے
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,کسٹمر کی ضرورت ہے
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} واپسی کے لئے لازمی ہے
 DocType: Purchase Order,To Receive,وصول کرنے کے لئے
 apps/erpnext/erpnext/public/js/setup_wizard.js +195,user@example.com,user@example.com
-DocType: Email Digest,Income / Expense,آمدنی / اخراجات
 DocType: Employee,Personal Email,ذاتی ای میل
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,کل تغیر
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.",فعال ہے تو، نظام خود کار طریقے کی انوینٹری کے لئے اکاؤنٹنگ اندراجات پوسٹ کریں گے.
@@ -3226,13 +3266,14 @@
 DocType: Customer,From Lead,لیڈ سے
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,احکامات کی پیداوار کے لئے جاری.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,مالی سال منتخب کریں ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,POS Profile required to make POS Entry,پی او ایس پی او ایس پروفائل اندراج کرنے کے لئے کی ضرورت ہے
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +509,POS Profile required to make POS Entry,پی او ایس پی او ایس پروفائل اندراج کرنے کے لئے کی ضرورت ہے
 DocType: Program Enrollment Tool,Enroll Students,طلباء اندراج کریں
 DocType: Hub Settings,Name Token,نام ٹوکن
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,سٹینڈرڈ فروخت
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Atleast one warehouse is mandatory,کم سے کم ایک گودام لازمی ہے
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +129,Atleast one warehouse is mandatory,کم سے کم ایک گودام لازمی ہے
 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 +330,{0} against Sales Invoice {1},{0} فروخت انوائس کے خلاف {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,پراجیکٹ کا نام
@@ -3253,10 +3294,11 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,پتے 0.5 ملٹی میں مختص ہونا ضروری ہے
 DocType: Production Order,Operation Cost,آپریشن کی لاگت
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,ایک CSV فائل سے حاضری اپ لوڈ کریں
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,بقایا AMT
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,مقرر مقاصد آئٹم گروپ وار اس کی فروخت کے شخص کے لئے.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],جھروکے سٹاکس بڑی عمر کے مقابلے [دنوں]
-apps/erpnext/erpnext/controllers/accounts_controller.py +528,Row #{0}: Asset is mandatory for fixed asset purchase/sale,صف # {0}: اثاثہ فکسڈ اثاثہ خرید / فروخت کے لئے لازمی ہے
+apps/erpnext/erpnext/controllers/accounts_controller.py +531,Row #{0}: Asset is mandatory for fixed asset purchase/sale,صف # {0}: اثاثہ فکسڈ اثاثہ خرید / فروخت کے لئے لازمی ہے
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.",دو یا زیادہ قیمتوں کا تعین قواعد مندرجہ بالا شرائط پر مبنی پایا جاتا ہے تو، ترجیح کا اطلاق ہوتا ہے. ڈیفالٹ قدر صفر (خالی) ہے جبکہ ترجیح 20 0 درمیان ایک بڑی تعداد ہے. زیادہ تعداد ایک ہی شرائط کے ساتھ ایک سے زیادہ قیمتوں کا تعین قوانین موجود ہیں تو یہ مقدم لے جائے گا کا مطلب ہے.
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,مالی سال: {0} نہیں موجود
 DocType: Currency Exchange,To Currency,سینٹ کٹس اور نیوس
@@ -3273,14 +3315,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,نجی ایکوئٹی
 DocType: Maintenance Visit,Customer Feedback,کسٹمر آپ کی رائے
 DocType: Account,Expense,اخراجات
-DocType: Sales Invoice,Exhibition,نمائش
 apps/erpnext/erpnext/utilities/doctype/address/address.py +77,"Company is mandatory, as it is your company address",یہ آپ کی کمپنی ایڈریس ہے کے طور پر کمپنی، لازمی ہے
 DocType: Item Attribute,From Range,رینج سے
 apps/erpnext/erpnext/stock/utils.py +99,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 +28,Jobs,نوکریاں
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,نوکریاں
 ,Sales Order Trends,سیلز آرڈر رجحانات
 DocType: Employee,Held On,مقبوضہ پر
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,پیداوار آئٹم
@@ -3289,16 +3331,16 @@
 DocType: Stock Entry Detail,Additional Cost,اضافی لاگت
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,مالی سال کی آخری تاریخ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher",واؤچر نمبر کی بنیاد پر فلٹر کر سکتے ہیں، واؤچر کی طرف سے گروپ ہے
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +763,Make Supplier Quotation,پردایک کوٹیشن بنائیں
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,Make Supplier Quotation,پردایک کوٹیشن بنائیں
 DocType: Quality Inspection,Incoming,موصولہ
 DocType: BOM,Materials Required (Exploded),مواد (دھماکے) کی ضرورت
 apps/erpnext/erpnext/public/js/setup_wizard.js +185,"Add users to your organization, other than yourself",اپنے آپ کے علاوہ، آپ کی تنظیم کے صارفین کو شامل کریں
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,Row # {0}: Serial No {1} does not match with {2} {3},صف # {0}: سیریل نمبر {1} کے ساتھ مطابقت نہیں ہے {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +42,Casual Leave,آرام دہ اور پرسکون کی رخصت
+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,آرام دہ اور پرسکون کی رخصت
 DocType: Batch,Batch ID,بیچ کی شناخت
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,Note: {0},نوٹ: {0}
 ,Delivery Note Trends,ترسیل کے نوٹ رجحانات
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +103,This Week's Summary,اس ہفتے کے خلاصے
+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} صرف اسٹاک معاملات کے ذریعے اپ ڈیٹ کیا جا سکتا ہے
 DocType: Student Group Creation Tool,Get Courses,کورسز حاصل کریں
 DocType: GL Entry,Party,پارٹی
@@ -3308,7 +3350,7 @@
 DocType: Request for Quotation Item,Request for Quotation Item,کوٹیشن آئٹم کے لئے درخواست
 DocType: Purchase Order,To Bill,بل میں
 DocType: Material Request,% Ordered,٪سامان آرڈرھوگیا
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Piecework,Piecework
+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: Task,Actual Time (in Hours),(گھنٹوں میں) اصل وقت
 DocType: Employee,History In Company,کمپنی کی تاریخ
@@ -3325,7 +3367,7 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +350,{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 +162,Black,سیاہ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Black,سیاہ
 DocType: BOM Explosion Item,BOM Explosion Item,BOM دھماکہ آئٹم
 DocType: Account,Auditor,آڈیٹر
 DocType: Cheque Print Template,Distance from top edge,اوپر کے کنارے سے فاصلہ
@@ -3334,13 +3376,13 @@
 DocType: Pricing Rule,Disable,غیر فعال کریں
 DocType: Project Task,Pending Review,زیر جائزہ
 DocType: Task,Total Expense Claim (via Expense Claim),(خرچ دعوی ذریعے) کل اخراجات کا دعوی
-apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +69,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,مارک غائب
 DocType: Journal Entry Account,Exchange Rate,زر مبادلہ کی شرح
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Sales Order {0} is not submitted,سیلز آرڈر {0} پیش نہیں ہے
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +527,Sales Order {0} is not submitted,سیلز آرڈر {0} پیش نہیں ہے
 DocType: Homepage,Tag Line,ٹیگ لائن
 DocType: Fee Component,Fee Component,فیس اجزاء
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +857,Add items from,سے اشیاء شامل کریں
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +836,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: Cheque Print Template,Regular,باقاعدگی سے
 DocType: BOM,Last Purchase Rate,آخری خریداری کی شرح
@@ -3348,6 +3390,7 @@
 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} کے بعد مختلف حالتوں ہے
 ,Sales Person-wise Transaction Summary,فروخت شخص وار ٹرانزیکشن کا خلاصہ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +60,Cost Center is required for 'Profit and Loss' account {0}. Please set up a default Cost Center for the Company.,لاگت سینٹر &#39;فائدہ اور نقصان&#39; اکاؤنٹ {0} کے لئے ضروری ہے. کمپنی کے لئے ایک پہلے سے طے شدہ لاگت سینٹر قائم کی مہربانی.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,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,ماہانہ تقسیم فی صد
@@ -3358,12 +3401,12 @@
 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 +710,Online,آن لائن
+apps/erpnext/erpnext/accounts/page/pos/pos.js +692,Online,آن لائن
 ,Available Stock for Packing Items,پیکنگ اشیاء کے لئے دستیاب اسٹاک
 DocType: Item Variant,Item Variant,آئٹم مختلف
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,کوئی دوسرے پہلے سے طے شدہ ہے کے طور پر پہلے سے طے شدہ طور پر اس ایڈریس سانچے کی ترتیب
+apps/erpnext/erpnext/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'",پہلے سے ڈیبٹ میں اکاؤنٹ بیلنس، آپ کو کریڈٹ &#39;کے طور پر کی بیلنس ہونا چاہئے&#39; قائم کرنے کی اجازت نہیں کر رہے ہیں
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Quality Management,معیار منظم رکھنا
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,معیار منظم رکھنا
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,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,ملازم بیرونی کام کی تاریخ
@@ -3385,11 +3428,12 @@
 DocType: Student,Student Email ID,Student کی ای میل آئی ڈی
 DocType: Employee,Notice (days),نوٹس (دن)
 DocType: Tax Rule,Sales Tax Template,سیلز ٹیکس سانچہ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1520,Select items to save the invoice,انوائس کو بچانے کے لئے اشیاء کو منتخب کریں
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1544,Select items to save the invoice,انوائس کو بچانے کے لئے اشیاء کو منتخب کریں
 DocType: Employee,Encashment Date,معاوضہ تاریخ
 DocType: Account,Stock Adjustment,اسٹاک ایڈجسٹمنٹ
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},پہلے سے طے شدہ سرگرمی لاگت سرگرمی کی قسم کے لئے موجود ہے - {0}
 DocType: Production Order,Planned Operating Cost,منصوبہ بندی کی آپریٹنگ لاگت
+DocType: Academic Term,Term Start Date,ٹرم شروع کرنے کی تاریخ
 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,درخواست گزار کا نام
@@ -3419,17 +3463,17 @@
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,گودام (ہمیشہ انوینٹری) کے لئے اکاؤنٹ اس اکاؤنٹ کے تحت پیدا کیا جائے گا.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +119,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,اسٹاک بہی اندراج یہ گودام کے لئے موجود ہے کے طور پر گودام خارج نہیں کیا جا سکتا.
 DocType: Company,Distribution,تقسیم
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +8,Amount Paid,رقم ادا کر دی
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Project Manager,پروجیکٹ مینیجر
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,رقم ادا کر دی
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,پروجیکٹ مینیجر
 ,Quoted Item Comparison,نقل آئٹم موازنہ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Dispatch,ڈسپیچ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,ڈسپیچ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,شے کے لئے کی اجازت زیادہ سے زیادہ ڈسکاؤنٹ: {0} {1}٪ ہے
 apps/erpnext/erpnext/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.,مقرر کریڈٹ کی حد سے تجاوز ہے کہ لین دین پیش کرنے کی اجازت ہے کہ کردار.
-DocType: Sales Invoice,Supplier Reference,پردایک حوالہ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +844,"Master data syncing, it might take some time",ماسٹر ڈیٹا مطابقت پذیری، اس میں کچھ وقت لگ سکتا ہے
+apps/erpnext/erpnext/accounts/page/pos/pos.js +832,"Master data syncing, it might take some time",ماسٹر ڈیٹا مطابقت پذیری، اس میں کچھ وقت لگ سکتا ہے
 DocType: Item,Material Issue,مواد مسئلہ
 DocType: Hub Settings,Seller Description,فروش تفصیل
 DocType: Employee Education,Qualification,اہلیت
@@ -3442,7 +3486,7 @@
 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 +83,Error in formula or condition,فارمولا یا حالت میں خرابی
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,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,تمام کو غیر منتخب
@@ -3451,7 +3495,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},تاریخ مالی سال کے اندر اندر ہونا چاہئے. = تاریخ کے فرض {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc",یہاں آپ کو وغیرہ اونچائی، وزن، یلرجی، طبی خدشات کو برقرار رکھنے کے کر سکتے ہیں
 DocType: Leave Block List,Applies to Company,کمپنی پر لاگو ہوتا ہے
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +197,Cannot cancel because submitted Stock Entry {0} exists,پیش اسٹاک انٹری {0} موجود ہے کیونکہ منسوخ نہیں کر سکتے
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +198,Cannot cancel because submitted Stock Entry {0} exists,پیش اسٹاک انٹری {0} موجود ہے کیونکہ منسوخ نہیں کر سکتے
 DocType: Purchase Invoice,In Words,الفاظ میں
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,Today is {0}'s birthday!,آج {0} کی سالگرہ ہے!
 DocType: Production Planning Tool,Material Request For Warehouse,گودام کے لئے مواد کی درخواست
@@ -3463,11 +3507,12 @@
 ,Asset Depreciations and Balances,ایسیٹ Depreciations اور توازن
 DocType: Sales Invoice,Get Advances Received,پیشگی موصول ہو جاؤ
 DocType: Email Digest,Add/Remove Recipients,وصول کنندگان کو ہٹا دیں شامل کریں /
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +432,Transaction not allowed against stopped Production Order {0},ٹرانزیکشن روک پیداوار کے خلاف کی اجازت نہیں آرڈر {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +437,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 +143,Join,شامل ہوں
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,کمی کی مقدار
-apps/erpnext/erpnext/stock/doctype/item/item.py +652,Item variant {0} exists with same attributes,آئٹم ویرینٹ {0} اسی صفات کے ساتھ موجود
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,آئٹم ویرینٹ {0} اسی صفات کے ساتھ موجود
+DocType: Leave Application,LAP/,LAP /
 DocType: Salary Slip,Salary 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,"تاریخ"" کئ ضرورت ہے To"""
@@ -3475,12 +3520,12 @@
 DocType: Sales Invoice Item,Sales Order Item,سیلز آرڈر آئٹم
 DocType: Salary Slip,Payment Days,ادائیگی دنوں
 DocType: Customer,Dormant,امن
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +212,Warehouses with child nodes cannot be converted to ledger,بچے نوڈس کے ساتھ گوداموں لیجر میں تبدیل نہیں کیا جا سکتا
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +215,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/public/js/controllers/transaction.js +866,It is needed to fetch Item Details.,یہ شے کی تفصیلات بازیافت کرنے کی ضرورت ہے.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +857,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} پہلے سے حاصل کیا گیا ہے
@@ -3490,14 +3535,14 @@
 DocType: Expense Claim,Total Claimed Amount,کل دعوی رقم
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,فروخت کے لئے ممکنہ مواقع.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,Invalid {0},غلط {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Sick Leave,بیماری کی چھٹی
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,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,ڈیپارٹمنٹ سٹور
 DocType: Warehouse,PIN,PIN
 DocType: Sales Invoice,Base Change Amount (Company Currency),بیس بدلیں رقم (کمپنی کرنسی)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +313,No accounting entries for the following warehouses,مندرجہ ذیل گوداموں کے لئے کوئی اکاؤنٹنگ اندراجات
-apps/erpnext/erpnext/projects/doctype/project/project.js +102,Save the document first.,پہلی دستاویز کو بچانے کے.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +314,No accounting entries for the following warehouses,مندرجہ ذیل گوداموں کے لئے کوئی اکاؤنٹنگ اندراجات
+apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,پہلی دستاویز کو بچانے کے.
 DocType: Account,Chargeable,ادائیگی
 DocType: Company,Change Abbreviation,پیج مخفف
 DocType: Expense Claim Detail,Expense Date,اخراجات تاریخ
@@ -3510,10 +3555,9 @@
 DocType: Purchase Invoice,Recurring Print Format,مکرر پرنٹ کی شکل
 DocType: C-Form,Series,سیریز
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,Expected Delivery Date cannot be before Purchase Order Date,متوقع تاریخ کی ترسیل خریداری کے آرڈر کی تاریخ سے پہلے نہیں ہو سکتا
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} سیٹ اپ&gt; ترتیبات کے ذریعے&gt; نام دینے سیریز کے لئے نام دینے سیریز مقرر کریں
 DocType: Appraisal,Appraisal Template,تشخیص سانچہ
 DocType: Item Group,Item Classification,آئٹم کی درجہ بندی
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Business Development Manager,بزنس ڈیولپمنٹ مینیجر
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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,جنرل لیجر
@@ -3523,8 +3567,8 @@
 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 +940,Please select {0} first,پہلے {0} براہ مہربانی منتخب کریں
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +749,Batch {0} of Item {1} has expired.,آئٹم کے بیچ {0} {1} ختم ہو گیا ہے.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +953,Please select {0} first,پہلے {0} براہ مہربانی منتخب کریں
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +757,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,ذیلی کل
@@ -3541,8 +3585,8 @@
 {% 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 +92,Warehouse not found in the system,گودام کے نظام میں نہیں ملا
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +106,This Month's Summary,اس ماہ کے خلاصے
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,گودام کے نظام میں نہیں ملا
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,اس ماہ کے خلاصے
 DocType: Quality Inspection Reading,Quality Inspection Reading,معیار معائنہ پڑھنا
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`جھروکے سٹاکس پرانے Than`٪ d دن سے چھوٹا ہونا چاہئے.
 DocType: Tax Rule,Purchase Tax Template,ٹیکس سانچہ خریداری
@@ -3552,21 +3596,21 @@
 DocType: Item Customer Detail,Ref Code,ممبران کوڈ
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,ملازم کے ریکارڈ.
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Please set Next Depreciation Date,مقرر مہربانی اگلا ہراس تاریخ
-DocType: Payment Gateway,Payment Gateway,ادائیگی کے گیٹ وے
 DocType: HR Settings,Payroll Settings,پے رول کی ترتیبات
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,غیر منسلک انوائس اور ادائیگی ملاپ.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,حکم صادر کریں
+DocType: Email Digest,New Purchase Orders,نئی خریداری کے آرڈر
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,روٹ والدین لاگت مرکز نہیں کر سکتے ہیں
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Brand...,منتخب برانڈ ہے ...
 apps/erpnext/erpnext/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 +378,Operation Time must be greater than 0 for Operation {0},آپریشن کے وقت کے آپریشن کے لئے زیادہ سے زیادہ 0 ہونا ضروری ہے {0}
+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/accounts/doctype/account/account.py +170,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)
 DocType: Program,Program Abbreviation,پروگرام کا مخفف
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,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: Appraisal,Start Date,شروع کرنے کی تاریخ
@@ -3582,8 +3626,9 @@
 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,الزامات اس شے پر لاگو نہیں ہے تو ہم شے کو ہٹا دیں
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,مثال کے طور پر. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +27,Transaction currency must be same as Payment Gateway currency,ٹرانزیکشن کی کرنسی ادائیگی کے گیٹ وے کرنسی کے طور پر ایک ہی ہونا چاہیے
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Transaction currency must be same as Payment Gateway currency,ٹرانزیکشن کی کرنسی ادائیگی کے گیٹ وے کرنسی کے طور پر ایک ہی ہونا چاہیے
 DocType: Payment Entry,Receive,وصول
+apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,کوٹیشن:
 DocType: Maintenance Visit,Fully Completed,مکمل طور پر مکمل
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}٪ مکمل
 DocType: Employee,Educational Qualification,تعلیمی اہلیت
@@ -3592,10 +3637,10 @@
 DocType: Purchase Invoice,Submit on creation,تخلیق پر جمع کرائیں
 DocType: Asset,Disposal Date,ڈسپوزل تاریخ
 DocType: Employee Leave Approver,Employee Leave Approver,ملازم کی رخصت کی منظوری دینے والا
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row {0}: An Reorder entry already exists for this warehouse {1},صف {0}: ایک ترتیب اندراج پہلے ہی اس گودام کے لئے موجود ہے {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +495,Row {0}: An Reorder entry already exists for this warehouse {1},صف {0}: ایک ترتیب اندراج پہلے ہی اس گودام کے لئے موجود ہے {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +79,"Cannot declare as lost, because Quotation has been made.",کوٹیشن بنا دیا گیا ہے کیونکہ، کے طور پر کھو نہیں بتا سکتے.
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,خریداری ماسٹر مینیجر
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +429,Production Order {0} must be submitted,آرڈر {0} پیش کرنا ضروری ہے پیداوار
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +434,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
@@ -3604,24 +3649,26 @@
 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 +181,Totals,کل
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,کل
 DocType: BOM,Manufacturing,مینوفیکچرنگ
 ,Ordered Items To Be Delivered,کو حکم دیا اشیاء فراہم کرنے کے لئے
 DocType: Account,Income,انکم
 DocType: Industry Type,Industry Type,صنعت کی قسم
 apps/erpnext/erpnext/templates/includes/cart.js +141,Something went wrong!,کچھ غلط ہو گیا!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,Warning: Leave application contains following block dates,انتباہ: چھوڑ درخواست مندرجہ ذیل بلاک تاریخوں پر مشتمل ہے
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +120,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} اس ٹرانزیکشن مکمل کرنے کے یونٹوں.
+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 +181,Organization unit (department) master.,تنظیمی اکائی (محکمہ) ماسٹر.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,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 +793,All records are synced.,تمام ریکارڈ موافقت پذیر ہیں.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +781,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,لاگت مرکز نام
@@ -3640,21 +3687,20 @@
 DocType: Address,Name of person or organization that this address belongs to.,اس ایڈریس سے تعلق رکھتا ہے اس شخص یا تنظیم کا نام.
 apps/erpnext/erpnext/public/js/setup_wizard.js +260,Your Suppliers,اپنے سپلائرز
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +49,Cannot set as Lost as Sales Order is made.,سیلز آرڈر بنایا گیا ہے کے طور پر کھو کے طور پر مقرر کر سکتے ہیں.
-DocType: Student Applicant,Mother's Name,ماں کے نام
 DocType: Request for Quotation Item,Supplier Part No,پردایک حصہ نہیں
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +348,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 +326,Received From,کی طرف سے موصول
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Received From,کی طرف سے موصول
 DocType: Lead,Converted,تبدیل
 DocType: Item,Has Serial No,سیریل نہیں ہے
 DocType: Employee,Date of Issue,تاریخ اجراء
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: سے {0} کے لئے {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +153,Row #{0}: Set Supplier for item {1},صف # {0}: شے کے لئے مقرر پردایک {1}
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +93,Row {0}: Hours value must be greater than zero.,صف {0}: گھنٹے قدر صفر سے زیادہ ہونا چاہیے.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +117,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} سے منسلک نہیں مل سکتا
 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 +172,{0} {1} does not exist,{0} {1} کا کوئی وجود نہیں
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +175,{0} {1} does not exist,{0} {1} کا کوئی وجود نہیں
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,Please check Multi Currency option to allow accounts with other currency,دوسری کرنسی کے ساتھ اکاؤنٹس کی اجازت دینے ملٹی کرنسی آپشن کو چیک کریں براہ مہربانی
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +72,Item: {0} does not exist in the system,آئٹم: {0} نظام میں موجود نہیں ہے
 apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,آپ منجمد قیمت مقرر کرنے کی اجازت نہیں ہے
@@ -3663,13 +3709,14 @@
 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/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,حاضری مستقبل کی تاریخوں کے لئے نشان لگا دیا گیا نہیں کیا جا سکتا
 DocType: Pricing Rule,Pricing Rule Help,قیمتوں کا تعین حکمرانی کی مدد
 DocType: Purchase Taxes and Charges,Account Head,اکاؤنٹ ہیڈ
 apps/erpnext/erpnext/config/stock.py +163,Update additional costs to calculate landed cost of items,اشیاء کی قیمت کا حساب کرنے اترا اضافی اخراجات کو اپ ڈیٹ کریں
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Electrical,الیکٹریکل
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Electrical,الیکٹریکل
 DocType: Stock Entry,Total Value Difference (Out - In),کل قیمت فرق (باہر - میں)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,Row {0}: Exchange Rate is mandatory,صف {0}: زر مبادلہ کی شرح لازمی ہے
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},صارف ID ملازم کے لئے مقرر نہیں {0}
@@ -3677,7 +3724,7 @@
 DocType: Item,Customer Code,کسٹمر کوڈ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +210,Birthday Reminder for {0},کے لئے سالگرہ کی یاد دہانی {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,آخری آرڈر کے بعد دن
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +292,Debit To account must be a Balance Sheet account,اکاؤنٹ ڈیبٹ ایک بیلنس شیٹ اکاؤنٹ ہونا ضروری ہے
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To account must be a Balance Sheet account,اکاؤنٹ ڈیبٹ ایک بیلنس شیٹ اکاؤنٹ ہونا ضروری ہے
 DocType: Buying Settings,Naming Series,نام سیریز
 DocType: Leave Block List,Leave Block List Name,بلاک کریں فہرست کا نام چھوڑ دو
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,اسٹاک اثاثوں
@@ -3690,9 +3737,9 @@
 DocType: Notification Control,Sales Invoice Message,فروخت انوائس پیغام
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,اکاؤنٹ {0} بند قسم ذمہ داری / اکوئٹی کا ہونا ضروری ہے
 DocType: Sales Order Item,Ordered Qty,کا حکم دیا مقدار
-apps/erpnext/erpnext/stock/doctype/item/item.py +673,Item {0} is disabled,آئٹم {0} غیر فعال ہے
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} is disabled,آئٹم {0} غیر فعال ہے
 DocType: Stock Settings,Stock Frozen Upto,اسٹاک منجمد تک
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +838,BOM does not contain any stock item,BOM کسی بھی اسٹاک شے پر مشتمل نہیں ہے
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +809,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,تنخواہ تخم پیدا
@@ -3700,47 +3747,47 @@
 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 +485,Row #{0}: Please set reorder quantity,صف # {0}: ترتیب مقدار مقرر کریں
+DocType: Sales Invoice Timesheet,Billing Hours,بلنگ کے اوقات
+apps/erpnext/erpnext/stock/doctype/item/item.py +487,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 +62,Please set {0},مقرر کریں {0}
 DocType: Purchase Invoice,Repeat on Day of Month,مہینے کا دن پر دہرائیں
 DocType: Employee,Health Details,صحت کی تفصیلات
 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,اوپر منتخب شدہ معیار کے لئے تمام تنخواہ تخم جمع کرائیں
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} اشیا موافقت پذیر
 DocType: Sales Order,Partly Delivered,جزوی طور پر ہونے والا
-DocType: Sales Invoice,Existing Customer,موجودہ گاہک
 DocType: Email Digest,Receivables,وصولی
+DocType: Lead Source,Lead Source,لیڈ ماخذ
 DocType: Customer,Additional information regarding the customer.,کسٹمر کے بارے میں اضافی معلومات.
 DocType: Quality Inspection Reading,Reading 5,5 پڑھنا
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +38,Campaign Name is required,مہم کا نام کی ضرورت ہے
 DocType: Maintenance Visit,Maintenance Date,بحالی کی تاریخ
 DocType: Purchase Invoice Item,Rejected Serial No,مسترد سیریل نمبر
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},شے کے لئے ختم ہونے کی تاریخ سے کم ہونا چاہئے شروع کرنے کی تاریخ {0}
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.",مثال: سیریز مقرر کیا گیا ہے اور سیریل کوئی لین دین میں ذکر نہیں کیا جاتا ہے تو ABCD #####، پھر خود کار طریقے سے سیریل نمبر اس سیریز کی بنیاد پر پیدا کیا جائے گا. آپ کو ہمیشہ واضح طور پر اس شے کے لئے سیریل نمبر کا ذکر کرنا چاہتے ہیں. خالی چھوڑ دیں.
 DocType: Upload Attendance,Upload Attendance,اپ لوڈ کریں حاضری
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +129,BOM and Manufacturing Quantity are required,BOM اور مینوفیکچرنگ مقدار کی ضرورت ہے
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,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,زیادہ سے زیادہ طاقت
-DocType: Bank Reconciliation Detail,Amount,رقم
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM تبدیل
 ,Sales Analytics,سیلز تجزیات
 DocType: Manufacturing Settings,Manufacturing Settings,مینوفیکچرنگ کی ترتیبات
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,ای میل کے قیام
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +96,Please enter default currency in Company Master,کمپنی ماسٹر میں پہلے سے طے شدہ کرنسی داخل کریں
 DocType: Stock Entry Detail,Stock Entry Detail,اسٹاک انٹری تفصیل
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +100,Daily Reminders,ڈیلی یاددہانی
+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/account/account_tree.js +23,New Account Name,نئے اکاؤنٹ کا نام
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,خام مال فراہم لاگت
 DocType: Selling Settings,Settings for Selling Module,ماڈیول فروخت کے لئے ترتیبات
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Customer Service,کسٹمر سروس
+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/config/hr.py +50,Offer candidate a Job.,پیشکش امیدوار ایک ملازمت.
@@ -3749,8 +3796,9 @@
 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} اسٹاک آئٹم ہونا ضروری ہے
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,پیش رفت گودام میں پہلے سے طے شدہ کام
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1570,Total nos of serial no is not equal to quantity.,سیریل نمبر کی کل تعداد کی مقدار کے برابر نہیں ہے.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1594,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,اپ ڈیٹ سلسلہ نمبر
@@ -3758,9 +3806,10 @@
 DocType: Sales Order,Printing Details,پرنٹنگ تفصیلات
 DocType: Task,Closing Date,آخری تاریخ
 DocType: Sales Order Item,Produced Quantity,تیار مقدار
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Engineer,انجینئر
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Engineer,انجینئر
+DocType: Journal Entry,Total Amount Currency,کل رقم ست
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,تلاش ذیلی اسمبلی
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Item Code required at Row No {0},آئٹم کوڈ صف کوئی ضرورت {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +398,Item Code required at Row No {0},آئٹم کوڈ صف کوئی ضرورت {0}
 DocType: Sales Partner,Partner Type,پارٹنر کی قسم
 DocType: Purchase Taxes and Charges,Actual,اصل
 DocType: Authorization Rule,Customerwise Discount,Customerwise ڈسکاؤنٹ
@@ -3776,16 +3825,18 @@
 DocType: BOM,Raw Material Cost,خام مواد کی لاگت
 DocType: Item Reorder,Re-Order Level,دوبارہ آرڈر کی سطح
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,آپ کی پیداوار کے احکامات کو بڑھانے یا تجزیہ کے لئے خام مال، اتارنا کرنا چاہتے ہیں جس کے لئے اشیاء اور منصوبہ بندی کی مقدار درج کریں.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +55,Part-time,پارٹ ٹائم
+apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,Gantt چارٹ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,پارٹ ٹائم
 DocType: Employee,Applicable Holiday List,قابل اطلاق چھٹیوں فہرست
 DocType: Employee,Cheque,چیک
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,سیریز کو اپ ڈیٹ
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +57,Series Updated,سیریز کو اپ ڈیٹ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,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 +87,Clearance Date updated,کلیئرنس کی تاریخ اپ ڈیٹ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,کامیابی سے Reconciled
@@ -3799,7 +3850,7 @@
 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 +513,Posting date and posting time is mandatory,تاریخ پوسٹنگ اور وقت پوسٹنگ لازمی ہے
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,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.,آپ کی خریداری آرڈر کو بچانے کے ایک بار الفاظ میں نظر آئے گا.
@@ -3808,7 +3859,7 @@
 DocType: Task,Review Date,جائزہ تاریخ
 DocType: Purchase Invoice,Advance Payments,ایڈوانس ادائیگی
 DocType: Purchase Taxes and Charges,On Net Total,نیٹ کل پر
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +158,Target warehouse in row {0} must be same as Production Order,{0} قطار میں ہدف گودام پروڈکشن آرڈر کے طور پر ایک ہی ہونا چاہیے
+apps/erpnext/erpnext/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,کرنسی کسی دوسرے کرنسی استعمال اندراجات کرنے کے بعد تبدیل کر دیا گیا نہیں کیا جا سکتا
 DocType: Company,Round Off Account,اکاؤنٹ گول
@@ -3817,23 +3868,22 @@
 DocType: Customer Group,Parent Customer Group,والدین گاہک گروپ
 DocType: Purchase Invoice,Contact Email,رابطہ ای میل
 DocType: Appraisal Goal,Score Earned,سکور حاصل کی
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Notice Period,نوٹس کی مدت
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,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 +4,New Sales Person Name,نیا سیلز شخص کا نام
 DocType: Packing Slip,Gross Weight UOM,مجموعی وزن UOM
-DocType: Email Digest,Receivables / Payables,وصولی / Payables
 DocType: Delivery Note Item,Against Sales Invoice,فروخت انوائس کے خلاف
 DocType: Bin,Reserved Qty for Production,پیداوار کے لئے مقدار محفوظ ہیں-
 DocType: Asset,Frequency of Depreciation (Months),فرسودگی کے تعدد (مہینے)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +469,Credit Account,کریڈٹ اکاؤنٹ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Credit Account,کریڈٹ اکاؤنٹ
 DocType: Landed Cost Item,Landed Cost Item,لینڈڈ شے کی قیمت
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +55,Show zero values,صفر اقدار دکھائیں
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,صفر اقدار دکھائیں
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,شے کی مقدار خام مال کی دی گئی مقدار سے repacking / مینوفیکچرنگ کے بعد حاصل
 apps/erpnext/erpnext/public/js/setup_wizard.js +315,Setup a simple website for my organization,سیٹ اپ میری تنظیم کے لئے ایک سادہ ویب سائٹ
 DocType: Payment Reconciliation,Receivable / Payable Account,وصولی / قابل ادائیگی اکاؤنٹ
 DocType: Delivery Note Item,Against Sales Order Item,سیلز آرڈر آئٹم خلاف
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Please specify Attribute Value for attribute {0},وصف کے لئے قدر وصف کی وضاحت کریں {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},وصف کے لئے قدر وصف کی وضاحت کریں {0}
 DocType: Item,Default Warehouse,پہلے سے طے شدہ گودام
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +39,Budget cannot be assigned against Group Account {0},بجٹ گروپ کے اکاؤنٹ کے خلاف مقرر نہیں کیا جا سکتا {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,والدین لاگت مرکز درج کریں
@@ -3855,19 +3905,22 @@
 DocType: Journal Entry,Total Debit,کل ڈیبٹ
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,پہلے سے طے شدہ تیار مال گودام
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,فروخت شخص
-DocType: Sales Invoice,Cold Calling,سرد کالنگ
 DocType: SMS Parameter,SMS Parameter,ایس ایم ایس پیرامیٹر
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,بجٹ اور لاگت سینٹر
 DocType: Maintenance Schedule Item,Half Yearly,چھماہی
 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 +253,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 +141,Set as Lost,رکن کی نمائندہ تصویر کے طور پر مقرر
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,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 +5,This is based on transactions against this Customer. See timeline below for details,یہ کسٹمر کے خلاف لین دین کی بنیاد پر ہے. تفصیلات کے لئے نیچے ٹائم لائن ملاحظہ کریں
 DocType: Supplier,Credit Days Based On,کریڈٹ دنوں کی بنیاد
@@ -3878,11 +3931,10 @@
 ,Items To Be Requested,اشیا درخواست کی جائے
 DocType: Purchase Order,Get Last Purchase Rate,آخری خریداری کی شرح حاصل
 DocType: Company,Company Info,کمپنی کی معلومات
-apps/erpnext/erpnext/accounts/page/pos/pos.js +941,Select or add new customer,منتخب یا نئے گاہک شامل
+apps/erpnext/erpnext/accounts/page/pos/pos.js +930,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 +5,This is based on the attendance of this Employee,یہ اس ملازم کی حاضری پر مبنی ہے
-DocType: Sales Invoice,Frequency,ریڈیو فریکوئینسی
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +463,Debit Account,ڈیبٹ اکاؤنٹ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Debit Account,ڈیبٹ اکاؤنٹ
 DocType: Fiscal Year,Year Start Date,سال شروع کرنے کی تاریخ
 DocType: Attendance,Employee Name,ملازم کا نام
 DocType: Sales Invoice,Rounded Total (Company Currency),مدور کل (کمپنی کرنسی)
@@ -3892,7 +3944,7 @@
 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 +90,End Year cannot be before Start Year,اختتام سال شروع سال سے پہلے نہیں ہو سکتا
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Employee Benefits,ملازم فوائد
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,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,تیار مقدار
@@ -3900,16 +3952,16 @@
 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 +499,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},صف کوئی {0}: رقم خرچ دعوی {1} کے خلاف زیر التواء رقم سے زیادہ نہیں ہو سکتا. زیر التواء رقم ہے {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +500,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},صف کوئی {0}: رقم خرچ دعوی {1} کے خلاف زیر التواء رقم سے زیادہ نہیں ہو سکتا. زیر التواء رقم ہے {2}
 DocType: Maintenance Schedule,Schedule,شیڈول
 DocType: Account,Parent Account,والدین کے اکاؤنٹ
 DocType: Quality Inspection Reading,Reading 3,3 پڑھنا
 ,Hub,حب
 DocType: GL Entry,Voucher Type,واؤچر کی قسم
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1007,Price List not found or disabled,قیمت کی فہرست پایا یا معذور نہیں
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1008,Price List not found or disabled,قیمت کی فہرست پایا یا معذور نہیں
 DocType: Expense Claim,Approved,منظور
 DocType: Pricing Rule,Price,قیمت
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +244,Employee relieved on {0} must be set as 'Left',{0} مقرر کیا جانا چاہئے پر فارغ ملازم &#39;بائیں&#39; کے طور پر
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +256,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} مقررہ تاریخ کی حد میں ملازم کے لئے پیدا
@@ -3920,12 +3972,12 @@
 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 +259,Please select Employee Record first.,پہلی ملازم ریکارڈ منتخب کریں.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +266,Please select Employee Record first.,پہلی ملازم ریکارڈ منتخب کریں.
 DocType: POS Profile,Account for Change Amount,رقم تبدیلی کے لئے اکاؤنٹ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +190,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},صف {0}: پارٹی / اکاؤنٹ کے ساتھ میل نہیں کھاتا {1} / {2} میں {3} {4}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +235,Please enter Expense Account,ایکسپینس اکاؤنٹ درج کریں
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,Please enter Expense Account,ایکسپینس اکاؤنٹ درج کریں
 DocType: Account,Stock,اسٹاک
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,"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 +976,"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,خریداری / تیاری تفصیلات
@@ -3940,9 +3992,10 @@
 DocType: Asset Movement,Transaction Date,ٹرانزیکشن کی تاریخ
 DocType: Production Plan Item,Planned Qty,منصوبہ بندی کی مقدار
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,کل ٹیکس
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,For Quantity (Manufactured Qty) is mandatory,مقدار کے لئے (مقدار تیار) لازمی ہے
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,For Quantity (Manufactured Qty) is mandatory,مقدار کے لئے (مقدار تیار) لازمی ہے
 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 +78,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,اصل شروع کرنے کی تاریخ
@@ -3957,7 +4010,8 @@
 DocType: Warranty Claim,If different than customer address,کسٹمر ایڈریس سے مختلف تو
 DocType: BOM Operation,BOM Operation,BOM آپریشن
 DocType: Purchase Taxes and Charges,On Previous Row Amount,پچھلے صف کی رقم پر
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +226,Transfer Asset,منتقلی ایسیٹ
+DocType: Student,Home Address,گھر کا پتہ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +227,Transfer Asset,منتقلی ایسیٹ
 DocType: POS Profile,POS Profile,پی او ایس پروفائل
 apps/erpnext/erpnext/config/schools.py +33,Admission,داخلہ
 apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.",ترتیب بجٹ، اہداف وغیرہ کے لئے seasonality کے
@@ -3969,8 +4023,8 @@
 DocType: Assessment,Room,کمرہ
 DocType: Purchase Order,Advance Paid,ایڈوانس ادا
 DocType: Item,Item Tax,آئٹم ٹیکس
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +765,Material to Supplier,سپلائر مواد
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +189,Excise Invoice,ایکسائز انوائس
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,Material to Supplier,سپلائر مواد
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,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,موجودہ قرضوں
@@ -3980,7 +4034,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,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 +136,Credit Card,کریڈٹ کارڈ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,کریڈٹ کارڈ
 DocType: BOM,Item to be manufactured or repacked,آئٹم تیار یا repacked جائے کرنے کے لئے
 apps/erpnext/erpnext/config/stock.py +174,Default settings for stock transactions.,اسٹاک لین دین کے لئے پہلے سے طے شدہ ترتیبات.
 DocType: Purchase Invoice,Next Date,اگلی تاریخ
@@ -3988,6 +4042,7 @@
 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: Academic Term,Term End Date,اصطلاح آخر تاریخ
 DocType: Hub Settings,Seller Name,فروش نام
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),ٹیکسز اور الزامات کٹوتی (کمپنی کرنسی)
 DocType: Item Group,General Settings,عام ترتیبات
@@ -3999,7 +4054,7 @@
 DocType: Customer,Commission Rate,کمیشن کی شرح
 apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,مختلف بنائیں
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,محکمہ کی طرف سے بلاک چھٹی ایپلی کیشنز.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +115,"Payment Type must be one of Receive, Pay and Internal Transfer",ادائیگی کی قسم، وصول میں سے ایک ہو تنخواہ اور اندرونی منتقلی ضروری ہے
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +118,"Payment Type must be one of Receive, Pay and Internal Transfer",ادائیگی کی قسم، وصول میں سے ایک ہو تنخواہ اور اندرونی منتقلی ضروری ہے
 apps/erpnext/erpnext/config/selling.py +169,Analytics,تجزیات
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,ٹوکری خالی ہے
 DocType: Production Order,Actual Operating Cost,اصل آپریٹنگ لاگت
@@ -4014,10 +4069,10 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,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 +92,Designer,ڈیزائنر
+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/accounts/doctype/purchase_invoice/purchase_invoice.py +469,Cost Center is required in row {0} in Taxes table for type {1},قسم کے لئے سرمایہ کاری مرکز کے صف میں کی ضرورت ہے {0} ٹیکس میں میز {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +472,Cost Center is required in row {0} in Taxes table for type {1},قسم کے لئے سرمایہ کاری مرکز کے صف میں کی ضرورت ہے {0} ٹیکس میں میز {1}
 DocType: Program,Program Code,پروگرام کا کوڈ
 ,Item-wise Purchase Register,آئٹم وار خریداری رجسٹر
 DocType: Batch,Expiry Date,خاتمے کی تاریخ
@@ -4027,12 +4082,12 @@
 apps/erpnext/erpnext/config/projects.py +13,Project master.,پروجیکٹ ماسٹر.
 apps/erpnext/erpnext/controllers/status_updater.py +174,"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 +417, (Half Day),آدھا دن
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425, (Half Day),آدھا دن
 DocType: Supplier,Credit Days,کریڈٹ دنوں
 DocType: Leave Type,Is Carry Forward,فارورڈ لے
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +740,Get Items from BOM,BOM سے اشیاء حاصل
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +711,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 +549,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},صف # {0}: تاریخ پوسٹنگ خریداری کی تاریخ کے طور پر ایک ہی ہونا چاہیے {1} اثاثہ کی {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +552,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,دوسرے ایک گودام سے ایک اثاثہ کی منتقلی
diff --git a/erpnext/translations/vi.csv b/erpnext/translations/vi.csv
index e5d13ba..b0ff251 100644
--- a/erpnext/translations/vi.csv
+++ b/erpnext/translations/vi.csv
@@ -18,11 +18,10 @@
 DocType: Sales Partner,Dealer,Đại lý
 DocType: Employee,Rented,Thuê
 DocType: Purchase Order,PO-,tiềm
-apps/erpnext/erpnext/accounts/report/financial_statements.py +19,Start Year {0} not found.,Bắt đầu năm {0} không tìm thấy.
 DocType: POS Profile,Applicable for User,Áp dụng cho User
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +191,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Ngưng tự sản xuất không thể được hủy bỏ, rút nút nó đầu tiên để hủy bỏ"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +197,Do you really want to scrap this asset?,Bạn có thực sự muốn tháo dỡ tài sản này?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +17,Select Default Supplier,Chọn Mặc định Nhà cung cấp
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +192,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Ngưng tự sản xuất không thể được hủy bỏ, rút nút nó đầu tiên để hủy bỏ"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +198,Do you really want to scrap this asset?,Bạn có thực sự muốn tháo dỡ tài sản này?
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Chọn Mặc định Nhà cung cấp
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Tiền tệ là cần thiết cho Danh sách Price {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Sẽ được tính toán trong giao dịch.
 DocType: Address,County,quận
@@ -42,46 +41,45 @@
 DocType: Sales Invoice,Customer Name,Tên khách hàng
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +126,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 +180,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 +183,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 +148,Series Updated Successfully,Loạt Cập nhật thành công
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +149,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ệ
-DocType: Quality Inspection Reading,Parameter,Thông số
 apps/erpnext/erpnext/projects/doctype/project/project.py +54,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 +239,New Leave Application,Để lại ứng dụng mới
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,New Leave Application,Để lại ứng dụng mới
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +20,Attendance Record {0} exists against Student {1} for Course Schedule {2},Attendance Ghi {0} tồn tại đối với Sinh viên {1} cho Lịch học {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Bank Draft,Bank Draft
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,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ể
 DocType: Academic Term,Academic Term,Thời hạn học tập
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +13,Material,Vật chất
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Quantity,Số lượng
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +511,Accounts table cannot be blank.,Bảng tài khoản không được bỏ trống
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +616,Quantity,Số lượng
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +512,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ả)
 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/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 +142,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
-DocType: Purchase Invoice,Monthly,Hàng tháng
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Chậm trễ trong thanh toán (Ngày)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +771,Invoice,Hóa đơn
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +750,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 +198,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} không phù hợp với {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Row # {0}:
+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 +127,Please select Price List,Vui lòng chọn Bảng giá
@@ -112,8 +110,8 @@
 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 +589,Get items from,Lấy dữ liệu từ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +382,Stock cannot be updated against Delivery Note {0},Hàng tồn kho không thể được cập nhật gắn với giấy giao hàng {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Lấy dữ liệu từ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,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
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Cửa hàng tạp hóa
@@ -122,7 +120,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 +156,Salary Structure Missing,Cơ cấu tiền lương Thiếu
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,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
@@ -130,10 +128,11 @@
 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 +156,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/stock/doctype/item/item.py +472,"""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 +189,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"
 DocType: Tax Rule,Tax Type,Loại thuế
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +144,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}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,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/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ế
@@ -143,18 +142,17 @@
 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 +165,Opening,Mở ra
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,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/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ổ
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Chỉ có tài khoản Pay
 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
 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
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Company first,Vui lòng chọn Công ty đầu tiên
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,Please select Company first,Vui lòng chọn Công ty đầu tiên
 DocType: Employee Education,Under Graduate,Dưới đại học
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Mục tiêu trên
 DocType: BOM,Total Cost,Tổng chi phí
@@ -164,7 +162,7 @@
 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
 DocType: Purchase Invoice Item,Is Fixed Asset,Là cố định tài sản
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Available qty is {0}, you need {1}","qty sẵn là {0}, bạn cần {1}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +225,"Available qty is {0}, you need {1}","qty sẵn là {0}, bạn cần {1}"
 DocType: Expense Claim Detail,Claim Amount,Số tiền yêu cầu bồi thường
 DocType: Employee,Mr,Ông
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Loại nhà cung cấp / Nhà cung cấp
@@ -173,26 +171,27 @@
 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: Assessment Result,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 +171,Annual Salary,Mức lương hàng năm
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Annual Salary,Mức lương hàng năm
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Chi phí hàng tồn kho
-apps/erpnext/erpnext/accounts/report/financial_statements.py +22,End Year {0} not found.,Cuối năm {0} không tìm thấy.
 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}
 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 +130,At least one mode of payment is required for POS invoice.,Ít nhất một phương thức thanh toán là cần thiết cho POS hóa đơn.
 DocType: Products Settings,Show Products as a List,Hiện sản phẩm như một List
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Tải file mẫu, điền dữ liệu thích hợp và đính kèm các tập tin sửa đổi.
  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 +451,Item {0} is not active or end of life has been reached,Mục {0} không hoạt động hoặc kết thúc của cuộc sống đã đạt tới
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +456,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/controllers/accounts_controller.py +614,"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/controllers/accounts_controller.py +617,"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 +166,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
@@ -204,13 +203,13 @@
 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 +147,Execution,Thực hiện
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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/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}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,Cost Center {0} does not belong to Company {1},Chi phí bộ phận {0} không thuộc về Công ty {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +100,Cost Center {0} does not belong to Company {1},Chi phí bộ phận {0} không thuộc về Công ty {1}
 DocType: Customer,Individual,Individual
 DocType: Interest,Academics User,Các viện nghiên cứu tài
 DocType: Cheque Print Template,Amount In Figure,Số tiền Trong hình
@@ -226,30 +225,32 @@
 DocType: Production Planning Tool,Sales Orders,Đơn đặt hàng bán hàng
 DocType: Purchase Taxes and Charges,Valuation,Định giá
 ,Purchase Order Trends,Xu hướng mua hàng
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,The request for quotation can be accessed by clicking on the following link,Các yêu cầu báo giá có thể được truy cập bằng cách nhấp vào liên kết sau
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,Phân bổ lá trong năm.
 DocType: SG Creation Tool Course,SG Creation Tool Course,SG học Công cụ tạo
 DocType: Student Group Creation Tool,Leave blank if you wish to fetch all courses for selected academic term,Để trống nếu bạn muốn lấy tất cả các khóa học cho chọn học kỳ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,Insufficient Stock,Cổ đủ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227,Insufficient Stock,Cổ đủ
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Năng suất Disable và Thời gian theo dõi
+DocType: Email Digest,New Sales Orders,Hàng đơn đặt hàng mới
 DocType: Bank Reconciliation,Bank Account,Tài khoản ngân hàng
 DocType: Leave Type,Allow Negative Balance,Cho phép cân đối tiêu cực
 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/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} does not belong to Company {1},Tài khoản {0} không thuộc về Công ty {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +86,Account {0} does not belong to Company {1},Tài khoản {0} không thuộc về Công ty {1}
 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}
 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
 DocType: Course Schedule,Instructor Name,Tên giảng viên
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,For Warehouse is required before Submit,Kho cho là cần thiết trước khi Submit
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,For Warehouse is required before Submit,Kho cho là cần thiết trước khi Submit
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Nhận được Mở
 DocType: Sales Partner,Reseller,Đại lý bán lẻ
 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 +1436,"LocalStorage is full , did not save","Cục bộ là đầy đủ, không lưu"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1460,"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}
@@ -262,18 +263,19 @@
 apps/erpnext/erpnext/templates/generators/item.html +78,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 +5,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/leave_application/leave_application.py +206,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/leave_application/leave_application.py +213,Only the selected Leave Approver can submit this Leave Application,Chỉ chọn Để lại phê duyệt có thể gửi ứng dụng Để lại này
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Giảm ngày phải lớn hơn ngày của Tham gia
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Leaves per Year,Lá mỗi năm
+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 +103,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}
+DocType: Email Digest,Profit & Loss,Mất lợi nhuận
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,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 +435,Leave Blocked,Lại bị chặn
-apps/erpnext/erpnext/stock/doctype/item/item.py +669,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 +443,Leave Blocked,Lại bị chặn
+apps/erpnext/erpnext/stock/doctype/item/item.py +671,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 +83,Annual,Hàng năm
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +86,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
@@ -281,20 +283,22 @@
 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: 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 +91,Software Developer,Phần mềm phát triển
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,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: Scheduling Tool,Course Start Date,Khóa học Ngày bắt đầu
 DocType: Item,Publish in Hub,Xuất bản trong Hub
+DocType: Student Admission,Student Admission,Nhập học sinh viên
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is cancelled,Mục {0} bị hủy bỏ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Material Request,Yêu cầu tài liệu
+apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} is cancelled,Mục {0} bị hủy bỏ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +823,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 +28,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 +328,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Mục {0} không tìm thấy trong &#39;Nguyên liệu Supplied&#39; bảng trong Purchase Order {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +333,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Mục {0} không tìm thấy trong &#39;Nguyên liệu Supplied&#39; bảng trong Purchase Order {1}
 DocType: Employee,Relation,Mối quan hệ
 DocType: Shipping Rule,Worldwide Shipping,Vận chuyển trên toàn thế giới
+DocType: Student Guardian,Mother,Mẹ
 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
@@ -310,20 +314,21 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +130,Please select Charge Type first,Vui lòng chọn Charge Loại đầu tiên
 DocType: Student Group Student,Student Group Student,Nhóm học sinh sinh viên
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Mới nhất
+DocType: Email Digest,New Quotations,Trích dẫn mới
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Người phê duyệt Để lại đầu tiên trong danh sách sẽ được thiết lập mặc định Để lại phê duyệt
 DocType: Tax Rule,Shipping County,vận Chuyển County
 apps/erpnext/erpnext/config/desktop.py +158,Learn,Học
 DocType: Asset,Next Depreciation Date,Tiếp Khấu hao ngày
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Chi phí công việc cho mỗi nhân viên
 DocType: Accounts Settings,Settings for Accounts,Cài đặt cho tài khoản
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +626,Supplier Invoice No exists in Purchase Invoice {0},Nhà cung cấp hóa đơn Không tồn tại trong hóa đơn mua hàng {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +629,Supplier Invoice No exists in Purchase Invoice {0},Nhà cung cấp hóa đơn Không tồn tại trong hóa đơn mua hàng {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Quản lý bán hàng người Tree.
 DocType: Job Applicant,Cover Letter,Thư xin việc
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Séc xuất sắc và tiền gửi để xóa
 DocType: Item,Synced With Hub,Đồng bộ hóa Với Hub
 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 +348,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 +86,Circular Reference Error,Thông tư tham khảo Lỗi
@@ -335,15 +340,16 @@
 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 +806,Delivery Note,Giao hàng Ghi
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +800,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/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 +233,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/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/setup/doctype/email_digest/email_digest.py +104,Summary for this week and pending activities,Tóm tắt cho tuần này và các hoạt động cấp phát
+apps/erpnext/erpnext/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ể"
 DocType: Employee,Company Email,Email công ty
@@ -355,28 +361,29 @@
 apps/erpnext/erpnext/config/hr.py +186,"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
-apps/erpnext/erpnext/controllers/accounts_controller.py +551,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}
+apps/erpnext/erpnext/controllers/accounts_controller.py +554,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 +54,{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 +812,Select Item,Chọn nhiều Item
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +791,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 \
 					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 +142,Purchase Invoice {0} is already submitted,Mua hóa đơn {0} đã gửi
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch Không phải giống như {1} {2}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +143,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.
 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 +342,Please see attachment,Xin vui lòng xem file đính kèm
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,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 +19,Setup Already Complete!!,Đã thiết lập hoàn chỉnh!
 ,Finished Goods,Hoàn thành Hàng
 DocType: Delivery Note,Instructions,Hướng dẫn
 DocType: Quality Inspection,Inspected By,Kiểm tra bởi
+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: Maintenance Visit,Maintenance Type,Loại bảo trì
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Không nối tiếp {0} không thuộc về Giao hàng tận nơi Lưu ý {1}
 apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Thêm mục
@@ -390,29 +397,29 @@
 DocType: Currency Exchange,Currency Exchange,Thu đổi ngoại tệ
 DocType: Purchase Invoice Item,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)
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Balance tín dụng
+DocType: Email Digest,Credit Balance,Balance tín dụng
 DocType: Employee,Widowed,Góa chồng
 DocType: Request for Quotation,Request for Quotation,Yêu cầu báo giá
 DocType: Salary Slip Timesheet,Working Hours,Giờ làm việc
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Thay đổi bắt đầu / hiện số thứ tự của một loạt hiện có.
 apps/erpnext/erpnext/accounts/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 +736,Purchase Return,Mua Quay lại
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +715,Purchase Return,Mua Quay lại
 ,Purchase Register,Đăng ký mua
 DocType: 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 +202,{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 +209,{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 +143,Reason for losing,Lý do mất
-apps/erpnext/erpnext/accounts/utils.py +239,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 +163,Reason for losing,Lý do mất
+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
 DocType: Announcement,Receiver,Người nhận
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation được đóng cửa vào các ngày sau đây theo Danh sách khách sạn Holiday: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Cơ hội
 DocType: Employee,Single,Một lần
 DocType: 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 +225,Please enter Cost Center,Vui lòng nhập Bộ phận Chi phí
+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í
 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
@@ -425,26 +432,26 @@
 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
 DocType: Account,Is Group,Is Nhóm
+DocType: Email Digest,Pending Purchase Orders,Trong khi chờ đơn đặt hàng mua
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Tự động Đặt nối tiếp Nos dựa trên FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Kiểm tra nhà cung cấp hóa đơn Số độc đáo
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','Đế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 +102,Non Profit,Không lợi nhuận
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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: Stock Reconciliation Item,Do not include symbols (ex. $),Không bao gồm các biểu tượng (ví dụ $.)
 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 +638,Attribute {0} selected multiple times in Attributes Table,Thuộc tính {0} được chọn nhiều lần trong Thuộc tính Bảng
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Thuộc tính {0} được chọn nhiều lần trong Thuộc tính Bảng
 DocType: HR Settings,Employee record is created using selected field. ,
 DocType: Sales Order,Not Applicable,Không áp dụng
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Chủ lễ.
 DocType: Request for Quotation Item,Required Date,Ngày yêu cầu
 DocType: Delivery Note,Billing Address,Địa chỉ thanh toán
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +862,Please enter Item Code.,Vui lòng nhập Item Code.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +847,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."
@@ -458,12 +465,12 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Chứng khoán và tiền gửi
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Tổng số lá được giao là bắt buộc
 DocType: Job Opening,Description of a Job Opening,Mô tả công việc một Opening
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Pending activities for today,Hoạt động cấp phát cho ngày hôm nay
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Hoạt động cấp phát cho ngày hôm nay
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Kỷ lục tham dự.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Hợp phần lương cho timesheet biên chế dựa.
 DocType: Sales Order Item,Used for Production Plan,Sử dụng cho kế hoạch sản xuất
 DocType: Manufacturing Settings,Time Between Operations (in mins),Time Between Operations (trong phút)
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +92,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} ngân sách cho tài khoản {1} đối với Trung tâm chi phí {2} là {3}. Nó sẽ vượt xa bởi {4}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +95,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} ngân sách cho tài khoản {1} đối với Trung tâm chi phí {2} là {3}. Nó sẽ vượt xa bởi {4}
 DocType: Customer,Buyer of Goods and Services.,Người mua hàng hoá và dịch vụ.
 DocType: Journal Entry,Accounts Payable,Tài khoản Phải trả
 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
@@ -471,16 +478,16 @@
 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/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 +86,Administrative Officer,Nhân viên hành chính
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,Nhân viên hành chính
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +23,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 +319,Please select Company,Vui lòng chọn Công ty
-DocType: Stock Entry,Difference Account,Tài khoản chênh lệch
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +309,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 +44,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 +398,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 +399,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 +530,"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 +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"
 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 +28,Buy,Mua
@@ -488,7 +495,7 @@
 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 +1563,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 +1587,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ụ
@@ -497,13 +504,14 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Account {0} does not belong to company: {1},Tài khoản {0} không thuộc về công ty: {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation already used for another company,Tên viết tắt đã được sử dụng cho một công ty khác
 DocType: Selling Settings,Default Customer Group,Nhóm khách hàng mặc định
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Supplier is required against Payable account {0},Nhà cung cấp là cần thiết đối với tài khoản phải trả {0}
 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
 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 +313,Reference No and Reference Date is mandatory for Bank transaction,Reference No và Ngày tham chiếu là bắt buộc đối với giao dịch ngân hàng
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +316,Reference No and Reference Date is mandatory for Bank transaction,Reference No và Ngày tham chiếu là bắt buộc đối với giao dịch ngân hàng
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Thêm / Sửa Thuế và phí
 DocType: Purchase Invoice,Supplier Invoice No,Nhà cung cấp hóa đơn Không
 DocType: Territory,For reference,Để tham khảo
@@ -514,7 +522,6 @@
 DocType: Installation Note Item,Installation Note Item,Lưu ý cài đặt hàng
 DocType: Production Plan Item,Pending Qty,Pending Qty
 DocType: Budget,Ignore,Bỏ qua
-apps/erpnext/erpnext/accounts/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
 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/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
@@ -525,11 +532,11 @@
 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/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 +28,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 +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/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 +707,Make Sales Order,Thực hiện bán hàng đặt hàng
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +701,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
 DocType: C-Form Invoice Detail,Grand Total,Tổng cộng
@@ -545,7 +552,8 @@
 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 +734,Sales Return,Bán hàng trở lại
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +728,Sales Return,Bán hàng trở lại
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +91,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)
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Cơ sở dữ liệu khách hàng tiềm năng.
@@ -554,14 +562,13 @@
 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 +212,Opening (Cr),Mở (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +795,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,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 +237,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 +797,Default Unit of Measure for Item {0} cannot be changed directly because 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
 DocType: Purchase Order Item,Billed Amt,Số tiền trên Bill
 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 +91,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: Sales Invoice,Customer's Vendor,Nhà cung cấp của khách hàng
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Proposal Writing,Đề nghị Viết
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,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"
@@ -570,13 +577,14 @@
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,thời gian theo dõi
 DocType: Fiscal Year Company,Fiscal Year Company,Công ty tài chính Năm
 DocType: Packing Slip Item,DN Detail,DN chi tiết
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +257,Already supplier quotation has created,Đã cung cấp báo giá đã tạo
 DocType: Timesheet,Billed,Đã viết bill
 DocType: Batch,Batch Description,Mô tả Lô
+apps/erpnext/erpnext/accounts/utils.py +685,"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 +733,View Offline Records,Xem offline ghi
+apps/erpnext/erpnext/accounts/page/pos/pos.js +715,View Offline Records,Xem offline ghi
+DocType: Student,Sibling Details,Thông tin chi tiết anh chị em ruột
 DocType: Employee,Reason for Resignation,Lý do từ chức
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,Mẫu cho đánh giá kết quả.
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,Hóa đơn / Journal nhập chi tiết
@@ -590,7 +598,7 @@
 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
 DocType: Employee,Passport Number,Số hộ chiếu
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Manager,Chi cục trưởng
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,Chi cục trưởng
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,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"
@@ -599,10 +607,11 @@
 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
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +299,Timesheet created:,Timesheet tạo:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +715,Please set default Cash or Bank account in Mode of Payment {0},Xin vui lòng thiết lập mặc định hoặc tiền trong tài khoản ngân hàng Phương thức thanh toán {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +300,Timesheet created:,Timesheet tạo:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +772,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
 DocType: Selling Settings,Customer Naming By,đặt tên khách hàng theo
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,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ự
 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
 DocType: Activity Cost,Activity Type,Loại hoạt động
@@ -627,6 +636,7 @@
 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
 DocType: Salary Structure Employee,Base,Căn cứ
+DocType: Timesheet,Total Billed Hours,Tổng số giờ Được xem
 DocType: Journal Entry,Write Off Amount,Viết Tắt Số tiền
 DocType: Journal Entry,Bill No,số Bill
 DocType: Company,Gain/Loss Account on Asset Disposal,TK Lãi/Lỗ thanh lý tài sản
@@ -641,11 +651,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +9,Pre Sales,Pre Sales
 DocType: Purchase Receipt,Other Details,Các chi tiết khác
 DocType: Account,Accounts,Tài khoản
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Marketing,Marketing
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +227,Payment Entry is already created,Nhập thanh toán đã được tạo ra
+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,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 +538,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 +21,Preview Salary Slip,Xem trước trượt Mức lương
+apps/erpnext/erpnext/controllers/accounts_controller.py +541,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 +38,Preview Salary Slip,Xem trước trượt Mức lương
 DocType: Company,Deafult Cost Center,Trung tâm chi phí Deafult
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +48,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á
@@ -654,7 +664,7 @@
 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
 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 +617,Item has variants.,Mục có các biến thể.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Mục có các biến thể.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,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
@@ -674,7 +684,7 @@
 DocType: Purchase Order,Supply Raw Materials,Cung cấp Nguyên liệu thô
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Ngày, tháng, hóa đơn tiếp theo sẽ được tạo ra. Nó được tạo ra trên trình."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Tài sản ngắn hạn
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,{0} is not a stock Item,{0} không phải là 1 vật tư hàng hóa
+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 +169,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ì
@@ -741,26 +751,25 @@
 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 +709,No Permission,Không phép
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +710,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}
 apps/erpnext/erpnext/public/js/setup_wizard.js +298,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 +542,Row #{0}: Asset {1} must be submitted,Row # {0}: {1} tài sản phải nộp
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,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: Warehouse,Tree Details,Chi tiết Tree
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Bây giờ gửi
 ,Support Analytics,Hỗ trợ Analytics
 DocType: Item,Website Warehouse,Trang web kho
 DocType: Payment Reconciliation,Minimum Invoice Amount,Số tiền Hoá đơn tối thiểu
 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/sales_invoice/sales_invoice.py +227,Timesheet {0} is already completed or cancelled,Timesheet {0} đã được hoàn thành hoặc bị hủy bỏ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +259,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
@@ -776,13 +785,13 @@
 apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Lịch khóa học
 DocType: Maintenance Visit,Completion Status,Tình trạng hoàn thành
 DocType: HR Settings,Enter retirement age in years,Nhập tuổi nghỉ hưu trong năm
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +229,Target Warehouse,Mục tiêu kho
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +230,Target Warehouse,Mục tiêu kho
 DocType: Cheque Print Template,Starting location from left edge,Bắt đầu từ vị trí từ cạnh trái
 DocType: Item,Allow over delivery or receipt upto this percent,Cho phép trên giao nhận tối đa tỷ lệ này
 DocType: Stock Entry,STE-,STE-
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Sales Order Date,Ngày dự kiến giao hàng không thể trước ngày đơn đặt hàng
 DocType: Upload Attendance,Import Attendance,Nhập khẩu tham dự
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Tất cả các nhóm hàng
+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/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.
@@ -794,13 +803,15 @@
 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/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
 DocType: Expense Claim,Expenses,Chi phí
 DocType: Item Variant Attribute,Item Variant Attribute,Mục Variant Attribute
 ,Purchase Receipt Trends,Xu hướng mua hóa đơn
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Research & Development,Nghiên cứu & Phát triể
+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
 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
 DocType: Leave Block List Date,Leave Block List Date,Để lại Danh sách Chặn ngày
 DocType: Pricing Rule,Price or Discount,Giá hoặc giảm giá
@@ -809,7 +820,7 @@
 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/controllers/accounts_controller.py +340,"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."
+apps/erpnext/erpnext/controllers/accounts_controller.py +343,"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
@@ -831,12 +842,12 @@
 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 +756,Purchase Receipt,Mua hóa đơn
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +735,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 +167,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 +282,Unable to find Time Slot in the next {0} days for Operation {1},Không thể tìm Time Khe cắm trong {0} ngày tới cho Chiến {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +170,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 +283,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 +439,BOM {0} must be active,BOM {0} phải là active
@@ -847,7 +858,7 @@
 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 +214,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 +217,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
@@ -861,9 +872,9 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Nhân viên {0} không hoạt động hoặc không tồn tại
 DocType: Fee Structure,Components,Các thành phần
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,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 +612,Item Variants {0} updated,Các biến thể mục {0} cập nhật
+apps/erpnext/erpnext/stock/doctype/item/item.py +614,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 +843,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 +854,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
@@ -878,69 +889,72 @@
 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 +728,New Sales Invoice,Hóa đơn bán hàng mới
+apps/erpnext/erpnext/accounts/page/pos/pos.js +710,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 +728,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: 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 +86, 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 +109,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 +619,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Đố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/page/pos/pos.js +75, 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 +613,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing 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 +606,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
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +609,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
 DocType: Purchase Invoice Item,Purchase Order Item,Mua hàng mục
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +130,Indirect Income,Thu nhập gián tiếp
 DocType: Cheque Print Template,Date Settings,Cài đặt ngày
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,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 +810,Select Item for Transfer,Chọn mục Chuyển giao
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +789,Select Item for Transfer,Chọn mục Chuyển giao
 DocType: Purchase Invoice,Additional Discount Percentage,Tỷ lệ giảm giá bổ sung
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Xem danh sách tất cả các video giúp đỡ
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Chọn đầu tài khoản của ngân hàng nơi kiểm tra đã được gửi.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Cho phép người dùng chỉnh sửa Giá liệt kê Tỷ giá giao dịch
 DocType: Pricing Rule,Max Qty,Số lượng tối đa
-DocType: Student Applicant,Father's Name,Tên cha
 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 +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: Thanh toán chống Bán hàng / Mua hàng nên luôn luôn được đánh dấu là trước
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Mối nguy hóa học
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +686,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/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
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +694,All items have already been transferred for this Production Order.,Tất cả các mặt hàng đã được chuyển giao cho đặt hàng sản xuất này.
 DocType: Process Payroll,Select Payroll Year and Month,Chọn Payroll Năm và Tháng
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,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ở
-DocType: Opportunity,Walk In,Đi vào
 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 +12,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).
 DocType: Timesheet Detail,Bill,Hóa đơn
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,White,Trắng
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,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/stock/doctype/stock_entry/stock_entry.py +228,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})
+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 +731,Make ,Làm
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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/templates/pages/cart.html +5,My Cart,Giỏ hàng
-apps/erpnext/erpnext/controllers/selling_controller.py +154,Order Type must be one of {0},Loại thứ tự phải là một trong {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Loại thứ tự phải là một trong {0}
 DocType: Lead,Next Contact Date,Tiếp theo Liên lạc ngày
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Mở Số lượng
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +393,Please enter Account for Change Amount,Vui lòng nhập tài khoản để thay đổi Số tiền
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,Please enter Account for Change Amount,Vui lòng nhập tài khoản để thay đổi Số tiền
 DocType: Student Batch,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/scheduling_tool/scheduling_tool.js +8,Schedule Course,lịch học
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Stock Options,Tùy chọn hàng tồn kho
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,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 +211,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 +237,Qty for {0},Số lượng cho {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +212,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 +238,Qty for {0},Số lượng cho {0}
 DocType: Leave Application,Leave Application,Để lại ứng dụng
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Công cụ để phân bổ
 DocType: Leave Block List,Leave Block List Dates,Để lại Danh sách Chặn Ngày
@@ -949,9 +963,9 @@
 DocType: Company,Default Terms,Mặc định khoản
 DocType: Packing Slip Item,Packing Slip Item,Đóng gói trượt mục
 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 +70,Removed items with no change in quantity or value.,Các mục gỡ bỏ không có thay đổi về số lượng hoặc giá trị.
+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 +635,Attribute table is mandatory,Bảng thuộc tính là bắt buộc
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Bảng thuộc tính là bắt buộc
 DocType: Production Planning Tool,Get Sales Orders,Chọn đơn đặt hàng
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{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
@@ -976,7 +990,7 @@
 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/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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Không nối tiếp {0} là theo hợp đồng bảo trì tối đa {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +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
@@ -988,7 +1002,7 @@
 DocType: GL Entry,Against,Chống lại
 DocType: Item,Default Selling Cost Center,Bộ phận chi phí bán hàng mặc định
 DocType: Sales Partner,Implementation Partner,Đối tác thực hiện
-apps/erpnext/erpnext/controllers/selling_controller.py +231,Sales Order {0} is {1},Đơn hàng {0} là {1}
+apps/erpnext/erpnext/controllers/selling_controller.py +232,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: Packing Slip,Net Weight UOM,Trọng lượng UOM
@@ -998,25 +1012,24 @@
 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
 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 +155,Dr,Tiến sĩ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Dr,Tiến sĩ
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Trích dẫn nhận được từ nhà cung cấp.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},Để {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Tuổi trung bình
 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."
-apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,Xem Tất cả Sản phẩm
+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
 DocType: Expense Claim,From Employee,Từ nhân viên
-apps/erpnext/erpnext/controllers/accounts_controller.py +400,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}
+apps/erpnext/erpnext/controllers/accounts_controller.py +403,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/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,và năm:
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +191,{0} {1} must be submitted,{0} {1} phải được gửi
-DocType: Email Digest,Annual Expense,Chi phí hàng năm
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,{0} {1} must be submitted,{0} {1} phải được gửi
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +145,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}
@@ -1027,30 +1040,31 @@
 DocType: Sales Partner,Distributor,Nhà phân phối
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Shopping Cart Shipping Rule
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +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 +62,Please set 'Apply Additional Discount On',Xin hãy đặt &#39;Áp dụng giảm giá bổ sung On&#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +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
 DocType: Global Defaults,Global Defaults,Mặc định toàn cầu
 apps/erpnext/erpnext/projects/doctype/project/project.py +153,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
 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 +327,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 +362,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/stock/doctype/stock_entry/stock_entry.py +367,Finished Item {0} must be entered for Manufacture type entry,Hoàn thành mục {0} phải được nhập cho loại Sản xuất nhập cảnh
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Mở cân đối kế toán
 DocType: Sales Invoice Advance,Sales Invoice Advance,Hóa đơn bán hàng trước
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +499,Nothing to request,Không có gì để yêu cầu
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +500,Nothing to request,Không có gì để yêu cầu
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','Ngày bắt đầu' không thể sau 'Ngày kết thúc'
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Management,Quản lý
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},Hoặc thẻ ghi nợ hoặc tín dụng số tiền được yêu cầu cho {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,Quản lý
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +55,Either debit or credit amount is required for {0},Hoặc thẻ ghi nợ hoặc tín dụng số tiền được yêu cầu cho {0}
 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 +161,Blue,Màu xanh
+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
@@ -1060,12 +1074,12 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +23,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
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1374,Do you really want to submit the invoice?,Bạn có thực sự muốn gửi hóa đơn?
+DocType: Grading Structure,Grading System Name,Hệ thống tên phân loại
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Cơ sở dữ liệu nhà cung cấp.
 DocType: 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 +685,Cost Center For Item with Item Code ',Cost Center For Item with Item Code '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1526,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Chế độ thanh toán không được cấu hình. Vui lòng kiểm tra, cho dù tài khoản đã được thiết lập trên chế độ thanh toán hoặc trên POS hồ sơ."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +679,Cost Center For Item with Item Code ',Cost Center For Item with Item Code '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1550,"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/account/account_tree.js +26,"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
@@ -1085,104 +1099,106 @@
 DocType: Payment Reconciliation,Unreconciled Payment Details,Chi tiết Thanh toán Unreconciled
 DocType: Global Defaults,Current Fiscal Year,Năm tài chính hiện tại
 DocType: Global Defaults,Disable Rounded Total,Vô hiệu hóa Tròn Tổng số
-DocType: Lead,Call,Cuộc gọi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +417,'Entries' cannot be empty,'Chứng từ nhập' không thể để trống
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +418,'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 +214,Fiscal Year {0} not found,Năm tài chính {0} không tìm thấy
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +221,Fiscal Year {0} not found,Năm tài chính {0} không tìm thấy
 apps/erpnext/erpnext/config/hr.py +238,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 +150,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 +151,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 +145,Research,Nghiên cứu
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,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 +43,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 +57,View Ledger,Xem Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Sớm nhất
-apps/erpnext/erpnext/stock/doctype/item/item.py +504,"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 +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/setup/setup_wizard/setup_wizard.py +437,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
 ,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 +90,Row {0}: Activity Type is mandatory.,Row {0}: Loại hoạt động là bắt buộc.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +114,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/public/js/controllers/stock_controller.js +40,Accounting Ledger,Sổ cái hạch toán
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,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
 DocType: BOM Item,Item Description,Mô tả hạng mục
+DocType: Student Sibling,Student Sibling,sinh viên anh chị em ruột
 DocType: Purchase Invoice,Is Recurring,Là định kỳ
 DocType: Purchase Invoice,Supplied Items,Hàng đã cung cấp
 DocType: Student,STUD.,STUD.
 DocType: Production Order,Qty To Manufacture,Số lượng Để sản xuất
+DocType: Email Digest,New Income,thu nhập mới
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Duy trì cùng một tốc độ trong suốt chu kỳ mua
 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 +131,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 +175,Valuation Rate required for Item in row {0},Đinh giá phải có cho mục ở hàng {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,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
 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 +87, to ,đến
+apps/erpnext/erpnext/accounts/page/pos/pos.js +76, 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/accounts/doctype/gl_entry/gl_entry.py +196,Not authorized to edit frozen Account {0},Không được phép chỉnh sửa tài khoản đông lạnh {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,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 +62,Sales Order {0} is not valid,Đơn đặt hàng {0} không hợp lệ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Đơn đặt hàng {0} không hợp lệ
 apps/erpnext/erpnext/setup/doctype/company/company.py +185,"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 +152,Small,Nhỏ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,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}
 ,Invoiced Amount (Exculsive Tax),Số tiền ghi trên hóa đơn (thuế Exculsive)
-DocType: Student Applicant,Mother's / Guardian 1 Email ID,/ Guardian ID 1 Email của Mẹ
 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 +160,Green,Xanh
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,Xanh
 DocType: Supplier,SUPP-,SUPP-
 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 +57,Contract,hợp đồng
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,hợp đồng
 DocType: Email Digest,Add Quote,Thêm Quote
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +498,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 +503,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 +80,Row {0}: Qty is mandatory,Hàng {0}: Số lượng là bắt buộc
+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 +737,Sync Master Data,Dữ liệu Sync Thạc sĩ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +719,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
 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
+DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Đây là một nhóm mục gốc và không thể được chỉnh sửa.
+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: Warehouse,Warehouse Contact Info,Địa chỉ liên lạc của 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 +345,"{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"
+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
 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 +118,"For {0}, only credit accounts can be linked against another debit entry","Đối với {0}, tài khoản tín dụng chỉ có thể được liên kết chống lại mục nợ khác"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Delivery Note {0} is not submitted,Giao hàng Ghi {0} không nộp
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Delivery Note {0} is not submitted,Giao hàng Ghi {0} không nộp
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Sub-contracted Item,Mục {0} phải là một mục phụ ký hợp đồng
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Thiết bị vốn
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Giá Rule là lần đầu tiên được lựa chọn dựa trên 'Áp dụng trên' lĩnh vực, có thể được Item, mục Nhóm hoặc thương hiệu."
 DocType: Hub Settings,Seller Website,Người bán website
 DocType: Item,ITEM-,MỤC-
-apps/erpnext/erpnext/controllers/selling_controller.py +147,Total allocated percentage for sales team should be 100,Tổng tỷ lệ phần trăm phân bổ cho đội ngũ bán hàng nên được 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +110,Production Order status is {0},Tình trạng tự sản xuất là {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Tổng tỷ lệ phần trăm phân bổ cho đội ngũ bán hàng nên được 100
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Tình trạng tự sản xuất là {0}
 DocType: Appraisal Goal,Goal,Mục tiêu
 DocType: Sales Invoice Item,Edit Description,Chỉnh sửa Mô tả
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +757,For Supplier,Cho Nhà cung cấp
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +723,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
@@ -1198,10 +1214,11 @@
 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
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +445,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
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1667,Deafault warehouse is required for selected item,kho Deafault là cần thiết cho mục được chọn
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Deafault warehouse is required for selected item,kho Deafault là cần thiết cho mục được chọn
 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
@@ -1210,23 +1227,23 @@
 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 +110,Hardware,Phần cứng
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,Phần cứng
 DocType: Sales Order,Recurring Upto,Định kỳ Upto
 DocType: Attendance,HR Manager,Trưởng phòng Nhân sự
 apps/erpnext/erpnext/accounts/party.py +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 +48,Privilege Leave,Để lại đặc quyền
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,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 +79,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ổ
 DocType: Appraisal Template Goal,Appraisal Template Goal,Thẩm định mẫu Mục tiêu
-DocType: Salary Slip,Earning,Thu nhập
+DocType: Salary Component,Earning,Thu nhập
 DocType: Purchase Invoice,Party Account Currency,Đảng Tài khoản ngoại tệ
 ,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 +171,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 +174,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_data.py +358,Food,Thực phẩm
+apps/erpnext/erpnext/demo/setup/setup_data.py +301,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/course_schedule/course_schedule.js +103,Mark Attendence,Đánh dấu Attendence
@@ -1260,12 +1277,12 @@
 DocType: Sales Order Item,Planned Quantity,Số lượng dự kiến
 DocType: Purchase Invoice Item,Item Tax Amount,Số tiền hàng Thuế
 DocType: Item,Maintain Stock,Duy trì tồn kho
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +209,Stock Entries already created for Production Order ,Cổ Entries đã tạo ra cho sản xuất theo thứ tự
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,Cổ Entries đã tạo ra cho sản xuất theo thứ tự
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,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 +620,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 +238,Max: {0},Max: {0}
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +15,From Datetime,Từ Datetime
+apps/erpnext/erpnext/controllers/accounts_controller.py +623,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 +239,Max: {0},Max: {0}
+apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Từ Datetime
 DocType: Email Digest,For Company,Đối với công ty
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Đăng nhập thông tin liên lạc.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +153,"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."
@@ -1273,8 +1290,8 @@
 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 +552,cannot be greater than 100,không có thể lớn hơn 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +680,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 +546,cannot be greater than 100,không có thể lớn hơn 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,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
@@ -1288,10 +1305,9 @@
 DocType: GL Entry,GL Entry,GL nhập
 DocType: HR Settings,Employee Settings,Thiết lập nhân viên
 ,Batch-Wise Balance History,Batch-Wise Balance History
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Để làm Danh sách
 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 +61,Apprentice,Người học việc
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +102,Negative Quantity is not allowed,Số lượng tiêu cực không được phép
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,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í"
@@ -1313,15 +1329,14 @@
 DocType: Asset,Asset Name,Tên tài sản
 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 +141,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 +719,Packing Slip,Đóng gói trượt
+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 +713,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/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,Yêu cầu báo giá có thể được truy cập bằng cách nhấp vào liên kết sau đây
 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 +81,Analyst,Chuyên viên phân tích
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,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-
@@ -1329,7 +1344,7 @@
 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 +103,Government,Chính phủ.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,Chính phủ.
 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ể
 DocType: Company,Services,Dịch vụ
@@ -1345,6 +1360,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,Financial Year Start Date,Ngày bắt đầu năm tài chính
 DocType: POS Profile,Apply Discount,Áp dụng giảm giá
 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ư
 DocType: Program Course,Program Course,Khóa học chương trình
@@ -1385,12 +1401,12 @@
 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
 DocType: Production Plan Sales Order,Production Plan Sales Order,Kế hoạch sản xuất đáp ứng cho đơn hàng
 DocType: Sales Partner,Sales Partner Target,Mục tiêu DT của Đại lý
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +110,Accounting Entry for {0} can only be made in currency: {1},Hạch toán kế toán cho {0} chỉ có thể được thực hiện bằng loại tiền tệ: {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Hạch toán kế toán cho {0} chỉ có thể được thực hiện bằng loại tiền tệ: {1}
 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
 DocType: Shopping Cart Settings,Payment Success URL,Thanh toán thành công URL
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +78,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: trả lại hàng {1} không tồn tại trong {2} {3}
+apps/erpnext/erpnext/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
@@ -1399,40 +1415,39 @@
 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/stock/doctype/stock_entry/stock_entry.py +339,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Không được phép để tuyền hơn {0} {1} hơn so với mua hàng {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +344,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 +545,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 +550,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 +71,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 +162,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/projects/doctype/timesheet/timesheet.py +186,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
 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
 ,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 +130,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 +137,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
 DocType: Dependent Task,Dependent Task,Nhiệm vụ phụ thuộc
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,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/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 +190,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/hr/doctype/leave_application/leave_application.py +197,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 +921,Search Item,Tìm hàng
+apps/erpnext/erpnext/accounts/page/pos/pos.js +910,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 +546,Already completed,Đã hoàn thành
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +22,Payment Request already exists {0},Yêu cầu thanh toán đã tồn tại {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +550,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 +241,Quantity must not be more than {0},Số lượng không phải lớn hơn {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,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 +76,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
@@ -1449,7 +1464,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +221,Purchase Receipt {0} is not submitted,Mua hóa đơn {0} không nộp
 DocType: Company,Default Payable Account,Mặc định Account Payable
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Cài đặt cho các giỏ hàng mua sắm trực tuyến chẳng hạn như các quy tắc vận chuyển, bảng giá, vv"
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +83,{0}% Billed,{0}% HĐơn mua
+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ự
@@ -1461,12 +1476,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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/schools/doctype/fees/fees.js +22,Collect,Sưu tầm
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Sưu tầm
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,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 +225,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
-DocType: Payment Reconciliation,Payments,Thanh toán
 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
@@ -1478,7 +1492,7 @@
 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 +9,Procurement,Tạp vụ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,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/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
 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
@@ -1503,7 +1517,7 @@
 DocType: Purchase Invoice,Additional Discount,Chiết khấu giảm giá
 DocType: Selling Settings,Selling Settings,thiết lập thông số bán hàng
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Đấu giá trực tuyến
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +97,Please specify either Quantity or Valuation Rate or both,Xin vui lòng chỉ định hoặc lượng hoặc Tỷ lệ định giá hoặc cả hai
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,Xin vui lòng chỉ định hoặc lượng hoặc Tỷ lệ định giá hoặc cả hai
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +13,Fulfillment,hoàn thành
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Công ty, tháng và năm tài chính là bắt buộc"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Chi phí tiếp thị
@@ -1524,14 +1538,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,ERPNext Hoàn tất thiết lập!
 DocType: Item,Weightage,Weightage
 DocType: Packing Slip,PS-,PS
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +93,A Customer Group exists with same name please change the Customer name or rename the Customer Group,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/selling/doctype/customer/customer.py +126,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
 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
 DocType: Homepage,Products,Sản phẩm
 DocType: Announcement,Instructor,người hướng dẫn
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},Đảng Loại và Đảng là cần thiết cho thu / tài khoản phải trả {0}
 DocType: 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
@@ -1542,7 +1555,7 @@
 ,Item-wise Sales Register,Item-khôn ngoan doanh Đăng ký
 DocType: Asset,Gross Purchase Amount,Tổng Chi phí mua hàng
 DocType: Asset,Depreciation Method,Phương pháp Khấu hao
-apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Offline,ẩn
+apps/erpnext/erpnext/accounts/page/pos/pos.js +686,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
@@ -1560,25 +1573,27 @@
 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
 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 +858,Make Purchase Order,Từ mua hóa đơn
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +852,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 +141,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 +148,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
 DocType: Stock Reconciliation,Stock Reconciliation,"Kiểm kê, chốt kho"
 DocType: Territory,Territory Name,Tên địa bàn
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +172,Work-in-Progress Warehouse is required before Submit,Làm việc-trong-Tiến kho là cần thiết trước khi Submit
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,Work-in-Progress Warehouse is required before Submit,Làm việc-trong-Tiến kho là cần thiết trước khi Submit
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Nộp đơn xin việc.
 DocType: Purchase Order Item,Warehouse and Reference,Kho hàng và tham chiếu
 DocType: Supplier,Statutory info and other general information about your Supplier,Thông tin theo luật định và các thông tin chung khác về nhà cung cấp của bạn
-apps/erpnext/erpnext/hooks.py +88,Addresses,Địa chỉ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Nhà cung cấp&gt; Loại nhà cung cấp
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +212,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/hooks.py +95,Addresses,Địa chỉ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +215,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
 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
@@ -1586,11 +1601,10 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} must be submitted,BOM {0} phải được submit
 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 +731,Payment,Thanh toán
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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: Pricing Rule,Brand,Thương Hiệu
 DocType: Course,Course Abbreviation,Tên viết tắt khóa học
 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 +142,"Asset cannot be cancelled, as it is already {0}","Tài sản không thể được hủy bỏ, vì nó đã được {0}"
@@ -1602,7 +1616,7 @@
 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."
 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 +85,Associate,Liên kết
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,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
@@ -1610,7 +1624,7 @@
 DocType: Production Planning Tool,Material Requests,yêu cầu tài liệu
 DocType: Warranty Claim,Issue Date,Ngày phát hành
 DocType: Activity Cost,Activity Cost,Giá thành công việc
-DocType: Timesheet Detail,Timesheet Detail,timesheet chi tiết
+DocType: Sales Invoice Timesheet,Timesheet Detail,timesheet chi tiết
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Số lượng tiêu thụ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Viễn thông
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Chỉ ra rằng gói là một phần của việc phân phối này (Chỉ có Dự thảo)
@@ -1633,6 +1647,7 @@
 DocType: Production Plan Material Request,Material Request Date,Chất liệu Yêu cầu gia ngày
 DocType: Purchase Order Item,Supplier Quotation Item,Mục Báo giá của NCC
 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ể
 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ẹ
@@ -1645,31 +1660,32 @@
 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 +44,"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/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.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +502,Error: {0} &gt; {1},Lỗi: {0}&gt; {1}
 DocType: Item,Is Sales Item,Là hàng bán
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Nhóm mục Tree
 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.
 DocType: Naming Series,Current Value,Giá trị hiện tại
-apps/erpnext/erpnext/controllers/accounts_controller.py +235,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/controllers/accounts_controller.py +238,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
 DocType: Delivery Note Item,Against Sales Order,Theo đơn đặt hàng
 ,Serial No Status,Serial No Tình trạng
 DocType: Payment Entry Reference,Outstanding,Nổi bật
 ,Daily Timesheet Summary,Tóm tắt Timesheet hàng ngày
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +458,Item table can not be blank,Mục bảng không thể để trống
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +443,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}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +5,This is based on stock movement. See {0} for details,Điều này được dựa trên chuyển động chứng khoán. Xem {0} để biết chi tiết
 DocType: Pricing Rule,Selling,Bán hàng
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +341,Amount {0} {1} deducted against {2},Số tiền {0} {1} giảm trừ {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +344,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ổ
@@ -1684,8 +1700,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +144,Cannot refer row number greater than or equal to current row number for this Charge type,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 +159,Red,Đỏ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Vui lòng click vào 'Tạo Lịch trình' để lấy Serial No bổ sung cho hàng {0}
+apps/erpnext/erpnext/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
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Cơ sở Số tiền (Công ty ngoại tệ)
@@ -1693,7 +1709,7 @@
 DocType: Installation Note,Installation Time,Thời gian cài đặt
 DocType: Sales Invoice,Accounting Details,Chi tiết hạch toán
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,Xóa tất cả các giao dịch cho công ty này
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +187,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Row # {0}: Operation {1} không được hoàn thành cho {2} qty thành phẩm trong sản xuất theo thứ tự # {3}. Vui lòng cập nhật trạng thái hoạt động thông qua Time Logs
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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,Row # {0}: Operation {1} không được hoàn thành cho {2} qty thành phẩm trong sản xuất theo thứ tự # {3}. Vui lòng cập nhật trạng thái hoạt động thông qua Time Logs
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,Các khoản đầu tư
 DocType: Issue,Resolution Details,Độ phân giải chi tiết
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,phân bổ
@@ -1729,16 +1745,17 @@
 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}
 DocType: Delivery Note,Excise Page Number,Tiêu thụ đặc biệt số trang
 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}
 ,Maintenance Schedules,Lịch bảo trì
 DocType: Task,Actual End Date (via Time Sheet),Thực tế End Date (thông qua Time Sheet)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Amount {0} {1} against {2} {3},Số tiền {0} {1} với {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +339,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 +138,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 +295,Debit To account must be a Receivable account,Để ghi nợ tài khoản phải có một tài khoản phải thu
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Receivable account,Để ghi nợ tài khoản phải có một tài khoản phải thu
 DocType: Shipping Rule Condition,Shipping Amount,Số tiền vận chuyển
 ,Pending Amount,Số tiền cấp phát
 DocType: Purchase Invoice Item,Conversion Factor,Yếu tố chuyển đổi
@@ -1746,10 +1763,10 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +137,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 +90,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
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +93,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 +22,Enter Paid Amount,Nhập Số tiền trả tiền
+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
@@ -1759,13 +1776,15 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,timesheets
 DocType: HR Settings,HR Settings,Thiết lập nhân sự
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Expense Claim is pending approval. Only the Expense Approver can update status.,Bảng kê Chi phí đang chờ phê duyệt. Chỉ Người duyệt chi mới có thể cập nhật trạng thái.
+DocType: Email Digest,New Expenses,Chi phí mới
 DocType: Purchase Invoice,Additional Discount Amount,Thêm GIẢM Số tiền
-apps/erpnext/erpnext/controllers/accounts_controller.py +524,"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."
+apps/erpnext/erpnext/controllers/accounts_controller.py +527,"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 +249,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/stock/get_item_details.py +123,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
@@ -1776,17 +1795,19 @@
 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 +183,Closing (Opening + Totals),Đóng cửa (mở cửa + Các tổng số)
+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/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Hãy xác định tiền tệ của Công ty
 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/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
-apps/erpnext/erpnext/controllers/accounts_controller.py +272,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}
+DocType: Email Digest,Pending Sales Orders,Trong khi chờ hàng đơn đặt hàng
+apps/erpnext/erpnext/controllers/accounts_controller.py +275,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 +956,"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 Slip,Deduction,Khấu trừ
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +87,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/accounts/doctype/payment_entry/payment_entry.js +969,"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 +111,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 +262,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 +7,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
@@ -1794,7 +1815,7 @@
 DocType: Project,% Tasks Completed,Nhiệm vụ đã hoàn thành%
 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
 DocType: Project,Gross Margin,Margin Gross
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +194,Please enter Production Item first,Vui lòng nhập sản xuất hàng đầu tiên
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +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
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Báo giá
@@ -1803,53 +1824,54 @@
 DocType: Maintenance Visit,Maintenance User,Bảo trì tài khoản
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +149,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 +86,Item {0} has already been returned,Mục {0} đã được trả lại
+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: 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 +177,Job Description,Mô Tả Công Việc
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,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 +126,"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"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"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/accounts/doctype/sales_invoice/pos.py +24,Welcome to POS: Create your POS Profile,Chào mừng bạn đến POS: Tạo hồ sơ POS của bạn
 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 +191,Serial No {0} is under warranty upto {1},Không nối tiếp {0} được bảo hành tối đa {1}
+apps/erpnext/erpnext/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 +74,Shipments,Lô hàng
+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
 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 +153,Row # ,Row #
+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 +156,Get From,Nhận Từ
+apps/erpnext/erpnext/public/js/utils.js +167,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 +167,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 +416,"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ổ"
+apps/erpnext/erpnext/controllers/accounts_controller.py +419,"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/hr/doctype/employee/employee.py +136,User {0} is disabled,Người sử dụng {0} bị vô hiệu hóa
 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 ...
 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 +171,"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 +346,{0} is mandatory for Item {1},{0} là bắt buộc đối với mục {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,{0} is mandatory for Item {1},{0} là bắt buộc đối với mục {1}
 DocType: Currency Exchange,From Currency,Từ tệ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Vui lòng chọn Số tiền phân bổ, Loại hóa đơn và hóa đơn số trong ít nhất một hàng"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,Chi phí mua hàng mới
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},Đặt hàng bán hàng cần thiết cho mục {0}
 DocType: Purchase Invoice Item,Rate (Company Currency),Đơn giá (Công ty tiền tệ)
-apps/erpnext/erpnext/demo/setup_data.py +360,Others,Các thông tin khác
+DocType: Student Guardian,Others,Các thông tin khác
 DocType: Payment Entry,Unallocated Amount,Số tiền chưa được phân bổ
 apps/erpnext/erpnext/templates/includes/product_page.js +65,Cannot find a matching Item. Please select some other value for {0}.,Không thể tìm thấy một kết hợp Item. Hãy chọn một vài giá trị khác cho {0}.
 DocType: POS Profile,Taxes and Charges,Thuế và phí
@@ -1869,17 +1891,16 @@
 apps/erpnext/erpnext/config/stock.py +304,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/accounts/report/item_wise_sales_register/item_wise_sales_register.py +54,Receivable Account,Tài khoản phải thu
-apps/erpnext/erpnext/controllers/accounts_controller.py +546,Row #{0}: Asset {1} is already {2},Row # {0}: {1} Asset đã {2}
+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 +549,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 +79,CEO,CEO
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,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 +808,Please select correct account,Vui lòng chọn đúng tài khoản
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +809,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
-DocType: Purchase Invoice Item,Page Break,Phân trang
 DocType: Production Order Operation,Pending,Chờ
 DocType: Course,Course Name,Tên khóa học
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Người dùng có thể duyệt các ứng dụng nghỉ phép một nhân viên nào đó của
@@ -1888,14 +1909,15 @@
 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 +54,Full-time,Toàn thời gian
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,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: 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: Student,Guardians,người giám hộ
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +29,Please specify a country for this Shipping Rule or check Worldwide Shipping,Hãy xác định một quốc gia cho Rule Shipping này hoặc kiểm tra vận chuyển trên toàn thế giới
 DocType: Stock Entry,Total Incoming Value,Tổng giá trị Incoming
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Debit To is required,Nợ Để được yêu cầu
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +321,Debit To is required,Nợ Để được yêu cầu
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Danh sách mua Giá
 DocType: Offer Letter Term,Offer Term,Offer hạn
 DocType: Quality Inspection,Quality Manager,Quản lý chất lượng
@@ -1903,6 +1925,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/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
@@ -1913,18 +1936,17 @@
 DocType: Production Order Operation,Completed Qty,Số lượng hoàn thành
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"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 +273,Price List {0} is disabled,Danh sách giá {0} bị vô hiệu hóa
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +99,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/projects/doctype/timesheet/timesheet.py +123,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ờ
 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}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Hiện tại Rate Định giá
 DocType: Item,Customer Item Codes,Mã mục khách hàng (Customer Item Codes)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,Trao đổi Lãi / lỗ
 DocType: Opportunity,Lost Reason,Lý do bị mất
-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/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/purchase_receipt/purchase_receipt.py +378,All items have already been invoiced,Tất cả các mục đã được lập hoá đơn
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +379,All items have already been invoiced,Tất cả các mục đã được lập hoá đơn
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Vui lòng xác định hợp lệ ""Từ trường hợp số '"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,Further cost centers can be made under Groups but entries can be made against non-Groups
 DocType: Project,External,Bên ngoài
@@ -1940,18 +1962,19 @@
 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 +141,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/job_opening.html +19,Apply Now,Áp dụng ngay bây giờ
+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."
 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à
-apps/erpnext/erpnext/utilities/doctype/address/address.py +164,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: Fee Structure,Fee Structure,Cơ cấu phí
 DocType: Timesheet Detail,Costing Amount,Chi phí tiền
+DocType: Student Admission,Application Fee,Phí đăng ký
 DocType: Process Payroll,Submit Salary Slip,Trình Lương trượt
-apps/erpnext/erpnext/controllers/selling_controller.py +161,Maxiumm discount for Item {0} is {1}%,Giảm giá Maxiumm cho mục {0} {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,Giảm giá Maxiumm cho mục {0} {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Nhập khẩu với số lượng lớn
 DocType: Sales Partner,Address & Contacts,Địa chỉ & Liên hệ
 DocType: SMS Log,Sender Name,Tên người gửi
@@ -1976,21 +1999,21 @@
 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_data.py +361,Travel,Du lịch
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +155,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 +304,Travel,Du lịch
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +167,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 +23,Update Cost,Cập nhật giá
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Cập nhật giá
 DocType: Item Reorder,Item Reorder,Mục Sắp xếp lại
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +36,Show Salary Slip,Trượt Hiện Lương
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +748,Transfer Material,Vật liệu chuyển
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +53,Show Salary Slip,Trượt Hiện Lương
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +166,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 +923,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 +646,Select change amount account,tài khoản số lượng Chọn thay đổi
+apps/erpnext/erpnext/public/js/controllers/transaction.js +914,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 +703,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
@@ -2002,31 +2025,32 @@
 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 +64,"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: Quality Inspection,Purchase Receipt No,Mua hóa đơn Không
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Tiền một cách nghiêm túc
 DocType: Process Payroll,Create Salary Slip,Tạo Mức lương trượt
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +33,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 +352,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Số lượng trong hàng {0} ({1}) phải được giống như số lượng sản xuất {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Số lượng trong hàng {0} ({1}) phải được giống như số lượng sản xuất {2}
 DocType: Appraisal,Employee,Nhân viên
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Mời như tài
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} đã đầy đủ hóa đơn mua
 DocType: Workstation Working Hour,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 +100,LMS,LMS
+apps/erpnext/erpnext/config/schools.py +104,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/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
-DocType: Sales Invoice,Mass Mailing,Gửi thư hàng loạt
+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 +199,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/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 +297,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 +111,Pharmaceutical,Dược phẩm
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +309,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/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
@@ -2041,27 +2065,28 @@
 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 +814,Please specify Company to proceed,Vui lòng ghi rõ Công ty để tiến hành
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +793,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 +44,Compensatory Off,Đền bù Tắt
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,Đền bù Tắt
 DocType: Quality Inspection Reading,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.
 DocType: Room,Room Number,Số phòng
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Tham chiếu không hợp lệ {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +161,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) không được lớn hơn số lượng kế hoạch ({2}) trong lệnh sản xuất {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +162,{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 +217,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 +413,"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 +460,Quick Journal Entry,Tạp chí nhanh chóng nhập
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +111,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ỳ.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +441,"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 +450,Quick Journal Entry,Tạp chí nhanh chóng nhập
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +103,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 +214,{0} {1} is not submitted,{0} {1} chưa ghi sổ
 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
 ,Minutes to First Response for Issues,Phút để đáp ứng đầu tiên cho vấn đề
 DocType: Purchase Invoice,Terms and Conditions1,Điều khoản và Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,Tên của viện mà bạn đang thiết lập hệ thống này.
@@ -2070,16 +2095,17 @@
 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 +398,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 +739,Item or Warehouse for row {0} does not match Material Request,Mục hoặc Kho cho hàng {0} không phù hợp với liệu Yêu cầu
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +747,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
 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: Lead,Opportunity,Cơ hội
+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
@@ -2092,7 +2118,7 @@
 DocType: Student,Joining Date,Tham gia ngày
 ,Employees working on a holiday,Nhân viên làm việc trên một kỳ nghỉ
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Đánh dấu hiện tại
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},Bảo trì ngày bắt đầu không thể trước ngày giao hàng cho Serial No {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},Bảo trì ngày bắt đầu không thể trước ngày giao hàng cho Serial No {0}
 DocType: Production Order,Actual End Date,Ngày kết thúc thực tế
 DocType: Purchase Invoice,PINV-,PINV-
 DocType: Authorization Rule,Applicable To (Role),Để áp dụng (Role)
@@ -2107,7 +2133,7 @@
 DocType: SMS Log,No of Requested SMS,Không được yêu cầu của tin nhắn SMS
 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 +729,Please supply the specified items at the best possible rates,Vui lòng cung cấp mục cụ thể với mức giá tốt nhất có thể
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +695,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 +117,Contract End Date must be greater than Date of Joining,Ngày kết thúc hợp đồng phải lớn hơn ngày gia nhập
 DocType: Delivery Note,DN-,DN-
@@ -2116,7 +2142,7 @@
 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 +14,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/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
 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.
 
@@ -2143,13 +2169,14 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd Số lượng
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +54,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 +103,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 +504,Stock Entry {0} is not submitted,Cổ nhập {0} không được đệ trình
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Không thể sản xuất {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 +505,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: Salary Component Account,Salary Component Account,Tài khoản của Hợp phần lương
 DocType: Global Defaults,Hide Currency Symbol,Ẩn tệ Ký hiệu
 apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card","ví dụ như Ngân hàng, tiền mặt, thẻ tín dụng"
+DocType: Lead Source,Source Name,Source Name
 DocType: Journal Entry,Credit Note,Tín dụng Ghi chú
 DocType: Warranty Claim,Service Address,Địa chỉ dịch vụ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furnitures and Fixtures,Nội thất và Đèn
@@ -2161,6 +2188,7 @@
 DocType: Opportunity,Customer / Lead Name,Khách hàng / Tên Lead
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +89,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/controllers/trends.py +19,Total(Qty),Tổng số (SL)
 DocType: Sales Invoice,This Document,Tài liệu này
@@ -2172,15 +2200,15 @@
 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 +176,Organization branch master.,Chủ chi nhánh tổ chức.
-apps/erpnext/erpnext/controllers/accounts_controller.py +273, or ,hoặc
+apps/erpnext/erpnext/controllers/accounts_controller.py +276, 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
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,Chi phí tiện ích
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,Trên - 90
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +203,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: Tạp chí nhập {1} không có tài khoản {2} hoặc đã xuất hiện chống lại chứng từ khác
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +206,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 +90,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 +93,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
@@ -2208,8 +2236,8 @@
 DocType: Product Bundle,Parent Item,Cha mẹ mục
 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 +115,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 +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Lịch trình bảo trì không được tạo ra cho tất cả các mục. Vui lòng click vào 'Tạo lịch'
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +118,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'
 ,To Produce,Để sản xuất
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Bảng lương
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +163,"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"
@@ -2221,13 +2249,13 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +32,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 +748,Delivery,Giao hàng
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +742,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
 DocType: Payment Entry,Total Allocated Amount,Tổng số tiền phân bổ
 DocType: Item Reorder,Material Request Type,Tài liệu theo yêu cầu Loại
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +82,Row {0}: UOM Conversion Factor is mandatory,Row {0}: Ươm Conversion Factor là bắt buộc
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +79,Row {0}: UOM Conversion Factor is mandatory,Row {0}: Ươm Conversion Factor là bắt buộc
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Tài liệu tham khảo
 DocType: Budget,Cost Center,Bộ phận chi phí
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Chứng từ #
@@ -2238,13 +2266,13 @@
 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 +90,Head of Marketing and Sales,Trưởng phòng Marketing và Bán hàng
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Thuế thu nhập
+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 +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.
 DocType: Item Supplier,Item Supplier,Mục Nhà cung cấp
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +403,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 +770,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 +397,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 +764,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"
@@ -2256,28 +2284,29 @@
 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 +100,Issues,Vấn đề
+apps/erpnext/erpnext/hooks.py +109,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}
 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
 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 +155,Extra Large,Cực lớn
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,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 +507,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 +107,Local,địa phương
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +508,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/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 +154,Large,Lớn
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,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 +225,Total {0} ({1}),Tổng số {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +224,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á
@@ -2335,9 +2364,9 @@
 DocType: Attendance,Leave Type,Loại bỏ
 apps/erpnext/erpnext/controllers/stock_controller.py +173,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/hr/doctype/salary_slip/salary_slip.py +79,Name error: {0},Tên lỗi: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +90,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 +178,{0} {1} does not associated with {2} {3},{0} {1} không liên quan đến {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +181,{0} {1} does not associated with {2} {3},{0} {1} không liên quan đến {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Tại nhà cho nhân viên {0} đã được đánh dấu
 DocType: Packing Slip,If more than one package of the same type (for print),Nếu có nhiều hơn một gói cùng loại (đối với in)
 DocType: Warehouse,Parent Warehouse,Kho mẹ
@@ -2356,7 +2385,7 @@
 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
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,Ít nhất một mặt hàng cần được nhập với số lượng tiêu cực trong tài liệu trở lại
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Atleast one item should be entered with negative quantity in return document,Ít nhất một mặt hàng cần được nhập với số lượng tiêu cực trong tài liệu trở lại
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operation {0} lâu hơn bất kỳ giờ làm việc có sẵn trong máy trạm {1}, phá vỡ các hoạt động vào nhiều hoạt động"
 ,Requested,Yêu cầu
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +83,No Remarks,Không có Bình luận
@@ -2368,46 +2397,46 @@
 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/stock/doctype/purchase_receipt/purchase_receipt.py +98,Quality Inspection required for Item {0},Kiểm tra chất lượng cần thiết cho mục {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,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
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Quản lý Cây thư mục địa bàn
 DocType: Journal Entry Account,Sales Invoice,Hóa đơn bán hàng
 DocType: Journal Entry Account,Party Balance,Balance Đảng
-apps/erpnext/erpnext/accounts/page/pos/pos.js +475,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 +92,Salary Slip Created,Mức lương Phiếu tạo
+apps/erpnext/erpnext/accounts/page/pos/pos.js +464,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 +95,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
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,Tỷ lệ phần trăm giảm giá có thể được áp dụng hoặc chống lại một danh sách giá hay cho tất cả Bảng giá.
 DocType: Purchase Invoice,Half-yearly,Nửa năm
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +384,Accounting Entry for Stock,Hạch toán kế toán cho hàng tồn kho
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +387,Accounting Entry for Stock,Hạch toán kế toán cho hàng tồn kho
 DocType: Sales Invoice,Sales Team1,Team1 bán hàng
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,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 +96,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 +120,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 +88,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/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
 DocType: Item Group,Show this slideshow at the top of the page,Hiển thị slideshow này ở trên cùng của trang
 DocType: BOM,Item UOM,Đơn vị tính cho mục
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Số tiền thuế Sau GIẢM Số tiền (Công ty tiền tệ)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +147,Target warehouse is mandatory for row {0},Kho mục tiêu là bắt buộc đối với hàng {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +141,Target warehouse is mandatory for row {0},Kho mục tiêu là bắt buộc đối với hàng {0}
 DocType: Cheque Print Template,Primary Settings,Cài đặt tiểu học
 DocType: Purchase Invoice,Select Supplier Address,Chọn nhà cung cấp Địa chỉ
 DocType: Quality Inspection,Quality Inspection,Kiểm tra chất lượng
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Extra Small,Tắm nhỏ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +194,Account {0} is frozen,Tài khoản {0} bị đóng băng
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Tắm nhỏ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +690,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 +197,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 +606,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 +126,Commission rate cannot be greater than 100,Tỷ lệ hoa hồng không có thể lớn hơn 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +609,Can only make payment against unbilled {0},Chỉ có thể thực hiện thanh toán cho các phiếu chưa thanh toán {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,Tỷ lệ hoa hồng không có thể lớn hơn 100
 DocType: Stock Entry,Subcontract,Cho thầu lại
 apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,Vui lòng nhập {0} đầu tiên
 DocType: Production Order Operation,Actual End Time,Thực tế End Time
@@ -2418,30 +2447,30 @@
 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 +158,Colour,Màu
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,Màu
 DocType: Maintenance Visit,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"
 DocType: Student Log,Academic,Học tập
-apps/erpnext/erpnext/controllers/accounts_controller.py +469,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Tổng số trước ({0}) chống lại thứ tự {1} không thể lớn hơn Grand Total ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +472,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Tổng số trước ({0}) chống lại thứ tự {1} không thể lớn hơn Grand Total ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Chọn phân phối không đồng đều hàng tháng để phân phối các mục tiêu ở tháng.
 DocType: Purchase Invoice Item,Valuation Rate,Định giá
+DocType: Stock Reconciliation,SR/,SR /
 apps/erpnext/erpnext/stock/get_item_details.py +294,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ả
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +168,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 +175,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
-DocType: Student Applicant,Father's/ Guardian 2 Email ID,/ Guardian ID 2 Email của Cha
 DocType: Maintenance Visit Purpose,Against Document No,Đối với văn bản số
 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 +228,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 +231,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 +93,Researcher,Nhà nghiên cứu
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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.
@@ -2453,25 +2482,25 @@
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Để thuận tiện cho khách hàng, các mã này có thể được sử dụng trong các định dạng in hóa đơn và biên bản giao hàng"
 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: Sales Invoice,Advertisement,Quảng cáo
 DocType: Asset Category Account,Depreciation Expense Account,TK Chi phí Khấu hao
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Probationary Period,Thời gian thử việc
-apps/erpnext/erpnext/hooks.py +102,Announcements,Thông báo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Thời gian thử việc
+apps/erpnext/erpnext/hooks.py +111,Announcements,Thông báo
 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 +109,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 +16,To Datetime,Để Datetime
+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/scheduling_tool/scheduling_tool.py +51,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/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Các hoạt động cấp phát
+DocType: Accounts Settings,Make Payment via Journal Entry,Hãy thanh toán qua Journal nhập
+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 +127,Please enter relieving date.,Vui lòng nhập ngày giảm.
-apps/erpnext/erpnext/controllers/trends.py +145,Amt,Amt
+apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,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 +26,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
@@ -2489,14 +2518,15 @@
 apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1},Không tìm thấy tỷ giá hối đoái cho {0} đến {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Đánh dấu Nửa ngày
 DocType: Sales Invoice,Sales Team,Đội ngũ bán hàng
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Duplicate entry,Trùng lặp mục
+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 +490,[Error],[Lỗi]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +484,[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
 apps/erpnext/erpnext/controllers/status_updater.py +175,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.
 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
@@ -2512,22 +2542,22 @@
 ,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 +25,All Jobs,Tất cả Jobs
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,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
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Amount {0} {1} {2} {3},Số tiền {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Amount {0} {1} {2} {3},Số tiền {0} {1} {2} {3}
 DocType: Account,Depreciation,Khấu hao
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Nhà cung cấp (s)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Nhân viên Công cụ Attendance
 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 +372,Payment Entries {0} are un-linked,Thanh toán Entries {0} là un-liên kết
+apps/erpnext/erpnext/accounts/utils.py +449,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
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +497,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 +498,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ệ
@@ -2566,7 +2596,7 @@
 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 +848,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 +859,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 +233,Closing (Dr),Đóng cửa (Tiến sĩ)
 DocType: Cheque Print Template,Cheque Size,Kích Séc
@@ -2587,7 +2617,8 @@
 ,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.
-apps/erpnext/erpnext/controllers/accounts_controller.py +555,'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
+DocType: Student Guardian,Father,Cha
+apps/erpnext/erpnext/controllers/accounts_controller.py +558,'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
 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/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
@@ -2597,15 +2628,15 @@
 DocType: Sales Order,Fully Delivered,Giao đầy đủ
 DocType: Lead,Lower Income,Thu nhập thấp
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","Người đứng đầu tài khoản dưới trách nhiệm pháp lý, trong đó lợi nhuận / lỗ sẽ được ghi nhận"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +166,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 +238,"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 +81,Purchase Order number required for Item {0},Số mua hàng cần thiết cho mục {0}
+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/purchase_receipt/purchase_receipt.py +82,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/schools/doctype/student_applicant/student_applicant.py +17,Cannot change status as student {0} is linked with student application {1},Không thể thay đổi tình trạng như sinh viên {0} được liên kết với các ứng dụng sinh viên {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +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: Timesheet,"List of employee which has ""Salary Slip Based on Timesheet"" is enabled in salary structure.",Danh sách nhân viên trong đó có &quot;Phiếu Lương Dựa trên Timesheet&quot; được kích hoạt trong cấu trúc lương.
 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 +356,Customer {0} does not belong to project {1},Khách hàng {0} không thuộc về dự án {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,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
@@ -2617,7 +2648,7 @@
 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/patches/v7_0/create_warehouse_nestedset.py +55,All Warehouses,Tất cả các kho hàng
+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 +105,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
@@ -2629,10 +2660,10 @@
 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/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Làm cho lương trượt
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +26,Browse BOM,Xem BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,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/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 Year,Academic Year,Năm học
+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
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,Thẩm định
@@ -2640,12 +2671,12 @@
 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 +197,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 +204,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: Workstation Working Hour,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 +256,Select Quantity,Chọn Số lượng
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +257,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
@@ -2662,6 +2693,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Hoặc SL mục tiêu hoặc số lượng mục tiêu là bắt buộc.
 apps/erpnext/erpnext/config/projects.py +45,Cost of various activities,Chi phí hoạt động khác nhau
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Thiết kiện để {0}, vì các nhân viên thuộc dưới Sales Người không có một ID người dùng {1}"
+DocType: Timesheet,Billing Details,Chi tiết Thanh toán
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +149,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}
 DocType: Item,Inspection Required,Kiểm tra yêu cầu
@@ -2681,7 +2713,7 @@
 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 +138,Wire Transfer,Chuyển khoản
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,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: Sales Order,Recurring Order,Đặt hàng theo định kỳ
 DocType: Company,Default Income Account,Tài khoản thu nhập mặc định
@@ -2693,21 +2725,19 @@
 ,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á
 DocType: Lead,From Customer,Từ khách hàng
-apps/erpnext/erpnext/demo/setup_data.py +357,Calls,Các Cuộc gọi
+apps/erpnext/erpnext/demo/setup/setup_data.py +300,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/stock/doctype/item/item.py +466,"As there are existing transactions for this item, \
-							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Như có những giao dịch hiện tại cho mục này, \ bạn không thể thay đổi các giá trị của &#39;Có serial Không&#39;, &#39;Có hàng loạt Không&#39;, &#39;là Cổ Mã &quot;và&quot; Phương pháp định giá&#39;"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,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/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 +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Lưu ý: Hệ thống sẽ không kiểm tra trên giao và quá đặt phòng cho hàng {0} như số lượng hoặc số lượng là 0
 DocType: Notification Control,Quotation Message,thông tin báo giá
 DocType: Issue,Opening Date,Mở ngày
-apps/erpnext/erpnext/schools/api.py +58,Attendance has been marked successfully.,Tham dự đã được đánh dấu thành công.
+apps/erpnext/erpnext/schools/api.py +57,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 +136,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 +139,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
@@ -2722,12 +2752,13 @@
 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/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 +20,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 +1190,Please select customer,Vui lòng chọn của khách hàng
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1193,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
@@ -2737,6 +2768,7 @@
 ,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 +50,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: 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-
@@ -2754,11 +2786,12 @@
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Tên chủ đề
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Ít nhất bán hàng hoặc mua hàng phải được lựa chọn
+DocType: Grading Structure,Grade Intervals,Khoảng lớp
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Chọn bản chất của doanh nghiệp của bạn.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Trường hợp hoạt động sản xuất được thực hiện.
 DocType: Asset Movement,Source Warehouse,Kho nguồn
 DocType: Installation Note,Installation Date,Cài đặt ngày
-apps/erpnext/erpnext/controllers/accounts_controller.py +534,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}
+apps/erpnext/erpnext/controllers/accounts_controller.py +537,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
@@ -2772,28 +2805,31 @@
 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 +111,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/scheduling_tool/scheduling_tool.py +49,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 +87,{0}% Delivered,{0}% Đã giao hàng
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% Đã giao hàng
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Mục {0}: qty Ra lệnh {1} không thể ít hơn qty đặt hàng tối thiểu {2} (quy định tại khoản).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Tỷ lệ phân phối hàng tháng
 DocType: Territory,Territory Targets,Đị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 +379,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 +456,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ỗ
 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
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Tiêu đề cho các mẫu in, ví dụ như hóa đơn chiếu lệ."
+DocType: Student Guardian,Student Guardian,Người giám hộ sinh viên
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +184,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/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 +349,Journal Entries {0} are un-linked,Journal Entries {0} là un-liên kết
+apps/erpnext/erpnext/accounts/utils.py +426,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
@@ -2817,6 +2853,7 @@
 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
+DocType: Homepage,"URL for ""All Products""",URL cho &quot;Tất cả các sản phẩm&quot;
 DocType: Leave Application,Leave Balance Before Application,Trước khi rời khỏi cân ứng dụng
 DocType: SMS Center,Send SMS,Gửi tin nhắn SMS
 DocType: Cheque Print Template,Width of amount in word,Chiều rộng của số tiền trong từ
@@ -2825,7 +2862,7 @@
 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 +29,Current Job Openings,Hiện tại Hở Job
+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
 DocType: Journal Entry,Write Off,Viết một bài báo
 DocType: Timesheet Detail,Operation ID,Operation ID
@@ -2838,7 +2875,7 @@
 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 +850,Show tax break-up,Hiện thuế break-up
+apps/erpnext/erpnext/public/js/controllers/transaction.js +841,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/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ó"
@@ -2848,10 +2885,11 @@
 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 +534,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 +80,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 +162,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/selling/doctype/customer/customer.py +195,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ò
 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 +5,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
@@ -2860,12 +2898,11 @@
 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 +75,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 +138,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/hr/doctype/leave_application/leave_application.py +145,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: Program Enrollment Fee,Program Enrollment Fee,Chương trình Lệ phí đăng ký
 DocType: Item,Supplier Items,Nhà cung cấp Items
 DocType: Opportunity,Opportunity Type,Loại cơ hội
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,Công ty mới
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,Cost Center is required for 'Profit and Loss' account {0},Phải có Chi phí bộ phận cho tài khoản 'Lãi lỗ' {0}
 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: Cheque Print Template,Cheque Width,Chiều rộng Séc
@@ -2874,16 +2911,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,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 +228,{0} '{1}' is disabled,{0} '{1}' bị vô hiệu hóa
+apps/erpnext/erpnext/controllers/accounts_controller.py +231,{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: 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: Warranty Claim,Item and Warranty Details,Hàng và bảo hành chi tiết
 DocType: Sales Team,Contribution (%),Đóng góp (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Lưu ý: 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 +178,Responsibilities,Trách nhiệm
+apps/erpnext/erpnext/controllers/accounts_controller.py +78,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
 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
@@ -2891,6 +2929,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Thêm người dùng
 DocType: Pricing Rule,Item Group,Nhóm hàng
 DocType: Item,Safety Stock,Chứng khoán An toàn
+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: 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)
@@ -2900,7 +2939,6 @@
 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: Timesheet,Total Hours,Tổng số giờ
 DocType: Journal Entry,Printing Settings,In ấn Cài đặt
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,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ô
@@ -2913,13 +2951,14 @@
 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 +71,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á
+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ổ
 DocType: Purchase Invoice Item,Rate,Đơn giá
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Intern,Tập
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,Tập
 DocType: Stock Entry,From BOM,Từ BOM
 DocType: Assessment,Assessment Code,Mã Đánh giá
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +32,Basic,Cơ bản
+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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',Vui lòng click vào 'Tạo lịch'
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +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 +95,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
@@ -2928,11 +2967,11 @@
 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 +752,Issue Material,Vấn đề liệu
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +723,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 +683,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 +665,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.
 DocType: Hub Settings,Access Token,Mã truy cập
 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
@@ -2940,33 +2979,35 @@
 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 +1122,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 +96,All Territories,Tất cả các vùng lãnh thổ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1125,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ổ
 DocType: Purchase Invoice,Items,Khoản mục
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +23,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 +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.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +233,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 +96,Request for Quotations,Yêu cầu Báo giá
+apps/erpnext/erpnext/hooks.py +104,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
 DocType: Asset,Partially Depreciated,Nhiều khấu hao
 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 +628,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Mặc định Đơn vị đo lường cho Variant &#39;{0}&#39; phải giống như trong Template &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Mặc định Đơn vị đo lường cho Variant &#39;{0}&#39; phải giống như trong Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Tính toán dựa trên
 DocType: Delivery Note Item,From Warehouse,Từ kho
 DocType: Assessment,Supervisor Name,Tên Supervisor
+DocType: Assessment,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
 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 +27,Default Address Template cannot be deleted,Địa chỉ mặc định mẫu không thể bị xóa
+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
 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 đề
@@ -2981,8 +3022,8 @@
 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/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 +485,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 +336,Please select Posting Date first,Vui lòng chọn ngày đầu tiên viết bài
+apps/erpnext/erpnext/stock/get_item_details.py +486,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 +326,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
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Chi phí bộ phận với các phát sinh hiện có không thể được chuyển đổi sang sổ cái
@@ -2998,6 +3039,7 @@
 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
 DocType: Authorization Rule,Applicable To (Designation),Để áp dụng (Chỉ)
+,Profitability Analysis,Phân tích lợi nhuận
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,Thêm vào giỏ hàng
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Nhóm By
 DocType: Guardian,Interests,Sở thích
@@ -3010,22 +3052,22 @@
 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/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 +141,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"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"
 DocType: Scheduling Tool,Day,ngày
 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 +122,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/hr/doctype/leave_application/leave_application.py +129,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
-DocType: Student Applicant,AP.,AP.
 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 +639,Point of Sale,Điểm bán hàng
+apps/erpnext/erpnext/accounts/page/pos/pos.js +634,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ế
 DocType: Production Planning Tool,Production Planning Tool,Công cụ sản xuất Kế hoạch
@@ -3034,74 +3076,77 @@
 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 +373,Quantity to Manufacture must be greater than 0.,Số lượng để sản xuất phải lớn hơn 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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 Profile,Customer Group,Nhóm khách hàng
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,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/doctype/asset/asset.py +83,Next Depreciation Date must be on or after today,Tiếp Khấu hao ngày phải vào hoặc sau ngày nay
 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 +145,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: Quotation,Quotation Lost Reason,lý do báo giá thất bại
+apps/erpnext/erpnext/utilities/doctype/address/address.py +164,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.
 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 +330,Transaction reference no {0} dated {1},tham chiếu giao dịch không có {0} ngày {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,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 +107,Summary for this month and pending activities,Tóm tắt cho tháng này và các hoạt động cấp phát
+apps/erpnext/erpnext/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/accounts/doctype/sales_invoice/sales_invoice.py +406,Please remove this Invoice {0} from C-Form {1},Hãy loại bỏ hóa đơn này {0} từ C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,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 +644,Get Items,Được mục
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +623,Get Items,Được mục
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +210,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 +41,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
 DocType: Payment Request,Initiated,Được khởi xướng
 DocType: Production Order,Planned Start Date,Ngày bắt đầu lên kế hoạch
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,Customer is required against Receivable account {0},Khách hàng được yêu cầu đối với tài khoản phải thu {0}
 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 +265,Project-wise data is not available for Quotation,Dữ liệu chuyên-dự án không có sẵn cho báo giá
+apps/erpnext/erpnext/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 +101,Commercial,Thương mại
+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/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: Supplier Quotation,Supplier Address,Địa chỉ nhà cung cấp
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +648,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/accounts/doctype/purchase_invoice/purchase_invoice.py +651,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 +30,Series is mandatory,Series là bắt buộc
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +50,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
 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}
 DocType: Leave Allocation,Unused leaves,Lá chưa sử dụng
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Cr,Cr
 DocType: Tax Rule,Billing State,Bang thanh toán
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +250,Transfer,Truyền
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +187,{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 +825,Fetch exploded BOM (including sub-assemblies),Lấy BOM nổ (bao gồm các cụm chi tiết)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +254,Transfer,Truyền
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +190,{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 +796,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 +115,Due Date is mandatory,Ngày đến hạn là bắt buộc
+apps/erpnext/erpnext/controllers/accounts_controller.py +118,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
 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
 ,Inactive Customers,Khách hàng không được kích hoạt
+DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Hóa đơn mua hàng
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Làm thế nào giá Quy tắc được áp dụng?
 DocType: Quality Inspection,Delivery Note No,Giao hàng tận nơi Lưu ý Không
@@ -3110,7 +3155,7 @@
 DocType: Company,Retail,Lĩnh vực bán lẻ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +120,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 +587,Product Bundle,Sản phẩm lô
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Product Bundle,Sản phẩm lô
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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
@@ -3120,8 +3165,8 @@
 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 +742,Send Supplier Emails,Gửi email Nhà cung cấp
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +104,"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/buying/doctype/request_for_quotation/request_for_quotation.js +708,Send Supplier Emails,Gửi email Nhà cung cấp
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,"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
 DocType: Guardian Interest,Guardian Interest,người giám hộ lãi
 DocType: Timesheet,Employee Detail,Nhân viên chi tiết
@@ -3132,9 +3177,9 @@
 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}
 DocType: Salary Slip,Earning & Deduction,Thu nhập và khoản giảm trừ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +77,Account {0} cannot be a Group,Tài khoản {0} không thể là nhóm
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} cannot be a Group,Tài khoản {0} không thể là nhóm
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +31,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 +107,Negative Valuation Rate is not allowed,Tỷ lệ tiêu cực Định giá không được phép
+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
 DocType: Holiday List,Weekly Off,Tắt tuần
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Ví dụ như năm 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +39,Provisional Profit / Loss (Credit),Lợi nhuận tạm thời / lỗ (tín dụng)
@@ -3148,16 +3193,16 @@
 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 +176,{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/accounts/doctype/purchase_invoice/purchase_invoice.js +626,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 +605,Get Items from Product Bundle,Chọn mục từ Sản phẩm theo lô
 DocType: Asset,Straight Line,Đường thẳng
 DocType: Project User,Project User,Dự án tài
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} is inactive,Tài khoản {0} không hoạt động
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} is inactive,Tài khoản {0} không hoạt động
 DocType: GL Entry,Is Advance,Là Trước
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,"""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: Bank Reconciliation,Payment Entries,Entries thanh toán
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,'Profit and Loss' type account {0} not allowed in Opening Entry,Kiểu tài khoản 'Lãi và Lỗ' {0} không được phép có trong bút toán đầu kỳ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +71,'Profit and Loss' type account {0} not allowed in Opening Entry,Kiểu tài khoản 'Lãi và Lỗ' {0} không được phép có trong bút toán đầu kỳ
 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
@@ -3176,7 +3221,7 @@
 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,Hoa hồng trên doanh thu
 DocType: Offer Letter Term,Value / Description,Giá trị / Mô tả
-apps/erpnext/erpnext/controllers/accounts_controller.py +558,"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}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +561,"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: Production Order,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}.
@@ -3189,13 +3234,13 @@
 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/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: Sales Order,% Amount Billed,% Số tiền đã ghi hđơn
+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.
 apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},Không có hàng với Serial No {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Mở Notifications
+DocType: Email Digest,Open Notifications,Mở Notifications
 DocType: Payment Entry,Difference Amount (Company Currency),Chênh lệch Số tiền (Công ty ngoại tệ)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,Chi phí trực tiếp
 apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
@@ -3203,7 +3248,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Doanh thu khách hàng mới
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,Chi phí đi lại
 DocType: Maintenance Visit,Breakdown,Hỏng
-apps/erpnext/erpnext/controllers/accounts_controller.py +634,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}
+apps/erpnext/erpnext/controllers/accounts_controller.py +637,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}
 DocType: Program Enrollment Tool,Student Applicants,Ứng sinh viên
@@ -3211,15 +3256,15 @@
 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 +56,Probation,Quản chế
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Probation,Quản chế
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Linh kiện lương
 DocType: Program Enrollment Tool,New Academic Year,Năm mới học
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Payment of salary for the month {0} and year {1},Thanh toán tiền lương trong tháng {0} và năm {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Payment of salary for the month {0} and year {1},Thanh toán tiền lương trong tháng {0} và năm {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Auto chèn tỷ Bảng giá nếu mất tích
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Tổng số tiền trả
 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 +144,Planning,Hoạch định
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,Hoạch định
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,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
@@ -3232,11 +3277,10 @@
 DocType: Sales Partner,Contact Desc,Liên hệ với quyết định
 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.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Sales invoice submitted sucessfully.,hóa đơn bán hàng gửi thành công.
 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}
 DocType: Assessment Result,Student Name,Tên học sinh
-apps/erpnext/erpnext/hooks.py +104,Assessment Schedule,Lịch trình đánh giá
+apps/erpnext/erpnext/hooks.py +113,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
@@ -3246,6 +3290,7 @@
 DocType: GL Entry,Party Type,Loại bên
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +78,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
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Lương mẫu chủ.
 DocType: Leave Type,Max Days Leave Allowed,Để lại tối đa ngày phép
@@ -3257,18 +3302,19 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Báo giá cho Lead hoặc cho 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 +99,All Customer Groups,Tất cả các nhóm khách hàng
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +78,Accumulated Monthly,tích lũy hàng tháng
-apps/erpnext/erpnext/controllers/accounts_controller.py +595,{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/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 +81,Accumulated Monthly,tích lũy hàng tháng
+apps/erpnext/erpnext/controllers/accounts_controller.py +598,{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
 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
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +188,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
 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 +84,Secretary,Thư ký
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,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
@@ -3277,24 +3323,22 @@
 ,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á
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,Row # {0}: Serial No là bắt buộc
+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 +859,Supplier Quotation,Báo giá của NCC
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +838,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 +7,Collect Fees,thu thập Phí
+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}
 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.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,sự kiện sắp tới
 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
-DocType: Email Digest,Income / Expense,Thu nhập / chi phí
 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."
@@ -3306,13 +3350,14 @@
 DocType: Customer,From Lead,Từ chì
 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 +453,POS Profile required to make POS Entry,POS hồ sơ cần thiết để làm cho POS nhập
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +509,POS Profile required to make POS Entry,POS hồ sơ cần thiết để làm cho POS nhập
 DocType: Program Enrollment Tool,Enroll Students,Ghi danh học sinh
 DocType: Hub Settings,Name Token,Tên Mã
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Tiêu chuẩn bán hàng
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Atleast one warehouse is mandatory,Ít nhất một kho là bắt buộc
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +129,Atleast one warehouse is mandatory,Ít nhất một kho là bắt buộc
 DocType: Serial No,Out of Warranty,Ra khỏi bảo hành
 DocType: BOM Replace Tool,Replace,Thay thế
+DocType: Production Order,Unstopped,Unstopped
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{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
@@ -3333,10 +3378,11 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Lá phải được phân bổ trong bội số của 0,5"
 DocType: Production Order,Operation Cost,Chi phí hoạt động
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,Tải lên tham gia từ một tập tin csv.
+apps/erpnext/erpnext/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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Nổi bật Amt
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Mục tiêu đề ra mục Nhóm-khôn ngoan cho người bán hàng này.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Cổ phiếu đóng băng cũ hơn [Ngày]
-apps/erpnext/erpnext/controllers/accounts_controller.py +528,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: tài sản là bắt buộc đối với tài sản cố định mua / bán
+apps/erpnext/erpnext/controllers/accounts_controller.py +531,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: tài sản là bắt buộc đối với tài sản cố định mua / bán
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Nếu hai hoặc nhiều Rules giá được tìm thấy dựa trên các điều kiện trên, ưu tiên được áp dụng. Ưu tiên là một số từ 0 đến 20, trong khi giá trị mặc định là số không (trống). Số cao hơn có nghĩa là nó sẽ được ưu tiên nếu có nhiều Rules giá với điều kiện tương tự."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Năm tài chính: {0} không tồn tại
 DocType: Currency Exchange,To Currency,Để tệ
@@ -3353,15 +3399,15 @@
 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
-DocType: Sales Invoice,Exhibition,Triển lam
 apps/erpnext/erpnext/utilities/doctype/address/address.py +77,"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 +81,Syntax error in formula or condition: {0},Lỗi cú pháp trong công thức hoặc điều kiện: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +92,Syntax error in formula or condition: {0},Lỗi cú pháp trong công thức hoặc điều kiện: {0}
 apps/erpnext/erpnext/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
+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 +28,Jobs,việc làm
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,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
@@ -3370,16 +3416,16 @@
 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 +763,Make Supplier Quotation,Tạo báo giá của NCC
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,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/controllers/sales_and_purchase_return.py +100,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 +42,Casual Leave,Để lại bình thường
+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
 DocType: Batch,Batch ID,ID Lô
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,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 +103,This Week's Summary,Tóm tắt tuần này
+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
 DocType: Student Group Creation Tool,Get Courses,Nhận Học
 DocType: GL Entry,Party,Bên
@@ -3389,7 +3435,7 @@
 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 +59,Piecework,Việc làm ăn khoán
+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
 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
@@ -3406,7 +3452,7 @@
 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.
 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 +162,Black,Đen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,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
@@ -3417,13 +3463,13 @@
 DocType: Project Task,Pending Review,Đang chờ xem xét
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +106,"Asset {0} cannot be scrapped, as it is already {1}","Tài sản {0} không thể được loại bỏ, vì nó đã được {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Tổng số yêu cầu bồi thường chi phí (thông qua Chi Claim)
-apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +69,Customer Id,Id của khách hàng
+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
 DocType: Journal Entry Account,Exchange Rate,Tỷ giá
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Sales Order {0} is not submitted,Đơn đặt hàng {0} chưa duyệt
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +527,Sales Order {0} is not submitted,Đơn đặt hàng {0} chưa duyệt
 DocType: Homepage,Tag Line,Dòng Tag
 DocType: Fee Component,Fee Component,phí Component
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +857,Add items from,Thêm các mục từ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +836,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}
 DocType: Cheque Print Template,Regular,Đều đặn
 DocType: BOM,Last Purchase Rate,Cuối cùng Rate
@@ -3431,6 +3477,7 @@
 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ể
 ,Sales Person-wise Transaction Summary,Người khôn ngoan bán hàng Tóm tắt thông tin giao dịch
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +60,Cost Center is required for 'Profit and Loss' account {0}. Please set up a default Cost Center for the Company.,Trung tâm chi phí là cần thiết cho &#39;Lỗ&#39; tài khoản {0}. Hãy thiết lập một Trung tâm chi phí mặc định cho Công ty.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,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
@@ -3441,12 +3488,12 @@
 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 +710,Online,Trực tuyến
+apps/erpnext/erpnext/accounts/page/pos/pos.js +692,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 +16,Setting this Address Template as default as there is no other default,Địa chỉ thiết lập mẫu này như mặc định là không có mặc định khác
+apps/erpnext/erpnext/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
 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 +74,Quality Management,Quản lý chất lượng
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,Quản lý chất lượng
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,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ử
@@ -3468,11 +3515,12 @@
 DocType: Student,Student Email ID,Email ID Sinh viên
 DocType: Employee,Notice (days),Thông báo (ngày)
 DocType: Tax Rule,Sales Tax Template,Template Thuế bán hàng
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1520,Select items to save the invoice,Chọn mục để lưu các hoá đơn
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1544,Select items to save the invoice,Chọn mục để lưu các hoá đơn
 DocType: Employee,Encashment Date,Encashment Date
 DocType: Account,Stock Adjustment,Điều chỉnh hàng tồn kho
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Mặc định Hoạt động Chi phí tồn tại cho Type Hoạt động - {0}
 DocType: Production Order,Planned Operating Cost,Chi phí điều hành kế hoạch
+DocType: Academic Term,Term Start Date,Hạn Ngày bắt đầu
 apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},{0} # Xin vui lòng tìm thấy kèm theo {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Bank Statement balance as per General Ledger
 DocType: Job Applicant,Applicant Name,Tên đơn
@@ -3502,17 +3550,17 @@
 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.
 DocType: Company,Distribution,Gửi đến:
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +8,Amount Paid,Số tiền trả
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Project Manager,Giám đốc dự á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
 ,Quoted Item Comparison,Quoted hàng So sánh
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Dispatch,Công văn
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,Công văn
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Tối đa cho phép giảm giá cho mặt hàng: {0} {1}%
 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.
-DocType: Sales Invoice,Supplier Reference,Nhà cung cấp tham khảo
-apps/erpnext/erpnext/accounts/page/pos/pos.js +844,"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 +832,"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
@@ -3526,7 +3574,7 @@
 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 +83,Error in formula or condition,Lỗi trong công thức hoặc điều kiện
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,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ả
@@ -3535,7 +3583,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},Đến ngày phải được trong năm tài chính. Giả sử Đến ngày = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Ở đây bạn có thể duy trì chiều cao, cân nặng, dị ứng, mối quan tâm y tế vv"
 DocType: Leave Block List,Applies to Company,Áp dụng đối với Công ty
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +197,Cannot cancel because submitted Stock Entry {0} exists,Không thể hủy bỏ vì chứng từ hàng tôn kho gửi duyệt{0} đã  tồn tại
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +198,Cannot cancel because submitted Stock Entry {0} exists,Không thể hủy bỏ vì chứng từ hàng tôn kho gửi duyệt{0} đã  tồn tại
 DocType: Purchase Invoice,In Words,Trong từ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,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
@@ -3545,14 +3593,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,Năm tài chính của bạn bắt đầu từ ngày
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Khấu hao và dư tài sản
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +319,Amount {0} {1} transferred from {2} to {3},Số tiền {0} {1} chuyển từ {2} để {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +322,Amount {0} {1} transferred from {2} to {3},Số tiền {0} {1} chuyển từ {2} để {3}
 DocType: Sales Invoice,Get Advances Received,Được nhận trước
 DocType: Email Digest,Add/Remove Recipients,Thêm/Xóa người nhận
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +432,Transaction not allowed against stopped Production Order {0},Giao dịch không được phép chống lại dừng lại tự sản xuất {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +437,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 +143,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 +652,Item variant {0} exists with same attributes,Mục biến {0} tồn tại với cùng một thuộc tính
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Mục biến {0} tồn tại với cùng một thuộc tính
+DocType: Leave Application,LAP/,LAP /
 DocType: Salary Slip,Salary Slip,Lương trượt
 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'
@@ -3560,12 +3609,12 @@
 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 +212,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 +215,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."
 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/public/js/controllers/transaction.js +866,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 +857,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
@@ -3575,14 +3624,14 @@
 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 +178,Invalid {0},Không hợp lệ {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Sick Leave,Để lại bệnh
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,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
 DocType: Warehouse,PIN,GHIM
 DocType: Sales Invoice,Base Change Amount (Company Currency),Thay đổi Số tiền cơ sở (Công ty ngoại tệ)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +313,No accounting entries for the following warehouses,Không ghi sổ kế toán cho các kho sau
-apps/erpnext/erpnext/projects/doctype/project/project.js +102,Save the document first.,Lưu tài liệu đầu tiên.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +314,No accounting entries for the following warehouses,Không ghi sổ kế toán cho các kho sau
+apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Lưu tài liệu đầu tiên.
 DocType: Account,Chargeable,Buộc tội
 DocType: Company,Change Abbreviation,Thay đổi Tên viết tắt
 DocType: Expense Claim Detail,Expense Date,Ngày Chi phí
@@ -3595,10 +3644,9 @@
 DocType: Purchase Invoice,Recurring Print Format,Định kỳ 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,Ngày Dự kiến giao hàng không thể trước Ngày đặt mua
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,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
 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 +87,Business Development Manager,Giám đốc phát triển kinh doanh
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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
@@ -3608,8 +3656,8 @@
 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 +940,Please select {0} first,Vui lòng chọn {0} đầu tiên
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +749,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 +953,Please select {0} first,Vui lòng chọn {0} đầu tiên
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +757,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
@@ -3637,8 +3685,8 @@
  {% 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 +92,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 +106,This Month's Summary,Tóm tắt của tháng này
+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
 DocType: Quality Inspection Reading,Quality Inspection Reading,Đọc kiểm tra chất lượng
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,'đóng băng hàng tồn kho muộn hơn' nên nhỏ hơn %d ngày
 DocType: Tax Rule,Purchase Tax Template,Mua Template Thuế
@@ -3648,21 +3696,22 @@
 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 +87,Please set Next Depreciation Date,Hãy đặt Tiếp Khấu hao ngày
-DocType: Payment Gateway,Payment Gateway,Cổng thanh toán
 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 +378,Operation Time must be greater than 0 for Operation {0},Thời gian hoạt động phải lớn hơn 0 cho hoạt động {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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/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ệ
 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)
 DocType: Program,Program Abbreviation,Tên viết tắt chương trình
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,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: Appraisal,Start Date,Ngày bắt đầu
@@ -3678,21 +3727,22 @@
 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 đó
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Ví dụ. smsgateway.com / api / send_sms.cgi
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +27,Transaction currency must be same as Payment Gateway currency,Đồng tiền giao dịch phải được giống như thanh toán tiền tệ Cổng
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Transaction currency must be same as Payment Gateway currency,Đồng tiền giao dịch phải được giống như thanh toán tiền tệ Cổng
 DocType: Payment Entry,Receive,Nhận
+apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,Báo giá:
 DocType: Maintenance Visit,Fully Completed,Hoàn thành đầy đủ
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Hoàn thành
 DocType: Employee,Educational Qualification,Trình độ chuyên môn giáo dục
 DocType: Workstation,Operating Costs,Chi phí điều hành
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Hành động nếu tích lũy ngân sách hàng tháng vượt quá
 DocType: Purchase Invoice,Submit on creation,Gửi về sáng tạo
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +432,Currency for {0} must be {1},Đồng tiền cho {0} phải là {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +435,Currency for {0} must be {1},Đồng tiền cho {0} phải là {1}
 DocType: Asset,Disposal Date,Xử ngày
 DocType: Employee Leave Approver,Employee Leave Approver,Nhân viên Để lại phê duyệt
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,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 +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/crm/doctype/opportunity/opportunity.py +79,"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."
 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 +429,Production Order {0} must be submitted,Đặt hàng sản xuất {0} phải được gửi
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +434,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
@@ -3702,25 +3752,27 @@
 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/accounts/report/general_ledger/general_ledger.py +181,Totals,{0}{/0}{1}{/1} {2}{/2}Tổng giá trị
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,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 +113,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 +120,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.
+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 +181,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/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 +793,All records are synced.,Tất cả hồ sơ được đồng bộ hóa.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +781,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
 DocType: Cost Center,Cost Center Name,Tên bộ phận chi phí
@@ -3739,21 +3791,20 @@
 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/selling/doctype/quotation/quotation.py +49,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: Student Applicant,Mother's Name,Tên của mẹ
 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 +348,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',không thể trừ khi mục là cho &#39;định giá&#39; hoặc &#39;Vaulation và Total&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Received From,Nhận được từ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Received From,Nhận được từ
 DocType: Lead,Converted,Chuyển đổi
 DocType: Item,Has Serial No,Có Serial No
 DocType: Employee,Date of Issue,Ngày phát hành
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{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 +93,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/projects/doctype/timesheet/timesheet.py +117,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
 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 +172,{0} {1} does not exist,{0} {1} không tồn tại
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +175,{0} {1} does not exist,{0} {1} không tồn tại
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,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 +72,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
@@ -3762,13 +3813,14 @@
 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/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
 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 +109,Electrical,Hệ thống điện
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,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 +318,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}
@@ -3776,7 +3828,7 @@
 DocType: Item,Customer Code,Mã số khách hàng
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +210,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 +292,Debit To account must be a Balance Sheet account,Nợ Để tài khoản phải có một tài khoản Cân đối kế toán
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To account must be a Balance Sheet account,Nợ Để tài khoản phải có một tài khoản Cân đối kế toán
 DocType: Buying Settings,Naming Series,Đặt tên dòng
 DocType: Leave Block List,Leave Block List Name,Để lại Block List Tên
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Tài sản hàng tồn kho
@@ -3788,11 +3840,11 @@
 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 +301,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 +313,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: Sales Order Item,Ordered Qty,Số lượng đặt hàng
-apps/erpnext/erpnext/stock/doctype/item/item.py +673,Item {0} is disabled,Mục {0} bị vô hiệu hóa
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,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 +838,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 +809,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ụ.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Tạo ra lương Trượt
@@ -3800,23 +3852,24 @@
 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ệ)
-apps/erpnext/erpnext/stock/doctype/item/item.py +485,Row #{0}: Please set reorder quantity,Row # {0}: Hãy thiết lập số lượng đặt hàng
+DocType: Sales Invoice Timesheet,Billing Hours,Giờ Thanh toán
+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
 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 +62,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
+DocType: Payment Entry,Allocate Payment Amount,Phân bổ số tiền thanh toán
 DocType: Employee External Work History,Salary,Lương bổng
 DocType: Serial No,Delivery Document Type,Loại tài liệu giao hàng
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Gửi tất cả các phiếu lương cho các tiêu chí lựa chọn ở trên
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} các mục đã được đồng bộ hóa
 DocType: Sales Order,Partly Delivered,Một phần Giao
-DocType: Sales Invoice,Existing Customer,Khách hàng hiện tại
 DocType: Email Digest,Receivables,Các khoản phải thu
+DocType: Lead Source,Lead Source,Nguồn dẫn
 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
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +38,Campaign Name is required,Phải có tên chiến dịch
 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.
@@ -3825,10 +3878,9 @@
 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 +129,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 +113,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
-DocType: Bank Reconciliation Detail,Amount,Giá trị
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM đã thay thế
 ,Sales Analytics,Bán hàng Analytics
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +113,Available {0},Sẵn {0}
@@ -3836,14 +3888,14 @@
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Thiết lập Email
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +96,Please enter default currency in Company Master,Vui lòng nhập tiền tệ mặc định trong Công ty Thạc sĩ
 DocType: Stock Entry Detail,Stock Entry Detail,Chi tiết phiếu nhập kho
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +100,Daily Reminders,Nhắc nhở hàng ngày
+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/account/account_tree.js +23,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 +71,Customer Service,Dịch vụ chăm sóc khách 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
 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.
@@ -3852,8 +3904,9 @@
 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
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Kho SP dở dang mặc định
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1570,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/accounts/page/pos/pos.js +1594,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ố
@@ -3861,9 +3914,10 @@
 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 +82,Engineer,Kỹ sư
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,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 +370,Item Code required at Row No {0},Mã mục bắt buộc khi Row Không có {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +398,Item Code required at Row No {0},Mã mục bắt buộc khi Row Không có {0}
 DocType: Sales Partner,Partner Type,Loại đối tác
 DocType: Purchase Taxes and Charges,Actual,Dựa trên tiền thực tế
 DocType: Authorization Rule,Customerwise Discount,Giảm giá 1 cách thông minh
@@ -3879,16 +3933,18 @@
 DocType: BOM,Raw Material Cost,Chi phí nguyên liệu thô
 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/setup/setup_wizard/install_fixtures.py +55,Part-time,Bán thời gian
+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
 DocType: Employee,Applicable Holiday List,Áp dụng lễ Danh sách
 DocType: Employee,Cheque,Séc
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Cập nhật hàng loạt
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +57,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
 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 +87,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
@@ -3902,7 +3958,7 @@
 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 +513,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 +518,Posting date and posting time is mandatory,Ngày đăng và gửi bài thời gian là bắt buộc
 apps/erpnext/erpnext/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.
@@ -3912,7 +3968,7 @@
 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/stock/doctype/stock_entry/stock_entry.py +158,Target warehouse in row {0} must be same as Production Order,Kho hàng mục tiêu trong {0} phải được giống như sản xuất theo thứ tự
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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
 DocType: Company,Round Off Account,Vòng Tắt tài khoản
@@ -3921,23 +3977,22 @@
 DocType: Customer Group,Parent Customer Group,Nhóm mẹ của nhóm khách hàng
 DocType: Purchase Invoice,Contact Email,Liên hệ Email
 DocType: Appraisal Goal,Score Earned,Điểm số kiếm được
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Notice Period,Thông báo Thời gian
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,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 +4,New Sales Person Name,Tên mới Người Bán hàng
 DocType: Packing Slip,Gross Weight UOM,Tổng trọng lượng UOM
-DocType: Email Digest,Receivables / Payables,Các khoản phải thu / phải trả
 DocType: Delivery Note Item,Against Sales Invoice,Theo hóa đơn bán hàng
 DocType: Bin,Reserved Qty for Production,Reserved Số lượng cho sản xuất
 DocType: Asset,Frequency of Depreciation (Months),Tần số của Khấu hao (Tháng)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +469,Credit Account,Tài khoản tín dụng
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Credit Account,Tài khoản tín dụng
 DocType: Landed Cost Item,Landed Cost Item,Chi phí hạ cánh hàng
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +55,Show zero values,Hiện không có giá trị
+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
 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 +647,Please specify Attribute Value for attribute {0},Hãy xác định thuộc tính Giá trị thuộc tính {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Hãy xác định thuộc tính Giá trị thuộc tính {0}
 DocType: Item,Default Warehouse,Kho mặc định
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +39,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ẹ
@@ -3959,19 +4014,22 @@
 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
-DocType: Sales Invoice,Cold Calling,Cold Calling
 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: Maintenance Schedule Item,Half Yearly,Nửa Trong Năm
 DocType: Lead,Blog Subscriber,Blog Subscriber
+DocType: Guardian,Alternate Number,Số thay thế
 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.
+DocType: Stock Reconciliation Item,Quantity Difference,Số lượng Sự khác biệt
 apps/erpnext/erpnext/config/hr.py +253,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 +141,Set as Lost,Thiết lập như Lost
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,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 +5,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
 DocType: Supplier,Credit Days Based On,Days Credit Dựa Trên
@@ -3983,11 +4041,10 @@
 ,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 +941,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 +930,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 +5,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
-DocType: Sales Invoice,Frequency,Tần số
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +463,Debit Account,Nợ TK
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,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 )
@@ -3996,27 +4053,27 @@
 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 +210,Supplier Quotation {0} created,Nhà cung cấp bảng báo giá {0} đã tạo
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +208,Supplier Quotation {0} created,Nhà cung cấp bảng báo giá {0} đã tạo
 apps/erpnext/erpnext/accounts/report/financial_statements.py +90,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 +173,Employee Benefits,Lợi ích của nhân viên
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,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 +228,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 +232,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 +499,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 +500,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 +1007,Price List not found or disabled,Danh sách giá không tìm thấy hoặc bị vô hiệu hóa
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1008,Price List not found or disabled,Danh sách giá không tìm thấy hoặc bị vô hiệu hóa
 DocType: Expense Claim,Approved,Đã được phê duyệt
 DocType: Pricing Rule,Price,Giá
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +244,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 +256,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
@@ -4027,12 +4084,12 @@
 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 +259,Please select Employee Record first.,Vui lòng chọn nhân viên ghi đầu tiên.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +266,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 +190,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 +235,Please enter Expense Account,Vui lòng nhập tài khoản chi phí
+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í
 DocType: Account,Stock,Kho
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,"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 +976,"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
@@ -4047,9 +4104,10 @@
 DocType: Asset Movement,Transaction Date,Giao dịch ngày
 DocType: Production Plan Item,Planned Qty,Số lượng dự kiến
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,Tổng số thuế
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,For Quantity (Manufactured Qty) is mandatory,Đối với lượng (Sản xuất Qty) là bắt buộc
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,For Quantity (Manufactured Qty) is mandatory,Đối với lượng (Sản xuất Qty) là bắt buộc
 DocType: Stock Entry,Default Target Warehouse,Mặc định mục tiêu kho
 DocType: Purchase Invoice,Net Total (Company Currency),Net Tổng số (Công ty tiền tệ)
+apps/erpnext/erpnext/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 +78,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: Production Order,Actual Start Date,Ngày bắt đầu thực tế
@@ -4064,9 +4122,11 @@
 DocType: Warranty Claim,If different than customer address,Nếu khác với địa chỉ của khách hàng
 DocType: BOM Operation,BOM Operation,BOM Operation
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Dựa trên số tiền dòng trên
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +226,Transfer Asset,chuyển nhượng tài sản
+DocType: Student,Home Address,Địa chỉ nhà
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +227,Transfer Asset,chuyển nhượng tài sản
 DocType: POS Profile,POS Profile,POS hồ sơ
 apps/erpnext/erpnext/config/schools.py +33,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 +129,"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
@@ -4076,8 +4136,8 @@
 DocType: Assessment,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 +765,Material to Supplier,Chất liệu để Nhà cung cấp
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +189,Excise Invoice,Tiêu thụ đặc biệt Invoice
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,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
 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
@@ -4087,7 +4147,7 @@
 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/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 +136,Credit Card,Thẻ tín dụng
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,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.
 DocType: Purchase Invoice,Next Date,Tiếp theo ngày
@@ -4095,6 +4155,7 @@
 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: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Ở đây bạn có thể duy trì chi tiết gia đình như tên và nghề nghiệp của cha mẹ, vợ, chồng và con cái"
+DocType: Academic Term,Term End Date,Hạn cuối ngày
 DocType: Hub Settings,Seller Name,Tên người bán
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Thuế và Phí được khấu trừ (Theo tiền tệ Cty)
 DocType: Item Group,General Settings,Thiết lập chung
@@ -4106,7 +4167,7 @@
 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/config/hr.py +87,Block leave applications by department.,Block leave applications by department.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +115,"Payment Type must be one of Receive, Pay and Internal Transfer","Loại thanh toán phải là một trong những nhận, phải trả tiền và chuyển giao nội bộ"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +118,"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/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Giỏ hàng rỗng
 DocType: Production Order,Actual Operating Cost,Chi phí hoạt động thực tế
@@ -4121,10 +4182,10 @@
 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
 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 +92,Designer,Nhà thiết kế
+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
 DocType: Serial No,Delivery Details,Chi tiết giao hàng
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +469,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}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +472,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
 ,Item-wise Purchase Register,Item-khôn ngoan mua Đăng ký
 DocType: Batch,Expiry Date,Ngày hết hiệu lực
@@ -4134,12 +4195,12 @@
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Chủ dự án.
 apps/erpnext/erpnext/controllers/status_updater.py +174,"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 +417, (Half Day),(Nửa ngày)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425, (Half Day),(Nửa ngày)
 DocType: Supplier,Credit Days,Ngày tín dụng
 DocType: Leave Type,Is Carry Forward,Được Carry Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +740,Get Items from BOM,Được mục từ BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +711,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/controllers/accounts_controller.py +549,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/controllers/accounts_controller.py +552,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
diff --git a/erpnext/translations/zh-tw.csv b/erpnext/translations/zh-tw.csv
index 0f260fa..ca6566a 100644
--- a/erpnext/translations/zh-tw.csv
+++ b/erpnext/translations/zh-tw.csv
@@ -384,7 +384,7 @@
 DocType: Delivery Note,% Installed,％已安裝
 apps/erpnext/erpnext/public/js/setup_wizard.js +378,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: BOM,Item Desription,項目Desription
+DocType: BOM,Item Description,項目Description
 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,是集團
diff --git a/erpnext/translations/zh.csv b/erpnext/translations/zh.csv
index 988af46..071eea2 100644
--- a/erpnext/translations/zh.csv
+++ b/erpnext/translations/zh.csv
@@ -18,11 +18,10 @@
 DocType: Sales Partner,Dealer,经销商
 DocType: Employee,Rented,租
 DocType: Purchase Order,PO-,PO-
-apps/erpnext/erpnext/accounts/report/financial_statements.py +19,Start Year {0} not found.,入学年份{0}没有找到。
 DocType: POS Profile,Applicable for User,适用于用户
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +191,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",停止生产订单无法取消，首先Unstop它取消
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +197,Do you really want to scrap this asset?,难道你真的想放弃这项资产？
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +17,Select Default Supplier,选择默认供应商
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +192,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",停止生产订单无法取消，首先Unstop它取消
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +198,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 +36,Currency is required for Price List {0},价格表{0}需要制定货币
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,*将被计算在该交易内。
 DocType: Address,County,县
@@ -42,46 +41,45 @@
 DocType: Sales Invoice,Customer Name,客户名称
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +126,Bank account cannot be named as {0},银行账户不能命名为{0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,会计分录和维护余额操作针对的组(头)
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +180,Outstanding for {0} cannot be less than zero ({1}),杰出的{0}不能小于零（ {1} ）
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,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 +148,Series Updated Successfully,系列已成功更新
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +149,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,所有供应商联系人
-DocType: Quality Inspection Reading,Parameter,参数
 apps/erpnext/erpnext/projects/doctype/project/project.py +54,Expected End Date can not be less than Expected Start Date,预计结束日期不能小于预期开始日期
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,行＃{0}：速率必须与{1}：{2}（{3} / {4}）
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +239,New Leave Application,新建假期申请
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,New Leave Application,新建假期申请
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +20,Attendance Record {0} exists against Student {1} for Course Schedule {2},考勤记录{0}存在针对学生{1}课程表{2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Bank Draft,银行汇票
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,银行汇票
 DocType: Mode of Payment Account,Mode of Payment Account,付款方式账户
 apps/erpnext/erpnext/stock/doctype/item/item.js +52,Show Variants,显示变体
 DocType: Academic Term,Academic Term,学期
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +13,Material,材料
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Quantity,数量
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +511,Accounts table cannot be blank.,账表不能为空。
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +616,Quantity,数量
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +512,Accounts table cannot be blank.,账表不能为空。
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,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/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 +142,User {0} is already assigned to Employee {1},用户{0}已经被分配给员工{1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,医疗保健
-DocType: Purchase Invoice,Monthly,每月
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),延迟支付（天）
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +771,Invoice,发票
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +750,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 +198,Row {0}: {1} {2} does not match with {3},行{0}：{1} {2}不相匹配{3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,行＃{0}：
+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 +127,Please select Price List,请选择价格表
@@ -112,8 +110,8 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,同一家公司进入不止一次
 DocType: Employee,Married,已婚
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},不允许{0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +589,Get items from,从获得项目
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +382,Stock cannot be updated against Delivery Note {0},送货单{0}不能更新库存
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,从获得项目
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,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,杂货
@@ -122,7 +120,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 +156,Salary Structure Missing,薪酬结构缺失
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Salary Structure Missing,薪酬结构缺失
 DocType: Lead,Person Name,人姓名
 DocType: Sales Invoice Item,Sales Invoice Item,销售发票品目
 DocType: Account,Credit,贷方
@@ -130,10 +128,11 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",如“小学”或“大学”
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,股票报告
 DocType: Warehouse,Warehouse Detail,仓库详细信息
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,Credit limit has been crossed for customer {0} {1}/{2},客户{0} 的信用额度已经越过 {1} / {2}
-apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",是固定资产不能被反选，因为存在资产记录的项目
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +189,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",是固定资产不能被反选，因为存在资产记录的项目
 DocType: Tax Rule,Tax Type,税收类型
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +144,You are not authorized to add or update entries before {0},你没有权限在{0}前添加或更改分录。
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},你没有权限在{0}前添加或更改分录。
 DocType: Item,Item Image (if not slideshow),品目图片(如果没有指定幻灯片)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,同名客户已存在
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,（小时率/ 60）*实际操作时间
@@ -143,18 +142,17 @@
 DocType: Student Log,Student Log,学生登录
 DocType: Quality Inspection,Get Specification Details,获取详细规格
 DocType: Lead,Interested,有兴趣
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +165,Opening,开盘
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,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/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,客户&gt;客户组&gt;领地
 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.,有交易的科目不能被转换为组。
 DocType: Lead,Product Enquiry,产品查询
 DocType: Academic Term,Schools,学校
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,请先输入公司
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Company first,请首先选择公司
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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,总成本
@@ -164,7 +162,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,对账单
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,制药
 DocType: Purchase Invoice Item,Is Fixed Asset,是固定的资产
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Available qty is {0}, you need {1}",可用数量是{0}，则需要{1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +225,"Available qty is {0}, you need {1}",可用数量是{0}，则需要{1}
 DocType: Expense Claim Detail,Claim Amount,报销金额
 DocType: Employee,Mr,先生
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,供应商类型/供应商
@@ -173,25 +171,26 @@
 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: Assessment Result,Grade,年级
 DocType: Sales Invoice Item,Delivered By Supplier,交付供应商
 DocType: SMS Center,All Contact,所有联系人
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Annual Salary,年薪
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,库存费用
-apps/erpnext/erpnext/accounts/report/financial_statements.py +22,End Year {0} not found.,结束年份{0}没有找到。
 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}的已接收数量
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,供应原料采购
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +130,At least one mode of payment is required for POS invoice.,付款中的至少一个模式需要POS发票。
 DocType: Products Settings,Show Products as a List,产品展示作为一个列表
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records",下载此模板，填写相应的数据后上传。所有的日期和员工出勤记录将显示在模板里。
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +451,Item {0} is not active or end of life has been reached,品目{0}处于非活动或寿命终止状态
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +456,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/controllers/accounts_controller.py +614,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",要包括税款，行{0}项率，税收行{1}也必须包括在内
+apps/erpnext/erpnext/controllers/accounts_controller.py +617,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",要包括税款，行{0}项率，税收行{1}也必须包括在内
 apps/erpnext/erpnext/config/hr.py +166,Settings for HR Module,人力资源模块的设置
 DocType: SMS Center,SMS Center,短信中心
 DocType: Sales Invoice,Change Amount,涨跌额
@@ -203,13 +202,13 @@
 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 +147,Execution,执行
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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,项目和定价
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},总时间：{0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},起始日期应该在财年之内。财年起始日是{0}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,Cost Center {0} does not belong to Company {1},成本中心{0}不属于公司{1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +100,Cost Center {0} does not belong to Company {1},成本中心{0}不属于公司{1}
 DocType: Customer,Individual,个人
 DocType: Interest,Academics User,学术界用户
 DocType: Cheque Print Template,Amount In Figure,量图
@@ -225,30 +224,32 @@
 DocType: Production Planning Tool,Sales Orders,销售订单
 DocType: Purchase Taxes and Charges,Valuation,估值
 ,Purchase Order Trends,采购订单趋势
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,The request for quotation can be accessed by clicking on the following link,报价请求可以通过点击以下链接进行访问
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,调配一年的假期。
 DocType: SG Creation Tool Course,SG Creation Tool Course,SG创建工具课程
 DocType: Student Group Creation Tool,Leave blank if you wish to fetch all courses for selected academic term,留空，如果你想获取选定学期所有课程
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,Insufficient Stock,库存不足
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227,Insufficient Stock,库存不足
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,禁用容量规划和时间跟踪
+DocType: Email Digest,New Sales Orders,新建销售订单
 DocType: Bank Reconciliation,Bank Account,银行帐户
 DocType: Leave Type,Allow Negative Balance,允许负余额
 DocType: Selling Settings,Default Territory,默认地区
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,电视
 DocType: Production Order Operation,Updated via 'Time Log',通过“时间日志”更新
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} does not belong to Company {1},科目{0}不属于公司{1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +86,Account {0} does not belong to Company {1},科目{0}不属于公司{1}
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},提前量不能大于{0} {1}
 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 +174,For Warehouse is required before Submit,提交前必须选择仓库
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,For Warehouse is required before Submit,提交前必须选择仓库
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,收到的
 DocType: Sales Partner,Reseller,经销商
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,你不能输入行没有。大于或等于当前行没有。这种充电式
 DocType: Delivery Note Item,Against Sales Invoice Item,对销售发票项目
 ,Production Orders in Progress,在建生产订单
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Cash from Financing,从融资净现金
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1436,"LocalStorage is full , did not save",localStorage的满了，没救
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1460,"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}
@@ -261,18 +262,19 @@
 apps/erpnext/erpnext/templates/generators/item.html +78,No description given,未提供描述
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,请求您的报价。
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +5,This is based on the Time Sheets created against this project,这是基于对这个项目产生的考勤表
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Only the selected Leave Approver can submit this Leave Application,只有选择的休假审批者可以提交此请假
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +213,Only the selected Leave Approver can submit this Leave Application,只有选择的休假审批者可以提交此请假
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,解除日期必须大于加入的日期
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Leaves per Year,每年叶
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,每年叶
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,行{0}：请检查'是推进'对帐户{1}，如果这是一个进步条目。
 apps/erpnext/erpnext/stock/utils.py +188,Warehouse {0} does not belong to company {1},仓库{0}不属于公司{1}
+DocType: Email Digest,Profit & Loss,利润损失
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,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 +435,Leave Blocked,已禁止请假
-apps/erpnext/erpnext/stock/doctype/item/item.py +669,Item {0} has reached its end of life on {1},品目{0}已经到达寿命终止日期{1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +443,Leave Blocked,已禁止请假
+apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item {0} has reached its end of life on {1},品目{0}已经到达寿命终止日期{1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +95,Bank Entries,银行条目
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +83,Annual,全年
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +86,Annual,全年
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,库存盘点品目
 DocType: Stock Entry,Sales Invoice No,销售发票编号
 DocType: Material Request Item,Min Order Qty,最小订货量
@@ -280,20 +282,22 @@
 DocType: Lead,Do Not Contact,不要联系
 apps/erpnext/erpnext/public/js/setup_wizard.js +360,People who teach at your organisation,谁在您的组织教人
 DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,跟踪所有周期性发票的唯一ID，提交时自动生成。
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Software Developer,软件开发人员
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,软件开发人员
 DocType: Item,Minimum Order Qty,最小起订量
 DocType: Pricing Rule,Supplier Type,供应商类型
 DocType: Scheduling Tool,Course Start Date,课程开始日期
 DocType: Item,Publish in Hub,在发布中心
+DocType: Student Admission,Student Admission,学生入学
 ,Terretory,区域
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is cancelled,品目{0}已取消
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Material Request,物料申请
+apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} is cancelled,品目{0}已取消
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +823,Material Request,物料申请
 DocType: Bank Reconciliation,Update Clearance Date,更新清拆日期
 apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +28,Abbreviation already used for another salary component,缩写已用于其他薪酬部分
 DocType: Item,Purchase Details,购买详情
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +328,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},项目{0}未发现“原材料提供&#39;表中的采购订单{1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +333,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},项目{0}未发现“原材料提供&#39;表中的采购订单{1}
 DocType: Employee,Relation,关系
 DocType: Shipping Rule,Worldwide Shipping,全球航运
+DocType: Student Guardian,Mother,母亲
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,确认客户订单。
 DocType: Purchase Receipt Item,Rejected Quantity,拒绝数量
 DocType: SMS Settings,SMS Sender Name,短信发送者名称
@@ -309,20 +313,21 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +130,Please select Charge Type first,预计日期不能前材料申请日期
 DocType: Student Group Student,Student Group Student,学生组学生
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,最新
+DocType: Email Digest,New Quotations,新报价
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,假期审批人列表的第一个将被设为默认审批人
 DocType: Tax Rule,Shipping County,航运县
 apps/erpnext/erpnext/config/desktop.py +158,Learn,学习
 DocType: Asset,Next Depreciation Date,接下来折旧日期
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,每个员工活动费用
 DocType: Accounts Settings,Settings for Accounts,帐户设置
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +626,Supplier Invoice No exists in Purchase Invoice {0},供应商发票不存在采购发票{0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +629,Supplier Invoice No exists in Purchase Invoice {0},供应商发票不存在采购发票{0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,管理销售人员。
 DocType: Job Applicant,Cover Letter,求职信
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,杰出的支票及存款清除
 DocType: Item,Synced With Hub,与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 +348,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 +86,Circular Reference Error,循环引用错误
@@ -334,15 +339,16 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,自动创建物料申请时通过邮件通知
 DocType: Journal Entry,Multi Currency,多币种
 DocType: Payment Reconciliation Invoice,Invoice Type,发票类型
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +806,Delivery Note,送货单
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +800,Delivery Note,送货单
 apps/erpnext/erpnext/config/learn.py +87,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 +233,Payment Entry has been modified after you pulled it. Please pull it again.,付款项被修改，你把它之后。请重新拉。
+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/setup/doctype/email_digest/email_digest.py +104,Summary for this week and pending activities,本周和待活动总结
+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",请输入邮件地址列表，用英文逗号分割。发票在特定的日期会被自动发送。
 DocType: Employee,Company Email,企业邮箱
@@ -354,27 +360,28 @@
 apps/erpnext/erpnext/config/hr.py +186,"Employee designation (e.g. CEO, Director etc.).",雇员指派(例如总裁，总监等) 。
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,请输入“重复上月的一天'字段值
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,客户货币转换为客户的基础货币后的单价
-apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},行＃{0}：采购发票不能对现有资产进行{1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +554,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},行＃{0}：采购发票不能对现有资产进行{1}
 DocType: Item Tax,Tax Rate,税率
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0}已分配给员工{1}的时期{2}到{3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +812,Select Item,选择项目
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +791,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/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,采购发票{0}已经提交
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},行＃{0}：批号必须与{1} {2}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +143,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)。
 DocType: C-Form Invoice Detail,Invoice Date,发票日期
 DocType: GL Entry,Debit Amount,借方金额
 apps/erpnext/erpnext/accounts/party.py +242,There can only be 1 Account per Company in {0} {1},只能有每公司1帐户{0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +4,Your email address,您的电子邮件地址
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +342,Please see attachment,请参阅附件
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,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 +19,Setup Already Complete!!,安装已经完成！
 ,Finished Goods,成品
 DocType: Delivery Note,Instructions,说明
 DocType: Quality Inspection,Inspected By,验货人
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,供应商&gt;供应商类型
 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,添加项目
@@ -388,29 +395,29 @@
 DocType: Currency Exchange,Currency Exchange,货币兑换
 DocType: Purchase Invoice Item,Item Name,品目名称
 DocType: Authorization Rule,Approving User  (above authorized value),批准的用户（上述授权值）
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,贷方余额
+DocType: Email Digest,Credit Balance,贷方余额
 DocType: Employee,Widowed,丧偶
 DocType: Request for Quotation,Request for Quotation,询价
 DocType: Salary Slip Timesheet,Working Hours,工作时间
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,更改现有系列的起始/当前序列号。
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.",如果几条价格规则同时使用，系统将提醒用户设置优先级。
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +736,Purchase Return,采购退货
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +715,Purchase Return,采购退货
 ,Purchase Register,购买注册
 DocType: Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,适用费用
 DocType: Workstation,Consumable Cost,耗材成本
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +202,{0} ({1}) must have role 'Leave Approver',{0} {1}必须有“假期审批人”的角色
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,{0} ({1}) must have role 'Leave Approver',{0} {1}必须有“假期审批人”的角色
 DocType: Purchase Receipt,Vehicle Date,车日期
 DocType: Student Log,Medical,医药
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,原因丢失
-apps/erpnext/erpnext/accounts/utils.py +239,Allocated amount can not greater than unadjusted amount,分配的金额不能超过未调整的量更大
+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,分配的金额不能超过未调整的量更大
 DocType: Announcement,Receiver,接收器
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},工作站在以下假期关闭：{0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,机会
 DocType: Employee,Single,单身
 DocType: Account,Cost of Goods Sold,销货成本
 DocType: Purchase Invoice,Yearly,每年
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +225,Please enter Cost Center,请输入成本中心
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,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,考官名称
@@ -423,26 +430,26 @@
 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,检查供应商发票编号唯一性
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','起始箱号'不能小于'结束箱号'
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,Non Profit,非营利
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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: Stock Reconciliation Item,Do not include symbols (ex. $),不包括符号（例如$）
 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 +638,Attribute {0} selected multiple times in Attributes Table,属性{0}多次选择在属性表
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,属性{0}多次选择在属性表
 DocType: HR Settings,Employee record is created using selected field. ,使用所选字段创建员工记录。
 DocType: Sales Order,Not Applicable,不适用
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,假期大师
 DocType: Request for Quotation Item,Required Date,所需时间
 DocType: Delivery Note,Billing Address,帐单地址
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +862,Please enter Item Code.,请输入产品编号。
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +847,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",如果勾选，税金将被当成已包括在打印税率/打印总额内。
@@ -456,12 +463,12 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,证券及存款
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,总叶分配是必须的
 DocType: Job Opening,Description of a Job Opening,空缺职位的说明
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Pending activities for today,今天待定活动
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,今天待定活动
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,考勤记录。
 DocType: Salary Structure,Salary Component for timesheet based payroll.,薪酬部分基于时间表工资。
 DocType: Sales Order Item,Used for Production Plan,用于生产计划
 DocType: Manufacturing Settings,Time Between Operations (in mins),时间操作之间（以分钟）
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +92,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0}预算帐户{1}对成本中心{2}是{3}。它将被超过{4}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +95,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0}预算帐户{1}对成本中心{2}是{3}。它将被超过{4}
 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,所选的材料清单并不同样项目
@@ -469,16 +476,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +238,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 +86,Administrative Officer,行政主任
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,行政主任
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +23,Acutal Qty {0} / Waiting Qty {1},Acutal数量{0} /等待数量{1}
 DocType: Timesheet Detail,Hrs,小时
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +319,Please select Company,请选择公司
-DocType: Stock Entry,Difference Account,差异科目
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +309,Please select Company,请选择公司
+DocType: Stock Entry Detail,Difference Account,差异科目
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,不能因为其依赖的任务{0}没有关闭关闭任务。
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Please enter Warehouse for which Material Request will be raised,请重新拉。
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +399,Please enter Warehouse for which Material Request will be raised,请重新拉。
 DocType: Production Order,Additional Operating Cost,额外的运营成本
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,化妆品
-apps/erpnext/erpnext/stock/doctype/item/item.py +530,"To merge, following properties must be same for both items",若要合并，以下属性必须为这两个项目是相同的
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,"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 +28,Buy,购买
@@ -486,7 +493,7 @@
 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 +1563,Serial no item cannot be a fraction,序号项目不能是一个分数
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1587,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,管理转包
@@ -495,13 +502,14 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Account {0} does not belong to company: {1},科目{0}不属于公司：{1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation already used for another company,缩写已用于另一家公司
 DocType: Selling Settings,Default Customer Group,默认客户群组
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Supplier is required against Payable account {0},供应商必须对应付账款{0}
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction",如果禁用，“舍入总计”字段将不在交易中显示
 DocType: BOM,Operating Cost,营业成本
 DocType: Sales Order Item,Gross Profit,毛利
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +42,Increment cannot be 0,增量不能为0
 DocType: Production Planning Tool,Material Requirement,物料需求
 DocType: Company,Delete Company Transactions,删除公司事务
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +313,Reference No and Reference Date is mandatory for Bank transaction,参考编号和参考日期是强制性的银行交易
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +316,Reference No and Reference Date is mandatory for Bank transaction,参考编号和参考日期是强制性的银行交易
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,添加/编辑税金及费用
 DocType: Purchase Invoice,Supplier Invoice No,供应商发票编号
 DocType: Territory,For reference,供参考
@@ -512,7 +520,6 @@
 DocType: Installation Note Item,Installation Note Item,安装单品目
 DocType: Production Plan Item,Pending Qty,待定数量
 DocType: Budget,Ignore,忽略
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,产品编号&gt;项目组&gt;品牌
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,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,工资单时间表
@@ -523,11 +530,11 @@
 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/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,没有在发票表中找到记录
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +28,Please select Company and Party Type first,请选择公司和党的第一型
+apps/erpnext/erpnext/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/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 +707,Make Sales Order,创建销售订单
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +701,Make Sales Order,创建销售订单
 DocType: Project Task,Project Task,项目任务
 ,Lead Id,线索ID
 DocType: C-Form Invoice Detail,Grand Total,总计
@@ -543,7 +550,8 @@
 DocType: Job Applicant,Resume Attachment,简历附
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,回头客
 DocType: Leave Control Panel,Allocate,调配
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +734,Sales Return,销售退货
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +728,Sales Return,销售退货
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +91,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,注：总分配叶{0}应不低于已核定叶{1}期间
 DocType: Announcement,Posted By,发布者
 DocType: Item,Delivered by Supplier (Drop Ship),由供应商交货（直接发运）
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,潜在客户数据库。
@@ -552,14 +560,13 @@
 DocType: Quotation,Quotation To,报价对象
 DocType: Lead,Middle Income,中等收入
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +212,Opening (Cr),开幕（CR ）
-apps/erpnext/erpnext/stock/doctype/item/item.py +795,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,测度项目的默认单位{0}不能直接改变，因为你已经做了一些交易（S）与其他计量单位。您将需要创建一个新的项目，以使用不同的默认计量单位。
-apps/erpnext/erpnext/accounts/utils.py +237,Allocated amount can not be negative,调配数量不能为负
+apps/erpnext/erpnext/stock/doctype/item/item.py +797,Default Unit of Measure for Item {0} cannot be changed directly because 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,调配数量不能为负
 DocType: Purchase Order Item,Billed 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 +91,Reference No & Reference Date is required for {0},{0}需要参考编号与参考日期
-DocType: Sales Invoice,Customer's Vendor,客户的供应商
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Proposal Writing,提案写作
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,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",如果选中，原料是分包的将被纳入材料要求项
@@ -568,13 +575,14 @@
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,时间跟踪
 DocType: Fiscal Year Company,Fiscal Year Company,公司财政年度
 DocType: Packing Slip Item,DN Detail,送货单详情
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +257,Already supplier quotation has created,已经供应商的报价已经创造
 DocType: Timesheet,Billed,已开票
 DocType: Batch,Batch Description,批次说明
+apps/erpnext/erpnext/accounts/utils.py +685,"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 +733,View Offline Records,查看离线记录
+apps/erpnext/erpnext/accounts/page/pos/pos.js +715,View Offline Records,查看离线记录
+DocType: Student,Sibling Details,兄弟姐妹详情
 DocType: Employee,Reason for Resignation,原因辞职
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,绩效考核模板。
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,发票/日记帐分录详细信息
@@ -588,7 +596,7 @@
 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,在库存净变动
 DocType: Employee,Passport Number,护照号码
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Manager,经理
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,经理
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,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,“根据”和“分组依据”不能相同
@@ -597,10 +605,11 @@
 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 +299,Timesheet created:,创建时间表：
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +715,Please set default Cash or Bank account in Mode of Payment {0},请设置默认的现金或银行账户的付款方式{0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +300,Timesheet created:,创建时间表：
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +772,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,注册
 DocType: Selling Settings,Customer Naming By,客户命名方式
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,请安装员工在人力资源命名系统&gt; HR设置
 DocType: Depreciation Schedule,Depreciation Amount,折旧额
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,转换为组
 DocType: Activity Cost,Activity Type,活动类型
@@ -625,6 +634,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,完
 DocType: Pricing Rule,Sales Manager,销售经理
 DocType: Salary Structure Employee,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,在资产处置收益/损失帐户
@@ -639,11 +649,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +9,Pre Sales,售前
 DocType: Purchase Receipt,Other Details,其他详细信息
 DocType: Account,Accounts,会计
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Marketing,市场营销
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +227,Payment Entry is already created,已创建付款输入
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,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 +538,Row #{0}: Asset {1} does not linked to Item {2},行＃{0}：资产{1}不挂项目{2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +21,Preview Salary Slip,预览工资单
+apps/erpnext/erpnext/controllers/accounts_controller.py +541,Row #{0}: Asset {1} does not linked to Item {2},行＃{0}：资产{1}不挂项目{2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +38,Preview Salary Slip,预览工资单
 DocType: Company,Deafult Cost Center,Deafult成本中心
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +48,Account {0} has been entered multiple times,帐户{0}已多次输入
 DocType: Account,Expenses Included In Valuation,开支计入估值
@@ -652,7 +662,7 @@
 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 +617,Item has variants.,项目已变种。
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,项目已变种。
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,品目{0}未找到
 DocType: Bin,Stock Value,库存值
 apps/erpnext/erpnext/accounts/doctype/account/account.py +25,Company {0} does not exist,公司{0}不存在
@@ -672,7 +682,7 @@
 DocType: Purchase Order,Supply Raw Materials,供应原料
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,下一次发票生成的日期，提交时将会生成。
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,流动资产
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,{0} is not a stock Item,{0}不是一个库存品目
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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 +169,Lead must be set if Opportunity is made from Lead,如果商机的来源是“线索”的话，必须指定线索
@@ -750,26 +760,25 @@
 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 +709,No Permission,无此权限
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +710,No Permission,无此权限
 DocType: Company,Default Bank Account,默认银行账户
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",要根据党的筛选，选择党第一类型
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},“库存更新'校验不通过，因为{0}中的退货条目未交付
 apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,具有较高权重的项目将显示更高的可
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,银行对帐详细
-apps/erpnext/erpnext/controllers/accounts_controller.py +542,Row #{0}: Asset {1} must be submitted,行＃{0}：资产{1}必须提交
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,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文件上传库存余额
 DocType: Warehouse,Tree Details,树详细信息
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,立即发送
 ,Support Analytics,客户支持分析
 DocType: Item,Website Warehouse,网站仓库
 DocType: Payment Reconciliation,Minimum Invoice Amount,最小发票金额
 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/sales_invoice/sales_invoice.py +227,Timesheet {0} is already completed or cancelled,时间表{0}已完成或取消
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +259,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
@@ -785,13 +794,13 @@
 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 +229,Target Warehouse,目标仓库
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +230,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-,甜菊
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Sales Order Date,预计交货日期不能早于销售订单日期
 DocType: Upload Attendance,Import Attendance,导入考勤记录
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,所有品目群组
+apps/erpnext/erpnext/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/config/setup.py +89,Automatically compose message on submission of transactions.,在提交交易时自动编写信息。
@@ -803,13 +812,15 @@
 DocType: Sales Invoice,Payment Due Date,付款到期日
 apps/erpnext/erpnext/stock/doctype/item/item.js +278,Item Variant {0} already exists with same attributes,项目变种{0}已经具有相同属性的存在
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',“打开”
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,开做
 DocType: Notification Control,Delivery Note Message,送货单留言
 DocType: Expense Claim,Expenses,开支
 DocType: Item Variant Attribute,Item Variant Attribute,产品规格属性
 ,Purchase Receipt Trends,购买收据趋势
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Research & Development,研究与发展
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,研究与发展
 ,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,价格或折扣
@@ -818,7 +829,7 @@
 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/controllers/accounts_controller.py +340,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",付款输入{0}对订单{1}，检查它是否应该被拉到作为预先在该发票联。
+apps/erpnext/erpnext/controllers/accounts_controller.py +343,"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,销售点
@@ -840,12 +851,12 @@
 DocType: Supplier Quotation,Is Subcontracted,是否外包
 DocType: Item Attribute,Item Attribute Values,品目属性值
 DocType: Examination Result,Examination Result,考试成绩
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +756,Purchase Receipt,外购入库单
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +735,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 +167,Reference Doctype must be one of {0},参考文档类型必须是一个{0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +282,Unable to find Time Slot in the next {0} days for Operation {1},找不到时隙在未来{0}天操作{1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +170,Reference Doctype must be one of {0},参考文档类型必须是一个{0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Unable to find Time Slot in the next {0} days for Operation {1},找不到时隙在未来{0}天操作{1}
 DocType: Production Order,Plan material for sub-assemblies,计划材料为子组件
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,销售合作伙伴和地区
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be active,BOM{0}处于非活动状态
@@ -856,7 +867,7 @@
 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 +214,Warehouses with existing transaction can not be converted to ledger.,与现有的交易仓库不能转换到总帐。
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +217,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,生产订单
@@ -870,9 +881,9 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,雇员{0}非活动或不存在
 DocType: Fee Structure,Components,组件
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,Please enter Asset Category in Item {0},请输入项目资产类别{0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +612,Item Variants {0} updated,品目变种{0}已更新
+apps/erpnext/erpnext/stock/doctype/item/item.py +614,Item Variants {0} updated,品目变种{0}已更新
 DocType: Quality Inspection Reading,Reading 6,阅读6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +843,Cannot {0} {1} {2} without any negative outstanding invoice,无法{0} {1} {2}没有任何负面的优秀发票
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +854,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,立即同步
@@ -887,69 +898,72 @@
 DocType: Item,Is Purchase Item,是否采购品目
 DocType: Asset,Purchase Invoice,购买发票
 DocType: Stock Ledger Entry,Voucher Detail No,凭证详情编号
-apps/erpnext/erpnext/accounts/page/pos/pos.js +728,New Sales Invoice,新的销售发票
+apps/erpnext/erpnext/accounts/page/pos/pos.js +710,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 +728,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: Cheque Print Template,Has Print Format,拥有打印格式
-apps/erpnext/erpnext/accounts/page/pos/pos.js +86, is mandatory. Maybe Currency Exchange record is not created for ,是强制性的。也许外币兑换记录没有创建
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +109,Row #{0}: Please specify Serial No for Item {1},行＃{0}：请注明序号为项目{1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +619,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.",对于“产品包”的物品，仓库，序列号和批号将被从“装箱单”表考虑。如果仓库和批次号是相同的任何“产品包”项目的所有包装物品，这些值可以在主项表中输入，值将被复制到“装箱单”表。
+apps/erpnext/erpnext/accounts/page/pos/pos.js +75, 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 +613,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing 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 +606,Supplier Invoice Date cannot be greater than Posting Date,供应商发票的日期不能超过过帐日期更大
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +609,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: Cheque Print Template,Date Settings,日期设定
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,方差
 ,Company Name,公司名称
 DocType: SMS Center,Total Message(s),总信息（s ）
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +810,Select Item for Transfer,对于转让项目选择
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +789,Select Item for Transfer,对于转让项目选择
 DocType: Purchase Invoice,Additional Discount Percentage,额外折扣百分比
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,查看所有帮助影片名单
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,请选择支票存入的银行账户头。
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,允许用户编辑交易中的价目表率。
 DocType: Pricing Rule,Max Qty,最大数量
-DocType: Student Applicant,Father's Name,父名称
 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 +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,行{0}：付款方式对销售/采购订单应始终被标记为提前
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,化学品
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +686,All items have already been transferred for this Production Order.,所有品目都已经转移到这个生产订单。
+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}，然后重试
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +694,All items have already been transferred for this Production Order.,所有品目都已经转移到这个生产订单。
 DocType: Process Payroll,Select Payroll Year and Month,选择薪资年和月
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,Meter,仪表
 DocType: Workstation,Electricity Cost,电力成本
 DocType: HR Settings,Don't send Employee Birthday Reminders,不要发送员工生日提醒
-DocType: Opportunity,Walk In,主动上门
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,库存条目
 DocType: Item,Inspection Criteria,检验标准
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,转移
 apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,上传你的信头和logo。(您可以在以后对其进行编辑）。
 DocType: Timesheet Detail,Bill,法案
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,White,白
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date is entered as past date,接下来折旧日期输入为过去的日期
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +167,White,白
 DocType: SMS Center,All Lead (Open),所有潜在客户（开放）
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +228,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),行{0}：数量不适用于{4}在仓库{1}在发布条目的时间（{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}),行{0}：数量不适用于{4}在仓库{1}在发布条目的时间（{2} {3}）
 DocType: Purchase Invoice,Get Advances Paid,获取已付预付款
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +731,Make ,使
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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 +154,Order Type must be one of {0},订单类型必须是一个{0}
+apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},订单类型必须是一个{0}
 DocType: Lead,Next Contact Date,下次联络日期
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,开放数量
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +393,Please enter Account for Change Amount,对于涨跌额请输入帐号
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,Please enter Account for Change Amount,对于涨跌额请输入帐号
 DocType: Student Batch,Student Batch Name,学生批名
 DocType: Holiday List,Holiday List Name,假期列表名称
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js +8,Schedule Course,课程时间表
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Stock Options,股票期权
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,股票期权
 DocType: Journal Entry Account,Expense Claim,报销
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +211,Do you really want to restore this scrapped asset?,难道你真的想恢复这个报废的资产？
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +237,Qty for {0},{0}数量
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +212,Do you really want to restore this scrapped asset?,难道你真的想恢复这个报废的资产？
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,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,禁离日列表日期
@@ -958,9 +972,9 @@
 DocType: Company,Default Terms,默认条款
 DocType: Packing Slip Item,Packing Slip Item,装箱单项目
 DocType: Purchase Invoice,Cash/Bank Account,现金/银行账户
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,删除的项目在数量或价值没有变化。
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,删除的项目在数量或价值没有变化。
 DocType: Delivery Note,Delivery To,交货对象
-apps/erpnext/erpnext/stock/doctype/item/item.py +635,Attribute table is mandatory,属性表是强制性的
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,属性表是强制性的
 DocType: Production Planning Tool,Get Sales Orders,获取销售订单
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0}不能为负
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,请选择一个学生
@@ -985,7 +999,7 @@
 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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},序列号{0}截至至{1}之前在年度保养合同内。
+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,组织名称
@@ -997,7 +1011,7 @@
 DocType: GL Entry,Against,针对
 DocType: Item,Default Selling Cost Center,默认销售成本中心
 DocType: Sales Partner,Implementation Partner,实施合作伙伴
-apps/erpnext/erpnext/controllers/selling_controller.py +231,Sales Order {0} is {1},销售订单{0} {1}
+apps/erpnext/erpnext/controllers/selling_controller.py +232,Sales Order {0} is {1},销售订单{0} {1}
 DocType: Opportunity,Contact Info,联系方式
 apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,制作Stock条目
 DocType: Packing Slip,Net Weight UOM,净重计量单位
@@ -1007,25 +1021,24 @@
 DocType: Holiday List,Get Weekly Off Dates,获取周末日期
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,结束日期不能小于开始日期
 DocType: Sales Person,Select company name first.,请先选择公司名称。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Dr,借方
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Dr,借方
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,从供应商收到的报价。
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},{0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,平均年龄
 DocType: 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/templates/pages/home.html +32,View All Products,查看所有产品
+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 +400,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,警告： 因为{1}中的物件{0}为零，系统将不会检查超额
+apps/erpnext/erpnext/controllers/accounts_controller.py +403,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/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,和年份：
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +191,{0} {1} must be submitted,{0} {1}必须提交
-DocType: Email Digest,Annual Expense,年费用
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,{0} {1} must be submitted,{0} {1}必须提交
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +145,Quantity must be less than or equal to {0},量必须小于或等于{0}
 DocType: SMS Center,Total Characters,总字符
 apps/erpnext/erpnext/controllers/buying_controller.py +156,Please select BOM in BOM field for Item {0},请BOM字段中选择BOM的项目{0}
@@ -1036,30 +1049,31 @@
 DocType: Sales Partner,Distributor,经销商
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,购物车配送规则
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +211,Production Order {0} must be cancelled before cancelling this Sales Order,生产订单{0}必须取消这个销售订单之前被取消
-apps/erpnext/erpnext/public/js/controllers/transaction.js +62,Please set 'Apply Additional Discount On',请设置“收取额外折扣”
+apps/erpnext/erpnext/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,从范围必须小于要范围
 DocType: Global Defaults,Global Defaults,全局默认值
 apps/erpnext/erpnext/projects/doctype/project/project.py +153,Project Collaboration Invitation,项目合作邀请
 DocType: Salary Slip,Deductions,扣款列表
+DocType: Leave Allocation,LAL/,LAL /
 apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,开始年份
 DocType: Purchase Invoice,Start date of current invoice's period,当前发票周期的起始日期
 DocType: Salary Slip,Leave Without Pay,无薪假期
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +327,Capacity Planning Error,容量规划错误
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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 +362,Finished Item {0} must be entered for Manufacture type entry,完成项目{0}必须为制造类条目进入
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +367,Finished Item {0} must be entered for Manufacture type entry,完成项目{0}必须为制造类条目进入
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,打开会计平衡
 DocType: Sales Invoice Advance,Sales Invoice Advance,销售发票预付款
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +499,Nothing to request,没有申请内容
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +500,Nothing to request,没有申请内容
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',“实际开始日期”不能大于“实际结束日期'
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Management,管理人员
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},{0}需要指定借方或贷方金额
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,管理人员
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +55,Either debit or credit amount is required for {0},{0}需要指定借方或贷方金额
 DocType: Cheque Print Template,Payer Settings,付款人设置
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""",这将追加到变异的项目代码。例如，如果你的英文缩写为“SM”，而该项目的代码是“T-SHIRT”，该变种的项目代码将是“T-SHIRT-SM”
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,保存工资单后会显示净支付金额(大写)。
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,Blue,蓝色
+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
@@ -1069,12 +1083,12 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +23,POS Profile {0} already created for user: {1} and company {2},POS简介{0}已经为用户创建：{1}和公司{2}
 DocType: Purchase Order Item,UOM Conversion Factor,计量单位换算系数
 DocType: Stock Settings,Default Item Group,默认品目群组
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1374,Do you really want to submit the invoice?,你真的要提交的发票？
+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 +685,Cost Center For Item with Item Code ',成本中心：品目代码‘
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1526,"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 +679,Cost Center For Item with Item Code ',成本中心：品目代码‘
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1550,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",付款方式未配置。请检查是否帐户已就付款方式或POS机配置文件中设置。
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,您的销售人员将在此日期收到联系客户的提醒
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,"Further accounts can be made under Groups, but entries can be made against non-Groups",进一步帐户可以根据组进行，但条目可针对非组进行
 DocType: Lead,Lead,线索
@@ -1094,104 +1108,106 @@
 DocType: Payment Reconciliation,Unreconciled Payment Details,未核销付款详情
 DocType: Global Defaults,Current Fiscal Year,当前财年
 DocType: Global Defaults,Disable Rounded Total,禁用总计化整
-DocType: Lead,Call,通话
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +417,'Entries' cannot be empty,“分录”不能为空
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +418,'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 +214,Fiscal Year {0} not found,会计年度{0}未找到
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +221,Fiscal Year {0} not found,会计年度{0}未找到
 apps/erpnext/erpnext/config/hr.py +238,Setting up Employees,建立职工
 DocType: Sales Order,SO-,所以-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,请选择前缀第一
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Please select prefix first,请选择前缀第一
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Research,研究
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,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 +43,Item {0} must be a non-stock item,项{0}必须是一个非库存项目
 DocType: Contact,User ID,用户ID
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +57,View Ledger,查看总帐
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,最早
-apps/erpnext/erpnext/stock/doctype/item/item.py +504,"An Item Group exists with same name, please change the item name or rename the item group",同名品目群组已存在，请修改品目名或群组名
+apps/erpnext/erpnext/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 +437,Rest Of The World,世界其他地区
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,物件{0}不能有批次
 ,Budget Variance Report,预算差异报告
 DocType: Salary Slip,Gross Pay,工资总额
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +90,Row {0}: Activity Type is mandatory.,行{0}：活动类型是强制性的。
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +114,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/public/js/controllers/stock_controller.js +40,Accounting Ledger,会计总帐
+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,留存收益
 DocType: BOM Item,Item Description,品目说明
+DocType: Student Sibling,Student Sibling,学生兄弟
 DocType: Purchase Invoice,Is Recurring,是否周期性
 DocType: Purchase Invoice,Supplied Items,供应的品目
 DocType: Student,STUD.,螺柱。
 DocType: Production Order,Qty To Manufacture,生产数量
+DocType: Email Digest,New Income,新的收入
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,在整个采购周期使用同一价格
 DocType: Opportunity Item,Opportunity Item,项目的机会
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,临时开通
 ,Employee Leave Balance,雇员假期余量
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +131,Balance for Account {0} must always be {1},账户{0}的余额必须总是{1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +175,Valuation Rate required for Item in row {0},行对项目所需的估值速率{0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,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,举例：硕士计算机科学
 DocType: Purchase Invoice,Rejected Warehouse,拒绝仓库
 DocType: GL Entry,Against Voucher,对凭证
 DocType: Item,Default Buying Cost Center,默认采购成本中心
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.",为了获得最好ERPNext，我们建议您花一些时间和观看这些帮助视频。
-apps/erpnext/erpnext/accounts/page/pos/pos.js +87, to ,至
+apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,至
 DocType: Item,Lead Time in days,在天交货期
 ,Accounts Payable Summary,应付帐款摘要
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Not authorized to edit frozen Account {0},无权修改冻结帐户{0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},无权修改冻结帐户{0}
 DocType: Journal Entry,Get Outstanding Invoices,获取未清发票
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +62,Sales Order {0} is not valid,销售订单{0}无效
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,销售订单{0}无效
 apps/erpnext/erpnext/setup/doctype/company/company.py +185,"Sorry, companies cannot be merged",抱歉，公司不能合并
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +139,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",在材质要求总发行/传输量{0} {1} \不能超过请求的数量{2}的项目更大的{3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Small,小
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,Small,小
 DocType: Employee,Employee Number,雇员编号
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},箱号已被使用，请尝试从{0}开始
 ,Invoiced Amount (Exculsive Tax),已开票金额（未含税）
-DocType: Student Applicant,Mother's / Guardian 1 Email ID,母亲/监护人1电子邮件ID
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,项目2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,账户头{0}已创建
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +160,Green,绿
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,绿
 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 +57,Contract,合同
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,合同
 DocType: Email Digest,Add Quote,添加报价
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +498,UOM coversion factor required for UOM: {0} in Item: {1},物件{1}的计量单位{0}需要单位换算系数
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +503,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 +80,Row {0}: Qty is mandatory,行{0}：数量是强制性的
+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 +737,Sync Master Data,同步主数据
+apps/erpnext/erpnext/accounts/page/pos/pos.js +719,Sync Master Data,同步主数据
 apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,您的产品或服务
 DocType: Mode of Payment,Mode of Payment,付款方式
 apps/erpnext/erpnext/stock/doctype/item/item.py +178,Website Image should be a public file or website URL,网站形象应该是一个公共文件或网站网址
+DocType: Student Applicant,AP,美联社
 DocType: Purchase Invoice Item,BOM,BOM
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,请先输入项目
+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 +345,"{0}: Employee email not found, hence email not sent",{0}：未发现员工的电子邮件，因此，电子邮件未发
+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,是你的公司地址
 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 +118,"For {0}, only credit accounts can be linked against another debit entry",对于{0}，贷方分录只能选择贷方账户
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Delivery Note {0} is not submitted,送货单{0}未提交
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Delivery Note {0} is not submitted,送货单{0}未提交
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Sub-contracted Item,品目{0}必须是外包品目
 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,卖家网站
 DocType: Item,ITEM-,项目-
-apps/erpnext/erpnext/controllers/selling_controller.py +147,Total allocated percentage for sales team should be 100,对于销售团队总分配比例应为100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +110,Production Order status is {0},生产订单状态为{0}
+apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,对于销售团队总分配比例应为100
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},生产订单状态为{0}
 DocType: Appraisal Goal,Goal,目标
 DocType: Sales Invoice Item,Edit Description,编辑说明
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +757,For Supplier,对供应商
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +723,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,创建打印格式
@@ -1207,10 +1223,11 @@
 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,等级代码
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,邮件摘要：
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +445,BOM {0} does not belong to Item {1},BOM{0}不属于品目{1}
 DocType: Sales Partner,Target Distribution,目标分布
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1667,Deafault warehouse is required for selected item,Deafault仓库需要选择的项目
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Deafault warehouse is required for selected item,Deafault仓库需要选择的项目
 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
@@ -1219,23 +1236,23 @@
 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 +110,Hardware,硬件
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,硬件
 DocType: Sales Order,Recurring Upto,经常性高达
 DocType: Attendance,HR Manager,人力资源经理
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,请选择一个公司
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Privilege Leave,特权休假
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,特权休假
 DocType: Purchase Invoice,Supplier Invoice Date,供应商发票日期
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,您需要启用购物车
 DocType: Payment Entry,Writeoff,注销
 DocType: Appraisal Template Goal,Appraisal Template Goal,评估目标模板
-DocType: Salary Slip,Earning,盈余
+DocType: Salary Component,Earning,盈余
 DocType: Purchase Invoice,Party Account Currency,党的账户币种
 ,BOM Browser,BOM浏览器
 DocType: Purchase Taxes and Charges,Add or Deduct,添加或扣除
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,之间存在重叠的条件：
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +171,Against Journal Entry {0} is already adjusted against some other voucher,日记帐分录{0}已经被其他凭证调整
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,日记帐分录{0}已经被其他凭证调整
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,总订单价值
-apps/erpnext/erpnext/demo/setup_data.py +358,Food,食品
+apps/erpnext/erpnext/demo/setup/setup_data.py +301,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/course_schedule/course_schedule.js +103,Mark Attendence,马克考勤
@@ -1269,12 +1286,12 @@
 DocType: Sales Order Item,Planned Quantity,计划数量
 DocType: Purchase Invoice Item,Item Tax Amount,品目税额
 DocType: Item,Maintain Stock,库存维护
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +209,Stock Entries already created for Production Order ,生产订单已创建库存条目
+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,在固定资产净变动
 DocType: Leave Control Panel,Leave blank if considered for all designations,如果针对所有 职位请留空
-apps/erpnext/erpnext/controllers/accounts_controller.py +620,Charge of type 'Actual' in row {0} cannot be included in Item Rate,行{0}中的收取类型“实际”不能有“品目税率”
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,Max: {0},最大值：{0}
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +15,From Datetime,起始时间日期
+apps/erpnext/erpnext/controllers/accounts_controller.py +623,Charge of type 'Actual' in row {0} cannot be included in Item Rate,行{0}中的收取类型“实际”不能有“品目税率”
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +239,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 +153,"Request for Quotation is disabled to access from portal, for more check portal settings.",询价被禁止访问门脉，为更多的检查门户设置。
@@ -1282,8 +1299,8 @@
 DocType: Sales Invoice,Shipping Address Name,送货地址姓名
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,科目表
 DocType: Material Request,Terms and Conditions Content,条款和条件内容
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +552,cannot be greater than 100,不能大于100
-apps/erpnext/erpnext/stock/doctype/item/item.py +680,Item {0} is not a stock Item,品目{0}不是库存品目
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +546,cannot be greater than 100,不能大于100
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is not a stock Item,品目{0}不是库存品目
 DocType: Maintenance Visit,Unscheduled,计划外
 DocType: Employee,Owned,资
 DocType: Salary Detail,Depends on Leave Without Pay,依赖于无薪休假
@@ -1297,10 +1314,9 @@
 DocType: GL Entry,GL Entry,总账分录
 DocType: HR Settings,Employee Settings,雇员设置
 ,Batch-Wise Balance History,批次余额历史
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,待办事项列表
 apps/erpnext/erpnext/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 +61,Apprentice,学徒
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +102,Negative Quantity is not allowed,负数量是不允许的
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,学徒
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +103,Negative Quantity is not allowed,负数量是不允许的
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",从物件大师取得税项详细信息表，嵌入在此字段内。用作税金和费用。
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +152,Employee cannot report to himself.,雇员不能向自己报告。
@@ -1321,15 +1337,14 @@
 DocType: Asset,Asset Name,资产名称
 DocType: Shipping Rule Condition,To Value,To值
 DocType: Asset Movement,Stock Manager,库存管理
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +141,Source warehouse is mandatory for row {0},行{0}中源仓库为必须项
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +719,Packing Slip,装箱单
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Source warehouse is mandatory for row {0},行{0}中源仓库为必须项
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +713,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/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,请求报价可以点击以下链接访问
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,导入失败！
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,未添加地址。
 DocType: Workstation Working Hour,Workstation Working Hour,工作站工作时间
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Analyst,分析员
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,分析员
 DocType: Item,Inventory,库存
 DocType: Item,Sales Details,销售详情
 DocType: Quality Inspection,QI-,QI-
@@ -1337,7 +1352,7 @@
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,在数量
 DocType: Notification Control,Expense Claim Rejected,报销拒绝
 DocType: Item Attribute,Item Attribute,品目属性
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +103,Government,政府
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,政府
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,学院名称
 apps/erpnext/erpnext/config/stock.py +289,Item Variants,项目变体
 DocType: Company,Services,服务
@@ -1353,6 +1368,7 @@
 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/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,从投资现金流
 DocType: Program Course,Program Course,课程计划
@@ -1393,12 +1409,12 @@
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,接收人列表为空。请创建接收人列表
 DocType: Production Plan Sales Order,Production Plan Sales Order,生产计划销售订单
 DocType: Sales Partner,Sales Partner Target,销售合作伙伴目标
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +110,Accounting Entry for {0} can only be made in currency: {1},会计分录为{0}只能在货币进行：{1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},会计分录为{0}只能在货币进行：{1}
 DocType: Pricing Rule,Pricing Rule,定价规则
 DocType: Budget,Action if Annual Budget Exceeded,如果行动年度预算超标
 apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,材料要求采购订单
 DocType: Shopping Cart Settings,Payment Success URL,付款成功URL
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +78,Row # {0}: Returned Item {1} does not exists in {2} {3},行＃{0}：返回的项目{1}不存在{2} {3}
+apps/erpnext/erpnext/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,银行对帐表
@@ -1407,40 +1423,39 @@
 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/stock/doctype/stock_entry/stock_entry.py +339,Not allowed to tranfer more {0} than {1} against Purchase Order {2},不允许转院更多{0}不是{1}对采购订单{2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +344,Not allowed to tranfer more {0} than {1} against Purchase Order {2},不允许转院更多{0}不是{1}对采购订单{2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},已成功为{0}调配假期
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,未选择品目
 DocType: Shipping Rule Condition,From Value,起始值
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +545,Manufacturing Quantity is mandatory,生产数量为必须项
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,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 +71,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 +162,Row {0}: From Time and To Time of {1} is overlapping with {2},行{0}：从时间和结束时间{1}是具有重叠{2}
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +186,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,库存负债
 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 +130,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 +137,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,其他报告
 DocType: Dependent Task,Dependent Task,相关任务
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,请安装员工在人力资源命名系统&gt; HR设置
 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 +190,Leave of type {0} cannot be longer than {1},类型为{0}的假期不能长于{1}天
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +197,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 +921,Search Item,搜索项目
+apps/erpnext/erpnext/accounts/page/pos/pos.js +910,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 +546,Already completed,已经完成
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +22,Payment Request already exists {0},付款申请已经存在{0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +550,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 +241,Quantity must not be more than {0},数量不能超过{0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Quantity must not be more than {0},数量不能超过{0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +76,Previous Financial Year is not closed,上一财政年度未关闭
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +44,Age (Days),时间（天）
 DocType: Quotation Item,Quotation Item,报价品目
@@ -1457,7 +1472,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +221,Purchase Receipt {0} is not submitted,外购入库单{0}未提交
 DocType: Company,Default Payable Account,默认应付账户
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.",网上购物车，如配送规则，价格表等的设置
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +83,{0}% Billed,{0}％帐单
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}％帐单
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,保留数量
 DocType: Party Account,Party Account,党的帐户
 apps/erpnext/erpnext/config/setup.py +116,Human Resources,人力资源
@@ -1469,12 +1484,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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 +22,Collect,搜集
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,搜集
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,Against Supplier Invoice {0} dated {1},对日期为{1}的供应商发票{0}
 DocType: Customer,Default Price List,默认价格表
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +225,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: Payment Reconciliation,Payments,付款
 DocType: Journal Entry,Entry Type,条目类型
 ,Customer Credit Balance,客户贷方余额
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Payable,应付账款净额变化
@@ -1486,7 +1500,7 @@
 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 +9,Procurement,采购
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,没有一个项目无论在数量或价值的任何变化。
+apps/erpnext/erpnext/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,保修申请
 ,Lead Details,线索详情
 DocType: Purchase Invoice,End date of current invoice's period,当前发票周期的结束日期
@@ -1511,7 +1525,7 @@
 DocType: Purchase Invoice,Additional Discount,更多优惠
 DocType: Selling Settings,Selling Settings,销售设置
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,网上拍卖
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +97,Please specify either Quantity or Valuation Rate or both,请注明无论是数量或估价率或两者
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,请注明无论是数量或估价率或两者
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +13,Fulfillment,履行
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory",公司，月度和财年是必须项
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,市场营销开支
@@ -1532,14 +1546,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,ERPNext设置完成！
 DocType: Item,Weightage,权重
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +93,A Customer Group exists with same name please change the Customer name or rename the Customer Group,同名的客户组已经存在，请更改客户姓名或重命名该客户组
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +126,A Customer Group exists with same name please change the Customer name or rename the Customer Group,同名的客户组已经存在，请更改客户姓名或重命名该客户组
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,新建联系人
 DocType: Territory,Parent Territory,家长领地
 DocType: Quality Inspection Reading,Reading 2,阅读2
 DocType: Stock Entry,Material Receipt,物料收据
 DocType: Homepage,Products,产品展示
 DocType: Announcement,Instructor,讲师
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},党的类型和党的需要应收/应付帐户{0}
 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,下次联络人
@@ -1550,7 +1563,7 @@
 ,Item-wise Sales Register,品目特定的销售记录
 DocType: Asset,Gross Purchase Amount,总购买金额
 DocType: Asset,Depreciation Method,折旧方法
-apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Offline,离线
+apps/erpnext/erpnext/accounts/page/pos/pos.js +686,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,需要
@@ -1568,25 +1581,27 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +425,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 +858,Make Purchase Order,创建采购订单
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +852,Make Purchase Order,创建采购订单
 DocType: SMS Center,Send To,发送到
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,There is not enough leave balance for Leave Type {0},假期类型{0}的余额不足了
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,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 +172,Work-in-Progress Warehouse is required before Submit,提交前需要指定在制品仓库
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,Work-in-Progress Warehouse is required before Submit,提交前需要指定在制品仓库
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,求职申请。
 DocType: Purchase Order Item,Warehouse and Reference,仓库及参考
 DocType: Supplier,Statutory info and other general information about your Supplier,供应商的注册信息和其他一般信息
-apps/erpnext/erpnext/hooks.py +88,Addresses,地址
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,供应商&gt;供应商类型
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +212,Against Journal Entry {0} does not have any unmatched {1} entry,日记帐分录{0}没有不符合的{1}分录
+apps/erpnext/erpnext/hooks.py +95,Addresses,地址
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +215,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,根据项目或仓库请设置过滤器
 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,为了提供与比尔
@@ -1594,11 +1609,10 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} must be submitted,BOM{0}未提交
 DocType: Authorization Control,Authorization Control,授权控制
 apps/erpnext/erpnext/controllers/buying_controller.py +300,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},行＃{0}：拒绝仓库是强制性的反对否决项{1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +731,Payment,付款
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,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: Pricing Rule,Brand,品牌
 DocType: Course,Course Abbreviation,当然缩写
 DocType: Item,Will also apply for variants,会同时应用于变体
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +142,"Asset cannot be cancelled, as it is already {0}",资产不能被取消，因为它已经是{0}
@@ -1610,7 +1624,7 @@
 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.",列出您采购或销售的产品或服务。请确认品目群组，计量单位或其他属性。
 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 +85,Associate,协理
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,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,创建接收人列表
@@ -1618,7 +1632,7 @@
 DocType: Production Planning Tool,Material Requests,材料要求
 DocType: Warranty Claim,Issue Date,问题日期
 DocType: Activity Cost,Activity Cost,活动费用
-DocType: Timesheet Detail,Timesheet Detail,详细时间表
+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),表示该打包是这个交付的一部分（仅草稿）
@@ -1641,6 +1655,7 @@
 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,有变体
 DocType: Monthly Distribution,Name of the Monthly Distribution,月度分布名称
 DocType: Sales Person,Parent Sales Person,母公司销售人员
@@ -1653,31 +1668,32 @@
 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 +44,"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/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.,大写金额将在销售发票保存后显示。
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +502,Error: {0} &gt; {1},错误：{0}&gt; {1}
 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.,这个词开始日期不能超过哪个术语链接学年的开学日期较早（学年{}）。请更正日期，然后再试一次。
 DocType: Naming Series,Current Value,当前值
-apps/erpnext/erpnext/controllers/accounts_controller.py +235,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,多个会计年度的日期{0}存在。请设置公司财年
+apps/erpnext/erpnext/controllers/accounts_controller.py +238,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 +458,Item table can not be blank,品目表不能为空
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +443,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 +5,This is based on stock movement. See {0} for details,这是基于库存移动。见{0}详情
 DocType: Pricing Rule,Selling,销售
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +341,Amount {0} {1} deducted against {2},金额{0} {1}抵扣{2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +344,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,到期日不能前于过账日期
@@ -1692,8 +1708,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +144,Cannot refer row number greater than or equal to current row number for this Charge type,此收取类型不能引用大于或等于本行的数据。
 DocType: Asset,Sold,出售
 ,Item-wise Purchase History,品目特定的采购历史
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Red,红
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},请点击“生成表”来获取序列号增加了对项目{0}
+apps/erpnext/erpnext/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,清生产订单
 DocType: Sales Invoice Payment,Base Amount (Company Currency),基本金额（公司币种）
@@ -1701,7 +1717,7 @@
 DocType: Installation Note,Installation Time,安装时间
 DocType: Sales Invoice,Accounting Details,会计细节
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,删除所有交易本公司
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +187,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,行＃{0}：操作{1}未完成的成品{2}在生产数量订单{3}。请通过时间日志更新运行状态
+apps/erpnext/erpnext/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}。请通过时间日志更新运行状态
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,投资
 DocType: Issue,Resolution Details,详细解析
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,分配
@@ -1737,6 +1753,7 @@
 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}
 DocType: Delivery Note,Excise Page Number,Excise页码
 DocType: Asset,Purchase Date,购买日期
 DocType: Employee,Personal Details,个人资料
@@ -1745,7 +1762,7 @@
 DocType: Task,Actual End Date (via Time Sheet),实际结束日期（通过时间表）
 ,Quotation Trends,报价趋势
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},品目{0}的品目群组没有设置
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +295,Debit To account must be a Receivable account,入借帐户必须是应收账科目
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Receivable account,入借帐户必须是应收账科目
 DocType: Shipping Rule Condition,Shipping Amount,发货数量
 ,Pending Amount,待审核金额
 DocType: Purchase Invoice Item,Conversion Factor,转换系数
@@ -1753,10 +1770,10 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +137,Expected value after useful life must be greater than or equal to {0},使用寿命后预期值必须大于或等于{0}
 DocType: Purchase Receipt,Vehicle Number,车号
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,经常性发票终止日期
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +90,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,共分配叶{0}不能小于已经批准叶{1}期间
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +93,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 +22,Enter Paid Amount,输入支付的金额
+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,采用多级物料清单
@@ -1766,13 +1783,15 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,时间表
 DocType: HR Settings,HR Settings,人力资源设置
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Expense Claim is pending approval. Only the Expense Approver can update status.,报销正在等待批准。只有开支审批人才能更改其状态。
+DocType: Email Digest,New Expenses,新的费用
 DocType: Purchase Invoice,Additional Discount Amount,额外的折扣金额
-apps/erpnext/erpnext/controllers/accounts_controller.py +524,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",行＃{0}：订购数量必须是1，因为项目是固定资产。请使用单独的行多数量。
+apps/erpnext/erpnext/controllers/accounts_controller.py +527,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",行＃{0}：订购数量必须是1，因为项目是固定资产。请使用单独的行多数量。
 DocType: Leave Block List Allow,Leave Block List Allow,例外用户
 apps/erpnext/erpnext/setup/doctype/company/company.py +249,Abbr can not be blank or space,缩写不能为空或空格
 apps/erpnext/erpnext/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/stock/get_item_details.py +123,Please specify Company,请注明公司
 ,Customer Acquisition and Loyalty,客户获得和忠诚度
@@ -1783,17 +1802,19 @@
 apps/erpnext/erpnext/projects/doctype/task/task.js +26,Expense Claims,报销
 DocType: Issue,Support,支持
 ,BOM Search,BOM搜索
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Closing (Opening + Totals),截止（开标+总计）
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),截止（开标+总计）
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,请公司指定的货币
 DocType: Workstation,Wages per hour,时薪
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +50,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,下列资料的要求已自动根据项目的重新排序水平的提高
-apps/erpnext/erpnext/controllers/accounts_controller.py +272,Account {0} is invalid. Account Currency must be {1},帐户{0}是无效的。帐户货币必须是{1}
+DocType: Email Digest,Pending Sales Orders,待完成销售订单
+apps/erpnext/erpnext/controllers/accounts_controller.py +275,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 +956,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",行＃{0}：参考文件类型必须是销售订单之一，销售发票或日记帐分录
-DocType: Salary Slip,Deduction,扣款
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +87,Row {0}: From Time and To Time is mandatory.,行{0}：从时间和时间是强制性的。
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +969,"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 +111,Row {0}: From Time and To Time is mandatory.,行{0}：从时间和时间是强制性的。
+DocType: Stock Reconciliation Item,Amount Difference,金额差异
 apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},加入项目价格为{0}价格表{1}
 DocType: Address Template,Address Template,地址模板
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +7,Please enter Employee Id of this sales person,请输入这个销售人员的员工标识
@@ -1801,7 +1822,7 @@
 DocType: Project,% Tasks Completed,％任务已完成
 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 +194,Please enter Production Item first,请先输入生产项目
+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,已禁用用户
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,报价
@@ -1810,53 +1831,54 @@
 DocType: Maintenance Visit,Maintenance User,维护用户
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +149,Cost Updated,成本更新
 DocType: Employee,Date of Birth,出生日期
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +86,Item {0} has already been returned,品目{0}已被退回
+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: 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 +177,Job Description,职位描述
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,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 +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","命名序列中不能输入特殊符号，""-""，""#""，"".""和""/""除外"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","命名序列中不能输入特殊符号，""-""，""#""，"".""和""/""除外"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.",追踪销售活动。追踪来自活动的潜在客户，报价，销售订单等，统计投资回报率。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +24,Welcome to POS: Create your POS Profile,欢迎到POS：创建您的个人资料POS
 DocType: Expense Claim,Approver,审批者
 ,SO Qty,销售订单数量
+DocType: Guardian,Work Address,工作地址
 DocType: Appraisal,Calculate Total Score,计算总分
 DocType: Request for Quotation,Manufacturing Manager,生产经理
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},序列号{0}截至至{1}之前在保修内。
+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 +74,Shipments,发货
+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 +153,Row # ,行＃
+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 +156,Get From,得到
+apps/erpnext/erpnext/public/js/utils.js +167,Get From,得到
 DocType: C-Form,Quarter,季
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Miscellaneous Expenses,杂项开支
 DocType: Global Defaults,Default Company,默认公司
 apps/erpnext/erpnext/controllers/stock_controller.py +167,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,品目{0}必须指定开支/差异账户。
-apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings",不能为行{1}的{0}开具超过{2}的超额账单。要允许超额账单请更改仓储设置。
+apps/erpnext/erpnext/controllers/accounts_controller.py +419,"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,-以上
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} is disabled,用户{0}已禁用
 DocType: Leave Application,Total Leave Days,总休假天数
 DocType: Email Digest,Note: Email will not be sent to disabled users,注意：邮件不会发送给已禁用用户
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,选择公司...
 DocType: Leave Control Panel,Leave blank if considered for all departments,如果针对所有部门请留空
 apps/erpnext/erpnext/config/hr.py +171,"Types of employment (permanent, contract, intern etc.).",就业（永久，合同，实习生等）的类型。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +346,{0} is mandatory for Item {1},品目{1}必须有{0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,{0} is mandatory for Item {1},品目{1}必须有{0}
 DocType: Currency Exchange,From Currency,源货币
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",请ATLEAST一行选择分配金额，发票类型和发票号码
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,新的采购成本
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},销售订单为品目{0}的必须项
 DocType: Purchase Invoice Item,Rate (Company Currency),单价（公司货币）
-apps/erpnext/erpnext/demo/setup_data.py +360,Others,他人
+DocType: Student Guardian,Others,他人
 DocType: Payment Entry,Unallocated Amount,未分配金额
 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,税项和收费
@@ -1876,17 +1898,16 @@
 apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,序列化库存
 DocType: Activity Type,Default Billing Rate,默认计费率
 DocType: Sales Invoice,Total Billing Amount,总结算金额
-apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +54,Receivable Account,应收账款
-apps/erpnext/erpnext/controllers/accounts_controller.py +546,Row #{0}: Asset {1} is already {2},行＃{0}：资产{1}已经是{2}
+apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,应收账款
+apps/erpnext/erpnext/controllers/accounts_controller.py +549,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 +79,CEO,CEO
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,CEO
 DocType: Expense Claim Detail,Expense Claim Detail,报销详情
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +808,Please select correct account,请选择正确的帐户
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +809,Please select correct account,请选择正确的帐户
 DocType: Item,Weight UOM,重量计量单位
 DocType: Salary Structure Employee,Salary Structure Employee,薪资结构员工
 DocType: Employee,Blood Group,血型
-DocType: Purchase Invoice Item,Page Break,分页符
 DocType: Production Order Operation,Pending,有待
 DocType: Course,Course Name,课程名
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,可以为特定用户批准假期的用户
@@ -1895,14 +1916,15 @@
 DocType: Fiscal Year,Companies,企业
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,电子
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,当库存达到再订购点时提出物料请求
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Full-time,全职
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,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: 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,总传入值
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Debit To is required,借记是必需的
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +321,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,质量经理
@@ -1910,6 +1932,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/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,总开票金额
@@ -1920,18 +1943,17 @@
 DocType: Production Order Operation,Completed Qty,已完成数量
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"For {0}, only debit accounts can be linked against another credit entry",对于{0}，借方分录只能选择借方账户
 apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,价格表{0}被禁用
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +99,Row {0}: Completed Qty cannot be more than {1} for operation {2},行{0}：已完成的数量不能超过{1}操作{2}
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +123,Row {0}: Completed Qty cannot be more than {1} for operation {2},行{0}：已完成的数量不能超过{1}操作{2}
 DocType: Manufacturing Settings,Allow Overtime,允许加班
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,品目{1}需要{0}的序列号。您已提供{2}。
 DocType: Stock Reconciliation Item,Current Valuation Rate,目前的估值价格
 DocType: Item,Customer Item Codes,客户项目代码
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,兑换收益/损失
 DocType: Opportunity,Lost Reason,丧失原因
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,请设置通过设置编号系列考勤&gt;编号系列
 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/purchase_receipt/purchase_receipt.py +378,All items have already been invoiced,所有品目已开具发票
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +379,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,外部
@@ -1947,18 +1969,19 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,您的客户
 apps/erpnext/erpnext/projects/doctype/project/project.py +141,You have been invited to collaborate on the project: {0},您已被邀请在项目上进行合作：{0}
 DocType: Leave Block List Date,Block Date,禁离日期
-apps/erpnext/erpnext/templates/generators/job_opening.html +19,Apply Now,现在申请
+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.",创建和管理每日，每周和每月的电子邮件摘要。
 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,房屋
-apps/erpnext/erpnext/utilities/doctype/address/address.py +164,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,无缺省地址模板中。请创建设置&gt;打印和品牌&gt;地址模板一个新的。
 DocType: Fee Structure,Fee Structure,费用结构
 DocType: Timesheet Detail,Costing Amount,成本核算金额
+DocType: Student Admission,Application Fee,报名费
 DocType: Process Payroll,Submit Salary Slip,提交工资单
-apps/erpnext/erpnext/controllers/selling_controller.py +161,Maxiumm discount for Item {0} is {1}%,品目{0}的最大折扣为 {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,品目{0}的最大折扣为 {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,进口散装
 DocType: Sales Partner,Address & Contacts,地址及联系方式
 DocType: SMS Log,Sender Name,发件人名称
@@ -1983,21 +2006,21 @@
 DocType: Serial No,Delivery Time,交货时间
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,账龄基于
 DocType: Item,End of Life,寿命结束
-apps/erpnext/erpnext/demo/setup_data.py +361,Travel,旅游
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +155,No active or default Salary Structure found for employee {0} for the given dates,发现员工{0}对于给定的日期没有活动或默认的薪酬结构
+apps/erpnext/erpnext/demo/setup/setup_data.py +304,Travel,旅游
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +167,No active or default Salary Structure found for employee {0} for the given dates,发现员工{0}对于给定的日期没有活动或默认的薪酬结构
 DocType: Leave Block List,Allow Users,允许用户(多个)
 DocType: Purchase Order,Customer Mobile No,客户手机号码
 DocType: Sales Invoice,Recurring,经常性
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,跟踪独立收入和支出进行产品垂直或部门。
 DocType: Rename Tool,Rename Tool,重命名工具
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +23,Update Cost,更新成本
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,更新成本
 DocType: Item Reorder,Item Reorder,品目重新排序
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +36,Show Salary Slip,显示工资单
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +748,Transfer Material,转印材料
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +53,Show Salary Slip,显示工资单
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,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 +166,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 +923,Please set recurring after saving,请设置保存后复发
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +646,Select change amount account,选择变化量账户
+apps/erpnext/erpnext/public/js/controllers/transaction.js +914,Please set recurring after saving,请设置保存后复发
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +703,Select change amount account,选择变化量账户
 DocType: Purchase Invoice,Price List Currency,价格表货币
 DocType: Naming Series,User must always select,用户必须始终选择
 DocType: Stock Settings,Allow Negative Stock,允许负库存
@@ -2009,31 +2032,32 @@
 DocType: Quality Inspection,Verified By,认证机构
 DocType: Address,Subsidiary,子机构
 apps/erpnext/erpnext/setup/doctype/company/company.py +64,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.",因为已有交易不能改变公司的默认货币，请先取消交易。
+DocType: Grade Interval,Grade Description,等级说明
 DocType: Quality Inspection,Purchase Receipt No,购买收据号码
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,保证金
 DocType: Process Payroll,Create Salary Slip,建立工资单
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +33,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 +352,Quantity in row {0} ({1}) must be same as manufactured quantity {2},行{0}中的数量({1})必须等于生产数量{2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Quantity in row {0} ({1}) must be same as manufactured quantity {2},行{0}中的数量({1})必须等于生产数量{2}
 DocType: Appraisal,Employee,雇员
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,邀请成为用户
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1}已完全开票
 DocType: Workstation Working Hour,End Time,结束时间
 DocType: Payment Entry,Payment Deductions or Loss,付款扣除或损失
-apps/erpnext/erpnext/config/schools.py +100,LMS,LMS
+apps/erpnext/erpnext/config/schools.py +104,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,销售渠道
 DocType: Student Batch Student,Student Batch Student,学生批学生
-DocType: Sales Invoice,Mass Mailing,邮件群发
+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 +199,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/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 +297,Salary Slip of employee {0} already created for this period,员工的工资单{0}已为这一时期创建
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Pharmaceutical,医药
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +309,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/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,入贷
@@ -2048,27 +2072,28 @@
 DocType: Upload Attendance,Attendance To Date,考勤结束日期
 DocType: Warranty Claim,Raised By,提出
 DocType: Payment Gateway Account,Payment Account,付款帐号
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +814,Please specify Company to proceed,请注明公司进行
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +793,Please specify Company to proceed,请注明公司进行
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Receivable,应收账款净额变化
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Compensatory Off,补假
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,补假
 DocType: Quality Inspection Reading,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.,请确保你真的要删除这家公司的所有交易。主数据将保持原样。这个动作不能撤消。
 DocType: Room,Room Number,房间号
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},无效的参考{0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +161,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} {1}不能大于生产订单{3}的计划数量({2})
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +162,{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 +217,Raw Materials cannot be blank.,原材料不能为空。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,"Could not update stock, invoice contains drop shipping item.",无法更新库存，发票包含下降航运项目。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +460,Quick Journal Entry,快速日记帐分录
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +111,You can not change rate if BOM mentioned agianst any item,如果任何条目中引用了BOM，你不能更改其税率
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +441,"Could not update stock, invoice contains drop shipping item.",无法更新库存，发票包含下降航运项目。
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Quick Journal Entry,快速日记帐分录
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +103,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 +214,{0} {1} is not submitted,{0} {1}未提交
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,请求的项目。
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,独立的生产订单将每个成品项目被创建。
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +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.,该机构的名称要为其建立这个系统。
@@ -2077,16 +2102,17 @@
 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 +398,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 +739,Item or Warehouse for row {0} does not match Material Request,行{0}中的品目或仓库与物料申请不符合
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +747,Item or Warehouse for row {0} does not match Material Request,行{0}中的品目或仓库与物料申请不符合
 apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,计量单位
 DocType: Fiscal Year,Year End Date,年度结束日期
 DocType: Task Depends On,Task Depends On,任务取决于
-DocType: Lead,Opportunity,机会
+DocType: Supplier Quotation,Opportunity,机会
 ,Completed Production Orders,已完成生产订单
 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,默认工作台
@@ -2099,7 +2125,7 @@
 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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},序列号为{0}的开始日期不能早于交付日期
+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,实际结束日期
 DocType: Purchase Invoice,PINV-,PINV-
 DocType: Authorization Rule,Applicable To (Role),适用于(角色)
@@ -2114,7 +2140,7 @@
 DocType: SMS Log,No of Requested SMS,请求短信数量
 DocType: Campaign,Campaign-.####,活动-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,下一步
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,Please supply the specified items at the best possible rates,请在提供最好的利率规定的项目
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +695,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 +117,Contract End Date must be greater than Date of Joining,合同结束日期必须大于加入的日期
 DocType: Delivery Note,DN-,DN-
@@ -2123,7 +2149,7 @@
 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 +14,This is an example website auto-generated from ERPNext,这是一个示例网站从ERPNext自动生成
+apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,这是一个示例网站从ERPNext自动生成
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,账龄范围1
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
@@ -2162,13 +2188,14 @@
 DocType: Purchase Receipt Item,Recd Quantity,记录数量
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +54,Fee Records Created - {0},费纪录创造 -  {0}
 DocType: Asset Category Account,Asset Category Account,资产类别的帐户
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +103,Cannot produce more Item {0} than Sales Order quantity {1},不能生产超过销售订单数量{1}的品目{0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Stock Entry {0} is not submitted,库存记录{0}不提交
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},不能生产超过销售订单数量{1}的品目{0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +505,Stock Entry {0} is not submitted,库存记录{0}不提交
 DocType: Payment Reconciliation,Bank / Cash Account,银行/现金账户
 DocType: Tax Rule,Billing City,结算城市
 DocType: Salary Component Account,Salary Component Account,薪金部分账户
 DocType: Global Defaults,Hide Currency Symbol,隐藏货币符号
 apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card",例如：银行，现金，信用卡
+DocType: Lead Source,Source Name,源名称
 DocType: Journal Entry,Credit Note,信用票据
 DocType: Warranty Claim,Service Address,服务地址
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furnitures and Fixtures,家具及固定装置
@@ -2180,6 +2207,7 @@
 DocType: Opportunity,Customer / Lead Name,客户/潜在客户名称
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +89,Clearance Date not mentioned,清拆日期未提及
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,生产
+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/controllers/trends.py +19,Total(Qty),总计（数量）
 DocType: Sales Invoice,This Document,本文档
@@ -2191,15 +2219,15 @@
 DocType: Purchase Receipt,Time at which materials were received,收到材料在哪个时间
 DocType: Stock Ledger Entry,Outgoing Rate,传出率
 apps/erpnext/erpnext/config/hr.py +176,Organization branch master.,组织分支主。
-apps/erpnext/erpnext/controllers/accounts_controller.py +273, or ,或
+apps/erpnext/erpnext/controllers/accounts_controller.py +276, 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 +203,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,行＃{0}：日记条目{1}没有帐户{2}或已经对另一凭证匹配
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +206,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 +90,No employee for the above selected criteria OR salary slip already created,已创建的任何雇员对上述选择标准或工资单
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +93,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,针对选择您要分配款项的发票。
@@ -2227,8 +2255,8 @@
 DocType: Product Bundle,Parent Item,父项目
 DocType: Account,Account Type,账户类型
 DocType: Delivery Note,DN-RET-,DN-RET-
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +115,Leave Type {0} cannot be carry-forwarded,休假类型{0}不能随身转发
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',维护计划没有为所有品目生成，请点击“生产计划”
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +118,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 +163,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",对于行{0} {1}。以包括{2}中的档案速率，行{3}也必须包括
@@ -2240,13 +2268,13 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +32,Disabled template must not be default template,残疾人模板必须不能默认模板
 DocType: Account,Income Account,收益账户
 DocType: Payment Request,Amount in customer's currency,量客户的货币
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +748,Delivery,交货
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +742,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,关键责任区
 DocType: Payment Entry,Total Allocated Amount,总拨款额
 DocType: Item Reorder,Material Request Type,物料申请类型
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +82,Row {0}: UOM Conversion Factor is mandatory,行{0}：计量单位转换系数是必需的
+apps/erpnext/erpnext/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,成本中心
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,凭证 #
@@ -2257,13 +2285,13 @@
 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 +90,Head of Marketing and Sales,营销和销售主管
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,所得税
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,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 +403,Please enter Item Code to get batch no,请输入产品编号，以获得批号
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +770,Please select a value for {0} quotation_to {1},请选择一个值{0} quotation_to {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +397,Please enter Item Code to get batch no,请输入产品编号，以获得批号
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +764,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",合并是唯一可能的，如果以下属性中均有记载相同。是集团，根型，公司
@@ -2275,28 +2303,29 @@
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,没存货
 DocType: Appraisal,HR User,HR用户
 DocType: Purchase Invoice,Taxes and Charges Deducted,已扣除税费
-apps/erpnext/erpnext/hooks.py +100,Issues,问题
+apps/erpnext/erpnext/hooks.py +109,Issues,问题
 apps/erpnext/erpnext/controllers/status_updater.py +13,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}被禁用
 DocType: Supplier,Billing Currency,结算货币
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Large,特大号
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,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 +507,Warning: Another {0} # {1} exists against stock entry {2},警告：针对库存记录{2}存在另一个{0}＃{1}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Local,当地
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +508,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),贷款及垫款（资产）
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,债务人
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Large,大
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,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 +225,Total {0} ({1}),总{0}（{1}）
+apps/erpnext/erpnext/accounts/report/financial_statements.py +224,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,默认估值方法
@@ -2342,9 +2371,9 @@
 DocType: Attendance,Leave Type,假期类型
 apps/erpnext/erpnext/controllers/stock_controller.py +173,Expense / Difference account ({0}) must be a 'Profit or Loss' account,开支/差异帐户({0})必须是一个“益损”账户
 DocType: Account,Accounts User,会计人员
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Name error: {0},名称错误：{0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +90,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 +178,{0} {1} does not associated with {2} {3},{0} {1} 没有关联 {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +181,{0} {1} does not associated with {2} {3},{0} {1} 没有关联 {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,雇员{0}的考勤已标记
 DocType: Packing Slip,If more than one package of the same type (for print),如果有多个同样类型的打包（用于打印）
 DocType: Warehouse,Parent Warehouse,家长仓库
@@ -2363,7 +2392,7 @@
 DocType: BOM Item,Scrap %,折旧％
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection",费用会根据你选择的品目数量和金额按比例分配。
 DocType: Maintenance Visit,Purposes,用途
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,ATLEAST一个项目应该负数量回报文档中输入
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Atleast one item should be entered with negative quantity in return document,ATLEAST一个项目应该负数量回报文档中输入
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations",操作{0}比任何可用的工作时间更长工作站{1}，分解成运行多个操作
 ,Requested,要求
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +83,No Remarks,暂无说明
@@ -2375,46 +2404,46 @@
 DocType: Item,Total Projected Qty,预计总数量
 DocType: Monthly Distribution,Distribution Name,分配名称
 DocType: Course,Course Code,课程代码
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Quality Inspection required for Item {0},品目{0}要求质量检验
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Quality Inspection required for Item {0},品目{0}要求质量检验
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,客户的货币转换为公司的基础货币后的单价
 DocType: Purchase Invoice Item,Net Rate (Company Currency),净利率（公司货币）
 DocType: Salary Detail,Condition and Formula Help,条件和公式帮助
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,管理区域
 DocType: Journal Entry Account,Sales Invoice,销售发票
 DocType: Journal Entry Account,Party Balance,党平衡
-apps/erpnext/erpnext/accounts/page/pos/pos.js +475,Please select Apply Discount On,请选择适用的折扣
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +92,Salary Slip Created,工资单创建
+apps/erpnext/erpnext/accounts/page/pos/pos.js +464,Please select Apply Discount On,请选择适用的折扣
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +95,Salary Slip Created,工资单创建
 DocType: Company,Default Receivable Account,默认应收账户
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,为上述选择条件支付的工资总计创建银行分录
 DocType: Stock Entry,Material Transfer for Manufacture,用于生产的物料转移
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,折扣百分比可以应用于一个或所有的价目表。
 DocType: Purchase Invoice,Half-yearly,半年一次
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +384,Accounting Entry for Stock,库存的会计分录
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +387,Accounting Entry for Stock,库存的会计分录
 DocType: Sales Invoice,Sales Team1,销售团队1
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,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 +96,Row {0}: Completed Qty must be greater than zero.,行{0}：已完成数量必须大于零。
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +120,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 +88,Row # {0}: Cannot return more than {1} for Item {2},行＃{0}：无法返回超过{1}项{2}
+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,情节
 DocType: Item Group,Show this slideshow at the top of the page,在页面顶部显示此幻灯片
 DocType: BOM,Item UOM,品目计量单位
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),税额后，优惠金额（公司货币）
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +147,Target warehouse is mandatory for row {0},行{0}必须指定目标仓库
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +141,Target warehouse is mandatory for row {0},行{0}必须指定目标仓库
 DocType: Cheque Print Template,Primary Settings,主要设置
 DocType: Purchase Invoice,Select Supplier Address,选择供应商地址
 DocType: Quality Inspection,Quality Inspection,质量检验
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Extra Small,超小
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,Warning: Material Requested Qty is less than Minimum Order Qty,警告：物料请求的数量低于最低起订量
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +194,Account {0} is frozen,科目{0}已冻结
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,超小
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +690,Warning: Material Requested Qty is less than Minimum Order Qty,警告：物料请求的数量低于最低起订量
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,科目{0}已冻结
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,属于本机构的，带独立科目表的法人/附属机构。
 DocType: Payment Request,Mute Email,静音电子邮件
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco",食品，饮料与烟草
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +606,Can only make payment against unbilled {0},只能使支付对未付款的{0}
-apps/erpnext/erpnext/controllers/selling_controller.py +126,Commission rate cannot be greater than 100,佣金率不能大于100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +609,Can only make payment against unbilled {0},只能使支付对未付款的{0}
+apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,佣金率不能大于100
 DocType: Stock Entry,Subcontract,外包
 apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,请输入{0}第一
 DocType: Production Order Operation,Actual End Time,实际结束时间
@@ -2425,30 +2454,30 @@
 DocType: SMS Log,No of Sent SMS,发送短信数量
 DocType: Account,Expense Account,开支帐户
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,软件
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Colour,颜色
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,颜色
 DocType: Maintenance Visit,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",请选择项，其中“正股项”是“否”和“是销售物品”是“是”，没有其他产品捆绑
 DocType: Student Log,Academic,学术的
-apps/erpnext/erpnext/controllers/accounts_controller.py +469,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),总的超前（{0}）对二阶{1}不能大于总计（{2}）
+apps/erpnext/erpnext/controllers/accounts_controller.py +472,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),总的超前（{0}）对二阶{1}不能大于总计（{2}）
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,如果要不规则的按月分配，请选择“月度分布”。
 DocType: Purchase Invoice Item,Valuation Rate,估值率
+DocType: Stock Reconciliation,SR/,SR /
 apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,价格表货币没有选择
 DocType: Assessment,Results,结果
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +168,Employee {0} has already applied for {1} between {2} and {3},雇员{0}申请了{1}，时间是{2}至{3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +175,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: Student Applicant,Father's/ Guardian 2 Email ID,父亲/监护人2电子邮件ID
 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 +228,Warehouses with existing transaction can not be converted to group.,与现有的交易仓库不能转换为组。
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +231,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 +93,Researcher,研究员
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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.,来料质量检验。
@@ -2460,25 +2489,25 @@
 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: Sales Invoice,Advertisement,广告
 DocType: Asset Category Account,Depreciation Expense Account,折旧费用帐户
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Probationary Period,试用期
-apps/erpnext/erpnext/hooks.py +102,Announcements,通告
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,试用期
+apps/erpnext/erpnext/hooks.py +111,Announcements,通告
 DocType: Customer Group,Only leaf nodes are allowed in transaction,只有叶节点中允许交易
 DocType: Expense Claim,Expense Approver,开支审批人
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +109,Row {0}: Advance against Customer must be credit,行{0}：提前对客户必须是信用
 apps/erpnext/erpnext/accounts/doctype/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 +16,To Datetime,以日期时间
+apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,以日期时间
 DocType: SMS Settings,SMS Gateway URL,短信网关的URL
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +51,Course Schedules deleted:,课程表删除：
 apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,日志维护短信发送状态
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,待活动
+DocType: Accounts Settings,Make Payment via Journal Entry,通过日记帐分录进行付款
+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 +127,Please enter relieving date.,请输入解除日期。
-apps/erpnext/erpnext/controllers/trends.py +145,Amt,金额
+apps/erpnext/erpnext/controllers/trends.py +149,Amt,金额
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,Only Leave Applications with status 'Approved' can be submitted,只留下带有状态的应用“已批准” ，可以提交
 apps/erpnext/erpnext/utilities/doctype/address/address.py +26,Address Title is mandatory.,地址标题是必须项。
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,如果询价的来源是活动的话请输入活动名称。
@@ -2496,14 +2525,15 @@
 apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1},找不到汇率{0} {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,马克半天
 DocType: Sales Invoice,Sales Team,销售团队
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Duplicate entry,重复的条目
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,重复的条目
 DocType: Program Enrollment Tool,Get Students,让学生
 DocType: Serial No,Under Warranty,在保修期内
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +490,[Error],[错误]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +484,[Error],[错误]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,大写金额将在销售订单保存后显示。
 ,Employee Birthday,雇员生日
 apps/erpnext/erpnext/controllers/status_updater.py +175,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}已经存在。请修改这些条目，然后再试一次。
 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}不存在
@@ -2519,22 +2549,22 @@
 ,Issued Items Against Production Order,生产订单已发料的品目
 DocType: Pricing Rule,Purchase Manager,采购经理
 DocType: Target Detail,Target Detail,目标详细信息
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +25,All Jobs,所有职位
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,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 +323,Amount {0} {1} {2} {3},金额{0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,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: Supplier,Credit Limit,信用额度
 DocType: Production Plan Sales Order,Salse Order Date,Salse订单日期
 DocType: Salary Component,Salary Component,薪金部分
-apps/erpnext/erpnext/accounts/utils.py +372,Payment Entries {0} are un-linked,付款项{0}是联合国联
+apps/erpnext/erpnext/accounts/utils.py +449,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 +497,Material Requests {0} created,物料申请{0}已创建
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +498,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.,条款或合同模板。
 DocType: Purchase Invoice,Address and Contact,地址和联系方式
@@ -2573,7 +2603,7 @@
 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 +848,Paid Amount cannot be greater than total negative outstanding amount {0},支付的金额不能超过总负余额大于{0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +859,Paid Amount cannot be greater than total negative outstanding amount {0},支付的金额不能超过总负余额大于{0}
 DocType: Employee Internal Work History,Employee Internal Work History,雇员内部就职经历
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +233,Closing (Dr),结算(借记)
 DocType: Cheque Print Template,Cheque Size,支票大小
@@ -2594,7 +2624,8 @@
 ,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取消。
-apps/erpnext/erpnext/controllers/accounts_controller.py +555,'Update Stock' cannot be checked for fixed asset sale,固定资产销售不能选择“更新库存”
+DocType: Student Guardian,Father,父亲
+apps/erpnext/erpnext/controllers/accounts_controller.py +558,'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/buying/doctype/purchase_order/purchase_order.py +132,Material Request {0} is cancelled or stopped,物料申请{0}已取消或已停止
@@ -2604,15 +2635,15 @@
 DocType: Sales Order,Fully Delivered,完全交付
 DocType: Lead,Lower Income,较低收益
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked",负债类型的账户头(益损)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +166,Source and target warehouse cannot be same for row {0},行{0}中的源和目标仓库不能相同
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",差异帐户必须是资产/负债类型的帐户，因为此库存盘点在期初进行
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +81,Purchase Order number required for Item {0},所需物品的采购订单号{0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +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/purchase_receipt/purchase_receipt.py +82,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 +17,Cannot change status as student {0} is linked with student application {1},无法改变地位的学生{0}与学生申请链接{1}
+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: Timesheet,"List of employee which has ""Salary Slip Based on Timesheet"" is enabled in salary structure.",员工的名单里面有“根据时间表工资单”，在工资结构被启用。
 DocType: Asset,Fully Depreciated,已提足折旧
 ,Stock Projected Qty,预计库存量
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Customer {0} does not belong to project {1},客户{0}不属于项目{1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,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,序列号和批次
@@ -2624,7 +2655,7 @@
 DocType: Purchase Invoice,Purchase Taxes and Charges,购置税和费
 ,Qty to Receive,接收数量
 DocType: Leave Block List,Leave Block List Allowed,禁离日例外用户
-apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +55,All Warehouses,所有仓库
+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 +105,Credit To account must be a Balance Sheet account,信用帐户必须是资产负债表科目
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,所有供应商类型
@@ -2636,10 +2667,10 @@
 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/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,创建工资单
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +26,Browse BOM,浏览BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,浏览BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,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 Year,Academic Year,学年
+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
 DocType: Appraisal,Appraisal,评估
@@ -2647,12 +2678,12 @@
 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 +197,Leave approver must be one of {0},假期审批人有{0}的角色
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,Leave approver must be one of {0},假期审批人有{0}的角色
 DocType: Hub Settings,Seller Email,卖家电子邮件
 DocType: Project,Total Purchase Cost (via Purchase Invoice),总购买成本（通过采购发票）
 DocType: Workstation Working Hour,Start Time,开始时间
 DocType: Item Price,Bulk Import Help,批量导入帮助
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +256,Select Quantity,选择数量
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +257,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,消息已发送
@@ -2669,6 +2700,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,需要指定目标数量和金额。
 apps/erpnext/erpnext/config/projects.py +45,Cost of various activities,各种活动的费用
 apps/erpnext/erpnext/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 +149,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}的库存交易进行更新
 DocType: Item,Inspection Required,需要检验
@@ -2688,7 +2720,7 @@
 DocType: Expense Claim,Approval Status,审批状态
 DocType: Hub Settings,Publish Items to Hub,发布项目到集线器
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},行{0}的起始值必须更小
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Wire Transfer,电汇
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,电汇
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,全面检查
 DocType: Sales Order,Recurring Order,周期性订单
 DocType: Company,Default Income Account,默认收益账户
@@ -2700,21 +2732,19 @@
 ,Welcome to ERPNext,欢迎使用ERPNext
 apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,导致报价
 DocType: Lead,From Customer,源客户
-apps/erpnext/erpnext/demo/setup_data.py +357,Calls,电话
+apps/erpnext/erpnext/demo/setup/setup_data.py +300,Calls,电话
 DocType: Project,Total Costing Amount (via Time Logs),总成本核算金额（通过时间日志）
 DocType: Purchase Order Item Supplied,Stock UOM,库存计量单位
-apps/erpnext/erpnext/stock/doctype/item/item.py +466,"As there are existing transactions for this item, \
-							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'",由于存在现有交易为这个项目，\你不能改变的值&#39;有序列号&#39;，&#39;有批号&#39;，&#39;是股票项目“和”评估方法“
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,Purchase Order {0} is not submitted,采购订单{0}未提交
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,预计
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},序列号{0}不属于仓库{1}
 apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,注意：系统将不会为品目{0}检查超额发货或超额预订，因为其数量或金额为0
 DocType: Notification Control,Quotation Message,报价信息
 DocType: Issue,Opening Date,开幕日期
-apps/erpnext/erpnext/schools/api.py +58,Attendance has been marked successfully.,出席已成功标记。
+apps/erpnext/erpnext/schools/api.py +57,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 +136,Account Type for {0} must be {1},帐户类型为{0}必须{1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +139,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,两个仓库必须属于同一公司
@@ -2729,12 +2759,13 @@
 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/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 +20,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 +1190,Please select customer,请选择客户
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1193,Please select customer,请选择客户
 DocType: C-Form,I,一世
 DocType: Company,Asset Depreciation Cost Center,资产折旧成本中心
 DocType: Sales Order Item,Sales Order Date,销售订单日期
@@ -2744,6 +2775,7 @@
 ,Payment Period Based On Invoice Date,已经提交。
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},{0}没有货币汇率
 DocType: Assessment,Examiner,检查员
+DocType: Student,Siblings,兄弟姐妹
 DocType: Journal Entry,Stock Entry,库存记录
 DocType: Payment Entry,Payment References,付款参考
 DocType: C-Form,C-FORM-,C-形式 -
@@ -2761,11 +2793,12 @@
 DocType: Journal Entry,JV-,将N-
 DocType: Topic,Topic Name,主题名称
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,必须至少选择'销售'或'采购'其中的一项
+DocType: Grading Structure,Grade Intervals,间隔级
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,选择您的业务的性质。
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,生产流程进行的地方。
 DocType: Asset Movement,Source Warehouse,源仓库
 DocType: Installation Note,Installation Date,安装日期
-apps/erpnext/erpnext/controllers/accounts_controller.py +534,Row #{0}: Asset {1} does not belong to company {2},行＃{0}：资产{1}不属于公司{2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +537,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,销售用户
@@ -2779,28 +2812,31 @@
 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 +111,Date Of Retirement must be greater than Date of Joining,退休日期必须大于入职日期
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +49,There were errors while scheduling course on :,有错误，同时在调度过程：
 DocType: Sales Invoice,Against Income Account,对收益账目
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +87,{0}% Delivered,{0}％交付
+apps/erpnext/erpnext/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 +379,Please set default {0} in Company {1},请设置在默认情况下公司{0} {1}
+apps/erpnext/erpnext/accounts/utils.py +456,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,总利润/亏损
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,采购订单项目提供
 apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,公司名称不能为公司
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,打印模板的信头。
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,标题打印模板例如形式发票。
+DocType: Student Guardian,Student Guardian,学生家长
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +184,Valuation type charges can not marked as Inclusive,估值类型罪名不能标记为包容性
 DocType: POS Profile,Update Stock,更新库存
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,不同计量单位的项目会导致不正确的（总）净重值。请确保每个品目的净重使用同一个计量单位。
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM税率
 DocType: Asset,Journal Entry for Scrap,日记帐分录报废
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,请送货单拉项目
-apps/erpnext/erpnext/accounts/utils.py +349,Journal Entries {0} are un-linked,日记帐分录{0}没有关联
+apps/erpnext/erpnext/accounts/utils.py +426,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,请提及公司舍入成本中心
@@ -2824,6 +2860,7 @@
 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,社区论坛
+DocType: Homepage,"URL for ""All Products""",网址“所有产品”
 DocType: Leave Application,Leave Balance Before Application,申请前假期余量
 DocType: SMS Center,Send SMS,发送短信
 DocType: Cheque Print Template,Width of amount in word,在字量的宽度
@@ -2832,7 +2869,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 +29,Current Job Openings,当前职位空缺
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,Current Job Openings,当前职位空缺
 DocType: Company,Stock Adjustment Account,库存调整账户
 DocType: Journal Entry,Write Off,抹杀
 DocType: Timesheet Detail,Operation ID,操作ID
@@ -2845,7 +2882,7 @@
 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 +850,Show tax break-up,展会税分手
+apps/erpnext/erpnext/public/js/controllers/transaction.js +841,Show tax break-up,展会税分手
 apps/erpnext/erpnext/accounts/party.py +308,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}，因此你不能重新分配或修改
@@ -2855,10 +2892,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 +534,Please select Posting Date before selecting Party,在选择之前，甲方请选择发布日期
 DocType: Serial No,Out of AMC,出资产管理公司
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +80,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 +162,Please contact to the user who have Sales Master Manager {0} role,请联系，谁拥有硕士学位的销售经理{0}角色的用户
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +195,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 +5,This is based on the attendance of this Student,这是基于这名学生出席
@@ -2867,12 +2905,11 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,取消这个销售订单之前必须取消送货单{0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +75,Paid amount + Write Off Amount can not be greater than Grand Total,支付的金额+写的抵销金额不能大于总计
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,{0} is not a valid Batch Number for Item {1},{0}不是品目{1}的有效批次号
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +138,Note: There is not enough leave balance for Leave Type {0},注意：假期类型{0}的余量不足
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,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,机会类型
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,新建公司
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,Cost Center is required for 'Profit and Loss' account {0},成本中心是“损益”科目{0}的必须项
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,交易只能由公司的创建者被删除
 apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,总帐分录发现错误数字，你可能在交易中选择了错误的科目。
 DocType: Cheque Print Template,Cheque Width,支票宽度
@@ -2881,16 +2918,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,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 +228,{0} '{1}' is disabled,{0}“{1}”被禁用
+apps/erpnext/erpnext/controllers/accounts_controller.py +231,{0} '{1}' is disabled,{0}“{1}”被禁用
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,设置为打开
 DocType: Cheque Print Template,Scanned Cheque,支票扫描
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,交易提交时自动向联系人发送电子邮件。
+DocType: Timesheet,Total Billable Amount,总结算金额
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,项目3
 DocType: Purchase Order,Customer Contact Email,客户联系电子邮件
 DocType: Warranty Claim,Item and Warranty Details,项目和保修细节
 DocType: Sales Team,Contribution (%),贡献（％）
-apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,注意：付款分录不会创建，因为“现金或银行账户”没有指定
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Responsibilities,职责
+apps/erpnext/erpnext/controllers/accounts_controller.py +78,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,职责
 DocType: Expense Claim Account,Expense Claim Account,报销账户
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,模板
 DocType: Sales Person,Sales Person Name,销售人员姓名
@@ -2898,6 +2936,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,添加用户
 DocType: Pricing Rule,Item Group,品目群组
 DocType: Item,Safety Stock,安全库存
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,产品编号&gt;项目组&gt;品牌
 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),已添加的税费（公司货币）
@@ -2907,7 +2946,6 @@
 DocType: Item,Default BOM,默认的BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Please re-type company name to confirm,请确认重新输入公司名称
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +67,Total Outstanding Amt,总街货量金额
-DocType: Timesheet,Total Hours,总时数
 DocType: Journal Entry,Printing Settings,打印设置
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Total Debit must be equal to Total Credit. The difference is {0},总借记必须等于总积分。
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,汽车
@@ -2920,13 +2958,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,投资银行业务
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +71,Cash or Bank Account is mandatory for making payment entry,“现金”或“银行账户”是付款分录的必须项
 DocType: Purchase Invoice,Price List Exchange Rate,价目表汇率
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,客户&gt;客户组&gt;领地
 DocType: Purchase Invoice Item,Rate,单价
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Intern,实习生
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,实习生
 DocType: Stock Entry,From BOM,从BOM
 DocType: Assessment,Assessment Code,评估准则
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +32,Basic,基本
+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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',请点击“生成表”
+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 +95,Reference No is mandatory if you entered Reference Date,如果输入参考日期，参考编号是强制输入的
@@ -2935,11 +2974,11 @@
 DocType: Salary Slip,Salary Structure,薪酬结构
 DocType: Account,Bank,银行
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,航空公司
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +752,Issue Material,发料
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +723,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 +683,You are in offline mode. You will not be able to reload until you have network.,您在离线模式。您将无法重新加载，直到你有网络。
+apps/erpnext/erpnext/accounts/page/pos/pos.js +665,You are in offline mode. You will not be able to reload until you have network.,您在离线模式。您将无法重新加载，直到你有网络。
 DocType: Hub Settings,Access Token,访问令牌
 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,序列号
@@ -2947,33 +2986,35 @@
 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 +1122,Enter value must be positive,输入值必须为正
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,All Territories,所有的区域
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1125,Enter value must be positive,输入值必须为正
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,所有的区域
 DocType: Purchase Invoice,Items,品目
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +23,Student is already enrolled.,学生已经注册。
 DocType: Fiscal Year,Year Name,年度名称
 DocType: Process Payroll,Process Payroll,处理工资
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,这个月的假期比工作日多。
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +233,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 +96,Request for Quotations,索取报价
+apps/erpnext/erpnext/hooks.py +104,Request for Quotations,索取报价
 DocType: Payment Reconciliation,Maximum Invoice Amount,最大发票额
 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 +628,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',测度变异的默认单位“{0}”必须是相同模板“{1}”
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',测度变异的默认单位“{0}”必须是相同模板“{1}”
 DocType: Shipping Rule,Calculate Based On,计算基于
 DocType: Delivery Note Item,From Warehouse,从仓库
 DocType: Assessment,Supervisor Name,主管名称
+DocType: Assessment,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,购买用户
 DocType: Notification Control,Customize the Notification,自定义通知
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Cash Flow from Operations,运营现金流
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,默认地址模板不能删除
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,默认地址模板不能删除
 DocType: Sales Invoice,Shipping Rule,配送规则
 DocType: Manufacturer,Limited to 12 characters,限12个字符
 DocType: Journal Entry,Print Heading,打印标题
@@ -2988,8 +3029,8 @@
 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/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,需要指定目标数量和金额
-apps/erpnext/erpnext/stock/get_item_details.py +485,No default BOM exists for Item {0},品目{0}没有默认的BOM
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +336,Please select Posting Date first,请选择发布日期第一
+apps/erpnext/erpnext/stock/get_item_details.py +486,No default BOM exists for Item {0},品目{0}没有默认的BOM
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +326,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,有交易的成本中心不能转化为总账
@@ -3005,6 +3046,7 @@
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,匹配付款与发票
 DocType: Journal Entry,Bank Entry,银行记录
 DocType: Authorization Rule,Applicable To (Designation),适用于(指定)
+,Profitability Analysis,盈利能力分析
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,加入购物车
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,分组基于
 DocType: Guardian,Interests,兴趣
@@ -3017,21 +3059,21 @@
 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 +141,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",序列化的品目{0}不能被“库存盘点”更新
 DocType: Scheduling Tool,Day,天
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,新序列号不能有仓库，仓库只能通过库存记录和采购收据设置。
 DocType: Lead,Lead Type,线索类型
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,You are not authorized to approve leaves on Block Dates,您无权批准叶子座日期
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,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: Student Applicant,AP.,AP。
 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 +639,Point of Sale,销售点
+apps/erpnext/erpnext/accounts/page/pos/pos.js +634,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,税项
 DocType: Production Planning Tool,Production Planning Tool,生产规划工具
@@ -3040,74 +3082,77 @@
 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 +373,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 Entry,Update Rate and Availability,更新率和可用性
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,百分比你被允许接收或传递更多针对订购的数量。例如：如果您订购100个单位。和你的津贴是10％，那么你被允许接收110个单位。
 DocType: POS Profile,Customer Group,客户群组
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,Expense account is mandatory for item {0},品目{0}必须指定开支账户
 DocType: Item,Website Description,网站简介
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date must be on or after today,接下来折旧日期必须等于或之后的今天
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,在净资产收益变化
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +145,Please cancel Purchase Invoice {0} first,请取消采购发票{0}第一
 DocType: Serial No,AMC Expiry Date,AMC到期时间
 ,Sales Register,销售记录
 DocType: Quotation,Quotation Lost Reason,报价丧失原因
+apps/erpnext/erpnext/utilities/doctype/address/address.py +164,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,无缺省地址模板中。请创建设置&gt;打印和品牌&gt;地址模板一个新的。
 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 +330,Transaction reference no {0} dated {1},交易参考编号{0}日{1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Transaction reference no {0} dated {1},交易参考编号{0}日{1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,无需编辑。
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,Summary for this month and pending activities,本月和待活动总结
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,本月和待活动总结
 DocType: Customer Group,Customer Group Name,客户群组名称
 apps/erpnext/erpnext/public/js/financial_statements.js +54,Cash Flow Statement,现金流量表
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Please remove this Invoice {0} from C-Form {1},请删除此发票{0}从C-表格{1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Please remove this Invoice {0} from C-Form {1},请删除此发票{0}从C-表格{1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,请选择结转，如果你还需要包括上一会计年度的资产负债叶本财年
 DocType: GL Entry,Against Voucher Type,对凭证类型
 DocType: Item,Attributes,属性
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +644,Get Items,获取品目
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +623,Get Items,获取品目
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +210,Please enter Write Off Account,请输入核销帐户
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,最后订购日期
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +41,Account {0} does not belongs to company {1},帐户{0}不属于公司{1}
+DocType: Student,Guardian Details,卫详细
 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,计划开始日期
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,Customer is required against Receivable account {0},客户须对应收账款{0}
 DocType: Serial No,Creation Document Type,创建文件类型
 DocType: Leave Type,Is Encash,是否兑现
 DocType: Purchase Invoice,Mobile No,手机号码
 DocType: Leave Allocation,New Leaves Allocated,新调配的假期
-apps/erpnext/erpnext/controllers/trends.py +265,Project-wise data is not available for Quotation,项目明智的数据不适用于报价
+apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,项目明智的数据不适用于报价
 DocType: Project,Expected End Date,预计结束日期
 DocType: Budget Account,Budget Amount,预算额
 DocType: Appraisal Template,Appraisal Template Title,评估模板标题
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,Commercial,广告
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,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 +648,Row {0}# Account must be of type 'Fixed Asset',行{0}＃账户的类型必须是&#39;固定资产&#39;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Row {0}# Account must be of type 'Fixed Asset',行{0}＃账户的类型必须是&#39;固定资产&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,输出数量
 apps/erpnext/erpnext/config/accounts.py +278,Rules to calculate shipping amount for a sale,用来计算销售运输量的规则
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +30,Series is mandatory,系列是必须项
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +50,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}需要指定仓库
 DocType: Leave Allocation,Unused leaves,未使用的叶子
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Cr,信用
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Cr,信用
 DocType: Tax Rule,Billing State,计费状态
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +250,Transfer,转让
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +187,{0} {1} does not associated with Party Account {2},{0} {1}不符合党的帐户关联{2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,Fetch exploded BOM (including sub-assemblies),获取展开BOM（包括子品目）
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +254,Transfer,转让
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +190,{0} {1} does not associated with Party Account {2},{0} {1}不符合党的帐户关联{2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +796,Fetch exploded BOM (including sub-assemblies),获取展开BOM（包括子品目）
 DocType: Authorization Rule,Applicable To (Employee),适用于(员工)
-apps/erpnext/erpnext/controllers/accounts_controller.py +115,Due Date is mandatory,截止日期是强制性的
+apps/erpnext/erpnext/controllers/accounts_controller.py +118,Due Date is mandatory,截止日期是强制性的
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,增量属性{0}不能为0
 DocType: Journal Entry,Pay To / Recd From,支付/ RECD从
 DocType: Naming Series,Setup Series,设置系列
 DocType: Payment Reconciliation,To Invoice Date,要发票日期
 DocType: Supplier,Contact HTML,联系HTML
 ,Inactive Customers,不活跃的客户
+DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,购买收据
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,定价规则如何被应用？
 DocType: Quality Inspection,Delivery Note No,送货单编号
@@ -3116,7 +3161,7 @@
 DocType: Company,Retail,零售
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +120,Customer {0} does not exist,客户{0}不存在
 DocType: Attendance,Absent,缺席
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +587,Product Bundle,产品包
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Product Bundle,产品包
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Invalid reference {1},行{0}：无效参考{1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,购置税和费模板
 DocType: Upload Attendance,Download Template,下载模板
@@ -3126,7 +3171,8 @@
 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 +742,Send Supplier Emails,发送电子邮件供应商
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +708,Send Supplier Emails,发送电子邮件供应商
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,"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,卫利息
 DocType: Timesheet,Employee Detail,员工详细信息
@@ -3137,9 +3183,9 @@
 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/accounts/doctype/gl_entry/gl_entry.py +77,Account {0} cannot be a Group,科目{0}不能为组
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} cannot be a Group,科目{0}不能为组
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +31,Optional. This setting will be used to filter in various transactions.,可选。此设置将被应用于各种交易进行过滤。
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +107,Negative Valuation Rate is not allowed,负评估价格是不允许的
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,负评估价格是不允许的
 DocType: Holiday List,Weekly Off,周末
 DocType: Fiscal Year,"For e.g. 2012, 2012-13",对例如2012，2012-13
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +39,Provisional Profit / Loss (Credit),临时溢利/（亏损）（信用）
@@ -3153,16 +3199,16 @@
 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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}：成本中心是品目{2}的必须项
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +626,Get Items from Product Bundle,获取从产品捆绑项目
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +605,Get Items from Product Bundle,获取从产品捆绑项目
 DocType: Asset,Straight Line,直线
 DocType: Project User,Project User,项目用户
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} is inactive,科目{0}已停用
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} is inactive,科目{0}已停用
 DocType: GL Entry,Is Advance,是否预付款
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,必须指定考勤起始日期和结束日期
 apps/erpnext/erpnext/controllers/buying_controller.py +148,Please enter 'Is Subcontracted' as Yes or No,请输入'转包' YES或NO
 DocType: Sales Team,Contact No.,联络人电话
 DocType: Bank Reconciliation,Payment Entries,付款项
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,'Profit and Loss' type account {0} not allowed in Opening Entry,期初分录中不允许有“损益”类型的账户{0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +71,'Profit and Loss' type account {0} not allowed in Opening Entry,期初分录中不允许有“损益”类型的账户{0}
 DocType: Program Enrollment Tool,Get Students From,让学生从
 DocType: Hub Settings,Seller Country,卖家国家
 apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,公布于网页上的项目
@@ -3181,7 +3227,7 @@
 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 +558,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",行＃{0}：资产{1}无法提交，这已经是{2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +561,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",行＃{0}：资产{1}无法提交，这已经是{2}
 DocType: Tax Rule,Billing Country,结算国家
 DocType: Production Order,Expected Delivery Date,预计交货日期
 apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,借贷{0}＃不等于{1}。不同的是{2}。
@@ -3194,13 +3240,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +202,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: Sales Order,% Amount Billed,（％）金额帐单
+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.,要用户手动选择序列的话请勾选。勾选此项后将不会选择默认序列。
 apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},没有序列号为{0}的品目
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,打开通知
+DocType: Email Digest,Open Notifications,打开通知
 DocType: Payment Entry,Difference Amount (Company Currency),差异金额（公司币种）
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,直接开支
 apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
@@ -3208,7 +3254,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,新客户收入
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,差旅费
 DocType: Maintenance Visit,Breakdown,细目
-apps/erpnext/erpnext/controllers/accounts_controller.py +634,Account: {0} with currency: {1} can not be selected,帐号：{0}币种：{1}不能选择
+apps/erpnext/erpnext/controllers/accounts_controller.py +637,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}
 DocType: Program Enrollment Tool,Student Applicants,学生申请
@@ -3216,15 +3262,15 @@
 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 +56,Probation,缓刑
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Probation,缓刑
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,工资组件
 DocType: Program Enrollment Tool,New Academic Year,新学年
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Payment of salary for the month {0} and year {1},支付工资的月{0}和年{1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Payment of salary for the month {0} and year {1},支付工资的月{0}和年{1}
 DocType: Stock Settings,Auto insert Price List rate if missing,自动插入价目表率，如果丢失
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,总支付金额
 DocType: Production Order Item,Transferred Qty,转让数量
 apps/erpnext/erpnext/config/learn.py +11,Navigating,导航
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Planning,规划
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,规划
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,发行
 DocType: Project,Total Billing Amount (via Time Logs),总结算金额（通过时间日志）
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,We sell this Item,我们卖这些物件
@@ -3237,11 +3283,10 @@
 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/accounts/page/pos/pos.js +1376,Sales invoice submitted sucessfully.,销售发票提交成功地。
 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}
 DocType: Assessment Result,Student Name,学生姓名
-apps/erpnext/erpnext/hooks.py +104,Assessment Schedule,评估表
+apps/erpnext/erpnext/hooks.py +113,Assessment Schedule,评估表
 DocType: Brand,Item Manager,项目经理
 DocType: Buying Settings,Default Supplier Type,默认供应商类别
 DocType: Production Order,Total Operating Cost,总营运成本
@@ -3251,6 +3296,7 @@
 DocType: GL Entry,Party Type,党的类型
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +78,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}超出范围
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,薪资模板大师。
 DocType: Leave Type,Max Days Leave Allowed,允许的最长假期天数
@@ -3262,18 +3308,19 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,向潜在客户或客户发出的报价。
 DocType: Stock Settings,Role Allowed to edit frozen stock,角色可以编辑冻结库存
 ,Territory Target Variance Item Group-Wise,按物件组的区域目标波动
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Customer Groups,所有客户群组
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +78,Accumulated Monthly,每月累计
-apps/erpnext/erpnext/controllers/accounts_controller.py +595,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0}是必填项。可能是没有由{1}到{2}的货币转换记录。
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,所有客户群组
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +81,Accumulated Monthly,每月累计
+apps/erpnext/erpnext/controllers/accounts_controller.py +598,{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}不存在
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),价格列表费率（公司货币）
 DocType: Products Settings,Products Settings,产品设置
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +188,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,请设置命名为系列{0}通过设置&gt;设置&gt;命名系列
 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 +84,Secretary,秘书
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,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,采购
@@ -3282,24 +3329,22 @@
 ,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,评估名称
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,行＃{0}：序列号是必需的
+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 +859,Supplier Quotation,供应商报价
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +838,Supplier Quotation,供应商报价
 DocType: Quotation,In Words will be visible once you save the Quotation.,大写金额将在报价单保存后显示。
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +7,Collect Fees,收费
+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}使用
 DocType: Lead,Add to calendar on this date,将此日期添加至日历
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,规则增加运输成本。
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,即将举行的活动
 DocType: Item,Opening Stock,打开股票
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,客户是必须项
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0}是退货单的必填项
 DocType: Purchase Order,To Receive,接受
 apps/erpnext/erpnext/public/js/setup_wizard.js +195,user@example.com,user@example.com
-DocType: Email Digest,Income / Expense,收益/支出
 DocType: Employee,Personal Email,个人电子邮件
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,总方差
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.",如果启用，系统将自动为库存创建会计分录。
@@ -3310,13 +3355,14 @@
 DocType: Customer,From Lead,来自潜在客户
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,发布生产订单。
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,选择财政年度...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,POS Profile required to make POS Entry,需要POS资料，使POS进入
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +509,POS Profile required to make POS Entry,需要POS资料，使POS进入
 DocType: Program Enrollment Tool,Enroll Students,招生
 DocType: Hub Settings,Name Token,名称令牌
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,标准销售
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Atleast one warehouse is mandatory,必须选择至少一个仓库
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +129,Atleast one warehouse is mandatory,必须选择至少一个仓库
 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 +330,{0} against Sales Invoice {1},{0}不允许销售发票{1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,项目名称
@@ -3337,10 +3383,11 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,假期天数必须为0.5的倍数
 DocType: Production Order,Operation Cost,运营成本
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,由.csv文件上传考勤记录
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,优秀的金额
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,为销售人员设置品次群组特定的目标
 DocType: Stock Settings,Freeze Stocks Older Than [Days],冻结老于此天数的库存
-apps/erpnext/erpnext/controllers/accounts_controller.py +528,Row #{0}: Asset is mandatory for fixed asset purchase/sale,行＃{0}：资产是必须的固定资产购买/销售
+apps/erpnext/erpnext/controllers/accounts_controller.py +531,Row #{0}: Asset is mandatory for fixed asset purchase/sale,行＃{0}：资产是必须的固定资产购买/销售
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.",如果存在多个价格规则，则会应用优先级别。优先权是一个介于0到20的数字，默认值是零（或留空）。数字越大，意味着优先级别越高。
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,会计年度：{0}不存在
 DocType: Currency Exchange,To Currency,以货币
@@ -3357,15 +3404,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,私募股权投资
 DocType: Maintenance Visit,Customer Feedback,客户反馈
 DocType: Account,Expense,开支
-DocType: Sales Invoice,Exhibition,展览
 apps/erpnext/erpnext/utilities/doctype/address/address.py +77,"Company is mandatory, as it is your company address",公司是强制性的，因为它是你的公司地址
 DocType: Item Attribute,From Range,从范围
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +81,Syntax error in formula or condition: {0},式或条件语法错误：{0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +92,Syntax error in formula or condition: {0},式或条件语法错误：{0}
 apps/erpnext/erpnext/stock/utils.py +99,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 +28,Jobs,工作
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,工作
 ,Sales Order Trends,销售订单趋势
 DocType: Employee,Held On,举行日期
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,生产项目
@@ -3374,16 +3421,16 @@
 DocType: Stock Entry Detail,Additional Cost,额外费用
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,财政年度结束日期
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher",按凭证分类后不能根据凭证编号过滤
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +763,Make Supplier Quotation,创建供应商报价
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,Make Supplier Quotation,创建供应商报价
 DocType: Quality Inspection,Incoming,接收
 DocType: BOM,Materials Required (Exploded),所需物料（正展开）
 apps/erpnext/erpnext/public/js/setup_wizard.js +185,"Add users to your organization, other than yourself",将用户添加到您的组织，除了自己
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,Row # {0}: Serial No {1} does not match with {2} {3},行＃{0}：序列号{1}不相匹配{2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +42,Casual Leave,事假
+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,事假
 DocType: Batch,Batch ID,批次ID
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,Note: {0},注： {0}
 ,Delivery Note Trends,送货单趋势
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +103,This Week's Summary,本周的总结
+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}只能通过库存处理更新
 DocType: Student Group Creation Tool,Get Courses,获取课程
 DocType: GL Entry,Party,一方
@@ -3393,7 +3440,7 @@
 DocType: Request for Quotation Item,Request for Quotation Item,询价项目
 DocType: Purchase Order,To Bill,比尔
 DocType: Material Request,% Ordered,％有序
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Piecework,计件工作
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Piecework,计件工作
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,平均买入价
 DocType: Task,Actual Time (in Hours),实际时间（小时）
 DocType: Employee,History In Company,公司内历史
@@ -3410,7 +3457,7 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +350,{0} units of {1} needed in {2} to complete this transaction.,{0}单位{1}在{2}完成此交易所需。
 DocType: SMS Settings,SMS Settings,短信设置
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Temporary Accounts,临时账户
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Black,黑
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,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}项目
@@ -3421,13 +3468,13 @@
 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 +69,Customer Id,客户ID
+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,马克缺席
 DocType: Journal Entry Account,Exchange Rate,汇率
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Sales Order {0} is not submitted,销售订单{0}未提交
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +527,Sales Order {0} is not submitted,销售订单{0}未提交
 DocType: Homepage,Tag Line,标语
 DocType: Fee Component,Fee Component,收费组件
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +857,Add items from,添加的项目
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +836,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}
 DocType: Cheque Print Template,Regular,定期
 DocType: BOM,Last Purchase Rate,最后采购价格
@@ -3435,6 +3482,7 @@
 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}不能有库存，因为他存在变体
 ,Sales Person-wise Transaction Summary,销售人员特定的交易汇总
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +60,Cost Center is required for 'Profit and Loss' account {0}. Please set up a default Cost Center for the Company.,成本中心需要的损益“账户{0}。请设置为公司默认的成本中心。
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,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,月度分布比例
@@ -3445,12 +3493,12 @@
 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 +710,Online,线上
+apps/erpnext/erpnext/accounts/page/pos/pos.js +692,Online,线上
 ,Available Stock for Packing Items,库存可用打包品目
 DocType: Item Variant,Item Variant,品目变体
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,将此地址模板设置为默认，因为没有其他的默认项
+apps/erpnext/erpnext/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 +74,Quality Management,质量管理
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,质量管理
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,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,雇员外部就职经历
@@ -3472,11 +3520,12 @@
 DocType: Student,Student Email ID,学生的电子邮件ID
 DocType: Employee,Notice (days),通告（天）
 DocType: Tax Rule,Sales Tax Template,销售税模板
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1520,Select items to save the invoice,选取要保存发票
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1544,Select items to save the invoice,选取要保存发票
 DocType: Employee,Encashment Date,兑现日期
 DocType: Account,Stock Adjustment,库存调整
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},默认情况下存在作业成本的活动类型 -  {0}
 DocType: Production Order,Planned Operating Cost,计划运营成本
+DocType: Academic Term,Term Start Date,期限起始日期
 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,申请人姓名
@@ -3506,17 +3555,17 @@
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,仓库（永续盘存）的账户将在该帐户下创建。
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +119,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,无法删除，因为此仓库有库存分类账分录。
 DocType: Company,Distribution,分配
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +8,Amount Paid,已支付的款项
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Project Manager,项目经理
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,已支付的款项
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,项目经理
 ,Quoted Item Comparison,项目报价比较
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Dispatch,调度
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,调度
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,品目{0}的最大折扣为 {1}%
 apps/erpnext/erpnext/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.,作用是允许提交超过设定信用额度交易的。
-DocType: Sales Invoice,Supplier Reference,供应商推荐
-apps/erpnext/erpnext/accounts/page/pos/pos.js +844,"Master data syncing, it might take some time",主数据同步，这可能需要一些时间
+apps/erpnext/erpnext/accounts/page/pos/pos.js +832,"Master data syncing, it might take some time",主数据同步，这可能需要一些时间
 DocType: Item,Material Issue,发料
 DocType: Hub Settings,Seller Description,卖家描述
 DocType: Employee Education,Qualification,学历
@@ -3530,7 +3579,7 @@
 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 +83,Error in formula or condition,错误的公式或条件
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,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,取消所有
@@ -3539,7 +3588,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},日期应该是在财政年度内。假设终止日期= {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc",在这里，你可以保持身高，体重，过敏，医疗问题等
 DocType: Leave Block List,Applies to Company,适用于公司
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +197,Cannot cancel because submitted Stock Entry {0} exists,不能取消，因为提交的仓储记录{0}已经存在
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +198,Cannot cancel because submitted Stock Entry {0} exists,不能取消，因为提交的仓储记录{0}已经存在
 DocType: Purchase Invoice,In Words,大写金额
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,Today is {0}'s birthday!,今天是{0}的生日！
 DocType: Production Planning Tool,Material Request For Warehouse,物料申请仓库
@@ -3549,14 +3598,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,您的会计年度开始于
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,资产折旧和平衡
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +319,Amount {0} {1} transferred from {2} to {3},金额{0} {1}从转移{2}到{3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +322,Amount {0} {1} transferred from {2} to {3},金额{0} {1}从转移{2}到{3}
 DocType: Sales Invoice,Get Advances Received,获取已收预付款
 DocType: Email Digest,Add/Remove Recipients,添加/删除收件人
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +432,Transaction not allowed against stopped Production Order {0},交易不反对停止生产订单允许{0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +437,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 +143,Join,加入
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,短缺数量
-apps/erpnext/erpnext/stock/doctype/item/item.py +652,Item variant {0} exists with same attributes,项目变种{0}存在具有相同属性
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,项目变种{0}存在具有相同属性
+DocType: Leave Application,LAP/,LAP /
 DocType: Salary Slip,Salary 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,“结束日期”必需设置
@@ -3564,12 +3614,12 @@
 DocType: Sales Invoice Item,Sales Order Item,销售订单品目
 DocType: Salary Slip,Payment Days,金天
 DocType: Customer,Dormant,休眠
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +212,Warehouses with child nodes cannot be converted to ledger,与子节点仓库不能转换为分类账
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +215,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/public/js/controllers/transaction.js +866,It is needed to fetch Item Details.,这是需要获取项目详细信息。
+apps/erpnext/erpnext/public/js/controllers/transaction.js +857,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}已收到过
@@ -3579,14 +3629,14 @@
 DocType: Expense Claim,Total Claimed Amount,总索赔额
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,销售的潜在机会
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,Invalid {0},无效的{0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Sick Leave,病假
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,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,百货
 DocType: Warehouse,PIN,销
 DocType: Sales Invoice,Base Change Amount (Company Currency),基地涨跌额（公司币种）
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +313,No accounting entries for the following warehouses,没有以下仓库的会计分录
-apps/erpnext/erpnext/projects/doctype/project/project.js +102,Save the document first.,首先保存文档。
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +314,No accounting entries for the following warehouses,没有以下仓库的会计分录
+apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,首先保存文档。
 DocType: Account,Chargeable,应课
 DocType: Company,Change Abbreviation,更改缩写
 DocType: Expense Claim Detail,Expense Date,报销日期
@@ -3599,10 +3649,9 @@
 DocType: Purchase Invoice,Recurring Print Format,常用打印格式
 DocType: C-Form,Series,系列
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,Expected Delivery Date cannot be before Purchase Order Date,预计交货日期不能早于采购订单日期
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,请设置命名为系列{0}通过设置&gt;设置&gt;命名系列
 DocType: Appraisal,Appraisal Template,评估模板
 DocType: Item Group,Item Classification,品目分类
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Business Development Manager,业务发展经理
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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,总帐
@@ -3612,8 +3661,8 @@
 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 +940,Please select {0} first,请选择{0}第一
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +749,Batch {0} of Item {1} has expired.,一批项目的{0} {1}已过期。
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +953,Please select {0} first,请选择{0}第一
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +757,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,小计
@@ -3641,8 +3690,8 @@
  {％，如果email_id％}电子邮件：{{email_id}}＆LT; BR＆GT {％ENDIF - ％} 
  </代码> </ PRE>"
 DocType: Salary Detail,Default Amount,默认金额
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +92,Warehouse not found in the system,仓库在系统中未找到
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +106,This Month's Summary,本月摘要
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,仓库在系统中未找到
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,本月摘要
 DocType: Quality Inspection Reading,Quality Inspection Reading,质量检验报告
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`冻结老于此天数的库存`应该比％d天小。
 DocType: Tax Rule,Purchase Tax Template,购置税模板
@@ -3652,21 +3701,22 @@
 DocType: Item Customer Detail,Ref Code,参考代码
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,雇员记录。
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Please set Next Depreciation Date,请设置下折旧日期
-DocType: Payment Gateway,Payment Gateway,支付网关
 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 +378,Operation Time must be greater than 0 for Operation {0},运行时间必须大于0的操作{0}
+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/accounts/doctype/account/account.py +170,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高。
 DocType: Program,Program Abbreviation,计划缩写
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,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: Appraisal,Start Date,开始日期
@@ -3682,21 +3732,22 @@
 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,删除项目，如果收费并不适用于该项目
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,例如：smsgateway.com/API/send_sms.cgi
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +27,Transaction currency must be same as Payment Gateway currency,交易货币必须与支付网关货币
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Transaction currency must be same as Payment Gateway currency,交易货币必须与支付网关货币
 DocType: Payment Entry,Receive,接受
+apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,语录：
 DocType: Maintenance Visit,Fully Completed,全部完成
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}％已完成
 DocType: Employee,Educational Qualification,学历
 DocType: Workstation,Operating Costs,运营成本
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,如果积累了每月预算超出行动
 DocType: Purchase Invoice,Submit on creation,提交关于创建
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +432,Currency for {0} must be {1},货币{0}必须{1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +435,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 +493,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}：一个重新排序条目已存在这个仓库{1}
+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/crm/doctype/opportunity/opportunity.py +79,"Cannot declare as lost, because Quotation has been made.",不能更改状态为丧失，因为已有报价。
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,采购经理大师
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +429,Production Order {0} must be submitted,生产订单{0}必须提交
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +434,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,无效的主名称
@@ -3706,25 +3757,27 @@
 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 +181,Totals,总计
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,总计
 DocType: BOM,Manufacturing,生产
 ,Ordered Items To Be Delivered,订购项目交付
 DocType: Account,Income,收益
 DocType: Industry Type,Industry Type,行业类型
 apps/erpnext/erpnext/templates/includes/cart.js +141,Something went wrong!,发现错误！
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,Warning: Leave application contains following block dates,警告：申请的假期含有以下的禁离日
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +120,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}来完成这一交易单位。
+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 +181,Organization unit (department) master.,组织单位（部门）的主人。
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,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 +793,All records are synced.,所有记录同步。
+apps/erpnext/erpnext/accounts/page/pos/pos.js +781,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,无担保贷款
 DocType: Cost Center,Cost Center Name,成本中心名称
@@ -3743,21 +3796,20 @@
 DocType: Address,Name of person or organization that this address belongs to.,此地址所属的人或组织的名称
 apps/erpnext/erpnext/public/js/setup_wizard.js +260,Your Suppliers,您的供应商
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +49,Cannot set as Lost as Sales Order is made.,不能更改状态为丧失，因为已有销售订单。
-DocType: Student Applicant,Mother's Name,母亲的名字
 DocType: Request for Quotation Item,Supplier Part No,供应商部件号
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +348,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',当类是“估值”或“Vaulation和总&#39;不能扣除
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Received From,从......收到
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Received From,从......收到
 DocType: Lead,Converted,已转换
 DocType: Item,Has Serial No,有序列号
 DocType: Employee,Date of Issue,签发日期
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}：申请者{0} 金额{1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +153,Row #{0}: Set Supplier for item {1},行＃{0}：设置供应商项目{1}
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +93,Row {0}: Hours value must be greater than zero.,行{0}：小时值必须大于零。
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +117,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}无法找到
 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 +172,{0} {1} does not exist,{0} {1}不存在
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +175,{0} {1} does not exist,{0} {1}不存在
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,Please check Multi Currency option to allow accounts with other currency,请检查多币种选项，允许帐户与其他货币
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +72,Item: {0} does not exist in the system,品目{0}不存在
 apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,您没有权限设定冻结值
@@ -3766,13 +3818,14 @@
 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/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,考勤不能标记为未来的日期
 DocType: Pricing Rule,Pricing Rule Help,定价规则说明
 DocType: Purchase Taxes and Charges,Account Head,账户头
 apps/erpnext/erpnext/config/stock.py +163,Update additional costs to calculate landed cost of items,更新额外费用以计算到岸成本
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Electrical,电气
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Electrical,电气
 DocType: Stock Entry,Total Value Difference (Out - In),总价值差（输出 - ）
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,Row {0}: Exchange Rate is mandatory,行{0}：汇率是必须的
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},员工设置{0}为设置用户ID
@@ -3780,7 +3833,7 @@
 DocType: Item,Customer Code,客户代码
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +210,Birthday Reminder for {0},{0}的生日提醒
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,自上次订购天数
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +292,Debit To account must be a Balance Sheet account,借记帐户必须是资产负债表科目
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To account must be a Balance Sheet account,借记帐户必须是资产负债表科目
 DocType: Buying Settings,Naming Series,命名系列
 DocType: Leave Block List,Leave Block List Name,禁离日列表名称
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,库存资产
@@ -3792,11 +3845,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 +301,Salary Slip of employee {0} already created for time sheet {1},员工的工资单{0}已为时间表创建{1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +313,Salary Slip of employee {0} already created for time sheet {1},员工的工资单{0}已为时间表创建{1}
 DocType: Sales Order Item,Ordered Qty,订购数量
-apps/erpnext/erpnext/stock/doctype/item/item.py +673,Item {0} is disabled,项目{0}无效
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} is disabled,项目{0}无效
 DocType: Stock Settings,Stock Frozen Upto,库存冻结止
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +838,BOM does not contain any stock item,BOM不包含任何库存项目
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +809,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,生成工资条
@@ -3804,23 +3857,24 @@
 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 +485,Row #{0}: Please set reorder quantity,行＃{0}：请设置再订购数量
+DocType: Sales Invoice Timesheet,Billing Hours,结算时间
+apps/erpnext/erpnext/stock/doctype/item/item.py +487,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 +62,Please set {0},请设置{0}
 DocType: Purchase Invoice,Repeat on Day of Month,重复上月的日
 DocType: Employee,Health Details,健康细节
 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,根据上述所选条件提交工资单
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0}个品目已同步
 DocType: Sales Order,Partly Delivered,部分交付
-DocType: Sales Invoice,Existing Customer,现有客户
 DocType: Email Digest,Receivables,应收款
+DocType: Lead Source,Lead Source,线索来源
 DocType: Customer,Additional information regarding the customer.,对于客户的其他信息。
 DocType: Quality Inspection Reading,Reading 5,阅读5
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +38,Campaign Name is required,活动名称是必须项
 DocType: Maintenance Visit,Maintenance Date,维护日期
 DocType: Purchase Invoice Item,Rejected Serial No,拒绝序列号
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +80,Year start date or end date is overlapping with {0}. To avoid please set company,新年的开始日期或结束日期与{0}重叠。为了避免请将公司
@@ -3829,10 +3883,9 @@
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","例如：ABCD ##### 
 如果设置了序列但是没有在交易中输入序列号，那么系统会根据序列自动生产序列号。如果要强制手动输入序列号，请不要勾选此项。"
 DocType: Upload Attendance,Upload Attendance,上传考勤记录
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +129,BOM and Manufacturing Quantity are required,BOM和生产量是必需的
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,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,最大力量
-DocType: Bank Reconciliation Detail,Amount,量
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM已替换
 ,Sales Analytics,销售分析
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +113,Available {0},可用{0}
@@ -3840,14 +3893,14 @@
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,设置电子邮件
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +96,Please enter default currency in Company Master,请在公司主输入默认货币
 DocType: Stock Entry Detail,Stock Entry Detail,库存记录详情
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +100,Daily Reminders,每日提醒
+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/account/account_tree.js +23,New Account Name,新建账户名称
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,供应的原料成本
 DocType: Selling Settings,Settings for Selling Module,销售模块的设置
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Customer Service,顾客服务
+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/config/hr.py +50,Offer candidate a Job.,报价候选作业。
@@ -3856,8 +3909,9 @@
 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}必须是库存品目
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,默认工作正在进行仓库
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1570,Total nos of serial no is not equal to quantity.,序列号的总号不等于数量。
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1594,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,更新序列号
@@ -3865,9 +3919,10 @@
 DocType: Sales Order,Printing Details,印刷详情
 DocType: Task,Closing Date,结算日期
 DocType: Sales Order Item,Produced Quantity,生产的产品数量
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Engineer,工程师
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Engineer,工程师
+DocType: Journal Entry,Total Amount Currency,总金额币种
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,搜索子组件
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Item Code required at Row No {0},行{0}中的品目编号是必须项
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +398,Item Code required at Row No {0},行{0}中的品目编号是必须项
 DocType: Sales Partner,Partner Type,合作伙伴类型
 DocType: Purchase Taxes and Charges,Actual,实际
 DocType: Authorization Rule,Customerwise Discount,客户折扣
@@ -3883,16 +3938,18 @@
 DocType: BOM,Raw Material Cost,原材料成本
 DocType: Item Reorder,Re-Order Level,再次订货级别
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,输入要生产的品目和数量或者下载物料清单。
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +55,Part-time,兼任
+apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,甘特图
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,兼任
 DocType: Employee,Applicable Holiday List,可申请假期列表
 DocType: Employee,Cheque,支票
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,系列已更新
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +57,Series Updated,系列已更新
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,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 +87,Clearance Date updated,间隙更新日期
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,对账/盘点成功
@@ -3906,7 +3963,7 @@
 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 +513,Posting date and posting time is mandatory,发布日期和发布时间是必需的
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,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.,大写金额将在采购订单保存后显示。
@@ -3916,7 +3973,7 @@
 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/stock/doctype/stock_entry/stock_entry.py +158,Target warehouse in row {0} must be same as Production Order,行{0}的目标仓库必须与生产订单的仓库相同
+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,货币不能使用其他货币进行输入后更改
 DocType: Company,Round Off Account,四舍五入账户
@@ -3925,23 +3982,22 @@
 DocType: Customer Group,Parent Customer Group,母公司集团客户
 DocType: Purchase Invoice,Contact Email,联络人电邮
 DocType: Appraisal Goal,Score Earned,已得分数
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Notice Period,通知期
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,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 +4,New Sales Person Name,新销售人员的姓名
 DocType: Packing Slip,Gross Weight UOM,毛重计量单位
-DocType: Email Digest,Receivables / Payables,应收/应付账款
 DocType: Delivery Note Item,Against Sales Invoice,对销售发票
 DocType: Bin,Reserved Qty for Production,预留数量生产
 DocType: Asset,Frequency of Depreciation (Months),折旧率（月）
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +469,Credit Account,信用账户
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Credit Account,信用账户
 DocType: Landed Cost Item,Landed Cost Item,到岸成本品目
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +55,Show zero values,显示零值
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,显示零值
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,原材料被生产/重新打包后得到的品目数量
 apps/erpnext/erpnext/public/js/setup_wizard.js +315,Setup a simple website for my organization,设置一个简单的网站为我的组织
 DocType: Payment Reconciliation,Receivable / Payable Account,应收/应付账款
 DocType: Delivery Note Item,Against Sales Order Item,对销售订单项目
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Please specify Attribute Value for attribute {0},请指定属性值的属性{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},请指定属性值的属性{0}
 DocType: Item,Default Warehouse,默认仓库
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +39,Budget cannot be assigned against Group Account {0},财政预算案不能对集团客户分配{0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,请输入父成本中心
@@ -3963,19 +4019,22 @@
 DocType: Journal Entry,Total Debit,总借记
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,默认成品仓库
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,销售人员
-DocType: Sales Invoice,Cold Calling,冷推销
 DocType: SMS Parameter,SMS Parameter,短信参数
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,预算和成本中心
 DocType: Maintenance Schedule Item,Half Yearly,半年度
 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 +253,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 +141,Set as Lost,设置为丧失
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,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 +5,This is based on transactions against this Customer. See timeline below for details,这是基于对这个顾客的交易。详情请参阅以下时间表
 DocType: Supplier,Credit Days Based On,信贷天基于
@@ -3987,11 +4046,10 @@
 ,Items To Be Requested,要申请的品目
 DocType: Purchase Order,Get Last Purchase Rate,获取最新的采购税率
 DocType: Company,Company Info,公司简介
-apps/erpnext/erpnext/accounts/page/pos/pos.js +941,Select or add new customer,选择或添加新客户
+apps/erpnext/erpnext/accounts/page/pos/pos.js +930,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 +5,This is based on the attendance of this Employee,这是基于该员工的考勤
-DocType: Sales Invoice,Frequency,频率
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +463,Debit Account,借方科目
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Debit Account,借方科目
 DocType: Fiscal Year,Year Start Date,今年开始日期
 DocType: Attendance,Employee Name,雇员姓名
 DocType: Sales Invoice,Rounded Total (Company Currency),圆润的总计（公司货币）
@@ -4000,27 +4058,27 @@
 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 +210,Supplier Quotation {0} created,供应商报价{0}创建
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +208,Supplier Quotation {0} created,供应商报价{0}创建
 apps/erpnext/erpnext/accounts/report/financial_statements.py +90,End Year cannot be before Start Year,结束年份不能启动年前
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Employee Benefits,员工福利
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,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 +228,Please set a default Holiday List for Employee {0} or Company {1},请设置一个默认的假日列表为员工{0}或公司{1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +232,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 +499,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},行无{0}：金额不能大于金额之前对报销{1}。待审核金额为{2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +500,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 +1007,Price List not found or disabled,价格表未找到或禁用
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1008,Price List not found or disabled,价格表未找到或禁用
 DocType: Expense Claim,Approved,已批准
 DocType: Pricing Rule,Price,价格
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +244,Employee relieved on {0} must be set as 'Left',{0}的假期批准后，雇员的状态必须设置为“离开”
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +256,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}已经创建
@@ -4031,12 +4089,12 @@
 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 +259,Please select Employee Record first.,请选择员工记录第一。
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +266,Please select Employee Record first.,请选择员工记录第一。
 DocType: POS Profile,Account for Change Amount,帐户涨跌额
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +190,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},行{0}：甲方/客户不与匹配{1} / {2} {3} {4}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +235,Please enter Expense Account,请输入您的费用帐户
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,Please enter Expense Account,请输入您的费用帐户
 DocType: Account,Stock,库存
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,"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 +976,"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,采购/制造详细信息
@@ -4051,9 +4109,10 @@
 DocType: Asset Movement,Transaction Date,交易日期
 DocType: Production Plan Item,Planned Qty,计划数量
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,总税收
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,For Quantity (Manufactured Qty) is mandatory,对于数量（制造数量）是强制性的
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,For Quantity (Manufactured Qty) is mandatory,对于数量（制造数量）是强制性的
 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 +78,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,实际开始日期
@@ -4068,9 +4127,11 @@
 DocType: Warranty Claim,If different than customer address,如果客户地址不同的话
 DocType: BOM Operation,BOM Operation,BOM操作
 DocType: Purchase Taxes and Charges,On Previous Row Amount,基于前一行的金额
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +226,Transfer Asset,转让资产
+DocType: Student,Home Address,家庭地址
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +227,Transfer Asset,转让资产
 DocType: POS Profile,POS Profile,POS简介
 apps/erpnext/erpnext/config/schools.py +33,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 +129,"Item {0} is a template, please select one of its variants",项目{0}是一个模板，请选择它的一个变体
 DocType: Asset,Asset Category,资产类别
@@ -4080,8 +4141,8 @@
 DocType: Assessment,Room,房间
 DocType: Purchase Order,Advance Paid,已支付的预付款
 DocType: Item,Item Tax,品目税项
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +765,Material to Supplier,材料到供应商
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +189,Excise Invoice,消费税发票
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,Material to Supplier,材料到供应商
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,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,流动负债
@@ -4091,7 +4152,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,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 +136,Credit Card,信用卡
+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.,仓储业务的默认设置。
 DocType: Purchase Invoice,Next Date,下次日期
@@ -4099,6 +4160,7 @@
 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: Academic Term,Term End Date,期限结束日期
 DocType: Hub Settings,Seller Name,卖家名称
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),已扣除税费（公司货币）
 DocType: Item Group,General Settings,常规设置
@@ -4110,7 +4172,7 @@
 DocType: Customer,Commission Rate,佣金率
 apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,在Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,按部门禁止假期申请。
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +115,"Payment Type must be one of Receive, Pay and Internal Transfer",付款方式必须是接收之一，收费和内部转账
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +118,"Payment Type must be one of Receive, Pay and Internal Transfer",付款方式必须是接收之一，收费和内部转账
 apps/erpnext/erpnext/config/selling.py +169,Analytics,Analytics（分析）
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,车是空的
 DocType: Production Order,Actual Operating Cost,实际运行成本
@@ -4125,10 +4187,10 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,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 +92,Designer,设计师
+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/accounts/doctype/purchase_invoice/purchase_invoice.py +469,Cost Center is required in row {0} in Taxes table for type {1},类型{1}税费表的行{0}必须有成本中心
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +472,Cost Center is required in row {0} in Taxes table for type {1},类型{1}税费表的行{0}必须有成本中心
 DocType: Program,Program Code,程序代码
 ,Item-wise Purchase Register,品目特定的采购记录
 DocType: Batch,Expiry Date,到期时间
@@ -4138,12 +4200,12 @@
 apps/erpnext/erpnext/config/projects.py +13,Project master.,项目主。
 apps/erpnext/erpnext/controllers/status_updater.py +174,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.",要允许对账单或过度订货，库存设置或更新项目“津贴”。
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,不要在货币旁显示货币代号，例如$等。
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +417, (Half Day),（半天）
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425, (Half Day),（半天）
 DocType: Supplier,Credit Days,信用期
 DocType: Leave Type,Is Carry Forward,是否顺延假期
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +740,Get Items from BOM,从物料清单获取品目
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +711,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 +549,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},行＃{0}：过帐日期必须是相同的购买日期{1}资产的{2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +552,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,从一个仓库转移资产到另一
diff --git a/erpnext/utilities/address_and_contact.py b/erpnext/utilities/address_and_contact.py
index 324f679..36879d2 100644
--- a/erpnext/utilities/address_and_contact.py
+++ b/erpnext/utilities/address_and_contact.py
@@ -29,7 +29,6 @@
 	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):
@@ -37,9 +36,7 @@
 
 	if not any(names):
 		return True
-
-	else:
-		return False
+	return False
 
 def get_permission_query_conditions_for_contact(user):
 	return get_permission_query_conditions("Contact")
diff --git a/erpnext/utilities/doctype/address/address.json b/erpnext/utilities/doctype/address/address.json
index 8ccf205..8168b69 100644
--- a/erpnext/utilities/doctype/address/address.json
+++ b/erpnext/utilities/doctype/address/address.json
@@ -8,11 +8,13 @@
  "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, 
@@ -20,14 +22,16 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "icon-map-marker", 
+   "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, 
@@ -38,6 +42,7 @@
    "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", 
@@ -46,6 +51,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Address Title", 
    "length": 0, 
    "no_copy": 0, 
@@ -53,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, 
@@ -63,6 +70,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "address_type", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -70,6 +78,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Address Type", 
    "length": 0, 
    "no_copy": 0, 
@@ -78,6 +87,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, 
@@ -88,6 +98,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "address_line1", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -95,6 +106,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Address Line 1", 
    "length": 0, 
    "no_copy": 0, 
@@ -102,6 +114,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, 
@@ -112,6 +125,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "address_line2", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -119,6 +133,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Address Line 2", 
    "length": 0, 
    "no_copy": 0, 
@@ -126,6 +141,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,6 +152,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "city", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -143,6 +160,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "City/Town", 
    "length": 0, 
    "no_copy": 0, 
@@ -150,6 +168,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, 
@@ -160,6 +179,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "county", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -167,6 +187,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "County", 
    "length": 0, 
    "no_copy": 0, 
@@ -175,6 +196,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, 
@@ -185,6 +207,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "state", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -192,6 +215,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "State", 
    "length": 0, 
    "no_copy": 0, 
@@ -199,6 +223,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, 
@@ -209,6 +234,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "country", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -216,6 +242,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 1, 
    "label": "Country", 
    "length": 0, 
    "no_copy": 0, 
@@ -224,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": 1, 
@@ -234,6 +262,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "pincode", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -241,6 +270,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Postal Code", 
    "length": 0, 
    "no_copy": 0, 
@@ -248,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": 1, 
@@ -258,6 +289,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break0", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -265,12 +297,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, 
@@ -282,6 +316,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "email_id", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -289,6 +324,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Email Id", 
    "length": 0, 
    "no_copy": 0, 
@@ -296,6 +332,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, 
@@ -306,6 +343,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "phone", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -313,6 +351,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Phone", 
    "length": 0, 
    "no_copy": 0, 
@@ -320,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, 
@@ -330,6 +370,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "fax", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -337,6 +378,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Fax", 
    "length": 0, 
    "no_copy": 0, 
@@ -344,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, 
@@ -354,6 +397,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "0", 
    "description": "", 
    "fieldname": "is_primary_address", 
@@ -363,6 +407,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Preferred Billing Address", 
    "length": 0, 
    "no_copy": 0, 
@@ -370,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, 
@@ -380,6 +426,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "0", 
    "description": "", 
    "fieldname": "is_shipping_address", 
@@ -389,6 +436,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Preferred Shipping Address", 
    "length": 0, 
    "no_copy": 0, 
@@ -396,6 +444,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, 
@@ -406,6 +455,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "linked_with", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -413,14 +463,16 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Reference", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "icon-pushpin", 
+   "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, 
@@ -431,6 +483,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "0", 
    "fieldname": "is_your_company_address", 
    "fieldtype": "Check", 
@@ -439,6 +492,7 @@
    "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, 
@@ -447,6 +501,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, 
@@ -457,6 +512,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.is_your_company_address", 
    "fieldname": "company", 
    "fieldtype": "Link", 
@@ -465,6 +521,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -474,6 +531,7 @@
    "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, 
@@ -484,6 +542,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:!doc.is_your_company_address", 
    "fieldname": "customer", 
    "fieldtype": "Link", 
@@ -492,6 +551,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer", 
    "length": 0, 
    "no_copy": 0, 
@@ -500,6 +560,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, 
@@ -510,6 +571,7 @@
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:!doc.is_your_company_address", 
    "fieldname": "customer_name", 
    "fieldtype": "Data", 
@@ -518,6 +580,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -525,6 +588,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, 
@@ -535,6 +599,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:!doc.is_your_company_address", 
    "fieldname": "supplier", 
    "fieldtype": "Link", 
@@ -543,6 +608,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Supplier", 
    "length": 0, 
    "no_copy": 0, 
@@ -551,6 +617,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, 
@@ -561,6 +628,7 @@
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:!doc.is_your_company_address", 
    "fieldname": "supplier_name", 
    "fieldtype": "Data", 
@@ -569,6 +637,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Supplier Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -576,6 +645,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, 
@@ -586,6 +656,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval: !doc.is_your_company_address", 
    "fieldname": "sales_partner", 
    "fieldtype": "Link", 
@@ -594,6 +665,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Sales Partner", 
    "length": 0, 
    "no_copy": 0, 
@@ -602,6 +674,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, 
@@ -612,6 +685,7 @@
    "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", 
@@ -620,6 +694,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Lead", 
    "length": 0, 
    "no_copy": 0, 
@@ -628,6 +703,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, 
@@ -638,6 +714,7 @@
    "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", 
@@ -646,6 +723,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Lead Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -653,6 +731,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, 
@@ -662,15 +741,16 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-map-marker", 
+ "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-05-30 14:20:47.284751", 
+ "modified": "2016-11-07 05:47:06.911933", 
  "modified_by": "Administrator", 
  "module": "Utilities", 
  "name": "Address", 
@@ -686,6 +766,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -706,6 +787,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -726,6 +808,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -746,6 +829,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
diff --git a/erpnext/utilities/doctype/address_template/address_template.json b/erpnext/utilities/doctype/address_template/address_template.json
index 3e263be..6ff93d9 100644
--- a/erpnext/utilities/doctype/address_template/address_template.json
+++ b/erpnext/utilities/doctype/address_template/address_template.json
@@ -10,6 +10,7 @@
  "doctype": "DocType", 
  "document_type": "Setup", 
  "editable_grid": 0, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -23,6 +24,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Country", 
    "length": 0, 
    "no_copy": 0, 
@@ -31,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": 1, 
@@ -50,6 +53,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Is Default", 
    "length": 0, 
    "no_copy": 0, 
@@ -57,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, 
@@ -77,6 +82,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Template", 
    "length": 0, 
    "no_copy": 0, 
@@ -84,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, 
@@ -93,7 +100,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-map-marker", 
+ "icon": "fa fa-map-marker", 
  "idx": 0, 
  "image_view": 0, 
  "in_create": 0, 
@@ -102,7 +109,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-09-15 05:42:59.542484", 
+ "modified": "2016-11-07 05:47:11.633848", 
  "modified_by": "Administrator", 
  "module": "Utilities", 
  "name": "Address Template", 
@@ -119,6 +126,7 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
diff --git a/erpnext/utilities/doctype/contact/contact.json b/erpnext/utilities/doctype/contact/contact.json
index 486b93b..a183779 100644
--- a/erpnext/utilities/doctype/contact/contact.json
+++ b/erpnext/utilities/doctype/contact/contact.json
@@ -2,16 +2,20 @@
  "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, 
@@ -19,14 +23,16 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "icon-user", 
+   "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, 
@@ -37,6 +43,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "first_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -44,6 +51,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "First Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -53,6 +61,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, 
@@ -63,6 +72,7 @@
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "last_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -70,6 +80,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Last Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -79,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, 
@@ -89,6 +101,7 @@
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "email_id", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -96,6 +109,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Email Id", 
    "length": 0, 
    "no_copy": 0, 
@@ -106,6 +120,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, 
@@ -116,6 +131,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "cb00", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -123,12 +139,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 +157,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "Passive", 
    "fieldname": "status", 
    "fieldtype": "Select", 
@@ -147,6 +166,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 1, 
    "label": "Status", 
    "length": 0, 
    "no_copy": 0, 
@@ -155,6 +175,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, 
@@ -165,6 +186,7 @@
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "phone", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -172,6 +194,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Phone", 
    "length": 0, 
    "no_copy": 0, 
@@ -181,6 +204,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, 
@@ -191,6 +215,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "image", 
    "fieldtype": "Attach Image", 
    "hidden": 1, 
@@ -198,6 +223,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Image", 
    "length": 0, 
    "no_copy": 0, 
@@ -206,6 +232,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, 
@@ -216,6 +243,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "contact_details", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -223,14 +251,16 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Reference", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "icon-pushpin", 
+   "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, 
@@ -241,6 +271,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "user", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -248,6 +279,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "User Id", 
    "length": 0, 
    "no_copy": 0, 
@@ -257,6 +289,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, 
@@ -267,6 +300,7 @@
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "", 
    "fieldname": "customer", 
    "fieldtype": "Link", 
@@ -275,6 +309,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer", 
    "length": 0, 
    "no_copy": 0, 
@@ -285,6 +320,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 +331,7 @@
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "", 
    "fieldname": "customer_name", 
    "fieldtype": "Data", 
@@ -303,6 +340,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -310,6 +348,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, 
@@ -320,6 +359,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break1", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -327,6 +367,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
@@ -334,6 +375,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, 
@@ -345,6 +387,7 @@
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "", 
    "fieldname": "supplier", 
    "fieldtype": "Link", 
@@ -353,6 +396,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Supplier", 
    "length": 0, 
    "no_copy": 0, 
@@ -361,6 +405,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,6 +416,7 @@
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "", 
    "fieldname": "supplier_name", 
    "fieldtype": "Data", 
@@ -379,6 +425,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Supplier Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -386,6 +433,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, 
@@ -396,6 +444,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "", 
    "fieldname": "sales_partner", 
    "fieldtype": "Link", 
@@ -404,6 +453,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Sales Partner", 
    "length": 0, 
    "no_copy": 0, 
@@ -412,6 +462,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, 
@@ -422,6 +473,7 @@
    "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", 
@@ -431,6 +483,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Is Primary Contact", 
    "length": 0, 
    "no_copy": 0, 
@@ -440,6 +493,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, 
@@ -450,6 +504,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "more_info", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -457,14 +512,16 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "More Information", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "icon-file-text", 
+   "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, 
@@ -475,6 +532,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "mobile_no", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -482,6 +540,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Mobile No", 
    "length": 0, 
    "no_copy": 0, 
@@ -491,6 +550,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,6 +561,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "Enter department to which this Contact belongs", 
    "fieldname": "department", 
    "fieldtype": "Data", 
@@ -509,6 +570,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Department", 
    "length": 0, 
    "no_copy": 0, 
@@ -516,6 +578,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, 
@@ -526,6 +589,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "Enter designation of this Contact", 
    "fieldname": "designation", 
    "fieldtype": "Data", 
@@ -534,6 +598,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Designation", 
    "length": 0, 
    "no_copy": 0, 
@@ -541,6 +606,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,6 +617,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "unsubscribed", 
    "fieldtype": "Check", 
    "hidden": 0, 
@@ -558,6 +625,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Unsubscribed", 
    "length": 0, 
    "no_copy": 0, 
@@ -565,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, 
@@ -574,16 +643,17 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-user", 
+ "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-04-06 05:39:47.125816", 
+ "modified": "2016-11-07 05:30:56.576752", 
  "modified_by": "Administrator", 
  "module": "Utilities", 
  "name": "Contact", 
@@ -599,6 +669,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -619,6 +690,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -639,6 +711,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -659,6 +732,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -679,6 +753,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -699,6 +774,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -719,6 +795,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -739,6 +816,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -759,6 +837,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -779,6 +858,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -799,6 +879,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -819,6 +900,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "match": "", 
    "permlevel": 1, 
    "print": 0, 
@@ -831,6 +913,7 @@
    "write": 0
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "sort_order": "ASC", 
diff --git a/erpnext/utilities/doctype/contact/contact.py b/erpnext/utilities/doctype/contact/contact.py
index a687880..dd6aa10 100644
--- a/erpnext/utilities/doctype/contact/contact.py
+++ b/erpnext/utilities/doctype/contact/contact.py
@@ -103,4 +103,5 @@
 		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/rename_tool/rename_tool.json b/erpnext/utilities/doctype/rename_tool/rename_tool.json
index eff3e08..f9aac1c 100644
--- a/erpnext/utilities/doctype/rename_tool/rename_tool.json
+++ b/erpnext/utilities/doctype/rename_tool/rename_tool.json
@@ -75,7 +75,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 1, 
- "icon": "icon-magic", 
+ "icon": "fa fa-magic", 
  "idx": 1, 
  "in_create": 0, 
  "in_dialog": 0, 
diff --git a/erpnext/utilities/doctype/sms_log/sms_log.json b/erpnext/utilities/doctype/sms_log/sms_log.json
index 0df91f7..ffd9a7f 100644
--- a/erpnext/utilities/doctype/sms_log/sms_log.json
+++ b/erpnext/utilities/doctype/sms_log/sms_log.json
@@ -253,7 +253,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "icon-mobile-phone", 
+ "icon": "fa fa-mobile-phone", 
  "idx": 1, 
  "in_create": 0, 
  "in_dialog": 0, 
diff --git a/erpnext/utilities/web_form/addresses/addresses.py b/erpnext/utilities/web_form/addresses/addresses.py
index 2334f8b..3fd1017 100644
--- a/erpnext/utilities/web_form/addresses/addresses.py
+++ b/erpnext/utilities/web_form/addresses/addresses.py
@@ -4,4 +4,4 @@
 
 def get_context(context):
 	# do your magic here
-	pass
+	context.show_sidebar = True
diff --git a/license.txt b/license.txt
index 2c5df26..2a99aee 100644
--- a/license.txt
+++ b/license.txt
@@ -1,176 +1,675 @@
-ERPNext License Info
---------------------
-
-(c) 2013 Frappe Technologies Pvt Ltd. Mumbai
-ERPNext is a trademark of Frappe Technologies
-
-The ERPNext code is licensed under the GNU General Public License (v3) as mentioned below and the Documentation is licensed under Creative Commons (CC-BY-SA-3.0)
-
-GNU GENERAL PUBLIC LICENSE
---------------------------
+### GNU GENERAL PUBLIC LICENSE
 
 Version 3, 29 June 2007
 
-http://www.gnu.org/copyleft/gpl.html
+Copyright (C) 2007 Free Software Foundation, Inc.
+<http://fsf.org/>
 
-TERMS AND CONDITIONS
-0. Definitions.
+Everyone is permitted to copy and distribute verbatim copies of this
+license document, but changing it is not allowed.
 
-“This License” refers to version 3 of the GNU General Public License.
+### Preamble
 
-“Copyright” also means copyright-like laws that apply to other kinds of works, such as semiconductor masks.
+The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
 
-“The Program” refers to any copyrightable work licensed under this License. Each licensee is addressed as “you”. “Licensees” and “recipients” may be individuals or organizations.
+The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom
+to share and change all versions of a program--to make sure it remains
+free software for all its users. We, the Free Software Foundation, use
+the GNU General Public License for most of our software; it applies
+also to any other work released this way by its authors. You can apply
+it to your programs, too.
 
-To “modify” a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a “modified version” of the earlier work or a work “based on” the earlier work.
+When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
 
-A “covered work” means either the unmodified Program or a work based on the Program.
+To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you
+have certain responsibilities if you distribute copies of the
+software, or if you modify it: responsibilities to respect the freedom
+of others.
 
-To “propagate” a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well.
+For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
 
-To “convey” a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying.
+Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
 
-An interactive user interface displays “Appropriate Legal Notices” to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion.
-1. Source Code.
+For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
 
-The “source code” for a work means the preferred form of the work for making modifications to it. “Object code” means any non-source form of a work.
+Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the
+manufacturer can do so. This is fundamentally incompatible with the
+aim of protecting users' freedom to change the software. The
+systematic pattern of such abuse occurs in the area of products for
+individuals to use, which is precisely where it is most unacceptable.
+Therefore, we have designed this version of the GPL to prohibit the
+practice for those products. If such problems arise substantially in
+other domains, we stand ready to extend this provision to those
+domains in future versions of the GPL, as needed to protect the
+freedom of users.
 
-A “Standard Interface” means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language.
+Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish
+to avoid the special danger that patents applied to a free program
+could make it effectively proprietary. To prevent this, the GPL
+assures that patents cannot be used to render the program non-free.
+
+The precise terms and conditions for copying, distribution and
+modification follow.
+
+### TERMS AND CONDITIONS
+
+#### 0. Definitions.
+
+"This License" refers to version 3 of the GNU General Public License.
+
+"Copyright" also means copyright-like laws that apply to other kinds
+of works, such as semiconductor masks.
+
+"The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of
+an exact copy. The resulting work is called a "modified version" of
+the earlier work or a work "based on" the earlier work.
+
+A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user
+through a computer network, with no transfer of a copy, is not
+conveying.
+
+An interactive user interface displays "Appropriate Legal Notices" to
+the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+#### 1. Source Code.
+
+The "source code" for a work means the preferred form of the work for
+making modifications to it. "Object code" means any non-source form of
+a work.
+
+A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+The Corresponding Source need not include anything that users can
+regenerate automatically from other parts of the Corresponding Source.
+
+The Corresponding Source for a work in source code form is that same
+work.
+
+#### 2. Basic Permissions.
+
+All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+You may make, run and propagate covered works that you do not convey,
+without conditions so long as your license otherwise remains in force.
+You may convey covered works to others for the sole purpose of having
+them make modifications exclusively for you, or provide you with
+facilities for running those works, provided that you comply with the
+terms of this License in conveying all material for which you do not
+control copyright. Those thus making or running the covered works for
+you must do so exclusively on your behalf, under your direction and
+control, on terms that prohibit them from making any copies of your
+copyrighted material outside their relationship with you.
+
+Conveying under any other circumstances is permitted solely under the
+conditions stated below. Sublicensing is not allowed; section 10 makes
+it unnecessary.
+
+#### 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such
+circumvention is effected by exercising rights under this License with
+respect to the covered work, and you disclaim any intention to limit
+operation or modification of the work as a means of enforcing, against
+the work's users, your or third parties' legal rights to forbid
+circumvention of technological measures.
+
+#### 4. Conveying Verbatim Copies.
+
+You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+#### 5. Conveying Modified Source Versions.
+
+You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these
+conditions:
+
+-   a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+-   b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under
+    section 7. This requirement modifies the requirement in section 4
+    to "keep intact all notices".
+-   c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy. This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged. This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+-   d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+#### 6. Conveying Non-Source Forms.
+
+You may convey a covered work in object code form under the terms of
+sections 4 and 5, provided that you also convey the machine-readable
+Corresponding Source under the terms of this License, in one of these
+ways:
+
+-   a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+-   b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the Corresponding
+    Source from a network server at no charge.
+-   c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source. This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+-   d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge. You need not require recipients to copy the
+    Corresponding Source along with the object code. If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source. Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+-   e) Convey the object code using peer-to-peer transmission,
+    provided you inform other peers where the object code and
+    Corresponding Source of the work are being offered to the general
+    public at no charge under subsection 6d.
+
+A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal,
+family, or household purposes, or (2) anything designed or sold for
+incorporation into a dwelling. In determining whether a product is a
+consumer product, doubtful cases shall be resolved in favor of
+coverage. For a particular product received by a particular user,
+"normally used" refers to a typical or common use of that class of
+product, regardless of the status of the particular user or of the way
+in which the particular user actually uses, or expects or is expected
+to use, the product. A product is a consumer product regardless of
+whether the product has substantial commercial, industrial or
+non-consumer uses, unless such uses represent the only significant
+mode of use of the product.
+
+"Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to
+install and execute modified versions of a covered work in that User
+Product from a modified version of its Corresponding Source. The
+information must suffice to ensure that the continued functioning of
+the modified object code is in no case prevented or interfered with
+solely because modification has been made.
+
+If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or
+updates for a work that has been modified or installed by the
+recipient, or for the User Product in which it has been modified or
+installed. Access to a network may be denied when the modification
+itself materially and adversely affects the operation of the network
+or violates the rules and protocols for communication across the
+network.
+
+Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+#### 7. Additional Terms.
+
+"Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
 
-The “System Libraries” of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A “Major Component”, in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it.
+When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
 
-The “Corresponding Source” for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work.
+Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders
+of that material) supplement the terms of this License with terms:
 
-The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source.
+-   a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+-   b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+-   c) Prohibiting misrepresentation of the origin of that material,
+    or requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+-   d) Limiting the use for publicity purposes of names of licensors
+    or authors of the material; or
+-   e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+-   f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions
+    of it) with contractual assumptions of liability to the recipient,
+    for any liability that these contractual assumptions directly
+    impose on those licensors and authors.
 
-The Corresponding Source for a work in source code form is that same work.
-2. Basic Permissions.
+All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
 
-All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law.
+If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
 
-You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you.
+Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions; the
+above requirements apply either way.
 
-Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary.
-3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+#### 8. Termination.
 
-No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures.
+You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
 
-When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures.
-4. Conveying Verbatim Copies.
+However, if you cease all violation of this License, then your license
+from a particular copyright holder is reinstated (a) provisionally,
+unless and until the copyright holder explicitly and finally
+terminates your license, and (b) permanently, if the copyright holder
+fails to notify you of the violation by some reasonable means prior to
+60 days after the cessation.
 
-You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program.
+Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
 
-You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee.
-5. Conveying Modified Source Versions.
+Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
 
-You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions:
+#### 9. Acceptance Not Required for Having Copies.
 
-    a) The work must carry prominent notices stating that you modified it, and giving a relevant date.
-    b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to “keep intact all notices”.
-    c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it.
-    d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so.
+You are not required to accept this License in order to receive or run
+a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
 
-A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an “aggregate” if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate.
-6. Conveying Non-Source Forms.
+#### 10. Automatic Licensing of Downstream Recipients.
 
-You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways:
+Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
 
-    a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange.
-    b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge.
-    c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b.
-    d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements.
-    e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d.
+An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
 
-A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work.
+You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
 
-A “User Product” is either (1) a “consumer product”, which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, “normally used” refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product.
+#### 11. Patents.
 
-“Installation Information” for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made.
+A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
 
-If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM).
+A contributor's "essential patent claims" are all patent claims owned
+or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
 
-The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network.
+Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
 
-Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying.
-7. Additional Terms.
+In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
 
-“Additional permissions” are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions.
+If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
 
-When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission.
+If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
 
-Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms:
+A patent license is "discriminatory" if it does not include within the
+scope of its coverage, prohibits the exercise of, or is conditioned on
+the non-exercise of one or more of the rights that are specifically
+granted under this License. You may not convey a covered work if you
+are a party to an arrangement with a third party that is in the
+business of distributing software, under which you make payment to the
+third party based on the extent of your activity of conveying the
+work, and under which the third party grants, to any of the parties
+who would receive the covered work from you, a discriminatory patent
+license (a) in connection with copies of the covered work conveyed by
+you (or copies made from those copies), or (b) primarily for and in
+connection with specific products or compilations that contain the
+covered work, unless you entered into that arrangement, or that patent
+license was granted, prior to 28 March 2007.
 
-    a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or
-    b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or
-    c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or
-    d) Limiting the use for publicity purposes of names of licensors or authors of the material; or
-    e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or
-    f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors.
+Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
 
-All other non-permissive additional terms are considered “further restrictions” within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying.
+#### 12. No Surrender of Others' Freedom.
 
-If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms.
+If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under
+this License and any other pertinent obligations, then as a
+consequence you may not convey it at all. For example, if you agree to
+terms that obligate you to collect a royalty for further conveying
+from those to whom you convey the Program, the only way you could
+satisfy both those terms and this License would be to refrain entirely
+from conveying the Program.
 
-Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way.
-8. Termination.
+#### 13. Use with the GNU Affero General Public License.
 
-You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11).
+Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
 
-However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation.
+#### 14. Revised Versions of this License.
 
-Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice.
+The Free Software Foundation may publish revised and/or new versions
+of the GNU General Public License from time to time. Such new versions
+will be similar in spirit to the present version, but may differ in
+detail to address new problems or concerns.
 
-Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10.
-9. Acceptance Not Required for Having Copies.
+Each version is given a distinguishing version number. If the Program
+specifies that a certain numbered version of the GNU General Public
+License "or any later version" applies to it, you have the option of
+following the terms and conditions either of that numbered version or
+of any later version published by the Free Software Foundation. If the
+Program does not specify a version number of the GNU General Public
+License, you may choose any version ever published by the Free
+Software Foundation.
 
-You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so.
-10. Automatic Licensing of Downstream Recipients.
+If the Program specifies that a proxy can decide which future versions
+of the GNU General Public License can be used, that proxy's public
+statement of acceptance of a version permanently authorizes you to
+choose that version for the Program.
 
-Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License.
+Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
 
-An “entity transaction” is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts.
+#### 15. Disclaimer of Warranty.
 
-You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it.
-11. Patents.
+THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT
+WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND
+PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE
+DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR
+CORRECTION.
 
-A “contributor” is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's “contributor version”.
+#### 16. Limitation of Liability.
 
-A contributor's “essential patent claims” are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, “control” includes the right to grant patent sublicenses in a manner consistent with the requirements of this License.
+IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR
+CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT
+NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR
+LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM
+TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER
+PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
 
-Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version.
+#### 17. Interpretation of Sections 15 and 16.
 
-In the following three paragraphs, a “patent license” is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To “grant” such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party.
+If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
 
-If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. “Knowingly relying” means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid.
+END OF TERMS AND CONDITIONS
 
-If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it.
+### How to Apply These Terms to Your New Programs
 
-A patent license is “discriminatory” if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007.
+If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these
+terms.
 
-Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law.
-12. No Surrender of Others' Freedom.
+To do so, attach the following notices to the program. It is safest to
+attach them to the start of each source file to most effectively state
+the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
 
-If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program.
-13. Use with the GNU Affero General Public License.
+        <one line to give the program's name and a brief idea of what it does.>
+        Copyright (C) <year>  <name of author>
 
-Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such.
-14. Revised Versions of this License.
+        This program is free software: you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation, either version 3 of the License, or
+        (at your option) any later version.
 
-The Free Software Foundation may publish revised and/or new versions of the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
 
-Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU General Public License “or any later version” applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation.
+        You should have received a copy of the GNU General Public License
+        along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-If the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program.
+Also add information on how to contact you by electronic and paper
+mail.
 
-Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version.
-15. Disclaimer of Warranty.
+If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
 
-THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-16. Limitation of Liability.
+        <program>  Copyright (C) <year>  <name of author>
+        This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+        This is free software, and you are welcome to redistribute it
+        under certain conditions; type `show c' for details.
 
-IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-17. Interpretation of Sections 15 and 16.
+The hypothetical commands \`show w' and \`show c' should show the
+appropriate parts of the General Public License. Of course, your
+program's commands might be different; for a GUI interface, you would
+use an "about box".
 
-If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee.
+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 <http://www.gnu.org/licenses/>.
 
-END OF TERMS AND CONDITIONS
\ No newline at end of file
+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 <http://www.gnu.org/philosophy/why-not-lgpl.html>.
\ No newline at end of file
diff --git a/patches.txt b/patches.txt
deleted file mode 100644
index 8f127fe..0000000
--- a/patches.txt
+++ /dev/null
@@ -1 +0,0 @@
-bench.patches.v3.deprecate_old_config